diff --git a/.gitignore b/.gitignore
index 1e15ce5fc1084..f4a4f0b8dc213 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,17 @@ lib*dll.def
 /pgsql.sln.cache
 /Debug/
 /Release/
+.cproject
+.project
+/DemoDir
+/bin
+/include
+/lib
+/share
+tags
+univ/
+db/
+.gitignore
+build/
+cscope.out
+*.pdf
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 79b0da42a8454..50fae4128aa32 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,6 +20,9 @@ $(call recurse,world,doc src config contrib,all)
 world:
 	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
 
+# build src/ before contrib/
+world-contrib-recurse: world-src-recurse
+
 html man:
 	$(MAKE) -C doc $@
 
@@ -33,6 +36,9 @@ $(call recurse,install-world,doc src config contrib,install)
 install-world:
 	+@echo "PostgreSQL, contrib, and documentation installation complete."
 
+# build src/ before contrib/
+install-world-contrib-recurse: install-world-src-recurse
+
 $(call recurse,installdirs uninstall coverage,doc src config)
 
 $(call recurse,distprep,doc src config contrib)
diff --git a/README b/README
index 49d55af5f6bfc..28555dc6f9be0 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+Commiting from Eclipse
+This is version 9.1.2
 PostgreSQL Database Management System
 =====================================
 
diff --git a/config/python.m4 b/config/python.m4
index ec357c2e48184..1ef77a91ddc6f 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -32,7 +32,7 @@ fi
 AC_MSG_CHECKING([Python configuration directory])
 python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"`
 python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"`
-python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print(os.path.join(f(plat_specific=1,standard_lib=1),'config'))"`
+python_configdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
 python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
 
 AC_SUBST(python_majorversion)[]dnl
@@ -69,7 +69,12 @@ then
 else
 	# Old way: use libpython from python_configdir
 	python_libdir="${python_configdir}"
-	python_libspec="-L${python_libdir} -lpython${python_version}"
+	# LDVERSION was introduced in Python 3.2.
+	python_ldversion=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
+	if test x"${python_ldversion}" = x""; then
+		python_ldversion=$python_version
+	fi
+	python_libspec="-L${python_libdir} -lpython${python_ldversion}"
 fi
 
 python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
diff --git a/configure b/configure
index 0904fa61f01c9..d9566d7b07d82 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for PostgreSQL 9.1beta2.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 9.1.2.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.1beta2'
-PACKAGE_STRING='PostgreSQL 9.1beta2'
+PACKAGE_VERSION='9.1.2'
+PACKAGE_STRING='PostgreSQL 9.1.2'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 9.1beta2 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1480,7 +1480,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 9.1beta2:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1627,7 +1627,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 9.1beta2
+PostgreSQL configure 9.1.2
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1643,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 9.1beta2, which was
+It was created by PostgreSQL $as_me 9.1.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -7242,7 +7242,7 @@ fi
 $as_echo_n "checking Python configuration directory... " >&6; }
 python_majorversion=`${PYTHON} -c "import sys; print(sys.version[0])"`
 python_version=`${PYTHON} -c "import sys; print(sys.version[:3])"`
-python_configdir=`${PYTHON} -c "from distutils.sysconfig import get_python_lib as f; import os; print(os.path.join(f(plat_specific=1,standard_lib=1),'config'))"`
+python_configdir=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"`
 python_includespec=`${PYTHON} -c "import distutils.sysconfig; print('-I'+distutils.sysconfig.get_python_inc())"`
 
 # This should be enough of a message.
@@ -7266,7 +7266,12 @@ then
 else
 	# Old way: use libpython from python_configdir
 	python_libdir="${python_configdir}"
-	python_libspec="-L${python_libdir} -lpython${python_version}"
+	# LDVERSION was introduced in Python 3.2.
+	python_ldversion=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"`
+	if test x"${python_ldversion}" = x""; then
+		python_ldversion=$python_version
+	fi
+	python_libspec="-L${python_libdir} -lpython${python_ldversion}"
 fi
 
 python_additional_libs=`${PYTHON} -c "import distutils.sysconfig,string; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
@@ -20423,8 +20428,7 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
 
 
-
-for ac_func in crypt erand48 getopt getpeereid getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
+for ac_func in crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -20536,16 +20540,25 @@ done
 case $host_os in
 
         # Windows uses a specialised env handler
+        # and doesn't need a replacement getpeereid because it doesn't use
+        # Unix sockets.
         mingw*)
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UNSETENV 1
 _ACEOF
 
-                ac_cv_func_unsetenv=yes;;
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GETPEEREID 1
+_ACEOF
+
+                ac_cv_func_unsetenv=yes
+                ac_cv_func_getpeereid=yes;;
         *)
 
-for ac_func in unsetenv
+
+for ac_func in unsetenv getpeereid
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -21077,6 +21090,12 @@ esac
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" win32setlocale.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS win32setlocale.$ac_objext"
+ ;;
+esac
+
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYMLINK 1
@@ -30056,7 +30075,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 9.1beta2, which was
+This file was extended by PostgreSQL $as_me 9.1.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -30123,7 +30142,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-PostgreSQL config.status 9.1beta2
+PostgreSQL config.status 9.1.2
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index e6232afeaaa48..c011a4c6391b3 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [9.1beta2], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.1.2], [pgsql-bugs@postgresql.org])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -1310,16 +1310,20 @@ fi
 pgac_save_LIBS="$LIBS"
 LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
-AC_REPLACE_FUNCS([crypt erand48 getopt getpeereid getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
+AC_REPLACE_FUNCS([crypt erand48 getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul])
 
 case $host_os in
 
         # Windows uses a specialised env handler
+        # and doesn't need a replacement getpeereid because it doesn't use
+        # Unix sockets.
         mingw*)
                 AC_DEFINE(HAVE_UNSETENV, 1, [Define to 1 because replacement version used.])
-                ac_cv_func_unsetenv=yes;;
+                AC_DEFINE(HAVE_GETPEEREID, 1, [Define to 1 because function not required.])
+                ac_cv_func_unsetenv=yes
+                ac_cv_func_getpeereid=yes;;
         *)
-                AC_REPLACE_FUNCS([unsetenv])
+                AC_REPLACE_FUNCS([unsetenv getpeereid])
 		;;
 esac
 
@@ -1370,6 +1374,7 @@ if test "$PORTNAME" = "win32"; then
   AC_LIBOBJ(open)
   AC_LIBOBJ(win32env)
   AC_LIBOBJ(win32error)
+  AC_LIBOBJ(win32setlocale)
   AC_DEFINE([HAVE_SYMLINK], 1,
             [Define to 1 if you have the `symlink' function.])
   AC_CHECK_TYPES(MINIDUMP_TYPE, [pgac_minidump_type=yes], [pgac_minidump_type=no], [
diff --git a/contrib/Makefile b/contrib/Makefile
index 696776795e7a7..0c238aae16c29 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -52,18 +52,26 @@ SUBDIRS = \
 
 ifeq ($(with_openssl),yes)
 SUBDIRS += sslinfo
+else
+ALWAYS_SUBDIRS += sslinfo
 endif
 
 ifeq ($(with_ossp_uuid),yes)
 SUBDIRS += uuid-ossp
+else
+ALWAYS_SUBDIRS += uuid-ossp
 endif
 
 ifeq ($(with_libxml),yes)
 SUBDIRS += xml2
+else
+ALWAYS_SUBDIRS += xml2
 endif
 
 ifeq ($(with_selinux),yes)
 SUBDIRS += sepgsql
+else
+ALWAYS_SUBDIRS += sepgsql
 endif
 
 # Missing:
@@ -71,3 +79,4 @@ endif
 
 
 $(recurse)
+$(recurse_always)
diff --git a/contrib/adminpack/adminpack--1.0.sql b/contrib/adminpack/adminpack--1.0.sql
index 090702231c0cf..f76f5c3cdf719 100644
--- a/contrib/adminpack/adminpack--1.0.sql
+++ b/contrib/adminpack/adminpack--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/adminpack/adminpack--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION adminpack" to load this file. \quit
+
 /* ***********************************************
  * Administrative functions for PostgreSQL
  * *********************************************** */
diff --git a/contrib/btree_gin/btree_gin--1.0.sql b/contrib/btree_gin/btree_gin--1.0.sql
index 07f93640f3382..cf867ef687357 100644
--- a/contrib/btree_gin/btree_gin--1.0.sql
+++ b/contrib/btree_gin/btree_gin--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/btree_gin/btree_gin--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION btree_gin" to load this file. \quit
+
 CREATE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal)
 RETURNS bool
 AS 'MODULE_PATHNAME'
diff --git a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql
index fe1ddeab878ab..8dfafc1e8b925 100644
--- a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql
+++ b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/btree_gin/btree_gin--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION btree_gin" to load this file. \quit
+
 ALTER EXTENSION btree_gin ADD function gin_btree_consistent(internal,smallint,anyelement,integer,internal,internal);
 ALTER EXTENSION btree_gin ADD function gin_extract_value_int2(smallint,internal);
 ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int2(smallint,smallint,smallint,internal);
diff --git a/contrib/btree_gist/btree_gist--1.0.sql b/contrib/btree_gist/btree_gist--1.0.sql
index dd428995c185a..c5c958753e38a 100644
--- a/contrib/btree_gist/btree_gist--1.0.sql
+++ b/contrib/btree_gist/btree_gist--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/btree_gist/btree_gist--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION btree_gist" to load this file. \quit
+
 CREATE FUNCTION gbtreekey4_in(cstring)
 RETURNS gbtreekey4
 AS 'MODULE_PATHNAME', 'gbtreekey_in'
diff --git a/contrib/btree_gist/btree_gist--unpackaged--1.0.sql b/contrib/btree_gist/btree_gist--unpackaged--1.0.sql
index 00252bf7c380a..838ad7ec1e1dd 100644
--- a/contrib/btree_gist/btree_gist--unpackaged--1.0.sql
+++ b/contrib/btree_gist/btree_gist--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/btree_gist/btree_gist--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION btree_gist" to load this file. \quit
+
 ALTER EXTENSION btree_gist ADD type gbtreekey4;
 ALTER EXTENSION btree_gist ADD function gbtreekey4_in(cstring);
 ALTER EXTENSION btree_gist ADD function gbtreekey4_out(gbtreekey4);
diff --git a/contrib/chkpass/chkpass--1.0.sql b/contrib/chkpass/chkpass--1.0.sql
index 755fee3bc3fc8..d1fbedc4468a1 100644
--- a/contrib/chkpass/chkpass--1.0.sql
+++ b/contrib/chkpass/chkpass--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/chkpass/chkpass--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION chkpass" to load this file. \quit
+
 --
 --	Input and output functions and the type itself:
 --
diff --git a/contrib/chkpass/chkpass--unpackaged--1.0.sql b/contrib/chkpass/chkpass--unpackaged--1.0.sql
index bf91950f3c631..7bbfb142a6a87 100644
--- a/contrib/chkpass/chkpass--unpackaged--1.0.sql
+++ b/contrib/chkpass/chkpass--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/chkpass/chkpass--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION chkpass" to load this file. \quit
+
 ALTER EXTENSION chkpass ADD type chkpass;
 ALTER EXTENSION chkpass ADD function chkpass_in(cstring);
 ALTER EXTENSION chkpass ADD function chkpass_out(chkpass);
diff --git a/contrib/citext/citext--1.0.sql b/contrib/citext/citext--1.0.sql
index 2760f7e08d907..1dd19973d7786 100644
--- a/contrib/citext/citext--1.0.sql
+++ b/contrib/citext/citext--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/citext/citext--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION citext" to load this file. \quit
+
 --
 --  PostgreSQL code for CITEXT.
 --
diff --git a/contrib/citext/citext--unpackaged--1.0.sql b/contrib/citext/citext--unpackaged--1.0.sql
index a59df36797cba..9b0f200aac7ba 100644
--- a/contrib/citext/citext--unpackaged--1.0.sql
+++ b/contrib/citext/citext--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/citext/citext--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION citext" to load this file. \quit
+
 ALTER EXTENSION citext ADD type citext;
 ALTER EXTENSION citext ADD function citextin(cstring);
 ALTER EXTENSION citext ADD function citextout(citext);
@@ -78,11 +81,49 @@ ALTER EXTENSION citext ADD function translate(citext,citext,text);
 --
 -- As of 9.1, type citext should be marked collatable.  There is no ALTER TYPE
 -- command for this, so we have to do it by poking the pg_type entry directly.
+-- We have to poke any derived copies in pg_attribute or pg_index as well.
 -- Notes: 100 is the OID of the "pg_catalog.default" collation --- it seems
 -- easier and more reliable to hard-wire that here than to pull it out of
--- pg_collation.  Also, we don't need a pg_depend entry since the default
--- collation is pinned.
+-- pg_collation.  Also, we don't need to make pg_depend entries since the
+-- default collation is pinned.
 --
 
 UPDATE pg_catalog.pg_type SET typcollation = 100
 WHERE oid = 'citext'::pg_catalog.regtype;
+
+UPDATE pg_catalog.pg_attribute SET attcollation = 100
+WHERE atttypid = 'citext'::pg_catalog.regtype;
+
+UPDATE pg_catalog.pg_index SET indcollation[0] = 100
+WHERE indclass[0] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[1] = 100
+WHERE indclass[1] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[2] = 100
+WHERE indclass[2] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[3] = 100
+WHERE indclass[3] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[4] = 100
+WHERE indclass[4] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[5] = 100
+WHERE indclass[5] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[6] = 100
+WHERE indclass[6] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+UPDATE pg_catalog.pg_index SET indcollation[7] = 100
+WHERE indclass[7] IN (SELECT oid FROM pg_catalog.pg_opclass
+                      WHERE opcintype = 'citext'::pg_catalog.regtype);
+
+-- somewhat arbitrarily, we assume no citext indexes have more than 8 columns
diff --git a/contrib/cube/cube--1.0.sql b/contrib/cube/cube--1.0.sql
index ee9febe005315..0307811ceb9c6 100644
--- a/contrib/cube/cube--1.0.sql
+++ b/contrib/cube/cube--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/cube/cube--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION cube" to load this file. \quit
+
 -- Create the user-defined type for N-dimensional boxes
 
 CREATE FUNCTION cube_in(cstring)
diff --git a/contrib/cube/cube--unpackaged--1.0.sql b/contrib/cube/cube--unpackaged--1.0.sql
index 866c18a289855..6859682786164 100644
--- a/contrib/cube/cube--unpackaged--1.0.sql
+++ b/contrib/cube/cube--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/cube/cube--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION cube" to load this file. \quit
+
 ALTER EXTENSION cube ADD type cube;
 ALTER EXTENSION cube ADD function cube_in(cstring);
 ALTER EXTENSION cube ADD function cube(double precision[],double precision[]);
diff --git a/contrib/dblink/dblink--1.0.sql b/contrib/dblink/dblink--1.0.sql
index 4ac551446198b..1fec9e3944127 100644
--- a/contrib/dblink/dblink--1.0.sql
+++ b/contrib/dblink/dblink--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/dblink/dblink--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dblink" to load this file. \quit
+
 -- dblink_connect now restricts non-superusers to password
 -- authenticated connections
 CREATE FUNCTION dblink_connect (text)
diff --git a/contrib/dblink/dblink--unpackaged--1.0.sql b/contrib/dblink/dblink--unpackaged--1.0.sql
index b6d184b4a2c09..29f5bed0c13a2 100644
--- a/contrib/dblink/dblink--unpackaged--1.0.sql
+++ b/contrib/dblink/dblink--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/dblink/dblink--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dblink" to load this file. \quit
+
 ALTER EXTENSION dblink ADD function dblink_connect(text);
 ALTER EXTENSION dblink ADD function dblink_connect(text,text);
 ALTER EXTENSION dblink ADD function dblink_connect_u(text);
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 19b98fb73d1d2..0812a3b2b561f 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -187,7 +187,7 @@ typedef struct remoteConnHashEnt
 					ereport(ERROR, \
 							(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \
 							 errmsg("could not establish connection"), \
-							 errdetail("%s", msg))); \
+							 errdetail_internal("%s", msg))); \
 				} \
 				dblink_security_check(conn, rconn); \
 				PQsetClientEncoding(conn, GetDatabaseEncodingName()); \
@@ -263,7 +263,7 @@ dblink_connect(PG_FUNCTION_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
 				 errmsg("could not establish connection"),
-				 errdetail("%s", msg)));
+				 errdetail_internal("%s", msg)));
 	}
 
 	/* check password actually used if not superuser */
@@ -613,16 +613,13 @@ Datum
 dblink_send_query(PG_FUNCTION_ARGS)
 {
 	PGconn	   *conn = NULL;
-	char	   *connstr = NULL;
 	char	   *sql = NULL;
 	remoteConn *rconn = NULL;
-	char	   *msg;
-	bool		freeconn = false;
 	int			retval;
 
 	if (PG_NARGS() == 2)
 	{
-		DBLINK_GET_CONN;
+		DBLINK_GET_NAMED_CONN;
 		sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
 	}
 	else
@@ -711,13 +708,13 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 		if (PG_NARGS() == 2)
 		{
 			/* text,bool */
-			DBLINK_GET_CONN;
+			DBLINK_GET_NAMED_CONN;
 			fail = PG_GETARG_BOOL(1);
 		}
 		else if (PG_NARGS() == 1)
 		{
 			/* text */
-			DBLINK_GET_CONN;
+			DBLINK_GET_NAMED_CONN;
 		}
 		else
 			/* shouldn't happen */
@@ -2264,8 +2261,9 @@ dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_
 
 	ereport(level,
 			(errcode(sqlstate),
-	message_primary ? errmsg("%s", message_primary) : errmsg("unknown error"),
-			 message_detail ? errdetail("%s", message_detail) : 0,
+			 message_primary ? errmsg_internal("%s", message_primary) :
+			 errmsg("unknown error"),
+			 message_detail ? errdetail_internal("%s", message_detail) : 0,
 			 message_hint ? errhint("%s", message_hint) : 0,
 			 message_context ? errcontext("%s", message_context) : 0,
 		  errcontext("Error occurred on dblink connection named \"%s\": %s.",
diff --git a/contrib/dict_int/dict_int--1.0.sql b/contrib/dict_int/dict_int--1.0.sql
index 585a56552d661..acb1461b56990 100644
--- a/contrib/dict_int/dict_int--1.0.sql
+++ b/contrib/dict_int/dict_int--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/dict_int/dict_int--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_int" to load this file. \quit
+
 CREATE FUNCTION dintdict_init(internal)
         RETURNS internal
         AS 'MODULE_PATHNAME'
diff --git a/contrib/dict_int/dict_int--unpackaged--1.0.sql b/contrib/dict_int/dict_int--unpackaged--1.0.sql
index f89218a565c0c..ef59b046ee67f 100644
--- a/contrib/dict_int/dict_int--unpackaged--1.0.sql
+++ b/contrib/dict_int/dict_int--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/dict_int/dict_int--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_int" to load this file. \quit
+
 ALTER EXTENSION dict_int ADD function dintdict_init(internal);
 ALTER EXTENSION dict_int ADD function dintdict_lexize(internal,internal,internal,internal);
 ALTER EXTENSION dict_int ADD text search template intdict_template;
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index c4ad6ef343e1c..ed82d83004c0d 100644
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@@ -73,7 +73,7 @@ dintdict_lexize(PG_FUNCTION_ARGS)
 	DictInt    *d = (DictInt *) PG_GETARG_POINTER(0);
 	char	   *in = (char *) PG_GETARG_POINTER(1);
 	char	   *txt = pnstrdup(in, PG_GETARG_INT32(2));
-	TSLexeme   *res = palloc(sizeof(TSLexeme) * 2);
+	TSLexeme   *res = palloc0(sizeof(TSLexeme) * 2);
 
 	res[1].lexeme = NULL;
 	if (PG_GETARG_INT32(2) > d->maxlen)
diff --git a/contrib/dict_xsyn/dict_xsyn--1.0.sql b/contrib/dict_xsyn/dict_xsyn--1.0.sql
index 30eaff4db5a92..3d6bb51ca893e 100644
--- a/contrib/dict_xsyn/dict_xsyn--1.0.sql
+++ b/contrib/dict_xsyn/dict_xsyn--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/dict_xsyn/dict_xsyn--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_xsyn" to load this file. \quit
+
 CREATE FUNCTION dxsyn_init(internal)
         RETURNS internal
         AS 'MODULE_PATHNAME'
diff --git a/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql b/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql
index 6fe0285f799f9..1d193f7981a42 100644
--- a/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql
+++ b/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION dict_xsyn" to load this file. \quit
+
 ALTER EXTENSION dict_xsyn ADD function dxsyn_init(internal);
 ALTER EXTENSION dict_xsyn ADD function dxsyn_lexize(internal,internal,internal,internal);
 ALTER EXTENSION dict_xsyn ADD text search template xsyn_template;
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c
index ded20facd47cb..18301effc7c81 100644
--- a/contrib/dict_xsyn/dict_xsyn.c
+++ b/contrib/dict_xsyn/dict_xsyn.c
@@ -245,6 +245,8 @@ dxsyn_lexize(PG_FUNCTION_ARGS)
 			if (pos != value || d->keeporig)
 			{
 				res[nsyns].lexeme = pnstrdup(syn, end - syn);
+				res[nsyns].nvariant = 0;
+				res[nsyns].flags = 0;
 				nsyns++;
 			}
 
diff --git a/contrib/earthdistance/earthdistance--1.0.sql b/contrib/earthdistance/earthdistance--1.0.sql
index 71e4025f6f8a9..4af9062e7d853 100644
--- a/contrib/earthdistance/earthdistance--1.0.sql
+++ b/contrib/earthdistance/earthdistance--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/earthdistance/earthdistance--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION earthdistance" to load this file. \quit
+
 -- earth() returns the radius of the earth in meters. This is the only
 -- place you need to change things for the cube base distance functions
 -- in order to use different units (or a better value for the Earth's radius).
diff --git a/contrib/earthdistance/earthdistance--unpackaged--1.0.sql b/contrib/earthdistance/earthdistance--unpackaged--1.0.sql
index 2d5919cc72d70..362e0ac1071c3 100644
--- a/contrib/earthdistance/earthdistance--unpackaged--1.0.sql
+++ b/contrib/earthdistance/earthdistance--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/earthdistance/earthdistance--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION earthdistance" to load this file. \quit
+
 ALTER EXTENSION earthdistance ADD function earth();
 ALTER EXTENSION earthdistance ADD type earth;
 ALTER EXTENSION earthdistance ADD function sec_to_gc(double precision);
diff --git a/contrib/earthdistance/expected/earthdistance.out b/contrib/earthdistance/expected/earthdistance.out
index 8a3fc749c1cf4..9bd556fc224e4 100644
--- a/contrib/earthdistance/expected/earthdistance.out
+++ b/contrib/earthdistance/expected/earthdistance.out
@@ -1,6 +1,14 @@
 --
---  Test earth distance functions
+--  Test earthdistance extension
 --
+-- In this file we also do some testing of extension create/drop scenarios.
+-- That's really exercising the core database's dependency logic, so ideally
+-- we'd do it in the core regression tests, but we can't for lack of suitable
+-- guaranteed-available extensions.  earthdistance is a good test case because
+-- it has a dependency on the cube extension.
+--
+CREATE EXTENSION earthdistance;  -- fail, must install cube first
+ERROR:  required extension "cube" is not installed
 CREATE EXTENSION cube;
 CREATE EXTENSION earthdistance;
 --
@@ -945,3 +953,141 @@ SELECT abs(cube_distance(ll_to_earth(-30,-90), '(0)'::cube) / earth() - 1) <
  t
 (1 row)
 
+--
+-- Now we are going to test extension create/drop scenarios.
+--
+-- list what's installed
+\dT
+                                              List of data types
+ Schema | Name  |                                         Description                                         
+--------+-------+---------------------------------------------------------------------------------------------
+ public | cube  | multi-dimensional cube '(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'
+ public | earth | 
+(2 rows)
+
+drop extension cube;  -- fail, earthdistance requires it
+ERROR:  cannot drop extension cube because other objects depend on it
+DETAIL:  extension earthdistance depends on extension cube
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+drop extension earthdistance;
+drop type cube;  -- fail, extension cube requires it
+ERROR:  cannot drop type cube because extension cube requires it
+HINT:  You can drop extension cube instead.
+-- list what's installed
+\dT
+                                             List of data types
+ Schema | Name |                                         Description                                         
+--------+------+---------------------------------------------------------------------------------------------
+ public | cube | multi-dimensional cube '(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'
+(1 row)
+
+create table foo (f1 cube, f2 int);
+drop extension cube;  -- fail, foo.f1 requires it
+ERROR:  cannot drop extension cube because other objects depend on it
+DETAIL:  table foo column f1 depends on type cube
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+drop table foo;
+drop extension cube;
+-- list what's installed
+\dT
+     List of data types
+ Schema | Name | Description 
+--------+------+-------------
+(0 rows)
+
+\df
+                       List of functions
+ Schema | Name | Result data type | Argument data types | Type 
+--------+------+------------------+---------------------+------
+(0 rows)
+
+\do
+                             List of operators
+ Schema | Name | Left arg type | Right arg type | Result type | Description 
+--------+------+---------------+----------------+-------------+-------------
+(0 rows)
+
+create schema c;
+create extension cube with schema c;
+-- list what's installed
+\dT public.*
+     List of data types
+ Schema | Name | Description 
+--------+------+-------------
+(0 rows)
+
+\df public.*
+                       List of functions
+ Schema | Name | Result data type | Argument data types | Type 
+--------+------+------------------+---------------------+------
+(0 rows)
+
+\do public.*
+                             List of operators
+ Schema | Name | Left arg type | Right arg type | Result type | Description 
+--------+------+---------------+----------------+-------------+-------------
+(0 rows)
+
+\dT c.*
+                                              List of data types
+ Schema |  Name  |                                         Description                                         
+--------+--------+---------------------------------------------------------------------------------------------
+ c      | c.cube | multi-dimensional cube '(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'
+(1 row)
+
+create table foo (f1 c.cube, f2 int);
+drop extension cube;  -- fail, foo.f1 requires it
+ERROR:  cannot drop extension cube because other objects depend on it
+DETAIL:  table foo column f1 depends on type c.cube
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+drop schema c;  -- fail, cube requires it
+ERROR:  cannot drop schema c because other objects depend on it
+DETAIL:  extension cube depends on schema c
+table foo column f1 depends on type c.cube
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+drop extension cube cascade;
+NOTICE:  drop cascades to table foo column f1
+\d foo
+      Table "public.foo"
+ Column |  Type   | Modifiers 
+--------+---------+-----------
+ f2     | integer | 
+
+-- list what's installed
+\dT public.*
+     List of data types
+ Schema | Name | Description 
+--------+------+-------------
+(0 rows)
+
+\df public.*
+                       List of functions
+ Schema | Name | Result data type | Argument data types | Type 
+--------+------+------------------+---------------------+------
+(0 rows)
+
+\do public.*
+                             List of operators
+ Schema | Name | Left arg type | Right arg type | Result type | Description 
+--------+------+---------------+----------------+-------------+-------------
+(0 rows)
+
+\dT c.*
+     List of data types
+ Schema | Name | Description 
+--------+------+-------------
+(0 rows)
+
+\df c.*
+                       List of functions
+ Schema | Name | Result data type | Argument data types | Type 
+--------+------+------------------+---------------------+------
+(0 rows)
+
+\do c.*
+                             List of operators
+ Schema | Name | Left arg type | Right arg type | Result type | Description 
+--------+------+---------------+----------------+-------------+-------------
+(0 rows)
+
+drop schema c;
diff --git a/contrib/earthdistance/sql/earthdistance.sql b/contrib/earthdistance/sql/earthdistance.sql
index e494c350ce9d6..860450276f64a 100644
--- a/contrib/earthdistance/sql/earthdistance.sql
+++ b/contrib/earthdistance/sql/earthdistance.sql
@@ -1,7 +1,14 @@
 --
---  Test earth distance functions
+--  Test earthdistance extension
+--
+-- In this file we also do some testing of extension create/drop scenarios.
+-- That's really exercising the core database's dependency logic, so ideally
+-- we'd do it in the core regression tests, but we can't for lack of suitable
+-- guaranteed-available extensions.  earthdistance is a good test case because
+-- it has a dependency on the cube extension.
 --
 
+CREATE EXTENSION earthdistance;  -- fail, must install cube first
 CREATE EXTENSION cube;
 CREATE EXTENSION earthdistance;
 
@@ -291,3 +298,62 @@ SELECT is_point(ll_to_earth(-30,-90));
 SELECT cube_dim(ll_to_earth(-30,-90)) <= 3;
 SELECT abs(cube_distance(ll_to_earth(-30,-90), '(0)'::cube) / earth() - 1) <
        '10e-12'::float8;
+
+--
+-- Now we are going to test extension create/drop scenarios.
+--
+
+-- list what's installed
+\dT
+
+drop extension cube;  -- fail, earthdistance requires it
+
+drop extension earthdistance;
+
+drop type cube;  -- fail, extension cube requires it
+
+-- list what's installed
+\dT
+
+create table foo (f1 cube, f2 int);
+
+drop extension cube;  -- fail, foo.f1 requires it
+
+drop table foo;
+
+drop extension cube;
+
+-- list what's installed
+\dT
+\df
+\do
+
+create schema c;
+
+create extension cube with schema c;
+
+-- list what's installed
+\dT public.*
+\df public.*
+\do public.*
+\dT c.*
+
+create table foo (f1 c.cube, f2 int);
+
+drop extension cube;  -- fail, foo.f1 requires it
+
+drop schema c;  -- fail, cube requires it
+
+drop extension cube cascade;
+
+\d foo
+
+-- list what's installed
+\dT public.*
+\df public.*
+\do public.*
+\dT c.*
+\df c.*
+\do c.*
+
+drop schema c;
diff --git a/contrib/file_fdw/file_fdw--1.0.sql b/contrib/file_fdw/file_fdw--1.0.sql
index 0cca65f46381d..856e6bf0a71f0 100644
--- a/contrib/file_fdw/file_fdw--1.0.sql
+++ b/contrib/file_fdw/file_fdw--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/file_fdw/file_fdw--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION file_fdw" to load this file. \quit
+
 CREATE FUNCTION file_fdw_handler()
 RETURNS fdw_handler
 AS 'MODULE_PATHNAME'
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 466c015107db2..4eb87e651bcb1 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -215,6 +215,14 @@ file_fdw_validator(PG_FUNCTION_ARGS)
 	 */
 	ProcessCopyOptions(NULL, true, other_options);
 
+	/*
+	 * Filename option is required for file_fdw foreign tables.
+	 */
+	if (catalog == ForeignTableRelationId && filename == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_FDW_DYNAMIC_PARAMETER_VALUE_NEEDED),
+				 errmsg("filename is required for file_fdw foreign tables")));
+
 	PG_RETURN_VOID();
 }
 
@@ -286,10 +294,14 @@ fileGetOptions(Oid foreigntableid,
 		}
 		prev = lc;
 	}
+
+	/*
+	 * The validator should have checked that a filename was included in the
+	 * options, but check again, just in case.
+	 */
 	if (*filename == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_FDW_UNABLE_TO_CREATE_REPLY),
-				 errmsg("filename is required for file_fdw foreign tables")));
+		elog(ERROR, "filename is required for file_fdw foreign tables");
+
 	*other_options = options;
 }
 
diff --git a/contrib/file_fdw/input/file_fdw.source b/contrib/file_fdw/input/file_fdw.source
index 9ff7235a12468..1405752819ced 100644
--- a/contrib/file_fdw/input/file_fdw.source
+++ b/contrib/file_fdw/input/file_fdw.source
@@ -59,6 +59,7 @@ CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', delimiter
 ');       -- ERROR
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', null '
 ');       -- ERROR
+CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
 
 CREATE FOREIGN TABLE agg_text (
 	a	int2,
diff --git a/contrib/file_fdw/output/file_fdw.source b/contrib/file_fdw/output/file_fdw.source
index 2ba36c936852d..6dd2653d0a771 100644
--- a/contrib/file_fdw/output/file_fdw.source
+++ b/contrib/file_fdw/output/file_fdw.source
@@ -75,6 +75,8 @@ ERROR:  COPY delimiter cannot be newline or carriage return
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'csv', null '
 ');       -- ERROR
 ERROR:  COPY null representation cannot use newline or carriage return
+CREATE FOREIGN TABLE tbl () SERVER file_server;  -- ERROR
+ERROR:  filename is required for file_fdw foreign tables
 CREATE FOREIGN TABLE agg_text (
 	a	int2,
 	b	float4
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql b/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql
index d9b8987adf562..1cf9b6188cc04 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql
+++ b/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION fuzzystrmatch" to load this file. \quit
+
 CREATE FUNCTION levenshtein (text,text) RETURNS int
 AS 'MODULE_PATHNAME','levenshtein'
 LANGUAGE C IMMUTABLE STRICT;
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql b/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql
index b99510bcddc99..b9a805a4fe517 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql
+++ b/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION fuzzystrmatch" to load this file. \quit
+
 ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text);
 ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text,integer,integer,integer);
 ALTER EXTENSION fuzzystrmatch ADD function metaphone(text,integer);
diff --git a/contrib/hstore/hstore--1.0.sql b/contrib/hstore/hstore--1.0.sql
index 247a2773f5ad8..8b211c4669f0a 100644
--- a/contrib/hstore/hstore--1.0.sql
+++ b/contrib/hstore/hstore--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/hstore/hstore--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION hstore" to load this file. \quit
+
 CREATE TYPE hstore;
 
 CREATE FUNCTION hstore_in(cstring)
diff --git a/contrib/hstore/hstore--unpackaged--1.0.sql b/contrib/hstore/hstore--unpackaged--1.0.sql
index 0eb300ecf5116..b7e73f41232cd 100644
--- a/contrib/hstore/hstore--unpackaged--1.0.sql
+++ b/contrib/hstore/hstore--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/hstore/hstore--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION hstore" to load this file. \quit
+
 ALTER EXTENSION hstore ADD type hstore;
 ALTER EXTENSION hstore ADD function hstore_in(cstring);
 ALTER EXTENSION hstore ADD function hstore_out(hstore);
diff --git a/contrib/intagg/intagg--1.0.sql b/contrib/intagg/intagg--1.0.sql
index 19a57c079b8dc..f96b6e2e9b7b4 100644
--- a/contrib/intagg/intagg--1.0.sql
+++ b/contrib/intagg/intagg--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/intagg/intagg--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION intagg" to load this file. \quit
+
 -- Internal function for the aggregate
 -- Is called for each item in an aggregation
 CREATE FUNCTION int_agg_state (internal, int4)
diff --git a/contrib/intagg/intagg--unpackaged--1.0.sql b/contrib/intagg/intagg--unpackaged--1.0.sql
index 95238d9c67560..6a6663d092c66 100644
--- a/contrib/intagg/intagg--unpackaged--1.0.sql
+++ b/contrib/intagg/intagg--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/intagg/intagg--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION intagg" to load this file. \quit
+
 ALTER EXTENSION intagg ADD function int_agg_state(internal,integer);
 ALTER EXTENSION intagg ADD function int_agg_final_array(internal);
 ALTER EXTENSION intagg ADD function int_array_aggregate(integer);
diff --git a/contrib/intarray/intarray--1.0.sql b/contrib/intarray/intarray--1.0.sql
index 3b77c516cbc12..0b89e0f55e52a 100644
--- a/contrib/intarray/intarray--1.0.sql
+++ b/contrib/intarray/intarray--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/intarray/intarray--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION intarray" to load this file. \quit
+
 --
 -- Create the user-defined type for the 1-D integer arrays (_int4)
 --
diff --git a/contrib/intarray/intarray--unpackaged--1.0.sql b/contrib/intarray/intarray--unpackaged--1.0.sql
index 5a2829c9f53b9..5de64bf0aba18 100644
--- a/contrib/intarray/intarray--unpackaged--1.0.sql
+++ b/contrib/intarray/intarray--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/intarray/intarray--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION intarray" to load this file. \quit
+
 ALTER EXTENSION intarray ADD type query_int;
 ALTER EXTENSION intarray ADD function bqarr_in(cstring);
 ALTER EXTENSION intarray ADD function bqarr_out(query_int);
diff --git a/contrib/isn/isn--1.0.sql b/contrib/isn/isn--1.0.sql
index 336ad1db3ce10..0df7bba3b3299 100644
--- a/contrib/isn/isn--1.0.sql
+++ b/contrib/isn/isn--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/isn/isn--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION isn" to load this file. \quit
+
 -- Example:
 --   create table test ( id isbn );
 --   insert into test values('978-0-393-04002-9');
diff --git a/contrib/isn/isn--unpackaged--1.0.sql b/contrib/isn/isn--unpackaged--1.0.sql
index 6130a43e5157f..30e5012156602 100644
--- a/contrib/isn/isn--unpackaged--1.0.sql
+++ b/contrib/isn/isn--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/isn/isn--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION isn" to load this file. \quit
+
 ALTER EXTENSION isn ADD type ean13;
 ALTER EXTENSION isn ADD function ean13_in(cstring);
 ALTER EXTENSION isn ADD function ean13_out(ean13);
diff --git a/contrib/lo/lo--1.0.sql b/contrib/lo/lo--1.0.sql
index 4b9a7dee32e41..cb350e0b8a008 100644
--- a/contrib/lo/lo--1.0.sql
+++ b/contrib/lo/lo--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/lo/lo--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION lo" to load this file. \quit
+
 --
 --	Create the data type ... now just a domain over OID
 --
diff --git a/contrib/lo/lo--unpackaged--1.0.sql b/contrib/lo/lo--unpackaged--1.0.sql
index 54de61686eae9..053185ba1d857 100644
--- a/contrib/lo/lo--unpackaged--1.0.sql
+++ b/contrib/lo/lo--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/lo/lo--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION lo" to load this file. \quit
+
 ALTER EXTENSION lo ADD domain lo;
 ALTER EXTENSION lo ADD function lo_oid(lo);
 ALTER EXTENSION lo ADD function lo_manage();
diff --git a/contrib/ltree/ltree--1.0.sql b/contrib/ltree/ltree--1.0.sql
index 32969538a023c..5a2f375a4f3f4 100644
--- a/contrib/ltree/ltree--1.0.sql
+++ b/contrib/ltree/ltree--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/ltree/ltree--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION ltree" to load this file. \quit
+
 CREATE FUNCTION ltree_in(cstring)
 RETURNS ltree
 AS 'MODULE_PATHNAME'
diff --git a/contrib/ltree/ltree--unpackaged--1.0.sql b/contrib/ltree/ltree--unpackaged--1.0.sql
index f483725b4afd5..1e24fa56c688c 100644
--- a/contrib/ltree/ltree--unpackaged--1.0.sql
+++ b/contrib/ltree/ltree--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/ltree/ltree--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION ltree" to load this file. \quit
+
 ALTER EXTENSION ltree ADD type ltree;
 ALTER EXTENSION ltree ADD function ltree_in(cstring);
 ALTER EXTENSION ltree ADD function ltree_out(ltree);
diff --git a/contrib/pageinspect/pageinspect--1.0.sql b/contrib/pageinspect/pageinspect--1.0.sql
index a711f581e2661..5613956fd8c74 100644
--- a/contrib/pageinspect/pageinspect--1.0.sql
+++ b/contrib/pageinspect/pageinspect--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pageinspect/pageinspect--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pageinspect" to load this file. \quit
+
 --
 -- get_raw_page()
 --
diff --git a/contrib/pageinspect/pageinspect--unpackaged--1.0.sql b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
index 7d4feaf034ae4..13e2167dfc1ac 100644
--- a/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
+++ b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pageinspect/pageinspect--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pageinspect" to load this file. \quit
+
 DROP FUNCTION heap_page_items(bytea);
 CREATE FUNCTION heap_page_items(IN page bytea,
 	OUT lp smallint,
diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c
index dd8a45133c89c..400968ce399c8 100644
--- a/contrib/pg_archivecleanup/pg_archivecleanup.c
+++ b/contrib/pg_archivecleanup/pg_archivecleanup.c
@@ -83,7 +83,7 @@ Initialize(void)
 	if (stat(archiveLocation, &stat_buf) != 0 ||
 		!S_ISDIR(stat_buf.st_mode))
 	{
-		fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n",
+		fprintf(stderr, "%s: archive location \"%s\" does not exist\n",
 				progname, archiveLocation);
 		exit(2);
 	}
@@ -135,7 +135,7 @@ CleanupPriorWALFiles(void)
 		closedir(xldir);
 	}
 	else
-		fprintf(stderr, "%s: could not open archiveLocation \"%s\": %s\n",
+		fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",
 				progname, archiveLocation, strerror(errno));
 }
 
diff --git a/contrib/pg_buffercache/pg_buffercache--1.0.sql b/contrib/pg_buffercache/pg_buffercache--1.0.sql
index 9407d214108c7..4ca4c44256c8a 100644
--- a/contrib/pg_buffercache/pg_buffercache--1.0.sql
+++ b/contrib/pg_buffercache/pg_buffercache--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pg_buffercache/pg_buffercache--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_buffercache" to load this file. \quit
+
 -- Register the function.
 CREATE FUNCTION pg_buffercache_pages()
 RETURNS SETOF RECORD
diff --git a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql
index f00a954d86e89..bfe6e52f8f40e 100644
--- a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql
+++ b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql
@@ -1,4 +1,7 @@
 /* contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_buffercache" to load this file. \quit
+
 ALTER EXTENSION pg_buffercache ADD function pg_buffercache_pages();
 ALTER EXTENSION pg_buffercache ADD view pg_buffercache;
diff --git a/contrib/pg_freespacemap/pg_freespacemap--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql
index d63420e33a4ec..2adb52a3753fc 100644
--- a/contrib/pg_freespacemap/pg_freespacemap--1.0.sql
+++ b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pg_freespacemap/pg_freespacemap--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_freespacemap" to load this file. \quit
+
 -- Register the C function.
 CREATE FUNCTION pg_freespace(regclass, bigint)
 RETURNS int2
diff --git a/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
index 4c7487fa4e78d..5e8d7e472ee90 100644
--- a/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
+++ b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql
@@ -1,4 +1,7 @@
 /* contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_freespacemap" to load this file. \quit
+
 ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass,bigint);
 ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass);
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index d2e0d582f279f..0aa05344b9dd9 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -173,7 +173,7 @@ CustomizableInitialize(void)
 	 */
 	if (stat(archiveLocation, &stat_buf) != 0)
 	{
-		fprintf(stderr, "%s: archiveLocation \"%s\" does not exist\n", progname, archiveLocation);
+		fprintf(stderr, "%s: archive location \"%s\" does not exist\n", progname, archiveLocation);
 		fflush(stderr);
 		exit(2);
 	}
@@ -283,12 +283,12 @@ CustomizableCleanupPriorWALFiles(void)
 #endif
 
 					if (debug)
-						fprintf(stderr, "\nremoving \"%s\"", WALFilePath);
+						fprintf(stderr, "\nremoving file \"%s\"", WALFilePath);
 
 					rc = unlink(WALFilePath);
 					if (rc != 0)
 					{
-						fprintf(stderr, "\n%s: ERROR failed to remove \"%s\": %s",
+						fprintf(stderr, "\n%s: ERROR: could not remove file \"%s\": %s\n",
 								progname, WALFilePath, strerror(errno));
 						break;
 					}
@@ -298,7 +298,8 @@ CustomizableCleanupPriorWALFiles(void)
 				fprintf(stderr, "\n");
 		}
 		else
-			fprintf(stderr, "%s: archiveLocation \"%s\" open error\n", progname, archiveLocation);
+			fprintf(stderr, "%s: could not open archive location \"%s\": %s\n",
+					progname, archiveLocation, strerror(errno));
 
 		closedir(xldir);
 		fflush(stderr);
@@ -693,7 +694,7 @@ main(int argc, char **argv)
 	}
 	else
 	{
-		fprintf(stderr, "%s: use %%f to specify nextWALFileName\n", progname);
+		fprintf(stderr, "%s: must specify WAL file name as second non-option argument (use \"%%f\")\n", progname);
 		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
 		exit(2);
 	}
@@ -705,7 +706,7 @@ main(int argc, char **argv)
 	}
 	else
 	{
-		fprintf(stderr, "%s: use %%p to specify xlogFilePath\n", progname);
+		fprintf(stderr, "%s: must specify xlog destination as third non-option argument (use \"%%p\")\n", progname);
 		fprintf(stderr, "Try \"%s --help\" for more information.\n", progname);
 		exit(2);
 	}
diff --git a/contrib/pg_stat_statements/pg_stat_statements--1.0.sql b/contrib/pg_stat_statements/pg_stat_statements--1.0.sql
index e17b82c616a86..5294a01dd5281 100644
--- a/contrib/pg_stat_statements/pg_stat_statements--1.0.sql
+++ b/contrib/pg_stat_statements/pg_stat_statements--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pg_stat_statements/pg_stat_statements--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_stat_statements" to load this file. \quit
+
 -- Register functions.
 CREATE FUNCTION pg_stat_statements_reset()
 RETURNS void
diff --git a/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql b/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql
index 9dda85cbdfc38..e84a3cbafc2c7 100644
--- a/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql
+++ b/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_stat_statements" to load this file. \quit
+
 ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements_reset();
 ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements();
 ALTER EXTENSION pg_stat_statements ADD view pg_stat_statements;
diff --git a/contrib/pg_trgm/pg_trgm--1.0.sql b/contrib/pg_trgm/pg_trgm--1.0.sql
index d9cdd23d85f1f..8067bd60339a2 100644
--- a/contrib/pg_trgm/pg_trgm--1.0.sql
+++ b/contrib/pg_trgm/pg_trgm--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pg_trgm/pg_trgm--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_trgm" to load this file. \quit
+
 CREATE FUNCTION set_limit(float4)
 RETURNS float4
 AS 'MODULE_PATHNAME'
diff --git a/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql b/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql
index 0e1c63f0752d7..7243a6a410f93 100644
--- a/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql
+++ b/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pg_trgm" to load this file. \quit
+
 ALTER EXTENSION pg_trgm ADD function set_limit(real);
 ALTER EXTENSION pg_trgm ADD function show_limit();
 ALTER EXTENSION pg_trgm ADD function show_trgm(text);
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index fdec6e34af166..419628c3a448d 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -16,8 +16,11 @@ static void check_old_cluster_has_new_cluster_dbs(void);
 static void check_locale_and_encoding(ControlData *oldctrl,
 						  ControlData *newctrl);
 static void check_is_super_user(ClusterInfo *cluster);
+static void check_for_prepared_transactions(ClusterInfo *cluster);
 static void check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster);
 static void check_for_reg_data_type_usage(ClusterInfo *cluster);
+static void check_for_support_lib(ClusterInfo *cluster);
+static void get_bin_version(ClusterInfo *cluster);
 
 
 void
@@ -29,7 +32,7 @@ output_check_banner(bool *live_check)
 		if (old_cluster.port == new_cluster.port)
 			pg_log(PG_FATAL, "When checking a live server, "
 				   "the old and new port numbers must be different.\n");
-		pg_log(PG_REPORT, "PerForming Consistency Checks on Old Live Server\n");
+		pg_log(PG_REPORT, "Performing Consistency Checks on Old Live Server\n");
 		pg_log(PG_REPORT, "------------------------------------------------\n");
 	}
 	else
@@ -65,6 +68,7 @@ check_old_cluster(bool live_check,
 	 * Check for various failure cases
 	 */
 	check_is_super_user(&old_cluster);
+	check_for_prepared_transactions(&old_cluster);
 	check_for_reg_data_type_usage(&old_cluster);
 	check_for_isn_and_int8_passing_mismatch(&old_cluster);
 
@@ -73,6 +77,7 @@ check_old_cluster(bool live_check,
 	{
 		old_8_3_check_for_name_data_type_usage(&old_cluster);
 		old_8_3_check_for_tsquery_usage(&old_cluster);
+		old_8_3_check_ltree_usage(&old_cluster);
 		if (user_opts.check)
 		{
 			old_8_3_rebuild_tsvector_tables(&old_cluster, true);
@@ -117,6 +122,7 @@ check_new_cluster(void)
 	get_db_and_rel_infos(&new_cluster);
 
 	check_new_cluster_is_empty();
+	check_for_prepared_transactions(&new_cluster);
 	check_old_cluster_has_new_cluster_dbs();
 
 	check_loadable_libraries();
@@ -213,6 +219,8 @@ output_completion_banner(char *deletion_script_file_name)
 void
 check_cluster_versions(void)
 {
+	prep_status("Checking cluster versions");
+
 	/* get old and new cluster versions */
 	old_cluster.major_version = get_major_server_version(&old_cluster);
 	new_cluster.major_version = get_major_server_version(&new_cluster);
@@ -232,31 +240,33 @@ check_cluster_versions(void)
 
 	/*
 	 * We can't allow downgrading because we use the target pg_dumpall, and
-	 * pg_dumpall cannot operate on new datbase versions, only older versions.
+	 * pg_dumpall cannot operate on new database versions, only older versions.
 	 */
 	if (old_cluster.major_version > new_cluster.major_version)
 		pg_log(PG_FATAL, "This utility cannot be used to downgrade to older major PostgreSQL versions.\n");
+
+	/* get old and new binary versions */
+	get_bin_version(&old_cluster);
+	get_bin_version(&new_cluster);
+
+	/* Ensure binaries match the designated data directories */
+	if (GET_MAJOR_VERSION(old_cluster.major_version) !=
+		GET_MAJOR_VERSION(old_cluster.bin_version))
+		pg_log(PG_FATAL,
+			   "Old cluster data and binary directories are from different major versions.\n");
+	if (GET_MAJOR_VERSION(new_cluster.major_version) !=
+		GET_MAJOR_VERSION(new_cluster.bin_version))
+		pg_log(PG_FATAL,
+			   "New cluster data and binary directories are from different major versions.\n");
+
+	check_ok();
 }
 
 
 void
 check_cluster_compatibility(bool live_check)
 {
-	char		libfile[MAXPGPATH];
-	FILE	   *lib_test;
-
-	/*
-	 * Test pg_upgrade_support.so is in the proper place.	 We cannot copy it
-	 * ourselves because install directories are typically root-owned.
-	 */
-	snprintf(libfile, sizeof(libfile), "%s/pg_upgrade_support%s", new_cluster.libpath,
-			 DLSUFFIX);
-
-	if ((lib_test = fopen(libfile, "r")) == NULL)
-		pg_log(PG_FATAL,
-			   "pg_upgrade_support%s must be created and installed in %s\n", DLSUFFIX, libfile);
-	else
-		fclose(lib_test);
+	check_for_support_lib(&new_cluster);
 
 	/* get/check pg_control data of servers */
 	get_control_data(&old_cluster, live_check);
@@ -506,6 +516,36 @@ check_is_super_user(ClusterInfo *cluster)
 }
 
 
+/*
+ *	check_for_prepared_transactions()
+ *
+ *	Make sure there are no prepared transactions because the storage format
+ *	might have changed.
+ */
+static void
+check_for_prepared_transactions(ClusterInfo *cluster)
+{
+	PGresult   *res;
+	PGconn	   *conn = connectToServer(cluster, "template1");
+
+	prep_status("Checking for prepared transactions");
+
+	res = executeQueryOrDie(conn,
+							"SELECT * "
+							"FROM pg_catalog.pg_prepared_xacts");
+
+	if (PQntuples(res) != 0)
+		pg_log(PG_FATAL, "The %s cluster contains prepared transactions\n",
+			   CLUSTER_NAME(cluster));
+
+	PQclear(res);
+
+	PQfinish(conn);
+
+	check_ok();
+}
+
+
 /*
  *	check_for_isn_and_int8_passing_mismatch()
  *
@@ -697,3 +737,71 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
 	else
 		check_ok();
 }
+
+
+/*
+ * Test pg_upgrade_support.so is in the proper place.	 We cannot copy it
+ * ourselves because install directories are typically root-owned.
+ */
+static void
+check_for_support_lib(ClusterInfo *cluster)
+{
+	char		cmd[MAXPGPATH];
+	char		libdir[MAX_STRING];
+	char		libfile[MAXPGPATH];
+	FILE	   *lib_test;
+	FILE	   *output;
+
+	snprintf(cmd, sizeof(cmd), "\"%s/pg_config\" --pkglibdir", cluster->bindir);
+
+	if ((output = popen(cmd, "r")) == NULL)
+		pg_log(PG_FATAL, "Could not get pkglibdir data: %s\n",
+			   getErrorText(errno));
+
+	fgets(libdir, sizeof(libdir), output);
+
+	pclose(output);
+
+	/* Remove trailing newline */
+	if (strchr(libdir, '\n') != NULL)
+		*strchr(libdir, '\n') = '\0';
+
+	snprintf(libfile, sizeof(libfile), "%s/pg_upgrade_support%s", libdir,
+			 DLSUFFIX);
+
+	if ((lib_test = fopen(libfile, "r")) == NULL)
+		pg_log(PG_FATAL,
+			   "The pg_upgrade_support module must be created and installed in the %s cluster.\n",
+				CLUSTER_NAME(cluster));
+
+	fclose(lib_test);
+}
+
+
+static void
+get_bin_version(ClusterInfo *cluster)
+{
+	char		cmd[MAXPGPATH], cmd_output[MAX_STRING];
+	FILE	   *output;
+	int			pre_dot, post_dot;
+
+	snprintf(cmd, sizeof(cmd), "\"%s/pg_ctl\" --version", cluster->bindir);
+
+	if ((output = popen(cmd, "r")) == NULL)
+		pg_log(PG_FATAL, "Could not get pg_ctl version data: %s\n",
+			   getErrorText(errno));
+
+	fgets(cmd_output, sizeof(cmd_output), output);
+
+	pclose(output);
+
+	/* Remove trailing newline */
+	if (strchr(cmd_output, '\n') != NULL)
+		*strchr(cmd_output, '\n') = '\0';
+
+	if (sscanf(cmd_output, "%*s %*s %d.%d", &pre_dot, &post_dot) != 2)
+		pg_log(PG_FATAL, "could not get version from %s\n", cmd);
+
+	cluster->bin_version = (pre_dot * 100 + post_dot) * 100;
+}
+
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 25ee81f2a0908..8e0db7750ff3d 100644
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -140,8 +140,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 				if (!isascii(*p))
 					pg_log(PG_FATAL,
 						   "The 8.3 cluster's pg_controldata is incapable of outputting ASCII, even\n"
-						   "with LANG=C.  You must upgrade this cluster to a newer version of Postgres\n"
-						   "8.3 to fix this bug.  Postgres 8.3.7 and later are known to work properly.\n");
+						   "with LANG=C.  You must upgrade this cluster to a newer version of PostgreSQL\n"
+						   "8.3 to fix this bug.  PostgreSQL 8.3.7 and later are known to work properly.\n");
 		}
 #endif
 
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index b7d82663ff376..b632584d5c42f 100644
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -16,6 +16,9 @@
 static void check_data_dir(const char *pg_data);
 static void check_bin_dir(ClusterInfo *cluster);
 static void validate_exec(const char *dir, const char *cmdName);
+#ifdef WIN32
+static int win32_check_directory_write_permissions(void);
+#endif
 
 
 /*
@@ -97,17 +100,11 @@ verify_directories(void)
 
 	prep_status("Checking current, bin, and data directories");
 
-	if (access(".", R_OK | W_OK
 #ifndef WIN32
-
-	/*
-	 * Do a directory execute check only on Unix because execute permission on
-	 * NTFS means "can execute scripts", which we don't care about. Also, X_OK
-	 * is not defined in the Windows API.
-	 */
-			   | X_OK
+	if (access(".", R_OK | W_OK | X_OK) != 0)
+#else
+	if (win32_check_directory_write_permissions() != 0)
 #endif
-			   ) != 0)
 		pg_log(PG_FATAL,
 		  "You must have read and write access in the current directory.\n");
 
@@ -119,6 +116,32 @@ verify_directories(void)
 }
 
 
+#ifdef WIN32
+/*
+ * win32_check_directory_write_permissions()
+ *
+ *	access() on WIN32 can't check directory permissions, so we have to
+ *	optionally create, then delete a file to check.
+ *		http://msdn.microsoft.com/en-us/library/1w06ktdy%28v=vs.80%29.aspx
+ */
+static int
+win32_check_directory_write_permissions(void)
+{
+	int fd;
+
+	/*
+	 *	We open a file we would normally create anyway.  We do this even in
+	 *	'check' mode, which isn't ideal, but this is the best we can do.
+	 */	
+	if ((fd = open(GLOBALS_DUMP_FILE, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) < 0)
+		return -1;
+	close(fd);
+
+	return unlink(GLOBALS_DUMP_FILE);
+}
+#endif
+
+
 /*
  * check_data_dir()
  *
@@ -145,7 +168,9 @@ check_data_dir(const char *pg_data)
 	{
 		struct stat statBuf;
 
-		snprintf(subDirName, sizeof(subDirName), "%s/%s", pg_data,
+		snprintf(subDirName, sizeof(subDirName), "%s%s%s", pg_data,
+			/* Win32 can't stat() a directory with a trailing slash. */
+				 *requiredSubdirs[subdirnum] ? "/" : "",
 				 requiredSubdirs[subdirnum]);
 
 		if (stat(subDirName, &statBuf) != 0)
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index a7e40090e2f3f..8fdc86d7d471d 100644
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -287,14 +287,14 @@ pg_scandir_internal(const char *dirname,
 	size_t		entrysize;
 
 	if ((dirdesc = opendir(dirname)) == NULL)
-		pg_log(PG_FATAL, "could not open directory \"%s\": %m\n", dirname);
+		pg_log(PG_FATAL, "could not open directory \"%s\": %s\n", dirname, getErrorText(errno));
 
 	*namelist = NULL;
 
 	while ((direntry = readdir(dirdesc)) != NULL)
 	{
 		/* Invoke the selector function to see if the direntry matches */
-		if ((*selector) (direntry))
+		if (!selector || (*selector) (direntry))
 		{
 			count++;
 
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index f0cd8e5ede29a..7e177d4571181 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -55,12 +55,15 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
 				   old_db->db_name, old_rel->reloid, new_rel->reloid);
 
 		/*
-		 * In pre-8.4, TOAST table names change during CLUSTER;  in >= 8.4
-		 * TOAST relation names always use heap table oids, hence we cannot
-		 * check relation names when upgrading from pre-8.4.
+		 * TOAST table names initially match the heap pg_class oid.
+		 * In pre-8.4, TOAST table names change during CLUSTER; in pre-9.0,
+		 * TOAST table names change during ALTER TABLE ALTER COLUMN SET TYPE.
+		 * In >= 9.0, TOAST relation names always use heap table oids, hence
+		 * we cannot check relation names when upgrading from pre-9.0.
+		 * Clusters upgraded to 9.0 will get matching TOAST names.
 		 */
 		if (strcmp(old_rel->nspname, new_rel->nspname) != 0 ||
-			((GET_MAJOR_VERSION(old_cluster.major_version) >= 804 ||
+			((GET_MAJOR_VERSION(old_cluster.major_version) >= 900 ||
 			  strcmp(old_rel->nspname, "pg_toast") != 0) &&
 			 strcmp(old_rel->relname, new_rel->relname) != 0))
 			pg_log(PG_FATAL, "Mismatch of relation names: database \"%s\", "
@@ -266,7 +269,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
 			 "  LEFT OUTER JOIN pg_catalog.pg_tablespace t "
 			 "	   ON c.reltablespace = t.oid "
 			 "WHERE relkind IN ('r','t', 'i'%s) AND "
-			 "  ((n.nspname NOT IN ('pg_catalog', 'information_schema', 'binary_upgrade') AND "
+			 /* exclude possible orphaned temp tables */
+			 "  ((n.nspname !~ '^pg_temp_' AND "
+			 "    n.nspname !~ '^pg_toast_temp_' AND "
+			 "    n.nspname NOT IN ('pg_catalog', 'information_schema', 'binary_upgrade') AND "
 			 "	  c.oid >= %u) "
 			 "  OR (n.nspname = 'pg_catalog' AND "
 	"    relname IN ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) "
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index abb74a5bfa44b..735ee6758d131 100644
--- a/contrib/pg_upgrade/option.c
+++ b/contrib/pg_upgrade/option.c
@@ -19,8 +19,6 @@
 static void usage(void);
 static void validateDirectoryOption(char **dirpath,
 				   char *envVarName, char *cmdLineOption, char *description);
-static void get_pkglibdirs(void);
-static char *get_pkglibdir(const char *bindir);
 
 
 UserOpts	user_opts;
@@ -213,8 +211,6 @@ parseCommandLine(int argc, char *argv[])
 							"old cluster data resides");
 	validateDirectoryOption(&new_cluster.pgdata, "NEWDATADIR", "-D",
 							"new cluster data resides");
-
-	get_pkglibdirs();
 }
 
 
@@ -316,44 +312,3 @@ validateDirectoryOption(char **dirpath,
 #endif
 		(*dirpath)[strlen(*dirpath) - 1] = 0;
 }
-
-
-static void
-get_pkglibdirs(void)
-{
-	/*
-	 * we do not need to know the libpath in the old cluster, and might not
-	 * have a working pg_config to ask for it anyway.
-	 */
-	old_cluster.libpath = NULL;
-	new_cluster.libpath = get_pkglibdir(new_cluster.bindir);
-}
-
-
-static char *
-get_pkglibdir(const char *bindir)
-{
-	char		cmd[MAXPGPATH];
-	char		bufin[MAX_STRING];
-	FILE	   *output;
-	int			i;
-
-	snprintf(cmd, sizeof(cmd), "\"%s/pg_config\" --pkglibdir", bindir);
-
-	if ((output = popen(cmd, "r")) == NULL)
-		pg_log(PG_FATAL, "Could not get pkglibdir data: %s\n",
-			   getErrorText(errno));
-
-	fgets(bufin, sizeof(bufin), output);
-
-	if (output)
-		pclose(output);
-
-	/* Remove trailing newline */
-	i = strlen(bufin) - 1;
-
-	if (bufin[i] == '\n')
-		bufin[i] = '\0';
-
-	return pg_strdup(bufin);
-}
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index e329dc3efe67c..abd3d5f8a2a12 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -193,8 +193,14 @@ prepare_new_cluster(void)
 	prep_status("Analyzing all rows in the new cluster");
 	exec_prog(true,
 			  SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
-			  "--all --analyze >> %s 2>&1" SYSTEMQUOTE,
-	  new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename);
+			  "--all --analyze >> \"%s\" 2>&1" SYSTEMQUOTE,
+	  new_cluster.bindir, new_cluster.port, os_info.user,
+#ifndef WIN32
+	  log_opts.filename
+#else
+	  DEVNULL
+#endif
+	  );
 	check_ok();
 
 	/*
@@ -206,8 +212,14 @@ prepare_new_cluster(void)
 	prep_status("Freezing all rows on the new cluster");
 	exec_prog(true,
 			  SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" "
-			  "--all --freeze >> %s 2>&1" SYSTEMQUOTE,
-	  new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename);
+			  "--all --freeze >> \"%s\" 2>&1" SYSTEMQUOTE,
+	  new_cluster.bindir, new_cluster.port, os_info.user,
+#ifndef WIN32
+	  log_opts.filename
+#else
+	  DEVNULL
+#endif
+	  );
 	check_ok();
 
 	get_pg_database_relfilenode(&new_cluster);
@@ -245,7 +257,13 @@ prepare_new_databases(void)
 			  "--no-psqlrc --port %d --username \"%s\" "
 			  "-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
 			  new_cluster.bindir, new_cluster.port, os_info.user, os_info.cwd,
-			  GLOBALS_DUMP_FILE, log_opts.filename);
+			  GLOBALS_DUMP_FILE,
+#ifndef WIN32
+			  log_opts.filename
+#else
+			  DEVNULL
+#endif
+			  );
 	check_ok();
 
 	/* we load this to get a current list of databases */
@@ -276,7 +294,13 @@ create_new_objects(void)
 			  "--no-psqlrc --port %d --username \"%s\" "
 			  "-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
 			  new_cluster.bindir, new_cluster.port, os_info.user, os_info.cwd,
-			  DB_DUMP_FILE, log_opts.filename);
+			  DB_DUMP_FILE,
+#ifndef WIN32
+			  log_opts.filename
+#else
+			  DEVNULL
+#endif
+			  );
 	check_ok();
 
 	/* regenerate now that we have objects in the databases */
@@ -324,7 +348,13 @@ copy_clog_xlog_xid(void)
 	exec_prog(true, SYSTEMQUOTE "\"%s/pg_resetxlog\" -l %u,%u,%u \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE,
 			  new_cluster.bindir, old_cluster.controldata.chkpnt_tli,
 			old_cluster.controldata.logid, old_cluster.controldata.nxtlogseg,
-			  new_cluster.pgdata, log_opts.filename);
+			  new_cluster.pgdata,
+#ifndef WIN32
+			  log_opts.filename
+#else
+			  DEVNULL
+#endif
+			  );
 	check_ok();
 }
 
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index a3a0856309108..898541b770b68 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -184,8 +184,8 @@ typedef struct
 	unsigned short port;		/* port number where postmaster is waiting */
 	uint32		major_version;	/* PG_VERSION of cluster */
 	char		major_version_str[64];	/* string PG_VERSION of cluster */
+	uint32		bin_version;	/* version returned from pg_ctl */
 	Oid			pg_database_oid;	/* OID of pg_database relation */
-	char	   *libpath;		/* pathname for cluster's pkglibdir */
 	char	   *tablespace_suffix;		/* directory specification */
 } ClusterInfo;
 
@@ -390,6 +390,7 @@ void new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster,
 
 void		old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster);
 void		old_8_3_check_for_tsquery_usage(ClusterInfo *cluster);
+void		old_8_3_check_ltree_usage(ClusterInfo *cluster);
 void		old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode);
 void		old_8_3_invalidate_hash_gin_indexes(ClusterInfo *cluster, bool check_mode);
 void old_8_3_invalidate_bpchar_pattern_ops_indexes(ClusterInfo *cluster,
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index 58c1234a9482e..e86540b9d7986 100644
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -184,7 +184,7 @@ start_postmaster(ClusterInfo *cluster)
 			 (cluster->controldata.cat_ver >=
 			  BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? "-b" :
 			 "-c autovacuum=off -c autovacuum_freeze_max_age=2000000000",
-			 log_opts.filename);
+			 output_filename);
 
 	/*
 	 * Don't throw an error right away, let connecting throw the error because
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
index 1a31f8d683509..ffb79adc91a12 100644
--- a/contrib/pg_upgrade/version_old_8_3.c
+++ b/contrib/pg_upgrade/version_old_8_3.c
@@ -59,8 +59,10 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
-						 "		n.nspname != 'information_schema'");
+								 /* exclude possible orphaned temp tables */
+								"  		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_toast_temp_' AND "
+						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
@@ -149,8 +151,10 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
-						 "		n.nspname != 'information_schema'");
+								 /* exclude possible orphaned temp tables */
+								"  		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_toast_temp_' AND "
+						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
@@ -197,6 +201,87 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
 }
 
 
+/*
+ *	old_8_3_check_ltree_usage()
+ *	8.3 -> 8.4
+ *	The internal ltree structure was changed in 8.4 so upgrading is impossible.
+ */
+void
+old_8_3_check_ltree_usage(ClusterInfo *cluster)
+{
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status("Checking for contrib/ltree");
+
+	snprintf(output_path, sizeof(output_path), "%s/contrib_ltree.txt",
+			 os_info.cwd);
+
+	for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_proname;
+		DbInfo	   *active_db = &cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(cluster, active_db->db_name);
+
+		/* Find any functions coming from contrib/ltree */
+		res = executeQueryOrDie(conn,
+								"SELECT n.nspname, p.proname "
+								"FROM	pg_catalog.pg_proc p, "
+								"		pg_catalog.pg_namespace n "
+								"WHERE	p.pronamespace = n.oid AND "
+								"		p.probin = '$libdir/ltree'");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_proname = PQfnumber(res, "proname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (script == NULL && (script = fopen(output_path, "w")) == NULL)
+				pg_log(PG_FATAL, "Could not open file \"%s\": %s\n",
+					   output_path, getErrorText(errno));
+			if (!db_used)
+			{
+				fprintf(script, "Database: %s\n", active_db->db_name);
+				db_used = true;
+			}
+			fprintf(script, "  %s.%s\n",
+					PQgetvalue(res, rowno, i_nspname),
+					PQgetvalue(res, rowno, i_proname));
+		}
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+
+	if (script)
+		fclose(script);
+
+	if (found)
+	{
+		pg_log(PG_REPORT, "fatal\n");
+		pg_log(PG_FATAL,
+			   "Your installation contains the \"ltree\" data type.  This data type\n"
+			   "changed its internal storage format between your old and new clusters so this\n"
+			   "cluster cannot currently be upgraded.  You can manually upgrade databases\n"
+			   "that use \"contrib/ltree\" facilities and remove \"contrib/ltree\" from the old\n"
+			   "cluster and restart the upgrade.  A list of the problem functions is in the\n"
+			   "file:\n"
+			   "    %s\n\n", output_path);
+	}
+	else
+		check_ok();
+}
+
+
 /*
  * old_8_3_rebuild_tsvector_tables()
  *	8.3 -> 8.4
@@ -247,8 +332,10 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
 								"		NOT a.attisdropped AND "
 								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
-						 "		n.nspname != 'information_schema'");
+								 /* exclude possible orphaned temp tables */
+								"  		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_toast_temp_' AND "
+						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 /*
  *	This macro is used below to avoid reindexing indexes already rebuilt
@@ -265,7 +352,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
 								"		NOT a.attisdropped AND "		\
 								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " \
 								"		c.relnamespace = n.oid AND "	\
-								"		n.nspname != 'pg_catalog' AND " \
+								"       n.nspname !~ '^pg_' AND "		\
 								"		n.nspname != 'information_schema') "
 
 		ntups = PQntuples(res);
@@ -631,8 +718,10 @@ old_8_3_create_sequence_script(ClusterInfo *cluster)
 								"		pg_catalog.pg_namespace n "
 								"WHERE	c.relkind = 'S' AND "
 								"		c.relnamespace = n.oid AND "
-							  "		n.nspname != 'pg_catalog' AND "
-						 "		n.nspname != 'information_schema'");
+								 /* exclude possible orphaned temp tables */
+								"  		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_toast_temp_' AND "
+						 		"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
 		i_nspname = PQfnumber(res, "nspname");
diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c
index a7b7e758ff5e6..eebf1877cfd86 100644
--- a/contrib/pgcrypto/crypt-blowfish.c
+++ b/contrib/pgcrypto/crypt-blowfish.c
@@ -5,8 +5,8 @@
  * and crypt(3) interfaces added, but optimizations specific to password
  * cracking removed.
  *
- * Written by Solar Designer <solar@openwall.com> in 1998-2001, and placed
- * in the public domain.
+ * Written by Solar Designer <solar at openwall.com> in 1998-2002 and
+ * placed in the public domain.
  *
  * There's absolutely no warranty.
  *
@@ -19,9 +19,9 @@
  * of your choice.
  *
  * This implementation is compatible with OpenBSD bcrypt.c (version 2a)
- * by Niels Provos <provos@physnet.uni-hamburg.de>, and uses some of his
- * ideas. The password hashing algorithm was designed by David Mazieres
- * <dm@lcs.mit.edu>.
+ * by Niels Provos <provos at citi.umich.edu>, and uses some of his
+ * ideas.  The password hashing algorithm was designed by David Mazieres
+ * <dm at lcs.mit.edu>.
  *
  * There's a paper on the algorithm that explains its design decisions:
  *
@@ -40,7 +40,7 @@
 #ifdef __i386__
 #define BF_ASM				0	/* 1 */
 #define BF_SCALE			1
-#elif defined(__alpha__)
+#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
 #define BF_ASM				0
 #define BF_SCALE			1
 #else
@@ -49,6 +49,7 @@
 #endif
 
 typedef unsigned int BF_word;
+typedef signed int BF_word_signed;
 
 /* Number of Blowfish rounds, this is also hardcoded into a few places */
 #define BF_N				16
@@ -544,7 +545,8 @@ extern void _BF_body_r(BF_ctx *ctx);
 #endif
 
 static void
-BF_set_key(const char *key, BF_key expanded, BF_key initial)
+BF_set_key(const char *key, BF_key expanded, BF_key initial,
+		   int sign_extension_bug)
 {
 	const char *ptr = key;
 	int			i,
@@ -557,7 +559,10 @@ BF_set_key(const char *key, BF_key expanded, BF_key initial)
 		for (j = 0; j < 4; j++)
 		{
 			tmp <<= 8;
-			tmp |= *ptr;
+			if (sign_extension_bug)
+				tmp |= (BF_word_signed) (signed char) *ptr;
+			else
+				tmp |= (unsigned char) *ptr;
 
 			if (!*ptr)
 				ptr = key;
@@ -599,10 +604,11 @@ _crypt_blowfish_rn(const char *key, const char *setting,
 
 	if (setting[0] != '$' ||
 		setting[1] != '2' ||
-		setting[2] != 'a' ||
+		(setting[2] != 'a' && setting[2] != 'x') ||
 		setting[3] != '$' ||
 		setting[4] < '0' || setting[4] > '3' ||
 		setting[5] < '0' || setting[5] > '9' ||
+		(setting[4] == '3' && setting[5] > '1') ||
 		setting[6] != '$')
 	{
 		return NULL;
@@ -616,7 +622,7 @@ _crypt_blowfish_rn(const char *key, const char *setting,
 	}
 	BF_swap(data.binary.salt, 4);
 
-	BF_set_key(key, data.expanded_key, data.ctx.P);
+	BF_set_key(key, data.expanded_key, data.ctx.P, setting[2] == 'x');
 
 	memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
 
diff --git a/contrib/pgcrypto/pgcrypto--1.0.sql b/contrib/pgcrypto/pgcrypto--1.0.sql
index 52be0950ce639..d95a51bc40677 100644
--- a/contrib/pgcrypto/pgcrypto--1.0.sql
+++ b/contrib/pgcrypto/pgcrypto--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pgcrypto/pgcrypto--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pgcrypto" to load this file. \quit
+
 CREATE FUNCTION digest(text, text)
 RETURNS bytea
 AS 'MODULE_PATHNAME', 'pg_digest'
diff --git a/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql b/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql
index 64f0cdf23ac41..fe8d4c4e72ce9 100644
--- a/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql
+++ b/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pgcrypto" to load this file. \quit
+
 ALTER EXTENSION pgcrypto ADD function digest(text,text);
 ALTER EXTENSION pgcrypto ADD function digest(bytea,text);
 ALTER EXTENSION pgcrypto ADD function hmac(text,text,text);
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c
index ab12e2a6e7294..d2e1682e15947 100644
--- a/contrib/pgcrypto/px-crypt.c
+++ b/contrib/pgcrypto/px-crypt.c
@@ -79,6 +79,7 @@ struct px_crypt_algo
 static const struct px_crypt_algo
 			px_crypt_list[] = {
 	{"$2a$", 4, run_crypt_bf},
+	{"$2x$", 4, run_crypt_bf},
 	{"$2$", 3, NULL},			/* N/A */
 	{"$1$", 3, run_crypt_md5},
 	{"_", 1, run_crypt_des},
diff --git a/contrib/pgrowlocks/pgrowlocks--1.0.sql b/contrib/pgrowlocks/pgrowlocks--1.0.sql
index 0b60fdcd07f60..a909b7430d8ff 100644
--- a/contrib/pgrowlocks/pgrowlocks--1.0.sql
+++ b/contrib/pgrowlocks/pgrowlocks--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pgrowlocks/pgrowlocks--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pgrowlocks" to load this file. \quit
+
 CREATE FUNCTION pgrowlocks(IN relname text,
     OUT locked_row TID,		-- row TID
     OUT lock_type TEXT,		-- lock type
diff --git a/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql b/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql
index 2d9d1eed41a98..b8c3faf1c7678 100644
--- a/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql
+++ b/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql
@@ -1,3 +1,6 @@
 /* contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pgrowlocks" to load this file. \quit
+
 ALTER EXTENSION pgrowlocks ADD function pgrowlocks(text);
diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index fd2cc9246bcc5..ceabd862a86ea 100644
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -155,6 +155,8 @@ pgstatindex(PG_FUNCTION_ARGS)
 		Page		page;
 		BTPageOpaque opaque;
 
+		CHECK_FOR_INTERRUPTS();
+
 		/* Read and lock buffer */
 		buffer = ReadBuffer(rel, blkno);
 		LockBuffer(buffer, BUFFER_LOCK_SHARE);
@@ -234,9 +236,17 @@ pgstatindex(PG_FUNCTION_ARGS)
 		values[j] = palloc(32);
 		snprintf(values[j++], 32, INT64_FORMAT, indexStat.deleted_pages);
 		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%.2f", 100.0 - (double) indexStat.free_space / (double) indexStat.max_avail * 100.0);
+		if (indexStat.max_avail > 0)
+			snprintf(values[j++], 32, "%.2f",
+					 100.0 - (double) indexStat.free_space / (double) indexStat.max_avail * 100.0);
+		else
+			snprintf(values[j++], 32, "NaN");
 		values[j] = palloc(32);
-		snprintf(values[j++], 32, "%.2f", (double) indexStat.fragments / (double) indexStat.leaf_pages * 100.0);
+		if (indexStat.leaf_pages > 0)
+			snprintf(values[j++], 32, "%.2f",
+					 (double) indexStat.fragments / (double) indexStat.leaf_pages * 100.0);
+		else
+			snprintf(values[j++], 32, "NaN");
 
 		tuple = BuildTupleFromCStrings(TupleDescGetAttInMetadata(tupleDesc),
 									   values);
diff --git a/contrib/pgstattuple/pgstattuple--1.0.sql b/contrib/pgstattuple/pgstattuple--1.0.sql
index 83445ec4aee6e..f7e03083ad7e9 100644
--- a/contrib/pgstattuple/pgstattuple--1.0.sql
+++ b/contrib/pgstattuple/pgstattuple--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pgstattuple/pgstattuple--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pgstattuple" to load this file. \quit
+
 CREATE FUNCTION pgstattuple(IN relname text,
     OUT table_len BIGINT,		-- physical table length in bytes
     OUT tuple_count BIGINT,		-- number of live tuples
diff --git a/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql b/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql
index 3cfb8db534750..14b63cafcf5fe 100644
--- a/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql
+++ b/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pgstattuple" to load this file. \quit
+
 ALTER EXTENSION pgstattuple ADD function pgstattuple(text);
 ALTER EXTENSION pgstattuple ADD function pgstattuple(oid);
 ALTER EXTENSION pgstattuple ADD function pgstatindex(text);
diff --git a/contrib/seg/seg--1.0.sql b/contrib/seg/seg--1.0.sql
index 563411da6a0e1..3230b94f4090e 100644
--- a/contrib/seg/seg--1.0.sql
+++ b/contrib/seg/seg--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/seg/seg--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION seg" to load this file. \quit
+
 -- Create the user-defined type for 1-D floating point intervals (seg)
 
 CREATE FUNCTION seg_in(cstring)
diff --git a/contrib/seg/seg--unpackaged--1.0.sql b/contrib/seg/seg--unpackaged--1.0.sql
index 9fefbfc9aa4ef..ebd6b3bc5b53c 100644
--- a/contrib/seg/seg--unpackaged--1.0.sql
+++ b/contrib/seg/seg--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/seg/seg--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION seg" to load this file. \quit
+
 ALTER EXTENSION seg ADD type seg;
 ALTER EXTENSION seg ADD function seg_in(cstring);
 ALTER EXTENSION seg ADD function seg_out(seg);
diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile
index bc995dd29a2ad..c3ed2f5c1e8d0 100644
--- a/contrib/sepgsql/Makefile
+++ b/contrib/sepgsql/Makefile
@@ -4,8 +4,10 @@ MODULE_big = sepgsql
 OBJS = hooks.o selinux.o label.o dml.o \
 	schema.o relation.o proc.o
 DATA_built = sepgsql.sql
-REGRESS = label dml misc
-EXTRA_CLEAN = -r tmp *.pp sepgsql-regtest.if sepgsql-regtest.fc
+
+# Note: because we don't tell the Makefile there are any regression tests,
+# we have to clean those result files explicitly
+EXTRA_CLEAN = -r $(pg_regress_clean_files) tmp/ *.pp sepgsql-regtest.if sepgsql-regtest.fc
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -18,5 +20,4 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-SHLIB_LINK += $(filter -lselinux, $(LIBS))
-REGRESS_OPTS += --launcher $(top_builddir)/contrib/sepgsql/launcher
+SHLIB_LINK += -lselinux
diff --git a/contrib/sepgsql/sepgsql-regtest.te b/contrib/sepgsql/sepgsql-regtest.te
index 3b1def75a5208..a8fe2476a4fb3 100644
--- a/contrib/sepgsql/sepgsql-regtest.te
+++ b/contrib/sepgsql/sepgsql-regtest.te
@@ -1,4 +1,4 @@
-policy_module(sepgsql-regtest, 1.02)
+policy_module(sepgsql-regtest, 1.03)
 
 gen_require(`
 	all_userspace_class_perms
@@ -24,6 +24,7 @@ postgresql_procedure_object(sepgsql_regtest_trusted_proc_exec_t)
 role sepgsql_regtest_dba_r;
 userdom_base_user_template(sepgsql_regtest_dba)
 userdom_manage_home_role(sepgsql_regtest_dba_r, sepgsql_regtest_dba_t)
+userdom_exec_user_home_content_files(sepgsql_regtest_dba_t)
 userdom_write_user_tmp_sockets(sepgsql_regtest_user_t)
 optional_policy(`
 	postgresql_admin(sepgsql_regtest_dba_t, sepgsql_regtest_dba_r)
@@ -40,6 +41,7 @@ optional_policy(`
 role sepgsql_regtest_user_r;
 userdom_base_user_template(sepgsql_regtest_user)
 userdom_manage_home_role(sepgsql_regtest_user_r, sepgsql_regtest_user_t)
+userdom_exec_user_home_content_files(sepgsql_regtest_user_t)
 userdom_write_user_tmp_sockets(sepgsql_regtest_user_t)
 optional_policy(`
 	postgresql_role(sepgsql_regtest_user_r, sepgsql_regtest_user_t)
diff --git a/contrib/sepgsql/test_sepgsql b/contrib/sepgsql/test_sepgsql
new file mode 100755
index 0000000000000..9b7262ae82aef
--- /dev/null
+++ b/contrib/sepgsql/test_sepgsql
@@ -0,0 +1,264 @@
+#!/bin/sh
+#
+# Run the sepgsql regression tests, after making a lot of environmental checks
+# to try to ensure that the SELinux environment is set up appropriately and
+# the database is configured correctly.
+#
+# Note that this must be run against an installed Postgres database.
+# There's no equivalent of "make check", and that wouldn't be terribly useful
+# since much of the value is in checking that you installed sepgsql into
+# your database correctly.
+#
+# This must be run in the contrib/sepgsql directory of a Postgres build tree.
+#
+
+PG_BINDIR=`pg_config --bindir`
+
+echo
+echo "============== checking selinux environment           =============="
+
+# matchpathcon must be present to assess whether the installation environment
+# is OK.
+echo -n "checking for matchpathcon           ... "
+if ! matchpathcon -n . >/dev/null 2>&1; then
+    echo "not found"
+    echo ""
+    echo "The matchpathcon command must be available."
+    echo "Please install it or update your PATH to include it"
+    echo "(it is typically in '/usr/sbin', which might not be in your PATH)."
+    echo "matchpathcon is typically included in the libselinux-utils package."
+    exit 1
+fi
+echo "ok"
+
+# runcon must be present to launch psql using the correct environment
+echo -n "checking for runcon                 ... "
+if ! runcon --help >/dev/null 2>&1; then
+    echo "not found"
+    echo ""
+    echo "The runcon command must be available."
+    echo "runcon is typically included in the coreutils package."
+    echo ""
+    exit 1
+fi
+echo "ok"
+
+# check sestatus too, since that lives in yet another package
+echo -n "checking for sestatus               ... "
+if ! sestatus >/dev/null 2>&1; then
+    echo "not found"
+    echo ""
+    echo "The sestatus command must be available."
+    echo "sestatus is typically included in the policycoreutils package."
+    echo ""
+    exit 1
+fi
+echo "ok"
+
+# check that the user is running in the unconfined_t domain
+echo -n "checking current user domain        ... "
+DOMAIN=`id -Z 2>/dev/null | sed 's/:/ /g' | awk '{print $3}'`
+echo ${DOMAIN:-failed}
+if [ "${DOMAIN}" != unconfined_t ]; then
+    echo ""
+    echo "The regression tests must be launched from the unconfined_t domain."
+    echo ""
+    echo "The unconfined_t domain is typically the default domain for user"
+    echo "shell processes.  If the default has been changed on your system,"
+    echo "you can revert the changes like this:"
+    echo ""
+    echo "  \$ sudo semanage login -d `whoami`"
+    echo ""
+    echo "Or, you can add a setting to log in using the unconfined_t domain:"
+    echo ""
+    echo "  \$ sudo semanage login -a -s unconfined_u -r s0-s0:c0.c255 `whoami`"
+    echo ""
+    exit 1
+fi
+
+# SELinux must be configured in enforcing mode
+echo -n "checking selinux operating mode     ... "
+CURRENT_MODE=`LANG=C sestatus | grep '^Current mode:' | awk '{print $3}'`
+echo ${CURRENT_MODE:-failed}
+if [ "${CURRENT_MODE}" = enforcing ]; then
+    : OK
+elif [ "${CURRENT_MODE}" = permissive -o "${CURRENT_MODE}" = disabled ]; then
+    echo ""
+    echo "Before running the regression tests, SELinux must be enabled and"
+    echo "must be running in enforcing mode."
+    echo ""
+    echo "If SELinux is currently running in permissive mode, you can"
+    echo "switch to enforcing mode using the 'setenforce' command."
+    echo
+    echo "  \$ sudo setenforce 1"
+    echo ""
+    echo "The system default setting is configured in /etc/selinux/config,"
+    echo "or using a kernel boot parameter."
+    echo ""
+    exit 1
+else
+    echo ""
+    echo "Unable to determine the current selinux operating mode.  Please"
+    echo "verify that the sestatus command is installed and in your PATH."
+    echo ""
+    exit 1
+fi
+
+# 'sepgsql-regtest' policy module must be loaded
+echo -n "checking for sepgsql-regtest policy ... "
+SELINUX_MNT=`LANG=C sestatus | grep '^SELinuxfs mount:' | awk '{print $3}'`
+if [ "$SELINUX_MNT" = "" ]; then
+    echo "failed"
+    echo ""
+    echo "Unable to find SELinuxfs mount point."
+    echo ""
+    echo "The sestatus command should report the location where SELinuxfs"
+    echo "is mounted, but did not do so."
+    echo ""
+    exit 1
+fi
+if [ ! -e "${SELINUX_MNT}/booleans/sepgsql_regression_test_mode" ]; then
+    echo "failed"
+    echo ""
+    echo "The 'sepgsql-regtest' policy module appears not to be installed."
+    echo "Without this policy installed, the regression tests will fail."
+    echo "You can install this module using the following commands:"
+    echo ""
+    echo "  \$ make -f /usr/share/selinux/devel/Makefile"
+    echo "  \$ sudo semodule -u sepgsql-regtest.pp"
+    echo ""
+    echo "To confirm that the policy package is installed, use this command:"
+    echo ""
+    echo "  \$ sudo semodule -l | grep sepgsql"
+    echo ""
+    exit 1
+fi
+echo "ok"
+
+# Verify that sepgsql_regression_test_mode is active.
+echo -n "checking whether policy is enabled  ... "
+POLICY_STATUS=`getsebool sepgsql_regression_test_mode | awk '{print $3}'`
+echo ${POLICY_STATUS:-failed}
+if [ "${POLICY_STATUS}" != on ]; then
+    echo ""
+    echo "The SELinux boolean 'sepgsql_regression_test_mode' must be"
+    echo "turned on in order to enable the rules necessary to run the"
+    echo "regression tests."
+    echo ""
+    if [ "${POLICY_STATUS}" = "" ]; then
+        echo "We attempted to determine the state of this Boolean using"
+        echo "'getsebool', but that command did not produce the expected"
+        echo "output.  Please verify that getsebool is available and in"
+        echo "your PATH."
+    else
+        echo "You can turn on this variable using the following commands:"
+        echo ""
+        echo "  \$ sudo setsebool sepgsql_regression_test_mode on"
+        echo ""
+        echo "For security reasons, it is suggested that you turn off this"
+        echo "variable when regression testing is complete and the associated"
+        echo "rules are no longer needed."
+    fi
+    echo ""
+    exit 1
+fi
+
+# 'psql' command must be executable from test domain
+echo -n "checking whether we can run psql    ... "
+CMD_PSQL="${PG_BINDIR}/psql"
+if [ ! -e "${CMD_PSQL}" ]; then
+    echo "not found"
+    echo
+    echo "${CMD_PSQL} was not found."
+    echo "Check your PostgreSQL installation."
+    echo
+    exit 1
+fi
+runcon -t sepgsql_regtest_user_t "${CMD_PSQL}" --help >& /dev/null
+if [ $? -ne 0 ]; then
+    echo "failed"
+    echo
+    echo "${CMD_PSQL} must be executable from the"
+    echo "sepgsql_regtest_user_t domain. That domain has restricted privileges"
+    echo "compared to unconfined_t, so the problem may be the psql file's"
+    echo "SELinux label. Try"
+    echo
+    PSQL_T=`matchpathcon -n "${CMD_PSQL}" | sed 's/:/ /g' | awk '{print $3}'`
+    if [ "${PSQL_T}" = "user_home_t" ]; then
+        # Installation appears to be in /home directory
+        echo "  \$ sudo restorecon -R ${PG_BINDIR}"
+        echo
+        echo "Or, using chcon"
+        echo
+        echo "  \$ sudo chcon -t user_home_t ${CMD_PSQL}"
+    else
+        echo "  \$ sudo restorecon -R ${PG_BINDIR}"
+        echo
+        echo "Or, using chcon"
+        echo
+        echo "  \$ sudo chcon -t bin_t ${CMD_PSQL}"
+    fi
+    echo
+    exit 1
+fi
+echo "ok"
+
+# loadable module must be installed and not configured to permissive mode
+echo -n "checking sepgsql installation       ... "
+VAL="`${CMD_PSQL} -t -c 'SHOW sepgsql.permissive' template1 2>/dev/null`"
+RETVAL="$?"
+if [ $RETVAL -eq 2 ]; then
+    echo "failed"
+    echo ""
+    echo "Could not connect to the database server."
+    echo "Please check your PostgreSQL installation."
+    echo ""
+    exit 1
+elif [ $RETVAL -ne 0 ]; then
+    echo "failed"
+    echo ""
+    echo "The sepgsql module does not appear to be loaded.  Please verify"
+    echo "that the 'shared_preload_libraries' setting in postgresql.conf"
+    echo "includes 'sepgsql', and then restart the server."
+    echo ""
+    echo "See Installation section of the contrib/sepgsql documentation."
+    echo ""
+    exit 1
+elif ! echo "$VAL" | grep -q 'off$'; then
+    echo "failed"
+    echo ""
+    echo "The parameter 'sepgsql.permissive' is set to 'on'.  It must be"
+    echo "turned off before running the regression tests."
+    echo ""
+    exit 1
+fi
+echo "ok"
+
+# template1 database must be labeled
+# NOTE: this test is wrong; we really ought to be checking template0.
+# But we can't connect to that without extra pushups, and it's not worth it.
+echo -n "checking for labels in template1    ... "
+NUM=`${CMD_PSQL} -At -c 'SELECT count(*) FROM pg_catalog.pg_seclabel' template1 2>/dev/null`
+if [ -z "${NUM}" ]; then
+    echo "failed"
+    echo ""
+    echo "In order to test sepgsql, initial labels must be assigned within"
+    echo "the 'template1' database.  These labels will be copied into the"
+    echo "regression test database."
+    echo ""
+    echo "See Installation section of the contrib/sepgsql documentation."
+    echo ""
+    exit 1
+fi
+echo "found ${NUM}"
+
+#
+# checking complete - let's run the tests
+#
+
+echo
+echo "============== running sepgsql regression tests       =============="
+
+make REGRESS="label dml misc" REGRESS_OPTS="--launcher ./launcher" installcheck
+
+# exit with the exit code provided by "make"
diff --git a/contrib/spi/autoinc--1.0.sql b/contrib/spi/autoinc--1.0.sql
index 9c9df9ce0bdce..22721e003de66 100644
--- a/contrib/spi/autoinc--1.0.sql
+++ b/contrib/spi/autoinc--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/spi/autoinc--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION autoinc" to load this file. \quit
+
 CREATE FUNCTION autoinc()
 RETURNS trigger
 AS 'MODULE_PATHNAME'
diff --git a/contrib/spi/autoinc--unpackaged--1.0.sql b/contrib/spi/autoinc--unpackaged--1.0.sql
index 232e9170fc61e..cfe2065d3d860 100644
--- a/contrib/spi/autoinc--unpackaged--1.0.sql
+++ b/contrib/spi/autoinc--unpackaged--1.0.sql
@@ -1,3 +1,6 @@
 /* contrib/spi/autoinc--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION autoinc" to load this file. \quit
+
 ALTER EXTENSION autoinc ADD function autoinc();
diff --git a/contrib/spi/insert_username--1.0.sql b/contrib/spi/insert_username--1.0.sql
index bd854587e0316..0deb0bf3f8be5 100644
--- a/contrib/spi/insert_username--1.0.sql
+++ b/contrib/spi/insert_username--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/spi/insert_username--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION insert_username" to load this file. \quit
+
 CREATE FUNCTION insert_username()
 RETURNS trigger
 AS 'MODULE_PATHNAME'
diff --git a/contrib/spi/insert_username--unpackaged--1.0.sql b/contrib/spi/insert_username--unpackaged--1.0.sql
index f53cb690f12a5..91a5d1f30958c 100644
--- a/contrib/spi/insert_username--unpackaged--1.0.sql
+++ b/contrib/spi/insert_username--unpackaged--1.0.sql
@@ -1,3 +1,6 @@
 /* contrib/spi/insert_username--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION insert_username" to load this file. \quit
+
 ALTER EXTENSION insert_username ADD function insert_username();
diff --git a/contrib/spi/moddatetime--1.0.sql b/contrib/spi/moddatetime--1.0.sql
index 97cc63289fe97..2ee61b814f361 100644
--- a/contrib/spi/moddatetime--1.0.sql
+++ b/contrib/spi/moddatetime--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/spi/moddatetime--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION moddatetime" to load this file. \quit
+
 CREATE FUNCTION moddatetime()
 RETURNS trigger
 AS 'MODULE_PATHNAME'
diff --git a/contrib/spi/moddatetime--unpackaged--1.0.sql b/contrib/spi/moddatetime--unpackaged--1.0.sql
index f3a0a968371fa..caa49ce0dc90a 100644
--- a/contrib/spi/moddatetime--unpackaged--1.0.sql
+++ b/contrib/spi/moddatetime--unpackaged--1.0.sql
@@ -1,3 +1,6 @@
 /* contrib/spi/moddatetime--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION moddatetime" to load this file. \quit
+
 ALTER EXTENSION moddatetime ADD function moddatetime();
diff --git a/contrib/spi/refint--1.0.sql b/contrib/spi/refint--1.0.sql
index 9e5d931df5ec8..faf797c215767 100644
--- a/contrib/spi/refint--1.0.sql
+++ b/contrib/spi/refint--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/spi/refint--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION refint" to load this file. \quit
+
 CREATE FUNCTION check_primary_key()
 RETURNS trigger
 AS 'MODULE_PATHNAME'
diff --git a/contrib/spi/refint--unpackaged--1.0.sql b/contrib/spi/refint--unpackaged--1.0.sql
index 54fece055a306..cd9c9b0c3656e 100644
--- a/contrib/spi/refint--unpackaged--1.0.sql
+++ b/contrib/spi/refint--unpackaged--1.0.sql
@@ -1,4 +1,7 @@
 /* contrib/spi/refint--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION refint" to load this file. \quit
+
 ALTER EXTENSION refint ADD function check_primary_key();
 ALTER EXTENSION refint ADD function check_foreign_key();
diff --git a/contrib/spi/timetravel--1.0.sql b/contrib/spi/timetravel--1.0.sql
index b68cf2f2475c0..c34ca09965b2f 100644
--- a/contrib/spi/timetravel--1.0.sql
+++ b/contrib/spi/timetravel--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/spi/timetravel--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION timetravel" to load this file. \quit
+
 CREATE FUNCTION timetravel()
 RETURNS trigger
 AS 'MODULE_PATHNAME'
diff --git a/contrib/spi/timetravel--unpackaged--1.0.sql b/contrib/spi/timetravel--unpackaged--1.0.sql
index e3716afe95acd..dd07a133a5004 100644
--- a/contrib/spi/timetravel--unpackaged--1.0.sql
+++ b/contrib/spi/timetravel--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/spi/timetravel--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION timetravel" to load this file. \quit
+
 ALTER EXTENSION timetravel ADD function timetravel();
 ALTER EXTENSION timetravel ADD function set_timetravel(name,integer);
 ALTER EXTENSION timetravel ADD function get_timetravel(name);
diff --git a/contrib/sslinfo/sslinfo--1.0.sql b/contrib/sslinfo/sslinfo--1.0.sql
index ef745a0a2e6c2..79ce656786f9a 100644
--- a/contrib/sslinfo/sslinfo--1.0.sql
+++ b/contrib/sslinfo/sslinfo--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/sslinfo/sslinfo--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION sslinfo" to load this file. \quit
+
 CREATE FUNCTION ssl_client_serial() RETURNS numeric
 AS 'MODULE_PATHNAME', 'ssl_client_serial'
 LANGUAGE C STRICT;
diff --git a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
index befa96e908bae..e4b868423b305 100644
--- a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
+++ b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/sslinfo/sslinfo--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION sslinfo" to load this file. \quit
+
 ALTER EXTENSION sslinfo ADD function ssl_client_serial();
 ALTER EXTENSION sslinfo ADD function ssl_is_used();
 ALTER EXTENSION sslinfo ADD function ssl_client_cert_present();
diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL
index 58e69bc784fd8..e4b56dfb3b4c8 100755
--- a/contrib/start-scripts/osx/PostgreSQL
+++ b/contrib/start-scripts/osx/PostgreSQL
@@ -85,28 +85,28 @@ StartService () {
     if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
         ConsoleMessage "Starting PostgreSQL database server"
         if [ "${ROTATELOGS}" = "1" ]; then
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} &
         else
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1
         fi
     fi
 }
 
 StopService () {
     ConsoleMessage "Stopping PostgreSQL database server"
-    sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast
+    sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast"
 }
 
 RestartService () {
     if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
         ConsoleMessage "Restarting PostgreSQL database server"
 	# should match StopService:
-	sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast
+	sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast"
 	# should match StartService:
         if [ "${ROTATELOGS}" = "1" ]; then
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} &
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} &
         else
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1
+            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1
         fi
     else
         StopService
diff --git a/contrib/tablefunc/tablefunc--1.0.sql b/contrib/tablefunc/tablefunc--1.0.sql
index 7bf117cb5c0fc..8681ff4706629 100644
--- a/contrib/tablefunc/tablefunc--1.0.sql
+++ b/contrib/tablefunc/tablefunc--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/tablefunc/tablefunc--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION tablefunc" to load this file. \quit
+
 CREATE FUNCTION normal_rand(int4, float8, float8)
 RETURNS setof float8
 AS 'MODULE_PATHNAME','normal_rand'
diff --git a/contrib/tablefunc/tablefunc--unpackaged--1.0.sql b/contrib/tablefunc/tablefunc--unpackaged--1.0.sql
index 20e09816e9dd1..e5e9619c52f93 100644
--- a/contrib/tablefunc/tablefunc--unpackaged--1.0.sql
+++ b/contrib/tablefunc/tablefunc--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/tablefunc/tablefunc--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION tablefunc" to load this file. \quit
+
 ALTER EXTENSION tablefunc ADD function normal_rand(integer,double precision,double precision);
 ALTER EXTENSION tablefunc ADD function crosstab(text);
 ALTER EXTENSION tablefunc ADD type tablefunc_crosstab_2;
diff --git a/contrib/test_parser/test_parser--1.0.sql b/contrib/test_parser/test_parser--1.0.sql
index 5b8b04bb05b26..06c94d353be27 100644
--- a/contrib/test_parser/test_parser--1.0.sql
+++ b/contrib/test_parser/test_parser--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/test_parser/test_parser--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION test_parser" to load this file. \quit
+
 CREATE FUNCTION testprs_start(internal, int4)
 RETURNS internal
 AS 'MODULE_PATHNAME'
diff --git a/contrib/test_parser/test_parser--unpackaged--1.0.sql b/contrib/test_parser/test_parser--unpackaged--1.0.sql
index e240ab2b5bb07..34120f2346bc7 100644
--- a/contrib/test_parser/test_parser--unpackaged--1.0.sql
+++ b/contrib/test_parser/test_parser--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/test_parser/test_parser--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION test_parser" to load this file. \quit
+
 ALTER EXTENSION test_parser ADD function testprs_start(internal,integer);
 ALTER EXTENSION test_parser ADD function testprs_getlexeme(internal,internal,internal);
 ALTER EXTENSION test_parser ADD function testprs_end(internal);
diff --git a/contrib/tsearch2/tsearch2--1.0.sql b/contrib/tsearch2/tsearch2--1.0.sql
index 369507e8f5600..4777df8d914a2 100644
--- a/contrib/tsearch2/tsearch2--1.0.sql
+++ b/contrib/tsearch2/tsearch2--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/tsearch2/tsearch2--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION tsearch2" to load this file. \quit
+
 -- These domains are just to catch schema-qualified references to the
 -- old data types.
 CREATE DOMAIN tsvector AS pg_catalog.tsvector;
diff --git a/contrib/tsearch2/tsearch2--unpackaged--1.0.sql b/contrib/tsearch2/tsearch2--unpackaged--1.0.sql
index d04d5aa57e363..af970a4862ff0 100644
--- a/contrib/tsearch2/tsearch2--unpackaged--1.0.sql
+++ b/contrib/tsearch2/tsearch2--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/tsearch2/tsearch2--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION tsearch2" to load this file. \quit
+
 ALTER EXTENSION tsearch2 ADD type @extschema@.tsvector;
 ALTER EXTENSION tsearch2 ADD type @extschema@.tsquery;
 ALTER EXTENSION tsearch2 ADD type @extschema@.gtsvector;
diff --git a/contrib/unaccent/unaccent--1.0.sql b/contrib/unaccent/unaccent--1.0.sql
index b5909e0b556f3..9085ca473fbbd 100644
--- a/contrib/unaccent/unaccent--1.0.sql
+++ b/contrib/unaccent/unaccent--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/unaccent/unaccent--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION unaccent" to load this file. \quit
+
 CREATE FUNCTION unaccent(regdictionary, text)
 	RETURNS text
 	AS 'MODULE_PATHNAME', 'unaccent_dict'
diff --git a/contrib/unaccent/unaccent--unpackaged--1.0.sql b/contrib/unaccent/unaccent--unpackaged--1.0.sql
index eeb9c532f98d5..abd06983ac4ca 100644
--- a/contrib/unaccent/unaccent--unpackaged--1.0.sql
+++ b/contrib/unaccent/unaccent--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/unaccent/unaccent--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION unaccent" to load this file. \quit
+
 ALTER EXTENSION unaccent ADD function unaccent(regdictionary,text);
 ALTER EXTENSION unaccent ADD function unaccent(text);
 ALTER EXTENSION unaccent ADD function unaccent_init(internal);
diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c
index 709f4c4492aee..ea8dd4c8a741a 100644
--- a/contrib/unaccent/unaccent.c
+++ b/contrib/unaccent/unaccent.c
@@ -93,35 +93,83 @@ initSuffixTree(char *filename)
 
 	do
 	{
-		char		src[4096];
-		char		trg[4096];
-		int			srclen;
-		int			trglen;
-		char	   *line = NULL;
-
+		/*
+		 * pg_do_encoding_conversion() (called by tsearch_readline()) will
+		 * emit exception if it finds untranslatable characters in current
+		 * locale. We just skip such lines, continuing with the next.
+		 */
 		skip = true;
 
 		PG_TRY();
 		{
-			/*
-			 * pg_do_encoding_conversion() (called by tsearch_readline()) will
-			 * emit exception if it finds untranslatable characters in current
-			 * locale. We just skip such characters.
-			 */
+			char	   *line;
+
 			while ((line = tsearch_readline(&trst)) != NULL)
 			{
-				if (sscanf(line, "%s\t%s\n", src, trg) != 2)
-					continue;
+				/*
+				 * The format of each line must be "src trg" where src and trg
+				 * are sequences of one or more non-whitespace characters,
+				 * separated by whitespace.  Whitespace at start or end of
+				 * line is ignored.
+				 */
+				int			state;
+				char	   *ptr;
+				char	   *src = NULL;
+				char	   *trg = NULL;
+				int			ptrlen;
+				int			srclen = 0;
+				int			trglen = 0;
+
+				state = 0;
+				for (ptr = line; *ptr; ptr += ptrlen)
+				{
+					ptrlen = pg_mblen(ptr);
+					/* ignore whitespace, but end src or trg */
+					if (t_isspace(ptr))
+					{
+						if (state == 1)
+							state = 2;
+						else if (state == 3)
+							state = 4;
+						continue;
+					}
+					switch (state)
+					{
+						case 0:
+							/* start of src */
+							src = ptr;
+							srclen = ptrlen;
+							state = 1;
+							break;
+						case 1:
+							/* continue src */
+							srclen += ptrlen;
+							break;
+						case 2:
+							/* start of trg */
+							trg = ptr;
+							trglen = ptrlen;
+							state = 3;
+							break;
+						case 3:
+							/* continue trg */
+							trglen += ptrlen;
+							break;
+						default:
+							/* bogus line format */
+							state = -1;
+							break;
+					}
+				}
 
-				srclen = strlen(src);
-				trglen = strlen(trg);
+				if (state >= 3)
+					rootSuffixTree = placeChar(rootSuffixTree,
+											   (unsigned char *) src, srclen,
+											   trg, trglen);
 
-				rootSuffixTree = placeChar(rootSuffixTree,
-										   (unsigned char *) src, srclen,
-										   trg, trglen);
-				skip = false;
 				pfree(line);
 			}
+			skip = false;
 		}
 		PG_CATCH();
 		{
diff --git a/contrib/uuid-ossp/uuid-ossp--1.0.sql b/contrib/uuid-ossp/uuid-ossp--1.0.sql
index 43ae0b38a0bb1..45ada1b23bc30 100644
--- a/contrib/uuid-ossp/uuid-ossp--1.0.sql
+++ b/contrib/uuid-ossp/uuid-ossp--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/uuid-ossp/uuid-ossp--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION uuid-ossp" to load this file. \quit
+
 CREATE FUNCTION uuid_nil()
 RETURNS uuid
 AS 'MODULE_PATHNAME', 'uuid_nil'
diff --git a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
index bc984dd8c09d5..5c0dbfef9c0f5 100644
--- a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
+++ b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION uuid-ossp" to load this file. \quit
+
 ALTER EXTENSION "uuid-ossp" ADD function uuid_nil();
 ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_dns();
 ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_url();
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index ad325723c9917..be3d018cf535a 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -8,7 +8,7 @@ DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
 
 REGRESS = xml2
 
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
+SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/xml2/xml2--1.0.sql b/contrib/xml2/xml2--1.0.sql
index bc27dc89ca5eb..0b6afc63d05f5 100644
--- a/contrib/xml2/xml2--1.0.sql
+++ b/contrib/xml2/xml2--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/xml2/xml2--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION xml2" to load this file. \quit
+
 --SQL for XML parser
 
 -- deprecated old name for xml_is_well_formed
diff --git a/contrib/xml2/xml2--unpackaged--1.0.sql b/contrib/xml2/xml2--unpackaged--1.0.sql
index 1aa894a61927e..b02dabffc2a03 100644
--- a/contrib/xml2/xml2--unpackaged--1.0.sql
+++ b/contrib/xml2/xml2--unpackaged--1.0.sql
@@ -1,5 +1,8 @@
 /* contrib/xml2/xml2--unpackaged--1.0.sql */
 
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION xml2" to load this file. \quit
+
 ALTER EXTENSION xml2 ADD function xslt_process(text,text);
 ALTER EXTENSION xml2 ADD function xslt_process(text,text,text);
 ALTER EXTENSION xml2 ADD function xpath_table(text,text,text,text,text);
diff --git a/doc/README.mb.big5 b/doc/README.mb.big5
deleted file mode 100644
index 529af955911a8..0000000000000
--- a/doc/README.mb.big5
+++ /dev/null
@@ -1,326 +0,0 @@
-PostgreSQL 7.0.1 multi-byte (MB) support README	  May 20 2000
-
-						Tatsuo Ishii
-						ishii@postgresql.org
-		  http://www.sra.co.jp/people/t-ishii/PostgreSQL/
-
-[µù] 1. ·PÁÂ¥Û¤«¹F¤Ò (Tatsuo Ishii) ¥ý¥Í!
-     2. µùÄÀ³¡¥÷­ì¤å©ÒµL, ¤¤Ä¶­Y¦³¿ù»~, ½ÐÁpµ¸ cch@cc.kmu.edu.tw
-
-
-0. ²¤¶
-
-MB ¤ä´©¬O¬°¤FÅý PostgreSQL ¯à³B²z¦h¦ì¤¸²Õ¦r¤¸ (multi-byte character),
-¨Ò¦p: EUC (Extended Unix Code), Unicode (²Î¤@½X) ©M Mule internal code
-(¦h°ê»y¨¥¤º½X). ¦b MB ªº¤ä´©¤U, §A¥i¥H¦b¥¿³Wªí¥Ü¦¡ (regexp), LIKE ¤Î
-¨ä¥L¤@¨Ç¨ç¦¡¤¤¨Ï¥Î¦h¦ì¤¸²Õ¦r¤¸. ¹w³]ªº½s½X¨t²Î¥i¨ú¨M©ó§A¦w¸Ë PostgreSQL
-®Éªº initdb(1) ©R¥O, ¥ç¥i¥Ñ createdb(1) ©R¥O©Î«Ø¥ß¸ê®Æ®wªº SQL ©R¥O¨M©w.
-©Ò¥H§A¥i¥H¦³¦h­Ó¤£¦P½s½X¨t²Îªº¸ê®Æ®w.
-
-MB ¤ä´©¤]¸Ñ¨M¤F¤@¨Ç 8 ¦ì¤¸³æ¦ì¤¸²Õ¦r¤¸¶° (¥]§t ISO-8859-1) ªº¬ÛÃö°ÝÃD,
-(§Ú¨Ã¨S¦³»¡©Ò¦³ªº¬ÛÃö°ÝÃD³£¸Ñ¨M¤F, §Ú¥u¬O½T»{¤F°jÂk´ú¸Õ°õ¦æ¦¨¥\,
-¦Ó¤@¨Çªk»y¦r¤¸¦b MB ­×¸É¤U¥i¥H¨Ï¥Î. ¦pªG§A¦b¨Ï¥Î 8 ¦ì¤¸¦r¤¸®Éµo²{¤F
-¥ô¦ó°ÝÃD, ½Ð³qª¾§Ú)
-
-1. ¦p¦ó¨Ï¥Î
-
-½sĶ PostgreSQL «e, °õ¦æ configure ®É¨Ï¥Î multibyte ªº¿ï¶µ
-
-	% ./configure --enable-multibyte[=encoding_system]
-	% ./configure --enable-multibyte[=½s½X¨t²Î]
-
-¨ä¤¤ªº½s½X¨t²Î¥i¥H«ü©w¬°¤U­±¨ä¤¤¤§¤@:
-
-	SQL_ASCII		ASCII
-	EUC_JP			Japanese EUC
-	EUC_CN			Chinese EUC
-	EUC_KR			Korean EUC
-	EUC_TW			Taiwan EUC
-	UNICODE			Unicode(UTF-8)
-	MULE_INTERNAL		Mule internal
-	LATIN1			ISO 8859-1 English and some European languages
-	LATIN2			ISO 8859-2 English and some European languages
-	LATIN3			ISO 8859-3 English and some European languages
-	LATIN4			ISO 8859-4 English and some European languages
-	LATIN5			ISO 8859-5 English and some European languages
-	KOI8			KOI8-R
-	WIN			Windows CP1251
-	ALT			Windows CP866
-
-¨Ò¦p:
-
-	% ./configure --enable-multibyte=EUC_JP
-
-¦pªG¬Ù²¤«ü©w½s½X¨t²Î, ¨º»ò¹w³]­È´N¬O SQL_ASCII.
-
-2. ¦p¦ó³]©w½s½X
-
-initdb ©R¥O©w¸q PostgresSQL ¦w¸Ë«áªº¹w³]½s½X, ¨Ò¦p:
-
-	% initdb -E EUC_JP
-
-±N¹w³]ªº½s½X³]©w¬° EUC_JP (Extended Unix Code for Japanese), ¦pªG§A³ßÅw
-¸ûªøªº¦r¦ê, §A¤]¥i¥H¥Î "--encoding" ¦Ó¤£¥Î "-E". ¦pªG¨S¦³¨Ï¥Î -E ©Î
---encoding ªº¿ï¶µ, ¨º»ò½sö®Éªº³]©w·|¦¨¬°¹w³]­È.
-
-§A¥i¥H«Ø¥ß¨Ï¥Î¤£¦P½s½Xªº¸ê®Æ®w:
-
-	% createdb -E EUC_KR korean
-
-³o­Ó©R¥O·|«Ø¥ß¤@­Ó¥s°µ "korean" ªº¸ê®Æ®w, ¦Ó¨ä±Ä¥Î EUC_KR ½s½X.
-¥t¥~¦³¤@­Ó¤èªk, ¬O¨Ï¥Î SQL ©R¥O, ¤]¥i¥H¹F¨ì¦P¼Ëªº¥Øªº:
-
-	CREATE DATABASE korean WITH ENCODING = 'EUC_KR';
-
-¦b pg_database ¨t²Î³W®æªí (system catalog) ¤¤¦³¤@­Ó "encoding" ªºÄæ¦ì,
-´N¬O¥Î¨Ó¬ö¿ý¤@­Ó¸ê®Æ®wªº½s½X. §A¥i¥H¥Î psql -l ©Î¶i¤J psql «á¥Î \l ªº
-©R¥O¨Ó¬d¬Ý¸ê®Æ®w±Ä¥Î¦óºØ½s½X:
-
-$ psql -l
-            List of databases
-   Database    |  Owner  |   Encoding    
----------------+---------+---------------
- euc_cn        | t-ishii | EUC_CN
- euc_jp        | t-ishii | EUC_JP
- euc_kr        | t-ishii | EUC_KR
- euc_tw        | t-ishii | EUC_TW
- mule_internal | t-ishii | MULE_INTERNAL
- regression    | t-ishii | SQL_ASCII
- template1     | t-ishii | EUC_JP
- test          | t-ishii | EUC_JP
- unicode       | t-ishii | UNICODE
-(9 rows)
-
-3. «eºÝ»P«áºÝ½s½Xªº¦Û°ÊÂà´«
-
-[µù: «eºÝªx«ü«È¤áºÝªºµ{¦¡, ¥i¯à¬O psql ©R¥O¸ÑĶ¾¹, ©Î±Ä¥Î libpq ªº C 
-µ{¦¡, Perl µ{¦¡, ©ÎªÌ¬O³z¹L ODBC ªºµøµ¡À³¥Îµ{¦¡. ¦Ó«áºÝ´N¬O«ü PostgreSQL
-¸ê®Æ®wªº¦øªAµ{¦¡]
-
-PostgreSQL ¤ä´©¬Y¨Ç½s½X¦b«eºÝ»P«áºÝ¶¡°µ¦Û°ÊÂà´«: [µù: ³o¸Ì©Ò¿×ªº¦Û°Ê
-Âà´«¬O«ü§A¦b«eºÝ¤Î«áºÝ©Ò«Å§i±Ä¥Îªº½s½X¤£¦P, ¦ý¥u­n PostgreSQL ¤ä´©³o
-¨âºØ½s½X¶¡ªºÂà´«, ¨º»ò¥¦·|À°§A¦b¦s¨ú«e°µÂà´«]
-
-  encoding of backend			available encoding of frontend
-  --------------------------------------------------------------------
-	EUC_JP				EUC_JP, SJIS
-  
-	EUC_TW				EUC_TW, BIG5
-  
-  	LATIN2				LATIN2, WIN1250
-  
-	LATIN5				LATIN5, WIN, ALT
-  
-	MULE_INTERNAL			EUC_JP, SJIS, EUC_KR, EUC_CN, 
-					EUC_TW, BIG5, LATIN1 to LATIN5, 
-					WIN, ALT, WIN1250
-
-¦b±Ò°Ê¦Û°Ê½s½XÂà´«¤§«e, §A¥²¶·§i¶D PostgreSQL §A­n¦b«eºÝ±Ä¥Î¦óºØ½s½X.
-¦³¦n´X­Ó¤èªk¥i¥H¹F¨ì³o­Ó¥Øªº:
-
-o ¦b psql ©R¥O¸ÑĶ¾¹¤¤¨Ï¥Î \encoding ³o­Ó©R¥O
-
-\encoding ³o­Ó©R¥O¥i¥HÅý§A°¨¤W¤Á´««eºÝ½s½X, ¨Ò¦p, §A­n±N«eºÝ½s½X¤Á´«¬° SJIS,
-¨º»ò½Ð¥´:
-
-	\encoding SJIS
-
-o ¨Ï¥Î libpq [µù: PostgreSQL ¸ê®Æ®wªº C API µ{¦¡®w] ªº¨ç¦¡
-
-psql ªº \encoding ©R¥O¨ä¹ê¥u¬O¥h©I¥s PQsetClientEncoding() ³o­Ó¨ç¦¡¨Ó¹F¨ì¥Øªº.
-
-  int PQsetClientEncoding(PGconn *conn, const char *encoding)
-
-¤W¦¡¤¤ conn ³o­Ó°Ñ¼Æ¥Nªí¤@­Ó¹ï«áºÝªº³s½u, encoding ³o­Ó°Ñ¼Æ­n©ñ§A·Q¥Îªº½s½X,
-°²¦p¥¦¦¨¥\¦a³]©w¤F½s½X, «K·|¶Ç¦^ 0 ­È, ¥¢±Ñªº¸Ü¶Ç¦^ -1. ¦Ü©ó¥Ø«e³s½uªº½s½X¥i
-§Q¥Î¥H¤U¨ç¦¡¬dª¾:
-
-  int PQclientEncoding(const PGconn *conn)
-
-³o¸Ì­nª`·Nªº¬O: ³o­Ó¨ç¦¡¶Ç¦^ªº¬O½s½Xªº¥N¸¹ (encoding id, ¬O­Ó¾ã¼Æ­È),
-¦Ó¤£¬O½s½Xªº¦WºÙ¦r¦ê (¦p "EUC_JP"), ¦pªG§A­n¥Ñ½s½X¥N¸¹±oª¾½s½X¦WºÙ,
-¥²¶·©I¥s:
-
-char *pg_encoding_to_char(int encoding_id)
-
-o ¨Ï¥Î PGCLIENTENCODING ³o­ÓÀô¹ÒÅܼÆ
-
-¦pªG«eºÝ©³³]©w¤F PGCLIENTENCODING ³o¤@­ÓÀô¹ÒÅܼÆ, ¨º»ò«áºÝ·|°µ½s½X¦Û°ÊÂà´«.
-
-[µù] PostgreSQL 7.0.0 ~ 7.0.3 ¦³­Ó bug -- ¤£»{³o­ÓÀô¹ÒÅܼÆ
-
-o ¨Ï¥Î SET CLIENT_ENCODING TO ³o­Ó SQL ªº©R¥O
-
-­n³]©w«eºÝªº½s½X¥i¥H¥Î¥H¤U³o­Ó SQL ©R¥O:
-
-	SET CLIENT_ENCODING TO 'encoding';
-
-§A¤]¥i¥H¨Ï¥Î SQL92 ªº»yªk "SET NAMES" ¹F¨ì¦P¼Ëªº¥Øªº:
-
-	SET NAMES 'encoding';
-
-¬d¸ß¥Ø«eªº«eºÝ½s½X¥i¥H¥Î¥H¤U³o­Ó SQL ©R¥O:
-
-	SHOW CLIENT_ENCODING;
-
-¤Á´«¬°­ì¨Ó¹w³]ªº½s½X, ¥Î¥H¤U³o­Ó SQL ©R¥O:
-
-	RESET CLIENT_ENCODING;
-
-[µù] ¨Ï¥Î psql ©R¥O¸ÑĶ¾¹®É, «Øij¤£­n¥Î³o­Ó¤èªk, ½Ð¥Î \encoding
-
-4. Ãö©ó Unicode (²Î¤@½X)
-
-²Î¤@½X©M¨ä¥L½s½X¶¡ªºÂà´«¥i¯à­n¦b 7.1 ª©«á¤~·|¹ê²{.
-
-5. ¦pªGµLªkÂà´«·|µo¥Í¤°»ò¨Æ?
-
-°²³]§A¦b«áºÝ¿ï¾Ü¤F EUC_JP ³o­Ó½s½X, «eºÝ¨Ï¥Î LATIN1, (¬Y¨Ç¤é¤å¦r¤¸µLªkÂà´«¦¨ 
-LATIN1) ¦b³o­Óª¬ªp¤U, ¬Y­Ó¦r¤¸­Y¤£¯àÂন LATIN1 ¦r¤¸¶°, ´N·|³QÂন¥H¤Uªº«¬¦¡:
-
-	(¤Q¤»¶i¦ì­È)
-
-6. °Ñ¦Ò¸ê®Æ
-
-These are good sources to start learning various kind of encoding
-systems.
-
-ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/cjk.inf
-	Detailed explanations of EUC_JP, EUC_CN, EUC_KR, EUC_TW
-	appear in section 3.2.
-
-Unicode: http://www.unicode.org/
-	The homepage of UNICODE.
-
-	RFC 3629
-	UTF-8 is defined here.
-
-5. History
-
-May 20, 2000
-	* SJIS UDC (NEC selection IBM kanji) support contributed
-	  by Eiji Tokuya
-	* Changes above will appear in 7.0.1
-
-Mar 22, 2000
-	* Add new libpq functions PQsetClientEncoding, PQclientEncoding
-	* ./configure --with-mb=EUC_JP
-	  now deprecated. use 
-	  ./configure --enable-multibyte=EUC_JP
-	  instead
-  	* Add SQL_ASCII regression test case
-	* Add SJIS User Defined Character (UDC) support
-	* All of above will appear in 7.0
-
-July 11, 1999
-	* Add support for WIN1250 (Windows Czech) as a client encoding
-	  (contributed by Pavel Behal)
-	* fix some compiler warnings (contributed by Tomoaki Nishiyama)
-
-Mar 23, 1999
-	* Add support for KOI8(KOI8-R), WIN(CP1251), ALT(CP866)
-	  (thanks Oleg Broytmann for testing)
-	* Fix problem with MB and locale
-
-Jan 26, 1999
-	* Add support for Big5 for fronend encoding
-	  (you need to create a database with EUC_TW to use Big5)
-	* Add regression test case for EUC_TW
-	  (contributed by Jonah Kuo <jonahkuo@mail.ttn.com.tw>)
-
-Dec 15, 1998
-	* Bugs related to SQL_ASCII support fixed
-
-Nov 5, 1998
-	* 6.4 release. In this version, pg_database has "encoding"
-	  column that represents the database encoding
-
-Jul 22, 1998
-	* determine encoding at initdb/createdb rather than compile time
-	* support for PGCLIENTENCODING when issuing COPY command
-	* support for SQL92 syntax "SET NAMES"
-	* support for LATIN2-5
-	* add UNICODE regression test case
-	* new test suite for MB
-	* clean up source files
-
-Jun 5, 1998
-	* add support for the encoding translation between the backend
-	  and the frontend
-	* new command SET CLIENT_ENCODING etc. added
-	* add support for LATIN1 character set
-	* enhance 8 bit cleaness
-
-April 21, 1998 some enhancements/fixes
-	* character_length(), position(), substring() are now aware of 
-	  multi-byte characters
-	* add octet_length()
-	* add --with-mb option to configure
-	* new regression tests for EUC_KR
-  	  (contributed by "Soonmyung. Hong" <hong@lunaris.hanmesoft.co.kr>)
-	* add some test cases to the EUC_JP regression test
-	* fix problem in regress/regress.sh in case of System V
-	* fix toupper(), tolower() to handle 8bit chars
-
-Mar 25, 1998 MB PL2 is incorporated into PostgreSQL 6.3.1
-
-Mar 10, 1998 PL2 released
-	* add regression test for EUC_JP, EUC_CN and MULE_INTERNAL
-	* add an English document (this file)
-	* fix problems concerning 8-bit single byte characters
-
-Mar 1, 1998 PL1 released
-
-Appendix:
-
-[Here is a good documentation explaining how to use WIN1250 on
-Windows/ODBC from Pavel Behal. Please note that Installation step 1)
-is not necceary in 6.5.1 -- Tatsuo]
-
-Version: 0.91 for PgSQL 6.5
-Author: Pavel Behal
-Revised by: Tatsuo Ishii
-Email: behal@opf.slu.cz
-Licence: The Same as PostgreSQL
-
-Sorry for my Eglish and C code, I'm not native :-)
-
-!!!!!!!!!!!!!!!!!!!!!!!!! NO WARRANTY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-Instalation:
-------------
-1) Change three affected files in source directories 
-    (I don't have time to create proper patch diffs, I don't know how)
-2) Compile with enabled locale and multibyte set to LATIN2
-3) Setup properly your instalation, do not forget to create locale
-   variables in your profile (environment). Ex. (may not be exactly true):
-	LC_ALL=cs_CZ.ISO8859-2
-	LC_COLLATE=cs_CZ.ISO8859-2
-	LC_CTYPE=cs_CZ.ISO8859-2
-	LC_MONETARY=cs_CZ.ISO8859-2
-	LC_NUMERIC=cs_CZ.ISO8859-2
-	LC_TIME=cs_CZ.ISO8859-2
-4) You have to start the postmaster with locales set!
-5) Try it with Czech language, it have to sort
-5) Install ODBC driver for PgSQL into your M$ Windows
-6) Setup properly your data source. Include this line in your ODBC
-   configuration dialog in field "Connect Settings:" :
-	SET CLIENT_ENCODING = 'WIN1250';
-7) Now try it again, but in Windows with ODBC.
-
-Description:
-------------
-- Depends on proper system locales, tested with RH6.0 and Slackware 3.6,
-  with cs_CZ.iso8859-2 loacle
-- Never try to set-up server multibyte database encoding to WIN1250,
-  always use LATIN2 instead. There is not WIN1250 locale in Unix
-- WIN1250 encoding is useable only for M$W ODBC clients. The characters are
-  on thy fly re-coded, to be displayed and stored back properly
- 
-Important:
-----------
-- it reorders your sort order depending on your LC_... setting, so don't be
-  confused with regression tests, they don't use locale
-- "ch" is corectly sorted only in some newer locales (Ex. RH6.0)
-- you have to insert money as '162,50' (with comma in aphostrophes!)
-- not tested properly
diff --git a/doc/README.mb.jp b/doc/README.mb.jp
deleted file mode 100644
index 7cafb2426ea1f..0000000000000
--- a/doc/README.mb.jp
+++ /dev/null
@@ -1,814 +0,0 @@
-PostgreSQL 7.3 multi-byte (MB) support README	       2002/10/21 $B:n@.(B
-
-							$B@P0fC#IW(B
-						ishii@postgresql.org
-
-$B"#$O$8$a$K(B
-
-  PostgreSQL $B$K$*$1$k%^%k%A%P%$%H%5%]!<%H$O0J2<$N$h$&$JFCD'$r;}$C$F$$$^$9!%(B
-
-    1. $B%^%k%A%P%$%HJ8;z$H$7$F!$F|K\8l!$Cf9q8l$J$I$N3F9q$N(B EUC$B!$(BUnicode$B!$(B
-       mule internal code, ISO-8859-* $B$,%G!<%?%Y!<%9:n@.;~$KA*Br2DG=!%(B
-       $B%G!<%?%Y!<%9$K$O$3$N%(%s%3!<%G%#%s%0$N$^$^3JG<$5$l$^$9!%(B
-    2. $B%F!<%V%kL>$K%^%k%A%P%$%HJ8;z$,;HMQ2DG=(B
-    3. $B%+%i%`L>$K%^%k%A%P%$%HJ8;z$,;HMQ2DG=(B
-    4. $B%G!<%?$=$N$b$N$K$b%^%k%A%P%$%HJ8;z$,;HMQ2DG=(B
-    5. $B%^%k%A%P%$%HJ8;z$N@55,I=8=8!:w$,;HMQ2DG=(B
-    6. $B%^%k%A%P%$%HJ8;z$N(B LIKE $B8!:w$,;HMQ2DG=(B
-    7. character_length(), position(), substring() $B$J$I$NJ8;zNs4X?t$G(B
-       $B$N%^%k%A%P%$%H%5%]!<%H(B
-    8. $B%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$,%P%C%/%(%s%IB&$H0[$k>l9g$K!$(B
-       $B<+F0E*$K%(%s%3!<%G%#%s%0JQ49$r9T$J$$$^$9!%(B
-    9. $B%f!<%6Dj5A$N%(%s%3!<%G%#%s%0JQ49$r:n@.2DG=!%(B
-
-  $B%^%k%A%P%$%H%5%]!<%H$,07$&$3$H$N$G$-$k%(%s%3!<%G%#%s%0$O0J2<$K$J$j$^(B
-  $B$9!%(B
-
-	SQL_ASCII	ASCII
-	EUC_JP		$BF|K\8l(B EUC
-	EUC_CN		GB $B$r%Y!<%9$K$7$?CfJ8(BEUC$B!%(Bcode set 2 $B$O(B
-			SS2+2$B%P%$%H%3!<%I(B = 3$B%P%$%HI=8=$G$9!%(B
-	EUC_KR		$B4Z9q8l(B EUC$B!%(B
-	JOHAB		$B%O%s%0%k%Y!<%9$N4Z9q8l(BEUC.
-	EUC_TW		$BBfOQ$N(B EUC$B!%(Bcode set 2 $B$O(B
-			SS2+$BLLHV9f(B+2$B%P%$%H%3!<%I(B = 4$B%P%$%HI=8=$G$9!%(B
-	UNICODE		UTF-8$B!%$?$@$7%5%]!<%H$9$k$N$O(B UCS-2 $B$NHO0O!$(B
-			$B$9$J$o$A(B 0xffff $B$^$G$G$9!%(B
-	MULE_INTERNAL	mule $B$NFbIt%3!<%I!%$?$@$7!$(BType N $B$NITDjD9J8;z$O(B
-			$B%5%]!<%H$7$F$$$^$;$s!%(B
-	LATIN1 $B$+$i(B LATIN10$B$^$G(B
-	ISO_8859_1 $B$+$i(B 16$B$^$G(B
-	$B%-%j%kJ8;z(B	KOI8(KOI8-R), WIN(CP1251), ALT(CP866)$B$r%5%]!<%H(B
-			$B$7$F$$$^$9!%$b$A$m$s(B ISO 8859-5 $B$b;HMQ2DG=$G$9!%(B
-			$B$3$N>l9g!$(B"LATIN5" $B$H$7$F;XDj$7$F2<$5$$!%(B
-	WIN1256		$B%"%i%V=t9q8l(BWindows$BMQ%(%s%3!<%G%#%s%0(B.
-	TCVN		$B%Y%H%J%`8l(B."ABC"$B$d(B"VSCII"$B$b;HMQ2DG=(B.
-	WIN874		$B%?%$8l(B.
-
-  $B%U%m%s%H%(%s%IB&$G$O$5$i$K0J2<$N%(%s%3!<%G%#%s%0$,;HMQ$G$-$^$9!%(B
-
-	SJIS		$B%7%U%H(BJIS(MS932$B$H$[$\8_49(B)
-	BIG5		$BBfOQ$d9a9A$G;HMQ$5$l$F$$$kCf9q8l!%(BEUC_TW$B$H8_49(B
-			$B@-$,$"$j$^$9!%(B
-	GBK		Windows-936
-	UHC		Windows-949
-	WIN1250		Windows-1250
-	GB18030		GB18030
-
-$B"#F|K\8l$r;HMQ$9$k$3$H$N$G$-$k%(%s%3!<%G%#%s%0(B
-
-  $BA*Br$NL\0B$H$7$F$O!$1Q8l$HF|K\8l$7$+;H$o$J$$>l9g$O(B EUC_JP($BF1MM$K!$Cf(B
-  $B9q8l$7$+;H$o$J$$>l9g$O(B EUC_CN... $B$J$I$H$J$j$^$9(B)$B!$$=$NB>$N8@8l$b;H$$$?(B
-  $B$$>l9g$O(B UNICODE $B$b$7$/$O(B MULE_INTERNAL $B$H$J$k$G$7$g$&!%(B
-
-  $BCm0U!'(BMULE_INTERNAL $B$rA*$V$H!$$?$/$5$s$NJ8;z=89g$KBP1~$G$-$FJXMx$G$9(B
-  $B$,!$@55,I=8=$GJ#?t$NJ8;z=89g$K$^$?$,$k$h$&$JHO0O;XDj(B($B$?$H$($P!$(B[a-$BHO(B]
-  $B$H$+!$(B[abc$BHO0O(B]$B$N$h$&$J(B)$B$O;H$($^$;$s!%J#?t$NHO0O;XDj$G0[$J$kJ8;z=89g(B
-  $B$r;H$&$N$O9=$$$^$;$s(B($B$?$H$($P(B [abc][$BHO(B-$B0O(B])$B!%$^$?!$(B[^a] $B$N$h$&$JI=8=(B
-  $B$O!$(B"a" $B$NB0$9$kJ8;z=89g(B($B$3$N>l9g!$(BUS-ASCII)$B$K$*$$$F(B "a" $B0J30$G$"$k(B
-  $B$3$H$rI=$7$^$9!%7h$7$F4A;z$dJ?2>L>$J$I(B "a" $B0J30$r$9$Y$FI=$9$o$1$G$O(B
-  $B$J$$$3$H$KCm0U$7$F2<$5$$!%(B
-
-$B"#%$%s%9%H!<%k(B
-
-  PostgreSQL 7.3$B$+$i$O(Bconfigure$B$N%*%W%7%g%s;XDj$NM-L5$K4X$o$i$:!$%^%k(B
-  $B%A%P%$%H%5%]!<%H$,M-8z$K$J$C$F$$$^$9$N$G!$FC$K(Bconifgure$B;~$K%^%k%A%P(B
-  $B%$%HMQ$NFCJL$J%*%W%7%g%s$r;XDj$9$kI,MW$O$"$j$^$;$s!%(B
-
-$B"#(Binitdb/createdb/create database $B$K$*$1$k%(%s%3!<%G%#%s%0$N;XDj$K$D$$$F(B
-
-  initdb $B$G$O0J2<$N%*%W%7%g%s$G%(%s%3!<%G%#%s%0$,;XDj$G$-$^$9!%(B
-
-	-E $B%(%s%3!<%G%#%s%0(B
-	--encoding=$B%(%s%3!<%G%#%s%0(B
-
-  $B$3$3$G;XDj$7$?%(%s%3!<%G%#%s%0$O!$0J8e(B createdb/create database $B$G%((B
-  $B%s%3!<%G%#%s%0$r>JN,$7$?>l9g$K@_Dj$5$l$k%(%s%3!<%G%#%s%0$K$J$j$^$9!%(B
-  -E $B$^$?$O(B --encoding $B%*%W%7%g%s$r>JN,$7$?>l9g$O!$%(%s%3!<%G%#%s%0$H(B
-  $B$7$F(BSQL_ASCII$B$,:NMQ$5$l$F$7$^$&$N$G!$F|K\8l$r%G%U%)%k%H$G;HMQ$9$k>l(B
-  $B9g$O!$(B
-
-	-E EUC_JP
-
-   $B$"$k$$$O(B
-
-	--encoding=EUC_JP
-
-  $B$H$7$FI,$:L@<(E*$K%(%s%3!<%G%#%s%0$r;XDj$7$F$/$@$5$$!%(B
-
-  $B$J$*!$(BPostgreSQL 7.3$B0J9_%m%1!<%k%5%]!<%H$,I,$:M-8z$K$J$C$F$$$^$9$,!$(B
-  $B$3$l$OF|K\8l$J$I$r;HMQ$9$k:]$K$O2?$N%a%C%j%H$b$J$$$P$+$j$G$J$/!$>c32(B
-  $B$N860x$K$J$C$?$j!$(BLIKE$B8!:w$d@55,I=8=8!:w$G%$%s%G%C%/%9$,M-8z$K$J$i$J(B
-  $B$$$J$I$NLdBj$r0z$-5/$3$9$N$G!$L58z$K$7$F$*$/$3$H$r$*$9$9$a$7$^$9!%%m(B
-  $B%1!<%k%5%]!<%H$rL58z$K$9$k$?$a$K$O!$(B
-
-	--no-locale
-
-  $B%*%W%7%g%s$r;XDj$7$^$9!%(B
-
-  createdb $B$G$O0J2<$N%*%W%7%g%s$G%(%s%3!<%G%#%s%0$,;XDj$G$-$^$9!%(B
-
-	-E $B%(%s%3!<%G%#%s%0(B
-	--encoding=$B%(%s%3!<%G%#%s%0(B
-
-  create database $B$G$O0J2<$N%*%W%7%g%s$G%(%s%3!<%G%#%s%0$,;XDj$G$-$^$9!%(B
-
-	CREATE DATABASE dbanme WITH ENCODING = '$B%(%s%3!<%G%#%s%0(B';
-
-  LOCATION $B$rF1;~$K;XDj$9$k>l9g$O0J2<$N$h$&$K$J$j$^$9!%(B
-
-	CREATE DATABASE dbanme WITH LOCATION = 'path' ENCODING = '$B%(%s%3!<%G%#%s%0(B';
-
-  createdb/create database $B$G$O!$%(%s%3!<%G%#%s%0;XDj$r>JN,$7$?>l9g$O!$(Binitdb 
-  $B$G;XDj$7$?%(%s%3!<%G%#%s%0$,:NMQ$5$l$^$9!%$3$l$O!$(Binitdb $B$,:n@.$9$k(B
-  $B%F%s%W%l!<%H%G!<%?%Y!<%9(B(template1)$B$N(B encoding $B%"%H%j%S%e!<%H$r7Q>5(B
-  $B$9$k$+$i$G$9!%(B
-
-  $B%G!<%?%Y!<%9$N%(%s%3!<%G%#%s%0$O!$(Bpsql -l$B!$(Bpsql $B$N(B \l $B$G;2>H$G$-$^$9!%(B
-
-$ psql -l
-            List of databases
-   Database    |  Owner  |   Encoding    
----------------+---------+---------------
- euc_cn        | t-ishii | EUC_CN
- euc_jp        | t-ishii | EUC_JP
- euc_kr        | t-ishii | EUC_KR
- euc_tw        | t-ishii | EUC_TW
- mule_internal | t-ishii | MULE_INTERNAL
- regression    | t-ishii | SQL_ASCII
- template1     | t-ishii | EUC_JP
- test          | t-ishii | EUC_JP
- unicode       | t-ishii | UNICODE
-(9 rows)
-
-$B"#J8;z7?$N%G!<%?7?$K$D$$$F(B
-
-  7.2$B$G$O!$(BCHAR(n)$B$H(BVARCHAR(n)$B$N(B n $B$OJ8;z?t$r0UL#$7$^$9!%(Bn $B$,%P%$%H?t$r(B
-  $B0UL#$9$k(B 7.1 $B0JA0$H$O0[$J$j$^$9$N$G$4Cm0U2<$5$$!%(B
-
-  $BNc$r<($7$^$9!%(B
-
-  7.2$B$G$O!$(BCHAR(1)$B$K(B"$B$"(B"$B$r3JG<$G$-$^$9$,!$(B7.1$B0JA0$G$O3JG<$G$-$^$;$s$3(B
-  $B$l$O!$(B"$B$"(B"$B$r3JG<$9$k$?$a$K>/$J$/$H$b(B2$B%P%$%H0J>e$rMW$9$k$+$i$G$9!%(B
-  $B5U$K!$(B"a" $B$O(B1$B%P%$%H$7$+>CHq$7$J$$$?$a!$(B7.1$B$G$b(B CHAR(1) $B$K3JG<$G$-$^(B
-  $B$9!%(B
-
-  $B$J$*!$(B7.2$B$G$O!$(B7.1$B$^$G$H0[$J$j!$(BCHAR(n)$B$K3JG<$G$-$J$$(B n $BJ8;z$h$jBg$-(B
-  $B$$J8;zNs$O(B n $BJ8;z$G@Z$j<N$F$i$l$k$N$G$O$J$/!$%(%i!<$K$J$k$3$H$K$4Cm(B
-  $B0U2<$5$$!%$3$l$O!$%^%k%A%P%$%HBP1~$NM-L5$K4X$o$i$:!$J8;zNs$N07$$$,(B
-  SQL$BI8=`$K1h$&$h$&$KJQ$C$?$+$i$G$9!%(B
-
-$B"#%U%m%s%H%(%s%I$H%P%C%/%(%s%I$N<+F0%(%s%3!<%G%#%s%0JQ49$K$D$$$F(B
-
-  $B%P%C%/%(%s%I(B($B%G!<%?%Y!<%9(B)$B$H(B psql $B$J$I$N%U%m%s%H%(%s%I$N%(%s%3!<%G%#(B
-  $B%s%0$O0lCW$7$F$$$k$N$,86B'$G$9$,!$$$$/$D$+$N%(%s%3!<%G%#%s%0$K$D$$$F(B
-  $B$O%P%C%/%(%s%I$H%U%m%s%H%(%s%I$N4V$G0[$J$k$b$N$r;HMQ$9$k$3$H$,$G$-$^(B
-  $B$9!%$3$N>l9g!$<+F0E*$K%P%C%/%(%s%I$G%(%s%3!<%G%#%s%0JQ49$,9T$o$l$^$9!%(B
-
-  $B%P%C%/%(%s%I$N%(%s%3!<%G%#%s%0(B	$B5vMF$5$l$k%U%m%s%H%(%s%I$N(B
-					$B%(%s%3!<%G%#%s%0(B
-  ----------------------------------------------------------------
-	EUC_JP				EUC_JP, SJIS, UNICODE
-
-	EUC_TW				EUC_TW, BIG5, UNICODE
-
-	EUC_CN				EUC_CN, UNICODE
-
-	EUC_KR				EUC_KR, UNICODE
-
-	JOHAB				JOHAB, UNICODE
-
-	LATIN1,3,4			LATIN1,3,4, UNICODE
-
-  	LATIN2				LATIN2, WIN1250, UNICODE
-
-	LATIN5				LATIN5, WIN, ALT, UNICODE
-
-	LATIN6,7,8,9,10			LATIN6,7,8,9,10, UNICODE
-
-	ISO_8859_5,6,7,8		ISO_8859_5,6,7,8, UNICODE
-
-	WIN1256				WIN1256, UNICODE
-
-	TCVN				TCVN, UNICODE
-
-	WIN874				WIN874, UNICODE
-
-	MULE_INTERNAL			EUC_JP, SJIS, EUC_KR, EUC_CN, 
-					EUC_TW, BIG5, LATIN1$B$+$i(B5, 
-					WIN, ALT, WIN1250
-
-	UNICODE				EUC_JP, SJIS, EUC_KR, UHC,
-					EUC_CN, GBK, EUC_TW, BIG5,
-					LATIN1$B$+$i(B10, ISO_8859_5$B$+$i(B8,
-					WIN, ALT, WIN1250, WIN1256,
-					TCVN, WIN874, JOHAB
-  ----------------------------------------------------------------
-
-  $B%P%C%/%(%s%I$H%U%m%s%H%(%s%I$N%(%s%3!<%G%#%s%0$,0[$J$k>l9g!$$=$N$3$H(B
-  $B$r%P%C%/%(%s%I$KEA$($kI,MW$,$"$j$^$9!%$=$N$?$a$NJ}K!$,$$$/$D$+$"$j$^(B
-  $B$9!%(B
-
-o psql $B$N(B \encoding $B%3%^%s%I$r;H$&J}K!(B
-
-  psql$B$G$O!$(B\encoding$B%3%^%s%I$r;H$C$FF0E*$K%U%m%s%H%(%s%IB&$NJ8;z%3!<(B
-  $B%I$r@ZBX$($k$3$H$,$G$-$^$9!%Nc(B:
-
-	\encoding SJIS
-
-o libpq $B$N4X?t(B PQsetClientEncoding $B$r;H$&J}K!(B
-
-  7.0 $B$+$i?7$7$$(B libpq $B4X?t(B PQsetClientEncoding $B$,DI2C$5$l$F$$$^$9!%(B
-
-  PQsetClientEncoding(PGconn *conn, const char *encoding)
-
-  $B$3$N4X?t$r;H$($P!$%3%M%/%7%g%sKh$K%(%s%3!<%G%#%s%0$r@ZBX$($k$3$H$,$G(B
-  $B$-$^$9!%8=:_$N%(%s%3!<%G%#%s%0$NLd$$9g$o$;$O(B
-
-  int PQclientEncoding(const PGconn *conn)
-
-  $B$G$9!%(B
-
-o postgresql.conf $B$G@_Dj$9$kJ}K!(B
-
-  $B%U%m%s%H%(%s%I$N%G%U%)%k%H%(%s%3!<%G%#%s%0$r;XDj$9$k$K$O!$(B
-  postgresql.conf $B$N(B client_encoding $B$r;XDj$7$^$9!%;XDjNc(B:
-
-  client_encoding = SJIS
-
-o $B4D6-JQ?t(B PGCLIENTENCODING $B$r;H$&J}K!(B
-
-  (1) postmaster $B5/F0;~$K4D6-JQ?t$r@_Dj$9$kJ}K!(B
-
-  $B4D6-JQ?t(B PGCLIENTENCODING $B$r@_Dj$9$k$3$H$K$h$j!$(B postgresql.conf $B$G(B
-  $B%(%s%3!<%G%#%s%0$r;XDj$9$k$N$HF1$88z2L$,F@$i$l$^$9!%$?$@$7!$$3$l$ONr(B
-  $B;KE*7P0^$+$i;D$5$l$F$$$k5!G=$G!$:#8e$O$3$N5!G=$rMxMQ$7$J$$$3$H$r$*$9(B
-  $B$9$a$7$^$9!%@_DjNc(B:
-
-  export PGCLIENTENCODING=SJIS postmaster -S
-
-  (2) $B%/%i%$%"%s%H!$%U%m%s%H%(%s%IKh$K%(%s%3!<%G%#%s%0$r@_Dj$7$?$$>l9g(B
-
-  $B$=$N%U%m%s%H%(%s%I(B($B$?$H$($P(B psql)$B$r5/F0$9$kA0$K4D6-JQ?t(B 
-  PGCLIENTENCODING $B$r@_Dj$7$^$9!%(B
-
-o set client_encoding $B%3%^%s%I$r;H$&J}K!(B
-
-  SET CLIENT_ENCODING SQL$B%3%^%s%I$r;H$C$FF0E*$K%U%m%s%H%(%s%I$N%(%s%3!<(B
-  $B%G%#%s%0$rJQ99$G$-$^$9!%Nc(B:
-
-	SET CLIENT_ENCODING TO SJIS;
-
-$B"#8=:_@_Dj$5$l$F$$$k%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$rD4$Y$k(B
-
- $B8=:_@_Dj$5$l$F$$$k%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$O(B
-
-	show client_encoding;
-
- $B$G;2>H$G$-$^$9(B($B>.J8;z$GI=<($5$l$^$9(B)$B!%(B
-
-$B"#%G%U%)%k%H$N%(%s%3!<%G%#%s%0$X$NI|5"(B
-
-  SQL$B%3%^%s%I(B:
-
-	RESET CLIENT_ENCODING;
-
-  $B$O!$%G%U%)%k%H$N%U%m%s%H%(%s%I%(%s%3!<%G%#%s%0@_Dj$KI|5"$5$;$^$9!%(B
-  postmaster$B$rN)$A>e$2$k$H$-$K(B postgresql.conf $B$N(B client_encoding $B$d4D(B
-  $B6-JQ?t(B PGCLIENTENCODING $B$,@_Dj$5$l$F$$$k$H$=$N%(%s%3!<%G%#%s%0$K!$$=(B
-  $B$&$G$J$1$l$P%G!<%?%Y!<%9$N%(%s%3!<%G%#%s%0$HF1$8$K$J$j$^$9!%(B
-  
-$B"#L@<(E*$J%(%s%3!<%G%#%s%0JQ49(B
-
-  7.2$B$G$O!$(Bconvert$B$H$$$&4X?t$r;H$$!$L@<(E*$J%(%s%3!<%G%#%s%0JQ49$,$G$-(B
-  $B$^$9!%(B
-
-  convert(string text, [src_encoding name,] dest_encoding name) 
-
-  $B$3$3$G(Bsrc_encoding$B$O(Btext$B$N%(%s%3!<%G%#%s%0L>$G$9!%>JN,$9$k$H!$%G!<%?(B
-  $B%Y!<%9%(%s%3!<%G%#%s%0L>$HF1$8$G$"$k$H8+$J$5$l$^$9!%(Bdest_encoding$B$O!$(B
-  $BJQ498e$N%(%s%3!<%G%#%s%0L>$G$9!%(B
-
-  $BNc$r<($7$^$9!%(B
-
-  SELECT convert(text, EUC_JP) FROM unicode_tbl;
-
-  $B$O!$(BUnicode$B$N%F!<%V%k(Bunicode_tbl$B$N(Btext$BNs$r(BEUC_JP$B$KJQ49$7$FJV$7$^$9!%(B
-
-  7.3$B$G$O$5$i$K(BSQL$BI8=`$N(BCONVERT$B4X?t$,;H$($^$9!%(BSQL$BI8=`$N(BCONVERT$B$O(B
-  PostgreSQL$B$N(BCONVERT$B$H5!G=$O$[$H$s$IF1$8$G$9$,!$8F$S=P$77A<0$,0[$j$^(B
-  $B$9!%(B
-
-  SELECT convert(text using euc_jp_to_utf8) FROM unicode_tbl;
-
-  "using" $B$N8e$N0z?t$O!V%3%s%P!<%8%g%sL>!W$G$9!%$3$NNc$G$O!$(BEUC_JP $B$+(B
-  $B$i(B UTF-8 $B$KJQ49$9$k%3%s%P!<%8%g%s$r;XDj$7$F$$$^$9!%Dj5A:Q$N%3%s%P!<(B
-  $B%8%g%s$K$D$$$F$O!$%f!<%6!<%:%,%$%I$N(B "String Functions and
-  Operators" $B$NI=(B"Built-in Conversions" $B$r8+$F$/$@$5$$!%(B
-
-$B"#%(%s%3!<%G%#%s%0JQ49ITG=$N>l9g$N=hM}(B
-
-  $B%P%C%/%(%s%IB&$N%(%s%3!<%G%#%s%0$H%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0(B
-  $B$,$$$D$bAj8_JQ49$G$-$k$H$O8B$j$^$;$s!%6KC<$JOC!$%P%C%/%(%s%IB&$,(B 
-  EUC_JP $B$J$N$K!$%U%m%s%H%(%s%IB&$,(B EUC_KR $B$@$C$?$i$I$&$J$k$G$7$g$&!%(B
-  $B$3$N>l9g(B PostgreSQL $B$OJQ49$G$-$J$$%3!<%I$r(B 16$B?JI=8=$KJQ49$7$^$9!%(B
-  $B$?$H$($P!$(B"(bdae)" $B$N$h$&$K!%$J$*!$$3$N(B 16$B?JI=8=$O(B mule
-  internal code $B$N%3!<%I$G$"$k$3$H$KCm0U$7$F2<$5$$!%$3$l$O!$D>@\%U%m%s(B
-  $B%H%(%s%I(B <--> $B%P%C%/%(%s%I$N%(%s%3!<%G%#%s%0$rJQ49$9$k$N$G$O$J$/!$0l(B
-  $BEYFbItI=8=$G$"$k(B mule internal code $B$r7PM3$7$F$$$k$?$a$G$9!%(B
-
-  $B$J$*!$(BUnicode$B$H$=$l0J30$N%(%s%3!<%G%#%s%0$NJQ49$@$1$ONc30$G!$(BNOTICE
-  $B%a%C%;!<%8$,I=<($5$l!$JQ49ITG=$NJ8;z$OL5;k$5$l$^$9!%(B
-
-$B"#%G%U%)%k%H%3%s%P!<%8%g%s(B
-
-  $B%G%U%)%k%H%3%s%P!<%8%g%s$O!$%P%C%/%(%s%I$H%U%m%s%H%(%s%I$H$N4V$N%(%s(B
-  $B%3!<%G%#%s%0$N<+F0JQ49$K;H$o$l$kFCJL$J%3%s%P!<%8%g%s$G$9!%%G%U%)%k%H(B
-  $B%3%s%P!<%8%g%s$O3F!9$N(B{$B%9%-!<%^!$%=!<%9%(%s%3!<%G%#%s%0!$%G%9%F%#%M!<(B
-  $B%7%g%s%(%s%3!<%G%#%s%0(B}$B$NAH$_9g$o$;$K$*$$$F!$$?$@0l8D$@$1B8:_$7$^$9!%(B
-  $B>e5-$G@bL@$7$?AH$_9~$_:Q$N%3%s%P!<%8%g%s$O!$(Bpg_catalog$B%9%-!<%^$K$*$$(B
-  $B$FDj5A$5$l$F$*$j!$%9%-!<%^%5!<%A%Q%9$N@_Dj$K4X$o$i$:I,$:MxMQ$G$-$k%3(B
-  $B%s%P!<%8%g%s$K$J$C$F$$$^$9!%(B
-
-  $B5U$K8@$&$H!$(B pg_catalog $B0J30$N%9%-!<%^$K%G%U%)%k%H%3%s%P!<%8%g%s$r:n(B
-  $B@.$9$k$3$H$K$h$j!$%G%U%)%k%H%3%s%P!<%8%g%s$r<+M3$KA*Br$9$k$3$H$b$G$-(B
-  $B$k$o$1$G$9!%$?$H$($P(B SJIS $B$H$NJQ49$K$*$$$F!$(BPostgreSQL $B$,MQ0U$7$F$$(B
-  $B$k(B MS932$B8_49(B $B$NJQ49$G$O$J$/!$(BJIS $B5,3J$N%7%U%H%8%9$KAjEv$9$kJQ49$r9T(B
-  $B$&$h$&$J%3%s%P!<%8%g%s$r:n@.$9$k$3$H$b2DG=$G$9!%(B
-
-$B"#%f!<%6Dj5A%3%s%P!<%8%g%s$N:n@.(B
-
-  PostgreSQL 7.3$B0J9_!$%f!<%6Dj5A$N%3%s%P!<%8%g%s$r:n@.$G$-$k$h$&$K$J$C(B
-  $B$F$$$^$9!%%3%s%P!<%8%g%s$NDj5A$O(B CREATE CONVERSION $B$H$$$&(B SQL $B%3%^%s(B
-  $B%I$r;H$C$F9T$$$^$9!%(B
-
-    CREATE [DEFAULT] CONVERSION conversion_name
-        FOR source_encoding
-        TO dest_encoding FROM funcname
-
-  $B>\:Y$O%j%U%!%l%s%9%^%K%e%"%k$r$4Mw2<$5$$!%(B
-
-$B"#(BSJIS$B%f!<%6Dj5AJ8;z$X$NBP1~(B
-
-  7.0 $B$+$i(B SJIS$B%f!<%6Dj5AJ8;z(B (UDC) $B$KBP1~$7$F$$$^$9!%(BUDC $B$r$I$&07$&$+(B
-  $B$H8@$&$3$H$K$D$$$FCf>r$5$s(B(nak@email.com)$B$+$iLdBjDs5/$H>\:Y$J2r@b$r(B
-  $BD:$-$^$7$?$N$G!$;29M$N$?$a$K$3$N%I%-%e%a%s%H$N:G8e$KIU$1$F$*$-$^$9!%(B
-  $B$^$?!$$3$NLdBj$K$D$$$F$O!$(BPostgreSQL$BF|K\8l%a!<%j%s%0%j%9%H$N(B 
-  [pgsql-jp 12288] (1999/12/17$BIU(B)$B$H(B [pgsql-jp 12486] (2000/1/5$BIU(B) $B$+$i(B
-  $B;O$^$k%9%l%C%I$G5DO@$r8+$k$3$H$,$G$-$^$9(B($B%a!<%k$N%"!<%+%$%V$O(B
-  http://www.sra.co.jp/people/t-ishii/PostgreSQL/ $B$G;2>H$G$-$^$9(B)$B!%(B
-
-  $B$3$3$G$O!$$=$l$i$N5DO@$r$U$^$(!$4JC1$K2r@b$7$^$9!%(B
-
-  PostgreSQL$B$G$O!$F|K\8l$r;HMQ$9$k:]$K%P%C%/%(%s%IB&$N%(%s%3!<%G%#%s%0(B
-  $B$r(B EUC_JP $B$^$?$O(B MULE_INTERNAL or Unicode $B$K$9$kI,MW$,$"$j$^$9!%(B
-  MULE_INTERNAL $B$O(B EUC_JP $B$KJ8;z=89g$rI=$9%3!<%I$rIU$1$?$b$N$J$N$G!$K\(B
-  $B<AE*$KF1$8$G$9!%$^$?!$(BUnicode <---> SJIS $BJQ49$O8=:_$N$H$3$m%5%]!<%H(B
-  $B$5$l$F$$$^$;$s$N$GL5;k$7$^$9!%$7$?$,$C$F!$$3$3$G$O(B EUC_JP $B$H(B SJIS $B$N(B
-  $BAj8_JQ49$N$_$r9M$($^$9!%(B
-
-  $BM=HwCN<1(B
-
-  $B0l8}$K(B EUC_JP $B$H$$$C$F$b!$<B:]$K$OCf?H$OJ#?t$NJ8;z=89g$+$i@.$jN)$C$F(B
-  $B$$$^$9!%(B
-
-	G0: JIS ROMAN (ASCII $B$H$[$\F1$8(B)
-	G1: JIS X 0208 (JIS $B4A;z(B)
-	G2: JIS X 0201 (1$B%P%$%H%+%J(B)
-	G3: JIS X 0212 (JIS $BJd=u4A;z(B)
-
-  $B0lJ}(B SJIS $B$O$3$N$&$A4pK\E*$K(B G0, G1, G2 $B$r%5%]!<%H$7$F$*$j!$(BG3 $B$O%5(B
-  $B%]!<%H$7$F$$$^$;$s!%$7$?$,$C$F!$(BSJIS $B$O(B EUC_JP $B$NItJ,=89g$H$_$J$9$3(B
-  $B$H$,$G$-!$<B:](B PostgreSQL 6.5 $B$^$G$O$3$N9M$($G<BAu$5$l$F$$$^$7$?!%(B
-
-  $B$H$3$m$,!$(BWindows PC $B$N(B SJIS $B$N@$3&$G$O!$>e5-(B JIS $B5,3J$GDj5A$5$l$F$$(B
-  $B$J$$J8;z%3!<%I$,0lItMxMQ$5$l$F$*$j!$$3$NItJ,(B (UDC) $B$O=>Mh(B PostgreSQL 
-  $B$G$OA4$/9MN8$5$l$F$$$^$;$s$G$7$?!%<B:](B UDC $B$r4^$`(B SJIS $B$r(B EUC_JP $B$K(B
-  $BJQ49$9$k$H$-$KIT@5$JJQ49$,9T$o$l$F$$$^$7$?!%$=$3$G(B PostgreSQL 7.0 $B$G(B
-  $B$O!$$^$:$3$NLdBj$r2r7h$9$k$3$H$K$7$^$7$?!%(B
-
-  $B$^$?!$(BUDC $B$NMxMQJ}$K$D$$$F$OI8=`5,3J$N$h$&$J$b$N$O$"$j$^$;$s$,!$<B$O(B
-  $B6H3&CDBN$G$N<h$j7h$a$,$"$j!$$$$o$f$k%G%U%!%/%H%9%?%s%@!<%I$J$i$PB8:_(B
-  $B$9$k$3$H$,J,$+$j$^$7$?!%$=$3$G$3$l$K$D$$$F$b$G$-$k$@$1%5%]!<%H$9$k$3(B
-  $B$H$K$7$^$7$?!%(B
-
-  PostgreSQL 7.0 $B$G$N(B UDC $BBP1~$N<BAu(B
-
-  (1) $B%f!<%6Dj5AJ8;zNN0h$O(B JIS $B$N%f!<%6Dj5AJ8;zNN0h$K%^%C%T%s%0$9$k!%(B
-  SJIS $B$H(B EUC_JP $B$G(B1$BBP(B1$B$NBP1~$K$J$j$^$9!%(B
-
-    - SJIS $B%f!<%6Dj5AJ8;zNN0h(B A ($B2>>N(B)
-          95$B!A(B104 $B6h(B  $B"+"*(B $BF|K\8l(B EUC / G1 (JIS X 0208) 85$B!A(B95 $B6h(B
-
-    - SJIS $B%f!<%6Dj5AJ8;zNN0h(B B ($B2>>N(B)
-         105$B!A(B114 $B6h(B  $B"+"*(B $BF|K\8l(B EUC / G3 (JIS X 0212) 85$B!A(B95 $B6h(B
-
-  (2) IBM $B3HD%J8;zNN0h(B (SJIS 115$B!A(B120 $B6h(B)
-
-  $BJQ49%F!<%V%k$K$h$C$F(B G1 (JIS X 0208)$B$H!$(BG3 (JIS X 0212)$B$KJQ49$5$l$^(B
-  $B$9!%$J$*!$$3$NJQ49$K$*$$$F$O!$(BSJIS --> EUC_JP $B$GJQ49$7!$:F$S(B EUC_JP --
-  > SJIS $B$KJQ49$9$k$H85$N(B SJIS $B$KLa$i$J$$$3$H$,$"$j$^$9!%$^$?!$(BEUC_JP --
-  > SJIS $B$NJQ49$G$O!$$9$Y$F$NJ8;z$rJQ49$G$-$k$o$1$G$O$J$$$N$G!$$=$N>l(B
-  $B9g$OJQ49ITG=J8;z$H$7$F!V".!W$KCV$-49$($^$9!%(B
-
-  *$B6H3&CDBN$N<h$j7h$a$G$O!$JQ49ITG=J8;z$O!V<BAu0MB8!W$H$J$C$F$$$^$9$,!$(B
-  Solaris $B$r$O$8$a!$B?$/$N%7%9%F%`$,!V".!W$rJQ49ITG=J8;z$K:NMQ$7$F$$$^(B
-  $B$9!%(BPostgreSQL$B$b$3$l$K9g$o$;$^$7$?!%(B
-
-  (3) NEC $BA*Dj(B IBM $B3HD%J8;zNN0h(B (SJIS 89$B!A(B92 $B6h(B)
-  
-  PostgreSQL 7.0$B$G$O$9$Y$FJQ49ITG=J8;z!V".!W$KCV$-49$($i$l$^$9!%(B
-
-  PostgreSQL 7.0.1$B0J9_$G$O!$0lC6(B IBM $B3HD%J8;zNN0h$KJQ49$5$l$?8e!$(BG1
-  (JIS X 0208)$B$H!$(BG3 (JIS X 0212)$B$KJQ49$5$l$^$9!%(B
-
-$B<U<-!'(B
-
-  o $BFA2H(B@$B;06(1?M"%5!<%S%9$5$s$+$i!$(BNEC $BA*Dj(B IBM $B4A;zBP1~%Q%C%A$rDs6!$7(B
-    $B$F$$$?$@$-$^$7$?!%(B
-
-  o $B3F<oJ8;z%;%C%H!$%3!<%I7O$K$D$$$F!$F|K\8l(B PostgreSQL $B%a!<%j%s%0%j%9%H(B
-    $B$N%a%s%P$NJ}$+$i%"%I%P%$%9$rD:$-$^$7$?!%$3$3$K46<U$7$^$9!%(B
-    $B$^$?!$(BSJIS $BBP1~$K$D$$$F$O!$;T@n(B@$B$*CcBg$5$s$N%Q%C%A$r;29M$K$5$;$F$$(B
-    $B$?$@$-$^$7$?!%(B
-
-  o SJIS$B%f!<%6Dj5AJ8;z(B (UDC) $B$r$I$&07$&$+$H8@$&$3$H$K$D$$$FCf>r$5$s(B
-    (nak@email.com)$B$+$iLdBjDs5/$H>\:Y$J2r@b$rD:$-$^$7$?!%(B
-
-$B"#(BUnicode$B$H$=$l0J30$N%(%s%3!<%G%#%s%0$H$NAj8_JQ49$K$D$$$F(B
-
-  PostgreSQL 7.1$B$+$i(BUnicode$B$H$=$l0J30$N%(%s%3!<%G%#%s%0$H$NAj8_JQ49$,(B
-  $B2DG=$K$J$j$^$7$?!%$3$NJQ49$O$4$/0lIt$NJ8;z%3!<%I(B(ISO 8859-1)$B$r$N$>$-!$(B
-  $B%m%8%C%/$K$h$kJQ49$,$G$-$J$$$?$a!$JQ49$N:]$K$O%F!<%V%k$,I,MW$K$J$j$^(B
-  $B$9!%(BPostgreSQL$B$N<BAu$G$O!$(BUnicode$BJQ49%F!<%V%k$O(B Unicode organization 
-  $B$,Ds6!$9$k$b$N$r;HMQ!$$3$l$r(BPerl$B%W%m%0%i%`$G(BC$B8@8l$N%F!<%V%k$KJQ49$7(B
-  $B$F:n@.$7$F$$$^$9(B(Perl$B%W%m%0%i%`$O(BNARITA Tomio$B;a:n@.$N(Blv$B%P!<%8%g%s(B
-  4.3.6 $B$KIUB0$9$k$b$N$r2~B$$N>e!$MxMQ$7$F$$$^$9(B)$B!%(BUnicode
-  organization$B$NDs6!$9$kJQ49%F!<%V%k$O:FG[I[$,5v2D$5$l$F$$$J$$$?$a!$(B
-  PostgreSQL$B$N%=!<%9%3!<%I$K$O4^$^$l$F$$$^$;$s!%0J2<!$;HMQ$7$?JQ49%F!<(B
-  $B%V%k$rNs5s$7$^$9!%(B
-
-  $B%(%s%3!<%G%#%s%0(B	$BJQ49%F!<%V%k(B
-  ============================================================
-  ISO 8859-1		$B$J$7(B
-  ISO 8859-2		8859-2.TXT
-  ISO 8859-3		8859-3.TXT
-  ISO 8859-4		8859-4.TXT
-  ISO 8859-5		8859-5.TXT
-  ISO 8859-6		8859-6.TXT
-  ISO 8859-7		8859-7.TXT
-  ISO 8859-8		8859-8.TXT
-  ISO 8859-9		8859-9.TXT
-  ISO 8859-10		8859-10.TXT
-  ISO 8859-13		8859-13.TXT
-  ISO 8859-14		8859-14.TXT
-  ISO 8859-15		8859-15.TXT
-  ISO 8859-16		8859-16.TXT
-  EUC_JP		JIS0201.TXT, JIS0208.TXT, JIS0212.TXT,
-			CP932.TXT, sjis.map
-  SJIS			CP932.TXT
-  EUC_CN		GB2312.TXT
-  GBK			CP936.TXT
-  EUC_KR		KSX1001.TXT
-  UHC			CP949.TXT
-  JOHAB			JOHAB.TXT
-  EUC_TW		CNS11643.TXT
-  Big5			BIG5.TXT
-  WIN1256		CP1256.TXT
-  TCVN			CP1258.TXT
-  WIN874		CP874.TXT
-  ============================================================
-
-$B<U<-!'(B
-
-  o $BFA2H(B@$B;06(1?M"%5!<%S%9$5$s$+$i!$(BCP932.TXT$B$h$j@8@.$7$?(BSJIS$BMQ$NJQ49%F!<(B
-    $B%V%k$rDs6!$7$F$$$?$@$-$^$7$?!%$3$l$K$h$j!$(BIBM $B3HD%J8;zNN0h(B (SJIS
-    115$B!A(B120 $B6h(B), NEC $BA*Dj(B IBM $B3HD%J8;zNN0h(B (SJIS 89$B!A(B92 $B6h(B)$B$KBP1~$9$k(B
-    $B$3$H$,$G$-$k$h$&$K$J$j$^$7$?!%(B
-
-
-$B;29M(B1$B!'(B
-
-  Pavel Behal$B;a$K$h$jDs6!$5$l$?(BWIN1250$B%5%]!<%H$G$9$,!$(BWindows$B4D6-$G$N(B
-  $BMxMQ$N;EJ}$K$D$$$F;29M$K$J$k%I%-%e%a%s%H$,IUB0$7$F$$$k$N$G!$$3$3$KE:(B
-  $BIU$7$F$*$-$^$9!%(B
-
-  -------------------------------------------------------------------
-Version: 0.91 for PgSQL 6.5
-Author: Pavel Behal
-Revised by: Tatsuo Ishii
-Email: behal@opf.slu.cz
-Licence: The Same as PostgreSQL
-
-Sorry for my Eglish and C code, I'm not native :-)
-
-!!!!!!!!!!!!!!!!!!!!!!!!! NO WARRANTY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-Instalation:
-------------
-1) Change three affected files in source directories 
-    (I don't have time to create proper patch diffs, I don't know how)
-	[PostgreSQL 6.5.1$B$G$O$3$N%9%F%C%W$OI,MW$"$j$^$;$s!%(B-- $B@P0f(B]
-2) Compile with enabled locale and multibyte set to LATIN2
-3) Setup properly your instalation, do not forget to create locale
-   variables in your profile (environment). Ex. (may not be exactly true):
-	LC_ALL=cs_CZ.ISO8859-2
-	LC_COLLATE=cs_CZ.ISO8859-2
-	LC_CTYPE=cs_CZ.ISO8859-2
-	LC_MONETARY=cs_CZ.ISO8859-2
-	LC_NUMERIC=cs_CZ.ISO8859-2
-	LC_TIME=cs_CZ.ISO8859-2
-4) You have to start the postmaster with locales set!
-5) Try it with Czech language, it have to sort
-5) Install ODBC driver for PgSQL into your M$ Windows
-6) Setup properly your data source. Include this line in your ODBC
-   configuration dialog in field "Connect Settings:" :
-	SET CLIENT_ENCODING = 'WIN1250';
-7) Now try it again, but in Windows with ODBC.
-
-Description:
-------------
-- Depends on proper system locales, tested with RH6.0 and Slackware 3.6,
-  with cs_CZ.iso8859-2 loacle
-- Never try to set-up server multibyte database encoding to WIN1250,
-  always use LATIN2 instead. There is not WIN1250 locale in Unix
-- WIN1250 encoding is useable only for M$W ODBC clients. The characters are
-  on thy fly re-coded, to be displayed and stored back properly
- 
-Important:
-----------
-- it reorders your sort order depending on your LC_... setting, so don't be
-  confused with regression tests, they don't use locale
-- "ch" is corectly sorted only in some newer locales (Ex. RH6.0)
-- you have to insert money as '162,50' (with comma in aphostrophes!)
-- not tested properly
-  -------------------------------------------------------------------
-
-$B;29M(B2$B!'(BSJIS$B%f!<%6Dj5AJ8;z(B (UDC) $B$r$I$&07$&$+$H8@$&$3$H$K$D$$$FCf>r$5$s(B
-    (nak@email.com)$B$+$i$$$?$@$$$?LdBjDs5/$H2r@b$G$9!%(B
-
--------------------------- $B0zMQ3+;O(B ----------------------------------
----
-1. SJIS $B%3!<%I$NHO0O(B
-
-    1 $B%P%$%HL\(B 0x81 - 0x9F$B!$(B0xE0 - 0xFC
-    2 $B%P%$%HL\(B 0x40 - 0x7E$B!$(B0x80 - 0xFC
-
-    $B$$$o$f$k!V30;zNN0h!W$NHO0O(B:
-
-    - X0208 $B6&DL<+M3NN0h(B
-
-    |--------------------
-    | 85 $B6h(B  0xEB40 $B!A(B
-    |...
-    |--------------------
-    | 89 $B6h(B  0xED40 $B!A(B    ; 89$B!A(B92 $B6h$O(B
-    |...                  ; $B!V(BNEC $BA*Dj(B IBM $B3HD%J8;zNN0h!W(B
-    |-------------------- ; $B$H8F$P$l$k(B
-    | 93 $B6h(B  0xEF40 $B!A(B
-    | 94 $B6h(B  0xEF9F $B!A(B 0xEFFC
-
-    - $B%f!<%6Dj5AJ8;zNN0h(B
-    
-    |--------------------
-    | 95 $B6h(B  0xF040 $B!A(B    ; 95$B!A(B104 $B6h(B
-    |...                  ; $B!V%f!<%6Dj5AJ8;zNN0h(B A$B!W(B($B2>>N(B)
-    |--------------------
-    |105 $B6h(B  0xF540 $B!A(B    ; 105$B!A(B114 $B6h(B
-    |...                  ; $B!V%f!<%6Dj5AJ8;zNN0h(B B$B!W(B($B2>>N(B)
-    |--------------------
-    |115 $B6h(B  0xFA40 $B!A(B    ; 115$B!A(B120 $B6h$O0lHL$K(B
-    |...                  ; $B!V(BIBM $B3HD%J8;zNN0h!W(B
-    |120 $B6h(B  ...          ; $B$H8F$P$l$k(B
-    |--------------------
-
----
-2. i-mode $BC<Kv$,;H$C$F$$$k?^7AJ8;z%3!<%I$NHO0O(B
-
-    0xF89F - 0xF8FC  (112 $B6h(B)
-    0xF940 - 0xF949  (113 $B6h(B)
-    0xF972 - 0xF97E  (113 $B6h(B)
-    0xF980 - 0xF990  (113 $B6h(B)
-    0xF9B0           (114 $B6h(B)
-
----
-3. $B0lHLE*$J(B EUC $BF|K\8l%3!<%I$NDj5A(B
-
-    G0 : [0x21-0x7E]                  ; $B$$$o$f$k(B JIS ROMAN
-    G1 : [0xA1-0xFE] [0xA1-0xFE]      ; JIS X 0208 
-    G2 : 0x8E [0xA1-0xDF]             ; JIS X 0201 $B%+%J(B
-    G3 : 0x8F [0xA1-0xFE] [0x21-0x7E] ; JIS X 0212 $BJd=u4A;z(B
-
----
-[$BLdBjE@(B]
-
-SJIS 95$B!A(B120 $B6h$O(B JIS X0208 $B$K3:Ev$9$kNN0h$,B8:_$7$J$$(B
-$B$?$a!$$3$NNN0h$N(B EUC - SJIS $BJ8;z%3!<%IJQ49$O3F%Y%s%@$K(B
-$B$h$C$F0[$J$k$N$G$O$J$$$+!$$H$$$&$N$,@P0fMM$+$i$N$4;XE&(B
-$B$G$7$?!%(B
-
----
-[$B5DO@(B]
-
-$BD4::$N7k2L!$(BSJIS 95$B!A(B120 $B6h$r(B EUC $B$KJQ49$9$k$?$a$NI8=`E*$J(B
-$B%k!<%k$,$J$$$o$1$G$O$J$$!$$H$$$&$3$H$,$o$+$j$^$7$?!%>\:Y$O(B
-$B8e=R$N;29M;qNA$r$4Mw$$$?$@$/$H$7$F!$$3$3$G$O$=$N%k!<%k$r(B
-$B4JC1$K$4@bL@$$$?$7$^$9!%(B
-
-   - SJIS $B%f!<%6Dj5AJ8;zNN0h(B A ($B2>>N(B)
-          95$B!A(B104 $B6h(B  $B"+"*(B $BF|K\8l(B EUC / G1 85$B!A(B95 $B6h(B
-
-         $B$?$H$($P(B SJIS $B$N(B (95, 1) = 0xF040 $B$O(B
-         EUC $B$N(B 0xF5A1 $B$K$J$j$^$9!%(B
-
-   - SJIS $B%f!<%6Dj5AJ8;zNN0h(B B ($B2>>N(B)
-         105$B!A(B114 $B6h(B  $B"+"*(B $BF|K\8l(B EUC / G3 85$B!A(B95 $B6h(B
-
-         $B$?$H$($P(B SJIS $B$N(B (105, 1) = 0xF540 $B$O(B
-         EUC $B$N(B 0x8FF5A1 $B$K$J$j$^$9!%(B
-
-   - IBM $B3HD%J8;zNN0h(B
-         115$B!A(B120 $B6h(B
-
-         JIS X 0208 ($BF|K\8l(B EUC / G1)$B!$(BJIS X 0212 
-         ($BF|K\8l(B EUC / G3) $B$K3:Ev$9$kJ8;z$,$"$k>l9g(B
-         $B$O$=$NJ8;z$K%^%C%T%s%0!%$=$&$G$J$$>l9g$O(B
-         $BF|K\8l(B EUC / G3 83$B!A(B84 $B6h$r!$6hE@%3!<%I$N>e0L(B
-         $B$+$i=g$K3d$jEv$F$F$$$/(B ($BJQ49%F!<%V%kJ}<0(B)
-
-$B$3$N;EMM$O!$9-$/;H$o$l$F$$$k(B SJIS $B$H(B EUC $B$N%^%C%T%s%0$,%Y%s%@$K(B
-$B$h$C$F0[$J$k$?$a!$Aj8_1?MQ$N:]$KLdBj$K$J$C$F$$$k$3$H$+$i!$(B1996 
-$BG/$K(B OSF $BF|K\%Y%s%@6(5D2q$,8!F$:n@.$7$?Js9p=q$,%Y!<%9$K$J$C$F$$(B
-$B$k$h$&$G$9!%(B
-
-Solaris $B$N%I%-%e%a%s%H$K$O!V(BTOG $BF|K\%Y%s%@6(5D2q?d>)(B EUC$B!&%7%U%H(B 
-JIS $B%3!<%IJQ49;EMM!W$K$b$H$E$/$H=q$$$F$"$j!$(BSolaris 2.6 $B$+$iF3F~(B
-$B$7$F$$$k$N$@$=$&$G!$;d$+$i8+$l$P;v<B>e$NI8=`$H9M$($F$bIT<+A3$G$O(B
-$B$J$$$H46$8$^$9!%(B
-
-$B$J$*!$>/$J$/$H$b(B 1996 $BG/Ev;~$K$*$$$F$O!$(BOracle $B$d(B Sybase $B$O(B 
-SJIS $B$N%f!<%6Dj5A(B/$B%Y%s%@Dj5AJ8;zNN0h$r(B EUC $B$KJQ49$9$k:]!$H=JLIT(B
-$B2DG=J8;z$H$7$F07$C$F$$$k$i$7$$$H$$$&$3$H$bJdB-$7$F$*$-$^$9!%(B
-
----
-[$B;29M;qNA(B]
-
-// URL $B$,D9$$$N$G!$ESCf$G@Z$l$J$$$H$$$$$N$G$9$,(B...
-
--$B!VF|K\8l(B EUC$B!&%7%U%H(B JIS $B%3!<%IJQ49;EMM$H%3!<%I7O<BBVD4::!W(B
-    1966, OSF $BF|K\%Y%s%@6(5D2q(B
-    http://www.opengroup.or.jp/jvc/cde/sjis-euc.html
-
--$B!VJ8;z%3!<%IJQ495,B'!W(B
-    Solaris 7$B!$(BJFP $B%f!<%6!<%:%,%$%I(B
-    http://docs.sun.com/ab2/coll.139.3/JFPUG/@Ab2PageView/11683?Ab2Lang=ja&Ab2Enc=euc-jp
-
--$B!VF|K\8lJ8;z%3!<%I!W(B
-    Solaris 7$B!$(BJFP $B%f!<%6!<%:%,%$%I(B
-    http://docs.sun.com/ab2/coll.139.3/JFPUG/@Ab2PageView/879;td=5?Ab2Lang=ja&Ab2Enc=euc-jp
-
-    // $BFf$N!V(B1$B!A(B20 $B6h!W$N5-=R$O$3$3$+$i$-$F$$$^$9!%(B
-
----
--------------------------- $B0zMQ$3$3$^$G(B ---------------------------------
-
-$B2~DjMzNr!'(B
-
-  2002/10/21
-	* $B%^%k%A%P%$%HBP1~$,%*%W%7%g%s$G$O$J$/!$8GDj$GI,$:AH$_9~$^$l$k(B
-	  $B$h$&$K$J$j$^$7$?!%(B
-
-	* CREATE CONVERSION/DROP CONVERSION$B$NDI2C!%$3$l$K$H$b$J$$!$%((B
-	  $B%s%3!<%G%#%s%0JQ494X?t$,%m!<%@%V%k4X?t$K$J$j!$%P%C%/%(%s%I$N(B
-	  $B%m!<%I%b%8%e!<%k%5%$%:$,(B7.2$B$h$j$b>.$5$/$J$C$F$$$^$9!%$^$?!$(B
-	  SQL$BI8=`$N(BCONVERT$B4X?t$rDI2C$7$^$7$?!%(B
-	* $B$$$/$D$+%(%s%3!<%G%#%s%0$,DI2C$5$l$F$$$^$9!%(B
-	* $B0J>e!$(B7.3$B$KH?1G$5$l$^$9!%(B
-
-  2001/10/01
-	* CONVERT$B$NDI2C!%(Blpad/rpad/trim/btrim/ltrim/rtrim/translate$B$N(B
-	  $B%^%k%A%P%$%HBP1~DI2C!%(Bchar/varchar$B$G%P%$%H?t$G$O$J$/!$J8;z?t(B
-	  $B$G%5%$%:$rDj5A$9$k$h$&$KJQ99!%0J>e!$(B7.2$B$KH?1G$5$l$^$9!%(B
-
-  2001/2/15
-	* $BFA2H(B@$B;06(1?M"%5!<%S%9$5$s$+$i!$(BCP932.TXT$B$h$j@8@.$7$?(BSJIS$BMQ$N(B
-	  $BJQ49%F!<%V%k$rDs6!$7$F$$$?$@$-$^$7$?!%(B7.1$B$KH?1G$5$l$^$9!%(B
-
-  2001/1/6
-	* UNICODE$B$HB>$N%(%s%3!<%G%#%s%0$H$NAj8_JQ495!G=$rDI2C!%(B
-	* 7.1$B$KH?1G$5$l$^$9!%(B
-
-  2000/5/20
-	* NEC $BA*Dj(B IBM $B4A;zBP1~$rDI2C$7$^$7$?!%$3$l$O(B $BFA2H(B@$B;06(1?M"%5!<%S%9(B
-	  $B$5$s$+$i$N(B contribute $B$G$9!%(B
-	* $B$3$l$i$O!$(B7.0.1 $B$KH?1G$5$l$^$9!%(B
-
-  2000/3/22
-	* PQsetClientEncoding, PQclientEncoding $B$r(Blibpq $B4X?t$KDI2C!$(B
-	  $B%3%M%/%7%g%sKh$K%(%s%3!<%G%#%s%0$rJQ992DG=$K!%(B
-	* SJIS $B%f!<%6Dj5AJ8;z(B (UDC) $B$X$NBP1~(B
-  	* ./configure --with-mb=EUC_JP $B$+$i(B
-	  ./configure --enable-multibyte=EUC_JP $B$KJQ99(B
-  	* SQL_ASCII $B$N(B regression test $BDI2C(B
-	* $B$3$l$i$O(B 7.0 $B$KH?1G$5$l$^$9!%(B
-
-  1999/7/11 WIN1250(Windows$BMQ$N%A%'%38l(B)$B%5%]!<%H$rDI2C$7$^$7$?!%(B
-	* WIN1250 $B$,%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$H$7$FMxMQ$G$-$k$h(B
-	  $B$&$K$J$j$^$7$?!%$3$N>l9g!$%P%C%/%(%s%IB&$N%(%s%3!<%G%#%s%0$O(B
-	  LATIN2 $B$^$?$O(B MULE_INTERNAL $B$H$7$^$9!%(B
-	  (contributed by Pavel Behal)
-	* backend/utils/mb/conv.c$B$K$*$1$k7?$NIT@09g$r=$@5$7$^$7$?!%(B
-	  (contributed by Tomoaki Nishiyama)
-	* $B$3$l$i$O(B6.5.1$B$KH?1G$5$l$^$9!%(B
-
-  1999/3/23 $B%-%j%kJ8;z%5%]!<%HDI2CB>(B(6.5 $B$KH?1G:Q(B)
-	* $B%(%s%3!<%G%#%s%0$H$7$F(B KOI8(KOI8-R), WIN(CP1251), ALT(CP866) $B$r(B
-	  $B%5%]!<%H$7$F$$$^$9!%$3$l$i$O!$%U%m%s%H%(%s%I!$%P%C%/%(%s%I!$(B
-	  $B$I$A$i$N%(%s%3!<%G%#%s%0$H$7$F$b;HMQ2DG=$G$"$j!$%(%s%3!<%G%#%s%0$N(B
-	  $BAj8_JQ49$,2DG=$G$9!%$^$?!$=>Mh$+$i%5%]!<%H$7$F$$$k(B ISO 8859-5 $B$b(B
-	  $BF1MM$K;HMQ2DG=$G$9!%(B
-	  $B%-%j%kJ8;z%5%]!<%H$O!$(BOleg Broytmann <phd@sun.med.ru> $B;a$N(B
-	  $B%j%/%(%9%H5Z$S6(NO$K$h$j<B8=$7$^$7$?!%$3$l$O!$=>Mh$+$i$"$k(B
-	  RCODE $B%5%]!<%H$N5!G=$r<h$j9~$`$b$N$G$b$"$j$^$9!%(B
-	* MB $B$H(B locale $B$rF1;~$K;XDj$7$?>l9g$KBgJ8;z!?>.J8;z$rL5;k$7$?(B
-	  $B@55,I=8=8!:w$,@5>o$KF0:n$7$J$$%P%0$r=$@5(B
-
-  1999/1/26 Big5 $B%5%]!<%HDI2C(B(6.4.2-patched/6.5 $B$KH?1G:Q(B)
-	* Big5 $B$,%U%m%s%H%(%s%IB&$N%(%s%3!<%G%#%s%0$H$7$FMxMQ$G$-$k$h(B
-	  $B$&$K$J$j$^$7$?!%$3$N>l9g!$%P%C%/%(%s%IB&$N%(%s%3!<%G%#%s%0$O(B
-	  EUC_TW $B$^$?$O(B MULE_INTERNAL $B$H$7$^$9!%(B
-	* EUC_TW $B$N(B regression test $B%1!<%9$rDI2C(B
-	  (contributed by Jonah Kuo <jonahkuo@mail.ttn.com.tw>)
-
-  1998/12/16 $BK\%I%-%e%a%s%H=$@5(B(6.4.2 $B$KH?1G:Q(B)$B!%(B
-	* Makefile.custom $B$G(B MB=EUC_JP $B$J$I$H@_Dj$9$kJ}K!$O(B 6.4 $B0J9_(B
-	  $B%5%]!<%H$5$l$F$$$J$$$N$G:o=|$7$?!%(B
-	* $BJ8;z%3!<%I(B $B"*(B $B%(%s%3!<%G%#%s%0!$%/%i%$%"%s%H"*%U%m%s%H%(%s%I(B
-	  $B%5!<%P"*%P%C%/%(%s%I(B $B$K$=$l$>$l8l6g$r=$@5!%(B
-
-  1998/12/15 6.4 $B8~$1%P%0=$@5%Q%C%A%j%j!<%9(B(6.4.2 $B$KH?1G:Q(B)$B!%(B
-	* SQL_ASCII $B%5%]!<%H$N%P%0=$@5(B
-
-  1998/11/21 6.4 $B8~$1%P%0=$@5%Q%C%A%j%j!<%9(B(6.4.2 $B$KH?1G:Q(B)$B!%(B
-	* BINARY CURSOR $B$NLdBj$r=$@5(B
-	* pg_dumpall $B$N%P%0=$@5(B
-
-  1998/11/5 6.4 $B%j%j!<%9!%(B
-	* pg_database $B$N(B encoding $B%+%i%`$,(B MB $B$,M-8z$G$J$$$H$-$K$b(B
-	  $BDI2C$5$l$k$h$&$K$J$C$?!%$=$N$?$a!$(BMB $B$,M-8z$G$J$$$H$-$K$O!$(B
-	  ASCII $B$N%(%s%3!<%G%#%s%0$rI=$9(B SQL_ASCII $B$r?7$7$$%(%s%3!<%G%#%s%0(B
-	  $B$H$7$FDI2C$7$?!%$3$l$K$H$b$J$$!$%(%s%3!<%G%#%s%0L>$KBP1~$9$k(B
-	  $B%(%s%3!<%G%#%s%0(BID$B$,(B SQL_ASCII $B$r(B 0 $B$H$9$kHV9f$KJQ99$K$J$C$?!%(B
-
-  1998/7/22 6.4 $B&A8~$1$K%Q%C%A$r%j%j!<%9!%(B
-	* initdb/createdb/create database $B$G%P%C%/%(%s%IB&$N(B
-	  $B%(%s%3!<%G%#%s%0$r@_Dj$-$k5!G=<BAu!%$3$N$?$a!$%7%9%F%`%+%?%m(B
-	  $B%0$N(B pg_database $B$K?7$7$$%+%i%`(B encoding $B$rDI2C(B(MB$B$,M-8z$J;~$@$1(B)
-	* copy $B$,(B PGCLIENTENCODING $B$KBP1~(B
-	* SQL92 $B$N(B "SET NAMES" $B$r%5%]!<%H(B(MB$B$,M-8z$J;~$@$1(B)
-	* LATIN2-5 $B$r%5%]!<%H(B
-	* regression test $B$K(B unicode $B$N%F%9%H%1!<%9$rDI2C(B
-	* MB $B@lMQ$N(B regression $B%F%9%H%G%#%l%/%H%j(B test/mb $B$rDI2C(B
-	* $B%=!<%9%U%!%$%k$NCV$->l=j$rBgI}8+D>$7!%(BMB $B4X78$O(B
-	  include/mb, backend/utils/mb $B$KCV$/$h$&$K$7$?(B
-
-  1998/5/25 $B%P%0=$@5(B(mb_b3.patch $B$H$7$F(B pgsql-jp ML $B$K%j%j!<%9!$(B
-	$BK\2H$G$O(B 6.4 snapshot $B$K<h$j9~$^$l$kM=Dj(B)	
-
-  1998/5/18 $B5!G=DI2C!?%P%0=$@5(B(mb_b2.patch $B$H$7$F(B pgsql-jp ML $B$K%j%j!<%9!$(B
-	$BK\2H$G$O(B 6.4 snapshot $B$K<h$j9~$^$l$kM=Dj(B)
-	* $B4D6-JQ?t(B PGCLIENTENCODING $B$N%5%]!<%H!%%U%m%s%H%(%s%IB&$N(B
-	  $B%(%s%3!<%G%#%s%0$r;XDj$9$k!%8=:_!$(BSJIS, EUC_*, MULE_INTERNAL, 
-	  LATIN1 $B$,;XDj$G$-$k!%$^$?!$(B
-	  set client_encoding to 'sjis';
-	  $B$G$b2DG=(B
-	* 8bit $BJ8;z$,EO$k$HLdBj$,5/$-$k2U=j$K$G$-$k$@$1BP1~(B
-
-  1998/4/21 $B5!G=DI2C!?%P%0=$@5(B(mb_b1.patch $B$H$7$F(B pgsql-jp ML $B$K%j%j!<%9!$(B
-	$BK\2H$G$O(B 6.4 snapshot $B$K<h$j9~$^$l$F$$$k(B)
-	* character_length(), position(), substring() $B$N%^%k%A%P%$%H(B
-	  $BBP1~(B
-	* octet_length() $BDI2C(B $B"*(B initdb $B$N$d$jD>$7I,MW(B
-	* configure $B$N%*%W%7%g%s$K(B MB $B%5%]!<%HDI2C(B
-	  (ex. configure --with-mb=EUC_JP)
-	* EUC_KR $B$N(B regression test $BDI2C(B
-	  ("Soonmyung. Hong" <hong@lunaris.hanmesoft.co.kr> $B$5$sDs6!(B)
-	* EUC_JP $B$N(B regression test $B$K(B character_length(), position(),
-	  substring(), octet_length() $BDI2C(B
-	* regress.sh $B$N(B SystemV $B$K$*$1$kHs8_49@-=$@5(B
-	* toupper(), tolower() $B$K(B 8bit $BJ8;z$,EO$k$HMn$A$k$3$H$,(B
-	  $B$"$k$N$r=$@5(B
-
-  1998/3/25 PostgreSQL 6.3.1 $B%j%j!<%9!$(BMB PL2 $B$,<h$j9~$^$l$k(B
-
-  1998/3/10 PL2 $B$r%j%j!<%9(B
-	* EUC_JP, EUC_CN, MULE_INTERNAL $B$N(B regression test $B$rDI2C(B
-	  (EUC_CN $B$N%G!<%?$O(B he@sra.co.jp $B$5$sDs6!(B)
-	* regexp $B$K$*$$$F!$(Bisalpha $B$J$I$K(B unsigend char $B0J30$NCM$,(B
-          $BEO$i$J$$$h$&$K%,!<%I$r$+$1$k(B
-	* $B1Q8l$N%I%-%e%a%s%H$rDI2C(B
-	* MB $B$rDj5A$7$J$$>l9g$KH/@8$9$k%P%0$r=$@5(B
-
-  1998/3/1 PL1 $B$r%j%j!<%9(B
-
-$B0J>e!%(B
diff --git a/doc/bug.template b/doc/bug.template
index f921883ecb670..7cd063fcf7a0a 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration:
 
   Operating System (example: Linux 2.4.18)	:
 
-  PostgreSQL version (example: PostgreSQL 9.1beta2):  PostgreSQL 9.1beta2
+  PostgreSQL version (example: PostgreSQL 9.1.2):  PostgreSQL 9.1.2
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index c5078a80801c4..e6c8a49df8782 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -206,10 +206,19 @@ postgres.pdf:
 ##
 
 JADE.text = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -i output-text -t sgml
+ICONV = iconv
 LYNX = lynx
 
+# The release notes may contain non-ASCII characters (for contributor
+# names), which lynx converts to the encoding determined by the
+# current locale.  The get output that is deterministic and easily
+# readable by everyone, we make lynx produce LATIN1 and then convert
+# that to ASCII with transliteration for the non-ASCII characters.
+# Official releases are currently built on FreeBSD, which has limited
+# locale support and is very picky about locale name spelling.  The
+# below has been finely tuned to run on FreeBSD and Linux/glibc.
 INSTALL HISTORY regress_README: % : %.html
-	$(PERL) -p -e 's/<H(1|2)$$/<H\1 align=center/g' $< | $(LYNX) -force_html -dump -nolist -stdin > $@
+	$(PERL) -p -e 's/<H(1|2)$$/<H\1 align=center/g' $< | LC_ALL=en_US.ISO8859-1 $(LYNX) -force_html -dump -nolist -stdin | $(ICONV) -f latin1 -t us-ascii//TRANSLIT > $@
 
 INSTALL.html: standalone-install.sgml installation.sgml version.sgml
 	$(JADE.text) -V nochunks standalone-install.sgml installation.sgml > $@
diff --git a/doc/src/sgml/auth-delay.sgml b/doc/src/sgml/auth-delay.sgml
index b91a7ecda7aea..e377c980cab91 100644
--- a/doc/src/sgml/auth-delay.sgml
+++ b/doc/src/sgml/auth-delay.sgml
@@ -17,7 +17,7 @@
  </para>
 
  <para>
-  In order to function, this module must be loaded via 
+  In order to function, this module must be loaded via
   <xref linkend="guc-shared-preload-libraries"> in <filename>postgresql.conf</>.
  </para>
 
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index 03180cf108479..a880a75fd8b39 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -579,7 +579,7 @@ tar -cf backup.tar /usr/local/pgsql/data
     character in the command.  The simplest useful command is something
     like:
 <programlisting>
-archive_command = 'cp -i %p /mnt/server/archivedir/%f &lt;/dev/null'  # Unix
+archive_command = 'test ! -f /mnt/server/archivedir/%f &amp;&amp; cp %p /mnt/server/archivedir/%f'  # Unix
 archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"'  # Windows
 </programlisting>
     which will copy archivable WAL segments to the directory
@@ -588,7 +588,7 @@ archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"'  # Windows
     <literal>%p</> and <literal>%f</> parameters have been replaced,
     the actual command executed might look like this:
 <programlisting>
-cp -i pg_xlog/00000001000000A900000065 /mnt/server/archivedir/00000001000000A900000065 &lt;/dev/null
+test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_xlog/00000001000000A900000065 /mnt/server/archivedir/00000001000000A900000065
 </programlisting>
     A similar command will be generated for each new file to be archived.
    </para>
@@ -617,18 +617,19 @@ cp -i pg_xlog/00000001000000A900000065 /mnt/server/archivedir/00000001000000A900
     preserve the integrity of your archive in case of administrator error
     (such as sending the output of two different servers to the same archive
     directory).
+   </para>
+
+   <para>
     It is advisable to test your proposed archive command to ensure that it
     indeed does not overwrite an existing file, <emphasis>and that it returns
-    nonzero status in this case</>.  On many Unix platforms, <command>cp
-    -i</> causes copy to prompt before overwriting a file, and
-    <literal>&lt; /dev/null</> causes the prompt (and overwriting) to
-    fail.  If your platform does not support this behavior, you should
-    add a command to test for the existence of the archive file.  For
-    example, something like:
-<programlisting>
-archive_command = 'test ! -f /mnt/server/archivedir/%f &amp;&amp; cp %p /mnt/server/archivedir/%f'
-</programlisting>
-    works correctly on most Unix variants.
+    nonzero status in this case</>.
+    The example command above for Unix ensures this by including a separate
+    <command>test</> step.  On some Unix platforms, <command>cp</> has
+    switches such as <option>-i</> that can be used to do the same thing
+    less verbosely, but you should not rely on these without verifying that
+    the right exit status is returned.  (In particular, GNU <command>cp</>
+    will return status zero when <option>-i</> is used and the target file
+    already exists, which is <emphasis>not</> the desired behavior.)
    </para>
 
    <para>
@@ -868,7 +869,11 @@ SELECT pg_stop_backup();
     of mistakes when restoring.  This is easy to arrange if
     <filename>pg_xlog/</> is a symbolic link pointing to someplace outside
     the cluster directory, which is a common setup anyway for performance
-    reasons.
+    reasons.  You might also want to exclude <filename>postmaster.pid</>
+    and <filename>postmaster.opts</>, which record information
+    about the running <application>postmaster</>, not about the
+    <application>postmaster</> which will eventually use this backup.
+    (These files can confuse <application>pg_ctl</>.)
    </para>
 
    <para>
@@ -1212,7 +1217,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
       <literal>on</>, and set up an <varname>archive_command</> that performs
       archiving only when a <emphasis>switch file</> exists.  For example:
 <programlisting>
-archive_command = 'test ! -f /var/lib/pgsql/backup_in_progress || cp -i %p /var/lib/pgsql/archive/%f &lt; /dev/null'
+archive_command = 'test ! -f /var/lib/pgsql/backup_in_progress || (test ! -f /var/lib/pgsql/archive/%f &amp;&amp; cp %p /var/lib/pgsql/archive/%f)'
 </programlisting>
       This command will perform archiving when
       <filename>/var/lib/pgsql/backup_in_progress</> exists, and otherwise
@@ -1265,7 +1270,7 @@ restore_command = 'gunzip &lt; /mnt/server/archivedir/%f | pg_decompresslog - %p
       <varname>archive_command</varname>, so that their
       <filename>postgresql.conf</> entry looks very simple:
 <programlisting>
-archive_command = 'local_backup_script.sh'
+archive_command = 'local_backup_script.sh "%p" "%f"'
 </programlisting>
       Using a separate script file is advisable any time you want to use
       more than a single command in the archiving process.
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 8504555bac96f..c467c8bdae7df 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -1263,7 +1263,7 @@
       <entry><type>bool</type></entry>
       <entry>
        Role can log in. That is, this role can be given as the initial
-       session authorization identifier.
+       session authorization identifier
       </entry>
      </row>
 
@@ -1274,7 +1274,7 @@
        Role is a replication role. That is, this role can initiate streaming
        replication (see <xref linkend="streaming-replication">) and set/unset
        the system backup mode using <function>pg_start_backup</> and
-       <function>pg_stop_backup</>.
+       <function>pg_stop_backup</>
       </entry>
      </row>
 
@@ -1898,7 +1898,8 @@
       <entry><structfield>convalidated</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>Has the constraint been validated? Can only be false for foreign keys</entry>
+      <entry>Has the constraint been validated?
+       Currently, can only be false for foreign keys</entry>
      </row>
 
      <row>
@@ -4668,8 +4669,9 @@
 
   <para>
    The catalog <structname>pg_seclabel</structname> stores security
-   labels on database objects.  See the
-   <xref linkend="sql-security-label"> statement.
+   labels on database objects.  Security labels can be manipulated
+   with the <xref linkend="sql-security-label"> command.  For an easier
+   way to view security labels, see <xref linkend="view-pg-seclabels">.
   </para>
 
   <table>
@@ -6883,6 +6885,8 @@
    in the same way as in <structname>pg_description</structname> or
    <structname>pg_depend</structname>).  Also, the right to extend a
    relation is represented as a separate lockable object.
+   Also, <quote>advisory</> locks can be taken on numbers that have
+   user-defined meanings.
   </para>
 
   <table>
@@ -6983,9 +6987,7 @@
       <entry>any OID column</entry>
       <entry>
        OID of the object within its system catalog, or null if the
-       object is not a general database object.
-       For advisory locks it is used to distinguish the two key
-       spaces (1 for an int8 key, 2 for two int4 keys).
+       object is not a general database object
       </entry>
      </row>
      <row>
@@ -6993,10 +6995,11 @@
       <entry><type>smallint</type></entry>
       <entry></entry>
       <entry>
-       For a table column, this is the column number (the
+       Column number targeted by the lock (the
        <structfield>classid</> and <structfield>objid</> refer to the
-       table itself).  For all other object types, this column is
-       zero.  Null if the object is not a general database object
+       table itself),
+       or zero if the target is some other general database object,
+       or null if the target is not a general database object
       </entry>
      </row>
      <row>
@@ -7013,7 +7016,7 @@
       <entry></entry>
       <entry>
        Process ID of the server process holding or awaiting this
-       lock.  Null if the lock is held by a prepared transaction.
+       lock, or null if the lock is held by a prepared transaction
       </entry>
      </row>
      <row>
@@ -7066,7 +7069,8 @@
 
   <para>
    Advisory locks can be acquired on keys consisting of either a single
-   <type>bigint</type> value or two integer values.  A <type>bigint</type> key is displayed with its
+   <type>bigint</type> value or two integer values.
+   A <type>bigint</type> key is displayed with its
    high-order half in the <structfield>classid</> column, its low-order half
    in the <structfield>objid</> column, and <structfield>objsubid</> equal
    to 1.  Integer keys are displayed with the first key in the
@@ -7076,16 +7080,6 @@
    so the <structfield>database</> column is meaningful for an advisory lock.
   </para>
 
-  <para>
-   When the <structname>pg_locks</structname> view is accessed, the
-   internal lock manager data structures are momentarily locked, and
-   a copy is made for the view to display.  This ensures that the
-   view produces a consistent set of results, while not blocking
-   normal lock manager operations longer than necessary.  Nonetheless
-   there could be some impact on database performance if this view is
-   frequently accessed.
-  </para>
-
   <para>
    <structname>pg_locks</structname> provides a global view of all locks
    in the database cluster, not only those relevant to the current database.
@@ -7110,6 +7104,21 @@
    but it continues to hold the locks it acquired while running.)
   </para>
 
+  <para>
+   The <structname>pg_locks</structname> view displays data from both the
+   regular lock manager and the predicate lock manager, which are
+   separate systems.  When this view is accessed, the internal data
+   structures of each lock manager are momentarily locked, and copies are
+   made for the view to display.  Each lock manager will therefore
+   produce a consistent set of results, but as we do not lock both lock
+   managers simultaneously, it is possible for locks to be taken or
+   released after we interrogate the regular lock manager and before we
+   interrogate the predicate lock manager.  Each lock manager is only
+   locked for the minimum possible time so as to reduce the performance
+   impact of querying this view, but there could nevertheless be some
+   impact on database performance if it is frequently accessed.
+  </para>
+
  </sect1>
 
  <sect1 id="view-pg-prepared-statements">
@@ -7364,7 +7373,7 @@
       <entry></entry>
       <entry>
        Role can update system catalogs directly.  (Even a superuser cannot do
-       this unless this column is true.)
+       this unless this column is true)
       </entry>
      </row>
 
@@ -7378,6 +7387,18 @@
       </entry>
      </row>
 
+     <row>
+      <entry><structfield>rolreplication</structfield></entry>
+      <entry><type>bool</type></entry>
+      <entry></entry>
+      <entry>
+       Role is a replication role. That is, this role can initiate streaming
+       replication (see <xref linkend="streaming-replication">) and set/unset
+       the system backup mode using <function>pg_start_backup</> and
+       <function>pg_stop_backup</>
+      </entry>
+     </row>
+
      <row>
       <entry><structfield>rolconnlimit</structfield></entry>
       <entry><type>int4</type></entry>
@@ -7403,6 +7424,13 @@
        null if no expiration</entry>
      </row>
 
+     <row>
+      <entry><structfield>rolconfig</structfield></entry>
+      <entry><type>text[]</type></entry>
+      <entry></entry>
+      <entry>Role-specific defaults for run-time configuration variables</entry>
+     </row>
+
      <row>
       <entry><structfield>oid</structfield></entry>
       <entry><type>oid</type></entry>
@@ -8199,7 +8227,9 @@
    The view <structname>pg_timezone_names</structname> provides a list
    of time zone names that are recognized by <command>SET TIMEZONE</>,
    along with their associated abbreviations, UTC offsets,
-   and daylight-savings status.
+   and daylight-savings status.  (Technically,
+   <productname>PostgreSQL</productname> uses <acronym>UT1</> rather
+   than UTC because leap seconds are not handled.)
    Unlike the abbreviations shown in <link
    linkend="view-pg-timezone-abbrevs"><structname>pg_timezone_abbrevs</structname></link>, many of these names imply a set of daylight-savings transition
    date rules.  Therefore, the associated information changes across local DST
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 77c541b6cb0ea..f6f858d47404f 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -231,7 +231,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
        An IP address is specified in standard dotted decimal
        notation with a <acronym>CIDR</> mask length.  The mask
        length indicates the number of high-order bits of the client
-       IP address that must match.  Bits to the right of this must
+       IP address that must match.  Bits to the right of this should
        be zero in the given IP address.
        There must not be any white space between the IP address, the
        <literal>/</literal>, and the CIDR mask length.
@@ -990,7 +990,9 @@ omicron         bryanh                  guest1
     <productname>Kerberos</productname> when possible and automatically
     fall back to <productname>NTLM</productname> in other cases.
     <productname>SSPI</productname> authentication only works when both
-    server and client are running <productname>Windows</productname>.
+    server and client are running <productname>Windows</productname>,
+    or, on non-Windows platforms, when <productname>GSSAPI</productname>
+    is available.
    </para>
 
    <para>
@@ -1385,7 +1387,8 @@ omicron         bryanh                  guest1
       <term><literal>ldapserver</literal></term>
       <listitem>
        <para>
-        Name or IP of LDAP server to connect to.
+        Names or IP addresses of LDAP servers to connect to. Multiple
+        servers may be specified, separated by spaces.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 39819695d17e8..f797860d1c078 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -259,7 +259,7 @@ SET ENABLE_SEQSCAN TO OFF;
       </indexterm>
       <listitem>
        <para>
-        Specifies the name of an additional process-id (PID) file that the
+        Specifies the name of an additional process-ID (PID) file that the
         server should create for use by server administration programs.
         This parameter can only be set at server start.
        </para>
@@ -1420,11 +1420,18 @@ SET ENABLE_SEQSCAN TO OFF;
         This parameter can only be set at server start.
        </para>
        <para>
-        In <literal>minimal</> level, WAL-logging of some bulk operations, like
-        <command>CREATE INDEX</>, <command>CLUSTER</> and <command>COPY</> on
-        a table that was created or truncated in the same transaction can be
-        safely skipped, which can make those operations much faster (see
-        <xref linkend="populate-pitr">). But minimal WAL does not contain
+        In <literal>minimal</> level, WAL-logging of some bulk
+        operations can be safely skipped, which can make those
+        operations much faster (see <xref linkend="populate-pitr">).
+        Operations in which this optimization can be applied include:
+        <simplelist>
+         <member><command>CREATE TABLE AS</></member>
+         <member><command>CREATE INDEX</></member>
+         <member><command>CLUSTER</></member>
+         <member><command>COPY</> into tables that were created or truncated in the same
+         transaction</member>
+        </simplelist>
+        But minimal WAL does not contain
         enough information to reconstruct the data from a base backup and the
         WAL logs, so either <literal>archive</> or <literal>hot_standby</>
         level must be used to enable
@@ -1499,7 +1506,7 @@ SET ENABLE_SEQSCAN TO OFF;
      </varlistentry>
 
      <varlistentry id="guc-synchronous-commit" xreflabel="synchronous_commit">
-      <term><varname>synchronous_commit</varname> (<type>boolean</type>)</term>
+      <term><varname>synchronous_commit</varname> (<type>enum</type>)</term>
       <indexterm>
        <primary><varname>synchronous_commit</> configuration parameter</primary>
       </indexterm>
@@ -1844,9 +1851,9 @@ SET ENABLE_SEQSCAN TO OFF;
         <varname>archive_mode</> and <varname>archive_command</> are
         separate variables so that <varname>archive_command</> can be
         changed without leaving archiving mode.
-        This parameter can only be set at server start. <varname>wal_level</>
-        must be set to <literal>archive</> or <literal>hot_standby</> to
-        enable <varname>archive_mode</>.
+        This parameter can only be set at server start.
+        <varname>archive_mode</> cannot be enabled when
+        <varname>wal_level</> is set to <literal>minimal</>.
        </para>
       </listitem>
      </varlistentry>
@@ -1911,7 +1918,10 @@ SET ENABLE_SEQSCAN TO OFF;
         files.  Therefore, it is unwise to use a very short
         <varname>archive_timeout</> &mdash; it will bloat your archive
         storage.  <varname>archive_timeout</> settings of a minute or so are
-        usually reasonable.  This parameter can only be set in the
+        usually reasonable.  You should consider using streaming replication,
+        instead of archiving, if you want data to be copied off the master
+        server more quickly than that.
+        This parameter can only be set in the
         <filename>postgresql.conf</> file or on the server command line.
        </para>
       </listitem>
@@ -1920,14 +1930,32 @@ SET ENABLE_SEQSCAN TO OFF;
      </variablelist>
     </sect2>
 
-    <sect2 id="runtime-config-replication">
-     <title>Streaming Replication</title>
+   </sect1>
+
+   <sect1 id="runtime-config-replication">
+    <title>Replication</title>
+
+    <para>
+     These settings control the behavior of the built-in
+     <firstterm>streaming replication</> feature (see
+     <xref linkend="streaming-replication">).
+     Some parameters must be set on the master server, while others must be
+     set on the standby server(s) that will receive replication data.
+    </para>
+
+    <sect2 id="runtime-config-replication-master">
+     <title>Master Server</title>
 
      <para>
-      These settings control the behavior of the built-in
-      <firstterm>streaming replication</> feature.
-      These parameters would be set on the primary server that is
+      These parameters can be set on the primary server that is
       to send replication data to one or more standby servers.
+      Note that in addition to these parameters,
+      <xref linkend="guc-wal-level"> must be set appropriately on the master
+      server, and you will typically want to enable WAL archiving as
+      well (see <xref linkend="runtime-config-wal-archiving">).
+      The values of these parameters on standby servers are irrelevant,
+      although you may wish to set them there in preparation for the
+      possibility of a standby becoming the master.
      </para>
 
      <variablelist>
@@ -1995,7 +2023,7 @@ SET ENABLE_SEQSCAN TO OFF;
         <filename>pg_xlog</>; the system might need to retain more segments
         for WAL archival or to recover from a checkpoint. If
         <varname>wal_keep_segments</> is zero (the default), the system
-        doesn't keep any extra segments for standby purposes, and the number
+        doesn't keep any extra segments for standby purposes, so the number
         of old WAL segments available to standby servers is a function of
         the location of the previous checkpoint and status of WAL
         archiving.  This parameter has no effect on restartpoints.
@@ -2057,20 +2085,7 @@ SET ENABLE_SEQSCAN TO OFF;
        </para>
       </listitem>
      </varlistentry>
-     </variablelist>
-    </sect2>
-
-    <sect2 id="runtime-config-sync-rep">
-     <title>Synchronous Replication</title>
 
-     <para>
-      These settings control the behavior of the built-in
-      <firstterm>synchronous replication</> feature.
-      These parameters would be set on the primary server that is
-      to send replication data to one or more standby servers.
-     </para>
-
-     <variablelist>
      <varlistentry id="guc-synchronous-standby-names" xreflabel="synchronous_standby_names">
       <term><varname>synchronous_standby_names</varname> (<type>string</type>)</term>
       <indexterm>
@@ -2078,47 +2093,60 @@ SET ENABLE_SEQSCAN TO OFF;
       </indexterm>
       <listitem>
        <para>
-        Specifies a priority ordered list of standby names that can offer
-        synchronous replication.  At any one time there will be at most one
-        synchronous standby that will wake sleeping users following commit.
-        The synchronous standby will be the first named standby that is
-        both currently connected and streaming in real-time to the standby
-        (as shown by a state of "STREAMING").  Other standby servers
-        with listed later will become potential synchronous standbys.
-        If the current synchronous standby disconnects for whatever reason
-        it will be replaced immediately with the next highest priority standby.
+        Specifies a comma-separated list of standby names that can support
+        <firstterm>synchronous replication</>, as described in
+        <xref linkend="synchronous-replication">.
+        At any one time there will be at most one active synchronous standby;
+        transactions waiting for commit will be allowed to proceed after
+        this standby server confirms receipt of their data.
+        The synchronous standby will be the first standby named in this list
+        that is both currently connected and streaming data in real-time
+        (as shown by a state of <literal>streaming</literal> in the
+        <link linkend="monitoring-stats-views-table">
+        <literal>pg_stat_replication</></link> view).
+        Other standby servers appearing later in this list represent potential
+        synchronous standbys.
+        If the current synchronous standby disconnects for whatever reason,
+        it will be replaced immediately with the next-highest-priority standby.
         Specifying more than one standby name can allow very high availability.
        </para>
        <para>
-        The standby name is currently taken as the application_name of the
-        standby, as set in the primary_conninfo on the standby. Names are
-        not enforced for uniqueness. In case of duplicates one of the standbys
-        will be chosen to be the synchronous standby, though exactly which
-        one is indeterminate.
-        The special entry <literal>*</> matches any application_name, including
-        the default application name of <literal>walreceiver</>.
+        The name of a standby server for this purpose is the
+        <varname>application_name</> setting of the standby, as set in the
+        <varname>primary_conninfo</> of the standby's walreceiver.  There is
+        no mechanism to enforce uniqueness. In case of duplicates one of the
+        matching standbys will be chosen to be the synchronous standby, though
+        exactly which one is indeterminate.
+        The special entry <literal>*</> matches any
+        <varname>application_name</>, including the default application name
+        of <literal>walreceiver</>.
        </para>
        <para>
-        If no synchronous standby names are specified, then synchronous
-        replication is not enabled and transaction commit will never wait for
+        If no synchronous standby names are specified here, then synchronous
+        replication is not enabled and transaction commits will not wait for
         replication.  This is the default configuration.  Even when
         synchronous replication is enabled, individual transactions can be
         configured not to wait for replication by setting the
         <xref linkend="guc-synchronous-commit"> parameter to
         <literal>local</> or <literal>off</>.
        </para>
+       <para>
+        This parameter can only be set in the <filename>postgresql.conf</>
+        file or on the server command line.
+       </para>
       </listitem>
      </varlistentry>
 
      </variablelist>
     </sect2>
 
-    <sect2 id="runtime-config-standby">
-    <title>Standby Servers</title>
+    <sect2 id="runtime-config-replication-standby">
+     <title>Standby Servers</title>
 
      <para>
       These settings control the behavior of a standby server that is
-      to receive replication data.
+      to receive replication data.  Their values on the master server
+      are irrelevant.
      </para>
 
     <variablelist>
@@ -2207,13 +2235,16 @@ SET ENABLE_SEQSCAN TO OFF;
       </indexterm>
       <listitem>
       <para>
-       Specifies the minimum frequency, in seconds, for the WAL receiver
+       Specifies the minimum frequency for the WAL receiver
        process on the standby to send information about replication progress
-       to the primary, where they can be seen using the
-       <literal>pg_stat_replication</literal> view.  The standby will report
+       to the primary, where it can be seen using the
+       <link linkend="monitoring-stats-views-table">
+       <literal>pg_stat_replication</></link> view.  The standby will report
        the last transaction log position it has written, the last position it
-       has flushed to disk, and the last position it has applied.  Updates are
-       sent each time the write or flush positions changed, or at least as
+       has flushed to disk, and the last position it has applied.
+       This parameter's
+       value is the maximum interval, in seconds, between reports.  Updates are
+       sent each time the write or flush positions change, or at least as
        often as specified by this parameter.  Thus, the apply position may
        lag slightly behind the true position.  Setting this parameter to zero
        disables status updates completely.  This parameter can only be set in
@@ -2239,8 +2270,10 @@ SET ENABLE_SEQSCAN TO OFF;
         about queries currently executing on the standby. This parameter can
         be used to eliminate query cancels caused by cleanup records, but
         can cause database bloat on the primary for some workloads.
-        The default value is <literal>off</literal>.  Feedback messages will not
-        be sent more frequently than once per <varname>wal_receiver_status_interval</>.
+        Feedback messages will not be sent more frequently than once per
+        <varname>wal_receiver_status_interval</>. The default value is
+        <literal>off</literal>. This parameter can only be set in the
+        <filename>postgresql.conf</> file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
@@ -3016,6 +3049,10 @@ local0.*    /var/log/postgresql
         any time-zone-dependent <literal>%</literal>-escapes, the computation
         is done in the zone specified
         by <xref linkend="guc-log-timezone">.)
+        The supported <literal>%</literal>-escapes are similar to those
+        listed in the Open Group's <ulink
+        url="http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">strftime
+        </ulink> specification.
         Note that the system's <systemitem>strftime</systemitem> is not used
         directly, so platform-specific (nonstandard) extensions do not work.
        </para>
@@ -4485,9 +4522,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        <para>
         The current effective value of the search path can be examined
         via the <acronym>SQL</acronym> function
-        <function>current_schemas()</>.  This is not quite the same as
+        <function>current_schemas</>
+        (see <xref linkend="functions-info">).
+        This is not quite the same as
         examining the value of <varname>search_path</varname>, since
-        <function>current_schemas()</> shows how the items
+        <function>current_schemas</> shows how the items
         appearing in <varname>search_path</varname> were resolved.
        </para>
 
@@ -5196,7 +5235,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
        </para>
 
        <para>
-        Unlike <varname>local_preload_libraries</>, there is no
+        Unlike <xref linkend="guc-shared-preload-libraries">, there is no
         performance advantage to loading a library at session
         start rather than when it is first used.  Rather, the intent of
         this feature is to allow debugging or performance-measurement
@@ -6166,11 +6205,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
       <listitem>
        <para>
         If on, emit information about user lock usage.  Output is the same
-        as for <symbol>trace_locks</symbol>, only for user locks.
-       </para>
-       <para>
-        User locks were removed as of PostgreSQL version 8.2.  This option
-        currently has no effect.
+        as for <symbol>trace_locks</symbol>, only for advisory locks.
        </para>
        <para>
         This parameter is only available if the <symbol>LOCK_DEBUG</symbol>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index ab8eb2d30bb8c..0cba6587587db 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -3875,7 +3875,7 @@ SELECT to_tsvector( 'postgraduate' ) @@ to_tsquery( 'postgres:*' );
  t
 (1 row)
 </programlisting>
-     because <literal>postgres</> gets stemmed to <literal>postgr</>: 
+     because <literal>postgres</> gets stemmed to <literal>postgr</>:
 <programlisting>
 SELECT to_tsquery('postgres:*');
  to_tsquery 
diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml
index 22551402e3d10..855495c54d5e9 100644
--- a/doc/src/sgml/dblink.sgml
+++ b/doc/src/sgml/dblink.sgml
@@ -76,8 +76,7 @@ dblink_connect(text connname, text connstr) returns text
     <varlistentry>
      <term><parameter>connstr</parameter></term>
      <listitem>
-      <para>
-       <application>libpq</>-style connection info string, for example
+      <para><application>libpq</>-style connection info string, for example
        <literal>hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres
        password=mypasswd</>.
        For details see <function>PQconnectdb</> in
@@ -114,7 +113,7 @@ dblink_connect(text connname, text connstr) returns text
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_connect('dbname=postgres');
@@ -285,7 +284,7 @@ dblink_disconnect(text connname) returns text
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_disconnect();
@@ -447,12 +446,11 @@ CREATE VIEW myremote_pg_proc AS
     AS t1(proname name, prosrc text);
 
 SELECT * FROM myremote_pg_proc WHERE proname LIKE 'bytea%';
-</programlisting>
-   </para>
+</programlisting></para>
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT * FROM dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
@@ -620,7 +618,7 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_connect('dbname=dblink_test_standby');
@@ -761,7 +759,7 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_connect('dbname=postgres');
@@ -878,7 +876,7 @@ dblink_fetch(text connname, text cursorname, int howmany [, bool fail_on_error])
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_connect('dbname=postgres');
@@ -1011,7 +1009,7 @@ dblink_close(text connname, text cursorname [, bool fail_on_error]) returns text
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_connect('dbname=postgres');
@@ -1068,7 +1066,7 @@ dblink_get_connections() returns text[]
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <programlisting>
 SELECT dblink_get_connections();
@@ -1127,7 +1125,7 @@ dblink_error_message(text connname) returns text
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <programlisting>
 SELECT dblink_error_message('dtest1');
@@ -1205,7 +1203,7 @@ dblink_send_query(text connname, text sql) returns int
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <programlisting>
 SELECT dblink_send_query('dtest1', 'SELECT * FROM foo WHERE f1 &lt; 3');
@@ -1264,7 +1262,7 @@ dblink_is_busy(text connname) returns int
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <programlisting>
 SELECT dblink_is_busy('dtest1');
@@ -1324,7 +1322,7 @@ dblink_get_notify(text connname) returns setof (notify_name text, be_pid int, ex
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_exec('LISTEN virtual');
@@ -1437,7 +1435,7 @@ dblink_get_result(text connname [, bool fail_on_error]) returns setof record
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 contrib_regression=# SELECT dblink_connect('dtest1', 'dbname=contrib_regression');
@@ -1554,7 +1552,7 @@ dblink_cancel_query(text connname) returns text
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <programlisting>
 SELECT dblink_cancel_query('dtest1');
@@ -1628,7 +1626,7 @@ CREATE TYPE dblink_pkey_results AS (position int, colname text);
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 CREATE TABLE foobar (
@@ -1769,7 +1767,7 @@ dblink_build_sql_insert(text relname,
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_build_sql_insert('foo', '1 2', 2, '{"1", "a"}', '{"1", "b''a"}');
@@ -1883,7 +1881,7 @@ dblink_build_sql_delete(text relname,
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_build_sql_delete('"MyFoo"', '1 2', 2, '{"1", "b"}');
@@ -2016,7 +2014,7 @@ dblink_build_sql_update(text relname,
   </refsect1>
 
   <refsect1>
-   <title>Example</title>
+   <title>Examples</title>
 
 <screen>
 SELECT dblink_build_sql_update('foo', '1 2', 2, '{"1", "a"}', '{"1", "b"}');
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 9709dd613ff9a..c624fc2d9a23c 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -2332,8 +2332,9 @@ VALUES ('New York', NULL, NULL, 'NY');
      <para>
       Bulk loads and deletes can be accomplished by adding or removing
       partitions, if that requirement is planned into the partitioning design.
-      <command>ALTER TABLE</> is far faster than a bulk operation.
-      It also entirely avoids the <command>VACUUM</command>
+      <command>ALTER TABLE NO INHERIT</> and <command>DROP TABLE</> are
+      both far faster than a bulk operation.
+      These commands also entirely avoid the <command>VACUUM</command>
       overhead caused by a bulk <command>DELETE</>.
      </para>
     </listitem>
@@ -3007,6 +3008,9 @@ ANALYZE measurement;
    <indexterm>
     <primary>foreign table</primary>
    </indexterm>
+   <indexterm>
+    <primary>user mapping</primary>
+   </indexterm>
 
    <para>
     <productname>PostgreSQL</productname> implements portions of the SQL/MED
@@ -3021,10 +3025,11 @@ ANALYZE measurement;
     <firstterm>foreign data wrapper</firstterm>. A foreign data wrapper is a
     library that can communicate with an external data source, hiding the
     details of connecting to the data source and fetching data from it. There
-    are several foreign data wrappers available, which can for example read
-    plain data files residing on the server, or connect to another PostgreSQL
-    instance. If none of the existing foreign data wrappers suit your needs,
-    you can write your own; see <xref linkend="fdwhandler">.
+    is a foreign data wrapper available as a <filename>contrib</> module,
+    which can read plain data files residing on the server.  Other kind of
+    foreign data wrappers might be found as third party products.  If none of
+    the existing foreign data wrappers suit your needs, you can write your
+    own; see <xref linkend="fdwhandler">.
    </para>
 
    <para>
@@ -3035,8 +3040,15 @@ ANALYZE measurement;
     tables</firstterm>, which define the structure of the remote data. A
     foreign table can be used in queries just like a normal table, but a
     foreign table has no storage in the PostgreSQL server.  Whenever it is
-    used, PostgreSQL asks the foreign data wrapper to fetch the data from the
-    external source.
+    used, <productname>PostgreSQL</productname> asks the foreign data wrapper
+    to fetch the data from the external source.
+   </para>
+
+   <para>
+    Accessing remote data may require authentication at the external
+    data source.  This information can be provided by a
+    <firstterm>user mapping</>, which can provide additional options based
+    on the current <productname>PostgreSQL</productname> role.
    </para>
 
    <para>
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index bc29fb18cb04a..9fd3511b4dbb7 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -154,8 +154,8 @@ cc -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">MacOS X</></term>
-    <indexterm><primary>MacOS X</><secondary>shared library</></>
+    <term><systemitem class="osname">Mac OS X</></term>
+    <indexterm><primary>Mac OS X</><secondary>shared library</></>
     <listitem>
      <para>
       Here is an example.  It assumes the developer tools are installed.
diff --git a/doc/src/sgml/dummy-seclabel.sgml b/doc/src/sgml/dummy-seclabel.sgml
index 28d19d2409e08..d064705f2aeb6 100644
--- a/doc/src/sgml/dummy-seclabel.sgml
+++ b/doc/src/sgml/dummy-seclabel.sgml
@@ -1,4 +1,4 @@
-<!-- doc/src/sgml/dummy_seclabel.sgml -->
+<!-- doc/src/sgml/dummy-seclabel.sgml -->
 
 <sect1 id="dummy-seclabel" xreflabel="dummy_seclabel">
  <title>dummy_seclabel</title>
@@ -40,7 +40,7 @@
 
 <programlisting>
 # postgresql.conf
-shared_preload_libraries = 'dummy_label'
+shared_preload_libraries = 'dummy_seclabel'
 </programlisting>
 
 <programlisting>
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index def250c156c88..97fbf99c45d80 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -9424,7 +9424,7 @@ risnull(CINTTYPE, (char *) &i);
       <listitem>
        <para>
         Functions return this value if a parsing routine is passed extra
-        characters is cannot parse.  Internally it is defined as -1264 (the
+        characters it cannot parse.  Internally it is defined as -1264 (the
         <productname>Informix</productname> definition).
        </para>
       </listitem>
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index ab538cb500867..7079db3ed3f7b 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -522,6 +522,17 @@
      script files are implicitly executed within a transaction block.
     </para>
 
+    <para>
+     An extension's <acronym>SQL</> script files can also contain lines
+     beginning with <literal>\echo</>, which will be ignored (treated as
+     comments) by the extension mechanism.  This provision is commonly used
+     to throw an error if the script file is fed to <application>psql</>
+     rather than being loaded via <command>CREATE EXTENSION</> (see example
+     script below).  Without that, users might accidentally load the
+     extension's contents as <quote>loose</> objects rather than as an
+     extension, a state of affairs that's a bit tedious to recover from.
+    </para>
+
     <para>
      While the script files can contain any characters allowed by the specified
      encoding, control files should contain only plain ASCII, because there
@@ -808,6 +819,9 @@ SELECT * FROM pg_extension_update_paths('<replaceable>extension_name</>');
      The script file <filename>pair--1.0.sql</> looks like this:
 
 <programlisting><![CDATA[
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION pair" to load this file. \quit
+
 CREATE TYPE pair AS ( k text, v text );
 
 CREATE OR REPLACE FUNCTION pair(anyelement, text)
@@ -1049,6 +1063,15 @@ include $(PGXS)
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><varname>REGRESS_OPTS</varname></term>
+      <listitem>
+       <para>
+        additional switches to pass to <application>pg_regress</>
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><varname>EXTRA_CLEAN</varname></term>
       <listitem>
diff --git a/doc/src/sgml/fdwhandler.sgml b/doc/src/sgml/fdwhandler.sgml
index fc07f129b796c..76ff243f5d34d 100644
--- a/doc/src/sgml/fdwhandler.sgml
+++ b/doc/src/sgml/fdwhandler.sgml
@@ -17,37 +17,6 @@
     to write a new foreign data wrapper.
    </para>
 
-   <para>
-    The FDW author needs to implement a handler function, and optionally
-    a validator function. Both functions must be written in a compiled
-    language such as C, using the version-1 interface.
-    For details on C language calling conventions and dynamic loading,
-    see <xref linkend="xfunc-c">.
-   </para>
-
-   <para>
-    The handler function simply returns a struct of function pointers to
-    callback functions that will be called by the planner and executor.
-    Most of the effort in writing an FDW is in implementing these callback
-    functions.
-    The handler function must be registered with
-    <productname>PostgreSQL</productname> as taking no arguments and returning
-    the special pseudo-type <type>fdw_handler</type>.
-    The callback functions are plain C functions and are not visible or
-    callable at the SQL level.
-   </para>
-
-   <para>
-    The validator function is responsible for validating options given in the
-    <command>CREATE FOREIGN DATA WRAPPER</command>, <command>CREATE
-    SERVER</command> and <command>CREATE FOREIGN TABLE</command> commands.
-    The validator function must be registered as taking two arguments, a text
-    array containing the options to be validated, and an OID representing the
-    type of object the options are associated with (in the form of the OID
-    of the system catalog the object would be stored in).  If no validator
-    function is supplied, the options are not checked at object creation time.
-   </para>
-
    <para>
     The foreign data wrappers included in the standard distribution are good
     references when trying to write your own.  Look into the
@@ -65,7 +34,51 @@
     </para>
    </note>
 
-   <sect1 id="fdw-routines">
+   <sect1 id="fdw-functions">
+    <title>Foreign Data Wrapper Functions</title>
+
+    <para>
+     The FDW author needs to implement a handler function, and optionally
+     a validator function. Both functions must be written in a compiled
+     language such as C, using the version-1 interface.
+     For details on C language calling conventions and dynamic loading,
+     see <xref linkend="xfunc-c">.
+    </para>
+
+    <para>
+     The handler function simply returns a struct of function pointers to
+     callback functions that will be called by the planner and executor.
+     Most of the effort in writing an FDW is in implementing these callback
+     functions.
+     The handler function must be registered with
+     <productname>PostgreSQL</productname> as taking no arguments and
+     returning the special pseudo-type <type>fdw_handler</type>.  The
+     callback functions are plain C functions and are not visible or
+     callable at the SQL level.  The callback functions are described in
+     <xref linkend="fdw-callbacks">.
+    </para>
+
+    <para>
+     The validator function is responsible for validating options given in
+     <command>CREATE</command> and <command>ALTER</command> commands for its
+     foreign data wrapper, as well as foreign servers, user mappings, and
+     foreign tables using the wrapper.
+     The validator function must be registered as taking two arguments, a
+     text array containing the options to be validated, and an OID
+     representing the type of object the options are associated with (in
+     the form of the OID of the system catalog the object would be stored
+     in, either
+     <literal>ForeignDataWrapperRelationId</>,
+     <literal>ForeignServerRelationId</>,
+     <literal>UserMappingRelationId</>,
+     or <literal>ForeignTableRelationId</>).
+     If no validator function is supplied, options are not checked at object
+     creation time or object alteration time.
+    </para>
+
+   </sect1>
+
+   <sect1 id="fdw-callbacks">
     <title>Foreign Data Wrapper Callback Routines</title>
 
     <para>
@@ -139,7 +152,9 @@ BeginForeignScan (ForeignScanState *node,
 </programlisting>
 
      Begin executing a foreign scan. This is called during executor startup.
-     It should perform any initialization needed before the scan can start.
+     It should perform any initialization needed before the scan can start,
+     but not start executing the actual scan (that should be done upon the
+     first call to <function>IterateForeignScan</>).
      The <structname>ForeignScanState</> node has already been created, but
      its <structfield>fdw_state</> field is still NULL.  Information about
      the table to scan is accessible through the
@@ -179,6 +194,17 @@ IterateForeignScan (ForeignScanState *node);
      are not needed, you should insert nulls in those column positions.
     </para>
 
+    <para>
+     Note that <productname>PostgreSQL</productname>'s executor doesn't care
+     whether the rows returned violate the <literal>NOT NULL</literal>
+     constraints which were defined on the foreign table columns - but the
+     planner does care, and may optimize queries incorrectly if
+     <literal>NULL</> values are present in a column declared not to contain
+     them.  If a <literal>NULL</> value is encountered when the user has
+     declared that none should be present, it may be appropriate to raise an
+     error (just as you would need to do in the case of a data type mismatch).
+    </para>
+
     <para>
 <programlisting>
 void
diff --git a/doc/src/sgml/features.sgml b/doc/src/sgml/features.sgml
index fbaeca6ed38e0..01d3ed91c57bc 100644
--- a/doc/src/sgml/features.sgml
+++ b/doc/src/sgml/features.sgml
@@ -22,9 +22,7 @@
   <productname>PostgreSQL</productname> development aims for
   conformance with the latest official version of the standard where
   such conformance does not contradict traditional features or common
-  sense.  The PostgreSQL project is not represented in the ISO/IEC
-  9075 Working Group during the preparation of the SQL standard
-  releases, but even so, many of the features required by the SQL
+  sense.  Many of the features required by the SQL
   standard are supported, though sometimes with slightly differing
   syntax or function.  Further moves towards conformance can be
   expected over time.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 8f223d6891374..c843be784883f 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1482,15 +1482,15 @@
          <primary>decode</primary>
         </indexterm>
         <literal><function>decode(<parameter>string</parameter> <type>text</type>,
-        <parameter>type</parameter> <type>text</type>)</function></literal>
+        <parameter>format</parameter> <type>text</type>)</function></literal>
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
-        Decode binary data from <parameter>string</parameter> previously
-        encoded with <function>encode</>.  Parameter type is same as in <function>encode</>.
+        Decode binary data from textual representation in <parameter>string</>.
+        Options for <parameter>format</> are same as in <function>encode</>.
        </entry>
        <entry><literal>decode('MTIzAAE=', 'base64')</literal></entry>
-       <entry><literal>123\000\001</literal></entry>
+       <entry><literal>\x3132330001</literal></entry>
       </row>
 
       <row>
@@ -1499,13 +1499,13 @@
          <primary>encode</primary>
         </indexterm>
         <literal><function>encode(<parameter>data</parameter> <type>bytea</type>,
-        <parameter>type</parameter> <type>text</type>)</function></literal>
+        <parameter>format</parameter> <type>text</type>)</function></literal>
        </entry>
        <entry><type>text</type></entry>
        <entry>
-        Encode binary data to different representation.  Supported
-        types are: <literal>base64</>, <literal>hex</>, <literal>escape</>.
-        <literal>Escape</> merely outputs null bytes as <literal>\000</> and
+        Encode binary data into a textual representation.  Supported
+        formats are: <literal>base64</>, <literal>hex</>, <literal>escape</>.
+        <literal>escape</> merely outputs null bytes as <literal>\000</> and
         doubles backslashes.
        </entry>
        <entry><literal>encode(E'123\\000\\001', 'base64')</literal></entry>
@@ -1523,7 +1523,7 @@
        <entry><type>text</type></entry>
        <entry>
          Format a string.  This function is similar to the C function
-         <function>sprintf</>; but only the following conversions
+         <function>sprintf</>; but only the following conversion specifications
          are recognized: <literal>%s</literal> interpolates the corresponding
          argument as a string; <literal>%I</literal> escapes its argument as
          an SQL identifier; <literal>%L</literal> escapes its argument as an
@@ -1587,7 +1587,7 @@
       </row>
 
       <row>
-       <entry><literal><function>length(<parameter>string</parameter><type>bytea</type>,
+       <entry><literal><function>length(<parameter>string</parameter> <type>bytea</type>,
         <parameter>encoding</parameter> <type>name</type> )</function></literal></entry>
        <entry><type>int</type></entry>
        <entry>
@@ -1707,7 +1707,7 @@
         <function>quote_nullable</function> is often more suitable.
         See also <xref linkend="plpgsql-quote-literal-example">.
        </entry>
-       <entry><literal>quote_literal('O\'Reilly')</literal></entry>
+       <entry><literal>quote_literal(E'O\'Reilly')</literal></entry>
        <entry><literal>'O''Reilly'</literal></entry>
       </row>
 
@@ -2859,6 +2859,14 @@
     (see <xref linkend="functions-binarystring-other">).
    </para>
 
+   <note>
+    <para>
+     The sample results shown on this page assume that the server parameter
+     <link linkend="guc-bytea-output"><varname>bytea_output</></link> is set
+     to <literal>escape</literal> (the traditional PostgreSQL format).
+    </para>
+   </note>
+
    <table id="functions-binarystring-sql">
     <title><acronym>SQL</acronym> Binary String Functions and Operators</title>
     <tgroup cols="5">
@@ -6890,7 +6898,9 @@ SELECT EXTRACT(SECOND FROM TIME '17:12:28.5');
        <para>
         The time zone offset from UTC, measured in seconds.  Positive values
         correspond to time zones east of UTC, negative values to
-        zones west of UTC.
+        zones west of UTC.  (Technically,
+        <productname>PostgreSQL</productname> uses <acronym>UT1</> because
+        leap seconds are not handled.)
        </para>
       </listitem>
      </varlistentry>
@@ -14878,8 +14888,8 @@ SELECT (pg_stat_file('filename')).modification;
    </indexterm>
    <para>
     <function>pg_advisory_xact_lock</> works the same as
-    <function>pg_advisory_lock</>, expect the lock is automatically released
-    at the end of the current transaction and can not be released explicitly.
+    <function>pg_advisory_lock</>, except the lock is automatically released
+    at the end of the current transaction and cannot be released explicitly.
    </para>
 
    <indexterm>
@@ -14887,8 +14897,8 @@ SELECT (pg_stat_file('filename')).modification;
    </indexterm>
    <para>
     <function>pg_advisory_xact_lock_shared</> works the same as
-    <function>pg_advisory_lock_shared</>, expect the lock is automatically released
-    at the end of the current transaction and can not be released explicitly.
+    <function>pg_advisory_lock_shared</>, except the lock is automatically released
+    at the end of the current transaction and cannot be released explicitly.
    </para>
 
    <indexterm>
@@ -14896,9 +14906,9 @@ SELECT (pg_stat_file('filename')).modification;
    </indexterm>
    <para>
     <function>pg_try_advisory_xact_lock</> works the same as
-    <function>pg_try_advisory_lock</>, expect the lock, if acquired,
+    <function>pg_try_advisory_lock</>, except the lock, if acquired,
     is automatically released at the end of the current transaction and
-    can not be released explicitly.
+    cannot be released explicitly.
    </para>
 
    <indexterm>
@@ -14906,9 +14916,9 @@ SELECT (pg_stat_file('filename')).modification;
    </indexterm>
    <para>
     <function>pg_try_advisory_xact_lock_shared</> works the same as
-    <function>pg_try_advisory_lock_shared</>, expect the lock, if acquired,
+    <function>pg_try_advisory_lock_shared</>, except the lock, if acquired,
     is automatically released at the end of the current transaction and
-    can not be released explicitly.
+    cannot be released explicitly.
    </para>
 
    <indexterm>
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 80665a5cb244f..f811d297d8bab 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -872,7 +872,7 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
      <literal>pg_stat_replication</></link> view. Large differences between
      <function>pg_current_xlog_location</> and <literal>sent_location</> field
      might indicate that the master server is under heavy load, while
-     differences between <literal>sent_location</> and 
+     differences between <literal>sent_location</> and
      <function>pg_last_xlog_receive_location</> on the standby might indicate
      network delay, or that the standby is under heavy load.
     </para>
@@ -1028,14 +1028,14 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
 
    <para>
     When a standby first attaches to the primary, it will not yet be properly
-    synchronized. This is described as <literal>CATCHUP</> mode. Once
+    synchronized. This is described as <literal>catchup</> mode. Once
     the lag between standby and primary reaches zero for the first time
-    we move to real-time <literal>STREAMING</> state.
+    we move to real-time <literal>streaming</> state.
     The catch-up duration may be long immediately after the standby has
     been created. If the standby is shut down, then the catch-up period
     will increase according to the length of time the standby has been down.
     The standby is only able to become a synchronous standby
-    once it has reached <literal>STREAMING</> state.
+    once it has reached <literal>streaming</> state.
    </para>
 
    <para>
@@ -1585,7 +1585,7 @@ if (!triggered)
    <para>
     There are also additional types of conflict that can occur with Hot Standby.
     These conflicts are <emphasis>hard conflicts</> in the sense that queries
-    might need to be cancelled and, in some cases, sessions disconnected to resolve them.
+    might need to be canceled and, in some cases, sessions disconnected to resolve them.
     The user is provided with several ways to handle these
     conflicts. Conflict cases include:
 
@@ -1682,7 +1682,7 @@ if (!triggered)
    <para>
     Once the delay specified by <varname>max_standby_archive_delay</> or
     <varname>max_standby_streaming_delay</> has been exceeded, conflicting
-    queries will be cancelled.  This usually results just in a cancellation
+    queries will be canceled.  This usually results just in a cancellation
     error, although in the case of replaying a <command>DROP DATABASE</>
     the entire conflicting session will be terminated.  Also, if the conflict
     is over a lock held by an idle transaction, the conflicting session is
@@ -1690,10 +1690,10 @@ if (!triggered)
    </para>
 
    <para>
-    Cancelled queries may be retried immediately (after beginning a new
+    Canceled queries may be retried immediately (after beginning a new
     transaction, of course).  Since query cancellation depends on
     the nature of the WAL records being replayed, a query that was
-    cancelled may well succeed if it is executed again.
+    canceled may well succeed if it is executed again.
    </para>
 
    <para>
@@ -1751,7 +1751,7 @@ if (!triggered)
     Another option is to increase <xref linkend="guc-vacuum-defer-cleanup-age">
     on the primary server, so that dead rows will not be cleaned up as quickly
     as they normally would be.  This will allow more time for queries to
-    execute before they are cancelled on the standby, without having to set
+    execute before they are canceled on the standby, without having to set
     a high <varname>max_standby_streaming_delay</>.  However it is
     difficult to guarantee any specific execution-time window with this
     approach, since <varname>vacuum_defer_cleanup_age</> is measured in
@@ -1981,7 +1981,7 @@ LOG:  database system is ready to accept read only connections
     <command>DROP TABLESPACE</> can only succeed if the tablespace is empty.
     Some standby users may be actively using the tablespace via their
     <varname>temp_tablespaces</> parameter. If there are temporary files in the
-    tablespace, all active queries are cancelled to ensure that temporary
+    tablespace, all active queries are canceled to ensure that temporary
     files are removed, so the tablespace can be removed and WAL replay
     can continue.
    </para>
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index c7e997793db8f..bb9425838539e 100644
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -712,7 +712,7 @@ amrestrpos (IndexScanDesc scan);
    read-write conflict with the insert of any tuple into that index by a
    concurrent serializable transaction.  If certain patterns of read-write
    conflicts are detected among a set of concurrent serializable
-   transactions, one of those transactions may be cancelled to protect data
+   transactions, one of those transactions may be canceled to protect data
    integrity.  When the flag is set, it indicates that the index access
    method implements finer-grained predicate locking, which will tend to
    reduce the frequency of such transaction cancellations.
diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index 6df69db4aadee..c2f33afab2f55 100644
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -379,6 +379,42 @@
       </entry>
      </row>
 
+     <row>
+      <entry><literal>character_set_catalog</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+     </row>
+
+     <row>
+      <entry><literal>character_set_schema</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+     </row>
+
+     <row>
+      <entry><literal>character_set_name</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+     </row>
+
+     <row>
+      <entry><literal>collation_catalog</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Not yet implemented</entry>
+     </row>
+
+     <row>
+      <entry><literal>collation_schema</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Not yet implemented</entry>
+     </row>
+
+     <row>
+      <entry><literal>collation_name</literal></entry>
+      <entry><type>sql_identifier</type></entry>
+      <entry>Not yet implemented</entry>
+     </row>
+
      <row>
       <entry><literal>numeric_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
@@ -1321,19 +1357,19 @@
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
@@ -1996,19 +2032,19 @@
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
@@ -2273,19 +2309,19 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Not yet implemented</entry>
      </row>
 
      <row>
@@ -3023,19 +3059,19 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
      </row>
 
      <row>
@@ -3835,19 +3871,19 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
      </row>
 
      <row>
@@ -4619,6 +4655,11 @@ ORDER BY c.ordinal_position;
    embedded SQL in C; that is all you will learn from this table.
   </para>
 
+  <para>
+   This table was removed from the SQL standard in SQL:2008, so there
+   are no entries referring to standards later than SQL:2003.
+  </para>
+
   <table>
    <title><literal>sql_languages</literal> Columns</title>
 
@@ -4646,8 +4687,7 @@ ORDER BY c.ordinal_position;
       <entry><type>character_data</type></entry>
       <entry>
        The year the standard referenced in
-       <literal>sql_language_source</literal> was approved; currently
-       <literal>2003</>
+       <literal>sql_language_source</literal> was approved.
       </entry>
      </row>
 
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index cb8bca9c63136..f96b174fcc07b 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -20,7 +20,7 @@
   There are several different ways of building PostgreSQL on
   <productname>Windows</productname>. The simplest way to build with
   Microsoft tools is to install a supported version of the
-  <productname>Microsoft Platform SDK</productname> and use use the included
+  <productname>Microsoft Platform SDK</productname> and use the included
   compiler. It is also possible to build with the full
   <productname>Microsoft Visual C++ 2005 or 2008</productname>. In some cases
   that requires the installation of the <productname>Platform SDK</productname>
@@ -49,8 +49,8 @@
   <xref linkend="installation-notes-mingw"> and <xref linkend="installation-notes-cygwin">.
   To produce native 64 bit binaries in these environments, use the tools from
   <productname>MinGW-w64</productname>. These tools can also be used to
-  cross-compile for 32 bit and 64 bit <productname>Windows</productname> 
-  targets on other hosts, such as <productname>Linux</productname> and 
+  cross-compile for 32 bit and 64 bit <productname>Windows</productname>
+  targets on other hosts, such as <productname>Linux</productname> and
   <productname>Darwin</productname>.
   <productname>Cygwin</productname> is not recommended for running a
   production server, and it should only be used for running on
@@ -61,7 +61,7 @@
  </para>
 
  <para>
-  Native builds of <application>psql</application> don't support command 
+  Native builds of <application>psql</application> don't support command
   line editing. The <productname>Cygwin</productname> build does support
   command line editing, so it should be used where psql is needed for
   interactive use on  <productname>Windows</productname>.
@@ -170,7 +170,7 @@ $ENV{PATH}=$ENV{PATH} . ';c:\some\where\bison\bin';
       ActiveState Perl is required to run the build generation scripts. MinGW
       or Cygwin Perl will not work. It must also be present in the PATH.
       Binaries can be downloaded from
-      <ulink url="http://www.activestate.com"></> (Note: version 5.8 is required,
+      <ulink url="http://www.activestate.com"></> (Note: version 5.8 or later is required,
       the free Standard Distribution is sufficient).
      </para></listitem>
     </varlistentry>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index b359000ab302e..08aa348263753 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -62,7 +62,7 @@
    return a non-null object pointer, unless perhaps there is too
    little memory even to allocate the <structname>PGconn</> object.
    The <function>PQstatus</> function should be called to check
-   whether a connection was successfully made before queries are sent
+   the return value for a successful connection before queries are sent
    via the connection object.
 
    <warning>
@@ -363,7 +363,7 @@ PGconn *PQconnectdbParams(const char **keywords, const char **values, int expand
            client's connection to the server is considered dead.  A value of
            zero uses the system default. This parameter is ignored for
            connections made via a Unix-domain socket, or if keepalives are disabled.
-           It is only supported on systems where the <symbol>TCP_KEEPINTVL</>
+           It is only supported on systems where the <symbol>TCP_KEEPCNT</>
            socket option is available; on other systems, it has no effect.
           </para>
          </listitem>
@@ -420,7 +420,9 @@ PGconn *PQconnectdbParams(const char **keywords, const char **values, int expand
              <term><literal>require</literal></term>
              <listitem>
               <para>
-               only try an <acronym>SSL</> connection
+               only try an <acronym>SSL</> connection. If a root CA
+               file is present, verify the certificate in the same way as
+               if <literal>verify-ca</literal> was specified
               </para>
              </listitem>
             </varlistentry>
@@ -1748,8 +1750,10 @@ PGresult *PQexec(PGconn *conn, const char *command);
         Returns a <structname>PGresult</structname> pointer or possibly a null
         pointer.  A non-null pointer will generally be returned except in
         out-of-memory conditions or serious errors such as inability to send
-        the command to the server.  If a null pointer is returned, it should
-        be treated like a <symbol>PGRES_FATAL_ERROR</symbol> result.  Use
+        the command to the server.  The <function>PQresultStatus</> function
+        should be called to check the return value for any errors (including
+        the value of a null pointer, in which case it will return
+        <symbol>PGRES_FATAL_ERROR</symbol>).  Use
         <function>PQerrorMessage</function> to get more information about such
         errors.
        </para>
@@ -4088,7 +4092,7 @@ int PQflush(PGconn *conn);
  </sect1>
 
  <sect1 id="libpq-cancel">
-  <title>Cancelling Queries in Progress</title>
+  <title>Canceling Queries in Progress</title>
 
   <indexterm zone="libpq-cancel">
    <primary>canceling</primary>
@@ -6116,7 +6120,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
             break;
         }
 
-        /* unknown event id, just return TRUE. */
+        /* unknown event ID, just return TRUE. */
         default:
             break;
     }
@@ -6494,6 +6498,8 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
 <synopsis>
 <replaceable>hostname</replaceable>:<replaceable>port</replaceable>:<replaceable>database</replaceable>:<replaceable>username</replaceable>:<replaceable>password</replaceable>
 </synopsis>
+   (You can add a reminder comment to the file by copying the line above and
+   preceding it with <literal>#</>.)
    Each of the first four fields can be a literal value, or
    <literal>*</literal>, which matches anything.  The password field from
    the first line that matches the current connection parameters will be
@@ -6730,6 +6736,18 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
    the connection parameters <literal>sslrootcert</> and <literal>sslcrl</>
    or the environment variables <envar>PGSSLROOTCERT</> and <envar>PGSSLCRL</>.
   </para>
+
+  <note>
+   <para>
+    For backwards compatibility with earlier versions of PostgreSQL, if a
+    root CA file exists, the behavior of
+    <literal>sslmode</literal>=<literal>require</literal> will be the same
+    as that of <literal>verify-ca</literal>, meaning the sever certificate
+    is validated against the CA. Relying on this behavior is discouraged,
+    and applications that need certificate validation should always use
+    <literal>validate-ca</literal> or <literal>validate-full</literal>.
+   </para>
+  </note>
  </sect2>
 
  <sect2 id="libpq-ssl-clientcert">
@@ -6866,7 +6884,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
 
     <tbody>
      <row>
-      <entry><literal>disabled</></entry>
+      <entry><literal>disable</></entry>
       <entry>No</entry>
       <entry>No</entry>
       <entry>I don't care about security, and I don't want to pay the overhead
@@ -7553,7 +7571,7 @@ main(int argc, char **argv)
         while ((notify = PQnotifies(conn)) != NULL)
         {
             fprintf(stderr,
-                    "ASYNC NOTIFY of '%s' received from backend pid %d\n",
+                    "ASYNC NOTIFY of '%s' received from backend PID %d\n",
                     notify->relname, notify->be_pid);
             PQfreemem(notify);
             nnotifies++;
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 553c16873f9a3..8da8f85e7096e 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -282,7 +282,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       total disk blocks read, total buffer hits (i.e., block
       read requests avoided by finding the block already in buffer cache),
       number of rows returned, fetched, inserted, updated and deleted, the
-      total number of queries cancelled due to conflict with recovery (on
+      total number of queries canceled due to conflict with recovery (on
       standby servers), and time of last statistics reset.
      </entry>
      </row>
@@ -290,7 +290,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
      <row>
       <entry><structname>pg_stat_database_conflicts</><indexterm><primary>pg_stat_database_conflicts</primary></indexterm></entry>
       <entry>One row per database, showing database OID, database name and
-      the number of queries that have been cancelled in this database due to
+      the number of queries that have been canceled in this database due to
       dropped tablespaces, lock timeouts, old snapshots, pinned buffers and
       deadlocks. Will only contain information on standby servers, since
       conflicts do not occur on master servers.
@@ -639,7 +639,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_db_conflict_tablespace</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with dropped tablespaces in database
+       Number of queries canceled because of recovery conflict with dropped tablespaces in database
       </entry>
      </row>
 
@@ -647,7 +647,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_db_conflict_lock</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with locks in database
+       Number of queries canceled because of recovery conflict with locks in database
       </entry>
      </row>
 
@@ -655,7 +655,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_db_conflict_snapshot</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with old snapshots in database
+       Number of queries canceled because of recovery conflict with old snapshots in database
       </entry>
      </row>
 
@@ -663,7 +663,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_db_conflict_bufferpin</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with pinned buffers in database
+       Number of queries canceled because of recovery conflict with pinned buffers in database
       </entry>
      </row>
 
@@ -671,7 +671,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_db_conflict_startup_deadlock</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with deadlocks in database
+       Number of queries canceled because of recovery conflict with deadlocks in database
       </entry>
      </row>
 
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index e688176acb4ce..b311d2401096f 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -547,7 +547,7 @@ SELECT SUM(value) FROM mytab WHERE class = 2;
     If either transaction were running at the Repeatable Read isolation level,
     both would be allowed to commit; but since there is no serial order of execution
     consistent with the result, using Serializable transactions will allow one
-    transaction to commit and and will roll the other back with this message:
+    transaction to commit and will roll the other back with this message:
 
 <screen>
 ERROR:  could not serialize access due to read/write dependencies among transactions
@@ -658,6 +658,26 @@ ERROR:  could not serialize access due to read/write dependencies among transact
        protections automatically provided by Serializable transactions.
       </para>
      </listitem>
+     <listitem>
+      <para>
+       When the system is forced to combine multiple page-level predicate
+       locks into a single relation-level predicate lock because the predicate
+       lock table is short of memory, an increase in the rate of serialization
+       failures may occur.  You can avoid this by increasing
+       <xref linkend="guc-max-pred-locks-per-transaction">.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       A sequential scan will always necessitate a relation-level predicate
+       lock.  This can result in an increased rate of serialization failures.
+       It may be helpful to encourage the use of index scans by reducing
+       <xref linkend="guc-random-page-cost"> and/or increasing
+       <xref linkend="guc-cpu-tuple-cost">.  Be sure to weigh any decrease
+       in transaction rollbacks and restarts against any overall change in
+       query execution time.
+      </para>
+     </listitem>
     </itemizedlist>
    </para>
 
@@ -858,9 +878,8 @@ ERROR:  could not serialize access due to read/write dependencies among transact
         </para>
 
         <para>
-         Acquired by <command>CREATE TRIGGER</command>,
-         <command>CREATE RULE</command> (except for <literal>ON SELECT</>
-         rules) and some forms of <command>ALTER TABLE</command>.
+         This lock mode is not automatically acquired by any
+         <productname>PostgreSQL</productname> command.
         </para>
        </listitem>
       </varlistentry>
@@ -905,10 +924,10 @@ ERROR:  could not serialize access due to read/write dependencies among transact
         </para>
 
         <para>
-         Acquired by the <command>DROP TABLE</command>,
+         Acquired by the <command>ALTER TABLE</>, <command>DROP TABLE</>,
          <command>TRUNCATE</command>, <command>REINDEX</command>,
          <command>CLUSTER</command>, and <command>VACUUM FULL</command>
-         commands, and some forms of <command>ALTER TABLE</>.
+         commands.
          This is also the default lock mode for <command>LOCK TABLE</command>
          statements that do not specify a mode explicitly.
         </para>
diff --git a/doc/src/sgml/pgtrgm.sgml b/doc/src/sgml/pgtrgm.sgml
index 18f0f3eba0cc5..30e535557c336 100644
--- a/doc/src/sgml/pgtrgm.sgml
+++ b/doc/src/sgml/pgtrgm.sgml
@@ -9,7 +9,8 @@
 
  <para>
   The <filename>pg_trgm</filename> module provides functions and operators
-  for determining the similarity of text based on trigram matching, as
+  for determining the similarity of <acronym>ASCII</>
+  alphanumeric text based on trigram matching, as
   well as index operator classes that support fast searching for similar
   strings.
  </para>
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 8bd5f74178e8d..3a6dbfd65acaf 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -105,7 +105,7 @@
      <varlistentry>
       <term><option>-k</option></term>
       <term><option>--link</option></term>
-      <listitem><para>link instead of copying files to new cluster</para></listitem>
+      <listitem><para>use hard links instead of copying files to the new cluster</para></listitem>
      </varlistentry>
 
      <varlistentry>
@@ -292,12 +292,18 @@ NET STOP pgsql-8.3  (<productname>PostgreSQL</> 8.3 and older used a different s
     <para>
      Always run the <application>pg_upgrade</> binary of the new server, not the old one.
      <application>pg_upgrade</> requires the specification of the old and new cluster's
-     data and executable (<filename>bin</>) directories. You can also specify separate
+     data and executable (<filename>bin</>) directories. You can also specify
      user and port values, and whether you want the data linked instead of
-     copied (the default). If you use linking, the upgrade will be much
-     faster (no data copying), but you will no longer be able to access your
-     old cluster once you start the new cluster after the upgrade. See
-     <literal>pg_upgrade --help</> for a full list of options.
+     copied (the default).
+    </para>
+
+    <para>
+     If you use link mode, the upgrade will be much faster (no file
+     copying), but you will not be able to access your old cluster
+     once you start the new cluster after the upgrade.  Link mode also
+     requires that the old and new cluster data directories be in the
+     same file system.  See <literal>pg_upgrade --help</> for a full
+     list of options.
     </para>
 
     <para>
@@ -329,6 +335,9 @@ pg_upgrade.exe
 
     <para>
      Obviously, no one should be accessing the clusters during the upgrade.
+     Consider using a non-default port number, e.g.  50432, for old
+     and new clusters to avoid unintended client connections during
+     the upgrade.
     </para>
 
     <para>
@@ -476,6 +485,11 @@ psql --username postgres --file script.sql postgres
    You must drop any such columns and upgrade them manually.
   </para>
 
+  <para>
+   pg_upgrade will not work if the <filename>ltree</>
+   contrib module is installed in a database.
+  </para>
+
   <para>
    pg_upgrade will require a table rebuild if:
    <itemizedlist>
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index eea6ec58e320c..0a9d71ef41a5f 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -940,6 +940,9 @@ PERFORM <replaceable>query</replaceable>;
      result.  Write the <replaceable>query</replaceable> the same
      way you would write an SQL <command>SELECT</> command, but replace the
      initial keyword <command>SELECT</> with <command>PERFORM</command>.
+     For <command>WITH</> queries, use <command>PERFORM</> and then
+     place the query in parentheses.  (In this case, the query can only
+     return one row.)
      <application>PL/pgSQL</application> variables will be
      substituted into the query just as for commands that return no result,
      and the plan is cached in the same way.  Also, the special variable
@@ -3174,7 +3177,7 @@ RAISE NOTICE 'Calling cs_create_job(%)', v_job_id;
     and hint:
 <programlisting>
 RAISE EXCEPTION 'Nonexistent ID --> %', user_id
-      USING HINT = 'Please check your user id';
+      USING HINT = 'Please check your user ID';
 </programlisting>
    </para>
 
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index d3de330916dd5..84d39e191cba0 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1142,7 +1142,7 @@
   </sect2>
 
   <sect2>
-   <title>Cancelling Requests in Progress</title>
+   <title>Canceling Requests in Progress</title>
 
    <para>
     During the processing of a query, the frontend might request
@@ -1742,6 +1742,11 @@ The commands accepted in walsender mode are:
          <filename>postmaster.pid</>
         </para>
        </listitem>
+       <listitem>
+        <para>
+         <filename>postmaster.opts</>
+        </para>
+       </listitem>
        <listitem>
         <para>
          <filename>pg_xlog</>, including subdirectories. If the backup is run
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index b3cf39a39b0a1..7ca640e6975e5 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -266,7 +266,9 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         <literal>USING</>: it forms a <literal>USING</> list
         consisting of all column names that appear in both
         input tables.  As with <literal>USING</>, these columns appear
-        only once in the output table.
+        only once in the output table.  If there are no common
+        columns, <literal>NATURAL</literal> behaves like
+        <literal>CROSS JOIN</literal>.
        </para>
 
        <para>
diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml
index de6090520db7b..86470242eacb2 100644
--- a/doc/src/sgml/recovery-config.sgml
+++ b/doc/src/sgml/recovery-config.sgml
@@ -11,7 +11,8 @@
 
    <para>
     This chapter describes the settings available in the
-    <filename>recovery.conf</> file. They apply only for the duration of the
+    <filename>recovery.conf</><indexterm><primary>recovery.conf</></>
+    file. They apply only for the duration of the
     recovery.  They must be reset for any subsequent recovery you wish to
     perform.  They cannot be changed once recovery has begun.
    </para>
@@ -325,7 +326,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
           of the primary server, as well as the port number if it is not
           the same as the standby server's default.
           Also specify a user name corresponding to a role that has the
-          <literal>SUPERUSER</> and <literal>LOGIN</> privileges on the
+          <literal>REPLICATION</> and <literal>LOGIN</> privileges on the
           primary (see
           <xref linkend="streaming-replication-authentication">).
           A password needs to be provided too, if the primary demands password
diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml
index 2bfc724be50dd..246e8f812687b 100644
--- a/doc/src/sgml/ref/abort.sgml
+++ b/doc/src/sgml/ref/abort.sgml
@@ -75,8 +75,7 @@ ABORT [ WORK | TRANSACTION ]
    To abort all changes:
 <programlisting>
 ABORT;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml
index 618c432a79474..26c5dc0175666 100644
--- a/doc/src/sgml/ref/alter_aggregate.sgml
+++ b/doc/src/sgml/ref/alter_aggregate.sgml
@@ -125,8 +125,7 @@ ALTER AGGREGATE myavg(integer) OWNER TO joe;
    <type>integer</type> into schema <literal>myschema</literal>:
 <programlisting>
 ALTER AGGREGATE myavg(integer) SET SCHEMA myschema;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgml
index 3aef656a0e9e3..ebb30b88607d2 100644
--- a/doc/src/sgml/ref/alter_collation.sgml
+++ b/doc/src/sgml/ref/alter_collation.sgml
@@ -104,8 +104,7 @@ ALTER COLLATION "de_DE" RENAME TO german;
    <literal>joe</literal>:
 <programlisting>
 ALTER COLLATION "en_US" OWNER TO joe;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml
index 4f2269b849908..4cc335b18e05b 100644
--- a/doc/src/sgml/ref/alter_conversion.sgml
+++ b/doc/src/sgml/ref/alter_conversion.sgml
@@ -104,8 +104,7 @@ ALTER CONVERSION iso_8859_1_to_utf8 RENAME TO latin1_to_unicode;
    <literal>joe</literal>:
 <programlisting>
 ALTER CONVERSION iso_8859_1_to_utf8 OWNER TO joe;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index 5a975adf5c1c1..360732fd358be 100644
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -190,8 +190,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
 
 <programlisting>
 ALTER DATABASE test SET enable_indexscan TO off;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml
index cc4f3636a25c9..f7b52ef9d1ac2 100644
--- a/doc/src/sgml/ref/alter_default_privileges.sgml
+++ b/doc/src/sgml/ref/alter_default_privileges.sgml
@@ -187,8 +187,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA myschema REVOKE INSERT ON TABLES FROM webuser
 
 <programlisting>
 ALTER DEFAULT PRIVILEGES FOR ROLE admin REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml
index 2a5a935edcd0a..90c8d5165e925 100644
--- a/doc/src/sgml/ref/alter_domain.sgml
+++ b/doc/src/sgml/ref/alter_domain.sgml
@@ -241,8 +241,7 @@ ALTER DOMAIN zipcode DROP CONSTRAINT zipchk;
    To move the domain into a different schema:
 <programlisting>
 ALTER DOMAIN zipcode SET SCHEMA customers;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-ALTERDOMAIN-compatibility">
diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml
index e8c9608666e7a..cbe5043fef5b3 100644
--- a/doc/src/sgml/ref/alter_extension.sgml
+++ b/doc/src/sgml/ref/alter_extension.sgml
@@ -241,6 +241,18 @@ ALTER EXTENSION <replaceable class="PARAMETER">extension_name</replaceable> DROP
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><replaceable class="parameter">left_type</replaceable></term>
+     <term><replaceable class="parameter">right_type</replaceable></term>
+     <listitem>
+      <para>
+       The data type(s) of the operator's arguments (optionally
+       schema-qualified).  Write <literal>NONE</> for the missing argument
+       of a prefix or postfix operator.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
      <term><literal>PROCEDURAL</literal></term>
 
@@ -276,7 +288,15 @@ ALTER EXTENSION hstore SET SCHEMA utils;
    To add an existing function to the <literal>hstore</literal> extension:
 <programlisting>
 ALTER EXTENSION hstore ADD FUNCTION populate_record(anyelement, hstore);
-</programlisting>
+</programlisting></para>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   <command>ALTER EXTENSION</command> is a <productname>PostgreSQL</>
+   extension.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
index af56ed7561ddf..59cf9c65e77e3 100644
--- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
@@ -141,8 +141,7 @@ ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar');
    to <literal>bob.myvalidator</>:
 <programlisting>
 ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml
index c2ebdac8479a5..c52fc717366d2 100644
--- a/doc/src/sgml/ref/alter_foreign_table.sgml
+++ b/doc/src/sgml/ref/alter_foreign_table.sgml
@@ -32,7 +32,7 @@ ALTER FOREIGN TABLE <replaceable class="PARAMETER">name</replaceable>
 
 <phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
 
-    ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">type</replaceable>
+    ADD [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> <replaceable class="PARAMETER">type</replaceable> [ NULL | NOT NULL ]
     DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column</replaceable> [ RESTRICT | CASCADE ]
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">type</replaceable>
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> { SET | DROP } NOT NULL
@@ -125,7 +125,7 @@ ALTER FOREIGN TABLE <replaceable class="PARAMETER">name</replaceable>
     <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term>
     <listitem>
      <para>
-      Change options for the foreign table or the column of the foreign table.
+      Change options for the foreign table.
       <literal>ADD</>, <literal>SET</>, and <literal>DROP</>
       specify the action to be performed.  <literal>ADD</> is assumed
       if no operation is explicitly specified.  Option names must be
@@ -150,8 +150,6 @@ ALTER FOREIGN TABLE <replaceable class="PARAMETER">name</replaceable>
    You must own the table to use <command>ALTER FOREIGN TABLE</>.
    To change the schema of a foreign table, you must also have
    <literal>CREATE</literal> privilege on the new schema.
-   To add the table as a new child of a parent table, you must own the
-   parent table as well.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the table's schema.  (These restrictions enforce that altering the owner
@@ -260,12 +258,11 @@ ALTER FOREIGN TABLE <replaceable class="PARAMETER">name</replaceable>
    </para>
 
    <para>
-    Consistency with the foreign server is not checked when a column is
-    added or removed with <literal>ADD COLUMN</literal> or
-    <literal>DROP COLUMN</literal>, a system <literal>oid</> column is added
-    or removed, a <literal>CHECK</> or <literal>NOT NULL</> constraint is
-    added, or column type is changed with <literal>SET DATA TYPE</>.  It is the
-    user's responsibility to ensure that the table definition matches the
+    Consistency with the foreign server is not checked when a column is added
+    or removed with <literal>ADD COLUMN</literal> or
+    <literal>DROP COLUMN</literal>, a <literal>NOT NULL</> constraint is
+    added, or a column type is changed with <literal>SET DATA TYPE</>.  It is
+    the user's responsibility to ensure that the table definition matches the
     remote side.
    </para>
 
@@ -289,8 +286,7 @@ ALTER FOREIGN TABLE distributors ALTER COLUMN street SET NOT NULL;
    To change options of a foreign table:
 <programlisting>
 ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2, 'value2', DROP opt3 'value3');
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml
index 22233af4aadd2..acb3e4fb93fed 100644
--- a/doc/src/sgml/ref/alter_function.sgml
+++ b/doc/src/sgml/ref/alter_function.sgml
@@ -153,8 +153,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
      <term><literal>STRICT</literal></term>
 
      <listitem>
-      <para>
-       <literal>CALLED ON NULL INPUT</literal> changes the function so
+      <para><literal>CALLED ON NULL INPUT</literal> changes the function so
        that it will be invoked when some or all of its arguments are
        null. <literal>RETURNS NULL ON NULL INPUT</literal> or
        <literal>STRICT</literal> changes the function so that it is not
diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml
index 63d42e1e1617a..177b11d28dddc 100644
--- a/doc/src/sgml/ref/alter_group.sgml
+++ b/doc/src/sgml/ref/alter_group.sgml
@@ -103,9 +103,7 @@ ALTER GROUP staff ADD USER karl, john;
 
 <programlisting>
 ALTER GROUP workers DROP USER beth;
-</programlisting>
-
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml
index 69b8e5d3f8c1a..c701d165b8386 100644
--- a/doc/src/sgml/ref/alter_index.sgml
+++ b/doc/src/sgml/ref/alter_index.sgml
@@ -190,8 +190,7 @@ ALTER INDEX distributors SET TABLESPACE fasttablespace;
 <programlisting>
 ALTER INDEX distributors SET (fillfactor = 75);
 REINDEX INDEX distributors;
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml
index a52f9f9cb460f..32bde5af7cfc6 100644
--- a/doc/src/sgml/ref/alter_operator.sgml
+++ b/doc/src/sgml/ref/alter_operator.sgml
@@ -105,8 +105,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</repla
    Change the owner of a custom operator <literal>a @@ b</literal> for type <type>text</type>:
 <programlisting>
 ALTER OPERATOR @@ (text, text) OWNER TO joe;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml
index adc0273b8353c..2fbba53d25f54 100644
--- a/doc/src/sgml/ref/alter_role.sgml
+++ b/doc/src/sgml/ref/alter_role.sgml
@@ -289,8 +289,7 @@ ALTER ROLE worker_bee SET maintenance_work_mem = 100000;
 
 <programlisting>
 ALTER ROLE fred IN DATABASE devel SET client_min_messages = DEBUG;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 37644d83b10ef..79795d9db093b 100644
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -282,8 +282,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep
    Restart a sequence called <literal>serial</literal>, at 105:
 <programlisting>
 ALTER SEQUENCE serial RESTART WITH 105;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml
index ab4731a4349f5..c27b4c06a1cc1 100644
--- a/doc/src/sgml/ref/alter_server.sgml
+++ b/doc/src/sgml/ref/alter_server.sgml
@@ -100,8 +100,7 @@ ALTER SERVER foo OPTIONS (host 'foo', dbname 'foodb');
    change <literal>host</> option:
 <programlisting>
 ALTER SERVER foo VERSION '8.4' OPTIONS (SET host 'baz');
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 4e02438483b63..39cbdf3de76c5 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -42,9 +42,8 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )
     ALTER [ COLUMN ] <replaceable class="PARAMETER">column</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
-    ADD <replaceable class="PARAMETER">table_constraint</replaceable>
-    ADD <replaceable class="PARAMETER">table_constraint_using_index</replaceable>
     ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]
+    ADD <replaceable class="PARAMETER">table_constraint_using_index</replaceable>
     VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
     DROP CONSTRAINT [ IF EXISTS ]  <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ]
     DISABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ]
@@ -235,27 +234,21 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable>
-          [ NOT VALID ]</literal></term>
+    <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]</literal></term>
     <listitem>
      <para>
       This form adds a new constraint to a table using the same syntax as
-      <xref linkend="SQL-CREATETABLE">. Newly added foreign key constraints can
-      also be defined as <literal>NOT VALID</literal> to avoid the
-      potentially lengthy initial check that must otherwise be performed.
-      Constraint checks are skipped at create table time, so
-      <xref linkend="SQL-CREATETABLE"> does not contain this option.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><literal>VALIDATE CONSTRAINT</literal></term>
-    <listitem>
-     <para>
-      This form validates a foreign key constraint that was previously created
-      as <literal>NOT VALID</literal>. Constraints already marked valid do not
-      cause an error response.
+      <xref linkend="SQL-CREATETABLE">, plus the option <literal>NOT
+      VALID</literal>, which is currently only allowed for foreign key
+      constraints.
+      If the constraint is marked <literal>NOT VALID</literal>, the
+      potentially-lengthy initial check to verify that all rows in the table
+      satisfy the constraint is skipped.  The constraint will still be
+      enforced against subsequent inserts or updates (that is, they'll fail
+      unless there is a matching row in the referenced table).  But the
+      database will not assume that the constraint holds for all rows in
+      the table, until it is validated by using the <literal>VALIDATE
+      CONSTRAINT</literal> option.
      </para>
     </listitem>
    </varlistentry>
@@ -311,6 +304,21 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term><literal>VALIDATE CONSTRAINT</literal></term>
+    <listitem>
+     <para>
+      This form validates a foreign key constraint that was previously created
+      as <literal>NOT VALID</literal>, by scanning the table to ensure there
+      are no unmatched rows.  Nothing happens if the constraint is
+      already marked valid.
+      The value of separating validation from initial creation of the
+      constraint is that validation requires a lesser lock on the table
+      than constraint creation does.
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
     <term><literal>DROP CONSTRAINT [ IF EXISTS ]</literal></term>
     <listitem>
@@ -1031,8 +1039,7 @@ ALTER TABLE myschema.distributors SET SCHEMA yourschema;
 CREATE UNIQUE INDEX CONCURRENTLY dist_id_temp_idx ON distributors (dist_id);
 ALTER TABLE distributors DROP CONSTRAINT distributors_pkey,
     ADD CONSTRAINT distributors_pkey PRIMARY KEY USING INDEX dist_id_temp_idx;
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml
index 0cfc26437de1f..ed04d8437fbd5 100644
--- a/doc/src/sgml/ref/alter_tablespace.sgml
+++ b/doc/src/sgml/ref/alter_tablespace.sgml
@@ -111,8 +111,7 @@ ALTER TABLESPACE index_space RENAME TO fast_raid;
    Change the owner of tablespace <literal>index_space</literal>:
 <programlisting>
 ALTER TABLESPACE index_space OWNER TO mary;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 2f943ee9c2a1b..90c2e3d141f31 100644
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -92,8 +92,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
    To rename an existing trigger:
 <programlisting>
 ALTER TRIGGER emp_stamp ON emp RENAME TO emp_track_chgs;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml
index a417c0d01b30d..a81fe6c340cf9 100644
--- a/doc/src/sgml/ref/alter_type.sgml
+++ b/doc/src/sgml/ref/alter_type.sgml
@@ -313,8 +313,7 @@ ALTER TYPE compfoo ADD ATTRIBUTE f3 int;
    To add a new value to an enum type in a particular sort position:
 <programlisting>
 ALTER TYPE colors ADD VALUE 'orange' AFTER 'red';
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml
index d18fe361999ce..3245f83e08d8d 100644
--- a/doc/src/sgml/ref/alter_user_mapping.sgml
+++ b/doc/src/sgml/ref/alter_user_mapping.sgml
@@ -92,8 +92,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
    Change the password for user mapping <literal>bob</>, server<literal> foo</>:
 <programlisting>
 ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'public');
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml
index 0d509319a3669..c3839057c0705 100644
--- a/doc/src/sgml/ref/alter_view.sgml
+++ b/doc/src/sgml/ref/alter_view.sgml
@@ -123,8 +123,7 @@ ALTER VIEW <replaceable class="parameter">name</replaceable> SET SCHEMA <replace
    <literal>bar</literal>:
 <programlisting>
 ALTER VIEW foo RENAME TO bar;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index 4c6a2b4a2ceca..acd823206a4e8 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -122,8 +122,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
 
 <programlisting>
 BEGIN;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 25e3c817ebb4f..4af6af7492294 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -107,8 +107,7 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
    Close the cursor <literal>liahona</literal>:
 <programlisting>
 CLOSE liahona;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index addf652065201..339990fa4d6be 100644
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -197,8 +197,7 @@ CLUSTER employees;
    Cluster all tables in the database that have previously been clustered:
 <programlisting>
 CLUSTER;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 081f398706de3..c80cbac5173eb 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -293,8 +293,7 @@ PostgreSQL documentation
     <literal>xyzzy</literal>:
 <screen>
 <prompt>$ </prompt><userinput>clusterdb --table foo xyzzy</userinput>
-</screen>
-   </para>
+</screen></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index ab12614f8430b..1c8b37c83282d 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -26,7 +26,7 @@ COMMENT ON
   AGGREGATE <replaceable class="PARAMETER">agg_name</replaceable> (<replaceable class="PARAMETER">agg_type</replaceable> [, ...] ) |
   CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
   COLLATION <replaceable class="PARAMETER">object_name</replaceable> |
-  COLUMN <replaceable class="PARAMETER">table_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> |
+  COLUMN <replaceable class="PARAMETER">relation_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> |
   CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
   CONVERSION <replaceable class="PARAMETER">object_name</replaceable> |
   DATABASE <replaceable class="PARAMETER">object_name</replaceable> |
@@ -98,7 +98,7 @@ COMMENT ON
   <variablelist>
    <varlistentry>
     <term><replaceable class="parameter">object_name</replaceable></term>
-    <term><replaceable class="parameter">table_name.column_name</replaceable></term>
+    <term><replaceable class="parameter">relation_name</replaceable>.<replaceable>column_name</replaceable></term>
     <term><replaceable class="parameter">agg_name</replaceable></term>
     <term><replaceable class="parameter">constraint_name</replaceable></term>
     <term><replaceable class="parameter">function_name</replaceable></term>
@@ -111,6 +111,9 @@ COMMENT ON
       aggregates, collations, conversions, domains, foreign tables, functions,
       indexes, operators, operator classes, operator families, sequences,
       text search objects, types, and views can be schema-qualified.
+      When commenting on a column,
+      <replaceable class="parameter">relation_name</replaceable> must refer
+      to a table, view, composite type, or foreign table.
      </para>
     </listitem>
    </varlistentry>
@@ -293,8 +296,7 @@ COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'Snowball stemmer';
 COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for RI';
 COMMENT ON TYPE complex IS 'Complex number data type';
 COMMENT ON VIEW my_view IS 'View of departmental costs';
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index 1a039c2e3ee3d..40147a54769b8 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -72,8 +72,7 @@ COMMIT [ WORK | TRANSACTION ]
    To commit the current transaction and make all changes permanent:
 <programlisting>
 COMMIT;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml
index 930435d81a0f5..2af677fcb0625 100644
--- a/doc/src/sgml/ref/commit_prepared.sgml
+++ b/doc/src/sgml/ref/commit_prepared.sgml
@@ -79,8 +79,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
 
 <programlisting>
 COMMIT PREPARED 'foobar';
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 6429a4ef0d7fb..a73b02276cb07 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -703,8 +703,7 @@ only one flag bit is defined, and the rest must be zero:
            </para>
           </listitem>
          </varlistentry>
-        </variablelist>
-       </para>
+        </variablelist></para>
       </listitem>
      </varlistentry>
 
@@ -850,8 +849,7 @@ ZW      ZIMBABWE
 0000140  \0 002   Z   M  \0  \0  \0 006   Z   A   M   B   I   A 377 377
 0000160 377 377  \0 003  \0  \0  \0 002   Z   W  \0  \0  \0  \b   Z   I
 0000200   M   B   A   B   W   E 377 377 377 377 377 377
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
@@ -910,7 +908,6 @@ COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH O
     TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
     [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
     [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
-</synopsis>
-  </para>
+</synopsis></para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml
index 4a3719122268c..084b60c4c162c 100644
--- a/doc/src/sgml/ref/create_conversion.sgml
+++ b/doc/src/sgml/ref/create_conversion.sgml
@@ -113,8 +113,7 @@ conv_proc(
     internal, -- destination (fill with a null terminated C string)
     integer   -- source string length
 ) RETURNS void;
-</programlisting>
-      </para>
+</programlisting></para>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -141,8 +140,7 @@ conv_proc(
    <literal>LATIN1</literal> using <function>myfunc</>:
 <programlisting>
 CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
 
diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml
index 8db90f911f619..0f901d78ee944 100644
--- a/doc/src/sgml/ref/create_domain.sgml
+++ b/doc/src/sgml/ref/create_domain.sgml
@@ -162,8 +162,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
    <varlistentry>
     <term><literal>CHECK (<replaceable class="PARAMETER">expression</replaceable>)</literal></term>
     <listitem>
-     <para>
-      <literal>CHECK</> clauses specify integrity constraints or tests
+     <para><literal>CHECK</> clauses specify integrity constraints or tests
       which values of the domain must satisfy.
       Each constraint must be an expression
       producing a Boolean result.  It should use the key word <literal>VALUE</>
@@ -190,8 +189,8 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
 <programlisting>
 CREATE DOMAIN us_postal_code AS TEXT
 CHECK(
-   VALUE ~ '^\\d{5}$'
-OR VALUE ~ '^\\d{5}-\\d{4}$'
+   VALUE ~ '^\d{5}$'
+OR VALUE ~ '^\d{5}-\d{4}$'
 );
 
 CREATE TABLE us_snail_addy (
@@ -202,8 +201,7 @@ CREATE TABLE us_snail_addy (
   city TEXT NOT NULL,
   postal us_postal_code NOT NULL
 );
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-CREATEDOMAIN-compatibility">
diff --git a/doc/src/sgml/ref/create_extension.sgml b/doc/src/sgml/ref/create_extension.sgml
index 7670d76f89442..9ec0fa2fe16be 100644
--- a/doc/src/sgml/ref/create_extension.sgml
+++ b/doc/src/sgml/ref/create_extension.sgml
@@ -111,8 +111,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
      <varlistentry>
       <term><replaceable class="parameter">old_version</replaceable></term>
       <listitem>
-       <para>
-        <literal>FROM</> <replaceable class="parameter">old_version</>
+       <para><literal>FROM</> <replaceable class="parameter">old_version</>
         must be specified when, and only when, you are attempting to install
         an extension that replaces an <quote>old style</> module that is just
         a collection of objects not packaged into an extension.  This option
diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
index 3093ebcb4ac57..804fb47c68fd0 100644
--- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
@@ -62,8 +62,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
    <varlistentry>
     <term><literal>HANDLER <replaceable class="parameter">handler_function</replaceable></literal></term>
     <listitem>
-     <para>
-      <replaceable class="parameter">handler_function</replaceable> is the
+     <para><replaceable class="parameter">handler_function</replaceable> is the
       name of a previously registered function that will be called to
       retrieve the execution functions for foreign tables.
       The handler function must take no arguments, and
@@ -81,8 +80,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
    <varlistentry>
     <term><literal>VALIDATOR <replaceable class="parameter">validator_function</replaceable></literal></term>
     <listitem>
-     <para>
-      <replaceable class="parameter">validator_function</replaceable> is the
+     <para><replaceable class="parameter">validator_function</replaceable> is the
       name of a previously registered function that will be called to
       check the generic options given to the foreign-data wrapper, as
       well as options for foreign servers and user mappings using the
@@ -157,8 +155,7 @@ CREATE FOREIGN DATA WRAPPER file HANDLER file_fdw_handler;
 <programlisting>
 CREATE FOREIGN DATA WRAPPER mywrapper
     OPTIONS (debug 'true');
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml
index ad91072bd125c..f52fd8c8e0466 100644
--- a/doc/src/sgml/ref/create_foreign_table.sgml
+++ b/doc/src/sgml/ref/create_foreign_table.sgml
@@ -167,8 +167,7 @@ CREATE FOREIGN TABLE films (
     len         interval hour to minute
 )
 SERVER film_server;
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index cd6ac69eb63d0..a617f96542785 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -259,8 +259,7 @@ CREATE [ OR REPLACE ] FUNCTION
      <term><literal>WINDOW</literal></term>
 
      <listitem>
-      <para>
-       <literal>WINDOW</literal> indicates that the function is a
+      <para><literal>WINDOW</literal> indicates that the function is a
        <firstterm>window function</> rather than a plain function.
        This is currently only useful for functions written in C.
        The <literal>WINDOW</> attribute cannot be changed when
@@ -282,8 +281,7 @@ CREATE [ OR REPLACE ] FUNCTION
        <literal>VOLATILE</literal> is the default assumption.
       </para>
 
-      <para>
-       <literal>IMMUTABLE</literal> indicates that the function
+      <para><literal>IMMUTABLE</literal> indicates that the function
        cannot modify the database and always
        returns the same result when given the same argument values; that
        is, it does not do database lookups or otherwise use information not
@@ -292,8 +290,7 @@ CREATE [ OR REPLACE ] FUNCTION
        immediately replaced with the function value.
       </para>
 
-      <para>
-       <literal>STABLE</literal> indicates that the function
+      <para><literal>STABLE</literal> indicates that the function
        cannot modify the database,
        and that within a single table scan it will consistently
        return the same result for the same argument values, but that its
@@ -306,8 +303,7 @@ CREATE [ OR REPLACE ] FUNCTION
        as stable, since their values do not change within a transaction.
       </para>
 
-      <para>
-       <literal>VOLATILE</literal> indicates that the function value can
+      <para><literal>VOLATILE</literal> indicates that the function value can
        change even within a single table scan, so no optimizations can be
        made.  Relatively few database functions are volatile in this sense;
        some examples are <literal>random()</>, <literal>currval()</>,
@@ -329,16 +325,14 @@ CREATE [ OR REPLACE ] FUNCTION
      <term><literal>STRICT</literal></term>
 
      <listitem>
-      <para>
-       <literal>CALLED ON NULL INPUT</literal> (the default) indicates
+      <para><literal>CALLED ON NULL INPUT</literal> (the default) indicates
        that the function will be called normally when some of its
        arguments are null.  It is then the function author's
        responsibility to check for null values if necessary and respond
        appropriately.
       </para>
 
-      <para>
-       <literal>RETURNS NULL ON NULL INPUT</literal> or
+      <para><literal>RETURNS NULL ON NULL INPUT</literal> or
        <literal>STRICT</literal> indicates that the function always
        returns null whenever any of its arguments are null.  If this
        parameter is specified, the function is not executed when there
@@ -353,8 +347,7 @@ CREATE [ OR REPLACE ] FUNCTION
     <term><literal><optional>EXTERNAL</optional> SECURITY DEFINER</literal></term>
 
     <listitem>
-     <para>
-      <literal>SECURITY INVOKER</literal> indicates that the function
+     <para><literal>SECURITY INVOKER</literal> indicates that the function
       is to be executed with the privileges of the user that calls it.
       That is the default.  <literal>SECURITY DEFINER</literal>
       specifies that the function is to be executed with the
@@ -499,8 +492,7 @@ CREATE [ OR REPLACE ] FUNCTION
        <varlistentry>
         <term><literal>isCachable</></term>
         <listitem>
-         <para>
-          <literal>isCachable</literal> is an obsolete equivalent of
+         <para><literal>isCachable</literal> is an obsolete equivalent of
           <literal>IMMUTABLE</literal>; it's still accepted for
           backwards-compatibility reasons.
          </para>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 43b6499603cb0..1a1e8d60d7549 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -381,7 +381,16 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ <replaceable class="parameter">name</
    <para>
     In a concurrent index build, the index is actually entered into the
     system catalogs in one transaction, then the two table scans occur in a
-    second and third transaction.
+    second and third transaction.  All active transactions at the time the
+    second table scan starts, not just ones that already involve the table,
+    have the potential to block the concurrent index creation until they
+    finish.  When checking for transactions that could still use the original
+    index, concurrent index creation advances through potentially interfering
+    older transactions one at a time, obtaining shared locks on their virtual
+    transaction identifiers to wait for them to complete.
+   </para>
+
+   <para>
     If a problem arises while scanning the table, such as a
     uniqueness violation in a unique index, the <command>CREATE INDEX</>
     command will fail but leave behind an <quote>invalid</> index. This index
@@ -589,8 +598,7 @@ SELECT * FROM points
    To create an index without locking out writes to the table:
 <programlisting>
 CREATE INDEX CONCURRENTLY sales_quantity_index ON sales_table (quantity);
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 13c3baf993c4a..6e72892375b5f 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -118,8 +118,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
      <term><literal>TRUSTED</literal></term>
 
      <listitem>
-      <para>
-       <literal>TRUSTED</literal> specifies that the language does
+      <para><literal>TRUSTED</literal> specifies that the language does
        not grant access to data that the user would not otherwise
        have.  If this key word is omitted
        when registering the language, only users with the
@@ -160,8 +159,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
      <term><literal>HANDLER</literal> <replaceable class="parameter">call_handler</replaceable></term>
 
      <listitem>
-      <para>
-       <replaceable class="parameter">call_handler</replaceable> is
+      <para><replaceable class="parameter">call_handler</replaceable> is
        the name of a previously registered function that will be
        called to execute the procedural language's functions.  The call
        handler for a procedural language must be written in a compiled
@@ -178,8 +176,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
      <term><literal>INLINE</literal> <replaceable class="parameter">inline_handler</replaceable></term>
 
      <listitem>
-      <para>
-       <replaceable class="parameter">inline_handler</replaceable> is the
+      <para><replaceable class="parameter">inline_handler</replaceable> is the
        name of a previously registered function that will be called
        to execute an anonymous code block
        (<xref linkend="sql-do"> command)
@@ -199,8 +196,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
      <term><literal>VALIDATOR</literal> <replaceable class="parameter">valfunction</replaceable></term>
 
      <listitem>
-      <para>
-       <replaceable class="parameter">valfunction</replaceable> is the
+      <para><replaceable class="parameter">valfunction</replaceable> is the
        name of a previously registered function that will be called
        when a new function in the language is created, to validate the
        new function.
@@ -309,8 +305,7 @@ CREATE FUNCTION plsample_call_handler() RETURNS language_handler
     LANGUAGE C;
 CREATE LANGUAGE plsample
     HANDLER plsample_call_handler;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="sql-createlanguage-compat">
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 90da092450fd5..28b5e7e0da2e2 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -52,8 +52,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
    There are a few restrictions on your choice of name:
    <itemizedlist>
     <listitem>
-     <para>
-     <literal>--</literal> and <literal>/*</literal> cannot appear anywhere in an operator name,
+     <para><literal>--</literal> and <literal>/*</literal> cannot appear anywhere in an operator name,
      since they will be taken as the start of a comment.
      </para>
     </listitem>
@@ -215,8 +214,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
    arguments, use the <literal>OPERATOR()</> syntax, for example:
 <programlisting>
 COMMUTATOR = OPERATOR(myschema.===) ,
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
@@ -266,8 +264,7 @@ CREATE OPERATOR === (
     JOIN = area_join_procedure,
     HASHES, MERGES
 );
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index 43bec5d8e134c..5a939346e7aab 100644
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -268,8 +268,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
      <varlistentry>
       <term><literal>IN GROUP</> <replaceable class="parameter">role_name</replaceable></term>
       <listitem>
-       <para>
-        <literal>IN GROUP</literal> is an obsolete spelling of
+       <para><literal>IN GROUP</literal> is an obsolete spelling of
         <literal>IN ROLE</>.
        </para>
       </listitem>
@@ -438,8 +437,7 @@ CREATE ROLE miriam WITH LOGIN PASSWORD 'jw8s0F4' VALID UNTIL '2005-01-01';
    Create a role that can create databases and manage roles:
 <programlisting>
 CREATE ROLE admin WITH CREATEDB CREATEROLE;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index e7c88497d607d..8bccf7f1f1274 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -149,8 +149,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
    <varlistentry>
     <term><option>INSTEAD</option></term>
     <listitem>
-     <para>
-      <literal>INSTEAD</literal> indicates that the commands should be
+     <para><literal>INSTEAD</literal> indicates that the commands should be
       executed <emphasis>instead of</> the original command.
      </para>
     </listitem>
@@ -159,8 +158,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
    <varlistentry>
     <term><option>ALSO</option></term>
     <listitem>
-     <para>
-      <literal>ALSO</literal> indicates that the commands should be
+     <para><literal>ALSO</literal> indicates that the commands should be
       executed <emphasis>in addition to</emphasis> the original
       command.
      </para>
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index 89a624eda26a7..930d876814d9a 100644
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -147,8 +147,7 @@ CREATE SCHEMA hollywood;
 CREATE TABLE hollywood.films (title text, release date, awards text[]);
 CREATE VIEW hollywood.winners AS
     SELECT title, release FROM hollywood.films WHERE awards IS NOT NULL;
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index f36b616db0ebe..367f440b6cb0f 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -318,8 +318,7 @@ BEGIN;
 COPY distributors FROM 'input_file';
 SELECT setval('serial', max(id)) FROM distributors;
 END;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
@@ -348,8 +347,7 @@ END;
       extension.
      </para>
     </listitem>
-   </itemizedlist>
-  </para>
+   </itemizedlist></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml
index f923dc84c89c5..be9be50b69c46 100644
--- a/doc/src/sgml/ref/create_server.sgml
+++ b/doc/src/sgml/ref/create_server.sgml
@@ -136,8 +136,7 @@ CREATE SERVER foo FOREIGN DATA WRAPPER "default";
    foreign-data wrapper <literal>pgsql</>:
 <programlisting>
 CREATE SERVER myserver FOREIGN DATA WRAPPER pgsql OPTIONS (host 'foo', dbname 'foodb', port '5432');
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 0fbe1160972e2..faff45900c41d 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -288,8 +288,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
       error will be reported.
      </para>
 
-     <para>
-      <literal>CHECK</> constraints are merged in essentially the same way as
+     <para><literal>CHECK</> constraints are merged in essentially the same way as
       columns: if multiple parent tables and/or the new table definition
       contain identically-named <literal>CHECK</> constraints, these
       constraints must all have the same check expression, or an error will be
@@ -340,8 +339,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
       table, unless the <literal>INCLUDING INDEXES</literal> clause is
       specified.
      </para>
-     <para>
-      <literal>STORAGE</> settings for the copied column definitions will only
+     <para><literal>STORAGE</> settings for the copied column definitions will only
       be copied if <literal>INCLUDING STORAGE</literal> is specified.  The
       default behavior is to exclude <literal>STORAGE</> settings, resulting
       in the copied columns in the new table having type-specific default
@@ -354,8 +352,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
       is specified. The default behavior is to exclude comments, resulting in
       the copied columns and constraints in the new table having no comments.
      </para>
-     <para>
-      <literal>INCLUDING ALL</literal> is an abbreviated form of
+     <para><literal>INCLUDING ALL</literal> is an abbreviated form of
       <literal>INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING INDEXES INCLUDING STORAGE INCLUDING COMMENTS</literal>.
      </para>
      <para>
@@ -798,8 +795,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+      </variablelist></para>
     </listitem>
    </varlistentry>
 
@@ -1061,9 +1057,7 @@ CREATE TABLE films (
     kind        varchar(10),
     len         interval hour to minute
 );
-</programlisting>
 
-<programlisting>
 CREATE TABLE distributors (
      did    integer PRIMARY KEY DEFAULT nextval('serial'),
      name   varchar(40) NOT NULL CHECK (name &lt;&gt; '')
@@ -1151,9 +1145,7 @@ CREATE TABLE distributors (
     name    varchar(40),
     PRIMARY KEY(did)
 );
-</programlisting>
 
-<programlisting>
 CREATE TABLE distributors (
     did     integer PRIMARY KEY,
     name    varchar(40)
@@ -1259,8 +1251,7 @@ CREATE TABLE employees OF employee_type (
     PRIMARY KEY (name),
     salary WITH OPTIONS DEFAULT 1000
 );
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-CREATETABLE-compatibility">
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index ff71078d1e2ee..e4797b6547318 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -183,8 +183,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE <replaceable
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+      </variablelist></para>
     </listitem>
    </varlistentry>
 
@@ -291,8 +290,7 @@ PREPARE recentfilms(date) AS
   SELECT * FROM films WHERE date_prod &gt; $1;
 CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
   EXECUTE recentfilms('2002-01-01');
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
@@ -319,8 +317,7 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
     </listitem>
 
     <listitem>
-     <para>
-      <productname>PostgreSQL</> handles temporary tables in a way
+     <para><productname>PostgreSQL</> handles temporary tables in a way
       rather different from the standard; see
       <xref linkend="sql-createtable">
       for details.
@@ -341,8 +338,7 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
       is an extension.
      </para>
     </listitem>
-   </itemizedlist>
-  </para>
+   </itemizedlist></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml
index beda4540c81ae..89c89072aed1e 100644
--- a/doc/src/sgml/ref/create_tablespace.sgml
+++ b/doc/src/sgml/ref/create_tablespace.sgml
@@ -118,8 +118,7 @@ CREATE TABLESPACE dbspace LOCATION '/data/dbs';
    owned by user <literal>genevieve</>:
 <programlisting>
 CREATE TABLESPACE indexspace OWNER genevieve LOCATION '/data/indexes';
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 8e502d94e4838..a7915cf09f4bf 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -235,8 +235,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
       is mentioned as a target of the <command>UPDATE</> command.
      </para>
 
-     <para>
-      <literal>INSTEAD OF UPDATE</> events do not support lists of columns.
+     <para><literal>INSTEAD OF UPDATE</> events do not support lists of columns.
      </para>
     </listitem>
    </varlistentry>
@@ -311,8 +310,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
       and <literal>DELETE</> triggers cannot refer to <literal>NEW</>.
      </para>
 
-     <para>
-      <literal>INSTEAD OF</> triggers do not support <literal>WHEN</>
+     <para><literal>INSTEAD OF</> triggers do not support <literal>WHEN</>
       conditions.
      </para>
 
@@ -502,8 +500,7 @@ CREATE TRIGGER view_insert
     </listitem>
 
     <listitem>
-     <para>
-      <productname>PostgreSQL</productname> only allows the execution
+     <para><productname>PostgreSQL</productname> only allows the execution
       of a user-defined function for the triggered action.  The standard
       allows the execution of a number of other SQL commands, such as
       <command>CREATE TABLE</command>, as the triggered action.  This
diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml
index c9606280fb896..c7cc4ce5746c8 100644
--- a/doc/src/sgml/ref/create_user_mapping.sgml
+++ b/doc/src/sgml/ref/create_user_mapping.sgml
@@ -94,8 +94,7 @@ CREATE USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
    Create a user mapping for user <literal>bob</>, server <literal>foo</>:
 <programlisting>
 CREATE USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'secret');
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 9c8171d0499f5..3e50173e22a15 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -352,8 +352,7 @@ PostgreSQL documentation
 <screen>
 <prompt>$ </prompt><userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
 <computeroutput>CREATE DATABASE demo ENCODING 'LATIN1';</computeroutput>
-</screen>
-   </para>
+</screen></para>
  </refsect1>
 
 
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index f2b75b7aca5c5..d500faaa74333 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -91,8 +91,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <term><literal>SCROLL</literal></term>
     <term><literal>NO SCROLL</literal></term>
     <listitem>
-     <para>
-      <literal>SCROLL</literal> specifies that the cursor can be used
+     <para><literal>SCROLL</literal> specifies that the cursor can be used
       to retrieve rows in a nonsequential fashion (e.g.,
       backward). Depending upon the complexity of the query's
       execution plan, specifying <literal>SCROLL</literal> might impose
@@ -110,8 +109,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <term><literal>WITH HOLD</literal></term>
     <term><literal>WITHOUT HOLD</literal></term>
     <listitem>
-     <para>
-      <literal>WITH HOLD</literal> specifies that the cursor can
+     <para><literal>WITH HOLD</literal> specifies that the cursor can
       continue to be used after the transaction that created it
       successfully commits.  <literal>WITHOUT HOLD</literal> specifies
       that the cursor cannot be used outside of the transaction that
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 9406f4e3af04b..71ebeda880aa9 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -275,8 +275,7 @@ DELETE FROM tasks WHERE status = 'DONE' RETURNING *;
    <literal>c_tasks</> is currently positioned:
 <programlisting>
 DELETE FROM tasks WHERE CURRENT OF c_tasks;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml
index 74a2ce3b4eed2..65ebbae138502 100644
--- a/doc/src/sgml/ref/discard.sgml
+++ b/doc/src/sgml/ref/discard.sgml
@@ -83,8 +83,7 @@ UNLISTEN *;
 SELECT pg_advisory_unlock_all();
 DISCARD PLANS;
 DISCARD TEMP;
-</programlisting>
-     </para>
+</programlisting></para>
     </listitem>
    </varlistentry>
 
diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml
index 47f144f7954a5..5f43d1cf52c49 100644
--- a/doc/src/sgml/ref/do.sgml
+++ b/doc/src/sgml/ref/do.sgml
@@ -107,9 +107,9 @@ BEGIN
         EXECUTE 'GRANT ALL ON ' || quote_ident(r.table_schema) || '.' || quote_ident(r.table_name) || ' TO webuser';
     END LOOP;
 END$$;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
+
  <refsect1>
   <title>Compatibility</title>
 
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index 400b4d70eb302..dd8aafa74db88 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -99,8 +99,7 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> (
    <type>integer</type>:
 <programlisting>
 DROP AGGREGATE myavg(integer);
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml
index 139e89dacaf10..589c6ac39b35c 100644
--- a/doc/src/sgml/ref/drop_cast.sgml
+++ b/doc/src/sgml/ref/drop_cast.sgml
@@ -92,8 +92,7 @@ DROP CAST [ IF EXISTS ] (<replaceable>source_type</replaceable> AS <replaceable>
    To drop the cast from type <type>text</type> to type <type>int</type>:
 <programlisting>
 DROP CAST (text AS int);
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="sql-dropcast-compat">
diff --git a/doc/src/sgml/ref/drop_collation.sgml b/doc/src/sgml/ref/drop_collation.sgml
index 0afcaaf2dee0d..64a48eec2b0b4 100644
--- a/doc/src/sgml/ref/drop_collation.sgml
+++ b/doc/src/sgml/ref/drop_collation.sgml
@@ -84,8 +84,7 @@ DROP COLLATION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRIC
    To drop the collation named <literal>german</>:
 <programlisting>
 DROP COLLATION german;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="sql-dropcollation-compat">
diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml
index 79e159dcbd150..6f866438fbb59 100644
--- a/doc/src/sgml/ref/drop_conversion.sgml
+++ b/doc/src/sgml/ref/drop_conversion.sgml
@@ -77,8 +77,7 @@ DROP CONVERSION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRI
    To drop the conversion named <literal>myname</>:
 <programlisting>
 DROP CONVERSION myname;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="sql-dropconversion-compat">
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index 689633f6dd634..b7b9a167c11f2 100644
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -87,8 +87,7 @@ DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
 
 <programlisting>
 DROP DOMAIN box;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-DROPDOMAIN-compatibility">
diff --git a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
index 0ac0722f3d56c..18fa4fe4a575c 100644
--- a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
@@ -87,8 +87,7 @@ DROP FOREIGN DATA WRAPPER [ IF EXISTS ] <replaceable class="parameter">name</rep
    Drop the foreign-data wrapper <literal>dbi</>:
 <programlisting>
 DROP FOREIGN DATA WRAPPER dbi;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_foreign_table.sgml b/doc/src/sgml/ref/drop_foreign_table.sgml
index 71f26465bb620..1f66126a33568 100644
--- a/doc/src/sgml/ref/drop_foreign_table.sgml
+++ b/doc/src/sgml/ref/drop_foreign_table.sgml
@@ -21,7 +21,7 @@
 DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
- 
+
  <refsect1>
   <title>Description</title>
 
@@ -30,7 +30,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl
    Only the owner of a foreign table can remove it.
   </para>
  </refsect1>
-  
+
  <refsect1>
   <title>Parameters</title>
 
@@ -80,15 +80,14 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl
   <title>Examples</title>
 
   <para>
-   To destroy two foreign tables, <literal>films</literal> and 
+   To destroy two foreign tables, <literal>films</literal> and
    <literal>distributors</literal>:
 
 <programlisting>
 DROP FOREIGN TABLE films, distributors;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
- 
+
  <refsect1>
   <title>Compatibility</title>
 
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index a26b4ff66cfc1..2d0048be2882f 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -132,8 +132,7 @@ DROP FUNCTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> (
 
 <programlisting>
 DROP FUNCTION sqrt(integer);
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-DROPFUNCTION-compatibility">
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index fb4ce2bf9cd26..7177ef2d81b00 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -87,8 +87,7 @@ DROP INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
 
 <programlisting>
 DROP INDEX title_idx;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index 21c9e5aced632..c2cb7045dedf0 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -100,8 +100,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
 
 <programlisting>
 DROP LANGUAGE plsample;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index aa227ab8d87b7..3091454fdc584 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -123,8 +123,7 @@ DROP OPERATOR ~ (none, bit);
    for type <type>bigint</type>:
 <programlisting>
 DROP OPERATOR ! (bigint, none);
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml
index a3a999437c23f..92c0fb863dd37 100644
--- a/doc/src/sgml/ref/drop_role.sgml
+++ b/doc/src/sgml/ref/drop_role.sgml
@@ -96,8 +96,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    To drop a role:
 <programlisting>
 DROP ROLE jonathan;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index fd24c70127285..b7ff6e6078ea9 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -96,8 +96,7 @@ DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <re
 
 <programlisting>
 DROP RULE newrule ON mytable;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml
index 50fb09b965def..15dbc40817a74 100644
--- a/doc/src/sgml/ref/drop_schema.sgml
+++ b/doc/src/sgml/ref/drop_schema.sgml
@@ -93,8 +93,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
 
 <programlisting>
 DROP SCHEMA mystuff CASCADE;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index 84a8ca188b387..f810b5976c19a 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -86,8 +86,7 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [,
 
 <programlisting>
 DROP SEQUENCE serial;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml
index af08655a1d76c..6a64e83ebe620 100644
--- a/doc/src/sgml/ref/drop_server.sgml
+++ b/doc/src/sgml/ref/drop_server.sgml
@@ -87,8 +87,7 @@ DROP SERVER [ IF EXISTS ] <replaceable class="parameter">server_name</replaceabl
    Drop a server <literal>foo</> if it exists:
 <programlisting>
 DROP SERVER IF EXISTS foo;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index 7fa7e32ee07e8..26fe76e1f8d3f 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -100,8 +100,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
 
 <programlisting>
 DROP TABLE films, distributors;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml
index aa80be3c6f59b..107e049c8c68d 100644
--- a/doc/src/sgml/ref/drop_tablespace.sgml
+++ b/doc/src/sgml/ref/drop_tablespace.sgml
@@ -86,8 +86,7 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">tablespace_name</re
    To remove tablespace <literal>mystuff</literal> from the system:
 <programlisting>
 DROP TABLESPACE mystuff;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index 444c928d1ec88..2fcc690db73bc 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -99,8 +99,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON
 
 <programlisting>
 DROP TRIGGER if_dist_exists ON films;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-DROPTRIGGER-compatibility">
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index 9de13068a7e8f..c3ddfa5f42534 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -86,8 +86,7 @@ DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    To remove the data type <type>box</type>:
 <programlisting>
 DROP TYPE box;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-DROPTYPE-compatibility">
diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml
index 747d7cbd2e70c..de21bfe5d7a0b 100644
--- a/doc/src/sgml/ref/drop_user_mapping.sgml
+++ b/doc/src/sgml/ref/drop_user_mapping.sgml
@@ -85,8 +85,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</
    Drop a user mapping <literal>bob</>, server <literal>foo</> if it exists:
 <programlisting>
 DROP USER MAPPING IF EXISTS FOR bob SERVER foo;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 5d7e413c0b7dd..51b82664cb374 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -86,8 +86,7 @@ DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    This command will remove the view called <literal>kinds</literal>:
 <programlisting>
 DROP VIEW kinds;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 1aa76cdb57bf4..e20bcdb53f43c 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -253,8 +253,7 @@ PostgreSQL documentation
 <computeroutput>Database "demo" will be permanently deleted.
 Are you sure? (y/n) </computeroutput><userinput>y</userinput>
 <computeroutput>DROP DATABASE demo;</computeroutput>
-</screen>
-   </para>
+</screen></para>
  </refsect1>
 
 
diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index 0ad640b0b47b0..04c3a609e5db8 100644
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -271,8 +271,7 @@ PostgreSQL documentation
     To remove the language <literal>pltcl</literal>:
 <screen>
 <prompt>$ </prompt><userinput>droplang pltcl dbname</userinput>
-</screen>
-   </para>
+</screen></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 3089a21954334..c158103913c49 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -254,8 +254,7 @@ PostgreSQL documentation
 <computeroutput>Role "joe" will be permanently removed.
 Are you sure? (y/n) </computeroutput><userinput>y</userinput>
 <computeroutput>DROP ROLE joe;</computeroutput>
-</screen>
-   </para>
+</screen></para>
  </refsect1>
 
 
diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml
index 2bbd4761585c2..9c13e93a271c3 100644
--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
@@ -166,8 +166,7 @@ PostgreSQL documentation
          </para>
          </listitem>
         </varlistentry>
-       </variablelist>
-      </para>
+       </variablelist></para>
      </listitem>
     </varlistentry>
 
@@ -253,8 +252,7 @@ PostgreSQL documentation
 ecpg prog1.pgc
 cc -I/usr/local/pgsql/include -c prog1.c
 cc -o prog1 prog1.o -L/usr/local/pgsql/lib -lecpg
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
 </refentry>
diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml
index 85248b4c2f585..b60cb2c48bdfd 100644
--- a/doc/src/sgml/ref/end.sgml
+++ b/doc/src/sgml/ref/end.sgml
@@ -74,8 +74,7 @@ END [ WORK | TRANSACTION ]
    To commit the current transaction and make all changes permanent:
 <programlisting>
 END;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index b78fed267b93b..cc49b6f0ce666 100644
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -111,8 +111,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
    <varlistentry>
     <term><replaceable class="PARAMETER">direction</replaceable></term>
     <listitem>
-     <para>
-      <replaceable class="PARAMETER">direction</replaceable> defines
+     <para><replaceable class="PARAMETER">direction</replaceable> defines
       the fetch direction and number of rows to fetch.  It can be one
       of the following:
 
@@ -266,16 +265,14 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+      </variablelist></para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
     <term><replaceable class="PARAMETER">count</replaceable></term>
     <listitem>
-     <para>
-      <replaceable class="PARAMETER">count</replaceable> is a
+     <para><replaceable class="PARAMETER">count</replaceable> is a
       possibly-signed integer constant, determining the location or
       number of rows to fetch.  For <literal>FORWARD</> and
       <literal>BACKWARD</> cases, specifying a negative <replaceable
@@ -378,8 +375,7 @@ FETCH PRIOR FROM liahona;
 -- Close the cursor and end the transaction:
 CLOSE liahona;
 COMMIT WORK;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index 689aba5104f1e..acdabd2ee8253 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -586,8 +586,7 @@ GRANT ALL PRIVILEGES ON kinds TO manuel;
 
 <programlisting>
 GRANT admins TO joe;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="sql-grant-compatibility">
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index a5c0d5a0a68b0..6aae3396d29bf 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -312,8 +312,7 @@ WITH upd AS (
     RETURNING *
 )
 INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml
index 98091c2856a4a..7287d3fc29611 100644
--- a/doc/src/sgml/ref/listen.sgml
+++ b/doc/src/sgml/ref/listen.sgml
@@ -113,8 +113,7 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable>
 LISTEN virtual;
 NOTIFY virtual;
 Asynchronous notification "virtual" received from server process with PID 8448.
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 9b464580aae42..53014ed34f5ed 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -222,8 +222,7 @@ DELETE FROM films_user_comments WHERE id IN
     (SELECT id FROM films WHERE rating &lt; 5);
 DELETE FROM films WHERE rating &lt; 5;
 COMMIT WORK;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml
index 330b2cd56d2b9..44807062930c6 100644
--- a/doc/src/sgml/ref/notify.sgml
+++ b/doc/src/sgml/ref/notify.sgml
@@ -204,8 +204,7 @@ Asynchronous notification "virtual" with payload "This is the payload" received
 LISTEN foo;
 SELECT pg_notify('fo' || 'o', 'pay' || 'load');
 Asynchronous notification "foo" with payload "payload" received from server process with PID 14728.
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 47dce43b1948e..25280045412e0 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -138,8 +138,7 @@ PostgreSQL documentation
            </para>
            </listitem>
          </varlistentry>
-        </variablelist>
-       </para>
+        </variablelist></para>
       </listitem>
      </varlistentry>
 
@@ -230,8 +229,8 @@ PostgreSQL documentation
         the backup, this is only an approximation and may not end at exactly
         <literal>100%</literal>. In particular, when WAL log is included in the
         backup, the total amount of data cannot be estimated in advance, and
-        in this case the progress report will only count towards the total
-        amount of data without WAL.
+        in this case the estimated target size will increase once it passes the
+        total estimate without WAL.
        </para>
        <para>
         When this is enabled, the backup will start by enumerating the size of
@@ -324,7 +323,7 @@ PostgreSQL documentation
 
        <para>
         This option is never essential, since
-        <application>pg_bsaebackup</application> will automatically prompt
+        <application>pg_basebackup</application> will automatically prompt
         for a password if the server demands password authentication.
         However, <application>pg_basebackup</application> will waste a
         connection attempt finding out that the server wants a password.
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 10105e2524109..07836e718f702 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -519,8 +519,7 @@ PostgreSQL documentation
     running without <function>fsync</function>, use:
 <screen>
 <prompt>$</prompt> <userinput>pg_ctl -o "-F -p 5433" start</userinput>
-</screen>
-   </para>
+</screen></para>
   </refsect2>
 
   <refsect2 id="R2-APP-PGCTL-4">
@@ -534,8 +533,7 @@ PostgreSQL documentation
     <emphasis>how</emphasis> the server shuts down:
 <screen>
 <prompt>$</prompt> <userinput>pg_ctl stop -m fast</userinput>
-</screen>
-   </para>
+</screen></para>
   </refsect2>
 
   <refsect2 id="R2-APP-PGCTL-5">
@@ -564,8 +562,7 @@ PostgreSQL documentation
     To restart using port 5433, disabling <function>fsync</> upon restart:
 <screen>
 <prompt>$</prompt> <userinput>pg_ctl -o "-F -p 5433" restart</userinput>
-</screen>
-   </para>
+</screen></para>
   </refsect2>
 
   <refsect2 id="R2-APP-PGCTL-6">
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index c24cc394d667e..f6f33de7e7e0a 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -268,10 +268,7 @@ PostgreSQL documentation
           </para>
          </listitem>
         </varlistentry>
-
-       </variablelist>
-       </para>
-
+       </variablelist></para>
       </listitem>
      </varlistentry>
 
@@ -1075,8 +1072,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
 
 <screen>
 <prompt>$</prompt> <userinput>pg_dump -t '"MixedCaseName"' mydb &gt; mytab.sql</userinput>
-</screen>
-  </para>
+</screen></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index be4851b657013..be11d176cd464 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -197,8 +197,7 @@
           </para>
          </listitem>
         </varlistentry>
-       </variablelist>
-       </para>
+       </variablelist></para>
       </listitem>
      </varlistentry>
 
@@ -286,8 +285,7 @@
         if filtering switches such as <option>-n</> or <option>-t</> are
         used with <option>-L</>, they will further restrict the items restored.
        </para>
-       <para>
-        <replaceable class="PARAMETER">list-file</> is normally created by
+       <para><replaceable class="PARAMETER">list-file</> is normally created by
         editing the output of a previous <option>-l</> operation.
         Lines can be moved or removed, and can also
         be commented out by placing a semicolon (<literal>;</literal>) at the
@@ -707,8 +705,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
     </listitem>
 
     <listitem>
-     <para>
-      <application>pg_restore</application> cannot restore large objects
+     <para><application>pg_restore</application> cannot restore large objects
       selectively;  for instance, only those for a specific table.  If
       an archive contains large objects, then all large objects will be
       restored, or none of them if they are excluded via <option>-L</option>,
@@ -821,8 +818,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
    items 10 and 6, in that order:
 <screen>
 <prompt>$</prompt> <userinput>pg_restore -L db.list db.dump</userinput>
-</screen>
-  </para>
+</screen></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index bd4ae338f7328..b16bbdfa4b359 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -745,7 +745,7 @@ PostgreSQL documentation
 
    <para>
     Note that the single-user mode server does not provide sophisticated
-    line-editing features (no command history, for example). 
+    line-editing features (no command history, for example).
     Single-User mode also does not do any background processing, like
     automatic checkpoints.
 
diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml
index 261cedc8d9c7f..a10aa35d386cd 100644
--- a/doc/src/sgml/ref/prepare_transaction.sgml
+++ b/doc/src/sgml/ref/prepare_transaction.sgml
@@ -153,8 +153,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
 
 <programlisting>
 PREPARE TRANSACTION 'foobar';
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index eaf901d328df5..79a0ed4f4bbb1 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -83,8 +83,7 @@ PostgreSQL documentation
       (<filename>psqlrc</filename> and <filename>~/.psqlrc</filename>) are
       ignored with this option.
       </para>
-      <para>
-      <replaceable class="parameter">command</replaceable> must be either
+      <para><replaceable class="parameter">command</replaceable> must be either
       a command string that is completely parsable by the server (i.e.,
       it contains no <application>psql</application>-specific features),
       or a single backslash command. Thus you cannot mix
@@ -839,8 +838,7 @@ testdb=&gt;
         backslash escapes do not apply.
         </para>
 
-        <para>
-        <literal>\copy ... from stdin | to stdout</literal>
+        <para><literal>\copy ... from stdin | to stdout</literal>
         reads/writes based on the command input and output respectively.
         All rows are read from the same source that issued the command,
         continuing until <literal>\.</literal> is read or the stream
@@ -878,8 +876,8 @@ testdb=&gt;
 
         <listitem>
         <para>
-        For each relation (table, view, index, sequence or foreign table)
-        matching the
+        For each relation (table, view, index, sequence, or foreign table)
+        or composite type matching the
         <replaceable class="parameter">pattern</replaceable>, show all
         columns, their types, the tablespace (if not the default) and any
         special attributes such as <literal>NOT NULL</literal> or defaults.
@@ -1440,25 +1438,21 @@ testdb=&gt;
         <literal>\r</> to cancel.
         </para>
 
-        <tip>
         <para>
-        <application>psql</application> checks the environment
-        variables <envar>PSQL_EDITOR</envar>, <envar>EDITOR</envar>, and
-        <envar>VISUAL</envar> (in that order) for an editor to use. If
-        all of them are unset, <filename>vi</filename> is used on Unix
-        systems, <filename>notepad.exe</filename> on Windows systems.
+        If a line number is specified, <application>psql</application> will
+        position the cursor on the specified line of the file or query buffer.
+        Note that if a single all-digits argument is given,
+        <application>psql</application> assumes it is a line number,
+        not a file name.
         </para>
-        </tip>
 
+        <tip>
         <para>
-        If a line number is specified, <application>psql</application> will
-        position the cursor on the specified line of the file or query buffer.
-        This feature requires the <varname>EDITOR_LINENUMBER_SWITCH</varname>
-        variable to be set, so that <application>psql</application> knows how
-        to specify the line number to the editor.  Note that if a single
-        all-digits argument is given, <application>psql</application> assumes
-        it is a line number not a file name.
+        See under <xref linkend="app-psql-environment"
+        endterm="app-psql-environment-title"> for how to configure and
+        customize your editor.
         </para>
+        </tip>
         </listitem>
       </varlistentry>
 
@@ -1514,13 +1508,18 @@ Tue Oct 26 21:40:57 CEST 1999
 
         <para>
         If a line number is specified, <application>psql</application> will
-        position the cursor on the specified line of the function body
-        (note that the function body typically does not begin on the
-        first line of the file).
-        This feature requires the <varname>EDITOR_LINENUMBER_SWITCH</varname>
-        variable to be set, so that <application>psql</application> knows how
-        to specify the line number to the editor.
+        position the cursor on the specified line of the function body.
+        (Note that the function body typically does not begin on the first
+        line of the file.)
+        </para>
+
+        <tip>
+        <para>
+        See under <xref linkend="app-psql-environment"
+        endterm="app-psql-environment-title"> for how to configure and
+        customize your editor.
         </para>
+        </tip>
         </listitem>
       </varlistentry>
 
@@ -1737,8 +1736,7 @@ lo_import 152801
         specified, the query output will be reset to the standard output.
         </para>
 
-        <para>
-        <quote>Query results</quote> includes all tables, command
+        <para><quote>Query results</quote> includes all tables, command
         responses, and notices obtained from the database server, as
         well as output of various backslash commands that query the
         database (such as <command>\d</command>), but not error
@@ -1906,21 +1904,18 @@ lo_import 152801
           is enough.)
           </para>
 
-          <para>
-          <literal>unaligned</> format writes all columns of a row on one
+          <para><literal>unaligned</> format writes all columns of a row on one
           line, separated by the currently active field separator. This
           is useful for creating output that might be intended to be read
           in by other programs (for example, tab-separated or comma-separated
           format).
           </para>
 
-          <para>
-          <literal>aligned</literal> format is the standard, human-readable,
+          <para><literal>aligned</literal> format is the standard, human-readable,
           nicely formatted text output;  this is the default.
           </para>
 
-          <para>
-          <literal>wrapped</> format is like <literal>aligned</> but wraps
+          <para><literal>wrapped</> format is like <literal>aligned</> but wraps
           wide data values across lines to make the output fit in the target
           column width.  The target width is determined as described under
           the <literal>columns</> option.  Note that <application>psql</> will
@@ -1954,8 +1949,7 @@ lo_import 152801
           <literal>wrapped</> output formats.
           </para>
 
-          <para>
-          <literal>ascii</literal> style uses plain <acronym>ASCII</acronym>
+          <para><literal>ascii</literal> style uses plain <acronym>ASCII</acronym>
           characters.  Newlines in data are shown using
           a <literal>+</literal> symbol in the right-hand margin.
           When the <literal>wrapped</literal> format wraps data from
@@ -1964,8 +1958,7 @@ lo_import 152801
           and again in the left-hand margin of the following line.
           </para>
 
-          <para>
-          <literal>old-ascii</literal> style uses plain <acronym>ASCII</>
+          <para><literal>old-ascii</literal> style uses plain <acronym>ASCII</>
           characters, using the formatting style used
           in <productname>PostgreSQL</productname> 8.4 and earlier.
           Newlines in data are shown using a <literal>:</literal>
@@ -1975,8 +1968,7 @@ lo_import 152801
           symbol is used in place of the left-hand column separator.
           </para>
 
-          <para>
-          <literal>unicode</literal> style uses Unicode box-drawing characters.
+          <para><literal>unicode</literal> style uses Unicode box-drawing characters.
           Newlines in data are shown using a carriage return symbol
           in the right-hand margin.  When the data is wrapped from one line
           to the next without a newline character, an ellipsis symbol
@@ -2130,10 +2122,11 @@ lo_import 152801
 
 
       <varlistentry>
-        <term><literal>\q</literal></term>
+        <term><literal>\q</literal> or <literal>\quit</literal></term>
         <listitem>
         <para>
         Quits the <application>psql</application> program.
+        In a script file, only execution of that script is terminated.
         </para>
         </listitem>
       </varlistentry>
@@ -2458,8 +2451,7 @@ testdb=&gt; <userinput>\set foo bar</userinput>
 <programlisting>
 testdb=&gt; <userinput>\echo :foo</userinput>
 bar
-</programlisting>
-    </para>
+</programlisting></para>
 
     <note>
     <para>
@@ -2583,27 +2575,6 @@ bar
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>EDITOR_LINENUMBER_SWITCH</varname></term>
-        <listitem>
-        <para>
-        When <command>\edit</command> or <command>\ef</command> is used with a
-        line number argument, this variable specifies the command-line switch
-        used to pass the line number to the user's editor.  For editors such
-        as <productname>emacs</> or <productname>vi</>, you can simply set
-        this variable to a plus sign.  Include a trailing space in the value
-        of the variable if there needs to be space between the switch name and
-        the line number.
-        Examples:
-
-<programlisting>
-\set EDITOR_LINENUMBER_SWITCH +
-\set EDITOR_LINENUMBER_SWITCH '--line '
-</programlisting>
-        </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>ENCODING</varname></term>
         <listitem>
@@ -2770,18 +2741,16 @@ bar
         <term><varname>ON_ERROR_STOP</varname></term>
         <listitem>
         <para>
-        By default, if non-interactive scripts encounter an error, such
-        as a malformed <acronym>SQL</acronym> command or internal
-        meta-command, processing continues. This has been the
-        traditional behavior of <application>psql</application> but it
-        is sometimes not desirable. If this variable is set, script
-        processing will immediately terminate. If the script was called
-        from another script it will terminate in the same fashion. If
-        the outermost script was not called from an interactive
-        <application>psql</application> session but rather using the
-        <option>-f</option> option, <application>psql</application> will
-        return error code 3, to distinguish this case from fatal error
-        conditions (error code 1).
+        By default, command processing continues after an error.  When this
+        variable is set, it will instead stop immediately.  In interactive mode,
+        <application>psql</application> will return to the command prompt;
+        otherwise, <application>psql</application> will exit, returning
+        error code 3 to distinguish this case from fatal error
+        conditions, which are reported using error code 1.  In either case,
+        any currently running scripts (the top-level script, if any, and any
+        other scripts which it may have in invoked) will be terminated
+        immediately.  If the top-level command string contained multiple SQL
+        commands, processing will stop with the current command.
         </para>
         </listitem>
       </varlistentry>
@@ -3154,8 +3123,8 @@ $endif
  </refsect1>
 
 
- <refsect1>
-  <title>Environment</title>
+ <refsect1 id="app-psql-environment">
+  <title id="app-psql-environment-title">Environment</title>
 
   <variablelist>
 
@@ -3205,8 +3174,41 @@ $endif
 
     <listitem>
      <para>
-      Editor used by the <command>\e</command> command.  The variables
-      are examined in the order listed; the first that is set is used.
+      Editor used by the <command>\e</command> and
+      <command>\ef</command> commands.  The variables are examined in
+      the order listed; the first that is set is used.
+     </para>
+
+     <para>
+      The built-in default editors are <filename>vi</filename> on Unix
+      systems and <filename>notepad.exe</filename> on Windows systems.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><envar>PSQL_EDITOR_LINENUMBER_ARG</envar></term>
+
+    <listitem>
+     <para>
+      When <command>\e</command> or <command>\ef</command> is used
+      with a line number argument, this variable specifies the
+      command-line argument used to pass the starting line number to
+      the user's editor.  For editors such as <productname>Emacs</> or
+      <productname>vi</>, this is a plus sign.  Include a trailing
+      space in the value of the variable if there needs to be space
+      between the option name and the line number.  Examples:
+<programlisting>
+PSQL_EDITOR_LINENUMBER_ARG='+'
+PSQL_EDITOR_LINENUMBER_ARG='--line '
+</programlisting>
+     </para>
+
+     <para>
+      The default is <literal>+</literal> on Unix systems
+      (corresponding to the default editor <filename>vi</filename>,
+      and useful for many other common editors); but there is no
+      default on Windows systems.
      </para>
     </listitem>
    </varlistentry>
@@ -3300,8 +3302,7 @@ $endif
       </listitem>
 
       <listitem>
-      <para>
-       <application>psql</application> is only guaranteed to work smoothly
+      <para><application>psql</application> is only guaranteed to work smoothly
        with servers of the same version. That does not mean other combinations
        will fail outright, but subtle and not-so-subtle problems might come
        up.  Backslash commands are particularly likely to fail if the
@@ -3344,8 +3345,7 @@ $endif
       raster font does not work with the ANSI code page.
      </para>
     </listitem>
-   </itemizedlist>
- </para>
+   </itemizedlist></para>
 
  </refsect1>
 
@@ -3451,8 +3451,7 @@ second | three
 -[ RECORD 4 ]-
 first  | 4
 second | four
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index c9514f95aee8b..722266563eb16 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -74,8 +74,7 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } <replaceable class="PARAMETER">nam
      </para>
     </listitem>
 
-   </itemizedlist>
-  </para>
+   </itemizedlist></para>
  </refsect1>
 
  <refsect1>
@@ -263,8 +262,7 @@ $ <userinput>psql broken_db</userinput>
 ...
 broken_db=&gt; REINDEX DATABASE broken_db;
 broken_db=&gt; \q
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 026bdcc7185ed..7b0263c5a1c27 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -319,8 +319,7 @@ PostgreSQL documentation
     <literal>bar</literal> in a database named <literal>abcd</literal>:
 <screen>
 <prompt>$ </prompt><userinput>reindexdb --table foo --index bar abcd</userinput>
-</screen>
-   </para>
+</screen></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index 3e31a6c186953..d1ce7fb12467b 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -91,8 +91,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
    Set the <varname>timezone</> configuration variable to its default value:
 <screen>
 RESET timezone;
-</screen>
-  </para>
+</screen></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index 204c986ecec5e..3229e4bcc716c 100644
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -261,8 +261,7 @@ REVOKE ALL PRIVILEGES ON kinds FROM manuel;
 
 <programlisting>
 REVOKE admins FROM joe;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1 id="SQL-REVOKE-compatibility">
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index 49989c01bffdb..b26554567dbd0 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -71,8 +71,7 @@ ROLLBACK [ WORK | TRANSACTION ]
    To abort all changes:
 <programlisting>
 ROLLBACK;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml
index 9dfe1416e0dca..9592b92f32181 100644
--- a/doc/src/sgml/ref/rollback_prepared.sgml
+++ b/doc/src/sgml/ref/rollback_prepared.sgml
@@ -79,8 +79,7 @@ ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
 
 <programlisting>
 ROLLBACK PREPARED 'foobar';
-</programlisting>
-  </para>
+</programlisting></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml
index bf838223783ba..1b59af6443615 100644
--- a/doc/src/sgml/ref/rollback_to.sgml
+++ b/doc/src/sgml/ref/rollback_to.sgml
@@ -124,8 +124,7 @@ FETCH 1 FROM foo;
         2
 
 COMMIT;
-</programlisting>
-   </para>
+</programlisting></para>
 
 
  </refsect1>
diff --git a/doc/src/sgml/ref/security_label.sgml b/doc/src/sgml/ref/security_label.sgml
index 8a01b940de898..22a86dee5782e 100644
--- a/doc/src/sgml/ref/security_label.sgml
+++ b/doc/src/sgml/ref/security_label.sgml
@@ -193,8 +193,7 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
 
 <programlisting>
 SECURITY LABEL FOR selinux ON TABLE mytable IS 'system_u:object_r:sepgsql_table_t:s0';
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
@@ -203,4 +202,12 @@ SECURITY LABEL FOR selinux ON TABLE mytable IS 'system_u:object_r:sepgsql_table_
    There is no <command>SECURITY LABEL</command> command in the SQL standard.
   </para>
  </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sepgsql"></member>
+   <member><xref linkend="dummy-seclabel"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 5ff1ee834e62e..9f53f778045e2 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -125,8 +125,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
     </listitem>
 
     <listitem>
-     <para>
-      <literal>SELECT DISTINCT</literal> eliminates duplicate rows from the
+     <para><literal>SELECT DISTINCT</literal> eliminates duplicate rows from the
       result.  <literal>SELECT DISTINCT ON</literal> eliminates rows that
       match on all the specified expressions.  <literal>SELECT ALL</literal>
       (the default) will return all candidate rows, including
@@ -423,8 +422,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
         separating <literal>FROM</> items.
        </para>
 
-       <para>
-        <literal>CROSS JOIN</> and <literal>INNER JOIN</literal>
+       <para><literal>CROSS JOIN</> and <literal>INNER JOIN</literal>
         produce a simple Cartesian product, the same result as you get from
         listing the two items at the top level of <literal>FROM</>,
         but restricted by the join condition (if any).
@@ -435,8 +433,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
         <literal>WHERE</>.
        </para>
 
-       <para>
-        <literal>LEFT OUTER JOIN</> returns all rows in the qualified
+       <para><literal>LEFT OUTER JOIN</> returns all rows in the qualified
         Cartesian product (i.e., all combined rows that pass its join
         condition), plus one copy of each row in the left-hand table
         for which there was no right-hand row that passed the join
@@ -455,8 +452,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
         OUTER JOIN</> by switching the left and right inputs.
        </para>
 
-       <para>
-        <literal>FULL OUTER JOIN</> returns all the joined rows, plus
+       <para><literal>FULL OUTER JOIN</> returns all the joined rows, plus
         one row for each unmatched left-hand row (extended with nulls
         on the right), plus one row for each unmatched right-hand row
         (extended with nulls on the left).
@@ -467,8 +463,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
      <varlistentry>
       <term><literal>ON <replaceable class="parameter">join_condition</replaceable></literal></term>
       <listitem>
-       <para>
-        <replaceable class="parameter">join_condition</replaceable> is
+       <para><replaceable class="parameter">join_condition</replaceable> is
         an expression resulting in a value of type
         <type>boolean</type> (similar to a <literal>WHERE</literal>
         clause) that specifies which rows in a join are considered to
@@ -494,8 +489,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
      <varlistentry>
       <term><literal>NATURAL</literal></term>
       <listitem>
-       <para>
-        <literal>NATURAL</literal> is shorthand for a
+       <para><literal>NATURAL</literal> is shorthand for a
         <literal>USING</> list that mentions all columns in the two
         tables that have the same names.
        </para>
@@ -832,8 +826,7 @@ SELECT DISTINCT ON (location) location, time, report
     The <literal>UNION</literal> clause has this general form:
 <synopsis>
 <replaceable class="parameter">select_statement</replaceable> UNION [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable>
-</synopsis>
-    <replaceable class="parameter">select_statement</replaceable> is
+</synopsis><replaceable class="parameter">select_statement</replaceable> is
     any <command>SELECT</command> statement without an <literal>ORDER
     BY</>, <literal>LIMIT</>, <literal>FOR UPDATE</literal>, or
     <literal>FOR SHARE</literal> clause.
@@ -885,8 +878,7 @@ SELECT DISTINCT ON (location) location, time, report
     The <literal>INTERSECT</literal> clause has this general form:
 <synopsis>
 <replaceable class="parameter">select_statement</replaceable> INTERSECT [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable>
-</synopsis>
-    <replaceable class="parameter">select_statement</replaceable> is
+</synopsis><replaceable class="parameter">select_statement</replaceable> is
     any <command>SELECT</command> statement without an <literal>ORDER
     BY</>, <literal>LIMIT</>, <literal>FOR UPDATE</literal>, or
     <literal>FOR SHARE</literal> clause.
@@ -933,8 +925,7 @@ SELECT DISTINCT ON (location) location, time, report
     The <literal>EXCEPT</literal> clause has this general form:
 <synopsis>
 <replaceable class="parameter">select_statement</replaceable> EXCEPT [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable>
-</synopsis>
-    <replaceable class="parameter">select_statement</replaceable> is
+</synopsis><replaceable class="parameter">select_statement</replaceable> is
     any <command>SELECT</command> statement without an <literal>ORDER
     BY</>, <literal>LIMIT</>, <literal>FOR UPDATE</literal>, or
     <literal>FOR SHARE</literal> clause.
@@ -1096,17 +1087,19 @@ OFFSET <replaceable class="parameter">start</replaceable>
 OFFSET <replaceable class="parameter">start</replaceable> { ROW | ROWS }
 FETCH { FIRST | NEXT } [ <replaceable class="parameter">count</replaceable> ] { ROW | ROWS } ONLY
 </synopsis>
-    According to the standard, the <literal>OFFSET</literal> clause must come
-    before the <literal>FETCH</literal> clause if both are present; but
-    <productname>PostgreSQL</> is laxer and allows either order.
+    In this syntax, to write anything except a simple integer constant for
+    <replaceable class="parameter">start</> or <replaceable
+    class="parameter">count</replaceable>, you must write parentheses
+    around it.
+    If <replaceable class="parameter">count</> is
+    omitted in a <literal>FETCH</> clause, it defaults to 1.
     <literal>ROW</literal>
     and <literal>ROWS</literal> as well as <literal>FIRST</literal>
     and <literal>NEXT</literal> are noise words that don't influence
-    the effects of these clauses.  In this syntax, when using expressions
-    other than simple constants for <replaceable class="parameter">start</>
-    or <replaceable class="parameter">count</replaceable>, parentheses will be
-    necessary in most cases.  If <replaceable class="parameter">count</> is
-    omitted in <literal>FETCH</>, it defaults to 1.
+    the effects of these clauses.
+    According to the standard, the <literal>OFFSET</literal> clause must come
+    before the <literal>FETCH</literal> clause if both are present; but
+    <productname>PostgreSQL</> is laxer and allows either order.
    </para>
 
    <para>
@@ -1290,7 +1283,8 @@ ROLLBACK TO s;
 
   <caution>
    <para>
-    It is possible for a <command>SELECT</> command using <literal>ORDER
+    It is possible for a <command>SELECT</> command running at the <literal>READ
+    COMMITTED</literal> transaction isolation level and using <literal>ORDER
     BY</literal> and <literal>FOR UPDATE/SHARE</literal> to return rows out of
     order.  This is because <literal>ORDER BY</> is applied first.
     The command sorts the result, but might then block trying to obtain a lock
@@ -1311,6 +1305,13 @@ SELECT * FROM (SELECT * FROM mytable FOR UPDATE) ss ORDER BY column1;
     only if concurrent updates of the ordering columns are expected and a
     strictly sorted result is required.
    </para>
+
+   <para>
+    At the <literal>REPEATABLE READ</literal> or <literal>SERIALIZABLE</literal>
+    transaction isolation level this would cause a serialization failure (with
+    a <literal>SQLSTATE</literal> of <literal>'40001'</literal>), so there is
+    no possibility of receiving rows out of order under these isolation levels.
+   </para>
   </caution>
   </refsect2>
 
@@ -1561,8 +1562,7 @@ SELECT 2+2;
     following query is invalid:
 <programlisting>
 SELECT distributors.* WHERE distributors.name = 'Westward';
-</programlisting>
-    <productname>PostgreSQL</productname> releases prior to
+</programlisting><productname>PostgreSQL</productname> releases prior to
     8.1 would accept queries of this form, and add an implicit entry
     to the query's <literal>FROM</literal> clause for each table
     referenced by the query. This is no longer allowed.
diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml
index 02266083d4e79..48b789b580554 100644
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
@@ -125,8 +125,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
 
 <programlisting>
 SELECT * INTO films_recent FROM films WHERE date_prod &gt;= '2002-01-01';
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 3ef700b60db7b..40e1bd4e60741 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -154,8 +154,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
     <varlistentry>
      <term><literal>SCHEMA</literal></term>
      <listitem>
-      <para>
-       <literal>SET SCHEMA '<replaceable>value</>'</> is an alias for
+      <para><literal>SET SCHEMA '<replaceable>value</>'</> is an alias for
        <literal>SET search_path TO <replaceable>value</></>.  Only one
        schema can be specified using this syntax.
       </para>
@@ -165,8 +164,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
     <varlistentry>
      <term><literal>NAMES</literal></term>
      <listitem>
-      <para>
-       <literal>SET NAMES <replaceable>value</></> is an alias for
+      <para><literal>SET NAMES <replaceable>value</></> is an alias for
        <literal>SET client_encoding TO <replaceable>value</></>.
       </para>
      </listitem>
@@ -187,16 +185,14 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
        <function>setseed</function>:
 <programlisting>
 SELECT setseed(<replaceable>value</replaceable>);
-</programlisting>
-      </para>
+</programlisting></para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
      <term><literal>TIME ZONE</literal></term>
      <listitem>
-      <para>
-       <literal>SET TIME ZONE <replaceable>value</></> is an alias
+      <para><literal>SET TIME ZONE <replaceable>value</></> is an alias
        for <literal>SET timezone TO <replaceable>value</></>.  The
        syntax <literal>SET TIME ZONE</literal> allows special syntax
        for the time zone specification.  Here are examples of valid
@@ -302,8 +298,7 @@ SET TIME ZONE 'PST8PDT';
    Set the time zone for Italy:
 <screen>
 SET TIME ZONE 'Europe/Rome';
-</screen>
-  </para>
+</screen></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index f864bbf6a61c3..e28a7e1cde24c 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -143,7 +143,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
    transaction, the transaction may block when first acquiring its snapshot,
    after which it is able to run without the normal overhead of a
    <literal>SERIALIZABLE</literal> transaction and without any risk of
-   contributing to or being cancelled by a serialization failure.  This mode
+   contributing to or being canceled by a serialization failure.  This mode
    is well suited for long-running reports or backups.
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index ca26bb2687c9c..4a6a3fc7fe9c2 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -109,8 +109,7 @@ SHOW ALL
          </para>
         </listitem>
        </varlistentry>
-      </variablelist>
-     </para>
+      </variablelist></para>
     </listitem>
    </varlistentry>
 
@@ -177,8 +176,7 @@ SHOW ALL;
  xmloption               | content | Sets whether XML data in implicit parsing ...
  zero_damaged_pages      | off     | Continues processing past damaged page headers.
 (196 rows)
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index 9f12ca4b3b3d2..2fe47ca81626d 100644
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -206,8 +206,7 @@ TRUNCATE bigtable, fattable RESTART IDENTITY;
 
 <programlisting>
 TRUNCATE othertable CASCADE;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml
index ad3b9a12afab2..c6436829d6089 100644
--- a/doc/src/sgml/ref/unlisten.sgml
+++ b/doc/src/sgml/ref/unlisten.sgml
@@ -111,8 +111,7 @@ Asynchronous notification "virtual" received from server process with PID 8448.
 UNLISTEN virtual;
 NOTIFY virtual;
 -- no NOTIFY event is received
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 5968db1f6fe74..ba5af8e884bb1 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -348,8 +348,7 @@ COMMIT;
    <literal>c_films</> is currently positioned:
 <programlisting>
 UPDATE films SET kind = 'Dramatic' WHERE CURRENT OF c_films;
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index 87283bca50d52..f05babc76a5b9 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -254,8 +254,7 @@ CPU 0.07s/0.39u sec elapsed 1.56 sec.
 INFO:  analyzing "public.onek"
 INFO:  "onek": 36 pages, 1000 rows sampled, 1000 estimated total rows
 VACUUM
-</programlisting>
-  </para>
+</programlisting></para>
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index e9022fe9479d4..4effa4188a610 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -369,8 +369,7 @@ PostgreSQL documentation
     <literal>bar</literal> of the table for the optimizer:
 <screen>
 <prompt>$ </prompt><userinput>vacuumdb --analyze --verbose --table 'foo(bar)' xyzzy</userinput>
-</screen>
-   </para>
+</screen></para>
 
  </refsect1>
 
diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml
index 552c80cf06a0c..1f0e9a8ba11d0 100644
--- a/doc/src/sgml/ref/values.sgml
+++ b/doc/src/sgml/ref/values.sgml
@@ -214,8 +214,7 @@ UPDATE employees SET salary = salary * v.increase
 <programlisting>
 SELECT * FROM machines
 WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.43'));
-</programlisting>
-  </para>
+</programlisting></para>
 
   <tip>
    <para>
@@ -230,8 +229,7 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.
  <refsect1>
   <title>Compatibility</title>
 
-  <para>
-   <command>VALUES</command> conforms to the SQL standard.
+  <para><command>VALUES</command> conforms to the SQL standard.
    <literal>LIMIT</literal> and <literal>OFFSET</literal> are
    <productname>PostgreSQL</productname> extensions; see also
    under <xref linkend="sql-select">.
diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml
index ee8184b16ca7d..f13957b0264cf 100644
--- a/doc/src/sgml/release-7.4.sgml
+++ b/doc/src/sgml/release-7.4.sgml
@@ -465,7 +465,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
diff --git a/doc/src/sgml/release-8.0.sgml b/doc/src/sgml/release-8.0.sgml
index 469a76d8935f6..5d6d60e607f11 100644
--- a/doc/src/sgml/release-8.0.sgml
+++ b/doc/src/sgml/release-8.0.sgml
@@ -609,7 +609,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
diff --git a/doc/src/sgml/release-8.1.sgml b/doc/src/sgml/release-8.1.sgml
index 4e1a0c5dd0bc5..5f74abf45e725 100644
--- a/doc/src/sgml/release-8.1.sgml
+++ b/doc/src/sgml/release-8.1.sgml
@@ -849,7 +849,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
@@ -4203,7 +4203,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
       <para>
        While the <varname>statement_timeout</> configuration
        parameter allows a query taking more than a certain amount of
-       time to be cancelled, the <command>NOWAIT</> option allows a
+       time to be canceled, the <command>NOWAIT</> option allows a
        query to be canceled as soon as a <command>SELECT ... FOR
        UPDATE/SHARE</> command cannot immediately acquire a row lock.
       </para>
diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml
index 0a9ee5031afb5..a75ed44981c92 100644
--- a/doc/src/sgml/release-8.2.sgml
+++ b/doc/src/sgml/release-8.2.sgml
@@ -1,6 +1,541 @@
 <!-- doc/src/sgml/release-8.2.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-8-2-23">
+  <title>Release 8.2.23</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-12-05</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 8.2.22.
+   For information about new features in the 8.2 major release, see
+   <xref linkend="release-8-2">.
+  </para>
+
+  <para>
+   This is expected to be the last <productname>PostgreSQL</> release
+   in the 8.2.X series.  Users are encouraged to update to a newer
+   release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 8.2.23</title>
+
+   <para>
+    A dump/restore is not required for those running 8.2.X.
+   </para>
+
+   <para>
+    However, a longstanding error was discovered in the definition of the
+    <literal>information_schema.referential_constraints</> view.  If you
+    rely on correct results from that view, you should replace its
+    definition as explained in the first changelog item below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 8.2.14,
+    see the release notes for 8.2.14.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in <literal>information_schema.referential_constraints</> view
+      (Tom Lane)
+     </para>
+
+     <para>
+      This view was being insufficiently careful about matching the
+      foreign-key constraint to the depended-on primary or unique key
+      constraint.  That could result in failure to show a foreign key
+      constraint at all, or showing it multiple times, or claiming that it
+      depends on a different constraint than the one it really does.
+     </para>
+
+     <para>
+      Since the view definition is installed by <application>initdb</>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can (as a superuser) drop the
+      <literal>information_schema</> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</> if you're uncertain where
+      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      to be fixed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
+      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      attempts to copy its data verbatim to another table could produce
+      corrupt results in certain corner cases.
+      The problem can only manifest in this precise form in 8.4 and later,
+      but we patched earlier versions as well in case there are other code
+      paths that could trigger the same bug.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition during toast table access from stale syscache entries
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was transient errors like <quote>missing chunk
+      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      toast table would always belong to a system catalog.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve locale support in <type>money</> type's input and output
+      (Tom Lane)
+     </para>
+
+     <para>
+      Aside from not supporting all standard
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      formatting options, the input and output functions were inconsistent,
+      meaning there were locales in which dumped <type>money</> values could
+      not be re-read.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't let <link
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
+      affect <literal>CASE foo WHEN NULL ...</> constructs
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <varname>transform_null_equals</> is only supposed to affect
+      <literal>foo = NULL</> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change foreign-key trigger creation order to better support
+      self-referential foreign keys (Tom Lane)
+     </para>
+
+     <para>
+      For a cascading foreign key that references its own table, a row update
+      will fire both the <literal>ON UPDATE</> trigger and the
+      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
+      trigger must execute first, else the <literal>CHECK</> will check a
+      non-final state of the row and possibly throw an inappropriate error.
+      However, the firing order of these triggers is determined by their
+      names, which generally sort in creation order since the triggers have
+      auto-generated names following the convention
+      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      modifying that convention, which we will do in 9.2, but it seems risky
+      to change it in existing releases.  So this patch just changes the
+      creation order of the triggers.  Users encountering this type of error
+      should drop and re-create the foreign key constraint to get its
+      triggers into the right order.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve blank lines within commands in <application>psql</>'s command
+      history (Robert Haas)
+     </para>
+
+     <para>
+      The former behavior could cause problems if an empty line was removed
+      from within a string literal, for example.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      not necessarily the operating system's main copy
+      (David Wheeler and Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure VPATH builds properly install all server header files
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Shorten file names reported in verbose error messages (Peter Eisentraut)
+     </para>
+
+     <para>
+      Regular builds have always reported just the name of the C file
+      containing the error message call, but VPATH builds formerly
+      reported an absolute path name.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix interpretation of Windows timezone names for Central America
+      (Tom Lane)
+     </para>
+
+     <para>
+      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
+      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Central America.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011n
+      for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
+      also historical corrections for Alaska and British East Africa.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-8-2-22">
+  <title>Release 8.2.22</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-09-26</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 8.2.21.
+   For information about new features in the 8.2 major release, see
+   <xref linkend="release-8-2">.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</> community will stop releasing updates
+   for the 8.2.X release series in December 2011.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 8.2.22</title>
+
+   <para>
+    A dump/restore is not required for those running 8.2.X.
+    However, if you are upgrading from a version earlier than 8.2.14,
+    see the release notes for 8.2.14.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix multiple bugs in GiST index page split processing (Heikki
+      Linnakangas)
+     </para>
+
+     <para>
+      The probability of occurrence was low, but these could lead to index
+      corruption.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      (Noah Misch)
+     </para>
+
+     <para>
+      This fixes a very-low-probability server crash scenario.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition in relcache init file invalidation (Tom Lane)
+     </para>
+
+     <para>
+      There was a window wherein a new backend process could read a stale init
+      file but miss the inval messages that would tell it the data is stale.
+      The result would be bizarre failures in catalog accesses, typically
+      <quote>could not read block 0 in file ...</> later during startup.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak at end of a GiST index scan (Tom Lane)
+     </para>
+
+     <para>
+      Commands that perform many separate GiST index scans, such as
+      verification of a new GiST-based exclusion constraint on a table
+      already containing many rows, could transiently require large amounts of
+      memory due to this leak.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problem when constructing a large, lossy bitmap
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array- and path-creating functions to ensure padding bytes are
+      zeroes (Tom Lane)
+     </para>
+
+     <para>
+      This avoids some situations where the planner will think that
+      semantically-equal constants are not equal, resulting in poor
+      optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Work around gcc 4.6.0 bug that breaks WAL replay (Tom Lane)
+     </para>
+
+     <para>
+      This could lead to loss of committed transactions after a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+     </para>
+
+     <para>
+      This operation doesn't work as expected and can lead to failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Defend against integer overflow when computing size of a hash table (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix portability bugs in use of credentials control messages for
+      <quote>peer</> authentication (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+     </para>
+
+     <para>
+      This led to failure to use all bits of the provided seed.  This function
+      is not used on most platforms (only those without <function>srandom</>),
+      and the potential security exposure from a less-random-than-expected
+      seed seems minimal in any case.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid integer overflow when the sum of <literal>LIMIT</> and
+      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add overflow checks to <type>int4</> and <type>int8</> versions of
+      <function>generate_series()</> (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+     </para>
+
+     <para>
+      In a format with <literal>FM</> and no digit positions
+      after the decimal point, zeroes to the left of the decimal point could
+      be removed incorrectly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      2^63 (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s counting of script file line numbers during
+      <literal>COPY</> from a different file (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_restore</>'s direct-to-database mode for
+      <varname>standard_conforming_strings</> (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_restore</> could emit incorrect commands when restoring
+      directly to a database server from an archive file that had been made
+      with <varname>standard_conforming_strings</> set to <literal>on</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      LDAP service lookup code (Albe Laurenz)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, avoid failures when using nonblocking I/O
+      and an SSL connection (Martin Pihlak, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve libpq's handling of failures during connection startup
+      (Tom Lane)
+     </para>
+
+     <para>
+      In particular, the response to a server report of <function>fork()</>
+      failure during SSL connection startup is now saner.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      precision (Akira Kurosawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Apply upstream fix for blowfish signed-character bug (CVE-2011-2483)
+      (Tom Lane)
+     </para>
+
+     <para>
+      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      wrong results on platforms where char is signed (which is most),
+      leading to encrypted passwords being weaker than they should be.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pgstatindex()</> to give consistent results for empty
+      indexes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow building with perl 5.14 (Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update configure script's method for probing existence of system
+      functions (Tom Lane)
+     </para>
+
+     <para>
+      The version of autoconf we used in 8.3 and 8.2 could be fooled by
+      compilers that perform link-time optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix assorted issues with build and install file paths containing spaces
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011i
+      for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-8-2-21">
   <title>Release 8.2.21</title>
 
@@ -1334,7 +1869,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
diff --git a/doc/src/sgml/release-8.3.sgml b/doc/src/sgml/release-8.3.sgml
index bccc141a5491f..ec1880d20fa3b 100644
--- a/doc/src/sgml/release-8.3.sgml
+++ b/doc/src/sgml/release-8.3.sgml
@@ -1,6 +1,644 @@
 <!-- doc/src/sgml/release-8.3.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-8-3-17">
+  <title>Release 8.3.17</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-12-05</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 8.3.16.
+   For information about new features in the 8.3 major release, see
+   <xref linkend="release-8-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 8.3.17</title>
+
+   <para>
+    A dump/restore is not required for those running 8.3.X.
+   </para>
+
+   <para>
+    However, a longstanding error was discovered in the definition of the
+    <literal>information_schema.referential_constraints</> view.  If you
+    rely on correct results from that view, you should replace its
+    definition as explained in the first changelog item below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 8.3.8,
+    see the release notes for 8.3.8.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in <literal>information_schema.referential_constraints</> view
+      (Tom Lane)
+     </para>
+
+     <para>
+      This view was being insufficiently careful about matching the
+      foreign-key constraint to the depended-on primary or unique key
+      constraint.  That could result in failure to show a foreign key
+      constraint at all, or showing it multiple times, or claiming that it
+      depends on a different constraint than the one it really does.
+     </para>
+
+     <para>
+      Since the view definition is installed by <application>initdb</>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can (as a superuser) drop the
+      <literal>information_schema</> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</> if you're uncertain where
+      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      to be fixed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
+      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      attempts to copy its data verbatim to another table could produce
+      corrupt results in certain corner cases.
+      The problem can only manifest in this precise form in 8.4 and later,
+      but we patched earlier versions as well in case there are other code
+      paths that could trigger the same bug.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition during toast table access from stale syscache entries
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was transient errors like <quote>missing chunk
+      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      toast table would always belong to a system catalog.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      not (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This change affects no core code, but might prevent crashes in add-on
+      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      datum as per usual convention.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve locale support in <type>money</> type's input and output
+      (Tom Lane)
+     </para>
+
+     <para>
+      Aside from not supporting all standard
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      formatting options, the input and output functions were inconsistent,
+      meaning there were locales in which dumped <type>money</> values could
+      not be re-read.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't let <link
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
+      affect <literal>CASE foo WHEN NULL ...</> constructs
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <varname>transform_null_equals</> is only supposed to affect
+      <literal>foo = NULL</> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change foreign-key trigger creation order to better support
+      self-referential foreign keys (Tom Lane)
+     </para>
+
+     <para>
+      For a cascading foreign key that references its own table, a row update
+      will fire both the <literal>ON UPDATE</> trigger and the
+      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
+      trigger must execute first, else the <literal>CHECK</> will check a
+      non-final state of the row and possibly throw an inappropriate error.
+      However, the firing order of these triggers is determined by their
+      names, which generally sort in creation order since the triggers have
+      auto-generated names following the convention
+      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      modifying that convention, which we will do in 9.2, but it seems risky
+      to change it in existing releases.  So this patch just changes the
+      creation order of the triggers.  Users encountering this type of error
+      should drop and re-create the foreign key constraint to get its
+      triggers into the right order.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid floating-point underflow while tracking buffer allocation rate
+      (Greg Matthews)
+     </para>
+
+     <para>
+      While harmless in itself, on certain platforms this would result in
+      annoying kernel log messages.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve blank lines within commands in <application>psql</>'s command
+      history (Robert Haas)
+     </para>
+
+     <para>
+      The former behavior could cause problems if an empty line was removed
+      from within a string literal, for example.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts between
+      auto-generated types, such as table rowtypes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      not necessarily the operating system's main copy
+      (David Wheeler and Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect coding in <filename>contrib/dict_int</> and
+      <filename>contrib/dict_xsyn</> (Tom Lane)
+     </para>
+
+     <para>
+      Some functions incorrectly assumed that memory returned by
+      <function>palloc()</> is guaranteed zeroed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure VPATH builds properly install all server header files
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Shorten file names reported in verbose error messages (Peter Eisentraut)
+     </para>
+
+     <para>
+      Regular builds have always reported just the name of the C file
+      containing the error message call, but VPATH builds formerly
+      reported an absolute path name.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix interpretation of Windows timezone names for Central America
+      (Tom Lane)
+     </para>
+
+     <para>
+      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
+      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Central America.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011n
+      for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
+      also historical corrections for Alaska and British East Africa.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-8-3-16">
+  <title>Release 8.3.16</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-09-26</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 8.3.15.
+   For information about new features in the 8.3 major release, see
+   <xref linkend="release-8-3">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 8.3.16</title>
+
+   <para>
+    A dump/restore is not required for those running 8.3.X.
+    However, if you are upgrading from a version earlier than 8.3.8,
+    see the release notes for 8.3.8.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in indexing of in-doubt HOT-updated tuples (Tom Lane)
+     </para>
+
+     <para>
+      These bugs could result in index corruption after reindexing a system
+      catalog.  They are not believed to affect user indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix multiple bugs in GiST index page split processing (Heikki
+      Linnakangas)
+     </para>
+
+     <para>
+      The probability of occurrence was low, but these could lead to index
+      corruption.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible buffer overrun in <function>tsvector_concat()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      The function could underestimate the amount of memory needed for its
+      result, leading to server crashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in <function>xml_recv</> when processing a
+      <quote>standalone</> parameter (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      and in SJIS-2004 encoding conversion (Noah Misch)
+     </para>
+
+     <para>
+      This fixes some very-low-probability server crash scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition in relcache init file invalidation (Tom Lane)
+     </para>
+
+     <para>
+      There was a window wherein a new backend process could read a stale init
+      file but miss the inval messages that would tell it the data is stale.
+      The result would be bizarre failures in catalog accesses, typically
+      <quote>could not read block 0 in file ...</> later during startup.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak at end of a GiST index scan (Tom Lane)
+     </para>
+
+     <para>
+      Commands that perform many separate GiST index scans, such as
+      verification of a new GiST-based exclusion constraint on a table
+      already containing many rows, could transiently require large amounts of
+      memory due to this leak.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problem when constructing a large, lossy bitmap
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array- and path-creating functions to ensure padding bytes are
+      zeroes (Tom Lane)
+     </para>
+
+     <para>
+      This avoids some situations where the planner will think that
+      semantically-equal constants are not equal, resulting in poor
+      optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Work around gcc 4.6.0 bug that breaks WAL replay (Tom Lane)
+     </para>
+
+     <para>
+      This could lead to loss of committed transactions after a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+     </para>
+
+     <para>
+      This operation doesn't work as expected and can lead to failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Defend against integer overflow when computing size of a hash table (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where <command>CLUSTER</> might attempt to access
+      already-removed TOAST data (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix portability bugs in use of credentials control messages for
+      <quote>peer</> authentication (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix SSPI login when multiple roundtrips are required (Ahmed Shinwari,
+      Magnus Hagander)
+     </para>
+
+     <para>
+      The typical symptom of this problem was <quote>The function requested is
+      not supported</> errors during SSPI login.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+     </para>
+
+     <para>
+      This led to failure to use all bits of the provided seed.  This function
+      is not used on most platforms (only those without <function>srandom</>),
+      and the potential security exposure from a less-random-than-expected
+      seed seems minimal in any case.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid integer overflow when the sum of <literal>LIMIT</> and
+      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add overflow checks to <type>int4</> and <type>int8</> versions of
+      <function>generate_series()</> (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+     </para>
+
+     <para>
+      In a format with <literal>FM</> and no digit positions
+      after the decimal point, zeroes to the left of the decimal point could
+      be removed incorrectly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      2^63 (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_ctl</>, support silent mode for service registrations
+      on Windows (MauMau)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s counting of script file line numbers during
+      <literal>COPY</> from a different file (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_restore</>'s direct-to-database mode for
+      <varname>standard_conforming_strings</> (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_restore</> could emit incorrect commands when restoring
+      directly to a database server from an archive file that had been made
+      with <varname>standard_conforming_strings</> set to <literal>on</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      LDAP service lookup code (Albe Laurenz)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, avoid failures when using nonblocking I/O
+      and an SSL connection (Martin Pihlak, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve libpq's handling of failures during connection startup
+      (Tom Lane)
+     </para>
+
+     <para>
+      In particular, the response to a server report of <function>fork()</>
+      failure during SSL connection startup is now saner.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <application>libpq</>'s error reporting for SSL failures (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      precision (Akira Kurosawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpglib</>, be sure <literal>LC_NUMERIC</> setting is
+      restored after an error (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Apply upstream fix for blowfish signed-character bug (CVE-2011-2483)
+      (Tom Lane)
+     </para>
+
+     <para>
+      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      wrong results on platforms where char is signed (which is most),
+      leading to encrypted passwords being weaker than they should be.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pgstatindex()</> to give consistent results for empty
+      indexes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow building with perl 5.14 (Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update configure script's method for probing existence of system
+      functions (Tom Lane)
+     </para>
+
+     <para>
+      The version of autoconf we used in 8.3 and 8.2 could be fooled by
+      compilers that perform link-time optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix assorted issues with build and install file paths containing spaces
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011i
+      for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-8-3-15">
   <title>Release 8.3.15</title>
 
@@ -1566,7 +2204,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml
index e4fddd44e6e91..27e1e6c7b1e87 100644
--- a/doc/src/sgml/release-8.4.sgml
+++ b/doc/src/sgml/release-8.4.sgml
@@ -1,6 +1,846 @@
 <!-- doc/src/sgml/release-8.4.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-8-4-10">
+  <title>Release 8.4.10</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-12-05</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 8.4.9.
+   For information about new features in the 8.4 major release, see
+   <xref linkend="release-8-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 8.4.10</title>
+
+   <para>
+    A dump/restore is not required for those running 8.4.X.
+   </para>
+
+   <para>
+    However, a longstanding error was discovered in the definition of the
+    <literal>information_schema.referential_constraints</> view.  If you
+    rely on correct results from that view, you should replace its
+    definition as explained in the first changelog item below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 8.4.8,
+    see the release notes for 8.4.8.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in <literal>information_schema.referential_constraints</> view
+      (Tom Lane)
+     </para>
+
+     <para>
+      This view was being insufficiently careful about matching the
+      foreign-key constraint to the depended-on primary or unique key
+      constraint.  That could result in failure to show a foreign key
+      constraint at all, or showing it multiple times, or claiming that it
+      depends on a different constraint than the one it really does.
+     </para>
+
+     <para>
+      Since the view definition is installed by <application>initdb</>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can (as a superuser) drop the
+      <literal>information_schema</> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</> if you're uncertain where
+      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      to be fixed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect replay of WAL records for GIN index updates
+      (Tom Lane)
+     </para>
+
+     <para>
+      This could result in transiently failing to find index entries after
+      a crash, or on a hot-standby server.  The problem would be repaired
+      by the next <command>VACUUM</> of the index, however.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
+      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      attempts to copy its data verbatim to another table could produce
+      corrupt results in certain corner cases.
+      The problem can only manifest in this precise form in 8.4 and later,
+      but we patched earlier versions as well in case there are other code
+      paths that could trigger the same bug.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition during toast table access from stale syscache entries
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was transient errors like <quote>missing chunk
+      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      toast table would always belong to a system catalog.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Track dependencies of functions on items used in parameter default
+      expressions (Tom Lane)
+     </para>
+
+     <para>
+      Previously, a referenced object could be dropped without having dropped
+      or modified the function, leading to misbehavior when the function was
+      used.  Note that merely installing this update will not fix the missing
+      dependency entries; to do that, you'd need to <command>CREATE OR
+      REPLACE</> each such function afterwards.  If you have functions whose
+      defaults depend on non-built-in objects, doing so is recommended.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow inlining of set-returning SQL functions with multiple OUT
+      parameters (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      not (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This change affects no core code, but might prevent crashes in add-on
+      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      datum as per usual convention.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve locale support in <type>money</> type's input and output
+      (Tom Lane)
+     </para>
+
+     <para>
+      Aside from not supporting all standard
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      formatting options, the input and output functions were inconsistent,
+      meaning there were locales in which dumped <type>money</> values could
+      not be re-read.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't let <link
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
+      affect <literal>CASE foo WHEN NULL ...</> constructs
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <varname>transform_null_equals</> is only supposed to affect
+      <literal>foo = NULL</> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change foreign-key trigger creation order to better support
+      self-referential foreign keys (Tom Lane)
+     </para>
+
+     <para>
+      For a cascading foreign key that references its own table, a row update
+      will fire both the <literal>ON UPDATE</> trigger and the
+      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
+      trigger must execute first, else the <literal>CHECK</> will check a
+      non-final state of the row and possibly throw an inappropriate error.
+      However, the firing order of these triggers is determined by their
+      names, which generally sort in creation order since the triggers have
+      auto-generated names following the convention
+      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      modifying that convention, which we will do in 9.2, but it seems risky
+      to change it in existing releases.  So this patch just changes the
+      creation order of the triggers.  Users encountering this type of error
+      should drop and re-create the foreign key constraint to get its
+      triggers into the right order.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid floating-point underflow while tracking buffer allocation rate
+      (Greg Matthews)
+     </para>
+
+     <para>
+      While harmless in itself, on certain platforms this would result in
+      annoying kernel log messages.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve configuration file name and line number values when starting
+      child processes under Windows (Tom Lane)
+     </para>
+
+     <para>
+      Formerly, these would not be displayed correctly in the
+      <structname>pg_settings</> view.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve blank lines within commands in <application>psql</>'s command
+      history (Robert Haas)
+     </para>
+
+     <para>
+      The former behavior could cause problems if an empty line was removed
+      from within a string literal, for example.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts between
+      auto-generated types, such as table rowtypes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      not necessarily the operating system's main copy
+      (David Wheeler and Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect coding in <filename>contrib/dict_int</> and
+      <filename>contrib/dict_xsyn</> (Tom Lane)
+     </para>
+
+     <para>
+      Some functions incorrectly assumed that memory returned by
+      <function>palloc()</> is guaranteed zeroed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure VPATH builds properly install all server header files
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Shorten file names reported in verbose error messages (Peter Eisentraut)
+     </para>
+
+     <para>
+      Regular builds have always reported just the name of the C file
+      containing the error message call, but VPATH builds formerly
+      reported an absolute path name.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix interpretation of Windows timezone names for Central America
+      (Tom Lane)
+     </para>
+
+     <para>
+      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
+      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Central America.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011n
+      for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
+      also historical corrections for Alaska and British East Africa.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-8-4-9">
+  <title>Release 8.4.9</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-09-26</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 8.4.8.
+   For information about new features in the 8.4 major release, see
+   <xref linkend="release-8-4">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 8.4.9</title>
+
+   <para>
+    A dump/restore is not required for those running 8.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 8.4.8,
+    see the release notes for 8.4.8.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in indexing of in-doubt HOT-updated tuples (Tom Lane)
+     </para>
+
+     <para>
+      These bugs could result in index corruption after reindexing a system
+      catalog.  They are not believed to affect user indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix multiple bugs in GiST index page split processing (Heikki
+      Linnakangas)
+     </para>
+
+     <para>
+      The probability of occurrence was low, but these could lead to index
+      corruption.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible buffer overrun in <function>tsvector_concat()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      The function could underestimate the amount of memory needed for its
+      result, leading to server crashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in <function>xml_recv</> when processing a
+      <quote>standalone</> parameter (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>pg_options_to_table</> return NULL for an option with no
+      value (Tom Lane)
+     </para>
+
+     <para>
+      Previously such cases would result in a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      and in SJIS-2004 encoding conversion (Noah Misch)
+     </para>
+
+     <para>
+      This fixes some very-low-probability server crash scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent intermittent hang in interactions of startup process with
+      bgwriter process (Simon Riggs)
+     </para>
+
+     <para>
+      This affected recovery in non-hot-standby cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition in relcache init file invalidation (Tom Lane)
+     </para>
+
+     <para>
+      There was a window wherein a new backend process could read a stale init
+      file but miss the inval messages that would tell it the data is stale.
+      The result would be bizarre failures in catalog accesses, typically
+      <quote>could not read block 0 in file ...</> later during startup.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak at end of a GiST index scan (Tom Lane)
+     </para>
+
+     <para>
+      Commands that perform many separate GiST index scans, such as
+      verification of a new GiST-based exclusion constraint on a table
+      already containing many rows, could transiently require large amounts of
+      memory due to this leak.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect memory accounting (leading to possible memory bloat) in
+      tuplestores supporting holdable cursors and plpgsql's <literal>RETURN
+      NEXT</> command (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problem when constructing a large, lossy bitmap
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix join selectivity estimation for unique columns (Tom Lane)
+     </para>
+
+     <para>
+      This fixes an erroneous planner heuristic that could lead to poor
+      estimates of the result size of a join.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix nested PlaceHolderVar expressions that appear only in sub-select
+      target lists (Tom Lane)
+     </para>
+
+     <para>
+      This mistake could result in outputs of an outer join incorrectly
+      appearing as NULL.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow nested <literal>EXISTS</> queries to be optimized properly (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array- and path-creating functions to ensure padding bytes are
+      zeroes (Tom Lane)
+     </para>
+
+     <para>
+      This avoids some situations where the planner will think that
+      semantically-equal constants are not equal, resulting in poor
+      optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>EXPLAIN</> to handle gating Result nodes within
+      inner-indexscan subplans (Tom Lane)
+     </para>
+
+     <para>
+      The usual symptom of this oversight was <quote>bogus varno</> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Work around gcc 4.6.0 bug that breaks WAL replay (Tom Lane)
+     </para>
+
+     <para>
+      This could lead to loss of committed transactions after a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+     </para>
+
+     <para>
+      This operation doesn't work as expected and can lead to failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>VACUUM</> so that it always updates
+      <literal>pg_class</>.<literal>reltuples</>/<literal>relpages</> (Tom
+      Lane)
+     </para>
+
+     <para>
+      This fixes some scenarios where autovacuum could make increasingly poor
+      decisions about when to vacuum tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Defend against integer overflow when computing size of a hash table (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where <command>CLUSTER</> might attempt to access
+      already-removed TOAST data (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix portability bugs in use of credentials control messages for
+      <quote>peer</> authentication (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix SSPI login when multiple roundtrips are required (Ahmed Shinwari,
+      Magnus Hagander)
+     </para>
+
+     <para>
+      The typical symptom of this problem was <quote>The function requested is
+      not supported</> errors during SSPI login.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Throw an error if <filename>pg_hba.conf</> contains <literal>hostssl</>
+      but SSL is disabled (Tom Lane)
+     </para>
+
+     <para>
+      This was concluded to be more user-friendly than the previous behavior
+      of silently ignoring such lines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+     </para>
+
+     <para>
+      This led to failure to use all bits of the provided seed.  This function
+      is not used on most platforms (only those without <function>srandom</>),
+      and the potential security exposure from a less-random-than-expected
+      seed seems minimal in any case.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid integer overflow when the sum of <literal>LIMIT</> and
+      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add overflow checks to <type>int4</> and <type>int8</> versions of
+      <function>generate_series()</> (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+     </para>
+
+     <para>
+      In a format with <literal>FM</> and no digit positions
+      after the decimal point, zeroes to the left of the decimal point could
+      be removed incorrectly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      2^63 (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Weaken plpgsql's check for typmod matching in record values (Tom Lane)
+     </para>
+
+     <para>
+      An overly enthusiastic check could lead to discarding length modifiers
+      that should have been kept.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly handle quotes in locale names during <application>initdb</>
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The case can arise with some Windows locales, such as <quote>People's
+      Republic of China</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to preserve toast tables' relfrozenxids
+      during an upgrade from 8.3 (Bruce Momjian)
+     </para>
+
+     <para>
+      Failure to do this could lead to <filename>pg_clog</> files being
+      removed too soon after the upgrade.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_ctl</>, support silent mode for service registrations
+      on Windows (MauMau)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s counting of script file line numbers during
+      <literal>COPY</> from a different file (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_restore</>'s direct-to-database mode for
+      <varname>standard_conforming_strings</> (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_restore</> could emit incorrect commands when restoring
+      directly to a database server from an archive file that had been made
+      with <varname>standard_conforming_strings</> set to <literal>on</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Be more user-friendly about unsupported cases for parallel
+      <application>pg_restore</> (Tom Lane)
+     </para>
+
+     <para>
+      This change ensures that such cases are detected and reported before
+      any restore actions have been taken.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      LDAP service lookup code (Albe Laurenz)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, avoid failures when using nonblocking I/O
+      and an SSL connection (Martin Pihlak, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve libpq's handling of failures during connection startup
+      (Tom Lane)
+     </para>
+
+     <para>
+      In particular, the response to a server report of <function>fork()</>
+      failure during SSL connection startup is now saner.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <application>libpq</>'s error reporting for SSL failures (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>PQsetvalue()</> to avoid possible crash when adding a new
+      tuple to a <structname>PGresult</> originally obtained from a server
+      query (Andrew Chernow)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      precision (Akira Kurosawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpglib</>, be sure <literal>LC_NUMERIC</> setting is
+      restored after an error (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Apply upstream fix for blowfish signed-character bug (CVE-2011-2483)
+      (Tom Lane)
+     </para>
+
+     <para>
+      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      wrong results on platforms where char is signed (which is most),
+      leading to encrypted passwords being weaker than they should be.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pgstatindex()</> to give consistent results for empty
+      indexes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow building with perl 5.14 (Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update configure script's method for probing existence of system
+      functions (Tom Lane)
+     </para>
+
+     <para>
+      The version of autoconf we used in 8.3 and 8.2 could be fooled by
+      compilers that perform link-time optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix assorted issues with build and install file paths containing spaces
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011i
+      for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-8-4-8">
   <title>Release 8.4.8</title>
 
@@ -2062,7 +2902,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml
index 4b232f065f667..4f8ec5116a438 100644
--- a/doc/src/sgml/release-9.0.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -1,6 +1,1040 @@
 <!-- doc/src/sgml/release-9.0.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-0-6">
+  <title>Release 9.0.6</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-12-05</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.0.5.
+   For information about new features in the 9.0 major release, see
+   <xref linkend="release-9-0">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.0.6</title>
+
+   <para>
+    A dump/restore is not required for those running 9.0.X.
+   </para>
+
+   <para>
+    However, a longstanding error was discovered in the definition of the
+    <literal>information_schema.referential_constraints</> view.  If you
+    rely on correct results from that view, you should replace its
+    definition as explained in the first changelog item below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.0.4,
+    see the release notes for 9.0.4.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in <literal>information_schema.referential_constraints</> view
+      (Tom Lane)
+     </para>
+
+     <para>
+      This view was being insufficiently careful about matching the
+      foreign-key constraint to the depended-on primary or unique key
+      constraint.  That could result in failure to show a foreign key
+      constraint at all, or showing it multiple times, or claiming that it
+      depends on a different constraint than the one it really does.
+     </para>
+
+     <para>
+      Since the view definition is installed by <application>initdb</>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can (as a superuser) drop the
+      <literal>information_schema</> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</> if you're uncertain where
+      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      to be fixed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible crash during <command>UPDATE</> or <command>DELETE</> that
+      joins to the output of a scalar-returning function (Tom Lane)
+     </para>
+
+     <para>
+      A crash could only occur if the target row had been concurrently
+      updated, so this problem surfaced only intermittently.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect replay of WAL records for GIN index updates
+      (Tom Lane)
+     </para>
+
+     <para>
+      This could result in transiently failing to find index entries after
+      a crash, or on a hot-standby server.  The problem would be repaired
+      by the next <command>VACUUM</> of the index, however.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
+      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      attempts to copy its data verbatim to another table could produce
+      corrupt results in certain corner cases.
+      The problem can only manifest in this precise form in 8.4 and later,
+      but we patched earlier versions as well in case there are other code
+      paths that could trigger the same bug.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failures during hot standby startup (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Start hot standby faster when initial snapshot is incomplete
+      (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition during toast table access from stale syscache entries
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was transient errors like <quote>missing chunk
+      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      toast table would always belong to a system catalog.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Track dependencies of functions on items used in parameter default
+      expressions (Tom Lane)
+     </para>
+
+     <para>
+      Previously, a referenced object could be dropped without having dropped
+      or modified the function, leading to misbehavior when the function was
+      used.  Note that merely installing this update will not fix the missing
+      dependency entries; to do that, you'd need to <command>CREATE OR
+      REPLACE</> each such function afterwards.  If you have functions whose
+      defaults depend on non-built-in objects, doing so is recommended.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow inlining of set-returning SQL functions with multiple OUT
+      parameters (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't trust deferred-unique indexes for join removal (Tom Lane and Marti
+      Raudsepp)
+     </para>
+
+     <para>
+      A deferred uniqueness constraint might not hold intra-transaction,
+      so assuming that it does could give incorrect query results.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      not (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This change affects no core code, but might prevent crashes in add-on
+      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      datum as per usual convention.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve locale support in <type>money</> type's input and output
+      (Tom Lane)
+     </para>
+
+     <para>
+      Aside from not supporting all standard
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      formatting options, the input and output functions were inconsistent,
+      meaning there were locales in which dumped <type>money</> values could
+      not be re-read.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't let <link
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
+      affect <literal>CASE foo WHEN NULL ...</> constructs
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <varname>transform_null_equals</> is only supposed to affect
+      <literal>foo = NULL</> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change foreign-key trigger creation order to better support
+      self-referential foreign keys (Tom Lane)
+     </para>
+
+     <para>
+      For a cascading foreign key that references its own table, a row update
+      will fire both the <literal>ON UPDATE</> trigger and the
+      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
+      trigger must execute first, else the <literal>CHECK</> will check a
+      non-final state of the row and possibly throw an inappropriate error.
+      However, the firing order of these triggers is determined by their
+      names, which generally sort in creation order since the triggers have
+      auto-generated names following the convention
+      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      modifying that convention, which we will do in 9.2, but it seems risky
+      to change it in existing releases.  So this patch just changes the
+      creation order of the triggers.  Users encountering this type of error
+      should drop and re-create the foreign key constraint to get its
+      triggers into the right order.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid floating-point underflow while tracking buffer allocation rate
+      (Greg Matthews)
+     </para>
+
+     <para>
+      While harmless in itself, on certain platforms this would result in
+      annoying kernel log messages.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve configuration file name and line number values when starting
+      child processes under Windows (Tom Lane)
+     </para>
+
+     <para>
+      Formerly, these would not be displayed correctly in the
+      <structname>pg_settings</> view.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect field alignment in <application>ecpg</>'s SQLDA area
+      (Zoltan Boszormenyi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve blank lines within commands in <application>psql</>'s command
+      history (Robert Haas)
+     </para>
+
+     <para>
+      The former behavior could cause problems if an empty line was removed
+      from within a string literal, for example.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts between
+      auto-generated types, such as table rowtypes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Assorted fixes for <application>pg_upgrade</> (Bruce Momjian)
+     </para>
+
+     <para>
+      Handle exclusion constraints correctly, avoid failures on Windows,
+      don't complain about mismatched toast table names in 8.4 databases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      not necessarily the operating system's main copy
+      (David Wheeler and Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect coding in <filename>contrib/dict_int</> and
+      <filename>contrib/dict_xsyn</> (Tom Lane)
+     </para>
+
+     <para>
+      Some functions incorrectly assumed that memory returned by
+      <function>palloc()</> is guaranteed zeroed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix assorted errors in <filename>contrib/unaccent</>'s configuration
+      file parsing (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect quoting of log file name in Mac OS X start script
+      (Sidar Lopez)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure VPATH builds properly install all server header files
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Shorten file names reported in verbose error messages (Peter Eisentraut)
+     </para>
+
+     <para>
+      Regular builds have always reported just the name of the C file
+      containing the error message call, but VPATH builds formerly
+      reported an absolute path name.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix interpretation of Windows timezone names for Central America
+      (Tom Lane)
+     </para>
+
+     <para>
+      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
+      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Central America.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011n
+      for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
+      also historical corrections for Alaska and British East Africa.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-0-5">
+  <title>Release 9.0.5</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-09-26</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.0.4.
+   For information about new features in the 9.0 major release, see
+   <xref linkend="release-9-0">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.0.5</title>
+
+   <para>
+    A dump/restore is not required for those running 9.0.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.0.4,
+    see the release notes for 9.0.4.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix catalog cache invalidation after a <command>VACUUM FULL</> or
+      <command>CLUSTER</> on a system catalog (Tom Lane)
+     </para>
+
+     <para>
+      In some cases the relocation of a system catalog row to another place
+      would not be recognized by concurrent server processes, allowing catalog
+      corruption to occur if they then tried to update that row.  The
+      worst-case outcome could be as bad as complete loss of a table.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect order of operations during sinval reset processing,
+      and ensure that TOAST OIDs are preserved in system catalogs (Tom
+      Lane)
+     </para>
+
+     <para>
+      These mistakes could lead to transient failures after a <command>VACUUM
+      FULL</> or <command>CLUSTER</> on a system catalog.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix bugs in indexing of in-doubt HOT-updated tuples (Tom Lane)
+     </para>
+
+     <para>
+      These bugs could result in index corruption after reindexing a system
+      catalog.  They are not believed to affect user indexes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix multiple bugs in GiST index page split processing (Heikki
+      Linnakangas)
+     </para>
+
+     <para>
+      The probability of occurrence was low, but these could lead to index
+      corruption.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible buffer overrun in <function>tsvector_concat()</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      The function could underestimate the amount of memory needed for its
+      result, leading to server crashes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in <function>xml_recv</> when processing a
+      <quote>standalone</> parameter (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>pg_options_to_table</> return NULL for an option with no
+      value (Tom Lane)
+     </para>
+
+     <para>
+      Previously such cases would result in a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      and in SJIS-2004 encoding conversion (Noah Misch)
+     </para>
+
+     <para>
+      This fixes some very-low-probability server crash scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Protect <function>pg_stat_reset_shared()</> against NULL input (Magnus
+      Hagander)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failure when a recovery conflict deadlock is detected
+      within a sub-transaction (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid spurious conflicts while recycling btree index pages during hot
+      standby (Noah Misch, Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Shut down WAL receiver if it's still running at end of recovery (Heikki
+      Linnakangas)
+     </para>
+
+     <para>
+      The postmaster formerly panicked in this situation, but it's actually a
+      legitimate case.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition in relcache init file invalidation (Tom Lane)
+     </para>
+
+     <para>
+      There was a window wherein a new backend process could read a stale init
+      file but miss the inval messages that would tell it the data is stale.
+      The result would be bizarre failures in catalog accesses, typically
+      <quote>could not read block 0 in file ...</> later during startup.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak at end of a GiST index scan (Tom Lane)
+     </para>
+
+     <para>
+      Commands that perform many separate GiST index scans, such as
+      verification of a new GiST-based exclusion constraint on a table
+      already containing many rows, could transiently require large amounts of
+      memory due to this leak.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak when encoding conversion has to be done on incoming
+      command strings and <command>LISTEN</> is active (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect memory accounting (leading to possible memory bloat) in
+      tuplestores supporting holdable cursors and plpgsql's <literal>RETURN
+      NEXT</> command (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix trigger <literal>WHEN</> conditions when both <literal>BEFORE</> and
+      <literal>AFTER</> triggers exist (Tom Lane)
+     </para>
+
+     <para>
+      Evaluation of <literal>WHEN</> conditions for <literal>AFTER ROW
+      UPDATE</> triggers could crash if there had been a <literal>BEFORE
+      ROW</> trigger fired for the same update.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix performance problem when constructing a large, lossy bitmap
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix join selectivity estimation for unique columns (Tom Lane)
+     </para>
+
+     <para>
+      This fixes an erroneous planner heuristic that could lead to poor
+      estimates of the result size of a join.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix nested PlaceHolderVar expressions that appear only in sub-select
+      target lists (Tom Lane)
+     </para>
+
+     <para>
+      This mistake could result in outputs of an outer join incorrectly
+      appearing as NULL.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow the planner to assume that empty parent tables really are empty
+      (Tom Lane)
+     </para>
+
+     <para>
+      Normally an empty table is assumed to have a certain minimum size for
+      planning purposes; but this heuristic seems to do more harm than good
+      for the parent table of an inheritance hierarchy, which often is
+      permanently empty.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow nested <literal>EXISTS</> queries to be optimized properly (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix array- and path-creating functions to ensure padding bytes are
+      zeroes (Tom Lane)
+     </para>
+
+     <para>
+      This avoids some situations where the planner will think that
+      semantically-equal constants are not equal, resulting in poor
+      optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>EXPLAIN</> to handle gating Result nodes within
+      inner-indexscan subplans (Tom Lane)
+     </para>
+
+     <para>
+      The usual symptom of this oversight was <quote>bogus varno</> errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix btree preprocessing of <replaceable>indexedcol</> <literal>IS
+      NULL</> conditions (Dean Rasheed)
+     </para>
+
+     <para>
+      Such a condition is unsatisfiable if combined with any other type of
+      btree-indexable condition on the same index column.  The case was
+      handled incorrectly in 9.0.0 and later, leading to query output where
+      there should be none.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Work around gcc 4.6.0 bug that breaks WAL replay (Tom Lane)
+     </para>
+
+     <para>
+      This could lead to loss of committed transactions after a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+     </para>
+
+     <para>
+      This operation doesn't work as expected and can lead to failures.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <command>VACUUM</> so that it always updates
+      <literal>pg_class</>.<literal>reltuples</>/<literal>relpages</> (Tom
+      Lane)
+     </para>
+
+     <para>
+      This fixes some scenarios where autovacuum could make increasingly poor
+      decisions about when to vacuum tables.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Defend against integer overflow when computing size of a hash table (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix cases where <command>CLUSTER</> might attempt to access
+      already-removed TOAST data (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix premature timeout failures during initial authentication transaction
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix portability bugs in use of credentials control messages for
+      <quote>peer</> authentication (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix SSPI login when multiple roundtrips are required (Ahmed Shinwari,
+      Magnus Hagander)
+     </para>
+
+     <para>
+      The typical symptom of this problem was <quote>The function requested is
+      not supported</> errors during SSPI login.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix failure when adding a new variable of a custom variable class to
+      <filename>postgresql.conf</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Throw an error if <filename>pg_hba.conf</> contains <literal>hostssl</>
+      but SSL is disabled (Tom Lane)
+     </para>
+
+     <para>
+      This was concluded to be more user-friendly than the previous behavior
+      of silently ignoring such lines.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix failure when <command>DROP OWNED BY</> attempts to remove default
+      privileges on sequences (Shigeru Hanada)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+     </para>
+
+     <para>
+      This led to failure to use all bits of the provided seed.  This function
+      is not used on most platforms (only those without <function>srandom</>),
+      and the potential security exposure from a less-random-than-expected
+      seed seems minimal in any case.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid integer overflow when the sum of <literal>LIMIT</> and
+      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add overflow checks to <type>int4</> and <type>int8</> versions of
+      <function>generate_series()</> (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+     </para>
+
+     <para>
+      In a format with <literal>FM</> and no digit positions
+      after the decimal point, zeroes to the left of the decimal point could
+      be removed incorrectly.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      2^63 (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Weaken plpgsql's check for typmod matching in record values (Tom Lane)
+     </para>
+
+     <para>
+      An overly enthusiastic check could lead to discarding length modifiers
+      that should have been kept.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly handle quotes in locale names during <application>initdb</>
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The case can arise with some Windows locales, such as <quote>People's
+      Republic of China</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, avoid dumping orphaned temporary tables
+      (Bruce Momjian)
+     </para>
+
+     <para>
+      This prevents situations wherein table OID assignments could get out of
+      sync between old and new installations.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_upgrade</> to preserve toast tables' relfrozenxids
+      during an upgrade from 8.3 (Bruce Momjian)
+     </para>
+
+     <para>
+      Failure to do this could lead to <filename>pg_clog</> files being
+      removed too soon after the upgrade.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_upgrade</>, fix the <literal>-l</> (log) option to
+      work on Windows (Bruce Momjian)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>pg_ctl</>, support silent mode for service registrations
+      on Windows (MauMau)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>psql</>'s counting of script file line numbers during
+      <literal>COPY</> from a different file (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_restore</>'s direct-to-database mode for
+      <varname>standard_conforming_strings</> (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_restore</> could emit incorrect commands when restoring
+      directly to a database server from an archive file that had been made
+      with <varname>standard_conforming_strings</> set to <literal>on</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Be more user-friendly about unsupported cases for parallel
+      <application>pg_restore</> (Tom Lane)
+     </para>
+
+     <para>
+      This change ensures that such cases are detected and reported before
+      any restore actions have been taken.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      LDAP service lookup code (Albe Laurenz)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>libpq</>, avoid failures when using nonblocking I/O
+      and an SSL connection (Martin Pihlak, Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve libpq's handling of failures during connection startup
+      (Tom Lane)
+     </para>
+
+     <para>
+      In particular, the response to a server report of <function>fork()</>
+      failure during SSL connection startup is now saner.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve <application>libpq</>'s error reporting for SSL failures (Tom
+      Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>PQsetvalue()</> to avoid possible crash when adding a new
+      tuple to a <structname>PGresult</> originally obtained from a server
+      query (Andrew Chernow)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      precision (Akira Kurosawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpglib</>, be sure <literal>LC_NUMERIC</> setting is
+      restored after an error (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Apply upstream fix for blowfish signed-character bug (CVE-2011-2483)
+      (Tom Lane)
+     </para>
+
+     <para>
+      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      wrong results on platforms where char is signed (which is most),
+      leading to encrypted passwords being weaker than they should be.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>pgstatindex()</> to give consistent results for empty
+      indexes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow building with perl 5.14 (Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix assorted issues with build and install file paths containing spaces
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011i
+      for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-0-4">
   <title>Release 9.0.4</title>
 
diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
index 2d6c8edf9bd92..8832a4a5d81e4 100644
--- a/doc/src/sgml/release-9.1.sgml
+++ b/doc/src/sgml/release-9.1.sgml
@@ -1,27 +1,814 @@
 <!-- doc/src/sgml/release-9.1.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-1-2">
+  <title>Release 9.1.2</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-12-05</simpara>
+  </note>
+
+  <para>
+   This release contains a variety of fixes from 9.1.1.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.2</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+   <para>
+    However, a longstanding error was discovered in the definition of the
+    <literal>information_schema.referential_constraints</> view.  If you
+    rely on correct results from that view, you should replace its
+    definition as explained in the first changelog item below.
+   </para>
+
+   <para>
+    Also, if your installation was upgraded from a previous major release
+    by running <application>pg_upgrade</>, and it contains table columns of
+    the <type>citext</> data type, you should run <literal>CREATE EXTENSION
+    citext FROM unpackaged</>.  If you've already done that before
+    upgrading to 9.1.2, you will instead need to do manual catalog updates
+    as explained in the second changelog item.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix bugs in <literal>information_schema.referential_constraints</> view
+      (Tom Lane)
+     </para>
+
+     <para>
+      This view was being insufficiently careful about matching the
+      foreign-key constraint to the depended-on primary or unique key
+      constraint.  That could result in failure to show a foreign key
+      constraint at all, or showing it multiple times, or claiming that it
+      depends on a different constraint than the one it really does.
+     </para>
+
+     <para>
+      Since the view definition is installed by <application>initdb</>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can (as a superuser) drop the
+      <literal>information_schema</> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</> if you're uncertain where
+      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      to be fixed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <filename>contrib/citext</>'s upgrade script fix collations of
+      <type>citext</> columns and indexes (Tom Lane)
+     </para>
+
+     <para>
+      Existing <type>citext</> columns and indexes aren't correctly marked as
+      being of a collatable data type during <application>pg_upgrade</> from
+      a pre-9.1 server.  That leads to operations on them failing with errors
+      such as <quote>could not determine which collation to use for string
+      comparison</>.  This change allows them to be fixed by the same
+      script that upgrades the <type>citext</> module into a proper 9.1
+      extension during <literal>CREATE EXTENSION citext FROM unpackaged</>.
+     </para>
+
+     <para>
+      If you have a previously-upgraded database that is suffering from this
+      problem, and you already ran the <command>CREATE EXTENSION</> command,
+      you can manually run (as superuser) the <command>UPDATE</> commands
+      found at the end of
+      <filename><replaceable>SHAREDIR</>/extension/citext--unpackaged--1.0.sql</filename>.
+      (Run <literal>pg_config --sharedir</> if you're uncertain where
+      <replaceable>SHAREDIR</> is.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible crash during <command>UPDATE</> or <command>DELETE</> that
+      joins to the output of a scalar-returning function (Tom Lane)
+     </para>
+
+     <para>
+      A crash could only occur if the target row had been concurrently
+      updated, so this problem surfaced only intermittently.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect replay of WAL records for GIN index updates
+      (Tom Lane)
+     </para>
+
+     <para>
+      This could result in transiently failing to find index entries after
+      a crash, or on a hot-standby server.  The problem would be repaired
+      by the next <command>VACUUM</> of the index, however.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
+      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      (Tom Lane)
+     </para>
+
+     <para>
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      attempts to copy its data verbatim to another table could produce
+      corrupt results in certain corner cases.
+      The problem can only manifest in this precise form in 8.4 and later,
+      but we patched earlier versions as well in case there are other code
+      paths that could trigger the same bug.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failures during hot standby startup (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Start hot standby faster when initial snapshot is incomplete
+      (Simon Riggs)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix race condition during toast table access from stale syscache entries
+      (Tom Lane)
+     </para>
+
+     <para>
+      The typical symptom was transient errors like <quote>missing chunk
+      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      toast table would always belong to a system catalog.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Track dependencies of functions on items used in parameter default
+      expressions (Tom Lane)
+     </para>
+
+     <para>
+      Previously, a referenced object could be dropped without having dropped
+      or modified the function, leading to misbehavior when the function was
+      used.  Note that merely installing this update will not fix the missing
+      dependency entries; to do that, you'd need to <command>CREATE OR
+      REPLACE</> each such function afterwards.  If you have functions whose
+      defaults depend on non-built-in objects, doing so is recommended.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect management of placeholder variables in nestloop joins
+      (Tom Lane)
+     </para>
+
+     <para>
+      This bug is known to lead to <quote>variable not found in subplan target
+      list</> planner errors, and could possibly result in wrong query output
+      when outer joins are involved.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix window functions that sort by expressions involving aggregates
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously these could fail with <quote>could not find pathkey item to
+      sort</> planner errors.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>MergeAppend child's targetlist doesn't match MergeAppend</>
+      planner errors (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix index matching for operators with both collatable and noncollatable
+      inputs (Tom Lane)
+     </para>
+
+     <para>
+      In 9.1.0, an indexable operator that has a non-collatable left-hand
+      input type and a collatable right-hand input type would not be
+      recognized as matching the left-hand column's index.  An example is
+      the <type>hstore</> <literal>?</> <type>text</> operator.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow inlining of set-returning SQL functions with multiple OUT
+      parameters (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't trust deferred-unique indexes for join removal (Tom Lane and Marti
+      Raudsepp)
+     </para>
+
+     <para>
+      A deferred uniqueness constraint might not hold intra-transaction,
+      so assuming that it does could give incorrect query results.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      not (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This change affects no core code, but might prevent crashes in add-on
+      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      datum as per usual convention.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve locale support in <type>money</> type's input and output
+      (Tom Lane)
+     </para>
+
+     <para>
+      Aside from not supporting all standard
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      formatting options, the input and output functions were inconsistent,
+      meaning there were locales in which dumped <type>money</> values could
+      not be re-read.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't let <link
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
+      affect <literal>CASE foo WHEN NULL ...</> constructs
+      (Heikki Linnakangas)
+     </para>
+
+     <para>
+      <varname>transform_null_equals</> is only supposed to affect
+      <literal>foo = NULL</> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change foreign-key trigger creation order to better support
+      self-referential foreign keys (Tom Lane)
+     </para>
+
+     <para>
+      For a cascading foreign key that references its own table, a row update
+      will fire both the <literal>ON UPDATE</> trigger and the
+      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
+      trigger must execute first, else the <literal>CHECK</> will check a
+      non-final state of the row and possibly throw an inappropriate error.
+      However, the firing order of these triggers is determined by their
+      names, which generally sort in creation order since the triggers have
+      auto-generated names following the convention
+      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      modifying that convention, which we will do in 9.2, but it seems risky
+      to change it in existing releases.  So this patch just changes the
+      creation order of the triggers.  Users encountering this type of error
+      should drop and re-create the foreign key constraint to get its
+      triggers into the right order.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <literal>IF EXISTS</> to work correctly in <command>DROP OPERATOR
+      FAMILY</> (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Disallow dropping of an extension from within its own script
+      (Tom Lane)
+     </para>
+
+     <para>
+      This prevents odd behavior in case of incorrect management of extension
+      dependencies.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Don't mark auto-generated types as extension members (Robert Haas)
+     </para>
+
+     <para>
+      Relation rowtypes and automatically-generated array types do not need to
+      have their own extension membership entries in <structname>pg_depend</>,
+      and creating such entries complicates matters for extension upgrades.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with invalid pre-existing <varname>search_path</> settings during
+      <command>CREATE EXTENSION</> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid floating-point underflow while tracking buffer allocation rate
+      (Greg Matthews)
+     </para>
+
+     <para>
+      While harmless in itself, on certain platforms this would result in
+      annoying kernel log messages.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent autovacuum transactions from running in serializable mode
+      (Tom Lane)
+     </para>
+
+     <para>
+      Autovacuum formerly used the cluster-wide default transaction isolation
+      level, but there is no need for it to use anything higher than READ
+      COMMITTED, and using SERIALIZABLE could result in unnecessary delays
+      for other processes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure walsender processes respond promptly to <systemitem>SIGTERM</>
+      (Magnus Hagander)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Exclude <filename>postmaster.opts</> from base backups
+      (Magnus Hagander)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve configuration file name and line number values when starting
+      child processes under Windows (Tom Lane)
+     </para>
+
+     <para>
+      Formerly, these would not be displayed correctly in the
+      <structname>pg_settings</> view.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect field alignment in <application>ecpg</>'s SQLDA area
+      (Zoltan Boszormenyi)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Preserve blank lines within commands in <application>psql</>'s command
+      history (Robert Haas)
+     </para>
+
+     <para>
+      The former behavior could cause problems if an empty line was removed
+      from within a string literal, for example.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid platform-specific infinite loop in <application>pg_dump</>
+      (Steve Singer)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix compression of plain-text output format in <application>pg_dump</>
+      (Adrian Klaver and Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_dump</> has historically understood <literal>-Z</> with
+      no <literal>-F</> switch to mean that it should emit a gzip-compressed
+      version of its plain text output.  Restore that behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</> to dump user-defined casts between
+      auto-generated types, such as table rowtypes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix missed quoting of foreign server names in <application>pg_dump</>
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Assorted fixes for <application>pg_upgrade</> (Bruce Momjian)
+     </para>
+
+     <para>
+      Handle exclusion constraints correctly, avoid failures on Windows,
+      don't complain about mismatched toast table names in 8.4 databases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In PL/pgSQL, allow foreign tables to define row types
+      (Alexander Soudakov)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix up conversions of PL/Perl functions' results
+      (Alex Hunsaker and Tom Lane)
+     </para>
+
+     <para>
+      Restore the pre-9.1 behavior that PL/Perl functions returning
+      <type>void</> ignore the result value of their last Perl statement;
+      9.1.0 would throw an error if that statement returned a reference.
+      Also, make sure it works to return a string value for a composite type,
+      so long as the string meets the type's input format.
+      In addition, throw errors for attempts to return Perl arrays or hashes
+      when the function's declared result type is not an array or composite
+      type, respectively.  (Pre-9.1 versions rather uselessly returned
+      strings like <literal>ARRAY(0x221a9a0)</> or
+      <literal>HASH(0x221aa90)</> in such cases.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure PL/Perl strings are always correctly UTF8-encoded
+      (Amit Khandekar and Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      not necessarily the operating system's main copy
+      (David Wheeler and Alex Hunsaker)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly propagate SQLSTATE in PL/Python exceptions
+      (Mika Eloranta and Jan Urbanski)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Do not install PL/Python extension files for Python major versions
+      other than the one built against (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change all the <filename>contrib</> extension script files to report
+      a useful error message if they are fed to <application>psql</>
+      (Andrew Dunstan and Tom Lane)
+     </para>
+
+     <para>
+      This should help teach people about the new method of using
+      <command>CREATE EXTENSION</> to load these files.  In most cases,
+      sourcing the scripts directly would fail anyway, but with
+      harder-to-interpret messages.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect coding in <filename>contrib/dict_int</> and
+      <filename>contrib/dict_xsyn</> (Tom Lane)
+     </para>
+
+     <para>
+      Some functions incorrectly assumed that memory returned by
+      <function>palloc()</> is guaranteed zeroed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove <filename>contrib/sepgsql</> tests from the regular regression
+      test mechanism (Tom Lane)
+     </para>
+
+     <para>
+      Since these tests require root privileges for setup, they're impractical
+      to run automatically.  Switch over to a manual approach instead, and
+      provide a testing script to help with that.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix assorted errors in <filename>contrib/unaccent</>'s configuration
+      file parsing (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect quoting of log file name in Mac OS X start script
+      (Sidar Lopez)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Revert unintentional enabling of <literal>WAL_DEBUG</> (Robert Haas)
+     </para>
+
+     <para>
+      Fortunately, as debugging tools go, this one is pretty cheap;
+      but it's not intended to be enabled by default, so revert.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure VPATH builds properly install all server header files
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Shorten file names reported in verbose error messages (Peter Eisentraut)
+     </para>
+
+     <para>
+      Regular builds have always reported just the name of the C file
+      containing the error message call, but VPATH builds formerly
+      reported an absolute path name.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix interpretation of Windows timezone names for Central America
+      (Tom Lane)
+     </para>
+
+     <para>
+      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
+      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Central America.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</> release 2011n
+      for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
+      also historical corrections for Alaska and British East Africa.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-1-1">
+  <title>Release 9.1.1</title>
+
+  <note>
+  <title>Release Date</title>
+  <simpara>2011-09-26</simpara>
+  </note>
+
+  <para>
+   This release contains a small number of fixes from 9.1.0.
+   For information about new features in the 9.1 major release, see
+   <xref linkend="release-9-1">.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.1.1</title>
+
+   <para>
+    A dump/restore is not required for those running 9.1.X.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Make <function>pg_options_to_table</> return NULL for an option with no
+      value (Tom Lane)
+     </para>
+
+     <para>
+      Previously such cases would result in a server crash.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix memory leak at end of a GiST index scan (Tom Lane)
+     </para>
+
+     <para>
+      Commands that perform many separate GiST index scans, such as
+      verification of a new GiST-based exclusion constraint on a table
+      already containing many rows, could transiently require large amounts of
+      memory due to this leak.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix explicit reference to <literal>pg_temp</> schema in <command>CREATE
+      TEMPORARY TABLE</> (Robert Haas)
+     </para>
+
+     <para>
+      This used to be allowed, but failed in 9.1.0.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-1">
   <title>Release 9.1</title>
 
   <note>
    <title>Release Date</title>
-   <simpara>2011-??-??</simpara>
+   <simpara>2011-09-12</simpara>
   </note>
 
-  <para>CURRENT AS OF 2011-06-09</para>
-
   <sect2>
    <title>Overview</title>
 
    <para>
-    This release of
-    <productname>PostgreSQL</> adds numerous major features, including:
+    This release shows <productname>PostgreSQL</> moving beyond the
+    traditional relational-database feature set with new, ground-breaking
+    functionality that is unique to <productname>PostgreSQL</>.
+    The streaming replication feature introduced in release 9.0 is
+    significantly enhanced by adding a synchronous-replication option,
+    streaming backups, and monitoring improvements.
+    Major enhancements include:
    </para>
 
-   <para>
-    (summary to be added)
-   </para>
+   <itemizedlist>
+
+    <!-- This list duplicates items below, but without authors or details-->
+
+    <listitem>
+     <para>
+      Allow <link linkend="synchronous-replication">synchronous
+      replication</link>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add support for <link linkend="SQL-CREATEFOREIGNTABLE">foreign
+      tables</link>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add per-column <link
+      linkend="collation">collation</link> support
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add <link linkend="extend-extensions">extensions</link> which
+      simplify packaging of additions to <productname>PostgreSQL</>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add a true <link
+      linkend="xact-serializable">serializable isolation level</link>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support unlogged tables using the <literal>UNLOGGED</>
+      option in <link linkend="SQL-CREATETABLE"><command>CREATE
+      TABLE</></link>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow data-modification commands
+      (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>) in
+      <link linkend="queries-with"><literal>WITH</></link> clauses
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add nearest-neighbor (order-by-operator) searching to <link
+      linkend="GiST"><acronym>GiST</> indexes</link>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add a <link linkend="SQL-SECURITY-LABEL"><command>SECURITY
+      LABEL</></link> command and support for
+      <link linkend="sepgsql"><acronym>SELinux</> permissions control</link>
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update the <link linkend="plpython">PL/Python</link> server-side
+      language
+     </para>
+    </listitem>
+
+   </itemizedlist>
 
    <para>
     The above items are explained in more detail in the sections below.
@@ -66,6 +853,17 @@
        strings are the proper way to embed backslash escapes in strings and are
        unaffected by this change.
       </para>
+
+      <warning>
+       <para>
+        This change can break applications that are not expecting it and
+        do their own string escaping according to the old rules.  The
+        consequences could be as severe as introducing SQL-injection security
+        holes.  Be sure to test applications that are exposed to untrusted
+        input, to ensure that they correctly handle single quotes and
+        backslashes in text strings.
+       </para>
+      </warning>
      </listitem>
 
     </itemizedlist>
@@ -171,7 +969,7 @@
      <listitem>
       <para>
         Require superuser or <literal>CREATEROLE</> permissions in order to
-        set role comments (Tom Lane)
+        set comments on roles (Tom Lane)
       </para>
      </listitem>
 
@@ -192,8 +990,8 @@
       </para>
 
       <para>
-       Previously <function>pg_last_xlog_receive_location()</> could
-       move backward when streaming replication is restarted.
+       Previously, the value of <function>pg_last_xlog_receive_location()</>
+       could move backward when streaming replication is restarted.
       </para>
      </listitem>
 
@@ -205,7 +1003,7 @@
       </para>
 
       <para>
-       Previously replication connections were always logged.
+       Previously, replication connections were always logged.
       </para>
      </listitem>
 
@@ -276,6 +1074,32 @@
 
    </sect3>
 
+   <sect3>
+    <title>Contrib</title>
+
+    <itemizedlist>
+
+     <listitem>
+      <para>
+       All contrib modules are now installed with <link
+       linkend="SQL-CREATEEXTENSION"><command>CREATE EXTENSION</></link>
+       rather than by manually invoking their SQL scripts
+       (Dimitri Fontaine, Tom Lane)
+      </para>
+
+      <para>
+       To update an existing database containing the 9.0 version of a contrib
+       module, use <literal>CREATE EXTENSION ... FROM unpackaged</literal>
+       to wrap the existing contrib module's objects into an extension.  When
+       updating from a pre-9.0 version, drop the contrib module's objects
+       using its old uninstall script, then use <literal>CREATE EXTENSION</>.
+      </para>
+     </listitem>
+
+    </itemizedlist>
+
+   </sect3>
+
    <sect3>
     <title>Other Incompatibilities</title>
 
@@ -303,7 +1127,8 @@
 
      <listitem>
       <para>
-       Treat <application>ECPG</> cursor names as case-insensitive (Zoltan Boszormenyi)
+       Treat <application>ECPG</> cursor names as case-insensitive
+       (Zoltan Boszormenyi)
       </para>
      </listitem>
 
@@ -314,9 +1139,12 @@
 
   <sect2>
    <title>Changes</title>
-    <para>
-     Version 9.1 has ...
-    </para>
+
+   <para>
+    Below you will find a detailed account of the changes between
+    <productname>PostgreSQL</productname> 9.1 and the previous major
+    release.
+   </para>
 
    <sect3>
     <title>Server</title>
@@ -328,8 +1156,7 @@
 
       <listitem>
        <para>
-        Support unlogged tables using the <link
-        linkend="SQL-CREATETABLE-description"><literal>UNLOGGED</></link>
+        Support unlogged tables using the <literal>UNLOGGED</>
         option in <link linkend="SQL-CREATETABLE"><command>CREATE
         TABLE</></link> (Robert Haas)
        </para>
@@ -360,8 +1187,11 @@
 
       <listitem>
        <para>
-         Merge duplicate fsync requests on busy systems (Robert Haas,
-         Greg Smith)
+        Merge duplicate fsync requests (Robert Haas, Greg Smith)
+       </para>
+
+       <para>
+        This greatly improves performance under heavy write loads.
        </para>
       </listitem>
 
@@ -385,6 +1215,19 @@
        </para>
       </listitem>
 
+      <listitem>
+       <para>
+        Avoid leaving data files open after <quote>blind writes</>
+        (Alvaro Herrera)
+       </para>
+
+       <para>
+        This fixes scenarios in which backends might hold files open long
+        after they were deleted, preventing the kernel from reclaiming
+        disk space.
+       </para>
+      </listitem>
+
      </itemizedlist>
 
     </sect4>
@@ -491,7 +1334,9 @@
        </para>
 
        <para>
-        The old term is still accepted for backward compatibility.
+        The old term is still accepted for backward compatibility, but since
+        the two methods are fundamentally different, it seemed better to adopt
+        different names for them.
        </para>
       </listitem>
 
@@ -528,7 +1373,7 @@
        </para>
 
        <para>
-        New details show <acronym>WAL</> file and sync activity.
+        New details include <acronym>WAL</> file and sync activity.
        </para>
       </listitem>
 
@@ -541,6 +1386,18 @@
        </para>
       </listitem>
 
+      <listitem>
+       <para>
+        Reduce the default maximum line length for <application>syslog</>
+        logging to 900 bytes plus prefixes (Noah Misch)
+       </para>
+
+       <para>
+        This avoids truncation of long log lines on syslog implementations
+        that have a 1KB length limit, rather than the more common 2KB.
+       </para>
+      </listitem>
+
      </itemizedlist>
 
     </sect4>
@@ -615,14 +1472,14 @@
 
       <listitem>
        <para>
-        Allow auto-tuning of <link
+        Provide auto-tuning of <link
         linkend="guc-wal-buffers"><varname>wal_buffers</></link> (Greg
         Smith)
        </para>
 
        <para>
-        <varname>wal_buffers</> is now auto-tuned by default based on
-        the size of <varname>shared_buffers</>.
+        By default, the value of <varname>wal_buffers</> is now chosen
+        automatically based on the value of <varname>shared_buffers</>.
        </para>
       </listitem>
 
@@ -662,8 +1519,8 @@
       </para>
 
       <para>
-       This allows the primary to wait for a standby to write the transaction
-       information to disk before acknowledging the commit.
+       This allows the primary server to wait for a standby to write a
+       transaction's information to disk before acknowledging the commit.
        One standby at a time can take the role of the synchronous standby,
        as controlled by the
        <link linkend="guc-synchronous-standby-names"><varname>synchronous_standby_names</varname></link>
@@ -676,8 +1533,8 @@
 
      <listitem>
       <para>
-       Add protocol support for sending file system backups to standbys using
-       the streaming replication network connection (Magnus Hagander,
+       Add protocol support for sending file system backups to standby servers
+       using the streaming replication network connection (Magnus Hagander,
        Heikki Linnakangas)
       </para>
 
@@ -714,7 +1571,7 @@
 
      <listitem>
       <para>
-       Add replication <link linkend="SQL-CREATEROLE">permission</link>
+       Add a <link linkend="SQL-CREATEROLE">replication permission</link>
        for roles (Magnus Hagander)
       </para>
 
@@ -779,7 +1636,7 @@
       </para>
 
       <para>
-       This helps avoid cancelling long-running queries on the standby.
+       This helps avoid canceling long-running queries on the standby.
       </para>
      </listitem>
 
@@ -813,7 +1670,7 @@
        <para>
         Increase the maximum values for
         <link linkend="guc-max-standby-archive-delay"><varname>max_standby_archive_delay</varname></link> and
-        <link linkend="guc-max-standby-streaming-delay"><varname>max_standby_streaming_delay</varname></link>.
+        <link linkend="guc-max-standby-streaming-delay"><varname>max_standby_streaming_delay</varname></link>
        </para>
 
        <para>
@@ -846,8 +1703,7 @@
 
       <listitem>
        <para>
-        Add functions to control streaming replication replay (Simon
-        Riggs)
+        Add functions to control streaming replication replay (Simon Riggs)
        </para>
 
        <para>
@@ -908,8 +1764,8 @@
        </para>
 
        <para>
-        This allows external cluster management software to take control
-        of whether servers restart or not.
+        This allows external cluster management software to control
+        whether the database server restarts or not.
        </para>
       </listitem>
 
@@ -940,15 +1796,15 @@
       <listitem>
        <para>
         Add a true <link
-        linkend="xact-serializable">serializable</link> isolation
-        level (Kevin Grittner, Dan Ports)
+        linkend="xact-serializable">serializable isolation level</link>
+        (Kevin Grittner, Dan Ports)
        </para>
 
        <para>
         Previously, asking for serializable isolation guaranteed only that a
         single MVCC snapshot would be used for the entire transaction, which
         allowed certain documented anomalies.  The old snapshot isolation
-        behavior is still accessible by requesting the <link
+        behavior is still available by requesting the <link
         linkend="xact-repeatable-read"><literal>REPEATABLE READ</></link>
         isolation level.
        </para>
@@ -957,7 +1813,7 @@
       <listitem>
        <para>
         Allow data-modification commands
-        (<command>INSERT</>/<command>UPDATE</>/<command>DELETE)</> in
+        (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>) in
         <link linkend="queries-with"><literal>WITH</></link> clauses
         (Marko Tiikkaja, Hitoshi Harada)
        </para>
@@ -985,7 +1841,7 @@
        </para>
 
        <para>
-        Some other database system already allowed this behavior, and
+        The SQL standard allows this behavior, and
         because of the primary key, the result is unambiguous.
        </para>
       </listitem>
@@ -1010,9 +1866,9 @@
        </para>
 
        <para>
-        Previously <command>EXPLAIN ANALYZE</> used a slightly different
-        snapshot for queries involving rules.  The <command>EXPLAIN ANALYZE</>
-        behavior was judged to be more logical.
+        Previously <command>EXPLAIN ANALYZE</> used slightly different
+        snapshot timing for queries involving rules.  The
+        <command>EXPLAIN ANALYZE</> behavior was judged to be more logical.
        </para>
       </listitem>
 
@@ -1031,7 +1887,8 @@
        </para>
 
        <para>
-        Previously collation could only be set at database creation.
+        Previously collation (the sort ordering of text strings) could only be
+        chosen at database creation.
         Collation can now be set per column, domain, index, or
         expression, via the SQL-standard <literal>COLLATE</> clause.
        </para>
@@ -1174,8 +2031,8 @@
        </para>
 
        <para>
-        The new option is called <literal>NOT VALID</>, which can
-        later be modified to <literal>VALIDATED</> and validation
+        The new option is called <literal>NOT VALID</>.  The constraint's
+        state can later be modified to <literal>VALIDATED</> and validation
         checks performed. Together these allow you to add a foreign key
         with minimal impact on read and write operations.
        </para>
@@ -1211,14 +2068,14 @@
       <listitem>
        <para>
         Fix possible <quote>tuple concurrently updated</quote> error
-        when two backends attempted to add an inheritance
+        when two backends attempt to add an inheritance
         child to the same table at the same time (Robert Haas)
        </para>
 
        <para>
         <link linkend="sql-altertable"><command>ALTER TABLE</command></link>
-        now takes a stronger lock on the parent table, so that both children do
-        not try to update it simultaneously.
+        now takes a stronger lock on the parent table, so that the sessions
+        cannot try to update it simultaneously.
        </para>
       </listitem>
 
@@ -1260,8 +2117,8 @@
       </para>
 
       <para>
-       This is similar to the existing session-level advisory locks,
-       but the locks are automatically released at transaction end.
+       These are similar to the existing session-level advisory locks,
+       but such locks are automatically released at transaction end.
       </para>
      </listitem>
 
@@ -1352,11 +2209,11 @@
       <listitem>
        <para>
         Prevent <link linkend="autovacuum">autovacuum</link> from
-        waiting if it cannot acquire a lock (Robert Haas)
+        waiting if it cannot acquire a table lock (Robert Haas)
        </para>
 
        <para>
-        It will try to vacuum later.
+        It will try to vacuum that table later.
        </para>
       </listitem>
 
@@ -1394,6 +2251,12 @@
        <para>
         This allows <acronym>GiST</> indexes to quickly return the
         <replaceable>N</> closest values in a query with <literal>LIMIT</>.
+        For example
+<programlisting><![CDATA[
+SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
+]]>
+</programlisting>
+        finds the ten places closest to a given target point.
        </para>
       </listitem>
 
@@ -1452,7 +2315,7 @@
 
       <para>
        Previously all <type>numeric</> values had four-byte headers;
-       this saves on disk storage.
+       this change saves on disk storage.
       </para>
      </listitem>
 
@@ -1520,7 +2383,7 @@
      <listitem>
       <para>
        Add support for casting from <type>int4</> and <type>int8</>
-       to <type>numeric</> (Joey Adams)
+       to <type>money</> (Joey Adams)
       </para>
      </listitem>
 
@@ -1590,9 +2453,9 @@
       <listitem>
        <para>
         Add SQL function <link
-        linkend="format"><function>format(text)</></link>, which
-        behaves like C's <function>printf()</> (Pavel Stehule, Robert
-        Haas)
+        linkend="format"><function>format(text, ...)</></link>, which
+        behaves analogously to C's <function>printf()</> (Pavel Stehule,
+        Robert Haas)
        </para>
 
        <para>
@@ -1742,20 +2605,6 @@
        </para>
       </listitem>
 
-      <listitem>
-       <para>
-        Minimize lock levels for <link
-        linkend="SQL-CREATETRIGGER"><command>CREATE TRIGGER</></link>
-        and many <link linkend="SQL-ALTERTABLE"><command>ALTER
-        TABLE</></link> and <link linkend="SQL-CREATERULE"><command>CREATE
-        RULE</></link> operations (Simon Riggs)
-       </para>
-
-       <para>
-        This improves database availability when altering active databases.
-       </para>
-      </listitem>
-
      </itemizedlist>
 
     </sect4>
@@ -1773,7 +2622,7 @@
       <listitem>
        <para>
         Add <link linkend="plpgsql-foreach-array"><command>FOREACH IN
-        ARRAY</></link> to <link linkend="plpgsql">PL/pgSQL</link>
+        ARRAY</></link> to PL/pgSQL
         (Pavel Stehule)
        </para>
 
@@ -1884,7 +2733,7 @@
 
       <listitem>
        <para>
-         Add PL/Python explicit subtransactions (Jan Urbanski)
+        Add explicit subtransactions to PL/Python (Jan Urbanski)
        </para>
       </listitem>
 
@@ -1894,7 +2743,7 @@
        </para>
 
        <para>
-        The functions are <link
+        These functions are <link
         linkend="plpython-util"><literal>plpy.quote_ident</></link>,
         <link linkend="plpython-util"><literal>plpy.quote_literal</></link>,
         and <link
@@ -1977,7 +2826,7 @@
 
       <listitem>
        <para>
-        Add <option>S</> (<quote>system</>) option to <application>psql</>'s
+        Add the <option>S</> (<quote>system</>) option to <application>psql</>'s
         <literal>\dn</> (list schemas) command (Tom Lane)
        </para>
 
@@ -1996,7 +2845,7 @@
 
        <para>
         This is passed to the editor according to the
-        <envar>EDITOR_LINENUMBER_SWITCH</> psql variable.
+        <envar>PSQL_EDITOR_LINENUMBER_ARG</> environment variable.
        </para>
       </listitem>
 
@@ -2129,7 +2978,8 @@
 
       <listitem>
        <para>
-        Add a libpq connection option <literal>client_encoding</>
+        Add a libpq connection option <link
+        linkend="libpq-connect-client-encoding"><literal>client_encoding</></link>
         which behaves like the <envar>PGCLIENTENCODING</> environment
         variable (Heikki Linnakangas)
        </para>
@@ -2156,10 +3006,11 @@
 
       <listitem>
        <para>
-        Allow libpq database clients to
-        check the user name of the server process using <link
+        Allow libpq-using clients to
+        check the user name of the server process
+        when connecting via Unix-domain sockets, with the new <link
         linkend="libpq-connect-requirepeer"><literal>requirepeer</></link>
-        when connecting via Unix-domain sockets
+        connection option
         (Peter Eisentraut)
        </para>
 
@@ -2194,8 +3045,16 @@
 
       <listitem>
        <para>
-         Allow ECPG to accept dynamic cursor names even in
-         <literal>WHERE CURRENT OF</literal> clauses
+        Allow ECPG to accept dynamic cursor names even in
+        <literal>WHERE CURRENT OF</literal> clauses
+        (Zoltan Boszormenyi)
+       </para>
+      </listitem>
+
+      <listitem>
+       <para>
+        Make <application>ecpglib</> write <type>double</> values with a
+        precision of 15 digits, not 14 as formerly (Akira Kurosawa)
        </para>
       </listitem>
 
@@ -2344,8 +3203,8 @@
 
       <listitem>
        <para>
-         Add latches to the source code to wait for events (Heikki
-         Linnakangas)
+        Add latches to the source code to support waiting for events (Heikki
+        Linnakangas)
        </para>
       </listitem>
 
@@ -2415,6 +3274,13 @@
        </para>
       </listitem>
 
+      <listitem>
+       <para>
+         Improve support for building with
+         <application>Clang</application> (Peter Eisentraut)
+       </para>
+      </listitem>
+
      </itemizedlist>
 
     <sect4>
@@ -2455,7 +3321,7 @@
 
      <listitem>
       <para>
-       Modify <filename>contrib</> modules and stored procedure
+       Modify <filename>contrib</> modules and procedural
        languages to install via the new <link
        linkend="extend-extensions">extension</link> mechanism (Tom Lane,
        Dimitri Fontaine)
@@ -2476,7 +3342,7 @@
 
      <listitem>
       <para>
-        Add nearest-neighbor support to <link
+        Add nearest-neighbor search support to <link
         linkend="pgtrgm"><filename>contrib/pg_trgm</></link> and <link
         linkend="btree-gist"><filename>contrib/btree_gist</></link>
         (Teodor Sigaev)
@@ -2587,7 +3453,7 @@
       <listitem>
        <para>
         Add <link linkend="sepgsql"><filename>contrib/sepgsql</></link>
-        to interface permission checks with <acronym>SE</>-Linux (KaiGai Kohei)
+        to interface permission checks with <acronym>SELinux</> (KaiGai Kohei)
        </para>
 
        <para>
@@ -2613,7 +3479,7 @@
 
       <listitem>
        <para>
-        Add <link linkend="dummy-seclabel">dummy_seclabel</link>
+        Add <link linkend="dummy-seclabel"><filename>dummy_seclabel</></link>
         contrib module (KaiGai Kohei)
        </para>
 
@@ -2723,8 +3589,8 @@
 
      <listitem>
       <para>
-        Extensive <link linkend="ecpg"><application>ECPG</> documentation</link>
-        improvements (Satoshi Nagayasu)
+        Extensive <link linkend="ecpg"><application>ECPG</></link>
+        documentation improvements (Satoshi Nagayasu)
       </para>
      </listitem>
 
@@ -2779,7 +3645,7 @@
 
      <listitem>
       <para>
-       Merge docs for <command>CREATE CONSTRAINT TRIGGER</> and <link
+       Merge documentation for <command>CREATE CONSTRAINT TRIGGER</> and <link
        linkend="SQL-CREATETRIGGER"><command>CREATE TRIGGER</></link>
        (Alvaro Herrera)
       </para>
@@ -2803,6 +3669,20 @@
       </para>
      </listitem>
 
+     <listitem>
+      <para>
+       Handle non-ASCII characters consistently in <filename>HISTORY</> file
+       (Peter Eisentraut)
+      </para>
+
+      <para>
+       While the <filename>HISTORY</> file is in English, we do have to deal
+       with non-ASCII letters in contributor names.  These are now
+       transliterated so that they are reasonably legible without assumptions
+       about character set.
+      </para>
+     </listitem>
+
     </itemizedlist>
 
    </sect3>
diff --git a/doc/src/sgml/release-old.sgml b/doc/src/sgml/release-old.sgml
index f03683ec3fdad..7b74947af4efd 100644
--- a/doc/src/sgml/release-old.sgml
+++ b/doc/src/sgml/release-old.sgml
@@ -3299,7 +3299,7 @@ New BeOS port (David Reid, Cyril Velter)
 Add proofreader's changes to docs (Addison-Wesley, Bruce)
 New Alpha spinlock code (Adriaan Joubert, Compaq)
 UnixWare port overhaul (Peter E)
-New Darwin/MacOS X port (Peter Bierman, Bruce Hartzler)
+New Darwin/Mac OS X port (Peter Bierman, Bruce Hartzler)
 New FreeBSD Alpha port (Alfred)
 Overhaul shared memory segments (Tom)
 Add IBM S/390 support (Neale Ferguson)
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index ef83206bbc9aa..49e09a8848051 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -282,7 +282,7 @@ pg_ctl start -l logfile
    Different systems have different conventions for starting up daemons
    at boot time. Many systems have a file
    <filename>/etc/rc.local</filename> or
-   <filename>/etc/rc.d/rc.local</filename>. Others use
+   <filename>/etc/rc.d/rc.local</filename>. Others use <filename>init.d</filename> or
    <filename>rc.d</> directories. Whatever you do, the server must be
    run by the <productname>PostgreSQL</productname> user account
    <emphasis>and not by root</emphasis> or any other user. Therefore you
@@ -329,7 +329,8 @@ fi
 <programlisting>
 /usr/local/pgsql/bin/pg_ctl start -l logfile -D /usr/local/pgsql/data
 </programlisting>
-      to <filename>/etc/rc.d/rc.local</filename> or look at the file
+      to <filename>/etc/rc.d/rc.local</filename>
+      or <filename>/etc/rc.local</filename> or look at the file
       <filename>contrib/start-scripts/linux</filename> in the
       <productname>PostgreSQL</productname> source distribution.
      </para>
@@ -337,10 +338,11 @@ fi
 
     <listitem>
      <para>
-      On <productname>NetBSD</productname>, either use the
+      On <productname>NetBSD</productname>, use either the
       <productname>FreeBSD</productname> or
       <productname>Linux</productname> start scripts, depending on
-      preference. <indexterm><primary>NetBSD</><secondary>start script</secondary></>
+      preference.
+      <indexterm><primary>NetBSD</><secondary>start script</secondary></>
      </para>
     </listitem>
 
@@ -603,13 +605,13 @@ psql: could not connect to server: No such file or directory
        <row>
         <entry><varname>SEMMNI</></>
         <entry>Maximum number of semaphore identifiers (i.e., sets)</>
-        <entry>at least <literal>ceil((max_connections + autovacuum_max_workers) / 16)</literal></>
+        <entry>at least <literal>ceil((max_connections + autovacuum_max_workers + 4) / 16)</literal></>
        </row>
 
        <row>
         <entry><varname>SEMMNS</></>
         <entry>Maximum number of semaphores system-wide</>
-        <entry><literal>ceil((max_connections + autovacuum_max_workers) / 16) * 17</literal> plus room for other applications</>
+        <entry><literal>ceil((max_connections + autovacuum_max_workers + 4) / 16) * 17</literal> plus room for other applications</>
        </row>
 
        <row>
@@ -684,7 +686,7 @@ psql: could not connect to server: No such file or directory
     linkend="sysvipc-parameters">).  The parameter <varname>SEMMNI</>
     determines the limit on the number of semaphore sets that can
     exist on the system at one time.  Hence this parameter must be at
-    least <literal>ceil((max_connections + autovacuum_max_workers) / 16)</>.
+    least <literal>ceil((max_connections + autovacuum_max_workers + 4) / 16)</>.
     Lowering the number
     of allowed connections is a temporary workaround for failures,
     which are usually confusingly worded <quote>No space
@@ -834,16 +836,44 @@ options "SEMMNS=240"
 
        <para>
         <systemitem class="osname">FreeBSD</> versions before 4.0 work like
-        <systemitem class="osname">NetBSD</> and <systemitem class="osname">
-        OpenBSD</> (see below).
+        <systemitem class="osname">OpenBSD</> (see below).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
       <term><systemitem class="osname">NetBSD</></term>
-      <term><systemitem class="osname">OpenBSD</></term>
       <indexterm><primary>NetBSD</><secondary>IPC configuration</></>
+      <listitem>
+       <para>
+        In <systemitem class="osname">NetBSD</> 5.0 and later,
+        IPC parameters can be adjusted using <command>sysctl</command>,
+        for example:
+<screen>
+<prompt>$</prompt> <userinput>sysctl -w kern.ipc.shmmax=16777216</userinput>
+</screen>
+        To have these settings persist over reboots, modify
+        <filename>/etc/sysctl.conf</filename>.
+       </para>
+
+       <para>
+        You might also want to configure your kernel to lock shared
+        memory into RAM and prevent it from being paged out to swap.
+        This can be accomplished using the <command>sysctl</command>
+        setting <literal>kern.ipc.shm_use_phys</literal>.
+       </para>
+
+       <para>
+        <systemitem class="osname">NetBSD</> versions before 5.0 work like
+        <systemitem class="osname">OpenBSD</> (see below), except that
+        parameters should be set with the keyword <literal>options</> not
+        <literal>option</>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><systemitem class="osname">OpenBSD</></term>
       <indexterm><primary>OpenBSD</><secondary>IPC configuration</></>
       <listitem>
        <para>
@@ -851,19 +881,17 @@ options "SEMMNS=240"
         to be enabled when the kernel is compiled. (They are by
         default.) The maximum size of shared memory is determined by
         the option <varname>SHMMAXPGS</> (in pages). The following
-        shows an example of how to set the various parameters on
-        <systemitem class="osname">NetBSD</>
-        (<systemitem class="osname">OpenBSD</> uses <literal>option</> instead):
+        shows an example of how to set the various parameters:
 <programlisting>
-options        SYSVSHM
-options        SHMMAXPGS=4096
-options        SHMSEG=256
-
-options        SYSVSEM
-options        SEMMNI=256
-options        SEMMNS=512
-options        SEMMNU=256
-options        SEMMAP=256
+option        SYSVSHM
+option        SHMMAXPGS=4096
+option        SHMSEG=256
+
+option        SYSVSEM
+option        SEMMNI=256
+option        SEMMNS=512
+option        SEMMNU=256
+option        SEMMAP=256
 </programlisting>
        </para>
 
@@ -876,7 +904,6 @@ options        SEMMAP=256
       </listitem>
      </varlistentry>
 
-
      <varlistentry>
       <term><systemitem class="osname">HP-UX</></term>
       <indexterm><primary>HP-UX</><secondary>IPC configuration</></>
@@ -944,8 +971,8 @@ options        SEMMAP=256
 
 
      <varlistentry>
-      <term><systemitem class="osname">MacOS X</></term>
-      <indexterm><primary>MacOS X</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">Mac OS X</></term>
+      <indexterm><primary>Mac OS X</><secondary>IPC configuration</></>
       <listitem>
        <para>
         The recommended method for configuring shared memory in OS X
@@ -1341,7 +1368,7 @@ echo -17 > /proc/self/oom_adj
     Note that this action must be done as root, or it will have no effect;
     so a root-owned startup script is the easiest place to do it.  If you
     do this, you may also wish to build <productname>PostgreSQL</>
-    with <literal>-DLINUX_OOM_ADJ=0</> added to <varname>CFLAGS</>.
+    with <literal>-DLINUX_OOM_ADJ=0</> added to <varname>CPPFLAGS</>.
     That will cause postmaster child processes to run with the normal
     <varname>oom_adj</> value of zero, so that the OOM killer can still
     target them at need.
diff --git a/doc/src/sgml/sepgsql.sgml b/doc/src/sgml/sepgsql.sgml
index db9b64cc880a0..e9b9770b42422 100644
--- a/doc/src/sgml/sepgsql.sgml
+++ b/doc/src/sgml/sepgsql.sgml
@@ -8,15 +8,15 @@
  </indexterm>
 
  <para>
-  <filename>sepgsql</> is a loadable module which supports label-based
+  <filename>sepgsql</> is a loadable module that supports label-based
   mandatory access control (MAC) based on <productname>SELinux</> security
   policy.
  </para>
 
  <warning>
    <para>
-     This implementation has signification limitations, and does not enforce
-     mandatory access control for all actions.  See
+     The current implementation has significant limitations, and does not
+     enforce mandatory access control for all actions.  See
      <xref linkend="sepgsql-limitations">.
    </para>
  </warning>
@@ -31,8 +31,8 @@
    <productname>SELinux</>, this module allows
    <productname>PostgreSQL</productname> to function as a user-space object
    manager.  Each table or function access initiated by a DML query will be
-   checked against the system security policy.  This check is an additional to
-   the usual permissions checking performed by
+   checked against the system security policy.  This check is in addition to
+   the usual SQL permissions checking performed by
    <productname>PostgreSQL</productname>.
   </para>
 
@@ -45,7 +45,7 @@
    to be performed.  Since these labels can be applied to any sort of object,
    access control decisions for objects stored within the database can be
    (and, with this module, are) subjected to the same general criteria used
-   for objects of any other type (e.g. files).  This design is intended to
+   for objects of any other type, such as files.  This design is intended to
    allow a centralized security policy to protect information assets
    independent of the particulars of how those assets are stored.
   </para>
@@ -60,18 +60,18 @@
   <title>Installation</title>
 
   <para>
-    This module can only be used on <productname>Linux</productname> 2.6.28
-    or higher with <productname>SELinux</productname> enabled.  It is not
-    available on any other platform, and must be explicitly enabled using
-    <literal>--with-selinux</>.  You will also need <productname>libselinux</>
-    2.0.93 or higher and <productname>selinux-policy</> 3.9.13 or higher
-    (some distributions may backport the necessary rules into older policy
+    <filename>sepgsql</> can only be used on <productname>Linux</productname>
+    2.6.28 or higher with <productname>SELinux</productname> enabled.
+    It is not available on any other platform.  You will also need
+    <productname>libselinux</> 2.0.93 or higher and
+    <productname>selinux-policy</> 3.9.13 or higher (although some
+    distributions may backport the necessary rules into older policy
     versions).
   </para>
 
   <para>
    The <command>sestatus</> command allows you to check the status of
-   <productname>SELinux</productname>.
+   <productname>SELinux</productname>.  A typical display is:
 <screen>
 $ sestatus
 SELinux status:                 enabled
@@ -86,29 +86,56 @@ Policy from config file:        targeted
   </para>
 
   <para>
-   To use this module, you must add include <literal>sepgsql</>
-   in <xref linkend="guc-shared-preload-libraries">.  The module will not
-   function if loaded in any other manner.  Once the module is loaded, you
+   To build this module, include the option <literal>--with-selinux</> in
+   your PostgreSQL <literal>configure</> command.  Be sure that the
+   <filename>libselinux-devel</> RPM is installed at build time.
+  </para>
+
+  <para>
+   To use this module, you must include <literal>sepgsql</>
+   in the <xref linkend="guc-shared-preload-libraries"> parameter in
+   <filename>postgresql.conf</>.  The module will not function correctly
+   if loaded in any other manner.  Once the module is loaded, you
    should execute <filename>sepgsql.sql</filename> in each database.
    This will install functions needed for security label management, and
    assign initial security labels.
   </para>
 
   <para>
-   The following instructions that assume your installation is under the
-   <filename>/usr/local/pgsql</> directory. Adjust the paths shown below as
-   appropriate for your installation.
+   Here is an example showing how to initialize a fresh database cluster
+   with <filename>sepgsql</> functions and security labels installed.
+   Adjust the paths shown as appropriate for your installation:
   </para>
 
 <screen>
+$ export PGDATA=/path/to/data/directory
 $ initdb
 $ vi $PGDATA/postgresql.conf
+  change
+    #shared_preload_libraries = ''                # (change requires restart)
+  to
+    shared_preload_libraries = 'sepgsql'          # (change requires restart)
 $ for DBNAME in template0 template1 postgres; do
-  postgres --single -F -O -c exit_on_error=true $DBNAME \
-      &lt; /usr/local/pgsql/share/contrib/sepgsql.sql &gt; /dev/null
+    postgres --single -F -c exit_on_error=true $DBNAME \
+      &lt;/usr/local/pgsql/share/contrib/sepgsql.sql &gt;/dev/null
   done
 </screen>
 
+  <para>
+   Please note that you may see some or all of the following notifications
+   depending on the particular versions you have of
+   <productname>libselinux</> and <productname>selinux-policy</>:
+<screen>
+/etc/selinux/targeted/contexts/sepgsql_contexts:  line 33 has invalid object type db_blobs
+/etc/selinux/targeted/contexts/sepgsql_contexts:  line 36 has invalid object type db_language
+/etc/selinux/targeted/contexts/sepgsql_contexts:  line 37 has invalid object type db_language
+/etc/selinux/targeted/contexts/sepgsql_contexts:  line 38 has invalid object type db_language
+/etc/selinux/targeted/contexts/sepgsql_contexts:  line 39 has invalid object type db_language
+/etc/selinux/targeted/contexts/sepgsql_contexts:  line 40 has invalid object type db_language
+</screen>
+   These messages are harmless and should be ignored.
+  </para>
+
   <para>
    If the installation process completes without error, you can now start the
    server normally.
@@ -117,61 +144,70 @@ $ for DBNAME in template0 template1 postgres; do
 
  <sect2 id="sepgsql-regression">
   <title>Regression Tests</title>
+
   <para>
    Due to the nature of <productname>SELinux</productname>, running the
-   regression tests for this module requires several additional configuration
-   steps.
+   regression tests for <filename>sepgsql</> requires several extra
+   configuration steps, some of which must be done as root.
+   The regression tests will not be run by an ordinary
+   <literal>make check</> or <literal>make installcheck</> command; you must
+   set up the configuration and then invoke the test script manually.
+   The tests must be run in the <filename>contrib/sepgsql</> directory
+   of a configured PostgreSQL build tree.  Although they require a build tree,
+   the tests are designed to be executed against an installed server,
+   that is they are comparable to <literal>make installcheck</> not
+   <literal>make check</>.
   </para>
 
   <para>
-   First, build and install the policy package for the regression test.
-   The <filename>sepgsql-regtest.pp</> is a special purpose policy package
+   First, set up <filename>sepgsql</filename> in a working database
+   according to the instructions in <xref linkend="sepgsql-installation">.
+   Note that the current operating system user must be able to connect to the
+   database as superuser without password authentication.
+  </para>
+
+  <para>
+   Second, build and install the policy package for the regression test.
+   The <filename>sepgsql-regtest</> policy is a special purpose policy package
    which provides a set of rules to be allowed during the regression tests.
-   It should be built from the policy source file 
-   (<filename>sepgsql-regtest.te</>), which is normally done using
-   <command>make</command>.  You will need to locate the appropriate
+   It should be built from the policy source file
+   <filename>sepgsql-regtest.te</>, which is done using
+   <command>make</command> with a Makefile supplied by SELinux.
+   You will need to locate the appropriate
    Makefile on your system; the path shown below is only an example.
-   Once built, you can install this policy package using the
-   <command>semodule</> command, which links supplied policy packages and
-   loads them into the kernel space.  If this package is correctly installed,
+   Once built, install this policy package using the
+   <command>semodule</> command, which loads supplied policy packages
+   into the kernel.  If the package is correctly installed,
    <literal><command>semodule</> -l</> should list sepgsql-regtest as an
-   available policy package.
+   available policy package:
   </para>
 
 <screen>
-$ make -C ./contrib/sepgsql -f /usr/share/selinux/devel/Makefile
-$ su
-# semodule -u ./contrib/sepgsql/sepgsql-regtest.pp
-# semodule -l
-    :
+$ cd .../contrib/sepgsql
+$ make -f /usr/share/selinux/devel/Makefile
+$ sudo semodule -u sepgsql-regtest.pp
+$ sudo semodule -l | grep sepgsql
 sepgsql-regtest 1.03
-    :
 </screen>
 
   <para>
-   Second, turn on <literal>sepgsql_regression_test_mode</>.
-   We don't enable all the rules in the <filename>sepgsql-regtest.pp</>
+   Third, turn on <literal>sepgsql_regression_test_mode</>.
+   We don't enable all the rules in <filename>sepgsql-regtest</>
    by default, for your system's safety.
-   The <literal>sepgsql_regression_test_mode</literal> parameter is associated
-   with rules to launch regression test.
-   It can be turned on using <command>setsebool</> command.
+   The <literal>sepgsql_regression_test_mode</literal> parameter enables
+   the rules needed to launch the regression tests.
+   It can be turned on using the <command>setsebool</> command:
   </para>
 
 <screen>
-$ su
-# setsebool sepgsql_regression_test_mode on
-# getsebool sepgsql_regression_test_mode
+$ sudo setsebool sepgsql_regression_test_mode on
+$ getsebool sepgsql_regression_test_mode
 sepgsql_regression_test_mode --> on
 </screen>
 
   <para>
-   Last, kick the regression test from the <literal>unconfined_t</> domain.
-  </para>
-
-  <para>
-   The <command>id</> command tells us the current working domain.
-   Confirm your shell is now performing with the <literal>unconfined_t</>
-   domain as follows.
+   Fourth, verify your shell is operating in the <literal>unconfined_t</>
+   domain:
   </para>
 <screen>
 $ id -Z
@@ -184,15 +220,34 @@ unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
   </para>
 
   <para>
-   If <command>pg_regress</> fails to launch the <command>psql</> command,
-   you may need to ensure that the <command>psql</> command is labeled
-   as <literal>bin_t</>.  If it is not, the <command>restorecon</> command can
-   often be used to fix up security labels within the
-   <productname>PostgreSQL</productname> installation directory.
+   Finally, run the regression test script:
+  </para>
+<screen>
+$ ./test_sepgsql
+</screen>
+
+  <para>
+   This script will attempt to verify that you have done all the configuration
+   steps correctly, and then it will run the regression tests for the
+   <filename>sepgsql</> module.
+  </para>
+
+  <para>
+   After completing the tests, it's recommended you disable
+   the <literal>sepgsql_regression_test_mode</literal> parameter:
   </para>
 
 <screen>
-$ restorecon -R /usr/local/pgsql/
+$ sudo setsebool sepgsql_regression_test_mode off
+</screen>
+
+  <para>
+   You might prefer to remove the <filename>sepgsql-regtest</> policy
+   entirely:
+  </para>
+
+<screen>
+$ sudo semodule -r sepgsql-regtest
 </screen>
  </sect2>
 
@@ -207,7 +262,7 @@ $ restorecon -R /usr/local/pgsql/
     </indexterm>
     <listitem>
      <para>
-      This parameter enables <productname>SE-PostgreSQL</> to function
+      This parameter enables <filename>sepgsql</> to function
       in permissive mode, regardless of the system setting.
       The default is off.
       This parameter can only be set in the <filename>postgresql.conf</>
@@ -215,8 +270,8 @@ $ restorecon -R /usr/local/pgsql/
      </para>
 
      <para>
-      When this parameter is on, <productname>SE-PostgreSQL</> functions
-      in permissive mode, even if the platform system is working in enforcing
+      When this parameter is on, <filename>sepgsql</> functions
+      in permissive mode, even if SELinux in general is working in enforcing
       mode.  This parameter is primarily useful for testing purposes.
      </para>
     </listitem>
@@ -229,9 +284,10 @@ $ restorecon -R /usr/local/pgsql/
     </indexterm>
     <listitem>
      <para>
-      This parameter enables the printing of audit messages independent from
-      the policy setting.
-      The default is off (according to the security policy setting).
+      This parameter enables the printing of audit messages regardless of
+      the system policy settings.
+      The default is off, which means that messages will be printed according
+      to the system settings.
      </para>
 
      <para>
@@ -256,19 +312,20 @@ $ restorecon -R /usr/local/pgsql/
    <title>Controlled Object Classes</title>
    <para>
     The security model of <productname>SELinux</> describes all the access
-    control rules as a relationship between a subject entity (typically,
-    it is a client of database) and an object entity, each of which is
+    control rules as relationships between a subject entity (typically,
+    a client of the database) and an object entity (such as a database
+    object), each of which is
     identified by a security label.  If access to an unlabelled object is
     attempted, the object is treated as if it were assigned the label
     <literal>unlabeled_t</>.
    </para>
 
    <para>
-    Currently, <productname>sepgsql</productname> allows security labels to be
+    Currently, <filename>sepgsql</filename> allows security labels to be
     assigned to schemas, tables, columns, sequences, views, and functions.
-    When <productname>sepgsql</productname> is in use, security labels are
+    When <filename>sepgsql</filename> is in use, security labels are
     automatically assigned to supported database objects at creation time.
-    This label is called as a default security label, being decided according
+    This label is called a default security label, and is decided according
     to the system security policy, which takes as input the creator's label
     and the label assigned to the new object's parent object.
    </para>
@@ -277,9 +334,9 @@ $ restorecon -R /usr/local/pgsql/
     A new database object basically inherits the security label of the parent
     object, except when the security policy has special rules known as
     type-transition rules, in which case a different label may be applied.
-    For schemas, the parent object is the current database; for columns, it
-    is the corresponding table; for tables, sequences, views, and functions,
-    it is the containing schema.
+    For schemas, the parent object is the current database; for tables,
+    sequences, views, and functions, it is the containing schema; for columns,
+    it is the containing table.
    </para>
   </sect3>
 
@@ -289,41 +346,29 @@ $ restorecon -R /usr/local/pgsql/
    <para>
     For tables, <literal>db_table:select</>, <literal>db_table:insert</>,
     <literal>db_table:update</> or <literal>db_table:delete</> is
-    checked for all the referenced target tables depending on the sort of
+    checked for all the referenced target tables depending on the kind of
     statement;
     in addition, <literal>db_table:select</> is also checked for
     all the tables that contain the columns referenced in the
     <literal>WHERE</> or <literal>RETURNING</> clause, as a data source
-    of <literal>UPDATE</>, and so on.
-   </para>
+    of <literal>UPDATE</>, and so on.  For example, consider:
 
-   <para>
 <synopsis>
 UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
 </synopsis>
 
-    In this case, we must have <literal>db_table:select</> in addition to
+    In this case we must have <literal>db_table:select</> in addition to
     <literal>db_table:update</>, because <literal>t1.a</> is referenced
     within the <literal>WHERE</> clause.  Column-level permissions will also be
     checked for each referenced column.
    </para>
 
-   <para>
-    The client must be allowed to access all referenced tables and
-    columns, even if they originated from views which were then expanded,
-    so that we apply consistent access control rules independent of the manner
-    in which the table contents are referenced.
-   </para>
-
    <para>
     For columns, <literal>db_column:select</> is checked on
-    not only the columns being read using <literal>SELECT</>, but being
+    not only the columns being read using <literal>SELECT</>, but those being
     referenced in other DML statements.
-   </para>
-
-   <para>
     Of course, it also checks <literal>db_column:update</> or
-    <literal>db_column:insert</> on the column being modified by
+    <literal>db_column:insert</> on columns being modified by
     <literal>UPDATE</> or <literal>INSERT</>.
    </para>
 
@@ -331,11 +376,11 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
 <synopsis>
 UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
 </synopsis>
-    In this case, it checks <literal>db_column:update</> on
-    the <literal>t1.x</> being updated, <literal>db_column:{select update}</>
-    on the <literal>t1.y</> being updated and referenced,
-    and <literal>db_column:select</> on the <literal>t1.z</> being only
-    referenced in the <literal>WHERE</> clause.
+    In this case, it checks <literal>db_column:update</> on the column
+    <literal>t1.x</> being updated, <literal>db_column:{select update}</>
+    on the column <literal>t1.y</> being updated and referenced, and
+    <literal>db_column:select</> on the column <literal>t1.z</>, since that is
+    only referenced in the <literal>WHERE</> clause.
     <literal>db_table:{select update}</> will also be checked
     at the table level.
    </para>
@@ -348,43 +393,50 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
    </para>
 
    <para>
-    For views, <literal>db_view:expand</> shall be checked, then any other
-    corresponding permissions shall be also checked on the objects being
+    For views, <literal>db_view:expand</> will be checked, then any other
+    required permissions will be checked on the objects being
     expanded from the view, individually.
    </para>
 
    <para>
-    For functions, <literal>db_procedure:{execute}</> is defined, but not
+    For functions, <literal>db_procedure:{execute}</> is defined, but is not
     checked in this version.
    </para>
 
+   <para>
+    The client must be allowed to access all referenced tables and
+    columns, even if they originated from views which were then expanded,
+    so that we apply consistent access control rules independent of the manner
+    in which the table contents are referenced.
+   </para>
+
    <para>
     The default database privilege system allows database superusers to
     modify system catalogs using DML commands, and reference or modify
     toast tables.  These operations are prohibited when
-    <productname>sepgsql</> is enabled.
+    <filename>sepgsql</> is enabled.
    </para>
   </sect3>
 
   <sect3>
    <title>DDL Permissions</title>
    <para>
-    On <xref linkend="sql-security-label"> command, <literal>setattr</> and
-    <literal>relabelfrom</> shall be checked on the object being relabeled
-    with an old security label, then <literal>relabelto</> on the supplied
+    When <xref linkend="sql-security-label"> is executed, <literal>setattr</>
+    and <literal>relabelfrom</> will be checked on the object being relabeled
+    with its old security label, then <literal>relabelto</> with the supplied
     new security label.
    </para>
 
    <para>
     In the case where multiple label providers are installed and the user tries
-    to set a security label, but is not managed by <productname>SELinux</>,
+    to set a security label, but it is not managed by <productname>SELinux</>,
     only <literal>setattr</> should be checked here.
-    This is currently not checked due to implementation restrictions.
+    This is currently not done due to implementation restrictions.
    </para>
   </sect3>
 
   <sect3>
-   <title>Trusted Procedure</title>
+   <title>Trusted Procedures</title>
    <para>
     Trusted procedures are similar to security definer functions or set-uid
     commands. <productname>SELinux</> provides a feature to allow trusted
@@ -433,9 +485,9 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
 
    <para>
     In this case, a regular user cannot reference <literal>customer.credit</>
-    directly, but a trusted procedure <literal>show_credit</> enables us
-    to print the credit card number of customers with some of the digits masked
-    out.
+    directly, but a trusted procedure <literal>show_credit</> allows him
+    to print the credit card numbers of customers with some of the digits
+    masked out.
    </para>
   </sect3>
 
@@ -453,16 +505,6 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
   <title>Limitations</title>
 
   <variablelist>
-   <varlistentry>
-    <term>Userspace access vector cache</term>
-    <listitem>
-     <para>
-      <productname>sepgsql</> does not yet support an access vector cache.
-      This would likely improve performance.
-     </para>
-    </listitem>
-   </varlistentry>
-
    <varlistentry>
     <term>Data Definition Language (DDL) Permissions</term>
     <listitem>
@@ -486,7 +528,7 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
     <listitem>
      <para>
       <productname>PostgreSQL</> does not support row-level access; therefore,
-      <productname>sepgsql</productname> does not support it either.
+      <filename>sepgsql</filename> does not support it either.
      </para>
     </listitem>
    </varlistentry>
@@ -495,11 +537,11 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
     <term>Covert channels</term>
     <listitem>
      <para>
-      <productname>sepgsql</> never tries to hide existence of
-      a certain object, even if the user is not allowed to the reference.
+      <filename>sepgsql</> does not try to hide the existence of
+      a certain object, even if the user is not allowed to reference it.
       For example, we can infer the existence of an invisible object as
       a result of primary key conflicts, foreign key violations, and so on,
-      even if we cannot reference contents of these objects.  The existence
+      even if we cannot obtain the contents of the object.  The existence
       of a top secret table cannot be hidden; we only hope to conceal its
       contents.
      </para>
@@ -515,7 +557,7 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
     <term><ulink url="http://wiki.postgresql.org/wiki/SEPostgreSQL">SE-PostgreSQL Introduction</ulink></term>
     <listitem>
      <para>
-      This wiki page provides a brief-overview, security design, architecture,
+      This wiki page provides a brief overview, security design, architecture,
       administration and upcoming features.
      </para>
     </listitem>
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index ac8f462de0ea9..4ed83d6189b93 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -214,13 +214,12 @@ ereport(ERROR,
    </listitem>
    <listitem>
     <para>
-     <function>errdetail_log(const char *msg, ...)</function> is the same as
-     <function>errdetail</> except that this string goes only to the server
-     log, never to the client.  If both <function>errdetail</> and
-     <function>errdetail_log</> are used then one string goes to the client
-     and the other to the log.  This is useful for error details that are
-     too security-sensitive or too bulky to include in the report
-     sent to the client.
+     <function>errdetail_internal(const char *msg, ...)</function> is the same
+     as <function>errdetail</>, except that the message string will not be
+     translated nor included in the internationalization message dictionary.
+     This should be used for detail messages that are not worth expending
+     translation effort on, for instance because they are too technical to be
+     useful to most users.
     </para>
    </listitem>
    <listitem>
@@ -231,6 +230,18 @@ ereport(ERROR,
      For more information see <xref linkend="nls-guidelines">.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <function>errdetail_log(const char *msg, ...)</function> is the same as
+     <function>errdetail</> except that this string goes only to the server
+     log, never to the client.  If both <function>errdetail</> (or one of
+     its equivalents above) and
+     <function>errdetail_log</> are used then one string goes to the client
+     and the other to the log.  This is useful for error details that are
+     too security-sensitive or too bulky to include in the report
+     sent to the client.
+    </para>
+   </listitem>
    <listitem>
     <para>
      <function>errhint(const char *msg, ...)</function> supplies an optional
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 512c96f9bde8a..1b41cb40b3c5f 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -392,8 +392,7 @@ typedef struct
     TupleDesc   tupdesc;        /* row descriptor */
     HeapTuple  *vals;           /* rows */
 } SPITupleTable;
-</programlisting>
-   <structfield>vals</> is an array of pointers to rows.  (The number
+</programlisting><structfield>vals</> is an array of pointers to rows.  (The number
    of valid entries is given by <varname>SPI_processed</varname>.)
    <structfield>tupdesc</> is a row descriptor which you can pass to
    SPI functions dealing with rows.  <structfield>tuptabcxt</>,
@@ -425,9 +424,7 @@ typedef struct
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -803,9 +800,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -1231,7 +1226,7 @@ Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argI
 
   <para>
    <function>SPI_getargtypeid</function> returns the OID representing the type
-   id for the <parameter>argIndex</parameter>'th argument of a plan prepared by
+   for the <parameter>argIndex</parameter>'th argument of a plan prepared by
    <function>SPI_prepare</function>. First argument is at index zero.
   </para>
  </refsect1>
@@ -1263,7 +1258,7 @@ Oid SPI_getargtypeid(SPIPlanPtr <parameter>plan</parameter>, int <parameter>argI
  <refsect1>
   <title>Return Value</title>
   <para>
-    The type id of the argument at the given index.
+    The type OID of the argument at the given index.
     If the <parameter>plan</parameter> is <symbol>NULL</symbol> or invalid,
     or <parameter>argIndex</parameter> is less than 0 or
     not less than the number of arguments declared for the
@@ -1421,9 +1416,7 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -1540,9 +1533,7 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -1777,9 +1768,7 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -1915,9 +1904,7 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -2022,9 +2009,7 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para>
-      <literal>true</> for read-only execution
-     </para>
+     <para><literal>true</> for read-only execution</para>
     </listitem>
    </varlistentry>
   </variablelist>
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index 90c3e061b24da..0a133bb7c7e81 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -121,7 +121,7 @@ last started with</entry>
 
 <row>
  <entry><filename>postmaster.pid</></entry>
- <entry>A lock file recording the current postmaster process id (PID),
+ <entry>A lock file recording the current postmaster process ID (PID),
   cluster data directory path,
   postmaster start timestamp,
   port number,
diff --git a/doc/src/sgml/stylesheet-man.xsl b/doc/src/sgml/stylesheet-man.xsl
index 8c614ca754df5..822b082522bde 100644
--- a/doc/src/sgml/stylesheet-man.xsl
+++ b/doc/src/sgml/stylesheet-man.xsl
@@ -8,19 +8,6 @@
 <xsl:import href="stylesheet-common.xsl" />
 
 
-<!-- The following is a workaround for what may actually be a mistake
-     in our markup.  The problem is in a situation like
-
-<para>
- <command>FOO</command> is ...
-
-     there is strictly speaking a line break before "FOO".  In the
-     HTML output, this does not appear to be a problem, but in the man
-     page output, this shows up.  Using this setting, pure whitespace
-     text nodes are removed, so the problem is solved. -->
-<xsl:strip-space elements="para"/>
-
-
 <!-- Parameters -->
 
 <xsl:param name="man.authors.section.enabled">0</xsl:param>
diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl
index 637758ff429eb..232fa58e516a5 100644
--- a/doc/src/sgml/stylesheet.dsl
+++ b/doc/src/sgml/stylesheet.dsl
@@ -298,8 +298,6 @@
 				      (nav-banner elemnode)))))
 	 (r2? (or (not (node-list-empty? prev))
 		  (not (node-list-empty? next))
-		  (not (node-list-empty? prevsib))
-		  (not (node-list-empty? nextsib))
 		  (nav-context? elemnode)))
 	 (r2-sosofo (make element gi: "TR"
 			  (make element gi: "TD"
@@ -323,15 +321,9 @@
 					     (list "WIDTH" "10%")
 					     (list "ALIGN" "left")
 					     (list "VALIGN" "top"))
-				(if (node-list-empty? prevsib)
-				    (make entity-ref name: "nbsp")
-				    (make element gi: "A"
-					  attributes: (list
-						       (list "TITLE" (element-title-string prevsib))
-						       (list "HREF"
-							     (href-to
-							      prevsib)))
-					  (gentext-nav-prev-sibling prevsib))))
+				(if (nav-up? elemnode)
+				    (nav-up elemnode)
+				    (nav-home-link elemnode)))
 			  (make element gi: "TD"
 				attributes: (list
 					     (list "WIDTH" "60%")
@@ -340,21 +332,7 @@
 				(nav-context elemnode))
 			  (make element gi: "TD"
 				attributes: (list
-					     (list "WIDTH" "10%")
-					     (list "ALIGN" "right")
-					     (list "VALIGN" "top"))
-				(if (node-list-empty? nextsib)
-				    (make entity-ref name: "nbsp")
-				    (make element gi: "A"
-					  attributes: (list
-						       (list "TITLE" (element-title-string nextsib))
-						       (list "HREF"
-							     (href-to
-							      nextsib)))
-					  (gentext-nav-next-sibling nextsib))))
-			  (make element gi: "TD"
-				attributes: (list
-					     (list "WIDTH" "10%")
+					     (list "WIDTH" "20%")
 					     (list "ALIGN" "right")
 					     (list "VALIGN" "top"))
 				(if (node-list-empty? next)
diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index dba5bd6603ed7..8cb66248218b6 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -867,7 +867,7 @@ ts_rank(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>fl
 
       <listitem>
        <para>
-        Standard ranking function.<!-- TODO document this better -->
+        Ranks vectors based on the frequency of their matching lexems.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index f233e9d712e0d..cca45eb569875 100644
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -758,9 +758,11 @@ cast is a cast from that type to itself.  If one is found in the
 <structname>pg_cast</> catalog, apply it to the expression before storing
 into the destination column.  The implementation function for such a cast
 always takes an extra parameter of type <type>integer</type>, which receives
-the destination column's declared length (actually, its
-<structfield>atttypmod</> value; the interpretation of
-<structfield>atttypmod</> varies for different data types).  The cast function
+the destination column's <structfield>atttypmod</> value (typically its
+declared length, although the interpretation of <structfield>atttypmod</>
+varies for different data types), and it may take a third <type>boolean</>
+parameter that says whether the cast is explicit or implicit.  The cast
+function
 is responsible for applying any length-dependent semantics such as size
 checking or truncation.
 </para>
@@ -772,17 +774,17 @@ checking or truncation.
 <title><type>character</type> Storage Type Conversion</title>
 
 <para>
-For a target column declared as <type>character(20)</type> the following statement
-ensures that the stored value is sized correctly:
+For a target column declared as <type>character(20)</type> the following
+statement shows that the stored value is sized correctly:
 
 <screen>
 CREATE TABLE vv (v character(20));
 INSERT INTO vv SELECT 'abc' || 'def';
-SELECT v, length(v) FROM vv;
+SELECT v, octet_length(v) FROM vv;
 
-          v           | length
-----------------------+--------
- abcdef               |     20
+          v           | octet_length
+----------------------+--------------
+ abcdef               |           20
 (1 row)
 </screen>
 </para>
@@ -796,7 +798,7 @@ char</>, the internal name of the <type>character</type> data type) to match the
 column type.  (Since the conversion from <type>text</type> to
 <type>bpchar</type> is binary-coercible, this conversion does
 not insert any real function call.)  Finally, the sizing function
-<literal>bpchar(bpchar, integer)</literal> is found in the system catalog
+<literal>bpchar(bpchar, integer, boolean)</> is found in the system catalog
 and applied to the operator's result and the stored column length.  This
 type-specific function performs the required length check and addition of
 padding spaces.
diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml
index 4d111903a76fd..ff825eca3b8f8 100644
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@ -87,7 +87,9 @@
         On <productname>FreeBSD</>, IDE drives can be queried using
         <command>atacontrol</command> and write caching turned off using
         <literal>hw.ata.wc=0</> in <filename>/boot/loader.conf</>;
-        SCSI drives use <command>sdparm</command>.
+        SCSI drives can be queried using <command>camcontrol identify</command>,
+        and the write cache both queried and changed using
+        <command>sdparm</command> when available.
       </para>
     </listitem>
 
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 56f282712db21..3bf658d6b0c87 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -19,6 +19,8 @@
 # Meta configuration
 
 standard_targets = all install installdirs uninstall distprep clean distclean maintainer-clean coverage check installcheck maintainer-check
+# these targets should recurse even into subdirectories not being built:
+standard_always_targets = distprep clean distclean maintainer-clean
 
 .PHONY: $(standard_targets) install-strip html man installcheck-parallel
 
@@ -263,7 +265,7 @@ X = @EXEEXT@
 
 ifneq (@PERL@,)
     # quoted to protect pathname with spaces
-    PERL		= "@PERL@"
+    PERL		= '@PERL@'
 else
     PERL		= $(missing) perl
 endif
@@ -437,7 +439,7 @@ endif
 pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
 
 pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags)
-pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(pg_regress_locale_flags)
+pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags)
 
 pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
 
@@ -603,6 +605,16 @@ endef
 # $3: target to run in subdir (defaults to current element of $1)
 recurse = $(foreach target,$(if $1,$1,$(standard_targets)),$(foreach subdir,$(if $2,$2,$(SUBDIRS)),$(eval $(call _create_recursive_target,$(target),$(subdir),$(if $3,$3,$(target))))))
 
+# If a makefile's list of SUBDIRS varies depending on configuration, then
+# any subdirectories excluded from SUBDIRS should instead be added to
+# ALWAYS_SUBDIRS, and then it must call recurse_always as well as recurse.
+# This ensures that distprep, distclean, etc will apply to all subdirectories.
+# In the normal case all arguments will be defaulted.
+# $1: targets to make recursive (defaults to standard_always_targets)
+# $2: list of subdirs (defaults to ALWAYS_SUBDIRS variable)
+# $3: target to run in subdir (defaults to current element of $1)
+recurse_always = $(foreach target,$(if $1,$1,$(standard_always_targets)),$(foreach subdir,$(if $2,$2,$(ALWAYS_SUBDIRS)),$(eval $(call _create_recursive_target,$(target),$(subdir),$(if $3,$3,$(target))))))
+
 
 ##########################################################################
 #
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index a5cf6c6c1681b..983abc37ebd97 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -130,7 +130,7 @@ ifeq ($(PORTNAME), darwin)
     ifneq ($(SO_MAJOR_VERSION), 0)
       version_link	= -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
     endif
-    LINK.shared		= $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress
+    LINK.shared		= $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
     shlib		= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
     shlib_major		= lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
   else
diff --git a/src/backend/Makefile b/src/backend/Makefile
index bbc59f76c735c..ec82d8d344ed7 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -164,27 +164,28 @@ utils/probes.h: utils/probes.d
 # For headers generated during regular builds, we prefer a relative symlink.
 
 $(top_builddir)/src/include/parser/gram.h: parser/gram.h
-	prereqdir=`cd $(dir $<) >/dev/null && pwd` && \
-	  cd $(dir $@) && rm -f $(notdir $@) && \
+	prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
+	  cd '$(dir $@)' && rm -f $(notdir $@) && \
 	  $(LN_S) "$$prereqdir/$(notdir $<)" .
 
 $(top_builddir)/src/include/catalog/schemapg.h: catalog/schemapg.h
-	prereqdir=`cd $(dir $<) >/dev/null && pwd` && \
-	  cd $(dir $@) && rm -f $(notdir $@) && \
+	prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
+	  cd '$(dir $@)' && rm -f $(notdir $@) && \
 	  $(LN_S) "$$prereqdir/$(notdir $<)" .
 
 $(top_builddir)/src/include/utils/errcodes.h: utils/errcodes.h
-	cd $(dir $@) && rm -f $(notdir $@) && \
-	    $(LN_S) ../../../$(subdir)/utils/errcodes.h .
+	prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
+	  cd '$(dir $@)' && rm -f $(notdir $@) && \
+	  $(LN_S) "$$prereqdir/$(notdir $<)" .
 
 $(top_builddir)/src/include/utils/fmgroids.h: utils/fmgroids.h
-	prereqdir=`cd $(dir $<) >/dev/null && pwd` && \
-	  cd $(dir $@) && rm -f $(notdir $@) && \
+	prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
+	  cd '$(dir $@)' && rm -f $(notdir $@) && \
 	  $(LN_S) "$$prereqdir/$(notdir $<)" .
 
 $(top_builddir)/src/include/utils/probes.h: utils/probes.h
-	cd $(dir $@) && rm -f $(notdir $@) && \
-	    $(LN_S) ../../../$(subdir)/utils/probes.h .
+	cd '$(dir $@)' && rm -f $(notdir $@) && \
+	    $(LN_S) "../../../$(subdir)/utils/probes.h" .
 
 
 utils/probes.o: utils/probes.d $(SUBDIROBJS)
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 175e6ea2f2e66..d6cf21972db6a 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -145,7 +145,6 @@ heap_fill_tuple(TupleDesc tupleDesc,
 #ifdef USE_ASSERT_CHECKING
 	char	   *start = data;
 #endif
-
 	if (bit != NULL)
 	{
 		bitP = &bit[-1];
@@ -190,7 +189,8 @@ heap_fill_tuple(TupleDesc tupleDesc,
 		 */
 
 		if (att[i]->attbyval)
-		{
+		  {
+
 			/* pass-by-value */
 			data = (char *) att_align_nominal(data, att[i]->attalign);
 			store_att_byval(data, values[i], att[i]->attlen);
@@ -665,11 +665,12 @@ heap_form_tuple(TupleDesc tupleDescriptor,
 				 att[i]->attalign == 'd' &&
 				 att[i]->attndims == 0 &&
 				 !VARATT_IS_EXTENDED(DatumGetPointer(values[i])))
-		{
-			values[i] = toast_flatten_tuple_attribute(values[i],
-													  att[i]->atttypid,
-													  att[i]->atttypmod);
-		}
+		  {
+		    	
+		  values[i] = toast_flatten_tuple_attribute(values[i],
+							    att[i]->atttypid,
+							    att[i]->atttypmod);
+		  }
 	}
 
 	/*
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 465742556f5b9..2dfdb36c76ecf 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -1176,7 +1176,7 @@ heap_reloptions(char relkind, Datum reloptions, bool validate)
 			return (bytea *) rdopts;
 		case RELKIND_RELATION:
 			return default_reloptions(reloptions, validate, RELOPT_KIND_HEAP);
-		default:
+	default:
 			/* other relkinds are not supported */
 			return NULL;
 	}
diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c
index c954bcb12fc8d..66d881e96dd98 100644
--- a/src/backend/access/gin/ginxlog.c
+++ b/src/backend/access/gin/ginxlog.c
@@ -529,6 +529,8 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
 							elog(ERROR, "failed to add item to index page");
 
 						tuples = (IndexTuple) (((char *) tuples) + tupsize);
+
+						off++;
 					}
 
 					/*
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 8227bfdb88ba8..4e732d1d8570f 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -714,7 +714,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
 				ereport(ERROR,
 						(errmsg("index \"%s\" contains an inner tuple marked as invalid",
 								RelationGetRelationName(r)),
-						 errdetail("This is caused by an incomplete page split at crash recovery before upgrading to 9.1."),
+						 errdetail("This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."),
 						 errhint("Please REINDEX it.")));
 
 			/*
@@ -883,9 +883,12 @@ gistFindPath(Relation r, BlockNumber child)
 
 		if (GistPageIsLeaf(page))
 		{
-			/* we can safety go away, follows only leaf pages */
+			/*
+			 * Because we scan the index top-down, all the rest of the pages
+			 * in the queue must be leaf pages as well.
+			 */
 			UnlockReleaseBuffer(buffer);
-			return NULL;
+			break;
 		}
 
 		top->lsn = PageGetLSN(page);
@@ -900,14 +903,25 @@ gistFindPath(Relation r, BlockNumber child)
 		if (top->parent && XLByteLT(top->parent->lsn, GistPageGetOpaque(page)->nsn) &&
 			GistPageGetOpaque(page)->rightlink != InvalidBlockNumber /* sanity check */ )
 		{
-			/* page splited while we thinking of... */
+			/*
+			 * Page was split while we looked elsewhere. We didn't see the
+			 * downlink to the right page when we scanned the parent, so
+			 * add it to the queue now.
+			 *
+			 * Put the right page ahead of the queue, so that we visit it
+			 * next. That's important, because if this is the lowest internal
+			 * level, just above leaves, we might already have queued up some
+			 * leaf pages, and we assume that there can't be any non-leaf
+			 * pages behind leaf pages.
+			 */
 			ptr = (GISTInsertStack *) palloc0(sizeof(GISTInsertStack));
 			ptr->blkno = GistPageGetOpaque(page)->rightlink;
 			ptr->childoffnum = InvalidOffsetNumber;
-			ptr->parent = top;
-			ptr->next = NULL;
-			tail->next = ptr;
-			tail = ptr;
+			ptr->parent = top->parent;
+			ptr->next = top->next;
+			top->next = ptr;
+			if (tail == top)
+				tail = ptr;
 		}
 
 		maxoff = PageGetMaxOffsetNumber(page);
@@ -963,7 +977,9 @@ gistFindPath(Relation r, BlockNumber child)
 		top = top->next;
 	}
 
-	return NULL;
+	elog(ERROR, "failed to re-find parent of a page in index \"%s\", block %u",
+		 RelationGetRelationName(r), child);
+	return NULL; /* keep compiler quiet */
 }
 
 /*
@@ -1034,7 +1050,6 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child)
 
 		/* ok, find new path */
 		ptr = parent = gistFindPath(r, child->blkno);
-		Assert(ptr != NULL);
 
 		/* read all buffers as expected by caller */
 		/* note we don't lock them or gistcheckpage them here! */
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 5662a3a4aab08..92405283d023c 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -242,6 +242,7 @@ gistendscan(PG_FUNCTION_ARGS)
 	GISTScanOpaque so = (GISTScanOpaque) scan->opaque;
 
 	freeGISTstate(so->giststate);
+	pfree(so->giststate);
 	MemoryContextDelete(so->queueCxt);
 	MemoryContextDelete(so->tempCxt);
 	pfree(so->tmpTreeItem);
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index 33e6f341548ad..50c6270b00592 100644
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -270,7 +270,7 @@ gistbulkdelete(PG_FUNCTION_ARGS)
 					ereport(LOG,
 							(errmsg("index \"%s\" contains an inner tuple marked as invalid",
 									RelationGetRelationName(rel)),
-							 errdetail("This is caused by an incomplete page split at crash recovery before upgrading to 9.1."),
+							 errdetail("This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."),
 							 errhint("Please REINDEX it.")));
 			}
 		}
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 01a492e496e90..cc8b45fd48941 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -274,7 +274,8 @@ heapgetpage(HeapScanDesc scan, BlockNumber page)
 			else
 				valid = HeapTupleSatisfiesVisibility(&loctup, snapshot, buffer);
 
-			CheckForSerializableConflictOut(valid, scan->rs_rd, &loctup, buffer);
+			CheckForSerializableConflictOut(valid, scan->rs_rd, &loctup,
+											buffer, snapshot);
 
 			if (valid)
 				scan->rs_vistuples[ntup++] = lineoff;
@@ -469,7 +470,8 @@ heapgettup(HeapScanDesc scan,
 													 snapshot,
 													 scan->rs_cbuf);
 
-				CheckForSerializableConflictOut(valid, scan->rs_rd, tuple, scan->rs_cbuf);
+				CheckForSerializableConflictOut(valid, scan->rs_rd, tuple,
+												scan->rs_cbuf, snapshot);
 
 				if (valid && key != NULL)
 					HeapKeyTest(tuple, RelationGetDescr(scan->rs_rd),
@@ -477,8 +479,6 @@ heapgettup(HeapScanDesc scan,
 
 				if (valid)
 				{
-					if (!scan->rs_relpredicatelocked)
-						PredicateLockTuple(scan->rs_rd, tuple);
 					LockBuffer(scan->rs_cbuf, BUFFER_LOCK_UNLOCK);
 					return;
 				}
@@ -746,16 +746,12 @@ heapgettup_pagemode(HeapScanDesc scan,
 							nkeys, key, valid);
 				if (valid)
 				{
-					if (!scan->rs_relpredicatelocked)
-						PredicateLockTuple(scan->rs_rd, tuple);
 					scan->rs_cindex = lineindex;
 					return;
 				}
 			}
 			else
 			{
-				if (!scan->rs_relpredicatelocked)
-					PredicateLockTuple(scan->rs_rd, tuple);
 				scan->rs_cindex = lineindex;
 				return;
 			}
@@ -1222,13 +1218,26 @@ heap_beginscan_internal(Relation relation, Snapshot snapshot,
 	scan->rs_strategy = NULL;	/* set in initscan */
 	scan->rs_allow_strat = allow_strat;
 	scan->rs_allow_sync = allow_sync;
-	scan->rs_relpredicatelocked = false;
 
 	/*
 	 * we can use page-at-a-time mode if it's an MVCC-safe snapshot
 	 */
 	scan->rs_pageatatime = IsMVCCSnapshot(snapshot);
 
+	/*
+	 * For a seqscan in a serializable transaction, acquire a predicate lock
+	 * on the entire relation. This is required not only to lock all the
+	 * matching tuples, but also to conflict with new insertions into the
+	 * table. In an indexscan, we take page locks on the index pages covering
+	 * the range specified in the scan qual, but in a heap scan there is
+	 * nothing more fine-grained to lock. A bitmap scan is a different story,
+	 * there we have already scanned the index and locked the index pages
+	 * covering the predicate. But in that case we still have to lock any
+	 * matching heap tuples.
+	 */
+	if (!is_bitmapscan)
+		PredicateLockRelation(relation, snapshot);
+
 	/* we only need to set this up once */
 	scan->rs_ctup.t_tableOid = RelationGetRelid(relation);
 
@@ -1470,9 +1479,9 @@ heap_fetch(Relation relation,
 	valid = HeapTupleSatisfiesVisibility(tuple, snapshot, buffer);
 
 	if (valid)
-		PredicateLockTuple(relation, tuple);
+		PredicateLockTuple(relation, tuple, snapshot);
 
-	CheckForSerializableConflictOut(valid, relation, tuple, buffer);
+	CheckForSerializableConflictOut(valid, relation, tuple, buffer, snapshot);
 
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
@@ -1588,11 +1597,12 @@ heap_hot_search_buffer(ItemPointer tid, Relation relation, Buffer buffer,
 
 		/* If it's visible per the snapshot, we must return it */
 		valid = HeapTupleSatisfiesVisibility(&heapTuple, snapshot, buffer);
-		CheckForSerializableConflictOut(valid, relation, &heapTuple, buffer);
+		CheckForSerializableConflictOut(valid, relation, &heapTuple, buffer,
+										snapshot);
 		if (valid)
 		{
 			ItemPointerSetOffsetNumber(tid, offnum);
-			PredicateLockTuple(relation, &heapTuple);
+			PredicateLockTuple(relation, &heapTuple, snapshot);
 			if (all_dead)
 				*all_dead = false;
 			return true;
@@ -1750,7 +1760,7 @@ heap_get_latest_tid(Relation relation,
 		 * result candidate.
 		 */
 		valid = HeapTupleSatisfiesVisibility(&tp, snapshot, buffer);
-		CheckForSerializableConflictOut(valid, relation, &tp, buffer);
+		CheckForSerializableConflictOut(valid, relation, &tp, buffer, snapshot);
 		if (valid)
 			*tid = ctid;
 
@@ -1911,17 +1921,22 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	else
 		heaptup = tup;
 
+	/*
+	 * We're about to do the actual insert -- but check for conflict first,
+	 * to avoid possibly having to roll back work we've just done.
+	 *
+	 * For a heap insert, we only need to check for table-level SSI locks.
+	 * Our new tuple can't possibly conflict with existing tuple locks, and
+	 * heap page locks are only consolidated versions of tuple locks; they do
+	 * not lock "gaps" as index page locks do.  So we don't need to identify
+	 * a buffer before making the call.
+	 */
+	CheckForSerializableConflictIn(relation, NULL, InvalidBuffer);
+
 	/* Find buffer to insert this tuple into */
 	buffer = RelationGetBufferForTuple(relation, heaptup->t_len,
 									   InvalidBuffer, options, bistate);
 
-	/*
-	 * We're about to do the actual insert -- check for conflict at the
-	 * relation or buffer level first, to avoid possibly having to roll back
-	 * work we've just done.
-	 */
-	CheckForSerializableConflictIn(relation, NULL, buffer);
-
 	/* NO EREPORT(ERROR) from here till changes are logged */
 	START_CRIT_SECTION();
 
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index 4f4dd69291fd5..2f0676f425fd4 100644
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -74,7 +74,9 @@ do { \
 
 
 static void toast_delete_datum(Relation rel, Datum value);
-static Datum toast_save_datum(Relation rel, Datum value, int options);
+static Datum toast_save_datum(Relation rel, Datum value,
+				 struct varlena *oldexternal, int options);
+static bool toast_valueid_exists(Oid toastrelid, Oid valueid);
 static struct varlena *toast_fetch_datum(struct varlena * attr);
 static struct varlena *toast_fetch_datum_slice(struct varlena * attr,
 						int32 sliceoffset, int32 length);
@@ -431,6 +433,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	bool		toast_oldisnull[MaxHeapAttributeNumber];
 	Datum		toast_values[MaxHeapAttributeNumber];
 	Datum		toast_oldvalues[MaxHeapAttributeNumber];
+	struct varlena *toast_oldexternal[MaxHeapAttributeNumber];
 	int32		toast_sizes[MaxHeapAttributeNumber];
 	bool		toast_free[MaxHeapAttributeNumber];
 	bool		toast_delold[MaxHeapAttributeNumber];
@@ -466,6 +469,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	 * ----------
 	 */
 	memset(toast_action, ' ', numAttrs * sizeof(char));
+	memset(toast_oldexternal, 0, numAttrs * sizeof(struct varlena *));
 	memset(toast_free, 0, numAttrs * sizeof(bool));
 	memset(toast_delold, 0, numAttrs * sizeof(bool));
 
@@ -550,6 +554,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 			 */
 			if (VARATT_IS_EXTERNAL(new_value))
 			{
+				toast_oldexternal[i] = new_value;
 				if (att[i]->attstorage == 'p')
 					new_value = heap_tuple_untoast_attr(new_value);
 				else
@@ -592,7 +597,6 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	if (newtup->t_data->t_infomask & HEAP_HASOID)
 		hoff += sizeof(Oid);
 	hoff = MAXALIGN(hoff);
-	Assert(hoff == newtup->t_data->t_hoff);
 	/* now convert to a limit on the tuple data size */
 	maxDataLen = TOAST_TUPLE_TARGET - hoff;
 
@@ -676,7 +680,8 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		{
 			old_value = toast_values[i];
 			toast_action[i] = 'p';
-			toast_values[i] = toast_save_datum(rel, toast_values[i], options);
+			toast_values[i] = toast_save_datum(rel, toast_values[i],
+											   toast_oldexternal[i], options);
 			if (toast_free[i])
 				pfree(DatumGetPointer(old_value));
 			toast_free[i] = true;
@@ -726,7 +731,8 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		i = biggest_attno;
 		old_value = toast_values[i];
 		toast_action[i] = 'p';
-		toast_values[i] = toast_save_datum(rel, toast_values[i], options);
+		toast_values[i] = toast_save_datum(rel, toast_values[i],
+										   toast_oldexternal[i], options);
 		if (toast_free[i])
 			pfree(DatumGetPointer(old_value));
 		toast_free[i] = true;
@@ -839,7 +845,8 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		i = biggest_attno;
 		old_value = toast_values[i];
 		toast_action[i] = 'p';
-		toast_values[i] = toast_save_datum(rel, toast_values[i], options);
+		toast_values[i] = toast_save_datum(rel, toast_values[i],
+										   toast_oldexternal[i], options);
 		if (toast_free[i])
 			pfree(DatumGetPointer(old_value));
 		toast_free[i] = true;
@@ -856,43 +863,54 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	{
 		HeapTupleHeader olddata = newtup->t_data;
 		HeapTupleHeader new_data;
-		int32		new_len;
+		int32		new_header_len;
 		int32		new_data_len;
+		int32		new_tuple_len;
 
 		/*
-		 * Calculate the new size of the tuple.  Header size should not
-		 * change, but data size might.
+		 * Calculate the new size of the tuple.
+		 *
+		 * Note: we used to assume here that the old tuple's t_hoff must equal
+		 * the new_header_len value, but that was incorrect.  The old tuple
+		 * might have a smaller-than-current natts, if there's been an ALTER
+		 * TABLE ADD COLUMN since it was stored; and that would lead to a
+		 * different conclusion about the size of the null bitmap, or even
+		 * whether there needs to be one at all.
 		 */
-		new_len = offsetof(HeapTupleHeaderData, t_bits);
+		new_header_len = offsetof(HeapTupleHeaderData, t_bits);
 		if (has_nulls)
-			new_len += BITMAPLEN(numAttrs);
+			new_header_len += BITMAPLEN(numAttrs);
 		if (olddata->t_infomask & HEAP_HASOID)
-			new_len += sizeof(Oid);
-		new_len = MAXALIGN(new_len);
-		Assert(new_len == olddata->t_hoff);
+			new_header_len += sizeof(Oid);
+		new_header_len = MAXALIGN(new_header_len);
 		new_data_len = heap_compute_data_size(tupleDesc,
 											  toast_values, toast_isnull);
-		new_len += new_data_len;
+		new_tuple_len = new_header_len + new_data_len;
 
 		/*
 		 * Allocate and zero the space needed, and fill HeapTupleData fields.
 		 */
-		result_tuple = (HeapTuple) palloc0(HEAPTUPLESIZE + new_len);
-		result_tuple->t_len = new_len;
+		result_tuple = (HeapTuple) palloc0(HEAPTUPLESIZE + new_tuple_len);
+		result_tuple->t_len = new_tuple_len;
 		result_tuple->t_self = newtup->t_self;
 		result_tuple->t_tableOid = newtup->t_tableOid;
 		new_data = (HeapTupleHeader) ((char *) result_tuple + HEAPTUPLESIZE);
 		result_tuple->t_data = new_data;
 
 		/*
-		 * Put the existing tuple header and the changed values into place
+		 * Copy the existing tuple header, but adjust natts and t_hoff.
 		 */
-		memcpy(new_data, olddata, olddata->t_hoff);
+		memcpy(new_data, olddata, offsetof(HeapTupleHeaderData, t_bits));
+		HeapTupleHeaderSetNatts(new_data, numAttrs);
+		new_data->t_hoff = new_header_len;
+		if (olddata->t_infomask & HEAP_HASOID)
+			HeapTupleHeaderSetOid(new_data, HeapTupleHeaderGetOid(olddata));
 
+		/* Copy over the data, and fill the null bitmap if needed */
 		heap_fill_tuple(tupleDesc,
 						toast_values,
 						toast_isnull,
-						(char *) new_data + olddata->t_hoff,
+						(char *) new_data + new_header_len,
 						new_data_len,
 						&(new_data->t_infomask),
 						has_nulls ? new_data->t_bits : NULL);
@@ -920,6 +938,87 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 }
 
 
+/* ----------
+ * toast_flatten_tuple -
+ *
+ *	"Flatten" a tuple to contain no out-of-line toasted fields.
+ *	(This does not eliminate compressed or short-header datums.)
+ * ----------
+ */
+HeapTuple
+toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc)
+{
+	HeapTuple	new_tuple;
+	Form_pg_attribute *att = tupleDesc->attrs;
+	int			numAttrs = tupleDesc->natts;
+	int			i;
+	Datum		toast_values[MaxTupleAttributeNumber];
+	bool		toast_isnull[MaxTupleAttributeNumber];
+	bool		toast_free[MaxTupleAttributeNumber];
+
+	/*
+	 * Break down the tuple into fields.
+	 */
+	Assert(numAttrs <= MaxTupleAttributeNumber);
+	heap_deform_tuple(tup, tupleDesc, toast_values, toast_isnull);
+
+	memset(toast_free, 0, numAttrs * sizeof(bool));
+
+	for (i = 0; i < numAttrs; i++)
+	{
+		/*
+		 * Look at non-null varlena attributes
+		 */
+		if (!toast_isnull[i] && att[i]->attlen == -1)
+		{
+			struct varlena *new_value;
+
+			new_value = (struct varlena *) DatumGetPointer(toast_values[i]);
+			if (VARATT_IS_EXTERNAL(new_value))
+			{
+				new_value = toast_fetch_datum(new_value);
+				toast_values[i] = PointerGetDatum(new_value);
+				toast_free[i] = true;
+			}
+		}
+	}
+
+	/*
+	 * Form the reconfigured tuple.
+	 */
+	new_tuple = heap_form_tuple(tupleDesc, toast_values, toast_isnull);
+
+	/*
+	 * Be sure to copy the tuple's OID and identity fields.  We also make a
+	 * point of copying visibility info, just in case anybody looks at those
+	 * fields in a syscache entry.
+	 */
+	if (tupleDesc->tdhasoid)
+		HeapTupleSetOid(new_tuple, HeapTupleGetOid(tup));
+
+	new_tuple->t_self = tup->t_self;
+	new_tuple->t_tableOid = tup->t_tableOid;
+
+	new_tuple->t_data->t_choice = tup->t_data->t_choice;
+	new_tuple->t_data->t_ctid = tup->t_data->t_ctid;
+	new_tuple->t_data->t_infomask &= ~HEAP_XACT_MASK;
+	new_tuple->t_data->t_infomask |=
+		tup->t_data->t_infomask & HEAP_XACT_MASK;
+	new_tuple->t_data->t_infomask2 &= ~HEAP2_XACT_MASK;
+	new_tuple->t_data->t_infomask2 |=
+		tup->t_data->t_infomask2 & HEAP2_XACT_MASK;
+
+	/*
+	 * Free allocated temp values
+	 */
+	for (i = 0; i < numAttrs; i++)
+		if (toast_free[i])
+			pfree(DatumGetPointer(toast_values[i]));
+
+	return new_tuple;
+}
+
+
 /* ----------
  * toast_flatten_tuple_attribute -
  *
@@ -939,8 +1038,9 @@ toast_flatten_tuple_attribute(Datum value,
 	TupleDesc	tupleDesc;
 	HeapTupleHeader olddata;
 	HeapTupleHeader new_data;
-	int32		new_len;
+	int32		new_header_len;
 	int32		new_data_len;
+	int32		new_tuple_len;
 	HeapTupleData tmptup;
 	Form_pg_attribute *att;
 	int			numAttrs;
@@ -1011,33 +1111,39 @@ toast_flatten_tuple_attribute(Datum value,
 	}
 
 	/*
-	 * Calculate the new size of the tuple.  Header size should not change,
-	 * but data size might.
+	 * Calculate the new size of the tuple.
+	 *
+	 * This should match the reconstruction code in toast_insert_or_update.
 	 */
-	new_len = offsetof(HeapTupleHeaderData, t_bits);
+	new_header_len = offsetof(HeapTupleHeaderData, t_bits);
 	if (has_nulls)
-		new_len += BITMAPLEN(numAttrs);
+		new_header_len += BITMAPLEN(numAttrs);
 	if (olddata->t_infomask & HEAP_HASOID)
-		new_len += sizeof(Oid);
-	new_len = MAXALIGN(new_len);
-	Assert(new_len == olddata->t_hoff);
+		new_header_len += sizeof(Oid);
+	new_header_len = MAXALIGN(new_header_len);
 	new_data_len = heap_compute_data_size(tupleDesc,
 										  toast_values, toast_isnull);
-	new_len += new_data_len;
+	new_tuple_len = new_header_len + new_data_len;
 
-	new_data = (HeapTupleHeader) palloc0(new_len);
+	new_data = (HeapTupleHeader) palloc0(new_tuple_len);
 
 	/*
-	 * Put the tuple header and the changed values into place
+	 * Copy the existing tuple header, but adjust natts and t_hoff.
 	 */
-	memcpy(new_data, olddata, olddata->t_hoff);
+	memcpy(new_data, olddata, offsetof(HeapTupleHeaderData, t_bits));
+	HeapTupleHeaderSetNatts(new_data, numAttrs);
+	new_data->t_hoff = new_header_len;
+	if (olddata->t_infomask & HEAP_HASOID)
+		HeapTupleHeaderSetOid(new_data, HeapTupleHeaderGetOid(olddata));
 
-	HeapTupleHeaderSetDatumLength(new_data, new_len);
+	/* Reset the datum length field, too */
+	HeapTupleHeaderSetDatumLength(new_data, new_tuple_len);
 
+	/* Copy over the data, and fill the null bitmap if needed */
 	heap_fill_tuple(tupleDesc,
 					toast_values,
 					toast_isnull,
-					(char *) new_data + olddata->t_hoff,
+					(char *) new_data + new_header_len,
 					new_data_len,
 					&(new_data->t_infomask),
 					has_nulls ? new_data->t_bits : NULL);
@@ -1117,10 +1223,16 @@ toast_compress_datum(Datum value)
  *
  *	Save one single datum into the secondary relation and return
  *	a Datum reference for it.
+ *
+ * rel: the main relation we're working with (not the toast rel!)
+ * value: datum to be pushed to toast storage
+ * oldexternal: if not NULL, toast pointer previously representing the datum
+ * options: options to be passed to heap_insert() for toast rows
  * ----------
  */
 static Datum
-toast_save_datum(Relation rel, Datum value, int options)
+toast_save_datum(Relation rel, Datum value,
+				 struct varlena *oldexternal, int options)
 {
 	Relation	toastrel;
 	Relation	toastidx;
@@ -1199,11 +1311,55 @@ toast_save_datum(Relation rel, Datum value, int options)
 		toast_pointer.va_toastrelid = RelationGetRelid(toastrel);
 
 	/*
-	 * Choose an unused OID within the toast table for this toast value.
+	 * Choose an OID to use as the value ID for this toast value.
+	 *
+	 * Normally we just choose an unused OID within the toast table.  But
+	 * during table-rewriting operations where we are preserving an existing
+	 * toast table OID, we want to preserve toast value OIDs too.  So, if
+	 * rd_toastoid is set and we had a prior external value from that same
+	 * toast table, re-use its value ID.  If we didn't have a prior external
+	 * value (which is a corner case, but possible if the table's attstorage
+	 * options have been changed), we have to pick a value ID that doesn't
+	 * conflict with either new or existing toast value OIDs.
 	 */
-	toast_pointer.va_valueid = GetNewOidWithIndex(toastrel,
-												  RelationGetRelid(toastidx),
-												  (AttrNumber) 1);
+	if (!OidIsValid(rel->rd_toastoid))
+	{
+		/* normal case: just choose an unused OID */
+		toast_pointer.va_valueid =
+			GetNewOidWithIndex(toastrel,
+							   RelationGetRelid(toastidx),
+							   (AttrNumber) 1);
+	}
+	else
+	{
+		/* rewrite case: check to see if value was in old toast table */
+		toast_pointer.va_valueid = InvalidOid;
+		if (oldexternal != NULL)
+		{
+			struct varatt_external old_toast_pointer;
+
+			Assert(VARATT_IS_EXTERNAL(oldexternal));
+			/* Must copy to access aligned fields */
+			VARATT_EXTERNAL_GET_POINTER(old_toast_pointer, oldexternal);
+			if (old_toast_pointer.va_toastrelid == rel->rd_toastoid)
+				toast_pointer.va_valueid = old_toast_pointer.va_valueid;
+		}
+		if (toast_pointer.va_valueid == InvalidOid)
+		{
+			/*
+			 * new value; must choose an OID that doesn't conflict in either
+			 * old or new toast table
+			 */
+			do
+			{
+				toast_pointer.va_valueid =
+					GetNewOidWithIndex(toastrel,
+									   RelationGetRelid(toastidx),
+									   (AttrNumber) 1);
+			} while (toast_valueid_exists(rel->rd_toastoid,
+										  toast_pointer.va_valueid));
+		}
+	}
 
 	/*
 	 * Initialize constant parts of the tuple data
@@ -1338,6 +1494,52 @@ toast_delete_datum(Relation rel, Datum value)
 }
 
 
+/* ----------
+ * toast_valueid_exists -
+ *
+ *	Test whether a toast value with the given ID exists in the toast relation
+ * ----------
+ */
+static bool
+toast_valueid_exists(Oid toastrelid, Oid valueid)
+{
+	bool		result = false;
+	Relation	toastrel;
+	ScanKeyData toastkey;
+	SysScanDesc toastscan;
+
+	/*
+	 * Open the toast relation
+	 */
+	toastrel = heap_open(toastrelid, AccessShareLock);
+
+	/*
+	 * Setup a scan key to find chunks with matching va_valueid
+	 */
+	ScanKeyInit(&toastkey,
+				(AttrNumber) 1,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(valueid));
+
+	/*
+	 * Is there any such chunk?
+	 */
+	toastscan = systable_beginscan(toastrel, toastrel->rd_rel->reltoastidxid,
+								   true, SnapshotToast, 1, &toastkey);
+
+	if (systable_getnext(toastscan) != NULL)
+		result = true;
+
+	/*
+	 * End scan and close relations
+	 */
+	systable_endscan(toastscan);
+	heap_close(toastrel, AccessShareLock);
+
+	return result;
+}
+
+
 /* ----------
  * toast_fetch_datum -
  *
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 02087659647cd..13fa6aa80a7c2 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -126,7 +126,7 @@ do { \
 } while(0)
 
 static IndexScanDesc index_beginscan_internal(Relation indexRelation,
-						 int nkeys, int norderbys);
+						 int nkeys, int norderbys, Snapshot snapshot);
 
 
 /* ----------------------------------------------------------------
@@ -209,6 +209,8 @@ index_insert(Relation indexRelation,
 									   (HeapTuple) NULL,
 									   InvalidBuffer);
 
+	// printf("indexam.c 212: %c\n", values[15]);
+
 	/*
 	 * have the am's insert proc do all the work.
 	 */
@@ -234,7 +236,7 @@ index_beginscan(Relation heapRelation,
 {
 	IndexScanDesc scan;
 
-	scan = index_beginscan_internal(indexRelation, nkeys, norderbys);
+	scan = index_beginscan_internal(indexRelation, nkeys, norderbys, snapshot);
 
 	/*
 	 * Save additional parameters into the scandesc.  Everything else was set
@@ -259,7 +261,7 @@ index_beginscan_bitmap(Relation indexRelation,
 {
 	IndexScanDesc scan;
 
-	scan = index_beginscan_internal(indexRelation, nkeys, 0);
+	scan = index_beginscan_internal(indexRelation, nkeys, 0, snapshot);
 
 	/*
 	 * Save additional parameters into the scandesc.  Everything else was set
@@ -275,7 +277,7 @@ index_beginscan_bitmap(Relation indexRelation,
  */
 static IndexScanDesc
 index_beginscan_internal(Relation indexRelation,
-						 int nkeys, int norderbys)
+						 int nkeys, int norderbys, Snapshot snapshot)
 {
 	IndexScanDesc scan;
 	FmgrInfo   *procedure;
@@ -284,7 +286,7 @@ index_beginscan_internal(Relation indexRelation,
 	GET_REL_PROCEDURE(ambeginscan);
 
 	if (!(indexRelation->rd_am->ampredlocks))
-		PredicateLockRelation(indexRelation);
+		PredicateLockRelation(indexRelation, snapshot);
 
 	/*
 	 * We hold a reference count to the relcache entry throughout the scan.
@@ -602,7 +604,8 @@ index_getnext(IndexScanDesc scan, ScanDirection direction)
 												 scan->xs_cbuf);
 
 			CheckForSerializableConflictOut(valid, scan->heapRelation,
-											heapTuple, scan->xs_cbuf);
+											heapTuple, scan->xs_cbuf,
+											scan->xs_snapshot);
 
 			if (valid)
 			{
@@ -624,7 +627,7 @@ index_getnext(IndexScanDesc scan, ScanDirection direction)
 				else
 					scan->xs_next_hot = InvalidOffsetNumber;
 
-				PredicateLockTuple(scan->heapRelation, heapTuple);
+				PredicateLockTuple(scan->heapRelation, heapTuple, scan->xs_snapshot);
 
 				LockBuffer(scan->xs_cbuf, BUFFER_LOCK_UNLOCK);
 
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 58f47e7b6466f..4b1a2e912b640 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -560,9 +560,19 @@ _bt_getbuf(Relation rel, BlockNumber blkno, int access)
 					 */
 					if (XLogStandbyInfoActive())
 					{
+						TransactionId latestRemovedXid;
+
 						BTPageOpaque opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 
-						_bt_log_reuse_page(rel, blkno, opaque->btpo.xact);
+						/*
+						 * opaque->btpo.xact is the threshold value not the
+						 * value to measure conflicts against. We must retreat
+						 * by one from it to get the correct conflict xid.
+						 */
+						latestRemovedXid = opaque->btpo.xact;
+						TransactionIdRetreat(latestRemovedXid);
+
+						_bt_log_reuse_page(rel, blkno, latestRemovedXid);
 					}
 
 					/* Okay to use page.  Re-initialize and return it */
@@ -677,6 +687,7 @@ bool
 _bt_page_recyclable(Page page)
 {
 	BTPageOpaque opaque;
+	TransactionId cutoff;
 
 	/*
 	 * It's possible to find an all-zeroes page in an index --- for example, a
@@ -689,11 +700,18 @@ _bt_page_recyclable(Page page)
 
 	/*
 	 * Otherwise, recycle if deleted and too old to have any processes
-	 * interested in it.
+	 * interested in it.  If we are generating records for Hot Standby
+	 * defer page recycling until RecentGlobalXmin to respect user
+	 * controls specified by vacuum_defer_cleanup_age or hot_standby_feedback.
 	 */
+	if (XLogStandbyInfoActive())
+		cutoff = RecentGlobalXmin;
+	else
+		cutoff = RecentXmin;
+
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 	if (P_ISDELETED(opaque) &&
-		TransactionIdPrecedesOrEquals(opaque->btpo.xact, RecentXmin))
+		TransactionIdPrecedesOrEquals(opaque->btpo.xact, cutoff))
 		return true;
 	return false;
 }
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 6a7ddd7db4de4..ac86eb494f691 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -29,7 +29,6 @@
 #include "storage/indexfsm.h"
 #include "storage/ipc.h"
 #include "storage/lmgr.h"
-#include "storage/predicate.h"
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 2ce2bc2f00f51..5c00fac533b03 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -64,10 +64,7 @@ _bt_search(Relation rel, int keysz, ScanKey scankey, bool nextkey,
 
 	/* If index is empty and access = BT_READ, no root page is created. */
 	if (!BufferIsValid(*bufP))
-	{
-		PredicateLockRelation(rel);		/* Nothing finer to lock exists. */
 		return (BTStack) NULL;
-	}
 
 	/* Loop iterates once per level descended in the tree */
 	for (;;)
@@ -92,11 +89,7 @@ _bt_search(Relation rel, int keysz, ScanKey scankey, bool nextkey,
 		page = BufferGetPage(*bufP);
 		opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 		if (P_ISLEAF(opaque))
-		{
-			if (access == BT_READ)
-				PredicateLockPage(rel, BufferGetBlockNumber(*bufP));
 			break;
-		}
 
 		/*
 		 * Find the appropriate item on the internal page, and get the child
@@ -855,9 +848,16 @@ _bt_first(IndexScanDesc scan, ScanDirection dir)
 
 	if (!BufferIsValid(buf))
 	{
-		/* Only get here if index is completely empty */
+		/*
+		 * We only get here if the index is completely empty. Lock relation
+		 * because nothing finer to lock exists.
+		 */
+		PredicateLockRelation(rel, scan->xs_snapshot);
 		return false;
 	}
+	else
+		PredicateLockPage(rel, BufferGetBlockNumber(buf),
+						  scan->xs_snapshot);
 
 	/* initialize moreLeft/moreRight appropriately for scan direction */
 	if (ScanDirectionIsForward(dir))
@@ -1153,7 +1153,7 @@ _bt_steppage(IndexScanDesc scan, ScanDirection dir)
 			opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 			if (!P_IGNORE(opaque))
 			{
-				PredicateLockPage(rel, blkno);
+				PredicateLockPage(rel, blkno, scan->xs_snapshot);
 				/* see if there are any matches on this page */
 				/* note that this will clear moreRight if we can stop */
 				if (_bt_readpage(scan, dir, P_FIRSTDATAKEY(opaque)))
@@ -1201,7 +1201,7 @@ _bt_steppage(IndexScanDesc scan, ScanDirection dir)
 			opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 			if (!P_IGNORE(opaque))
 			{
-				PredicateLockPage(rel, BufferGetBlockNumber(so->currPos.buf));
+				PredicateLockPage(rel, BufferGetBlockNumber(so->currPos.buf), scan->xs_snapshot);
 				/* see if there are any matches on this page */
 				/* note that this will clear moreLeft if we can stop */
 				if (_bt_readpage(scan, dir, PageGetMaxOffsetNumber(page)))
@@ -1363,11 +1363,7 @@ _bt_get_endpoint(Relation rel, uint32 level, bool rightmost)
 		buf = _bt_gettrueroot(rel);
 
 	if (!BufferIsValid(buf))
-	{
-		/* empty index... */
-		PredicateLockRelation(rel);		/* Nothing finer to lock exists. */
 		return InvalidBuffer;
-	}
 
 	page = BufferGetPage(buf);
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
@@ -1444,13 +1440,16 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 
 	if (!BufferIsValid(buf))
 	{
-		/* empty index... */
-		PredicateLockRelation(rel);		/* Nothing finer to lock exists. */
+		/*
+		 * Empty index. Lock the whole relation, as nothing finer to lock
+		 * exists.
+		 */
+		PredicateLockRelation(rel, scan->xs_snapshot);
 		so->currPos.buf = InvalidBuffer;
 		return false;
 	}
 
-	PredicateLockPage(rel, BufferGetBlockNumber(buf));
+	PredicateLockPage(rel, BufferGetBlockNumber(buf), scan->xs_snapshot);
 	page = BufferGetPage(buf);
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 	Assert(P_ISLEAF(opaque));
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 2e896a258f7cb..f87eadcdec2db 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -325,8 +325,14 @@ _bt_preprocess_keys(IndexScanDesc scan)
 
 			/*
 			 * If = has been specified, all other keys can be eliminated as
-			 * redundant.  In case of key > 2 && key == 1 we can set qual_ok
-			 * to false and abandon further processing.
+			 * redundant.  If we have a case like key = 1 AND key > 2, we can
+			 * set qual_ok to false and abandon further processing.
+			 *
+			 * We also have to deal with the case of "key IS NULL", which is
+			 * unsatisfiable in combination with any other index condition.
+			 * By the time we get here, that's been classified as an equality
+			 * check, and we've rejected any combination of it with a regular
+			 * equality condition; but not with other types of conditions.
 			 */
 			if (xform[BTEqualStrategyNumber - 1])
 			{
@@ -339,6 +345,13 @@ _bt_preprocess_keys(IndexScanDesc scan)
 					if (!chk || j == (BTEqualStrategyNumber - 1))
 						continue;
 
+					if (eq->sk_flags & SK_SEARCHNULL)
+					{
+						/* IS NULL is contradictory to anything else */
+						so->qual_ok = false;
+						return;
+					}
+
 					if (_bt_compare_scankey_args(scan, chk, eq, chk,
 												 &test_result))
 					{
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index d3de8934eee15..34258ec5582fb 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -490,6 +490,25 @@ StartupCLOG(void)
 	 */
 	ClogCtl->shared->latest_page_number = pageno;
 
+	LWLockRelease(CLogControlLock);
+}
+
+/*
+ * This must be called ONCE at the end of startup/recovery.
+ */
+void
+TrimCLOG(void)
+{
+	TransactionId xid = ShmemVariableCache->nextXid;
+	int			pageno = TransactionIdToPage(xid);
+
+	LWLockAcquire(CLogControlLock, LW_EXCLUSIVE);
+
+	/*
+	 * Re-Initialize our idea of the latest page number.
+	 */
+	ClogCtl->shared->latest_page_number = pageno;
+
 	/*
 	 * Zero out the remainder of the current clog page.  Under normal
 	 * circumstances it should be zeroes already, but it seems at least
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index bb3afd6000c35..f039672620179 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -1568,7 +1568,7 @@ StartupMultiXact(void)
 
 	/*
 	 * Zero out the remainder of the current members page.	See notes in
-	 * StartupCLOG() for motivation.
+	 * TrimCLOG() for motivation.
 	 */
 	entryno = MXOffsetToMemberEntry(offset);
 	if (entryno != 0)
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 281268120ef25..54176ee9df9f8 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1356,10 +1356,10 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	 * after we send the SI messages. See AtEOXact_Inval()
 	 */
 	if (hdr->initfileinval)
-		RelationCacheInitFileInvalidate(true);
+		RelationCacheInitFilePreInvalidate();
 	SendSharedInvalidMessages(invalmsgs, hdr->ninvalmsgs);
 	if (hdr->initfileinval)
-		RelationCacheInitFileInvalidate(false);
+		RelationCacheInitFilePostInvalidate();
 
 	/* And now do the callbacks */
 	if (isCommit)
diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c
index 47c15af241d29..eeb445da9d75a 100644
--- a/src/backend/access/transam/twophase_rmgr.c
+++ b/src/backend/access/transam/twophase_rmgr.c
@@ -25,34 +25,34 @@ const TwoPhaseCallback twophase_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 {
 	NULL,						/* END ID */
 	lock_twophase_recover,		/* Lock */
-	predicatelock_twophase_recover,		/* PredicateLock */
 	NULL,						/* pgstat */
-	multixact_twophase_recover	/* MultiXact */
+	multixact_twophase_recover, /* MultiXact */
+	predicatelock_twophase_recover		/* PredicateLock */
 };
 
 const TwoPhaseCallback twophase_postcommit_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 {
 	NULL,						/* END ID */
 	lock_twophase_postcommit,	/* Lock */
-	NULL,						/* PredicateLock */
 	pgstat_twophase_postcommit, /* pgstat */
-	multixact_twophase_postcommit		/* MultiXact */
+	multixact_twophase_postcommit,		/* MultiXact */
+	NULL						/* PredicateLock */
 };
 
 const TwoPhaseCallback twophase_postabort_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 {
 	NULL,						/* END ID */
 	lock_twophase_postabort,	/* Lock */
-	NULL,						/* PredicateLock */
 	pgstat_twophase_postabort,	/* pgstat */
-	multixact_twophase_postabort	/* MultiXact */
+	multixact_twophase_postabort,		/* MultiXact */
+	NULL						/* PredicateLock */
 };
 
 const TwoPhaseCallback twophase_standby_recover_callbacks[TWOPHASE_RM_MAX_ID + 1] =
 {
 	NULL,						/* END ID */
 	lock_twophase_standby_recover,		/* Lock */
-	NULL,						/* PredicateLock */
 	NULL,						/* pgstat */
-	NULL						/* MultiXact */
+	NULL,						/* MultiXact */
+	NULL						/* PredicateLock */
 };
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index aa0b0291ee1c7..f3a8dae63122c 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -659,7 +659,8 @@ static bool CheckForStandbyTrigger(void);
 static void xlog_outrec(StringInfo buf, XLogRecord *record);
 #endif
 static void pg_start_backup_callback(int code, Datum arg);
-static bool read_backup_label(XLogRecPtr *checkPointLoc);
+static bool read_backup_label(XLogRecPtr *checkPointLoc,
+				  bool *backupEndRequired);
 static void rm_redo_error_callback(void *arg);
 static int	get_sync_bit(int method);
 
@@ -3221,11 +3222,10 @@ ExecuteRecoveryCommand(char *command, char *commandName, bool failOnSignal)
 		 */
 		signaled = WIFSIGNALED(rc) || WEXITSTATUS(rc) > 125;
 
-		/*
-		 * translator: First %s represents a recovery.conf parameter name like
-		 * "recovery_end_command", and the 2nd is the value of that parameter.
-		 */
 		ereport((signaled && failOnSignal) ? FATAL : WARNING,
+		/*------
+		   translator: First %s represents a recovery.conf parameter name like
+		  "recovery_end_command", and the 2nd is the value of that parameter. */
 				(errmsg("%s \"%s\": return code %d", commandName,
 						command, rc)));
 	}
@@ -5258,22 +5258,22 @@ readRecoveryCommandFile(void)
 		{
 			recoveryRestoreCommand = pstrdup(item->value);
 			ereport(DEBUG2,
-					(errmsg("restore_command = '%s'",
-							recoveryRestoreCommand)));
+					(errmsg_internal("restore_command = '%s'",
+									 recoveryRestoreCommand)));
 		}
 		else if (strcmp(item->name, "recovery_end_command") == 0)
 		{
 			recoveryEndCommand = pstrdup(item->value);
 			ereport(DEBUG2,
-					(errmsg("recovery_end_command = '%s'",
-							recoveryEndCommand)));
+					(errmsg_internal("recovery_end_command = '%s'",
+									 recoveryEndCommand)));
 		}
 		else if (strcmp(item->name, "archive_cleanup_command") == 0)
 		{
 			archiveCleanupCommand = pstrdup(item->value);
 			ereport(DEBUG2,
-					(errmsg("archive_cleanup_command = '%s'",
-							archiveCleanupCommand)));
+					(errmsg_internal("archive_cleanup_command = '%s'",
+									 archiveCleanupCommand)));
 		}
 		else if (strcmp(item->name, "pause_at_recovery_target") == 0)
 		{
@@ -5282,7 +5282,8 @@ readRecoveryCommandFile(void)
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("parameter \"%s\" requires a Boolean value", "pause_at_recovery_target")));
 			ereport(DEBUG2,
-					(errmsg("pause_at_recovery_target = '%s'", item->value)));
+					(errmsg_internal("pause_at_recovery_target = '%s'",
+									 item->value)));
 		}
 		else if (strcmp(item->name, "recovery_target_timeline") == 0)
 		{
@@ -5300,10 +5301,10 @@ readRecoveryCommandFile(void)
 			}
 			if (rtli)
 				ereport(DEBUG2,
-						(errmsg("recovery_target_timeline = %u", rtli)));
+						(errmsg_internal("recovery_target_timeline = %u", rtli)));
 			else
 				ereport(DEBUG2,
-						(errmsg("recovery_target_timeline = latest")));
+						(errmsg_internal("recovery_target_timeline = latest")));
 		}
 		else if (strcmp(item->name, "recovery_target_xid") == 0)
 		{
@@ -5314,8 +5315,8 @@ readRecoveryCommandFile(void)
 				 (errmsg("recovery_target_xid is not a valid number: \"%s\"",
 						 item->value)));
 			ereport(DEBUG2,
-					(errmsg("recovery_target_xid = %u",
-							recoveryTargetXid)));
+					(errmsg_internal("recovery_target_xid = %u",
+							 		 recoveryTargetXid)));
 			recoveryTarget = RECOVERY_TARGET_XID;
 		}
 		else if (strcmp(item->name, "recovery_target_time") == 0)
@@ -5338,8 +5339,8 @@ readRecoveryCommandFile(void)
 												ObjectIdGetDatum(InvalidOid),
 														Int32GetDatum(-1)));
 			ereport(DEBUG2,
-					(errmsg("recovery_target_time = '%s'",
-							timestamptz_to_str(recoveryTargetTime))));
+					(errmsg_internal("recovery_target_time = '%s'",
+							 		 timestamptz_to_str(recoveryTargetTime))));
 		}
 		else if (strcmp(item->name, "recovery_target_name") == 0)
 		{
@@ -5355,11 +5356,12 @@ readRecoveryCommandFile(void)
 			if (strlen(recoveryTargetName) >= MAXFNAMELEN)
 				ereport(FATAL,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("recovery_target_name is too long (maximum %d characters)", MAXFNAMELEN - 1)));
+						 errmsg("recovery_target_name is too long (maximum %d characters)",
+								MAXFNAMELEN - 1)));
 
 			ereport(DEBUG2,
-					(errmsg("recovery_target_name = '%s'",
-							recoveryTargetName)));
+					(errmsg_internal("recovery_target_name = '%s'",
+									 recoveryTargetName)));
 		}
 		else if (strcmp(item->name, "recovery_target_inclusive") == 0)
 		{
@@ -5369,32 +5371,35 @@ readRecoveryCommandFile(void)
 			if (!parse_bool(item->value, &recoveryTargetInclusive))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("parameter \"%s\" requires a Boolean value", "recovery_target_inclusive")));
+						 errmsg("parameter \"%s\" requires a Boolean value",
+								"recovery_target_inclusive")));
 			ereport(DEBUG2,
-					(errmsg("recovery_target_inclusive = %s", item->value)));
+					(errmsg_internal("recovery_target_inclusive = %s",
+									 item->value)));
 		}
 		else if (strcmp(item->name, "standby_mode") == 0)
 		{
 			if (!parse_bool(item->value, &StandbyMode))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("parameter \"%s\" requires a Boolean value", "standby_mode")));
+						 errmsg("parameter \"%s\" requires a Boolean value",
+								"standby_mode")));
 			ereport(DEBUG2,
-					(errmsg("standby_mode = '%s'", item->value)));
+					(errmsg_internal("standby_mode = '%s'", item->value)));
 		}
 		else if (strcmp(item->name, "primary_conninfo") == 0)
 		{
 			PrimaryConnInfo = pstrdup(item->value);
 			ereport(DEBUG2,
-					(errmsg("primary_conninfo = '%s'",
-							PrimaryConnInfo)));
+					(errmsg_internal("primary_conninfo = '%s'",
+									 PrimaryConnInfo)));
 		}
 		else if (strcmp(item->name, "trigger_file") == 0)
 		{
 			TriggerFile = pstrdup(item->value);
 			ereport(DEBUG2,
-					(errmsg("trigger_file = '%s'",
-							TriggerFile)));
+					(errmsg_internal("trigger_file = '%s'",
+									 TriggerFile)));
 		}
 		else
 			ereport(FATAL,
@@ -5995,6 +6000,7 @@ StartupXLOG(void)
 	XLogRecord *record;
 	uint32		freespace;
 	TransactionId oldestActiveXID;
+	bool		backupEndRequired = false;
 
 	/*
 	 * Read control file and check XLOG status looks valid.
@@ -6128,7 +6134,7 @@ StartupXLOG(void)
 	if (StandbyMode)
 		OwnLatch(&XLogCtl->recoveryWakeupLatch);
 
-	if (read_backup_label(&checkPointLoc))
+	if (read_backup_label(&checkPointLoc, &backupEndRequired))
 	{
 		/*
 		 * When a backup_label file is present, we want to roll forward from
@@ -6304,10 +6310,17 @@ StartupXLOG(void)
 		}
 
 		/*
-		 * set backupStartPoint if we're starting recovery from a base backup
+		 * Set backupStartPoint if we're starting recovery from a base backup.
+		 * However, if there was no recovery.conf, and the backup was taken
+		 * with pg_start_backup(), we don't know if the server crashed before
+		 * the backup was finished and we're doing crash recovery on the
+		 * original server, or if we're restoring from the base backup. We
+		 * have to assume we're doing crash recovery in that case, or the
+		 * database would refuse to start up after a crash.
 		 */
-		if (haveBackupLabel)
+		if ((InArchiveRecovery && haveBackupLabel) || backupEndRequired)
 			ControlFile->backupStartPoint = checkPoint.redo;
+
 		ControlFile->time = (pg_time_t) time(NULL);
 		/* No need to hold ControlFileLock yet, we aren't up far enough */
 		UpdateControlFile();
@@ -6371,10 +6384,12 @@ StartupXLOG(void)
 				oldestActiveXID = checkPoint.oldestActiveXid;
 			Assert(TransactionIdIsValid(oldestActiveXID));
 
-			/* Startup commit log and related stuff */
+			/*
+			 * Startup commit log and subtrans only. Other SLRUs are not
+			 * maintained during recovery and need not be started yet.
+			 */
 			StartupCLOG();
 			StartupSUBTRANS(oldestActiveXID);
-			StartupMultiXact();
 
 			/*
 			 * If we're beginning at a shutdown checkpoint, we know that
@@ -6670,23 +6685,15 @@ StartupXLOG(void)
 
 		/*
 		 * Ran off end of WAL before reaching end-of-backup WAL record, or
-		 * minRecoveryPoint. That's usually a bad sign, indicating that you
-		 * tried to recover from an online backup but never called
-		 * pg_stop_backup(), or you didn't archive all the WAL up to that
-		 * point. However, this also happens in crash recovery, if the system
-		 * crashes while an online backup is in progress. We must not treat
-		 * that as an error, or the database will refuse to start up.
+		 * minRecoveryPoint.
 		 */
-		if (InArchiveRecovery)
-		{
-			if (!XLogRecPtrIsInvalid(ControlFile->backupStartPoint))
-				ereport(FATAL,
-						(errmsg("WAL ends before end of online backup"),
-						 errhint("Online backup started with pg_start_backup() must be ended with pg_stop_backup(), and all WAL up to that point must be available at recovery.")));
-			else
-				ereport(FATAL,
-					  (errmsg("WAL ends before consistent recovery point")));
-		}
+		if (!XLogRecPtrIsInvalid(ControlFile->backupStartPoint))
+			ereport(FATAL,
+					(errmsg("WAL ends before end of online backup"),
+					 errhint("Online backup started with pg_start_backup() must be ended with pg_stop_backup(), and all WAL up to that point must be available at recovery.")));
+		else
+			ereport(FATAL,
+					(errmsg("WAL ends before consistent recovery point")));
 	}
 
 	/*
@@ -6871,16 +6878,21 @@ StartupXLOG(void)
 	TransactionIdRetreat(ShmemVariableCache->latestCompletedXid);
 
 	/*
-	 * Start up the commit log and related stuff, too. In hot standby mode we
-	 * did this already before WAL replay.
+	 * Start up the commit log and subtrans, if not already done for
+	 * hot standby.
 	 */
 	if (standbyState == STANDBY_DISABLED)
 	{
 		StartupCLOG();
 		StartupSUBTRANS(oldestActiveXID);
-		StartupMultiXact();
 	}
 
+	/*
+	 * Perform end of recovery actions for any SLRUs that need it.
+	 */
+	StartupMultiXact();
+	TrimCLOG();
+
 	/* Reload shared-memory state for prepared transactions */
 	RecoverPreparedTransactions();
 
@@ -7586,6 +7598,16 @@ CreateCheckPoint(int flags)
 	MemSet(&checkPoint, 0, sizeof(checkPoint));
 	checkPoint.time = (pg_time_t) time(NULL);
 
+	/*
+	 * For Hot Standby, derive the oldestActiveXid before we fix the redo pointer.
+	 * This allows us to begin accumulating changes to assemble our starting
+	 * snapshot of locks and transactions.
+	 */
+	if (!shutdown && XLogStandbyInfoActive())
+		checkPoint.oldestActiveXid = GetOldestActiveTransactionId();
+	else
+		checkPoint.oldestActiveXid = InvalidTransactionId;
+
 	/*
 	 * We must hold WALInsertLock while examining insert state to determine
 	 * the checkpoint REDO pointer.
@@ -7772,9 +7794,7 @@ CreateCheckPoint(int flags)
 	 * Update checkPoint.nextXid since we have a later value
 	 */
 	if (!shutdown && XLogStandbyInfoActive())
-		LogStandbySnapshot(&checkPoint.oldestActiveXid, &checkPoint.nextXid);
-	else
-		checkPoint.oldestActiveXid = InvalidTransactionId;
+		LogStandbySnapshot(&checkPoint.nextXid);
 
 	START_CRIT_SECTION();
 
@@ -7987,7 +8007,8 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
 		if (RmgrTable[rmid].rm_safe_restartpoint != NULL)
 			if (!(RmgrTable[rmid].rm_safe_restartpoint()))
 			{
-				elog(trace_recovery(DEBUG2), "RM %d not safe to record restart point at %X/%X",
+				elog(trace_recovery(DEBUG2),
+					 "RM %d not safe to record restart point at %X/%X",
 					 rmid,
 					 checkPoint->redo.xlogid,
 					 checkPoint->redo.xrecoff);
@@ -8375,13 +8396,13 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
 
 		/*
 		 * If we see a shutdown checkpoint while waiting for an end-of-backup
-		 * record, the backup was cancelled and the end-of-backup record will
+		 * record, the backup was canceled and the end-of-backup record will
 		 * never arrive.
 		 */
 		if (InArchiveRecovery &&
 			!XLogRecPtrIsInvalid(ControlFile->backupStartPoint))
 			ereport(ERROR,
-					(errmsg("online backup was cancelled, recovery cannot continue")));
+					(errmsg("online backup was canceled, recovery cannot continue")));
 
 		/*
 		 * If we see a shutdown checkpoint, we know that nothing was running
@@ -8990,6 +9011,8 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile)
 						 startpoint.xlogid, startpoint.xrecoff, xlogfilename);
 		appendStringInfo(&labelfbuf, "CHECKPOINT LOCATION: %X/%X\n",
 						 checkpointloc.xlogid, checkpointloc.xrecoff);
+		appendStringInfo(&labelfbuf, "BACKUP METHOD: %s\n",
+						 exclusive ? "pg_start_backup" : "streamed");
 		appendStringInfo(&labelfbuf, "START TIME: %s\n", strfbuf);
 		appendStringInfo(&labelfbuf, "LABEL: %s\n", backupidstr);
 
@@ -9337,7 +9360,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive)
 						(errmsg("pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)",
 								waits),
 						 errhint("Check that your archive_command is executing properly.  "
-								 "pg_stop_backup can be cancelled safely, "
+								 "pg_stop_backup can be canceled safely, "
 								 "but the database backup will not be usable without all the WAL segments.")));
 			}
 		}
@@ -9719,15 +9742,19 @@ pg_xlogfile_name(PG_FUNCTION_ARGS)
  *
  * Returns TRUE if a backup_label was found (and fills the checkpoint
  * location and its REDO location into *checkPointLoc and RedoStartLSN,
- * respectively); returns FALSE if not.
+ * respectively); returns FALSE if not. If this backup_label came from a
+ * streamed backup, *backupEndRequired is set to TRUE.
  */
 static bool
-read_backup_label(XLogRecPtr *checkPointLoc)
+read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired)
 {
 	char		startxlogfilename[MAXFNAMELEN];
 	TimeLineID	tli;
 	FILE	   *lfp;
 	char		ch;
+	char		backuptype[20];
+
+	*backupEndRequired = false;
 
 	/*
 	 * See if label file is present
@@ -9760,6 +9787,16 @@ read_backup_label(XLogRecPtr *checkPointLoc)
 		ereport(FATAL,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE)));
+	/*
+	 * BACKUP METHOD line didn't exist in 9.1beta3 and earlier, so don't
+	 * error out if it doesn't exist.
+	 */
+	if (fscanf(lfp, "BACKUP METHOD: %19s", backuptype) == 1)
+	{
+		if (strcmp(backuptype, "streamed") == 0)
+			*backupEndRequired = true;
+	}
+
 	if (ferror(lfp) || FreeFile(lfp))
 		ereport(FATAL,
 				(errcode_for_file_access(),
@@ -9819,13 +9856,13 @@ CancelBackup(void)
 	if (stat(BACKUP_LABEL_FILE, &stat_buf) < 0)
 		return;
 
-	/* remove leftover file from previously cancelled backup if it exists */
+	/* remove leftover file from previously canceled backup if it exists */
 	unlink(BACKUP_LABEL_OLD);
 
 	if (rename(BACKUP_LABEL_FILE, BACKUP_LABEL_OLD) == 0)
 	{
 		ereport(LOG,
-				(errmsg("online backup mode cancelled"),
+				(errmsg("online backup mode canceled"),
 				 errdetail("\"%s\" was renamed to \"%s\".",
 						   BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 	}
@@ -9833,7 +9870,7 @@ CancelBackup(void)
 	{
 		ereport(WARNING,
 				(errcode_for_file_access(),
-				 errmsg("online backup mode was not cancelled"),
+				 errmsg("online backup mode was not canceled"),
 				 errdetail("Could not rename \"%s\" to \"%s\": %m.",
 						   BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 	}
@@ -9881,34 +9918,50 @@ startupproc_quickdie(SIGNAL_ARGS)
 static void
 StartupProcSigUsr1Handler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	latch_sigusr1_handler();
+
+	errno = save_errno;
 }
 
 /* SIGUSR2: set flag to finish recovery */
 static void
 StartupProcTriggerHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	promote_triggered = true;
 	WakeupRecovery();
+
+	errno = save_errno;
 }
 
 /* SIGHUP: set flag to re-read config file at next convenient time */
 static void
 StartupProcSigHupHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	got_SIGHUP = true;
 	WakeupRecovery();
+
+	errno = save_errno;
 }
 
 /* SIGTERM: set flag to abort redo and exit */
 static void
 StartupProcShutdownHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	if (in_restore_command)
 		proc_exit(1);
 	else
 		shutdown_requested = true;
 	WakeupRecovery();
+
+	errno = save_errno;
 }
 
 /* Handle SIGHUP and SIGTERM signals of startup process */
@@ -10161,7 +10214,7 @@ XLogPageRead(XLogRecPtr *RecPtr, int emode, bool fetching_ckpt,
 					/*
 					 * Wait for more WAL to arrive, or timeout to be reached
 					 */
-					WaitLatch(&XLogCtl->recoveryWakeupLatch, 5000000L);
+					WaitLatch(&XLogCtl->recoveryWakeupLatch, 5000L);
 					ResetLatch(&XLogCtl->recoveryWakeupLatch);
 				}
 				else
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index a9d242869897d..f3e85aa31bb78 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -248,7 +248,7 @@ Boot_CreateStmt:
 													  (Datum) 0,
 													  false,
 													  true);
-						elog(DEBUG4, "relation created with oid %u", id);
+						elog(DEBUG4, "relation created with OID %u", id);
 					}
 					do_end();
 				}
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index c459c1e221383..e182455411637 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -98,6 +98,7 @@ typedef struct
 #define DEPFLAG_AUTO		0x0004		/* reached via auto dependency */
 #define DEPFLAG_INTERNAL	0x0008		/* reached via internal dependency */
 #define DEPFLAG_EXTENSION	0x0010		/* reached via extension dependency */
+#define DEPFLAG_REVERSE		0x0020		/* reverse internal/extension link */
 
 
 /* expansible list of ObjectAddresses */
@@ -190,6 +191,9 @@ static void add_exact_object_address_extra(const ObjectAddress *object,
 static bool object_address_present_add_flags(const ObjectAddress *object,
 								 int flags,
 								 ObjectAddresses *addrs);
+static bool stack_address_present_add_flags(const ObjectAddress *object,
+								int flags,
+								ObjectAddressStack *stack);
 static void getRelationDescription(StringInfo buffer, Oid relid);
 static void getOpFamilyDescription(StringInfo buffer, Oid opfid);
 
@@ -459,7 +463,6 @@ findDependentObjects(const ObjectAddress *object,
 	ObjectAddress otherObject;
 	ObjectAddressStack mystack;
 	ObjectAddressExtra extra;
-	ObjectAddressStack *stackptr;
 
 	/*
 	 * If the target object is already being visited in an outer recursion
@@ -477,27 +480,8 @@ findDependentObjects(const ObjectAddress *object,
 	 * auto dependency, too, if we had to.	However there are no known cases
 	 * where that would be necessary.
 	 */
-	for (stackptr = stack; stackptr; stackptr = stackptr->next)
-	{
-		if (object->classId == stackptr->object->classId &&
-			object->objectId == stackptr->object->objectId)
-		{
-			if (object->objectSubId == stackptr->object->objectSubId)
-			{
-				stackptr->flags |= flags;
-				return;
-			}
-
-			/*
-			 * Could visit column with whole table already on stack; this is
-			 * the same case noted in object_address_present_add_flags().
-			 * (It's not clear this can really happen, but we might as well
-			 * check.)
-			 */
-			if (stackptr->object->objectSubId == 0)
-				return;
-		}
-	}
+	if (stack_address_present_add_flags(object, flags, stack))
+		return;
 
 	/*
 	 * It's also possible that the target object has already been completely
@@ -513,12 +497,13 @@ findDependentObjects(const ObjectAddress *object,
 
 	/*
 	 * The target object might be internally dependent on some other object
-	 * (its "owner").  If so, and if we aren't recursing from the owning
-	 * object, we have to transform this deletion request into a deletion
-	 * request of the owning object.  (We'll eventually recurse back to this
-	 * object, but the owning object has to be visited first so it will be
-	 * deleted after.)	The way to find out about this is to scan the
-	 * pg_depend entries that show what this object depends on.
+	 * (its "owner"), and/or be a member of an extension (also considered its
+	 * owner).  If so, and if we aren't recursing from the owning object, we
+	 * have to transform this deletion request into a deletion request of the
+	 * owning object.  (We'll eventually recurse back to this object, but the
+	 * owning object has to be visited first so it will be deleted after.)
+	 * The way to find out about this is to scan the pg_depend entries that
+	 * show what this object depends on.
 	 */
 	ScanKeyInit(&key[0],
 				Anum_pg_depend_classid,
@@ -567,7 +552,7 @@ findDependentObjects(const ObjectAddress *object,
 				 * 1. At the outermost recursion level, disallow the DROP. (We
 				 * just ereport here, rather than proceeding, since no other
 				 * dependencies are likely to be interesting.)	However, if
-				 * the other object is listed in pendingObjects, just release
+				 * the owning object is listed in pendingObjects, just release
 				 * the caller's lock and return; we'll eventually complete the
 				 * DROP when we reach that entry in the pending list.
 				 */
@@ -595,31 +580,31 @@ findDependentObjects(const ObjectAddress *object,
 
 				/*
 				 * 2. When recursing from the other end of this dependency,
-				 * it's okay to continue with the deletion. This holds when
+				 * it's okay to continue with the deletion.  This holds when
 				 * recursing from a whole object that includes the nominal
-				 * other end as a component, too.
+				 * other end as a component, too.  Since there can be more
+				 * than one "owning" object, we have to allow matches that
+				 * are more than one level down in the stack.
 				 */
-				if (stack->object->classId == otherObject.classId &&
-					stack->object->objectId == otherObject.objectId &&
-					(stack->object->objectSubId == otherObject.objectSubId ||
-					 stack->object->objectSubId == 0))
+				if (stack_address_present_add_flags(&otherObject, 0, stack))
 					break;
 
 				/*
-				 * 3. When recursing from anyplace else, transform this
-				 * deletion request into a delete of the other object.
+				 * 3. Not all the owning objects have been visited, so
+				 * transform this deletion request into a delete of this
+				 * owning object.
 				 *
 				 * First, release caller's lock on this object and get
-				 * deletion lock on the other object.  (We must release
+				 * deletion lock on the owning object.  (We must release
 				 * caller's lock to avoid deadlock against a concurrent
-				 * deletion of the other object.)
+				 * deletion of the owning object.)
 				 */
 				ReleaseDeletionLock(object);
 				AcquireDeletionLock(&otherObject);
 
 				/*
-				 * The other object might have been deleted while we waited to
-				 * lock it; if so, neither it nor the current object are
+				 * The owning object might have been deleted while we waited
+				 * to lock it; if so, neither it nor the current object are
 				 * interesting anymore.  We test this by checking the
 				 * pg_depend entry (see notes below).
 				 */
@@ -631,13 +616,18 @@ findDependentObjects(const ObjectAddress *object,
 				}
 
 				/*
-				 * Okay, recurse to the other object instead of proceeding. We
-				 * treat this exactly as if the original reference had linked
-				 * to that object instead of this one; hence, pass through the
-				 * same flags and stack.
+				 * Okay, recurse to the owning object instead of proceeding.
+				 *
+				 * We do not need to stack the current object; we want the
+				 * traversal order to be as if the original reference had
+				 * linked to the owning object instead of this one.
+				 *
+				 * The dependency type is a "reverse" dependency: we need to
+				 * delete the owning object if this one is to be deleted, but
+				 * this linkage is never a reason for an automatic deletion.
 				 */
 				findDependentObjects(&otherObject,
-									 flags,
+									 DEPFLAG_REVERSE,
 									 stack,
 									 targetObjects,
 									 pendingObjects,
@@ -2016,6 +2006,43 @@ object_address_present_add_flags(const ObjectAddress *object,
 	return false;
 }
 
+/*
+ * Similar to above, except we search an ObjectAddressStack.
+ */
+static bool
+stack_address_present_add_flags(const ObjectAddress *object,
+								int flags,
+								ObjectAddressStack *stack)
+{
+	ObjectAddressStack *stackptr;
+
+	for (stackptr = stack; stackptr; stackptr = stackptr->next)
+	{
+		const ObjectAddress *thisobj = stackptr->object;
+
+		if (object->classId == thisobj->classId &&
+			object->objectId == thisobj->objectId)
+		{
+			if (object->objectSubId == thisobj->objectSubId)
+			{
+				stackptr->flags |= flags;
+				return true;
+			}
+
+			/*
+			 * Could visit column with whole table already on stack; this is
+			 * the same case noted in object_address_present_add_flags(), and
+			 * as in that case, we don't propagate flags for the component to
+			 * the whole object.
+			 */
+			if (thisobj->objectSubId == 0)
+				return true;
+		}
+	}
+
+	return false;
+}
+
 /*
  * Record multiple dependencies from an ObjectAddresses array, after first
  * removing any duplicates.
@@ -2424,12 +2451,11 @@ getObjectDescription(const ObjectAddress *object)
 				initStringInfo(&opfam);
 				getOpFamilyDescription(&opfam, amopForm->amopfamily);
 
-				/*
-				 * translator: %d is the operator strategy (a number), the
-				 * first two %s's are data type names, the third %s is the
-				 * description of the operator family, and the last %s is the
-				 * textual form of the operator with arguments.
-				 */
+				/*------
+				   translator: %d is the operator strategy (a number), the
+				   first two %s's are data type names, the third %s is the
+				   description of the operator family, and the last %s is the
+				   textual form of the operator with arguments.  */
 				appendStringInfo(&buffer, _("operator %d (%s, %s) of %s: %s"),
 								 amopForm->amopstrategy,
 								 format_type_be(amopForm->amoplefttype),
@@ -2475,12 +2501,11 @@ getObjectDescription(const ObjectAddress *object)
 				initStringInfo(&opfam);
 				getOpFamilyDescription(&opfam, amprocForm->amprocfamily);
 
-				/*
-				 * translator: %d is the function number, the first two %s's
-				 * are data type names, the third %s is the description of the
-				 * operator family, and the last %s is the textual form of the
-				 * function with arguments.
-				 */
+				/*------
+				   translator: %d is the function number, the first two %s's
+				   are data type names, the third %s is the description of the
+				   operator family, and the last %s is the textual form of the
+				   function with arguments.  */
 				appendStringInfo(&buffer, _("function %d (%s, %s) of %s: %s"),
 								 amprocForm->amprocnum,
 								 format_type_be(amprocForm->amproclefttype),
@@ -2862,6 +2887,9 @@ getRelationDescription(StringInfo buffer, Oid relid)
 		case RELKIND_VIEW:
 			appendStringInfo(buffer, _("view %s"),
 							 relname);
+		case RELKIND_MAT_VIEW:
+			appendStringInfo(buffer, _("matview %s"),
+							 relname);
 			break;
 		case RELKIND_COMPOSITE_TYPE:
 			appendStringInfo(buffer, _("composite type %s"),
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index a6e541d858694..aa7279a1bc130 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -81,31 +81,31 @@ Oid			binary_upgrade_next_heap_pg_class_oid = InvalidOid;
 Oid			binary_upgrade_next_toast_pg_class_oid = InvalidOid;
 
 static void AddNewRelationTuple(Relation pg_class_desc,
-					Relation new_rel_desc,
-					Oid new_rel_oid,
-					Oid new_type_oid,
-					Oid reloftype,
-					Oid relowner,
-					char relkind,
-					Datum relacl,
-					Datum reloptions);
+				Relation new_rel_desc,
+				Oid new_rel_oid,
+				Oid new_type_oid,
+				Oid reloftype,
+				Oid relowner,
+				char relkind,
+				Datum relacl,
+				Datum reloptions);
 static Oid AddNewRelationType(const char *typeName,
-				   Oid typeNamespace,
-				   Oid new_rel_oid,
-				   char new_rel_kind,
-				   Oid ownerid,
-				   Oid new_row_type,
-				   Oid new_array_type);
+			      Oid typeNamespace,
+			      Oid new_rel_oid,
+			      char new_rel_kind,
+			      Oid ownerid,
+			      Oid new_row_type,
+			      Oid new_array_type);
 static void RelationRemoveInheritance(Oid relid);
 static void StoreRelCheck(Relation rel, char *ccname, Node *expr,
 			  bool is_local, int inhcount);
 static void StoreConstraints(Relation rel, List *cooked_constraints);
 static bool MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
-							bool allow_merge, bool is_local);
+					bool allow_merge, bool is_local);
 static void SetRelationNumChecks(Relation rel, int numchecks);
 static Node *cookConstraint(ParseState *pstate,
-			   Node *raw_constraint,
-			   char *relname);
+			    Node *raw_constraint,
+			    char *relname);
 static List *insert_ordered_unique_oid(List *list, Oid datum);
 
 
@@ -132,39 +132,39 @@ static List *insert_ordered_unique_oid(List *list, Oid datum);
  */
 
 static FormData_pg_attribute a1 = {
-	0, {"ctid"}, TIDOID, 0, sizeof(ItemPointerData),
-	SelfItemPointerAttributeNumber, 0, -1, -1,
-	false, 'p', 's', true, false, false, true, 0
+  0, {"ctid"}, TIDOID, 0, sizeof(ItemPointerData),
+  SelfItemPointerAttributeNumber, 0, -1, -1,
+  false, 'p', 's', true, false, false, true, 0
 };
 
 static FormData_pg_attribute a2 = {
-	0, {"oid"}, OIDOID, 0, sizeof(Oid),
-	ObjectIdAttributeNumber, 0, -1, -1,
-	true, 'p', 'i', true, false, false, true, 0
+  0, {"oid"}, OIDOID, 0, sizeof(Oid),
+  ObjectIdAttributeNumber, 0, -1, -1,
+  true, 'p', 'i', true, false, false, true, 0
 };
 
 static FormData_pg_attribute a3 = {
-	0, {"xmin"}, XIDOID, 0, sizeof(TransactionId),
-	MinTransactionIdAttributeNumber, 0, -1, -1,
-	true, 'p', 'i', true, false, false, true, 0
+  0, {"xmin"}, XIDOID, 0, sizeof(TransactionId),
+  MinTransactionIdAttributeNumber, 0, -1, -1,
+  true, 'p', 'i', true, false, false, true, 0
 };
 
 static FormData_pg_attribute a4 = {
-	0, {"cmin"}, CIDOID, 0, sizeof(CommandId),
-	MinCommandIdAttributeNumber, 0, -1, -1,
-	true, 'p', 'i', true, false, false, true, 0
+  0, {"cmin"}, CIDOID, 0, sizeof(CommandId),
+  MinCommandIdAttributeNumber, 0, -1, -1,
+  true, 'p', 'i', true, false, false, true, 0
 };
 
 static FormData_pg_attribute a5 = {
-	0, {"xmax"}, XIDOID, 0, sizeof(TransactionId),
-	MaxTransactionIdAttributeNumber, 0, -1, -1,
-	true, 'p', 'i', true, false, false, true, 0
+  0, {"xmax"}, XIDOID, 0, sizeof(TransactionId),
+  MaxTransactionIdAttributeNumber, 0, -1, -1,
+  true, 'p', 'i', true, false, false, true, 0
 };
 
 static FormData_pg_attribute a6 = {
-	0, {"cmax"}, CIDOID, 0, sizeof(CommandId),
-	MaxCommandIdAttributeNumber, 0, -1, -1,
-	true, 'p', 'i', true, false, false, true, 0
+  0, {"cmax"}, CIDOID, 0, sizeof(CommandId),
+  MaxCommandIdAttributeNumber, 0, -1, -1,
+  true, 'p', 'i', true, false, false, true, 0
 };
 
 /*
@@ -174,9 +174,9 @@ static FormData_pg_attribute a6 = {
  * used in SQL.
  */
 static FormData_pg_attribute a7 = {
-	0, {"tableoid"}, OIDOID, 0, sizeof(Oid),
-	TableOidAttributeNumber, 0, -1, -1,
-	true, 'p', 'i', true, false, false, true, 0
+  0, {"tableoid"}, OIDOID, 0, sizeof(Oid),
+  TableOidAttributeNumber, 0, -1, -1,
+  true, 'p', 'i', true, false, false, true, 0
 };
 
 static const Form_pg_attribute SysAtt[] = {&a1, &a2, &a3, &a4, &a5, &a6, &a7};
@@ -189,11 +189,11 @@ static const Form_pg_attribute SysAtt[] = {&a1, &a2, &a3, &a4, &a5, &a6, &a7};
 Form_pg_attribute
 SystemAttributeDefinition(AttrNumber attno, bool relhasoids)
 {
-	if (attno >= 0 || attno < -(int) lengthof(SysAtt))
-		elog(ERROR, "invalid system attribute number %d", attno);
-	if (attno == ObjectIdAttributeNumber && !relhasoids)
-		elog(ERROR, "invalid system attribute number %d", attno);
-	return SysAtt[-attno - 1];
+  if (attno >= 0 || attno < -(int) lengthof(SysAtt))
+    elog(ERROR, "invalid system attribute number %d", attno);
+  if (attno == ObjectIdAttributeNumber && !relhasoids)
+    elog(ERROR, "invalid system attribute number %d", attno);
+  return SysAtt[-attno - 1];
 }
 
 /*
@@ -203,20 +203,20 @@ SystemAttributeDefinition(AttrNumber attno, bool relhasoids)
 Form_pg_attribute
 SystemAttributeByName(const char *attname, bool relhasoids)
 {
-	int			j;
+  int			j;
 
-	for (j = 0; j < (int) lengthof(SysAtt); j++)
-	{
-		Form_pg_attribute att = SysAtt[j];
+  for (j = 0; j < (int) lengthof(SysAtt); j++)
+    {
+      Form_pg_attribute att = SysAtt[j];
 
-		if (relhasoids || att->attnum != ObjectIdAttributeNumber)
-		{
-			if (strcmp(NameStr(att->attname), attname) == 0)
-				return att;
-		}
+      if (relhasoids || att->attnum != ObjectIdAttributeNumber)
+	{
+	  if (strcmp(NameStr(att->attname), attname) == 0)
+	    return att;
 	}
+    }
 
-	return NULL;
+  return NULL;
 }
 
 
@@ -237,102 +237,102 @@ SystemAttributeByName(const char *attname, bool relhasoids)
  */
 Relation
 heap_create(const char *relname,
-			Oid relnamespace,
-			Oid reltablespace,
-			Oid relid,
-			TupleDesc tupDesc,
-			char relkind,
-			char relpersistence,
-			bool shared_relation,
-			bool mapped_relation,
-			bool allow_system_table_mods)
+	    Oid relnamespace,
+	    Oid reltablespace,
+	    Oid relid,
+	    TupleDesc tupDesc,
+	    char relkind,
+	    char relpersistence,
+	    bool shared_relation,
+	    bool mapped_relation,
+	    bool allow_system_table_mods)
 {
-	bool		create_storage;
-	Relation	rel;
-
-	/* The caller must have provided an OID for the relation. */
-	Assert(OidIsValid(relid));
-
-	/*
-	 * sanity checks
-	 */
-	if (!allow_system_table_mods &&
-		(IsSystemNamespace(relnamespace) || IsToastNamespace(relnamespace)) &&
-		IsNormalProcessingMode())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("permission denied to create \"%s.%s\"",
-						get_namespace_name(relnamespace), relname),
-		errdetail("System catalog modifications are currently disallowed.")));
-
-	/*
-	 * Decide if we need storage or not, and handle a couple other special
-	 * cases for particular relkinds.
-	 */
-	switch (relkind)
-	{
-		case RELKIND_VIEW:
-		case RELKIND_COMPOSITE_TYPE:
-		case RELKIND_FOREIGN_TABLE:
-			create_storage = false;
-
-			/*
-			 * Force reltablespace to zero if the relation has no physical
-			 * storage.  This is mainly just for cleanliness' sake.
-			 */
-			reltablespace = InvalidOid;
-			break;
-		case RELKIND_SEQUENCE:
-			create_storage = true;
-
-			/*
-			 * Force reltablespace to zero for sequences, since we don't
-			 * support moving them around into different tablespaces.
-			 */
-			reltablespace = InvalidOid;
-			break;
-		default:
-			create_storage = true;
-			break;
-	}
-
-	/*
-	 * Never allow a pg_class entry to explicitly specify the database's
-	 * default tablespace in reltablespace; force it to zero instead. This
-	 * ensures that if the database is cloned with a different default
-	 * tablespace, the pg_class entry will still match where CREATE DATABASE
-	 * will put the physically copied relation.
-	 *
-	 * Yes, this is a bit of a hack.
-	 */
-	if (reltablespace == MyDatabaseTableSpace)
-		reltablespace = InvalidOid;
-
-	/*
-	 * build the relcache entry.
-	 */
-	rel = RelationBuildLocalRelation(relname,
-									 relnamespace,
-									 tupDesc,
-									 relid,
-									 reltablespace,
-									 shared_relation,
-									 mapped_relation,
-									 relpersistence);
-
-	/*
-	 * Have the storage manager create the relation's disk file, if needed.
-	 *
-	 * We only create the main fork here, other forks will be created on
-	 * demand.
-	 */
-	if (create_storage)
-	{
-		RelationOpenSmgr(rel);
-		RelationCreateStorage(rel->rd_node, relpersistence);
-	}
-
-	return rel;
+  bool		create_storage;
+  Relation	rel;
+
+  /* The caller must have provided an OID for the relation. */
+  Assert(OidIsValid(relid));
+
+  /*
+   * sanity checks
+   */
+  if (!allow_system_table_mods &&
+      (IsSystemNamespace(relnamespace) || IsToastNamespace(relnamespace)) &&
+      IsNormalProcessingMode())
+    ereport(ERROR,
+	    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+	     errmsg("permission denied to create \"%s.%s\"",
+		    get_namespace_name(relnamespace), relname),
+	     errdetail("System catalog modifications are currently disallowed.")));
+
+  /*
+   * Decide if we need storage or not, and handle a couple other special
+   * cases for particular relkinds.
+   */
+  switch (relkind)
+    {
+    case RELKIND_VIEW:
+    case RELKIND_COMPOSITE_TYPE:
+    case RELKIND_FOREIGN_TABLE:
+      create_storage = false;
+
+      /*
+       * Force reltablespace to zero if the relation has no physical
+       * storage.  This is mainly just for cleanliness' sake.
+       */
+      reltablespace = InvalidOid;
+      break;
+    case RELKIND_SEQUENCE:
+      create_storage = true;
+
+      /*
+       * Force reltablespace to zero for sequences, since we don't
+       * support moving them around into different tablespaces.
+       */
+      reltablespace = InvalidOid;
+      break;
+    default:
+      create_storage = true;
+      break;
+    }
+
+  /*
+   * Never allow a pg_class entry to explicitly specify the database's
+   * default tablespace in reltablespace; force it to zero instead. This
+   * ensures that if the database is cloned with a different default
+   * tablespace, the pg_class entry will still match where CREATE DATABASE
+   * will put the physically copied relation.
+   *
+   * Yes, this is a bit of a hack.
+   */
+  if (reltablespace == MyDatabaseTableSpace)
+    reltablespace = InvalidOid;
+
+  /*
+   * build the relcache entry.
+   */
+  rel = RelationBuildLocalRelation(relname,
+				   relnamespace,
+				   tupDesc,
+				   relid,
+				   reltablespace,
+				   shared_relation,
+				   mapped_relation,
+				   relpersistence);
+
+  /*
+   * Have the storage manager create the relation's disk file, if needed.
+   *
+   * We only create the main fork here, other forks will be created on
+   * demand.
+   */
+  if (create_storage)
+    {
+      RelationOpenSmgr(rel);
+      RelationCreateStorage(rel->rd_node, relpersistence);
+    }
+
+  return rel;
 }
 
 /* ----------------------------------------------------------------
@@ -376,65 +376,66 @@ heap_create(const char *relname,
  */
 void
 CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
-						 bool allow_system_table_mods)
+			 bool allow_system_table_mods)
 {
-	int			i;
-	int			j;
-	int			natts = tupdesc->natts;
-
-	/* Sanity check on column count */
-	if (natts < 0 || natts > MaxHeapAttributeNumber)
-		ereport(ERROR,
-				(errcode(ERRCODE_TOO_MANY_COLUMNS),
-				 errmsg("tables can have at most %d columns",
-						MaxHeapAttributeNumber)));
-
-	/*
-	 * first check for collision with system attribute names
-	 *
-	 * Skip this for a view or type relation, since those don't have system
-	 * attributes.
-	 */
-	if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE)
+  int			i;
+  int			j;
+  int			natts = tupdesc->natts;
+
+  /* Sanity check on column count */
+  if (natts < 0 || natts > MaxHeapAttributeNumber)
+    ereport(ERROR,
+	    (errcode(ERRCODE_TOO_MANY_COLUMNS),
+	     errmsg("tables can have at most %d columns",
+		    MaxHeapAttributeNumber)));
+
+  /*
+   * first check for collision with system attribute names
+   *
+   * Skip this for a view or type relation, since those don't have system
+   * attributes.
+   */
+  //? To be checked
+  if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE)
+    {
+      for (i = 0; i < natts; i++)
 	{
-		for (i = 0; i < natts; i++)
-		{
-			if (SystemAttributeByName(NameStr(tupdesc->attrs[i]->attname),
-									  tupdesc->tdhasoid) != NULL)
-				ereport(ERROR,
-						(errcode(ERRCODE_DUPLICATE_COLUMN),
-						 errmsg("column name \"%s\" conflicts with a system column name",
-								NameStr(tupdesc->attrs[i]->attname))));
-		}
+	  if (SystemAttributeByName(NameStr(tupdesc->attrs[i]->attname),
+				    tupdesc->tdhasoid) != NULL)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DUPLICATE_COLUMN),
+		     errmsg("column name \"%s\" conflicts with a system column name",
+			    NameStr(tupdesc->attrs[i]->attname))));
 	}
-
-	/*
-	 * next check for repeated attribute names
-	 */
-	for (i = 1; i < natts; i++)
+    }
+
+  /*
+   * next check for repeated attribute names
+   */
+  for (i = 1; i < natts; i++)
+    {
+      for (j = 0; j < i; j++)
 	{
-		for (j = 0; j < i; j++)
-		{
-			if (strcmp(NameStr(tupdesc->attrs[j]->attname),
-					   NameStr(tupdesc->attrs[i]->attname)) == 0)
-				ereport(ERROR,
-						(errcode(ERRCODE_DUPLICATE_COLUMN),
-						 errmsg("column name \"%s\" specified more than once",
-								NameStr(tupdesc->attrs[j]->attname))));
-		}
-	}
-
-	/*
-	 * next check the attribute types
-	 */
-	for (i = 0; i < natts; i++)
-	{
-		CheckAttributeType(NameStr(tupdesc->attrs[i]->attname),
-						   tupdesc->attrs[i]->atttypid,
-						   tupdesc->attrs[i]->attcollation,
-						   NIL, /* assume we're creating a new rowtype */
-						   allow_system_table_mods);
+	  if (strcmp(NameStr(tupdesc->attrs[j]->attname),
+		     NameStr(tupdesc->attrs[i]->attname)) == 0)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DUPLICATE_COLUMN),
+		     errmsg("column name \"%s\" specified more than once",
+			    NameStr(tupdesc->attrs[j]->attname))));
 	}
+    }
+
+  /*
+   * next check the attribute types
+   */
+  for (i = 0; i < natts; i++)
+    {
+      CheckAttributeType(NameStr(tupdesc->attrs[i]->attname),
+			 tupdesc->attrs[i]->atttypid,
+			 tupdesc->attrs[i]->attcollation,
+			 NIL, /* assume we're creating a new rowtype */
+			 allow_system_table_mods);
+    }
 }
 
 /* --------------------------------
@@ -454,110 +455,110 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
  */
 void
 CheckAttributeType(const char *attname,
-				   Oid atttypid, Oid attcollation,
-				   List *containing_rowtypes,
-				   bool allow_system_table_mods)
+		   Oid atttypid, Oid attcollation,
+		   List *containing_rowtypes,
+		   bool allow_system_table_mods)
 {
-	char		att_typtype = get_typtype(atttypid);
-	Oid			att_typelem;
-
-	if (atttypid == UNKNOWNOID)
-	{
-		/*
-		 * Warn user, but don't fail, if column to be created has UNKNOWN type
-		 * (usually as a result of a 'retrieve into' - jolly)
-		 */
-		ereport(WARNING,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("column \"%s\" has type \"unknown\"", attname),
-				 errdetail("Proceeding with relation creation anyway.")));
-	}
-	else if (att_typtype == TYPTYPE_PSEUDO)
+  char		att_typtype = get_typtype(atttypid);
+  Oid			att_typelem;
+
+  if (atttypid == UNKNOWNOID)
+    {
+      /*
+       * Warn user, but don't fail, if column to be created has UNKNOWN type
+       * (usually as a result of a 'retrieve into' - jolly)
+       */
+      ereport(WARNING,
+	      (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	       errmsg("column \"%s\" has type \"unknown\"", attname),
+	       errdetail("Proceeding with relation creation anyway.")));
+    }
+  else if (att_typtype == TYPTYPE_PSEUDO)
+    {
+      /*
+       * Refuse any attempt to create a pseudo-type column, except for a
+       * special hack for pg_statistic: allow ANYARRAY when modifying system
+       * catalogs (this allows creating pg_statistic and cloning it during
+       * VACUUM FULL)
+       */
+      if (atttypid != ANYARRAYOID || !allow_system_table_mods)
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("column \"%s\" has pseudo-type %s",
+			attname, format_type_be(atttypid))));
+    }
+  else if (att_typtype == TYPTYPE_DOMAIN)
+    {
+      /*
+       * If it's a domain, recurse to check its base type.
+       */
+      CheckAttributeType(attname, getBaseType(atttypid), attcollation,
+			 containing_rowtypes,
+			 allow_system_table_mods);
+    }
+  else if (att_typtype == TYPTYPE_COMPOSITE)
+    {
+      /*
+       * For a composite type, recurse into its attributes.
+       */
+      Relation	relation;
+      TupleDesc	tupdesc;
+      int			i;
+
+      /*
+       * Check for self-containment.	Eventually we might be able to allow
+       * this (just return without complaint, if so) but it's not clear how
+       * many other places would require anti-recursion defenses before it
+       * would be safe to allow tables to contain their own rowtype.
+       */
+      if (list_member_oid(containing_rowtypes, atttypid))
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("composite type %s cannot be made a member of itself",
+			format_type_be(atttypid))));
+
+      containing_rowtypes = lcons_oid(atttypid, containing_rowtypes);
+
+      relation = relation_open(get_typ_typrelid(atttypid), AccessShareLock);
+
+      tupdesc = RelationGetDescr(relation);
+
+      for (i = 0; i < tupdesc->natts; i++)
 	{
-		/*
-		 * Refuse any attempt to create a pseudo-type column, except for a
-		 * special hack for pg_statistic: allow ANYARRAY when modifying system
-		 * catalogs (this allows creating pg_statistic and cloning it during
-		 * VACUUM FULL)
-		 */
-		if (atttypid != ANYARRAYOID || !allow_system_table_mods)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-					 errmsg("column \"%s\" has pseudo-type %s",
-							attname, format_type_be(atttypid))));
-	}
-	else if (att_typtype == TYPTYPE_DOMAIN)
-	{
-		/*
-		 * If it's a domain, recurse to check its base type.
-		 */
-		CheckAttributeType(attname, getBaseType(atttypid), attcollation,
-						   containing_rowtypes,
-						   allow_system_table_mods);
-	}
-	else if (att_typtype == TYPTYPE_COMPOSITE)
-	{
-		/*
-		 * For a composite type, recurse into its attributes.
-		 */
-		Relation	relation;
-		TupleDesc	tupdesc;
-		int			i;
-
-		/*
-		 * Check for self-containment.	Eventually we might be able to allow
-		 * this (just return without complaint, if so) but it's not clear how
-		 * many other places would require anti-recursion defenses before it
-		 * would be safe to allow tables to contain their own rowtype.
-		 */
-		if (list_member_oid(containing_rowtypes, atttypid))
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				errmsg("composite type %s cannot be made a member of itself",
-					   format_type_be(atttypid))));
-
-		containing_rowtypes = lcons_oid(atttypid, containing_rowtypes);
-
-		relation = relation_open(get_typ_typrelid(atttypid), AccessShareLock);
-
-		tupdesc = RelationGetDescr(relation);
-
-		for (i = 0; i < tupdesc->natts; i++)
-		{
-			Form_pg_attribute attr = tupdesc->attrs[i];
-
-			if (attr->attisdropped)
-				continue;
-			CheckAttributeType(NameStr(attr->attname),
-							   attr->atttypid, attr->attcollation,
-							   containing_rowtypes,
-							   allow_system_table_mods);
-		}
-
-		relation_close(relation, AccessShareLock);
-
-		containing_rowtypes = list_delete_first(containing_rowtypes);
-	}
-	else if (OidIsValid((att_typelem = get_element_type(atttypid))))
-	{
-		/*
-		 * Must recurse into array types, too, in case they are composite.
-		 */
-		CheckAttributeType(attname, att_typelem, attcollation,
-						   containing_rowtypes,
-						   allow_system_table_mods);
+	  Form_pg_attribute attr = tupdesc->attrs[i];
+
+	  if (attr->attisdropped)
+	    continue;
+	  CheckAttributeType(NameStr(attr->attname),
+			     attr->atttypid, attr->attcollation,
+			     containing_rowtypes,
+			     allow_system_table_mods);
 	}
 
-	/*
-	 * This might not be strictly invalid per SQL standard, but it is pretty
-	 * useless, and it cannot be dumped, so we must disallow it.
-	 */
-	if (!OidIsValid(attcollation) && type_is_collatable(atttypid))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("no collation was derived for column \"%s\" with collatable type %s",
-						attname, format_type_be(atttypid)),
-		errhint("Use the COLLATE clause to set the collation explicitly.")));
+      relation_close(relation, AccessShareLock);
+
+      containing_rowtypes = list_delete_first(containing_rowtypes);
+    }
+  else if (OidIsValid((att_typelem = get_element_type(atttypid))))
+    {
+      /*
+       * Must recurse into array types, too, in case they are composite.
+       */
+      CheckAttributeType(attname, att_typelem, attcollation,
+			 containing_rowtypes,
+			 allow_system_table_mods);
+    }
+
+  /*
+   * This might not be strictly invalid per SQL standard, but it is pretty
+   * useless, and it cannot be dumped, so we must disallow it.
+   */
+  if (!OidIsValid(attcollation) && type_is_collatable(atttypid))
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("no collation was derived for column \"%s\" with collatable type %s",
+		    attname, format_type_be(atttypid)),
+	     errhint("Use the COLLATE clause to set the collation explicitly.")));
 }
 
 /*
@@ -574,51 +575,51 @@ CheckAttributeType(const char *attname,
  */
 void
 InsertPgAttributeTuple(Relation pg_attribute_rel,
-					   Form_pg_attribute new_attribute,
-					   CatalogIndexState indstate)
+		       Form_pg_attribute new_attribute,
+		       CatalogIndexState indstate)
 {
-	Datum		values[Natts_pg_attribute];
-	bool		nulls[Natts_pg_attribute];
-	HeapTuple	tup;
-
-	/* This is a tad tedious, but way cleaner than what we used to do... */
-	memset(values, 0, sizeof(values));
-	memset(nulls, false, sizeof(nulls));
-
-	values[Anum_pg_attribute_attrelid - 1] = ObjectIdGetDatum(new_attribute->attrelid);
-	values[Anum_pg_attribute_attname - 1] = NameGetDatum(&new_attribute->attname);
-	values[Anum_pg_attribute_atttypid - 1] = ObjectIdGetDatum(new_attribute->atttypid);
-	values[Anum_pg_attribute_attstattarget - 1] = Int32GetDatum(new_attribute->attstattarget);
-	values[Anum_pg_attribute_attlen - 1] = Int16GetDatum(new_attribute->attlen);
-	values[Anum_pg_attribute_attnum - 1] = Int16GetDatum(new_attribute->attnum);
-	values[Anum_pg_attribute_attndims - 1] = Int32GetDatum(new_attribute->attndims);
-	values[Anum_pg_attribute_attcacheoff - 1] = Int32GetDatum(new_attribute->attcacheoff);
-	values[Anum_pg_attribute_atttypmod - 1] = Int32GetDatum(new_attribute->atttypmod);
-	values[Anum_pg_attribute_attbyval - 1] = BoolGetDatum(new_attribute->attbyval);
-	values[Anum_pg_attribute_attstorage - 1] = CharGetDatum(new_attribute->attstorage);
-	values[Anum_pg_attribute_attalign - 1] = CharGetDatum(new_attribute->attalign);
-	values[Anum_pg_attribute_attnotnull - 1] = BoolGetDatum(new_attribute->attnotnull);
-	values[Anum_pg_attribute_atthasdef - 1] = BoolGetDatum(new_attribute->atthasdef);
-	values[Anum_pg_attribute_attisdropped - 1] = BoolGetDatum(new_attribute->attisdropped);
-	values[Anum_pg_attribute_attislocal - 1] = BoolGetDatum(new_attribute->attislocal);
-	values[Anum_pg_attribute_attinhcount - 1] = Int32GetDatum(new_attribute->attinhcount);
-	values[Anum_pg_attribute_attcollation - 1] = ObjectIdGetDatum(new_attribute->attcollation);
-
-	/* start out with empty permissions and empty options */
-	nulls[Anum_pg_attribute_attacl - 1] = true;
-	nulls[Anum_pg_attribute_attoptions - 1] = true;
-
-	tup = heap_form_tuple(RelationGetDescr(pg_attribute_rel), values, nulls);
-
-	/* finally insert the new tuple, update the indexes, and clean up */
-	simple_heap_insert(pg_attribute_rel, tup);
-
-	if (indstate != NULL)
-		CatalogIndexInsert(indstate, tup);
-	else
-		CatalogUpdateIndexes(pg_attribute_rel, tup);
-
-	heap_freetuple(tup);
+  Datum		values[Natts_pg_attribute];
+  bool		nulls[Natts_pg_attribute];
+  HeapTuple	tup;
+
+  /* This is a tad tedious, but way cleaner than what we used to do... */
+  memset(values, 0, sizeof(values));
+  memset(nulls, false, sizeof(nulls));
+
+  values[Anum_pg_attribute_attrelid - 1] = ObjectIdGetDatum(new_attribute->attrelid);
+  values[Anum_pg_attribute_attname - 1] = NameGetDatum(&new_attribute->attname);
+  values[Anum_pg_attribute_atttypid - 1] = ObjectIdGetDatum(new_attribute->atttypid);
+  values[Anum_pg_attribute_attstattarget - 1] = Int32GetDatum(new_attribute->attstattarget);
+  values[Anum_pg_attribute_attlen - 1] = Int16GetDatum(new_attribute->attlen);
+  values[Anum_pg_attribute_attnum - 1] = Int16GetDatum(new_attribute->attnum);
+  values[Anum_pg_attribute_attndims - 1] = Int32GetDatum(new_attribute->attndims);
+  values[Anum_pg_attribute_attcacheoff - 1] = Int32GetDatum(new_attribute->attcacheoff);
+  values[Anum_pg_attribute_atttypmod - 1] = Int32GetDatum(new_attribute->atttypmod);
+  values[Anum_pg_attribute_attbyval - 1] = BoolGetDatum(new_attribute->attbyval);
+  values[Anum_pg_attribute_attstorage - 1] = CharGetDatum(new_attribute->attstorage);
+  values[Anum_pg_attribute_attalign - 1] = CharGetDatum(new_attribute->attalign);
+  values[Anum_pg_attribute_attnotnull - 1] = BoolGetDatum(new_attribute->attnotnull);
+  values[Anum_pg_attribute_atthasdef - 1] = BoolGetDatum(new_attribute->atthasdef);
+  values[Anum_pg_attribute_attisdropped - 1] = BoolGetDatum(new_attribute->attisdropped);
+  values[Anum_pg_attribute_attislocal - 1] = BoolGetDatum(new_attribute->attislocal);
+  values[Anum_pg_attribute_attinhcount - 1] = Int32GetDatum(new_attribute->attinhcount);
+  values[Anum_pg_attribute_attcollation - 1] = ObjectIdGetDatum(new_attribute->attcollation);
+
+  /* start out with empty permissions and empty options */
+  nulls[Anum_pg_attribute_attacl - 1] = true;
+  nulls[Anum_pg_attribute_attoptions - 1] = true;
+
+  tup = heap_form_tuple(RelationGetDescr(pg_attribute_rel), values, nulls);
+
+  /* finally insert the new tuple, update the indexes, and clean up */
+  simple_heap_insert(pg_attribute_rel, tup);
+
+  if (indstate != NULL)
+    CatalogIndexInsert(indstate, tup);
+  else
+    CatalogUpdateIndexes(pg_attribute_rel, tup);
+
+  heap_freetuple(tup);
 }
 
 /* --------------------------------
@@ -630,99 +631,98 @@ InsertPgAttributeTuple(Relation pg_attribute_rel,
  */
 static void
 AddNewAttributeTuples(Oid new_rel_oid,
-					  TupleDesc tupdesc,
-					  char relkind,
-					  bool oidislocal,
-					  int oidinhcount)
+		      TupleDesc tupdesc,
+		      char relkind,
+		      bool oidislocal,
+		      int oidinhcount)
 {
-	Form_pg_attribute attr;
-	int			i;
-	Relation	rel;
-	CatalogIndexState indstate;
-	int			natts = tupdesc->natts;
-	ObjectAddress myself,
-				referenced;
-
-	/*
-	 * open pg_attribute and its indexes.
-	 */
-	rel = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	indstate = CatalogOpenIndexes(rel);
-
-	/*
-	 * First we add the user attributes.  This is also a convenient place to
-	 * add dependencies on their datatypes and collations.
-	 */
-	for (i = 0; i < natts; i++)
+  Form_pg_attribute attr;
+  int			i;
+  Relation	rel;
+  CatalogIndexState indstate;
+  int			natts = tupdesc->natts;
+  ObjectAddress myself,
+    referenced;
+  /*
+   * open pg_attribute and its indexes.
+   */
+  rel = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  indstate = CatalogOpenIndexes(rel);
+
+  /*
+   * First we add the user attributes.  This is also a convenient place to
+   * add dependencies on their datatypes and collations.
+   */
+  for (i = 0; i < natts; i++)
+    {
+      attr = tupdesc->attrs[i];
+      /* Fill in the correct relation OID */
+      attr->attrelid = new_rel_oid;
+      /* Make sure these are OK, too */
+      attr->attstattarget = -1;
+      attr->attcacheoff = -1;
+
+      InsertPgAttributeTuple(rel, attr, indstate);
+
+      /* Add dependency info */
+      myself.classId = RelationRelationId;
+      myself.objectId = new_rel_oid;
+      myself.objectSubId = i + 1;
+      referenced.classId = TypeRelationId;
+      referenced.objectId = attr->atttypid;
+      referenced.objectSubId = 0;
+      recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+      /* The default collation is pinned, so don't bother recording it */
+      if (OidIsValid(attr->attcollation) &&
+	  attr->attcollation != DEFAULT_COLLATION_OID)
 	{
-		attr = tupdesc->attrs[i];
-		/* Fill in the correct relation OID */
-		attr->attrelid = new_rel_oid;
-		/* Make sure these are OK, too */
-		attr->attstattarget = -1;
-		attr->attcacheoff = -1;
-
-		InsertPgAttributeTuple(rel, attr, indstate);
-
-		/* Add dependency info */
-		myself.classId = RelationRelationId;
-		myself.objectId = new_rel_oid;
-		myself.objectSubId = i + 1;
-		referenced.classId = TypeRelationId;
-		referenced.objectId = attr->atttypid;
-		referenced.objectSubId = 0;
-		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-
-		/* The default collation is pinned, so don't bother recording it */
-		if (OidIsValid(attr->attcollation) &&
-			attr->attcollation != DEFAULT_COLLATION_OID)
-		{
-			referenced.classId = CollationRelationId;
-			referenced.objectId = attr->attcollation;
-			referenced.objectSubId = 0;
-			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-		}
+	  referenced.classId = CollationRelationId;
+	  referenced.objectId = attr->attcollation;
+	  referenced.objectSubId = 0;
+	  recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 	}
-
-	/*
-	 * Next we add the system attributes.  Skip OID if rel has no OIDs. Skip
-	 * all for a view or type relation.  We don't bother with making datatype
-	 * dependencies here, since presumably all these types are pinned.
-	 */
-	if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE)
+    }
+
+  /*
+   * Next we add the system attributes.  Skip OID if rel has no OIDs. Skip
+   * all for a view or type relation.  We don't bother with making datatype
+   * dependencies here, since presumably all these types are pinned.
+   */
+  if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE)
+    {
+      for (i = 0; i < (int) lengthof(SysAtt); i++)
 	{
-		for (i = 0; i < (int) lengthof(SysAtt); i++)
-		{
-			FormData_pg_attribute attStruct;
+	  FormData_pg_attribute attStruct;
 
-			/* skip OID where appropriate */
-			if (!tupdesc->tdhasoid &&
-				SysAtt[i]->attnum == ObjectIdAttributeNumber)
-				continue;
+	  /* skip OID where appropriate */
+	  if (!tupdesc->tdhasoid &&
+	      SysAtt[i]->attnum == ObjectIdAttributeNumber)
+	    continue;
 
-			memcpy(&attStruct, (char *) SysAtt[i], sizeof(FormData_pg_attribute));
+	  memcpy(&attStruct, (char *) SysAtt[i], sizeof(FormData_pg_attribute));
 
-			/* Fill in the correct relation OID in the copied tuple */
-			attStruct.attrelid = new_rel_oid;
+	  /* Fill in the correct relation OID in the copied tuple */
+	  attStruct.attrelid = new_rel_oid;
 
-			/* Fill in correct inheritance info for the OID column */
-			if (attStruct.attnum == ObjectIdAttributeNumber)
-			{
-				attStruct.attislocal = oidislocal;
-				attStruct.attinhcount = oidinhcount;
-			}
+	  /* Fill in correct inheritance info for the OID column */
+	  if (attStruct.attnum == ObjectIdAttributeNumber)
+	    {
+	      attStruct.attislocal = oidislocal;
+	      attStruct.attinhcount = oidinhcount;
+	    }
 
-			InsertPgAttributeTuple(rel, &attStruct, indstate);
-		}
+	  InsertPgAttributeTuple(rel, &attStruct, indstate);
 	}
+    }
 
-	/*
-	 * clean up
-	 */
-	CatalogCloseIndexes(indstate);
+  /*
+   * clean up
+   */
+  CatalogCloseIndexes(indstate);
 
-	heap_close(rel, RowExclusiveLock);
+  heap_close(rel, RowExclusiveLock);
 }
 
 /* --------------------------------
@@ -740,67 +740,67 @@ AddNewAttributeTuples(Oid new_rel_oid,
  */
 void
 InsertPgClassTuple(Relation pg_class_desc,
-				   Relation new_rel_desc,
-				   Oid new_rel_oid,
-				   Datum relacl,
-				   Datum reloptions)
+		   Relation new_rel_desc,
+		   Oid new_rel_oid,
+		   Datum relacl,
+		   Datum reloptions)
 {
-	Form_pg_class rd_rel = new_rel_desc->rd_rel;
-	Datum		values[Natts_pg_class];
-	bool		nulls[Natts_pg_class];
-	HeapTuple	tup;
-
-	/* This is a tad tedious, but way cleaner than what we used to do... */
-	memset(values, 0, sizeof(values));
-	memset(nulls, false, sizeof(nulls));
-
-	values[Anum_pg_class_relname - 1] = NameGetDatum(&rd_rel->relname);
-	values[Anum_pg_class_relnamespace - 1] = ObjectIdGetDatum(rd_rel->relnamespace);
-	values[Anum_pg_class_reltype - 1] = ObjectIdGetDatum(rd_rel->reltype);
-	values[Anum_pg_class_reloftype - 1] = ObjectIdGetDatum(rd_rel->reloftype);
-	values[Anum_pg_class_relowner - 1] = ObjectIdGetDatum(rd_rel->relowner);
-	values[Anum_pg_class_relam - 1] = ObjectIdGetDatum(rd_rel->relam);
-	values[Anum_pg_class_relfilenode - 1] = ObjectIdGetDatum(rd_rel->relfilenode);
-	values[Anum_pg_class_reltablespace - 1] = ObjectIdGetDatum(rd_rel->reltablespace);
-	values[Anum_pg_class_relpages - 1] = Int32GetDatum(rd_rel->relpages);
-	values[Anum_pg_class_reltuples - 1] = Float4GetDatum(rd_rel->reltuples);
-	values[Anum_pg_class_reltoastrelid - 1] = ObjectIdGetDatum(rd_rel->reltoastrelid);
-	values[Anum_pg_class_reltoastidxid - 1] = ObjectIdGetDatum(rd_rel->reltoastidxid);
-	values[Anum_pg_class_relhasindex - 1] = BoolGetDatum(rd_rel->relhasindex);
-	values[Anum_pg_class_relisshared - 1] = BoolGetDatum(rd_rel->relisshared);
-	values[Anum_pg_class_relpersistence - 1] = CharGetDatum(rd_rel->relpersistence);
-	values[Anum_pg_class_relkind - 1] = CharGetDatum(rd_rel->relkind);
-	values[Anum_pg_class_relnatts - 1] = Int16GetDatum(rd_rel->relnatts);
-	values[Anum_pg_class_relchecks - 1] = Int16GetDatum(rd_rel->relchecks);
-	values[Anum_pg_class_relhasoids - 1] = BoolGetDatum(rd_rel->relhasoids);
-	values[Anum_pg_class_relhaspkey - 1] = BoolGetDatum(rd_rel->relhaspkey);
-	values[Anum_pg_class_relhasrules - 1] = BoolGetDatum(rd_rel->relhasrules);
-	values[Anum_pg_class_relhastriggers - 1] = BoolGetDatum(rd_rel->relhastriggers);
-	values[Anum_pg_class_relhassubclass - 1] = BoolGetDatum(rd_rel->relhassubclass);
-	values[Anum_pg_class_relfrozenxid - 1] = TransactionIdGetDatum(rd_rel->relfrozenxid);
-	if (relacl != (Datum) 0)
-		values[Anum_pg_class_relacl - 1] = relacl;
-	else
-		nulls[Anum_pg_class_relacl - 1] = true;
-	if (reloptions != (Datum) 0)
-		values[Anum_pg_class_reloptions - 1] = reloptions;
-	else
-		nulls[Anum_pg_class_reloptions - 1] = true;
-
-	tup = heap_form_tuple(RelationGetDescr(pg_class_desc), values, nulls);
-
-	/*
-	 * The new tuple must have the oid already chosen for the rel.	Sure would
-	 * be embarrassing to do this sort of thing in polite company.
-	 */
-	HeapTupleSetOid(tup, new_rel_oid);
-
-	/* finally insert the new tuple, update the indexes, and clean up */
-	simple_heap_insert(pg_class_desc, tup);
-
-	CatalogUpdateIndexes(pg_class_desc, tup);
-
-	heap_freetuple(tup);
+  Form_pg_class rd_rel = new_rel_desc->rd_rel;
+  Datum		values[Natts_pg_class];
+  bool		nulls[Natts_pg_class];
+  HeapTuple	tup;
+
+  /* This is a tad tedious, but way cleaner than what we used to do... */
+  memset(values, 0, sizeof(values));
+  memset(nulls, false, sizeof(nulls));
+  values[Anum_pg_class_relname - 1] = NameGetDatum(&rd_rel->relname);
+  values[Anum_pg_class_relnamespace - 1] = ObjectIdGetDatum(rd_rel->relnamespace);
+  values[Anum_pg_class_reltype - 1] = ObjectIdGetDatum(rd_rel->reltype);
+  values[Anum_pg_class_reloftype - 1] = ObjectIdGetDatum(rd_rel->reloftype);
+  values[Anum_pg_class_relowner - 1] = ObjectIdGetDatum(rd_rel->relowner);
+  values[Anum_pg_class_relam - 1] = ObjectIdGetDatum(rd_rel->relam);
+  values[Anum_pg_class_relfilenode - 1] = ObjectIdGetDatum(rd_rel->relfilenode);
+  values[Anum_pg_class_reltablespace - 1] = ObjectIdGetDatum(rd_rel->reltablespace);
+  values[Anum_pg_class_relpages - 1] = Int32GetDatum(rd_rel->relpages);
+  values[Anum_pg_class_reltuples - 1] = Float4GetDatum(rd_rel->reltuples);
+  values[Anum_pg_class_reltoastrelid - 1] = ObjectIdGetDatum(rd_rel->reltoastrelid);
+  values[Anum_pg_class_reltoastidxid - 1] = ObjectIdGetDatum(rd_rel->reltoastidxid);
+  values[Anum_pg_class_relhasindex - 1] = BoolGetDatum(rd_rel->relhasindex);
+  values[Anum_pg_class_relisshared - 1] = BoolGetDatum(rd_rel->relisshared);
+  values[Anum_pg_class_relpersistence - 1] = CharGetDatum(rd_rel->relpersistence);
+  values[Anum_pg_class_relkind - 1] = CharGetDatum(rd_rel->relkind);
+  values[Anum_pg_class_relnatts - 1] = Int16GetDatum(rd_rel->relnatts);
+  values[Anum_pg_class_relchecks - 1] = Int16GetDatum(rd_rel->relchecks);
+  values[Anum_pg_class_relhasoids - 1] = BoolGetDatum(rd_rel->relhasoids);
+  values[Anum_pg_class_relhaspkey - 1] = BoolGetDatum(rd_rel->relhaspkey);
+  values[Anum_pg_class_relhasrules - 1] = BoolGetDatum(rd_rel->relhasrules);
+  values[Anum_pg_class_relhastriggers - 1] = BoolGetDatum(rd_rel->relhastriggers);
+  values[Anum_pg_class_relhassubclass - 1] = BoolGetDatum(rd_rel->relhassubclass);
+  values[Anum_pg_class_relfrozenxid - 1] = TransactionIdGetDatum(rd_rel->relfrozenxid);
+  if (relacl != (Datum) 0)
+    values[Anum_pg_class_relacl - 1] = relacl;
+  else
+    nulls[Anum_pg_class_relacl - 1] = true;
+  if (reloptions != (Datum) 0)
+    values[Anum_pg_class_reloptions - 1] = reloptions;
+  else
+    nulls[Anum_pg_class_reloptions - 1] = true;
+
+  tup = heap_form_tuple(RelationGetDescr(pg_class_desc), values, nulls);
+  int i = 0;
+
+  /*
+   * The new tuple must have the oid already chosen for the rel.	Sure would
+   * be embarrassing to do this sort of thing in polite company.
+   */
+    HeapTupleSetOid(tup, new_rel_oid);
+
+  /* finally insert the new tuple, update the indexes, and clean up */
+  simple_heap_insert(pg_class_desc, tup);
+
+  CatalogUpdateIndexes(pg_class_desc, tup);
+
+  heap_freetuple(tup);
 }
 
 /* --------------------------------
@@ -812,76 +812,78 @@ InsertPgClassTuple(Relation pg_class_desc,
  */
 static void
 AddNewRelationTuple(Relation pg_class_desc,
-					Relation new_rel_desc,
-					Oid new_rel_oid,
-					Oid new_type_oid,
-					Oid reloftype,
-					Oid relowner,
-					char relkind,
-					Datum relacl,
-					Datum reloptions)
+		    Relation new_rel_desc,
+		    Oid new_rel_oid,
+		    Oid new_type_oid,
+		    Oid reloftype,
+		    Oid relowner,
+		    char relkind,
+		    Datum relacl,
+		    Datum reloptions)
 {
-	Form_pg_class new_rel_reltup;
-
-	/*
-	 * first we update some of the information in our uncataloged relation's
-	 * relation descriptor.
-	 */
-	new_rel_reltup = new_rel_desc->rd_rel;
-
-	switch (relkind)
-	{
-		case RELKIND_RELATION:
-		case RELKIND_INDEX:
-		case RELKIND_TOASTVALUE:
-			/* The relation is real, but as yet empty */
-			new_rel_reltup->relpages = 0;
-			new_rel_reltup->reltuples = 0;
-			break;
-		case RELKIND_SEQUENCE:
-			/* Sequences always have a known size */
-			new_rel_reltup->relpages = 1;
-			new_rel_reltup->reltuples = 1;
-			break;
-		default:
-			/* Views, etc, have no disk storage */
-			new_rel_reltup->relpages = 0;
-			new_rel_reltup->reltuples = 0;
-			break;
-	}
-
-	/* Initialize relfrozenxid */
-	if (relkind == RELKIND_RELATION ||
-		relkind == RELKIND_TOASTVALUE)
-	{
-		/*
-		 * Initialize to the minimum XID that could put tuples in the table.
-		 * We know that no xacts older than RecentXmin are still running, so
-		 * that will do.
-		 */
-		new_rel_reltup->relfrozenxid = RecentXmin;
-	}
-	else
-	{
-		/*
-		 * Other relation types will not contain XIDs, so set relfrozenxid to
-		 * InvalidTransactionId.  (Note: a sequence does contain a tuple, but
-		 * we force its xmin to be FrozenTransactionId always; see
-		 * commands/sequence.c.)
-		 */
-		new_rel_reltup->relfrozenxid = InvalidTransactionId;
-	}
-
-	new_rel_reltup->relowner = relowner;
-	new_rel_reltup->reltype = new_type_oid;
-	new_rel_reltup->reloftype = reloftype;
-	new_rel_reltup->relkind = relkind;
-
-	new_rel_desc->rd_att->tdtypeid = new_type_oid;
-
-	/* Now build and insert the tuple */
-	InsertPgClassTuple(pg_class_desc, new_rel_desc, new_rel_oid,
-					   relacl, reloptions);
+  Form_pg_class new_rel_reltup;
+
+  /*
+   * first we update some of the information in our uncataloged relation's
+   * relation descriptor.
+   */
+  new_rel_reltup = new_rel_desc->rd_rel;
+
+  switch (relkind)
+    {
+    case RELKIND_RELATION:
+    case RELKIND_MAT_VIEW:
+    case RELKIND_INDEX:
+    case RELKIND_TOASTVALUE:
+      /* The relation is real, but as yet empty */
+      new_rel_reltup->relpages = 0;
+      new_rel_reltup->reltuples = 0;
+      break;
+    case RELKIND_SEQUENCE:
+      /* Sequences always have a known size */
+      new_rel_reltup->relpages = 1;
+      new_rel_reltup->reltuples = 1;
+      break;
+    default:
+      /* Views, etc, have no disk storage */
+      new_rel_reltup->relpages = 0;
+      new_rel_reltup->reltuples = 0;
+      break;
+    }
+
+  /* Initialize relfrozenxid */
+  if (relkind == RELKIND_RELATION ||
+      relkind == RELKIND_TOASTVALUE)
+    {
+      /*
+       * Initialize to the minimum XID that could put tuples in the table.
+       * We know that no xacts older than RecentXmin are still running, so
+       * that will do.
+       */
+      new_rel_reltup->relfrozenxid = RecentXmin;
+    }
+  else
+    {
+      /*
+       * Other relation types will not contain XIDs, so set relfrozenxid to
+       * InvalidTransactionId.  (Note: a sequence does contain a tuple, but
+       * we force its xmin to be FrozenTransactionId always; see
+       * commands/sequence.c.)
+       */
+      new_rel_reltup->relfrozenxid = InvalidTransactionId;
+    }
+
+  new_rel_reltup->relowner = relowner;
+  new_rel_reltup->reltype = new_type_oid;
+  new_rel_reltup->reloftype = reloftype;
+  new_rel_reltup->relkind = relkind;
+
+  new_rel_desc->rd_att->tdtypeid = new_type_oid;
+
+
+  /* Now build and insert the tuple */
+  InsertPgClassTuple(pg_class_desc, new_rel_desc, new_rel_oid,
+		     relacl, reloptions);
 }
 
 
@@ -893,45 +895,45 @@ AddNewRelationTuple(Relation pg_class_desc,
  */
 static Oid
 AddNewRelationType(const char *typeName,
-				   Oid typeNamespace,
-				   Oid new_rel_oid,
-				   char new_rel_kind,
-				   Oid ownerid,
-				   Oid new_row_type,
-				   Oid new_array_type)
+		   Oid typeNamespace,
+		   Oid new_rel_oid,
+		   char new_rel_kind,
+		   Oid ownerid,
+		   Oid new_row_type,
+		   Oid new_array_type)
 {
-	return
-		TypeCreate(new_row_type,	/* optional predetermined OID */
-				   typeName,	/* type name */
-				   typeNamespace,		/* type namespace */
-				   new_rel_oid, /* relation oid */
-				   new_rel_kind,	/* relation kind */
-				   ownerid,		/* owner's ID */
-				   -1,			/* internal size (varlena) */
-				   TYPTYPE_COMPOSITE,	/* type-type (composite) */
-				   TYPCATEGORY_COMPOSITE,		/* type-category (ditto) */
-				   false,		/* composite types are never preferred */
-				   DEFAULT_TYPDELIM,	/* default array delimiter */
-				   F_RECORD_IN, /* input procedure */
-				   F_RECORD_OUT,	/* output procedure */
-				   F_RECORD_RECV,		/* receive procedure */
-				   F_RECORD_SEND,		/* send procedure */
-				   InvalidOid,	/* typmodin procedure - none */
-				   InvalidOid,	/* typmodout procedure - none */
-				   InvalidOid,	/* analyze procedure - default */
-				   InvalidOid,	/* array element type - irrelevant */
-				   false,		/* this is not an array type */
-				   new_array_type,		/* array type if any */
-				   InvalidOid,	/* domain base type - irrelevant */
-				   NULL,		/* default value - none */
-				   NULL,		/* default binary representation */
-				   false,		/* passed by reference */
-				   'd',			/* alignment - must be the largest! */
-				   'x',			/* fully TOASTable */
-				   -1,			/* typmod */
-				   0,			/* array dimensions for typBaseType */
-				   false,		/* Type NOT NULL */
-				   InvalidOid); /* rowtypes never have a collation */
+  return
+    TypeCreate(new_row_type,	/* optional predetermined OID */
+	       typeName,	/* type name */
+	       typeNamespace,		/* type namespace */
+	       new_rel_oid, /* relation oid */
+	       new_rel_kind,	/* relation kind */
+	       ownerid,		/* owner's ID */
+	       -1,			/* internal size (varlena) */
+	       TYPTYPE_COMPOSITE,	/* type-type (composite) */
+	       TYPCATEGORY_COMPOSITE,		/* type-category (ditto) */
+	       false,		/* composite types are never preferred */
+	       DEFAULT_TYPDELIM,	/* default array delimiter */
+	       F_RECORD_IN, /* input procedure */
+	       F_RECORD_OUT,	/* output procedure */
+	       F_RECORD_RECV,		/* receive procedure */
+	       F_RECORD_SEND,		/* send procedure */
+	       InvalidOid,	/* typmodin procedure - none */
+	       InvalidOid,	/* typmodout procedure - none */
+	       InvalidOid,	/* analyze procedure - default */
+	       InvalidOid,	/* array element type - irrelevant */
+	       false,		/* this is not an array type */
+	       new_array_type,		/* array type if any */
+	       InvalidOid,	/* domain base type - irrelevant */
+	       NULL,		/* default value - none */
+	       NULL,		/* default binary representation */
+	       false,		/* passed by reference */
+	       'd',			/* alignment - must be the largest! */
+	       'x',			/* fully TOASTable */
+	       -1,			/* typmod */
+	       0,			/* array dimensions for typBaseType */
+	       false,		/* Type NOT NULL */
+	       InvalidOid); /* rowtypes never have a collation */
 }
 
 /* --------------------------------
@@ -964,352 +966,356 @@ AddNewRelationType(const char *typeName,
  */
 Oid
 heap_create_with_catalog(const char *relname,
-						 Oid relnamespace,
-						 Oid reltablespace,
-						 Oid relid,
-						 Oid reltypeid,
-						 Oid reloftypeid,
-						 Oid ownerid,
-						 TupleDesc tupdesc,
-						 List *cooked_constraints,
-						 char relkind,
-						 char relpersistence,
-						 bool shared_relation,
-						 bool mapped_relation,
-						 bool oidislocal,
-						 int oidinhcount,
-						 OnCommitAction oncommit,
-						 Datum reloptions,
-						 bool use_user_acl,
-						 bool allow_system_table_mods)
+			 Oid relnamespace,
+			 Oid reltablespace,
+			 Oid relid,
+			 Oid reltypeid,
+			 Oid reloftypeid,
+			 Oid ownerid,
+			 TupleDesc tupdesc,
+			 List *cooked_constraints,
+			 char relkind,
+			 char relpersistence,
+			 bool shared_relation,
+			 bool mapped_relation,
+			 bool oidislocal,
+			 int oidinhcount,
+			 OnCommitAction oncommit,
+			 Datum reloptions,
+			 bool use_user_acl,
+			 bool allow_system_table_mods)
 {
-	Relation	pg_class_desc;
-	Relation	new_rel_desc;
-	Acl		   *relacl;
-	Oid			existing_relid;
-	Oid			old_type_oid;
-	Oid			new_type_oid;
-	Oid			new_array_oid = InvalidOid;
-
-	pg_class_desc = heap_open(RelationRelationId, RowExclusiveLock);
-
-	/*
-	 * sanity checks
-	 */
-	Assert(IsNormalProcessingMode() || IsBootstrapProcessingMode());
-
-	CheckAttributeNamesTypes(tupdesc, relkind, allow_system_table_mods);
-
-	/*
-	 * This would fail later on anyway, if the relation already exists.  But
-	 * by catching it here we can emit a nicer error message.
-	 */
-	existing_relid = get_relname_relid(relname, relnamespace);
-	if (existing_relid != InvalidOid)
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_TABLE),
-				 errmsg("relation \"%s\" already exists", relname)));
-
-	/*
-	 * Since we are going to create a rowtype as well, also check for
-	 * collision with an existing type name.  If there is one and it's an
-	 * autogenerated array, we can rename it out of the way; otherwise we can
-	 * at least give a good error message.
-	 */
-	old_type_oid = GetSysCacheOid2(TYPENAMENSP,
-								   CStringGetDatum(relname),
-								   ObjectIdGetDatum(relnamespace));
-	if (OidIsValid(old_type_oid))
+  Relation	pg_class_desc;
+  Relation	new_rel_desc;
+  Acl		   *relacl;
+  Oid			existing_relid;
+  Oid			old_type_oid;
+  Oid			new_type_oid;
+  Oid			new_array_oid = InvalidOid;
+
+  pg_class_desc = heap_open(RelationRelationId, RowExclusiveLock);
+
+  /*
+   * sanity checks
+   */
+  Assert(IsNormalProcessingMode() || IsBootstrapProcessingMode());
+  CheckAttributeNamesTypes(tupdesc, relkind, allow_system_table_mods);
+
+  /*
+   * This would fail later on anyway, if the relation already exists.  But
+   * by catching it here we can emit a nicer error message.
+   */
+  existing_relid = get_relname_relid(relname, relnamespace);
+  if (existing_relid != InvalidOid)
+    ereport(ERROR,
+	    (errcode(ERRCODE_DUPLICATE_TABLE),
+	     errmsg("relation \"%s\" already exists", relname)));
+
+  /*
+   * Since we are going to create a rowtype as well, also check for
+   * collision with an existing type name.  If there is one and it's an
+   * autogenerated array, we can rename it out of the way; otherwise we can
+   * at least give a good error message.
+   */
+  old_type_oid = GetSysCacheOid2(TYPENAMENSP,
+				 CStringGetDatum(relname),
+				 ObjectIdGetDatum(relnamespace));
+  if (OidIsValid(old_type_oid))
+    {
+      if (!moveArrayTypeName(old_type_oid, relname, relnamespace))
+	ereport(ERROR,
+		(errcode(ERRCODE_DUPLICATE_OBJECT),
+		 errmsg("type \"%s\" already exists", relname),
+		 errhint("A relation has an associated type of the same name, "
+			 "so you must use a name that doesn't conflict "
+			 "with any existing type.")));
+    }
+
+  /*
+   * Shared relations must be in pg_global (last-ditch check)
+   */
+  if (shared_relation && reltablespace != GLOBALTABLESPACE_OID)
+    elog(ERROR, "shared relations must be placed in pg_global tablespace");
+
+  /*
+   * Allocate an OID for the relation, unless we were told what to use.
+   *
+   * The OID will be the relfilenode as well, so make sure it doesn't
+   * collide with either pg_class OIDs or existing physical files.
+   */
+  if (!OidIsValid(relid))
+    {
+      /*
+       * Use binary-upgrade override for pg_class.oid/relfilenode, if
+       * supplied.
+       */
+      if (IsBinaryUpgrade &&
+	  OidIsValid(binary_upgrade_next_heap_pg_class_oid) &&
+	  (relkind == RELKIND_RELATION || relkind == RELKIND_SEQUENCE ||
+	   relkind == RELKIND_MAT_VIEW || relkind == RELKIND_VIEW || relkind == RELKIND_COMPOSITE_TYPE ||
+	   relkind == RELKIND_FOREIGN_TABLE))
 	{
-		if (!moveArrayTypeName(old_type_oid, relname, relnamespace))
-			ereport(ERROR,
-					(errcode(ERRCODE_DUPLICATE_OBJECT),
-					 errmsg("type \"%s\" already exists", relname),
-			   errhint("A relation has an associated type of the same name, "
-					   "so you must use a name that doesn't conflict "
-					   "with any existing type.")));
+	  relid = binary_upgrade_next_heap_pg_class_oid;
+	  binary_upgrade_next_heap_pg_class_oid = InvalidOid;
 	}
-
-	/*
-	 * Shared relations must be in pg_global (last-ditch check)
-	 */
-	if (shared_relation && reltablespace != GLOBALTABLESPACE_OID)
-		elog(ERROR, "shared relations must be placed in pg_global tablespace");
-
-	/*
-	 * Allocate an OID for the relation, unless we were told what to use.
-	 *
-	 * The OID will be the relfilenode as well, so make sure it doesn't
-	 * collide with either pg_class OIDs or existing physical files.
-	 */
-	if (!OidIsValid(relid))
+      else if (IsBinaryUpgrade &&
+	       OidIsValid(binary_upgrade_next_toast_pg_class_oid) &&
+	       relkind == RELKIND_TOASTVALUE)
 	{
-		/*
-		 * Use binary-upgrade override for pg_class.oid/relfilenode, if
-		 * supplied.
-		 */
-		if (IsBinaryUpgrade &&
-			OidIsValid(binary_upgrade_next_heap_pg_class_oid) &&
-			(relkind == RELKIND_RELATION || relkind == RELKIND_SEQUENCE ||
-			 relkind == RELKIND_VIEW || relkind == RELKIND_COMPOSITE_TYPE ||
-			 relkind == RELKIND_FOREIGN_TABLE))
-		{
-			relid = binary_upgrade_next_heap_pg_class_oid;
-			binary_upgrade_next_heap_pg_class_oid = InvalidOid;
-		}
-		else if (IsBinaryUpgrade &&
-				 OidIsValid(binary_upgrade_next_toast_pg_class_oid) &&
-				 relkind == RELKIND_TOASTVALUE)
-		{
-			relid = binary_upgrade_next_toast_pg_class_oid;
-			binary_upgrade_next_toast_pg_class_oid = InvalidOid;
-		}
-		else
-			relid = GetNewRelFileNode(reltablespace, pg_class_desc,
-									  relpersistence);
+	  relid = binary_upgrade_next_toast_pg_class_oid;
+	  binary_upgrade_next_toast_pg_class_oid = InvalidOid;
 	}
-
-	/*
-	 * Determine the relation's initial permissions.
-	 */
-	if (use_user_acl)
+      else
+	relid = GetNewRelFileNode(reltablespace, pg_class_desc,
+				  relpersistence);
+    }
+
+  /*
+   * Determine the relation's initial permissions.
+   */
+  if (use_user_acl)
+    {
+      switch (relkind)
 	{
-		switch (relkind)
-		{
-			case RELKIND_RELATION:
-			case RELKIND_VIEW:
-			case RELKIND_FOREIGN_TABLE:
-				relacl = get_user_default_acl(ACL_OBJECT_RELATION, ownerid,
-											  relnamespace);
-				break;
-			case RELKIND_SEQUENCE:
-				relacl = get_user_default_acl(ACL_OBJECT_SEQUENCE, ownerid,
-											  relnamespace);
-				break;
-			default:
-				relacl = NULL;
-				break;
-		}
+	case RELKIND_RELATION:
+	case RELKIND_MAT_VIEW:
+	case RELKIND_VIEW:
+	case RELKIND_FOREIGN_TABLE:
+	  relacl = get_user_default_acl(ACL_OBJECT_RELATION, ownerid,
+					relnamespace);
+	  break;
+	case RELKIND_SEQUENCE:
+	  relacl = get_user_default_acl(ACL_OBJECT_SEQUENCE, ownerid,
+					relnamespace);
+	  break;
+	default:
+	  relacl = NULL;
+	  break;
 	}
-	else
-		relacl = NULL;
-
-	/*
-	 * Create the relcache entry (mostly dummy at this point) and the physical
-	 * disk file.  (If we fail further down, it's the smgr's responsibility to
-	 * remove the disk file again.)
-	 */
-	new_rel_desc = heap_create(relname,
-							   relnamespace,
-							   reltablespace,
-							   relid,
-							   tupdesc,
-							   relkind,
-							   relpersistence,
-							   shared_relation,
-							   mapped_relation,
-							   allow_system_table_mods);
-
-	Assert(relid == RelationGetRelid(new_rel_desc));
-
-	/*
-	 * Decide whether to create an array type over the relation's rowtype. We
-	 * do not create any array types for system catalogs (ie, those made
-	 * during initdb).	We create array types for regular relations, views,
-	 * composite types and foreign tables ... but not, eg, for toast tables or
-	 * sequences.
-	 */
-	if (IsUnderPostmaster && (relkind == RELKIND_RELATION ||
-							  relkind == RELKIND_VIEW ||
-							  relkind == RELKIND_FOREIGN_TABLE ||
-							  relkind == RELKIND_COMPOSITE_TYPE))
-		new_array_oid = AssignTypeArrayOid();
-
-	/*
-	 * Since defining a relation also defines a complex type, we add a new
-	 * system type corresponding to the new relation.  The OID of the type can
-	 * be preselected by the caller, but if reltypeid is InvalidOid, we'll
-	 * generate a new OID for it.
-	 *
-	 * NOTE: we could get a unique-index failure here, in case someone else is
-	 * creating the same type name in parallel but hadn't committed yet when
-	 * we checked for a duplicate name above.
-	 */
-	new_type_oid = AddNewRelationType(relname,
-									  relnamespace,
-									  relid,
-									  relkind,
-									  ownerid,
-									  reltypeid,
-									  new_array_oid);
-
-	/*
-	 * Now make the array type if wanted.
-	 */
-	if (OidIsValid(new_array_oid))
+    }
+  else
+    relacl = NULL;
+
+  /*
+   * Create the relcache entry (mostly dummy at this point) and the physical
+   * disk file.  (If we fail further down, it's the smgr's responsibility to
+   * remove the disk file again.)
+   */
+  new_rel_desc = heap_create(relname,
+			     relnamespace,
+			     reltablespace,
+			     relid,
+			     tupdesc,
+			     relkind,
+			     relpersistence,
+			     shared_relation,
+			     mapped_relation,
+			     allow_system_table_mods);
+
+  Assert(relid == RelationGetRelid(new_rel_desc));
+
+  /*
+   * Decide whether to create an array type over the relation's rowtype. We
+   * do not create any array types for system catalogs (ie, those made
+   * during initdb).	We create array types for regular relations, views,
+   * composite types and foreign tables ... but not, eg, for toast tables or
+   * sequences.
+   */
+  if (IsUnderPostmaster && (relkind == RELKIND_RELATION ||
+			    relkind == RELKIND_MAT_VIEW || 
+			    relkind == RELKIND_VIEW ||
+			    relkind == RELKIND_FOREIGN_TABLE ||
+			    relkind == RELKIND_COMPOSITE_TYPE))
+    new_array_oid = AssignTypeArrayOid();
+
+  /*
+   * Since defining a relation also defines a complex type, we add a new
+   * system type corresponding to the new relation.  The OID of the type can
+   * be preselected by the caller, but if reltypeid is InvalidOid, we'll
+   * generate a new OID for it.
+   *
+   * NOTE: we could get a unique-index failure here, in case someone else is
+   * creating the same type name in parallel but hadn't committed yet when
+   * we checked for a duplicate name above.
+   */
+  new_type_oid = AddNewRelationType(relname,
+				    relnamespace,
+				    relid,
+				    relkind,
+				    ownerid,
+				    reltypeid,
+				    new_array_oid);
+
+  /*
+   * Now make the array type if wanted.
+   */
+  if (OidIsValid(new_array_oid))
+    {
+      char	   *relarrayname;
+
+      relarrayname = makeArrayTypeName(relname, relnamespace);
+
+      TypeCreate(new_array_oid,		/* force the type's OID to this */
+		 relarrayname,	/* Array type name */
+		 relnamespace,	/* Same namespace as parent */
+		 InvalidOid,	/* Not composite, no relationOid */
+		 0,			/* relkind, also N/A here */
+		 ownerid,		/* owner's ID */
+		 -1,			/* Internal size (varlena) */
+		 TYPTYPE_BASE,	/* Not composite - typelem is */
+		 TYPCATEGORY_ARRAY,	/* type-category (array) */
+		 false,		/* array types are never preferred */
+		 DEFAULT_TYPDELIM,	/* default array delimiter */
+		 F_ARRAY_IN,	/* array input proc */
+		 F_ARRAY_OUT, /* array output proc */
+		 F_ARRAY_RECV,	/* array recv (bin) proc */
+		 F_ARRAY_SEND,	/* array send (bin) proc */
+		 InvalidOid,	/* typmodin procedure - none */
+		 InvalidOid,	/* typmodout procedure - none */
+		 InvalidOid,	/* analyze procedure - default */
+		 new_type_oid,	/* array element type - the rowtype */
+		 true,		/* yes, this is an array type */
+		 InvalidOid,	/* this has no array type */
+		 InvalidOid,	/* domain base type - irrelevant */
+		 NULL,		/* default value - none */
+		 NULL,		/* default binary representation */
+		 false,		/* passed by reference */
+		 'd',			/* alignment - must be the largest! */
+		 'x',			/* fully TOASTable */
+		 -1,			/* typmod */
+		 0,			/* array dimensions for typBaseType */
+		 false,		/* Type NOT NULL */
+		 InvalidOid); /* rowtypes never have a collation */
+
+      pfree(relarrayname);
+    }
+
+  /*
+   * now create an entry in pg_class for the relation.
+   *
+   * NOTE: we could get a unique-index failure here, in case someone else is
+   * creating the same relation name in parallel but hadn't committed yet
+   * when we checked for a duplicate name above.
+   */
+
+  AddNewRelationTuple(pg_class_desc,
+		      new_rel_desc,
+		      relid,
+		      new_type_oid,
+		      reloftypeid,
+		      ownerid,
+		      relkind,
+		      PointerGetDatum(relacl),
+		      reloptions);
+
+  /*
+   * now add tuples to pg_attribute for the attributes in our new relation.
+   */
+  AddNewAttributeTuples(relid, new_rel_desc->rd_att, relkind,
+			oidislocal, oidinhcount);
+
+
+  /*
+   * Make a dependency link to force the relation to be deleted if its
+   * namespace is.  Also make a dependency link to its owner, as well as
+   * dependencies for any roles mentioned in the default ACL.
+   *
+   * For composite types, these dependencies are tracked for the pg_type
+   * entry, so we needn't record them here.  Likewise, TOAST tables don't
+   * need a namespace dependency (they live in a pinned namespace) nor an
+   * owner dependency (they depend indirectly through the parent table), nor
+   * should they have any ACL entries.  The same applies for extension
+   * dependencies.
+   *
+   * Also, skip this in bootstrap mode, since we don't make dependencies
+   * while bootstrapping.
+   */
+  if (relkind != RELKIND_COMPOSITE_TYPE &&
+      relkind != RELKIND_TOASTVALUE &&
+      !IsBootstrapProcessingMode())
+    {
+      ObjectAddress myself,
+	referenced;
+
+      myself.classId = RelationRelationId;
+      myself.objectId = relid;
+      myself.objectSubId = 0;
+      referenced.classId = NamespaceRelationId;
+      referenced.objectId = relnamespace;
+      referenced.objectSubId = 0;
+      recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+
+      recordDependencyOnOwner(RelationRelationId, relid, ownerid);
+
+      recordDependencyOnCurrentExtension(&myself, false);
+
+      if (reloftypeid)
 	{
-		char	   *relarrayname;
-
-		relarrayname = makeArrayTypeName(relname, relnamespace);
-
-		TypeCreate(new_array_oid,		/* force the type's OID to this */
-				   relarrayname,	/* Array type name */
-				   relnamespace,	/* Same namespace as parent */
-				   InvalidOid,	/* Not composite, no relationOid */
-				   0,			/* relkind, also N/A here */
-				   ownerid,		/* owner's ID */
-				   -1,			/* Internal size (varlena) */
-				   TYPTYPE_BASE,	/* Not composite - typelem is */
-				   TYPCATEGORY_ARRAY,	/* type-category (array) */
-				   false,		/* array types are never preferred */
-				   DEFAULT_TYPDELIM,	/* default array delimiter */
-				   F_ARRAY_IN,	/* array input proc */
-				   F_ARRAY_OUT, /* array output proc */
-				   F_ARRAY_RECV,	/* array recv (bin) proc */
-				   F_ARRAY_SEND,	/* array send (bin) proc */
-				   InvalidOid,	/* typmodin procedure - none */
-				   InvalidOid,	/* typmodout procedure - none */
-				   InvalidOid,	/* analyze procedure - default */
-				   new_type_oid,	/* array element type - the rowtype */
-				   true,		/* yes, this is an array type */
-				   InvalidOid,	/* this has no array type */
-				   InvalidOid,	/* domain base type - irrelevant */
-				   NULL,		/* default value - none */
-				   NULL,		/* default binary representation */
-				   false,		/* passed by reference */
-				   'd',			/* alignment - must be the largest! */
-				   'x',			/* fully TOASTable */
-				   -1,			/* typmod */
-				   0,			/* array dimensions for typBaseType */
-				   false,		/* Type NOT NULL */
-				   InvalidOid); /* rowtypes never have a collation */
-
-		pfree(relarrayname);
+	  referenced.classId = TypeRelationId;
+	  referenced.objectId = reloftypeid;
+	  referenced.objectSubId = 0;
+	  recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 	}
 
-	/*
-	 * now create an entry in pg_class for the relation.
-	 *
-	 * NOTE: we could get a unique-index failure here, in case someone else is
-	 * creating the same relation name in parallel but hadn't committed yet
-	 * when we checked for a duplicate name above.
-	 */
-	AddNewRelationTuple(pg_class_desc,
-						new_rel_desc,
-						relid,
-						new_type_oid,
-						reloftypeid,
-						ownerid,
-						relkind,
-						PointerGetDatum(relacl),
-						reloptions);
-
-	/*
-	 * now add tuples to pg_attribute for the attributes in our new relation.
-	 */
-	AddNewAttributeTuples(relid, new_rel_desc->rd_att, relkind,
-						  oidislocal, oidinhcount);
-
-	/*
-	 * Make a dependency link to force the relation to be deleted if its
-	 * namespace is.  Also make a dependency link to its owner, as well as
-	 * dependencies for any roles mentioned in the default ACL.
-	 *
-	 * For composite types, these dependencies are tracked for the pg_type
-	 * entry, so we needn't record them here.  Likewise, TOAST tables don't
-	 * need a namespace dependency (they live in a pinned namespace) nor an
-	 * owner dependency (they depend indirectly through the parent table), nor
-	 * should they have any ACL entries.  The same applies for extension
-	 * dependencies.
-	 *
-	 * Also, skip this in bootstrap mode, since we don't make dependencies
-	 * while bootstrapping.
-	 */
-	if (relkind != RELKIND_COMPOSITE_TYPE &&
-		relkind != RELKIND_TOASTVALUE &&
-		!IsBootstrapProcessingMode())
+      if (relacl != NULL)
 	{
-		ObjectAddress myself,
-					referenced;
-
-		myself.classId = RelationRelationId;
-		myself.objectId = relid;
-		myself.objectSubId = 0;
-		referenced.classId = NamespaceRelationId;
-		referenced.objectId = relnamespace;
-		referenced.objectSubId = 0;
-		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-
-		recordDependencyOnOwner(RelationRelationId, relid, ownerid);
-
-		recordDependencyOnCurrentExtension(&myself);
-
-		if (reloftypeid)
-		{
-			referenced.classId = TypeRelationId;
-			referenced.objectId = reloftypeid;
-			referenced.objectSubId = 0;
-			recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-		}
-
-		if (relacl != NULL)
-		{
-			int			nnewmembers;
-			Oid		   *newmembers;
-
-			nnewmembers = aclmembers(relacl, &newmembers);
-			updateAclDependencies(RelationRelationId, relid, 0,
-								  ownerid,
-								  0, NULL,
-								  nnewmembers, newmembers);
-		}
+	  int			nnewmembers;
+	  Oid		   *newmembers;
+
+	  nnewmembers = aclmembers(relacl, &newmembers);
+	  updateAclDependencies(RelationRelationId, relid, 0,
+				ownerid,
+				0, NULL,
+				nnewmembers, newmembers);
 	}
-
-	/* Post creation hook for new relation */
-	InvokeObjectAccessHook(OAT_POST_CREATE, RelationRelationId, relid, 0);
-
-	/*
-	 * Store any supplied constraints and defaults.
-	 *
-	 * NB: this may do a CommandCounterIncrement and rebuild the relcache
-	 * entry, so the relation must be valid and self-consistent at this point.
-	 * In particular, there are not yet constraints and defaults anywhere.
-	 */
-	StoreConstraints(new_rel_desc, cooked_constraints);
-
-	/*
-	 * If there's a special on-commit action, remember it
-	 */
-	if (oncommit != ONCOMMIT_NOOP)
-		register_on_commit_action(relid, oncommit);
-
-	/*
-	 * If this is an unlogged relation, it needs an init fork so that it can
-	 * be correctly reinitialized on restart.  Since we're going to do an
-	 * immediate sync, we ony need to xlog this if archiving or streaming is
-	 * enabled.  And the immediate sync is required, because otherwise there's
-	 * no guarantee that this will hit the disk before the next checkpoint
-	 * moves the redo pointer.
-	 */
-	if (relpersistence == RELPERSISTENCE_UNLOGGED)
-	{
-		Assert(relkind == RELKIND_RELATION || relkind == RELKIND_TOASTVALUE);
-
-		smgrcreate(new_rel_desc->rd_smgr, INIT_FORKNUM, false);
-		if (XLogIsNeeded())
-			log_smgrcreate(&new_rel_desc->rd_smgr->smgr_rnode.node,
-						   INIT_FORKNUM);
-		smgrimmedsync(new_rel_desc->rd_smgr, INIT_FORKNUM);
-	}
-
-	/*
-	 * ok, the relation has been cataloged, so close our relations and return
-	 * the OID of the newly created relation.
-	 */
-	heap_close(new_rel_desc, NoLock);	/* do not unlock till end of xact */
-	heap_close(pg_class_desc, RowExclusiveLock);
-
-	return relid;
+    }
+
+  /* Post creation hook for new relation */
+  InvokeObjectAccessHook(OAT_POST_CREATE, RelationRelationId, relid, 0);
+
+  /*
+   * Store any supplied constraints and defaults.
+   *
+   * NB: this may do a CommandCounterIncrement and rebuild the relcache
+   * entry, so the relation must be valid and self-consistent at this point.
+   * In particular, there are not yet constraints and defaults anywhere.
+   */
+  StoreConstraints(new_rel_desc, cooked_constraints);
+
+  /*
+   * If there's a special on-commit action, remember it
+   */
+  if (oncommit != ONCOMMIT_NOOP)
+    register_on_commit_action(relid, oncommit);
+
+  /*
+   * If this is an unlogged relation, it needs an init fork so that it can
+   * be correctly reinitialized on restart.  Since we're going to do an
+   * immediate sync, we only need to xlog this if archiving or streaming is
+   * enabled.  And the immediate sync is required, because otherwise there's
+   * no guarantee that this will hit the disk before the next checkpoint
+   * moves the redo pointer.
+   */
+  if (relpersistence == RELPERSISTENCE_UNLOGGED)
+    {
+      Assert(relkind == RELKIND_RELATION || relkind == RELKIND_TOASTVALUE);
+
+      RelationOpenSmgr(new_rel_desc);
+      smgrcreate(new_rel_desc->rd_smgr, INIT_FORKNUM, false);
+      if (XLogIsNeeded())
+	log_smgrcreate(&new_rel_desc->rd_smgr->smgr_rnode.node,
+		       INIT_FORKNUM);
+      smgrimmedsync(new_rel_desc->rd_smgr, INIT_FORKNUM);
+    }
+
+  /*
+   * ok, the relation has been cataloged, so close our relations and return
+   * the OID of the newly created relation.
+   */
+  heap_close(new_rel_desc, NoLock);	/* do not unlock till end of xact */
+  heap_close(pg_class_desc, RowExclusiveLock);
+
+  return relid;
 }
 
 
@@ -1325,26 +1331,26 @@ heap_create_with_catalog(const char *relname,
 static void
 RelationRemoveInheritance(Oid relid)
 {
-	Relation	catalogRelation;
-	SysScanDesc scan;
-	ScanKeyData key;
-	HeapTuple	tuple;
+  Relation	catalogRelation;
+  SysScanDesc scan;
+  ScanKeyData key;
+  HeapTuple	tuple;
 
-	catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
+  catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
 
-	ScanKeyInit(&key,
-				Anum_pg_inherits_inhrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
+  ScanKeyInit(&key,
+	      Anum_pg_inherits_inhrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relid));
 
-	scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId, true,
-							  SnapshotNow, 1, &key);
+  scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId, true,
+			    SnapshotNow, 1, &key);
 
-	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
-		simple_heap_delete(catalogRelation, &tuple->t_self);
+  while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+    simple_heap_delete(catalogRelation, &tuple->t_self);
 
-	systable_endscan(scan);
-	heap_close(catalogRelation, RowExclusiveLock);
+  systable_endscan(scan);
+  heap_close(catalogRelation, RowExclusiveLock);
 }
 
 /*
@@ -1358,22 +1364,22 @@ RelationRemoveInheritance(Oid relid)
 void
 DeleteRelationTuple(Oid relid)
 {
-	Relation	pg_class_desc;
-	HeapTuple	tup;
+  Relation	pg_class_desc;
+  HeapTuple	tup;
 
-	/* Grab an appropriate lock on the pg_class relation */
-	pg_class_desc = heap_open(RelationRelationId, RowExclusiveLock);
+  /* Grab an appropriate lock on the pg_class relation */
+  pg_class_desc = heap_open(RelationRelationId, RowExclusiveLock);
 
-	tup = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
-	if (!HeapTupleIsValid(tup))
-		elog(ERROR, "cache lookup failed for relation %u", relid);
+  tup = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
+  if (!HeapTupleIsValid(tup))
+    elog(ERROR, "cache lookup failed for relation %u", relid);
 
-	/* delete the relation tuple from pg_class, and finish up */
-	simple_heap_delete(pg_class_desc, &tup->t_self);
+  /* delete the relation tuple from pg_class, and finish up */
+  simple_heap_delete(pg_class_desc, &tup->t_self);
 
-	ReleaseSysCache(tup);
+  ReleaseSysCache(tup);
 
-	heap_close(pg_class_desc, RowExclusiveLock);
+  heap_close(pg_class_desc, RowExclusiveLock);
 }
 
 /*
@@ -1387,30 +1393,30 @@ DeleteRelationTuple(Oid relid)
 void
 DeleteAttributeTuples(Oid relid)
 {
-	Relation	attrel;
-	SysScanDesc scan;
-	ScanKeyData key[1];
-	HeapTuple	atttup;
-
-	/* Grab an appropriate lock on the pg_attribute relation */
-	attrel = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	/* Use the index to scan only attributes of the target relation */
-	ScanKeyInit(&key[0],
-				Anum_pg_attribute_attrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
-
-	scan = systable_beginscan(attrel, AttributeRelidNumIndexId, true,
-							  SnapshotNow, 1, key);
-
-	/* Delete all the matching tuples */
-	while ((atttup = systable_getnext(scan)) != NULL)
-		simple_heap_delete(attrel, &atttup->t_self);
-
-	/* Clean up after the scan */
-	systable_endscan(scan);
-	heap_close(attrel, RowExclusiveLock);
+  Relation	attrel;
+  SysScanDesc scan;
+  ScanKeyData key[1];
+  HeapTuple	atttup;
+
+  /* Grab an appropriate lock on the pg_attribute relation */
+  attrel = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  /* Use the index to scan only attributes of the target relation */
+  ScanKeyInit(&key[0],
+	      Anum_pg_attribute_attrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relid));
+
+  scan = systable_beginscan(attrel, AttributeRelidNumIndexId, true,
+			    SnapshotNow, 1, key);
+
+  /* Delete all the matching tuples */
+  while ((atttup = systable_getnext(scan)) != NULL)
+    simple_heap_delete(attrel, &atttup->t_self);
+
+  /* Clean up after the scan */
+  systable_endscan(scan);
+  heap_close(attrel, RowExclusiveLock);
 }
 
 /*
@@ -1424,86 +1430,86 @@ DeleteAttributeTuples(Oid relid)
 void
 RemoveAttributeById(Oid relid, AttrNumber attnum)
 {
-	Relation	rel;
-	Relation	attr_rel;
-	HeapTuple	tuple;
-	Form_pg_attribute attStruct;
-	char		newattname[NAMEDATALEN];
-
-	/*
-	 * Grab an exclusive lock on the target table, which we will NOT release
-	 * until end of transaction.  (In the simple case where we are directly
-	 * dropping this column, AlterTableDropColumn already did this ... but
-	 * when cascading from a drop of some other object, we may not have any
-	 * lock.)
-	 */
-	rel = relation_open(relid, AccessExclusiveLock);
-
-	attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheCopy2(ATTNUM,
-								ObjectIdGetDatum(relid),
-								Int16GetDatum(attnum));
-	if (!HeapTupleIsValid(tuple))		/* shouldn't happen */
-		elog(ERROR, "cache lookup failed for attribute %d of relation %u",
-			 attnum, relid);
-	attStruct = (Form_pg_attribute) GETSTRUCT(tuple);
-
-	if (attnum < 0)
-	{
-		/* System attribute (probably OID) ... just delete the row */
-
-		simple_heap_delete(attr_rel, &tuple->t_self);
-	}
-	else
-	{
-		/* Dropping user attributes is lots harder */
-
-		/* Mark the attribute as dropped */
-		attStruct->attisdropped = true;
-
-		/*
-		 * Set the type OID to invalid.  A dropped attribute's type link
-		 * cannot be relied on (once the attribute is dropped, the type might
-		 * be too). Fortunately we do not need the type row --- the only
-		 * really essential information is the type's typlen and typalign,
-		 * which are preserved in the attribute's attlen and attalign.  We set
-		 * atttypid to zero here as a means of catching code that incorrectly
-		 * expects it to be valid.
-		 */
-		attStruct->atttypid = InvalidOid;
-
-		/* Remove any NOT NULL constraint the column may have */
-		attStruct->attnotnull = false;
-
-		/* We don't want to keep stats for it anymore */
-		attStruct->attstattarget = 0;
-
-		/*
-		 * Change the column name to something that isn't likely to conflict
-		 */
-		snprintf(newattname, sizeof(newattname),
-				 "........pg.dropped.%d........", attnum);
-		namestrcpy(&(attStruct->attname), newattname);
-
-		simple_heap_update(attr_rel, &tuple->t_self, tuple);
-
-		/* keep the system catalog indexes current */
-		CatalogUpdateIndexes(attr_rel, tuple);
-	}
-
-	/*
-	 * Because updating the pg_attribute row will trigger a relcache flush for
-	 * the target relation, we need not do anything else to notify other
-	 * backends of the change.
-	 */
-
-	heap_close(attr_rel, RowExclusiveLock);
-
-	if (attnum > 0)
-		RemoveStatistics(relid, attnum);
-
-	relation_close(rel, NoLock);
+  Relation	rel;
+  Relation	attr_rel;
+  HeapTuple	tuple;
+  Form_pg_attribute attStruct;
+  char		newattname[NAMEDATALEN];
+
+  /*
+   * Grab an exclusive lock on the target table, which we will NOT release
+   * until end of transaction.  (In the simple case where we are directly
+   * dropping this column, AlterTableDropColumn already did this ... but
+   * when cascading from a drop of some other object, we may not have any
+   * lock.)
+   */
+  rel = relation_open(relid, AccessExclusiveLock);
+
+  attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheCopy2(ATTNUM,
+			      ObjectIdGetDatum(relid),
+			      Int16GetDatum(attnum));
+  if (!HeapTupleIsValid(tuple))		/* shouldn't happen */
+    elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+	 attnum, relid);
+  attStruct = (Form_pg_attribute) GETSTRUCT(tuple);
+
+  if (attnum < 0)
+    {
+      /* System attribute (probably OID) ... just delete the row */
+
+      simple_heap_delete(attr_rel, &tuple->t_self);
+    }
+  else
+    {
+      /* Dropping user attributes is lots harder */
+
+      /* Mark the attribute as dropped */
+      attStruct->attisdropped = true;
+
+      /*
+       * Set the type OID to invalid.  A dropped attribute's type link
+       * cannot be relied on (once the attribute is dropped, the type might
+       * be too). Fortunately we do not need the type row --- the only
+       * really essential information is the type's typlen and typalign,
+       * which are preserved in the attribute's attlen and attalign.  We set
+       * atttypid to zero here as a means of catching code that incorrectly
+       * expects it to be valid.
+       */
+      attStruct->atttypid = InvalidOid;
+
+      /* Remove any NOT NULL constraint the column may have */
+      attStruct->attnotnull = false;
+
+      /* We don't want to keep stats for it anymore */
+      attStruct->attstattarget = 0;
+
+      /*
+       * Change the column name to something that isn't likely to conflict
+       */
+      snprintf(newattname, sizeof(newattname),
+	       "........pg.dropped.%d........", attnum);
+      namestrcpy(&(attStruct->attname), newattname);
+
+      simple_heap_update(attr_rel, &tuple->t_self, tuple);
+
+      /* keep the system catalog indexes current */
+      CatalogUpdateIndexes(attr_rel, tuple);
+    }
+
+  /*
+   * Because updating the pg_attribute row will trigger a relcache flush for
+   * the target relation, we need not do anything else to notify other
+   * backends of the change.
+   */
+
+  heap_close(attr_rel, RowExclusiveLock);
+
+  if (attnum > 0)
+    RemoveStatistics(relid, attnum);
+
+  relation_close(rel, NoLock);
 }
 
 /*
@@ -1514,48 +1520,48 @@ RemoveAttributeById(Oid relid, AttrNumber attnum)
  */
 void
 RemoveAttrDefault(Oid relid, AttrNumber attnum,
-				  DropBehavior behavior, bool complain)
+		  DropBehavior behavior, bool complain)
 {
-	Relation	attrdef_rel;
-	ScanKeyData scankeys[2];
-	SysScanDesc scan;
-	HeapTuple	tuple;
-	bool		found = false;
-
-	attrdef_rel = heap_open(AttrDefaultRelationId, RowExclusiveLock);
-
-	ScanKeyInit(&scankeys[0],
-				Anum_pg_attrdef_adrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
-	ScanKeyInit(&scankeys[1],
-				Anum_pg_attrdef_adnum,
-				BTEqualStrategyNumber, F_INT2EQ,
-				Int16GetDatum(attnum));
-
-	scan = systable_beginscan(attrdef_rel, AttrDefaultIndexId, true,
-							  SnapshotNow, 2, scankeys);
-
-	/* There should be at most one matching tuple, but we loop anyway */
-	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
-	{
-		ObjectAddress object;
-
-		object.classId = AttrDefaultRelationId;
-		object.objectId = HeapTupleGetOid(tuple);
-		object.objectSubId = 0;
-
-		performDeletion(&object, behavior);
-
-		found = true;
-	}
-
-	systable_endscan(scan);
-	heap_close(attrdef_rel, RowExclusiveLock);
-
-	if (complain && !found)
-		elog(ERROR, "could not find attrdef tuple for relation %u attnum %d",
-			 relid, attnum);
+  Relation	attrdef_rel;
+  ScanKeyData scankeys[2];
+  SysScanDesc scan;
+  HeapTuple	tuple;
+  bool		found = false;
+
+  attrdef_rel = heap_open(AttrDefaultRelationId, RowExclusiveLock);
+
+  ScanKeyInit(&scankeys[0],
+	      Anum_pg_attrdef_adrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relid));
+  ScanKeyInit(&scankeys[1],
+	      Anum_pg_attrdef_adnum,
+	      BTEqualStrategyNumber, F_INT2EQ,
+	      Int16GetDatum(attnum));
+
+  scan = systable_beginscan(attrdef_rel, AttrDefaultIndexId, true,
+			    SnapshotNow, 2, scankeys);
+
+  /* There should be at most one matching tuple, but we loop anyway */
+  while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+    {
+      ObjectAddress object;
+
+      object.classId = AttrDefaultRelationId;
+      object.objectId = HeapTupleGetOid(tuple);
+      object.objectSubId = 0;
+
+      performDeletion(&object, behavior);
+
+      found = true;
+    }
+
+  systable_endscan(scan);
+  heap_close(attrdef_rel, RowExclusiveLock);
+
+  if (complain && !found)
+    elog(ERROR, "could not find attrdef tuple for relation %u attnum %d",
+	 relid, attnum);
 }
 
 /*
@@ -1568,68 +1574,68 @@ RemoveAttrDefault(Oid relid, AttrNumber attnum,
 void
 RemoveAttrDefaultById(Oid attrdefId)
 {
-	Relation	attrdef_rel;
-	Relation	attr_rel;
-	Relation	myrel;
-	ScanKeyData scankeys[1];
-	SysScanDesc scan;
-	HeapTuple	tuple;
-	Oid			myrelid;
-	AttrNumber	myattnum;
+  Relation	attrdef_rel;
+  Relation	attr_rel;
+  Relation	myrel;
+  ScanKeyData scankeys[1];
+  SysScanDesc scan;
+  HeapTuple	tuple;
+  Oid			myrelid;
+  AttrNumber	myattnum;
 
-	/* Grab an appropriate lock on the pg_attrdef relation */
-	attrdef_rel = heap_open(AttrDefaultRelationId, RowExclusiveLock);
+  /* Grab an appropriate lock on the pg_attrdef relation */
+  attrdef_rel = heap_open(AttrDefaultRelationId, RowExclusiveLock);
 
-	/* Find the pg_attrdef tuple */
-	ScanKeyInit(&scankeys[0],
-				ObjectIdAttributeNumber,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(attrdefId));
+  /* Find the pg_attrdef tuple */
+  ScanKeyInit(&scankeys[0],
+	      ObjectIdAttributeNumber,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(attrdefId));
 
-	scan = systable_beginscan(attrdef_rel, AttrDefaultOidIndexId, true,
-							  SnapshotNow, 1, scankeys);
+  scan = systable_beginscan(attrdef_rel, AttrDefaultOidIndexId, true,
+			    SnapshotNow, 1, scankeys);
 
-	tuple = systable_getnext(scan);
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "could not find tuple for attrdef %u", attrdefId);
+  tuple = systable_getnext(scan);
+  if (!HeapTupleIsValid(tuple))
+    elog(ERROR, "could not find tuple for attrdef %u", attrdefId);
 
-	myrelid = ((Form_pg_attrdef) GETSTRUCT(tuple))->adrelid;
-	myattnum = ((Form_pg_attrdef) GETSTRUCT(tuple))->adnum;
+  myrelid = ((Form_pg_attrdef) GETSTRUCT(tuple))->adrelid;
+  myattnum = ((Form_pg_attrdef) GETSTRUCT(tuple))->adnum;
 
-	/* Get an exclusive lock on the relation owning the attribute */
-	myrel = relation_open(myrelid, AccessExclusiveLock);
+  /* Get an exclusive lock on the relation owning the attribute */
+  myrel = relation_open(myrelid, AccessExclusiveLock);
 
-	/* Now we can delete the pg_attrdef row */
-	simple_heap_delete(attrdef_rel, &tuple->t_self);
+  /* Now we can delete the pg_attrdef row */
+  simple_heap_delete(attrdef_rel, &tuple->t_self);
 
-	systable_endscan(scan);
-	heap_close(attrdef_rel, RowExclusiveLock);
+  systable_endscan(scan);
+  heap_close(attrdef_rel, RowExclusiveLock);
 
-	/* Fix the pg_attribute row */
-	attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
+  /* Fix the pg_attribute row */
+  attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
 
-	tuple = SearchSysCacheCopy2(ATTNUM,
-								ObjectIdGetDatum(myrelid),
-								Int16GetDatum(myattnum));
-	if (!HeapTupleIsValid(tuple))		/* shouldn't happen */
-		elog(ERROR, "cache lookup failed for attribute %d of relation %u",
-			 myattnum, myrelid);
+  tuple = SearchSysCacheCopy2(ATTNUM,
+			      ObjectIdGetDatum(myrelid),
+			      Int16GetDatum(myattnum));
+  if (!HeapTupleIsValid(tuple))		/* shouldn't happen */
+    elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+	 myattnum, myrelid);
 
-	((Form_pg_attribute) GETSTRUCT(tuple))->atthasdef = false;
+  ((Form_pg_attribute) GETSTRUCT(tuple))->atthasdef = false;
 
-	simple_heap_update(attr_rel, &tuple->t_self, tuple);
+  simple_heap_update(attr_rel, &tuple->t_self, tuple);
 
-	/* keep the system catalog indexes current */
-	CatalogUpdateIndexes(attr_rel, tuple);
+  /* keep the system catalog indexes current */
+  CatalogUpdateIndexes(attr_rel, tuple);
 
-	/*
-	 * Our update of the pg_attribute row will force a relcache rebuild, so
-	 * there's nothing else to do here.
-	 */
-	heap_close(attr_rel, RowExclusiveLock);
+  /*
+   * Our update of the pg_attribute row will force a relcache rebuild, so
+   * there's nothing else to do here.
+   */
+  heap_close(attr_rel, RowExclusiveLock);
 
-	/* Keep lock on attribute's rel until end of xact */
-	relation_close(myrel, NoLock);
+  /* Keep lock on attribute's rel until end of xact */
+  relation_close(myrel, NoLock);
 }
 
 /*
@@ -1644,98 +1650,98 @@ RemoveAttrDefaultById(Oid attrdefId)
 void
 heap_drop_with_catalog(Oid relid)
 {
-	Relation	rel;
-
-	/*
-	 * Open and lock the relation.
-	 */
-	rel = relation_open(relid, AccessExclusiveLock);
-
-	/*
-	 * There can no longer be anyone *else* touching the relation, but we
-	 * might still have open queries or cursors, or pending trigger events, in
-	 * our own session.
-	 */
-	CheckTableNotInUse(rel, "DROP TABLE");
-
-	/*
-	 * This effectively deletes all rows in the table, and may be done in a
-	 * serializable transaction.  In that case we must record a rw-conflict in
-	 * to this transaction from each transaction holding a predicate lock on
-	 * the table.
-	 */
-	CheckTableForSerializableConflictIn(rel);
-
-	/*
-	 * Delete pg_foreign_table tuple first.
-	 */
-	if (rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
-	{
-		Relation	rel;
-		HeapTuple	tuple;
-
-		rel = heap_open(ForeignTableRelationId, RowExclusiveLock);
-
-		tuple = SearchSysCache1(FOREIGNTABLEREL, ObjectIdGetDatum(relid));
-		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for foreign table %u", relid);
-
-		simple_heap_delete(rel, &tuple->t_self);
-
-		ReleaseSysCache(tuple);
-		heap_close(rel, RowExclusiveLock);
-	}
-
-	/*
-	 * Schedule unlinking of the relation's physical files at commit.
-	 */
-	if (rel->rd_rel->relkind != RELKIND_VIEW &&
-		rel->rd_rel->relkind != RELKIND_COMPOSITE_TYPE &&
-		rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
-	{
-		RelationDropStorage(rel);
-	}
-
-	/*
-	 * Close relcache entry, but *keep* AccessExclusiveLock on the relation
-	 * until transaction commit.  This ensures no one else will try to do
-	 * something with the doomed relation.
-	 */
-	relation_close(rel, NoLock);
-
-	/*
-	 * Forget any ON COMMIT action for the rel
-	 */
-	remove_on_commit_action(relid);
-
-	/*
-	 * Flush the relation from the relcache.  We want to do this before
-	 * starting to remove catalog entries, just to be certain that no relcache
-	 * entry rebuild will happen partway through.  (That should not really
-	 * matter, since we don't do CommandCounterIncrement here, but let's be
-	 * safe.)
-	 */
-	RelationForgetRelation(relid);
-
-	/*
-	 * remove inheritance information
-	 */
-	RelationRemoveInheritance(relid);
-
-	/*
-	 * delete statistics
-	 */
-	RemoveStatistics(relid, 0);
-
-	/*
-	 * delete attribute tuples
-	 */
-	DeleteAttributeTuples(relid);
-
-	/*
-	 * delete relation tuple
-	 */
-	DeleteRelationTuple(relid);
+  Relation	rel;
+
+  /*
+   * Open and lock the relation.
+   */
+  rel = relation_open(relid, AccessExclusiveLock);
+
+  /*
+   * There can no longer be anyone *else* touching the relation, but we
+   * might still have open queries or cursors, or pending trigger events, in
+   * our own session.
+   */
+  CheckTableNotInUse(rel, "DROP TABLE");
+
+  /*
+   * This effectively deletes all rows in the table, and may be done in a
+   * serializable transaction.  In that case we must record a rw-conflict in
+   * to this transaction from each transaction holding a predicate lock on
+   * the table.
+   */
+  CheckTableForSerializableConflictIn(rel);
+
+  /*
+   * Delete pg_foreign_table tuple first.
+   */
+  if (rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+    {
+      Relation	rel;
+      HeapTuple	tuple;
+
+      rel = heap_open(ForeignTableRelationId, RowExclusiveLock);
+
+      tuple = SearchSysCache1(FOREIGNTABLEREL, ObjectIdGetDatum(relid));
+      if (!HeapTupleIsValid(tuple))
+	elog(ERROR, "cache lookup failed for foreign table %u", relid);
+
+      simple_heap_delete(rel, &tuple->t_self);
+
+      ReleaseSysCache(tuple);
+      heap_close(rel, RowExclusiveLock);
+    }
+
+  /*
+   * Schedule unlinking of the relation's physical files at commit.
+   */
+  if (rel->rd_rel->relkind != RELKIND_VIEW &&
+      rel->rd_rel->relkind != RELKIND_COMPOSITE_TYPE &&
+      rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
+    {
+      RelationDropStorage(rel);
+    }
+
+  /*
+   * Close relcache entry, but *keep* AccessExclusiveLock on the relation
+   * until transaction commit.  This ensures no one else will try to do
+   * something with the doomed relation.
+   */
+  relation_close(rel, NoLock);
+
+  /*
+   * Forget any ON COMMIT action for the rel
+   */
+  remove_on_commit_action(relid);
+
+  /*
+   * Flush the relation from the relcache.  We want to do this before
+   * starting to remove catalog entries, just to be certain that no relcache
+   * entry rebuild will happen partway through.  (That should not really
+   * matter, since we don't do CommandCounterIncrement here, but let's be
+   * safe.)
+   */
+  RelationForgetRelation(relid);
+
+  /*
+   * remove inheritance information
+   */
+  RelationRemoveInheritance(relid);
+
+  /*
+   * delete statistics
+   */
+  RemoveStatistics(relid, 0);
+
+  /*
+   * delete attribute tuples
+   */
+  DeleteAttributeTuples(relid);
+
+  /*
+   * delete relation tuple
+   */
+  DeleteRelationTuple(relid);
 }
 
 
@@ -1745,96 +1751,96 @@ heap_drop_with_catalog(Oid relid)
 void
 StoreAttrDefault(Relation rel, AttrNumber attnum, Node *expr)
 {
-	char	   *adbin;
-	char	   *adsrc;
-	Relation	adrel;
-	HeapTuple	tuple;
-	Datum		values[4];
-	static bool nulls[4] = {false, false, false, false};
-	Relation	attrrel;
-	HeapTuple	atttup;
-	Form_pg_attribute attStruct;
-	Oid			attrdefOid;
-	ObjectAddress colobject,
-				defobject;
-
-	/*
-	 * Flatten expression to string form for storage.
-	 */
-	adbin = nodeToString(expr);
-
-	/*
-	 * Also deparse it to form the mostly-obsolete adsrc field.
-	 */
-	adsrc = deparse_expression(expr,
-							deparse_context_for(RelationGetRelationName(rel),
-												RelationGetRelid(rel)),
-							   false, false);
-
-	/*
-	 * Make the pg_attrdef entry.
-	 */
-	values[Anum_pg_attrdef_adrelid - 1] = RelationGetRelid(rel);
-	values[Anum_pg_attrdef_adnum - 1] = attnum;
-	values[Anum_pg_attrdef_adbin - 1] = CStringGetTextDatum(adbin);
-	values[Anum_pg_attrdef_adsrc - 1] = CStringGetTextDatum(adsrc);
-
-	adrel = heap_open(AttrDefaultRelationId, RowExclusiveLock);
-
-	tuple = heap_form_tuple(adrel->rd_att, values, nulls);
-	attrdefOid = simple_heap_insert(adrel, tuple);
-
-	CatalogUpdateIndexes(adrel, tuple);
-
-	defobject.classId = AttrDefaultRelationId;
-	defobject.objectId = attrdefOid;
-	defobject.objectSubId = 0;
-
-	heap_close(adrel, RowExclusiveLock);
-
-	/* now can free some of the stuff allocated above */
-	pfree(DatumGetPointer(values[Anum_pg_attrdef_adbin - 1]));
-	pfree(DatumGetPointer(values[Anum_pg_attrdef_adsrc - 1]));
-	heap_freetuple(tuple);
-	pfree(adbin);
-	pfree(adsrc);
-
-	/*
-	 * Update the pg_attribute entry for the column to show that a default
-	 * exists.
-	 */
-	attrrel = heap_open(AttributeRelationId, RowExclusiveLock);
-	atttup = SearchSysCacheCopy2(ATTNUM,
-								 ObjectIdGetDatum(RelationGetRelid(rel)),
-								 Int16GetDatum(attnum));
-	if (!HeapTupleIsValid(atttup))
-		elog(ERROR, "cache lookup failed for attribute %d of relation %u",
-			 attnum, RelationGetRelid(rel));
-	attStruct = (Form_pg_attribute) GETSTRUCT(atttup);
-	if (!attStruct->atthasdef)
-	{
-		attStruct->atthasdef = true;
-		simple_heap_update(attrrel, &atttup->t_self, atttup);
-		/* keep catalog indexes current */
-		CatalogUpdateIndexes(attrrel, atttup);
-	}
-	heap_close(attrrel, RowExclusiveLock);
-	heap_freetuple(atttup);
-
-	/*
-	 * Make a dependency so that the pg_attrdef entry goes away if the column
-	 * (or whole table) is deleted.
-	 */
-	colobject.classId = RelationRelationId;
-	colobject.objectId = RelationGetRelid(rel);
-	colobject.objectSubId = attnum;
-
-	recordDependencyOn(&defobject, &colobject, DEPENDENCY_AUTO);
-
-	/*
-	 * Record dependencies on objects used in the expression, too.
-	 */
-	recordDependencyOnExpr(&defobject, expr, NIL, DEPENDENCY_NORMAL);
+  char	   *adbin;
+  char	   *adsrc;
+  Relation	adrel;
+  HeapTuple	tuple;
+  Datum		values[4];
+  static bool nulls[4] = {false, false, false, false};
+  Relation	attrrel;
+  HeapTuple	atttup;
+  Form_pg_attribute attStruct;
+  Oid			attrdefOid;
+  ObjectAddress colobject,
+    defobject;
+
+  /*
+   * Flatten expression to string form for storage.
+   */
+  adbin = nodeToString(expr);
+
+  /*
+   * Also deparse it to form the mostly-obsolete adsrc field.
+   */
+  adsrc = deparse_expression(expr,
+			     deparse_context_for(RelationGetRelationName(rel),
+						 RelationGetRelid(rel)),
+			     false, false);
+
+  /*
+   * Make the pg_attrdef entry.
+   */
+  values[Anum_pg_attrdef_adrelid - 1] = RelationGetRelid(rel);
+  values[Anum_pg_attrdef_adnum - 1] = attnum;
+  values[Anum_pg_attrdef_adbin - 1] = CStringGetTextDatum(adbin);
+  values[Anum_pg_attrdef_adsrc - 1] = CStringGetTextDatum(adsrc);
+
+  adrel = heap_open(AttrDefaultRelationId, RowExclusiveLock);
+
+  tuple = heap_form_tuple(adrel->rd_att, values, nulls);
+  attrdefOid = simple_heap_insert(adrel, tuple);
+
+  CatalogUpdateIndexes(adrel, tuple);
+
+  defobject.classId = AttrDefaultRelationId;
+  defobject.objectId = attrdefOid;
+  defobject.objectSubId = 0;
+
+  heap_close(adrel, RowExclusiveLock);
+
+  /* now can free some of the stuff allocated above */
+  pfree(DatumGetPointer(values[Anum_pg_attrdef_adbin - 1]));
+  pfree(DatumGetPointer(values[Anum_pg_attrdef_adsrc - 1]));
+  heap_freetuple(tuple);
+  pfree(adbin);
+  pfree(adsrc);
+
+  /*
+   * Update the pg_attribute entry for the column to show that a default
+   * exists.
+   */
+  attrrel = heap_open(AttributeRelationId, RowExclusiveLock);
+  atttup = SearchSysCacheCopy2(ATTNUM,
+			       ObjectIdGetDatum(RelationGetRelid(rel)),
+			       Int16GetDatum(attnum));
+  if (!HeapTupleIsValid(atttup))
+    elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+	 attnum, RelationGetRelid(rel));
+  attStruct = (Form_pg_attribute) GETSTRUCT(atttup);
+  if (!attStruct->atthasdef)
+    {
+      attStruct->atthasdef = true;
+      simple_heap_update(attrrel, &atttup->t_self, atttup);
+      /* keep catalog indexes current */
+      CatalogUpdateIndexes(attrrel, atttup);
+    }
+  heap_close(attrrel, RowExclusiveLock);
+  heap_freetuple(atttup);
+
+  /*
+   * Make a dependency so that the pg_attrdef entry goes away if the column
+   * (or whole table) is deleted.
+   */
+  colobject.classId = RelationRelationId;
+  colobject.objectId = RelationGetRelid(rel);
+  colobject.objectSubId = attnum;
+
+  recordDependencyOn(&defobject, &colobject, DEPENDENCY_AUTO);
+
+  /*
+   * Record dependencies on objects used in the expression, too.
+   */
+  recordDependencyOnExpr(&defobject, expr, NIL, DEPENDENCY_NORMAL);
 }
 
 /*
@@ -1845,91 +1851,93 @@ StoreAttrDefault(Relation rel, AttrNumber attnum, Node *expr)
  */
 static void
 StoreRelCheck(Relation rel, char *ccname, Node *expr,
-			  bool is_local, int inhcount)
+	      bool is_local, int inhcount)
 {
-	char	   *ccbin;
-	char	   *ccsrc;
-	List	   *varList;
-	int			keycount;
-	int16	   *attNos;
-
-	/*
-	 * Flatten expression to string form for storage.
-	 */
-	ccbin = nodeToString(expr);
-
-	/*
-	 * Also deparse it to form the mostly-obsolete consrc field.
-	 */
-	ccsrc = deparse_expression(expr,
-							deparse_context_for(RelationGetRelationName(rel),
-												RelationGetRelid(rel)),
-							   false, false);
-
-	/*
-	 * Find columns of rel that are used in expr
-	 *
-	 * NB: pull_var_clause is okay here only because we don't allow subselects
-	 * in check constraints; it would fail to examine the contents of
-	 * subselects.
-	 */
-	varList = pull_var_clause(expr, PVC_REJECT_PLACEHOLDERS);
-	keycount = list_length(varList);
-
-	if (keycount > 0)
+  char	   *ccbin;
+  char	   *ccsrc;
+  List	   *varList;
+  int			keycount;
+  int16	   *attNos;
+
+  /*
+   * Flatten expression to string form for storage.
+   */
+  ccbin = nodeToString(expr);
+
+  /*
+   * Also deparse it to form the mostly-obsolete consrc field.
+   */
+  ccsrc = deparse_expression(expr,
+			     deparse_context_for(RelationGetRelationName(rel),
+						 RelationGetRelid(rel)),
+			     false, false);
+
+  /*
+   * Find columns of rel that are used in expr
+   *
+   * NB: pull_var_clause is okay here only because we don't allow subselects
+   * in check constraints; it would fail to examine the contents of
+   * subselects.
+   */
+  varList = pull_var_clause(expr,
+			    PVC_REJECT_AGGREGATES,
+			    PVC_REJECT_PLACEHOLDERS);
+  keycount = list_length(varList);
+
+  if (keycount > 0)
+    {
+      ListCell   *vl;
+      int			i = 0;
+
+      attNos = (int16 *) palloc(keycount * sizeof(int16));
+      foreach(vl, varList)
 	{
-		ListCell   *vl;
-		int			i = 0;
-
-		attNos = (int16 *) palloc(keycount * sizeof(int16));
-		foreach(vl, varList)
-		{
-			Var		   *var = (Var *) lfirst(vl);
-			int			j;
-
-			for (j = 0; j < i; j++)
-				if (attNos[j] == var->varattno)
-					break;
-			if (j == i)
-				attNos[i++] = var->varattno;
-		}
-		keycount = i;
+	  Var		   *var = (Var *) lfirst(vl);
+	  int			j;
+
+	  for (j = 0; j < i; j++)
+	    if (attNos[j] == var->varattno)
+	      break;
+	  if (j == i)
+	    attNos[i++] = var->varattno;
 	}
-	else
-		attNos = NULL;
-
-	/*
-	 * Create the Check Constraint
-	 */
-	CreateConstraintEntry(ccname,		/* Constraint Name */
-						  RelationGetNamespace(rel),	/* namespace */
-						  CONSTRAINT_CHECK,		/* Constraint Type */
-						  false,	/* Is Deferrable */
-						  false,	/* Is Deferred */
-						  true, /* Is Validated */
-						  RelationGetRelid(rel),		/* relation */
-						  attNos,		/* attrs in the constraint */
-						  keycount,		/* # attrs in the constraint */
-						  InvalidOid,	/* not a domain constraint */
-						  InvalidOid,	/* no associated index */
-						  InvalidOid,	/* Foreign key fields */
-						  NULL,
-						  NULL,
-						  NULL,
-						  NULL,
-						  0,
-						  ' ',
-						  ' ',
-						  ' ',
-						  NULL, /* not an exclusion constraint */
-						  expr, /* Tree form of check constraint */
-						  ccbin,	/* Binary form of check constraint */
-						  ccsrc,	/* Source form of check constraint */
-						  is_local,		/* conislocal */
-						  inhcount);	/* coninhcount */
-
-	pfree(ccbin);
-	pfree(ccsrc);
+      keycount = i;
+    }
+  else
+    attNos = NULL;
+
+  /*
+   * Create the Check Constraint
+   */
+  CreateConstraintEntry(ccname,		/* Constraint Name */
+			RelationGetNamespace(rel),	/* namespace */
+			CONSTRAINT_CHECK,		/* Constraint Type */
+			false,	/* Is Deferrable */
+			false,	/* Is Deferred */
+			true, /* Is Validated */
+			RelationGetRelid(rel),		/* relation */
+			attNos,		/* attrs in the constraint */
+			keycount,		/* # attrs in the constraint */
+			InvalidOid,	/* not a domain constraint */
+			InvalidOid,	/* no associated index */
+			InvalidOid,	/* Foreign key fields */
+			NULL,
+			NULL,
+			NULL,
+			NULL,
+			0,
+			' ',
+			' ',
+			' ',
+			NULL, /* not an exclusion constraint */
+			expr, /* Tree form of check constraint */
+			ccbin,	/* Binary form of check constraint */
+			ccsrc,	/* Source form of check constraint */
+			is_local,		/* conislocal */
+			inhcount);	/* coninhcount */
+
+  pfree(ccbin);
+  pfree(ccsrc);
 }
 
 /*
@@ -1943,41 +1951,41 @@ StoreRelCheck(Relation rel, char *ccname, Node *expr,
 static void
 StoreConstraints(Relation rel, List *cooked_constraints)
 {
-	int			numchecks = 0;
-	ListCell   *lc;
+  int			numchecks = 0;
+  ListCell   *lc;
 
-	if (!cooked_constraints)
-		return;					/* nothing to do */
+  if (!cooked_constraints)
+    return;					/* nothing to do */
 
-	/*
-	 * Deparsing of constraint expressions will fail unless the just-created
-	 * pg_attribute tuples for this relation are made visible.	So, bump the
-	 * command counter.  CAUTION: this will cause a relcache entry rebuild.
-	 */
-	CommandCounterIncrement();
+  /*
+   * Deparsing of constraint expressions will fail unless the just-created
+   * pg_attribute tuples for this relation are made visible.	So, bump the
+   * command counter.  CAUTION: this will cause a relcache entry rebuild.
+   */
+  CommandCounterIncrement();
 
-	foreach(lc, cooked_constraints)
+  foreach(lc, cooked_constraints)
+    {
+      CookedConstraint *con = (CookedConstraint *) lfirst(lc);
+
+      switch (con->contype)
 	{
-		CookedConstraint *con = (CookedConstraint *) lfirst(lc);
-
-		switch (con->contype)
-		{
-			case CONSTR_DEFAULT:
-				StoreAttrDefault(rel, con->attnum, con->expr);
-				break;
-			case CONSTR_CHECK:
-				StoreRelCheck(rel, con->name, con->expr,
-							  con->is_local, con->inhcount);
-				numchecks++;
-				break;
-			default:
-				elog(ERROR, "unrecognized constraint type: %d",
-					 (int) con->contype);
-		}
+	case CONSTR_DEFAULT:
+	  StoreAttrDefault(rel, con->attnum, con->expr);
+	  break;
+	case CONSTR_CHECK:
+	  StoreRelCheck(rel, con->name, con->expr,
+			con->is_local, con->inhcount);
+	  numchecks++;
+	  break;
+	default:
+	  elog(ERROR, "unrecognized constraint type: %d",
+	       (int) con->contype);
 	}
+    }
 
-	if (numchecks > 0)
-		SetRelationNumChecks(rel, numchecks);
+  if (numchecks > 0)
+    SetRelationNumChecks(rel, numchecks);
 }
 
 /*
@@ -2007,216 +2015,218 @@ StoreConstraints(Relation rel, List *cooked_constraints)
  */
 List *
 AddRelationNewConstraints(Relation rel,
-						  List *newColDefaults,
-						  List *newConstraints,
-						  bool allow_merge,
-						  bool is_local)
+			  List *newColDefaults,
+			  List *newConstraints,
+			  bool allow_merge,
+			  bool is_local)
 {
-	List	   *cookedConstraints = NIL;
-	TupleDesc	tupleDesc;
-	TupleConstr *oldconstr;
-	int			numoldchecks;
-	ParseState *pstate;
-	RangeTblEntry *rte;
-	int			numchecks;
-	List	   *checknames;
-	ListCell   *cell;
-	Node	   *expr;
-	CookedConstraint *cooked;
-
-	/*
-	 * Get info about existing constraints.
-	 */
-	tupleDesc = RelationGetDescr(rel);
-	oldconstr = tupleDesc->constr;
-	if (oldconstr)
-		numoldchecks = oldconstr->num_check;
-	else
-		numoldchecks = 0;
-
-	/*
-	 * Create a dummy ParseState and insert the target relation as its sole
-	 * rangetable entry.  We need a ParseState for transformExpr.
-	 */
-	pstate = make_parsestate(NULL);
-	rte = addRangeTableEntryForRelation(pstate,
-										rel,
-										NULL,
-										false,
-										true);
-	addRTEtoQuery(pstate, rte, true, true, true);
-
-	/*
-	 * Process column default expressions.
-	 */
-	foreach(cell, newColDefaults)
+  List	   *cookedConstraints = NIL;
+  TupleDesc	tupleDesc;
+  TupleConstr *oldconstr;
+  int			numoldchecks;
+  ParseState *pstate;
+  RangeTblEntry *rte;
+  int			numchecks;
+  List	   *checknames;
+  ListCell   *cell;
+  Node	   *expr;
+  CookedConstraint *cooked;
+
+  /*
+   * Get info about existing constraints.
+   */
+  tupleDesc = RelationGetDescr(rel);
+  oldconstr = tupleDesc->constr;
+  if (oldconstr)
+    numoldchecks = oldconstr->num_check;
+  else
+    numoldchecks = 0;
+
+  /*
+   * Create a dummy ParseState and insert the target relation as its sole
+   * rangetable entry.  We need a ParseState for transformExpr.
+   */
+  pstate = make_parsestate(NULL);
+  rte = addRangeTableEntryForRelation(pstate,
+				      rel,
+				      NULL,
+				      false,
+				      true);
+  addRTEtoQuery(pstate, rte, true, true, true);
+
+  /*
+   * Process column default expressions.
+   */
+  foreach(cell, newColDefaults)
+    {
+      RawColumnDefault *colDef = (RawColumnDefault *) lfirst(cell);
+      Form_pg_attribute atp = rel->rd_att->attrs[colDef->attnum - 1];
+
+      expr = cookDefault(pstate, colDef->raw_default,
+			 atp->atttypid, atp->atttypmod,
+			 NameStr(atp->attname));
+
+      /*
+       * If the expression is just a NULL constant, we do not bother to make
+       * an explicit pg_attrdef entry, since the default behavior is
+       * equivalent.
+       *
+       * Note a nonobvious property of this test: if the column is of a
+       * domain type, what we'll get is not a bare null Const but a
+       * CoerceToDomain expr, so we will not discard the default.  This is
+       * critical because the column default needs to be retained to
+       * override any default that the domain might have.
+       */
+      if (expr == NULL ||
+	  (IsA(expr, Const) &&((Const *) expr)->constisnull))
+	continue;
+
+      StoreAttrDefault(rel, colDef->attnum, expr);
+
+      cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
+      cooked->contype = CONSTR_DEFAULT;
+      cooked->name = NULL;
+      cooked->attnum = colDef->attnum;
+      cooked->expr = expr;
+      cooked->is_local = is_local;
+      cooked->inhcount = is_local ? 0 : 1;
+      cookedConstraints = lappend(cookedConstraints, cooked);
+    }
+
+  /*
+   * Process constraint expressions.
+   */
+  numchecks = numoldchecks;
+  checknames = NIL;
+  foreach(cell, newConstraints)
+    {
+      Constraint *cdef = (Constraint *) lfirst(cell);
+      char	   *ccname;
+
+      if (cdef->contype != CONSTR_CHECK)
+	continue;
+
+      if (cdef->raw_expr != NULL)
 	{
-		RawColumnDefault *colDef = (RawColumnDefault *) lfirst(cell);
-		Form_pg_attribute atp = rel->rd_att->attrs[colDef->attnum - 1];
-
-		expr = cookDefault(pstate, colDef->raw_default,
-						   atp->atttypid, atp->atttypmod,
-						   NameStr(atp->attname));
-
-		/*
-		 * If the expression is just a NULL constant, we do not bother to make
-		 * an explicit pg_attrdef entry, since the default behavior is
-		 * equivalent.
-		 *
-		 * Note a nonobvious property of this test: if the column is of a
-		 * domain type, what we'll get is not a bare null Const but a
-		 * CoerceToDomain expr, so we will not discard the default.  This is
-		 * critical because the column default needs to be retained to
-		 * override any default that the domain might have.
-		 */
-		if (expr == NULL ||
-			(IsA(expr, Const) &&((Const *) expr)->constisnull))
-			continue;
-
-		StoreAttrDefault(rel, colDef->attnum, expr);
-
-		cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
-		cooked->contype = CONSTR_DEFAULT;
-		cooked->name = NULL;
-		cooked->attnum = colDef->attnum;
-		cooked->expr = expr;
-		cooked->is_local = is_local;
-		cooked->inhcount = is_local ? 0 : 1;
-		cookedConstraints = lappend(cookedConstraints, cooked);
+	  Assert(cdef->cooked_expr == NULL);
+
+	  /*
+	   * Transform raw parsetree to executable expression, and verify
+	   * it's valid as a CHECK constraint.
+	   */
+	  expr = cookConstraint(pstate, cdef->raw_expr,
+				RelationGetRelationName(rel));
 	}
-
-	/*
-	 * Process constraint expressions.
-	 */
-	numchecks = numoldchecks;
-	checknames = NIL;
-	foreach(cell, newConstraints)
+      else
 	{
-		Constraint *cdef = (Constraint *) lfirst(cell);
-		char	   *ccname;
-
-		if (cdef->contype != CONSTR_CHECK)
-			continue;
-
-		if (cdef->raw_expr != NULL)
-		{
-			Assert(cdef->cooked_expr == NULL);
-
-			/*
-			 * Transform raw parsetree to executable expression, and verify
-			 * it's valid as a CHECK constraint.
-			 */
-			expr = cookConstraint(pstate, cdef->raw_expr,
-								  RelationGetRelationName(rel));
-		}
-		else
-		{
-			Assert(cdef->cooked_expr != NULL);
-
-			/*
-			 * Here, we assume the parser will only pass us valid CHECK
-			 * expressions, so we do no particular checking.
-			 */
-			expr = stringToNode(cdef->cooked_expr);
-		}
-
-		/*
-		 * Check name uniqueness, or generate a name if none was given.
-		 */
-		if (cdef->conname != NULL)
-		{
-			ListCell   *cell2;
-
-			ccname = cdef->conname;
-			/* Check against other new constraints */
-			/* Needed because we don't do CommandCounterIncrement in loop */
-			foreach(cell2, checknames)
-			{
-				if (strcmp((char *) lfirst(cell2), ccname) == 0)
-					ereport(ERROR,
-							(errcode(ERRCODE_DUPLICATE_OBJECT),
-							 errmsg("check constraint \"%s\" already exists",
-									ccname)));
-			}
-
-			/* save name for future checks */
-			checknames = lappend(checknames, ccname);
-
-			/*
-			 * Check against pre-existing constraints.	If we are allowed to
-			 * merge with an existing constraint, there's no more to do here.
-			 * (We omit the duplicate constraint from the result, which is
-			 * what ATAddCheckConstraint wants.)
-			 */
-			if (MergeWithExistingConstraint(rel, ccname, expr,
-											allow_merge, is_local))
-				continue;
-		}
-		else
-		{
-			/*
-			 * When generating a name, we want to create "tab_col_check" for a
-			 * column constraint and "tab_check" for a table constraint.  We
-			 * no longer have any info about the syntactic positioning of the
-			 * constraint phrase, so we approximate this by seeing whether the
-			 * expression references more than one column.	(If the user
-			 * played by the rules, the result is the same...)
-			 *
-			 * Note: pull_var_clause() doesn't descend into sublinks, but we
-			 * eliminated those above; and anyway this only needs to be an
-			 * approximate answer.
-			 */
-			List	   *vars;
-			char	   *colname;
-
-			vars = pull_var_clause(expr, PVC_REJECT_PLACEHOLDERS);
-
-			/* eliminate duplicates */
-			vars = list_union(NIL, vars);
-
-			if (list_length(vars) == 1)
-				colname = get_attname(RelationGetRelid(rel),
-									  ((Var *) linitial(vars))->varattno);
-			else
-				colname = NULL;
-
-			ccname = ChooseConstraintName(RelationGetRelationName(rel),
-										  colname,
-										  "check",
-										  RelationGetNamespace(rel),
-										  checknames);
-
-			/* save name for future checks */
-			checknames = lappend(checknames, ccname);
-		}
-
-		/*
-		 * OK, store it.
-		 */
-		StoreRelCheck(rel, ccname, expr, is_local, is_local ? 0 : 1);
-
-		numchecks++;
-
-		cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
-		cooked->contype = CONSTR_CHECK;
-		cooked->name = ccname;
-		cooked->attnum = 0;
-		cooked->expr = expr;
-		cooked->is_local = is_local;
-		cooked->inhcount = is_local ? 0 : 1;
-		cookedConstraints = lappend(cookedConstraints, cooked);
+	  Assert(cdef->cooked_expr != NULL);
+
+	  /*
+	   * Here, we assume the parser will only pass us valid CHECK
+	   * expressions, so we do no particular checking.
+	   */
+	  expr = stringToNode(cdef->cooked_expr);
 	}
 
-	/*
-	 * Update the count of constraints in the relation's pg_class tuple. We do
-	 * this even if there was no change, in order to ensure that an SI update
-	 * message is sent out for the pg_class tuple, which will force other
-	 * backends to rebuild their relcache entries for the rel. (This is
-	 * critical if we added defaults but not constraints.)
-	 */
-	SetRelationNumChecks(rel, numchecks);
+      /*
+       * Check name uniqueness, or generate a name if none was given.
+       */
+      if (cdef->conname != NULL)
+	{
+	  ListCell   *cell2;
+
+	  ccname = cdef->conname;
+	  /* Check against other new constraints */
+	  /* Needed because we don't do CommandCounterIncrement in loop */
+	  foreach(cell2, checknames)
+	    {
+	      if (strcmp((char *) lfirst(cell2), ccname) == 0)
+		ereport(ERROR,
+			(errcode(ERRCODE_DUPLICATE_OBJECT),
+			 errmsg("check constraint \"%s\" already exists",
+				ccname)));
+	    }
+
+	  /* save name for future checks */
+	  checknames = lappend(checknames, ccname);
+
+	  /*
+	   * Check against pre-existing constraints.	If we are allowed to
+	   * merge with an existing constraint, there's no more to do here.
+	   * (We omit the duplicate constraint from the result, which is
+	   * what ATAddCheckConstraint wants.)
+	   */
+	  if (MergeWithExistingConstraint(rel, ccname, expr,
+					  allow_merge, is_local))
+	    continue;
+	}
+      else
+	{
+	  /*
+	   * When generating a name, we want to create "tab_col_check" for a
+	   * column constraint and "tab_check" for a table constraint.  We
+	   * no longer have any info about the syntactic positioning of the
+	   * constraint phrase, so we approximate this by seeing whether the
+	   * expression references more than one column.	(If the user
+	   * played by the rules, the result is the same...)
+	   *
+	   * Note: pull_var_clause() doesn't descend into sublinks, but we
+	   * eliminated those above; and anyway this only needs to be an
+	   * approximate answer.
+	   */
+	  List	   *vars;
+	  char	   *colname;
+
+	  vars = pull_var_clause(expr,
+				 PVC_REJECT_AGGREGATES,
+				 PVC_REJECT_PLACEHOLDERS);
+
+	  /* eliminate duplicates */
+	  vars = list_union(NIL, vars);
+
+	  if (list_length(vars) == 1)
+	    colname = get_attname(RelationGetRelid(rel),
+				  ((Var *) linitial(vars))->varattno);
+	  else
+	    colname = NULL;
+
+	  ccname = ChooseConstraintName(RelationGetRelationName(rel),
+					colname,
+					"check",
+					RelationGetNamespace(rel),
+					checknames);
+
+	  /* save name for future checks */
+	  checknames = lappend(checknames, ccname);
+	}
 
-	return cookedConstraints;
+      /*
+       * OK, store it.
+       */
+      StoreRelCheck(rel, ccname, expr, is_local, is_local ? 0 : 1);
+
+      numchecks++;
+
+      cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
+      cooked->contype = CONSTR_CHECK;
+      cooked->name = ccname;
+      cooked->attnum = 0;
+      cooked->expr = expr;
+      cooked->is_local = is_local;
+      cooked->inhcount = is_local ? 0 : 1;
+      cookedConstraints = lappend(cookedConstraints, cooked);
+    }
+
+  /*
+   * Update the count of constraints in the relation's pg_class tuple. We do
+   * this even if there was no change, in order to ensure that an SI update
+   * message is sent out for the pg_class tuple, which will force other
+   * backends to rebuild their relcache entries for the rel. (This is
+   * critical if we added defaults but not constraints.)
+   */
+  SetRelationNumChecks(rel, numchecks);
+
+  return cookedConstraints;
 }
 
 /*
@@ -2229,78 +2239,78 @@ AddRelationNewConstraints(Relation rel,
  */
 static bool
 MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
-							bool allow_merge, bool is_local)
+			    bool allow_merge, bool is_local)
 {
-	bool		found;
-	Relation	conDesc;
-	SysScanDesc conscan;
-	ScanKeyData skey[2];
-	HeapTuple	tup;
+  bool		found;
+  Relation	conDesc;
+  SysScanDesc conscan;
+  ScanKeyData skey[2];
+  HeapTuple	tup;
 
-	/* Search for a pg_constraint entry with same name and relation */
-	conDesc = heap_open(ConstraintRelationId, RowExclusiveLock);
+  /* Search for a pg_constraint entry with same name and relation */
+  conDesc = heap_open(ConstraintRelationId, RowExclusiveLock);
 
-	found = false;
+  found = false;
 
-	ScanKeyInit(&skey[0],
-				Anum_pg_constraint_conname,
-				BTEqualStrategyNumber, F_NAMEEQ,
-				CStringGetDatum(ccname));
+  ScanKeyInit(&skey[0],
+	      Anum_pg_constraint_conname,
+	      BTEqualStrategyNumber, F_NAMEEQ,
+	      CStringGetDatum(ccname));
 
-	ScanKeyInit(&skey[1],
-				Anum_pg_constraint_connamespace,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetNamespace(rel)));
+  ScanKeyInit(&skey[1],
+	      Anum_pg_constraint_connamespace,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetNamespace(rel)));
 
-	conscan = systable_beginscan(conDesc, ConstraintNameNspIndexId, true,
-								 SnapshotNow, 2, skey);
+  conscan = systable_beginscan(conDesc, ConstraintNameNspIndexId, true,
+			       SnapshotNow, 2, skey);
 
-	while (HeapTupleIsValid(tup = systable_getnext(conscan)))
+  while (HeapTupleIsValid(tup = systable_getnext(conscan)))
+    {
+      Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tup);
+
+      if (con->conrelid == RelationGetRelid(rel))
 	{
-		Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tup);
-
-		if (con->conrelid == RelationGetRelid(rel))
-		{
-			/* Found it.  Conflicts if not identical check constraint */
-			if (con->contype == CONSTRAINT_CHECK)
-			{
-				Datum		val;
-				bool		isnull;
-
-				val = fastgetattr(tup,
-								  Anum_pg_constraint_conbin,
-								  conDesc->rd_att, &isnull);
-				if (isnull)
-					elog(ERROR, "null conbin for rel %s",
-						 RelationGetRelationName(rel));
-				if (equal(expr, stringToNode(TextDatumGetCString(val))))
-					found = true;
-			}
-			if (!found || !allow_merge)
-				ereport(ERROR,
-						(errcode(ERRCODE_DUPLICATE_OBJECT),
-				errmsg("constraint \"%s\" for relation \"%s\" already exists",
-					   ccname, RelationGetRelationName(rel))));
-			/* OK to update the tuple */
-			ereport(NOTICE,
-			   (errmsg("merging constraint \"%s\" with inherited definition",
-					   ccname)));
-			tup = heap_copytuple(tup);
-			con = (Form_pg_constraint) GETSTRUCT(tup);
-			if (is_local)
-				con->conislocal = true;
-			else
-				con->coninhcount++;
-			simple_heap_update(conDesc, &tup->t_self, tup);
-			CatalogUpdateIndexes(conDesc, tup);
-			break;
-		}
+	  /* Found it.  Conflicts if not identical check constraint */
+	  if (con->contype == CONSTRAINT_CHECK)
+	    {
+	      Datum		val;
+	      bool		isnull;
+
+	      val = fastgetattr(tup,
+				Anum_pg_constraint_conbin,
+				conDesc->rd_att, &isnull);
+	      if (isnull)
+		elog(ERROR, "null conbin for rel %s",
+		     RelationGetRelationName(rel));
+	      if (equal(expr, stringToNode(TextDatumGetCString(val))))
+		found = true;
+	    }
+	  if (!found || !allow_merge)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DUPLICATE_OBJECT),
+		     errmsg("constraint \"%s\" for relation \"%s\" already exists",
+			    ccname, RelationGetRelationName(rel))));
+	  /* OK to update the tuple */
+	  ereport(NOTICE,
+		  (errmsg("merging constraint \"%s\" with inherited definition",
+			  ccname)));
+	  tup = heap_copytuple(tup);
+	  con = (Form_pg_constraint) GETSTRUCT(tup);
+	  if (is_local)
+	    con->conislocal = true;
+	  else
+	    con->coninhcount++;
+	  simple_heap_update(conDesc, &tup->t_self, tup);
+	  CatalogUpdateIndexes(conDesc, tup);
+	  break;
 	}
+    }
 
-	systable_endscan(conscan);
-	heap_close(conDesc, RowExclusiveLock);
+  systable_endscan(conscan);
+  heap_close(conDesc, RowExclusiveLock);
 
-	return found;
+  return found;
 }
 
 /*
@@ -2316,35 +2326,35 @@ MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
 static void
 SetRelationNumChecks(Relation rel, int numchecks)
 {
-	Relation	relrel;
-	HeapTuple	reltup;
-	Form_pg_class relStruct;
-
-	relrel = heap_open(RelationRelationId, RowExclusiveLock);
-	reltup = SearchSysCacheCopy1(RELOID,
-								 ObjectIdGetDatum(RelationGetRelid(rel)));
-	if (!HeapTupleIsValid(reltup))
-		elog(ERROR, "cache lookup failed for relation %u",
-			 RelationGetRelid(rel));
-	relStruct = (Form_pg_class) GETSTRUCT(reltup);
-
-	if (relStruct->relchecks != numchecks)
-	{
-		relStruct->relchecks = numchecks;
-
-		simple_heap_update(relrel, &reltup->t_self, reltup);
-
-		/* keep catalog indexes current */
-		CatalogUpdateIndexes(relrel, reltup);
-	}
-	else
-	{
-		/* Skip the disk update, but force relcache inval anyway */
-		CacheInvalidateRelcache(rel);
-	}
-
-	heap_freetuple(reltup);
-	heap_close(relrel, RowExclusiveLock);
+  Relation	relrel;
+  HeapTuple	reltup;
+  Form_pg_class relStruct;
+
+  relrel = heap_open(RelationRelationId, RowExclusiveLock);
+  reltup = SearchSysCacheCopy1(RELOID,
+			       ObjectIdGetDatum(RelationGetRelid(rel)));
+  if (!HeapTupleIsValid(reltup))
+    elog(ERROR, "cache lookup failed for relation %u",
+	 RelationGetRelid(rel));
+  relStruct = (Form_pg_class) GETSTRUCT(reltup);
+
+  if (relStruct->relchecks != numchecks)
+    {
+      relStruct->relchecks = numchecks;
+
+      simple_heap_update(relrel, &reltup->t_self, reltup);
+
+      /* keep catalog indexes current */
+      CatalogUpdateIndexes(relrel, reltup);
+    }
+  else
+    {
+      /* Skip the disk update, but force relcache inval anyway */
+      CacheInvalidateRelcache(rel);
+    }
+
+  heap_freetuple(reltup);
+  heap_close(relrel, RowExclusiveLock);
 }
 
 /*
@@ -2361,83 +2371,83 @@ SetRelationNumChecks(Relation rel, int numchecks)
  */
 Node *
 cookDefault(ParseState *pstate,
-			Node *raw_default,
-			Oid atttypid,
-			int32 atttypmod,
-			char *attname)
+	    Node *raw_default,
+	    Oid atttypid,
+	    int32 atttypmod,
+	    char *attname)
 {
-	Node	   *expr;
-
-	Assert(raw_default != NULL);
-
-	/*
-	 * Transform raw parsetree to executable expression.
-	 */
-	expr = transformExpr(pstate, raw_default);
-
-	/*
-	 * Make sure default expr does not refer to any vars.
-	 */
-	if (contain_var_clause(expr))
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
-			  errmsg("cannot use column references in default expression")));
-
-	/*
-	 * It can't return a set either.
-	 */
-	if (expression_returns_set(expr))
-		ereport(ERROR,
-				(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("default expression must not return a set")));
-
-	/*
-	 * No subplans or aggregates, either...
-	 */
-	if (pstate->p_hasSubLinks)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot use subquery in default expression")));
-	if (pstate->p_hasAggs)
-		ereport(ERROR,
-				(errcode(ERRCODE_GROUPING_ERROR),
-			 errmsg("cannot use aggregate function in default expression")));
-	if (pstate->p_hasWindowFuncs)
-		ereport(ERROR,
-				(errcode(ERRCODE_WINDOWING_ERROR),
-				 errmsg("cannot use window function in default expression")));
-
-	/*
-	 * Coerce the expression to the correct type and typmod, if given. This
-	 * should match the parser's processing of non-defaulted expressions ---
-	 * see transformAssignedExpr().
-	 */
-	if (OidIsValid(atttypid))
-	{
-		Oid			type_id = exprType(expr);
-
-		expr = coerce_to_target_type(pstate, expr, type_id,
-									 atttypid, atttypmod,
-									 COERCION_ASSIGNMENT,
-									 COERCE_IMPLICIT_CAST,
-									 -1);
-		if (expr == NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("column \"%s\" is of type %s"
-							" but default expression is of type %s",
-							attname,
-							format_type_be(atttypid),
-							format_type_be(type_id)),
-			   errhint("You will need to rewrite or cast the expression.")));
-	}
-
-	/*
-	 * Finally, take care of collations in the finished expression.
-	 */
-	assign_expr_collations(pstate, expr);
-
-	return expr;
+  Node	   *expr;
+
+  Assert(raw_default != NULL);
+
+  /*
+   * Transform raw parsetree to executable expression.
+   */
+  expr = transformExpr(pstate, raw_default);
+
+  /*
+   * Make sure default expr does not refer to any vars.
+   */
+  if (contain_var_clause(expr))
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+	     errmsg("cannot use column references in default expression")));
+
+  /*
+   * It can't return a set either.
+   */
+  if (expression_returns_set(expr))
+    ereport(ERROR,
+	    (errcode(ERRCODE_DATATYPE_MISMATCH),
+	     errmsg("default expression must not return a set")));
+
+  /*
+   * No subplans or aggregates, either...
+   */
+  if (pstate->p_hasSubLinks)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot use subquery in default expression")));
+  if (pstate->p_hasAggs)
+    ereport(ERROR,
+	    (errcode(ERRCODE_GROUPING_ERROR),
+	     errmsg("cannot use aggregate function in default expression")));
+  if (pstate->p_hasWindowFuncs)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WINDOWING_ERROR),
+	     errmsg("cannot use window function in default expression")));
+
+  /*
+   * Coerce the expression to the correct type and typmod, if given. This
+   * should match the parser's processing of non-defaulted expressions ---
+   * see transformAssignedExpr().
+   */
+  if (OidIsValid(atttypid))
+    {
+      Oid			type_id = exprType(expr);
+
+      expr = coerce_to_target_type(pstate, expr, type_id,
+				   atttypid, atttypmod,
+				   COERCION_ASSIGNMENT,
+				   COERCE_IMPLICIT_CAST,
+				   -1);
+      if (expr == NULL)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("column \"%s\" is of type %s"
+			" but default expression is of type %s",
+			attname,
+			format_type_be(atttypid),
+			format_type_be(type_id)),
+		 errhint("You will need to rewrite or cast the expression.")));
+    }
+
+  /*
+   * Finally, take care of collations in the finished expression.
+   */
+  assign_expr_collations(pstate, expr);
+
+  return expr;
 }
 
 /*
@@ -2449,52 +2459,52 @@ cookDefault(ParseState *pstate,
  */
 static Node *
 cookConstraint(ParseState *pstate,
-			   Node *raw_constraint,
-			   char *relname)
+	       Node *raw_constraint,
+	       char *relname)
 {
-	Node	   *expr;
-
-	/*
-	 * Transform raw parsetree to executable expression.
-	 */
-	expr = transformExpr(pstate, raw_constraint);
-
-	/*
-	 * Make sure it yields a boolean result.
-	 */
-	expr = coerce_to_boolean(pstate, expr, "CHECK");
-
-	/*
-	 * Take care of collations.
-	 */
-	assign_expr_collations(pstate, expr);
-
-	/*
-	 * Make sure no outside relations are referred to.
-	 */
-	if (list_length(pstate->p_rtable) != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
-			errmsg("only table \"%s\" can be referenced in check constraint",
-				   relname)));
-
-	/*
-	 * No subplans or aggregates, either...
-	 */
-	if (pstate->p_hasSubLinks)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot use subquery in check constraint")));
-	if (pstate->p_hasAggs)
-		ereport(ERROR,
-				(errcode(ERRCODE_GROUPING_ERROR),
-			   errmsg("cannot use aggregate function in check constraint")));
-	if (pstate->p_hasWindowFuncs)
-		ereport(ERROR,
-				(errcode(ERRCODE_WINDOWING_ERROR),
-				 errmsg("cannot use window function in check constraint")));
-
-	return expr;
+  Node	   *expr;
+
+  /*
+   * Transform raw parsetree to executable expression.
+   */
+  expr = transformExpr(pstate, raw_constraint);
+
+  /*
+   * Make sure it yields a boolean result.
+   */
+  expr = coerce_to_boolean(pstate, expr, "CHECK");
+
+  /*
+   * Take care of collations.
+   */
+  assign_expr_collations(pstate, expr);
+
+  /*
+   * Make sure no outside relations are referred to.
+   */
+  if (list_length(pstate->p_rtable) != 1)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
+	     errmsg("only table \"%s\" can be referenced in check constraint",
+		    relname)));
+
+  /*
+   * No subplans or aggregates, either...
+   */
+  if (pstate->p_hasSubLinks)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot use subquery in check constraint")));
+  if (pstate->p_hasAggs)
+    ereport(ERROR,
+	    (errcode(ERRCODE_GROUPING_ERROR),
+	     errmsg("cannot use aggregate function in check constraint")));
+  if (pstate->p_hasWindowFuncs)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WINDOWING_ERROR),
+	     errmsg("cannot use window function in check constraint")));
+
+  return expr;
 }
 
 
@@ -2507,40 +2517,40 @@ cookConstraint(ParseState *pstate,
 void
 RemoveStatistics(Oid relid, AttrNumber attnum)
 {
-	Relation	pgstatistic;
-	SysScanDesc scan;
-	ScanKeyData key[2];
-	int			nkeys;
-	HeapTuple	tuple;
-
-	pgstatistic = heap_open(StatisticRelationId, RowExclusiveLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_statistic_starelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
-
-	if (attnum == 0)
-		nkeys = 1;
-	else
-	{
-		ScanKeyInit(&key[1],
-					Anum_pg_statistic_staattnum,
-					BTEqualStrategyNumber, F_INT2EQ,
-					Int16GetDatum(attnum));
-		nkeys = 2;
-	}
-
-	scan = systable_beginscan(pgstatistic, StatisticRelidAttnumInhIndexId, true,
-							  SnapshotNow, nkeys, key);
-
-	/* we must loop even when attnum != 0, in case of inherited stats */
-	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
-		simple_heap_delete(pgstatistic, &tuple->t_self);
-
-	systable_endscan(scan);
-
-	heap_close(pgstatistic, RowExclusiveLock);
+  Relation	pgstatistic;
+  SysScanDesc scan;
+  ScanKeyData key[2];
+  int			nkeys;
+  HeapTuple	tuple;
+
+  pgstatistic = heap_open(StatisticRelationId, RowExclusiveLock);
+
+  ScanKeyInit(&key[0],
+	      Anum_pg_statistic_starelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relid));
+
+  if (attnum == 0)
+    nkeys = 1;
+  else
+    {
+      ScanKeyInit(&key[1],
+		  Anum_pg_statistic_staattnum,
+		  BTEqualStrategyNumber, F_INT2EQ,
+		  Int16GetDatum(attnum));
+      nkeys = 2;
+    }
+
+  scan = systable_beginscan(pgstatistic, StatisticRelidAttnumInhIndexId, true,
+			    SnapshotNow, nkeys, key);
+
+  /* we must loop even when attnum != 0, in case of inherited stats */
+  while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+    simple_heap_delete(pgstatistic, &tuple->t_self);
+
+  systable_endscan(scan);
+
+  heap_close(pgstatistic, RowExclusiveLock);
 }
 
 
@@ -2554,33 +2564,33 @@ RemoveStatistics(Oid relid, AttrNumber attnum)
 static void
 RelationTruncateIndexes(Relation heapRelation)
 {
-	ListCell   *indlist;
+  ListCell   *indlist;
 
-	/* Ask the relcache to produce a list of the indexes of the rel */
-	foreach(indlist, RelationGetIndexList(heapRelation))
-	{
-		Oid			indexId = lfirst_oid(indlist);
-		Relation	currentIndex;
-		IndexInfo  *indexInfo;
+  /* Ask the relcache to produce a list of the indexes of the rel */
+  foreach(indlist, RelationGetIndexList(heapRelation))
+    {
+      Oid			indexId = lfirst_oid(indlist);
+      Relation	currentIndex;
+      IndexInfo  *indexInfo;
 
-		/* Open the index relation; use exclusive lock, just to be sure */
-		currentIndex = index_open(indexId, AccessExclusiveLock);
+      /* Open the index relation; use exclusive lock, just to be sure */
+      currentIndex = index_open(indexId, AccessExclusiveLock);
 
-		/* Fetch info needed for index_build */
-		indexInfo = BuildIndexInfo(currentIndex);
+      /* Fetch info needed for index_build */
+      indexInfo = BuildIndexInfo(currentIndex);
 
-		/*
-		 * Now truncate the actual file (and discard buffers).
-		 */
-		RelationTruncate(currentIndex, 0);
+      /*
+       * Now truncate the actual file (and discard buffers).
+       */
+      RelationTruncate(currentIndex, 0);
 
-		/* Initialize the index and rebuild */
-		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, currentIndex, indexInfo, false, true);
+      /* Initialize the index and rebuild */
+      /* Note: we do not need to re-establish pkey setting */
+      index_build(heapRelation, currentIndex, indexInfo, false, true);
 
-		/* We're done with this index */
-		index_close(currentIndex, NoLock);
-	}
+      /* We're done with this index */
+      index_close(currentIndex, NoLock);
+    }
 }
 
 /*
@@ -2595,33 +2605,33 @@ RelationTruncateIndexes(Relation heapRelation)
 void
 heap_truncate(List *relids)
 {
-	List	   *relations = NIL;
-	ListCell   *cell;
+  List	   *relations = NIL;
+  ListCell   *cell;
 
-	/* Open relations for processing, and grab exclusive access on each */
-	foreach(cell, relids)
-	{
-		Oid			rid = lfirst_oid(cell);
-		Relation	rel;
+  /* Open relations for processing, and grab exclusive access on each */
+  foreach(cell, relids)
+    {
+      Oid			rid = lfirst_oid(cell);
+      Relation	rel;
 
-		rel = heap_open(rid, AccessExclusiveLock);
-		relations = lappend(relations, rel);
-	}
+      rel = heap_open(rid, AccessExclusiveLock);
+      relations = lappend(relations, rel);
+    }
 
-	/* Don't allow truncate on tables that are referenced by foreign keys */
-	heap_truncate_check_FKs(relations, true);
+  /* Don't allow truncate on tables that are referenced by foreign keys */
+  heap_truncate_check_FKs(relations, true);
 
-	/* OK to do it */
-	foreach(cell, relations)
-	{
-		Relation	rel = lfirst(cell);
+  /* OK to do it */
+  foreach(cell, relations)
+    {
+      Relation	rel = lfirst(cell);
 
-		/* Truncate the relation */
-		heap_truncate_one_rel(rel);
+      /* Truncate the relation */
+      heap_truncate_one_rel(rel);
 
-		/* Close the relation, but keep exclusive lock on it until commit */
-		heap_close(rel, NoLock);
-	}
+      /* Close the relation, but keep exclusive lock on it until commit */
+      heap_close(rel, NoLock);
+    }
 }
 
 /*
@@ -2636,25 +2646,25 @@ heap_truncate(List *relids)
 void
 heap_truncate_one_rel(Relation rel)
 {
-	Oid			toastrelid;
+  Oid			toastrelid;
 
-	/* Truncate the actual file (and discard buffers) */
-	RelationTruncate(rel, 0);
+  /* Truncate the actual file (and discard buffers) */
+  RelationTruncate(rel, 0);
 
-	/* If the relation has indexes, truncate the indexes too */
-	RelationTruncateIndexes(rel);
+  /* If the relation has indexes, truncate the indexes too */
+  RelationTruncateIndexes(rel);
 
-	/* If there is a toast table, truncate that too */
-	toastrelid = rel->rd_rel->reltoastrelid;
-	if (OidIsValid(toastrelid))
-	{
-		Relation	toastrel = heap_open(toastrelid, AccessExclusiveLock);
+  /* If there is a toast table, truncate that too */
+  toastrelid = rel->rd_rel->reltoastrelid;
+  if (OidIsValid(toastrelid))
+    {
+      Relation	toastrel = heap_open(toastrelid, AccessExclusiveLock);
 
-		RelationTruncate(toastrel, 0);
-		RelationTruncateIndexes(toastrel);
-		/* keep the lock... */
-		heap_close(toastrel, NoLock);
-	}
+      RelationTruncate(toastrel, 0);
+      RelationTruncateIndexes(toastrel);
+      /* keep the lock... */
+      heap_close(toastrel, NoLock);
+    }
 }
 
 /*
@@ -2673,79 +2683,79 @@ heap_truncate_one_rel(Relation rel)
 void
 heap_truncate_check_FKs(List *relations, bool tempTables)
 {
-	List	   *oids = NIL;
-	List	   *dependents;
-	ListCell   *cell;
-
-	/*
-	 * Build a list of OIDs of the interesting relations.
-	 *
-	 * If a relation has no triggers, then it can neither have FKs nor be
-	 * referenced by a FK from another table, so we can ignore it.
-	 */
-	foreach(cell, relations)
+  List	   *oids = NIL;
+  List	   *dependents;
+  ListCell   *cell;
+
+  /*
+   * Build a list of OIDs of the interesting relations.
+   *
+   * If a relation has no triggers, then it can neither have FKs nor be
+   * referenced by a FK from another table, so we can ignore it.
+   */
+  foreach(cell, relations)
+    {
+      Relation	rel = lfirst(cell);
+
+      if (rel->rd_rel->relhastriggers)
+	oids = lappend_oid(oids, RelationGetRelid(rel));
+    }
+
+  /*
+   * Fast path: if no relation has triggers, none has FKs either.
+   */
+  if (oids == NIL)
+    return;
+
+  /*
+   * Otherwise, must scan pg_constraint.	We make one pass with all the
+   * relations considered; if this finds nothing, then all is well.
+   */
+  dependents = heap_truncate_find_FKs(oids);
+  if (dependents == NIL)
+    return;
+
+  /*
+   * Otherwise we repeat the scan once per relation to identify a particular
+   * pair of relations to complain about.  This is pretty slow, but
+   * performance shouldn't matter much in a failure path.  The reason for
+   * doing things this way is to ensure that the message produced is not
+   * dependent on chance row locations within pg_constraint.
+   */
+  foreach(cell, oids)
+    {
+      Oid			relid = lfirst_oid(cell);
+      ListCell   *cell2;
+
+      dependents = heap_truncate_find_FKs(list_make1_oid(relid));
+
+      foreach(cell2, dependents)
 	{
-		Relation	rel = lfirst(cell);
+	  Oid			relid2 = lfirst_oid(cell2);
 
-		if (rel->rd_rel->relhastriggers)
-			oids = lappend_oid(oids, RelationGetRelid(rel));
-	}
+	  if (!list_member_oid(oids, relid2))
+	    {
+	      char	   *relname = get_rel_name(relid);
+	      char	   *relname2 = get_rel_name(relid2);
 
-	/*
-	 * Fast path: if no relation has triggers, none has FKs either.
-	 */
-	if (oids == NIL)
-		return;
-
-	/*
-	 * Otherwise, must scan pg_constraint.	We make one pass with all the
-	 * relations considered; if this finds nothing, then all is well.
-	 */
-	dependents = heap_truncate_find_FKs(oids);
-	if (dependents == NIL)
-		return;
-
-	/*
-	 * Otherwise we repeat the scan once per relation to identify a particular
-	 * pair of relations to complain about.  This is pretty slow, but
-	 * performance shouldn't matter much in a failure path.  The reason for
-	 * doing things this way is to ensure that the message produced is not
-	 * dependent on chance row locations within pg_constraint.
-	 */
-	foreach(cell, oids)
-	{
-		Oid			relid = lfirst_oid(cell);
-		ListCell   *cell2;
-
-		dependents = heap_truncate_find_FKs(list_make1_oid(relid));
-
-		foreach(cell2, dependents)
-		{
-			Oid			relid2 = lfirst_oid(cell2);
-
-			if (!list_member_oid(oids, relid2))
-			{
-				char	   *relname = get_rel_name(relid);
-				char	   *relname2 = get_rel_name(relid2);
-
-				if (tempTables)
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("unsupported ON COMMIT and foreign key combination"),
-							 errdetail("Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting.",
-									   relname2, relname)));
-				else
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("cannot truncate a table referenced in a foreign key constraint"),
-							 errdetail("Table \"%s\" references \"%s\".",
-									   relname2, relname),
-						   errhint("Truncate table \"%s\" at the same time, "
-								   "or use TRUNCATE ... CASCADE.",
-								   relname2)));
-			}
-		}
+	      if (tempTables)
+		ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("unsupported ON COMMIT and foreign key combination"),
+			 errdetail("Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting.",
+				   relname2, relname)));
+	      else
+		ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("cannot truncate a table referenced in a foreign key constraint"),
+			 errdetail("Table \"%s\" references \"%s\".",
+				   relname2, relname),
+			 errhint("Truncate table \"%s\" at the same time, "
+				 "or use TRUNCATE ... CASCADE.",
+				 relname2)));
+	    }
 	}
+    }
 }
 
 /*
@@ -2765,41 +2775,41 @@ heap_truncate_check_FKs(List *relations, bool tempTables)
 List *
 heap_truncate_find_FKs(List *relationIds)
 {
-	List	   *result = NIL;
-	Relation	fkeyRel;
-	SysScanDesc fkeyScan;
-	HeapTuple	tuple;
+  List	   *result = NIL;
+  Relation	fkeyRel;
+  SysScanDesc fkeyScan;
+  HeapTuple	tuple;
 
-	/*
-	 * Must scan pg_constraint.  Right now, it is a seqscan because there is
-	 * no available index on confrelid.
-	 */
-	fkeyRel = heap_open(ConstraintRelationId, AccessShareLock);
+  /*
+   * Must scan pg_constraint.  Right now, it is a seqscan because there is
+   * no available index on confrelid.
+   */
+  fkeyRel = heap_open(ConstraintRelationId, AccessShareLock);
 
-	fkeyScan = systable_beginscan(fkeyRel, InvalidOid, false,
-								  SnapshotNow, 0, NULL);
+  fkeyScan = systable_beginscan(fkeyRel, InvalidOid, false,
+				SnapshotNow, 0, NULL);
 
-	while (HeapTupleIsValid(tuple = systable_getnext(fkeyScan)))
-	{
-		Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tuple);
+  while (HeapTupleIsValid(tuple = systable_getnext(fkeyScan)))
+    {
+      Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tuple);
 
-		/* Not a foreign key */
-		if (con->contype != CONSTRAINT_FOREIGN)
-			continue;
+      /* Not a foreign key */
+      if (con->contype != CONSTRAINT_FOREIGN)
+	continue;
 
-		/* Not referencing one of our list of tables */
-		if (!list_member_oid(relationIds, con->confrelid))
-			continue;
+      /* Not referencing one of our list of tables */
+      if (!list_member_oid(relationIds, con->confrelid))
+	continue;
 
-		/* Add referencer unless already in input or result list */
-		if (!list_member_oid(relationIds, con->conrelid))
-			result = insert_ordered_unique_oid(result, con->conrelid);
-	}
+      /* Add referencer unless already in input or result list */
+      if (!list_member_oid(relationIds, con->conrelid))
+	result = insert_ordered_unique_oid(result, con->conrelid);
+    }
 
-	systable_endscan(fkeyScan);
-	heap_close(fkeyRel, AccessShareLock);
+  systable_endscan(fkeyScan);
+  heap_close(fkeyRel, AccessShareLock);
 
-	return result;
+  return result;
 }
 
 /*
@@ -2815,29 +2825,29 @@ heap_truncate_find_FKs(List *relationIds)
 static List *
 insert_ordered_unique_oid(List *list, Oid datum)
 {
-	ListCell   *prev;
-
-	/* Does the datum belong at the front? */
-	if (list == NIL || datum < linitial_oid(list))
-		return lcons_oid(datum, list);
-	/* Does it match the first entry? */
-	if (datum == linitial_oid(list))
-		return list;			/* duplicate, so don't insert */
-	/* No, so find the entry it belongs after */
-	prev = list_head(list);
-	for (;;)
-	{
-		ListCell   *curr = lnext(prev);
-
-		if (curr == NULL || datum < lfirst_oid(curr))
-			break;				/* it belongs after 'prev', before 'curr' */
-
-		if (datum == lfirst_oid(curr))
-			return list;		/* duplicate, so don't insert */
-
-		prev = curr;
-	}
-	/* Insert datum into list after 'prev' */
-	lappend_cell_oid(list, prev, datum);
-	return list;
+  ListCell   *prev;
+
+  /* Does the datum belong at the front? */
+  if (list == NIL || datum < linitial_oid(list))
+    return lcons_oid(datum, list);
+  /* Does it match the first entry? */
+  if (datum == linitial_oid(list))
+    return list;			/* duplicate, so don't insert */
+  /* No, so find the entry it belongs after */
+  prev = list_head(list);
+  for (;;)
+    {
+      ListCell   *curr = lnext(prev);
+
+      if (curr == NULL || datum < lfirst_oid(curr))
+	break;				/* it belongs after 'prev', before 'curr' */
+
+      if (datum == lfirst_oid(curr))
+	return list;		/* duplicate, so don't insert */
+
+      prev = curr;
+    }
+  /* Insert datum into list after 'prev' */
+  lappend_cell_oid(list, prev, datum);
+  return list;
 }
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 21f5cce69c8c8..53f1bd2aea37c 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -123,6 +123,7 @@ CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
 		 * FormIndexDatum fills in its values and isnull parameters with the
 		 * appropriate values for the column(s) of the index.
 		 */
+		// printf("indexing.c 126: %c\n", values[15]);
 		FormIndexDatum(indexInfo,
 					   slot,
 					   NULL,	/* no expression eval to do */
diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql
index 452a0ead44cab..342b704054ffa 100644
--- a/src/backend/catalog/information_schema.sql
+++ b/src/backend/catalog/information_schema.sql
@@ -1158,20 +1158,24 @@ CREATE VIEW referential_constraints AS
 
     FROM (pg_namespace ncon
           INNER JOIN pg_constraint con ON ncon.oid = con.connamespace
-          INNER JOIN pg_class c ON con.conrelid = c.oid)
-         LEFT JOIN
-         (pg_constraint pkc
-          INNER JOIN pg_namespace npkc ON pkc.connamespace = npkc.oid)
-         ON con.confrelid = pkc.conrelid
-            AND _pg_keysequal(con.confkey, pkc.conkey)
-
-    WHERE c.relkind = 'r'
-          AND con.contype = 'f'
-          AND (pkc.contype IN ('p', 'u') OR pkc.contype IS NULL)
-          AND (pg_has_role(c.relowner, 'USAGE')
-               -- SELECT privilege omitted, per SQL standard
-               OR has_table_privilege(c.oid, 'INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER')
-               OR has_any_column_privilege(c.oid, 'INSERT, UPDATE, REFERENCES') );
+          INNER JOIN pg_class c ON con.conrelid = c.oid AND con.contype = 'f')
+         LEFT JOIN pg_depend d1  -- find constraint's dependency on an index
+          ON d1.objid = con.oid AND d1.classid = 'pg_constraint'::regclass
+             AND d1.refclassid = 'pg_class'::regclass AND d1.refobjsubid = 0
+         LEFT JOIN pg_depend d2  -- find pkey/unique constraint for that index
+          ON d2.refclassid = 'pg_constraint'::regclass
+             AND d2.classid = 'pg_class'::regclass
+             AND d2.objid = d1.refobjid AND d2.objsubid = 0
+             AND d2.deptype = 'i'
+         LEFT JOIN pg_constraint pkc ON pkc.oid = d2.refobjid
+            AND pkc.contype IN ('p', 'u')
+            AND pkc.conrelid = con.confrelid
+         LEFT JOIN pg_namespace npkc ON pkc.connamespace = npkc.oid
+
+    WHERE pg_has_role(c.relowner, 'USAGE')
+          -- SELECT privilege omitted, per SQL standard
+          OR has_table_privilege(c.oid, 'INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER')
+          OR has_any_column_privilege(c.oid, 'INSERT, UPDATE, REFERENCES') ;
 
 GRANT SELECT ON referential_constraints TO PUBLIC;
 
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index 41e92992deec9..079a19379b643 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -221,7 +221,6 @@ Datum		pg_is_other_temp_schema(PG_FUNCTION_ARGS);
 Oid
 RangeVarGetRelid(const RangeVar *relation, bool failOK)
 {
-	Oid			namespaceId;
 	Oid			relId;
 
 	/*
@@ -247,17 +246,27 @@ RangeVarGetRelid(const RangeVar *relation, bool failOK)
 	 */
 	if (relation->relpersistence == RELPERSISTENCE_TEMP)
 	{
-		if (relation->schemaname)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				   errmsg("temporary tables cannot specify a schema name")));
-		if (OidIsValid(myTempNamespace))
+		if (!OidIsValid(myTempNamespace))
+			relId = InvalidOid;	/* this probably can't happen? */
+		else
+		{
+			if (relation->schemaname)
+			{
+				Oid		namespaceId;
+				namespaceId = LookupExplicitNamespace(relation->schemaname);
+				if (namespaceId != myTempNamespace)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+						   errmsg("temporary tables cannot specify a schema name")));
+			}
+
 			relId = get_relname_relid(relation->relname, myTempNamespace);
-		else	/* this probably can't happen? */
-			relId = InvalidOid;
+		}
 	}
 	else if (relation->schemaname)
 	{
+		Oid		namespaceId;
+
 		/* use exact schema given */
 		namespaceId = LookupExplicitNamespace(relation->schemaname);
 		relId = get_relname_relid(relation->relname, namespaceId);
@@ -311,19 +320,6 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation)
 							newRelation->relname)));
 	}
 
-	if (newRelation->relpersistence == RELPERSISTENCE_TEMP)
-	{
-		/* TEMP tables are created in our backend-local temp namespace */
-		if (newRelation->schemaname)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				   errmsg("temporary tables cannot specify a schema name")));
-		/* Initialize temp namespace if first time through */
-		if (!OidIsValid(myTempNamespace))
-			InitTempTableNamespace();
-		return myTempNamespace;
-	}
-
 	if (newRelation->schemaname)
 	{
 		/* check for pg_temp alias */
@@ -338,6 +334,13 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation)
 		namespaceId = get_namespace_oid(newRelation->schemaname, false);
 		/* we do not check for USAGE rights here! */
 	}
+	else if (newRelation->relpersistence == RELPERSISTENCE_TEMP)
+	{
+		/* Initialize temp namespace if first time through */
+		if (!OidIsValid(myTempNamespace))
+			InitTempTableNamespace();
+		return myTempNamespace;
+	}
 	else
 	{
 		/* use the default creation namespace */
@@ -389,6 +392,44 @@ RangeVarGetAndCheckCreationNamespace(const RangeVar *newRelation)
 	return namespaceId;
 }
 
+/*
+ * Adjust the relpersistence for an about-to-be-created relation based on the
+ * creation namespace, and throw an error for invalid combinations.
+ */
+void
+RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
+{
+	switch (newRelation->relpersistence)
+	{
+		case RELPERSISTENCE_TEMP:
+			if (!isTempOrToastNamespace(nspid))
+			{
+				if (isAnyTempNamespace(nspid))
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+							 errmsg("cannot create relations in temporary schemas of other sessions")));
+				else
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+							 errmsg("cannot create temporary relation in non-temporary schema")));
+			}
+			break;
+		case RELPERSISTENCE_PERMANENT:
+			if (isTempOrToastNamespace(nspid))
+				newRelation->relpersistence = RELPERSISTENCE_TEMP;
+			else if (isAnyTempNamespace(nspid))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+						 errmsg("cannot create relations in temporary schemas of other sessions")));
+			break;
+		default:
+			if (isAnyTempNamespace(nspid))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+						 errmsg("only temporary relations may be created in temporary schemas")));
+	}
+}
+
 /*
  * RelnameGetRelid
  *		Try to resolve an unqualified relation name.
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index bf25091582ff2..3925b8ec95c60 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -463,6 +463,11 @@ get_object_address_relobject(ObjectType objtype, List *objname, Relation *relp)
 		address.classId = RewriteRelationId;
 		address.objectId = get_rewrite_oid_without_relid(depname, &reloid);
 		address.objectSubId = 0;
+
+		/*
+		 * Caller is expecting to get back the relation, even though we
+		 * didn't end up using it to find the rule.
+		 */
 		relation = heap_open(reloid, AccessShareLock);
 	}
 	else
diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c
index 5b92a4c0c2816..383f36ef1d50c 100644
--- a/src/backend/catalog/pg_collation.c
+++ b/src/backend/catalog/pg_collation.c
@@ -131,7 +131,7 @@ CollationCreate(const char *collname, Oid collnamespace,
 							collowner);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new collation */
 	InvokeObjectAccessHook(OAT_POST_CREATE,
diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 1ef6a9d24e2dc..c84dbc6ae4cc9 100644
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -133,7 +133,7 @@ ConversionCreate(const char *conname, Oid connamespace,
 							conowner);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new conversion */
 	InvokeObjectAccessHook(OAT_POST_CREATE,
diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
index 67aad86d4e705..c1a4340190a55 100644
--- a/src/backend/catalog/pg_depend.c
+++ b/src/backend/catalog/pg_depend.c
@@ -130,14 +130,44 @@ recordMultipleDependencies(const ObjectAddress *depender,
  *
  * This must be called during creation of any user-definable object type
  * that could be a member of an extension.
+ *
+ * If isReplace is true, the object already existed (or might have already
+ * existed), so we must check for a pre-existing extension membership entry.
+ * Passing false is a guarantee that the object is newly created, and so
+ * could not already be a member of any extension.
  */
 void
-recordDependencyOnCurrentExtension(const ObjectAddress *object)
+recordDependencyOnCurrentExtension(const ObjectAddress *object,
+								   bool isReplace)
 {
+	/* Only whole objects can be extension members */
+	Assert(object->objectSubId == 0);
+
 	if (creating_extension)
 	{
 		ObjectAddress extension;
 
+		/* Only need to check for existing membership if isReplace */
+		if (isReplace)
+		{
+			Oid		oldext;
+
+			oldext = getExtensionOfObject(object->classId, object->objectId);
+			if (OidIsValid(oldext))
+			{
+				/* If already a member of this extension, nothing to do */
+				if (oldext == CurrentExtensionObject)
+					return;
+				/* Already a member of some other extension, so reject */
+				ereport(ERROR,
+						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+						 errmsg("%s is already a member of extension \"%s\"",
+								getObjectDescription(object),
+								get_extension_name(oldext))));
+			}
+		}
+
+		/* OK, record it as a member of CurrentExtensionObject */
 		extension.classId = ExtensionRelationId;
 		extension.objectId = CurrentExtensionObject;
 		extension.objectSubId = 0;
diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c
index 172f99196cc37..ceebac2f7e1d2 100644
--- a/src/backend/catalog/pg_namespace.c
+++ b/src/backend/catalog/pg_namespace.c
@@ -83,7 +83,7 @@ NamespaceCreate(const char *nspName, Oid ownerId)
 	recordDependencyOnOwner(NamespaceRelationId, nspoid, ownerId);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new schema */
 	InvokeObjectAccessHook(OAT_POST_CREATE, NamespaceRelationId, nspoid, 0);
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index ccd0fe1997def..88410e5090bdc 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -776,8 +776,11 @@ makeOperatorDependencies(HeapTuple tuple)
 	myself.objectId = HeapTupleGetOid(tuple);
 	myself.objectSubId = 0;
 
-	/* In case we are updating a shell, delete any existing entries */
-	deleteDependencyRecordsFor(myself.classId, myself.objectId, false);
+	/*
+	 * In case we are updating a shell, delete any existing entries, except
+	 * for extension membership which should remain the same.
+	 */
+	deleteDependencyRecordsFor(myself.classId, myself.objectId, true);
 	deleteSharedDependencyRecordsFor(myself.classId, myself.objectId, 0);
 
 	/* Dependency on namespace */
@@ -857,5 +860,5 @@ makeOperatorDependencies(HeapTuple tuple)
 							oper->oprowner);
 
 	/* Dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, true);
 }
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 6250b0735c1d0..72559daf54975 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -562,8 +562,7 @@ ProcedureCreate(const char *procedureName,
 	 * Create dependencies for the new function.  If we are updating an
 	 * existing function, first delete any existing pg_depend entries.
 	 * (However, since we are not changing ownership or permissions, the
-	 * shared dependencies do *not* need to change, and we leave them alone.
-	 * We also don't change any pre-existing extension-membership dependency.)
+	 * shared dependencies do *not* need to change, and we leave them alone.)
 	 */
 	if (is_update)
 		deleteDependencyRecordsFor(ProcedureRelationId, retval, true);
@@ -599,6 +598,11 @@ ProcedureCreate(const char *procedureName,
 		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 	}
 
+	/* dependency on parameter default expressions */
+	if (parameterDefaults)
+		recordDependencyOnExpr(&myself, (Node *) parameterDefaults,
+							   NIL, DEPENDENCY_NORMAL);
+
 	/* dependency on owner */
 	if (!is_update)
 		recordDependencyOnOwner(ProcedureRelationId, retval, proowner);
@@ -617,8 +621,7 @@ ProcedureCreate(const char *procedureName,
 	}
 
 	/* dependency on extension */
-	if (!is_update)
-		recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, is_update);
 
 	heap_freetuple(tup);
 
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 8c8e7b276d70e..591352d4b4376 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -1284,8 +1284,7 @@ shdepReassignOwned(List *roleids, Oid newrole)
 
 			ereport(ERROR,
 					(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
-				   errmsg("cannot drop objects owned by %s because they are "
-						  "required by the database system",
+					 errmsg("cannot reassign ownership of objects owned by %s because they are required by the database system",
 						  getObjectDescription(&obj))));
 
 			/*
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index de5c63defe5f2..95b17d764edd7 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -484,7 +484,11 @@ TypeCreate(Oid newTypeOid,
  *
  * If rebuild is true, we remove existing dependencies and rebuild them
  * from scratch.  This is needed for ALTER TYPE, and also when replacing
- * a shell type.  We don't remove/rebuild extension dependencies, though.
+ * a shell type.  We don't remove an existing extension dependency, though.
+ * (That means an extension can't absorb a shell type created in another
+ * extension, nor ALTER a type created by another extension.  Also, if it
+ * replaces a free-standing shell type or ALTERs a free-standing type,
+ * that type will become a member of the extension.)
  */
 void
 GenerateTypeDependencies(Oid typeNamespace,
@@ -509,6 +513,7 @@ GenerateTypeDependencies(Oid typeNamespace,
 	ObjectAddress myself,
 				referenced;
 
+	/* If rebuild, first flush old dependencies, except extension deps */
 	if (rebuild)
 	{
 		deleteDependencyRecordsFor(TypeRelationId, typeObjectId, true);
@@ -520,12 +525,12 @@ GenerateTypeDependencies(Oid typeNamespace,
 	myself.objectSubId = 0;
 
 	/*
-	 * Make dependency on namespace and shared dependency on owner.
+	 * Make dependencies on namespace, owner, extension.
 	 *
 	 * For a relation rowtype (that's not a composite type), we should skip
 	 * these because we'll depend on them indirectly through the pg_class
 	 * entry.  Likewise, skip for implicit arrays since we'll depend on them
-	 * through the element type.  The same goes for extension membership.
+	 * through the element type.
 	 */
 	if ((!OidIsValid(relationOid) || relationKind == RELKIND_COMPOSITE_TYPE) &&
 		!isImplicitArray)
@@ -537,9 +542,7 @@ GenerateTypeDependencies(Oid typeNamespace,
 
 		recordDependencyOnOwner(TypeRelationId, typeObjectId, owner);
 
-		/* dependency on extension */
-		if (!rebuild)
-			recordDependencyOnCurrentExtension(&myself);
+		recordDependencyOnCurrentExtension(&myself, rebuild);
 	}
 
 	/* Normal dependencies on the I/O functions */
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index b059f9d784bd4..f2b4b62837e8f 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -59,11 +59,13 @@ AlterTableCreateToastTable(Oid relOid, Datum reloptions)
 	Relation	rel;
 
 	/*
-	 * Grab a DDL-exclusive lock on the target table, since we'll update the
-	 * pg_class tuple.	This is redundant for all present users.  Tuple
-	 * toasting behaves safely in the face of a concurrent TOAST table add.
+	 * Grab an exclusive lock on the target table, since we'll update its
+	 * pg_class tuple. This is redundant for all present uses, since caller
+	 * will have such a lock already.  But the lock is needed to ensure that
+	 * concurrent readers of the pg_class tuple won't have visibility issues,
+	 * so let's be safe.
 	 */
-	rel = heap_open(relOid, ShareUpdateExclusiveLock);
+	rel = heap_open(relOid, AccessExclusiveLock);
 
 	/* create_toast_table does all the work */
 	(void) create_toast_table(rel, InvalidOid, InvalidOid, reloptions);
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index 81fd6581f32da..1238a126942b3 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -16,7 +16,7 @@ OBJS = aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o  \
 	collationcmds.o constraint.o conversioncmds.o copy.o \
 	dbcommands.o define.o discard.o explain.o extension.o \
 	foreigncmds.o functioncmds.o \
-	indexcmds.o lockcmds.o operatorcmds.o opclasscmds.o \
+	indexcmds.o lockcmds.o matview.o operatorcmds.o opclasscmds.o \
 	portalcmds.o prepare.o proclang.o \
 	schemacmds.o seclabel.o sequence.o tablecmds.o tablespace.o trigger.o \
 	tsearchcmds.o typecmds.o user.o vacuum.o vacuumlazy.o \
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 215e21cae0826..d02bf7fba5d17 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -420,7 +420,7 @@ AlterObjectNamespace(Relation rel, int oidCacheId, int nameCacheId,
 		if (Anum_owner <= 0)
 			ereport(ERROR,
 					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 (errmsg("must be superuser to SET SCHEMA of %s",
+					 (errmsg("must be superuser to set schema of %s",
 							 getObjectDescriptionOids(classId, objid)))));
 
 		/* Otherwise, must be owner of the existing object */
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 57188bc25a7ba..a930a67d626a4 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -266,7 +266,6 @@ do_analyze_rel(Relation onerel, VacuumStmt *vacstmt, bool inh)
 	Relation   *Irel;
 	int			nindexes;
 	bool		hasindex;
-	bool		analyzableindex;
 	VacAttrStats **vacattrstats;
 	AnlIndexData *indexdata;
 	int			targrows,
@@ -380,7 +379,6 @@ do_analyze_rel(Relation onerel, VacuumStmt *vacstmt, bool inh)
 	}
 	hasindex = (nindexes > 0);
 	indexdata = NULL;
-	analyzableindex = false;
 	if (hasindex)
 	{
 		indexdata = (AnlIndexData *) palloc0(nindexes * sizeof(AnlIndexData));
@@ -414,10 +412,7 @@ do_analyze_rel(Relation onerel, VacuumStmt *vacstmt, bool inh)
 						thisdata->vacattrstats[tcnt] =
 							examine_attribute(Irel[ind], i + 1, indexkey);
 						if (thisdata->vacattrstats[tcnt] != NULL)
-						{
 							tcnt++;
-							analyzableindex = true;
-						}
 					}
 				}
 				thisdata->attr_cnt = tcnt;
@@ -425,16 +420,11 @@ do_analyze_rel(Relation onerel, VacuumStmt *vacstmt, bool inh)
 		}
 	}
 
-	/*
-	 * Quit if no analyzable columns.
-	 */
-	if (attr_cnt <= 0 && !analyzableindex)
-		goto cleanup;
-
 	/*
 	 * Determine how many rows we need to sample, using the worst case from
 	 * all analyzable columns.	We use a lower bound of 100 rows to avoid
-	 * possible overflow in Vitter's algorithm.
+	 * possible overflow in Vitter's algorithm.  (Note: that will also be
+	 * the target in the corner case where there are no analyzable columns.)
 	 */
 	targrows = 100;
 	for (i = 0; i < attr_cnt; i++)
@@ -573,9 +563,6 @@ do_analyze_rel(Relation onerel, VacuumStmt *vacstmt, bool inh)
 	if (!inh)
 		pgstat_report_analyze(onerel, totalrows, totaldeadrows);
 
-	/* We skip to here if there were no analyzable columns */
-cleanup:
-
 	/* If this isn't part of VACUUM ANALYZE, let index AMs do cleanup */
 	if (!(vacstmt->options & VACOPT_VACUUM))
 	{
@@ -858,12 +845,11 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
 		stats->attrtypmod = attr->atttypmod;
 	}
 
-	typtuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(stats->attrtypid));
+	typtuple = SearchSysCacheCopy1(TYPEOID,
+								   ObjectIdGetDatum(stats->attrtypid));
 	if (!HeapTupleIsValid(typtuple))
 		elog(ERROR, "cache lookup failed for type %u", stats->attrtypid);
-	stats->attrtype = (Form_pg_type) palloc(sizeof(FormData_pg_type));
-	memcpy(stats->attrtype, GETSTRUCT(typtuple), sizeof(FormData_pg_type));
-	ReleaseSysCache(typtuple);
+	stats->attrtype = (Form_pg_type) GETSTRUCT(typtuple);
 	stats->anl_context = anl_context;
 	stats->tupattnum = attnum;
 
@@ -892,7 +878,7 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr)
 
 	if (!ok || stats->compute_stats == NULL || stats->minrows <= 0)
 	{
-		pfree(stats->attrtype);
+		heap_freetuple(typtuple);
 		pfree(stats->attr);
 		pfree(stats);
 		return NULL;
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index c020dc2e4ecbd..76ea020512026 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -800,6 +800,10 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex,
 		 * When doing swap by content, any toast pointers written into NewHeap
 		 * must use the old toast table's OID, because that's where the toast
 		 * data will eventually be found.  Set this up by setting rd_toastoid.
+		 * This also tells tuptoaster.c to preserve the toast value OIDs,
+		 * which we want so as not to invalidate toast pointers in system
+		 * catalog caches.
+		 *
 		 * Note that we must hold NewHeap open until we are done writing data,
 		 * since the relcache will not guarantee to remember this setting once
 		 * the relation is closed.	Also, this technique depends on the fact
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index 7f8a108374ec8..7ef33b77b442d 100644
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -123,7 +123,7 @@ DefineCollation(List *names, List *parameters)
 	if (!collcollate)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-			errmsg("parameter \"lc_collate\" parameter must be specified")));
+				 errmsg("parameter \"lc_collate\" must be specified")));
 
 	if (!collctype)
 		ereport(ERROR,
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 57429035e895e..39bf6fc8e4f33 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -1234,7 +1234,7 @@ BeginCopy(bool is_from,
 		 *
 		 * ExecutorStart computes a result tupdesc for us
 		 */
-		ExecutorStart(cstate->queryDesc, 0);
+		ExecutorStart(cstate->queryDesc, 0, 'r');
 
 		tupDesc = cstate->queryDesc->tupDesc;
 	}
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index a770daf88d9ba..ddf10c234a692 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -383,7 +383,7 @@ ExplainOnePlan(PlannedStmt *plannedstmt, ExplainState *es,
 		eflags = EXEC_FLAG_EXPLAIN_ONLY;
 
 	/* call ExecutorStart to prepare the plan for execution */
-	ExecutorStart(queryDesc, eflags);
+	ExecutorStart(queryDesc, eflags, 'r');
 
 	/* Execute the plan for statistics if asked for */
 	if (es->analyze)
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index d848926ae55ef..547a24e363320 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -33,6 +33,7 @@
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
 #include "catalog/objectaccess.h"
+#include "catalog/pg_collation.h"
 #include "catalog/pg_depend.h"
 #include "catalog/pg_extension.h"
 #include "catalog/pg_namespace.h"
@@ -40,6 +41,7 @@
 #include "commands/alter.h"
 #include "commands/comment.h"
 #include "commands/extension.h"
+#include "commands/schemacmds.h"
 #include "commands/trigger.h"
 #include "executor/executor.h"
 #include "funcapi.h"
@@ -626,7 +628,7 @@ read_extension_aux_control_file(const ExtensionControlFile *pcontrol,
 }
 
 /*
- * Read a SQL script file into a string, and convert to database encoding
+ * Read an SQL script file into a string, and convert to database encoding
  */
 static char *
 read_extension_script_file(const ExtensionControlFile *control,
@@ -737,7 +739,7 @@ execute_sql_string(const char *sql, const char *filename)
 										GetActiveSnapshot(), NULL,
 										dest, NULL, 0);
 
-				ExecutorStart(qdesc, 0);
+				ExecutorStart(qdesc, 0, 'r');
 				ExecutorRun(qdesc, ForwardScanDirection, 0);
 				ExecutorFinish(qdesc);
 				ExecutorEnd(qdesc);
@@ -775,9 +777,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 						 const char *schemaName, Oid schemaOid)
 {
 	char	   *filename;
-	char	   *save_client_min_messages,
-			   *save_log_min_messages,
-			   *save_search_path;
+	int			save_nestlevel;
 	StringInfoData pathbuf;
 	ListCell   *lc;
 
@@ -809,22 +809,20 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 	 * so that we won't spam the user with useless NOTICE messages from common
 	 * script actions like creating shell types.
 	 *
-	 * We use the equivalent of SET LOCAL to ensure the setting is undone upon
-	 * error.
+	 * We use the equivalent of a function SET option to allow the setting to
+	 * persist for exactly the duration of the script execution.  guc.c also
+	 * takes care of undoing the setting on error.
 	 */
-	save_client_min_messages =
-		pstrdup(GetConfigOption("client_min_messages", false));
+	save_nestlevel = NewGUCNestLevel();
+
 	if (client_min_messages < WARNING)
 		(void) set_config_option("client_min_messages", "warning",
 								 PGC_USERSET, PGC_S_SESSION,
-								 GUC_ACTION_LOCAL, true);
-
-	save_log_min_messages =
-		pstrdup(GetConfigOption("log_min_messages", false));
+								 GUC_ACTION_SAVE, true);
 	if (log_min_messages < WARNING)
 		(void) set_config_option("log_min_messages", "warning",
 								 PGC_SUSET, PGC_S_SESSION,
-								 GUC_ACTION_LOCAL, true);
+								 GUC_ACTION_SAVE, true);
 
 	/*
 	 * Set up the search path to contain the target schema, then the schemas
@@ -833,10 +831,9 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 	 *
 	 * Note: it might look tempting to use PushOverrideSearchPath for this,
 	 * but we cannot do that.  We have to actually set the search_path GUC in
-	 * case the extension script examines or changes it.
+	 * case the extension script examines or changes it.  In any case, the
+	 * GUC_ACTION_SAVE method is just as convenient.
 	 */
-	save_search_path = pstrdup(GetConfigOption("search_path", false));
-
 	initStringInfo(&pathbuf);
 	appendStringInfoString(&pathbuf, quote_identifier(schemaName));
 	foreach(lc, requiredSchemas)
@@ -850,7 +847,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 
 	(void) set_config_option("search_path", pathbuf.data,
 							 PGC_USERSET, PGC_S_SESSION,
-							 GUC_ACTION_LOCAL, true);
+							 GUC_ACTION_SAVE, true);
 
 	/*
 	 * Set creating_extension and related variables so that
@@ -861,26 +858,39 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 	CurrentExtensionObject = extensionOid;
 	PG_TRY();
 	{
-		char	   *sql = read_extension_script_file(control, filename);
+		char	   *c_sql = read_extension_script_file(control, filename);
+		Datum		t_sql;
+
+		/* We use various functions that want to operate on text datums */
+		t_sql = CStringGetTextDatum(c_sql);
+
+		/*
+		 * Reduce any lines beginning with "\echo" to empty.  This allows
+		 * scripts to contain messages telling people not to run them via
+		 * psql, which has been found to be necessary due to old habits.
+		 */
+		t_sql = DirectFunctionCall4Coll(textregexreplace,
+										C_COLLATION_OID,
+										t_sql,
+										CStringGetTextDatum("^\\\\echo.*$"),
+										CStringGetTextDatum(""),
+										CStringGetTextDatum("ng"));
 
 		/*
 		 * If it's not relocatable, substitute the target schema name for
 		 * occcurrences of @extschema@.
 		 *
-		 * For a relocatable extension, we just run the script as-is. There
-		 * cannot be any need for @extschema@, else it wouldn't be
-		 * relocatable.
+		 * For a relocatable extension, we needn't do this.  There cannot be
+		 * any need for @extschema@, else it wouldn't be relocatable.
 		 */
 		if (!control->relocatable)
 		{
 			const char *qSchemaName = quote_identifier(schemaName);
 
-			sql = text_to_cstring(
-								  DatumGetTextPP(
-											DirectFunctionCall3(replace_text,
-													CStringGetTextDatum(sql),
-										  CStringGetTextDatum("@extschema@"),
-										 CStringGetTextDatum(qSchemaName))));
+			t_sql = DirectFunctionCall3(replace_text,
+										t_sql,
+										CStringGetTextDatum("@extschema@"),
+										CStringGetTextDatum(qSchemaName));
 		}
 
 		/*
@@ -889,15 +899,16 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 		 */
 		if (control->module_pathname)
 		{
-			sql = text_to_cstring(
-								  DatumGetTextPP(
-											DirectFunctionCall3(replace_text,
-													CStringGetTextDatum(sql),
-									  CStringGetTextDatum("MODULE_PATHNAME"),
-							CStringGetTextDatum(control->module_pathname))));
+			t_sql = DirectFunctionCall3(replace_text,
+										t_sql,
+										CStringGetTextDatum("MODULE_PATHNAME"),
+							CStringGetTextDatum(control->module_pathname));
 		}
 
-		execute_sql_string(sql, filename);
+		/* And now back to C string */
+		c_sql = text_to_cstring(DatumGetTextPP(t_sql));
+
+		execute_sql_string(c_sql, filename);
 	}
 	PG_CATCH();
 	{
@@ -911,18 +922,9 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control,
 	CurrentExtensionObject = InvalidOid;
 
 	/*
-	 * Restore GUC variables for the remainder of the current transaction.
-	 * Again use SET LOCAL, so we won't affect the session value.
+	 * Restore the GUC variables we set above.
 	 */
-	(void) set_config_option("search_path", save_search_path,
-							 PGC_USERSET, PGC_S_SESSION,
-							 GUC_ACTION_LOCAL, true);
-	(void) set_config_option("client_min_messages", save_client_min_messages,
-							 PGC_USERSET, PGC_S_SESSION,
-							 GUC_ACTION_LOCAL, true);
-	(void) set_config_option("log_min_messages", save_log_min_messages,
-							 PGC_SUSET, PGC_S_SESSION,
-							 GUC_ACTION_LOCAL, true);
+	AtEOXact_GUC(true, save_nestlevel);
 }
 
 /*
@@ -1369,9 +1371,18 @@ CreateExtension(CreateExtensionStmt *stmt)
 
 		if (schemaOid == InvalidOid)
 		{
-			schemaOid = NamespaceCreate(schemaName, extowner);
-			/* Advance cmd counter to make the namespace visible */
-			CommandCounterIncrement();
+			CreateSchemaStmt *csstmt = makeNode(CreateSchemaStmt);
+
+			csstmt->schemaname = schemaName;
+			csstmt->authid = NULL;		/* will be created by current user */
+			csstmt->schemaElts = NIL;
+			CreateSchemaCommand(csstmt, NULL);
+
+			/*
+			 * CreateSchemaCommand includes CommandCounterIncrement, so new
+			 * schema is now visible
+			 */
+			schemaOid = get_namespace_oid(schemaName, false);
 		}
 	}
 	else
@@ -1631,6 +1642,23 @@ RemoveExtensionById(Oid extId)
 	HeapTuple	tuple;
 	ScanKeyData entry[1];
 
+	/*
+	 * Disallow deletion of any extension that's currently open for insertion;
+	 * else subsequent executions of recordDependencyOnCurrentExtension()
+	 * could create dangling pg_depend records that refer to a no-longer-valid
+	 * pg_extension OID.  This is needed not so much because we think people
+	 * might write "DROP EXTENSION foo" in foo's own script files, as because
+	 * errors in dependency management in extension script files could give
+	 * rise to cases where an extension is dropped as a result of recursing
+	 * from some contained object.  Because of that, we must test for the case
+	 * here, not at some higher level of the DROP EXTENSION command.
+	 */
+	if (extId == CurrentExtensionObject)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("cannot drop extension \"%s\" because it is being modified",
+						get_extension_name(extId))));
+
 	rel = heap_open(ExtensionRelationId, RowExclusiveLock);
 
 	ScanKeyInit(&entry[0],
@@ -2099,7 +2127,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("pg_extension_config_dump() can only be called "
-						"from a SQL script executed by CREATE EXTENSION")));
+						"from an SQL script executed by CREATE EXTENSION")));
 
 	/*
 	 * Check that the table exists and is a member of the extension being
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c
index 21d52e06ba035..3a3c131366829 100644
--- a/src/backend/commands/foreigncmds.c
+++ b/src/backend/commands/foreigncmds.c
@@ -165,8 +165,18 @@ transformGenericOptions(Oid catalogId,
 
 	result = optionListToArray(resultOptions);
 
-	if (OidIsValid(fdwvalidator) && DatumGetPointer(result) != NULL)
-		OidFunctionCall2(fdwvalidator, result, ObjectIdGetDatum(catalogId));
+	if (OidIsValid(fdwvalidator))
+	{
+		Datum	valarg = result;
+
+		/*
+		 * Pass a null options list as an empty array, so that validators
+		 * don't have to be declared non-strict to handle the case.
+		 */
+		if (DatumGetPointer(valarg) == NULL)
+			valarg = PointerGetDatum(construct_empty_array(TEXTOID));
+		OidFunctionCall2(fdwvalidator, valarg, ObjectIdGetDatum(catalogId));
+	}
 
 	return result;
 }
@@ -205,6 +215,8 @@ AlterForeignDataWrapperOwner(const char *name, Oid newOwnerId)
 	Oid			fdwId;
 	Form_pg_foreign_data_wrapper form;
 
+	rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
+
 	/* Must be a superuser to change a FDW owner */
 	if (!superuser())
 		ereport(ERROR,
@@ -221,8 +233,6 @@ AlterForeignDataWrapperOwner(const char *name, Oid newOwnerId)
 						name),
 		errhint("The owner of a foreign-data wrapper must be a superuser.")));
 
-	rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
-
 	tup = SearchSysCacheCopy1(FOREIGNDATAWRAPPERNAME, CStringGetDatum(name));
 
 	if (!HeapTupleIsValid(tup))
@@ -422,6 +432,8 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
 	ObjectAddress myself;
 	ObjectAddress referenced;
 
+	rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
+
 	/* Must be super user */
 	if (!superuser())
 		ereport(ERROR,
@@ -445,8 +457,6 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
 	/*
 	 * Insert tuple into pg_foreign_data_wrapper.
 	 */
-	rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
-
 	memset(values, 0, sizeof(values));
 	memset(nulls, false, sizeof(nulls));
 
@@ -505,7 +515,7 @@ CreateForeignDataWrapper(CreateFdwStmt *stmt)
 	recordDependencyOnOwner(ForeignDataWrapperRelationId, fdwId, ownerId);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new foreign data wrapper */
 	InvokeObjectAccessHook(OAT_POST_CREATE,
@@ -535,6 +545,8 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt)
 	Oid			fdwhandler;
 	Oid			fdwvalidator;
 
+	rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
+
 	/* Must be super user */
 	if (!superuser())
 		ereport(ERROR,
@@ -625,9 +637,6 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt)
 	}
 
 	/* Everything looks good - update the tuple */
-
-	rel = heap_open(ForeignDataWrapperRelationId, RowExclusiveLock);
-
 	tp = heap_modify_tuple(tp, RelationGetDescr(rel),
 						   repl_val, repl_null, repl_repl);
 
@@ -763,6 +772,8 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
 	ObjectAddress referenced;
 	ForeignDataWrapper *fdw;
 
+	rel = heap_open(ForeignServerRelationId, RowExclusiveLock);
+
 	/* For now the owner cannot be specified on create. Use effective user ID. */
 	ownerId = GetUserId();
 
@@ -788,8 +799,6 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
 	/*
 	 * Insert tuple into pg_foreign_server.
 	 */
-	rel = heap_open(ForeignServerRelationId, RowExclusiveLock);
-
 	memset(values, 0, sizeof(values));
 	memset(nulls, false, sizeof(nulls));
 
@@ -847,7 +856,7 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
 	recordDependencyOnOwner(ForeignServerRelationId, srvId, ownerId);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new foreign server */
 	InvokeObjectAccessHook(OAT_POST_CREATE, ForeignServerRelationId, srvId, 0);
@@ -870,6 +879,8 @@ AlterForeignServer(AlterForeignServerStmt *stmt)
 	Oid			srvId;
 	Form_pg_foreign_server srvForm;
 
+	rel = heap_open(ForeignServerRelationId, RowExclusiveLock);
+
 	tp = SearchSysCacheCopy1(FOREIGNSERVERNAME,
 							 CStringGetDatum(stmt->servername));
 
@@ -935,9 +946,6 @@ AlterForeignServer(AlterForeignServerStmt *stmt)
 	}
 
 	/* Everything looks good - update the tuple */
-
-	rel = heap_open(ForeignServerRelationId, RowExclusiveLock);
-
 	tp = heap_modify_tuple(tp, RelationGetDescr(rel),
 						   repl_val, repl_null, repl_repl);
 
@@ -1058,6 +1066,8 @@ CreateUserMapping(CreateUserMappingStmt *stmt)
 	ForeignServer *srv;
 	ForeignDataWrapper *fdw;
 
+	rel = heap_open(UserMappingRelationId, RowExclusiveLock);
+
 	useId = GetUserOidFromMapping(stmt->username, false);
 
 	/* Check that the server exists. */
@@ -1083,8 +1093,6 @@ CreateUserMapping(CreateUserMappingStmt *stmt)
 	/*
 	 * Insert tuple into pg_user_mapping.
 	 */
-	rel = heap_open(UserMappingRelationId, RowExclusiveLock);
-
 	memset(values, 0, sizeof(values));
 	memset(nulls, false, sizeof(nulls));
 
@@ -1127,7 +1135,7 @@ CreateUserMapping(CreateUserMappingStmt *stmt)
 	}
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new user mapping */
 	InvokeObjectAccessHook(OAT_POST_CREATE, UserMappingRelationId, umId, 0);
@@ -1151,6 +1159,8 @@ AlterUserMapping(AlterUserMappingStmt *stmt)
 	Oid			umId;
 	ForeignServer *srv;
 
+	rel = heap_open(UserMappingRelationId, RowExclusiveLock);
+
 	useId = GetUserOidFromMapping(stmt->username, false);
 	srv = GetForeignServerByName(stmt->servername, false);
 
@@ -1208,9 +1218,6 @@ AlterUserMapping(AlterUserMappingStmt *stmt)
 	}
 
 	/* Everything looks good - update the tuple */
-
-	rel = heap_open(UserMappingRelationId, RowExclusiveLock);
-
 	tp = heap_modify_tuple(tp, RelationGetDescr(rel),
 						   repl_val, repl_null, repl_repl);
 
@@ -1334,11 +1341,13 @@ CreateForeignTable(CreateForeignTableStmt *stmt, Oid relid)
 	ForeignServer *server;
 
 	/*
-	 * Advance command counter to ensure the pg_attribute tuple visible; the
-	 * tuple might be updated to add constraints in previous step.
+	 * Advance command counter to ensure the pg_attribute tuple is visible;
+	 * the tuple might be updated to add constraints in previous step.
 	 */
 	CommandCounterIncrement();
 
+	ftrel = heap_open(ForeignTableRelationId, RowExclusiveLock);
+
 	/*
 	 * For now the owner cannot be specified on create. Use effective user ID.
 	 */
@@ -1358,8 +1367,6 @@ CreateForeignTable(CreateForeignTableStmt *stmt, Oid relid)
 	/*
 	 * Insert tuple into pg_foreign_table.
 	 */
-	ftrel = heap_open(ForeignTableRelationId, RowExclusiveLock);
-
 	memset(values, 0, sizeof(values));
 	memset(nulls, false, sizeof(nulls));
 
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 03da168ff2c14..92abd44a600e4 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -1489,6 +1489,7 @@ CreateCast(CreateCastStmt *stmt)
 	char		sourcetyptype;
 	char		targettyptype;
 	Oid			funcid;
+	Oid			castid;
 	int			nargs;
 	char		castcontext;
 	char		castmethod;
@@ -1734,13 +1735,13 @@ CreateCast(CreateCastStmt *stmt)
 
 	tuple = heap_form_tuple(RelationGetDescr(relation), values, nulls);
 
-	simple_heap_insert(relation, tuple);
+	castid = simple_heap_insert(relation, tuple);
 
 	CatalogUpdateIndexes(relation, tuple);
 
 	/* make dependency entries */
 	myself.classId = CastRelationId;
-	myself.objectId = HeapTupleGetOid(tuple);
+	myself.objectId = castid;
 	myself.objectSubId = 0;
 
 	/* dependency on source type */
@@ -1765,11 +1766,10 @@ CreateCast(CreateCastStmt *stmt)
 	}
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new cast */
-	InvokeObjectAccessHook(OAT_POST_CREATE,
-						   CastRelationId, myself.objectId, 0);
+	InvokeObjectAccessHook(OAT_POST_CREATE, CastRelationId, castid, 0);
 
 	heap_freetuple(tuple);
 
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
new file mode 100644
index 0000000000000..9a05d68ae6163
--- /dev/null
+++ b/src/backend/commands/matview.c
@@ -0,0 +1,625 @@
+/*-------------------------------------------------------------------------
+ *
+ * matview.c
+ *	  use rewrite rules to construct matviews
+ *
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/commands/matview.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "access/xact.h"
+#include "catalog/namespace.h"
+#include "commands/defrem.h"
+#include "commands/tablecmds.h"
+#include "commands/matview.h"
+#include "executor/execdesc.h"
+#include "miscadmin.h"
+#include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
+#include "parser/analyze.h"
+#include "parser/parse_relation.h"
+#include "rewrite/rewriteDefine.h"
+#include "rewrite/rewriteManip.h"
+#include "rewrite/rewriteSupport.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
+#include "utils/rel.h"
+
+static void checkMatViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
+static bool isMatViewOnTempTable_walker(Node *node, void *context);
+// extern void getRelationDescription(StringInfo buffer, Oid relid);
+
+/*---------------------------------------------------------------------
+ * isMatViewOnTempTable
+ *
+ * Returns true iff any of the relations underlying this matview are
+ * temporary tables.
+ *---------------------------------------------------------------------
+ */
+static bool
+isMatViewOnTempTable(Query *matViewParse)
+{
+	return isMatViewOnTempTable_walker((Node *) matViewParse, NULL);
+}
+
+static bool
+isMatViewOnTempTable_walker(Node *node, void *context)
+{
+	if (node == NULL)
+		return false;
+
+	if (IsA(node, Query))
+	{
+		Query	   *query = (Query *) node;
+		ListCell   *rtable;
+
+		foreach(rtable, query->rtable)
+		{
+			RangeTblEntry *rte = lfirst(rtable);
+
+			if (rte->rtekind == RTE_RELATION)
+			{
+				Relation	rel = heap_open(rte->relid, AccessShareLock);
+				char		relpersistence = rel->rd_rel->relpersistence;
+
+				heap_close(rel, AccessShareLock);
+				if (relpersistence == RELPERSISTENCE_TEMP)
+					return true;
+			}
+		}
+
+		return query_tree_walker(query,
+								 isMatViewOnTempTable_walker,
+								 context,
+								 QTW_IGNORE_JOINALIASES);
+	}
+
+	return expression_tree_walker(node,
+								  isMatViewOnTempTable_walker,
+								  context);
+}
+
+/*---------------------------------------------------------------------
+ * DefineMaterializedVirtualRelation
+ *
+ * Create the "matview" relation. `DefineRelation' does all the work,
+ * we just provide the correct arguments ... at least when we're
+ * creating a matview.  If we're updating an existing matview, we have to
+ * work harder.
+ *---------------------------------------------------------------------
+ */
+static Oid
+DefineMaterializedVirtualRelation(const RangeVar *relation, Query * matViewParse, bool replace,
+					  Oid namespaceId)
+{
+	Oid			matViewOid;
+	CreateStmt *createStmt = makeNode(CreateStmt);
+	List	   *attrList;
+	ListCell   *t;
+	List *tlist = matViewParse -> targetList;
+	/*
+	 * create a list of ColumnDef nodes based on the names and types of the
+	 * (non-junk) targetlist items from the matView's SELECT list.
+	 */
+	attrList = NIL;
+	foreach(t, tlist)
+	{
+		TargetEntry *tle = lfirst(t);
+
+		if (!tle->resjunk)
+		{
+			ColumnDef  *def = makeNode(ColumnDef);
+
+			def->colname = pstrdup(tle->resname);
+			def->typeName = makeTypeNameFromOid(exprType((Node *) tle->expr),
+											 exprTypmod((Node *) tle->expr));
+			def->inhcount = 0;
+			def->is_local = true;
+			def->is_not_null = false;
+			def->is_from_type = false;
+			def->storage = 0;
+			def->raw_default = NULL;
+			def->cooked_default = NULL;
+			def->collClause = NULL;
+			def->collOid = exprCollation((Node *) tle->expr);
+
+			/*
+			 * It's possible that the column is of a collatable type but the
+			 * collation could not be resolved, so double-check.
+			 */
+			if (type_is_collatable(exprType((Node *) tle->expr)))
+			{
+				if (!OidIsValid(def->collOid))
+					ereport(ERROR,
+							(errcode(ERRCODE_INDETERMINATE_COLLATION),
+							 errmsg("could not determine which collation to use for mat view column \"%s\"",
+									def->colname),
+							 errhint("Use the COLLATE clause to set the collation explicitly.")));
+			}
+			else
+				Assert(!OidIsValid(def->collOid));
+			def->constraints = NIL;
+
+			attrList = lappend(attrList, def);
+		}
+	}
+
+	if (attrList == NIL)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				 errmsg("mat view must have at least one column")));
+
+	/*
+	 * Check to see if we want to replace an existing mat view.
+	 */
+	matViewOid = get_relname_relid(relation->relname, namespaceId);
+
+	if (OidIsValid(matViewOid) && replace)
+	{
+		Relation	rel;
+		TupleDesc	descriptor;
+
+		/*
+		 * Yes.  Get exclusive lock on the existing mat view ...
+		 */
+		rel = relation_open(matViewOid, AccessExclusiveLock);
+
+		/*
+		 * Make sure it *is* a mat view, and do permissions checks.
+		 */
+		if (rel->rd_rel->relkind != RELKIND_MAT_VIEW)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is not a mat view",
+							RelationGetRelationName(rel))));
+
+		if (!pg_class_ownercheck(matViewOid, GetUserId()))
+			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+						   RelationGetRelationName(rel));
+
+		/* Also check it's not in use already */
+		CheckTableNotInUse(rel, "CREATE OR REPLACE MATVIEW");
+
+		/*
+		 * Due to the namespace visibility rules for temporary objects, we
+		 * should only end up replacing a temporary mat view with another
+		 * temporary mat view, and similarly for permanent mat views.
+		 */
+		Assert(relation->relpersistence == rel->rd_rel->relpersistence);
+
+		/*
+		 * Create a tuple descriptor to compare against the existing mat view, and
+		 * verify that the old column list is an initial prefix of the new
+		 * column list.
+		 */
+		descriptor = BuildDescForRelation(attrList);
+		checkMatViewTupleDesc(descriptor, rel->rd_att);
+
+		/*
+		 * If new attributes have been added, we must add pg_attribute entries
+		 * for them.  It is convenient (although overkill) to use the ALTER
+		 * TABLE ADD COLUMN infrastructure for this.
+		 */
+		if (list_length(attrList) > rel->rd_att->natts)
+		{
+			List	   *atcmds = NIL;
+			ListCell   *c;
+			int			skip = rel->rd_att->natts;
+
+			foreach(c, attrList)
+			{
+				AlterTableCmd *atcmd;
+
+				if (skip > 0)
+				{
+					skip--;
+					continue;
+				}
+				atcmd = makeNode(AlterTableCmd);
+				atcmd->subtype = AT_AddColumnToMatView;
+				atcmd->def = (Node *) lfirst(c);
+				atcmds = lappend(atcmds, atcmd);
+			}
+			AlterTableInternal(matViewOid, atcmds, true);
+		}
+
+		/*
+		 * Seems okay, so return the OID of the pre-existing mat view.
+		 */
+		relation_close(rel, NoLock);	/* keep the lock! */
+
+		return matViewOid;
+	}
+	else
+	{
+		Oid			relid;
+
+		/*
+		 * now set the parameters for keys/inheritance etc. All of these are
+		 * uninteresting for mat views...
+		 */
+		/* 
+         * createStmt->relation = (RangeVar *) relation;
+		 * createStmt->tableElts = attrList;
+		 * createStmt->inhRelations = NIL;
+		 * createStmt->constraints = NIL;
+		 * createStmt->options = list_make1(defWithOids(false));
+		 * createStmt->oncommit = ONCOMMIT_NOOP;
+		 * createStmt->tablespacename = NULL;
+		 * createStmt->if_not_exists = false;
+         */
+
+		matViewParse -> intoClause = makeNode(IntoClause);
+		matViewParse -> intoClause -> rel = (RangeVar *) relation;
+		matViewParse -> intoClause -> colNames = attrList;
+		matViewParse -> intoClause -> options = NULL;
+		matViewParse -> intoClause -> onCommit = ONCOMMIT_NOOP;
+		matViewParse -> intoClause -> tableSpaceName = NULL;
+
+		PlannedStmt * plannedMatViewParse;
+		plannedMatViewParse = pg_plan_query(matViewParse, 0, NULL);
+		QueryDesc  *qdesc;
+		DestReceiver *dest;
+		dest = CreateDestReceiver(DestNone);
+		qdesc = CreateQueryDesc((PlannedStmt *) plannedMatViewParse,
+								NULL,
+								GetActiveSnapshot(), NULL,
+								dest, NULL, 0);
+		
+		ExecutorStart(qdesc, 0, 'm');
+		ExecutorRun(qdesc, ForwardScanDirection, 0);
+		ExecutorFinish(qdesc);
+		ExecutorEnd(qdesc);
+	
+		FreeQueryDesc(qdesc);
+
+		/*
+		 * finally create the relation (this will error out if there's an
+		 * existing mat view, so we don't need more code to complain if "replace"
+		 * is false).
+		 */
+		relid = get_relname_relid(relation->relname, namespaceId);
+		// relid = DefineRelation(createStmt, RELKIND_MAT_VIEW, InvalidOid);
+
+		printf("matview.c 263: Defined Relation for MatView\n");
+		Assert(relid != InvalidOid);
+		
+		return relid;
+	}
+}
+
+/*
+ * Verify that tupledesc associated with proposed new mat view definition
+ * matches tupledesc of old mat view.  This is basically a cut-down version
+ * of equalTupleDescs(), with code added to generate specific complaints.
+ * Also, we allow the new tupledesc to have more columns than the old.
+ */
+static void
+checkMatViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc)
+{
+	int			i;
+
+	if (newdesc->natts < olddesc->natts)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				 errmsg("cannot drop columns from mat view")));
+	/* we can ignore tdhasoid */
+
+	for (i = 0; i < olddesc->natts; i++)
+	{
+		Form_pg_attribute newattr = newdesc->attrs[i];
+		Form_pg_attribute oldattr = olddesc->attrs[i];
+
+		/* XXX msg not right, but we don't support DROP COL on mat view anyway */
+		if (newattr->attisdropped != oldattr->attisdropped)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("cannot drop columns from mat view")));
+
+		if (strcmp(NameStr(newattr->attname), NameStr(oldattr->attname)) != 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+				 errmsg("cannot change name of mat view column \"%s\" to \"%s\"",
+						NameStr(oldattr->attname),
+						NameStr(newattr->attname))));
+		/* XXX would it be safe to allow atttypmod to change?  Not sure */
+		if (newattr->atttypid != oldattr->atttypid ||
+			newattr->atttypmod != oldattr->atttypmod)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("cannot change data type of mat view column \"%s\" from %s to %s",
+							NameStr(oldattr->attname),
+							format_type_with_typemod(oldattr->atttypid,
+													 oldattr->atttypmod),
+							format_type_with_typemod(newattr->atttypid,
+													 newattr->atttypmod))));
+		/* We can ignore the remaining attributes of an attribute... */
+	}
+
+	/*
+	 * We ignore the constraint fields.  The new mat view desc can't have any
+	 * constraints, and the only ones that could be on the old mat view are
+	 * defaults, which we are happy to leave in place.
+	 */
+}
+
+static void
+DefineMatViewRules(Oid matViewOid, Query *matViewParse, bool replace)
+{
+	/*
+	 * Set up the ON SELECT rule.  Since the query has already been through
+	 * parse analysis, we use DefineQueryRewrite() directly.
+	 */
+  // Rule should be changed here. But changing it causes error. Hence not done as of yet.
+	DefineQueryRewrite(pstrdup(ViewSelectRuleName),
+					   matViewOid,
+					   NULL,
+					   CMD_SELECT,
+					   true,
+					   replace,
+					   list_make1(matViewParse));
+
+	/*
+	 * Someday: automatic ON INSERT, etc
+	 */
+}
+
+/*---------------------------------------------------------------
+ * UpdateRangeTableOfMatViewParse
+ *
+ * Update the range table of the given parsetree.
+ * This update consists of adding two new entries IN THE BEGINNING
+ * of the range table (otherwise the rule system will die a slow,
+ * horrible and painful death, and we do not want that now, do we?)
+ * one for the OLD relation and one for the NEW one (both of
+ * them refer in fact to the "view" relation).
+ *
+ * Of course we must also increase the 'varnos' of all the Var nodes
+ * by 2...
+ *
+ * These extra RT entries are not actually used in the query,
+ * except for run-time permission checking.
+ *---------------------------------------------------------------
+ */
+static Query *
+UpdateRangeTableOfMatViewParse(Oid matViewOid, Query *matViewParse)
+{
+	Relation	matViewRel;
+	List	   *new_rt;
+	RangeTblEntry *rt_entry1,
+			   *rt_entry2;
+
+	/*
+	 * Make a copy of the given parsetree.	It's not so much that we don't
+	 * want to scribble on our input, it's that the parser has a bad habit of
+	 * outputting multiple links to the same subtree for constructs like
+	 * BETWEEN, and we mustn't have OffsetVarNodes increment the varno of a
+	 * Var node twice.	copyObject will expand any multiply-referenced subtree
+	 * into multiple copies.
+	 */
+	matViewParse = (Query *) copyObject(matViewParse);
+
+	/* need to open the rel for addRangeTableEntryForRelation */
+	matViewRel = relation_open(matViewOid, AccessShareLock);
+
+	/*
+	 * Create the 2 new range table entries and form the new range table...
+	 * OLD first, then NEW....
+	 */
+	rt_entry1 = addRangeTableEntryForRelation(NULL, matViewRel,
+											  makeAlias("old", NIL),
+											  false, false);
+	rt_entry2 = addRangeTableEntryForRelation(NULL, matViewRel,
+											  makeAlias("new", NIL),
+											  false, false);
+	/* Must override addRangeTableEntry's default access-check flags */
+	rt_entry1->requiredPerms = 0;
+	rt_entry2->requiredPerms = 0;
+
+	new_rt = lcons(rt_entry1, lcons(rt_entry2, matViewParse->rtable));
+
+	matViewParse->rtable = new_rt;
+
+	/*
+	 * Now offset all var nodes by 2, and jointree RT indexes too.
+	 */
+	OffsetVarNodes((Node *) matViewParse, 2, 0);
+
+	relation_close(matViewRel, AccessShareLock);
+
+	return matViewParse;
+}
+
+/*
+ * DefineMatView
+ *		Execute a CREATE MATVIEW command.
+ */
+void
+DefineMatView(MatViewStmt *stmt, const char *queryString)
+{
+	Query	   *matViewParse;
+	Oid			matViewOid;
+	Oid			namespaceId;
+	RangeVar   *matView;
+
+	/*
+	 * Run parse analysis to convert the raw parse tree to a Query.  Note this
+	 * also acquires sufficient locks on the source table(s).
+	 *
+	 * Since parse analysis scribbles on its input, copy the raw parse tree;
+	 * this ensures we don't corrupt a prepared statement, for example.
+	 */
+	/* 
+         * ListCell * lc;
+	 * foreach(lc, ((SelectStmt *)(stmt -> query)) -> fromClause){
+	 *   printf("From Clause: %s\n", (char *) lc -> data.ptr_value);
+	 * }
+         */
+	// Assert(1 == 0);
+	printf("matview.c 439: calling parse_analyze\n");
+	matViewParse = parse_analyze((Node *) copyObject(stmt->query),
+							  queryString, NULL, 0);
+	printf("matview.c 442: parse_analyze call ended\n");
+	/*
+	 * The grammar should ensure that the result is a single SELECT Query.
+	 */
+	if (!IsA(matViewParse, Query) ||
+		matViewParse->commandType != CMD_SELECT)
+		elog(ERROR, "unexpected parse analysis result");
+
+	/*
+	 * Check for unsupported cases.  These tests are redundant with ones in
+	 * DefineQueryRewrite(), but that function will complain about a bogus ON
+	 * SELECT rule, and we'd rather the message complain about a view.
+	 */
+	if (matViewParse->intoClause != NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("mat views must not contain SELECT INTO")));
+	if (matViewParse->hasModifyingCTE)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		errmsg("mat views must not contain data-modifying statements in WITH")));
+
+
+	/*
+	 * If a list of column names was given, run through and insert these into
+	 * the actual query tree. - thomas 2000-03-08
+	 */
+	if (stmt->aliases != NIL)
+	{
+		ListCell   *alist_item = list_head(stmt->aliases);
+		ListCell   *targetList;
+
+		foreach(targetList, matViewParse->targetList)
+		{
+			TargetEntry *te = (TargetEntry *) lfirst(targetList);
+
+			Assert(IsA(te, TargetEntry));
+			/* junk columns don't get aliases */
+			if (te->resjunk)
+				continue;
+			te->resname = pstrdup(strVal(lfirst(alist_item)));
+			alist_item = lnext(alist_item);
+			if (alist_item == NULL)
+				break;			/* done assigning aliases */
+		}
+
+		if (alist_item != NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_SYNTAX_ERROR),
+					 errmsg("CREATE MAT VIEW specifies more column "
+							"names than columns")));
+	}
+	printf("matview.c 492:\n");
+
+	/* Unlogged views are not sensible. */
+	if (stmt->matView->relpersistence == RELPERSISTENCE_UNLOGGED)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+		errmsg("views cannot be unlogged because they do not have storage")));
+
+	/*
+	 * If the user didn't explicitly ask for a temporary view, check whether
+	 * we need one implicitly.	We allow TEMP to be inserted automatically as
+	 * long as the CREATE command is consistent with that --- no explicit
+	 * schema name.
+	 */
+
+	matView = copyObject(stmt->matView);  /* don't corrupt original command */	
+	printf("matview.c 508:\n");
+	if (matView->relpersistence == RELPERSISTENCE_PERMANENT
+		&& isMatViewOnTempTable(matViewParse))
+	  {
+		printf("matview.c 512: Inside\n");
+		matView->relpersistence = RELPERSISTENCE_TEMP;
+		printf("matview.c 512: Giving Error\n");
+		ereport(NOTICE,
+				(errmsg("view \"%s\" will be a temporary view",
+						matView->relname)));
+	}
+	printf("matview.c 517:\n");
+	/* Might also need to make it temporary if placed in temp schema. */
+	namespaceId = RangeVarGetCreationNamespace(matView);
+	RangeVarAdjustRelationPersistence(matView, namespaceId);
+
+	/*
+	 * Create the materialized view relation
+	 *
+	 * NOTE: if it already exists and replace is false, the xact will be
+	 * aborted.
+	 */
+	printf("matview.c 527: Calling DefineMaterializedVirtualRelation\n");
+	matViewOid = DefineMaterializedVirtualRelation(matView,
+						       matViewParse,
+						       stmt->replace,
+						       namespaceId);
+
+
+	/*Unclear bisiness begins 
+	PlannedStmt * PlannedMatViewParse;
+	PlannedMatViewParse = pg_plan_query(matViewParse, 0, NULL);
+	printf("matview.c 532: DefineMaterializedVirtualRelation returned\n");
+
+	QueryDesc *queryDesc = CreateQueryDesc(PlannedMatViewParse,
+										   queryString,
+										   GetActiveSnapshot(),
+										   InvalidSnapshot,
+										   None_Receiver, NULL, 0);
+
+	queryDesc->dest = CreateDestReceiver(DestIntoRel);
+
+	CmdType		operation;
+	bool		sendTuples;
+	DestReceiver *dest;
+ 
+	operation = queryDesc->operation;
+	dest = queryDesc->dest;
+	sendTuples = (operation == CMD_SELECT ||
+				  queryDesc->plannedstmt->hasReturning);
+
+	if (sendTuples)
+		(*dest->rStartup) (dest, operation, queryDesc->tupDesc);
+
+	if (!ScanDirectionIsNoMovement(ForwardScanDirection))
+		ExecutePlan(estate,
+					queryDesc->planstate,
+					operation,
+					sendTuples,
+					count,
+					direction,
+					dest);
+
+	if (sendTuples)
+		(*dest->rShutdown) (dest);
+
+	/*Unclear bisiness ends*/ 
+	/*
+	 * The relation we have just created is not visible to any other commands
+	 * running with the same transaction & command id. So, increment the
+	 * command id counter (but do NOT pfree any memory!!!!)
+	 */
+	CommandCounterIncrement();
+
+	/*
+	 * The range table of 'viewParse' does not contain entries for the "OLD"
+	 * and "NEW" relations. So... add them!
+	 */
+	// matViewParse = UpdateRangeTableOfMatViewParse(matViewOid, matViewParse);
+
+	/*
+	 * Now create the rules associated with the view.
+	 */
+	matViewParse -> intoClause = NULL;
+	// DefineMatViewRules(matViewOid, matViewParse, stmt->replace);
+	printf("MatView defined\n");
+}
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index aff5ac6ec43ba..8bad626c834b9 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -310,7 +310,7 @@ CreateOpFamily(char *amname, char *opfname, Oid namespaceoid, Oid amoid)
 	recordDependencyOnOwner(OperatorFamilyRelationId, opfamilyoid, GetUserId());
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new operator family */
 	InvokeObjectAccessHook(OAT_POST_CREATE,
@@ -713,7 +713,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
 	recordDependencyOnOwner(OperatorClassRelationId, opclassoid, GetUserId());
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* Post creation hook for new operator class */
 	InvokeObjectAccessHook(OAT_POST_CREATE,
@@ -1614,10 +1614,9 @@ RemoveOpFamily(RemoveOpFamilyStmt *stmt)
 	tuple = OpFamilyCacheLookup(amID, stmt->opfamilyname, stmt->missing_ok);
 	if (!HeapTupleIsValid(tuple))
 	{
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("operator family \"%s\" does not exist for access method \"%s\"",
-						NameListToString(stmt->opfamilyname), stmt->amname)));
+		ereport(NOTICE,
+				(errmsg("operator family \"%s\" does not exist for access method \"%s\", skipping",
+				   NameListToString(stmt->opfamilyname), stmt->amname)));
 		return;
 	}
 
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index b36f31ee6d52f..98770c5a61afc 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -388,8 +388,7 @@ create_proc_lang(const char *languageName, bool replace,
 	 * Create dependencies for the new language.  If we are updating an
 	 * existing language, first delete any existing pg_depend entries.
 	 * (However, since we are not changing ownership or permissions, the
-	 * shared dependencies do *not* need to change, and we leave them alone.
-	 * We also don't change any pre-existing extension-membership dependency.)
+	 * shared dependencies do *not* need to change, and we leave them alone.)
 	 */
 	myself.classId = LanguageRelationId;
 	myself.objectId = HeapTupleGetOid(tup);
@@ -404,8 +403,7 @@ create_proc_lang(const char *languageName, bool replace,
 								languageOwner);
 
 	/* dependency on extension */
-	if (!is_update)
-		recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, is_update);
 
 	/* dependency on the PL handler function */
 	referenced.classId = ProcedureRelationId;
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 2c9f855f53123..c3966e3c2e6ae 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -90,18 +90,18 @@
  */
 typedef struct OnCommitItem
 {
-	Oid			relid;			/* relid of relation */
-	OnCommitAction oncommit;	/* what to do at end of xact */
-
-	/*
-	 * If this entry was created during the current transaction,
-	 * creating_subid is the ID of the creating subxact; if created in a prior
-	 * transaction, creating_subid is zero.  If deleted during the current
-	 * transaction, deleting_subid is the ID of the deleting subxact; if no
-	 * deletion request is pending, deleting_subid is zero.
-	 */
-	SubTransactionId creating_subid;
-	SubTransactionId deleting_subid;
+  Oid			relid;			/* relid of relation */
+  OnCommitAction oncommit;	/* what to do at end of xact */
+
+  /*
+   * If this entry was created during the current transaction,
+   * creating_subid is the ID of the creating subxact; if created in a prior
+   * transaction, creating_subid is zero.  If deleted during the current
+   * transaction, deleting_subid is the ID of the deleting subxact; if no
+   * deletion request is pending, deleting_subid is zero.
+   */
+  SubTransactionId creating_subid;
+  SubTransactionId deleting_subid;
 } OnCommitItem;
 
 static List *on_commits = NIL;
@@ -135,36 +135,36 @@ static List *on_commits = NIL;
 
 typedef struct AlteredTableInfo
 {
-	/* Information saved before any work commences: */
-	Oid			relid;			/* Relation to work on */
-	char		relkind;		/* Its relkind */
-	TupleDesc	oldDesc;		/* Pre-modification tuple descriptor */
-	/* Information saved by Phase 1 for Phase 2: */
-	List	   *subcmds[AT_NUM_PASSES]; /* Lists of AlterTableCmd */
-	/* Information saved by Phases 1/2 for Phase 3: */
-	List	   *constraints;	/* List of NewConstraint */
-	List	   *newvals;		/* List of NewColumnValue */
-	bool		new_notnull;	/* T if we added new NOT NULL constraints */
-	bool		rewrite;		/* T if a rewrite is forced */
-	Oid			newTableSpace;	/* new tablespace; 0 means no change */
-	/* Objects to rebuild after completing ALTER TYPE operations */
-	List	   *changedConstraintOids;	/* OIDs of constraints to rebuild */
-	List	   *changedConstraintDefs;	/* string definitions of same */
-	List	   *changedIndexOids;		/* OIDs of indexes to rebuild */
-	List	   *changedIndexDefs;		/* string definitions of same */
+  /* Information saved before any work commences: */
+  Oid			relid;			/* Relation to work on */
+  char		relkind;		/* Its relkind */
+  TupleDesc	oldDesc;		/* Pre-modification tuple descriptor */
+  /* Information saved by Phase 1 for Phase 2: */
+  List	   *subcmds[AT_NUM_PASSES]; /* Lists of AlterTableCmd */
+  /* Information saved by Phases 1/2 for Phase 3: */
+  List	   *constraints;	/* List of NewConstraint */
+  List	   *newvals;		/* List of NewColumnValue */
+  bool		new_notnull;	/* T if we added new NOT NULL constraints */
+  bool		rewrite;		/* T if a rewrite is forced */
+  Oid			newTableSpace;	/* new tablespace; 0 means no change */
+  /* Objects to rebuild after completing ALTER TYPE operations */
+  List	   *changedConstraintOids;	/* OIDs of constraints to rebuild */
+  List	   *changedConstraintDefs;	/* string definitions of same */
+  List	   *changedIndexOids;		/* OIDs of indexes to rebuild */
+  List	   *changedIndexDefs;		/* string definitions of same */
 } AlteredTableInfo;
 
 /* Struct describing one new constraint to check in Phase 3 scan */
 /* Note: new NOT NULL constraints are handled elsewhere */
 typedef struct NewConstraint
 {
-	char	   *name;			/* Constraint name, or NULL if none */
-	ConstrType	contype;		/* CHECK or FOREIGN */
-	Oid			refrelid;		/* PK rel, if FOREIGN */
-	Oid			refindid;		/* OID of PK's index, if FOREIGN */
-	Oid			conid;			/* OID of pg_constraint entry, if FOREIGN */
-	Node	   *qual;			/* Check expr or CONSTR_FOREIGN Constraint */
-	List	   *qualstate;		/* Execution state for CHECK */
+  char	   *name;			/* Constraint name, or NULL if none */
+  ConstrType	contype;		/* CHECK or FOREIGN */
+  Oid			refrelid;		/* PK rel, if FOREIGN */
+  Oid			refindid;		/* OID of PK's index, if FOREIGN */
+  Oid			conid;			/* OID of pg_constraint entry, if FOREIGN */
+  Node	   *qual;			/* Check expr or CONSTR_FOREIGN Constraint */
+  List	   *qualstate;		/* Execution state for CHECK */
 } NewConstraint;
 
 /*
@@ -176,9 +176,9 @@ typedef struct NewConstraint
  */
 typedef struct NewColumnValue
 {
-	AttrNumber	attnum;			/* which column */
-	Expr	   *expr;			/* expression to compute */
-	ExprState  *exprstate;		/* execution state */
+  AttrNumber	attnum;			/* which column */
+  Expr	   *expr;			/* expression to compute */
+  ExprState  *exprstate;		/* execution state */
 } NewColumnValue;
 
 /*
@@ -186,52 +186,52 @@ typedef struct NewColumnValue
  */
 struct dropmsgstrings
 {
-	char		kind;
-	int			nonexistent_code;
-	const char *nonexistent_msg;
-	const char *skipping_msg;
-	const char *nota_msg;
-	const char *drophint_msg;
+  char		kind;
+  int			nonexistent_code;
+  const char *nonexistent_msg;
+  const char *skipping_msg;
+  const char *nota_msg;
+  const char *drophint_msg;
 };
 
 static const struct dropmsgstrings dropmsgstringarray[] = {
-	{RELKIND_RELATION,
-		ERRCODE_UNDEFINED_TABLE,
-		gettext_noop("table \"%s\" does not exist"),
-		gettext_noop("table \"%s\" does not exist, skipping"),
-		gettext_noop("\"%s\" is not a table"),
-	gettext_noop("Use DROP TABLE to remove a table.")},
-	{RELKIND_SEQUENCE,
-		ERRCODE_UNDEFINED_TABLE,
-		gettext_noop("sequence \"%s\" does not exist"),
-		gettext_noop("sequence \"%s\" does not exist, skipping"),
-		gettext_noop("\"%s\" is not a sequence"),
-	gettext_noop("Use DROP SEQUENCE to remove a sequence.")},
-	{RELKIND_VIEW,
-		ERRCODE_UNDEFINED_TABLE,
-		gettext_noop("view \"%s\" does not exist"),
-		gettext_noop("view \"%s\" does not exist, skipping"),
-		gettext_noop("\"%s\" is not a view"),
-	gettext_noop("Use DROP VIEW to remove a view.")},
-	{RELKIND_INDEX,
-		ERRCODE_UNDEFINED_OBJECT,
-		gettext_noop("index \"%s\" does not exist"),
-		gettext_noop("index \"%s\" does not exist, skipping"),
-		gettext_noop("\"%s\" is not an index"),
-	gettext_noop("Use DROP INDEX to remove an index.")},
-	{RELKIND_COMPOSITE_TYPE,
-		ERRCODE_UNDEFINED_OBJECT,
-		gettext_noop("type \"%s\" does not exist"),
-		gettext_noop("type \"%s\" does not exist, skipping"),
-		gettext_noop("\"%s\" is not a type"),
-	gettext_noop("Use DROP TYPE to remove a type.")},
-	{RELKIND_FOREIGN_TABLE,
-		ERRCODE_UNDEFINED_OBJECT,
-		gettext_noop("foreign table \"%s\" does not exist"),
-		gettext_noop("foreign table \"%s\" does not exist, skipping"),
-		gettext_noop("\"%s\" is not a foreign table"),
-	gettext_noop("Use DROP FOREIGN TABLE to remove a foreign table.")},
-	{'\0', 0, NULL, NULL, NULL, NULL}
+  {RELKIND_RELATION,
+   ERRCODE_UNDEFINED_TABLE,
+   gettext_noop("table \"%s\" does not exist"),
+   gettext_noop("table \"%s\" does not exist, skipping"),
+   gettext_noop("\"%s\" is not a table"),
+   gettext_noop("Use DROP TABLE to remove a table.")},
+  {RELKIND_SEQUENCE,
+   ERRCODE_UNDEFINED_TABLE,
+   gettext_noop("sequence \"%s\" does not exist"),
+   gettext_noop("sequence \"%s\" does not exist, skipping"),
+   gettext_noop("\"%s\" is not a sequence"),
+   gettext_noop("Use DROP SEQUENCE to remove a sequence.")},
+  {RELKIND_VIEW,
+   ERRCODE_UNDEFINED_TABLE,
+   gettext_noop("view \"%s\" does not exist"),
+   gettext_noop("view \"%s\" does not exist, skipping"),
+   gettext_noop("\"%s\" is not a view"),
+   gettext_noop("Use DROP VIEW to remove a view.")},
+  {RELKIND_INDEX,
+   ERRCODE_UNDEFINED_OBJECT,
+   gettext_noop("index \"%s\" does not exist"),
+   gettext_noop("index \"%s\" does not exist, skipping"),
+   gettext_noop("\"%s\" is not an index"),
+   gettext_noop("Use DROP INDEX to remove an index.")},
+  {RELKIND_COMPOSITE_TYPE,
+   ERRCODE_UNDEFINED_OBJECT,
+   gettext_noop("type \"%s\" does not exist"),
+   gettext_noop("type \"%s\" does not exist, skipping"),
+   gettext_noop("\"%s\" is not a type"),
+   gettext_noop("Use DROP TYPE to remove a type.")},
+  {RELKIND_FOREIGN_TABLE,
+   ERRCODE_UNDEFINED_OBJECT,
+   gettext_noop("foreign table \"%s\" does not exist"),
+   gettext_noop("foreign table \"%s\" does not exist, skipping"),
+   gettext_noop("\"%s\" is not a foreign table"),
+   gettext_noop("Use DROP FOREIGN TABLE to remove a foreign table.")},
+  {'\0', 0, NULL, NULL, NULL, NULL}
 };
 
 /* Alter table target-type flags for ATSimplePermissions */
@@ -243,120 +243,120 @@ static const struct dropmsgstrings dropmsgstringarray[] = {
 
 static void truncate_check_rel(Relation rel);
 static List *MergeAttributes(List *schema, List *supers, char relpersistence,
-				List **supOids, List **supconstr, int *supOidCount);
+			     List **supOids, List **supconstr, int *supOidCount);
 static bool MergeCheckConstraint(List *constraints, char *name, Node *expr);
 static bool change_varattnos_walker(Node *node, const AttrNumber *newattno);
 static void MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel);
 static void MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel);
 static void StoreCatalogInheritance(Oid relationId, List *supers);
 static void StoreCatalogInheritance1(Oid relationId, Oid parentOid,
-						 int16 seqNumber, Relation inhRelation);
+				     int16 seqNumber, Relation inhRelation);
 static int	findAttrByName(const char *attributeName, List *schema);
 static void setRelhassubclassInRelation(Oid relationId, bool relhassubclass);
 static void AlterIndexNamespaces(Relation classRel, Relation rel,
-					 Oid oldNspOid, Oid newNspOid);
+				 Oid oldNspOid, Oid newNspOid);
 static void AlterSeqNamespaces(Relation classRel, Relation rel,
-				   Oid oldNspOid, Oid newNspOid,
-				   const char *newNspName, LOCKMODE lockmode);
-static void ATExecValidateConstraint(Relation rel, const char *constrName);
+			       Oid oldNspOid, Oid newNspOid,
+			       const char *newNspName, LOCKMODE lockmode);
+static void ATExecValidateConstraint(Relation rel, char *constrName);
 static int transformColumnNameList(Oid relId, List *colList,
-						int16 *attnums, Oid *atttypids);
+				   int16 *attnums, Oid *atttypids);
 static int transformFkeyGetPrimaryKey(Relation pkrel, Oid *indexOid,
-						   List **attnamelist,
-						   int16 *attnums, Oid *atttypids,
-						   Oid *opclasses);
+				      List **attnamelist,
+				      int16 *attnums, Oid *atttypids,
+				      Oid *opclasses);
 static Oid transformFkeyCheckAttrs(Relation pkrel,
-						int numattrs, int16 *attnums,
-						Oid *opclasses);
+				   int numattrs, int16 *attnums,
+				   Oid *opclasses);
 static void checkFkeyPermissions(Relation rel, int16 *attnums, int natts);
 static void validateForeignKeyConstraint(char *conname,
-							 Relation rel, Relation pkrel,
-							 Oid pkindOid, Oid constraintOid);
+					 Relation rel, Relation pkrel,
+					 Oid pkindOid, Oid constraintOid);
 static void createForeignKeyTriggers(Relation rel, Constraint *fkconstraint,
-						 Oid constraintOid, Oid indexOid);
+				     Oid constraintOid, Oid indexOid);
 static void ATController(Relation rel, List *cmds, bool recurse, LOCKMODE lockmode);
 static void ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
-		  bool recurse, bool recursing, LOCKMODE lockmode);
+		      bool recurse, bool recursing, LOCKMODE lockmode);
 static void ATRewriteCatalogs(List **wqueue, LOCKMODE lockmode);
 static void ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
-		  AlterTableCmd *cmd, LOCKMODE lockmode);
+		      AlterTableCmd *cmd, LOCKMODE lockmode);
 static void ATRewriteTables(List **wqueue, LOCKMODE lockmode);
 static void ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode);
 static AlteredTableInfo *ATGetQueueEntry(List **wqueue, Relation rel);
 static void ATSimplePermissions(Relation rel, int allowed_targets);
 static void ATWrongRelkindError(Relation rel, int allowed_targets);
 static void ATSimpleRecursion(List **wqueue, Relation rel,
-				  AlterTableCmd *cmd, bool recurse, LOCKMODE lockmode);
+			      AlterTableCmd *cmd, bool recurse, LOCKMODE lockmode);
 static void ATTypedTableRecursion(List **wqueue, Relation rel, AlterTableCmd *cmd,
-					  LOCKMODE lockmode);
+				  LOCKMODE lockmode);
 static List *find_typed_table_dependencies(Oid typeOid, const char *typeName,
-							  DropBehavior behavior);
+					   DropBehavior behavior);
 static void ATPrepAddColumn(List **wqueue, Relation rel, bool recurse, bool recursing,
-				AlterTableCmd *cmd, LOCKMODE lockmode);
+			    AlterTableCmd *cmd, LOCKMODE lockmode);
 static void ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
-				ColumnDef *colDef, bool isOid,
-				bool recurse, bool recursing, LOCKMODE lockmode);
+			    ColumnDef *colDef, bool isOid,
+			    bool recurse, bool recursing, LOCKMODE lockmode);
 static void add_column_datatype_dependency(Oid relid, int32 attnum, Oid typid);
 static void add_column_collation_dependency(Oid relid, int32 attnum, Oid collid);
 static void ATPrepAddOids(List **wqueue, Relation rel, bool recurse,
 			  AlterTableCmd *cmd, LOCKMODE lockmode);
 static void ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode);
 static void ATExecSetNotNull(AlteredTableInfo *tab, Relation rel,
-				 const char *colName, LOCKMODE lockmode);
+			     const char *colName, LOCKMODE lockmode);
 static void ATExecColumnDefault(Relation rel, const char *colName,
-					Node *newDefault, LOCKMODE lockmode);
+				Node *newDefault, LOCKMODE lockmode);
 static void ATPrepSetStatistics(Relation rel, const char *colName,
-					Node *newValue, LOCKMODE lockmode);
+				Node *newValue, LOCKMODE lockmode);
 static void ATExecSetStatistics(Relation rel, const char *colName,
-					Node *newValue, LOCKMODE lockmode);
+				Node *newValue, LOCKMODE lockmode);
 static void ATExecSetOptions(Relation rel, const char *colName,
-				 Node *options, bool isReset, LOCKMODE lockmode);
+			     Node *options, bool isReset, LOCKMODE lockmode);
 static void ATExecSetStorage(Relation rel, const char *colName,
-				 Node *newValue, LOCKMODE lockmode);
+			     Node *newValue, LOCKMODE lockmode);
 static void ATPrepDropColumn(List **wqueue, Relation rel, bool recurse, bool recursing,
-				 AlterTableCmd *cmd, LOCKMODE lockmode);
+			     AlterTableCmd *cmd, LOCKMODE lockmode);
 static void ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
-				 DropBehavior behavior,
-				 bool recurse, bool recursing,
-				 bool missing_ok, LOCKMODE lockmode);
+			     DropBehavior behavior,
+			     bool recurse, bool recursing,
+			     bool missing_ok, LOCKMODE lockmode);
 static void ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
 			   IndexStmt *stmt, bool is_rebuild, LOCKMODE lockmode);
 static void ATExecAddConstraint(List **wqueue,
-					AlteredTableInfo *tab, Relation rel,
-				 Constraint *newConstraint, bool recurse, LOCKMODE lockmode);
+				AlteredTableInfo *tab, Relation rel,
+				Constraint *newConstraint, bool recurse, LOCKMODE lockmode);
 static void ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
-						 IndexStmt *stmt, LOCKMODE lockmode);
+				     IndexStmt *stmt, LOCKMODE lockmode);
 static void ATAddCheckConstraint(List **wqueue,
-					 AlteredTableInfo *tab, Relation rel,
-					 Constraint *constr,
-					 bool recurse, bool recursing, LOCKMODE lockmode);
+				 AlteredTableInfo *tab, Relation rel,
+				 Constraint *constr,
+				 bool recurse, bool recursing, LOCKMODE lockmode);
 static void ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
-						  Constraint *fkconstraint, LOCKMODE lockmode);
+				      Constraint *fkconstraint, LOCKMODE lockmode);
 static void ATExecDropConstraint(Relation rel, const char *constrName,
-					 DropBehavior behavior,
-					 bool recurse, bool recursing,
-					 bool missing_ok, LOCKMODE lockmode);
+				 DropBehavior behavior,
+				 bool recurse, bool recursing,
+				 bool missing_ok, LOCKMODE lockmode);
 static void ATPrepAlterColumnType(List **wqueue,
-					  AlteredTableInfo *tab, Relation rel,
-					  bool recurse, bool recursing,
-					  AlterTableCmd *cmd, LOCKMODE lockmode);
+				  AlteredTableInfo *tab, Relation rel,
+				  bool recurse, bool recursing,
+				  AlterTableCmd *cmd, LOCKMODE lockmode);
 static bool ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno);
 static void ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
-					  AlterTableCmd *cmd, LOCKMODE lockmode);
+				  AlterTableCmd *cmd, LOCKMODE lockmode);
 static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode);
 static void ATPostAlterTypeParse(char *cmd, List **wqueue, LOCKMODE lockmode);
 static void change_owner_recurse_to_sequences(Oid relationOid,
-								  Oid newOwnerId, LOCKMODE lockmode);
+					      Oid newOwnerId, LOCKMODE lockmode);
 static void ATExecClusterOn(Relation rel, const char *indexName, LOCKMODE lockmode);
 static void ATExecDropCluster(Relation rel, LOCKMODE lockmode);
 static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel,
-					char *tablespacename, LOCKMODE lockmode);
+				char *tablespacename, LOCKMODE lockmode);
 static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode);
 static void ATExecSetRelOptions(Relation rel, List *defList, bool isReset, LOCKMODE lockmode);
 static void ATExecEnableDisableTrigger(Relation rel, char *trigname,
-					   char fires_when, bool skip_system, LOCKMODE lockmode);
+				       char fires_when, bool skip_system, LOCKMODE lockmode);
 static void ATExecEnableDisableRule(Relation rel, char *rulename,
-						char fires_when, LOCKMODE lockmode);
+				    char fires_when, LOCKMODE lockmode);
 static void ATPrepAddInherit(Relation child_rel);
 static void ATExecAddInherit(Relation child_rel, RangeVar *parent, LOCKMODE lockmode);
 static void ATExecDropInherit(Relation rel, RangeVar *parent, LOCKMODE lockmode);
@@ -366,7 +366,7 @@ static void ATExecDropOf(Relation rel, LOCKMODE lockmode);
 static void ATExecGenericOptions(Relation rel, List *options);
 
 static void copy_relation_data(SMgrRelation rel, SMgrRelation dst,
-				   ForkNumber forkNum, char relpersistence);
+			       ForkNumber forkNum, char relpersistence);
 static const char *storage_name(char c);
 
 
@@ -390,246 +390,244 @@ static const char *storage_name(char c);
 Oid
 DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId)
 {
-	char		relname[NAMEDATALEN];
-	Oid			namespaceId;
-	List	   *schema = stmt->tableElts;
-	Oid			relationId;
-	Oid			tablespaceId;
-	Relation	rel;
-	TupleDesc	descriptor;
-	List	   *inheritOids;
-	List	   *old_constraints;
-	bool		localHasOids;
-	int			parentOidCount;
-	List	   *rawDefaults;
-	List	   *cookedDefaults;
-	Datum		reloptions;
-	ListCell   *listptr;
-	AttrNumber	attnum;
-	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
-	Oid			ofTypeId;
-
-	/*
-	 * Truncate relname to appropriate length (probably a waste of time, as
-	 * parser should have done this already).
-	 */
-	StrNCpy(relname, stmt->relation->relname, NAMEDATALEN);
-
-	/*
-	 * Check consistency of arguments
-	 */
-	if (stmt->oncommit != ONCOMMIT_NOOP
-		&& stmt->relation->relpersistence != RELPERSISTENCE_TEMP)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("ON COMMIT can only be used on temporary tables")));
-	if (stmt->constraints != NIL && relkind == RELKIND_FOREIGN_TABLE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("constraints on foreign tables are not supported")));
-
-	/*
-	 * Security check: disallow creating temp tables from security-restricted
-	 * code.  This is needed because calling code might not expect untrusted
-	 * tables to appear in pg_temp at the front of its search path.
-	 */
-	if (stmt->relation->relpersistence == RELPERSISTENCE_TEMP
-		&& InSecurityRestrictedOperation())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("cannot create temporary table within security-restricted operation")));
-
-	/*
-	 * Look up the namespace in which we are supposed to create the relation,
-	 * and check we have permission to create there.
-	 */
-	namespaceId = RangeVarGetAndCheckCreationNamespace(stmt->relation);
-
-	/*
-	 * Select tablespace to use.  If not specified, use default tablespace
-	 * (which may in turn default to database's default).
-	 */
-	if (stmt->tablespacename)
-	{
-		tablespaceId = get_tablespace_oid(stmt->tablespacename, false);
-	}
-	else
-	{
-		tablespaceId = GetDefaultTablespace(stmt->relation->relpersistence);
-		/* note InvalidOid is OK in this case */
-	}
-
-	/* Check permissions except when using database's default */
-	if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
-	{
-		AclResult	aclresult;
-
-		aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(),
-										   ACL_CREATE);
-		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
-						   get_tablespace_name(tablespaceId));
-	}
-
-	/* In all cases disallow placing user relations in pg_global */
-	if (tablespaceId == GLOBALTABLESPACE_OID)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("only shared relations can be placed in pg_global tablespace")));
-
-	/* Identify user ID that will own the table */
-	if (!OidIsValid(ownerId))
-		ownerId = GetUserId();
-
-	/*
-	 * Parse and validate reloptions, if any.
-	 */
-	reloptions = transformRelOptions((Datum) 0, stmt->options, NULL, validnsps,
-									 true, false);
-
-	(void) heap_reloptions(relkind, reloptions, true);
-
-	if (stmt->ofTypename)
-		ofTypeId = typenameTypeId(NULL, stmt->ofTypename);
-	else
-		ofTypeId = InvalidOid;
-
-	/*
-	 * Look up inheritance ancestors and generate relation schema, including
-	 * inherited attributes.
-	 */
-	schema = MergeAttributes(schema, stmt->inhRelations,
-							 stmt->relation->relpersistence,
-							 &inheritOids, &old_constraints, &parentOidCount);
-
-	/*
-	 * Create a tuple descriptor from the relation schema.	Note that this
-	 * deals with column names, types, and NOT NULL constraints, but not
-	 * default values or CHECK constraints; we handle those below.
-	 */
-	descriptor = BuildDescForRelation(schema);
-
-	localHasOids = interpretOidsOption(stmt->options);
-	descriptor->tdhasoid = (localHasOids || parentOidCount > 0);
-
-	/*
-	 * Find columns with default values and prepare for insertion of the
-	 * defaults.  Pre-cooked (that is, inherited) defaults go into a list of
-	 * CookedConstraint structs that we'll pass to heap_create_with_catalog,
-	 * while raw defaults go into a list of RawColumnDefault structs that will
-	 * be processed by AddRelationNewConstraints.  (We can't deal with raw
-	 * expressions until we can do transformExpr.)
-	 *
-	 * We can set the atthasdef flags now in the tuple descriptor; this just
-	 * saves StoreAttrDefault from having to do an immediate update of the
-	 * pg_attribute rows.
-	 */
-	rawDefaults = NIL;
-	cookedDefaults = NIL;
-	attnum = 0;
-
-	foreach(listptr, schema)
-	{
-		ColumnDef  *colDef = lfirst(listptr);
-
-		attnum++;
-
-		if (colDef->raw_default != NULL)
-		{
-			RawColumnDefault *rawEnt;
-
-			if (relkind == RELKIND_FOREIGN_TABLE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("default values on foreign tables are not supported")));
-
-			Assert(colDef->cooked_default == NULL);
-
-			rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
-			rawEnt->attnum = attnum;
-			rawEnt->raw_default = colDef->raw_default;
-			rawDefaults = lappend(rawDefaults, rawEnt);
-			descriptor->attrs[attnum - 1]->atthasdef = true;
-		}
-		else if (colDef->cooked_default != NULL)
-		{
-			CookedConstraint *cooked;
-
-			cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
-			cooked->contype = CONSTR_DEFAULT;
-			cooked->name = NULL;
-			cooked->attnum = attnum;
-			cooked->expr = colDef->cooked_default;
-			cooked->is_local = true;	/* not used for defaults */
-			cooked->inhcount = 0;		/* ditto */
-			cookedDefaults = lappend(cookedDefaults, cooked);
-			descriptor->attrs[attnum - 1]->atthasdef = true;
-		}
-	}
-
-	/*
-	 * Create the relation.  Inherited defaults and constraints are passed in
-	 * for immediate handling --- since they don't need parsing, they can be
-	 * stored immediately.
-	 */
-	relationId = heap_create_with_catalog(relname,
-										  namespaceId,
-										  tablespaceId,
-										  InvalidOid,
-										  InvalidOid,
-										  ofTypeId,
-										  ownerId,
-										  descriptor,
-										  list_concat(cookedDefaults,
-													  old_constraints),
-										  relkind,
-										  stmt->relation->relpersistence,
-										  false,
-										  false,
-										  localHasOids,
-										  parentOidCount,
-										  stmt->oncommit,
-										  reloptions,
-										  true,
-										  allowSystemTableMods);
-
-	/* Store inheritance information for new rel. */
-	StoreCatalogInheritance(relationId, inheritOids);
-
-	/*
-	 * We must bump the command counter to make the newly-created relation
-	 * tuple visible for opening.
-	 */
-	CommandCounterIncrement();
-
-	/*
-	 * Open the new relation and acquire exclusive lock on it.	This isn't
-	 * really necessary for locking out other backends (since they can't see
-	 * the new rel anyway until we commit), but it keeps the lock manager from
-	 * complaining about deadlock risks.
-	 */
-	rel = relation_open(relationId, AccessExclusiveLock);
-
-	/*
-	 * Now add any newly specified column default values and CHECK constraints
-	 * to the new relation.  These are passed to us in the form of raw
-	 * parsetrees; we need to transform them to executable expression trees
-	 * before they can be added. The most convenient way to do that is to
-	 * apply the parser's transformExpr routine, but transformExpr doesn't
-	 * work unless we have a pre-existing relation. So, the transformation has
-	 * to be postponed to this final step of CREATE TABLE.
-	 */
-	if (rawDefaults || stmt->constraints)
-		AddRelationNewConstraints(rel, rawDefaults, stmt->constraints,
-								  true, true);
-
-	/*
-	 * Clean up.  We keep lock on new relation (although it shouldn't be
-	 * visible to anyone else anyway, until commit).
-	 */
-	relation_close(rel, NoLock);
-
-	return relationId;
+  char		relname[NAMEDATALEN];
+  Oid			namespaceId;
+  List	   *schema = stmt->tableElts;
+  Oid			relationId;
+  Oid			tablespaceId;
+  Relation	rel;
+  TupleDesc	descriptor;
+  List	   *inheritOids;
+  List	   *old_constraints;
+  bool		localHasOids;
+  int			parentOidCount;
+  List	   *rawDefaults;
+  List	   *cookedDefaults;
+  Datum		reloptions;
+  ListCell   *listptr;
+  AttrNumber	attnum;
+  static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
+  Oid			ofTypeId;
+  /*
+   * Truncate relname to appropriate length (probably a waste of time, as
+   * parser should have done this already).
+   */
+  StrNCpy(relname, stmt->relation->relname, NAMEDATALEN);
+
+  /*
+   * Check consistency of arguments
+   */
+  if (stmt->oncommit != ONCOMMIT_NOOP
+      && stmt->relation->relpersistence != RELPERSISTENCE_TEMP)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("ON COMMIT can only be used on temporary tables")));
+  if (stmt->constraints != NIL && relkind == RELKIND_FOREIGN_TABLE)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("constraints on foreign tables are not supported")));
+
+  /*
+   * Look up the namespace in which we are supposed to create the relation,
+   * and check we have permission to create there.
+   */
+  namespaceId = RangeVarGetAndCheckCreationNamespace(stmt->relation);
+  RangeVarAdjustRelationPersistence(stmt->relation, namespaceId);
+
+  /*
+   * Security check: disallow creating temp tables from security-restricted
+   * code.  This is needed because calling code might not expect untrusted
+   * tables to appear in pg_temp at the front of its search path.
+   */
+  if (stmt->relation->relpersistence == RELPERSISTENCE_TEMP
+      && InSecurityRestrictedOperation())
+    ereport(ERROR,
+	    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+	     errmsg("cannot create temporary table within security-restricted operation")));
+
+  /*
+   * Select tablespace to use.  If not specified, use default tablespace
+   * (which may in turn default to database's default).
+   */
+  if (stmt->tablespacename)
+    {
+      tablespaceId = get_tablespace_oid(stmt->tablespacename, false);
+    }
+  else
+    {
+      tablespaceId = GetDefaultTablespace(stmt->relation->relpersistence);
+      /* note InvalidOid is OK in this case */
+    }
+
+  /* Check permissions except when using database's default */
+  if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
+    {
+      AclResult	aclresult;
+
+      aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(),
+					 ACL_CREATE);
+      if (aclresult != ACLCHECK_OK)
+	aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+		       get_tablespace_name(tablespaceId));
+    }
+
+  /* In all cases disallow placing user relations in pg_global */
+  if (tablespaceId == GLOBALTABLESPACE_OID)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+	     errmsg("only shared relations can be placed in pg_global tablespace")));
+
+  /* Identify user ID that will own the table */
+  if (!OidIsValid(ownerId))
+    ownerId = GetUserId();
+
+  /*
+   * Parse and validate reloptions, if any.
+   */
+  reloptions = transformRelOptions((Datum) 0, stmt->options, NULL, validnsps,
+				   true, false);
+
+  (void) heap_reloptions(relkind, reloptions, true);
+
+  if (stmt->ofTypename)
+    ofTypeId = typenameTypeId(NULL, stmt->ofTypename);
+  else
+    ofTypeId = InvalidOid;
+
+  /*
+   * Look up inheritance ancestors and generate relation schema, including
+   * inherited attributes.
+   */
+  schema = MergeAttributes(schema, stmt->inhRelations,
+			   stmt->relation->relpersistence,
+			   &inheritOids, &old_constraints, &parentOidCount);
+
+  /*
+   * Create a tuple descriptor from the relation schema.	Note that this
+   * deals with column names, types, and NOT NULL constraints, but not
+   * default values or CHECK constraints; we handle those below.
+   */
+  descriptor = BuildDescForRelation(schema);
+
+  localHasOids = interpretOidsOption(stmt->options);
+  descriptor->tdhasoid = (localHasOids || parentOidCount > 0);
+
+  /*
+   * Find columns with default values and prepare for insertion of the
+   * defaults.  Pre-cooked (that is, inherited) defaults go into a list of
+   * CookedConstraint structs that we'll pass to heap_create_with_catalog,
+   * while raw defaults go into a list of RawColumnDefault structs that will
+   * be processed by AddRelationNewConstraints.  (We can't deal with raw
+   * expressions until we can do transformExpr.)
+   *
+   * We can set the atthasdef flags now in the tuple descriptor; this just
+   * saves StoreAttrDefault from having to do an immediate update of the
+   * pg_attribute rows.
+   */
+  rawDefaults = NIL;
+  cookedDefaults = NIL;
+  attnum = 0;
+
+  foreach(listptr, schema)
+    {
+      ColumnDef  *colDef = lfirst(listptr);
+
+      attnum++;
+
+      if (colDef->raw_default != NULL)
+	{
+	  RawColumnDefault *rawEnt;
+
+	  if (relkind == RELKIND_FOREIGN_TABLE)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		     errmsg("default values on foreign tables are not supported")));
+
+	  Assert(colDef->cooked_default == NULL);
+
+	  rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
+	  rawEnt->attnum = attnum;
+	  rawEnt->raw_default = colDef->raw_default;
+	  rawDefaults = lappend(rawDefaults, rawEnt);
+	  descriptor->attrs[attnum - 1]->atthasdef = true;
+	}
+      else if (colDef->cooked_default != NULL)
+	{
+	  CookedConstraint *cooked;
+
+	  cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
+	  cooked->contype = CONSTR_DEFAULT;
+	  cooked->name = NULL;
+	  cooked->attnum = attnum;
+	  cooked->expr = colDef->cooked_default;
+	  cooked->is_local = true;	/* not used for defaults */
+	  cooked->inhcount = 0;		/* ditto */
+	  cookedDefaults = lappend(cookedDefaults, cooked);
+	  descriptor->attrs[attnum - 1]->atthasdef = true;
+	}
+    }
+  /*
+   * Create the relation.  Inherited defaults and constraints are passed in
+   * for immediate handling --- since they don't need parsing, they can be
+   * stored immediately.
+   */
+  relationId = heap_create_with_catalog(relname,
+					namespaceId,
+					tablespaceId,
+					InvalidOid,
+					InvalidOid,
+					ofTypeId,
+					ownerId,
+					descriptor,
+					list_concat(cookedDefaults,
+						    old_constraints),
+					relkind,
+					stmt->relation->relpersistence,
+					false,
+					false,
+					localHasOids,
+					parentOidCount,
+					stmt->oncommit,
+					reloptions,
+					true,
+					allowSystemTableMods);
+  /* Store inheritance information for new rel. */
+  StoreCatalogInheritance(relationId, inheritOids);
+
+  /*
+   * We must bump the command counter to make the newly-created relation
+   * tuple visible for opening.
+   */
+  CommandCounterIncrement();
+
+  /*
+   * Open the new relation and acquire exclusive lock on it.	This isn't
+   * really necessary for locking out other backends (since they can't see
+   * the new rel anyway until we commit), but it keeps the lock manager from
+   * complaining about deadlock risks.
+   */
+  rel = relation_open(relationId, AccessExclusiveLock);
+
+  /*
+   * Now add any newly specified column default values and CHECK constraints
+   * to the new relation.  These are passed to us in the form of raw
+   * parsetrees; we need to transform them to executable expression trees
+   * before they can be added. The most convenient way to do that is to
+   * apply the parser's transformExpr routine, but transformExpr doesn't
+   * work unless we have a pre-existing relation. So, the transformation has
+   * to be postponed to this final step of CREATE TABLE.
+   */
+  if (rawDefaults || stmt->constraints)
+    AddRelationNewConstraints(rel, rawDefaults, stmt->constraints,
+			      true, true);
+
+  /*
+   * Clean up.  We keep lock on new relation (although it shouldn't be
+   * visible to anyone else anyway, until commit).
+   */
+  relation_close(rel, NoLock);
+
+  return relationId;
 }
 
 /*
@@ -639,27 +637,27 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId)
 static void
 DropErrorMsgNonExistent(const char *relname, char rightkind, bool missing_ok)
 {
-	const struct dropmsgstrings *rentry;
-
-	for (rentry = dropmsgstringarray; rentry->kind != '\0'; rentry++)
-	{
-		if (rentry->kind == rightkind)
-		{
-			if (!missing_ok)
-			{
-				ereport(ERROR,
-						(errcode(rentry->nonexistent_code),
-						 errmsg(rentry->nonexistent_msg, relname)));
-			}
-			else
-			{
-				ereport(NOTICE, (errmsg(rentry->skipping_msg, relname)));
-				break;
-			}
-		}
-	}
-
-	Assert(rentry->kind != '\0');		/* Should be impossible */
+  const struct dropmsgstrings *rentry;
+
+  for (rentry = dropmsgstringarray; rentry->kind != '\0'; rentry++)
+    {
+      if (rentry->kind == rightkind)
+	{
+	  if (!missing_ok)
+	    {
+	      ereport(ERROR,
+		      (errcode(rentry->nonexistent_code),
+		       errmsg(rentry->nonexistent_msg, relname)));
+	    }
+	  else
+	    {
+	      ereport(NOTICE, (errmsg(rentry->skipping_msg, relname)));
+	      break;
+	    }
+	}
+    }
+
+  Assert(rentry->kind != '\0');		/* Should be impossible */
 }
 
 /*
@@ -669,29 +667,29 @@ DropErrorMsgNonExistent(const char *relname, char rightkind, bool missing_ok)
 static void
 DropErrorMsgWrongType(const char *relname, char wrongkind, char rightkind)
 {
-	const struct dropmsgstrings *rentry;
-	const struct dropmsgstrings *wentry;
-
-	for (rentry = dropmsgstringarray; rentry->kind != '\0'; rentry++)
-		if (rentry->kind == rightkind)
-			break;
-	Assert(rentry->kind != '\0');
-
-	for (wentry = dropmsgstringarray; wentry->kind != '\0'; wentry++)
-		if (wentry->kind == wrongkind)
-			break;
-	/* wrongkind could be something we don't have in our table... */
-
-	ereport(ERROR,
-			(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			 errmsg(rentry->nota_msg, relname),
+  const struct dropmsgstrings *rentry;
+  const struct dropmsgstrings *wentry;
+
+  for (rentry = dropmsgstringarray; rentry->kind != '\0'; rentry++)
+    if (rentry->kind == rightkind)
+      break;
+  Assert(rentry->kind != '\0');
+
+  for (wentry = dropmsgstringarray; wentry->kind != '\0'; wentry++)
+    if (wentry->kind == wrongkind)
+      break;
+  /* wrongkind could be something we don't have in our table... */
+
+  ereport(ERROR,
+	  (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	   errmsg(rentry->nota_msg, relname),
 	   (wentry->kind != '\0') ? errhint("%s", _(wentry->drophint_msg)) : 0));
 }
 
 /*
  * RemoveRelations
  *		Implements DROP TABLE, DROP INDEX, DROP SEQUENCE, DROP VIEW,
- *		DROP FOREIGN TABLE
+ *		DROP FOREIGN TABLE, DROP 
  */
 void
 RemoveRelations(DropStmt *drop)
@@ -725,12 +723,16 @@ RemoveRelations(DropStmt *drop)
 			relkind = RELKIND_VIEW;
 			break;
 
+        case OBJECT_MAT_VIEW:
+                relkind = RELKIND_MAT_VIEW;
+                break;
+
 		case OBJECT_FOREIGN_TABLE:
 			relkind = RELKIND_FOREIGN_TABLE;
 			break;
 
 		default:
-			elog(ERROR, "unrecognized drop object type: %d",
+			elog(ERROR, "(tablecmds.c:738 unrecognized drop object type: %d",
 				 (int) drop->removeType);
 			relkind = 0;		/* keep compiler quiet */
 			break;
@@ -812,19 +814,19 @@ RemoveRelations(DropStmt *drop)
 					 errmsg("permission denied: \"%s\" is a system catalog",
 							rel->relname)));
 
-		/* OK, we're ready to delete this one */
-		obj.classId = RelationRelationId;
-		obj.objectId = relOid;
-		obj.objectSubId = 0;
+      /* OK, we're ready to delete this one */
+      obj.classId = RelationRelationId;
+      obj.objectId = relOid;
+      obj.objectSubId = 0;
 
-		add_exact_object_address(&obj, objects);
+      add_exact_object_address(&obj, objects);
 
-		ReleaseSysCache(tuple);
-	}
+      ReleaseSysCache(tuple);
+    }
 
-	performMultipleDeletions(objects, drop->behavior);
+  performMultipleDeletions(objects, drop->behavior);
 
-	free_object_addresses(objects);
+  free_object_addresses(objects);
 }
 
 /*
@@ -842,275 +844,275 @@ RemoveRelations(DropStmt *drop)
 void
 ExecuteTruncate(TruncateStmt *stmt)
 {
-	List	   *rels = NIL;
-	List	   *relids = NIL;
-	List	   *seq_relids = NIL;
-	EState	   *estate;
-	ResultRelInfo *resultRelInfos;
-	ResultRelInfo *resultRelInfo;
-	SubTransactionId mySubid;
-	ListCell   *cell;
-
-	/*
-	 * Open, exclusive-lock, and check all the explicitly-specified relations
-	 */
-	foreach(cell, stmt->relations)
-	{
-		RangeVar   *rv = lfirst(cell);
-		Relation	rel;
-		bool		recurse = interpretInhOption(rv->inhOpt);
-		Oid			myrelid;
-
-		rel = heap_openrv(rv, AccessExclusiveLock);
-		myrelid = RelationGetRelid(rel);
-		/* don't throw error for "TRUNCATE foo, foo" */
-		if (list_member_oid(relids, myrelid))
-		{
-			heap_close(rel, AccessExclusiveLock);
-			continue;
-		}
-		truncate_check_rel(rel);
-		rels = lappend(rels, rel);
-		relids = lappend_oid(relids, myrelid);
-
-		if (recurse)
-		{
-			ListCell   *child;
-			List	   *children;
-
-			children = find_all_inheritors(myrelid, AccessExclusiveLock, NULL);
-
-			foreach(child, children)
-			{
-				Oid			childrelid = lfirst_oid(child);
-
-				if (list_member_oid(relids, childrelid))
-					continue;
-
-				/* find_all_inheritors already got lock */
-				rel = heap_open(childrelid, NoLock);
-				truncate_check_rel(rel);
-				rels = lappend(rels, rel);
-				relids = lappend_oid(relids, childrelid);
-			}
-		}
-	}
-
-	/*
-	 * In CASCADE mode, suck in all referencing relations as well.	This
-	 * requires multiple iterations to find indirectly-dependent relations. At
-	 * each phase, we need to exclusive-lock new rels before looking for their
-	 * dependencies, else we might miss something.	Also, we check each rel as
-	 * soon as we open it, to avoid a faux pas such as holding lock for a long
-	 * time on a rel we have no permissions for.
-	 */
-	if (stmt->behavior == DROP_CASCADE)
-	{
-		for (;;)
-		{
-			List	   *newrelids;
-
-			newrelids = heap_truncate_find_FKs(relids);
-			if (newrelids == NIL)
-				break;			/* nothing else to add */
-
-			foreach(cell, newrelids)
-			{
-				Oid			relid = lfirst_oid(cell);
-				Relation	rel;
-
-				rel = heap_open(relid, AccessExclusiveLock);
-				ereport(NOTICE,
-						(errmsg("truncate cascades to table \"%s\"",
-								RelationGetRelationName(rel))));
-				truncate_check_rel(rel);
-				rels = lappend(rels, rel);
-				relids = lappend_oid(relids, relid);
-			}
-		}
-	}
-
-	/*
-	 * Check foreign key references.  In CASCADE mode, this should be
-	 * unnecessary since we just pulled in all the references; but as a
-	 * cross-check, do it anyway if in an Assert-enabled build.
-	 */
+  List	   *rels = NIL;
+  List	   *relids = NIL;
+  List	   *seq_relids = NIL;
+  EState	   *estate;
+  ResultRelInfo *resultRelInfos;
+  ResultRelInfo *resultRelInfo;
+  SubTransactionId mySubid;
+  ListCell   *cell;
+
+  /*
+   * Open, exclusive-lock, and check all the explicitly-specified relations
+   */
+  foreach(cell, stmt->relations)
+    {
+      RangeVar   *rv = lfirst(cell);
+      Relation	rel;
+      bool		recurse = interpretInhOption(rv->inhOpt);
+      Oid			myrelid;
+
+      rel = heap_openrv(rv, AccessExclusiveLock);
+      myrelid = RelationGetRelid(rel);
+      /* don't throw error for "TRUNCATE foo, foo" */
+      if (list_member_oid(relids, myrelid))
+	{
+	  heap_close(rel, AccessExclusiveLock);
+	  continue;
+	}
+      truncate_check_rel(rel);
+      rels = lappend(rels, rel);
+      relids = lappend_oid(relids, myrelid);
+
+      if (recurse)
+	{
+	  ListCell   *child;
+	  List	   *children;
+
+	  children = find_all_inheritors(myrelid, AccessExclusiveLock, NULL);
+
+	  foreach(child, children)
+	    {
+	      Oid			childrelid = lfirst_oid(child);
+
+	      if (list_member_oid(relids, childrelid))
+		continue;
+
+	      /* find_all_inheritors already got lock */
+	      rel = heap_open(childrelid, NoLock);
+	      truncate_check_rel(rel);
+	      rels = lappend(rels, rel);
+	      relids = lappend_oid(relids, childrelid);
+	    }
+	}
+    }
+
+  /*
+   * In CASCADE mode, suck in all referencing relations as well.	This
+   * requires multiple iterations to find indirectly-dependent relations. At
+   * each phase, we need to exclusive-lock new rels before looking for their
+   * dependencies, else we might miss something.	Also, we check each rel as
+   * soon as we open it, to avoid a faux pas such as holding lock for a long
+   * time on a rel we have no permissions for.
+   */
+  if (stmt->behavior == DROP_CASCADE)
+    {
+      for (;;)
+	{
+	  List	   *newrelids;
+
+	  newrelids = heap_truncate_find_FKs(relids);
+	  if (newrelids == NIL)
+	    break;			/* nothing else to add */
+
+	  foreach(cell, newrelids)
+	    {
+	      Oid			relid = lfirst_oid(cell);
+	      Relation	rel;
+
+	      rel = heap_open(relid, AccessExclusiveLock);
+	      ereport(NOTICE,
+		      (errmsg("truncate cascades to table \"%s\"",
+			      RelationGetRelationName(rel))));
+	      truncate_check_rel(rel);
+	      rels = lappend(rels, rel);
+	      relids = lappend_oid(relids, relid);
+	    }
+	}
+    }
+
+  /*
+   * Check foreign key references.  In CASCADE mode, this should be
+   * unnecessary since we just pulled in all the references; but as a
+   * cross-check, do it anyway if in an Assert-enabled build.
+   */
 #ifdef USE_ASSERT_CHECKING
-	heap_truncate_check_FKs(rels, false);
+  heap_truncate_check_FKs(rels, false);
 #else
-	if (stmt->behavior == DROP_RESTRICT)
-		heap_truncate_check_FKs(rels, false);
+  if (stmt->behavior == DROP_RESTRICT)
+    heap_truncate_check_FKs(rels, false);
 #endif
 
-	/*
-	 * If we are asked to restart sequences, find all the sequences, lock them
-	 * (we need AccessExclusiveLock for ResetSequence), and check permissions.
-	 * We want to do this early since it's pointless to do all the truncation
-	 * work only to fail on sequence permissions.
-	 */
-	if (stmt->restart_seqs)
-	{
-		foreach(cell, rels)
-		{
-			Relation	rel = (Relation) lfirst(cell);
-			List	   *seqlist = getOwnedSequences(RelationGetRelid(rel));
-			ListCell   *seqcell;
-
-			foreach(seqcell, seqlist)
-			{
-				Oid			seq_relid = lfirst_oid(seqcell);
-				Relation	seq_rel;
-
-				seq_rel = relation_open(seq_relid, AccessExclusiveLock);
-
-				/* This check must match AlterSequence! */
-				if (!pg_class_ownercheck(seq_relid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
-								   RelationGetRelationName(seq_rel));
-
-				seq_relids = lappend_oid(seq_relids, seq_relid);
-
-				relation_close(seq_rel, NoLock);
-			}
-		}
-	}
-
-	/* Prepare to catch AFTER triggers. */
-	AfterTriggerBeginQuery();
-
-	/*
-	 * To fire triggers, we'll need an EState as well as a ResultRelInfo for
-	 * each relation.  We don't need to call ExecOpenIndices, though.
-	 */
-	estate = CreateExecutorState();
-	resultRelInfos = (ResultRelInfo *)
-		palloc(list_length(rels) * sizeof(ResultRelInfo));
-	resultRelInfo = resultRelInfos;
-	foreach(cell, rels)
-	{
-		Relation	rel = (Relation) lfirst(cell);
-
-		InitResultRelInfo(resultRelInfo,
-						  rel,
-						  0,	/* dummy rangetable index */
-						  0);
-		resultRelInfo++;
-	}
-	estate->es_result_relations = resultRelInfos;
-	estate->es_num_result_relations = list_length(rels);
-
-	/*
-	 * Process all BEFORE STATEMENT TRUNCATE triggers before we begin
-	 * truncating (this is because one of them might throw an error). Also, if
-	 * we were to allow them to prevent statement execution, that would need
-	 * to be handled here.
-	 */
-	resultRelInfo = resultRelInfos;
-	foreach(cell, rels)
-	{
-		estate->es_result_relation_info = resultRelInfo;
-		ExecBSTruncateTriggers(estate, resultRelInfo);
-		resultRelInfo++;
-	}
-
-	/*
-	 * OK, truncate each table.
-	 */
-	mySubid = GetCurrentSubTransactionId();
-
-	foreach(cell, rels)
-	{
-		Relation	rel = (Relation) lfirst(cell);
-
-		/*
-		 * Normally, we need a transaction-safe truncation here.  However, if
-		 * the table was either created in the current (sub)transaction or has
-		 * a new relfilenode in the current (sub)transaction, then we can just
-		 * truncate it in-place, because a rollback would cause the whole
-		 * table or the current physical file to be thrown away anyway.
-		 */
-		if (rel->rd_createSubid == mySubid ||
-			rel->rd_newRelfilenodeSubid == mySubid)
-		{
-			/* Immediate, non-rollbackable truncation is OK */
-			heap_truncate_one_rel(rel);
-		}
-		else
-		{
-			Oid			heap_relid;
-			Oid			toast_relid;
-
-			/*
-			 * This effectively deletes all rows in the table, and may be done
-			 * in a serializable transaction.  In that case we must record a
-			 * rw-conflict in to this transaction from each transaction
-			 * holding a predicate lock on the table.
-			 */
-			CheckTableForSerializableConflictIn(rel);
-
-			/*
-			 * Need the full transaction-safe pushups.
-			 *
-			 * Create a new empty storage file for the relation, and assign it
-			 * as the relfilenode value. The old storage file is scheduled for
-			 * deletion at commit.
-			 */
-			RelationSetNewRelfilenode(rel, RecentXmin);
-
-			heap_relid = RelationGetRelid(rel);
-			toast_relid = rel->rd_rel->reltoastrelid;
-
-			/*
-			 * The same for the toast table, if any.
-			 */
-			if (OidIsValid(toast_relid))
-			{
-				rel = relation_open(toast_relid, AccessExclusiveLock);
-				RelationSetNewRelfilenode(rel, RecentXmin);
-				heap_close(rel, NoLock);
-			}
-
-			/*
-			 * Reconstruct the indexes to match, and we're done.
-			 */
-			reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST);
-		}
-	}
-
-	/*
-	 * Restart owned sequences if we were asked to.
-	 */
-	foreach(cell, seq_relids)
-	{
-		Oid			seq_relid = lfirst_oid(cell);
-
-		ResetSequence(seq_relid);
-	}
-
-	/*
-	 * Process all AFTER STATEMENT TRUNCATE triggers.
-	 */
-	resultRelInfo = resultRelInfos;
-	foreach(cell, rels)
-	{
-		estate->es_result_relation_info = resultRelInfo;
-		ExecASTruncateTriggers(estate, resultRelInfo);
-		resultRelInfo++;
-	}
-
-	/* Handle queued AFTER triggers */
-	AfterTriggerEndQuery(estate);
-
-	/* We can clean up the EState now */
-	FreeExecutorState(estate);
-
-	/* And close the rels (can't do this while EState still holds refs) */
-	foreach(cell, rels)
-	{
-		Relation	rel = (Relation) lfirst(cell);
-
-		heap_close(rel, NoLock);
-	}
+  /*
+   * If we are asked to restart sequences, find all the sequences, lock them
+   * (we need AccessExclusiveLock for ResetSequence), and check permissions.
+   * We want to do this early since it's pointless to do all the truncation
+   * work only to fail on sequence permissions.
+   */
+  if (stmt->restart_seqs)
+    {
+      foreach(cell, rels)
+	{
+	  Relation	rel = (Relation) lfirst(cell);
+	  List	   *seqlist = getOwnedSequences(RelationGetRelid(rel));
+	  ListCell   *seqcell;
+
+	  foreach(seqcell, seqlist)
+	    {
+	      Oid			seq_relid = lfirst_oid(seqcell);
+	      Relation	seq_rel;
+
+	      seq_rel = relation_open(seq_relid, AccessExclusiveLock);
+
+	      /* This check must match AlterSequence! */
+	      if (!pg_class_ownercheck(seq_relid, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+			       RelationGetRelationName(seq_rel));
+
+	      seq_relids = lappend_oid(seq_relids, seq_relid);
+
+	      relation_close(seq_rel, NoLock);
+	    }
+	}
+    }
+
+  /* Prepare to catch AFTER triggers. */
+  AfterTriggerBeginQuery();
+
+  /*
+   * To fire triggers, we'll need an EState as well as a ResultRelInfo for
+   * each relation.  We don't need to call ExecOpenIndices, though.
+   */
+  estate = CreateExecutorState();
+  resultRelInfos = (ResultRelInfo *)
+    palloc(list_length(rels) * sizeof(ResultRelInfo));
+  resultRelInfo = resultRelInfos;
+  foreach(cell, rels)
+    {
+      Relation	rel = (Relation) lfirst(cell);
+
+      InitResultRelInfo(resultRelInfo,
+			rel,
+			0,	/* dummy rangetable index */
+			0);
+      resultRelInfo++;
+    }
+  estate->es_result_relations = resultRelInfos;
+  estate->es_num_result_relations = list_length(rels);
+
+  /*
+   * Process all BEFORE STATEMENT TRUNCATE triggers before we begin
+   * truncating (this is because one of them might throw an error). Also, if
+   * we were to allow them to prevent statement execution, that would need
+   * to be handled here.
+   */
+  resultRelInfo = resultRelInfos;
+  foreach(cell, rels)
+    {
+      estate->es_result_relation_info = resultRelInfo;
+      ExecBSTruncateTriggers(estate, resultRelInfo);
+      resultRelInfo++;
+    }
+
+  /*
+   * OK, truncate each table.
+   */
+  mySubid = GetCurrentSubTransactionId();
+
+  foreach(cell, rels)
+    {
+      Relation	rel = (Relation) lfirst(cell);
+
+      /*
+       * Normally, we need a transaction-safe truncation here.  However, if
+       * the table was either created in the current (sub)transaction or has
+       * a new relfilenode in the current (sub)transaction, then we can just
+       * truncate it in-place, because a rollback would cause the whole
+       * table or the current physical file to be thrown away anyway.
+       */
+      if (rel->rd_createSubid == mySubid ||
+	  rel->rd_newRelfilenodeSubid == mySubid)
+	{
+	  /* Immediate, non-rollbackable truncation is OK */
+	  heap_truncate_one_rel(rel);
+	}
+      else
+	{
+	  Oid			heap_relid;
+	  Oid			toast_relid;
+
+	  /*
+	   * This effectively deletes all rows in the table, and may be done
+	   * in a serializable transaction.  In that case we must record a
+	   * rw-conflict in to this transaction from each transaction
+	   * holding a predicate lock on the table.
+	   */
+	  CheckTableForSerializableConflictIn(rel);
+
+	  /*
+	   * Need the full transaction-safe pushups.
+	   *
+	   * Create a new empty storage file for the relation, and assign it
+	   * as the relfilenode value. The old storage file is scheduled for
+	   * deletion at commit.
+	   */
+	  RelationSetNewRelfilenode(rel, RecentXmin);
+
+	  heap_relid = RelationGetRelid(rel);
+	  toast_relid = rel->rd_rel->reltoastrelid;
+
+	  /*
+	   * The same for the toast table, if any.
+	   */
+	  if (OidIsValid(toast_relid))
+	    {
+	      rel = relation_open(toast_relid, AccessExclusiveLock);
+	      RelationSetNewRelfilenode(rel, RecentXmin);
+	      heap_close(rel, NoLock);
+	    }
+
+	  /*
+	   * Reconstruct the indexes to match, and we're done.
+	   */
+	  reindex_relation(heap_relid, REINDEX_REL_PROCESS_TOAST);
+	}
+    }
+
+  /*
+   * Restart owned sequences if we were asked to.
+   */
+  foreach(cell, seq_relids)
+    {
+      Oid			seq_relid = lfirst_oid(cell);
+
+      ResetSequence(seq_relid);
+    }
+
+  /*
+   * Process all AFTER STATEMENT TRUNCATE triggers.
+   */
+  resultRelInfo = resultRelInfos;
+  foreach(cell, rels)
+    {
+      estate->es_result_relation_info = resultRelInfo;
+      ExecASTruncateTriggers(estate, resultRelInfo);
+      resultRelInfo++;
+    }
+
+  /* Handle queued AFTER triggers */
+  AfterTriggerEndQuery(estate);
+
+  /* We can clean up the EState now */
+  FreeExecutorState(estate);
+
+  /* And close the rels (can't do this while EState still holds refs) */
+  foreach(cell, rels)
+    {
+      Relation	rel = (Relation) lfirst(cell);
+
+      heap_close(rel, NoLock);
+    }
 }
 
 /*
@@ -1119,42 +1121,42 @@ ExecuteTruncate(TruncateStmt *stmt)
 static void
 truncate_check_rel(Relation rel)
 {
-	AclResult	aclresult;
-
-	/* Only allow truncate on regular tables */
-	if (rel->rd_rel->relkind != RELKIND_RELATION)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a table",
-						RelationGetRelationName(rel))));
-
-	/* Permissions checks */
-	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
-								  ACL_TRUNCATE);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS,
-					   RelationGetRelationName(rel));
-
-	if (!allowSystemTableMods && IsSystemRelation(rel))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("permission denied: \"%s\" is a system catalog",
-						RelationGetRelationName(rel))));
-
-	/*
-	 * Don't allow truncate on temp tables of other backends ... their local
-	 * buffer manager is not going to cope.
-	 */
-	if (RELATION_IS_OTHER_TEMP(rel))
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			  errmsg("cannot truncate temporary tables of other sessions")));
-
-	/*
-	 * Also check for active uses of the relation in the current transaction,
-	 * including open scans and pending AFTER trigger events.
-	 */
-	CheckTableNotInUse(rel, "TRUNCATE");
+  AclResult	aclresult;
+
+  /* Only allow truncate on regular tables */
+  if (rel->rd_rel->relkind != RELKIND_RELATION)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a table",
+		    RelationGetRelationName(rel))));
+
+  /* Permissions checks */
+  aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
+				ACL_TRUNCATE);
+  if (aclresult != ACLCHECK_OK)
+    aclcheck_error(aclresult, ACL_KIND_CLASS,
+		   RelationGetRelationName(rel));
+
+  if (!allowSystemTableMods && IsSystemRelation(rel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+	     errmsg("permission denied: \"%s\" is a system catalog",
+		    RelationGetRelationName(rel))));
+
+  /*
+   * Don't allow truncate on temp tables of other backends ... their local
+   * buffer manager is not going to cope.
+   */
+  if (RELATION_IS_OTHER_TEMP(rel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot truncate temporary tables of other sessions")));
+
+  /*
+   * Also check for active uses of the relation in the current transaction,
+   * including open scans and pending AFTER trigger events.
+   */
+  CheckTableNotInUse(rel, "TRUNCATE");
 }
 
 /*
@@ -1164,19 +1166,19 @@ truncate_check_rel(Relation rel)
 static const char *
 storage_name(char c)
 {
-	switch (c)
-	{
-		case 'p':
-			return "PLAIN";
-		case 'm':
-			return "MAIN";
-		case 'x':
-			return "EXTENDED";
-		case 'e':
-			return "EXTERNAL";
-		default:
-			return "???";
-	}
+  switch (c)
+    {
+    case 'p':
+      return "PLAIN";
+    case 'm':
+      return "MAIN";
+    case 'x':
+      return "EXTENDED";
+    case 'e':
+      return "EXTERNAL";
+    default:
+      return "???";
+    }
 }
 
 /*----------
@@ -1239,475 +1241,475 @@ storage_name(char c)
  */
 static List *
 MergeAttributes(List *schema, List *supers, char relpersistence,
-				List **supOids, List **supconstr, int *supOidCount)
+		List **supOids, List **supconstr, int *supOidCount)
 {
-	ListCell   *entry;
-	List	   *inhSchema = NIL;
-	List	   *parentOids = NIL;
-	List	   *constraints = NIL;
-	int			parentsWithOids = 0;
-	bool		have_bogus_defaults = false;
-	int			child_attno;
-	static Node bogus_marker = {0};		/* marks conflicting defaults */
-
-	/*
-	 * Check for and reject tables with too many columns. We perform this
-	 * check relatively early for two reasons: (a) we don't run the risk of
-	 * overflowing an AttrNumber in subsequent code (b) an O(n^2) algorithm is
-	 * okay if we're processing <= 1600 columns, but could take minutes to
-	 * execute if the user attempts to create a table with hundreds of
-	 * thousands of columns.
-	 *
-	 * Note that we also need to check that any we do not exceed this figure
-	 * after including columns from inherited relations.
+  ListCell   *entry;
+  List	   *inhSchema = NIL;
+  List	   *parentOids = NIL;
+  List	   *constraints = NIL;
+  int			parentsWithOids = 0;
+  bool		have_bogus_defaults = false;
+  int			child_attno;
+  static Node bogus_marker = {0};		/* marks conflicting defaults */
+
+  /*
+   * Check for and reject tables with too many columns. We perform this
+   * check relatively early for two reasons: (a) we don't run the risk of
+   * overflowing an AttrNumber in subsequent code (b) an O(n^2) algorithm is
+   * okay if we're processing <= 1600 columns, but could take minutes to
+   * execute if the user attempts to create a table with hundreds of
+   * thousands of columns.
+   *
+   * Note that we also need to check that any we do not exceed this figure
+   * after including columns from inherited relations.
+   */
+  if (list_length(schema) > MaxHeapAttributeNumber)
+    ereport(ERROR,
+	    (errcode(ERRCODE_TOO_MANY_COLUMNS),
+	     errmsg("tables can have at most %d columns",
+		    MaxHeapAttributeNumber)));
+
+  /*
+   * Check for duplicate names in the explicit list of attributes.
+   *
+   * Although we might consider merging such entries in the same way that we
+   * handle name conflicts for inherited attributes, it seems to make more
+   * sense to assume such conflicts are errors.
+   */
+  foreach(entry, schema)
+    {
+      ColumnDef  *coldef = lfirst(entry);
+      ListCell   *rest = lnext(entry);
+      ListCell   *prev = entry;
+
+      if (coldef->typeName == NULL)
+
+	/*
+	 * Typed table column option that does not belong to a column from
+	 * the type.  This works because the columns from the type come
+	 * first in the list.
 	 */
-	if (list_length(schema) > MaxHeapAttributeNumber)
-		ereport(ERROR,
-				(errcode(ERRCODE_TOO_MANY_COLUMNS),
-				 errmsg("tables can have at most %d columns",
-						MaxHeapAttributeNumber)));
+	ereport(ERROR,
+		(errcode(ERRCODE_UNDEFINED_COLUMN),
+		 errmsg("column \"%s\" does not exist",
+			coldef->colname)));
 
-	/*
-	 * Check for duplicate names in the explicit list of attributes.
-	 *
-	 * Although we might consider merging such entries in the same way that we
-	 * handle name conflicts for inherited attributes, it seems to make more
-	 * sense to assume such conflicts are errors.
-	 */
-	foreach(entry, schema)
+      while (rest != NULL)
 	{
-		ColumnDef  *coldef = lfirst(entry);
-		ListCell   *rest = lnext(entry);
-		ListCell   *prev = entry;
-
-		if (coldef->typeName == NULL)
-
-			/*
-			 * Typed table column option that does not belong to a column from
-			 * the type.  This works because the columns from the type come
-			 * first in the list.
-			 */
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("column \"%s\" does not exist",
-							coldef->colname)));
+	  ColumnDef  *restdef = lfirst(rest);
+	  ListCell   *next = lnext(rest);		/* need to save it in case we
+							 * delete it */
 
-		while (rest != NULL)
+	  if (strcmp(coldef->colname, restdef->colname) == 0)
+	    {
+	      if (coldef->is_from_type)
 		{
-			ColumnDef  *restdef = lfirst(rest);
-			ListCell   *next = lnext(rest);		/* need to save it in case we
-												 * delete it */
-
-			if (strcmp(coldef->colname, restdef->colname) == 0)
-			{
-				if (coldef->is_from_type)
-				{
-					/*
-					 * merge the column options into the column from the type
-					 */
-					coldef->is_not_null = restdef->is_not_null;
-					coldef->raw_default = restdef->raw_default;
-					coldef->cooked_default = restdef->cooked_default;
-					coldef->constraints = restdef->constraints;
-					coldef->is_from_type = false;
-					list_delete_cell(schema, rest, prev);
-				}
-				else
-					ereport(ERROR,
-							(errcode(ERRCODE_DUPLICATE_COLUMN),
-							 errmsg("column \"%s\" specified more than once",
-									coldef->colname)));
-			}
-			prev = rest;
-			rest = next;
+		  /*
+		   * merge the column options into the column from the type
+		   */
+		  coldef->is_not_null = restdef->is_not_null;
+		  coldef->raw_default = restdef->raw_default;
+		  coldef->cooked_default = restdef->cooked_default;
+		  coldef->constraints = restdef->constraints;
+		  coldef->is_from_type = false;
+		  list_delete_cell(schema, rest, prev);
+		}
+	      else
+		ereport(ERROR,
+			(errcode(ERRCODE_DUPLICATE_COLUMN),
+			 errmsg("column \"%s\" specified more than once",
+				coldef->colname)));
+	    }
+	  prev = rest;
+	  rest = next;
+	}
+    }
+
+  /*
+   * Scan the parents left-to-right, and merge their attributes to form a
+   * list of inherited attributes (inhSchema).  Also check to see if we need
+   * to inherit an OID column.
+   */
+  child_attno = 0;
+  foreach(entry, supers)
+    {
+      RangeVar   *parent = (RangeVar *) lfirst(entry);
+      Relation	relation;
+      TupleDesc	tupleDesc;
+      TupleConstr *constr;
+      AttrNumber *newattno;
+      AttrNumber	parent_attno;
+
+      /*
+       * A self-exclusive lock is needed here.  If two backends attempt to
+       * add children to the same parent simultaneously, and that parent has
+       * no pre-existing children, then both will attempt to update the
+       * parent's relhassubclass field, leading to a "tuple concurrently
+       * updated" error.
+       */
+      relation = heap_openrv(parent, ShareUpdateExclusiveLock);
+
+      if (relation->rd_rel->relkind != RELKIND_RELATION)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("inherited relation \"%s\" is not a table",
+			parent->relname)));
+      /* Permanent rels cannot inherit from temporary ones */
+      if (relpersistence != RELPERSISTENCE_TEMP
+	  && RelationUsesTempNamespace(relation))
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("cannot inherit from temporary relation \"%s\"",
+			parent->relname)));
+
+      /*
+       * We should have an UNDER permission flag for this, but for now,
+       * demand that creator of a child table own the parent.
+       */
+      if (!pg_class_ownercheck(RelationGetRelid(relation), GetUserId()))
+	aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		       RelationGetRelationName(relation));
+
+      /*
+       * Reject duplications in the list of parents.
+       */
+      if (list_member_oid(parentOids, RelationGetRelid(relation)))
+	ereport(ERROR,
+		(errcode(ERRCODE_DUPLICATE_TABLE),
+		 errmsg("relation \"%s\" would be inherited from more than once",
+			parent->relname)));
+
+      parentOids = lappend_oid(parentOids, RelationGetRelid(relation));
+
+      if (relation->rd_rel->relhasoids)
+	parentsWithOids++;
+
+      tupleDesc = RelationGetDescr(relation);
+      constr = tupleDesc->constr;
+
+      /*
+       * newattno[] will contain the child-table attribute numbers for the
+       * attributes of this parent table.  (They are not the same for
+       * parents after the first one, nor if we have dropped columns.)
+       */
+      newattno = (AttrNumber *)
+	palloc(tupleDesc->natts * sizeof(AttrNumber));
+
+      for (parent_attno = 1; parent_attno <= tupleDesc->natts;
+	   parent_attno++)
+	{
+	  Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
+	  char	   *attributeName = NameStr(attribute->attname);
+	  int			exist_attno;
+	  ColumnDef  *def;
+
+	  /*
+	   * Ignore dropped columns in the parent.
+	   */
+	  if (attribute->attisdropped)
+	    {
+	      /*
+	       * change_varattnos_of_a_node asserts that this is greater
+	       * than zero, so if anything tries to use it, we should find
+	       * out.
+	       */
+	      newattno[parent_attno - 1] = 0;
+	      continue;
+	    }
+
+	  /*
+	   * Does it conflict with some previously inherited column?
+	   */
+	  exist_attno = findAttrByName(attributeName, inhSchema);
+	  if (exist_attno > 0)
+	    {
+	      Oid			defTypeId;
+	      int32		deftypmod;
+	      Oid			defCollId;
+
+	      /*
+	       * Yes, try to merge the two column definitions. They must
+	       * have the same type, typmod, and collation.
+	       */
+	      ereport(NOTICE,
+		      (errmsg("merging multiple inherited definitions of column \"%s\"",
+			      attributeName)));
+	      def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
+	      typenameTypeIdAndMod(NULL, def->typeName, &defTypeId, &deftypmod);
+	      if (defTypeId != attribute->atttypid ||
+		  deftypmod != attribute->atttypmod)
+		ereport(ERROR,
+			(errcode(ERRCODE_DATATYPE_MISMATCH),
+			 errmsg("inherited column \"%s\" has a type conflict",
+				attributeName),
+			 errdetail("%s versus %s",
+				   TypeNameToString(def->typeName),
+				   format_type_be(attribute->atttypid))));
+	      defCollId = GetColumnDefCollation(NULL, def, defTypeId);
+	      if (defCollId != attribute->attcollation)
+		ereport(ERROR,
+			(errcode(ERRCODE_COLLATION_MISMATCH),
+			 errmsg("inherited column \"%s\" has a collation conflict",
+				attributeName),
+			 errdetail("\"%s\" versus \"%s\"",
+				   get_collation_name(defCollId),
+				   get_collation_name(attribute->attcollation))));
+
+	      /* Copy storage parameter */
+	      if (def->storage == 0)
+		def->storage = attribute->attstorage;
+	      else if (def->storage != attribute->attstorage)
+		ereport(ERROR,
+			(errcode(ERRCODE_DATATYPE_MISMATCH),
+			 errmsg("inherited column \"%s\" has a storage parameter conflict",
+				attributeName),
+			 errdetail("%s versus %s",
+				   storage_name(def->storage),
+				   storage_name(attribute->attstorage))));
+
+	      def->inhcount++;
+	      /* Merge of NOT NULL constraints = OR 'em together */
+	      def->is_not_null |= attribute->attnotnull;
+	      /* Default and other constraints are handled below */
+	      newattno[parent_attno - 1] = exist_attno;
+	    }
+	  else
+	    {
+	      /*
+	       * No, create a new inherited column
+	       */
+	      def = makeNode(ColumnDef);
+	      def->colname = pstrdup(attributeName);
+	      def->typeName = makeTypeNameFromOid(attribute->atttypid,
+						  attribute->atttypmod);
+	      def->inhcount = 1;
+	      def->is_local = false;
+	      def->is_not_null = attribute->attnotnull;
+	      def->is_from_type = false;
+	      def->storage = attribute->attstorage;
+	      def->raw_default = NULL;
+	      def->cooked_default = NULL;
+	      def->collClause = NULL;
+	      def->collOid = attribute->attcollation;
+	      def->constraints = NIL;
+	      inhSchema = lappend(inhSchema, def);
+	      newattno[parent_attno - 1] = ++child_attno;
+	    }
+
+	  /*
+	   * Copy default if any
+	   */
+	  if (attribute->atthasdef)
+	    {
+	      Node	   *this_default = NULL;
+	      AttrDefault *attrdef;
+	      int			i;
+
+	      /* Find default in constraint structure */
+	      Assert(constr != NULL);
+	      attrdef = constr->defval;
+	      for (i = 0; i < constr->num_defval; i++)
+		{
+		  if (attrdef[i].adnum == parent_attno)
+		    {
+		      this_default = stringToNode(attrdef[i].adbin);
+		      break;
+		    }
 		}
+	      Assert(this_default != NULL);
+
+	      /*
+	       * If default expr could contain any vars, we'd need to fix
+	       * 'em, but it can't; so default is ready to apply to child.
+	       *
+	       * If we already had a default from some prior parent, check
+	       * to see if they are the same.  If so, no problem; if not,
+	       * mark the column as having a bogus default. Below, we will
+	       * complain if the bogus default isn't overridden by the child
+	       * schema.
+	       */
+	      Assert(def->raw_default == NULL);
+	      if (def->cooked_default == NULL)
+		def->cooked_default = this_default;
+	      else if (!equal(def->cooked_default, this_default))
+		{
+		  def->cooked_default = &bogus_marker;
+		  have_bogus_defaults = true;
+		}
+	    }
 	}
 
-	/*
-	 * Scan the parents left-to-right, and merge their attributes to form a
-	 * list of inherited attributes (inhSchema).  Also check to see if we need
-	 * to inherit an OID column.
-	 */
-	child_attno = 0;
-	foreach(entry, supers)
+      /*
+       * Now copy the CHECK constraints of this parent, adjusting attnos
+       * using the completed newattno[] map.	Identically named constraints
+       * are merged if possible, else we throw error.
+       */
+      if (constr && constr->num_check > 0)
 	{
-		RangeVar   *parent = (RangeVar *) lfirst(entry);
-		Relation	relation;
-		TupleDesc	tupleDesc;
-		TupleConstr *constr;
-		AttrNumber *newattno;
-		AttrNumber	parent_attno;
-
-		/*
-		 * A self-exclusive lock is needed here.  If two backends attempt to
-		 * add children to the same parent simultaneously, and that parent has
-		 * no pre-existing children, then both will attempt to update the
-		 * parent's relhassubclass field, leading to a "tuple concurrently
-		 * updated" error.
-		 */
-		relation = heap_openrv(parent, ShareUpdateExclusiveLock);
-
-		if (relation->rd_rel->relkind != RELKIND_RELATION)
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("inherited relation \"%s\" is not a table",
-							parent->relname)));
-		/* Permanent rels cannot inherit from temporary ones */
-		if (relpersistence != RELPERSISTENCE_TEMP
-			&& RelationUsesTempNamespace(relation))
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("cannot inherit from temporary relation \"%s\"",
-							parent->relname)));
-
-		/*
-		 * We should have an UNDER permission flag for this, but for now,
-		 * demand that creator of a child table own the parent.
-		 */
-		if (!pg_class_ownercheck(RelationGetRelid(relation), GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
-						   RelationGetRelationName(relation));
-
-		/*
-		 * Reject duplications in the list of parents.
-		 */
-		if (list_member_oid(parentOids, RelationGetRelid(relation)))
-			ereport(ERROR,
-					(errcode(ERRCODE_DUPLICATE_TABLE),
-			 errmsg("relation \"%s\" would be inherited from more than once",
-					parent->relname)));
-
-		parentOids = lappend_oid(parentOids, RelationGetRelid(relation));
-
-		if (relation->rd_rel->relhasoids)
-			parentsWithOids++;
+	  ConstrCheck *check = constr->check;
+	  int			i;
 
-		tupleDesc = RelationGetDescr(relation);
-		constr = tupleDesc->constr;
+	  for (i = 0; i < constr->num_check; i++)
+	    {
+	      char	   *name = check[i].ccname;
+	      Node	   *expr;
 
-		/*
-		 * newattno[] will contain the child-table attribute numbers for the
-		 * attributes of this parent table.  (They are not the same for
-		 * parents after the first one, nor if we have dropped columns.)
-		 */
-		newattno = (AttrNumber *)
-			palloc(tupleDesc->natts * sizeof(AttrNumber));
+	      /* adjust varattnos of ccbin here */
+	      expr = stringToNode(check[i].ccbin);
+	      change_varattnos_of_a_node(expr, newattno);
 
-		for (parent_attno = 1; parent_attno <= tupleDesc->natts;
-			 parent_attno++)
+	      /* check for duplicate */
+	      if (!MergeCheckConstraint(constraints, name, expr))
 		{
-			Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
-			char	   *attributeName = NameStr(attribute->attname);
-			int			exist_attno;
-			ColumnDef  *def;
-
-			/*
-			 * Ignore dropped columns in the parent.
-			 */
-			if (attribute->attisdropped)
-			{
-				/*
-				 * change_varattnos_of_a_node asserts that this is greater
-				 * than zero, so if anything tries to use it, we should find
-				 * out.
-				 */
-				newattno[parent_attno - 1] = 0;
-				continue;
-			}
-
-			/*
-			 * Does it conflict with some previously inherited column?
-			 */
-			exist_attno = findAttrByName(attributeName, inhSchema);
-			if (exist_attno > 0)
-			{
-				Oid			defTypeId;
-				int32		deftypmod;
-				Oid			defCollId;
-
-				/*
-				 * Yes, try to merge the two column definitions. They must
-				 * have the same type, typmod, and collation.
-				 */
-				ereport(NOTICE,
-						(errmsg("merging multiple inherited definitions of column \"%s\"",
-								attributeName)));
-				def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
-				typenameTypeIdAndMod(NULL, def->typeName, &defTypeId, &deftypmod);
-				if (defTypeId != attribute->atttypid ||
-					deftypmod != attribute->atttypmod)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-						errmsg("inherited column \"%s\" has a type conflict",
-							   attributeName),
-							 errdetail("%s versus %s",
-									   TypeNameToString(def->typeName),
-									   format_type_be(attribute->atttypid))));
-				defCollId = GetColumnDefCollation(NULL, def, defTypeId);
-				if (defCollId != attribute->attcollation)
-					ereport(ERROR,
-							(errcode(ERRCODE_COLLATION_MISMATCH),
-					errmsg("inherited column \"%s\" has a collation conflict",
-						   attributeName),
-							 errdetail("\"%s\" versus \"%s\"",
-									   get_collation_name(defCollId),
-							  get_collation_name(attribute->attcollation))));
-
-				/* Copy storage parameter */
-				if (def->storage == 0)
-					def->storage = attribute->attstorage;
-				else if (def->storage != attribute->attstorage)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("inherited column \"%s\" has a storage parameter conflict",
-									attributeName),
-							 errdetail("%s versus %s",
-									   storage_name(def->storage),
-									   storage_name(attribute->attstorage))));
-
-				def->inhcount++;
-				/* Merge of NOT NULL constraints = OR 'em together */
-				def->is_not_null |= attribute->attnotnull;
-				/* Default and other constraints are handled below */
-				newattno[parent_attno - 1] = exist_attno;
-			}
-			else
-			{
-				/*
-				 * No, create a new inherited column
-				 */
-				def = makeNode(ColumnDef);
-				def->colname = pstrdup(attributeName);
-				def->typeName = makeTypeNameFromOid(attribute->atttypid,
-													attribute->atttypmod);
-				def->inhcount = 1;
-				def->is_local = false;
-				def->is_not_null = attribute->attnotnull;
-				def->is_from_type = false;
-				def->storage = attribute->attstorage;
-				def->raw_default = NULL;
-				def->cooked_default = NULL;
-				def->collClause = NULL;
-				def->collOid = attribute->attcollation;
-				def->constraints = NIL;
-				inhSchema = lappend(inhSchema, def);
-				newattno[parent_attno - 1] = ++child_attno;
-			}
-
-			/*
-			 * Copy default if any
-			 */
-			if (attribute->atthasdef)
-			{
-				Node	   *this_default = NULL;
-				AttrDefault *attrdef;
-				int			i;
-
-				/* Find default in constraint structure */
-				Assert(constr != NULL);
-				attrdef = constr->defval;
-				for (i = 0; i < constr->num_defval; i++)
-				{
-					if (attrdef[i].adnum == parent_attno)
-					{
-						this_default = stringToNode(attrdef[i].adbin);
-						break;
-					}
-				}
-				Assert(this_default != NULL);
-
-				/*
-				 * If default expr could contain any vars, we'd need to fix
-				 * 'em, but it can't; so default is ready to apply to child.
-				 *
-				 * If we already had a default from some prior parent, check
-				 * to see if they are the same.  If so, no problem; if not,
-				 * mark the column as having a bogus default. Below, we will
-				 * complain if the bogus default isn't overridden by the child
-				 * schema.
-				 */
-				Assert(def->raw_default == NULL);
-				if (def->cooked_default == NULL)
-					def->cooked_default = this_default;
-				else if (!equal(def->cooked_default, this_default))
-				{
-					def->cooked_default = &bogus_marker;
-					have_bogus_defaults = true;
-				}
-			}
+		  /* nope, this is a new one */
+		  CookedConstraint *cooked;
+
+		  cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
+		  cooked->contype = CONSTR_CHECK;
+		  cooked->name = pstrdup(name);
+		  cooked->attnum = 0; /* not used for constraints */
+		  cooked->expr = expr;
+		  cooked->is_local = false;
+		  cooked->inhcount = 1;
+		  constraints = lappend(constraints, cooked);
 		}
-
-		/*
-		 * Now copy the CHECK constraints of this parent, adjusting attnos
-		 * using the completed newattno[] map.	Identically named constraints
-		 * are merged if possible, else we throw error.
-		 */
-		if (constr && constr->num_check > 0)
-		{
-			ConstrCheck *check = constr->check;
-			int			i;
-
-			for (i = 0; i < constr->num_check; i++)
-			{
-				char	   *name = check[i].ccname;
-				Node	   *expr;
-
-				/* adjust varattnos of ccbin here */
-				expr = stringToNode(check[i].ccbin);
-				change_varattnos_of_a_node(expr, newattno);
-
-				/* check for duplicate */
-				if (!MergeCheckConstraint(constraints, name, expr))
-				{
-					/* nope, this is a new one */
-					CookedConstraint *cooked;
-
-					cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
-					cooked->contype = CONSTR_CHECK;
-					cooked->name = pstrdup(name);
-					cooked->attnum = 0; /* not used for constraints */
-					cooked->expr = expr;
-					cooked->is_local = false;
-					cooked->inhcount = 1;
-					constraints = lappend(constraints, cooked);
-				}
-			}
-		}
-
-		pfree(newattno);
-
-		/*
-		 * Close the parent rel, but keep our AccessShareLock on it until xact
-		 * commit.	That will prevent someone else from deleting or ALTERing
-		 * the parent before the child is committed.
-		 */
-		heap_close(relation, NoLock);
-	}
-
-	/*
-	 * If we had no inherited attributes, the result schema is just the
-	 * explicitly declared columns.  Otherwise, we need to merge the declared
-	 * columns into the inherited schema list.
-	 */
-	if (inhSchema != NIL)
-	{
-		foreach(entry, schema)
-		{
-			ColumnDef  *newdef = lfirst(entry);
-			char	   *attributeName = newdef->colname;
-			int			exist_attno;
-
-			/*
-			 * Does it conflict with some previously inherited column?
-			 */
-			exist_attno = findAttrByName(attributeName, inhSchema);
-			if (exist_attno > 0)
-			{
-				ColumnDef  *def;
-				Oid			defTypeId,
-							newTypeId;
-				int32		deftypmod,
-							newtypmod;
-				Oid			defcollid,
-							newcollid;
-
-				/*
-				 * Yes, try to merge the two column definitions. They must
-				 * have the same type, typmod, and collation.
-				 */
-				ereport(NOTICE,
-				   (errmsg("merging column \"%s\" with inherited definition",
-						   attributeName)));
-				def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
-				typenameTypeIdAndMod(NULL, def->typeName, &defTypeId, &deftypmod);
-				typenameTypeIdAndMod(NULL, newdef->typeName, &newTypeId, &newtypmod);
-				if (defTypeId != newTypeId || deftypmod != newtypmod)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("column \"%s\" has a type conflict",
-									attributeName),
-							 errdetail("%s versus %s",
-									   TypeNameToString(def->typeName),
-									   TypeNameToString(newdef->typeName))));
-				defcollid = GetColumnDefCollation(NULL, def, defTypeId);
-				newcollid = GetColumnDefCollation(NULL, newdef, newTypeId);
-				if (defcollid != newcollid)
-					ereport(ERROR,
-							(errcode(ERRCODE_COLLATION_MISMATCH),
-							 errmsg("column \"%s\" has a collation conflict",
-									attributeName),
-							 errdetail("\"%s\" versus \"%s\"",
-									   get_collation_name(defcollid),
-									   get_collation_name(newcollid))));
-
-				/* Copy storage parameter */
-				if (def->storage == 0)
-					def->storage = newdef->storage;
-				else if (newdef->storage != 0 && def->storage != newdef->storage)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("column \"%s\" has a storage parameter conflict",
-							attributeName),
-							 errdetail("%s versus %s",
-									   storage_name(def->storage),
-									   storage_name(newdef->storage))));
-
-				/* Mark the column as locally defined */
-				def->is_local = true;
-				/* Merge of NOT NULL constraints = OR 'em together */
-				def->is_not_null |= newdef->is_not_null;
-				/* If new def has a default, override previous default */
-				if (newdef->raw_default != NULL)
-				{
-					def->raw_default = newdef->raw_default;
-					def->cooked_default = newdef->cooked_default;
-				}
-			}
-			else
-			{
-				/*
-				 * No, attach new column to result schema
-				 */
-				inhSchema = lappend(inhSchema, newdef);
-			}
-		}
-
-		schema = inhSchema;
-
-		/*
-		 * Check that we haven't exceeded the legal # of columns after merging
-		 * in inherited columns.
-		 */
-		if (list_length(schema) > MaxHeapAttributeNumber)
-			ereport(ERROR,
-					(errcode(ERRCODE_TOO_MANY_COLUMNS),
-					 errmsg("tables can have at most %d columns",
-							MaxHeapAttributeNumber)));
-	}
-
-	/*
-	 * If we found any conflicting parent default values, check to make sure
-	 * they were overridden by the child.
-	 */
-	if (have_bogus_defaults)
-	{
-		foreach(entry, schema)
+	    }
+	}
+
+      pfree(newattno);
+
+      /*
+       * Close the parent rel, but keep our AccessShareLock on it until xact
+       * commit.	That will prevent someone else from deleting or ALTERing
+       * the parent before the child is committed.
+       */
+      heap_close(relation, NoLock);
+    }
+
+  /*
+   * If we had no inherited attributes, the result schema is just the
+   * explicitly declared columns.  Otherwise, we need to merge the declared
+   * columns into the inherited schema list.
+   */
+  if (inhSchema != NIL)
+    {
+      foreach(entry, schema)
+	{
+	  ColumnDef  *newdef = lfirst(entry);
+	  char	   *attributeName = newdef->colname;
+	  int			exist_attno;
+
+	  /*
+	   * Does it conflict with some previously inherited column?
+	   */
+	  exist_attno = findAttrByName(attributeName, inhSchema);
+	  if (exist_attno > 0)
+	    {
+	      ColumnDef  *def;
+	      Oid			defTypeId,
+		newTypeId;
+	      int32		deftypmod,
+		newtypmod;
+	      Oid			defcollid,
+		newcollid;
+
+	      /*
+	       * Yes, try to merge the two column definitions. They must
+	       * have the same type, typmod, and collation.
+	       */
+	      ereport(NOTICE,
+		      (errmsg("merging column \"%s\" with inherited definition",
+			      attributeName)));
+	      def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
+	      typenameTypeIdAndMod(NULL, def->typeName, &defTypeId, &deftypmod);
+	      typenameTypeIdAndMod(NULL, newdef->typeName, &newTypeId, &newtypmod);
+	      if (defTypeId != newTypeId || deftypmod != newtypmod)
+		ereport(ERROR,
+			(errcode(ERRCODE_DATATYPE_MISMATCH),
+			 errmsg("column \"%s\" has a type conflict",
+				attributeName),
+			 errdetail("%s versus %s",
+				   TypeNameToString(def->typeName),
+				   TypeNameToString(newdef->typeName))));
+	      defcollid = GetColumnDefCollation(NULL, def, defTypeId);
+	      newcollid = GetColumnDefCollation(NULL, newdef, newTypeId);
+	      if (defcollid != newcollid)
+		ereport(ERROR,
+			(errcode(ERRCODE_COLLATION_MISMATCH),
+			 errmsg("column \"%s\" has a collation conflict",
+				attributeName),
+			 errdetail("\"%s\" versus \"%s\"",
+				   get_collation_name(defcollid),
+				   get_collation_name(newcollid))));
+
+	      /* Copy storage parameter */
+	      if (def->storage == 0)
+		def->storage = newdef->storage;
+	      else if (newdef->storage != 0 && def->storage != newdef->storage)
+		ereport(ERROR,
+			(errcode(ERRCODE_DATATYPE_MISMATCH),
+			 errmsg("column \"%s\" has a storage parameter conflict",
+				attributeName),
+			 errdetail("%s versus %s",
+				   storage_name(def->storage),
+				   storage_name(newdef->storage))));
+
+	      /* Mark the column as locally defined */
+	      def->is_local = true;
+	      /* Merge of NOT NULL constraints = OR 'em together */
+	      def->is_not_null |= newdef->is_not_null;
+	      /* If new def has a default, override previous default */
+	      if (newdef->raw_default != NULL)
 		{
-			ColumnDef  *def = lfirst(entry);
-
-			if (def->cooked_default == &bogus_marker)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_COLUMN_DEFINITION),
-				  errmsg("column \"%s\" inherits conflicting default values",
-						 def->colname),
-						 errhint("To resolve the conflict, specify a default explicitly.")));
+		  def->raw_default = newdef->raw_default;
+		  def->cooked_default = newdef->cooked_default;
 		}
-	}
-
-	*supOids = parentOids;
-	*supconstr = constraints;
-	*supOidCount = parentsWithOids;
-	return schema;
+	    }
+	  else
+	    {
+	      /*
+	       * No, attach new column to result schema
+	       */
+	      inhSchema = lappend(inhSchema, newdef);
+	    }
+	}
+
+      schema = inhSchema;
+
+      /*
+       * Check that we haven't exceeded the legal # of columns after merging
+       * in inherited columns.
+       */
+      if (list_length(schema) > MaxHeapAttributeNumber)
+	ereport(ERROR,
+		(errcode(ERRCODE_TOO_MANY_COLUMNS),
+		 errmsg("tables can have at most %d columns",
+			MaxHeapAttributeNumber)));
+    }
+
+  /*
+   * If we found any conflicting parent default values, check to make sure
+   * they were overridden by the child.
+   */
+  if (have_bogus_defaults)
+    {
+      foreach(entry, schema)
+	{
+	  ColumnDef  *def = lfirst(entry);
+
+	  if (def->cooked_default == &bogus_marker)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_INVALID_COLUMN_DEFINITION),
+		     errmsg("column \"%s\" inherits conflicting default values",
+			    def->colname),
+		     errhint("To resolve the conflict, specify a default explicitly.")));
+	}
+    }
+
+  *supOids = parentOids;
+  *supconstr = constraints;
+  *supOidCount = parentsWithOids;
+  return schema;
 }
 
 
@@ -1726,32 +1728,32 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 static bool
 MergeCheckConstraint(List *constraints, char *name, Node *expr)
 {
-	ListCell   *lc;
-
-	foreach(lc, constraints)
-	{
-		CookedConstraint *ccon = (CookedConstraint *) lfirst(lc);
+  ListCell   *lc;
 
-		Assert(ccon->contype == CONSTR_CHECK);
+  foreach(lc, constraints)
+    {
+      CookedConstraint *ccon = (CookedConstraint *) lfirst(lc);
 
-		/* Non-matching names never conflict */
-		if (strcmp(ccon->name, name) != 0)
-			continue;
+      Assert(ccon->contype == CONSTR_CHECK);
 
-		if (equal(expr, ccon->expr))
-		{
-			/* OK to merge */
-			ccon->inhcount++;
-			return true;
-		}
+      /* Non-matching names never conflict */
+      if (strcmp(ccon->name, name) != 0)
+	continue;
 
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_OBJECT),
-				 errmsg("check constraint name \"%s\" appears multiple times but with different expressions",
-						name)));
+      if (equal(expr, ccon->expr))
+	{
+	  /* OK to merge */
+	  ccon->inhcount++;
+	  return true;
 	}
 
-	return false;
+      ereport(ERROR,
+	      (errcode(ERRCODE_DUPLICATE_OBJECT),
+	       errmsg("check constraint name \"%s\" appears multiple times but with different expressions",
+		      name)));
+    }
+
+  return false;
 }
 
 
@@ -1767,34 +1769,34 @@ MergeCheckConstraint(List *constraints, char *name, Node *expr)
 void
 change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
 {
-	/* no setup needed, so away we go */
-	(void) change_varattnos_walker(node, newattno);
+  /* no setup needed, so away we go */
+  (void) change_varattnos_walker(node, newattno);
 }
 
 static bool
 change_varattnos_walker(Node *node, const AttrNumber *newattno)
 {
-	if (node == NULL)
-		return false;
-	if (IsA(node, Var))
-	{
-		Var		   *var = (Var *) node;
-
-		if (var->varlevelsup == 0 && var->varno == 1 &&
-			var->varattno > 0)
-		{
-			/*
-			 * ??? the following may be a problem when the node is multiply
-			 * referenced though stringToNode() doesn't create such a node
-			 * currently.
-			 */
-			Assert(newattno[var->varattno - 1] > 0);
-			var->varattno = var->varoattno = newattno[var->varattno - 1];
-		}
-		return false;
-	}
-	return expression_tree_walker(node, change_varattnos_walker,
-								  (void *) newattno);
+  if (node == NULL)
+    return false;
+  if (IsA(node, Var))
+    {
+      Var		   *var = (Var *) node;
+
+      if (var->varlevelsup == 0 && var->varno == 1 &&
+	  var->varattno > 0)
+	{
+	  /*
+	   * ??? the following may be a problem when the node is multiply
+	   * referenced though stringToNode() doesn't create such a node
+	   * currently.
+	   */
+	  Assert(newattno[var->varattno - 1] > 0);
+	  var->varattno = var->varoattno = newattno[var->varattno - 1];
+	}
+      return false;
+    }
+  return expression_tree_walker(node, change_varattnos_walker,
+				(void *) newattno);
 }
 
 /*
@@ -1804,27 +1806,27 @@ change_varattnos_walker(Node *node, const AttrNumber *newattno)
 AttrNumber *
 varattnos_map(TupleDesc olddesc, TupleDesc newdesc)
 {
-	AttrNumber *attmap;
-	int			i,
-				j;
-
-	attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * olddesc->natts);
-	for (i = 1; i <= olddesc->natts; i++)
-	{
-		if (olddesc->attrs[i - 1]->attisdropped)
-			continue;			/* leave the entry as zero */
-
-		for (j = 1; j <= newdesc->natts; j++)
-		{
-			if (strcmp(NameStr(olddesc->attrs[i - 1]->attname),
-					   NameStr(newdesc->attrs[j - 1]->attname)) == 0)
-			{
-				attmap[i - 1] = j;
-				break;
-			}
-		}
-	}
-	return attmap;
+  AttrNumber *attmap;
+  int			i,
+    j;
+
+  attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * olddesc->natts);
+  for (i = 1; i <= olddesc->natts; i++)
+    {
+      if (olddesc->attrs[i - 1]->attisdropped)
+	continue;			/* leave the entry as zero */
+
+      for (j = 1; j <= newdesc->natts; j++)
+	{
+	  if (strcmp(NameStr(olddesc->attrs[i - 1]->attname),
+		     NameStr(newdesc->attrs[j - 1]->attname)) == 0)
+	    {
+	      attmap[i - 1] = j;
+	      break;
+	    }
+	}
+    }
+  return attmap;
 }
 
 /*
@@ -1834,19 +1836,19 @@ varattnos_map(TupleDesc olddesc, TupleDesc newdesc)
 AttrNumber *
 varattnos_map_schema(TupleDesc old, List *schema)
 {
-	AttrNumber *attmap;
-	int			i;
-
-	attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * old->natts);
-	for (i = 1; i <= old->natts; i++)
-	{
-		if (old->attrs[i - 1]->attisdropped)
-			continue;			/* leave the entry as zero */
-
-		attmap[i - 1] = findAttrByName(NameStr(old->attrs[i - 1]->attname),
-									   schema);
-	}
-	return attmap;
+  AttrNumber *attmap;
+  int			i;
+
+  attmap = (AttrNumber *) palloc0(sizeof(AttrNumber) * old->natts);
+  for (i = 1; i <= old->natts; i++)
+    {
+      if (old->attrs[i - 1]->attisdropped)
+	continue;			/* leave the entry as zero */
+
+      attmap[i - 1] = findAttrByName(NameStr(old->attrs[i - 1]->attname),
+				     schema);
+    }
+  return attmap;
 }
 
 
@@ -1859,39 +1861,39 @@ varattnos_map_schema(TupleDesc old, List *schema)
 static void
 StoreCatalogInheritance(Oid relationId, List *supers)
 {
-	Relation	relation;
-	int16		seqNumber;
-	ListCell   *entry;
-
-	/*
-	 * sanity checks
-	 */
-	AssertArg(OidIsValid(relationId));
-
-	if (supers == NIL)
-		return;
-
-	/*
-	 * Store INHERITS information in pg_inherits using direct ancestors only.
-	 * Also enter dependencies on the direct ancestors, and make sure they are
-	 * marked with relhassubclass = true.
-	 *
-	 * (Once upon a time, both direct and indirect ancestors were found here
-	 * and then entered into pg_ipl.  Since that catalog doesn't exist
-	 * anymore, there's no need to look for indirect ancestors.)
-	 */
-	relation = heap_open(InheritsRelationId, RowExclusiveLock);
-
-	seqNumber = 1;
-	foreach(entry, supers)
-	{
-		Oid			parentOid = lfirst_oid(entry);
-
-		StoreCatalogInheritance1(relationId, parentOid, seqNumber, relation);
-		seqNumber++;
-	}
-
-	heap_close(relation, RowExclusiveLock);
+  Relation	relation;
+  int16		seqNumber;
+  ListCell   *entry;
+
+  /*
+   * sanity checks
+   */
+  AssertArg(OidIsValid(relationId));
+
+  if (supers == NIL)
+    return;
+
+  /*
+   * Store INHERITS information in pg_inherits using direct ancestors only.
+   * Also enter dependencies on the direct ancestors, and make sure they are
+   * marked with relhassubclass = true.
+   *
+   * (Once upon a time, both direct and indirect ancestors were found here
+   * and then entered into pg_ipl.  Since that catalog doesn't exist
+   * anymore, there's no need to look for indirect ancestors.)
+   */
+  relation = heap_open(InheritsRelationId, RowExclusiveLock);
+
+  seqNumber = 1;
+  foreach(entry, supers)
+    {
+      Oid			parentOid = lfirst_oid(entry);
+
+      StoreCatalogInheritance1(relationId, parentOid, seqNumber, relation);
+      seqNumber++;
+    }
+
+  heap_close(relation, RowExclusiveLock);
 }
 
 /*
@@ -1900,48 +1902,48 @@ StoreCatalogInheritance(Oid relationId, List *supers)
  */
 static void
 StoreCatalogInheritance1(Oid relationId, Oid parentOid,
-						 int16 seqNumber, Relation inhRelation)
+			 int16 seqNumber, Relation inhRelation)
 {
-	TupleDesc	desc = RelationGetDescr(inhRelation);
-	Datum		values[Natts_pg_inherits];
-	bool		nulls[Natts_pg_inherits];
-	ObjectAddress childobject,
-				parentobject;
-	HeapTuple	tuple;
-
-	/*
-	 * Make the pg_inherits entry
-	 */
-	values[Anum_pg_inherits_inhrelid - 1] = ObjectIdGetDatum(relationId);
-	values[Anum_pg_inherits_inhparent - 1] = ObjectIdGetDatum(parentOid);
-	values[Anum_pg_inherits_inhseqno - 1] = Int16GetDatum(seqNumber);
-
-	memset(nulls, 0, sizeof(nulls));
-
-	tuple = heap_form_tuple(desc, values, nulls);
-
-	simple_heap_insert(inhRelation, tuple);
-
-	CatalogUpdateIndexes(inhRelation, tuple);
-
-	heap_freetuple(tuple);
-
-	/*
-	 * Store a dependency too
-	 */
-	parentobject.classId = RelationRelationId;
-	parentobject.objectId = parentOid;
-	parentobject.objectSubId = 0;
-	childobject.classId = RelationRelationId;
-	childobject.objectId = relationId;
-	childobject.objectSubId = 0;
-
-	recordDependencyOn(&childobject, &parentobject, DEPENDENCY_NORMAL);
-
-	/*
-	 * Mark the parent as having subclasses.
-	 */
-	setRelhassubclassInRelation(parentOid, true);
+  TupleDesc	desc = RelationGetDescr(inhRelation);
+  Datum		values[Natts_pg_inherits];
+  bool		nulls[Natts_pg_inherits];
+  ObjectAddress childobject,
+    parentobject;
+  HeapTuple	tuple;
+
+  /*
+   * Make the pg_inherits entry
+   */
+  values[Anum_pg_inherits_inhrelid - 1] = ObjectIdGetDatum(relationId);
+  values[Anum_pg_inherits_inhparent - 1] = ObjectIdGetDatum(parentOid);
+  values[Anum_pg_inherits_inhseqno - 1] = Int16GetDatum(seqNumber);
+
+  memset(nulls, 0, sizeof(nulls));
+
+  tuple = heap_form_tuple(desc, values, nulls);
+
+  simple_heap_insert(inhRelation, tuple);
+
+  CatalogUpdateIndexes(inhRelation, tuple);
+
+  heap_freetuple(tuple);
+
+  /*
+   * Store a dependency too
+   */
+  parentobject.classId = RelationRelationId;
+  parentobject.objectId = parentOid;
+  parentobject.objectSubId = 0;
+  childobject.classId = RelationRelationId;
+  childobject.objectId = relationId;
+  childobject.objectSubId = 0;
+
+  recordDependencyOn(&childobject, &parentobject, DEPENDENCY_NORMAL);
+
+  /*
+   * Mark the parent as having subclasses.
+   */
+  setRelhassubclassInRelation(parentOid, true);
 }
 
 /*
@@ -1953,19 +1955,19 @@ StoreCatalogInheritance1(Oid relationId, Oid parentOid,
 static int
 findAttrByName(const char *attributeName, List *schema)
 {
-	ListCell   *s;
-	int			i = 1;
+  ListCell   *s;
+  int			i = 1;
 
-	foreach(s, schema)
-	{
-		ColumnDef  *def = lfirst(s);
+  foreach(s, schema)
+    {
+      ColumnDef  *def = lfirst(s);
 
-		if (strcmp(attributeName, def->colname) == 0)
-			return i;
+      if (strcmp(attributeName, def->colname) == 0)
+	return i;
 
-		i++;
-	}
-	return 0;
+      i++;
+    }
+  return 0;
 }
 
 /*
@@ -1974,38 +1976,38 @@ findAttrByName(const char *attributeName, List *schema)
 static void
 setRelhassubclassInRelation(Oid relationId, bool relhassubclass)
 {
-	Relation	relationRelation;
-	HeapTuple	tuple;
-	Form_pg_class classtuple;
-
-	/*
-	 * Fetch a modifiable copy of the tuple, modify it, update pg_class.
-	 *
-	 * If the tuple already has the right relhassubclass setting, we don't
-	 * need to update it, but we still need to issue an SI inval message.
-	 */
-	relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
-	tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relationId));
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for relation %u", relationId);
-	classtuple = (Form_pg_class) GETSTRUCT(tuple);
-
-	if (classtuple->relhassubclass != relhassubclass)
-	{
-		classtuple->relhassubclass = relhassubclass;
-		simple_heap_update(relationRelation, &tuple->t_self, tuple);
-
-		/* keep the catalog indexes up to date */
-		CatalogUpdateIndexes(relationRelation, tuple);
-	}
-	else
-	{
-		/* no need to change tuple, but force relcache rebuild anyway */
-		CacheInvalidateRelcacheByTuple(tuple);
-	}
-
-	heap_freetuple(tuple);
-	heap_close(relationRelation, RowExclusiveLock);
+  Relation	relationRelation;
+  HeapTuple	tuple;
+  Form_pg_class classtuple;
+
+  /*
+   * Fetch a modifiable copy of the tuple, modify it, update pg_class.
+   *
+   * If the tuple already has the right relhassubclass setting, we don't
+   * need to update it, but we still need to issue an SI inval message.
+   */
+  relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
+  tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relationId));
+  if (!HeapTupleIsValid(tuple))
+    elog(ERROR, "cache lookup failed for relation %u", relationId);
+  classtuple = (Form_pg_class) GETSTRUCT(tuple);
+
+  if (classtuple->relhassubclass != relhassubclass)
+    {
+      classtuple->relhassubclass = relhassubclass;
+      simple_heap_update(relationRelation, &tuple->t_self, tuple);
+
+      /* keep the catalog indexes up to date */
+      CatalogUpdateIndexes(relationRelation, tuple);
+    }
+  else
+    {
+      /* no need to change tuple, but force relcache rebuild anyway */
+      CacheInvalidateRelcacheByTuple(tuple);
+    }
+
+  heap_freetuple(tuple);
+  heap_close(relationRelation, RowExclusiveLock);
 }
 
 
@@ -2014,186 +2016,186 @@ setRelhassubclassInRelation(Oid relationId, bool relhassubclass)
  */
 static void
 renameatt_internal(Oid myrelid,
-				   const char *oldattname,
-				   const char *newattname,
-				   bool recurse,
-				   bool recursing,
-				   int expected_parents,
-				   DropBehavior behavior)
+		   const char *oldattname,
+		   const char *newattname,
+		   bool recurse,
+		   bool recursing,
+		   int expected_parents,
+		   DropBehavior behavior)
 {
-	Relation	targetrelation;
-	Relation	attrelation;
-	HeapTuple	atttup;
-	Form_pg_attribute attform;
-	int			attnum;
-	char		relkind;
-
-	/*
-	 * Grab an exclusive lock on the target table, which we will NOT release
-	 * until end of transaction.
-	 */
-	targetrelation = relation_open(myrelid, AccessExclusiveLock);
-
-	if (targetrelation->rd_rel->reloftype && !recursing)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot rename column of typed table")));
-
-	/*
-	 * Renaming the columns of sequences or toast tables doesn't actually
-	 * break anything from the system's point of view, since internal
-	 * references are by attnum.  But it doesn't seem right to allow users to
-	 * change names that are hardcoded into the system, hence the following
-	 * restriction.
-	 */
-	relkind = RelationGetForm(targetrelation)->relkind;
-	if (relkind != RELKIND_RELATION &&
-		relkind != RELKIND_VIEW &&
-		relkind != RELKIND_COMPOSITE_TYPE &&
-		relkind != RELKIND_INDEX &&
-		relkind != RELKIND_FOREIGN_TABLE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a table, view, composite type, index or foreign table",
-						RelationGetRelationName(targetrelation))));
-
-	/*
-	 * permissions checking.  only the owner of a class can change its schema.
-	 */
-	if (!pg_class_ownercheck(myrelid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
-					   RelationGetRelationName(targetrelation));
-	if (!allowSystemTableMods && IsSystemRelation(targetrelation))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("permission denied: \"%s\" is a system catalog",
-						RelationGetRelationName(targetrelation))));
-
-	/*
-	 * if the 'recurse' flag is set then we are supposed to rename this
-	 * attribute in all classes that inherit from 'relname' (as well as in
-	 * 'relname').
-	 *
-	 * any permissions or problems with duplicate attributes will cause the
-	 * whole transaction to abort, which is what we want -- all or nothing.
-	 */
-	if (recurse)
-	{
-		List	   *child_oids,
-				   *child_numparents;
-		ListCell   *lo,
-				   *li;
-
-		/*
-		 * we need the number of parents for each child so that the recursive
-		 * calls to renameatt() can determine whether there are any parents
-		 * outside the inheritance hierarchy being processed.
-		 */
-		child_oids = find_all_inheritors(myrelid, AccessExclusiveLock,
-										 &child_numparents);
-
-		/*
-		 * find_all_inheritors does the recursive search of the inheritance
-		 * hierarchy, so all we have to do is process all of the relids in the
-		 * list that it returns.
-		 */
-		forboth(lo, child_oids, li, child_numparents)
-		{
-			Oid			childrelid = lfirst_oid(lo);
-			int			numparents = lfirst_int(li);
-
-			if (childrelid == myrelid)
-				continue;
-			/* note we need not recurse again */
-			renameatt_internal(childrelid, oldattname, newattname, false, true, numparents, behavior);
-		}
-	}
-	else
-	{
-		/*
-		 * If we are told not to recurse, there had better not be any child
-		 * tables; else the rename would put them out of step.
-		 *
-		 * expected_parents will only be 0 if we are not already recursing.
-		 */
-		if (expected_parents == 0 &&
-			find_inheritance_children(myrelid, NoLock) != NIL)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-					 errmsg("inherited column \"%s\" must be renamed in child tables too",
-							oldattname)));
-	}
-
-	/* rename attributes in typed tables of composite type */
-	if (targetrelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
-	{
-		List	   *child_oids;
-		ListCell   *lo;
-
-		child_oids = find_typed_table_dependencies(targetrelation->rd_rel->reltype,
-									 RelationGetRelationName(targetrelation),
-												   behavior);
-
-		foreach(lo, child_oids)
-			renameatt_internal(lfirst_oid(lo), oldattname, newattname, true, true, 0, behavior);
-	}
-
-	attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	atttup = SearchSysCacheCopyAttName(myrelid, oldattname);
-	if (!HeapTupleIsValid(atttup))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" does not exist",
-						oldattname)));
-	attform = (Form_pg_attribute) GETSTRUCT(atttup);
-
-	attnum = attform->attnum;
-	if (attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot rename system column \"%s\"",
-						oldattname)));
-
-	/*
-	 * if the attribute is inherited, forbid the renaming.	if this is a
-	 * top-level call to renameatt(), then expected_parents will be 0, so the
-	 * effect of this code will be to prohibit the renaming if the attribute
-	 * is inherited at all.  if this is a recursive call to renameatt(),
-	 * expected_parents will be the number of parents the current relation has
-	 * within the inheritance hierarchy being processed, so we'll prohibit the
-	 * renaming only if there are additional parents from elsewhere.
-	 */
-	if (attform->attinhcount > expected_parents)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("cannot rename inherited column \"%s\"",
-						oldattname)));
-
-	/* new name should not already exist */
-
-	/* this test is deliberately not attisdropped-aware */
-	if (SearchSysCacheExists2(ATTNAME,
-							  ObjectIdGetDatum(myrelid),
-							  PointerGetDatum(newattname)))
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" already exists",
-					  newattname, RelationGetRelationName(targetrelation))));
-
-	/* apply the update */
-	namestrcpy(&(attform->attname), newattname);
-
-	simple_heap_update(attrelation, &atttup->t_self, atttup);
-
-	/* keep system catalog indexes current */
-	CatalogUpdateIndexes(attrelation, atttup);
-
-	heap_freetuple(atttup);
-
-	heap_close(attrelation, RowExclusiveLock);
-
-	relation_close(targetrelation, NoLock);		/* close rel but keep lock */
+  Relation	targetrelation;
+  Relation	attrelation;
+  HeapTuple	atttup;
+  Form_pg_attribute attform;
+  int			attnum;
+  char		relkind;
+
+  /*
+   * Grab an exclusive lock on the target table, which we will NOT release
+   * until end of transaction.
+   */
+  targetrelation = relation_open(myrelid, AccessExclusiveLock);
+
+  if (targetrelation->rd_rel->reloftype && !recursing)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("cannot rename column of typed table")));
+
+  /*
+   * Renaming the columns of sequences or toast tables doesn't actually
+   * break anything from the system's point of view, since internal
+   * references are by attnum.  But it doesn't seem right to allow users to
+   * change names that are hardcoded into the system, hence the following
+   * restriction.
+   */
+  relkind = RelationGetForm(targetrelation)->relkind;
+  if (relkind != RELKIND_RELATION &&
+      relkind != RELKIND_VIEW &&
+      relkind != RELKIND_COMPOSITE_TYPE &&
+      relkind != RELKIND_INDEX &&
+      relkind != RELKIND_FOREIGN_TABLE)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a table, view, composite type, index or foreign table",
+		    RelationGetRelationName(targetrelation))));
+
+  /*
+   * permissions checking.  only the owner of a class can change its schema.
+   */
+  if (!pg_class_ownercheck(myrelid, GetUserId()))
+    aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		   RelationGetRelationName(targetrelation));
+  if (!allowSystemTableMods && IsSystemRelation(targetrelation))
+    ereport(ERROR,
+	    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+	     errmsg("permission denied: \"%s\" is a system catalog",
+		    RelationGetRelationName(targetrelation))));
+
+  /*
+   * if the 'recurse' flag is set then we are supposed to rename this
+   * attribute in all classes that inherit from 'relname' (as well as in
+   * 'relname').
+   *
+   * any permissions or problems with duplicate attributes will cause the
+   * whole transaction to abort, which is what we want -- all or nothing.
+   */
+  if (recurse)
+    {
+      List	   *child_oids,
+	*child_numparents;
+      ListCell   *lo,
+	*li;
+
+      /*
+       * we need the number of parents for each child so that the recursive
+       * calls to renameatt() can determine whether there are any parents
+       * outside the inheritance hierarchy being processed.
+       */
+      child_oids = find_all_inheritors(myrelid, AccessExclusiveLock,
+				       &child_numparents);
+
+      /*
+       * find_all_inheritors does the recursive search of the inheritance
+       * hierarchy, so all we have to do is process all of the relids in the
+       * list that it returns.
+       */
+      forboth(lo, child_oids, li, child_numparents)
+	{
+	  Oid			childrelid = lfirst_oid(lo);
+	  int			numparents = lfirst_int(li);
+
+	  if (childrelid == myrelid)
+	    continue;
+	  /* note we need not recurse again */
+	  renameatt_internal(childrelid, oldattname, newattname, false, true, numparents, behavior);
+	}
+    }
+  else
+    {
+      /*
+       * If we are told not to recurse, there had better not be any child
+       * tables; else the rename would put them out of step.
+       *
+       * expected_parents will only be 0 if we are not already recursing.
+       */
+      if (expected_parents == 0 &&
+	  find_inheritance_children(myrelid, NoLock) != NIL)
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("inherited column \"%s\" must be renamed in child tables too",
+			oldattname)));
+    }
+
+  /* rename attributes in typed tables of composite type */
+  if (targetrelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
+    {
+      List	   *child_oids;
+      ListCell   *lo;
+
+      child_oids = find_typed_table_dependencies(targetrelation->rd_rel->reltype,
+						 RelationGetRelationName(targetrelation),
+						 behavior);
+
+      foreach(lo, child_oids)
+	renameatt_internal(lfirst_oid(lo), oldattname, newattname, true, true, 0, behavior);
+    }
+
+  attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  atttup = SearchSysCacheCopyAttName(myrelid, oldattname);
+  if (!HeapTupleIsValid(atttup))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" does not exist",
+		    oldattname)));
+  attform = (Form_pg_attribute) GETSTRUCT(atttup);
+
+  attnum = attform->attnum;
+  if (attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot rename system column \"%s\"",
+		    oldattname)));
+
+  /*
+   * if the attribute is inherited, forbid the renaming.	if this is a
+   * top-level call to renameatt(), then expected_parents will be 0, so the
+   * effect of this code will be to prohibit the renaming if the attribute
+   * is inherited at all.  if this is a recursive call to renameatt(),
+   * expected_parents will be the number of parents the current relation has
+   * within the inheritance hierarchy being processed, so we'll prohibit the
+   * renaming only if there are additional parents from elsewhere.
+   */
+  if (attform->attinhcount > expected_parents)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("cannot rename inherited column \"%s\"",
+		    oldattname)));
+
+  /* new name should not already exist */
+
+  /* this test is deliberately not attisdropped-aware */
+  if (SearchSysCacheExists2(ATTNAME,
+			    ObjectIdGetDatum(myrelid),
+			    PointerGetDatum(newattname)))
+    ereport(ERROR,
+	    (errcode(ERRCODE_DUPLICATE_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" already exists",
+		    newattname, RelationGetRelationName(targetrelation))));
+
+  /* apply the update */
+  namestrcpy(&(attform->attname), newattname);
+
+  simple_heap_update(attrelation, &atttup->t_self, atttup);
+
+  /* keep system catalog indexes current */
+  CatalogUpdateIndexes(attrelation, atttup);
+
+  heap_freetuple(atttup);
+
+  heap_close(attrelation, RowExclusiveLock);
+
+  relation_close(targetrelation, NoLock);		/* close rel but keep lock */
 }
 
 
@@ -2203,13 +2205,13 @@ renameatt_internal(Oid myrelid,
 void
 renameatt(Oid myrelid, RenameStmt *stmt)
 {
-	renameatt_internal(myrelid,
-					   stmt->subname,	/* old att name */
-					   stmt->newname,	/* new att name */
-					   interpretInhOption(stmt->relation->inhOpt),		/* recursive? */
-					   false,	/* recursing? */
-					   0,		/* expected inhcount */
-					   stmt->behavior);
+  renameatt_internal(myrelid,
+		     stmt->subname,	/* old att name */
+		     stmt->newname,	/* new att name */
+		     interpretInhOption(stmt->relation->inhOpt),		/* recursive? */
+		     false,	/* recursing? */
+		     0,		/* expected inhcount */
+		     stmt->behavior);
 }
 
 
@@ -2221,61 +2223,61 @@ renameatt(Oid myrelid, RenameStmt *stmt)
 void
 RenameRelation(Oid myrelid, const char *newrelname, ObjectType reltype)
 {
-	Relation	targetrelation;
-	Oid			namespaceId;
-	char		relkind;
-
-	/*
-	 * Grab an exclusive lock on the target table, index, sequence or view,
-	 * which we will NOT release until end of transaction.
-	 */
-	targetrelation = relation_open(myrelid, AccessExclusiveLock);
-
-	namespaceId = RelationGetNamespace(targetrelation);
-	relkind = targetrelation->rd_rel->relkind;
-
-	/*
-	 * For compatibility with prior releases, we don't complain if ALTER TABLE
-	 * or ALTER INDEX is used to rename some other type of relation.  But
-	 * ALTER SEQUENCE/VIEW/FOREIGN TABLE are only to be used with relations of
-	 * that type.
-	 */
-	if (reltype == OBJECT_SEQUENCE && relkind != RELKIND_SEQUENCE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a sequence",
-						RelationGetRelationName(targetrelation))));
-
-	if (reltype == OBJECT_VIEW && relkind != RELKIND_VIEW)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a view",
-						RelationGetRelationName(targetrelation))));
-
-	if (reltype == OBJECT_FOREIGN_TABLE && relkind != RELKIND_FOREIGN_TABLE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a foreign table",
-						RelationGetRelationName(targetrelation))));
-
-	/*
-	 * Don't allow ALTER TABLE on composite types. We want people to use ALTER
-	 * TYPE for that.
-	 */
-	if (relkind == RELKIND_COMPOSITE_TYPE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is a composite type",
-						RelationGetRelationName(targetrelation)),
-				 errhint("Use ALTER TYPE instead.")));
-
-	/* Do the work */
-	RenameRelationInternal(myrelid, newrelname, namespaceId);
-
-	/*
-	 * Close rel, but keep exclusive lock!
-	 */
-	relation_close(targetrelation, NoLock);
+  Relation	targetrelation;
+  Oid			namespaceId;
+  char		relkind;
+
+  /*
+   * Grab an exclusive lock on the target table, index, sequence or view,
+   * which we will NOT release until end of transaction.
+   */
+  targetrelation = relation_open(myrelid, AccessExclusiveLock);
+
+  namespaceId = RelationGetNamespace(targetrelation);
+  relkind = targetrelation->rd_rel->relkind;
+
+  /*
+   * For compatibility with prior releases, we don't complain if ALTER TABLE
+   * or ALTER INDEX is used to rename some other type of relation.  But
+   * ALTER SEQUENCE/VIEW/FOREIGN TABLE are only to be used with relations of
+   * that type.
+   */
+  if (reltype == OBJECT_SEQUENCE && relkind != RELKIND_SEQUENCE)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a sequence",
+		    RelationGetRelationName(targetrelation))));
+
+  if (reltype == OBJECT_VIEW && relkind != RELKIND_VIEW)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a view",
+		    RelationGetRelationName(targetrelation))));
+
+  if (reltype == OBJECT_FOREIGN_TABLE && relkind != RELKIND_FOREIGN_TABLE)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a foreign table",
+		    RelationGetRelationName(targetrelation))));
+
+  /*
+   * Don't allow ALTER TABLE on composite types. We want people to use ALTER
+   * TYPE for that.
+   */
+  if (relkind == RELKIND_COMPOSITE_TYPE)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is a composite type",
+		    RelationGetRelationName(targetrelation)),
+	     errhint("Use ALTER TYPE instead.")));
+
+  /* Do the work */
+  RenameRelationInternal(myrelid, newrelname, namespaceId);
+
+  /*
+   * Close rel, but keep exclusive lock!
+   */
+  relation_close(targetrelation, NoLock);
 }
 
 /*
@@ -2290,69 +2292,69 @@ RenameRelation(Oid myrelid, const char *newrelname, ObjectType reltype)
 void
 RenameRelationInternal(Oid myrelid, const char *newrelname, Oid namespaceId)
 {
-	Relation	targetrelation;
-	Relation	relrelation;	/* for RELATION relation */
-	HeapTuple	reltup;
-	Form_pg_class relform;
-
-	/*
-	 * Grab an exclusive lock on the target table, index, sequence or view,
-	 * which we will NOT release until end of transaction.
-	 */
-	targetrelation = relation_open(myrelid, AccessExclusiveLock);
-
-	/*
-	 * Find relation's pg_class tuple, and make sure newrelname isn't in use.
-	 */
-	relrelation = heap_open(RelationRelationId, RowExclusiveLock);
-
-	reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(myrelid));
-	if (!HeapTupleIsValid(reltup))		/* shouldn't happen */
-		elog(ERROR, "cache lookup failed for relation %u", myrelid);
-	relform = (Form_pg_class) GETSTRUCT(reltup);
-
-	if (get_relname_relid(newrelname, namespaceId) != InvalidOid)
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_TABLE),
-				 errmsg("relation \"%s\" already exists",
-						newrelname)));
-
-	/*
-	 * Update pg_class tuple with new relname.	(Scribbling on reltup is OK
-	 * because it's a copy...)
-	 */
-	namestrcpy(&(relform->relname), newrelname);
-
-	simple_heap_update(relrelation, &reltup->t_self, reltup);
-
-	/* keep the system catalog indexes current */
-	CatalogUpdateIndexes(relrelation, reltup);
-
-	heap_freetuple(reltup);
-	heap_close(relrelation, RowExclusiveLock);
-
-	/*
-	 * Also rename the associated type, if any.
-	 */
-	if (OidIsValid(targetrelation->rd_rel->reltype))
-		RenameTypeInternal(targetrelation->rd_rel->reltype,
-						   newrelname, namespaceId);
-
-	/*
-	 * Also rename the associated constraint, if any.
-	 */
-	if (targetrelation->rd_rel->relkind == RELKIND_INDEX)
-	{
-		Oid			constraintId = get_index_constraint(myrelid);
-
-		if (OidIsValid(constraintId))
-			RenameConstraintById(constraintId, newrelname);
-	}
-
-	/*
-	 * Close rel, but keep exclusive lock!
-	 */
-	relation_close(targetrelation, NoLock);
+  Relation	targetrelation;
+  Relation	relrelation;	/* for RELATION relation */
+  HeapTuple	reltup;
+  Form_pg_class relform;
+
+  /*
+   * Grab an exclusive lock on the target table, index, sequence or view,
+   * which we will NOT release until end of transaction.
+   */
+  targetrelation = relation_open(myrelid, AccessExclusiveLock);
+
+  /*
+   * Find relation's pg_class tuple, and make sure newrelname isn't in use.
+   */
+  relrelation = heap_open(RelationRelationId, RowExclusiveLock);
+
+  reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(myrelid));
+  if (!HeapTupleIsValid(reltup))		/* shouldn't happen */
+    elog(ERROR, "cache lookup failed for relation %u", myrelid);
+  relform = (Form_pg_class) GETSTRUCT(reltup);
+
+  if (get_relname_relid(newrelname, namespaceId) != InvalidOid)
+    ereport(ERROR,
+	    (errcode(ERRCODE_DUPLICATE_TABLE),
+	     errmsg("relation \"%s\" already exists",
+		    newrelname)));
+
+  /*
+   * Update pg_class tuple with new relname.	(Scribbling on reltup is OK
+   * because it's a copy...)
+   */
+  namestrcpy(&(relform->relname), newrelname);
+
+  simple_heap_update(relrelation, &reltup->t_self, reltup);
+
+  /* keep the system catalog indexes current */
+  CatalogUpdateIndexes(relrelation, reltup);
+
+  heap_freetuple(reltup);
+  heap_close(relrelation, RowExclusiveLock);
+
+  /*
+   * Also rename the associated type, if any.
+   */
+  if (OidIsValid(targetrelation->rd_rel->reltype))
+    RenameTypeInternal(targetrelation->rd_rel->reltype,
+		       newrelname, namespaceId);
+
+  /*
+   * Also rename the associated constraint, if any.
+   */
+  if (targetrelation->rd_rel->relkind == RELKIND_INDEX)
+    {
+      Oid			constraintId = get_index_constraint(myrelid);
+
+      if (OidIsValid(constraintId))
+	RenameConstraintById(constraintId, newrelname);
+    }
+
+  /*
+   * Close rel, but keep exclusive lock!
+   */
+  relation_close(targetrelation, NoLock);
 }
 
 /*
@@ -2383,25 +2385,25 @@ RenameRelationInternal(Oid myrelid, const char *newrelname, Oid namespaceId)
 void
 CheckTableNotInUse(Relation rel, const char *stmt)
 {
-	int			expected_refcnt;
-
-	expected_refcnt = rel->rd_isnailed ? 2 : 1;
-	if (rel->rd_refcnt != expected_refcnt)
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_IN_USE),
-		/* translator: first %s is a SQL command, eg ALTER TABLE */
-				 errmsg("cannot %s \"%s\" because "
-						"it is being used by active queries in this session",
-						stmt, RelationGetRelationName(rel))));
-
-	if (rel->rd_rel->relkind != RELKIND_INDEX &&
-		AfterTriggerPendingOnRel(RelationGetRelid(rel)))
-		ereport(ERROR,
-				(errcode(ERRCODE_OBJECT_IN_USE),
-		/* translator: first %s is a SQL command, eg ALTER TABLE */
-				 errmsg("cannot %s \"%s\" because "
-						"it has pending trigger events",
-						stmt, RelationGetRelationName(rel))));
+  int			expected_refcnt;
+
+  expected_refcnt = rel->rd_isnailed ? 2 : 1;
+  if (rel->rd_refcnt != expected_refcnt)
+    ereport(ERROR,
+	    (errcode(ERRCODE_OBJECT_IN_USE),
+	     /* translator: first %s is a SQL command, eg ALTER TABLE */
+	     errmsg("cannot %s \"%s\" because "
+		    "it is being used by active queries in this session",
+		    stmt, RelationGetRelationName(rel))));
+
+  if (rel->rd_rel->relkind != RELKIND_INDEX &&
+      AfterTriggerPendingOnRel(RelationGetRelid(rel)))
+    ereport(ERROR,
+	    (errcode(ERRCODE_OBJECT_IN_USE),
+	     /* translator: first %s is a SQL command, eg ALTER TABLE */
+	     errmsg("cannot %s \"%s\" because "
+		    "it has pending trigger events",
+		    stmt, RelationGetRelationName(rel))));
 }
 
 /*
@@ -2451,79 +2453,79 @@ CheckTableNotInUse(Relation rel, const char *stmt)
 void
 AlterTable(AlterTableStmt *stmt)
 {
-	Relation	rel;
-	LOCKMODE	lockmode = AlterTableGetLockLevel(stmt->cmds);
-
-	/*
-	 * Acquire same level of lock as already acquired during parsing.
-	 */
-	rel = relation_openrv(stmt->relation, lockmode);
-
-	CheckTableNotInUse(rel, "ALTER TABLE");
-
-	/* Check relation type against type specified in the ALTER command */
-	switch (stmt->relkind)
-	{
-		case OBJECT_TABLE:
-
-			/*
-			 * For mostly-historical reasons, we allow ALTER TABLE to apply to
-			 * almost all relation types.
-			 */
-			if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE
-				|| rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a table",
-								RelationGetRelationName(rel))));
-			break;
+  Relation	rel;
+  LOCKMODE	lockmode = AlterTableGetLockLevel(stmt->cmds);
+
+  /*
+   * Acquire same level of lock as already acquired during parsing.
+   */
+  rel = relation_openrv(stmt->relation, lockmode);
+
+  CheckTableNotInUse(rel, "ALTER TABLE");
+
+  /* Check relation type against type specified in the ALTER command */
+  switch (stmt->relkind)
+    {
+    case OBJECT_TABLE:
+
+      /*
+       * For mostly-historical reasons, we allow ALTER TABLE to apply to
+       * almost all relation types.
+       */
+      if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE
+	  || rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a table",
+			RelationGetRelationName(rel))));
+      break;
 
-		case OBJECT_INDEX:
-			if (rel->rd_rel->relkind != RELKIND_INDEX)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not an index",
-								RelationGetRelationName(rel))));
-			break;
+    case OBJECT_INDEX:
+      if (rel->rd_rel->relkind != RELKIND_INDEX)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not an index",
+			RelationGetRelationName(rel))));
+      break;
 
-		case OBJECT_SEQUENCE:
-			if (rel->rd_rel->relkind != RELKIND_SEQUENCE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a sequence",
-								RelationGetRelationName(rel))));
-			break;
+    case OBJECT_SEQUENCE:
+      if (rel->rd_rel->relkind != RELKIND_SEQUENCE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a sequence",
+			RelationGetRelationName(rel))));
+      break;
 
-		case OBJECT_TYPE:
-			if (rel->rd_rel->relkind != RELKIND_COMPOSITE_TYPE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a composite type",
-								RelationGetRelationName(rel))));
-			break;
+    case OBJECT_TYPE:
+      if (rel->rd_rel->relkind != RELKIND_COMPOSITE_TYPE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a composite type",
+			RelationGetRelationName(rel))));
+      break;
 
-		case OBJECT_VIEW:
-			if (rel->rd_rel->relkind != RELKIND_VIEW)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a view",
-								RelationGetRelationName(rel))));
-			break;
+    case OBJECT_VIEW:
+      if (rel->rd_rel->relkind != RELKIND_VIEW)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a view",
+			RelationGetRelationName(rel))));
+      break;
 
-		case OBJECT_FOREIGN_TABLE:
-			if (rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a foreign table",
-								RelationGetRelationName(rel))));
-			break;
+    case OBJECT_FOREIGN_TABLE:
+      if (rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a foreign table",
+			RelationGetRelationName(rel))));
+      break;
 
-		default:
-			elog(ERROR, "unrecognized object type: %d", (int) stmt->relkind);
-	}
+    default:
+      elog(ERROR, "unrecognized object type: %d", (int) stmt->relkind);
+    }
 
-	ATController(rel, stmt->cmds, interpretInhOption(stmt->relation->inhOpt),
-				 lockmode);
+  ATController(rel, stmt->cmds, interpretInhOption(stmt->relation->inhOpt),
+	       lockmode);
 }
 
 /*
@@ -2540,12 +2542,12 @@ AlterTable(AlterTableStmt *stmt)
 void
 AlterTableInternal(Oid relid, List *cmds, bool recurse)
 {
-	Relation	rel;
-	LOCKMODE	lockmode = AlterTableGetLockLevel(cmds);
+  Relation	rel;
+  LOCKMODE	lockmode = AlterTableGetLockLevel(cmds);
 
-	rel = relation_open(relid, lockmode);
+  rel = relation_open(relid, lockmode);
 
-	ATController(rel, cmds, recurse, lockmode);
+  ATController(rel, cmds, recurse, lockmode);
 }
 
 /*
@@ -2572,180 +2574,208 @@ AlterTableInternal(Oid relid, List *cmds, bool recurse)
 LOCKMODE
 AlterTableGetLockLevel(List *cmds)
 {
-	ListCell   *lcmd;
-	LOCKMODE	lockmode = ShareUpdateExclusiveLock;
+  /*
+   * Late in 9.1 dev cycle a number of issues were uncovered with access
+   * to catalog relations, leading to the decision to re-enforce all DDL
+   * at AccessExclusiveLock level by default.
+   *
+   * The issues are that there is a pervasive assumption in the code that
+   * the catalogs will not be read unless an AccessExclusiveLock is held.
+   * If that rule is relaxed, we must protect against a number of potential
+   * effects - infrequent, but proven possible with test cases where
+   * multiple DDL operations occur in a stream against frequently accessed
+   * tables.
+   *
+   * 1. Catalog tables are read using SnapshotNow, which has a race bug
+   * that allows a scan to return no valid rows even when one is present
+   * in the case of a commit of a concurrent update of the catalog table.
+   * SnapshotNow also ignores transactions in progress, so takes the
+   * latest committed version without waiting for the latest changes.
+   *
+   * 2. Relcache needs to be internally consistent, so unless we lock the
+   * definition during reads we have no way to guarantee that.
+   *
+   * 3. Catcache access isn't coordinated at all so refreshes can occur at
+   * any time.
+   */
+#ifdef REDUCED_ALTER_TABLE_LOCK_LEVELS
+  ListCell   *lcmd;
+  LOCKMODE	lockmode = ShareUpdateExclusiveLock;
+
+  foreach(lcmd, cmds)
+    {
+      AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
+      LOCKMODE	cmd_lockmode = AccessExclusiveLock; /* default for compiler */
+
+      switch (cmd->subtype)
+	{
+	  /*
+	   * Need AccessExclusiveLock for these subcommands because they
+	   * affect or potentially affect both read and write
+	   * operations.
+	   *
+	   * New subcommand types should be added here by default.
+	   */
+	case AT_AddColumn:	/* may rewrite heap, in some cases and visible
+				 * to SELECT */
+	case AT_DropColumn:	/* change visible to SELECT */
+	case AT_AddColumnToView:	/* CREATE VIEW */
+	case AT_AlterColumnType:	/* must rewrite heap */
+	case AT_DropConstraint:		/* as DROP INDEX */
+	case AT_AddOids:	/* must rewrite heap */
+	case AT_DropOids:	/* calls AT_DropColumn */
+	case AT_EnableAlwaysRule:	/* may change SELECT rules */
+	case AT_EnableReplicaRule:	/* may change SELECT rules */
+	case AT_EnableRule:	/* may change SELECT rules */
+	case AT_DisableRule:		/* may change SELECT rules */
+	case AT_ChangeOwner:		/* change visible to SELECT */
+	case AT_SetTableSpace:		/* must rewrite heap */
+	case AT_DropNotNull:		/* may change some SQL plans */
+	case AT_SetNotNull:
+	case AT_GenericOptions:
+	  cmd_lockmode = AccessExclusiveLock;
+	  break;
+
+	  /*
+	   * These subcommands affect write operations only.
+	   */
+	case AT_ColumnDefault:
+	case AT_ProcessedConstraint:		/* becomes AT_AddConstraint */
+	case AT_AddConstraintRecurse:		/* becomes AT_AddConstraint */
+	case AT_EnableTrig:
+	case AT_EnableAlwaysTrig:
+	case AT_EnableReplicaTrig:
+	case AT_EnableTrigAll:
+	case AT_EnableTrigUser:
+	case AT_DisableTrig:
+	case AT_DisableTrigAll:
+	case AT_DisableTrigUser:
+	case AT_AddIndex:	/* from ADD CONSTRAINT */
+	case AT_AddIndexConstraint:
+	  cmd_lockmode = ShareRowExclusiveLock;
+	  break;
+
+	case AT_AddConstraint:
+	  if (IsA(cmd->def, Constraint))
+	    {
+	      Constraint *con = (Constraint *) cmd->def;
+
+	      switch (con->contype)
+		{
+		case CONSTR_EXCLUSION:
+		case CONSTR_PRIMARY:
+		case CONSTR_UNIQUE:
+
+		  /*
+		   * Cases essentially the same as CREATE INDEX. We
+		   * could reduce the lock strength to ShareLock if
+		   * we can work out how to allow concurrent catalog
+		   * updates.
+		   */
+		  cmd_lockmode = ShareRowExclusiveLock;
+		  break;
+		case CONSTR_FOREIGN:
 
-	foreach(lcmd, cmds)
-	{
-		AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
-		LOCKMODE	cmd_lockmode = AccessExclusiveLock; /* default for compiler */
+		  /*
+		   * We add triggers to both tables when we add a
+		   * Foreign Key, so the lock level must be at least
+		   * as strong as CREATE TRIGGER.
+		   */
+		  cmd_lockmode = ShareRowExclusiveLock;
+		  break;
 
-		switch (cmd->subtype)
-		{
-				/*
-				 * Need AccessExclusiveLock for these subcommands because they
-				 * affect or potentially affect both read and write
-				 * operations.
-				 *
-				 * New subcommand types should be added here by default.
-				 */
-			case AT_AddColumn:	/* may rewrite heap, in some cases and visible
-								 * to SELECT */
-			case AT_DropColumn:	/* change visible to SELECT */
-			case AT_AddColumnToView:	/* CREATE VIEW */
-			case AT_AlterColumnType:	/* must rewrite heap */
-			case AT_DropConstraint:		/* as DROP INDEX */
-			case AT_AddOids:	/* must rewrite heap */
-			case AT_DropOids:	/* calls AT_DropColumn */
-			case AT_EnableAlwaysRule:	/* may change SELECT rules */
-			case AT_EnableReplicaRule:	/* may change SELECT rules */
-			case AT_EnableRule:	/* may change SELECT rules */
-			case AT_DisableRule:		/* may change SELECT rules */
-			case AT_ChangeOwner:		/* change visible to SELECT */
-			case AT_SetTableSpace:		/* must rewrite heap */
-			case AT_DropNotNull:		/* may change some SQL plans */
-			case AT_SetNotNull:
-			case AT_GenericOptions:
-				cmd_lockmode = AccessExclusiveLock;
-				break;
-
-				/*
-				 * These subcommands affect write operations only.
-				 */
-			case AT_ColumnDefault:
-			case AT_ProcessedConstraint:		/* becomes AT_AddConstraint */
-			case AT_AddConstraintRecurse:		/* becomes AT_AddConstraint */
-			case AT_EnableTrig:
-			case AT_EnableAlwaysTrig:
-			case AT_EnableReplicaTrig:
-			case AT_EnableTrigAll:
-			case AT_EnableTrigUser:
-			case AT_DisableTrig:
-			case AT_DisableTrigAll:
-			case AT_DisableTrigUser:
-			case AT_AddIndex:	/* from ADD CONSTRAINT */
-			case AT_AddIndexConstraint:
-				cmd_lockmode = ShareRowExclusiveLock;
-				break;
-
-			case AT_AddConstraint:
-				if (IsA(cmd->def, Constraint))
-				{
-					Constraint *con = (Constraint *) cmd->def;
-
-					switch (con->contype)
-					{
-						case CONSTR_EXCLUSION:
-						case CONSTR_PRIMARY:
-						case CONSTR_UNIQUE:
-
-							/*
-							 * Cases essentially the same as CREATE INDEX. We
-							 * could reduce the lock strength to ShareLock if
-							 * we can work out how to allow concurrent catalog
-							 * updates.
-							 */
-							cmd_lockmode = ShareRowExclusiveLock;
-							break;
-						case CONSTR_FOREIGN:
-
-							/*
-							 * We add triggers to both tables when we add a
-							 * Foreign Key, so the lock level must be at least
-							 * as strong as CREATE TRIGGER.
-							 */
-							cmd_lockmode = ShareRowExclusiveLock;
-							break;
-
-						default:
-							cmd_lockmode = ShareRowExclusiveLock;
-					}
-				}
-				break;
-
-				/*
-				 * These subcommands affect inheritance behaviour. Queries
-				 * started before us will continue to see the old inheritance
-				 * behaviour, while queries started after we commit will see
-				 * new behaviour. No need to prevent reads or writes to the
-				 * subtable while we hook it up though.
-				 */
-			case AT_AddInherit:
-			case AT_DropInherit:
-				cmd_lockmode = ShareUpdateExclusiveLock;
-				break;
-
-				/*
-				 * These subcommands affect implicit row type conversion. They
-				 * have affects similar to CREATE/DROP CAST on queries.  We
-				 * don't provide for invalidating parse trees as a result of
-				 * such changes.  Do avoid concurrent pg_class updates,
-				 * though.
-				 */
-			case AT_AddOf:
-			case AT_DropOf:
-				cmd_lockmode = ShareUpdateExclusiveLock;
-
-				/*
-				 * These subcommands affect general strategies for performance
-				 * and maintenance, though don't change the semantic results
-				 * from normal data reads and writes. Delaying an ALTER TABLE
-				 * behind currently active writes only delays the point where
-				 * the new strategy begins to take effect, so there is no
-				 * benefit in waiting. In this case the minimum restriction
-				 * applies: we don't currently allow concurrent catalog
-				 * updates.
-				 */
-			case AT_SetStatistics:
-			case AT_ClusterOn:
-			case AT_DropCluster:
-			case AT_SetRelOptions:
-			case AT_ResetRelOptions:
-			case AT_SetOptions:
-			case AT_ResetOptions:
-			case AT_SetStorage:
-			case AT_ValidateConstraint:
-				cmd_lockmode = ShareUpdateExclusiveLock;
-				break;
-
-			default:			/* oops */
-				elog(ERROR, "unrecognized alter table type: %d",
-					 (int) cmd->subtype);
-				break;
+		default:
+		  cmd_lockmode = ShareRowExclusiveLock;
 		}
+	    }
+	  break;
+
+	  /*
+	   * These subcommands affect inheritance behaviour. Queries
+	   * started before us will continue to see the old inheritance
+	   * behaviour, while queries started after we commit will see
+	   * new behaviour. No need to prevent reads or writes to the
+	   * subtable while we hook it up though.
+	   */
+	case AT_AddInherit:
+	case AT_DropInherit:
+	  cmd_lockmode = ShareUpdateExclusiveLock;
+	  break;
+
+	  /*
+	   * These subcommands affect implicit row type conversion. They
+	   * have affects similar to CREATE/DROP CAST on queries.  We
+	   * don't provide for invalidating parse trees as a result of
+	   * such changes.  Do avoid concurrent pg_class updates,
+	   * though.
+	   */
+	case AT_AddOf:
+	case AT_DropOf:
+	  cmd_lockmode = ShareUpdateExclusiveLock;
+
+	  /*
+	   * These subcommands affect general strategies for performance
+	   * and maintenance, though don't change the semantic results
+	   * from normal data reads and writes. Delaying an ALTER TABLE
+	   * behind currently active writes only delays the point where
+	   * the new strategy begins to take effect, so there is no
+	   * benefit in waiting. In this case the minimum restriction
+	   * applies: we don't currently allow concurrent catalog
+	   * updates.
+	   */
+	case AT_SetStatistics:
+	case AT_ClusterOn:
+	case AT_DropCluster:
+	case AT_SetRelOptions:
+	case AT_ResetRelOptions:
+	case AT_SetOptions:
+	case AT_ResetOptions:
+	case AT_SetStorage:
+	case AT_ValidateConstraint:
+	  cmd_lockmode = ShareUpdateExclusiveLock;
+	  break;
+
+	default:			/* oops */
+	  elog(ERROR, "unrecognized alter table type: %d",
+	       (int) cmd->subtype);
+	  break;
+	}
+
+      /*
+       * Take the greatest lockmode from any subcommand
+       */
+      if (cmd_lockmode > lockmode)
+	lockmode = cmd_lockmode;
+    }
+#else
+  LOCKMODE	lockmode = AccessExclusiveLock;
+#endif
 
-		/*
-		 * Take the greatest lockmode from any subcommand
-		 */
-		if (cmd_lockmode > lockmode)
-			lockmode = cmd_lockmode;
-	}
-
-	return lockmode;
+  return lockmode;
 }
 
 static void
 ATController(Relation rel, List *cmds, bool recurse, LOCKMODE lockmode)
 {
-	List	   *wqueue = NIL;
-	ListCell   *lcmd;
+  List	   *wqueue = NIL;
+  ListCell   *lcmd;
 
-	/* Phase 1: preliminary examination of commands, create work queue */
-	foreach(lcmd, cmds)
-	{
-		AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
+  /* Phase 1: preliminary examination of commands, create work queue */
+  foreach(lcmd, cmds)
+    {
+      AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
 
-		ATPrepCmd(&wqueue, rel, cmd, recurse, false, lockmode);
-	}
+      ATPrepCmd(&wqueue, rel, cmd, recurse, false, lockmode);
+    }
 
-	/* Close the relation, but keep lock until commit */
-	relation_close(rel, NoLock);
+  /* Close the relation, but keep lock until commit */
+  relation_close(rel, NoLock);
 
-	/* Phase 2: update system catalogs */
-	ATRewriteCatalogs(&wqueue, lockmode);
+  /* Phase 2: update system catalogs */
+  ATRewriteCatalogs(&wqueue, lockmode);
 
-	/* Phase 3: scan/rewrite tables as needed */
-	ATRewriteTables(&wqueue, lockmode);
+  /* Phase 3: scan/rewrite tables as needed */
+  ATRewriteTables(&wqueue, lockmode);
 }
 
 /*
@@ -2759,214 +2789,214 @@ ATController(Relation rel, List *cmds, bool recurse, LOCKMODE lockmode)
  */
 static void
 ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
-		  bool recurse, bool recursing, LOCKMODE lockmode)
+	  bool recurse, bool recursing, LOCKMODE lockmode)
 {
-	AlteredTableInfo *tab;
-	int			pass;
-
-	/* Find or create work queue entry for this table */
-	tab = ATGetQueueEntry(wqueue, rel);
-
-	/*
-	 * Copy the original subcommand for each table.  This avoids conflicts
-	 * when different child tables need to make different parse
-	 * transformations (for example, the same column may have different column
-	 * numbers in different children).
-	 */
-	cmd = copyObject(cmd);
-
-	/*
-	 * Do permissions checking, recursion to child tables if needed, and any
-	 * additional phase-1 processing needed.
-	 */
-	switch (cmd->subtype)
-	{
-		case AT_AddColumn:		/* ADD COLUMN */
-			ATSimplePermissions(rel,
-						 ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE);
-			ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
-			/* Recursion occurs during execution phase */
-			pass = AT_PASS_ADD_COL;
-			break;
-		case AT_AddColumnToView:		/* add column via CREATE OR REPLACE
-										 * VIEW */
-			ATSimplePermissions(rel, ATT_VIEW);
-			ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
-			/* Recursion occurs during execution phase */
-			pass = AT_PASS_ADD_COL;
-			break;
-		case AT_ColumnDefault:	/* ALTER COLUMN DEFAULT */
-
-			/*
-			 * We allow defaults on views so that INSERT into a view can have
-			 * default-ish behavior.  This works because the rewriter
-			 * substitutes default values into INSERTs before it expands
-			 * rules.
-			 */
-			ATSimplePermissions(rel, ATT_TABLE | ATT_VIEW);
-			ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
-			/* No command-specific prep needed */
-			pass = cmd->def ? AT_PASS_ADD_CONSTR : AT_PASS_DROP;
-			break;
-		case AT_DropNotNull:	/* ALTER COLUMN DROP NOT NULL */
-			ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);
-			ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
-			/* No command-specific prep needed */
-			pass = AT_PASS_DROP;
-			break;
-		case AT_SetNotNull:		/* ALTER COLUMN SET NOT NULL */
-			ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);
-			ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
-			/* No command-specific prep needed */
-			pass = AT_PASS_ADD_CONSTR;
-			break;
-		case AT_SetStatistics:	/* ALTER COLUMN SET STATISTICS */
-			ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
-			/* Performs own permission checks */
-			ATPrepSetStatistics(rel, cmd->name, cmd->def, lockmode);
-			pass = AT_PASS_MISC;
-			break;
-		case AT_SetOptions:		/* ALTER COLUMN SET ( options ) */
-		case AT_ResetOptions:	/* ALTER COLUMN RESET ( options ) */
-			ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX);
-			/* This command never recurses */
-			pass = AT_PASS_MISC;
-			break;
-		case AT_SetStorage:		/* ALTER COLUMN SET STORAGE */
-			ATSimplePermissions(rel, ATT_TABLE);
-			ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
-			/* No command-specific prep needed */
-			pass = AT_PASS_MISC;
-			break;
-		case AT_DropColumn:		/* DROP COLUMN */
-			ATSimplePermissions(rel,
-						 ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE);
-			ATPrepDropColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
-			/* Recursion occurs during execution phase */
-			pass = AT_PASS_DROP;
-			break;
-		case AT_AddIndex:		/* ADD INDEX */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* This command never recurses */
-			/* No command-specific prep needed */
-			pass = AT_PASS_ADD_INDEX;
-			break;
-		case AT_AddConstraint:	/* ADD CONSTRAINT */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* Recursion occurs during execution phase */
-			/* No command-specific prep needed except saving recurse flag */
-			if (recurse)
-				cmd->subtype = AT_AddConstraintRecurse;
-			pass = AT_PASS_ADD_CONSTR;
-			break;
-		case AT_AddIndexConstraint:		/* ADD CONSTRAINT USING INDEX */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* This command never recurses */
-			/* No command-specific prep needed */
-			pass = AT_PASS_ADD_CONSTR;
-			break;
-		case AT_DropConstraint:	/* DROP CONSTRAINT */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* Recursion occurs during execution phase */
-			/* No command-specific prep needed except saving recurse flag */
-			if (recurse)
-				cmd->subtype = AT_DropConstraintRecurse;
-			pass = AT_PASS_DROP;
-			break;
-		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
-			ATSimplePermissions(rel,
-						 ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE);
-			/* Performs own recursion */
-			ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd, lockmode);
-			pass = AT_PASS_ALTER_TYPE;
-			break;
-		case AT_ChangeOwner:	/* ALTER OWNER */
-			/* This command never recurses */
-			/* No command-specific prep needed */
-			pass = AT_PASS_MISC;
-			break;
-		case AT_ClusterOn:		/* CLUSTER ON */
-		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* These commands never recurse */
-			/* No command-specific prep needed */
-			pass = AT_PASS_MISC;
-			break;
-		case AT_AddOids:		/* SET WITH OIDS */
-			ATSimplePermissions(rel, ATT_TABLE);
-			if (!rel->rd_rel->relhasoids || recursing)
-				ATPrepAddOids(wqueue, rel, recurse, cmd, lockmode);
-			/* Recursion occurs during execution phase */
-			pass = AT_PASS_ADD_COL;
-			break;
-		case AT_DropOids:		/* SET WITHOUT OIDS */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* Performs own recursion */
-			if (rel->rd_rel->relhasoids)
-			{
-				AlterTableCmd *dropCmd = makeNode(AlterTableCmd);
-
-				dropCmd->subtype = AT_DropColumn;
-				dropCmd->name = pstrdup("oid");
-				dropCmd->behavior = cmd->behavior;
-				ATPrepCmd(wqueue, rel, dropCmd, recurse, false, lockmode);
-			}
-			pass = AT_PASS_DROP;
-			break;
-		case AT_SetTableSpace:	/* SET TABLESPACE */
-			ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX);
-			/* This command never recurses */
-			ATPrepSetTableSpace(tab, rel, cmd->name, lockmode);
-			pass = AT_PASS_MISC;	/* doesn't actually matter */
-			break;
-		case AT_SetRelOptions:	/* SET (...) */
-		case AT_ResetRelOptions:		/* RESET (...) */
-			ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX);
-			/* This command never recurses */
-			/* No command-specific prep needed */
-			pass = AT_PASS_MISC;
-			break;
-		case AT_AddInherit:		/* INHERIT */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* This command never recurses */
-			ATPrepAddInherit(rel);
-			pass = AT_PASS_MISC;
-			break;
-		case AT_ValidateConstraint:
-		case AT_EnableTrig:		/* ENABLE TRIGGER variants */
-		case AT_EnableAlwaysTrig:
-		case AT_EnableReplicaTrig:
-		case AT_EnableTrigAll:
-		case AT_EnableTrigUser:
-		case AT_DisableTrig:	/* DISABLE TRIGGER variants */
-		case AT_DisableTrigAll:
-		case AT_DisableTrigUser:
-		case AT_EnableRule:		/* ENABLE/DISABLE RULE variants */
-		case AT_EnableAlwaysRule:
-		case AT_EnableReplicaRule:
-		case AT_DisableRule:
-		case AT_DropInherit:	/* NO INHERIT */
-		case AT_AddOf:			/* OF */
-		case AT_DropOf: /* NOT OF */
-			ATSimplePermissions(rel, ATT_TABLE);
-			/* These commands never recurse */
-			/* No command-specific prep needed */
-			pass = AT_PASS_MISC;
-			break;
-		case AT_GenericOptions:
-			ATSimplePermissions(rel, ATT_FOREIGN_TABLE);
-			/* No command-specific prep needed */
-			pass = AT_PASS_MISC;
-			break;
-		default:				/* oops */
-			elog(ERROR, "unrecognized alter table type: %d",
-				 (int) cmd->subtype);
-			pass = 0;			/* keep compiler quiet */
-			break;
-	}
-
-	/* Add the subcommand to the appropriate list for phase 2 */
-	tab->subcmds[pass] = lappend(tab->subcmds[pass], cmd);
+  AlteredTableInfo *tab;
+  int			pass;
+
+  /* Find or create work queue entry for this table */
+  tab = ATGetQueueEntry(wqueue, rel);
+
+  /*
+   * Copy the original subcommand for each table.  This avoids conflicts
+   * when different child tables need to make different parse
+   * transformations (for example, the same column may have different column
+   * numbers in different children).
+   */
+  cmd = copyObject(cmd);
+
+  /*
+   * Do permissions checking, recursion to child tables if needed, and any
+   * additional phase-1 processing needed.
+   */
+  switch (cmd->subtype)
+    {
+    case AT_AddColumn:		/* ADD COLUMN */
+      ATSimplePermissions(rel,
+			  ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE);
+      ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
+      /* Recursion occurs during execution phase */
+      pass = AT_PASS_ADD_COL;
+      break;
+    case AT_AddColumnToView:		/* add column via CREATE OR REPLACE
+					 * VIEW */
+      ATSimplePermissions(rel, ATT_VIEW);
+      ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
+      /* Recursion occurs during execution phase */
+      pass = AT_PASS_ADD_COL;
+      break;
+    case AT_ColumnDefault:	/* ALTER COLUMN DEFAULT */
+
+      /*
+       * We allow defaults on views so that INSERT into a view can have
+       * default-ish behavior.  This works because the rewriter
+       * substitutes default values into INSERTs before it expands
+       * rules.
+       */
+      ATSimplePermissions(rel, ATT_TABLE | ATT_VIEW);
+      ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
+      /* No command-specific prep needed */
+      pass = cmd->def ? AT_PASS_ADD_CONSTR : AT_PASS_DROP;
+      break;
+    case AT_DropNotNull:	/* ALTER COLUMN DROP NOT NULL */
+      ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);
+      ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
+      /* No command-specific prep needed */
+      pass = AT_PASS_DROP;
+      break;
+    case AT_SetNotNull:		/* ALTER COLUMN SET NOT NULL */
+      ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);
+      ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
+      /* No command-specific prep needed */
+      pass = AT_PASS_ADD_CONSTR;
+      break;
+    case AT_SetStatistics:	/* ALTER COLUMN SET STATISTICS */
+      ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
+      /* Performs own permission checks */
+      ATPrepSetStatistics(rel, cmd->name, cmd->def, lockmode);
+      pass = AT_PASS_MISC;
+      break;
+    case AT_SetOptions:		/* ALTER COLUMN SET ( options ) */
+    case AT_ResetOptions:	/* ALTER COLUMN RESET ( options ) */
+      ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX);
+      /* This command never recurses */
+      pass = AT_PASS_MISC;
+      break;
+    case AT_SetStorage:		/* ALTER COLUMN SET STORAGE */
+      ATSimplePermissions(rel, ATT_TABLE);
+      ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
+      /* No command-specific prep needed */
+      pass = AT_PASS_MISC;
+      break;
+    case AT_DropColumn:		/* DROP COLUMN */
+      ATSimplePermissions(rel,
+			  ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE);
+      ATPrepDropColumn(wqueue, rel, recurse, recursing, cmd, lockmode);
+      /* Recursion occurs during execution phase */
+      pass = AT_PASS_DROP;
+      break;
+    case AT_AddIndex:		/* ADD INDEX */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* This command never recurses */
+      /* No command-specific prep needed */
+      pass = AT_PASS_ADD_INDEX;
+      break;
+    case AT_AddConstraint:	/* ADD CONSTRAINT */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* Recursion occurs during execution phase */
+      /* No command-specific prep needed except saving recurse flag */
+      if (recurse)
+	cmd->subtype = AT_AddConstraintRecurse;
+      pass = AT_PASS_ADD_CONSTR;
+      break;
+    case AT_AddIndexConstraint:		/* ADD CONSTRAINT USING INDEX */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* This command never recurses */
+      /* No command-specific prep needed */
+      pass = AT_PASS_ADD_CONSTR;
+      break;
+    case AT_DropConstraint:	/* DROP CONSTRAINT */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* Recursion occurs during execution phase */
+      /* No command-specific prep needed except saving recurse flag */
+      if (recurse)
+	cmd->subtype = AT_DropConstraintRecurse;
+      pass = AT_PASS_DROP;
+      break;
+    case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
+      ATSimplePermissions(rel,
+			  ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE);
+      /* Performs own recursion */
+      ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd, lockmode);
+      pass = AT_PASS_ALTER_TYPE;
+      break;
+    case AT_ChangeOwner:	/* ALTER OWNER */
+      /* This command never recurses */
+      /* No command-specific prep needed */
+      pass = AT_PASS_MISC;
+      break;
+    case AT_ClusterOn:		/* CLUSTER ON */
+    case AT_DropCluster:	/* SET WITHOUT CLUSTER */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* These commands never recurse */
+      /* No command-specific prep needed */
+      pass = AT_PASS_MISC;
+      break;
+    case AT_AddOids:		/* SET WITH OIDS */
+      ATSimplePermissions(rel, ATT_TABLE);
+      if (!rel->rd_rel->relhasoids || recursing)
+	ATPrepAddOids(wqueue, rel, recurse, cmd, lockmode);
+      /* Recursion occurs during execution phase */
+      pass = AT_PASS_ADD_COL;
+      break;
+    case AT_DropOids:		/* SET WITHOUT OIDS */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* Performs own recursion */
+      if (rel->rd_rel->relhasoids)
+	{
+	  AlterTableCmd *dropCmd = makeNode(AlterTableCmd);
+
+	  dropCmd->subtype = AT_DropColumn;
+	  dropCmd->name = pstrdup("oid");
+	  dropCmd->behavior = cmd->behavior;
+	  ATPrepCmd(wqueue, rel, dropCmd, recurse, false, lockmode);
+	}
+      pass = AT_PASS_DROP;
+      break;
+    case AT_SetTableSpace:	/* SET TABLESPACE */
+      ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX);
+      /* This command never recurses */
+      ATPrepSetTableSpace(tab, rel, cmd->name, lockmode);
+      pass = AT_PASS_MISC;	/* doesn't actually matter */
+      break;
+    case AT_SetRelOptions:	/* SET (...) */
+    case AT_ResetRelOptions:		/* RESET (...) */
+      ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX);
+      /* This command never recurses */
+      /* No command-specific prep needed */
+      pass = AT_PASS_MISC;
+      break;
+    case AT_AddInherit:		/* INHERIT */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* This command never recurses */
+      ATPrepAddInherit(rel);
+      pass = AT_PASS_MISC;
+      break;
+    case AT_ValidateConstraint:
+    case AT_EnableTrig:		/* ENABLE TRIGGER variants */
+    case AT_EnableAlwaysTrig:
+    case AT_EnableReplicaTrig:
+    case AT_EnableTrigAll:
+    case AT_EnableTrigUser:
+    case AT_DisableTrig:	/* DISABLE TRIGGER variants */
+    case AT_DisableTrigAll:
+    case AT_DisableTrigUser:
+    case AT_EnableRule:		/* ENABLE/DISABLE RULE variants */
+    case AT_EnableAlwaysRule:
+    case AT_EnableReplicaRule:
+    case AT_DisableRule:
+    case AT_DropInherit:	/* NO INHERIT */
+    case AT_AddOf:			/* OF */
+    case AT_DropOf: /* NOT OF */
+      ATSimplePermissions(rel, ATT_TABLE);
+      /* These commands never recurse */
+      /* No command-specific prep needed */
+      pass = AT_PASS_MISC;
+      break;
+    case AT_GenericOptions:
+      ATSimplePermissions(rel, ATT_FOREIGN_TABLE);
+      /* No command-specific prep needed */
+      pass = AT_PASS_MISC;
+      break;
+    default:				/* oops */
+      elog(ERROR, "unrecognized alter table type: %d",
+	   (int) cmd->subtype);
+      pass = 0;			/* keep compiler quiet */
+      break;
+    }
+
+  /* Add the subcommand to the appropriate list for phase 2 */
+  tab->subcmds[pass] = lappend(tab->subcmds[pass], cmd);
 }
 
 /*
@@ -2979,57 +3009,57 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 static void
 ATRewriteCatalogs(List **wqueue, LOCKMODE lockmode)
 {
-	int			pass;
-	ListCell   *ltab;
-
-	/*
-	 * We process all the tables "in parallel", one pass at a time.  This is
-	 * needed because we may have to propagate work from one table to another
-	 * (specifically, ALTER TYPE on a foreign key's PK has to dispatch the
-	 * re-adding of the foreign key constraint to the other table).  Work can
-	 * only be propagated into later passes, however.
-	 */
-	for (pass = 0; pass < AT_NUM_PASSES; pass++)
-	{
-		/* Go through each table that needs to be processed */
-		foreach(ltab, *wqueue)
-		{
-			AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
-			List	   *subcmds = tab->subcmds[pass];
-			Relation	rel;
-			ListCell   *lcmd;
-
-			if (subcmds == NIL)
-				continue;
-
-			/*
-			 * Appropriate lock was obtained by phase 1, needn't get it again
-			 */
-			rel = relation_open(tab->relid, NoLock);
-
-			foreach(lcmd, subcmds)
-				ATExecCmd(wqueue, tab, rel, (AlterTableCmd *) lfirst(lcmd), lockmode);
-
-			/*
-			 * After the ALTER TYPE pass, do cleanup work (this is not done in
-			 * ATExecAlterColumnType since it should be done only once if
-			 * multiple columns of a table are altered).
-			 */
-			if (pass == AT_PASS_ALTER_TYPE)
-				ATPostAlterTypeCleanup(wqueue, tab, lockmode);
-
-			relation_close(rel, NoLock);
-		}
-	}
-
-	/* Check to see if a toast table must be added. */
-	foreach(ltab, *wqueue)
-	{
-		AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
-
-		if (tab->relkind == RELKIND_RELATION)
-			AlterTableCreateToastTable(tab->relid, (Datum) 0);
-	}
+  int			pass;
+  ListCell   *ltab;
+
+  /*
+   * We process all the tables "in parallel", one pass at a time.  This is
+   * needed because we may have to propagate work from one table to another
+   * (specifically, ALTER TYPE on a foreign key's PK has to dispatch the
+   * re-adding of the foreign key constraint to the other table).  Work can
+   * only be propagated into later passes, however.
+   */
+  for (pass = 0; pass < AT_NUM_PASSES; pass++)
+    {
+      /* Go through each table that needs to be processed */
+      foreach(ltab, *wqueue)
+	{
+	  AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
+	  List	   *subcmds = tab->subcmds[pass];
+	  Relation	rel;
+	  ListCell   *lcmd;
+
+	  if (subcmds == NIL)
+	    continue;
+
+	  /*
+	   * Appropriate lock was obtained by phase 1, needn't get it again
+	   */
+	  rel = relation_open(tab->relid, NoLock);
+
+	  foreach(lcmd, subcmds)
+	    ATExecCmd(wqueue, tab, rel, (AlterTableCmd *) lfirst(lcmd), lockmode);
+
+	  /*
+	   * After the ALTER TYPE pass, do cleanup work (this is not done in
+	   * ATExecAlterColumnType since it should be done only once if
+	   * multiple columns of a table are altered).
+	   */
+	  if (pass == AT_PASS_ALTER_TYPE)
+	    ATPostAlterTypeCleanup(wqueue, tab, lockmode);
+
+	  relation_close(rel, NoLock);
+	}
+    }
+
+  /* Check to see if a toast table must be added. */
+  foreach(ltab, *wqueue)
+    {
+      AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
+
+      if (tab->relkind == RELKIND_RELATION)
+	AlterTableCreateToastTable(tab->relid, (Datum) 0);
+    }
 }
 
 /*
@@ -3037,201 +3067,201 @@ ATRewriteCatalogs(List **wqueue, LOCKMODE lockmode)
  */
 static void
 ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
-		  AlterTableCmd *cmd, LOCKMODE lockmode)
+	  AlterTableCmd *cmd, LOCKMODE lockmode)
 {
-	switch (cmd->subtype)
-	{
-		case AT_AddColumn:		/* ADD COLUMN */
-		case AT_AddColumnToView:		/* add column via CREATE OR REPLACE
-										 * VIEW */
-			ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
-							false, false, false, lockmode);
-			break;
-		case AT_AddColumnRecurse:
-			ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
-							false, true, false, lockmode);
-			break;
-		case AT_ColumnDefault:	/* ALTER COLUMN DEFAULT */
-			ATExecColumnDefault(rel, cmd->name, cmd->def, lockmode);
-			break;
-		case AT_DropNotNull:	/* ALTER COLUMN DROP NOT NULL */
-			ATExecDropNotNull(rel, cmd->name, lockmode);
-			break;
-		case AT_SetNotNull:		/* ALTER COLUMN SET NOT NULL */
-			ATExecSetNotNull(tab, rel, cmd->name, lockmode);
-			break;
-		case AT_SetStatistics:	/* ALTER COLUMN SET STATISTICS */
-			ATExecSetStatistics(rel, cmd->name, cmd->def, lockmode);
-			break;
-		case AT_SetOptions:		/* ALTER COLUMN SET ( options ) */
-			ATExecSetOptions(rel, cmd->name, cmd->def, false, lockmode);
-			break;
-		case AT_ResetOptions:	/* ALTER COLUMN RESET ( options ) */
-			ATExecSetOptions(rel, cmd->name, cmd->def, true, lockmode);
-			break;
-		case AT_SetStorage:		/* ALTER COLUMN SET STORAGE */
-			ATExecSetStorage(rel, cmd->name, cmd->def, lockmode);
-			break;
-		case AT_DropColumn:		/* DROP COLUMN */
-			ATExecDropColumn(wqueue, rel, cmd->name,
-					 cmd->behavior, false, false, cmd->missing_ok, lockmode);
-			break;
-		case AT_DropColumnRecurse:		/* DROP COLUMN with recursion */
-			ATExecDropColumn(wqueue, rel, cmd->name,
-					  cmd->behavior, true, false, cmd->missing_ok, lockmode);
-			break;
-		case AT_AddIndex:		/* ADD INDEX */
-			ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, false, lockmode);
-			break;
-		case AT_ReAddIndex:		/* ADD INDEX */
-			ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, true, lockmode);
-			break;
-		case AT_AddConstraint:	/* ADD CONSTRAINT */
-			ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
-								false, lockmode);
-			break;
-		case AT_AddConstraintRecurse:	/* ADD CONSTRAINT with recursion */
-			ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
-								true, lockmode);
-			break;
-		case AT_AddIndexConstraint:		/* ADD CONSTRAINT USING INDEX */
-			ATExecAddIndexConstraint(tab, rel, (IndexStmt *) cmd->def, lockmode);
-			break;
-		case AT_ValidateConstraint:
-			ATExecValidateConstraint(rel, cmd->name);
-			break;
-		case AT_DropConstraint:	/* DROP CONSTRAINT */
-			ATExecDropConstraint(rel, cmd->name, cmd->behavior,
-								 false, false,
-								 cmd->missing_ok, lockmode);
-			break;
-		case AT_DropConstraintRecurse:	/* DROP CONSTRAINT with recursion */
-			ATExecDropConstraint(rel, cmd->name, cmd->behavior,
-								 true, false,
-								 cmd->missing_ok, lockmode);
-			break;
-		case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
-			ATExecAlterColumnType(tab, rel, cmd, lockmode);
-			break;
-		case AT_ChangeOwner:	/* ALTER OWNER */
-			ATExecChangeOwner(RelationGetRelid(rel),
-							  get_role_oid(cmd->name, false),
-							  false, lockmode);
-			break;
-		case AT_ClusterOn:		/* CLUSTER ON */
-			ATExecClusterOn(rel, cmd->name, lockmode);
-			break;
-		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
-			ATExecDropCluster(rel, lockmode);
-			break;
-		case AT_AddOids:		/* SET WITH OIDS */
-			/* Use the ADD COLUMN code, unless prep decided to do nothing */
-			if (cmd->def != NULL)
-				ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
-								true, false, false, lockmode);
-			break;
-		case AT_AddOidsRecurse:	/* SET WITH OIDS */
-			/* Use the ADD COLUMN code, unless prep decided to do nothing */
-			if (cmd->def != NULL)
-				ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
-								true, true, false, lockmode);
-			break;
-		case AT_DropOids:		/* SET WITHOUT OIDS */
-
-			/*
-			 * Nothing to do here; we'll have generated a DropColumn
-			 * subcommand to do the real work
-			 */
-			break;
-		case AT_SetTableSpace:	/* SET TABLESPACE */
-
-			/*
-			 * Nothing to do here; Phase 3 does the work
-			 */
-			break;
-		case AT_SetRelOptions:	/* SET (...) */
-			ATExecSetRelOptions(rel, (List *) cmd->def, false, lockmode);
-			break;
-		case AT_ResetRelOptions:		/* RESET (...) */
-			ATExecSetRelOptions(rel, (List *) cmd->def, true, lockmode);
-			break;
-
-		case AT_EnableTrig:		/* ENABLE TRIGGER name */
-			ATExecEnableDisableTrigger(rel, cmd->name,
-								   TRIGGER_FIRES_ON_ORIGIN, false, lockmode);
-			break;
-		case AT_EnableAlwaysTrig:		/* ENABLE ALWAYS TRIGGER name */
-			ATExecEnableDisableTrigger(rel, cmd->name,
-									   TRIGGER_FIRES_ALWAYS, false, lockmode);
-			break;
-		case AT_EnableReplicaTrig:		/* ENABLE REPLICA TRIGGER name */
-			ATExecEnableDisableTrigger(rel, cmd->name,
-								  TRIGGER_FIRES_ON_REPLICA, false, lockmode);
-			break;
-		case AT_DisableTrig:	/* DISABLE TRIGGER name */
-			ATExecEnableDisableTrigger(rel, cmd->name,
-									   TRIGGER_DISABLED, false, lockmode);
-			break;
-		case AT_EnableTrigAll:	/* ENABLE TRIGGER ALL */
-			ATExecEnableDisableTrigger(rel, NULL,
-								   TRIGGER_FIRES_ON_ORIGIN, false, lockmode);
-			break;
-		case AT_DisableTrigAll:	/* DISABLE TRIGGER ALL */
-			ATExecEnableDisableTrigger(rel, NULL,
-									   TRIGGER_DISABLED, false, lockmode);
-			break;
-		case AT_EnableTrigUser:	/* ENABLE TRIGGER USER */
-			ATExecEnableDisableTrigger(rel, NULL,
-									TRIGGER_FIRES_ON_ORIGIN, true, lockmode);
-			break;
-		case AT_DisableTrigUser:		/* DISABLE TRIGGER USER */
-			ATExecEnableDisableTrigger(rel, NULL,
-									   TRIGGER_DISABLED, true, lockmode);
-			break;
-
-		case AT_EnableRule:		/* ENABLE RULE name */
-			ATExecEnableDisableRule(rel, cmd->name,
-									RULE_FIRES_ON_ORIGIN, lockmode);
-			break;
-		case AT_EnableAlwaysRule:		/* ENABLE ALWAYS RULE name */
-			ATExecEnableDisableRule(rel, cmd->name,
-									RULE_FIRES_ALWAYS, lockmode);
-			break;
-		case AT_EnableReplicaRule:		/* ENABLE REPLICA RULE name */
-			ATExecEnableDisableRule(rel, cmd->name,
-									RULE_FIRES_ON_REPLICA, lockmode);
-			break;
-		case AT_DisableRule:	/* DISABLE RULE name */
-			ATExecEnableDisableRule(rel, cmd->name,
-									RULE_DISABLED, lockmode);
-			break;
-
-		case AT_AddInherit:
-			ATExecAddInherit(rel, (RangeVar *) cmd->def, lockmode);
-			break;
-		case AT_DropInherit:
-			ATExecDropInherit(rel, (RangeVar *) cmd->def, lockmode);
-			break;
-		case AT_AddOf:
-			ATExecAddOf(rel, (TypeName *) cmd->def, lockmode);
-			break;
-		case AT_DropOf:
-			ATExecDropOf(rel, lockmode);
-			break;
-		case AT_GenericOptions:
-			ATExecGenericOptions(rel, (List *) cmd->def);
-			break;
-		default:				/* oops */
-			elog(ERROR, "unrecognized alter table type: %d",
-				 (int) cmd->subtype);
-			break;
-	}
-
-	/*
-	 * Bump the command counter to ensure the next subcommand in the sequence
-	 * can see the changes so far
-	 */
-	CommandCounterIncrement();
+  switch (cmd->subtype)
+    {
+    case AT_AddColumn:		/* ADD COLUMN */
+    case AT_AddColumnToView:		/* add column via CREATE OR REPLACE
+					 * VIEW */
+      ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
+		      false, false, false, lockmode);
+      break;
+    case AT_AddColumnRecurse:
+      ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
+		      false, true, false, lockmode);
+      break;
+    case AT_ColumnDefault:	/* ALTER COLUMN DEFAULT */
+      ATExecColumnDefault(rel, cmd->name, cmd->def, lockmode);
+      break;
+    case AT_DropNotNull:	/* ALTER COLUMN DROP NOT NULL */
+      ATExecDropNotNull(rel, cmd->name, lockmode);
+      break;
+    case AT_SetNotNull:		/* ALTER COLUMN SET NOT NULL */
+      ATExecSetNotNull(tab, rel, cmd->name, lockmode);
+      break;
+    case AT_SetStatistics:	/* ALTER COLUMN SET STATISTICS */
+      ATExecSetStatistics(rel, cmd->name, cmd->def, lockmode);
+      break;
+    case AT_SetOptions:		/* ALTER COLUMN SET ( options ) */
+      ATExecSetOptions(rel, cmd->name, cmd->def, false, lockmode);
+      break;
+    case AT_ResetOptions:	/* ALTER COLUMN RESET ( options ) */
+      ATExecSetOptions(rel, cmd->name, cmd->def, true, lockmode);
+      break;
+    case AT_SetStorage:		/* ALTER COLUMN SET STORAGE */
+      ATExecSetStorage(rel, cmd->name, cmd->def, lockmode);
+      break;
+    case AT_DropColumn:		/* DROP COLUMN */
+      ATExecDropColumn(wqueue, rel, cmd->name,
+		       cmd->behavior, false, false, cmd->missing_ok, lockmode);
+      break;
+    case AT_DropColumnRecurse:		/* DROP COLUMN with recursion */
+      ATExecDropColumn(wqueue, rel, cmd->name,
+		       cmd->behavior, true, false, cmd->missing_ok, lockmode);
+      break;
+    case AT_AddIndex:		/* ADD INDEX */
+      ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, false, lockmode);
+      break;
+    case AT_ReAddIndex:		/* ADD INDEX */
+      ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, true, lockmode);
+      break;
+    case AT_AddConstraint:	/* ADD CONSTRAINT */
+      ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
+			  false, lockmode);
+      break;
+    case AT_AddConstraintRecurse:	/* ADD CONSTRAINT with recursion */
+      ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
+			  true, lockmode);
+      break;
+    case AT_AddIndexConstraint:		/* ADD CONSTRAINT USING INDEX */
+      ATExecAddIndexConstraint(tab, rel, (IndexStmt *) cmd->def, lockmode);
+      break;
+    case AT_ValidateConstraint:
+      ATExecValidateConstraint(rel, cmd->name);
+      break;
+    case AT_DropConstraint:	/* DROP CONSTRAINT */
+      ATExecDropConstraint(rel, cmd->name, cmd->behavior,
+			   false, false,
+			   cmd->missing_ok, lockmode);
+      break;
+    case AT_DropConstraintRecurse:	/* DROP CONSTRAINT with recursion */
+      ATExecDropConstraint(rel, cmd->name, cmd->behavior,
+			   true, false,
+			   cmd->missing_ok, lockmode);
+      break;
+    case AT_AlterColumnType:		/* ALTER COLUMN TYPE */
+      ATExecAlterColumnType(tab, rel, cmd, lockmode);
+      break;
+    case AT_ChangeOwner:	/* ALTER OWNER */
+      ATExecChangeOwner(RelationGetRelid(rel),
+			get_role_oid(cmd->name, false),
+			false, lockmode);
+      break;
+    case AT_ClusterOn:		/* CLUSTER ON */
+      ATExecClusterOn(rel, cmd->name, lockmode);
+      break;
+    case AT_DropCluster:	/* SET WITHOUT CLUSTER */
+      ATExecDropCluster(rel, lockmode);
+      break;
+    case AT_AddOids:		/* SET WITH OIDS */
+      /* Use the ADD COLUMN code, unless prep decided to do nothing */
+      if (cmd->def != NULL)
+	ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
+			true, false, false, lockmode);
+      break;
+    case AT_AddOidsRecurse:	/* SET WITH OIDS */
+      /* Use the ADD COLUMN code, unless prep decided to do nothing */
+      if (cmd->def != NULL)
+	ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def,
+			true, true, false, lockmode);
+      break;
+    case AT_DropOids:		/* SET WITHOUT OIDS */
+
+      /*
+       * Nothing to do here; we'll have generated a DropColumn
+       * subcommand to do the real work
+       */
+      break;
+    case AT_SetTableSpace:	/* SET TABLESPACE */
+
+      /*
+       * Nothing to do here; Phase 3 does the work
+       */
+      break;
+    case AT_SetRelOptions:	/* SET (...) */
+      ATExecSetRelOptions(rel, (List *) cmd->def, false, lockmode);
+      break;
+    case AT_ResetRelOptions:		/* RESET (...) */
+      ATExecSetRelOptions(rel, (List *) cmd->def, true, lockmode);
+      break;
+
+    case AT_EnableTrig:		/* ENABLE TRIGGER name */
+      ATExecEnableDisableTrigger(rel, cmd->name,
+				 TRIGGER_FIRES_ON_ORIGIN, false, lockmode);
+      break;
+    case AT_EnableAlwaysTrig:		/* ENABLE ALWAYS TRIGGER name */
+      ATExecEnableDisableTrigger(rel, cmd->name,
+				 TRIGGER_FIRES_ALWAYS, false, lockmode);
+      break;
+    case AT_EnableReplicaTrig:		/* ENABLE REPLICA TRIGGER name */
+      ATExecEnableDisableTrigger(rel, cmd->name,
+				 TRIGGER_FIRES_ON_REPLICA, false, lockmode);
+      break;
+    case AT_DisableTrig:	/* DISABLE TRIGGER name */
+      ATExecEnableDisableTrigger(rel, cmd->name,
+				 TRIGGER_DISABLED, false, lockmode);
+      break;
+    case AT_EnableTrigAll:	/* ENABLE TRIGGER ALL */
+      ATExecEnableDisableTrigger(rel, NULL,
+				 TRIGGER_FIRES_ON_ORIGIN, false, lockmode);
+      break;
+    case AT_DisableTrigAll:	/* DISABLE TRIGGER ALL */
+      ATExecEnableDisableTrigger(rel, NULL,
+				 TRIGGER_DISABLED, false, lockmode);
+      break;
+    case AT_EnableTrigUser:	/* ENABLE TRIGGER USER */
+      ATExecEnableDisableTrigger(rel, NULL,
+				 TRIGGER_FIRES_ON_ORIGIN, true, lockmode);
+      break;
+    case AT_DisableTrigUser:		/* DISABLE TRIGGER USER */
+      ATExecEnableDisableTrigger(rel, NULL,
+				 TRIGGER_DISABLED, true, lockmode);
+      break;
+
+    case AT_EnableRule:		/* ENABLE RULE name */
+      ATExecEnableDisableRule(rel, cmd->name,
+			      RULE_FIRES_ON_ORIGIN, lockmode);
+      break;
+    case AT_EnableAlwaysRule:		/* ENABLE ALWAYS RULE name */
+      ATExecEnableDisableRule(rel, cmd->name,
+			      RULE_FIRES_ALWAYS, lockmode);
+      break;
+    case AT_EnableReplicaRule:		/* ENABLE REPLICA RULE name */
+      ATExecEnableDisableRule(rel, cmd->name,
+			      RULE_FIRES_ON_REPLICA, lockmode);
+      break;
+    case AT_DisableRule:	/* DISABLE RULE name */
+      ATExecEnableDisableRule(rel, cmd->name,
+			      RULE_DISABLED, lockmode);
+      break;
+
+    case AT_AddInherit:
+      ATExecAddInherit(rel, (RangeVar *) cmd->def, lockmode);
+      break;
+    case AT_DropInherit:
+      ATExecDropInherit(rel, (RangeVar *) cmd->def, lockmode);
+      break;
+    case AT_AddOf:
+      ATExecAddOf(rel, (TypeName *) cmd->def, lockmode);
+      break;
+    case AT_DropOf:
+      ATExecDropOf(rel, lockmode);
+      break;
+    case AT_GenericOptions:
+      ATExecGenericOptions(rel, (List *) cmd->def);
+      break;
+    default:				/* oops */
+      elog(ERROR, "unrecognized alter table type: %d",
+	   (int) cmd->subtype);
+      break;
+    }
+
+  /*
+   * Bump the command counter to ensure the next subcommand in the sequence
+   * can see the changes so far
+   */
+  CommandCounterIncrement();
 }
 
 /*
@@ -3240,171 +3270,169 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 static void
 ATRewriteTables(List **wqueue, LOCKMODE lockmode)
 {
-	ListCell   *ltab;
-
-	/* Go through each table that needs to be checked or rewritten */
-	foreach(ltab, *wqueue)
-	{
-		AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
-
-		/* Foreign tables have no storage. */
-		if (tab->relkind == RELKIND_FOREIGN_TABLE)
-			continue;
-
-		/*
-		 * If we change column data types or add/remove OIDs, the operation
-		 * has to be propagated to tables that use this table's rowtype as a
-		 * column type.  tab->newvals will also be non-NULL in the case where
-		 * we're adding a column with a default.  We choose to forbid that
-		 * case as well, since composite types might eventually support
-		 * defaults.
-		 *
-		 * (Eventually we'll probably need to check for composite type
-		 * dependencies even when we're just scanning the table without a
-		 * rewrite, but at the moment a composite type does not enforce any
-		 * constraints, so it's not necessary/appropriate to enforce them just
-		 * during ALTER.)
-		 */
-		if (tab->newvals != NIL || tab->rewrite)
-		{
-			Relation	rel;
-
-			rel = heap_open(tab->relid, NoLock);
-			find_composite_type_dependencies(rel->rd_rel->reltype, rel, NULL);
-			heap_close(rel, NoLock);
-		}
-
-		/*
-		 * We only need to rewrite the table if at least one column needs to
-		 * be recomputed, or we are adding/removing the OID column.
-		 */
-		if (tab->rewrite)
+  ListCell   *ltab;
+
+  /* Go through each table that needs to be checked or rewritten */
+  foreach(ltab, *wqueue)
+    {
+      AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
+
+      /* Foreign tables have no storage. */
+      if (tab->relkind == RELKIND_FOREIGN_TABLE)
+	continue;
+
+      /*
+       * If we change column data types or add/remove OIDs, the operation
+       * has to be propagated to tables that use this table's rowtype as a
+       * column type.  tab->newvals will also be non-NULL in the case where
+       * we're adding a column with a default.  We choose to forbid that
+       * case as well, since composite types might eventually support
+       * defaults.
+       *
+       * (Eventually we'll probably need to check for composite type
+       * dependencies even when we're just scanning the table without a
+       * rewrite, but at the moment a composite type does not enforce any
+       * constraints, so it's not necessary/appropriate to enforce them just
+       * during ALTER.)
+       */
+      if (tab->newvals != NIL || tab->rewrite)
+	{
+	  Relation	rel;
+
+	  rel = heap_open(tab->relid, NoLock);
+	  find_composite_type_dependencies(rel->rd_rel->reltype, rel, NULL);
+	  heap_close(rel, NoLock);
+	}
+
+      /*
+       * We only need to rewrite the table if at least one column needs to
+       * be recomputed, or we are adding/removing the OID column.
+       */
+      if (tab->rewrite)
+	{
+	  /* Build a temporary relation and copy data */
+	  Relation	OldHeap;
+	  Oid			OIDNewHeap;
+	  Oid			NewTableSpace;
+
+	  OldHeap = heap_open(tab->relid, NoLock);
+
+	  /*
+	   * We don't support rewriting of system catalogs; there are too
+	   * many corner cases and too little benefit.  In particular this
+	   * is certainly not going to work for mapped catalogs.
+	   */
+	  if (IsSystemRelation(OldHeap))
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot rewrite system relation \"%s\"",
+			    RelationGetRelationName(OldHeap))));
+
+	  /*
+	   * Don't allow rewrite on temp tables of other backends ... their
+	   * local buffer manager is not going to cope.
+	   */
+	  if (RELATION_IS_OTHER_TEMP(OldHeap))
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot rewrite temporary tables of other sessions")));
+
+	  /*
+	   * Select destination tablespace (same as original unless user
+	   * requested a change)
+	   */
+	  if (tab->newTableSpace)
+	    NewTableSpace = tab->newTableSpace;
+	  else
+	    NewTableSpace = OldHeap->rd_rel->reltablespace;
+
+	  heap_close(OldHeap, NoLock);
+
+	  /* Create transient table that will receive the modified data */
+	  OIDNewHeap = make_new_heap(tab->relid, NewTableSpace);
+
+	  /*
+	   * Copy the heap data into the new table with the desired
+	   * modifications, and test the current data within the table
+	   * against new constraints generated by ALTER TABLE commands.
+	   */
+	  ATRewriteTable(tab, OIDNewHeap, lockmode);
+
+	  /*
+	   * Swap the physical files of the old and new heaps, then rebuild
+	   * indexes and discard the old heap.  We can use RecentXmin for
+	   * the table's new relfrozenxid because we rewrote all the tuples
+	   * in ATRewriteTable, so no older Xid remains in the table.  Also,
+	   * we never try to swap toast tables by content, since we have no
+	   * interest in letting this code work on system catalogs.
+	   */
+	  finish_heap_swap(tab->relid, OIDNewHeap,
+			   false, false, true, RecentXmin);
+	}
+      else
+	{
+	  /*
+	   * Test the current data within the table against new constraints
+	   * generated by ALTER TABLE commands, but don't rebuild data.
+	   */
+	  if (tab->constraints != NIL || tab->new_notnull)
+	    ATRewriteTable(tab, InvalidOid, lockmode);
+
+	  /*
+	   * If we had SET TABLESPACE but no reason to reconstruct tuples,
+	   * just do a block-by-block copy.
+	   */
+	  if (tab->newTableSpace)
+	    ATExecSetTableSpace(tab->relid, tab->newTableSpace, lockmode);
+	}
+    }
+
+  /*
+   * Foreign key constraints are checked in a final pass, since (a) it's
+   * generally best to examine each one separately, and (b) it's at least
+   * theoretically possible that we have changed both relations of the
+   * foreign key, and we'd better have finished both rewrites before we try
+   * to read the tables.
+   */
+  foreach(ltab, *wqueue)
+    {
+      AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
+      Relation	rel = NULL;
+      ListCell   *lcon;
+
+      foreach(lcon, tab->constraints)
+	{
+	  NewConstraint *con = lfirst(lcon);
+
+	  if (con->contype == CONSTR_FOREIGN)
+	    {
+	      Constraint *fkconstraint = (Constraint *) con->qual;
+	      Relation	refrel;
+
+	      if (rel == NULL)
 		{
-			/* Build a temporary relation and copy data */
-			Relation	OldHeap;
-			Oid			OIDNewHeap;
-			Oid			NewTableSpace;
-
-			OldHeap = heap_open(tab->relid, NoLock);
-
-			/*
-			 * We don't support rewriting of system catalogs; there are too
-			 * many corner cases and too little benefit.  In particular this
-			 * is certainly not going to work for mapped catalogs.
-			 */
-			if (IsSystemRelation(OldHeap))
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot rewrite system relation \"%s\"",
-								RelationGetRelationName(OldHeap))));
-
-			/*
-			 * Don't allow rewrite on temp tables of other backends ... their
-			 * local buffer manager is not going to cope.
-			 */
-			if (RELATION_IS_OTHER_TEMP(OldHeap))
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				errmsg("cannot rewrite temporary tables of other sessions")));
-
-			/*
-			 * Select destination tablespace (same as original unless user
-			 * requested a change)
-			 */
-			if (tab->newTableSpace)
-				NewTableSpace = tab->newTableSpace;
-			else
-				NewTableSpace = OldHeap->rd_rel->reltablespace;
-
-			heap_close(OldHeap, NoLock);
-
-			/* Create transient table that will receive the modified data */
-			OIDNewHeap = make_new_heap(tab->relid, NewTableSpace);
-
-			/*
-			 * Copy the heap data into the new table with the desired
-			 * modifications, and test the current data within the table
-			 * against new constraints generated by ALTER TABLE commands.
-			 */
-			ATRewriteTable(tab, OIDNewHeap, lockmode);
-
-			/*
-			 * Swap the physical files of the old and new heaps, then rebuild
-			 * indexes and discard the old heap.  We can use RecentXmin for
-			 * the table's new relfrozenxid because we rewrote all the tuples
-			 * in ATRewriteTable, so no older Xid remains in the table.  Also,
-			 * we never try to swap toast tables by content, since we have no
-			 * interest in letting this code work on system catalogs.
-			 */
-			finish_heap_swap(tab->relid, OIDNewHeap,
-							 false, false, true, RecentXmin);
+		  /* Long since locked, no need for another */
+		  rel = heap_open(tab->relid, NoLock);
 		}
-		else
-		{
-			/*
-			 * Test the current data within the table against new constraints
-			 * generated by ALTER TABLE commands, but don't rebuild data.
-			 */
-			if (tab->constraints != NIL || tab->new_notnull)
-				ATRewriteTable(tab, InvalidOid, lockmode);
-
-			/*
-			 * If we had SET TABLESPACE but no reason to reconstruct tuples,
-			 * just do a block-by-block copy.
-			 */
-			if (tab->newTableSpace)
-				ATExecSetTableSpace(tab->relid, tab->newTableSpace, lockmode);
-		}
-	}
-
-	/*
-	 * Foreign key constraints are checked in a final pass, since (a) it's
-	 * generally best to examine each one separately, and (b) it's at least
-	 * theoretically possible that we have changed both relations of the
-	 * foreign key, and we'd better have finished both rewrites before we try
-	 * to read the tables.
-	 */
-	foreach(ltab, *wqueue)
-	{
-		AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
-		Relation	rel = NULL;
-		ListCell   *lcon;
-
-		foreach(lcon, tab->constraints)
-		{
-			NewConstraint *con = lfirst(lcon);
-
-			if (con->contype == CONSTR_FOREIGN)
-			{
-				Constraint *fkconstraint = (Constraint *) con->qual;
-				Relation	refrel;
-
-				if (rel == NULL)
-					/* Long since locked, no need for another */
-					rel = heap_open(tab->relid, NoLock);
 
-				/*
-				 * We're adding a trigger to both tables, so the lock level
-				 * here should sensibly reflect that.
-				 */
-				refrel = heap_open(con->refrelid, ShareRowExclusiveLock);
+	      refrel = heap_open(con->refrelid, RowShareLock);
 
-				validateForeignKeyConstraint(fkconstraint->conname, rel, refrel,
-											 con->refindid,
-											 con->conid);
+	      validateForeignKeyConstraint(fkconstraint->conname, rel, refrel,
+					   con->refindid,
+					   con->conid);
 
-				/*
-				 * No need to mark the constraint row as validated, we did
-				 * that when we inserted the row earlier.
-				 */
+	      /*
+	       * No need to mark the constraint row as validated, we did
+	       * that when we inserted the row earlier.
+	       */
 
-				heap_close(refrel, NoLock);
-			}
-		}
-
-		if (rel)
-			heap_close(rel, NoLock);
+	      heap_close(refrel, NoLock);
+	    }
 	}
+
+      if (rel)
+	heap_close(rel, NoLock);
+    }
 }
 
 /*
@@ -3415,289 +3443,289 @@ ATRewriteTables(List **wqueue, LOCKMODE lockmode)
 static void
 ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 {
-	Relation	oldrel;
-	Relation	newrel;
-	TupleDesc	oldTupDesc;
-	TupleDesc	newTupDesc;
-	bool		needscan = false;
-	List	   *notnull_attrs;
-	int			i;
-	ListCell   *l;
-	EState	   *estate;
-	CommandId	mycid;
-	BulkInsertState bistate;
-	int			hi_options;
-
-	/*
-	 * Open the relation(s).  We have surely already locked the existing
-	 * table.
-	 */
-	oldrel = heap_open(tab->relid, NoLock);
-	oldTupDesc = tab->oldDesc;
-	newTupDesc = RelationGetDescr(oldrel);		/* includes all mods */
-
-	if (OidIsValid(OIDNewHeap))
-		newrel = heap_open(OIDNewHeap, lockmode);
-	else
-		newrel = NULL;
-
-	/*
-	 * Prepare a BulkInsertState and options for heap_insert. Because we're
-	 * building a new heap, we can skip WAL-logging and fsync it to disk at
-	 * the end instead (unless WAL-logging is required for archiving or
-	 * streaming replication). The FSM is empty too, so don't bother using it.
-	 */
-	if (newrel)
-	{
-		mycid = GetCurrentCommandId(true);
-		bistate = GetBulkInsertState();
-
-		hi_options = HEAP_INSERT_SKIP_FSM;
-		if (!XLogIsNeeded())
-			hi_options |= HEAP_INSERT_SKIP_WAL;
-	}
-	else
-	{
-		/* keep compiler quiet about using these uninitialized */
-		mycid = 0;
-		bistate = NULL;
-		hi_options = 0;
-	}
-
-	/*
-	 * Generate the constraint and default execution states
-	 */
-
-	estate = CreateExecutorState();
-
-	/* Build the needed expression execution states */
-	foreach(l, tab->constraints)
-	{
-		NewConstraint *con = lfirst(l);
-
-		switch (con->contype)
-		{
-			case CONSTR_CHECK:
-				needscan = true;
-				con->qualstate = (List *)
-					ExecPrepareExpr((Expr *) con->qual, estate);
-				break;
-			case CONSTR_FOREIGN:
-				/* Nothing to do here */
-				break;
-			default:
-				elog(ERROR, "unrecognized constraint type: %d",
-					 (int) con->contype);
-		}
-	}
-
-	foreach(l, tab->newvals)
-	{
-		NewColumnValue *ex = lfirst(l);
-
-		ex->exprstate = ExecPrepareExpr((Expr *) ex->expr, estate);
-	}
-
-	notnull_attrs = NIL;
-	if (newrel || tab->new_notnull)
-	{
-		/*
-		 * If we are rebuilding the tuples OR if we added any new NOT NULL
-		 * constraints, check all not-null constraints.  This is a bit of
-		 * overkill but it minimizes risk of bugs, and heap_attisnull is a
-		 * pretty cheap test anyway.
-		 */
-		for (i = 0; i < newTupDesc->natts; i++)
+  Relation	oldrel;
+  Relation	newrel;
+  TupleDesc	oldTupDesc;
+  TupleDesc	newTupDesc;
+  bool		needscan = false;
+  List	   *notnull_attrs;
+  int			i;
+  ListCell   *l;
+  EState	   *estate;
+  CommandId	mycid;
+  BulkInsertState bistate;
+  int			hi_options;
+
+  /*
+   * Open the relation(s).  We have surely already locked the existing
+   * table.
+   */
+  oldrel = heap_open(tab->relid, NoLock);
+  oldTupDesc = tab->oldDesc;
+  newTupDesc = RelationGetDescr(oldrel);		/* includes all mods */
+
+  if (OidIsValid(OIDNewHeap))
+    newrel = heap_open(OIDNewHeap, lockmode);
+  else
+    newrel = NULL;
+
+  /*
+   * Prepare a BulkInsertState and options for heap_insert. Because we're
+   * building a new heap, we can skip WAL-logging and fsync it to disk at
+   * the end instead (unless WAL-logging is required for archiving or
+   * streaming replication). The FSM is empty too, so don't bother using it.
+   */
+  if (newrel)
+    {
+      mycid = GetCurrentCommandId(true);
+      bistate = GetBulkInsertState();
+
+      hi_options = HEAP_INSERT_SKIP_FSM;
+      if (!XLogIsNeeded())
+	hi_options |= HEAP_INSERT_SKIP_WAL;
+    }
+  else
+    {
+      /* keep compiler quiet about using these uninitialized */
+      mycid = 0;
+      bistate = NULL;
+      hi_options = 0;
+    }
+
+  /*
+   * Generate the constraint and default execution states
+   */
+
+  estate = CreateExecutorState();
+
+  /* Build the needed expression execution states */
+  foreach(l, tab->constraints)
+    {
+      NewConstraint *con = lfirst(l);
+
+      switch (con->contype)
+	{
+	case CONSTR_CHECK:
+	  needscan = true;
+	  con->qualstate = (List *)
+	    ExecPrepareExpr((Expr *) con->qual, estate);
+	  break;
+	case CONSTR_FOREIGN:
+	  /* Nothing to do here */
+	  break;
+	default:
+	  elog(ERROR, "unrecognized constraint type: %d",
+	       (int) con->contype);
+	}
+    }
+
+  foreach(l, tab->newvals)
+    {
+      NewColumnValue *ex = lfirst(l);
+
+      ex->exprstate = ExecPrepareExpr((Expr *) ex->expr, estate);
+    }
+
+  notnull_attrs = NIL;
+  if (newrel || tab->new_notnull)
+    {
+      /*
+       * If we are rebuilding the tuples OR if we added any new NOT NULL
+       * constraints, check all not-null constraints.  This is a bit of
+       * overkill but it minimizes risk of bugs, and heap_attisnull is a
+       * pretty cheap test anyway.
+       */
+      for (i = 0; i < newTupDesc->natts; i++)
+	{
+	  if (newTupDesc->attrs[i]->attnotnull &&
+	      !newTupDesc->attrs[i]->attisdropped)
+	    notnull_attrs = lappend_int(notnull_attrs, i);
+	}
+      if (notnull_attrs)
+	needscan = true;
+    }
+
+  if (newrel || needscan)
+    {
+      ExprContext *econtext;
+      Datum	   *values;
+      bool	   *isnull;
+      TupleTableSlot *oldslot;
+      TupleTableSlot *newslot;
+      HeapScanDesc scan;
+      HeapTuple	tuple;
+      MemoryContext oldCxt;
+      List	   *dropped_attrs = NIL;
+      ListCell   *lc;
+
+      if (newrel)
+	ereport(DEBUG1,
+		(errmsg("rewriting table \"%s\"",
+			RelationGetRelationName(oldrel))));
+      else
+	ereport(DEBUG1,
+		(errmsg("verifying table \"%s\"",
+			RelationGetRelationName(oldrel))));
+
+      if (newrel)
+	{
+	  /*
+	   * All predicate locks on the tuples or pages are about to be made
+	   * invalid, because we move tuples around.	Promote them to
+	   * relation locks.
+	   */
+	  TransferPredicateLocksToHeapRelation(oldrel);
+	}
+
+      econtext = GetPerTupleExprContext(estate);
+
+      /*
+       * Make tuple slots for old and new tuples.  Note that even when the
+       * tuples are the same, the tupDescs might not be (consider ADD COLUMN
+       * without a default).
+       */
+      oldslot = MakeSingleTupleTableSlot(oldTupDesc);
+      newslot = MakeSingleTupleTableSlot(newTupDesc);
+
+      /* Preallocate values/isnull arrays */
+      i = Max(newTupDesc->natts, oldTupDesc->natts);
+      values = (Datum *) palloc(i * sizeof(Datum));
+      isnull = (bool *) palloc(i * sizeof(bool));
+      memset(values, 0, i * sizeof(Datum));
+      memset(isnull, true, i * sizeof(bool));
+
+      /*
+       * Any attributes that are dropped according to the new tuple
+       * descriptor can be set to NULL. We precompute the list of dropped
+       * attributes to avoid needing to do so in the per-tuple loop.
+       */
+      for (i = 0; i < newTupDesc->natts; i++)
+	{
+	  if (newTupDesc->attrs[i]->attisdropped)
+	    dropped_attrs = lappend_int(dropped_attrs, i);
+	}
+
+      /*
+       * Scan through the rows, generating a new row if needed and then
+       * checking all the constraints.
+       */
+      scan = heap_beginscan(oldrel, SnapshotNow, 0, NULL);
+
+      /*
+       * Switch to per-tuple memory context and reset it for each tuple
+       * produced, so we don't leak memory.
+       */
+      oldCxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
+
+      while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+	{
+	  if (tab->rewrite)
+	    {
+	      Oid			tupOid = InvalidOid;
+
+	      /* Extract data from old tuple */
+	      heap_deform_tuple(tuple, oldTupDesc, values, isnull);
+	      if (oldTupDesc->tdhasoid)
+		tupOid = HeapTupleGetOid(tuple);
+
+	      /* Set dropped attributes to null in new tuple */
+	      foreach(lc, dropped_attrs)
+		isnull[lfirst_int(lc)] = true;
+
+	      /*
+	       * Process supplied expressions to replace selected columns.
+	       * Expression inputs come from the old tuple.
+	       */
+	      ExecStoreTuple(tuple, oldslot, InvalidBuffer, false);
+	      econtext->ecxt_scantuple = oldslot;
+
+	      foreach(l, tab->newvals)
 		{
-			if (newTupDesc->attrs[i]->attnotnull &&
-				!newTupDesc->attrs[i]->attisdropped)
-				notnull_attrs = lappend_int(notnull_attrs, i);
-		}
-		if (notnull_attrs)
-			needscan = true;
-	}
+		  NewColumnValue *ex = lfirst(l);
 
-	if (newrel || needscan)
-	{
-		ExprContext *econtext;
-		Datum	   *values;
-		bool	   *isnull;
-		TupleTableSlot *oldslot;
-		TupleTableSlot *newslot;
-		HeapScanDesc scan;
-		HeapTuple	tuple;
-		MemoryContext oldCxt;
-		List	   *dropped_attrs = NIL;
-		ListCell   *lc;
-
-		if (newrel)
-			ereport(DEBUG1,
-					(errmsg("rewriting table \"%s\"",
-							RelationGetRelationName(oldrel))));
-		else
-			ereport(DEBUG1,
-					(errmsg("verifying table \"%s\"",
-							RelationGetRelationName(oldrel))));
-
-		if (newrel)
-		{
-			/*
-			 * All predicate locks on the tuples or pages are about to be made
-			 * invalid, because we move tuples around.	Promote them to
-			 * relation locks.
-			 */
-			TransferPredicateLocksToHeapRelation(oldrel);
+		  values[ex->attnum - 1] = ExecEvalExpr(ex->exprstate,
+							econtext,
+							&isnull[ex->attnum - 1],
+							NULL);
 		}
 
-		econtext = GetPerTupleExprContext(estate);
+	      /*
+	       * Form the new tuple. Note that we don't explicitly pfree it,
+	       * since the per-tuple memory context will be reset shortly.
+	       */
+	      tuple = heap_form_tuple(newTupDesc, values, isnull);
 
-		/*
-		 * Make tuple slots for old and new tuples.  Note that even when the
-		 * tuples are the same, the tupDescs might not be (consider ADD COLUMN
-		 * without a default).
-		 */
-		oldslot = MakeSingleTupleTableSlot(oldTupDesc);
-		newslot = MakeSingleTupleTableSlot(newTupDesc);
+	      /* Preserve OID, if any */
+	      if (newTupDesc->tdhasoid)
+		HeapTupleSetOid(tuple, tupOid);
+	    }
 
-		/* Preallocate values/isnull arrays */
-		i = Max(newTupDesc->natts, oldTupDesc->natts);
-		values = (Datum *) palloc(i * sizeof(Datum));
-		isnull = (bool *) palloc(i * sizeof(bool));
-		memset(values, 0, i * sizeof(Datum));
-		memset(isnull, true, i * sizeof(bool));
+	  /* Now check any constraints on the possibly-changed tuple */
+	  ExecStoreTuple(tuple, newslot, InvalidBuffer, false);
+	  econtext->ecxt_scantuple = newslot;
 
-		/*
-		 * Any attributes that are dropped according to the new tuple
-		 * descriptor can be set to NULL. We precompute the list of dropped
-		 * attributes to avoid needing to do so in the per-tuple loop.
-		 */
-		for (i = 0; i < newTupDesc->natts; i++)
-		{
-			if (newTupDesc->attrs[i]->attisdropped)
-				dropped_attrs = lappend_int(dropped_attrs, i);
-		}
+	  foreach(l, notnull_attrs)
+	    {
+	      int			attn = lfirst_int(l);
 
-		/*
-		 * Scan through the rows, generating a new row if needed and then
-		 * checking all the constraints.
-		 */
-		scan = heap_beginscan(oldrel, SnapshotNow, 0, NULL);
+	      if (heap_attisnull(tuple, attn + 1))
+		ereport(ERROR,
+			(errcode(ERRCODE_NOT_NULL_VIOLATION),
+			 errmsg("column \"%s\" contains null values",
+				NameStr(newTupDesc->attrs[attn]->attname))));
+	    }
 
-		/*
-		 * Switch to per-tuple memory context and reset it for each tuple
-		 * produced, so we don't leak memory.
-		 */
-		oldCxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
+	  foreach(l, tab->constraints)
+	    {
+	      NewConstraint *con = lfirst(l);
 
-		while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+	      switch (con->contype)
 		{
-			if (tab->rewrite)
-			{
-				Oid			tupOid = InvalidOid;
-
-				/* Extract data from old tuple */
-				heap_deform_tuple(tuple, oldTupDesc, values, isnull);
-				if (oldTupDesc->tdhasoid)
-					tupOid = HeapTupleGetOid(tuple);
-
-				/* Set dropped attributes to null in new tuple */
-				foreach(lc, dropped_attrs)
-					isnull[lfirst_int(lc)] = true;
-
-				/*
-				 * Process supplied expressions to replace selected columns.
-				 * Expression inputs come from the old tuple.
-				 */
-				ExecStoreTuple(tuple, oldslot, InvalidBuffer, false);
-				econtext->ecxt_scantuple = oldslot;
-
-				foreach(l, tab->newvals)
-				{
-					NewColumnValue *ex = lfirst(l);
-
-					values[ex->attnum - 1] = ExecEvalExpr(ex->exprstate,
-														  econtext,
-													 &isnull[ex->attnum - 1],
-														  NULL);
-				}
-
-				/*
-				 * Form the new tuple. Note that we don't explicitly pfree it,
-				 * since the per-tuple memory context will be reset shortly.
-				 */
-				tuple = heap_form_tuple(newTupDesc, values, isnull);
-
-				/* Preserve OID, if any */
-				if (newTupDesc->tdhasoid)
-					HeapTupleSetOid(tuple, tupOid);
-			}
-
-			/* Now check any constraints on the possibly-changed tuple */
-			ExecStoreTuple(tuple, newslot, InvalidBuffer, false);
-			econtext->ecxt_scantuple = newslot;
-
-			foreach(l, notnull_attrs)
-			{
-				int			attn = lfirst_int(l);
-
-				if (heap_attisnull(tuple, attn + 1))
-					ereport(ERROR,
-							(errcode(ERRCODE_NOT_NULL_VIOLATION),
-							 errmsg("column \"%s\" contains null values",
-								NameStr(newTupDesc->attrs[attn]->attname))));
-			}
-
-			foreach(l, tab->constraints)
-			{
-				NewConstraint *con = lfirst(l);
-
-				switch (con->contype)
-				{
-					case CONSTR_CHECK:
-						if (!ExecQual(con->qualstate, econtext, true))
-							ereport(ERROR,
-									(errcode(ERRCODE_CHECK_VIOLATION),
-									 errmsg("check constraint \"%s\" is violated by some row",
-											con->name)));
-						break;
-					case CONSTR_FOREIGN:
-						/* Nothing to do here */
-						break;
-					default:
-						elog(ERROR, "unrecognized constraint type: %d",
-							 (int) con->contype);
-				}
-			}
+		case CONSTR_CHECK:
+		  if (!ExecQual(con->qualstate, econtext, true))
+		    ereport(ERROR,
+			    (errcode(ERRCODE_CHECK_VIOLATION),
+			     errmsg("check constraint \"%s\" is violated by some row",
+				    con->name)));
+		  break;
+		case CONSTR_FOREIGN:
+		  /* Nothing to do here */
+		  break;
+		default:
+		  elog(ERROR, "unrecognized constraint type: %d",
+		       (int) con->contype);
+		}
+	    }
 
-			/* Write the tuple out to the new relation */
-			if (newrel)
-				heap_insert(newrel, tuple, mycid, hi_options, bistate);
+	  /* Write the tuple out to the new relation */
+	  if (newrel)
+	    heap_insert(newrel, tuple, mycid, hi_options, bistate);
 
-			ResetExprContext(econtext);
+	  ResetExprContext(econtext);
 
-			CHECK_FOR_INTERRUPTS();
-		}
+	  CHECK_FOR_INTERRUPTS();
+	}
 
-		MemoryContextSwitchTo(oldCxt);
-		heap_endscan(scan);
+      MemoryContextSwitchTo(oldCxt);
+      heap_endscan(scan);
 
-		ExecDropSingleTupleTableSlot(oldslot);
-		ExecDropSingleTupleTableSlot(newslot);
-	}
+      ExecDropSingleTupleTableSlot(oldslot);
+      ExecDropSingleTupleTableSlot(newslot);
+    }
 
-	FreeExecutorState(estate);
+  FreeExecutorState(estate);
 
-	heap_close(oldrel, NoLock);
-	if (newrel)
-	{
-		FreeBulkInsertState(bistate);
+  heap_close(oldrel, NoLock);
+  if (newrel)
+    {
+      FreeBulkInsertState(bistate);
 
-		/* If we skipped writing WAL, then we need to sync the heap. */
-		if (hi_options & HEAP_INSERT_SKIP_WAL)
-			heap_sync(newrel);
+      /* If we skipped writing WAL, then we need to sync the heap. */
+      if (hi_options & HEAP_INSERT_SKIP_WAL)
+	heap_sync(newrel);
 
-		heap_close(newrel, NoLock);
-	}
+      heap_close(newrel, NoLock);
+    }
 }
 
 /*
@@ -3706,29 +3734,29 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 static AlteredTableInfo *
 ATGetQueueEntry(List **wqueue, Relation rel)
 {
-	Oid			relid = RelationGetRelid(rel);
-	AlteredTableInfo *tab;
-	ListCell   *ltab;
-
-	foreach(ltab, *wqueue)
-	{
-		tab = (AlteredTableInfo *) lfirst(ltab);
-		if (tab->relid == relid)
-			return tab;
-	}
+  Oid			relid = RelationGetRelid(rel);
+  AlteredTableInfo *tab;
+  ListCell   *ltab;
+
+  foreach(ltab, *wqueue)
+    {
+      tab = (AlteredTableInfo *) lfirst(ltab);
+      if (tab->relid == relid)
+	return tab;
+    }
 
-	/*
-	 * Not there, so add it.  Note that we make a copy of the relation's
-	 * existing descriptor before anything interesting can happen to it.
-	 */
-	tab = (AlteredTableInfo *) palloc0(sizeof(AlteredTableInfo));
-	tab->relid = relid;
-	tab->relkind = rel->rd_rel->relkind;
-	tab->oldDesc = CreateTupleDescCopy(RelationGetDescr(rel));
+  /*
+   * Not there, so add it.  Note that we make a copy of the relation's
+   * existing descriptor before anything interesting can happen to it.
+   */
+  tab = (AlteredTableInfo *) palloc0(sizeof(AlteredTableInfo));
+  tab->relid = relid;
+  tab->relkind = rel->rd_rel->relkind;
+  tab->oldDesc = CreateTupleDescCopy(RelationGetDescr(rel));
 
-	*wqueue = lappend(*wqueue, tab);
+  *wqueue = lappend(*wqueue, tab);
 
-	return tab;
+  return tab;
 }
 
 /*
@@ -3741,44 +3769,44 @@ ATGetQueueEntry(List **wqueue, Relation rel)
 static void
 ATSimplePermissions(Relation rel, int allowed_targets)
 {
-	int			actual_target;
-
-	switch (rel->rd_rel->relkind)
-	{
-		case RELKIND_RELATION:
-			actual_target = ATT_TABLE;
-			break;
-		case RELKIND_VIEW:
-			actual_target = ATT_VIEW;
-			break;
-		case RELKIND_INDEX:
-			actual_target = ATT_INDEX;
-			break;
-		case RELKIND_COMPOSITE_TYPE:
-			actual_target = ATT_COMPOSITE_TYPE;
-			break;
-		case RELKIND_FOREIGN_TABLE:
-			actual_target = ATT_FOREIGN_TABLE;
-			break;
-		default:
-			actual_target = 0;
-			break;
-	}
-
-	/* Wrong target type? */
-	if ((actual_target & allowed_targets) == 0)
-		ATWrongRelkindError(rel, allowed_targets);
-
-	/* Permissions checks */
-	if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
-					   RelationGetRelationName(rel));
-
-	if (!allowSystemTableMods && IsSystemRelation(rel))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("permission denied: \"%s\" is a system catalog",
-						RelationGetRelationName(rel))));
+  int			actual_target;
+
+  switch (rel->rd_rel->relkind)
+    {
+    case RELKIND_RELATION:
+      actual_target = ATT_TABLE;
+      break;
+    case RELKIND_VIEW:
+      actual_target = ATT_VIEW;
+      break;
+    case RELKIND_INDEX:
+      actual_target = ATT_INDEX;
+      break;
+    case RELKIND_COMPOSITE_TYPE:
+      actual_target = ATT_COMPOSITE_TYPE;
+      break;
+    case RELKIND_FOREIGN_TABLE:
+      actual_target = ATT_FOREIGN_TABLE;
+      break;
+    default:
+      actual_target = 0;
+      break;
+    }
+
+  /* Wrong target type? */
+  if ((actual_target & allowed_targets) == 0)
+    ATWrongRelkindError(rel, allowed_targets);
+
+  /* Permissions checks */
+  if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
+    aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		   RelationGetRelationName(rel));
+
+  if (!allowSystemTableMods && IsSystemRelation(rel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+	     errmsg("permission denied: \"%s\" is a system catalog",
+		    RelationGetRelationName(rel))));
 }
 
 /*
@@ -3790,40 +3818,40 @@ ATSimplePermissions(Relation rel, int allowed_targets)
 static void
 ATWrongRelkindError(Relation rel, int allowed_targets)
 {
-	char	   *msg;
-
-	switch (allowed_targets)
-	{
-		case ATT_TABLE:
-			msg = _("\"%s\" is not a table");
-			break;
-		case ATT_TABLE | ATT_INDEX:
-			msg = _("\"%s\" is not a table or index");
-			break;
-		case ATT_TABLE | ATT_VIEW:
-			msg = _("\"%s\" is not a table or view");
-			break;
-		case ATT_TABLE | ATT_FOREIGN_TABLE:
-			msg = _("\"%s\" is not a table or foreign table");
-			break;
-		case ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE:
-			msg = _("\"%s\" is not a table, composite type, or foreign table");
-			break;
-		case ATT_VIEW:
-			msg = _("\"%s\" is not a view");
-			break;
-		case ATT_FOREIGN_TABLE:
-			msg = _("\"%s\" is not a foreign table");
-			break;
-		default:
-			/* shouldn't get here, add all necessary cases above */
-			msg = _("\"%s\" is of the wrong type");
-			break;
-	}
-
-	ereport(ERROR,
-			(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			 errmsg(msg, RelationGetRelationName(rel))));
+  char	   *msg;
+
+  switch (allowed_targets)
+    {
+    case ATT_TABLE:
+      msg = _("\"%s\" is not a table");
+      break;
+    case ATT_TABLE | ATT_INDEX:
+      msg = _("\"%s\" is not a table or index");
+      break;
+    case ATT_TABLE | ATT_VIEW:
+      msg = _("\"%s\" is not a table or view");
+      break;
+    case ATT_TABLE | ATT_FOREIGN_TABLE:
+      msg = _("\"%s\" is not a table or foreign table");
+      break;
+    case ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE:
+      msg = _("\"%s\" is not a table, composite type, or foreign table");
+      break;
+    case ATT_VIEW:
+      msg = _("\"%s\" is not a view");
+      break;
+    case ATT_FOREIGN_TABLE:
+      msg = _("\"%s\" is not a foreign table");
+      break;
+    default:
+      /* shouldn't get here, add all necessary cases above */
+      msg = _("\"%s\" is of the wrong type");
+      break;
+    }
+
+  ereport(ERROR,
+	  (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	   errmsg(msg, RelationGetRelationName(rel))));
 }
 
 /*
@@ -3836,39 +3864,39 @@ ATWrongRelkindError(Relation rel, int allowed_targets)
  */
 static void
 ATSimpleRecursion(List **wqueue, Relation rel,
-				  AlterTableCmd *cmd, bool recurse, LOCKMODE lockmode)
+		  AlterTableCmd *cmd, bool recurse, LOCKMODE lockmode)
 {
-	/*
-	 * Propagate to children if desired.  Non-table relations never have
-	 * children, so no need to search in that case.
-	 */
-	if (recurse && rel->rd_rel->relkind == RELKIND_RELATION)
-	{
-		Oid			relid = RelationGetRelid(rel);
-		ListCell   *child;
-		List	   *children;
-
-		children = find_all_inheritors(relid, lockmode, NULL);
-
-		/*
-		 * find_all_inheritors does the recursive search of the inheritance
-		 * hierarchy, so all we have to do is process all of the relids in the
-		 * list that it returns.
-		 */
-		foreach(child, children)
-		{
-			Oid			childrelid = lfirst_oid(child);
-			Relation	childrel;
-
-			if (childrelid == relid)
-				continue;
-			/* find_all_inheritors already got lock */
-			childrel = relation_open(childrelid, NoLock);
-			CheckTableNotInUse(childrel, "ALTER TABLE");
-			ATPrepCmd(wqueue, childrel, cmd, false, true, lockmode);
-			relation_close(childrel, NoLock);
-		}
-	}
+  /*
+   * Propagate to children if desired.  Non-table relations never have
+   * children, so no need to search in that case.
+   */
+  if (recurse && rel->rd_rel->relkind == RELKIND_RELATION)
+    {
+      Oid			relid = RelationGetRelid(rel);
+      ListCell   *child;
+      List	   *children;
+
+      children = find_all_inheritors(relid, lockmode, NULL);
+
+      /*
+       * find_all_inheritors does the recursive search of the inheritance
+       * hierarchy, so all we have to do is process all of the relids in the
+       * list that it returns.
+       */
+      foreach(child, children)
+	{
+	  Oid			childrelid = lfirst_oid(child);
+	  Relation	childrel;
+
+	  if (childrelid == relid)
+	    continue;
+	  /* find_all_inheritors already got lock */
+	  childrel = relation_open(childrelid, NoLock);
+	  CheckTableNotInUse(childrel, "ALTER TABLE");
+	  ATPrepCmd(wqueue, childrel, cmd, false, true, lockmode);
+	  relation_close(childrel, NoLock);
+	}
+    }
 }
 
 /*
@@ -3880,27 +3908,27 @@ ATSimpleRecursion(List **wqueue, Relation rel,
  */
 static void
 ATTypedTableRecursion(List **wqueue, Relation rel, AlterTableCmd *cmd,
-					  LOCKMODE lockmode)
+		      LOCKMODE lockmode)
 {
-	ListCell   *child;
-	List	   *children;
+  ListCell   *child;
+  List	   *children;
 
-	Assert(rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE);
+  Assert(rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE);
 
-	children = find_typed_table_dependencies(rel->rd_rel->reltype,
-											 RelationGetRelationName(rel),
-											 cmd->behavior);
+  children = find_typed_table_dependencies(rel->rd_rel->reltype,
+					   RelationGetRelationName(rel),
+					   cmd->behavior);
 
-	foreach(child, children)
-	{
-		Oid			childrelid = lfirst_oid(child);
-		Relation	childrel;
+  foreach(child, children)
+    {
+      Oid			childrelid = lfirst_oid(child);
+      Relation	childrel;
 
-		childrel = relation_open(childrelid, lockmode);
-		CheckTableNotInUse(childrel, "ALTER TABLE");
-		ATPrepCmd(wqueue, childrel, cmd, true, true, lockmode);
-		relation_close(childrel, NoLock);
-	}
+      childrel = relation_open(childrelid, lockmode);
+      CheckTableNotInUse(childrel, "ALTER TABLE");
+      ATPrepCmd(wqueue, childrel, cmd, true, true, lockmode);
+      relation_close(childrel, NoLock);
+    }
 }
 
 
@@ -3920,103 +3948,103 @@ ATTypedTableRecursion(List **wqueue, Relation rel, AlterTableCmd *cmd,
  */
 void
 find_composite_type_dependencies(Oid typeOid, Relation origRelation,
-								 const char *origTypeName)
+				 const char *origTypeName)
 {
-	Relation	depRel;
-	ScanKeyData key[2];
-	SysScanDesc depScan;
-	HeapTuple	depTup;
-	Oid			arrayOid;
-
-	/*
-	 * We scan pg_depend to find those things that depend on the rowtype. (We
-	 * assume we can ignore refobjsubid for a rowtype.)
-	 */
-	depRel = heap_open(DependRelationId, AccessShareLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_depend_refclassid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(TypeRelationId));
-	ScanKeyInit(&key[1],
-				Anum_pg_depend_refobjid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(typeOid));
-
-	depScan = systable_beginscan(depRel, DependReferenceIndexId, true,
-								 SnapshotNow, 2, key);
-
-	while (HeapTupleIsValid(depTup = systable_getnext(depScan)))
-	{
-		Form_pg_depend pg_depend = (Form_pg_depend) GETSTRUCT(depTup);
-		Relation	rel;
-		Form_pg_attribute att;
-
-		/* Ignore dependees that aren't user columns of relations */
-		/* (we assume system columns are never of rowtypes) */
-		if (pg_depend->classid != RelationRelationId ||
-			pg_depend->objsubid <= 0)
-			continue;
-
-		rel = relation_open(pg_depend->objid, AccessShareLock);
-		att = rel->rd_att->attrs[pg_depend->objsubid - 1];
-
-		if (rel->rd_rel->relkind == RELKIND_RELATION)
-		{
-			if (origTypeName)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot alter type \"%s\" because column \"%s\".\"%s\" uses it",
-								origTypeName,
-								RelationGetRelationName(rel),
-								NameStr(att->attname))));
-			else if (origRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot alter type \"%s\" because column \"%s\".\"%s\" uses it",
-								RelationGetRelationName(origRelation),
-								RelationGetRelationName(rel),
-								NameStr(att->attname))));
-			else if (origRelation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot alter foreign table \"%s\" because column \"%s\".\"%s\" uses its rowtype",
-								RelationGetRelationName(origRelation),
-								RelationGetRelationName(rel),
-								NameStr(att->attname))));
-			else
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype",
-								RelationGetRelationName(origRelation),
-								RelationGetRelationName(rel),
-								NameStr(att->attname))));
-		}
-		else if (OidIsValid(rel->rd_rel->reltype))
-		{
-			/*
-			 * A view or composite type itself isn't a problem, but we must
-			 * recursively check for indirect dependencies via its rowtype.
-			 */
-			find_composite_type_dependencies(rel->rd_rel->reltype,
-											 origRelation, origTypeName);
-		}
-
-		relation_close(rel, AccessShareLock);
-	}
-
-	systable_endscan(depScan);
-
-	relation_close(depRel, AccessShareLock);
-
-	/*
-	 * If there's an array type for the rowtype, must check for uses of it,
-	 * too.
-	 */
-	arrayOid = get_array_type(typeOid);
-	if (OidIsValid(arrayOid))
-		find_composite_type_dependencies(arrayOid, origRelation, origTypeName);
-}
+  Relation	depRel;
+  ScanKeyData key[2];
+  SysScanDesc depScan;
+  HeapTuple	depTup;
+  Oid			arrayOid;
+
+  /*
+   * We scan pg_depend to find those things that depend on the rowtype. (We
+   * assume we can ignore refobjsubid for a rowtype.)
+   */
+  depRel = heap_open(DependRelationId, AccessShareLock);
+
+  ScanKeyInit(&key[0],
+	      Anum_pg_depend_refclassid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(TypeRelationId));
+  ScanKeyInit(&key[1],
+	      Anum_pg_depend_refobjid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(typeOid));
+
+  depScan = systable_beginscan(depRel, DependReferenceIndexId, true,
+			       SnapshotNow, 2, key);
+
+  while (HeapTupleIsValid(depTup = systable_getnext(depScan)))
+    {
+      Form_pg_depend pg_depend = (Form_pg_depend) GETSTRUCT(depTup);
+      Relation	rel;
+      Form_pg_attribute att;
+
+      /* Ignore dependees that aren't user columns of relations */
+      /* (we assume system columns are never of rowtypes) */
+      if (pg_depend->classid != RelationRelationId ||
+	  pg_depend->objsubid <= 0)
+	continue;
+
+      rel = relation_open(pg_depend->objid, AccessShareLock);
+      att = rel->rd_att->attrs[pg_depend->objsubid - 1];
+
+      if (rel->rd_rel->relkind == RELKIND_RELATION)
+	{
+	  if (origTypeName)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot alter type \"%s\" because column \"%s.%s\" uses it",
+			    origTypeName,
+			    RelationGetRelationName(rel),
+			    NameStr(att->attname))));
+	  else if (origRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot alter type \"%s\" because column \"%s.%s\" uses it",
+			    RelationGetRelationName(origRelation),
+			    RelationGetRelationName(rel),
+			    NameStr(att->attname))));
+	  else if (origRelation->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type",
+			    RelationGetRelationName(origRelation),
+			    RelationGetRelationName(rel),
+			    NameStr(att->attname))));
+	  else
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot alter table \"%s\" because column \"%s.%s\" uses its row type",
+			    RelationGetRelationName(origRelation),
+			    RelationGetRelationName(rel),
+			    NameStr(att->attname))));
+	}
+      else if (OidIsValid(rel->rd_rel->reltype))
+	{
+	  /*
+	   * A view or composite type itself isn't a problem, but we must
+	   * recursively check for indirect dependencies via its rowtype.
+	   */
+	  find_composite_type_dependencies(rel->rd_rel->reltype,
+					   origRelation, origTypeName);
+	}
+
+      relation_close(rel, AccessShareLock);
+    }
+
+  systable_endscan(depScan);
+
+  relation_close(depRel, AccessShareLock);
+
+  /*
+   * If there's an array type for the rowtype, must check for uses of it,
+   * too.
+   */
+  arrayOid = get_array_type(typeOid);
+  if (OidIsValid(arrayOid))
+    find_composite_type_dependencies(arrayOid, origRelation, origTypeName);
+}
 
 
 /*
@@ -4029,37 +4057,37 @@ find_composite_type_dependencies(Oid typeOid, Relation origRelation,
 static List *
 find_typed_table_dependencies(Oid typeOid, const char *typeName, DropBehavior behavior)
 {
-	Relation	classRel;
-	ScanKeyData key[1];
-	HeapScanDesc scan;
-	HeapTuple	tuple;
-	List	   *result = NIL;
-
-	classRel = heap_open(RelationRelationId, AccessShareLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_class_reloftype,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(typeOid));
+  Relation	classRel;
+  ScanKeyData key[1];
+  HeapScanDesc scan;
+  HeapTuple	tuple;
+  List	   *result = NIL;
 
-	scan = heap_beginscan(classRel, SnapshotNow, 1, key);
+  classRel = heap_open(RelationRelationId, AccessShareLock);
 
-	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
-	{
-		if (behavior == DROP_RESTRICT)
-			ereport(ERROR,
-					(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
-					 errmsg("cannot alter type \"%s\" because it is the type of a typed table",
-							typeName),
-			errhint("Use ALTER ... CASCADE to alter the typed tables too.")));
-		else
-			result = lappend_oid(result, HeapTupleGetOid(tuple));
-	}
+  ScanKeyInit(&key[0],
+	      Anum_pg_class_reloftype,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(typeOid));
 
-	heap_endscan(scan);
-	heap_close(classRel, AccessShareLock);
+  scan = heap_beginscan(classRel, SnapshotNow, 1, key);
 
-	return result;
+  while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+    {
+      if (behavior == DROP_RESTRICT)
+	ereport(ERROR,
+		(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
+		 errmsg("cannot alter type \"%s\" because it is the type of a typed table",
+			typeName),
+		 errhint("Use ALTER ... CASCADE to alter the typed tables too.")));
+      else
+	result = lappend_oid(result, HeapTupleGetOid(tuple));
+    }
+
+  heap_endscan(scan);
+  heap_close(classRel, AccessShareLock);
+
+  return result;
 }
 
 
@@ -4074,29 +4102,29 @@ find_typed_table_dependencies(Oid typeOid, const char *typeName, DropBehavior be
 void
 check_of_type(HeapTuple typetuple)
 {
-	Form_pg_type typ = (Form_pg_type) GETSTRUCT(typetuple);
-	bool		typeOk = false;
-
-	if (typ->typtype == TYPTYPE_COMPOSITE)
-	{
-		Relation	typeRelation;
-
-		Assert(OidIsValid(typ->typrelid));
-		typeRelation = relation_open(typ->typrelid, AccessShareLock);
-		typeOk = (typeRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE);
-
-		/*
-		 * Close the parent rel, but keep our AccessShareLock on it until xact
-		 * commit.	That will prevent someone else from deleting or ALTERing
-		 * the type before the typed table creation/conversion commits.
-		 */
-		relation_close(typeRelation, NoLock);
-	}
-	if (!typeOk)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("type %s is not a composite type",
-						format_type_be(HeapTupleGetOid(typetuple)))));
+  Form_pg_type typ = (Form_pg_type) GETSTRUCT(typetuple);
+  bool		typeOk = false;
+
+  if (typ->typtype == TYPTYPE_COMPOSITE)
+    {
+      Relation	typeRelation;
+
+      Assert(OidIsValid(typ->typrelid));
+      typeRelation = relation_open(typ->typrelid, AccessShareLock);
+      typeOk = (typeRelation->rd_rel->relkind == RELKIND_COMPOSITE_TYPE);
+
+      /*
+       * Close the parent rel, but keep our AccessShareLock on it until xact
+       * commit.	That will prevent someone else from deleting or ALTERing
+       * the type before the typed table creation/conversion commits.
+       */
+      relation_close(typeRelation, NoLock);
+    }
+  if (!typeOk)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("type %s is not a composite type",
+		    format_type_be(HeapTupleGetOid(typetuple)))));
 }
 
 
@@ -4116,359 +4144,359 @@ check_of_type(HeapTuple typetuple)
  */
 static void
 ATPrepAddColumn(List **wqueue, Relation rel, bool recurse, bool recursing,
-				AlterTableCmd *cmd, LOCKMODE lockmode)
+		AlterTableCmd *cmd, LOCKMODE lockmode)
 {
-	if (rel->rd_rel->reloftype && !recursing)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot add column to typed table")));
+  if (rel->rd_rel->reloftype && !recursing)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("cannot add column to typed table")));
 
-	if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
-		ATTypedTableRecursion(wqueue, rel, cmd, lockmode);
+  if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
+    ATTypedTableRecursion(wqueue, rel, cmd, lockmode);
 
-	if (recurse)
-		cmd->subtype = AT_AddColumnRecurse;
+  if (recurse)
+    cmd->subtype = AT_AddColumnRecurse;
 }
 
 static void
 ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
-				ColumnDef *colDef, bool isOid,
-				bool recurse, bool recursing, LOCKMODE lockmode)
+		ColumnDef *colDef, bool isOid,
+		bool recurse, bool recursing, LOCKMODE lockmode)
 {
-	Oid			myrelid = RelationGetRelid(rel);
-	Relation	pgclass,
-				attrdesc;
-	HeapTuple	reltup;
-	FormData_pg_attribute attribute;
-	int			newattnum;
-	char		relkind;
-	HeapTuple	typeTuple;
-	Oid			typeOid;
-	int32		typmod;
-	Oid			collOid;
-	Form_pg_type tform;
-	Expr	   *defval;
-	List	   *children;
-	ListCell   *child;
-
-	/* At top level, permission check was done in ATPrepCmd, else do it */
-	if (recursing)
-		ATSimplePermissions(rel, ATT_TABLE);
-
-	attrdesc = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	/*
-	 * Are we adding the column to a recursion child?  If so, check whether to
-	 * merge with an existing definition for the column.  If we do merge, we
-	 * must not recurse.  Children will already have the column, and recursing
-	 * into them would mess up attinhcount.
-	 */
-	if (colDef->inhcount > 0)
-	{
-		HeapTuple	tuple;
-
-		/* Does child already have a column by this name? */
-		tuple = SearchSysCacheCopyAttName(myrelid, colDef->colname);
-		if (HeapTupleIsValid(tuple))
-		{
-			Form_pg_attribute childatt = (Form_pg_attribute) GETSTRUCT(tuple);
-			Oid			ctypeId;
-			int32		ctypmod;
-			Oid			ccollid;
-
-			/* Child column must match on type, typmod, and collation */
-			typenameTypeIdAndMod(NULL, colDef->typeName, &ctypeId, &ctypmod);
-			if (ctypeId != childatt->atttypid ||
-				ctypmod != childatt->atttypmod)
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("child table \"%s\" has different type for column \"%s\"",
-							RelationGetRelationName(rel), colDef->colname)));
-			ccollid = GetColumnDefCollation(NULL, colDef, ctypeId);
-			if (ccollid != childatt->attcollation)
-				ereport(ERROR,
-						(errcode(ERRCODE_COLLATION_MISMATCH),
-						 errmsg("child table \"%s\" has different collation for column \"%s\"",
-							  RelationGetRelationName(rel), colDef->colname),
-						 errdetail("\"%s\" versus \"%s\"",
-								   get_collation_name(ccollid),
-							   get_collation_name(childatt->attcollation))));
-
-			/* If it's OID, child column must actually be OID */
-			if (isOid && childatt->attnum != ObjectIdAttributeNumber)
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("child table \"%s\" has a conflicting \"%s\" column",
-						RelationGetRelationName(rel), colDef->colname)));
-
-			/* Bump the existing child att's inhcount */
-			childatt->attinhcount++;
-			simple_heap_update(attrdesc, &tuple->t_self, tuple);
-			CatalogUpdateIndexes(attrdesc, tuple);
-
-			heap_freetuple(tuple);
-
-			/* Inform the user about the merge */
-			ereport(NOTICE,
-			  (errmsg("merging definition of column \"%s\" for child \"%s\"",
-					  colDef->colname, RelationGetRelationName(rel))));
-
-			heap_close(attrdesc, RowExclusiveLock);
-			return;
-		}
-	}
-
-	pgclass = heap_open(RelationRelationId, RowExclusiveLock);
-
-	reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(myrelid));
-	if (!HeapTupleIsValid(reltup))
-		elog(ERROR, "cache lookup failed for relation %u", myrelid);
-	relkind = ((Form_pg_class) GETSTRUCT(reltup))->relkind;
-
-	/*
-	 * this test is deliberately not attisdropped-aware, since if one tries to
-	 * add a column matching a dropped column name, it's gonna fail anyway.
-	 */
-	if (SearchSysCacheExists2(ATTNAME,
-							  ObjectIdGetDatum(myrelid),
-							  PointerGetDatum(colDef->colname)))
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" already exists",
-						colDef->colname, RelationGetRelationName(rel))));
-
-	/* Determine the new attribute's number */
-	if (isOid)
-		newattnum = ObjectIdAttributeNumber;
-	else
-	{
-		newattnum = ((Form_pg_class) GETSTRUCT(reltup))->relnatts + 1;
-		if (newattnum > MaxHeapAttributeNumber)
-			ereport(ERROR,
-					(errcode(ERRCODE_TOO_MANY_COLUMNS),
-					 errmsg("tables can have at most %d columns",
-							MaxHeapAttributeNumber)));
-	}
-
-	typeTuple = typenameType(NULL, colDef->typeName, &typmod);
-	tform = (Form_pg_type) GETSTRUCT(typeTuple);
-	typeOid = HeapTupleGetOid(typeTuple);
-	collOid = GetColumnDefCollation(NULL, colDef, typeOid);
-
-	/* make sure datatype is legal for a column */
-	CheckAttributeType(colDef->colname, typeOid, collOid,
-					   list_make1_oid(rel->rd_rel->reltype),
-					   false);
-
-	/* construct new attribute's pg_attribute entry */
-	attribute.attrelid = myrelid;
-	namestrcpy(&(attribute.attname), colDef->colname);
-	attribute.atttypid = typeOid;
-	attribute.attstattarget = (newattnum > 0) ? -1 : 0;
-	attribute.attlen = tform->typlen;
-	attribute.attcacheoff = -1;
-	attribute.atttypmod = typmod;
-	attribute.attnum = newattnum;
-	attribute.attbyval = tform->typbyval;
-	attribute.attndims = list_length(colDef->typeName->arrayBounds);
-	attribute.attstorage = tform->typstorage;
-	attribute.attalign = tform->typalign;
-	attribute.attnotnull = colDef->is_not_null;
-	attribute.atthasdef = false;
-	attribute.attisdropped = false;
-	attribute.attislocal = colDef->is_local;
-	attribute.attinhcount = colDef->inhcount;
-	attribute.attcollation = collOid;
-	/* attribute.attacl is handled by InsertPgAttributeTuple */
-
-	ReleaseSysCache(typeTuple);
-
-	InsertPgAttributeTuple(attrdesc, &attribute, NULL);
-
-	heap_close(attrdesc, RowExclusiveLock);
-
-	/*
-	 * Update pg_class tuple as appropriate
-	 */
-	if (isOid)
-		((Form_pg_class) GETSTRUCT(reltup))->relhasoids = true;
-	else
-		((Form_pg_class) GETSTRUCT(reltup))->relnatts = newattnum;
-
-	simple_heap_update(pgclass, &reltup->t_self, reltup);
-
-	/* keep catalog indexes current */
-	CatalogUpdateIndexes(pgclass, reltup);
-
-	heap_freetuple(reltup);
-
-	/* Post creation hook for new attribute */
-	InvokeObjectAccessHook(OAT_POST_CREATE,
-						   RelationRelationId, myrelid, newattnum);
-
-	heap_close(pgclass, RowExclusiveLock);
-
-	/* Make the attribute's catalog entry visible */
-	CommandCounterIncrement();
-
-	/*
-	 * Store the DEFAULT, if any, in the catalogs
-	 */
-	if (colDef->raw_default)
-	{
-		RawColumnDefault *rawEnt;
-
-		if (relkind == RELKIND_FOREIGN_TABLE)
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			  errmsg("default values on foreign tables are not supported")));
-
-		rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
-		rawEnt->attnum = attribute.attnum;
-		rawEnt->raw_default = copyObject(colDef->raw_default);
-
-		/*
-		 * This function is intended for CREATE TABLE, so it processes a
-		 * _list_ of defaults, but we just do one.
-		 */
-		AddRelationNewConstraints(rel, list_make1(rawEnt), NIL, false, true);
-
-		/* Make the additional catalog changes visible */
-		CommandCounterIncrement();
-	}
-
-	/*
-	 * Tell Phase 3 to fill in the default expression, if there is one.
-	 *
-	 * If there is no default, Phase 3 doesn't have to do anything, because
-	 * that effectively means that the default is NULL.  The heap tuple access
-	 * routines always check for attnum > # of attributes in tuple, and return
-	 * NULL if so, so without any modification of the tuple data we will get
-	 * the effect of NULL values in the new column.
-	 *
-	 * An exception occurs when the new column is of a domain type: the domain
-	 * might have a NOT NULL constraint, or a check constraint that indirectly
-	 * rejects nulls.  If there are any domain constraints then we construct
-	 * an explicit NULL default value that will be passed through
-	 * CoerceToDomain processing.  (This is a tad inefficient, since it causes
-	 * rewriting the table which we really don't have to do, but the present
-	 * design of domain processing doesn't offer any simple way of checking
-	 * the constraints more directly.)
-	 *
-	 * Note: we use build_column_default, and not just the cooked default
-	 * returned by AddRelationNewConstraints, so that the right thing happens
-	 * when a datatype's default applies.
-	 *
-	 * We skip this step completely for views and foreign tables.  For a view,
-	 * we can only get here from CREATE OR REPLACE VIEW, which historically
-	 * doesn't set up defaults, not even for domain-typed columns.  And in any
-	 * case we mustn't invoke Phase 3 on a view or foreign table, since they
-	 * have no storage.
-	 */
-	if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE
-		&& relkind != RELKIND_FOREIGN_TABLE && attribute.attnum > 0)
-	{
-		defval = (Expr *) build_column_default(rel, attribute.attnum);
-
-		if (!defval && GetDomainConstraints(typeOid) != NIL)
-		{
-			Oid			baseTypeId;
-			int32		baseTypeMod;
-			Oid			baseTypeColl;
-
-			baseTypeMod = typmod;
-			baseTypeId = getBaseTypeAndTypmod(typeOid, &baseTypeMod);
-			baseTypeColl = get_typcollation(baseTypeId);
-			defval = (Expr *) makeNullConst(baseTypeId, baseTypeMod, baseTypeColl);
-			defval = (Expr *) coerce_to_target_type(NULL,
-													(Node *) defval,
-													baseTypeId,
-													typeOid,
-													typmod,
-													COERCION_ASSIGNMENT,
-													COERCE_IMPLICIT_CAST,
-													-1);
-			if (defval == NULL) /* should not happen */
-				elog(ERROR, "failed to coerce base type to domain");
-		}
-
-		if (defval)
-		{
-			NewColumnValue *newval;
-
-			newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
-			newval->attnum = attribute.attnum;
-			newval->expr = defval;
-
-			tab->newvals = lappend(tab->newvals, newval);
-			tab->rewrite = true;
-		}
-
-		/*
-		 * If the new column is NOT NULL, tell Phase 3 it needs to test that.
-		 * (Note we don't do this for an OID column.  OID will be marked not
-		 * null, but since it's filled specially, there's no need to test
-		 * anything.)
-		 */
-		tab->new_notnull |= colDef->is_not_null;
-	}
-
-	/*
-	 * If we are adding an OID column, we have to tell Phase 3 to rewrite the
-	 * table to fix that.
-	 */
-	if (isOid)
-		tab->rewrite = true;
-
-	/*
-	 * Add needed dependency entries for the new column.
-	 */
-	add_column_datatype_dependency(myrelid, newattnum, attribute.atttypid);
-	add_column_collation_dependency(myrelid, newattnum, attribute.attcollation);
-
-	/*
-	 * Propagate to children as appropriate.  Unlike most other ALTER
-	 * routines, we have to do this one level of recursion at a time; we can't
-	 * use find_all_inheritors to do it in one pass.
-	 */
-	children = find_inheritance_children(RelationGetRelid(rel), lockmode);
-
-	/*
-	 * If we are told not to recurse, there had better not be any child
-	 * tables; else the addition would put them out of step.
-	 */
-	if (children && !recurse)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("column must be added to child tables too")));
-
-	/* Children should see column as singly inherited */
-	if (!recursing)
-	{
-		colDef = copyObject(colDef);
-		colDef->inhcount = 1;
-		colDef->is_local = false;
-	}
-
-	foreach(child, children)
-	{
-		Oid			childrelid = lfirst_oid(child);
-		Relation	childrel;
-		AlteredTableInfo *childtab;
-
-		/* find_inheritance_children already got lock */
-		childrel = heap_open(childrelid, NoLock);
-		CheckTableNotInUse(childrel, "ALTER TABLE");
-
-		/* Find or create work queue entry for this table */
-		childtab = ATGetQueueEntry(wqueue, childrel);
-
-		/* Recurse to child */
-		ATExecAddColumn(wqueue, childtab, childrel,
-						colDef, isOid, recurse, true, lockmode);
-
-		heap_close(childrel, NoLock);
-	}
+  Oid			myrelid = RelationGetRelid(rel);
+  Relation	pgclass,
+    attrdesc;
+  HeapTuple	reltup;
+  FormData_pg_attribute attribute;
+  int			newattnum;
+  char		relkind;
+  HeapTuple	typeTuple;
+  Oid			typeOid;
+  int32		typmod;
+  Oid			collOid;
+  Form_pg_type tform;
+  Expr	   *defval;
+  List	   *children;
+  ListCell   *child;
+
+  /* At top level, permission check was done in ATPrepCmd, else do it */
+  if (recursing)
+    ATSimplePermissions(rel, ATT_TABLE);
+
+  attrdesc = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  /*
+   * Are we adding the column to a recursion child?  If so, check whether to
+   * merge with an existing definition for the column.  If we do merge, we
+   * must not recurse.  Children will already have the column, and recursing
+   * into them would mess up attinhcount.
+   */
+  if (colDef->inhcount > 0)
+    {
+      HeapTuple	tuple;
+
+      /* Does child already have a column by this name? */
+      tuple = SearchSysCacheCopyAttName(myrelid, colDef->colname);
+      if (HeapTupleIsValid(tuple))
+	{
+	  Form_pg_attribute childatt = (Form_pg_attribute) GETSTRUCT(tuple);
+	  Oid			ctypeId;
+	  int32		ctypmod;
+	  Oid			ccollid;
+
+	  /* Child column must match on type, typmod, and collation */
+	  typenameTypeIdAndMod(NULL, colDef->typeName, &ctypeId, &ctypmod);
+	  if (ctypeId != childatt->atttypid ||
+	      ctypmod != childatt->atttypmod)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("child table \"%s\" has different type for column \"%s\"",
+			    RelationGetRelationName(rel), colDef->colname)));
+	  ccollid = GetColumnDefCollation(NULL, colDef, ctypeId);
+	  if (ccollid != childatt->attcollation)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_COLLATION_MISMATCH),
+		     errmsg("child table \"%s\" has different collation for column \"%s\"",
+			    RelationGetRelationName(rel), colDef->colname),
+		     errdetail("\"%s\" versus \"%s\"",
+			       get_collation_name(ccollid),
+			       get_collation_name(childatt->attcollation))));
+
+	  /* If it's OID, child column must actually be OID */
+	  if (isOid && childatt->attnum != ObjectIdAttributeNumber)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("child table \"%s\" has a conflicting \"%s\" column",
+			    RelationGetRelationName(rel), colDef->colname)));
+
+	  /* Bump the existing child att's inhcount */
+	  childatt->attinhcount++;
+	  simple_heap_update(attrdesc, &tuple->t_self, tuple);
+	  CatalogUpdateIndexes(attrdesc, tuple);
+
+	  heap_freetuple(tuple);
+
+	  /* Inform the user about the merge */
+	  ereport(NOTICE,
+		  (errmsg("merging definition of column \"%s\" for child \"%s\"",
+			  colDef->colname, RelationGetRelationName(rel))));
+
+	  heap_close(attrdesc, RowExclusiveLock);
+	  return;
+	}
+    }
+
+  pgclass = heap_open(RelationRelationId, RowExclusiveLock);
+
+  reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(myrelid));
+  if (!HeapTupleIsValid(reltup))
+    elog(ERROR, "cache lookup failed for relation %u", myrelid);
+  relkind = ((Form_pg_class) GETSTRUCT(reltup))->relkind;
+
+  /*
+   * this test is deliberately not attisdropped-aware, since if one tries to
+   * add a column matching a dropped column name, it's gonna fail anyway.
+   */
+  if (SearchSysCacheExists2(ATTNAME,
+			    ObjectIdGetDatum(myrelid),
+			    PointerGetDatum(colDef->colname)))
+    ereport(ERROR,
+	    (errcode(ERRCODE_DUPLICATE_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" already exists",
+		    colDef->colname, RelationGetRelationName(rel))));
+
+  /* Determine the new attribute's number */
+  if (isOid)
+    newattnum = ObjectIdAttributeNumber;
+  else
+    {
+      newattnum = ((Form_pg_class) GETSTRUCT(reltup))->relnatts + 1;
+      if (newattnum > MaxHeapAttributeNumber)
+	ereport(ERROR,
+		(errcode(ERRCODE_TOO_MANY_COLUMNS),
+		 errmsg("tables can have at most %d columns",
+			MaxHeapAttributeNumber)));
+    }
+
+  typeTuple = typenameType(NULL, colDef->typeName, &typmod);
+  tform = (Form_pg_type) GETSTRUCT(typeTuple);
+  typeOid = HeapTupleGetOid(typeTuple);
+  collOid = GetColumnDefCollation(NULL, colDef, typeOid);
+
+  /* make sure datatype is legal for a column */
+  CheckAttributeType(colDef->colname, typeOid, collOid,
+		     list_make1_oid(rel->rd_rel->reltype),
+		     false);
+
+  /* construct new attribute's pg_attribute entry */
+  attribute.attrelid = myrelid;
+  namestrcpy(&(attribute.attname), colDef->colname);
+  attribute.atttypid = typeOid;
+  attribute.attstattarget = (newattnum > 0) ? -1 : 0;
+  attribute.attlen = tform->typlen;
+  attribute.attcacheoff = -1;
+  attribute.atttypmod = typmod;
+  attribute.attnum = newattnum;
+  attribute.attbyval = tform->typbyval;
+  attribute.attndims = list_length(colDef->typeName->arrayBounds);
+  attribute.attstorage = tform->typstorage;
+  attribute.attalign = tform->typalign;
+  attribute.attnotnull = colDef->is_not_null;
+  attribute.atthasdef = false;
+  attribute.attisdropped = false;
+  attribute.attislocal = colDef->is_local;
+  attribute.attinhcount = colDef->inhcount;
+  attribute.attcollation = collOid;
+  /* attribute.attacl is handled by InsertPgAttributeTuple */
+
+  ReleaseSysCache(typeTuple);
+
+  InsertPgAttributeTuple(attrdesc, &attribute, NULL);
+
+  heap_close(attrdesc, RowExclusiveLock);
+
+  /*
+   * Update pg_class tuple as appropriate
+   */
+  if (isOid)
+    ((Form_pg_class) GETSTRUCT(reltup))->relhasoids = true;
+  else
+    ((Form_pg_class) GETSTRUCT(reltup))->relnatts = newattnum;
+
+  simple_heap_update(pgclass, &reltup->t_self, reltup);
+
+  /* keep catalog indexes current */
+  CatalogUpdateIndexes(pgclass, reltup);
+
+  heap_freetuple(reltup);
+
+  /* Post creation hook for new attribute */
+  InvokeObjectAccessHook(OAT_POST_CREATE,
+			 RelationRelationId, myrelid, newattnum);
+
+  heap_close(pgclass, RowExclusiveLock);
+
+  /* Make the attribute's catalog entry visible */
+  CommandCounterIncrement();
+
+  /*
+   * Store the DEFAULT, if any, in the catalogs
+   */
+  if (colDef->raw_default)
+    {
+      RawColumnDefault *rawEnt;
+
+      if (relkind == RELKIND_FOREIGN_TABLE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("default values on foreign tables are not supported")));
+
+      rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
+      rawEnt->attnum = attribute.attnum;
+      rawEnt->raw_default = copyObject(colDef->raw_default);
+
+      /*
+       * This function is intended for CREATE TABLE, so it processes a
+       * _list_ of defaults, but we just do one.
+       */
+      AddRelationNewConstraints(rel, list_make1(rawEnt), NIL, false, true);
+
+      /* Make the additional catalog changes visible */
+      CommandCounterIncrement();
+    }
+
+  /*
+   * Tell Phase 3 to fill in the default expression, if there is one.
+   *
+   * If there is no default, Phase 3 doesn't have to do anything, because
+   * that effectively means that the default is NULL.  The heap tuple access
+   * routines always check for attnum > # of attributes in tuple, and return
+   * NULL if so, so without any modification of the tuple data we will get
+   * the effect of NULL values in the new column.
+   *
+   * An exception occurs when the new column is of a domain type: the domain
+   * might have a NOT NULL constraint, or a check constraint that indirectly
+   * rejects nulls.  If there are any domain constraints then we construct
+   * an explicit NULL default value that will be passed through
+   * CoerceToDomain processing.  (This is a tad inefficient, since it causes
+   * rewriting the table which we really don't have to do, but the present
+   * design of domain processing doesn't offer any simple way of checking
+   * the constraints more directly.)
+   *
+   * Note: we use build_column_default, and not just the cooked default
+   * returned by AddRelationNewConstraints, so that the right thing happens
+   * when a datatype's default applies.
+   *
+   * We skip this step completely for views and foreign tables.  For a view,
+   * we can only get here from CREATE OR REPLACE VIEW, which historically
+   * doesn't set up defaults, not even for domain-typed columns.  And in any
+   * case we mustn't invoke Phase 3 on a view or foreign table, since they
+   * have no storage.
+   */
+  if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE
+      && relkind != RELKIND_FOREIGN_TABLE && attribute.attnum > 0)
+    {
+      defval = (Expr *) build_column_default(rel, attribute.attnum);
+
+      if (!defval && GetDomainConstraints(typeOid) != NIL)
+	{
+	  Oid			baseTypeId;
+	  int32		baseTypeMod;
+	  Oid			baseTypeColl;
+
+	  baseTypeMod = typmod;
+	  baseTypeId = getBaseTypeAndTypmod(typeOid, &baseTypeMod);
+	  baseTypeColl = get_typcollation(baseTypeId);
+	  defval = (Expr *) makeNullConst(baseTypeId, baseTypeMod, baseTypeColl);
+	  defval = (Expr *) coerce_to_target_type(NULL,
+						  (Node *) defval,
+						  baseTypeId,
+						  typeOid,
+						  typmod,
+						  COERCION_ASSIGNMENT,
+						  COERCE_IMPLICIT_CAST,
+						  -1);
+	  if (defval == NULL) /* should not happen */
+	    elog(ERROR, "failed to coerce base type to domain");
+	}
+
+      if (defval)
+	{
+	  NewColumnValue *newval;
+
+	  newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
+	  newval->attnum = attribute.attnum;
+	  newval->expr = defval;
+
+	  tab->newvals = lappend(tab->newvals, newval);
+	  tab->rewrite = true;
+	}
+
+      /*
+       * If the new column is NOT NULL, tell Phase 3 it needs to test that.
+       * (Note we don't do this for an OID column.  OID will be marked not
+       * null, but since it's filled specially, there's no need to test
+       * anything.)
+       */
+      tab->new_notnull |= colDef->is_not_null;
+    }
+
+  /*
+   * If we are adding an OID column, we have to tell Phase 3 to rewrite the
+   * table to fix that.
+   */
+  if (isOid)
+    tab->rewrite = true;
+
+  /*
+   * Add needed dependency entries for the new column.
+   */
+  add_column_datatype_dependency(myrelid, newattnum, attribute.atttypid);
+  add_column_collation_dependency(myrelid, newattnum, attribute.attcollation);
+
+  /*
+   * Propagate to children as appropriate.  Unlike most other ALTER
+   * routines, we have to do this one level of recursion at a time; we can't
+   * use find_all_inheritors to do it in one pass.
+   */
+  children = find_inheritance_children(RelationGetRelid(rel), lockmode);
+
+  /*
+   * If we are told not to recurse, there had better not be any child
+   * tables; else the addition would put them out of step.
+   */
+  if (children && !recurse)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("column must be added to child tables too")));
+
+  /* Children should see column as singly inherited */
+  if (!recursing)
+    {
+      colDef = copyObject(colDef);
+      colDef->inhcount = 1;
+      colDef->is_local = false;
+    }
+
+  foreach(child, children)
+    {
+      Oid			childrelid = lfirst_oid(child);
+      Relation	childrel;
+      AlteredTableInfo *childtab;
+
+      /* find_inheritance_children already got lock */
+      childrel = heap_open(childrelid, NoLock);
+      CheckTableNotInUse(childrel, "ALTER TABLE");
+
+      /* Find or create work queue entry for this table */
+      childtab = ATGetQueueEntry(wqueue, childrel);
+
+      /* Recurse to child */
+      ATExecAddColumn(wqueue, childtab, childrel,
+		      colDef, isOid, recurse, true, lockmode);
+
+      heap_close(childrel, NoLock);
+    }
 }
 
 /*
@@ -4477,16 +4505,16 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
 static void
 add_column_datatype_dependency(Oid relid, int32 attnum, Oid typid)
 {
-	ObjectAddress myself,
-				referenced;
-
-	myself.classId = RelationRelationId;
-	myself.objectId = relid;
-	myself.objectSubId = attnum;
-	referenced.classId = TypeRelationId;
-	referenced.objectId = typid;
-	referenced.objectSubId = 0;
-	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+  ObjectAddress myself,
+    referenced;
+
+  myself.classId = RelationRelationId;
+  myself.objectId = relid;
+  myself.objectSubId = attnum;
+  referenced.classId = TypeRelationId;
+  referenced.objectId = typid;
+  referenced.objectSubId = 0;
+  recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 }
 
 /*
@@ -4495,20 +4523,20 @@ add_column_datatype_dependency(Oid relid, int32 attnum, Oid typid)
 static void
 add_column_collation_dependency(Oid relid, int32 attnum, Oid collid)
 {
-	ObjectAddress myself,
-				referenced;
-
-	/* We know the default collation is pinned, so don't bother recording it */
-	if (OidIsValid(collid) && collid != DEFAULT_COLLATION_OID)
-	{
-		myself.classId = RelationRelationId;
-		myself.objectId = relid;
-		myself.objectSubId = attnum;
-		referenced.classId = CollationRelationId;
-		referenced.objectId = collid;
-		referenced.objectSubId = 0;
-		recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
-	}
+  ObjectAddress myself,
+    referenced;
+
+  /* We know the default collation is pinned, so don't bother recording it */
+  if (OidIsValid(collid) && collid != DEFAULT_COLLATION_OID)
+    {
+      myself.classId = RelationRelationId;
+      myself.objectId = relid;
+      myself.objectSubId = attnum;
+      referenced.classId = CollationRelationId;
+      referenced.objectId = collid;
+      referenced.objectSubId = 0;
+      recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
+    }
 }
 
 /*
@@ -4520,23 +4548,23 @@ add_column_collation_dependency(Oid relid, int32 attnum, Oid collid)
 static void
 ATPrepAddOids(List **wqueue, Relation rel, bool recurse, AlterTableCmd *cmd, LOCKMODE lockmode)
 {
-	/* If we're recursing to a child table, the ColumnDef is already set up */
-	if (cmd->def == NULL)
-	{
-		ColumnDef  *cdef = makeNode(ColumnDef);
-
-		cdef->colname = pstrdup("oid");
-		cdef->typeName = makeTypeNameFromOid(OIDOID, -1);
-		cdef->inhcount = 0;
-		cdef->is_local = true;
-		cdef->is_not_null = true;
-		cdef->storage = 0;
-		cmd->def = (Node *) cdef;
-	}
-	ATPrepAddColumn(wqueue, rel, recurse, false, cmd, lockmode);
-
-	if (recurse)
-		cmd->subtype = AT_AddOidsRecurse;
+  /* If we're recursing to a child table, the ColumnDef is already set up */
+  if (cmd->def == NULL)
+    {
+      ColumnDef  *cdef = makeNode(ColumnDef);
+
+      cdef->colname = pstrdup("oid");
+      cdef->typeName = makeTypeNameFromOid(OIDOID, -1);
+      cdef->inhcount = 0;
+      cdef->is_local = true;
+      cdef->is_not_null = true;
+      cdef->storage = 0;
+      cmd->def = (Node *) cdef;
+    }
+  ATPrepAddColumn(wqueue, rel, recurse, false, cmd, lockmode);
+
+  if (recurse)
+    cmd->subtype = AT_AddOidsRecurse;
 }
 
 /*
@@ -4545,89 +4573,89 @@ ATPrepAddOids(List **wqueue, Relation rel, bool recurse, AlterTableCmd *cmd, LOC
 static void
 ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode)
 {
-	HeapTuple	tuple;
-	AttrNumber	attnum;
-	Relation	attr_rel;
-	List	   *indexoidlist;
-	ListCell   *indexoidscan;
-
-	/*
-	 * lookup the attribute
-	 */
-	attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
-
-	if (!HeapTupleIsValid(tuple))
+  HeapTuple	tuple;
+  AttrNumber	attnum;
+  Relation	attr_rel;
+  List	   *indexoidlist;
+  ListCell   *indexoidscan;
+
+  /*
+   * lookup the attribute
+   */
+  attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+
+  attnum = ((Form_pg_attribute) GETSTRUCT(tuple))->attnum;
+
+  /* Prevent them from altering a system attribute */
+  if (attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
+
+  /*
+   * Check that the attribute is not in a primary key
+   */
+
+  /* Loop over all indexes on the relation */
+  indexoidlist = RelationGetIndexList(rel);
+
+  foreach(indexoidscan, indexoidlist)
+    {
+      Oid			indexoid = lfirst_oid(indexoidscan);
+      HeapTuple	indexTuple;
+      Form_pg_index indexStruct;
+      int			i;
+
+      indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
+      if (!HeapTupleIsValid(indexTuple))
+	elog(ERROR, "cache lookup failed for index %u", indexoid);
+      indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
+
+      /* If the index is not a primary key, skip the check */
+      if (indexStruct->indisprimary)
+	{
+	  /*
+	   * Loop over each attribute in the primary key and see if it
+	   * matches the to-be-altered attribute
+	   */
+	  for (i = 0; i < indexStruct->indnatts; i++)
+	    {
+	      if (indexStruct->indkey.values[i] == attnum)
 		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-
-	attnum = ((Form_pg_attribute) GETSTRUCT(tuple))->attnum;
-
-	/* Prevent them from altering a system attribute */
-	if (attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
-
-	/*
-	 * Check that the attribute is not in a primary key
-	 */
-
-	/* Loop over all indexes on the relation */
-	indexoidlist = RelationGetIndexList(rel);
-
-	foreach(indexoidscan, indexoidlist)
-	{
-		Oid			indexoid = lfirst_oid(indexoidscan);
-		HeapTuple	indexTuple;
-		Form_pg_index indexStruct;
-		int			i;
-
-		indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
-		if (!HeapTupleIsValid(indexTuple))
-			elog(ERROR, "cache lookup failed for index %u", indexoid);
-		indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
-
-		/* If the index is not a primary key, skip the check */
-		if (indexStruct->indisprimary)
-		{
-			/*
-			 * Loop over each attribute in the primary key and see if it
-			 * matches the to-be-altered attribute
-			 */
-			for (i = 0; i < indexStruct->indnatts; i++)
-			{
-				if (indexStruct->indkey.values[i] == attnum)
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-							 errmsg("column \"%s\" is in a primary key",
-									colName)));
-			}
-		}
-
-		ReleaseSysCache(indexTuple);
+			(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+			 errmsg("column \"%s\" is in a primary key",
+				colName)));
+	    }
 	}
 
-	list_free(indexoidlist);
+      ReleaseSysCache(indexTuple);
+    }
 
-	/*
-	 * Okay, actually perform the catalog change ... if needed
-	 */
-	if (((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull)
-	{
-		((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = FALSE;
+  list_free(indexoidlist);
 
-		simple_heap_update(attr_rel, &tuple->t_self, tuple);
+  /*
+   * Okay, actually perform the catalog change ... if needed
+   */
+  if (((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull)
+    {
+      ((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = FALSE;
 
-		/* keep the system catalog indexes current */
-		CatalogUpdateIndexes(attr_rel, tuple);
-	}
+      simple_heap_update(attr_rel, &tuple->t_self, tuple);
 
-	heap_close(attr_rel, RowExclusiveLock);
+      /* keep the system catalog indexes current */
+      CatalogUpdateIndexes(attr_rel, tuple);
+    }
+
+  heap_close(attr_rel, RowExclusiveLock);
 }
 
 /*
@@ -4635,51 +4663,51 @@ ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode)
  */
 static void
 ATExecSetNotNull(AlteredTableInfo *tab, Relation rel,
-				 const char *colName, LOCKMODE lockmode)
+		 const char *colName, LOCKMODE lockmode)
 {
-	HeapTuple	tuple;
-	AttrNumber	attnum;
-	Relation	attr_rel;
+  HeapTuple	tuple;
+  AttrNumber	attnum;
+  Relation	attr_rel;
 
-	/*
-	 * lookup the attribute
-	 */
-	attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
+  /*
+   * lookup the attribute
+   */
+  attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
 
-	tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+  tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
 
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
 
-	attnum = ((Form_pg_attribute) GETSTRUCT(tuple))->attnum;
+  attnum = ((Form_pg_attribute) GETSTRUCT(tuple))->attnum;
 
-	/* Prevent them from altering a system attribute */
-	if (attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
+  /* Prevent them from altering a system attribute */
+  if (attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
 
-	/*
-	 * Okay, actually perform the catalog change ... if needed
-	 */
-	if (!((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull)
-	{
-		((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = TRUE;
+  /*
+   * Okay, actually perform the catalog change ... if needed
+   */
+  if (!((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull)
+    {
+      ((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = TRUE;
 
-		simple_heap_update(attr_rel, &tuple->t_self, tuple);
+      simple_heap_update(attr_rel, &tuple->t_self, tuple);
 
-		/* keep the system catalog indexes current */
-		CatalogUpdateIndexes(attr_rel, tuple);
+      /* keep the system catalog indexes current */
+      CatalogUpdateIndexes(attr_rel, tuple);
 
-		/* Tell Phase 3 it needs to test the constraint */
-		tab->new_notnull = true;
-	}
+      /* Tell Phase 3 it needs to test the constraint */
+      tab->new_notnull = true;
+    }
 
-	heap_close(attr_rel, RowExclusiveLock);
+  heap_close(attr_rel, RowExclusiveLock);
 }
 
 /*
@@ -4687,49 +4715,49 @@ ATExecSetNotNull(AlteredTableInfo *tab, Relation rel,
  */
 static void
 ATExecColumnDefault(Relation rel, const char *colName,
-					Node *newDefault, LOCKMODE lockmode)
+		    Node *newDefault, LOCKMODE lockmode)
 {
-	AttrNumber	attnum;
-
-	/*
-	 * get the number of the attribute
-	 */
-	attnum = get_attnum(RelationGetRelid(rel), colName);
-	if (attnum == InvalidAttrNumber)
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-
-	/* Prevent them from altering a system attribute */
-	if (attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
-
-	/*
-	 * Remove any old default for the column.  We use RESTRICT here for
-	 * safety, but at present we do not expect anything to depend on the
-	 * default.
-	 */
-	RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, false);
-
-	if (newDefault)
-	{
-		/* SET DEFAULT */
-		RawColumnDefault *rawEnt;
-
-		rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
-		rawEnt->attnum = attnum;
-		rawEnt->raw_default = newDefault;
-
-		/*
-		 * This function is intended for CREATE TABLE, so it processes a
-		 * _list_ of defaults, but we just do one.
-		 */
-		AddRelationNewConstraints(rel, list_make1(rawEnt), NIL, false, true);
-	}
+  AttrNumber	attnum;
+
+  /*
+   * get the number of the attribute
+   */
+  attnum = get_attnum(RelationGetRelid(rel), colName);
+  if (attnum == InvalidAttrNumber)
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+
+  /* Prevent them from altering a system attribute */
+  if (attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
+
+  /*
+   * Remove any old default for the column.  We use RESTRICT here for
+   * safety, but at present we do not expect anything to depend on the
+   * default.
+   */
+  RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, false);
+
+  if (newDefault)
+    {
+      /* SET DEFAULT */
+      RawColumnDefault *rawEnt;
+
+      rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
+      rawEnt->attnum = attnum;
+      rawEnt->raw_default = newDefault;
+
+      /*
+       * This function is intended for CREATE TABLE, so it processes a
+       * _list_ of defaults, but we just do one.
+       */
+      AddRelationNewConstraints(rel, list_make1(rawEnt), NIL, false, true);
+    }
 }
 
 /*
@@ -4738,144 +4766,144 @@ ATExecColumnDefault(Relation rel, const char *colName,
 static void
 ATPrepSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE lockmode)
 {
-	/*
-	 * We do our own permission checking because (a) we want to allow SET
-	 * STATISTICS on indexes (for expressional index columns), and (b) we want
-	 * to allow SET STATISTICS on system catalogs without requiring
-	 * allowSystemTableMods to be turned on.
-	 */
-	if (rel->rd_rel->relkind != RELKIND_RELATION &&
-		rel->rd_rel->relkind != RELKIND_INDEX)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a table or index",
-						RelationGetRelationName(rel))));
-
-	/* Permissions checks */
-	if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
-					   RelationGetRelationName(rel));
+  /*
+   * We do our own permission checking because (a) we want to allow SET
+   * STATISTICS on indexes (for expressional index columns), and (b) we want
+   * to allow SET STATISTICS on system catalogs without requiring
+   * allowSystemTableMods to be turned on.
+   */
+  if (rel->rd_rel->relkind != RELKIND_RELATION &&
+      rel->rd_rel->relkind != RELKIND_INDEX)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a table or index",
+		    RelationGetRelationName(rel))));
+
+  /* Permissions checks */
+  if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
+    aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		   RelationGetRelationName(rel));
 }
 
 static void
 ATExecSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE lockmode)
 {
-	int			newtarget;
-	Relation	attrelation;
-	HeapTuple	tuple;
-	Form_pg_attribute attrtuple;
-
-	Assert(IsA(newValue, Integer));
-	newtarget = intVal(newValue);
-
-	/*
-	 * Limit target to a sane range
-	 */
-	if (newtarget < -1)
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("statistics target %d is too low",
-						newtarget)));
-	}
-	else if (newtarget > 10000)
-	{
-		newtarget = 10000;
-		ereport(WARNING,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("lowering statistics target to %d",
-						newtarget)));
-	}
-
-	attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
-
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-	attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
-
-	if (attrtuple->attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
-
-	attrtuple->attstattarget = newtarget;
-
-	simple_heap_update(attrelation, &tuple->t_self, tuple);
-
-	/* keep system catalog indexes current */
-	CatalogUpdateIndexes(attrelation, tuple);
-
-	heap_freetuple(tuple);
-
-	heap_close(attrelation, RowExclusiveLock);
+  int			newtarget;
+  Relation	attrelation;
+  HeapTuple	tuple;
+  Form_pg_attribute attrtuple;
+
+  Assert(IsA(newValue, Integer));
+  newtarget = intVal(newValue);
+
+  /*
+   * Limit target to a sane range
+   */
+  if (newtarget < -1)
+    {
+      ereport(ERROR,
+	      (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+	       errmsg("statistics target %d is too low",
+		      newtarget)));
+    }
+  else if (newtarget > 10000)
+    {
+      newtarget = 10000;
+      ereport(WARNING,
+	      (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+	       errmsg("lowering statistics target to %d",
+		      newtarget)));
+    }
+
+  attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+  attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
+
+  if (attrtuple->attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
+
+  attrtuple->attstattarget = newtarget;
+
+  simple_heap_update(attrelation, &tuple->t_self, tuple);
+
+  /* keep system catalog indexes current */
+  CatalogUpdateIndexes(attrelation, tuple);
+
+  heap_freetuple(tuple);
+
+  heap_close(attrelation, RowExclusiveLock);
 }
 
 static void
 ATExecSetOptions(Relation rel, const char *colName, Node *options,
-				 bool isReset, LOCKMODE lockmode)
+		 bool isReset, LOCKMODE lockmode)
 {
-	Relation	attrelation;
-	HeapTuple	tuple,
-				newtuple;
-	Form_pg_attribute attrtuple;
-	Datum		datum,
-				newOptions;
-	bool		isnull;
-	Datum		repl_val[Natts_pg_attribute];
-	bool		repl_null[Natts_pg_attribute];
-	bool		repl_repl[Natts_pg_attribute];
-
-	attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheAttName(RelationGetRelid(rel), colName);
-
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-	attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
-
-	if (attrtuple->attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
-
-	/* Generate new proposed attoptions (text array) */
-	Assert(IsA(options, List));
-	datum = SysCacheGetAttr(ATTNAME, tuple, Anum_pg_attribute_attoptions,
-							&isnull);
-	newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
-									 (List *) options, NULL, NULL, false,
-									 isReset);
-	/* Validate new options */
-	(void) attribute_reloptions(newOptions, true);
-
-	/* Build new tuple. */
-	memset(repl_null, false, sizeof(repl_null));
-	memset(repl_repl, false, sizeof(repl_repl));
-	if (newOptions != (Datum) 0)
-		repl_val[Anum_pg_attribute_attoptions - 1] = newOptions;
-	else
-		repl_null[Anum_pg_attribute_attoptions - 1] = true;
-	repl_repl[Anum_pg_attribute_attoptions - 1] = true;
-	newtuple = heap_modify_tuple(tuple, RelationGetDescr(attrelation),
-								 repl_val, repl_null, repl_repl);
-	ReleaseSysCache(tuple);
-
-	/* Update system catalog. */
-	simple_heap_update(attrelation, &newtuple->t_self, newtuple);
-	CatalogUpdateIndexes(attrelation, newtuple);
-	heap_freetuple(newtuple);
-
-	heap_close(attrelation, RowExclusiveLock);
+  Relation	attrelation;
+  HeapTuple	tuple,
+    newtuple;
+  Form_pg_attribute attrtuple;
+  Datum		datum,
+    newOptions;
+  bool		isnull;
+  Datum		repl_val[Natts_pg_attribute];
+  bool		repl_null[Natts_pg_attribute];
+  bool		repl_repl[Natts_pg_attribute];
+
+  attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheAttName(RelationGetRelid(rel), colName);
+
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+  attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
+
+  if (attrtuple->attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
+
+  /* Generate new proposed attoptions (text array) */
+  Assert(IsA(options, List));
+  datum = SysCacheGetAttr(ATTNAME, tuple, Anum_pg_attribute_attoptions,
+			  &isnull);
+  newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
+				   (List *) options, NULL, NULL, false,
+				   isReset);
+  /* Validate new options */
+  (void) attribute_reloptions(newOptions, true);
+
+  /* Build new tuple. */
+  memset(repl_null, false, sizeof(repl_null));
+  memset(repl_repl, false, sizeof(repl_repl));
+  if (newOptions != (Datum) 0)
+    repl_val[Anum_pg_attribute_attoptions - 1] = newOptions;
+  else
+    repl_null[Anum_pg_attribute_attoptions - 1] = true;
+  repl_repl[Anum_pg_attribute_attoptions - 1] = true;
+  newtuple = heap_modify_tuple(tuple, RelationGetDescr(attrelation),
+			       repl_val, repl_null, repl_repl);
+  ReleaseSysCache(tuple);
+
+  /* Update system catalog. */
+  simple_heap_update(attrelation, &newtuple->t_self, newtuple);
+  CatalogUpdateIndexes(attrelation, newtuple);
+  heap_freetuple(newtuple);
+
+  heap_close(attrelation, RowExclusiveLock);
 }
 
 /*
@@ -4884,69 +4912,69 @@ ATExecSetOptions(Relation rel, const char *colName, Node *options,
 static void
 ATExecSetStorage(Relation rel, const char *colName, Node *newValue, LOCKMODE lockmode)
 {
-	char	   *storagemode;
-	char		newstorage;
-	Relation	attrelation;
-	HeapTuple	tuple;
-	Form_pg_attribute attrtuple;
-
-	Assert(IsA(newValue, String));
-	storagemode = strVal(newValue);
-
-	if (pg_strcasecmp(storagemode, "plain") == 0)
-		newstorage = 'p';
-	else if (pg_strcasecmp(storagemode, "external") == 0)
-		newstorage = 'e';
-	else if (pg_strcasecmp(storagemode, "extended") == 0)
-		newstorage = 'x';
-	else if (pg_strcasecmp(storagemode, "main") == 0)
-		newstorage = 'm';
-	else
-	{
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid storage type \"%s\"",
-						storagemode)));
-		newstorage = 0;			/* keep compiler quiet */
-	}
-
-	attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
-
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-	attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
-
-	if (attrtuple->attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
-
-	/*
-	 * safety check: do not allow toasted storage modes unless column datatype
-	 * is TOAST-aware.
-	 */
-	if (newstorage == 'p' || TypeIsToastable(attrtuple->atttypid))
-		attrtuple->attstorage = newstorage;
-	else
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("column data type %s can only have storage PLAIN",
-						format_type_be(attrtuple->atttypid))));
-
-	simple_heap_update(attrelation, &tuple->t_self, tuple);
-
-	/* keep system catalog indexes current */
-	CatalogUpdateIndexes(attrelation, tuple);
-
-	heap_freetuple(tuple);
-
-	heap_close(attrelation, RowExclusiveLock);
+  char	   *storagemode;
+  char		newstorage;
+  Relation	attrelation;
+  HeapTuple	tuple;
+  Form_pg_attribute attrtuple;
+
+  Assert(IsA(newValue, String));
+  storagemode = strVal(newValue);
+
+  if (pg_strcasecmp(storagemode, "plain") == 0)
+    newstorage = 'p';
+  else if (pg_strcasecmp(storagemode, "external") == 0)
+    newstorage = 'e';
+  else if (pg_strcasecmp(storagemode, "extended") == 0)
+    newstorage = 'x';
+  else if (pg_strcasecmp(storagemode, "main") == 0)
+    newstorage = 'm';
+  else
+    {
+      ereport(ERROR,
+	      (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+	       errmsg("invalid storage type \"%s\"",
+		      storagemode)));
+      newstorage = 0;			/* keep compiler quiet */
+    }
+
+  attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+  attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
+
+  if (attrtuple->attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
+
+  /*
+   * safety check: do not allow toasted storage modes unless column datatype
+   * is TOAST-aware.
+   */
+  if (newstorage == 'p' || TypeIsToastable(attrtuple->atttypid))
+    attrtuple->attstorage = newstorage;
+  else
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("column data type %s can only have storage PLAIN",
+		    format_type_be(attrtuple->atttypid))));
+
+  simple_heap_update(attrelation, &tuple->t_self, tuple);
+
+  /* keep system catalog indexes current */
+  CatalogUpdateIndexes(attrelation, tuple);
+
+  heap_freetuple(tuple);
+
+  heap_close(attrelation, RowExclusiveLock);
 }
 
 
@@ -4961,384 +4989,384 @@ ATExecSetStorage(Relation rel, const char *colName, Node *newValue, LOCKMODE loc
  */
 static void
 ATPrepDropColumn(List **wqueue, Relation rel, bool recurse, bool recursing,
-				 AlterTableCmd *cmd, LOCKMODE lockmode)
+		 AlterTableCmd *cmd, LOCKMODE lockmode)
 {
-	if (rel->rd_rel->reloftype && !recursing)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot drop column from typed table")));
+  if (rel->rd_rel->reloftype && !recursing)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("cannot drop column from typed table")));
 
-	if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
-		ATTypedTableRecursion(wqueue, rel, cmd, lockmode);
+  if (rel->rd_rel->relkind == RELKIND_COMPOSITE_TYPE)
+    ATTypedTableRecursion(wqueue, rel, cmd, lockmode);
 
-	if (recurse)
-		cmd->subtype = AT_DropColumnRecurse;
+  if (recurse)
+    cmd->subtype = AT_DropColumnRecurse;
 }
 
 static void
 ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
-				 DropBehavior behavior,
-				 bool recurse, bool recursing,
-				 bool missing_ok, LOCKMODE lockmode)
+		 DropBehavior behavior,
+		 bool recurse, bool recursing,
+		 bool missing_ok, LOCKMODE lockmode)
 {
-	HeapTuple	tuple;
-	Form_pg_attribute targetatt;
-	AttrNumber	attnum;
-	List	   *children;
-	ObjectAddress object;
-
-	/* At top level, permission check was done in ATPrepCmd, else do it */
-	if (recursing)
-		ATSimplePermissions(rel, ATT_TABLE);
-
-	/*
-	 * get the number of the attribute
-	 */
-	tuple = SearchSysCacheAttName(RelationGetRelid(rel), colName);
-	if (!HeapTupleIsValid(tuple))
-	{
-		if (!missing_ok)
+  HeapTuple	tuple;
+  Form_pg_attribute targetatt;
+  AttrNumber	attnum;
+  List	   *children;
+  ObjectAddress object;
+
+  /* At top level, permission check was done in ATPrepCmd, else do it */
+  if (recursing)
+    ATSimplePermissions(rel, ATT_TABLE);
+
+  /*
+   * get the number of the attribute
+   */
+  tuple = SearchSysCacheAttName(RelationGetRelid(rel), colName);
+  if (!HeapTupleIsValid(tuple))
+    {
+      if (!missing_ok)
+	{
+	  ereport(ERROR,
+		  (errcode(ERRCODE_UNDEFINED_COLUMN),
+		   errmsg("column \"%s\" of relation \"%s\" does not exist",
+			  colName, RelationGetRelationName(rel))));
+	}
+      else
+	{
+	  ereport(NOTICE,
+		  (errmsg("column \"%s\" of relation \"%s\" does not exist, skipping",
+			  colName, RelationGetRelationName(rel))));
+	  return;
+	}
+    }
+  targetatt = (Form_pg_attribute) GETSTRUCT(tuple);
+
+  attnum = targetatt->attnum;
+
+  /* Can't drop a system attribute, except OID */
+  if (attnum <= 0 && attnum != ObjectIdAttributeNumber)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot drop system column \"%s\"",
+		    colName)));
+
+  /* Don't drop inherited columns */
+  if (targetatt->attinhcount > 0 && !recursing)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("cannot drop inherited column \"%s\"",
+		    colName)));
+
+  ReleaseSysCache(tuple);
+
+  /*
+   * Propagate to children as appropriate.  Unlike most other ALTER
+   * routines, we have to do this one level of recursion at a time; we can't
+   * use find_all_inheritors to do it in one pass.
+   */
+  children = find_inheritance_children(RelationGetRelid(rel), lockmode);
+
+  if (children)
+    {
+      Relation	attr_rel;
+      ListCell   *child;
+
+      attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
+      foreach(child, children)
+	{
+	  Oid			childrelid = lfirst_oid(child);
+	  Relation	childrel;
+	  Form_pg_attribute childatt;
+
+	  /* find_inheritance_children already got lock */
+	  childrel = heap_open(childrelid, NoLock);
+	  CheckTableNotInUse(childrel, "ALTER TABLE");
+
+	  tuple = SearchSysCacheCopyAttName(childrelid, colName);
+	  if (!HeapTupleIsValid(tuple))		/* shouldn't happen */
+	    elog(ERROR, "cache lookup failed for attribute \"%s\" of relation %u",
+		 colName, childrelid);
+	  childatt = (Form_pg_attribute) GETSTRUCT(tuple);
+
+	  if (childatt->attinhcount <= 0)		/* shouldn't happen */
+	    elog(ERROR, "relation %u has non-inherited attribute \"%s\"",
+		 childrelid, colName);
+
+	  if (recurse)
+	    {
+	      /*
+	       * If the child column has other definition sources, just
+	       * decrement its inheritance count; if not, recurse to delete
+	       * it.
+	       */
+	      if (childatt->attinhcount == 1 && !childatt->attislocal)
 		{
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("column \"%s\" of relation \"%s\" does not exist",
-							colName, RelationGetRelationName(rel))));
+		  /* Time to delete this child column, too */
+		  ATExecDropColumn(wqueue, childrel, colName,
+				   behavior, true, true,
+				   false, lockmode);
 		}
-		else
+	      else
 		{
-			ereport(NOTICE,
-					(errmsg("column \"%s\" of relation \"%s\" does not exist, skipping",
-							colName, RelationGetRelationName(rel))));
-			return;
-		}
-	}
-	targetatt = (Form_pg_attribute) GETSTRUCT(tuple);
-
-	attnum = targetatt->attnum;
-
-	/* Can't drop a system attribute, except OID */
-	if (attnum <= 0 && attnum != ObjectIdAttributeNumber)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot drop system column \"%s\"",
-						colName)));
-
-	/* Don't drop inherited columns */
-	if (targetatt->attinhcount > 0 && !recursing)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("cannot drop inherited column \"%s\"",
-						colName)));
+		  /* Child column must survive my deletion */
+		  childatt->attinhcount--;
 
-	ReleaseSysCache(tuple);
+		  simple_heap_update(attr_rel, &tuple->t_self, tuple);
 
-	/*
-	 * Propagate to children as appropriate.  Unlike most other ALTER
-	 * routines, we have to do this one level of recursion at a time; we can't
-	 * use find_all_inheritors to do it in one pass.
-	 */
-	children = find_inheritance_children(RelationGetRelid(rel), lockmode);
+		  /* keep the system catalog indexes current */
+		  CatalogUpdateIndexes(attr_rel, tuple);
 
-	if (children)
-	{
-		Relation	attr_rel;
-		ListCell   *child;
+		  /* Make update visible */
+		  CommandCounterIncrement();
+		}
+	    }
+	  else
+	    {
+	      /*
+	       * If we were told to drop ONLY in this table (no recursion),
+	       * we need to mark the inheritors' attributes as locally
+	       * defined rather than inherited.
+	       */
+	      childatt->attinhcount--;
+	      childatt->attislocal = true;
+
+	      simple_heap_update(attr_rel, &tuple->t_self, tuple);
+
+	      /* keep the system catalog indexes current */
+	      CatalogUpdateIndexes(attr_rel, tuple);
+
+	      /* Make update visible */
+	      CommandCounterIncrement();
+	    }
+
+	  heap_freetuple(tuple);
+
+	  heap_close(childrel, NoLock);
+	}
+      heap_close(attr_rel, RowExclusiveLock);
+    }
+
+  /*
+   * Perform the actual column deletion
+   */
+  object.classId = RelationRelationId;
+  object.objectId = RelationGetRelid(rel);
+  object.objectSubId = attnum;
+
+  performDeletion(&object, behavior);
+
+  /*
+   * If we dropped the OID column, must adjust pg_class.relhasoids and tell
+   * Phase 3 to physically get rid of the column.  We formerly left the
+   * column in place physically, but this caused subtle problems.  See
+   * http://archives.postgresql.org/pgsql-hackers/2009-02/msg00363.php
+   */
+  if (attnum == ObjectIdAttributeNumber)
+    {
+      Relation	class_rel;
+      Form_pg_class tuple_class;
+      AlteredTableInfo *tab;
+
+      class_rel = heap_open(RelationRelationId, RowExclusiveLock);
+
+      tuple = SearchSysCacheCopy1(RELOID,
+				  ObjectIdGetDatum(RelationGetRelid(rel)));
+      if (!HeapTupleIsValid(tuple))
+	elog(ERROR, "cache lookup failed for relation %u",
+	     RelationGetRelid(rel));
+      tuple_class = (Form_pg_class) GETSTRUCT(tuple);
+
+      tuple_class->relhasoids = false;
+      simple_heap_update(class_rel, &tuple->t_self, tuple);
+
+      /* Keep the catalog indexes up to date */
+      CatalogUpdateIndexes(class_rel, tuple);
+
+      heap_close(class_rel, RowExclusiveLock);
+
+      /* Find or create work queue entry for this table */
+      tab = ATGetQueueEntry(wqueue, rel);
+
+      /* Tell Phase 3 to physically remove the OID column */
+      tab->rewrite = true;
+    }
+}
 
-		attr_rel = heap_open(AttributeRelationId, RowExclusiveLock);
-		foreach(child, children)
-		{
-			Oid			childrelid = lfirst_oid(child);
-			Relation	childrel;
-			Form_pg_attribute childatt;
+/*
+ * ALTER TABLE ADD INDEX
+ *
+ * There is no such command in the grammar, but parse_utilcmd.c converts
+ * UNIQUE and PRIMARY KEY constraints into AT_AddIndex subcommands.  This lets
+ * us schedule creation of the index at the appropriate time during ALTER.
+ */
+static void
+ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
+	       IndexStmt *stmt, bool is_rebuild, LOCKMODE lockmode)
+{
+  bool		check_rights;
+  bool		skip_build;
+  bool		quiet;
+
+  Assert(IsA(stmt, IndexStmt));
+
+  /* suppress schema rights check when rebuilding existing index */
+  check_rights = !is_rebuild;
+  /* skip index build if phase 3 will have to rewrite table anyway */
+  skip_build = tab->rewrite;
+  /* suppress notices when rebuilding existing index */
+  quiet = is_rebuild;
+
+  /* The IndexStmt has already been through transformIndexStmt */
+
+  DefineIndex(stmt->relation, /* relation */
+	      stmt->idxname,	/* index name */
+	      InvalidOid,		/* no predefined OID */
+	      stmt->accessMethod,		/* am name */
+	      stmt->tableSpace,
+	      stmt->indexParams,		/* parameters */
+	      (Expr *) stmt->whereClause,
+	      stmt->options,
+	      stmt->excludeOpNames,
+	      stmt->unique,
+	      stmt->primary,
+	      stmt->isconstraint,
+	      stmt->deferrable,
+	      stmt->initdeferred,
+	      true,			/* is_alter_table */
+	      check_rights,
+	      skip_build,
+	      quiet,
+	      false);
+}
 
-			/* find_inheritance_children already got lock */
-			childrel = heap_open(childrelid, NoLock);
-			CheckTableNotInUse(childrel, "ALTER TABLE");
-
-			tuple = SearchSysCacheCopyAttName(childrelid, colName);
-			if (!HeapTupleIsValid(tuple))		/* shouldn't happen */
-				elog(ERROR, "cache lookup failed for attribute \"%s\" of relation %u",
-					 colName, childrelid);
-			childatt = (Form_pg_attribute) GETSTRUCT(tuple);
-
-			if (childatt->attinhcount <= 0)		/* shouldn't happen */
-				elog(ERROR, "relation %u has non-inherited attribute \"%s\"",
-					 childrelid, colName);
-
-			if (recurse)
-			{
-				/*
-				 * If the child column has other definition sources, just
-				 * decrement its inheritance count; if not, recurse to delete
-				 * it.
-				 */
-				if (childatt->attinhcount == 1 && !childatt->attislocal)
-				{
-					/* Time to delete this child column, too */
-					ATExecDropColumn(wqueue, childrel, colName,
-									 behavior, true, true,
-									 false, lockmode);
-				}
-				else
-				{
-					/* Child column must survive my deletion */
-					childatt->attinhcount--;
-
-					simple_heap_update(attr_rel, &tuple->t_self, tuple);
-
-					/* keep the system catalog indexes current */
-					CatalogUpdateIndexes(attr_rel, tuple);
-
-					/* Make update visible */
-					CommandCounterIncrement();
-				}
-			}
-			else
-			{
-				/*
-				 * If we were told to drop ONLY in this table (no recursion),
-				 * we need to mark the inheritors' attributes as locally
-				 * defined rather than inherited.
-				 */
-				childatt->attinhcount--;
-				childatt->attislocal = true;
-
-				simple_heap_update(attr_rel, &tuple->t_self, tuple);
-
-				/* keep the system catalog indexes current */
-				CatalogUpdateIndexes(attr_rel, tuple);
-
-				/* Make update visible */
-				CommandCounterIncrement();
-			}
-
-			heap_freetuple(tuple);
-
-			heap_close(childrel, NoLock);
-		}
-		heap_close(attr_rel, RowExclusiveLock);
-	}
-
-	/*
-	 * Perform the actual column deletion
-	 */
-	object.classId = RelationRelationId;
-	object.objectId = RelationGetRelid(rel);
-	object.objectSubId = attnum;
-
-	performDeletion(&object, behavior);
-
-	/*
-	 * If we dropped the OID column, must adjust pg_class.relhasoids and tell
-	 * Phase 3 to physically get rid of the column.  We formerly left the
-	 * column in place physically, but this caused subtle problems.  See
-	 * http://archives.postgresql.org/pgsql-hackers/2009-02/msg00363.php
-	 */
-	if (attnum == ObjectIdAttributeNumber)
-	{
-		Relation	class_rel;
-		Form_pg_class tuple_class;
-		AlteredTableInfo *tab;
-
-		class_rel = heap_open(RelationRelationId, RowExclusiveLock);
-
-		tuple = SearchSysCacheCopy1(RELOID,
-									ObjectIdGetDatum(RelationGetRelid(rel)));
-		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for relation %u",
-				 RelationGetRelid(rel));
-		tuple_class = (Form_pg_class) GETSTRUCT(tuple);
-
-		tuple_class->relhasoids = false;
-		simple_heap_update(class_rel, &tuple->t_self, tuple);
-
-		/* Keep the catalog indexes up to date */
-		CatalogUpdateIndexes(class_rel, tuple);
-
-		heap_close(class_rel, RowExclusiveLock);
-
-		/* Find or create work queue entry for this table */
-		tab = ATGetQueueEntry(wqueue, rel);
-
-		/* Tell Phase 3 to physically remove the OID column */
-		tab->rewrite = true;
-	}
-}
-
-/*
- * ALTER TABLE ADD INDEX
- *
- * There is no such command in the grammar, but parse_utilcmd.c converts
- * UNIQUE and PRIMARY KEY constraints into AT_AddIndex subcommands.  This lets
- * us schedule creation of the index at the appropriate time during ALTER.
- */
-static void
-ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
-			   IndexStmt *stmt, bool is_rebuild, LOCKMODE lockmode)
-{
-	bool		check_rights;
-	bool		skip_build;
-	bool		quiet;
-
-	Assert(IsA(stmt, IndexStmt));
-
-	/* suppress schema rights check when rebuilding existing index */
-	check_rights = !is_rebuild;
-	/* skip index build if phase 3 will have to rewrite table anyway */
-	skip_build = tab->rewrite;
-	/* suppress notices when rebuilding existing index */
-	quiet = is_rebuild;
-
-	/* The IndexStmt has already been through transformIndexStmt */
-
-	DefineIndex(stmt->relation, /* relation */
-				stmt->idxname,	/* index name */
-				InvalidOid,		/* no predefined OID */
-				stmt->accessMethod,		/* am name */
-				stmt->tableSpace,
-				stmt->indexParams,		/* parameters */
-				(Expr *) stmt->whereClause,
-				stmt->options,
-				stmt->excludeOpNames,
-				stmt->unique,
-				stmt->primary,
-				stmt->isconstraint,
-				stmt->deferrable,
-				stmt->initdeferred,
-				true,			/* is_alter_table */
-				check_rights,
-				skip_build,
-				quiet,
-				false);
-}
-
-/*
- * ALTER TABLE ADD CONSTRAINT USING INDEX
- */
-static void
-ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
-						 IndexStmt *stmt, LOCKMODE lockmode)
-{
-	Oid			index_oid = stmt->indexOid;
-	Relation	indexRel;
-	char	   *indexName;
-	IndexInfo  *indexInfo;
-	char	   *constraintName;
-	char		constraintType;
-
-	Assert(IsA(stmt, IndexStmt));
-	Assert(OidIsValid(index_oid));
-	Assert(stmt->isconstraint);
-
-	indexRel = index_open(index_oid, AccessShareLock);
-
-	indexName = pstrdup(RelationGetRelationName(indexRel));
-
-	indexInfo = BuildIndexInfo(indexRel);
-
-	/* this should have been checked at parse time */
-	if (!indexInfo->ii_Unique)
-		elog(ERROR, "index \"%s\" is not unique", indexName);
-
-	/*
-	 * Determine name to assign to constraint.	We require a constraint to
-	 * have the same name as the underlying index; therefore, use the index's
-	 * existing name as the default constraint name, and if the user
-	 * explicitly gives some other name for the constraint, rename the index
-	 * to match.
-	 */
-	constraintName = stmt->idxname;
-	if (constraintName == NULL)
-		constraintName = indexName;
-	else if (strcmp(constraintName, indexName) != 0)
-	{
-		ereport(NOTICE,
-				(errmsg("ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\"",
-						indexName, constraintName)));
-		RenameRelation(index_oid, constraintName, OBJECT_INDEX);
-	}
-
-	/* Extra checks needed if making primary key */
-	if (stmt->primary)
-		index_check_primary_key(rel, indexInfo, true);
-
-	/* Note we currently don't support EXCLUSION constraints here */
-	if (stmt->primary)
-		constraintType = CONSTRAINT_PRIMARY;
-	else
-		constraintType = CONSTRAINT_UNIQUE;
-
-	/* Create the catalog entries for the constraint */
-	index_constraint_create(rel,
-							index_oid,
-							indexInfo,
-							constraintName,
-							constraintType,
-							stmt->deferrable,
-							stmt->initdeferred,
-							stmt->primary,
-							true,
-							allowSystemTableMods);
-
-	index_close(indexRel, NoLock);
-}
+/*
+ * ALTER TABLE ADD CONSTRAINT USING INDEX
+ */
+static void
+ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
+			 IndexStmt *stmt, LOCKMODE lockmode)
+{
+  Oid			index_oid = stmt->indexOid;
+  Relation	indexRel;
+  char	   *indexName;
+  IndexInfo  *indexInfo;
+  char	   *constraintName;
+  char		constraintType;
+
+  Assert(IsA(stmt, IndexStmt));
+  Assert(OidIsValid(index_oid));
+  Assert(stmt->isconstraint);
+
+  indexRel = index_open(index_oid, AccessShareLock);
+
+  indexName = pstrdup(RelationGetRelationName(indexRel));
+
+  indexInfo = BuildIndexInfo(indexRel);
+
+  /* this should have been checked at parse time */
+  if (!indexInfo->ii_Unique)
+    elog(ERROR, "index \"%s\" is not unique", indexName);
+
+  /*
+   * Determine name to assign to constraint.	We require a constraint to
+   * have the same name as the underlying index; therefore, use the index's
+   * existing name as the default constraint name, and if the user
+   * explicitly gives some other name for the constraint, rename the index
+   * to match.
+   */
+  constraintName = stmt->idxname;
+  if (constraintName == NULL)
+    constraintName = indexName;
+  else if (strcmp(constraintName, indexName) != 0)
+    {
+      ereport(NOTICE,
+	      (errmsg("ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\"",
+		      indexName, constraintName)));
+      RenameRelation(index_oid, constraintName, OBJECT_INDEX);
+    }
+
+  /* Extra checks needed if making primary key */
+  if (stmt->primary)
+    index_check_primary_key(rel, indexInfo, true);
+
+  /* Note we currently don't support EXCLUSION constraints here */
+  if (stmt->primary)
+    constraintType = CONSTRAINT_PRIMARY;
+  else
+    constraintType = CONSTRAINT_UNIQUE;
+
+  /* Create the catalog entries for the constraint */
+  index_constraint_create(rel,
+			  index_oid,
+			  indexInfo,
+			  constraintName,
+			  constraintType,
+			  stmt->deferrable,
+			  stmt->initdeferred,
+			  stmt->primary,
+			  true,
+			  allowSystemTableMods);
+
+  index_close(indexRel, NoLock);
+}
 
 /*
  * ALTER TABLE ADD CONSTRAINT
  */
 static void
 ATExecAddConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
-				  Constraint *newConstraint, bool recurse, LOCKMODE lockmode)
+		    Constraint *newConstraint, bool recurse, LOCKMODE lockmode)
 {
-	Assert(IsA(newConstraint, Constraint));
-
-	/*
-	 * Currently, we only expect to see CONSTR_CHECK and CONSTR_FOREIGN nodes
-	 * arriving here (see the preprocessing done in parse_utilcmd.c).  Use a
-	 * switch anyway to make it easier to add more code later.
-	 */
-	switch (newConstraint->contype)
-	{
-		case CONSTR_CHECK:
-			ATAddCheckConstraint(wqueue, tab, rel,
-								 newConstraint, recurse, false, lockmode);
-			break;
-
-		case CONSTR_FOREIGN:
-
-			/*
-			 * Note that we currently never recurse for FK constraints, so the
-			 * "recurse" flag is silently ignored.
-			 *
-			 * Assign or validate constraint name
-			 */
-			if (newConstraint->conname)
-			{
-				if (ConstraintNameIsUsed(CONSTRAINT_RELATION,
-										 RelationGetRelid(rel),
-										 RelationGetNamespace(rel),
-										 newConstraint->conname))
-					ereport(ERROR,
-							(errcode(ERRCODE_DUPLICATE_OBJECT),
-							 errmsg("constraint \"%s\" for relation \"%s\" already exists",
-									newConstraint->conname,
-									RelationGetRelationName(rel))));
-			}
-			else
-				newConstraint->conname =
-					ChooseConstraintName(RelationGetRelationName(rel),
-								   strVal(linitial(newConstraint->fk_attrs)),
-										 "fkey",
-										 RelationGetNamespace(rel),
-										 NIL);
-
-			ATAddForeignKeyConstraint(tab, rel, newConstraint, lockmode);
-			break;
-
-		default:
-			elog(ERROR, "unrecognized constraint type: %d",
-				 (int) newConstraint->contype);
-	}
+  Assert(IsA(newConstraint, Constraint));
+
+  /*
+   * Currently, we only expect to see CONSTR_CHECK and CONSTR_FOREIGN nodes
+   * arriving here (see the preprocessing done in parse_utilcmd.c).  Use a
+   * switch anyway to make it easier to add more code later.
+   */
+  switch (newConstraint->contype)
+    {
+    case CONSTR_CHECK:
+      ATAddCheckConstraint(wqueue, tab, rel,
+			   newConstraint, recurse, false, lockmode);
+      break;
+
+    case CONSTR_FOREIGN:
+
+      /*
+       * Note that we currently never recurse for FK constraints, so the
+       * "recurse" flag is silently ignored.
+       *
+       * Assign or validate constraint name
+       */
+      if (newConstraint->conname)
+	{
+	  if (ConstraintNameIsUsed(CONSTRAINT_RELATION,
+				   RelationGetRelid(rel),
+				   RelationGetNamespace(rel),
+				   newConstraint->conname))
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DUPLICATE_OBJECT),
+		     errmsg("constraint \"%s\" for relation \"%s\" already exists",
+			    newConstraint->conname,
+			    RelationGetRelationName(rel))));
+	}
+      else
+	newConstraint->conname =
+	  ChooseConstraintName(RelationGetRelationName(rel),
+			       strVal(linitial(newConstraint->fk_attrs)),
+			       "fkey",
+			       RelationGetNamespace(rel),
+			       NIL);
+
+      ATAddForeignKeyConstraint(tab, rel, newConstraint, lockmode);
+      break;
+
+    default:
+      elog(ERROR, "unrecognized constraint type: %d",
+	   (int) newConstraint->contype);
+    }
 }
 
 /*
@@ -5356,101 +5384,101 @@ ATExecAddConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
  */
 static void
 ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
-					 Constraint *constr, bool recurse, bool recursing,
-					 LOCKMODE lockmode)
+		     Constraint *constr, bool recurse, bool recursing,
+		     LOCKMODE lockmode)
 {
-	List	   *newcons;
-	ListCell   *lcon;
-	List	   *children;
-	ListCell   *child;
-
-	/* At top level, permission check was done in ATPrepCmd, else do it */
-	if (recursing)
-		ATSimplePermissions(rel, ATT_TABLE);
-
-	/*
-	 * Call AddRelationNewConstraints to do the work, making sure it works on
-	 * a copy of the Constraint so transformExpr can't modify the original. It
-	 * returns a list of cooked constraints.
-	 *
-	 * If the constraint ends up getting merged with a pre-existing one, it's
-	 * omitted from the returned list, which is what we want: we do not need
-	 * to do any validation work.  That can only happen at child tables,
-	 * though, since we disallow merging at the top level.
-	 */
-	newcons = AddRelationNewConstraints(rel, NIL,
-										list_make1(copyObject(constr)),
-										recursing, !recursing);
-
-	/* Add each constraint to Phase 3's queue */
-	foreach(lcon, newcons)
-	{
-		CookedConstraint *ccon = (CookedConstraint *) lfirst(lcon);
-		NewConstraint *newcon;
-
-		newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
-		newcon->name = ccon->name;
-		newcon->contype = ccon->contype;
-		/* ExecQual wants implicit-AND format */
-		newcon->qual = (Node *) make_ands_implicit((Expr *) ccon->expr);
-
-		tab->constraints = lappend(tab->constraints, newcon);
-
-		/* Save the actually assigned name if it was defaulted */
-		if (constr->conname == NULL)
-			constr->conname = ccon->name;
-	}
-
-	/* At this point we must have a locked-down name to use */
-	Assert(constr->conname != NULL);
-
-	/* Advance command counter in case same table is visited multiple times */
-	CommandCounterIncrement();
-
-	/*
-	 * If the constraint got merged with an existing constraint, we're done.
-	 * We mustn't recurse to child tables in this case, because they've
-	 * already got the constraint, and visiting them again would lead to an
-	 * incorrect value for coninhcount.
-	 */
-	if (newcons == NIL)
-		return;
-
-	/*
-	 * Propagate to children as appropriate.  Unlike most other ALTER
-	 * routines, we have to do this one level of recursion at a time; we can't
-	 * use find_all_inheritors to do it in one pass.
-	 */
-	children = find_inheritance_children(RelationGetRelid(rel), lockmode);
-
-	/*
-	 * If we are told not to recurse, there had better not be any child
-	 * tables; else the addition would put them out of step.
-	 */
-	if (children && !recurse)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("constraint must be added to child tables too")));
-
-	foreach(child, children)
-	{
-		Oid			childrelid = lfirst_oid(child);
-		Relation	childrel;
-		AlteredTableInfo *childtab;
-
-		/* find_inheritance_children already got lock */
-		childrel = heap_open(childrelid, NoLock);
-		CheckTableNotInUse(childrel, "ALTER TABLE");
-
-		/* Find or create work queue entry for this table */
-		childtab = ATGetQueueEntry(wqueue, childrel);
-
-		/* Recurse to child */
-		ATAddCheckConstraint(wqueue, childtab, childrel,
-							 constr, recurse, true, lockmode);
-
-		heap_close(childrel, NoLock);
-	}
+  List	   *newcons;
+  ListCell   *lcon;
+  List	   *children;
+  ListCell   *child;
+
+  /* At top level, permission check was done in ATPrepCmd, else do it */
+  if (recursing)
+    ATSimplePermissions(rel, ATT_TABLE);
+
+  /*
+   * Call AddRelationNewConstraints to do the work, making sure it works on
+   * a copy of the Constraint so transformExpr can't modify the original. It
+   * returns a list of cooked constraints.
+   *
+   * If the constraint ends up getting merged with a pre-existing one, it's
+   * omitted from the returned list, which is what we want: we do not need
+   * to do any validation work.  That can only happen at child tables,
+   * though, since we disallow merging at the top level.
+   */
+  newcons = AddRelationNewConstraints(rel, NIL,
+				      list_make1(copyObject(constr)),
+				      recursing, !recursing);
+
+  /* Add each constraint to Phase 3's queue */
+  foreach(lcon, newcons)
+    {
+      CookedConstraint *ccon = (CookedConstraint *) lfirst(lcon);
+      NewConstraint *newcon;
+
+      newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
+      newcon->name = ccon->name;
+      newcon->contype = ccon->contype;
+      /* ExecQual wants implicit-AND format */
+      newcon->qual = (Node *) make_ands_implicit((Expr *) ccon->expr);
+
+      tab->constraints = lappend(tab->constraints, newcon);
+
+      /* Save the actually assigned name if it was defaulted */
+      if (constr->conname == NULL)
+	constr->conname = ccon->name;
+    }
+
+  /* At this point we must have a locked-down name to use */
+  Assert(constr->conname != NULL);
+
+  /* Advance command counter in case same table is visited multiple times */
+  CommandCounterIncrement();
+
+  /*
+   * If the constraint got merged with an existing constraint, we're done.
+   * We mustn't recurse to child tables in this case, because they've
+   * already got the constraint, and visiting them again would lead to an
+   * incorrect value for coninhcount.
+   */
+  if (newcons == NIL)
+    return;
+
+  /*
+   * Propagate to children as appropriate.  Unlike most other ALTER
+   * routines, we have to do this one level of recursion at a time; we can't
+   * use find_all_inheritors to do it in one pass.
+   */
+  children = find_inheritance_children(RelationGetRelid(rel), lockmode);
+
+  /*
+   * If we are told not to recurse, there had better not be any child
+   * tables; else the addition would put them out of step.
+   */
+  if (children && !recurse)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("constraint must be added to child tables too")));
+
+  foreach(child, children)
+    {
+      Oid			childrelid = lfirst_oid(child);
+      Relation	childrel;
+      AlteredTableInfo *childtab;
+
+      /* find_inheritance_children already got lock */
+      childrel = heap_open(childrelid, NoLock);
+      CheckTableNotInUse(childrel, "ALTER TABLE");
+
+      /* Find or create work queue entry for this table */
+      childtab = ATGetQueueEntry(wqueue, childrel);
+
+      /* Recurse to child */
+      ATAddCheckConstraint(wqueue, childtab, childrel,
+			   constr, recurse, true, lockmode);
+
+      heap_close(childrel, NoLock);
+    }
 }
 
 /*
@@ -5462,374 +5490,382 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
  */
 static void
 ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
-						  Constraint *fkconstraint, LOCKMODE lockmode)
+			  Constraint *fkconstraint, LOCKMODE lockmode)
 {
-	Relation	pkrel;
-	int16		pkattnum[INDEX_MAX_KEYS];
-	int16		fkattnum[INDEX_MAX_KEYS];
-	Oid			pktypoid[INDEX_MAX_KEYS];
-	Oid			fktypoid[INDEX_MAX_KEYS];
-	Oid			opclasses[INDEX_MAX_KEYS];
-	Oid			pfeqoperators[INDEX_MAX_KEYS];
-	Oid			ppeqoperators[INDEX_MAX_KEYS];
-	Oid			ffeqoperators[INDEX_MAX_KEYS];
-	int			i;
-	int			numfks,
-				numpks;
-	Oid			indexOid;
-	Oid			constrOid;
-
-	pkrel = heap_openrv(fkconstraint->pktable, lockmode);
-
-	/*
-	 * Validity checks (permission checks wait till we have the column
-	 * numbers)
-	 */
-	if (pkrel->rd_rel->relkind != RELKIND_RELATION)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("referenced relation \"%s\" is not a table",
-						RelationGetRelationName(pkrel))));
-
-	if (!allowSystemTableMods && IsSystemRelation(pkrel))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("permission denied: \"%s\" is a system catalog",
-						RelationGetRelationName(pkrel))));
-
-	/*
-	 * References from permanent or unlogged tables to temp tables, and from
-	 * permanent tables to unlogged tables, are disallowed because the
-	 * referenced data can vanish out from under us.  References from temp
-	 * tables to any other table type are also disallowed, because other
-	 * backends might need to run the RI triggers on the perm table, but they
-	 * can't reliably see tuples in the local buffers of other backends.
-	 */
-	switch (rel->rd_rel->relpersistence)
-	{
-		case RELPERSISTENCE_PERMANENT:
-			if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-						 errmsg("constraints on permanent tables may reference only permanent tables")));
-			break;
-		case RELPERSISTENCE_UNLOGGED:
-			if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT
-				&& pkrel->rd_rel->relpersistence != RELPERSISTENCE_UNLOGGED)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-						 errmsg("constraints on unlogged tables may reference only permanent or unlogged tables")));
-			break;
-		case RELPERSISTENCE_TEMP:
-			if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_TEMP)
-				ereport(ERROR,
-						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-						 errmsg("constraints on temporary tables may reference only temporary tables")));
-			break;
-	}
-
-	/*
-	 * Look up the referencing attributes to make sure they exist, and record
-	 * their attnums and type OIDs.
-	 */
-	MemSet(pkattnum, 0, sizeof(pkattnum));
-	MemSet(fkattnum, 0, sizeof(fkattnum));
-	MemSet(pktypoid, 0, sizeof(pktypoid));
-	MemSet(fktypoid, 0, sizeof(fktypoid));
-	MemSet(opclasses, 0, sizeof(opclasses));
-	MemSet(pfeqoperators, 0, sizeof(pfeqoperators));
-	MemSet(ppeqoperators, 0, sizeof(ppeqoperators));
-	MemSet(ffeqoperators, 0, sizeof(ffeqoperators));
-
-	numfks = transformColumnNameList(RelationGetRelid(rel),
-									 fkconstraint->fk_attrs,
-									 fkattnum, fktypoid);
-
-	/*
-	 * If the attribute list for the referenced table was omitted, lookup the
-	 * definition of the primary key and use it.  Otherwise, validate the
-	 * supplied attribute list.  In either case, discover the index OID and
-	 * index opclasses, and the attnums and type OIDs of the attributes.
-	 */
-	if (fkconstraint->pk_attrs == NIL)
-	{
-		numpks = transformFkeyGetPrimaryKey(pkrel, &indexOid,
-											&fkconstraint->pk_attrs,
-											pkattnum, pktypoid,
-											opclasses);
-	}
-	else
-	{
-		numpks = transformColumnNameList(RelationGetRelid(pkrel),
-										 fkconstraint->pk_attrs,
-										 pkattnum, pktypoid);
-		/* Look for an index matching the column list */
-		indexOid = transformFkeyCheckAttrs(pkrel, numpks, pkattnum,
-										   opclasses);
-	}
-
-	/*
-	 * Now we can check permissions.
-	 */
-	checkFkeyPermissions(pkrel, pkattnum, numpks);
-	checkFkeyPermissions(rel, fkattnum, numfks);
-
-	/*
-	 * Look up the equality operators to use in the constraint.
-	 *
-	 * Note that we have to be careful about the difference between the actual
-	 * PK column type and the opclass' declared input type, which might be
-	 * only binary-compatible with it.	The declared opcintype is the right
-	 * thing to probe pg_amop with.
-	 */
-	if (numfks != numpks)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_FOREIGN_KEY),
-				 errmsg("number of referencing and referenced columns for foreign key disagree")));
-
-	for (i = 0; i < numpks; i++)
-	{
-		Oid			pktype = pktypoid[i];
-		Oid			fktype = fktypoid[i];
-		Oid			fktyped;
-		HeapTuple	cla_ht;
-		Form_pg_opclass cla_tup;
-		Oid			amid;
-		Oid			opfamily;
-		Oid			opcintype;
-		Oid			pfeqop;
-		Oid			ppeqop;
-		Oid			ffeqop;
-		int16		eqstrategy;
-
-		/* We need several fields out of the pg_opclass entry */
-		cla_ht = SearchSysCache1(CLAOID, ObjectIdGetDatum(opclasses[i]));
-		if (!HeapTupleIsValid(cla_ht))
-			elog(ERROR, "cache lookup failed for opclass %u", opclasses[i]);
-		cla_tup = (Form_pg_opclass) GETSTRUCT(cla_ht);
-		amid = cla_tup->opcmethod;
-		opfamily = cla_tup->opcfamily;
-		opcintype = cla_tup->opcintype;
-		ReleaseSysCache(cla_ht);
-
-		/*
-		 * Check it's a btree; currently this can never fail since no other
-		 * index AMs support unique indexes.  If we ever did have other types
-		 * of unique indexes, we'd need a way to determine which operator
-		 * strategy number is equality.  (Is it reasonable to insist that
-		 * every such index AM use btree's number for equality?)
-		 */
-		if (amid != BTREE_AM_OID)
-			elog(ERROR, "only b-tree indexes are supported for foreign keys");
-		eqstrategy = BTEqualStrategyNumber;
-
-		/*
-		 * There had better be a primary equality operator for the index.
-		 * We'll use it for PK = PK comparisons.
-		 */
-		ppeqop = get_opfamily_member(opfamily, opcintype, opcintype,
-									 eqstrategy);
-
-		if (!OidIsValid(ppeqop))
-			elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",
-				 eqstrategy, opcintype, opcintype, opfamily);
-
-		/*
-		 * Are there equality operators that take exactly the FK type? Assume
-		 * we should look through any domain here.
-		 */
-		fktyped = getBaseType(fktype);
-
-		pfeqop = get_opfamily_member(opfamily, opcintype, fktyped,
-									 eqstrategy);
-		if (OidIsValid(pfeqop))
-			ffeqop = get_opfamily_member(opfamily, fktyped, fktyped,
-										 eqstrategy);
-		else
-			ffeqop = InvalidOid;	/* keep compiler quiet */
-
-		if (!(OidIsValid(pfeqop) && OidIsValid(ffeqop)))
-		{
-			/*
-			 * Otherwise, look for an implicit cast from the FK type to the
-			 * opcintype, and if found, use the primary equality operator.
-			 * This is a bit tricky because opcintype might be a polymorphic
-			 * type such as ANYARRAY or ANYENUM; so what we have to test is
-			 * whether the two actual column types can be concurrently cast to
-			 * that type.  (Otherwise, we'd fail to reject combinations such
-			 * as int[] and point[].)
-			 */
-			Oid			input_typeids[2];
-			Oid			target_typeids[2];
-
-			input_typeids[0] = pktype;
-			input_typeids[1] = fktype;
-			target_typeids[0] = opcintype;
-			target_typeids[1] = opcintype;
-			if (can_coerce_type(2, input_typeids, target_typeids,
-								COERCION_IMPLICIT))
-				pfeqop = ffeqop = ppeqop;
-		}
-
-		if (!(OidIsValid(pfeqop) && OidIsValid(ffeqop)))
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("foreign key constraint \"%s\" "
-							"cannot be implemented",
-							fkconstraint->conname),
-					 errdetail("Key columns \"%s\" and \"%s\" "
-							   "are of incompatible types: %s and %s.",
-							   strVal(list_nth(fkconstraint->fk_attrs, i)),
-							   strVal(list_nth(fkconstraint->pk_attrs, i)),
-							   format_type_be(fktype),
-							   format_type_be(pktype))));
-
-		pfeqoperators[i] = pfeqop;
-		ppeqoperators[i] = ppeqop;
-		ffeqoperators[i] = ffeqop;
-	}
-
-	/*
-	 * Record the FK constraint in pg_constraint.
-	 */
-	constrOid = CreateConstraintEntry(fkconstraint->conname,
-									  RelationGetNamespace(rel),
-									  CONSTRAINT_FOREIGN,
-									  fkconstraint->deferrable,
-									  fkconstraint->initdeferred,
-									  fkconstraint->initially_valid,
-									  RelationGetRelid(rel),
-									  fkattnum,
-									  numfks,
-									  InvalidOid,		/* not a domain
-														 * constraint */
-									  indexOid,
-									  RelationGetRelid(pkrel),
-									  pkattnum,
-									  pfeqoperators,
-									  ppeqoperators,
-									  ffeqoperators,
-									  numpks,
-									  fkconstraint->fk_upd_action,
-									  fkconstraint->fk_del_action,
-									  fkconstraint->fk_matchtype,
-									  NULL,		/* no exclusion constraint */
-									  NULL,		/* no check constraint */
-									  NULL,
-									  NULL,
-									  true,		/* islocal */
-									  0);		/* inhcount */
-
-	/*
-	 * Create the triggers that will enforce the constraint.
-	 */
-	createForeignKeyTriggers(rel, fkconstraint, constrOid, indexOid);
-
-	/*
-	 * Tell Phase 3 to check that the constraint is satisfied by existing rows
-	 * We can skip this during table creation or if requested explicitly by
-	 * specifying NOT VALID on an alter table statement.
-	 */
-	if (!fkconstraint->skip_validation)
-	{
-		NewConstraint *newcon;
-
-		newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
-		newcon->name = fkconstraint->conname;
-		newcon->contype = CONSTR_FOREIGN;
-		newcon->refrelid = RelationGetRelid(pkrel);
-		newcon->refindid = indexOid;
-		newcon->conid = constrOid;
-		newcon->qual = (Node *) fkconstraint;
-
-		tab->constraints = lappend(tab->constraints, newcon);
-	}
-
-	/*
-	 * Close pk table, but keep lock until we've committed.
-	 */
-	heap_close(pkrel, NoLock);
+  Relation	pkrel;
+  int16		pkattnum[INDEX_MAX_KEYS];
+  int16		fkattnum[INDEX_MAX_KEYS];
+  Oid			pktypoid[INDEX_MAX_KEYS];
+  Oid			fktypoid[INDEX_MAX_KEYS];
+  Oid			opclasses[INDEX_MAX_KEYS];
+  Oid			pfeqoperators[INDEX_MAX_KEYS];
+  Oid			ppeqoperators[INDEX_MAX_KEYS];
+  Oid			ffeqoperators[INDEX_MAX_KEYS];
+  int			i;
+  int			numfks,
+    numpks;
+  Oid			indexOid;
+  Oid			constrOid;
+
+  /*
+   * Grab an exclusive lock on the pk table, so that someone doesn't delete
+   * rows out from under us. (Although a lesser lock would do for that
+   * purpose, we'll need exclusive lock anyway to add triggers to the pk
+   * table; trying to start with a lesser lock will just create a risk of
+   * deadlock.)
+   */
+  pkrel = heap_openrv(fkconstraint->pktable, AccessExclusiveLock);
+
+  /*
+   * Validity checks (permission checks wait till we have the column
+   * numbers)
+   */
+  if (pkrel->rd_rel->relkind != RELKIND_RELATION)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("referenced relation \"%s\" is not a table",
+		    RelationGetRelationName(pkrel))));
+
+  if (!allowSystemTableMods && IsSystemRelation(pkrel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+	     errmsg("permission denied: \"%s\" is a system catalog",
+		    RelationGetRelationName(pkrel))));
+
+  /*
+   * References from permanent or unlogged tables to temp tables, and from
+   * permanent tables to unlogged tables, are disallowed because the
+   * referenced data can vanish out from under us.  References from temp
+   * tables to any other table type are also disallowed, because other
+   * backends might need to run the RI triggers on the perm table, but they
+   * can't reliably see tuples in the local buffers of other backends.
+   */
+  switch (rel->rd_rel->relpersistence)
+    {
+    case RELPERSISTENCE_PERMANENT:
+      if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT)
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("constraints on permanent tables may reference only permanent tables")));
+      break;
+    case RELPERSISTENCE_UNLOGGED:
+      if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT
+	  && pkrel->rd_rel->relpersistence != RELPERSISTENCE_UNLOGGED)
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("constraints on unlogged tables may reference only permanent or unlogged tables")));
+      break;
+    case RELPERSISTENCE_TEMP:
+      if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_TEMP)
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("constraints on temporary tables may reference only temporary tables")));
+      break;
+    }
+
+  /*
+   * Look up the referencing attributes to make sure they exist, and record
+   * their attnums and type OIDs.
+   */
+  MemSet(pkattnum, 0, sizeof(pkattnum));
+  MemSet(fkattnum, 0, sizeof(fkattnum));
+  MemSet(pktypoid, 0, sizeof(pktypoid));
+  MemSet(fktypoid, 0, sizeof(fktypoid));
+  MemSet(opclasses, 0, sizeof(opclasses));
+  MemSet(pfeqoperators, 0, sizeof(pfeqoperators));
+  MemSet(ppeqoperators, 0, sizeof(ppeqoperators));
+  MemSet(ffeqoperators, 0, sizeof(ffeqoperators));
+
+  numfks = transformColumnNameList(RelationGetRelid(rel),
+				   fkconstraint->fk_attrs,
+				   fkattnum, fktypoid);
+
+  /*
+   * If the attribute list for the referenced table was omitted, lookup the
+   * definition of the primary key and use it.  Otherwise, validate the
+   * supplied attribute list.  In either case, discover the index OID and
+   * index opclasses, and the attnums and type OIDs of the attributes.
+   */
+  if (fkconstraint->pk_attrs == NIL)
+    {
+      numpks = transformFkeyGetPrimaryKey(pkrel, &indexOid,
+					  &fkconstraint->pk_attrs,
+					  pkattnum, pktypoid,
+					  opclasses);
+    }
+  else
+    {
+      numpks = transformColumnNameList(RelationGetRelid(pkrel),
+				       fkconstraint->pk_attrs,
+				       pkattnum, pktypoid);
+      /* Look for an index matching the column list */
+      indexOid = transformFkeyCheckAttrs(pkrel, numpks, pkattnum,
+					 opclasses);
+    }
+
+  /*
+   * Now we can check permissions.
+   */
+  checkFkeyPermissions(pkrel, pkattnum, numpks);
+  checkFkeyPermissions(rel, fkattnum, numfks);
+
+  /*
+   * Look up the equality operators to use in the constraint.
+   *
+   * Note that we have to be careful about the difference between the actual
+   * PK column type and the opclass' declared input type, which might be
+   * only binary-compatible with it.	The declared opcintype is the right
+   * thing to probe pg_amop with.
+   */
+  if (numfks != numpks)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_FOREIGN_KEY),
+	     errmsg("number of referencing and referenced columns for foreign key disagree")));
+
+  for (i = 0; i < numpks; i++)
+    {
+      Oid			pktype = pktypoid[i];
+      Oid			fktype = fktypoid[i];
+      Oid			fktyped;
+      HeapTuple	cla_ht;
+      Form_pg_opclass cla_tup;
+      Oid			amid;
+      Oid			opfamily;
+      Oid			opcintype;
+      Oid			pfeqop;
+      Oid			ppeqop;
+      Oid			ffeqop;
+      int16		eqstrategy;
+
+      /* We need several fields out of the pg_opclass entry */
+      cla_ht = SearchSysCache1(CLAOID, ObjectIdGetDatum(opclasses[i]));
+      if (!HeapTupleIsValid(cla_ht))
+	elog(ERROR, "cache lookup failed for opclass %u", opclasses[i]);
+      cla_tup = (Form_pg_opclass) GETSTRUCT(cla_ht);
+      amid = cla_tup->opcmethod;
+      opfamily = cla_tup->opcfamily;
+      opcintype = cla_tup->opcintype;
+      ReleaseSysCache(cla_ht);
+
+      /*
+       * Check it's a btree; currently this can never fail since no other
+       * index AMs support unique indexes.  If we ever did have other types
+       * of unique indexes, we'd need a way to determine which operator
+       * strategy number is equality.  (Is it reasonable to insist that
+       * every such index AM use btree's number for equality?)
+       */
+      if (amid != BTREE_AM_OID)
+	elog(ERROR, "only b-tree indexes are supported for foreign keys");
+      eqstrategy = BTEqualStrategyNumber;
+
+      /*
+       * There had better be a primary equality operator for the index.
+       * We'll use it for PK = PK comparisons.
+       */
+      ppeqop = get_opfamily_member(opfamily, opcintype, opcintype,
+				   eqstrategy);
+
+      if (!OidIsValid(ppeqop))
+	elog(ERROR, "missing operator %d(%u,%u) in opfamily %u",
+	     eqstrategy, opcintype, opcintype, opfamily);
+
+      /*
+       * Are there equality operators that take exactly the FK type? Assume
+       * we should look through any domain here.
+       */
+      fktyped = getBaseType(fktype);
+
+      pfeqop = get_opfamily_member(opfamily, opcintype, fktyped,
+				   eqstrategy);
+      if (OidIsValid(pfeqop))
+	ffeqop = get_opfamily_member(opfamily, fktyped, fktyped,
+				     eqstrategy);
+      else
+	ffeqop = InvalidOid;	/* keep compiler quiet */
+
+      if (!(OidIsValid(pfeqop) && OidIsValid(ffeqop)))
+	{
+	  /*
+	   * Otherwise, look for an implicit cast from the FK type to the
+	   * opcintype, and if found, use the primary equality operator.
+	   * This is a bit tricky because opcintype might be a polymorphic
+	   * type such as ANYARRAY or ANYENUM; so what we have to test is
+	   * whether the two actual column types can be concurrently cast to
+	   * that type.  (Otherwise, we'd fail to reject combinations such
+	   * as int[] and point[].)
+	   */
+	  Oid			input_typeids[2];
+	  Oid			target_typeids[2];
+
+	  input_typeids[0] = pktype;
+	  input_typeids[1] = fktype;
+	  target_typeids[0] = opcintype;
+	  target_typeids[1] = opcintype;
+	  if (can_coerce_type(2, input_typeids, target_typeids,
+			      COERCION_IMPLICIT))
+	    pfeqop = ffeqop = ppeqop;
+	}
+
+      if (!(OidIsValid(pfeqop) && OidIsValid(ffeqop)))
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("foreign key constraint \"%s\" "
+			"cannot be implemented",
+			fkconstraint->conname),
+		 errdetail("Key columns \"%s\" and \"%s\" "
+			   "are of incompatible types: %s and %s.",
+			   strVal(list_nth(fkconstraint->fk_attrs, i)),
+			   strVal(list_nth(fkconstraint->pk_attrs, i)),
+			   format_type_be(fktype),
+			   format_type_be(pktype))));
+
+      pfeqoperators[i] = pfeqop;
+      ppeqoperators[i] = ppeqop;
+      ffeqoperators[i] = ffeqop;
+    }
+
+  /*
+   * Record the FK constraint in pg_constraint.
+   */
+  constrOid = CreateConstraintEntry(fkconstraint->conname,
+				    RelationGetNamespace(rel),
+				    CONSTRAINT_FOREIGN,
+				    fkconstraint->deferrable,
+				    fkconstraint->initdeferred,
+				    fkconstraint->initially_valid,
+				    RelationGetRelid(rel),
+				    fkattnum,
+				    numfks,
+				    InvalidOid,		/* not a domain
+							 * constraint */
+				    indexOid,
+				    RelationGetRelid(pkrel),
+				    pkattnum,
+				    pfeqoperators,
+				    ppeqoperators,
+				    ffeqoperators,
+				    numpks,
+				    fkconstraint->fk_upd_action,
+				    fkconstraint->fk_del_action,
+				    fkconstraint->fk_matchtype,
+				    NULL,		/* no exclusion constraint */
+				    NULL,		/* no check constraint */
+				    NULL,
+				    NULL,
+				    true,		/* islocal */
+				    0);		/* inhcount */
+
+  /*
+   * Create the triggers that will enforce the constraint.
+   */
+  createForeignKeyTriggers(rel, fkconstraint, constrOid, indexOid);
+
+  /*
+   * Tell Phase 3 to check that the constraint is satisfied by existing rows.
+   * We can skip this during table creation, or if requested explicitly by
+   * specifying NOT VALID in an ADD FOREIGN KEY command.
+   */
+  if (!fkconstraint->skip_validation)
+    {
+      NewConstraint *newcon;
+
+      newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
+      newcon->name = fkconstraint->conname;
+      newcon->contype = CONSTR_FOREIGN;
+      newcon->refrelid = RelationGetRelid(pkrel);
+      newcon->refindid = indexOid;
+      newcon->conid = constrOid;
+      newcon->qual = (Node *) fkconstraint;
+
+      tab->constraints = lappend(tab->constraints, newcon);
+    }
+
+  /*
+   * Close pk table, but keep lock until we've committed.
+   */
+  heap_close(pkrel, NoLock);
 }
 
 /*
  * ALTER TABLE VALIDATE CONSTRAINT
  */
 static void
-ATExecValidateConstraint(Relation rel, const char *constrName)
+ATExecValidateConstraint(Relation rel, char *constrName)
 {
-	Relation	conrel;
-	SysScanDesc scan;
-	ScanKeyData key;
-	HeapTuple	tuple;
-	Form_pg_constraint con = NULL;
-	bool		found = false;
-
-	conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
-
-	/*
-	 * Find and check the target constraint
-	 */
-	ScanKeyInit(&key,
-				Anum_pg_constraint_conrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	scan = systable_beginscan(conrel, ConstraintRelidIndexId,
-							  true, SnapshotNow, 1, &key);
-
-	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
-	{
-		con = (Form_pg_constraint) GETSTRUCT(tuple);
-		if (con->contype == CONSTRAINT_FOREIGN &&
-			strcmp(NameStr(con->conname), constrName) == 0)
-		{
-			found = true;
-			break;
-		}
-	}
-
-	if (!found)
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("foreign key constraint \"%s\" of relation \"%s\" does not exist",
-						constrName, RelationGetRelationName(rel))));
-
-	if (!con->convalidated)
-	{
-		Oid			conid = HeapTupleGetOid(tuple);
-		HeapTuple	copyTuple = heap_copytuple(tuple);
-		Form_pg_constraint copy_con = (Form_pg_constraint) GETSTRUCT(copyTuple);
-		Relation	refrel;
-
-		/*
-		 * Triggers are already in place on both tables, so a concurrent write
-		 * that alters the result here is not possible. Normally we can run a
-		 * query here to do the validation, which would only require
-		 * AccessShareLock. In some cases, it is possible that we might need
-		 * to fire triggers to perform the check, so we take a lock at
-		 * RowShareLock level just in case.
-		 */
-		refrel = heap_open(con->confrelid, RowShareLock);
-
-		validateForeignKeyConstraint((char *) constrName, rel, refrel,
-									 con->conindid,
-									 conid);
-
-		/*
-		 * Now update the catalog, while we have the door open.
-		 */
-		copy_con->convalidated = true;
-		simple_heap_update(conrel, &copyTuple->t_self, copyTuple);
-		CatalogUpdateIndexes(conrel, copyTuple);
-		heap_freetuple(copyTuple);
-
-		heap_close(refrel, NoLock);
-	}
-
-	systable_endscan(scan);
-
-	heap_close(conrel, RowExclusiveLock);
+  Relation	conrel;
+  SysScanDesc scan;
+  ScanKeyData key;
+  HeapTuple	tuple;
+  Form_pg_constraint con = NULL;
+  bool		found = false;
+
+  conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
+
+  /*
+   * Find and check the target constraint
+   */
+  ScanKeyInit(&key,
+	      Anum_pg_constraint_conrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  scan = systable_beginscan(conrel, ConstraintRelidIndexId,
+			    true, SnapshotNow, 1, &key);
+
+  while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+    {
+      con = (Form_pg_constraint) GETSTRUCT(tuple);
+      if (con->contype == CONSTRAINT_FOREIGN &&
+	  strcmp(NameStr(con->conname), constrName) == 0)
+	{
+	  found = true;
+	  break;
+	}
+    }
+
+  if (!found)
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_OBJECT),
+	     errmsg("foreign key constraint \"%s\" of relation \"%s\" does not exist",
+		    constrName, RelationGetRelationName(rel))));
+
+  if (!con->convalidated)
+    {
+      Oid			conid = HeapTupleGetOid(tuple);
+      HeapTuple	copyTuple = heap_copytuple(tuple);
+      Form_pg_constraint copy_con = (Form_pg_constraint) GETSTRUCT(copyTuple);
+      Relation	refrel;
+
+      /*
+       * Triggers are already in place on both tables, so a concurrent write
+       * that alters the result here is not possible. Normally we can run a
+       * query here to do the validation, which would only require
+       * AccessShareLock. In some cases, it is possible that we might need
+       * to fire triggers to perform the check, so we take a lock at
+       * RowShareLock level just in case.
+       */
+      refrel = heap_open(con->confrelid, RowShareLock);
+
+      validateForeignKeyConstraint(constrName, rel, refrel,
+				   con->conindid,
+				   conid);
+
+      /*
+       * Now update the catalog, while we have the door open.
+       */
+      copy_con->convalidated = true;
+      simple_heap_update(conrel, &copyTuple->t_self, copyTuple);
+      CatalogUpdateIndexes(conrel, copyTuple);
+      heap_freetuple(copyTuple);
+
+      heap_close(refrel, NoLock);
+    }
+
+  systable_endscan(scan);
+
+  heap_close(conrel, RowExclusiveLock);
 }
 
+
 /*
  * transformColumnNameList - transform list of column names
  *
@@ -5837,35 +5873,35 @@ ATExecValidateConstraint(Relation rel, const char *constrName)
  */
 static int
 transformColumnNameList(Oid relId, List *colList,
-						int16 *attnums, Oid *atttypids)
+			int16 *attnums, Oid *atttypids)
 {
-	ListCell   *l;
-	int			attnum;
+  ListCell   *l;
+  int			attnum;
 
-	attnum = 0;
-	foreach(l, colList)
-	{
-		char	   *attname = strVal(lfirst(l));
-		HeapTuple	atttuple;
-
-		atttuple = SearchSysCacheAttName(relId, attname);
-		if (!HeapTupleIsValid(atttuple))
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("column \"%s\" referenced in foreign key constraint does not exist",
-							attname)));
-		if (attnum >= INDEX_MAX_KEYS)
-			ereport(ERROR,
-					(errcode(ERRCODE_TOO_MANY_COLUMNS),
-					 errmsg("cannot have more than %d keys in a foreign key",
-							INDEX_MAX_KEYS)));
-		attnums[attnum] = ((Form_pg_attribute) GETSTRUCT(atttuple))->attnum;
-		atttypids[attnum] = ((Form_pg_attribute) GETSTRUCT(atttuple))->atttypid;
-		ReleaseSysCache(atttuple);
-		attnum++;
-	}
+  attnum = 0;
+  foreach(l, colList)
+    {
+      char	   *attname = strVal(lfirst(l));
+      HeapTuple	atttuple;
 
-	return attnum;
+      atttuple = SearchSysCacheAttName(relId, attname);
+      if (!HeapTupleIsValid(atttuple))
+	ereport(ERROR,
+		(errcode(ERRCODE_UNDEFINED_COLUMN),
+		 errmsg("column \"%s\" referenced in foreign key constraint does not exist",
+			attname)));
+      if (attnum >= INDEX_MAX_KEYS)
+	ereport(ERROR,
+		(errcode(ERRCODE_TOO_MANY_COLUMNS),
+		 errmsg("cannot have more than %d keys in a foreign key",
+			INDEX_MAX_KEYS)));
+      attnums[attnum] = ((Form_pg_attribute) GETSTRUCT(atttuple))->attnum;
+      atttypids[attnum] = ((Form_pg_attribute) GETSTRUCT(atttuple))->atttypid;
+      ReleaseSysCache(atttuple);
+      attnum++;
+    }
+
+  return attnum;
 }
 
 /*
@@ -5882,91 +5918,91 @@ transformColumnNameList(Oid relId, List *colList,
  */
 static int
 transformFkeyGetPrimaryKey(Relation pkrel, Oid *indexOid,
-						   List **attnamelist,
-						   int16 *attnums, Oid *atttypids,
-						   Oid *opclasses)
+			   List **attnamelist,
+			   int16 *attnums, Oid *atttypids,
+			   Oid *opclasses)
 {
-	List	   *indexoidlist;
-	ListCell   *indexoidscan;
-	HeapTuple	indexTuple = NULL;
-	Form_pg_index indexStruct = NULL;
-	Datum		indclassDatum;
-	bool		isnull;
-	oidvector  *indclass;
-	int			i;
-
-	/*
-	 * Get the list of index OIDs for the table from the relcache, and look up
-	 * each one in the pg_index syscache until we find one marked primary key
-	 * (hopefully there isn't more than one such).
-	 */
-	*indexOid = InvalidOid;
-
-	indexoidlist = RelationGetIndexList(pkrel);
-
-	foreach(indexoidscan, indexoidlist)
-	{
-		Oid			indexoid = lfirst_oid(indexoidscan);
-
-		indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
-		if (!HeapTupleIsValid(indexTuple))
-			elog(ERROR, "cache lookup failed for index %u", indexoid);
-		indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
-		if (indexStruct->indisprimary)
-		{
-			/*
-			 * Refuse to use a deferrable primary key.	This is per SQL spec,
-			 * and there would be a lot of interesting semantic problems if we
-			 * tried to allow it.
-			 */
-			if (!indexStruct->indimmediate)
-				ereport(ERROR,
-						(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-						 errmsg("cannot use a deferrable primary key for referenced table \"%s\"",
-								RelationGetRelationName(pkrel))));
-
-			*indexOid = indexoid;
-			break;
-		}
-		ReleaseSysCache(indexTuple);
-	}
-
-	list_free(indexoidlist);
-
-	/*
-	 * Check that we found it
-	 */
-	if (!OidIsValid(*indexOid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("there is no primary key for referenced table \"%s\"",
-						RelationGetRelationName(pkrel))));
-
-	/* Must get indclass the hard way */
-	indclassDatum = SysCacheGetAttr(INDEXRELID, indexTuple,
-									Anum_pg_index_indclass, &isnull);
-	Assert(!isnull);
-	indclass = (oidvector *) DatumGetPointer(indclassDatum);
-
-	/*
-	 * Now build the list of PK attributes from the indkey definition (we
-	 * assume a primary key cannot have expressional elements)
-	 */
-	*attnamelist = NIL;
-	for (i = 0; i < indexStruct->indnatts; i++)
-	{
-		int			pkattno = indexStruct->indkey.values[i];
-
-		attnums[i] = pkattno;
-		atttypids[i] = attnumTypeId(pkrel, pkattno);
-		opclasses[i] = indclass->values[i];
-		*attnamelist = lappend(*attnamelist,
-			   makeString(pstrdup(NameStr(*attnumAttName(pkrel, pkattno)))));
-	}
-
-	ReleaseSysCache(indexTuple);
-
-	return i;
+  List	   *indexoidlist;
+  ListCell   *indexoidscan;
+  HeapTuple	indexTuple = NULL;
+  Form_pg_index indexStruct = NULL;
+  Datum		indclassDatum;
+  bool		isnull;
+  oidvector  *indclass;
+  int			i;
+
+  /*
+   * Get the list of index OIDs for the table from the relcache, and look up
+   * each one in the pg_index syscache until we find one marked primary key
+   * (hopefully there isn't more than one such).
+   */
+  *indexOid = InvalidOid;
+
+  indexoidlist = RelationGetIndexList(pkrel);
+
+  foreach(indexoidscan, indexoidlist)
+    {
+      Oid			indexoid = lfirst_oid(indexoidscan);
+
+      indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
+      if (!HeapTupleIsValid(indexTuple))
+	elog(ERROR, "cache lookup failed for index %u", indexoid);
+      indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
+      if (indexStruct->indisprimary)
+	{
+	  /*
+	   * Refuse to use a deferrable primary key.	This is per SQL spec,
+	   * and there would be a lot of interesting semantic problems if we
+	   * tried to allow it.
+	   */
+	  if (!indexStruct->indimmediate)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+		     errmsg("cannot use a deferrable primary key for referenced table \"%s\"",
+			    RelationGetRelationName(pkrel))));
+
+	  *indexOid = indexoid;
+	  break;
+	}
+      ReleaseSysCache(indexTuple);
+    }
+
+  list_free(indexoidlist);
+
+  /*
+   * Check that we found it
+   */
+  if (!OidIsValid(*indexOid))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_OBJECT),
+	     errmsg("there is no primary key for referenced table \"%s\"",
+		    RelationGetRelationName(pkrel))));
+
+  /* Must get indclass the hard way */
+  indclassDatum = SysCacheGetAttr(INDEXRELID, indexTuple,
+				  Anum_pg_index_indclass, &isnull);
+  Assert(!isnull);
+  indclass = (oidvector *) DatumGetPointer(indclassDatum);
+
+  /*
+   * Now build the list of PK attributes from the indkey definition (we
+   * assume a primary key cannot have expressional elements)
+   */
+  *attnamelist = NIL;
+  for (i = 0; i < indexStruct->indnatts; i++)
+    {
+      int			pkattno = indexStruct->indkey.values[i];
+
+      attnums[i] = pkattno;
+      atttypids[i] = attnumTypeId(pkrel, pkattno);
+      opclasses[i] = indclass->values[i];
+      *attnamelist = lappend(*attnamelist,
+			     makeString(pstrdup(NameStr(*attnumAttName(pkrel, pkattno)))));
+    }
+
+  ReleaseSysCache(indexTuple);
+
+  return i;
 }
 
 /*
@@ -5979,152 +6015,152 @@ transformFkeyGetPrimaryKey(Relation pkrel, Oid *indexOid,
  */
 static Oid
 transformFkeyCheckAttrs(Relation pkrel,
-						int numattrs, int16 *attnums,
-						Oid *opclasses) /* output parameter */
+			int numattrs, int16 *attnums,
+			Oid *opclasses) /* output parameter */
 {
-	Oid			indexoid = InvalidOid;
-	bool		found = false;
-	bool		found_deferrable = false;
-	List	   *indexoidlist;
-	ListCell   *indexoidscan;
-
-	/*
-	 * Get the list of index OIDs for the table from the relcache, and look up
-	 * each one in the pg_index syscache, and match unique indexes to the list
-	 * of attnums we are given.
-	 */
-	indexoidlist = RelationGetIndexList(pkrel);
-
-	foreach(indexoidscan, indexoidlist)
-	{
-		HeapTuple	indexTuple;
-		Form_pg_index indexStruct;
-		int			i,
-					j;
-
-		indexoid = lfirst_oid(indexoidscan);
-		indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
-		if (!HeapTupleIsValid(indexTuple))
-			elog(ERROR, "cache lookup failed for index %u", indexoid);
-		indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
-
-		/*
-		 * Must have the right number of columns; must be unique and not a
-		 * partial index; forget it if there are any expressions, too
-		 */
-		if (indexStruct->indnatts == numattrs &&
-			indexStruct->indisunique &&
-			heap_attisnull(indexTuple, Anum_pg_index_indpred) &&
-			heap_attisnull(indexTuple, Anum_pg_index_indexprs))
+  Oid			indexoid = InvalidOid;
+  bool		found = false;
+  bool		found_deferrable = false;
+  List	   *indexoidlist;
+  ListCell   *indexoidscan;
+
+  /*
+   * Get the list of index OIDs for the table from the relcache, and look up
+   * each one in the pg_index syscache, and match unique indexes to the list
+   * of attnums we are given.
+   */
+  indexoidlist = RelationGetIndexList(pkrel);
+
+  foreach(indexoidscan, indexoidlist)
+    {
+      HeapTuple	indexTuple;
+      Form_pg_index indexStruct;
+      int			i,
+	j;
+
+      indexoid = lfirst_oid(indexoidscan);
+      indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
+      if (!HeapTupleIsValid(indexTuple))
+	elog(ERROR, "cache lookup failed for index %u", indexoid);
+      indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
+
+      /*
+       * Must have the right number of columns; must be unique and not a
+       * partial index; forget it if there are any expressions, too
+       */
+      if (indexStruct->indnatts == numattrs &&
+	  indexStruct->indisunique &&
+	  heap_attisnull(indexTuple, Anum_pg_index_indpred) &&
+	  heap_attisnull(indexTuple, Anum_pg_index_indexprs))
+	{
+	  /* Must get indclass the hard way */
+	  Datum		indclassDatum;
+	  bool		isnull;
+	  oidvector  *indclass;
+
+	  indclassDatum = SysCacheGetAttr(INDEXRELID, indexTuple,
+					  Anum_pg_index_indclass, &isnull);
+	  Assert(!isnull);
+	  indclass = (oidvector *) DatumGetPointer(indclassDatum);
+
+	  /*
+	   * The given attnum list may match the index columns in any order.
+	   * Check that each list is a subset of the other.
+	   */
+	  for (i = 0; i < numattrs; i++)
+	    {
+	      found = false;
+	      for (j = 0; j < numattrs; j++)
 		{
-			/* Must get indclass the hard way */
-			Datum		indclassDatum;
-			bool		isnull;
-			oidvector  *indclass;
-
-			indclassDatum = SysCacheGetAttr(INDEXRELID, indexTuple,
-											Anum_pg_index_indclass, &isnull);
-			Assert(!isnull);
-			indclass = (oidvector *) DatumGetPointer(indclassDatum);
-
-			/*
-			 * The given attnum list may match the index columns in any order.
-			 * Check that each list is a subset of the other.
-			 */
-			for (i = 0; i < numattrs; i++)
-			{
-				found = false;
-				for (j = 0; j < numattrs; j++)
-				{
-					if (attnums[i] == indexStruct->indkey.values[j])
-					{
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-					break;
-			}
-			if (found)
-			{
-				for (i = 0; i < numattrs; i++)
-				{
-					found = false;
-					for (j = 0; j < numattrs; j++)
-					{
-						if (attnums[j] == indexStruct->indkey.values[i])
-						{
-							opclasses[j] = indclass->values[i];
-							found = true;
-							break;
-						}
-					}
-					if (!found)
-						break;
-				}
-			}
-
-			/*
-			 * Refuse to use a deferrable unique/primary key.  This is per SQL
-			 * spec, and there would be a lot of interesting semantic problems
-			 * if we tried to allow it.
-			 */
-			if (found && !indexStruct->indimmediate)
+		  if (attnums[i] == indexStruct->indkey.values[j])
+		    {
+		      found = true;
+		      break;
+		    }
+		}
+	      if (!found)
+		break;
+	    }
+	  if (found)
+	    {
+	      for (i = 0; i < numattrs; i++)
+		{
+		  found = false;
+		  for (j = 0; j < numattrs; j++)
+		    {
+		      if (attnums[j] == indexStruct->indkey.values[i])
 			{
-				/*
-				 * Remember that we found an otherwise matching index, so that
-				 * we can generate a more appropriate error message.
-				 */
-				found_deferrable = true;
-				found = false;
+			  opclasses[j] = indclass->values[i];
+			  found = true;
+			  break;
 			}
+		    }
+		  if (!found)
+		    break;
 		}
-		ReleaseSysCache(indexTuple);
-		if (found)
-			break;
-	}
-
-	if (!found)
-	{
-		if (found_deferrable)
-			ereport(ERROR,
-					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-					 errmsg("cannot use a deferrable unique constraint for referenced table \"%s\"",
-							RelationGetRelationName(pkrel))));
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_FOREIGN_KEY),
-					 errmsg("there is no unique constraint matching given keys for referenced table \"%s\"",
-							RelationGetRelationName(pkrel))));
-	}
+	    }
+
+	  /*
+	   * Refuse to use a deferrable unique/primary key.  This is per SQL
+	   * spec, and there would be a lot of interesting semantic problems
+	   * if we tried to allow it.
+	   */
+	  if (found && !indexStruct->indimmediate)
+	    {
+	      /*
+	       * Remember that we found an otherwise matching index, so that
+	       * we can generate a more appropriate error message.
+	       */
+	      found_deferrable = true;
+	      found = false;
+	    }
+	}
+      ReleaseSysCache(indexTuple);
+      if (found)
+	break;
+    }
+
+  if (!found)
+    {
+      if (found_deferrable)
+	ereport(ERROR,
+		(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+		 errmsg("cannot use a deferrable unique constraint for referenced table \"%s\"",
+			RelationGetRelationName(pkrel))));
+      else
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_FOREIGN_KEY),
+		 errmsg("there is no unique constraint matching given keys for referenced table \"%s\"",
+			RelationGetRelationName(pkrel))));
+    }
 
-	list_free(indexoidlist);
+  list_free(indexoidlist);
 
-	return indexoid;
+  return indexoid;
 }
 
 /* Permissions checks for ADD FOREIGN KEY */
 static void
 checkFkeyPermissions(Relation rel, int16 *attnums, int natts)
 {
-	Oid			roleid = GetUserId();
-	AclResult	aclresult;
-	int			i;
-
-	/* Okay if we have relation-level REFERENCES permission */
-	aclresult = pg_class_aclcheck(RelationGetRelid(rel), roleid,
-								  ACL_REFERENCES);
-	if (aclresult == ACLCHECK_OK)
-		return;
-	/* Else we must have REFERENCES on each column */
-	for (i = 0; i < natts; i++)
-	{
-		aclresult = pg_attribute_aclcheck(RelationGetRelid(rel), attnums[i],
-										  roleid, ACL_REFERENCES);
-		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_CLASS,
-						   RelationGetRelationName(rel));
-	}
+  Oid			roleid = GetUserId();
+  AclResult	aclresult;
+  int			i;
+
+  /* Okay if we have relation-level REFERENCES permission */
+  aclresult = pg_class_aclcheck(RelationGetRelid(rel), roleid,
+				ACL_REFERENCES);
+  if (aclresult == ACLCHECK_OK)
+    return;
+  /* Else we must have REFERENCES on each column */
+  for (i = 0; i < natts; i++)
+    {
+      aclresult = pg_attribute_aclcheck(RelationGetRelid(rel), attnums[i],
+					roleid, ACL_REFERENCES);
+      if (aclresult != ACLCHECK_OK)
+	aclcheck_error(aclresult, ACL_KIND_CLASS,
+		       RelationGetRelationName(rel));
+    }
 }
 
 /*
@@ -6135,115 +6171,115 @@ checkFkeyPermissions(Relation rel, int16 *attnums, int natts)
  */
 static void
 validateForeignKeyConstraint(char *conname,
-							 Relation rel,
-							 Relation pkrel,
-							 Oid pkindOid,
-							 Oid constraintOid)
+			     Relation rel,
+			     Relation pkrel,
+			     Oid pkindOid,
+			     Oid constraintOid)
 {
-	HeapScanDesc scan;
-	HeapTuple	tuple;
-	Trigger		trig;
-
-	ereport(DEBUG1,
-			(errmsg("validating foreign key constraint \"%s\"", conname)));
-
-	/*
-	 * Build a trigger call structure; we'll need it either way.
-	 */
-	MemSet(&trig, 0, sizeof(trig));
-	trig.tgoid = InvalidOid;
-	trig.tgname = conname;
-	trig.tgenabled = TRIGGER_FIRES_ON_ORIGIN;
-	trig.tgisinternal = TRUE;
-	trig.tgconstrrelid = RelationGetRelid(pkrel);
-	trig.tgconstrindid = pkindOid;
-	trig.tgconstraint = constraintOid;
-	trig.tgdeferrable = FALSE;
-	trig.tginitdeferred = FALSE;
-	/* we needn't fill in tgargs or tgqual */
-
-	/*
-	 * See if we can do it with a single LEFT JOIN query.  A FALSE result
-	 * indicates we must proceed with the fire-the-trigger method.
-	 */
-	if (RI_Initial_Check(&trig, rel, pkrel))
-		return;
-
-	/*
-	 * Scan through each tuple, calling RI_FKey_check_ins (insert trigger) as
-	 * if that tuple had just been inserted.  If any of those fail, it should
-	 * ereport(ERROR) and that's that.
-	 */
-	scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
-
-	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
-	{
-		FunctionCallInfoData fcinfo;
-		TriggerData trigdata;
-
-		/*
-		 * Make a call to the trigger function
-		 *
-		 * No parameters are passed, but we do set a context
-		 */
-		MemSet(&fcinfo, 0, sizeof(fcinfo));
-
-		/*
-		 * We assume RI_FKey_check_ins won't look at flinfo...
-		 */
-		trigdata.type = T_TriggerData;
-		trigdata.tg_event = TRIGGER_EVENT_INSERT | TRIGGER_EVENT_ROW;
-		trigdata.tg_relation = rel;
-		trigdata.tg_trigtuple = tuple;
-		trigdata.tg_newtuple = NULL;
-		trigdata.tg_trigger = &trig;
-		trigdata.tg_trigtuplebuf = scan->rs_cbuf;
-		trigdata.tg_newtuplebuf = InvalidBuffer;
-
-		fcinfo.context = (Node *) &trigdata;
-
-		RI_FKey_check_ins(&fcinfo);
-	}
-
-	heap_endscan(scan);
+  HeapScanDesc scan;
+  HeapTuple	tuple;
+  Trigger		trig;
+
+  ereport(DEBUG1,
+	  (errmsg("validating foreign key constraint \"%s\"", conname)));
+
+  /*
+   * Build a trigger call structure; we'll need it either way.
+   */
+  MemSet(&trig, 0, sizeof(trig));
+  trig.tgoid = InvalidOid;
+  trig.tgname = conname;
+  trig.tgenabled = TRIGGER_FIRES_ON_ORIGIN;
+  trig.tgisinternal = TRUE;
+  trig.tgconstrrelid = RelationGetRelid(pkrel);
+  trig.tgconstrindid = pkindOid;
+  trig.tgconstraint = constraintOid;
+  trig.tgdeferrable = FALSE;
+  trig.tginitdeferred = FALSE;
+  /* we needn't fill in tgargs or tgqual */
+
+  /*
+   * See if we can do it with a single LEFT JOIN query.  A FALSE result
+   * indicates we must proceed with the fire-the-trigger method.
+   */
+  if (RI_Initial_Check(&trig, rel, pkrel))
+    return;
+
+  /*
+   * Scan through each tuple, calling RI_FKey_check_ins (insert trigger) as
+   * if that tuple had just been inserted.  If any of those fail, it should
+   * ereport(ERROR) and that's that.
+   */
+  scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
+
+  while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+    {
+      FunctionCallInfoData fcinfo;
+      TriggerData trigdata;
+
+      /*
+       * Make a call to the trigger function
+       *
+       * No parameters are passed, but we do set a context
+       */
+      MemSet(&fcinfo, 0, sizeof(fcinfo));
+
+      /*
+       * We assume RI_FKey_check_ins won't look at flinfo...
+       */
+      trigdata.type = T_TriggerData;
+      trigdata.tg_event = TRIGGER_EVENT_INSERT | TRIGGER_EVENT_ROW;
+      trigdata.tg_relation = rel;
+      trigdata.tg_trigtuple = tuple;
+      trigdata.tg_newtuple = NULL;
+      trigdata.tg_trigger = &trig;
+      trigdata.tg_trigtuplebuf = scan->rs_cbuf;
+      trigdata.tg_newtuplebuf = InvalidBuffer;
+
+      fcinfo.context = (Node *) &trigdata;
+
+      RI_FKey_check_ins(&fcinfo);
+    }
+
+  heap_endscan(scan);
 }
 
 static void
 CreateFKCheckTrigger(RangeVar *myRel, Constraint *fkconstraint,
-					 Oid constraintOid, Oid indexOid, bool on_insert)
+		     Oid constraintOid, Oid indexOid, bool on_insert)
 {
-	CreateTrigStmt *fk_trigger;
-
-	fk_trigger = makeNode(CreateTrigStmt);
-	fk_trigger->trigname = "RI_ConstraintTrigger";
-	fk_trigger->relation = myRel;
-	fk_trigger->row = true;
-	fk_trigger->timing = TRIGGER_TYPE_AFTER;
-
-	/* Either ON INSERT or ON UPDATE */
-	if (on_insert)
-	{
-		fk_trigger->funcname = SystemFuncName("RI_FKey_check_ins");
-		fk_trigger->events = TRIGGER_TYPE_INSERT;
-	}
-	else
-	{
-		fk_trigger->funcname = SystemFuncName("RI_FKey_check_upd");
-		fk_trigger->events = TRIGGER_TYPE_UPDATE;
-	}
-
-	fk_trigger->columns = NIL;
-	fk_trigger->whenClause = NULL;
-	fk_trigger->isconstraint = true;
-	fk_trigger->deferrable = fkconstraint->deferrable;
-	fk_trigger->initdeferred = fkconstraint->initdeferred;
-	fk_trigger->constrrel = fkconstraint->pktable;
-	fk_trigger->args = NIL;
-
-	(void) CreateTrigger(fk_trigger, NULL, constraintOid, indexOid, true);
-
-	/* Make changes-so-far visible */
-	CommandCounterIncrement();
+  CreateTrigStmt *fk_trigger;
+
+  fk_trigger = makeNode(CreateTrigStmt);
+  fk_trigger->trigname = "RI_ConstraintTrigger";
+  fk_trigger->relation = myRel;
+  fk_trigger->row = true;
+  fk_trigger->timing = TRIGGER_TYPE_AFTER;
+
+  /* Either ON INSERT or ON UPDATE */
+  if (on_insert)
+    {
+      fk_trigger->funcname = SystemFuncName("RI_FKey_check_ins");
+      fk_trigger->events = TRIGGER_TYPE_INSERT;
+    }
+  else
+    {
+      fk_trigger->funcname = SystemFuncName("RI_FKey_check_upd");
+      fk_trigger->events = TRIGGER_TYPE_UPDATE;
+    }
+
+  fk_trigger->columns = NIL;
+  fk_trigger->whenClause = NULL;
+  fk_trigger->isconstraint = true;
+  fk_trigger->deferrable = fkconstraint->deferrable;
+  fk_trigger->initdeferred = fkconstraint->initdeferred;
+  fk_trigger->constrrel = fkconstraint->pktable;
+  fk_trigger->args = NIL;
+
+  (void) CreateTrigger(fk_trigger, NULL, constraintOid, indexOid, true);
+
+  /* Make changes-so-far visible */
+  CommandCounterIncrement();
 }
 
 /*
@@ -6251,130 +6287,144 @@ CreateFKCheckTrigger(RangeVar *myRel, Constraint *fkconstraint,
  */
 static void
 createForeignKeyTriggers(Relation rel, Constraint *fkconstraint,
-						 Oid constraintOid, Oid indexOid)
+			 Oid constraintOid, Oid indexOid)
 {
-	RangeVar   *myRel;
-	CreateTrigStmt *fk_trigger;
-
-	/*
-	 * Reconstruct a RangeVar for my relation (not passed in, unfortunately).
-	 */
-	myRel = makeRangeVar(get_namespace_name(RelationGetNamespace(rel)),
-						 pstrdup(RelationGetRelationName(rel)),
-						 -1);
-
-	/* Make changes-so-far visible */
-	CommandCounterIncrement();
-
-	/*
-	 * Build and execute a CREATE CONSTRAINT TRIGGER statement for the CHECK
-	 * action for both INSERTs and UPDATEs on the referencing table.
-	 */
-	CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, indexOid, true);
-	CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, indexOid, false);
-
-	/*
-	 * Build and execute a CREATE CONSTRAINT TRIGGER statement for the ON
-	 * DELETE action on the referenced table.
-	 */
-	fk_trigger = makeNode(CreateTrigStmt);
-	fk_trigger->trigname = "RI_ConstraintTrigger";
-	fk_trigger->relation = fkconstraint->pktable;
-	fk_trigger->row = true;
-	fk_trigger->timing = TRIGGER_TYPE_AFTER;
-	fk_trigger->events = TRIGGER_TYPE_DELETE;
-	fk_trigger->columns = NIL;
-	fk_trigger->whenClause = NULL;
-	fk_trigger->isconstraint = true;
-	fk_trigger->constrrel = myRel;
-	switch (fkconstraint->fk_del_action)
-	{
-		case FKCONSTR_ACTION_NOACTION:
-			fk_trigger->deferrable = fkconstraint->deferrable;
-			fk_trigger->initdeferred = fkconstraint->initdeferred;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_noaction_del");
-			break;
-		case FKCONSTR_ACTION_RESTRICT:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_restrict_del");
-			break;
-		case FKCONSTR_ACTION_CASCADE:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_cascade_del");
-			break;
-		case FKCONSTR_ACTION_SETNULL:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_setnull_del");
-			break;
-		case FKCONSTR_ACTION_SETDEFAULT:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_setdefault_del");
-			break;
-		default:
-			elog(ERROR, "unrecognized FK action type: %d",
-				 (int) fkconstraint->fk_del_action);
-			break;
-	}
-	fk_trigger->args = NIL;
-
-	(void) CreateTrigger(fk_trigger, NULL, constraintOid, indexOid, true);
-
-	/* Make changes-so-far visible */
-	CommandCounterIncrement();
-
-	/*
-	 * Build and execute a CREATE CONSTRAINT TRIGGER statement for the ON
-	 * UPDATE action on the referenced table.
-	 */
-	fk_trigger = makeNode(CreateTrigStmt);
-	fk_trigger->trigname = "RI_ConstraintTrigger";
-	fk_trigger->relation = fkconstraint->pktable;
-	fk_trigger->row = true;
-	fk_trigger->timing = TRIGGER_TYPE_AFTER;
-	fk_trigger->events = TRIGGER_TYPE_UPDATE;
-	fk_trigger->columns = NIL;
-	fk_trigger->whenClause = NULL;
-	fk_trigger->isconstraint = true;
-	fk_trigger->constrrel = myRel;
-	switch (fkconstraint->fk_upd_action)
-	{
-		case FKCONSTR_ACTION_NOACTION:
-			fk_trigger->deferrable = fkconstraint->deferrable;
-			fk_trigger->initdeferred = fkconstraint->initdeferred;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_noaction_upd");
-			break;
-		case FKCONSTR_ACTION_RESTRICT:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_restrict_upd");
-			break;
-		case FKCONSTR_ACTION_CASCADE:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_cascade_upd");
-			break;
-		case FKCONSTR_ACTION_SETNULL:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_setnull_upd");
-			break;
-		case FKCONSTR_ACTION_SETDEFAULT:
-			fk_trigger->deferrable = false;
-			fk_trigger->initdeferred = false;
-			fk_trigger->funcname = SystemFuncName("RI_FKey_setdefault_upd");
-			break;
-		default:
-			elog(ERROR, "unrecognized FK action type: %d",
-				 (int) fkconstraint->fk_upd_action);
-			break;
-	}
-	fk_trigger->args = NIL;
-
-	(void) CreateTrigger(fk_trigger, NULL, constraintOid, indexOid, true);
+  RangeVar   *myRel;
+  CreateTrigStmt *fk_trigger;
+
+  /*
+   * Reconstruct a RangeVar for my relation (not passed in, unfortunately).
+   */
+  myRel = makeRangeVar(get_namespace_name(RelationGetNamespace(rel)),
+		       pstrdup(RelationGetRelationName(rel)),
+		       -1);
+
+  /* Make changes-so-far visible */
+  CommandCounterIncrement();
+
+  /*
+   * Build and execute a CREATE CONSTRAINT TRIGGER statement for the ON
+   * DELETE action on the referenced table.
+   */
+  fk_trigger = makeNode(CreateTrigStmt);
+  fk_trigger->trigname = "RI_ConstraintTrigger";
+  fk_trigger->relation = fkconstraint->pktable;
+  fk_trigger->row = true;
+  fk_trigger->timing = TRIGGER_TYPE_AFTER;
+  fk_trigger->events = TRIGGER_TYPE_DELETE;
+  fk_trigger->columns = NIL;
+  fk_trigger->whenClause = NULL;
+  fk_trigger->isconstraint = true;
+  fk_trigger->constrrel = myRel;
+  switch (fkconstraint->fk_del_action)
+    {
+    case FKCONSTR_ACTION_NOACTION:
+      fk_trigger->deferrable = fkconstraint->deferrable;
+      fk_trigger->initdeferred = fkconstraint->initdeferred;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_noaction_del");
+      break;
+    case FKCONSTR_ACTION_RESTRICT:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_restrict_del");
+      break;
+    case FKCONSTR_ACTION_CASCADE:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_cascade_del");
+      break;
+    case FKCONSTR_ACTION_SETNULL:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_setnull_del");
+      break;
+    case FKCONSTR_ACTION_SETDEFAULT:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_setdefault_del");
+      break;
+    default:
+      elog(ERROR, "unrecognized FK action type: %d",
+	   (int) fkconstraint->fk_del_action);
+      break;
+    }
+  fk_trigger->args = NIL;
+
+  (void) CreateTrigger(fk_trigger, NULL, constraintOid, indexOid, true);
+
+  /* Make changes-so-far visible */
+  CommandCounterIncrement();
+
+  /*
+   * Build and execute a CREATE CONSTRAINT TRIGGER statement for the ON
+   * UPDATE action on the referenced table.
+   */
+  fk_trigger = makeNode(CreateTrigStmt);
+  fk_trigger->trigname = "RI_ConstraintTrigger";
+  fk_trigger->relation = fkconstraint->pktable;
+  fk_trigger->row = true;
+  fk_trigger->timing = TRIGGER_TYPE_AFTER;
+  fk_trigger->events = TRIGGER_TYPE_UPDATE;
+  fk_trigger->columns = NIL;
+  fk_trigger->whenClause = NULL;
+  fk_trigger->isconstraint = true;
+  fk_trigger->constrrel = myRel;
+  switch (fkconstraint->fk_upd_action)
+    {
+    case FKCONSTR_ACTION_NOACTION:
+      fk_trigger->deferrable = fkconstraint->deferrable;
+      fk_trigger->initdeferred = fkconstraint->initdeferred;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_noaction_upd");
+      break;
+    case FKCONSTR_ACTION_RESTRICT:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_restrict_upd");
+      break;
+    case FKCONSTR_ACTION_CASCADE:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_cascade_upd");
+      break;
+    case FKCONSTR_ACTION_SETNULL:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_setnull_upd");
+      break;
+    case FKCONSTR_ACTION_SETDEFAULT:
+      fk_trigger->deferrable = false;
+      fk_trigger->initdeferred = false;
+      fk_trigger->funcname = SystemFuncName("RI_FKey_setdefault_upd");
+      break;
+    default:
+      elog(ERROR, "unrecognized FK action type: %d",
+	   (int) fkconstraint->fk_upd_action);
+      break;
+    }
+  fk_trigger->args = NIL;
+
+  (void) CreateTrigger(fk_trigger, NULL, constraintOid, indexOid, true);
+
+  /* Make changes-so-far visible */
+  CommandCounterIncrement();
+
+  /*
+   * Build and execute CREATE CONSTRAINT TRIGGER statements for the CHECK
+   * action for both INSERTs and UPDATEs on the referencing table.
+   *
+   * Note: for a self-referential FK (referencing and referenced tables are
+   * the same), it is important that the ON UPDATE action fires before the
+   * CHECK action, since both triggers will fire on the same row during an
+   * UPDATE event; otherwise the CHECK trigger will be checking a non-final
+   * state of the row.  Because triggers fire in name order, we are
+   * effectively relying on the OIDs of the triggers to sort correctly as
+   * text.  This will work except when the OID counter wraps around or adds
+   * a digit, eg "99999" sorts after "100000".  That is infrequent enough,
+   * and the use of self-referential FKs is rare enough, that we live with
+   * it for now.  There will be a real fix in PG 9.2.
+   */
+  CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, indexOid, true);
+  CreateFKCheckTrigger(myRel, fkconstraint, constraintOid, indexOid, false);
 }
 
 /*
@@ -6384,782 +6434,783 @@ createForeignKeyTriggers(Relation rel, Constraint *fkconstraint,
  */
 static void
 ATExecDropConstraint(Relation rel, const char *constrName,
-					 DropBehavior behavior,
-					 bool recurse, bool recursing,
-					 bool missing_ok, LOCKMODE lockmode)
+		     DropBehavior behavior,
+		     bool recurse, bool recursing,
+		     bool missing_ok, LOCKMODE lockmode)
 {
-	List	   *children;
-	ListCell   *child;
-	Relation	conrel;
-	Form_pg_constraint con;
-	SysScanDesc scan;
-	ScanKeyData key;
-	HeapTuple	tuple;
-	bool		found = false;
-	bool		is_check_constraint = false;
-
-	/* At top level, permission check was done in ATPrepCmd, else do it */
-	if (recursing)
-		ATSimplePermissions(rel, ATT_TABLE);
-
-	conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
-
-	/*
-	 * Find and drop the target constraint
-	 */
-	ScanKeyInit(&key,
-				Anum_pg_constraint_conrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	scan = systable_beginscan(conrel, ConstraintRelidIndexId,
-							  true, SnapshotNow, 1, &key);
-
-	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
-	{
-		ObjectAddress conobj;
-
-		con = (Form_pg_constraint) GETSTRUCT(tuple);
-
-		if (strcmp(NameStr(con->conname), constrName) != 0)
-			continue;
+  List	   *children;
+  ListCell   *child;
+  Relation	conrel;
+  Form_pg_constraint con;
+  SysScanDesc scan;
+  ScanKeyData key;
+  HeapTuple	tuple;
+  bool		found = false;
+  bool		is_check_constraint = false;
+
+  /* At top level, permission check was done in ATPrepCmd, else do it */
+  if (recursing)
+    ATSimplePermissions(rel, ATT_TABLE);
+
+  conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
+
+  /*
+   * Find and drop the target constraint
+   */
+  ScanKeyInit(&key,
+	      Anum_pg_constraint_conrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  scan = systable_beginscan(conrel, ConstraintRelidIndexId,
+			    true, SnapshotNow, 1, &key);
+
+  while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+    {
+      ObjectAddress conobj;
+
+      con = (Form_pg_constraint) GETSTRUCT(tuple);
+
+      if (strcmp(NameStr(con->conname), constrName) != 0)
+	continue;
+
+      /* Don't drop inherited constraints */
+      if (con->coninhcount > 0 && !recursing)
+	ereport(ERROR,
+		(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+		 errmsg("cannot drop inherited constraint \"%s\" of relation \"%s\"",
+			constrName, RelationGetRelationName(rel))));
 
-		/* Don't drop inherited constraints */
-		if (con->coninhcount > 0 && !recursing)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-					 errmsg("cannot drop inherited constraint \"%s\" of relation \"%s\"",
-							constrName, RelationGetRelationName(rel))));
+      /* Right now only CHECK constraints can be inherited */
+      if (con->contype == CONSTRAINT_CHECK)
+	is_check_constraint = true;
 
-		/* Right now only CHECK constraints can be inherited */
-		if (con->contype == CONSTRAINT_CHECK)
-			is_check_constraint = true;
+      /*
+       * Perform the actual constraint deletion
+       */
+      conobj.classId = ConstraintRelationId;
+      conobj.objectId = HeapTupleGetOid(tuple);
+      conobj.objectSubId = 0;
 
-		/*
-		 * Perform the actual constraint deletion
-		 */
-		conobj.classId = ConstraintRelationId;
-		conobj.objectId = HeapTupleGetOid(tuple);
-		conobj.objectSubId = 0;
+      performDeletion(&conobj, behavior);
 
-		performDeletion(&conobj, behavior);
+      found = true;
+    }
 
-		found = true;
-	}
-
-	systable_endscan(scan);
+  systable_endscan(scan);
 
-	if (!found)
+  if (!found)
+    {
+      if (!missing_ok)
 	{
-		if (!missing_ok)
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_OBJECT),
-				errmsg("constraint \"%s\" of relation \"%s\" does not exist",
-					   constrName, RelationGetRelationName(rel))));
-		}
-		else
-		{
-			ereport(NOTICE,
-					(errmsg("constraint \"%s\" of relation \"%s\" does not exist, skipping",
-							constrName, RelationGetRelationName(rel))));
-			heap_close(conrel, RowExclusiveLock);
-			return;
-		}
+	  ereport(ERROR,
+		  (errcode(ERRCODE_UNDEFINED_OBJECT),
+		   errmsg("constraint \"%s\" of relation \"%s\" does not exist",
+			  constrName, RelationGetRelationName(rel))));
 	}
-
-	/*
-	 * Propagate to children as appropriate.  Unlike most other ALTER
-	 * routines, we have to do this one level of recursion at a time; we can't
-	 * use find_all_inheritors to do it in one pass.
-	 */
-	if (is_check_constraint)
-		children = find_inheritance_children(RelationGetRelid(rel), lockmode);
-	else
-		children = NIL;
-
-	foreach(child, children)
+      else
 	{
-		Oid			childrelid = lfirst_oid(child);
-		Relation	childrel;
+	  ereport(NOTICE,
+		  (errmsg("constraint \"%s\" of relation \"%s\" does not exist, skipping",
+			  constrName, RelationGetRelationName(rel))));
+	  heap_close(conrel, RowExclusiveLock);
+	  return;
+	}
+    }
 
-		/* find_inheritance_children already got lock */
-		childrel = heap_open(childrelid, NoLock);
-		CheckTableNotInUse(childrel, "ALTER TABLE");
+  /*
+   * Propagate to children as appropriate.  Unlike most other ALTER
+   * routines, we have to do this one level of recursion at a time; we can't
+   * use find_all_inheritors to do it in one pass.
+   */
+  if (is_check_constraint)
+    children = find_inheritance_children(RelationGetRelid(rel), lockmode);
+  else
+    children = NIL;
 
-		ScanKeyInit(&key,
-					Anum_pg_constraint_conrelid,
-					BTEqualStrategyNumber, F_OIDEQ,
-					ObjectIdGetDatum(childrelid));
-		scan = systable_beginscan(conrel, ConstraintRelidIndexId,
-								  true, SnapshotNow, 1, &key);
+  foreach(child, children)
+    {
+      Oid			childrelid = lfirst_oid(child);
+      Relation	childrel;
 
-		found = false;
+      /* find_inheritance_children already got lock */
+      childrel = heap_open(childrelid, NoLock);
+      CheckTableNotInUse(childrel, "ALTER TABLE");
 
-		while (HeapTupleIsValid(tuple = systable_getnext(scan)))
-		{
-			HeapTuple	copy_tuple;
+      ScanKeyInit(&key,
+		  Anum_pg_constraint_conrelid,
+		  BTEqualStrategyNumber, F_OIDEQ,
+		  ObjectIdGetDatum(childrelid));
+      scan = systable_beginscan(conrel, ConstraintRelidIndexId,
+				true, SnapshotNow, 1, &key);
 
-			con = (Form_pg_constraint) GETSTRUCT(tuple);
+      found = false;
 
-			/* Right now only CHECK constraints can be inherited */
-			if (con->contype != CONSTRAINT_CHECK)
-				continue;
+      while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+	{
+	  HeapTuple	copy_tuple;
 
-			if (strcmp(NameStr(con->conname), constrName) != 0)
-				continue;
+	  con = (Form_pg_constraint) GETSTRUCT(tuple);
 
-			found = true;
+	  /* Right now only CHECK constraints can be inherited */
+	  if (con->contype != CONSTRAINT_CHECK)
+	    continue;
 
-			if (con->coninhcount <= 0)	/* shouldn't happen */
-				elog(ERROR, "relation %u has non-inherited constraint \"%s\"",
-					 childrelid, constrName);
+	  if (strcmp(NameStr(con->conname), constrName) != 0)
+	    continue;
 
-			copy_tuple = heap_copytuple(tuple);
-			con = (Form_pg_constraint) GETSTRUCT(copy_tuple);
+	  found = true;
 
-			if (recurse)
-			{
-				/*
-				 * If the child constraint has other definition sources, just
-				 * decrement its inheritance count; if not, recurse to delete
-				 * it.
-				 */
-				if (con->coninhcount == 1 && !con->conislocal)
-				{
-					/* Time to delete this child constraint, too */
-					ATExecDropConstraint(childrel, constrName, behavior,
-										 true, true,
-										 false, lockmode);
-				}
-				else
-				{
-					/* Child constraint must survive my deletion */
-					con->coninhcount--;
-					simple_heap_update(conrel, &copy_tuple->t_self, copy_tuple);
-					CatalogUpdateIndexes(conrel, copy_tuple);
-
-					/* Make update visible */
-					CommandCounterIncrement();
-				}
-			}
-			else
-			{
-				/*
-				 * If we were told to drop ONLY in this table (no recursion),
-				 * we need to mark the inheritors' constraints as locally
-				 * defined rather than inherited.
-				 */
-				con->coninhcount--;
-				con->conislocal = true;
-
-				simple_heap_update(conrel, &copy_tuple->t_self, copy_tuple);
-				CatalogUpdateIndexes(conrel, copy_tuple);
-
-				/* Make update visible */
-				CommandCounterIncrement();
-			}
+	  if (con->coninhcount <= 0)	/* shouldn't happen */
+	    elog(ERROR, "relation %u has non-inherited constraint \"%s\"",
+		 childrelid, constrName);
 
-			heap_freetuple(copy_tuple);
-		}
-
-		systable_endscan(scan);
-
-		if (!found)
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_OBJECT),
-				errmsg("constraint \"%s\" of relation \"%s\" does not exist",
-					   constrName,
-					   RelationGetRelationName(childrel))));
-
-		heap_close(childrel, NoLock);
-	}
-
-	heap_close(conrel, RowExclusiveLock);
-}
+	  copy_tuple = heap_copytuple(tuple);
+	  con = (Form_pg_constraint) GETSTRUCT(copy_tuple);
 
-/*
- * ALTER COLUMN TYPE
- */
-static void
-ATPrepAlterColumnType(List **wqueue,
-					  AlteredTableInfo *tab, Relation rel,
-					  bool recurse, bool recursing,
-					  AlterTableCmd *cmd, LOCKMODE lockmode)
-{
-	char	   *colName = cmd->name;
-	ColumnDef  *def = (ColumnDef *) cmd->def;
-	TypeName   *typeName = def->typeName;
-	Node	   *transform = def->raw_default;
-	HeapTuple	tuple;
-	Form_pg_attribute attTup;
-	AttrNumber	attnum;
-	Oid			targettype;
-	int32		targettypmod;
-	Oid			targetcollid;
-	NewColumnValue *newval;
-	ParseState *pstate = make_parsestate(NULL);
-
-	if (rel->rd_rel->reloftype && !recursing)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot alter column type of typed table")));
-
-	/* lookup the attribute so we can check inheritance status */
-	tuple = SearchSysCacheAttName(RelationGetRelid(rel), colName);
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-	attTup = (Form_pg_attribute) GETSTRUCT(tuple);
-	attnum = attTup->attnum;
-
-	/* Can't alter a system attribute */
-	if (attnum <= 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter system column \"%s\"",
-						colName)));
-
-	/* Don't alter inherited columns */
-	if (attTup->attinhcount > 0 && !recursing)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("cannot alter inherited column \"%s\"",
-						colName)));
-
-	/* Look up the target type */
-	typenameTypeIdAndMod(NULL, typeName, &targettype, &targettypmod);
-
-	/* And the collation */
-	targetcollid = GetColumnDefCollation(NULL, def, targettype);
-
-	/* make sure datatype is legal for a column */
-	CheckAttributeType(colName, targettype, targetcollid,
-					   list_make1_oid(rel->rd_rel->reltype),
-					   false);
-
-	if (tab->relkind == RELKIND_RELATION)
-	{
-		/*
-		 * Set up an expression to transform the old data value to the new
-		 * type. If a USING option was given, transform and use that
-		 * expression, else just take the old value and try to coerce it.  We
-		 * do this first so that type incompatibility can be detected before
-		 * we waste effort, and because we need the expression to be parsed
-		 * against the original table rowtype.
-		 */
-		if (transform)
+	  if (recurse)
+	    {
+	      /*
+	       * If the child constraint has other definition sources, just
+	       * decrement its inheritance count; if not, recurse to delete
+	       * it.
+	       */
+	      if (con->coninhcount == 1 && !con->conislocal)
 		{
-			RangeTblEntry *rte;
-
-			/* Expression must be able to access vars of old table */
-			rte = addRangeTableEntryForRelation(pstate,
-												rel,
-												NULL,
-												false,
-												true);
-			addRTEtoQuery(pstate, rte, false, true, true);
-
-			transform = transformExpr(pstate, transform);
-
-			/* It can't return a set */
-			if (expression_returns_set(transform))
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-					  errmsg("transform expression must not return a set")));
-
-			/* No subplans or aggregates, either... */
-			if (pstate->p_hasSubLinks)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("cannot use subquery in transform expression")));
-			if (pstate->p_hasAggs)
-				ereport(ERROR,
-						(errcode(ERRCODE_GROUPING_ERROR),
-						 errmsg("cannot use aggregate function in transform expression")));
-			if (pstate->p_hasWindowFuncs)
-				ereport(ERROR,
-						(errcode(ERRCODE_WINDOWING_ERROR),
-						 errmsg("cannot use window function in transform expression")));
+		  /* Time to delete this child constraint, too */
+		  ATExecDropConstraint(childrel, constrName, behavior,
+				       true, true,
+				       false, lockmode);
 		}
-		else
+	      else
 		{
-			transform = (Node *) makeVar(1, attnum,
-										 attTup->atttypid, attTup->atttypmod,
-										 attTup->attcollation,
-										 0);
-		}
+		  /* Child constraint must survive my deletion */
+		  con->coninhcount--;
+		  simple_heap_update(conrel, &copy_tuple->t_self, copy_tuple);
+		  CatalogUpdateIndexes(conrel, copy_tuple);
 
-		transform = coerce_to_target_type(pstate,
-										  transform, exprType(transform),
-										  targettype, targettypmod,
-										  COERCION_ASSIGNMENT,
-										  COERCE_IMPLICIT_CAST,
-										  -1);
-		if (transform == NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("column \"%s\" cannot be cast to type %s",
-							colName, format_type_be(targettype))));
+		  /* Make update visible */
+		  CommandCounterIncrement();
+		}
+	    }
+	  else
+	    {
+	      /*
+	       * If we were told to drop ONLY in this table (no recursion),
+	       * we need to mark the inheritors' constraints as locally
+	       * defined rather than inherited.
+	       */
+	      con->coninhcount--;
+	      con->conislocal = true;
 
-		/* Fix collations after all else */
-		assign_expr_collations(pstate, transform);
+	      simple_heap_update(conrel, &copy_tuple->t_self, copy_tuple);
+	      CatalogUpdateIndexes(conrel, copy_tuple);
 
-		/*
-		 * Add a work queue item to make ATRewriteTable update the column
-		 * contents.
-		 */
-		newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
-		newval->attnum = attnum;
-		newval->expr = (Expr *) transform;
+	      /* Make update visible */
+	      CommandCounterIncrement();
+	    }
 
-		tab->newvals = lappend(tab->newvals, newval);
-		if (ATColumnChangeRequiresRewrite(transform, attnum))
-			tab->rewrite = true;
+	  heap_freetuple(copy_tuple);
 	}
-	else if (transform)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			  errmsg("ALTER TYPE USING is only supported on plain tables")));
 
-	if (tab->relkind == RELKIND_COMPOSITE_TYPE ||
-		tab->relkind == RELKIND_FOREIGN_TABLE)
-	{
-		/*
-		 * For composite types, do this check now.	Tables will check it later
-		 * when the table is being rewritten.
-		 */
-		find_composite_type_dependencies(rel->rd_rel->reltype, rel, NULL);
-	}
+      systable_endscan(scan);
 
-	ReleaseSysCache(tuple);
+      if (!found)
+	ereport(ERROR,
+		(errcode(ERRCODE_UNDEFINED_OBJECT),
+		 errmsg("constraint \"%s\" of relation \"%s\" does not exist",
+			constrName,
+			RelationGetRelationName(childrel))));
 
-	/*
-	 * The recursion case is handled by ATSimpleRecursion.	However, if we are
-	 * told not to recurse, there had better not be any child tables; else the
-	 * alter would put them out of step.
-	 */
-	if (recurse)
-		ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
-	else if (!recursing &&
-			 find_inheritance_children(RelationGetRelid(rel), NoLock) != NIL)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
-				 errmsg("type of inherited column \"%s\" must be changed in child tables too",
-						colName)));
+      heap_close(childrel, NoLock);
+    }
 
-	if (tab->relkind == RELKIND_COMPOSITE_TYPE)
-		ATTypedTableRecursion(wqueue, rel, cmd, lockmode);
+  heap_close(conrel, RowExclusiveLock);
 }
 
 /*
- * When the data type of a column is changed, a rewrite might not be required
- * if the new type is sufficiently identical to the old one, and the USING
- * clause isn't trying to insert some other value.  It's safe to skip the
- * rewrite if the old type is binary coercible to the new type, or if the
- * new type is an unconstrained domain over the old type.  In the case of a
- * constrained domain, we could get by with scanning the table and checking
- * the constraint rather than actually rewriting it, but we don't currently
- * try to do that.
+ * ALTER COLUMN TYPE
  */
-static bool
-ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno)
-{
-	Assert(expr != NULL);
-
-	for (;;)
-	{
-		/* only one varno, so no need to check that */
-		if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno)
-			return false;
-		else if (IsA(expr, RelabelType))
-			expr = (Node *) ((RelabelType *) expr)->arg;
-		else if (IsA(expr, CoerceToDomain))
-		{
-			CoerceToDomain *d = (CoerceToDomain *) expr;
-
-			if (GetDomainConstraints(d->resulttype) != NIL)
-				return true;
-			expr = (Node *) d->arg;
-		}
-		else
-			return true;
-	}
-}
-
 static void
-ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
-					  AlterTableCmd *cmd, LOCKMODE lockmode)
+ATPrepAlterColumnType(List **wqueue,
+		      AlteredTableInfo *tab, Relation rel,
+		      bool recurse, bool recursing,
+		      AlterTableCmd *cmd, LOCKMODE lockmode)
 {
-	char	   *colName = cmd->name;
-	ColumnDef  *def = (ColumnDef *) cmd->def;
-	TypeName   *typeName = def->typeName;
-	HeapTuple	heapTup;
-	Form_pg_attribute attTup;
-	AttrNumber	attnum;
-	HeapTuple	typeTuple;
-	Form_pg_type tform;
-	Oid			targettype;
-	int32		targettypmod;
-	Oid			targetcollid;
-	Node	   *defaultexpr;
-	Relation	attrelation;
-	Relation	depRel;
-	ScanKeyData key[3];
-	SysScanDesc scan;
-	HeapTuple	depTup;
-
-	attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	/* Look up the target column */
-	heapTup = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
-	if (!HeapTupleIsValid(heapTup))		/* shouldn't happen */
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
-	attTup = (Form_pg_attribute) GETSTRUCT(heapTup);
-	attnum = attTup->attnum;
-
-	/* Check for multiple ALTER TYPE on same column --- can't cope */
-	if (attTup->atttypid != tab->oldDesc->attrs[attnum - 1]->atttypid ||
-		attTup->atttypmod != tab->oldDesc->attrs[attnum - 1]->atttypmod)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot alter type of column \"%s\" twice",
-						colName)));
-
-	/* Look up the target type (should not fail, since prep found it) */
-	typeTuple = typenameType(NULL, typeName, &targettypmod);
-	tform = (Form_pg_type) GETSTRUCT(typeTuple);
-	targettype = HeapTupleGetOid(typeTuple);
-	/* And the collation */
-	targetcollid = GetColumnDefCollation(NULL, def, targettype);
-
-	/*
-	 * If there is a default expression for the column, get it and ensure we
-	 * can coerce it to the new datatype.  (We must do this before changing
-	 * the column type, because build_column_default itself will try to
-	 * coerce, and will not issue the error message we want if it fails.)
-	 *
-	 * We remove any implicit coercion steps at the top level of the old
-	 * default expression; this has been agreed to satisfy the principle of
-	 * least surprise.	(The conversion to the new column type should act like
-	 * it started from what the user sees as the stored expression, and the
-	 * implicit coercions aren't going to be shown.)
-	 */
-	if (attTup->atthasdef)
-	{
-		defaultexpr = build_column_default(rel, attnum);
-		Assert(defaultexpr);
-		defaultexpr = strip_implicit_coercions(defaultexpr);
-		defaultexpr = coerce_to_target_type(NULL,		/* no UNKNOWN params */
-										  defaultexpr, exprType(defaultexpr),
-											targettype, targettypmod,
-											COERCION_ASSIGNMENT,
-											COERCE_IMPLICIT_CAST,
-											-1);
-		if (defaultexpr == NULL)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-				errmsg("default for column \"%s\" cannot be cast to type %s",
-					   colName, format_type_be(targettype))));
-	}
-	else
-		defaultexpr = NULL;
-
-	/*
-	 * Find everything that depends on the column (constraints, indexes, etc),
-	 * and record enough information to let us recreate the objects.
-	 *
-	 * The actual recreation does not happen here, but only after we have
-	 * performed all the individual ALTER TYPE operations.	We have to save
-	 * the info before executing ALTER TYPE, though, else the deparser will
-	 * get confused.
-	 *
-	 * There could be multiple entries for the same object, so we must check
-	 * to ensure we process each one only once.  Note: we assume that an index
-	 * that implements a constraint will not show a direct dependency on the
-	 * column.
-	 */
-	depRel = heap_open(DependRelationId, RowExclusiveLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_depend_refclassid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationRelationId));
-	ScanKeyInit(&key[1],
-				Anum_pg_depend_refobjid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	ScanKeyInit(&key[2],
-				Anum_pg_depend_refobjsubid,
-				BTEqualStrategyNumber, F_INT4EQ,
-				Int32GetDatum((int32) attnum));
-
-	scan = systable_beginscan(depRel, DependReferenceIndexId, true,
-							  SnapshotNow, 3, key);
-
-	while (HeapTupleIsValid(depTup = systable_getnext(scan)))
-	{
-		Form_pg_depend foundDep = (Form_pg_depend) GETSTRUCT(depTup);
-		ObjectAddress foundObject;
-
-		/* We don't expect any PIN dependencies on columns */
-		if (foundDep->deptype == DEPENDENCY_PIN)
-			elog(ERROR, "cannot alter type of a pinned column");
-
-		foundObject.classId = foundDep->classid;
-		foundObject.objectId = foundDep->objid;
-		foundObject.objectSubId = foundDep->objsubid;
-
-		switch (getObjectClass(&foundObject))
-		{
-			case OCLASS_CLASS:
-				{
-					char		relKind = get_rel_relkind(foundObject.objectId);
-
-					if (relKind == RELKIND_INDEX)
-					{
-						Assert(foundObject.objectSubId == 0);
-						if (!list_member_oid(tab->changedIndexOids, foundObject.objectId))
-						{
-							tab->changedIndexOids = lappend_oid(tab->changedIndexOids,
-													   foundObject.objectId);
-							tab->changedIndexDefs = lappend(tab->changedIndexDefs,
-							   pg_get_indexdef_string(foundObject.objectId));
-						}
-					}
-					else if (relKind == RELKIND_SEQUENCE)
-					{
-						/*
-						 * This must be a SERIAL column's sequence.  We need
-						 * not do anything to it.
-						 */
-						Assert(foundObject.objectSubId == 0);
-					}
-					else
-					{
-						/* Not expecting any other direct dependencies... */
-						elog(ERROR, "unexpected object depending on column: %s",
-							 getObjectDescription(&foundObject));
-					}
-					break;
-				}
-
-			case OCLASS_CONSTRAINT:
-				Assert(foundObject.objectSubId == 0);
-				if (!list_member_oid(tab->changedConstraintOids,
-									 foundObject.objectId))
-				{
-					char	   *defstring = pg_get_constraintdef_string(foundObject.objectId);
-
-					/*
-					 * Put NORMAL dependencies at the front of the list and
-					 * AUTO dependencies at the back.  This makes sure that
-					 * foreign-key constraints depending on this column will
-					 * be dropped before unique or primary-key constraints of
-					 * the column; which we must have because the FK
-					 * constraints depend on the indexes belonging to the
-					 * unique constraints.
-					 */
-					if (foundDep->deptype == DEPENDENCY_NORMAL)
-					{
-						tab->changedConstraintOids =
-							lcons_oid(foundObject.objectId,
-									  tab->changedConstraintOids);
-						tab->changedConstraintDefs =
-							lcons(defstring,
-								  tab->changedConstraintDefs);
-					}
-					else
-					{
-						tab->changedConstraintOids =
-							lappend_oid(tab->changedConstraintOids,
-										foundObject.objectId);
-						tab->changedConstraintDefs =
-							lappend(tab->changedConstraintDefs,
-									defstring);
-					}
-				}
-				break;
-
-			case OCLASS_REWRITE:
-				/* XXX someday see if we can cope with revising views */
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot alter type of a column used by a view or rule"),
-						 errdetail("%s depends on column \"%s\"",
-								   getObjectDescription(&foundObject),
-								   colName)));
-				break;
-
-			case OCLASS_TRIGGER:
-
-				/*
-				 * A trigger can depend on a column because the column is
-				 * specified as an update target, or because the column is
-				 * used in the trigger's WHEN condition.  The first case would
-				 * not require any extra work, but the second case would
-				 * require updating the WHEN expression, which will take a
-				 * significant amount of new code.	Since we can't easily tell
-				 * which case applies, we punt for both.  FIXME someday.
-				 */
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("cannot alter type of a column used in a trigger definition"),
-						 errdetail("%s depends on column \"%s\"",
-								   getObjectDescription(&foundObject),
-								   colName)));
-				break;
-
-			case OCLASS_DEFAULT:
-
-				/*
-				 * Ignore the column's default expression, since we will fix
-				 * it below.
-				 */
-				Assert(defaultexpr);
-				break;
-
-			case OCLASS_PROC:
-			case OCLASS_TYPE:
-			case OCLASS_CAST:
-			case OCLASS_COLLATION:
-			case OCLASS_CONVERSION:
-			case OCLASS_LANGUAGE:
-			case OCLASS_LARGEOBJECT:
-			case OCLASS_OPERATOR:
-			case OCLASS_OPCLASS:
-			case OCLASS_OPFAMILY:
-			case OCLASS_AMOP:
-			case OCLASS_AMPROC:
-			case OCLASS_SCHEMA:
-			case OCLASS_TSPARSER:
-			case OCLASS_TSDICT:
-			case OCLASS_TSTEMPLATE:
-			case OCLASS_TSCONFIG:
-			case OCLASS_ROLE:
-			case OCLASS_DATABASE:
-			case OCLASS_TBLSPACE:
-			case OCLASS_FDW:
-			case OCLASS_FOREIGN_SERVER:
-			case OCLASS_USER_MAPPING:
-			case OCLASS_DEFACL:
-			case OCLASS_EXTENSION:
-
-				/*
-				 * We don't expect any of these sorts of objects to depend on
-				 * a column.
-				 */
-				elog(ERROR, "unexpected object depending on column: %s",
-					 getObjectDescription(&foundObject));
-				break;
-
-			default:
-				elog(ERROR, "unrecognized object class: %u",
-					 foundObject.classId);
-		}
-	}
-
-	systable_endscan(scan);
-
-	/*
-	 * Now scan for dependencies of this column on other things.  The only
-	 * thing we should find is the dependency on the column datatype, which we
-	 * want to remove, and possibly a collation dependency.
-	 */
-	ScanKeyInit(&key[0],
-				Anum_pg_depend_classid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationRelationId));
-	ScanKeyInit(&key[1],
-				Anum_pg_depend_objid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	ScanKeyInit(&key[2],
-				Anum_pg_depend_objsubid,
-				BTEqualStrategyNumber, F_INT4EQ,
-				Int32GetDatum((int32) attnum));
-
-	scan = systable_beginscan(depRel, DependDependerIndexId, true,
-							  SnapshotNow, 3, key);
-
-	while (HeapTupleIsValid(depTup = systable_getnext(scan)))
-	{
-		Form_pg_depend foundDep = (Form_pg_depend) GETSTRUCT(depTup);
-
-		if (foundDep->deptype != DEPENDENCY_NORMAL)
-			elog(ERROR, "found unexpected dependency type '%c'",
-				 foundDep->deptype);
-		if (!(foundDep->refclassid == TypeRelationId &&
-			  foundDep->refobjid == attTup->atttypid) &&
-			!(foundDep->refclassid == CollationRelationId &&
-			  foundDep->refobjid == attTup->attcollation))
-			elog(ERROR, "found unexpected dependency for column");
-
-		simple_heap_delete(depRel, &depTup->t_self);
-	}
-
-	systable_endscan(scan);
-
-	heap_close(depRel, RowExclusiveLock);
-
-	/*
-	 * Here we go --- change the recorded column type and collation.  (Note
-	 * heapTup is a copy of the syscache entry, so okay to scribble on.)
-	 */
-	attTup->atttypid = targettype;
-	attTup->atttypmod = targettypmod;
-	attTup->attcollation = targetcollid;
-	attTup->attndims = list_length(typeName->arrayBounds);
-	attTup->attlen = tform->typlen;
-	attTup->attbyval = tform->typbyval;
-	attTup->attalign = tform->typalign;
-	attTup->attstorage = tform->typstorage;
-
-	ReleaseSysCache(typeTuple);
-
-	simple_heap_update(attrelation, &heapTup->t_self, heapTup);
-
-	/* keep system catalog indexes current */
-	CatalogUpdateIndexes(attrelation, heapTup);
-
-	heap_close(attrelation, RowExclusiveLock);
-
-	/* Install dependencies on new datatype and collation */
-	add_column_datatype_dependency(RelationGetRelid(rel), attnum, targettype);
-	add_column_collation_dependency(RelationGetRelid(rel), attnum, targetcollid);
+  char	   *colName = cmd->name;
+  ColumnDef  *def = (ColumnDef *) cmd->def;
+  TypeName   *typeName = def->typeName;
+  Node	   *transform = def->raw_default;
+  HeapTuple	tuple;
+  Form_pg_attribute attTup;
+  AttrNumber	attnum;
+  Oid			targettype;
+  int32		targettypmod;
+  Oid			targetcollid;
+  NewColumnValue *newval;
+  ParseState *pstate = make_parsestate(NULL);
+
+  if (rel->rd_rel->reloftype && !recursing)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("cannot alter column type of typed table")));
+
+  /* lookup the attribute so we can check inheritance status */
+  tuple = SearchSysCacheAttName(RelationGetRelid(rel), colName);
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+  attTup = (Form_pg_attribute) GETSTRUCT(tuple);
+  attnum = attTup->attnum;
+
+  /* Can't alter a system attribute */
+  if (attnum <= 0)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter system column \"%s\"",
+		    colName)));
+
+  /* Don't alter inherited columns */
+  if (attTup->attinhcount > 0 && !recursing)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("cannot alter inherited column \"%s\"",
+		    colName)));
+
+  /* Look up the target type */
+  typenameTypeIdAndMod(NULL, typeName, &targettype, &targettypmod);
+
+  /* And the collation */
+  targetcollid = GetColumnDefCollation(NULL, def, targettype);
+
+  /* make sure datatype is legal for a column */
+  CheckAttributeType(colName, targettype, targetcollid,
+		     list_make1_oid(rel->rd_rel->reltype),
+		     false);
+
+  if (tab->relkind == RELKIND_RELATION)
+    {
+      /*
+       * Set up an expression to transform the old data value to the new
+       * type. If a USING option was given, transform and use that
+       * expression, else just take the old value and try to coerce it.  We
+       * do this first so that type incompatibility can be detected before
+       * we waste effort, and because we need the expression to be parsed
+       * against the original table row type.
+       */
+      if (transform)
+	{
+	  RangeTblEntry *rte;
+
+	  /* Expression must be able to access vars of old table */
+	  rte = addRangeTableEntryForRelation(pstate,
+					      rel,
+					      NULL,
+					      false,
+					      true);
+	  addRTEtoQuery(pstate, rte, false, true, true);
+
+	  transform = transformExpr(pstate, transform);
+
+	  /* It can't return a set */
+	  if (expression_returns_set(transform))
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("transform expression must not return a set")));
+
+	  /* No subplans or aggregates, either... */
+	  if (pstate->p_hasSubLinks)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot use subquery in transform expression")));
+	  if (pstate->p_hasAggs)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_GROUPING_ERROR),
+		     errmsg("cannot use aggregate function in transform expression")));
+	  if (pstate->p_hasWindowFuncs)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_WINDOWING_ERROR),
+		     errmsg("cannot use window function in transform expression")));
+	}
+      else
+	{
+	  transform = (Node *) makeVar(1, attnum,
+				       attTup->atttypid, attTup->atttypmod,
+				       attTup->attcollation,
+				       0);
+	}
+
+      transform = coerce_to_target_type(pstate,
+					transform, exprType(transform),
+					targettype, targettypmod,
+					COERCION_ASSIGNMENT,
+					COERCE_IMPLICIT_CAST,
+					-1);
+      if (transform == NULL)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("column \"%s\" cannot be cast to type %s",
+			colName, format_type_be(targettype))));
+
+      /* Fix collations after all else */
+      assign_expr_collations(pstate, transform);
+
+      /*
+       * Add a work queue item to make ATRewriteTable update the column
+       * contents.
+       */
+      newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
+      newval->attnum = attnum;
+      newval->expr = (Expr *) transform;
+
+      tab->newvals = lappend(tab->newvals, newval);
+      if (ATColumnChangeRequiresRewrite(transform, attnum))
+	tab->rewrite = true;
+    }
+  else if (transform)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a table",
+		    RelationGetRelationName(rel))));
+
+  if (tab->relkind == RELKIND_COMPOSITE_TYPE ||
+      tab->relkind == RELKIND_FOREIGN_TABLE)
+    {
+      /*
+       * For composite types, do this check now.	Tables will check it later
+       * when the table is being rewritten.
+       */
+      find_composite_type_dependencies(rel->rd_rel->reltype, rel, NULL);
+    }
+
+  ReleaseSysCache(tuple);
+
+  /*
+   * The recursion case is handled by ATSimpleRecursion.	However, if we are
+   * told not to recurse, there had better not be any child tables; else the
+   * alter would put them out of step.
+   */
+  if (recurse)
+    ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
+  else if (!recursing &&
+	   find_inheritance_children(RelationGetRelid(rel), NoLock) != NIL)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+	     errmsg("type of inherited column \"%s\" must be changed in child tables too",
+		    colName)));
+
+  if (tab->relkind == RELKIND_COMPOSITE_TYPE)
+    ATTypedTableRecursion(wqueue, rel, cmd, lockmode);
+}
 
-	/*
-	 * Drop any pg_statistic entry for the column, since it's now wrong type
-	 */
-	RemoveStatistics(RelationGetRelid(rel), attnum);
+/*
+ * When the data type of a column is changed, a rewrite might not be required
+ * if the new type is sufficiently identical to the old one, and the USING
+ * clause isn't trying to insert some other value.  It's safe to skip the
+ * rewrite if the old type is binary coercible to the new type, or if the
+ * new type is an unconstrained domain over the old type.  In the case of a
+ * constrained domain, we could get by with scanning the table and checking
+ * the constraint rather than actually rewriting it, but we don't currently
+ * try to do that.
+ */
+static bool
+ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno)
+{
+  Assert(expr != NULL);
 
-	/*
-	 * Update the default, if present, by brute force --- remove and re-add
-	 * the default.  Probably unsafe to take shortcuts, since the new version
-	 * may well have additional dependencies.  (It's okay to do this now,
-	 * rather than after other ALTER TYPE commands, since the default won't
-	 * depend on other column types.)
-	 */
-	if (defaultexpr)
+  for (;;)
+    {
+      /* only one varno, so no need to check that */
+      if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno)
+	return false;
+      else if (IsA(expr, RelabelType))
+	expr = (Node *) ((RelabelType *) expr)->arg;
+      else if (IsA(expr, CoerceToDomain))
 	{
-		/* Must make new row visible since it will be updated again */
-		CommandCounterIncrement();
+	  CoerceToDomain *d = (CoerceToDomain *) expr;
 
-		/*
-		 * We use RESTRICT here for safety, but at present we do not expect
-		 * anything to depend on the default.
-		 */
-		RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, true);
-
-		StoreAttrDefault(rel, attnum, defaultexpr);
+	  if (GetDomainConstraints(d->resulttype) != NIL)
+	    return true;
+	  expr = (Node *) d->arg;
 	}
+      else
+	return true;
+    }
+}
 
-	/* Cleanup */
-	heap_freetuple(heapTup);
+static void
+ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
+		      AlterTableCmd *cmd, LOCKMODE lockmode)
+{
+  char	   *colName = cmd->name;
+  ColumnDef  *def = (ColumnDef *) cmd->def;
+  TypeName   *typeName = def->typeName;
+  HeapTuple	heapTup;
+  Form_pg_attribute attTup;
+  AttrNumber	attnum;
+  HeapTuple	typeTuple;
+  Form_pg_type tform;
+  Oid			targettype;
+  int32		targettypmod;
+  Oid			targetcollid;
+  Node	   *defaultexpr;
+  Relation	attrelation;
+  Relation	depRel;
+  ScanKeyData key[3];
+  SysScanDesc scan;
+  HeapTuple	depTup;
+
+  attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  /* Look up the target column */
+  heapTup = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+  if (!HeapTupleIsValid(heapTup))		/* shouldn't happen */
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_COLUMN),
+	     errmsg("column \"%s\" of relation \"%s\" does not exist",
+		    colName, RelationGetRelationName(rel))));
+  attTup = (Form_pg_attribute) GETSTRUCT(heapTup);
+  attnum = attTup->attnum;
+
+  /* Check for multiple ALTER TYPE on same column --- can't cope */
+  if (attTup->atttypid != tab->oldDesc->attrs[attnum - 1]->atttypid ||
+      attTup->atttypmod != tab->oldDesc->attrs[attnum - 1]->atttypmod)
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot alter type of column \"%s\" twice",
+		    colName)));
+
+  /* Look up the target type (should not fail, since prep found it) */
+  typeTuple = typenameType(NULL, typeName, &targettypmod);
+  tform = (Form_pg_type) GETSTRUCT(typeTuple);
+  targettype = HeapTupleGetOid(typeTuple);
+  /* And the collation */
+  targetcollid = GetColumnDefCollation(NULL, def, targettype);
+
+  /*
+   * If there is a default expression for the column, get it and ensure we
+   * can coerce it to the new datatype.  (We must do this before changing
+   * the column type, because build_column_default itself will try to
+   * coerce, and will not issue the error message we want if it fails.)
+   *
+   * We remove any implicit coercion steps at the top level of the old
+   * default expression; this has been agreed to satisfy the principle of
+   * least surprise.	(The conversion to the new column type should act like
+   * it started from what the user sees as the stored expression, and the
+   * implicit coercions aren't going to be shown.)
+   */
+  if (attTup->atthasdef)
+    {
+      defaultexpr = build_column_default(rel, attnum);
+      Assert(defaultexpr);
+      defaultexpr = strip_implicit_coercions(defaultexpr);
+      defaultexpr = coerce_to_target_type(NULL,		/* no UNKNOWN params */
+					  defaultexpr, exprType(defaultexpr),
+					  targettype, targettypmod,
+					  COERCION_ASSIGNMENT,
+					  COERCE_IMPLICIT_CAST,
+					  -1);
+      if (defaultexpr == NULL)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("default for column \"%s\" cannot be cast to type %s",
+			colName, format_type_be(targettype))));
+    }
+  else
+    defaultexpr = NULL;
+
+  /*
+   * Find everything that depends on the column (constraints, indexes, etc),
+   * and record enough information to let us recreate the objects.
+   *
+   * The actual recreation does not happen here, but only after we have
+   * performed all the individual ALTER TYPE operations.	We have to save
+   * the info before executing ALTER TYPE, though, else the deparser will
+   * get confused.
+   *
+   * There could be multiple entries for the same object, so we must check
+   * to ensure we process each one only once.  Note: we assume that an index
+   * that implements a constraint will not show a direct dependency on the
+   * column.
+   */
+  depRel = heap_open(DependRelationId, RowExclusiveLock);
+
+  ScanKeyInit(&key[0],
+	      Anum_pg_depend_refclassid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationRelationId));
+  ScanKeyInit(&key[1],
+	      Anum_pg_depend_refobjid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  ScanKeyInit(&key[2],
+	      Anum_pg_depend_refobjsubid,
+	      BTEqualStrategyNumber, F_INT4EQ,
+	      Int32GetDatum((int32) attnum));
+
+  scan = systable_beginscan(depRel, DependReferenceIndexId, true,
+			    SnapshotNow, 3, key);
+
+  while (HeapTupleIsValid(depTup = systable_getnext(scan)))
+    {
+      Form_pg_depend foundDep = (Form_pg_depend) GETSTRUCT(depTup);
+      ObjectAddress foundObject;
+
+      /* We don't expect any PIN dependencies on columns */
+      if (foundDep->deptype == DEPENDENCY_PIN)
+	elog(ERROR, "cannot alter type of a pinned column");
+
+      foundObject.classId = foundDep->classid;
+      foundObject.objectId = foundDep->objid;
+      foundObject.objectSubId = foundDep->objsubid;
+
+      switch (getObjectClass(&foundObject))
+	{
+	case OCLASS_CLASS:
+	  {
+	    char		relKind = get_rel_relkind(foundObject.objectId);
+
+	    if (relKind == RELKIND_INDEX)
+	      {
+		Assert(foundObject.objectSubId == 0);
+		if (!list_member_oid(tab->changedIndexOids, foundObject.objectId))
+		  {
+		    tab->changedIndexOids = lappend_oid(tab->changedIndexOids,
+							foundObject.objectId);
+		    tab->changedIndexDefs = lappend(tab->changedIndexDefs,
+						    pg_get_indexdef_string(foundObject.objectId));
+		  }
+	      }
+	    else if (relKind == RELKIND_SEQUENCE)
+	      {
+		/*
+		 * This must be a SERIAL column's sequence.  We need
+		 * not do anything to it.
+		 */
+		Assert(foundObject.objectSubId == 0);
+	      }
+	    else
+	      {
+		/* Not expecting any other direct dependencies... */
+		elog(ERROR, "unexpected object depending on column: %s",
+		     getObjectDescription(&foundObject));
+	      }
+	    break;
+	  }
+
+	case OCLASS_CONSTRAINT:
+	  Assert(foundObject.objectSubId == 0);
+	  if (!list_member_oid(tab->changedConstraintOids,
+			       foundObject.objectId))
+	    {
+	      char	   *defstring = pg_get_constraintdef_string(foundObject.objectId);
+
+	      /*
+	       * Put NORMAL dependencies at the front of the list and
+	       * AUTO dependencies at the back.  This makes sure that
+	       * foreign-key constraints depending on this column will
+	       * be dropped before unique or primary-key constraints of
+	       * the column; which we must have because the FK
+	       * constraints depend on the indexes belonging to the
+	       * unique constraints.
+	       */
+	      if (foundDep->deptype == DEPENDENCY_NORMAL)
+		{
+		  tab->changedConstraintOids =
+		    lcons_oid(foundObject.objectId,
+			      tab->changedConstraintOids);
+		  tab->changedConstraintDefs =
+		    lcons(defstring,
+			  tab->changedConstraintDefs);
+		}
+	      else
+		{
+		  tab->changedConstraintOids =
+		    lappend_oid(tab->changedConstraintOids,
+				foundObject.objectId);
+		  tab->changedConstraintDefs =
+		    lappend(tab->changedConstraintDefs,
+			    defstring);
+		}
+	    }
+	  break;
+
+	case OCLASS_REWRITE:
+	  /* XXX someday see if we can cope with revising views */
+	  ereport(ERROR,
+		  (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		   errmsg("cannot alter type of a column used by a view or rule"),
+		   errdetail("%s depends on column \"%s\"",
+			     getObjectDescription(&foundObject),
+			     colName)));
+	  break;
+
+	case OCLASS_TRIGGER:
+
+	  /*
+	   * A trigger can depend on a column because the column is
+	   * specified as an update target, or because the column is
+	   * used in the trigger's WHEN condition.  The first case would
+	   * not require any extra work, but the second case would
+	   * require updating the WHEN expression, which will take a
+	   * significant amount of new code.	Since we can't easily tell
+	   * which case applies, we punt for both.  FIXME someday.
+	   */
+	  ereport(ERROR,
+		  (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		   errmsg("cannot alter type of a column used in a trigger definition"),
+		   errdetail("%s depends on column \"%s\"",
+			     getObjectDescription(&foundObject),
+			     colName)));
+	  break;
+
+	case OCLASS_DEFAULT:
+
+	  /*
+	   * Ignore the column's default expression, since we will fix
+	   * it below.
+	   */
+	  Assert(defaultexpr);
+	  break;
+
+	case OCLASS_PROC:
+	case OCLASS_TYPE:
+	case OCLASS_CAST:
+	case OCLASS_COLLATION:
+	case OCLASS_CONVERSION:
+	case OCLASS_LANGUAGE:
+	case OCLASS_LARGEOBJECT:
+	case OCLASS_OPERATOR:
+	case OCLASS_OPCLASS:
+	case OCLASS_OPFAMILY:
+	case OCLASS_AMOP:
+	case OCLASS_AMPROC:
+	case OCLASS_SCHEMA:
+	case OCLASS_TSPARSER:
+	case OCLASS_TSDICT:
+	case OCLASS_TSTEMPLATE:
+	case OCLASS_TSCONFIG:
+	case OCLASS_ROLE:
+	case OCLASS_DATABASE:
+	case OCLASS_TBLSPACE:
+	case OCLASS_FDW:
+	case OCLASS_FOREIGN_SERVER:
+	case OCLASS_USER_MAPPING:
+	case OCLASS_DEFACL:
+	case OCLASS_EXTENSION:
+
+	  /*
+	   * We don't expect any of these sorts of objects to depend on
+	   * a column.
+	   */
+	  elog(ERROR, "unexpected object depending on column: %s",
+	       getObjectDescription(&foundObject));
+	  break;
+
+	default:
+	  elog(ERROR, "unrecognized object class: %u",
+	       foundObject.classId);
+	}
+    }
+
+  systable_endscan(scan);
+
+  /*
+   * Now scan for dependencies of this column on other things.  The only
+   * thing we should find is the dependency on the column datatype, which we
+   * want to remove, and possibly a collation dependency.
+   */
+  ScanKeyInit(&key[0],
+	      Anum_pg_depend_classid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationRelationId));
+  ScanKeyInit(&key[1],
+	      Anum_pg_depend_objid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  ScanKeyInit(&key[2],
+	      Anum_pg_depend_objsubid,
+	      BTEqualStrategyNumber, F_INT4EQ,
+	      Int32GetDatum((int32) attnum));
+
+  scan = systable_beginscan(depRel, DependDependerIndexId, true,
+			    SnapshotNow, 3, key);
+
+  while (HeapTupleIsValid(depTup = systable_getnext(scan)))
+    {
+      Form_pg_depend foundDep = (Form_pg_depend) GETSTRUCT(depTup);
+
+      if (foundDep->deptype != DEPENDENCY_NORMAL)
+	elog(ERROR, "found unexpected dependency type '%c'",
+	     foundDep->deptype);
+      if (!(foundDep->refclassid == TypeRelationId &&
+	    foundDep->refobjid == attTup->atttypid) &&
+	  !(foundDep->refclassid == CollationRelationId &&
+	    foundDep->refobjid == attTup->attcollation))
+	elog(ERROR, "found unexpected dependency for column");
+
+      simple_heap_delete(depRel, &depTup->t_self);
+    }
+
+  systable_endscan(scan);
+
+  heap_close(depRel, RowExclusiveLock);
+
+  /*
+   * Here we go --- change the recorded column type and collation.  (Note
+   * heapTup is a copy of the syscache entry, so okay to scribble on.)
+   */
+  attTup->atttypid = targettype;
+  attTup->atttypmod = targettypmod;
+  attTup->attcollation = targetcollid;
+  attTup->attndims = list_length(typeName->arrayBounds);
+  attTup->attlen = tform->typlen;
+  attTup->attbyval = tform->typbyval;
+  attTup->attalign = tform->typalign;
+  attTup->attstorage = tform->typstorage;
+
+  ReleaseSysCache(typeTuple);
+
+  simple_heap_update(attrelation, &heapTup->t_self, heapTup);
+
+  /* keep system catalog indexes current */
+  CatalogUpdateIndexes(attrelation, heapTup);
+
+  heap_close(attrelation, RowExclusiveLock);
+
+  /* Install dependencies on new datatype and collation */
+  add_column_datatype_dependency(RelationGetRelid(rel), attnum, targettype);
+  add_column_collation_dependency(RelationGetRelid(rel), attnum, targetcollid);
+
+  /*
+   * Drop any pg_statistic entry for the column, since it's now wrong type
+   */
+  RemoveStatistics(RelationGetRelid(rel), attnum);
+
+  /*
+   * Update the default, if present, by brute force --- remove and re-add
+   * the default.  Probably unsafe to take shortcuts, since the new version
+   * may well have additional dependencies.  (It's okay to do this now,
+   * rather than after other ALTER TYPE commands, since the default won't
+   * depend on other column types.)
+   */
+  if (defaultexpr)
+    {
+      /* Must make new row visible since it will be updated again */
+      CommandCounterIncrement();
+
+      /*
+       * We use RESTRICT here for safety, but at present we do not expect
+       * anything to depend on the default.
+       */
+      RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, true);
+
+      StoreAttrDefault(rel, attnum, defaultexpr);
+    }
+
+  /* Cleanup */
+  heap_freetuple(heapTup);
 }
 
 /*
@@ -7170,145 +7221,145 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 static void
 ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
 {
-	ObjectAddress obj;
-	ListCell   *l;
-
-	/*
-	 * Re-parse the index and constraint definitions, and attach them to the
-	 * appropriate work queue entries.	We do this before dropping because in
-	 * the case of a FOREIGN KEY constraint, we might not yet have exclusive
-	 * lock on the table the constraint is attached to, and we need to get
-	 * that before dropping.  It's safe because the parser won't actually look
-	 * at the catalogs to detect the existing entry.
-	 */
-	foreach(l, tab->changedIndexDefs)
-		ATPostAlterTypeParse((char *) lfirst(l), wqueue, lockmode);
-	foreach(l, tab->changedConstraintDefs)
-		ATPostAlterTypeParse((char *) lfirst(l), wqueue, lockmode);
-
-	/*
-	 * Now we can drop the existing constraints and indexes --- constraints
-	 * first, since some of them might depend on the indexes.  In fact, we
-	 * have to delete FOREIGN KEY constraints before UNIQUE constraints, but
-	 * we already ordered the constraint list to ensure that would happen. It
-	 * should be okay to use DROP_RESTRICT here, since nothing else should be
-	 * depending on these objects.
-	 */
-	foreach(l, tab->changedConstraintOids)
-	{
-		obj.classId = ConstraintRelationId;
-		obj.objectId = lfirst_oid(l);
-		obj.objectSubId = 0;
-		performDeletion(&obj, DROP_RESTRICT);
-	}
-
-	foreach(l, tab->changedIndexOids)
-	{
-		obj.classId = RelationRelationId;
-		obj.objectId = lfirst_oid(l);
-		obj.objectSubId = 0;
-		performDeletion(&obj, DROP_RESTRICT);
-	}
-
-	/*
-	 * The objects will get recreated during subsequent passes over the work
-	 * queue.
-	 */
+  ObjectAddress obj;
+  ListCell   *l;
+
+  /*
+   * Re-parse the index and constraint definitions, and attach them to the
+   * appropriate work queue entries.	We do this before dropping because in
+   * the case of a FOREIGN KEY constraint, we might not yet have exclusive
+   * lock on the table the constraint is attached to, and we need to get
+   * that before dropping.  It's safe because the parser won't actually look
+   * at the catalogs to detect the existing entry.
+   */
+  foreach(l, tab->changedIndexDefs)
+    ATPostAlterTypeParse((char *) lfirst(l), wqueue, lockmode);
+  foreach(l, tab->changedConstraintDefs)
+    ATPostAlterTypeParse((char *) lfirst(l), wqueue, lockmode);
+
+  /*
+   * Now we can drop the existing constraints and indexes --- constraints
+   * first, since some of them might depend on the indexes.  In fact, we
+   * have to delete FOREIGN KEY constraints before UNIQUE constraints, but
+   * we already ordered the constraint list to ensure that would happen. It
+   * should be okay to use DROP_RESTRICT here, since nothing else should be
+   * depending on these objects.
+   */
+  foreach(l, tab->changedConstraintOids)
+    {
+      obj.classId = ConstraintRelationId;
+      obj.objectId = lfirst_oid(l);
+      obj.objectSubId = 0;
+      performDeletion(&obj, DROP_RESTRICT);
+    }
+
+  foreach(l, tab->changedIndexOids)
+    {
+      obj.classId = RelationRelationId;
+      obj.objectId = lfirst_oid(l);
+      obj.objectSubId = 0;
+      performDeletion(&obj, DROP_RESTRICT);
+    }
+
+  /*
+   * The objects will get recreated during subsequent passes over the work
+   * queue.
+   */
 }
 
 static void
 ATPostAlterTypeParse(char *cmd, List **wqueue, LOCKMODE lockmode)
 {
-	List	   *raw_parsetree_list;
-	List	   *querytree_list;
-	ListCell   *list_item;
-
-	/*
-	 * We expect that we will get only ALTER TABLE and CREATE INDEX
-	 * statements. Hence, there is no need to pass them through
-	 * parse_analyze() or the rewriter, but instead we need to pass them
-	 * through parse_utilcmd.c to make them ready for execution.
-	 */
-	raw_parsetree_list = raw_parser(cmd);
-	querytree_list = NIL;
-	foreach(list_item, raw_parsetree_list)
-	{
-		Node	   *stmt = (Node *) lfirst(list_item);
-
-		if (IsA(stmt, IndexStmt))
-			querytree_list = lappend(querytree_list,
-									 transformIndexStmt((IndexStmt *) stmt,
-														cmd));
-		else if (IsA(stmt, AlterTableStmt))
-			querytree_list = list_concat(querytree_list,
-							 transformAlterTableStmt((AlterTableStmt *) stmt,
-													 cmd));
-		else
-			querytree_list = lappend(querytree_list, stmt);
-	}
-
-	/*
-	 * Attach each generated command to the proper place in the work queue.
-	 * Note this could result in creation of entirely new work-queue entries.
-	 */
-	foreach(list_item, querytree_list)
-	{
-		Node	   *stm = (Node *) lfirst(list_item);
-		Relation	rel;
-		AlteredTableInfo *tab;
+  List	   *raw_parsetree_list;
+  List	   *querytree_list;
+  ListCell   *list_item;
+
+  /*
+   * We expect that we will get only ALTER TABLE and CREATE INDEX
+   * statements. Hence, there is no need to pass them through
+   * parse_analyze() or the rewriter, but instead we need to pass them
+   * through parse_utilcmd.c to make them ready for execution.
+   */
+  raw_parsetree_list = raw_parser(cmd);
+  querytree_list = NIL;
+  foreach(list_item, raw_parsetree_list)
+    {
+      Node	   *stmt = (Node *) lfirst(list_item);
+
+      if (IsA(stmt, IndexStmt))
+	querytree_list = lappend(querytree_list,
+				 transformIndexStmt((IndexStmt *) stmt,
+						    cmd));
+      else if (IsA(stmt, AlterTableStmt))
+	querytree_list = list_concat(querytree_list,
+				     transformAlterTableStmt((AlterTableStmt *) stmt,
+							     cmd));
+      else
+	querytree_list = lappend(querytree_list, stmt);
+    }
+
+  /*
+   * Attach each generated command to the proper place in the work queue.
+   * Note this could result in creation of entirely new work-queue entries.
+   */
+  foreach(list_item, querytree_list)
+    {
+      Node	   *stm = (Node *) lfirst(list_item);
+      Relation	rel;
+      AlteredTableInfo *tab;
+
+      switch (nodeTag(stm))
+	{
+	case T_IndexStmt:
+	  {
+	    IndexStmt  *stmt = (IndexStmt *) stm;
+	    AlterTableCmd *newcmd;
+
+	    rel = relation_openrv(stmt->relation, lockmode);
+	    tab = ATGetQueueEntry(wqueue, rel);
+	    newcmd = makeNode(AlterTableCmd);
+	    newcmd->subtype = AT_ReAddIndex;
+	    newcmd->def = (Node *) stmt;
+	    tab->subcmds[AT_PASS_OLD_INDEX] =
+	      lappend(tab->subcmds[AT_PASS_OLD_INDEX], newcmd);
+	    relation_close(rel, NoLock);
+	    break;
+	  }
+	case T_AlterTableStmt:
+	  {
+	    AlterTableStmt *stmt = (AlterTableStmt *) stm;
+	    ListCell   *lcmd;
+
+	    rel = relation_openrv(stmt->relation, lockmode);
+	    tab = ATGetQueueEntry(wqueue, rel);
+	    foreach(lcmd, stmt->cmds)
+	      {
+		AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
 
-		switch (nodeTag(stm))
-		{
-			case T_IndexStmt:
-				{
-					IndexStmt  *stmt = (IndexStmt *) stm;
-					AlterTableCmd *newcmd;
-
-					rel = relation_openrv(stmt->relation, lockmode);
-					tab = ATGetQueueEntry(wqueue, rel);
-					newcmd = makeNode(AlterTableCmd);
-					newcmd->subtype = AT_ReAddIndex;
-					newcmd->def = (Node *) stmt;
-					tab->subcmds[AT_PASS_OLD_INDEX] =
-						lappend(tab->subcmds[AT_PASS_OLD_INDEX], newcmd);
-					relation_close(rel, NoLock);
-					break;
-				}
-			case T_AlterTableStmt:
-				{
-					AlterTableStmt *stmt = (AlterTableStmt *) stm;
-					ListCell   *lcmd;
-
-					rel = relation_openrv(stmt->relation, lockmode);
-					tab = ATGetQueueEntry(wqueue, rel);
-					foreach(lcmd, stmt->cmds)
-					{
-						AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
-
-						switch (cmd->subtype)
-						{
-							case AT_AddIndex:
-								cmd->subtype = AT_ReAddIndex;
-								tab->subcmds[AT_PASS_OLD_INDEX] =
-									lappend(tab->subcmds[AT_PASS_OLD_INDEX], cmd);
-								break;
-							case AT_AddConstraint:
-								tab->subcmds[AT_PASS_OLD_CONSTR] =
-									lappend(tab->subcmds[AT_PASS_OLD_CONSTR], cmd);
-								break;
-							default:
-								elog(ERROR, "unexpected statement type: %d",
-									 (int) cmd->subtype);
-						}
-					}
-					relation_close(rel, NoLock);
-					break;
-				}
-			default:
-				elog(ERROR, "unexpected statement type: %d",
-					 (int) nodeTag(stm));
-		}
-	}
+		switch (cmd->subtype)
+		  {
+		  case AT_AddIndex:
+		    cmd->subtype = AT_ReAddIndex;
+		    tab->subcmds[AT_PASS_OLD_INDEX] =
+		      lappend(tab->subcmds[AT_PASS_OLD_INDEX], cmd);
+		    break;
+		  case AT_AddConstraint:
+		    tab->subcmds[AT_PASS_OLD_CONSTR] =
+		      lappend(tab->subcmds[AT_PASS_OLD_CONSTR], cmd);
+		    break;
+		  default:
+		    elog(ERROR, "unexpected statement type: %d",
+			 (int) cmd->subtype);
+		  }
+	      }
+	    relation_close(rel, NoLock);
+	    break;
+	  }
+	default:
+	  elog(ERROR, "unexpected statement type: %d",
+	       (int) nodeTag(stm));
+	}
+    }
 }
 
 
@@ -7327,213 +7378,213 @@ ATPostAlterTypeParse(char *cmd, List **wqueue, LOCKMODE lockmode)
 void
 ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lockmode)
 {
-	Relation	target_rel;
-	Relation	class_rel;
-	HeapTuple	tuple;
-	Form_pg_class tuple_class;
-
-	/*
-	 * Get exclusive lock till end of transaction on the target table. Use
-	 * relation_open so that we can work on indexes and sequences.
-	 */
-	target_rel = relation_open(relationOid, lockmode);
-
-	/* Get its pg_class tuple, too */
-	class_rel = heap_open(RelationRelationId, RowExclusiveLock);
+  Relation	target_rel;
+  Relation	class_rel;
+  HeapTuple	tuple;
+  Form_pg_class tuple_class;
+
+  /*
+   * Get exclusive lock till end of transaction on the target table. Use
+   * relation_open so that we can work on indexes and sequences.
+   */
+  target_rel = relation_open(relationOid, lockmode);
+
+  /* Get its pg_class tuple, too */
+  class_rel = heap_open(RelationRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relationOid));
+  if (!HeapTupleIsValid(tuple))
+    elog(ERROR, "cache lookup failed for relation %u", relationOid);
+  tuple_class = (Form_pg_class) GETSTRUCT(tuple);
+
+  /* Can we change the ownership of this tuple? */
+  switch (tuple_class->relkind)
+    {
+    case RELKIND_RELATION:
+    case RELKIND_VIEW:
+    case RELKIND_FOREIGN_TABLE:
+      /* ok to change owner */
+      break;
+    case RELKIND_INDEX:
+      if (!recursing)
+	{
+	  /*
+	   * Because ALTER INDEX OWNER used to be allowed, and in fact
+	   * is generated by old versions of pg_dump, we give a warning
+	   * and do nothing rather than erroring out.  Also, to avoid
+	   * unnecessary chatter while restoring those old dumps, say
+	   * nothing at all if the command would be a no-op anyway.
+	   */
+	  if (tuple_class->relowner != newOwnerId)
+	    ereport(WARNING,
+		    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		     errmsg("cannot change owner of index \"%s\"",
+			    NameStr(tuple_class->relname)),
+		     errhint("Change the ownership of the index's table, instead.")));
+	  /* quick hack to exit via the no-op path */
+	  newOwnerId = tuple_class->relowner;
+	}
+      break;
+    case RELKIND_SEQUENCE:
+      if (!recursing &&
+	  tuple_class->relowner != newOwnerId)
+	{
+	  /* if it's an owned sequence, disallow changing it by itself */
+	  Oid			tableId;
+	  int32		colId;
+
+	  if (sequenceIsOwned(relationOid, &tableId, &colId))
+	    ereport(ERROR,
+		    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		     errmsg("cannot change owner of sequence \"%s\"",
+			    NameStr(tuple_class->relname)),
+		     errdetail("Sequence \"%s\" is linked to table \"%s\".",
+			       NameStr(tuple_class->relname),
+			       get_rel_name(tableId))));
+	}
+      break;
+    case RELKIND_COMPOSITE_TYPE:
+      if (recursing)
+	break;
+      ereport(ERROR,
+	      (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	       errmsg("\"%s\" is a composite type",
+		      NameStr(tuple_class->relname)),
+	       errhint("Use ALTER TYPE instead.")));
+      break;
+    case RELKIND_TOASTVALUE:
+      if (recursing)
+	break;
+      /* FALL THRU */
+    default:
+      ereport(ERROR,
+	      (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	       errmsg("\"%s\" is not a table, view, sequence, or foreign table",
+		      NameStr(tuple_class->relname))));
+    }
+
+  /*
+   * If the new owner is the same as the existing owner, consider the
+   * command to have succeeded.  This is for dump restoration purposes.
+   */
+  if (tuple_class->relowner != newOwnerId)
+    {
+      Datum		repl_val[Natts_pg_class];
+      bool		repl_null[Natts_pg_class];
+      bool		repl_repl[Natts_pg_class];
+      Acl		   *newAcl;
+      Datum		aclDatum;
+      bool		isNull;
+      HeapTuple	newtuple;
+
+      /* skip permission checks when recursing to index or toast table */
+      if (!recursing)
+	{
+	  /* Superusers can always do it */
+	  if (!superuser())
+	    {
+	      Oid			namespaceOid = tuple_class->relnamespace;
+	      AclResult	aclresult;
+
+	      /* Otherwise, must be owner of the existing object */
+	      if (!pg_class_ownercheck(relationOid, GetUserId()))
+		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+			       RelationGetRelationName(target_rel));
 
-	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relationOid));
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for relation %u", relationOid);
-	tuple_class = (Form_pg_class) GETSTRUCT(tuple);
+	      /* Must be able to become new owner */
+	      check_is_member_of_role(GetUserId(), newOwnerId);
 
-	/* Can we change the ownership of this tuple? */
-	switch (tuple_class->relkind)
-	{
-		case RELKIND_RELATION:
-		case RELKIND_VIEW:
-		case RELKIND_FOREIGN_TABLE:
-			/* ok to change owner */
-			break;
-		case RELKIND_INDEX:
-			if (!recursing)
-			{
-				/*
-				 * Because ALTER INDEX OWNER used to be allowed, and in fact
-				 * is generated by old versions of pg_dump, we give a warning
-				 * and do nothing rather than erroring out.  Also, to avoid
-				 * unnecessary chatter while restoring those old dumps, say
-				 * nothing at all if the command would be a no-op anyway.
-				 */
-				if (tuple_class->relowner != newOwnerId)
-					ereport(WARNING,
-							(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-							 errmsg("cannot change owner of index \"%s\"",
-									NameStr(tuple_class->relname)),
-							 errhint("Change the ownership of the index's table, instead.")));
-				/* quick hack to exit via the no-op path */
-				newOwnerId = tuple_class->relowner;
-			}
-			break;
-		case RELKIND_SEQUENCE:
-			if (!recursing &&
-				tuple_class->relowner != newOwnerId)
-			{
-				/* if it's an owned sequence, disallow changing it by itself */
-				Oid			tableId;
-				int32		colId;
-
-				if (sequenceIsOwned(relationOid, &tableId, &colId))
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("cannot change owner of sequence \"%s\"",
-									NameStr(tuple_class->relname)),
-					  errdetail("Sequence \"%s\" is linked to table \"%s\".",
-								NameStr(tuple_class->relname),
-								get_rel_name(tableId))));
-			}
-			break;
-		case RELKIND_COMPOSITE_TYPE:
-			if (recursing)
-				break;
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("\"%s\" is a composite type",
-							NameStr(tuple_class->relname)),
-					 errhint("Use ALTER TYPE instead.")));
-			break;
-		case RELKIND_TOASTVALUE:
-			if (recursing)
-				break;
-			/* FALL THRU */
-		default:
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			errmsg("\"%s\" is not a table, view, sequence, or foreign table",
-				   NameStr(tuple_class->relname))));
+	      /* New owner must have CREATE privilege on namespace */
+	      aclresult = pg_namespace_aclcheck(namespaceOid, newOwnerId,
+						ACL_CREATE);
+	      if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+			       get_namespace_name(namespaceOid));
+	    }
 	}
 
-	/*
-	 * If the new owner is the same as the existing owner, consider the
-	 * command to have succeeded.  This is for dump restoration purposes.
-	 */
-	if (tuple_class->relowner != newOwnerId)
-	{
-		Datum		repl_val[Natts_pg_class];
-		bool		repl_null[Natts_pg_class];
-		bool		repl_repl[Natts_pg_class];
-		Acl		   *newAcl;
-		Datum		aclDatum;
-		bool		isNull;
-		HeapTuple	newtuple;
-
-		/* skip permission checks when recursing to index or toast table */
-		if (!recursing)
-		{
-			/* Superusers can always do it */
-			if (!superuser())
-			{
-				Oid			namespaceOid = tuple_class->relnamespace;
-				AclResult	aclresult;
-
-				/* Otherwise, must be owner of the existing object */
-				if (!pg_class_ownercheck(relationOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
-								   RelationGetRelationName(target_rel));
-
-				/* Must be able to become new owner */
-				check_is_member_of_role(GetUserId(), newOwnerId);
-
-				/* New owner must have CREATE privilege on namespace */
-				aclresult = pg_namespace_aclcheck(namespaceOid, newOwnerId,
-												  ACL_CREATE);
-				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
-								   get_namespace_name(namespaceOid));
-			}
-		}
-
-		memset(repl_null, false, sizeof(repl_null));
-		memset(repl_repl, false, sizeof(repl_repl));
+      memset(repl_null, false, sizeof(repl_null));
+      memset(repl_repl, false, sizeof(repl_repl));
 
-		repl_repl[Anum_pg_class_relowner - 1] = true;
-		repl_val[Anum_pg_class_relowner - 1] = ObjectIdGetDatum(newOwnerId);
+      repl_repl[Anum_pg_class_relowner - 1] = true;
+      repl_val[Anum_pg_class_relowner - 1] = ObjectIdGetDatum(newOwnerId);
 
-		/*
-		 * Determine the modified ACL for the new owner.  This is only
-		 * necessary when the ACL is non-null.
-		 */
-		aclDatum = SysCacheGetAttr(RELOID, tuple,
-								   Anum_pg_class_relacl,
-								   &isNull);
-		if (!isNull)
-		{
-			newAcl = aclnewowner(DatumGetAclP(aclDatum),
-								 tuple_class->relowner, newOwnerId);
-			repl_repl[Anum_pg_class_relacl - 1] = true;
-			repl_val[Anum_pg_class_relacl - 1] = PointerGetDatum(newAcl);
-		}
+      /*
+       * Determine the modified ACL for the new owner.  This is only
+       * necessary when the ACL is non-null.
+       */
+      aclDatum = SysCacheGetAttr(RELOID, tuple,
+				 Anum_pg_class_relacl,
+				 &isNull);
+      if (!isNull)
+	{
+	  newAcl = aclnewowner(DatumGetAclP(aclDatum),
+			       tuple_class->relowner, newOwnerId);
+	  repl_repl[Anum_pg_class_relacl - 1] = true;
+	  repl_val[Anum_pg_class_relacl - 1] = PointerGetDatum(newAcl);
+	}
 
-		newtuple = heap_modify_tuple(tuple, RelationGetDescr(class_rel), repl_val, repl_null, repl_repl);
+      newtuple = heap_modify_tuple(tuple, RelationGetDescr(class_rel), repl_val, repl_null, repl_repl);
 
-		simple_heap_update(class_rel, &newtuple->t_self, newtuple);
-		CatalogUpdateIndexes(class_rel, newtuple);
+      simple_heap_update(class_rel, &newtuple->t_self, newtuple);
+      CatalogUpdateIndexes(class_rel, newtuple);
 
-		heap_freetuple(newtuple);
+      heap_freetuple(newtuple);
 
-		/*
-		 * Update owner dependency reference, if any.  A composite type has
-		 * none, because it's tracked for the pg_type entry instead of here;
-		 * indexes and TOAST tables don't have their own entries either.
-		 */
-		if (tuple_class->relkind != RELKIND_COMPOSITE_TYPE &&
-			tuple_class->relkind != RELKIND_INDEX &&
-			tuple_class->relkind != RELKIND_TOASTVALUE)
-			changeDependencyOnOwner(RelationRelationId, relationOid,
-									newOwnerId);
+      /*
+       * Update owner dependency reference, if any.  A composite type has
+       * none, because it's tracked for the pg_type entry instead of here;
+       * indexes and TOAST tables don't have their own entries either.
+       */
+      if (tuple_class->relkind != RELKIND_COMPOSITE_TYPE &&
+	  tuple_class->relkind != RELKIND_INDEX &&
+	  tuple_class->relkind != RELKIND_TOASTVALUE)
+	changeDependencyOnOwner(RelationRelationId, relationOid,
+				newOwnerId);
 
-		/*
-		 * Also change the ownership of the table's rowtype, if it has one
-		 */
-		if (tuple_class->relkind != RELKIND_INDEX)
-			AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
-							 tuple_class->relkind == RELKIND_COMPOSITE_TYPE);
+      /*
+       * Also change the ownership of the table's row type, if it has one
+       */
+      if (tuple_class->relkind != RELKIND_INDEX)
+	AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
+			       tuple_class->relkind == RELKIND_COMPOSITE_TYPE);
 
-		/*
-		 * If we are operating on a table, also change the ownership of any
-		 * indexes and sequences that belong to the table, as well as the
-		 * table's toast table (if it has one)
-		 */
-		if (tuple_class->relkind == RELKIND_RELATION ||
-			tuple_class->relkind == RELKIND_TOASTVALUE)
-		{
-			List	   *index_oid_list;
-			ListCell   *i;
+      /*
+       * If we are operating on a table, also change the ownership of any
+       * indexes and sequences that belong to the table, as well as the
+       * table's toast table (if it has one)
+       */
+      if (tuple_class->relkind == RELKIND_RELATION ||
+	  tuple_class->relkind == RELKIND_TOASTVALUE)
+	{
+	  List	   *index_oid_list;
+	  ListCell   *i;
 
-			/* Find all the indexes belonging to this relation */
-			index_oid_list = RelationGetIndexList(target_rel);
+	  /* Find all the indexes belonging to this relation */
+	  index_oid_list = RelationGetIndexList(target_rel);
 
-			/* For each index, recursively change its ownership */
-			foreach(i, index_oid_list)
-				ATExecChangeOwner(lfirst_oid(i), newOwnerId, true, lockmode);
+	  /* For each index, recursively change its ownership */
+	  foreach(i, index_oid_list)
+	    ATExecChangeOwner(lfirst_oid(i), newOwnerId, true, lockmode);
 
-			list_free(index_oid_list);
-		}
+	  list_free(index_oid_list);
+	}
 
-		if (tuple_class->relkind == RELKIND_RELATION)
-		{
-			/* If it has a toast table, recurse to change its ownership */
-			if (tuple_class->reltoastrelid != InvalidOid)
-				ATExecChangeOwner(tuple_class->reltoastrelid, newOwnerId,
-								  true, lockmode);
+      if (tuple_class->relkind == RELKIND_RELATION)
+	{
+	  /* If it has a toast table, recurse to change its ownership */
+	  if (tuple_class->reltoastrelid != InvalidOid)
+	    ATExecChangeOwner(tuple_class->reltoastrelid, newOwnerId,
+			      true, lockmode);
 
-			/* If it has dependent sequences, recurse to change them too */
-			change_owner_recurse_to_sequences(relationOid, newOwnerId, lockmode);
-		}
+	  /* If it has dependent sequences, recurse to change them too */
+	  change_owner_recurse_to_sequences(relationOid, newOwnerId, lockmode);
 	}
+    }
 
-	ReleaseSysCache(tuple);
-	heap_close(class_rel, RowExclusiveLock);
-	relation_close(target_rel, NoLock);
+  ReleaseSysCache(tuple);
+  heap_close(class_rel, RowExclusiveLock);
+  relation_close(target_rel, NoLock);
 }
 
 /*
@@ -7546,63 +7597,63 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 static void
 change_owner_recurse_to_sequences(Oid relationOid, Oid newOwnerId, LOCKMODE lockmode)
 {
-	Relation	depRel;
-	SysScanDesc scan;
-	ScanKeyData key[2];
-	HeapTuple	tup;
-
-	/*
-	 * SERIAL sequences are those having an auto dependency on one of the
-	 * table's columns (we don't care *which* column, exactly).
-	 */
-	depRel = heap_open(DependRelationId, AccessShareLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_depend_refclassid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationRelationId));
-	ScanKeyInit(&key[1],
-				Anum_pg_depend_refobjid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relationOid));
-	/* we leave refobjsubid unspecified */
-
-	scan = systable_beginscan(depRel, DependReferenceIndexId, true,
-							  SnapshotNow, 2, key);
-
-	while (HeapTupleIsValid(tup = systable_getnext(scan)))
-	{
-		Form_pg_depend depForm = (Form_pg_depend) GETSTRUCT(tup);
-		Relation	seqRel;
-
-		/* skip dependencies other than auto dependencies on columns */
-		if (depForm->refobjsubid == 0 ||
-			depForm->classid != RelationRelationId ||
-			depForm->objsubid != 0 ||
-			depForm->deptype != DEPENDENCY_AUTO)
-			continue;
-
-		/* Use relation_open just in case it's an index */
-		seqRel = relation_open(depForm->objid, lockmode);
-
-		/* skip non-sequence relations */
-		if (RelationGetForm(seqRel)->relkind != RELKIND_SEQUENCE)
-		{
-			/* No need to keep the lock */
-			relation_close(seqRel, lockmode);
-			continue;
-		}
-
-		/* We don't need to close the sequence while we alter it. */
-		ATExecChangeOwner(depForm->objid, newOwnerId, true, lockmode);
-
-		/* Now we can close it.  Keep the lock till end of transaction. */
-		relation_close(seqRel, NoLock);
-	}
-
-	systable_endscan(scan);
-
-	relation_close(depRel, AccessShareLock);
+  Relation	depRel;
+  SysScanDesc scan;
+  ScanKeyData key[2];
+  HeapTuple	tup;
+
+  /*
+   * SERIAL sequences are those having an auto dependency on one of the
+   * table's columns (we don't care *which* column, exactly).
+   */
+  depRel = heap_open(DependRelationId, AccessShareLock);
+
+  ScanKeyInit(&key[0],
+	      Anum_pg_depend_refclassid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationRelationId));
+  ScanKeyInit(&key[1],
+	      Anum_pg_depend_refobjid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relationOid));
+  /* we leave refobjsubid unspecified */
+
+  scan = systable_beginscan(depRel, DependReferenceIndexId, true,
+			    SnapshotNow, 2, key);
+
+  while (HeapTupleIsValid(tup = systable_getnext(scan)))
+    {
+      Form_pg_depend depForm = (Form_pg_depend) GETSTRUCT(tup);
+      Relation	seqRel;
+
+      /* skip dependencies other than auto dependencies on columns */
+      if (depForm->refobjsubid == 0 ||
+	  depForm->classid != RelationRelationId ||
+	  depForm->objsubid != 0 ||
+	  depForm->deptype != DEPENDENCY_AUTO)
+	continue;
+
+      /* Use relation_open just in case it's an index */
+      seqRel = relation_open(depForm->objid, lockmode);
+
+      /* skip non-sequence relations */
+      if (RelationGetForm(seqRel)->relkind != RELKIND_SEQUENCE)
+	{
+	  /* No need to keep the lock */
+	  relation_close(seqRel, lockmode);
+	  continue;
+	}
+
+      /* We don't need to close the sequence while we alter it. */
+      ATExecChangeOwner(depForm->objid, newOwnerId, true, lockmode);
+
+      /* Now we can close it.  Keep the lock till end of transaction. */
+      relation_close(seqRel, NoLock);
+    }
+
+  systable_endscan(scan);
+
+  relation_close(depRel, AccessShareLock);
 }
 
 /*
@@ -7613,21 +7664,21 @@ change_owner_recurse_to_sequences(Oid relationOid, Oid newOwnerId, LOCKMODE lock
 static void
 ATExecClusterOn(Relation rel, const char *indexName, LOCKMODE lockmode)
 {
-	Oid			indexOid;
+  Oid			indexOid;
 
-	indexOid = get_relname_relid(indexName, rel->rd_rel->relnamespace);
+  indexOid = get_relname_relid(indexName, rel->rd_rel->relnamespace);
 
-	if (!OidIsValid(indexOid))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("index \"%s\" for table \"%s\" does not exist",
-						indexName, RelationGetRelationName(rel))));
+  if (!OidIsValid(indexOid))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_OBJECT),
+	     errmsg("index \"%s\" for table \"%s\" does not exist",
+		    indexName, RelationGetRelationName(rel))));
 
-	/* Check index is valid to cluster on */
-	check_index_is_clusterable(rel, indexOid, false, lockmode);
+  /* Check index is valid to cluster on */
+  check_index_is_clusterable(rel, indexOid, false, lockmode);
 
-	/* And do the work */
-	mark_index_clustered(rel, indexOid);
+  /* And do the work */
+  mark_index_clustered(rel, indexOid);
 }
 
 /*
@@ -7639,7 +7690,7 @@ ATExecClusterOn(Relation rel, const char *indexName, LOCKMODE lockmode)
 static void
 ATExecDropCluster(Relation rel, LOCKMODE lockmode)
 {
-	mark_index_clustered(rel, InvalidOid);
+  mark_index_clustered(rel, InvalidOid);
 }
 
 /*
@@ -7648,23 +7699,23 @@ ATExecDropCluster(Relation rel, LOCKMODE lockmode)
 static void
 ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename, LOCKMODE lockmode)
 {
-	Oid			tablespaceId;
-	AclResult	aclresult;
-
-	/* Check that the tablespace exists */
-	tablespaceId = get_tablespace_oid(tablespacename, false);
-
-	/* Check its permissions */
-	aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(), ACL_CREATE);
-	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_TABLESPACE, tablespacename);
-
-	/* Save info for Phase 3 to do the real work */
-	if (OidIsValid(tab->newTableSpace))
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-				 errmsg("cannot have multiple SET TABLESPACE subcommands")));
-	tab->newTableSpace = tablespaceId;
+  Oid			tablespaceId;
+  AclResult	aclresult;
+
+  /* Check that the tablespace exists */
+  tablespaceId = get_tablespace_oid(tablespacename, false);
+
+  /* Check its permissions */
+  aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(), ACL_CREATE);
+  if (aclresult != ACLCHECK_OK)
+    aclcheck_error(aclresult, ACL_KIND_TABLESPACE, tablespacename);
+
+  /* Save info for Phase 3 to do the real work */
+  if (OidIsValid(tab->newTableSpace))
+    ereport(ERROR,
+	    (errcode(ERRCODE_SYNTAX_ERROR),
+	     errmsg("cannot have multiple SET TABLESPACE subcommands")));
+  tab->newTableSpace = tablespaceId;
 }
 
 /*
@@ -7673,125 +7724,125 @@ ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename, L
 static void
 ATExecSetRelOptions(Relation rel, List *defList, bool isReset, LOCKMODE lockmode)
 {
-	Oid			relid;
-	Relation	pgclass;
-	HeapTuple	tuple;
-	HeapTuple	newtuple;
-	Datum		datum;
-	bool		isnull;
-	Datum		newOptions;
-	Datum		repl_val[Natts_pg_class];
-	bool		repl_null[Natts_pg_class];
-	bool		repl_repl[Natts_pg_class];
-	static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
-
-	if (defList == NIL)
-		return;					/* nothing to do */
-
-	pgclass = heap_open(RelationRelationId, RowExclusiveLock);
-
-	/* Get the old reloptions */
-	relid = RelationGetRelid(rel);
-	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for relation %u", relid);
-
-	datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions, &isnull);
-
-	/* Generate new proposed reloptions (text array) */
-	newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
-								   defList, NULL, validnsps, false, isReset);
-
-	/* Validate */
-	switch (rel->rd_rel->relkind)
-	{
-		case RELKIND_RELATION:
-		case RELKIND_TOASTVALUE:
-			(void) heap_reloptions(rel->rd_rel->relkind, newOptions, true);
-			break;
-		case RELKIND_INDEX:
-			(void) index_reloptions(rel->rd_am->amoptions, newOptions, true);
-			break;
-		default:
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("\"%s\" is not a table, index, or TOAST table",
-							RelationGetRelationName(rel))));
-			break;
-	}
+  Oid			relid;
+  Relation	pgclass;
+  HeapTuple	tuple;
+  HeapTuple	newtuple;
+  Datum		datum;
+  bool		isnull;
+  Datum		newOptions;
+  Datum		repl_val[Natts_pg_class];
+  bool		repl_null[Natts_pg_class];
+  bool		repl_repl[Natts_pg_class];
+  static char *validnsps[] = HEAP_RELOPT_NAMESPACES;
+
+  if (defList == NIL)
+    return;					/* nothing to do */
 
-	/*
-	 * All we need do here is update the pg_class row; the new options will be
-	 * propagated into relcaches during post-commit cache inval.
-	 */
-	memset(repl_val, 0, sizeof(repl_val));
-	memset(repl_null, false, sizeof(repl_null));
-	memset(repl_repl, false, sizeof(repl_repl));
+  pgclass = heap_open(RelationRelationId, RowExclusiveLock);
 
-	if (newOptions != (Datum) 0)
-		repl_val[Anum_pg_class_reloptions - 1] = newOptions;
-	else
-		repl_null[Anum_pg_class_reloptions - 1] = true;
+  /* Get the old reloptions */
+  relid = RelationGetRelid(rel);
+  tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
+  if (!HeapTupleIsValid(tuple))
+    elog(ERROR, "cache lookup failed for relation %u", relid);
 
-	repl_repl[Anum_pg_class_reloptions - 1] = true;
+  datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions, &isnull);
 
-	newtuple = heap_modify_tuple(tuple, RelationGetDescr(pgclass),
-								 repl_val, repl_null, repl_repl);
+  /* Generate new proposed reloptions (text array) */
+  newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
+				   defList, NULL, validnsps, false, isReset);
 
-	simple_heap_update(pgclass, &newtuple->t_self, newtuple);
+  /* Validate */
+  switch (rel->rd_rel->relkind)
+    {
+    case RELKIND_RELATION:
+    case RELKIND_TOASTVALUE:
+      (void) heap_reloptions(rel->rd_rel->relkind, newOptions, true);
+      break;
+    case RELKIND_INDEX:
+      (void) index_reloptions(rel->rd_am->amoptions, newOptions, true);
+      break;
+    default:
+      ereport(ERROR,
+	      (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	       errmsg("\"%s\" is not a table, index, or TOAST table",
+		      RelationGetRelationName(rel))));
+      break;
+    }
 
-	CatalogUpdateIndexes(pgclass, newtuple);
+  /*
+   * All we need do here is update the pg_class row; the new options will be
+   * propagated into relcaches during post-commit cache inval.
+   */
+  memset(repl_val, 0, sizeof(repl_val));
+  memset(repl_null, false, sizeof(repl_null));
+  memset(repl_repl, false, sizeof(repl_repl));
 
-	heap_freetuple(newtuple);
+  if (newOptions != (Datum) 0)
+    repl_val[Anum_pg_class_reloptions - 1] = newOptions;
+  else
+    repl_null[Anum_pg_class_reloptions - 1] = true;
 
-	ReleaseSysCache(tuple);
+  repl_repl[Anum_pg_class_reloptions - 1] = true;
 
-	/* repeat the whole exercise for the toast table, if there's one */
-	if (OidIsValid(rel->rd_rel->reltoastrelid))
-	{
-		Relation	toastrel;
-		Oid			toastid = rel->rd_rel->reltoastrelid;
+  newtuple = heap_modify_tuple(tuple, RelationGetDescr(pgclass),
+			       repl_val, repl_null, repl_repl);
 
-		toastrel = heap_open(toastid, lockmode);
+  simple_heap_update(pgclass, &newtuple->t_self, newtuple);
 
-		/* Get the old reloptions */
-		tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(toastid));
-		if (!HeapTupleIsValid(tuple))
-			elog(ERROR, "cache lookup failed for relation %u", toastid);
+  CatalogUpdateIndexes(pgclass, newtuple);
 
-		datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions, &isnull);
+  heap_freetuple(newtuple);
 
-		newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
-								defList, "toast", validnsps, false, isReset);
+  ReleaseSysCache(tuple);
 
-		(void) heap_reloptions(RELKIND_TOASTVALUE, newOptions, true);
+  /* repeat the whole exercise for the toast table, if there's one */
+  if (OidIsValid(rel->rd_rel->reltoastrelid))
+    {
+      Relation	toastrel;
+      Oid			toastid = rel->rd_rel->reltoastrelid;
 
-		memset(repl_val, 0, sizeof(repl_val));
-		memset(repl_null, false, sizeof(repl_null));
-		memset(repl_repl, false, sizeof(repl_repl));
+      toastrel = heap_open(toastid, lockmode);
 
-		if (newOptions != (Datum) 0)
-			repl_val[Anum_pg_class_reloptions - 1] = newOptions;
-		else
-			repl_null[Anum_pg_class_reloptions - 1] = true;
+      /* Get the old reloptions */
+      tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(toastid));
+      if (!HeapTupleIsValid(tuple))
+	elog(ERROR, "cache lookup failed for relation %u", toastid);
 
-		repl_repl[Anum_pg_class_reloptions - 1] = true;
+      datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions, &isnull);
 
-		newtuple = heap_modify_tuple(tuple, RelationGetDescr(pgclass),
-									 repl_val, repl_null, repl_repl);
+      newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
+				       defList, "toast", validnsps, false, isReset);
 
-		simple_heap_update(pgclass, &newtuple->t_self, newtuple);
+      (void) heap_reloptions(RELKIND_TOASTVALUE, newOptions, true);
 
-		CatalogUpdateIndexes(pgclass, newtuple);
+      memset(repl_val, 0, sizeof(repl_val));
+      memset(repl_null, false, sizeof(repl_null));
+      memset(repl_repl, false, sizeof(repl_repl));
 
-		heap_freetuple(newtuple);
+      if (newOptions != (Datum) 0)
+	repl_val[Anum_pg_class_reloptions - 1] = newOptions;
+      else
+	repl_null[Anum_pg_class_reloptions - 1] = true;
 
-		ReleaseSysCache(tuple);
+      repl_repl[Anum_pg_class_reloptions - 1] = true;
 
-		heap_close(toastrel, NoLock);
-	}
+      newtuple = heap_modify_tuple(tuple, RelationGetDescr(pgclass),
+				   repl_val, repl_null, repl_repl);
+
+      simple_heap_update(pgclass, &newtuple->t_self, newtuple);
+
+      CatalogUpdateIndexes(pgclass, newtuple);
 
-	heap_close(pgclass, RowExclusiveLock);
+      heap_freetuple(newtuple);
+
+      ReleaseSysCache(tuple);
+
+      heap_close(toastrel, NoLock);
+    }
+
+  heap_close(pgclass, RowExclusiveLock);
 }
 
 /*
@@ -7801,141 +7852,141 @@ ATExecSetRelOptions(Relation rel, List *defList, bool isReset, LOCKMODE lockmode
 static void
 ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode)
 {
-	Relation	rel;
-	Oid			oldTableSpace;
-	Oid			reltoastrelid;
-	Oid			reltoastidxid;
-	Oid			newrelfilenode;
-	RelFileNode newrnode;
-	SMgrRelation dstrel;
-	Relation	pg_class;
-	HeapTuple	tuple;
-	Form_pg_class rd_rel;
-	ForkNumber	forkNum;
-
-	/*
-	 * Need lock here in case we are recursing to toast table or index
-	 */
-	rel = relation_open(tableOid, lockmode);
-
-	/*
-	 * No work if no change in tablespace.
-	 */
-	oldTableSpace = rel->rd_rel->reltablespace;
-	if (newTableSpace == oldTableSpace ||
-		(newTableSpace == MyDatabaseTableSpace && oldTableSpace == 0))
-	{
-		relation_close(rel, NoLock);
-		return;
-	}
-
-	/*
-	 * We cannot support moving mapped relations into different tablespaces.
-	 * (In particular this eliminates all shared catalogs.)
-	 */
-	if (RelationIsMapped(rel))
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot move system relation \"%s\"",
-						RelationGetRelationName(rel))));
-
-	/* Can't move a non-shared relation into pg_global */
-	if (newTableSpace == GLOBALTABLESPACE_OID)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("only shared relations can be placed in pg_global tablespace")));
-
-	/*
-	 * Don't allow moving temp tables of other backends ... their local buffer
-	 * manager is not going to cope.
-	 */
-	if (RELATION_IS_OTHER_TEMP(rel))
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot move temporary tables of other sessions")));
-
-	reltoastrelid = rel->rd_rel->reltoastrelid;
-	reltoastidxid = rel->rd_rel->reltoastidxid;
-
-	/* Get a modifiable copy of the relation's pg_class row */
-	pg_class = heap_open(RelationRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(tableOid));
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for relation %u", tableOid);
-	rd_rel = (Form_pg_class) GETSTRUCT(tuple);
-
-	/*
-	 * Since we copy the file directly without looking at the shared buffers,
-	 * we'd better first flush out any pages of the source relation that are
-	 * in shared buffers.  We assume no new changes will be made while we are
-	 * holding exclusive lock on the rel.
-	 */
-	FlushRelationBuffers(rel);
-
-	/*
-	 * Relfilenodes are not unique across tablespaces, so we need to allocate
-	 * a new one in the new tablespace.
-	 */
-	newrelfilenode = GetNewRelFileNode(newTableSpace, NULL,
-									   rel->rd_rel->relpersistence);
-
-	/* Open old and new relation */
-	newrnode = rel->rd_node;
-	newrnode.relNode = newrelfilenode;
-	newrnode.spcNode = newTableSpace;
-	dstrel = smgropen(newrnode, rel->rd_backend);
-
-	RelationOpenSmgr(rel);
-
-	/*
-	 * Create and copy all forks of the relation, and schedule unlinking of
-	 * old physical files.
-	 *
-	 * NOTE: any conflict in relfilenode value will be caught in
-	 * RelationCreateStorage().
-	 */
-	RelationCreateStorage(newrnode, rel->rd_rel->relpersistence);
-
-	/* copy main fork */
-	copy_relation_data(rel->rd_smgr, dstrel, MAIN_FORKNUM,
-					   rel->rd_rel->relpersistence);
-
-	/* copy those extra forks that exist */
-	for (forkNum = MAIN_FORKNUM + 1; forkNum <= MAX_FORKNUM; forkNum++)
-	{
-		if (smgrexists(rel->rd_smgr, forkNum))
-		{
-			smgrcreate(dstrel, forkNum, false);
-			copy_relation_data(rel->rd_smgr, dstrel, forkNum,
-							   rel->rd_rel->relpersistence);
-		}
-	}
-
-	/* drop old relation, and close new one */
-	RelationDropStorage(rel);
-	smgrclose(dstrel);
-
-	/* update the pg_class row */
-	rd_rel->reltablespace = (newTableSpace == MyDatabaseTableSpace) ? InvalidOid : newTableSpace;
-	rd_rel->relfilenode = newrelfilenode;
-	simple_heap_update(pg_class, &tuple->t_self, tuple);
-	CatalogUpdateIndexes(pg_class, tuple);
-
-	heap_freetuple(tuple);
-
-	heap_close(pg_class, RowExclusiveLock);
-
-	relation_close(rel, NoLock);
-
-	/* Make sure the reltablespace change is visible */
-	CommandCounterIncrement();
-
-	/* Move associated toast relation and/or index, too */
-	if (OidIsValid(reltoastrelid))
-		ATExecSetTableSpace(reltoastrelid, newTableSpace, lockmode);
-	if (OidIsValid(reltoastidxid))
-		ATExecSetTableSpace(reltoastidxid, newTableSpace, lockmode);
+  Relation	rel;
+  Oid			oldTableSpace;
+  Oid			reltoastrelid;
+  Oid			reltoastidxid;
+  Oid			newrelfilenode;
+  RelFileNode newrnode;
+  SMgrRelation dstrel;
+  Relation	pg_class;
+  HeapTuple	tuple;
+  Form_pg_class rd_rel;
+  ForkNumber	forkNum;
+
+  /*
+   * Need lock here in case we are recursing to toast table or index
+   */
+  rel = relation_open(tableOid, lockmode);
+
+  /*
+   * No work if no change in tablespace.
+   */
+  oldTableSpace = rel->rd_rel->reltablespace;
+  if (newTableSpace == oldTableSpace ||
+      (newTableSpace == MyDatabaseTableSpace && oldTableSpace == 0))
+    {
+      relation_close(rel, NoLock);
+      return;
+    }
+
+  /*
+   * We cannot support moving mapped relations into different tablespaces.
+   * (In particular this eliminates all shared catalogs.)
+   */
+  if (RelationIsMapped(rel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot move system relation \"%s\"",
+		    RelationGetRelationName(rel))));
+
+  /* Can't move a non-shared relation into pg_global */
+  if (newTableSpace == GLOBALTABLESPACE_OID)
+    ereport(ERROR,
+	    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+	     errmsg("only shared relations can be placed in pg_global tablespace")));
+
+  /*
+   * Don't allow moving temp tables of other backends ... their local buffer
+   * manager is not going to cope.
+   */
+  if (RELATION_IS_OTHER_TEMP(rel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+	     errmsg("cannot move temporary tables of other sessions")));
+
+  reltoastrelid = rel->rd_rel->reltoastrelid;
+  reltoastidxid = rel->rd_rel->reltoastidxid;
+
+  /* Get a modifiable copy of the relation's pg_class row */
+  pg_class = heap_open(RelationRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(tableOid));
+  if (!HeapTupleIsValid(tuple))
+    elog(ERROR, "cache lookup failed for relation %u", tableOid);
+  rd_rel = (Form_pg_class) GETSTRUCT(tuple);
+
+  /*
+   * Since we copy the file directly without looking at the shared buffers,
+   * we'd better first flush out any pages of the source relation that are
+   * in shared buffers.  We assume no new changes will be made while we are
+   * holding exclusive lock on the rel.
+   */
+  FlushRelationBuffers(rel);
+
+  /*
+   * Relfilenodes are not unique across tablespaces, so we need to allocate
+   * a new one in the new tablespace.
+   */
+  newrelfilenode = GetNewRelFileNode(newTableSpace, NULL,
+				     rel->rd_rel->relpersistence);
+
+  /* Open old and new relation */
+  newrnode = rel->rd_node;
+  newrnode.relNode = newrelfilenode;
+  newrnode.spcNode = newTableSpace;
+  dstrel = smgropen(newrnode, rel->rd_backend);
+
+  RelationOpenSmgr(rel);
+
+  /*
+   * Create and copy all forks of the relation, and schedule unlinking of
+   * old physical files.
+   *
+   * NOTE: any conflict in relfilenode value will be caught in
+   * RelationCreateStorage().
+   */
+  RelationCreateStorage(newrnode, rel->rd_rel->relpersistence);
+
+  /* copy main fork */
+  copy_relation_data(rel->rd_smgr, dstrel, MAIN_FORKNUM,
+		     rel->rd_rel->relpersistence);
+
+  /* copy those extra forks that exist */
+  for (forkNum = MAIN_FORKNUM + 1; forkNum <= MAX_FORKNUM; forkNum++)
+    {
+      if (smgrexists(rel->rd_smgr, forkNum))
+	{
+	  smgrcreate(dstrel, forkNum, false);
+	  copy_relation_data(rel->rd_smgr, dstrel, forkNum,
+			     rel->rd_rel->relpersistence);
+	}
+    }
+
+  /* drop old relation, and close new one */
+  RelationDropStorage(rel);
+  smgrclose(dstrel);
+
+  /* update the pg_class row */
+  rd_rel->reltablespace = (newTableSpace == MyDatabaseTableSpace) ? InvalidOid : newTableSpace;
+  rd_rel->relfilenode = newrelfilenode;
+  simple_heap_update(pg_class, &tuple->t_self, tuple);
+  CatalogUpdateIndexes(pg_class, tuple);
+
+  heap_freetuple(tuple);
+
+  heap_close(pg_class, RowExclusiveLock);
+
+  relation_close(rel, NoLock);
+
+  /* Make sure the reltablespace change is visible */
+  CommandCounterIncrement();
+
+  /* Move associated toast relation and/or index, too */
+  if (OidIsValid(reltoastrelid))
+    ATExecSetTableSpace(reltoastrelid, newTableSpace, lockmode);
+  if (OidIsValid(reltoastidxid))
+    ATExecSetTableSpace(reltoastidxid, newTableSpace, lockmode);
 }
 
 /*
@@ -7943,68 +7994,68 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode)
  */
 static void
 copy_relation_data(SMgrRelation src, SMgrRelation dst,
-				   ForkNumber forkNum, char relpersistence)
+		   ForkNumber forkNum, char relpersistence)
 {
-	char	   *buf;
-	Page		page;
-	bool		use_wal;
-	BlockNumber nblocks;
-	BlockNumber blkno;
-
-	/*
-	 * palloc the buffer so that it's MAXALIGN'd.  If it were just a local
-	 * char[] array, the compiler might align it on any byte boundary, which
-	 * can seriously hurt transfer speed to and from the kernel; not to
-	 * mention possibly making log_newpage's accesses to the page header fail.
-	 */
-	buf = (char *) palloc(BLCKSZ);
-	page = (Page) buf;
-
-	/*
-	 * We need to log the copied data in WAL iff WAL archiving/streaming is
-	 * enabled AND it's a permanent relation.
-	 */
-	use_wal = XLogIsNeeded() && relpersistence == RELPERSISTENCE_PERMANENT;
-
-	nblocks = smgrnblocks(src, forkNum);
-
-	for (blkno = 0; blkno < nblocks; blkno++)
-	{
-		/* If we got a cancel signal during the copy of the data, quit */
-		CHECK_FOR_INTERRUPTS();
-
-		smgrread(src, forkNum, blkno, buf);
-
-		/* XLOG stuff */
-		if (use_wal)
-			log_newpage(&dst->smgr_rnode.node, forkNum, blkno, page);
-
-		/*
-		 * Now write the page.	We say isTemp = true even if it's not a temp
-		 * rel, because there's no need for smgr to schedule an fsync for this
-		 * write; we'll do it ourselves below.
-		 */
-		smgrextend(dst, forkNum, blkno, buf, true);
-	}
-
-	pfree(buf);
-
-	/*
-	 * If the rel isn't temp, we must fsync it down to disk before it's safe
-	 * to commit the transaction.  (For a temp rel we don't care since the rel
-	 * will be uninteresting after a crash anyway.)
-	 *
-	 * It's obvious that we must do this when not WAL-logging the copy. It's
-	 * less obvious that we have to do it even if we did WAL-log the copied
-	 * pages. The reason is that since we're copying outside shared buffers, a
-	 * CHECKPOINT occurring during the copy has no way to flush the previously
-	 * written data to disk (indeed it won't know the new rel even exists).  A
-	 * crash later on would replay WAL from the checkpoint, therefore it
-	 * wouldn't replay our earlier WAL entries. If we do not fsync those pages
-	 * here, they might still not be on disk when the crash occurs.
-	 */
-	if (relpersistence == RELPERSISTENCE_PERMANENT)
-		smgrimmedsync(dst, forkNum);
+  char	   *buf;
+  Page		page;
+  bool		use_wal;
+  BlockNumber nblocks;
+  BlockNumber blkno;
+
+  /*
+   * palloc the buffer so that it's MAXALIGN'd.  If it were just a local
+   * char[] array, the compiler might align it on any byte boundary, which
+   * can seriously hurt transfer speed to and from the kernel; not to
+   * mention possibly making log_newpage's accesses to the page header fail.
+   */
+  buf = (char *) palloc(BLCKSZ);
+  page = (Page) buf;
+
+  /*
+   * We need to log the copied data in WAL iff WAL archiving/streaming is
+   * enabled AND it's a permanent relation.
+   */
+  use_wal = XLogIsNeeded() && relpersistence == RELPERSISTENCE_PERMANENT;
+
+  nblocks = smgrnblocks(src, forkNum);
+
+  for (blkno = 0; blkno < nblocks; blkno++)
+    {
+      /* If we got a cancel signal during the copy of the data, quit */
+      CHECK_FOR_INTERRUPTS();
+
+      smgrread(src, forkNum, blkno, buf);
+
+      /* XLOG stuff */
+      if (use_wal)
+	log_newpage(&dst->smgr_rnode.node, forkNum, blkno, page);
+
+      /*
+       * Now write the page.	We say isTemp = true even if it's not a temp
+       * rel, because there's no need for smgr to schedule an fsync for this
+       * write; we'll do it ourselves below.
+       */
+      smgrextend(dst, forkNum, blkno, buf, true);
+    }
+
+  pfree(buf);
+
+  /*
+   * If the rel isn't temp, we must fsync it down to disk before it's safe
+   * to commit the transaction.  (For a temp rel we don't care since the rel
+   * will be uninteresting after a crash anyway.)
+   *
+   * It's obvious that we must do this when not WAL-logging the copy. It's
+   * less obvious that we have to do it even if we did WAL-log the copied
+   * pages. The reason is that since we're copying outside shared buffers, a
+   * CHECKPOINT occurring during the copy has no way to flush the previously
+   * written data to disk (indeed it won't know the new rel even exists).  A
+   * crash later on would replay WAL from the checkpoint, therefore it
+   * wouldn't replay our earlier WAL entries. If we do not fsync those pages
+   * here, they might still not be on disk when the crash occurs.
+   */
+  if (relpersistence == RELPERSISTENCE_PERMANENT)
+    smgrimmedsync(dst, forkNum);
 }
 
 /*
@@ -8014,154 +8065,154 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
  */
 static void
 ATExecEnableDisableTrigger(Relation rel, char *trigname,
-						char fires_when, bool skip_system, LOCKMODE lockmode)
+			   char fires_when, bool skip_system, LOCKMODE lockmode)
 {
-	EnableDisableTrigger(rel, trigname, fires_when, skip_system);
+  EnableDisableTrigger(rel, trigname, fires_when, skip_system);
 }
 
 /*
  * ALTER TABLE ENABLE/DISABLE RULE
  *
- * We just pass this off to rewriteDefine.c.
- */
-static void
-ATExecEnableDisableRule(Relation rel, char *trigname,
-						char fires_when, LOCKMODE lockmode)
-{
-	EnableDisableRule(rel, trigname, fires_when);
-}
-
-/*
- * ALTER TABLE INHERIT
- *
- * Add a parent to the child's parents. This verifies that all the columns and
- * check constraints of the parent appear in the child and that they have the
- * same data types and expressions.
- */
-static void
-ATPrepAddInherit(Relation child_rel)
-{
-	if (child_rel->rd_rel->reloftype)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot change inheritance of typed table")));
-}
-
-static void
-ATExecAddInherit(Relation child_rel, RangeVar *parent, LOCKMODE lockmode)
-{
-	Relation	parent_rel,
-				catalogRelation;
-	SysScanDesc scan;
-	ScanKeyData key;
-	HeapTuple	inheritsTuple;
-	int32		inhseqno;
-	List	   *children;
-
-	/*
-	 * A self-exclusive lock is needed here.  See the similar case in
-	 * MergeAttributes() for a full explanation.
-	 */
-	parent_rel = heap_openrv(parent, ShareUpdateExclusiveLock);
-
-	/*
-	 * Must be owner of both parent and child -- child was checked by
-	 * ATSimplePermissions call in ATPrepCmd
-	 */
-	ATSimplePermissions(parent_rel, ATT_TABLE);
-
-	/* Permanent rels cannot inherit from temporary ones */
-	if (RelationUsesTempNamespace(parent_rel)
-		&& !RelationUsesTempNamespace(child_rel))
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot inherit from temporary relation \"%s\"",
-						RelationGetRelationName(parent_rel))));
-
-	/*
-	 * Check for duplicates in the list of parents, and determine the highest
-	 * inhseqno already present; we'll use the next one for the new parent.
-	 * (Note: get RowExclusiveLock because we will write pg_inherits below.)
-	 *
-	 * Note: we do not reject the case where the child already inherits from
-	 * the parent indirectly; CREATE TABLE doesn't reject comparable cases.
-	 */
-	catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
-	ScanKeyInit(&key,
-				Anum_pg_inherits_inhrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(child_rel)));
-	scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId,
-							  true, SnapshotNow, 1, &key);
-
-	/* inhseqno sequences start at 1 */
-	inhseqno = 0;
-	while (HeapTupleIsValid(inheritsTuple = systable_getnext(scan)))
-	{
-		Form_pg_inherits inh = (Form_pg_inherits) GETSTRUCT(inheritsTuple);
-
-		if (inh->inhparent == RelationGetRelid(parent_rel))
-			ereport(ERROR,
-					(errcode(ERRCODE_DUPLICATE_TABLE),
-			 errmsg("relation \"%s\" would be inherited from more than once",
-					RelationGetRelationName(parent_rel))));
-		if (inh->inhseqno > inhseqno)
-			inhseqno = inh->inhseqno;
-	}
-	systable_endscan(scan);
-
-	/*
-	 * Prevent circularity by seeing if proposed parent inherits from child.
-	 * (In particular, this disallows making a rel inherit from itself.)
-	 *
-	 * This is not completely bulletproof because of race conditions: in
-	 * multi-level inheritance trees, someone else could concurrently be
-	 * making another inheritance link that closes the loop but does not join
-	 * either of the rels we have locked.  Preventing that seems to require
-	 * exclusive locks on the entire inheritance tree, which is a cure worse
-	 * than the disease.  find_all_inheritors() will cope with circularity
-	 * anyway, so don't sweat it too much.
-	 *
-	 * We use weakest lock we can on child's children, namely AccessShareLock.
-	 */
-	children = find_all_inheritors(RelationGetRelid(child_rel),
-								   AccessShareLock, NULL);
-
-	if (list_member_oid(children, RelationGetRelid(parent_rel)))
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_TABLE),
-				 errmsg("circular inheritance not allowed"),
-				 errdetail("\"%s\" is already a child of \"%s\".",
-						   parent->relname,
-						   RelationGetRelationName(child_rel))));
-
-	/* If parent has OIDs then child must have OIDs */
-	if (parent_rel->rd_rel->relhasoids && !child_rel->rd_rel->relhasoids)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs",
-						RelationGetRelationName(child_rel),
-						RelationGetRelationName(parent_rel))));
-
-	/* Match up the columns and bump attinhcount as needed */
-	MergeAttributesIntoExisting(child_rel, parent_rel);
-
-	/* Match up the constraints and bump coninhcount as needed */
-	MergeConstraintsIntoExisting(child_rel, parent_rel);
-
-	/*
-	 * OK, it looks valid.	Make the catalog entries that show inheritance.
-	 */
-	StoreCatalogInheritance1(RelationGetRelid(child_rel),
-							 RelationGetRelid(parent_rel),
-							 inhseqno + 1,
-							 catalogRelation);
+ * We just pass this off to rewriteDefine.c.
+ */
+static void
+ATExecEnableDisableRule(Relation rel, char *trigname,
+			char fires_when, LOCKMODE lockmode)
+{
+  EnableDisableRule(rel, trigname, fires_when);
+}
 
-	/* Now we're done with pg_inherits */
-	heap_close(catalogRelation, RowExclusiveLock);
+/*
+ * ALTER TABLE INHERIT
+ *
+ * Add a parent to the child's parents. This verifies that all the columns and
+ * check constraints of the parent appear in the child and that they have the
+ * same data types and expressions.
+ */
+static void
+ATPrepAddInherit(Relation child_rel)
+{
+  if (child_rel->rd_rel->reloftype)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("cannot change inheritance of typed table")));
+}
 
-	/* keep our lock on the parent relation until commit */
-	heap_close(parent_rel, NoLock);
+static void
+ATExecAddInherit(Relation child_rel, RangeVar *parent, LOCKMODE lockmode)
+{
+  Relation	parent_rel,
+    catalogRelation;
+  SysScanDesc scan;
+  ScanKeyData key;
+  HeapTuple	inheritsTuple;
+  int32		inhseqno;
+  List	   *children;
+
+  /*
+   * A self-exclusive lock is needed here.  See the similar case in
+   * MergeAttributes() for a full explanation.
+   */
+  parent_rel = heap_openrv(parent, ShareUpdateExclusiveLock);
+
+  /*
+   * Must be owner of both parent and child -- child was checked by
+   * ATSimplePermissions call in ATPrepCmd
+   */
+  ATSimplePermissions(parent_rel, ATT_TABLE);
+
+  /* Permanent rels cannot inherit from temporary ones */
+  if (RelationUsesTempNamespace(parent_rel)
+      && !RelationUsesTempNamespace(child_rel))
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("cannot inherit from temporary relation \"%s\"",
+		    RelationGetRelationName(parent_rel))));
+
+  /*
+   * Check for duplicates in the list of parents, and determine the highest
+   * inhseqno already present; we'll use the next one for the new parent.
+   * (Note: get RowExclusiveLock because we will write pg_inherits below.)
+   *
+   * Note: we do not reject the case where the child already inherits from
+   * the parent indirectly; CREATE TABLE doesn't reject comparable cases.
+   */
+  catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
+  ScanKeyInit(&key,
+	      Anum_pg_inherits_inhrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(child_rel)));
+  scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId,
+			    true, SnapshotNow, 1, &key);
+
+  /* inhseqno sequences start at 1 */
+  inhseqno = 0;
+  while (HeapTupleIsValid(inheritsTuple = systable_getnext(scan)))
+    {
+      Form_pg_inherits inh = (Form_pg_inherits) GETSTRUCT(inheritsTuple);
+
+      if (inh->inhparent == RelationGetRelid(parent_rel))
+	ereport(ERROR,
+		(errcode(ERRCODE_DUPLICATE_TABLE),
+		 errmsg("relation \"%s\" would be inherited from more than once",
+			RelationGetRelationName(parent_rel))));
+      if (inh->inhseqno > inhseqno)
+	inhseqno = inh->inhseqno;
+    }
+  systable_endscan(scan);
+
+  /*
+   * Prevent circularity by seeing if proposed parent inherits from child.
+   * (In particular, this disallows making a rel inherit from itself.)
+   *
+   * This is not completely bulletproof because of race conditions: in
+   * multi-level inheritance trees, someone else could concurrently be
+   * making another inheritance link that closes the loop but does not join
+   * either of the rels we have locked.  Preventing that seems to require
+   * exclusive locks on the entire inheritance tree, which is a cure worse
+   * than the disease.  find_all_inheritors() will cope with circularity
+   * anyway, so don't sweat it too much.
+   *
+   * We use weakest lock we can on child's children, namely AccessShareLock.
+   */
+  children = find_all_inheritors(RelationGetRelid(child_rel),
+				 AccessShareLock, NULL);
+
+  if (list_member_oid(children, RelationGetRelid(parent_rel)))
+    ereport(ERROR,
+	    (errcode(ERRCODE_DUPLICATE_TABLE),
+	     errmsg("circular inheritance not allowed"),
+	     errdetail("\"%s\" is already a child of \"%s\".",
+		       parent->relname,
+		       RelationGetRelationName(child_rel))));
+
+  /* If parent has OIDs then child must have OIDs */
+  if (parent_rel->rd_rel->relhasoids && !child_rel->rd_rel->relhasoids)
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs",
+		    RelationGetRelationName(child_rel),
+		    RelationGetRelationName(parent_rel))));
+
+  /* Match up the columns and bump attinhcount as needed */
+  MergeAttributesIntoExisting(child_rel, parent_rel);
+
+  /* Match up the constraints and bump coninhcount as needed */
+  MergeConstraintsIntoExisting(child_rel, parent_rel);
+
+  /*
+   * OK, it looks valid.	Make the catalog entries that show inheritance.
+   */
+  StoreCatalogInheritance1(RelationGetRelid(child_rel),
+			   RelationGetRelid(parent_rel),
+			   inhseqno + 1,
+			   catalogRelation);
+
+  /* Now we're done with pg_inherits */
+  heap_close(catalogRelation, RowExclusiveLock);
+
+  /* keep our lock on the parent relation until commit */
+  heap_close(parent_rel, NoLock);
 }
 
 /*
@@ -8171,19 +8222,19 @@ ATExecAddInherit(Relation child_rel, RangeVar *parent, LOCKMODE lockmode)
 static char *
 decompile_conbin(HeapTuple contup, TupleDesc tupdesc)
 {
-	Form_pg_constraint con;
-	bool		isnull;
-	Datum		attr;
-	Datum		expr;
-
-	con = (Form_pg_constraint) GETSTRUCT(contup);
-	attr = heap_getattr(contup, Anum_pg_constraint_conbin, tupdesc, &isnull);
-	if (isnull)
-		elog(ERROR, "null conbin for constraint %u", HeapTupleGetOid(contup));
-
-	expr = DirectFunctionCall2(pg_get_expr, attr,
-							   ObjectIdGetDatum(con->conrelid));
-	return TextDatumGetCString(expr);
+  Form_pg_constraint con;
+  bool		isnull;
+  Datum		attr;
+  Datum		expr;
+
+  con = (Form_pg_constraint) GETSTRUCT(contup);
+  attr = heap_getattr(contup, Anum_pg_constraint_conbin, tupdesc, &isnull);
+  if (isnull)
+    elog(ERROR, "null conbin for constraint %u", HeapTupleGetOid(contup));
+
+  expr = DirectFunctionCall2(pg_get_expr, attr,
+			     ObjectIdGetDatum(con->conrelid));
+  return TextDatumGetCString(expr);
 }
 
 /*
@@ -8196,16 +8247,16 @@ decompile_conbin(HeapTuple contup, TupleDesc tupdesc)
 static bool
 constraints_equivalent(HeapTuple a, HeapTuple b, TupleDesc tupleDesc)
 {
-	Form_pg_constraint acon = (Form_pg_constraint) GETSTRUCT(a);
-	Form_pg_constraint bcon = (Form_pg_constraint) GETSTRUCT(b);
-
-	if (acon->condeferrable != bcon->condeferrable ||
-		acon->condeferred != bcon->condeferred ||
-		strcmp(decompile_conbin(a, tupleDesc),
-			   decompile_conbin(b, tupleDesc)) != 0)
-		return false;
-	else
-		return true;
+  Form_pg_constraint acon = (Form_pg_constraint) GETSTRUCT(a);
+  Form_pg_constraint bcon = (Form_pg_constraint) GETSTRUCT(b);
+
+  if (acon->condeferrable != bcon->condeferrable ||
+      acon->condeferred != bcon->condeferred ||
+      strcmp(decompile_conbin(a, tupleDesc),
+	     decompile_conbin(b, tupleDesc)) != 0)
+    return false;
+  else
+    return true;
 }
 
 /*
@@ -8225,78 +8276,78 @@ constraints_equivalent(HeapTuple a, HeapTuple b, TupleDesc tupleDesc)
 static void
 MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
 {
-	Relation	attrrel;
-	AttrNumber	parent_attno;
-	int			parent_natts;
-	TupleDesc	tupleDesc;
-	HeapTuple	tuple;
-
-	attrrel = heap_open(AttributeRelationId, RowExclusiveLock);
-
-	tupleDesc = RelationGetDescr(parent_rel);
-	parent_natts = tupleDesc->natts;
-
-	for (parent_attno = 1; parent_attno <= parent_natts; parent_attno++)
-	{
-		Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
-		char	   *attributeName = NameStr(attribute->attname);
-
-		/* Ignore dropped columns in the parent. */
-		if (attribute->attisdropped)
-			continue;
-
-		/* Find same column in child (matching on column name). */
-		tuple = SearchSysCacheCopyAttName(RelationGetRelid(child_rel),
-										  attributeName);
-		if (HeapTupleIsValid(tuple))
-		{
-			/* Check they are same type, typmod, and collation */
-			Form_pg_attribute childatt = (Form_pg_attribute) GETSTRUCT(tuple);
-
-			if (attribute->atttypid != childatt->atttypid ||
-				attribute->atttypmod != childatt->atttypmod)
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("child table \"%s\" has different type for column \"%s\"",
-								RelationGetRelationName(child_rel),
-								attributeName)));
-
-			if (attribute->attcollation != childatt->attcollation)
-				ereport(ERROR,
-						(errcode(ERRCODE_COLLATION_MISMATCH),
-						 errmsg("child table \"%s\" has different collation for column \"%s\"",
-								RelationGetRelationName(child_rel),
-								attributeName)));
-
-			/*
-			 * Check child doesn't discard NOT NULL property.  (Other
-			 * constraints are checked elsewhere.)
-			 */
-			if (attribute->attnotnull && !childatt->attnotnull)
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-				errmsg("column \"%s\" in child table must be marked NOT NULL",
-					   attributeName)));
-
-			/*
-			 * OK, bump the child column's inheritance count.  (If we fail
-			 * later on, this change will just roll back.)
-			 */
-			childatt->attinhcount++;
-			simple_heap_update(attrrel, &tuple->t_self, tuple);
-			CatalogUpdateIndexes(attrrel, tuple);
-			heap_freetuple(tuple);
-		}
-		else
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("child table is missing column \"%s\"",
-							attributeName)));
-		}
-	}
-
-	heap_close(attrrel, RowExclusiveLock);
+  Relation	attrrel;
+  AttrNumber	parent_attno;
+  int			parent_natts;
+  TupleDesc	tupleDesc;
+  HeapTuple	tuple;
+
+  attrrel = heap_open(AttributeRelationId, RowExclusiveLock);
+
+  tupleDesc = RelationGetDescr(parent_rel);
+  parent_natts = tupleDesc->natts;
+
+  for (parent_attno = 1; parent_attno <= parent_natts; parent_attno++)
+    {
+      Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
+      char	   *attributeName = NameStr(attribute->attname);
+
+      /* Ignore dropped columns in the parent. */
+      if (attribute->attisdropped)
+	continue;
+
+      /* Find same column in child (matching on column name). */
+      tuple = SearchSysCacheCopyAttName(RelationGetRelid(child_rel),
+					attributeName);
+      if (HeapTupleIsValid(tuple))
+	{
+	  /* Check they are same type, typmod, and collation */
+	  Form_pg_attribute childatt = (Form_pg_attribute) GETSTRUCT(tuple);
+
+	  if (attribute->atttypid != childatt->atttypid ||
+	      attribute->atttypmod != childatt->atttypmod)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("child table \"%s\" has different type for column \"%s\"",
+			    RelationGetRelationName(child_rel),
+			    attributeName)));
+
+	  if (attribute->attcollation != childatt->attcollation)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_COLLATION_MISMATCH),
+		     errmsg("child table \"%s\" has different collation for column \"%s\"",
+			    RelationGetRelationName(child_rel),
+			    attributeName)));
+
+	  /*
+	   * Check child doesn't discard NOT NULL property.  (Other
+	   * constraints are checked elsewhere.)
+	   */
+	  if (attribute->attnotnull && !childatt->attnotnull)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("column \"%s\" in child table must be marked NOT NULL",
+			    attributeName)));
+
+	  /*
+	   * OK, bump the child column's inheritance count.  (If we fail
+	   * later on, this change will just roll back.)
+	   */
+	  childatt->attinhcount++;
+	  simple_heap_update(attrrel, &tuple->t_self, tuple);
+	  CatalogUpdateIndexes(attrrel, tuple);
+	  heap_freetuple(tuple);
+	}
+      else
+	{
+	  ereport(ERROR,
+		  (errcode(ERRCODE_DATATYPE_MISMATCH),
+		   errmsg("child table is missing column \"%s\"",
+			  attributeName)));
+	}
+    }
+
+  heap_close(attrrel, RowExclusiveLock);
 }
 
 /*
@@ -8319,87 +8370,87 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
 static void
 MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
 {
-	Relation	catalog_relation;
-	TupleDesc	tuple_desc;
-	SysScanDesc parent_scan;
-	ScanKeyData parent_key;
-	HeapTuple	parent_tuple;
-
-	catalog_relation = heap_open(ConstraintRelationId, RowExclusiveLock);
-	tuple_desc = RelationGetDescr(catalog_relation);
-
-	/* Outer loop scans through the parent's constraint definitions */
-	ScanKeyInit(&parent_key,
-				Anum_pg_constraint_conrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(parent_rel)));
-	parent_scan = systable_beginscan(catalog_relation, ConstraintRelidIndexId,
-									 true, SnapshotNow, 1, &parent_key);
-
-	while (HeapTupleIsValid(parent_tuple = systable_getnext(parent_scan)))
-	{
-		Form_pg_constraint parent_con = (Form_pg_constraint) GETSTRUCT(parent_tuple);
-		SysScanDesc child_scan;
-		ScanKeyData child_key;
-		HeapTuple	child_tuple;
-		bool		found = false;
-
-		if (parent_con->contype != CONSTRAINT_CHECK)
-			continue;
-
-		/* Search for a child constraint matching this one */
-		ScanKeyInit(&child_key,
-					Anum_pg_constraint_conrelid,
-					BTEqualStrategyNumber, F_OIDEQ,
-					ObjectIdGetDatum(RelationGetRelid(child_rel)));
-		child_scan = systable_beginscan(catalog_relation, ConstraintRelidIndexId,
-										true, SnapshotNow, 1, &child_key);
-
-		while (HeapTupleIsValid(child_tuple = systable_getnext(child_scan)))
-		{
-			Form_pg_constraint child_con = (Form_pg_constraint) GETSTRUCT(child_tuple);
-			HeapTuple	child_copy;
-
-			if (child_con->contype != CONSTRAINT_CHECK)
-				continue;
-
-			if (strcmp(NameStr(parent_con->conname),
-					   NameStr(child_con->conname)) != 0)
-				continue;
-
-			if (!constraints_equivalent(parent_tuple, child_tuple, tuple_desc))
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("child table \"%s\" has different definition for check constraint \"%s\"",
-								RelationGetRelationName(child_rel),
-								NameStr(parent_con->conname))));
-
-			/*
-			 * OK, bump the child constraint's inheritance count.  (If we fail
-			 * later on, this change will just roll back.)
-			 */
-			child_copy = heap_copytuple(child_tuple);
-			child_con = (Form_pg_constraint) GETSTRUCT(child_copy);
-			child_con->coninhcount++;
-			simple_heap_update(catalog_relation, &child_copy->t_self, child_copy);
-			CatalogUpdateIndexes(catalog_relation, child_copy);
-			heap_freetuple(child_copy);
-
-			found = true;
-			break;
-		}
-
-		systable_endscan(child_scan);
-
-		if (!found)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("child table is missing constraint \"%s\"",
-							NameStr(parent_con->conname))));
-	}
+  Relation	catalog_relation;
+  TupleDesc	tuple_desc;
+  SysScanDesc parent_scan;
+  ScanKeyData parent_key;
+  HeapTuple	parent_tuple;
+
+  catalog_relation = heap_open(ConstraintRelationId, RowExclusiveLock);
+  tuple_desc = RelationGetDescr(catalog_relation);
+
+  /* Outer loop scans through the parent's constraint definitions */
+  ScanKeyInit(&parent_key,
+	      Anum_pg_constraint_conrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(parent_rel)));
+  parent_scan = systable_beginscan(catalog_relation, ConstraintRelidIndexId,
+				   true, SnapshotNow, 1, &parent_key);
+
+  while (HeapTupleIsValid(parent_tuple = systable_getnext(parent_scan)))
+    {
+      Form_pg_constraint parent_con = (Form_pg_constraint) GETSTRUCT(parent_tuple);
+      SysScanDesc child_scan;
+      ScanKeyData child_key;
+      HeapTuple	child_tuple;
+      bool		found = false;
+
+      if (parent_con->contype != CONSTRAINT_CHECK)
+	continue;
+
+      /* Search for a child constraint matching this one */
+      ScanKeyInit(&child_key,
+		  Anum_pg_constraint_conrelid,
+		  BTEqualStrategyNumber, F_OIDEQ,
+		  ObjectIdGetDatum(RelationGetRelid(child_rel)));
+      child_scan = systable_beginscan(catalog_relation, ConstraintRelidIndexId,
+				      true, SnapshotNow, 1, &child_key);
+
+      while (HeapTupleIsValid(child_tuple = systable_getnext(child_scan)))
+	{
+	  Form_pg_constraint child_con = (Form_pg_constraint) GETSTRUCT(child_tuple);
+	  HeapTuple	child_copy;
+
+	  if (child_con->contype != CONSTRAINT_CHECK)
+	    continue;
+
+	  if (strcmp(NameStr(parent_con->conname),
+		     NameStr(child_con->conname)) != 0)
+	    continue;
+
+	  if (!constraints_equivalent(parent_tuple, child_tuple, tuple_desc))
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("child table \"%s\" has different definition for check constraint \"%s\"",
+			    RelationGetRelationName(child_rel),
+			    NameStr(parent_con->conname))));
+
+	  /*
+	   * OK, bump the child constraint's inheritance count.  (If we fail
+	   * later on, this change will just roll back.)
+	   */
+	  child_copy = heap_copytuple(child_tuple);
+	  child_con = (Form_pg_constraint) GETSTRUCT(child_copy);
+	  child_con->coninhcount++;
+	  simple_heap_update(catalog_relation, &child_copy->t_self, child_copy);
+	  CatalogUpdateIndexes(catalog_relation, child_copy);
+	  heap_freetuple(child_copy);
+
+	  found = true;
+	  break;
+	}
+
+      systable_endscan(child_scan);
+
+      if (!found)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("child table is missing constraint \"%s\"",
+			NameStr(parent_con->conname))));
+    }
 
-	systable_endscan(parent_scan);
-	heap_close(catalog_relation, RowExclusiveLock);
+  systable_endscan(parent_scan);
+  heap_close(catalog_relation, RowExclusiveLock);
 }
 
 /*
@@ -8421,184 +8472,184 @@ MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
 static void
 ATExecDropInherit(Relation rel, RangeVar *parent, LOCKMODE lockmode)
 {
-	Relation	parent_rel;
-	Relation	catalogRelation;
-	SysScanDesc scan;
-	ScanKeyData key[3];
-	HeapTuple	inheritsTuple,
-				attributeTuple,
-				constraintTuple;
-	List	   *connames;
-	bool		found = false;
-
-	/*
-	 * AccessShareLock on the parent is probably enough, seeing that DROP
-	 * TABLE doesn't lock parent tables at all.  We need some lock since we'll
-	 * be inspecting the parent's schema.
-	 */
-	parent_rel = heap_openrv(parent, AccessShareLock);
-
-	/*
-	 * We don't bother to check ownership of the parent table --- ownership of
-	 * the child is presumed enough rights.
-	 */
-
-	/*
-	 * Find and destroy the pg_inherits entry linking the two, or error out if
-	 * there is none.
-	 */
-	catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
-	ScanKeyInit(&key[0],
-				Anum_pg_inherits_inhrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId,
-							  true, SnapshotNow, 1, key);
-
-	while (HeapTupleIsValid(inheritsTuple = systable_getnext(scan)))
-	{
-		Oid			inhparent;
-
-		inhparent = ((Form_pg_inherits) GETSTRUCT(inheritsTuple))->inhparent;
-		if (inhparent == RelationGetRelid(parent_rel))
-		{
-			simple_heap_delete(catalogRelation, &inheritsTuple->t_self);
-			found = true;
-			break;
-		}
-	}
-
-	systable_endscan(scan);
-	heap_close(catalogRelation, RowExclusiveLock);
+  Relation	parent_rel;
+  Relation	catalogRelation;
+  SysScanDesc scan;
+  ScanKeyData key[3];
+  HeapTuple	inheritsTuple,
+    attributeTuple,
+    constraintTuple;
+  List	   *connames;
+  bool		found = false;
+
+  /*
+   * AccessShareLock on the parent is probably enough, seeing that DROP
+   * TABLE doesn't lock parent tables at all.  We need some lock since we'll
+   * be inspecting the parent's schema.
+   */
+  parent_rel = heap_openrv(parent, AccessShareLock);
+
+  /*
+   * We don't bother to check ownership of the parent table --- ownership of
+   * the child is presumed enough rights.
+   */
+
+  /*
+   * Find and destroy the pg_inherits entry linking the two, or error out if
+   * there is none.
+   */
+  catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
+  ScanKeyInit(&key[0],
+	      Anum_pg_inherits_inhrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId,
+			    true, SnapshotNow, 1, key);
+
+  while (HeapTupleIsValid(inheritsTuple = systable_getnext(scan)))
+    {
+      Oid			inhparent;
+
+      inhparent = ((Form_pg_inherits) GETSTRUCT(inheritsTuple))->inhparent;
+      if (inhparent == RelationGetRelid(parent_rel))
+	{
+	  simple_heap_delete(catalogRelation, &inheritsTuple->t_self);
+	  found = true;
+	  break;
+	}
+    }
+
+  systable_endscan(scan);
+  heap_close(catalogRelation, RowExclusiveLock);
+
+  if (!found)
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_TABLE),
+	     errmsg("relation \"%s\" is not a parent of relation \"%s\"",
+		    RelationGetRelationName(parent_rel),
+		    RelationGetRelationName(rel))));
+
+  /*
+   * Search through child columns looking for ones matching parent rel
+   */
+  catalogRelation = heap_open(AttributeRelationId, RowExclusiveLock);
+  ScanKeyInit(&key[0],
+	      Anum_pg_attribute_attrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  scan = systable_beginscan(catalogRelation, AttributeRelidNumIndexId,
+			    true, SnapshotNow, 1, key);
+  while (HeapTupleIsValid(attributeTuple = systable_getnext(scan)))
+    {
+      Form_pg_attribute att = (Form_pg_attribute) GETSTRUCT(attributeTuple);
+
+      /* Ignore if dropped or not inherited */
+      if (att->attisdropped)
+	continue;
+      if (att->attinhcount <= 0)
+	continue;
+
+      if (SearchSysCacheExistsAttName(RelationGetRelid(parent_rel),
+				      NameStr(att->attname)))
+	{
+	  /* Decrement inhcount and possibly set islocal to true */
+	  HeapTuple	copyTuple = heap_copytuple(attributeTuple);
+	  Form_pg_attribute copy_att = (Form_pg_attribute) GETSTRUCT(copyTuple);
+
+	  copy_att->attinhcount--;
+	  if (copy_att->attinhcount == 0)
+	    copy_att->attislocal = true;
+
+	  simple_heap_update(catalogRelation, &copyTuple->t_self, copyTuple);
+	  CatalogUpdateIndexes(catalogRelation, copyTuple);
+	  heap_freetuple(copyTuple);
+	}
+    }
+  systable_endscan(scan);
+  heap_close(catalogRelation, RowExclusiveLock);
+
+  /*
+   * Likewise, find inherited check constraints and disinherit them. To do
+   * this, we first need a list of the names of the parent's check
+   * constraints.  (We cheat a bit by only checking for name matches,
+   * assuming that the expressions will match.)
+   */
+  catalogRelation = heap_open(ConstraintRelationId, RowExclusiveLock);
+  ScanKeyInit(&key[0],
+	      Anum_pg_constraint_conrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(parent_rel)));
+  scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
+			    true, SnapshotNow, 1, key);
+
+  connames = NIL;
+
+  while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
+    {
+      Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
+
+      if (con->contype == CONSTRAINT_CHECK)
+	connames = lappend(connames, pstrdup(NameStr(con->conname)));
+    }
+
+  systable_endscan(scan);
+
+  /* Now scan the child's constraints */
+  ScanKeyInit(&key[0],
+	      Anum_pg_constraint_conrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
+			    true, SnapshotNow, 1, key);
+
+  while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
+    {
+      Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
+      bool		match;
+      ListCell   *lc;
+
+      if (con->contype != CONSTRAINT_CHECK)
+	continue;
+
+      match = false;
+      foreach(lc, connames)
+	{
+	  if (strcmp(NameStr(con->conname), (char *) lfirst(lc)) == 0)
+	    {
+	      match = true;
+	      break;
+	    }
+	}
+
+      if (match)
+	{
+	  /* Decrement inhcount and possibly set islocal to true */
+	  HeapTuple	copyTuple = heap_copytuple(constraintTuple);
+	  Form_pg_constraint copy_con = (Form_pg_constraint) GETSTRUCT(copyTuple);
+
+	  if (copy_con->coninhcount <= 0)		/* shouldn't happen */
+	    elog(ERROR, "relation %u has non-inherited constraint \"%s\"",
+		 RelationGetRelid(rel), NameStr(copy_con->conname));
+
+	  copy_con->coninhcount--;
+	  if (copy_con->coninhcount == 0)
+	    copy_con->conislocal = true;
+
+	  simple_heap_update(catalogRelation, &copyTuple->t_self, copyTuple);
+	  CatalogUpdateIndexes(catalogRelation, copyTuple);
+	  heap_freetuple(copyTuple);
+	}
+    }
+
+  systable_endscan(scan);
+  heap_close(catalogRelation, RowExclusiveLock);
+
+  drop_parent_dependency(RelationGetRelid(rel),
+			 RelationRelationId,
+			 RelationGetRelid(parent_rel));
 
-	if (!found)
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s\" is not a parent of relation \"%s\"",
-						RelationGetRelationName(parent_rel),
-						RelationGetRelationName(rel))));
-
-	/*
-	 * Search through child columns looking for ones matching parent rel
-	 */
-	catalogRelation = heap_open(AttributeRelationId, RowExclusiveLock);
-	ScanKeyInit(&key[0],
-				Anum_pg_attribute_attrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	scan = systable_beginscan(catalogRelation, AttributeRelidNumIndexId,
-							  true, SnapshotNow, 1, key);
-	while (HeapTupleIsValid(attributeTuple = systable_getnext(scan)))
-	{
-		Form_pg_attribute att = (Form_pg_attribute) GETSTRUCT(attributeTuple);
-
-		/* Ignore if dropped or not inherited */
-		if (att->attisdropped)
-			continue;
-		if (att->attinhcount <= 0)
-			continue;
-
-		if (SearchSysCacheExistsAttName(RelationGetRelid(parent_rel),
-										NameStr(att->attname)))
-		{
-			/* Decrement inhcount and possibly set islocal to true */
-			HeapTuple	copyTuple = heap_copytuple(attributeTuple);
-			Form_pg_attribute copy_att = (Form_pg_attribute) GETSTRUCT(copyTuple);
-
-			copy_att->attinhcount--;
-			if (copy_att->attinhcount == 0)
-				copy_att->attislocal = true;
-
-			simple_heap_update(catalogRelation, &copyTuple->t_self, copyTuple);
-			CatalogUpdateIndexes(catalogRelation, copyTuple);
-			heap_freetuple(copyTuple);
-		}
-	}
-	systable_endscan(scan);
-	heap_close(catalogRelation, RowExclusiveLock);
-
-	/*
-	 * Likewise, find inherited check constraints and disinherit them. To do
-	 * this, we first need a list of the names of the parent's check
-	 * constraints.  (We cheat a bit by only checking for name matches,
-	 * assuming that the expressions will match.)
-	 */
-	catalogRelation = heap_open(ConstraintRelationId, RowExclusiveLock);
-	ScanKeyInit(&key[0],
-				Anum_pg_constraint_conrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(parent_rel)));
-	scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
-							  true, SnapshotNow, 1, key);
-
-	connames = NIL;
-
-	while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
-	{
-		Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
-
-		if (con->contype == CONSTRAINT_CHECK)
-			connames = lappend(connames, pstrdup(NameStr(con->conname)));
-	}
-
-	systable_endscan(scan);
-
-	/* Now scan the child's constraints */
-	ScanKeyInit(&key[0],
-				Anum_pg_constraint_conrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
-							  true, SnapshotNow, 1, key);
-
-	while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
-	{
-		Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
-		bool		match;
-		ListCell   *lc;
-
-		if (con->contype != CONSTRAINT_CHECK)
-			continue;
-
-		match = false;
-		foreach(lc, connames)
-		{
-			if (strcmp(NameStr(con->conname), (char *) lfirst(lc)) == 0)
-			{
-				match = true;
-				break;
-			}
-		}
-
-		if (match)
-		{
-			/* Decrement inhcount and possibly set islocal to true */
-			HeapTuple	copyTuple = heap_copytuple(constraintTuple);
-			Form_pg_constraint copy_con = (Form_pg_constraint) GETSTRUCT(copyTuple);
-
-			if (copy_con->coninhcount <= 0)		/* shouldn't happen */
-				elog(ERROR, "relation %u has non-inherited constraint \"%s\"",
-					 RelationGetRelid(rel), NameStr(copy_con->conname));
-
-			copy_con->coninhcount--;
-			if (copy_con->coninhcount == 0)
-				copy_con->conislocal = true;
-
-			simple_heap_update(catalogRelation, &copyTuple->t_self, copyTuple);
-			CatalogUpdateIndexes(catalogRelation, copyTuple);
-			heap_freetuple(copyTuple);
-		}
-	}
-
-	systable_endscan(scan);
-	heap_close(catalogRelation, RowExclusiveLock);
-
-	drop_parent_dependency(RelationGetRelid(rel),
-						   RelationRelationId,
-						   RelationGetRelid(parent_rel));
-
-	/* keep our lock on the parent relation until commit */
-	heap_close(parent_rel, NoLock);
+  /* keep our lock on the parent relation until commit */
+  heap_close(parent_rel, NoLock);
 }
 
 /*
@@ -8611,42 +8662,42 @@ ATExecDropInherit(Relation rel, RangeVar *parent, LOCKMODE lockmode)
 static void
 drop_parent_dependency(Oid relid, Oid refclassid, Oid refobjid)
 {
-	Relation	catalogRelation;
-	SysScanDesc scan;
-	ScanKeyData key[3];
-	HeapTuple	depTuple;
-
-	catalogRelation = heap_open(DependRelationId, RowExclusiveLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_depend_classid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationRelationId));
-	ScanKeyInit(&key[1],
-				Anum_pg_depend_objid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
-	ScanKeyInit(&key[2],
-				Anum_pg_depend_objsubid,
-				BTEqualStrategyNumber, F_INT4EQ,
-				Int32GetDatum(0));
-
-	scan = systable_beginscan(catalogRelation, DependDependerIndexId, true,
-							  SnapshotNow, 3, key);
-
-	while (HeapTupleIsValid(depTuple = systable_getnext(scan)))
-	{
-		Form_pg_depend dep = (Form_pg_depend) GETSTRUCT(depTuple);
-
-		if (dep->refclassid == refclassid &&
-			dep->refobjid == refobjid &&
-			dep->refobjsubid == 0 &&
-			dep->deptype == DEPENDENCY_NORMAL)
-			simple_heap_delete(catalogRelation, &depTuple->t_self);
-	}
-
-	systable_endscan(scan);
-	heap_close(catalogRelation, RowExclusiveLock);
+  Relation	catalogRelation;
+  SysScanDesc scan;
+  ScanKeyData key[3];
+  HeapTuple	depTuple;
+
+  catalogRelation = heap_open(DependRelationId, RowExclusiveLock);
+
+  ScanKeyInit(&key[0],
+	      Anum_pg_depend_classid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationRelationId));
+  ScanKeyInit(&key[1],
+	      Anum_pg_depend_objid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relid));
+  ScanKeyInit(&key[2],
+	      Anum_pg_depend_objsubid,
+	      BTEqualStrategyNumber, F_INT4EQ,
+	      Int32GetDatum(0));
+
+  scan = systable_beginscan(catalogRelation, DependDependerIndexId, true,
+			    SnapshotNow, 3, key);
+
+  while (HeapTupleIsValid(depTuple = systable_getnext(scan)))
+    {
+      Form_pg_depend dep = (Form_pg_depend) GETSTRUCT(depTuple);
+
+      if (dep->refclassid == refclassid &&
+	  dep->refobjid == refobjid &&
+	  dep->refobjsubid == 0 &&
+	  dep->deptype == DEPENDENCY_NORMAL)
+	simple_heap_delete(catalogRelation, &depTuple->t_self);
+    }
+
+  systable_endscan(scan);
+  heap_close(catalogRelation, RowExclusiveLock);
 }
 
 /*
@@ -8660,129 +8711,129 @@ drop_parent_dependency(Oid relid, Oid refclassid, Oid refobjid)
 static void
 ATExecAddOf(Relation rel, const TypeName *ofTypename, LOCKMODE lockmode)
 {
-	Oid			relid = RelationGetRelid(rel);
-	Type		typetuple;
-	Oid			typeid;
-	Relation	inheritsRelation,
-				relationRelation;
-	SysScanDesc scan;
-	ScanKeyData key;
-	AttrNumber	table_attno,
-				type_attno;
-	TupleDesc	typeTupleDesc,
-				tableTupleDesc;
-	ObjectAddress tableobj,
-				typeobj;
-	HeapTuple	classtuple;
-
-	/* Validate the type. */
-	typetuple = typenameType(NULL, ofTypename, NULL);
-	check_of_type(typetuple);
-	typeid = HeapTupleGetOid(typetuple);
-
-	/* Fail if the table has any inheritance parents. */
-	inheritsRelation = heap_open(InheritsRelationId, AccessShareLock);
-	ScanKeyInit(&key,
-				Anum_pg_inherits_inhrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(relid));
-	scan = systable_beginscan(inheritsRelation, InheritsRelidSeqnoIndexId,
-							  true, SnapshotNow, 1, &key);
-	if (HeapTupleIsValid(systable_getnext(scan)))
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("typed tables cannot inherit")));
-	systable_endscan(scan);
-	heap_close(inheritsRelation, AccessShareLock);
-
-	/*
-	 * Check the tuple descriptors for compatibility.  Unlike inheritance, we
-	 * require that the order also match.  However, attnotnull need not match.
-	 * Also unlike inheritance, we do not require matching relhasoids.
-	 */
-	typeTupleDesc = lookup_rowtype_tupdesc(typeid, -1);
-	tableTupleDesc = RelationGetDescr(rel);
-	table_attno = 1;
-	for (type_attno = 1; type_attno <= typeTupleDesc->natts; type_attno++)
-	{
-		Form_pg_attribute type_attr,
-					table_attr;
-		const char *type_attname,
-				   *table_attname;
-
-		/* Get the next non-dropped type attribute. */
-		type_attr = typeTupleDesc->attrs[type_attno - 1];
-		if (type_attr->attisdropped)
-			continue;
-		type_attname = NameStr(type_attr->attname);
-
-		/* Get the next non-dropped table attribute. */
-		do
-		{
-			if (table_attno > tableTupleDesc->natts)
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("table is missing column \"%s\"",
-								type_attname)));
-			table_attr = tableTupleDesc->attrs[table_attno++ - 1];
-		} while (table_attr->attisdropped);
-		table_attname = NameStr(table_attr->attname);
-
-		/* Compare name. */
-		if (strncmp(table_attname, type_attname, NAMEDATALEN) != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("table has column \"%s\" where type requires \"%s\"",
-						table_attname, type_attname)));
-
-		/* Compare type. */
-		if (table_attr->atttypid != type_attr->atttypid ||
-			table_attr->atttypmod != type_attr->atttypmod ||
-			table_attr->attcollation != type_attr->attcollation)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-				  errmsg("table \"%s\" has different type for column \"%s\"",
-						 RelationGetRelationName(rel), type_attname)));
-	}
-	DecrTupleDescRefCount(typeTupleDesc);
-
-	/* Any remaining columns at the end of the table had better be dropped. */
-	for (; table_attno <= tableTupleDesc->natts; table_attno++)
-	{
-		Form_pg_attribute table_attr = tableTupleDesc->attrs[table_attno - 1];
-
-		if (!table_attr->attisdropped)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("table has extra column \"%s\"",
-							NameStr(table_attr->attname))));
-	}
-
-	/* If the table was already typed, drop the existing dependency. */
-	if (rel->rd_rel->reloftype)
-		drop_parent_dependency(relid, TypeRelationId, rel->rd_rel->reloftype);
-
-	/* Record a dependency on the new type. */
-	tableobj.classId = RelationRelationId;
-	tableobj.objectId = relid;
-	tableobj.objectSubId = 0;
-	typeobj.classId = TypeRelationId;
-	typeobj.objectId = typeid;
-	typeobj.objectSubId = 0;
-	recordDependencyOn(&tableobj, &typeobj, DEPENDENCY_NORMAL);
-
-	/* Update pg_class.reloftype */
-	relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
-	classtuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relid));
-	if (!HeapTupleIsValid(classtuple))
-		elog(ERROR, "cache lookup failed for relation %u", relid);
-	((Form_pg_class) GETSTRUCT(classtuple))->reloftype = typeid;
-	simple_heap_update(relationRelation, &classtuple->t_self, classtuple);
-	CatalogUpdateIndexes(relationRelation, classtuple);
-	heap_freetuple(classtuple);
-	heap_close(relationRelation, RowExclusiveLock);
-
-	ReleaseSysCache(typetuple);
+  Oid			relid = RelationGetRelid(rel);
+  Type		typetuple;
+  Oid			typeid;
+  Relation	inheritsRelation,
+    relationRelation;
+  SysScanDesc scan;
+  ScanKeyData key;
+  AttrNumber	table_attno,
+    type_attno;
+  TupleDesc	typeTupleDesc,
+    tableTupleDesc;
+  ObjectAddress tableobj,
+    typeobj;
+  HeapTuple	classtuple;
+
+  /* Validate the type. */
+  typetuple = typenameType(NULL, ofTypename, NULL);
+  check_of_type(typetuple);
+  typeid = HeapTupleGetOid(typetuple);
+
+  /* Fail if the table has any inheritance parents. */
+  inheritsRelation = heap_open(InheritsRelationId, AccessShareLock);
+  ScanKeyInit(&key,
+	      Anum_pg_inherits_inhrelid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(relid));
+  scan = systable_beginscan(inheritsRelation, InheritsRelidSeqnoIndexId,
+			    true, SnapshotNow, 1, &key);
+  if (HeapTupleIsValid(systable_getnext(scan)))
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("typed tables cannot inherit")));
+  systable_endscan(scan);
+  heap_close(inheritsRelation, AccessShareLock);
+
+  /*
+   * Check the tuple descriptors for compatibility.  Unlike inheritance, we
+   * require that the order also match.  However, attnotnull need not match.
+   * Also unlike inheritance, we do not require matching relhasoids.
+   */
+  typeTupleDesc = lookup_rowtype_tupdesc(typeid, -1);
+  tableTupleDesc = RelationGetDescr(rel);
+  table_attno = 1;
+  for (type_attno = 1; type_attno <= typeTupleDesc->natts; type_attno++)
+    {
+      Form_pg_attribute type_attr,
+	table_attr;
+      const char *type_attname,
+	*table_attname;
+
+      /* Get the next non-dropped type attribute. */
+      type_attr = typeTupleDesc->attrs[type_attno - 1];
+      if (type_attr->attisdropped)
+	continue;
+      type_attname = NameStr(type_attr->attname);
+
+      /* Get the next non-dropped table attribute. */
+      do
+	{
+	  if (table_attno > tableTupleDesc->natts)
+	    ereport(ERROR,
+		    (errcode(ERRCODE_DATATYPE_MISMATCH),
+		     errmsg("table is missing column \"%s\"",
+			    type_attname)));
+	  table_attr = tableTupleDesc->attrs[table_attno++ - 1];
+	} while (table_attr->attisdropped);
+      table_attname = NameStr(table_attr->attname);
+
+      /* Compare name. */
+      if (strncmp(table_attname, type_attname, NAMEDATALEN) != 0)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("table has column \"%s\" where type requires \"%s\"",
+			table_attname, type_attname)));
+
+      /* Compare type. */
+      if (table_attr->atttypid != type_attr->atttypid ||
+	  table_attr->atttypmod != type_attr->atttypmod ||
+	  table_attr->attcollation != type_attr->attcollation)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("table \"%s\" has different type for column \"%s\"",
+			RelationGetRelationName(rel), type_attname)));
+    }
+  DecrTupleDescRefCount(typeTupleDesc);
+
+  /* Any remaining columns at the end of the table had better be dropped. */
+  for (; table_attno <= tableTupleDesc->natts; table_attno++)
+    {
+      Form_pg_attribute table_attr = tableTupleDesc->attrs[table_attno - 1];
+
+      if (!table_attr->attisdropped)
+	ereport(ERROR,
+		(errcode(ERRCODE_DATATYPE_MISMATCH),
+		 errmsg("table has extra column \"%s\"",
+			NameStr(table_attr->attname))));
+    }
+
+  /* If the table was already typed, drop the existing dependency. */
+  if (rel->rd_rel->reloftype)
+    drop_parent_dependency(relid, TypeRelationId, rel->rd_rel->reloftype);
+
+  /* Record a dependency on the new type. */
+  tableobj.classId = RelationRelationId;
+  tableobj.objectId = relid;
+  tableobj.objectSubId = 0;
+  typeobj.classId = TypeRelationId;
+  typeobj.objectId = typeid;
+  typeobj.objectSubId = 0;
+  recordDependencyOn(&tableobj, &typeobj, DEPENDENCY_NORMAL);
+
+  /* Update pg_class.reloftype */
+  relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
+  classtuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relid));
+  if (!HeapTupleIsValid(classtuple))
+    elog(ERROR, "cache lookup failed for relation %u", relid);
+  ((Form_pg_class) GETSTRUCT(classtuple))->reloftype = typeid;
+  simple_heap_update(relationRelation, &classtuple->t_self, classtuple);
+  CatalogUpdateIndexes(relationRelation, classtuple);
+  heap_freetuple(classtuple);
+  heap_close(relationRelation, RowExclusiveLock);
+
+  ReleaseSysCache(typetuple);
 }
 
 /*
@@ -8794,33 +8845,33 @@ ATExecAddOf(Relation rel, const TypeName *ofTypename, LOCKMODE lockmode)
 static void
 ATExecDropOf(Relation rel, LOCKMODE lockmode)
 {
-	Oid			relid = RelationGetRelid(rel);
-	Relation	relationRelation;
-	HeapTuple	tuple;
-
-	if (!OidIsValid(rel->rd_rel->reloftype))
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a typed table",
-						RelationGetRelationName(rel))));
-
-	/*
-	 * We don't bother to check ownership of the type --- ownership of the
-	 * table is presumed enough rights.  No lock required on the type, either.
-	 */
-
-	drop_parent_dependency(relid, TypeRelationId, rel->rd_rel->reloftype);
-
-	/* Clear pg_class.reloftype */
-	relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
-	tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relid));
-	if (!HeapTupleIsValid(tuple))
-		elog(ERROR, "cache lookup failed for relation %u", relid);
-	((Form_pg_class) GETSTRUCT(tuple))->reloftype = InvalidOid;
-	simple_heap_update(relationRelation, &tuple->t_self, tuple);
-	CatalogUpdateIndexes(relationRelation, tuple);
-	heap_freetuple(tuple);
-	heap_close(relationRelation, RowExclusiveLock);
+  Oid			relid = RelationGetRelid(rel);
+  Relation	relationRelation;
+  HeapTuple	tuple;
+
+  if (!OidIsValid(rel->rd_rel->reloftype))
+    ereport(ERROR,
+	    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	     errmsg("\"%s\" is not a typed table",
+		    RelationGetRelationName(rel))));
+
+  /*
+   * We don't bother to check ownership of the type --- ownership of the
+   * table is presumed enough rights.  No lock required on the type, either.
+   */
+
+  drop_parent_dependency(relid, TypeRelationId, rel->rd_rel->reloftype);
+
+  /* Clear pg_class.reloftype */
+  relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
+  tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relid));
+  if (!HeapTupleIsValid(tuple))
+    elog(ERROR, "cache lookup failed for relation %u", relid);
+  ((Form_pg_class) GETSTRUCT(tuple))->reloftype = InvalidOid;
+  simple_heap_update(relationRelation, &tuple->t_self, tuple);
+  CatalogUpdateIndexes(relationRelation, tuple);
+  heap_freetuple(tuple);
+  heap_close(relationRelation, RowExclusiveLock);
 }
 
 /*
@@ -8829,68 +8880,68 @@ ATExecDropOf(Relation rel, LOCKMODE lockmode)
 static void
 ATExecGenericOptions(Relation rel, List *options)
 {
-	Relation	ftrel;
-	ForeignServer *server;
-	ForeignDataWrapper *fdw;
-	HeapTuple	tuple;
-	bool		isnull;
-	Datum		repl_val[Natts_pg_foreign_table];
-	bool		repl_null[Natts_pg_foreign_table];
-	bool		repl_repl[Natts_pg_foreign_table];
-	Datum		datum;
-	Form_pg_foreign_table tableform;
-
-	if (options == NIL)
-		return;
-
-	ftrel = heap_open(ForeignTableRelationId, RowExclusiveLock);
-
-	tuple = SearchSysCacheCopy1(FOREIGNTABLEREL, rel->rd_id);
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_OBJECT),
-				 errmsg("foreign table \"%s\" does not exist",
-						RelationGetRelationName(rel))));
-	tableform = (Form_pg_foreign_table) GETSTRUCT(tuple);
-	server = GetForeignServer(tableform->ftserver);
-	fdw = GetForeignDataWrapper(server->fdwid);
-
-	memset(repl_val, 0, sizeof(repl_val));
-	memset(repl_null, false, sizeof(repl_null));
-	memset(repl_repl, false, sizeof(repl_repl));
-
-	/* Extract the current options */
-	datum = SysCacheGetAttr(FOREIGNTABLEREL,
-							tuple,
-							Anum_pg_foreign_table_ftoptions,
-							&isnull);
-	if (isnull)
-		datum = PointerGetDatum(NULL);
-
-	/* Transform the options */
-	datum = transformGenericOptions(ForeignTableRelationId,
-									datum,
-									options,
-									fdw->fdwvalidator);
-
-	if (PointerIsValid(DatumGetPointer(datum)))
-		repl_val[Anum_pg_foreign_table_ftoptions - 1] = datum;
-	else
-		repl_null[Anum_pg_foreign_table_ftoptions - 1] = true;
-
-	repl_repl[Anum_pg_foreign_table_ftoptions - 1] = true;
-
-	/* Everything looks good - update the tuple */
-
-	tuple = heap_modify_tuple(tuple, RelationGetDescr(ftrel),
-							  repl_val, repl_null, repl_repl);
-
-	simple_heap_update(ftrel, &tuple->t_self, tuple);
-	CatalogUpdateIndexes(ftrel, tuple);
-
-	heap_close(ftrel, RowExclusiveLock);
-
-	heap_freetuple(tuple);
+  Relation	ftrel;
+  ForeignServer *server;
+  ForeignDataWrapper *fdw;
+  HeapTuple	tuple;
+  bool		isnull;
+  Datum		repl_val[Natts_pg_foreign_table];
+  bool		repl_null[Natts_pg_foreign_table];
+  bool		repl_repl[Natts_pg_foreign_table];
+  Datum		datum;
+  Form_pg_foreign_table tableform;
+
+  if (options == NIL)
+    return;
+
+  ftrel = heap_open(ForeignTableRelationId, RowExclusiveLock);
+
+  tuple = SearchSysCacheCopy1(FOREIGNTABLEREL, rel->rd_id);
+  if (!HeapTupleIsValid(tuple))
+    ereport(ERROR,
+	    (errcode(ERRCODE_UNDEFINED_OBJECT),
+	     errmsg("foreign table \"%s\" does not exist",
+		    RelationGetRelationName(rel))));
+  tableform = (Form_pg_foreign_table) GETSTRUCT(tuple);
+  server = GetForeignServer(tableform->ftserver);
+  fdw = GetForeignDataWrapper(server->fdwid);
+
+  memset(repl_val, 0, sizeof(repl_val));
+  memset(repl_null, false, sizeof(repl_null));
+  memset(repl_repl, false, sizeof(repl_repl));
+
+  /* Extract the current options */
+  datum = SysCacheGetAttr(FOREIGNTABLEREL,
+			  tuple,
+			  Anum_pg_foreign_table_ftoptions,
+			  &isnull);
+  if (isnull)
+    datum = PointerGetDatum(NULL);
+
+  /* Transform the options */
+  datum = transformGenericOptions(ForeignTableRelationId,
+				  datum,
+				  options,
+				  fdw->fdwvalidator);
+
+  if (PointerIsValid(DatumGetPointer(datum)))
+    repl_val[Anum_pg_foreign_table_ftoptions - 1] = datum;
+  else
+    repl_null[Anum_pg_foreign_table_ftoptions - 1] = true;
+
+  repl_repl[Anum_pg_foreign_table_ftoptions - 1] = true;
+
+  /* Everything looks good - update the tuple */
+
+  tuple = heap_modify_tuple(tuple, RelationGetDescr(ftrel),
+			    repl_val, repl_null, repl_repl);
+
+  simple_heap_update(ftrel, &tuple->t_self, tuple);
+  CatalogUpdateIndexes(ftrel, tuple);
+
+  heap_close(ftrel, RowExclusiveLock);
+
+  heap_freetuple(tuple);
 }
 
 
@@ -8901,124 +8952,124 @@ ATExecGenericOptions(Relation rel, List *options)
  */
 void
 AlterTableNamespace(RangeVar *relation, const char *newschema,
-					ObjectType stmttype, LOCKMODE lockmode)
+		    ObjectType stmttype, LOCKMODE lockmode)
 {
-	Relation	rel;
-	Oid			relid;
-	Oid			oldNspOid;
-	Oid			nspOid;
-	Relation	classRel;
-
-	rel = relation_openrv(relation, lockmode);
-
-	relid = RelationGetRelid(rel);
-	oldNspOid = RelationGetNamespace(rel);
-
-	/* Check relation type against type specified in the ALTER command */
-	switch (stmttype)
-	{
-		case OBJECT_TABLE:
-
-			/*
-			 * For mostly-historical reasons, we allow ALTER TABLE to apply to
-			 * all relation types.
-			 */
-			break;
-
-		case OBJECT_SEQUENCE:
-			if (rel->rd_rel->relkind != RELKIND_SEQUENCE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a sequence",
-								RelationGetRelationName(rel))));
-			break;
-
-		case OBJECT_VIEW:
-			if (rel->rd_rel->relkind != RELKIND_VIEW)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a view",
-								RelationGetRelationName(rel))));
-			break;
-
-		case OBJECT_FOREIGN_TABLE:
-			if (rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("\"%s\" is not a foreign table",
-								RelationGetRelationName(rel))));
-			break;
-
-		default:
-			elog(ERROR, "unrecognized object type: %d", (int) stmttype);
-	}
-
-	/* Can we change the schema of this tuple? */
-	switch (rel->rd_rel->relkind)
-	{
-		case RELKIND_RELATION:
-		case RELKIND_VIEW:
-		case RELKIND_FOREIGN_TABLE:
-			/* ok to change schema */
-			break;
-		case RELKIND_SEQUENCE:
-			{
-				/* if it's an owned sequence, disallow moving it by itself */
-				Oid			tableId;
-				int32		colId;
-
-				if (sequenceIsOwned(relid, &tableId, &colId))
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("cannot move an owned sequence into another schema"),
-					  errdetail("Sequence \"%s\" is linked to table \"%s\".",
-								RelationGetRelationName(rel),
-								get_rel_name(tableId))));
-			}
-			break;
-		case RELKIND_COMPOSITE_TYPE:
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("\"%s\" is a composite type",
-							RelationGetRelationName(rel)),
-					 errhint("Use ALTER TYPE instead.")));
-			break;
-		case RELKIND_INDEX:
-		case RELKIND_TOASTVALUE:
-			/* FALL THRU */
-		default:
-			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-			errmsg("\"%s\" is not a table, view, sequence, or foreign table",
-				   RelationGetRelationName(rel))));
-	}
-
-	/* get schema OID and check its permissions */
-	nspOid = LookupCreationNamespace(newschema);
-
-	/* common checks on switching namespaces */
-	CheckSetNamespace(oldNspOid, nspOid, RelationRelationId, relid);
-
-	/* OK, modify the pg_class row and pg_depend entry */
-	classRel = heap_open(RelationRelationId, RowExclusiveLock);
-
-	AlterRelationNamespaceInternal(classRel, relid, oldNspOid, nspOid, true);
-
-	/* Fix the table's rowtype too */
-	AlterTypeNamespaceInternal(rel->rd_rel->reltype, nspOid, false, false);
-
-	/* Fix other dependent stuff */
-	if (rel->rd_rel->relkind == RELKIND_RELATION)
-	{
-		AlterIndexNamespaces(classRel, rel, oldNspOid, nspOid);
-		AlterSeqNamespaces(classRel, rel, oldNspOid, nspOid, newschema, lockmode);
-		AlterConstraintNamespaces(relid, oldNspOid, nspOid, false);
-	}
+  Relation	rel;
+  Oid			relid;
+  Oid			oldNspOid;
+  Oid			nspOid;
+  Relation	classRel;
+
+  rel = relation_openrv(relation, lockmode);
+
+  relid = RelationGetRelid(rel);
+  oldNspOid = RelationGetNamespace(rel);
+
+  /* Check relation type against type specified in the ALTER command */
+  switch (stmttype)
+    {
+    case OBJECT_TABLE:
+
+      /*
+       * For mostly-historical reasons, we allow ALTER TABLE to apply to
+       * all relation types.
+       */
+      break;
+
+    case OBJECT_SEQUENCE:
+      if (rel->rd_rel->relkind != RELKIND_SEQUENCE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a sequence",
+			RelationGetRelationName(rel))));
+      break;
 
-	heap_close(classRel, RowExclusiveLock);
+    case OBJECT_VIEW:
+      if (rel->rd_rel->relkind != RELKIND_VIEW)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a view",
+			RelationGetRelationName(rel))));
+      break;
 
-	/* close rel, but keep lock until commit */
-	relation_close(rel, NoLock);
+    case OBJECT_FOREIGN_TABLE:
+      if (rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE)
+	ereport(ERROR,
+		(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+		 errmsg("\"%s\" is not a foreign table",
+			RelationGetRelationName(rel))));
+      break;
+
+    default:
+      elog(ERROR, "unrecognized object type: %d", (int) stmttype);
+    }
+
+  /* Can we change the schema of this tuple? */
+  switch (rel->rd_rel->relkind)
+    {
+    case RELKIND_RELATION:
+    case RELKIND_VIEW:
+    case RELKIND_FOREIGN_TABLE:
+      /* ok to change schema */
+      break;
+    case RELKIND_SEQUENCE:
+      {
+	/* if it's an owned sequence, disallow moving it by itself */
+	Oid			tableId;
+	int32		colId;
+
+	if (sequenceIsOwned(relid, &tableId, &colId))
+	  ereport(ERROR,
+		  (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+		   errmsg("cannot move an owned sequence into another schema"),
+		   errdetail("Sequence \"%s\" is linked to table \"%s\".",
+			     RelationGetRelationName(rel),
+			     get_rel_name(tableId))));
+      }
+      break;
+    case RELKIND_COMPOSITE_TYPE:
+      ereport(ERROR,
+	      (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	       errmsg("\"%s\" is a composite type",
+		      RelationGetRelationName(rel)),
+	       errhint("Use ALTER TYPE instead.")));
+      break;
+    case RELKIND_INDEX:
+    case RELKIND_TOASTVALUE:
+      /* FALL THRU */
+    default:
+      ereport(ERROR,
+	      (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+	       errmsg("\"%s\" is not a table, view, sequence, or foreign table",
+		      RelationGetRelationName(rel))));
+    }
+
+  /* get schema OID and check its permissions */
+  nspOid = LookupCreationNamespace(newschema);
+
+  /* common checks on switching namespaces */
+  CheckSetNamespace(oldNspOid, nspOid, RelationRelationId, relid);
+
+  /* OK, modify the pg_class row and pg_depend entry */
+  classRel = heap_open(RelationRelationId, RowExclusiveLock);
+
+  AlterRelationNamespaceInternal(classRel, relid, oldNspOid, nspOid, true);
+
+  /* Fix the table's row type too */
+  AlterTypeNamespaceInternal(rel->rd_rel->reltype, nspOid, false, false);
+
+  /* Fix other dependent stuff */
+  if (rel->rd_rel->relkind == RELKIND_RELATION)
+    {
+      AlterIndexNamespaces(classRel, rel, oldNspOid, nspOid);
+      AlterSeqNamespaces(classRel, rel, oldNspOid, nspOid, newschema, lockmode);
+      AlterConstraintNamespaces(relid, oldNspOid, nspOid, false);
+    }
+
+  heap_close(classRel, RowExclusiveLock);
+
+  /* close rel, but keep lock until commit */
+  relation_close(rel, NoLock);
 }
 
 /*
@@ -9028,42 +9079,42 @@ AlterTableNamespace(RangeVar *relation, const char *newschema,
  */
 void
 AlterRelationNamespaceInternal(Relation classRel, Oid relOid,
-							   Oid oldNspOid, Oid newNspOid,
-							   bool hasDependEntry)
+			       Oid oldNspOid, Oid newNspOid,
+			       bool hasDependEntry)
 {
-	HeapTuple	classTup;
-	Form_pg_class classForm;
-
-	classTup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relOid));
-	if (!HeapTupleIsValid(classTup))
-		elog(ERROR, "cache lookup failed for relation %u", relOid);
-	classForm = (Form_pg_class) GETSTRUCT(classTup);
-
-	Assert(classForm->relnamespace == oldNspOid);
-
-	/* check for duplicate name (more friendly than unique-index failure) */
-	if (get_relname_relid(NameStr(classForm->relname),
-						  newNspOid) != InvalidOid)
-		ereport(ERROR,
-				(errcode(ERRCODE_DUPLICATE_TABLE),
-				 errmsg("relation \"%s\" already exists in schema \"%s\"",
-						NameStr(classForm->relname),
-						get_namespace_name(newNspOid))));
-
-	/* classTup is a copy, so OK to scribble on */
-	classForm->relnamespace = newNspOid;
-
-	simple_heap_update(classRel, &classTup->t_self, classTup);
-	CatalogUpdateIndexes(classRel, classTup);
-
-	/* Update dependency on schema if caller said so */
-	if (hasDependEntry &&
-		changeDependencyFor(RelationRelationId, relOid,
-							NamespaceRelationId, oldNspOid, newNspOid) != 1)
-		elog(ERROR, "failed to change schema dependency for relation \"%s\"",
-			 NameStr(classForm->relname));
-
-	heap_freetuple(classTup);
+  HeapTuple	classTup;
+  Form_pg_class classForm;
+
+  classTup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relOid));
+  if (!HeapTupleIsValid(classTup))
+    elog(ERROR, "cache lookup failed for relation %u", relOid);
+  classForm = (Form_pg_class) GETSTRUCT(classTup);
+
+  Assert(classForm->relnamespace == oldNspOid);
+
+  /* check for duplicate name (more friendly than unique-index failure) */
+  if (get_relname_relid(NameStr(classForm->relname),
+			newNspOid) != InvalidOid)
+    ereport(ERROR,
+	    (errcode(ERRCODE_DUPLICATE_TABLE),
+	     errmsg("relation \"%s\" already exists in schema \"%s\"",
+		    NameStr(classForm->relname),
+		    get_namespace_name(newNspOid))));
+
+  /* classTup is a copy, so OK to scribble on */
+  classForm->relnamespace = newNspOid;
+
+  simple_heap_update(classRel, &classTup->t_self, classTup);
+  CatalogUpdateIndexes(classRel, classTup);
+
+  /* Update dependency on schema if caller said so */
+  if (hasDependEntry &&
+      changeDependencyFor(RelationRelationId, relOid,
+			  NamespaceRelationId, oldNspOid, newNspOid) != 1)
+    elog(ERROR, "failed to change schema dependency for relation \"%s\"",
+	 NameStr(classForm->relname));
+
+  heap_freetuple(classTup);
 }
 
 /*
@@ -9074,28 +9125,28 @@ AlterRelationNamespaceInternal(Relation classRel, Oid relOid,
  */
 static void
 AlterIndexNamespaces(Relation classRel, Relation rel,
-					 Oid oldNspOid, Oid newNspOid)
+		     Oid oldNspOid, Oid newNspOid)
 {
-	List	   *indexList;
-	ListCell   *l;
-
-	indexList = RelationGetIndexList(rel);
-
-	foreach(l, indexList)
-	{
-		Oid			indexOid = lfirst_oid(l);
-
-		/*
-		 * Note: currently, the index will not have its own dependency on the
-		 * namespace, so we don't need to do changeDependencyFor(). There's no
-		 * rowtype in pg_type, either.
-		 */
-		AlterRelationNamespaceInternal(classRel, indexOid,
-									   oldNspOid, newNspOid,
-									   false);
-	}
-
-	list_free(indexList);
+  List	   *indexList;
+  ListCell   *l;
+
+  indexList = RelationGetIndexList(rel);
+
+  foreach(l, indexList)
+    {
+      Oid			indexOid = lfirst_oid(l);
+
+      /*
+       * Note: currently, the index will not have its own dependency on the
+       * namespace, so we don't need to do changeDependencyFor(). There's no
+       * row type in pg_type, either.
+       */
+      AlterRelationNamespaceInternal(classRel, indexOid,
+				     oldNspOid, newNspOid,
+				     false);
+    }
+
+  list_free(indexList);
 }
 
 /*
@@ -9107,74 +9158,74 @@ AlterIndexNamespaces(Relation classRel, Relation rel,
  */
 static void
 AlterSeqNamespaces(Relation classRel, Relation rel,
-	 Oid oldNspOid, Oid newNspOid, const char *newNspName, LOCKMODE lockmode)
+		   Oid oldNspOid, Oid newNspOid, const char *newNspName, LOCKMODE lockmode)
 {
-	Relation	depRel;
-	SysScanDesc scan;
-	ScanKeyData key[2];
-	HeapTuple	tup;
-
-	/*
-	 * SERIAL sequences are those having an auto dependency on one of the
-	 * table's columns (we don't care *which* column, exactly).
-	 */
-	depRel = heap_open(DependRelationId, AccessShareLock);
-
-	ScanKeyInit(&key[0],
-				Anum_pg_depend_refclassid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationRelationId));
-	ScanKeyInit(&key[1],
-				Anum_pg_depend_refobjid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(rel)));
-	/* we leave refobjsubid unspecified */
-
-	scan = systable_beginscan(depRel, DependReferenceIndexId, true,
-							  SnapshotNow, 2, key);
-
-	while (HeapTupleIsValid(tup = systable_getnext(scan)))
-	{
-		Form_pg_depend depForm = (Form_pg_depend) GETSTRUCT(tup);
-		Relation	seqRel;
-
-		/* skip dependencies other than auto dependencies on columns */
-		if (depForm->refobjsubid == 0 ||
-			depForm->classid != RelationRelationId ||
-			depForm->objsubid != 0 ||
-			depForm->deptype != DEPENDENCY_AUTO)
-			continue;
-
-		/* Use relation_open just in case it's an index */
-		seqRel = relation_open(depForm->objid, lockmode);
-
-		/* skip non-sequence relations */
-		if (RelationGetForm(seqRel)->relkind != RELKIND_SEQUENCE)
-		{
-			/* No need to keep the lock */
-			relation_close(seqRel, lockmode);
-			continue;
-		}
-
-		/* Fix the pg_class and pg_depend entries */
-		AlterRelationNamespaceInternal(classRel, depForm->objid,
-									   oldNspOid, newNspOid,
-									   true);
-
-		/*
-		 * Sequences have entries in pg_type. We need to be careful to move
-		 * them to the new namespace, too.
-		 */
-		AlterTypeNamespaceInternal(RelationGetForm(seqRel)->reltype,
-								   newNspOid, false, false);
-
-		/* Now we can close it.  Keep the lock till end of transaction. */
-		relation_close(seqRel, NoLock);
-	}
-
-	systable_endscan(scan);
-
-	relation_close(depRel, AccessShareLock);
+  Relation	depRel;
+  SysScanDesc scan;
+  ScanKeyData key[2];
+  HeapTuple	tup;
+
+  /*
+   * SERIAL sequences are those having an auto dependency on one of the
+   * table's columns (we don't care *which* column, exactly).
+   */
+  depRel = heap_open(DependRelationId, AccessShareLock);
+
+  ScanKeyInit(&key[0],
+	      Anum_pg_depend_refclassid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationRelationId));
+  ScanKeyInit(&key[1],
+	      Anum_pg_depend_refobjid,
+	      BTEqualStrategyNumber, F_OIDEQ,
+	      ObjectIdGetDatum(RelationGetRelid(rel)));
+  /* we leave refobjsubid unspecified */
+
+  scan = systable_beginscan(depRel, DependReferenceIndexId, true,
+			    SnapshotNow, 2, key);
+
+  while (HeapTupleIsValid(tup = systable_getnext(scan)))
+    {
+      Form_pg_depend depForm = (Form_pg_depend) GETSTRUCT(tup);
+      Relation	seqRel;
+
+      /* skip dependencies other than auto dependencies on columns */
+      if (depForm->refobjsubid == 0 ||
+	  depForm->classid != RelationRelationId ||
+	  depForm->objsubid != 0 ||
+	  depForm->deptype != DEPENDENCY_AUTO)
+	continue;
+
+      /* Use relation_open just in case it's an index */
+      seqRel = relation_open(depForm->objid, lockmode);
+
+      /* skip non-sequence relations */
+      if (RelationGetForm(seqRel)->relkind != RELKIND_SEQUENCE)
+	{
+	  /* No need to keep the lock */
+	  relation_close(seqRel, lockmode);
+	  continue;
+	}
+
+      /* Fix the pg_class and pg_depend entries */
+      AlterRelationNamespaceInternal(classRel, depForm->objid,
+				     oldNspOid, newNspOid,
+				     true);
+
+      /*
+       * Sequences have entries in pg_type. We need to be careful to move
+       * them to the new namespace, too.
+       */
+      AlterTypeNamespaceInternal(RelationGetForm(seqRel)->reltype,
+				 newNspOid, false, false);
+
+      /* Now we can close it.  Keep the lock till end of transaction. */
+      relation_close(seqRel, NoLock);
+    }
+
+  systable_endscan(scan);
+
+  relation_close(depRel, AccessShareLock);
 }
 
 
@@ -9192,27 +9243,27 @@ AlterSeqNamespaces(Relation classRel, Relation rel,
 void
 register_on_commit_action(Oid relid, OnCommitAction action)
 {
-	OnCommitItem *oc;
-	MemoryContext oldcxt;
+  OnCommitItem *oc;
+  MemoryContext oldcxt;
 
-	/*
-	 * We needn't bother registering the relation unless there is an ON COMMIT
-	 * action we need to take.
-	 */
-	if (action == ONCOMMIT_NOOP || action == ONCOMMIT_PRESERVE_ROWS)
-		return;
+  /*
+   * We needn't bother registering the relation unless there is an ON COMMIT
+   * action we need to take.
+   */
+  if (action == ONCOMMIT_NOOP || action == ONCOMMIT_PRESERVE_ROWS)
+    return;
 
-	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+  oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
 
-	oc = (OnCommitItem *) palloc(sizeof(OnCommitItem));
-	oc->relid = relid;
-	oc->oncommit = action;
-	oc->creating_subid = GetCurrentSubTransactionId();
-	oc->deleting_subid = InvalidSubTransactionId;
+  oc = (OnCommitItem *) palloc(sizeof(OnCommitItem));
+  oc->relid = relid;
+  oc->oncommit = action;
+  oc->creating_subid = GetCurrentSubTransactionId();
+  oc->deleting_subid = InvalidSubTransactionId;
 
-	on_commits = lcons(oc, on_commits);
+  on_commits = lcons(oc, on_commits);
 
-	MemoryContextSwitchTo(oldcxt);
+  MemoryContextSwitchTo(oldcxt);
 }
 
 /*
@@ -9223,18 +9274,18 @@ register_on_commit_action(Oid relid, OnCommitAction action)
 void
 remove_on_commit_action(Oid relid)
 {
-	ListCell   *l;
+  ListCell   *l;
 
-	foreach(l, on_commits)
-	{
-		OnCommitItem *oc = (OnCommitItem *) lfirst(l);
+  foreach(l, on_commits)
+    {
+      OnCommitItem *oc = (OnCommitItem *) lfirst(l);
 
-		if (oc->relid == relid)
-		{
-			oc->deleting_subid = GetCurrentSubTransactionId();
-			break;
-		}
+      if (oc->relid == relid)
+	{
+	  oc->deleting_subid = GetCurrentSubTransactionId();
+	  break;
 	}
+    }
 }
 
 /*
@@ -9246,50 +9297,50 @@ remove_on_commit_action(Oid relid)
 void
 PreCommit_on_commit_actions(void)
 {
-	ListCell   *l;
-	List	   *oids_to_truncate = NIL;
-
-	foreach(l, on_commits)
-	{
-		OnCommitItem *oc = (OnCommitItem *) lfirst(l);
-
-		/* Ignore entry if already dropped in this xact */
-		if (oc->deleting_subid != InvalidSubTransactionId)
-			continue;
-
-		switch (oc->oncommit)
-		{
-			case ONCOMMIT_NOOP:
-			case ONCOMMIT_PRESERVE_ROWS:
-				/* Do nothing (there shouldn't be such entries, actually) */
-				break;
-			case ONCOMMIT_DELETE_ROWS:
-				oids_to_truncate = lappend_oid(oids_to_truncate, oc->relid);
-				break;
-			case ONCOMMIT_DROP:
-				{
-					ObjectAddress object;
-
-					object.classId = RelationRelationId;
-					object.objectId = oc->relid;
-					object.objectSubId = 0;
-					performDeletion(&object, DROP_CASCADE);
-
-					/*
-					 * Note that table deletion will call
-					 * remove_on_commit_action, so the entry should get marked
-					 * as deleted.
-					 */
-					Assert(oc->deleting_subid != InvalidSubTransactionId);
-					break;
-				}
-		}
-	}
-	if (oids_to_truncate != NIL)
-	{
-		heap_truncate(oids_to_truncate);
-		CommandCounterIncrement();		/* XXX needed? */
-	}
+  ListCell   *l;
+  List	   *oids_to_truncate = NIL;
+
+  foreach(l, on_commits)
+    {
+      OnCommitItem *oc = (OnCommitItem *) lfirst(l);
+
+      /* Ignore entry if already dropped in this xact */
+      if (oc->deleting_subid != InvalidSubTransactionId)
+	continue;
+
+      switch (oc->oncommit)
+	{
+	case ONCOMMIT_NOOP:
+	case ONCOMMIT_PRESERVE_ROWS:
+	  /* Do nothing (there shouldn't be such entries, actually) */
+	  break;
+	case ONCOMMIT_DELETE_ROWS:
+	  oids_to_truncate = lappend_oid(oids_to_truncate, oc->relid);
+	  break;
+	case ONCOMMIT_DROP:
+	  {
+	    ObjectAddress object;
+
+	    object.classId = RelationRelationId;
+	    object.objectId = oc->relid;
+	    object.objectSubId = 0;
+	    performDeletion(&object, DROP_CASCADE);
+
+	    /*
+	     * Note that table deletion will call
+	     * remove_on_commit_action, so the entry should get marked
+	     * as deleted.
+	     */
+	    Assert(oc->deleting_subid != InvalidSubTransactionId);
+	    break;
+	  }
+	}
+    }
+  if (oids_to_truncate != NIL)
+    {
+      heap_truncate(oids_to_truncate);
+      CommandCounterIncrement();		/* XXX needed? */
+    }
 }
 
 /*
@@ -9303,36 +9354,36 @@ PreCommit_on_commit_actions(void)
 void
 AtEOXact_on_commit_actions(bool isCommit)
 {
-	ListCell   *cur_item;
-	ListCell   *prev_item;
+  ListCell   *cur_item;
+  ListCell   *prev_item;
 
-	prev_item = NULL;
-	cur_item = list_head(on_commits);
+  prev_item = NULL;
+  cur_item = list_head(on_commits);
 
-	while (cur_item != NULL)
-	{
-		OnCommitItem *oc = (OnCommitItem *) lfirst(cur_item);
+  while (cur_item != NULL)
+    {
+      OnCommitItem *oc = (OnCommitItem *) lfirst(cur_item);
 
-		if (isCommit ? oc->deleting_subid != InvalidSubTransactionId :
-			oc->creating_subid != InvalidSubTransactionId)
-		{
-			/* cur_item must be removed */
-			on_commits = list_delete_cell(on_commits, cur_item, prev_item);
-			pfree(oc);
-			if (prev_item)
-				cur_item = lnext(prev_item);
-			else
-				cur_item = list_head(on_commits);
-		}
-		else
-		{
-			/* cur_item must be preserved */
-			oc->creating_subid = InvalidSubTransactionId;
-			oc->deleting_subid = InvalidSubTransactionId;
-			prev_item = cur_item;
-			cur_item = lnext(prev_item);
-		}
+      if (isCommit ? oc->deleting_subid != InvalidSubTransactionId :
+	  oc->creating_subid != InvalidSubTransactionId)
+	{
+	  /* cur_item must be removed */
+	  on_commits = list_delete_cell(on_commits, cur_item, prev_item);
+	  pfree(oc);
+	  if (prev_item)
+	    cur_item = lnext(prev_item);
+	  else
+	    cur_item = list_head(on_commits);
+	}
+      else
+	{
+	  /* cur_item must be preserved */
+	  oc->creating_subid = InvalidSubTransactionId;
+	  oc->deleting_subid = InvalidSubTransactionId;
+	  prev_item = cur_item;
+	  cur_item = lnext(prev_item);
 	}
+    }
 }
 
 /*
@@ -9344,37 +9395,37 @@ AtEOXact_on_commit_actions(bool isCommit)
  */
 void
 AtEOSubXact_on_commit_actions(bool isCommit, SubTransactionId mySubid,
-							  SubTransactionId parentSubid)
+			      SubTransactionId parentSubid)
 {
-	ListCell   *cur_item;
-	ListCell   *prev_item;
+  ListCell   *cur_item;
+  ListCell   *prev_item;
 
-	prev_item = NULL;
-	cur_item = list_head(on_commits);
+  prev_item = NULL;
+  cur_item = list_head(on_commits);
 
-	while (cur_item != NULL)
-	{
-		OnCommitItem *oc = (OnCommitItem *) lfirst(cur_item);
+  while (cur_item != NULL)
+    {
+      OnCommitItem *oc = (OnCommitItem *) lfirst(cur_item);
 
-		if (!isCommit && oc->creating_subid == mySubid)
-		{
-			/* cur_item must be removed */
-			on_commits = list_delete_cell(on_commits, cur_item, prev_item);
-			pfree(oc);
-			if (prev_item)
-				cur_item = lnext(prev_item);
-			else
-				cur_item = list_head(on_commits);
-		}
-		else
-		{
-			/* cur_item must be preserved */
-			if (oc->creating_subid == mySubid)
-				oc->creating_subid = parentSubid;
-			if (oc->deleting_subid == mySubid)
-				oc->deleting_subid = isCommit ? parentSubid : InvalidSubTransactionId;
-			prev_item = cur_item;
-			cur_item = lnext(prev_item);
-		}
+      if (!isCommit && oc->creating_subid == mySubid)
+	{
+	  /* cur_item must be removed */
+	  on_commits = list_delete_cell(on_commits, cur_item, prev_item);
+	  pfree(oc);
+	  if (prev_item)
+	    cur_item = lnext(prev_item);
+	  else
+	    cur_item = list_head(on_commits);
+	}
+      else
+	{
+	  /* cur_item must be preserved */
+	  if (oc->creating_subid == mySubid)
+	    oc->creating_subid = parentSubid;
+	  if (oc->deleting_subid == mySubid)
+	    oc->deleting_subid = isCommit ? parentSubid : InvalidSubTransactionId;
+	  prev_item = cur_item;
+	  cur_item = lnext(prev_item);
 	}
+    }
 }
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index ce36ea8be45c0..f4352aef4eb32 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -143,14 +143,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 	ObjectAddress myself,
 				referenced;
 
-	/*
-	 * ShareRowExclusiveLock is sufficient to prevent concurrent write
-	 * activity to the relation, and thus to lock out any operations that
-	 * might want to fire triggers on the relation.  If we had ON SELECT
-	 * triggers we would need to take an AccessExclusiveLock to add one of
-	 * those, just as we do with ON SELECT rules.
-	 */
-	rel = heap_openrv(stmt->relation, ShareRowExclusiveLock);
+	rel = heap_openrv(stmt->relation, AccessExclusiveLock);
 
 	/*
 	 * Triggers must be on tables or views, and there are additional
@@ -309,7 +302,9 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 		 * subselects in WHEN clauses; it would fail to examine the contents
 		 * of subselects.
 		 */
-		varList = pull_var_clause(whenClause, PVC_REJECT_PLACEHOLDERS);
+		varList = pull_var_clause(whenClause,
+								  PVC_REJECT_AGGREGATES,
+								  PVC_REJECT_PLACEHOLDERS);
 		foreach(lc, varList)
 		{
 			Var		   *var = (Var *) lfirst(lc);
@@ -480,7 +475,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 	 * can skip this for internally generated triggers, since the name
 	 * modification above should be sufficient.
 	 *
-	 * NOTE that this is cool only because we have ShareRowExclusiveLock on
+	 * NOTE that this is cool only because we have AccessExclusiveLock on
 	 * the relation, so the trigger set won't be changing underneath us.
 	 */
 	if (!isInternal)
@@ -896,7 +891,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
 		ereport(NOTICE,
 		(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
 				constr_name, buf.data),
-		 errdetail("%s", _(funcdescr[funcnum]))));
+		 errdetail_internal("%s", _(funcdescr[funcnum]))));
 		oldContext = MemoryContextSwitchTo(TopMemoryContext);
 		info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
 		info->args = copyObject(stmt->args);
@@ -912,7 +907,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
 		ereport(NOTICE,
 		(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
 				constr_name, buf.data),
-		 errdetail("%s", _(funcdescr[funcnum]))));
+		 errdetail_internal("%s", _(funcdescr[funcnum]))));
 	}
 	else
 	{
@@ -924,7 +919,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
 		ereport(NOTICE,
 				(errmsg("converting trigger group into constraint \"%s\" %s",
 						constr_name, buf.data),
-				 errdetail("%s", _(funcdescr[funcnum]))));
+				 errdetail_internal("%s", _(funcdescr[funcnum]))));
 		fkcon->contype = CONSTR_FOREIGN;
 		fkcon->location = -1;
 		if (funcnum == 2)
@@ -1006,6 +1001,8 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
 		}
 		fkcon->deferrable = stmt->deferrable;
 		fkcon->initdeferred = stmt->initdeferred;
+		fkcon->skip_validation = false;
+		fkcon->initially_valid = true;
 
 		/* ... and execute it */
 		ProcessUtility((Node *) atstmt,
@@ -1082,14 +1079,11 @@ RemoveTriggerById(Oid trigOid)
 		elog(ERROR, "could not find tuple for trigger %u", trigOid);
 
 	/*
-	 * Open and lock the relation the trigger belongs to.  As in
-	 * CreateTrigger, this is sufficient to lock out all operations that could
-	 * fire or add triggers; but it would need to be revisited if we had ON
-	 * SELECT triggers.
+	 * Open and exclusive-lock the relation the trigger belongs to.
 	 */
 	relid = ((Form_pg_trigger) GETSTRUCT(tup))->tgrelid;
 
-	rel = heap_open(relid, ShareRowExclusiveLock);
+	rel = heap_open(relid, AccessExclusiveLock);
 
 	if (rel->rd_rel->relkind != RELKIND_RELATION &&
 		rel->rd_rel->relkind != RELKIND_VIEW)
@@ -2761,13 +2755,13 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
 		}
 		if (HeapTupleIsValid(newtup))
 		{
-			if (estate->es_trig_tuple_slot == NULL)
+			if (estate->es_trig_newtup_slot == NULL)
 			{
 				oldContext = MemoryContextSwitchTo(estate->es_query_cxt);
-				estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate);
+				estate->es_trig_newtup_slot = ExecInitExtraTupleSlot(estate);
 				MemoryContextSwitchTo(oldContext);
 			}
-			newslot = estate->es_trig_tuple_slot;
+			newslot = estate->es_trig_newtup_slot;
 			if (newslot->tts_tupleDescriptor != tupdesc)
 				ExecSetSlotDescriptor(newslot, tupdesc);
 			ExecStoreTuple(newtup, newslot, InvalidBuffer, false);
diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index 3355eaafda26a..deac1062ef971 100644
--- a/src/backend/commands/tsearchcmds.c
+++ b/src/backend/commands/tsearchcmds.c
@@ -142,7 +142,7 @@ makeParserDependencies(HeapTuple tuple)
 	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* dependencies on functions */
 	referenced.classId = ProcedureRelationId;
@@ -479,7 +479,7 @@ makeDictionaryDependencies(HeapTuple tuple)
 	recordDependencyOnOwner(myself.classId, myself.objectId, dict->dictowner);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* dependency on template */
 	referenced.classId = TSTemplateRelationId;
@@ -1069,7 +1069,7 @@ makeTSTemplateDependencies(HeapTuple tuple)
 	recordDependencyOn(&myself, &referenced, DEPENDENCY_NORMAL);
 
 	/* dependency on extension */
-	recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, false);
 
 	/* dependencies on functions */
 	referenced.classId = ProcedureRelationId;
@@ -1417,8 +1417,7 @@ makeConfigurationDependencies(HeapTuple tuple, bool removeOld,
 	recordDependencyOnOwner(myself.classId, myself.objectId, cfg->cfgowner);
 
 	/* dependency on extension */
-	if (!removeOld)
-		recordDependencyOnCurrentExtension(&myself);
+	recordDependencyOnCurrentExtension(&myself, removeOld);
 
 	/* dependency on parser */
 	referenced.classId = TSParserRelationId;
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 66c11de6723ab..18e80221070c7 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -1609,6 +1609,7 @@ DefineCompositeType(const RangeVar *typevar, List *coldeflist)
 	 * instead of below about a "relation".
 	 */
 	typeNamespace = RangeVarGetCreationNamespace(createStmt->relation);
+	RangeVarAdjustRelationPersistence(createStmt->relation, typeNamespace);
 	old_type_oid =
 		GetSysCacheOid2(TYPENAMENSP,
 						CStringGetDatum(createStmt->relation->relname),
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 838d6eba20565..871bda7cc59a8 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -953,7 +953,7 @@ DropRole(DropRoleStmt *stmt)
 					(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
 					 errmsg("role \"%s\" cannot be dropped because some objects depend on it",
 							role),
-					 errdetail("%s", detail),
+					 errdetail_internal("%s", detail),
 					 errdetail_log("%s", detail_log)));
 
 		/*
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 5cbf3a04f807f..fdd9fb4336ec5 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -78,7 +78,7 @@ static bool vacuum_rel(Oid relid, VacuumStmt *vacstmt, bool do_toast,
  * tables separately.
  *
  * for_wraparound is used by autovacuum to let us know when it's forcing
- * a vacuum for wraparound, which should not be auto-cancelled.
+ * a vacuum for wraparound, which should not be auto-canceled.
  *
  * bstrategy is normally given as NULL, but in autovacuum it can be passed
  * in to use the same buffer strategy object across multiple vacuum() calls.
@@ -484,7 +484,9 @@ vac_estimate_reltuples(Relation relation, bool is_analyze,
 
 	/*
 	 * If scanned_pages is zero but total_pages isn't, keep the existing value
-	 * of reltuples.
+	 * of reltuples.  (Note: callers should avoid updating the pg_class
+	 * statistics in this situation, since no new information has been
+	 * provided.)
 	 */
 	if (scanned_pages == 0)
 		return old_rel_tuples;
@@ -867,7 +869,7 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, bool do_toast, bool for_wraparound)
 		 * here by violating transaction semantics.)
 		 *
 		 * We also set the VACUUM_FOR_WRAPAROUND flag, which is passed down by
-		 * autovacuum; it's used to avoid cancelling a vacuum that was invoked
+		 * autovacuum; it's used to avoid canceling a vacuum that was invoked
 		 * in an emergency.
 		 *
 		 * Note: these flags remain set until CommitTransaction or
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index ccc586f12efa5..0e559720dce2a 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -84,6 +84,7 @@ typedef struct LVRelStats
 	/* hasindex = true means two-pass strategy; false means one-pass */
 	bool		hasindex;
 	/* Overall statistics about rel */
+	BlockNumber old_rel_pages;	/* previous value of pg_class.relpages */
 	BlockNumber rel_pages;		/* total number of pages */
 	BlockNumber scanned_pages;	/* number of pages we examined */
 	double		scanned_tuples; /* counts only tuples on scanned pages */
@@ -154,6 +155,9 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
 	TimestampTz starttime = 0;
 	bool		scan_all;
 	TransactionId freezeTableLimit;
+	BlockNumber new_rel_pages;
+	double		new_rel_tuples;
+	TransactionId new_frozen_xid;
 
 	pg_rusage_init(&ru0);
 
@@ -176,6 +180,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
 
 	vacrelstats = (LVRelStats *) palloc0(sizeof(LVRelStats));
 
+	vacrelstats->old_rel_pages = onerel->rd_rel->relpages;
 	vacrelstats->old_rel_tuples = onerel->rd_rel->reltuples;
 	vacrelstats->num_index_scans = 0;
 
@@ -205,20 +210,39 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
 	FreeSpaceMapVacuum(onerel);
 
 	/*
-	 * Update statistics in pg_class.  But don't change relfrozenxid if we
-	 * skipped any pages.
+	 * Update statistics in pg_class.
+	 *
+	 * A corner case here is that if we scanned no pages at all because every
+	 * page is all-visible, we should not update relpages/reltuples, because
+	 * we have no new information to contribute.  In particular this keeps
+	 * us from replacing relpages=reltuples=0 (which means "unknown tuple
+	 * density") with nonzero relpages and reltuples=0 (which means "zero
+	 * tuple density") unless there's some actual evidence for the latter.
+	 *
+	 * Also, don't change relfrozenxid if we skipped any pages, since then
+	 * we don't know for certain that all tuples have a newer xmin.
 	 */
+	new_rel_pages = vacrelstats->rel_pages;
+	new_rel_tuples = vacrelstats->new_rel_tuples;
+	if (vacrelstats->scanned_pages == 0 && new_rel_pages > 0)
+	{
+		new_rel_pages = vacrelstats->old_rel_pages;
+		new_rel_tuples = vacrelstats->old_rel_tuples;
+	}
+
+	new_frozen_xid = FreezeLimit;
+	if (vacrelstats->scanned_pages < vacrelstats->rel_pages)
+		new_frozen_xid = InvalidTransactionId;
+
 	vac_update_relstats(onerel,
-						vacrelstats->rel_pages, vacrelstats->new_rel_tuples,
+						new_rel_pages, new_rel_tuples,
 						vacrelstats->hasindex,
-					  (vacrelstats->scanned_pages < vacrelstats->rel_pages) ?
-						InvalidTransactionId :
-						FreezeLimit);
+						new_frozen_xid);
 
 	/* report results to the stats collector, too */
 	pgstat_report_vacuum(RelationGetRelid(onerel),
 						 onerel->rd_rel->relisshared,
-						 vacrelstats->new_rel_tuples);
+						 new_rel_tuples);
 
 	/* and log the action if appropriate */
 	if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0)
@@ -238,7 +262,7 @@ lazy_vacuum_rel(Relation onerel, VacuumStmt *vacstmt,
 							vacrelstats->pages_removed,
 							vacrelstats->rel_pages,
 							vacrelstats->tuples_deleted,
-							vacrelstats->new_rel_tuples,
+							new_rel_tuples,
 							pg_rusage_show(&ru0))));
 	}
 }
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index be681e3fd4f9f..200c65a468eca 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -97,10 +97,10 @@ isViewOnTempTable_walker(Node *node, void *context)
  *---------------------------------------------------------------------
  */
 static Oid
-DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace)
+DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace,
+					  Oid namespaceId)
 {
-	Oid			viewOid,
-				namespaceId;
+	Oid			viewOid;
 	CreateStmt *createStmt = makeNode(CreateStmt);
 	List	   *attrList;
 	ListCell   *t;
@@ -160,7 +160,6 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace)
 	/*
 	 * Check to see if we want to replace an existing view.
 	 */
-	namespaceId = RangeVarGetCreationNamespace(relation);
 	viewOid = get_relname_relid(relation->relname, namespaceId);
 
 	if (OidIsValid(viewOid) && replace)
@@ -417,6 +416,7 @@ DefineView(ViewStmt *stmt, const char *queryString)
 {
 	Query	   *viewParse;
 	Oid			viewOid;
+	Oid			namespaceId;
 	RangeVar   *view;
 
 	/*
@@ -426,6 +426,7 @@ DefineView(ViewStmt *stmt, const char *queryString)
 	 * Since parse analysis scribbles on its input, copy the raw parse tree;
 	 * this ensures we don't corrupt a prepared statement, for example.
 	 */
+		printf("view.c (429): DefineView called %s\n", queryString);
 	viewParse = parse_analyze((Node *) copyObject(stmt->query),
 							  queryString, NULL, 0);
 
@@ -480,28 +481,33 @@ DefineView(ViewStmt *stmt, const char *queryString)
 							"names than columns")));
 	}
 
+	/* Unlogged views are not sensible. */
+	if (stmt->view->relpersistence == RELPERSISTENCE_UNLOGGED)
+		ereport(ERROR,
+				(errcode(ERRCODE_SYNTAX_ERROR),
+		errmsg("views cannot be unlogged because they do not have storage")));
+
 	/*
 	 * If the user didn't explicitly ask for a temporary view, check whether
 	 * we need one implicitly.	We allow TEMP to be inserted automatically as
 	 * long as the CREATE command is consistent with that --- no explicit
 	 * schema name.
 	 */
-	view = stmt->view;
+    printf("view.c:496 Node tag for stmt: %d\n",stmt->type);
+	view = copyObject(stmt->view);  /* don't corrupt original command */
+    printf("view.c:498 Node tag for view: %d\n",view->type);
 	if (view->relpersistence == RELPERSISTENCE_PERMANENT
 		&& isViewOnTempTable(viewParse))
 	{
-		view = copyObject(view);	/* don't corrupt original command */
 		view->relpersistence = RELPERSISTENCE_TEMP;
 		ereport(NOTICE,
 				(errmsg("view \"%s\" will be a temporary view",
 						view->relname)));
 	}
 
-	/* Unlogged views are not sensible. */
-	if (view->relpersistence == RELPERSISTENCE_UNLOGGED)
-		ereport(ERROR,
-				(errcode(ERRCODE_SYNTAX_ERROR),
-		errmsg("views cannot be unlogged because they do not have storage")));
+	/* Might also need to make it temporary if placed in temp schema. */
+	namespaceId = RangeVarGetCreationNamespace(view);
+	RangeVarAdjustRelationPersistence(view, namespaceId);
 
 	/*
 	 * Create the view relation
@@ -510,7 +516,7 @@ DefineView(ViewStmt *stmt, const char *queryString)
 	 * aborted.
 	 */
 	viewOid = DefineVirtualRelation(view, viewParse->targetList,
-									stmt->replace);
+									stmt->replace, namespaceId);
 
 	/*
 	 * The relation we have just created is not visible to any other commands
@@ -524,6 +530,7 @@ DefineView(ViewStmt *stmt, const char *queryString)
 	 * and "NEW" relations. So... add them!
 	 */
 	viewParse = UpdateRangeTableOfViewParse(viewOid, viewParse);
+    printf("Nodetag for view:%d\n",viewParse->type);
 
 	/*
 	 * Now create the rules associated with the view.
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index df1d3cab4d162..44a2a6a94acd0 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -73,7 +73,7 @@ ExecutorEnd_hook_type ExecutorEnd_hook = NULL;
 ExecutorCheckPerms_hook_type ExecutorCheckPerms_hook = NULL;
 
 /* decls for local routines only used within this module */
-static void InitPlan(QueryDesc *queryDesc, int eflags);
+static void InitPlan(QueryDesc *queryDesc, int eflags, char relOrMat);
 static void CheckValidRowMarkRel(Relation rel, RowMarkType markType);
 static void ExecPostprocessPlan(EState *estate);
 static void ExecEndPlan(PlanState *planstate, EState *estate);
@@ -87,7 +87,7 @@ static bool ExecCheckRTEPerms(RangeTblEntry *rte);
 static void ExecCheckXactReadOnly(PlannedStmt *plannedstmt);
 static void EvalPlanQualStart(EPQState *epqstate, EState *parentestate,
 				  Plan *planTree);
-static void OpenIntoRel(QueryDesc *queryDesc);
+static void OpenIntoRel(QueryDesc *queryDesc, char relOrMat);
 static void CloseIntoRel(QueryDesc *queryDesc);
 static void intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo);
 static void intorel_receive(TupleTableSlot *slot, DestReceiver *self);
@@ -120,16 +120,17 @@ static void intorel_destroy(DestReceiver *self);
  * ----------------------------------------------------------------
  */
 void
-ExecutorStart(QueryDesc *queryDesc, int eflags)
+ExecutorStart(QueryDesc *queryDesc, int eflags, char relOrMat)
 {
+  printf("execMain.c 125: ExecutorStart called\n");
 	if (ExecutorStart_hook)
 		(*ExecutorStart_hook) (queryDesc, eflags);
 	else
-		standard_ExecutorStart(queryDesc, eflags);
+		standard_ExecutorStart(queryDesc, eflags, relOrMat);
 }
 
 void
-standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
+standard_ExecutorStart(QueryDesc *queryDesc, int eflags, char relOrMat)
 {
 	EState	   *estate;
 	MemoryContext oldcontext;
@@ -212,7 +213,7 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	/*
 	 * Initialize the plan state tree
 	 */
-	InitPlan(queryDesc, eflags);
+	InitPlan(queryDesc, eflags, relOrMat);
 
 	/*
 	 * Set up an AFTER-trigger statement context, unless told not to, or
@@ -732,7 +733,7 @@ ExecCheckXactReadOnly(PlannedStmt *plannedstmt)
  * ----------------------------------------------------------------
  */
 static void
-InitPlan(QueryDesc *queryDesc, int eflags)
+InitPlan(QueryDesc *queryDesc, int eflags, char relOrMat)
 {
 	CmdType		operation = queryDesc->operation;
 	PlannedStmt *plannedstmt = queryDesc->plannedstmt;
@@ -871,6 +872,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	estate->es_tupleTable = NIL;
 	estate->es_trig_tuple_slot = NULL;
 	estate->es_trig_oldtup_slot = NULL;
+	estate->es_trig_newtup_slot = NULL;
 
 	/* mark EvalPlanQual not active */
 	estate->es_epqTuple = NULL;
@@ -966,7 +968,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 	 * If EXPLAIN, skip creating the "into" relation.
 	 */
 	if (estate->es_select_into && !(eflags & EXEC_FLAG_EXPLAIN_ONLY))
-		OpenIntoRel(queryDesc);
+		OpenIntoRel(queryDesc, relOrMat);
 }
 
 /*
@@ -2384,7 +2386,7 @@ typedef struct
  * been placed in queryDesc->tupDesc.
  */
 static void
-OpenIntoRel(QueryDesc *queryDesc)
+OpenIntoRel(QueryDesc *queryDesc, char relOrMat)
 {
 	IntoClause *into = queryDesc->plannedstmt->intoClause;
 	EState	   *estate = queryDesc->estate;
@@ -2414,6 +2416,13 @@ OpenIntoRel(QueryDesc *queryDesc)
 				(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 				 errmsg("ON COMMIT can only be used on temporary tables")));
 
+	/*
+	 * Find namespace to create in, check its permissions
+	 */
+	intoName = into->rel->relname;
+	namespaceId = RangeVarGetAndCheckCreationNamespace(into->rel);
+	RangeVarAdjustRelationPersistence(into->rel, namespaceId);
+
 	/*
 	 * Security check: disallow creating temp tables from security-restricted
 	 * code.  This is needed because calling code might not expect untrusted
@@ -2425,12 +2434,6 @@ OpenIntoRel(QueryDesc *queryDesc)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("cannot create temporary table within security-restricted operation")));
 
-	/*
-	 * Find namespace to create in, check its permissions
-	 */
-	intoName = into->rel->relname;
-	namespaceId = RangeVarGetAndCheckCreationNamespace(into->rel);
-
 	/*
 	 * Select tablespace to use.  If not specified, use default tablespace
 	 * (which may in turn default to database's default).
@@ -2465,7 +2468,7 @@ OpenIntoRel(QueryDesc *queryDesc)
 									 validnsps,
 									 true,
 									 false);
-	(void) heap_reloptions(RELKIND_RELATION, reloptions, true);
+	(void) heap_reloptions(relOrMat, reloptions, true);
 
 	/* Copy the tupdesc because heap_create_with_catalog modifies it */
 	tupdesc = CreateTupleDescCopy(queryDesc->tupDesc);
@@ -2480,7 +2483,7 @@ OpenIntoRel(QueryDesc *queryDesc)
 											  GetUserId(),
 											  tupdesc,
 											  NIL,
-											  RELKIND_RELATION,
+											  relOrMat,
 											  into->rel->relpersistence,
 											  false,
 											  false,
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 073ef8d23b368..63e3d9277264d 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -124,6 +124,7 @@ CreateExecutorState(void)
 	estate->es_trig_target_relations = NIL;
 	estate->es_trig_tuple_slot = NULL;
 	estate->es_trig_oldtup_slot = NULL;
+	estate->es_trig_newtup_slot = NULL;
 
 	estate->es_param_list_info = NULL;
 	estate->es_param_exec_vals = NULL;
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 13946cab23d88..56d8f8da9017c 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -578,7 +578,7 @@ postquel_start(execution_state *es, SQLFunctionCachePtr fcache)
 			eflags = EXEC_FLAG_SKIP_TRIGGERS;
 		else
 			eflags = 0;			/* default run-to-completion flags */
-		ExecutorStart(es->qd, eflags);
+		ExecutorStart(es->qd, eflags, 'r');
 	}
 
 	es->status = F_EXEC_RUN;
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 20d5eb14bf2c1..c376c55f1e1ea 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -370,14 +370,23 @@ bitgetpage(HeapScanDesc scan, TBMIterateResult *tbmres)
 		{
 			ItemId		lp;
 			HeapTupleData loctup;
+			bool		valid;
 
 			lp = PageGetItemId(dp, offnum);
 			if (!ItemIdIsNormal(lp))
 				continue;
 			loctup.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
 			loctup.t_len = ItemIdGetLength(lp);
-			if (HeapTupleSatisfiesVisibility(&loctup, snapshot, buffer))
+			loctup.t_tableOid = scan->rs_rd->rd_id;
+			ItemPointerSet(&loctup.t_self, page, offnum);
+			valid = HeapTupleSatisfiesVisibility(&loctup, snapshot, buffer);
+			if (valid)
+			{
 				scan->rs_vistuples[ntup++] = offnum;
+				PredicateLockTuple(scan->rs_rd, &loctup, snapshot);
+			}
+			CheckForSerializableConflictOut(valid, scan->rs_rd, &loctup,
+											buffer, snapshot);
 		}
 	}
 
diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
index 85d1a6e27f110..f2d356d1f182d 100644
--- a/src/backend/executor/nodeLimit.c
+++ b/src/backend/executor/nodeLimit.c
@@ -127,7 +127,7 @@ ExecLimit(LimitState *node)
 				 * the state machine state to record having done so.
 				 */
 				if (!node->noCount &&
-					node->position >= node->offset + node->count)
+					node->position - node->offset >= node->count)
 				{
 					node->lstate = LIMIT_WINDOWEND;
 					return NULL;
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index e98bc0f5a308b..b4793583587f2 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -148,6 +148,7 @@ ExecNestLoop(NestLoopState *node)
 
 				prm = &(econtext->ecxt_param_exec_vals[paramno]);
 				/* Param value should be an OUTER var */
+				Assert(IsA(nlp->paramval, Var));
 				Assert(nlp->paramval->varno == OUTER);
 				Assert(nlp->paramval->varattno > 0);
 				prm->value = slot_getattr(outerTupleSlot,
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 1e566b2d5057a..0f3438d0639d8 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -28,7 +28,6 @@
 #include "access/relscan.h"
 #include "executor/execdebug.h"
 #include "executor/nodeSeqscan.h"
-#include "storage/predicate.h"
 
 static void InitScanRelation(SeqScanState *node, EState *estate);
 static TupleTableSlot *SeqNext(SeqScanState *node);
@@ -106,15 +105,11 @@ SeqRecheck(SeqScanState *node, TupleTableSlot *slot)
  *		tuple.
  *		We call the ExecScan() routine and pass it the appropriate
  *		access method functions.
- *		For serializable transactions, we first acquire a predicate
- *		lock on the entire relation.
  * ----------------------------------------------------------------
  */
 TupleTableSlot *
 ExecSeqScan(SeqScanState *node)
 {
-	PredicateLockRelation(node->ss_currentRelation);
-	node->ss_currentScanDesc->rs_relpredicatelocked = true;
 	return ExecScan((ScanState *) node,
 					(ExecScanAccessMtd) SeqNext,
 					(ExecScanRecheckMtd) SeqRecheck);
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 6e723ca092b32..a6733ffe4c41f 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -2105,7 +2105,7 @@ _SPI_pquery(QueryDesc *queryDesc, bool fire_triggers, long tcount)
 	else
 		eflags = EXEC_FLAG_SKIP_TRIGGERS;
 
-	ExecutorStart(queryDesc, eflags);
+	ExecutorStart(queryDesc, eflags, 'r');
 
 	ExecutorRun(queryDesc, ForwardScanDirection, tcount);
 
diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c
index 4a7b2c30cf308..269a9ad82f52e 100644
--- a/src/backend/foreign/foreign.c
+++ b/src/backend/foreign/foreign.c
@@ -371,8 +371,17 @@ deflist_to_tuplestore(ReturnSetInfo *rsinfo, List *options)
 		DefElem    *def = lfirst(cell);
 
 		values[0] = CStringGetTextDatum(def->defname);
-		values[1] = CStringGetTextDatum(((Value *) def->arg)->val.str);
-		nulls[0] = nulls[1] = false;
+		nulls[0] = false;
+		if (def->arg)
+		{
+			values[1] = CStringGetTextDatum(((Value *) (def->arg))->val.str);
+			nulls[1] = false;
+		}
+		else
+		{
+			values[1] = (Datum) 0;
+			nulls[1] = true;
+		}
 		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
 	}
 
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 778849e4347f1..03fe1846d25ca 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -443,6 +443,17 @@ ClientAuthentication(Port *port)
 								   NULL, 0,
 								   NI_NUMERICHOST);
 
+#define HOSTNAME_LOOKUP_DETAIL(port) \
+				(port->remote_hostname				  \
+				 ? (port->remote_hostname_resolv == +1					\
+					? errdetail_log("Client IP address resolved to \"%s\", forward lookup matches.", port->remote_hostname) \
+					: (port->remote_hostname_resolv == 0				\
+					   ? errdetail_log("Client IP address resolved to \"%s\", forward lookup not checked.", port->remote_hostname) \
+					   : (port->remote_hostname_resolv == -1			\
+						  ? errdetail_log("Client IP address resolved to \"%s\", forward lookup does not match.", port->remote_hostname) \
+						  : 0)))										\
+				 : 0)
+
 				if (am_walsender)
 				{
 #ifdef USE_SSL
@@ -450,12 +461,14 @@ ClientAuthentication(Port *port)
 					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
 						errmsg("no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s",
 							   hostinfo, port->user_name,
-							   port->ssl ? _("SSL on") : _("SSL off"))));
+							   port->ssl ? _("SSL on") : _("SSL off")),
+						HOSTNAME_LOOKUP_DETAIL(port)));
 #else
 					ereport(FATAL,
 					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
 						errmsg("no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\"",
-							   hostinfo, port->user_name)));
+							   hostinfo, port->user_name),
+						HOSTNAME_LOOKUP_DETAIL(port)));
 #endif
 				}
 				else
@@ -466,13 +479,15 @@ ClientAuthentication(Port *port)
 						errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s",
 							   hostinfo, port->user_name,
 							   port->database_name,
-							   port->ssl ? _("SSL on") : _("SSL off"))));
+							   port->ssl ? _("SSL on") : _("SSL off")),
+						HOSTNAME_LOOKUP_DETAIL(port)));
 #else
 					ereport(FATAL,
 					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
 						errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\"",
 							   hostinfo, port->user_name,
-							   port->database_name)));
+							   port->database_name),
+						HOSTNAME_LOOKUP_DETAIL(port)));
 #endif
 				}
 				break;
@@ -959,7 +974,7 @@ pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
 	 */
 	ereport(severity,
 			(errmsg_internal("%s", errmsg),
-			 errdetail("%s: %s", msg_major, msg_minor)));
+			 errdetail_internal("%s: %s", msg_major, msg_minor)));
 }
 
 static int
@@ -1202,11 +1217,11 @@ pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
 					  sysmsg, sizeof(sysmsg), NULL) == 0)
 		ereport(severity,
 				(errmsg_internal("%s", errmsg),
-				 errdetail("SSPI error %x", (unsigned int) r)));
+				 errdetail_internal("SSPI error %x", (unsigned int) r)));
 	else
 		ereport(severity,
 				(errmsg_internal("%s", errmsg),
-				 errdetail("%s (%x)", sysmsg, (unsigned int) r)));
+				 errdetail_internal("%s (%x)", sysmsg, (unsigned int) r)));
 }
 
 static int
@@ -1353,16 +1368,22 @@ pg_SSPI_recvauth(Port *port)
 						  _("could not accept SSPI security context"), r);
 		}
 
+		/*
+		 * Overwrite the current context with the one we just received.
+		 * If sspictx is NULL it was the first loop and we need to allocate
+		 * a buffer for it. On subsequent runs, we can just overwrite the
+		 * buffer contents since the size does not change.
+		 */
 		if (sspictx == NULL)
 		{
 			sspictx = malloc(sizeof(CtxtHandle));
 			if (sspictx == NULL)
 				ereport(ERROR,
 						(errmsg("out of memory")));
-
-			memcpy(sspictx, &newctx, sizeof(CtxtHandle));
 		}
 
+		memcpy(sspictx, &newctx, sizeof(CtxtHandle));
+
 		if (r == SEC_I_CONTINUE_NEEDED)
 			elog(DEBUG4, "SSPI continue needed");
 
@@ -1436,7 +1457,7 @@ pg_SSPI_recvauth(Port *port)
 	if (!LookupAccountSid(NULL, tokenuser->User.Sid, accountname, &accountnamesize,
 						  domainname, &domainnamesize, &accountnameuse))
 		ereport(ERROR,
-			  (errmsg_internal("could not lookup acconut sid: error code %d",
+			  (errmsg_internal("could not look up account SID: error code %d",
 							   (int) GetLastError())));
 
 	free(tokenuser);
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 437a0c79b0af6..4e8faa4f35c3d 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -644,7 +644,7 @@ tmp_dh_cb(SSL *s, int is_export, int keylength)
 	if (r == NULL || 8 * DH_size(r) < keylength)
 	{
 		ereport(DEBUG2,
-				(errmsg_internal("DH: generating parameters (%d bits)....",
+				(errmsg_internal("DH: generating parameters (%d bits)",
 								 keylength)));
 		r = DH_generate_parameters(keylength, DH_GENERATOR_2, NULL, NULL);
 	}
@@ -736,6 +736,12 @@ initialize_SSL(void)
 					(errmsg("could not create SSL context: %s",
 							SSLerrmessage())));
 
+		/*
+		 * Disable OpenSSL's moving-write-buffer sanity check, because it
+		 * causes unnecessary failures in nonblocking send cases.
+		 */
+		SSL_CTX_set_mode(SSL_context, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+
 		/*
 		 * Load and verify server's certificate and private key
 		 */
diff --git a/src/backend/nls.mk b/src/backend/nls.mk
index 18945692cd2d6..b9bce33de3e47 100644
--- a/src/backend/nls.mk
+++ b/src/backend/nls.mk
@@ -1,6 +1,6 @@
 # src/backend/nls.mk
 CATALOG_NAME	:= postgres
-AVAIL_LANGUAGES	:= de es fr ja pt_BR tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= de es fr ja pl pt_BR zh_CN zh_TW
 GETTEXT_FILES	:= + gettext-files
 GETTEXT_TRIGGERS:= _ errmsg errmsg_plural:1,2 errdetail errdetail_log \
     errdetail_plural:1,2 errhint errcontext \
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index c9133ddfa19b4..5b9ffb2f20291 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -4275,7 +4275,8 @@ copyObject(void *from)
 		case T_AlterEnumStmt:
 			retval = _copyAlterEnumStmt(from);
 			break;
-		case T_ViewStmt:
+	case T_ViewStmt:
+	  printf("copyfuncs 93: Viewstmt\n");
 			retval = _copyViewStmt(from);
 			break;
 		case T_LoadStmt:
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 4d2eccf817905..e4e5fd2e4294e 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -121,11 +121,17 @@ makeVarFromTargetEntry(Index varno,
  * with error cases, but it's not worth changing now.)  The vartype indicates
  * a rowtype; either a named composite type, or RECORD.  This function
  * encapsulates the logic for determining the correct rowtype OID to use.
+ *
+ * If allowScalar is true, then for the case where the RTE is a function
+ * returning a non-composite result type, we produce a normal Var referencing
+ * the function's result directly, instead of the single-column composite
+ * value that the whole-row notation might otherwise suggest.
  */
 Var *
 makeWholeRowVar(RangeTblEntry *rte,
 				Index varno,
-				Index varlevelsup)
+				Index varlevelsup,
+				bool allowScalar)
 {
 	Var		   *result;
 	Oid			toid;
@@ -157,39 +163,34 @@ makeWholeRowVar(RangeTblEntry *rte,
 								 InvalidOid,
 								 varlevelsup);
 			}
-			else
+			else if (allowScalar)
 			{
-				/*
-				 * func returns scalar; instead of making a whole-row Var,
-				 * just reference the function's scalar output.  (XXX this
-				 * seems a tad inconsistent, especially if "f.*" was
-				 * explicitly written ...)
-				 */
+				/* func returns scalar; just return its output as-is */
 				result = makeVar(varno,
 								 1,
 								 toid,
 								 -1,
+								 exprCollation(rte->funcexpr),
+								 varlevelsup);
+			}
+			else
+			{
+				/* func returns scalar, but we want a composite result */
+				result = makeVar(varno,
+								 InvalidAttrNumber,
+								 RECORDOID,
+								 -1,
 								 InvalidOid,
 								 varlevelsup);
 			}
 			break;
-		case RTE_VALUES:
-			toid = RECORDOID;
-			/* returns composite; same as relation case */
-			result = makeVar(varno,
-							 InvalidAttrNumber,
-							 toid,
-							 -1,
-							 InvalidOid,
-							 varlevelsup);
-			break;
 		default:
 
 			/*
-			 * RTE is a join or subselect.	We represent this as a whole-row
-			 * Var of RECORD type.	(Note that in most cases the Var will be
-			 * expanded to a RowExpr during planning, but that is not our
-			 * concern here.)
+			 * RTE is a join, subselect, or VALUES.  We represent this as a
+			 * whole-row Var of RECORD type. (Note that in most cases the Var
+			 * will be expanded to a RowExpr during planning, but that is not
+			 * our concern here.)
 			 */
 			result = makeVar(varno,
 							 InvalidAttrNumber,
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 681f5f85bc740..96b09fbce7183 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -1764,6 +1764,7 @@ _outIndexOptInfo(StringInfo str, IndexOptInfo *node)
 	WRITE_NODE_FIELD(indpred);
 	WRITE_BOOL_FIELD(predOK);
 	WRITE_BOOL_FIELD(unique);
+	WRITE_BOOL_FIELD(immediate);
 	WRITE_BOOL_FIELD(hypothetical);
 }
 
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index cd119dbabb8c7..e22824a7dcd4c 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -82,7 +82,7 @@ elog_node_display(int lev, const char *title, void *obj, bool pretty)
 	pfree(s);
 	ereport(lev,
 			(errmsg_internal("%s:", title),
-			 errdetail("%s", f)));
+			 errdetail_internal("%s", f)));
 	pfree(f);
 }
 
diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c
index 33f94c03b2a08..6f806fda8515c 100644
--- a/src/backend/nodes/tidbitmap.c
+++ b/src/backend/nodes/tidbitmap.c
@@ -953,8 +953,11 @@ tbm_lossify(TIDBitmap *tbm)
 	/*
 	 * XXX Really stupid implementation: this just lossifies pages in
 	 * essentially random order.  We should be paying some attention to the
-	 * number of bits set in each page, instead.  Also it might be a good idea
-	 * to lossify more than the minimum number of pages during each call.
+	 * number of bits set in each page, instead.
+	 *
+	 * Since we are called as soon as nentries exceeds maxentries, we should
+	 * push nentries down to significantly less than maxentries, or else we'll
+	 * just end up doing this again very soon.  We shoot for maxentries/2.
 	 */
 	Assert(!tbm->iterating);
 	Assert(tbm->status == TBM_HASH);
@@ -975,7 +978,7 @@ tbm_lossify(TIDBitmap *tbm)
 		/* This does the dirty work ... */
 		tbm_mark_page_lossy(tbm, page->blockno);
 
-		if (tbm->nentries <= tbm->maxentries)
+		if (tbm->nentries <= tbm->maxentries / 2)
 		{
 			/* we have done enough */
 			hash_seq_term(&status);
@@ -988,6 +991,19 @@ tbm_lossify(TIDBitmap *tbm)
 		 * not care whether we visit lossy chunks or not.
 		 */
 	}
+
+	/*
+	 * With a big bitmap and small work_mem, it's possible that we cannot
+	 * get under maxentries.  Again, if that happens, we'd end up uselessly
+	 * calling tbm_lossify over and over.  To prevent this from becoming a
+	 * performance sink, force maxentries up to at least double the current
+	 * number of entries.  (In essence, we're admitting inability to fit
+	 * within work_mem when we do this.)  Note that this test will not fire
+	 * if we broke out of the loop early; and if we didn't, the current
+	 * number of entries is simply not reducible any further.
+	 */
+	if (tbm->nentries > tbm->maxentries / 2)
+		tbm->maxentries = Min(tbm->nentries, (INT_MAX - 1) / 2) * 2;
 }
 
 /*
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 47ab08e502e63..a14b809a14ca7 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -403,7 +403,15 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 			continue;
 		}
 
-		/* CE failed, so finish copying targetlist and join quals */
+		/*
+		 * CE failed, so finish copying/modifying targetlist and join quals.
+		 *
+		 * Note: the resulting childrel->reltargetlist may contain arbitrary
+		 * expressions, which normally would not occur in a reltargetlist.
+		 * That is okay because nothing outside of this routine will look at
+		 * the child rel's reltargetlist.  We do have to cope with the case
+		 * while constructing attr_widths estimates below, though.
+		 */
 		childrel->joininfo = (List *)
 			adjust_appendrel_attrs((Node *) rel->joininfo,
 								   appinfo);
@@ -486,23 +494,36 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 			parent_rows += childrel->rows;
 			parent_size += childrel->width * childrel->rows;
 
+			/*
+			 * Accumulate per-column estimates too.  We need not do anything
+			 * for PlaceHolderVars in the parent list.  If child expression
+			 * isn't a Var, or we didn't record a width estimate for it, we
+			 * have to fall back on a datatype-based estimate.
+			 *
+			 * By construction, child's reltargetlist is 1-to-1 with parent's.
+			 */
 			forboth(parentvars, rel->reltargetlist,
 					childvars, childrel->reltargetlist)
 			{
 				Var		   *parentvar = (Var *) lfirst(parentvars);
-				Var		   *childvar = (Var *) lfirst(childvars);
-
-				/*
-				 * Accumulate per-column estimates too.  Whole-row Vars and
-				 * PlaceHolderVars can be ignored here.
-				 */
-				if (IsA(parentvar, Var) &&
-					IsA(childvar, Var))
+				Node	   *childvar = (Node *) lfirst(childvars);
+
+				if (IsA(parentvar, Var))
 				{
 					int			pndx = parentvar->varattno - rel->min_attr;
-					int			cndx = childvar->varattno - childrel->min_attr;
-
-					parent_attrsizes[pndx] += childrel->attr_widths[cndx] * childrel->rows;
+					int32		child_width = 0;
+
+					if (IsA(childvar, Var))
+					{
+						int		cndx = ((Var *) childvar)->varattno - childrel->min_attr;
+
+						child_width = childrel->attr_widths[cndx];
+					}
+					if (child_width <= 0)
+						child_width = get_typavgwidth(exprType(childvar),
+													  exprTypmod(childvar));
+					Assert(child_width > 0);
+					parent_attrsizes[pndx] += child_width * childrel->rows;
 				}
 			}
 		}
@@ -1304,7 +1325,8 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual,
 
 	/*
 	 * It would be unsafe to push down window function calls, but at least for
-	 * the moment we could never see any in a qual anyhow.
+	 * the moment we could never see any in a qual anyhow.  (The same applies
+	 * to aggregates, which we check for in pull_var_clause below.)
 	 */
 	Assert(!contain_window_function(qual));
 
@@ -1312,7 +1334,9 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual,
 	 * Examine all Vars used in clause; since it's a restriction clause, all
 	 * such Vars must refer to subselect output columns.
 	 */
-	vars = pull_var_clause(qual, PVC_INCLUDE_PLACEHOLDERS);
+	vars = pull_var_clause(qual,
+						   PVC_REJECT_AGGREGATES,
+						   PVC_INCLUDE_PLACEHOLDERS);
 	foreach(vl, vars)
 	{
 		Var		   *var = (Var *) lfirst(vl);
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index bb38768bd4358..c853bd8dcb6ca 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -3238,14 +3238,14 @@ set_subquery_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 	/*
 	 * Compute per-output-column width estimates by examining the subquery's
 	 * targetlist.	For any output that is a plain Var, get the width estimate
-	 * that was made while planning the subquery.  Otherwise, fall back on a
-	 * datatype-based estimate.
+	 * that was made while planning the subquery.  Otherwise, we leave it to
+	 * set_rel_width to fill in a datatype-based default estimate.
 	 */
 	foreach(lc, subroot->parse->targetList)
 	{
 		TargetEntry *te = (TargetEntry *) lfirst(lc);
 		Node	   *texpr = (Node *) te->expr;
-		int32		item_width;
+		int32		item_width = 0;
 
 		Assert(IsA(te, TargetEntry));
 		/* junk columns aren't visible to upper query */
@@ -3256,8 +3256,14 @@ set_subquery_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 		 * XXX This currently doesn't work for subqueries containing set
 		 * operations, because the Vars in their tlists are bogus references
 		 * to the first leaf subquery, which wouldn't give the right answer
-		 * even if we could still get to its PlannerInfo.  So fall back on
-		 * datatype in that case.
+		 * even if we could still get to its PlannerInfo.
+		 *
+		 * Also, the subquery could be an appendrel for which all branches are
+		 * known empty due to constraint exclusion, in which case
+		 * set_append_rel_pathlist will have left the attr_widths set to zero.
+		 *
+		 * In either case, we just leave the width estimate zero until
+		 * set_rel_width fixes it.
 		 */
 		if (IsA(texpr, Var) &&
 			subroot->parse->setOperations == NULL)
@@ -3267,11 +3273,6 @@ set_subquery_size_estimates(PlannerInfo *root, RelOptInfo *rel,
 
 			item_width = subrel->attr_widths[var->varattno - subrel->min_attr];
 		}
-		else
-		{
-			item_width = get_typavgwidth(exprType(texpr), exprTypmod(texpr));
-		}
-		Assert(item_width > 0);
 		Assert(te->resno >= rel->min_attr && te->resno <= rel->max_attr);
 		rel->attr_widths[te->resno - rel->min_attr] = item_width;
 	}
@@ -3491,7 +3492,7 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
 		else if (IsA(node, PlaceHolderVar))
 		{
 			PlaceHolderVar *phv = (PlaceHolderVar *) node;
-			PlaceHolderInfo *phinfo = find_placeholder_info(root, phv);
+			PlaceHolderInfo *phinfo = find_placeholder_info(root, phv, false);
 
 			tuple_width += phinfo->ph_width;
 		}
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index a365beecd8a34..acc4fb1a185c9 100644
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -847,9 +847,10 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
 	{
 		EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc);
 		List	   *vars = pull_var_clause((Node *) cur_em->em_expr,
+										   PVC_RECURSE_AGGREGATES,
 										   PVC_INCLUDE_PLACEHOLDERS);
 
-		add_vars_to_targetlist(root, vars, ec->ec_relids);
+		add_vars_to_targetlist(root, vars, ec->ec_relids, false);
 		list_free(vars);
 	}
 }
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 1cace6d5960eb..58b8797b7383c 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -41,6 +41,9 @@
 #define IsBooleanOpfamily(opfamily) \
 	((opfamily) == BOOL_BTREE_FAM_OID || (opfamily) == BOOL_HASH_FAM_OID)
 
+#define IndexCollMatchesExprColl(idxcollation, exprcollation) \
+	((idxcollation) == InvalidOid || (idxcollation) == (exprcollation))
+
 /* Whether to use ScalarArrayOpExpr to build index qualifications */
 typedef enum
 {
@@ -1181,6 +1184,13 @@ group_clauses_by_indexkey(IndexOptInfo *index,
  *	  We do not actually do the commuting here, but we check whether a
  *	  suitable commutator operator is available.
  *
+ *	  If the index has a collation, the clause must have the same collation.
+ *	  For collation-less indexes, we assume it doesn't matter; this is
+ *	  necessary for cases like "hstore ? text", wherein hstore's operators
+ *	  don't care about collation but the clause will get marked with a
+ *	  collation anyway because of the text argument.  (This logic is
+ *	  embodied in the macro IndexCollMatchesExprColl.)
+ *
  *	  It is also possible to match RowCompareExpr clauses to indexes (but
  *	  currently, only btree indexes handle this).  In this routine we will
  *	  report a match if the first column of the row comparison matches the
@@ -1303,7 +1313,7 @@ match_clause_to_indexcol(IndexOptInfo *index,
 		bms_is_subset(right_relids, outer_relids) &&
 		!contain_volatile_functions(rightop))
 	{
-		if (idxcollation == expr_coll &&
+		if (IndexCollMatchesExprColl(idxcollation, expr_coll) &&
 			is_indexable_operator(expr_op, opfamily, true))
 			return true;
 
@@ -1322,7 +1332,7 @@ match_clause_to_indexcol(IndexOptInfo *index,
 		bms_is_subset(left_relids, outer_relids) &&
 		!contain_volatile_functions(leftop))
 	{
-		if (idxcollation == expr_coll &&
+		if (IndexCollMatchesExprColl(idxcollation, expr_coll) &&
 			is_indexable_operator(expr_op, opfamily, false))
 			return true;
 
@@ -1398,8 +1408,8 @@ match_rowcompare_to_indexcol(IndexOptInfo *index,
 	expr_op = linitial_oid(clause->opnos);
 	expr_coll = linitial_oid(clause->inputcollids);
 
-	/* Collations must match */
-	if (expr_coll != idxcollation)
+	/* Collations must match, if relevant */
+	if (!IndexCollMatchesExprColl(idxcollation, expr_coll))
 		return false;
 
 	/*
@@ -1571,7 +1581,7 @@ match_clause_to_ordering_op(IndexOptInfo *index,
 	/*
 	 * We can forget the whole thing right away if wrong collation.
 	 */
-	if (expr_coll != idxcollation)
+	if (!IndexCollMatchesExprColl(idxcollation, expr_coll))
 		return NULL;
 
 	/*
@@ -1862,7 +1872,7 @@ eclass_matches_any_index(EquivalenceClass *ec, EquivalenceMember *em,
 			 */
 			if ((index->relam != BTREE_AM_OID ||
 				 list_member_oid(ec->ec_opfamilies, curFamily)) &&
-				ec->ec_collation == curCollation &&
+				IndexCollMatchesExprColl(curCollation, ec->ec_collation) &&
 				match_index_to_operand((Node *) em->em_expr, indexcol, index))
 				return true;
 		}
@@ -2169,10 +2179,11 @@ relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
 		int			c;
 
 		/*
-		 * If the index is not unique or if it's a partial index that doesn't
-		 * match the query, it's useless here.
+		 * If the index is not unique, or not immediately enforced, or if it's
+		 * a partial index that doesn't match the query, it's useless here.
 		 */
-		if (!ind->unique || (ind->indpred != NIL && !ind->predOK))
+		if (!ind->unique || !ind->immediate ||
+			(ind->indpred != NIL && !ind->predOK))
 			continue;
 
 		/*
@@ -2967,7 +2978,8 @@ expand_indexqual_rowcompare(RestrictInfo *rinfo,
 			break;
 
 		/* Does collation match? */
-		if (lfirst_oid(collids_cell) != index->indexcollations[i])
+		if (!IndexCollMatchesExprColl(index->indexcollations[i],
+									  lfirst_oid(collids_cell)))
 			break;
 
 		/* Add opfamily and datatypes to lists */
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index e4ccf5ce79167..7a81010e4cf4a 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -27,6 +27,7 @@
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/paths.h"
+#include "optimizer/placeholder.h"
 #include "optimizer/plancat.h"
 #include "optimizer/planmain.h"
 #include "optimizer/predtest.h"
@@ -1886,7 +1887,20 @@ create_nestloop_plan(PlannerInfo *root,
 		NestLoopParam *nlp = (NestLoopParam *) lfirst(cell);
 
 		next = lnext(cell);
-		if (bms_is_member(nlp->paramval->varno, outerrelids))
+		if (IsA(nlp->paramval, Var) &&
+			bms_is_member(nlp->paramval->varno, outerrelids))
+		{
+			root->curOuterParams = list_delete_cell(root->curOuterParams,
+													cell, prev);
+			nestParams = lappend(nestParams, nlp);
+		}
+		else if (IsA(nlp->paramval, PlaceHolderVar) &&
+				 bms_overlap(((PlaceHolderVar *) nlp->paramval)->phrels,
+							 outerrelids) &&
+				 bms_is_subset(find_placeholder_info(root,
+													 (PlaceHolderVar *) nlp->paramval,
+													 false)->ph_eval_at,
+							   outerrelids))
 		{
 			root->curOuterParams = list_delete_cell(root->curOuterParams,
 													cell, prev);
@@ -2314,11 +2328,12 @@ create_hashjoin_plan(PlannerInfo *root,
 
 /*
  * replace_nestloop_params
- *	  Replace outer-relation Vars in the given expression with nestloop Params
+ *	  Replace outer-relation Vars and PlaceHolderVars in the given expression
+ *	  with nestloop Params
  *
- * All Vars belonging to the relation(s) identified by root->curOuterRels
- * are replaced by Params, and entries are added to root->curOuterParams if
- * not already present.
+ * All Vars and PlaceHolderVars belonging to the relation(s) identified by
+ * root->curOuterRels are replaced by Params, and entries are added to
+ * root->curOuterParams if not already present.
  */
 static Node *
 replace_nestloop_params(PlannerInfo *root, Node *expr)
@@ -2345,7 +2360,7 @@ replace_nestloop_params_mutator(Node *node, PlannerInfo *root)
 		if (!bms_is_member(var->varno, root->curOuterRels))
 			return node;
 		/* Create a Param representing the Var */
-		param = assign_nestloop_param(root, var);
+		param = assign_nestloop_param_var(root, var);
 		/* Is this param already listed in root->curOuterParams? */
 		foreach(lc, root->curOuterParams)
 		{
@@ -2365,6 +2380,48 @@ replace_nestloop_params_mutator(Node *node, PlannerInfo *root)
 		/* And return the replacement Param */
 		return (Node *) param;
 	}
+	if (IsA(node, PlaceHolderVar))
+	{
+		PlaceHolderVar *phv = (PlaceHolderVar *) node;
+		Param	   *param;
+		NestLoopParam *nlp;
+		ListCell   *lc;
+
+		/* Upper-level PlaceHolderVars should be long gone at this point */
+		Assert(phv->phlevelsup == 0);
+
+		/*
+		 * If not to be replaced, just return the PlaceHolderVar unmodified.
+		 * We use bms_overlap as a cheap/quick test to see if the PHV might
+		 * be evaluated in the outer rels, and then grab its PlaceHolderInfo
+		 * to tell for sure.
+		 */
+		if (!bms_overlap(phv->phrels, root->curOuterRels))
+			return node;
+		if (!bms_is_subset(find_placeholder_info(root, phv, false)->ph_eval_at,
+						   root->curOuterRels))
+			return node;
+		/* Create a Param representing the PlaceHolderVar */
+		param = assign_nestloop_param_placeholdervar(root, phv);
+		/* Is this param already listed in root->curOuterParams? */
+		foreach(lc, root->curOuterParams)
+		{
+			nlp = (NestLoopParam *) lfirst(lc);
+			if (nlp->paramno == param->paramid)
+			{
+				Assert(equal(phv, nlp->paramval));
+				/* Present, so we can just return the Param */
+				return (Node *) param;
+			}
+		}
+		/* No, so add it */
+		nlp = makeNode(NestLoopParam);
+		nlp->paramno = param->paramid;
+		nlp->paramval = (Var *) phv;
+		root->curOuterParams = lappend(root->curOuterParams, nlp);
+		/* And return the replacement Param */
+		return (Node *) param;
+	}
 	return expression_tree_mutator(node,
 								   replace_nestloop_params_mutator,
 								   (void *) root);
@@ -2377,7 +2434,7 @@ replace_nestloop_params_mutator(Node *node, PlannerInfo *root)
  *
  * We have four tasks here:
  *	* Remove RestrictInfo nodes from the input clauses.
- *	* Replace any outer-relation Var nodes with nestloop Params.
+ *	* Replace any outer-relation Var or PHV nodes with nestloop Params.
  *	  (XXX eventually, that responsibility should go elsewhere?)
  *	* Index keys must be represented by Var nodes with varattno set to the
  *	  index's attribute number, not the attribute number in the original rel.
@@ -3539,7 +3596,13 @@ prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 
 			if (!tle)
 			{
-				/* No matching tlist item; look for a computable expression */
+				/*
+				 * No matching tlist item; look for a computable expression.
+				 * Note that we treat Aggrefs as if they were variables; this
+				 * is necessary when attempting to sort the output from an Agg
+				 * node for use in a WindowFunc (since grouping_planner will
+				 * have treated the Aggrefs as variables, too).
+				 */
 				Expr	   *sortexpr = NULL;
 
 				foreach(j, ec->ec_members)
@@ -3552,6 +3615,7 @@ prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 						continue;
 					sortexpr = em->em_expr;
 					exprvars = pull_var_clause((Node *) sortexpr,
+											   PVC_INCLUDE_AGGREGATES,
 											   PVC_INCLUDE_PLACEHOLDERS);
 					foreach(k, exprvars)
 					{
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 333ede218ea40..9cfc56ea541d4 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -132,11 +132,12 @@ void
 build_base_rel_tlists(PlannerInfo *root, List *final_tlist)
 {
 	List	   *tlist_vars = pull_var_clause((Node *) final_tlist,
+											 PVC_RECURSE_AGGREGATES,
 											 PVC_INCLUDE_PLACEHOLDERS);
 
 	if (tlist_vars != NIL)
 	{
-		add_vars_to_targetlist(root, tlist_vars, bms_make_singleton(0));
+		add_vars_to_targetlist(root, tlist_vars, bms_make_singleton(0), true);
 		list_free(tlist_vars);
 	}
 }
@@ -150,10 +151,15 @@ build_base_rel_tlists(PlannerInfo *root, List *final_tlist)
  *
  *	  The list may also contain PlaceHolderVars.  These don't necessarily
  *	  have a single owning relation; we keep their attr_needed info in
- *	  root->placeholder_list instead.
+ *	  root->placeholder_list instead.  If create_new_ph is true, it's OK
+ *	  to create new PlaceHolderInfos, and we also have to update ph_may_need;
+ *	  otherwise, the PlaceHolderInfos must already exist, and we should only
+ *	  update their ph_needed.  (It should be true before deconstruct_jointree
+ *	  begins, and false after that.)
  */
 void
-add_vars_to_targetlist(PlannerInfo *root, List *vars, Relids where_needed)
+add_vars_to_targetlist(PlannerInfo *root, List *vars,
+					   Relids where_needed, bool create_new_ph)
 {
 	ListCell   *temp;
 
@@ -184,18 +190,20 @@ add_vars_to_targetlist(PlannerInfo *root, List *vars, Relids where_needed)
 		else if (IsA(node, PlaceHolderVar))
 		{
 			PlaceHolderVar *phv = (PlaceHolderVar *) node;
-			PlaceHolderInfo *phinfo = find_placeholder_info(root, phv);
+			PlaceHolderInfo *phinfo = find_placeholder_info(root, phv,
+															create_new_ph);
 
+			/* Always adjust ph_needed */
 			phinfo->ph_needed = bms_add_members(phinfo->ph_needed,
 												where_needed);
 
 			/*
-			 * Update ph_may_need too.	This is currently only necessary when
-			 * being called from build_base_rel_tlists, but we may as well do
-			 * it always.
+			 * If we are creating PlaceHolderInfos, mark them with the
+			 * correct maybe-needed locations.  Otherwise, it's too late to
+			 * change that.
 			 */
-			phinfo->ph_may_need = bms_add_members(phinfo->ph_may_need,
-												  where_needed);
+			if (create_new_ph)
+				mark_placeholder_maybe_needed(root, phinfo, where_needed);
 		}
 		else
 			elog(ERROR, "unrecognized node type: %d", (int) nodeTag(node));
@@ -1030,9 +1038,11 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 	 */
 	if (bms_membership(relids) == BMS_MULTIPLE)
 	{
-		List	   *vars = pull_var_clause(clause, PVC_INCLUDE_PLACEHOLDERS);
+		List	   *vars = pull_var_clause(clause,
+										   PVC_RECURSE_AGGREGATES,
+										   PVC_INCLUDE_PLACEHOLDERS);
 
-		add_vars_to_targetlist(root, vars, relids);
+		add_vars_to_targetlist(root, vars, relids, false);
 		list_free(vars);
 	}
 
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index ff39d5754dc98..d18e4c7a4cff4 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -188,7 +188,7 @@ query_planner(PlannerInfo *root, List *tlist,
 	 */
 	build_base_rel_tlists(root, tlist);
 
-	find_placeholders_in_jointree(root);
+	find_placeholders_in_query(root);
 
 	joinlist = deconstruct_jointree(root);
 
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 9aafc8adcc6bd..d4d9c58cff842 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -1473,11 +1473,16 @@ grouping_planner(PlannerInfo *root, double tuple_fraction)
 			 * step.  That's handled internally by make_sort_from_pathkeys,
 			 * but we need the copyObject steps here to ensure that each plan
 			 * node has a separately modifiable tlist.
+			 *
+			 * Note: it's essential here to use PVC_INCLUDE_AGGREGATES so that
+			 * Vars mentioned only in aggregate expressions aren't pulled out
+			 * as separate targetlist entries.  Otherwise we could be putting
+			 * ungrouped Vars directly into an Agg node's tlist, resulting in
+			 * undefined behavior.
 			 */
-			window_tlist = flatten_tlist(tlist);
-			if (parse->hasAggs)
-				window_tlist = add_to_flat_tlist(window_tlist,
-											pull_agg_clause((Node *) tlist));
+			window_tlist = flatten_tlist(tlist,
+										 PVC_INCLUDE_AGGREGATES,
+										 PVC_INCLUDE_PLACEHOLDERS);
 			window_tlist = add_volatile_sort_exprs(window_tlist, tlist,
 												   activeWindows);
 			result_plan->targetlist = (List *) copyObject(window_tlist);
@@ -2576,14 +2581,18 @@ make_subplanTargetList(PlannerInfo *root,
 	}
 
 	/*
-	 * Otherwise, start with a "flattened" tlist (having just the vars
-	 * mentioned in the targetlist and HAVING qual --- but not upper-level
-	 * Vars; they will be replaced by Params later on).  Note this includes
-	 * vars used in resjunk items, so we are covering the needs of ORDER BY
-	 * and window specifications.
+	 * Otherwise, start with a "flattened" tlist (having just the Vars
+	 * mentioned in the targetlist and HAVING qual).  Note this includes Vars
+	 * used in resjunk items, so we are covering the needs of ORDER BY and
+	 * window specifications.  Vars used within Aggrefs will be pulled out
+	 * here, too.
 	 */
-	sub_tlist = flatten_tlist(tlist);
-	extravars = pull_var_clause(parse->havingQual, PVC_INCLUDE_PLACEHOLDERS);
+	sub_tlist = flatten_tlist(tlist,
+							  PVC_RECURSE_AGGREGATES,
+							  PVC_INCLUDE_PLACEHOLDERS);
+	extravars = pull_var_clause(parse->havingQual,
+								PVC_RECURSE_AGGREGATES,
+								PVC_INCLUDE_PLACEHOLDERS);
 	sub_tlist = add_to_flat_tlist(sub_tlist, extravars);
 	list_free(extravars);
 	*need_tlist_eval = false;	/* only eval if not flat tlist */
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 60a1484c992b7..01d2cec562faa 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -1019,6 +1019,10 @@ set_join_references(PlannerGlobal *glob, Join *join, int rtoffset)
 												   (Node *) nlp->paramval,
 												   outer_itlist,
 												   rtoffset);
+			/* Check we replaced any PlaceHolderVar with simple Var */
+			if (!(IsA(nlp->paramval, Var) &&
+				  nlp->paramval->varno == OUTER))
+				elog(ERROR, "NestLoopParam was not reduced to a simple Var");
 		}
 	}
 	else if (IsA(join, MergeJoin))
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 71ffc17b5990c..570151e60657a 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -172,7 +172,7 @@ replace_outer_var(PlannerInfo *root, Var *var)
  * the Var to be local to the current query level.
  */
 Param *
-assign_nestloop_param(PlannerInfo *root, Var *var)
+assign_nestloop_param_var(PlannerInfo *root, Var *var)
 {
 	Param	   *retval;
 	int			i;
@@ -192,6 +192,65 @@ assign_nestloop_param(PlannerInfo *root, Var *var)
 	return retval;
 }
 
+/*
+ * Generate a Param node to replace the given PlaceHolderVar, which will be
+ * supplied from an upper NestLoop join node.
+ *
+ * This is just like assign_nestloop_param_var, except for PlaceHolderVars.
+ */
+Param *
+assign_nestloop_param_placeholdervar(PlannerInfo *root, PlaceHolderVar *phv)
+{
+	Param	   *retval;
+	ListCell   *ppl;
+	PlannerParamItem *pitem;
+	Index		abslevel;
+	int			i;
+
+	Assert(phv->phlevelsup == 0);
+	abslevel = root->query_level;
+
+	/* If there's already a paramlist entry for this same PHV, just use it */
+	/* We assume comparing the PHIDs is sufficient */
+	i = 0;
+	foreach(ppl, root->glob->paramlist)
+	{
+		pitem = (PlannerParamItem *) lfirst(ppl);
+		if (pitem->abslevel == abslevel && IsA(pitem->item, PlaceHolderVar))
+		{
+			PlaceHolderVar *pphv = (PlaceHolderVar *) pitem->item;
+
+			if (pphv->phid == phv->phid)
+				break;
+		}
+		i++;
+	}
+
+	if (ppl == NULL)
+	{
+		/* Nope, so make a new one */
+		phv = (PlaceHolderVar *) copyObject(phv);
+
+		pitem = makeNode(PlannerParamItem);
+		pitem->item = (Node *) phv;
+		pitem->abslevel = abslevel;
+
+		root->glob->paramlist = lappend(root->glob->paramlist, pitem);
+
+		/* i is already the correct list index for the new item */
+	}
+
+	retval = makeNode(Param);
+	retval->paramkind = PARAM_EXEC;
+	retval->paramid = i;
+	retval->paramtype = exprType((Node *) phv->phexpr);
+	retval->paramtypmod = exprTypmod((Node *) phv->phexpr);
+	retval->paramcollid = exprCollation((Node *) phv->phexpr);
+	retval->location = -1;
+
+	return retval;
+}
+
 /*
  * Generate a Param node to replace the given Aggref
  * which is expected to have agglevelsup > 0 (ie, it is not local).
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
index 5d163292c58b4..4ff7f48977bc1 100644
--- a/src/backend/optimizer/prep/prepjointree.c
+++ b/src/backend/optimizer/prep/prepjointree.c
@@ -246,6 +246,7 @@ pull_up_sublinks_jointree_recurse(PlannerInfo *root, Node *jtnode,
 		 * as a sublink that is executed only for row pairs that meet the
 		 * other join conditions.  Fixing this seems to require considerable
 		 * restructuring of the executor, but maybe someday it can happen.
+		 * (See also the comparable case in pull_up_sublinks_qual_recurse.)
 		 *
 		 * We don't expect to see any pre-existing JOIN_SEMI or JOIN_ANTI
 		 * nodes here.
@@ -331,9 +332,7 @@ pull_up_sublinks_qual_recurse(PlannerInfo *root, Node *node,
 				j->rarg = pull_up_sublinks_jointree_recurse(root,
 															j->rarg,
 															&child_rels);
-				/* Pulled-up ANY/EXISTS quals can use those rels too */
-				child_rels = bms_add_members(child_rels, available_rels);
-				/* ... and any inserted joins get stacked onto j->rarg */
+				/* Any inserted joins get stacked onto j->rarg */
 				j->quals = pull_up_sublinks_qual_recurse(root,
 														 j->quals,
 														 child_rels,
@@ -355,9 +354,7 @@ pull_up_sublinks_qual_recurse(PlannerInfo *root, Node *node,
 				j->rarg = pull_up_sublinks_jointree_recurse(root,
 															j->rarg,
 															&child_rels);
-				/* Pulled-up ANY/EXISTS quals can use those rels too */
-				child_rels = bms_add_members(child_rels, available_rels);
-				/* ... and any inserted joins get stacked onto j->rarg */
+				/* Any inserted joins get stacked onto j->rarg */
 				j->quals = pull_up_sublinks_qual_recurse(root,
 														 j->quals,
 														 child_rels,
@@ -377,7 +374,6 @@ pull_up_sublinks_qual_recurse(PlannerInfo *root, Node *node,
 		/* If the immediate argument of NOT is EXISTS, try to convert */
 		SubLink    *sublink = (SubLink *) get_notclausearg((Expr *) node);
 		JoinExpr   *j;
-		Relids		child_rels;
 
 		if (sublink && IsA(sublink, SubLink))
 		{
@@ -387,17 +383,27 @@ pull_up_sublinks_qual_recurse(PlannerInfo *root, Node *node,
 												   available_rels);
 				if (j)
 				{
+					/*
+					 * For the moment, refrain from recursing underneath NOT.
+					 * As in pull_up_sublinks_jointree_recurse, recursing here
+					 * would result in inserting a join underneath an ANTI
+					 * join with which it could not commute, and that could
+					 * easily lead to a worse plan than what we've
+					 * historically generated.
+					 */
+#ifdef NOT_USED
 					/* Yes; recursively process what we pulled up */
+					Relids		child_rels;
+
 					j->rarg = pull_up_sublinks_jointree_recurse(root,
 																j->rarg,
 																&child_rels);
-					/* Pulled-up ANY/EXISTS quals can use those rels too */
-					child_rels = bms_add_members(child_rels, available_rels);
-					/* ... and any inserted joins get stacked onto j->rarg */
+					/* Any inserted joins get stacked onto j->rarg */
 					j->quals = pull_up_sublinks_qual_recurse(root,
 															 j->quals,
 															 child_rels,
 															 &j->rarg);
+#endif
 					/* Now insert the new join node into the join tree */
 					j->larg = *jtlink;
 					*jtlink = (Node *) j;
@@ -779,22 +785,15 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
 	parse->havingQual = pullup_replace_vars(parse->havingQual, &rvcontext);
 
 	/*
-	 * Replace references in the translated_vars lists of appendrels. When
-	 * pulling up an appendrel member, we do not need PHVs in the list of the
-	 * parent appendrel --- there isn't any outer join between. Elsewhere, use
-	 * PHVs for safety.  (This analysis could be made tighter but it seems
-	 * unlikely to be worth much trouble.)
+	 * Replace references in the translated_vars lists of appendrels, too.
+	 * We do it this way because we must preserve the AppendRelInfo structs.
 	 */
 	foreach(lc, root->append_rel_list)
 	{
 		AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(lc);
-		bool		save_need_phvs = rvcontext.need_phvs;
 
-		if (appinfo == containing_appendrel)
-			rvcontext.need_phvs = false;
 		appinfo->translated_vars = (List *)
 			pullup_replace_vars((Node *) appinfo->translated_vars, &rvcontext);
-		rvcontext.need_phvs = save_need_phvs;
 	}
 
 	/*
@@ -1402,8 +1401,31 @@ pullup_replace_vars_callback(Var *var,
 			if (newnode && IsA(newnode, Var) &&
 				((Var *) newnode)->varlevelsup == 0)
 			{
-				/* Simple Vars always escape being wrapped */
-				wrap = false;
+				/*
+				 * Simple Vars normally escape being wrapped.  However, in
+				 * wrap_non_vars mode (ie, we are dealing with an appendrel
+				 * member), we must ensure that each tlist entry expands to a
+				 * distinct expression, else we may have problems with
+				 * improperly placing identical entries into different
+				 * EquivalenceClasses.  Therefore, we wrap a Var in a
+				 * PlaceHolderVar if it duplicates any earlier entry in the
+				 * tlist (ie, we've got "SELECT x, x, ...").  Since each PHV
+				 * is distinct, this fixes the ambiguity.  We can use
+				 * tlist_member to detect whether there's an earlier
+				 * duplicate.
+				 */
+				wrap = (rcon->wrap_non_vars &&
+						tlist_member(newnode, rcon->targetlist) != tle);
+			}
+			else if (newnode && IsA(newnode, PlaceHolderVar) &&
+					 ((PlaceHolderVar *) newnode)->phlevelsup == 0)
+			{
+				/*
+				 * No need to directly wrap a PlaceHolderVar with another one,
+				 * either, unless we need to prevent duplication.
+				 */
+				wrap = (rcon->wrap_non_vars &&
+						tlist_member(newnode, rcon->targetlist) != tle);
 			}
 			else if (rcon->wrap_non_vars)
 			{
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index c97150c6f74bf..475dba635d2f6 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -131,7 +131,8 @@ preprocess_targetlist(PlannerInfo *root, List *tlist)
 			/* Not a table, so we need the whole row as a junk var */
 			var = makeWholeRowVar(rt_fetch(rc->rti, range_table),
 								  rc->rti,
-								  0);
+								  0,
+								  false);
 			snprintf(resname, sizeof(resname), "wholerow%u", rc->rowmarkId);
 			tle = makeTargetEntry((Expr *) var,
 								  list_length(tlist) + 1,
@@ -154,6 +155,7 @@ preprocess_targetlist(PlannerInfo *root, List *tlist)
 		ListCell   *l;
 
 		vars = pull_var_clause((Node *) parse->returningList,
+							   PVC_RECURSE_AGGREGATES,
 							   PVC_INCLUDE_PLACEHOLDERS);
 		foreach(l, vars)
 		{
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 2914c398186f6..fe1a8952fc269 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -26,6 +26,7 @@
 #include "catalog/pg_type.h"
 #include "executor/executor.h"
 #include "executor/functions.h"
+#include "funcapi.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
@@ -84,7 +85,6 @@ typedef struct
 } inline_error_callback_arg;
 
 static bool contain_agg_clause_walker(Node *node, void *context);
-static bool pull_agg_clause_walker(Node *node, List **context);
 static bool count_agg_clauses_walker(Node *node,
 						 count_agg_clauses_context *context);
 static bool find_window_functions_walker(Node *node, WindowFuncLists *lists);
@@ -418,41 +418,6 @@ contain_agg_clause_walker(Node *node, void *context)
 	return expression_tree_walker(node, contain_agg_clause_walker, context);
 }
 
-/*
- * pull_agg_clause
- *	  Recursively search for Aggref nodes within a clause.
- *
- *	  Returns a List of all Aggrefs found.
- *
- * This does not descend into subqueries, and so should be used only after
- * reduction of sublinks to subplans, or in contexts where it's known there
- * are no subqueries.  There mustn't be outer-aggregate references either.
- */
-List *
-pull_agg_clause(Node *clause)
-{
-	List	   *result = NIL;
-
-	(void) pull_agg_clause_walker(clause, &result);
-	return result;
-}
-
-static bool
-pull_agg_clause_walker(Node *node, List **context)
-{
-	if (node == NULL)
-		return false;
-	if (IsA(node, Aggref))
-	{
-		Assert(((Aggref *) node)->agglevelsup == 0);
-		*context = lappend(*context, node);
-		return false;			/* no need to descend into arguments */
-	}
-	Assert(!IsA(node, SubLink));
-	return expression_tree_walker(node, pull_agg_clause_walker,
-								  (void *) context);
-}
-
 /*
  * count_agg_clauses
  *	  Recursively count the Aggref nodes in an expression tree, and
@@ -4512,9 +4477,12 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte)
 	 * If it returns RECORD, we have to check against the column type list
 	 * provided in the RTE; check_sql_fn_retval can't do that.  (If no match,
 	 * we just fail to inline, rather than complaining; see notes for
-	 * tlist_matches_coltypelist.)
+	 * tlist_matches_coltypelist.)  We don't have to do this for functions
+	 * with declared OUT parameters, even though their funcresulttype is
+	 * RECORDOID, so check get_func_result_type too.
 	 */
 	if (fexpr->funcresulttype == RECORDOID &&
+		get_func_result_type(func_oid, NULL, NULL) == TYPEFUNC_RECORD &&
 		!tlist_matches_coltypelist(querytree->targetList, rte->funccoltypes))
 		goto fail;
 
diff --git a/src/backend/optimizer/util/placeholder.c b/src/backend/optimizer/util/placeholder.c
index 9796fbf9b603f..3ae5154684db8 100644
--- a/src/backend/optimizer/util/placeholder.c
+++ b/src/backend/optimizer/util/placeholder.c
@@ -24,7 +24,7 @@
 
 /* Local functions */
 static Relids find_placeholders_recurse(PlannerInfo *root, Node *jtnode);
-static void find_placeholders_in_qual(PlannerInfo *root, Node *qual,
+static void mark_placeholders_in_expr(PlannerInfo *root, Node *expr,
 						  Relids relids);
 
 
@@ -50,7 +50,10 @@ make_placeholder_expr(PlannerInfo *root, Expr *expr, Relids phrels)
 
 /*
  * find_placeholder_info
- *		Fetch the PlaceHolderInfo for the given PHV; create it if not found
+ *		Fetch the PlaceHolderInfo for the given PHV
+ *
+ * If the PlaceHolderInfo doesn't exist yet, create it if create_new_ph is
+ * true, else throw an error.
  *
  * This is separate from make_placeholder_expr because subquery pullup has
  * to make PlaceHolderVars for expressions that might not be used at all in
@@ -58,10 +61,13 @@ make_placeholder_expr(PlannerInfo *root, Expr *expr, Relids phrels)
  * We build PlaceHolderInfos only for PHVs that are still present in the
  * simplified query passed to query_planner().
  *
- * Note: this should only be called after query_planner() has started.
+ * Note: this should only be called after query_planner() has started.  Also,
+ * create_new_ph must not be TRUE after deconstruct_jointree begins, because
+ * make_outerjoininfo assumes that we already know about all placeholders.
  */
 PlaceHolderInfo *
-find_placeholder_info(PlannerInfo *root, PlaceHolderVar *phv)
+find_placeholder_info(PlannerInfo *root, PlaceHolderVar *phv,
+					  bool create_new_ph)
 {
 	PlaceHolderInfo *phinfo;
 	ListCell   *lc;
@@ -77,6 +83,9 @@ find_placeholder_info(PlannerInfo *root, PlaceHolderVar *phv)
 	}
 
 	/* Not found, so create it */
+	if (!create_new_ph)
+		elog(ERROR, "too late to create a new PlaceHolderInfo");
+
 	phinfo = makeNode(PlaceHolderInfo);
 
 	phinfo->phid = phv->phid;
@@ -95,28 +104,41 @@ find_placeholder_info(PlannerInfo *root, PlaceHolderVar *phv)
 }
 
 /*
- * find_placeholders_in_jointree
- *		Search the jointree for PlaceHolderVars, and build PlaceHolderInfos
+ * find_placeholders_in_query
+ *		Search the query for PlaceHolderVars, and build PlaceHolderInfos
+ *
+ * We need to examine the jointree, but not the targetlist, because
+ * build_base_rel_tlists() will already have made entries for any PHVs
+ * in the targetlist.
  *
- * We don't need to look at the targetlist because build_base_rel_tlists()
- * will already have made entries for any PHVs in the tlist.
+ * We also need to search for PHVs in AppendRelInfo translated_vars
+ * lists.  In most cases, translated_vars entries aren't directly referenced
+ * elsewhere, but we need to create PlaceHolderInfo entries for them to
+ * support set_rel_width() calculations for the appendrel child relations.
  */
 void
-find_placeholders_in_jointree(PlannerInfo *root)
+find_placeholders_in_query(PlannerInfo *root)
 {
 	/* We need do nothing if the query contains no PlaceHolderVars */
 	if (root->glob->lastPHId != 0)
 	{
-		/* Start recursion at top of jointree */
+		/* Recursively search the jointree */
 		Assert(root->parse->jointree != NULL &&
 			   IsA(root->parse->jointree, FromExpr));
 		(void) find_placeholders_recurse(root, (Node *) root->parse->jointree);
+
+		/*
+		 * Also search the append_rel_list for translated vars that are PHVs.
+		 * Barring finding them elsewhere in the query, they do not need any
+		 * ph_may_need bits, only to be present in the PlaceHolderInfo list.
+		 */
+		mark_placeholders_in_expr(root, (Node *) root->append_rel_list, NULL);
 	}
 }
 
 /*
  * find_placeholders_recurse
- *	  One recursion level of find_placeholders_in_jointree.
+ *	  One recursion level of jointree search for find_placeholders_in_query.
  *
  * jtnode is the current jointree node to examine.
  *
@@ -157,7 +179,7 @@ find_placeholders_recurse(PlannerInfo *root, Node *jtnode)
 		/*
 		 * Now process the top-level quals.
 		 */
-		find_placeholders_in_qual(root, f->quals, jtrelids);
+		mark_placeholders_in_expr(root, f->quals, jtrelids);
 	}
 	else if (IsA(jtnode, JoinExpr))
 	{
@@ -173,7 +195,7 @@ find_placeholders_recurse(PlannerInfo *root, Node *jtnode)
 		jtrelids = bms_join(leftids, rightids);
 
 		/* Process the qual clauses */
-		find_placeholders_in_qual(root, j->quals, jtrelids);
+		mark_placeholders_in_expr(root, j->quals, jtrelids);
 	}
 	else
 	{
@@ -185,14 +207,15 @@ find_placeholders_recurse(PlannerInfo *root, Node *jtnode)
 }
 
 /*
- * find_placeholders_in_qual
- *		Process a qual clause for find_placeholders_in_jointree.
+ * mark_placeholders_in_expr
+ *		Find all PlaceHolderVars in the given expression, and mark them
+ *		as possibly needed at the specified join level.
  *
  * relids is the syntactic join level to mark as the "maybe needed" level
- * for each PlaceHolderVar found in the qual clause.
+ * for each PlaceHolderVar found in the expression.
  */
 static void
-find_placeholders_in_qual(PlannerInfo *root, Node *qual, Relids relids)
+mark_placeholders_in_expr(PlannerInfo *root, Node *expr, Relids relids)
 {
 	List	   *vars;
 	ListCell   *vl;
@@ -201,7 +224,9 @@ find_placeholders_in_qual(PlannerInfo *root, Node *qual, Relids relids)
 	 * pull_var_clause does more than we need here, but it'll do and it's
 	 * convenient to use.
 	 */
-	vars = pull_var_clause(qual, PVC_INCLUDE_PLACEHOLDERS);
+	vars = pull_var_clause(expr,
+						   PVC_RECURSE_AGGREGATES,
+						   PVC_INCLUDE_PLACEHOLDERS);
 	foreach(vl, vars)
 	{
 		PlaceHolderVar *phv = (PlaceHolderVar *) lfirst(vl);
@@ -212,25 +237,47 @@ find_placeholders_in_qual(PlannerInfo *root, Node *qual, Relids relids)
 			continue;
 
 		/* Create a PlaceHolderInfo entry if there's not one already */
-		phinfo = find_placeholder_info(root, phv);
+		phinfo = find_placeholder_info(root, phv, true);
 
-		/* Mark the PHV as possibly needed at the qual's syntactic level */
-		phinfo->ph_may_need = bms_add_members(phinfo->ph_may_need, relids);
-
-		/*
-		 * This is a bit tricky: the PHV's contained expression may contain
-		 * other, lower-level PHVs.  We need to get those into the
-		 * PlaceHolderInfo list, but they aren't going to be needed where the
-		 * outer PHV is referenced.  Rather, they'll be needed where the outer
-		 * PHV is evaluated.  We can estimate that (conservatively) as the
-		 * syntactic location of the PHV's expression.  Recurse to take care
-		 * of any such PHVs.
-		 */
-		find_placeholders_in_qual(root, (Node *) phv->phexpr, phv->phrels);
+		/* Mark it, and recursively process any contained placeholders */
+		mark_placeholder_maybe_needed(root, phinfo, relids);
 	}
 	list_free(vars);
 }
 
+/*
+ * mark_placeholder_maybe_needed
+ *		Mark a placeholder as possibly needed at the specified join level.
+ *
+ * relids is the syntactic join level to mark as the "maybe needed" level
+ * for the placeholder.
+ *
+ * This is called during an initial scan of the query's targetlist and quals
+ * before we begin deconstruct_jointree.  Once we begin deconstruct_jointree,
+ * all active placeholders must be present in root->placeholder_list with
+ * their correct ph_may_need values, because make_outerjoininfo and
+ * update_placeholder_eval_levels require this info to be available while
+ * we crawl up the join tree.
+ */
+void
+mark_placeholder_maybe_needed(PlannerInfo *root, PlaceHolderInfo *phinfo,
+							  Relids relids)
+{
+	/* Mark the PHV as possibly needed at the given syntactic level */
+	phinfo->ph_may_need = bms_add_members(phinfo->ph_may_need, relids);
+
+	/*
+	 * This is a bit tricky: the PHV's contained expression may contain other,
+	 * lower-level PHVs.  We need to get those into the PlaceHolderInfo list,
+	 * but they aren't going to be needed where the outer PHV is referenced.
+	 * Rather, they'll be needed where the outer PHV is evaluated.  We can
+	 * estimate that (conservatively) as the syntactic location of the PHV's
+	 * expression.  Recurse to take care of any such PHVs.
+	 */
+	mark_placeholders_in_expr(root, (Node *) phinfo->ph_var->phexpr,
+							  phinfo->ph_var->phrels);
+}
+
 /*
  * update_placeholder_eval_levels
  *		Adjust the target evaluation levels for placeholders
@@ -348,9 +395,10 @@ fix_placeholder_input_needed_levels(PlannerInfo *root)
 		if (bms_membership(eval_at) == BMS_MULTIPLE)
 		{
 			List	   *vars = pull_var_clause((Node *) phinfo->ph_var->phexpr,
+											   PVC_RECURSE_AGGREGATES,
 											   PVC_INCLUDE_PLACEHOLDERS);
 
-			add_vars_to_targetlist(root, vars, eval_at);
+			add_vars_to_targetlist(root, vars, eval_at, false);
 			list_free(vars);
 		}
 	}
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index b28681630b380..a92d248528981 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -316,6 +316,7 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 				ChangeVarNodes((Node *) info->indpred, 1, varno, 0);
 			info->predOK = false;		/* set later in indxpath.c */
 			info->unique = index->indisunique;
+			info->immediate = index->indimmediate;
 			info->hypothetical = false;
 
 			/*
@@ -385,24 +386,38 @@ estimate_rel_size(Relation rel, int32 *attr_widths,
 
 			/*
 			 * HACK: if the relation has never yet been vacuumed, use a
-			 * minimum estimate of 10 pages.  This emulates a desirable aspect
-			 * of pre-8.0 behavior, which is that we wouldn't assume a newly
-			 * created relation is really small, which saves us from making
-			 * really bad plans during initial data loading.  (The plans are
-			 * not wrong when they are made, but if they are cached and used
-			 * again after the table has grown a lot, they are bad.) It would
-			 * be better to force replanning if the table size has changed a
-			 * lot since the plan was made ... but we don't currently have any
-			 * infrastructure for redoing cached plans at all, so we have to
-			 * kluge things here instead.
+			 * minimum size estimate of 10 pages.  The idea here is to avoid
+			 * assuming a newly-created table is really small, even if it
+			 * currently is, because that may not be true once some data gets
+			 * loaded into it.  Once a vacuum or analyze cycle has been done
+			 * on it, it's more reasonable to believe the size is somewhat
+			 * stable.
+			 *
+			 * (Note that this is only an issue if the plan gets cached and
+			 * used again after the table has been filled.  What we're trying
+			 * to avoid is using a nestloop-type plan on a table that has
+			 * grown substantially since the plan was made.  Normally,
+			 * autovacuum/autoanalyze will occur once enough inserts have
+			 * happened and cause cached-plan invalidation; but that doesn't
+			 * happen instantaneously, and it won't happen at all for cases
+			 * such as temporary tables.)
 			 *
 			 * We approximate "never vacuumed" by "has relpages = 0", which
 			 * means this will also fire on genuinely empty relations.	Not
 			 * great, but fortunately that's a seldom-seen case in the real
 			 * world, and it shouldn't degrade the quality of the plan too
 			 * much anyway to err in this direction.
+			 *
+			 * There are two exceptions wherein we don't apply this heuristic.
+			 * One is if the table has inheritance children.  Totally empty
+			 * parent tables are quite common, so we should be willing to
+			 * believe that they are empty.  Also, we don't apply the 10-page
+			 * minimum to indexes.
 			 */
-			if (curpages < 10 && rel->rd_rel->relpages == 0)
+			if (curpages < 10 &&
+				rel->rd_rel->relpages == 0 &&
+				!rel->rd_rel->relhassubclass &&
+				rel->rd_rel->relkind != RELKIND_INDEX)
 				curpages = 10;
 
 			/* report estimated # pages */
@@ -418,9 +433,10 @@ estimate_rel_size(Relation rel, int32 *attr_widths,
 			reltuples = (double) rel->rd_rel->reltuples;
 
 			/*
-			 * If it's an index, discount the metapage.  This is a kluge
-			 * because it assumes more than it ought to about index contents;
-			 * it's reasonably OK for btrees but a bit suspect otherwise.
+			 * If it's an index, discount the metapage while estimating the
+			 * number of tuples.  This is a kluge because it assumes more than
+			 * it ought to about index structure.  Currently it's OK for
+			 * btree, hash, and GIN indexes but suspect for GiST indexes.
 			 */
 			if (rel->rd_rel->relkind == RELKIND_INDEX &&
 				relpages > 0)
@@ -428,6 +444,7 @@ estimate_rel_size(Relation rel, int32 *attr_widths,
 				curpages--;
 				relpages--;
 			}
+
 			/* estimate number of tuples from previous tuple density */
 			if (relpages > 0)
 				density = reltuples / (double) relpages;
@@ -957,6 +974,11 @@ join_selectivity(PlannerInfo *root,
  * Detect whether there is a unique index on the specified attribute
  * of the specified relation, thus allowing us to conclude that all
  * the (non-null) values of the attribute are distinct.
+ *
+ * This function does not check the index's indimmediate property, which
+ * means that uniqueness may transiently fail to hold intra-transaction.
+ * That's appropriate when we are making statistical estimates, but beware
+ * of using this for any correctness proofs.
  */
 bool
 has_unique_index(RelOptInfo *rel, AttrNumber attno)
diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c
index a7e83729b1b1b..bbfbc7947b1d8 100644
--- a/src/backend/optimizer/util/predtest.c
+++ b/src/backend/optimizer/util/predtest.c
@@ -1249,6 +1249,7 @@ list_member_strip(List *list, Expr *datum)
  * and in addition we use (6) to represent <>.	<> is not a btree-indexable
  * operator, but we assume here that if an equality operator of a btree
  * opfamily has a negator operator, the negator behaves as <> for the opfamily.
+ * (This convention is also known to get_op_btree_interpretation().)
  *
  * The interpretation of:
  *
@@ -1285,7 +1286,7 @@ list_member_strip(List *list, Expr *datum)
 #define BTEQ BTEqualStrategyNumber
 #define BTGE BTGreaterEqualStrategyNumber
 #define BTGT BTGreaterStrategyNumber
-#define BTNE 6
+#define BTNE ROWCOMPARE_NE
 
 static const StrategyNumber BT_implic_table[6][6] = {
 /*
@@ -1556,18 +1557,12 @@ get_btree_test_op(Oid pred_op, Oid clause_op, bool refute_it)
 	OprProofCacheKey key;
 	OprProofCacheEntry *cache_entry;
 	bool		cfound;
-	bool		pred_op_negated;
-	Oid			pred_op_negator,
-				clause_op_negator,
-				test_op = InvalidOid;
-	Oid			opfamily_id;
+	Oid			test_op = InvalidOid;
 	bool		found = false;
-	StrategyNumber pred_strategy,
-				clause_strategy,
-				test_strategy;
-	Oid			clause_righttype;
-	CatCList   *catlist;
-	int			i;
+	List	   *pred_op_infos,
+			   *clause_op_infos;
+	ListCell   *lcp,
+			   *lcc;
 
 	/*
 	 * Find or make a cache entry for this pair of operators.
@@ -1628,135 +1623,71 @@ get_btree_test_op(Oid pred_op, Oid clause_op, bool refute_it)
 	 * corresponding test operator.  This should work for any logically
 	 * consistent opfamilies.
 	 */
-	catlist = SearchSysCacheList1(AMOPOPID, ObjectIdGetDatum(pred_op));
+	clause_op_infos = get_op_btree_interpretation(clause_op);
+	if (clause_op_infos)
+		pred_op_infos = get_op_btree_interpretation(pred_op);
+	else							/* no point in looking */
+		pred_op_infos = NIL;
 
-	/*
-	 * If we couldn't find any opfamily containing the pred_op, perhaps it is
-	 * a <> operator.  See if it has a negator that is in an opfamily.
-	 */
-	pred_op_negated = false;
-	if (catlist->n_members == 0)
+	foreach(lcp, pred_op_infos)
 	{
-		pred_op_negator = get_negator(pred_op);
-		if (OidIsValid(pred_op_negator))
-		{
-			pred_op_negated = true;
-			ReleaseSysCacheList(catlist);
-			catlist = SearchSysCacheList1(AMOPOPID,
-										  ObjectIdGetDatum(pred_op_negator));
-		}
-	}
+		OpBtreeInterpretation *pred_op_info = lfirst(lcp);
+		Oid			opfamily_id = pred_op_info->opfamily_id;
 
-	/* Also may need the clause_op's negator */
-	clause_op_negator = get_negator(clause_op);
+		foreach(lcc, clause_op_infos)
+		{
+			OpBtreeInterpretation *clause_op_info = lfirst(lcc);
+			StrategyNumber pred_strategy,
+						clause_strategy,
+						test_strategy;
 
-	/* Now search the opfamilies */
-	for (i = 0; i < catlist->n_members; i++)
-	{
-		HeapTuple	pred_tuple = &catlist->members[i]->tuple;
-		Form_pg_amop pred_form = (Form_pg_amop) GETSTRUCT(pred_tuple);
-		HeapTuple	clause_tuple;
+			/* Must find them in same opfamily */
+			if (opfamily_id != clause_op_info->opfamily_id)
+				continue;
+			/* Lefttypes should match */
+			Assert(clause_op_info->oplefttype == pred_op_info->oplefttype);
 
-		/* Must be btree */
-		if (pred_form->amopmethod != BTREE_AM_OID)
-			continue;
+			pred_strategy = pred_op_info->strategy;
+			clause_strategy = clause_op_info->strategy;
 
-		/* Get the predicate operator's btree strategy number */
-		opfamily_id = pred_form->amopfamily;
-		pred_strategy = (StrategyNumber) pred_form->amopstrategy;
-		Assert(pred_strategy >= 1 && pred_strategy <= 5);
+			/*
+			 * Look up the "test" strategy number in the implication table
+			 */
+			if (refute_it)
+				test_strategy = BT_refute_table[clause_strategy - 1][pred_strategy - 1];
+			else
+				test_strategy = BT_implic_table[clause_strategy - 1][pred_strategy - 1];
 
-		if (pred_op_negated)
-		{
-			/* Only consider negators that are = */
-			if (pred_strategy != BTEqualStrategyNumber)
+			if (test_strategy == 0)
+			{
+				/* Can't determine implication using this interpretation */
 				continue;
-			pred_strategy = BTNE;
-		}
+			}
 
-		/*
-		 * From the same opfamily, find a strategy number for the clause_op,
-		 * if possible
-		 */
-		clause_tuple = SearchSysCache3(AMOPOPID,
-									   ObjectIdGetDatum(clause_op),
-									   CharGetDatum(AMOP_SEARCH),
-									   ObjectIdGetDatum(opfamily_id));
-		if (HeapTupleIsValid(clause_tuple))
-		{
-			Form_pg_amop clause_form = (Form_pg_amop) GETSTRUCT(clause_tuple);
-
-			/* Get the restriction clause operator's strategy/datatype */
-			clause_strategy = (StrategyNumber) clause_form->amopstrategy;
-			Assert(clause_strategy >= 1 && clause_strategy <= 5);
-			Assert(clause_form->amoplefttype == pred_form->amoplefttype);
-			clause_righttype = clause_form->amoprighttype;
-			ReleaseSysCache(clause_tuple);
-		}
-		else if (OidIsValid(clause_op_negator))
-		{
-			clause_tuple = SearchSysCache3(AMOPOPID,
-										 ObjectIdGetDatum(clause_op_negator),
-										   CharGetDatum(AMOP_SEARCH),
-										   ObjectIdGetDatum(opfamily_id));
-			if (HeapTupleIsValid(clause_tuple))
+			/*
+			 * See if opfamily has an operator for the test strategy and the
+			 * datatypes.
+			 */
+			if (test_strategy == BTNE)
 			{
-				Form_pg_amop clause_form = (Form_pg_amop) GETSTRUCT(clause_tuple);
-
-				/* Get the restriction clause operator's strategy/datatype */
-				clause_strategy = (StrategyNumber) clause_form->amopstrategy;
-				Assert(clause_strategy >= 1 && clause_strategy <= 5);
-				Assert(clause_form->amoplefttype == pred_form->amoplefttype);
-				clause_righttype = clause_form->amoprighttype;
-				ReleaseSysCache(clause_tuple);
-
-				/* Only consider negators that are = */
-				if (clause_strategy != BTEqualStrategyNumber)
-					continue;
-				clause_strategy = BTNE;
+				test_op = get_opfamily_member(opfamily_id,
+											  pred_op_info->oprighttype,
+											  clause_op_info->oprighttype,
+											  BTEqualStrategyNumber);
+				if (OidIsValid(test_op))
+					test_op = get_negator(test_op);
 			}
 			else
-				continue;
-		}
-		else
-			continue;
-
-		/*
-		 * Look up the "test" strategy number in the implication table
-		 */
-		if (refute_it)
-			test_strategy = BT_refute_table[clause_strategy - 1][pred_strategy - 1];
-		else
-			test_strategy = BT_implic_table[clause_strategy - 1][pred_strategy - 1];
+			{
+				test_op = get_opfamily_member(opfamily_id,
+											  pred_op_info->oprighttype,
+											  clause_op_info->oprighttype,
+											  test_strategy);
+			}
 
-		if (test_strategy == 0)
-		{
-			/* Can't determine implication using this interpretation */
-			continue;
-		}
+			if (!OidIsValid(test_op))
+				continue;
 
-		/*
-		 * See if opfamily has an operator for the test strategy and the
-		 * datatypes.
-		 */
-		if (test_strategy == BTNE)
-		{
-			test_op = get_opfamily_member(opfamily_id,
-										  pred_form->amoprighttype,
-										  clause_righttype,
-										  BTEqualStrategyNumber);
-			if (OidIsValid(test_op))
-				test_op = get_negator(test_op);
-		}
-		else
-		{
-			test_op = get_opfamily_member(opfamily_id,
-										  pred_form->amoprighttype,
-										  clause_righttype,
-										  test_strategy);
-		}
-		if (OidIsValid(test_op))
-		{
 			/*
 			 * Last check: test_op must be immutable.
 			 *
@@ -1772,9 +1703,13 @@ get_btree_test_op(Oid pred_op, Oid clause_op, bool refute_it)
 				break;
 			}
 		}
+
+		if (found)
+			break;
 	}
 
-	ReleaseSysCacheList(catlist);
+	list_free_deep(pred_op_infos);
+	list_free_deep(clause_op_infos);
 
 	if (!found)
 	{
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index d17424e40f38d..718057a773faf 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -76,9 +76,8 @@ tlist_member_ignore_relabel(Node *node, List *targetlist)
  * flatten_tlist
  *	  Create a target list that only contains unique variables.
  *
- * Note that Vars with varlevelsup > 0 are not included in the output
- * tlist.  We expect that those will eventually be replaced with Params,
- * but that probably has not happened at the time this routine is called.
+ * Aggrefs and PlaceHolderVars in the input are treated according to
+ * aggbehavior and phbehavior, for which see pull_var_clause().
  *
  * 'tlist' is the current target list
  *
@@ -88,10 +87,12 @@ tlist_member_ignore_relabel(Node *node, List *targetlist)
  * Copying the Var nodes is probably overkill, but be safe for now.
  */
 List *
-flatten_tlist(List *tlist)
+flatten_tlist(List *tlist, PVCAggregateBehavior aggbehavior,
+			  PVCPlaceHolderBehavior phbehavior)
 {
 	List	   *vlist = pull_var_clause((Node *) tlist,
-										PVC_INCLUDE_PLACEHOLDERS);
+										aggbehavior,
+										phbehavior);
 	List	   *new_tlist;
 
 	new_tlist = add_to_flat_tlist(NIL, vlist);
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index edf507c405650..8ce7ee41a187b 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -56,7 +56,8 @@ typedef struct
 typedef struct
 {
 	List	   *varlist;
-	PVCPlaceHolderBehavior behavior;
+	PVCAggregateBehavior aggbehavior;
+	PVCPlaceHolderBehavior phbehavior;
 } pull_var_clause_context;
 
 typedef struct
@@ -616,16 +617,22 @@ find_minimum_var_level_walker(Node *node,
  * pull_var_clause
  *	  Recursively pulls all Var nodes from an expression clause.
  *
- *	  PlaceHolderVars are handled according to 'behavior':
+ *	  Aggrefs are handled according to 'aggbehavior':
+ *		PVC_REJECT_AGGREGATES		throw error if Aggref found
+ *		PVC_INCLUDE_AGGREGATES		include Aggrefs in output list
+ *		PVC_RECURSE_AGGREGATES		recurse into Aggref arguments
+ *	  Vars within an Aggref's expression are included only in the last case.
+ *
+ *	  PlaceHolderVars are handled according to 'phbehavior':
  *		PVC_REJECT_PLACEHOLDERS		throw error if PlaceHolderVar found
  *		PVC_INCLUDE_PLACEHOLDERS	include PlaceHolderVars in output list
- *		PVC_RECURSE_PLACEHOLDERS	recurse into PlaceHolderVar argument
+ *		PVC_RECURSE_PLACEHOLDERS	recurse into PlaceHolderVar arguments
  *	  Vars within a PHV's expression are included only in the last case.
  *
  *	  CurrentOfExpr nodes are ignored in all cases.
  *
- *	  Upper-level vars (with varlevelsup > 0) are not included.
- *	  (These probably represent errors too, but we don't complain.)
+ *	  Upper-level vars (with varlevelsup > 0) should not be seen here,
+ *	  likewise for upper-level Aggrefs and PlaceHolderVars.
  *
  *	  Returns list of nodes found.	Note the nodes themselves are not
  *	  copied, only referenced.
@@ -634,12 +641,14 @@ find_minimum_var_level_walker(Node *node,
  * of sublinks to subplans!
  */
 List *
-pull_var_clause(Node *node, PVCPlaceHolderBehavior behavior)
+pull_var_clause(Node *node, PVCAggregateBehavior aggbehavior,
+				PVCPlaceHolderBehavior phbehavior)
 {
 	pull_var_clause_context context;
 
 	context.varlist = NIL;
-	context.behavior = behavior;
+	context.aggbehavior = aggbehavior;
+	context.phbehavior = phbehavior;
 
 	pull_var_clause_walker(node, &context);
 	return context.varlist;
@@ -652,20 +661,40 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context)
 		return false;
 	if (IsA(node, Var))
 	{
-		if (((Var *) node)->varlevelsup == 0)
-			context->varlist = lappend(context->varlist, node);
+		if (((Var *) node)->varlevelsup != 0)
+			elog(ERROR, "Upper-level Var found where not expected");
+		context->varlist = lappend(context->varlist, node);
 		return false;
 	}
-	if (IsA(node, PlaceHolderVar))
+	else if (IsA(node, Aggref))
+	{
+		if (((Aggref *) node)->agglevelsup != 0)
+			elog(ERROR, "Upper-level Aggref found where not expected");
+		switch (context->aggbehavior)
+		{
+			case PVC_REJECT_AGGREGATES:
+				elog(ERROR, "Aggref found where not expected");
+				break;
+			case PVC_INCLUDE_AGGREGATES:
+				context->varlist = lappend(context->varlist, node);
+				/* we do NOT descend into the contained expression */
+				return false;
+			case PVC_RECURSE_AGGREGATES:
+				/* ignore the aggregate, look at its argument instead */
+				break;
+		}
+	}
+	else if (IsA(node, PlaceHolderVar))
 	{
-		switch (context->behavior)
+		if (((PlaceHolderVar *) node)->phlevelsup != 0)
+			elog(ERROR, "Upper-level PlaceHolderVar found where not expected");
+		switch (context->phbehavior)
 		{
 			case PVC_REJECT_PLACEHOLDERS:
 				elog(ERROR, "PlaceHolderVar found where not expected");
 				break;
 			case PVC_INCLUDE_PLACEHOLDERS:
-				if (((PlaceHolderVar *) node)->phlevelsup == 0)
-					context->varlist = lappend(context->varlist, node);
+				context->varlist = lappend(context->varlist, node);
 				/* we do NOT descend into the contained expression */
 				return false;
 			case PVC_RECURSE_PLACEHOLDERS:
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index e4a4e3a5e4800..bccd6097fe848 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -91,7 +91,6 @@ parse_analyze(Node *parseTree, const char *sourceText,
 
 	if (numParams > 0)
 		parse_fixed_parameters(pstate, paramTypes, numParams);
-
 	query = transformStmt(pstate, parseTree);
 
 	free_parsestate(pstate);
@@ -159,7 +158,6 @@ Query *
 transformStmt(ParseState *pstate, Node *parseTree)
 {
 	Query	   *result;
-
 	switch (nodeTag(parseTree))
 	{
 			/*
@@ -178,9 +176,9 @@ transformStmt(ParseState *pstate, Node *parseTree)
 			break;
 
 		case T_SelectStmt:
-			{
+		  {
+			printf("analyze.c 180: transformStmt Select case\n");
 				SelectStmt *n = (SelectStmt *) parseTree;
-
 				if (n->valuesLists)
 					result = transformValuesClause(pstate, n);
 				else if (n->op == SETOP_NONE)
@@ -204,7 +202,7 @@ transformStmt(ParseState *pstate, Node *parseTree)
 			break;
 
 		default:
-
+		  printf("analyze.c 204 : transformStmt default case\n");
 			/*
 			 * other statements don't require any transformation; just return
 			 * the original parsetree with a Query node plastered on top.
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 1d39674de4cd7..a5c203edfe835 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -94,6 +94,13 @@ typedef struct PrivTarget
 	List	   *objs;
 } PrivTarget;
 
+/* ConstraintAttributeSpec yields an integer bitmask of these flags: */
+#define CAS_NOT_DEFERRABLE			0x01
+#define CAS_DEFERRABLE				0x02
+#define CAS_INITIALLY_IMMEDIATE		0x04
+#define CAS_INITIALLY_DEFERRED		0x08
+#define CAS_NOT_VALID				0x10
+
 
 #define parser_yyerror(msg)  scanner_yyerror(msg, yyscanner)
 #define parser_errposition(pos)  scanner_errposition(pos, yyscanner)
@@ -135,6 +142,9 @@ static RangeVar *makeRangeVarFromAnyName(List *names, int position, core_yyscan_
 static void SplitColQualList(List *qualList,
 							 List **constraintList, CollateClause **collClause,
 							 core_yyscan_t yyscanner);
+static void processCASbits(int cas_bits, int location, const char *constrType,
+			   bool *deferrable, bool *initdeferred, bool *not_valid,
+			   core_yyscan_t yyscanner);
 
 %}
 
@@ -206,7 +216,7 @@ static void SplitColQualList(List *qualList,
 		DropUserStmt DropdbStmt DropTableSpaceStmt DropFdwStmt
 		DropForeignServerStmt DropUserMappingStmt ExplainStmt FetchStmt
 		GrantStmt GrantRoleStmt IndexStmt InsertStmt ListenStmt LoadStmt
-		LockStmt NotifyStmt ExplainableStmt PreparableStmt
+		LockStmt MatViewStmt NotifyStmt ExplainableStmt PreparableStmt
 		CreateFunctionStmt AlterFunctionStmt ReindexStmt RemoveAggrStmt
 		RemoveFuncStmt RemoveOperStmt RenameStmt RevokeStmt RevokeRoleStmt
 		RuleActionStmt RuleActionStmtOrEmpty RuleStmt
@@ -429,8 +439,7 @@ static void SplitColQualList(List *qualList,
 %type <list>	ColQualList
 %type <node>	ColConstraint ColConstraintElem ConstraintAttr
 %type <ival>	key_actions key_delete key_match key_update key_action
-%type <ival>	ConstraintAttributeSpec ConstraintDeferrabilitySpec
-				ConstraintTimeSpec
+%type <ival>	ConstraintAttributeSpec ConstraintAttributeElem
 %type <str>		ExistingIndex
 
 %type <list>	constraints_set_list
@@ -522,7 +531,7 @@ static void SplitColQualList(List *qualList,
 	LEAST LEFT LEVEL LIKE LIMIT LISTEN LOAD LOCAL LOCALTIME LOCALTIMESTAMP
 	LOCATION LOCK_P
 
-	MAPPING MATCH MAXVALUE MINUTE_P MINVALUE MODE MONTH_P MOVE
+	MAPPING MATCH MATVIEW MAXVALUE MINUTE_P MINVALUE MODE MONTH_P MOVE
 
 	NAME_P NAMES NATIONAL NATURAL NCHAR NEXT NO NONE
 	NOT NOTHING NOTIFY NOTNULL NOWAIT NULL_P NULLIF
@@ -755,6 +764,7 @@ stmt :
 			| ListenStmt
 			| LoadStmt
 			| LockStmt
+			| MatViewStmt
 			| NotifyStmt
 			| PrepareStmt
 			| ReassignOwnedStmt
@@ -1185,6 +1195,7 @@ schema_stmt:
 			| CreateSeqStmt
 			| CreateTrigStmt
 			| GrantStmt
+			| MatViewStmt
 			| ViewStmt
 		;
 
@@ -2638,7 +2649,7 @@ ColConstraintElem:
 					n->fk_matchtype		= $4;
 					n->fk_upd_action	= (char) ($5 >> 8);
 					n->fk_del_action	= (char) ($5 & 0xFF);
-					n->skip_validation  = FALSE;
+					n->skip_validation  = false;
 					n->initially_valid  = true;
 					$$ = (Node *)n;
 				}
@@ -2654,7 +2665,10 @@ ColConstraintElem:
  * combinations.
  *
  * See also ConstraintAttributeSpec, which can be used in places where
- * there is no parsing conflict.
+ * there is no parsing conflict.  (Note: currently, NOT VALID is an allowed
+ * clause in ConstraintAttributeSpec, but not here.  Someday we might need
+ * to allow it here too, but for the moment it doesn't seem useful in the
+ * statements that use ConstraintAttr.)
  */
 ConstraintAttr:
 			DEFERRABLE
@@ -2746,11 +2760,9 @@ ConstraintElem:
 					n->location = @1;
 					n->raw_expr = $3;
 					n->cooked_expr = NULL;
-					if ($5 != 0)
-						ereport(ERROR,
-								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-								 errmsg("CHECK constraints cannot be deferred"),
-								 parser_errposition(@5)));
+					processCASbits($5, @5, "CHECK",
+								   NULL, NULL, NULL,
+								   yyscanner);
 					$$ = (Node *)n;
 				}
 			| UNIQUE '(' columnList ')' opt_definition OptConsTableSpace
@@ -2763,8 +2775,9 @@ ConstraintElem:
 					n->options = $5;
 					n->indexname = NULL;
 					n->indexspace = $6;
-					n->deferrable = ($7 & 1) != 0;
-					n->initdeferred = ($7 & 2) != 0;
+					processCASbits($7, @7, "UNIQUE",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 					$$ = (Node *)n;
 				}
 			| UNIQUE ExistingIndex ConstraintAttributeSpec
@@ -2776,8 +2789,9 @@ ConstraintElem:
 					n->options = NIL;
 					n->indexname = $2;
 					n->indexspace = NULL;
-					n->deferrable = ($3 & 1) != 0;
-					n->initdeferred = ($3 & 2) != 0;
+					processCASbits($3, @3, "UNIQUE",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 					$$ = (Node *)n;
 				}
 			| PRIMARY KEY '(' columnList ')' opt_definition OptConsTableSpace
@@ -2790,8 +2804,9 @@ ConstraintElem:
 					n->options = $6;
 					n->indexname = NULL;
 					n->indexspace = $7;
-					n->deferrable = ($8 & 1) != 0;
-					n->initdeferred = ($8 & 2) != 0;
+					processCASbits($8, @8, "PRIMARY KEY",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 					$$ = (Node *)n;
 				}
 			| PRIMARY KEY ExistingIndex ConstraintAttributeSpec
@@ -2803,8 +2818,9 @@ ConstraintElem:
 					n->options = NIL;
 					n->indexname = $3;
 					n->indexspace = NULL;
-					n->deferrable = ($4 & 1) != 0;
-					n->initdeferred = ($4 & 2) != 0;
+					processCASbits($4, @4, "PRIMARY KEY",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 					$$ = (Node *)n;
 				}
 			| EXCLUDE access_method_clause '(' ExclusionConstraintList ')'
@@ -2820,8 +2836,9 @@ ConstraintElem:
 					n->indexname		= NULL;
 					n->indexspace		= $7;
 					n->where_clause		= $8;
-					n->deferrable		= ($9 & 1) != 0;
-					n->initdeferred		= ($9 & 2) != 0;
+					processCASbits($9, @9, "EXCLUDE",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 					$$ = (Node *)n;
 				}
 			| FOREIGN KEY '(' columnList ')' REFERENCES qualified_name
@@ -2836,27 +2853,11 @@ ConstraintElem:
 					n->fk_matchtype		= $9;
 					n->fk_upd_action	= (char) ($10 >> 8);
 					n->fk_del_action	= (char) ($10 & 0xFF);
-					n->deferrable		= ($11 & 1) != 0;
-					n->initdeferred		= ($11 & 2) != 0;
-					n->skip_validation  = false;
-					n->initially_valid  = true;
-					$$ = (Node *)n;
-				}
-			| FOREIGN KEY '(' columnList ')' REFERENCES qualified_name
-				opt_column_list key_match key_actions
-				NOT VALID
-				{
-					Constraint *n = makeNode(Constraint);
-					n->contype = CONSTR_FOREIGN;
-					n->location = @1;
-					n->pktable			= $7;
-					n->fk_attrs			= $4;
-					n->pk_attrs			= $8;
-					n->fk_matchtype		= $9;
-					n->fk_upd_action	= (char) ($10 >> 8);
-					n->fk_del_action	= (char) ($10 & 0xFF);
-					n->skip_validation  = true;
-					n->initially_valid  = false;
+					processCASbits($11, @11, "FOREIGN KEY",
+								   &n->deferrable, &n->initdeferred,
+								   &n->skip_validation,
+								   yyscanner);
+					n->initially_valid = !n->skip_validation;
 					$$ = (Node *)n;
 				}
 		;
@@ -4031,8 +4032,9 @@ CreateTrigStmt:
 					n->columns = (List *) lsecond($6);
 					n->whenClause = $14;
 					n->isconstraint  = TRUE;
-					n->deferrable = ($10 & 1) != 0;
-					n->initdeferred = ($10 & 2) != 0;
+					processCASbits($10, @10, "TRIGGER",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 					n->constrrel = $9;
 					$$ = (Node *)n;
 				}
@@ -4135,45 +4137,40 @@ OptConstrFromTable:
 		;
 
 ConstraintAttributeSpec:
-			ConstraintDeferrabilitySpec
-				{ $$ = $1; }
-			| ConstraintDeferrabilitySpec ConstraintTimeSpec
+			/*EMPTY*/
+				{ $$ = 0; }
+			| ConstraintAttributeSpec ConstraintAttributeElem
 				{
-					if ($1 == 0 && $2 != 0)
+					/*
+					 * We must complain about conflicting options.
+					 * We could, but choose not to, complain about redundant
+					 * options (ie, where $2's bit is already set in $1).
+					 */
+					int		newspec = $1 | $2;
+
+					/* special message for this case */
+					if ((newspec & (CAS_NOT_DEFERRABLE | CAS_INITIALLY_DEFERRED)) == (CAS_NOT_DEFERRABLE | CAS_INITIALLY_DEFERRED))
 						ereport(ERROR,
 								(errcode(ERRCODE_SYNTAX_ERROR),
 								 errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE"),
-								 parser_errposition(@1)));
-					$$ = $1 | $2;
-				}
-			| ConstraintTimeSpec
-				{
-					if ($1 != 0)
-						$$ = 3;
-					else
-						$$ = 0;
-				}
-			| ConstraintTimeSpec ConstraintDeferrabilitySpec
-				{
-					if ($2 == 0 && $1 != 0)
+								 parser_errposition(@2)));
+					/* generic message for other conflicts */
+					if ((newspec & (CAS_NOT_DEFERRABLE | CAS_DEFERRABLE)) == (CAS_NOT_DEFERRABLE | CAS_DEFERRABLE) ||
+						(newspec & (CAS_INITIALLY_IMMEDIATE | CAS_INITIALLY_DEFERRED)) == (CAS_INITIALLY_IMMEDIATE | CAS_INITIALLY_DEFERRED))
 						ereport(ERROR,
 								(errcode(ERRCODE_SYNTAX_ERROR),
-								 errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE"),
-								 parser_errposition(@1)));
-					$$ = $1 | $2;
+								 errmsg("conflicting constraint properties"),
+								 parser_errposition(@2)));
+					$$ = newspec;
 				}
-			| /*EMPTY*/
-				{ $$ = 0; }
 		;
 
-ConstraintDeferrabilitySpec:
-			NOT DEFERRABLE							{ $$ = 0; }
-			| DEFERRABLE							{ $$ = 1; }
-		;
-
-ConstraintTimeSpec:
-			INITIALLY IMMEDIATE						{ $$ = 0; }
-			| INITIALLY DEFERRED					{ $$ = 2; }
+ConstraintAttributeElem:
+			NOT DEFERRABLE					{ $$ = CAS_NOT_DEFERRABLE; }
+			| DEFERRABLE					{ $$ = CAS_DEFERRABLE; }
+			| INITIALLY IMMEDIATE			{ $$ = CAS_INITIALLY_IMMEDIATE; }
+			| INITIALLY DEFERRED			{ $$ = CAS_INITIALLY_DEFERRED; }
+			| NOT VALID						{ $$ = CAS_NOT_VALID; }
 		;
 
 
@@ -4217,8 +4214,9 @@ CreateAssertStmt:
 					n->trigname = $3;
 					n->args = list_make1($6);
 					n->isconstraint  = TRUE;
-					n->deferrable = ($8 & 1) != 0;
-					n->initdeferred = ($8 & 2) != 0;
+					processCASbits($8, @8, "ASSERTION",
+								   &n->deferrable, &n->initdeferred, NULL,
+								   yyscanner);
 
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -4740,21 +4738,22 @@ DropStmt:	DROP drop_type IF_P EXISTS any_name_list opt_drop_behavior
 		;
 
 
-drop_type:	TABLE									{ $$ = OBJECT_TABLE; }
-			| SEQUENCE								{ $$ = OBJECT_SEQUENCE; }
-			| VIEW									{ $$ = OBJECT_VIEW; }
-			| INDEX									{ $$ = OBJECT_INDEX; }
-			| FOREIGN TABLE							{ $$ = OBJECT_FOREIGN_TABLE; }
-			| TYPE_P								{ $$ = OBJECT_TYPE; }
-			| DOMAIN_P								{ $$ = OBJECT_DOMAIN; }
-			| COLLATION								{ $$ = OBJECT_COLLATION; }
-			| CONVERSION_P							{ $$ = OBJECT_CONVERSION; }
-			| SCHEMA								{ $$ = OBJECT_SCHEMA; }
-			| EXTENSION								{ $$ = OBJECT_EXTENSION; }
-			| TEXT_P SEARCH PARSER					{ $$ = OBJECT_TSPARSER; }
-			| TEXT_P SEARCH DICTIONARY				{ $$ = OBJECT_TSDICTIONARY; }
-			| TEXT_P SEARCH TEMPLATE				{ $$ = OBJECT_TSTEMPLATE; }
-			| TEXT_P SEARCH CONFIGURATION			{ $$ = OBJECT_TSCONFIGURATION; }
+drop_type:	TABLE					{ $$	= OBJECT_TABLE; }
+			| SEQUENCE			{ $$	= OBJECT_SEQUENCE; }
+			| VIEW				{ $$	= OBJECT_VIEW; }
+                        | MATVIEW			{ $$	= OBJECT_MAT_VIEW; }
+			| INDEX				{ $$	= OBJECT_INDEX; }
+			| FOREIGN TABLE			{ $$	= OBJECT_FOREIGN_TABLE; }
+			| TYPE_P			{ $$	= OBJECT_TYPE; }
+			| DOMAIN_P			{ $$	= OBJECT_DOMAIN; }
+			| COLLATION			{ $$	= OBJECT_COLLATION; }
+			| CONVERSION_P			{ $$	= OBJECT_CONVERSION; }
+			| SCHEMA			{ $$	= OBJECT_SCHEMA; }
+			| EXTENSION			{ $$	= OBJECT_EXTENSION; }
+			| TEXT_P SEARCH PARSER		{ $$	= OBJECT_TSPARSER; }
+			| TEXT_P SEARCH DICTIONARY	{ $$	= OBJECT_TSDICTIONARY; }
+			| TEXT_P SEARCH TEMPLATE	{ $$	= OBJECT_TSTEMPLATE; }
+			| TEXT_P SEARCH CONFIGURATION	{ $$	= OBJECT_TSCONFIGURATION; }
 		;
 
 any_name_list:
@@ -7271,7 +7270,7 @@ transaction_mode_list_or_empty:
 
 ViewStmt: CREATE OptTemp VIEW qualified_name opt_column_list
 				AS SelectStmt opt_check_option
-				{
+{
 					ViewStmt *n = makeNode(ViewStmt);
 					n->view = $4;
 					n->view->relpersistence = $2;
@@ -7292,6 +7291,33 @@ ViewStmt: CREATE OptTemp VIEW qualified_name opt_column_list
 					$$ = (Node *) n;
 				}
 		;
+/*
+changed
+*/
+MatViewStmt: CREATE OptTemp MATVIEW qualified_name opt_column_list
+                AS SelectStmt opt_check_option
+{
+  printf("gram.y 7300: MatViewStmt detected\n");
+                    MatViewStmt *n = makeNode(MatViewStmt);
+                    n->matView = $4;
+                    n->matView->relpersistence = $2;
+                    n->aliases = $5;
+                    n->query = $7;
+                    n->replace = false;
+                    $$ = (Node *) n;
+                }
+        | CREATE OR REPLACE OptTemp MATVIEW qualified_name opt_column_list
+                AS SelectStmt opt_check_option
+                {
+                    MatViewStmt *n = makeNode(MatViewStmt);
+                    n->matView = $6;
+                    n->matView->relpersistence = $4;
+                    n->aliases = $7;
+                    n->query = $9;
+                    n->replace = true;
+                    $$ = (Node *) n;
+                }
+        ;
 
 opt_check_option:
 		WITH CHECK OPTION
@@ -11945,6 +11971,7 @@ unreserved_keyword:
 			| LOCK_P
 			| MAPPING
 			| MATCH
+			| MATVIEW
 			| MAXVALUE
 			| MINUTE_P
 			| MINVALUE
@@ -12865,6 +12892,64 @@ SplitColQualList(List *qualList,
 	*constraintList = qualList;
 }
 
+/*
+ * Process result of ConstraintAttributeSpec, and set appropriate bool flags
+ * in the output command node.  Pass NULL for any flags the particular
+ * command doesn't support.
+ */
+static void
+processCASbits(int cas_bits, int location, const char *constrType,
+			   bool *deferrable, bool *initdeferred, bool *not_valid,
+			   core_yyscan_t yyscanner)
+{
+	/* defaults */
+	if (deferrable)
+		*deferrable = false;
+	if (initdeferred)
+		*initdeferred = false;
+	if (not_valid)
+		*not_valid = false;
+
+	if (cas_bits & (CAS_DEFERRABLE | CAS_INITIALLY_DEFERRED))
+	{
+		if (deferrable)
+			*deferrable = true;
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 /* translator: %s is CHECK, UNIQUE, or similar */
+					 errmsg("%s constraints cannot be marked DEFERRABLE",
+							constrType),
+					 parser_errposition(location)));
+	}
+
+	if (cas_bits & CAS_INITIALLY_DEFERRED)
+	{
+		if (initdeferred)
+			*initdeferred = true;
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 /* translator: %s is CHECK, UNIQUE, or similar */
+					 errmsg("%s constraints cannot be marked DEFERRABLE",
+							constrType),
+					 parser_errposition(location)));
+	}
+
+	if (cas_bits & CAS_NOT_VALID)
+	{
+		if (not_valid)
+			*not_valid = true;
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 /* translator: %s is CHECK, UNIQUE, or similar */
+					 errmsg("%s constraints cannot be marked NOT VALID",
+							constrType),
+					 parser_errposition(location)));
+	}
+}
+
 /* parser_init()
  * Initialize to parse one query string
  */
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 08f0439e7edb2..75236c76a1f5a 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -836,12 +836,15 @@ transformAExprOp(ParseState *pstate, A_Expr *a)
 	/*
 	 * Special-case "foo = NULL" and "NULL = foo" for compatibility with
 	 * standards-broken products (like Microsoft's).  Turn these into IS NULL
-	 * exprs.
+	 * exprs. (If either side is a CaseTestExpr, then the expression was
+	 * generated internally from a CASE-WHEN expression, and
+	 * transform_null_equals does not apply.)
 	 */
 	if (Transform_null_equals &&
 		list_length(a->name) == 1 &&
 		strcmp(strVal(linitial(a->name)), "=") == 0 &&
-		(exprIsNullConstant(lexpr) || exprIsNullConstant(rexpr)))
+		(exprIsNullConstant(lexpr) || exprIsNullConstant(rexpr)) &&
+		(!IsA(lexpr, CaseTestExpr) && !IsA(rexpr, CaseTestExpr)))
 	{
 		NullTest   *n = makeNode(NullTest);
 
@@ -2056,8 +2059,15 @@ transformWholeRowRef(ParseState *pstate, RangeTblEntry *rte, int location)
 	/* Find the RTE's rangetable location */
 	vnum = RTERangeTablePosn(pstate, rte, &sublevels_up);
 
-	/* Build the appropriate referencing node */
-	result = makeWholeRowVar(rte, vnum, sublevels_up);
+	/*
+	 * Build the appropriate referencing node.  Note that if the RTE is a
+	 * function returning scalar, we create just a plain reference to the
+	 * function value, not a composite containing a single column.  This is
+	 * pretty inconsistent at first sight, but it's what we've done
+	 * historically.  One argument for it is that "rel" and "rel.*" mean the
+	 * same thing for composite relations, so why not for scalar functions...
+	 */
+	result = makeWholeRowVar(rte, vnum, sublevels_up, true);
 
 	/* location is not filled in by makeWholeRowVar */
 	result->location = location;
@@ -2170,8 +2180,7 @@ make_row_comparison_op(ParseState *pstate, List *opname,
 	List	   *opfamilies;
 	ListCell   *l,
 			   *r;
-	List	  **opfamily_lists;
-	List	  **opstrat_lists;
+	List	  **opinfo_lists;
 	Bitmapset  *strats;
 	int			nopers;
 	int			i;
@@ -2241,8 +2250,7 @@ make_row_comparison_op(ParseState *pstate, List *opname,
 	 * containing the operators, and see which interpretations (strategy
 	 * numbers) exist for each operator.
 	 */
-	opfamily_lists = (List **) palloc(nopers * sizeof(List *));
-	opstrat_lists = (List **) palloc(nopers * sizeof(List *));
+	opinfo_lists = (List **) palloc(nopers * sizeof(List *));
 	strats = NULL;
 	i = 0;
 	foreach(l, opexprs)
@@ -2251,17 +2259,18 @@ make_row_comparison_op(ParseState *pstate, List *opname,
 		Bitmapset  *this_strats;
 		ListCell   *j;
 
-		get_op_btree_interpretation(opno,
-									&opfamily_lists[i], &opstrat_lists[i]);
+		opinfo_lists[i] = get_op_btree_interpretation(opno);
 
 		/*
-		 * convert strategy number list to a Bitmapset to make the
+		 * convert strategy numbers into a Bitmapset to make the
 		 * intersection calculation easy.
 		 */
 		this_strats = NULL;
-		foreach(j, opstrat_lists[i])
+		foreach(j, opinfo_lists[i])
 		{
-			this_strats = bms_add_member(this_strats, lfirst_int(j));
+			OpBtreeInterpretation *opinfo = lfirst(j);
+
+			this_strats = bms_add_member(this_strats, opinfo->strategy);
 		}
 		if (i == 0)
 			strats = this_strats;
@@ -2309,14 +2318,15 @@ make_row_comparison_op(ParseState *pstate, List *opname,
 	for (i = 0; i < nopers; i++)
 	{
 		Oid			opfamily = InvalidOid;
+		ListCell   *j;
 
-		forboth(l, opfamily_lists[i], r, opstrat_lists[i])
+		foreach(j, opinfo_lists[i])
 		{
-			int			opstrat = lfirst_int(r);
+			OpBtreeInterpretation *opinfo = lfirst(j);
 
-			if (opstrat == rctype)
+			if (opinfo->strategy == rctype)
 			{
-				opfamily = lfirst_oid(l);
+				opfamily = opinfo->opfamily_id;
 				break;
 			}
 		}
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index efb8fddbc39b4..60028af55d307 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -162,6 +162,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	 * possible.
 	 */
 	namespaceid = RangeVarGetAndCheckCreationNamespace(stmt->relation);
+	RangeVarAdjustRelationPersistence(stmt->relation, namespaceid);
 
 	/*
 	 * If the relation already exists and the user specified "IF NOT EXISTS",
@@ -367,7 +368,10 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 		if (cxt->rel)
 			snamespaceid = RelationGetNamespace(cxt->rel);
 		else
+		{
 			snamespaceid = RangeVarGetCreationNamespace(cxt->relation);
+			RangeVarAdjustRelationPersistence(cxt->relation, snamespaceid);
+		}
 		snamespace = get_namespace_name(snamespaceid);
 		sname = ChooseRelationName(cxt->relation->relname,
 								   column->colname,
@@ -845,7 +849,6 @@ static void
 transformOfType(CreateStmtContext *cxt, TypeName *ofTypename)
 {
 	HeapTuple	tuple;
-	Form_pg_type typ;
 	TupleDesc	tupdesc;
 	int			i;
 	Oid			ofTypeId;
@@ -854,7 +857,6 @@ transformOfType(CreateStmtContext *cxt, TypeName *ofTypename)
 
 	tuple = typenameType(NULL, ofTypename, NULL);
 	check_of_type(tuple);
-	typ = (Form_pg_type) GETSTRUCT(tuple);
 	ofTypeId = HeapTupleGetOid(tuple);
 	ofTypename->typeOid = ofTypeId;		/* cached for later */
 
@@ -1483,21 +1485,21 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("\"%s\" is not a unique index", index_name),
-					 errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+					 errdetail("Cannot create a primary key or unique constraint using such an index."),
 					 parser_errposition(cxt->pstate, constraint->location)));
 
 		if (RelationGetIndexExpressions(index_rel) != NIL)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("index \"%s\" contains expressions", index_name),
-					 errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+					 errdetail("Cannot create a primary key or unique constraint using such an index."),
 					 parser_errposition(cxt->pstate, constraint->location)));
 
 		if (RelationGetIndexPredicate(index_rel) != NIL)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("\"%s\" is a partial index", index_name),
-					 errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+					 errdetail("Cannot create a primary key or unique constraint using such an index."),
 					 parser_errposition(cxt->pstate, constraint->location)));
 
 		/*
@@ -1522,7 +1524,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 		if (index_rel->rd_rel->relam != get_am_oid(DEFAULT_INDEX_TYPE, false))
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("index \"%s\" is not a b-tree", index_name),
+					 errmsg("index \"%s\" is not a btree", index_name),
 					 parser_errposition(cxt->pstate, constraint->location)));
 
 		/* Must get indclass the hard way */
@@ -1567,7 +1569,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 						 errmsg("index \"%s\" does not have default sorting behavior", index_name),
-						 errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."),
+						 errdetail("Cannot create a primary key or unique constraint using such an index."),
 					 parser_errposition(cxt->pstate, constraint->location)));
 
 			constraint->keys = lappend(constraint->keys, makeString(attname));
@@ -1753,7 +1755,8 @@ transformFKConstraints(CreateStmtContext *cxt,
 
 	/*
 	 * If CREATE TABLE or adding a column with NULL default, we can safely
-	 * skip validation of the constraint.
+	 * skip validation of FK constraints, and nonetheless mark them valid.
+	 * (This will override any user-supplied NOT VALID flag.)
 	 */
 	if (skipValidation)
 	{
@@ -2635,7 +2638,7 @@ transformCreateSchemaStmt(CreateSchemaStmt *stmt)
 			case T_ViewStmt:
 				{
 					ViewStmt   *elp = (ViewStmt *) element;
-
+					printf("parse_utilcmd.c: 2641\n");
 					setSchemaName(cxt.schemaname, &elp->view->schemaname);
 
 					/*
diff --git a/src/backend/po/de.po b/src/backend/po/de.po
index ba70dc31d84b0..d738f2890b8a3 100644
--- a/src/backend/po/de.po
+++ b/src/backend/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for PostgreSQL server
 # Peter Eisentraut <peter_e@gmx.net>, 2001 - 2011.
 #
-# pgtranslation Id: postgres.po,v 1.94 2011/05/23 18:21:57 petere Exp $
+# pgtranslation Id: postgres.po,v 1.110 2011/11/30 19:30:21 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-23 02:43+0000\n"
-"PO-Revision-Date: 2011-05-23 20:42+0300\n"
+"POT-Creation-Date: 2011-11-30 18:43+0000\n"
+"PO-Revision-Date: 2011-11-30 21:28+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -19,316 +19,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: main/main.c:237
+#: nodes/nodeFuncs.c:114 nodes/nodeFuncs.c:140 parser/parse_coerce.c:1645
+#: parser/parse_coerce.c:1662 parser/parse_coerce.c:1724
+#: parser/parse_expr.c:1636 parser/parse_func.c:367 parser/parse_oper.c:948
 #, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr "%s: setsysinfo fehlgeschlagen: %s\n"
+msgid "could not find array type for data type %s"
+msgstr "konnte Arraytyp für Datentyp %s nicht finden"
 
-#: main/main.c:259
-#, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s: WSAStartup fehlgeschlagen: %d\n"
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:615
+msgid "multiple DictFile parameters"
+msgstr "mehrere DictFile-Parameter"
 
-#: main/main.c:278
-#, c-format
-msgid ""
-"%s is the PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s ist der PostgreSQL-Server.\n"
-"\n"
+#: tsearch/dict_ispell.c:64
+msgid "multiple AffFile parameters"
+msgstr "mehrere AffFile-Parameter"
 
-#: main/main.c:279
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION]...\n"
-"\n"
-msgstr ""
-"Aufruf:\n"
-"  %s [OPTION]...\n"
-"\n"
+#: tsearch/dict_ispell.c:75 tsearch/dict_simple.c:50
+#: snowball/dict_snowball.c:206
+msgid "multiple StopWords parameters"
+msgstr "mehrere »StopWords«-Parameter"
 
-#: main/main.c:280
+#: tsearch/dict_ispell.c:83
 #, c-format
-msgid "Options:\n"
-msgstr "Optionen:\n"
+msgid "unrecognized Ispell parameter: \"%s\""
+msgstr "unbekannter Ispell-Parameter: »%s«"
 
-#: main/main.c:282
-#, c-format
-msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr "  -A 1|0          Assert-Prüfungen ein-/ausschalten\n"
+#: tsearch/dict_ispell.c:97
+msgid "missing AffFile parameter"
+msgstr "Parameter »AffFile« fehlt"
 
-#: main/main.c:284
-#, c-format
-msgid "  -B NBUFFERS     number of shared buffers\n"
-msgstr "  -B ZAHL         Anzahl der geteilten Puffer\n"
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:639
+msgid "missing DictFile parameter"
+msgstr "Parameter »DictFile« fehlt"
 
-#: main/main.c:285
-#, c-format
-msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr "  -c NAME=WERT    setze Konfigurationsparameter\n"
+#: tsearch/dict_simple.c:59
+msgid "multiple Accept parameters"
+msgstr "mehrere »Accept«-Parameter"
 
-#: main/main.c:286
+#: tsearch/dict_simple.c:67
 #, c-format
-msgid "  -d 1-5          debugging level\n"
-msgstr "  -d 1-5          Debug-Level\n"
+msgid "unrecognized simple dictionary parameter: \"%s\""
+msgstr "unbekannter Parameter für das einfache Wörterbuch: »%s«"
 
-#: main/main.c:287
+#: tsearch/dict_synonym.c:119
 #, c-format
-msgid "  -D DATADIR      database directory\n"
-msgstr "  -D VERZEICHNIS  Datenbankverzeichnis\n"
+msgid "unrecognized synonym parameter: \"%s\""
+msgstr "unbekannter Synonymparameter: »%s«"
 
-#: main/main.c:288
-#, c-format
-msgid "  -e              use European date input format (DMY)\n"
-msgstr "  -e              verwende europäisches Datumseingabeformat (DMY)\n"
+#: tsearch/dict_synonym.c:126
+msgid "missing Synonyms parameter"
+msgstr "Parameter »Synonyms« fehlt"
 
-#: main/main.c:289
+#: tsearch/dict_synonym.c:133
 #, c-format
-msgid "  -F              turn fsync off\n"
-msgstr "  -F              »fsync« ausschalten\n"
+msgid "could not open synonym file \"%s\": %m"
+msgstr "konnte Synonymdatei »%s« nicht öffnen: %m"
 
-#: main/main.c:290
+#: tsearch/dict_thesaurus.c:180
 #, c-format
-msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr "  -h HOSTNAME     horche auf Hostname oder IP-Adresse\n"
+msgid "could not open thesaurus file \"%s\": %m"
+msgstr "konnte Thesaurusdatei »%s« nicht öffnen: %m"
 
-#: main/main.c:291
-#, c-format
-msgid "  -i              enable TCP/IP connections\n"
-msgstr "  -i              ermögliche TCP/IP-Verbindungen\n"
+#: tsearch/dict_thesaurus.c:213
+msgid "unexpected delimiter"
+msgstr "unerwartetes Trennzeichen"
 
-#: main/main.c:292
-#, c-format
-msgid "  -k DIRECTORY    Unix-domain socket location\n"
-msgstr "  -k VERZEICHNIS  Ort der Unix-Domain-Socket\n"
+#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
+msgid "unexpected end of line or lexeme"
+msgstr "unerwartetes Ende der Zeile oder des Lexems"
 
-#: main/main.c:294
-#, c-format
-msgid "  -l              enable SSL connections\n"
-msgstr "  -l              ermögliche SSL-Verbindungen\n"
+#: tsearch/dict_thesaurus.c:288
+msgid "unexpected end of line"
+msgstr "unerwartetes Ende der Zeile"
 
-#: main/main.c:296
+#: tsearch/dict_thesaurus.c:412
 #, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
-msgstr "  -N ZAHL         Anzahl der erlaubten Verbindugen\n"
+msgid ""
+"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"Thesaurus-Beispielwort »%s« wird nicht vom Unterwörterbuch erkannt (Regel %d)"
 
-#: main/main.c:297
+#: tsearch/dict_thesaurus.c:418
 #, c-format
-msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
+msgstr "Thesaurus-Beispielwort »%s« ist ein Stoppwort (Regel %d)"
+
+#: tsearch/dict_thesaurus.c:421
+msgid "Use \"?\" to represent a stop word within a sample phrase."
 msgstr ""
-"  -o OPTIONEN     »OPTIONEN« an jeden Serverprozess weiterreichen (obsolet)\n"
+"Verwenden Sie »?«, um ein Stoppwort in einem Beispielsatz darzustellen."
 
-#: main/main.c:298
+#: tsearch/dict_thesaurus.c:567
 #, c-format
-msgid "  -p PORT         port number to listen on\n"
-msgstr "  -p PORT         auf dieser Portnummer horchen\n"
+msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
+msgstr "Thesaurus-Ersatzwort »%s« ist ein Stoppwort (Regel %d)"
 
-#: main/main.c:299
+#: tsearch/dict_thesaurus.c:574
 #, c-format
-msgid "  -s              show statistics after each query\n"
-msgstr "  -s              zeige Statistiken nach jeder Anfrage\n"
+msgid ""
+"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"Thesaurus-Ersatzwort »%s« wird nicht vom Unterwörterbuch erkannt (Regel %d)"
 
-#: main/main.c:300
+#: tsearch/dict_thesaurus.c:586
 #, c-format
-msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
-msgstr "  -S ZAHL         setze Speicher für Sortiervorgänge (in kB)\n"
+msgid "thesaurus substitute phrase is empty (rule %d)"
+msgstr "Thesaurus-Ersatzausdruck ist leer (Regel %d)"
 
-#: main/main.c:301
-#, c-format
-msgid "  --NAME=VALUE    set run-time parameter\n"
-msgstr "  --NAME=WERT     setze Konfigurationsparameter\n"
+#: tsearch/dict_thesaurus.c:624
+msgid "multiple Dictionary parameters"
+msgstr "mehrere »Dictionary«-Parameter"
 
-#: main/main.c:302
+#: tsearch/dict_thesaurus.c:631
 #, c-format
-msgid "  --describe-config  describe configuration parameters, then exit\n"
-msgstr "  --describe-config  zeige Konfigurationsparameter und beende\n"
+msgid "unrecognized Thesaurus parameter: \"%s\""
+msgstr "unbekannter Thesaurus-Parameter: »%s«"
 
-#: main/main.c:303
-#, c-format
-msgid "  --help          show this help, then exit\n"
-msgstr "  --help          diese Hilfe anzeigen, dann beenden\n"
+#: tsearch/dict_thesaurus.c:643
+msgid "missing Dictionary parameter"
+msgstr "Parameter »Dictionary« fehlt"
 
-#: main/main.c:304
+#: tsearch/spell.c:276
 #, c-format
-msgid "  --version       output version information, then exit\n"
-msgstr "  --version       Versionsinformationen anzeigen, dann beenden\n"
+msgid "could not open dictionary file \"%s\": %m"
+msgstr "konnte Wörterbuchdatei »%s« nicht öffnen: %m"
 
-#: main/main.c:306
+#: tsearch/spell.c:439 utils/adt/regexp.c:195
 #, c-format
-msgid ""
-"\n"
-"Developer options:\n"
-msgstr ""
-"\n"
-"Entwickleroptionen:\n"
+msgid "invalid regular expression: %s"
+msgstr "ungültiger regulärer Ausdruck: %s"
 
-#: main/main.c:307
-#, c-format
-msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
-msgstr "  -f s|i|n|m|h    verbiete Verwendung einiger Plantypen\n"
+#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
+#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:12477 gram.y:12494
+msgid "syntax error"
+msgstr "Syntaxfehler"
 
-#: main/main.c:308
-#, c-format
-msgid ""
-"  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
-"  -n              Shared Memory nach abnormalem Ende nicht neu "
-"initialisieren\n"
+#: tsearch/spell.c:596 tsearch/spell.c:842 tsearch/spell.c:862
+msgid "multibyte flag character is not allowed"
+msgstr "Mehrbytemarkierungszeichen ist nicht erlaubt"
 
-#: main/main.c:309
+#: tsearch/spell.c:629 tsearch/spell.c:687 tsearch/spell.c:780
 #, c-format
-msgid "  -O              allow system table structure changes\n"
-msgstr "  -O              erlaube Änderungen an Systemtabellenstruktur\n"
+msgid "could not open affix file \"%s\": %m"
+msgstr "konnte Affixdatei »%s« nicht öffnen: %m"
 
-#: main/main.c:310
-#, c-format
-msgid "  -P              disable system indexes\n"
-msgstr "  -P              schalte Systemindexe aus\n"
+#: tsearch/spell.c:675
+msgid "Ispell dictionary supports only default flag value"
+msgstr "Ispell-Wörterbuch unterstützt nur den Default-Flag-Wert"
 
-#: main/main.c:311
-#, c-format
-msgid "  -t pa|pl|ex     show timings after each query\n"
-msgstr "  -t pa|pl|ex     zeige Zeitmessung nach jeder Anfrage\n"
+#: tsearch/spell.c:873
+msgid "wrong affix file format for flag"
+msgstr "falsches Affixdateiformat für Flag"
 
-#: main/main.c:312
+#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:530
 #, c-format
-msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
-msgstr ""
-"  -T              SIGSTOP an alle Backend-Prozesse senden wenn einer stirbt\n"
+msgid "string is too long for tsvector (%d bytes, max %d bytes)"
+msgstr "Zeichenkette ist zu lang für tsvector (%d Bytes, maximal %d Bytes)"
 
-#: main/main.c:313
+#: tsearch/ts_locale.c:177
 #, c-format
-msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
-msgstr "  -W ZAHL         warte ZAHL Sekunden, um Debugger starten zu können\n"
+msgid "line %d of configuration file \"%s\": \"%s\""
+msgstr "Zeile %d in Konfigurationsdatei »%s«: »%s«"
 
-#: main/main.c:315
+#: tsearch/ts_locale.c:182 libpq/hba.c:781 libpq/hba.c:797 libpq/hba.c:833
+#: libpq/hba.c:855 libpq/hba.c:864 libpq/hba.c:887 libpq/hba.c:899
+#: libpq/hba.c:912 libpq/hba.c:927 libpq/hba.c:982 libpq/hba.c:1002
+#: libpq/hba.c:1016 libpq/hba.c:1033 libpq/hba.c:1046 libpq/hba.c:1062
+#: libpq/hba.c:1077 libpq/hba.c:1119 libpq/hba.c:1151 libpq/hba.c:1162
+#: libpq/hba.c:1182 libpq/hba.c:1193 libpq/hba.c:1204 libpq/hba.c:1221
+#: libpq/hba.c:1242 libpq/hba.c:1272 libpq/hba.c:1284 libpq/hba.c:1297
+#: libpq/hba.c:1331 libpq/hba.c:1405 libpq/hba.c:1423 libpq/hba.c:1444
+#: libpq/hba.c:1475 libpq/hba.c:1485
 #, c-format
-msgid ""
-"\n"
-"Options for single-user mode:\n"
-msgstr ""
-"\n"
-"Optionen für Einzelbenutzermodus:\n"
+msgid "line %d of configuration file \"%s\""
+msgstr "Zeile %d in Konfigurationsdatei »%s«"
 
-#: main/main.c:316
+#: tsearch/ts_locale.c:302
 #, c-format
-msgid "  --single        selects single-user mode (must be first argument)\n"
-msgstr ""
-"  --single        wählt den Einzelbenutzermodus (muss erstes Argument sein)\n"
+msgid "conversion from wchar_t to server encoding failed: %m"
+msgstr "Umwandlung von wchar_t in Serverkodierung fehlgeschlagen: %m"
 
-#: main/main.c:317
-#, c-format
-msgid "  DBNAME          database name (defaults to user name)\n"
-msgstr "  DBNAME          Datenbankname (Standard: Benutzername)\n"
-
-#: main/main.c:318
-#, c-format
-msgid "  -d 0-5          override debugging level\n"
-msgstr "  -d 1-5          Debug-Level setzen\n"
-
-#: main/main.c:319
-#, c-format
-msgid "  -E              echo statement before execution\n"
-msgstr "  -E              gebe Befehl vor der Ausführung aus\n"
-
-#: main/main.c:320
-#, c-format
-msgid "  -j              do not use newline as interactive query delimiter\n"
-msgstr ""
-"  -j              verwende Zeilenende nicht als Anfrageende im interaktiven\n"
-"                  Modus\n"
-
-#: main/main.c:321 main/main.c:326
-#, c-format
-msgid "  -r FILENAME     send stdout and stderr to given file\n"
-msgstr "  -r DATEINAME    sende stdout und stderr in genannte Datei\n"
-
-#: main/main.c:323
-#, c-format
-msgid ""
-"\n"
-"Options for bootstrapping mode:\n"
-msgstr ""
-"\n"
-"Optionen für Bootstrap-Modus:\n"
-
-#: main/main.c:324
-#, c-format
-msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
-msgstr ""
-"  --boot          wählt den Bootstrap-Modus (muss erstes Argument sein)\n"
-
-#: main/main.c:325
-#, c-format
-msgid ""
-"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
-msgstr "  DBNAME          Datenbankname (Pflichtangabe im Bootstrap-Modus)\n"
-
-#: main/main.c:327
-#, c-format
-msgid "  -x NUM          internal use\n"
-msgstr "  -x NUM          interne Verwendung\n"
+#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
+#: tsearch/ts_parse.c:568
+msgid "word is too long to be indexed"
+msgstr "Wort ist zu lang, um indiziert zu werden"
 
-#: main/main.c:329
+#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
+#: tsearch/ts_parse.c:569
 #, c-format
-msgid ""
-"\n"
-"Please read the documentation for the complete list of run-time\n"
-"configuration settings and how to set them on the command line or in\n"
-"the configuration file.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"In der Dokumentation finden Sie eine komplette Liste der Konfigurations-\n"
-"parameter und Informationen wie man sie auf der Kommandozeile oder in der\n"
-"Konfiguratonsdatei setzen kann.\n"
-"\n"
-"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
-
-#: main/main.c:343
-msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"Der PostgreSQL-Server darf nicht als »root« ausgeführt werden.  Der\n"
-"Server muss unter einer unprivilegierten Benutzer-ID gestartet werden,\n"
-"um mögliche Sicherheitskompromittierung zu verhindern.  In der\n"
-"Dokumentation finden Sie weitere Informationen darüber, wie der\n"
-"Server richtig gestartet wird.\n"
+msgid "Words longer than %d characters are ignored."
+msgstr "Wörter, die länger als %d Zeichen sind, werden ignoriert."
 
-#: main/main.c:360
+#: tsearch/ts_utils.c:53
 #, c-format
-msgid "%s: real and effective user IDs must match\n"
-msgstr "%s: reelle und effektive Benutzer-IDs müssen übereinstimmen\n"
-
-#: main/main.c:367
-msgid ""
-"Execution of PostgreSQL by a user with administrative permissions is not\n"
-"permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromises.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"Der PostgreSQL-Server darf nicht als Benutzer mit Administrator-Rechten\n"
-"ausgeführt werden.  Der Server muss unter einer unprivilegierten\n"
-"Benutzer-ID gestartet werden, um mögliche Sicherheitskompromittierung zu\n"
-"verhindern.  In der Dokumentation finden Sie weitere Informationen darüber,\n"
-"wie der Server richtig gestartet wird.\n"
+msgid "invalid text search configuration file name \"%s\""
+msgstr "ungültiger Textsuchekonfigurationsdateiname »%s«"
 
-#: main/main.c:388
+#: tsearch/ts_utils.c:91
 #, c-format
-msgid "%s: invalid effective UID: %d\n"
-msgstr "%s: ungültige effektive UID: %d\n"
+msgid "could not open stop-word file \"%s\": %m"
+msgstr "konnte Stoppwortdatei »%s« nicht öffnen: %m"
 
-#: main/main.c:401
-#, c-format
-msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr "%s: konnte Benutzername nicht ermitteln (GetUserName fehlgeschlagen)\n"
+#: tsearch/wparser.c:314
+msgid "text search parser does not support headline creation"
+msgstr "Textsucheparser unterstützt das Erzeugen von Headlines nicht"
 
 #: tsearch/wparser_def.c:2551
 #, c-format
@@ -351,203 +245,211 @@ msgstr "»ShortWord« sollte >= 0 sein"
 msgid "MaxFragments should be >= 0"
 msgstr "»MaxFragments« sollte >= 0 sein"
 
-#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:615
-msgid "multiple DictFile parameters"
-msgstr "mehrere DictFile-Parameter"
-
-#: tsearch/dict_ispell.c:64
-msgid "multiple AffFile parameters"
-msgstr "mehrere AffFile-Parameter"
+#: access/hash/hashinsert.c:73
+#, c-format
+msgid "index row size %lu exceeds hash maximum %lu"
+msgstr "Größe der Indexzeile %lu überschreitet Maximum für Hash-Index %lu"
 
-#: tsearch/dict_ispell.c:75 tsearch/dict_simple.c:50
-#: snowball/dict_snowball.c:206
-msgid "multiple StopWords parameters"
-msgstr "mehrere »StopWords«-Parameter"
+#: access/hash/hashinsert.c:76
+msgid "Values larger than a buffer page cannot be indexed."
+msgstr ""
+"Werte, die größer sind als eine Pufferseite, können nicht indiziert werden."
 
-#: tsearch/dict_ispell.c:83
+#: access/hash/hashovfl.c:547
 #, c-format
-msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "unbekannter Ispell-Parameter: »%s«"
+msgid "out of overflow pages in hash index \"%s\""
+msgstr "keine Überlaufseiten in Hash-Index »%s« mehr"
 
-#: tsearch/dict_ispell.c:97
-msgid "missing AffFile parameter"
-msgstr "Parameter »AffFile« fehlt"
+#: access/hash/hashsearch.c:152
+msgid "hash indexes do not support whole-index scans"
+msgstr "Hash-Indexe unterstützen keine Scans des ganzen Index"
 
-#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:639
-msgid "missing DictFile parameter"
-msgstr "Parameter »DictFile« fehlt"
+#: access/hash/hashutil.c:170 access/gist/gistutil.c:589
+#: access/nbtree/nbtpage.c:433
+#, c-format
+msgid "index \"%s\" contains unexpected zero page at block %u"
+msgstr "Index »%s« enthält unerwartete Nullseite bei Block %u"
 
-#: tsearch/dict_simple.c:59
-msgid "multiple Accept parameters"
-msgstr "mehrere »Accept«-Parameter"
+#: access/hash/hashutil.c:173 access/hash/hashutil.c:184
+#: access/hash/hashutil.c:196 access/hash/hashutil.c:217
+#: access/gist/gist.c:718 access/gist/gistutil.c:592
+#: access/gist/gistutil.c:603 access/gist/gistvacuum.c:274
+#: access/nbtree/nbtpage.c:436 access/nbtree/nbtpage.c:447
+msgid "Please REINDEX it."
+msgstr "Bitte führen Sie REINDEX für den Index aus."
 
-#: tsearch/dict_simple.c:67
+#: access/hash/hashutil.c:181 access/hash/hashutil.c:193
+#: access/gist/gistutil.c:600 access/nbtree/nbtpage.c:444
 #, c-format
-msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "unbekannter Parameter für das einfache Wörterbuch: »%s«"
+msgid "index \"%s\" contains corrupted page at block %u"
+msgstr "Index »%s« enthält korrupte Seite bei Block %u"
 
-#: tsearch/dict_synonym.c:119
+#: access/hash/hashutil.c:209
 #, c-format
-msgid "unrecognized synonym parameter: \"%s\""
-msgstr "unbekannter Synonymparameter: »%s«"
-
-#: tsearch/dict_synonym.c:126
-msgid "missing Synonyms parameter"
-msgstr "Parameter »Synonyms« fehlt"
+msgid "index \"%s\" is not a hash index"
+msgstr "Index »%s« ist kein Hash-Index"
 
-#: tsearch/dict_synonym.c:133
+#: access/hash/hashutil.c:215
 #, c-format
-msgid "could not open synonym file \"%s\": %m"
-msgstr "konnte Synonymdatei »%s« nicht öffnen: %m"
+msgid "index \"%s\" has wrong hash version"
+msgstr "Index »%s« hat falsche Hash-Version"
 
-#: tsearch/dict_thesaurus.c:180
+#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
 #, c-format
-msgid "could not open thesaurus file \"%s\": %m"
-msgstr "konnte Thesaurusdatei »%s« nicht öffnen: %m"
-
-#: tsearch/dict_thesaurus.c:213
-msgid "unexpected delimiter"
-msgstr "unerwartetes Trennzeichen"
-
-#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
-msgid "unexpected end of line or lexeme"
-msgstr "unerwartetes Ende der Zeile oder des Lexems"
+msgid "number of columns (%d) exceeds limit (%d)"
+msgstr "Anzahl der Spalten (%d) überschreitet Maximum (%d)"
 
-#: tsearch/dict_thesaurus.c:288
-msgid "unexpected end of line"
-msgstr "unerwartetes Ende der Zeile"
+#: access/common/indextuple.c:57
+#, c-format
+msgid "number of index columns (%d) exceeds limit (%d)"
+msgstr "Anzahl der Indexspalten (%d) überschreitet Maximum (%d)"
 
-#: tsearch/dict_thesaurus.c:412
+#: access/common/indextuple.c:168
 #, c-format
-msgid ""
-"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"Thesaurus-Beispielwort »%s« wird nicht vom Unterwörterbuch erkannt (Regel %d)"
+msgid "index row requires %lu bytes, maximum size is %lu"
+msgstr "Indexzeile benötigt %lu Bytes, Maximalgröße ist %lu"
 
-#: tsearch/dict_thesaurus.c:418
+#: access/common/printtup.c:278 tcop/fastpath.c:180 tcop/fastpath.c:554
+#: tcop/postgres.c:1664
 #, c-format
-msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr "Thesaurus-Beispielwort »%s« ist ein Stoppwort (Regel %d)"
+msgid "unsupported format code: %d"
+msgstr "nicht unterstützter Formatcode: %d"
 
-#: tsearch/dict_thesaurus.c:421
-msgid "Use \"?\" to represent a stop word within a sample phrase."
+#: access/common/reloptions.c:323
+msgid "user-defined relation parameter types limit exceeded"
 msgstr ""
-"Verwenden Sie »?«, um ein Stoppwort in einem Beispielsatz darzustellen."
+"Wertebereich des Typs für benutzerdefinierte Relationsparameter überschritten"
 
-#: tsearch/dict_thesaurus.c:567
-#, c-format
-msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr "Thesaurus-Ersatzwort »%s« ist ein Stoppwort (Regel %d)"
+#: access/common/reloptions.c:622
+msgid "RESET must not include values for parameters"
+msgstr "RESET darf keinen Parameterwert enthalten"
 
-#: tsearch/dict_thesaurus.c:574
+#: access/common/reloptions.c:655
 #, c-format
-msgid ""
-"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"Thesaurus-Ersatzwort »%s« wird nicht vom Unterwörterbuch erkannt (Regel %d)"
+msgid "unrecognized parameter namespace \"%s\""
+msgstr "unbekannter Parameter-Namensraum »%s«"
 
-#: tsearch/dict_thesaurus.c:586
+#: access/common/reloptions.c:898
 #, c-format
-msgid "thesaurus substitute phrase is empty (rule %d)"
-msgstr "Thesaurus-Ersatzausdruck ist leer (Regel %d)"
-
-#: tsearch/dict_thesaurus.c:624
-msgid "multiple Dictionary parameters"
-msgstr "mehrere »Dictionary«-Parameter"
+msgid "unrecognized parameter \"%s\""
+msgstr "unbekannter Parameter »%s«"
 
-#: tsearch/dict_thesaurus.c:631
+#: access/common/reloptions.c:923
 #, c-format
-msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "unbekannter Thesaurus-Parameter: »%s«"
+msgid "parameter \"%s\" specified more than once"
+msgstr "Parameter »%s« mehrmals angegeben"
 
-#: tsearch/dict_thesaurus.c:643
-msgid "missing Dictionary parameter"
-msgstr "Parameter »Dictionary« fehlt"
+#: access/common/reloptions.c:938
+#, c-format
+msgid "invalid value for boolean option \"%s\": %s"
+msgstr "ungültiger Wert für Boole'sche Option »%s«: »%s«"
 
-#: tsearch/spell.c:276
+#: access/common/reloptions.c:949
 #, c-format
-msgid "could not open dictionary file \"%s\": %m"
-msgstr "konnte Wörterbuchdatei »%s« nicht öffnen: %m"
+msgid "invalid value for integer option \"%s\": %s"
+msgstr "ungültiger Wert für ganzzahlige Option »%s«: »%s«"
 
-#: tsearch/spell.c:439 utils/adt/regexp.c:195
+#: access/common/reloptions.c:954 access/common/reloptions.c:972
 #, c-format
-msgid "invalid regular expression: %s"
-msgstr "ungültiger regulärer Ausdruck: %s"
+msgid "value %s out of bounds for option \"%s\""
+msgstr "Wert %s ist außerhalb des gültigen Bereichs für Option »%s«"
 
-#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
-#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:12481 gram.y:12498
-msgid "syntax error"
-msgstr "Syntaxfehler"
+#: access/common/reloptions.c:956
+#, c-format
+msgid "Valid values are between \"%d\" and \"%d\"."
+msgstr "Gültige Werte sind zwischen »%d« und »%d«."
 
-#: tsearch/spell.c:596 tsearch/spell.c:842 tsearch/spell.c:862
-msgid "multibyte flag character is not allowed"
-msgstr "Mehrbytemarkierungszeichen ist nicht erlaubt"
+#: access/common/reloptions.c:967
+#, c-format
+msgid "invalid value for floating point option \"%s\": %s"
+msgstr "ungültiger Wert für Gleitkommaoption »%s«: »%s«"
 
-#: tsearch/spell.c:629 tsearch/spell.c:687 tsearch/spell.c:780
+#: access/common/reloptions.c:974
 #, c-format
-msgid "could not open affix file \"%s\": %m"
-msgstr "konnte Affixdatei »%s« nicht öffnen: %m"
+msgid "Valid values are between \"%f\" and \"%f\"."
+msgstr "Gültige Werte sind zwischen »%f« und »%f«."
 
-#: tsearch/spell.c:675
-msgid "Ispell dictionary supports only default flag value"
-msgstr "Ispell-Wörterbuch unterstützt nur den Default-Flag-Wert"
+#: access/common/tupconvert.c:107
+#, c-format
+msgid "Returned type %s does not match expected type %s in column %d."
+msgstr ""
+"Zurückgegebener Typ %1$s stimmt in Spalte %3$d nicht mit erwartetem Typ %2$s "
+"überein."
 
-#: tsearch/spell.c:873
-msgid "wrong affix file format for flag"
-msgstr "falsches Affixdateiformat für Flag"
+#: access/common/tupconvert.c:135
+#, c-format
+msgid ""
+"Number of returned columns (%d) does not match expected column count (%d)."
+msgstr ""
+"Anzahl der zurückgegebenen Spalten (%d) entspricht nicht der erwarteten "
+"Spaltenanzahl (%d)."
 
-#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:514
+#: access/common/tupconvert.c:240
 #, c-format
-msgid "string is too long for tsvector (%d bytes, max %d bytes)"
-msgstr "Zeichenkette ist zu lang für tsvector (%d Bytes, maximal %d Bytes)"
+msgid ""
+"Attribute \"%s\" of type %s does not match corresponding attribute of type "
+"%s."
+msgstr ""
+"Attribut »%s« von Typ %s stimmt nicht mit dem entsprechenden Attribut von "
+"Typ %s überein."
 
-#: tsearch/ts_locale.c:177
+#: access/common/tupconvert.c:252
 #, c-format
-msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "Zeile %d in Konfigurationsdatei »%s«: »%s«"
+msgid "Attribute \"%s\" of type %s does not exist in type %s."
+msgstr "Attribut »%s« von Typ %s existiert nicht in Typ %s."
 
-#: tsearch/ts_locale.c:182 libpq/hba.c:781 libpq/hba.c:797 libpq/hba.c:846
-#: libpq/hba.c:855 libpq/hba.c:878 libpq/hba.c:890 libpq/hba.c:903
-#: libpq/hba.c:918 libpq/hba.c:973 libpq/hba.c:993 libpq/hba.c:1007
-#: libpq/hba.c:1024 libpq/hba.c:1037 libpq/hba.c:1053 libpq/hba.c:1068
-#: libpq/hba.c:1110 libpq/hba.c:1142 libpq/hba.c:1153 libpq/hba.c:1173
-#: libpq/hba.c:1184 libpq/hba.c:1195 libpq/hba.c:1212 libpq/hba.c:1233
-#: libpq/hba.c:1263 libpq/hba.c:1275 libpq/hba.c:1288 libpq/hba.c:1322
-#: libpq/hba.c:1396 libpq/hba.c:1414 libpq/hba.c:1435 libpq/hba.c:1466
-#: libpq/hba.c:1476
+#: access/common/tupdesc.c:575 parser/parse_relation.c:1169
 #, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "Zeile %d in Konfigurationsdatei »%s«"
+msgid "column \"%s\" cannot be declared SETOF"
+msgstr "Spalte »%s« kann nicht als SETOF deklariert werden"
 
-#: tsearch/ts_locale.c:302
+#: access/gin/ginentrypage.c:101 access/nbtree/nbtinsert.c:531
+#: access/nbtree/nbtsort.c:483
 #, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "Umwandlung von wchar_t in Serverkodierung fehlgeschlagen: %m"
+msgid "index row size %lu exceeds maximum %lu for index \"%s\""
+msgstr "Größe %lu der Indexzeile überschreitet Maximum %lu für Index »%s«"
 
-#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
-#: tsearch/ts_parse.c:568
-msgid "word is too long to be indexed"
-msgstr "Wort ist zu lang, um indiziert zu werden"
+#: access/gin/ginscan.c:401
+msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
+msgstr ""
+"alte GIN-Indexe unterstützen keine Scans des ganzen Index oder Suchen nach "
+"NULL-Werten"
 
-#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
-#: tsearch/ts_parse.c:569
+#: access/gin/ginscan.c:402
 #, c-format
-msgid "Words longer than %d characters are ignored."
-msgstr "Wörter, die länger als %d Zeichen sind, werden ignoriert."
+msgid "To fix this, do REINDEX INDEX \"%s\"."
+msgstr "Um das zu reparieren, führen Sie REINDEX INDEX \"%s\" aus."
 
-#: tsearch/ts_utils.c:53
+#: access/gist/gist.c:230
+msgid "unlogged GiST indexes are not supported"
+msgstr "ungeloggte GiST-Indexe werden nicht unterstützt"
+
+#: access/gist/gist.c:715 access/gist/gistvacuum.c:271
 #, c-format
-msgid "invalid text search configuration file name \"%s\""
-msgstr "ungültiger Textsuchekonfigurationsdateiname »%s«"
+msgid "index \"%s\" contains an inner tuple marked as invalid"
+msgstr "Index »%s« enthält ein inneres Tupel, das als ungültig markiert ist"
 
-#: tsearch/ts_utils.c:91
+#: access/gist/gist.c:717 access/gist/gistvacuum.c:273
+msgid ""
+"This is caused by an incomplete page split at crash recovery before "
+"upgrading to PostgreSQL 9.1."
+msgstr ""
+"Das kommt von einem unvollständigen Page-Split bei der Crash-Recovery vor "
+"dem Upgrade auf PostgreSQL 9.1."
+
+#: access/gist/gistsplit.c:375
 #, c-format
-msgid "could not open stop-word file \"%s\": %m"
-msgstr "konnte Stoppwortdatei »%s« nicht öffnen: %m"
+msgid "picksplit method for column %d of index \"%s\" failed"
+msgstr "Picksplit-Methode für Spalte %d von Index »%s« fehlgeschlagen"
 
-#: tsearch/wparser.c:314
-msgid "text search parser does not support headline creation"
-msgstr "Textsucheparser unterstützt die Erzeugung von Headlines nicht"
+#: access/gist/gistsplit.c:377
+msgid ""
+"The index is not optimal. To optimize it, contact a developer, or try to use "
+"the column as the second one in the CREATE INDEX command."
+msgstr ""
+"Der Index ist nicht optimal. Um ihn zu optimieren, kontaktieren Sie einen "
+"Entwickler oder versuchen Sie, die Spalte als die zweite im CREATE-INDEX-"
+"Befehl zu verwenden."
 
 #: access/transam/slru.c:609
 #, c-format
@@ -822,7 +724,7 @@ msgstr "maximale Anzahl committeter Subtransaktionen (%d) erreicht"
 #: access/transam/xact.c:2044
 msgid "cannot PREPARE a transaction that has operated on temporary tables"
 msgstr ""
-"PREPARE kann nicht in einer Transaktion ausgeführt werden, die temporäre "
+"PREPARE kann nicht für eine Transaktion ausgeführt werden, die temporäre "
 "Tabellen bearbeitet hat"
 
 #. translator: %s represents an SQL statement name
@@ -869,96 +771,97 @@ msgstr "Savepoint existiert nicht"
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "kann nicht mehr als 2^32-1 Subtransaktionen in einer Transaktion haben"
 
-#: access/transam/xlog.c:1328
+#: access/transam/xlog.c:1329
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "konnte Archivstatusdatei »%s« nicht erstellen: %m"
 
-#: access/transam/xlog.c:1336
+#: access/transam/xlog.c:1337
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "konnte Archivstatusdatei »%s« nicht schreiben: %m"
 
-#: access/transam/xlog.c:1791 access/transam/xlog.c:10337
-#: replication/walreceiver.c:506 replication/walsender.c:1003
+#: access/transam/xlog.c:1792 access/transam/xlog.c:10401
+#: replication/walreceiver.c:510 replication/walsender.c:994
 #, c-format
 msgid "could not seek in log file %u, segment %u to offset %u: %m"
 msgstr ""
 "konnte Positionszeiger von Logdatei %u, Segment %u nicht auf %u setzen: %m"
 
-#: access/transam/xlog.c:1808 replication/walreceiver.c:523
+#: access/transam/xlog.c:1809 replication/walreceiver.c:527
 #, c-format
 msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
 msgstr ""
 "konnte nicht in Logdatei %u, Segment %u bei Position %u, Länge %lu "
 "schreiben: %m"
 
-#: access/transam/xlog.c:2010
+#: access/transam/xlog.c:2011
 #, c-format
 msgid "updated min recovery point to %X/%X"
 msgstr "minimaler Recovery-Punkt auf %X/%X aktualisiert"
 
-#: access/transam/xlog.c:2351 access/transam/xlog.c:2455
-#: access/transam/xlog.c:2684 access/transam/xlog.c:2755
-#: access/transam/xlog.c:2812 replication/walsender.c:991
+#: access/transam/xlog.c:2352 access/transam/xlog.c:2456
+#: access/transam/xlog.c:2685 access/transam/xlog.c:2756
+#: access/transam/xlog.c:2813 replication/walsender.c:982
 #, c-format
 msgid "could not open file \"%s\" (log file %u, segment %u): %m"
 msgstr "konnte Datei »%s« nicht öffnen (Logdatei %u, Segment %u): %m"
 
-#: access/transam/xlog.c:2376 access/transam/xlog.c:2509
-#: access/transam/xlog.c:4397 access/transam/xlog.c:9015
-#: access/transam/xlog.c:9255 storage/smgr/md.c:285 storage/file/copydir.c:172
-#: postmaster/postmaster.c:3690
+#: access/transam/xlog.c:2377 access/transam/xlog.c:2510
+#: access/transam/xlog.c:4408 access/transam/xlog.c:9049
+#: access/transam/xlog.c:9289 storage/file/copydir.c:172 storage/smgr/md.c:285
+#: postmaster/postmaster.c:3691
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "kann Datei »%s« nicht erstellen: %m"
 
-#: access/transam/xlog.c:2408 access/transam/xlog.c:2541
-#: access/transam/xlog.c:4449 access/transam/xlog.c:4512
-#: storage/file/copydir.c:197 postmaster/postmaster.c:3700
-#: postmaster/postmaster.c:3710 utils/init/miscinit.c:1089
-#: utils/init/miscinit.c:1098 utils/init/miscinit.c:1105 utils/misc/guc.c:7414
-#: utils/misc/guc.c:7439
+#: access/transam/xlog.c:2409 access/transam/xlog.c:2542
+#: access/transam/xlog.c:4460 access/transam/xlog.c:4523
+#: storage/file/copydir.c:197 postmaster/postmaster.c:3701
+#: postmaster/postmaster.c:3711 utils/init/miscinit.c:1089
+#: utils/init/miscinit.c:1098 utils/init/miscinit.c:1105 utils/misc/guc.c:7432
+#: utils/misc/guc.c:7457
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "konnte nicht in Datei »%s« schreiben: %m"
 
-#: access/transam/xlog.c:2416 access/transam/xlog.c:2548
-#: access/transam/xlog.c:4518 storage/smgr/md.c:918 storage/smgr/md.c:1124
-#: storage/smgr/md.c:1275 storage/file/copydir.c:269
+#: access/transam/xlog.c:2417 access/transam/xlog.c:2549
+#: access/transam/xlog.c:4529 storage/file/copydir.c:269 storage/smgr/md.c:924
+#: storage/smgr/md.c:1130 storage/smgr/md.c:1281
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht fsyncen: %m"
 
-#: access/transam/xlog.c:2421 access/transam/xlog.c:2553
-#: access/transam/xlog.c:4523 commands/copy.c:1329 storage/file/copydir.c:211
+#: access/transam/xlog.c:2422 access/transam/xlog.c:2554
+#: access/transam/xlog.c:4534 commands/copy.c:1329 storage/file/copydir.c:211
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht schließen: %m"
 
-#: access/transam/xlog.c:2494 access/transam/xlog.c:4166
-#: access/transam/xlog.c:4260 access/transam/xlog.c:4416 storage/smgr/md.c:539
-#: storage/smgr/md.c:796 storage/file/copydir.c:165 storage/file/copydir.c:255
-#: replication/basebackup.c:725 utils/error/elog.c:1469
+#: access/transam/xlog.c:2495 access/transam/xlog.c:4177
+#: access/transam/xlog.c:4271 access/transam/xlog.c:4427
+#: storage/file/copydir.c:165 storage/file/copydir.c:255 storage/smgr/md.c:542
+#: storage/smgr/md.c:802 replication/basebackup.c:726
 #: utils/init/miscinit.c:1039 utils/init/miscinit.c:1153
+#: utils/error/elog.c:1515
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:2522 access/transam/xlog.c:4428
-#: access/transam/xlog.c:9187 access/transam/xlog.c:9200
-#: access/transam/xlog.c:9730 access/transam/xlog.c:9755
+#: access/transam/xlog.c:2523 access/transam/xlog.c:4439
+#: access/transam/xlog.c:9221 access/transam/xlog.c:9234
+#: access/transam/xlog.c:9768 access/transam/xlog.c:9803
 #: storage/file/copydir.c:186 utils/adt/genfile.c:138
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht lesen: %m"
 
-#: access/transam/xlog.c:2525
+#: access/transam/xlog.c:2526
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "nicht genug Daten in Datei »%s«"
 
-#: access/transam/xlog.c:2644
+#: access/transam/xlog.c:2645
 #, c-format
 msgid ""
 "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
@@ -967,7 +870,7 @@ msgstr ""
 "konnte Datei »%s« nicht nach »%s« linken (Initialisierung von Logdatei %u, "
 "Segment %u): %m"
 
-#: access/transam/xlog.c:2656
+#: access/transam/xlog.c:2657
 #, c-format
 msgid ""
 "could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
@@ -976,13 +879,13 @@ msgstr ""
 "konnte Datei »%s« nicht in »%s« umbenennen (Initialisierung von Logdatei %u, "
 "Segment %u): %m"
 
-#: access/transam/xlog.c:2839 replication/walreceiver.c:480
+#: access/transam/xlog.c:2840 replication/walreceiver.c:484
 #, c-format
 msgid "could not close log file %u, segment %u: %m"
 msgstr "konnte Logdatei %u, Segment %u nicht schließen: %m"
 
-#: access/transam/xlog.c:2911 access/transam/xlog.c:3076
-#: access/transam/xlog.c:9000 access/transam/xlog.c:9175
+#: access/transam/xlog.c:2912 access/transam/xlog.c:3077
+#: access/transam/xlog.c:9034 access/transam/xlog.c:9209
 #: storage/file/copydir.c:86 storage/file/copydir.c:125 utils/adt/dbsize.c:65
 #: utils/adt/dbsize.c:211 utils/adt/dbsize.c:276 utils/adt/genfile.c:107
 #: utils/adt/genfile.c:279
@@ -990,27 +893,29 @@ msgstr "konnte Logdatei %u, Segment %u nicht schließen: %m"
 msgid "could not stat file \"%s\": %m"
 msgstr "konnte »stat« für Datei »%s« nicht ausführen: %m"
 
-#: access/transam/xlog.c:2919 access/transam/xlog.c:9205 storage/smgr/md.c:355
-#: storage/smgr/md.c:402 storage/smgr/md.c:1238
+#: access/transam/xlog.c:2920 access/transam/xlog.c:9239 storage/smgr/md.c:358
+#: storage/smgr/md.c:405 storage/smgr/md.c:1244
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht löschen: %m"
 
-#: access/transam/xlog.c:3055
+#: access/transam/xlog.c:3056
 #, c-format
 msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
 msgstr "Archivdatei »%s« hat falsche Größe: %lu statt %lu"
 
-#: access/transam/xlog.c:3064
+#: access/transam/xlog.c:3065
 #, c-format
 msgid "restored log file \"%s\" from archive"
 msgstr "Logdatei »%s« aus Archiv wiederhergestellt"
 
-#: access/transam/xlog.c:3114
+#: access/transam/xlog.c:3115
 #, c-format
 msgid "could not restore file \"%s\" from archive: return code %d"
 msgstr "konnte Datei »%s« nicht aus Archiv wiederherstellen: Rückgabecode %d"
 
+#. translator: First %s represents a recovery.conf parameter name like
+#. "recovery_end_command", and the 2nd is the value of that parameter.
 #: access/transam/xlog.c:3229
 #, c-format
 msgid "%s \"%s\": return code %d"
@@ -1076,72 +981,72 @@ msgstr "falsche Gesamtlänge im Datensatz bei %X/%X"
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr "falsche Resource-Manager-Daten-Prüfsumme im Datensatz bei %X/%X"
 
-#: access/transam/xlog.c:3750 access/transam/xlog.c:3786
+#: access/transam/xlog.c:3759 access/transam/xlog.c:3797
 #, c-format
 msgid "invalid record offset at %X/%X"
 msgstr "ungültiger Datensatz-Offset bei %X/%X"
 
-#: access/transam/xlog.c:3794
+#: access/transam/xlog.c:3805
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "Contrecord-Eintrag ist bei %X/%X"
 
-#: access/transam/xlog.c:3809
+#: access/transam/xlog.c:3820
 #, c-format
 msgid "invalid xlog switch record at %X/%X"
 msgstr "ungültiger Xlog-Switch-Datensatz bei %X/%X"
 
-#: access/transam/xlog.c:3817
+#: access/transam/xlog.c:3828
 #, c-format
 msgid "record with zero length at %X/%X"
 msgstr "Datensatz mit Länge null bei %X/%X"
 
-#: access/transam/xlog.c:3826
+#: access/transam/xlog.c:3837
 #, c-format
 msgid "invalid record length at %X/%X"
 msgstr "ungültige Datensatzlänge bei %X/%X"
 
-#: access/transam/xlog.c:3833
+#: access/transam/xlog.c:3844
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ungültige Resource-Manager-ID %u bei %X/%X"
 
-#: access/transam/xlog.c:3846 access/transam/xlog.c:3862
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3873
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "Datensatz mit inkorrektem Prev-Link %X/%X bei %X/%X"
 
-#: access/transam/xlog.c:3891
+#: access/transam/xlog.c:3902
 #, c-format
 msgid "record length %u at %X/%X too long"
 msgstr "Datensatzlänge %u bei %X/%X zu groß"
 
-#: access/transam/xlog.c:3931
+#: access/transam/xlog.c:3942
 #, c-format
 msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr "es gibt keine Contrecord-Flag in Logdatei %u, Segment %u, Offset %u"
 
-#: access/transam/xlog.c:3941
+#: access/transam/xlog.c:3952
 #, c-format
 msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 msgstr "ungültige Contrecord-Länge %u in Logdatei %u, Segment %u, Offset %u"
 
-#: access/transam/xlog.c:4031
+#: access/transam/xlog.c:4042
 #, c-format
 msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr "ungültige magische Zahl %04X in Logdatei %u, Segment %u, Offset %u"
 
-#: access/transam/xlog.c:4038 access/transam/xlog.c:4084
+#: access/transam/xlog.c:4049 access/transam/xlog.c:4095
 #, c-format
 msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr "ungültige Infobits %04X in Logdatei %u, Segment %u, Offset %u"
 
-#: access/transam/xlog.c:4060 access/transam/xlog.c:4068
-#: access/transam/xlog.c:4075
+#: access/transam/xlog.c:4071 access/transam/xlog.c:4079
+#: access/transam/xlog.c:4086
 msgid "WAL file is from different database system"
 msgstr "WAL-Datei stammt von einem anderen Datenbanksystem"
 
-#: access/transam/xlog.c:4061
+#: access/transam/xlog.c:4072
 #, c-format
 msgid ""
 "WAL file database system identifier is %s, pg_control database system "
@@ -1150,25 +1055,25 @@ msgstr ""
 "Datenbanksystemidentifikator in der WAL-Datei ist %s, "
 "Datenbanksystemidentifikator in pg_control ist %s."
 
-#: access/transam/xlog.c:4069
+#: access/transam/xlog.c:4080
 msgid "Incorrect XLOG_SEG_SIZE in page header."
 msgstr "Falscher XLOG_SEG_SIZE-Wert in Page-Header."
 
-#: access/transam/xlog.c:4076
+#: access/transam/xlog.c:4087
 msgid "Incorrect XLOG_BLCKSZ in page header."
 msgstr "Falscher XLOG_BLCKSZ-Wert in Page-Header."
 
-#: access/transam/xlog.c:4092
+#: access/transam/xlog.c:4103
 #, c-format
 msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr "unerwartete Page-Adresse %X/%X in Logdatei %u, Segment %u, Offset %u"
 
-#: access/transam/xlog.c:4104
+#: access/transam/xlog.c:4115
 #, c-format
 msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
 msgstr "unerwartete Timeline-ID %u in Logdatei %u, Segment %u, Offset %u"
 
-#: access/transam/xlog.c:4122
+#: access/transam/xlog.c:4133
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
@@ -1177,99 +1082,99 @@ msgstr ""
 "Timeline-ID %u nicht in richtiger Reihenfolge (nach %u) in Logdatei %u, "
 "Segment %u, Offset %u"
 
-#: access/transam/xlog.c:4195
+#: access/transam/xlog.c:4206
 #, c-format
 msgid "syntax error in history file: %s"
 msgstr "Syntaxfehler in History-Datei: %s"
 
-#: access/transam/xlog.c:4196
+#: access/transam/xlog.c:4207
 msgid "Expected a numeric timeline ID."
 msgstr "Eine numerische Timeline-ID wurde erwartet."
 
-#: access/transam/xlog.c:4201
+#: access/transam/xlog.c:4212
 #, c-format
 msgid "invalid data in history file: %s"
 msgstr "ungültige Daten in History-Datei: %s"
 
-#: access/transam/xlog.c:4202
+#: access/transam/xlog.c:4213
 msgid "Timeline IDs must be in increasing sequence."
 msgstr "Timeline-IDs müssen in aufsteigender Folge sein."
 
-#: access/transam/xlog.c:4215
+#: access/transam/xlog.c:4226
 #, c-format
 msgid "invalid data in history file \"%s\""
 msgstr "ungültige Daten in History-Datei »%s«"
 
-#: access/transam/xlog.c:4216
+#: access/transam/xlog.c:4227
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "Timeline-IDs müssen kleiner als die Timeline-ID des Kindes sein."
 
-#: access/transam/xlog.c:4302
+#: access/transam/xlog.c:4313
 #, c-format
 msgid "new timeline %u is not a child of database system timeline %u"
 msgstr "neue Timeline %u ist kein Kind der Datenbanksystem-Timeline %u"
 
-#: access/transam/xlog.c:4315
+#: access/transam/xlog.c:4326
 #, c-format
 msgid "new target timeline is %u"
 msgstr "neue Ziel-Timeline ist %u"
 
-#: access/transam/xlog.c:4540
+#: access/transam/xlog.c:4551
 #, c-format
 msgid "could not link file \"%s\" to \"%s\": %m"
 msgstr "konnte Datei »%s« nicht nach »%s« linken: %m"
 
-#: access/transam/xlog.c:4547 access/transam/xlog.c:5502
-#: access/transam/xlog.c:5555 access/transam/xlog.c:6326
+#: access/transam/xlog.c:4558 access/transam/xlog.c:5518
+#: access/transam/xlog.c:5571 access/transam/xlog.c:6350
 #: postmaster/pgarch.c:715
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "konnte Datei »%s« nicht in »%s« umbenennen: %m"
 
-#: access/transam/xlog.c:4629
+#: access/transam/xlog.c:4640
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "konnte Kontrolldatei »%s« nicht erzeugen: %m"
 
-#: access/transam/xlog.c:4640 access/transam/xlog.c:4865
+#: access/transam/xlog.c:4651 access/transam/xlog.c:4876
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "konnte nicht in Kontrolldatei schreiben: %m"
 
-#: access/transam/xlog.c:4646 access/transam/xlog.c:4871
+#: access/transam/xlog.c:4657 access/transam/xlog.c:4882
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "konnte Kontrolldatei nicht fsyncen: %m"
 
-#: access/transam/xlog.c:4651 access/transam/xlog.c:4876
+#: access/transam/xlog.c:4662 access/transam/xlog.c:4887
 #, c-format
 msgid "could not close control file: %m"
 msgstr "konnte Kontrolldatei nicht schließen: %m"
 
-#: access/transam/xlog.c:4669 access/transam/xlog.c:4854
+#: access/transam/xlog.c:4680 access/transam/xlog.c:4865
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "konnte Kontrolldatei »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:4675
+#: access/transam/xlog.c:4686
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "konnte nicht aus Kontrolldatei lesen: %m"
 
-#: access/transam/xlog.c:4688 access/transam/xlog.c:4697
-#: access/transam/xlog.c:4721 access/transam/xlog.c:4728
-#: access/transam/xlog.c:4735 access/transam/xlog.c:4740
-#: access/transam/xlog.c:4747 access/transam/xlog.c:4754
-#: access/transam/xlog.c:4761 access/transam/xlog.c:4768
-#: access/transam/xlog.c:4775 access/transam/xlog.c:4782
-#: access/transam/xlog.c:4791 access/transam/xlog.c:4798
-#: access/transam/xlog.c:4807 access/transam/xlog.c:4814
-#: access/transam/xlog.c:4823 access/transam/xlog.c:4830
+#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
+#: access/transam/xlog.c:4732 access/transam/xlog.c:4739
+#: access/transam/xlog.c:4746 access/transam/xlog.c:4751
+#: access/transam/xlog.c:4758 access/transam/xlog.c:4765
+#: access/transam/xlog.c:4772 access/transam/xlog.c:4779
+#: access/transam/xlog.c:4786 access/transam/xlog.c:4793
+#: access/transam/xlog.c:4802 access/transam/xlog.c:4809
+#: access/transam/xlog.c:4818 access/transam/xlog.c:4825
+#: access/transam/xlog.c:4834 access/transam/xlog.c:4841
 #: utils/init/miscinit.c:1171
 msgid "database files are incompatible with server"
 msgstr "Datenbankdateien sind inkompatibel mit Server"
 
-#: access/transam/xlog.c:4689
+#: access/transam/xlog.c:4700
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
@@ -1279,7 +1184,7 @@ msgstr ""
 "initialisiert, aber der Server wurde mit PG_CONTROL_VERSION %d (0x%08x) "
 "kompiliert."
 
-#: access/transam/xlog.c:4693
+#: access/transam/xlog.c:4704
 msgid ""
 "This could be a problem of mismatched byte ordering.  It looks like you need "
 "to initdb."
@@ -1287,7 +1192,7 @@ msgstr ""
 "Das Problem könnte eine falsche Byte-Reihenfolge sein. Es sieht so aus, dass "
 "Sie initdb ausführen müssen."
 
-#: access/transam/xlog.c:4698
+#: access/transam/xlog.c:4709
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
@@ -1296,16 +1201,16 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit PG_CONTROL_VERSION %d initialisiert, aber "
 "der Server wurde mit PG_CONTROL_VERSION %d kompiliert."
 
-#: access/transam/xlog.c:4701 access/transam/xlog.c:4725
-#: access/transam/xlog.c:4732 access/transam/xlog.c:4737
+#: access/transam/xlog.c:4712 access/transam/xlog.c:4736
+#: access/transam/xlog.c:4743 access/transam/xlog.c:4748
 msgid "It looks like you need to initdb."
 msgstr "Es sieht so aus, dass Sie initdb ausführen müssen."
 
-#: access/transam/xlog.c:4712
+#: access/transam/xlog.c:4723
 msgid "incorrect checksum in control file"
 msgstr "falsche Prüfsumme in Kontrolldatei"
 
-#: access/transam/xlog.c:4722
+#: access/transam/xlog.c:4733
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
@@ -1314,7 +1219,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit CATALOG_VERSION_NO %d initialisiert, aber "
 "der Server wurde mit CATALOG_VERSION_NO %d kompiliert."
 
-#: access/transam/xlog.c:4729
+#: access/transam/xlog.c:4740
 #, c-format
 msgid ""
 "The database cluster was initialized with MAXALIGN %d, but the server was "
@@ -1323,7 +1228,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit MAXALIGN %d initialisiert, aber der Server "
 "wurde mit MAXALIGN %d kompiliert."
 
-#: access/transam/xlog.c:4736
+#: access/transam/xlog.c:4747
 msgid ""
 "The database cluster appears to use a different floating-point number format "
 "than the server executable."
@@ -1331,7 +1236,7 @@ msgstr ""
 "Der Datenbank-Cluster verwendet anscheinend ein anderes "
 "Fließkommazahlenformat als das Serverprogramm."
 
-#: access/transam/xlog.c:4741
+#: access/transam/xlog.c:4752
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d, but the server was "
@@ -1340,18 +1245,18 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit BLCKSZ %d initialisiert, aber der Server "
 "wurde mit BLCKSZ %d kompiliert."
 
-#: access/transam/xlog.c:4744 access/transam/xlog.c:4751
-#: access/transam/xlog.c:4758 access/transam/xlog.c:4765
-#: access/transam/xlog.c:4772 access/transam/xlog.c:4779
-#: access/transam/xlog.c:4786 access/transam/xlog.c:4794
-#: access/transam/xlog.c:4801 access/transam/xlog.c:4810
-#: access/transam/xlog.c:4817 access/transam/xlog.c:4826
-#: access/transam/xlog.c:4833
+#: access/transam/xlog.c:4755 access/transam/xlog.c:4762
+#: access/transam/xlog.c:4769 access/transam/xlog.c:4776
+#: access/transam/xlog.c:4783 access/transam/xlog.c:4790
+#: access/transam/xlog.c:4797 access/transam/xlog.c:4805
+#: access/transam/xlog.c:4812 access/transam/xlog.c:4821
+#: access/transam/xlog.c:4828 access/transam/xlog.c:4837
+#: access/transam/xlog.c:4844
 msgid "It looks like you need to recompile or initdb."
 msgstr ""
 "Es sieht so aus, dass Sie neu kompilieren oder initdb ausführen müssen."
 
-#: access/transam/xlog.c:4748
+#: access/transam/xlog.c:4759
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d, but the server was "
@@ -1360,7 +1265,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit RELSEG_SIZE %d initialisiert, aber der "
 "Server wurde mit RELSEGSIZE %d kompiliert."
 
-#: access/transam/xlog.c:4755
+#: access/transam/xlog.c:4766
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
@@ -1369,7 +1274,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit XLOG_BLCKSZ %d initialisiert, aber der "
 "Server wurde mit XLOG_BLCKSZ %d kompiliert."
 
-#: access/transam/xlog.c:4762
+#: access/transam/xlog.c:4773
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
@@ -1378,7 +1283,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit XLOG_SEG_SIZE %d initialisiert, aber der "
 "Server wurde mit XLOG_SEG_SIZE %d kompiliert."
 
-#: access/transam/xlog.c:4769
+#: access/transam/xlog.c:4780
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d, but the server was "
@@ -1387,7 +1292,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit NAMEDATALEN %d initialisiert, aber der "
 "Server wurde mit NAMEDATALEN %d kompiliert."
 
-#: access/transam/xlog.c:4776
+#: access/transam/xlog.c:4787
 #, c-format
 msgid ""
 "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
@@ -1396,7 +1301,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit INDEX_MAX_KEYS %d initialisiert, aber der "
 "Server wurde mit INDEX_MAX_KEYS %d kompiliert."
 
-#: access/transam/xlog.c:4783
+#: access/transam/xlog.c:4794
 #, c-format
 msgid ""
 "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
@@ -1405,7 +1310,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit TOAST_MAX_CHUNK_SIZE %d initialisiert, aber "
 "der Server wurde mit TOAST_MAX_CHUNK_SIZE %d kompiliert."
 
-#: access/transam/xlog.c:4792
+#: access/transam/xlog.c:4803
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
 "server was compiled with HAVE_INT64_TIMESTAMP."
@@ -1413,7 +1318,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde ohne HAVE_INT64_TIMESTAMP initialisiert, aber "
 "der Server wurde mit HAE_INT64_TIMESTAMP kompiliert."
 
-#: access/transam/xlog.c:4799
+#: access/transam/xlog.c:4810
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
 "server was compiled without HAVE_INT64_TIMESTAMP."
@@ -1421,7 +1326,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit HAVE_INT64_TIMESTAMP initialisiert, aber der "
 "Server wurde ohne HAE_INT64_TIMESTAMP kompiliert."
 
-#: access/transam/xlog.c:4808
+#: access/transam/xlog.c:4819
 msgid ""
 "The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
 "was compiled with USE_FLOAT4_BYVAL."
@@ -1429,7 +1334,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde ohne USE_FLOAT4_BYVAL initialisiert, aber der "
 "Server wurde mit USE_FLOAT4_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4815
+#: access/transam/xlog.c:4826
 msgid ""
 "The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
 "was compiled without USE_FLOAT4_BYVAL."
@@ -1437,7 +1342,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit USE_FLOAT4_BYVAL initialisiert, aber der "
 "Server wurde ohne USE_FLOAT4_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4824
+#: access/transam/xlog.c:4835
 msgid ""
 "The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
 "was compiled with USE_FLOAT8_BYVAL."
@@ -1445,7 +1350,7 @@ msgstr ""
 "Der Datenbank-Cluster wurde ohne USE_FLOAT8_BYVAL initialisiert, aber der "
 "Server wurde mit USE_FLOAT8_BYVAL kompiliert."
 
-#: access/transam/xlog.c:4831
+#: access/transam/xlog.c:4842
 msgid ""
 "The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
 "was compiled without USE_FLOAT8_BYVAL."
@@ -1453,118 +1358,54 @@ msgstr ""
 "Der Datenbank-Cluster wurde mit USE_FLOAT8_BYVAL initialisiert, aber der "
 "Server wurde ohne USE_FLOAT8_BYVAL kompiliert."
 
-#: access/transam/xlog.c:5156
+#: access/transam/xlog.c:5167
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr "konnte Bootstrap-Transaktionslogdatei nicht schreiben: %m"
 
-#: access/transam/xlog.c:5162
+#: access/transam/xlog.c:5173
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr "konnte Bootstrap-Transaktionslogdatei nicht fsyncen: %m"
 
-#: access/transam/xlog.c:5167
+#: access/transam/xlog.c:5178
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr "konnte Bootstrap-Transaktionslogdatei nicht schließen: %m"
 
-#: access/transam/xlog.c:5234
+#: access/transam/xlog.c:5245
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "konnte Recovery-Kommandodatei »%s« nicht öffnen: %m"
 
-#: access/transam/xlog.c:5250
-#, c-format
-msgid "restore_command = '%s'"
-msgstr "restore_command = '%s'"
-
-#: access/transam/xlog.c:5257
-#, c-format
-msgid "recovery_end_command = '%s'"
-msgstr "recovery_end_command = '%s'"
-
-#: access/transam/xlog.c:5264
-#, c-format
-msgid "archive_cleanup_command = '%s'"
-msgstr "archive_cleanup_command = '%s'"
-
-#: access/transam/xlog.c:5272 access/transam/xlog.c:5361
-#: access/transam/xlog.c:5370 commands/extension.c:525
-#: commands/extension.c:533 utils/misc/guc.c:5305
+#: access/transam/xlog.c:5283 access/transam/xlog.c:5374
+#: access/transam/xlog.c:5385 commands/extension.c:527
+#: commands/extension.c:535 utils/misc/guc.c:5309
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "Parameter »%s« erfordert einen Boole'schen Wert"
 
-#: access/transam/xlog.c:5274
-#, c-format
-msgid "pause_at_recovery_target = '%s'"
-msgstr "pause_at_recovery_target = '%s'"
-
-#: access/transam/xlog.c:5287
+#: access/transam/xlog.c:5299
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr "recovery_target_timeline ist keine gültige Zahl: »%s«"
 
-#: access/transam/xlog.c:5292
-#, c-format
-msgid "recovery_target_timeline = %u"
-msgstr "recovery_target_timeline = %u"
-
-#: access/transam/xlog.c:5295
-msgid "recovery_target_timeline = latest"
-msgstr "recovery_target_timeline = latest"
-
-#: access/transam/xlog.c:5303
+#: access/transam/xlog.c:5315
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr "recovery_target_xid ist keine gültige Zahl: »%s«"
 
-#: access/transam/xlog.c:5306
-#, c-format
-msgid "recovery_target_xid = %u"
-msgstr "recovery_target_xid = %u"
-
-#: access/transam/xlog.c:5330
-#, c-format
-msgid "recovery_target_time = '%s'"
-msgstr "recovery_target_time = '%s'"
-
-#: access/transam/xlog.c:5347
+#: access/transam/xlog.c:5359
 #, c-format
 msgid "recovery_target_name is too long (maximum %d characters)"
 msgstr "recovery_target_name ist zu lang (maximal %d Zeichen)"
 
-#: access/transam/xlog.c:5350
-#, c-format
-msgid "recovery_target_name = '%s'"
-msgstr "recovery_target_name = '%s'"
-
-#: access/transam/xlog.c:5363
-#, c-format
-msgid "recovery_target_inclusive = %s"
-msgstr "recovery_target_inclusive = %s"
-
-#: access/transam/xlog.c:5372
-#, c-format
-msgid "standby_mode = '%s'"
-msgstr "standby_mode = '%s'"
-
-#: access/transam/xlog.c:5378
-#, c-format
-msgid "primary_conninfo = '%s'"
-msgstr "primary_conninfo = '%s'"
-
-#: access/transam/xlog.c:5385
-#, c-format
-msgid "trigger_file = '%s'"
-msgstr "trigger_file = '%s'"
-
-#: access/transam/xlog.c:5390
+#: access/transam/xlog.c:5406
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "unbekannter Recovery-Parameter »%s«"
 
-#: access/transam/xlog.c:5401
+#: access/transam/xlog.c:5417
 #, c-format
 msgid ""
 "recovery command file \"%s\" specified neither primary_conninfo nor "
@@ -1573,7 +1414,7 @@ msgstr ""
 "Recovery-Kommandodatei »%s« hat weder primary_conninfo noch restore_command "
 "angegeben"
 
-#: access/transam/xlog.c:5403
+#: access/transam/xlog.c:5419
 msgid ""
 "The database server will regularly poll the pg_xlog subdirectory to check "
 "for files placed there."
@@ -1581,7 +1422,7 @@ msgstr ""
 "Der Datenbankserver prüft das Unterverzeichnis pg_xlog regelmäßig auf dort "
 "abgelegte Dateien."
 
-#: access/transam/xlog.c:5409
+#: access/transam/xlog.c:5425
 #, c-format
 msgid ""
 "recovery command file \"%s\" must specify restore_command when standby mode "
@@ -1590,66 +1431,66 @@ msgstr ""
 "Recovery-Kommandodatei »%s« muss restore_command angeben, wenn der Standby-"
 "Modus nicht eingeschaltet ist"
 
-#: access/transam/xlog.c:5429
+#: access/transam/xlog.c:5445
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "recovery_target_timeline %u existiert nicht"
 
-#: access/transam/xlog.c:5559
+#: access/transam/xlog.c:5575
 msgid "archive recovery complete"
 msgstr "Wiederherstellung aus Archiv abgeschlossen"
 
-#: access/transam/xlog.c:5677
+#: access/transam/xlog.c:5693
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "Wiederherstellung beendet nach Commit der Transaktion %u, Zeit %s"
 
-#: access/transam/xlog.c:5682
+#: access/transam/xlog.c:5698
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "Wiederherstellung beendet vor Commit der Transaktion %u, Zeit %s"
 
-#: access/transam/xlog.c:5690
+#: access/transam/xlog.c:5706
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "Wiederherstellung beendet nach Abbruch der Transaktion %u, Zeit %s"
 
-#: access/transam/xlog.c:5695
+#: access/transam/xlog.c:5711
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "Wiederherstellung beendet vor Abbruch der Transaktion %u, Zeit %s"
 
-#: access/transam/xlog.c:5704
+#: access/transam/xlog.c:5720
 #, c-format
 msgid "recovery stopping at restore point \"%s\", time %s"
 msgstr "Wiederherstellung beendet bei Restore-Punkt »%s«, Zeit %s"
 
-#: access/transam/xlog.c:5732
+#: access/transam/xlog.c:5748
 msgid "recovery has paused"
 msgstr "Wiederherstellung wurde pausiert"
 
-#: access/transam/xlog.c:5733
+#: access/transam/xlog.c:5749
 msgid "Execute pg_xlog_replay_resume() to continue."
 msgstr "Führen Sie pg_xlog_replay_resume() aus um fortzusetzen."
 
-#: access/transam/xlog.c:5776 access/transam/xlog.c:5798
-#: access/transam/xlog.c:5820
+#: access/transam/xlog.c:5792 access/transam/xlog.c:5814
+#: access/transam/xlog.c:5836
 msgid "must be superuser to control recovery"
 msgstr "nur Superuser können die Wiederherstellung kontrollieren"
 
-#: access/transam/xlog.c:5781 access/transam/xlog.c:5803
-#: access/transam/xlog.c:5825
+#: access/transam/xlog.c:5797 access/transam/xlog.c:5819
+#: access/transam/xlog.c:5841
 msgid "recovery is not in progress"
 msgstr "Wiederherstellung läuft nicht"
 
-#: access/transam/xlog.c:5782 access/transam/xlog.c:5804
-#: access/transam/xlog.c:5826
+#: access/transam/xlog.c:5798 access/transam/xlog.c:5820
+#: access/transam/xlog.c:5842
 msgid "Recovery control functions can only be executed during recovery."
 msgstr ""
 "Wiederherstellungskontrollfunktionen können nur während der "
 "Wiederherstellung ausgeführt werden."
 
-#: access/transam/xlog.c:5918
+#: access/transam/xlog.c:5934
 #, c-format
 msgid ""
 "hot standby is not possible because %s = %d is a lower setting than on the "
@@ -1658,11 +1499,11 @@ msgstr ""
 "Hot Standby ist nicht möglich, weil %s = %d eine niedrigere Einstellung als "
 "auf dem Masterserver ist (Wert dort war %d)"
 
-#: access/transam/xlog.c:5940
+#: access/transam/xlog.c:5956
 msgid "WAL was generated with wal_level=minimal, data may be missing"
 msgstr "WAL wurde mit wal_level=minimal erzeugt, eventuell fehlen Daten"
 
-#: access/transam/xlog.c:5941
+#: access/transam/xlog.c:5957
 msgid ""
 "This happens if you temporarily set wal_level=minimal without taking a new "
 "base backup."
@@ -1670,7 +1511,7 @@ msgstr ""
 "Das passiert, wenn vorübergehend wal_level=minimal gesetzt wurde, ohne ein "
 "neues Base-Backup zu erzeugen."
 
-#: access/transam/xlog.c:5952
+#: access/transam/xlog.c:5968
 msgid ""
 "hot standby is not possible because wal_level was not set to \"hot_standby\" "
 "on the master server"
@@ -1678,7 +1519,7 @@ msgstr ""
 "Hot Standby ist nicht möglich, weil wal_level auf dem Masterserver nicht auf "
 "»hot_standby« gesetzt wurde"
 
-#: access/transam/xlog.c:5953
+#: access/transam/xlog.c:5969
 msgid ""
 "Either set wal_level to \"hot_standby\" on the master, or turn off "
 "hot_standby here."
@@ -1686,34 +1527,34 @@ msgstr ""
 "Setzen Sie entweder wal_level auf »hot_standby« auf dem Master oder schalten "
 "Sie hot_standby hier aus."
 
-#: access/transam/xlog.c:6000
+#: access/transam/xlog.c:6017
 msgid "control file contains invalid data"
 msgstr "Kontrolldatei enthält ungültige Daten"
 
-#: access/transam/xlog.c:6004
+#: access/transam/xlog.c:6021
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "Datenbanksystem wurde am %s heruntergefahren"
 
-#: access/transam/xlog.c:6008
+#: access/transam/xlog.c:6025
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr ""
 "Datenbanksystem wurde während der Wiederherstellung am %s heruntergefahren"
 
-#: access/transam/xlog.c:6012
+#: access/transam/xlog.c:6029
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr ""
 "Datenbanksystem wurde beim Herunterfahren unterbrochen; letzte bekannte "
 "Aktion am %s"
 
-#: access/transam/xlog.c:6016
+#: access/transam/xlog.c:6033
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "Datenbanksystem wurde während der Wiederherstellung am %s unterbrochen"
 
-#: access/transam/xlog.c:6018
+#: access/transam/xlog.c:6035
 msgid ""
 "This probably means that some data is corrupted and you will have to use the "
 "last backup for recovery."
@@ -1721,14 +1562,14 @@ msgstr ""
 "Das bedeutet wahrscheinlich, dass einige Daten verfälscht sind und Sie die "
 "letzte Datensicherung zur Wiederherstellung verwenden müssen."
 
-#: access/transam/xlog.c:6022
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr ""
 "Datenbanksystem wurde während der Wiederherstellung bei Logzeit %s "
 "unterbrochen"
 
-#: access/transam/xlog.c:6024
+#: access/transam/xlog.c:6041
 msgid ""
 "If this has occurred more than once some data might be corrupted and you "
 "might need to choose an earlier recovery target."
@@ -1737,50 +1578,50 @@ msgstr ""
 "möglicherweise verfälscht und Sie müssen ein früheres Wiederherstellungsziel "
 "wählen."
 
-#: access/transam/xlog.c:6028
+#: access/transam/xlog.c:6045
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "Datenbanksystem wurde unterbrochen; letzte bekannte Aktion am %s"
 
-#: access/transam/xlog.c:6077
+#: access/transam/xlog.c:6094
 #, c-format
 msgid "requested timeline %u is not a child of database system timeline %u"
 msgstr "angeforderte Timeline %u ist kein Kind der Datenbanksystem-Timeline %u"
 
-#: access/transam/xlog.c:6095
+#: access/transam/xlog.c:6112
 msgid "entering standby mode"
 msgstr "Standby-Modus eingeschaltet"
 
-#: access/transam/xlog.c:6098
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "starte Point-in-Time-Recovery bis XID %u"
 
-#: access/transam/xlog.c:6102
+#: access/transam/xlog.c:6119
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "starte Point-in-Time-Recovery bis %s"
 
-#: access/transam/xlog.c:6106
+#: access/transam/xlog.c:6123
 #, c-format
 msgid "starting point-in-time recovery to \"%s\""
 msgstr "starte Point-in-Time-Recovery bis »%s«"
 
-#: access/transam/xlog.c:6110
+#: access/transam/xlog.c:6127
 msgid "starting archive recovery"
 msgstr "starte Wiederherstellung aus Archiv"
 
-#: access/transam/xlog.c:6132 access/transam/xlog.c:6172
+#: access/transam/xlog.c:6149 access/transam/xlog.c:6189
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "Checkpoint-Eintrag ist bei %X/%X"
 
-#: access/transam/xlog.c:6146
+#: access/transam/xlog.c:6163
 msgid "could not find redo location referenced by checkpoint record"
 msgstr ""
 "konnte die vom Checkpoint-Datensatz referenzierte Redo-Position nicht finden"
 
-#: access/transam/xlog.c:6147 access/transam/xlog.c:6154
+#: access/transam/xlog.c:6164 access/transam/xlog.c:6171
 #, c-format
 msgid ""
 "If you are not restoring from a backup, try removing the file \"%s/"
@@ -1789,90 +1630,90 @@ msgstr ""
 "Wenn Sie kein Backup wiederherstellen, versuchen Sie, die Datei »%s/"
 "backup_label« zu löschen."
 
-#: access/transam/xlog.c:6153
+#: access/transam/xlog.c:6170
 msgid "could not locate required checkpoint record"
 msgstr "konnte den nötigen Checkpoint-Datensatz nicht finden"
 
-#: access/transam/xlog.c:6182 access/transam/xlog.c:6197
+#: access/transam/xlog.c:6199 access/transam/xlog.c:6214
 msgid "could not locate a valid checkpoint record"
 msgstr "konnte keinen gültigen Checkpoint-Datensatz finden"
 
-#: access/transam/xlog.c:6191
+#: access/transam/xlog.c:6208
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "verwende vorherigen Checkpoint-Eintrag bei %X/%X"
 
-#: access/transam/xlog.c:6206
+#: access/transam/xlog.c:6223
 #, c-format
 msgid "redo record is at %X/%X; shutdown %s"
 msgstr "Redo-Eintrag ist bei %X/%X; Shutdown %s"
 
-#: access/transam/xlog.c:6210
+#: access/transam/xlog.c:6227
 #, c-format
 msgid "next transaction ID: %u/%u; next OID: %u"
 msgstr "nächste Transaktions-ID: %u/%u; nächste OID: %u"
 
-#: access/transam/xlog.c:6214
+#: access/transam/xlog.c:6231
 #, c-format
 msgid "next MultiXactId: %u; next MultiXactOffset: %u"
 msgstr "nächste MultiXactId: %u; nächster MultiXactOffset: %u"
 
-#: access/transam/xlog.c:6217
+#: access/transam/xlog.c:6234
 #, c-format
 msgid "oldest unfrozen transaction ID: %u, in database %u"
 msgstr "älteste nicht eingefrorene Transaktions-ID: %u, in Datenbank %u"
 
-#: access/transam/xlog.c:6221
+#: access/transam/xlog.c:6238
 msgid "invalid next transaction ID"
 msgstr "ungültige nächste Transaktions-ID"
 
-#: access/transam/xlog.c:6240
+#: access/transam/xlog.c:6257
 msgid "invalid redo in checkpoint record"
 msgstr "ungültiges Redo im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:6251
+#: access/transam/xlog.c:6268
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "ungültiger Redo-Datensatz im Shutdown-Checkpoint"
 
-#: access/transam/xlog.c:6281
+#: access/transam/xlog.c:6298
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 "Datenbanksystem wurde nicht richtig heruntergefahren; automatische "
 "Wiederherstellung läuft"
 
-#: access/transam/xlog.c:6353
+#: access/transam/xlog.c:6377
 msgid "initializing for hot standby"
 msgstr "initialisiere für Hot Standby"
 
-#: access/transam/xlog.c:6481
+#: access/transam/xlog.c:6507
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "Redo beginnt bei %X/%X"
 
-#: access/transam/xlog.c:6596
+#: access/transam/xlog.c:6622
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "Redo fertig bei %X/%X"
 
-#: access/transam/xlog.c:6601 access/transam/xlog.c:8178
+#: access/transam/xlog.c:6627 access/transam/xlog.c:8210
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "letzte vollständige Transaktion war bei Logzeit %s"
 
-#: access/transam/xlog.c:6609
+#: access/transam/xlog.c:6635
 msgid "redo is not required"
 msgstr "Redo nicht nötig"
 
-#: access/transam/xlog.c:6657
+#: access/transam/xlog.c:6683
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr "angeforderter Recovery-Endpunkt ist vor konsistentem Recovery-Punkt"
 
-#: access/transam/xlog.c:6673
+#: access/transam/xlog.c:6692
 msgid "WAL ends before end of online backup"
 msgstr "WAL endet vor dem Ende der Online-Sicherung"
 
-#: access/transam/xlog.c:6674
+#: access/transam/xlog.c:6693
 msgid ""
 "Online backup started with pg_start_backup() must be ended with "
 "pg_stop_backup(), and all WAL up to that point must be available at recovery."
@@ -1881,191 +1722,190 @@ msgstr ""
 "() beendet werden und der ganze WAL bis zu diesem Punkt muss bei der "
 "Wiederherstellung verfügbar sein."
 
-#: access/transam/xlog.c:6677
+#: access/transam/xlog.c:6696
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL endet vor einem konsistenten Wiederherstellungspunkt"
 
-#: access/transam/xlog.c:6699
+#: access/transam/xlog.c:6717
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "gewählte neue Timeline-ID: %u"
 
-#: access/transam/xlog.c:6941
+#: access/transam/xlog.c:6964
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "konsistenter Wiederherstellungszustand erreicht bei %X/%X"
 
-#: access/transam/xlog.c:7107
+#: access/transam/xlog.c:7130
 msgid "invalid primary checkpoint link in control file"
 msgstr "ungültige primäre Checkpoint-Verknüpfung in Kontrolldatei"
 
-#: access/transam/xlog.c:7111
+#: access/transam/xlog.c:7134
 msgid "invalid secondary checkpoint link in control file"
 msgstr "ungültige sekundäre Checkpoint-Verknüpfung in Kontrolldatei"
 
-#: access/transam/xlog.c:7115
+#: access/transam/xlog.c:7138
 msgid "invalid checkpoint link in backup_label file"
 msgstr "ungültige Checkpoint-Verknüpfung in backup_label-Datei"
 
-#: access/transam/xlog.c:7129
+#: access/transam/xlog.c:7152
 msgid "invalid primary checkpoint record"
 msgstr "ungültiger primärer Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7133
+#: access/transam/xlog.c:7156
 msgid "invalid secondary checkpoint record"
 msgstr "ungültiger sekundärer Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7137
+#: access/transam/xlog.c:7160
 msgid "invalid checkpoint record"
 msgstr "ungültiger Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7148
+#: access/transam/xlog.c:7171
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr "ungültige Resource-Manager-ID im primären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7152
+#: access/transam/xlog.c:7175
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr "ungültige Resource-Manager-ID im sekundären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7156
+#: access/transam/xlog.c:7179
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "ungültige Resource-Manager-ID im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7168
+#: access/transam/xlog.c:7191
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "ungültige xl_info im primären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7172
+#: access/transam/xlog.c:7195
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "ungültige xl_info im sekundären Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7176
+#: access/transam/xlog.c:7199
 msgid "invalid xl_info in checkpoint record"
 msgstr "ungültige xl_info im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:7188
+#: access/transam/xlog.c:7211
 msgid "invalid length of primary checkpoint record"
 msgstr "ungültige Länge des primären Checkpoint-Datensatzes"
 
-#: access/transam/xlog.c:7192
+#: access/transam/xlog.c:7215
 msgid "invalid length of secondary checkpoint record"
 msgstr "ungültige Länge des sekundären Checkpoint-Datensatzes"
 
-#: access/transam/xlog.c:7196
+#: access/transam/xlog.c:7219
 msgid "invalid length of checkpoint record"
 msgstr "ungültige Länge des Checkpoint-Datensatzes"
 
-#: access/transam/xlog.c:7358
+#: access/transam/xlog.c:7381
 msgid "shutting down"
 msgstr "fahre herunter"
 
-#: access/transam/xlog.c:7380
+#: access/transam/xlog.c:7403
 msgid "database system is shut down"
 msgstr "Datenbanksystem ist heruntergefahren"
 
-#: access/transam/xlog.c:7806
+#: access/transam/xlog.c:7837
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 "gleichzeitige Transaktionslog-Aktivität während das Datenbanksystem "
 "herunterfährt"
 
-#: access/transam/xlog.c:8039
+#: access/transam/xlog.c:8071
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "Restart-Punkt übersprungen, Wiederherstellung ist bereits beendet"
 
-#: access/transam/xlog.c:8064
+#: access/transam/xlog.c:8096
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr "Restart-Punkt wird übersprungen, schon bei %X/%X erledigt"
 
-#: access/transam/xlog.c:8176
+#: access/transam/xlog.c:8208
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "Recovery-Restart-Punkt bei %X/%X"
 
-#: access/transam/xlog.c:8276
+#: access/transam/xlog.c:8308
 #, c-format
 msgid "restore point \"%s\" created at %X/%X"
 msgstr "Restore-Punkt »%s« erzeugt bei %X/%X"
 
-#: access/transam/xlog.c:8373
-msgid "online backup was cancelled, recovery cannot continue"
+#: access/transam/xlog.c:8405
+msgid "online backup was canceled, recovery cannot continue"
 msgstr ""
 "Online-Sicherung wurde storniert, Wiederherstellung kann nicht fortgesetzt "
 "werden"
 
-#: access/transam/xlog.c:8425
+#: access/transam/xlog.c:8457
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr "unerwartete Timeline-ID %u (nach %u) im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:8461
+#: access/transam/xlog.c:8493
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr "unerwartete Timeline-ID %u (sollte %u sein) im Checkpoint-Datensatz"
 
-#: access/transam/xlog.c:8725 access/transam/xlog.c:8749
+#: access/transam/xlog.c:8757 access/transam/xlog.c:8781
 #, c-format
 msgid "could not fsync log file %u, segment %u: %m"
 msgstr "konnte Logdatei %u, Segment %u nicht fsyncen: %m"
 
-#: access/transam/xlog.c:8757
+#: access/transam/xlog.c:8789
 #, c-format
 msgid "could not fsync write-through log file %u, segment %u: %m"
 msgstr "konnte Write-Through-Logdatei %u, Segment %u nicht fsyncen: %m"
 
-#: access/transam/xlog.c:8766
+#: access/transam/xlog.c:8798
 #, c-format
 msgid "could not fdatasync log file %u, segment %u: %m"
 msgstr "konnte Logdatei %u, Segment %u nicht fdatasyncen: %m"
 
-#: access/transam/xlog.c:8847 access/transam/xlog.c:9123
-#, fuzzy
+#: access/transam/xlog.c:8879 access/transam/xlog.c:9157
 msgid "must be superuser or replication role to run a backup"
-msgstr "nur Superuser können ein Backup ausführen"
+msgstr "nur Superuser und Replikationsrollen können ein Backup ausführen"
 
-#: access/transam/xlog.c:8852 access/transam/xlog.c:9128
-#: access/transam/xlog.c:9391 access/transam/xlog.c:9423
-#: access/transam/xlog.c:9464 access/transam/xlog.c:9497
-#: access/transam/xlog.c:9604 access/transam/xlog.c:9679
+#: access/transam/xlog.c:8884 access/transam/xlog.c:9162
+#: access/transam/xlog.c:9425 access/transam/xlog.c:9457
+#: access/transam/xlog.c:9498 access/transam/xlog.c:9531
+#: access/transam/xlog.c:9638 access/transam/xlog.c:9713
 msgid "recovery is in progress"
 msgstr "Wiederherstellung läuft"
 
-#: access/transam/xlog.c:8853 access/transam/xlog.c:9129
-#: access/transam/xlog.c:9392 access/transam/xlog.c:9424
-#: access/transam/xlog.c:9465 access/transam/xlog.c:9498
+#: access/transam/xlog.c:8885 access/transam/xlog.c:9163
+#: access/transam/xlog.c:9426 access/transam/xlog.c:9458
+#: access/transam/xlog.c:9499 access/transam/xlog.c:9532
 msgid "WAL control functions cannot be executed during recovery."
 msgstr ""
 "während der Wiederherstellung können keine WAL-Kontrollfunktionen ausgeführt "
 "werden"
 
-#: access/transam/xlog.c:8858 access/transam/xlog.c:9134
+#: access/transam/xlog.c:8890 access/transam/xlog.c:9168
 msgid "WAL level not sufficient for making an online backup"
 msgstr "WAL-Level nicht ausreichend, um Online-Sicherung durchzuführen"
 
-#: access/transam/xlog.c:8859 access/transam/xlog.c:9135
-#: access/transam/xlog.c:9430
+#: access/transam/xlog.c:8891 access/transam/xlog.c:9169
+#: access/transam/xlog.c:9464
 msgid ""
 "wal_level must be set to \"archive\" or \"hot_standby\" at server start."
 msgstr ""
 "wal_level muss beim Serverstart auf »archive« oder »hot_standby« gesetzt "
 "werden."
 
-#: access/transam/xlog.c:8864
+#: access/transam/xlog.c:8896
 #, c-format
 msgid "backup label too long (max %d bytes)"
 msgstr "Backup-Label zu lang (maximal %d Bytes)"
 
-#: access/transam/xlog.c:8905 access/transam/xlog.c:9006
+#: access/transam/xlog.c:8937 access/transam/xlog.c:9040
 msgid "a backup is already in progress"
 msgstr "ein Backup läuft bereits"
 
-#: access/transam/xlog.c:8906
+#: access/transam/xlog.c:8938
 msgid "Run pg_stop_backup() and try again."
 msgstr "Führen Sie pg_stop_backup() aus und versuchen Sie es nochmal."
 
-#: access/transam/xlog.c:9007
+#: access/transam/xlog.c:9041
 #, c-format
 msgid ""
 "If you're sure there is no backup in progress, remove file \"%s\" and try "
@@ -2074,29 +1914,29 @@ msgstr ""
 "Wenn Sie sicher sind, dass noch kein Backup läuft, entfernen Sie die Datei "
 "»%s« und versuchen Sie es noch einmal."
 
-#: access/transam/xlog.c:9021 access/transam/xlog.c:9267
+#: access/transam/xlog.c:9055 access/transam/xlog.c:9301
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "konnte Datei »%s« nicht schreiben: %m"
 
-#: access/transam/xlog.c:9179
+#: access/transam/xlog.c:9213
 msgid "a backup is not in progress"
 msgstr "es läuft kein Backup"
 
-#: access/transam/xlog.c:9218 access/transam/xlog.c:9745
-#: access/transam/xlog.c:9751
+#: access/transam/xlog.c:9252 access/transam/xlog.c:9783
+#: access/transam/xlog.c:9789
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "ungültige Daten in Datei »%s«"
 
-#: access/transam/xlog.c:9316
+#: access/transam/xlog.c:9350
 msgid ""
 "pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
 msgstr ""
 "Aufräumen nach pg_stop_backup beendet, warte bis die benötigten WAL-Segmente "
 "archiviert sind"
 
-#: access/transam/xlog.c:9326
+#: access/transam/xlog.c:9360
 #, c-format
 msgid ""
 "pg_stop_backup still waiting for all required WAL segments to be archived "
@@ -2105,22 +1945,22 @@ msgstr ""
 "pg_stop_backup wartet immer noch, bis alle benötigten WAL-Segmente "
 "archiviert sind (%d Sekunden abgelaufen)"
 
-#: access/transam/xlog.c:9328
+#: access/transam/xlog.c:9362
 msgid ""
 "Check that your archive_command is executing properly.  pg_stop_backup can "
-"be cancelled safely, but the database backup will not be usable without all "
+"be canceled safely, but the database backup will not be usable without all "
 "the WAL segments."
 msgstr ""
-"Prüfen Sie, ob das archive_command korrekt ausführt. pg_stop_backup kann "
-"sicher abgebrochen werden, aber die Datenbank ist nicht benutzbar ohne die "
-"fehlenden WAL-Segmente."
+"Prüfen Sie, ob das archive_command korrekt ausgeführt wird. pg_stop_backup "
+"kann gefahrlos abgebrochen werden, aber die Datenbanksicherung wird ohne die "
+"fehlenden WAL-Segmente nicht benutzbar sein."
 
-#: access/transam/xlog.c:9335
+#: access/transam/xlog.c:9369
 msgid "pg_stop_backup complete, all required WAL segments have been archived"
 msgstr ""
 "pg_stop_backup abgeschlossen, alle benötigten WAL-Segmente wurden archiviert"
 
-#: access/transam/xlog.c:9339
+#: access/transam/xlog.c:9373
 msgid ""
 "WAL archiving is not enabled; you must ensure that all required WAL segments "
 "are copied through other means to complete the backup"
@@ -2129,366 +1969,162 @@ msgstr ""
 "benötigten WAL-Segmente auf andere Art kopiert werden, um die Sicherung "
 "abzuschließen"
 
-#: access/transam/xlog.c:9386
+#: access/transam/xlog.c:9420
 msgid "must be superuser to switch transaction log files"
 msgstr "nur Superuser können Transaktionslogdateien umschalten"
 
-#: access/transam/xlog.c:9418
+#: access/transam/xlog.c:9452
 msgid "must be superuser to create a restore point"
 msgstr "nur Superuser können Restore-Punkte anlegen"
 
-#: access/transam/xlog.c:9429
+#: access/transam/xlog.c:9463
 msgid "WAL level not sufficient for creating a restore point"
 msgstr "WAL-Level nicht ausreichend, um Restore-Punkt anzulegen"
 
-#: access/transam/xlog.c:9437
+#: access/transam/xlog.c:9471
 #, c-format
 msgid "value too long for restore point (maximum %d characters)"
 msgstr "Wert zu lang für Restore-Punkt (maximal %d Zeichen)"
 
-#: access/transam/xlog.c:9605
+#: access/transam/xlog.c:9639
 msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
 msgstr ""
 "pg_xlogfile_name_offset() kann nicht während der Wiederherstellung "
 "ausgeführt werden."
 
-#: access/transam/xlog.c:9615 access/transam/xlog.c:9687
+#: access/transam/xlog.c:9649 access/transam/xlog.c:9721
 #, c-format
 msgid "could not parse transaction log location \"%s\""
 msgstr "konnte Transaktionslogposition »%s« nicht interpretieren"
 
-#: access/transam/xlog.c:9680
+#: access/transam/xlog.c:9714
 msgid "pg_xlogfile_name() cannot be executed during recovery."
 msgstr ""
 "pg_xlogfile_name() kann nicht während der Wiederherstellung ausgeführt "
 "werden."
 
-#: access/transam/xlog.c:9777
+#: access/transam/xlog.c:9825
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:9817
-msgid "online backup mode cancelled"
+#: access/transam/xlog.c:9865
+msgid "online backup mode canceled"
 msgstr "Online-Sicherungsmodus storniert"
 
-#: access/transam/xlog.c:9818
+#: access/transam/xlog.c:9866
 #, c-format
 msgid "\"%s\" was renamed to \"%s\"."
 msgstr "»%s« wurde in »%s« umbenannt."
 
-#: access/transam/xlog.c:9825
-msgid "online backup mode was not cancelled"
+#: access/transam/xlog.c:9873
+msgid "online backup mode was not canceled"
 msgstr "Online-Sicherungsmodus wurde nicht storniert"
 
-#: access/transam/xlog.c:9826
+#: access/transam/xlog.c:9874
 #, c-format
 msgid "Could not rename \"%s\" to \"%s\": %m."
 msgstr "Konnte »%s« nicht in »%s« umbenennen: %m."
 
-#: access/transam/xlog.c:10323 access/transam/xlog.c:10345
+#: access/transam/xlog.c:10387 access/transam/xlog.c:10409
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u: %m"
 msgstr "konnte nicht aus Logdatei %u, Segment %u, Position %u lesen: %m"
 
-#: access/transam/xlog.c:10434
-#, fuzzy
+#: access/transam/xlog.c:10498
 msgid "received promote request"
-msgstr "intelligentes Herunterfahren verlangt"
+msgstr "Anforderung zum Befördern empfangen"
 
-#: access/transam/xlog.c:10447
+#: access/transam/xlog.c:10511
 #, c-format
 msgid "trigger file found: %s"
 msgstr "Triggerdatei gefunden: %s"
 
-#: access/common/tupdesc.c:575 parser/parse_relation.c:1169
+#: access/heap/heapam.c:1082 access/heap/heapam.c:1110
+#: access/heap/heapam.c:1140 catalog/aclchk.c:1678
 #, c-format
-msgid "column \"%s\" cannot be declared SETOF"
-msgstr "Spalte »%s« kann nicht als SETOF deklariert werden"
+msgid "\"%s\" is an index"
+msgstr "»%s« ist ein Index"
 
-#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
+#: access/heap/heapam.c:1087 access/heap/heapam.c:1115
+#: access/heap/heapam.c:1145 catalog/aclchk.c:1685 commands/tablecmds.c:2269
+#: commands/tablecmds.c:7450 commands/tablecmds.c:9032
 #, c-format
-msgid "number of columns (%d) exceeds limit (%d)"
-msgstr "Anzahl der Spalten (%d) überschreitet Maximum (%d)"
+msgid "\"%s\" is a composite type"
+msgstr "»%s« ist ein zusammengesetzter Typ"
 
-#: access/common/indextuple.c:57
+#: access/heap/heapam.c:3216 access/heap/heapam.c:3247
+#: access/heap/heapam.c:3282
 #, c-format
-msgid "number of index columns (%d) exceeds limit (%d)"
-msgstr "Anzahl der Indexspalten (%d) überschreitet Maximum (%d)"
+msgid "could not obtain lock on row in relation \"%s\""
+msgstr "konnte Sperre für Zeile in Relation »%s« nicht setzen"
 
-#: access/common/indextuple.c:168
+#: access/heap/hio.c:175 access/heap/rewriteheap.c:597
 #, c-format
-msgid "index row requires %lu bytes, maximum size is %lu"
-msgstr "Indexzeile benötigt %lu Bytes, Maximalgröße ist %lu"
+msgid "row is too big: size %lu, maximum size %lu"
+msgstr "Zeile ist zu groß: Größe ist %lu, Maximalgröße ist %lu"
 
-#: access/common/printtup.c:278 tcop/fastpath.c:180 tcop/fastpath.c:554
-#: tcop/postgres.c:1664
+#: access/index/indexam.c:161 catalog/objectaddress.c:391
+#: commands/indexcmds.c:1542 commands/tablecmds.c:220
+#: commands/tablecmds.c:2486
 #, c-format
-msgid "unsupported format code: %d"
-msgstr "nicht unterstützter Formatcode: %d"
-
-#: access/common/reloptions.c:323
-msgid "user-defined relation parameter types limit exceeded"
-msgstr ""
-"Wertebereich des Typs für benutzerdefinierte Relationsparameter überschritten"
-
-#: access/common/reloptions.c:622
-msgid "RESET must not include values for parameters"
-msgstr "RESET darf keinen Parameterwert enthalten"
+msgid "\"%s\" is not an index"
+msgstr "»%s« ist kein Index"
 
-#: access/common/reloptions.c:655
+#: access/nbtree/nbtinsert.c:393
 #, c-format
-msgid "unrecognized parameter namespace \"%s\""
-msgstr "unbekannter Parameter-Namensraum »%s«"
+msgid "duplicate key value violates unique constraint \"%s\""
+msgstr "doppelter Schlüsselwert verletzt Unique-Constraint »%s«"
 
-#: access/common/reloptions.c:898
+#: access/nbtree/nbtinsert.c:395
 #, c-format
-msgid "unrecognized parameter \"%s\""
-msgstr "unbekannter Parameter »%s«"
+msgid "Key %s already exists."
+msgstr "Schlüssel »%s« existiert bereits."
 
-#: access/common/reloptions.c:923
+#: access/nbtree/nbtinsert.c:457
 #, c-format
-msgid "parameter \"%s\" specified more than once"
-msgstr "Parameter »%s« mehrmals angegeben"
+msgid "failed to re-find tuple within index \"%s\""
+msgstr "konnte Tupel mit Index »%s« nicht erneut finden"
 
-#: access/common/reloptions.c:938
-#, c-format
-msgid "invalid value for boolean option \"%s\": %s"
-msgstr "ungültiger Wert für Boole'sche Option »%s«: »%s«"
+#: access/nbtree/nbtinsert.c:459
+msgid "This may be because of a non-immutable index expression."
+msgstr "Das kann daran liegen, dass der Indexausdruck nicht »immutable« ist."
 
-#: access/common/reloptions.c:949
+#: access/nbtree/nbtinsert.c:535 access/nbtree/nbtsort.c:487
+msgid ""
+"Values larger than 1/3 of a buffer page cannot be indexed.\n"
+"Consider a function index of an MD5 hash of the value, or use full text "
+"indexing."
+msgstr ""
+"Werte, die größer sind als 1/3 einer Pufferseite, können nicht indiziert "
+"werden.\n"
+"Erstellen Sie eventuell einen Funktionsindex auf einen MD5-Hash oder "
+"verwenden Sie Volltextindizierung."
+
+#: access/nbtree/nbtpage.c:161 access/nbtree/nbtpage.c:365
+#: parser/parse_utilcmd.c:1527
 #, c-format
-msgid "invalid value for integer option \"%s\": %s"
-msgstr "ungültiger Wert für ganzzahlige Option »%s«: »%s«"
+msgid "index \"%s\" is not a btree"
+msgstr "Index »%s« ist kein B-Tree"
 
-#: access/common/reloptions.c:954 access/common/reloptions.c:972
-#, c-format
-msgid "value %s out of bounds for option \"%s\""
-msgstr "Wert %s ist außerhalb des gültigen Bereichs für Option »%s«"
-
-#: access/common/reloptions.c:956
-#, c-format
-msgid "Valid values are between \"%d\" and \"%d\"."
-msgstr "Gültige Werte sind zwischen »%d« und »%d«."
-
-#: access/common/reloptions.c:967
-#, c-format
-msgid "invalid value for floating point option \"%s\": %s"
-msgstr "ungültiger Wert für Gleitkommaoption »%s«: »%s«"
-
-#: access/common/reloptions.c:974
-#, c-format
-msgid "Valid values are between \"%f\" and \"%f\"."
-msgstr "Gültige Werte sind zwischen »%f« und »%f«."
-
-#: access/common/tupconvert.c:107
-#, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr ""
-"Zurückgegebener Typ %1$s stimmt in Spalte %3$d nicht mit erwartetem Typ %2$s "
-"überein."
-
-#: access/common/tupconvert.c:135
-#, c-format
-msgid ""
-"Number of returned columns (%d) does not match expected column count (%d)."
-msgstr ""
-"Anzahl der zurückgegebenen Spalten (%d) entspricht nicht der erwarteten "
-"Spaltenanzahl (%d)."
-
-#: access/common/tupconvert.c:240
-#, c-format
-msgid ""
-"Attribute \"%s\" of type %s does not match corresponding attribute of type "
-"%s."
-msgstr ""
-"Attribut »%s« von Typ %s stimmt nicht mit dem entsprechenden Attribut von "
-"Typ %s überein."
-
-#: access/common/tupconvert.c:252
-#, c-format
-msgid "Attribute \"%s\" of type %s does not exist in type %s."
-msgstr "Attribut »%s« von Typ %s existiert nicht in Typ %s."
-
-#: access/gin/ginentrypage.c:101 access/nbtree/nbtinsert.c:531
-#: access/nbtree/nbtsort.c:483
-#, c-format
-msgid "index row size %lu exceeds maximum %lu for index \"%s\""
-msgstr "Größe %lu der Indexzeile überschreitet Maximum %lu für Index »%s«"
-
-#: access/gin/ginscan.c:401
-msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
-msgstr ""
-"alte GIN-Indexe unterstützen keine Scans des ganzen Index oder Suchen nach "
-"NULL-Werten"
-
-#: access/gin/ginscan.c:402
-#, c-format
-msgid "To fix this, do REINDEX INDEX \"%s\"."
-msgstr "Um das zu reparieren, führen Sie REINDEX INDEX \"%s\" aus."
-
-#: access/gist/gist.c:230
-msgid "unlogged GiST indexes are not supported"
-msgstr "ungeloggte GiST-Indexe werden nicht unterstützt"
-
-#: access/gist/gist.c:715 access/gist/gistvacuum.c:271
-#, c-format
-msgid "index \"%s\" contains an inner tuple marked as invalid"
-msgstr "Index »%s« enthält ein inneres Tupel, das als ungültig markiert ist"
-
-#: access/gist/gist.c:717 access/gist/gistvacuum.c:273
-msgid ""
-"This is caused by an incomplete page split at crash recovery before "
-"upgrading to 9.1."
-msgstr ""
-
-#: access/gist/gist.c:718 access/gist/gistutil.c:585
-#: access/gist/gistutil.c:596 access/gist/gistvacuum.c:274
-#: access/hash/hashutil.c:173 access/hash/hashutil.c:184
-#: access/hash/hashutil.c:196 access/hash/hashutil.c:217
-#: access/nbtree/nbtpage.c:436 access/nbtree/nbtpage.c:447
-msgid "Please REINDEX it."
-msgstr "Bitte führen Sie REINDEX für den Index aus."
-
-#: access/gist/gistsplit.c:375
-#, c-format
-msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr "Picksplit-Methode für Spalte %d von Index »%s« fehlgeschlagen"
-
-#: access/gist/gistsplit.c:377
-msgid ""
-"The index is not optimal. To optimize it, contact a developer, or try to use "
-"the column as the second one in the CREATE INDEX command."
-msgstr ""
-"Der Index ist nicht optimal. Um ihn zu optimieren, kontaktieren Sie einen "
-"Entwickler oder versuchen Sie, die Spalte als die zweite im CREATE-INDEX-"
-"Befehl zu verwenden."
-
-#: access/gist/gistutil.c:582 access/hash/hashutil.c:170
-#: access/nbtree/nbtpage.c:433
-#, c-format
-msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "Index »%s« enthält unerwartete Nullseite bei Block %u"
-
-#: access/gist/gistutil.c:593 access/hash/hashutil.c:181
-#: access/hash/hashutil.c:193 access/nbtree/nbtpage.c:444
-#, c-format
-msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "Index »%s« enthält korrupte Seite bei Block %u"
-
-#: access/hash/hashutil.c:209
-#, c-format
-msgid "index \"%s\" is not a hash index"
-msgstr "Index »%s« ist kein Hash-Index"
-
-#: access/hash/hashutil.c:215
-#, c-format
-msgid "index \"%s\" has wrong hash version"
-msgstr "Index »%s« hat falsche Hash-Version"
-
-#: access/hash/hashinsert.c:73
-#, c-format
-msgid "index row size %lu exceeds hash maximum %lu"
-msgstr "Größe der Indexzeile %lu überschreitet Maximum für Hash-Index %lu"
-
-#: access/hash/hashinsert.c:76
-msgid "Values larger than a buffer page cannot be indexed."
-msgstr ""
-"Werte, die größer sind als eine Pufferseite, können nicht indiziert werden."
-
-#: access/hash/hashovfl.c:547
-#, c-format
-msgid "out of overflow pages in hash index \"%s\""
-msgstr "keine Überlaufseiten in Hash-Index »%s« mehr"
-
-#: access/hash/hashsearch.c:152
-msgid "hash indexes do not support whole-index scans"
-msgstr "Hash-Indexe unterstützen keine Scans des ganzen Index"
-
-#: access/heap/heapam.c:1086 access/heap/heapam.c:1114
-#: access/heap/heapam.c:1144 catalog/aclchk.c:1678
-#, c-format
-msgid "\"%s\" is an index"
-msgstr "»%s« ist ein Index"
-
-#: access/heap/heapam.c:1091 access/heap/heapam.c:1119
-#: access/heap/heapam.c:1149 catalog/aclchk.c:1685 commands/tablecmds.c:2259
-#: commands/tablecmds.c:7379 commands/tablecmds.c:8962
-#, c-format
-msgid "\"%s\" is a composite type"
-msgstr "»%s« ist ein zusammengesetzter Typ"
-
-#: access/heap/heapam.c:3212 access/heap/heapam.c:3243
-#: access/heap/heapam.c:3278
-#, c-format
-msgid "could not obtain lock on row in relation \"%s\""
-msgstr "konnte Sperre für Zeile in Relation »%s« nicht setzen"
-
-#: access/heap/hio.c:175 access/heap/rewriteheap.c:597
-#, c-format
-msgid "row is too big: size %lu, maximum size %lu"
-msgstr "Zeile ist zu groß: Größe ist %lu, Maximalgröße ist %lu"
-
-#: access/index/indexam.c:161 catalog/objectaddress.c:391
-#: commands/indexcmds.c:1541 commands/tablecmds.c:219
-#: commands/tablecmds.c:2476
-#, c-format
-msgid "\"%s\" is not an index"
-msgstr "»%s« ist kein Index"
-
-#: access/nbtree/nbtinsert.c:393
-#, c-format
-msgid "duplicate key value violates unique constraint \"%s\""
-msgstr "doppelter Schlüsselwert verletzt Unique-Constraint »%s«"
-
-#: access/nbtree/nbtinsert.c:395
-#, c-format
-msgid "Key %s already exists."
-msgstr "Schlüssel »%s« existiert bereits."
-
-#: access/nbtree/nbtinsert.c:457
-#, c-format
-msgid "failed to re-find tuple within index \"%s\""
-msgstr "konnte Tupel mit Index »%s« nicht erneut finden"
-
-#: access/nbtree/nbtinsert.c:459
-msgid "This may be because of a non-immutable index expression."
-msgstr "Das kann daran liegen, dass der Indexausdruck nicht »immutable« ist."
-
-#: access/nbtree/nbtinsert.c:535 access/nbtree/nbtsort.c:487
-msgid ""
-"Values larger than 1/3 of a buffer page cannot be indexed.\n"
-"Consider a function index of an MD5 hash of the value, or use full text "
-"indexing."
-msgstr ""
-"Werte, die größer sind als 1/3 einer Pufferseite, können nicht indiziert "
-"werden.\n"
-"Erstellen Sie eventuell einen Funktionsindex auf einen MD5-Hash oder "
-"verwenden Sie Volltextindizierung."
-
-#: access/nbtree/nbtpage.c:161 access/nbtree/nbtpage.c:365
-#, c-format
-msgid "index \"%s\" is not a btree"
-msgstr "Index »%s« ist kein B-Tree"
-
-#: access/nbtree/nbtpage.c:167 access/nbtree/nbtpage.c:371
+#: access/nbtree/nbtpage.c:167 access/nbtree/nbtpage.c:371
 #, c-format
 msgid "version mismatch in index \"%s\": file version %d, code version %d"
 msgstr ""
 "keine Versionsübereinstimmung in Index »%s«: Dateiversion %d, Code-Version %d"
 
-#: bootstrap/bootstrap.c:277 tcop/postgres.c:3386 postmaster/postmaster.c:681
+#: bootstrap/bootstrap.c:277 tcop/postgres.c:3388 postmaster/postmaster.c:682
 #, c-format
 msgid "--%s requires a value"
 msgstr "--%s benötigt einen Wert"
 
-#: bootstrap/bootstrap.c:282 tcop/postgres.c:3391 postmaster/postmaster.c:686
+#: bootstrap/bootstrap.c:282 tcop/postgres.c:3393 postmaster/postmaster.c:687
 #, c-format
 msgid "-c %s requires a value"
 msgstr "-c %s benötigt einen Wert"
 
-#: bootstrap/bootstrap.c:293 postmaster/postmaster.c:698
-#: postmaster/postmaster.c:711
+#: bootstrap/bootstrap.c:293 postmaster/postmaster.c:699
+#: postmaster/postmaster.c:712
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
@@ -2498,16 +2134,6 @@ msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s: ungültige Kommandozeilenargumente\n"
 
-#: catalog/pg_collation.c:75
-#, c-format
-msgid "collation \"%s\" for encoding \"%s\" already exists"
-msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits"
-
-#: catalog/pg_collation.c:89
-#, c-format
-msgid "collation \"%s\" already exists"
-msgstr "Sortierfolge »%s« existiert bereits"
-
 #: catalog/aclchk.c:200
 msgid "grant options can only be granted to roles"
 msgstr "Grant-Optionen können nur Rollen gewährt werden"
@@ -2619,16 +2245,16 @@ msgstr "Spaltenprivilegien sind nur für Relation gültig"
 msgid "large object %u does not exist"
 msgstr "Large Object %u existiert nicht"
 
-#: catalog/aclchk.c:833 catalog/aclchk.c:841 commands/collationcmds.c:93
-#: commands/copy.c:863 commands/copy.c:881 commands/copy.c:889
-#: commands/copy.c:897 commands/copy.c:905 commands/copy.c:913
-#: commands/copy.c:921 commands/copy.c:929 commands/copy.c:945
-#: commands/copy.c:959 commands/dbcommands.c:146 commands/dbcommands.c:154
+#: catalog/aclchk.c:833 catalog/aclchk.c:841 commands/copy.c:863
+#: commands/copy.c:881 commands/copy.c:889 commands/copy.c:897
+#: commands/copy.c:905 commands/copy.c:913 commands/copy.c:921
+#: commands/copy.c:929 commands/copy.c:945 commands/copy.c:959
+#: commands/dbcommands.c:146 commands/dbcommands.c:154
 #: commands/dbcommands.c:162 commands/dbcommands.c:170
 #: commands/dbcommands.c:178 commands/dbcommands.c:186
 #: commands/dbcommands.c:194 commands/dbcommands.c:1315
-#: commands/dbcommands.c:1323 commands/foreigncmds.c:386
-#: commands/foreigncmds.c:395 commands/functioncmds.c:488
+#: commands/dbcommands.c:1323 commands/foreigncmds.c:396
+#: commands/foreigncmds.c:405 commands/functioncmds.c:488
 #: commands/functioncmds.c:578 commands/functioncmds.c:586
 #: commands/functioncmds.c:594 commands/functioncmds.c:1982
 #: commands/functioncmds.c:1990 commands/user.c:133 commands/user.c:150
@@ -2638,12 +2264,12 @@ msgstr "Large Object %u existiert nicht"
 #: commands/user.c:230 commands/user.c:501 commands/user.c:513
 #: commands/user.c:521 commands/user.c:529 commands/user.c:537
 #: commands/user.c:545 commands/user.c:553 commands/user.c:561
-#: commands/user.c:570 commands/user.c:578 commands/sequence.c:1119
-#: commands/sequence.c:1127 commands/sequence.c:1135 commands/sequence.c:1143
-#: commands/sequence.c:1151 commands/sequence.c:1159 commands/sequence.c:1167
-#: commands/sequence.c:1175 commands/typecmds.c:282 commands/extension.c:1248
-#: commands/extension.c:1256 commands/extension.c:1264
-#: commands/extension.c:2473
+#: commands/user.c:570 commands/user.c:578 commands/sequence.c:1135
+#: commands/sequence.c:1143 commands/sequence.c:1151 commands/sequence.c:1159
+#: commands/sequence.c:1167 commands/sequence.c:1175 commands/sequence.c:1183
+#: commands/sequence.c:1191 commands/typecmds.c:282 commands/extension.c:1250
+#: commands/extension.c:1258 commands/extension.c:1266
+#: commands/extension.c:2501 commands/collationcmds.c:93
 msgid "conflicting or redundant options"
 msgstr "widersprüchliche oder überflüssige Optionen"
 
@@ -2651,22 +2277,22 @@ msgstr "widersprüchliche oder überflüssige Optionen"
 msgid "default privileges cannot be set for columns"
 msgstr "Vorgabeprivilegien können nicht für Spalten gesetzt werden"
 
-#: catalog/aclchk.c:1428 catalog/objectaddress.c:536 commands/analyze.c:355
-#: commands/copy.c:3774 commands/sequence.c:1403 commands/tablecmds.c:4543
-#: commands/tablecmds.c:4633 commands/tablecmds.c:4680
-#: commands/tablecmds.c:4776 commands/tablecmds.c:4820
-#: commands/tablecmds.c:4899 commands/tablecmds.c:4983
-#: commands/tablecmds.c:6591 commands/tablecmds.c:6799 commands/trigger.c:590
-#: parser/analyze.c:2038 parser/parse_relation.c:2043
+#: catalog/aclchk.c:1428 catalog/objectaddress.c:541 commands/analyze.c:343
+#: commands/copy.c:3774 commands/sequence.c:1419 commands/tablecmds.c:4591
+#: commands/tablecmds.c:4681 commands/tablecmds.c:4728
+#: commands/tablecmds.c:4824 commands/tablecmds.c:4868
+#: commands/tablecmds.c:4947 commands/tablecmds.c:5031
+#: commands/tablecmds.c:6661 commands/tablecmds.c:6870 commands/trigger.c:585
+#: parser/analyze.c:2039 parser/parse_relation.c:2043
 #: parser/parse_relation.c:2100 parser/parse_target.c:895
-#: parser/parse_type.c:117 utils/adt/acl.c:2772 utils/adt/ruleutils.c:1578
+#: parser/parse_type.c:117 utils/adt/acl.c:2772 utils/adt/ruleutils.c:1580
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "Spalte »%s« von Relation »%s« existiert nicht"
 
 #: catalog/aclchk.c:1693 catalog/objectaddress.c:398 commands/sequence.c:1035
-#: commands/tablecmds.c:207 commands/tablecmds.c:2237
-#: commands/tablecmds.c:2484 commands/tablecmds.c:8912 utils/adt/acl.c:2008
+#: commands/tablecmds.c:208 commands/tablecmds.c:2247
+#: commands/tablecmds.c:2494 commands/tablecmds.c:8982 utils/adt/acl.c:2008
 #: utils/adt/acl.c:2038 utils/adt/acl.c:2070 utils/adt/acl.c:2102
 #: utils/adt/acl.c:2130 utils/adt/acl.c:2160
 #, c-format
@@ -2717,7 +2343,7 @@ msgid "permission denied for relation %s"
 msgstr "keine Berechtigung für Relation %s"
 
 #: catalog/aclchk.c:3072 commands/sequence.c:550 commands/sequence.c:749
-#: commands/sequence.c:791 commands/sequence.c:827 commands/sequence.c:1454
+#: commands/sequence.c:791 commands/sequence.c:827 commands/sequence.c:1470
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "keine Berechtigung für Sequenz %s"
@@ -3010,37 +2636,37 @@ msgstr "ungültiger Fork-Name"
 msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
 msgstr "Gültige Fork-Namen sind »main«, »fsm« und »vm«."
 
-#: catalog/dependency.c:589
+#: catalog/dependency.c:574
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "kann %s nicht löschen, wird von %s benötigt"
 
-#: catalog/dependency.c:592
+#: catalog/dependency.c:577
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Sie können stattdessen %s löschen."
 
-#: catalog/dependency.c:748 catalog/pg_shdepend.c:562
+#: catalog/dependency.c:738 catalog/pg_shdepend.c:562
 #, c-format
 msgid "cannot drop %s because it is required by the database system"
 msgstr "kann %s nicht löschen, wird vom Datenbanksystem benötigt"
 
-#: catalog/dependency.c:864
+#: catalog/dependency.c:854
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "Löschvorgang löscht automatisch %s"
 
-#: catalog/dependency.c:876 catalog/dependency.c:885
+#: catalog/dependency.c:866 catalog/dependency.c:875
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s hängt von %s ab"
 
-#: catalog/dependency.c:897 catalog/dependency.c:906
+#: catalog/dependency.c:887 catalog/dependency.c:896
 #, c-format
 msgid "drop cascades to %s"
 msgstr "Löschvorgang löscht ebenfalls %s"
 
-#: catalog/dependency.c:914 catalog/pg_shdepend.c:673
+#: catalog/dependency.c:904 catalog/pg_shdepend.c:673
 #, c-format
 msgid ""
 "\n"
@@ -3055,341 +2681,341 @@ msgstr[1] ""
 "\n"
 "und %d weitere Objekte (Liste im Serverlog)"
 
-#: catalog/dependency.c:926
+#: catalog/dependency.c:916
 #, c-format
 msgid "cannot drop %s because other objects depend on it"
 msgstr "kann %s nicht löschen, weil andere Objekte davon abhängen"
 
-#: catalog/dependency.c:928 catalog/dependency.c:929 catalog/dependency.c:935
-#: catalog/dependency.c:936 catalog/dependency.c:947 catalog/dependency.c:948
-#: catalog/objectaddress.c:315 commands/user.c:956 commands/user.c:957
-#: commands/tablecmds.c:687 commands/trigger.c:899 commands/trigger.c:915
-#: commands/trigger.c:927 tcop/postgres.c:4297 storage/lmgr/deadlock.c:942
-#: storage/lmgr/deadlock.c:943 nodes/print.c:85 port/win32/security.c:51
-#: utils/adt/xml.c:1364 utils/adt/xml.c:1365 utils/adt/xml.c:1371
-#: utils/adt/xml.c:1442 utils/fmgr/dfmgr.c:381 utils/misc/guc.c:5395
-#: utils/misc/guc.c:5709 utils/misc/guc.c:7978 utils/misc/guc.c:7982
-#: utils/misc/guc.c:7984 utils/misc/guc.c:8012 utils/misc/guc.c:8016
-#: utils/misc/guc.c:8018 utils/misc/guc.c:8046 utils/misc/guc.c:8050
-#: utils/misc/guc.c:8052 utils/misc/guc.c:8080 utils/misc/guc.c:8084
-#: utils/misc/guc.c:8086 utils/misc/guc.c:8114 utils/misc/guc.c:8119
-#: utils/misc/guc.c:8121
+#: catalog/dependency.c:918 catalog/dependency.c:919 catalog/dependency.c:925
+#: catalog/dependency.c:926 catalog/dependency.c:937 catalog/dependency.c:938
+#: catalog/objectaddress.c:315 commands/user.c:957 commands/tablecmds.c:689
+#: storage/lmgr/deadlock.c:943 port/win32/security.c:51 utils/misc/guc.c:5399
+#: utils/misc/guc.c:5713 utils/misc/guc.c:8014 utils/misc/guc.c:8048
+#: utils/misc/guc.c:8082 utils/misc/guc.c:8116 utils/misc/guc.c:8151
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: catalog/dependency.c:930 catalog/dependency.c:937
+#: catalog/dependency.c:920 catalog/dependency.c:927
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr ""
 "Verwenden Sie DROP ... CASCADE, um die abhängigen Objekte ebenfalls zu "
 "löschen."
 
-#: catalog/dependency.c:934
+#: catalog/dependency.c:924
 msgid "cannot drop desired object(s) because other objects depend on them"
 msgstr ""
 "kann gewünschte Objekte nicht löschen, weil andere Objekte davon abhängen"
 
 #. translator: %d always has a value larger than 1
-#: catalog/dependency.c:943
+#: catalog/dependency.c:933
 #, c-format
 msgid "drop cascades to %d other object"
 msgid_plural "drop cascades to %d other objects"
 msgstr[0] "Löschvorgang löscht ebenfalls %d weiteres Objekt"
 msgstr[1] "Löschvorgang löscht ebenfalls %d weitere Objekte"
 
-#: catalog/dependency.c:2177
+#: catalog/dependency.c:2204
 #, c-format
 msgid " column %s"
 msgstr " Spalte %s"
 
-#: catalog/dependency.c:2183
+#: catalog/dependency.c:2210
 #, c-format
 msgid "function %s"
 msgstr "Funktion %s"
 
-#: catalog/dependency.c:2188
+#: catalog/dependency.c:2215
 #, c-format
 msgid "type %s"
 msgstr "Typ %s"
 
-#: catalog/dependency.c:2218
+#: catalog/dependency.c:2245
 #, c-format
 msgid "cast from %s to %s"
 msgstr "Typumwandlung von %s in %s"
 
-#: catalog/dependency.c:2238
+#: catalog/dependency.c:2265
 #, c-format
 msgid "collation %s"
 msgstr "Sortierfolge %s"
 
-#: catalog/dependency.c:2262
+#: catalog/dependency.c:2289
 #, c-format
 msgid "constraint %s on %s"
 msgstr "Constraint %s für %s"
 
-#: catalog/dependency.c:2268
+#: catalog/dependency.c:2295
 #, c-format
 msgid "constraint %s"
 msgstr "Constraint %s"
 
-#: catalog/dependency.c:2285
+#: catalog/dependency.c:2312
 #, c-format
 msgid "conversion %s"
 msgstr "Konversion %s"
 
-#: catalog/dependency.c:2322
+#: catalog/dependency.c:2349
 #, c-format
 msgid "default for %s"
 msgstr "Vorgabewert für %s"
 
-#: catalog/dependency.c:2339
+#: catalog/dependency.c:2366
 #, c-format
 msgid "language %s"
 msgstr "Sprache %s"
 
-#: catalog/dependency.c:2345
+#: catalog/dependency.c:2372
 #, c-format
 msgid "large object %u"
 msgstr "Large Object %u"
 
-#: catalog/dependency.c:2350
+#: catalog/dependency.c:2377
 #, c-format
 msgid "operator %s"
 msgstr "Operator %s"
 
-#: catalog/dependency.c:2382
+#: catalog/dependency.c:2409
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "Operatorklasse %s für Zugriffsmethode %s"
 
-#: catalog/dependency.c:2433
+#. translator: %d is the operator strategy (a number), the
+#. first two %s's are data type names, the third %s is the
+#. description of the operator family, and the last %s is the
+#. textual form of the operator with arguments.
+#: catalog/dependency.c:2459
 #, c-format
 msgid "operator %d (%s, %s) of %s: %s"
 msgstr "Operator %d (%s, %s) von %s: %s"
 
-#: catalog/dependency.c:2484
+#. translator: %d is the function number, the first two %s's
+#. are data type names, the third %s is the description of the
+#. operator family, and the last %s is the textual form of the
+#. function with arguments.
+#: catalog/dependency.c:2509
 #, c-format
 msgid "function %d (%s, %s) of %s: %s"
 msgstr "Funktion %d (%s, %s) von %s: %s"
 
-#: catalog/dependency.c:2524
+#: catalog/dependency.c:2549
 #, c-format
 msgid "rule %s on "
 msgstr "Regel %s für "
 
-#: catalog/dependency.c:2559
+#: catalog/dependency.c:2584
 #, c-format
 msgid "trigger %s on "
 msgstr "Trigger %s für "
 
-#: catalog/dependency.c:2576
+#: catalog/dependency.c:2601
 #, c-format
 msgid "schema %s"
 msgstr "Schema %s"
 
-#: catalog/dependency.c:2589
+#: catalog/dependency.c:2614
 #, c-format
 msgid "text search parser %s"
 msgstr "Textsucheparser %s"
 
-#: catalog/dependency.c:2604
+#: catalog/dependency.c:2629
 #, c-format
 msgid "text search dictionary %s"
 msgstr "Textsuchewörterbuch %s"
 
-#: catalog/dependency.c:2619
+#: catalog/dependency.c:2644
 #, c-format
 msgid "text search template %s"
 msgstr "Textsuchevorlage %s"
 
-#: catalog/dependency.c:2634
+#: catalog/dependency.c:2659
 #, c-format
 msgid "text search configuration %s"
 msgstr "Textsuchekonfiguration %s"
 
-#: catalog/dependency.c:2642
+#: catalog/dependency.c:2667
 #, c-format
 msgid "role %s"
 msgstr "Rolle %s"
 
-#: catalog/dependency.c:2655
+#: catalog/dependency.c:2680
 #, c-format
 msgid "database %s"
 msgstr "Datenbank %s"
 
-#: catalog/dependency.c:2667
+#: catalog/dependency.c:2692
 #, c-format
 msgid "tablespace %s"
 msgstr "Tablespace %s"
 
-#: catalog/dependency.c:2676
+#: catalog/dependency.c:2701
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "Fremddaten-Wrapper %s"
 
-#: catalog/dependency.c:2685
+#: catalog/dependency.c:2710
 #, c-format
 msgid "server %s"
 msgstr "Server %s"
 
-#: catalog/dependency.c:2710
+#: catalog/dependency.c:2735
 #, c-format
 msgid "user mapping for %s"
 msgstr "Benutzerabbildung für %s"
 
-#: catalog/dependency.c:2744
+#: catalog/dependency.c:2769
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Relationen von Rolle %s"
 
-#: catalog/dependency.c:2749
+#: catalog/dependency.c:2774
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Sequenzen von Rolle %s"
 
-#: catalog/dependency.c:2754
+#: catalog/dependency.c:2779
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "Vorgabeprivilegien für neue Funktionen von Rolle %s"
 
-#: catalog/dependency.c:2760
+#: catalog/dependency.c:2785
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "Vorgabeprivilegien von Rolle %s"
 
-#: catalog/dependency.c:2768
+#: catalog/dependency.c:2793
 #, c-format
 msgid " in schema %s"
 msgstr " in Schema %s"
 
-#: catalog/dependency.c:2785
+#: catalog/dependency.c:2810
 #, c-format
 msgid "extension %s"
 msgstr "Erweiterung %s"
 
-#: catalog/dependency.c:2843
+#: catalog/dependency.c:2868
 #, c-format
 msgid "table %s"
 msgstr "Tabelle %s"
 
-#: catalog/dependency.c:2847
+#: catalog/dependency.c:2872
 #, c-format
 msgid "index %s"
 msgstr "Index %s"
 
-#: catalog/dependency.c:2851
+#: catalog/dependency.c:2876
 #, c-format
 msgid "sequence %s"
 msgstr "Sequenz %s"
 
-#: catalog/dependency.c:2855
+#: catalog/dependency.c:2880
 #, c-format
 msgid "uncataloged table %s"
 msgstr "nicht katalogisierte Tabelle %s"
 
-#: catalog/dependency.c:2859
+#: catalog/dependency.c:2884
 #, c-format
 msgid "toast table %s"
 msgstr "TOAST-Tabelle %s"
 
-#: catalog/dependency.c:2863
+#: catalog/dependency.c:2888
 #, c-format
 msgid "view %s"
 msgstr "Sicht %s"
 
-#: catalog/dependency.c:2867
+#: catalog/dependency.c:2892
 #, c-format
 msgid "composite type %s"
 msgstr "zusammengesetzter Typ %s"
 
-#: catalog/dependency.c:2871
+#: catalog/dependency.c:2896
 #, c-format
 msgid "foreign table %s"
 msgstr "Fremdtabelle %s"
 
-#: catalog/dependency.c:2876
+#: catalog/dependency.c:2901
 #, c-format
 msgid "relation %s"
 msgstr "Relation %s"
 
-#: catalog/dependency.c:2913
+#: catalog/dependency.c:2938
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "Operatorfamilie %s für Zugriffsmethode %s"
 
-#: catalog/heap.c:263
+#: catalog/heap.c:264
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "keine Berechtigung, um »%s.%s« zu erzeugen"
 
-#: catalog/heap.c:265
+#: catalog/heap.c:266
 msgid "System catalog modifications are currently disallowed."
 msgstr "Änderungen an Systemkatalogen sind gegenwärtig nicht erlaubt."
 
-#: catalog/heap.c:388 commands/tablecmds.c:1258 commands/tablecmds.c:1675
-#: commands/tablecmds.c:4228
+#: catalog/heap.c:389 commands/tablecmds.c:1268 commands/tablecmds.c:1685
+#: commands/tablecmds.c:4276
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "Tabellen können höchstens %d Spalten haben"
 
-#: catalog/heap.c:405
+#: catalog/heap.c:406
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "Spaltenname »%s« steht im Konflikt mit dem Namen einer Systemspalte"
 
-#: catalog/heap.c:421
+#: catalog/heap.c:422
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "Spaltenname »%s« mehrmals angegeben"
 
-#: catalog/heap.c:471
+#: catalog/heap.c:472
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "Spalte »%s« hat Typ »unknown«"
 
-#: catalog/heap.c:472
+#: catalog/heap.c:473
 msgid "Proceeding with relation creation anyway."
 msgstr "Relation wird trotzdem erzeugt."
 
-#: catalog/heap.c:485
+#: catalog/heap.c:486
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "Spalte »%s« hat Pseudotyp %s"
 
-#: catalog/heap.c:508
+#: catalog/heap.c:516
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "zusammengesetzter Typ %s kann nicht Teil von sich selbst werden"
 
-#: catalog/heap.c:550
+#: catalog/heap.c:558
 #, c-format
 msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr ""
 "für Spalte »%s« mit sortierbarem Typ %s wurde keine Sortierfolge abgeleitet"
 
-#: catalog/heap.c:552 commands/indexcmds.c:930 commands/view.c:145
+#: catalog/heap.c:560 commands/indexcmds.c:931 commands/view.c:145
 #: regex/regc_pg_locale.c:259 utils/adt/formatting.c:1520
 #: utils/adt/formatting.c:1570 utils/adt/formatting.c:1641
 #: utils/adt/formatting.c:1691 utils/adt/formatting.c:1774
-#: utils/adt/formatting.c:1836 utils/adt/like.c:212 utils/adt/selfuncs.c:4853
-#: utils/adt/selfuncs.c:4970 utils/adt/varlena.c:1315
+#: utils/adt/formatting.c:1836 utils/adt/like.c:212 utils/adt/selfuncs.c:4914
+#: utils/adt/selfuncs.c:5031 utils/adt/varlena.c:1315
 msgid "Use the COLLATE clause to set the collation explicitly."
 msgstr ""
 "Verwenden Sie die COLLATE-Klausel, um die Sortierfolge explizit zu setzen."
 
-#: catalog/heap.c:1003 catalog/index.c:767 commands/tablecmds.c:2308
+#: catalog/heap.c:1011 catalog/index.c:769 commands/tablecmds.c:2318
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "Relation »%s« existiert bereits"
 
-#: catalog/heap.c:1019 catalog/pg_type.c:396 catalog/pg_type.c:696
+#: catalog/heap.c:1027 catalog/pg_type.c:396 catalog/pg_type.c:699
 #: commands/typecmds.c:224 commands/typecmds.c:806 commands/typecmds.c:1145
-#: commands/typecmds.c:1621
+#: commands/typecmds.c:1622
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "Typ »%s« existiert bereits"
 
-#: catalog/heap.c:1020
+#: catalog/heap.c:1028
 msgid ""
 "A relation has an associated type of the same name, so you must use a name "
 "that doesn't conflict with any existing type."
@@ -3397,74 +3023,74 @@ msgstr ""
 "Eine Relation hat einen zugehörigen Typ mit dem selben Namen, daher müssen "
 "Sie einen Namen wählen, der nicht mit einem bestehenden Typ kollidiert."
 
-#: catalog/heap.c:2122
+#: catalog/heap.c:2141
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "Check-Constraint »%s« existiert bereits"
 
-#: catalog/heap.c:2266 catalog/pg_constraint.c:645 commands/tablecmds.c:5302
+#: catalog/heap.c:2287 catalog/pg_constraint.c:645 commands/tablecmds.c:5350
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "Constraint »%s« existiert bereits für Relation »%s«"
 
-#: catalog/heap.c:2270
+#: catalog/heap.c:2291
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "Constraint »%s« wird mit geerbter Definition zusammengeführt"
 
-#: catalog/heap.c:2368
+#: catalog/heap.c:2389
 msgid "cannot use column references in default expression"
 msgstr "Spaltenverweise können nicht in Vorgabeausdrücken verwendet werden"
 
-#: catalog/heap.c:2376
+#: catalog/heap.c:2397
 msgid "default expression must not return a set"
 msgstr "Vorgabeausdruck kann keine Ergebnismenge zurückgeben"
 
-#: catalog/heap.c:2384
+#: catalog/heap.c:2405
 msgid "cannot use subquery in default expression"
 msgstr "Unteranfragen können nicht in Vorgabeausdrücken verwendet werden"
 
-#: catalog/heap.c:2388
+#: catalog/heap.c:2409
 msgid "cannot use aggregate function in default expression"
 msgstr "Aggregatfunktionen können nicht in Vorgabeausdrücken verwendet werden"
 
-#: catalog/heap.c:2392
+#: catalog/heap.c:2413
 msgid "cannot use window function in default expression"
 msgstr "Fensterfunktionen können nicht in Vorgabeausdrücken verwendet werden"
 
-#: catalog/heap.c:2411 rewrite/rewriteHandler.c:992
+#: catalog/heap.c:2432 rewrite/rewriteHandler.c:1030
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "Spalte »%s« hat Typ %s, aber der Vorgabeausdruck hat Typ %s"
 
-#: catalog/heap.c:2416 commands/prepare.c:370 parser/parse_node.c:397
+#: catalog/heap.c:2437 commands/prepare.c:370 parser/parse_node.c:397
 #: parser/parse_target.c:489 parser/parse_target.c:735
-#: parser/parse_target.c:745 rewrite/rewriteHandler.c:997
+#: parser/parse_target.c:745 rewrite/rewriteHandler.c:1035
 msgid "You will need to rewrite or cast the expression."
 msgstr "Sie müssen den Ausdruck umschreiben oder eine Typumwandlung vornehmen."
 
-#: catalog/heap.c:2462
+#: catalog/heap.c:2483
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "nur Verweise auf Tabelle »%s« sind im Check-Constraint zugelassen"
 
-#: catalog/heap.c:2471 commands/typecmds.c:2385
+#: catalog/heap.c:2492 commands/typecmds.c:2386
 msgid "cannot use subquery in check constraint"
 msgstr "Unteranfragen können nicht in Check-Constraints verwendet werden"
 
-#: catalog/heap.c:2475 commands/typecmds.c:2389
+#: catalog/heap.c:2496 commands/typecmds.c:2390
 msgid "cannot use aggregate function in check constraint"
 msgstr "Aggregatfunktionen können nicht in Check-Constraints verwendet werden"
 
-#: catalog/heap.c:2479 commands/typecmds.c:2393
+#: catalog/heap.c:2500 commands/typecmds.c:2394
 msgid "cannot use window function in check constraint"
 msgstr "Fensterfunktionen können nicht in Check-Constraints verwendet werden"
 
-#: catalog/heap.c:2718
+#: catalog/heap.c:2739
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "nicht unterstützte Kombination aus ON COMMIT und Fremdschlüssel"
 
-#: catalog/heap.c:2719
+#: catalog/heap.c:2740
 #, c-format
 msgid ""
 "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
@@ -3473,159 +3099,172 @@ msgstr ""
 "Tabelle »%s« verweist auf »%s«, aber sie haben nicht die gleiche ON-COMMIT-"
 "Einstellung"
 
-#: catalog/heap.c:2724
+#: catalog/heap.c:2745
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr ""
 "kann eine Tabelle, die in einen Fremdschlüssel-Constraint eingebunden ist, "
 "nicht leeren"
 
-#: catalog/heap.c:2725
+#: catalog/heap.c:2746
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "Tabelle »%s« verweist auf »%s«."
 
-#: catalog/heap.c:2727
+#: catalog/heap.c:2748
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr ""
 "Leeren Sie die Tabelle »%s« gleichzeitig oder verwenden Sie TRUNCATE ... "
 "CASCADE."
 
-#: catalog/index.c:200 parser/parse_utilcmd.c:1294 parser/parse_utilcmd.c:1380
+#: catalog/index.c:202 parser/parse_utilcmd.c:1296 parser/parse_utilcmd.c:1382
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "mehrere Primärschlüssel für Tabelle »%s« nicht erlaubt"
 
-#: catalog/index.c:218
+#: catalog/index.c:220
 msgid "primary keys cannot be expressions"
 msgstr "Primärschlüssel können keine Ausdrücke sein"
 
-#: catalog/index.c:728 catalog/index.c:1122
+#: catalog/index.c:730 catalog/index.c:1124
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr ""
 "benutzerdefinierte Indexe für Systemkatalogtabellen werden nicht unterstützt"
 
-#: catalog/index.c:738
+#: catalog/index.c:740
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr ""
 "nebenläufige Indexerzeugung für Systemkatalogtabellen wird nicht unterstützt"
 
-#: catalog/index.c:756
+#: catalog/index.c:758
 msgid "shared indexes cannot be created after initdb"
 msgstr "Cluster-globale Indexe können nicht nach initdb erzeugt werden"
 
-#: catalog/index.c:1719
+#: catalog/index.c:1727
 #, c-format
 msgid "building index \"%s\" on table \"%s\""
 msgstr "baue Index »%s« von Tabelle »%s«"
 
-#: catalog/index.c:2777
+#: catalog/index.c:2800
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht reindizieren"
 
-#: catalog/namespace.c:235 catalog/namespace.c:309 commands/trigger.c:4153
+#: catalog/namespace.c:234 catalog/namespace.c:318 commands/trigger.c:4147
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: »%s.%s.%s«"
 
-#: catalog/namespace.c:253 catalog/namespace.c:320
+#: catalog/namespace.c:260
 msgid "temporary tables cannot specify a schema name"
 msgstr "temporäre Tabellen können keinen Schemanamen angeben"
 
-#: catalog/namespace.c:276 commands/lockcmds.c:122 parser/parse_relation.c:835
+#: catalog/namespace.c:285 commands/lockcmds.c:122 parser/parse_relation.c:835
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "Relation »%s.%s« existiert nicht"
 
-#: catalog/namespace.c:281 commands/lockcmds.c:127 parser/parse_relation.c:848
+#: catalog/namespace.c:290 commands/lockcmds.c:127 parser/parse_relation.c:848
 #: parser/parse_relation.c:856 utils/adt/regproc.c:810
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "Relation »%s« existiert nicht"
 
-#: catalog/namespace.c:355 catalog/namespace.c:2548
+#: catalog/namespace.c:358 catalog/namespace.c:2589
 msgid "no schema has been selected to create in"
 msgstr "kein Schema für die Objekterzeugung ausgewählt"
 
-#: catalog/namespace.c:1865 commands/tsearchcmds.c:319
+#: catalog/namespace.c:410 catalog/namespace.c:423
+msgid "cannot create relations in temporary schemas of other sessions"
+msgstr "kann keine Relationen in temporären Schemas anderer Sitzungen erzeugen"
+
+#: catalog/namespace.c:414
+msgid "cannot create temporary relation in non-temporary schema"
+msgstr ""
+"kann keine temporäre Relation in einem nicht-temporären Schema erzeugen"
+
+#: catalog/namespace.c:429
+msgid "only temporary relations may be created in temporary schemas"
+msgstr "nur temporäre Relationen können in temporären Schemas erzeugt werden"
+
+#: catalog/namespace.c:1906 commands/tsearchcmds.c:320
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "Textsucheparser »%s« existiert nicht"
 
-#: catalog/namespace.c:1988 commands/tsearchcmds.c:768
+#: catalog/namespace.c:2029 commands/tsearchcmds.c:769
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "Textsuchewörterbuch »%s« existiert nicht"
 
-#: catalog/namespace.c:2112 commands/tsearchcmds.c:1303
+#: catalog/namespace.c:2153 commands/tsearchcmds.c:1304
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "Textsuchevorlage »%s« existiert nicht"
 
-#: catalog/namespace.c:2235 commands/tsearchcmds.c:1753
+#: catalog/namespace.c:2276 commands/tsearchcmds.c:1753
 #: commands/tsearchcmds.c:1909
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "Textsuchekonfiguration »%s« existiert nicht"
 
-#: catalog/namespace.c:2348 parser/parse_expr.c:775 parser/parse_target.c:1085
+#: catalog/namespace.c:2389 parser/parse_expr.c:775 parser/parse_target.c:1085
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "Verweise auf andere Datenbanken sind nicht implementiert: %s"
 
-#: catalog/namespace.c:2354 parser/parse_expr.c:782 parser/parse_target.c:1092
-#: gram.y:11615 gram.y:12814
+#: catalog/namespace.c:2395 parser/parse_expr.c:782 parser/parse_target.c:1092
+#: gram.y:11611 gram.y:12810
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "falscher qualifizierter Name (zu viele Namensteile): %s"
 
-#: catalog/namespace.c:2482
+#: catalog/namespace.c:2523
 #, c-format
 msgid "%s is already in schema \"%s\""
 msgstr "%s ist bereits in Schema »%s«"
 
-#: catalog/namespace.c:2490
+#: catalog/namespace.c:2531
 msgid "cannot move objects into or out of temporary schemas"
 msgstr "Objekte können nicht in oder aus temporären Schemas verschoben werden"
 
-#: catalog/namespace.c:2496
+#: catalog/namespace.c:2537
 msgid "cannot move objects into or out of TOAST schema"
 msgstr "Objekte können nicht in oder aus TOAST-Schemas verschoben werden"
 
-#: catalog/namespace.c:2569 catalog/namespace.c:3554 catalog/namespace.c:3557
+#: catalog/namespace.c:2610 catalog/namespace.c:3595 catalog/namespace.c:3598
 #: commands/schemacmds.c:253 commands/schemacmds.c:322
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "Schema »%s« existiert nicht"
 
-#: catalog/namespace.c:2600
+#: catalog/namespace.c:2641
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "falscher Relationsname (zu viele Namensteile): %s"
 
-#: catalog/namespace.c:2999
+#: catalog/namespace.c:3040
 #, c-format
 msgid "collation \"%s\" for encoding \"%s\" does not exist"
 msgstr "Sortierfolge »%s« für Kodierung »%s« existiert nicht"
 
-#: catalog/namespace.c:3051
+#: catalog/namespace.c:3092
 #, c-format
 msgid "conversion \"%s\" does not exist"
 msgstr "Konversion »%s« existiert nicht"
 
-#: catalog/namespace.c:3256
+#: catalog/namespace.c:3297
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr ""
 "keine Berechtigung, um temporäre Tabellen in Datenbank »%s« zu erzeugen"
 
-#: catalog/namespace.c:3272
+#: catalog/namespace.c:3313
 msgid "cannot create temporary tables during recovery"
 msgstr ""
 "während der Wiederherstellung können keine temporäre Tabellen erzeugt werden"
 
-#: catalog/namespace.c:3516 commands/tablespace.c:1121 commands/variable.c:59
-#: replication/syncrep.c:657 utils/misc/guc.c:8151
+#: catalog/namespace.c:3557 commands/tablespace.c:1121 commands/variable.c:59
+#: replication/syncrep.c:656 utils/misc/guc.c:8181
 msgid "List syntax is invalid."
 msgstr "Die Listensyntax ist ungültig."
 
@@ -3633,8 +3272,8 @@ msgstr "Die Listensyntax ist ungültig."
 msgid "database name cannot be qualified"
 msgstr "Datenbankname kann nicht qualifiziert werden"
 
-#: catalog/objectaddress.c:289 commands/extension.c:1585
-#: commands/extension.c:2245
+#: catalog/objectaddress.c:289 commands/extension.c:1596
+#: commands/extension.c:2273
 msgid "extension name cannot be qualified"
 msgstr "Erweiterungsname kann nicht qualifiziert werden"
 
@@ -3662,45 +3301,45 @@ msgstr "Fremddaten-Wrapper-Name kann nicht qualifiziert werden"
 msgid "server name cannot be qualified"
 msgstr "Servername kann nicht qualifiziert werden"
 
-#: catalog/objectaddress.c:405 catalog/toasting.c:91 commands/indexcmds.c:199
-#: commands/indexcmds.c:1573 commands/lockcmds.c:149 commands/tablecmds.c:201
-#: commands/tablecmds.c:1119 commands/tablecmds.c:2468
-#: commands/tablecmds.c:3778
+#: catalog/objectaddress.c:405 catalog/toasting.c:93 commands/indexcmds.c:200
+#: commands/indexcmds.c:1574 commands/lockcmds.c:149 commands/tablecmds.c:202
+#: commands/tablecmds.c:1129 commands/tablecmds.c:2478
+#: commands/tablecmds.c:3825 commands/tablecmds.c:6773
 #, c-format
 msgid "\"%s\" is not a table"
 msgstr "»%s« ist keine Tabelle"
 
-#: catalog/objectaddress.c:412 commands/tablecmds.c:213
-#: commands/tablecmds.c:2243 commands/tablecmds.c:2500
-#: commands/tablecmds.c:3793 commands/tablecmds.c:8920 commands/view.c:182
+#: catalog/objectaddress.c:412 commands/tablecmds.c:214
+#: commands/tablecmds.c:2253 commands/tablecmds.c:2510
+#: commands/tablecmds.c:3840 commands/tablecmds.c:8990 commands/view.c:181
 #, c-format
 msgid "\"%s\" is not a view"
 msgstr "»%s« ist keine Sicht"
 
-#: catalog/objectaddress.c:419 commands/tablecmds.c:231
-#: commands/tablecmds.c:2249 commands/tablecmds.c:2508
-#: commands/tablecmds.c:3796 commands/tablecmds.c:8928
+#: catalog/objectaddress.c:419 commands/tablecmds.c:232
+#: commands/tablecmds.c:2259 commands/tablecmds.c:2518
+#: commands/tablecmds.c:3843 commands/tablecmds.c:8998
 #, c-format
 msgid "\"%s\" is not a foreign table"
 msgstr "»%s« ist keine Fremdtabelle"
 
-#: catalog/objectaddress.c:819 catalog/pg_largeobject.c:200
+#: catalog/objectaddress.c:824 catalog/pg_largeobject.c:200
 #: libpq/be-fsstubs.c:287
 #, c-format
 msgid "must be owner of large object %u"
 msgstr "Berechtigung nur für Eigentümer des Large Object %u"
 
-#: catalog/objectaddress.c:834 commands/functioncmds.c:1525
+#: catalog/objectaddress.c:839 commands/functioncmds.c:1526
 #: commands/functioncmds.c:1814
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr "Berechtigung nur für Eigentümer des Typs %s oder des Typs %s"
 
-#: catalog/objectaddress.c:865 catalog/objectaddress.c:881
+#: catalog/objectaddress.c:870 catalog/objectaddress.c:886
 msgid "must be superuser"
 msgstr "Berechtigung nur für Superuser"
 
-#: catalog/objectaddress.c:872
+#: catalog/objectaddress.c:877
 msgid "must have CREATEROLE privilege"
 msgstr "Berechtigung nur mit CREATEROLE-Privileg"
 
@@ -3777,7 +3416,7 @@ msgstr "Funktion %s gibt eine Ergebnismenge zurück"
 msgid "function %s requires run-time type coercion"
 msgstr "Funktion %s erfordert Typumwandlung zur Laufzeit"
 
-#: catalog/pg_constraint.c:654 commands/typecmds.c:2320
+#: catalog/pg_constraint.c:654 commands/typecmds.c:2321
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "Constraint »%s« für Domäne »%s« existiert bereits"
@@ -3802,7 +3441,12 @@ msgstr "Konversion »%s« existiert bereits"
 msgid "default conversion for %s to %s already exists"
 msgstr "Standardumwandlung von %s nach %s existiert bereits"
 
-#: catalog/pg_depend.c:293
+#: catalog/pg_depend.c:164 commands/extension.c:2753
+#, c-format
+msgid "%s is already a member of extension \"%s\""
+msgstr "%s ist schon Mitglied der Erweiterung »%s«"
+
+#: catalog/pg_depend.c:323
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "kann Abhängigkeit von %s nicht entfernen, weil es ein Systemobjekt ist"
@@ -3824,7 +3468,7 @@ msgstr "»%s« ist kein existierendes Enum-Label"
 
 #: catalog/pg_enum.c:325
 msgid "ALTER TYPE ADD BEFORE/AFTER is incompatible with binary upgrade"
-msgstr ""
+msgstr "ALTER TYPE ADD BEFORE/AFTER ist mit Binary Upgrade inkompatibel"
 
 #: catalog/pg_namespace.c:52 commands/schemacmds.c:259
 #, c-format
@@ -3952,22 +3596,22 @@ msgstr "Funktion %s ist eine Fensterfunktion"
 msgid "function \"%s\" is not a window function"
 msgstr "Funktion »%s« ist keine Fensterfunktion"
 
-#: catalog/pg_proc.c:695
+#: catalog/pg_proc.c:698
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "es gibt keine eingebaute Funktion namens %s"
 
-#: catalog/pg_proc.c:787
+#: catalog/pg_proc.c:790
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "SQL-Funktionen können keinen Rückgabetyp »%s« haben"
 
-#: catalog/pg_proc.c:802
+#: catalog/pg_proc.c:805
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL-Funktionen können keine Argumente vom Typ »%s« haben"
 
-#: catalog/pg_proc.c:888 executor/functions.c:1162
+#: catalog/pg_proc.c:891 executor/functions.c:1162
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "SQL-Funktion »%s«"
@@ -4020,7 +3664,7 @@ msgid_plural "%d objects in %s"
 msgstr[0] "%d Objekt in %s"
 msgstr[1] "%d Objekte in %s"
 
-#: catalog/pg_shdepend.c:1191 catalog/pg_shdepend.c:1287
+#: catalog/pg_shdepend.c:1191
 #, c-format
 msgid ""
 "cannot drop objects owned by %s because they are required by the database "
@@ -4029,6 +3673,15 @@ msgstr ""
 "kann Objekte, die %s gehören, nicht löschen, weil sie vom Datenbanksystem "
 "benötigt werden"
 
+#: catalog/pg_shdepend.c:1287
+#, c-format
+msgid ""
+"cannot reassign ownership of objects owned by %s because they are required "
+"by the database system"
+msgstr ""
+"kann den Eigentümer von den Objekten, die %s gehören, nicht ändern, weil die "
+"Objekte vom Datenbanksystem benötigt werden"
+
 #: catalog/pg_type.c:241
 #, c-format
 msgid "invalid type internal size %d"
@@ -4054,48 +3707,30 @@ msgstr "Ausrichtung »%c« ist ungültig für Typen variabler Länge"
 msgid "fixed-size types must have storage PLAIN"
 msgstr "Typen mit fester Größe müssen Storage-Typ PLAIN haben"
 
-#: catalog/pg_type.c:761
+#: catalog/pg_type.c:764
 #, c-format
 msgid "could not form array type name for type \"%s\""
 msgstr "konnte keinen Arraytypnamen für Datentyp »%s« erzeugen"
 
-#: catalog/toasting.c:142
+#: catalog/toasting.c:144
 msgid "shared tables cannot be toasted after initdb"
 msgstr ""
 "Cluster-globale Tabellen können nach initdb nicht mehr getoastet werden"
 
-#: commands/collationcmds.c:81
+#: catalog/pg_collation.c:75
 #, c-format
-msgid "collation attribute \"%s\" not recognized"
-msgstr "Attribut »%s« für Sortierfolge unbekannt"
-
-#: commands/collationcmds.c:126
-msgid "parameter \"lc_collate\" parameter must be specified"
-msgstr "Parameter »lc_collate« muss angegeben werden"
-
-#: commands/collationcmds.c:131
-msgid "parameter \"lc_ctype\" must be specified"
-msgstr "Parameter »lc_ctype« muss angegeben werden"
+msgid "collation \"%s\" for encoding \"%s\" already exists"
+msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits"
 
-#: commands/collationcmds.c:177
+#: catalog/pg_collation.c:89
 #, c-format
-msgid "collation \"%s\" does not exist, skipping"
-msgstr "Sortierfolge »%s« existiert nicht, wird übersprungen"
+msgid "collation \"%s\" already exists"
+msgstr "Sortierfolge »%s« existiert bereits"
 
-#: commands/collationcmds.c:237 commands/collationcmds.c:416
+#: commands/aggregatecmds.c:103
 #, c-format
-msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
-msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits in Schema »%s«"
-
-#: commands/collationcmds.c:249 commands/collationcmds.c:428
-#, c-format
-msgid "collation \"%s\" already exists in schema \"%s\""
-msgstr "Sortierfolge »%s« existiert bereits in Schema »%s«"
-
-#: commands/aggregatecmds.c:103
-#, c-format
-msgid "aggregate attribute \"%s\" not recognized"
-msgstr "Attribut »%s« für Aggregatfunktion unbekannt"
+msgid "aggregate attribute \"%s\" not recognized"
+msgstr "Attribut »%s« für Aggregatfunktion unbekannt"
 
 #: commands/aggregatecmds.c:113
 msgid "aggregate stype must be specified"
@@ -4131,60 +3766,62 @@ msgid "function %s already exists in schema \"%s\""
 msgstr "Funktion %s existiert bereits in Schema »%s«"
 
 #: commands/alter.c:423
-#, fuzzy, c-format
-msgid "must be superuser to SET SCHEMA of %s"
-msgstr "nur Superuser können Dateien lesen"
+#, c-format
+msgid "must be superuser to set schema of %s"
+msgstr "nur Superuser können Schema von %s setzen"
 
 #: commands/alter.c:451
 #, c-format
 msgid "%s already exists in schema \"%s\""
 msgstr "%s existiert bereits in Schema »%s«"
 
-#: commands/analyze.c:163
+#: commands/analyze.c:153
 #, c-format
 msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr "überspringe Analyze von »%s« --- Sperre nicht verfügbar"
 
-#: commands/analyze.c:180
+#: commands/analyze.c:170
 #, c-format
 msgid "skipping \"%s\" --- only superuser can analyze it"
 msgstr "überspringe »%s« --- nur Superuser kann sie analysieren"
 
-#: commands/analyze.c:184
+#: commands/analyze.c:174
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
 msgstr ""
 "überspringe »%s« --- nur Superuser oder Eigentümer der Datenbank kann sie "
 "analysieren"
 
-#: commands/analyze.c:188
+#: commands/analyze.c:178
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can analyze it"
 msgstr ""
 "überspringe »%s« --- nur Eigentümer der Tabelle oder der Datenbank kann sie "
 "analysieren"
 
-#: commands/analyze.c:204
+#: commands/analyze.c:194
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
-msgstr "überspringe »%s« --- kann Nicht-Tabellen oder besondere Systemtabellen nicht analysieren"
+msgstr ""
+"überspringe »%s« --- kann Nicht-Tabellen oder besondere Systemtabellen nicht "
+"analysieren"
 
-#: commands/analyze.c:297
+#: commands/analyze.c:285
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "analysiere Vererbungsbaum von »%s.%s«"
 
-#: commands/analyze.c:302
+#: commands/analyze.c:290
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "analysiere »%s.%s«"
 
-#: commands/analyze.c:623
+#: commands/analyze.c:598
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
 msgstr "automatisches Analysieren von Tabelle »%s.%s.%s« Systembenutzung: %s"
 
-#: commands/analyze.c:1263
+#: commands/analyze.c:1238
 #, c-format
 msgid ""
 "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
@@ -4193,7 +3830,7 @@ msgstr ""
 "»%s«: %d von %u Seiten gelesen, enthalten %.0f lebende Zeilen und %.0f tote "
 "Zeilen; %d Zeilen in Stichprobe, schätzungsweise %.0f Zeilen insgesamt"
 
-#: commands/analyze.c:1524 executor/execQual.c:2734
+#: commands/analyze.c:1499 executor/execQual.c:2734
 msgid "could not convert row type"
 msgstr "konnte Zeilentyp nicht umwandeln"
 
@@ -4220,19 +3857,19 @@ msgstr ""
 msgid "too many notifications in the NOTIFY queue"
 msgstr "zu viele Benachrichtigungen in NOTIFY-Schlange"
 
-#: commands/async.c:1421
+#: commands/async.c:1430
 #, c-format
 msgid "NOTIFY queue is %.0f%% full"
 msgstr "NOTIFY-Schlange ist %.0f%% voll"
 
-#: commands/async.c:1423
+#: commands/async.c:1432
 #, c-format
 msgid ""
 "The server process with PID %d is among those with the oldest transactions."
 msgstr ""
 "Der Serverprozess mit PID %d gehört zu denen mit den ältesten Transaktionen."
 
-#: commands/async.c:1426
+#: commands/async.c:1435
 msgid ""
 "The NOTIFY queue cannot be emptied until that process ends its current "
 "transaction."
@@ -4240,34 +3877,34 @@ msgstr ""
 "Die NOTIFY-Schlange kann erst geleert werden, wenn dieser Prozess seine "
 "aktuelle Transaktion beendet."
 
-#: commands/cluster.c:133 commands/cluster.c:371
+#: commands/cluster.c:134 commands/cluster.c:372
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht clustern"
 
-#: commands/cluster.c:163
+#: commands/cluster.c:164
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "es gibt keinen bereits geclusterten Index für Tabelle »%s«"
 
-#: commands/cluster.c:177 commands/tablecmds.c:7602
+#: commands/cluster.c:178 commands/tablecmds.c:7673
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "Index »%s« für Tabelle »%s« existiert nicht"
 
-#: commands/cluster.c:360
+#: commands/cluster.c:361
 msgid "cannot cluster a shared catalog"
 msgstr "globaler Katalog kann nicht geclustert werden"
 
-#: commands/cluster.c:375
+#: commands/cluster.c:376
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "temporäre Tabellen anderer Sitzungen können nicht gevacuumt werden"
 
-#: commands/cluster.c:417
+#: commands/cluster.c:426
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "»%s« ist kein Index für Tabelle »%s«"
 
-#: commands/cluster.c:425
+#: commands/cluster.c:434
 #, c-format
 msgid ""
 "cannot cluster on index \"%s\" because access method does not support "
@@ -4276,32 +3913,32 @@ msgstr ""
 "kann nicht anhand des Index »%s« clustern, weil die Indexmethode Clustern "
 "nicht unterstützt"
 
-#: commands/cluster.c:437
+#: commands/cluster.c:446
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "kann nicht anhand des partiellen Index »%s« clustern"
 
-#: commands/cluster.c:451
+#: commands/cluster.c:460
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "kann nicht anhand des ungültigen Index »%s« clustern"
 
-#: commands/cluster.c:870
+#: commands/cluster.c:883
 #, c-format
 msgid "clustering \"%s.%s\" using index scan on \"%s\""
 msgstr "clustere »%s.%s« durch Index-Scan von »%s«"
 
-#: commands/cluster.c:876
+#: commands/cluster.c:889
 #, c-format
 msgid "clustering \"%s.%s\" using sequential scan and sort"
 msgstr "clustere »%s.%s« durch sequenziellen Scan und Sortieren"
 
-#: commands/cluster.c:881 commands/vacuumlazy.c:320
+#: commands/cluster.c:894 commands/vacuumlazy.c:339
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "vacuume »%s.%s«"
 
-#: commands/cluster.c:1041
+#: commands/cluster.c:1054
 #, c-format
 msgid ""
 "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
@@ -4309,18 +3946,20 @@ msgstr ""
 "»%s«: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u Seiten "
 "gefunden"
 
-#: commands/cluster.c:1045
+#: commands/cluster.c:1058
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
 "%s."
 msgstr ""
+"%.0f tote Zeilenversionen können noch nicht entfernt werden.\n"
+"%s."
 
 #: commands/comment.c:60 commands/dbcommands.c:764 commands/dbcommands.c:909
 #: commands/dbcommands.c:1008 commands/dbcommands.c:1181
 #: commands/dbcommands.c:1366 commands/dbcommands.c:1451
-#: commands/dbcommands.c:1854 utils/init/postinit.c:707
-#: utils/init/postinit.c:775 utils/init/postinit.c:792
+#: commands/dbcommands.c:1854 utils/init/postinit.c:709
+#: utils/init/postinit.c:777 utils/init/postinit.c:794
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "Datenbank »%s« existiert nicht"
@@ -4330,17 +3969,17 @@ msgstr "Datenbank »%s« existiert nicht"
 msgid "\"%s\" is not a table, view, composite type, or foreign table"
 msgstr "»%s« ist weder Tabelle, Sicht, zusammengesetzter Typ noch Fremdtabelle"
 
-#: commands/constraint.c:59 utils/adt/ri_triggers.c:3082
+#: commands/constraint.c:59 utils/adt/ri_triggers.c:3080
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "Funktion »%s« wurde nicht von Triggermanager aufgerufen"
 
-#: commands/constraint.c:66 utils/adt/ri_triggers.c:3091
+#: commands/constraint.c:66 utils/adt/ri_triggers.c:3089
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "Funktion »%s« muss AFTER ROW ausgelöst werden"
 
-#: commands/constraint.c:80 utils/adt/ri_triggers.c:3112
+#: commands/constraint.c:80 utils/adt/ri_triggers.c:3110
 #, c-format
 msgid "function \"%s\" must be fired for INSERT or UPDATE"
 msgstr "Funktion »%s« muss von INSERT oder UPDATE ausgelöst werden"
@@ -4664,7 +4303,7 @@ msgstr "fehlende Daten für Spalte »%s«"
 
 #: commands/copy.c:2476
 msgid "received copy data after EOF marker"
-msgstr ""
+msgstr "COPY-Daten nach EOF-Markierung empfangen"
 
 #: commands/copy.c:2483
 #, c-format
@@ -4730,14 +4369,14 @@ msgstr "ungültige Feldgröße"
 msgid "incorrect binary data format"
 msgstr "falsches Binärdatenformat"
 
-#: commands/copy.c:3779 commands/indexcmds.c:845 commands/tablecmds.c:1283
-#: commands/tablecmds.c:2138 parser/parse_expr.c:764
-#: utils/adt/tsvector_op.c:1393
+#: commands/copy.c:3779 commands/indexcmds.c:846 commands/tablecmds.c:1293
+#: commands/tablecmds.c:2148 parser/parse_expr.c:764
+#: utils/adt/tsvector_op.c:1417
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "Spalte »%s« existiert nicht"
 
-#: commands/copy.c:3786 commands/tablecmds.c:1309 commands/trigger.c:599
+#: commands/copy.c:3786 commands/tablecmds.c:1319 commands/trigger.c:594
 #: parser/parse_target.c:911 parser/parse_target.c:922
 #, c-format
 msgid "column \"%s\" specified more than once"
@@ -5022,68 +4661,70 @@ msgstr "Option »%s« nicht gefunden"
 msgid "option \"%s\" provided more than once"
 msgstr "Option »%s« mehrmals angegeben"
 
-#: commands/foreigncmds.c:212 commands/foreigncmds.c:220
+#: commands/foreigncmds.c:224 commands/foreigncmds.c:232
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr ""
 "keine Berechtigung, um Eigentümer des Fremddaten-Wrappers »%s« zu ändern"
 
-#: commands/foreigncmds.c:214
+#: commands/foreigncmds.c:226
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr "Nur Superuser können den Eigentümer eines Fremddaten-Wrappers ändern."
 
-#: commands/foreigncmds.c:222
+#: commands/foreigncmds.c:234
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "Der Eigentümer eines Fremddaten-Wrappers muss ein Superuser sein."
 
-#: commands/foreigncmds.c:231 commands/foreigncmds.c:552
-#: commands/foreigncmds.c:703 foreign/foreign.c:515
+#: commands/foreigncmds.c:241 commands/foreigncmds.c:564
+#: commands/foreigncmds.c:712 foreign/foreign.c:524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "Fremddaten-Wrapper »%s« existiert nicht"
 
-#: commands/foreigncmds.c:274 commands/foreigncmds.c:879
-#: commands/foreigncmds.c:970 commands/foreigncmds.c:1255
-#: foreign/foreign.c:535
+#: commands/foreigncmds.c:284 commands/foreigncmds.c:890
+#: commands/foreigncmds.c:978 commands/foreigncmds.c:1262
+#: foreign/foreign.c:544
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "Server »%s« existiert nicht"
 
-#: commands/foreigncmds.c:336
+#: commands/foreigncmds.c:346
 #, c-format
 msgid "function %s must return type \"fdw_handler\""
 msgstr "Funktion %s muss Typ »fdw_handler« zurückgeben"
 
-#: commands/foreigncmds.c:429
+#: commands/foreigncmds.c:441
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu erzeugen"
 
-#: commands/foreigncmds.c:431
+#: commands/foreigncmds.c:443
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Nur Superuser können Fremddaten-Wrapper anlegen."
 
-#: commands/foreigncmds.c:442
+#: commands/foreigncmds.c:454
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "Fremddaten-Wrapper »%s« existiert bereits"
 
-#: commands/foreigncmds.c:542
+#: commands/foreigncmds.c:554
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu ändern"
 
-#: commands/foreigncmds.c:544
+#: commands/foreigncmds.c:556
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Nur Superuser können Fremddaten-Wrapper ändern."
 
-#: commands/foreigncmds.c:575
+#: commands/foreigncmds.c:587
 msgid ""
 "changing the foreign-data wrapper handler can change behavior of existing "
 "foreign tables"
-msgstr "das Ändern des Handlers des Fremddaten-Wrappers kann das Verhalten von bestehenden Fremdtabellen verändern"
+msgstr ""
+"das Ändern des Handlers des Fremddaten-Wrappers kann das Verhalten von "
+"bestehenden Fremdtabellen verändern"
 
-#: commands/foreigncmds.c:589
+#: commands/foreigncmds.c:601
 msgid ""
 "changing the foreign-data wrapper validator can cause the options for "
 "dependent objects to become invalid"
@@ -5091,45 +4732,45 @@ msgstr ""
 "durch Ändern des Validators des Fremddaten-Wrappers können die Optionen von "
 "abhängigen Objekten ungültig werden"
 
-#: commands/foreigncmds.c:694
+#: commands/foreigncmds.c:703
 #, c-format
 msgid "permission denied to drop foreign-data wrapper \"%s\""
 msgstr "keine Berechtigung, um Fremddaten-Wrapper »%s« zu löschen"
 
-#: commands/foreigncmds.c:696
+#: commands/foreigncmds.c:705
 msgid "Must be superuser to drop a foreign-data wrapper."
 msgstr "Nur Superuser können Fremddaten-Wrapper löschen."
 
-#: commands/foreigncmds.c:708
+#: commands/foreigncmds.c:717
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "Fremddaten-Wrapper »%s« existiert nicht, wird übersprungen"
 
-#: commands/foreigncmds.c:775
+#: commands/foreigncmds.c:786
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "Server »%s« existiert bereits"
 
-#: commands/foreigncmds.c:974
+#: commands/foreigncmds.c:982
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "Server »%s« existiert nicht, wird übersprungen"
 
-#: commands/foreigncmds.c:1077
+#: commands/foreigncmds.c:1087
 #, c-format
 msgid "user mapping \"%s\" already exists for server %s"
 msgstr "Benutzerabbildung »%s« existiert bereits für Server »%s«"
 
-#: commands/foreigncmds.c:1163 commands/foreigncmds.c:1271
+#: commands/foreigncmds.c:1173 commands/foreigncmds.c:1278
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server"
 msgstr "Benutzerabbildung »%s« existiert für den Server nicht"
 
-#: commands/foreigncmds.c:1258
+#: commands/foreigncmds.c:1265
 msgid "server does not exist, skipping"
 msgstr "Server existiert nicht, wird übersprungen"
 
-#: commands/foreigncmds.c:1276
+#: commands/foreigncmds.c:1283
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server, skipping"
 msgstr ""
@@ -5145,8 +4786,8 @@ msgstr "SQL-Funktion kann keinen Hüllen-Rückgabetyp %s haben"
 msgid "return type %s is only a shell"
 msgstr "Rückgabetyp %s ist nur eine Hülle"
 
-#: commands/functioncmds.c:128 commands/tablecmds.c:223
-#: commands/typecmds.c:660 commands/typecmds.c:2660 parser/parse_func.c:1502
+#: commands/functioncmds.c:128 commands/tablecmds.c:224
+#: commands/typecmds.c:660 commands/typecmds.c:2661 parser/parse_func.c:1502
 #: parser/parse_type.c:196 utils/adt/regproc.c:973
 #, c-format
 msgid "type \"%s\" does not exist"
@@ -5254,7 +4895,7 @@ msgid "only one AS item needed for language \"%s\""
 msgstr "nur ein AS-Element benötigt für Sprache »%s«"
 
 #: commands/functioncmds.c:839 commands/functioncmds.c:2019
-#: commands/proclang.c:602 commands/proclang.c:642 commands/proclang.c:756
+#: commands/proclang.c:600 commands/proclang.c:640 commands/proclang.c:754
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "Sprache »%s« existiert nicht"
@@ -5286,7 +4927,7 @@ msgstr "Funktion %s(%s) existiert nicht, wird übersprungen"
 
 #: commands/functioncmds.c:1008 commands/functioncmds.c:1108
 #: commands/functioncmds.c:1171 commands/functioncmds.c:1322
-#: utils/adt/ruleutils.c:1694
+#: utils/adt/ruleutils.c:1696
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "»%s« ist eine Aggregatfunktion"
@@ -5310,21 +4951,21 @@ msgstr ""
 "Verwenden Sie ALTER AGGREGATE, um den Eigentümer einer Aggregatfunktion zu "
 "ändern."
 
-#: commands/functioncmds.c:1511
+#: commands/functioncmds.c:1512
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "Quelldatentyp %s ist ein Pseudotyp."
 
-#: commands/functioncmds.c:1517
+#: commands/functioncmds.c:1518
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "Zieldatentyp %s ist ein Pseudotyp"
 
-#: commands/functioncmds.c:1554
+#: commands/functioncmds.c:1555
 msgid "cast function must take one to three arguments"
 msgstr "Typumwandlungsfunktion muss ein bis drei Argumente haben"
 
-#: commands/functioncmds.c:1558
+#: commands/functioncmds.c:1559
 msgid ""
 "argument of cast function must match or be binary-coercible from source data "
 "type"
@@ -5332,15 +4973,15 @@ msgstr ""
 "Argument der Typumwandlungsfunktion muss mit Quelldatentyp übereinstimmen "
 "oder in ihn binär-umwandelbar sein"
 
-#: commands/functioncmds.c:1562
+#: commands/functioncmds.c:1563
 msgid "second argument of cast function must be type integer"
 msgstr "zweites Argument der Typumwandlungsfunktion muss Typ integer haben"
 
-#: commands/functioncmds.c:1566
+#: commands/functioncmds.c:1567
 msgid "third argument of cast function must be type boolean"
 msgstr "drittes Argument der Typumwandlungsfunktion muss Typ boolean haben"
 
-#: commands/functioncmds.c:1570
+#: commands/functioncmds.c:1571
 msgid ""
 "return data type of cast function must match or be binary-coercible to "
 "target data type"
@@ -5348,51 +4989,51 @@ msgstr ""
 "Rückgabetyp der Typumwandlungsfunktion muss mit Zieldatentyp übereinstimmen "
 "oder in ihn binär-umwandelbar sein"
 
-#: commands/functioncmds.c:1581
+#: commands/functioncmds.c:1582
 msgid "cast function must not be volatile"
 msgstr "Typumwandlungsfunktion darf nicht VOLATILE sein"
 
-#: commands/functioncmds.c:1586
+#: commands/functioncmds.c:1587
 msgid "cast function must not be an aggregate function"
 msgstr "Typumwandlungsfunktion darf keine Aggregatfunktion sein"
 
-#: commands/functioncmds.c:1590
+#: commands/functioncmds.c:1591
 msgid "cast function must not be a window function"
 msgstr "Typumwandlungsfunktion darf keine Fensterfunktion sein"
 
-#: commands/functioncmds.c:1594
+#: commands/functioncmds.c:1595
 msgid "cast function must not return a set"
 msgstr "Typumwandlungsfunktion darf keine Ergebnismenge zurückgeben"
 
-#: commands/functioncmds.c:1620
+#: commands/functioncmds.c:1621
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "nur Superuser können Typumwandlungen mit WITHOUT FUNCTION erzeugen"
 
-#: commands/functioncmds.c:1635
+#: commands/functioncmds.c:1636
 msgid "source and target data types are not physically compatible"
 msgstr "Quelldatentyp und Zieldatentyp sind nicht physikalisch kompatibel"
 
-#: commands/functioncmds.c:1650
+#: commands/functioncmds.c:1651
 msgid "composite data types are not binary-compatible"
 msgstr "zusammengesetzte Datentypen sind nicht binärkompatibel"
 
-#: commands/functioncmds.c:1656
+#: commands/functioncmds.c:1657
 msgid "enum data types are not binary-compatible"
 msgstr "Enum-Datentypen sind nicht binärkompatibel"
 
-#: commands/functioncmds.c:1662
+#: commands/functioncmds.c:1663
 msgid "array data types are not binary-compatible"
 msgstr "Array-Datentypen sind nicht binärkompatibel"
 
-#: commands/functioncmds.c:1679
+#: commands/functioncmds.c:1680
 msgid "domain data types must not be marked binary-compatible"
 msgstr "Domänendatentypen dürfen nicht als binärkompatibel markiert werden"
 
-#: commands/functioncmds.c:1689
+#: commands/functioncmds.c:1690
 msgid "source data type and target data type are the same"
 msgstr "Quelldatentyp und Zieldatentyp sind der selbe"
 
-#: commands/functioncmds.c:1722
+#: commands/functioncmds.c:1723
 #, c-format
 msgid "cast from type %s to type %s already exists"
 msgstr "Typumwandlung von Typ %s in Typ %s existiert bereits"
@@ -5430,105 +5071,106 @@ msgstr "mindestens eine Spalte muss angegeben werden"
 msgid "cannot use more than %d columns in an index"
 msgstr "Index kann nicht mehr als %d Spalten enthalten"
 
-#: commands/indexcmds.c:194
+#: commands/indexcmds.c:195
 #, c-format
 msgid "cannot create index on foreign table \"%s\""
 msgstr "kann keinen Index für Fremdtabelle »%s« erzeugen"
 
-#: commands/indexcmds.c:209
+#: commands/indexcmds.c:210
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "kann keine Indexe für temporäre Tabellen anderer Sitzungen erzeugen"
 
-#: commands/indexcmds.c:264 commands/tablecmds.c:477 commands/tablecmds.c:7825
+#: commands/indexcmds.c:265 commands/tablecmds.c:479 commands/tablecmds.c:7896
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr ""
 "nur geteilte Relationen können in den Tablespace »pg_global« gelegt werden"
 
-#: commands/indexcmds.c:295
+#: commands/indexcmds.c:296
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "ersetze Zugriffsmethode »gist« für obsolete Methode »rtree«"
 
-#: commands/indexcmds.c:303 commands/opclasscmds.c:369
-#: commands/opclasscmds.c:790 commands/opclasscmds.c:2203
+#: commands/indexcmds.c:304 commands/opclasscmds.c:369
+#: commands/opclasscmds.c:790 commands/opclasscmds.c:2202
 #, c-format
 msgid "access method \"%s\" does not exist"
 msgstr "Zugriffsmethode »%s« existiert nicht"
 
-#: commands/indexcmds.c:312
+#: commands/indexcmds.c:313
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "Zugriffsmethode »%s« unterstützt keine Unique Indexe"
 
-#: commands/indexcmds.c:317
+#: commands/indexcmds.c:318
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "Zugriffsmethode »%s« unterstützt keine mehrspaltigen Indexe"
 
-#: commands/indexcmds.c:322
+#: commands/indexcmds.c:323
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "Zugriffsmethode »%s« unterstützt keine Exclusion-Constraints"
 
-#: commands/indexcmds.c:398
+#: commands/indexcmds.c:399
 #, c-format
 msgid "%s %s will create implicit index \"%s\" for table \"%s\""
 msgstr "%s %s erstellt implizit einen Index »%s« für Tabelle »%s«"
 
-#: commands/indexcmds.c:762
+#: commands/indexcmds.c:763
 msgid "cannot use subquery in index predicate"
 msgstr "Unteranfragen können nicht im Indexprädikat verwendet werden"
 
-#: commands/indexcmds.c:766
+#: commands/indexcmds.c:767
 msgid "cannot use aggregate in index predicate"
 msgstr "Aggregatfunktionen können nicht im Indexprädikat verwendet werden"
 
-#: commands/indexcmds.c:775
+#: commands/indexcmds.c:776
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "Funktionen im Indexprädikat müssen als IMMUTABLE markiert sein"
 
-#: commands/indexcmds.c:840 parser/parse_utilcmd.c:1702
+#: commands/indexcmds.c:841 parser/parse_utilcmd.c:1704
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr "Spalte »%s«, die im Schlüssel verwendet wird, existiert nicht"
 
-#: commands/indexcmds.c:893
+#: commands/indexcmds.c:894
 msgid "cannot use subquery in index expression"
 msgstr "Unteranfragen können nicht in Indexausdrücken verwendet werden"
 
-#: commands/indexcmds.c:897
+#: commands/indexcmds.c:898
 msgid "cannot use aggregate function in index expression"
 msgstr "Aggregatfunktionen können nicht in Indexausdrücken verwendet werden"
 
-#: commands/indexcmds.c:908
+#: commands/indexcmds.c:909
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr "Funktionen im Indexausdruck müssen als IMMUTABLE markiert sein"
 
-#: commands/indexcmds.c:929
+#: commands/indexcmds.c:930
 msgid "could not determine which collation to use for index expression"
-msgstr "konnte die für den Indexausdruck zu verwendende Sortierfolge nicht bestimmen"
+msgstr ""
+"konnte die für den Indexausdruck zu verwendende Sortierfolge nicht bestimmen"
 
-#: commands/indexcmds.c:937 commands/typecmds.c:843 parser/parse_expr.c:2140
-#: parser/parse_type.c:492 parser/parse_utilcmd.c:2553
+#: commands/indexcmds.c:938 commands/typecmds.c:843 parser/parse_expr.c:2150
+#: parser/parse_type.c:492 parser/parse_utilcmd.c:2556
 #, c-format
 msgid "collations are not supported by type %s"
 msgstr "Sortierfolgen werden von Typ %s nicht unterstützt"
 
-#: commands/indexcmds.c:975
+#: commands/indexcmds.c:976
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "Operator %s ist nicht kommutativ"
 
-#: commands/indexcmds.c:977
+#: commands/indexcmds.c:978
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr ""
 "In Exclusion-Constraints können nur kommutative Operatoren verwendet werden."
 
-#: commands/indexcmds.c:1003
+#: commands/indexcmds.c:1004
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "Operator %s ist kein Mitglied der Operatorfamilie »%s«"
 
-#: commands/indexcmds.c:1006
+#: commands/indexcmds.c:1007
 msgid ""
 "The exclusion operator must be related to the index operator class for the "
 "constraint."
@@ -5536,22 +5178,22 @@ msgstr ""
 "Der Exklusionsoperator muss in Beziehung zur Indexoperatorklasse des "
 "Constraints stehen."
 
-#: commands/indexcmds.c:1041
+#: commands/indexcmds.c:1042
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "Zugriffsmethode »%s« unterstützt die Optionen ASC/DESC nicht"
 
-#: commands/indexcmds.c:1046
+#: commands/indexcmds.c:1047
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "Zugriffsmethode »%s« unterstützt die Optionen NULLS FIRST/LAST nicht"
 
-#: commands/indexcmds.c:1102
+#: commands/indexcmds.c:1103
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr "Datentyp %s hat keine Standardoperatorklasse für Zugriffsmethode »%s«"
 
-#: commands/indexcmds.c:1104
+#: commands/indexcmds.c:1105
 msgid ""
 "You must specify an operator class for the index or define a default "
 "operator class for the data type."
@@ -5559,32 +5201,32 @@ msgstr ""
 "Sie müssen für den Index eine Operatorklasse angeben oder eine "
 "Standardoperatorklasse für den Datentyp definieren."
 
-#: commands/indexcmds.c:1133 commands/indexcmds.c:1141
+#: commands/indexcmds.c:1134 commands/indexcmds.c:1142
 #: commands/opclasscmds.c:212 commands/opclasscmds.c:1568
 #, c-format
 msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr "Operatorklasse »%s« existiert nicht für Zugriffsmethode »%s«"
 
-#: commands/indexcmds.c:1154
+#: commands/indexcmds.c:1155
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "Operatorklasse »%s« akzeptiert Datentyp %s nicht"
 
-#: commands/indexcmds.c:1244
+#: commands/indexcmds.c:1245
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr "es gibt mehrere Standardoperatorklassen für Datentyp %s"
 
-#: commands/indexcmds.c:1585
+#: commands/indexcmds.c:1586
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "Tabelle »%s« hat keine Indexe"
 
-#: commands/indexcmds.c:1613
+#: commands/indexcmds.c:1614
 msgid "can only reindex the currently open database"
 msgstr "aktuell geöffnete Datenbank kann nicht reindiziert werden"
 
-#: commands/indexcmds.c:1698
+#: commands/indexcmds.c:1699
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "Tabelle »%s.%s« wurde neu indiziert"
@@ -5599,9 +5241,9 @@ msgstr "konnte Sperre für Relation »%s« nicht setzen"
 msgid "could not obtain lock on relation with OID %u"
 msgstr "konnte Sperre für Relation mit OID %u nicht setzen"
 
-#: commands/opclasscmds.c:136 commands/opclasscmds.c:1619
-#: commands/opclasscmds.c:1839 commands/opclasscmds.c:1850
-#: commands/opclasscmds.c:2084 commands/opclasscmds.c:2095
+#: commands/opclasscmds.c:136 commands/opclasscmds.c:1838
+#: commands/opclasscmds.c:1849 commands/opclasscmds.c:2083
+#: commands/opclasscmds.c:2094
 #, c-format
 msgid "operator family \"%s\" does not exist for access method \"%s\""
 msgstr "Operatorfamilie »%s« existiert nicht für Zugriffsmethode »%s«"
@@ -5737,7 +5379,15 @@ msgstr "Operator %d(%s,%s) existiert nicht in Operatorfamilie »%s«"
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "Funktion %d(%s,%s) existiert nicht in Operatorfamilie »%s«"
 
-#: commands/opclasscmds.c:1779
+#: commands/opclasscmds.c:1618
+#, c-format
+msgid ""
+"operator family \"%s\" does not exist for access method \"%s\", skipping"
+msgstr ""
+"Operatorfamilie »%s« existiert nicht für Zugriffsmethode »%s«, wird "
+"übersprungen"
+
+#: commands/opclasscmds.c:1778
 #, c-format
 msgid ""
 "operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
@@ -5745,7 +5395,7 @@ msgid ""
 msgstr ""
 "Operatorklasse »%s« für Zugriffsmethode »%s« existiert bereits in Schema »%s«"
 
-#: commands/opclasscmds.c:1868
+#: commands/opclasscmds.c:1867
 #, c-format
 msgid ""
 "operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
@@ -5803,7 +5453,7 @@ msgid "invalid cursor name: must not be empty"
 msgstr "ungültiger Cursorname: darf nicht leer sein"
 
 #: commands/portalcmds.c:168 commands/portalcmds.c:222
-#: executor/execCurrent.c:66 utils/adt/xml.c:2044 utils/adt/xml.c:2208
+#: executor/execCurrent.c:66 utils/adt/xml.c:2046 utils/adt/xml.c:2210
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "Cursor »%s« existiert nicht"
@@ -5872,19 +5522,19 @@ msgstr "vorbereitete Anweisung »%s« existiert bereits"
 msgid "prepared statement \"%s\" does not exist"
 msgstr "vorbereitete Anweisung »%s« existiert nicht"
 
-#: commands/prepare.c:751 commands/extension.c:1679 commands/extension.c:1788
-#: commands/extension.c:1981 executor/execQual.c:1613 executor/execQual.c:1638
+#: commands/prepare.c:751 commands/extension.c:1707 commands/extension.c:1816
+#: commands/extension.c:2009 executor/execQual.c:1613 executor/execQual.c:1638
 #: executor/execQual.c:1999 executor/execQual.c:5115 executor/functions.c:785
-#: foreign/foreign.c:350 replication/walsender.c:1387
+#: foreign/foreign.c:350 replication/walsender.c:1401
 #: utils/mmgr/portalmem.c:946 utils/fmgr/funcapi.c:60
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "Funktion mit Mengenergebnis in einem Zusammenhang aufgerufen, der keine "
 "Mengenergebnisse verarbeiten kann"
 
-#: commands/prepare.c:755 commands/extension.c:1683 commands/extension.c:1792
-#: commands/extension.c:1985 foreign/foreign.c:355
-#: replication/walsender.c:1391 utils/mmgr/portalmem.c:950
+#: commands/prepare.c:755 commands/extension.c:1711 commands/extension.c:1820
+#: commands/extension.c:2013 foreign/foreign.c:355
+#: replication/walsender.c:1405 utils/mmgr/portalmem.c:950
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr ""
 "Materialisierungsmodus wird benötigt, ist aber in diesem Zusammenhang nicht "
@@ -5918,7 +5568,7 @@ msgstr "Rolle »%s« existiert bereits"
 
 #: commands/user.c:623 commands/user.c:825 commands/user.c:905
 #: commands/user.c:1056 commands/variable.c:882 commands/variable.c:954
-#: utils/adt/acl.c:4822 utils/init/miscinit.c:432
+#: utils/init/miscinit.c:432 utils/adt/acl.c:4822
 #, c-format
 msgid "role \"%s\" does not exist"
 msgstr "Rolle »%s« existiert nicht"
@@ -6052,12 +5702,12 @@ msgid ""
 "changing return type of function %s from \"opaque\" to \"language_handler\""
 msgstr "ändere Rückgabetyp von Funktion %s von »opaque« in »language_handler«"
 
-#: commands/proclang.c:357 commands/proclang.c:608
+#: commands/proclang.c:357 commands/proclang.c:606
 #, c-format
 msgid "language \"%s\" already exists"
 msgstr "Sprache »%s« existiert bereits"
 
-#: commands/proclang.c:539
+#: commands/proclang.c:537
 #, c-format
 msgid "language \"%s\" does not exist, skipping"
 msgstr "Sprache »%s« existiert nicht, wird übersprungen"
@@ -6105,282 +5755,282 @@ msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
 msgstr ""
 "setval: Wert %s ist außerhalb des gültigen Bereichs von Sequenz »%s« (%s..%s)"
 
-#: commands/sequence.c:1017 lib/stringinfo.c:266 libpq/auth.c:1043
-#: libpq/auth.c:1397 libpq/auth.c:1465 libpq/auth.c:2002
-#: storage/buffer/buf_init.c:154 storage/buffer/localbuf.c:350
-#: storage/file/fd.c:359 storage/file/fd.c:742 storage/file/fd.c:860
-#: storage/ipc/procarray.c:784 storage/ipc/procarray.c:1183
-#: storage/ipc/procarray.c:1190 storage/ipc/procarray.c:1425
-#: storage/ipc/procarray.c:1819 postmaster/postmaster.c:2003
-#: postmaster/postmaster.c:2034 postmaster/postmaster.c:3231
-#: postmaster/postmaster.c:3915 postmaster/postmaster.c:3996
-#: postmaster/postmaster.c:4610 utils/adt/formatting.c:1529
-#: utils/adt/formatting.c:1650 utils/adt/formatting.c:1783
-#: utils/adt/regexp.c:210 utils/adt/varlena.c:3474 utils/adt/varlena.c:3495
-#: utils/mmgr/aset.c:416 utils/mmgr/aset.c:587 utils/mmgr/aset.c:765
-#: utils/mmgr/aset.c:966 utils/fmgr/dfmgr.c:224 utils/hash/dynahash.c:364
-#: utils/hash/dynahash.c:436 utils/hash/dynahash.c:932
-#: utils/init/miscinit.c:150 utils/init/miscinit.c:171
-#: utils/init/miscinit.c:181 utils/mb/mbutils.c:374 utils/mb/mbutils.c:675
-#: utils/misc/tzparser.c:455 utils/misc/guc.c:3296 utils/misc/guc.c:3309
-#: utils/misc/guc.c:3322
+#: commands/sequence.c:1017 lib/stringinfo.c:266 libpq/auth.c:1022
+#: libpq/auth.c:1382 libpq/auth.c:1450 libpq/auth.c:1852
+#: storage/ipc/procarray.c:796 storage/ipc/procarray.c:1207
+#: storage/ipc/procarray.c:1214 storage/ipc/procarray.c:1449
+#: storage/ipc/procarray.c:1900 storage/buffer/buf_init.c:154
+#: storage/buffer/localbuf.c:350 storage/file/fd.c:358 storage/file/fd.c:742
+#: storage/file/fd.c:860 postmaster/postmaster.c:2004
+#: postmaster/postmaster.c:2035 postmaster/postmaster.c:3232
+#: postmaster/postmaster.c:3916 postmaster/postmaster.c:3997
+#: postmaster/postmaster.c:4611 utils/init/miscinit.c:150
+#: utils/init/miscinit.c:171 utils/init/miscinit.c:181
+#: utils/adt/formatting.c:1529 utils/adt/formatting.c:1650
+#: utils/adt/formatting.c:1783 utils/adt/regexp.c:210 utils/adt/varlena.c:3474
+#: utils/adt/varlena.c:3495 utils/mmgr/aset.c:416 utils/mmgr/aset.c:587
+#: utils/mmgr/aset.c:765 utils/mmgr/aset.c:966 utils/fmgr/dfmgr.c:224
+#: utils/hash/dynahash.c:364 utils/hash/dynahash.c:436
+#: utils/hash/dynahash.c:932 utils/mb/mbutils.c:374 utils/mb/mbutils.c:675
+#: utils/misc/guc.c:3298 utils/misc/guc.c:3311 utils/misc/guc.c:3324
+#: utils/misc/tzparser.c:455
 msgid "out of memory"
 msgstr "Speicher aufgebraucht"
 
-#: commands/sequence.c:1190
+#: commands/sequence.c:1206
 msgid "INCREMENT must not be zero"
 msgstr "INCREMENT darf nicht null sein"
 
-#: commands/sequence.c:1236
+#: commands/sequence.c:1252
 #, c-format
 msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr "MINVALUE (%s) muss kleiner als MAXVALUE (%s) sein"
 
-#: commands/sequence.c:1261
+#: commands/sequence.c:1277
 #, c-format
 msgid "START value (%s) cannot be less than MINVALUE (%s)"
 msgstr "START-Wert (%s) kann nicht kleiner als MINVALUE (%s) sein"
 
-#: commands/sequence.c:1273
+#: commands/sequence.c:1289
 #, c-format
 msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
 msgstr "START-Wert (%s) kann nicht größer als MAXVALUE (%s) sein"
 
-#: commands/sequence.c:1304
+#: commands/sequence.c:1320
 #, c-format
 msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
 msgstr "RESTART-Wert (%s) kann nicht kleiner als MINVALUE (%s) sein"
 
-#: commands/sequence.c:1316
+#: commands/sequence.c:1332
 #, c-format
 msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
 msgstr "RESTART-Wert (%s) kann nicht größer als MAXVALUE (%s) sein"
 
-#: commands/sequence.c:1331
+#: commands/sequence.c:1347
 #, c-format
 msgid "CACHE (%s) must be greater than zero"
 msgstr "CACHE (%s) muss größer als null sein"
 
-#: commands/sequence.c:1362
+#: commands/sequence.c:1378
 msgid "invalid OWNED BY option"
 msgstr "ungültige OWNED BY Option"
 
-#: commands/sequence.c:1363
+#: commands/sequence.c:1379
 msgid "Specify OWNED BY table.column or OWNED BY NONE."
 msgstr "Geben Sie OWNED BY tabelle.spalte oder OWNED BY NONE an."
 
-#: commands/sequence.c:1385 commands/tablecmds.c:5470
+#: commands/sequence.c:1401 commands/tablecmds.c:5525
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "Relation »%s«, auf die verwiesen wird, ist keine Tabelle"
 
-#: commands/sequence.c:1392
+#: commands/sequence.c:1408
 msgid "sequence must have same owner as table it is linked to"
 msgstr "Sequenz muss selben Eigentümer wie die verknüpfte Tabelle haben"
 
-#: commands/sequence.c:1396
+#: commands/sequence.c:1412
 msgid "sequence must be in same schema as table it is linked to"
 msgstr "Sequenz muss im selben Schema wie die verknüpfte Tabelle sein"
 
-#: commands/tablecmds.c:199
+#: commands/tablecmds.c:200
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "Tabelle »%s« existiert nicht"
 
-#: commands/tablecmds.c:200
+#: commands/tablecmds.c:201
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "Tabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:202
+#: commands/tablecmds.c:203
 msgid "Use DROP TABLE to remove a table."
 msgstr "Verwenden Sie DROP TABLE, um eine Tabelle zu löschen."
 
-#: commands/tablecmds.c:205
+#: commands/tablecmds.c:206
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "Sequenz »%s« existiert nicht"
 
-#: commands/tablecmds.c:206
+#: commands/tablecmds.c:207
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "Sequenz »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:208
+#: commands/tablecmds.c:209
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Verwenden Sie DROP SEQUENCE, um eine Sequenz zu löschen."
 
-#: commands/tablecmds.c:211
+#: commands/tablecmds.c:212
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "Sicht »%s« existiert nicht"
 
-#: commands/tablecmds.c:212
+#: commands/tablecmds.c:213
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "Sicht »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:214
+#: commands/tablecmds.c:215
 msgid "Use DROP VIEW to remove a view."
 msgstr "Verwenden Sie DROP VIEW, um eine Sicht zu löschen."
 
-#: commands/tablecmds.c:217 parser/parse_utilcmd.c:1447
+#: commands/tablecmds.c:218 parser/parse_utilcmd.c:1449
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "Index »%s« existiert nicht"
 
-#: commands/tablecmds.c:218
+#: commands/tablecmds.c:219
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "Index »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:220
+#: commands/tablecmds.c:221
 msgid "Use DROP INDEX to remove an index."
 msgstr "Verwenden Sie DROP INDEX, um einen Index zu löschen."
 
-#: commands/tablecmds.c:224 commands/typecmds.c:666
+#: commands/tablecmds.c:225 commands/typecmds.c:666
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "Typ »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:225
+#: commands/tablecmds.c:226
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "»%s« ist kein Typ"
 
-#: commands/tablecmds.c:226
+#: commands/tablecmds.c:227
 msgid "Use DROP TYPE to remove a type."
 msgstr "Verwenden Sie DROP TYPE, um einen Typen zu löschen."
 
-#: commands/tablecmds.c:229 commands/tablecmds.c:8832
+#: commands/tablecmds.c:230 commands/tablecmds.c:8902
 #, c-format
 msgid "foreign table \"%s\" does not exist"
 msgstr "Fremdtabelle »%s« existiert nicht"
 
-#: commands/tablecmds.c:230
+#: commands/tablecmds.c:231
 #, c-format
 msgid "foreign table \"%s\" does not exist, skipping"
 msgstr "Fremdtabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:232
+#: commands/tablecmds.c:233
 msgid "Use DROP FOREIGN TABLE to remove a foreign table."
 msgstr "Verwenden Sie DROP FOREIGN TABLE, um eine Fremdtabelle zu löschen."
 
-#: commands/tablecmds.c:424 executor/execMain.c:2363
+#: commands/tablecmds.c:425 executor/execMain.c:2416
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT kann nur mit temporären Tabellen verwendet werden"
 
-#: commands/tablecmds.c:428
+#: commands/tablecmds.c:429
 msgid "constraints on foreign tables are not supported"
 msgstr "Constraints für Fremdtabellen werden nicht unterstützt"
 
-#: commands/tablecmds.c:439 executor/execMain.c:2374
+#: commands/tablecmds.c:447 executor/execMain.c:2434
 msgid "cannot create temporary table within security-restricted operation"
 msgstr ""
 "kann temporäre Tabelle nicht in einer sicherheitsbeschränkten Operation "
 "erzeugen"
 
-#: commands/tablecmds.c:543 commands/tablecmds.c:4303
+#: commands/tablecmds.c:545 commands/tablecmds.c:4351
 msgid "default values on foreign tables are not supported"
 msgstr "Vorgabewerte für Fremdtabellen werden nicht unterstützt"
 
-#: commands/tablecmds.c:811 commands/tablecmds.c:1132
-#: commands/tablecmds.c:2060 commands/tablecmds.c:3760
-#: commands/tablecmds.c:5476 commands/trigger.c:199 commands/trigger.c:1104
-#: tcop/utility.c:95 rewrite/rewriteDefine.c:265
+#: commands/tablecmds.c:813 commands/tablecmds.c:1142
+#: commands/tablecmds.c:2070 commands/tablecmds.c:3807
+#: commands/tablecmds.c:5531 commands/trigger.c:192 commands/trigger.c:1098
+#: tcop/utility.c:95 rewrite/rewriteDefine.c:263
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "keine Berechtigung: »%s« ist ein Systemkatalog"
 
-#: commands/tablecmds.c:923
+#: commands/tablecmds.c:925
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "Truncate-Vorgang leert ebenfalls Tabelle »%s«"
 
-#: commands/tablecmds.c:1142
+#: commands/tablecmds.c:1152
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht leeren"
 
-#: commands/tablecmds.c:1344 parser/parse_utilcmd.c:617
-#: parser/parse_utilcmd.c:1665
+#: commands/tablecmds.c:1354 parser/parse_utilcmd.c:621
+#: parser/parse_utilcmd.c:1667
 #, c-format
 msgid "inherited relation \"%s\" is not a table"
 msgstr "geerbte Relation »%s« ist keine Tabelle"
 
-#: commands/tablecmds.c:1351 commands/tablecmds.c:8057
+#: commands/tablecmds.c:1361 commands/tablecmds.c:8128
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "von temporärer Relation »%s« kann nicht geerbt werden"
 
-#: commands/tablecmds.c:1368 commands/tablecmds.c:8085
+#: commands/tablecmds.c:1378 commands/tablecmds.c:8156
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "von der Relation »%s« würde mehrmals geerbt werden"
 
-#: commands/tablecmds.c:1424
+#: commands/tablecmds.c:1434
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "geerbte Definitionen von Spalte »%s« werden zusammengeführt"
 
-#: commands/tablecmds.c:1432
+#: commands/tablecmds.c:1442
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "geerbte Spalte »%s« hat Typkonflikt"
 
-#: commands/tablecmds.c:1434 commands/tablecmds.c:1455
-#: commands/tablecmds.c:1620 commands/tablecmds.c:1642
-#: parser/parse_coerce.c:1473 parser/parse_coerce.c:1492
-#: parser/parse_coerce.c:1537 parser/parse_param.c:217
+#: commands/tablecmds.c:1444 commands/tablecmds.c:1465
+#: commands/tablecmds.c:1630 commands/tablecmds.c:1652
+#: parser/parse_coerce.c:1514 parser/parse_coerce.c:1534
+#: parser/parse_coerce.c:1579 parser/parse_param.c:217
 #, c-format
 msgid "%s versus %s"
 msgstr "%s gegen %s"
 
-#: commands/tablecmds.c:1441
+#: commands/tablecmds.c:1451
 #, c-format
 msgid "inherited column \"%s\" has a collation conflict"
 msgstr "geerbte Spalte »%s« hat Sortierfolgenkonflikt"
 
-#: commands/tablecmds.c:1443 commands/tablecmds.c:1630
-#: commands/tablecmds.c:4172
+#: commands/tablecmds.c:1453 commands/tablecmds.c:1640
+#: commands/tablecmds.c:4220
 #, c-format
 msgid "\"%s\" versus \"%s\""
 msgstr "»%s« gegen »%s«"
 
-#: commands/tablecmds.c:1453
+#: commands/tablecmds.c:1463
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "geerbte Spalte »%s« hat einen Konflikt bei einem Storage-Parameter"
 
-#: commands/tablecmds.c:1610
+#: commands/tablecmds.c:1620
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "Spalte »%s« wird mit geerbter Definition zusammengeführt"
 
-#: commands/tablecmds.c:1618
+#: commands/tablecmds.c:1628
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "für Spalte »%s« besteht ein Typkonflikt"
 
-#: commands/tablecmds.c:1628
+#: commands/tablecmds.c:1638
 #, c-format
 msgid "column \"%s\" has a collation conflict"
 msgstr "für Spalte »%s« besteht ein Sortierfolgenkonflikt"
 
-#: commands/tablecmds.c:1640
+#: commands/tablecmds.c:1650
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "für Spalte »%s« besteht ein Konflikt bei einem Storage-Parameter"
 
-#: commands/tablecmds.c:1692
+#: commands/tablecmds.c:1702
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "Spalte »%s« erbt widersprüchliche Vorgabewerte"
 
-#: commands/tablecmds.c:1694
+#: commands/tablecmds.c:1704
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "Um den Konflikt zu lösen, geben Sie einen Vorgabewert ausdrücklich an."
 
-#: commands/tablecmds.c:1741
+#: commands/tablecmds.c:1751
 #, c-format
 msgid ""
 "check constraint name \"%s\" appears multiple times but with different "
@@ -6389,44 +6039,45 @@ msgstr ""
 "Check-Constraint-Name »%s« erscheint mehrmals, aber mit unterschiedlichen "
 "Ausdrücken"
 
-#: commands/tablecmds.c:2031
+#: commands/tablecmds.c:2041
 msgid "cannot rename column of typed table"
 msgstr "Spalte einer getypten Tabelle kann nicht umbenannt werden"
 
-#: commands/tablecmds.c:2048
+#: commands/tablecmds.c:2058
 #, c-format
 msgid "\"%s\" is not a table, view, composite type, index or foreign table"
-msgstr "»%s« ist weder Tabelle, Sicht, zusammengesetzter Typ, Index noch Fremdtabelle"
+msgstr ""
+"»%s« ist weder Tabelle, Sicht, zusammengesetzter Typ, Index noch Fremdtabelle"
 
-#: commands/tablecmds.c:2114
+#: commands/tablecmds.c:2124
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr ""
 "vererbte Spalte »%s« muss ebenso in den abgeleiteten Tabellen umbenannt "
 "werden"
 
-#: commands/tablecmds.c:2146
+#: commands/tablecmds.c:2156
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "Systemspalte »%s« kann nicht umbenannt werden"
 
-#: commands/tablecmds.c:2161
+#: commands/tablecmds.c:2171
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "kann vererbte Spalte »%s« nicht umbenennen"
 
-#: commands/tablecmds.c:2172 commands/tablecmds.c:4216
+#: commands/tablecmds.c:2182 commands/tablecmds.c:4264
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "Spalte »%s« von Relation »%s« existiert bereits"
 
-#: commands/tablecmds.c:2261 commands/tablecmds.c:7381
-#: commands/tablecmds.c:8964
+#: commands/tablecmds.c:2271 commands/tablecmds.c:7452
+#: commands/tablecmds.c:9034
 msgid "Use ALTER TYPE instead."
 msgstr "Verwenden Sie stattdessen ALTER TYPE."
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2384
+#: commands/tablecmds.c:2394
 #, c-format
 msgid ""
 "cannot %s \"%s\" because it is being used by active queries in this session"
@@ -6435,205 +6086,207 @@ msgstr ""
 "Sitzung verwendet wird"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2393
+#: commands/tablecmds.c:2403
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr ""
 "%s mit Relation »%s« nicht möglich, weil es anstehende Trigger-Ereignisse "
 "dafür gibt"
 
-#: commands/tablecmds.c:2492
+#: commands/tablecmds.c:2502
 #, c-format
 msgid "\"%s\" is not a composite type"
 msgstr "»%s« ist kein zusammengesetzter Typ"
 
-#: commands/tablecmds.c:3288
+#: commands/tablecmds.c:3327
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "Systemrelation »%s« kann nicht neu geschrieben werden"
 
-#: commands/tablecmds.c:3298
+#: commands/tablecmds.c:3337
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "kann temporäre Tabellen anderer Sitzungen nicht neu schreiben"
 
-#: commands/tablecmds.c:3525
+#: commands/tablecmds.c:3562
 #, c-format
 msgid "rewriting table \"%s\""
 msgstr "schreibe Tabelle »%s« neu"
 
-#: commands/tablecmds.c:3529
+#: commands/tablecmds.c:3566
 #, c-format
 msgid "verifying table \"%s\""
 msgstr "überprüfe Tabelle »%s«"
 
-#: commands/tablecmds.c:3626
+#: commands/tablecmds.c:3673
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "Spalte »%s« enthält NULL-Werte"
 
-#: commands/tablecmds.c:3640
+#: commands/tablecmds.c:3687
 #, c-format
 msgid "check constraint \"%s\" is violated by some row"
 msgstr "Check-Constraint »%s« wird von irgendeiner Zeile verletzt"
 
-#: commands/tablecmds.c:3781 commands/tablecmds.c:4730
+#: commands/tablecmds.c:3828 commands/tablecmds.c:4778
 #, c-format
 msgid "\"%s\" is not a table or index"
 msgstr "»%s« ist keine Tabelle und kein Index"
 
-#: commands/tablecmds.c:3784 commands/trigger.c:193 commands/trigger.c:1098
-#: rewrite/rewriteDefine.c:259
+#: commands/tablecmds.c:3831 commands/trigger.c:186 commands/trigger.c:1092
+#: rewrite/rewriteDefine.c:257
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "»%s« ist keine Tabelle oder Sicht"
 
-#: commands/tablecmds.c:3787
+#: commands/tablecmds.c:3834
 #, c-format
 msgid "\"%s\" is not a table or foreign table"
 msgstr "»%s« ist keine Tabelle oder Fremdtabelle"
 
-#: commands/tablecmds.c:3790
+#: commands/tablecmds.c:3837
 #, c-format
 msgid "\"%s\" is not a table, composite type, or foreign table"
 msgstr "»%s« ist weder Tabelle, Sicht, zusammengesetzter Typ noch Fremdtabelle"
 
-#: commands/tablecmds.c:3800
+#: commands/tablecmds.c:3847
 #, c-format
 msgid "\"%s\" is of the wrong type"
 msgstr "»%s« hat den falschen Typ"
 
-#: commands/tablecmds.c:3949 commands/tablecmds.c:3956
+#: commands/tablecmds.c:3996 commands/tablecmds.c:4003
 #, c-format
-msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
+msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
 msgstr "kann Typ »%s« nicht ändern, weil Spalte »%s.%s« ihn verwendet"
 
-#: commands/tablecmds.c:3963
-#, fuzzy, c-format
+#: commands/tablecmds.c:4010
+#, c-format
 msgid ""
-"cannot alter foreign table \"%s\" because column \"%s\".\"%s\" uses its "
-"rowtype"
+"cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
-"kann Tabelle »%s« nicht ändern, weil Spalte »%s.%s« ihren Zeilentyp verwendet"
+"kann Fremdtabelle »%s« nicht ändern, weil Spalte »%s.%s« ihren Zeilentyp "
+"verwendet"
 
-#: commands/tablecmds.c:3970
+#: commands/tablecmds.c:4017
 #, c-format
-msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
+msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
 "kann Tabelle »%s« nicht ändern, weil Spalte »%s.%s« ihren Zeilentyp verwendet"
 
-#: commands/tablecmds.c:4032
+#: commands/tablecmds.c:4079
 #, c-format
 msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr "kann Typ »%s« nicht ändern, weil er der Typ einer getypten Tabelle ist"
 
-#: commands/tablecmds.c:4034
+#: commands/tablecmds.c:4081
 msgid "Use ALTER ... CASCADE to alter the typed tables too."
-msgstr "Verwenden Sie ALTER ... CASCADE, um die getypten Tabellen ebenfalls zu ändern."
+msgstr ""
+"Verwenden Sie ALTER ... CASCADE, um die getypten Tabellen ebenfalls zu "
+"ändern."
 
-#: commands/tablecmds.c:4077
+#: commands/tablecmds.c:4125
 #, c-format
 msgid "type %s is not a composite type"
 msgstr "Typ %s ist kein zusammengesetzter Typ"
 
-#: commands/tablecmds.c:4103
+#: commands/tablecmds.c:4151
 msgid "cannot add column to typed table"
 msgstr "zu einer getypten Tabelle kann keine Spalte hinzugefügt werden"
 
-#: commands/tablecmds.c:4164 commands/tablecmds.c:8239
+#: commands/tablecmds.c:4212 commands/tablecmds.c:8310
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "abgeleitete Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
 
-#: commands/tablecmds.c:4170 commands/tablecmds.c:8246
+#: commands/tablecmds.c:4218 commands/tablecmds.c:8317
 #, c-format
 msgid "child table \"%s\" has different collation for column \"%s\""
 msgstr ""
 "abgeleitete Tabelle »%s« hat unterschiedliche Sortierfolge für Spalte »%s«"
 
-#: commands/tablecmds.c:4180
+#: commands/tablecmds.c:4228
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
 msgstr "abgeleitete Tabelle »%s« hat eine widersprüchliche Spalte »%s«"
 
-#: commands/tablecmds.c:4192
+#: commands/tablecmds.c:4240
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr ""
 "Definition von Spalte »%s« für abgeleitete Tabelle »%s« wird zusammengeführt"
 
-#: commands/tablecmds.c:4422
+#: commands/tablecmds.c:4470
 msgid "column must be added to child tables too"
 msgstr "Spalte muss ebenso in den abgeleiteten Tabellen hinzugefügt werden"
 
-#: commands/tablecmds.c:4552 commands/tablecmds.c:4642
-#: commands/tablecmds.c:4687 commands/tablecmds.c:4783
-#: commands/tablecmds.c:4827 commands/tablecmds.c:4906
-#: commands/tablecmds.c:6600
+#: commands/tablecmds.c:4600 commands/tablecmds.c:4690
+#: commands/tablecmds.c:4735 commands/tablecmds.c:4831
+#: commands/tablecmds.c:4875 commands/tablecmds.c:4954
+#: commands/tablecmds.c:6670
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "Systemspalte »%s« kann nicht geändert werden"
 
-#: commands/tablecmds.c:4586
+#: commands/tablecmds.c:4634
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "Spalte »%s« ist in einem Primärschlüssel"
 
-#: commands/tablecmds.c:4757
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "Statistikziel %d ist zu niedrig"
 
-#: commands/tablecmds.c:4765
+#: commands/tablecmds.c:4813
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "setze Statistikziel auf %d herab"
 
-#: commands/tablecmds.c:4887
+#: commands/tablecmds.c:4935
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "ungültiger Storage-Typ »%s«"
 
-#: commands/tablecmds.c:4918
+#: commands/tablecmds.c:4966
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr "Spaltendatentyp %s kann nur Storage-Typ PLAIN"
 
-#: commands/tablecmds.c:4948
+#: commands/tablecmds.c:4996
 msgid "cannot drop column from typed table"
 msgstr "aus einer getypten Tabelle können keine Spalten gelöscht werden"
 
-#: commands/tablecmds.c:4989
+#: commands/tablecmds.c:5037
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "Spalte »%s« von Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:5002
+#: commands/tablecmds.c:5050
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "Systemspalte »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:5009
+#: commands/tablecmds.c:5057
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "geerbte Spalte »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:5235
+#: commands/tablecmds.c:5283
 #, c-format
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX benennt Index »%s« um in »%s«"
 
-#: commands/tablecmds.c:5412
+#: commands/tablecmds.c:5460
 msgid "constraint must be added to child tables too"
 msgstr "Constraint muss ebenso in den abgeleiteten Tabellen hinzugefügt werden"
 
-#: commands/tablecmds.c:5493
+#: commands/tablecmds.c:5548
 msgid "constraints on permanent tables may reference only permanent tables"
 msgstr ""
 "Constraints für permanente Tabellen dürfen nur auf permanente Tabellen "
 "verweisen"
 
-#: commands/tablecmds.c:5500
+#: commands/tablecmds.c:5555
 msgid ""
 "constraints on unlogged tables may reference only permanent or unlogged "
 "tables"
@@ -6641,289 +6294,279 @@ msgstr ""
 "Constraints für ungeloggte Tabellen dürfen nur auf permanente oder "
 "ungeloggte Tabellen verweisen"
 
-#: commands/tablecmds.c:5506
+#: commands/tablecmds.c:5561
 msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
 "Constraints für temporäre Tabellen dürfen nur auf temporäre Tabellen "
 "verweisen"
 
-#: commands/tablecmds.c:5567
+#: commands/tablecmds.c:5622
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr ""
 "Anzahl der Quell- und Zielspalten im Fremdschlüssel stimmt nicht überein"
 
-#: commands/tablecmds.c:5656
+#: commands/tablecmds.c:5711
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "Fremdschlüssel-Constraint »%s« kann nicht implementiert werden"
 
-#: commands/tablecmds.c:5659
+#: commands/tablecmds.c:5714
 #, c-format
 msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
 msgstr "Schlüsselspalten »%s« und »%s« haben inkompatible Typen: %s und %s."
 
-#: commands/tablecmds.c:5772
+#: commands/tablecmds.c:5827
 #, c-format
 msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "Fremdschlüssel-Constraint »%s« von Relation »%s« existiert nicht"
 
-#: commands/tablecmds.c:5834
+#: commands/tablecmds.c:5890
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "Spalte »%s«, die im Fremdschlüssel verwendet wird, existiert nicht"
 
-#: commands/tablecmds.c:5839
+#: commands/tablecmds.c:5895
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "Fremdschlüssel kann nicht mehr als %d Schlüssel haben"
 
-#: commands/tablecmds.c:5904
+#: commands/tablecmds.c:5960
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr ""
 "aufschiebbarer Primärschlüssel kann nicht für Tabelle »%s«, auf die "
 "verwiesen wird, verwendet werden"
 
-#: commands/tablecmds.c:5921
+#: commands/tablecmds.c:5977
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr ""
 "in Tabelle »%s«, auf die verwiesen wird, gibt es keinen Primärschlüssel"
 
-#: commands/tablecmds.c:6071
+#: commands/tablecmds.c:6127
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
 "aufschiebbarer Unique-Constraint kann nicht für Tabelle »%s«, auf die "
 "verwiesen wird, verwendet werden"
 
-#: commands/tablecmds.c:6076
+#: commands/tablecmds.c:6132
 #, c-format
 msgid ""
 "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr ""
-"in Tabelle »%s«, auf die verwiesen wird, gibt es keinen Unique Constraint, "
+"in Tabelle »%s«, auf die verwiesen wird, gibt es keinen Unique-Constraint, "
 "der auf die angegebenen Schlüssel passt"
 
-#: commands/tablecmds.c:6127
+#: commands/tablecmds.c:6183
 #, c-format
 msgid "validating foreign key constraint \"%s\""
 msgstr "validiere Fremdschlüssel-Constraint »%s«"
 
-#: commands/tablecmds.c:6409
+#: commands/tablecmds.c:6479
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "geerbter Constraint »%s« von Relation »%s« kann nicht gelöscht werden"
 
-#: commands/tablecmds.c:6436 commands/tablecmds.c:6549
+#: commands/tablecmds.c:6506 commands/tablecmds.c:6619
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "Constraint »%s« von Relation »%s« existiert nicht"
 
-#: commands/tablecmds.c:6442
+#: commands/tablecmds.c:6512
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "Constraint »%s« von Relation »%s« existiert nicht, wird übersprungen"
 
-#: commands/tablecmds.c:6584
+#: commands/tablecmds.c:6654
 msgid "cannot alter column type of typed table"
 msgstr "Spaltentyp einer getypten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:6607
+#: commands/tablecmds.c:6677
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "kann vererbte Spalte »%s« nicht ändern"
 
-#: commands/tablecmds.c:6649
+#: commands/tablecmds.c:6719
 msgid "transform expression must not return a set"
 msgstr "Umwandlungsausdruck kann keine Ergebnismenge zurückgeben"
 
-#: commands/tablecmds.c:6655
+#: commands/tablecmds.c:6725
 msgid "cannot use subquery in transform expression"
 msgstr "Unteranfragen können in Umwandlungsausdrücken nicht verwendet werden"
 
-#: commands/tablecmds.c:6659
+#: commands/tablecmds.c:6729
 msgid "cannot use aggregate function in transform expression"
 msgstr ""
 "Aggregatfunktionen können in Umwandlungsausdrücken nicht verwendet werden"
 
-#: commands/tablecmds.c:6663
+#: commands/tablecmds.c:6733
 msgid "cannot use window function in transform expression"
 msgstr ""
 "Fensterfunktionen können in Umwandlungsausdrücken nicht verwendet werden"
 
-#: commands/tablecmds.c:6682
+#: commands/tablecmds.c:6752
 #, c-format
 msgid "column \"%s\" cannot be cast to type %s"
 msgstr "Spalte »%s« kann nicht in Typ %s umgewandelt werden"
 
-#: commands/tablecmds.c:6703
-msgid "ALTER TYPE USING is only supported on plain tables"
-msgstr ""
-
-#: commands/tablecmds.c:6728
+#: commands/tablecmds.c:6799
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 "Typ der vererbten Spalte »%s« muss ebenso in den abgeleiteten Tabellen "
 "geändert werden"
 
-#: commands/tablecmds.c:6809
+#: commands/tablecmds.c:6880
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "Typ der Spalte »%s« kann nicht zweimal geändert werden"
 
-#: commands/tablecmds.c:6845
+#: commands/tablecmds.c:6916
 #, c-format
 msgid "default for column \"%s\" cannot be cast to type %s"
 msgstr "Vorgabewert der Spalte »%s« kann nicht in Typ %s umgewandelt werden"
 
-#: commands/tablecmds.c:6971
+#: commands/tablecmds.c:7042
 msgid "cannot alter type of a column used by a view or rule"
 msgstr ""
 "Typ einer Spalte, die von einer Sicht oder Regel verwendet wird, kann nicht "
 "geändert werden"
 
-#: commands/tablecmds.c:6972 commands/tablecmds.c:6991
+#: commands/tablecmds.c:7043 commands/tablecmds.c:7062
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s hängt von Spalte »%s« ab"
 
-#: commands/tablecmds.c:6990
+#: commands/tablecmds.c:7061
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr ""
 "Typ einer Spalte, die in einer Trigger-Definition verwendet wird, kann nicht "
 "geändert werden"
 
-#: commands/tablecmds.c:7349
+#: commands/tablecmds.c:7420
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "kann Eigentümer des Index »%s« nicht ändern"
 
-#: commands/tablecmds.c:7351
+#: commands/tablecmds.c:7422
 msgid "Change the ownership of the index's table, instead."
 msgstr "Ändern Sie stattdessen den Eigentümer der Tabelle des Index."
 
-#: commands/tablecmds.c:7367
+#: commands/tablecmds.c:7438
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "kann Eigentümer der Sequenz »%s« nicht ändern"
 
-#: commands/tablecmds.c:7369 commands/tablecmds.c:8954
+#: commands/tablecmds.c:7440 commands/tablecmds.c:9024
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "Sequenz »%s« ist mit Tabelle »%s« verknüpft."
 
-#: commands/tablecmds.c:7390
-#, fuzzy, c-format
-msgid ""
-"\"%s\" is not a table, view, sequence, or foreign tabl, or foreign tablee"
-msgstr "»%s« ist weder Tabelle, Sicht, zusammengesetzter Typ noch Index"
+#: commands/tablecmds.c:7461 commands/tablecmds.c:9042
+#, c-format
+msgid "\"%s\" is not a table, view, sequence, or foreign table"
+msgstr "»%s« ist keine Tabelle, Sicht, Sequenz oder Fremdtabelle"
 
-#: commands/tablecmds.c:7645
+#: commands/tablecmds.c:7716
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "mehrere SET TABLESPACE Unterbefehle sind ungültig"
 
-#: commands/tablecmds.c:7697
+#: commands/tablecmds.c:7768
 #, c-format
 msgid "\"%s\" is not a table, index, or TOAST table"
 msgstr "»%s« ist weder Tabelle, Index noch TOAST-Tabelle"
 
-#: commands/tablecmds.c:7818
+#: commands/tablecmds.c:7889
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "Systemrelation »%s« kann nicht verschoben werden"
 
-#: commands/tablecmds.c:7834
+#: commands/tablecmds.c:7905
 msgid "cannot move temporary tables of other sessions"
 msgstr "temporäre Tabellen anderer Sitzungen können nicht verschoben werden"
 
-#: commands/tablecmds.c:8026
+#: commands/tablecmds.c:8097
 msgid "cannot change inheritance of typed table"
 msgstr "Vererbung einer getypten Tabelle kann nicht geändert werden"
 
-#: commands/tablecmds.c:8112
+#: commands/tablecmds.c:8183
 msgid "circular inheritance not allowed"
 msgstr "zirkuläre Vererbung ist nicht erlaubt"
 
-#: commands/tablecmds.c:8113
+#: commands/tablecmds.c:8184
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "»%s« ist schon von »%s« abgeleitet."
 
-#: commands/tablecmds.c:8121
+#: commands/tablecmds.c:8192
 #, c-format
 msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
 msgstr "Tabelle »%s« ohne OIDs kann nicht von Tabelle »%s« mit OIDs erben"
 
-#: commands/tablecmds.c:8257
+#: commands/tablecmds.c:8328
 #, c-format
 msgid "column \"%s\" in child table must be marked NOT NULL"
 msgstr "Spalte »%s« in abgeleiteter Tabelle muss als NOT NULL markiert sein"
 
-#: commands/tablecmds.c:8273
+#: commands/tablecmds.c:8344
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "Spalte »%s« fehlt in abgeleiteter Tabelle"
 
-#: commands/tablecmds.c:8352
+#: commands/tablecmds.c:8423
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr ""
 "abgeleitete Tabelle »%s« hat unterschiedliche Definition für Check-"
 "Constraint »%s«"
 
-#: commands/tablecmds.c:8376
+#: commands/tablecmds.c:8447
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "Constraint »%s« fehlt in abgeleiteter Tabelle"
 
-#: commands/tablecmds.c:8456
+#: commands/tablecmds.c:8527
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "Relation »%s« ist keine Basisrelation von Relation »%s«"
 
-#: commands/tablecmds.c:8675
+#: commands/tablecmds.c:8744
 msgid "typed tables cannot inherit"
 msgstr "getypte Tabellen können nicht erben"
 
-#: commands/tablecmds.c:8706
-#, fuzzy, c-format
+#: commands/tablecmds.c:8775
+#, c-format
 msgid "table is missing column \"%s\""
-msgstr "Spalte »%s« fehlt in abgeleiteter Tabelle"
+msgstr "Spalte »%s« fehlt in Tabelle"
 
-#: commands/tablecmds.c:8716
-#, fuzzy, c-format
+#: commands/tablecmds.c:8785
+#, c-format
 msgid "table has column \"%s\" where type requires \"%s\""
-msgstr "Tabelle »%s« verweist auf »%s«."
+msgstr "Tabelle hat Spalte »%s«, aber Typ benötigt »%s«"
 
-#: commands/tablecmds.c:8725
+#: commands/tablecmds.c:8794
 #, c-format
 msgid "table \"%s\" has different type for column \"%s\""
 msgstr "Tabelle »%s« hat unterschiedlichen Typ für Spalte »%s«"
 
-#: commands/tablecmds.c:8737
-#, fuzzy, c-format
+#: commands/tablecmds.c:8807
+#, c-format
 msgid "table has extra column \"%s\""
-msgstr "Spalte »%s« fehlt in abgeleiteter Tabelle"
+msgstr "Tabelle hat zusätzliche Spalte »%s«"
 
-#: commands/tablecmds.c:8784
+#: commands/tablecmds.c:8854
 #, c-format
 msgid "\"%s\" is not a typed table"
 msgstr "»%s« ist keine getypte Tabelle"
 
-#: commands/tablecmds.c:8953
+#: commands/tablecmds.c:9023
 msgid "cannot move an owned sequence into another schema"
 msgstr ""
 "einer Tabelle zugeordnete Sequenz kann nicht in ein anderes Schema "
 "verschoben werden"
 
-#: commands/tablecmds.c:8972
-#, c-format
-msgid "\"%s\" is not a table, view, sequence, or foreign table"
-msgstr "»%s« ist keine Tabelle, Sicht, Sequenz oder Fremdtabelle"
-
-#: commands/tablecmds.c:9029
+#: commands/tablecmds.c:9099
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "Relation »%s« existiert bereits in Schema »%s«"
@@ -7009,7 +6652,9 @@ msgstr "Verzeichnis »%s« existiert nicht"
 
 #: commands/tablespace.c:561
 msgid "Create this directory for the tablespace before restarting the server."
-msgstr "Erzeugen Sie dieses Verzeichnis für den Tablespace bevor Sie den Server neu starten."
+msgstr ""
+"Erzeugen Sie dieses Verzeichnis für den Tablespace bevor Sie den Server neu "
+"starten."
 
 #: commands/tablespace.c:566
 #, c-format
@@ -7032,8 +6677,8 @@ msgid "could not create symbolic link \"%s\": %m"
 msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %m"
 
 #: commands/tablespace.c:684 storage/file/copydir.c:67
-#: storage/file/copydir.c:106 storage/file/fd.c:1605
-#: postmaster/postmaster.c:1165 utils/adt/genfile.c:353 utils/adt/misc.c:213
+#: storage/file/copydir.c:106 storage/file/fd.c:1624
+#: postmaster/postmaster.c:1166 utils/adt/genfile.c:353 utils/adt/misc.c:213
 #: utils/misc/tzparser.c:323
 #, c-format
 msgid "could not open directory \"%s\": %m"
@@ -7055,258 +6700,258 @@ msgstr "Tablespace »%s« existiert nicht."
 msgid "tablespace %u is not empty"
 msgstr "Tablespace %u ist nicht leer"
 
-#: commands/trigger.c:166
+#: commands/trigger.c:159
 #, c-format
 msgid "\"%s\" is a table"
 msgstr "»%s« ist eine Tabelle"
 
-#: commands/trigger.c:168
+#: commands/trigger.c:161
 msgid "Tables cannot have INSTEAD OF triggers."
 msgstr "Tabellen können keine INSTEAD OF-Trigger haben."
 
-#: commands/trigger.c:179 commands/trigger.c:186
+#: commands/trigger.c:172 commands/trigger.c:179
 #, c-format
 msgid "\"%s\" is a view"
 msgstr "»%s« ist eine Sicht"
 
-#: commands/trigger.c:181
+#: commands/trigger.c:174
 msgid "Views cannot have row-level BEFORE or AFTER triggers."
-msgstr ""
+msgstr "Sichten können keine BEFORE- oder AFTER-Trigger auf Zeilenebene haben."
 
-#: commands/trigger.c:188
+#: commands/trigger.c:181
 msgid "Views cannot have TRUNCATE triggers."
 msgstr "Sichten können keine TRUNCATE-Trigger haben."
 
-#: commands/trigger.c:235
+#: commands/trigger.c:228
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "TRUNCATE FOR EACH ROW-Trigger werden nicht unterstützt"
 
-#: commands/trigger.c:243
+#: commands/trigger.c:236
 msgid "INSTEAD OF triggers must be FOR EACH ROW"
 msgstr "INSTEAD OF-Trigger müssen FOR EACH ROW sein"
 
-#: commands/trigger.c:247
+#: commands/trigger.c:240
 msgid "INSTEAD OF triggers cannot have WHEN conditions"
 msgstr "INSTEAD OF-Trigger können keine WHEN-Bedingungen haben"
 
-#: commands/trigger.c:251
+#: commands/trigger.c:244
 msgid "INSTEAD OF triggers cannot have column lists"
 msgstr "INSTEAD OF-Trigger können keine Spaltenlisten haben"
 
-#: commands/trigger.c:295
+#: commands/trigger.c:288
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr ""
 "Unteranfragen können nicht in der WHEN-Bedingung eines Triggers verwendet "
 "werden"
 
-#: commands/trigger.c:299
+#: commands/trigger.c:292
 msgid "cannot use aggregate function in trigger WHEN condition"
 msgstr ""
 "Aggregatfunktionen können nicht in der WHEN-Bedingung eines Triggers "
 "verwendet werden"
 
-#: commands/trigger.c:303
+#: commands/trigger.c:296
 msgid "cannot use window function in trigger WHEN condition"
 msgstr ""
 "Fensterfunktionen können nicht in der WHEN-Bedingung eines Triggers "
 "verwendet werden"
 
-#: commands/trigger.c:323 commands/trigger.c:336
+#: commands/trigger.c:318 commands/trigger.c:331
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr ""
 "WHEN-Bedingung eines Statement-Triggers kann keine Verweise auf Spaltenwerte "
 "enthalten"
 
-#: commands/trigger.c:328
+#: commands/trigger.c:323
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr ""
 "WHEN-Bedingung eines INSERT-Triggers kann keine Verweise auf OLD-Werte "
 "enthalten"
 
-#: commands/trigger.c:341
+#: commands/trigger.c:336
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr ""
 "WHEN-Bedingung eines DELETE-Triggers kann keine Verweise auf NEW-Werte "
 "enthalten"
 
-#: commands/trigger.c:346
+#: commands/trigger.c:341
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr ""
 "WHEN-Bedingung eines BEFORE-Triggers kann keine Verweise auf Systemspalten "
 "in NEW enthalten"
 
-#: commands/trigger.c:384
+#: commands/trigger.c:379
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"trigger\""
 msgstr "ändere Rückgabetyp von Funktion %s von »opaque« in »trigger«"
 
-#: commands/trigger.c:391
+#: commands/trigger.c:386
 #, c-format
 msgid "function %s must return type \"trigger\""
 msgstr "Funktion %s muss Typ »trigger« zurückgeben"
 
-#: commands/trigger.c:501 commands/trigger.c:1240
+#: commands/trigger.c:496 commands/trigger.c:1234
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "Trigger »%s« für Relation »%s« existiert bereits"
 
-#: commands/trigger.c:786
+#: commands/trigger.c:781
 msgid "Found referenced table's UPDATE trigger."
 msgstr "UPDATE-Trigger der Zieltabelle wurde gefunden."
 
-#: commands/trigger.c:787
+#: commands/trigger.c:782
 msgid "Found referenced table's DELETE trigger."
 msgstr "DELETE-Trigger der Zieltabelle wurde gefunden."
 
-#: commands/trigger.c:788
+#: commands/trigger.c:783
 msgid "Found referencing table's trigger."
 msgstr "Trigger der Quelltabelle wurde gefunden."
 
-#: commands/trigger.c:897 commands/trigger.c:913
+#: commands/trigger.c:892 commands/trigger.c:908
 #, c-format
 msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
 msgstr "unvollständige Triggergruppe für Constraint \"%s\" %s ignoriert"
 
-#: commands/trigger.c:925
+#: commands/trigger.c:920
 #, c-format
 msgid "converting trigger group into constraint \"%s\" %s"
 msgstr "Triggergruppe wird in Constraint \"%s\" %s umgewandelt"
 
-#: commands/trigger.c:1039
+#: commands/trigger.c:1036
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
 msgstr "Trigger »%s« für Tabelle »%s« existiert nicht, wird übersprungen"
 
-#: commands/trigger.c:1169 commands/trigger.c:1282 commands/trigger.c:1393
+#: commands/trigger.c:1163 commands/trigger.c:1276 commands/trigger.c:1387
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist"
 msgstr "Trigger »%s« für Tabelle »%s« existiert nicht"
 
-#: commands/trigger.c:1361
+#: commands/trigger.c:1355
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "keine Berechtigung: »%s« ist ein Systemtrigger"
 
-#: commands/trigger.c:1843
+#: commands/trigger.c:1837
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "Triggerfunktion %u gab NULL-Wert zurück"
 
-#: commands/trigger.c:1902 commands/trigger.c:2101 commands/trigger.c:2285
-#: commands/trigger.c:2527
+#: commands/trigger.c:1896 commands/trigger.c:2095 commands/trigger.c:2279
+#: commands/trigger.c:2521
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "Trigger für BEFORE STATEMENT kann keinen Wert zurückgeben"
 
-#: commands/trigger.c:2589 executor/execMain.c:1811
+#: commands/trigger.c:2583 executor/execMain.c:1864
 #: executor/nodeLockRows.c:137 executor/nodeModifyTable.c:366
 #: executor/nodeModifyTable.c:582
 msgid "could not serialize access due to concurrent update"
 msgstr "kann Zugriff nicht serialisieren wegen gleichzeitiger Aktualisierung"
 
-#: commands/trigger.c:4204
+#: commands/trigger.c:4198
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "Constraint »%s« ist nicht aufschiebbar"
 
-#: commands/trigger.c:4227
+#: commands/trigger.c:4221
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "Constraint »%s« existiert nicht"
 
-#: commands/tsearchcmds.c:116 commands/tsearchcmds.c:1043
+#: commands/tsearchcmds.c:117 commands/tsearchcmds.c:1044
 #, c-format
 msgid "function %s should return type %s"
 msgstr "Function %s sollte Rückgabetyp %s haben"
 
-#: commands/tsearchcmds.c:188
+#: commands/tsearchcmds.c:189
 msgid "must be superuser to create text search parsers"
 msgstr "nur Superuser können Textsucheparser anlegen"
 
-#: commands/tsearchcmds.c:236
+#: commands/tsearchcmds.c:237
 #, c-format
 msgid "text search parser parameter \"%s\" not recognized"
 msgstr "Textsucheparserparameter »%s« nicht erkannt"
 
-#: commands/tsearchcmds.c:246
+#: commands/tsearchcmds.c:247
 msgid "text search parser start method is required"
 msgstr "Textsucheparserstartmethode muss angegeben werden"
 
-#: commands/tsearchcmds.c:251
+#: commands/tsearchcmds.c:252
 msgid "text search parser gettoken method is required"
 msgstr "Gettoken-Methode für Textsucheparser muss angegeben werden"
 
-#: commands/tsearchcmds.c:256
+#: commands/tsearchcmds.c:257
 msgid "text search parser end method is required"
 msgstr "Textsucheparserendemethode muss angegeben werden"
 
-#: commands/tsearchcmds.c:261
+#: commands/tsearchcmds.c:262
 msgid "text search parser lextypes method is required"
 msgstr "Lextypes-Methode für Textsucheparser muss angegeben werden"
 
-#: commands/tsearchcmds.c:296
+#: commands/tsearchcmds.c:297
 msgid "must be superuser to drop text search parsers"
 msgstr "nur Superuser können Textsucheparser löschen"
 
-#: commands/tsearchcmds.c:325
+#: commands/tsearchcmds.c:326
 #, c-format
 msgid "text search parser \"%s\" does not exist, skipping"
 msgstr "Textsucheparser »%s« existiert nicht, wird übersprungen"
 
-#: commands/tsearchcmds.c:380
+#: commands/tsearchcmds.c:381
 msgid "must be superuser to rename text search parsers"
 msgstr "nur Superuser können Textsucheparser umbenennen"
 
-#: commands/tsearchcmds.c:398
+#: commands/tsearchcmds.c:399
 #, c-format
 msgid "text search parser \"%s\" already exists"
 msgstr "Textsucheparser »%s« existiert bereits"
 
-#: commands/tsearchcmds.c:524
+#: commands/tsearchcmds.c:525
 #, c-format
 msgid "text search template \"%s\" does not accept options"
 msgstr "Textsuchevorlage »%s« akzeptiert keine Optionen"
 
-#: commands/tsearchcmds.c:597
+#: commands/tsearchcmds.c:598
 msgid "text search template is required"
 msgstr "Textsuchevorlage muss angegeben werden"
 
-#: commands/tsearchcmds.c:666
+#: commands/tsearchcmds.c:667
 #, c-format
 msgid "text search dictionary \"%s\" already exists"
 msgstr "Textsuchewörterbuch »%s« existiert bereits"
 
-#: commands/tsearchcmds.c:774
+#: commands/tsearchcmds.c:775
 #, c-format
 msgid "text search dictionary \"%s\" does not exist, skipping"
 msgstr "Textsuchewörterbuch »%s« existiert nicht, wird übersprungen"
 
-#: commands/tsearchcmds.c:1107
+#: commands/tsearchcmds.c:1108
 msgid "must be superuser to create text search templates"
 msgstr "nur Superuser können Textsuchevorlagen erzeugen"
 
-#: commands/tsearchcmds.c:1144
+#: commands/tsearchcmds.c:1145
 #, c-format
 msgid "text search template parameter \"%s\" not recognized"
 msgstr "Textsuchevorlageparameter »%s« nicht erkannt"
 
-#: commands/tsearchcmds.c:1154
+#: commands/tsearchcmds.c:1155
 msgid "text search template lexize method is required"
 msgstr "Lexize-Methode für Textsuchevorlage muss angegeben werden"
 
-#: commands/tsearchcmds.c:1192
+#: commands/tsearchcmds.c:1193
 msgid "must be superuser to rename text search templates"
 msgstr "nur Superuser können Textsuchevorlagen umbenennen"
 
-#: commands/tsearchcmds.c:1211
+#: commands/tsearchcmds.c:1212
 #, c-format
 msgid "text search template \"%s\" already exists"
 msgstr "Textsuchevorlage »%s« existiert bereits"
 
-#: commands/tsearchcmds.c:1280
+#: commands/tsearchcmds.c:1281
 msgid "must be superuser to drop text search templates"
 msgstr "nur Superuser können Textsuchevorlagen löschen"
 
-#: commands/tsearchcmds.c:1309
+#: commands/tsearchcmds.c:1310
 #, c-format
 msgid "text search template \"%s\" does not exist, skipping"
 msgstr "Textsuchevorlage »%s« existiert nicht, wird übersprungen"
@@ -7446,27 +7091,27 @@ msgstr "mehrere Vorgabeausdrücke"
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "wiedersprüchliche NULL/NOT NULL-Constraints"
 
-#: commands/typecmds.c:1001 commands/typecmds.c:1983
+#: commands/typecmds.c:1001 commands/typecmds.c:1984
 msgid "unique constraints not possible for domains"
-msgstr "Unique Constraints sind nicht für Domänen möglich"
+msgstr "Unique-Constraints sind nicht für Domänen möglich"
 
-#: commands/typecmds.c:1007 commands/typecmds.c:1989
+#: commands/typecmds.c:1007 commands/typecmds.c:1990
 msgid "primary key constraints not possible for domains"
 msgstr "Primärschlüssel-Constraints sind nicht fürDomänen möglich"
 
-#: commands/typecmds.c:1013 commands/typecmds.c:1995
+#: commands/typecmds.c:1013 commands/typecmds.c:1996
 msgid "exclusion constraints not possible for domains"
 msgstr "Exclusion-Constraints sind nicht für Domänen möglich"
 
-#: commands/typecmds.c:1019 commands/typecmds.c:2001
+#: commands/typecmds.c:1019 commands/typecmds.c:2002
 msgid "foreign key constraints not possible for domains"
 msgstr "Fremdschlüssel-Constraints sind nicht für Domänen möglich"
 
-#: commands/typecmds.c:1028 commands/typecmds.c:2010
+#: commands/typecmds.c:1028 commands/typecmds.c:2011
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "Setzen des Constraint-Modus wird für Domänen nicht unterstützt"
 
-#: commands/typecmds.c:1272 utils/cache/typcache.c:761
+#: commands/typecmds.c:1272 utils/cache/typcache.c:996
 #, c-format
 msgid "%s is not an enum"
 msgstr "»%s« ist kein Enum"
@@ -7496,12 +7141,12 @@ msgstr "typmod_out-Funktion %s muss Typ »cstring« zurückgeben"
 msgid "type analyze function %s must return type \"boolean\""
 msgstr "Typanalysefunktion %s muss Typ »boolean« zurückgeben"
 
-#: commands/typecmds.c:1835
+#: commands/typecmds.c:1836
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "Spalte »%s« von Tabelle »%s« enthält NULL-Werte"
 
-#: commands/typecmds.c:2081
+#: commands/typecmds.c:2082
 #, c-format
 msgid ""
 "column \"%s\" of table \"%s\" contains values that violate the new constraint"
@@ -7509,37 +7154,37 @@ msgstr ""
 "Spalte »%s« von Tabelle »%s« enthält Werte, die den neuen Constraint "
 "verletzen"
 
-#: commands/typecmds.c:2286
+#: commands/typecmds.c:2287
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s ist keine Domäne"
 
-#: commands/typecmds.c:2368 commands/typecmds.c:2377
+#: commands/typecmds.c:2369 commands/typecmds.c:2378
 msgid "cannot use table references in domain check constraint"
 msgstr ""
 "Tabellenverweise können in Domänen-Check-Constraints nicht verwendet werden"
 
-#: commands/typecmds.c:2607 commands/typecmds.c:2679 commands/typecmds.c:2903
+#: commands/typecmds.c:2608 commands/typecmds.c:2680 commands/typecmds.c:2904
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s ist der Zeilentyp einer Tabelle"
 
-#: commands/typecmds.c:2609 commands/typecmds.c:2681 commands/typecmds.c:2905
+#: commands/typecmds.c:2610 commands/typecmds.c:2682 commands/typecmds.c:2906
 msgid "Use ALTER TABLE instead."
 msgstr "Verwenden Sie stattdessen ALTER TABLE."
 
-#: commands/typecmds.c:2616 commands/typecmds.c:2688 commands/typecmds.c:2834
+#: commands/typecmds.c:2617 commands/typecmds.c:2689 commands/typecmds.c:2835
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "Array-Typ %s kann nicht verändert werden"
 
-#: commands/typecmds.c:2618 commands/typecmds.c:2690 commands/typecmds.c:2836
+#: commands/typecmds.c:2619 commands/typecmds.c:2691 commands/typecmds.c:2837
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr ""
 "Sie können den Typ %s ändern, wodurch der Array-Typ ebenfalls geändert wird."
 
-#: commands/typecmds.c:2889
+#: commands/typecmds.c:2890
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "Typ %s existiert bereits in Schema »%s«"
@@ -7554,48 +7199,50 @@ msgstr ""
 "Schließen Sie bald alle offenen Transaktionen, um Überlaufprobleme zu "
 "vermeiden."
 
-#: commands/vacuum.c:736
+#: commands/vacuum.c:811
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 "einige Datenbanken sind seit über 2 Milliarden Transaktionen nicht gevacuumt "
 "worden"
 
-#: commands/vacuum.c:737
+#: commands/vacuum.c:812
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr ""
 "Sie haben möglicherweise bereits Daten wegen Transaktionsnummernüberlauf "
 "verloren."
 
-#: commands/vacuum.c:851
+#: commands/vacuum.c:919
 #, c-format
 msgid "skipping vacuum of \"%s\" --- lock not available"
 msgstr "überspringe Vacuum von »%s« --- Sperre nicht verfügbar"
 
-#: commands/vacuum.c:877
+#: commands/vacuum.c:945
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr "überspringe »%s« --- nur Superuser kann sie vacuumen"
 
-#: commands/vacuum.c:881
+#: commands/vacuum.c:949
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr ""
 "überspringe »%s« --- nur Superuser oder Eigentümer der Datenbank kann sie "
 "vacuumen"
 
-#: commands/vacuum.c:885
+#: commands/vacuum.c:953
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr ""
 "überspringe »%s« --- nur Eigentümer der Tabelle oder der Datenbank kann sie "
 "vacuumen"
 
-#: commands/vacuum.c:902
+#: commands/vacuum.c:970
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
-msgstr "überspringe »%s« --- kann Nicht-Tabellen oder besondere Systemtabellen nicht vacuumen"
+msgstr ""
+"überspringe »%s« --- kann Nicht-Tabellen oder besondere Systemtabellen nicht "
+"vacuumen"
 
-#: commands/vacuumlazy.c:234
+#: commands/vacuumlazy.c:254
 #, c-format
 msgid ""
 "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
@@ -7608,18 +7255,18 @@ msgstr ""
 "Tuple: %.0f entfernt, %.0f noch vorhanden\n"
 "Systembenutzung: %s"
 
-#: commands/vacuumlazy.c:450
+#: commands/vacuumlazy.c:508
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr ""
 "Seite %2$u in Relation »%1$s« ist nicht initialisiert --- wird repariert"
 
-#: commands/vacuumlazy.c:801
+#: commands/vacuumlazy.c:865
 #, c-format
 msgid "\"%s\": removed %.0f row versions in %u pages"
 msgstr "»%s«: %.0f Zeilenversionen in %u Seiten entfernt"
 
-#: commands/vacuumlazy.c:806
+#: commands/vacuumlazy.c:870
 #, c-format
 msgid ""
 "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
@@ -7628,7 +7275,7 @@ msgstr ""
 "»%s«: %.0f entfernbare, %.0f nicht entfernbare Zeilenversionen in %u von %u "
 "Seiten gefunden"
 
-#: commands/vacuumlazy.c:809
+#: commands/vacuumlazy.c:874
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -7641,28 +7288,28 @@ msgstr ""
 "%u Seiten sind vollkommen leer.\n"
 "%s."
 
-#: commands/vacuumlazy.c:867
+#: commands/vacuumlazy.c:932
 #, c-format
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr "»%s«: %d Zeilenversionen in %d Seiten entfernt"
 
-#: commands/vacuumlazy.c:870 commands/vacuumlazy.c:962
-#: commands/vacuumlazy.c:1087
+#: commands/vacuumlazy.c:935 commands/vacuumlazy.c:1027
+#: commands/vacuumlazy.c:1160
 #, c-format
 msgid "%s."
 msgstr "%s."
 
-#: commands/vacuumlazy.c:959
+#: commands/vacuumlazy.c:1024
 #, c-format
 msgid "scanned index \"%s\" to remove %d row versions"
 msgstr "Index »%s« gelesen und %d Zeilenversionen entfernt"
 
-#: commands/vacuumlazy.c:1001
+#: commands/vacuumlazy.c:1065
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "Index »%s« enthält %.0f Zeilenversionen in %u Seiten"
 
-#: commands/vacuumlazy.c:1005
+#: commands/vacuumlazy.c:1069
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -7673,12 +7320,12 @@ msgstr ""
 "%u Indexseiten wurden gelöscht, %u sind gegenwärtig wiederverwendbar.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1084
+#: commands/vacuumlazy.c:1157
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "»%s«: von %u auf %u Seiten verkürzt"
 
-#: commands/variable.c:160 utils/misc/guc.c:8175
+#: commands/variable.c:160 utils/misc/guc.c:8205
 #, c-format
 msgid "Unrecognized key word: \"%s\"."
 msgstr "Unbekanntes Schlüsselwort: »%s«."
@@ -7711,11 +7358,9 @@ msgstr ""
 "Transaktion setzen"
 
 #: commands/variable.c:589
-#, fuzzy
 msgid "transaction read-write mode must be set before any query"
 msgstr ""
-"kann den Read/Write-Modus einer Transaktion nicht während der "
-"Wiederherstellung setzen"
+"Read/Write-Modus einer Transaktion muss vor allen Anfragen gesetzt werden"
 
 #: commands/variable.c:595
 msgid "cannot set transaction read-write mode during recovery"
@@ -7735,37 +7380,33 @@ msgstr ""
 "aufgerufen werden"
 
 #: commands/variable.c:655
-#, fuzzy
 msgid "cannot use serializable mode in a hot standby"
-msgstr "initialisiere für Hot Standby"
+msgstr "kann serialisierbaren Modus nicht in einem Hot Standby verwenden"
 
 #: commands/variable.c:656
-#, fuzzy
 msgid "You can use REPEATABLE READ instead."
-msgstr "Sie könnten stattdessen EXECUTE ... INTO verwenden."
+msgstr "Sie können stattdessen REPEATABLE READ verwenden."
 
 #: commands/variable.c:704
-#, fuzzy
 msgid ""
 "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr ""
-"SET TRANSACTION ISOLATION LEVEL kann nicht in einer Subtransaktion "
+"SET TRANSACTION [NOT] DEFERRABLE kann nicht in einer Subtransaktion "
 "aufgerufen werden"
 
 #: commands/variable.c:710
-#, fuzzy
 msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
 msgstr ""
-"SET TRANSACTION ISOLATION LEVEL muss vor allen Anfragen aufgerufen werden"
+"SET TRANSACTION [NOT] DEFERRABLE muss vor allen Anfragen aufgerufen werden"
 
 #: commands/variable.c:792
-#, fuzzy, c-format
+#, c-format
 msgid "Conversion between %s and %s is not supported."
-msgstr "Umwandlung zwischen %s und %s wird nicht unterstützt"
+msgstr "Umwandlung zwischen %s und %s wird nicht unterstützt."
 
 #: commands/variable.c:799
 msgid "Cannot change \"client_encoding\" now."
-msgstr ""
+msgstr "»client_encoding« kann jetzt nicht geändert werden."
 
 #: commands/variable.c:969
 #, c-format
@@ -7773,26 +7414,26 @@ msgid "permission denied to set role \"%s\""
 msgstr "keine Berechtigung, um Rolle »%s« zu setzen"
 
 #: commands/view.c:143
-#, fuzzy, c-format
+#, c-format
 msgid "could not determine which collation to use for view column \"%s\""
 msgstr ""
-"konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion »%s« nicht "
-"ermitteln"
+"konnte die für die Sichtspalte »%s« zu verwendende Sortierfolge nicht "
+"bestimmen"
 
 #: commands/view.c:158
 msgid "view must have at least one column"
 msgstr "Sicht muss mindestens eine Spalte haben"
 
-#: commands/view.c:284 commands/view.c:296
+#: commands/view.c:283 commands/view.c:295
 msgid "cannot drop columns from view"
 msgstr "aus einer Sicht können keine Spalten gelöscht werden"
 
-#: commands/view.c:301
+#: commands/view.c:300
 #, c-format
 msgid "cannot change name of view column \"%s\" to \"%s\""
 msgstr "kann Namen der Sichtspalte »%s« nicht in »%s« ändern"
 
-#: commands/view.c:309
+#: commands/view.c:308
 #, c-format
 msgid "cannot change data type of view column \"%s\" from %s to %s"
 msgstr "kann Datentyp der Sichtspalte »%s« nicht von %s in %s ändern"
@@ -7810,223 +7451,259 @@ msgstr ""
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW gibt mehr Spaltennamen als Spalten an"
 
-#: commands/view.c:496
-#, c-format
-msgid "view \"%s\" will be a temporary view"
-msgstr "Sicht »%s« wird eine temporäre Sicht"
-
-#: commands/view.c:504
+#: commands/view.c:487
 msgid "views cannot be unlogged because they do not have storage"
 msgstr ""
 "Sichten können nicht ungeloggt sein, weil sie keinen Speicherplatz verwenden"
 
+#: commands/view.c:501
+#, c-format
+msgid "view \"%s\" will be a temporary view"
+msgstr "Sicht »%s« wird eine temporäre Sicht"
+
 #: commands/seclabel.c:58
 msgid "no security label providers have been loaded"
-msgstr ""
+msgstr "es sind keine Security-Label-Provider geladen"
 
 #: commands/seclabel.c:62
 msgid ""
 "must specify provider when multiple security label providers have been loaded"
 msgstr ""
+"Provider muss angegeben werden, wenn mehrere Security-Label-Provider geladen "
+"sind"
 
 #: commands/seclabel.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "security label provider \"%s\" is not loaded"
-msgstr "Variable »%s« ist nicht deklariert"
+msgstr "Security-Label-Provider »%s« ist nicht geladen"
 
-#: commands/extension.c:147 commands/extension.c:2431
+#: commands/extension.c:149 commands/extension.c:2459
 #, c-format
 msgid "extension \"%s\" does not exist"
 msgstr "Erweiterung »%s« existiert nicht"
 
-#: commands/extension.c:246 commands/extension.c:255 commands/extension.c:267
-#: commands/extension.c:277
+#: commands/extension.c:248 commands/extension.c:257 commands/extension.c:269
+#: commands/extension.c:279
 #, c-format
 msgid "invalid extension name: \"%s\""
 msgstr "ungültiger Erweiterungsname: »%s«"
 
-#: commands/extension.c:247
+#: commands/extension.c:249
 msgid "Extension names must not be empty."
 msgstr "Erweiterungsnamen dürfen nicht leer sein."
 
-#: commands/extension.c:256
+#: commands/extension.c:258
 msgid "Extension names must not contain \"--\"."
 msgstr "Erweiterungsnamen dürfen nicht »--« enthalten."
 
-#: commands/extension.c:268
+#: commands/extension.c:270
 msgid "Extension names must not begin or end with \"-\"."
 msgstr "Erweiterungsnamen dürfen nicht mit »-« anfangen oder aufhören."
 
-#: commands/extension.c:278
+#: commands/extension.c:280
 msgid "Extension names must not contain directory separator characters."
 msgstr "Erweiterungsnamen dürfen keine Verzeichnistrennzeichen enthalten."
 
-#: commands/extension.c:293 commands/extension.c:302 commands/extension.c:311
-#: commands/extension.c:321
+#: commands/extension.c:295 commands/extension.c:304 commands/extension.c:313
+#: commands/extension.c:323
 #, c-format
 msgid "invalid extension version name: \"%s\""
 msgstr "ungültiger Erweiterungsversionsname: »%s«"
 
-#: commands/extension.c:294
+#: commands/extension.c:296
 msgid "Version names must not be empty."
 msgstr "Versionsnamen dürfen nicht leer sein."
 
-#: commands/extension.c:303
+#: commands/extension.c:305
 msgid "Version names must not contain \"--\"."
 msgstr "Versionsnamen dürfen nicht »--« enthalten."
 
-#: commands/extension.c:312
+#: commands/extension.c:314
 msgid "Version names must not begin or end with \"-\"."
 msgstr "Versionsnamen dürfen nicht mit »-« anfangen oder aufhören."
 
-#: commands/extension.c:322
+#: commands/extension.c:324
 msgid "Version names must not contain directory separator characters."
 msgstr "Versionsnamen dürfen keine Verzeichnistrennzeichen enthalten."
 
-#: commands/extension.c:472
+#: commands/extension.c:474
 #, c-format
 msgid "could not open extension control file \"%s\": %m"
 msgstr "konnte Erweiterungskontrolldatei »%s« nicht öffnen: %m"
 
-#: commands/extension.c:493 commands/extension.c:503
-#, fuzzy, c-format
+#: commands/extension.c:495 commands/extension.c:505
+#, c-format
 msgid "parameter \"%s\" cannot be set in a secondary extension control file"
-msgstr "Parameter »%s« kann nach Start der Verbindung nicht geändert werden"
+msgstr ""
+"Parameter »%s« kann nicht in einer sekundären Erweitungskontrolldatei "
+"gesetzt werden"
 
-#: commands/extension.c:542
+#: commands/extension.c:544
 #, c-format
 msgid "\"%s\" is not a valid encoding name"
 msgstr "»%s« ist kein gültiger Kodierungsname"
 
-#: commands/extension.c:556
-#, fuzzy, c-format
+#: commands/extension.c:558
+#, c-format
 msgid "parameter \"%s\" must be a list of extension names"
-msgstr "Argument von Option »%s« muss eine Liste aus Spaltennamen sein"
+msgstr "Parameter »%s« muss eine Liste von Erweiterungsnamen sein"
 
-#: commands/extension.c:563
+#: commands/extension.c:565
 #, c-format
 msgid "unrecognized parameter \"%s\" in file \"%s\""
 msgstr "unbekannter Parameter »%s« in Datei »%s«"
 
-#: commands/extension.c:572
-#, fuzzy
+#: commands/extension.c:574
 msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
-msgstr "Parameter »%s« kann nach Start der Verbindung nicht geändert werden"
+msgstr ""
+"Parameter »schema« kann nicht angegeben werden, wenn »relocatable« an ist"
 
-#: commands/extension.c:724
+#: commands/extension.c:726
 msgid ""
 "transaction control statements are not allowed within an extension script"
 msgstr ""
+"Transaktionskontrollanweisungen sind nicht in einem Erweiterungsskript "
+"erlaubt"
 
 #: commands/extension.c:794
-#, fuzzy, c-format
+#, c-format
 msgid "permission denied to create extension \"%s\""
-msgstr "keine Berechtigung, um Tablespace »%s« zu erzeugen"
+msgstr "keine Berechtigung, um Erweiterung »%s« zu erzeugen"
 
 #: commands/extension.c:796
 msgid "Must be superuser to create this extension."
 msgstr "Nur Superuser können diese Erweiterung anlegen."
 
 #: commands/extension.c:800
-#, fuzzy, c-format
+#, c-format
 msgid "permission denied to update extension \"%s\""
-msgstr "keine Berechtigung, um Tablespace »%s« zu erzeugen"
+msgstr "keine Berechtigung, um Erweiterung »%s« zu aktualisieren"
 
 #: commands/extension.c:802
-#, fuzzy
 msgid "Must be superuser to update this extension."
-msgstr "Nur Superuser können Tablespaces anlegen."
+msgstr "Nur Superuser können diese Erweiterung aktualisieren."
 
-#: commands/extension.c:1082
-#, fuzzy, c-format
+#: commands/extension.c:1084
+#, c-format
 msgid ""
 "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
-msgstr "Relation »%s« ist keine Basisrelation von Relation »%s«"
+msgstr ""
+"Erweiterung »%s« hat keinen Aktualisierungspfad von Version »%s« auf Version "
+"»%s«"
 
-#: commands/extension.c:1209
+#: commands/extension.c:1211
 #, c-format
 msgid "extension \"%s\" already exists, skipping"
 msgstr "Erweiterung »%s« existiert bereits, wird übersprungen"
 
-#: commands/extension.c:1216
+#: commands/extension.c:1218
 #, c-format
 msgid "extension \"%s\" already exists"
 msgstr "Erweiterung »%s« existiert bereits"
 
-#: commands/extension.c:1227
-#, fuzzy
+#: commands/extension.c:1229
 msgid "nested CREATE EXTENSION is not supported"
-msgstr "LOCATION wird nicht mehr unterstützt"
+msgstr "geschachteltes CREATE EXTENSION wird nicht unterstützt"
 
-#: commands/extension.c:1282 commands/extension.c:2491
-#, fuzzy
+#: commands/extension.c:1284 commands/extension.c:2519
 msgid "version to install must be specified"
-msgstr "Hostname muss angegeben werden\n"
+msgstr "die zu installierende Version muss angegeben werden"
 
-#: commands/extension.c:1299
+#: commands/extension.c:1301
 #, c-format
 msgid "FROM version must be different from installation target version \"%s\""
 msgstr ""
+"FROM-Version muss verschieden von der zu installierenden Version »%s« sein"
 
-#: commands/extension.c:1354
-#, fuzzy, c-format
+#: commands/extension.c:1356
+#, c-format
 msgid "extension \"%s\" must be installed in schema \"%s\""
-msgstr "Relation »%s« ist bereits in Schema »%s«"
+msgstr "Erweiterung »%s« muss in Schema »%s« installiert werden"
 
-#: commands/extension.c:1424 commands/extension.c:2632
-#, fuzzy, c-format
+#: commands/extension.c:1435 commands/extension.c:2660
+#, c-format
 msgid "required extension \"%s\" is not installed"
-msgstr "Relation »%s«, auf die verwiesen wird, ist keine Tabelle"
+msgstr "benötigte Erweiterung »%s« ist nicht installiert"
 
-#: commands/extension.c:1593
+#: commands/extension.c:1604
 #, c-format
 msgid "extension \"%s\" does not exist, skipping"
 msgstr "Erweiterung »%s« existiert nicht, wird übersprungen"
 
-#: commands/extension.c:2101
+#: commands/extension.c:1659
+#, c-format
+msgid "cannot drop extension \"%s\" because it is being modified"
+msgstr "Erweiterung »%s« kann nicht gelöscht werden, weil sie gerade geändert wird"
+
+#: commands/extension.c:2129
 msgid ""
-"pg_extension_config_dump() can only be called from a SQL script executed by "
+"pg_extension_config_dump() can only be called from an SQL script executed by "
 "CREATE EXTENSION"
 msgstr ""
+"pg_extension_config_dump() kann nur von einem SQL-Skript aufgerufen werden, "
+"das von CREATE EXTENSION ausgeführt wird"
 
-#: commands/extension.c:2113
+#: commands/extension.c:2141
 #, c-format
 msgid "OID %u does not refer to a table"
 msgstr "OID %u bezieht sich nicht auf eine Tabelle"
 
-#: commands/extension.c:2118
-#, fuzzy, c-format
+#: commands/extension.c:2146
+#, c-format
 msgid "table \"%s\" is not a member of the extension being created"
-msgstr "Rolle »%s« ist kein Mitglied der Rolle »%s«"
+msgstr "Tabelle »%s« ist kein Mitglied der anzulegenden Erweiterung"
 
-#: commands/extension.c:2301 commands/extension.c:2360
-#, fuzzy, c-format
+#: commands/extension.c:2329 commands/extension.c:2388
+#, c-format
 msgid "extension \"%s\" does not support SET SCHEMA"
-msgstr "Zugriffsmethode »%s« unterstützt die Optionen ASC/DESC nicht"
+msgstr "Erweiterung »%s« unterstützt SET SCHEMA nicht"
 
-#: commands/extension.c:2362
-#, fuzzy, c-format
+#: commands/extension.c:2390
+#, c-format
 msgid "%s is not in the extension's schema \"%s\""
-msgstr "Funktion %s existiert bereits in Schema »%s«"
+msgstr "%s ist nicht im Schema der Erweiterung (»%s«)"
 
-#: commands/extension.c:2411
+#: commands/extension.c:2439
 msgid "nested ALTER EXTENSION is not supported"
 msgstr "geschachteltes ALTER EXTENSION wird nicht unterstützt"
 
-#: commands/extension.c:2502
-#, fuzzy, c-format
+#: commands/extension.c:2530
+#, c-format
 msgid "version \"%s\" of extension \"%s\" is already installed"
-msgstr "Spalte »%s« von Relation »%s« existiert bereits"
-
-#: commands/extension.c:2725
-#, fuzzy, c-format
-msgid "%s is already a member of extension \"%s\""
-msgstr "Rolle »%s« ist schon Mitglied der Rolle »%s«"
+msgstr "Version »%s« von Erweiterung »%s« ist bereits installiert"
 
-#: commands/extension.c:2742
-#, fuzzy, c-format
+#: commands/extension.c:2770
+#, c-format
 msgid "%s is not a member of extension \"%s\""
-msgstr "Rolle »%s« ist kein Mitglied der Rolle »%s«"
+msgstr "%s ist kein Mitglied der Erweiterung »%s«"
+
+#: commands/collationcmds.c:81
+#, c-format
+msgid "collation attribute \"%s\" not recognized"
+msgstr "Attribut »%s« für Sortierfolge unbekannt"
+
+#: commands/collationcmds.c:126
+msgid "parameter \"lc_collate\" must be specified"
+msgstr "Parameter »lc_collate« muss angegeben werden"
+
+#: commands/collationcmds.c:131
+msgid "parameter \"lc_ctype\" must be specified"
+msgstr "Parameter »lc_ctype« muss angegeben werden"
+
+#: commands/collationcmds.c:177
+#, c-format
+msgid "collation \"%s\" does not exist, skipping"
+msgstr "Sortierfolge »%s« existiert nicht, wird übersprungen"
+
+#: commands/collationcmds.c:237 commands/collationcmds.c:416
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
+msgstr "Sortierfolge »%s« für Kodierung »%s« existiert bereits in Schema »%s«"
+
+#: commands/collationcmds.c:249 commands/collationcmds.c:428
+#, c-format
+msgid "collation \"%s\" already exists in schema \"%s\""
+msgstr "Sortierfolge »%s« existiert bereits in Schema »%s«"
 
 #: tcop/fastpath.c:109 tcop/fastpath.c:485 tcop/fastpath.c:615
 #, c-format
@@ -8076,7 +7753,7 @@ msgid "incorrect binary data format in function argument %d"
 msgstr "falsches Binärdatenformat in Funktionsargument %d"
 
 #: tcop/postgres.c:399 tcop/postgres.c:411 tcop/postgres.c:422
-#: tcop/postgres.c:434 tcop/postgres.c:4150
+#: tcop/postgres.c:434 tcop/postgres.c:4152
 #, c-format
 msgid "invalid frontend message type %d"
 msgstr "ungültiger Frontend-Message-Typ %d"
@@ -8195,7 +7872,7 @@ msgstr ""
 "Benutzeranfrage hat möglicherweise Zeilenversionen sehen müssen, die "
 "entfernt werden müssen."
 
-#: tcop/postgres.c:2249 storage/ipc/standby.c:490
+#: tcop/postgres.c:2249 storage/ipc/standby.c:491
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr ""
 "Benutzertransaktion hat Verklemmung (Deadlock) mit Wiederherstellung "
@@ -8219,7 +7896,7 @@ msgstr ""
 "zurückzurollen und die Sitzung zu beenden, weil ein anderer Serverprozess "
 "abnormal beendet wurde und möglicherweise das Shared Memory verfälscht hat."
 
-#: tcop/postgres.c:2591 tcop/postgres.c:2939
+#: tcop/postgres.c:2591 tcop/postgres.c:2941
 msgid ""
 "In a moment you should be able to reconnect to the database and repeat your "
 "command."
@@ -8227,11 +7904,11 @@ msgstr ""
 "In einem Moment sollten Sie wieder mit der Datenbank verbinden und Ihren "
 "Befehl wiederholen können."
 
-#: tcop/postgres.c:2701
+#: tcop/postgres.c:2703
 msgid "floating-point exception"
 msgstr "Fließkommafehler"
 
-#: tcop/postgres.c:2702
+#: tcop/postgres.c:2704
 msgid ""
 "An invalid floating-point operation was signaled. This probably means an out-"
 "of-range result or an invalid operation, such as division by zero."
@@ -8240,58 +7917,58 @@ msgstr ""
 "wahrscheinlich ein Ergebnis außerhalb des gültigen Bereichs oder eine "
 "ungültige Operation, zum Beispiel Division durch null."
 
-#: tcop/postgres.c:2870
+#: tcop/postgres.c:2872
 msgid "terminating autovacuum process due to administrator command"
 msgstr "breche Autovacuum-Prozess ab aufgrund von Anweisung des Administrators"
 
-#: tcop/postgres.c:2876 tcop/postgres.c:2886 tcop/postgres.c:2937
+#: tcop/postgres.c:2878 tcop/postgres.c:2888 tcop/postgres.c:2939
 msgid "terminating connection due to conflict with recovery"
 msgstr "breche Verbindung ab wegen Konflikt mit der Wiederherstellung"
 
-#: tcop/postgres.c:2892
+#: tcop/postgres.c:2894
 msgid "terminating connection due to administrator command"
 msgstr "breche Verbindung ab aufgrund von Anweisung des Administrators"
 
-#: tcop/postgres.c:2907
+#: tcop/postgres.c:2909
 msgid "canceling authentication due to timeout"
 msgstr "storniere Authentifizierung wegen Zeitüberschreitung"
 
-#: tcop/postgres.c:2916
+#: tcop/postgres.c:2918
 msgid "canceling statement due to statement timeout"
 msgstr "storniere Anfrage wegen Zeitüberschreitung"
 
-#: tcop/postgres.c:2925
+#: tcop/postgres.c:2927
 msgid "canceling autovacuum task"
 msgstr "storniere Autovacuum-Aufgabe"
 
-#: tcop/postgres.c:2944 storage/ipc/standby.c:489
+#: tcop/postgres.c:2946 storage/ipc/standby.c:490
 msgid "canceling statement due to conflict with recovery"
 msgstr "storniere Anfrage wegen Konflikt mit der Wiederherstellung"
 
-#: tcop/postgres.c:2960
+#: tcop/postgres.c:2962
 msgid "canceling statement due to user request"
 msgstr "storniere Anfrage wegen Benutzeraufforderung"
 
-#: tcop/postgres.c:3041 tcop/postgres.c:3063
+#: tcop/postgres.c:3043 tcop/postgres.c:3065
 msgid "stack depth limit exceeded"
 msgstr "Grenze für Stacktiefe überschritten"
 
-#: tcop/postgres.c:3042 tcop/postgres.c:3064
-#, fuzzy, c-format
+#: tcop/postgres.c:3044 tcop/postgres.c:3066
+#, c-format
 msgid ""
 "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
 "after ensuring the platform's stack depth limit is adequate."
 msgstr ""
-"Erhöhen Sie den Konfigurationsparameter »max_stack_depth«, nachdem Sie "
-"sichergestellt haben, dass die Stacktiefenbegrenzung Ihrer Plattform "
-"ausreichend ist."
+"Erhöhen Sie den Konfigurationsparameter »max_stack_depth« (aktuell %dkB), "
+"nachdem Sie sichergestellt haben, dass die Stacktiefenbegrenzung Ihrer "
+"Plattform ausreichend ist."
 
-#: tcop/postgres.c:3080
-#, fuzzy, c-format
+#: tcop/postgres.c:3082
+#, c-format
 msgid "\"max_stack_depth\" must not exceed %ldkB."
-msgstr "»max_stack_depth« darf %ldkB nicht überschreiten"
+msgstr "»max_stack_depth« darf %ldkB nicht überschreiten."
 
-#: tcop/postgres.c:3082
+#: tcop/postgres.c:3084
 msgid ""
 "Increase the platform's stack depth limit via \"ulimit -s\" or local "
 "equivalent."
@@ -8299,36 +7976,36 @@ msgstr ""
 "Erhöhen Sie die Stacktiefenbegrenzung Ihrer Plattform mit »ulimit -s« oder "
 "der lokalen Entsprechung."
 
-#: tcop/postgres.c:3417
+#: tcop/postgres.c:3419
 msgid "invalid command-line arguments for server process"
 msgstr "ungültige Kommandozeilenargumente für Serverprozess"
 
-#: tcop/postgres.c:3418 tcop/postgres.c:3424
+#: tcop/postgres.c:3420 tcop/postgres.c:3426
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Versuchen Sie »%s --help« für weitere Informationen."
 
-#: tcop/postgres.c:3422
+#: tcop/postgres.c:3424
 #, c-format
 msgid "%s: invalid command-line arguments"
 msgstr "%s: ungültige Kommandozeilenargumente"
 
-#: tcop/postgres.c:3521
+#: tcop/postgres.c:3523
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: weder Datenbankname noch Benutzername angegeben"
 
-#: tcop/postgres.c:4060
+#: tcop/postgres.c:4062
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "ungültiger Subtyp %d von CLOSE-Message"
 
-#: tcop/postgres.c:4093
+#: tcop/postgres.c:4095
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "ungültiger Subtyp %d von DESCRIBE-Message"
 
-#: tcop/postgres.c:4327
+#: tcop/postgres.c:4329
 #, c-format
 msgid ""
 "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
@@ -8417,39 +8094,35 @@ msgstr ""
 msgid "no value found for parameter %d"
 msgstr "kein Wert für Parameter %d gefunden"
 
-#: executor/execMain.c:844 parser/analyze.c:2382
-#, fuzzy, c-format
-msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
-msgstr "SELECT FOR UPDATE/SHARE kann nicht auf einen Verbund angewendet werden"
-
-#: executor/execMain.c:994
+#: executor/execMain.c:996
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "kann Sequenz »%s« nicht ändern"
 
-#: executor/execMain.c:1000
+#: executor/execMain.c:1002
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "kann TOAST-Relation »%s« nicht ändern"
 
-#: executor/execMain.c:1010
-#, fuzzy, c-format
+#: executor/execMain.c:1012
+#, c-format
 msgid "cannot insert into view \"%s\""
-msgstr "kann nicht in eine Sicht einfügen"
+msgstr "kann nicht in Sicht »%s« einfügen"
 
-#: executor/execMain.c:1012
-#, fuzzy
+#: executor/execMain.c:1014
 msgid ""
 "You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT "
 "trigger."
-msgstr "Sie benötigen eine ON INSERT DO INSTEAD Regel ohne Bedingung."
+msgstr ""
+"Sie benötigen eine ON INSERT DO INSTEAD Regel ohne Bedingung oder einen "
+"INSTEAD OF INSERT Trigger."
 
-#: executor/execMain.c:1018
+#: executor/execMain.c:1020
 #, c-format
 msgid "cannot update view \"%s\""
 msgstr "kann Sicht »%s« nicht aktualisieren"
 
-#: executor/execMain.c:1020
+#: executor/execMain.c:1022
 msgid ""
 "You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE "
 "trigger."
@@ -8457,34 +8130,60 @@ msgstr ""
 "Sie benötigen eine ON UPDATE DO INSTEAD Regel ohne Bedingung oder einen "
 "INSTEAD OF UPDATE Trigger."
 
-#: executor/execMain.c:1026
-#, fuzzy, c-format
+#: executor/execMain.c:1028
+#, c-format
 msgid "cannot delete from view \"%s\""
-msgstr "kann nicht in einer Sicht löschen"
+msgstr "kann nicht in Sicht »%s« löschen"
 
-#: executor/execMain.c:1028
-#, fuzzy
+#: executor/execMain.c:1030
 msgid ""
 "You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE "
 "trigger."
-msgstr "Sie benötigen eine ON DELETE DO INSTEAD Regel ohne Bedingung."
+msgstr ""
+"Sie benötigen eine ON DELETE DO INSTEAD Regel ohne Bedingung oder einen "
+"INSTEAD OF DELETE Trigger."
 
-#: executor/execMain.c:1038
-#, fuzzy, c-format
+#: executor/execMain.c:1040
+#, c-format
 msgid "cannot change foreign table \"%s\""
-msgstr "kann Relation »%s« nicht ändern"
+msgstr "kann Fremdtabelle »%s« nicht ändern"
 
-#: executor/execMain.c:1044
+#: executor/execMain.c:1046
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "kann Relation »%s« nicht ändern"
 
-#: executor/execMain.c:1515
+#: executor/execMain.c:1070
+#, c-format
+msgid "cannot lock rows in sequence \"%s\""
+msgstr "kann Zeilen in Sequenz »%s« nicht sperren"
+
+#: executor/execMain.c:1077
+#, c-format
+msgid "cannot lock rows in TOAST relation \"%s\""
+msgstr "kann Zeilen in TOAST-Relation »%s« nicht sperren"
+
+#: executor/execMain.c:1084
+#, c-format
+msgid "cannot lock rows in view \"%s\""
+msgstr "kann Zeilen in Sicht »%s« nicht sperren"
+
+#: executor/execMain.c:1091
+#, c-format
+msgid "cannot lock rows in foreign table \"%s\""
+msgstr "kann Zeilen in Fremdtabelle »%s« nicht sperren"
+
+#: executor/execMain.c:1097
+#, c-format
+msgid "cannot lock rows in relation \"%s\""
+msgstr "kann Zeilen in Relation »%s« nicht sperren"
+
+#: executor/execMain.c:1568
 #, c-format
 msgid "null value in column \"%s\" violates not-null constraint"
 msgstr "NULL-Wert in Spalte »%s« verletzt Not-Null-Constraint"
 
-#: executor/execMain.c:1527
+#: executor/execMain.c:1580
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "neue Zeile für Relation »%s« verletzt Check-Constraint »%s«"
@@ -8492,7 +8191,7 @@ msgstr "neue Zeile für Relation »%s« verletzt Check-Constraint »%s«"
 #: executor/execQual.c:298 executor/execQual.c:326 executor/execQual.c:2987
 #: utils/adt/array_userfuncs.c:430 utils/adt/arrayfuncs.c:228
 #: utils/adt/arrayfuncs.c:507 utils/adt/arrayfuncs.c:1242
-#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:4934
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:4940
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "Anzahl der Arraydimensionen (%d) überschreitet erlaubtes Maximum (%d)"
@@ -8640,12 +8339,12 @@ msgstr "Domäne %s erlaubt keine NULL-Werte"
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "Wert für Domäne %s verletzt Check-Constraint »%s«"
 
-#: executor/execQual.c:4288 optimizer/util/clauses.c:608
+#: executor/execQual.c:4288 optimizer/util/clauses.c:573
 #: parser/parse_agg.c:164
 msgid "aggregate function calls cannot be nested"
 msgstr "Aufrufe von Aggregatfunktionen können nicht geschachtelt werden"
 
-#: executor/execQual.c:4326 optimizer/util/clauses.c:682
+#: executor/execQual.c:4326 optimizer/util/clauses.c:647
 #: parser/parse_agg.c:211
 msgid "window function calls cannot be nested"
 msgstr "Aufrufe von Fensterfunktionen können nicht geschachtelt werden"
@@ -8665,22 +8364,22 @@ msgstr "ROW()-Spalte hat Typ %s statt Typ %s"
 msgid "could not identify a comparison function for type %s"
 msgstr "konnte keine Vergleichsfunktion für Typ %s ermitteln"
 
-#: executor/execUtils.c:1304
+#: executor/execUtils.c:1305
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "konnte Exclusion-Constraint »%s« nicht erzeugen"
 
-#: executor/execUtils.c:1306
+#: executor/execUtils.c:1307
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "Schlüssel %s kollidiert mit Schlüssel %s."
 
-#: executor/execUtils.c:1311
+#: executor/execUtils.c:1312
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "kollidierender Schlüsselwert verletzt Exclusion-Constraint »%s«"
 
-#: executor/execUtils.c:1313
+#: executor/execUtils.c:1314
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "Schlüssel %s kollidiert mit vorhandenem Schlüssel %s."
@@ -8761,26 +8460,26 @@ msgstr "Die letzte Anweisung gibt zu wenige Spalten zurück."
 #: executor/functions.c:1607
 #, c-format
 msgid "return type %s is not supported for SQL functions"
-msgstr "Rückgabetyp %s wird nicht von SQL-Funktionen unterstützt"
+msgstr "Rückgabetyp %s wird von SQL-Funktionen nicht unterstützt"
 
 #: executor/nodeAgg.c:1730 executor/nodeWindowAgg.c:1851
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr "Aggregatfunktion %u muss kompatiblen Eingabe- und Ãœbergangstyp haben"
 
-#: executor/nodeHashjoin.c:806 executor/nodeHashjoin.c:836
+#: executor/nodeHashjoin.c:814 executor/nodeHashjoin.c:844
 #, c-format
 msgid "could not rewind hash-join temporary file: %m"
 msgstr ""
 "konnte Position in temporärer Datei für Hash-Verbund nicht auf Anfang "
 "setzen: %m"
 
-#: executor/nodeHashjoin.c:871 executor/nodeHashjoin.c:877
+#: executor/nodeHashjoin.c:879 executor/nodeHashjoin.c:885
 #, c-format
 msgid "could not write to hash-join temporary file: %m"
 msgstr "konnte nicht in temporäre Datei für Hash-Verbund schreiben: %m"
 
-#: executor/nodeHashjoin.c:911 executor/nodeHashjoin.c:921
+#: executor/nodeHashjoin.c:919 executor/nodeHashjoin.c:929
 #, c-format
 msgid "could not read from hash-join temporary file: %m"
 msgstr "konnte nicht aus temporärer Datei für Hash-Verbund lesen: %m"
@@ -8859,11 +8558,11 @@ msgstr "Plan mit mehreren Anfragen kann nicht als Cursor geöffnet werden"
 msgid "cannot open %s query as cursor"
 msgstr "%s kann nicht als Cursor geöffnet werden"
 
-#: executor/spi.c:1233 parser/analyze.c:2205
+#: executor/spi.c:1233 parser/analyze.c:2206
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE wird nicht unterstützt"
 
-#: executor/spi.c:1234 parser/analyze.c:2206
+#: executor/spi.c:1234 parser/analyze.c:2207
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Scrollbare Cursor müssen READ ONLY sein."
 
@@ -8878,16 +8577,16 @@ msgid "user mapping not found for \"%s\""
 msgstr "Benutzerabbildung für »%s« nicht gefunden"
 
 #: foreign/foreign.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "foreign-data wrapper \"%s\" has no handler"
-msgstr "Fremddaten-Wrapper »%s« existiert nicht"
+msgstr "Fremddaten-Wrapper »%s« hat keinen Handler"
 
-#: foreign/foreign.c:489
+#: foreign/foreign.c:498
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "ungültige Option »%s«"
 
-#: foreign/foreign.c:490
+#: foreign/foreign.c:499
 #, c-format
 msgid "Valid options in this context are: %s"
 msgstr "Gültige Optionen in diesem Zusammenhang sind: %s"
@@ -8897,107 +8596,107 @@ msgstr "Gültige Optionen in diesem Zusammenhang sind: %s"
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "Kann Zeichenkettenpuffer mit %d Bytes nicht um %d Bytes vergrößern."
 
-#: libpq/auth.c:265
+#: libpq/auth.c:257
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "Authentifizierung für Benutzer »%s« fehlgeschlagen: Host abgelehnt"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:260
 #, c-format
 msgid "Kerberos 5 authentication failed for user \"%s\""
 msgstr "Kerberos-5-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:271
+#: libpq/auth.c:263
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "»trust«-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:274
+#: libpq/auth.c:266
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "Ident-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:277
-#, fuzzy, c-format
+#: libpq/auth.c:269
+#, c-format
 msgid "Peer authentication failed for user \"%s\""
-msgstr "PAM-Authentifizierung für Benutzer »%s« fehlgeschlagen"
+msgstr "Peer-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:281
+#: libpq/auth.c:273
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "Passwort-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:286
+#: libpq/auth.c:278
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "GSSAPI-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:289
+#: libpq/auth.c:281
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "SSPI-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:292
+#: libpq/auth.c:284
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "PAM-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:295
+#: libpq/auth.c:287
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "LDAP-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:298
+#: libpq/auth.c:290
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "Zertifikatauthentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:301
+#: libpq/auth.c:293
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "RADIUS-Authentifizierung für Benutzer »%s« fehlgeschlagen"
 
-#: libpq/auth.c:304
+#: libpq/auth.c:296
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr ""
 "Authentifizierung für Benutzer »%s« fehlgeschlagen: ungültige "
 "Authentifizierungsmethode"
 
-#: libpq/auth.c:333
+#: libpq/auth.c:325
 msgid "missing or erroneous pg_hba.conf file"
 msgstr "fehlende oder fehlerhafter pg_hba.conf-Datei"
 
-#: libpq/auth.c:334
+#: libpq/auth.c:326
 msgid "See server log for details."
 msgstr "Einzelheiten finden Sie im Serverlog."
 
-#: libpq/auth.c:364
+#: libpq/auth.c:356
 msgid "connection requires a valid client certificate"
 msgstr "Verbindung erfordert ein gültiges Client-Zertifikat"
 
-#: libpq/auth.c:408 libpq/auth.c:424 libpq/auth.c:461 libpq/auth.c:477
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
 msgid "SSL on"
 msgstr "SSL an"
 
-#: libpq/auth.c:408 libpq/auth.c:424 libpq/auth.c:461 libpq/auth.c:477
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
 msgid "SSL off"
 msgstr "SSL aus"
 
-#: libpq/auth.c:406
+#: libpq/auth.c:398
 #, c-format
 msgid ""
 "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr ""
 "pg_hba.conf lehnt Replikationsverbindung ab für Host »%s«, Benutzer »%s«, %s"
 
-#: libpq/auth.c:412
+#: libpq/auth.c:404
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
 msgstr ""
 "pg_hba.conf lehnt Replikationsverbindung ab für Host »%s«, Benutzer »%s«"
 
-#: libpq/auth.c:421
+#: libpq/auth.c:413
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
@@ -9006,14 +8705,33 @@ msgstr ""
 "pg_hba.conf lehnt Verbindung ab für Host »%s«, Benutzer »%s«, Datenbank "
 "»%s«, %s"
 
-#: libpq/auth.c:428
+#: libpq/auth.c:420
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
 "pg_hba.conf lehnt Verbindung ab für Host »%s«, Benutzer »%s«, Datenbank »%s«"
 
-#: libpq/auth.c:459
+#: libpq/auth.c:449
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup matches."
+msgstr ""
+"Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung stimmt überein."
+
+#: libpq/auth.c:451
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup not checked."
+msgstr ""
+"Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung nicht geprüft."
+
+#: libpq/auth.c:453
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup does not match."
+msgstr ""
+"Auflösung der Client-IP-Adresse ergab »%s«, Vorwärtsauflösung stimmt nicht "
+"überein."
+
+#: libpq/auth.c:462
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
@@ -9022,7 +8740,7 @@ msgstr ""
 "kein pg_hba.conf-Eintrag für Replikationsverbindung von Host »%s«, Benutzer "
 "»%s«, %s"
 
-#: libpq/auth.c:465
+#: libpq/auth.c:469
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
@@ -9030,250 +8748,222 @@ msgstr ""
 "kein pg_hba.conf-Eintrag für Replikationsverbindung von Host »%s«, Benutzer "
 "»%s«"
 
-#: libpq/auth.c:474
+#: libpq/auth.c:479
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 "kein pg_hba.conf-Eintrag für Host »%s«, Benutzer »%s«, Datenbank »%s«, %s"
 
-#: libpq/auth.c:481
+#: libpq/auth.c:487
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
 msgstr "kein pg_hba.conf-Eintrag für Host »%s«, Benutzer »%s«, Datenbank »%s«"
 
-#: libpq/auth.c:540
-#, c-format
-msgid "could not enable credential reception: %m"
-msgstr "konnte Empfang von Credentials nicht einschalten: %m"
-
-#: libpq/auth.c:560 libpq/hba.c:1109
+#: libpq/auth.c:539 libpq/hba.c:1118
 msgid ""
 "MD5 authentication is not supported when \"db_user_namespace\" is enabled"
 msgstr ""
 "MD5-Authentifizierung wird nicht unterstützt, wenn »db_user_namespace« "
 "angeschaltet ist"
 
-#: libpq/auth.c:684
+#: libpq/auth.c:663
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "Passwort-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:712
+#: libpq/auth.c:691
 msgid "invalid password packet size"
 msgstr "ungültige Größe des Passwortpakets"
 
-#: libpq/auth.c:716
+#: libpq/auth.c:695
 msgid "received password packet"
 msgstr "Passwortpaket empfangen"
 
-#: libpq/auth.c:774
+#: libpq/auth.c:753
 #, c-format
 msgid "Kerberos initialization returned error %d"
 msgstr "Kerberos-Initialisierung ergab Fehler %d"
 
-#: libpq/auth.c:784
+#: libpq/auth.c:763
 #, c-format
 msgid "Kerberos keytab resolving returned error %d"
 msgstr "Auflösung der Kerberos-Keytab ergab Fehler %d"
 
-#: libpq/auth.c:808
+#: libpq/auth.c:787
 #, c-format
 msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
 msgstr "Kerberos sname_to_principal(\"%s\", \"%s\") ergab Fehler %d"
 
-#: libpq/auth.c:853
+#: libpq/auth.c:832
 #, c-format
 msgid "Kerberos recvauth returned error %d"
 msgstr "Kerberos recvauth ergab Fehler %d"
 
-#: libpq/auth.c:876
+#: libpq/auth.c:855
 #, c-format
 msgid "Kerberos unparse_name returned error %d"
 msgstr "Kerberos unparse_name ergab Fehler %d"
 
-#: libpq/auth.c:998
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: libpq/auth.c:1024
+#: libpq/auth.c:1003
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI wird in Protokollversion 2 nicht unterstützt"
 
-#: libpq/auth.c:1079
+#: libpq/auth.c:1058
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "GSS-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:1142
+#: libpq/auth.c:1121
 msgid "accepting GSS security context failed"
 msgstr "Annahme des GSS-Sicherheitskontexts fehlgeschlagen"
 
-#: libpq/auth.c:1168
+#: libpq/auth.c:1147
 msgid "retrieving GSS user name failed"
 msgstr "Abfrage des GSS-Benutzernamens fehlgeschlagen"
 
-#: libpq/auth.c:1241
-#, c-format
-msgid "SSPI error %x"
-msgstr "SSPI-Fehler %x"
-
-#: libpq/auth.c:1245
-#, c-format
-msgid "%s (%x)"
-msgstr "%s (%x)"
-
-#: libpq/auth.c:1285
+#: libpq/auth.c:1264
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSL wird in Protokollversion 2 nicht unterstützt"
 
-#: libpq/auth.c:1300
+#: libpq/auth.c:1279
 msgid "could not acquire SSPI credentials"
 msgstr "konnte SSPI-Credentials nicht erhalten"
 
-#: libpq/auth.c:1317
+#: libpq/auth.c:1296
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "SSPI-Antwort erwartet, Message-Typ %d empfangen"
 
-#: libpq/auth.c:1389
+#: libpq/auth.c:1368
 msgid "could not accept SSPI security context"
 msgstr "konnte SSPI-Sicherheitskontext nicht akzeptieren"
 
-#: libpq/auth.c:1445
+#: libpq/auth.c:1430
 msgid "could not get token from SSPI security context"
 msgstr "konnte kein Token vom SSPI-Sicherheitskontext erhalten"
 
-#: libpq/auth.c:1689
+#: libpq/auth.c:1674
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "konnte Socket für Ident-Verbindung nicht erzeugen: %m"
 
-#: libpq/auth.c:1704
+#: libpq/auth.c:1689
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "konnte nicht mit lokaler Adresse »%s« verbinden: %m"
 
-#: libpq/auth.c:1716
+#: libpq/auth.c:1701
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "konnte nicht mit Ident-Server auf Adresse »%s«, Port %s verbinden: %m"
 
-#: libpq/auth.c:1736
+#: libpq/auth.c:1721
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "konnte Anfrage an Ident-Server auf Adresse »%s«, Port %s nicht senden: %m"
 
-#: libpq/auth.c:1751
+#: libpq/auth.c:1736
 #, c-format
 msgid ""
 "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "konnte Antwort von Ident-Server auf Adresse »%s«, Port %s nicht empfangen: %m"
 
-#: libpq/auth.c:1761
+#: libpq/auth.c:1746
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "ungültig formatierte Antwort vom Ident-Server: »%s«"
 
-#: libpq/auth.c:1802 libpq/auth.c:1830 libpq/auth.c:1856 libpq/auth.c:1930
+#: libpq/auth.c:1785
+msgid "peer authentication is not supported on this platform"
+msgstr "Peer-Authentifizierung wird auf dieser Plattform nicht unterstützt"
+
+#: libpq/auth.c:1789
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "konnte Credentials von Gegenstelle nicht ermitteln: %m"
 
-#: libpq/auth.c:1811 libpq/auth.c:1839 libpq/auth.c:1874 libpq/auth.c:1941
+#: libpq/auth.c:1798
 #, c-format
 msgid "local user with ID %d does not exist"
 msgstr "lokaler Benutzer mit ID %d existiert nicht"
 
-#: libpq/auth.c:1864
-#, c-format
-msgid "could not get effective UID from peer credentials: %m"
-msgstr "konnte effektive UID nicht aus Peer-Credentials ermitteln: %m"
-
-#: libpq/auth.c:1950
-msgid ""
-"Ident authentication is not supported on local connections on this platform"
-msgstr ""
-"Ident-Authentifizierung auf lokalen Verbindungen wird auf dieser Plattform "
-"nicht unterstützt"
-
-#: libpq/auth.c:2031 libpq/auth.c:2303 libpq/auth.c:2663
+#: libpq/auth.c:1881 libpq/auth.c:2153 libpq/auth.c:2513
 msgid "empty password returned by client"
 msgstr "Client gab leeres Passwort zurück"
 
-#: libpq/auth.c:2041
+#: libpq/auth.c:1891
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "Fehler von der unteren PAM-Ebene: %s"
 
-#: libpq/auth.c:2110
+#: libpq/auth.c:1960
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "konnte PAM-Authenticator nicht erzeugen: %s"
 
-#: libpq/auth.c:2121
+#: libpq/auth.c:1971
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) fehlgeschlagen: %s"
 
-#: libpq/auth.c:2132
+#: libpq/auth.c:1982
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) fehlgeschlagen: %s"
 
-#: libpq/auth.c:2143
+#: libpq/auth.c:1993
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate fehlgeschlagen: %s"
 
-#: libpq/auth.c:2154
+#: libpq/auth.c:2004
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt fehlgeschlagen: %s"
 
-#: libpq/auth.c:2165
+#: libpq/auth.c:2015
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "konnte PAM-Authenticator nicht freigeben: %s"
 
-#: libpq/auth.c:2198 libpq/auth.c:2202
+#: libpq/auth.c:2048 libpq/auth.c:2052
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "konnte LDAP nicht initialisieren: Fehlercode %d"
 
-#: libpq/auth.c:2212
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not set LDAP protocol version: error code %d"
 msgstr "konnte LDAP-Protokollversion nicht setzen: Fehlercode %d"
 
-#: libpq/auth.c:2241
+#: libpq/auth.c:2091
 msgid "could not load wldap32.dll"
 msgstr "konnte wldap32.dll nicht laden"
 
-#: libpq/auth.c:2249
+#: libpq/auth.c:2099
 msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
 msgstr "konnte Funktion _ldap_start_tls_sA in wldap32.dll nicht laden"
 
-#: libpq/auth.c:2250
+#: libpq/auth.c:2100
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP über SSL wird auf dieser Plattform nicht unterstützt"
 
-#: libpq/auth.c:2265
+#: libpq/auth.c:2115
 #, c-format
 msgid "could not start LDAP TLS session: error code %d"
 msgstr "konnte LDAP-TLS-Sitzung nicht öffnen: Fehlercode %d"
 
-#: libpq/auth.c:2287
+#: libpq/auth.c:2137
 msgid "LDAP server not specified"
 msgstr "LDAP-Server nicht angegeben"
 
-#: libpq/auth.c:2339
+#: libpq/auth.c:2189
 msgid "invalid character in user name for LDAP authentication"
 msgstr "ungültiges Zeichen im Benutzernamen für LDAP-Authentifizierung"
 
-#: libpq/auth.c:2354
+#: libpq/auth.c:2204
 #, c-format
 msgid ""
 "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
@@ -9282,20 +8972,20 @@ msgstr ""
 "erstes LDAP-Binden für ldapbinddn »%s« auf Server »%s« fehlgeschlagen: "
 "Fehlercode %d"
 
-#: libpq/auth.c:2379
+#: libpq/auth.c:2229
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "konnte LDAP nicht mit Filter »%s« auf Server »%s« durchsuchen: Fehlercode %d"
 
-#: libpq/auth.c:2389
+#: libpq/auth.c:2239
 #, c-format
 msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
 msgstr ""
 "LDAP-Suche fehlgeschlagen für Filter »%s« auf Server »%s«: Benutzer "
 "existiert nicht"
 
-#: libpq/auth.c:2393
+#: libpq/auth.c:2243
 #, c-format
 msgid ""
 "LDAP search failed for filter \"%s\" on server \"%s\": user is not unique "
@@ -9304,26 +8994,26 @@ msgstr ""
 "LDAP-Suche fehlgeschlagen für Filter »%s« auf Server »%s«: Benutzer ist "
 "nicht eindeutig (%ld Treffer)"
 
-#: libpq/auth.c:2410
+#: libpq/auth.c:2260
 #, c-format
 msgid ""
 "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr ""
 "konnte DN fũr den ersten Treffer für »%s« auf Server »%s« nicht lesen: %s"
 
-#: libpq/auth.c:2430
+#: libpq/auth.c:2280
 #, c-format
 msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
 msgstr ""
 "Losbinden fehlgeschlagen nach Suche nach Benutzer »%s« auf Server »%s«: %s"
 
-#: libpq/auth.c:2467
+#: libpq/auth.c:2317
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "LDAP-Login fehlgeschlagen für Benutzer »%s« auf Server »%s«: Fehlercode %d"
 
-#: libpq/auth.c:2495
+#: libpq/auth.c:2345
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": client certificate "
@@ -9332,91 +9022,91 @@ msgstr ""
 "Zertifikatauthentifizierung für Benutzer »%s« fehlgeschlagen: Client-"
 "Zertifikat enthält keinen Benutzernamen"
 
-#: libpq/auth.c:2619
+#: libpq/auth.c:2469
 msgid "RADIUS server not specified"
 msgstr "RADIUS-Server nicht angegeben"
 
-#: libpq/auth.c:2626
+#: libpq/auth.c:2476
 msgid "RADIUS secret not specified"
 msgstr "RADIUS-Geheimnis nicht angegeben"
 
-#: libpq/auth.c:2642 libpq/hba.c:1394
+#: libpq/auth.c:2492 libpq/hba.c:1403
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "konnte RADIUS-Servername »%s« nicht in Adresse übersetzen: %s"
 
-#: libpq/auth.c:2670
+#: libpq/auth.c:2520
 msgid ""
 "RADIUS authentication does not support passwords longer than 16 characters"
 msgstr ""
 "RADIUS-Authentifizierung unterstützt keine Passwörter länger als 16 Zeichen"
 
-#: libpq/auth.c:2681
+#: libpq/auth.c:2531
 msgid "could not generate random encryption vector"
 msgstr "konnte zufälligen Verschlüsselungsvektor nicht erzeugen"
 
-#: libpq/auth.c:2704
+#: libpq/auth.c:2554
 msgid "could not perform MD5 encryption of password"
 msgstr "konnte MD5-Verschlüsselung des Passworts nicht durchführen"
 
-#: libpq/auth.c:2726
+#: libpq/auth.c:2576
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "konnte RADIUS-Socket nicht erstellen: %m"
 
-#: libpq/auth.c:2747
+#: libpq/auth.c:2597
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "konnte lokales RADIUS-Socket nicht binden: %m"
 
-#: libpq/auth.c:2757
+#: libpq/auth.c:2607
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "konnte RADIUS-Paket nicht senden: %m"
 
-#: libpq/auth.c:2786 libpq/auth.c:2811
+#: libpq/auth.c:2636 libpq/auth.c:2661
 msgid "timeout waiting for RADIUS response"
 msgstr "Zeitüberschreitung beim Warten auf RADIUS-Antwort"
 
-#: libpq/auth.c:2804
+#: libpq/auth.c:2654
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "konnte Status des RADIUS-Sockets nicht prüfen: %m"
 
-#: libpq/auth.c:2833
+#: libpq/auth.c:2683
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "konnte RADIUS-Antwort nicht lesen: %m"
 
-#: libpq/auth.c:2845 libpq/auth.c:2849
+#: libpq/auth.c:2695 libpq/auth.c:2699
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %i"
 msgstr "RADIUS-Antwort wurde von falschem Port gesendet: %i"
 
-#: libpq/auth.c:2858
+#: libpq/auth.c:2708
 #, c-format
 msgid "RADIUS response too short: %i"
 msgstr "RADIUS-Antwort zu kurz: %i"
 
-#: libpq/auth.c:2865
+#: libpq/auth.c:2715
 #, c-format
 msgid "RADIUS response has corrupt length: %i (actual length %i)"
 msgstr "RADIUS-Antwort hat verfälschte Länge: %i (tatsächliche Länge %i)"
 
-#: libpq/auth.c:2873
+#: libpq/auth.c:2723
 #, c-format
 msgid "RADIUS response is to a different request: %i (should be %i)"
 msgstr "RADIUS-Antwort unterscheidet sich von Anfrage: %i (sollte %i sein)"
 
-#: libpq/auth.c:2898
+#: libpq/auth.c:2748
 msgid "could not perform MD5 encryption of received packet"
 msgstr "konnte MD5-Verschlüsselung des empfangenen Pakets nicht durchführen"
 
-#: libpq/auth.c:2907
+#: libpq/auth.c:2757
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "RADIUS-Antwort hat falsche MD5-Signatur"
 
-#: libpq/auth.c:2924
+#: libpq/auth.c:2774
 #, c-format
 msgid "RADIUS response has invalid code (%i) for user \"%s\""
 msgstr "RADIUS-Antwort hat ungültigen Code (%i) für Benutzer »%s«"
@@ -9478,7 +9168,7 @@ msgstr "konnte Serverdatei »%s« nicht schreiben: %m"
 msgid "SSL error: %s"
 msgstr "SSL-Fehler: %s"
 
-#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:951
+#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:957
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "unbekannter SSL-Fehlercode: %d"
@@ -9496,103 +9186,103 @@ msgstr "SSL konnte keine neue Verhandlungsanfrage senden"
 msgid "could not create SSL context: %s"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s"
 
-#: libpq/be-secure.c:746
+#: libpq/be-secure.c:752
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "konnte Serverzertifikatsdatei »%s« nicht laden: %s"
 
-#: libpq/be-secure.c:752
+#: libpq/be-secure.c:758
 #, c-format
 msgid "could not access private key file \"%s\": %m"
 msgstr "konnte auf private Schlüsseldatei »%s« nicht zugreifen: %m"
 
-#: libpq/be-secure.c:767
+#: libpq/be-secure.c:773
 #, c-format
 msgid "private key file \"%s\" has group or world access"
 msgstr "private Schlüsseldatei »%s« erlaubt Zugriff von Gruppe oder Welt"
 
-#: libpq/be-secure.c:769
+#: libpq/be-secure.c:775
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Rechte sollten u=rw (0600) oder weniger sein."
 
-#: libpq/be-secure.c:776
+#: libpq/be-secure.c:782
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "konnte private Schlüsseldatei »%s« nicht laden: %s"
 
-#: libpq/be-secure.c:781
+#: libpq/be-secure.c:787
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "Überprüfung des privaten Schlüssels fehlgeschlagen: %s"
 
-#: libpq/be-secure.c:809
+#: libpq/be-secure.c:815
 #, c-format
 msgid "could not access root certificate file \"%s\": %m"
 msgstr "konnte nicht auf Root-Zertifikat-Datei »%s« zugreifen: %m"
 
-#: libpq/be-secure.c:820
+#: libpq/be-secure.c:826
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "konnte Root-Zertifikat-Datei »%s« nicht laden: %s"
 
-#: libpq/be-secure.c:843
+#: libpq/be-secure.c:849
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "SSL-Certificate-Revocation-List-Datei »%s« ignoriert"
 
-#: libpq/be-secure.c:845
+#: libpq/be-secure.c:851
 msgid "SSL library does not support certificate revocation lists."
 msgstr "SSL-Bibliothek unterstützt keine Certificate-Revocation-Lists."
 
-#: libpq/be-secure.c:852
+#: libpq/be-secure.c:858
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
 msgstr ""
 "SSL-Certificate-Revocation-List-Datei »%s« nicht gefunden, wird "
 "übersprungen: %s"
 
-#: libpq/be-secure.c:854
+#: libpq/be-secure.c:860
 msgid "Certificates will not be checked against revocation list."
 msgstr "Zertifikate werden nicht gegen die Revocation-Liste geprüft."
 
-#: libpq/be-secure.c:896
+#: libpq/be-secure.c:902
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht initialisieren: %s"
 
-#: libpq/be-secure.c:905
+#: libpq/be-secure.c:911
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "konnte SSL-Socket nicht setzen: %s"
 
-#: libpq/be-secure.c:931
+#: libpq/be-secure.c:937
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "konnte SSL-Verbindung nicht annehmen: %m"
 
-#: libpq/be-secure.c:935 libpq/be-secure.c:946
+#: libpq/be-secure.c:941 libpq/be-secure.c:952
 msgid "could not accept SSL connection: EOF detected"
 msgstr "konnte SSL-Verbindung nicht annehmen: EOF entdeckt"
 
-#: libpq/be-secure.c:940
+#: libpq/be-secure.c:946
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "konnte SSL-Verbindung nicht annehmen: %s"
 
-#: libpq/be-secure.c:991
+#: libpq/be-secure.c:997
 msgid "SSL certificate's common name contains embedded null"
 msgstr "Common-Name im SSL-Zertifikat enthält Null-Byte"
 
-#: libpq/be-secure.c:998
+#: libpq/be-secure.c:1004
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "SSL-Verbindung von »%s«"
 
-#: libpq/be-secure.c:1042
+#: libpq/be-secure.c:1048
 msgid "no SSL error reported"
 msgstr "kein SSL-Fehler berichtet"
 
-#: libpq/be-secure.c:1046
+#: libpq/be-secure.c:1052
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-Fehlercode %lu"
@@ -9609,9 +9299,9 @@ msgstr ""
 "konnte sekundäre Authentifizierungsdatei »@%s« nicht als »%s« öffnen: %m"
 
 #: libpq/hba.c:628
-#, fuzzy, c-format
+#, c-format
 msgid "could not translate host name \"%s\" to address: %s"
-msgstr "konnte Hostname »%s« nicht in Adresse übersetzen: %s\n"
+msgstr "konnte Hostname »%s« nicht in Adresse übersetzen: %s"
 
 #. translator: the second %s is a list of auth methods
 #: libpq/hba.c:779
@@ -9627,116 +9317,117 @@ msgstr ""
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "Authentifizierungsmethode »%s« benötigt Argument »%s«"
 
-#: libpq/hba.c:844
+#: libpq/hba.c:832
+msgid "local connections are not supported by this build"
+msgstr "lokale Verbindungen werden von dieser Installation nicht unterstützt"
+
+#: libpq/hba.c:853
 msgid "hostssl requires SSL to be turned on"
-msgstr ""
+msgstr "für hostssl muss SSL angeschaltet sein"
 
-#: libpq/hba.c:845
+#: libpq/hba.c:854
 msgid "Set ssl = on in postgresql.conf."
-msgstr ""
+msgstr "Setzen Sie ssl = on in postgresql.conf."
 
-#: libpq/hba.c:853
-#, fuzzy
+#: libpq/hba.c:862
 msgid "hostssl is not supported by this build"
-msgstr "SSL wird von dieser Installation nicht unterstützt"
+msgstr "hostssl wird von dieser Installation nicht unterstützt"
 
-#: libpq/hba.c:854
+#: libpq/hba.c:863
 msgid "Compile with --with-openssl to use SSL connections."
 msgstr "Kompilieren Sie mit --with-openssl, um SSL-Verbindungen zu verwenden."
 
-#: libpq/hba.c:876
+#: libpq/hba.c:885
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "ungültiger Verbindungstyp »%s«"
 
-#: libpq/hba.c:889
+#: libpq/hba.c:898
 msgid "end-of-line before database specification"
 msgstr "Zeilenende vor Datenbankangabe"
 
-#: libpq/hba.c:902
+#: libpq/hba.c:911
 msgid "end-of-line before role specification"
 msgstr "Zeilenende vor Rollenangabe"
 
-#: libpq/hba.c:917
+#: libpq/hba.c:926
 msgid "end-of-line before IP address specification"
 msgstr "Zeilenende vor IP-Adressangabe"
 
-#: libpq/hba.c:971
+#: libpq/hba.c:980
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "ungültige IP-Adresse »%s«: %s"
 
-#: libpq/hba.c:991
+#: libpq/hba.c:1000
 #, c-format
 msgid "specifying both host name and CIDR mask is invalid: \"%s\""
-msgstr ""
+msgstr "Angabe von sowohl Hostname als auch CIDR-Maske ist ungültig: »%s«"
 
-#: libpq/hba.c:1005
+#: libpq/hba.c:1014
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "ungültige CIDR-Maske in Adresse »%s«"
 
-#: libpq/hba.c:1023
+#: libpq/hba.c:1032
 msgid "end-of-line before netmask specification"
 msgstr "Zeilenende vor Netzmaskenangabe"
 
-#: libpq/hba.c:1035
+#: libpq/hba.c:1044
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "ungültige IP-Maske »%s«: %s"
 
-#: libpq/hba.c:1052
+#: libpq/hba.c:1061
 msgid "IP address and mask do not match"
 msgstr "IP-Adresse und -Maske passen nicht zusammen"
 
-#: libpq/hba.c:1067
+#: libpq/hba.c:1076
 msgid "end-of-line before authentication method"
 msgstr "Zeilenende vor Authentifizierungsmethode"
 
-#: libpq/hba.c:1140
+#: libpq/hba.c:1149
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "ungültige Authentifizierungsmethode »%s«"
 
-#: libpq/hba.c:1151
-#, fuzzy, c-format
+#: libpq/hba.c:1160
+#, c-format
 msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr ""
-"ungültige Authentifizierungsmethode »%s«: auf dieser Platform nicht "
+"ungültige Authentifizierungsmethode »%s«: von dieser Installation nicht "
 "unterstützt"
 
-#: libpq/hba.c:1172
+#: libpq/hba.c:1181
 msgid "krb5 authentication is not supported on local sockets"
 msgstr "krb5-Authentifizierung wird auf lokalen Sockets nicht unterstützt"
 
-#: libpq/hba.c:1183
+#: libpq/hba.c:1192
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "gssapi-Authentifizierung wird auf lokalen Sockets nicht unterstützt"
 
-#: libpq/hba.c:1194
-#, fuzzy
+#: libpq/hba.c:1203
 msgid "peer authentication is only supported on local sockets"
-msgstr "krb5-Authentifizierung wird auf lokalen Sockets nicht unterstützt"
+msgstr "peer-Authentifizierung wird nur auf lokalen Sockets unterstützt"
 
-#: libpq/hba.c:1211
+#: libpq/hba.c:1220
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "cert-Authentifizierung wird nur auf »hostssl«-Verbindungen unterstützt"
 
-#: libpq/hba.c:1232
+#: libpq/hba.c:1241
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "Authentifizierungsoption nicht im Format name=wert: %s"
 
-#: libpq/hba.c:1248
-#, fuzzy
+#: libpq/hba.c:1257
 msgid "ident, peer, krb5, gssapi, sspi and cert"
-msgstr "ident, krb5, gssapi, sspi und cert"
+msgstr "ident, peer, krb5, gssapi, sspi und cert"
 
-#: libpq/hba.c:1262
+#: libpq/hba.c:1271
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert kann nur für »hostssl«-Zeilen konfiguriert werden"
 
-#: libpq/hba.c:1273
+#: libpq/hba.c:1282
 msgid ""
 "client certificates can only be checked if a root certificate store is "
 "available"
@@ -9744,36 +9435,36 @@ msgstr ""
 "Client-Zertifikate können nur überprüft werden, wenn Wurzelzertifikat "
 "verfügbar ist"
 
-#: libpq/hba.c:1274
+#: libpq/hba.c:1283
 msgid "Make sure the root.crt file is present and readable."
 msgstr "Stellen Sie sicher, dass die Datei root.crt vorhanden und lesbar ist."
 
-#: libpq/hba.c:1287
+#: libpq/hba.c:1296
 msgid "clientcert can not be set to 0 when using \"cert\" authentication"
 msgstr ""
 "clientcert kann nicht auf 0 gesetzt sein, wenn »cert«-Authentifizierung "
 "verwendet wird"
 
-#: libpq/hba.c:1321
+#: libpq/hba.c:1330
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "ungültige LDAP-Portnummer: »%s«"
 
-#: libpq/hba.c:1367 libpq/hba.c:1375
+#: libpq/hba.c:1376 libpq/hba.c:1384
 msgid "krb5, gssapi and sspi"
 msgstr "krb5, gssapi und sspi"
 
-#: libpq/hba.c:1413
+#: libpq/hba.c:1422
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "ungültige RADIUS-Portnummer: »%s«"
 
-#: libpq/hba.c:1433
+#: libpq/hba.c:1442
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "unbekannter Authentifizierungsoptionsname: »%s«"
 
-#: libpq/hba.c:1465
+#: libpq/hba.c:1474
 msgid ""
 "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
 "together with ldapprefix"
@@ -9781,7 +9472,7 @@ msgstr ""
 "ldapbasedn, ldapbinddn, ldapbindpasswd oder ldapsearchattribute kann nicht "
 "zusammen mit ldapprefix verwendet werden"
 
-#: libpq/hba.c:1475
+#: libpq/hba.c:1484
 msgid ""
 "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
 "\", or \"ldapsuffix\" to be set"
@@ -9789,22 +9480,22 @@ msgstr ""
 "Authentifizierungsmethode »ldap« benötigt Argument »ldapbasedn«, "
 "»ldapprefix« oder »ldapsuffix«"
 
-#: libpq/hba.c:1674 guc-file.l:409
+#: libpq/hba.c:1683 guc-file.l:409
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "konnte Konfigurationsdatei »%s« nicht öffnen: %m"
 
-#: libpq/hba.c:1806
+#: libpq/hba.c:1815
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "ungültiger regulärer Ausdruck »%s«: %s"
 
-#: libpq/hba.c:1829
+#: libpq/hba.c:1838
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "Suche nach regulärem Ausdruck für »%s« fehlgeschlagen: %s"
 
-#: libpq/hba.c:1847
+#: libpq/hba.c:1856
 #, c-format
 msgid ""
 "regular expression \"%s\" has no subexpressions as requested by "
@@ -9813,26 +9504,26 @@ msgstr ""
 "regulärer Ausdruck »%s« hat keine Teilausdrücke wie von der Backreference in "
 "»%s« verlangt"
 
-#: libpq/hba.c:1913
+#: libpq/hba.c:1922
 #, c-format
 msgid "missing entry in file \"%s\" at end of line %d"
 msgstr "fehlender Eintrag in Datei »%s« am Ende von Zeile %d"
 
-#: libpq/hba.c:1954
+#: libpq/hba.c:1963
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr ""
 "angegebener Benutzername (%s) und authentifizierter Benutzername (%s) "
 "stimmen nicht überein"
 
-#: libpq/hba.c:1975
+#: libpq/hba.c:1984
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr ""
 "kein passender Eintrag in Usermap »%s« für Benutzer »%s«, authentifiziert "
 "als »%s«"
 
-#: libpq/hba.c:1999
+#: libpq/hba.c:2008
 #, c-format
 msgid "could not open usermap file \"%s\": %m"
 msgstr "konnte Usermap-Datei »%s« nicht öffnen: %m"
@@ -10003,91 +9694,44 @@ msgstr "unbekannter Snowball-Parameter: »%s«"
 msgid "missing Language parameter"
 msgstr "Parameter »Language« fehlt"
 
-#: storage/smgr/md.c:378 storage/smgr/md.c:849
-#, c-format
-msgid "could not truncate file \"%s\": %m"
-msgstr "kann Datei »%s« nicht kürzen: %m"
+#: storage/ipc/procarray.c:270 storage/ipc/sinvaladt.c:302
+#: storage/lmgr/proc.c:297 postmaster/postmaster.c:1862
+msgid "sorry, too many clients already"
+msgstr "tut mir leid, schon zu viele Verbindungen"
 
-#: storage/smgr/md.c:446
-#, c-format
-msgid "cannot extend file \"%s\" beyond %u blocks"
-msgstr "kann Datei »%s« nicht auf über %u Blöcke erweitern"
+#: storage/ipc/shmem.c:190 storage/lmgr/lock.c:631 storage/lmgr/lock.c:700
+#: storage/lmgr/lock.c:2163 storage/lmgr/lock.c:2542 storage/lmgr/lock.c:2607
+#: storage/lmgr/proc.c:197 storage/lmgr/proc.c:216
+#: storage/lmgr/predicate.c:2233 storage/lmgr/predicate.c:2248
+#: storage/lmgr/predicate.c:3623 storage/lmgr/predicate.c:4770
+#: utils/hash/dynahash.c:928
+msgid "out of shared memory"
+msgstr "Shared Memory aufgebraucht"
 
-# XXX
-#: storage/smgr/md.c:468 storage/smgr/md.c:629 storage/smgr/md.c:704
+#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
 #, c-format
-msgid "could not seek to block %u in file \"%s\": %m"
-msgstr "konnte Positionszeiger nicht auf Block %u in Datei »%s« setzen: %m"
+msgid ""
+"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+msgstr ""
+"nicht genug Shared-Memory für Datenstruktur »%s« (%lu Bytes angefordert)"
 
-#: storage/smgr/md.c:476
+#: storage/ipc/shmem.c:365
 #, c-format
-msgid "could not extend file \"%s\": %m"
-msgstr "konnte Datei »%s« nicht erweitern: %m"
-
-#: storage/smgr/md.c:478 storage/smgr/md.c:485 storage/smgr/md.c:731
-msgid "Check free disk space."
-msgstr "Prüfen Sie den freien Festplattenplatz."
+msgid "could not create ShmemIndex entry for data structure \"%s\""
+msgstr "konnte ShmemIndex-Eintrag für Datenstruktur »%s« nicht erzeugen"
 
-#: storage/smgr/md.c:482
+#: storage/ipc/shmem.c:380
 #, c-format
-msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
-msgstr ""
-"konnte Datei »%s« nicht erweitern: es wurden nur %d von %d Bytes bei Block "
-"%u geschrieben"
-
-#: storage/smgr/md.c:647
-#, c-format
-msgid "could not read block %u in file \"%s\": %m"
-msgstr "konnte Block %u in Datei »%s« nicht lesen: %m"
-
-#: storage/smgr/md.c:663
-#, c-format
-msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
-msgstr ""
-"konnte Block %u in Datei »%s« nicht lesen: es wurden nur %d von %d Bytes "
-"gelesen"
-
-#: storage/smgr/md.c:722
-#, c-format
-msgid "could not write block %u in file \"%s\": %m"
-msgstr "konnte Block %u in Datei »%s« nicht schreiben: %m"
-
-#: storage/smgr/md.c:727
-#, c-format
-msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
-msgstr ""
-"konnte Block %u in Datei »%s« nicht schreiben: es wurden nur %d von %d Bytes "
-"geschrieben"
-
-#: storage/smgr/md.c:825
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
-msgstr ""
-"konnte Datei »%s« nicht auf %u Blöcke kürzen: es sind jetzt nur %u Blöcke"
-
-#: storage/smgr/md.c:874
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: %m"
-msgstr "konnte Datei »%s« nicht auf %u Blöcke kürzen: %m"
-
-#: storage/smgr/md.c:1128
-#, c-format
-msgid "could not fsync file \"%s\" but retrying: %m"
-msgstr "konnte Datei »%s« nicht fsyncen, versuche erneut: %m"
-
-#: storage/smgr/md.c:1270
-msgid "could not forward fsync request because request queue is full"
+msgid ""
+"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
+"actual %lu"
 msgstr ""
+"ShmemIndex-Eintraggröße ist falsch für Datenstruktur »%s«: erwartet %lu, "
+"tatsächlich %lu"
 
-#: storage/smgr/md.c:1637
-#, c-format
-msgid "could not open file \"%s\" (target block %u): %m"
-msgstr "konnte Datei »%s« nicht öffnen (Zielblock %u): %m"
-
-#: storage/smgr/md.c:1659
-#, c-format
-msgid "could not seek to end of file \"%s\": %m"
-msgstr "konnte Positionszeiger nicht ans Ende der Datei »%s« setzen: %m"
+#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
+msgid "requested shared memory size overflows size_t"
+msgstr "angeforderte Shared-Memory-Größe übersteigt Kapazität von size_t"
 
 #: storage/buffer/bufmgr.c:134 storage/buffer/bufmgr.c:239
 msgid "cannot access temporary tables of other sessions"
@@ -10117,16 +9761,16 @@ msgstr ""
 msgid "invalid page header in block %u of relation %s"
 msgstr "ungültiger Seitenkopf in Block %u von Relation %s"
 
-#: storage/buffer/bufmgr.c:2728
+#: storage/buffer/bufmgr.c:2746
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "konnte Block %u von %s nicht schreiben"
 
-#: storage/buffer/bufmgr.c:2730
+#: storage/buffer/bufmgr.c:2748
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Mehrere Fehlschläge --- Schreibfehler ist möglicherweise dauerhaft."
 
-#: storage/buffer/bufmgr.c:2751 storage/buffer/bufmgr.c:2770
+#: storage/buffer/bufmgr.c:2769 storage/buffer/bufmgr.c:2788
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "schreibe Block %u von Relation %s"
@@ -10135,192 +9779,130 @@ msgstr "schreibe Block %u von Relation %s"
 msgid "no empty local buffer available"
 msgstr "kein leerer lokaler Puffer verfügbar"
 
-#: storage/file/fd.c:406
+#: storage/file/fd.c:405
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "getrlimit fehlgeschlagen: %m"
 
-#: storage/file/fd.c:496
+#: storage/file/fd.c:495
 msgid "insufficient file descriptors available to start server process"
 msgstr "nicht genug Dateideskriptoren verfügbar, um Serverprozess zu starten"
 
-#: storage/file/fd.c:497
+#: storage/file/fd.c:496
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "System erlaubt %d, wir benötigen mindestens %d."
 
-#: storage/file/fd.c:538 storage/file/fd.c:1450 storage/file/fd.c:1566
+#: storage/file/fd.c:537 storage/file/fd.c:1469 storage/file/fd.c:1585
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "keine Dateideskriptoren mehr: %m; freigeben und nochmal versuchen"
 
-#: storage/file/fd.c:1091
+#: storage/file/fd.c:1110
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "temporäre Datei: Pfad »%s«, Größe %lu"
 
-#: storage/file/fd.c:1625
+#: storage/file/fd.c:1644
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "konnte Verzeichnis »%s« nicht lesen: %m"
 
-#: storage/file/reinit.c:58
+#: storage/smgr/md.c:381 storage/smgr/md.c:855
 #, c-format
-msgid "resetting unlogged relations: cleanup %d init %d"
-msgstr ""
-
-#: storage/ipc/procarray.c:270 storage/ipc/sinvaladt.c:302
-#: storage/lmgr/proc.c:293 postmaster/postmaster.c:1861
-msgid "sorry, too many clients already"
-msgstr "tut mir leid, schon zu viele Verbindungen"
-
-#: storage/ipc/procarray.c:637
-msgid "consistent state delayed because recovery snapshot incomplete"
-msgstr ""
-"konsistenter Zustand ist verzögert, weil Wiederherstellungs-Snapshot "
-"unvollständig ist"
-
-#: storage/ipc/shmem.c:190 storage/lmgr/predicate.c:2054
-#: storage/lmgr/predicate.c:2069 storage/lmgr/predicate.c:3296
-#: storage/lmgr/predicate.c:4253 storage/lmgr/lock.c:631
-#: storage/lmgr/lock.c:700 storage/lmgr/lock.c:2170 storage/lmgr/lock.c:2549
-#: storage/lmgr/lock.c:2614 storage/lmgr/proc.c:193 storage/lmgr/proc.c:212
-#: utils/hash/dynahash.c:928
-msgid "out of shared memory"
-msgstr "Shared Memory aufgebraucht"
+msgid "could not truncate file \"%s\": %m"
+msgstr "kann Datei »%s« nicht kürzen: %m"
 
-#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
+#: storage/smgr/md.c:449
 #, c-format
-msgid ""
-"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
-msgstr ""
-"nicht genug Shared-Memory für Datenstruktur »%s« (%lu Bytes angefordert)"
+msgid "cannot extend file \"%s\" beyond %u blocks"
+msgstr "kann Datei »%s« nicht auf über %u Blöcke erweitern"
 
-#: storage/ipc/shmem.c:365
+# XXX
+#: storage/smgr/md.c:471 storage/smgr/md.c:635 storage/smgr/md.c:710
 #, c-format
-msgid "could not create ShmemIndex entry for data structure \"%s\""
-msgstr "konnte ShmemIndex-Eintrag für Datenstruktur »%s« nicht erzeugen"
+msgid "could not seek to block %u in file \"%s\": %m"
+msgstr "konnte Positionszeiger nicht auf Block %u in Datei »%s« setzen: %m"
 
-#: storage/ipc/shmem.c:380
+#: storage/smgr/md.c:479
 #, c-format
-msgid ""
-"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
-"actual %lu"
-msgstr ""
-"ShmemIndex-Eintraggröße ist falsch für Datenstruktur »%s«: erwartet %lu, "
-"tatsächlich %lu"
-
-#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
-msgid "requested shared memory size overflows size_t"
-msgstr "angeforderte Shared-Memory-Größe übersteigt Kapazität von size_t"
+msgid "could not extend file \"%s\": %m"
+msgstr "konnte Datei »%s« nicht erweitern: %m"
 
-#: storage/large_object/inv_api.c:555 storage/large_object/inv_api.c:752
-#, c-format
-msgid "large object %u was not opened for writing"
-msgstr "Large Object %u wurde nicht zum Schreiben geöffnet"
+#: storage/smgr/md.c:481 storage/smgr/md.c:488 storage/smgr/md.c:737
+msgid "Check free disk space."
+msgstr "Prüfen Sie den freien Festplattenplatz."
 
-#: storage/large_object/inv_api.c:562 storage/large_object/inv_api.c:759
+#: storage/smgr/md.c:485
 #, c-format
-msgid "large object %u was already dropped"
-msgstr "Large Object %u wurde gleichzeitig gelöscht"
-
-#: storage/lmgr/predicate.c:574
-msgid "not enough elements in RWConflictPool to record a rw-conflict"
-msgstr ""
-
-#: storage/lmgr/predicate.c:575 storage/lmgr/predicate.c:603
-msgid ""
-"You might need to run fewer transactions at a time or increase "
-"max_connections."
-msgstr ""
-
-#: storage/lmgr/predicate.c:602
-msgid "not enough elements in RWConflictPool to record a potential rw-conflict"
-msgstr ""
-
-#: storage/lmgr/predicate.c:782
-msgid "memory for serializable conflict tracking is nearly exhausted"
-msgstr ""
-
-#: storage/lmgr/predicate.c:783
-#, fuzzy
-msgid ""
-"There may be an idle transaction or a forgotten prepared transaction causing "
-"this."
+msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr ""
-"%d andere Sitzung(en) und %d vorbereitete Transaktion(en) verwenden die "
-"Datenbank."
+"konnte Datei »%s« nicht erweitern: es wurden nur %d von %d Bytes bei Block "
+"%u geschrieben"
 
-#: storage/lmgr/predicate.c:1067 storage/lmgr/predicate.c:1138
+#: storage/smgr/md.c:653
 #, c-format
-msgid ""
-"not enough shared memory for elements of data structure \"%s\" (%lu bytes "
-"requested)"
-msgstr ""
-"nicht genug Shared-Memory für Elemente der Datenstruktur »%s« (%lu Bytes "
-"angefordert)"
+msgid "could not read block %u in file \"%s\": %m"
+msgstr "konnte Block %u in Datei »%s« nicht lesen: %m"
 
-#: storage/lmgr/predicate.c:1408
-msgid "deferrable snapshot was unsafe; trying a new one"
+#: storage/smgr/md.c:669
+#, c-format
+msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
 msgstr ""
+"konnte Block %u in Datei »%s« nicht lesen: es wurden nur %d von %d Bytes "
+"gelesen"
 
-#: storage/lmgr/predicate.c:2055 storage/lmgr/predicate.c:2070
-#: storage/lmgr/predicate.c:3297
-msgid "You might need to increase max_pred_locks_per_transaction."
-msgstr "Sie müssen möglicherweise max_pred_locks_per_transaction erhöhen."
-
-#: storage/lmgr/predicate.c:3449 storage/lmgr/predicate.c:3538
-#: storage/lmgr/predicate.c:3546 storage/lmgr/predicate.c:3587
-#: storage/lmgr/predicate.c:3828 storage/lmgr/predicate.c:3995
-#: storage/lmgr/predicate.c:4004 storage/lmgr/predicate.c:4045
-#, fuzzy
-msgid ""
-"could not serialize access due to read/write dependencies among transactions"
-msgstr "kann Zugriff nicht serialisieren wegen gleichzeitiger Aktualisierung"
+#: storage/smgr/md.c:728
+#, c-format
+msgid "could not write block %u in file \"%s\": %m"
+msgstr "konnte Block %u in Datei »%s« nicht schreiben: %m"
 
-#: storage/lmgr/predicate.c:3450
-msgid "Cancelled on identification as a pivot, during conflict out checking."
+#: storage/smgr/md.c:733
+#, c-format
+msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
 msgstr ""
+"konnte Block %u in Datei »%s« nicht schreiben: es wurden nur %d von %d Bytes "
+"geschrieben"
 
-#: storage/lmgr/predicate.c:3451 storage/lmgr/predicate.c:3540
-#: storage/lmgr/predicate.c:3548 storage/lmgr/predicate.c:3589
-#: storage/lmgr/predicate.c:3830 storage/lmgr/predicate.c:3997
-#: storage/lmgr/predicate.c:4006 storage/lmgr/predicate.c:4047
-msgid "The transaction might succeed if retried."
+#: storage/smgr/md.c:831
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr ""
+"konnte Datei »%s« nicht auf %u Blöcke kürzen: es sind jetzt nur %u Blöcke"
 
-#: storage/lmgr/predicate.c:3539
+#: storage/smgr/md.c:880
 #, c-format
-msgid "Cancelled on conflict out to old pivot %u."
-msgstr ""
+msgid "could not truncate file \"%s\" to %u blocks: %m"
+msgstr "konnte Datei »%s« nicht auf %u Blöcke kürzen: %m"
 
-#: storage/lmgr/predicate.c:3547
+#: storage/smgr/md.c:1134
 #, c-format
-msgid ""
-"Cancelled on identification as a pivot, with conflict out to old committed "
-"transaction %u."
-msgstr ""
+msgid "could not fsync file \"%s\" but retrying: %m"
+msgstr "konnte Datei »%s« nicht fsyncen, versuche erneut: %m"
 
-#: storage/lmgr/predicate.c:3588
-msgid "Cancelled on conflict out to old pivot."
-msgstr ""
+#: storage/smgr/md.c:1276
+msgid "could not forward fsync request because request queue is full"
+msgstr "konnte fsync-Anfrage nicht weiterleiten, weil Anfrageschlange voll ist"
 
-#: storage/lmgr/predicate.c:3829
-msgid "Cancelled on identification as a pivot, during conflict in checking."
-msgstr ""
+#: storage/smgr/md.c:1646
+#, c-format
+msgid "could not open file \"%s\" (target block %u): %m"
+msgstr "konnte Datei »%s« nicht öffnen (Zielblock %u): %m"
 
-#: storage/lmgr/predicate.c:3996
-msgid "Cancelled on identification as pivot, during write."
-msgstr ""
+#: storage/smgr/md.c:1668
+#, c-format
+msgid "could not seek to end of file \"%s\": %m"
+msgstr "konnte Positionszeiger nicht ans Ende der Datei »%s« setzen: %m"
 
-#: storage/lmgr/predicate.c:4005
+#: storage/large_object/inv_api.c:555 storage/large_object/inv_api.c:752
 #, c-format
-msgid "Cancelled on conflict out to pivot %u, during read."
-msgstr ""
+msgid "large object %u was not opened for writing"
+msgstr "Large Object %u wurde nicht zum Schreiben geöffnet"
 
-#: storage/lmgr/predicate.c:4046
-msgid "Cancelled on identification as a pivot, during commit attempt."
-msgstr ""
+#: storage/large_object/inv_api.c:562 storage/large_object/inv_api.c:759
+#, c-format
+msgid "large object %u was already dropped"
+msgstr "Large Object %u wurde gleichzeitig gelöscht"
 
 #: storage/lmgr/deadlock.c:915
 #, c-format
@@ -10406,23 +9988,23 @@ msgstr ""
 "Nur Sperren gleich oder unter RowExclusiveLock können während der "
 "Wiederherstellung auf Datenbankobjekte gesetzt werden."
 
-#: storage/lmgr/lock.c:632 storage/lmgr/lock.c:701 storage/lmgr/lock.c:2550
-#: storage/lmgr/lock.c:2615
+#: storage/lmgr/lock.c:632 storage/lmgr/lock.c:701 storage/lmgr/lock.c:2543
+#: storage/lmgr/lock.c:2608
 msgid "You might need to increase max_locks_per_transaction."
 msgstr "Sie müssen möglicherweise max_locks_per_transaction erhöhen."
 
-#: storage/lmgr/lock.c:2171
+#: storage/lmgr/lock.c:2164
 msgid "Not enough memory for reassigning the prepared transaction's locks."
 msgstr ""
 "Nicht genug Speicher, um die Sperren der vorbereiteten Transaktion zu "
 "übergeben."
 
-#: storage/lmgr/proc.c:1019 utils/adt/misc.c:102
+#: storage/lmgr/proc.c:1046 utils/adt/misc.c:102
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "konnte Signal nicht an Prozess %d senden: %m"
 
-#: storage/lmgr/proc.c:1053
+#: storage/lmgr/proc.c:1080
 #, c-format
 msgid ""
 "process %d avoided deadlock for %s on %s by rearranging queue order after "
@@ -10431,7 +10013,7 @@ msgstr ""
 "Prozess %d vermied Verklemmung wegen %s-Sperre auf %s durch Umordnen der "
 "Queue nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1065
+#: storage/lmgr/proc.c:1092
 #, c-format
 msgid ""
 "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
@@ -10439,21 +10021,95 @@ msgstr ""
 "Prozess %d hat Verklemmung festgestellt beim Warten auf %s-Sperre auf %s "
 "nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1071
+#: storage/lmgr/proc.c:1098
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "Prozess %d wartet immer noch auf %s-Sperre auf %s nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1075
+#: storage/lmgr/proc.c:1102
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "Prozess %d erlangte %s-Sperre auf %s nach %ld,%03d ms"
 
-#: storage/lmgr/proc.c:1091
+#: storage/lmgr/proc.c:1118
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "Prozess %d konnte %s-Sperre auf %s nach %ld,%03d ms nicht erlangen"
 
+#: storage/lmgr/predicate.c:665
+msgid "not enough elements in RWConflictPool to record a read/write conflict"
+msgstr ""
+"nicht genügend Elemente in RWConflictPool, um einen Lese-/Schreibkonflikt "
+"aufzuzeichnen"
+
+#: storage/lmgr/predicate.c:666 storage/lmgr/predicate.c:694
+msgid ""
+"You might need to run fewer transactions at a time or increase "
+"max_connections."
+msgstr ""
+"Sie müssten entweder weniger Transaktionen auf einmal ausführen oder "
+"max_connections erhöhen."
+
+#: storage/lmgr/predicate.c:693
+msgid ""
+"not enough elements in RWConflictPool to record a potential read/write "
+"conflict"
+msgstr ""
+"nicht genügend Elemente in RWConflictPool, um einen möglichen Lese-/"
+"Schreibkonflikt aufzuzeichnen"
+
+#: storage/lmgr/predicate.c:898
+msgid "memory for serializable conflict tracking is nearly exhausted"
+msgstr ""
+"Speicher für die Verfolgung von Serialisierungskonflikten ist fast "
+"aufgebraucht"
+
+#: storage/lmgr/predicate.c:899
+msgid ""
+"There might be an idle transaction or a forgotten prepared transaction "
+"causing this."
+msgstr ""
+"Möglicherweise gibt es eine stillliegende Transaktion oder eine vergessene "
+"vorbereitete Transaktion, die der Grund dafür ist."
+
+#: storage/lmgr/predicate.c:1181 storage/lmgr/predicate.c:1253
+#, c-format
+msgid ""
+"not enough shared memory for elements of data structure \"%s\" (%lu bytes "
+"requested)"
+msgstr ""
+"nicht genug Shared-Memory für Elemente der Datenstruktur »%s« (%lu Bytes "
+"angefordert)"
+
+#: storage/lmgr/predicate.c:1536
+msgid "deferrable snapshot was unsafe; trying a new one"
+msgstr "aufschiebbarer Snapshot war unsicher; versuche einen neuen"
+
+#: storage/lmgr/predicate.c:2234 storage/lmgr/predicate.c:2249
+#: storage/lmgr/predicate.c:3624
+msgid "You might need to increase max_pred_locks_per_transaction."
+msgstr "Sie müssen möglicherweise max_pred_locks_per_transaction erhöhen."
+
+#: storage/lmgr/predicate.c:3778 storage/lmgr/predicate.c:3867
+#: storage/lmgr/predicate.c:3875 storage/lmgr/predicate.c:3914
+#: storage/lmgr/predicate.c:4153 storage/lmgr/predicate.c:4491
+#: storage/lmgr/predicate.c:4503 storage/lmgr/predicate.c:4545
+#: storage/lmgr/predicate.c:4583
+msgid ""
+"could not serialize access due to read/write dependencies among transactions"
+msgstr ""
+"konnte Zugriff nicht serialisieren wegen Lese-/Schreib-Abhängigkeiten "
+"zwischen Transaktionen"
+
+#: storage/lmgr/predicate.c:3780 storage/lmgr/predicate.c:3869
+#: storage/lmgr/predicate.c:3877 storage/lmgr/predicate.c:3916
+#: storage/lmgr/predicate.c:4155 storage/lmgr/predicate.c:4493
+#: storage/lmgr/predicate.c:4505 storage/lmgr/predicate.c:4547
+#: storage/lmgr/predicate.c:4585
+msgid "The transaction might succeed if retried."
+msgstr ""
+"Die Transaktion könnte erfolgreich sein, wenn sie erneut versucht würde."
+
 #: storage/page/bufpage.c:143 storage/page/bufpage.c:390
 #: storage/page/bufpage.c:623 storage/page/bufpage.c:753
 #, c-format
@@ -10475,63 +10131,316 @@ msgstr "verfälschte Item-Längen: gesamt %u, verfügbarer Platz %u"
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "verfälschter Item-Zeiger: offset = %u, size = %u"
 
-#: nodes/nodeFuncs.c:114 nodes/nodeFuncs.c:140 parser/parse_coerce.c:1603
-#: parser/parse_coerce.c:1620 parser/parse_coerce.c:1678
-#: parser/parse_expr.c:1633 parser/parse_func.c:367 parser/parse_oper.c:984
+#: main/main.c:237
 #, c-format
-msgid "could not find array type for data type %s"
-msgstr "konnte Arraytyp für Datentyp %s nicht finden"
+msgid "%s: setsysinfo failed: %s\n"
+msgstr "%s: setsysinfo fehlgeschlagen: %s\n"
+
+#: main/main.c:259
+#, c-format
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: WSAStartup fehlgeschlagen: %d\n"
 
-#: optimizer/plan/initsplan.c:587
+#: main/main.c:278
+#, c-format
 msgid ""
-"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
-"join"
+"%s is the PostgreSQL server.\n"
+"\n"
 msgstr ""
-"SELECT FOR UPDATE/SHARE kann nicht auf die nullbare Seite eines äußeren "
-"Verbundes angewendet werden"
-
-#: optimizer/plan/planner.c:959 parser/analyze.c:1336 parser/analyze.c:1533
-#: parser/analyze.c:2262
-msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
-msgstr "SELECT FOR UPDATE/SHARE ist nicht in UNION/INTERSECT/EXCEPT erlaubt"
-
-#: optimizer/plan/planner.c:2249
-msgid "could not implement GROUP BY"
-msgstr "konnte GROUP BY nicht implementieren"
+"%s ist der PostgreSQL-Server.\n"
+"\n"
 
-#: optimizer/plan/planner.c:2250 optimizer/plan/planner.c:2422
-#: optimizer/prep/prepunion.c:791
+#: main/main.c:279
+#, c-format
 msgid ""
-"Some of the datatypes only support hashing, while others only support "
-"sorting."
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
 msgstr ""
-"Einige Datentypen unterstützen nur Hashing, während andere nur Sortieren "
-"unterstützen."
-
-#: optimizer/plan/planner.c:2421
-msgid "could not implement DISTINCT"
-msgstr "konnte DISTINCT nicht implementieren"
+"Aufruf:\n"
+"  %s [OPTION]...\n"
+"\n"
 
-#: optimizer/plan/planner.c:2868
-msgid "could not implement window PARTITION BY"
-msgstr "konnte PARTITION BY für Fenster nicht implementieren"
+#: main/main.c:280
+#, c-format
+msgid "Options:\n"
+msgstr "Optionen:\n"
 
-#: optimizer/plan/planner.c:2869
-msgid "Window partitioning columns must be of sortable datatypes."
-msgstr "Fensterpartitionierungsspalten müssen sortierbare Datentypen haben."
+#: main/main.c:282
+#, c-format
+msgid "  -A 1|0          enable/disable run-time assert checking\n"
+msgstr "  -A 1|0          Assert-Prüfungen ein-/ausschalten\n"
 
-#: optimizer/plan/planner.c:2873
-msgid "could not implement window ORDER BY"
-msgstr "konnte ORDER BY für Fenster nicht implementieren"
+#: main/main.c:284
+#, c-format
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B ZAHL         Anzahl der geteilten Puffer\n"
 
-#: optimizer/plan/planner.c:2874
-msgid "Window ordering columns must be of sortable datatypes."
-msgstr "Fenstersortierspalten müssen sortierbare Datentypen haben."
+#: main/main.c:285
+#, c-format
+msgid "  -c NAME=VALUE   set run-time parameter\n"
+msgstr "  -c NAME=WERT    setze Konfigurationsparameter\n"
 
-#: optimizer/util/clauses.c:4201
+#: main/main.c:286
 #, c-format
-msgid "SQL function \"%s\" during inlining"
-msgstr "SQL-Funktion »%s« beim Inlining"
+msgid "  -d 1-5          debugging level\n"
+msgstr "  -d 1-5          Debug-Level\n"
+
+#: main/main.c:287
+#, c-format
+msgid "  -D DATADIR      database directory\n"
+msgstr "  -D VERZEICHNIS  Datenbankverzeichnis\n"
+
+#: main/main.c:288
+#, c-format
+msgid "  -e              use European date input format (DMY)\n"
+msgstr "  -e              verwende europäisches Datumseingabeformat (DMY)\n"
+
+#: main/main.c:289
+#, c-format
+msgid "  -F              turn fsync off\n"
+msgstr "  -F              »fsync« ausschalten\n"
+
+#: main/main.c:290
+#, c-format
+msgid "  -h HOSTNAME     host name or IP address to listen on\n"
+msgstr "  -h HOSTNAME     horche auf Hostname oder IP-Adresse\n"
+
+#: main/main.c:291
+#, c-format
+msgid "  -i              enable TCP/IP connections\n"
+msgstr "  -i              ermögliche TCP/IP-Verbindungen\n"
+
+#: main/main.c:292
+#, c-format
+msgid "  -k DIRECTORY    Unix-domain socket location\n"
+msgstr "  -k VERZEICHNIS  Ort der Unix-Domain-Socket\n"
+
+#: main/main.c:294
+#, c-format
+msgid "  -l              enable SSL connections\n"
+msgstr "  -l              ermögliche SSL-Verbindungen\n"
+
+#: main/main.c:296
+#, c-format
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N ZAHL         Anzahl der erlaubten Verbindugen\n"
+
+#: main/main.c:297
+#, c-format
+msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgstr ""
+"  -o OPTIONEN     »OPTIONEN« an jeden Serverprozess weiterreichen (obsolet)\n"
+
+#: main/main.c:298
+#, c-format
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p PORT         auf dieser Portnummer horchen\n"
+
+#: main/main.c:299
+#, c-format
+msgid "  -s              show statistics after each query\n"
+msgstr "  -s              zeige Statistiken nach jeder Anfrage\n"
+
+#: main/main.c:300
+#, c-format
+msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
+msgstr "  -S ZAHL         setze Speicher für Sortiervorgänge (in kB)\n"
+
+#: main/main.c:301
+#, c-format
+msgid "  --NAME=VALUE    set run-time parameter\n"
+msgstr "  --NAME=WERT     setze Konfigurationsparameter\n"
+
+#: main/main.c:302
+#, c-format
+msgid "  --describe-config  describe configuration parameters, then exit\n"
+msgstr "  --describe-config  zeige Konfigurationsparameter und beende\n"
+
+#: main/main.c:303
+#, c-format
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          diese Hilfe anzeigen, dann beenden\n"
+
+#: main/main.c:304
+#, c-format
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       Versionsinformationen anzeigen, dann beenden\n"
+
+#: main/main.c:306
+#, c-format
+msgid ""
+"\n"
+"Developer options:\n"
+msgstr ""
+"\n"
+"Entwickleroptionen:\n"
+
+#: main/main.c:307
+#, c-format
+msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
+msgstr "  -f s|i|n|m|h    verbiete Verwendung einiger Plantypen\n"
+
+#: main/main.c:308
+#, c-format
+msgid ""
+"  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr ""
+"  -n              Shared Memory nach abnormalem Ende nicht neu "
+"initialisieren\n"
+
+#: main/main.c:309
+#, c-format
+msgid "  -O              allow system table structure changes\n"
+msgstr "  -O              erlaube Änderungen an Systemtabellenstruktur\n"
+
+#: main/main.c:310
+#, c-format
+msgid "  -P              disable system indexes\n"
+msgstr "  -P              schalte Systemindexe aus\n"
+
+#: main/main.c:311
+#, c-format
+msgid "  -t pa|pl|ex     show timings after each query\n"
+msgstr "  -t pa|pl|ex     zeige Zeitmessung nach jeder Anfrage\n"
+
+#: main/main.c:312
+#, c-format
+msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
+msgstr ""
+"  -T              SIGSTOP an alle Backend-Prozesse senden wenn einer stirbt\n"
+
+#: main/main.c:313
+#, c-format
+msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
+msgstr "  -W ZAHL         warte ZAHL Sekunden, um Debugger starten zu können\n"
+
+#: main/main.c:315
+#, c-format
+msgid ""
+"\n"
+"Options for single-user mode:\n"
+msgstr ""
+"\n"
+"Optionen für Einzelbenutzermodus:\n"
+
+#: main/main.c:316
+#, c-format
+msgid "  --single        selects single-user mode (must be first argument)\n"
+msgstr ""
+"  --single        wählt den Einzelbenutzermodus (muss erstes Argument sein)\n"
+
+#: main/main.c:317
+#, c-format
+msgid "  DBNAME          database name (defaults to user name)\n"
+msgstr "  DBNAME          Datenbankname (Standard: Benutzername)\n"
+
+#: main/main.c:318
+#, c-format
+msgid "  -d 0-5          override debugging level\n"
+msgstr "  -d 1-5          Debug-Level setzen\n"
+
+#: main/main.c:319
+#, c-format
+msgid "  -E              echo statement before execution\n"
+msgstr "  -E              gebe Befehl vor der Ausführung aus\n"
+
+#: main/main.c:320
+#, c-format
+msgid "  -j              do not use newline as interactive query delimiter\n"
+msgstr ""
+"  -j              verwende Zeilenende nicht als Anfrageende im interaktiven\n"
+"                  Modus\n"
+
+#: main/main.c:321 main/main.c:326
+#, c-format
+msgid "  -r FILENAME     send stdout and stderr to given file\n"
+msgstr "  -r DATEINAME    sende stdout und stderr in genannte Datei\n"
+
+#: main/main.c:323
+#, c-format
+msgid ""
+"\n"
+"Options for bootstrapping mode:\n"
+msgstr ""
+"\n"
+"Optionen für Bootstrap-Modus:\n"
+
+#: main/main.c:324
+#, c-format
+msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
+msgstr ""
+"  --boot          wählt den Bootstrap-Modus (muss erstes Argument sein)\n"
+
+#: main/main.c:325
+#, c-format
+msgid ""
+"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
+msgstr "  DBNAME          Datenbankname (Pflichtangabe im Bootstrap-Modus)\n"
+
+#: main/main.c:327
+#, c-format
+msgid "  -x NUM          internal use\n"
+msgstr "  -x NUM          interne Verwendung\n"
+
+#: main/main.c:329
+#, c-format
+msgid ""
+"\n"
+"Please read the documentation for the complete list of run-time\n"
+"configuration settings and how to set them on the command line or in\n"
+"the configuration file.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"In der Dokumentation finden Sie eine komplette Liste der Konfigurations-\n"
+"parameter und Informationen wie man sie auf der Kommandozeile oder in der\n"
+"Konfiguratonsdatei setzen kann.\n"
+"\n"
+"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
+
+#: main/main.c:343
+msgid ""
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"Der PostgreSQL-Server darf nicht als »root« ausgeführt werden.  Der\n"
+"Server muss unter einer unprivilegierten Benutzer-ID gestartet werden,\n"
+"um mögliche Sicherheitskompromittierung zu verhindern.  In der\n"
+"Dokumentation finden Sie weitere Informationen darüber, wie der\n"
+"Server richtig gestartet wird.\n"
+
+#: main/main.c:360
+#, c-format
+msgid "%s: real and effective user IDs must match\n"
+msgstr "%s: reelle und effektive Benutzer-IDs müssen übereinstimmen\n"
+
+#: main/main.c:367
+msgid ""
+"Execution of PostgreSQL by a user with administrative permissions is not\n"
+"permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromises.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"Der PostgreSQL-Server darf nicht als Benutzer mit Administrator-Rechten\n"
+"ausgeführt werden.  Der Server muss unter einer unprivilegierten\n"
+"Benutzer-ID gestartet werden, um mögliche Sicherheitskompromittierung zu\n"
+"verhindern.  In der Dokumentation finden Sie weitere Informationen darüber,\n"
+"wie der Server richtig gestartet wird.\n"
+
+#: main/main.c:388
+#, c-format
+msgid "%s: invalid effective UID: %d\n"
+msgstr "%s: ungültige effektive UID: %d\n"
+
+#: main/main.c:401
+#, c-format
+msgid "%s: could not determine user name (GetUserName failed)\n"
+msgstr "%s: konnte Benutzername nicht ermitteln (GetUserName fehlgeschlagen)\n"
 
 #: optimizer/prep/prepunion.c:385
 msgid "could not implement recursive UNION"
@@ -10547,29 +10456,70 @@ msgstr "Alle Spaltendatentypen müssen hashbar sein."
 msgid "could not implement %s"
 msgstr "konnte %s nicht implementieren"
 
-#: optimizer/path/joinrels.c:673
+#: optimizer/prep/prepunion.c:791 optimizer/plan/planner.c:2255
+#: optimizer/plan/planner.c:2427
 msgid ""
-"FULL JOIN is only supported with merge-joinable or hash-joinable join "
-"conditions"
+"Some of the datatypes only support hashing, while others only support "
+"sorting."
 msgstr ""
-"FULL JOIN wird nur für Merge- oder Hash-Verbund-fähige Verbundbedingungen "
-"unterstützt"
+"Einige Datentypen unterstützen nur Hashing, während andere nur Sortieren "
+"unterstützen."
 
-#: parser/parse_collate.c:214 parser/parse_collate.c:538
+#: optimizer/util/clauses.c:4166
 #, c-format
-msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgid "SQL function \"%s\" during inlining"
+msgstr "SQL-Funktion »%s« beim Inlining"
+
+#: optimizer/util/plancat.c:97
+msgid "cannot access temporary or unlogged relations during recovery"
 msgstr ""
+"während der Wiederherstellung kann nicht auf temporäre oder ungeloggte "
+"Tabellen zugegriffen werden"
 
-#: parser/parse_collate.c:217 parser/parse_collate.c:541
+#: optimizer/plan/initsplan.c:595
 msgid ""
-"You can choose the collation by applying the COLLATE clause to one or both "
-"expressions."
+"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
+"join"
 msgstr ""
+"SELECT FOR UPDATE/SHARE kann nicht auf die nullbare Seite eines äußeren "
+"Verbundes angewendet werden"
 
-#: parser/parse_collate.c:763
-#, c-format
-msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+#: optimizer/plan/planner.c:959 parser/analyze.c:1337 parser/analyze.c:1534
+#: parser/analyze.c:2263
+msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
+msgstr "SELECT FOR UPDATE/SHARE ist nicht in UNION/INTERSECT/EXCEPT erlaubt"
+
+#: optimizer/plan/planner.c:2254
+msgid "could not implement GROUP BY"
+msgstr "konnte GROUP BY nicht implementieren"
+
+#: optimizer/plan/planner.c:2426
+msgid "could not implement DISTINCT"
+msgstr "konnte DISTINCT nicht implementieren"
+
+#: optimizer/plan/planner.c:2877
+msgid "could not implement window PARTITION BY"
+msgstr "konnte PARTITION BY für Fenster nicht implementieren"
+
+#: optimizer/plan/planner.c:2878
+msgid "Window partitioning columns must be of sortable datatypes."
+msgstr "Fensterpartitionierungsspalten müssen sortierbare Datentypen haben."
+
+#: optimizer/plan/planner.c:2882
+msgid "could not implement window ORDER BY"
+msgstr "konnte ORDER BY für Fenster nicht implementieren"
+
+#: optimizer/plan/planner.c:2883
+msgid "Window ordering columns must be of sortable datatypes."
+msgstr "Fenstersortierspalten müssen sortierbare Datentypen haben."
+
+#: optimizer/path/joinrels.c:673
+msgid ""
+"FULL JOIN is only supported with merge-joinable or hash-joinable join "
+"conditions"
 msgstr ""
+"FULL JOIN wird nur für Merge- oder Hash-Verbund-fähige Verbundbedingungen "
+"unterstützt"
 
 #: parser/analyze.c:471
 msgid "INSERT ... SELECT cannot specify INTO"
@@ -10579,23 +10529,23 @@ msgstr "INSERT ... SELECT kann INTO nicht verwenden"
 msgid "VALUES lists must all be the same length"
 msgstr "VALUES-Listen müssen alle die gleiche Länge haben"
 
-#: parser/analyze.c:606 parser/analyze.c:1210
+#: parser/analyze.c:606 parser/analyze.c:1211
 msgid "VALUES must not contain table references"
 msgstr "VALUES darf keine Tabellenverweise enthalten"
 
-#: parser/analyze.c:620 parser/analyze.c:1224
+#: parser/analyze.c:620 parser/analyze.c:1225
 msgid "VALUES must not contain OLD or NEW references"
 msgstr "VALUES darf keine Verweise auf OLD oder NEW enthalten"
 
-#: parser/analyze.c:621 parser/analyze.c:1225
+#: parser/analyze.c:621 parser/analyze.c:1226
 msgid "Use SELECT ... UNION ALL ... instead."
 msgstr "Verwenden Sie stattdessen SELECT ... UNION ALL ..."
 
-#: parser/analyze.c:725 parser/analyze.c:1237
+#: parser/analyze.c:725 parser/analyze.c:1238
 msgid "cannot use aggregate function in VALUES"
 msgstr "Aggregatfunktionen können nicht in VALUES verwendet werden"
 
-#: parser/analyze.c:731 parser/analyze.c:1243
+#: parser/analyze.c:731 parser/analyze.c:1244
 msgid "cannot use window function in VALUES"
 msgstr "Fensterfunktionen können nicht in VALUES verwendet werden"
 
@@ -10612,26 +10562,28 @@ msgid ""
 "The insertion source is a row expression containing the same number of "
 "columns expected by the INSERT. Did you accidentally use extra parentheses?"
 msgstr ""
+"Der einzufügende Wert ist ein Zeilenausdruck mit der gleichen Anzahl Spalten "
+"wie von INSERT erwartet. Haben Sie versehentlich zu viele Klammern gesetzt?"
 
 #: parser/analyze.c:1084
 msgid "DEFAULT can only appear in a VALUES list within INSERT"
 msgstr "DEFAULT kann nur in VALUES-Liste innerhalb von INSERT auftreten"
 
-#: parser/analyze.c:1191 parser/analyze.c:2413
+#: parser/analyze.c:1192 parser/analyze.c:2414
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
 msgstr "SELECT FOR UPDATE/SHARE kann nicht auf VALUES angewendet werden"
 
-#: parser/analyze.c:1451
+#: parser/analyze.c:1452
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "ungültige ORDER-BY-Klausel mit UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:1452
+#: parser/analyze.c:1453
 msgid "Only result column names can be used, not expressions or functions."
 msgstr ""
 "Es können nur Ergebnisspaltennamen verwendet werden, keine Ausdrücke oder "
 "Funktionen."
 
-#: parser/analyze.c:1453
+#: parser/analyze.c:1454
 msgid ""
 "Add the expression/function to every SELECT, or move the UNION into a FROM "
 "clause."
@@ -10639,11 +10591,11 @@ msgstr ""
 "Fügen Sie den Ausdrück/die Funktion jedem SELECT hinzu oder verlegen Sie die "
 "UNION in eine FROM-Klausel."
 
-#: parser/analyze.c:1525
+#: parser/analyze.c:1526
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO ist nur im ersten SELECT von UNION/INTERSECT/EXCEPT erlaubt"
 
-#: parser/analyze.c:1585
+#: parser/analyze.c:1586
 msgid ""
 "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
 "same query level"
@@ -10651,85 +10603,85 @@ msgstr ""
 "Teilanweisung von UNION/INTERSECT/EXCEPT kann nicht auf andere Relationen "
 "auf der selben Anfrageebene verweisen"
 
-#: parser/analyze.c:1673
+#: parser/analyze.c:1674
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "jede %s-Anfrage muss die gleiche Anzahl Spalten haben"
 
-#: parser/analyze.c:1929
+#: parser/analyze.c:1930
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS gibt zu viele Spaltennamen an"
 
-#: parser/analyze.c:1987
+#: parser/analyze.c:1988
 msgid "cannot use aggregate function in UPDATE"
 msgstr "Aggregatfunktionen können nicht in UPDATE verwendet werden"
 
-#: parser/analyze.c:1993
+#: parser/analyze.c:1994
 msgid "cannot use window function in UPDATE"
 msgstr "Fensterfunktionen können nicht in UPDATE verwendet werden"
 
-#: parser/analyze.c:2102
+#: parser/analyze.c:2103
 msgid "cannot use aggregate function in RETURNING"
 msgstr "Aggregatfunktionen können nicht in RETURNING verwendet werden"
 
-#: parser/analyze.c:2108
+#: parser/analyze.c:2109
 msgid "cannot use window function in RETURNING"
 msgstr "Fensterfunktionen können nicht in RETURNING verwendet werden"
 
-#: parser/analyze.c:2127
+#: parser/analyze.c:2128
 msgid "RETURNING cannot contain references to other relations"
 msgstr "RETURNING kann keine Verweise auf andere Relationen enthalten"
 
-#: parser/analyze.c:2166
+#: parser/analyze.c:2167
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "SCROLL und NO SCROLL können nicht beide angegeben werden"
 
-#: parser/analyze.c:2180
+#: parser/analyze.c:2181
 msgid "DECLARE CURSOR cannot specify INTO"
 msgstr "DECLARE CURSOR kann nicht INTO verwenden"
 
-#: parser/analyze.c:2192
+#: parser/analyze.c:2193
 msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr ""
 "DECLARE CURSOR darf keine datenmodifizierenden Anweisungen in WITH enthalten"
 
-#: parser/analyze.c:2198
+#: parser/analyze.c:2199
 msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE wird nicht unterstützt"
 
-#: parser/analyze.c:2199
+#: parser/analyze.c:2200
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Haltbare Cursor müssen READ ONLY sein."
 
-#: parser/analyze.c:2212
+#: parser/analyze.c:2213
 msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE wird nicht unterstützt"
 
-#: parser/analyze.c:2213
+#: parser/analyze.c:2214
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Insensitive Cursor müssen READ ONLY sein."
 
-#: parser/analyze.c:2266
+#: parser/analyze.c:2267
 msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
 msgstr "SELECT FOR UPDATE/SHARE ist nicht mit DISTINCT-Klausel erlaubt"
 
-#: parser/analyze.c:2270
+#: parser/analyze.c:2271
 msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
 msgstr "SELECT FOR UPDATE/SHARE ist nicht mit GROUP-BY-Klausel erlaubt"
 
-#: parser/analyze.c:2274
+#: parser/analyze.c:2275
 msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
 msgstr "SELECT FOR UPDATE/SHARE ist nicht mit HAVING-Klausel erlaubt"
 
-#: parser/analyze.c:2278
+#: parser/analyze.c:2279
 msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
 msgstr "SELECT FOR UPDATE/SHARE ist nicht mit Aggregatfunktionen erlaubt"
 
-#: parser/analyze.c:2282
+#: parser/analyze.c:2283
 msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
 msgstr "SELECT FOR UPDATE/SHARE ist nicht mit Fensterfunktionen erlaubt"
 
-#: parser/analyze.c:2286
+#: parser/analyze.c:2287
 msgid ""
 "SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
 "target list"
@@ -10737,29 +10689,35 @@ msgstr ""
 "SELECT FOR UPDATE/SHARE ist nicht mit Funktionen mit Ergebnismenge in der "
 "Targetliste erlaubt"
 
-#: parser/analyze.c:2365
+#: parser/analyze.c:2366
 msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
 msgstr "SELECT FOR UPDATE/SHARE muss unqualifizierte Relationsnamen angeben"
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2383
+#, c-format
+msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
+msgstr ""
+"SELECT FOR UPDATE/SHARE kann nicht mit Fremdtabelle »%s« verwendet werden"
+
+#: parser/analyze.c:2402
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
 msgstr "SELECT FOR UPDATE/SHARE kann nicht auf einen Verbund angewendet werden"
 
-#: parser/analyze.c:2407
+#: parser/analyze.c:2408
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
 msgstr "SELECT FOR UPDATE/SHARE kann nicht auf eine Funktion angewendet werden"
 
-#: parser/analyze.c:2419
+#: parser/analyze.c:2420
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
 msgstr ""
 "SELECT FOR UPDATE/SHARE kann nicht auf eine WITH-Anfrage angewendet werden"
 
-#: parser/analyze.c:2433
+#: parser/analyze.c:2434
 #, c-format
 msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
 msgstr "Relation »%s« in FOR UPDATE/SHARE nicht in der FROM-Klausel gefunden"
 
-#: parser/parse_agg.c:131 parser/parse_oper.c:255
+#: parser/parse_agg.c:131 parser/parse_oper.c:219
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "konnte keine Sortieroperator für Typ %s ermitteln"
@@ -10986,72 +10944,72 @@ msgstr ""
 "Sortieroperatoren müssen die Mitglieder »<« oder »>« einer »btree«-"
 "Operatorfamilie sein."
 
-#: parser/parse_coerce.c:875 parser/parse_coerce.c:905
-#: parser/parse_coerce.c:923 parser/parse_coerce.c:938
-#: parser/parse_expr.c:1667 parser/parse_expr.c:2109 parser/parse_target.c:829
+#: parser/parse_coerce.c:906 parser/parse_coerce.c:936
+#: parser/parse_coerce.c:954 parser/parse_coerce.c:969
+#: parser/parse_expr.c:1670 parser/parse_expr.c:2119 parser/parse_target.c:829
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "kann Typ %s nicht in Typ %s umwandeln"
 
-#: parser/parse_coerce.c:908
+#: parser/parse_coerce.c:939
 msgid "Input has too few columns."
 msgstr "Eingabe hat zu wenige Spalten."
 
-#: parser/parse_coerce.c:926
+#: parser/parse_coerce.c:957
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "Kann in Spalte %3$d Typ %1$s nicht in Typ %2$s umwandeln."
 
-#: parser/parse_coerce.c:941
+#: parser/parse_coerce.c:972
 msgid "Input has too many columns."
 msgstr "Eingabe hat zu viele Spalten."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:984
+#: parser/parse_coerce.c:1015
 #, c-format
 msgid "argument of %s must be type boolean, not type %s"
 msgstr "Argument von %s muss Typ boolean haben, nicht Typ %s"
 
 #. translator: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:994 parser/parse_coerce.c:1043
+#: parser/parse_coerce.c:1025 parser/parse_coerce.c:1074
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "Argument von %s darf keine Ergebnismenge zurückgeben"
 
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1031
+#: parser/parse_coerce.c:1062
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "Argument von %s muss Typ %s haben, nicht Typ %s"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1164
+#: parser/parse_coerce.c:1195
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "%s-Typen %s und %s passen nicht zusammen"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1231
+#: parser/parse_coerce.c:1262
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s konnte Typ %s nicht in %s umwandeln"
 
-#: parser/parse_coerce.c:1472
+#: parser/parse_coerce.c:1513
 msgid "arguments declared \"anyelement\" are not all alike"
 msgstr "als »anyelement« deklariert Argumente sind nicht alle gleich"
 
-#: parser/parse_coerce.c:1491
+#: parser/parse_coerce.c:1533
 msgid "arguments declared \"anyarray\" are not all alike"
 msgstr "als »anyarray« deklarierte Argumente sind nicht alle gleich"
 
-#: parser/parse_coerce.c:1520 parser/parse_coerce.c:1664
-#: parser/parse_coerce.c:1695
+#: parser/parse_coerce.c:1562 parser/parse_coerce.c:1710
+#: parser/parse_coerce.c:1742
 #, c-format
 msgid "argument declared \"anyarray\" is not an array but type %s"
 msgstr "als »anyarray« deklariertes Argument ist kein Array sondern Typ %s"
 
-#: parser/parse_coerce.c:1536
+#: parser/parse_coerce.c:1578
 msgid ""
 "argument declared \"anyarray\" is not consistent with argument declared "
 "\"anyelement\""
@@ -11059,17 +11017,17 @@ msgstr ""
 "als »anyarray« deklariertes Argument ist nicht mit als »anyelement« "
 "deklariertem Argument konsistent"
 
-#: parser/parse_coerce.c:1554
+#: parser/parse_coerce.c:1596
 msgid "could not determine polymorphic type because input has type \"unknown\""
 msgstr ""
 "konnte polymorphischen Typ nicht bestimmen, weil Eingabe Typ »unknown« hat"
 
-#: parser/parse_coerce.c:1564
+#: parser/parse_coerce.c:1606
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "mit »anynonarray« gepaarter Typ ist ein Array-Typ: %s"
 
-#: parser/parse_coerce.c:1574
+#: parser/parse_coerce.c:1616
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "mit »anyenum« gepaarter Typ ist kein Enum-Typ: %s"
@@ -11140,17 +11098,19 @@ msgstr ""
 "Typ um."
 
 #: parser/parse_cte.c:331
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
 "but collation \"%s\" overall"
 msgstr ""
-"Spalte %2$d in rekursiver Anfrage »%1$s« hat Typ %3$s im nicht-rekursiven "
-"Teilausdruck aber Typ %4$s insgesamt"
+"Spalte %2$d in rekursiver Anfrage »%1$s« hat Sortierfolge %3$s im nicht-"
+"rekursiven Teilausdruck aber Sortierfolge %4$s insgesamt"
 
 #: parser/parse_cte.c:335
 msgid "Use the COLLATE clause to set the collation of the non-recursive term."
 msgstr ""
+"Verwenden Sie die COLLATE-Klausel, um die Sortierfolge des nicht-rekursiven "
+"Teilsausdrucks zu setzen."
 
 #: parser/parse_cte.c:426
 #, c-format
@@ -11236,102 +11196,101 @@ msgstr "Spaltenverweis »%s« ist nicht eindeutig"
 msgid "there is no parameter $%d"
 msgstr "es gibt keinen Parameter $%d"
 
-#: parser/parse_expr.c:1018
+#: parser/parse_expr.c:1021
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF erfordert, dass Operator = boolean ergibt"
 
-#: parser/parse_expr.c:1197
+#: parser/parse_expr.c:1200
 msgid "arguments of row IN must all be row expressions"
 msgstr "Argumente von Zeilen-IN müssen alle Zeilenausdrücke sein"
 
-#: parser/parse_expr.c:1411
+#: parser/parse_expr.c:1414
 msgid "subquery cannot have SELECT INTO"
 msgstr "Unteranfrage kann kein SELECT INTO enthalten"
 
-#: parser/parse_expr.c:1439
+#: parser/parse_expr.c:1442
 msgid "subquery must return a column"
 msgstr "Unteranfrage muss eine Spalte zurückgeben"
 
-#: parser/parse_expr.c:1446
+#: parser/parse_expr.c:1449
 msgid "subquery must return only one column"
 msgstr "Unteranfrage darf nur eine Spalte zurückgeben"
 
-#: parser/parse_expr.c:1506
+#: parser/parse_expr.c:1509
 msgid "subquery has too many columns"
 msgstr "Unteranfrage hat zu viele Spalten"
 
-#: parser/parse_expr.c:1511
+#: parser/parse_expr.c:1514
 msgid "subquery has too few columns"
 msgstr "Unteranfrage hat zu wenige Spalten"
 
-#: parser/parse_expr.c:1607
+#: parser/parse_expr.c:1610
 msgid "cannot determine type of empty array"
 msgstr "kann Typ eines leeren Arrays nicht bestimmen"
 
-#: parser/parse_expr.c:1608
+#: parser/parse_expr.c:1611
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr ""
 "Wandeln Sie ausdrücklich in den gewünschten Typ um, zum Beispiel ARRAY[]::"
 "integer[]."
 
-#: parser/parse_expr.c:1622
+#: parser/parse_expr.c:1625
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "konnte Elementtyp für Datentyp %s nicht finden"
 
-#: parser/parse_expr.c:1823
+#: parser/parse_expr.c:1826
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "unbenannter XML-Attributwert muss ein Spaltenverweis sein"
 
-#: parser/parse_expr.c:1824
+#: parser/parse_expr.c:1827
 msgid "unnamed XML element value must be a column reference"
 msgstr "unbenannter XML-Elementwert muss ein Spaltenverweis sein"
 
-#: parser/parse_expr.c:1839
+#: parser/parse_expr.c:1842
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "XML-Attributname »%s« einscheint mehrmals"
 
-#: parser/parse_expr.c:1946
+#: parser/parse_expr.c:1949
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "kann das Ergebnis von XMLSERIALIZE nicht in Typ %s umwandeln"
 
-#: parser/parse_expr.c:2183 parser/parse_expr.c:2382
+#: parser/parse_expr.c:2192 parser/parse_expr.c:2392
 msgid "unequal number of entries in row expressions"
 msgstr "ungleiche Anzahl Einträge in Zeilenausdrücken"
 
-#: parser/parse_expr.c:2193
+#: parser/parse_expr.c:2202
 msgid "cannot compare rows of zero length"
 msgstr "kann Zeilen mit Länge null nicht vergleichen"
 
-#: parser/parse_expr.c:2218
+#: parser/parse_expr.c:2227
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr "Zeilenvergleichsoperator muss Typ boolean zurückgeben, nicht Typ %s"
 
-#: parser/parse_expr.c:2225
+#: parser/parse_expr.c:2234
 msgid "row comparison operator must not return a set"
 msgstr "Zeilenvergleichsoperator darf keine Ergebnismenge zurückgeben"
 
-#: parser/parse_expr.c:2284 parser/parse_expr.c:2328
+#: parser/parse_expr.c:2293 parser/parse_expr.c:2338
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
-msgstr ""
-"konnte Interpretation des Zeilenvergleichsoperators %s nicht bestimmten"
+msgstr "konnte Interpretation des Zeilenvergleichsoperators %s nicht bestimmen"
 
-#: parser/parse_expr.c:2286
+#: parser/parse_expr.c:2295
 msgid ""
 "Row comparison operators must be associated with btree operator families."
 msgstr ""
 "Zeilenvergleichsoperatoren müssen einer »btree«-Operatorfamilie zugeordnet "
 "sein."
 
-#: parser/parse_expr.c:2330
+#: parser/parse_expr.c:2340
 msgid "There are multiple equally-plausible candidates."
 msgstr "Es gibt mehrere gleichermaßen plausible Kandidaten."
 
-#: parser/parse_expr.c:2422
+#: parser/parse_expr.c:2432
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM erfordert, dass Operator = boolean ergibt"
 
@@ -11466,35 +11425,35 @@ msgstr "Arrayindex muss Typ integer haben"
 msgid "array assignment requires type %s but expression is of type %s"
 msgstr "Arrayzuweisung erfordert Typ %s, aber Ausdruck hat Typ %s"
 
-#: parser/parse_oper.c:124 parser/parse_oper.c:754 utils/adt/regproc.c:464
+#: parser/parse_oper.c:124 parser/parse_oper.c:718 utils/adt/regproc.c:464
 #: utils/adt/regproc.c:484 utils/adt/regproc.c:643
 #, c-format
 msgid "operator does not exist: %s"
 msgstr "Operator existiert nicht: %s"
 
-#: parser/parse_oper.c:257
+#: parser/parse_oper.c:221
 msgid "Use an explicit ordering operator or modify the query."
 msgstr ""
 "Verwenden Sie einen ausdrücklichen Sortieroperator oder ändern Sie die "
 "Anfrage."
 
-#: parser/parse_oper.c:261 utils/adt/arrayfuncs.c:3176
-#: utils/adt/arrayfuncs.c:3689 utils/adt/rowtypes.c:1157
+#: parser/parse_oper.c:225 utils/adt/arrayfuncs.c:3176
+#: utils/adt/arrayfuncs.c:3695 utils/adt/rowtypes.c:1157
 #, c-format
 msgid "could not identify an equality operator for type %s"
 msgstr "konnte keinen Ist-Gleich-Operator für Typ %s ermitteln"
 
-#: parser/parse_oper.c:512
+#: parser/parse_oper.c:476
 #, c-format
 msgid "operator requires run-time type coercion: %s"
 msgstr "Operator erfordert Typumwandlung zur Laufzeit: %s"
 
-#: parser/parse_oper.c:746
+#: parser/parse_oper.c:710
 #, c-format
 msgid "operator is not unique: %s"
 msgstr "Operator ist nicht eindeutig: %s"
 
-#: parser/parse_oper.c:748
+#: parser/parse_oper.c:712
 msgid ""
 "Could not choose a best candidate operator. You might need to add explicit "
 "type casts."
@@ -11502,7 +11461,7 @@ msgstr ""
 "Konnte keinen besten Kandidatoperator auswählen. Sie müssen möglicherweise "
 "ausdrückliche Typumwandlungen hinzufügen."
 
-#: parser/parse_oper.c:756
+#: parser/parse_oper.c:720
 msgid ""
 "No operator matches the given name and argument type(s). You might need to "
 "add explicit type casts."
@@ -11510,20 +11469,20 @@ msgstr ""
 "Kein Operator stimmt mit dem angegebenen Namen und den Argumenttypen "
 "überein. Sie müssen möglicherweise ausdrückliche Typumwandlungen hinzufügen."
 
-#: parser/parse_oper.c:815 parser/parse_oper.c:929
+#: parser/parse_oper.c:779 parser/parse_oper.c:893
 #, c-format
 msgid "operator is only a shell: %s"
 msgstr "Operator ist nur eine Hülle: %s"
 
-#: parser/parse_oper.c:917
+#: parser/parse_oper.c:881
 msgid "op ANY/ALL (array) requires array on right side"
 msgstr "op ANY/ALL (array) erfordert Array auf der rechten Seite"
 
-#: parser/parse_oper.c:959
+#: parser/parse_oper.c:923
 msgid "op ANY/ALL (array) requires operator to yield boolean"
 msgstr "op ANY/ALL (array) erfordert, dass Operator boolean ergibt"
 
-#: parser/parse_oper.c:964
+#: parser/parse_oper.c:928
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr ""
 "op ANY/ALL (array) erfordert, dass Operator keine Ergebnismenge zurückgibt"
@@ -11705,7 +11664,7 @@ msgstr "falscher %%TYPE-Verweis (zu viele Namensteile): %s"
 msgid "type reference %s converted to %s"
 msgstr "Typverweis %s in %s umgewandelt"
 
-#: parser/parse_type.c:202 utils/cache/typcache.c:176
+#: parser/parse_type.c:202 utils/cache/typcache.c:195
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "Typ »%s« ist nur eine Hülle"
@@ -11724,138 +11683,134 @@ msgstr "Typmodifikatoren müssen einfache Konstanten oder Bezeichner sein"
 msgid "invalid type name \"%s\""
 msgstr "ungültiger Typname: »%s«"
 
-#: parser/parse_utilcmd.c:180
+#: parser/parse_utilcmd.c:181
 #, c-format
 msgid "relation \"%s\" already exists, skipping"
 msgstr "Relation »%s« existiert bereits, wird übersprungen"
 
-#: parser/parse_utilcmd.c:333
+#: parser/parse_utilcmd.c:334
 msgid "array of serial is not implemented"
 msgstr "Array aus Typ serial ist nicht implementiert"
 
-#: parser/parse_utilcmd.c:378
+#: parser/parse_utilcmd.c:382
 #, c-format
 msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
 msgstr "%s erstellt implizit eine Sequenz »%s« für die »serial«-Spalte »%s.%s«"
 
-#: parser/parse_utilcmd.c:479 parser/parse_utilcmd.c:491
+#: parser/parse_utilcmd.c:483 parser/parse_utilcmd.c:495
 #, c-format
 msgid ""
 "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr ""
 "widersprüchliche NULL/NOT NULL-Deklarationen für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:503
+#: parser/parse_utilcmd.c:507
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "mehrere Vorgabewerte angegeben für Spalte »%s« von Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:1438
+#: parser/parse_utilcmd.c:1440
 msgid "cannot use an existing index in CREATE TABLE"
 msgstr "bestehender Index kann nicht in CREATE TABLE verwendet werden"
 
-#: parser/parse_utilcmd.c:1458
+#: parser/parse_utilcmd.c:1460
 #, c-format
 msgid "index \"%s\" is already associated with a constraint"
-msgstr ""
+msgstr "Index »%s« gehört bereits zu einem Constraint"
 
-#: parser/parse_utilcmd.c:1466
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1468
+#, c-format
 msgid "index \"%s\" does not belong to table \"%s\""
-msgstr "Index »%s« existiert nicht"
+msgstr "Index »%s« gehört nicht zu Tabelle »%s«"
 
-#: parser/parse_utilcmd.c:1473
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1475
+#, c-format
 msgid "index \"%s\" is not valid"
-msgstr "Index »%s« ist kein Hash-Index"
+msgstr "Index »%s« ist nicht gültig"
 
-#: parser/parse_utilcmd.c:1479
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1481
+#, c-format
 msgid "index \"%s\" is not ready"
-msgstr "Index »%s« ist kein B-Tree"
+msgstr "Index »%s« ist nicht bereit"
 
-#: parser/parse_utilcmd.c:1485
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1487
+#, c-format
 msgid "\"%s\" is not a unique index"
-msgstr "»%s« ist kein Index"
+msgstr "»%s« ist kein Unique Index"
 
-#: parser/parse_utilcmd.c:1486 parser/parse_utilcmd.c:1493
-#: parser/parse_utilcmd.c:1500 parser/parse_utilcmd.c:1570
-msgid "Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."
+#: parser/parse_utilcmd.c:1488 parser/parse_utilcmd.c:1495
+#: parser/parse_utilcmd.c:1502 parser/parse_utilcmd.c:1572
+msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr ""
+"Ein Primärschlüssel oder Unique-Constraint kann nicht mit einem solchen "
+"Index erzeugt werden."
 
-#: parser/parse_utilcmd.c:1492
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1494
+#, c-format
 msgid "index \"%s\" contains expressions"
-msgstr "Index »%s« hat falsche Hash-Version"
+msgstr "Index »%s« enthält Ausdrücke"
 
-#: parser/parse_utilcmd.c:1499
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1501
+#, c-format
 msgid "\"%s\" is a partial index"
-msgstr "»%s« ist ein Index"
+msgstr "»%s« ist ein partieller Index"
 
-#: parser/parse_utilcmd.c:1511
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1513
+#, c-format
 msgid "\"%s\" is a deferrable index"
-msgstr "»%s« ist keine Tabelle und kein Index"
+msgstr "»%s« ist ein aufschiebbarer Index"
 
-#: parser/parse_utilcmd.c:1512
-#, fuzzy
+#: parser/parse_utilcmd.c:1514
 msgid "Cannot create a non-deferrable constraint using a deferrable index."
 msgstr ""
-"aufschiebbarer Unique-Constraint kann nicht für Tabelle »%s«, auf die "
-"verwiesen wird, verwendet werden"
-
-#: parser/parse_utilcmd.c:1525
-#, fuzzy, c-format
-msgid "index \"%s\" is not a b-tree"
-msgstr "Index »%s« ist kein B-Tree"
+"Ein nicht aufschiebbarer Constraint kann nicht mit einem aufschiebbaren "
+"Index erzeugt werden."
 
-#: parser/parse_utilcmd.c:1569
-#, fuzzy, c-format
+#: parser/parse_utilcmd.c:1571
+#, c-format
 msgid "index \"%s\" does not have default sorting behavior"
-msgstr "Index »%s« existiert nicht, wird übersprungen"
+msgstr "Index »%s« hat nicht das Standardsortierverhalten"
 
-#: parser/parse_utilcmd.c:1714
+#: parser/parse_utilcmd.c:1716
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "Spalte »%s« erscheint zweimal im Primärschlüssel-Constraint"
 
-#: parser/parse_utilcmd.c:1720
+#: parser/parse_utilcmd.c:1722
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
-msgstr "Spalte »%s« erscheint zweimal im Unique Constraint"
+msgstr "Spalte »%s« erscheint zweimal im Unique-Constraint"
 
-#: parser/parse_utilcmd.c:1884
+#: parser/parse_utilcmd.c:1887
 msgid "index expression cannot return a set"
 msgstr "Indexausdruck kann keine Ergebnismenge zurückgeben"
 
-#: parser/parse_utilcmd.c:1894
+#: parser/parse_utilcmd.c:1897
 msgid ""
 "index expressions and predicates can refer only to the table being indexed"
 msgstr ""
 "Indexausdrücke und -prädikate können nur auf die zu indizierende Tabelle "
 "verweisen"
 
-#: parser/parse_utilcmd.c:1991
+#: parser/parse_utilcmd.c:1994
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr ""
 "WHERE-Bedingung einer Regel kann keine Verweise auf andere Relationen "
 "enthalten"
 
-#: parser/parse_utilcmd.c:1997
+#: parser/parse_utilcmd.c:2000
 msgid "cannot use aggregate function in rule WHERE condition"
 msgstr ""
 "Aggregatfunktionen können nicht in der WHERE-Bedingung einer Regel verwendet "
 "werden"
 
-#: parser/parse_utilcmd.c:2001
+#: parser/parse_utilcmd.c:2004
 msgid "cannot use window function in rule WHERE condition"
 msgstr ""
 "Fensterfunktionen können nicht in der WHERE-Bedingung einer Regel verwendet "
 "werden"
 
-#: parser/parse_utilcmd.c:2073
+#: parser/parse_utilcmd.c:2076
 msgid ""
 "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
 "actions"
@@ -11863,66 +11818,65 @@ msgstr ""
 "Regeln mit WHERE-Bedingungen können als Aktion nur SELECT, INSERT, UPDATE "
 "oder DELETE haben"
 
-#: parser/parse_utilcmd.c:2091 parser/parse_utilcmd.c:2190
+#: parser/parse_utilcmd.c:2094 parser/parse_utilcmd.c:2193
 #: rewrite/rewriteHandler.c:442 rewrite/rewriteManip.c:1024
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "UNION/INTERSECTION/EXCEPT mit Bedingung sind nicht implementiert"
 
-#: parser/parse_utilcmd.c:2109
+#: parser/parse_utilcmd.c:2112
 msgid "ON SELECT rule cannot use OLD"
 msgstr "ON-SELECT-Regel kann nicht OLD verwenden"
 
-#: parser/parse_utilcmd.c:2113
+#: parser/parse_utilcmd.c:2116
 msgid "ON SELECT rule cannot use NEW"
 msgstr "ON-SELECT-Regel kann nicht NEW verwenden"
 
-#: parser/parse_utilcmd.c:2122
+#: parser/parse_utilcmd.c:2125
 msgid "ON INSERT rule cannot use OLD"
 msgstr "ON-INSERT-Regel kann nicht OLD verwenden"
 
-#: parser/parse_utilcmd.c:2128
+#: parser/parse_utilcmd.c:2131
 msgid "ON DELETE rule cannot use NEW"
 msgstr "ON-DELETE-Regel kann nicht NEW verwenden"
 
-#: parser/parse_utilcmd.c:2156
+#: parser/parse_utilcmd.c:2159
 msgid "cannot refer to OLD within WITH query"
-msgstr ""
+msgstr "in WITH-Anfrage kann nicht auf OLD verweisen werden"
 
-#: parser/parse_utilcmd.c:2163
+#: parser/parse_utilcmd.c:2166
 msgid "cannot refer to NEW within WITH query"
-msgstr ""
+msgstr "in WITH-Anfrage kann nicht auf NEW verwiesen werden"
 
-#: parser/parse_utilcmd.c:2446
+#: parser/parse_utilcmd.c:2449
 msgid "misplaced DEFERRABLE clause"
 msgstr "falsch platzierte DEFERRABLE-Klausel"
 
-#: parser/parse_utilcmd.c:2451 parser/parse_utilcmd.c:2466
+#: parser/parse_utilcmd.c:2454 parser/parse_utilcmd.c:2469
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "mehrere DEFERRABLE/NOT DEFERRABLE-Klauseln sind nicht erlaubt"
 
-#: parser/parse_utilcmd.c:2461
+#: parser/parse_utilcmd.c:2464
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "falsch platzierte NOT DEFERRABLE-Klausel"
 
-#: parser/parse_utilcmd.c:2474 parser/parse_utilcmd.c:2500 gram.y:4145
-#: gram.y:4161
+#: parser/parse_utilcmd.c:2477 parser/parse_utilcmd.c:2503 gram.y:4153
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr ""
 "Constraint, der als INITIALLY DEFERRED deklariert wurde, muss DEFERRABLE sein"
 
-#: parser/parse_utilcmd.c:2482
+#: parser/parse_utilcmd.c:2485
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "falsch platzierte INITIALLY DEFERRED-Klausel"
 
-#: parser/parse_utilcmd.c:2487 parser/parse_utilcmd.c:2513
+#: parser/parse_utilcmd.c:2490 parser/parse_utilcmd.c:2516
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "mehrere INITIALLY IMMEDIATE/DEFERRED-Klauseln sind nicht erlaubt"
 
-#: parser/parse_utilcmd.c:2508
+#: parser/parse_utilcmd.c:2511
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "falsch platzierte INITIALLY IMMEDIATE-Klausel"
 
-#: parser/parse_utilcmd.c:2699
+#: parser/parse_utilcmd.c:2702
 #, c-format
 msgid ""
 "CREATE specifies a schema (%s) different from the one being created (%s)"
@@ -11935,28 +11889,42 @@ msgstr ""
 msgid "identifier \"%s\" will be truncated to \"%s\""
 msgstr "Bezeichner »%s« wird auf »%s« gekürzt"
 
-#: gram.y:906
-#, fuzzy, c-format
+#: parser/parse_collate.c:214 parser/parse_collate.c:538
+#, c-format
+msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgstr "implizite Sortierfolgen »%s« und »%s« stimmen nicht überein"
+
+#: parser/parse_collate.c:217 parser/parse_collate.c:541
+msgid ""
+"You can choose the collation by applying the COLLATE clause to one or both "
+"expressions."
+msgstr ""
+"Sie können die Sortierfolge auswählen, indem Sie die COLLATE-Klausel auf "
+"einen oder beide Ausdrücke anwenden."
+
+#: parser/parse_collate.c:763
+#, c-format
+msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+msgstr "explizite Sortierfolgen »%s« und »%s« stimmen nicht überein"
+
+#: gram.y:915
+#, c-format
 msgid "unrecognized role option \"%s\""
-msgstr "unbekannte EXPLAIN-Option »%s«"
+msgstr "unbekannte Rollenoption »%s«"
 
-#: gram.y:1292
+#: gram.y:1301
 msgid "current database cannot be changed"
 msgstr "aktuelle Datenbank kann nicht geändert werden"
 
-#: gram.y:1410 gram.y:1425
+#: gram.y:1419 gram.y:1434
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "Zeitzonenintervall muss HOUR oder HOUR TO MINUTE sein"
 
-#: gram.y:1430 gram.y:9250 gram.y:11740
+#: gram.y:1439 gram.y:9246 gram.y:11736
 msgid "interval precision specified twice"
 msgstr "Intervallpräzision doppelt angegeben"
 
-#: gram.y:2752
-msgid "CHECK constraints cannot be deferred"
-msgstr "CHECK-Constraints sind nicht aufschiebbar"
-
-#: gram.y:2888 utils/adt/ri_triggers.c:375 utils/adt/ri_triggers.c:435
+#: gram.y:2887 utils/adt/ri_triggers.c:375 utils/adt/ri_triggers.c:435
 #: utils/adt/ri_triggers.c:598 utils/adt/ri_triggers.c:838
 #: utils/adt/ri_triggers.c:1026 utils/adt/ri_triggers.c:1188
 #: utils/adt/ri_triggers.c:1376 utils/adt/ri_triggers.c:1547
@@ -11967,7 +11935,7 @@ msgstr "CHECK-Constraints sind nicht aufschiebbar"
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL ist noch nicht implementiert"
 
-#: gram.y:3006
+#: gram.y:3005
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS kann INTO nicht verwenden"
 
@@ -11975,154 +11943,169 @@ msgstr "CREATE TABLE AS kann INTO nicht verwenden"
 msgid "duplicate trigger events specified"
 msgstr "mehrere Trigger-Ereignisse angegeben"
 
-#: gram.y:4225
+#: gram.y:4160
+msgid "conflicting constraint properties"
+msgstr "widersprüchliche Constraint-Eigentschaften"
+
+#: gram.y:4221
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION ist noch nicht implementiert"
 
-#: gram.y:4241
+#: gram.y:4237
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION ist noch nicht implementiert"
 
-#: gram.y:4577
+#: gram.y:4573
 msgid "RECHECK is no longer required"
 msgstr "RECHECK wird nicht mehr benötigt"
 
-#: gram.y:4578
+#: gram.y:4574
 msgid "Update your data type."
 msgstr "Aktualisieren Sie Ihren Datentyp."
 
-#: gram.y:6221 utils/adt/regproc.c:630
+#: gram.y:6217 utils/adt/regproc.c:630
 msgid "missing argument"
 msgstr "Argument fehlt"
 
-#: gram.y:6222 utils/adt/regproc.c:631
+#: gram.y:6218 utils/adt/regproc.c:631
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr ""
 "Verwenden Sie NONE, um das fehlende Argument eines unären Operators "
 "anzugeben."
 
-#: gram.y:7301 gram.y:7307 gram.y:7313
+#: gram.y:7297 gram.y:7303 gram.y:7309
 msgid "WITH CHECK OPTION is not implemented"
 msgstr "WITH CHECK OPTION ist nicht implementiert"
 
-#: gram.y:7990
+#: gram.y:7986
 msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
 msgstr "Spaltennamenliste nicht erlaubt in CREATE TABLE / EXECUTE"
 
-#: gram.y:8214
+#: gram.y:8210
 msgid "number of columns does not match number of values"
 msgstr "Anzahl der Spalten stimmt nicht mit der Anzahl der Werte überein"
 
-#: gram.y:8664
+#: gram.y:8660
 msgid "LIMIT #,# syntax is not supported"
 msgstr "Syntax LIMIT x,y wird nicht unterstützt"
 
-#: gram.y:8665
+#: gram.y:8661
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Verwenden Sie die getrennten Klauseln LIMIT und OFFSET."
 
-#: gram.y:8883
+#: gram.y:8879
 msgid "VALUES in FROM must have an alias"
 msgstr "VALUES in FROM muss Aliasnamen erhalten"
 
-#: gram.y:8884
+#: gram.y:8880
 msgid "For example, FROM (VALUES ...) [AS] foo."
 msgstr "Zum Beispiel FROM (VALUES ...) [AS] xyz."
 
-#: gram.y:8889
+#: gram.y:8885
 msgid "subquery in FROM must have an alias"
 msgstr "Unteranfrage in FROM muss Aliasnamen erhalten"
 
-#: gram.y:8890
+#: gram.y:8886
 msgid "For example, FROM (SELECT ...) [AS] foo."
 msgstr "Zum Beispiel FROM (SELECT ...) [AS] xyz."
 
-#: gram.y:9376
+#: gram.y:9372
 msgid "precision for type float must be at least 1 bit"
 msgstr "Präzision von Typ float muss mindestens 1 Bit sein"
 
-#: gram.y:9385
+#: gram.y:9381
 msgid "precision for type float must be less than 54 bits"
 msgstr "Präzision von Typ float muss weniger als 54 Bits sein"
 
-#: gram.y:10099
+#: gram.y:10095
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "UNIQUE-Prädikat ist noch nicht implementiert"
 
-#: gram.y:11007
+#: gram.y:11003
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING wird nur mit UNBOUNDED unterstützt"
 
-#: gram.y:11013
+#: gram.y:11009
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING wird nur mit UNBOUNDED unterstützt"
 
-#: gram.y:11040 gram.y:11063
+#: gram.y:11036 gram.y:11059
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "Frame-Beginn kann nicht UNBOUNDED FOLLOWING sein"
 
-#: gram.y:11045
+#: gram.y:11041
 msgid "frame starting from following row cannot end with current row"
 msgstr ""
 "Frame der in der folgenden Zeile beginnt kann nicht in der aktuellen Zeile "
 "enden"
 
-#: gram.y:11068
+#: gram.y:11064
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "Frame-Ende kann nicht UNBOUNDED PRECEDING sein"
 
-#: gram.y:11074
+#: gram.y:11070
 msgid "frame starting from current row cannot have preceding rows"
 msgstr ""
 "Frame der in der aktuellen Zeile beginnt kann keine vorhergehenden Zeilen "
 "haben"
 
-#: gram.y:11081
+#: gram.y:11077
 msgid "frame starting from following row cannot have preceding rows"
 msgstr ""
 "Frame der in der folgenden Zeile beginnt kann keine vorhergehenden Zeilen "
 "haben"
 
-#: gram.y:11715
+#: gram.y:11711
 msgid "type modifier cannot have parameter name"
 msgstr "Typmodifikator kann keinen Parameternamen haben"
 
-#: gram.y:12310 gram.y:12518
+#: gram.y:12306 gram.y:12514
 msgid "improper use of \"*\""
 msgstr "unzulässige Verwendung von »*«"
 
-#: gram.y:12449
+#: gram.y:12445
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "falsche Anzahl Parameter auf linker Seite von OVERLAPS-Ausdruck"
 
-#: gram.y:12456
+#: gram.y:12452
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "falsche Anzahl Parameter auf rechter Seite von OVERLAPS-Ausdruck"
 
-#: gram.y:12581
+#: gram.y:12577
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "mehrere ORDER-BY-Klauseln sind nicht erlaubt"
 
-#: gram.y:12592
+#: gram.y:12588
 msgid "multiple OFFSET clauses not allowed"
 msgstr "mehrere OFFSET-Klauseln sind nicht erlaubt"
 
-#: gram.y:12601
+#: gram.y:12597
 msgid "multiple LIMIT clauses not allowed"
 msgstr "mehrere LIMIT-Klauseln sind nicht erlaubt"
 
-#: gram.y:12610
+#: gram.y:12606
 msgid "multiple WITH clauses not allowed"
 msgstr "mehrere WITH-Klauseln sind nicht erlaubt"
 
-#: gram.y:12755
+#: gram.y:12751
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "OUT- und INOUT-Argumente sind in TABLE-Funktionen nicht erlaubt"
 
-#: gram.y:12856
-#, fuzzy
+#: gram.y:12852
 msgid "multiple COLLATE clauses not allowed"
-msgstr "mehrere LIMIT-Klauseln sind nicht erlaubt"
+msgstr "mehrere COLLATE-Klauseln sind nicht erlaubt"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12890 gram.y:12903
+#, c-format
+msgid "%s constraints cannot be marked DEFERRABLE"
+msgstr "%s-Constraints können nicht als DEFERRABLE markiert werden"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12916
+#, c-format
+msgid "%s constraints cannot be marked NOT VALID"
+msgstr "%s-Constraints können nicht als NOT VALID markiert werden"
 
 #: scan.l:411
 msgid "unterminated /* comment"
@@ -12249,9 +12232,24 @@ msgstr "nicht standardkonforme Verwendung von Escape in Zeichenkettenkonstante"
 msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
 msgstr "Verwenden Sie die Syntax für Escape-Zeichenketten, z.B. E'\\r\\n'."
 
+#: port/win32/security.c:43
+#, c-format
+msgid "could not open process token: error code %d\n"
+msgstr "konnte Prozess-Token nicht öffnen: Fehlercode %d\n"
+
+#: port/win32/security.c:63
+#, c-format
+msgid "could not get SID for Administrators group: error code %d\n"
+msgstr "konnte SID der Administrators-Gruppe nicht ermitteln: Fehlercode %d\n"
+
+#: port/win32/security.c:72
+#, c-format
+msgid "could not get SID for PowerUsers group: error code %d\n"
+msgstr "konnte SID der PowerUsers-Gruppe nicht ermitteln: Fehlercode %d\n"
+
 #: port/win32/signal.c:189
 #, c-format
-msgid "could not create signal listener pipe for pid %d: error code %d"
+msgid "could not create signal listener pipe for PID %d: error code %d"
 msgstr ""
 "konnte Listener-Pipe für Signale für PID %d nicht erzeugen: Fehlercode %d"
 
@@ -12267,96 +12265,32 @@ msgstr ""
 msgid "could not create signal dispatch thread: error code %d\n"
 msgstr "konnte Signal-Dispatch-Thread nicht erzeugen: Fehlercode %d\n"
 
-#: port/win32/security.c:43
-#, c-format
-msgid "could not open process token: error code %d\n"
-msgstr "konnte Prozess-Token nicht öffnen: Fehlercode %d\n"
-
-#: port/win32/security.c:63
-#, c-format
-msgid "could not get SID for Administrators group: error code %d\n"
-msgstr "konnte SID der Administrators-Gruppe nicht ermitteln: Fehlercode %d\n"
-
-#: port/win32/security.c:72
-#, c-format
-msgid "could not get SID for PowerUsers group: error code %d\n"
-msgstr "konnte SID der PowerUsers-Gruppe nicht ermitteln: Fehlercode %d\n"
-
 #: port/win32/crashdump.c:108
-msgid "could not load dbghelp.dll, cannot write crashdump\n"
-msgstr ""
+msgid "could not load dbghelp.dll, cannot write crash dump\n"
+msgstr "konnte dbghelp.dll nicht laden, kann Crash-Dump nicht schreiben\n"
 
 #: port/win32/crashdump.c:116
-#, fuzzy
 msgid ""
-"could not load required functions in dbghelp.dll, cannot write crashdump\n"
-msgstr "konnte den nötigen Checkpoint-Datensatz nicht finden"
+"could not load required functions in dbghelp.dll, cannot write crash dump\n"
+msgstr ""
+"konnte benötigte Funktionen in dbghelp.dll nicht laden, kann Crash-Dump "
+"nicht schreiben\n"
 
 #: port/win32/crashdump.c:147
-#, fuzzy, c-format
-msgid "could not open crash dump file %s for writing: error code %u\n"
-msgstr "konnte Datei »%s« nicht zum Schreiben öffnen: %m"
-
-#: port/win32/crashdump.c:154
-#, fuzzy, c-format
-msgid "wrote crash dump to %s\n"
-msgstr "Löschvorgang löscht ebenfalls %s"
-
-#: port/win32/crashdump.c:156
-#, fuzzy, c-format
-msgid "could not write crash dump to %s: error code %08x\n"
-msgstr "konnte Semaphore nicht erzeugen: Fehlercode %d"
-
-#: port/win32_sema.c:94
-#, c-format
-msgid "could not create semaphore: error code %d"
-msgstr "konnte Semaphore nicht erzeugen: Fehlercode %d"
-
-#: port/win32_sema.c:161
-#, c-format
-msgid "could not lock semaphore: error code %d"
-msgstr "konnte Semaphore nicht sperren: Fehlercode %d"
-
-#: port/win32_sema.c:174
-#, c-format
-msgid "could not unlock semaphore: error code %d"
-msgstr "konnte Semaphore nicht entsperren: Fehlercode %d"
-
-#: port/win32_sema.c:203
 #, c-format
-msgid "could not try-lock semaphore: error code %d"
-msgstr "konnte Semaphore nicht versuchsweise sperren: Fehlercode %d"
+msgid "could not open crash dump file \"%s\" for writing: error code %u\n"
+msgstr ""
+"konnte Crash-Dump-Datei »%s« nicht zum Schreiben öffnen: Fehlercode %u\n"
 
-#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
+#: port/win32/crashdump.c:154
 #, c-format
-msgid "could not create shared memory segment: %lu"
-msgstr "konnte Shared-Memory-Segment nicht erzeugen: %lu"
+msgid "wrote crash dump to file \"%s\"\n"
+msgstr "Crash-Dump nach Datei »%s« geschrieben\n"
 
-#: port/win32_shmem.c:169
+#: port/win32/crashdump.c:156
 #, c-format
-msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
-msgstr ""
-"Fehlgeschlagener Systemaufruf war CreateFileMapping(Größe=%lu, Name=%s)."
-
-#: port/win32_shmem.c:193
-msgid "pre-existing shared memory block is still in use"
-msgstr "bereits bestehender Shared-Memory-Block wird noch benutzt"
-
-#: port/win32_shmem.c:194
-msgid ""
-"Check if there are any old server processes still running, and terminate "
-"them."
-msgstr ""
-"Prüfen Sie, ob irgendwelche alten Serverprozesse noch laufen und beenden Sie "
-"diese."
-
-#: port/win32_shmem.c:204
-msgid "Failed system call was DuplicateHandle."
-msgstr "Fehlgeschlagener Systemaufruf war DuplicateHandle."
-
-#: port/win32_shmem.c:225
-msgid "Failed system call was MapViewOfFileEx."
-msgstr "Fehlgeschlagener Systemaufruf war MapViewOfFileEx."
+msgid "could not write crash dump to file \"%s\": error code %08x\n"
+msgstr "konnte Crash-Dump nicht nach Datei »%s« schreiben: Fehlercode %08x\n"
 
 #: port/sysv_sema.c:114 port/pg_sema.c:114
 #, c-format
@@ -12369,7 +12303,6 @@ msgid "Failed system call was semget(%lu, %d, 0%o)."
 msgstr "Fehlgeschlagener Systemaufruf war semget(%lu, %d, 0%o)."
 
 #: port/sysv_sema.c:119 port/pg_sema.c:119
-#, fuzzy
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs "
 "when either the system limit for the maximum number of semaphore sets "
@@ -12381,13 +12314,11 @@ msgid ""
 "your system for PostgreSQL."
 msgstr ""
 "Dieser Fehler bedeutet *nicht*, dass kein Platz mehr auf der Festplatte "
-"ist.\n"
-"Er tritt auf, wenn entweder die Systemhöchstgrenze für die Anzahl Semaphor-"
-"Sets (SEMMNI) oder die Systemhöchstgrenze für die Anzahl Semaphore (SEMMNS) "
-"überschritten würde.  Sie müssen den entsprechenden Kernelparameter "
+"ist.  Er tritt auf, wenn entweder die Systemhöchstgrenze für die Anzahl "
+"Semaphor-Sets (SEMMNI) oder die Systemhöchstgrenze für die Anzahl Semaphore "
+"(SEMMNS) überschritten würde.  Sie müssen den entsprechenden Kernelparameter "
 "erhöhen.  Alternativ können Sie den Semaphorverbrauch von PostgreSQL "
-"reduzieren indem Sie den Parameter »max_connections« herabsetzen (aktuell "
-"%d).\n"
+"reduzieren indem Sie den Parameter »max_connections« herabsetzen.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen, wie Sie Ihr "
 "System für PostgreSQL konfigurieren können."
 
@@ -12460,7 +12391,7 @@ msgstr ""
 "Konfiguration von Shared Memory."
 
 #: port/sysv_shmem.c:176 port/pg_shmem.c:176
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This error does *not* mean that you have run out of disk space.  It occurs "
 "either if all available shared memory IDs have been taken, in which case you "
@@ -12477,9 +12408,8 @@ msgstr ""
 "aufgebraucht sind, dann müssen den Kernelparameter SHMMNI erhöhen, oder weil "
 "die Systemhöchstgrenze für Shared Memory insgesamt erreicht wurde.  Wenn Sie "
 "die Höchstgrenze für Shared Memory nicht erhöhen können, verkleinern Sie das "
-"von PostgreSQL benötigte Shared Memory (aktuell %lu Bytes), indem Sie den "
-"PostgreSQL-Parameter »shared_buffers« (aktuell %d) und/oder "
-"»max_connections« (aktuell %d) reduzieren.\n"
+"von PostgreSQL benötigte Shared Memory (aktuell %lu Bytes), beispielsweise "
+"indem Sie »shared_buffers« oder »max_connections« reduzieren.\n"
 "Die PostgreSQL-Dokumentation enthält weitere Informationen über die "
 "Konfiguration von Shared Memory."
 
@@ -12488,12 +12418,63 @@ msgstr ""
 msgid "could not stat data directory \"%s\": %m"
 msgstr "konnte »stat« für Datenverzeichnis »%s« nicht ausführen: %m"
 
-#: port/unix_latch.c:269 port/pg_latch.c:269
+#: port/unix_latch.c:237 port/pg_latch.c:237
 #: replication/libpqwalreceiver/libpqwalreceiver.c:233
 #, c-format
 msgid "select() failed: %m"
 msgstr "select() fehlgeschlagen: %m"
 
+#: port/win32_sema.c:94
+#, c-format
+msgid "could not create semaphore: error code %d"
+msgstr "konnte Semaphore nicht erzeugen: Fehlercode %d"
+
+#: port/win32_sema.c:161
+#, c-format
+msgid "could not lock semaphore: error code %d"
+msgstr "konnte Semaphore nicht sperren: Fehlercode %d"
+
+#: port/win32_sema.c:174
+#, c-format
+msgid "could not unlock semaphore: error code %d"
+msgstr "konnte Semaphore nicht entsperren: Fehlercode %d"
+
+#: port/win32_sema.c:203
+#, c-format
+msgid "could not try-lock semaphore: error code %d"
+msgstr "konnte Semaphore nicht versuchsweise sperren: Fehlercode %d"
+
+#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
+#, c-format
+msgid "could not create shared memory segment: %lu"
+msgstr "konnte Shared-Memory-Segment nicht erzeugen: %lu"
+
+#: port/win32_shmem.c:169
+#, c-format
+msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
+msgstr ""
+"Fehlgeschlagener Systemaufruf war CreateFileMapping(Größe=%lu, Name=%s)."
+
+#: port/win32_shmem.c:193
+msgid "pre-existing shared memory block is still in use"
+msgstr "bereits bestehender Shared-Memory-Block wird noch benutzt"
+
+#: port/win32_shmem.c:194
+msgid ""
+"Check if there are any old server processes still running, and terminate "
+"them."
+msgstr ""
+"Prüfen Sie, ob irgendwelche alten Serverprozesse noch laufen und beenden Sie "
+"diese."
+
+#: port/win32_shmem.c:204
+msgid "Failed system call was DuplicateHandle."
+msgstr "Fehlgeschlagener Systemaufruf war DuplicateHandle."
+
+#: port/win32_shmem.c:225
+msgid "Failed system call was MapViewOfFileEx."
+msgstr "Fehlgeschlagener Systemaufruf war MapViewOfFileEx."
+
 #: postmaster/autovacuum.c:359
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
@@ -12503,47 +12484,47 @@ msgstr "konnte Autovacuum-Launcher-Prozess nicht starten (fork-Fehler): %m"
 msgid "autovacuum launcher started"
 msgstr "Autovacuum-Launcher startet"
 
-#: postmaster/autovacuum.c:760
+#: postmaster/autovacuum.c:781
 msgid "autovacuum launcher shutting down"
 msgstr "Autovacuum-Launcher fährt herunter"
 
-#: postmaster/autovacuum.c:1395
+#: postmaster/autovacuum.c:1416
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "konnte Autovacuum-Worker-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/autovacuum.c:1604
+#: postmaster/autovacuum.c:1634
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "Autovacuum: bearbeite Datenbank »%s«"
 
-#: postmaster/autovacuum.c:2007
+#: postmaster/autovacuum.c:2037
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
 "Autovacuum: lösche verwaiste temporäre Tabelle »%s.%s« in Datenbank »%s«"
 
-#: postmaster/autovacuum.c:2019
+#: postmaster/autovacuum.c:2049
 #, c-format
 msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
 "Autovacuum: verwaiste temporäre Tabelle »%s.%s« in Datenbank »%s« gefunden"
 
-#: postmaster/autovacuum.c:2289
+#: postmaster/autovacuum.c:2319
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "automatisches Vacuum der Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2292
+#: postmaster/autovacuum.c:2322
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "automatisches Analysieren der Tabelle »%s.%s.%s«"
 
-#: postmaster/autovacuum.c:2778
+#: postmaster/autovacuum.c:2808
 msgid "autovacuum not started because of misconfiguration"
 msgstr "Autovacuum wegen Fehlkonfiguration nicht gestartet"
 
-#: postmaster/autovacuum.c:2779
+#: postmaster/autovacuum.c:2809
 msgid "Enable the \"track_counts\" option."
 msgstr "Schalten Sie die Option »track_counts« ein."
 
@@ -12576,7 +12557,7 @@ msgstr "Einzelheiten finden Sie in den letzten Meldungen im Serverlog."
 #: postmaster/bgwriter.c:1223
 #, c-format
 msgid "compacted fsync request queue from %d entries to %d entries"
-msgstr ""
+msgstr "fsync-Anfrageschlange von %d Einträgen auf %d Einträge zusammengefasst"
 
 #: postmaster/pgarch.c:158
 #, c-format
@@ -12609,7 +12590,7 @@ msgstr "Der fehlgeschlagene Archivbefehl war: %s"
 msgid "archive command was terminated by exception 0x%X"
 msgstr "Archivbefehl wurde durch Ausnahme 0x%X beendet"
 
-#: postmaster/pgarch.c:579 postmaster/postmaster.c:2871
+#: postmaster/pgarch.c:579 postmaster/postmaster.c:2872
 msgid ""
 "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr ""
@@ -12677,7 +12658,7 @@ msgid "could not send test message on socket for statistics collector: %m"
 msgstr ""
 "konnte Testnachricht auf Socket für Statistiksammelprozess nicht senden: %m"
 
-#: postmaster/pgstat.c:448 postmaster/pgstat.c:2999
+#: postmaster/pgstat.c:448 postmaster/pgstat.c:2996
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "select() im Statistiksammelprozess fehlgeschlagen: %m"
@@ -12719,84 +12700,84 @@ msgstr "konnte Statistiksammelprozess nicht starten (fork-Fehler): %m"
 msgid "must be superuser to reset statistics counters"
 msgstr "nur Superuser können Statistikzähler zurücksetzen"
 
-#: postmaster/pgstat.c:1184
+#: postmaster/pgstat.c:1184 utils/adt/pgstatfuncs.c:1547
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "unbekanntes Reset-Ziel: »%s«"
 
-#: postmaster/pgstat.c:1185
+#: postmaster/pgstat.c:1185 utils/adt/pgstatfuncs.c:1548
 msgid "Target must be \"bgwriter\"."
 msgstr "Das Reset-Ziel muss »bgwriter« sein."
 
-#: postmaster/pgstat.c:2978
+#: postmaster/pgstat.c:2975
 #, c-format
 msgid "poll() failed in statistics collector: %m"
 msgstr "poll() im Statistiksammelprozess fehlgeschlagen: %m"
 
-#: postmaster/pgstat.c:3023
+#: postmaster/pgstat.c:3020
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "konnte Statistiknachricht nicht lesen: %m"
 
-#: postmaster/pgstat.c:3294
+#: postmaster/pgstat.c:3291
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht öffnen: %m"
 
-#: postmaster/pgstat.c:3366
+#: postmaster/pgstat.c:3363
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht schreiben: %m"
 
-#: postmaster/pgstat.c:3375
+#: postmaster/pgstat.c:3372
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht schließen: %m"
 
-#: postmaster/pgstat.c:3383
+#: postmaster/pgstat.c:3380
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
 msgstr "konnte temporäre Statistikdatei »%s« nicht in »%s« umbenennen: %m"
 
-#: postmaster/pgstat.c:3489 postmaster/pgstat.c:3718
+#: postmaster/pgstat.c:3486 postmaster/pgstat.c:3715
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "konnte Statistikdatei »%s« nicht öffnen: %m"
 
-#: postmaster/pgstat.c:3501 postmaster/pgstat.c:3511 postmaster/pgstat.c:3533
-#: postmaster/pgstat.c:3548 postmaster/pgstat.c:3611 postmaster/pgstat.c:3629
-#: postmaster/pgstat.c:3645 postmaster/pgstat.c:3663 postmaster/pgstat.c:3679
-#: postmaster/pgstat.c:3730 postmaster/pgstat.c:3741
+#: postmaster/pgstat.c:3498 postmaster/pgstat.c:3508 postmaster/pgstat.c:3530
+#: postmaster/pgstat.c:3545 postmaster/pgstat.c:3608 postmaster/pgstat.c:3626
+#: postmaster/pgstat.c:3642 postmaster/pgstat.c:3660 postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3727 postmaster/pgstat.c:3738
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "verfälschte Statistikdatei »%s«"
 
-#: postmaster/pgstat.c:4039
+#: postmaster/pgstat.c:4036
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr "Datenbank-Hash-Tabelle beim Aufräumen verfälscht --- Abbruch"
 
-#: postmaster/postmaster.c:572
+#: postmaster/postmaster.c:573
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s: ungültiges Argument für Option -f: »%s«\n"
 
-#: postmaster/postmaster.c:658
+#: postmaster/postmaster.c:659
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s: ungültiges Argument für Option -t: »%s«\n"
 
-#: postmaster/postmaster.c:709
+#: postmaster/postmaster.c:710
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s: ungültiges Argument: »%s«\n"
 
-#: postmaster/postmaster.c:734
+#: postmaster/postmaster.c:735
 #, c-format
 msgid "%s: superuser_reserved_connections must be less than max_connections\n"
 msgstr ""
 "%s: superuser_reserved_connections muss kleiner als max_connections sein\n"
 
-#: postmaster/postmaster.c:739
+#: postmaster/postmaster.c:740
 msgid ""
 "WAL archival (archive_mode=on) requires wal_level \"archive\" or "
 "\"hot_standby\""
@@ -12804,7 +12785,7 @@ msgstr ""
 "WAL-Archivierung (archive_mode=on) benötigt wal_level »archive« oder "
 "»hot_standby«"
 
-#: postmaster/postmaster.c:742
+#: postmaster/postmaster.c:743
 msgid ""
 "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
 "\"hot_standby\""
@@ -12812,51 +12793,51 @@ msgstr ""
 "WAL-Streaming (max_wal_senders > 0) benötigt wal_level »archive« oder "
 "»hot_standby«"
 
-#: postmaster/postmaster.c:750
+#: postmaster/postmaster.c:751
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s: ungültige datetoken-Tabellen, bitte reparieren\n"
 
-#: postmaster/postmaster.c:856
+#: postmaster/postmaster.c:857
 msgid "invalid list syntax for \"listen_addresses\""
 msgstr "ungültige Listensyntax für Parameter »listen_addresses«"
 
-#: postmaster/postmaster.c:886
+#: postmaster/postmaster.c:887
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "konnte Listen-Socket für »%s« nicht erzeugen"
 
-#: postmaster/postmaster.c:892
+#: postmaster/postmaster.c:893
 msgid "could not create any TCP/IP sockets"
 msgstr "konnte keine TCP/IP-Sockets erstellen"
 
-#: postmaster/postmaster.c:943
+#: postmaster/postmaster.c:944
 msgid "could not create Unix-domain socket"
 msgstr "konnte Unix-Domain-Socket nicht erstellen"
 
-#: postmaster/postmaster.c:951
+#: postmaster/postmaster.c:952
 msgid "no socket created for listening"
 msgstr "keine Listen-Socket erzeugt"
 
-#: postmaster/postmaster.c:985
+#: postmaster/postmaster.c:986
 msgid "could not create I/O completion port for child queue"
 msgstr "konnte Ein-/Ausgabe-Completion-Port für Child-Queue nicht erzeugen"
 
-#: postmaster/postmaster.c:1029
+#: postmaster/postmaster.c:1030
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %s\n"
 msgstr "%s: konnte externe PID-Datei »%s« nicht schreiben: %s\n"
 
-#: postmaster/postmaster.c:1097 utils/init/postinit.c:197
+#: postmaster/postmaster.c:1098 utils/init/postinit.c:197
 msgid "could not load pg_hba.conf"
 msgstr "konnte pg_hba.conf nicht laden"
 
-#: postmaster/postmaster.c:1144
+#: postmaster/postmaster.c:1145
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s: konnte kein passendes Programm »postgres« finden"
 
-#: postmaster/postmaster.c:1167 utils/misc/tzparser.c:325
+#: postmaster/postmaster.c:1168 utils/misc/tzparser.c:325
 #, c-format
 msgid ""
 "This may indicate an incomplete PostgreSQL installation, or that the file "
@@ -12865,42 +12846,42 @@ msgstr ""
 "Dies kann auf eine unvollständige PostgreSQL-Installation hindeuten, oder "
 "darauf, dass die Datei »%s« von ihrer richtigen Stelle verschoben worden ist."
 
-#: postmaster/postmaster.c:1195
+#: postmaster/postmaster.c:1196
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "Datenverzeichnis »%s« existiert nicht"
 
-#: postmaster/postmaster.c:1200
+#: postmaster/postmaster.c:1201
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "konnte Zugriffsrechte von Verzeichnis »%s« nicht lesen: %m"
 
-#: postmaster/postmaster.c:1208
+#: postmaster/postmaster.c:1209
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "angegebenes Datenverzeichnis »%s« ist kein Verzeichnis"
 
-#: postmaster/postmaster.c:1224
+#: postmaster/postmaster.c:1225
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "Datenverzeichnis »%s« hat falschen Eigentümer"
 
-#: postmaster/postmaster.c:1226
+#: postmaster/postmaster.c:1227
 msgid "The server must be started by the user that owns the data directory."
 msgstr ""
 "Der Server muss von dem Benutzer gestartet werden, dem das Datenverzeichnis "
 "gehört."
 
-#: postmaster/postmaster.c:1246
+#: postmaster/postmaster.c:1247
 #, c-format
 msgid "data directory \"%s\" has group or world access"
 msgstr "Datenverzeichnis »%s« erlaubt Zugriff von Gruppe oder Welt"
 
-#: postmaster/postmaster.c:1248
+#: postmaster/postmaster.c:1249
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Rechte sollten u=rwx (0700) sein."
 
-#: postmaster/postmaster.c:1259
+#: postmaster/postmaster.c:1260
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -12911,296 +12892,296 @@ msgstr ""
 "Es wurde im Verzeichnis »%s« erwartet,\n"
 "aber die Datei »%s« konnte nicht geöffnet werden: %s\n"
 
-#: postmaster/postmaster.c:1295
+#: postmaster/postmaster.c:1296
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: konnte Datei »%s« nicht öffnen: %s\n"
 
-#: postmaster/postmaster.c:1302
+#: postmaster/postmaster.c:1303
 #, c-format
 msgid "%s: could not open log file \"%s/%s\": %s\n"
 msgstr "%s: konnte Logdatei »%s/%s« nicht öffnen: %s\n"
 
-#: postmaster/postmaster.c:1313
+#: postmaster/postmaster.c:1314
 #, c-format
 msgid "%s: could not fork background process: %s\n"
 msgstr "%s: konnte Hintergrundprozess nicht starten (fork-Fehler): %s\n"
 
-#: postmaster/postmaster.c:1335
+#: postmaster/postmaster.c:1336
 #, c-format
 msgid "%s: could not dissociate from controlling TTY: %s\n"
 msgstr "%s: konnte nicht vom kontrollierenden TTY abtrennen: %s\n"
 
-#: postmaster/postmaster.c:1430
+#: postmaster/postmaster.c:1431
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "select() fehlgeschlagen im Postmaster: %m"
 
-#: postmaster/postmaster.c:1592 postmaster/postmaster.c:1623
+#: postmaster/postmaster.c:1593 postmaster/postmaster.c:1624
 msgid "incomplete startup packet"
 msgstr "unvollständiges Startpaket"
 
-#: postmaster/postmaster.c:1604
+#: postmaster/postmaster.c:1605
 msgid "invalid length of startup packet"
 msgstr "ungültige Länge des Startpakets"
 
-#: postmaster/postmaster.c:1661
+#: postmaster/postmaster.c:1662
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "konnte SSL-Verhandlungsantwort nicht senden: %m"
 
-#: postmaster/postmaster.c:1690
+#: postmaster/postmaster.c:1691
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
 "nicht unterstütztes Frontend-Protokoll %u.%u: Server unterstützt %u.0 bis %u."
 "%u"
 
-#: postmaster/postmaster.c:1741
+#: postmaster/postmaster.c:1742
 msgid "invalid value for boolean option \"replication\""
 msgstr "ungültiger Wert für Boole'sche Option »replication«"
 
-#: postmaster/postmaster.c:1761
+#: postmaster/postmaster.c:1762
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr "ungültiges Layout des Startpakets: Abschluss als letztes Byte erwartet"
 
-#: postmaster/postmaster.c:1789
+#: postmaster/postmaster.c:1790
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "kein PostgreSQL-Benutzername im Startpaket angegeben"
 
-#: postmaster/postmaster.c:1846
+#: postmaster/postmaster.c:1847
 msgid "the database system is starting up"
 msgstr "das Datenbanksystem startet"
 
-#: postmaster/postmaster.c:1851
+#: postmaster/postmaster.c:1852
 msgid "the database system is shutting down"
 msgstr "das Datenbanksystem fährt herunter"
 
-#: postmaster/postmaster.c:1856
+#: postmaster/postmaster.c:1857
 msgid "the database system is in recovery mode"
 msgstr "das Datenbanksystem ist im Wiederherstellungsmodus"
 
-#: postmaster/postmaster.c:1923
+#: postmaster/postmaster.c:1924
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "falscher Schlüssel in Stornierungsanfrage für Prozess %d"
 
-#: postmaster/postmaster.c:1931
+#: postmaster/postmaster.c:1932
 #, c-format
 msgid "PID %d in cancel request did not match any process"
 msgstr "PID %d in Stornierungsanfrage stimmte mit keinem Prozess überein"
 
-#: postmaster/postmaster.c:2137
+#: postmaster/postmaster.c:2138
 msgid "received SIGHUP, reloading configuration files"
 msgstr "SIGHUP empfangen, Konfigurationsdateien werden neu geladen"
 
-#: postmaster/postmaster.c:2160
+#: postmaster/postmaster.c:2161
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf nicht neu geladen"
 
-#: postmaster/postmaster.c:2203
+#: postmaster/postmaster.c:2204
 msgid "received smart shutdown request"
 msgstr "intelligentes Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2250
+#: postmaster/postmaster.c:2251
 msgid "received fast shutdown request"
 msgstr "schnelles Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2268
+#: postmaster/postmaster.c:2269
 msgid "aborting any active transactions"
 msgstr "etwaige aktive Transaktionen werden abgebrochen"
 
-#: postmaster/postmaster.c:2297
+#: postmaster/postmaster.c:2298
 msgid "received immediate shutdown request"
 msgstr "sofortiges Herunterfahren verlangt"
 
-#: postmaster/postmaster.c:2373 postmaster/postmaster.c:2401
+#: postmaster/postmaster.c:2374 postmaster/postmaster.c:2402
 msgid "startup process"
 msgstr "Startprozess"
 
-#: postmaster/postmaster.c:2376
+#: postmaster/postmaster.c:2377
 msgid "aborting startup due to startup process failure"
 msgstr "Serverstart abgebrochen wegen Startprozessfehler"
 
-#: postmaster/postmaster.c:2435
+#: postmaster/postmaster.c:2436
 msgid "database system is ready to accept connections"
 msgstr "Datenbanksystem ist bereit, um Verbindungen anzunehmen"
 
-#: postmaster/postmaster.c:2490
+#: postmaster/postmaster.c:2491
 msgid "background writer process"
 msgstr "Background-Writer-Prozess"
 
-#: postmaster/postmaster.c:2506
+#: postmaster/postmaster.c:2507
 msgid "WAL writer process"
 msgstr "WAL-Schreibprozess"
 
-#: postmaster/postmaster.c:2520
+#: postmaster/postmaster.c:2521
 msgid "WAL receiver process"
 msgstr "WAL-Receiver-Prozess"
 
-#: postmaster/postmaster.c:2535
+#: postmaster/postmaster.c:2536
 msgid "autovacuum launcher process"
 msgstr "Autovacuum-Launcher-Prozess"
 
-#: postmaster/postmaster.c:2550
+#: postmaster/postmaster.c:2551
 msgid "archiver process"
 msgstr "Archivierprozess"
 
-#: postmaster/postmaster.c:2566
+#: postmaster/postmaster.c:2567
 msgid "statistics collector process"
 msgstr "Statistiksammelprozess"
 
-#: postmaster/postmaster.c:2580
+#: postmaster/postmaster.c:2581
 msgid "system logger process"
 msgstr "Systemlogger-Prozess"
 
-#: postmaster/postmaster.c:2615 postmaster/postmaster.c:2634
-#: postmaster/postmaster.c:2641 postmaster/postmaster.c:2659
+#: postmaster/postmaster.c:2616 postmaster/postmaster.c:2635
+#: postmaster/postmaster.c:2642 postmaster/postmaster.c:2660
 msgid "server process"
 msgstr "Serverprozess"
 
-#: postmaster/postmaster.c:2695
+#: postmaster/postmaster.c:2696
 msgid "terminating any other active server processes"
 msgstr "aktive Serverprozesse werden abgebrochen"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2860
+#: postmaster/postmaster.c:2861
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) beendete mit Status %d"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2869
+#: postmaster/postmaster.c:2870
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d) wurde durch Ausnahme 0x%X beendet"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2878
+#: postmaster/postmaster.c:2879
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d: %s"
 msgstr "%s (PID %d) wurde von Signal %d beendet: %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2888
+#: postmaster/postmaster.c:2889
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d"
 msgstr "%s (PID %d) wurde von Signal %d beendet"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2897
+#: postmaster/postmaster.c:2898
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) beendete mit unbekanntem Status %d"
 
-#: postmaster/postmaster.c:3077
+#: postmaster/postmaster.c:3078
 msgid "abnormal database system shutdown"
 msgstr "abnormales Herunterfahren des Datenbanksystems"
 
-#: postmaster/postmaster.c:3116
+#: postmaster/postmaster.c:3117
 msgid "all server processes terminated; reinitializing"
 msgstr "alle Serverprozesse beendet; initialisiere neu"
 
-#: postmaster/postmaster.c:3299
+#: postmaster/postmaster.c:3300
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "konnte neuen Prozess für Verbindung nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:3341
+#: postmaster/postmaster.c:3342
 msgid "could not fork new process for connection: "
 msgstr "konnte neuen Prozess für Verbindung nicht starten (fork-Fehler): "
 
-#: postmaster/postmaster.c:3455
+#: postmaster/postmaster.c:3456
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "Verbindung empfangen: Host=%s Port=%s"
 
-#: postmaster/postmaster.c:3460
+#: postmaster/postmaster.c:3461
 #, c-format
 msgid "connection received: host=%s"
 msgstr "Verbindung empfangen: Host=%s"
 
-#: postmaster/postmaster.c:3729
+#: postmaster/postmaster.c:3730
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "konnte Serverprozess »%s« nicht ausführen: %m"
 
-#: postmaster/postmaster.c:4246
+#: postmaster/postmaster.c:4247
 msgid "database system is ready to accept read only connections"
 msgstr "Datenbanksystem ist bereit, um lesende Verbindungen anzunehmen"
 
-#: postmaster/postmaster.c:4513
+#: postmaster/postmaster.c:4514
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "konnte Startprozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:4517
+#: postmaster/postmaster.c:4518
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr "konnte Background-Writer-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:4521
+#: postmaster/postmaster.c:4522
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr "konnte WAL-Writer-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:4525
+#: postmaster/postmaster.c:4526
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr "konnte WAL-Receiver-Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:4529
+#: postmaster/postmaster.c:4530
 #, c-format
 msgid "could not fork process: %m"
 msgstr "konnte Prozess nicht starten (fork-Fehler): %m"
 
-#: postmaster/postmaster.c:4811
+#: postmaster/postmaster.c:4813
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr ""
 "konnte Socket %d nicht für Verwendung in Backend duplizieren: Fehlercode %d"
 
-#: postmaster/postmaster.c:4843
+#: postmaster/postmaster.c:4845
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "konnte geerbtes Socket nicht erzeugen: Fehlercode %d\n"
 
-#: postmaster/postmaster.c:4872 postmaster/postmaster.c:4879
+#: postmaster/postmaster.c:4874 postmaster/postmaster.c:4881
 #, c-format
 msgid "could not read from backend variables file \"%s\": %s\n"
 msgstr "konnte nicht aus Servervariablendatei »%s« lesen: %s\n"
 
-#: postmaster/postmaster.c:4888
+#: postmaster/postmaster.c:4890
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "konnte Datei »%s« nicht löschen: %s\n"
 
-#: postmaster/postmaster.c:4905
+#: postmaster/postmaster.c:4907
 #, c-format
 msgid "could not map view of backend variables: error code %d\n"
 msgstr "konnte Sicht der Backend-Variablen nicht mappen: Fehlercode %d\n"
 
-#: postmaster/postmaster.c:4914
+#: postmaster/postmaster.c:4916
 #, c-format
 msgid "could not unmap view of backend variables: error code %d\n"
 msgstr "konnte Sicht der Backend-Variablen nicht unmappen: Fehlercode %d\n"
 
-#: postmaster/postmaster.c:4921
+#: postmaster/postmaster.c:4923
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %d\n"
 msgstr ""
 "konnte Handle für Backend-Parametervariablen nicht schließen: Fehlercode %d\n"
 
-#: postmaster/postmaster.c:5064
+#: postmaster/postmaster.c:5067
 msgid "could not read exit code for process\n"
 msgstr "konnte Exitcode des Prozesses nicht lesen\n"
 
-#: postmaster/postmaster.c:5069
+#: postmaster/postmaster.c:5072
 msgid "could not post child completion status\n"
 msgstr "konnte Child-Completion-Status nicht versenden\n"
 
@@ -13253,12 +13234,11 @@ msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr ""
 "automatische Rotation abgeschaltet (SIGHUP zum Wiederanschalten verwenden)"
 
-#: regex/regc_pg_locale.c:258 utils/adt/selfuncs.c:4969
-#, fuzzy
+#: regex/regc_pg_locale.c:258 utils/adt/selfuncs.c:5030
 msgid "could not determine which collation to use for regular expression"
 msgstr ""
-"konnte Zeilenbeschreibung für Funktion, die »record« zurückgibt, nicht "
-"ermitteln"
+"konnte die für den regulären Ausdruck zu verwendende Sortierfolge nicht "
+"bestimmen"
 
 #: replication/libpqwalreceiver/libpqwalreceiver.c:101
 #, c-format
@@ -13327,9 +13307,9 @@ msgid "replication terminated by primary server"
 msgstr "Replikation wurde durch Primärserver beendet"
 
 #: replication/libpqwalreceiver/libpqwalreceiver.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "could not send data to WAL stream: %s"
-msgstr "konnte keine Daten an den Server senden: %s\n"
+msgstr "konnte keine Daten an den WAL-Stream senden: %s"
 
 #: replication/walreceiver.c:150
 msgid "terminating walreceiver process due to administrator command"
@@ -13367,27 +13347,26 @@ msgid "invalid standby query string: %s"
 msgstr "ungültige Standby-Anfragezeichenkette: %s"
 
 #: replication/walsender.c:518
-#, fuzzy, c-format
-msgid "invalid standby message type %d"
-msgstr "ungültiger Standby-Closing-Message-Typ %d"
+#, c-format
+msgid "invalid standby message type \"%c\""
+msgstr "ungültiger Standby-Message-Typ »%c«"
 
 #: replication/walsender.c:569
-#, fuzzy, c-format
-msgid "unexpected message type %c"
-msgstr "Typname erwartet"
+#, c-format
+msgid "unexpected message type \"%c\""
+msgstr "unerwarteter Message-Typ »%c«"
 
-#: replication/walsender.c:822
-#, fuzzy
+#: replication/walsender.c:813
 msgid "terminating walsender process due to replication timeout"
 msgstr ""
-"breche WAL-Receiver-Prozess ab aufgrund von Anweisung des Administrators"
+"breche WAL-Sender-Prozess ab wegen Zeitüberschreitung bei der Replikation"
 
-#: replication/walsender.c:838
+#: replication/walsender.c:829
 #, c-format
 msgid "standby \"%s\" has now caught up with primary"
-msgstr ""
+msgstr "Standby-Server »%s« hat jetzt den Primärserver eingeholt"
 
-#: replication/walsender.c:907
+#: replication/walsender.c:898
 #, c-format
 msgid ""
 "number of requested standby connections exceeds max_wal_senders (currently "
@@ -13396,333 +13375,346 @@ msgstr ""
 "Anzahl angeforderter Standby-Verbindungen überschreitet max_wal_senders "
 "(aktuell %d)"
 
-#: replication/walsender.c:985 replication/walsender.c:1047
+#: replication/walsender.c:976 replication/walsender.c:1038
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "das angeforderte WAL-Segment %s wurde schon entfernt"
 
-#: replication/walsender.c:1018
+#: replication/walsender.c:1009
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
 msgstr ""
 "konnte nicht aus Logdatei %u, Segment %u bei Position %u, Länge %lu lesen: %m"
 
-#: replication/basebackup.c:122
-#, fuzzy, c-format
-msgid "unable to read symbolic link %s: %m"
-msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %m"
+#: replication/basebackup.c:122 replication/basebackup.c:632
+#, c-format
+msgid "could not read symbolic link \"%s\": %m"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen: %m"
 
-#: replication/basebackup.c:231 replication/basebackup.c:743
+#: replication/basebackup.c:231 replication/basebackup.c:744
 msgid "base backup could not send data, aborting backup"
-msgstr ""
+msgstr "Basissicherung konnte keine Daten senden, Sicherung abgebrochen"
 
 #: replication/basebackup.c:278 replication/basebackup.c:287
 #: replication/basebackup.c:296 replication/basebackup.c:305
 #: replication/basebackup.c:314
-#, fuzzy, c-format
+#, c-format
 msgid "duplicate option \"%s\""
-msgstr "ungültige Option »%s«"
+msgstr "doppelte Option »%s«"
 
 #: replication/basebackup.c:366
-#, fuzzy, c-format
-msgid "unable to open directory pg_tblspc: %m"
-msgstr "konnte Verzeichnis »%s« nicht öffnen: %m"
+#, c-format
+msgid "could not open directory \"pg_tblspc\": %m"
+msgstr "konnte Verzeichnis »pg_tblspc« nicht öffnen: %m"
 
 #: replication/basebackup.c:576
 msgid "shutdown requested, aborting active base backup"
-msgstr ""
+msgstr "Herunterfahren verlangt, aktive Basissicherung wird abgebrochen"
 
-#: replication/basebackup.c:589
-#, fuzzy, c-format
+#: replication/basebackup.c:590
+#, c-format
 msgid "could not stat file or directory \"%s\": %m"
-msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %s\n"
-
-#: replication/basebackup.c:631
-#, fuzzy, c-format
-msgid "could not read symbolic link \"%s\": %m"
-msgstr "konnte symbolische Verknüpfung »%s« nicht erstellen: %m"
+msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %m"
 
-#: replication/basebackup.c:660
-#, fuzzy, c-format
+#: replication/basebackup.c:661
+#, c-format
 msgid "skipping special file \"%s\""
-msgstr "entferne Transaktionslogdatei »%s«"
+msgstr "überspringe besondere Datei »%s«"
 
-#: replication/basebackup.c:733
-#, fuzzy, c-format
+#: replication/basebackup.c:734
+#, c-format
 msgid "archive member \"%s\" too large for tar format"
-msgstr "Archivmitglied zu groß für Tar-Format\n"
+msgstr "Archivmitglied »%s« zu groß für Tar-Format"
 
-#: replication/syncrep.c:214
-#, fuzzy
+#: replication/syncrep.c:210
 msgid ""
 "canceling the wait for synchronous replication and terminating connection "
 "due to administrator command"
-msgstr "breche Verbindung ab aufgrund von Anweisung des Administrators"
+msgstr ""
+"storniere Warten auf synchrone Replikation and breche Verbindung ab aufgrund "
+"von Anweisung des Administrators"
 
-#: replication/syncrep.c:215 replication/syncrep.c:232
+#: replication/syncrep.c:211 replication/syncrep.c:228
 msgid ""
-"The transaction has already committed locally, but may not have been "
+"The transaction has already committed locally, but might not have been "
 "replicated to the standby."
 msgstr ""
+"Die Transaktion wurde lokal bereits committet, aber möglicherweise noch "
+"nicht zum Standby repliziert."
 
-#: replication/syncrep.c:231
-#, fuzzy
+#: replication/syncrep.c:227
 msgid "canceling wait for synchronous replication due to user request"
-msgstr "storniere Anfrage wegen Benutzeraufforderung"
+msgstr "storniere Warten auf synchrone Replikation wegen Benutzeraufforderung"
 
-#: replication/syncrep.c:357
+#: replication/syncrep.c:358
 #, c-format
 msgid "standby \"%s\" now has synchronous standby priority %u"
 msgstr "Standby »%s« hat jetzt synchrone Standby-Priorität %u"
 
-#: replication/syncrep.c:450
+#: replication/syncrep.c:451
 #, c-format
 msgid "standby \"%s\" is now the synchronous standby with priority %u"
 msgstr "Standby »%s« ist jetzt der synchrone Standby mit Priorität %u"
 
 #: repl_scanner.l:76
-#, fuzzy
 msgid "invalid streaming start location"
-msgstr "ungültige XML-Verarbeitungsanweisung"
+msgstr "ungültige Streaming-Startposition"
 
 #: repl_scanner.l:107
-#, fuzzy, c-format
+#, c-format
 msgid "syntax error: unexpected character \"%s\""
-msgstr "Syntaxfehler, »=« erwartet"
+msgstr "Syntaxfehler: unerwartetes Zeichen »%s«"
 
-#: rewrite/rewriteDefine.c:109 rewrite/rewriteDefine.c:771
+#: rewrite/rewriteDefine.c:109 rewrite/rewriteDefine.c:769
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "Regel »%s« für Relation »%s« existiert bereits"
 
-#: rewrite/rewriteDefine.c:289
+#: rewrite/rewriteDefine.c:287
 msgid "rule actions on OLD are not implemented"
 msgstr "Regelaktionen für OLD sind nicht implementiert"
 
-#: rewrite/rewriteDefine.c:290
+#: rewrite/rewriteDefine.c:288
 msgid "Use views or triggers instead."
 msgstr "Verwenden Sie stattdessen Sichten oder Trigger."
 
-#: rewrite/rewriteDefine.c:294
+#: rewrite/rewriteDefine.c:292
 msgid "rule actions on NEW are not implemented"
 msgstr "Regelaktionen für NEW sind nicht implementiert"
 
-#: rewrite/rewriteDefine.c:295
+#: rewrite/rewriteDefine.c:293
 msgid "Use triggers instead."
 msgstr "Verwenden Sie stattdessen Trigger."
 
-#: rewrite/rewriteDefine.c:308
+#: rewrite/rewriteDefine.c:306
 msgid "INSTEAD NOTHING rules on SELECT are not implemented"
 msgstr "INSTEAD-NOTHING-Regeln für SELECT sind nicht implementiert"
 
-#: rewrite/rewriteDefine.c:309
+#: rewrite/rewriteDefine.c:307
 msgid "Use views instead."
 msgstr "Verwenden Sie stattdessen Sichten."
 
-#: rewrite/rewriteDefine.c:317
+#: rewrite/rewriteDefine.c:315
 msgid "multiple actions for rules on SELECT are not implemented"
 msgstr "mehrere Regelaktionen für SELECT-Regeln sind nicht implementiert"
 
-#: rewrite/rewriteDefine.c:329
+#: rewrite/rewriteDefine.c:327
 msgid "rules on SELECT must have action INSTEAD SELECT"
 msgstr "Regeln für SELECT müssen als Aktion INSTEAD SELECT haben"
 
-#: rewrite/rewriteDefine.c:337
+#: rewrite/rewriteDefine.c:335
 msgid "rules on SELECT must not contain data-modifying statements in WITH"
 msgstr ""
 "Regeln für SELECT dürfen keine datenmodifizierenden Anweisungen in WITH "
 "enthalten"
 
-#: rewrite/rewriteDefine.c:345
+#: rewrite/rewriteDefine.c:343
 msgid "event qualifications are not implemented for rules on SELECT"
 msgstr "Ereignisqualifikationen sind nicht implementiert für SELECT-Regeln"
 
-#: rewrite/rewriteDefine.c:370
+#: rewrite/rewriteDefine.c:368
 #, c-format
 msgid "\"%s\" is already a view"
 msgstr "»%s« ist bereits eine Sicht"
 
-#: rewrite/rewriteDefine.c:394
+#: rewrite/rewriteDefine.c:392
 #, c-format
 msgid "view rule for \"%s\" must be named \"%s\""
 msgstr "Sicht-Regel für »%s« muss »%s« heißen"
 
-#: rewrite/rewriteDefine.c:419
+#: rewrite/rewriteDefine.c:417
 #, c-format
 msgid "could not convert table \"%s\" to a view because it is not empty"
 msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie nicht leer ist"
 
-#: rewrite/rewriteDefine.c:426
+#: rewrite/rewriteDefine.c:424
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has triggers"
 msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie Trigger hat"
 
-#: rewrite/rewriteDefine.c:428
+#: rewrite/rewriteDefine.c:426
 msgid ""
 "In particular, the table cannot be involved in any foreign key relationships."
 msgstr ""
 "Insbesondere darf die Tabelle nicht in Fremschlüsselverhältnisse eingebunden "
 "sein."
 
-#: rewrite/rewriteDefine.c:433
+#: rewrite/rewriteDefine.c:431
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has indexes"
 msgstr "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie Indexe hat"
 
-#: rewrite/rewriteDefine.c:439
+#: rewrite/rewriteDefine.c:437
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has child tables"
 msgstr ""
 "konnte Tabelle »%s« nicht in Sicht umwandeln, weil sie abgeleitete Tabellen "
 "hat"
 
-#: rewrite/rewriteDefine.c:466
+#: rewrite/rewriteDefine.c:464
 msgid "cannot have multiple RETURNING lists in a rule"
 msgstr "Regel kann nicht mehrere RETURNING-Listen enthalten"
 
-#: rewrite/rewriteDefine.c:471
+#: rewrite/rewriteDefine.c:469
 msgid "RETURNING lists are not supported in conditional rules"
 msgstr "RETURNING-Listen werden in Regeln mit Bedingung nicht unterstützt"
 
-#: rewrite/rewriteDefine.c:475
+#: rewrite/rewriteDefine.c:473
 msgid "RETURNING lists are not supported in non-INSTEAD rules"
 msgstr "RETURNING-Listen werden nur in INSTEAD-Regeln unterstützt"
 
-#: rewrite/rewriteDefine.c:554
+#: rewrite/rewriteDefine.c:552
 msgid "SELECT rule's target list has too many entries"
 msgstr "Targetliste von SELECT-Regel hat zu viele Einträge"
 
-#: rewrite/rewriteDefine.c:555
+#: rewrite/rewriteDefine.c:553
 msgid "RETURNING list has too many entries"
 msgstr "RETURNING-Liste hat zu viele Einträge"
 
-#: rewrite/rewriteDefine.c:571
+#: rewrite/rewriteDefine.c:569
 msgid "cannot convert relation containing dropped columns to view"
 msgstr "kann Relation mit gelöschten Spalten nicht in Sicht umwandeln"
 
-#: rewrite/rewriteDefine.c:576
+#: rewrite/rewriteDefine.c:574
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from \"%s\""
 msgstr ""
 "Spaltenname in Targeteintrag %d von SELECT-Regel unterscheidet sich von "
 "Spalte »%s«"
 
-#: rewrite/rewriteDefine.c:582
+#: rewrite/rewriteDefine.c:580
 #, c-format
 msgid "SELECT rule's target entry %d has different type from column \"%s\""
 msgstr ""
 "Typ von Targeteintrag %d von SELECT-Regel unterscheidet sich von Spalte »%s«"
 
-#: rewrite/rewriteDefine.c:584
+#: rewrite/rewriteDefine.c:582
 #, c-format
 msgid "RETURNING list's entry %d has different type from column \"%s\""
 msgstr "Eintrag %d in RETURNING-Liste hat anderen Typ als Spalte »%s«"
 
-#: rewrite/rewriteDefine.c:599
+#: rewrite/rewriteDefine.c:597
 #, c-format
 msgid "SELECT rule's target entry %d has different size from column \"%s\""
 msgstr ""
 "Größe von Targeteintrag %d von SELECT-Regel unterscheidet sich von Spalte "
 "»%s«"
 
-#: rewrite/rewriteDefine.c:601
+#: rewrite/rewriteDefine.c:599
 #, c-format
 msgid "RETURNING list's entry %d has different size from column \"%s\""
 msgstr "Eintrag %d in RETURNING-Liste hat andere Größe als Spalte »%s«"
 
-#: rewrite/rewriteDefine.c:609
+#: rewrite/rewriteDefine.c:607
 msgid "SELECT rule's target list has too few entries"
 msgstr "Targetliste von SELECT-Regeln hat zu wenige Einträge"
 
-#: rewrite/rewriteDefine.c:610
+#: rewrite/rewriteDefine.c:608
 msgid "RETURNING list has too few entries"
 msgstr "RETURNING-Liste hat zu wenige Einträge"
 
-#: rewrite/rewriteDefine.c:702 rewrite/rewriteDefine.c:764
+#: rewrite/rewriteDefine.c:700 rewrite/rewriteDefine.c:762
 #: rewrite/rewriteRemove.c:62 rewrite/rewriteSupport.c:117
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" does not exist"
 msgstr "Regel »%s« für Relation »%s« existiert nicht"
 
-#: rewrite/rewriteHandler.c:505
+#: rewrite/rewriteHandler.c:485
+#, c-format
+msgid ""
+"WITH query name \"%s\" appears in both a rule action and the query being "
+"rewritten"
+msgstr ""
+"WITH-Anfragename »%s« erscheint sowohl in der Regelaktion als auch in der "
+"umzuschreibenden Anfrage"
+
+#: rewrite/rewriteHandler.c:543
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "RETURNING-Listen können nicht in mehreren Regeln auftreten"
 
-#: rewrite/rewriteHandler.c:836 rewrite/rewriteHandler.c:854
-#, c-format
-msgid "multiple assignments to same column \"%s\""
-msgstr "mehrere Zuweisungen zur selben Spalte »%s«"
+#: rewrite/rewriteHandler.c:874 rewrite/rewriteHandler.c:892
+#, c-format
+msgid "multiple assignments to same column \"%s\""
+msgstr "mehrere Zuweisungen zur selben Spalte »%s«"
+
+#: rewrite/rewriteHandler.c:1627 rewrite/rewriteHandler.c:2022
+#, c-format
+msgid "infinite recursion detected in rules for relation \"%s\""
+msgstr "unendliche Rekursion entdeckt in Regeln für Relation »%s«"
+
+#: rewrite/rewriteHandler.c:1883
+msgid ""
+"DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
+"WITH"
+msgstr ""
+"DO INSTEAD NOTHING-Regeln werden für datenmodifizierende Anweisungen in WITH "
+"nicht unterstützt"
+
+#: rewrite/rewriteHandler.c:1897
+msgid ""
+"conditional DO INSTEAD rules are not supported for data-modifying statements "
+"in WITH"
+msgstr ""
+"Do INSTEAD-Regeln mit Bedingung werden für datenmodifizierende Anweisungen "
+"in WITH nicht unterstützt"
+
+#: rewrite/rewriteHandler.c:1901
+msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"DO ALSO-Regeln werden für datenmodifizierende Anweisungen in WITH nicht "
+"unterstützt"
 
-#: rewrite/rewriteHandler.c:1588 rewrite/rewriteHandler.c:1920
-#, c-format
-msgid "infinite recursion detected in rules for relation \"%s\""
-msgstr "unendliche Rekursion entdeckt in Regeln für Relation »%s«"
+#: rewrite/rewriteHandler.c:1906
+msgid ""
+"multi-statement DO INSTEAD rules are not supported for data-modifying "
+"statements in WITH"
+msgstr ""
+"DO INSTEAD-Regeln mit mehreren Anweisungen werden für datenmodifizierende "
+"Anweisungen in WITH nicht unterstützt"
 
-#: rewrite/rewriteHandler.c:1958
+#: rewrite/rewriteHandler.c:2060
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "INSERT RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
-#: rewrite/rewriteHandler.c:1960
+#: rewrite/rewriteHandler.c:2062
 msgid ""
 "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Sie benötigen eine ON INSERT DO INSTEAD Regel ohne Bedingung, mit RETURNING-"
 "Klausel."
 
-#: rewrite/rewriteHandler.c:1965
+#: rewrite/rewriteHandler.c:2067
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "UPDATE RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
-#: rewrite/rewriteHandler.c:1967
+#: rewrite/rewriteHandler.c:2069
 msgid ""
 "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Sie benötigen eine ON UPDATE DO INSTEAD Regel ohne Bedingung, mit RETURNING-"
 "Klausel."
 
-#: rewrite/rewriteHandler.c:1972
+#: rewrite/rewriteHandler.c:2074
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "DELETE RETURNING kann in Relation »%s« nicht ausgeführt werden"
 
-#: rewrite/rewriteHandler.c:1974
+#: rewrite/rewriteHandler.c:2076
 msgid ""
 "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Sie benötigen eine ON DELETE DO INSTEAD Regel ohne Bedingung, mit RETURNING-"
 "Klausel."
 
-#: rewrite/rewriteHandler.c:2020
-msgid ""
-"DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
-"WITH"
-msgstr ""
-"DO INSTEAD NOTHING-Regeln werden für datenmodifizierende Anweisungen in WITH "
-"nicht unterstützt"
-
-#: rewrite/rewriteHandler.c:2034
-msgid ""
-"conditional DO INSTEAD rules are not supported for data-modifying statements "
-"in WITH"
-msgstr ""
-"Do INSTEAD-Regeln mit Bedingung werden für datenmodifizierende Anweisungen "
-"in WITH nicht unterstützt"
-
-#: rewrite/rewriteHandler.c:2038
-msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
-msgstr ""
-"DO ALSO-Regeln werden für datenmodifizierende Anweisungen in WITH nicht "
-"unterstützt"
-
-#: rewrite/rewriteHandler.c:2043
+#: rewrite/rewriteHandler.c:2140
 msgid ""
-"multi-statement DO INSTEAD rules are not supported for data-modifying "
-"statements in WITH"
+"WITH cannot be used in a query that is rewritten by rules into multiple "
+"queries"
 msgstr ""
-"DO INSTEAD-Regeln mit mehreren Anweisungen werden für datenmodifizierende "
-"Anweisungen in WITH nicht unterstützt"
+"WITH kann nicht in einer Anfrage verwendet werden, die durch Regeln in "
+"mehrere Anfragen umgeschrieben wird"
 
 #: rewrite/rewriteManip.c:1012
 msgid "conditional utility statements are not implemented"
@@ -13751,256 +13743,284 @@ msgstr "es gibt mehrere Regeln namens »%s«"
 msgid "Specify a relation name as well as a rule name."
 msgstr "Geben Sie einen Relationsnamen und einen Regelnamen an."
 
-#: utils/error/assert.c:37
-msgid "TRAP: ExceptionalCondition: bad arguments\n"
-msgstr "TRAP: ExceptionalCondition: fehlerhafte Argumente\n"
+#: utils/init/miscinit.c:115
+#, c-format
+msgid "could not change directory to \"%s\": %m"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %m"
 
-#: utils/error/assert.c:40
+#: utils/init/miscinit.c:381 utils/misc/guc.c:5259
 #, c-format
-msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP: %s(»%s«, Datei: »%s«, Zeile: %d)\n"
+msgid "cannot set parameter \"%s\" within security-restricted operation"
+msgstr ""
+"kann Parameter »%s« nicht in einer sicherheitsbeschränkten Operation setzen"
 
-#: utils/error/elog.c:1479
+#: utils/init/miscinit.c:460
 #, c-format
-msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "konnte Datei »%s« nicht als stderr neu öffnen: %m"
+msgid "role \"%s\" is not permitted to log in"
+msgstr "Rolle »%s« hat keine Berechtigung zum Einloggen"
 
-#: utils/error/elog.c:1492
+#: utils/init/miscinit.c:478
 #, c-format
-msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "konnte Datei »%s« nicht als stdou neu öffnen: %m"
+msgid "too many connections for role \"%s\""
+msgstr "zu viele Verbindungen von Rolle »%s«"
 
-#: utils/error/elog.c:1882 utils/error/elog.c:1892 utils/error/elog.c:1902
-msgid "[unknown]"
-msgstr "[unbekannt]"
+#: utils/init/miscinit.c:538
+msgid "permission denied to set session authorization"
+msgstr "keine Berechtigung, um Sitzungsauthorisierung zu setzen"
 
-#: utils/error/elog.c:2253 utils/error/elog.c:2533 utils/error/elog.c:2611
-msgid "missing error text"
-msgstr "fehlender Fehlertext"
+#: utils/init/miscinit.c:618
+#, c-format
+msgid "invalid role OID: %u"
+msgstr "ungültige Rollen-OID: %u"
 
-#: utils/error/elog.c:2256 utils/error/elog.c:2259 utils/error/elog.c:2614
-#: utils/error/elog.c:2617
+#: utils/init/miscinit.c:750
 #, c-format
-msgid " at character %d"
-msgstr " bei Zeichen %d"
+msgid "could not create lock file \"%s\": %m"
+msgstr "konnte Sperrdatei »%s« nicht erstellen: %m"
 
-#: utils/error/elog.c:2269 utils/error/elog.c:2276
-msgid "DETAIL:  "
-msgstr "DETAIL:  "
+#: utils/init/miscinit.c:764
+#, c-format
+msgid "could not open lock file \"%s\": %m"
+msgstr "konnte Sperrdatei »%s« nicht öffnen: %m"
 
-#: utils/error/elog.c:2283
-msgid "HINT:  "
-msgstr "TIPP:  "
+#: utils/init/miscinit.c:770
+#, c-format
+msgid "could not read lock file \"%s\": %m"
+msgstr "konnte Sperrdatei »%s« nicht lesen: %m"
 
-#: utils/error/elog.c:2290
-msgid "QUERY:  "
-msgstr "ANFRAGE:  "
+#: utils/init/miscinit.c:818
+#, c-format
+msgid "lock file \"%s\" already exists"
+msgstr "Sperrdatei »%s« existiert bereits"
 
-#: utils/error/elog.c:2297
-msgid "CONTEXT:  "
-msgstr "ZUSAMMENHANG:  "
+#: utils/init/miscinit.c:822
+#, c-format
+msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Läuft bereits ein anderer postgres-Prozess (PID %d) im Datenverzeichnis »%s«?"
 
-#: utils/error/elog.c:2307
+#: utils/init/miscinit.c:824
 #, c-format
-msgid "LOCATION:  %s, %s:%d\n"
-msgstr "ORT:  %s, %s:%d\n"
+msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Läuft bereits ein anderer postmaster-Prozess (PID %d) im Datenverzeichnis "
+"»%s«?"
 
-#: utils/error/elog.c:2314
+#: utils/init/miscinit.c:827
 #, c-format
-msgid "LOCATION:  %s:%d\n"
-msgstr "ORT:  %s:%d\n"
+msgid "Is another postgres (PID %d) using socket file \"%s\"?"
+msgstr ""
+"Verwendet bereits ein anderer postgres-Prozess (PID %d) die Socketdatei »%s«?"
 
-#: utils/error/elog.c:2328
-msgid "STATEMENT:  "
-msgstr "ANWEISUNG:  "
+#: utils/init/miscinit.c:829
+#, c-format
+msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
+msgstr ""
+"Verwendet bereits ein anderer postmaster-Prozess (PID %d) die Socketdatei "
+"»%s«?"
 
-#. translator: This string will be truncated at 47
-#. characters expanded.
-#: utils/error/elog.c:2726
+#: utils/init/miscinit.c:865
 #, c-format
-msgid "operating system error %d"
-msgstr "Betriebssystemfehler %d"
+msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgstr ""
+"bereits bestehender Shared-Memory-Block (Schlüssel %lu, ID %lu) wird noch "
+"benutzt"
 
-#: utils/error/elog.c:2749
-msgid "DEBUG"
-msgstr "DEBUG"
+#: utils/init/miscinit.c:868
+#, c-format
+msgid ""
+"If you're sure there are no old server processes still running, remove the "
+"shared memory block or just delete the file \"%s\"."
+msgstr ""
+"Wenn Sie sich sicher sind, dass kein alter Serverprozess mehr läuft, "
+"entfernen Sie den Shared-Memory-Block oder löschen Sie einfach die Datei "
+"»%s«."
 
-#: utils/error/elog.c:2753
-msgid "LOG"
-msgstr "LOG"
+#: utils/init/miscinit.c:884
+#, c-format
+msgid "could not remove old lock file \"%s\": %m"
+msgstr "konnte alte Sperrdatei »%s« nicht löschen: %m"
 
-#: utils/error/elog.c:2756
-msgid "INFO"
-msgstr "INFO"
+#: utils/init/miscinit.c:886
+msgid ""
+"The file seems accidentally left over, but it could not be removed. Please "
+"remove the file by hand and try again."
+msgstr ""
+"Die Datei ist anscheinend aus Versehen übrig geblieben, konnte aber nicht "
+"gelöscht werden. Bitte entfernen Sie die Datei von Hand und versuchen Sie es "
+"erneut."
 
-#: utils/error/elog.c:2759
-msgid "NOTICE"
-msgstr "HINWEIS"
+#: utils/init/miscinit.c:920 utils/init/miscinit.c:931
+#: utils/init/miscinit.c:941
+#, c-format
+msgid "could not write lock file \"%s\": %m"
+msgstr "konnte Sperrdatei »%s« nicht schreiben: %m"
 
-#: utils/error/elog.c:2762
-msgid "WARNING"
-msgstr "WARNUNG"
+#: utils/init/miscinit.c:1048 utils/misc/guc.c:7527
+#, c-format
+msgid "could not read from file \"%s\": %m"
+msgstr "konnte nicht aus Datei »%s« lesen: %m"
 
-#: utils/error/elog.c:2765
-msgid "ERROR"
-msgstr "FEHLER"
+#: utils/init/miscinit.c:1147 utils/init/miscinit.c:1160
+#, c-format
+msgid "\"%s\" is not a valid data directory"
+msgstr "»%s« ist kein gültiges Datenverzeichnis"
 
-#: utils/error/elog.c:2768
-msgid "FATAL"
-msgstr "FATAL"
+#: utils/init/miscinit.c:1149
+#, c-format
+msgid "File \"%s\" is missing."
+msgstr "Die Datei »%s« fehlt."
 
-#: utils/error/elog.c:2771
-msgid "PANIC"
-msgstr "PANIK"
+#: utils/init/miscinit.c:1162
+#, c-format
+msgid "File \"%s\" does not contain valid data."
+msgstr "Die Datei »%s« enthält keine gültigen Daten."
 
-#: utils/adt/xml.c:135
-msgid "unsupported XML feature"
-msgstr "nicht unterstützte XML-Funktionalität"
+#: utils/init/miscinit.c:1164
+msgid "You might need to initdb."
+msgstr "Sie müssen möglicherweise initdb ausführen."
 
-#: utils/adt/xml.c:136
-msgid "This functionality requires the server to be built with libxml support."
+#: utils/init/miscinit.c:1172
+#, c-format
+msgid ""
+"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
+"not compatible with this version %s."
 msgstr ""
-"Diese Funktionalität verlangt, dass der Server mit Libxml-Unterstützung "
-"gebaut wird."
-
-#: utils/adt/xml.c:137
-msgid "You need to rebuild PostgreSQL using --with-libxml."
-msgstr "Sie müssen PostgreSQL mit --with-libxml neu bauen."
+"Das Datenverzeichnis wurde von PostgreSQL Version %ld.%ld initialisiert, "
+"welche nicht mit dieser Version %s kompatibel ist."
 
-#: utils/adt/xml.c:156 utils/mb/mbutils.c:515
+#: utils/init/miscinit.c:1220
 #, c-format
-msgid "invalid encoding name \"%s\""
-msgstr "ungültiger Kodierungsname »%s«"
-
-#: utils/adt/xml.c:402 utils/adt/xml.c:407
-msgid "invalid XML comment"
-msgstr "ungültiger XML-Kommentar"
-
-#: utils/adt/xml.c:536
-msgid "not an XML document"
-msgstr "kein XML-Dokument"
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "ungültige Listensyntax für Parameter »%s«"
 
-#: utils/adt/xml.c:689 utils/adt/xml.c:712
-msgid "invalid XML processing instruction"
-msgstr "ungültige XML-Verarbeitungsanweisung"
+#: utils/init/miscinit.c:1257
+#, c-format
+msgid "loaded library \"%s\""
+msgstr "Bibliothek »%s« geladen"
 
-#: utils/adt/xml.c:690
+#: utils/init/postinit.c:225
 #, c-format
-msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr "Die Zielangabe der XML-Verarbeitungsanweisung darf nicht »%s« sein."
+msgid "replication connection authorized: user=%s"
+msgstr "Replikationsverbindung authorisiert: Benutzer=%s"
 
-#: utils/adt/xml.c:713
-msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "XML-Verarbeitungsanweisung darf nicht »?>« enthalten."
+#: utils/init/postinit.c:229
+#, c-format
+msgid "connection authorized: user=%s database=%s"
+msgstr "Verbindung authorisiert: Benutzer=%s Datenbank=%s"
 
-#: utils/adt/xml.c:792
-msgid "xmlvalidate is not implemented"
-msgstr "xmlvalidate ist nicht implementiert"
+#: utils/init/postinit.c:260
+#, c-format
+msgid "database \"%s\" has disappeared from pg_database"
+msgstr "Datenbank »%s« ist aus pg_database verschwunden"
 
-#: utils/adt/xml.c:877
-msgid "could not initialize XML library"
-msgstr "konnte XML-Bibliothek nicht initialisieren"
+#: utils/init/postinit.c:262
+#, c-format
+msgid "Database OID %u now seems to belong to \"%s\"."
+msgstr "Datenbank-OID %u gehört jetzt anscheinend zu »%s«."
 
-#: utils/adt/xml.c:878
+#: utils/init/postinit.c:282
 #, c-format
-msgid ""
-"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
-msgstr ""
-"libxml2 hat inkompatiblen char-Typ: sizeof(char)=%u, sizeof(xmlChar)=%u."
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "Datenbank »%s« akzeptiert gegenwärtig keine Verbindungen"
 
-#: utils/adt/xml.c:1418
-msgid "Invalid character value."
-msgstr "Ungültiger Zeichenwert."
+#: utils/init/postinit.c:295
+#, c-format
+msgid "permission denied for database \"%s\""
+msgstr "keine Berechtigung für Datenbank »%s«"
 
-#: utils/adt/xml.c:1421
-msgid "Space required."
-msgstr "Leerzeichen benötigt."
+#: utils/init/postinit.c:296
+msgid "User does not have CONNECT privilege."
+msgstr "Benutzer hat das CONNECT-Privileg nicht."
 
-#: utils/adt/xml.c:1424
-msgid "standalone accepts only 'yes' or 'no'."
-msgstr "standalone akzeptiert nur »yes« oder »no«."
+#: utils/init/postinit.c:313
+#, c-format
+msgid "too many connections for database \"%s\""
+msgstr "zu viele Verbindungen für Datenbank »%s«"
 
-#: utils/adt/xml.c:1427
-msgid "Malformed declaration: missing version."
-msgstr "Fehlerhafte Deklaration: Version fehlt."
+#: utils/init/postinit.c:335 utils/init/postinit.c:342
+msgid "database locale is incompatible with operating system"
+msgstr "Datenbank-Locale ist inkompatibel mit Betriebssystem"
 
-#: utils/adt/xml.c:1430
-msgid "Missing encoding in text declaration."
-msgstr "Fehlende Kodierung in Textdeklaration."
+#: utils/init/postinit.c:336
+#, c-format
+msgid ""
+"The database was initialized with LC_COLLATE \"%s\",  which is not "
+"recognized by setlocale()."
+msgstr ""
+"Die Datenbank wurde mit LC_COLLATE »%s« initialisiert, was von setlocale() "
+"nicht erkannt wird."
 
-#: utils/adt/xml.c:1433
-msgid "Parsing XML declaration: '?>' expected."
-msgstr "Beim Parsen der XML-Deklaration: »?>« erwartet."
+#: utils/init/postinit.c:338 utils/init/postinit.c:345
+msgid ""
+"Recreate the database with another locale or install the missing locale."
+msgstr ""
+"Erzeugen Sie die Datenbank neu mit einer anderen Locale oder installieren "
+"Sie die fehlende Locale."
 
-#: utils/adt/xml.c:1436
+#: utils/init/postinit.c:343
 #, c-format
-msgid "Unrecognized libxml error code: %d."
-msgstr "Unbekannter Libxml-Fehlercode: %d."
-
-#: utils/adt/xml.c:1687 utils/adt/date.c:217
-msgid "date out of range"
-msgstr "date ist außerhalb des gültigen Bereichs"
+msgid ""
+"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
+"by setlocale()."
+msgstr ""
+"Die Datenbank wurde mit LC_CTYPE »%s« initialisiert, was von setlocale() "
+"nicht erkannt wird."
 
-#: utils/adt/xml.c:1688
-msgid "XML does not support infinite date values."
-msgstr "XML unterstützt keine unendlichen Datumswerte."
+#: utils/init/postinit.c:599
+msgid "no roles are defined in this database system"
+msgstr "in diesem Datenbanksystem sind keine Rollen definiert"
 
-#: utils/adt/xml.c:1710 utils/adt/xml.c:1717 utils/adt/xml.c:1737
-#: utils/adt/xml.c:1744 utils/adt/date.c:913 utils/adt/date.c:960
-#: utils/adt/date.c:1516 utils/adt/date.c:1553 utils/adt/date.c:2427
-#: utils/adt/formatting.c:3185 utils/adt/formatting.c:3217
-#: utils/adt/formatting.c:3285 utils/adt/nabstime.c:480
-#: utils/adt/nabstime.c:523 utils/adt/nabstime.c:553 utils/adt/nabstime.c:596
-#: utils/adt/timestamp.c:226 utils/adt/timestamp.c:269
-#: utils/adt/timestamp.c:491 utils/adt/timestamp.c:531
-#: utils/adt/timestamp.c:2530 utils/adt/timestamp.c:2551
-#: utils/adt/timestamp.c:2564 utils/adt/timestamp.c:2573
-#: utils/adt/timestamp.c:2631 utils/adt/timestamp.c:2654
-#: utils/adt/timestamp.c:2667 utils/adt/timestamp.c:2678
-#: utils/adt/timestamp.c:3114 utils/adt/timestamp.c:3244
-#: utils/adt/timestamp.c:3285 utils/adt/timestamp.c:3373
-#: utils/adt/timestamp.c:3420 utils/adt/timestamp.c:3531
-#: utils/adt/timestamp.c:3844 utils/adt/timestamp.c:3981
-#: utils/adt/timestamp.c:3988 utils/adt/timestamp.c:4002
-#: utils/adt/timestamp.c:4012 utils/adt/timestamp.c:4075
-#: utils/adt/timestamp.c:4215 utils/adt/timestamp.c:4225
-#: utils/adt/timestamp.c:4440 utils/adt/timestamp.c:4519
-#: utils/adt/timestamp.c:4526 utils/adt/timestamp.c:4553
-#: utils/adt/timestamp.c:4557 utils/adt/timestamp.c:4614
-msgid "timestamp out of range"
-msgstr "timestamp ist außerhalb des gültigen Bereichs"
+#: utils/init/postinit.c:600
+#, c-format
+msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
+msgstr "Sie sollten sofort CREATE USER \"%s\" SUPERUSER; ausführen."
 
-#: utils/adt/xml.c:1711 utils/adt/xml.c:1738
-msgid "XML does not support infinite timestamp values."
-msgstr "XML unterstützt keine unendliche timestamp-Werte."
+#: utils/init/postinit.c:623
+msgid "new replication connections are not allowed during database shutdown"
+msgstr ""
+"während des Herunterfahrens der Datenbank sind keine neuen "
+"Replikationsverbindungen erlaubt"
 
-#: utils/adt/xml.c:2123
-msgid "invalid query"
-msgstr "ungültige Anfrage"
+#: utils/init/postinit.c:627
+msgid "must be superuser to connect during database shutdown"
+msgstr ""
+"nur Superuser können während des Herunterfahrens der Datenbank verbinden"
 
-#: utils/adt/xml.c:3347
-msgid "invalid array for XML namespace mapping"
-msgstr "ungültiges Array for XML-Namensraumabbildung"
+#: utils/init/postinit.c:637
+msgid "must be superuser to connect in binary upgrade mode"
+msgstr "nur Superuser können im Binary-Upgrade-Modus verbinden"
 
-#: utils/adt/xml.c:3348
+#: utils/init/postinit.c:651
 msgid ""
-"The array must be two-dimensional with length of the second axis equal to 2."
+"remaining connection slots are reserved for non-replication superuser "
+"connections"
 msgstr ""
-"Das Array muss zweidimensional sein und die Länge der zweiten Achse muss "
-"gleich 2 sein."
+"die verbleibenden Verbindungen sind für Superuser auf Nicht-"
+"Replikationsverbindungen reserviert"
 
-#: utils/adt/xml.c:3372
-msgid "empty XPath expression"
-msgstr "leerer XPath-Ausdruck"
+#: utils/init/postinit.c:666
+msgid "must be replication role to start walsender"
+msgstr "nur Replikationsrollen können WAL-Sender starten"
 
-#: utils/adt/xml.c:3420
-msgid "neither namespace name nor URI may be null"
-msgstr "weder Namensraumname noch URI dürfen NULL sein"
+#: utils/init/postinit.c:726
+#, c-format
+msgid "database %u does not exist"
+msgstr "Datenbank %u existiert nicht"
+
+#: utils/init/postinit.c:778
+msgid "It seems to have just been dropped or renamed."
+msgstr "Sie wurde anscheinend gerade gelöscht oder umbenannt."
 
-#: utils/adt/xml.c:3427
+#: utils/init/postinit.c:796
 #, c-format
-msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
-msgstr "konnte XML-Namensraum mit Namen »%s« und URI »%s« nicht registrieren"
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "Das Datenbankunterverzeichnis »%s« fehlt."
+
+#: utils/init/postinit.c:801
+#, c-format
+msgid "could not access directory \"%s\": %m"
+msgstr "konnte nicht auf Verzeichnis »%s« zugreifen: %m"
 
 #: utils/adt/acl.c:166 utils/adt/name.c:87
 msgid "identifier too long"
@@ -14158,7 +14178,7 @@ msgstr ""
 "Aneinanderhängen."
 
 #: utils/adt/array_userfuncs.c:426 utils/adt/arrayfuncs.c:1238
-#: utils/adt/arrayfuncs.c:2911 utils/adt/arrayfuncs.c:4930
+#: utils/adt/arrayfuncs.c:2911 utils/adt/arrayfuncs.c:4936
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "ungültige Anzahl Dimensionen: %d"
@@ -14206,7 +14226,7 @@ msgstr "fehlerhafte Arraykonstante: »%s«"
 
 #: utils/adt/arrayfuncs.c:871 utils/adt/arrayfuncs.c:1473
 #: utils/adt/arrayfuncs.c:2795 utils/adt/arrayfuncs.c:2943
-#: utils/adt/arrayfuncs.c:5030 utils/adt/arrayutils.c:93
+#: utils/adt/arrayfuncs.c:5036 utils/adt/arrayutils.c:93
 #: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
 #, c-format
 msgid "array size exceeds the maximum allowed (%d)"
@@ -14220,7 +14240,7 @@ msgstr "ungültige Array-Flags"
 msgid "wrong element type"
 msgstr "falscher Elementtyp"
 
-#: utils/adt/arrayfuncs.c:1307 utils/cache/lsyscache.c:2467
+#: utils/adt/arrayfuncs.c:1307 utils/cache/lsyscache.c:2485
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "keine binäre Eingabefunktion verfügbar für Typ %s"
@@ -14230,7 +14250,7 @@ msgstr "keine binäre Eingabefunktion verfügbar für Typ %s"
 msgid "improper binary format in array element %d"
 msgstr "falsches Binärformat in Arrayelement %d"
 
-#: utils/adt/arrayfuncs.c:1529 utils/cache/lsyscache.c:2500
+#: utils/adt/arrayfuncs.c:1529 utils/cache/lsyscache.c:2518
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "keine binäre Ausgabefunktion verfügbar für Typ %s"
@@ -14242,8 +14262,8 @@ msgstr ""
 
 #: utils/adt/arrayfuncs.c:2076 utils/adt/arrayfuncs.c:2098
 #: utils/adt/arrayfuncs.c:2132 utils/adt/arrayfuncs.c:2418
-#: utils/adt/arrayfuncs.c:4910 utils/adt/arrayfuncs.c:4942
-#: utils/adt/arrayfuncs.c:4959
+#: utils/adt/arrayfuncs.c:4916 utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4965
 msgid "wrong number of array subscripts"
 msgstr "falsche Anzahl Arrayindizes"
 
@@ -14270,37 +14290,36 @@ msgid "null array element not allowed in this context"
 msgstr "NULL-Werte im Array sind in diesem Zusammenhang nicht erlaubt"
 
 #: utils/adt/arrayfuncs.c:3153 utils/adt/arrayfuncs.c:3361
-#: utils/adt/arrayfuncs.c:3672
+#: utils/adt/arrayfuncs.c:3678
 msgid "cannot compare arrays of different element types"
 msgstr "kann Arrays mit verschiedenen Elementtypen nicht vergleichen"
 
 #: utils/adt/arrayfuncs.c:3563
-#, fuzzy, c-format
+#, c-format
 msgid "could not identify a hash function for type %s"
-msgstr "konnte keine Vergleichsfunktion für Typ %s ermitteln"
+msgstr "konnte keine Hash-Funktion für Typ %s ermitteln"
 
-#: utils/adt/arrayfuncs.c:4808 utils/adt/arrayfuncs.c:4848
-#, fuzzy
+#: utils/adt/arrayfuncs.c:4814 utils/adt/arrayfuncs.c:4854
 msgid "dimension array or low bound array cannot be null"
-msgstr "Dimensions-Array oder Untergrenzen-Array kann nicht NULL sein"
+msgstr "Dimensions-Array oder Untergrenzen-Array darf nicht NULL sein"
 
-#: utils/adt/arrayfuncs.c:4911 utils/adt/arrayfuncs.c:4943
+#: utils/adt/arrayfuncs.c:4917 utils/adt/arrayfuncs.c:4949
 msgid "Dimension array must be one dimensional."
 msgstr "Dimensions-Array muss eindimensional sein."
 
-#: utils/adt/arrayfuncs.c:4916 utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4922 utils/adt/arrayfuncs.c:4954
 msgid "wrong range of array subscripts"
 msgstr "falscher Bereich der Arrayindizes"
 
-#: utils/adt/arrayfuncs.c:4917 utils/adt/arrayfuncs.c:4949
+#: utils/adt/arrayfuncs.c:4923 utils/adt/arrayfuncs.c:4955
 msgid "Lower bound of dimension array must be one."
 msgstr "Untergrenze des Dimensions-Arrays muss eins sein."
 
-#: utils/adt/arrayfuncs.c:4922 utils/adt/arrayfuncs.c:4954
+#: utils/adt/arrayfuncs.c:4928 utils/adt/arrayfuncs.c:4960
 msgid "dimension values cannot be null"
 msgstr "Dimensionswerte dürfen nicht NULL sein"
 
-#: utils/adt/arrayfuncs.c:4960
+#: utils/adt/arrayfuncs.c:4966
 msgid "Low bound array has different size than dimensions array."
 msgstr "Untergrenzen-Array hat andere Größe als Dimensions-Array."
 
@@ -14326,13 +14345,13 @@ msgstr "Kodierungsumwandlung zwischen %s und ASCII wird nicht unterstützt"
 msgid "invalid input syntax for type boolean: \"%s\""
 msgstr "ungültige Eingabesyntax für Typ boolean: »%s«"
 
-#: utils/adt/cash.c:232
+#: utils/adt/cash.c:237
 #, c-format
 msgid "invalid input syntax for type money: \"%s\""
 msgstr "ungültige Eingabesyntax für Typ money: »%s«"
 
-#: utils/adt/cash.c:493 utils/adt/cash.c:543 utils/adt/cash.c:594
-#: utils/adt/cash.c:643 utils/adt/cash.c:695 utils/adt/cash.c:745
+#: utils/adt/cash.c:507 utils/adt/cash.c:557 utils/adt/cash.c:608
+#: utils/adt/cash.c:657 utils/adt/cash.c:709 utils/adt/cash.c:759
 #: utils/adt/float.c:764 utils/adt/float.c:828 utils/adt/float.c:2470
 #: utils/adt/float.c:2533 utils/adt/geo_ops.c:4130 utils/adt/int.c:730
 #: utils/adt/int.c:875 utils/adt/int.c:974 utils/adt/int.c:1063
@@ -14371,6 +14390,10 @@ msgstr "Datum/Zeitwert »current« wird nicht mehr unterstützt"
 msgid "date out of range: \"%s\""
 msgstr "date ist außerhalb des gültigen Bereichs: »%s«"
 
+#: utils/adt/date.c:217 utils/adt/xml.c:1689
+msgid "date out of range"
+msgstr "date ist außerhalb des gültigen Bereichs"
+
 #: utils/adt/date.c:359
 msgid "cannot subtract infinite dates"
 msgstr "kann unendliche date-Werte nicht subtrahieren"
@@ -14379,6 +14402,31 @@ msgstr "kann unendliche date-Werte nicht subtrahieren"
 msgid "date out of range for timestamp"
 msgstr "Datum ist außerhalb des gültigen Bereichs für Typ »timestamp«"
 
+#: utils/adt/date.c:913 utils/adt/date.c:960 utils/adt/date.c:1516
+#: utils/adt/date.c:1553 utils/adt/date.c:2427 utils/adt/formatting.c:3185
+#: utils/adt/formatting.c:3217 utils/adt/formatting.c:3285
+#: utils/adt/nabstime.c:480 utils/adt/nabstime.c:523 utils/adt/nabstime.c:553
+#: utils/adt/nabstime.c:596 utils/adt/timestamp.c:226
+#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
+#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
+#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
+#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
+#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
+#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
+#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
+#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
+#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
+#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
+#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
+#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
+#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
+#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
+#: utils/adt/timestamp.c:4614 utils/adt/xml.c:1712 utils/adt/xml.c:1719
+#: utils/adt/xml.c:1739 utils/adt/xml.c:1746
+msgid "timestamp out of range"
+msgstr "timestamp ist außerhalb des gültigen Bereichs"
+
 #: utils/adt/date.c:986
 msgid "cannot convert reserved abstime value to date"
 msgstr "kann reservierten »abstime«-Wert nicht in »date« umwandeln"
@@ -14500,9 +14548,9 @@ msgid "could not determine actual enum type"
 msgstr "konnte tatsächlichen Enum-Typen nicht bestimmen"
 
 #: utils/adt/enum.c:365 utils/adt/enum.c:394
-#, fuzzy, c-format
+#, c-format
 msgid "enum %s contains no values"
-msgstr "Spalte »%s« enthält NULL-Werte"
+msgstr "Enum %s enthält keine Werte"
 
 #: utils/adt/float.c:54
 msgid "value out of range: overflow"
@@ -14656,25 +14704,22 @@ msgid "\"%s\" is not a number"
 msgstr "»%s« ist keine Zahl"
 
 #: utils/adt/formatting.c:1519 utils/adt/formatting.c:1569
-#, fuzzy
 msgid "could not determine which collation to use for lower() function"
 msgstr ""
-"konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion »%s« nicht "
-"ermitteln"
+"konnte die für die Funktion lower() zu verwendende Sortierfolge nicht "
+"bestimmen"
 
 #: utils/adt/formatting.c:1640 utils/adt/formatting.c:1690
-#, fuzzy
 msgid "could not determine which collation to use for upper() function"
 msgstr ""
-"konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion »%s« nicht "
-"ermitteln"
+"konnte die für die Funktion upper() zu verwendende Sortierfolge nicht "
+"bestimmen"
 
 #: utils/adt/formatting.c:1773 utils/adt/formatting.c:1835
-#, fuzzy
 msgid "could not determine which collation to use for initcap() function"
 msgstr ""
-"konnte den tatsächlichen Rückgabetyp der polymorphischen Funktion »%s« nicht "
-"ermitteln"
+"konnte die für die Funktion initcap() zu verwendende Sortierfolge nicht "
+"bestimmen"
 
 #: utils/adt/formatting.c:2017
 msgid "invalid combination of date conventions"
@@ -14712,7 +14757,7 @@ msgid ""
 "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr ""
 "Wenn die Quellzeichenkette keine feste Breite hat, versuchen Sie den "
-"Modifikator »%s«."
+"Modifikator »FM«."
 
 #: utils/adt/formatting.c:2113 utils/adt/formatting.c:2126
 #: utils/adt/formatting.c:2256
@@ -14774,11 +14819,11 @@ msgstr "inkonsistente Verwendung von Jahr %04d und »BC«"
 msgid "cannot calculate day of year without year information"
 msgstr "kann Tag des Jahres nicht berechnen ohne Jahrinformationen"
 
-#: utils/adt/formatting.c:4380
+#: utils/adt/formatting.c:4384
 msgid "\"EEEE\" not supported for input"
 msgstr "»E« wird nicht bei der Eingabe unterstützt"
 
-#: utils/adt/formatting.c:4392
+#: utils/adt/formatting.c:4396
 msgid "\"RN\" not supported for input"
 msgstr "»RN« wird nicht bei der Eingabe unterstützt"
 
@@ -14967,10 +15012,9 @@ msgstr "bigint ist außerhalb des gültigen Bereichs"
 msgid "OID out of range"
 msgstr "OID ist außerhalb des gültigen Bereichs"
 
-#: utils/adt/like.c:211 utils/adt/selfuncs.c:4852
-#, fuzzy
+#: utils/adt/like.c:211 utils/adt/selfuncs.c:4913
 msgid "could not determine which collation to use for ILIKE"
-msgstr "konnte Eingabedatentypen nicht bestimmen"
+msgstr "konnte die für ILIKE zu verwendende Sortierfolge nicht bestimmen"
 
 #: utils/adt/like_match.c:104 utils/adt/like_match.c:164
 msgid "LIKE pattern must not end with escape character"
@@ -15237,30 +15281,39 @@ msgstr "gewünschtes Zeichen ist zu groß für die Kodierung: %d"
 msgid "null character not permitted"
 msgstr "Null-Zeichen ist nicht erlaubt"
 
-#: utils/adt/pg_locale.c:993 utils/adt/pg_locale.c:1006
-#: utils/adt/pg_locale.c:1012
-#, fuzzy, c-format
+#: utils/adt/pg_locale.c:953
+#, c-format
 msgid "could not create locale \"%s\": %m"
-msgstr "konnte Sperrdatei »%s« nicht erstellen: %m"
+msgstr "konnte Locale »%s« nicht erzeugen: %m"
+
+#: utils/adt/pg_locale.c:956
+#, c-format
+msgid ""
+"The operating system could not find any locale data for the locale name \"%s"
+"\"."
+msgstr ""
+"Das Betriebssystem konnte keine Locale-Daten für den Locale-Namen »%s« "
+"finden."
 
-#: utils/adt/pg_locale.c:1023
-#, fuzzy
+#: utils/adt/pg_locale.c:1043
 msgid ""
 "collations with different collate and ctype values are not supported on this "
 "platform"
-msgstr "Tablespaces werden auf dieser Plattform nicht unterstützt"
+msgstr ""
+"Sortierfolgen mit unterschiedlichen »collate«- und »ctype«-Werten werden auf "
+"dieser Plattform nicht unterstützt"
 
-#: utils/adt/pg_locale.c:1038
-#, fuzzy
+#: utils/adt/pg_locale.c:1058
 msgid "nondefault collations are not supported on this platform"
 msgstr ""
-"%s: symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt"
+"Sortierfolgen außer der Standardsortierfolge werden auf dieser Plattform "
+"nicht unterstützt"
 
-#: utils/adt/pg_locale.c:1209
+#: utils/adt/pg_locale.c:1229
 msgid "invalid multibyte character for locale"
 msgstr "ungültiges Mehrbytezeichen für Locale"
 
-#: utils/adt/pg_locale.c:1210
+#: utils/adt/pg_locale.c:1230
 msgid ""
 "The server's LC_CTYPE locale is probably incompatible with the database "
 "encoding."
@@ -15301,14 +15354,12 @@ msgid "cannot display a value of type language_handler"
 msgstr "kann keinen Wert vom Typ language_handler anzeigen"
 
 #: utils/adt/pseudotypes.c:306
-#, fuzzy
 msgid "cannot accept a value of type fdw_handler"
-msgstr "kann keinen Wert vom Typ language_handler annehmen"
+msgstr "kann keinen Wert vom Typ fdw_handler annehmen"
 
 #: utils/adt/pseudotypes.c:319
-#, fuzzy
 msgid "cannot display a value of type fdw_handler"
-msgstr "kann keinen Wert vom Typ language_handler anzeigen"
+msgstr "kann keinen Wert vom Typ fdw_handler anzeigen"
 
 #: utils/adt/pseudotypes.c:333
 msgid "cannot accept a value of type internal"
@@ -15351,9 +15402,8 @@ msgid "cannot display a value of a shell type"
 msgstr "kann keinen Wert eines Hüllentyps anzeigen"
 
 #: utils/adt/pseudotypes.c:474 utils/adt/pseudotypes.c:498
-#, fuzzy
 msgid "cannot accept a value of type pg_node_tree"
-msgstr "kann keinen Wert vom Typ trigger annehmen"
+msgstr "kann keinen Wert vom Typ pg_node_tree annehmen"
 
 #: utils/adt/regexp.c:275 utils/adt/varlena.c:2866
 #, c-format
@@ -15379,8 +15429,8 @@ msgstr "es gibt mehrere Funktionen namens »%s«"
 msgid "more than one operator named %s"
 msgstr "es gibt mehrere Operatoren namens %s"
 
-#: utils/adt/regproc.c:635 utils/adt/regproc.c:1485 utils/adt/ruleutils.c:5798
-#: utils/adt/ruleutils.c:5853 utils/adt/ruleutils.c:5890
+#: utils/adt/regproc.c:635 utils/adt/regproc.c:1485 utils/adt/ruleutils.c:5858
+#: utils/adt/ruleutils.c:5913 utils/adt/ruleutils.c:5950
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
@@ -15409,41 +15459,41 @@ msgstr "Typname erwartet"
 msgid "improper type name"
 msgstr "falscher Typname"
 
-#: utils/adt/ri_triggers.c:409 utils/adt/ri_triggers.c:2839
-#: utils/adt/ri_triggers.c:3537 utils/adt/ri_triggers.c:3569
+#: utils/adt/ri_triggers.c:409 utils/adt/ri_triggers.c:2841
+#: utils/adt/ri_triggers.c:3535 utils/adt/ri_triggers.c:3567
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 "Einfügen oder Aktualisieren in Tabelle »%s« verletzt Fremdschlüssel-"
 "Constraint »%s«"
 
-#: utils/adt/ri_triggers.c:412 utils/adt/ri_triggers.c:2842
+#: utils/adt/ri_triggers.c:412 utils/adt/ri_triggers.c:2844
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr ""
 "MATCH FULL erlaubt das Mischen von Schlüsseln, die NULL und nicht NULL sind, "
 "nicht"
 
-#: utils/adt/ri_triggers.c:3099
+#: utils/adt/ri_triggers.c:3097
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "Funktion »%s« muss von INSERT ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:3105
+#: utils/adt/ri_triggers.c:3103
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "Funktion »%s« muss von UPDATE ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:3119
+#: utils/adt/ri_triggers.c:3117
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "Funktion »%s« muss von DELETE ausgelöst werden"
 
-#: utils/adt/ri_triggers.c:3148
+#: utils/adt/ri_triggers.c:3146
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "kein »pg_constraint«-Eintrag für Trigger »%s« für Tabelle »%s«"
 
-#: utils/adt/ri_triggers.c:3150
+#: utils/adt/ri_triggers.c:3148
 msgid ""
 "Remove this referential integrity trigger and its mates, then do ALTER TABLE "
 "ADD CONSTRAINT."
@@ -15451,7 +15501,7 @@ msgstr ""
 "Entfernen Sie diesen Referentielle-Integritäts-Trigger und seine Partner und "
 "führen Sie dann ALTER TABLE ADD CONSTRAINT aus."
 
-#: utils/adt/ri_triggers.c:3504
+#: utils/adt/ri_triggers.c:3502
 #, c-format
 msgid ""
 "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
@@ -15460,23 +15510,23 @@ msgstr ""
 "RI-Anfrage in Tabelle »%s« für Constraint »%s« von Tabelle »%s« ergab "
 "unerwartetes Ergebnis"
 
-#: utils/adt/ri_triggers.c:3508
+#: utils/adt/ri_triggers.c:3506
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr ""
 "Das liegt höchstwahrscheinlich daran, dass eine Regel die Anfrage "
 "umgeschrieben hat."
 
-#: utils/adt/ri_triggers.c:3539
+#: utils/adt/ri_triggers.c:3537
 #, c-format
 msgid "No rows were found in \"%s\"."
 msgstr "In »%s« wurden keine Zeilen gefunden."
 
-#: utils/adt/ri_triggers.c:3571
+#: utils/adt/ri_triggers.c:3569
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "Schlüssel (%s)=(%s) ist nicht in Tabelle »%s« vorhanden."
 
-#: utils/adt/ri_triggers.c:3577
+#: utils/adt/ri_triggers.c:3575
 #, c-format
 msgid ""
 "update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
@@ -15485,7 +15535,7 @@ msgstr ""
 "Aktualisieren oder Löschen in Tabelle »%s« verletzt Fremdschlüssel-"
 "Constraint »%s« von Tabelle »%s«"
 
-#: utils/adt/ri_triggers.c:3580
+#: utils/adt/ri_triggers.c:3578
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "Auf Schlüssel (%s)=(%s) wird noch aus Tabelle »%s« verwiesen."
@@ -15547,18 +15597,18 @@ msgid "cannot compare record types with different numbers of columns"
 msgstr ""
 "kann Record-Typen mit unterschiedlicher Anzahl Spalten nicht vergleichen"
 
-#: utils/adt/ruleutils.c:2427
+#: utils/adt/ruleutils.c:2429
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "Regel »%s« hat nicht unterstützten Ereignistyp %d"
 
-#: utils/adt/selfuncs.c:4837 utils/adt/selfuncs.c:5291
+#: utils/adt/selfuncs.c:4898 utils/adt/selfuncs.c:5352
 msgid "case insensitive matching not supported on type bytea"
 msgstr ""
 "Mustersuche ohne Rücksicht auf Groß-/Kleinschreibung wird für Typ bytea "
 "nicht unterstützt"
 
-#: utils/adt/selfuncs.c:4952 utils/adt/selfuncs.c:5451
+#: utils/adt/selfuncs.c:5013 utils/adt/selfuncs.c:5512
 msgid "regular-expression matching not supported on type bytea"
 msgstr ""
 "Mustersuche mit regulären Ausdrücken wird für Typ bytea nicht unterstützt"
@@ -15758,41 +15808,41 @@ msgstr "Wort ist zu lang (%ld Bytes, maximal %ld Bytes)"
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "Zeichenkette ist zu lang für tsvector (%ld Bytes, maximal %ld Bytes)"
 
-#: utils/adt/tsvector_op.c:1149
+#: utils/adt/tsvector_op.c:1173
 msgid "ts_stat query must return one tsvector column"
 msgstr "ts_stat-Anfrage muss eine tsvector-Spalte zurückgeben"
 
-#: utils/adt/tsvector_op.c:1329
+#: utils/adt/tsvector_op.c:1353
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "tsvector-Spalte »%s« existiert nicht"
 
-#: utils/adt/tsvector_op.c:1335
+#: utils/adt/tsvector_op.c:1359
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "Spalte »%s« hat nicht Typ tsvector"
 
-#: utils/adt/tsvector_op.c:1347
+#: utils/adt/tsvector_op.c:1371
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "Konfigurationsspalte »%s« existiert nicht"
 
-#: utils/adt/tsvector_op.c:1353
+#: utils/adt/tsvector_op.c:1377
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "Spalte »%s« hat nicht Typ regconfig"
 
-#: utils/adt/tsvector_op.c:1360
+#: utils/adt/tsvector_op.c:1384
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "Konfigurationsspalte »%s« darf nicht NULL sein"
 
-#: utils/adt/tsvector_op.c:1373
+#: utils/adt/tsvector_op.c:1397
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr "Textsuchekonfigurationsname »%s« muss Schemaqualifikation haben"
 
-#: utils/adt/tsvector_op.c:1398
+#: utils/adt/tsvector_op.c:1422
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "Spalte »%s« hat keinen Zeichentyp"
@@ -15872,79 +15922,202 @@ msgstr ""
 
 #: utils/adt/varbit.c:1731 utils/adt/varbit.c:1789
 #, c-format
-msgid "bit index %d out of valid range (0..%d)"
-msgstr "Bitindex %d ist außerhalb des gültigen Bereichs (0..%d)"
+msgid "bit index %d out of valid range (0..%d)"
+msgstr "Bitindex %d ist außerhalb des gültigen Bereichs (0..%d)"
+
+#: utils/adt/varbit.c:1740 utils/adt/varlena.c:2163
+msgid "new bit must be 0 or 1"
+msgstr "neues Bit muss 0 oder 1 sein"
+
+#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
+#, c-format
+msgid "value too long for type character(%d)"
+msgstr "Wert zu lang für Typ character(%d)"
+
+#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#, c-format
+msgid "value too long for type character varying(%d)"
+msgstr "Wert zu lang für Typ character varying(%d)"
+
+#: utils/adt/varlena.c:1314
+msgid "could not determine which collation to use for string comparison"
+msgstr ""
+"konnte die für den Zeichenkettenvergleich zu verwendende Sortierfolge nicht "
+"bestimmen"
+
+#: utils/adt/varlena.c:1358 utils/adt/varlena.c:1371
+#, c-format
+msgid "could not convert string to UTF-16: error %lu"
+msgstr "konnte Zeichenkette nicht in UTF-16 umwandeln: Fehler %lu"
+
+#: utils/adt/varlena.c:1386
+#, c-format
+msgid "could not compare Unicode strings: %m"
+msgstr "konnte Unicode-Zeichenketten nicht vergleichen: %m"
+
+#: utils/adt/varlena.c:2041 utils/adt/varlena.c:2072 utils/adt/varlena.c:2108
+#: utils/adt/varlena.c:2151
+#, c-format
+msgid "index %d out of valid range, 0..%d"
+msgstr "Index %d ist außerhalb des gültigen Bereichs, 0..%d"
+
+#: utils/adt/varlena.c:2959
+msgid "field position must be greater than zero"
+msgstr "Feldposition muss größer als null sein"
+
+#: utils/adt/varlena.c:3828 utils/adt/varlena.c:3889
+msgid "unterminated conversion specifier"
+msgstr "Konvertierungsspezifikation nicht abgeschlossen"
+
+#: utils/adt/varlena.c:3852 utils/adt/varlena.c:3868
+msgid "argument number is out of range"
+msgstr "Argumentnummer ist außerhalb des zulässigen Bereichs"
+
+#: utils/adt/varlena.c:3895
+msgid "conversion specifies argument 0, but arguments are numbered from 1"
+msgstr ""
+"Konvertierung gibt Argument 0 an, aber die Argumente sind von 1 an nummeriert"
+
+#: utils/adt/varlena.c:3902
+msgid "too few arguments for format"
+msgstr "zu wenige Argumente für Format"
+
+#: utils/adt/varlena.c:3923
+#, c-format
+msgid "unrecognized conversion specifier \"%c\""
+msgstr "unbekannte Konvertierungsspezifikation »%c«"
+
+#: utils/adt/varlena.c:3952
+msgid "null values cannot be formatted as an SQL identifier"
+msgstr "NULL-Werte können nicht als SQL-Bezeichner formatiert werden"
+
+#: utils/adt/windowfuncs.c:243
+msgid "argument of ntile must be greater than zero"
+msgstr "Argument von ntile muss größer als null sein"
+
+#: utils/adt/windowfuncs.c:465
+msgid "argument of nth_value must be greater than zero"
+msgstr "Argument von nth_value muss größer als null sein"
+
+#: utils/adt/xml.c:135
+msgid "unsupported XML feature"
+msgstr "nicht unterstützte XML-Funktionalität"
+
+#: utils/adt/xml.c:136
+msgid "This functionality requires the server to be built with libxml support."
+msgstr ""
+"Diese Funktionalität verlangt, dass der Server mit Libxml-Unterstützung "
+"gebaut wird."
+
+#: utils/adt/xml.c:137
+msgid "You need to rebuild PostgreSQL using --with-libxml."
+msgstr "Sie müssen PostgreSQL mit --with-libxml neu bauen."
+
+#: utils/adt/xml.c:156 utils/mb/mbutils.c:515
+#, c-format
+msgid "invalid encoding name \"%s\""
+msgstr "ungültiger Kodierungsname »%s«"
+
+#: utils/adt/xml.c:402 utils/adt/xml.c:407
+msgid "invalid XML comment"
+msgstr "ungültiger XML-Kommentar"
+
+#: utils/adt/xml.c:536
+msgid "not an XML document"
+msgstr "kein XML-Dokument"
+
+#: utils/adt/xml.c:689 utils/adt/xml.c:712
+msgid "invalid XML processing instruction"
+msgstr "ungültige XML-Verarbeitungsanweisung"
+
+#: utils/adt/xml.c:690
+#, c-format
+msgid "XML processing instruction target name cannot be \"%s\"."
+msgstr "Die Zielangabe der XML-Verarbeitungsanweisung darf nicht »%s« sein."
+
+#: utils/adt/xml.c:713
+msgid "XML processing instruction cannot contain \"?>\"."
+msgstr "XML-Verarbeitungsanweisung darf nicht »?>« enthalten."
+
+#: utils/adt/xml.c:792
+msgid "xmlvalidate is not implemented"
+msgstr "xmlvalidate ist nicht implementiert"
+
+#: utils/adt/xml.c:877
+msgid "could not initialize XML library"
+msgstr "konnte XML-Bibliothek nicht initialisieren"
+
+#: utils/adt/xml.c:878
+#, c-format
+msgid ""
+"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
+msgstr ""
+"libxml2 hat inkompatiblen char-Typ: sizeof(char)=%u, sizeof(xmlChar)=%u."
 
-#: utils/adt/varbit.c:1740 utils/adt/varlena.c:2163
-msgid "new bit must be 0 or 1"
-msgstr "neues Bit muss 0 oder 1 sein"
+#: utils/adt/xml.c:1420
+msgid "Invalid character value."
+msgstr "Ungültiger Zeichenwert."
 
-#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
-#, c-format
-msgid "value too long for type character(%d)"
-msgstr "Wert zu lang für Typ character(%d)"
+#: utils/adt/xml.c:1423
+msgid "Space required."
+msgstr "Leerzeichen benötigt."
 
-#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
-#, c-format
-msgid "value too long for type character varying(%d)"
-msgstr "Wert zu lang für Typ character varying(%d)"
+#: utils/adt/xml.c:1426
+msgid "standalone accepts only 'yes' or 'no'."
+msgstr "standalone akzeptiert nur »yes« oder »no«."
 
-#: utils/adt/varlena.c:1314
-#, fuzzy
-msgid "could not determine which collation to use for string comparison"
-msgstr ""
-"konnte Interpretation des Zeilenvergleichsoperators %s nicht bestimmten"
+#: utils/adt/xml.c:1429
+msgid "Malformed declaration: missing version."
+msgstr "Fehlerhafte Deklaration: Version fehlt."
 
-#: utils/adt/varlena.c:1358 utils/adt/varlena.c:1371
-#, c-format
-msgid "could not convert string to UTF-16: error %lu"
-msgstr "konnte Zeichenkette nicht in UTF-16 umwandeln: Fehler %lu"
+#: utils/adt/xml.c:1432
+msgid "Missing encoding in text declaration."
+msgstr "Fehlende Kodierung in Textdeklaration."
 
-#: utils/adt/varlena.c:1386
-#, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "konnte Unicode-Zeichenketten nicht vergleichen: %m"
+#: utils/adt/xml.c:1435
+msgid "Parsing XML declaration: '?>' expected."
+msgstr "Beim Parsen der XML-Deklaration: »?>« erwartet."
 
-#: utils/adt/varlena.c:2041 utils/adt/varlena.c:2072 utils/adt/varlena.c:2108
-#: utils/adt/varlena.c:2151
+#: utils/adt/xml.c:1438
 #, c-format
-msgid "index %d out of valid range, 0..%d"
-msgstr "Index %d ist außerhalb des gültigen Bereichs, 0..%d"
-
-#: utils/adt/varlena.c:2959
-msgid "field position must be greater than zero"
-msgstr "Feldposition muss größer als null sein"
+msgid "Unrecognized libxml error code: %d."
+msgstr "Unbekannter Libxml-Fehlercode: %d."
 
-#: utils/adt/varlena.c:3816 utils/adt/varlena.c:3862
-#, fuzzy
-msgid "unterminated conversion specifier"
-msgstr "Bezeichner in Anführungszeichen nicht abgeschlossen"
+#: utils/adt/xml.c:1690
+msgid "XML does not support infinite date values."
+msgstr "XML unterstützt keine unendlichen Datumswerte."
 
-#: utils/adt/varlena.c:3868
-msgid "conversion specifies argument 0, but arguments are numbered from 1"
-msgstr ""
+#: utils/adt/xml.c:1713 utils/adt/xml.c:1740
+msgid "XML does not support infinite timestamp values."
+msgstr "XML unterstützt keine unendlichen timestamp-Werte."
 
-#: utils/adt/varlena.c:3875
-#, fuzzy
-msgid "too few arguments for format conversion"
-msgstr "zu wenige Argumente auf Zeile %d"
+#: utils/adt/xml.c:2125
+msgid "invalid query"
+msgstr "ungültige Anfrage"
 
-#: utils/adt/varlena.c:3896
-#, fuzzy, c-format
-msgid "unrecognized conversion specifier: %c"
-msgstr "unbekannter Constraint-Typ: %c\n"
+#: utils/adt/xml.c:3349
+msgid "invalid array for XML namespace mapping"
+msgstr "ungültiges Array for XML-Namensraumabbildung"
 
-#: utils/adt/varlena.c:3925
-msgid "NULL cannot be escaped as an SQL identifier"
+#: utils/adt/xml.c:3350
+msgid ""
+"The array must be two-dimensional with length of the second axis equal to 2."
 msgstr ""
+"Das Array muss zweidimensional sein und die Länge der zweiten Achse muss "
+"gleich 2 sein."
 
-#: utils/adt/windowfuncs.c:243
-msgid "argument of ntile must be greater than zero"
-msgstr "Argument von ntile muss größer als null sein"
+#: utils/adt/xml.c:3374
+msgid "empty XPath expression"
+msgstr "leerer XPath-Ausdruck"
 
-#: utils/adt/windowfuncs.c:465
-msgid "argument of nth_value must be greater than zero"
-msgstr "Argument von nth_value muss größer als null sein"
+#: utils/adt/xml.c:3422
+msgid "neither namespace name nor URI may be null"
+msgstr "weder Namensraumname noch URI dürfen NULL sein"
+
+#: utils/adt/xml.c:3429
+#, c-format
+msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
+msgstr "konnte XML-Namensraum mit Namen »%s« und URI »%s« nicht registrieren"
 
 #: utils/sort/logtape.c:213
 #, c-format
@@ -15970,27 +16143,18 @@ msgstr "konnte Unique Index »%s« nicht erstellen"
 msgid "Key %s is duplicated."
 msgstr "Schlüssel %s ist doppelt vorhanden."
 
-#: utils/cache/typcache.c:409
-#, c-format
-msgid "type %s is not composite"
-msgstr "Typ %s ist kein zusammengesetzter Typ"
-
-#: utils/cache/typcache.c:423
-msgid "record type has not been registered"
-msgstr "Record-Typ wurde nicht registriert"
-
-#: utils/cache/lsyscache.c:2396 utils/cache/lsyscache.c:2429
-#: utils/cache/lsyscache.c:2462 utils/cache/lsyscache.c:2495
+#: utils/cache/lsyscache.c:2414 utils/cache/lsyscache.c:2447
+#: utils/cache/lsyscache.c:2480 utils/cache/lsyscache.c:2513
 #, c-format
 msgid "type %s is only a shell"
 msgstr "Typ %s ist nur eine Hülle"
 
-#: utils/cache/lsyscache.c:2401
+#: utils/cache/lsyscache.c:2419
 #, c-format
 msgid "no input function available for type %s"
 msgstr "keine Eingabefunktion verfügbar für Typ %s"
 
-#: utils/cache/lsyscache.c:2434
+#: utils/cache/lsyscache.c:2452
 #, c-format
 msgid "no output function available for type %s"
 msgstr "keine Ausgabefunktion verfügbar für Typ %s"
@@ -15999,16 +16163,21 @@ msgstr "keine Ausgabefunktion verfügbar für Typ %s"
 msgid "cached plan must not change result type"
 msgstr "gecachter Plan darf den Ergebnistyp nicht ändern"
 
-#: utils/cache/relcache.c:4274
+#: utils/cache/relcache.c:4285
 #, c-format
 msgid "could not create relation-cache initialization file \"%s\": %m"
 msgstr ""
 "konnte Initialisierungsdatei für Relationscache »%s« nicht erzeugen: %m"
 
-#: utils/cache/relcache.c:4276
+#: utils/cache/relcache.c:4287
 msgid "Continuing anyway, but there's something wrong."
 msgstr "Setze trotzdem fort, aber irgendwas stimmt nicht."
 
+#: utils/cache/relcache.c:4501
+#, c-format
+msgid "could not remove cache file \"%s\": %m"
+msgstr "konnte Cache-Datei »%s« nicht löschen: %m"
+
 #: utils/cache/relmapper.c:454
 msgid "cannot PREPARE a transaction that modified relation mapping"
 msgstr ""
@@ -16050,6 +16219,15 @@ msgstr "konnte Relation-Mapping-Datei »%s« nicht fsyncen: %m"
 msgid "could not close relation mapping file \"%s\": %m"
 msgstr "konnte Relation-Mapping-Datei »%s« nicht schließen: %m"
 
+#: utils/cache/typcache.c:629
+#, c-format
+msgid "type %s is not composite"
+msgstr "Typ %s ist kein zusammengesetzter Typ"
+
+#: utils/cache/typcache.c:643
+msgid "record type has not been registered"
+msgstr "Record-Typ wurde nicht registriert"
+
 #: utils/mmgr/aset.c:417
 #, c-format
 msgid "Failed while creating memory context \"%s\"."
@@ -16176,314 +16354,137 @@ msgstr "interne Funktion »%s« ist nicht in der internen Suchtabelle"
 #: utils/fmgr/fmgr.c:474
 #, c-format
 msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "Info-Funktion »%2$s« berichtete unbekannte API-Version %1$d"
-
-#: utils/fmgr/fmgr.c:845 utils/fmgr/fmgr.c:2106
-#, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr "Funktion %u hat zu viele Argumente (%d, Maximum ist %d)"
-
-#: utils/fmgr/funcapi.c:354
-#, c-format
-msgid ""
-"could not determine actual result type for function \"%s\" declared to "
-"return type %s"
-msgstr ""
-"konnte tatsächlichen Ergebnistyp von Funktion »%s« mit deklarierten "
-"Rückgabetyp %s nicht bestimmen"
-
-#: utils/fmgr/funcapi.c:1208 utils/fmgr/funcapi.c:1239
-msgid "number of aliases does not match number of columns"
-msgstr "Anzahl der Aliasnamen stimmt nicht mit der Anzahl der Spalten überein"
-
-#: utils/fmgr/funcapi.c:1233
-msgid "no column alias was provided"
-msgstr "Spaltenalias fehlt"
-
-#: utils/fmgr/funcapi.c:1257
-msgid "could not determine row description for function returning record"
-msgstr ""
-"konnte Zeilenbeschreibung für Funktion, die »record« zurückgibt, nicht "
-"ermitteln"
-
-#: utils/init/miscinit.c:115
-#, c-format
-msgid "could not change directory to \"%s\": %m"
-msgstr "konnte nicht in Verzeichnis »%s« wechseln: %m"
-
-#: utils/init/miscinit.c:381 utils/misc/guc.c:5255
-#, c-format
-msgid "cannot set parameter \"%s\" within security-restricted operation"
-msgstr ""
-"kann Parameter »%s« nicht in einer sicherheitsbeschränkten Operation setzen"
-
-#: utils/init/miscinit.c:460
-#, c-format
-msgid "role \"%s\" is not permitted to log in"
-msgstr "Rolle »%s« hat keine Berechtigung zum Einloggen"
-
-#: utils/init/miscinit.c:478
-#, c-format
-msgid "too many connections for role \"%s\""
-msgstr "zu viele Verbindungen von Rolle »%s«"
-
-#: utils/init/miscinit.c:538
-msgid "permission denied to set session authorization"
-msgstr "keine Berechtigung, um Sitzungsauthorisierung zu setzen"
-
-#: utils/init/miscinit.c:618
-#, c-format
-msgid "invalid role OID: %u"
-msgstr "ungültige Rollen-OID: %u"
-
-#: utils/init/miscinit.c:750
-#, c-format
-msgid "could not create lock file \"%s\": %m"
-msgstr "konnte Sperrdatei »%s« nicht erstellen: %m"
-
-#: utils/init/miscinit.c:764
-#, c-format
-msgid "could not open lock file \"%s\": %m"
-msgstr "konnte Sperrdatei »%s« nicht öffnen: %m"
-
-#: utils/init/miscinit.c:770
-#, c-format
-msgid "could not read lock file \"%s\": %m"
-msgstr "konnte Sperrdatei »%s« nicht lesen: %m"
-
-#: utils/init/miscinit.c:818
-#, c-format
-msgid "lock file \"%s\" already exists"
-msgstr "Sperrdatei »%s« existiert bereits"
-
-#: utils/init/miscinit.c:822
-#, c-format
-msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
-msgstr ""
-"Läuft bereits ein anderer postgres-Prozess (PID %d) im Datenverzeichnis »%s«?"
-
-#: utils/init/miscinit.c:824
-#, c-format
-msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
-msgstr ""
-"Läuft bereits ein anderer postmaster-Prozess (PID %d) im Datenverzeichnis "
-"»%s«?"
-
-#: utils/init/miscinit.c:827
-#, c-format
-msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr ""
-"Verwendet bereits ein anderer postgres-Prozess (PID %d) die Socketdatei »%s«?"
-
-#: utils/init/miscinit.c:829
-#, c-format
-msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr ""
-"Verwendet bereits ein anderer postmaster-Prozess (PID %d) die Socketdatei "
-"»%s«?"
-
-#: utils/init/miscinit.c:865
-#, c-format
-msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
-msgstr ""
-"bereits bestehender Shared-Memory-Block (Schlüssel %lu, ID %lu) wird noch "
-"benutzt"
-
-#: utils/init/miscinit.c:868
-#, c-format
-msgid ""
-"If you're sure there are no old server processes still running, remove the "
-"shared memory block or just delete the file \"%s\"."
-msgstr ""
-"Wenn Sie sich sicher sind, dass kein alter Serverprozess mehr läuft, "
-"entfernen Sie den Shared-Memory-Block oder löschen Sie einfach die Datei "
-"»%s«."
-
-#: utils/init/miscinit.c:884
-#, c-format
-msgid "could not remove old lock file \"%s\": %m"
-msgstr "konnte alte Sperrdatei »%s« nicht löschen: %m"
-
-#: utils/init/miscinit.c:886
-msgid ""
-"The file seems accidentally left over, but it could not be removed. Please "
-"remove the file by hand and try again."
-msgstr ""
-"Die Datei ist anscheinend aus Versehen übrig geblieben, konnte aber nicht "
-"gelöscht werden. Bitte entfernen Sie die Datei von Hand und versuchen Sie es "
-"erneut."
-
-#: utils/init/miscinit.c:920 utils/init/miscinit.c:931
-#: utils/init/miscinit.c:941
-#, c-format
-msgid "could not write lock file \"%s\": %m"
-msgstr "konnte Sperrdatei »%s« nicht schreiben: %m"
-
-#: utils/init/miscinit.c:1048 utils/misc/guc.c:7507
-#, c-format
-msgid "could not read from file \"%s\": %m"
-msgstr "konnte nicht aus Datei »%s« lesen: %m"
-
-#: utils/init/miscinit.c:1147 utils/init/miscinit.c:1160
-#, c-format
-msgid "\"%s\" is not a valid data directory"
-msgstr "»%s« ist kein gültiges Datenverzeichnis"
-
-#: utils/init/miscinit.c:1149
-#, c-format
-msgid "File \"%s\" is missing."
-msgstr "Die Datei »%s« fehlt."
-
-#: utils/init/miscinit.c:1162
-#, c-format
-msgid "File \"%s\" does not contain valid data."
-msgstr "Die Datei »%s« enthält keine gültigen Daten."
+msgstr "Info-Funktion »%2$s« berichtete unbekannte API-Version %1$d"
 
-#: utils/init/miscinit.c:1164
-msgid "You might need to initdb."
-msgstr "Sie müssen möglicherweise initdb ausführen."
+#: utils/fmgr/fmgr.c:845 utils/fmgr/fmgr.c:2106
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr "Funktion %u hat zu viele Argumente (%d, Maximum ist %d)"
 
-#: utils/init/miscinit.c:1172
+#: utils/fmgr/funcapi.c:354
 #, c-format
 msgid ""
-"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
-"not compatible with this version %s."
+"could not determine actual result type for function \"%s\" declared to "
+"return type %s"
 msgstr ""
-"Das Datenverzeichnis wurde von PostgreSQL Version %ld.%ld initialisiert, "
-"welche nicht mit dieser Version %s kompatibel ist."
+"konnte tatsächlichen Ergebnistyp von Funktion »%s« mit deklarierten "
+"Rückgabetyp %s nicht bestimmen"
 
-#: utils/init/miscinit.c:1220
-#, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "ungültige Listensyntax für Parameter »%s«"
+#: utils/fmgr/funcapi.c:1208 utils/fmgr/funcapi.c:1239
+msgid "number of aliases does not match number of columns"
+msgstr "Anzahl der Aliasnamen stimmt nicht mit der Anzahl der Spalten überein"
 
-#: utils/init/miscinit.c:1257
-#, c-format
-msgid "loaded library \"%s\""
-msgstr "Bibliothek »%s« geladen"
+#: utils/fmgr/funcapi.c:1233
+msgid "no column alias was provided"
+msgstr "Spaltenalias fehlt"
 
-#: utils/init/postinit.c:225
-#, fuzzy, c-format
-msgid "replication connection authorized: user=%s"
-msgstr "Replikationsverbindung authorisiert: Benutzer=%s Host=%s"
+#: utils/fmgr/funcapi.c:1257
+msgid "could not determine row description for function returning record"
+msgstr ""
+"konnte Zeilenbeschreibung für Funktion, die »record« zurückgibt, nicht "
+"ermitteln"
 
-#: utils/init/postinit.c:229
-#, c-format
-msgid "connection authorized: user=%s database=%s"
-msgstr "Verbindung authorisiert: Benutzer=%s Datenbank=%s"
+#: utils/error/assert.c:37
+msgid "TRAP: ExceptionalCondition: bad arguments\n"
+msgstr "TRAP: ExceptionalCondition: fehlerhafte Argumente\n"
 
-#: utils/init/postinit.c:260
+#: utils/error/assert.c:40
 #, c-format
-msgid "database \"%s\" has disappeared from pg_database"
-msgstr "Datenbank »%s« ist aus pg_database verschwunden"
+msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
+msgstr "TRAP: %s(»%s«, Datei: »%s«, Zeile: %d)\n"
 
-#: utils/init/postinit.c:262
+#: utils/error/elog.c:1525
 #, c-format
-msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "Datenbank-OID %u gehört jetzt anscheinend zu »%s«."
+msgid "could not reopen file \"%s\" as stderr: %m"
+msgstr "konnte Datei »%s« nicht als stderr neu öffnen: %m"
 
-#: utils/init/postinit.c:282
+#: utils/error/elog.c:1538
 #, c-format
-msgid "database \"%s\" is not currently accepting connections"
-msgstr "Datenbank »%s« akzeptiert gegenwärtig keine Verbindungen"
+msgid "could not reopen file \"%s\" as stdout: %m"
+msgstr "konnte Datei »%s« nicht als stdou neu öffnen: %m"
 
-#: utils/init/postinit.c:295
-#, c-format
-msgid "permission denied for database \"%s\""
-msgstr "keine Berechtigung für Datenbank »%s«"
+#: utils/error/elog.c:1928 utils/error/elog.c:1938 utils/error/elog.c:1948
+msgid "[unknown]"
+msgstr "[unbekannt]"
 
-#: utils/init/postinit.c:296
-msgid "User does not have CONNECT privilege."
-msgstr "Benutzer hat das CONNECT-Privileg nicht."
+#: utils/error/elog.c:2299 utils/error/elog.c:2579 utils/error/elog.c:2657
+msgid "missing error text"
+msgstr "fehlender Fehlertext"
 
-#: utils/init/postinit.c:313
+#: utils/error/elog.c:2302 utils/error/elog.c:2305 utils/error/elog.c:2660
+#: utils/error/elog.c:2663
 #, c-format
-msgid "too many connections for database \"%s\""
-msgstr "zu viele Verbindungen für Datenbank »%s«"
+msgid " at character %d"
+msgstr " bei Zeichen %d"
 
-#: utils/init/postinit.c:335 utils/init/postinit.c:342
-msgid "database locale is incompatible with operating system"
-msgstr "Datenbank-Locale ist inkompatibel mit Betriebssystem"
+#: utils/error/elog.c:2315 utils/error/elog.c:2322
+msgid "DETAIL:  "
+msgstr "DETAIL:  "
 
-#: utils/init/postinit.c:336
-#, c-format
-msgid ""
-"The database was initialized with LC_COLLATE \"%s\",  which is not "
-"recognized by setlocale()."
-msgstr ""
-"Die Datenbank wurde mit LC_COLLATE »%s« initialisiert, was von setlocale() "
-"nicht erkannt wird."
+#: utils/error/elog.c:2329
+msgid "HINT:  "
+msgstr "TIPP:  "
 
-#: utils/init/postinit.c:338 utils/init/postinit.c:345
-msgid ""
-"Recreate the database with another locale or install the missing locale."
-msgstr ""
-"Erzeugen Sie die Datenbank neu mit einer anderen Locale oder installieren "
-"Sie die fehlende Locale."
+#: utils/error/elog.c:2336
+msgid "QUERY:  "
+msgstr "ANFRAGE:  "
 
-#: utils/init/postinit.c:343
-#, c-format
-msgid ""
-"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
-"by setlocale()."
-msgstr ""
-"Die Datenbank wurde mit LC_CTYPE »%s« initialisiert, was von setlocale() "
-"nicht erkannt wird."
+#: utils/error/elog.c:2343
+msgid "CONTEXT:  "
+msgstr "ZUSAMMENHANG:  "
 
-#: utils/init/postinit.c:597
-msgid "no roles are defined in this database system"
-msgstr "in diesem Datenbanksystem sind keine Rollen definiert"
+#: utils/error/elog.c:2353
+#, c-format
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "ORT:  %s, %s:%d\n"
 
-#: utils/init/postinit.c:598
+#: utils/error/elog.c:2360
 #, c-format
-msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
-msgstr "Sie sollten sofort CREATE USER \"%s\" SUPERUSER; ausführen."
+msgid "LOCATION:  %s:%d\n"
+msgstr "ORT:  %s:%d\n"
 
-#: utils/init/postinit.c:621
-msgid "new replication connections are not allowed during database shutdown"
-msgstr ""
-"während des Herunterfahrens der Datenbank sind keine neuen "
-"Replikationsverbindungen erlaubt"
+#: utils/error/elog.c:2374
+msgid "STATEMENT:  "
+msgstr "ANWEISUNG:  "
 
-#: utils/init/postinit.c:625
-msgid "must be superuser to connect during database shutdown"
-msgstr ""
-"nur Superuser können während des Herunterfahrens der Datenbank verbinden"
+#. translator: This string will be truncated at 47
+#. characters expanded.
+#: utils/error/elog.c:2772
+#, c-format
+msgid "operating system error %d"
+msgstr "Betriebssystemfehler %d"
 
-#: utils/init/postinit.c:635
-msgid "must be superuser to connect in binary upgrade mode"
-msgstr "nur Superuser können im Binary-Upgrade-Modus verbinden"
+#: utils/error/elog.c:2795
+msgid "DEBUG"
+msgstr "DEBUG"
 
-#: utils/init/postinit.c:649
-msgid ""
-"remaining connection slots are reserved for non-replication superuser "
-"connections"
-msgstr ""
-"die verbleibenden Verbindungen sind für Superuser auf Nicht-"
-"Replikationsverbindungen reserviert"
+#: utils/error/elog.c:2799
+msgid "LOG"
+msgstr "LOG"
 
-#: utils/init/postinit.c:664
-msgid "must be replication role to start walsender"
-msgstr "nur Replikationsrollen können WAL-Sender starten"
+#: utils/error/elog.c:2802
+msgid "INFO"
+msgstr "INFO"
 
-#: utils/init/postinit.c:724
-#, c-format
-msgid "database %u does not exist"
-msgstr "Datenbank %u existiert nicht"
+#: utils/error/elog.c:2805
+msgid "NOTICE"
+msgstr "HINWEIS"
 
-#: utils/init/postinit.c:776
-msgid "It seems to have just been dropped or renamed."
-msgstr "Sie wurde anscheinend gerade gelöscht oder umbenannt."
+#: utils/error/elog.c:2808
+msgid "WARNING"
+msgstr "WARNUNG"
 
-#: utils/init/postinit.c:794
-#, c-format
-msgid "The database subdirectory \"%s\" is missing."
-msgstr "Das Datenbankunterverzeichnis »%s« fehlt."
+#: utils/error/elog.c:2811
+msgid "ERROR"
+msgstr "FEHLER"
 
-#: utils/init/postinit.c:799
-#, c-format
-msgid "could not access directory \"%s\": %m"
-msgstr "konnte nicht auf Verzeichnis »%s« zugreifen: %m"
+#: utils/error/elog.c:2814
+msgid "FATAL"
+msgstr "FATAL"
+
+#: utils/error/elog.c:2817
+msgid "PANIC"
+msgstr "PANIK"
 
 #: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
 #: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
@@ -16497,139 +16498,55 @@ msgstr "unerwartete Kodierungs-ID %d für ISO-8859-Zeichensatz"
 msgid "unexpected encoding ID %d for WIN character sets"
 msgstr "unerwartete Kodierungs-ID %d für WIN-Zeichensatz"
 
-#: utils/mb/conv.c:509
-#, c-format
-msgid "invalid encoding number: %d"
-msgstr "ungültige Kodierungsnummer: %d"
-
 #: utils/mb/encnames.c:485
 msgid "encoding name too long"
 msgstr "Kodierungsname zu lang"
 
 #: utils/mb/mbutils.c:281
-#, c-format
-msgid "conversion between %s and %s is not supported"
-msgstr "Umwandlung zwischen %s und %s wird nicht unterstützt"
-
-#: utils/mb/mbutils.c:351
-#, c-format
-msgid ""
-"default conversion function for encoding \"%s\" to \"%s\" does not exist"
-msgstr "Standardumwandlung von Kodierung »%s« nach »%s« existiert nicht"
-
-#: utils/mb/mbutils.c:375 utils/mb/mbutils.c:676
-#, c-format
-msgid "String of %d bytes is too long for encoding conversion."
-msgstr "Zeichenkette mit %d Bytes ist zu lang für Kodierungsumwandlung."
-
-#: utils/mb/mbutils.c:462
-#, c-format
-msgid "invalid source encoding name \"%s\""
-msgstr "ungültiger Quellkodierungsname »%s«"
-
-#: utils/mb/mbutils.c:467
-#, c-format
-msgid "invalid destination encoding name \"%s\""
-msgstr "ungültiger Zielkodierungsname »%s«"
-
-#: utils/mb/mbutils.c:589
-#, c-format
-msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "ungültiger Byte-Wert für Kodierung »%s«: 0x%02x"
-
-#: utils/mb/wchar.c:1611
-#, c-format
-msgid "invalid byte sequence for encoding \"%s\": 0x%s"
-msgstr "ungültige Byte-Sequenz für Kodierung »%s«: 0x%s"
-
-#: utils/mb/wchar.c:1640
-#, c-format
-msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
-msgstr "Zeichen 0x%s in Kodierung »%s« hat keine Entsprechung in »%s«"
-
-#: utils/misc/tzparser.c:61
-#, c-format
-msgid ""
-"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
-"zone file \"%s\", line %d"
-msgstr ""
-"Zeitzonenabkürzung »%s« ist zu lang (maximal %d Zeichen) in Zeitzonendatei "
-"»%s«, Zeile %d"
-
-#: utils/misc/tzparser.c:68
-#, c-format
-msgid ""
-"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
-"\"%s\", line %d"
-msgstr ""
-"Zeitzonenabstand %d ist kein Vielfaches von 900 s (15 min) in Zeitzonendatei "
-"»%s«, Zeile %d"
-
-#: utils/misc/tzparser.c:80
-#, c-format
-msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
-msgstr ""
-"Zeitzonenabstand %d ist außerhalb des gültigen Bereichs in Zeitzonendatei "
-"»%s«, Zeile %d"
-
-#: utils/misc/tzparser.c:115
-#, c-format
-msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr "fehlende Zeitzonenabkürzung in Zeitzonendatei »%s«, Zeile %d"
-
-#: utils/misc/tzparser.c:124
-#, c-format
-msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr "fehlender Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
-
-#: utils/misc/tzparser.c:131
-#, c-format
-msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
-msgstr "ungültige Zahl für Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
+#, c-format
+msgid "conversion between %s and %s is not supported"
+msgstr "Umwandlung zwischen %s und %s wird nicht unterstützt"
 
-#: utils/misc/tzparser.c:154
+#: utils/mb/mbutils.c:351
 #, c-format
-msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "ungültige Syntax in Zeitzonendatei »%s«, Zeile %d"
+msgid ""
+"default conversion function for encoding \"%s\" to \"%s\" does not exist"
+msgstr "Standardumwandlung von Kodierung »%s« nach »%s« existiert nicht"
 
-#: utils/misc/tzparser.c:218
+#: utils/mb/mbutils.c:375 utils/mb/mbutils.c:676
 #, c-format
-msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "Zeitzonenabkürzung »%s« ist mehrfach definiert"
+msgid "String of %d bytes is too long for encoding conversion."
+msgstr "Zeichenkette mit %d Bytes ist zu lang für Kodierungsumwandlung."
 
-#: utils/misc/tzparser.c:220
+#: utils/mb/mbutils.c:462
 #, c-format
-msgid ""
-"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
-"\", line %d."
-msgstr ""
-"Eintrag in Zeitzonendatei »%s«, Zeile %d, steht im Konflikt mit Eintrag in "
-"Datei »%s«, Zeile %d."
+msgid "invalid source encoding name \"%s\""
+msgstr "ungültiger Quellkodierungsname »%s«"
 
-#: utils/misc/tzparser.c:285
+#: utils/mb/mbutils.c:467
 #, c-format
-msgid "invalid time zone file name \"%s\""
-msgstr "ungültiger Zeitzonen-Dateiname »%s«"
+msgid "invalid destination encoding name \"%s\""
+msgstr "ungültiger Zielkodierungsname »%s«"
 
-#: utils/misc/tzparser.c:298
+#: utils/mb/mbutils.c:589
 #, c-format
-msgid "time zone file recursion limit exceeded in file \"%s\""
-msgstr "Rekursionsbeschränkung für Zeitzonendatei überschritten in Datei »%s«"
+msgid "invalid byte value for encoding \"%s\": 0x%02x"
+msgstr "ungültiger Byte-Wert für Kodierung »%s«: 0x%02x"
 
-#: utils/misc/tzparser.c:337 utils/misc/tzparser.c:350
+#: utils/mb/wchar.c:1611
 #, c-format
-msgid "could not read time zone file \"%s\": %m"
-msgstr "konnte Zeitzonendatei »%s« nicht lesen: %m"
+msgid "invalid byte sequence for encoding \"%s\": 0x%s"
+msgstr "ungültige Byte-Sequenz für Kodierung »%s«: 0x%s"
 
-#: utils/misc/tzparser.c:360
+#: utils/mb/wchar.c:1640
 #, c-format
-msgid "line is too long in time zone file \"%s\", line %d"
-msgstr "Zeile ist zu lang in Zeitzonendatei »%s«, Zeile %d"
+msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
+msgstr "Zeichen 0x%s in Kodierung »%s« hat keine Entsprechung in »%s«"
 
-#: utils/misc/tzparser.c:383
+#: utils/mb/conv.c:509
 #, c-format
-msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr "@INCLUDE ohne Dateiname in Zeitzonendatei »%s«, Zeile %d"
+msgid "invalid encoding number: %d"
+msgstr "ungültige Kodierungsnummer: %d"
 
 #: utils/misc/guc.c:525
 msgid "Ungrouped"
@@ -16692,179 +16609,183 @@ msgid "Write-Ahead Log / Archiving"
 msgstr "Write-Ahead-Log / Archivierung"
 
 #: utils/misc/guc.c:555
-msgid "Write-Ahead Log / Streaming Replication"
-msgstr "Write-Ahead-Log / Streaming-Replikation"
+msgid "Replication"
+msgstr "Replikation"
 
 #: utils/misc/guc.c:557
-msgid "Write-Ahead Log / Standby Servers"
-msgstr "Write-Ahead-Log / Standby-Server"
+msgid "Replication / Master Server"
+msgstr "Replikation / Master-Server"
 
 #: utils/misc/guc.c:559
+msgid "Replication / Standby Servers"
+msgstr "Replikation / Standby-Server"
+
+#: utils/misc/guc.c:561
 msgid "Query Tuning"
 msgstr "Anfragetuning"
 
-#: utils/misc/guc.c:561
+#: utils/misc/guc.c:563
 msgid "Query Tuning / Planner Method Configuration"
 msgstr "Anfragetuning / Planermethoden"
 
-#: utils/misc/guc.c:563
+#: utils/misc/guc.c:565
 msgid "Query Tuning / Planner Cost Constants"
 msgstr "Anfragetuning / Planerkosten"
 
-#: utils/misc/guc.c:565
+#: utils/misc/guc.c:567
 msgid "Query Tuning / Genetic Query Optimizer"
 msgstr "Anfragetuning / Genetischer Anfrageoptimierer"
 
-#: utils/misc/guc.c:567
+#: utils/misc/guc.c:569
 msgid "Query Tuning / Other Planner Options"
 msgstr "Anfragetuning / Andere Planeroptionen"
 
-#: utils/misc/guc.c:569
+#: utils/misc/guc.c:571
 msgid "Reporting and Logging"
 msgstr "Berichte und Logging"
 
-#: utils/misc/guc.c:571
+#: utils/misc/guc.c:573
 msgid "Reporting and Logging / Where to Log"
 msgstr "Berichte und Logging / Wohin geloggt wird"
 
-#: utils/misc/guc.c:573
+#: utils/misc/guc.c:575
 msgid "Reporting and Logging / When to Log"
 msgstr "Berichte und Logging / Wann geloggt wird"
 
-#: utils/misc/guc.c:575
+#: utils/misc/guc.c:577
 msgid "Reporting and Logging / What to Log"
 msgstr "Berichte und Logging / Was geloggt wird"
 
-#: utils/misc/guc.c:577
+#: utils/misc/guc.c:579
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: utils/misc/guc.c:579
+#: utils/misc/guc.c:581
 msgid "Statistics / Monitoring"
 msgstr "Statistiken / Ãœberwachung"
 
-#: utils/misc/guc.c:581
+#: utils/misc/guc.c:583
 msgid "Statistics / Query and Index Statistics Collector"
 msgstr "Statistiken / Statistiksammler für Anfragen und Indexe"
 
-#: utils/misc/guc.c:583
+#: utils/misc/guc.c:585
 msgid "Autovacuum"
 msgstr "Autovacuum"
 
-#: utils/misc/guc.c:585
+#: utils/misc/guc.c:587
 msgid "Client Connection Defaults"
 msgstr "Standardeinstellungen für Clientverbindungen"
 
-#: utils/misc/guc.c:587
+#: utils/misc/guc.c:589
 msgid "Client Connection Defaults / Statement Behavior"
 msgstr "Standardeinstellungen für Clientverbindungen / Anweisungsverhalten"
 
-#: utils/misc/guc.c:589
+#: utils/misc/guc.c:591
 msgid "Client Connection Defaults / Locale and Formatting"
 msgstr "Standardeinstellungen für Clientverbindungen / Locale und Formatierung"
 
-#: utils/misc/guc.c:591
+#: utils/misc/guc.c:593
 msgid "Client Connection Defaults / Other Defaults"
 msgstr "Standardeinstellungen für Clientverbindungen / Andere"
 
-#: utils/misc/guc.c:593
+#: utils/misc/guc.c:595
 msgid "Lock Management"
 msgstr "Sperrenverwaltung"
 
-#: utils/misc/guc.c:595
+#: utils/misc/guc.c:597
 msgid "Version and Platform Compatibility"
 msgstr "Versions- und Plattformkompatibilität"
 
-#: utils/misc/guc.c:597
+#: utils/misc/guc.c:599
 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
 msgstr "Versions- und Plattformkompatibilität / Frühere PostgreSQL-Versionen"
 
-#: utils/misc/guc.c:599
+#: utils/misc/guc.c:601
 msgid "Version and Platform Compatibility / Other Platforms and Clients"
 msgstr "Versions- und Plattformkompatibilität / Andere Plattformen und Clients"
 
-#: utils/misc/guc.c:601
+#: utils/misc/guc.c:603
 msgid "Error Handling"
 msgstr "Fehlerbehandlung"
 
-#: utils/misc/guc.c:603
+#: utils/misc/guc.c:605
 msgid "Preset Options"
 msgstr "Voreingestellte Optionen"
 
-#: utils/misc/guc.c:605
+#: utils/misc/guc.c:607
 msgid "Customized Options"
 msgstr "Angepasste Optionen"
 
-#: utils/misc/guc.c:607
+#: utils/misc/guc.c:609
 msgid "Developer Options"
 msgstr "Entwickleroptionen"
 
-#: utils/misc/guc.c:661
+#: utils/misc/guc.c:663
 msgid "Enables the planner's use of sequential-scan plans."
 msgstr "Ermöglicht sequenzielle Scans in Planer."
 
-#: utils/misc/guc.c:670
+#: utils/misc/guc.c:672
 msgid "Enables the planner's use of index-scan plans."
 msgstr "Ermöglicht Index-Scans im Planer."
 
-#: utils/misc/guc.c:679
+#: utils/misc/guc.c:681
 msgid "Enables the planner's use of bitmap-scan plans."
 msgstr "Ermöglicht Bitmap-Scans im Planer."
 
-#: utils/misc/guc.c:688
+#: utils/misc/guc.c:690
 msgid "Enables the planner's use of TID scan plans."
 msgstr "Ermöglicht TID-Scans im Planer."
 
-#: utils/misc/guc.c:697
+#: utils/misc/guc.c:699
 msgid "Enables the planner's use of explicit sort steps."
 msgstr "Ermöglicht Sortierschritte im Planer."
 
-#: utils/misc/guc.c:706
+#: utils/misc/guc.c:708
 msgid "Enables the planner's use of hashed aggregation plans."
 msgstr "Ermöglicht Hash-Aggregierung im Planer."
 
-#: utils/misc/guc.c:715
+#: utils/misc/guc.c:717
 msgid "Enables the planner's use of materialization."
 msgstr "Ermöglicht Materialisierung im Planer."
 
-#: utils/misc/guc.c:724
+#: utils/misc/guc.c:726
 msgid "Enables the planner's use of nested-loop join plans."
 msgstr "Ermöglicht Nested-Loop-Verbunde im Planer."
 
-#: utils/misc/guc.c:733
+#: utils/misc/guc.c:735
 msgid "Enables the planner's use of merge join plans."
 msgstr "Ermöglicht Merge-Verbunde im Planer."
 
-#: utils/misc/guc.c:742
+#: utils/misc/guc.c:744
 msgid "Enables the planner's use of hash join plans."
 msgstr "Ermöglicht Hash-Verbunde im Planer."
 
-#: utils/misc/guc.c:751
+#: utils/misc/guc.c:753
 msgid "Enables genetic query optimization."
 msgstr "Ermöglicht genetische Anfrageoptimierung."
 
-#: utils/misc/guc.c:752
+#: utils/misc/guc.c:754
 msgid "This algorithm attempts to do planning without exhaustive searching."
 msgstr ""
 "Dieser Algorithmus versucht das Planen ohne erschöpfende Suche durchzuführen."
 
-#: utils/misc/guc.c:762
+#: utils/misc/guc.c:764
 msgid "Shows whether the current user is a superuser."
 msgstr "Zeigt, ob der aktuelle Benutzer ein Superuser ist."
 
-#: utils/misc/guc.c:772
+#: utils/misc/guc.c:774
 msgid "Enables advertising the server via Bonjour."
 msgstr "Ermöglicht die Bekanntgabe des Servers mit Bonjour."
 
-#: utils/misc/guc.c:781
+#: utils/misc/guc.c:783
 msgid "Enables SSL connections."
 msgstr "Ermöglicht SSL-Verbindungen."
 
-#: utils/misc/guc.c:790
+#: utils/misc/guc.c:792
 msgid "Forces synchronization of updates to disk."
 msgstr "Erzwingt die Synchronisierung von Aktualisierungen auf Festplatte."
 
-#: utils/misc/guc.c:791
+#: utils/misc/guc.c:793
 msgid ""
 "The server will use the fsync() system call in several places to make sure "
 "that updates are physically written to disk. This insures that a database "
@@ -16877,11 +16798,11 @@ msgstr ""
 "Betriebssystemabsturz oder Hardwarefehler in einem korrekten Zustand "
 "wiederhergestellt werden kann."
 
-#: utils/misc/guc.c:802
+#: utils/misc/guc.c:804
 msgid "Continues processing past damaged page headers."
 msgstr "Setzt die Verarbeitung trotz kaputter Seitenköpfe fort."
 
-#: utils/misc/guc.c:803
+#: utils/misc/guc.c:805
 msgid ""
 "Detection of a damaged page header normally causes PostgreSQL to report an "
 "error, aborting the current transaction. Setting zero_damaged_pages to true "
@@ -16895,13 +16816,13 @@ msgstr ""
 "Seiten mit Nullen gefüllt und die Verarbeitung geht weiter. Dieses Verhalten "
 "zerstört Daten, nämlich alle Zeilen in der kaputten Seite."
 
-#: utils/misc/guc.c:816
+#: utils/misc/guc.c:818
 msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr ""
 "Schreibt volle Seiten in den WAL, sobald sie nach einem Checkpoint geändert "
 "werden."
 
-#: utils/misc/guc.c:817
+#: utils/misc/guc.c:819
 msgid ""
 "A page write in process during an operating system crash might be only "
 "partially written to disk.  During recovery, the row changes stored in WAL "
@@ -16914,11 +16835,11 @@ msgstr ""
 "Option schreibt Seiten, sobald sie nach einem Checkpoint geändert worden "
 "sind, damit eine volle Wiederherstellung möglich ist."
 
-#: utils/misc/guc.c:829
+#: utils/misc/guc.c:831
 msgid "Runs the server silently."
 msgstr "Startet den Server ohne Ausgabe."
 
-#: utils/misc/guc.c:830
+#: utils/misc/guc.c:832
 msgid ""
 "If this parameter is set, the server will automatically run in the "
 "background and any controlling terminals are dissociated."
@@ -16926,81 +16847,81 @@ msgstr ""
 "Wenn dieser Parameter gesetzt ist, dann wird der Server automatisch im "
 "Hintergrund gestartet und alle kontrollierenden Terminals werden abgetrennt."
 
-#: utils/misc/guc.c:839
+#: utils/misc/guc.c:841
 msgid "Logs each checkpoint."
 msgstr "Schreibt jeden Checkpoint in den Log."
 
-#: utils/misc/guc.c:848
+#: utils/misc/guc.c:850
 msgid "Logs each successful connection."
 msgstr "Schreibt jede erfolgreiche Verbindung in den Log."
 
-#: utils/misc/guc.c:857
+#: utils/misc/guc.c:859
 msgid "Logs end of a session, including duration."
 msgstr "Schreibt jedes Verbindungsende mit Sitzungszeit in den Log."
 
-#: utils/misc/guc.c:866
+#: utils/misc/guc.c:868
 msgid "Turns on various assertion checks."
 msgstr "Schaltet diverse Assertion-Prüfungen ein."
 
-#: utils/misc/guc.c:867
+#: utils/misc/guc.c:869
 msgid "This is a debugging aid."
 msgstr "Das ist eine Debug-Hilfe."
 
-#: utils/misc/guc.c:881
+#: utils/misc/guc.c:883
 msgid "Terminate session on any error."
-msgstr ""
+msgstr "Sitzung bei jedem Fehler abbrechen."
 
-#: utils/misc/guc.c:890
-msgid "Reinitialize after backend crash."
-msgstr ""
+#: utils/misc/guc.c:892
+msgid "Reinitialize server after backend crash."
+msgstr "Server nach Absturz eines Serverprozesses reinitialisieren."
 
-#: utils/misc/guc.c:900
+#: utils/misc/guc.c:902
 msgid "Logs the duration of each completed SQL statement."
 msgstr "Loggt die Dauer jeder abgeschlossenen SQL-Anweisung."
 
-#: utils/misc/guc.c:909
+#: utils/misc/guc.c:911
 msgid "Logs each query's parse tree."
 msgstr "Scheibt den Parsebaum jeder Anfrage in den Log."
 
-#: utils/misc/guc.c:918
+#: utils/misc/guc.c:920
 msgid "Logs each query's rewritten parse tree."
 msgstr "Schreibt den umgeschriebenen Parsebaum jeder Anfrage in den Log."
 
-#: utils/misc/guc.c:927
+#: utils/misc/guc.c:929
 msgid "Logs each query's execution plan."
 msgstr "Schreibt der Ausführungsplan jeder Anfrage in den Log."
 
-#: utils/misc/guc.c:936
+#: utils/misc/guc.c:938
 msgid "Indents parse and plan tree displays."
 msgstr "Rückt die Anzeige von Parse- und Planbäumen ein."
 
-#: utils/misc/guc.c:945
+#: utils/misc/guc.c:947
 msgid "Writes parser performance statistics to the server log."
 msgstr "Schreibt Parser-Leistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc.c:954
+#: utils/misc/guc.c:956
 msgid "Writes planner performance statistics to the server log."
 msgstr "Schreibt Planer-Leistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc.c:963
+#: utils/misc/guc.c:965
 msgid "Writes executor performance statistics to the server log."
 msgstr "Schreibt Executor-Leistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc.c:972
+#: utils/misc/guc.c:974
 msgid "Writes cumulative performance statistics to the server log."
 msgstr "Schreibt Gesamtleistungsstatistiken in den Serverlog."
 
-#: utils/misc/guc.c:982 utils/misc/guc.c:1047 utils/misc/guc.c:1057
-#: utils/misc/guc.c:1067 utils/misc/guc.c:1077 utils/misc/guc.c:1802
-#: utils/misc/guc.c:1812
+#: utils/misc/guc.c:984 utils/misc/guc.c:1049 utils/misc/guc.c:1059
+#: utils/misc/guc.c:1069 utils/misc/guc.c:1079 utils/misc/guc.c:1804
+#: utils/misc/guc.c:1814
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: utils/misc/guc.c:994
+#: utils/misc/guc.c:996
 msgid "Collects information about executing commands."
 msgstr "Sammelt Informationen über ausgeführte Befehle."
 
-#: utils/misc/guc.c:995
+#: utils/misc/guc.c:997
 msgid ""
 "Enables the collection of information on the currently executing command of "
 "each session, along with the time at which that command began execution."
@@ -17009,16 +16930,16 @@ msgstr ""
 "jeder Sitzung ein, einschließlich der Zeit, and dem die Befehlsausführung "
 "begann."
 
-#: utils/misc/guc.c:1005
+#: utils/misc/guc.c:1007
 msgid "Collects statistics on database activity."
 msgstr "Sammelt Statistiken über Datenbankaktivität."
 
-#: utils/misc/guc.c:1015
+#: utils/misc/guc.c:1017
 msgid "Updates the process title to show the active SQL command."
 msgstr ""
 "Der Prozesstitel wird aktualisiert, um den aktuellen SQL-Befehl anzuzeigen."
 
-#: utils/misc/guc.c:1016
+#: utils/misc/guc.c:1018
 msgid ""
 "Enables updating of the process title every time a new SQL command is "
 "received by the server."
@@ -17026,23 +16947,23 @@ msgstr ""
 "Ermöglicht das Aktualisieren des Prozesstitels bei jedem von Server "
 "empfangenen neuen SQL-Befehl."
 
-#: utils/misc/guc.c:1025
+#: utils/misc/guc.c:1027
 msgid "Starts the autovacuum subprocess."
 msgstr "Startet den Autovacuum-Prozess."
 
-#: utils/misc/guc.c:1035
+#: utils/misc/guc.c:1037
 msgid "Generates debugging output for LISTEN and NOTIFY."
 msgstr "Erzeugt Debug-Ausgabe für LISTEN und NOTIFY."
 
-#: utils/misc/guc.c:1089
+#: utils/misc/guc.c:1091
 msgid "Logs long lock waits."
 msgstr "Schreibt Meldungen über langes Warten auf Sperren in den Log."
 
-#: utils/misc/guc.c:1099
+#: utils/misc/guc.c:1101
 msgid "Logs the host name in the connection logs."
 msgstr "Schreibt den Hostnamen jeder Verbindung in den Log."
 
-#: utils/misc/guc.c:1100
+#: utils/misc/guc.c:1102
 msgid ""
 "By default, connection logs only show the IP address of the connecting host. "
 "If you want them to show the host name you can turn this on, but depending "
@@ -17054,15 +16975,15 @@ msgstr ""
 "diese Option anschalten, aber je nachdem, wie Ihr DNS eingerichtet ist, kann "
 "das die Leistung nicht unerheblich beeinträchtigen."
 
-#: utils/misc/guc.c:1111
+#: utils/misc/guc.c:1113
 msgid "Causes subtables to be included by default in various commands."
 msgstr "Schließt abgeleitete Tabellen in diverse Befehle automatisch ein."
 
-#: utils/misc/guc.c:1120
+#: utils/misc/guc.c:1122
 msgid "Encrypt passwords."
 msgstr "Verschlüsselt Passwörter."
 
-#: utils/misc/guc.c:1121
+#: utils/misc/guc.c:1123
 msgid ""
 "When a password is specified in CREATE USER or ALTER USER without writing "
 "either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
@@ -17072,11 +16993,11 @@ msgstr ""
 "UNENCRYPTED angegeben ist, bestimmt dieser Parameter, ob das Passwort "
 "verschlüsselt wird."
 
-#: utils/misc/guc.c:1131
+#: utils/misc/guc.c:1133
 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
 msgstr "Behandelt »ausdruck=NULL« als »ausdruck IS NULL«."
 
-#: utils/misc/guc.c:1132
+#: utils/misc/guc.c:1134
 msgid ""
 "When turned on, expressions of the form expr = NULL (or NULL = expr) are "
 "treated as expr IS NULL, that is, they return true if expr evaluates to the "
@@ -17089,15 +17010,15 @@ msgstr ""
 "korrekte Verhalten von ausdruck = NULL ist immer den NULL-Wert (für "
 "unbekannt) zurückzugeben."
 
-#: utils/misc/guc.c:1144
+#: utils/misc/guc.c:1146
 msgid "Enables per-database user names."
 msgstr "Ermöglicht Datenbank-lokale Benutzernamen."
 
-#: utils/misc/guc.c:1154
+#: utils/misc/guc.c:1156
 msgid "This parameter doesn't do anything."
 msgstr "Dieser Parameter macht nichts."
 
-#: utils/misc/guc.c:1155
+#: utils/misc/guc.c:1157
 msgid ""
 "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
 "vintage clients."
@@ -17105,36 +17026,38 @@ msgstr ""
 "Er ist nur hier, damit es keine Probleme mit 7.3-Clients gibt, die SET "
 "AUTOCOMMIT TO ON ausführen."
 
-#: utils/misc/guc.c:1164
+#: utils/misc/guc.c:1166
 msgid "Sets the default read-only status of new transactions."
 msgstr ""
 "Setzt den Standardwert für die Read-Only-Einstellung einer neuen Transaktion."
 
-#: utils/misc/guc.c:1173
+#: utils/misc/guc.c:1175
 msgid "Sets the current transaction's read-only status."
 msgstr "Setzt die Read-Only-Einstellung der aktuellen Transaktion."
 
-#: utils/misc/guc.c:1183
-#, fuzzy
+#: utils/misc/guc.c:1185
 msgid "Sets the default deferrable status of new transactions."
 msgstr ""
-"Setzt den Standardwert für die Read-Only-Einstellung einer neuen Transaktion."
+"Setzt den Standardwert für die Deferrable-Einstellung einer neuen "
+"Transaktion."
 
-#: utils/misc/guc.c:1192
+#: utils/misc/guc.c:1194
 msgid ""
 "Whether to defer a read-only serializable transaction until it can be "
 "executed with no possible serialization failures."
 msgstr ""
+"Ob eine serialisierbare Read-Only-Transaktion aufgeschoben werden soll, bis "
+"sie ohne mögliche Serialisierungsfehler ausgeführt werden kann."
 
-#: utils/misc/guc.c:1202
+#: utils/misc/guc.c:1204
 msgid "Check function bodies during CREATE FUNCTION."
 msgstr "Prüft Funktionskörper bei der Ausführung von CREATE FUNCTION."
 
-#: utils/misc/guc.c:1211
+#: utils/misc/guc.c:1213
 msgid "Enable input of NULL elements in arrays."
 msgstr "Ermöglicht die Eingabe von NULL-Elementen in Arrays."
 
-#: utils/misc/guc.c:1212
+#: utils/misc/guc.c:1214
 msgid ""
 "When turned on, unquoted NULL in an array input value means a null value; "
 "otherwise it is taken literally."
@@ -17142,42 +17065,42 @@ msgstr ""
 "Wenn dies eingeschaltet ist, wird ein nicht gequotetes NULL in einem Array-"
 "Eingabewert als NULL-Wert interpretiert, ansonsten als Zeichenkette."
 
-#: utils/misc/guc.c:1222
+#: utils/misc/guc.c:1224
 msgid "Create new tables with OIDs by default."
 msgstr "Erzeugt neue Tabellen standardmäßig mit OIDs."
 
-#: utils/misc/guc.c:1231
+#: utils/misc/guc.c:1233
 msgid ""
 "Start a subprocess to capture stderr output and/or csvlogs into log files."
 msgstr ""
 "Startet einen Subprozess, um die Stderr-Ausgabe und/oder CSV-Logs in "
 "Logdateien auszugeben."
 
-#: utils/misc/guc.c:1240
+#: utils/misc/guc.c:1242
 msgid "Truncate existing log files of same name during log rotation."
 msgstr "Kürzt existierende Logdateien mit dem selben Namen beim Rotieren."
 
-#: utils/misc/guc.c:1251
+#: utils/misc/guc.c:1253
 msgid "Emit information about resource usage in sorting."
 msgstr "Gibt Informationen über die Ressourcenverwendung beim Sortieren aus."
 
-#: utils/misc/guc.c:1265
+#: utils/misc/guc.c:1267
 msgid "Generate debugging output for synchronized scanning."
 msgstr "Erzeugt Debug-Ausgabe für synchronisiertes Scannen."
 
-#: utils/misc/guc.c:1280
+#: utils/misc/guc.c:1282
 msgid "Enable bounded sorting using heap sort."
 msgstr "Ermöglicht Bounded Sorting mittels Heap-Sort."
 
-#: utils/misc/guc.c:1293
+#: utils/misc/guc.c:1295
 msgid "Emit WAL-related debugging output."
 msgstr "Gibt diverse Debug-Meldungen über WAL aus."
 
-#: utils/misc/guc.c:1305
+#: utils/misc/guc.c:1307
 msgid "Datetimes are integer based."
 msgstr "Datum/Zeit verwendet intern ganze Zahlen."
 
-#: utils/misc/guc.c:1320
+#: utils/misc/guc.c:1322
 msgid ""
 "Sets whether Kerberos and GSSAPI user names should be treated as case-"
 "insensitive."
@@ -17185,42 +17108,45 @@ msgstr ""
 "Bestimmt, ob Groß-/Kleinschreibung bei Kerberos- und GSSAPI-Benutzernamen "
 "ignoriert werden soll."
 
-#: utils/misc/guc.c:1330
+#: utils/misc/guc.c:1332
 msgid "Warn about backslash escapes in ordinary string literals."
 msgstr "Warnt bei Backslash-Escapes in normalen Zeichenkettenkonstanten."
 
-#: utils/misc/guc.c:1340
+#: utils/misc/guc.c:1342
 msgid "Causes '...' strings to treat backslashes literally."
 msgstr ""
 "Bewirkt, dass Zeichenketten der Art '...' Backslashes als normales Zeichen "
 "behandeln."
 
-#: utils/misc/guc.c:1351
+#: utils/misc/guc.c:1353
 msgid "Enable synchronized sequential scans."
 msgstr "Ermöglicht synchronisierte sequenzielle Scans."
 
-#: utils/misc/guc.c:1361
+#: utils/misc/guc.c:1363
 msgid "Allows archiving of WAL files using archive_command."
 msgstr "Erlaubt die Archivierung von WAL-Dateien mittels archive_command."
 
-#: utils/misc/guc.c:1371
+#: utils/misc/guc.c:1373
 msgid "Allows connections and queries during recovery."
 msgstr "Erlaubt Verbindungen und Anfragen während der Wiederherstellung."
 
-#: utils/misc/guc.c:1381
+#: utils/misc/guc.c:1383
 msgid ""
-"Allows feedback from a hot standby primary that will avoid query conflicts."
+"Allows feedback from a hot standby to the primary that will avoid query "
+"conflicts."
 msgstr ""
+"Erlaubt Rückmeldungen von einem Hot Standby an den Primärserver, um "
+"Anfragekonflikte zu vermeiden."
 
-#: utils/misc/guc.c:1391
+#: utils/misc/guc.c:1393
 msgid "Allows modifications of the structure of system tables."
 msgstr "Erlaubt Änderungen an der Struktur von Systemtabellen."
 
-#: utils/misc/guc.c:1402
+#: utils/misc/guc.c:1404
 msgid "Disables reading from system indexes."
 msgstr "Schaltet das Lesen aus Systemindexen ab."
 
-#: utils/misc/guc.c:1403
+#: utils/misc/guc.c:1405
 msgid ""
 "It does not prevent updating the indexes, so it is safe to use.  The worst "
 "consequence is slowness."
@@ -17228,14 +17154,14 @@ msgstr ""
 "Das Aktualisieren der Indexe wird nicht verhindert, also ist die Verwendung "
 "unbedenklich. Schlimmstenfalls wird alles langsamer."
 
-#: utils/misc/guc.c:1414
+#: utils/misc/guc.c:1416
 msgid ""
 "Enables backward compatibility mode for privilege checks on large objects."
 msgstr ""
 "Schaltet den rückwärtskompatiblen Modus für Privilegienprüfungen bei Large "
 "Objects ein."
 
-#: utils/misc/guc.c:1415
+#: utils/misc/guc.c:1417
 msgid ""
 "Skips privilege checks when reading or modifying large objects, for "
 "compatibility with PostgreSQL releases prior to 9.0."
@@ -17243,11 +17169,11 @@ msgstr ""
 "Überspringt Privilegienprüfungen beim Lesen oder Ändern von Large Objects, "
 "zur Kompatibilität mit PostgreSQL-Versionen vor 9.0."
 
-#: utils/misc/guc.c:1425
+#: utils/misc/guc.c:1427
 msgid "When generating SQL fragments, quote all identifiers."
-msgstr ""
+msgstr "Wenn SQL-Fragmente erzeugt werden, alle Bezeichner quoten."
 
-#: utils/misc/guc.c:1444
+#: utils/misc/guc.c:1446
 msgid ""
 "Forces a switch to the next xlog file if a new file has not been started "
 "within N seconds."
@@ -17255,20 +17181,20 @@ msgstr ""
 "Erzwingt das Umschalten zur nächsten Transaktionslogdatei, wenn seit N "
 "Sekunden keine neue Datei begonnen worden ist."
 
-#: utils/misc/guc.c:1455
+#: utils/misc/guc.c:1457
 msgid "Waits N seconds on connection startup after authentication."
 msgstr ""
 "Wartet beim Starten einer Verbindung N Sekunden nach der Authentifizierung."
 
-#: utils/misc/guc.c:1456 utils/misc/guc.c:1905
+#: utils/misc/guc.c:1458 utils/misc/guc.c:1907
 msgid "This allows attaching a debugger to the process."
 msgstr "Das ermöglicht es, einen Debugger in den Prozess einzuhängen."
 
-#: utils/misc/guc.c:1465
+#: utils/misc/guc.c:1467
 msgid "Sets the default statistics target."
 msgstr "Setzt das voreingestellte Statistikziel."
 
-#: utils/misc/guc.c:1466
+#: utils/misc/guc.c:1468
 msgid ""
 "This applies to table columns that have not had a column-specific target set "
 "via ALTER TABLE SET STATISTICS."
@@ -17276,12 +17202,12 @@ msgstr ""
 "Diese Einstellung gilt für Tabellenspalten, für die kein spaltenspezifisches "
 "Ziel mit ALTER TABLE SET STATISTICS gesetzt worden ist."
 
-#: utils/misc/guc.c:1475
+#: utils/misc/guc.c:1477
 msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr ""
 "Setzt die Größe der FROM-Liste, ab der Unteranfragen nicht kollabiert werden."
 
-#: utils/misc/guc.c:1477
+#: utils/misc/guc.c:1479
 msgid ""
 "The planner will merge subqueries into upper queries if the resulting FROM "
 "list would have no more than this many items."
@@ -17289,13 +17215,13 @@ msgstr ""
 "Der Planer bindet Unteranfragen in die übergeordneten Anfragen ein, wenn die "
 "daraus resultierende FROM-Liste nicht mehr als so viele Elemente haben würde."
 
-#: utils/misc/guc.c:1487
+#: utils/misc/guc.c:1489
 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr ""
 "Setzt die Größe der FROM-Liste, ab der JOIN-Konstrukte nicht aufgelöst "
 "werden."
 
-#: utils/misc/guc.c:1489
+#: utils/misc/guc.c:1491
 msgid ""
 "The planner will flatten explicit JOIN constructs into lists of FROM items "
 "whenever a list of no more than this many items would result."
@@ -17303,34 +17229,34 @@ msgstr ""
 "Der Planer löst ausdrückliche JOIN-Konstrukte in FROM-Listen auf, wenn die "
 "daraus resultierende FROM-Liste nicht mehr als so viele Elemente haben würde."
 
-#: utils/misc/guc.c:1499
+#: utils/misc/guc.c:1501
 msgid "Sets the threshold of FROM items beyond which GEQO is used."
 msgstr ""
 "Setzt die Anzahl der Elemente in der FROM-Liste, ab der GEQO verwendet wird."
 
-#: utils/misc/guc.c:1508
+#: utils/misc/guc.c:1510
 msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr ""
 "GEQO: wird für die Berechnung der Vorgabewerte anderer GEQO-Parameter "
 "verwendet."
 
-#: utils/misc/guc.c:1517
+#: utils/misc/guc.c:1519
 msgid "GEQO: number of individuals in the population."
 msgstr "GEQO: Anzahl der Individien in der Bevölkerung."
 
-#: utils/misc/guc.c:1518 utils/misc/guc.c:1527
+#: utils/misc/guc.c:1520 utils/misc/guc.c:1529
 msgid "Zero selects a suitable default value."
 msgstr "Null wählt einen passenden Vorgabewert."
 
-#: utils/misc/guc.c:1526
+#: utils/misc/guc.c:1528
 msgid "GEQO: number of iterations of the algorithm."
 msgstr "GEQO: Anzahl der Iterationen im Algorithmus."
 
-#: utils/misc/guc.c:1537
+#: utils/misc/guc.c:1539
 msgid "Sets the time to wait on a lock before checking for deadlock."
 msgstr "Setzt die Zeit, die gewartet wird, bis auf Verklemmung geprüft wird."
 
-#: utils/misc/guc.c:1548
+#: utils/misc/guc.c:1550
 msgid ""
 "Sets the maximum delay before canceling queries when a hot standby server is "
 "processing archived WAL data."
@@ -17338,7 +17264,7 @@ msgstr ""
 "Setzt die maximale Verzögerung bevor Anfragen storniert werden, wenn ein Hot-"
 "Standby-Server archivierte WAL-Daten verarbeitet."
 
-#: utils/misc/guc.c:1559
+#: utils/misc/guc.c:1561
 msgid ""
 "Sets the maximum delay before canceling queries when a hot standby server is "
 "processing streamed WAL data."
@@ -17346,38 +17272,40 @@ msgstr ""
 "Setzt die maximale Verzögerung bevor Anfragen storniert werden, wenn ein Hot-"
 "Standby-Server gestreamte WAL-Daten verarbeitet."
 
-#: utils/misc/guc.c:1570
+#: utils/misc/guc.c:1572
 msgid ""
-"Sets the maximum interval between WAL receiver status reports to the master."
+"Sets the maximum interval between WAL receiver status reports to the primary."
 msgstr ""
+"Setzt das maximale Intervall zwischen Statusberichten des WAL-Receivers an "
+"den Primärserver."
 
-#: utils/misc/guc.c:1581
+#: utils/misc/guc.c:1583
 msgid "Sets the maximum number of concurrent connections."
 msgstr "Setzt die maximale Anzahl gleichzeitiger Verbindungen."
 
-#: utils/misc/guc.c:1591
+#: utils/misc/guc.c:1593
 msgid "Sets the number of connection slots reserved for superusers."
 msgstr "Setzt die Anzahl der für Superuser reservierten Verbindungen."
 
-#: utils/misc/guc.c:1605
+#: utils/misc/guc.c:1607
 msgid "Sets the number of shared memory buffers used by the server."
 msgstr "Setzt die Anzahl der vom Server verwendeten Shared-Memory-Puffer."
 
-#: utils/misc/guc.c:1616
+#: utils/misc/guc.c:1618
 msgid "Sets the maximum number of temporary buffers used by each session."
 msgstr ""
 "Setzt die maximale Anzahl der von jeder Sitzung verwendeten temporären "
 "Puffer."
 
-#: utils/misc/guc.c:1627
+#: utils/misc/guc.c:1629
 msgid "Sets the TCP port the server listens on."
 msgstr "Setzt den TCP-Port, auf dem der Server auf Verbindungen wartet."
 
-#: utils/misc/guc.c:1637
+#: utils/misc/guc.c:1639
 msgid "Sets the access permissions of the Unix-domain socket."
 msgstr "Setzt die Zugriffsrechte für die Unix-Domain-Socket."
 
-#: utils/misc/guc.c:1638
+#: utils/misc/guc.c:1640
 msgid ""
 "Unix-domain sockets use the usual Unix file system permission set. The "
 "parameter value is expected to be a numeric mode specification in the form "
@@ -17390,29 +17318,25 @@ msgstr ""
 "gebräuchliche Oktalformat zu verwenden, muss die Zahl mit 0 (einer Null) "
 "anfangen.)"
 
-#: utils/misc/guc.c:1652
-#, fuzzy
+#: utils/misc/guc.c:1654
 msgid "Sets the file permissions for log files."
-msgstr "Bestimmt das Dateinamenmuster für Logdateien."
+msgstr "Setzt die Dateizugriffsrechte für Logdateien."
 
-#: utils/misc/guc.c:1653
-#, fuzzy
+#: utils/misc/guc.c:1655
 msgid ""
 "The parameter value is expected to be a numeric mode specification in the "
 "form accepted by the chmod and umask system calls. (To use the customary "
 "octal format the number must start with a 0 (zero).)"
 msgstr ""
-"Unix-Domain-Sockets verwenden die üblichen Zugriffsrechte für Unix-"
-"Dateisysteme. Der Wert dieser Option muss ein numerischer Wert in der von "
-"den Systemaufrufen chmod und umask verwendeten Form sein. (Um das "
-"gebräuchliche Oktalformat zu verwenden, muss die Zahl mit 0 (einer Null) "
-"anfangen.)"
+"Der Wert dieser Option muss ein numerischer Wert in der von den "
+"Systemaufrufen chmod und umask verwendeten Form sein. (Um das gebräuchliche "
+"Oktalformat zu verwenden, muss die Zahl mit 0 (einer Null) anfangen.)"
 
-#: utils/misc/guc.c:1666
+#: utils/misc/guc.c:1668
 msgid "Sets the maximum memory to be used for query workspaces."
 msgstr "Setzt die maximale Speichergröße für Anfrage-Arbeitsbereiche."
 
-#: utils/misc/guc.c:1667
+#: utils/misc/guc.c:1669
 msgid ""
 "This much memory can be used by each internal sort operation and hash table "
 "before switching to temporary disk files."
@@ -17420,77 +17344,77 @@ msgstr ""
 "Gibt die Speichermenge an, die für interne Sortiervorgänge und Hashtabellen "
 "verwendet werden kann, bevor auf temporäre Dateien umgeschaltet wird."
 
-#: utils/misc/guc.c:1679
+#: utils/misc/guc.c:1681
 msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr "Setzt die maximale Speichergröße für Wartungsoperationen."
 
-#: utils/misc/guc.c:1680
+#: utils/misc/guc.c:1682
 msgid "This includes operations such as VACUUM and CREATE INDEX."
 msgstr "Das schließt Operationen wie VACUUM und CREATE INDEX ein."
 
-#: utils/misc/guc.c:1695
+#: utils/misc/guc.c:1697
 msgid "Sets the maximum stack depth, in kilobytes."
 msgstr "Setzt die maximale Stackgröße, in Kilobytes."
 
-#: utils/misc/guc.c:1706
+#: utils/misc/guc.c:1708
 msgid "Vacuum cost for a page found in the buffer cache."
 msgstr "Vacuum-Kosten für eine im Puffer-Cache gefundene Seite."
 
-#: utils/misc/guc.c:1716
+#: utils/misc/guc.c:1718
 msgid "Vacuum cost for a page not found in the buffer cache."
 msgstr "Vacuum-Kosten für eine nicht im Puffer-Cache gefundene Seite."
 
-#: utils/misc/guc.c:1726
+#: utils/misc/guc.c:1728
 msgid "Vacuum cost for a page dirtied by vacuum."
 msgstr "Vacuum-Kosten für eine durch Vacuum schmutzig gemachte Seite."
 
-#: utils/misc/guc.c:1736
+#: utils/misc/guc.c:1738
 msgid "Vacuum cost amount available before napping."
 msgstr "Verfügbare Vacuum-Kosten vor Nickerchen."
 
-#: utils/misc/guc.c:1746
+#: utils/misc/guc.c:1748
 msgid "Vacuum cost delay in milliseconds."
 msgstr "Vacuum-Kosten-Verzögerung in Millisekunden."
 
-#: utils/misc/guc.c:1757
+#: utils/misc/guc.c:1759
 msgid "Vacuum cost delay in milliseconds, for autovacuum."
 msgstr "Vacuum-Kosten-Verzögerung in Millisekunden, für Autovacuum."
 
-#: utils/misc/guc.c:1768
+#: utils/misc/guc.c:1770
 msgid "Vacuum cost amount available before napping, for autovacuum."
 msgstr "Verfügbare Vacuum-Kosten vor Nickerchen, für Autovacuum."
 
-#: utils/misc/guc.c:1778
+#: utils/misc/guc.c:1780
 msgid ""
 "Sets the maximum number of simultaneously open files for each server process."
 msgstr ""
 "Setzt die maximale Zahl gleichzeitig geöffneter Dateien für jeden "
 "Serverprozess."
 
-#: utils/misc/guc.c:1791
+#: utils/misc/guc.c:1793
 msgid "Sets the maximum number of simultaneously prepared transactions."
 msgstr ""
 "Setzt die maximale Anzahl von gleichzeitig vorbereiteten Transaktionen."
 
-#: utils/misc/guc.c:1824
+#: utils/misc/guc.c:1826
 msgid "Sets the maximum allowed duration of any statement."
 msgstr "Setzt die maximal erlaubte Dauer jeder Anweisung."
 
-#: utils/misc/guc.c:1825
+#: utils/misc/guc.c:1827
 msgid "A value of 0 turns off the timeout."
 msgstr "Der Wert 0 schaltet die Zeitprüfung aus."
 
-#: utils/misc/guc.c:1835
+#: utils/misc/guc.c:1837
 msgid "Minimum age at which VACUUM should freeze a table row."
 msgstr "Mindestalter, bei dem VACUUM eine Tabellenzeile einfrieren soll."
 
-#: utils/misc/guc.c:1845
+#: utils/misc/guc.c:1847
 msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
 "Alter, bei dem VACUUM die ganze Tabelle durchsuchen soll, um Zeilen "
 "einzufrieren."
 
-#: utils/misc/guc.c:1855
+#: utils/misc/guc.c:1857
 msgid ""
 "Number of transactions by which VACUUM and HOT cleanup should be deferred, "
 "if any."
@@ -17498,11 +17422,11 @@ msgstr ""
 "Anzahl Transaktionen, um die VACUUM- und HOT-Aufräumen aufgeschoben werden "
 "soll."
 
-#: utils/misc/guc.c:1868
+#: utils/misc/guc.c:1870
 msgid "Sets the maximum number of locks per transaction."
 msgstr "Setzt die maximale Anzahl Sperren pro Transaktion."
 
-#: utils/misc/guc.c:1869
+#: utils/misc/guc.c:1871
 msgid ""
 "The shared lock table is sized on the assumption that at most "
 "max_locks_per_transaction * max_connections distinct objects will need to be "
@@ -17512,54 +17436,52 @@ msgstr ""
 "max_locks_per_transaction * max_connections verschiedene Objekte "
 "gleichzeitig gesperrt werden müssen."
 
-#: utils/misc/guc.c:1880
-#, fuzzy
+#: utils/misc/guc.c:1882
 msgid "Sets the maximum number of predicate locks per transaction."
-msgstr "Setzt die maximale Anzahl Sperren pro Transaktion."
+msgstr "Setzt die maximale Anzahl Prädikatsperren pro Transaktion."
 
-#: utils/misc/guc.c:1881
-#, fuzzy
+#: utils/misc/guc.c:1883
 msgid ""
 "The shared predicate lock table is sized on the assumption that at most "
 "max_pred_locks_per_transaction * max_connections distinct objects will need "
 "to be locked at any one time."
 msgstr ""
-"Die globale Sperrentabelle wird mit der Annahme angelegt, das höchstens "
-"max_locks_per_transaction * max_connections verschiedene Objekte "
-"gleichzeitig gesperrt werden müssen."
+"Die globale Prädikatsperrentabelle wird mit der Annahme angelegt, das "
+"höchstens max_pred_locks_per_transaction * max_connections verschiedene "
+"Objekte gleichzeitig gesperrt werden müssen."
 
-#: utils/misc/guc.c:1892
+#: utils/misc/guc.c:1894
 msgid "Sets the maximum allowed time to complete client authentication."
 msgstr "Setzt die maximale Zeit, um die Client-Authentifizierung zu beenden."
 
-#: utils/misc/guc.c:1904
+#: utils/misc/guc.c:1906
 msgid "Waits N seconds on connection startup before authentication."
 msgstr ""
 "Wartet beim Starten einer Verbindung N Sekunden vor der Authentifizierung."
 
-#: utils/misc/guc.c:1915
+#: utils/misc/guc.c:1917
 msgid "Sets the number of WAL files held for standby servers."
 msgstr ""
 "Setzt die maximale Anzahl der für Standby-Server vorgehaltenen WAL-Dateien."
 
-#: utils/misc/guc.c:1925
+#: utils/misc/guc.c:1927
 msgid ""
 "Sets the maximum distance in log segments between automatic WAL checkpoints."
 msgstr ""
 "Setzt die maximale Anzahl Logsegmente zwischen automatischen WAL-Checkpoints."
 
-#: utils/misc/guc.c:1935
+#: utils/misc/guc.c:1937
 msgid "Sets the maximum time between automatic WAL checkpoints."
 msgstr "Setzt die maximale Zeit zwischen automatischen WAL-Checkpoints."
 
-#: utils/misc/guc.c:1946
+#: utils/misc/guc.c:1948
 msgid ""
 "Enables warnings if checkpoint segments are filled more frequently than this."
 msgstr ""
 "Schreibt eine Logmeldung, wenn Checkpoint-Segmente häufiger als dieser Wert "
 "gefüllt werden."
 
-#: utils/misc/guc.c:1948
+#: utils/misc/guc.c:1950
 msgid ""
 "Write a message to the server log if checkpoints caused by the filling of "
 "checkpoint segment files happens more frequently than this number of "
@@ -17569,28 +17491,27 @@ msgstr ""
 "Checkpoint-Segmente ausgelöst werden, häufiger als dieser Wert in Sekunden "
 "passieren. Null schaltet die Warnung ab."
 
-#: utils/misc/guc.c:1960
+#: utils/misc/guc.c:1962
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr "Setzt die Anzahl Diskseitenpuffer für WAL im Shared Memory."
 
-#: utils/misc/guc.c:1971
+#: utils/misc/guc.c:1973
 msgid "WAL writer sleep time between WAL flushes."
 msgstr "Schlafzeit zwischen WAL-Flush-Operationen des WAL-Writers."
 
-#: utils/misc/guc.c:1983
+#: utils/misc/guc.c:1985
 msgid "Sets the maximum number of simultaneously running WAL sender processes."
 msgstr "Setzt die maximale Anzahl gleichzeitig laufender WAL-Sender-Prozesse."
 
-#: utils/misc/guc.c:1993
+#: utils/misc/guc.c:1995
 msgid "WAL sender sleep time between WAL replications."
 msgstr "WAL-Sender-Schlafzeit zwischen WAL-Replikationen."
 
-#: utils/misc/guc.c:2004
-#, fuzzy
+#: utils/misc/guc.c:2006
 msgid "Sets the maximum time to wait for WAL replication."
-msgstr "Setzt die maximale Zeit zwischen automatischen WAL-Checkpoints."
+msgstr "Setzt die maximale Zeit, um auf WAL-Replikation zu warten."
 
-#: utils/misc/guc.c:2015
+#: utils/misc/guc.c:2017
 msgid ""
 "Sets the delay in microseconds between transaction commit and flushing WAL "
 "to disk."
@@ -17598,18 +17519,18 @@ msgstr ""
 "Setzt die Verzögerung in Millisekunden zwischen Transaktionsabschluss und "
 "dem Schreiben von WAL auf die Festplatte."
 
-#: utils/misc/guc.c:2026
+#: utils/misc/guc.c:2028
 msgid ""
 "Sets the minimum concurrent open transactions before performing commit_delay."
 msgstr ""
 "Setzt die minimale Anzahl gleichzeitig offener Transaktionen bevor "
 "»commit_delay« angewendet wird."
 
-#: utils/misc/guc.c:2037
+#: utils/misc/guc.c:2039
 msgid "Sets the number of digits displayed for floating-point values."
 msgstr "Setzt die Anzahl ausgegebener Ziffern für Fließkommawerte."
 
-#: utils/misc/guc.c:2038
+#: utils/misc/guc.c:2040
 msgid ""
 "This affects real, double precision, and geometric data types. The parameter "
 "value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
@@ -17619,16 +17540,16 @@ msgstr ""
 "Datentypen. Der Parameterwert wird zur Standardziffernanzahl (FLT_DIG bzw. "
 "DBL_DIG) hinzuaddiert."
 
-#: utils/misc/guc.c:2049
+#: utils/misc/guc.c:2051
 msgid "Sets the minimum execution time above which statements will be logged."
 msgstr ""
 "Setzt die minimale Ausführungszeit, über der Anweisungen geloggt werden."
 
-#: utils/misc/guc.c:2051
+#: utils/misc/guc.c:2053
 msgid "Zero prints all queries. -1 turns this feature off."
 msgstr "Null zeigt alle Anfragen. -1 schaltet dieses Feature aus."
 
-#: utils/misc/guc.c:2061
+#: utils/misc/guc.c:2063
 msgid ""
 "Sets the minimum execution time above which autovacuum actions will be "
 "logged."
@@ -17636,23 +17557,23 @@ msgstr ""
 "Setzt die minimale Ausführungszeit, über der Autovacuum-Aktionen geloggt "
 "werden."
 
-#: utils/misc/guc.c:2063
+#: utils/misc/guc.c:2065
 msgid "Zero prints all actions. -1 turns autovacuum logging off."
 msgstr ""
 "Null gibt alls Aktionen aus. -1 schaltet die Log-Aufzeichnung über "
 "Autovacuum aus."
 
-#: utils/misc/guc.c:2073
+#: utils/misc/guc.c:2075
 msgid "Background writer sleep time between rounds."
 msgstr "Schlafzeit zwischen Durchläufen des Background-Writers."
 
-#: utils/misc/guc.c:2084
+#: utils/misc/guc.c:2086
 msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr ""
 "Maximale Anzahl der vom Background-Writer pro Durchlauf zu flushenden LRU-"
 "Seiten."
 
-#: utils/misc/guc.c:2100
+#: utils/misc/guc.c:2102
 msgid ""
 "Number of simultaneous requests that can be handled efficiently by the disk "
 "subsystem."
@@ -17660,90 +17581,90 @@ msgstr ""
 "Anzahl simultaner Anfragen, die das Festplattensubsystem effizient "
 "bearbeiten kann."
 
-#: utils/misc/guc.c:2101
+#: utils/misc/guc.c:2103
 msgid ""
 "For RAID arrays, this should be approximately the number of drive spindles "
 "in the array."
 msgstr ""
 "Für RAID-Arrays sollte dies ungefähr die Anzahl Spindeln im Array sein."
 
-#: utils/misc/guc.c:2114
+#: utils/misc/guc.c:2116
 msgid "Automatic log file rotation will occur after N minutes."
 msgstr "Automatische Rotation der Logdateien geschieht nach N Minuten."
 
-#: utils/misc/guc.c:2125
+#: utils/misc/guc.c:2127
 msgid "Automatic log file rotation will occur after N kilobytes."
 msgstr "Automatische Rotation der Logdateien geschieht nach N Kilobytes."
 
-#: utils/misc/guc.c:2136
+#: utils/misc/guc.c:2138
 msgid "Shows the maximum number of function arguments."
 msgstr "Setzt die maximale Anzahl von Funktionsargumenten."
 
-#: utils/misc/guc.c:2147
+#: utils/misc/guc.c:2149
 msgid "Shows the maximum number of index keys."
 msgstr "Zeigt die maximale Anzahl von Indexschlüsseln."
 
-#: utils/misc/guc.c:2158
+#: utils/misc/guc.c:2160
 msgid "Shows the maximum identifier length."
 msgstr "Zeigt die maximale Länge von Bezeichnern."
 
-#: utils/misc/guc.c:2169
+#: utils/misc/guc.c:2171
 msgid "Shows the size of a disk block."
 msgstr "Zeigt die Größe eines Diskblocks."
 
-#: utils/misc/guc.c:2180
+#: utils/misc/guc.c:2182
 msgid "Shows the number of pages per disk file."
 msgstr "Zeigt die Anzahl Seiten pro Diskdatei."
 
-#: utils/misc/guc.c:2191
+#: utils/misc/guc.c:2193
 msgid "Shows the block size in the write ahead log."
 msgstr "Zeigt die Blockgröße im Write-Ahead-Log."
 
-#: utils/misc/guc.c:2202
+#: utils/misc/guc.c:2204
 msgid "Shows the number of pages per write ahead log segment."
 msgstr "Zeit die Anzahl Seiten pro Write-Ahead-Log-Segment."
 
-#: utils/misc/guc.c:2215
+#: utils/misc/guc.c:2217
 msgid "Time to sleep between autovacuum runs."
 msgstr "Wartezeit zwischen Autovacuum-Durchläufen."
 
-#: utils/misc/guc.c:2225
+#: utils/misc/guc.c:2227
 msgid "Minimum number of tuple updates or deletes prior to vacuum."
 msgstr "Mindestanzahl an geänderten oder gelöschten Tupeln vor einem Vacuum."
 
-#: utils/misc/guc.c:2234
+#: utils/misc/guc.c:2236
 msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
 msgstr ""
 "Mindestanzahl an Einfüge-, Änderungs- oder Löschoperationen von einem "
 "Analyze."
 
-#: utils/misc/guc.c:2244
+#: utils/misc/guc.c:2246
 msgid ""
 "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
 "Alter, nach dem eine Tabelle automatisch gevacuumt wird, um "
 "Transaktionsnummernüberlauf zu verhindern."
 
-#: utils/misc/guc.c:2255
+#: utils/misc/guc.c:2257
 msgid ""
 "Sets the maximum number of simultaneously running autovacuum worker "
 "processes."
 msgstr ""
 "Setzt die maximale Anzahl gleichzeitig laufender Autovacuum-Worker-Prozesse."
 
-#: utils/misc/guc.c:2265
+#: utils/misc/guc.c:2267
 msgid "Time between issuing TCP keepalives."
 msgstr "Zeit zwischen TCP-Keepalive-Sendungen."
 
-#: utils/misc/guc.c:2266 utils/misc/guc.c:2277
+#: utils/misc/guc.c:2268 utils/misc/guc.c:2279
 msgid "A value of 0 uses the system default."
 msgstr "Der Wert 0 verwendet die Systemvoreinstellung."
 
-#: utils/misc/guc.c:2276
+#: utils/misc/guc.c:2278
 msgid "Time between TCP keepalive retransmits."
 msgstr "Zeit zwischen TCP-Keepalive-Neuübertragungen."
 
-#: utils/misc/guc.c:2287
+#: utils/misc/guc.c:2289
 msgid ""
 "Set the amount of traffic to send and receive before renegotiating the "
 "encryption keys."
@@ -17751,11 +17672,11 @@ msgstr ""
 "Setzt die Traffic-Menge, die gesendet oder empfangen wird, bevor der "
 "Verschlüsselungsschlüssel neu ausgehandelt wird."
 
-#: utils/misc/guc.c:2298
+#: utils/misc/guc.c:2300
 msgid "Maximum number of TCP keepalive retransmits."
 msgstr "Maximale Anzahl an TCP-Keepalive-Neuübertragungen."
 
-#: utils/misc/guc.c:2299
+#: utils/misc/guc.c:2301
 msgid ""
 "This controls the number of consecutive keepalive retransmits that can be "
 "lost before a connection is considered dead. A value of 0 uses the system "
@@ -17765,16 +17686,16 @@ msgstr ""
 "Neuübertragungen, die verloren gehen dürfen, bis die Verbindung als tot "
 "betrachtet wird. Der Wert 0 verwendet die Betriebssystemvoreinstellung."
 
-#: utils/misc/guc.c:2310
+#: utils/misc/guc.c:2312
 msgid "Sets the maximum allowed result for exact search by GIN."
 msgstr ""
 "Setzt die maximal erlaubte Anzahl Ergebnisse für eine genaue Suche mit GIN."
 
-#: utils/misc/guc.c:2321
+#: utils/misc/guc.c:2323
 msgid "Sets the planner's assumption about the size of the disk cache."
 msgstr "Setzt die Annahme des Planers über die Größe des Festplatten-Caches."
 
-#: utils/misc/guc.c:2322
+#: utils/misc/guc.c:2324
 msgid ""
 "That is, the portion of the kernel's disk cache that will be used for "
 "PostgreSQL data files. This is measured in disk pages, which are normally 8 "
@@ -17785,35 +17706,35 @@ msgstr ""
 "PostgreSQL verwendet wird). Das wird in Diskseiten gemessen, welche "
 "normalerweise 8 kB groß sind."
 
-#: utils/misc/guc.c:2335
+#: utils/misc/guc.c:2337
 msgid "Shows the server version as an integer."
 msgstr "Zeigt die Serverversion als Zahl."
 
-#: utils/misc/guc.c:2346
+#: utils/misc/guc.c:2348
 msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr ""
 "Schreibt Meldungen über die Verwendung von temporären Dateien in den Log, "
 "wenn sie größer als diese Anzahl an Kilobytes sind."
 
-#: utils/misc/guc.c:2347
+#: utils/misc/guc.c:2349
 msgid "Zero logs all files. The default is -1 (turning this feature off)."
 msgstr ""
 "Null loggt alle Dateien. Die Standardeinstellung ist -1 (wodurch dieses "
 "Feature ausgeschaltet wird)."
 
-#: utils/misc/guc.c:2357
+#: utils/misc/guc.c:2359
 msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
 msgstr ""
 "Setzt die für pg_stat_activity.current_query reservierte Größe, in Bytes."
 
-#: utils/misc/guc.c:2376
+#: utils/misc/guc.c:2378
 msgid ""
 "Sets the planner's estimate of the cost of a sequentially fetched disk page."
 msgstr ""
 "Setzt den vom Planer geschätzten Aufwand, um eine sequenzielle Diskseite zu "
 "lesen."
 
-#: utils/misc/guc.c:2386
+#: utils/misc/guc.c:2388
 msgid ""
 "Sets the planner's estimate of the cost of a nonsequentially fetched disk "
 "page."
@@ -17821,12 +17742,12 @@ msgstr ""
 "Setzt den vom Planer geschätzten Aufwand, um eine nichtsequenzielle "
 "Diskseite zu lesen."
 
-#: utils/misc/guc.c:2396
+#: utils/misc/guc.c:2398
 msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr ""
 "Setzt den vom Planer geschätzten Aufwand für die Verarbeitung einer Zeile."
 
-#: utils/misc/guc.c:2406
+#: utils/misc/guc.c:2408
 msgid ""
 "Sets the planner's estimate of the cost of processing each index entry "
 "during an index scan."
@@ -17834,7 +17755,7 @@ msgstr ""
 "Setzt den vom Planer geschätzten Aufwand für die Verarbeitung eines "
 "Indexeintrags während eines Index-Scans."
 
-#: utils/misc/guc.c:2416
+#: utils/misc/guc.c:2418
 msgid ""
 "Sets the planner's estimate of the cost of processing each operator or "
 "function call."
@@ -17842,7 +17763,7 @@ msgstr ""
 "Setzt den vom Planer geschätzten Aufwand für die Verarbeitung eines "
 "Operators oder Funktionsaufrufs."
 
-#: utils/misc/guc.c:2427
+#: utils/misc/guc.c:2429
 msgid ""
 "Sets the planner's estimate of the fraction of a cursor's rows that will be "
 "retrieved."
@@ -17850,24 +17771,24 @@ msgstr ""
 "Setzt den vom Planer geschätzten Anteil der Cursor-Zeilen, die ausgelesen "
 "werden werden."
 
-#: utils/misc/guc.c:2438
+#: utils/misc/guc.c:2440
 msgid "GEQO: selective pressure within the population."
 msgstr "GEQO: selektiver Auswahldruck in der Bevölkerung."
 
-#: utils/misc/guc.c:2448
+#: utils/misc/guc.c:2450
 msgid "GEQO: seed for random path selection."
 msgstr "GEQO: Ausgangswert für die zufällige Pfadauswahl."
 
-#: utils/misc/guc.c:2458
+#: utils/misc/guc.c:2460
 msgid "Multiple of the average buffer usage to free per round."
 msgstr ""
 "Vielfaches der durchschnittlichen freizugebenden Pufferverwendung pro Runde."
 
-#: utils/misc/guc.c:2468
+#: utils/misc/guc.c:2470
 msgid "Sets the seed for random-number generation."
 msgstr "Setzt den Ausgangswert für die Zufallszahlenerzeugung."
 
-#: utils/misc/guc.c:2479
+#: utils/misc/guc.c:2481
 msgid ""
 "Number of tuple updates or deletes prior to vacuum as a fraction of "
 "reltuples."
@@ -17875,7 +17796,7 @@ msgstr ""
 "Anzahl geänderter oder gelöschter Tupel vor einem Vacuum, relativ zu "
 "reltuples."
 
-#: utils/misc/guc.c:2488
+#: utils/misc/guc.c:2490
 msgid ""
 "Number of tuple inserts, updates or deletes prior to analyze as a fraction "
 "of reltuples."
@@ -17883,7 +17804,7 @@ msgstr ""
 "Anzahl eingefügter, geänderter oder gelöschter Tupel vor einem Analyze, "
 "relativ zu reltuples."
 
-#: utils/misc/guc.c:2498
+#: utils/misc/guc.c:2500
 msgid ""
 "Time spent flushing dirty buffers during checkpoint, as fraction of "
 "checkpoint interval."
@@ -17891,54 +17812,54 @@ msgstr ""
 "Zeit, die damit verbracht wird, modifizierte Puffer während eines "
 "Checkpoints zurückzuschreiben, als Bruchteil des Checkpoint-Intervalls."
 
-#: utils/misc/guc.c:2517
+#: utils/misc/guc.c:2519
 msgid "Sets the shell command that will be called to archive a WAL file."
 msgstr ""
 "Setzt den Shell-Befehl, der aufgerufen wird, um eine WAL-Datei zu "
 "archivieren."
 
-#: utils/misc/guc.c:2527
+#: utils/misc/guc.c:2529
 msgid "Sets the client's character set encoding."
 msgstr "Setzt die Zeichensatzkodierung des Clients."
 
-#: utils/misc/guc.c:2538
+#: utils/misc/guc.c:2540
 msgid "Controls information prefixed to each log line."
 msgstr "Bestimmt die Informationen, die vor jede Logzeile geschrieben werden."
 
-#: utils/misc/guc.c:2539
+#: utils/misc/guc.c:2541
 msgid "If blank, no prefix is used."
 msgstr "Wenn leer, dann wird kein Präfix verwendet."
 
-#: utils/misc/guc.c:2548
+#: utils/misc/guc.c:2550
 msgid "Sets the time zone to use in log messages."
 msgstr "Setzt die in Logmeldungen verwendete Zeitzone."
 
-#: utils/misc/guc.c:2558
+#: utils/misc/guc.c:2560
 msgid "Sets the display format for date and time values."
 msgstr "Setzt das Ausgabeformat für Datums- und Zeitwerte."
 
-#: utils/misc/guc.c:2559
+#: utils/misc/guc.c:2561
 msgid "Also controls interpretation of ambiguous date inputs."
 msgstr "Kontrolliert auch die Interpretation von zweideutigen Datumseingaben."
 
-#: utils/misc/guc.c:2570
+#: utils/misc/guc.c:2572
 msgid "Sets the default tablespace to create tables and indexes in."
 msgstr "Setzt den Standard-Tablespace für Tabellen und Indexe."
 
-#: utils/misc/guc.c:2571
+#: utils/misc/guc.c:2573
 msgid "An empty string selects the database's default tablespace."
 msgstr "Eine leere Zeichenkette wählt den Standard-Tablespace der Datenbank."
 
-#: utils/misc/guc.c:2581
+#: utils/misc/guc.c:2583
 msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr ""
 "Setzt den oder die Tablespaces für temporäre Tabellen und Sortierdateien."
 
-#: utils/misc/guc.c:2592
+#: utils/misc/guc.c:2594
 msgid "Sets the path for dynamically loadable modules."
 msgstr "Setzt den Pfad für ladbare dynamische Bibliotheken."
 
-#: utils/misc/guc.c:2593
+#: utils/misc/guc.c:2595
 msgid ""
 "If a dynamically loadable module needs to be opened and the specified name "
 "does not have a directory component (i.e., the name does not contain a "
@@ -17949,78 +17870,78 @@ msgstr ""
 "Schrägstrich), dann sucht das System in diesem Pfad nach der angegebenen "
 "Datei."
 
-#: utils/misc/guc.c:2606
+#: utils/misc/guc.c:2608
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Setzt den Ort der Kerberos-Server-Schlüsseldatei."
 
-#: utils/misc/guc.c:2617
+#: utils/misc/guc.c:2619
 msgid "Sets the name of the Kerberos service."
 msgstr "Setzt den Namen des Kerberos-Service."
 
-#: utils/misc/guc.c:2627
+#: utils/misc/guc.c:2629
 msgid "Sets the Bonjour service name."
 msgstr "Setzt den Bonjour-Servicenamen."
 
-#: utils/misc/guc.c:2639
+#: utils/misc/guc.c:2641
 msgid "Shows the collation order locale."
 msgstr "Zeigt die Locale für die Sortierreihenfolge."
 
-#: utils/misc/guc.c:2650
+#: utils/misc/guc.c:2652
 msgid "Shows the character classification and case conversion locale."
 msgstr "Zeigt die Locale für Zeichenklassifizierung und Groß-/Kleinschreibung."
 
-#: utils/misc/guc.c:2661
+#: utils/misc/guc.c:2663
 msgid "Sets the language in which messages are displayed."
 msgstr "Setzt die Sprache, in der Mitteilungen ausgegeben werden."
 
-#: utils/misc/guc.c:2671
+#: utils/misc/guc.c:2673
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Setzt die Locale für die Formatierung von Geldbeträgen."
 
-#: utils/misc/guc.c:2681
+#: utils/misc/guc.c:2683
 msgid "Sets the locale for formatting numbers."
 msgstr "Setzt die Locale für die Formatierung von Zahlen."
 
-#: utils/misc/guc.c:2691
+#: utils/misc/guc.c:2693
 msgid "Sets the locale for formatting date and time values."
 msgstr "Setzt die Locale für die Formatierung von Datums- und Zeitwerten."
 
-#: utils/misc/guc.c:2701
+#: utils/misc/guc.c:2703
 msgid "Lists shared libraries to preload into server."
 msgstr ""
 "Listet dynamische Bibliotheken, die vorab in den Server geladen werden."
 
-#: utils/misc/guc.c:2712
+#: utils/misc/guc.c:2714
 msgid "Lists shared libraries to preload into each backend."
 msgstr ""
 "Listet dynamische Bibliotheken, die vorab in jeden Serverprozess geladen "
 "werden."
 
-#: utils/misc/guc.c:2723
+#: utils/misc/guc.c:2725
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr "Setzt die Schemasuchreihenfolge für Namen ohne Schemaqualifikation."
 
-#: utils/misc/guc.c:2735
+#: utils/misc/guc.c:2737
 msgid "Sets the server (database) character set encoding."
 msgstr "Setzt die Zeichensatzkodierung des Servers (der Datenbank)."
 
-#: utils/misc/guc.c:2747
+#: utils/misc/guc.c:2749
 msgid "Shows the server version."
 msgstr "Zeigt die Serverversion."
 
-#: utils/misc/guc.c:2759
+#: utils/misc/guc.c:2761
 msgid "Sets the current role."
 msgstr "Setzt die aktuelle Rolle."
 
-#: utils/misc/guc.c:2771
+#: utils/misc/guc.c:2773
 msgid "Sets the session user name."
 msgstr "Setzt den Sitzungsbenutzernamen."
 
-#: utils/misc/guc.c:2782
+#: utils/misc/guc.c:2784
 msgid "Sets the destination for server log output."
 msgstr "Setzt das Ziel für die Serverlogausgabe."
 
-#: utils/misc/guc.c:2783
+#: utils/misc/guc.c:2785
 msgid ""
 "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
 "\"eventlog\", depending on the platform."
@@ -18028,117 +17949,117 @@ msgstr ""
 "Gültige Werte sind Kombinationen von »stderr«, »syslog«, »csvlog« und "
 "»eventlog«, je nach Plattform."
 
-#: utils/misc/guc.c:2794
+#: utils/misc/guc.c:2796
 msgid "Sets the destination directory for log files."
 msgstr "Bestimmt das Zielverzeichnis für Logdateien."
 
-#: utils/misc/guc.c:2795
+#: utils/misc/guc.c:2797
 msgid "Can be specified as relative to the data directory or as absolute path."
 msgstr ""
 "Kann relativ zum Datenverzeichnis oder als absoluter Pfad angegeben werden."
 
-#: utils/misc/guc.c:2805
+#: utils/misc/guc.c:2807
 msgid "Sets the file name pattern for log files."
 msgstr "Bestimmt das Dateinamenmuster für Logdateien."
 
-#: utils/misc/guc.c:2816
+#: utils/misc/guc.c:2818
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr ""
 "Setzt den Programmnamen, mit dem PostgreSQL-Meldungen im Syslog "
 "identifiziert werden."
 
-#: utils/misc/guc.c:2827
+#: utils/misc/guc.c:2829
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr ""
 "Setzt die Zeitzone, in der Zeitangaben interpretiert und ausgegeben werden."
 
-#: utils/misc/guc.c:2837
+#: utils/misc/guc.c:2839
 msgid "Selects a file of time zone abbreviations."
 msgstr "Wählt eine Datei mit Zeitzonenabkürzungen."
 
-#: utils/misc/guc.c:2847
+#: utils/misc/guc.c:2849
 msgid "Sets the current transaction's isolation level."
 msgstr "Zeigt den Isolationsgrad der aktuellen Transaktion."
 
-#: utils/misc/guc.c:2858
+#: utils/misc/guc.c:2860
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Setzt die Eigentümergruppe der Unix-Domain-Socket."
 
-#: utils/misc/guc.c:2859
+#: utils/misc/guc.c:2861
 msgid ""
 "The owning user of the socket is always the user that starts the server."
 msgstr "Der Eigentümer ist immer der Benutzer, der den Server startet."
 
-#: utils/misc/guc.c:2869
+#: utils/misc/guc.c:2871
 msgid "Sets the directory where the Unix-domain socket will be created."
 msgstr ""
 "Setzt das Verzeichnis, in dem die Unix-Domain-Socket erzeugt werden soll."
 
-#: utils/misc/guc.c:2880
+#: utils/misc/guc.c:2882
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr ""
 "Setzt den Hostnamen oder die IP-Adresse(n), auf der auf Verbindungen "
 "gewartet wird."
 
-#: utils/misc/guc.c:2891
+#: utils/misc/guc.c:2893
 msgid "Sets the list of known custom variable classes."
 msgstr "Bestimmt die Liste der bekannten benutzerdefinierten Variablenklassen."
 
-#: utils/misc/guc.c:2902
+#: utils/misc/guc.c:2904
 msgid "Sets the server's data directory."
 msgstr "Setzt das Datenverzeichnis des Servers."
 
-#: utils/misc/guc.c:2913
+#: utils/misc/guc.c:2915
 msgid "Sets the server's main configuration file."
 msgstr "Setzt die Hauptkonfigurationsdatei des Servers."
 
-#: utils/misc/guc.c:2924
+#: utils/misc/guc.c:2926
 msgid "Sets the server's \"hba\" configuration file."
 msgstr "Setzt die »hba«-Konfigurationsdatei des Servers."
 
-#: utils/misc/guc.c:2935
+#: utils/misc/guc.c:2937
 msgid "Sets the server's \"ident\" configuration file."
 msgstr "Setzt die »ident«-Konfigurationsdatei des Servers."
 
-#: utils/misc/guc.c:2946
+#: utils/misc/guc.c:2948
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Schreibt die Postmaster-PID in die angegebene Datei."
 
-#: utils/misc/guc.c:2957
+#: utils/misc/guc.c:2959
 msgid "Writes temporary statistics files to the specified directory."
 msgstr "Schreibt temporäre Statistikdateien in das angegebene Verzeichnis."
 
-#: utils/misc/guc.c:2968
-msgid "List of potential standby names to synchronise with."
-msgstr ""
+#: utils/misc/guc.c:2970
+msgid "List of names of potential synchronous standbys."
+msgstr "Liste der Namen der möglichen synchronen Standbys."
 
-#: utils/misc/guc.c:2979
+#: utils/misc/guc.c:2981
 msgid "Sets default text search configuration."
 msgstr "Setzt die vorgegebene Textsuchekonfiguration."
 
-#: utils/misc/guc.c:2989
+#: utils/misc/guc.c:2991
 msgid "Sets the list of allowed SSL ciphers."
 msgstr "Setzt die Liste der erlaubten SSL-Verschlüsselungsalgorithmen."
 
-#: utils/misc/guc.c:3004
+#: utils/misc/guc.c:3006
 msgid "Sets the application name to be reported in statistics and logs."
 msgstr ""
 "Setzt den Anwendungsnamen, der in Statistiken und Logs verzeichnet wird."
 
-#: utils/misc/guc.c:3024
+#: utils/misc/guc.c:3026
 msgid "Sets whether \"\\'\" is allowed in string literals."
 msgstr "Bestimmt, ob »\\'« in Zeichenkettenkonstanten erlaubt ist."
 
-#: utils/misc/guc.c:3034
+#: utils/misc/guc.c:3036
 msgid "Sets the output format for bytea."
 msgstr "Setzt das Ausgabeformat für bytea."
 
-#: utils/misc/guc.c:3044
+#: utils/misc/guc.c:3046
 msgid "Sets the message levels that are sent to the client."
 msgstr "Setzt die Meldungstypen, die an den Client gesendet werden."
 
-#: utils/misc/guc.c:3045 utils/misc/guc.c:3098 utils/misc/guc.c:3109
-#: utils/misc/guc.c:3165
+#: utils/misc/guc.c:3047 utils/misc/guc.c:3100 utils/misc/guc.c:3111
+#: utils/misc/guc.c:3167
 msgid ""
 "Each level includes all the levels that follow it. The later the level, the "
 "fewer messages are sent."
@@ -18146,13 +18067,13 @@ msgstr ""
 "Jeder Wert schließt alle ihm folgenden Werte mit ein. Je weiter hinten der "
 "Wert steht, desto weniger Meldungen werden gesendet werden."
 
-#: utils/misc/guc.c:3055
+#: utils/misc/guc.c:3057
 msgid "Enables the planner to use constraints to optimize queries."
 msgstr ""
 "Ermöglicht dem Planer die Verwendung von Constraints, um Anfragen zu "
 "optimieren."
 
-#: utils/misc/guc.c:3056
+#: utils/misc/guc.c:3058
 msgid ""
 "Table scans will be skipped if their constraints guarantee that no rows "
 "match the query."
@@ -18160,71 +18081,70 @@ msgstr ""
 "Tabellen-Scans werden übersprungen, wenn deren Constraints garantieren, dass "
 "keine Zeile mit der Abfrage übereinstimmt."
 
-#: utils/misc/guc.c:3066
+#: utils/misc/guc.c:3068
 msgid "Sets the transaction isolation level of each new transaction."
 msgstr "Setzt den Transaktionsisolationsgrad neuer Transaktionen."
 
-#: utils/misc/guc.c:3076
+#: utils/misc/guc.c:3078
 msgid "Sets the display format for interval values."
 msgstr "Setzt das Ausgabeformat für Intervallwerte."
 
-#: utils/misc/guc.c:3087
+#: utils/misc/guc.c:3089
 msgid "Sets the verbosity of logged messages."
 msgstr "Setzt den Detailgrad von geloggten Meldungen."
 
-#: utils/misc/guc.c:3097
+#: utils/misc/guc.c:3099
 msgid "Sets the message levels that are logged."
 msgstr "Setzt die Meldungstypen, die geloggt werden."
 
-#: utils/misc/guc.c:3108
+#: utils/misc/guc.c:3110
 msgid ""
 "Causes all statements generating error at or above this level to be logged."
 msgstr ""
 "Schreibt alle Anweisungen, die einen Fehler auf dieser Stufe oder höher "
 "verursachen, in den Log."
 
-#: utils/misc/guc.c:3119
+#: utils/misc/guc.c:3121
 msgid "Sets the type of statements logged."
 msgstr "Setzt die Anweisungsarten, die geloggt werden."
 
-#: utils/misc/guc.c:3129
+#: utils/misc/guc.c:3131
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr ""
 "Setzt die zu verwendende Syslog-»Facility«, wenn Syslog angeschaltet ist."
 
-#: utils/misc/guc.c:3144
+#: utils/misc/guc.c:3146
 msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr "Setzt das Sitzungsverhalten für Trigger und Regeln."
 
-#: utils/misc/guc.c:3154
-#, fuzzy
+#: utils/misc/guc.c:3156
 msgid "Sets the current transaction's synchronization level."
-msgstr "Zeigt den Isolationsgrad der aktuellen Transaktion."
+msgstr "Setzt den Synchronisationsgrad der aktuellen Transaktion."
 
-#: utils/misc/guc.c:3164
+#: utils/misc/guc.c:3166
 msgid "Enables logging of recovery-related debugging information."
 msgstr ""
 "Ermöglicht das Loggen von Debug-Informationen über die Wiederherstellung."
 
-#: utils/misc/guc.c:3180
+#: utils/misc/guc.c:3182
 msgid "Collects function-level statistics on database activity."
 msgstr "Sammelt Statistiken auf Funktionsebene über Datenbankaktivität."
 
-#: utils/misc/guc.c:3190
+#: utils/misc/guc.c:3192
 msgid "Set the level of information written to the WAL."
 msgstr "Setzt den Umfang der in den WAL geschriebenen Informationen."
 
-#: utils/misc/guc.c:3200
+#: utils/misc/guc.c:3202
 msgid "Selects the method used for forcing WAL updates to disk."
 msgstr ""
 "Wählt die Methode, um das Schreiben von WAL-Änderungen auf die Festplatte zu "
 "erzwingen."
 
-#: utils/misc/guc.c:3210
+#: utils/misc/guc.c:3212
 msgid "Sets how binary values are to be encoded in XML."
 msgstr "Setzt, wie binäre Werte in XML kodiert werden."
 
-#: utils/misc/guc.c:3220
+#: utils/misc/guc.c:3222
 msgid ""
 "Sets whether XML data in implicit parsing and serialization operations is to "
 "be considered as documents or content fragments."
@@ -18232,7 +18152,7 @@ msgstr ""
 "Setzt, ob XML-Daten in impliziten Parse- und Serialisierungsoperationen als "
 "Dokument oder Fragment betrachtet werden sollen."
 
-#: utils/misc/guc.c:4062
+#: utils/misc/guc.c:4064
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -18243,12 +18163,12 @@ msgstr ""
 "Sie müssen die Kommandozeilenoption --config-file oder -D angegeben oder\n"
 "die Umgebungsvariable PGDATA setzen.\n"
 
-#: utils/misc/guc.c:4081
+#: utils/misc/guc.c:4083
 #, c-format
 msgid "%s cannot access the server configuration file \"%s\": %s\n"
 msgstr "%s kann nicht auf die Serverkonfigurationsdatei »%s« zugreifen: %s\n"
 
-#: utils/misc/guc.c:4101
+#: utils/misc/guc.c:4103
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -18259,7 +18179,7 @@ msgstr ""
 "zu finden sind.  Sie können dies mit »data_directory« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
-#: utils/misc/guc.c:4132
+#: utils/misc/guc.c:4134
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -18270,7 +18190,7 @@ msgstr ""
 "Sie können dies mit »hba_file« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
-#: utils/misc/guc.c:4155
+#: utils/misc/guc.c:4157
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -18281,156 +18201,240 @@ msgstr ""
 "Sie können dies mit »ident_file« in »%s«, mit der\n"
 "Kommandozeilenoption -D oder der Umgebungsvariable PGDATA angeben.\n"
 
-#: utils/misc/guc.c:4735 utils/misc/guc.c:4899
+#: utils/misc/guc.c:4739 utils/misc/guc.c:4903
 msgid "Value exceeds integer range."
 msgstr "Wert überschreitet Bereich für ganze Zahlen."
 
-#: utils/misc/guc.c:4754
+#: utils/misc/guc.c:4758
 msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
 msgstr "Gültige Einheiten für diesen Parameter sind »kB«, »MB« und »GB«."
 
-#: utils/misc/guc.c:4813
+#: utils/misc/guc.c:4817
 msgid ""
 "Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr ""
 "Gültige Einheiten für diesen Parameter sind »ms«, »s«, »min«, »h« und »d«."
 
-#: utils/misc/guc.c:5096 utils/misc/guc.c:5859 utils/misc/guc.c:5909
-#: utils/misc/guc.c:6582 utils/misc/guc.c:6741 utils/misc/guc.c:7902
+#: utils/misc/guc.c:5100 utils/misc/guc.c:5869 utils/misc/guc.c:5921
+#: utils/misc/guc.c:6594 utils/misc/guc.c:6753 utils/misc/guc.c:7932
 #: guc-file.l:203
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "unbekannter Konfigurationsparameter »%s«"
 
-#: utils/misc/guc.c:5129
+#: utils/misc/guc.c:5133
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "Parameter »%s« kann nicht geändert werden"
 
-#: utils/misc/guc.c:5158 utils/misc/guc.c:5332 utils/misc/guc.c:5429
-#: utils/misc/guc.c:5523 utils/misc/guc.c:5637 utils/misc/guc.c:5738
+#: utils/misc/guc.c:5162 utils/misc/guc.c:5336 utils/misc/guc.c:5433
+#: utils/misc/guc.c:5527 utils/misc/guc.c:5641 utils/misc/guc.c:5742
 #: guc-file.l:250
 #, c-format
 msgid "parameter \"%s\" cannot be changed without restarting the server"
 msgstr ""
 "Parameter »%s« kann nicht geändert werden, ohne den Server neu zu starten"
 
-#: utils/misc/guc.c:5168
+#: utils/misc/guc.c:5172
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "Parameter »%s« kann jetzt nicht geändert werden"
 
-#: utils/misc/guc.c:5199
+#: utils/misc/guc.c:5203
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "Parameter »%s« kann nach Start der Verbindung nicht geändert werden"
 
-#: utils/misc/guc.c:5209 utils/misc/guc.c:7917
+#: utils/misc/guc.c:5213 utils/misc/guc.c:7947
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "keine Berechtigung, um Parameter »%s« zu setzen"
 
-#: utils/misc/guc.c:5247
+#: utils/misc/guc.c:5251
 #, c-format
 msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr ""
 "Parameter »%s« kann nicht in einer Security-Definer-Funktion gesetzt werden"
 
-#: utils/misc/guc.c:5393 utils/misc/guc.c:5707 utils/misc/guc.c:8081
-#: utils/misc/guc.c:8115
+#: utils/misc/guc.c:5397 utils/misc/guc.c:5711 utils/misc/guc.c:8111
+#: utils/misc/guc.c:8145
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "ungültiger Wert für Parameter »%s«: »%s«"
 
-#: utils/misc/guc.c:5402
+#: utils/misc/guc.c:5406
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d ist außerhalb des gültigen Bereichs für Parameter »%s« (%d ... %d)"
 
-#: utils/misc/guc.c:5488
+#: utils/misc/guc.c:5492
 #, c-format
 msgid "parameter \"%s\" requires a numeric value"
 msgstr "Parameter »%s« erfordert einen numerischen Wert"
 
-#: utils/misc/guc.c:5496
+#: utils/misc/guc.c:5500
 #, c-format
 msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
 msgstr "%g ist außerhalb des gültigen Bereichs für Parameter »%s« (%g ... %g)"
 
-#: utils/misc/guc.c:5865 utils/misc/guc.c:5913 utils/misc/guc.c:6745
+#: utils/misc/guc.c:5877 utils/misc/guc.c:5925 utils/misc/guc.c:6757
 #, c-format
 msgid "must be superuser to examine \"%s\""
 msgstr "nur Superuser können »%s« ansehen"
 
-#: utils/misc/guc.c:5979
+#: utils/misc/guc.c:5991
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s darf nur ein Argument haben"
 
-#: utils/misc/guc.c:6212
+#: utils/misc/guc.c:6224
 msgid "SET requires parameter name"
 msgstr "SET benötigt Parameternamen"
 
-#: utils/misc/guc.c:6327
+#: utils/misc/guc.c:6339
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "Versuch, den Parameter »%s« zu redefinieren"
 
-#: utils/misc/guc.c:7618
+#: utils/misc/guc.c:7648
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "konnte Wert von Parameter »%s« nicht lesen"
 
-#: utils/misc/guc.c:7979 utils/misc/guc.c:8013
+#: utils/misc/guc.c:8009 utils/misc/guc.c:8043
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "ungültiger Wert für Parameter »%s«: %d"
 
-#: utils/misc/guc.c:8047
+#: utils/misc/guc.c:8077
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "ungültiger Wert für Parameter »%s«: %g"
 
-#: utils/misc/guc.c:8237
+#: utils/misc/guc.c:8267
 msgid ""
-"\"temp_buffers\" cannot be changed after any temp tables have been accessed "
-"in the session."
+"\"temp_buffers\" cannot be changed after any temporary tables have been "
+"accessed in the session."
 msgstr ""
+"»temp_buffers« kann nicht geändert werden, nachdem in der Sitzung auf "
+"temporäre Tabellen zugriffen wurde."
 
-#: utils/misc/guc.c:8249
+#: utils/misc/guc.c:8279
 msgid "SET AUTOCOMMIT TO OFF is no longer supported"
 msgstr "SET AUTOCOMMIT TO OFF wird nicht mehr unterstützt"
 
-#: utils/misc/guc.c:8324
+#: utils/misc/guc.c:8354
 msgid "assertion checking is not supported by this build"
 msgstr "Assert-Prüfungen werden von dieser Installation nicht unterstützt"
 
-#: utils/misc/guc.c:8337
+#: utils/misc/guc.c:8367
 msgid "Bonjour is not supported by this build"
 msgstr "Bonjour wird von dieser Installation nicht unterstützt"
 
-#: utils/misc/guc.c:8350
+#: utils/misc/guc.c:8380
 msgid "SSL is not supported by this build"
 msgstr "SSL wird von dieser Installation nicht unterstützt"
 
-#: utils/misc/guc.c:8362
-#, fuzzy
+#: utils/misc/guc.c:8392
 msgid "Cannot enable parameter when \"log_statement_stats\" is true."
-msgstr "kann Parameter nicht einschalten, wenn »log_statement_stats« an ist"
+msgstr "Kann Parameter nicht einschalten, wenn »log_statement_stats« an ist."
 
-#: utils/misc/guc.c:8374
-#, fuzzy
+#: utils/misc/guc.c:8404
 msgid ""
 "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
 "\"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr ""
-"kann »log_statement_stats« nicht einschalten, wenn »log_parser_stats«, "
-"»log_planner_stats« oder »log_executor_stats« an ist"
+"Kann »log_statement_stats« nicht einschalten, wenn »log_parser_stats«, "
+"»log_planner_stats« oder »log_executor_stats« an ist."
 
 #: utils/misc/help_config.c:131
 msgid "internal error: unrecognized run-time parameter type\n"
 msgstr "interner Fehler: unbekannter Parametertyp\n"
 
+#: utils/misc/tzparser.c:61
+#, c-format
+msgid ""
+"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
+"zone file \"%s\", line %d"
+msgstr ""
+"Zeitzonenabkürzung »%s« ist zu lang (maximal %d Zeichen) in Zeitzonendatei "
+"»%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:68
+#, c-format
+msgid ""
+"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
+"\"%s\", line %d"
+msgstr ""
+"Zeitzonenabstand %d ist kein Vielfaches von 900 s (15 min) in Zeitzonendatei "
+"»%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:80
+#, c-format
+msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
+msgstr ""
+"Zeitzonenabstand %d ist außerhalb des gültigen Bereichs in Zeitzonendatei "
+"»%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:115
+#, c-format
+msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
+msgstr "fehlende Zeitzonenabkürzung in Zeitzonendatei »%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:124
+#, c-format
+msgid "missing time zone offset in time zone file \"%s\", line %d"
+msgstr "fehlender Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:131
+#, c-format
+msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
+msgstr "ungültige Zahl für Zeitzonenabstand in Zeitzonendatei »%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:154
+#, c-format
+msgid "invalid syntax in time zone file \"%s\", line %d"
+msgstr "ungültige Syntax in Zeitzonendatei »%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:218
+#, c-format
+msgid "time zone abbreviation \"%s\" is multiply defined"
+msgstr "Zeitzonenabkürzung »%s« ist mehrfach definiert"
+
+#: utils/misc/tzparser.c:220
+#, c-format
+msgid ""
+"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
+"\", line %d."
+msgstr ""
+"Eintrag in Zeitzonendatei »%s«, Zeile %d, steht im Konflikt mit Eintrag in "
+"Datei »%s«, Zeile %d."
+
+#: utils/misc/tzparser.c:285
+#, c-format
+msgid "invalid time zone file name \"%s\""
+msgstr "ungültiger Zeitzonen-Dateiname »%s«"
+
+#: utils/misc/tzparser.c:298
+#, c-format
+msgid "time zone file recursion limit exceeded in file \"%s\""
+msgstr "Rekursionsbeschränkung für Zeitzonendatei überschritten in Datei »%s«"
+
+#: utils/misc/tzparser.c:337 utils/misc/tzparser.c:350
+#, c-format
+msgid "could not read time zone file \"%s\": %m"
+msgstr "konnte Zeitzonendatei »%s« nicht lesen: %m"
+
+#: utils/misc/tzparser.c:360
+#, c-format
+msgid "line is too long in time zone file \"%s\", line %d"
+msgstr "Zeile ist zu lang in Zeitzonendatei »%s«, Zeile %d"
+
+#: utils/misc/tzparser.c:383
+#, c-format
+msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
+msgstr "@INCLUDE ohne Dateiname in Zeitzonendatei »%s«, Zeile %d"
+
 #: guc-file.l:274
 #, c-format
 msgid "parameter \"%s\" removed from configuration file, reset to default"
@@ -18486,14 +18490,14 @@ msgid "could not set junction for \"%s\": %s\n"
 msgstr "konnte Junction für »%s« nicht erzeugen: %s\n"
 
 #: ../port/dirmod.c:358
-#, fuzzy, c-format
+#, c-format
 msgid "could not get junction for \"%s\": %s"
-msgstr "konnte Junction für »%s« nicht erzeugen: %s"
+msgstr "konnte Junction für »%s« nicht lesen: %s"
 
 #: ../port/dirmod.c:361
-#, fuzzy, c-format
+#, c-format
 msgid "could not get junction for \"%s\": %s\n"
-msgstr "konnte Junction für »%s« nicht erzeugen: %s\n"
+msgstr "konnte Junction für »%s« nicht lesen: %s\n"
 
 #: ../port/dirmod.c:443
 #, c-format
@@ -18609,144 +18613,3 @@ msgstr "win32-Fehlercode %lu nach %d abgebildet"
 #, c-format
 msgid "unrecognized win32 error code: %lu"
 msgstr "unbekannter win32-Fehlercode: %lu"
-
-#~ msgid "syntax error in recovery command file: %s"
-#~ msgstr "Syntaxfehler in Recovery-Kommandodatei: %s"
-
-#~ msgid "Lines should have the format parameter = 'value'."
-#~ msgstr "Die Zeilen müssen das Format parameter = 'wert' haben."
-
-#~ msgid "array must not contain null values"
-#~ msgstr "Array darf keine NULL-Werte enthalten"
-
-#~ msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
-#~ msgstr ""
-#~ "Index %u/%u/%u benötigt VACUUM FULL oder REINDEX, um Wiederherstellung "
-#~ "nach Absturz abzuschließen"
-
-#~ msgid "Incomplete insertion detected during crash replay."
-#~ msgstr "Unvollständige Einfügeoperation beim Crash-Replay entdeckt."
-
-#~ msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
-#~ msgstr ""
-#~ "Index »%s« benötigt VACUUM oder REINDEX, um Wiederherstellung nach "
-#~ "Absturz abzuschließen"
-
-#~ msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
-#~ msgstr ""
-#~ "Index »%s« benötigt VACUUM FULL oder REINDEX, um Wiederherstellung nach "
-#~ "Absturz abzuschließen"
-
-#~ msgid "EnumValuesCreate() can only set a single OID"
-#~ msgstr "EnumValuesCreate() kann nur eine einzelne OID setzen"
-
-#~ msgid ""
-#~ "cannot cluster on index \"%s\" because access method does not handle null "
-#~ "values"
-#~ msgstr ""
-#~ "kann nicht anhand des Index »%s« clustern, weil die Indexmethode keine "
-#~ "NULL-Werte verarbeiten kann"
-
-#~ msgid ""
-#~ "You might be able to work around this by marking column \"%s\" NOT NULL, "
-#~ "or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster "
-#~ "specification from the table."
-#~ msgstr ""
-#~ "Sie können das möglicherweise umgehen, indem Sie die Spalte »%s« als NOT "
-#~ "NULL markieren oder mit ALTER TABLE ... SET WITHOUT CLUSTER die Cluster-"
-#~ "Markierung von der Tabelle entfernen."
-
-#~ msgid ""
-#~ "You might be able to work around this by marking column \"%s\" NOT NULL."
-#~ msgstr ""
-#~ "Sie können das möglicherweise umgehen, indem Sie die Spalte »%s« als NOT "
-#~ "NULL markieren."
-
-#~ msgid ""
-#~ "cannot cluster on expressional index \"%s\" because its index access "
-#~ "method does not handle null values"
-#~ msgstr ""
-#~ "kann nicht anhand des Ausdrucksindex »%s« clustern, weil die Indexmethode "
-#~ "keine NULL-Werte verarbeiten kann"
-
-#~ msgid "\"%s\" is not a table, view, or composite type"
-#~ msgstr ""
-#~ "»%s« ist keine Tabelle, Sicht oder Sequenz und kein zusammengesetzter Typ"
-
-#~ msgid "must be member of role \"%s\" to comment upon it"
-#~ msgstr ""
-#~ "nur für Mitglieder der Rolle »%s« können einen Kommentar für sie erstellen"
-
-#~ msgid "must be superuser to comment on procedural language"
-#~ msgstr "nur Superuser können Kommentare für prozedurale Sprachen erzeugen"
-
-#~ msgid "must be superuser to comment on text search parser"
-#~ msgstr "nur Superuser können Kommentare für Textsucheparser erzeugen"
-
-#~ msgid "must be superuser to comment on text search template"
-#~ msgstr "nur Superuser können Kommentare für Textsuchevorlagen erzeugen"
-
-#~ msgid "function \"%s\" is already in schema \"%s\""
-#~ msgstr "Funktion »%s« ist bereits in Schema »%s«"
-
-#~ msgid "cannot reference temporary table from permanent table constraint"
-#~ msgstr ""
-#~ "temporäre Tabelle kann nicht in permanentem Tabellen-Constraint benutzt "
-#~ "werden"
-
-#~ msgid "cannot reference permanent table from temporary table constraint"
-#~ msgstr ""
-#~ "permanente Tabelle kann nicht in temporären Tabellen-Constraint benutzt "
-#~ "werden"
-
-#~ msgid "composite type must have at least one attribute"
-#~ msgstr "zusammengesetzter Typ muss mindestens ein Attribut haben"
-
-#~ msgid "database \"%s\" not found"
-#~ msgstr "Datenbank »%s« nicht gefunden"
-
-#~ msgid "invalid list syntax for parameter \"datestyle\""
-#~ msgstr "ungültige Listensyntax für Parameter »datestyle«"
-
-#~ msgid "unrecognized \"datestyle\" key word: \"%s\""
-#~ msgstr "unbekanntes »datestyle«-Schlüsselwort: »%s«"
-
-#~ msgid "invalid interval value for time zone: month not allowed"
-#~ msgstr "ungültige Intervallangabe für Zeitzone: Monat nicht erlaubt"
-
-#~ msgid "invalid interval value for time zone: day not allowed"
-#~ msgstr "ungültige Intervallangabe für Zeitzone: Tag nicht erlaubt"
-
-#~ msgid "unrecognized time zone name: \"%s\""
-#~ msgstr "unbekannter Zeitzonenname: »%s«"
-
-#~ msgid "argument to pg_get_expr() must come from system catalogs"
-#~ msgstr "Argument von pg_get_expr() muss aus den Systemkatalogen kommen"
-
-#~ msgid "cannot change view \"%s\""
-#~ msgstr "kann Sicht »%s« nicht ändern"
-
-#~ msgid "hostssl not supported on this platform"
-#~ msgstr "hostssl wird auf dieser Plattform nicht unterstützt"
-
-#~ msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
-#~ msgstr ""
-#~ "SELECT FOR UPDATE/SHARE kann nicht auf NEW oder OLD angewendet werden"
-
-#~ msgid "could not create log file \"%s\": %m"
-#~ msgstr "konnte Logdatei »%s« nicht erstellen: %m"
-
-#~ msgid "could not open new log file \"%s\": %m"
-#~ msgstr "konnte neue Logdatei »%s« nicht öffnen: %m"
-
-#~ msgid "Sets immediate fsync at commit."
-#~ msgstr "Setzt sofortiges Fsync beim Committen."
-
-#~ msgid "invalid list syntax for parameter \"log_destination\""
-#~ msgstr "ungültige Listensyntax für Parameter »log_destination«"
-
-#~ msgid "unrecognized \"log_destination\" key word: \"%s\""
-#~ msgstr "unbekanntes »log_destination«-Schlüsselwort: »%s«"
-
-#~ msgid "replication connection authorized: user=%s host=%s port=%s"
-#~ msgstr "Replikationsverbindung authorisiert: Benutzer=%s Host=%s Port=%s"
diff --git a/src/backend/po/es.po b/src/backend/po/es.po
index 69b320de1f3d4..251d9d1d1203c 100644
--- a/src/backend/po/es.po
+++ b/src/backend/po/es.po
@@ -1,14 +1,14 @@
 # Spanish message translation file for PostgreSQL server
 #
-# Copyright (C) 2002-2010 PostgreSQL Global Development Group
+# Copyright (C) 2002-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Karim Mribti  <karim@mribti.com> 2002.
-# Alvaro Herrera <alvherre@alvh.no-ip.org> 2003-2010
+# Alvaro Herrera <alvherre@alvh.no-ip.org> 2003-2011
 # Jaime Casanova <systemguards@gmail.com> 2005, 2006
 # Emanuel Calvo Franco <postgres-arg@gmail.com> 2008
 #
-# pgtranslation Id: postgres.po,v 1.33 2011/03/15 22:01:30 alvherre Exp $
+# pgtranslation Id: postgres.po,v 1.39 2011/09/22 13:18:04 alvherre Exp $
 #
 #
 # Glosario:
@@ -24,6 +24,9 @@
 # to grant				otorgar
 # lexeme				lexema
 # locale				configuración regional
+# to lock				bloquear
+# lock (sustantivo)			candado
+# to obtain a lock			bloquear un candado
 # mapping				mapeo
 # operator class			clase de operadores
 # to overflow				desbordar
@@ -43,7 +46,7 @@
 # FIXME varios:
 # * "port" se traduce en forma inconsistente; corregir
 # * "window function" probablemente debería ser "función de ventana deslizante"
-# * buscar un término mejor que "Entrada" para traducir "entry".
+# * buscar un término mejor que "Entrada" para traducir "entry" (elemento?)
 # * traducimos "large object" como "objeto grande".  ¿debería dejarse sin traducir?
 # * "concurrently" -> "por una transacción concurrente".  Discutible ...
 # * "standby" -> ??
@@ -51,10 +54,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL server 9.0\n"
+"Project-Id-Version: PostgreSQL server 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-12-09 02:56+0000\n"
-"PO-Revision-Date: 2011-03-15 18:59-0300\n"
+"POT-Creation-Date: 2011-09-22 04:58+0000\n"
+"PO-Revision-Date: 2011-09-22 10:17-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
 "Language: \n"
@@ -63,761 +66,656 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: main/main.c:230
+#: nodes/nodeFuncs.c:114 nodes/nodeFuncs.c:140 parser/parse_coerce.c:1645
+#: parser/parse_coerce.c:1662 parser/parse_coerce.c:1724
+#: parser/parse_expr.c:1633 parser/parse_func.c:367 parser/parse_oper.c:948
 #, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr "%s: setsysinfo falló: %s\n"
-
-#: main/main.c:249
-#, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s: WSAStartup falló: %d\n"
+msgid "could not find array type for data type %s"
+msgstr "no se pudo encontrar un tipo de array para el tipo de dato %s"
 
-#: main/main.c:268
-#, c-format
-msgid ""
-"%s is the PostgreSQL server.\n"
-"\n"
-msgstr "%s es el servidor PostgreSQL.\n"
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:615
+msgid "multiple DictFile parameters"
+msgstr "parámetro DictFile duplicado"
 
-#: main/main.c:269
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION]...\n"
-"\n"
-msgstr ""
-"Empleo:\n"
-"  %s [OPCION]...\n"
+#: tsearch/dict_ispell.c:64
+msgid "multiple AffFile parameters"
+msgstr "parámetro AffFile duplicado"
 
-#: main/main.c:270
-#, c-format
-msgid "Options:\n"
-msgstr "Opciones:\n"
+#: tsearch/dict_ispell.c:75 tsearch/dict_simple.c:50
+#: snowball/dict_snowball.c:206
+msgid "multiple StopWords parameters"
+msgstr "parámetro StopWords duplicado"
 
-#: main/main.c:272
+#: tsearch/dict_ispell.c:83
 #, c-format
-msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr ""
-"  -A 1|0          activar/desactivar el uso de aseveraciones (asserts)\n"
+msgid "unrecognized Ispell parameter: \"%s\""
+msgstr "parámetro Ispell no reconocido: «%s»"
 
-#: main/main.c:274
-#, c-format
-msgid "  -B NBUFFERS     number of shared buffers\n"
-msgstr "  -B NBUFFERS     número de búfers de memoria compartida\n"
+#: tsearch/dict_ispell.c:97
+msgid "missing AffFile parameter"
+msgstr "falta un parámetro AffFile"
 
-#: main/main.c:275
-#, c-format
-msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr "  -c VAR=VALOR    definir parámetro de ejecución\n"
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:639
+msgid "missing DictFile parameter"
+msgstr "falta un parámetro DictFile"
 
-#: main/main.c:276
-#, c-format
-msgid "  -d 1-5          debugging level\n"
-msgstr "  -d 1-5          nivel de depuración\n"
+#: tsearch/dict_simple.c:59
+msgid "multiple Accept parameters"
+msgstr "parámetro Accept duplicado"
 
-#: main/main.c:277
+#: tsearch/dict_simple.c:67
 #, c-format
-msgid "  -D DATADIR      database directory\n"
-msgstr "  -D DATADIR      directorio de bases de datos\n"
+msgid "unrecognized simple dictionary parameter: \"%s\""
+msgstr "parámetro del diccionario simple no reconocido: «%s»"
 
-#: main/main.c:278
+#: tsearch/dict_synonym.c:119
 #, c-format
-msgid "  -e              use European date input format (DMY)\n"
-msgstr "  -e              usar estilo europeo de fechas (DMY)\n"
+msgid "unrecognized synonym parameter: \"%s\""
+msgstr "parámetro de sinónimo no reconocido «%s»"
 
-#: main/main.c:279
-#, c-format
-msgid "  -F              turn fsync off\n"
-msgstr "  -F              desactivar fsync\n"
+#: tsearch/dict_synonym.c:126
+msgid "missing Synonyms parameter"
+msgstr "falta un parámetro Synonyms"
 
-#: main/main.c:280
+#: tsearch/dict_synonym.c:133
 #, c-format
-msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr "  -h NOMBRE       nombre de host o dirección IP en que escuchar\n"
+msgid "could not open synonym file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de sinónimos «%s»: %m"
 
-#: main/main.c:281
+#: tsearch/dict_thesaurus.c:180
 #, c-format
-msgid "  -i              enable TCP/IP connections\n"
-msgstr "  -i              activar conexiones TCP/IP\n"
+msgid "could not open thesaurus file \"%s\": %m"
+msgstr "no se pudo abrir el archivo del tesauro «%s»: %m"
 
-#: main/main.c:282
-#, c-format
-msgid "  -k DIRECTORY    Unix-domain socket location\n"
-msgstr "  -k DIRECTORIO   ubicación del socket Unix\n"
+#: tsearch/dict_thesaurus.c:213
+msgid "unexpected delimiter"
+msgstr "delimitador inesperado"
 
-#: main/main.c:284
-#, c-format
-msgid "  -l              enable SSL connections\n"
-msgstr "  -l              activar conexiones SSL\n"
+#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
+msgid "unexpected end of line or lexeme"
+msgstr "fin de línea o lexema inesperado"
 
-#: main/main.c:286
-#, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
-msgstr "  -N MAX-CONN     número máximo de conexiones permitidas\n"
+#: tsearch/dict_thesaurus.c:288
+msgid "unexpected end of line"
+msgstr "fin de línea inesperado"
 
-#: main/main.c:287
+#: tsearch/dict_thesaurus.c:412
 #, c-format
-msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgid ""
+"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
 msgstr ""
-"  -o OPCIONES     pasar «OPCIONES» a cada proceso servidor (obsoleto)\n"
+"la palabra muestra «%s» del tesauro no es reconocido por el subdiccionario "
+"(regla %d)"
 
-#: main/main.c:288
+# XXX -- stopword?
+#: tsearch/dict_thesaurus.c:418
 #, c-format
-msgid "  -p PORT         port number to listen on\n"
-msgstr "  -p PUERTO       número de puerto en el cual escuchar\n"
+msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
+msgstr "la palabra muestra «%s» del tesauro es una stopword (regla %d)"
 
-#: main/main.c:289
+# XXX -- stopword?
+#: tsearch/dict_thesaurus.c:421
+msgid "Use \"?\" to represent a stop word within a sample phrase."
+msgstr "Use «?» para representar una stopword en una frase muestra."
+
+# XXX -- stopword?
+#: tsearch/dict_thesaurus.c:567
 #, c-format
-msgid "  -s              show statistics after each query\n"
-msgstr "  -s              mostrar estadísticas después de cada consulta\n"
+msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
+msgstr "la palabra sustituta «%s» del tesauro es una stopword (regla %d)"
 
-#: main/main.c:290
+#: tsearch/dict_thesaurus.c:574
 #, c-format
-msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
+msgid ""
+"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
 msgstr ""
-"  -S WORK-MEM     mostrar cantidad de memoria para ordenamientos (en kB)\n"
+"la palabra sustituta «%s» del tesauro no es reconocida por el subdiccionario "
+"(regla %d)"
 
-#: main/main.c:291
+#: tsearch/dict_thesaurus.c:586
 #, c-format
-msgid "  --NAME=VALUE    set run-time parameter\n"
-msgstr "  --NOMBRE=VALOR  definir parámetro de ejecución\n"
+msgid "thesaurus substitute phrase is empty (rule %d)"
+msgstr "la frase sustituta del tesauro está vacía (regla %d)"
 
-#: main/main.c:292
-#, c-format
-msgid "  --describe-config  describe configuration parameters, then exit\n"
-msgstr ""
-"  --describe-config\n"
-"                  mostrar parámetros de configuración y salir\n"
+#: tsearch/dict_thesaurus.c:624
+msgid "multiple Dictionary parameters"
+msgstr "parámetro Dictionary duplicado"
 
-#: main/main.c:293
+#: tsearch/dict_thesaurus.c:631
 #, c-format
-msgid "  --help          show this help, then exit\n"
-msgstr "  --help          desplegar esta ayuda y salir\n"
+msgid "unrecognized Thesaurus parameter: \"%s\""
+msgstr "parámetro no reconocido de tesauro: «%s»"
 
-#: main/main.c:294
-#, c-format
-msgid "  --version       output version information, then exit\n"
-msgstr "  --version       desplegar número de versión y salir\n"
+#: tsearch/dict_thesaurus.c:643
+msgid "missing Dictionary parameter"
+msgstr "falta un paramétro Dictionary"
 
-#: main/main.c:296
+#: tsearch/spell.c:276
 #, c-format
-msgid ""
-"\n"
-"Developer options:\n"
-msgstr ""
-"\n"
-"Opciones de desarrollador:\n"
+msgid "could not open dictionary file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de diccionario «%s»: %m"
 
-#: main/main.c:297
+#: tsearch/spell.c:439 utils/adt/regexp.c:195
 #, c-format
-msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
-msgstr "  -f s|i|n|m|h    impedir el uso de algunos tipos de planes\n"
+msgid "invalid regular expression: %s"
+msgstr "la expresión regular no es válida: %s"
 
-#: main/main.c:298
-#, c-format
-msgid ""
-"  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
-"  -n              no reinicializar memoria compartida después de salida "
-"anormal\n"
+#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
+#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:12477 gram.y:12494
+msgid "syntax error"
+msgstr "error de sintaxis"
 
-#: main/main.c:299
-#, c-format
-msgid "  -O              allow system table structure changes\n"
-msgstr ""
-"  -O              permitir cambios en estructura de tablas de sistema\n"
+#: tsearch/spell.c:596 tsearch/spell.c:842 tsearch/spell.c:862
+msgid "multibyte flag character is not allowed"
+msgstr "los caracteres bandera multibyte no están permitidos"
 
-#: main/main.c:300
+#: tsearch/spell.c:629 tsearch/spell.c:687 tsearch/spell.c:780
 #, c-format
-msgid "  -P              disable system indexes\n"
-msgstr "  -P              desactivar índices de sistema\n"
+msgid "could not open affix file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de afijos «%s»: %m"
 
-#: main/main.c:301
-#, c-format
-msgid "  -t pa|pl|ex     show timings after each query\n"
-msgstr "  -t pa|pl|ex     mostrar tiempos después de cada consulta\n"
+#: tsearch/spell.c:675
+msgid "Ispell dictionary supports only default flag value"
+msgstr "el diccionario Ispell sólo permite el valor de bandera «default»"
 
-#: main/main.c:302
-#, c-format
-msgid "  -T              send SIGSTOP to all backend servers if one dies\n"
-msgstr ""
-"  -T              enviar SIGSTOP a todos los backends si uno de ellos muere\n"
+#: tsearch/spell.c:873
+msgid "wrong affix file format for flag"
+msgstr "formato de archivo de afijos incorrecto para la bandera"
 
-#: main/main.c:303
+#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:530
 #, c-format
-msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
-msgstr ""
-"  -W NÚM          espera NÚM segundos para permitir acoplar un depurador\n"
+msgid "string is too long for tsvector (%d bytes, max %d bytes)"
+msgstr "la cadena es demasiado larga para tsvector (%d bytes, máximo %d bytes)"
 
-#: main/main.c:305
+#: tsearch/ts_locale.c:177
 #, c-format
-msgid ""
-"\n"
-"Options for single-user mode:\n"
-msgstr ""
-"\n"
-"Opciones para modo mono-usuario:\n"
+msgid "line %d of configuration file \"%s\": \"%s\""
+msgstr "línea %d del archivo de configuración «%s»: «%s»"
 
-#: main/main.c:306
+#: tsearch/ts_locale.c:182 libpq/hba.c:781 libpq/hba.c:797 libpq/hba.c:833
+#: libpq/hba.c:855 libpq/hba.c:864 libpq/hba.c:887 libpq/hba.c:899
+#: libpq/hba.c:912 libpq/hba.c:927 libpq/hba.c:982 libpq/hba.c:1002
+#: libpq/hba.c:1016 libpq/hba.c:1033 libpq/hba.c:1046 libpq/hba.c:1062
+#: libpq/hba.c:1077 libpq/hba.c:1119 libpq/hba.c:1151 libpq/hba.c:1162
+#: libpq/hba.c:1182 libpq/hba.c:1193 libpq/hba.c:1204 libpq/hba.c:1221
+#: libpq/hba.c:1242 libpq/hba.c:1272 libpq/hba.c:1284 libpq/hba.c:1297
+#: libpq/hba.c:1331 libpq/hba.c:1405 libpq/hba.c:1423 libpq/hba.c:1444
+#: libpq/hba.c:1475 libpq/hba.c:1485
 #, c-format
-msgid "  --single        selects single-user mode (must be first argument)\n"
-msgstr ""
-"  --single        selecciona modo mono-usuario (debe ser el primer "
-"argumento)\n"
+msgid "line %d of configuration file \"%s\""
+msgstr "línea %d del archivo de configuración «%s»"
 
-#: main/main.c:307
+#: tsearch/ts_locale.c:302
 #, c-format
-msgid "  DBNAME          database name (defaults to user name)\n"
-msgstr ""
-"  DBNAME          nombre de base de datos (el valor por omisión es el nombre "
-"de usuario)\n"
+msgid "conversion from wchar_t to server encoding failed: %m"
+msgstr "conversión desde un wchar_t a la codificación del servidor falló: %m"
 
-#: main/main.c:308
-#, c-format
-msgid "  -d 0-5          override debugging level\n"
-msgstr "  -d 0-5          nivel de depuración\n"
+#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
+#: tsearch/ts_parse.c:568
+msgid "word is too long to be indexed"
+msgstr "la palabra es demasiado larga para ser indexada"
 
-#: main/main.c:309
+#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
+#: tsearch/ts_parse.c:569
 #, c-format
-msgid "  -E              echo statement before execution\n"
-msgstr "  -E              mostrar las consultas antes de su ejecución\n"
+msgid "Words longer than %d characters are ignored."
+msgstr "Las palabras más largas que %d caracteres son ignoradas."
 
-#: main/main.c:310
+#: tsearch/ts_utils.c:53
 #, c-format
-msgid "  -j              do not use newline as interactive query delimiter\n"
-msgstr ""
-"  -j              no usar saltos de línea como delimitadores de consulta\n"
-
-#: main/main.c:311 main/main.c:316
-#, c-format
-msgid "  -r FILENAME     send stdout and stderr to given file\n"
-msgstr "  -r ARCHIVO      enviar salida estándar y de error a ARCHIVO\n"
-
-#: main/main.c:313
-#, c-format
-msgid ""
-"\n"
-"Options for bootstrapping mode:\n"
-msgstr ""
-"\n"
-"Opciones para modo de inicio (bootstrapping):\n"
-
-#: main/main.c:314
-#, c-format
-msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
-msgstr ""
-"  --boot          selecciona modo de inicio (debe ser el primer argumento)\n"
-
-#: main/main.c:315
-#, c-format
-msgid ""
-"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
-msgstr ""
-"  DBNAME          nombre de base de datos (argumento obligatorio en modo de "
-"inicio)\n"
-
-#: main/main.c:317
-#, c-format
-msgid "  -x NUM          internal use\n"
-msgstr "  -x NUM          uso interno\n"
-
-#: main/main.c:319
-#, c-format
-msgid ""
-"\n"
-"Please read the documentation for the complete list of run-time\n"
-"configuration settings and how to set them on the command line or in\n"
-"the configuration file.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Por favor lea la documentación para obtener la lista completa de\n"
-"parámetros de configuración y cómo definirlos en la línea de órdenes\n"
-"y en el archivo de configuración.\n"
-"\n"
-"Reporte errores a <pgsql-bugs@postgresql.org>\n"
-
-#: main/main.c:333
-msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"No se permite ejecución del servidor PostgreSQL como «root».\n"
-"El servidor debe ser iniciado con un usuario no privilegiado\n"
-"para prevenir posibles compromisos de seguridad del sistema.\n"
-"Vea la documentación para obtener más información acerca de cómo\n"
-"iniciar correctamente el servidor.\n"
+msgid "invalid text search configuration file name \"%s\""
+msgstr "nombre de configuración de búsqueda en texto «%s» no válido"
 
-#: main/main.c:350
+#: tsearch/ts_utils.c:91
 #, c-format
-msgid "%s: real and effective user IDs must match\n"
-msgstr "%s: los IDs de usuario real y efectivo deben coincidir\n"
+msgid "could not open stop-word file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de stopwords «%s»: %m"
 
-#: main/main.c:357
-msgid ""
-"Execution of PostgreSQL by a user with administrative permissions is not\n"
-"permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromises.  See the documentation for\n"
-"more information on how to properly start the server.\n"
+#: tsearch/wparser.c:314
+msgid "text search parser does not support headline creation"
 msgstr ""
-"No se permite ejecución del servidor PostgreSQL por un usuario con "
-"privilegios administrativos.\n"
-"El servidor debe ser iniciado con un usuario no privilegiado\n"
-"para prevenir posibles compromisos de seguridad del sistema.\n"
-"Vea la documentación para obtener más información acerca de cómo\n"
-"iniciar correctamente el servidor.\n"
-
-#: main/main.c:378
-#, c-format
-msgid "%s: invalid effective UID: %d\n"
-msgstr "%s: el UID de usuario efectivo no es válido: %d\n"
-
-#: main/main.c:391
-#, c-format
-msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr "%s: no se pudo determinar el nombre de usuario (falló GetUserName)\n"
+"el analizador de búsqueda en texto no soporta creación de encabezados "
+"(headline)"
 
-#: tsearch/wparser_def.c:2533
+#: tsearch/wparser_def.c:2551
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "parámetro de encabezado (headline) no reconocido: «%s»"
 
-#: tsearch/wparser_def.c:2542
+#: tsearch/wparser_def.c:2560
 msgid "MinWords should be less than MaxWords"
 msgstr "MinWords debería ser menor que MaxWords"
 
-#: tsearch/wparser_def.c:2546
+#: tsearch/wparser_def.c:2564
 msgid "MinWords should be positive"
 msgstr "MinWords debería ser positivo"
 
-#: tsearch/wparser_def.c:2550
+#: tsearch/wparser_def.c:2568
 msgid "ShortWord should be >= 0"
 msgstr "ShortWord debería ser >= 0"
 
-#: tsearch/wparser_def.c:2554
+#: tsearch/wparser_def.c:2572
 msgid "MaxFragments should be >= 0"
 msgstr "MaxFragments debería ser >= 0"
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:615
-msgid "multiple DictFile parameters"
-msgstr "parámetro DictFile duplicado"
-
-#: tsearch/dict_ispell.c:63
-msgid "multiple AffFile parameters"
-msgstr "parámetro AffFile duplicado"
+#: access/hash/hashinsert.c:73
+#, c-format
+msgid "index row size %lu exceeds hash maximum %lu"
+msgstr "el tamaño de fila de índice %lu excede el máximo para hash %lu"
 
-#: tsearch/dict_ispell.c:74 tsearch/dict_simple.c:50
-#: snowball/dict_snowball.c:206
-msgid "multiple StopWords parameters"
-msgstr "parámetro StopWords duplicado"
+#: access/hash/hashinsert.c:76
+msgid "Values larger than a buffer page cannot be indexed."
+msgstr "Valores mayores a una página del buffer no pueden ser indexados."
 
-#: tsearch/dict_ispell.c:82
+#: access/hash/hashovfl.c:547
 #, c-format
-msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "parámetro Ispell no reconocido: «%s»"
+msgid "out of overflow pages in hash index \"%s\""
+msgstr "se agotaron las páginas de desbordamiento en el índice hash «%s»"
 
-#: tsearch/dict_ispell.c:96
-msgid "missing AffFile parameter"
-msgstr "falta un parámetro AffFile"
+#: access/hash/hashsearch.c:152
+msgid "hash indexes do not support whole-index scans"
+msgstr "los índices hash no soportan recorridos del índice completo"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:639
-msgid "missing DictFile parameter"
-msgstr "falta un parámetro DictFile"
+#: access/hash/hashutil.c:170 access/gist/gistutil.c:589
+#: access/nbtree/nbtpage.c:433
+#, c-format
+msgid "index \"%s\" contains unexpected zero page at block %u"
+msgstr "índice «%s» contiene páginas vacías no esperadas en el bloque %u"
 
-#: tsearch/dict_simple.c:59
-msgid "multiple Accept parameters"
-msgstr "parámetro Accept duplicado"
+#: access/hash/hashutil.c:173 access/hash/hashutil.c:184
+#: access/hash/hashutil.c:196 access/hash/hashutil.c:217
+#: access/gist/gist.c:718 access/gist/gistutil.c:592
+#: access/gist/gistutil.c:603 access/gist/gistvacuum.c:274
+#: access/nbtree/nbtpage.c:436 access/nbtree/nbtpage.c:447
+msgid "Please REINDEX it."
+msgstr "Por favor aplíquele REINDEX."
 
-#: tsearch/dict_simple.c:67
+#: access/hash/hashutil.c:181 access/hash/hashutil.c:193
+#: access/gist/gistutil.c:600 access/nbtree/nbtpage.c:444
 #, c-format
-msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "parámetro del diccionario simple no reconocido: «%s»"
+msgid "index \"%s\" contains corrupted page at block %u"
+msgstr "el índice «%s» contiene una página corrupta en el bloque %u"
 
-#: tsearch/dict_synonym.c:119
+#: access/hash/hashutil.c:209
 #, c-format
-msgid "unrecognized synonym parameter: \"%s\""
-msgstr "parámetro de sinónimo no reconocido «%s»"
-
-#: tsearch/dict_synonym.c:126
-msgid "missing Synonyms parameter"
-msgstr "falta un parámetro Synonyms"
+msgid "index \"%s\" is not a hash index"
+msgstr "el índice «%s» no es un índice hash"
 
-#: tsearch/dict_synonym.c:133
+#: access/hash/hashutil.c:215
 #, c-format
-msgid "could not open synonym file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de sinónimos «%s»: %m"
+msgid "index \"%s\" has wrong hash version"
+msgstr "el índice «%s» tiene una versión de hash incorrecta"
 
-#: tsearch/dict_thesaurus.c:180
+#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
 #, c-format
-msgid "could not open thesaurus file \"%s\": %m"
-msgstr "no se pudo abrir el archivo del tesauro «%s»: %m"
-
-#: tsearch/dict_thesaurus.c:213
-msgid "unexpected delimiter"
-msgstr "delimitador inesperado"
-
-#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
-msgid "unexpected end of line or lexeme"
-msgstr "fin de línea o lexema inesperado"
-
-#: tsearch/dict_thesaurus.c:288
-msgid "unexpected end of line"
-msgstr "fin de línea inesperado"
+msgid "number of columns (%d) exceeds limit (%d)"
+msgstr "el número de columnas (%d) excede el límite (%d)"
 
-#: tsearch/dict_thesaurus.c:412
+#: access/common/indextuple.c:57
 #, c-format
-msgid ""
-"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"la palabra muestra «%s» del tesauro no es reconocido por el subdiccionario "
-"(regla %d)"
+msgid "number of index columns (%d) exceeds limit (%d)"
+msgstr "el número de columnas del índice (%d) excede el límite (%d)"
 
-# XXX -- stopword?
-#: tsearch/dict_thesaurus.c:418
+#: access/common/indextuple.c:168
 #, c-format
-msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr "la palabra muestra «%s» del tesauro es una stopword (regla %d)"
-
-# XXX -- stopword?
-#: tsearch/dict_thesaurus.c:421
-msgid "Use \"?\" to represent a stop word within a sample phrase."
-msgstr "Use «?» para representar una stopword en una frase muestra."
+msgid "index row requires %lu bytes, maximum size is %lu"
+msgstr "fila de índice requiere %lu bytes, tamaño máximo es %lu"
 
-# XXX -- stopword?
-#: tsearch/dict_thesaurus.c:567
+#: access/common/printtup.c:278 tcop/fastpath.c:180 tcop/fastpath.c:554
+#: tcop/postgres.c:1664
 #, c-format
-msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr "la palabra sustituta «%s» del tesauro es una stopword (regla %d)"
+msgid "unsupported format code: %d"
+msgstr "código de formato no soportado: %d"
 
-#: tsearch/dict_thesaurus.c:574
-#, c-format
-msgid ""
-"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
+#: access/common/reloptions.c:323
+msgid "user-defined relation parameter types limit exceeded"
 msgstr ""
-"la palabra sustituta «%s» del tesauro no es reconocida por el subdiccionario "
-"(regla %d)"
-
-#: tsearch/dict_thesaurus.c:586
-#, c-format
-msgid "thesaurus substitute phrase is empty (rule %d)"
-msgstr "la frase sustituta del tesauro está vacía (regla %d)"
+"el límite de tipos de parámetros de relación definidos por el usuario ha "
+"sido excedido"
 
-#: tsearch/dict_thesaurus.c:624
-msgid "multiple Dictionary parameters"
-msgstr "parámetro Dictionary duplicado"
+#: access/common/reloptions.c:622
+msgid "RESET must not include values for parameters"
+msgstr "RESET no debe incluir valores de parámetros"
 
-#: tsearch/dict_thesaurus.c:631
+#: access/common/reloptions.c:655
 #, c-format
-msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "parámetro no reconocido de tesauro: «%s»"
-
-#: tsearch/dict_thesaurus.c:643
-msgid "missing Dictionary parameter"
-msgstr "falta un paramétro Dictionary"
+msgid "unrecognized parameter namespace \"%s\""
+msgstr "espacio de nombre de parámetro «%s» no reconocido"
 
-#: tsearch/spell.c:204
+#: access/common/reloptions.c:898
 #, c-format
-msgid "could not open dictionary file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de diccionario «%s»: %m"
+msgid "unrecognized parameter \"%s\""
+msgstr "parámetro no reconocido «%s»"
 
-#: tsearch/spell.c:365 utils/adt/regexp.c:190
+#: access/common/reloptions.c:923
 #, c-format
-msgid "invalid regular expression: %s"
-msgstr "la expresión regular no es válida: %s"
-
-#: tsearch/spell.c:444 tsearch/spell.c:461 tsearch/spell.c:478
-#: tsearch/spell.c:495 tsearch/spell.c:517 gram.y:11474 gram.y:11491
-msgid "syntax error"
-msgstr "error de sintaxis"
-
-#: tsearch/spell.c:522 tsearch/spell.c:772 tsearch/spell.c:792
-msgid "multibyte flag character is not allowed"
-msgstr "los caracteres bandera multibyte no están permitidos"
+msgid "parameter \"%s\" specified more than once"
+msgstr "el parámetro «%s» fue especificado más de una vez"
 
-#: tsearch/spell.c:557 tsearch/spell.c:615 tsearch/spell.c:710
+#: access/common/reloptions.c:938
 #, c-format
-msgid "could not open affix file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de afijos «%s»: %m"
-
-#: tsearch/spell.c:603
-msgid "Ispell dictionary supports only default flag value"
-msgstr "el diccionario Ispell sólo permite el valor de bandera «default»"
+msgid "invalid value for boolean option \"%s\": %s"
+msgstr "valor no válido para la opción booleana «%s»: «%s»"
 
-#: tsearch/spell.c:803
-msgid "wrong affix file format for flag"
-msgstr "formato de archivo de afijos incorrecto para la bandera"
+#: access/common/reloptions.c:949
+#, c-format
+msgid "invalid value for integer option \"%s\": %s"
+msgstr "valor no válido para la opción entera «%s»: «%s»"
 
-#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:514
+#: access/common/reloptions.c:954 access/common/reloptions.c:972
 #, c-format
-msgid "string is too long for tsvector (%d bytes, max %d bytes)"
-msgstr "la cadena es demasiado larga para tsvector (%d bytes, máximo %d bytes)"
+msgid "value %s out of bounds for option \"%s\""
+msgstr "el valor %s está fuera del rango de la opción «%s»"
 
-#: tsearch/ts_locale.c:168
+#: access/common/reloptions.c:956
 #, c-format
-msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "línea %d del archivo de configuración «%s»: «%s»"
+msgid "Valid values are between \"%d\" and \"%d\"."
+msgstr "Los valores aceptables están entre «%d» y «%d»."
 
-#: tsearch/ts_locale.c:173 libpq/hba.c:653 libpq/hba.c:669 libpq/hba.c:715
-#: libpq/hba.c:738 libpq/hba.c:750 libpq/hba.c:763 libpq/hba.c:778
-#: libpq/hba.c:825 libpq/hba.c:848 libpq/hba.c:865 libpq/hba.c:878
-#: libpq/hba.c:894 libpq/hba.c:909 libpq/hba.c:949 libpq/hba.c:981
-#: libpq/hba.c:992 libpq/hba.c:1004 libpq/hba.c:1015 libpq/hba.c:1032
-#: libpq/hba.c:1053 libpq/hba.c:1082 libpq/hba.c:1094 libpq/hba.c:1107
-#: libpq/hba.c:1141 libpq/hba.c:1215 libpq/hba.c:1233 libpq/hba.c:1254
-#: libpq/hba.c:1285 libpq/hba.c:1295
+#: access/common/reloptions.c:967
 #, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "línea %d del archivo de configuración «%s»"
+msgid "invalid value for floating point option \"%s\": %s"
+msgstr "valor no válido para la opción de coma flotante «%s»: «%s»"
 
-#: tsearch/ts_locale.c:288
+#: access/common/reloptions.c:974
 #, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "conversión desde un wchar_t a la codificación del servidor falló: %m"
+msgid "Valid values are between \"%f\" and \"%f\"."
+msgstr "Valores aceptables están entre «%f» y «%f»."
 
-#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
-#: tsearch/ts_parse.c:568
-msgid "word is too long to be indexed"
-msgstr "la palabra es demasiado larga para ser indexada"
+#: access/common/tupconvert.c:107
+#, c-format
+msgid "Returned type %s does not match expected type %s in column %d."
+msgstr ""
+"El tipo retornado %s no coincide con el tipo de registro esperado %s en la "
+"columna %d."
 
-#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
-#: tsearch/ts_parse.c:569
+#: access/common/tupconvert.c:135
 #, c-format
-msgid "Words longer than %d characters are ignored."
-msgstr "Las palabras más largas que %d caracteres son ignoradas."
+msgid ""
+"Number of returned columns (%d) does not match expected column count (%d)."
+msgstr ""
+"La cantidad de columnas retornadas (%d) no coincide con la cantidad esperada "
+"de columnas (%d)."
 
-#: tsearch/ts_utils.c:53
+#: access/common/tupconvert.c:240
 #, c-format
-msgid "invalid text search configuration file name \"%s\""
-msgstr "nombre de configuración de búsqueda en texto «%s» no válido"
+msgid ""
+"Attribute \"%s\" of type %s does not match corresponding attribute of type "
+"%s."
+msgstr ""
+"El atributo «%s» de tipo %s no coincide el atributo correspondiente de tipo "
+"%s."
 
-#: tsearch/ts_utils.c:91
+#: access/common/tupconvert.c:252
 #, c-format
-msgid "could not open stop-word file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de stopwords «%s»: %m"
+msgid "Attribute \"%s\" of type %s does not exist in type %s."
+msgstr "El atributo «%s» de tipo %s no existe en el tipo %s."
 
-#: tsearch/wparser.c:314
-msgid "text search parser does not support headline creation"
+#: access/common/tupdesc.c:575 parser/parse_relation.c:1169
+#, c-format
+msgid "column \"%s\" cannot be declared SETOF"
+msgstr "la columna «%s» no puede ser declarada SETOF"
+
+#: access/gin/ginentrypage.c:101 access/nbtree/nbtinsert.c:531
+#: access/nbtree/nbtsort.c:483
+#, c-format
+msgid "index row size %lu exceeds maximum %lu for index \"%s\""
 msgstr ""
-"el analizador de búsqueda en texto no soporta creación de encabezados "
-"(headline)"
+"el tamaño de fila de índice %lu excede el máximo %lu para el índice «%s»"
+
+#: access/gin/ginscan.c:401
+msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
+msgstr ""
+"los índices GIN antiguos no soportan recorridos del índice completo ni "
+"búsquedas de nulos"
+
+#: access/gin/ginscan.c:402
+#, c-format
+msgid "To fix this, do REINDEX INDEX \"%s\"."
+msgstr "Para corregir esto, ejecute REINDEX INDEX \"%s\"."
+
+#: access/gist/gist.c:230
+msgid "unlogged GiST indexes are not supported"
+msgstr "los índices GiST unlogged no están soportados"
+
+#: access/gist/gist.c:715 access/gist/gistvacuum.c:271
+#, c-format
+msgid "index \"%s\" contains an inner tuple marked as invalid"
+msgstr "el índice «%s» contiene una tupla interna marcada como no válida"
+
+#: access/gist/gist.c:717 access/gist/gistvacuum.c:273
+msgid ""
+"This is caused by an incomplete page split at crash recovery before "
+"upgrading to PostgreSQL 9.1."
+msgstr ""
+"Esto es causado por una división de página incompleta durante una "
+"recuperación antes de actualizar a PostgreSQL 9.1."
+
+#: access/gist/gistsplit.c:375
+#, c-format
+msgid "picksplit method for column %d of index \"%s\" failed"
+msgstr "el método picksplit para la columna %d del índice «%s» falló"
+
+#: access/gist/gistsplit.c:377
+msgid ""
+"The index is not optimal. To optimize it, contact a developer, or try to use "
+"the column as the second one in the CREATE INDEX command."
+msgstr ""
+"El índice no es óptimo.  Para optimizarlo, contacte un desarrollador o trate "
+"de usar la columna en segunda posición en la orden CREATE INDEX."
 
-#: access/transam/slru.c:595
+#: access/transam/slru.c:609
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "el archivo «%s» no existe, leyendo como ceros"
 
-#: access/transam/slru.c:825 access/transam/slru.c:831
-#: access/transam/slru.c:838 access/transam/slru.c:845
+#: access/transam/slru.c:839 access/transam/slru.c:845
 #: access/transam/slru.c:852 access/transam/slru.c:859
+#: access/transam/slru.c:866 access/transam/slru.c:873
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "no se pudo encontrar el estado de la transacción %u"
 
-#: access/transam/slru.c:826
+#: access/transam/slru.c:840
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "No se pudo abrir el archivo «%s»: %m."
 
-#: access/transam/slru.c:832
+#: access/transam/slru.c:846
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %u: %m."
 msgstr "No se pudo posicionar (seek) en el archivo «%s» a la posición %u: %m."
 
-#: access/transam/slru.c:839
+#: access/transam/slru.c:853
 #, c-format
 msgid "Could not read from file \"%s\" at offset %u: %m."
 msgstr "No se pudo leer desde el archivo «%s» en la posición %u: %m."
 
-#: access/transam/slru.c:846
+#: access/transam/slru.c:860
 #, c-format
 msgid "Could not write to file \"%s\" at offset %u: %m."
 msgstr "No se pudo escribir al archivo «%s» en la posición %u: %m."
 
-#: access/transam/slru.c:853
+#: access/transam/slru.c:867
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "No se pudo sincronizar (fsync) archivo «%s»: %m."
 
-#: access/transam/slru.c:860
+#: access/transam/slru.c:874
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "No se pudo cerrar el archivo «%s»: %m."
 
-#: access/transam/slru.c:1087
+#: access/transam/slru.c:1101
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr ""
 "no se pudo truncar el directorio «%s»: aparente problema por reciclaje de "
 "transacciones"
 
-#: access/transam/slru.c:1168
+#: access/transam/slru.c:1182
 #, c-format
 msgid "removing file \"%s\""
 msgstr "eliminando el archivo «%s»"
 
-#: access/transam/twophase.c:247
+#: access/transam/twophase.c:250
 #, c-format
 msgid "transaction identifier \"%s\" is too long"
 msgstr "identificador de transacción «%s» es demasiado largo"
 
-#: access/transam/twophase.c:254
+#: access/transam/twophase.c:257
 msgid "prepared transactions are disabled"
 msgstr "las transacciones preparadas están deshabilitadas"
 
-#: access/transam/twophase.c:255
+#: access/transam/twophase.c:258
 msgid "Set max_prepared_transactions to a nonzero value."
 msgstr "Defina max_prepared_transactions a un valor distinto de cero."
 
-#: access/transam/twophase.c:288
+#: access/transam/twophase.c:291
 #, c-format
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "identificador de transacción «%s» ya está siendo utilizado"
 
-#: access/transam/twophase.c:297
+#: access/transam/twophase.c:300
 msgid "maximum number of prepared transactions reached"
 msgstr "se alcanzó el número máximo de transacciones preparadas"
 
-#: access/transam/twophase.c:298
+#: access/transam/twophase.c:301
 #, c-format
 msgid "Increase max_prepared_transactions (currently %d)."
 msgstr "Incremente max_prepared_transactions (actualmente es %d)."
 
-#: access/transam/twophase.c:418
+#: access/transam/twophase.c:421
 #, c-format
 msgid "prepared transaction with identifier \"%s\" is busy"
 msgstr "transacción preparada con identificador «%s» está ocupada"
 
-#: access/transam/twophase.c:426
+#: access/transam/twophase.c:429
 msgid "permission denied to finish prepared transaction"
 msgstr "permiso denegado para finalizar la transacción preparada"
 
-#: access/transam/twophase.c:427
+#: access/transam/twophase.c:430
 msgid "Must be superuser or the user that prepared the transaction."
 msgstr "Debe ser superusuario o el usuario que preparó la transacción."
 
-#: access/transam/twophase.c:438
+#: access/transam/twophase.c:441
 msgid "prepared transaction belongs to another database"
 msgstr "la transacción preparada pertenece a otra base de datos"
 
-#: access/transam/twophase.c:439
+#: access/transam/twophase.c:442
 msgid ""
 "Connect to the database where the transaction was prepared to finish it."
 msgstr ""
 "Conéctese a la base de datos donde la transacción fue preparada para "
 "terminarla."
 
-#: access/transam/twophase.c:453
+#: access/transam/twophase.c:456
 #, c-format
 msgid "prepared transaction with identifier \"%s\" does not exist"
 msgstr "transacción preparada con identificador «%s» no existe"
 
-#: access/transam/twophase.c:936
+#: access/transam/twophase.c:939
 msgid "two-phase state file maximum length exceeded"
 msgstr ""
 "el largo máximo del archivo de estado de COMMIT en dos fases fue excedido"
 
-#: access/transam/twophase.c:954
+#: access/transam/twophase.c:957
 #, c-format
 msgid "could not create two-phase state file \"%s\": %m"
 msgstr "no se pudo crear el archivo de estado de COMMIT en dos fases «%s»: %m"
 
-#: access/transam/twophase.c:968 access/transam/twophase.c:985
-#: access/transam/twophase.c:1034 access/transam/twophase.c:1445
-#: access/transam/twophase.c:1452
+#: access/transam/twophase.c:971 access/transam/twophase.c:988
+#: access/transam/twophase.c:1044 access/transam/twophase.c:1465
+#: access/transam/twophase.c:1472
 #, c-format
 msgid "could not write two-phase state file: %m"
 msgstr "no se pudo escribir el archivo de estado de COMMIT en dos fases: %m"
 
-#: access/transam/twophase.c:994
+#: access/transam/twophase.c:997
 #, c-format
 msgid "could not seek in two-phase state file: %m"
 msgstr ""
 "no se pudo posicionar (seek) en el archivo de estado de COMMIT en dos fases: "
 "%m"
 
-#: access/transam/twophase.c:1040 access/transam/twophase.c:1470
+#: access/transam/twophase.c:1050 access/transam/twophase.c:1490
 #, c-format
 msgid "could not close two-phase state file: %m"
 msgstr "no se pudo cerrar el archivo de estado de COMMIT en dos fases: %m"
 
-#: access/transam/twophase.c:1112 access/transam/twophase.c:1550
+#: access/transam/twophase.c:1130 access/transam/twophase.c:1570
 #, c-format
 msgid "could not open two-phase state file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de estado de COMMIT en dos fases «%s»: %m"
 
-#: access/transam/twophase.c:1129
+#: access/transam/twophase.c:1147
 #, c-format
 msgid "could not stat two-phase state file \"%s\": %m"
 msgstr ""
 "no se pudo verificar (stat) el archivo de estado de COMMIT en dos fases "
 "«%s»: %m"
 
-#: access/transam/twophase.c:1161
+#: access/transam/twophase.c:1179
 #, c-format
 msgid "could not read two-phase state file \"%s\": %m"
 msgstr "no se pudo leer el archivo de estado de COMMIT en dos fases «%s»: %m"
 
-#: access/transam/twophase.c:1253
+#: access/transam/twophase.c:1271
 #, c-format
 msgid "two-phase state file for transaction %u is corrupt"
 msgstr ""
 "el archivo de estado de COMMIT en dos fases para la transacción %u está "
 "dañado"
 
-#: access/transam/twophase.c:1407
+#: access/transam/twophase.c:1427
 #, c-format
 msgid "could not remove two-phase state file \"%s\": %m"
 msgstr ""
 "no se pudo eliminar el archivo de estado de COMMIT en dos fases «%s»: %m"
 
-#: access/transam/twophase.c:1436
+#: access/transam/twophase.c:1456
 #, c-format
 msgid "could not recreate two-phase state file \"%s\": %m"
 msgstr ""
 "no se pudo recrear el archivo de estado de COMMIT en dos fases «%s»: %m"
 
-#: access/transam/twophase.c:1464
+#: access/transam/twophase.c:1484
 #, c-format
 msgid "could not fsync two-phase state file: %m"
 msgstr ""
 "no se pudo sincronizar (fsync) el archivo de estado de COMMIT en dos fases: "
 "%m"
 
-#: access/transam/twophase.c:1559
+#: access/transam/twophase.c:1579
 #, c-format
 msgid "could not fsync two-phase state file \"%s\": %m"
 msgstr ""
 "no se pudo sincronizar (fsync) el archivo de estado de COMMIT en dos fases "
 "«%s»: %m"
 
-#: access/transam/twophase.c:1566
+#: access/transam/twophase.c:1586
 #, c-format
 msgid "could not close two-phase state file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo de estado de COMMIT en dos fases «%s»: %m"
 
-#: access/transam/twophase.c:1631
+#: access/transam/twophase.c:1651
 #, c-format
 msgid "removing future two-phase state file \"%s\""
 msgstr "eliminando archivo futuro de estado de COMMIT en dos fases «%s»"
 
-#: access/transam/twophase.c:1647 access/transam/twophase.c:1658
-#: access/transam/twophase.c:1771 access/transam/twophase.c:1782
-#: access/transam/twophase.c:1855
+#: access/transam/twophase.c:1667 access/transam/twophase.c:1678
+#: access/transam/twophase.c:1791 access/transam/twophase.c:1802
+#: access/transam/twophase.c:1875
 #, c-format
 msgid "removing corrupt two-phase state file \"%s\""
 msgstr "eliminando archivo dañado de estado de COMMIT en dos fases «%s»"
 
-#: access/transam/twophase.c:1760 access/transam/twophase.c:1844
+#: access/transam/twophase.c:1780 access/transam/twophase.c:1864
 #, c-format
 msgid "removing stale two-phase state file \"%s\""
 msgstr "eliminando archivo obsoleto de estado de COMMIT en dos fases «%s»"
 
-#: access/transam/twophase.c:1862
+#: access/transam/twophase.c:1882
 #, c-format
 msgid "recovering prepared transaction %u"
 msgstr "recuperando transacción preparada %u"
@@ -879,35 +777,35 @@ msgstr ""
 "el límite para el reciclaje de ID de transacciones es %u, limitado por base "
 "de datos con OID %u"
 
-#: access/transam/xact.c:716
+#: access/transam/xact.c:729
 msgid "cannot have more than 2^32-1 commands in a transaction"
 msgstr "no se pueden tener más de 2^32-1 órdenes en una transacción"
 
-#: access/transam/xact.c:1236
+#: access/transam/xact.c:1268
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "se superó el número máximo de subtransacciones comprometidas (%d)"
 
-#: access/transam/xact.c:1993
+#: access/transam/xact.c:2044
 msgid "cannot PREPARE a transaction that has operated on temporary tables"
 msgstr ""
 "no se puede hacer PREPARE de una transacción que ha operado en tablas "
 "temporales"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2782
+#: access/transam/xact.c:2835
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s no puede ser ejecutado dentro de un bloque de transacción"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2792
+#: access/transam/xact.c:2845
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s no puede ser ejecutado dentro de una subtransacción"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2802
+#: access/transam/xact.c:2855
 #, c-format
 msgid "%s cannot be executed from a function or multi-command string"
 msgstr ""
@@ -915,120 +813,121 @@ msgstr ""
 "múltiples órdenes"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2853
+#: access/transam/xact.c:2906
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "la orden %s sólo puede ser usada en bloques de transacción"
 
-#: access/transam/xact.c:3035
+#: access/transam/xact.c:3088
 msgid "there is already a transaction in progress"
 msgstr "ya hay una transacción en curso"
 
-#: access/transam/xact.c:3202 access/transam/xact.c:3294
+#: access/transam/xact.c:3255 access/transam/xact.c:3347
 msgid "there is no transaction in progress"
 msgstr "no hay una transacción en curso"
 
-#: access/transam/xact.c:3388 access/transam/xact.c:3438
-#: access/transam/xact.c:3444 access/transam/xact.c:3488
-#: access/transam/xact.c:3536 access/transam/xact.c:3542
+#: access/transam/xact.c:3441 access/transam/xact.c:3491
+#: access/transam/xact.c:3497 access/transam/xact.c:3541
+#: access/transam/xact.c:3589 access/transam/xact.c:3595
 msgid "no such savepoint"
 msgstr "no hay un savepoint con ese nombre"
 
-#: access/transam/xact.c:4172
+#: access/transam/xact.c:4225
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "no se pueden tener más de 2^32-1 subtransacciones en una transacción"
 
-#: access/transam/xlog.c:1275
+#: access/transam/xlog.c:1329
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "no se pudo crear el archivo de estado «%s»: %m"
 
-#: access/transam/xlog.c:1283
+#: access/transam/xlog.c:1337
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "no se pudo escribir el archivo de estado «%s»: %m"
 
-#: access/transam/xlog.c:1738 access/transam/xlog.c:9602
-#: replication/walreceiver.c:479 replication/walsender.c:596
+#: access/transam/xlog.c:1792 access/transam/xlog.c:10386
+#: replication/walreceiver.c:510 replication/walsender.c:1003
 #, c-format
 msgid "could not seek in log file %u, segment %u to offset %u: %m"
 msgstr ""
 "no se pudo posicionar (seek) en archivo de registro %u, segmento %u a la "
 "posición %u: %m"
 
-#: access/transam/xlog.c:1755 replication/walreceiver.c:496
+#: access/transam/xlog.c:1809 replication/walreceiver.c:527
 #, c-format
 msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
 msgstr ""
 "no se pudo escribir archivo de registro %u, segmento %u en la posición %u, "
 "largo %lu: %m"
 
-#: access/transam/xlog.c:1957
+#: access/transam/xlog.c:2011
 #, c-format
 msgid "updated min recovery point to %X/%X"
 msgstr "el punto mínimo de recuperación fue actualizado a %X/%X"
 
-#: access/transam/xlog.c:2298 access/transam/xlog.c:2402
-#: access/transam/xlog.c:2631 access/transam/xlog.c:2702
-#: access/transam/xlog.c:2759 replication/walsender.c:584
+#: access/transam/xlog.c:2352 access/transam/xlog.c:2456
+#: access/transam/xlog.c:2685 access/transam/xlog.c:2756
+#: access/transam/xlog.c:2813 replication/walsender.c:991
 #, c-format
 msgid "could not open file \"%s\" (log file %u, segment %u): %m"
 msgstr "no se pudo abrir «%s» (archivo de registro %u, segmento %u): %m"
 
-#: access/transam/xlog.c:2323 access/transam/xlog.c:2456
-#: access/transam/xlog.c:4286 access/transam/xlog.c:8464
-#: access/transam/xlog.c:8619 storage/smgr/md.c:278 storage/file/copydir.c:172
-#: postmaster/postmaster.c:3645
+#: access/transam/xlog.c:2377 access/transam/xlog.c:2510
+#: access/transam/xlog.c:4408 access/transam/xlog.c:9034
+#: access/transam/xlog.c:9274 storage/file/copydir.c:172 storage/smgr/md.c:285
+#: postmaster/postmaster.c:3690
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "no se pudo crear archivo «%s»: %m"
 
-#: access/transam/xlog.c:2355 access/transam/xlog.c:2488
-#: access/transam/xlog.c:4338 access/transam/xlog.c:4394 commands/copy.c:1316
-#: storage/file/copydir.c:197 postmaster/postmaster.c:3655
-#: postmaster/postmaster.c:3665 utils/misc/guc.c:7008 utils/misc/guc.c:7033
-#: utils/init/miscinit.c:1054 utils/init/miscinit.c:1063
-#: utils/init/miscinit.c:1070
+#: access/transam/xlog.c:2409 access/transam/xlog.c:2542
+#: access/transam/xlog.c:4460 access/transam/xlog.c:4523
+#: storage/file/copydir.c:197 postmaster/postmaster.c:3700
+#: postmaster/postmaster.c:3710 utils/init/miscinit.c:1089
+#: utils/init/miscinit.c:1098 utils/init/miscinit.c:1105 utils/misc/guc.c:7424
+#: utils/misc/guc.c:7449
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "no se pudo escribir a archivo «%s»: %m"
 
-#: access/transam/xlog.c:2363 access/transam/xlog.c:2495
-#: access/transam/xlog.c:4400 storage/smgr/md.c:909 storage/smgr/md.c:1083
-#: storage/smgr/md.c:1226 storage/file/copydir.c:269
+#: access/transam/xlog.c:2417 access/transam/xlog.c:2549
+#: access/transam/xlog.c:4529 storage/file/copydir.c:269 storage/smgr/md.c:924
+#: storage/smgr/md.c:1130 storage/smgr/md.c:1281
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "no se pudo sincronizar (fsync) archivo «%s»: %m"
 
-#: access/transam/xlog.c:2368 access/transam/xlog.c:2500
-#: access/transam/xlog.c:4405 storage/file/copydir.c:211
+#: access/transam/xlog.c:2422 access/transam/xlog.c:2554
+#: access/transam/xlog.c:4534 commands/copy.c:1329 storage/file/copydir.c:211
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "no se pudo cerrar el archivo «%s»: %m"
 
-#: access/transam/xlog.c:2441 access/transam/xlog.c:4113
-#: access/transam/xlog.c:4207 access/transam/xlog.c:4305 storage/smgr/md.c:532
-#: storage/smgr/md.c:785 storage/file/copydir.c:165 storage/file/copydir.c:255
-#: utils/error/elog.c:1403 utils/init/miscinit.c:1005
-#: utils/init/miscinit.c:1118
+#: access/transam/xlog.c:2495 access/transam/xlog.c:4177
+#: access/transam/xlog.c:4271 access/transam/xlog.c:4427
+#: storage/file/copydir.c:165 storage/file/copydir.c:255 storage/smgr/md.c:542
+#: storage/smgr/md.c:802 replication/basebackup.c:725
+#: utils/init/miscinit.c:1039 utils/init/miscinit.c:1153
+#: utils/error/elog.c:1497
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "no se pudo abrir el archivo «%s»: %m"
 
-#: access/transam/xlog.c:2469 access/transam/xlog.c:4317
-#: access/transam/xlog.c:8567 access/transam/xlog.c:8641
-#: access/transam/xlog.c:9024 access/transam/xlog.c:9049
-#: storage/file/copydir.c:186 utils/adt/genfile.c:133
+#: access/transam/xlog.c:2523 access/transam/xlog.c:4439
+#: access/transam/xlog.c:9206 access/transam/xlog.c:9219
+#: access/transam/xlog.c:9753 access/transam/xlog.c:9788
+#: storage/file/copydir.c:186 utils/adt/genfile.c:138
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: access/transam/xlog.c:2472
+#: access/transam/xlog.c:2526
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "los datos del archivo «%s» son insuficientes"
 
-#: access/transam/xlog.c:2591
+#: access/transam/xlog.c:2645
 #, c-format
 msgid ""
 "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
@@ -1037,7 +936,7 @@ msgstr ""
 "no se pudo enlazar (link) el archivo «%s» a «%s» (inicialización de archivo "
 "de registro %u, segmento %u): %m"
 
-#: access/transam/xlog.c:2603
+#: access/transam/xlog.c:2657
 #, c-format
 msgid ""
 "could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
@@ -1046,186 +945,189 @@ msgstr ""
 "no se pudo renombrar archivo de «%s» a «%s» (inicialización de archivo de "
 "registro %u, segmento %u): %m"
 
-#: access/transam/xlog.c:2786 replication/walreceiver.c:453
+#: access/transam/xlog.c:2840 replication/walreceiver.c:484
 #, c-format
 msgid "could not close log file %u, segment %u: %m"
 msgstr "no se pudo cerrar archivo de registro %u, segmento %u: %m"
 
-#: access/transam/xlog.c:2858 access/transam/xlog.c:3023
-#: access/transam/xlog.c:8447 storage/file/copydir.c:86
-#: storage/file/copydir.c:125 utils/adt/dbsize.c:65 utils/adt/dbsize.c:217
-#: utils/adt/dbsize.c:288 utils/adt/genfile.c:170
+#: access/transam/xlog.c:2912 access/transam/xlog.c:3077
+#: access/transam/xlog.c:9019 access/transam/xlog.c:9194
+#: storage/file/copydir.c:86 storage/file/copydir.c:125 utils/adt/dbsize.c:65
+#: utils/adt/dbsize.c:211 utils/adt/dbsize.c:276 utils/adt/genfile.c:107
+#: utils/adt/genfile.c:279
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "no se pudo verificar archivo «%s»: %m"
 
-#: access/transam/xlog.c:2866 access/transam/xlog.c:8646 storage/smgr/md.c:348
-#: storage/smgr/md.c:395 storage/smgr/md.c:1192
+#: access/transam/xlog.c:2920 access/transam/xlog.c:9224 storage/smgr/md.c:358
+#: storage/smgr/md.c:405 storage/smgr/md.c:1244
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "no se pudo eliminar el archivo «%s»: %m"
 
-#: access/transam/xlog.c:3002
+#: access/transam/xlog.c:3056
 #, c-format
 msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
 msgstr "el archivo «%s» tiene tamaño erróneo: %lu en lugar de %lu"
 
-#: access/transam/xlog.c:3011
+#: access/transam/xlog.c:3065
 #, c-format
 msgid "restored log file \"%s\" from archive"
 msgstr "se ha restaurado el archivo «%s» desde el área de archivado"
 
-#: access/transam/xlog.c:3061
+#: access/transam/xlog.c:3115
 #, c-format
 msgid "could not restore file \"%s\" from archive: return code %d"
 msgstr "no se pudo recuperar el archivo «%s»: código de retorno %d"
 
-#: access/transam/xlog.c:3176
+#. translator: First %s represents a recovery.conf parameter name like
+#. "recovery_end_command", and the 2nd is the value of that parameter.
+#: access/transam/xlog.c:3229
 #, c-format
 msgid "%s \"%s\": return code %d"
 msgstr "%s «%s»: código de retorno %d"
 
-#: access/transam/xlog.c:3286 access/transam/xlog.c:3469
+#: access/transam/xlog.c:3339 access/transam/xlog.c:3522
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
 msgstr "no se pudo abrir directorio de registro de transacciones «%s»: %m"
 
-#: access/transam/xlog.c:3340
+#: access/transam/xlog.c:3393
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "el archivo de registro de transacciones «%s» ha sido reciclado"
 
-#: access/transam/xlog.c:3356
+#: access/transam/xlog.c:3409
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "eliminando archivo de registro de transacciones «%s»"
 
-#: access/transam/xlog.c:3379
+#: access/transam/xlog.c:3432
 #, c-format
 msgid "could not rename old transaction log file \"%s\": %m"
 msgstr ""
 "no se pudo cambiar el nombre del archivo antiguo de registro de "
 "transacciones «%s»: %m"
 
-#: access/transam/xlog.c:3391
+#: access/transam/xlog.c:3444
 #, c-format
 msgid "could not remove old transaction log file \"%s\": %m"
 msgstr ""
 "no se pudo eliminar el archivo antiguo de registro de transacciones «%s»: %m"
 
-#: access/transam/xlog.c:3429 access/transam/xlog.c:3439
+#: access/transam/xlog.c:3482 access/transam/xlog.c:3492
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "no existe el directorio WAL «%s»"
 
-#: access/transam/xlog.c:3445
+#: access/transam/xlog.c:3498
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "creando el directorio WAL faltante «%s»"
 
-#: access/transam/xlog.c:3448
+#: access/transam/xlog.c:3501
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "no se pudo crear el directorio faltante «%s»: %m"
 
-#: access/transam/xlog.c:3482
+#: access/transam/xlog.c:3535
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
 msgstr ""
 "eliminando el archivo de historia del respaldo de registro de transacciones "
 "«%s»"
 
-#: access/transam/xlog.c:3602
+#: access/transam/xlog.c:3655
 #, c-format
 msgid "incorrect hole size in record at %X/%X"
 msgstr "tamaño de hueco en registro en %X/%X es incorrecto"
 
-#: access/transam/xlog.c:3615
+#: access/transam/xlog.c:3668
 #, c-format
 msgid "incorrect total length in record at %X/%X"
 msgstr "longitud total de registro en %X/%X es incorrecta"
 
-#: access/transam/xlog.c:3628
+#: access/transam/xlog.c:3681
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "la suma de verificación de datos del gestor de recursos en %X/%X es "
 "incorrecta"
 
-#: access/transam/xlog.c:3697 access/transam/xlog.c:3733
+#: access/transam/xlog.c:3759 access/transam/xlog.c:3797
 #, c-format
 msgid "invalid record offset at %X/%X"
 msgstr "la posición de registro en %X/%X es incorrecta"
 
-#: access/transam/xlog.c:3741
+#: access/transam/xlog.c:3805
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord es requerido por %X/%X"
 
-#: access/transam/xlog.c:3756
+#: access/transam/xlog.c:3820
 #, c-format
 msgid "invalid xlog switch record at %X/%X"
 msgstr "registro de cambio de archivo xlog no válido en %X/%X"
 
-#: access/transam/xlog.c:3764
+#: access/transam/xlog.c:3828
 #, c-format
 msgid "record with zero length at %X/%X"
 msgstr "registro de longitud cero en %X/%X"
 
-#: access/transam/xlog.c:3773
+#: access/transam/xlog.c:3837
 #, c-format
 msgid "invalid record length at %X/%X"
 msgstr "longitud de registro no es válido en %X/%X"
 
-#: access/transam/xlog.c:3780
+#: access/transam/xlog.c:3844
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "el ID de gestor de recursos %u no es válido en %X/%X"
 
-#: access/transam/xlog.c:3793 access/transam/xlog.c:3809
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3873
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "registro con prev-link incorrecto %X/%X en %X/%X"
 
-#: access/transam/xlog.c:3838
+#: access/transam/xlog.c:3902
 #, c-format
 msgid "record length %u at %X/%X too long"
 msgstr "el longitud %u del registro en %X/%X es demasiado grande"
 
-#: access/transam/xlog.c:3878
+#: access/transam/xlog.c:3942
 #, c-format
 msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 "no hay marca de contrecord en el archivo de registro %u, segmento %u, "
 "posición %u"
 
-#: access/transam/xlog.c:3888
+#: access/transam/xlog.c:3952
 #, c-format
 msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 msgstr ""
 "la longitud de contrecord %u no es válido en el archivo de registro %u, "
 "segmento %u, posición %u"
 
-#: access/transam/xlog.c:3978
+#: access/transam/xlog.c:4042
 #, c-format
 msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 "el número mágico %04X no es válido en el archivo de registro %u, segmento "
 "%u, posición %u"
 
-#: access/transam/xlog.c:3985 access/transam/xlog.c:4031
+#: access/transam/xlog.c:4049 access/transam/xlog.c:4095
 #, c-format
 msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 "bits de información %04X no son válidos en el archivo de registro %u, "
 "segmento %u, posición %u"
 
-#: access/transam/xlog.c:4007 access/transam/xlog.c:4015
-#: access/transam/xlog.c:4022
+#: access/transam/xlog.c:4071 access/transam/xlog.c:4079
+#: access/transam/xlog.c:4086
 msgid "WAL file is from different database system"
 msgstr "el archivo WAL es de un sistema de bases de datos diferente"
 
-#: access/transam/xlog.c:4008
+#: access/transam/xlog.c:4072
 #, c-format
 msgid ""
 "WAL file database system identifier is %s, pg_control database system "
@@ -1234,27 +1136,27 @@ msgstr ""
 "El identificador de sistema del archivo WAL es %s, el identificador de "
 "sistema de pg_control es %s."
 
-#: access/transam/xlog.c:4016
+#: access/transam/xlog.c:4080
 msgid "Incorrect XLOG_SEG_SIZE in page header."
 msgstr "XLOG_SEG_SIZE incorrecto en encabezado de página."
 
-#: access/transam/xlog.c:4023
+#: access/transam/xlog.c:4087
 msgid "Incorrect XLOG_BLCKSZ in page header."
 msgstr "XLOG_BLCKSZ incorrecto en encabezado de página."
 
-#: access/transam/xlog.c:4039
+#: access/transam/xlog.c:4103
 #, c-format
 msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 "la dirección de página %X/%X en el archivo de registro %u, segmento %u, "
 "posición %u es inesperada"
 
-#: access/transam/xlog.c:4051
+#: access/transam/xlog.c:4115
 #, c-format
 msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
 msgstr "ID %u de timeline inesperado en archivo %u, segmento %u, posición %u"
 
-#: access/transam/xlog.c:4069
+#: access/transam/xlog.c:4133
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
@@ -1263,89 +1165,100 @@ msgstr ""
 "el ID de timeline %u está fuera de secuencia (después de %u) en el archivo "
 "de registro %u, segmento %u, posición %u"
 
-#: access/transam/xlog.c:4142
+#: access/transam/xlog.c:4206
 #, c-format
 msgid "syntax error in history file: %s"
 msgstr "error de sintaxis en archivo de historia: %s"
 
-#: access/transam/xlog.c:4143
+#: access/transam/xlog.c:4207
 msgid "Expected a numeric timeline ID."
 msgstr "Se esperaba un ID numérico de timeline."
 
-#: access/transam/xlog.c:4148
+#: access/transam/xlog.c:4212
 #, c-format
 msgid "invalid data in history file: %s"
 msgstr "datos no válidos en archivo de historia: %s"
 
-#: access/transam/xlog.c:4149
+#: access/transam/xlog.c:4213
 msgid "Timeline IDs must be in increasing sequence."
 msgstr "IDs de timeline deben ser una secuencia creciente."
 
-#: access/transam/xlog.c:4162
+#: access/transam/xlog.c:4226
 #, c-format
 msgid "invalid data in history file \"%s\""
 msgstr "datos no válidos en archivo de historia «%s»"
 
-#: access/transam/xlog.c:4163
+#: access/transam/xlog.c:4227
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr "IDs de timeline deben ser menores que el ID de timeline del hijo."
 
-#: access/transam/xlog.c:4422
+#: access/transam/xlog.c:4313
+#, c-format
+msgid "new timeline %u is not a child of database system timeline %u"
+msgstr ""
+"el nuevo timeline %u especificado no es hijo del timeline de sistema %u"
+
+#: access/transam/xlog.c:4326
+#, c-format
+msgid "new target timeline is %u"
+msgstr "el nuevo timeline destino es %u"
+
+#: access/transam/xlog.c:4551
 #, c-format
 msgid "could not link file \"%s\" to \"%s\": %m"
 msgstr "no se pudo enlazar (link) el archivo «%s» a «%s»: %m"
 
-#: access/transam/xlog.c:4429 access/transam/xlog.c:5384
-#: access/transam/xlog.c:5437 access/transam/xlog.c:6030
+#: access/transam/xlog.c:4558 access/transam/xlog.c:5518
+#: access/transam/xlog.c:5571 access/transam/xlog.c:6350
 #: postmaster/pgarch.c:715
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "no se pudo renombrar el archivo de «%s» a «%s»: %m"
 
-#: access/transam/xlog.c:4511
+#: access/transam/xlog.c:4640
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "no se pudo crear archivo de control «%s»: %m"
 
-#: access/transam/xlog.c:4522 access/transam/xlog.c:4747
+#: access/transam/xlog.c:4651 access/transam/xlog.c:4876
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "no se pudo escribir en el archivo de control: %m"
 
-#: access/transam/xlog.c:4528 access/transam/xlog.c:4753
+#: access/transam/xlog.c:4657 access/transam/xlog.c:4882
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "no se pudo sincronizar (fsync) el archivo de control: %m"
 
-#: access/transam/xlog.c:4533 access/transam/xlog.c:4758
+#: access/transam/xlog.c:4662 access/transam/xlog.c:4887
 #, c-format
 msgid "could not close control file: %m"
 msgstr "no se pudo cerrar el archivo de control: %m"
 
-#: access/transam/xlog.c:4551 access/transam/xlog.c:4736
+#: access/transam/xlog.c:4680 access/transam/xlog.c:4865
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de control «%s»: %m"
 
-#: access/transam/xlog.c:4557
+#: access/transam/xlog.c:4686
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "no se pudo leer desde el archivo de control: %m"
 
-#: access/transam/xlog.c:4570 access/transam/xlog.c:4579
-#: access/transam/xlog.c:4603 access/transam/xlog.c:4610
-#: access/transam/xlog.c:4617 access/transam/xlog.c:4622
-#: access/transam/xlog.c:4629 access/transam/xlog.c:4636
-#: access/transam/xlog.c:4643 access/transam/xlog.c:4650
-#: access/transam/xlog.c:4657 access/transam/xlog.c:4664
-#: access/transam/xlog.c:4673 access/transam/xlog.c:4680
-#: access/transam/xlog.c:4689 access/transam/xlog.c:4696
-#: access/transam/xlog.c:4705 access/transam/xlog.c:4712
-#: utils/init/miscinit.c:1136
+#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
+#: access/transam/xlog.c:4732 access/transam/xlog.c:4739
+#: access/transam/xlog.c:4746 access/transam/xlog.c:4751
+#: access/transam/xlog.c:4758 access/transam/xlog.c:4765
+#: access/transam/xlog.c:4772 access/transam/xlog.c:4779
+#: access/transam/xlog.c:4786 access/transam/xlog.c:4793
+#: access/transam/xlog.c:4802 access/transam/xlog.c:4809
+#: access/transam/xlog.c:4818 access/transam/xlog.c:4825
+#: access/transam/xlog.c:4834 access/transam/xlog.c:4841
+#: utils/init/miscinit.c:1171
 msgid "database files are incompatible with server"
 msgstr "los archivos de base de datos son incompatibles con el servidor"
 
-#: access/transam/xlog.c:4571
+#: access/transam/xlog.c:4700
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
@@ -1354,7 +1267,7 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con PG_CONTROL_VERSION %d "
 "(0x%08x), pero el servidor fue compilado con PG_CONTROL_VERSION %d (0x%08x)."
 
-#: access/transam/xlog.c:4575
+#: access/transam/xlog.c:4704
 msgid ""
 "This could be a problem of mismatched byte ordering.  It looks like you need "
 "to initdb."
@@ -1362,7 +1275,7 @@ msgstr ""
 "Este puede ser un problema de discordancia en el orden de bytes. Parece que "
 "necesitará ejecutar initdb."
 
-#: access/transam/xlog.c:4580
+#: access/transam/xlog.c:4709
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
@@ -1371,16 +1284,16 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con PG_CONTROL_VERSION "
 "%d, pero el servidor fue compilado con PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:4583 access/transam/xlog.c:4607
-#: access/transam/xlog.c:4614 access/transam/xlog.c:4619
+#: access/transam/xlog.c:4712 access/transam/xlog.c:4736
+#: access/transam/xlog.c:4743 access/transam/xlog.c:4748
 msgid "It looks like you need to initdb."
 msgstr "Parece que necesita ejecutar initdb."
 
-#: access/transam/xlog.c:4594
+#: access/transam/xlog.c:4723
 msgid "incorrect checksum in control file"
 msgstr "la suma de verificación es incorrecta en el archivo de control"
 
-#: access/transam/xlog.c:4604
+#: access/transam/xlog.c:4733
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
@@ -1389,7 +1302,7 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con CATALOG_VERSION_NO "
 "%d, pero el servidor fue compilado con CATALOG_VERSION_NO %d."
 
-#: access/transam/xlog.c:4611
+#: access/transam/xlog.c:4740
 #, c-format
 msgid ""
 "The database cluster was initialized with MAXALIGN %d, but the server was "
@@ -1398,7 +1311,7 @@ msgstr ""
 "Los archivos de la base de datos fueron inicializados con MAXALIGN %d, pero "
 "el servidor fue compilado con MAXALIGN %d."
 
-#: access/transam/xlog.c:4618
+#: access/transam/xlog.c:4747
 msgid ""
 "The database cluster appears to use a different floating-point number format "
 "than the server executable."
@@ -1406,7 +1319,7 @@ msgstr ""
 "Los archivos de la base de datos parecen usar un formato de número de coma "
 "flotante distinto al del ejecutable del servidor."
 
-#: access/transam/xlog.c:4623
+#: access/transam/xlog.c:4752
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d, but the server was "
@@ -1415,17 +1328,17 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con BLCKSZ %d, pero el "
 "servidor fue compilado con BLCKSZ %d."
 
-#: access/transam/xlog.c:4626 access/transam/xlog.c:4633
-#: access/transam/xlog.c:4640 access/transam/xlog.c:4647
-#: access/transam/xlog.c:4654 access/transam/xlog.c:4661
-#: access/transam/xlog.c:4668 access/transam/xlog.c:4676
-#: access/transam/xlog.c:4683 access/transam/xlog.c:4692
-#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
-#: access/transam/xlog.c:4715
+#: access/transam/xlog.c:4755 access/transam/xlog.c:4762
+#: access/transam/xlog.c:4769 access/transam/xlog.c:4776
+#: access/transam/xlog.c:4783 access/transam/xlog.c:4790
+#: access/transam/xlog.c:4797 access/transam/xlog.c:4805
+#: access/transam/xlog.c:4812 access/transam/xlog.c:4821
+#: access/transam/xlog.c:4828 access/transam/xlog.c:4837
+#: access/transam/xlog.c:4844
 msgid "It looks like you need to recompile or initdb."
 msgstr "Parece que necesita recompilar o ejecutar initdb."
 
-#: access/transam/xlog.c:4630
+#: access/transam/xlog.c:4759
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d, but the server was "
@@ -1434,7 +1347,7 @@ msgstr ""
 "Los archivos de la base de datos fueron inicializados con RELSEG_SIZE %d, "
 "pero el servidor fue compilado con RELSEG_SIZE %d."
 
-#: access/transam/xlog.c:4637
+#: access/transam/xlog.c:4766
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
@@ -1443,7 +1356,7 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con XLOG_BLCKSZ %d, pero "
 "el servidor fue compilado con XLOG_BLCKSZ %d."
 
-#: access/transam/xlog.c:4644
+#: access/transam/xlog.c:4773
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
@@ -1452,7 +1365,7 @@ msgstr ""
 "Los archivos de la base de datos fueron inicializados con XLOG_SEG_SIZE %d, "
 "pero el servidor fue compilado con XLOG_SEG_SIZE %d."
 
-#: access/transam/xlog.c:4651
+#: access/transam/xlog.c:4780
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d, but the server was "
@@ -1461,7 +1374,7 @@ msgstr ""
 "Los archivos de la base de datos fueron inicializados con NAMEDATALEN %d, "
 "pero el servidor fue compilado con NAMEDATALEN %d."
 
-#: access/transam/xlog.c:4658
+#: access/transam/xlog.c:4787
 #, c-format
 msgid ""
 "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
@@ -1470,7 +1383,7 @@ msgstr ""
 "Los archivos de la base de datos fueron inicializados con INDEX_MAX_KEYS %d, "
 "pero el servidor fue compilado con INDEX_MAX_KEYS %d."
 
-#: access/transam/xlog.c:4665
+#: access/transam/xlog.c:4794
 #, c-format
 msgid ""
 "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
@@ -1480,7 +1393,7 @@ msgstr ""
 "TOAST_MAX_CHUNK_SIZE %d, pero el servidor fue compilado con "
 "TOAST_MAX_CHUNK_SIZE %d."
 
-#: access/transam/xlog.c:4674
+#: access/transam/xlog.c:4803
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
 "server was compiled with HAVE_INT64_TIMESTAMP."
@@ -1489,7 +1402,7 @@ msgstr ""
 "HAVE_INT64_TIMESTAMP, pero el servidor fue compilado con "
 "HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4681
+#: access/transam/xlog.c:4810
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
 "server was compiled without HAVE_INT64_TIMESTAMP."
@@ -1498,7 +1411,7 @@ msgstr ""
 "HAVE_INT64_TIMESTAMP, pero el servidor fue compilado sin "
 "HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:4690
+#: access/transam/xlog.c:4819
 msgid ""
 "The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
 "was compiled with USE_FLOAT4_BYVAL."
@@ -1506,7 +1419,7 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados sin USE_FLOAT4_BYVAL, "
 "pero el servidor fue compilado con USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4697
+#: access/transam/xlog.c:4826
 msgid ""
 "The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
 "was compiled without USE_FLOAT4_BYVAL."
@@ -1514,7 +1427,7 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con USE_FLOAT4_BYVAL, "
 "pero el servidor fue compilado sin USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4706
+#: access/transam/xlog.c:4835
 msgid ""
 "The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
 "was compiled with USE_FLOAT8_BYVAL."
@@ -1522,7 +1435,7 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados sin USE_FLOAT8_BYVAL, "
 "pero el servidor fue compilado con USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4713
+#: access/transam/xlog.c:4842
 msgid ""
 "The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
 "was compiled without USE_FLOAT8_BYVAL."
@@ -1530,116 +1443,60 @@ msgstr ""
 "Los archivos de base de datos fueron inicializados con USE_FLOAT8_BYVAL, "
 "pero el servidor fue compilado sin USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4962
+#: access/transam/xlog.c:5167
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr ""
 "no se pudo escribir al archivo de registro de transacciones de inicio "
 "(bootstrap): %m"
 
-#: access/transam/xlog.c:4968
+#: access/transam/xlog.c:5173
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr ""
 "no se pudo sincronizar (fsync) el archivo de registro de transacciones de "
 "inicio (bootstrap): %m"
 
-#: access/transam/xlog.c:4973
+#: access/transam/xlog.c:5178
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr ""
 "no se pudo cerrar el archivo de registro de transacciones de inicio "
 "(bootstrap): %m"
 
-#: access/transam/xlog.c:5135
+#: access/transam/xlog.c:5245
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de recuperación «%s»: %m"
 
-#: access/transam/xlog.c:5159
-#, c-format
-msgid "restore_command = '%s'"
-msgstr "restore_command = '%s'"
-
-#: access/transam/xlog.c:5166
+#: access/transam/xlog.c:5283 access/transam/xlog.c:5374
+#: access/transam/xlog.c:5385 commands/extension.c:526
+#: commands/extension.c:534 utils/misc/guc.c:5307
 #, c-format
-msgid "recovery_end_command = '%s'"
-msgstr "recovery_end_command = '%s'"
-
-#: access/transam/xlog.c:5173
-#, c-format
-msgid "archive_cleanup_command = '%s'"
-msgstr "archive_cleanup_command = '%s'"
+msgid "parameter \"%s\" requires a Boolean value"
+msgstr "opción «%s» requiere un valor lógico (booleano)"
 
-#: access/transam/xlog.c:5187
+#: access/transam/xlog.c:5299
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr "recovery_target_timeline no es un número válido: «%s»"
 
-#: access/transam/xlog.c:5192
-#, c-format
-msgid "recovery_target_timeline = %u"
-msgstr "recovery_target_timeline = %u"
-
-#: access/transam/xlog.c:5195
-msgid "recovery_target_timeline = latest"
-msgstr "recovery_target_timeline = latest"
-
-#: access/transam/xlog.c:5203
+#: access/transam/xlog.c:5315
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr "recovery_target_xid no es un número válido: «%s»"
 
-#: access/transam/xlog.c:5206
-#, c-format
-msgid "recovery_target_xid = %u"
-msgstr "recovery_target_xid = %u"
-
-#: access/transam/xlog.c:5229
-#, c-format
-msgid "recovery_target_time = '%s'"
-msgstr "recovery_target_time = '%s'"
-
-#: access/transam/xlog.c:5240 access/transam/xlog.c:5249 utils/misc/guc.c:4895
-#, c-format
-msgid "parameter \"%s\" requires a Boolean value"
-msgstr "opción «%s» requiere un valor lógico (booleano)"
-
-#: access/transam/xlog.c:5242
-#, c-format
-msgid "recovery_target_inclusive = %s"
-msgstr "recovery_target_inclusive = %s"
-
-#: access/transam/xlog.c:5251
-#, c-format
-msgid "standby_mode = '%s'"
-msgstr "standby_mode = '%s'"
-
-#: access/transam/xlog.c:5257
+#: access/transam/xlog.c:5359
 #, c-format
-msgid "primary_conninfo = '%s'"
-msgstr "primary_conninfo = '%s'"
+msgid "recovery_target_name is too long (maximum %d characters)"
+msgstr "recovery_target_name es demasiado largo (máximo %d caracteres)"
 
-#: access/transam/xlog.c:5264
-#, c-format
-msgid "trigger_file = '%s'"
-msgstr "trigger_file = '%s'"
-
-#: access/transam/xlog.c:5269
+#: access/transam/xlog.c:5406
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "parámetro de recuperación no reconocido: «%s»"
 
-#: access/transam/xlog.c:5277
-#, c-format
-msgid "syntax error in recovery command file: %s"
-msgstr "error de sintaxis en archivo de recuperación: %s"
-
-#: access/transam/xlog.c:5279
-msgid "Lines should have the format parameter = 'value'."
-msgstr "Las líneas deben tener el formato «parámetro = 'valor'»."
-
-#: access/transam/xlog.c:5288
+#: access/transam/xlog.c:5417
 #, c-format
 msgid ""
 "recovery command file \"%s\" specified neither primary_conninfo nor "
@@ -1648,7 +1505,7 @@ msgstr ""
 "el archivo de recuperación «%s» no especifica primary_conninfo ni "
 "restore_command"
 
-#: access/transam/xlog.c:5290
+#: access/transam/xlog.c:5419
 msgid ""
 "The database server will regularly poll the pg_xlog subdirectory to check "
 "for files placed there."
@@ -1656,7 +1513,7 @@ msgstr ""
 "El servidor de bases de datos monitoreará el subdirectorio pg_xlog con "
 "regularidad en búsqueda de archivos almacenados ahí."
 
-#: access/transam/xlog.c:5296
+#: access/transam/xlog.c:5425
 #, c-format
 msgid ""
 "recovery command file \"%s\" must specify restore_command when standby mode "
@@ -1665,37 +1522,67 @@ msgstr ""
 "el archivo de recuperación «%s» debe especificar restore_command cuando el "
 "modo standby no está activo"
 
-#: access/transam/xlog.c:5316
+#: access/transam/xlog.c:5445
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "no existe el timeline %u especificado como destino de recuperación"
 
-#: access/transam/xlog.c:5441
+#: access/transam/xlog.c:5575
 msgid "archive recovery complete"
 msgstr "recuperación completa"
 
-#: access/transam/xlog.c:5531
+#: access/transam/xlog.c:5693
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr ""
 "recuperación detenida después de comprometer la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5536
+#: access/transam/xlog.c:5698
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "recuperación detenida antes de comprometer la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5544
+#: access/transam/xlog.c:5706
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "recuperación detenida después de abortar la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5549
+#: access/transam/xlog.c:5711
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "recuperación detenida antes de abortar la transacción %u, hora %s"
 
-#: access/transam/xlog.c:5632
+#: access/transam/xlog.c:5720
+#, c-format
+msgid "recovery stopping at restore point \"%s\", time %s"
+msgstr "recuperación detenida en el punto de recuperación «%s», hora %s"
+
+#: access/transam/xlog.c:5748
+msgid "recovery has paused"
+msgstr "la recuperación está en pausa"
+
+#: access/transam/xlog.c:5749
+msgid "Execute pg_xlog_replay_resume() to continue."
+msgstr "Ejecute pg_xlog_replay_resume() para continuar."
+
+#: access/transam/xlog.c:5792 access/transam/xlog.c:5814
+#: access/transam/xlog.c:5836
+msgid "must be superuser to control recovery"
+msgstr "debe ser superusuario para controlar la recuperación"
+
+#: access/transam/xlog.c:5797 access/transam/xlog.c:5819
+#: access/transam/xlog.c:5841
+msgid "recovery is not in progress"
+msgstr "la recuperación no está en proceso"
+
+#: access/transam/xlog.c:5798 access/transam/xlog.c:5820
+#: access/transam/xlog.c:5842
+msgid "Recovery control functions can only be executed during recovery."
+msgstr ""
+"Las funciones de control de recuperación sólo pueden ejecutarse durante la "
+"recuperación."
+
+#: access/transam/xlog.c:5934
 #, c-format
 msgid ""
 "hot standby is not possible because %s = %d is a lower setting than on the "
@@ -1704,11 +1591,11 @@ msgstr ""
 "hoy standby no es posible puesto que %s = %d es una configuración menor que "
 "en el servidor maestro (su valor era %d)"
 
-#: access/transam/xlog.c:5654
+#: access/transam/xlog.c:5956
 msgid "WAL was generated with wal_level=minimal, data may be missing"
 msgstr "WAL fue generado con wal_level=minimal, puede haber datos faltantes"
 
-#: access/transam/xlog.c:5655
+#: access/transam/xlog.c:5957
 msgid ""
 "This happens if you temporarily set wal_level=minimal without taking a new "
 "base backup."
@@ -1716,7 +1603,7 @@ msgstr ""
 "Esto sucede si temporalmente define wal_level=minimal sin tomar un nuevo "
 "respaldo base."
 
-#: access/transam/xlog.c:5666
+#: access/transam/xlog.c:5968
 msgid ""
 "hot standby is not possible because wal_level was not set to \"hot_standby\" "
 "on the master server"
@@ -1724,7 +1611,7 @@ msgstr ""
 "hot standby no es posible porque wal_level no estaba configurado como "
 "«hot_standby» en el servidor maestro"
 
-#: access/transam/xlog.c:5667
+#: access/transam/xlog.c:5969
 msgid ""
 "Either set wal_level to \"hot_standby\" on the master, or turn off "
 "hot_standby here."
@@ -1732,34 +1619,34 @@ msgstr ""
 "Defina wal_level a «hot_standby» en el maestro, o bien desactive hot_standby "
 "en este servidor."
 
-#: access/transam/xlog.c:5714
+#: access/transam/xlog.c:6017
 msgid "control file contains invalid data"
 msgstr "el archivo de control contiene datos no válidos"
 
-#: access/transam/xlog.c:5718
+#: access/transam/xlog.c:6021
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "el sistema de bases de datos fue apagado en %s"
 
-#: access/transam/xlog.c:5722
+#: access/transam/xlog.c:6025
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "el sistema de bases de datos fue apagado durante la recuperación en %s"
 
-#: access/transam/xlog.c:5726
+#: access/transam/xlog.c:6029
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr ""
 "el apagado del sistema de datos fue interrumpido; última vez registrada en "
 "funcionamiento en %s"
 
-#: access/transam/xlog.c:5730
+#: access/transam/xlog.c:6033
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr ""
 "el sistema de bases de datos fue interrumpido durante la recuperación en %s"
 
-#: access/transam/xlog.c:5732
+#: access/transam/xlog.c:6035
 msgid ""
 "This probably means that some data is corrupted and you will have to use the "
 "last backup for recovery."
@@ -1767,63 +1654,68 @@ msgstr ""
 "Esto probablemente significa que algunos datos están corruptos y tendrá que "
 "usar el respaldo más reciente para la recuperación."
 
-#: access/transam/xlog.c:5736
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr ""
 "el sistema de bases de datos fue interrumpido durante la recuperación en el "
 "instante de registro %s"
 
-#: access/transam/xlog.c:5738
+#: access/transam/xlog.c:6041
 msgid ""
 "If this has occurred more than once some data might be corrupted and you "
 "might need to choose an earlier recovery target."
 msgstr ""
 "Si esto ha ocurrido más de una vez, algunos datos podrían estar corruptos y "
-"podría necesitar escoger un punto de recuperación anterior."
+"podría ser necesario escoger un punto de recuperación anterior."
 
-#: access/transam/xlog.c:5742
+#: access/transam/xlog.c:6045
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr ""
 "el sistema de bases de datos fue interrumpido; última vez en funcionamiento "
 "en %s"
 
-#: access/transam/xlog.c:5791
+#: access/transam/xlog.c:6094
 #, c-format
 msgid "requested timeline %u is not a child of database system timeline %u"
 msgstr "el timeline %u especificado no es hijo del timeline de sistema %u"
 
-#: access/transam/xlog.c:5809
+#: access/transam/xlog.c:6112
 msgid "entering standby mode"
 msgstr "entrando al modo standby"
 
-#: access/transam/xlog.c:5812
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "comenzando el proceso de recuperación hasta el XID %u"
 
-#: access/transam/xlog.c:5816
+#: access/transam/xlog.c:6119
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "comenzando el proceso de recuperación hasta %s"
 
-#: access/transam/xlog.c:5820
+#: access/transam/xlog.c:6123
+#, c-format
+msgid "starting point-in-time recovery to \"%s\""
+msgstr "comenzando el proceso de recuperación hasta «%s»"
+
+#: access/transam/xlog.c:6127
 msgid "starting archive recovery"
 msgstr "comenzando proceso de recuperación"
 
-#: access/transam/xlog.c:5835 access/transam/xlog.c:5875
+#: access/transam/xlog.c:6149 access/transam/xlog.c:6189
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "el registro del punto de control está en %X/%X"
 
-#: access/transam/xlog.c:5849
+#: access/transam/xlog.c:6163
 msgid "could not find redo location referenced by checkpoint record"
 msgstr ""
 "no se pudo localizar la ubicación de redo referida por el registro de "
 "checkpoint"
 
-#: access/transam/xlog.c:5850 access/transam/xlog.c:5857
+#: access/transam/xlog.c:6164 access/transam/xlog.c:6171
 #, c-format
 msgid ""
 "If you are not restoring from a backup, try removing the file \"%s/"
@@ -1831,274 +1723,297 @@ msgid ""
 msgstr ""
 "Si no está restaurando un respaldo, intente eliminando «%s/backup_label»."
 
-#: access/transam/xlog.c:5856
+#: access/transam/xlog.c:6170
 msgid "could not locate required checkpoint record"
 msgstr "no se pudo localizar el registro del punto de control requerido"
 
-#: access/transam/xlog.c:5885 access/transam/xlog.c:5900
+#: access/transam/xlog.c:6199 access/transam/xlog.c:6214
 msgid "could not locate a valid checkpoint record"
 msgstr "no se pudo localizar un registro de punto de control válido"
 
-#: access/transam/xlog.c:5894
+#: access/transam/xlog.c:6208
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "usando el registro del punto de control anterior en %X/%X"
 
-#: access/transam/xlog.c:5909
+#: access/transam/xlog.c:6223
 #, c-format
 msgid "redo record is at %X/%X; shutdown %s"
 msgstr "registro de redo en %X/%X; apagado %s"
 
-#: access/transam/xlog.c:5913
+#: access/transam/xlog.c:6227
 #, c-format
 msgid "next transaction ID: %u/%u; next OID: %u"
 msgstr "siguiente ID de transacción: %u/%u; siguiente OID: %u"
 
-#: access/transam/xlog.c:5917
+#: access/transam/xlog.c:6231
 #, c-format
 msgid "next MultiXactId: %u; next MultiXactOffset: %u"
 msgstr "siguiente MultiXactId: %u; siguiente MultiXactOffset: %u"
 
-#: access/transam/xlog.c:5920
+#: access/transam/xlog.c:6234
 #, c-format
 msgid "oldest unfrozen transaction ID: %u, in database %u"
 msgstr "ID de transacción más antigua sin congelar: %u, en base de datos %u"
 
-#: access/transam/xlog.c:5924
+#: access/transam/xlog.c:6238
 msgid "invalid next transaction ID"
 msgstr "el siguiente ID de transacción no es válido"
 
-#: access/transam/xlog.c:5943
+#: access/transam/xlog.c:6257
 msgid "invalid redo in checkpoint record"
 msgstr "redo no es válido en el registro de punto de control"
 
-#: access/transam/xlog.c:5954
+#: access/transam/xlog.c:6268
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "registro redo no es válido en el punto de control de apagado"
 
-#: access/transam/xlog.c:5984
+#: access/transam/xlog.c:6298
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 "el sistema de bases de datos no fue apagado apropiadamente; se está "
 "efectuando la recuperación automática"
 
-#: access/transam/xlog.c:6049
+#: access/transam/xlog.c:6377
 msgid "initializing for hot standby"
 msgstr "inicializando para hot standby"
 
-#: access/transam/xlog.c:6174
+#: access/transam/xlog.c:6505
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "redo comienza en %X/%X"
 
-#: access/transam/xlog.c:6273
+#: access/transam/xlog.c:6620
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "redo listo en %X/%X"
 
-#: access/transam/xlog.c:6278 access/transam/xlog.c:7747
+#: access/transam/xlog.c:6625 access/transam/xlog.c:8195
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "última transacción completada al tiempo de registro %s"
 
-#: access/transam/xlog.c:6286
+#: access/transam/xlog.c:6633
 msgid "redo is not required"
 msgstr "no se requiere redo"
 
-#: access/transam/xlog.c:6326
+#: access/transam/xlog.c:6681
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr ""
 "el punto de detención de recuperación pedido es antes del punto de "
 "recuperación consistente"
 
-#: access/transam/xlog.c:6329
+#: access/transam/xlog.c:6690
+msgid "WAL ends before end of online backup"
+msgstr "WAL termina antes del fin del respaldo en línea"
+
+#: access/transam/xlog.c:6691
+msgid ""
+"Online backup started with pg_start_backup() must be ended with "
+"pg_stop_backup(), and all WAL up to that point must be available at recovery."
+msgstr ""
+"Un respaldo en línea iniciado con pg_start_backup() debe ser terminado con "
+"pg_stop_backup(), y todos los archivos WAL hasta ese punto deben estar "
+"disponibles durante la recuperación."
+
+#: access/transam/xlog.c:6694
 msgid "WAL ends before consistent recovery point"
 msgstr "WAL termina antes del punto de recuperación consistente"
 
-#: access/transam/xlog.c:6350
+#: access/transam/xlog.c:6715
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "seleccionado nuevo ID de timeline: %u"
 
-#: access/transam/xlog.c:6586
+#: access/transam/xlog.c:6957
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "el estado de recuperación consistente fue alcanzado en %X/%X"
 
-#: access/transam/xlog.c:6712
+#: access/transam/xlog.c:7123
 msgid "invalid primary checkpoint link in control file"
 msgstr ""
 "el enlace de punto de control primario en archivo de control no es válido"
 
-#: access/transam/xlog.c:6716
+#: access/transam/xlog.c:7127
 msgid "invalid secondary checkpoint link in control file"
 msgstr ""
 "el enlace del punto de control secundario en archivo de control no es válido"
 
-#: access/transam/xlog.c:6720
+#: access/transam/xlog.c:7131
 msgid "invalid checkpoint link in backup_label file"
 msgstr "el enlace del punto de control en backup_label no es válido"
 
-#: access/transam/xlog.c:6734
+#: access/transam/xlog.c:7145
 msgid "invalid primary checkpoint record"
 msgstr "el registro del punto de control primario no es válido"
 
-#: access/transam/xlog.c:6738
+#: access/transam/xlog.c:7149
 msgid "invalid secondary checkpoint record"
 msgstr "el registro del punto de control secundario no es válido"
 
-#: access/transam/xlog.c:6742
+#: access/transam/xlog.c:7153
 msgid "invalid checkpoint record"
 msgstr "el registro del punto de control no es válido"
 
-#: access/transam/xlog.c:6753
+#: access/transam/xlog.c:7164
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr ""
 "el ID de gestor de recursos en el registro del punto de control primario no "
 "es válido"
 
-#: access/transam/xlog.c:6757
+#: access/transam/xlog.c:7168
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr ""
 "el ID de gestor de recursos en el registro del punto de control secundario "
 "no es válido"
 
-#: access/transam/xlog.c:6761
+#: access/transam/xlog.c:7172
 msgid "invalid resource manager ID in checkpoint record"
 msgstr ""
 "el ID de gestor de recursos en el registro del punto de control no es válido"
 
-#: access/transam/xlog.c:6773
+#: access/transam/xlog.c:7184
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "xl_info en el registro del punto de control primario no es válido"
 
-#: access/transam/xlog.c:6777
+#: access/transam/xlog.c:7188
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "xl_info en el registro del punto de control secundario no es válido"
 
-#: access/transam/xlog.c:6781
+#: access/transam/xlog.c:7192
 msgid "invalid xl_info in checkpoint record"
 msgstr "xl_info en el registro del punto de control no es válido"
 
-#: access/transam/xlog.c:6793
+#: access/transam/xlog.c:7204
 msgid "invalid length of primary checkpoint record"
 msgstr "la longitud del registro del punto de control primario no es válida"
 
-#: access/transam/xlog.c:6797
+#: access/transam/xlog.c:7208
 msgid "invalid length of secondary checkpoint record"
 msgstr "la longitud del registro del punto de control secundario no es válida"
 
-#: access/transam/xlog.c:6801
+#: access/transam/xlog.c:7212
 msgid "invalid length of checkpoint record"
 msgstr "la longitud del registro de punto de control no es válida"
 
-#: access/transam/xlog.c:6963
+#: access/transam/xlog.c:7374
 msgid "shutting down"
 msgstr "apagando"
 
-#: access/transam/xlog.c:6985
+#: access/transam/xlog.c:7396
 msgid "database system is shut down"
 msgstr "el sistema de bases de datos está apagado"
 
-#: access/transam/xlog.c:7378
+#: access/transam/xlog.c:7822
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 "hay actividad en el registro de transacción mientras el sistema se está "
 "apagando"
 
-#: access/transam/xlog.c:7610
+#: access/transam/xlog.c:8056
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "saltando el punto-de-reinicio; la recuperación ya ha terminado"
 
-#: access/transam/xlog.c:7635
+#: access/transam/xlog.c:8081
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr "saltando el punto-de-reinicio; ya fue llevado a cabo en %X/%X"
 
-#: access/transam/xlog.c:7745
+#: access/transam/xlog.c:8193
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "punto-de-reinicio de recuperación en %X/%X"
 
-#: access/transam/xlog.c:7915
-msgid "online backup was cancelled, recovery cannot continue"
-msgstr ""
-"el modo de respaldo en línea fue cancelado, la recuperación no puede "
-"continuar"
+#: access/transam/xlog.c:8293
+#, c-format
+msgid "restore point \"%s\" created at %X/%X"
+msgstr "punto de recuperación «%s» creado en %X/%X"
 
-#: access/transam/xlog.c:7967
+#: access/transam/xlog.c:8390
+msgid "online backup was canceled, recovery cannot continue"
+msgstr "el respaldo en línea fue cancelado, la recuperación no puede continuar"
+
+#: access/transam/xlog.c:8442
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr ""
 "ID de timeline %u inesperado (después de %u) en el registro de punto de "
 "control"
 
-#: access/transam/xlog.c:8003
+#: access/transam/xlog.c:8478
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr ""
 "ID de timeline %u inesperado (debería ser %u) en el registro de punto de "
 "control"
 
-#: access/transam/xlog.c:8259 access/transam/xlog.c:8285
+#: access/transam/xlog.c:8742 access/transam/xlog.c:8766
 #, c-format
 msgid "could not fsync log file %u, segment %u: %m"
 msgstr ""
 "no se pudo sincronizar (fsync) el archivo de registro %u, segmento %u: %m"
 
-#: access/transam/xlog.c:8293
+#: access/transam/xlog.c:8774
 #, c-format
 msgid "could not fsync write-through log file %u, segment %u: %m"
 msgstr ""
 "no se pudo sincronizar (fsync write-through) el archivo de registro %u, "
 "segmento %u: %m"
 
-#: access/transam/xlog.c:8302
+#: access/transam/xlog.c:8783
 #, c-format
 msgid "could not fdatasync log file %u, segment %u: %m"
 msgstr ""
 "no se pudo sincronizar (fdatasync) el archivo de registro %u, segmento %u: %m"
 
-#: access/transam/xlog.c:8345 access/transam/xlog.c:8537
-msgid "must be superuser to run a backup"
-msgstr "debe ser superusuario para ejecutar un respaldo"
+#: access/transam/xlog.c:8864 access/transam/xlog.c:9142
+msgid "must be superuser or replication role to run a backup"
+msgstr ""
+"debe ser superusuario o el rol de replicación para ejecutar un respaldo"
 
-#: access/transam/xlog.c:8350 access/transam/xlog.c:8542
-#: access/transam/xlog.c:8745 access/transam/xlog.c:8773
-#: access/transam/xlog.c:8806 access/transam/xlog.c:8898
-#: access/transam/xlog.c:8973
+#: access/transam/xlog.c:8869 access/transam/xlog.c:9147
+#: access/transam/xlog.c:9410 access/transam/xlog.c:9442
+#: access/transam/xlog.c:9483 access/transam/xlog.c:9516
+#: access/transam/xlog.c:9623 access/transam/xlog.c:9698
 msgid "recovery is in progress"
 msgstr "la recuperación está en proceso"
 
-#: access/transam/xlog.c:8351 access/transam/xlog.c:8543
-#: access/transam/xlog.c:8746 access/transam/xlog.c:8774
-#: access/transam/xlog.c:8807
+#: access/transam/xlog.c:8870 access/transam/xlog.c:9148
+#: access/transam/xlog.c:9411 access/transam/xlog.c:9443
+#: access/transam/xlog.c:9484 access/transam/xlog.c:9517
 msgid "WAL control functions cannot be executed during recovery."
 msgstr ""
 "Las funciones de control de WAL no pueden ejecutarse durante la recuperación."
 
-#: access/transam/xlog.c:8356 access/transam/xlog.c:8548
+#: access/transam/xlog.c:8875 access/transam/xlog.c:9153
 msgid "WAL level not sufficient for making an online backup"
 msgstr "el nivel de WAL no es suficiente para hacer un respaldo en línea"
 
-#: access/transam/xlog.c:8357 access/transam/xlog.c:8549
+#: access/transam/xlog.c:8876 access/transam/xlog.c:9154
+#: access/transam/xlog.c:9449
 msgid ""
 "wal_level must be set to \"archive\" or \"hot_standby\" at server start."
 msgstr ""
 "wal_level debe ser definido a «archive» o «hot_standby» al inicio del "
 "servidor."
 
-#: access/transam/xlog.c:8384 access/transam/xlog.c:8453
+#: access/transam/xlog.c:8881
+#, c-format
+msgid "backup label too long (max %d bytes)"
+msgstr "la etiqueta de respaldo es demasiado larga (máximo %d bytes)"
+
+#: access/transam/xlog.c:8922 access/transam/xlog.c:9025
 msgid "a backup is already in progress"
 msgstr "ya hay un respaldo en curso"
 
-#: access/transam/xlog.c:8385
+#: access/transam/xlog.c:8923
 msgid "Run pg_stop_backup() and try again."
 msgstr "Ejecute pg_stop_backup() e intente nuevamente."
 
-#: access/transam/xlog.c:8454
+#: access/transam/xlog.c:9026
 #, c-format
 msgid ""
 "If you're sure there is no backup in progress, remove file \"%s\" and try "
@@ -2107,29 +2022,29 @@ msgstr ""
 "Si está seguro que no hay un respaldo en curso, elimine el archivo «%s» e "
 "intente nuevamente."
 
-#: access/transam/xlog.c:8475 access/transam/xlog.c:8632
+#: access/transam/xlog.c:9040 access/transam/xlog.c:9286
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "no se pudo escribir el archivo «%s»: %m"
 
-#: access/transam/xlog.c:8571
+#: access/transam/xlog.c:9198
 msgid "a backup is not in progress"
 msgstr "no hay un respaldo en curso"
 
-#: access/transam/xlog.c:8583 access/transam/xlog.c:9039
-#: access/transam/xlog.c:9045
+#: access/transam/xlog.c:9237 access/transam/xlog.c:9768
+#: access/transam/xlog.c:9774
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "datos no válidos en archivo «%s»"
 
-#: access/transam/xlog.c:8695
+#: access/transam/xlog.c:9335
 msgid ""
 "pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
 msgstr ""
 "finalización de pg_stop_backup completa, esperando que se archiven los "
 "segmentos WAL requeridos"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:9345
 #, c-format
 msgid ""
 "pg_stop_backup still waiting for all required WAL segments to be archived "
@@ -2138,10 +2053,10 @@ msgstr ""
 "pg_stop_backup todavía espera que todos los segmentos WAL requeridos sean "
 "archivados (han pasado %d segundos)"
 
-#: access/transam/xlog.c:8707
+#: access/transam/xlog.c:9347
 msgid ""
 "Check that your archive_command is executing properly.  pg_stop_backup can "
-"be cancelled safely, but the database backup will not be usable without all "
+"be canceled safely, but the database backup will not be usable without all "
 "the WAL segments."
 msgstr ""
 "Verifique que su archive_command se esté ejecutando con normalidad.  "
@@ -2149,13 +2064,13 @@ msgstr ""
 "base de datos no será utilizable a menos que disponga de todos los segmentos "
 "de WAL."
 
-#: access/transam/xlog.c:8714
+#: access/transam/xlog.c:9354
 msgid "pg_stop_backup complete, all required WAL segments have been archived"
 msgstr ""
 "pg_stop_backup completado, todos los segmentos de WAL requeridos han sido "
 "archivados"
 
-#: access/transam/xlog.c:8718
+#: access/transam/xlog.c:9358
 msgid ""
 "WAL archiving is not enabled; you must ensure that all required WAL segments "
 "are copied through other means to complete the backup"
@@ -2163,410 +2078,208 @@ msgstr ""
 "el archivado de WAL no está activo; debe asegurarse que todos los segmentos "
 "WAL requeridos se copian por algún otro mecanism para completar el respaldo"
 
-#: access/transam/xlog.c:8740
+#: access/transam/xlog.c:9405
 msgid "must be superuser to switch transaction log files"
 msgstr "debe ser superusuario para cambiar a un nuevo archivo de registro"
 
-#: access/transam/xlog.c:8899
+#: access/transam/xlog.c:9437
+msgid "must be superuser to create a restore point"
+msgstr "debe ser superusuario para crear un punto de recuperación"
+
+#: access/transam/xlog.c:9448
+msgid "WAL level not sufficient for creating a restore point"
+msgstr "el nivel de WAL no es suficiente para crear un punto de recuperación"
+
+#: access/transam/xlog.c:9456
+#, c-format
+msgid "value too long for restore point (maximum %d characters)"
+msgstr ""
+"el valor es demasiado largo para un punto de recuperación (máximo %d "
+"caracteres)"
+
+#: access/transam/xlog.c:9624
 msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
 msgstr "pg_xlogfile_name_offset() no puede ejecutarse durante la recuperación."
 
-#: access/transam/xlog.c:8909 access/transam/xlog.c:8981
+#: access/transam/xlog.c:9634 access/transam/xlog.c:9706
 #, c-format
 msgid "could not parse transaction log location \"%s\""
 msgstr "no se pudo interpretar la ubicación del registro de transacciones «%s»"
 
-#: access/transam/xlog.c:8974
+#: access/transam/xlog.c:9699
 msgid "pg_xlogfile_name() cannot be executed during recovery."
 msgstr "pg_xlogfile_name() no puede ejecutarse durante la recuperación."
 
-#: access/transam/xlog.c:9071
+#: access/transam/xlog.c:9810
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:9111
-msgid "online backup mode cancelled"
+#: access/transam/xlog.c:9850
+msgid "online backup mode canceled"
 msgstr "el modo de respaldo en línea fue cancelado"
 
-#: access/transam/xlog.c:9112
+#: access/transam/xlog.c:9851
 #, c-format
 msgid "\"%s\" was renamed to \"%s\"."
 msgstr "«%s» fue renombrado a «%s»."
 
-#: access/transam/xlog.c:9119
-msgid "online backup mode was not cancelled"
+#: access/transam/xlog.c:9858
+msgid "online backup mode was not canceled"
 msgstr "el modo de respaldo en línea no fue cancelado"
 
-#: access/transam/xlog.c:9120
+#: access/transam/xlog.c:9859
 #, c-format
 msgid "Could not rename \"%s\" to \"%s\": %m."
 msgstr "No se pudo renombrar «%s» a «%s»: %m."
 
-#: access/transam/xlog.c:9588 access/transam/xlog.c:9610
+#: access/transam/xlog.c:10372 access/transam/xlog.c:10394
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u: %m"
 msgstr ""
 "no se pudo leer el archivo de registro %u, segmento %u, posición %u: %m"
 
-#: access/transam/xlog.c:9698
+#: access/transam/xlog.c:10483
+msgid "received promote request"
+msgstr "se recibió petición de promoción"
+
+#: access/transam/xlog.c:10496
 #, c-format
 msgid "trigger file found: %s"
 msgstr "se encontró el archivo disparador: %s"
 
-#: access/common/tupdesc.c:545 parser/parse_relation.c:1165
+#: access/heap/heapam.c:1082 access/heap/heapam.c:1110
+#: access/heap/heapam.c:1140 catalog/aclchk.c:1678
 #, c-format
-msgid "column \"%s\" cannot be declared SETOF"
-msgstr "la columna «%s» no puede ser declarada SETOF"
+msgid "\"%s\" is an index"
+msgstr "«%s» es un índice"
 
-#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
+#: access/heap/heapam.c:1087 access/heap/heapam.c:1115
+#: access/heap/heapam.c:1145 catalog/aclchk.c:1685 commands/tablecmds.c:2269
+#: commands/tablecmds.c:7436 commands/tablecmds.c:9018
 #, c-format
-msgid "number of columns (%d) exceeds limit (%d)"
-msgstr "el número de columnas (%d) excede el límite (%d)"
+msgid "\"%s\" is a composite type"
+msgstr "«%s» es un tipo compuesto"
 
-#: access/common/indextuple.c:57
+#: access/heap/heapam.c:3216 access/heap/heapam.c:3247
+#: access/heap/heapam.c:3282
 #, c-format
-msgid "number of index columns (%d) exceeds limit (%d)"
-msgstr "el número de columnas del índice (%d) excede el límite (%d)"
+msgid "could not obtain lock on row in relation \"%s\""
+msgstr "no se pudo bloquear un candado en la fila de la relación «%s»"
 
-#: access/common/indextuple.c:168
+#: access/heap/hio.c:175 access/heap/rewriteheap.c:597
 #, c-format
-msgid "index row requires %lu bytes, maximum size is %lu"
-msgstr "fila de índice requiere %lu bytes, tamaño máximo es %lu"
+msgid "row is too big: size %lu, maximum size %lu"
+msgstr "fila es demasiado grande: tamaño %lu, tamaño máximo %lu"
 
-#: access/common/printtup.c:278 tcop/fastpath.c:181 tcop/fastpath.c:561
-#: tcop/postgres.c:1704
+#: access/index/indexam.c:161 catalog/objectaddress.c:391
+#: commands/indexcmds.c:1542 commands/tablecmds.c:220
+#: commands/tablecmds.c:2486
 #, c-format
-msgid "unsupported format code: %d"
-msgstr "código de formato no soportado: %d"
+msgid "\"%s\" is not an index"
+msgstr "«%s» no es un índice"
 
-#: access/common/reloptions.c:323
-msgid "user-defined relation parameter types limit exceeded"
-msgstr ""
-"el límite de tipos de parámetros de relación definidos por el usuario ha "
-"sido excedido"
+#: access/nbtree/nbtinsert.c:393
+#, c-format
+msgid "duplicate key value violates unique constraint \"%s\""
+msgstr "llave duplicada viola restricción de unicidad «%s»"
 
-#: access/common/reloptions.c:622
-msgid "RESET must not include values for parameters"
-msgstr "RESET no debe incluir valores de parámetros"
+#: access/nbtree/nbtinsert.c:395
+#, c-format
+msgid "Key %s already exists."
+msgstr "Ya existe la llave %s."
 
-#: access/common/reloptions.c:655
+#: access/nbtree/nbtinsert.c:457
 #, c-format
-msgid "unrecognized parameter namespace \"%s\""
-msgstr "espacio de nombre de parámetro «%s» no reconocido"
+msgid "failed to re-find tuple within index \"%s\""
+msgstr "no se pudo volver a encontrar la tupla dentro del índice «%s»"
+
+#: access/nbtree/nbtinsert.c:459
+msgid "This may be because of a non-immutable index expression."
+msgstr "Esto puede deberse a una expresión de índice no inmutable."
+
+#: access/nbtree/nbtinsert.c:535 access/nbtree/nbtsort.c:487
+msgid ""
+"Values larger than 1/3 of a buffer page cannot be indexed.\n"
+"Consider a function index of an MD5 hash of the value, or use full text "
+"indexing."
+msgstr ""
+"Valores mayores a 1/3 de la página del buffer no pueden ser indexados.\n"
+"Considere un índice sobre una función que genere un hash MD5 del valor, o "
+"utilice un esquema de indexación de texto completo."
 
-#: access/common/reloptions.c:895
+#: access/nbtree/nbtpage.c:161 access/nbtree/nbtpage.c:365
+#: parser/parse_utilcmd.c:1527
 #, c-format
-msgid "unrecognized parameter \"%s\""
-msgstr "parámetro no reconocido «%s»"
+msgid "index \"%s\" is not a btree"
+msgstr "el índice «%s» no es un btree"
 
-#: access/common/reloptions.c:920
+#: access/nbtree/nbtpage.c:167 access/nbtree/nbtpage.c:371
 #, c-format
-msgid "parameter \"%s\" specified more than once"
-msgstr "el parámetro «%s» fue especificado más de una vez"
+msgid "version mismatch in index \"%s\": file version %d, code version %d"
+msgstr ""
+"discordancia de versión en índice «%s»: versión de archivo %d, versión de "
+"código %d"
 
-#: access/common/reloptions.c:935
+#: bootstrap/bootstrap.c:277 tcop/postgres.c:3388 postmaster/postmaster.c:681
 #, c-format
-msgid "invalid value for boolean option \"%s\": %s"
-msgstr "valor no válido para la opción booleana «%s»: «%s»"
+msgid "--%s requires a value"
+msgstr "--%s requiere un valor"
 
-#: access/common/reloptions.c:946
+#: bootstrap/bootstrap.c:282 tcop/postgres.c:3393 postmaster/postmaster.c:686
 #, c-format
-msgid "invalid value for integer option \"%s\": %s"
-msgstr "valor no válido para la opción entera «%s»: «%s»"
+msgid "-c %s requires a value"
+msgstr "-c %s requiere un valor"
 
-#: access/common/reloptions.c:951 access/common/reloptions.c:969
+#: bootstrap/bootstrap.c:293 postmaster/postmaster.c:698
+#: postmaster/postmaster.c:711
 #, c-format
-msgid "value %s out of bounds for option \"%s\""
-msgstr "el valor %s está fuera del rango de la opción «%s»"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Pruebe «%s --help» para mayor información.\n"
 
-#: access/common/reloptions.c:953
+#: bootstrap/bootstrap.c:302
 #, c-format
-msgid "Valid values are between \"%d\" and \"%d\"."
-msgstr "Los valores aceptables están entre «%d» y «%d»."
+msgid "%s: invalid command-line arguments\n"
+msgstr "%s: argumentos de línea de órdenes no válidos\n"
 
-#: access/common/reloptions.c:964
+#: catalog/aclchk.c:200
+msgid "grant options can only be granted to roles"
+msgstr "la opción de grant sólo puede ser otorgada a roles"
+
+#: catalog/aclchk.c:316
 #, c-format
-msgid "invalid value for floating point option \"%s\": %s"
-msgstr "valor no válido para la opción de coma flotante «%s»: «%s»"
+msgid "no privileges were granted for column \"%s\" of relation \"%s\""
+msgstr "no se otorgaron privilegios para la columna «%s» de la relación «%s»"
 
-#: access/common/reloptions.c:971
+#: catalog/aclchk.c:321
 #, c-format
-msgid "Valid values are between \"%f\" and \"%f\"."
-msgstr "Valores aceptables están entre «%f» y «%f»."
+msgid "no privileges were granted for \"%s\""
+msgstr "no se otorgaron privilegios para «%s»"
 
-#: access/common/tupconvert.c:107
+#: catalog/aclchk.c:329
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
+msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
 msgstr ""
-"El tipo retornado %s no coincide con el tipo de registro esperado %s en la "
-"columna %d."
+"no todos los privilegios fueron otorgados para la columna «%s» de la "
+"relación «%s»"
 
-#: access/common/tupconvert.c:135
+#: catalog/aclchk.c:334
 #, c-format
-msgid ""
-"Number of returned columns (%d) does not match expected column count (%d)."
-msgstr ""
-"La cantidad de columnas retornadas (%d) no coincide con la cantidad esperada "
-"de columnas (%d)."
+msgid "not all privileges were granted for \"%s\""
+msgstr "no todos los privilegios fueron otorgados para «%s»"
 
-#: access/common/tupconvert.c:240
+#: catalog/aclchk.c:345
 #, c-format
-msgid ""
-"Attribute \"%s\" of type %s does not match corresponding attribute of type "
-"%s."
-msgstr ""
-"El atributo «%s» de tipo %s no coincide el atributo correspondiente de tipo "
-"%s."
-
-#: access/common/tupconvert.c:252
-#, c-format
-msgid "Attribute \"%s\" of type %s does not exist in type %s."
-msgstr "El atributo «%s» de tipo %s no existe en el tipo %s."
-
-#: access/gin/ginarrayproc.c:30
-msgid "array must not contain null values"
-msgstr "los arrays no deben contener valores nulos"
-
-#: access/gin/ginentrypage.c:83 access/gin/ginentrypage.c:118
-#: access/nbtree/nbtinsert.c:522 access/nbtree/nbtsort.c:483
-#, c-format
-msgid "index row size %lu exceeds maximum %lu for index \"%s\""
-msgstr ""
-"el tamaño de fila de índice %lu excede el máximo %lu para el índice «%s»"
-
-#: access/gin/ginscan.c:168 access/gin/ginscan.c:231
-msgid "GIN indexes do not support whole-index scans"
-msgstr "los índices GIN no soportan recorridos del índice completo"
-
-#: access/gist/gistxlog.c:803
-#, c-format
-msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr ""
-"índice %u/%u/%u necesita que se ejecute VACUUM FULL o REINDEX para finalizar "
-"la recuperación"
-
-#: access/gist/gistxlog.c:805
-msgid "Incomplete insertion detected during crash replay."
-msgstr "Inserción incompleta detectada durante recuperación."
-
-#: access/gist/gistsplit.c:372
-#, c-format
-msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr "el método picksplit para la columna %d del índice «%s» falló"
-
-#: access/gist/gistsplit.c:374
-msgid ""
-"The index is not optimal. To optimize it, contact a developer, or try to use "
-"the column as the second one in the CREATE INDEX command."
-msgstr ""
-"El índice no es óptimo.  Para optimizarlo, contacte un desarrollador o trate "
-"de usar la columna en segunda posición en la orden CREATE INDEX."
-
-#: access/gist/gistutil.c:407
-#, c-format
-msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
-msgstr ""
-"índice «%s» necesita que se ejecute VACUUM o REINDEX para finalizar la "
-"recuperación"
-
-#: access/gist/gistutil.c:588 access/hash/hashutil.c:165
-#: access/nbtree/nbtpage.c:432
-#, c-format
-msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "índice «%s» contiene páginas vacías no esperadas en el bloque %u"
-
-#: access/gist/gistutil.c:591 access/gist/gistutil.c:602
-#: access/hash/hashutil.c:168 access/hash/hashutil.c:179
-#: access/hash/hashutil.c:191 access/hash/hashutil.c:212
-#: access/nbtree/nbtpage.c:435 access/nbtree/nbtpage.c:446
-msgid "Please REINDEX it."
-msgstr "Por favor aplíquele REINDEX."
-
-#: access/gist/gistutil.c:599 access/hash/hashutil.c:176
-#: access/hash/hashutil.c:188 access/nbtree/nbtpage.c:443
-#, c-format
-msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "el índice «%s» contiene una página corrupta en el bloque %u"
-
-#: access/gist/gistvacuum.c:72
-#, c-format
-msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr ""
-"índice «%s» necesita que se ejecute VACUUM FULL o REINDEX para finalizar la "
-"recuperación"
-
-#: access/hash/hashutil.c:204
-#, c-format
-msgid "index \"%s\" is not a hash index"
-msgstr "el índice «%s» no es un índice hash"
-
-#: access/hash/hashutil.c:210
-#, c-format
-msgid "index \"%s\" has wrong hash version"
-msgstr "el índice «%s» tiene una versión de hash incorrecta"
-
-#: access/hash/hashinsert.c:73
-#, c-format
-msgid "index row size %lu exceeds hash maximum %lu"
-msgstr "el tamaño de fila de índice %lu excede el máximo para hash %lu"
-
-#: access/hash/hashinsert.c:76
-msgid "Values larger than a buffer page cannot be indexed."
-msgstr "Valores mayores a una página del buffer no pueden ser indexados."
-
-#: access/hash/hashovfl.c:546
-#, c-format
-msgid "out of overflow pages in hash index \"%s\""
-msgstr "se agotaron las páginas de desbordamiento en el índice hash «%s»"
-
-#: access/hash/hashsearch.c:152
-msgid "hash indexes do not support whole-index scans"
-msgstr "los índices hash no soportan recorridos del índice completo"
-
-#: access/heap/heapam.c:1076 access/heap/heapam.c:1104
-#: access/heap/heapam.c:1134 catalog/aclchk.c:1720
-#, c-format
-msgid "\"%s\" is an index"
-msgstr "«%s» es un índice"
-
-#: access/heap/heapam.c:1081 access/heap/heapam.c:1109
-#: access/heap/heapam.c:1139 catalog/aclchk.c:1727 commands/tablecmds.c:2162
-#: commands/tablecmds.c:6545 commands/tablecmds.c:7851
-#, c-format
-msgid "\"%s\" is a composite type"
-msgstr "«%s» es un tipo compuesto"
-
-#: access/heap/heapam.c:3149 access/heap/heapam.c:3180
-#: access/heap/heapam.c:3215
-#, c-format
-msgid "could not obtain lock on row in relation \"%s\""
-msgstr "no se pudo obtener un bloqueo en la fila de la relación «%s»"
-
-#: access/heap/hio.c:175 access/heap/rewriteheap.c:592
-#, c-format
-msgid "row is too big: size %lu, maximum size %lu"
-msgstr "fila es demasiado grande: tamaño %lu, tamaño máximo %lu"
-
-#: access/index/indexam.c:149 commands/comment.c:559 commands/indexcmds.c:1595
-#: commands/tablecmds.c:212 commands/tablecmds.c:2357
-#, c-format
-msgid "\"%s\" is not an index"
-msgstr "«%s» no es un índice"
-
-#: access/nbtree/nbtinsert.c:384
-#, c-format
-msgid "duplicate key value violates unique constraint \"%s\""
-msgstr "llave duplicada viola restricción de unicidad «%s»"
-
-#: access/nbtree/nbtinsert.c:386
-#, c-format
-msgid "Key %s already exists."
-msgstr "Ya existe la llave %s."
-
-#: access/nbtree/nbtinsert.c:448 executor/execUtils.c:1319
-#, c-format
-msgid "failed to re-find tuple within index \"%s\""
-msgstr "no se pudo volver a encontrar la tupla dentro del índice «%s»"
-
-#: access/nbtree/nbtinsert.c:450 executor/execUtils.c:1321
-msgid "This may be because of a non-immutable index expression."
-msgstr "Esto puede deberse a una expresión de índice no inmutable."
-
-#: access/nbtree/nbtinsert.c:526 access/nbtree/nbtsort.c:487
-msgid ""
-"Values larger than 1/3 of a buffer page cannot be indexed.\n"
-"Consider a function index of an MD5 hash of the value, or use full text "
-"indexing."
-msgstr ""
-"Valores mayores a 1/3 de la página del buffer no pueden ser indexados.\n"
-"Considere un índice sobre una función que genere un hash MD5 del valor, o "
-"utilice un esquema de indexación de texto completo."
-
-#: access/nbtree/nbtpage.c:160 access/nbtree/nbtpage.c:364
-#, c-format
-msgid "index \"%s\" is not a btree"
-msgstr "el índice «%s» no es un btree"
-
-#: access/nbtree/nbtpage.c:166 access/nbtree/nbtpage.c:370
-#, c-format
-msgid "version mismatch in index \"%s\": file version %d, code version %d"
-msgstr ""
-"discordancia de versión en índice «%s»: versión de archivo %d, versión de "
-"código %d"
-
-#: bootstrap/bootstrap.c:272 tcop/postgres.c:3391 postmaster/postmaster.c:675
-#, c-format
-msgid "--%s requires a value"
-msgstr "--%s requiere un valor"
-
-#: bootstrap/bootstrap.c:277 tcop/postgres.c:3396 postmaster/postmaster.c:680
-#, c-format
-msgid "-c %s requires a value"
-msgstr "-c %s requiere un valor"
-
-#: bootstrap/bootstrap.c:288 postmaster/postmaster.c:692
-#: postmaster/postmaster.c:705
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Pruebe «%s --help» para mayor información.\n"
-
-#: bootstrap/bootstrap.c:297
-#, c-format
-msgid "%s: invalid command-line arguments\n"
-msgstr "%s: argumentos de línea de órdenes no válidos\n"
-
-#: catalog/toasting.c:91 commands/comment.c:573 commands/indexcmds.c:187
-#: commands/indexcmds.c:1627 commands/lockcmds.c:149 commands/tablecmds.c:194
-#: commands/tablecmds.c:1096 commands/tablecmds.c:3354 commands/trigger.c:149
-#: commands/trigger.c:1063
-#, c-format
-msgid "\"%s\" is not a table"
-msgstr "«%s» no es una tabla"
-
-#: catalog/toasting.c:141
-msgid "shared tables cannot be toasted after initdb"
-msgstr ""
-"no se puede crear tablas TOAST a relaciones compartidas después de initdb"
-
-#: catalog/aclchk.c:196
-msgid "grant options can only be granted to roles"
-msgstr "la opción de grant sólo puede ser otorgada a roles"
-
-#: catalog/aclchk.c:312
-#, c-format
-msgid "no privileges were granted for column \"%s\" of relation \"%s\""
-msgstr "no se otorgaron privilegios para la columna «%s» de la relación «%s»"
-
-#: catalog/aclchk.c:317
-#, c-format
-msgid "no privileges were granted for \"%s\""
-msgstr "no se otorgaron privilegios para «%s»"
-
-#: catalog/aclchk.c:325
-#, c-format
-msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
-msgstr ""
-"no todos los privilegios fueron otorgados para la columna «%s» de la "
-"relación «%s»"
-
-#: catalog/aclchk.c:330
-#, c-format
-msgid "not all privileges were granted for \"%s\""
-msgstr "no todos los privilegios fueron otorgados para «%s»"
-
-#: catalog/aclchk.c:341
-#, c-format
-msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
+msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
 msgstr ""
 "ningún privilegio pudo ser revocado para la columna «%s» de la relación «%s»"
 
-#: catalog/aclchk.c:346
+#: catalog/aclchk.c:350
 #, c-format
 msgid "no privileges could be revoked for \"%s\""
 msgstr "ningún privilegio pudo ser revocado para «%s»"
 
-#: catalog/aclchk.c:354
+#: catalog/aclchk.c:358
 #, c-format
 msgid ""
 "not all privileges could be revoked for column \"%s\" of relation \"%s\""
@@ -2574,497 +2287,495 @@ msgstr ""
 "no todos los privilegios pudieron ser revocados para la columna «%s» de la "
 "relación «%s»"
 
-#: catalog/aclchk.c:359
+#: catalog/aclchk.c:363
 #, c-format
 msgid "not all privileges could be revoked for \"%s\""
 msgstr "no todos los privilegios pudieron ser revocados para «%s»"
 
-#: catalog/aclchk.c:438 catalog/aclchk.c:927
+#: catalog/aclchk.c:442 catalog/aclchk.c:891
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "el tipo de privilegio %s no es válido para una relación"
 
-#: catalog/aclchk.c:442 catalog/aclchk.c:931
+#: catalog/aclchk.c:446 catalog/aclchk.c:895
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "el tipo de privilegio %s no es válido para una secuencia"
 
-#: catalog/aclchk.c:446
+#: catalog/aclchk.c:450
 #, c-format
 msgid "invalid privilege type %s for database"
 msgstr "el tipo de privilegio %s no es válido para una base de datos"
 
-#: catalog/aclchk.c:450 catalog/aclchk.c:935
+#: catalog/aclchk.c:454 catalog/aclchk.c:899
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "el tipo de privilegio %s no es válido para una función"
 
-#: catalog/aclchk.c:454
+#: catalog/aclchk.c:458
 #, c-format
 msgid "invalid privilege type %s for language"
 msgstr "el tipo de privilegio %s no es válido para un lenguaje"
 
-#: catalog/aclchk.c:458
+#: catalog/aclchk.c:462
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "el tipo de privilegio %s no es válido para un objeto grande"
 
-#: catalog/aclchk.c:462
+#: catalog/aclchk.c:466
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "el tipo de privilegio %s no es válido para un esquema"
 
-#: catalog/aclchk.c:466
+#: catalog/aclchk.c:470
 #, c-format
 msgid "invalid privilege type %s for tablespace"
 msgstr "el tipo de privilegio %s no es válido para tablespaces"
 
-#: catalog/aclchk.c:470
+#: catalog/aclchk.c:474
 #, c-format
 msgid "invalid privilege type %s for foreign-data wrapper"
 msgstr ""
 "el tipo de privilegio %s no es válido para un conector de datos externos"
 
-#: catalog/aclchk.c:474
+#: catalog/aclchk.c:478
 #, c-format
 msgid "invalid privilege type %s for foreign server"
 msgstr "el tipo de privilegio %s no es válido para un servidor foráneo"
 
-#: catalog/aclchk.c:513
+#: catalog/aclchk.c:517
 msgid "column privileges are only valid for relations"
 msgstr "los privilegios de columna son sólo válidos para relaciones"
 
-#: catalog/aclchk.c:614 commands/comment.c:698 commands/dbcommands.c:760
-#: commands/dbcommands.c:905 commands/dbcommands.c:1004
-#: commands/dbcommands.c:1181 commands/dbcommands.c:1366
-#: commands/dbcommands.c:1410 commands/dbcommands.c:1456 utils/adt/acl.c:2975
-#: utils/adt/dbsize.c:149 utils/init/postinit.c:708 utils/init/postinit.c:776
-#: utils/init/postinit.c:793
-#, c-format
-msgid "database \"%s\" does not exist"
-msgstr "no existe la base de datos «%s»"
-
-#: catalog/aclchk.c:640 commands/comment.c:1220 commands/functioncmds.c:836
-#: commands/functioncmds.c:1990 commands/proclang.c:531
-#: commands/proclang.c:600 commands/proclang.c:640 utils/adt/acl.c:3562
-#, c-format
-msgid "language \"%s\" does not exist"
-msgstr "no existe el lenguaje «%s»"
-
-#: catalog/aclchk.c:656 catalog/aclchk.c:3690 catalog/aclchk.c:4381
-#: catalog/pg_largeobject.c:116 catalog/pg_largeobject.c:176
-#: commands/comment.c:1415 storage/large_object/inv_api.c:272
+#: catalog/aclchk.c:647 catalog/aclchk.c:3677 catalog/aclchk.c:4368
+#: catalog/objectaddress.c:199 catalog/pg_largeobject.c:116
+#: catalog/pg_largeobject.c:176 storage/large_object/inv_api.c:277
 #, c-format
 msgid "large object %u does not exist"
 msgstr "no existe el objeto grande %u"
 
-#: catalog/aclchk.c:673 catalog/aclchk.c:1051 catalog/namespace.c:340
-#: catalog/namespace.c:2307 catalog/namespace.c:2346 catalog/namespace.c:2393
-#: catalog/namespace.c:3320 commands/comment.c:806 commands/schemacmds.c:190
-#: commands/schemacmds.c:264 commands/schemacmds.c:335 utils/adt/acl.c:3760
-#, c-format
-msgid "schema \"%s\" does not exist"
-msgstr "no existe el esquema «%s»"
-
-#: catalog/aclchk.c:702 commands/comment.c:737 commands/dbcommands.c:436
-#: commands/dbcommands.c:1037 commands/indexcmds.c:225
-#: commands/tablecmds.c:430 commands/tablecmds.c:6804
-#: commands/tablespace.c:410 commands/tablespace.c:808
-#: commands/tablespace.c:875 commands/tablespace.c:980
-#: commands/tablespace.c:1036 commands/tablespace.c:1160
-#: executor/execMain.c:2125 utils/adt/acl.c:4134 utils/adt/dbsize.c:248
-#, c-format
-msgid "tablespace \"%s\" does not exist"
-msgstr "no existe el tablespace «%s»"
-
-#: catalog/aclchk.c:869 catalog/aclchk.c:877 commands/copy.c:751
-#: commands/copy.c:769 commands/copy.c:777 commands/copy.c:785
-#: commands/copy.c:793 commands/copy.c:801 commands/copy.c:809
-#: commands/copy.c:817 commands/copy.c:833 commands/dbcommands.c:146
-#: commands/dbcommands.c:154 commands/dbcommands.c:162
-#: commands/dbcommands.c:170 commands/dbcommands.c:178
-#: commands/dbcommands.c:186 commands/dbcommands.c:194
-#: commands/dbcommands.c:1315 commands/dbcommands.c:1323
-#: commands/functioncmds.c:485 commands/functioncmds.c:575
-#: commands/functioncmds.c:583 commands/functioncmds.c:591
-#: commands/functioncmds.c:1953 commands/functioncmds.c:1961
-#: commands/sequence.c:1025 commands/sequence.c:1033 commands/sequence.c:1041
-#: commands/sequence.c:1049 commands/sequence.c:1057 commands/sequence.c:1065
-#: commands/sequence.c:1073 commands/sequence.c:1081 commands/typecmds.c:274
-#: commands/user.c:140 commands/user.c:157 commands/user.c:165
-#: commands/user.c:173 commands/user.c:181 commands/user.c:189
-#: commands/user.c:197 commands/user.c:205 commands/user.c:213
-#: commands/user.c:221 commands/user.c:229 commands/user.c:467
-#: commands/user.c:479 commands/user.c:487 commands/user.c:495
-#: commands/user.c:503 commands/user.c:511 commands/user.c:519
-#: commands/user.c:528 commands/user.c:536
+#: catalog/aclchk.c:833 catalog/aclchk.c:841 commands/copy.c:863
+#: commands/copy.c:881 commands/copy.c:889 commands/copy.c:897
+#: commands/copy.c:905 commands/copy.c:913 commands/copy.c:921
+#: commands/copy.c:929 commands/copy.c:945 commands/copy.c:959
+#: commands/dbcommands.c:146 commands/dbcommands.c:154
+#: commands/dbcommands.c:162 commands/dbcommands.c:170
+#: commands/dbcommands.c:178 commands/dbcommands.c:186
+#: commands/dbcommands.c:194 commands/dbcommands.c:1315
+#: commands/dbcommands.c:1323 commands/foreigncmds.c:396
+#: commands/foreigncmds.c:405 commands/functioncmds.c:488
+#: commands/functioncmds.c:578 commands/functioncmds.c:586
+#: commands/functioncmds.c:594 commands/functioncmds.c:1982
+#: commands/functioncmds.c:1990 commands/user.c:133 commands/user.c:150
+#: commands/user.c:158 commands/user.c:166 commands/user.c:174
+#: commands/user.c:182 commands/user.c:190 commands/user.c:198
+#: commands/user.c:206 commands/user.c:214 commands/user.c:222
+#: commands/user.c:230 commands/user.c:501 commands/user.c:513
+#: commands/user.c:521 commands/user.c:529 commands/user.c:537
+#: commands/user.c:545 commands/user.c:553 commands/user.c:561
+#: commands/user.c:570 commands/user.c:578 commands/sequence.c:1135
+#: commands/sequence.c:1143 commands/sequence.c:1151 commands/sequence.c:1159
+#: commands/sequence.c:1167 commands/sequence.c:1175 commands/sequence.c:1183
+#: commands/sequence.c:1191 commands/typecmds.c:282 commands/extension.c:1249
+#: commands/extension.c:1257 commands/extension.c:1265
+#: commands/extension.c:2483 commands/collationcmds.c:93
 msgid "conflicting or redundant options"
 msgstr "opciones contradictorias o redundantes"
 
-#: catalog/aclchk.c:968
+#: catalog/aclchk.c:932
 msgid "default privileges cannot be set for columns"
 msgstr "los privilegios por omisión no pueden definirse para columnas"
 
-#: catalog/aclchk.c:1470 commands/analyze.c:341 commands/comment.c:651
-#: commands/copy.c:3441 commands/sequence.c:1309 commands/tablecmds.c:3949
-#: commands/tablecmds.c:4039 commands/tablecmds.c:4086
-#: commands/tablecmds.c:4182 commands/tablecmds.c:4226
-#: commands/tablecmds.c:4305 commands/tablecmds.c:4386
-#: commands/tablecmds.c:5837 commands/tablecmds.c:5975 commands/trigger.c:527
-#: parser/analyze.c:1823 parser/parse_relation.c:1996
-#: parser/parse_relation.c:2051 parser/parse_target.c:808
-#: parser/parse_type.c:117 utils/adt/acl.c:2770 utils/adt/ruleutils.c:1524
+#: catalog/aclchk.c:1428 catalog/objectaddress.c:541 commands/analyze.c:343
+#: commands/copy.c:3774 commands/sequence.c:1419 commands/tablecmds.c:4591
+#: commands/tablecmds.c:4681 commands/tablecmds.c:4728
+#: commands/tablecmds.c:4824 commands/tablecmds.c:4868
+#: commands/tablecmds.c:4947 commands/tablecmds.c:5031
+#: commands/tablecmds.c:6647 commands/tablecmds.c:6856 commands/trigger.c:585
+#: parser/analyze.c:2039 parser/parse_relation.c:2043
+#: parser/parse_relation.c:2100 parser/parse_target.c:895
+#: parser/parse_type.c:117 utils/adt/acl.c:2772 utils/adt/ruleutils.c:1580
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "no existe la columna «%s» en la relación «%s»"
 
-#: catalog/aclchk.c:1735 commands/comment.c:566 commands/sequence.c:953
-#: commands/tablecmds.c:200 commands/tablecmds.c:2146
-#: commands/tablecmds.c:2365 commands/tablecmds.c:7810 utils/adt/acl.c:2006
-#: utils/adt/acl.c:2036 utils/adt/acl.c:2068 utils/adt/acl.c:2100
-#: utils/adt/acl.c:2128 utils/adt/acl.c:2158
+#: catalog/aclchk.c:1693 catalog/objectaddress.c:398 commands/sequence.c:1035
+#: commands/tablecmds.c:208 commands/tablecmds.c:2247
+#: commands/tablecmds.c:2494 commands/tablecmds.c:8968 utils/adt/acl.c:2008
+#: utils/adt/acl.c:2038 utils/adt/acl.c:2070 utils/adt/acl.c:2102
+#: utils/adt/acl.c:2130 utils/adt/acl.c:2160
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "«%s» no es una secuencia"
 
-#: catalog/aclchk.c:1773
+#: catalog/aclchk.c:1731
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "la secuencia «%s» sólo soporta los privilegios USAGE, SELECT, y UPDATE"
 
-#: catalog/aclchk.c:1790
+#: catalog/aclchk.c:1748
 msgid "invalid privilege type USAGE for table"
 msgstr "el tipo de privilegio USAGE no es válido para tablas"
 
-#: catalog/aclchk.c:1940
+#: catalog/aclchk.c:1913
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "el tipo de privilegio %s no es válido para una columna"
 
-#: catalog/aclchk.c:1953
+#: catalog/aclchk.c:1926
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "la secuencia «%s» sólo soporta el privilegio SELECT"
 
-#: catalog/aclchk.c:2537
+#: catalog/aclchk.c:2510
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "el lenguaje «%s» no es confiable (trusted)"
 
-#: catalog/aclchk.c:2539
+#: catalog/aclchk.c:2512
 msgid "Only superusers can use untrusted languages."
 msgstr "Sólo los superusuarios pueden usar lenguajes no confiables."
 
-#: catalog/aclchk.c:3046
+#: catalog/aclchk.c:3019
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "tipo de privilegio no reconocido: «%s»"
 
-#: catalog/aclchk.c:3095
+#: catalog/aclchk.c:3068
 #, c-format
 msgid "permission denied for column %s"
 msgstr "permiso denegado a la columna %s"
 
-#: catalog/aclchk.c:3097
+#: catalog/aclchk.c:3070
 #, c-format
 msgid "permission denied for relation %s"
 msgstr "permiso denegado a la relación %s"
 
-#: catalog/aclchk.c:3099 commands/sequence.c:469 commands/sequence.c:668
-#: commands/sequence.c:710 commands/sequence.c:746
+#: catalog/aclchk.c:3072 commands/sequence.c:550 commands/sequence.c:749
+#: commands/sequence.c:791 commands/sequence.c:827 commands/sequence.c:1470
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "permiso denegado a la secuencia %s"
 
-#: catalog/aclchk.c:3101
+#: catalog/aclchk.c:3074
 #, c-format
 msgid "permission denied for database %s"
 msgstr "permiso denegado a la base de datos %s"
 
-#: catalog/aclchk.c:3103
+#: catalog/aclchk.c:3076
 #, c-format
 msgid "permission denied for function %s"
 msgstr "permiso denegado a la función %s"
 
-#: catalog/aclchk.c:3105
+#: catalog/aclchk.c:3078
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "permiso denegado al operador %s"
 
-#: catalog/aclchk.c:3107
+#: catalog/aclchk.c:3080
 #, c-format
 msgid "permission denied for type %s"
 msgstr "permiso denegado al tipo %s"
 
-#: catalog/aclchk.c:3109
+#: catalog/aclchk.c:3082
 #, c-format
 msgid "permission denied for language %s"
 msgstr "permiso denegado al lenguaje %s"
 
-#: catalog/aclchk.c:3111
+#: catalog/aclchk.c:3084
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "permiso denegado al objeto grande %s"
 
-#: catalog/aclchk.c:3113
+#: catalog/aclchk.c:3086
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "permiso denegado al esquema %s"
 
-#: catalog/aclchk.c:3115
+#: catalog/aclchk.c:3088
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "permiso denegado a la clase de operadores %s"
 
-#: catalog/aclchk.c:3117
+#: catalog/aclchk.c:3090
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "permiso denegado a la familia de operadores %s"
 
-#: catalog/aclchk.c:3119
+#: catalog/aclchk.c:3092
+#, c-format
+msgid "permission denied for collation %s"
+msgstr "permiso denegado al ordenamiento (collation) %s"
+
+#: catalog/aclchk.c:3094
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "permiso denegado a la conversión %s"
 
-#: catalog/aclchk.c:3121
+#: catalog/aclchk.c:3096
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "permiso denegado al tablespace %s"
 
-#: catalog/aclchk.c:3123
+#: catalog/aclchk.c:3098
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "permiso denegado a la configuración de búsqueda en texto %s"
 
-#: catalog/aclchk.c:3125
+#: catalog/aclchk.c:3100
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "permiso denegado a la configuración de búsqueda en texto %s"
 
-#: catalog/aclchk.c:3127
+#: catalog/aclchk.c:3102
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "permiso denegado al conector de datos externos %s"
 
-#: catalog/aclchk.c:3129
+#: catalog/aclchk.c:3104
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "permiso denegado al servidor foráneo %s"
 
-#: catalog/aclchk.c:3135 catalog/aclchk.c:3137
+#: catalog/aclchk.c:3106
+#, c-format
+msgid "permission denied for extension %s"
+msgstr "permiso denegado a la extensión %s"
+
+#: catalog/aclchk.c:3112 catalog/aclchk.c:3114
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "debe ser dueño de la relación %s"
 
-#: catalog/aclchk.c:3139
+#: catalog/aclchk.c:3116
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "debe ser dueño de la secuencia %s"
 
-#: catalog/aclchk.c:3141
+#: catalog/aclchk.c:3118
 #, c-format
 msgid "must be owner of database %s"
 msgstr "debe ser dueño de la base de datos %s"
 
-#: catalog/aclchk.c:3143
+#: catalog/aclchk.c:3120
 #, c-format
 msgid "must be owner of function %s"
 msgstr "debe ser dueño de la función %s"
 
-#: catalog/aclchk.c:3145
+#: catalog/aclchk.c:3122
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "debe ser dueño del operador %s"
 
-#: catalog/aclchk.c:3147
+#: catalog/aclchk.c:3124
 #, c-format
 msgid "must be owner of type %s"
 msgstr "debe ser dueño del tipo %s"
 
-#: catalog/aclchk.c:3149
+#: catalog/aclchk.c:3126
 #, c-format
 msgid "must be owner of language %s"
 msgstr "debe ser dueño del lenguaje %s"
 
-#: catalog/aclchk.c:3151
+#: catalog/aclchk.c:3128
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "debe ser dueño del objeto grande %s"
 
-#: catalog/aclchk.c:3153
+#: catalog/aclchk.c:3130
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "debe ser dueño del esquema %s"
 
-#: catalog/aclchk.c:3155
+#: catalog/aclchk.c:3132
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "debe ser dueño de la clase de operadores %s"
 
-#: catalog/aclchk.c:3157
+#: catalog/aclchk.c:3134
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "debe ser dueño de la familia de operadores %s"
 
-#: catalog/aclchk.c:3159
+#: catalog/aclchk.c:3136
+#, c-format
+msgid "must be owner of collation %s"
+msgstr "debe ser dueño del ordenamiento (collation) %s"
+
+#: catalog/aclchk.c:3138
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "debe ser dueño de la conversión %s"
 
-#: catalog/aclchk.c:3161
+#: catalog/aclchk.c:3140
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "debe ser dueño del tablespace %s"
 
-#: catalog/aclchk.c:3163
+#: catalog/aclchk.c:3142
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "debe ser dueño del diccionario de búsqueda en texto %s"
 
-#: catalog/aclchk.c:3165
+#: catalog/aclchk.c:3144
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "debe ser dueño de la configuración de búsqueda en texto %s"
 
-#: catalog/aclchk.c:3167
+#: catalog/aclchk.c:3146
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "debe ser dueño del conector de datos externos %s"
 
-#: catalog/aclchk.c:3169
+#: catalog/aclchk.c:3148
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "debe ser dueño del servidor foráneo %s"
 
-#: catalog/aclchk.c:3211
+#: catalog/aclchk.c:3150
+#, c-format
+msgid "must be owner of extension %s"
+msgstr "debe ser dueño de la extensión %s"
+
+#: catalog/aclchk.c:3192
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "permiso denegado a la columna «%s» de la relación «%s»"
 
-#: catalog/aclchk.c:3238
+#: catalog/aclchk.c:3219
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "no existe el rol con OID %u"
 
-#: catalog/aclchk.c:3331 catalog/aclchk.c:3339
+#: catalog/aclchk.c:3312 catalog/aclchk.c:3320
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "no existe el atributo %d de la relación con OID %u"
 
-#: catalog/aclchk.c:3412 catalog/aclchk.c:4232
+#: catalog/aclchk.c:3393 catalog/aclchk.c:4219
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "no existe la relación con OID %u"
 
-#: catalog/aclchk.c:3506 catalog/aclchk.c:4596 utils/adt/dbsize.c:127
+#: catalog/aclchk.c:3493 catalog/aclchk.c:4610 utils/adt/dbsize.c:127
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "no existe la base de datos con OID %u"
 
-#: catalog/aclchk.c:3560 catalog/aclchk.c:4310 tcop/fastpath.c:222
+#: catalog/aclchk.c:3547 catalog/aclchk.c:4297 tcop/fastpath.c:221
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "no existe la función con OID %u"
 
-#: catalog/aclchk.c:3614 catalog/aclchk.c:4336
+#: catalog/aclchk.c:3601 catalog/aclchk.c:4323
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "no existe el lenguaje con OID %u"
 
-#: catalog/aclchk.c:3775 catalog/aclchk.c:4408
+#: catalog/aclchk.c:3762 catalog/aclchk.c:4395
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "no existe el esquema con OID %u"
 
-#: catalog/aclchk.c:3829 catalog/aclchk.c:4435
+#: catalog/aclchk.c:3816 catalog/aclchk.c:4422
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "no existe el tablespace con OID %u"
 
-#: catalog/aclchk.c:3887
+#: catalog/aclchk.c:3874 catalog/aclchk.c:4556
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "no existe el conector de datos externos con OID %u"
 
-#: catalog/aclchk.c:3948 catalog/aclchk.c:4569
+#: catalog/aclchk.c:3935 catalog/aclchk.c:4583
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "no existe el servidor foráneo con OID %u"
 
-#: catalog/aclchk.c:4258
+#: catalog/aclchk.c:4245
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "no existe el tipo con OID %u"
 
-#: catalog/aclchk.c:4284
+#: catalog/aclchk.c:4271
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "no existe el operador con OID %u"
 
-#: catalog/aclchk.c:4461
+#: catalog/aclchk.c:4448
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "no existe la clase de operadores con OID %u"
 
-#: catalog/aclchk.c:4488
+#: catalog/aclchk.c:4475
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "no existe la familia de operadores con OID %u"
 
-#: catalog/aclchk.c:4515
+#: catalog/aclchk.c:4502
 #, c-format
 msgid "text search dictionary with OID %u does not exist"
 msgstr "no existe el diccionario de búsqueda en texto con OID %u"
 
-#: catalog/aclchk.c:4542
+#: catalog/aclchk.c:4529
 #, c-format
 msgid "text search configuration with OID %u does not exist"
 msgstr "no existe la configuración de búsqueda en texto con OID %u"
 
-#: catalog/aclchk.c:4622
+#: catalog/aclchk.c:4636
+#, c-format
+msgid "collation with OID %u does not exist"
+msgstr "no existe el ordenamiento (collation) con OID %u"
+
+#: catalog/aclchk.c:4662
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "no existe la conversión con OID %u"
 
-#: catalog/catalog.c:75
+#: catalog/aclchk.c:4703
+#, c-format
+msgid "extension with OID %u does not exist"
+msgstr "no existe la extensión con OID %u"
+
+#: catalog/catalog.c:76
 msgid "invalid fork name"
 msgstr "nombre de «fork» no válido"
 
-#: catalog/catalog.c:76
+#: catalog/catalog.c:77
 msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
 msgstr "Los nombres válidos son «man», «fsm» y «vm»."
 
-#: catalog/dependency.c:578
+#: catalog/dependency.c:574
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "no se puede eliminar %s porque %s lo requiere"
 
-#: catalog/dependency.c:581
+#: catalog/dependency.c:577
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Puede eliminar %s en su lugar."
 
-#: catalog/dependency.c:734 catalog/pg_shdepend.c:560
+#: catalog/dependency.c:738 catalog/pg_shdepend.c:562
 #, c-format
 msgid "cannot drop %s because it is required by the database system"
 msgstr "no se puede eliminar %s porque es requerido por el sistema"
 
-#: catalog/dependency.c:848
+#: catalog/dependency.c:854
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "eliminando automáticamente %s"
 
-#: catalog/dependency.c:860 catalog/dependency.c:869
+#: catalog/dependency.c:866 catalog/dependency.c:875
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s depende de %s"
 
-#: catalog/dependency.c:881 catalog/dependency.c:890
+#: catalog/dependency.c:887 catalog/dependency.c:896
 #, c-format
 msgid "drop cascades to %s"
 msgstr "eliminando además %s"
 
-#: catalog/dependency.c:898 catalog/pg_shdepend.c:671
+#: catalog/dependency.c:904 catalog/pg_shdepend.c:673
 #, c-format
 msgid ""
 "\n"
@@ -3079,300 +2790,343 @@ msgstr[1] ""
 "\n"
 "y otros %d objetos (vea el registro del servidor para obtener la lista)"
 
-#: catalog/dependency.c:910
+#: catalog/dependency.c:916
 #, c-format
 msgid "cannot drop %s because other objects depend on it"
 msgstr "no se puede eliminar %s porque otros objetos dependen de él"
 
-#: catalog/dependency.c:912 catalog/dependency.c:913 catalog/dependency.c:919
-#: catalog/dependency.c:920 catalog/dependency.c:931 catalog/dependency.c:932
-#: commands/tablecmds.c:658 commands/trigger.c:832 commands/trigger.c:848
-#: commands/trigger.c:860 commands/user.c:902 commands/user.c:903
-#: tcop/postgres.c:4298 storage/lmgr/deadlock.c:942
-#: storage/lmgr/deadlock.c:943 nodes/print.c:85 utils/adt/xml.c:1363
-#: utils/adt/xml.c:1364 utils/adt/xml.c:1370 utils/adt/xml.c:1441
-#: utils/misc/guc.c:4963 utils/misc/guc.c:5231 utils/fmgr/dfmgr.c:381
+#: catalog/dependency.c:918 catalog/dependency.c:919 catalog/dependency.c:925
+#: catalog/dependency.c:926 catalog/dependency.c:937 catalog/dependency.c:938
+#: catalog/objectaddress.c:315 commands/user.c:957 commands/tablecmds.c:689
+#: storage/lmgr/deadlock.c:943 port/win32/security.c:51 utils/misc/guc.c:5397
+#: utils/misc/guc.c:5711 utils/misc/guc.c:7994 utils/misc/guc.c:8028
+#: utils/misc/guc.c:8062 utils/misc/guc.c:8096 utils/misc/guc.c:8131
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: catalog/dependency.c:914 catalog/dependency.c:921
+#: catalog/dependency.c:920 catalog/dependency.c:927
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr "Use DROP ... CASCADE para eliminar además los objetos dependientes."
 
-#: catalog/dependency.c:918
+#: catalog/dependency.c:924
 msgid "cannot drop desired object(s) because other objects depend on them"
 msgstr ""
 "no se puede eliminar el o los objetos deseados porque otros objetos dependen "
 "de ellos"
 
 #. translator: %d always has a value larger than 1
-#: catalog/dependency.c:927
+#: catalog/dependency.c:933
 #, c-format
 msgid "drop cascades to %d other object"
 msgid_plural "drop cascades to %d other objects"
 msgstr[0] "eliminando además %d objeto más"
 msgstr[1] "eliminando además %d objetos más"
 
-#: catalog/dependency.c:2110
+#: catalog/dependency.c:2204
 #, c-format
 msgid " column %s"
 msgstr " columna %s"
 
-#: catalog/dependency.c:2116
+#: catalog/dependency.c:2210
 #, c-format
 msgid "function %s"
 msgstr "función %s"
 
-#: catalog/dependency.c:2121
+#: catalog/dependency.c:2215
 #, c-format
 msgid "type %s"
 msgstr "tipo %s"
 
-#: catalog/dependency.c:2151
+#: catalog/dependency.c:2245
 #, c-format
 msgid "cast from %s to %s"
 msgstr "conversión de %s a %s"
 
-#: catalog/dependency.c:2178
+#: catalog/dependency.c:2265
+#, c-format
+msgid "collation %s"
+msgstr "ordenamiento (collation) %s"
+
+#: catalog/dependency.c:2289
 #, c-format
 msgid "constraint %s on %s"
 msgstr "restricción «%s» en %s"
 
-#: catalog/dependency.c:2184
+#: catalog/dependency.c:2295
 #, c-format
 msgid "constraint %s"
 msgstr "restricción %s"
 
-#: catalog/dependency.c:2201
+#: catalog/dependency.c:2312
 #, c-format
 msgid "conversion %s"
 msgstr "conversión %s"
 
-#: catalog/dependency.c:2238
+#: catalog/dependency.c:2349
 #, c-format
 msgid "default for %s"
 msgstr "valor por omisión para %s"
 
-#: catalog/dependency.c:2255
+#: catalog/dependency.c:2366
 #, c-format
 msgid "language %s"
 msgstr "lenguaje %s"
 
-#: catalog/dependency.c:2261
+#: catalog/dependency.c:2372
 #, c-format
 msgid "large object %u"
 msgstr "objeto grande %u"
 
-#: catalog/dependency.c:2266
+#: catalog/dependency.c:2377
 #, c-format
 msgid "operator %s"
 msgstr "operador %s"
 
-#: catalog/dependency.c:2298
+#: catalog/dependency.c:2409
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "clase de operadores «%s» para el método de acceso «%s»"
 
-#: catalog/dependency.c:2348
+#. translator: %d is the operator strategy (a number), the
+#. first two %s's are data type names, the third %s is the
+#. description of the operator family, and the last %s is the
+#. textual form of the operator with arguments.
+#: catalog/dependency.c:2459
 #, c-format
-msgid "operator %d %s of %s"
-msgstr "operador %d %s de %s"
+msgid "operator %d (%s, %s) of %s: %s"
+msgstr "operador %d (%s, %s) de %s: %s"
 
-#: catalog/dependency.c:2395
+#. translator: %d is the function number, the first two %s's
+#. are data type names, the third %s is the description of the
+#. operator family, and the last %s is the textual form of the
+#. function with arguments.
+#: catalog/dependency.c:2509
 #, c-format
-msgid "function %d %s of %s"
-msgstr "función %d %s de %s"
+msgid "function %d (%s, %s) of %s: %s"
+msgstr "función %d (%s, %s) de %s: %s"
 
-#: catalog/dependency.c:2432
+#: catalog/dependency.c:2549
 #, c-format
 msgid "rule %s on "
 msgstr "regla «%s» en "
 
-#: catalog/dependency.c:2467
+#: catalog/dependency.c:2584
 #, c-format
 msgid "trigger %s on "
 msgstr "disparador %s en "
 
-#: catalog/dependency.c:2484
+#: catalog/dependency.c:2601
 #, c-format
 msgid "schema %s"
 msgstr "esquema %s"
 
-#: catalog/dependency.c:2497
+#: catalog/dependency.c:2614
 #, c-format
 msgid "text search parser %s"
 msgstr "analizador de búsqueda en texto %s"
 
-#: catalog/dependency.c:2512
+#: catalog/dependency.c:2629
 #, c-format
 msgid "text search dictionary %s"
 msgstr "diccionario de búsqueda en texto %s"
 
-#: catalog/dependency.c:2527
+#: catalog/dependency.c:2644
 #, c-format
 msgid "text search template %s"
 msgstr "plantilla de búsqueda en texto %s"
 
-#: catalog/dependency.c:2542
+#: catalog/dependency.c:2659
 #, c-format
 msgid "text search configuration %s"
 msgstr "configuración de búsqueda en texto %s"
 
-#: catalog/dependency.c:2550
+#: catalog/dependency.c:2667
 #, c-format
 msgid "role %s"
 msgstr "rol %s"
 
-#: catalog/dependency.c:2563
+#: catalog/dependency.c:2680
 #, c-format
 msgid "database %s"
 msgstr "base de datos %s"
 
-#: catalog/dependency.c:2575
+#: catalog/dependency.c:2692
 #, c-format
 msgid "tablespace %s"
 msgstr "tablespace %s"
 
-#: catalog/dependency.c:2584
+#: catalog/dependency.c:2701
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "conector de datos externos %s"
 
-#: catalog/dependency.c:2593
+#: catalog/dependency.c:2710
 #, c-format
 msgid "server %s"
 msgstr "servidor %s"
 
-#: catalog/dependency.c:2618
+#: catalog/dependency.c:2735
 #, c-format
 msgid "user mapping for %s"
 msgstr "mapeo para el usuario %s"
 
-#: catalog/dependency.c:2652
+#: catalog/dependency.c:2769
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "privilegios por omisión en nuevas relaciones pertenecientes al rol %s"
 
-#: catalog/dependency.c:2657
+#: catalog/dependency.c:2774
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "privilegios por omisión en nuevas secuencias pertenecientes al rol %s"
 
-#: catalog/dependency.c:2662
+#: catalog/dependency.c:2779
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "privilegios por omisión en nuevas funciones pertenecientes al rol %s"
 
-#: catalog/dependency.c:2668
+#: catalog/dependency.c:2785
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "privilegios por omisión pertenecientes al rol %s"
 
-#: catalog/dependency.c:2676
+#: catalog/dependency.c:2793
 #, c-format
 msgid " in schema %s"
 msgstr " en esquema %s"
 
-#: catalog/dependency.c:2724
+#: catalog/dependency.c:2810
+#, c-format
+msgid "extension %s"
+msgstr "extensión %s"
+
+#: catalog/dependency.c:2868
 #, c-format
 msgid "table %s"
 msgstr "tabla %s"
 
-#: catalog/dependency.c:2728
+#: catalog/dependency.c:2872
 #, c-format
 msgid "index %s"
 msgstr "índice %s"
 
-#: catalog/dependency.c:2732
+#: catalog/dependency.c:2876
 #, c-format
 msgid "sequence %s"
 msgstr "secuencia %s"
 
-#: catalog/dependency.c:2736
+#: catalog/dependency.c:2880
 #, c-format
 msgid "uncataloged table %s"
 msgstr "tabla sin catalogar %s"
 
-#: catalog/dependency.c:2740
+#: catalog/dependency.c:2884
 #, c-format
 msgid "toast table %s"
 msgstr "tabla toast %s"
 
-#: catalog/dependency.c:2744
+#: catalog/dependency.c:2888
 #, c-format
 msgid "view %s"
 msgstr "vista %s"
 
-#: catalog/dependency.c:2748
+#: catalog/dependency.c:2892
 #, c-format
 msgid "composite type %s"
 msgstr "tipo compuesto %s"
 
-#: catalog/dependency.c:2753
+#: catalog/dependency.c:2896
+#, c-format
+msgid "foreign table %s"
+msgstr "tabla foránea %s"
+
+#: catalog/dependency.c:2901
 #, c-format
 msgid "relation %s"
 msgstr "relación %s"
 
-#: catalog/dependency.c:2790
+#: catalog/dependency.c:2938
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "familia de operadores %s para el método de acceso %s"
 
-#: catalog/heap.c:257
+#: catalog/heap.c:264
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "se ha denegado el permiso para crear «%s.%s»"
 
-#: catalog/heap.c:259
+#: catalog/heap.c:266
 msgid "System catalog modifications are currently disallowed."
 msgstr ""
 "Las modificaciones al catálogo del sistema están actualmente deshabilitadas."
 
-#: catalog/heap.c:380 commands/tablecmds.c:1235 commands/tablecmds.c:1619
-#: commands/tablecmds.c:3722
+#: catalog/heap.c:389 commands/tablecmds.c:1268 commands/tablecmds.c:1685
+#: commands/tablecmds.c:4276
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "las tablas pueden tener a lo más %d columnas"
 
-#: catalog/heap.c:397
+#: catalog/heap.c:406
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr ""
 "el nombre de columna «%s» colisiona con nombre de una columna de sistema"
 
-#: catalog/heap.c:413
+#: catalog/heap.c:422
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "el nombre de columna «%s» fue especificado más de una vez"
 
-#: catalog/heap.c:451
+#: catalog/heap.c:472
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "la columna «%s» tiene tipo «unknown» (desconocido)"
 
-#: catalog/heap.c:452
+#: catalog/heap.c:473
 msgid "Proceeding with relation creation anyway."
 msgstr "Continuando con la creación de la relación de todas maneras."
 
-#: catalog/heap.c:465
+#: catalog/heap.c:486
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "la columna «%s» tiene pseudotipo %s"
 
-#: catalog/heap.c:927 catalog/index.c:620 commands/tablecmds.c:2211
+#: catalog/heap.c:516
+#, c-format
+msgid "composite type %s cannot be made a member of itself"
+msgstr "un tipo compuesto %s no puede ser hecho miembro de sí mismo"
+
+#: catalog/heap.c:558
+#, c-format
+msgid "no collation was derived for column \"%s\" with collatable type %s"
+msgstr ""
+"no se derivó ningún ordenamiento (collate) para la columna «%s» con tipo "
+"ordenable %s"
+
+#: catalog/heap.c:560 commands/indexcmds.c:931 commands/view.c:145
+#: regex/regc_pg_locale.c:259 utils/adt/formatting.c:1520
+#: utils/adt/formatting.c:1570 utils/adt/formatting.c:1641
+#: utils/adt/formatting.c:1691 utils/adt/formatting.c:1774
+#: utils/adt/formatting.c:1836 utils/adt/like.c:212 utils/adt/selfuncs.c:4912
+#: utils/adt/selfuncs.c:5029 utils/adt/varlena.c:1315
+msgid "Use the COLLATE clause to set the collation explicitly."
+msgstr ""
+"Use la cláusula COLLATE para establecer el ordenamiento explícitamente."
+
+#: catalog/heap.c:1011 catalog/index.c:769 commands/tablecmds.c:2318
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "la relación «%s» ya existe"
 
-#: catalog/heap.c:943 catalog/pg_type.c:385 catalog/pg_type.c:665
-#: commands/typecmds.c:218 commands/typecmds.c:795 commands/typecmds.c:1120
-#: commands/typecmds.c:1543
+#: catalog/heap.c:1027 catalog/pg_type.c:396 catalog/pg_type.c:695
+#: commands/typecmds.c:224 commands/typecmds.c:806 commands/typecmds.c:1145
+#: commands/typecmds.c:1622
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "ya existe un tipo «%s»"
 
-#: catalog/heap.c:944
+#: catalog/heap.c:1028
 msgid ""
 "A relation has an associated type of the same name, so you must use a name "
 "that doesn't conflict with any existing type."
@@ -3380,84 +3134,76 @@ msgstr ""
 "Una relación tiene un tipo asociado del mismo nombre, de modo que debe usar "
 "un nombre que no entre en conflicto con un tipo existente."
 
-#: catalog/heap.c:1540
-#, c-format
-msgid ""
-"cannot drop \"%s\" because it is being used by active queries in this session"
-msgstr ""
-"no se puede borrar «%s» porque está siendo usada por consultas activas en "
-"esta sesión"
-
-#: catalog/heap.c:1991
+#: catalog/heap.c:2141
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "la restricción check «%s» ya existe"
 
-#: catalog/heap.c:2135 catalog/pg_constraint.c:639 commands/tablecmds.c:4633
+#: catalog/heap.c:2287 catalog/pg_constraint.c:645 commands/tablecmds.c:5350
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "la restricción «%s» para la relación «%s» ya existe"
 
-#: catalog/heap.c:2139
+#: catalog/heap.c:2291
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "mezclando la restricción «%s» con la definición heredada"
 
-#: catalog/heap.c:2237
+#: catalog/heap.c:2389
 msgid "cannot use column references in default expression"
 msgstr "no se pueden usar referencias a columnas en una cláusula default"
 
-#: catalog/heap.c:2245
+#: catalog/heap.c:2397
 msgid "default expression must not return a set"
 msgstr "expresiones default no pueden retornar conjuntos"
 
-#: catalog/heap.c:2253
+#: catalog/heap.c:2405
 msgid "cannot use subquery in default expression"
 msgstr "no se puede usar una subconsulta en expresión default"
 
-#: catalog/heap.c:2257
+#: catalog/heap.c:2409
 msgid "cannot use aggregate function in default expression"
 msgstr "no se puede usar una función de agregación en expresión default"
 
-#: catalog/heap.c:2261
+#: catalog/heap.c:2413
 msgid "cannot use window function in default expression"
 msgstr ""
 "no se puede usar una función de ventana deslizante en expresión default"
 
-#: catalog/heap.c:2280 rewrite/rewriteHandler.c:952
+#: catalog/heap.c:2432 rewrite/rewriteHandler.c:1030
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "la columna «%s» es de tipo %s pero la expresión default es de tipo %s"
 
-#: catalog/heap.c:2285 commands/prepare.c:369 parser/parse_node.c:370
-#: parser/parse_target.c:475 parser/parse_target.c:734
-#: parser/parse_target.c:744 rewrite/rewriteHandler.c:957
+#: catalog/heap.c:2437 commands/prepare.c:370 parser/parse_node.c:397
+#: parser/parse_target.c:489 parser/parse_target.c:735
+#: parser/parse_target.c:745 rewrite/rewriteHandler.c:1035
 msgid "You will need to rewrite or cast the expression."
 msgstr "Necesitará reescribir la expresión o aplicarle una conversión de tipo."
 
-#: catalog/heap.c:2321
+#: catalog/heap.c:2483
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "sólo la tabla «%s» puede ser referenciada en una restricción check"
 
-#: catalog/heap.c:2330 commands/typecmds.c:2298
+#: catalog/heap.c:2492 commands/typecmds.c:2386
 msgid "cannot use subquery in check constraint"
 msgstr "no se pueden usar subconsultas en una restricción check"
 
-#: catalog/heap.c:2334 commands/typecmds.c:2302
+#: catalog/heap.c:2496 commands/typecmds.c:2390
 msgid "cannot use aggregate function in check constraint"
 msgstr "no se pueden usar funciones de agregación en una restricción check"
 
-#: catalog/heap.c:2338 commands/typecmds.c:2306
+#: catalog/heap.c:2500 commands/typecmds.c:2394
 msgid "cannot use window function in check constraint"
 msgstr ""
 "no se pueden usar funciones de ventana deslizante en una restricción check"
 
-#: catalog/heap.c:2577
+#: catalog/heap.c:2739
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "combinación de ON COMMIT y llaves foráneas no soportada"
 
-#: catalog/heap.c:2578
+#: catalog/heap.c:2740
 #, c-format
 msgid ""
 "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
@@ -3466,109 +3212,245 @@ msgstr ""
 "La tabla «%s» se refiere a «%s», pero no tienen la misma expresión para ON "
 "COMMIT."
 
-#: catalog/heap.c:2583
+#: catalog/heap.c:2745
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "no se puede truncar una tabla referida en una llave foránea"
 
-#: catalog/heap.c:2584
+#: catalog/heap.c:2746
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "La tabla «%s» hace referencia a «%s»."
 
-#: catalog/heap.c:2586
+#: catalog/heap.c:2748
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "Trunque la tabla «%s» al mismo tiempo, o utilice TRUNCATE ... CASCADE."
 
-#: catalog/index.c:581
+#: catalog/index.c:202 parser/parse_utilcmd.c:1296 parser/parse_utilcmd.c:1382
+#, c-format
+msgid "multiple primary keys for table \"%s\" are not allowed"
+msgstr "no se permiten múltiples llaves primarias para la tabla «%s»"
+
+#: catalog/index.c:220
+msgid "primary keys cannot be expressions"
+msgstr "las llaves primarias no pueden ser expresiones"
+
+#: catalog/index.c:730 catalog/index.c:1124
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "los usuarios no pueden crear índices en tablas del sistema"
 
-#: catalog/index.c:591
+#: catalog/index.c:740
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr "no se pueden crear índices de forma concurrente en tablas del sistema"
 
-#: catalog/index.c:609
+#: catalog/index.c:758
 msgid "shared indexes cannot be created after initdb"
 msgstr "no se pueden crear índices compartidos después de initdb"
 
-#: catalog/index.c:2425
+#: catalog/index.c:1727
+#, c-format
+msgid "building index \"%s\" on table \"%s\""
+msgstr "construyendo índice «%s» en la tabla «%s»"
+
+#: catalog/index.c:2800
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "no se puede hacer reindex de tablas temporales de otras sesiones"
 
-#: catalog/namespace.c:232 catalog/namespace.c:306 commands/trigger.c:3930
+#: catalog/namespace.c:234 catalog/namespace.c:318 commands/trigger.c:4147
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr ""
 "no están implementadas las referencias entre bases de datos: «%s.%s.%s»"
 
-#: catalog/namespace.c:250 catalog/namespace.c:317
+#: catalog/namespace.c:260
 msgid "temporary tables cannot specify a schema name"
 msgstr "las tablas temporales no pueden especificar un nombre de esquema"
 
-#: catalog/namespace.c:273 commands/lockcmds.c:122 parser/parse_relation.c:835
+#: catalog/namespace.c:285 commands/lockcmds.c:122 parser/parse_relation.c:835
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "no existe la relación «%s.%s»"
 
-#: catalog/namespace.c:278 commands/lockcmds.c:127 parser/parse_relation.c:848
+#: catalog/namespace.c:290 commands/lockcmds.c:127 parser/parse_relation.c:848
 #: parser/parse_relation.c:856 utils/adt/regproc.c:810
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "no existe la relación «%s»"
 
-#: catalog/namespace.c:358 catalog/namespace.c:2410
+#: catalog/namespace.c:358 catalog/namespace.c:2589
 msgid "no schema has been selected to create in"
 msgstr "no se ha seleccionado ningún esquema dentro del cual crear"
 
-#: catalog/namespace.c:1748 commands/tsearchcmds.c:306
+#: catalog/namespace.c:410 catalog/namespace.c:423
+msgid "cannot create relations in temporary schemas of other sessions"
+msgstr "no se pueden crear relaciones en esquemas temporales de otras sesiones"
+
+#: catalog/namespace.c:414
+msgid "cannot create temporary relation in non-temporary schema"
+msgstr "no se pueden crear tablas temporales en esquemas no temporales"
+
+#: catalog/namespace.c:429
+msgid "only temporary relations may be created in temporary schemas"
+msgstr ""
+"sólo relaciones temporales pueden ser creadas en los esquemas temporales"
+
+#: catalog/namespace.c:1906 commands/tsearchcmds.c:320
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "no existe el analizador de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:1871 commands/tsearchcmds.c:654
+#: catalog/namespace.c:2029 commands/tsearchcmds.c:769
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "no existe el diccionario de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:1995 commands/tsearchcmds.c:1137
+#: catalog/namespace.c:2153 commands/tsearchcmds.c:1304
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "no existe la plantilla de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:2118 commands/tsearchcmds.c:1532
-#: commands/tsearchcmds.c:1688
+#: catalog/namespace.c:2276 commands/tsearchcmds.c:1753
+#: commands/tsearchcmds.c:1909
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "no existe la configuración de búsqueda en texto «%s»"
 
-#: catalog/namespace.c:2231 parser/parse_expr.c:769 parser/parse_target.c:998
+#: catalog/namespace.c:2389 parser/parse_expr.c:775 parser/parse_target.c:1085
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "no están implementadas las referencias entre bases de datos: %s"
 
-#: catalog/namespace.c:2237 parser/parse_expr.c:776 parser/parse_target.c:1005
-#: gram.y:3673 gram.y:10605
+#: catalog/namespace.c:2395 parser/parse_expr.c:782 parser/parse_target.c:1092
+#: gram.y:11611 gram.y:12810
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "el nombre no es válido (demasiados puntos): %s"
 
-#: catalog/namespace.c:2442
+#: catalog/namespace.c:2523
+#, c-format
+msgid "%s is already in schema \"%s\""
+msgstr "%s ya está en el esquema «%s»"
+
+#: catalog/namespace.c:2531
+msgid "cannot move objects into or out of temporary schemas"
+msgstr "no se puede mover objetos hacia o desde esquemas temporales"
+
+#: catalog/namespace.c:2537
+msgid "cannot move objects into or out of TOAST schema"
+msgstr "no se puede mover objetos hacia o desde el esquema TOAST"
+
+#: catalog/namespace.c:2610 catalog/namespace.c:3595 catalog/namespace.c:3598
+#: commands/schemacmds.c:253 commands/schemacmds.c:322
+#, c-format
+msgid "schema \"%s\" does not exist"
+msgstr "no existe el esquema «%s»"
+
+#: catalog/namespace.c:2641
 #, c-format
 msgid "improper relation name (too many dotted names): %s"
 msgstr "el nombre de relación no es válido (demasiados puntos): %s"
 
-#: catalog/namespace.c:3024
+#: catalog/namespace.c:3040
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" does not exist"
+msgstr "no existe el ordenamiento (collation) «%s» para la codificación «%s»"
+
+#: catalog/namespace.c:3092
+#, c-format
+msgid "conversion \"%s\" does not exist"
+msgstr "no existe la conversión «%s»"
+
+#: catalog/namespace.c:3297
 #, c-format
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr ""
 "se ha denegado el permiso para crear tablas temporales en la base de datos "
 "«%s»"
 
-#: catalog/namespace.c:3040
+#: catalog/namespace.c:3313
 msgid "cannot create temporary tables during recovery"
 msgstr "no se pueden crear tablas temporales durante la recuperación"
 
+#: catalog/namespace.c:3557 commands/tablespace.c:1121 commands/variable.c:59
+#: replication/syncrep.c:656 utils/misc/guc.c:8161
+msgid "List syntax is invalid."
+msgstr "La sintaxis de lista no es válida."
+
+#: catalog/objectaddress.c:286
+msgid "database name cannot be qualified"
+msgstr "un nombre de base de datos no puede ser calificado"
+
+#: catalog/objectaddress.c:289 commands/extension.c:1595
+#: commands/extension.c:2255
+msgid "extension name cannot be qualified"
+msgstr "un nombre de extensión no puede ser calificado"
+
+#: catalog/objectaddress.c:292
+msgid "tablespace name cannot be qualified"
+msgstr "un nombre de tablespace no puede ser calificado"
+
+#: catalog/objectaddress.c:295
+msgid "role name cannot be qualified"
+msgstr "un nombre de rol no puede ser calificado"
+
+#: catalog/objectaddress.c:298 commands/schemacmds.c:178
+msgid "schema name cannot be qualified"
+msgstr "un nombre de esquema no puede ser calificado"
+
+#: catalog/objectaddress.c:301
+msgid "language name cannot be qualified"
+msgstr "un nombre de lenguaje no puede ser calificado"
+
+#: catalog/objectaddress.c:304
+msgid "foreign-data wrapper name cannot be qualified"
+msgstr "un nombre de conector de datos externos no puede ser calificado"
+
+#: catalog/objectaddress.c:307
+msgid "server name cannot be qualified"
+msgstr "un nombre de servidor no puede ser calificado"
+
+#: catalog/objectaddress.c:405 catalog/toasting.c:91 commands/indexcmds.c:200
+#: commands/indexcmds.c:1574 commands/lockcmds.c:149 commands/tablecmds.c:202
+#: commands/tablecmds.c:1129 commands/tablecmds.c:2478
+#: commands/tablecmds.c:3825 commands/tablecmds.c:6759
+#, c-format
+msgid "\"%s\" is not a table"
+msgstr "«%s» no es una tabla"
+
+#: catalog/objectaddress.c:412 commands/tablecmds.c:214
+#: commands/tablecmds.c:2253 commands/tablecmds.c:2510
+#: commands/tablecmds.c:3840 commands/tablecmds.c:8976 commands/view.c:181
+#, c-format
+msgid "\"%s\" is not a view"
+msgstr "«%s» no es una vista"
+
+#: catalog/objectaddress.c:419 commands/tablecmds.c:232
+#: commands/tablecmds.c:2259 commands/tablecmds.c:2518
+#: commands/tablecmds.c:3843 commands/tablecmds.c:8984
+#, c-format
+msgid "\"%s\" is not a foreign table"
+msgstr "«%s» no es una tabla foránea"
+
+#: catalog/objectaddress.c:824 catalog/pg_largeobject.c:200
+#: libpq/be-fsstubs.c:287
+#, c-format
+msgid "must be owner of large object %u"
+msgstr "debe ser dueño del objeto grande %u"
+
+#: catalog/objectaddress.c:839 commands/functioncmds.c:1526
+#: commands/functioncmds.c:1814
+#, c-format
+msgid "must be owner of type %s or type %s"
+msgstr "debe ser dueño del tipo %s o el tipo %s"
+
+#: catalog/objectaddress.c:870 catalog/objectaddress.c:886
+msgid "must be superuser"
+msgstr "debe ser superusuario"
+
+#: catalog/objectaddress.c:877
+msgid "must have CREATEROLE privilege"
+msgstr "debe tener privilegio CREATEROLE"
+
 #: catalog/pg_aggregate.c:100
 msgid "cannot determine transition data type"
 msgstr "no se pudo determinar el tipo de dato de transición"
@@ -3594,7 +3476,7 @@ msgstr ""
 "no se puede omitir el valor inicial cuando la función de transición es "
 "strict y el tipo de transición no es compatible con el tipo de entrada"
 
-#: catalog/pg_aggregate.c:175 catalog/pg_proc.c:204
+#: catalog/pg_aggregate.c:175 catalog/pg_proc.c:205
 msgid "cannot determine result data type"
 msgstr "no se puede determinar el tipo de dato del resultado"
 
@@ -3606,11 +3488,11 @@ msgstr ""
 "Una función de agregación que retorne un tipo de datos polimórfico debe "
 "tener al menos un argumento de tipo polimórfico."
 
-#: catalog/pg_aggregate.c:188 catalog/pg_proc.c:210
+#: catalog/pg_aggregate.c:188 catalog/pg_proc.c:211
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "uso inseguro de pseudotipo «internal»"
 
-#: catalog/pg_aggregate.c:189 catalog/pg_proc.c:211
+#: catalog/pg_aggregate.c:189 catalog/pg_proc.c:212
 msgid ""
 "A function returning \"internal\" must have at least one \"internal\" "
 "argument."
@@ -3624,10 +3506,10 @@ msgstr ""
 "el operador de ordenamiento sólo pueden ser especificado para funciones de "
 "agregación de un solo argumento"
 
-#: catalog/pg_aggregate.c:331 commands/typecmds.c:1269
-#: commands/typecmds.c:1320 commands/typecmds.c:1351 commands/typecmds.c:1374
-#: commands/typecmds.c:1395 commands/typecmds.c:1422 commands/typecmds.c:1449
-#: parser/parse_func.c:294 parser/parse_func.c:305 parser/parse_func.c:1464
+#: catalog/pg_aggregate.c:331 commands/typecmds.c:1350
+#: commands/typecmds.c:1401 commands/typecmds.c:1432 commands/typecmds.c:1455
+#: commands/typecmds.c:1476 commands/typecmds.c:1503 commands/typecmds.c:1530
+#: parser/parse_func.c:288 parser/parse_func.c:299 parser/parse_func.c:1481
 #, c-format
 msgid "function %s does not exist"
 msgstr "no existe la función %s"
@@ -3642,120 +3524,126 @@ msgstr "la función %s retorna un conjunto"
 msgid "function %s requires run-time type coercion"
 msgstr "la función %s requiere conversión de tipos en tiempo de ejecución"
 
-#: catalog/pg_constraint.c:648 commands/typecmds.c:2239
+#: catalog/pg_constraint.c:654 commands/typecmds.c:2321
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "el dominio «%2$s» ya contiene una restricción llamada «%1$s»"
 
-#: catalog/pg_constraint.c:767
+#: catalog/pg_constraint.c:773
 #, c-format
 msgid "table \"%s\" has multiple constraints named \"%s\""
 msgstr "hay múltiples restricciones llamadas «%2$s» en la tabla «%1$s»"
 
-#: catalog/pg_constraint.c:779
+#: catalog/pg_constraint.c:785
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "no existe la restricción «%s» para la tabla «%s»"
 
-#: catalog/pg_conversion.c:66
+#: catalog/pg_conversion.c:67
 #, c-format
 msgid "conversion \"%s\" already exists"
 msgstr "ya existe la conversión «%s»"
 
-#: catalog/pg_conversion.c:79
+#: catalog/pg_conversion.c:80
 #, c-format
 msgid "default conversion for %s to %s already exists"
 msgstr "ya existe una conversión por omisión desde %s a %s"
 
-#: catalog/pg_depend.c:209
+#: catalog/pg_depend.c:164 commands/extension.c:2735
+#, c-format
+msgid "%s is already a member of extension \"%s\""
+msgstr "«%s» ya es un miembro de la extensión «%s»"
+
+#: catalog/pg_depend.c:323
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr ""
 "no se puede eliminar dependencia a %s porque es un objeto requerido por el "
 "sistema"
 
-#: catalog/pg_enum.c:70
-msgid "EnumValuesCreate() can only set a single OID"
-msgstr "EnumValuesCreate() puede definir un único OID"
-
-#: catalog/pg_enum.c:110
+#: catalog/pg_enum.c:113 catalog/pg_enum.c:199
 #, c-format
 msgid "invalid enum label \"%s\""
 msgstr "la etiqueta enum «%s» no es válida"
 
-#: catalog/pg_enum.c:111
+#: catalog/pg_enum.c:114 catalog/pg_enum.c:200
 #, c-format
 msgid "Labels must be %d characters or less."
 msgstr "Las etiquetas deben ser de %d caracteres o menos."
 
-#: catalog/pg_largeobject.c:200 commands/comment.c:1422 libpq/be-fsstubs.c:287
+#: catalog/pg_enum.c:264
 #, c-format
-msgid "must be owner of large object %u"
-msgstr "debe ser dueño del objeto grande %u"
+msgid "\"%s\" is not an existing enum label"
+msgstr "«%s» no es una etiqueta de enum existente"
 
-#: catalog/pg_namespace.c:50 commands/schemacmds.c:272
+#: catalog/pg_enum.c:325
+msgid "ALTER TYPE ADD BEFORE/AFTER is incompatible with binary upgrade"
+msgstr ""
+"ALTER TYPE ADD BEFORE/AFTER es incompatible con la actualización binaria"
+
+#: catalog/pg_namespace.c:52 commands/schemacmds.c:259
 #, c-format
 msgid "schema \"%s\" already exists"
 msgstr "ya existe el esquema «%s»"
 
-#: catalog/pg_operator.c:220 catalog/pg_operator.c:358
+#: catalog/pg_operator.c:221 catalog/pg_operator.c:363
 #, c-format
 msgid "\"%s\" is not a valid operator name"
 msgstr "«%s» no es un nombre válido de operador"
 
-#: catalog/pg_operator.c:367
+#: catalog/pg_operator.c:372
 msgid "only binary operators can have commutators"
 msgstr "sólo los operadores binarios pueden tener conmutadores"
 
-#: catalog/pg_operator.c:371
+#: catalog/pg_operator.c:376
 msgid "only binary operators can have join selectivity"
 msgstr "sólo los operadores binarios pueden tener selectividad de join"
 
-#: catalog/pg_operator.c:375
+#: catalog/pg_operator.c:380
 msgid "only binary operators can merge join"
 msgstr "sólo los operadores binarios pueden ser usados en merge join"
 
-#: catalog/pg_operator.c:379
+#: catalog/pg_operator.c:384
 msgid "only binary operators can hash"
 msgstr "sólo los operadores binarios pueden ser usados en hash"
 
-#: catalog/pg_operator.c:390
+#: catalog/pg_operator.c:395
 msgid "only boolean operators can have negators"
 msgstr "sólo los operadores booleanos pueden tener negadores"
 
-#: catalog/pg_operator.c:394
+#: catalog/pg_operator.c:399
 msgid "only boolean operators can have restriction selectivity"
 msgstr "sólo los operadores booleanos pueden tener selectividad de restricción"
 
-#: catalog/pg_operator.c:398
+#: catalog/pg_operator.c:403
 msgid "only boolean operators can have join selectivity"
 msgstr "sólo los operadores booleanos pueden tener selectividad de join"
 
-#: catalog/pg_operator.c:402
+#: catalog/pg_operator.c:407
 msgid "only boolean operators can merge join"
 msgstr "sólo los operadores booleanos pueden ser usados en merge join"
 
-#: catalog/pg_operator.c:406
+#: catalog/pg_operator.c:411
 msgid "only boolean operators can hash"
 msgstr "sólo los operadores booleanos pueden ser usados en hash"
 
-#: catalog/pg_operator.c:418
+#: catalog/pg_operator.c:423
 #, c-format
 msgid "operator %s already exists"
 msgstr "ya existe un operador %s"
 
-#: catalog/pg_operator.c:607
+#: catalog/pg_operator.c:616
 msgid "operator cannot be its own negator or sort operator"
 msgstr "un operador no puede ser su propio negador u operador de ordenamiento"
 
-#: catalog/pg_proc.c:123 parser/parse_func.c:1509 parser/parse_func.c:1549
+#: catalog/pg_proc.c:124 parser/parse_func.c:1526 parser/parse_func.c:1566
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
 msgstr[0] "las funciones no pueden tener más de %d argumento"
 msgstr[1] "las funciones no pueden tener más de %d argumentos"
 
-#: catalog/pg_proc.c:205
+#: catalog/pg_proc.c:206
 msgid ""
 "A function returning a polymorphic type must have at least one polymorphic "
 "argument."
@@ -3763,84 +3651,84 @@ msgstr ""
 "Una función que retorne un tipo polimórfico debe tener al menos un argumento "
 "de tipo polimórfico."
 
-#: catalog/pg_proc.c:223
+#: catalog/pg_proc.c:224
 #, c-format
 msgid "\"%s\" is already an attribute of type %s"
 msgstr "«%s» ya es un atributo de tipo %s"
 
-#: catalog/pg_proc.c:362
+#: catalog/pg_proc.c:363
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "ya existe una función «%s» con los mismos argumentos"
 
-#: catalog/pg_proc.c:376 catalog/pg_proc.c:398
+#: catalog/pg_proc.c:377 catalog/pg_proc.c:399
 msgid "cannot change return type of existing function"
 msgstr "no se puede cambiar el tipo de retorno de una función existente"
 
-#: catalog/pg_proc.c:377 catalog/pg_proc.c:400 catalog/pg_proc.c:442
-#: catalog/pg_proc.c:465 catalog/pg_proc.c:491
+#: catalog/pg_proc.c:378 catalog/pg_proc.c:401 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:466 catalog/pg_proc.c:492
 msgid "Use DROP FUNCTION first."
 msgstr "Use DROP FUNCTION primero."
 
-#: catalog/pg_proc.c:399
+#: catalog/pg_proc.c:400
 msgid "Row type defined by OUT parameters is different."
 msgstr "Tipo de registro definido por parámetros OUT es diferente."
 
-#: catalog/pg_proc.c:440
+#: catalog/pg_proc.c:441
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "no se puede cambiar el nombre del parámetro de entrada «%s»"
 
-#: catalog/pg_proc.c:464
+#: catalog/pg_proc.c:465
 msgid "cannot remove parameter defaults from existing function"
 msgstr "no se puede eliminar el valor por omisión de funciones existentes"
 
-#: catalog/pg_proc.c:490
+#: catalog/pg_proc.c:491
 msgid "cannot change data type of existing parameter default value"
 msgstr ""
 "no se puede cambiar el tipo de dato del valor por omisión de un parámetro"
 
-#: catalog/pg_proc.c:502
+#: catalog/pg_proc.c:503
 #, c-format
 msgid "function \"%s\" is an aggregate function"
 msgstr "la función «%s» es una función de agregación"
 
-#: catalog/pg_proc.c:507
+#: catalog/pg_proc.c:508
 #, c-format
 msgid "function \"%s\" is not an aggregate function"
 msgstr "la función «%s» no es una función de agregación"
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "function \"%s\" is a window function"
 msgstr "la función %s es de tipo window"
 
-#: catalog/pg_proc.c:520
+#: catalog/pg_proc.c:521
 #, c-format
 msgid "function \"%s\" is not a window function"
 msgstr "la función «%s» no es de tipo window"
 
-#: catalog/pg_proc.c:688
+#: catalog/pg_proc.c:693
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "no hay ninguna función interna llamada «%s»"
 
-#: catalog/pg_proc.c:780
+#: catalog/pg_proc.c:785
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "las funciones SQL no pueden retornar el tipo %s"
 
-#: catalog/pg_proc.c:795
+#: catalog/pg_proc.c:800
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "las funciones SQL no pueden tener argumentos de tipo %s"
 
-#: catalog/pg_proc.c:861 executor/functions.c:936
+#: catalog/pg_proc.c:886 executor/functions.c:1162
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "función SQL «%s»"
 
-#: catalog/pg_shdepend.c:678
+#: catalog/pg_shdepend.c:680
 #, c-format
 msgid ""
 "\n"
@@ -3857,40 +3745,40 @@ msgstr[1] ""
 "y objetos en otras %d bases de datos (vea el registro del servidor para "
 "obtener la lista)"
 
-#: catalog/pg_shdepend.c:990
+#: catalog/pg_shdepend.c:992
 #, c-format
 msgid "role %u was concurrently dropped"
 msgstr "el rol %u fue eliminado por una transacción concurrente"
 
-#: catalog/pg_shdepend.c:1009
+#: catalog/pg_shdepend.c:1011
 #, c-format
 msgid "tablespace %u was concurrently dropped"
 msgstr "el tablespace %u fue eliminado por una transacción concurrente"
 
-#: catalog/pg_shdepend.c:1024
+#: catalog/pg_shdepend.c:1026
 #, c-format
 msgid "database %u was concurrently dropped"
 msgstr "la base de datos %u fue eliminado por una transacción concurrente"
 
-#: catalog/pg_shdepend.c:1068
+#: catalog/pg_shdepend.c:1070
 #, c-format
 msgid "owner of %s"
 msgstr "dueño de %s"
 
-#: catalog/pg_shdepend.c:1070
+#: catalog/pg_shdepend.c:1072
 #, c-format
 msgid "privileges for %s"
 msgstr "privilegios para %s"
 
 #. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1078
+#: catalog/pg_shdepend.c:1080
 #, c-format
 msgid "%d object in %s"
 msgid_plural "%d objects in %s"
 msgstr[0] "%d objeto en %s"
 msgstr[1] "%d objetos en %s"
 
-#: catalog/pg_shdepend.c:1189 catalog/pg_shdepend.c:1285
+#: catalog/pg_shdepend.c:1191
 #, c-format
 msgid ""
 "cannot drop objects owned by %s because they are required by the database "
@@ -3899,71 +3787,60 @@ msgstr ""
 "no se puede eliminar objetos de propiedad de %s porque son requeridos por el "
 "sistema"
 
-#: catalog/pg_type.c:231
+#: catalog/pg_shdepend.c:1287
+#, c-format
+msgid ""
+"cannot reassign ownership of objects owned by %s because they are required "
+"by the database system"
+msgstr ""
+"no se puede reasignar la propiedad de objetos de %s porque son requeridos "
+"por el sistema"
+
+#: catalog/pg_type.c:241
 #, c-format
 msgid "invalid type internal size %d"
 msgstr "el tamaño interno de tipo %d no es válido"
 
-#: catalog/pg_type.c:247 catalog/pg_type.c:255 catalog/pg_type.c:263
-#: catalog/pg_type.c:272
+#: catalog/pg_type.c:257 catalog/pg_type.c:265 catalog/pg_type.c:273
+#: catalog/pg_type.c:282
 #, c-format
 msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
 msgstr ""
 "el alineamiento «%c» no es válido para un tipo pasado por valor de tamaño %d"
 
-#: catalog/pg_type.c:279
+#: catalog/pg_type.c:289
 #, c-format
 msgid "internal size %d is invalid for passed-by-value type"
 msgstr "el tamaño interno %d no es válido para un tipo pasado por valor"
 
-#: catalog/pg_type.c:288 catalog/pg_type.c:294
+#: catalog/pg_type.c:298 catalog/pg_type.c:304
 #, c-format
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "el alineamiento «%c» no es válido para un tipo de largo variable"
 
-#: catalog/pg_type.c:302
+#: catalog/pg_type.c:312
 msgid "fixed-size types must have storage PLAIN"
 msgstr "los tipos de tamaño fijo deben tener almacenamiento PLAIN"
 
-#: catalog/pg_type.c:730
+#: catalog/pg_type.c:760
 #, c-format
 msgid "could not form array type name for type \"%s\""
 msgstr "no se pudo formar un nombre de tipo de array para el tipo «%s»"
 
-#: commands/view.c:139
-msgid "view must have at least one column"
-msgstr "una vista debe tener al menos una columna"
-
-#: commands/view.c:163 commands/comment.c:580 commands/tablecmds.c:206
-#: commands/tablecmds.c:2152 commands/tablecmds.c:2373
-#: commands/tablecmds.c:7818
-#, c-format
-msgid "\"%s\" is not a view"
-msgstr "«%s» no es una vista"
-
-#: commands/view.c:260 commands/view.c:272
-msgid "cannot drop columns from view"
-msgstr "no se pueden eliminar columnas de una vista"
-
-#: commands/view.c:277
-#, c-format
-msgid "cannot change name of view column \"%s\" to \"%s\""
-msgstr "no se puede cambiar el nombre de la columna «%s» de la vista a «%s»"
-
-#: commands/view.c:285
-#, c-format
-msgid "cannot change data type of view column \"%s\" from %s to %s"
+#: catalog/toasting.c:142
+msgid "shared tables cannot be toasted after initdb"
 msgstr ""
-"no se puede cambiar el tipo de dato de la columna «%s» de la vista de %s a %s"
+"no se puede crear tablas TOAST a relaciones compartidas después de initdb"
 
-#: commands/view.c:441
-msgid "CREATE VIEW specifies more column names than columns"
-msgstr "CREATE VIEW especifica más nombres de columna que columnas"
+#: catalog/pg_collation.c:75
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists"
+msgstr "la codificación «%2$s» ya tiene un ordenamiento llamado «%1$s»"
 
-#: commands/view.c:457
+#: catalog/pg_collation.c:89
 #, c-format
-msgid "view \"%s\" will be a temporary view"
-msgstr "la vista «%s» será una vista temporal"
+msgid "collation \"%s\" already exists"
+msgstr "el ordenamiento «%s» ya existe"
 
 #: commands/aggregatecmds.c:103
 #, c-format
@@ -4000,53 +3877,67 @@ msgstr "el tipo de transición de la función de agregación no puede ser %s"
 msgid "aggregate %s(%s) does not exist, skipping"
 msgstr "la función de agregación %s(%s) no existe, ignorando"
 
-#: commands/aggregatecmds.c:292 commands/functioncmds.c:1119
+#: commands/aggregatecmds.c:292 commands/functioncmds.c:1122
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "ya existe una función llamada %s en el esquema «%s»"
 
-#: commands/analyze.c:166
+#: commands/alter.c:423
+#, c-format
+msgid "must be superuser to set schema of %s"
+msgstr "debe ser superusuario para definir el esquema de %s"
+
+#: commands/alter.c:451
+#, c-format
+msgid "%s already exists in schema \"%s\""
+msgstr "ya existe %s en el esquema «%s»"
+
+#: commands/analyze.c:153
+#, c-format
+msgid "skipping analyze of \"%s\" --- lock not available"
+msgstr "saltando analyze de «%s»: el candado no está disponible"
+
+#: commands/analyze.c:170
 #, c-format
 msgid "skipping \"%s\" --- only superuser can analyze it"
 msgstr "ignorando «%s»: sólo un superusuario puede analizarla"
 
-#: commands/analyze.c:170
+#: commands/analyze.c:174
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
 msgstr ""
 "ignorando «%s»: sólo un superusuario o el dueño de la base de datos puede "
 "analizarla"
 
-#: commands/analyze.c:174
+#: commands/analyze.c:178
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can analyze it"
 msgstr ""
 "ignorando «%s»: sólo su dueño o el de la base de datos puede analizarla"
 
-#: commands/analyze.c:190
+#: commands/analyze.c:194
 #, c-format
-msgid ""
-"skipping \"%s\" --- cannot analyze indexes, views, or special system tables"
+msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
 msgstr ""
-"ignorando «%s»: no se pueden analizar índices, vistas o tablas especiales de "
-"sistema"
+"ignorando «%s»: no se pueden analizar objetos que no son tablas, ni tablas "
+"especiales de sistema"
 
-#: commands/analyze.c:283
+#: commands/analyze.c:285
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "analizando la jerarquía de herencia «%s.%s»"
 
-#: commands/analyze.c:288
+#: commands/analyze.c:290
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "analizando «%s.%s»"
 
-#: commands/analyze.c:609
+#: commands/analyze.c:598
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
 msgstr "analyze automático de la tabla «%s.%s.%s»: uso del sistema: %s"
 
-#: commands/analyze.c:1249
+#: commands/analyze.c:1238
 #, c-format
 msgid ""
 "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
@@ -4055,7 +3946,7 @@ msgstr ""
 "«%s»: se procesaron %d de %u páginas, que contenían %.0f filas vigentes y "
 "%.0f filas no vigentes; %d filas en la muestra, %.0f total de filas estimadas"
 
-#: commands/analyze.c:1510 executor/execQual.c:2735
+#: commands/analyze.c:1499 executor/execQual.c:2734
 msgid "could not convert row type"
 msgstr "no se pudo convertir el tipo de fila"
 
@@ -4082,12 +3973,12 @@ msgstr ""
 msgid "too many notifications in the NOTIFY queue"
 msgstr "demasiadas notificaciones en la cola NOTIFY"
 
-#: commands/async.c:1421
+#: commands/async.c:1430
 #, c-format
 msgid "NOTIFY queue is %.0f%% full"
 msgstr "la cola NOTIFY está %.0f%% llena"
 
-#: commands/async.c:1423
+#: commands/async.c:1432
 #, c-format
 msgid ""
 "The server process with PID %d is among those with the oldest transactions."
@@ -4095,7 +3986,7 @@ msgstr ""
 "El proceso servidor con PID %d está entre aquellos con transacciones más "
 "antiguas."
 
-#: commands/async.c:1426
+#: commands/async.c:1435
 msgid ""
 "The NOTIFY queue cannot be emptied until that process ends its current "
 "transaction."
@@ -4103,44 +3994,34 @@ msgstr ""
 "La cola NOTIFY no puede vaciarse hasta que ese proceso cierre su transacción "
 "actual."
 
-#: commands/cluster.c:126 commands/cluster.c:364
+#: commands/cluster.c:134 commands/cluster.c:372
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "no se pueden reordenar tablas temporales de otras sesiones"
 
-#: commands/cluster.c:156
+#: commands/cluster.c:164
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "no hay un índice de ordenamiento definido para la tabla «%s»"
 
-#: commands/cluster.c:170 commands/tablecmds.c:6768
+#: commands/cluster.c:178 commands/tablecmds.c:7659
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "no existe el índice «%s» en la tabla «%s»"
 
-#: commands/cluster.c:353
+#: commands/cluster.c:361
 msgid "cannot cluster a shared catalog"
 msgstr "no se puede reordenar un catálogo compartido"
 
-#: commands/cluster.c:368
+#: commands/cluster.c:376
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "no se puede hacer vacuum a tablas temporales de otras sesiones"
 
-#: commands/cluster.c:384
-#, c-format
-msgid "clustering \"%s.%s\""
-msgstr "reordenando «%s.%s»"
-
-#: commands/cluster.c:389 commands/vacuumlazy.c:320
-#, c-format
-msgid "vacuuming \"%s.%s\""
-msgstr "haciendo vacuum a «%s.%s»"
-
-#: commands/cluster.c:421
+#: commands/cluster.c:426
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "«%s» no es un índice de la tabla «%s»"
 
-#: commands/cluster.c:429
+#: commands/cluster.c:434
 #, c-format
 msgid ""
 "cannot cluster on index \"%s\" because access method does not support "
@@ -4149,567 +4030,480 @@ msgstr ""
 "no se puede reordenar en índice «%s» porque el método de acceso no soporta "
 "reordenamiento"
 
-#: commands/cluster.c:441
+#: commands/cluster.c:446
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "no se puede reordenar en índice parcial «%s»"
 
-#: commands/cluster.c:461
-#, c-format
-msgid ""
-"cannot cluster on index \"%s\" because access method does not handle null "
-"values"
-msgstr ""
-"no se puede reordenar en índice «%s» porque el método de acceso no maneja "
-"valores null"
-
-#: commands/cluster.c:464
-#, c-format
-msgid ""
-"You might be able to work around this by marking column \"%s\" NOT NULL, or "
-"use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification "
-"from the table."
-msgstr ""
-"Quizás pueda corregir esto marcando la columna «%s» NOT NULL, o usando ALTER "
-"TABLE ... SET WITHOUT CLUSTER para eliminar la reordenación para la tabla."
-
-#: commands/cluster.c:466
-#, c-format
-msgid ""
-"You might be able to work around this by marking column \"%s\" NOT NULL."
-msgstr "Quizás pueda corregir esto marcando la columna «%s» NOT NULL."
-
-#: commands/cluster.c:477
-#, c-format
-msgid ""
-"cannot cluster on expressional index \"%s\" because its index access method "
-"does not handle null values"
-msgstr ""
-"no se puede reordenar en índice de expresión «%s» porque el método de acceso "
-"no maneja valores null"
-
-#: commands/cluster.c:492
+#: commands/cluster.c:460
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "no se puede reordenar en el índice no válido «%s»"
 
-#: commands/comment.c:642
-#, c-format
-msgid "\"%s\" is not a table, view, or composite type"
-msgstr "«%s» no es una tabla, vista o tipo compuesto"
-
-#: commands/comment.c:681
-msgid "database name cannot be qualified"
-msgstr "un nombre de base de datos no puede ser calificado"
-
-#: commands/comment.c:729
-msgid "tablespace name cannot be qualified"
-msgstr "un nombre de tablespace no puede ser calificado"
-
-#: commands/comment.c:766
-msgid "role name cannot be qualified"
-msgstr "un nombre de rol no puede ser calificado"
-
-#: commands/comment.c:775
-#, c-format
-msgid "must be member of role \"%s\" to comment upon it"
-msgstr "debe ser miembro del rol «%s» para definirle un comentario"
-
-#: commands/comment.c:799 commands/schemacmds.c:178
-msgid "schema name cannot be qualified"
-msgstr "un nombre de esquema no puede ser calificado"
-
-#: commands/comment.c:874
-#, c-format
-msgid "rule \"%s\" does not exist"
-msgstr "no existe la regla «%s»"
-
-#: commands/comment.c:882
-#, c-format
-msgid "there are multiple rules named \"%s\""
-msgstr "hay múltiples reglas llamadas «%s»"
-
-#: commands/comment.c:883
-msgid "Specify a relation name as well as a rule name."
-msgstr "Especifique un nombre de relación además del nombre de regla."
-
-#: commands/comment.c:910 rewrite/rewriteDefine.c:687
-#: rewrite/rewriteDefine.c:749 rewrite/rewriteRemove.c:62
-#, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist"
-msgstr "no existe la regla «%s» para la relación «%s»"
-
-#: commands/comment.c:1105 commands/trigger.c:994 commands/trigger.c:1194
-#: commands/trigger.c:1305
+#: commands/cluster.c:883
 #, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist"
-msgstr "no existe el trigger «%s» para la tabla «%s»"
+msgid "clustering \"%s.%s\" using index scan on \"%s\""
+msgstr "reordenando «%s.%s» usando un recorrido de índice en «%s»"
 
-#: commands/comment.c:1183 commands/conversioncmds.c:153
-#: commands/conversioncmds.c:209 commands/conversioncmds.c:262
+#: commands/cluster.c:889
 #, c-format
-msgid "conversion \"%s\" does not exist"
-msgstr "no existe la conversión «%s»"
-
-#: commands/comment.c:1213
-msgid "language name cannot be qualified"
-msgstr "un nombre de lenguaje no puede ser calificado"
+msgid "clustering \"%s.%s\" using sequential scan and sort"
+msgstr "reordenando «%s.%s» usando un recorrido secuencial y ordenamiento"
 
-#: commands/comment.c:1226
-msgid "must be superuser to comment on procedural language"
-msgstr "debe ser superusuario para comentar un lenguaje procedural"
-
-#: commands/comment.c:1261 commands/comment.c:1342 commands/indexcmds.c:295
-#: commands/opclasscmds.c:281 commands/opclasscmds.c:669
-#: commands/opclasscmds.c:769 commands/opclasscmds.c:1495
-#: commands/opclasscmds.c:1556 commands/opclasscmds.c:1718
-#: commands/opclasscmds.c:1812 commands/opclasscmds.c:1903
-#: commands/opclasscmds.c:2046
+#: commands/cluster.c:894 commands/vacuumlazy.c:339
 #, c-format
-msgid "access method \"%s\" does not exist"
-msgstr "no existe el método de acceso «%s»"
+msgid "vacuuming \"%s.%s\""
+msgstr "haciendo vacuum a «%s.%s»"
 
-#: commands/comment.c:1289 commands/comment.c:1297 commands/indexcmds.c:1149
-#: commands/indexcmds.c:1157 commands/opclasscmds.c:1507
-#: commands/opclasscmds.c:1511 commands/opclasscmds.c:1739
-#: commands/opclasscmds.c:1750 commands/opclasscmds.c:1926
-#: commands/opclasscmds.c:1937
+#: commands/cluster.c:1054
 #, c-format
-msgid "operator class \"%s\" does not exist for access method \"%s\""
-msgstr "no existe la clase de operadores «%s» para el método de acceso «%s»"
+msgid ""
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
+msgstr ""
+"«%s»: se encontraron %.0f versiones eliminables de filas y %.0f no "
+"eliminables en %u páginas"
 
-#: commands/comment.c:1370 commands/comment.c:1378 commands/opclasscmds.c:343
-#: commands/opclasscmds.c:789 commands/opclasscmds.c:1568
-#: commands/opclasscmds.c:1572 commands/opclasscmds.c:1833
-#: commands/opclasscmds.c:1844 commands/opclasscmds.c:2069
-#: commands/opclasscmds.c:2080
+#: commands/cluster.c:1058
 #, c-format
-msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "no existe la familia de operadores «%s» para el método de acceso «%s»"
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"%s."
+msgstr ""
+"%.0f versiones muertas de filas no pueden ser eliminadas aún.\n"
+"%s."
 
-#: commands/comment.c:1469 commands/functioncmds.c:1777
+#: commands/comment.c:60 commands/dbcommands.c:764 commands/dbcommands.c:909
+#: commands/dbcommands.c:1008 commands/dbcommands.c:1181
+#: commands/dbcommands.c:1366 commands/dbcommands.c:1451
+#: commands/dbcommands.c:1854 utils/init/postinit.c:709
+#: utils/init/postinit.c:777 utils/init/postinit.c:794
 #, c-format
-msgid "cast from type %s to type %s does not exist"
-msgstr "no existe la conversión del tipo %s al tipo %s"
+msgid "database \"%s\" does not exist"
+msgstr "no existe la base de datos «%s»"
 
-#: commands/comment.c:1481 commands/functioncmds.c:1522
-#: commands/functioncmds.c:1794
+#: commands/comment.c:97 commands/seclabel.c:113
 #, c-format
-msgid "must be owner of type %s or type %s"
-msgstr "debe ser dueño del tipo %s o el tipo %s"
-
-#: commands/comment.c:1501
-msgid "must be superuser to comment on text search parser"
-msgstr "debe ser superusuario para comentar un analizador de búsqueda en texto"
+msgid "\"%s\" is not a table, view, composite type, or foreign table"
+msgstr "«%s» no es una tabla, vista, tipo compuesto, o tabla foránea"
 
-#: commands/comment.c:1530
-msgid "must be superuser to comment on text search template"
-msgstr "debe ser superusuario para comentar una plantilla de búsqueda en texto"
-
-#: commands/constraint.c:59 utils/adt/ri_triggers.c:2999
+#: commands/constraint.c:59 utils/adt/ri_triggers.c:3082
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "la función «%s» no fue ejecutada por el manejador de triggers"
 
-#: commands/constraint.c:66 utils/adt/ri_triggers.c:3008
+#: commands/constraint.c:66 utils/adt/ri_triggers.c:3091
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "la función «%s» debe ser ejecutada AFTER ROW"
 
-#: commands/constraint.c:80 utils/adt/ri_triggers.c:3029
+#: commands/constraint.c:80 utils/adt/ri_triggers.c:3112
 #, c-format
 msgid "function \"%s\" must be fired for INSERT or UPDATE"
 msgstr "la función «%s» debe ser ejecutada en INSERT o UPDATE"
 
-#: commands/conversioncmds.c:69
+#: commands/conversioncmds.c:71
 #, c-format
 msgid "source encoding \"%s\" does not exist"
 msgstr "no existe la codificación fuente «%s»"
 
-#: commands/conversioncmds.c:76
+#: commands/conversioncmds.c:78
 #, c-format
 msgid "destination encoding \"%s\" does not exist"
 msgstr "no existe la codificación de destino «%s»"
 
-#: commands/conversioncmds.c:90
+#: commands/conversioncmds.c:92
 #, c-format
 msgid "encoding conversion function %s must return type \"void\""
 msgstr "la función de conversión de codificación %s debe retornar tipo «void»"
 
-#: commands/conversioncmds.c:159
+#: commands/conversioncmds.c:152
 #, c-format
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "no existe la conversión «%s», ignorando"
 
-#: commands/conversioncmds.c:224
+#: commands/conversioncmds.c:211
 #, c-format
 msgid "conversion \"%s\" already exists in schema \"%s\""
 msgstr "ya existe una conversión llamada «%s» en el esquema «%s»"
 
-#: commands/copy.c:312 commands/copy.c:324 commands/copy.c:358
-#: commands/copy.c:368
+#: commands/copy.c:339 commands/copy.c:351 commands/copy.c:385
+#: commands/copy.c:395
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr ""
 "COPY BINARY no está soportado a la salida estándar o desde la entrada "
 "estándar"
 
-#: commands/copy.c:446
+#: commands/copy.c:473
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "no se pudo escribir archivo COPY: %m"
 
-#: commands/copy.c:458
+#: commands/copy.c:485
 msgid "connection lost during COPY to stdout"
 msgstr "se perdió la conexión durante COPY a la salida estándar"
 
-#: commands/copy.c:499
+#: commands/copy.c:526
 #, c-format
 msgid "could not read from COPY file: %m"
 msgstr "no se pudo leer desde archivo COPY: %m"
 
-#: commands/copy.c:515 commands/copy.c:534 commands/copy.c:538
-#: tcop/fastpath.c:291 tcop/postgres.c:348 tcop/postgres.c:371
+#: commands/copy.c:542 commands/copy.c:561 commands/copy.c:565
+#: tcop/fastpath.c:290 tcop/postgres.c:349 tcop/postgres.c:372
 msgid "unexpected EOF on client connection"
 msgstr "se encontró fin de archivo inesperado en la conexión del cliente"
 
-#: commands/copy.c:550
+#: commands/copy.c:577
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "falló COPY desde la entrada estándar: %s"
 
-#: commands/copy.c:566
+#: commands/copy.c:593
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr ""
 "se recibió un mensaje de tipo 0x%02X inesperado durante COPY desde la "
 "entrada estándar"
 
-#: commands/copy.c:762
+#: commands/copy.c:745
+msgid "must be superuser to COPY to or from a file"
+msgstr "debe ser superusuario para usar COPY desde o hacia un archivo"
+
+#: commands/copy.c:746
+msgid ""
+"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
+"for anyone."
+msgstr ""
+"Cualquier usuario puede usar COPY hacia la salida estándar o desde la "
+"entrada estándar. La orden \\copy de psql también puede ser utilizado por "
+"cualquier usuario."
+
+#: commands/copy.c:874
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "el formato de COPY «%s» no es reconocido"
 
-#: commands/copy.c:825 commands/copy.c:839
+#: commands/copy.c:937 commands/copy.c:951
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr ""
 "el argumento de la opción «%s» debe ser una lista de nombres de columna"
 
-#: commands/copy.c:845
+#: commands/copy.c:964
+#, c-format
+msgid "argument to option \"%s\" must be a valid encoding name"
+msgstr ""
+"el argumento de la opción «%s» debe ser un nombre válido de codificación"
+
+#: commands/copy.c:970
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "no se reconoce la opción «%s»"
 
-#: commands/copy.c:856
+#: commands/copy.c:981
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "no se puede especificar DELIMITER en modo BINARY"
 
-#: commands/copy.c:861
+#: commands/copy.c:986
 msgid "cannot specify NULL in BINARY mode"
 msgstr "no se puede especificar NULL en modo BINARY"
 
-#: commands/copy.c:883
+#: commands/copy.c:1008
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "el delimitador de COPY debe ser un solo carácter de un byte"
 
-#: commands/copy.c:890
+#: commands/copy.c:1015
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr ""
 "el delimitador de COPY no puede ser el carácter de nueva línea ni el de "
 "retorno de carro"
 
-#: commands/copy.c:896
+#: commands/copy.c:1021
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr ""
 "la representación de null de COPY no puede usar el carácter de nueva línea "
 "ni el de retorno de carro"
 
-#: commands/copy.c:913
+#: commands/copy.c:1038
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "el delimitador de COPY no puede ser «%s»"
 
-#: commands/copy.c:919
+#: commands/copy.c:1044
 msgid "COPY HEADER available only in CSV mode"
 msgstr "el «header» de COPY está disponible sólo en modo CSV"
 
-#: commands/copy.c:925
+#: commands/copy.c:1050
 msgid "COPY quote available only in CSV mode"
 msgstr "el «quote» de COPY está disponible sólo en modo CSV"
 
-#: commands/copy.c:930
+#: commands/copy.c:1055
 msgid "COPY quote must be a single one-byte character"
 msgstr "la comilla («quote») de COPY debe ser un solo carácter de un byte"
 
-#: commands/copy.c:935
+#: commands/copy.c:1060
 msgid "COPY delimiter and quote must be different"
 msgstr "el delimitador de COPY y la comilla («quote») deben ser diferentes"
 
-#: commands/copy.c:941
+#: commands/copy.c:1066
 msgid "COPY escape available only in CSV mode"
 msgstr "escape de COPY disponible sólo en modo CSV"
 
-#: commands/copy.c:946
+#: commands/copy.c:1071
 msgid "COPY escape must be a single one-byte character"
 msgstr "el escape de COPY debe ser un sólo carácter de un byte"
 
-#: commands/copy.c:952
+#: commands/copy.c:1077
 msgid "COPY force quote available only in CSV mode"
 msgstr "el forzado de comillas de COPY sólo está disponible en modo CSV"
 
-#: commands/copy.c:956
+#: commands/copy.c:1081
 msgid "COPY force quote only available using COPY TO"
 msgstr "el forzado de comillas de COPY sólo está disponible en COPY TO"
 
-#: commands/copy.c:962
+#: commands/copy.c:1087
 msgid "COPY force not null available only in CSV mode"
 msgstr "el forzado de no nulos en COPY sólo está disponible en modo CSV"
 
-#: commands/copy.c:966
+#: commands/copy.c:1091
 msgid "COPY force not null only available using COPY FROM"
 msgstr "el forzado de no nulos en COPY sólo está disponible usando COPY FROM"
 
-#: commands/copy.c:972
+#: commands/copy.c:1097
 msgid "COPY delimiter must not appear in the NULL specification"
 msgstr "el delimitador de COPY no debe aparecer en la especificación NULL"
 
-#: commands/copy.c:979
+#: commands/copy.c:1104
 msgid "CSV quote character must not appear in the NULL specification"
 msgstr ""
 "el carácter de «quote» de CSV no debe aparecer en la especificación NULL"
 
-#: commands/copy.c:985
-msgid "must be superuser to COPY to or from a file"
-msgstr "debe ser superusuario para usar COPY desde o hacia un archivo"
-
-#: commands/copy.c:986
-msgid ""
-"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
-"for anyone."
-msgstr ""
-"Cualquier usuario puede usar COPY hacia la salida estándar o desde la "
-"entrada estándar. La orden \\copy de psql también puede ser utilizado por "
-"cualquier usuario."
-
-#: commands/copy.c:1032
+#: commands/copy.c:1166
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "la tabla «%s» no tiene OIDs"
 
-#: commands/copy.c:1049
+#: commands/copy.c:1183
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS no está soportado"
 
-#: commands/copy.c:1076
+#: commands/copy.c:1210
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) no está soportado"
 
-#: commands/copy.c:1135
+#: commands/copy.c:1270
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
 msgstr "la columna con comillas forzadas «%s» no es referenciada por COPY"
 
-#: commands/copy.c:1157
+#: commands/copy.c:1292
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
 msgstr "la columna FORCE NOT NULL «%s» no fue mencionada en COPY"
 
-#: commands/copy.c:1235
+#: commands/copy.c:1356
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "no se puede copiar desde la vista «%s»"
 
-#: commands/copy.c:1237
+#: commands/copy.c:1358 commands/copy.c:1364
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Intente la forma COPY (SELECT ...) TO."
 
-#: commands/copy.c:1241
+#: commands/copy.c:1362
+#, c-format
+msgid "cannot copy from foreign table \"%s\""
+msgstr "no se puede copiar desde la tabla foránea «%s»"
+
+#: commands/copy.c:1368
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "no se puede copiar desde la secuencia «%s»"
 
-#: commands/copy.c:1246
+#: commands/copy.c:1373
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "no se puede copiar desde la relación «%s» porque no es una tabla"
 
-#: commands/copy.c:1270
+#: commands/copy.c:1397
 msgid "relative path not allowed for COPY to file"
 msgstr "no se permiten rutas relativas para COPY hacia un archivo"
 
-#: commands/copy.c:1279
+#: commands/copy.c:1407
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "no se pudo abrir el archivo «%s» para escritura: %m"
 
-#: commands/copy.c:1286 commands/copy.c:1781
+#: commands/copy.c:1414 commands/copy.c:2200
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» es un directorio"
 
-#: commands/copy.c:1572
+#: commands/copy.c:1738
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, línea %d, columna %s"
 
-#: commands/copy.c:1576 commands/copy.c:1621
+#: commands/copy.c:1742 commands/copy.c:1787
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, línea %d"
 
-#: commands/copy.c:1587
+#: commands/copy.c:1753
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, línea %d, columna %s: «%s»"
 
-#: commands/copy.c:1595
+#: commands/copy.c:1761
 #, c-format
 msgid "COPY %s, line %d, column %s: null input"
 msgstr "COPY %s, línea %d, columna %s: entrada nula"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1773
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, línea %d: «%s»"
 
-#: commands/copy.c:1709
+#: commands/copy.c:1857
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "no se puede copiar hacia la vista «%s»"
 
-#: commands/copy.c:1714
+#: commands/copy.c:1862
+#, c-format
+msgid "cannot copy to foreign table \"%s\""
+msgstr "no se puede copiar hacia la tabla foránea «%s»"
+
+#: commands/copy.c:1867
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "no se puede copiar hacia la secuencia «%s»"
 
-#: commands/copy.c:1719
+#: commands/copy.c:1872
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "no se puede copiar hacia la relación «%s» porque no es una tabla"
 
-#: commands/copy.c:1774 utils/adt/genfile.c:106
+#: commands/copy.c:2193 utils/adt/genfile.c:122
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "no se pudo abrir archivo «%s» para lectura: %m"
 
-#: commands/copy.c:1887
+#: commands/copy.c:2219
 msgid "COPY file signature not recognized"
 msgstr "el identificador del archivo COPY no es reconocido"
 
-#: commands/copy.c:1892
+#: commands/copy.c:2224
 msgid "invalid COPY file header (missing flags)"
 msgstr "el encabezado del archivo COPY no es válido (faltan campos)"
 
-#: commands/copy.c:1898
+#: commands/copy.c:2230
 msgid "unrecognized critical flags in COPY file header"
 msgstr "valores requeridos no reconocidos en encabezado de COPY"
 
-#: commands/copy.c:1904
+#: commands/copy.c:2236
 msgid "invalid COPY file header (missing length)"
 msgstr "el encabezado del archivo COPY no es válido (falta el largo)"
 
-#: commands/copy.c:1911
+#: commands/copy.c:2243
 msgid "invalid COPY file header (wrong length)"
 msgstr "el encabezado del archivo COPY no es válido (largo incorrecto)"
 
-#: commands/copy.c:2002
+#: commands/copy.c:2376 commands/copy.c:3058 commands/copy.c:3275
+msgid "extra data after last expected column"
+msgstr "datos extra después de la última columna esperada"
+
+#: commands/copy.c:2386
 msgid "missing data for OID column"
 msgstr "faltan datos para la columna OID"
 
-#: commands/copy.c:2008
+#: commands/copy.c:2392
 msgid "null OID in COPY data"
 msgstr "OID nulo en datos COPY"
 
-#: commands/copy.c:2018 commands/copy.c:2090
+#: commands/copy.c:2402 commands/copy.c:2501
 msgid "invalid OID in COPY data"
 msgstr "OID no válido en datos COPY"
 
-#: commands/copy.c:2033
+#: commands/copy.c:2417
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "faltan datos en la columna «%s»"
 
-#: commands/copy.c:2074
+#: commands/copy.c:2476
+msgid "received copy data after EOF marker"
+msgstr "se recibieron datos de copy después del marcador EOF"
+
+#: commands/copy.c:2483
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "la cantidad de registros es %d, pero se esperaban %d"
 
-#: commands/copy.c:2217 utils/misc/guc.c:7101 utils/init/miscinit.c:1014
-#, c-format
-msgid "could not read from file \"%s\": %m"
-msgstr "no se pudo leer el archivo «%s»: %m"
-
-#: commands/copy.c:2494 commands/copy.c:2511
+#: commands/copy.c:2822 commands/copy.c:2839
 msgid "literal carriage return found in data"
 msgstr "se encontró un retorno de carro literal en los datos"
 
-#: commands/copy.c:2495 commands/copy.c:2512
+#: commands/copy.c:2823 commands/copy.c:2840
 msgid "unquoted carriage return found in data"
 msgstr "se encontró un retorno de carro fuera de comillas en los datos"
 
-#: commands/copy.c:2497 commands/copy.c:2514
+#: commands/copy.c:2825 commands/copy.c:2842
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Use «\\r» para representar el retorno de carro."
 
-#: commands/copy.c:2498 commands/copy.c:2515
+#: commands/copy.c:2826 commands/copy.c:2843
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Use un campo CSV entre comillas para representar el retorno de carro."
 
-#: commands/copy.c:2527
+#: commands/copy.c:2855
 msgid "literal newline found in data"
 msgstr "se encontró un salto de línea literal en los datos"
 
-#: commands/copy.c:2528
+#: commands/copy.c:2856
 msgid "unquoted newline found in data"
 msgstr "se encontró un salto de línea fuera de comillas en los datos"
 
-#: commands/copy.c:2530
+#: commands/copy.c:2858
 msgid "Use \"\\n\" to represent newline."
 msgstr "Use «\\n» para representar un salto de línea."
 
-#: commands/copy.c:2531
+#: commands/copy.c:2859
 msgid "Use quoted CSV field to represent newline."
 msgstr "Use un campo CSV entre comillas para representar un salto de línea."
 
-#: commands/copy.c:2577 commands/copy.c:2613
+#: commands/copy.c:2905 commands/copy.c:2941
 msgid "end-of-copy marker does not match previous newline style"
 msgstr ""
 "el marcador fin-de-copy no coincide con el estilo previo de salto de línea"
 
-#: commands/copy.c:2586 commands/copy.c:2602
+#: commands/copy.c:2914 commands/copy.c:2930
 msgid "end-of-copy marker corrupt"
 msgstr "marcador fin-de-copy corrupto"
 
-#: commands/copy.c:2729 commands/copy.c:2764 commands/copy.c:2944
-#: commands/copy.c:2979
-msgid "extra data after last expected column"
-msgstr "datos extra después de la última columna esperada"
-
-#: commands/copy.c:3026
+#: commands/copy.c:3359
 msgid "unterminated CSV quoted field"
 msgstr "un valor entre comillas está inconcluso"
 
-#: commands/copy.c:3103 commands/copy.c:3122
+#: commands/copy.c:3436 commands/copy.c:3455
 msgid "unexpected EOF in COPY data"
 msgstr "EOF inesperado en datos de COPY"
 
-#: commands/copy.c:3112
+#: commands/copy.c:3445
 msgid "invalid field size"
 msgstr "el tamaño de campo no es válido"
 
-#: commands/copy.c:3135
+#: commands/copy.c:3468
 msgid "incorrect binary data format"
 msgstr "el formato de datos binarios es incorrecto"
 
-#: commands/copy.c:3446 commands/indexcmds.c:908 commands/tablecmds.c:1260
-#: commands/tablecmds.c:2065 parser/parse_expr.c:758
-#: utils/adt/tsvector_op.c:1347
+#: commands/copy.c:3779 commands/indexcmds.c:846 commands/tablecmds.c:1293
+#: commands/tablecmds.c:2148 parser/parse_expr.c:764
+#: utils/adt/tsvector_op.c:1417
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "no existe la columna «%s»"
 
-#: commands/copy.c:3453 commands/tablecmds.c:1286 commands/trigger.c:536
-#: parser/parse_target.c:824 parser/parse_target.c:835
+#: commands/copy.c:3786 commands/tablecmds.c:1319 commands/trigger.c:594
+#: parser/parse_target.c:911 parser/parse_target.c:922
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "la columna «%s» fue especificada más de una vez"
@@ -4732,8 +4526,8 @@ msgstr "%d no es un código válido de codificación"
 msgid "%s is not a valid encoding name"
 msgstr "%s no es un nombre válido de codificación"
 
-#: commands/dbcommands.c:253 commands/dbcommands.c:1347 commands/user.c:255
-#: commands/user.c:562
+#: commands/dbcommands.c:253 commands/dbcommands.c:1347 commands/user.c:267
+#: commands/user.c:606
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "límite de conexión no válido: %d"
@@ -4762,22 +4556,7 @@ msgstr "la codificación de servidor %d no es válida"
 msgid "invalid locale name %s"
 msgstr "el nombre de configuración regional «%s» no es válido"
 
-#: commands/dbcommands.c:369 commands/dbcommands.c:384
-#, c-format
-msgid "encoding %s does not match locale %s"
-msgstr "la codificación %s no coincide con la configuración regional %s"
-
-#: commands/dbcommands.c:372
-#, c-format
-msgid "The chosen LC_CTYPE setting requires encoding %s."
-msgstr "La configuración regional LC_CTYPE requiere la codificación %s."
-
-#: commands/dbcommands.c:387
-#, c-format
-msgid "The chosen LC_COLLATE setting requires encoding %s."
-msgstr "La configuración regional LC_COLLATE requiere la codificación %s."
-
-#: commands/dbcommands.c:405
+#: commands/dbcommands.c:352
 #, c-format
 msgid ""
 "new encoding (%s) is incompatible with the encoding of the template database "
@@ -4786,7 +4565,7 @@ msgstr ""
 "la nueva codificación (%s) es incompatible con la codificación de la base de "
 "datos patrón (%s)"
 
-#: commands/dbcommands.c:408
+#: commands/dbcommands.c:355
 msgid ""
 "Use the same encoding as in the template database, or use template0 as "
 "template."
@@ -4794,7 +4573,7 @@ msgstr ""
 "Use la misma codificación que en la base de datos patrón, o bien use "
 "template0 como patrón."
 
-#: commands/dbcommands.c:413
+#: commands/dbcommands.c:360
 #, c-format
 msgid ""
 "new collation (%s) is incompatible with the collation of the template "
@@ -4803,7 +4582,7 @@ msgstr ""
 "la nueva «collation» (%s) es incompatible con la «collation» de la base de "
 "datos patrón (%s)"
 
-#: commands/dbcommands.c:415
+#: commands/dbcommands.c:362
 msgid ""
 "Use the same collation as in the template database, or use template0 as "
 "template."
@@ -4811,7 +4590,7 @@ msgstr ""
 "Use la misma «collation» que en la base de datos patrón, o bien use "
 "template0 como patrón."
 
-#: commands/dbcommands.c:420
+#: commands/dbcommands.c:367
 #, c-format
 msgid ""
 "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
@@ -4820,7 +4599,7 @@ msgstr ""
 "el nuevo LC_CTYPE (%s) es incompatible con el LC_CTYPE de la base de datos "
 "patrón (%s)"
 
-#: commands/dbcommands.c:422
+#: commands/dbcommands.c:369
 msgid ""
 "Use the same LC_CTYPE as in the template database, or use template0 as "
 "template."
@@ -4828,16 +4607,16 @@ msgstr ""
 "Use el mismo LC_CTYPE que en la base de datos patrón, o bien use template0 "
 "como patrón."
 
-#: commands/dbcommands.c:449 commands/dbcommands.c:1054
+#: commands/dbcommands.c:391 commands/dbcommands.c:1054
 msgid "pg_global cannot be used as default tablespace"
 msgstr "no puede usarse pg_global como tablespace por omisión"
 
-#: commands/dbcommands.c:475
+#: commands/dbcommands.c:417
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "no se puede asignar el nuevo tablespace por omisión «%s»"
 
-#: commands/dbcommands.c:477
+#: commands/dbcommands.c:419
 #, c-format
 msgid ""
 "There is a conflict because database \"%s\" already has some tables in this "
@@ -4846,45 +4625,60 @@ msgstr ""
 "Hay un conflicto puesto que la base de datos «%s» ya tiene algunas tablas en "
 "este tablespace."
 
-#: commands/dbcommands.c:497 commands/dbcommands.c:925
+#: commands/dbcommands.c:439 commands/dbcommands.c:929
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "la base de datos «%s» ya existe"
 
-#: commands/dbcommands.c:511
+#: commands/dbcommands.c:453
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr ""
 "la base de datos de origen «%s» está siendo utilizada por otros usuarios"
 
-#: commands/dbcommands.c:767
+#: commands/dbcommands.c:695 commands/dbcommands.c:710
+#, c-format
+msgid "encoding %s does not match locale %s"
+msgstr "la codificación %s no coincide con la configuración regional %s"
+
+#: commands/dbcommands.c:698
+#, c-format
+msgid "The chosen LC_CTYPE setting requires encoding %s."
+msgstr "La configuración regional LC_CTYPE requiere la codificación %s."
+
+#: commands/dbcommands.c:713
+#, c-format
+msgid "The chosen LC_COLLATE setting requires encoding %s."
+msgstr "La configuración regional LC_COLLATE requiere la codificación %s."
+
+#: commands/dbcommands.c:771
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "no existe la base de datos «%s», ignorando"
 
-#: commands/dbcommands.c:788
+#: commands/dbcommands.c:792
 msgid "cannot drop a template database"
 msgstr "no se puede borrar una base de datos patrón"
 
-#: commands/dbcommands.c:794
+#: commands/dbcommands.c:798
 msgid "cannot drop the currently open database"
 msgstr "no se puede eliminar la base de datos activa"
 
-#: commands/dbcommands.c:805 commands/dbcommands.c:947
+#: commands/dbcommands.c:809 commands/dbcommands.c:951
 #: commands/dbcommands.c:1076
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "la base de datos «%s» está siendo utilizada por otros usuarios"
 
-#: commands/dbcommands.c:916
+#: commands/dbcommands.c:920
 msgid "permission denied to rename database"
 msgstr "se ha denegado el permiso para cambiar el nombre a la base de datos"
 
-#: commands/dbcommands.c:936
+#: commands/dbcommands.c:940
 msgid "current database cannot be renamed"
 msgstr "no se puede cambiar el nombre de la base de datos activa"
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1032
 msgid "cannot change the tablespace of the currently open database"
 msgstr "no se puede cambiar el tablespace de la base de datos activa"
 
@@ -4902,18 +4696,18 @@ msgstr ""
 "Debe moverlas de vuelta al tablespace por omisión de la base de datos antes "
 "de ejecutar esta orden."
 
-#: commands/dbcommands.c:1246 commands/dbcommands.c:1719
-#: commands/dbcommands.c:1913 commands/dbcommands.c:1961
-#: commands/tablespace.c:579
+#: commands/dbcommands.c:1246 commands/dbcommands.c:1714
+#: commands/dbcommands.c:1915 commands/dbcommands.c:1963
+#: commands/tablespace.c:584
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr "algunos archivos inútiles pueden haber quedado en el directorio \"%s\""
 
-#: commands/dbcommands.c:1495
+#: commands/dbcommands.c:1490
 msgid "permission denied to change owner of database"
 msgstr "se ha denegado el permiso para cambiar el dueño de la base de datos"
 
-#: commands/dbcommands.c:1807
+#: commands/dbcommands.c:1802
 #, c-format
 msgid ""
 "There are %d other session(s) and %d prepared transaction(s) using the "
@@ -4921,12 +4715,12 @@ msgid ""
 msgstr ""
 "Hay otras %d sesiones y %d transacciones preparadas usando la base de datos."
 
-#: commands/dbcommands.c:1810
+#: commands/dbcommands.c:1805
 #, c-format
 msgid "There are %d other session(s) using the database."
 msgstr "Hay otras %d sesiones usando la base de datos."
 
-#: commands/dbcommands.c:1813
+#: commands/dbcommands.c:1808
 #, c-format
 msgid "There are %d prepared transaction(s) using the database."
 msgstr "Hay otras %d transacciones preparadas usando la base de datos."
@@ -4968,84 +4762,97 @@ msgstr "%s requiere valor entero"
 msgid "invalid argument for %s: \"%s\""
 msgstr "argumento no válido para %s: «%s»"
 
-#: commands/explain.c:149
+#: commands/explain.c:153
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
 msgstr "valor no reconocido para la opción de EXPLAIN «%s»: «%s»"
 
-#: commands/explain.c:155
+#: commands/explain.c:159
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "opción de EXPLAIN no reconocida «%s»"
 
-#: commands/explain.c:162
+#: commands/explain.c:166
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "la opción BUFFERS de EXPLAIN requiere ANALYZE"
 
-#: commands/foreigncmds.c:132 commands/foreigncmds.c:141
+#: commands/foreigncmds.c:135 commands/foreigncmds.c:144
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "opción «%s» no encontrada"
 
-#: commands/foreigncmds.c:151
+#: commands/foreigncmds.c:154
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "la opción «%s» fue especificada más de una vez"
 
-#: commands/foreigncmds.c:209 commands/foreigncmds.c:217
+#: commands/foreigncmds.c:224 commands/foreigncmds.c:232
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr ""
 "se ha denegado el permiso para cambiar el dueño del conector de datos "
 "externos «%s»"
 
-#: commands/foreigncmds.c:211
+#: commands/foreigncmds.c:226
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr ""
 "Debe ser superusuario para cambiar el dueño de un conector de datos externos."
 
-#: commands/foreigncmds.c:219
+#: commands/foreigncmds.c:234
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "El dueño de un conector de datos externos debe ser un superusuario."
 
-#: commands/foreigncmds.c:228 commands/foreigncmds.c:452
-#: commands/foreigncmds.c:553 foreign/foreign.c:90
+#: commands/foreigncmds.c:241 commands/foreigncmds.c:564
+#: commands/foreigncmds.c:712 foreign/foreign.c:524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "no existe el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:270 commands/foreigncmds.c:723
-#: commands/foreigncmds.c:813 commands/foreigncmds.c:1089
-#: foreign/foreign.c:179
+#: commands/foreigncmds.c:284 commands/foreigncmds.c:890
+#: commands/foreigncmds.c:978 commands/foreigncmds.c:1262
+#: foreign/foreign.c:544
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "no existe el servidor «%s»"
 
-#: commands/foreigncmds.c:347
+#: commands/foreigncmds.c:346
+#, c-format
+msgid "function %s must return type \"fdw_handler\""
+msgstr "la función %s debe retornar tipo «fdw_handler»"
+
+#: commands/foreigncmds.c:441
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr ""
 "se ha denegado el permiso para crear el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:349
+#: commands/foreigncmds.c:443
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Debe ser superusuario para crear un conector de datos externos."
 
-#: commands/foreigncmds.c:360
+#: commands/foreigncmds.c:454
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "el conector de datos externos «%s» ya existe"
 
-#: commands/foreigncmds.c:442
+#: commands/foreigncmds.c:554
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "permiso denegado para cambiar el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:444
+#: commands/foreigncmds.c:556
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Debe ser superusuario para alterar un conector de datos externos."
 
-#: commands/foreigncmds.c:472
+#: commands/foreigncmds.c:587
+msgid ""
+"changing the foreign-data wrapper handler can change behavior of existing "
+"foreign tables"
+msgstr ""
+"al cambiar el manejador del conector de datos externos, el comportamiento de "
+"las tablas foráneas existentes puede cambiar"
+
+#: commands/foreigncmds.c:601
 msgid ""
 "changing the foreign-data wrapper validator can cause the options for "
 "dependent objects to become invalid"
@@ -5053,236 +4860,242 @@ msgstr ""
 "al cambiar el validador del conector de datos externos, las opciones para "
 "los objetos dependientes de él pueden volverse no válidas"
 
-#: commands/foreigncmds.c:544
+#: commands/foreigncmds.c:703
 #, c-format
 msgid "permission denied to drop foreign-data wrapper \"%s\""
 msgstr ""
 "se ha denegado el permiso para eliminar el conector de datos externos «%s»"
 
-#: commands/foreigncmds.c:546
+#: commands/foreigncmds.c:705
 msgid "Must be superuser to drop a foreign-data wrapper."
 msgstr "Debe ser superusuario para eliminar un conector de datos externos."
 
-#: commands/foreigncmds.c:558
+#: commands/foreigncmds.c:717
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "no existe el conector de datos externos «%s», ignorando"
 
-#: commands/foreigncmds.c:625
+#: commands/foreigncmds.c:786
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "el servidor «%s» ya existe"
 
-#: commands/foreigncmds.c:817
+#: commands/foreigncmds.c:982
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "el servidor «%s» no existe, ignorando"
 
-#: commands/foreigncmds.c:920
+#: commands/foreigncmds.c:1087
 #, c-format
 msgid "user mapping \"%s\" already exists for server %s"
 msgstr "ya existe un mapeo para el usuario «%s» en el servidor %s"
 
-#: commands/foreigncmds.c:998 commands/foreigncmds.c:1105
+#: commands/foreigncmds.c:1173 commands/foreigncmds.c:1278
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server"
 msgstr "no existe el mapeo para el usuario «%s» para el servidor"
 
-#: commands/foreigncmds.c:1092
+#: commands/foreigncmds.c:1265
 msgid "server does not exist, skipping"
 msgstr "el servidor no existe, ignorando"
 
-#: commands/foreigncmds.c:1110
+#: commands/foreigncmds.c:1283
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server, skipping"
 msgstr "el mapeo para el usuario «%s» no existe para el servidor, ignorando"
 
-#: commands/functioncmds.c:98
+#: commands/functioncmds.c:100
 #, c-format
 msgid "SQL function cannot return shell type %s"
 msgstr "una función SQL no puede retornar el tipo inconcluso %s"
 
-#: commands/functioncmds.c:103
+#: commands/functioncmds.c:105
 #, c-format
 msgid "return type %s is only a shell"
 msgstr "el tipo de retorno %s está inconcluso"
 
-#: commands/functioncmds.c:126 commands/tablecmds.c:216
-#: commands/typecmds.c:650 commands/typecmds.c:2572 parser/parse_func.c:1485
+#: commands/functioncmds.c:128 commands/tablecmds.c:224
+#: commands/typecmds.c:660 commands/typecmds.c:2661 parser/parse_func.c:1502
 #: parser/parse_type.c:196 utils/adt/regproc.c:973
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "no existe el tipo «%s»"
 
-#: commands/functioncmds.c:132 parser/parse_type.c:261
+#: commands/functioncmds.c:134 parser/parse_type.c:278
 #, c-format
 msgid "type modifier cannot be specified for shell type \"%s\""
 msgstr ""
 "no se puede especificar un modificador de tipo para el tipo inconcluso «%s»"
 
-#: commands/functioncmds.c:138
+#: commands/functioncmds.c:140
 #, c-format
 msgid "type \"%s\" is not yet defined"
 msgstr "el tipo «%s» no ha sido definido aún"
 
-#: commands/functioncmds.c:139
+#: commands/functioncmds.c:141
 msgid "Creating a shell type definition."
 msgstr "Creando una definición de tipo inconclusa."
 
-#: commands/functioncmds.c:218
+#: commands/functioncmds.c:220
 #, c-format
 msgid "SQL function cannot accept shell type %s"
 msgstr "las funciones SQL no pueden aceptar el tipo inconcluso %s"
 
-#: commands/functioncmds.c:223
+#: commands/functioncmds.c:225
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "el tipo de argumento %s está inconcluso"
 
-#: commands/functioncmds.c:233
+#: commands/functioncmds.c:235
 #, c-format
 msgid "type %s does not exist"
 msgstr "no existe el tipo %s"
 
-#: commands/functioncmds.c:241
+#: commands/functioncmds.c:243
 msgid "functions cannot accept set arguments"
 msgstr "funciones no pueden aceptar argumentos de conjunto"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:252
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "el parámetro VARIADIC debe ser el último parámetro de entrada"
 
-#: commands/functioncmds.c:277
+#: commands/functioncmds.c:279
 msgid "VARIADIC parameter must be an array"
 msgstr "el parámetro VARIADIC debe ser un array"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:319
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "el nombre de parámetro «%s» fue usado más de una vez"
 
-#: commands/functioncmds.c:332
+#: commands/functioncmds.c:334
 msgid "only input parameters can have default values"
 msgstr "solo los parámetros de entrada pueden tener valores por omisión"
 
-#: commands/functioncmds.c:344
+#: commands/functioncmds.c:347
 msgid "cannot use table references in parameter default value"
 msgstr ""
 "no se pueden usar referencias a tablas en el valor por omisión de un "
 "parámetro"
 
-#: commands/functioncmds.c:360
+#: commands/functioncmds.c:363
 msgid "cannot use subquery in parameter default value"
 msgstr ""
 "no se puede usar una subconsulta en el valor por omisión de un parámetro"
 
-#: commands/functioncmds.c:364
+#: commands/functioncmds.c:367
 msgid "cannot use aggregate function in parameter default value"
 msgstr ""
 "no se puede usar una función de agregación en el valor por omisión de un "
 "parámetro"
 
-#: commands/functioncmds.c:368
+#: commands/functioncmds.c:371
 msgid "cannot use window function in parameter default value"
 msgstr ""
 "no se puede usar una función de ventana deslizante en el valor por omisión "
 "de un parámetro"
 
-#: commands/functioncmds.c:378
+#: commands/functioncmds.c:381
 msgid "input parameters after one with a default value must also have defaults"
 msgstr ""
 "los parámetros de entrada después de uno que tenga valor por omisión también "
 "deben tener valores por omisión"
 
-#: commands/functioncmds.c:617
+#: commands/functioncmds.c:620
 msgid "no function body specified"
 msgstr "no se ha especificado un cuerpo para la función"
 
-#: commands/functioncmds.c:627
+#: commands/functioncmds.c:630
 msgid "no language specified"
 msgstr "no se ha especificado el lenguaje"
 
-#: commands/functioncmds.c:648 commands/functioncmds.c:1349
+#: commands/functioncmds.c:651 commands/functioncmds.c:1352
 msgid "COST must be positive"
 msgstr "COST debe ser positivo"
 
-#: commands/functioncmds.c:656 commands/functioncmds.c:1357
+#: commands/functioncmds.c:659 commands/functioncmds.c:1360
 msgid "ROWS must be positive"
 msgstr "ROWS debe ser positivo"
 
-#: commands/functioncmds.c:695
+#: commands/functioncmds.c:698
 #, c-format
 msgid "unrecognized function attribute \"%s\" ignored"
 msgstr "se ignoró el atributo de función no reconocido «%s»"
 
-#: commands/functioncmds.c:746
+#: commands/functioncmds.c:749
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "sólo se requiere un item AS para el lenguaje «%s»"
 
-#: commands/functioncmds.c:838 commands/functioncmds.c:1992
-msgid "Use CREATE LANGUAGE to load the language into the database."
-msgstr "Usar CREATE LANGUAGE para instalar el lenguaje en la base de datos."
+#: commands/functioncmds.c:839 commands/functioncmds.c:2019
+#: commands/proclang.c:600 commands/proclang.c:640 commands/proclang.c:754
+#, c-format
+msgid "language \"%s\" does not exist"
+msgstr "no existe el lenguaje «%s»"
+
+#: commands/functioncmds.c:841 commands/functioncmds.c:2021
+msgid "Use CREATE LANGUAGE to load the language into the database."
+msgstr "Usar CREATE LANGUAGE para instalar el lenguaje en la base de datos."
 
-#: commands/functioncmds.c:885
+#: commands/functioncmds.c:888
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "tipo de retorno de función debe ser %s debido a los parámetros OUT"
 
-#: commands/functioncmds.c:898
+#: commands/functioncmds.c:901
 msgid "function result type must be specified"
 msgstr "el tipo de retorno de la función debe ser especificado"
 
-#: commands/functioncmds.c:933 commands/functioncmds.c:1361
+#: commands/functioncmds.c:936 commands/functioncmds.c:1364
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "ROWS no es aplicable cuando una función no retorna un conjunto"
 
-#: commands/functioncmds.c:985
+#: commands/functioncmds.c:988
 #, c-format
 msgid "function %s(%s) does not exist, skipping"
 msgstr "no existe la función %s(%s), ignorando"
 
-#: commands/functioncmds.c:1005 commands/functioncmds.c:1105
-#: commands/functioncmds.c:1168 commands/functioncmds.c:1319
-#: utils/adt/ruleutils.c:1635
+#: commands/functioncmds.c:1008 commands/functioncmds.c:1108
+#: commands/functioncmds.c:1171 commands/functioncmds.c:1322
+#: utils/adt/ruleutils.c:1696
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "«%s» es una función de agregación"
 
-#: commands/functioncmds.c:1007
+#: commands/functioncmds.c:1010
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Use DROP AGGREGATE para eliminar funciones de agregación."
 
-#: commands/functioncmds.c:1014
+#: commands/functioncmds.c:1017
 #, c-format
 msgid "removing built-in function \"%s\""
 msgstr "eliminando la función interna «%s»"
 
-#: commands/functioncmds.c:1107
+#: commands/functioncmds.c:1110
 msgid "Use ALTER AGGREGATE to rename aggregate functions."
 msgstr ""
 "Use ALTER AGGREGATE para cambiar el nombre a las funciones de agregación."
 
-#: commands/functioncmds.c:1170
+#: commands/functioncmds.c:1173
 msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
 msgstr ""
 "Use ALTER AGGREGATE para cambiar el dueño a las funciones de agregación."
 
-#: commands/functioncmds.c:1508
+#: commands/functioncmds.c:1512
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "el tipo de origen %s es un pseudotipo"
 
-#: commands/functioncmds.c:1514
+#: commands/functioncmds.c:1518
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "el tipo de retorno %s es un pseudotipo"
 
-#: commands/functioncmds.c:1551
+#: commands/functioncmds.c:1555
 msgid "cast function must take one to three arguments"
 msgstr "la función de conversión lleva de uno a tres argumentos"
 
-#: commands/functioncmds.c:1555
+#: commands/functioncmds.c:1559
 msgid ""
 "argument of cast function must match or be binary-coercible from source data "
 "type"
@@ -5290,16 +5103,16 @@ msgstr ""
 "el argumento de la función de conversión debe coincidir o ser binario-"
 "convertible con el tipo de origen"
 
-#: commands/functioncmds.c:1559
+#: commands/functioncmds.c:1563
 msgid "second argument of cast function must be type integer"
 msgstr "el segundo argumento de la función de conversión debe ser entero"
 
-#: commands/functioncmds.c:1563
+#: commands/functioncmds.c:1567
 msgid "third argument of cast function must be type boolean"
 msgstr ""
 "el tercer argumento de la función de conversión debe ser de tipo boolean"
 
-#: commands/functioncmds.c:1567
+#: commands/functioncmds.c:1571
 msgid ""
 "return data type of cast function must match or be binary-coercible to "
 "target data type"
@@ -5307,188 +5120,194 @@ msgstr ""
 "el tipo de salida de la función de conversión debe coincidir o ser binario-"
 "convertible con el tipo de retorno"
 
-#: commands/functioncmds.c:1578
+#: commands/functioncmds.c:1582
 msgid "cast function must not be volatile"
 msgstr "la función de conversión no debe ser volatile"
 
-#: commands/functioncmds.c:1583
+#: commands/functioncmds.c:1587
 msgid "cast function must not be an aggregate function"
 msgstr "la función de conversión no debe ser una función de agregación"
 
-#: commands/functioncmds.c:1587
+#: commands/functioncmds.c:1591
 msgid "cast function must not be a window function"
 msgstr "la función de conversión no debe ser una función de ventana deslizante"
 
-#: commands/functioncmds.c:1591
+#: commands/functioncmds.c:1595
 msgid "cast function must not return a set"
 msgstr "la función de conversión no debe retornar un conjunto"
 
-#: commands/functioncmds.c:1617
+#: commands/functioncmds.c:1621
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr ""
 "debe ser superusuario para crear una conversión sin especificar función"
 
-#: commands/functioncmds.c:1632
+#: commands/functioncmds.c:1636
 msgid "source and target data types are not physically compatible"
 msgstr "los tipos de datos de origen y destino no son físicamente compatibles"
 
-#: commands/functioncmds.c:1647
+#: commands/functioncmds.c:1651
 msgid "composite data types are not binary-compatible"
 msgstr "los tipos de datos compuestos no son binario-compatibles"
 
-#: commands/functioncmds.c:1653
+#: commands/functioncmds.c:1657
 msgid "enum data types are not binary-compatible"
 msgstr "los tipos de datos enum no son binario-compatibles"
 
-#: commands/functioncmds.c:1659
+#: commands/functioncmds.c:1663
 msgid "array data types are not binary-compatible"
 msgstr "los tipos de datos de array no son binario-compatibles"
 
-#: commands/functioncmds.c:1669
+#: commands/functioncmds.c:1680
+msgid "domain data types must not be marked binary-compatible"
+msgstr "los tipos de dato de dominio no deben ser marcados binario-compatibles"
+
+#: commands/functioncmds.c:1690
 msgid "source data type and target data type are the same"
 msgstr "el tipo de origen y el tipo de retorno son el mismo"
 
-#: commands/functioncmds.c:1702
+#: commands/functioncmds.c:1723
 #, c-format
 msgid "cast from type %s to type %s already exists"
 msgstr "ya existe una conversión del tipo %s al tipo %s"
 
-#: commands/functioncmds.c:1782
+#: commands/functioncmds.c:1803
 #, c-format
 msgid "cast from type %s to type %s does not exist, skipping"
 msgstr "no existe la conversión del tipo %s al tipo %s, ignorando"
 
-#: commands/functioncmds.c:1879
+#: commands/functioncmds.c:1841
 #, c-format
-msgid "function \"%s\" is already in schema \"%s\""
-msgstr "la función «%s» ya está en el esquema «%s»"
-
-#: commands/functioncmds.c:1887 commands/tablecmds.c:7879
-#: commands/typecmds.c:2794
-msgid "cannot move objects into or out of temporary schemas"
-msgstr "no se puede mover objetos hacia o desde esquemas temporales"
-
-#: commands/functioncmds.c:1893 commands/tablecmds.c:7885
-#: commands/typecmds.c:2800
-msgid "cannot move objects into or out of TOAST schema"
-msgstr "no se puede mover objetos hacia o desde el esquema TOAST"
+msgid "cast from type %s to type %s does not exist"
+msgstr "no existe la conversión del tipo %s al tipo %s"
 
-#: commands/functioncmds.c:1902
+#: commands/functioncmds.c:1929
 #, c-format
 msgid "function \"%s\" already exists in schema \"%s\""
 msgstr "ya existe una función llamada %s en el esquema «%s»"
 
-#: commands/functioncmds.c:1974
+#: commands/functioncmds.c:2003
 msgid "no inline code specified"
 msgstr "no se ha especificado código"
 
-#: commands/functioncmds.c:2022
+#: commands/functioncmds.c:2051
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "el lenguaje «%s» no soporta ejecución de código en línea"
 
-#: commands/indexcmds.c:162
+#: commands/indexcmds.c:163
 msgid "must specify at least one column"
 msgstr "debe especificar al menos una columna"
 
-#: commands/indexcmds.c:166
+#: commands/indexcmds.c:167
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "no se puede usar más de %d columnas en un índice"
 
-#: commands/indexcmds.c:196
+#: commands/indexcmds.c:195
+#, c-format
+msgid "cannot create index on foreign table \"%s\""
+msgstr "no se puede crear un índice en la tabla foránea «%s»"
+
+#: commands/indexcmds.c:210
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "no se pueden crear índices en tablas temporales de otras sesiones"
 
-#: commands/indexcmds.c:256 commands/tablecmds.c:455 commands/tablecmds.c:6995
+#: commands/indexcmds.c:265 commands/tablecmds.c:479 commands/tablecmds.c:7882
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr ""
 "sólo relaciones compartidas pueden ser puestas en el tablespace pg_global"
 
-#: commands/indexcmds.c:287
+#: commands/indexcmds.c:296
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "sustituyendo el método de acceso obsoleto «rtree» por «gist»"
 
-#: commands/indexcmds.c:304
+#: commands/indexcmds.c:304 commands/opclasscmds.c:369
+#: commands/opclasscmds.c:790 commands/opclasscmds.c:2203
+#, c-format
+msgid "access method \"%s\" does not exist"
+msgstr "no existe el método de acceso «%s»"
+
+#: commands/indexcmds.c:313
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "el método de acceso «%s» no soporta índices únicos"
 
-#: commands/indexcmds.c:309
+#: commands/indexcmds.c:318
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "el método de acceso «%s» no soporta índices multicolumna"
 
-#: commands/indexcmds.c:314
+#: commands/indexcmds.c:323
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "el método de acceso «%s» no soporta restricciones por exclusión"
 
-#: commands/indexcmds.c:347 parser/parse_utilcmd.c:1212
-#: parser/parse_utilcmd.c:1298
-#, c-format
-msgid "multiple primary keys for table \"%s\" are not allowed"
-msgstr "no se permiten múltiples llaves primarias para la tabla «%s»"
-
-#: commands/indexcmds.c:364
-msgid "primary keys cannot be expressions"
-msgstr "las llaves primarias no pueden ser expresiones"
-
-#: commands/indexcmds.c:394 commands/indexcmds.c:903
-#: parser/parse_utilcmd.c:1445
-#, c-format
-msgid "column \"%s\" named in key does not exist"
-msgstr "no existe la columna «%s» en la llave"
-
-#: commands/indexcmds.c:468
+#: commands/indexcmds.c:399
 #, c-format
 msgid "%s %s will create implicit index \"%s\" for table \"%s\""
 msgstr "%s %s creará el índice implícito «%s» para la tabla «%s»"
 
-#: commands/indexcmds.c:827
+#: commands/indexcmds.c:763
 msgid "cannot use subquery in index predicate"
 msgstr "no se puede usar una subconsulta en un predicado de índice"
 
-#: commands/indexcmds.c:831
+#: commands/indexcmds.c:767
 msgid "cannot use aggregate in index predicate"
 msgstr "no se puede usar una función de agregación en un predicado de índice"
 
-#: commands/indexcmds.c:840
+#: commands/indexcmds.c:776
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr ""
 "las funciones utilizadas en predicados de índice deben estar marcadas "
 "IMMUTABLE"
 
-#: commands/indexcmds.c:942
+#: commands/indexcmds.c:841 parser/parse_utilcmd.c:1704
+#, c-format
+msgid "column \"%s\" named in key does not exist"
+msgstr "no existe la columna «%s» en la llave"
+
+#: commands/indexcmds.c:894
 msgid "cannot use subquery in index expression"
 msgstr "no se puede usar una subconsulta en una expresión de índice"
 
-#: commands/indexcmds.c:946
+#: commands/indexcmds.c:898
 msgid "cannot use aggregate function in index expression"
 msgstr "no se puede usar una función de agregación en una expresión de índice"
 
-#: commands/indexcmds.c:956
+#: commands/indexcmds.c:909
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr ""
 "las funciones utilizadas en expresiones de índice deben estar marcadas "
 "IMMUTABLE"
 
-#: commands/indexcmds.c:991
+#: commands/indexcmds.c:930
+msgid "could not determine which collation to use for index expression"
+msgstr ""
+"no se pudo determinar qué ordenamiento (collation) usar para la expresión de "
+"índice"
+
+#: commands/indexcmds.c:938 commands/typecmds.c:843 parser/parse_expr.c:2140
+#: parser/parse_type.c:492 parser/parse_utilcmd.c:2556
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "los ordenamientos (collation) no están soportados por el tipo %s"
+
+#: commands/indexcmds.c:976
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "el operador %s no es conmutativo"
 
-#: commands/indexcmds.c:993
+#: commands/indexcmds.c:978
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr ""
 "Sólo operadores conmutativos pueden ser usados en restricciones de exclusión."
 
-#: commands/indexcmds.c:1019
+#: commands/indexcmds.c:1004
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "el operador %s no es un miembro de la familia de operadores «%s»"
 
-#: commands/indexcmds.c:1022
+#: commands/indexcmds.c:1007
 msgid ""
 "The exclusion operator must be related to the index operator class for the "
 "constraint."
@@ -5496,24 +5315,24 @@ msgstr ""
 "El operador de exclusión debe estar relacionado con la clase de operadores "
 "del índice para la restricción."
 
-#: commands/indexcmds.c:1057
+#: commands/indexcmds.c:1042
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "el método de acceso «%s» no soporta las opciones ASC/DESC"
 
-#: commands/indexcmds.c:1062
+#: commands/indexcmds.c:1047
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "el método de acceso «%s» no soporta las opciones NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:1118
+#: commands/indexcmds.c:1103
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
 "el tipo de dato %s no tiene una clase de operadores por omisión para el "
 "método de acceso «%s»"
 
-#: commands/indexcmds.c:1120
+#: commands/indexcmds.c:1105
 msgid ""
 "You must specify an operator class for the index or define a default "
 "operator class for the data type."
@@ -5521,27 +5340,33 @@ msgstr ""
 "Debe especificar una clase de operadores para el índice, o definir una clase "
 "de operadores por omisión para el tipo de datos."
 
-#: commands/indexcmds.c:1170
+#: commands/indexcmds.c:1134 commands/indexcmds.c:1142
+#: commands/opclasscmds.c:212 commands/opclasscmds.c:1568
+#, c-format
+msgid "operator class \"%s\" does not exist for access method \"%s\""
+msgstr "no existe la clase de operadores «%s» para el método de acceso «%s»"
+
+#: commands/indexcmds.c:1155
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "la clase de operadores «%s» no acepta el tipo de datos %s"
 
-#: commands/indexcmds.c:1260
+#: commands/indexcmds.c:1245
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr ""
 "hay múltiples clases de operadores por omisión para el tipo de datos %s"
 
-#: commands/indexcmds.c:1639
+#: commands/indexcmds.c:1586
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "la tabla «%s» no tiene índices"
 
-#: commands/indexcmds.c:1667
+#: commands/indexcmds.c:1614
 msgid "can only reindex the currently open database"
 msgstr "sólo se puede reindexar la base de datos actualmente abierta"
 
-#: commands/indexcmds.c:1752
+#: commands/indexcmds.c:1699
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "la tabla «%s.%s» fue reindexada"
@@ -5549,39 +5374,46 @@ msgstr "la tabla «%s.%s» fue reindexada"
 #: commands/lockcmds.c:93
 #, c-format
 msgid "could not obtain lock on relation \"%s\""
-msgstr "no se pudo obtener un bloqueo en la relación «%s»"
+msgstr "no se pudo bloquear un candado en la relación «%s»"
 
 #: commands/lockcmds.c:98
 #, c-format
 msgid "could not obtain lock on relation with OID %u"
-msgstr "no se pudo obtener un bloqueo en la relación con OID %u"
+msgstr "no se pudo bloquear un candado en la relación con OID %u"
 
-#: commands/opclasscmds.c:190 commands/opclasscmds.c:701
+#: commands/opclasscmds.c:136 commands/opclasscmds.c:1619
+#: commands/opclasscmds.c:1839 commands/opclasscmds.c:1850
+#: commands/opclasscmds.c:2084 commands/opclasscmds.c:2095
+#, c-format
+msgid "operator family \"%s\" does not exist for access method \"%s\""
+msgstr "no existe la familia de operadores «%s» para el método de acceso «%s»"
+
+#: commands/opclasscmds.c:271
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists"
 msgstr "ya exista una familia de operadores «%s» para el método de acceso «%s»"
 
-#: commands/opclasscmds.c:320
+#: commands/opclasscmds.c:408
 msgid "must be superuser to create an operator class"
 msgstr "debe ser superusuario para crear una clase de operadores"
 
-#: commands/opclasscmds.c:403 commands/opclasscmds.c:849
-#: commands/opclasscmds.c:971
+#: commands/opclasscmds.c:480 commands/opclasscmds.c:864
+#: commands/opclasscmds.c:994
 #, c-format
 msgid "invalid operator number %d, must be between 1 and %d"
 msgstr "el número de operador %d es incorrecto, debe estar entre 1 y %d"
 
-#: commands/opclasscmds.c:446 commands/opclasscmds.c:892
-#: commands/opclasscmds.c:986
+#: commands/opclasscmds.c:531 commands/opclasscmds.c:915
+#: commands/opclasscmds.c:1009
 #, c-format
 msgid "invalid procedure number %d, must be between 1 and %d"
 msgstr "el número de procedimiento %d no es válido, debe estar entre 1 y %d"
 
-#: commands/opclasscmds.c:476
+#: commands/opclasscmds.c:561
 msgid "storage type specified more than once"
 msgstr "el tipo de almacenamiento fue especificado más de una vez"
 
-#: commands/opclasscmds.c:504
+#: commands/opclasscmds.c:589
 #, c-format
 msgid ""
 "storage type cannot be different from data type for access method \"%s\""
@@ -5589,106 +5421,111 @@ msgstr ""
 "el tipo de almacenamiento no puede ser diferente del tipo de dato para el "
 "método de acceso «%s»"
 
-#: commands/opclasscmds.c:520
+#: commands/opclasscmds.c:605
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists"
 msgstr "ya exista una clase de operadores «%s» para el método de acceso «%s»"
 
-#: commands/opclasscmds.c:548
+#: commands/opclasscmds.c:633
 #, c-format
 msgid "could not make operator class \"%s\" be default for type %s"
 msgstr ""
 "no se pudo hacer que «%s» sea la clase de operadores por omisión para el "
 "tipo %s"
 
-#: commands/opclasscmds.c:551
+#: commands/opclasscmds.c:636
 #, c-format
 msgid "Operator class \"%s\" already is the default."
 msgstr "Actualmente, «%s» es la clase de operadores por omisión."
 
-#: commands/opclasscmds.c:687
+#: commands/opclasscmds.c:760
 msgid "must be superuser to create an operator family"
 msgstr "debe ser superusuario para crear una familia de operadores"
 
-#: commands/opclasscmds.c:802
+#: commands/opclasscmds.c:816
 msgid "must be superuser to alter an operator family"
 msgstr "debe ser superusuario para alterar una familia de operadores"
 
-#: commands/opclasscmds.c:865
+#: commands/opclasscmds.c:880
 msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
 msgstr ""
 "los tipos de los argumentos de operador deben ser especificados en ALTER "
 "OPERATOR FAMILY"
 
-#: commands/opclasscmds.c:921
+#: commands/opclasscmds.c:944
 msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
 msgstr "STORAGE no puede ser especificado en ALTER OPERATOR FAMILY"
 
-#: commands/opclasscmds.c:1037
+#: commands/opclasscmds.c:1060
 msgid "one or two argument types must be specified"
 msgstr "uno o dos tipos de argumento debe/n ser especificado"
 
-#: commands/opclasscmds.c:1063
+#: commands/opclasscmds.c:1086
 msgid "index operators must be binary"
 msgstr "los operadores de índice deben ser binarios"
 
-#: commands/opclasscmds.c:1067
-msgid "index operators must return boolean"
-msgstr "los operadores de índice deben retornar boolean"
+#: commands/opclasscmds.c:1111
+#, c-format
+msgid "access method \"%s\" does not support ordering operators"
+msgstr "el método de acceso «%s» no soporta operadores de ordenamiento"
+
+#: commands/opclasscmds.c:1124
+msgid "index search operators must return boolean"
+msgstr "los operadores de búsqueda en índices deben retornar boolean"
 
-#: commands/opclasscmds.c:1105
+#: commands/opclasscmds.c:1163
 msgid "btree procedures must have two arguments"
 msgstr "los procedimientos de btree deben tener dos argumentos"
 
-#: commands/opclasscmds.c:1109
+#: commands/opclasscmds.c:1167
 msgid "btree procedures must return integer"
 msgstr "los procedimientos btree deben retornar integer"
 
-#: commands/opclasscmds.c:1124
+#: commands/opclasscmds.c:1182
 msgid "hash procedures must have one argument"
 msgstr "los procedimientos de hash deben tener un argumento"
 
-#: commands/opclasscmds.c:1128
+#: commands/opclasscmds.c:1186
 msgid "hash procedures must return integer"
 msgstr "los procedimientos de hash deben retornar integer"
 
-#: commands/opclasscmds.c:1153
+#: commands/opclasscmds.c:1211
 msgid "associated data types must be specified for index support procedure"
 msgstr ""
 "los tipos de datos asociados deben ser especificados en el procedimiento de "
 "soporte de índice"
 
-#: commands/opclasscmds.c:1179
+#: commands/opclasscmds.c:1237
 #, c-format
 msgid "procedure number %d for (%s,%s) appears more than once"
 msgstr "el número de procedimiento %d para (%s,%s) aparece más de una vez"
 
-#: commands/opclasscmds.c:1186
+#: commands/opclasscmds.c:1244
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "el número de operador %d para (%s,%s) aparece más de una vez"
 
-#: commands/opclasscmds.c:1234
+#: commands/opclasscmds.c:1293
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "ya existe un operador %d(%s,%s) en la familia de operadores «%s»"
 
-#: commands/opclasscmds.c:1334
+#: commands/opclasscmds.c:1406
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "ya existe una función %d(%s,%s) en la familia de operador «%s»"
 
-#: commands/opclasscmds.c:1421
+#: commands/opclasscmds.c:1493
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "no existe el operador %d(%s,%s) en la familia de operadores «%s»"
 
-#: commands/opclasscmds.c:1461
+#: commands/opclasscmds.c:1533
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "no existe la función %d(%s,%s) en la familia de operadores «%s»"
 
-#: commands/opclasscmds.c:1768
+#: commands/opclasscmds.c:1779
 #, c-format
 msgid ""
 "operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
@@ -5697,7 +5534,7 @@ msgstr ""
 "ya existe una clase de operadores «%s» para el método de acceso «%s» en el "
 "esquema «%s»"
 
-#: commands/opclasscmds.c:1862
+#: commands/opclasscmds.c:1868
 #, c-format
 msgid ""
 "operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
@@ -5706,44 +5543,44 @@ msgstr ""
 "ya existe una familia de operadores «%s» para el método de acceso «%s» en el "
 "esquema «%s»"
 
-#: commands/operatorcmds.c:98
+#: commands/operatorcmds.c:100
 msgid "=> is deprecated as an operator name"
 msgstr "=> es un nombre obsoleto de operador"
 
-#: commands/operatorcmds.c:99
+#: commands/operatorcmds.c:101
 msgid ""
 "This name may be disallowed altogether in future versions of PostgreSQL."
 msgstr ""
 "Este nombre puede prohibirse por completo en futuras versiones de PostgreSQL."
 
-#: commands/operatorcmds.c:120 commands/operatorcmds.c:128
+#: commands/operatorcmds.c:122 commands/operatorcmds.c:130
 msgid "SETOF type not allowed for operator argument"
 msgstr "no se permite un tipo SETOF en los argumentos de un operador"
 
-#: commands/operatorcmds.c:156
+#: commands/operatorcmds.c:158
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "el atributo de operador «%s» no es reconocido"
 
-#: commands/operatorcmds.c:166
+#: commands/operatorcmds.c:168
 msgid "operator procedure must be specified"
 msgstr "debe especificarse un procedimiento de operador"
 
-#: commands/operatorcmds.c:177
+#: commands/operatorcmds.c:179
 msgid "at least one of leftarg or rightarg must be specified"
 msgstr "debe especificar al menos uno de los argumentos izquierdo o derecho"
 
-#: commands/operatorcmds.c:226
+#: commands/operatorcmds.c:228
 #, c-format
 msgid "restriction estimator function %s must return type \"float8\""
 msgstr "la función de estimación de restricción %s debe retornar tipo «float8»"
 
-#: commands/operatorcmds.c:265
+#: commands/operatorcmds.c:267
 #, c-format
 msgid "join estimator function %s must return type \"float8\""
 msgstr "la función de estimación de join %s debe retornar tipo «float8»"
 
-#: commands/operatorcmds.c:316
+#: commands/operatorcmds.c:318
 #, c-format
 msgid "operator %s does not exist, skipping"
 msgstr "el operador %s no existe, ignorando"
@@ -5754,121 +5591,253 @@ msgid "invalid cursor name: must not be empty"
 msgstr "el nombre de cursor no es válido: no debe ser vacío"
 
 #: commands/portalcmds.c:168 commands/portalcmds.c:222
-#: executor/execCurrent.c:66 utils/adt/xml.c:2044 utils/adt/xml.c:2208
+#: executor/execCurrent.c:66 utils/adt/xml.c:2046 utils/adt/xml.c:2210
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: commands/portalcmds.c:329 tcop/pquery.c:748 tcop/pquery.c:1371
+#: commands/portalcmds.c:336 tcop/pquery.c:738 tcop/pquery.c:1401
 #, c-format
 msgid "portal \"%s\" cannot be run"
 msgstr "el portal «%s» no puede ser ejecutado"
 
-#: commands/portalcmds.c:402
+#: commands/portalcmds.c:409
 msgid "could not reposition held cursor"
 msgstr "no se pudo reposicionar cursor abierto"
 
-#: commands/prepare.c:70
+#: commands/prepare.c:71
 msgid "invalid statement name: must not be empty"
 msgstr "el nombre de sentencia no es válido: no debe ser vacío"
 
-#: commands/prepare.c:121 tcop/postgres.c:1307 parser/parse_param.c:293
+#: commands/prepare.c:122 tcop/postgres.c:1267 parser/parse_param.c:303
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "no se pudo determinar el tipo del parámetro $%d"
 
-#: commands/prepare.c:139
+#: commands/prepare.c:140
 msgid "utility statements cannot be prepared"
 msgstr "sentencias de utilidad no pueden ser preparadas"
 
-#: commands/prepare.c:239 commands/prepare.c:246 commands/prepare.c:702
+#: commands/prepare.c:240 commands/prepare.c:247 commands/prepare.c:706
 msgid "prepared statement is not a SELECT"
 msgstr "la sentencia preparada no es un SELECT"
 
-#: commands/prepare.c:313
+#: commands/prepare.c:314
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "el número de parámetros es incorrecto en la sentencia preparada «%s»"
 
-#: commands/prepare.c:315
+#: commands/prepare.c:316
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "Se esperaban %d parámetros pero se obtuvieron %d."
 
-#: commands/prepare.c:344
+#: commands/prepare.c:345
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "no se puede usar una subconsulta en un parámetro a EXECUTE"
 
-#: commands/prepare.c:348
+#: commands/prepare.c:349
 msgid "cannot use aggregate function in EXECUTE parameter"
 msgstr "no se puede usar una función de agregación en un parámetro a EXECUTE"
 
-#: commands/prepare.c:352
+#: commands/prepare.c:353
 msgid "cannot use window function in EXECUTE parameter"
 msgstr ""
 "no se puede usar una función de ventana deslizante en un parámetro a EXECUTE"
 
-#: commands/prepare.c:365
+#: commands/prepare.c:366
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr ""
 "el parámetro $%d de tipo %s no puede ser convertido al tipo esperado %s"
 
-#: commands/prepare.c:463
+#: commands/prepare.c:467
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "la sentencia preparada «%s» ya existe"
 
-#: commands/prepare.c:521
+#: commands/prepare.c:525
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "no existe la sentencia preparada «%s»"
 
-#: commands/prepare.c:747 executor/execQual.c:1615 executor/execQual.c:1640
-#: executor/execQual.c:2001 executor/execQual.c:5100 executor/functions.c:652
-#: foreign/foreign.c:271 utils/mmgr/portalmem.c:937 utils/fmgr/funcapi.c:60
+#: commands/prepare.c:751 commands/extension.c:1689 commands/extension.c:1798
+#: commands/extension.c:1991 executor/execQual.c:1613 executor/execQual.c:1638
+#: executor/execQual.c:1999 executor/execQual.c:5115 executor/functions.c:785
+#: foreign/foreign.c:350 replication/walsender.c:1403
+#: utils/mmgr/portalmem.c:946 utils/fmgr/funcapi.c:60
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "se llamó una función que retorna un conjunto en un contexto que no puede "
 "aceptarlo"
 
-#: commands/prepare.c:751 foreign/foreign.c:276 utils/mmgr/portalmem.c:941
+#: commands/prepare.c:755 commands/extension.c:1693 commands/extension.c:1802
+#: commands/extension.c:1995 foreign/foreign.c:355
+#: replication/walsender.c:1407 utils/mmgr/portalmem.c:950
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr ""
 "se requiere un nodo «materialize», pero no está permitido en este contexto"
 
-#: commands/proclang.c:92
+#: commands/user.c:143
+msgid "SYSID can no longer be specified"
+msgstr "SYSID ya no puede ser especificado"
+
+#: commands/user.c:284
+msgid "must be superuser to create superusers"
+msgstr "debe ser superusuario para crear superusuarios"
+
+#: commands/user.c:291
+msgid "must be superuser to create replication users"
+msgstr "debe ser superusuario para crear usuarios de replicación"
+
+#: commands/user.c:298
+msgid "permission denied to create role"
+msgstr "se ha denegado el permiso para crear el rol"
+
+#: commands/user.c:305 commands/user.c:1087
+#, c-format
+msgid "role name \"%s\" is reserved"
+msgstr "el nombre de rol «%s» está reservado"
+
+#: commands/user.c:318 commands/user.c:1081
+#, c-format
+msgid "role \"%s\" already exists"
+msgstr "el rol «%s» ya existe"
+
+#: commands/user.c:623 commands/user.c:825 commands/user.c:905
+#: commands/user.c:1056 commands/variable.c:882 commands/variable.c:954
+#: utils/init/miscinit.c:432 utils/adt/acl.c:4822
+#, c-format
+msgid "role \"%s\" does not exist"
+msgstr "no existe el rol «%s»"
+
+#: commands/user.c:636 commands/user.c:842 commands/user.c:1321
+#: commands/user.c:1458
+msgid "must be superuser to alter superusers"
+msgstr "debe ser superusuario para alterar superusuarios"
+
+#: commands/user.c:643
+msgid "must be superuser to alter replication users"
+msgstr "debe ser superusuario para alterar usuarios de replicación"
+
+#: commands/user.c:659 commands/user.c:850
+msgid "permission denied"
+msgstr "permiso denegado"
+
+#: commands/user.c:878
+msgid "permission denied to drop role"
+msgstr "se ha denegado el permiso para eliminar el rol"
+
+#: commands/user.c:910
+#, c-format
+msgid "role \"%s\" does not exist, skipping"
+msgstr "el rol «%s» no existe, ignorando"
+
+#: commands/user.c:922 commands/user.c:926
+msgid "current user cannot be dropped"
+msgstr "el usuario activo no puede ser eliminado"
+
+#: commands/user.c:930
+msgid "session user cannot be dropped"
+msgstr "no se puede eliminar un usuario de la sesión"
+
+#: commands/user.c:941
+msgid "must be superuser to drop superusers"
+msgstr "debe ser superusuario para eliminar superusuarios"
+
+#: commands/user.c:954
+#, c-format
+msgid "role \"%s\" cannot be dropped because some objects depend on it"
+msgstr "no se puede eliminar el rol «%s» porque otros objetos dependen de él"
+
+#: commands/user.c:1071
+msgid "session user cannot be renamed"
+msgstr "no se puede cambiar el nombre a un usuario de la sesión"
+
+#: commands/user.c:1075
+msgid "current user cannot be renamed"
+msgstr "no se puede cambiar el nombre al usuario activo"
+
+#: commands/user.c:1098
+msgid "must be superuser to rename superusers"
+msgstr "debe ser superusuario para cambiar el nombre a superusuarios"
+
+#: commands/user.c:1105
+msgid "permission denied to rename role"
+msgstr "se ha denegado el permiso para cambiar el nombre al rol"
+
+#: commands/user.c:1126
+msgid "MD5 password cleared because of role rename"
+msgstr "la contraseña MD5 fue borrada debido al cambio de nombre del rol"
+
+#: commands/user.c:1182
+msgid "column names cannot be included in GRANT/REVOKE ROLE"
+msgstr "los nombres de columna no pueden ser incluidos en GRANT/REVOKE ROLE"
+
+#: commands/user.c:1220
+msgid "permission denied to drop objects"
+msgstr "se ha denegado el permiso para eliminar objetos"
+
+#: commands/user.c:1247 commands/user.c:1256
+msgid "permission denied to reassign objects"
+msgstr "se ha denegado el permiso para reasignar objetos"
+
+#: commands/user.c:1329 commands/user.c:1466
+#, c-format
+msgid "must have admin option on role \"%s\""
+msgstr "debe tener opción de admin en rol «%s»"
+
+#: commands/user.c:1337
+msgid "must be superuser to set grantor"
+msgstr "debe ser superusuario para especificar el cedente (grantor)"
+
+#: commands/user.c:1362
+#, c-format
+msgid "role \"%s\" is a member of role \"%s\""
+msgstr "el rol «%s» es un miembro del rol «%s»"
+
+#: commands/user.c:1377
+#, c-format
+msgid "role \"%s\" is already a member of role \"%s\""
+msgstr "el rol «%s» ya es un miembro del rol «%s»"
+
+#: commands/user.c:1488
+#, c-format
+msgid "role \"%s\" is not a member of role \"%s\""
+msgstr "el rol «%s» no es un miembro del rol «%s»"
+
+#: commands/proclang.c:93
 msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
 msgstr ""
 "usando información de pg_pltemplate en vez de los parámetros de CREATE "
 "LANGUAGE"
 
-#: commands/proclang.c:102
+#: commands/proclang.c:103
 #, c-format
 msgid "must be superuser to create procedural language \"%s\""
 msgstr "debe ser superusuario para crear el lenguaje procedural «%s»"
 
-#: commands/proclang.c:122 commands/proclang.c:278
+#: commands/proclang.c:123 commands/proclang.c:279
 #, c-format
 msgid "function %s must return type \"language_handler\""
 msgstr "la función %s debe retornar tipo «language_handler»"
 
-#: commands/proclang.c:242
+#: commands/proclang.c:243
 #, c-format
 msgid "unsupported language \"%s\""
 msgstr "lenguaje no soportado: «%s»"
 
-#: commands/proclang.c:244
+#: commands/proclang.c:245
 msgid "The supported languages are listed in the pg_pltemplate system catalog."
 msgstr ""
 "Los lenguajes soportados están listados en el catálogo del sistema "
 "pg_pltemplate."
 
-#: commands/proclang.c:252
+#: commands/proclang.c:253
 msgid "must be superuser to create custom procedural language"
 msgstr "debe ser superusuario para crear un lenguaje procedural personalizado"
 
-#: commands/proclang.c:271
+#: commands/proclang.c:272
 #, c-format
 msgid ""
 "changing return type of function %s from \"opaque\" to \"language_handler\""
@@ -5876,295 +5845,338 @@ msgstr ""
 "cambiando el tipo de retorno de la función %s de «opaque» a "
 "«language_handler»"
 
-#: commands/proclang.c:356 commands/proclang.c:606
+#: commands/proclang.c:357 commands/proclang.c:606
 #, c-format
 msgid "language \"%s\" already exists"
 msgstr "ya existe el lenguaje «%s»"
 
-#: commands/proclang.c:534
+#: commands/proclang.c:537
 #, c-format
 msgid "language \"%s\" does not exist, skipping"
 msgstr "el lenguaje «%s» no existe, ignorando"
 
-#: commands/schemacmds.c:82 commands/schemacmds.c:288
+#: commands/schemacmds.c:82 commands/schemacmds.c:275
 #, c-format
 msgid "unacceptable schema name \"%s\""
 msgstr "el nombre de schema «%s» es inaceptable"
 
-#: commands/schemacmds.c:83 commands/schemacmds.c:289
+#: commands/schemacmds.c:83 commands/schemacmds.c:276
 msgid "The prefix \"pg_\" is reserved for system schemas."
 msgstr "El prefijo «pg_» está reservado para esquemas del sistema."
 
-#: commands/schemacmds.c:196
+#: commands/schemacmds.c:186
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "el esquema «%s» no existe, ignorando"
 
-#: commands/sequence.c:553
+#: commands/sequence.c:126
+msgid "unlogged sequences are not supported"
+msgstr "las secuencias unlogged no están soportadas"
+
+#: commands/sequence.c:634
 #, c-format
 msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
 msgstr "nextval: se alcanzó el valor máximo de la secuencia «%s» (%s)"
 
-#: commands/sequence.c:576
+#: commands/sequence.c:657
 #, c-format
 msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
 msgstr "nextval: se alcanzó el valor mínimo de la secuencia «%s» (%s)"
 
-#: commands/sequence.c:674
+#: commands/sequence.c:755
 #, c-format
 msgid "currval of sequence \"%s\" is not yet defined in this session"
 msgstr "currval de la secuencia «%s» no está definido en esta sesión"
 
-#: commands/sequence.c:693 commands/sequence.c:699
+#: commands/sequence.c:774 commands/sequence.c:780
 msgid "lastval is not yet defined in this session"
 msgstr "lastval no está definido en esta sesión"
 
-#: commands/sequence.c:767
+#: commands/sequence.c:848
 #, c-format
 msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
 msgstr "setval: el valor %s está fuera del rango de la secuencia «%s» (%s..%s)"
 
-#: commands/sequence.c:936 lib/stringinfo.c:266 libpq/auth.c:1020
-#: libpq/auth.c:1374 libpq/auth.c:1442 libpq/auth.c:2016
-#: storage/buffer/buf_init.c:154 storage/buffer/localbuf.c:348
-#: storage/file/fd.c:356 storage/file/fd.c:739 storage/file/fd.c:857
-#: storage/ipc/procarray.c:786 storage/ipc/procarray.c:1164
-#: storage/ipc/procarray.c:1171 storage/ipc/procarray.c:1406
-#: storage/ipc/procarray.c:1800 postmaster/postmaster.c:1973
-#: postmaster/postmaster.c:2006 postmaster/postmaster.c:3188
-#: postmaster/postmaster.c:3870 postmaster/postmaster.c:3951
-#: postmaster/postmaster.c:4539 utils/mmgr/aset.c:408 utils/mmgr/aset.c:587
-#: utils/mmgr/aset.c:770 utils/mmgr/aset.c:976 utils/adt/formatting.c:1491
-#: utils/adt/formatting.c:1547 utils/adt/formatting.c:1604
-#: utils/adt/regexp.c:205 utils/adt/varlena.c:3246 utils/adt/varlena.c:3267
-#: utils/misc/guc.c:2915 utils/misc/guc.c:2928 utils/misc/guc.c:2941
-#: utils/fmgr/dfmgr.c:224 utils/hash/dynahash.c:363 utils/hash/dynahash.c:435
-#: utils/hash/dynahash.c:929 utils/init/miscinit.c:149
-#: utils/init/miscinit.c:170 utils/init/miscinit.c:180 utils/mb/mbutils.c:334
-#: utils/mb/mbutils.c:606
+#: commands/sequence.c:1017 lib/stringinfo.c:266 libpq/auth.c:1022
+#: libpq/auth.c:1382 libpq/auth.c:1450 libpq/auth.c:1852
+#: storage/ipc/procarray.c:784 storage/ipc/procarray.c:1183
+#: storage/ipc/procarray.c:1190 storage/ipc/procarray.c:1425
+#: storage/ipc/procarray.c:1819 storage/buffer/buf_init.c:154
+#: storage/buffer/localbuf.c:350 storage/file/fd.c:358 storage/file/fd.c:742
+#: storage/file/fd.c:860 postmaster/postmaster.c:2003
+#: postmaster/postmaster.c:2034 postmaster/postmaster.c:3231
+#: postmaster/postmaster.c:3915 postmaster/postmaster.c:3996
+#: postmaster/postmaster.c:4610 utils/init/miscinit.c:150
+#: utils/init/miscinit.c:171 utils/init/miscinit.c:181
+#: utils/adt/formatting.c:1529 utils/adt/formatting.c:1650
+#: utils/adt/formatting.c:1783 utils/adt/regexp.c:210 utils/adt/varlena.c:3474
+#: utils/adt/varlena.c:3495 utils/mmgr/aset.c:416 utils/mmgr/aset.c:587
+#: utils/mmgr/aset.c:765 utils/mmgr/aset.c:966 utils/fmgr/dfmgr.c:224
+#: utils/hash/dynahash.c:364 utils/hash/dynahash.c:436
+#: utils/hash/dynahash.c:932 utils/mb/mbutils.c:374 utils/mb/mbutils.c:675
+#: utils/misc/guc.c:3298 utils/misc/guc.c:3311 utils/misc/guc.c:3324
+#: utils/misc/tzparser.c:455
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: commands/sequence.c:1096
+#: commands/sequence.c:1206
 msgid "INCREMENT must not be zero"
 msgstr "INCREMENT no debe ser cero"
 
-#: commands/sequence.c:1142
+#: commands/sequence.c:1252
 #, c-format
 msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr "MINVALUE (%s) debe ser menor que MAXVALUE (%s)"
 
-#: commands/sequence.c:1167
+#: commands/sequence.c:1277
 #, c-format
 msgid "START value (%s) cannot be less than MINVALUE (%s)"
 msgstr "el valor START (%s) no puede ser menor que MINVALUE (%s)"
 
-#: commands/sequence.c:1179
+#: commands/sequence.c:1289
 #, c-format
 msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
 msgstr "el valor START (%s) no puede ser mayor que MAXVALUE (%s)"
 
-#: commands/sequence.c:1210
+#: commands/sequence.c:1320
 #, c-format
 msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
 msgstr "el valor RESTART (%s) no puede ser menor que MINVALUE (%s)"
 
-#: commands/sequence.c:1222
+#: commands/sequence.c:1332
 #, c-format
 msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
 msgstr "el valor RESTART (%s) no puede ser mayor que MAXVALUE (%s)"
 
-#: commands/sequence.c:1237
+#: commands/sequence.c:1347
 #, c-format
 msgid "CACHE (%s) must be greater than zero"
 msgstr "CACHE (%s) debe ser mayor que cero"
 
-#: commands/sequence.c:1268
+#: commands/sequence.c:1378
 msgid "invalid OWNED BY option"
 msgstr "opción OWNED BY no válida"
 
-#: commands/sequence.c:1269
+#: commands/sequence.c:1379
 msgid "Specify OWNED BY table.column or OWNED BY NONE."
 msgstr "Especifique OWNED BY tabla.columna o OWNED BY NONE."
 
-#: commands/sequence.c:1291 commands/tablecmds.c:4808
+#: commands/sequence.c:1401 commands/tablecmds.c:5525
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "la relación referida «%s» no es una tabla"
 
-#: commands/sequence.c:1298
+#: commands/sequence.c:1408
 msgid "sequence must have same owner as table it is linked to"
 msgstr ""
 "la secuencia debe tener el mismo dueño que la tabla a la que está enlazada"
 
-#: commands/sequence.c:1302
+#: commands/sequence.c:1412
 msgid "sequence must be in same schema as table it is linked to"
 msgstr ""
 "la secuencia debe estar en el mismo esquema que la tabla a la que está "
 "enlazada"
 
-#: commands/tablecmds.c:192
+#: commands/tablecmds.c:200
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "no existe la tabla «%s»"
 
-#: commands/tablecmds.c:193
+#: commands/tablecmds.c:201
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "la tabla «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:195
+#: commands/tablecmds.c:203
 msgid "Use DROP TABLE to remove a table."
 msgstr "Use DROP TABLE para eliminar una tabla."
 
-#: commands/tablecmds.c:198
+#: commands/tablecmds.c:206
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "no existe la secuencia «%s»"
 
-#: commands/tablecmds.c:199
+#: commands/tablecmds.c:207
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "la secuencia «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:201
+#: commands/tablecmds.c:209
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Use DROP SEQUENCE para eliminar una secuencia."
 
-#: commands/tablecmds.c:204
+#: commands/tablecmds.c:212
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "no existe la vista «%s»"
 
-#: commands/tablecmds.c:205
+#: commands/tablecmds.c:213
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "la vista «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:207
+#: commands/tablecmds.c:215
 msgid "Use DROP VIEW to remove a view."
 msgstr "Use DROP VIEW para eliminar una vista."
 
-#: commands/tablecmds.c:210
+#: commands/tablecmds.c:218 parser/parse_utilcmd.c:1449
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "no existe el índice «%s»"
 
-#: commands/tablecmds.c:211
+#: commands/tablecmds.c:219
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "el índice «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:213
+#: commands/tablecmds.c:221
 msgid "Use DROP INDEX to remove an index."
 msgstr "Use DROP INDEX para eliminar un índice."
 
-#: commands/tablecmds.c:217 commands/typecmds.c:656
+#: commands/tablecmds.c:225 commands/typecmds.c:666
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "el tipo «%s» no existe, ignorando"
 
-#: commands/tablecmds.c:218
+#: commands/tablecmds.c:226
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "«%s» no es un tipo"
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:227
 msgid "Use DROP TYPE to remove a type."
 msgstr "Use DROP TYPE para eliminar un tipo."
 
-#: commands/tablecmds.c:390 executor/execMain.c:2091
+#: commands/tablecmds.c:230 commands/tablecmds.c:8888
+#, c-format
+msgid "foreign table \"%s\" does not exist"
+msgstr "no existe la tabla foránea «%s»"
+
+#: commands/tablecmds.c:231
+#, c-format
+msgid "foreign table \"%s\" does not exist, skipping"
+msgstr "la tabla foránea «%s» no existe, ignorando"
+
+#: commands/tablecmds.c:233
+msgid "Use DROP FOREIGN TABLE to remove a foreign table."
+msgstr "Use DROP FOREIGN TABLE para eliminar una tabla foránea."
+
+#: commands/tablecmds.c:425 executor/execMain.c:2416
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT sólo puede ser usado en tablas temporales"
 
-#: commands/tablecmds.c:400 executor/execMain.c:2101
+#: commands/tablecmds.c:429
+msgid "constraints on foreign tables are not supported"
+msgstr "las restricciones en tablas foráneas no están soportadas"
+
+#: commands/tablecmds.c:447 executor/execMain.c:2434
 msgid "cannot create temporary table within security-restricted operation"
 msgstr ""
 "no se puede crear una tabla temporal dentro una operación restringida por "
 "seguridad"
 
-#: commands/tablecmds.c:777 commands/tablecmds.c:1109
-#: commands/tablecmds.c:2001 commands/tablecmds.c:3366
-#: commands/tablecmds.c:3395 commands/tablecmds.c:4814 commands/trigger.c:155
-#: commands/trigger.c:1069 tcop/utility.c:92 rewrite/rewriteDefine.c:258
+#: commands/tablecmds.c:545 commands/tablecmds.c:4351
+msgid "default values on foreign tables are not supported"
+msgstr "los valores por omisión en tablas foráneas no están soportados"
+
+#: commands/tablecmds.c:813 commands/tablecmds.c:1142
+#: commands/tablecmds.c:2070 commands/tablecmds.c:3807
+#: commands/tablecmds.c:5531 commands/trigger.c:192 commands/trigger.c:1098
+#: tcop/utility.c:95 rewrite/rewriteDefine.c:263
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "permiso denegado: «%s» es un catálogo de sistema"
 
-#: commands/tablecmds.c:889
+#: commands/tablecmds.c:925
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "truncando además la tabla «%s»"
 
-#: commands/tablecmds.c:1119
+#: commands/tablecmds.c:1152
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "no se pueden truncar tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:1314 parser/parse_utilcmd.c:590
-#: parser/parse_utilcmd.c:1408
+#: commands/tablecmds.c:1354 parser/parse_utilcmd.c:621
+#: parser/parse_utilcmd.c:1667
 #, c-format
 msgid "inherited relation \"%s\" is not a table"
 msgstr "la relación heredada «%s» no es una tabla"
 
-#: commands/tablecmds.c:1320 commands/tablecmds.c:7223
+#: commands/tablecmds.c:1361 commands/tablecmds.c:8114
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "no se puede heredar de la tabla temporal «%s»"
 
-#: commands/tablecmds.c:1337 commands/tablecmds.c:7251
+#: commands/tablecmds.c:1378 commands/tablecmds.c:8142
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "se heredaría de la relación «%s» más de una vez"
 
-#: commands/tablecmds.c:1392
+#: commands/tablecmds.c:1434
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "mezclando múltiples definiciones heredadas de la columna «%s»"
 
-#: commands/tablecmds.c:1400
+#: commands/tablecmds.c:1442
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "columna heredada «%s» tiene conflicto de tipos"
 
-#: commands/tablecmds.c:1402 commands/tablecmds.c:1414
-#: commands/tablecmds.c:1574 commands/tablecmds.c:1586
-#: parser/parse_coerce.c:1438 parser/parse_coerce.c:1457
-#: parser/parse_coerce.c:1502 parser/parse_param.c:214
+#: commands/tablecmds.c:1444 commands/tablecmds.c:1465
+#: commands/tablecmds.c:1630 commands/tablecmds.c:1652
+#: parser/parse_coerce.c:1514 parser/parse_coerce.c:1534
+#: parser/parse_coerce.c:1579 parser/parse_param.c:217
 #, c-format
 msgid "%s versus %s"
 msgstr "%s versus %s"
 
-#: commands/tablecmds.c:1412
+#: commands/tablecmds.c:1451
+#, c-format
+msgid "inherited column \"%s\" has a collation conflict"
+msgstr "columna heredada «%s» tiene conflicto de ordenamiento (collation)"
+
+#: commands/tablecmds.c:1453 commands/tablecmds.c:1640
+#: commands/tablecmds.c:4220
+#, c-format
+msgid "\"%s\" versus \"%s\""
+msgstr "«%s» versus «%s»"
+
+#: commands/tablecmds.c:1463
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "columna heredada «%s» tiene conflicto de parámetros de almacenamiento"
 
-#: commands/tablecmds.c:1564
+#: commands/tablecmds.c:1620
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "mezclando la columna «%s» con la definición heredada"
 
-#: commands/tablecmds.c:1572
+#: commands/tablecmds.c:1628
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "la columna «%s» tiene conflicto de tipos"
 
-#: commands/tablecmds.c:1584
+#: commands/tablecmds.c:1638
+#, c-format
+msgid "column \"%s\" has a collation conflict"
+msgstr "la columna «%s» tiene conflicto de ordenamientos (collation)"
+
+#: commands/tablecmds.c:1650
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "la columna «%s» tiene conflicto de parámetros de almacenamiento"
 
-#: commands/tablecmds.c:1636
+#: commands/tablecmds.c:1702
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "la columna «%s» hereda valores por omisión no coincidentes"
 
-#: commands/tablecmds.c:1638
+#: commands/tablecmds.c:1704
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr ""
 "Para resolver el conflicto, indique explícitamente un valor por omisión."
 
-#: commands/tablecmds.c:1685
+#: commands/tablecmds.c:1751
 #, c-format
 msgid ""
 "check constraint name \"%s\" appears multiple times but with different "
@@ -6172,43 +6184,43 @@ msgid ""
 msgstr ""
 "la restricción «check» «%s» aparece más de una vez con diferentes expresiones"
 
-#: commands/tablecmds.c:1973
+#: commands/tablecmds.c:2041
 msgid "cannot rename column of typed table"
 msgstr "no se puede cambiar el nombre a una columna de una tabla tipada"
 
-#: commands/tablecmds.c:1989
+#: commands/tablecmds.c:2058
 #, c-format
-msgid "\"%s\" is not a table, view, composite type or index"
-msgstr "«%s» no es una tabla, vista, tipo compuesto o índice"
+msgid "\"%s\" is not a table, view, composite type, index or foreign table"
+msgstr "«%s» no es una tabla, vista, tipo compuesto, índice o tabla foránea"
 
-#: commands/tablecmds.c:2055
+#: commands/tablecmds.c:2124
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr ""
 "debe cambiar el nombre a la columna heredada «%s» en las tablas hijas también"
 
-#: commands/tablecmds.c:2073
+#: commands/tablecmds.c:2156
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "no se puede cambiar el nombre a la columna de sistema «%s»"
 
-#: commands/tablecmds.c:2088
+#: commands/tablecmds.c:2171
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "no se puede cambiar el nombre a la columna heredada «%s»"
 
-#: commands/tablecmds.c:2099 commands/tablecmds.c:3710
+#: commands/tablecmds.c:2182 commands/tablecmds.c:4264
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "ya existe la columna «%s» en la relación «%s»"
 
-#: commands/tablecmds.c:2164 commands/tablecmds.c:6547
-#: commands/tablecmds.c:7853
+#: commands/tablecmds.c:2271 commands/tablecmds.c:7438
+#: commands/tablecmds.c:9020
 msgid "Use ALTER TYPE instead."
 msgstr "Considere usar ALTER TYPE."
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2287
+#: commands/tablecmds.c:2394
 #, c-format
 msgid ""
 "cannot %s \"%s\" because it is being used by active queries in this session"
@@ -6217,190 +6229,270 @@ msgstr ""
 "en esta sesión"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2296
+#: commands/tablecmds.c:2403
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr ""
 "no se puede hacer %s en «%s» porque tiene eventos de disparador pendientes"
 
-#: commands/tablecmds.c:2909
+#: commands/tablecmds.c:2502
+#, c-format
+msgid "\"%s\" is not a composite type"
+msgstr "«%s» no es un tipo compuesto"
+
+#: commands/tablecmds.c:3327
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "no se puede reescribir la relación de sistema «%s»"
 
-#: commands/tablecmds.c:2919
+#: commands/tablecmds.c:3337
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "no se puede reescribir tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:3243
+#: commands/tablecmds.c:3562
+#, c-format
+msgid "rewriting table \"%s\""
+msgstr "reescribiendo tabla «%s»"
+
+#: commands/tablecmds.c:3566
+#, c-format
+msgid "verifying table \"%s\""
+msgstr "verificando tabla «%s»"
+
+#: commands/tablecmds.c:3673
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "la columna «%s» contiene valores nulos"
 
-#: commands/tablecmds.c:3257
+#: commands/tablecmds.c:3687
 #, c-format
 msgid "check constraint \"%s\" is violated by some row"
 msgstr "la restricción check «%s» es violada por alguna fila"
 
-#: commands/tablecmds.c:3348 rewrite/rewriteDefine.c:252
+#: commands/tablecmds.c:3828 commands/tablecmds.c:4778
+#, c-format
+msgid "\"%s\" is not a table or index"
+msgstr "«%s» no es una tabla o índice"
+
+#: commands/tablecmds.c:3831 commands/trigger.c:186 commands/trigger.c:1092
+#: rewrite/rewriteDefine.c:257
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "«%s» no es una tabla o vista"
 
-#: commands/tablecmds.c:3384 commands/tablecmds.c:4136
+#: commands/tablecmds.c:3834
 #, c-format
-msgid "\"%s\" is not a table or index"
-msgstr "«%s» no es una tabla o índice"
+msgid "\"%s\" is not a table or foreign table"
+msgstr "«%s» no es una tabla o tabla foránea"
+
+#: commands/tablecmds.c:3837
+#, c-format
+msgid "\"%s\" is not a table, composite type, or foreign table"
+msgstr "«%s» no es una tabla, tipo compuesto, o tabla foránea"
+
+#: commands/tablecmds.c:3847
+#, c-format
+msgid "\"%s\" is of the wrong type"
+msgstr "«%s» es tipo equivocado"
+
+#: commands/tablecmds.c:3996 commands/tablecmds.c:4003
+#, c-format
+msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
+msgstr "no se puede alterar el tipo «%s» porque la columna «%s.%s» lo usa"
 
-#: commands/tablecmds.c:3539
+#: commands/tablecmds.c:4010
 #, c-format
-msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
+msgid ""
+"cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
+msgstr ""
+"no se puede alterar la tabla foránea «%s» porque la columna «%s.%s» usa su "
+"tipo"
+
+#: commands/tablecmds.c:4017
+#, c-format
+msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
-"no se puede alterar la tabla «%s» porque la columna «%s».«%s» usa su tipo"
+"no se puede alterar la tabla «%s» porque la columna «%s.%s» usa su tipo"
 
-#: commands/tablecmds.c:3546
+#: commands/tablecmds.c:4079
 #, c-format
-msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
-msgstr "no se puede alterar el tipo «%s» porque la columna «%s».«%s» lo usa"
+msgid "cannot alter type \"%s\" because it is the type of a typed table"
+msgstr "no se puede cambiar el tipo «%s» porque es el tipo de una tabla tipada"
+
+#: commands/tablecmds.c:4081
+msgid "Use ALTER ... CASCADE to alter the typed tables too."
+msgstr "Use ALTER ... CASCADE para eliminar además las tablas tipadas."
+
+#: commands/tablecmds.c:4125
+#, c-format
+msgid "type %s is not a composite type"
+msgstr "el tipo %s no es un tipo compuesto"
 
-#: commands/tablecmds.c:3593
+#: commands/tablecmds.c:4151
 msgid "cannot add column to typed table"
 msgstr "no se puede agregar una columna a una tabla tipada"
 
-#: commands/tablecmds.c:3622
-msgid "column must be added to child tables too"
-msgstr "la columna debe ser agregada a las tablas hijas también"
-
-#: commands/tablecmds.c:3667 commands/tablecmds.c:7407
+#: commands/tablecmds.c:4212 commands/tablecmds.c:8296
 #, c-format
 msgid "child table \"%s\" has different type for column \"%s\""
 msgstr "la tabla hija «%s» tiene un tipo diferente para la columna «%s»"
 
-#: commands/tablecmds.c:3674
+#: commands/tablecmds.c:4218 commands/tablecmds.c:8303
+#, c-format
+msgid "child table \"%s\" has different collation for column \"%s\""
+msgstr ""
+"la tabla hija «%s» tiene un ordenamiento (collation) diferente para la "
+"columna «%s»"
+
+#: commands/tablecmds.c:4228
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
 msgstr "tabla hija «%s» tiene una columna «%s» que entra en conflicto"
 
-#: commands/tablecmds.c:3686
+#: commands/tablecmds.c:4240
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "mezclando la definición de la columna «%s» en la tabla hija «%s»"
 
-#: commands/tablecmds.c:3958 commands/tablecmds.c:4048
-#: commands/tablecmds.c:4093 commands/tablecmds.c:4189
-#: commands/tablecmds.c:4233 commands/tablecmds.c:4312
-#: commands/tablecmds.c:5846
+#: commands/tablecmds.c:4470
+msgid "column must be added to child tables too"
+msgstr "la columna debe ser agregada a las tablas hijas también"
+
+#: commands/tablecmds.c:4600 commands/tablecmds.c:4690
+#: commands/tablecmds.c:4735 commands/tablecmds.c:4831
+#: commands/tablecmds.c:4875 commands/tablecmds.c:4954
+#: commands/tablecmds.c:6656
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "no se puede alterar columna de sistema «%s»"
 
-#: commands/tablecmds.c:3992
+#: commands/tablecmds.c:4634
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "la columna «%s» está en la llave primaria"
 
-#: commands/tablecmds.c:4163
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "el valor de estadísticas %d es demasiado bajo"
 
-#: commands/tablecmds.c:4171
+#: commands/tablecmds.c:4813
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "bajando el valor de estadísticas a %d"
 
-#: commands/tablecmds.c:4293
+#: commands/tablecmds.c:4935
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "tipo de almacenamiento no válido «%s»"
 
-#: commands/tablecmds.c:4324
+#: commands/tablecmds.c:4966
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr ""
 "el tipo de datos %s de la columna sólo puede tener almacenamiento PLAIN"
 
-#: commands/tablecmds.c:4353
+#: commands/tablecmds.c:4996
 msgid "cannot drop column from typed table"
 msgstr "no se pueden eliminar columnas de una tabla tipada"
 
-#: commands/tablecmds.c:4392
+#: commands/tablecmds.c:5037
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "no existe la columna «%s» en la relación «%s», saltando"
 
-#: commands/tablecmds.c:4405
+#: commands/tablecmds.c:5050
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "no se puede eliminar la columna de sistema «%s»"
 
-#: commands/tablecmds.c:4412
+#: commands/tablecmds.c:5057
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "no se puede eliminar la columna heredada «%s»"
 
-#: commands/tablecmds.c:4743
+#: commands/tablecmds.c:5283
+#, c-format
+msgid ""
+"ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
+msgstr ""
+"ALTER TABLE / ADD CONSTRAINT USING INDEX renombrará el índice «%s» a «%s»"
+
+#: commands/tablecmds.c:5460
 msgid "constraint must be added to child tables too"
 msgstr "la restricción debe ser agregada a las tablas hijas también"
 
-#: commands/tablecmds.c:4830
-msgid "cannot reference temporary table from permanent table constraint"
+#: commands/tablecmds.c:5548
+msgid "constraints on permanent tables may reference only permanent tables"
+msgstr ""
+"las restricciones en tablas permanentes sólo pueden hacer referencia a "
+"tablas permanentes"
+
+#: commands/tablecmds.c:5555
+msgid ""
+"constraints on unlogged tables may reference only permanent or unlogged "
+"tables"
 msgstr ""
-"no se puede referir a una tabla temporal en una restricción de una tabla "
-"permanente"
+"las restricciones en tablas unlogged sólo pueden hacer referencia a tablas "
+"permanentes o unlogged"
 
-#: commands/tablecmds.c:4837
-msgid "cannot reference permanent table from temporary table constraint"
+#: commands/tablecmds.c:5561
+msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
-"no se puede referir a una tabla permanente en una restricción de una tabla "
-"temporal"
+"las restricciones en tablas temporales sólo pueden hacer referencia a tablas "
+"temporales"
 
-#: commands/tablecmds.c:4897
+#: commands/tablecmds.c:5622
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr ""
 "el número de columnas referidas en la llave foránea no coincide con el "
 "número de columnas de referencia"
 
-#: commands/tablecmds.c:4986
+#: commands/tablecmds.c:5711
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "la restricción de llave foránea «%s» no puede ser implementada"
 
-#: commands/tablecmds.c:4989
+#: commands/tablecmds.c:5714
 #, c-format
 msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
 msgstr "Las columnas llave «%s» y «%s» son de tipos incompatibles: %s y %s"
 
-#: commands/tablecmds.c:5084
+#: commands/tablecmds.c:5827
+#, c-format
+msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "no existe la restricción de llave foránea «%s» en la relación «%s»"
+
+#: commands/tablecmds.c:5890
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "no existe la columna «%s» referida en la llave foránea"
 
-#: commands/tablecmds.c:5089
+#: commands/tablecmds.c:5895
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "no se puede tener más de %d columnas en una llave foránea"
 
-#: commands/tablecmds.c:5154
+#: commands/tablecmds.c:5960
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr ""
 "no se puede usar una llave primaria postergable para la tabla referenciada "
 "«%s»"
 
-#: commands/tablecmds.c:5171
+#: commands/tablecmds.c:5977
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "no hay llave primaria para la tabla referida «%s»"
 
-#: commands/tablecmds.c:5321
+#: commands/tablecmds.c:6127
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
 "no se puede usar una restricción unique postergable para la tabla "
 "referenciada «%s»"
 
-#: commands/tablecmds.c:5326
+#: commands/tablecmds.c:6132
 #, c-format
 msgid ""
 "there is no unique constraint matching given keys for referenced table \"%s\""
@@ -6408,605 +6500,686 @@ msgstr ""
 "no hay restricción unique que coincida con las columnas dadas en la tabla "
 "referida «%s»"
 
-#: commands/tablecmds.c:5656
+#: commands/tablecmds.c:6183
+#, c-format
+msgid "validating foreign key constraint \"%s\""
+msgstr "validando restricción de llave foránea «%s»"
+
+#: commands/tablecmds.c:6465
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "no se puede eliminar la restricción «%s» heredada de la relación «%s»"
 
-#: commands/tablecmds.c:5683 commands/tablecmds.c:5797
+#: commands/tablecmds.c:6492 commands/tablecmds.c:6605
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "no existe la restricción «%s» en la relación «%s»"
 
-#: commands/tablecmds.c:5689
+#: commands/tablecmds.c:6498
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "no existe la restricción «%s» en la relación «%s», saltando"
 
-#: commands/tablecmds.c:5830
+#: commands/tablecmds.c:6640
 msgid "cannot alter column type of typed table"
 msgstr "no se puede cambiar el tipo de una columna de una tabla tipada"
 
-#: commands/tablecmds.c:5853
+#: commands/tablecmds.c:6663
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "no se puede alterar la columna heredada «%s»"
 
-#: commands/tablecmds.c:5888
+#: commands/tablecmds.c:6705
 msgid "transform expression must not return a set"
 msgstr "la expresión de transformación no puede retornar conjuntos"
 
-#: commands/tablecmds.c:5894
+#: commands/tablecmds.c:6711
 msgid "cannot use subquery in transform expression"
 msgstr "no se puede usar una subconsulta en una expresión de transformación"
 
-#: commands/tablecmds.c:5898
+#: commands/tablecmds.c:6715
 msgid "cannot use aggregate function in transform expression"
 msgstr ""
 "no se puede usar una función de agregación en una expresión de transformación"
 
-#: commands/tablecmds.c:5902
+#: commands/tablecmds.c:6719
 msgid "cannot use window function in transform expression"
 msgstr ""
 "no se puede usar una función de ventana deslizante en una expresión de "
 "transformación"
 
-#: commands/tablecmds.c:5920
+#: commands/tablecmds.c:6738
 #, c-format
 msgid "column \"%s\" cannot be cast to type %s"
 msgstr "la columna «%s» no puede convertirse al tipo %s"
 
-#: commands/tablecmds.c:5946
+#: commands/tablecmds.c:6785
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 "debe cambiar el tipo a la columna heredada «%s» en las tablas hijas también"
 
-#: commands/tablecmds.c:5985
+#: commands/tablecmds.c:6866
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "no se puede alterar el tipo de la columna «%s» dos veces"
 
-#: commands/tablecmds.c:6019
+#: commands/tablecmds.c:6902
 #, c-format
 msgid "default for column \"%s\" cannot be cast to type %s"
 msgstr ""
 "el valor por omisión para la columna «%s» no puede ser convertido al tipo %s"
 
-#: commands/tablecmds.c:6145
+#: commands/tablecmds.c:7028
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "no se puede alterar el tipo de una columna usada en una regla o vista"
 
-#: commands/tablecmds.c:6146 commands/tablecmds.c:6164
+#: commands/tablecmds.c:7029 commands/tablecmds.c:7048
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s depende de la columna «%s»"
 
-#: commands/tablecmds.c:6163
+#: commands/tablecmds.c:7047
 msgid "cannot alter type of a column used in a trigger definition"
-msgstr "no se puede alterar el tipo de una columna usada en una definición de trigger"
+msgstr ""
+"no se puede alterar el tipo de una columna usada en una definición de trigger"
 
-#: commands/tablecmds.c:6515
+#: commands/tablecmds.c:7406
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "no se puede cambiar el dueño del índice «%s»"
 
-#: commands/tablecmds.c:6517
+#: commands/tablecmds.c:7408
 msgid "Change the ownership of the index's table, instead."
 msgstr ""
 "Considere cambiar el dueño de la tabla en vez de cambiar el dueño del índice."
 
-#: commands/tablecmds.c:6533
+#: commands/tablecmds.c:7424
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "no se puede cambiar el dueño de la secuencia «%s»"
 
-#: commands/tablecmds.c:6535 commands/tablecmds.c:7843
+#: commands/tablecmds.c:7426 commands/tablecmds.c:9010
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "La secuencia «%s» está enlazada a la tabla «%s»."
 
-#: commands/tablecmds.c:6556 commands/tablecmds.c:7861
+#: commands/tablecmds.c:7447 commands/tablecmds.c:9028
 #, c-format
-msgid "\"%s\" is not a table, view, or sequence"
-msgstr "«%s» no es una tabla, vista o secuencia"
+msgid "\"%s\" is not a table, view, sequence, or foreign table"
+msgstr "«%s» no es una tabla, vista, secuencia o tabla foránea"
 
-#: commands/tablecmds.c:6815
+#: commands/tablecmds.c:7702
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "no se pueden tener múltiples subórdenes SET TABLESPACE"
 
-#: commands/tablecmds.c:6867
+#: commands/tablecmds.c:7754
 #, c-format
 msgid "\"%s\" is not a table, index, or TOAST table"
 msgstr "«%s» no es una tabla, índice o tabla TOAST"
 
-#: commands/tablecmds.c:6988
+#: commands/tablecmds.c:7875
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "no se puede mover la relación de sistema «%s»"
 
-#: commands/tablecmds.c:7004
+#: commands/tablecmds.c:7891
 msgid "cannot move temporary tables of other sessions"
 msgstr "no se pueden mover tablas temporales de otras sesiones"
 
-#: commands/tablecmds.c:7193
+#: commands/tablecmds.c:8083
 msgid "cannot change inheritance of typed table"
 msgstr "no se puede cambiar la herencia de una tabla tipada"
 
-#: commands/tablecmds.c:7278
+#: commands/tablecmds.c:8169
 msgid "circular inheritance not allowed"
 msgstr "la herencia circular no está permitida"
 
-#: commands/tablecmds.c:7279
+#: commands/tablecmds.c:8170
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "«%s» ya es un hijo de «%s»."
 
-#: commands/tablecmds.c:7287
+#: commands/tablecmds.c:8178
 #, c-format
 msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
 msgstr "tabla «%s» sin OIDs no puede heredar de tabla «%s» con OIDs"
 
-#: commands/tablecmds.c:7414
+#: commands/tablecmds.c:8314
 #, c-format
 msgid "column \"%s\" in child table must be marked NOT NULL"
 msgstr "columna «%s» en tabla hija debe marcarse como NOT NULL"
 
-#: commands/tablecmds.c:7430
+#: commands/tablecmds.c:8330
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "tabla hija no tiene la columna «%s»"
 
-#: commands/tablecmds.c:7509
+#: commands/tablecmds.c:8409
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr ""
 "la tabla hija «%s» tiene una definición diferente para la restricción check "
 "«%s»"
 
-#: commands/tablecmds.c:7533
+#: commands/tablecmds.c:8433
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "tabla hija no tiene la restricción «%s»"
 
-#: commands/tablecmds.c:7614
+#: commands/tablecmds.c:8513
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "relación «%s» no es un padre de la relación «%s»"
 
-#: commands/tablecmds.c:7842
-msgid "cannot move an owned sequence into another schema"
+#: commands/tablecmds.c:8730
+msgid "typed tables cannot inherit"
+msgstr "las tablas tipadas no pueden heredar"
+
+#: commands/tablecmds.c:8761
+#, c-format
+msgid "table is missing column \"%s\""
+msgstr "la tabla no tiene la columna «%s»"
+
+#: commands/tablecmds.c:8771
+#, c-format
+msgid "table has column \"%s\" where type requires \"%s\""
 msgstr ""
-"no se puede mover una secuencia enlazada a una tabla hacia otro esquema"
+"la tabla tiene columna «%s» en la posición en que el tipo requiere «%s»."
+
+#: commands/tablecmds.c:8780
+#, c-format
+msgid "table \"%s\" has different type for column \"%s\""
+msgstr "la tabla «%s» tiene un tipo diferente para la columna «%s»"
+
+#: commands/tablecmds.c:8793
+#, c-format
+msgid "table has extra column \"%s\""
+msgstr "tabla tiene la columna extra «%s»"
 
-#: commands/tablecmds.c:7871
+#: commands/tablecmds.c:8840
 #, c-format
-msgid "relation \"%s\" is already in schema \"%s\""
-msgstr "la relación «%s» ya está en el esquema «%s»"
+msgid "\"%s\" is not a typed table"
+msgstr "«%s» no es una tabla tipada"
+
+#: commands/tablecmds.c:9009
+msgid "cannot move an owned sequence into another schema"
+msgstr ""
+"no se puede mover una secuencia enlazada a una tabla hacia otro esquema"
 
-#: commands/tablecmds.c:7934
+#: commands/tablecmds.c:9085
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "ya existe una relación llamada «%s» en el esquema «%s»"
 
-#: commands/tablespace.c:157 commands/tablespace.c:174
-#: commands/tablespace.c:185 commands/tablespace.c:193
-#: commands/tablespace.c:598 storage/file/copydir.c:61
+#: commands/tablespace.c:158 commands/tablespace.c:175
+#: commands/tablespace.c:186 commands/tablespace.c:194
+#: commands/tablespace.c:603 storage/file/copydir.c:61
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "no se pudo crear el directorio «%s»: %m"
 
-#: commands/tablespace.c:204
+#: commands/tablespace.c:205
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "no se pudo verificar el directorio «%s»: %m"
 
-#: commands/tablespace.c:213
+#: commands/tablespace.c:214
 #, c-format
 msgid "\"%s\" exists but is not a directory"
 msgstr "«%s» existe pero no es un directorio"
 
-#: commands/tablespace.c:243
+#: commands/tablespace.c:244
 #, c-format
 msgid "permission denied to create tablespace \"%s\""
 msgstr "se ha denegado el permiso para crear el tablespace «%s»"
 
-#: commands/tablespace.c:245
+#: commands/tablespace.c:246
 msgid "Must be superuser to create a tablespace."
 msgstr "Debe ser superusuario para crear tablespaces."
 
-#: commands/tablespace.c:261
+#: commands/tablespace.c:262
 msgid "tablespace location cannot contain single quotes"
 msgstr "la ruta del tablespace no puede contener comillas simples"
 
-#: commands/tablespace.c:271
+#: commands/tablespace.c:272
 msgid "tablespace location must be an absolute path"
 msgstr "la ubicación del tablespace debe ser una ruta absoluta"
 
-#: commands/tablespace.c:282
+#: commands/tablespace.c:283
 #, c-format
 msgid "tablespace location \"%s\" is too long"
 msgstr "la ruta «%s» del tablespace es demasiado larga"
 
-#: commands/tablespace.c:292 commands/tablespace.c:824
+#: commands/tablespace.c:293 commands/tablespace.c:829
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "el nombre de tablespace «%s» es inaceptable"
 
-#: commands/tablespace.c:294 commands/tablespace.c:825
+#: commands/tablespace.c:295 commands/tablespace.c:830
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
 msgstr "El prefijo «pg_» está reservado para tablespaces del sistema."
 
-#: commands/tablespace.c:304 commands/tablespace.c:837
+#: commands/tablespace.c:305 commands/tablespace.c:842
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "el tablespace «%s» ya existe"
 
-#: commands/tablespace.c:372 commands/tablespace.c:524
+#: commands/tablespace.c:377 commands/tablespace.c:529
 msgid "tablespaces are not supported on this platform"
 msgstr "tablespaces no están soportados en esta plataforma"
 
-#: commands/tablespace.c:416
+#: commands/tablespace.c:415 commands/tablespace.c:813
+#: commands/tablespace.c:880 commands/tablespace.c:985
+#: commands/tablespace.c:1358
+#, c-format
+msgid "tablespace \"%s\" does not exist"
+msgstr "no existe el tablespace «%s»"
+
+#: commands/tablespace.c:421
 #, c-format
 msgid "tablespace \"%s\" does not exist, skipping"
 msgstr "el tablespace «%s» no existe, ignorando"
 
-#: commands/tablespace.c:481
+#: commands/tablespace.c:486
 #, c-format
 msgid "tablespace \"%s\" is not empty"
 msgstr "el tablespace «%s» no está vacío"
 
-#: commands/tablespace.c:555
+#: commands/tablespace.c:560
 #, c-format
 msgid "directory \"%s\" does not exist"
 msgstr "no existe el directorio «%s»"
 
-#: commands/tablespace.c:556
-#, c-format
-msgid ""
-"Create directory \"%s\" for this tablespace before restarting the server."
+#: commands/tablespace.c:561
+msgid "Create this directory for the tablespace before restarting the server."
 msgstr ""
-"Cree el directorio «%s» para este tablespace antes de iniciar el servidor."
+"Cree este directorio para el tablespace antes de reiniciar el servidor."
 
-#: commands/tablespace.c:561
+#: commands/tablespace.c:566
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "no se pudo definir los permisos del directorio «%s»: %m"
 
-#: commands/tablespace.c:593
+#: commands/tablespace.c:598
 #, c-format
 msgid "directory \"%s\" already in use as a tablespace"
 msgstr "el directorio «%s» ya está siendo usado como tablespace"
 
-#: commands/tablespace.c:608 commands/tablespace.c:745
+#: commands/tablespace.c:613 commands/tablespace.c:750
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "no se pudo eliminar el enlace simbólico «%s»: %m"
 
-#: commands/tablespace.c:618
+#: commands/tablespace.c:623
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "no se pudo crear el enlace simbólico «%s»: %m"
 
-#: commands/tablespace.c:679 storage/file/copydir.c:67
-#: storage/file/copydir.c:106 storage/file/fd.c:1600
-#: postmaster/postmaster.c:1142 utils/adt/genfile.c:244 utils/adt/misc.c:213
-#: utils/misc/tzparser.c:345
+#: commands/tablespace.c:684 storage/file/copydir.c:67
+#: storage/file/copydir.c:106 storage/file/fd.c:1624
+#: postmaster/postmaster.c:1165 utils/adt/genfile.c:353 utils/adt/misc.c:213
+#: utils/misc/tzparser.c:323
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "no se pudo abrir el directorio «%s»: %m"
 
-#: commands/tablespace.c:709 commands/tablespace.c:721
-#: commands/tablespace.c:737
+#: commands/tablespace.c:714 commands/tablespace.c:726
+#: commands/tablespace.c:742
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "no se pudo eliminar el directorio «%s»: %m"
 
-#: commands/tablespace.c:1421
+#: commands/tablespace.c:1039
+#, c-format
+msgid "Tablespace \"%s\" does not exist."
+msgstr "No existe el tablespace «%s»."
+
+#: commands/tablespace.c:1450
 #, c-format
 msgid "tablespace %u is not empty"
 msgstr "el tablespace %u no está vacío"
 
-#: commands/trigger.c:192
-msgid "TRUNCATE FOR EACH ROW triggers are not supported"
-msgstr "los triggers TRUNCATE FOR EACH ROW no están soportados"
+#: commands/trigger.c:159
+#, c-format
+msgid "\"%s\" is a table"
+msgstr "«%s» es una tabla"
+
+#: commands/trigger.c:161
+msgid "Tables cannot have INSTEAD OF triggers."
+msgstr "Las tablas no pueden tener disparadores INSTEAD OF."
+
+#: commands/trigger.c:172 commands/trigger.c:179
+#, c-format
+msgid "\"%s\" is a view"
+msgstr "«%s» es una vista"
+
+#: commands/trigger.c:174
+msgid "Views cannot have row-level BEFORE or AFTER triggers."
+msgstr ""
+"Las vistas no pueden tener disparadores BEFORE o AFTER a nivel de fila."
+
+#: commands/trigger.c:181
+msgid "Views cannot have TRUNCATE triggers."
+msgstr "Las vistas no pueden tener disparadores TRUNCATE."
+
+#: commands/trigger.c:228
+msgid "TRUNCATE FOR EACH ROW triggers are not supported"
+msgstr "los disparadores TRUNCATE FOR EACH ROW no están soportados"
+
+#: commands/trigger.c:236
+msgid "INSTEAD OF triggers must be FOR EACH ROW"
+msgstr "los disparadores INSTEAD OF deben ser FOR EACH ROW"
+
+#: commands/trigger.c:240
+msgid "INSTEAD OF triggers cannot have WHEN conditions"
+msgstr "los disparadores INSTEAD OF no pueden tener condiciones WHEN"
+
+#: commands/trigger.c:244
+msgid "INSTEAD OF triggers cannot have column lists"
+msgstr "los disparadores INSTEAD OF no pueden tener listas de columnas"
 
-#: commands/trigger.c:233
+#: commands/trigger.c:288
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "no se puede usar una subconsulta en la condición WHEN de un trigger"
 
-#: commands/trigger.c:237
+#: commands/trigger.c:292
 msgid "cannot use aggregate function in trigger WHEN condition"
 msgstr ""
 "no se pueden usar funciones de agregación en condición WHEN de un trigger"
 
-#: commands/trigger.c:241
+#: commands/trigger.c:296
 msgid "cannot use window function in trigger WHEN condition"
 msgstr ""
 "no se pueden usar funciones de ventana deslizante en condición WHEN de un "
 "trigger"
 
-#: commands/trigger.c:261 commands/trigger.c:274
+#: commands/trigger.c:318 commands/trigger.c:331
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr ""
 "la condición WHEN de un trigger por sentencias no pueden referirse a los "
 "valores de las columnas"
 
-#: commands/trigger.c:266
+#: commands/trigger.c:323
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr ""
 "la condición WHEN de un trigger en INSERT no puede referirse a valores OLD"
 
-#: commands/trigger.c:279
+#: commands/trigger.c:336
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr ""
 "la condición WHEN de un trigger en DELETE no puede referirse a valores NEW"
 
-#: commands/trigger.c:284
+#: commands/trigger.c:341
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr ""
 "la condición WHEN de un trigger BEFORE no puede referirse a columnas de "
 "sistema de NEW"
 
-#: commands/trigger.c:322
+#: commands/trigger.c:379
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"trigger\""
 msgstr "cambiando el tipo de retorno de la función %s de «opaque» a «trigger»"
 
-#: commands/trigger.c:329
+#: commands/trigger.c:386
 #, c-format
 msgid "function %s must return type \"trigger\""
 msgstr "la función %s debe retornar tipo «trigger»"
 
-#: commands/trigger.c:438 commands/trigger.c:1152
+#: commands/trigger.c:496 commands/trigger.c:1234
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "ya existe un trigger «%s» para la relación «%s»"
 
-#: commands/trigger.c:719
+#: commands/trigger.c:781
 msgid "Found referenced table's UPDATE trigger."
 msgstr "Se encontró el disparador UPDATE de la tabla referenciada."
 
-#: commands/trigger.c:720
+#: commands/trigger.c:782
 msgid "Found referenced table's DELETE trigger."
 msgstr "Se encontró el disparador DELETE de la tabla referenciada."
 
-#: commands/trigger.c:721
+#: commands/trigger.c:783
 msgid "Found referencing table's trigger."
 msgstr "Se encontró el disparador en la tabla que hace referencia."
 
-#: commands/trigger.c:830 commands/trigger.c:846
+#: commands/trigger.c:892 commands/trigger.c:908
 #, c-format
 msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
 msgstr ""
 "ignorando el grupo de disparadores incompleto para la restricción «%s» %s"
 
-#: commands/trigger.c:858
+#: commands/trigger.c:920
 #, c-format
 msgid "converting trigger group into constraint \"%s\" %s"
 msgstr "convirtiendo el grupo de disparadores en la restricción «%s» %s"
 
-#: commands/trigger.c:998
+#: commands/trigger.c:1036
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
 msgstr "no existe el trigger «%s» para la tabla «%s», ignorando"
 
-#: commands/trigger.c:1273
+#: commands/trigger.c:1163 commands/trigger.c:1276 commands/trigger.c:1387
+#, c-format
+msgid "trigger \"%s\" for table \"%s\" does not exist"
+msgstr "no existe el trigger «%s» para la tabla «%s»"
+
+#: commands/trigger.c:1355
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "permiso denegado: «%s» es un trigger de sistema"
 
-#: commands/trigger.c:1848
+#: commands/trigger.c:1837
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "la función de trigger %u ha retornado un valor null"
 
-#: commands/trigger.c:1908 commands/trigger.c:2023 commands/trigger.c:2160
-#: commands/trigger.c:2304
+#: commands/trigger.c:1896 commands/trigger.c:2095 commands/trigger.c:2279
+#: commands/trigger.c:2521
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "un trigger BEFORE STATEMENT no puede retornar un valor"
 
-#: commands/trigger.c:2366 executor/execMain.c:1544
-#: executor/nodeLockRows.c:136 executor/nodeModifyTable.c:334
-#: executor/nodeModifyTable.c:522
+#: commands/trigger.c:2583 executor/execMain.c:1864
+#: executor/nodeLockRows.c:137 executor/nodeModifyTable.c:366
+#: executor/nodeModifyTable.c:582
 msgid "could not serialize access due to concurrent update"
 msgstr "no se pudo serializar el acceso debido a un update concurrente"
 
-#: commands/trigger.c:3981
+#: commands/trigger.c:4198
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "la restricción «%s» no es postergable"
 
-#: commands/trigger.c:4004
+#: commands/trigger.c:4221
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "no existe la restricción «%s»"
 
-#: commands/tsearchcmds.c:109 commands/tsearchcmds.c:929
+#: commands/tsearchcmds.c:117 commands/tsearchcmds.c:1044
 #, c-format
 msgid "function %s should return type %s"
 msgstr "la función %s debería retornar el tipo %s"
 
-#: commands/tsearchcmds.c:178
+#: commands/tsearchcmds.c:189
 msgid "must be superuser to create text search parsers"
 msgstr "debe ser superusuario para crear analizadores de búsqueda en texto"
 
-#: commands/tsearchcmds.c:226
+#: commands/tsearchcmds.c:237
 #, c-format
 msgid "text search parser parameter \"%s\" not recognized"
 msgstr "el parámetro de analizador de búsqueda en texto «%s» no es reconocido"
 
-#: commands/tsearchcmds.c:236
+#: commands/tsearchcmds.c:247
 msgid "text search parser start method is required"
 msgstr "se requiere el método start del analizador de búsqueda en texto"
 
-#: commands/tsearchcmds.c:241
+#: commands/tsearchcmds.c:252
 msgid "text search parser gettoken method is required"
 msgstr "se requiere el método gettoken del analizador de búsqueda en texto"
 
-#: commands/tsearchcmds.c:246
+#: commands/tsearchcmds.c:257
 msgid "text search parser end method is required"
 msgstr "se requiere el método end del analizador de búsqueda en texto"
 
-#: commands/tsearchcmds.c:251
+#: commands/tsearchcmds.c:262
 msgid "text search parser lextypes method is required"
 msgstr "se requiere el método lextypes del analizador de búsqueda en texto"
 
-#: commands/tsearchcmds.c:283
+#: commands/tsearchcmds.c:297
 msgid "must be superuser to drop text search parsers"
 msgstr "debe ser superusuario para eliminar analizadores de búsqueda en texto"
 
-#: commands/tsearchcmds.c:312
+#: commands/tsearchcmds.c:326
 #, c-format
 msgid "text search parser \"%s\" does not exist, skipping"
 msgstr "el analizador de búsqueda en texto «%s» no existe, ignorando"
 
-#: commands/tsearchcmds.c:367
+#: commands/tsearchcmds.c:381
 msgid "must be superuser to rename text search parsers"
 msgstr ""
 "debe ser superusuario para cambiar el nombre a analizadores de búsqueda en "
 "texto"
 
-#: commands/tsearchcmds.c:385
+#: commands/tsearchcmds.c:399
 #, c-format
 msgid "text search parser \"%s\" already exists"
 msgstr "el analizador de búsqueda en texto «%s» ya existe"
 
-#: commands/tsearchcmds.c:462
+#: commands/tsearchcmds.c:525
 #, c-format
 msgid "text search template \"%s\" does not accept options"
 msgstr "la plantilla de búsquede en texto «%s» no acepta opciones"
 
-#: commands/tsearchcmds.c:535
+#: commands/tsearchcmds.c:598
 msgid "text search template is required"
 msgstr "se requiere una plantilla de búsqueda en texto"
 
-#: commands/tsearchcmds.c:600
+#: commands/tsearchcmds.c:667
 #, c-format
 msgid "text search dictionary \"%s\" already exists"
 msgstr "el diccionario de búsqueda en texto «%s» ya existe"
 
-#: commands/tsearchcmds.c:660
+#: commands/tsearchcmds.c:775
 #, c-format
 msgid "text search dictionary \"%s\" does not exist, skipping"
 msgstr "el diccionario de búsqueda en texto «%s» no existe, ignorando"
 
-#: commands/tsearchcmds.c:990
+#: commands/tsearchcmds.c:1108
 msgid "must be superuser to create text search templates"
 msgstr "debe ser superusuario para crear una plantilla de búsqueda en texto"
 
-#: commands/tsearchcmds.c:1027
+#: commands/tsearchcmds.c:1145
 #, c-format
 msgid "text search template parameter \"%s\" not recognized"
 msgstr ""
 "el parámetro de la plantilla de búsqueda en texto «%s» no es reconocido"
 
-#: commands/tsearchcmds.c:1037
+#: commands/tsearchcmds.c:1155
 msgid "text search template lexize method is required"
 msgstr "se requiere el método lexize de la plantilla de búsqueda en texto"
 
-#: commands/tsearchcmds.c:1072
+#: commands/tsearchcmds.c:1193
 msgid "must be superuser to rename text search templates"
 msgstr ""
 "debe ser superusuario para cambiar el nombre a plantillas de búsqueda en "
 "texto"
 
-#: commands/tsearchcmds.c:1091
+#: commands/tsearchcmds.c:1212
 #, c-format
 msgid "text search template \"%s\" already exists"
 msgstr "ya existe la plantilla de búsqueda en texto «%s»"
 
-#: commands/tsearchcmds.c:1114
+#: commands/tsearchcmds.c:1281
 msgid "must be superuser to drop text search templates"
 msgstr "debe ser superusuario para eliminar plantillas de búsqueda en texto"
 
-#: commands/tsearchcmds.c:1143
+#: commands/tsearchcmds.c:1310
 #, c-format
 msgid "text search template \"%s\" does not exist, skipping"
 msgstr "la plantilla de búsqueda en texto «%s» no existe, ignorando"
 
-#: commands/tsearchcmds.c:1338
+#: commands/tsearchcmds.c:1508
 #, c-format
 msgid "text search configuration parameter \"%s\" not recognized"
 msgstr ""
 "el parámetro de configuración de búsqueda en texto «%s» no es reconocido"
 
-#: commands/tsearchcmds.c:1345
+#: commands/tsearchcmds.c:1515
 msgid "cannot specify both PARSER and COPY options"
 msgstr "no se puede especificar simultáneamente las opciones PARSER y COPY"
 
-#: commands/tsearchcmds.c:1373
+#: commands/tsearchcmds.c:1543
 msgid "text search parser is required"
 msgstr "el analizador de búsqueda en texto es requerido"
 
-#: commands/tsearchcmds.c:1479
+#: commands/tsearchcmds.c:1652
 #, c-format
 msgid "text search configuration \"%s\" already exists"
 msgstr "la configuración de búsqueda en texto «%s» ya existe"
 
-#: commands/tsearchcmds.c:1538
+#: commands/tsearchcmds.c:1759
 #, c-format
 msgid "text search configuration \"%s\" does not exist, skipping"
 msgstr "no existe la configuración de búsqueda en texto «%s», ignorando"
 
-#: commands/tsearchcmds.c:1760
+#: commands/tsearchcmds.c:1981
 #, c-format
 msgid "token type \"%s\" does not exist"
 msgstr "no existe el tipo de elemento «%s»"
 
-#: commands/tsearchcmds.c:1984
+#: commands/tsearchcmds.c:2203
 #, c-format
 msgid "mapping for token type \"%s\" does not exist"
 msgstr "no existe un mapeo para el tipo de elemento «%s»"
 
-#: commands/tsearchcmds.c:1990
+#: commands/tsearchcmds.c:2209
 #, c-format
 msgid "mapping for token type \"%s\" does not exist, skipping"
 msgstr "el mapeo para el tipo de elemento «%s» no existe, ignorando"
 
-#: commands/tsearchcmds.c:2143 commands/tsearchcmds.c:2254
+#: commands/tsearchcmds.c:2362 commands/tsearchcmds.c:2473
 #, c-format
 msgid "invalid parameter list format: \"%s\""
 msgstr "el formato de la lista de parámetros no es válido: «%s»"
 
-#: commands/typecmds.c:163
+#: commands/typecmds.c:169
 msgid "must be superuser to create a base type"
 msgstr "debe ser superusuario para crear un tipo base"
 
-#: commands/typecmds.c:267
+#: commands/typecmds.c:275
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "el atributo de tipo «%s» no es reconocido"
 
-#: commands/typecmds.c:321
+#: commands/typecmds.c:329
 #, c-format
 msgid "invalid type category \"%s\": must be simple ASCII"
 msgstr "la categoría de tipo «%s» no es válida: debe ser ASCII simple"
 
-#: commands/typecmds.c:340
+#: commands/typecmds.c:348
 #, c-format
 msgid "array element type cannot be %s"
 msgstr "el tipo de elemento de array no puede ser %s"
 
-#: commands/typecmds.c:372
+#: commands/typecmds.c:380
 #, c-format
 msgid "alignment \"%s\" not recognized"
 msgstr "el alineamiento «%s» no es reconocido"
 
-#: commands/typecmds.c:389
+#: commands/typecmds.c:397
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "el almacenamiento «%s» no es reconocido"
 
-#: commands/typecmds.c:398
+#: commands/typecmds.c:408
 msgid "type input function must be specified"
 msgstr "debe especificarse la función de ingreso del tipo"
 
-#: commands/typecmds.c:402
+#: commands/typecmds.c:412
 msgid "type output function must be specified"
 msgstr "debe especificarse la función de salida de tipo"
 
-#: commands/typecmds.c:407
+#: commands/typecmds.c:417
 msgid ""
 "type modifier output function is useless without a type modifier input "
 "function"
@@ -7014,111 +7187,112 @@ msgstr ""
 "la función de salida de modificadores de tipo es inútil sin una función de "
 "entrada de modificadores de tipo"
 
-#: commands/typecmds.c:430
+#: commands/typecmds.c:440
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to %s"
 msgstr "cambiando el tipo de retorno de la función %s de «opaque» a %s"
 
-#: commands/typecmds.c:437
+#: commands/typecmds.c:447
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "la función de entrada %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:447
+#: commands/typecmds.c:457
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"cstring\""
 msgstr "cambiando el tipo de retorno de la función %s de «opaque» a «cstring»"
 
-#: commands/typecmds.c:454
+#: commands/typecmds.c:464
 #, c-format
 msgid "type output function %s must return type \"cstring\""
 msgstr "la función de salida %s del tipo debe retornar «cstring»"
 
-#: commands/typecmds.c:463
+#: commands/typecmds.c:473
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "la función de recepción %s del tipo debe retornar %s"
 
-#: commands/typecmds.c:472
+#: commands/typecmds.c:482
 #, c-format
 msgid "type send function %s must return type \"bytea\""
 msgstr "la función de envío %s del tipo debe retornar «bytea»"
 
-#: commands/typecmds.c:677 commands/typecmds.c:2205
+#: commands/typecmds.c:687
 #, c-format
 msgid "\"%s\" is not a domain"
 msgstr "«%s» no es un dominio"
 
-#: commands/typecmds.c:816
+#: commands/typecmds.c:827
 #, c-format
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "«%s» no es un tipo de dato base válido para un dominio"
 
-#: commands/typecmds.c:885
+#: commands/typecmds.c:909
 msgid "multiple default expressions"
 msgstr "múltiples expresiones default"
 
-#: commands/typecmds.c:949 commands/typecmds.c:958
+#: commands/typecmds.c:973 commands/typecmds.c:982
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "las restricciones NULL/NOT NULL no coinciden"
 
-#: commands/typecmds.c:977 commands/typecmds.c:1902
+#: commands/typecmds.c:1001 commands/typecmds.c:1984
 msgid "unique constraints not possible for domains"
 msgstr "no se pueden poner restricciones de unicidad a un dominio"
 
-#: commands/typecmds.c:983 commands/typecmds.c:1908
+#: commands/typecmds.c:1007 commands/typecmds.c:1990
 msgid "primary key constraints not possible for domains"
 msgstr "no se pueden poner restricciones de llave primaria a un dominio"
 
-#: commands/typecmds.c:989 commands/typecmds.c:1914
+#: commands/typecmds.c:1013 commands/typecmds.c:1996
 msgid "exclusion constraints not possible for domains"
 msgstr "las restricciones por exclusión no son posibles para los dominios"
 
-#: commands/typecmds.c:995 commands/typecmds.c:1920
+#: commands/typecmds.c:1019 commands/typecmds.c:2002
 msgid "foreign key constraints not possible for domains"
 msgstr "no se pueden poner restricciones de llave foránea a un dominio"
 
-#: commands/typecmds.c:1004 commands/typecmds.c:1929
+#: commands/typecmds.c:1028 commands/typecmds.c:2011
 msgid "specifying constraint deferrability not supported for domains"
 msgstr ""
 "no se puede especificar la postergabilidad de las restricciones a un dominio"
 
-#: commands/typecmds.c:1251
+#: commands/typecmds.c:1272 utils/cache/typcache.c:996
+#, c-format
+msgid "%s is not an enum"
+msgstr "%s no es un enum"
+
+#: commands/typecmds.c:1332
 #, c-format
 msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
 msgstr ""
 "cambiando el tipo de argumento de la función %s de «opaque» a «cstring»"
 
-#: commands/typecmds.c:1302
+#: commands/typecmds.c:1383
 #, c-format
 msgid "changing argument type of function %s from \"opaque\" to %s"
 msgstr "cambiando el tipo de argumento de la función %s de «opaque» a %s"
 
-#: commands/typecmds.c:1401
+#: commands/typecmds.c:1482
 #, c-format
 msgid "typmod_in function %s must return type \"integer\""
 msgstr "la función typmod_in %s debe retornar tipo «integer»"
 
-#: commands/typecmds.c:1428
+#: commands/typecmds.c:1509
 #, c-format
 msgid "typmod_out function %s must return type \"cstring\""
 msgstr "la función typmod_out %s debe retornar «cstring»"
 
-#: commands/typecmds.c:1455
+#: commands/typecmds.c:1536
 #, c-format
 msgid "type analyze function %s must return type \"boolean\""
 msgstr "la función de análisis %s del tipo debe retornar «boolean»"
 
-#: commands/typecmds.c:1513
-msgid "composite type must have at least one attribute"
-msgstr "un tipo compuesto debe tener al menos un atributo"
-
-#: commands/typecmds.c:1754
+#: commands/typecmds.c:1836
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "la columna «%s» de la tabla «%s» contiene valores null"
 
-#: commands/typecmds.c:2000
+#: commands/typecmds.c:2082
 #, c-format
 msgid ""
 "column \"%s\" of table \"%s\" contains values that violate the new constraint"
@@ -7126,214 +7300,93 @@ msgstr ""
 "la columna «%s» de la relación «%s» contiene valores que violan la nueva "
 "restricción"
 
-#: commands/typecmds.c:2281 commands/typecmds.c:2290
+#: commands/typecmds.c:2287
+#, c-format
+msgid "%s is not a domain"
+msgstr "%s no es un dominio"
+
+#: commands/typecmds.c:2369 commands/typecmds.c:2378
 msgid "cannot use table references in domain check constraint"
 msgstr ""
 "no se pueden usar referencias a tablas en restricción check para un dominio"
 
-#: commands/typecmds.c:2519 commands/typecmds.c:2591 commands/typecmds.c:2822
+#: commands/typecmds.c:2608 commands/typecmds.c:2680 commands/typecmds.c:2904
 #, c-format
 msgid "%s is a table's row type"
 msgstr "%s es el tipo de registro de una tabla"
 
-#: commands/typecmds.c:2521 commands/typecmds.c:2593 commands/typecmds.c:2824
+#: commands/typecmds.c:2610 commands/typecmds.c:2682 commands/typecmds.c:2906
 msgid "Use ALTER TABLE instead."
 msgstr "Considere usar ALTER TABLE."
 
-#: commands/typecmds.c:2528 commands/typecmds.c:2600 commands/typecmds.c:2739
+#: commands/typecmds.c:2617 commands/typecmds.c:2689 commands/typecmds.c:2835
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "no se puede alterar el tipo de array «%s»"
 
-#: commands/typecmds.c:2530 commands/typecmds.c:2602 commands/typecmds.c:2741
+#: commands/typecmds.c:2619 commands/typecmds.c:2691 commands/typecmds.c:2837
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "Puede alterar el tipo %s, lo cual alterará el tipo de array también."
 
-#: commands/typecmds.c:2786
-#, c-format
-msgid "type %s is already in schema \"%s\""
-msgstr "el tipo %s ya está en el esquema «%s»"
-
-#: commands/typecmds.c:2808
+#: commands/typecmds.c:2890
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "ya existe un tipo llamado «%s» en el esquema «%s»"
 
-#: commands/user.c:150
-msgid "SYSID can no longer be specified"
-msgstr "SYSID ya no puede ser especificado"
-
-#: commands/user.c:272
-msgid "must be superuser to create superusers"
-msgstr "debe ser superusuario para crear superusuarios"
-
-#: commands/user.c:279
-msgid "permission denied to create role"
-msgstr "se ha denegado el permiso para crear el rol"
-
-#: commands/user.c:286 commands/user.c:1033
-#, c-format
-msgid "role name \"%s\" is reserved"
-msgstr "el nombre de rol «%s» está reservado"
-
-#: commands/user.c:300 commands/user.c:1027
-#, c-format
-msgid "role \"%s\" already exists"
-msgstr "el rol «%s» ya existe"
-
-#: commands/user.c:579 commands/user.c:767 commands/user.c:851
-#: commands/user.c:1002 commands/variable.c:735 commands/variable.c:849
-#: utils/cache/lsyscache.c:2669 utils/init/miscinit.c:413
-#, c-format
-msgid "role \"%s\" does not exist"
-msgstr "no existe el rol «%s»"
-
-#: commands/user.c:592 commands/user.c:784 commands/user.c:1267
-#: commands/user.c:1404
-msgid "must be superuser to alter superusers"
-msgstr "debe ser superusuario para alterar superusuarios"
-
-#: commands/user.c:607 commands/user.c:792
-msgid "permission denied"
-msgstr "permiso denegado"
-
-#: commands/user.c:802
-#, c-format
-msgid "database \"%s\" not found"
-msgstr "base de datos «%s» no encontrada"
-
-#: commands/user.c:824
-msgid "permission denied to drop role"
-msgstr "se ha denegado el permiso para eliminar el rol"
-
-#: commands/user.c:856
-#, c-format
-msgid "role \"%s\" does not exist, skipping"
-msgstr "el rol «%s» no existe, ignorando"
-
-#: commands/user.c:868 commands/user.c:872
-msgid "current user cannot be dropped"
-msgstr "el usuario activo no puede ser eliminado"
-
-#: commands/user.c:876
-msgid "session user cannot be dropped"
-msgstr "no se puede eliminar un usuario de la sesión"
-
-#: commands/user.c:887
-msgid "must be superuser to drop superusers"
-msgstr "debe ser superusuario para eliminar superusuarios"
-
-#: commands/user.c:900
-#, c-format
-msgid "role \"%s\" cannot be dropped because some objects depend on it"
-msgstr "no se puede eliminar el rol «%s» porque otros objetos dependen de él"
-
-#: commands/user.c:1017
-msgid "session user cannot be renamed"
-msgstr "no se puede cambiar el nombre a un usuario de la sesión"
-
-#: commands/user.c:1021
-msgid "current user cannot be renamed"
-msgstr "no se puede cambiar el nombre al usuario activo"
-
-#: commands/user.c:1044
-msgid "must be superuser to rename superusers"
-msgstr "debe ser superusuario para cambiar el nombre a superusuarios"
-
-#: commands/user.c:1051
-msgid "permission denied to rename role"
-msgstr "se ha denegado el permiso para cambiar el nombre al rol"
-
-#: commands/user.c:1072
-msgid "MD5 password cleared because of role rename"
-msgstr "la contraseña MD5 fue borrada debido al cambio de nombre del rol"
-
-#: commands/user.c:1128
-msgid "column names cannot be included in GRANT/REVOKE ROLE"
-msgstr "los nombres de columna no pueden ser incluidos en GRANT/REVOKE ROLE"
-
-#: commands/user.c:1166
-msgid "permission denied to drop objects"
-msgstr "se ha denegado el permiso para eliminar objetos"
-
-#: commands/user.c:1193 commands/user.c:1202
-msgid "permission denied to reassign objects"
-msgstr "se ha denegado el permiso para reasignar objetos"
-
-#: commands/user.c:1275 commands/user.c:1412
-#, c-format
-msgid "must have admin option on role \"%s\""
-msgstr "debe tener opción de admin en rol «%s»"
-
-#: commands/user.c:1283
-msgid "must be superuser to set grantor"
-msgstr "debe ser superusuario para especificar el cedente (grantor)"
-
-#: commands/user.c:1308
-#, c-format
-msgid "role \"%s\" is a member of role \"%s\""
-msgstr "el rol «%s» es un miembro del rol «%s»"
-
-#: commands/user.c:1323
-#, c-format
-msgid "role \"%s\" is already a member of role \"%s\""
-msgstr "el rol «%s» ya es un miembro del rol «%s»"
-
-#: commands/user.c:1434
-#, c-format
-msgid "role \"%s\" is not a member of role \"%s\""
-msgstr "el rol «%s» no es un miembro del rol «%s»"
-
-#: commands/vacuum.c:421
+#: commands/vacuum.c:419
 msgid "oldest xmin is far in the past"
 msgstr "xmin más antiguo es demasiado antiguo"
 
-#: commands/vacuum.c:422
+#: commands/vacuum.c:420
 msgid "Close open transactions soon to avoid wraparound problems."
 msgstr ""
 "Cierre transacciones pronto para prevenir problemas por reciclaje de "
 "transacciones."
 
-#: commands/vacuum.c:747
+#: commands/vacuum.c:811
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 "algunas bases de datos no han tenido VACUUM en más de 2 mil millones de "
 "transacciones"
 
-#: commands/vacuum.c:748
+#: commands/vacuum.c:812
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr ""
 "Puede haber sufrido ya problemas de pérdida de datos por reciclaje del "
 "contador de transacciones."
 
-#: commands/vacuum.c:873
+#: commands/vacuum.c:919
+#, c-format
+msgid "skipping vacuum of \"%s\" --- lock not available"
+msgstr "saltando el vacuum de «%s»: el candado no está disponible"
+
+#: commands/vacuum.c:945
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr "ignorando «%s»: sólo un superusuario puede aplicarle VACUUM"
 
-#: commands/vacuum.c:877
+#: commands/vacuum.c:949
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr ""
 "ignorando «%s»: sólo un superusuario o el dueño de la base de datos puede "
 "aplicarle VACUUM"
 
-#: commands/vacuum.c:881
+#: commands/vacuum.c:953
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr ""
 "ignorando «%s»: sólo su dueño o el de la base de datos puede aplicarle VACUUM"
 
-#: commands/vacuum.c:898
+#: commands/vacuum.c:970
 #, c-format
-msgid ""
-"skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
+msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
-"ignorando «%s»: no se puede aplicar VACUUM a índices, vistas o tablas "
-"especiales de sistema"
+"ignorando «%s»: no se puede aplicar VACUUM a objetos que no son tablas o a "
+"tablas especiales de sistema"
 
-#: commands/vacuumlazy.c:234
+#: commands/vacuumlazy.c:254
 #, c-format
 msgid ""
 "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
@@ -7346,18 +7399,18 @@ msgstr ""
 "tuplas: eliminadas %.0f, remanentes %.0f\n"
 "uso del sistema: %s"
 
-#: commands/vacuumlazy.c:449
+#: commands/vacuumlazy.c:508
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr ""
 "la página %2$u de la relación «%1$s» no está inicializada --- arreglando"
 
-#: commands/vacuumlazy.c:785
+#: commands/vacuumlazy.c:865
 #, c-format
 msgid "\"%s\": removed %.0f row versions in %u pages"
 msgstr "«%s»: se eliminaron %.0f versiones de filas en %u páginas"
 
-#: commands/vacuumlazy.c:790
+#: commands/vacuumlazy.c:870
 #, c-format
 msgid ""
 "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
@@ -7366,7 +7419,7 @@ msgstr ""
 "«%s»: se encontraron %.0f versiones de filas eliminables y %.0f no "
 "eliminables en %u de %u páginas"
 
-#: commands/vacuumlazy.c:793
+#: commands/vacuumlazy.c:874
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -7379,28 +7432,28 @@ msgstr ""
 "%u páginas están completamente vacías.\n"
 "%s."
 
-#: commands/vacuumlazy.c:851
+#: commands/vacuumlazy.c:932
 #, c-format
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr "«%s»: se eliminaron %d versiones de filas en %d páginas"
 
-#: commands/vacuumlazy.c:854 commands/vacuumlazy.c:946
-#: commands/vacuumlazy.c:1071
+#: commands/vacuumlazy.c:935 commands/vacuumlazy.c:1027
+#: commands/vacuumlazy.c:1160
 #, c-format
 msgid "%s."
 msgstr "%s."
 
-#: commands/vacuumlazy.c:943
+#: commands/vacuumlazy.c:1024
 #, c-format
 msgid "scanned index \"%s\" to remove %d row versions"
 msgstr "se recorrió el índice «%s» para eliminar %d versiones de filas"
 
-#: commands/vacuumlazy.c:985
+#: commands/vacuumlazy.c:1065
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "el índice «%s» ahora contiene %.0f versiones de filas en %u páginas"
 
-#: commands/vacuumlazy.c:989
+#: commands/vacuumlazy.c:1069
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -7411,257 +7464,574 @@ msgstr ""
 "%u páginas de índice han sido eliminadas, %u son reusables.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1068
+#: commands/vacuumlazy.c:1157
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "«%s»: truncadas %u a %u páginas"
 
-#: commands/variable.c:62
-msgid "invalid list syntax for parameter \"datestyle\""
-msgstr "la sintaxis de lista no es válida para el parámetro «datestyle»"
-
-#: commands/variable.c:161
+#: commands/variable.c:160 utils/misc/guc.c:8185
 #, c-format
-msgid "unrecognized \"datestyle\" key word: \"%s\""
-msgstr "no se reconoce el valor de «datestyle» «%s»"
+msgid "Unrecognized key word: \"%s\"."
+msgstr "Palabra clave no reconocida: «%s»."
 
-#: commands/variable.c:175
-msgid "conflicting \"datestyle\" specifications"
-msgstr "especificaciones contradictorias de «datestyle»"
+#: commands/variable.c:172
+msgid "Conflicting \"datestyle\" specifications."
+msgstr "Especificaciones contradictorias de «datestyle»."
 
-#: commands/variable.c:285
-msgid "invalid interval value for time zone: month not allowed"
-msgstr "no se permite especificar mes en interval para huso horario"
+#: commands/variable.c:328
+msgid "Cannot specify months in time zone interval."
+msgstr "No se pueden especificar meses en el intervalo de huso horario."
 
-#: commands/variable.c:293
-msgid "invalid interval value for time zone: day not allowed"
-msgstr "no se permite especificar día en interval para huso horario"
-
-#: commands/variable.c:361 commands/variable.c:493
-#, c-format
-msgid "unrecognized time zone name: \"%s\""
-msgstr "el nombre de huso horario no es reconocido: «%s»"
+#: commands/variable.c:334
+msgid "Cannot specify days in time zone interval."
+msgstr "No se pueden especificar días en el intervalo de huso horario."
 
-#: commands/variable.c:370 commands/variable.c:502
+#: commands/variable.c:378 commands/variable.c:517
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "el huso horario «%s» parece usar segundos intercalares (bisiestos)"
 
-#: commands/variable.c:372 commands/variable.c:504
+#: commands/variable.c:380 commands/variable.c:519
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL no soporta segundos intercalares."
 
-#: commands/variable.c:557
+#: commands/variable.c:582
+msgid "cannot set transaction read-write mode inside a read-only transaction"
+msgstr ""
+"no se puede poner en modo de escritura dentro de una transacción de sólo "
+"lectura"
+
+#: commands/variable.c:589
+msgid "transaction read-write mode must be set before any query"
+msgstr "el modo de escritura debe ser activado antes de cualquier consulta"
+
+#: commands/variable.c:595
+msgid "cannot set transaction read-write mode during recovery"
+msgstr "no se puede poner en modo de escritura durante la recuperación"
+
+#: commands/variable.c:642
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr ""
 "SET TRANSACTION ISOLATION LEVEL debe ser llamado antes de cualquier consulta"
 
-#: commands/variable.c:566
+#: commands/variable.c:649
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr ""
 "SET TRANSACTION ISOLATION LEVEL no debe ser llamado en una subtransacción"
 
-#: commands/variable.c:665 utils/mb/mbutils.c:241
+#: commands/variable.c:655
+msgid "cannot use serializable mode in a hot standby"
+msgstr "no se puede utilizar el modo serializable en un hot standby"
+
+#: commands/variable.c:656
+msgid "You can use REPEATABLE READ instead."
+msgstr "Puede utilizar REPEATABLE READ en su lugar."
+
+#: commands/variable.c:704
+msgid ""
+"SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
+msgstr ""
+"SET TRANSACTION [NOT] DEFERRABLE no puede ser llamado en una subtransacción"
+
+#: commands/variable.c:710
+msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
+msgstr ""
+"SET TRANSACTION [NOT] DEFERRABLE debe ser llamado antes de cualquier consulta"
+
+#: commands/variable.c:792
 #, c-format
-msgid "conversion between %s and %s is not supported"
-msgstr "la conversión entre %s y %s no está soportada"
+msgid "Conversion between %s and %s is not supported."
+msgstr "La conversión entre %s y %s no está soportada."
 
-#: commands/variable.c:865
+#: commands/variable.c:799
+msgid "Cannot change \"client_encoding\" now."
+msgstr "No se puede cambiar «client_encoding» ahora."
+
+#: commands/variable.c:969
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "se ha denegado el permiso para definir el rol «%s»"
 
-#: tcop/fastpath.c:110 tcop/fastpath.c:492 tcop/fastpath.c:622
+#: commands/view.c:143
 #, c-format
-msgid "invalid argument size %d in function call message"
+msgid "could not determine which collation to use for view column \"%s\""
 msgstr ""
-"el tamaño de argumento %d no es válido en el mensaje de llamada a función"
+"no se pudo determinar el ordenamiento (collation) a usar para la columna "
+"«%s» de vista"
 
-#: tcop/fastpath.c:304 tcop/postgres.c:957 tcop/postgres.c:1267
-#: tcop/postgres.c:1548 tcop/postgres.c:1990 tcop/postgres.c:2358
-#: tcop/postgres.c:2439
-msgid ""
-"current transaction is aborted, commands ignored until end of transaction "
-"block"
+#: commands/view.c:158
+msgid "view must have at least one column"
+msgstr "una vista debe tener al menos una columna"
+
+#: commands/view.c:283 commands/view.c:295
+msgid "cannot drop columns from view"
+msgstr "no se pueden eliminar columnas de una vista"
+
+#: commands/view.c:300
+#, c-format
+msgid "cannot change name of view column \"%s\" to \"%s\""
+msgstr "no se puede cambiar el nombre de la columna «%s» de la vista a «%s»"
+
+#: commands/view.c:308
+#, c-format
+msgid "cannot change data type of view column \"%s\" from %s to %s"
 msgstr ""
-"transacción abortada, las órdenes serán ignoradas hasta el fin de bloque de "
-"transacción"
+"no se puede cambiar el tipo de dato de la columna «%s» de la vista de %s a %s"
+
+#: commands/view.c:447
+msgid "views must not contain SELECT INTO"
+msgstr "una vista no puede tener SELECT INTO"
+
+#: commands/view.c:451
+msgid "views must not contain data-modifying statements in WITH"
+msgstr "las vistas no deben contener sentencias que modifiquen datos en WITH"
+
+#: commands/view.c:479
+msgid "CREATE VIEW specifies more column names than columns"
+msgstr "CREATE VIEW especifica más nombres de columna que columnas"
 
-#: tcop/fastpath.c:332
+#: commands/view.c:487
+msgid "views cannot be unlogged because they do not have storage"
+msgstr "las vistas no pueden ser unlogged porque no tienen almacenamiento"
+
+#: commands/view.c:501
 #, c-format
-msgid "fastpath function call: \"%s\" (OID %u)"
-msgstr "llamada a función fastpath: «%s» (OID %u)"
+msgid "view \"%s\" will be a temporary view"
+msgstr "la vista «%s» será una vista temporal"
+
+#: commands/seclabel.c:58
+msgid "no security label providers have been loaded"
+msgstr "no se ha cargado ningún proveedor de etiquetas de seguridad"
 
-#: tcop/fastpath.c:359 parser/parse_func.c:1654
-msgid "argument to pg_get_expr() must come from system catalogs"
-msgstr "el argumento a pg_get_expr() debe venir de catálogos del sistema"
+#: commands/seclabel.c:62
+msgid ""
+"must specify provider when multiple security label providers have been loaded"
+msgstr ""
+"debe especificar un proveedor de etiquetas de seguridad cuando más de uno ha "
+"sido cargados"
 
-#: tcop/fastpath.c:418 tcop/postgres.c:1127 tcop/postgres.c:1414
-#: tcop/postgres.c:1831 tcop/postgres.c:2048
+#: commands/seclabel.c:80
 #, c-format
-msgid "duration: %s ms"
-msgstr "duración: %s ms"
+msgid "security label provider \"%s\" is not loaded"
+msgstr "el proveedor de etiquetas de seguridad «%s» no está cargado"
 
-#: tcop/fastpath.c:422
+#: commands/extension.c:148 commands/extension.c:2441
 #, c-format
-msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
-msgstr "duración: %s ms  llamada a función fastpath: «%s» (OID %u)"
+msgid "extension \"%s\" does not exist"
+msgstr "no existe la extensión «%s»"
 
-#: tcop/fastpath.c:460 tcop/fastpath.c:587
+#: commands/extension.c:247 commands/extension.c:256 commands/extension.c:268
+#: commands/extension.c:278
 #, c-format
-msgid "function call message contains %d arguments but function requires %d"
+msgid "invalid extension name: \"%s\""
+msgstr "nombre de extensión no válido: «%s»"
+
+#: commands/extension.c:248
+msgid "Extension names must not be empty."
+msgstr "Los nombres de extensión no deben ser vacíos."
+
+#: commands/extension.c:257
+msgid "Extension names must not contain \"--\"."
+msgstr "Los nombres de extensión no deben contener «--»."
+
+#: commands/extension.c:269
+msgid "Extension names must not begin or end with \"-\"."
+msgstr "Los nombres de extensión no deben empezar ni terminar con «-»."
+
+#: commands/extension.c:279
+msgid "Extension names must not contain directory separator characters."
 msgstr ""
-"el mensaje de llamada a función contiene %d argumentos pero la función "
-"requiere %d"
+"Los nombres de extensión no deben contener caracteres separadores de "
+"directorio."
 
-#: tcop/fastpath.c:468
+#: commands/extension.c:294 commands/extension.c:303 commands/extension.c:312
+#: commands/extension.c:322
 #, c-format
-msgid "function call message contains %d argument formats but %d arguments"
+msgid "invalid extension version name: \"%s\""
+msgstr "nombre de versión de extensión no válido: «%s»"
+
+#: commands/extension.c:295
+msgid "Version names must not be empty."
+msgstr "Los nombres de versión no deben ser vacíos."
+
+#: commands/extension.c:304
+msgid "Version names must not contain \"--\"."
+msgstr "Los nombres de versión no deben contener «--»."
+
+#: commands/extension.c:313
+msgid "Version names must not begin or end with \"-\"."
+msgstr "Los nombres de versión no deben empezar ni terminar con «-»."
+
+#: commands/extension.c:323
+msgid "Version names must not contain directory separator characters."
 msgstr ""
-"el mensaje de llamada a función contiene %d formatos de argumento pero %d "
-"argumentos"
+"Los nombres de versión no deben contener caracteres separadores de "
+"directorio."
 
-#: tcop/fastpath.c:555 tcop/fastpath.c:638
+#: commands/extension.c:473
 #, c-format
-msgid "incorrect binary data format in function argument %d"
-msgstr "el formato de datos binarios es incorrecto en argumento %d a función"
+msgid "could not open extension control file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de control de extensión «%s»: %m"
 
-#: tcop/postgres.c:398 tcop/postgres.c:410 tcop/postgres.c:421
-#: tcop/postgres.c:433 tcop/postgres.c:4154
+#: commands/extension.c:494 commands/extension.c:504
 #, c-format
-msgid "invalid frontend message type %d"
-msgstr "el tipo de mensaje de frontend %d no es válido"
+msgid "parameter \"%s\" cannot be set in a secondary extension control file"
+msgstr ""
+"el parámetro «%s» no se puede cambiar en un archivo control secundario de "
+"extensión"
 
-#: tcop/postgres.c:898
+#: commands/extension.c:543
 #, c-format
-msgid "statement: %s"
-msgstr "sentencia: %s"
+msgid "\"%s\" is not a valid encoding name"
+msgstr "«%s» no es un nombre válido de codificación"
 
-#: tcop/postgres.c:1132
+#: commands/extension.c:557
 #, c-format
-msgid "duration: %s ms  statement: %s"
-msgstr "duración: %s ms  sentencia: %s"
+msgid "parameter \"%s\" must be a list of extension names"
+msgstr "el parámetro «%s» debe ser una lista de nombres de extensión"
 
-#: tcop/postgres.c:1182
+#: commands/extension.c:564
 #, c-format
-msgid "parse %s: %s"
-msgstr "parse %s: %s"
+msgid "unrecognized parameter \"%s\" in file \"%s\""
+msgstr "parámetro no reconocido «%s» en el archivo «%s»"
 
-#: tcop/postgres.c:1240
-msgid "cannot insert multiple commands into a prepared statement"
-msgstr "no se pueden insertar múltiples órdenes en una sentencia preparada"
+#: commands/extension.c:573
+msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
+msgstr ""
+"el parámetro «schema» no puede ser especificado cuando «relocatable» es "
+"verdadero"
 
-#: tcop/postgres.c:1419
-#, c-format
-msgid "duration: %s ms  parse %s: %s"
-msgstr "duración: %s ms  parse: %s: %s"
+#: commands/extension.c:725
+msgid ""
+"transaction control statements are not allowed within an extension script"
+msgstr ""
+"las sentencias de control de transacción no están permitidos dentro de un "
+"guión de transacción"
 
-#: tcop/postgres.c:1465
+#: commands/extension.c:795
 #, c-format
-msgid "bind %s to %s"
-msgstr "bind %s a %s"
+msgid "permission denied to create extension \"%s\""
+msgstr "se ha denegado el permiso para crear la extensión «%s»"
 
-#: tcop/postgres.c:1484 tcop/postgres.c:2338
-msgid "unnamed prepared statement does not exist"
-msgstr "no existe una sentencia preparada sin nombre"
+#: commands/extension.c:797
+msgid "Must be superuser to create this extension."
+msgstr "Debe ser superusuario para crear esta extensión."
 
-#: tcop/postgres.c:1526
+#: commands/extension.c:801
 #, c-format
-msgid "bind message has %d parameter formats but %d parameters"
-msgstr ""
-"el mensaje de enlace (bind) tiene %d formatos de parámetro pero %d parámetros"
+msgid "permission denied to update extension \"%s\""
+msgstr "se ha denegado el permiso para actualizar la extensión «%s»"
 
-#: tcop/postgres.c:1532
+#: commands/extension.c:803
+msgid "Must be superuser to update this extension."
+msgstr "Debe ser superusuario para actualizar esta extensión."
+
+#: commands/extension.c:1083
 #, c-format
 msgid ""
-"bind message supplies %d parameters, but prepared statement \"%s\" requires "
-"%d"
+"extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr ""
-"el mensaje de enlace (bind) entrega %d parámetros, pero la sentencia "
-"preparada «%s» requiere %d"
+"la extensión «%s» no tiene ruta de actualización desde la versión «%s» hasta "
+"la versión «%s»"
 
-#: tcop/postgres.c:1697
+#: commands/extension.c:1210
 #, c-format
-msgid "incorrect binary data format in bind parameter %d"
+msgid "extension \"%s\" already exists, skipping"
+msgstr "la extensión «%s» ya existe, saltando"
+
+#: commands/extension.c:1217
+#, c-format
+msgid "extension \"%s\" already exists"
+msgstr "la extensión «%s» ya existe"
+
+#: commands/extension.c:1228
+msgid "nested CREATE EXTENSION is not supported"
+msgstr "los CREATE EXTENSION anidados no están soportados"
+
+#: commands/extension.c:1283 commands/extension.c:2501
+msgid "version to install must be specified"
+msgstr "la versión a instalar debe ser especificada"
+
+#: commands/extension.c:1300
+#, c-format
+msgid "FROM version must be different from installation target version \"%s\""
 msgstr ""
-"el formato de datos binarios es incorrecto en el parámetro de enlace %d"
+"la versión FROM debe ser diferente de la versión destino de instalación «%s»"
 
-#: tcop/postgres.c:1836
+#: commands/extension.c:1355
 #, c-format
-msgid "duration: %s ms  bind %s%s%s: %s"
-msgstr "duración: %s ms  bind %s%s%s: %s"
+msgid "extension \"%s\" must be installed in schema \"%s\""
+msgstr "la extensión «%s» debe ser instalada en el esquema «%s»"
 
-#: tcop/postgres.c:1884 tcop/postgres.c:2425
+#: commands/extension.c:1434 commands/extension.c:2642
 #, c-format
-msgid "portal \"%s\" does not exist"
-msgstr "no existe el portal «%s»"
+msgid "required extension \"%s\" is not installed"
+msgstr "la extensión requerida «%s» no está instalada"
 
-#: tcop/postgres.c:1971 tcop/postgres.c:2056
-msgid "execute fetch from"
-msgstr "ejecutar fetch desde"
+#: commands/extension.c:1603
+#, c-format
+msgid "extension \"%s\" does not exist, skipping"
+msgstr "no existe la extensión «%s», ignorando"
 
-#: tcop/postgres.c:1972 tcop/postgres.c:2057
-msgid "execute"
-msgstr "ejecutar"
+#: commands/extension.c:2111
+msgid ""
+"pg_extension_config_dump() can only be called from an SQL script executed by "
+"CREATE EXTENSION"
+msgstr ""
+"pg_extension_config_dump() sólo puede ser llamado desde un guión SQL "
+"ejecutado por CREATE EXTENSION"
 
-#: tcop/postgres.c:1969
+#: commands/extension.c:2123
 #, c-format
-msgid "%s %s%s%s: %s"
-msgstr "%s %s%s%s: %s"
+msgid "OID %u does not refer to a table"
+msgstr "el OID %u no hace referencia a una tabla"
 
-#: tcop/postgres.c:2053
+#: commands/extension.c:2128
 #, c-format
-msgid "duration: %s ms  %s %s%s%s: %s"
-msgstr "duración: %s ms  %s %s%s%s: %s"
+msgid "table \"%s\" is not a member of the extension being created"
+msgstr "el tabla «%s» no es un miembro de la extensión que se está creando"
 
-#: tcop/postgres.c:2179
+#: commands/extension.c:2311 commands/extension.c:2370
 #, c-format
-msgid "prepare: %s"
-msgstr "prepare: %s"
+msgid "extension \"%s\" does not support SET SCHEMA"
+msgstr "la extensión «%s» no soporta SET SCHEMA"
 
-#: tcop/postgres.c:2242
+#: commands/extension.c:2372
 #, c-format
-msgid "parameters: %s"
-msgstr "parámetros: %s"
+msgid "%s is not in the extension's schema \"%s\""
+msgstr "%s no está en el esquema de la extensión, «%s»"
 
-#: tcop/postgres.c:2261
-msgid "abort reason: recovery conflict"
-msgstr "razón para abortar: conflicto en la recuperación"
+#: commands/extension.c:2421
+msgid "nested ALTER EXTENSION is not supported"
+msgstr "los ALTER EXTENSION anidados no están soportados"
 
-#: tcop/postgres.c:2277
-msgid "User was holding shared buffer pin for too long."
-msgstr "El usuario mantuvo el búfer compartido «clavado» por demasiado tiempo."
+#: commands/extension.c:2512
+#, c-format
+msgid "version \"%s\" of extension \"%s\" is already installed"
+msgstr "la versión «%s» de la extensión «%s» ya está instalada"
+
+#: commands/extension.c:2752
+#, c-format
+msgid "%s is not a member of extension \"%s\""
+msgstr "%s no es un miembro de la extensión «%s»"
+
+#: commands/collationcmds.c:81
+#, c-format
+msgid "collation attribute \"%s\" not recognized"
+msgstr "el atributo de ordenamiento (collation) «%s» no es reconocido"
+
+#: commands/collationcmds.c:126
+msgid "parameter \"lc_collate\" must be specified"
+msgstr "debe especificarse el parámetro «lc_collate»"
+
+#: commands/collationcmds.c:131
+msgid "parameter \"lc_ctype\" must be specified"
+msgstr "debe especificarse el parámetro «lc_ctype»"
+
+#: commands/collationcmds.c:177
+#, c-format
+msgid "collation \"%s\" does not exist, skipping"
+msgstr "no existe el ordenamiento (collation) «%s», ignorando"
+
+#: commands/collationcmds.c:237 commands/collationcmds.c:416
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
+msgstr ""
+"ya existe un ordenamiento (collation) llamado «%s» para la codificación «%s» "
+"en el esquema «%s»"
+
+#: commands/collationcmds.c:249 commands/collationcmds.c:428
+#, c-format
+msgid "collation \"%s\" already exists in schema \"%s\""
+msgstr "ya existe un ordenamiento llamado «%s» en el esquema «%s»"
+
+#: tcop/fastpath.c:109 tcop/fastpath.c:485 tcop/fastpath.c:615
+#, c-format
+msgid "invalid argument size %d in function call message"
+msgstr ""
+"el tamaño de argumento %d no es válido en el mensaje de llamada a función"
+
+#: tcop/fastpath.c:303 tcop/postgres.c:917 tcop/postgres.c:1227
+#: tcop/postgres.c:1508 tcop/postgres.c:1950 tcop/postgres.c:2318
+#: tcop/postgres.c:2399
+msgid ""
+"current transaction is aborted, commands ignored until end of transaction "
+"block"
+msgstr ""
+"transacción abortada, las órdenes serán ignoradas hasta el fin de bloque de "
+"transacción"
+
+#: tcop/fastpath.c:331
+#, c-format
+msgid "fastpath function call: \"%s\" (OID %u)"
+msgstr "llamada a función fastpath: «%s» (OID %u)"
+
+#: tcop/fastpath.c:411 tcop/postgres.c:1087 tcop/postgres.c:1374
+#: tcop/postgres.c:1791 tcop/postgres.c:2008
+#, c-format
+msgid "duration: %s ms"
+msgstr "duración: %s ms"
+
+#: tcop/fastpath.c:415
+#, c-format
+msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
+msgstr "duración: %s ms  llamada a función fastpath: «%s» (OID %u)"
+
+#: tcop/fastpath.c:453 tcop/fastpath.c:580
+#, c-format
+msgid "function call message contains %d arguments but function requires %d"
+msgstr ""
+"el mensaje de llamada a función contiene %d argumentos pero la función "
+"requiere %d"
+
+#: tcop/fastpath.c:461
+#, c-format
+msgid "function call message contains %d argument formats but %d arguments"
+msgstr ""
+"el mensaje de llamada a función contiene %d formatos de argumento pero %d "
+"argumentos"
+
+#: tcop/fastpath.c:548 tcop/fastpath.c:631
+#, c-format
+msgid "incorrect binary data format in function argument %d"
+msgstr "el formato de datos binarios es incorrecto en argumento %d a función"
+
+#: tcop/postgres.c:399 tcop/postgres.c:411 tcop/postgres.c:422
+#: tcop/postgres.c:434 tcop/postgres.c:4152
+#, c-format
+msgid "invalid frontend message type %d"
+msgstr "el tipo de mensaje de frontend %d no es válido"
+
+#: tcop/postgres.c:858
+#, c-format
+msgid "statement: %s"
+msgstr "sentencia: %s"
+
+#: tcop/postgres.c:1092
+#, c-format
+msgid "duration: %s ms  statement: %s"
+msgstr "duración: %s ms  sentencia: %s"
+
+#: tcop/postgres.c:1142
+#, c-format
+msgid "parse %s: %s"
+msgstr "parse %s: %s"
+
+#: tcop/postgres.c:1200
+msgid "cannot insert multiple commands into a prepared statement"
+msgstr "no se pueden insertar múltiples órdenes en una sentencia preparada"
+
+#: tcop/postgres.c:1379
+#, c-format
+msgid "duration: %s ms  parse %s: %s"
+msgstr "duración: %s ms  parse: %s: %s"
+
+#: tcop/postgres.c:1425
+#, c-format
+msgid "bind %s to %s"
+msgstr "bind %s a %s"
+
+#: tcop/postgres.c:1444 tcop/postgres.c:2298
+msgid "unnamed prepared statement does not exist"
+msgstr "no existe una sentencia preparada sin nombre"
+
+#: tcop/postgres.c:1486
+#, c-format
+msgid "bind message has %d parameter formats but %d parameters"
+msgstr ""
+"el mensaje de enlace (bind) tiene %d formatos de parámetro pero %d parámetros"
+
+#: tcop/postgres.c:1492
+#, c-format
+msgid ""
+"bind message supplies %d parameters, but prepared statement \"%s\" requires "
+"%d"
+msgstr ""
+"el mensaje de enlace (bind) entrega %d parámetros, pero la sentencia "
+"preparada «%s» requiere %d"
+
+#: tcop/postgres.c:1657
+#, c-format
+msgid "incorrect binary data format in bind parameter %d"
+msgstr ""
+"el formato de datos binarios es incorrecto en el parámetro de enlace %d"
+
+#: tcop/postgres.c:1796
+#, c-format
+msgid "duration: %s ms  bind %s%s%s: %s"
+msgstr "duración: %s ms  bind %s%s%s: %s"
+
+#: tcop/postgres.c:1844 tcop/postgres.c:2385
+#, c-format
+msgid "portal \"%s\" does not exist"
+msgstr "no existe el portal «%s»"
+
+#: tcop/postgres.c:1931 tcop/postgres.c:2016
+msgid "execute fetch from"
+msgstr "ejecutar fetch desde"
+
+#: tcop/postgres.c:1932 tcop/postgres.c:2017
+msgid "execute"
+msgstr "ejecutar"
+
+#: tcop/postgres.c:1929
+#, c-format
+msgid "%s %s%s%s: %s"
+msgstr "%s %s%s%s: %s"
+
+#: tcop/postgres.c:2013
+#, c-format
+msgid "duration: %s ms  %s %s%s%s: %s"
+msgstr "duración: %s ms  %s %s%s%s: %s"
+
+#: tcop/postgres.c:2139
+#, c-format
+msgid "prepare: %s"
+msgstr "prepare: %s"
 
-#: tcop/postgres.c:2280
+#: tcop/postgres.c:2202
+#, c-format
+msgid "parameters: %s"
+msgstr "parámetros: %s"
+
+#: tcop/postgres.c:2221
+msgid "abort reason: recovery conflict"
+msgstr "razón para abortar: conflicto en la recuperación"
+
+#: tcop/postgres.c:2237
+msgid "User was holding shared buffer pin for too long."
+msgstr "El usuario mantuvo el búfer compartido «clavado» por demasiado tiempo."
+
+#: tcop/postgres.c:2240
 msgid "User was holding a relation lock for too long."
-msgstr "El usuario mantuvo un candado bloqueado por demasiado tiempo."
+msgstr "El usuario mantuvo una relación bloqueada por demasiado tiempo."
 
-#: tcop/postgres.c:2283
+#: tcop/postgres.c:2243
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr ""
 "El usuario estaba o pudo haber estado usando un tablespace que debía ser "
 "eliminado."
 
-#: tcop/postgres.c:2286
+#: tcop/postgres.c:2246
 msgid "User query might have needed to see row versions that must be removed."
 msgstr ""
 "La consulta del usuario pudo haber necesitado examinar versiones de tuplas "
 "que debían eliminarse."
 
-#: tcop/postgres.c:2289 storage/ipc/standby.c:499
+#: tcop/postgres.c:2249 storage/ipc/standby.c:491
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "La transacción del usuario causó un «deadlock» con la recuperación."
 
-#: tcop/postgres.c:2292
+#: tcop/postgres.c:2252
 msgid "User was connected to a database that must be dropped."
 msgstr ""
 "El usuario estaba conectado a una base de datos que debía ser eliminada."
 
-#: tcop/postgres.c:2626
+#: tcop/postgres.c:2586
 msgid "terminating connection because of crash of another server process"
 msgstr "terminando la conexión debido a una falla en otro proceso servidor"
 
-#: tcop/postgres.c:2627
+#: tcop/postgres.c:2587
 msgid ""
 "The postmaster has commanded this server process to roll back the current "
 "transaction and exit, because another server process exited abnormally and "
@@ -7671,17 +8041,17 @@ msgstr ""
 "curso y finalice la conexión, porque otro proceso servidor ha terminado "
 "anormalmente y podría haber corrompido la memoria compartida."
 
-#: tcop/postgres.c:2631 tcop/postgres.c:2963
+#: tcop/postgres.c:2591 tcop/postgres.c:2941
 msgid ""
 "In a moment you should be able to reconnect to the database and repeat your "
 "command."
 msgstr "Dentro de un momento debería poder reconectarse y repetir la consulta."
 
-#: tcop/postgres.c:2735
+#: tcop/postgres.c:2703
 msgid "floating-point exception"
 msgstr "excepción de coma flotante"
 
-#: tcop/postgres.c:2736
+#: tcop/postgres.c:2704
 msgid ""
 "An invalid floating-point operation was signaled. This probably means an out-"
 "of-range result or an invalid operation, such as division by zero."
@@ -7690,60 +8060,61 @@ msgstr ""
 "puede significar un resultado fuera de rango o una operación no válida, como "
 "una división por cero."
 
-#: tcop/postgres.c:2903
+#: tcop/postgres.c:2872
 msgid "terminating autovacuum process due to administrator command"
 msgstr "terminando el proceso autovacuum debido a una orden del administrador"
 
-#: tcop/postgres.c:2907 tcop/postgres.c:2912 tcop/postgres.c:2961
+#: tcop/postgres.c:2878 tcop/postgres.c:2888 tcop/postgres.c:2939
 msgid "terminating connection due to conflict with recovery"
 msgstr "terminando la conexión debido a un conflicto con la recuperación"
 
-#: tcop/postgres.c:2917
+#: tcop/postgres.c:2894
 msgid "terminating connection due to administrator command"
 msgstr "terminando la conexión debido a una orden del administrador"
 
-#: tcop/postgres.c:2932
+#: tcop/postgres.c:2909
 msgid "canceling authentication due to timeout"
 msgstr ""
 "cancelando la autentificación debido a que se agotó el tiempo de espera"
 
-#: tcop/postgres.c:2941
+#: tcop/postgres.c:2918
 msgid "canceling statement due to statement timeout"
 msgstr ""
 "cancelando la sentencia debido a que se agotó el tiempo de espera de "
 "sentencias"
 
-#: tcop/postgres.c:2950
+#: tcop/postgres.c:2927
 msgid "canceling autovacuum task"
 msgstr "cancelando tarea de autovacuum"
 
-#: tcop/postgres.c:2968 storage/ipc/standby.c:498
+#: tcop/postgres.c:2946 storage/ipc/standby.c:490
 msgid "canceling statement due to conflict with recovery"
 msgstr "cancelando la sentencia debido a un conflicto con la recuperación"
 
-#: tcop/postgres.c:2984
+#: tcop/postgres.c:2962
 msgid "canceling statement due to user request"
 msgstr "cancelando la sentencia debido a una petición del usuario"
 
-#: tcop/postgres.c:3058 tcop/postgres.c:3079
+#: tcop/postgres.c:3043 tcop/postgres.c:3065
 msgid "stack depth limit exceeded"
 msgstr "límite de profundidad de stack alcanzado"
 
-#: tcop/postgres.c:3059 tcop/postgres.c:3080
+#: tcop/postgres.c:3044 tcop/postgres.c:3066
+#, c-format
 msgid ""
-"Increase the configuration parameter \"max_stack_depth\", after ensuring the "
-"platform's stack depth limit is adequate."
+"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
+"after ensuring the platform's stack depth limit is adequate."
 msgstr ""
-"Incremente el parámetro de configuración «max_stack_depth», después de "
-"asegurarse que el límite de profundidad de stack de la plataforma es "
-"adecuado."
+"Incremente el parámetro de configuración «max_stack_depth» (actualmente "
+"%dkB), después de asegurarse que el límite de profundidad de stack de la "
+"plataforma es adecuado."
 
-#: tcop/postgres.c:3097
+#: tcop/postgres.c:3082
 #, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB"
-msgstr "«max_stack_depth» no debe exceder %ldkB"
+msgid "\"max_stack_depth\" must not exceed %ldkB."
+msgstr "«max_stack_depth» no debe exceder %ldkB."
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3084
 msgid ""
 "Increase the platform's stack depth limit via \"ulimit -s\" or local "
 "equivalent."
@@ -7751,37 +8122,37 @@ msgstr ""
 "Incremente el límite de profundidad del stack del sistema usando «ulimit -s» "
 "o el equivalente de su sistema."
 
-#: tcop/postgres.c:3422
+#: tcop/postgres.c:3419
 msgid "invalid command-line arguments for server process"
 msgstr ""
 "los argumentos de línea de órdenes no son válidos para proceso servidor"
 
-#: tcop/postgres.c:3423 tcop/postgres.c:3429
+#: tcop/postgres.c:3420 tcop/postgres.c:3426
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Pruebe «%s --help» para mayor información."
 
-#: tcop/postgres.c:3427
+#: tcop/postgres.c:3424
 #, c-format
 msgid "%s: invalid command-line arguments"
 msgstr "%s: argumentos de línea de órdenes no válidos"
 
-#: tcop/postgres.c:3526
+#: tcop/postgres.c:3523
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s: no se ha especificado base de datos ni usuario"
 
-#: tcop/postgres.c:4064
+#: tcop/postgres.c:4062
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "subtipo %d de mensaje CLOSE no válido"
 
-#: tcop/postgres.c:4097
+#: tcop/postgres.c:4095
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "subtipo %d de mensaje DESCRIBE no válido"
 
-#: tcop/postgres.c:4328
+#: tcop/postgres.c:4329
 #, c-format
 msgid ""
 "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
@@ -7790,41 +8161,41 @@ msgstr ""
 "desconexión: duración de sesión: %d:%02d:%02d.%03d usuario=%s base=%s host=%s"
 "%s%s"
 
-#: tcop/pquery.c:670
+#: tcop/pquery.c:660
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
 "el mensaje de enlace (bind) tiene %d formatos de resultado pero la consulta "
 "tiene %d columnas"
 
-#: tcop/pquery.c:978
+#: tcop/pquery.c:969
 msgid "cursor can only scan forward"
 msgstr "el cursor sólo se puede desplazar hacia adelante"
 
-#: tcop/pquery.c:979
+#: tcop/pquery.c:970
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Declárelo con SCROLL para permitirle desplazar hacia atrás."
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:242
+#: tcop/utility.c:253
 #, c-format
 msgid "cannot execute %s in a read-only transaction"
 msgstr "no se puede ejecutar %s en una transacción de sólo lectura"
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:261
+#: tcop/utility.c:272
 #, c-format
 msgid "cannot execute %s during recovery"
 msgstr "no se puede ejecutar %s durante la recuperación"
 
 #. translator: %s is name of a SQL command, eg PREPARE
-#: tcop/utility.c:279
+#: tcop/utility.c:290
 #, c-format
 msgid "cannot execute %s within security-restricted operation"
 msgstr ""
 "no se puede ejecutar %s durante una operación restringida por seguridad"
 
-#: tcop/utility.c:1129
+#: tcop/utility.c:1194
 msgid "must be superuser to do CHECKPOINT"
 msgstr "debe ser superusuario para ejecutar CHECKPOINT"
 
@@ -7862,7 +8233,7 @@ msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr ""
 "el cursor «%s» no es un recorrido simplemente actualizable de la tabla «%s»"
 
-#: executor/execCurrent.c:230 executor/execQual.c:1024
+#: executor/execCurrent.c:230 executor/execQual.c:1033
 #, c-format
 msgid ""
 "type of parameter %d (%s) does not match that when preparing the plan (%s)"
@@ -7870,73 +8241,137 @@ msgstr ""
 "el tipo del parámetro %d (%s) no coincide aquel con que fue preparado el "
 "plan (%s)"
 
-#: executor/execCurrent.c:242 executor/execQual.c:1035
+#: executor/execCurrent.c:242 executor/execQual.c:1045
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "no se encontró un valor para parámetro %d"
 
-#: executor/execMain.c:876
+#: executor/execMain.c:996
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "no se puede cambiar la secuencia «%s»"
 
-#: executor/execMain.c:882
+#: executor/execMain.c:1002
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "no se puede cambiar la relación TOAST «%s»"
 
-#: executor/execMain.c:888
+#: executor/execMain.c:1012
+#, c-format
+msgid "cannot insert into view \"%s\""
+msgstr "no se puede insertar en la vista «%s»"
+
+#: executor/execMain.c:1014
+msgid ""
+"You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT "
+"trigger."
+msgstr ""
+"Necesita un regla incondicional ON INSERT DO INSTEAD o un disparador INSTEAD "
+"OF INSERT."
+
+#: executor/execMain.c:1020
 #, c-format
-msgid "cannot change view \"%s\""
-msgstr "no se puede cambiar la vista «%s»"
+msgid "cannot update view \"%s\""
+msgstr "no se puede actualizar la vista «%s»"
 
-#: executor/execMain.c:894
+#: executor/execMain.c:1022
+msgid ""
+"You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE "
+"trigger."
+msgstr ""
+"Necesita un regla incondicional ON UPDATE DO INSTEAD o un disparador INSTEAD "
+"OF UPDATE."
+
+#: executor/execMain.c:1028
+#, c-format
+msgid "cannot delete from view \"%s\""
+msgstr "no se puede eliminar de la vista «%s»"
+
+#: executor/execMain.c:1030
+msgid ""
+"You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE "
+"trigger."
+msgstr ""
+"Necesita un regla incondicional ON DELETE DO INSTEAD o un disparador INSTEAD "
+"OF DELETE."
+
+#: executor/execMain.c:1040
+#, c-format
+msgid "cannot change foreign table \"%s\""
+msgstr "no se puede cambiar la tabla foránea «%s»"
+
+#: executor/execMain.c:1046
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "no se puede cambiar la relación «%s»"
 
-#: executor/execMain.c:1319
+#: executor/execMain.c:1070
+#, c-format
+msgid "cannot lock rows in sequence \"%s\""
+msgstr "no se puede bloquear registros de la secuencia «%s»"
+
+#: executor/execMain.c:1077
+#, c-format
+msgid "cannot lock rows in TOAST relation \"%s\""
+msgstr "no se puede bloquear registros en la relación TOAST «%s»"
+
+#: executor/execMain.c:1084
+#, c-format
+msgid "cannot lock rows in view \"%s\""
+msgstr "no se puede bloquear registros en la vista «%s»"
+
+#: executor/execMain.c:1091
+#, c-format
+msgid "cannot lock rows in foreign table \"%s\""
+msgstr "no se puede bloquear registros en la tabla foránea «%s»"
+
+#: executor/execMain.c:1097
+#, c-format
+msgid "cannot lock rows in relation \"%s\""
+msgstr "no se puede bloquear registros en la tabla «%s»"
+
+#: executor/execMain.c:1568
 #, c-format
 msgid "null value in column \"%s\" violates not-null constraint"
 msgstr "el valor null para la columna «%s» viola la restricción not null"
 
-#: executor/execMain.c:1331
+#: executor/execMain.c:1580
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr ""
 "el nuevo registro para la relación «%s» viola la restricción check «%s»"
 
-#: executor/execQual.c:296 executor/execQual.c:324 executor/execQual.c:2988
-#: utils/adt/array_userfuncs.c:428 utils/adt/arrayfuncs.c:204
-#: utils/adt/arrayfuncs.c:483 utils/adt/arrayfuncs.c:1218
-#: utils/adt/arrayfuncs.c:2886 utils/adt/arrayfuncs.c:4566
+#: executor/execQual.c:298 executor/execQual.c:326 executor/execQual.c:2987
+#: utils/adt/array_userfuncs.c:430 utils/adt/arrayfuncs.c:228
+#: utils/adt/arrayfuncs.c:507 utils/adt/arrayfuncs.c:1242
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:4940
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr ""
 "el número de dimensiones del array (%d) excede el máximo permitido (%d)"
 
-#: executor/execQual.c:309 executor/execQual.c:337
+#: executor/execQual.c:311 executor/execQual.c:339
 msgid "array subscript in assignment must not be null"
 msgstr "subíndice de array en asignación no puede ser nulo"
 
-#: executor/execQual.c:633 executor/execQual.c:3906
+#: executor/execQual.c:635 executor/execQual.c:3905
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "el atributo %d tiene tipo erróneo"
 
-#: executor/execQual.c:634 executor/execQual.c:3907
+#: executor/execQual.c:636 executor/execQual.c:3906
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "La tabla tiene tipo %s, pero la consulta esperaba %s."
 
-#: executor/execQual.c:698 executor/execQual.c:717 executor/execQual.c:916
+#: executor/execQual.c:700 executor/execQual.c:719 executor/execQual.c:918
 #: executor/nodeModifyTable.c:82 executor/nodeModifyTable.c:92
 #: executor/nodeModifyTable.c:109 executor/nodeModifyTable.c:117
 msgid "table row type and query-specified row type do not match"
 msgstr ""
 "el tipo de fila de la tabla no coincide con el tipo de la fila de la consulta"
 
-#: executor/execQual.c:699
+#: executor/execQual.c:701
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
@@ -7945,34 +8380,34 @@ msgstr[0] ""
 msgstr[1] ""
 "La fila de la tabla contiene %d atributos, pero la consulta esperaba %d."
 
-#: executor/execQual.c:718 executor/nodeModifyTable.c:93
+#: executor/execQual.c:720 executor/nodeModifyTable.c:93
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr ""
 "La tabla tiene tipo %s en posición ordinal %d, pero la consulta esperaba %s."
 
-#: executor/execQual.c:917 executor/execQual.c:1505
+#: executor/execQual.c:919 executor/execQual.c:1519
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr ""
 "Discordancia de almacenamiento físico en atributo eliminado en la posición "
 "%d."
 
-#: executor/execQual.c:1189 parser/parse_func.c:97 parser/parse_func.c:329
-#: parser/parse_func.c:645
+#: executor/execQual.c:1198 parser/parse_func.c:91 parser/parse_func.c:323
+#: parser/parse_func.c:640
 #, c-format
 msgid "cannot pass more than %d argument to a function"
 msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "no se pueden pasar más de %d argumento a una función"
 msgstr[1] "no se pueden pasar más de %d argumentos a una función"
 
-#: executor/execQual.c:1373
+#: executor/execQual.c:1387
 msgid "functions and operators can take at most one set argument"
 msgstr ""
 "las funciones y operadores pueden tomar a lo más un argumento que sea un "
 "conjunto"
 
-#: executor/execQual.c:1423
+#: executor/execQual.c:1437
 msgid ""
 "function returning setof record called in context that cannot accept type "
 "record"
@@ -7980,59 +8415,59 @@ msgstr ""
 "se llamó una función que retorna «setof record» en un contexto que no puede "
 "aceptar el tipo record"
 
-#: executor/execQual.c:1478 executor/execQual.c:1494 executor/execQual.c:1504
+#: executor/execQual.c:1492 executor/execQual.c:1508 executor/execQual.c:1518
 msgid "function return row and query-specified return row do not match"
 msgstr ""
 "la fila de retorno especificada en la consulta no coincide con fila de "
 "retorno de la función"
 
-#: executor/execQual.c:1479
+#: executor/execQual.c:1493
 #, c-format
 msgid "Returned row contains %d attribute, but query expects %d."
 msgid_plural "Returned row contains %d attributes, but query expects %d."
 msgstr[0] "Fila retornada contiene %d atributo, pero la consulta esperaba %d."
 msgstr[1] "Fila retornada contiene %d atributos, pero la consulta esperaba %d."
 
-#: executor/execQual.c:1495
+#: executor/execQual.c:1509
 #, c-format
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr ""
 "Tipo retornado %s en posición ordinal %d, pero la consulta esperaba %s."
 
-#: executor/execQual.c:1748 executor/execQual.c:2171
+#: executor/execQual.c:1745 executor/execQual.c:2170
 msgid "table-function protocol for materialize mode was not followed"
 msgstr ""
 "no se siguió el protocolo de función tabular para el modo de materialización"
 
-#: executor/execQual.c:1768 executor/execQual.c:2178
+#: executor/execQual.c:1765 executor/execQual.c:2177
 #, c-format
 msgid "unrecognized table-function returnMode: %d"
 msgstr ""
 "modo de retorno (returnMode) de la función tabular no es reconocido: %d"
 
-#: executor/execQual.c:2088
+#: executor/execQual.c:2087
 msgid "function returning set of rows cannot return null value"
 msgstr ""
 "una función que retorna un conjunto de registros no puede devolver un valor "
 "null"
 
-#: executor/execQual.c:2145
+#: executor/execQual.c:2144
 msgid "rows returned by function are not all of the same row type"
 msgstr "las filas retornadas por la función no tienen todas el mismo tipo"
 
-#: executor/execQual.c:2338
+#: executor/execQual.c:2335
 msgid "IS DISTINCT FROM does not support set arguments"
 msgstr "IS DISTINCT FROM no soporta argumentos que sean conjuntos"
 
-#: executor/execQual.c:2413
+#: executor/execQual.c:2412
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "op ANY/ALL (array) no soporta argumentos que sean conjuntos"
 
-#: executor/execQual.c:2966
+#: executor/execQual.c:2965
 msgid "cannot merge incompatible arrays"
 msgstr "no se puede mezclar arrays incompatibles"
 
-#: executor/execQual.c:2967
+#: executor/execQual.c:2966
 #, c-format
 msgid ""
 "Array with element type %s cannot be included in ARRAY construct with "
@@ -8041,86 +8476,91 @@ msgstr ""
 "El array con tipo de elemento %s no puede ser incluido en una sentencia "
 "ARRAY con tipo de elemento %s."
 
-#: executor/execQual.c:3008 executor/execQual.c:3035
-#: utils/adt/arrayfuncs.c:518
+#: executor/execQual.c:3007 executor/execQual.c:3034
+#: utils/adt/arrayfuncs.c:542
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
 msgstr ""
 "los arrays multidimensionales deben tener expresiones de arrays con "
 "dimensiones coincidentes"
 
-#: executor/execQual.c:3550
+#: executor/execQual.c:3549
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF no soporta argumentos que sean conjuntos"
 
-#: executor/execQual.c:3780 utils/adt/domains.c:128
+#: executor/execQual.c:3779 utils/adt/domains.c:128
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "el dominio %s no permite valores null"
 
-#: executor/execQual.c:3809 utils/adt/domains.c:164
+#: executor/execQual.c:3808 utils/adt/domains.c:164
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "el valor para el dominio %s viola la restricción check «%s»"
 
-#: executor/execQual.c:4277 optimizer/util/clauses.c:572
-#: parser/parse_agg.c:160
+#: executor/execQual.c:4288 optimizer/util/clauses.c:572
+#: parser/parse_agg.c:164
 msgid "aggregate function calls cannot be nested"
 msgstr "no se pueden anidar llamadas a funciones de agregación"
 
-#: executor/execQual.c:4315 optimizer/util/clauses.c:646
-#: parser/parse_agg.c:207
+#: executor/execQual.c:4326 optimizer/util/clauses.c:646
+#: parser/parse_agg.c:211
 msgid "window function calls cannot be nested"
 msgstr "no se pueden anidar llamadas a funciones de ventana deslizante"
 
-#: executor/execQual.c:4515
+#: executor/execQual.c:4538
 msgid "target type is not an array"
 msgstr "el tipo de destino no es un array"
 
-#: executor/execQual.c:4628
+#: executor/execQual.c:4651
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "la columna de ROW() es de tipo %s en lugar de ser de tipo %s"
 
-#: executor/execQual.c:4759 utils/adt/arrayfuncs.c:3306
-#: utils/adt/rowtypes.c:913
+#: executor/execQual.c:4786 utils/adt/arrayfuncs.c:3378
+#: utils/adt/rowtypes.c:922
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "no se pudo identificar una función de comparación para el tipo %s"
 
-#: executor/execUtils.c:1296
+#: executor/execUtils.c:1305
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "no se pudo crear la restricción por exclusión «%s»"
 
-#: executor/execUtils.c:1298
+#: executor/execUtils.c:1307
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "La llave %s está en conflicto con la llave %s."
 
-#: executor/execUtils.c:1303
+#: executor/execUtils.c:1312
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "llave en conflicto viola restricción por exclusión «%s»"
 
-#: executor/execUtils.c:1305
+#: executor/execUtils.c:1314
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "La llave %s está en conflicto con la llave existente %s."
 
+#: executor/functions.c:195
+#, c-format
+msgid "could not determine actual type of argument declared %s"
+msgstr "no se pudo determinar el tipo de argumento declarado %s"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:154
+#: executor/functions.c:295
 #, c-format
 msgid "%s is not allowed in a SQL function"
 msgstr "%s no está permitido en una función SQL"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:161 executor/spi.c:1256 executor/spi.c:1846
+#: executor/functions.c:302 executor/spi.c:1256 executor/spi.c:1891
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s no está permitido en una función no-«volatile»"
 
-#: executor/functions.c:259
+#: executor/functions.c:408
 #, c-format
 msgid ""
 "could not determine actual result type for function declared to return type "
@@ -8129,99 +8569,94 @@ msgstr ""
 "no se pudo determinar el tipo de resultado para función declarada retornando "
 "tipo %s"
 
-#: executor/functions.c:298
-#, c-format
-msgid "could not determine actual type of argument declared %s"
-msgstr "no se pudo determinar el tipo de argumento declarado %s"
-
-#: executor/functions.c:923
+#: executor/functions.c:1146
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "función SQL «%s» en la sentencia %d"
 
-#: executor/functions.c:946
+#: executor/functions.c:1172
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "función SQL «%s» durante el inicio"
 
-#: executor/functions.c:1091 executor/functions.c:1127
-#: executor/functions.c:1139 executor/functions.c:1250
-#: executor/functions.c:1282 executor/functions.c:1311
+#: executor/functions.c:1332 executor/functions.c:1368
+#: executor/functions.c:1380 executor/functions.c:1493
+#: executor/functions.c:1526 executor/functions.c:1556
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "el tipo de retorno de función declarada para retornar %s no concuerda"
 
-#: executor/functions.c:1093
+#: executor/functions.c:1334
 msgid ""
 "Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
 msgstr ""
 "La sentencia final de la función debe ser un SELECT o INSERT/UPDATE/DELETE "
 "RETURNING."
 
-#: executor/functions.c:1129
+#: executor/functions.c:1370
 msgid "Final statement must return exactly one column."
 msgstr "La sentencia final debe retornar exactamente una columna."
 
-#: executor/functions.c:1141
+#: executor/functions.c:1382
 #, c-format
 msgid "Actual return type is %s."
 msgstr "El verdadero tipo de retorno es %s."
 
-#: executor/functions.c:1252
+#: executor/functions.c:1495
 msgid "Final statement returns too many columns."
 msgstr "La sentencia final retorna demasiadas columnas."
 
-#: executor/functions.c:1284
+#: executor/functions.c:1528
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "La sentencia final retorna %s en lugar de %s en la columna %d."
 
-#: executor/functions.c:1313
+#: executor/functions.c:1558
 msgid "Final statement returns too few columns."
 msgstr "La sentencia final retorna muy pocas columnas."
 
-#: executor/functions.c:1361
+#: executor/functions.c:1607
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "el tipo de retorno %s no es soportado en funciones SQL"
 
-#: executor/nodeAgg.c:1717 executor/nodeWindowAgg.c:1842
+#: executor/nodeAgg.c:1730 executor/nodeWindowAgg.c:1851
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 "la función de agregación %u necesita tener tipos de entrada y transición "
 "compatibles"
 
-#: executor/nodeHashjoin.c:721 executor/nodeHashjoin.c:755
+#: executor/nodeHashjoin.c:814 executor/nodeHashjoin.c:844
 #, c-format
 msgid "could not rewind hash-join temporary file: %m"
 msgstr "falló la búsqueda en el archivo temporal de hash-join: %m"
 
-#: executor/nodeHashjoin.c:789 executor/nodeHashjoin.c:795
+#: executor/nodeHashjoin.c:879 executor/nodeHashjoin.c:885
 #, c-format
 msgid "could not write to hash-join temporary file: %m"
 msgstr "no se pudo escribir el archivo temporal de hash-join: %m"
 
-#: executor/nodeHashjoin.c:829 executor/nodeHashjoin.c:839
+#: executor/nodeHashjoin.c:919 executor/nodeHashjoin.c:929
 #, c-format
 msgid "could not read from hash-join temporary file: %m"
 msgstr "no se pudo leer el archivo temporal de hash-join: %m"
 
-#: executor/nodeLimit.c:251
+#: executor/nodeLimit.c:253
 msgid "OFFSET must not be negative"
 msgstr "OFFSET no debe ser negativo"
 
-#: executor/nodeLimit.c:278
+#: executor/nodeLimit.c:280
 msgid "LIMIT must not be negative"
 msgstr "LIMIT no debe ser negativo"
 
-#: executor/nodeMergejoin.c:1586
+#: executor/nodeMergejoin.c:1604
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr ""
 "RIGHT JOIN sólo está soportado con condiciones que se pueden usar con merge "
 "join"
 
-#: executor/nodeMergejoin.c:1606 optimizer/path/joinpath.c:1072
+#: executor/nodeMergejoin.c:1624
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr ""
 "FULL JOIN sólo está soportado con condiciones que se pueden usar con merge "
@@ -8246,19 +8681,19 @@ msgstr "La consulta tiene muy pocas columnas."
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "una subconsulta utilizada como expresión retornó más de un registro"
 
-#: executor/nodeWindowAgg.c:1233
+#: executor/nodeWindowAgg.c:1238
 msgid "frame starting offset must not be null"
 msgstr "la posición inicial del marco no debe ser null"
 
-#: executor/nodeWindowAgg.c:1246
+#: executor/nodeWindowAgg.c:1251
 msgid "frame starting offset must not be negative"
 msgstr "la posición inicial del marco no debe ser negativa"
 
-#: executor/nodeWindowAgg.c:1259
+#: executor/nodeWindowAgg.c:1264
 msgid "frame ending offset must not be null"
 msgstr "la posición final del marco no debe ser null"
 
-#: executor/nodeWindowAgg.c:1272
+#: executor/nodeWindowAgg.c:1277
 msgid "frame ending offset must not be negative"
 msgstr "la posición final del marco no debe ser negativa"
 
@@ -8284,30 +8719,35 @@ msgstr "no se puede abrir plan de varias consultas como cursor"
 msgid "cannot open %s query as cursor"
 msgstr "no se puede abrir consulta %s como cursor"
 
-#: executor/spi.c:1233 parser/analyze.c:1978
+#: executor/spi.c:1233 parser/analyze.c:2206
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE no está soportado"
 
-#: executor/spi.c:1234 parser/analyze.c:1979
+#: executor/spi.c:1234 parser/analyze.c:2207
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Los cursores declarados SCROLL deben ser READ ONLY."
 
-#: executor/spi.c:2142
+#: executor/spi.c:2157
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "sentencia SQL: «%s»"
 
-#: foreign/foreign.c:230
+#: foreign/foreign.c:198
 #, c-format
 msgid "user mapping not found for \"%s\""
 msgstr "no se encontró un mapeo para el usuario «%s»"
 
-#: foreign/foreign.c:408
+#: foreign/foreign.c:321
+#, c-format
+msgid "foreign-data wrapper \"%s\" has no handler"
+msgstr "el conector de datos externos «%s» no tiene manejador"
+
+#: foreign/foreign.c:498
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "el nombre de opción «%s» no es válido"
 
-#: foreign/foreign.c:409
+#: foreign/foreign.c:499
 #, c-format
 msgid "Valid options in this context are: %s"
 msgstr "Las opciones válidas en este contexto son: %s"
@@ -8319,89 +8759,94 @@ msgstr ""
 "No se puede agrandar el búfer de cadena que ya tiene %d bytes en %d bytes "
 "adicionales."
 
-#: libpq/auth.c:255
+#: libpq/auth.c:257
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "la autentificación falló para el usuario «%s»: anfitrión rechazado"
 
-#: libpq/auth.c:258
+#: libpq/auth.c:260
 #, c-format
 msgid "Kerberos 5 authentication failed for user \"%s\""
 msgstr "la autentificación Kerberos 5 falló para el usuario «%s»"
 
-#: libpq/auth.c:261
+#: libpq/auth.c:263
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "la autentificación «trust» falló para el usuario «%s»"
 
-#: libpq/auth.c:264
+#: libpq/auth.c:266
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "la autentificación Ident falló para el usuario «%s»"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:269
+#, c-format
+msgid "Peer authentication failed for user \"%s\""
+msgstr "la autentificación Peer falló para el usuario «%s»"
+
+#: libpq/auth.c:273
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "la autentificación password falló para el usuario «%s»"
 
-#: libpq/auth.c:273
+#: libpq/auth.c:278
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "la autentificación GSSAPI falló para el usuario «%s»"
 
-#: libpq/auth.c:276
+#: libpq/auth.c:281
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "la autentificación SSPI falló para el usuario «%s»"
 
-#: libpq/auth.c:279
+#: libpq/auth.c:284
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "la autentificación PAM falló para el usuario «%s»"
 
-#: libpq/auth.c:282
+#: libpq/auth.c:287
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "la autentificación LDAP falló para el usuario «%s»"
 
-#: libpq/auth.c:285
+#: libpq/auth.c:290
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "la autentificación por certificado falló para el usuario «%s»"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:293
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "la autentificación RADIUS falló para el usuario «%s»"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:296
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr ""
 "la autentificación falló para el usuario «%s»: método de autentificación no "
 "válido"
 
-#: libpq/auth.c:320
+#: libpq/auth.c:325
 msgid "missing or erroneous pg_hba.conf file"
 msgstr "No se encuentra pg_hba.conf o el archivo es incorrecto"
 
-#: libpq/auth.c:321
+#: libpq/auth.c:326
 msgid "See server log for details."
 msgstr "Vea el registro del servidor para obtener más detalles."
 
-#: libpq/auth.c:351
+#: libpq/auth.c:356
 msgid "connection requires a valid client certificate"
 msgstr "la conexión requiere un certificado de cliente válido"
 
-#: libpq/auth.c:395 libpq/auth.c:411 libpq/auth.c:448 libpq/auth.c:464
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
 msgid "SSL on"
 msgstr "SSL activo"
 
-#: libpq/auth.c:395 libpq/auth.c:411 libpq/auth.c:448 libpq/auth.c:464
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
 msgid "SSL off"
 msgstr "SSL inactivo"
 
-#: libpq/auth.c:393
+#: libpq/auth.c:398
 #, c-format
 msgid ""
 "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
@@ -8409,14 +8854,14 @@ msgstr ""
 "pg_hba.conf rechaza la conexión de replicación para el servidor «%s», "
 "usuario «%s», %s"
 
-#: libpq/auth.c:399
+#: libpq/auth.c:404
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
 msgstr ""
 "pg_hba.conf rechaza la conexión de replicación para el servidor «%s», "
 "usuario «%s»"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:413
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
@@ -8425,7 +8870,7 @@ msgstr ""
 "pg_hba.conf rechaza la conexión para el servidor «%s», usuario «%s», base de "
 "datos «%s», %s"
 
-#: libpq/auth.c:415
+#: libpq/auth.c:420
 #, c-format
 msgid ""
 "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
@@ -8433,7 +8878,28 @@ msgstr ""
 "pg_hba.conf rechaza la conexión para el servidor «%s», usuario «%s», base de "
 "datos «%s»"
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup matches."
+msgstr ""
+"La dirección IP del cliente fue resuelta a «%s», este resultado es "
+"coincidente."
+
+#: libpq/auth.c:451
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup not checked."
+msgstr ""
+"La dirección IP del cliente fue resuelta a «%s», este resultado no fue "
+"verificado."
+
+#: libpq/auth.c:453
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup does not match."
+msgstr ""
+"La dirección IP del cliente fue resuelta a «%s», este resultado no es "
+"coincidente."
+
+#: libpq/auth.c:462
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
@@ -8442,7 +8908,7 @@ msgstr ""
 "no hay una línea en pg_hba.conf para la conexión de replicación desde el "
 "servidor «%s», usuario «%s», %s"
 
-#: libpq/auth.c:452
+#: libpq/auth.c:469
 #, c-format
 msgid ""
 "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
@@ -8450,249 +8916,223 @@ msgstr ""
 "no hay una línea en pg_hba.conf para la conexión de replicación desde el "
 "servidor «%s», usuario «%s»"
 
-#: libpq/auth.c:461
+#: libpq/auth.c:479
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 "no hay una línea en pg_hba.conf para «%s», usuario «%s», base de datos «%s», "
 "%s"
 
-#: libpq/auth.c:468
+#: libpq/auth.c:487
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
 "no hay una línea en pg_hba.conf para «%s», usuario «%s», base de datos «%s»"
 
-#: libpq/auth.c:526
-#, c-format
-msgid "could not enable credential reception: %m"
-msgstr "no se pudo activar la recepción de credenciales: %m"
-
-#: libpq/auth.c:539 libpq/hba.c:948
+#: libpq/auth.c:539 libpq/hba.c:1118
 msgid ""
 "MD5 authentication is not supported when \"db_user_namespace\" is enabled"
 msgstr ""
 "la autentificación MD5 no está soportada cuando «db_user_namespace» está "
 "activo"
 
-#: libpq/auth.c:660
+#: libpq/auth.c:663
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "se esperaba una respuesta de contraseña, se obtuvo mensaje de tipo %d"
 
-#: libpq/auth.c:688
+#: libpq/auth.c:691
 msgid "invalid password packet size"
 msgstr "el tamaño del paquete de contraseña no es válido"
 
-#: libpq/auth.c:692
+#: libpq/auth.c:695
 msgid "received password packet"
 msgstr "se recibió un paquete de clave"
 
-#: libpq/auth.c:750
+#: libpq/auth.c:753
 #, c-format
 msgid "Kerberos initialization returned error %d"
 msgstr "la inicialización de Kerberos retornó error %d"
 
-#: libpq/auth.c:760
+#: libpq/auth.c:763
 #, c-format
 msgid "Kerberos keytab resolving returned error %d"
 msgstr "la resolución de keytab de Kerberos retornó error %d"
 
-#: libpq/auth.c:784
+#: libpq/auth.c:787
 #, c-format
 msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
 msgstr "sname_to_principal(\"%s\", \"%s\") de Kerberos retornó error %d"
 
-#: libpq/auth.c:829
+#: libpq/auth.c:832
 #, c-format
 msgid "Kerberos recvauth returned error %d"
 msgstr "recvauth de Kerberos retornó error %d"
 
-#: libpq/auth.c:852
+#: libpq/auth.c:855
 #, c-format
 msgid "Kerberos unparse_name returned error %d"
 msgstr "unparse_name de Kerberos retornó error %d"
 
-#: libpq/auth.c:975
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: libpq/auth.c:1001
+#: libpq/auth.c:1003
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI no está soportado por el protocolo versión 2"
 
-#: libpq/auth.c:1056
+#: libpq/auth.c:1058
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "se esperaba una respuesta GSS, se obtuvo mensaje de tipo %d"
 
-#: libpq/auth.c:1119
+#: libpq/auth.c:1121
 msgid "accepting GSS security context failed"
 msgstr "falló la aceptación del contexto de seguridad GSS"
 
-#: libpq/auth.c:1145
+#: libpq/auth.c:1147
 msgid "retrieving GSS user name failed"
 msgstr "falló la obtención del nombre de usuario GSS"
 
-#: libpq/auth.c:1218
-#, c-format
-msgid "SSPI error %x"
-msgstr "error SSPI %x"
-
-#: libpq/auth.c:1222
-#, c-format
-msgid "%s (%x)"
-msgstr "%s (%x)"
-
-#: libpq/auth.c:1262
+#: libpq/auth.c:1264
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI no está soportado por el protocolo versión 2"
 
-#: libpq/auth.c:1277
+#: libpq/auth.c:1279
 msgid "could not acquire SSPI credentials"
 msgstr "no se pudo obtener las credenciales SSPI"
 
-#: libpq/auth.c:1294
+#: libpq/auth.c:1296
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "se esperaba una respuesta SSPI, se obtuvo mensaje de tipo %d"
 
-#: libpq/auth.c:1366
+#: libpq/auth.c:1368
 msgid "could not accept SSPI security context"
 msgstr "no se pudo aceptar un contexto SSPI"
 
-#: libpq/auth.c:1422
+#: libpq/auth.c:1430
 msgid "could not get token from SSPI security context"
 msgstr ""
 "no se pudo obtener un testigo (token) desde el contexto de seguridad SSPI"
 
-#: libpq/auth.c:1665
+#: libpq/auth.c:1674
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "no se pudo crear un socket para conexión Ident: %m"
 
-#: libpq/auth.c:1680
+#: libpq/auth.c:1689
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "no se pudo enlazar a la dirección local «%s»: %m"
 
-#: libpq/auth.c:1692
+#: libpq/auth.c:1701
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "no se pudo conectar al servidor Ident «%s», port %s: %m"
 
-#: libpq/auth.c:1712
+#: libpq/auth.c:1721
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "no se pudo enviar consulta Ident al servidor «%s», port %s: %m"
 
-#: libpq/auth.c:1727
+#: libpq/auth.c:1736
 #, c-format
 msgid ""
 "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr "no se pudo recibir respuesta Ident desde el servidor «%s», port %s: %m"
 
-#: libpq/auth.c:1737
+#: libpq/auth.c:1746
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "respuesta del servidor Ident en formato no válido: «%s»"
 
-#: libpq/auth.c:1772 libpq/auth.c:1802 libpq/auth.c:1830 libpq/auth.c:1906
+#: libpq/auth.c:1785
+msgid "peer authentication is not supported on this platform"
+msgstr "método de autentificación peer no está soportado en esta plataforma"
+
+#: libpq/auth.c:1789
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "no se pudo recibir credenciales: %m"
 
-#: libpq/auth.c:1781 libpq/auth.c:1811 libpq/auth.c:1848 libpq/auth.c:1917
+#: libpq/auth.c:1798
 #, c-format
 msgid "local user with ID %d does not exist"
 msgstr "no existe un usuario local con ID %d"
 
-#: libpq/auth.c:1838
-#, c-format
-msgid "could not get effective UID from peer credentials: %m"
-msgstr "no se pudo obtener el UID efectivo desde las credenciales del par: %m"
-
-#: libpq/auth.c:1928
-msgid ""
-"Ident authentication is not supported on local connections on this platform"
-msgstr "esta plataforma no soporta autentificación Ident en conexiones locales"
-
-#: libpq/auth.c:2045 libpq/auth.c:2317 libpq/auth.c:2677
+#: libpq/auth.c:1881 libpq/auth.c:2153 libpq/auth.c:2513
 msgid "empty password returned by client"
 msgstr "el cliente retornó una contraseña vacía"
 
-#: libpq/auth.c:2055
+#: libpq/auth.c:1891
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "se ha recibido un error de la biblioteca PAM: %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:1960
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "no se pudo crear autenticador PAM: %s"
 
-#: libpq/auth.c:2135
+#: libpq/auth.c:1971
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) falló: %s"
 
-#: libpq/auth.c:2146
+#: libpq/auth.c:1982
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) falló: %s"
 
-#: libpq/auth.c:2157
+#: libpq/auth.c:1993
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate falló: %s"
 
-#: libpq/auth.c:2168
+#: libpq/auth.c:2004
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt falló: %s"
 
-#: libpq/auth.c:2179
+#: libpq/auth.c:2015
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "no se pudo liberar autenticador PAM: %s"
 
-#: libpq/auth.c:2212 libpq/auth.c:2216
+#: libpq/auth.c:2048 libpq/auth.c:2052
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "no se pudo inicializar LDAP: código de error %d"
 
-#: libpq/auth.c:2226
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not set LDAP protocol version: error code %d"
 msgstr "no se pudo definir la versión de protocolo LDAP: código de error %d"
 
-#: libpq/auth.c:2255
+#: libpq/auth.c:2091
 msgid "could not load wldap32.dll"
 msgstr "no se pudo cargar wldap32.dll"
 
-#: libpq/auth.c:2263
+#: libpq/auth.c:2099
 msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
 msgstr "no se pudo cargar la función _ldap_start_tls_sA en wldap32.dll"
 
-#: libpq/auth.c:2264
+#: libpq/auth.c:2100
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP sobre SSL no está soportado en esta plataforma."
 
-#: libpq/auth.c:2279
+#: libpq/auth.c:2115
 #, c-format
 msgid "could not start LDAP TLS session: error code %d"
 msgstr "no se pudo iniciar sesión de LDAP TLS: código de error %d"
 
-#: libpq/auth.c:2301
+#: libpq/auth.c:2137
 msgid "LDAP server not specified"
 msgstr "servidor LDAP no especificado"
 
-#: libpq/auth.c:2353
+#: libpq/auth.c:2189
 msgid "invalid character in user name for LDAP authentication"
 msgstr "carácter no válido en nombre de usuario para autentificación LDAP"
 
-#: libpq/auth.c:2368
+#: libpq/auth.c:2204
 #, c-format
 msgid ""
 "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
@@ -8701,21 +9141,21 @@ msgstr ""
 "no se pudo hacer el enlace LDAP inicial para el ldapbinddb «%s» en el "
 "servidor «%s»: código de error %d"
 
-#: libpq/auth.c:2393
+#: libpq/auth.c:2229
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "no se pudo hacer la búsqueda LDAP para el filtro «%s» en el servidor «%s»: "
 "código de error %d"
 
-#: libpq/auth.c:2403
+#: libpq/auth.c:2239
 #, c-format
 msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
 msgstr ""
 "La búsqueda LDAP falló para el filtro «%s» en el servidor «%s»: no existe el "
 "usuario"
 
-#: libpq/auth.c:2407
+#: libpq/auth.c:2243
 #, c-format
 msgid ""
 "LDAP search failed for filter \"%s\" on server \"%s\": user is not unique "
@@ -8724,7 +9164,7 @@ msgstr ""
 "La búsqueda LDAP falló para el filtro «%s» en el servidor «%s»: el usuario "
 "no es único (%ld coincidencias)"
 
-#: libpq/auth.c:2424
+#: libpq/auth.c:2260
 #, c-format
 msgid ""
 "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
@@ -8732,21 +9172,21 @@ msgstr ""
 "no se pudo obtener el dn para la primera entrada que coincide con «%s» en el "
 "servidor «%s»: %s"
 
-#: libpq/auth.c:2444
+#: libpq/auth.c:2280
 #, c-format
 msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
 msgstr ""
 "no se pudo desconectar después de buscar al usuario «%s» en el servidor "
 "«%s»: %s"
 
-#: libpq/auth.c:2481
+#: libpq/auth.c:2317
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "Falló el inicio de sesión LDAP para el usuario «%s» en el servidor «%s»: "
 "código de error %d"
 
-#: libpq/auth.c:2509
+#: libpq/auth.c:2345
 #, c-format
 msgid ""
 "certificate authentication failed for user \"%s\": client certificate "
@@ -8755,102 +9195,102 @@ msgstr ""
 "la autentificación con certificado falló para el usuario «%s»: el "
 "certificado de cliente no contiene un nombre de usuario"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2469
 msgid "RADIUS server not specified"
 msgstr "servidor RADIUS no especificado"
 
-#: libpq/auth.c:2640
+#: libpq/auth.c:2476
 msgid "RADIUS secret not specified"
 msgstr "secreto RADIUS no especificado"
 
-#: libpq/auth.c:2656 libpq/hba.c:1213
+#: libpq/auth.c:2492 libpq/hba.c:1403
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "no se pudo traducir el nombre de servidor RADIUS «%s» a dirección: %s"
 
-#: libpq/auth.c:2684
+#: libpq/auth.c:2520
 msgid ""
 "RADIUS authentication does not support passwords longer than 16 characters"
 msgstr ""
 "la autentificación RADIUS no soporta contraseñas más largas de 16 caracteres"
 
-#: libpq/auth.c:2695
+#: libpq/auth.c:2531
 msgid "could not generate random encryption vector"
 msgstr "no se pudo generar un vector aleatorio de encriptación"
 
-#: libpq/auth.c:2718
+#: libpq/auth.c:2554
 msgid "could not perform MD5 encryption of password"
 msgstr "no se pudo efectuar cifrado MD5 de la contraseña"
 
-#: libpq/auth.c:2740
+#: libpq/auth.c:2576
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "no se pudo crear el socket RADIUS: %m"
 
-#: libpq/auth.c:2761
+#: libpq/auth.c:2597
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "no se pudo enlazar el socket RADIUS local: %m"
 
-#: libpq/auth.c:2771
+#: libpq/auth.c:2607
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "no se pudo enviar el paquete RADIUS: %m"
 
-#: libpq/auth.c:2800 libpq/auth.c:2825
+#: libpq/auth.c:2636 libpq/auth.c:2661
 msgid "timeout waiting for RADIUS response"
 msgstr "se agotó el tiempo de espera de la respuesta RADIUS"
 
-#: libpq/auth.c:2818
+#: libpq/auth.c:2654
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "no se pudo verificar el estado en el socket %m"
 
-#: libpq/auth.c:2847
+#: libpq/auth.c:2683
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "no se pudo leer la respuesta RADIUS: %m"
 
-#: libpq/auth.c:2859 libpq/auth.c:2863
+#: libpq/auth.c:2695 libpq/auth.c:2699
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %i"
 msgstr "la respuesta RADIUS fue enviada desde el port incorrecto: %i"
 
-#: libpq/auth.c:2872
+#: libpq/auth.c:2708
 #, c-format
 msgid "RADIUS response too short: %i"
 msgstr "la respuesta RADIUS es demasiado corta: %i"
 
-#: libpq/auth.c:2879
+#: libpq/auth.c:2715
 #, c-format
 msgid "RADIUS response has corrupt length: %i (actual length %i)"
 msgstr "la respuesta RADIUS tiene largo corrupto: %i (largo real %i)"
 
-#: libpq/auth.c:2887
+#: libpq/auth.c:2723
 #, c-format
 msgid "RADIUS response is to a different request: %i (should be %i)"
 msgstr "la respuesta RADIUS es a una petición diferente: %i (debería ser %i)"
 
-#: libpq/auth.c:2912
+#: libpq/auth.c:2748
 msgid "could not perform MD5 encryption of received packet"
 msgstr "no se pudo realizar cifrado MD5 del paquete recibido"
 
-#: libpq/auth.c:2921
+#: libpq/auth.c:2757
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "la respuesta RADIUS tiene firma MD5 incorrecta"
 
-#: libpq/auth.c:2938
+#: libpq/auth.c:2774
 #, c-format
 msgid "RADIUS response has invalid code (%i) for user \"%s\""
 msgstr "la respuesta RADIUS tiene código no válido (%i) para el usuario «%s»"
 
 #: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:163 libpq/be-fsstubs.c:189
-#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:518
+#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:519
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "el descriptor de objeto grande no es válido: %d"
 
-#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:528
+#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:529
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "permiso denegado al objeto grande %u"
@@ -8892,12 +9332,12 @@ msgstr ""
 "Todos los usuarios pueden utilizar lo_export() de cliente proporcionada por "
 "libpq."
 
-#: libpq/be-fsstubs.c:483
+#: libpq/be-fsstubs.c:484
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "no se pudo crear el archivo del servidor «%s»: %m"
 
-#: libpq/be-fsstubs.c:495
+#: libpq/be-fsstubs.c:496
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "no se pudo escribir el archivo del servidor «%s»: %m"
@@ -8907,7 +9347,7 @@ msgstr "no se pudo escribir el archivo del servidor «%s»: %m"
 msgid "SSL error: %s"
 msgstr "error SSL: %s"
 
-#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:951
+#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:957
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "código de error SSL no reconocido: %d"
@@ -8925,121 +9365,126 @@ msgstr "SSL no pudo enviar una petición de renegociación"
 msgid "could not create SSL context: %s"
 msgstr "no se pudo crear un contexto SSL: %s"
 
-#: libpq/be-secure.c:746
+#: libpq/be-secure.c:752
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "no se pudo cargar el archivo de certificado de servidor «%s»: %s"
 
-#: libpq/be-secure.c:752
+#: libpq/be-secure.c:758
 #, c-format
 msgid "could not access private key file \"%s\": %m"
 msgstr "no se pudo acceder al archivo de la llave privada «%s»: %m"
 
-#: libpq/be-secure.c:767
+#: libpq/be-secure.c:773
 #, c-format
 msgid "private key file \"%s\" has group or world access"
 msgstr "el archivo de la llave privada «%s» tiene acceso para el grupo u otros"
 
-#: libpq/be-secure.c:769
+#: libpq/be-secure.c:775
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Los permisos deberían ser u=rw (0500) o menos."
 
-#: libpq/be-secure.c:776
+#: libpq/be-secure.c:782
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "no se pudo cargar el archivo de la llave privada «%s»: %s"
 
-#: libpq/be-secure.c:781
+#: libpq/be-secure.c:787
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "falló la revisión de la llave privada: %s"
 
-#: libpq/be-secure.c:809
+#: libpq/be-secure.c:815
 #, c-format
 msgid "could not access root certificate file \"%s\": %m"
 msgstr "no se pudo acceder al archivo del certificado raíz «%s»: %m"
 
-#: libpq/be-secure.c:820
+#: libpq/be-secure.c:826
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "no se pudo cargar el archivo del certificado raíz «%s»: %s"
 
-#: libpq/be-secure.c:843
+#: libpq/be-secure.c:849
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "ignorando lista de revocación de certificado SSL «%s»"
 
-#: libpq/be-secure.c:845
+#: libpq/be-secure.c:851
 msgid "SSL library does not support certificate revocation lists."
 msgstr "La libreria SSL no soporta listas de revocación de certificados."
 
-#: libpq/be-secure.c:852
+#: libpq/be-secure.c:858
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
 msgstr ""
 "lista de revocación de certificados SSL «%s» no encontrada, ignorando: %s"
 
-#: libpq/be-secure.c:854
+#: libpq/be-secure.c:860
 msgid "Certificates will not be checked against revocation list."
 msgstr "Certificados no serán verificados en las listas de revocación."
 
-#: libpq/be-secure.c:896
+#: libpq/be-secure.c:902
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "no se pudo inicializar la conexión SSL: %s"
 
-#: libpq/be-secure.c:905
+#: libpq/be-secure.c:911
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "no se definir un socket SSL: %s"
 
-#: libpq/be-secure.c:931
+#: libpq/be-secure.c:937
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "no se pudo aceptar una conexión SSL: %m"
 
-#: libpq/be-secure.c:935 libpq/be-secure.c:946
+#: libpq/be-secure.c:941 libpq/be-secure.c:952
 msgid "could not accept SSL connection: EOF detected"
 msgstr "no se pudo aceptar una conexión SSL: se detectó EOF"
 
-#: libpq/be-secure.c:940
+#: libpq/be-secure.c:946
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "no se pudo aceptar una conexión SSL: %s"
 
-#: libpq/be-secure.c:991
+#: libpq/be-secure.c:997
 msgid "SSL certificate's common name contains embedded null"
 msgstr "el «common name» del certificado SSL contiene un carácter null"
 
-#: libpq/be-secure.c:998
+#: libpq/be-secure.c:1004
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "conexión SSL desde «%s»"
 
-#: libpq/be-secure.c:1042
+#: libpq/be-secure.c:1048
 msgid "no SSL error reported"
 msgstr "código de error SSL no reportado"
 
-#: libpq/be-secure.c:1046
+#: libpq/be-secure.c:1052
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de error SSL %lu"
 
-#: libpq/hba.c:158
+#: libpq/hba.c:160
 #, c-format
 msgid "authentication file token too long, skipping: \"%s\""
 msgstr ""
 "una palabra en el archivo de autentificación es demasiado larga, ignorando: "
 "«%s»"
 
-#: libpq/hba.c:351
+#: libpq/hba.c:355
 #, c-format
 msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
 msgstr ""
 "no se pudo abrir el archivo secundario de autentificación «@%s» como «%s»: %m"
 
+#: libpq/hba.c:628
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s"
+msgstr "no se pudo traducir el nombre «%s» a una dirección: %s"
+
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:651
+#: libpq/hba.c:779
 #, c-format
 msgid ""
 "authentication option \"%s\" is only valid for authentication methods %s"
@@ -9047,102 +9492,123 @@ msgstr ""
 "la opción de autentificación «%s» sólo es válida para los métodos de "
 "autentificación %s"
 
-#: libpq/hba.c:667
+#: libpq/hba.c:795
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr ""
 "el método de autentificación «%s» requiere que el argumento «%s» esté "
 "definido"
 
-#: libpq/hba.c:713
-msgid "hostssl not supported on this platform"
-msgstr "hostssl no están soportados en esta plataforma"
+#: libpq/hba.c:832
+msgid "local connections are not supported by this build"
+msgstr "las conexiones locales no están soportadas en este servidor"
 
-#: libpq/hba.c:714
+#: libpq/hba.c:853
+msgid "hostssl requires SSL to be turned on"
+msgstr "hostssl requiere que SSL esté activado"
+
+#: libpq/hba.c:854
+msgid "Set ssl = on in postgresql.conf."
+msgstr "Defina «ssl = on» en postgresql.conf."
+
+#: libpq/hba.c:862
+msgid "hostssl is not supported by this build"
+msgstr "hostssl no está soportado en este servidor"
+
+#: libpq/hba.c:863
 msgid "Compile with --with-openssl to use SSL connections."
 msgstr "Compile con --with-openssl para usar conexiones SSL."
 
-#: libpq/hba.c:736
+#: libpq/hba.c:885
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "tipo de conexión «%s» no válido"
 
-#: libpq/hba.c:749
+#: libpq/hba.c:898
 msgid "end-of-line before database specification"
 msgstr "fin de línea antes de especificación de base de datos"
 
-#: libpq/hba.c:762
+#: libpq/hba.c:911
 msgid "end-of-line before role specification"
 msgstr "fin de línea antes de especificación de rol"
 
-#: libpq/hba.c:777
+#: libpq/hba.c:926
 msgid "end-of-line before IP address specification"
 msgstr "fin de línea antes de especificación de dirección IP"
 
-#: libpq/hba.c:823
+#: libpq/hba.c:980
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "dirección IP «%s» no válida: %s"
 
-#: libpq/hba.c:846
+#: libpq/hba.c:1000
+#, c-format
+msgid "specifying both host name and CIDR mask is invalid: \"%s\""
+msgstr ""
+"especificar tanto el nombre de host como la máscara CIDR no es válido: «%s»"
+
+#: libpq/hba.c:1014
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "máscara CIDR no válida en dirección «%s»"
 
-#: libpq/hba.c:864
+#: libpq/hba.c:1032
 msgid "end-of-line before netmask specification"
 msgstr "fin de línea antes de especificación de máscara de red"
 
-#: libpq/hba.c:876
+#: libpq/hba.c:1044
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "máscara IP «%s» no válida: %s"
 
-#: libpq/hba.c:893
+#: libpq/hba.c:1061
 msgid "IP address and mask do not match"
 msgstr "La dirección y máscara IP no coinciden"
 
-#: libpq/hba.c:908
+#: libpq/hba.c:1076
 msgid "end-of-line before authentication method"
 msgstr "fin de línea antes de especificación de método de autentificación"
 
-#: libpq/hba.c:979
+#: libpq/hba.c:1149
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "método de autentificación «%s» no válido"
 
-#: libpq/hba.c:990
+#: libpq/hba.c:1160
 #, c-format
-msgid "invalid authentication method \"%s\": not supported on this platform"
-msgstr ""
-"método de autentificación «%s» no válido: esta plataforma no lo soporta"
+msgid "invalid authentication method \"%s\": not supported by this build"
+msgstr "método de autentificación «%s» no válido: este servidor no lo soporta"
 
-#: libpq/hba.c:1003
+#: libpq/hba.c:1181
 msgid "krb5 authentication is not supported on local sockets"
 msgstr "la autentificación krb5 no está soportada en conexiones locales"
 
-#: libpq/hba.c:1014
+#: libpq/hba.c:1192
 msgid "gssapi authentication is not supported on local sockets"
 msgstr "la autentificación gssapi no está soportada en conexiones locales"
 
-#: libpq/hba.c:1031
+#: libpq/hba.c:1203
+msgid "peer authentication is only supported on local sockets"
+msgstr "la autentificación peer sólo está soportada en conexiones locales"
+
+#: libpq/hba.c:1220
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "la autentificación cert sólo está soportada en conexiones hostssl"
 
-#: libpq/hba.c:1052
+#: libpq/hba.c:1241
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "opción de autentificación en formato nombre=valor: %s"
 
-#: libpq/hba.c:1067
-msgid "ident, krb5, gssapi, sspi and cert"
-msgstr "ident, krb5, gssapi, sspi y cert"
+#: libpq/hba.c:1257
+msgid "ident, peer, krb5, gssapi, sspi and cert"
+msgstr "ident, peer, krb5, gssapi, sspi y cert"
 
-#: libpq/hba.c:1081
+#: libpq/hba.c:1271
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert sólo puede ser configurado en líneas «hostssl»"
 
-#: libpq/hba.c:1092
+#: libpq/hba.c:1282
 msgid ""
 "client certificates can only be checked if a root certificate store is "
 "available"
@@ -9150,35 +9616,35 @@ msgstr ""
 "los certificados de cliente sólo pueden verificarse si un almacén de "
 "certificado raíz está disponible"
 
-#: libpq/hba.c:1093
+#: libpq/hba.c:1283
 msgid "Make sure the root.crt file is present and readable."
 msgstr "Asegúrese que el archivo root.crt está presente y es legible."
 
-#: libpq/hba.c:1106
+#: libpq/hba.c:1296
 msgid "clientcert can not be set to 0 when using \"cert\" authentication"
 msgstr ""
 "clientcert no puede establecerse en 0 cuando se emplea autentificación «cert»"
 
-#: libpq/hba.c:1140
+#: libpq/hba.c:1330
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "número de puerto LDAP no válido: «%s»"
 
-#: libpq/hba.c:1186 libpq/hba.c:1194
+#: libpq/hba.c:1376 libpq/hba.c:1384
 msgid "krb5, gssapi and sspi"
 msgstr "krb5, gssapi y sspi"
 
-#: libpq/hba.c:1232
+#: libpq/hba.c:1422
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "número de puerto RADIUS no válido: «%s»"
 
-#: libpq/hba.c:1252
+#: libpq/hba.c:1442
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "nombre de opción de autentificación desconocido: «%s»"
 
-#: libpq/hba.c:1284
+#: libpq/hba.c:1474
 msgid ""
 "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
 "together with ldapprefix"
@@ -9186,7 +9652,7 @@ msgstr ""
 "no se puede usar ldapbasedn, ldapbinddn, ldapbindpasswd or "
 "ldapsearchattribute junto con ldapprefix"
 
-#: libpq/hba.c:1294
+#: libpq/hba.c:1484
 msgid ""
 "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
 "\", or \"ldapsuffix\" to be set"
@@ -9194,22 +9660,22 @@ msgstr ""
 "el método de autentificación «ldap» requiere que los argumento «ldapbasedn», "
 "«ldapprefix» o «ldapsuffix» estén definidos"
 
-#: libpq/hba.c:1482 guc-file.l:436
+#: libpq/hba.c:1683 guc-file.l:409
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de configuración «%s»: %m"
 
-#: libpq/hba.c:1614
+#: libpq/hba.c:1815
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "la expresión regular «%s» no es válida: %s"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1838
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "la coincidencia de expresión regular para «%s» falló: %s"
 
-#: libpq/hba.c:1655
+#: libpq/hba.c:1856
 #, c-format
 msgid ""
 "regular expression \"%s\" has no subexpressions as requested by "
@@ -9218,88 +9684,88 @@ msgstr ""
 "la expresión regular «%s» no tiene subexpresiones según lo requiere la "
 "referencia hacia atrás en «%s»"
 
-#: libpq/hba.c:1721
+#: libpq/hba.c:1922
 #, c-format
 msgid "missing entry in file \"%s\" at end of line %d"
 msgstr "falta una entrada en el archivo «%s» al final de la línea %d"
 
-#: libpq/hba.c:1762
+#: libpq/hba.c:1963
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr ""
 "el nombre de usuario entregado (%s) y el nombre de usuario autentificado "
 "(%s) no coinciden"
 
-#: libpq/hba.c:1783
+#: libpq/hba.c:1984
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr ""
 "no hay coincidencia en el mapa «%s» para el usuario «%s» autentificado como "
 "«%s»"
 
-#: libpq/hba.c:1807
+#: libpq/hba.c:2008
 #, c-format
 msgid "could not open usermap file \"%s\": %m"
 msgstr "no se pudo abrir el archivo de mapa de usuarios «%s»: %m"
 
-#: libpq/pqcomm.c:294
+#: libpq/pqcomm.c:306
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr ""
 "no se pudo traducir el nombre de host «%s», servicio «%s» a dirección: %s"
 
-#: libpq/pqcomm.c:298
+#: libpq/pqcomm.c:310
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "no se pudo traducir el servicio «%s» a dirección: %s"
 
-#: libpq/pqcomm.c:325
+#: libpq/pqcomm.c:337
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr ""
 "no se pudo enlazar a todas las direcciones pedidas: MAXLISTEN (%d) fue "
 "excedido"
 
-#: libpq/pqcomm.c:334
+#: libpq/pqcomm.c:346
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:338
+#: libpq/pqcomm.c:350
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:343
+#: libpq/pqcomm.c:355
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:348
+#: libpq/pqcomm.c:360
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "la familia de direcciones %d no es reconocida"
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:359
+#: libpq/pqcomm.c:371
 #, c-format
 msgid "could not create %s socket: %m"
 msgstr "no se pudo crear el socket %s: %m"
 
-#: libpq/pqcomm.c:384
+#: libpq/pqcomm.c:396
 #, c-format
 msgid "setsockopt(SO_REUSEADDR) failed: %m"
 msgstr "setsockopt(SO_REUSEADDR) falló: %m"
 
-#: libpq/pqcomm.c:399
+#: libpq/pqcomm.c:411
 #, c-format
 msgid "setsockopt(IPV6_V6ONLY) failed: %m"
 msgstr "setsockopt(IPV6_V6ONLY) falló: %m"
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:418
+#: libpq/pqcomm.c:430
 #, c-format
 msgid "could not bind %s socket: %m"
 msgstr "no se pudo enlazar al socket %s: %m"
 
-#: libpq/pqcomm.c:421
+#: libpq/pqcomm.c:433
 #, c-format
 msgid ""
 "Is another postmaster already running on port %d? If not, remove socket file "
@@ -9308,7 +9774,7 @@ msgstr ""
 "¿Hay otro postmaster corriendo en el puerto %d? Si no, elimine el socket "
 "«%s» y reintente."
 
-#: libpq/pqcomm.c:424
+#: libpq/pqcomm.c:436
 #, c-format
 msgid ""
 "Is another postmaster already running on port %d? If not, wait a few seconds "
@@ -9318,59 +9784,59 @@ msgstr ""
 "y reintente."
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:457
+#: libpq/pqcomm.c:469
 #, c-format
 msgid "could not listen on %s socket: %m"
 msgstr "no se pudo escuchar en el socket %s: %m"
 
-#: libpq/pqcomm.c:542
+#: libpq/pqcomm.c:554
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "no existe el grupo «%s»"
 
-#: libpq/pqcomm.c:552
+#: libpq/pqcomm.c:564
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "no se pudo definir el grupo del archivo «%s»: %m"
 
-#: libpq/pqcomm.c:563
+#: libpq/pqcomm.c:575
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "no se pudo definir los permisos del archivo «%s»: %m"
 
-#: libpq/pqcomm.c:593
+#: libpq/pqcomm.c:605
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "no se pudo aceptar una nueva conexión: %m"
 
-#: libpq/pqcomm.c:779 libpq/pqcomm.c:879
-#, c-format
-msgid "could not receive data from client: %m"
-msgstr "no se pudo recibir datos del cliente: %m"
-
-#: libpq/pqcomm.c:854
+#: libpq/pqcomm.c:773
 #, c-format
 msgid "could not set socket to non-blocking mode: %m"
 msgstr "no se pudo establecer el socket en modo no bloqueante: %m"
 
-#: libpq/pqcomm.c:900 libpq/pqcomm.c:911
+#: libpq/pqcomm.c:779
 #, c-format
 msgid "could not set socket to blocking mode: %m"
 msgstr "no se pudo poner el socket en modo bloqueante: %m"
 
-#: libpq/pqcomm.c:1056
+#: libpq/pqcomm.c:831 libpq/pqcomm.c:921
+#, c-format
+msgid "could not receive data from client: %m"
+msgstr "no se pudo recibir datos del cliente: %m"
+
+#: libpq/pqcomm.c:1072
 msgid "unexpected EOF within message length word"
 msgstr "EOF inesperado dentro de la palabra de tamaño del mensaje"
 
-#: libpq/pqcomm.c:1067
+#: libpq/pqcomm.c:1083
 msgid "invalid message length"
 msgstr "el largo de mensaje no es válido"
 
-#: libpq/pqcomm.c:1089 libpq/pqcomm.c:1099
+#: libpq/pqcomm.c:1105 libpq/pqcomm.c:1115
 msgid "incomplete message from client"
 msgstr "mensaje incompleto del cliente"
 
-#: libpq/pqcomm.c:1208
+#: libpq/pqcomm.c:1245
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "no se pudo enviar datos al cliente: %m"
@@ -9380,7 +9846,7 @@ msgid "no data left in message"
 msgstr "no hay datos restantes en el mensaje"
 
 #: libpq/pqformat.c:556 libpq/pqformat.c:574 libpq/pqformat.c:595
-#: utils/adt/arrayfuncs.c:1386 utils/adt/rowtypes.c:557
+#: utils/adt/arrayfuncs.c:1411 utils/adt/rowtypes.c:557
 msgid "insufficient data left in message"
 msgstr "los datos restantes del mensaje son insuficientes"
 
@@ -9412,96 +9878,62 @@ msgstr "parámetro Snowball no reconocido: «%s»"
 msgid "missing Language parameter"
 msgstr "falta un parámetro Language"
 
-#: storage/smgr/md.c:371 storage/smgr/md.c:839
-#, c-format
-msgid "could not truncate file \"%s\": %m"
-msgstr "no se pudo truncar el archivo «%s»: %m"
+#: storage/ipc/procarray.c:270 storage/ipc/sinvaladt.c:302
+#: storage/lmgr/proc.c:297 postmaster/postmaster.c:1861
+msgid "sorry, too many clients already"
+msgstr "lo siento, ya tenemos demasiados clientes"
 
-#: storage/smgr/md.c:439
-#, c-format
-msgid "cannot extend file \"%s\" beyond %u blocks"
-msgstr "no se pudo extender el archivo «%s» más allá de %u bloques"
+#: storage/ipc/procarray.c:637
+msgid "consistent state delayed because recovery snapshot incomplete"
+msgstr ""
+"el estado consistente fue retrasado porque la instantánea de recuperación "
+"está incompleta"
 
-#: storage/smgr/md.c:461 storage/smgr/md.c:621 storage/smgr/md.c:694
-#, c-format
-msgid "could not seek to block %u in file \"%s\": %m"
-msgstr "no se pudo posicionar (seek) al bloque %u en el archivo «%s»: %m"
+#: storage/ipc/shmem.c:190 storage/lmgr/lock.c:631 storage/lmgr/lock.c:700
+#: storage/lmgr/lock.c:2163 storage/lmgr/lock.c:2542 storage/lmgr/lock.c:2607
+#: storage/lmgr/proc.c:197 storage/lmgr/proc.c:216
+#: storage/lmgr/predicate.c:2233 storage/lmgr/predicate.c:2248
+#: storage/lmgr/predicate.c:3623 storage/lmgr/predicate.c:4770
+#: utils/hash/dynahash.c:928
+msgid "out of shared memory"
+msgstr "memoria compartida agotada"
 
-#: storage/smgr/md.c:469
+#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
 #, c-format
-msgid "could not extend file \"%s\": %m"
-msgstr "no se pudo extender el archivo «%s»: %m"
-
-#: storage/smgr/md.c:471 storage/smgr/md.c:478 storage/smgr/md.c:720
-msgid "Check free disk space."
-msgstr "Verifique el espacio libre en disco."
+msgid ""
+"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+msgstr ""
+"el espacio de memoria compartida es insuficiente para la estructura "
+"«%s» (%lu bytes solicitados"
 
-#: storage/smgr/md.c:475
+#: storage/ipc/shmem.c:365
 #, c-format
-msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
-msgstr ""
-"no se pudo extender el archivo «%s»: sólo se escribieron %d de %d bytes en "
-"el bloque %u"
-
-#: storage/smgr/md.c:638
-#, c-format
-msgid "could not read block %u in file \"%s\": %m"
-msgstr "no se pudo leer el bloque %u del archivo «%s»: %m"
-
-#: storage/smgr/md.c:654
-#, c-format
-msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
-msgstr ""
-"no se pudo leer el bloque %u del archivo «%s»: se leyeron sólo %d de %d bytes"
-
-#: storage/smgr/md.c:711
-#, c-format
-msgid "could not write block %u in file \"%s\": %m"
-msgstr "no se pudo escribir el bloque %u en el archivo «%s»: %m"
-
-#: storage/smgr/md.c:716
-#, c-format
-msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
-msgstr ""
-"no se pudo escribir el bloque %u en el archivo «%s»: se escribieron sólo %d "
-"de %d bytes"
+msgid "could not create ShmemIndex entry for data structure \"%s\""
+msgstr "no se pudo crear la entrada en ShmemIndex para la estructura «%s»"
 
-#: storage/smgr/md.c:815
+#: storage/ipc/shmem.c:380
 #, c-format
-msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
+msgid ""
+"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
+"actual %lu"
 msgstr ""
-"no se pudo truncar el archivo «%s» a %u bloques: es de sólo %u bloques ahora"
-
-#: storage/smgr/md.c:864
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: %m"
-msgstr "no se pudo truncar el archivo «%s» a %u bloques: %m"
-
-#: storage/smgr/md.c:1087
-#, c-format
-msgid "could not fsync file \"%s\" but retrying: %m"
-msgstr "no se pudo sincronizar (fsync) archivo «%s» pero reintentando: %m"
-
-#: storage/smgr/md.c:1586
-#, c-format
-msgid "could not open file \"%s\" (target block %u): %m"
-msgstr "no se pudo abrir el archivo «%s» (bloque buscado %u): %m"
+"el tamaño de la entrada ShmemIndex es incorrecto para la estructura «%s»: se "
+"esperaba %lu, real %lu"
 
-#: storage/smgr/md.c:1608
-#, c-format
-msgid "could not seek to end of file \"%s\": %m"
-msgstr "no se pudo posicionar (seek) al fin del archivo «%s»: %m"
+#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
+msgid "requested shared memory size overflows size_t"
+msgstr "la petición de tamaño de memoria compartida desborda size_t"
 
-#: storage/buffer/bufmgr.c:131 storage/buffer/bufmgr.c:235
+#: storage/buffer/bufmgr.c:134 storage/buffer/bufmgr.c:239
 msgid "cannot access temporary tables of other sessions"
 msgstr "no se pueden acceder tablas temporales de otras sesiones"
 
-#: storage/buffer/bufmgr.c:364
+#: storage/buffer/bufmgr.c:373
 #, c-format
 msgid "unexpected data beyond EOF in block %u of relation %s"
 msgstr "datos inesperados más allá del EOF en el bloque %u de relación %s"
 
-#: storage/buffer/bufmgr.c:366
+#: storage/buffer/bufmgr.c:375
 msgid ""
 "This has been seen to occur with buggy kernels; consider updating your "
 "system."
@@ -9509,117 +9941,159 @@ msgstr ""
 "Esto parece ocurrir sólo con kernels defectuosos; considere actualizar su "
 "sistema."
 
-#: storage/buffer/bufmgr.c:438
+#: storage/buffer/bufmgr.c:447
 #, c-format
 msgid "invalid page header in block %u of relation %s; zeroing out page"
 msgstr ""
 "el encabezado de página no es válido en el bloque %u de la relación «%s»; "
 "reinicializando la página"
 
-#: storage/buffer/bufmgr.c:446
+#: storage/buffer/bufmgr.c:455
 #, c-format
 msgid "invalid page header in block %u of relation %s"
 msgstr "el encabezado de página no es válido en el bloque %u de la relación %s"
 
-#: storage/buffer/bufmgr.c:2706
+#: storage/buffer/bufmgr.c:2735
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "no se pudo escribir el bloque %u de %s"
 
-#: storage/buffer/bufmgr.c:2708
+#: storage/buffer/bufmgr.c:2737
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Múltiples fallas --- el error de escritura puede ser permanente."
 
-#: storage/buffer/bufmgr.c:2729
+#: storage/buffer/bufmgr.c:2758 storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "escribiendo el bloque %u de la relación %s"
 
-#: storage/buffer/localbuf.c:189
+#: storage/buffer/localbuf.c:190
 msgid "no empty local buffer available"
 msgstr "no hay ningún búfer local disponible"
 
-#: storage/file/fd.c:403
+#: storage/file/fd.c:405
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "getrlimit falló: %m"
 
-#: storage/file/fd.c:493
+#: storage/file/fd.c:495
 msgid "insufficient file descriptors available to start server process"
 msgstr ""
 "los descriptores de archivo disponibles son insuficientes para iniciar un "
 "proceso servidor"
 
-#: storage/file/fd.c:494
+#: storage/file/fd.c:496
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "El sistema permite %d, se requieren al menos %d."
 
-#: storage/file/fd.c:535 storage/file/fd.c:1446 storage/file/fd.c:1561
+#: storage/file/fd.c:537 storage/file/fd.c:1469 storage/file/fd.c:1585
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr ""
 "se agotaron los descriptores de archivo: %m; libere e intente nuevamente"
 
-#: storage/file/fd.c:1088
+#: storage/file/fd.c:1110
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "archivo temporal: ruta «%s», tamaño %lu"
 
-#: storage/file/fd.c:1620
+#: storage/file/fd.c:1644
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "no se pudo leer el directorio «%s»: %m"
 
-#: storage/ipc/procarray.c:270 storage/ipc/sinvaladt.c:302
-#: storage/lmgr/proc.c:289 postmaster/postmaster.c:1833
-msgid "sorry, too many clients already"
-msgstr "lo siento, ya tenemos demasiados clientes"
+#: storage/smgr/md.c:381 storage/smgr/md.c:855
+#, c-format
+msgid "could not truncate file \"%s\": %m"
+msgstr "no se pudo truncar el archivo «%s»: %m"
 
-#: storage/ipc/procarray.c:639
-msgid "consistent state delayed because recovery snapshot incomplete"
+#: storage/smgr/md.c:449
+#, c-format
+msgid "cannot extend file \"%s\" beyond %u blocks"
+msgstr "no se pudo extender el archivo «%s» más allá de %u bloques"
+
+#: storage/smgr/md.c:471 storage/smgr/md.c:635 storage/smgr/md.c:710
+#, c-format
+msgid "could not seek to block %u in file \"%s\": %m"
+msgstr "no se pudo posicionar (seek) al bloque %u en el archivo «%s»: %m"
+
+#: storage/smgr/md.c:479
+#, c-format
+msgid "could not extend file \"%s\": %m"
+msgstr "no se pudo extender el archivo «%s»: %m"
+
+#: storage/smgr/md.c:481 storage/smgr/md.c:488 storage/smgr/md.c:737
+msgid "Check free disk space."
+msgstr "Verifique el espacio libre en disco."
+
+#: storage/smgr/md.c:485
+#, c-format
+msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr ""
-"el estado consistente fue retrasado porque la instantánea de recuperación "
-"está incompleta"
+"no se pudo extender el archivo «%s»: sólo se escribieron %d de %d bytes en "
+"el bloque %u"
 
-#: storage/ipc/shmem.c:190 storage/lmgr/lock.c:629 storage/lmgr/lock.c:698
-#: storage/lmgr/lock.c:2132 storage/lmgr/lock.c:2511 storage/lmgr/lock.c:2576
-#: storage/lmgr/proc.c:192 storage/lmgr/proc.c:210 utils/hash/dynahash.c:925
-msgid "out of shared memory"
-msgstr "memoria compartida agotada"
+#: storage/smgr/md.c:653
+#, c-format
+msgid "could not read block %u in file \"%s\": %m"
+msgstr "no se pudo leer el bloque %u del archivo «%s»: %m"
 
-#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
+#: storage/smgr/md.c:669
 #, c-format
-msgid ""
-"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
 msgstr ""
-"el espacio de memoria compartida es insuficiente para la estructura "
-"«%s» (%lu bytes solicitados"
+"no se pudo leer el bloque %u del archivo «%s»: se leyeron sólo %d de %d bytes"
 
-#: storage/ipc/shmem.c:365
+#: storage/smgr/md.c:728
 #, c-format
-msgid "could not create ShmemIndex entry for data structure \"%s\""
-msgstr "no se pudo crear la entrada en ShmemIndex para la estructura «%s»"
+msgid "could not write block %u in file \"%s\": %m"
+msgstr "no se pudo escribir el bloque %u en el archivo «%s»: %m"
 
-#: storage/ipc/shmem.c:380
+#: storage/smgr/md.c:733
 #, c-format
-msgid ""
-"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
-"actual %lu"
+msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
 msgstr ""
-"el tamaño de la entrada ShmemIndex es incorrecto para la estructura «%s»: se "
-"esperaba %lu, real %lu"
+"no se pudo escribir el bloque %u en el archivo «%s»: se escribieron sólo %d "
+"de %d bytes"
 
-#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
-msgid "requested shared memory size overflows size_t"
-msgstr "la petición de tamaño de memoria compartida desborda size_t"
+#: storage/smgr/md.c:831
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
+msgstr ""
+"no se pudo truncar el archivo «%s» a %u bloques: es de sólo %u bloques ahora"
+
+#: storage/smgr/md.c:880
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: %m"
+msgstr "no se pudo truncar el archivo «%s» a %u bloques: %m"
+
+#: storage/smgr/md.c:1134
+#, c-format
+msgid "could not fsync file \"%s\" but retrying: %m"
+msgstr "no se pudo sincronizar (fsync) archivo «%s» pero reintentando: %m"
+
+#: storage/smgr/md.c:1276
+msgid "could not forward fsync request because request queue is full"
+msgstr ""
+"no se pudo enviar una petición fsync porque la cola de peticiones está llena"
+
+#: storage/smgr/md.c:1646
+#, c-format
+msgid "could not open file \"%s\" (target block %u): %m"
+msgstr "no se pudo abrir el archivo «%s» (bloque buscado %u): %m"
+
+#: storage/smgr/md.c:1668
+#, c-format
+msgid "could not seek to end of file \"%s\": %m"
+msgstr "no se pudo posicionar (seek) al fin del archivo «%s»: %m"
 
-#: storage/large_object/inv_api.c:550 storage/large_object/inv_api.c:747
+#: storage/large_object/inv_api.c:555 storage/large_object/inv_api.c:752
 #, c-format
 msgid "large object %u was not opened for writing"
 msgstr "el objeto grande %u no fue abierto para escritura"
 
-#: storage/large_object/inv_api.c:557 storage/large_object/inv_api.c:754
+#: storage/large_object/inv_api.c:562 storage/large_object/inv_api.c:759
 #, c-format
 msgid "large object %u was already dropped"
 msgstr "el objeto grande %u ya fue eliminado"
@@ -9642,58 +10116,58 @@ msgstr "se ha detectado un deadlock"
 msgid "See server log for query details."
 msgstr "Vea el registro del servidor para obtener detalles de las consultas."
 
-#: storage/lmgr/lmgr.c:717
+#: storage/lmgr/lmgr.c:720
 #, c-format
 msgid "relation %u of database %u"
 msgstr "relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:723
+#: storage/lmgr/lmgr.c:726
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "extensión de la relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:729
+#: storage/lmgr/lmgr.c:732
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "página %u de la relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:736
+#: storage/lmgr/lmgr.c:739
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "tupla (%u,%u) de la relación %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:744
+#: storage/lmgr/lmgr.c:747
 #, c-format
 msgid "transaction %u"
 msgstr "transacción %u"
 
-#: storage/lmgr/lmgr.c:749
+#: storage/lmgr/lmgr.c:752
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "transacción virtual %d/%u"
 
-#: storage/lmgr/lmgr.c:755
+#: storage/lmgr/lmgr.c:758
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "objeto %u de clase %u de la base de datos %u"
 
-#: storage/lmgr/lmgr.c:763
+#: storage/lmgr/lmgr.c:766
 #, c-format
 msgid "user lock [%u,%u,%u]"
-msgstr "bloqueo de usuario [%u,%u,%u]"
+msgstr "candado de usuario [%u,%u,%u]"
 
 # XXX is this a good translation?
-#: storage/lmgr/lmgr.c:770
+#: storage/lmgr/lmgr.c:773
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
-msgstr "bloqueo consultivo [%u,%u,%u,%u]"
+msgstr "candado consultivo [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:778
+#: storage/lmgr/lmgr.c:781
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "tipo de locktag %d no reconocido"
 
-#: storage/lmgr/lock.c:516
+#: storage/lmgr/lock.c:517
 #, c-format
 msgid ""
 "cannot acquire lock mode %s on database objects while recovery is in progress"
@@ -9701,7 +10175,7 @@ msgstr ""
 "no se puede adquirir candado en modo %s en objetos de la base de datos "
 "mientras la recuperación está en proceso"
 
-#: storage/lmgr/lock.c:518
+#: storage/lmgr/lock.c:519
 msgid ""
 "Only RowExclusiveLock or less can be acquired on database objects during "
 "recovery."
@@ -9709,23 +10183,23 @@ msgstr ""
 "Sólo candados RowExclusiveLock o menor pueden ser adquiridos en objetos de "
 "la base de datos durante la recuperación."
 
-#: storage/lmgr/lock.c:630 storage/lmgr/lock.c:699 storage/lmgr/lock.c:2512
-#: storage/lmgr/lock.c:2577
+#: storage/lmgr/lock.c:632 storage/lmgr/lock.c:701 storage/lmgr/lock.c:2543
+#: storage/lmgr/lock.c:2608
 msgid "You might need to increase max_locks_per_transaction."
-msgstr "Puede necesitar incrementar max_locks_per_transaction."
+msgstr "Puede ser necesario incrementar max_locks_per_transaction."
 
-#: storage/lmgr/lock.c:2133
+#: storage/lmgr/lock.c:2164
 msgid "Not enough memory for reassigning the prepared transaction's locks."
 msgstr ""
 "No hay memoria suficiente para reasignar los bloqueos de la transacción "
 "preparada"
 
-#: storage/lmgr/proc.c:1006 utils/adt/misc.c:102
+#: storage/lmgr/proc.c:1046 utils/adt/misc.c:102
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "no se pudo enviar la señal al proceso %d: %m"
 
-#: storage/lmgr/proc.c:1040
+#: storage/lmgr/proc.c:1080
 #, c-format
 msgid ""
 "process %d avoided deadlock for %s on %s by rearranging queue order after "
@@ -9734,7 +10208,7 @@ msgstr ""
 "el proceso %d evitó un deadlock para %s en %s reordenando la cola después de "
 "%ld.%03d ms"
 
-#: storage/lmgr/proc.c:1052
+#: storage/lmgr/proc.c:1092
 #, c-format
 msgid ""
 "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
@@ -9742,21 +10216,94 @@ msgstr ""
 "el proceso %d detectó un deadlock mientras esperaba %s en %s después de %ld."
 "%03d ms"
 
-#: storage/lmgr/proc.c:1058
+#: storage/lmgr/proc.c:1098
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "el proceso %d está aún espera %s en %s después de %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1062
+#: storage/lmgr/proc.c:1102
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "el proceso %d adquirió %s en %s después de %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1078
+#: storage/lmgr/proc.c:1118
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "el proceso %d no pudo adquirir %s en %s después de %ld.%03d ms"
 
+#: storage/lmgr/predicate.c:665
+msgid "not enough elements in RWConflictPool to record a read/write conflict"
+msgstr ""
+"no hay suficientes elementos en RWConflictPool para registrar un conflicto "
+"read/write"
+
+#: storage/lmgr/predicate.c:666 storage/lmgr/predicate.c:694
+msgid ""
+"You might need to run fewer transactions at a time or increase "
+"max_connections."
+msgstr ""
+"Puede ser necesario ejecutar menos transacciones al mismo tiempo, o "
+"incrementar max_connections."
+
+#: storage/lmgr/predicate.c:693
+msgid ""
+"not enough elements in RWConflictPool to record a potential read/write "
+"conflict"
+msgstr ""
+"no hay suficientes elementos en RWConflictPool para registrar un potencial "
+"conflicto read/write"
+
+#: storage/lmgr/predicate.c:898
+msgid "memory for serializable conflict tracking is nearly exhausted"
+msgstr ""
+"la memoria para el seguimiento de conflictos de serialización está casi "
+"agotada"
+
+#: storage/lmgr/predicate.c:899
+msgid ""
+"There might be an idle transaction or a forgotten prepared transaction "
+"causing this."
+msgstr ""
+"Puede haber una transacción inactiva o una transacción preparada olvidada "
+"que esté causando este problema."
+
+#: storage/lmgr/predicate.c:1181 storage/lmgr/predicate.c:1253
+#, c-format
+msgid ""
+"not enough shared memory for elements of data structure \"%s\" (%lu bytes "
+"requested)"
+msgstr ""
+"el espacio de memoria compartida es insuficiente para la estructura "
+"«%s» (%lu bytes solicitados)"
+
+#: storage/lmgr/predicate.c:1536
+msgid "deferrable snapshot was unsafe; trying a new one"
+msgstr "la instantánea postergada era insegura; intentando con una nueva"
+
+#: storage/lmgr/predicate.c:2234 storage/lmgr/predicate.c:2249
+#: storage/lmgr/predicate.c:3624
+msgid "You might need to increase max_pred_locks_per_transaction."
+msgstr "Puede ser necesario incrementar max_pred_locks_per_transaction."
+
+#: storage/lmgr/predicate.c:3778 storage/lmgr/predicate.c:3867
+#: storage/lmgr/predicate.c:3875 storage/lmgr/predicate.c:3914
+#: storage/lmgr/predicate.c:4153 storage/lmgr/predicate.c:4491
+#: storage/lmgr/predicate.c:4503 storage/lmgr/predicate.c:4545
+#: storage/lmgr/predicate.c:4583
+msgid ""
+"could not serialize access due to read/write dependencies among transactions"
+msgstr ""
+"no se pudo serializar el acceso debido a dependencias read/write entre "
+"transacciones"
+
+#: storage/lmgr/predicate.c:3780 storage/lmgr/predicate.c:3869
+#: storage/lmgr/predicate.c:3877 storage/lmgr/predicate.c:3916
+#: storage/lmgr/predicate.c:4155 storage/lmgr/predicate.c:4493
+#: storage/lmgr/predicate.c:4505 storage/lmgr/predicate.c:4547
+#: storage/lmgr/predicate.c:4585
+msgid "The transaction might succeed if retried."
+msgstr "La transacción podría tener éxito si es reintentada."
+
 #: storage/page/bufpage.c:143 storage/page/bufpage.c:390
 #: storage/page/bufpage.c:623 storage/page/bufpage.c:753
 #, c-format
@@ -9780,7532 +10327,8400 @@ msgstr "los largos de ítem están corruptos: total %u, espacio disponible %u"
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "el puntero de ítem está corrupto: posición = %u, tamaño = %u"
 
-#: nodes/nodeFuncs.c:110 nodes/nodeFuncs.c:136 parser/parse_coerce.c:1568
-#: parser/parse_coerce.c:1585 parser/parse_coerce.c:1643
-#: parser/parse_expr.c:1606 parser/parse_func.c:373 parser/parse_oper.c:983
+#: main/main.c:237
 #, c-format
-msgid "could not find array type for data type %s"
-msgstr "no se pudo encontrar un tipo de array para el tipo de dato %s"
-
-#: optimizer/plan/initsplan.c:585
-msgid ""
-"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
-"join"
-msgstr ""
-"SELECT FOR UPDATE/SHARE no puede ser aplicado al lado nulable de un outer "
-"join"
+msgid "%s: setsysinfo failed: %s\n"
+msgstr "%s: setsysinfo falló: %s\n"
 
-#: optimizer/plan/planner.c:946 parser/analyze.c:1205 parser/analyze.c:1393
-#: parser/analyze.c:2035
-msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
-msgstr "SELECT FOR UPDATE/SHARE no está permitido con UNION/INTERSECT/EXCEPT"
+#: main/main.c:259
+#, c-format
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: WSAStartup falló: %d\n"
 
-#: optimizer/plan/planner.c:2220
-msgid "could not implement GROUP BY"
-msgstr "no se pudo implementar GROUP BY"
+#: main/main.c:278
+#, c-format
+msgid ""
+"%s is the PostgreSQL server.\n"
+"\n"
+msgstr "%s es el servidor PostgreSQL.\n"
 
-#: optimizer/plan/planner.c:2221 optimizer/plan/planner.c:2390
-#: optimizer/prep/prepunion.c:769
+#: main/main.c:279
+#, c-format
 msgid ""
-"Some of the datatypes only support hashing, while others only support "
-"sorting."
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
 msgstr ""
-"Algunos de los tipos sólo soportan hashing, mientras que otros sólo soportan "
-"ordenamiento."
-
-#: optimizer/plan/planner.c:2389
-msgid "could not implement DISTINCT"
-msgstr "no se pudo implementar DISTINCT"
+"Empleo:\n"
+"  %s [OPCION]...\n"
 
-#: optimizer/plan/planner.c:2833
-msgid "could not implement window PARTITION BY"
-msgstr "No se pudo implementar PARTITION BY de ventana"
+#: main/main.c:280
+#, c-format
+msgid "Options:\n"
+msgstr "Opciones:\n"
 
-#: optimizer/plan/planner.c:2834
-msgid "Window partitioning columns must be of sortable datatypes."
+#: main/main.c:282
+#, c-format
+msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr ""
-"Las columnas de particionamiento de ventana deben de tipos que se puedan "
-"ordenar."
+"  -A 1|0          activar/desactivar el uso de aseveraciones (asserts)\n"
 
-#: optimizer/plan/planner.c:2838
-msgid "could not implement window ORDER BY"
-msgstr "no se pudo implementar ORDER BY de ventana"
+#: main/main.c:284
+#, c-format
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B NBUFFERS     número de búfers de memoria compartida\n"
 
-#: optimizer/plan/planner.c:2839
-msgid "Window ordering columns must be of sortable datatypes."
-msgstr ""
-"Las columnas de ordenamiento de ventana debe ser de tipos que se puedan "
-"ordenar."
+#: main/main.c:285
+#, c-format
+msgid "  -c NAME=VALUE   set run-time parameter\n"
+msgstr "  -c VAR=VALOR    definir parámetro de ejecución\n"
 
-#: optimizer/util/clauses.c:4016
+#: main/main.c:286
 #, c-format
-msgid "SQL function \"%s\" during inlining"
-msgstr "función SQL «%s», durante expansión en línea"
+msgid "  -d 1-5          debugging level\n"
+msgstr "  -d 1-5          nivel de depuración\n"
 
-#: optimizer/prep/prepunion.c:374
-msgid "could not implement recursive UNION"
-msgstr "no se pudo implementar UNION recursivo"
+#: main/main.c:287
+#, c-format
+msgid "  -D DATADIR      database directory\n"
+msgstr "  -D DATADIR      directorio de bases de datos\n"
 
-#: optimizer/prep/prepunion.c:375
-msgid "All column datatypes must be hashable."
-msgstr ""
-"Todos los tipos de dato de las columnas deben ser tipos de los que se puedan "
-"hacer un hash."
+#: main/main.c:288
+#, c-format
+msgid "  -e              use European date input format (DMY)\n"
+msgstr "  -e              usar estilo europeo de fechas (DMY)\n"
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:768
+#: main/main.c:289
 #, c-format
-msgid "could not implement %s"
-msgstr "no se pudo implementar %s"
+msgid "  -F              turn fsync off\n"
+msgstr "  -F              desactivar fsync\n"
 
-#: parser/scansup.c:190
+#: main/main.c:290
 #, c-format
-msgid "identifier \"%s\" will be truncated to \"%s\""
-msgstr "el identificador «%s» se truncará a «%s»"
+msgid "  -h HOSTNAME     host name or IP address to listen on\n"
+msgstr "  -h NOMBRE       nombre de host o dirección IP en que escuchar\n"
 
-#: parser/analyze.c:450
-msgid "INSERT ... SELECT cannot specify INTO"
-msgstr "INSERT ... SELECT no puede especificar INTO"
+#: main/main.c:291
+#, c-format
+msgid "  -i              enable TCP/IP connections\n"
+msgstr "  -i              activar conexiones TCP/IP\n"
 
-#: parser/analyze.c:552 parser/analyze.c:977
-msgid "VALUES lists must all be the same length"
-msgstr "las listas VALUES deben ser todas de la misma longitud"
-
-#: parser/analyze.c:573 parser/analyze.c:1082
-msgid "VALUES must not contain table references"
-msgstr "VALUES no debe contener referencias a tablas"
+#: main/main.c:292
+#, c-format
+msgid "  -k DIRECTORY    Unix-domain socket location\n"
+msgstr "  -k DIRECTORIO   ubicación del socket Unix\n"
 
-#: parser/analyze.c:587 parser/analyze.c:1096
-msgid "VALUES must not contain OLD or NEW references"
-msgstr "VALUES no debe contener referencias a OLD o NEW"
+#: main/main.c:294
+#, c-format
+msgid "  -l              enable SSL connections\n"
+msgstr "  -l              activar conexiones SSL\n"
 
-#: parser/analyze.c:588 parser/analyze.c:1097
-msgid "Use SELECT ... UNION ALL ... instead."
-msgstr "Use SELECT ... UNION ALL ... en su lugar."
+#: main/main.c:296
+#, c-format
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N MAX-CONN     número máximo de conexiones permitidas\n"
 
-#: parser/analyze.c:698 parser/analyze.c:1109
-msgid "cannot use aggregate function in VALUES"
-msgstr "no se puede usar una función de agregación en VALUES"
+#: main/main.c:297
+#, c-format
+msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgstr ""
+"  -o OPCIONES     pasar «OPCIONES» a cada proceso servidor (obsoleto)\n"
 
-#: parser/analyze.c:704 parser/analyze.c:1115
-msgid "cannot use window function in VALUES"
-msgstr "no se puede usar una función de ventana deslizante en VALUES"
+#: main/main.c:298
+#, c-format
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p PUERTO       número de puerto en el cual escuchar\n"
 
-#: parser/analyze.c:736
-msgid "INSERT has more expressions than target columns"
-msgstr "INSERT tiene más expresiones que columnas de destino"
+#: main/main.c:299
+#, c-format
+msgid "  -s              show statistics after each query\n"
+msgstr "  -s              mostrar estadísticas después de cada consulta\n"
 
-#: parser/analyze.c:744
-msgid "INSERT has more target columns than expressions"
-msgstr "INSERT tiene más columnas de destino que expresiones"
+#: main/main.c:300
+#, c-format
+msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
+msgstr ""
+"  -S WORK-MEM     mostrar cantidad de memoria para ordenamientos (en kB)\n"
 
-#: parser/analyze.c:993
-msgid "DEFAULT can only appear in a VALUES list within INSERT"
-msgstr "DEFAULT sólo puede aparecer en listas VALUES dentro de un INSERT"
+#: main/main.c:301
+#, c-format
+msgid "  --NAME=VALUE    set run-time parameter\n"
+msgstr "  --NOMBRE=VALOR  definir parámetro de ejecución\n"
 
-#: parser/analyze.c:1063 parser/analyze.c:2183
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
-msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a VALUES"
+#: main/main.c:302
+#, c-format
+msgid "  --describe-config  describe configuration parameters, then exit\n"
+msgstr ""
+"  --describe-config\n"
+"                  mostrar parámetros de configuración y salir\n"
 
-#: parser/analyze.c:1316
-msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
-msgstr "cláusula UNION/INTERSECT/EXCEPT ORDER BY no válida"
+#: main/main.c:303
+#, c-format
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          desplegar esta ayuda y salir\n"
 
-#: parser/analyze.c:1317
-msgid "Only result column names can be used, not expressions or functions."
-msgstr ""
-"Sólo nombres de columna del resultado pueden usarse, no expresiones o "
-"funciones."
+#: main/main.c:304
+#, c-format
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       desplegar número de versión y salir\n"
 
-#: parser/analyze.c:1318
+#: main/main.c:306
+#, c-format
 msgid ""
-"Add the expression/function to every SELECT, or move the UNION into a FROM "
-"clause."
+"\n"
+"Developer options:\n"
 msgstr ""
-"Agregue la función o expresión a todos los SELECT, o mueva el UNION dentro "
-"de una cláusula FROM."
+"\n"
+"Opciones de desarrollador:\n"
 
-#: parser/analyze.c:1385
-msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
-msgstr "sólo se permite INTO en el primer SELECT de UNION/INTERSECT/EXCEPT"
+#: main/main.c:307
+#, c-format
+msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
+msgstr "  -f s|i|n|m|h    impedir el uso de algunos tipos de planes\n"
 
-#: parser/analyze.c:1445
+#: main/main.c:308
+#, c-format
 msgid ""
-"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
-"same query level"
+"  -n              do not reinitialize shared memory after abnormal exit\n"
 msgstr ""
-"una sentencia miembro de UNION/INSERT/EXCEPT no puede referirse a otras "
-"relaciones del mismo nivel de la consulta"
+"  -n              no reinicializar memoria compartida después de salida "
+"anormal\n"
 
-#: parser/analyze.c:1530
+#: main/main.c:309
 #, c-format
-msgid "each %s query must have the same number of columns"
-msgstr "cada consulta %s debe tener el mismo número de columnas"
-
-#: parser/analyze.c:1722
-msgid "CREATE TABLE AS specifies too many column names"
-msgstr "CREATE TABLE AS especifica demasiados nombres de columna"
-
-#: parser/analyze.c:1772
-msgid "cannot use aggregate function in UPDATE"
-msgstr "no se puede usar una función de agregación en UPDATE"
-
-#: parser/analyze.c:1778
-msgid "cannot use window function in UPDATE"
-msgstr "no se puede usar una función de ventana deslizante en UPDATE"
-
-#: parser/analyze.c:1885
-msgid "cannot use aggregate function in RETURNING"
-msgstr "no se puede usar una función de agregación en RETURNING"
-
-#: parser/analyze.c:1891
-msgid "cannot use window function in RETURNING"
-msgstr "no se puede usar una función de ventana deslizante en RETURNING"
-
-#: parser/analyze.c:1910
-msgid "RETURNING cannot contain references to other relations"
-msgstr "RETURNING no puede contener referencias a otras relaciones"
-
-#: parser/analyze.c:1949
-msgid "cannot specify both SCROLL and NO SCROLL"
-msgstr "no se puede especificar SCROLL y NO SCROLL"
-
-#: parser/analyze.c:1963
-msgid "DECLARE CURSOR cannot specify INTO"
-msgstr "DECLARE CURSOR no puede especificar INTO"
-
-#: parser/analyze.c:1971
-msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE no está soportado"
-
-#: parser/analyze.c:1972
-msgid "Holdable cursors must be READ ONLY."
-msgstr "Los cursores declarados HOLD deben ser READ ONLY."
-
-#: parser/analyze.c:1985
-msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE no está soportado"
-
-#: parser/analyze.c:1986
-msgid "Insensitive cursors must be READ ONLY."
-msgstr "Los cursores insensitivos deben ser READ ONLY."
-
-#: parser/analyze.c:2039
-msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
-msgstr "SELECT FOR UPDATE/SHARE no está permitido con cláusulas DISTINCT"
+msgid "  -O              allow system table structure changes\n"
+msgstr ""
+"  -O              permitir cambios en estructura de tablas de sistema\n"
 
-#: parser/analyze.c:2043
-msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
-msgstr "SELECT FOR UPDATE/SHARE no está permitido con cláusulas GROUP BY"
+#: main/main.c:310
+#, c-format
+msgid "  -P              disable system indexes\n"
+msgstr "  -P              desactivar índices de sistema\n"
 
-#: parser/analyze.c:2047
-msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
-msgstr "SELECT FOR UPDATE/SHARE no está permitido con cláusulas HAVING"
+#: main/main.c:311
+#, c-format
+msgid "  -t pa|pl|ex     show timings after each query\n"
+msgstr "  -t pa|pl|ex     mostrar tiempos después de cada consulta\n"
 
-#: parser/analyze.c:2051
-msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
-msgstr "SELECT FOR UPDATE/SHARE no está permitido con funciones de agregación"
+#: main/main.c:312
+#, c-format
+msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
+msgstr ""
+"  -T              enviar SIGSTOP a todos los procesos backend si uno de "
+"ellos\n"
+"                  muere\n"
 
-#: parser/analyze.c:2055
-msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
+#: main/main.c:313
+#, c-format
+msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
 msgstr ""
-"SELECT FOR UPDATE/SHARE no está permitido con funciones de ventana deslizante"
+"  -W NÚM          espera NÚM segundos para permitir acoplar un depurador\n"
 
-#: parser/analyze.c:2059
+#: main/main.c:315
+#, c-format
 msgid ""
-"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
-"target list"
+"\n"
+"Options for single-user mode:\n"
 msgstr ""
-"SELECT FOR UPDATE/SHARE no está permitido con funciones que retornan "
-"conjuntos en la lista de resultados"
+"\n"
+"Opciones para modo mono-usuario:\n"
 
-#: parser/analyze.c:2135
-msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
+#: main/main.c:316
+#, c-format
+msgid "  --single        selects single-user mode (must be first argument)\n"
 msgstr ""
-"SELECT FOR UPDATE/SHARE debe especificar nombres de relaciones sin calificar"
-
-#: parser/analyze.c:2165
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
-msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a un join"
-
-#: parser/analyze.c:2171
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
-msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a NEW u OLD"
-
-#: parser/analyze.c:2177
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
-msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a una función"
-
-#: parser/analyze.c:2189
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
-msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a una consulta WITH"
+"  --single        selecciona modo mono-usuario (debe ser el primer "
+"argumento)\n"
 
-#: parser/analyze.c:2203
+#: main/main.c:317
 #, c-format
-msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
+msgid "  DBNAME          database name (defaults to user name)\n"
 msgstr ""
-"la relación «%s» en la cláusula FOR UPDATE/SHARE no fue encontrada en la "
-"cláusula FROM"
+"  DBNAME          nombre de base de datos (el valor por omisión es el nombre "
+"de usuario)\n"
 
-#: parser/parse_agg.c:127 parser/parse_oper.c:254
+#: main/main.c:318
 #, c-format
-msgid "could not identify an ordering operator for type %s"
-msgstr "no se pudo identificar un operador de ordenamiento para el tipo %s"
+msgid "  -d 0-5          override debugging level\n"
+msgstr "  -d 0-5          nivel de depuración\n"
 
-#: parser/parse_agg.c:129
-msgid "Aggregates with DISTINCT must be able to sort their inputs."
-msgstr ""
-"Las funciones de agregación con DISTINCT deben ser capaces de ordenar sus "
-"valores de entrada."
+#: main/main.c:319
+#, c-format
+msgid "  -E              echo statement before execution\n"
+msgstr "  -E              mostrar las consultas antes de su ejecución\n"
 
-#: parser/parse_agg.c:170
-msgid "aggregate function calls cannot contain window function calls"
+#: main/main.c:320
+#, c-format
+msgid "  -j              do not use newline as interactive query delimiter\n"
 msgstr ""
-"las llamadas a funciones de agregación no pueden contener llamadas a "
-"funciones de ventana deslizante"
+"  -j              no usar saltos de línea como delimitadores de consulta\n"
 
-#: parser/parse_agg.c:241 parser/parse_clause.c:1620
+#: main/main.c:321 main/main.c:326
 #, c-format
-msgid "window \"%s\" does not exist"
-msgstr "la ventana «%s» no existe"
-
-#: parser/parse_agg.c:331
-msgid "aggregates not allowed in WHERE clause"
-msgstr "no se permiten funciones de agregación en la cláusula WHERE"
-
-#: parser/parse_agg.c:337
-msgid "aggregates not allowed in JOIN conditions"
-msgstr "no se permiten funciones de agregación en las condiciones JOIN"
-
-#: parser/parse_agg.c:358
-msgid "aggregates not allowed in GROUP BY clause"
-msgstr "no se permiten funciones de agregación en la cláusula GROUP BY"
+msgid "  -r FILENAME     send stdout and stderr to given file\n"
+msgstr "  -r ARCHIVO      enviar salida estándar y de error a ARCHIVO\n"
 
-#: parser/parse_agg.c:426
-msgid "aggregate functions not allowed in a recursive query's recursive term"
+#: main/main.c:323
+#, c-format
+msgid ""
+"\n"
+"Options for bootstrapping mode:\n"
 msgstr ""
-"las funciones de agregación no están permitidas en el término recursivo de "
-"una consulta recursiva"
-
-#: parser/parse_agg.c:451
-msgid "window functions not allowed in WHERE clause"
-msgstr "no se permiten funciones de ventana deslizante en la cláusula WHERE"
-
-#: parser/parse_agg.c:457
-msgid "window functions not allowed in JOIN conditions"
-msgstr "no se permiten funciones de ventana deslizante en las condiciones JOIN"
-
-#: parser/parse_agg.c:463
-msgid "window functions not allowed in HAVING clause"
-msgstr "no se permiten funciones de ventana deslizante en la cláusula HAVING"
-
-#: parser/parse_agg.c:476
-msgid "window functions not allowed in GROUP BY clause"
-msgstr "no se permiten funciones de ventana deslizante en la cláusula GROUP BY"
+"\n"
+"Opciones para modo de inicio (bootstrapping):\n"
 
-#: parser/parse_agg.c:495 parser/parse_agg.c:508
-msgid "window functions not allowed in window definition"
+#: main/main.c:324
+#, c-format
+msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
 msgstr ""
-"no se permiten funciones de ventana deslizante en definiciones de ventana "
-"deslizante"
+"  --boot          selecciona modo de inicio (debe ser el primer argumento)\n"
 
-#: parser/parse_agg.c:630
+#: main/main.c:325
 #, c-format
 msgid ""
-"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
-"aggregate function"
+"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
 msgstr ""
-"la columna «%s.%s» debe aparecer en la cláusula GROUP BY o ser usada en una "
-"función de agregación"
+"  DBNAME          nombre de base de datos (argumento obligatorio en modo de "
+"inicio)\n"
 
-#: parser/parse_agg.c:636
+#: main/main.c:327
 #, c-format
-msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
-msgstr ""
-"la subconsulta usa la columna «%s.%s» no agrupada de una consulta exterior"
+msgid "  -x NUM          internal use\n"
+msgstr "  -x NUM          uso interno\n"
 
-#: parser/parse_clause.c:420
+#: main/main.c:329
 #, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
-msgstr "la cláusula JOIN/ON se refiere a «%s», que no es parte de JOIN"
-
-#: parser/parse_clause.c:501
-msgid "subquery in FROM cannot have SELECT INTO"
-msgstr "una subconsulta en FROM no puede tener SELECT INTO"
-
-#: parser/parse_clause.c:523
-msgid "subquery in FROM cannot refer to other relations of same query level"
-msgstr ""
-"una subconsulta en FROM no puede referirse a otras relaciones en el mismo "
-"nivel de la consulta"
-
-#: parser/parse_clause.c:574
 msgid ""
-"function expression in FROM cannot refer to other relations of same query "
-"level"
+"\n"
+"Please read the documentation for the complete list of run-time\n"
+"configuration settings and how to set them on the command line or in\n"
+"the configuration file.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
-"una función en FROM no puede referirse a otras relaciones en el mismo nivel "
-"de la consulta"
-
-#: parser/parse_clause.c:587
-msgid "cannot use aggregate function in function expression in FROM"
-msgstr "no se pueden usar funciones de agregación en una función en FROM"
+"\n"
+"Por favor lea la documentación para obtener la lista completa de\n"
+"parámetros de configuración y cómo definirlos en la línea de órdenes\n"
+"y en el archivo de configuración.\n"
+"\n"
+"Reporte errores a <pgsql-bugs@postgresql.org>\n"
 
-#: parser/parse_clause.c:594
-msgid "cannot use window function in function expression in FROM"
+#: main/main.c:343
+msgid ""
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
 msgstr ""
-"no se pueden usar funciones de ventana deslizante en una función en FROM"
-
-#: parser/parse_clause.c:870
-#, c-format
-msgid "column name \"%s\" appears more than once in USING clause"
-msgstr "la columna «%s» aparece más de una vez en la cláusula USING"
+"No se permite ejecución del servidor PostgreSQL como «root».\n"
+"El servidor debe ser iniciado con un usuario no privilegiado\n"
+"para prevenir posibles compromisos de seguridad del sistema.\n"
+"Vea la documentación para obtener más información acerca de cómo\n"
+"iniciar correctamente el servidor.\n"
 
-#: parser/parse_clause.c:885
+#: main/main.c:360
 #, c-format
-msgid "common column name \"%s\" appears more than once in left table"
-msgstr "la columna común «%s» aparece más de una vez en la tabla izquierda"
+msgid "%s: real and effective user IDs must match\n"
+msgstr "%s: los IDs de usuario real y efectivo deben coincidir\n"
 
-#: parser/parse_clause.c:894
-#, c-format
-msgid "column \"%s\" specified in USING clause does not exist in left table"
+#: main/main.c:367
+msgid ""
+"Execution of PostgreSQL by a user with administrative permissions is not\n"
+"permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromises.  See the documentation for\n"
+"more information on how to properly start the server.\n"
 msgstr ""
-"la columna «%s» especificada en la cláusula USING no existe en la tabla "
-"izquierda"
+"No se permite ejecución del servidor PostgreSQL por un usuario con "
+"privilegios administrativos.\n"
+"El servidor debe ser iniciado con un usuario no privilegiado\n"
+"para prevenir posibles compromisos de seguridad del sistema.\n"
+"Vea la documentación para obtener más información acerca de cómo\n"
+"iniciar correctamente el servidor.\n"
 
-#: parser/parse_clause.c:908
+#: main/main.c:388
 #, c-format
-msgid "common column name \"%s\" appears more than once in right table"
-msgstr "la columna común «%s» aparece más de una vez en la tabla derecha"
+msgid "%s: invalid effective UID: %d\n"
+msgstr "%s: el UID de usuario efectivo no es válido: %d\n"
 
-#: parser/parse_clause.c:917
+#: main/main.c:401
 #, c-format
-msgid "column \"%s\" specified in USING clause does not exist in right table"
-msgstr ""
-"la columna «%s» especificada en la cláusula USING no existe en la tabla "
-"derecha"
+msgid "%s: could not determine user name (GetUserName failed)\n"
+msgstr "%s: no se pudo determinar el nombre de usuario (falló GetUserName)\n"
 
-#: parser/parse_clause.c:974
-#, c-format
-msgid "column alias list for \"%s\" has too many entries"
-msgstr "la lista de alias de columnas para «%s» tiene demasiadas entradas"
+#: optimizer/prep/prepunion.c:385
+msgid "could not implement recursive UNION"
+msgstr "no se pudo implementar UNION recursivo"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1211
-#, c-format
-msgid "argument of %s must not contain variables"
-msgstr "el argumento de %s no puede contener variables"
+#: optimizer/prep/prepunion.c:386
+msgid "All column datatypes must be hashable."
+msgstr ""
+"Todos los tipos de dato de las columnas deben ser tipos de los que se puedan "
+"hacer un hash."
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1222
+#. translator: %s is UNION, INTERSECT, or EXCEPT
+#: optimizer/prep/prepunion.c:790
 #, c-format
-msgid "argument of %s must not contain aggregate functions"
-msgstr "el argumento de %s no puede contener funciones de agregación"
+msgid "could not implement %s"
+msgstr "no se pudo implementar %s"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1233
-#, c-format
-msgid "argument of %s must not contain window functions"
-msgstr "el argumento de %s no puede contener funciones de ventana deslizante"
+#: optimizer/prep/prepunion.c:791 optimizer/plan/planner.c:2255
+#: optimizer/plan/planner.c:2427
+msgid ""
+"Some of the datatypes only support hashing, while others only support "
+"sorting."
+msgstr ""
+"Algunos de los tipos sólo soportan hashing, mientras que otros sólo soportan "
+"ordenamiento."
 
-#. translator: first %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1350
+#: optimizer/util/clauses.c:4165
 #, c-format
-msgid "%s \"%s\" is ambiguous"
-msgstr "%s «%s» es ambiguo"
+msgid "SQL function \"%s\" during inlining"
+msgstr "función SQL «%s», durante expansión en línea"
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1374
-#, c-format
-msgid "non-integer constant in %s"
-msgstr "constante no entera en %s"
+#: optimizer/util/plancat.c:97
+msgid "cannot access temporary or unlogged relations during recovery"
+msgstr ""
+"no se pueden crear tablas temporales o unlogged durante la recuperación"
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1392
-#, c-format
-msgid "%s position %d is not in select list"
-msgstr "la posición %2$d de %1$s no está en la lista de resultados"
+#: optimizer/plan/initsplan.c:595
+msgid ""
+"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
+"join"
+msgstr ""
+"SELECT FOR UPDATE/SHARE no puede ser aplicado al lado nulable de un outer "
+"join"
 
-#: parser/parse_clause.c:1608
-#, c-format
-msgid "window \"%s\" is already defined"
-msgstr "la ventana «%s» ya está definida"
+#: optimizer/plan/planner.c:959 parser/analyze.c:1337 parser/analyze.c:1534
+#: parser/analyze.c:2263
+msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
+msgstr "SELECT FOR UPDATE/SHARE no está permitido con UNION/INTERSECT/EXCEPT"
 
-#: parser/parse_clause.c:1662
-#, c-format
-msgid "cannot override PARTITION BY clause of window \"%s\""
-msgstr "no se puede pasar a llevar la cláusula PARTITION BY de la ventana «%s»"
+#: optimizer/plan/planner.c:2254
+msgid "could not implement GROUP BY"
+msgstr "no se pudo implementar GROUP BY"
 
-#: parser/parse_clause.c:1674
-#, c-format
-msgid "cannot override ORDER BY clause of window \"%s\""
-msgstr "no se puede pasar a llevar la cláusula ORDER BY de la ventana «%s»"
+#: optimizer/plan/planner.c:2426
+msgid "could not implement DISTINCT"
+msgstr "no se pudo implementar DISTINCT"
 
-#: parser/parse_clause.c:1696
-#, c-format
-msgid "cannot override frame clause of window \"%s\""
-msgstr "no se puede pasar a llevar la cláusula de «frame» de la ventana «%s»"
+#: optimizer/plan/planner.c:2877
+msgid "could not implement window PARTITION BY"
+msgstr "No se pudo implementar PARTITION BY de ventana"
 
-#: parser/parse_clause.c:1762
-msgid ""
-"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
-"list"
+#: optimizer/plan/planner.c:2878
+msgid "Window partitioning columns must be of sortable datatypes."
 msgstr ""
-"en una agregación con DISTINCT, las expresiones en ORDER BY deben aparecer "
-"en la lista de argumentos"
+"Las columnas de particionamiento de ventana deben de tipos que se puedan "
+"ordenar."
 
-#: parser/parse_clause.c:1763
-msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
-msgstr ""
-"para SELECT DISTINCT, las expresiones en ORDER BY deben aparecer en la lista "
-"de resultados"
+#: optimizer/plan/planner.c:2882
+msgid "could not implement window ORDER BY"
+msgstr "no se pudo implementar ORDER BY de ventana"
 
-#: parser/parse_clause.c:1849 parser/parse_clause.c:1881
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+#: optimizer/plan/planner.c:2883
+msgid "Window ordering columns must be of sortable datatypes."
 msgstr ""
-"las expresiones de SELECT DISTINCT ON deben coincidir con las expresiones "
-"iniciales de ORDER BY"
-
-#: parser/parse_clause.c:2000
-#, c-format
-msgid "operator %s is not a valid ordering operator"
-msgstr "el operador «%s» no es un operador válido de ordenamiento"
+"Las columnas de ordenamiento de ventana debe ser de tipos que se puedan "
+"ordenar."
 
-#: parser/parse_clause.c:2002
+#: optimizer/path/joinrels.c:673
 msgid ""
-"Ordering operators must be \"<\" or \">\" members of btree operator families."
+"FULL JOIN is only supported with merge-joinable or hash-joinable join "
+"conditions"
 msgstr ""
-"Los operadores de ordenamiento deben ser miembros «<» o «>» de una familia "
-"de operadores btree."
-
-#: parser/parse_coerce.c:841 parser/parse_coerce.c:870
-#: parser/parse_coerce.c:888 parser/parse_coerce.c:903
-#: parser/parse_expr.c:1640 parser/parse_expr.c:2079
-#, c-format
-msgid "cannot cast type %s to %s"
-msgstr "no se puede convertir el tipo %s a %s"
-
-#: parser/parse_coerce.c:873
-msgid "Input has too few columns."
-msgstr "La entrada tiene muy pocas columnas."
-
-#: parser/parse_coerce.c:891
-#, c-format
-msgid "Cannot cast type %s to %s in column %d."
-msgstr "No se puede convertir el tipo %s a %s en la columna %d."
+"FULL JOIN sólo está soportado con condiciones que se pueden usar con merge "
+"join o hash join"
 
-#: parser/parse_coerce.c:906
-msgid "Input has too many columns."
-msgstr "La entrada tiene demasiadas columnas."
+#: parser/analyze.c:471
+msgid "INSERT ... SELECT cannot specify INTO"
+msgstr "INSERT ... SELECT no puede especificar INTO"
 
-#. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:949
-#, c-format
-msgid "argument of %s must be type boolean, not type %s"
-msgstr "el argumento de %s debe ser de tipo boolean, no tipo %s"
+#: parser/analyze.c:564 parser/analyze.c:1070
+msgid "VALUES lists must all be the same length"
+msgstr "las listas VALUES deben ser todas de la misma longitud"
 
-#. translator: %s is name of a SQL construct, eg WHERE
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:959 parser/parse_coerce.c:1008
-#, c-format
-msgid "argument of %s must not return a set"
-msgstr "el argumento de %s no debe retornar un conjunto"
+#: parser/analyze.c:606 parser/analyze.c:1211
+msgid "VALUES must not contain table references"
+msgstr "VALUES no debe contener referencias a tablas"
 
-#. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:996
-#, c-format
-msgid "argument of %s must be type %s, not type %s"
-msgstr "el argumento de %s debe ser de tipo %s, no tipo %s"
+#: parser/analyze.c:620 parser/analyze.c:1225
+msgid "VALUES must not contain OLD or NEW references"
+msgstr "VALUES no debe contener referencias a OLD o NEW"
 
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1129
-#, c-format
-msgid "%s types %s and %s cannot be matched"
-msgstr "los tipos %2$s y %3$s no son coincidentes en %1$s"
+#: parser/analyze.c:621 parser/analyze.c:1226
+msgid "Use SELECT ... UNION ALL ... instead."
+msgstr "Use SELECT ... UNION ALL ... en su lugar."
 
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1196
-#, c-format
-msgid "%s could not convert type %s to %s"
-msgstr "%s no pudo convertir el tipo %s a %s"
+#: parser/analyze.c:725 parser/analyze.c:1238
+msgid "cannot use aggregate function in VALUES"
+msgstr "no se puede usar una función de agregación en VALUES"
 
-#: parser/parse_coerce.c:1437
-msgid "arguments declared \"anyelement\" are not all alike"
-msgstr "los argumentos declarados «anyelement» no son de tipos compatibles"
+#: parser/analyze.c:731 parser/analyze.c:1244
+msgid "cannot use window function in VALUES"
+msgstr "no se puede usar una función de ventana deslizante en VALUES"
 
-#: parser/parse_coerce.c:1456
-msgid "arguments declared \"anyarray\" are not all alike"
-msgstr "los argumentos declarados «anyarray» no son de tipos compatibles"
+#: parser/analyze.c:765
+msgid "INSERT has more expressions than target columns"
+msgstr "INSERT tiene más expresiones que columnas de destino"
 
-#: parser/parse_coerce.c:1485 parser/parse_coerce.c:1629
-#: parser/parse_coerce.c:1660
-#, c-format
-msgid "argument declared \"anyarray\" is not an array but type %s"
-msgstr "el argumento declarado «anyarray» no es un array sino de tipo %s"
+#: parser/analyze.c:783
+msgid "INSERT has more target columns than expressions"
+msgstr "INSERT tiene más columnas de destino que expresiones"
 
-#: parser/parse_coerce.c:1501
+#: parser/analyze.c:787
 msgid ""
-"argument declared \"anyarray\" is not consistent with argument declared "
-"\"anyelement\""
+"The insertion source is a row expression containing the same number of "
+"columns expected by the INSERT. Did you accidentally use extra parentheses?"
 msgstr ""
-"el argumento declarado «anyarray» no es consistente con el argumento "
-"declarado «anyelement»"
+"La fuente de inserción es una expresión de fila que contiene la misma "
+"cantidad de columnas que esperaba el INSERT. ¿Usó accidentalmente paréntesis "
+"extra?"
 
-#: parser/parse_coerce.c:1519
-msgid "could not determine polymorphic type because input has type \"unknown\""
-msgstr ""
-"no se pudo determinar el tipo polimórfico porque el tipo de entrada es "
-"«unknown»"
+#: parser/analyze.c:1084
+msgid "DEFAULT can only appear in a VALUES list within INSERT"
+msgstr "DEFAULT sólo puede aparecer en listas VALUES dentro de un INSERT"
 
-#: parser/parse_coerce.c:1529
-#, c-format
-msgid "type matched to anynonarray is an array type: %s"
-msgstr "el argumento coincidente con anynonarray es un array: %s"
-
-#: parser/parse_coerce.c:1539
-#, c-format
-msgid "type matched to anyenum is not an enum type: %s"
-msgstr "el tipo coincidente con anyenum no es un tipo enum: %s"
+#: parser/analyze.c:1192 parser/analyze.c:2414
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
+msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a VALUES"
 
-#: parser/parse_cte.c:40
-#, c-format
-msgid ""
-"recursive reference to query \"%s\" must not appear within its non-recursive "
-"term"
-msgstr ""
-"la referencia recursiva a la consulta «%s» no debe aparecer dentro de su "
-"término no recursivo"
+#: parser/analyze.c:1452
+msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
+msgstr "cláusula UNION/INTERSECT/EXCEPT ORDER BY no válida"
 
-#: parser/parse_cte.c:42
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within a subquery"
+#: parser/analyze.c:1453
+msgid "Only result column names can be used, not expressions or functions."
 msgstr ""
-"la referencia recursiva a la consulta «%s» no debe aparecer dentro de una "
-"subconsulta"
+"Sólo nombres de columna del resultado pueden usarse, no expresiones o "
+"funciones."
 
-#: parser/parse_cte.c:44
-#, c-format
+#: parser/analyze.c:1454
 msgid ""
-"recursive reference to query \"%s\" must not appear within an outer join"
+"Add the expression/function to every SELECT, or move the UNION into a FROM "
+"clause."
 msgstr ""
-"la referencia recursiva a la consulta «%s» no debe aparecer dentro de un "
-"outer join"
+"Agregue la función o expresión a todos los SELECT, o mueva el UNION dentro "
+"de una cláusula FROM."
 
-#: parser/parse_cte.c:46
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
-msgstr ""
-"la referencia recursiva a la consulta «%s» no debe aparecer dentro de "
-"INTERSECT"
+#: parser/analyze.c:1526
+msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
+msgstr "sólo se permite INTO en el primer SELECT de UNION/INTERSECT/EXCEPT"
 
-#: parser/parse_cte.c:48
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
+#: parser/analyze.c:1586
+msgid ""
+"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
+"same query level"
 msgstr ""
-"la referencia recursiva a la consulta «%s» no debe aparecer dentro de EXCEPT"
-
-#: parser/parse_cte.c:130
-#, c-format
-msgid "WITH query name \"%s\" specified more than once"
-msgstr "el nombre de consulta WITH «%s» fue especificado más de una vez"
-
-#: parser/parse_cte.c:247
-msgid "subquery in WITH cannot have SELECT INTO"
-msgstr "una subconsulta en WITH no puede tener SELECT INTO"
+"una sentencia miembro de UNION/INSERT/EXCEPT no puede referirse a otras "
+"relaciones del mismo nivel de la consulta"
 
-#: parser/parse_cte.c:288
+#: parser/analyze.c:1674
 #, c-format
-msgid ""
-"recursive query \"%s\" column %d has type %s in non-recursive term but type "
-"%s overall"
-msgstr ""
-"la columna %2$d en la consulta recursiva «%1$s» tiene tipo %3$s en el "
-"término no recursivo, pero %4$s en general"
+msgid "each %s query must have the same number of columns"
+msgstr "cada consulta %s debe tener el mismo número de columnas"
 
-#: parser/parse_cte.c:294
-msgid "Cast the output of the non-recursive term to the correct type."
-msgstr ""
-"Aplique una conversión de tipo a la salida del término no recursivo al tipo "
-"correcto."
+#: parser/analyze.c:1930
+msgid "CREATE TABLE AS specifies too many column names"
+msgstr "CREATE TABLE AS especifica demasiados nombres de columna"
 
-#: parser/parse_cte.c:376
-#, c-format
-msgid "WITH query \"%s\" has %d columns available but %d columns specified"
-msgstr ""
-"la consulta WITH «%s» tiene %d columnas disponibles pero se especificaron %d"
+#: parser/analyze.c:1988
+msgid "cannot use aggregate function in UPDATE"
+msgstr "no se puede usar una función de agregación en UPDATE"
 
-#: parser/parse_cte.c:556
-msgid "mutual recursion between WITH items is not implemented"
-msgstr "la recursión mutua entre elementos de WITH no está implementada"
+#: parser/analyze.c:1994
+msgid "cannot use window function in UPDATE"
+msgstr "no se puede usar una función de ventana deslizante en UPDATE"
 
-#: parser/parse_cte.c:608
-#, c-format
-msgid ""
-"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
-"recursive-term"
-msgstr ""
-"la consulta recursiva «%s» no tiene la forma término-no-recursivo UNION "
-"[ALL] término-recursivo"
+#: parser/analyze.c:2103
+msgid "cannot use aggregate function in RETURNING"
+msgstr "no se puede usar una función de agregación en RETURNING"
 
-#: parser/parse_cte.c:640
-msgid "ORDER BY in a recursive query is not implemented"
-msgstr "ORDER BY no está implementado en una consulta recursiva"
+#: parser/analyze.c:2109
+msgid "cannot use window function in RETURNING"
+msgstr "no se puede usar una función de ventana deslizante en RETURNING"
 
-#: parser/parse_cte.c:646
-msgid "OFFSET in a recursive query is not implemented"
-msgstr "OFFSET no está implementado en una consulta recursiva"
+#: parser/analyze.c:2128
+msgid "RETURNING cannot contain references to other relations"
+msgstr "RETURNING no puede contener referencias a otras relaciones"
 
-#: parser/parse_cte.c:652
-msgid "LIMIT in a recursive query is not implemented"
-msgstr "LIMIT no está implementado en una consulta recursiva"
+#: parser/analyze.c:2167
+msgid "cannot specify both SCROLL and NO SCROLL"
+msgstr "no se puede especificar SCROLL y NO SCROLL"
 
-#: parser/parse_cte.c:658
-msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
-msgstr "FOR UPDATE/SHARE no está implementado en una consulta recursiva"
+#: parser/analyze.c:2181
+msgid "DECLARE CURSOR cannot specify INTO"
+msgstr "DECLARE CURSOR no puede especificar INTO"
 
-#: parser/parse_cte.c:715
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear more than once"
+#: parser/analyze.c:2193
+msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
 msgstr ""
-"la referencia recursiva a la consulta «%s» no debe aparecer más de una vez"
+"DECLARE CURSOR no debe contener sentencias que modifiquen datos en WITH"
 
-#: parser/parse_expr.c:358 parser/parse_expr.c:751
-#, c-format
-msgid "column %s.%s does not exist"
-msgstr "no existe la columna %s.%s"
+#: parser/analyze.c:2199
+msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE no está soportado"
 
-#: parser/parse_expr.c:370
-#, c-format
-msgid "column \"%s\" not found in data type %s"
-msgstr "la columna «%s» no fue encontrado en el tipo %s"
+#: parser/analyze.c:2200
+msgid "Holdable cursors must be READ ONLY."
+msgstr "Los cursores declarados HOLD deben ser READ ONLY."
 
-#: parser/parse_expr.c:376
-#, c-format
-msgid "could not identify column \"%s\" in record data type"
-msgstr "no se pudo identificar la columna «%s» en el tipo de dato record"
+#: parser/analyze.c:2213
+msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE no está soportado"
 
-#: parser/parse_expr.c:382
-#, c-format
-msgid "column notation .%s applied to type %s, which is not a composite type"
-msgstr ""
-"la notación de columna .%s fue aplicada al tipo %s, que no es un tipo "
-"compuesto"
+#: parser/analyze.c:2214
+msgid "Insensitive cursors must be READ ONLY."
+msgstr "Los cursores insensitivos deben ser READ ONLY."
 
-#: parser/parse_expr.c:412 parser/parse_target.c:600
-msgid "row expansion via \"*\" is not supported here"
-msgstr "la expansión de filas a través de «*» no está soportado aquí"
+#: parser/analyze.c:2267
+msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
+msgstr "SELECT FOR UPDATE/SHARE no está permitido con cláusulas DISTINCT"
 
-#: parser/parse_expr.c:735 parser/parse_relation.c:478
-#: parser/parse_relation.c:551 parser/parse_target.c:977
-#, c-format
-msgid "column reference \"%s\" is ambiguous"
-msgstr "la referencia a la columna «%s» es ambigua"
+#: parser/analyze.c:2271
+msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
+msgstr "SELECT FOR UPDATE/SHARE no está permitido con cláusulas GROUP BY"
 
-#: parser/parse_expr.c:803 parser/parse_param.c:108 parser/parse_param.c:139
-#: parser/parse_param.c:195 parser/parse_param.c:287
-#, c-format
-msgid "there is no parameter $%d"
-msgstr "no hay parámetro $%d"
+#: parser/analyze.c:2275
+msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
+msgstr "SELECT FOR UPDATE/SHARE no está permitido con cláusulas HAVING"
 
-#: parser/parse_expr.c:1008
-msgid "NULLIF requires = operator to yield boolean"
-msgstr "NULLIF requiere que el operador = retorne boolean"
+#: parser/analyze.c:2279
+msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
+msgstr "SELECT FOR UPDATE/SHARE no está permitido con funciones de agregación"
 
-#: parser/parse_expr.c:1181
-msgid "arguments of row IN must all be row expressions"
-msgstr "los argumentos de IN de registros deben ser expresiones de registro"
+#: parser/analyze.c:2283
+msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
+msgstr ""
+"SELECT FOR UPDATE/SHARE no está permitido con funciones de ventana deslizante"
 
-#: parser/parse_expr.c:1385
-msgid "subquery cannot have SELECT INTO"
-msgstr "una subconsulta no puede tener SELECT INTO"
+#: parser/analyze.c:2287
+msgid ""
+"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
+"target list"
+msgstr ""
+"SELECT FOR UPDATE/SHARE no está permitido con funciones que retornan "
+"conjuntos en la lista de resultados"
 
-#: parser/parse_expr.c:1413
-msgid "subquery must return a column"
-msgstr "la subconsulta debe retornar una columna"
+#: parser/analyze.c:2366
+msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
+msgstr ""
+"SELECT FOR UPDATE/SHARE debe especificar nombres de relaciones sin calificar"
 
-#: parser/parse_expr.c:1420
-msgid "subquery must return only one column"
-msgstr "la subconsulta debe retornar sólo una columna"
+#: parser/analyze.c:2383
+#, c-format
+msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
+msgstr "SELECT FOR UPDATE/SHARE no puede ser usado con la tabla foránea «%s»"
 
-#: parser/parse_expr.c:1479
-msgid "subquery has too many columns"
-msgstr "la subconsulta tiene demasiadas columnas"
+#: parser/analyze.c:2402
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
+msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a un join"
 
-#: parser/parse_expr.c:1484
-msgid "subquery has too few columns"
-msgstr "la subconsulta tiene muy pocas columnas"
+#: parser/analyze.c:2408
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
+msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a una función"
 
-#: parser/parse_expr.c:1580
-msgid "cannot determine type of empty array"
-msgstr "no se puede determinar el tipo de un array vacío"
+#: parser/analyze.c:2420
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
+msgstr "SELECT FOR UPDATE/SHARE no puede ser aplicado a una consulta WITH"
 
-#: parser/parse_expr.c:1581
-msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
+#: parser/analyze.c:2434
+#, c-format
+msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
 msgstr ""
-"Agregue una conversión de tipo explícita al tipo deseado, por ejemplo ARRAY"
-"[]::integer[]."
+"la relación «%s» en la cláusula FOR UPDATE/SHARE no fue encontrada en la "
+"cláusula FROM"
 
-#: parser/parse_expr.c:1595
+#: parser/parse_agg.c:131 parser/parse_oper.c:219
 #, c-format
-msgid "could not find element type for data type %s"
-msgstr ""
-"no se pudo encontrar el tipo de dato de elemento para el tipo de dato %s"
+msgid "could not identify an ordering operator for type %s"
+msgstr "no se pudo identificar un operador de ordenamiento para el tipo %s"
 
-#: parser/parse_expr.c:1793
-msgid "unnamed XML attribute value must be a column reference"
+#: parser/parse_agg.c:133
+msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr ""
-"el valor del atributo XML sin nombre debe ser una referencia a una columna"
+"Las funciones de agregación con DISTINCT deben ser capaces de ordenar sus "
+"valores de entrada."
 
-#: parser/parse_expr.c:1794
-msgid "unnamed XML element value must be a column reference"
+#: parser/parse_agg.c:174
+msgid "aggregate function calls cannot contain window function calls"
 msgstr ""
-"el valor del elemento XML sin nombre debe ser una referencia a una columna"
+"las llamadas a funciones de agregación no pueden contener llamadas a "
+"funciones de ventana deslizante"
 
-#: parser/parse_expr.c:1809
+#: parser/parse_agg.c:245 parser/parse_clause.c:1637
 #, c-format
-msgid "XML attribute name \"%s\" appears more than once"
-msgstr "el nombre de atributo XML «%s» aparece más de una vez"
+msgid "window \"%s\" does not exist"
+msgstr "la ventana «%s» no existe"
 
-#: parser/parse_expr.c:1916
-#, c-format
-msgid "cannot cast XMLSERIALIZE result to %s"
-msgstr "no se puede convertir el resultado de XMLSERIALIZE a %s"
+#: parser/parse_agg.c:336
+msgid "aggregates not allowed in WHERE clause"
+msgstr "no se permiten funciones de agregación en la cláusula WHERE"
 
-#: parser/parse_expr.c:2120 parser/parse_expr.c:2318
-msgid "unequal number of entries in row expressions"
-msgstr "número desigual de entradas en expresiones de registro"
+#: parser/parse_agg.c:342
+msgid "aggregates not allowed in JOIN conditions"
+msgstr "no se permiten funciones de agregación en las condiciones JOIN"
 
-#: parser/parse_expr.c:2130
-msgid "cannot compare rows of zero length"
-msgstr "no se pueden comparar registros de largo cero"
+#: parser/parse_agg.c:363
+msgid "aggregates not allowed in GROUP BY clause"
+msgstr "no se permiten funciones de agregación en la cláusula GROUP BY"
 
-#: parser/parse_expr.c:2155
-#, c-format
-msgid "row comparison operator must yield type boolean, not type %s"
+#: parser/parse_agg.c:433
+msgid "aggregate functions not allowed in a recursive query's recursive term"
 msgstr ""
-"el operador de comparación de registros debe retornar tipo boolean, no tipo "
-"%s"
+"las funciones de agregación no están permitidas en el término recursivo de "
+"una consulta recursiva"
 
-#: parser/parse_expr.c:2162
-msgid "row comparison operator must not return a set"
-msgstr "el operador de comparación de registros no puede retornar un conjunto"
+#: parser/parse_agg.c:458
+msgid "window functions not allowed in WHERE clause"
+msgstr "no se permiten funciones de ventana deslizante en la cláusula WHERE"
 
-#: parser/parse_expr.c:2221 parser/parse_expr.c:2265
-#, c-format
-msgid "could not determine interpretation of row comparison operator %s"
+#: parser/parse_agg.c:464
+msgid "window functions not allowed in JOIN conditions"
+msgstr "no se permiten funciones de ventana deslizante en las condiciones JOIN"
+
+#: parser/parse_agg.c:470
+msgid "window functions not allowed in HAVING clause"
+msgstr "no se permiten funciones de ventana deslizante en la cláusula HAVING"
+
+#: parser/parse_agg.c:483
+msgid "window functions not allowed in GROUP BY clause"
+msgstr "no se permiten funciones de ventana deslizante en la cláusula GROUP BY"
+
+#: parser/parse_agg.c:502 parser/parse_agg.c:515
+msgid "window functions not allowed in window definition"
 msgstr ""
-"no se pudo determinar la interpretación del operador de comparación de "
-"registros %s"
+"no se permiten funciones de ventana deslizante en definiciones de ventana "
+"deslizante"
 
-#: parser/parse_expr.c:2223
+#: parser/parse_agg.c:673
+#, c-format
 msgid ""
-"Row comparison operators must be associated with btree operator families."
+"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
+"aggregate function"
 msgstr ""
-"Los operadores de comparación de registros deben estar asociados a una "
-"familia de operadores btree."
-
-#: parser/parse_expr.c:2267
-msgid "There are multiple equally-plausible candidates."
-msgstr "Hay múltiples candidatos igualmente plausibles."
-
-#: parser/parse_expr.c:2358
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr "IS DISTINCT FROM requiere que el operador = retorne boolean"
-
-#: parser/parse_func.c:153
-#, c-format
-msgid "argument name \"%s\" used more than once"
-msgstr "el nombre de argumento «%s» fue especificado más de una vez"
-
-#: parser/parse_func.c:164
-msgid "positional argument cannot follow named argument"
-msgstr "un argumento posicional no puede seguir a un argumento con nombre"
+"la columna «%s.%s» debe aparecer en la cláusula GROUP BY o ser usada en una "
+"función de agregación"
 
-#: parser/parse_func.c:242
+#: parser/parse_agg.c:679
 #, c-format
-msgid "%s(*) specified, but %s is not an aggregate function"
-msgstr "se especificó %s(*), pero %s no es una función de agregación"
+msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
+msgstr ""
+"la subconsulta usa la columna «%s.%s» no agrupada de una consulta exterior"
 
-#: parser/parse_func.c:249
+#: parser/parse_clause.c:421
 #, c-format
-msgid "DISTINCT specified, but %s is not an aggregate function"
-msgstr "se especificó DISTINCT, pero %s no es una función de agregación"
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgstr "la cláusula JOIN/ON se refiere a «%s», que no es parte de JOIN"
 
-#: parser/parse_func.c:255
-#, c-format
-msgid "ORDER BY specified, but %s is not an aggregate function"
-msgstr "se especificó ORDER BY, pero %s no es una función de agregación"
+#: parser/parse_clause.c:502
+msgid "subquery in FROM cannot have SELECT INTO"
+msgstr "una subconsulta en FROM no puede tener SELECT INTO"
 
-#: parser/parse_func.c:261
-#, c-format
-msgid ""
-"OVER specified, but %s is not a window function nor an aggregate function"
+#: parser/parse_clause.c:524
+msgid "subquery in FROM cannot refer to other relations of same query level"
 msgstr ""
-"se especificó OVER, pero %s no es una función de ventana deslizante ni una "
-"función de agregación"
-
-#: parser/parse_func.c:283
-#, c-format
-msgid "function %s is not unique"
-msgstr "la función %s no es única"
+"una subconsulta en FROM no puede referirse a otras relaciones en el mismo "
+"nivel de la consulta"
 
-#: parser/parse_func.c:286
+#: parser/parse_clause.c:580
 msgid ""
-"Could not choose a best candidate function. You might need to add explicit "
-"type casts."
+"function expression in FROM cannot refer to other relations of same query "
+"level"
 msgstr ""
-"No se pudo escoger la función más adecuada. Puede desear agregar "
-"conversiones explícitas de tipos."
+"una función en FROM no puede referirse a otras relaciones en el mismo nivel "
+"de la consulta"
 
-#: parser/parse_func.c:297
-msgid ""
-"No aggregate function matches the given name and argument types. Perhaps you "
-"misplaced ORDER BY; ORDER BY must appear after all regular arguments of the "
-"aggregate."
-msgstr ""
-"Ninguna función coincide en el nombre y tipos de argumentos. Quizás puso "
-"ORDER BY en una mala posición; ORDER BY debe aparecer después de todos los "
-"argumentos normales de la función de agregación."
+#: parser/parse_clause.c:593
+msgid "cannot use aggregate function in function expression in FROM"
+msgstr "no se pueden usar funciones de agregación en una función en FROM"
 
-#: parser/parse_func.c:308
-msgid ""
-"No function matches the given name and argument types. You might need to add "
-"explicit type casts."
+#: parser/parse_clause.c:600
+msgid "cannot use window function in function expression in FROM"
 msgstr ""
-"Ninguna función coincide en el nombre y tipos de argumentos. Puede desear "
-"agregar conversión explícita de tipos."
+"no se pueden usar funciones de ventana deslizante en una función en FROM"
 
-#: parser/parse_func.c:415 parser/parse_func.c:480
+#: parser/parse_clause.c:877
 #, c-format
-msgid "%s(*) must be used to call a parameterless aggregate function"
-msgstr ""
-"%s(*) debe ser usado para invocar una función de agregación sin parámetros"
-
-#: parser/parse_func.c:422
-msgid "aggregates cannot return sets"
-msgstr "las funciones de agregación no pueden retornar conjuntos"
-
-#: parser/parse_func.c:434
-msgid "aggregates cannot use named arguments"
-msgstr "las funciones de agregación no pueden usar argumentos con nombre"
-
-#: parser/parse_func.c:453
-msgid "window function call requires an OVER clause"
-msgstr ""
-"la invocación de una función de ventana deslizante requiere una cláusula OVER"
+msgid "column name \"%s\" appears more than once in USING clause"
+msgstr "la columna «%s» aparece más de una vez en la cláusula USING"
 
-#: parser/parse_func.c:470
-msgid "DISTINCT is not implemented for window functions"
-msgstr "DISTINCT no está implementado para funciones de ventana deslizante"
+#: parser/parse_clause.c:892
+#, c-format
+msgid "common column name \"%s\" appears more than once in left table"
+msgstr "la columna común «%s» aparece más de una vez en la tabla izquierda"
 
-#: parser/parse_func.c:490
-msgid "aggregate ORDER BY is not implemented for window functions"
+#: parser/parse_clause.c:901
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr ""
-"el ORDER BY de funciones de agregación no está implementado para funciones "
-"de ventana deslizante"
+"la columna «%s» especificada en la cláusula USING no existe en la tabla "
+"izquierda"
 
-#: parser/parse_func.c:496
-msgid "window functions cannot return sets"
-msgstr "las funciones de ventana deslizante no pueden retornar conjuntos"
+#: parser/parse_clause.c:915
+#, c-format
+msgid "common column name \"%s\" appears more than once in right table"
+msgstr "la columna común «%s» aparece más de una vez en la tabla derecha"
 
-#: parser/parse_func.c:507
-msgid "window functions cannot use named arguments"
+#: parser/parse_clause.c:924
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr ""
-"las funciones de ventana deslizante no pueden usar argumentos con nombre"
+"la columna «%s» especificada en la cláusula USING no existe en la tabla "
+"derecha"
 
-#: parser/parse_func.c:1572
+#: parser/parse_clause.c:981
 #, c-format
-msgid "aggregate %s(*) does not exist"
-msgstr "no existe la función de agregación %s(*)"
+msgid "column alias list for \"%s\" has too many entries"
+msgstr "la lista de alias de columnas para «%s» tiene demasiadas entradas"
 
-#: parser/parse_func.c:1577
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1228
 #, c-format
-msgid "aggregate %s does not exist"
-msgstr "no existe la función de agregación %s"
+msgid "argument of %s must not contain variables"
+msgstr "el argumento de %s no puede contener variables"
 
-#: parser/parse_func.c:1596
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1239
 #, c-format
-msgid "function %s is not an aggregate"
-msgstr "la función %s no es una función de agregación"
+msgid "argument of %s must not contain aggregate functions"
+msgstr "el argumento de %s no puede contener funciones de agregación"
 
-#: parser/parse_node.c:82
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1250
 #, c-format
-msgid "target lists can have at most %d entries"
-msgstr "las listas de resultados pueden tener a lo más %d entradas"
+msgid "argument of %s must not contain window functions"
+msgstr "el argumento de %s no puede contener funciones de ventana deslizante"
 
-#: parser/parse_node.c:222
+#. translator: first %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1367
 #, c-format
-msgid "cannot subscript type %s because it is not an array"
-msgstr "no se puede poner subíndices al tipo %s porque no es un array"
-
-#: parser/parse_node.c:316 parser/parse_node.c:342
-msgid "array subscript must have type integer"
-msgstr "los subíndices de arrays deben tener tipo entero"
+msgid "%s \"%s\" is ambiguous"
+msgstr "%s «%s» es ambiguo"
 
-#: parser/parse_node.c:366
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1391
 #, c-format
-msgid "array assignment requires type %s but expression is of type %s"
-msgstr ""
-"la asignación de array debe tener tipo %s pero la expresión es de tipo %s"
+msgid "non-integer constant in %s"
+msgstr "constante no entera en %s"
 
-#: parser/parse_oper.c:124 parser/parse_oper.c:751 utils/adt/regproc.c:464
-#: utils/adt/regproc.c:484 utils/adt/regproc.c:643
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1409
 #, c-format
-msgid "operator does not exist: %s"
-msgstr "el operador no existe: %s"
+msgid "%s position %d is not in select list"
+msgstr "la posición %2$d de %1$s no está en la lista de resultados"
 
-#: parser/parse_oper.c:256
-msgid "Use an explicit ordering operator or modify the query."
-msgstr "Use un operador de ordenamiento explícito o modifique la consulta."
+#: parser/parse_clause.c:1625
+#, c-format
+msgid "window \"%s\" is already defined"
+msgstr "la ventana «%s» ya está definida"
 
-#: parser/parse_oper.c:260 utils/adt/arrayfuncs.c:3105
-#: utils/adt/arrayfuncs.c:3506 utils/adt/rowtypes.c:1139
+#: parser/parse_clause.c:1679
 #, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "no se pudo identificar un operador de igualdad para el tipo %s"
+msgid "cannot override PARTITION BY clause of window \"%s\""
+msgstr "no se puede pasar a llevar la cláusula PARTITION BY de la ventana «%s»"
 
-#: parser/parse_oper.c:509
+#: parser/parse_clause.c:1691
 #, c-format
-msgid "operator requires run-time type coercion: %s"
-msgstr "el operador requiere conversión explícita de tipos: %s"
+msgid "cannot override ORDER BY clause of window \"%s\""
+msgstr "no se puede pasar a llevar la cláusula ORDER BY de la ventana «%s»"
 
-#: parser/parse_oper.c:743
+#: parser/parse_clause.c:1713
 #, c-format
-msgid "operator is not unique: %s"
-msgstr "el operador no es único: %s"
+msgid "cannot override frame clause of window \"%s\""
+msgstr "no se puede pasar a llevar la cláusula de «frame» de la ventana «%s»"
 
-#: parser/parse_oper.c:745
+#: parser/parse_clause.c:1779
 msgid ""
-"Could not choose a best candidate operator. You might need to add explicit "
-"type casts."
+"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
+"list"
 msgstr ""
-"No se pudo escoger el operador más adecuado. Puede desear agregar "
-"conversiones explícitas de tipos."
+"en una agregación con DISTINCT, las expresiones en ORDER BY deben aparecer "
+"en la lista de argumentos"
 
-#: parser/parse_oper.c:753
-msgid ""
-"No operator matches the given name and argument type(s). You might need to "
-"add explicit type casts."
+#: parser/parse_clause.c:1780
+msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
 msgstr ""
-"Ningún operador coincide con el nombre y el tipo de los argumentos. Puede "
-"desear agregar conversiones explícitas de tipos."
+"para SELECT DISTINCT, las expresiones en ORDER BY deben aparecer en la lista "
+"de resultados"
+
+#: parser/parse_clause.c:1866 parser/parse_clause.c:1898
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr ""
+"las expresiones de SELECT DISTINCT ON deben coincidir con las expresiones "
+"iniciales de ORDER BY"
 
-#: parser/parse_oper.c:812 parser/parse_oper.c:928
+#: parser/parse_clause.c:2020
 #, c-format
-msgid "operator is only a shell: %s"
-msgstr "el operador está inconcluso: %s"
+msgid "operator %s is not a valid ordering operator"
+msgstr "el operador «%s» no es un operador válido de ordenamiento"
 
-#: parser/parse_oper.c:916
-msgid "op ANY/ALL (array) requires array on right side"
-msgstr "op ANY/ALL (array) requiere un array al lado derecho"
+#: parser/parse_clause.c:2022
+msgid ""
+"Ordering operators must be \"<\" or \">\" members of btree operator families."
+msgstr ""
+"Los operadores de ordenamiento deben ser miembros «<» o «>» de una familia "
+"de operadores btree."
 
-#: parser/parse_oper.c:958
-msgid "op ANY/ALL (array) requires operator to yield boolean"
-msgstr "op ANY/ALL (array) requiere un operador que entregue boolean"
+#: parser/parse_coerce.c:906 parser/parse_coerce.c:936
+#: parser/parse_coerce.c:954 parser/parse_coerce.c:969
+#: parser/parse_expr.c:1667 parser/parse_expr.c:2109 parser/parse_target.c:829
+#, c-format
+msgid "cannot cast type %s to %s"
+msgstr "no se puede convertir el tipo %s a %s"
 
-#: parser/parse_oper.c:963
-msgid "op ANY/ALL (array) requires operator not to return a set"
-msgstr "op ANY/ALL (array) requiere un operador que no retorne un conjunto"
+#: parser/parse_coerce.c:939
+msgid "Input has too few columns."
+msgstr "La entrada tiene muy pocas columnas."
 
-#: parser/parse_param.c:212
+#: parser/parse_coerce.c:957
 #, c-format
-msgid "inconsistent types deduced for parameter $%d"
-msgstr "para el parámetro $%d se dedujeron tipos de dato inconsistentes"
+msgid "Cannot cast type %s to %s in column %d."
+msgstr "No se puede convertir el tipo %s a %s en la columna %d."
 
-#: parser/parse_relation.c:147
+#: parser/parse_coerce.c:972
+msgid "Input has too many columns."
+msgstr "La entrada tiene demasiadas columnas."
+
+#. translator: first %s is name of a SQL construct, eg WHERE
+#: parser/parse_coerce.c:1015
 #, c-format
-msgid "table reference \"%s\" is ambiguous"
-msgstr "la referencia a la tabla «%s» es ambigua"
+msgid "argument of %s must be type boolean, not type %s"
+msgstr "el argumento de %s debe ser de tipo boolean, no tipo %s"
 
-#: parser/parse_relation.c:183
+#. translator: %s is name of a SQL construct, eg WHERE
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1025 parser/parse_coerce.c:1074
 #, c-format
-msgid "table reference %u is ambiguous"
-msgstr "la referencia a la tabla %u es ambigua"
+msgid "argument of %s must not return a set"
+msgstr "el argumento de %s no debe retornar un conjunto"
 
-#: parser/parse_relation.c:343
+#. translator: first %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1062
 #, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "el nombre de tabla «%s» fue especificado más de una vez"
+msgid "argument of %s must be type %s, not type %s"
+msgstr "el argumento de %s debe ser de tipo %s, no tipo %s"
 
-#: parser/parse_relation.c:754 parser/parse_relation.c:1043
-#: parser/parse_relation.c:1403
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1195
 #, c-format
-msgid "table \"%s\" has %d columns available but %d columns specified"
-msgstr "la tabla «%s» tiene %d columnas pero se especificaron %d"
+msgid "%s types %s and %s cannot be matched"
+msgstr "los tipos %2$s y %3$s no son coincidentes en %1$s"
 
-#: parser/parse_relation.c:784
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1262
 #, c-format
-msgid "too many column aliases specified for function %s"
-msgstr "se especificaron demasiados alias de columna para la función %s"
+msgid "%s could not convert type %s to %s"
+msgstr "%s no pudo convertir el tipo %s a %s"
 
-#: parser/parse_relation.c:850
+#: parser/parse_coerce.c:1513
+msgid "arguments declared \"anyelement\" are not all alike"
+msgstr "los argumentos declarados «anyelement» no son de tipos compatibles"
+
+#: parser/parse_coerce.c:1533
+msgid "arguments declared \"anyarray\" are not all alike"
+msgstr "los argumentos declarados «anyarray» no son de tipos compatibles"
+
+#: parser/parse_coerce.c:1562 parser/parse_coerce.c:1710
+#: parser/parse_coerce.c:1742
 #, c-format
-msgid ""
-"There is a WITH item named \"%s\", but it cannot be referenced from this "
-"part of the query."
-msgstr ""
-"Hay un elemento WITH llamado «%s», pero no puede ser referenciada desde esta "
-"parte de la consulta."
+msgid "argument declared \"anyarray\" is not an array but type %s"
+msgstr "el argumento declarado «anyarray» no es un array sino de tipo %s"
 
-#: parser/parse_relation.c:852
+#: parser/parse_coerce.c:1578
 msgid ""
-"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
+"argument declared \"anyarray\" is not consistent with argument declared "
+"\"anyelement\""
 msgstr ""
-"Use WITH RECURSIVE, o reordene los elementos de WITH para eliminar "
-"referencias hacia adelante."
-
-#: parser/parse_relation.c:1122
-msgid ""
-"a column definition list is only allowed for functions returning \"record\""
-msgstr ""
-"sólo se permite una lista de definición de columnas en funciones que "
-"retornan «record»"
-
-#: parser/parse_relation.c:1130
-msgid "a column definition list is required for functions returning \"record\""
-msgstr ""
-"se requiere una lista de definición de columnas para funciones que retornan "
-"«record»"
-
-#: parser/parse_relation.c:1177
-#, c-format
-msgid "function \"%s\" in FROM has unsupported return type %s"
-msgstr "la función «%s» en FROM tiene el tipo de retorno no soportado %s"
+"el argumento declarado «anyarray» no es consistente con el argumento "
+"declarado «anyelement»"
 
-#: parser/parse_relation.c:1249
-#, c-format
-msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
+#: parser/parse_coerce.c:1596
+msgid "could not determine polymorphic type because input has type \"unknown\""
 msgstr ""
-"la lista VALUES «%s» tiene %d columnas disponibles pero se especificaron %d"
+"no se pudo determinar el tipo polimórfico porque el tipo de entrada es "
+"«unknown»"
 
-#: parser/parse_relation.c:1305
+#: parser/parse_coerce.c:1606
 #, c-format
-msgid "joins can have at most %d columns"
-msgstr "los joins pueden tener a lo más %d columnas"
+msgid "type matched to anynonarray is an array type: %s"
+msgstr "el argumento coincidente con anynonarray es un array: %s"
 
-#: parser/parse_relation.c:2038
+#: parser/parse_coerce.c:1616
 #, c-format
-msgid "column %d of relation \"%s\" does not exist"
-msgstr "no existe la columna %d en la relación «%s»"
+msgid "type matched to anyenum is not an enum type: %s"
+msgstr "el tipo coincidente con anyenum no es un tipo enum: %s"
 
-#: parser/parse_relation.c:2397
+#: parser/parse_cte.c:42
 #, c-format
-msgid "invalid reference to FROM-clause entry for table \"%s\""
+msgid ""
+"recursive reference to query \"%s\" must not appear within its non-recursive "
+"term"
 msgstr ""
-"referencia a la entrada de la cláusula FROM para la tabla «%s» no válida"
+"la referencia recursiva a la consulta «%s» no debe aparecer dentro de su "
+"término no recursivo"
 
-#: parser/parse_relation.c:2400
+#: parser/parse_cte.c:44
 #, c-format
-msgid "Perhaps you meant to reference the table alias \"%s\"."
-msgstr "Probablemente quiera hacer referencia al alias de la tabla «%s»."
+msgid "recursive reference to query \"%s\" must not appear within a subquery"
+msgstr ""
+"la referencia recursiva a la consulta «%s» no debe aparecer dentro de una "
+"subconsulta"
 
-#: parser/parse_relation.c:2402
+#: parser/parse_cte.c:46
 #, c-format
 msgid ""
-"There is an entry for table \"%s\", but it cannot be referenced from this "
-"part of the query."
+"recursive reference to query \"%s\" must not appear within an outer join"
 msgstr ""
-"Hay una entrada para la tabla «%s», pero no puede ser referenciada desde "
-"esta parte de la consulta."
+"la referencia recursiva a la consulta «%s» no debe aparecer dentro de un "
+"outer join"
 
-#: parser/parse_relation.c:2408
+#: parser/parse_cte.c:48
 #, c-format
-msgid "missing FROM-clause entry for table \"%s\""
-msgstr "falta una entrada para la tabla «%s» en la cláusula FROM"
+msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
+msgstr ""
+"la referencia recursiva a la consulta «%s» no debe aparecer dentro de "
+"INTERSECT"
 
-#: parser/parse_target.c:373 parser/parse_target.c:661
+#: parser/parse_cte.c:50
 #, c-format
-msgid "cannot assign to system column \"%s\""
-msgstr "no se puede asignar a la columna de sistema «%s»"
-
-#: parser/parse_target.c:398
-msgid "cannot set an array element to DEFAULT"
-msgstr "no se puede definir un elemento de array a DEFAULT"
-
-#: parser/parse_target.c:403
-msgid "cannot set a subfield to DEFAULT"
-msgstr "no se puede definir un subcampo a DEFAULT"
+msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
+msgstr ""
+"la referencia recursiva a la consulta «%s» no debe aparecer dentro de EXCEPT"
 
-#: parser/parse_target.c:470
+#: parser/parse_cte.c:132
 #, c-format
-msgid "column \"%s\" is of type %s but expression is of type %s"
-msgstr "la columna «%s» es de tipo %s pero la expresión es de tipo %s"
+msgid "WITH query name \"%s\" specified more than once"
+msgstr "el nombre de consulta WITH «%s» fue especificado más de una vez"
 
-#: parser/parse_target.c:645
-#, c-format
+#: parser/parse_cte.c:259
+msgid "subquery in WITH cannot have SELECT INTO"
+msgstr "una subconsulta en WITH no puede tener SELECT INTO"
+
+#: parser/parse_cte.c:271
 msgid ""
-"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
-"composite type"
+"WITH clause containing a data-modifying statement must be at the top level"
 msgstr ""
-"no se puede asignar al campo «%s» de la columna «%s» porque su tipo %s no es "
-"un tipo compuesto"
+"la cláusula WITH que contiene las sentencias que modifican datos debe estar "
+"en el nivel más externo"
 
-#: parser/parse_target.c:654
+#: parser/parse_cte.c:320
 #, c-format
 msgid ""
-"cannot assign to field \"%s\" of column \"%s\" because there is no such "
-"column in data type %s"
+"recursive query \"%s\" column %d has type %s in non-recursive term but type "
+"%s overall"
 msgstr ""
-"no se puede asignar al campo «%s» de la columna «%s» porque no existe esa "
-"columna en el tipo de dato %s"
+"la columna %2$d en la consulta recursiva «%1$s» tiene tipo %3$s en el "
+"término no recursivo, pero %4$s en general"
+
+#: parser/parse_cte.c:326
+msgid "Cast the output of the non-recursive term to the correct type."
+msgstr ""
+"Aplique una conversión de tipo a la salida del término no recursivo al tipo "
+"correcto."
 
-#: parser/parse_target.c:729
+#: parser/parse_cte.c:331
 #, c-format
 msgid ""
-"array assignment to \"%s\" requires type %s but expression is of type %s"
+"recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
+"but collation \"%s\" overall"
 msgstr ""
-"la asignación de array a «%s» requiere tipo %s pero la expresión es de tipo "
-"%s"
+"la columna %2$d en la consulta recursiva «%1$s» tiene ordenamiento "
+"(collation) %3$s en el término no recursivo, pero %4$s en general"
+
+#: parser/parse_cte.c:335
+msgid "Use the COLLATE clause to set the collation of the non-recursive term."
+msgstr ""
+"Use la clásula COLLATE para definir el ordenamiento del término no-recursivo."
 
-#: parser/parse_target.c:739
+#: parser/parse_cte.c:426
 #, c-format
-msgid "subfield \"%s\" is of type %s but expression is of type %s"
-msgstr "el subcampo «%s» es de tipo %s pero la expresión es de tipo %s"
+msgid "WITH query \"%s\" has %d columns available but %d columns specified"
+msgstr ""
+"la consulta WITH «%s» tiene %d columnas disponibles pero se especificaron %d"
 
-#: parser/parse_target.c:1039
-msgid "SELECT * with no tables specified is not valid"
-msgstr "SELECT * sin especificar tablas no es válido"
+#: parser/parse_cte.c:606
+msgid "mutual recursion between WITH items is not implemented"
+msgstr "la recursión mutua entre elementos de WITH no está implementada"
 
-#: parser/parse_type.c:83
+#: parser/parse_cte.c:658
 #, c-format
-msgid "improper %%TYPE reference (too few dotted names): %s"
-msgstr "referencia %%TYPE inapropiada (muy pocos nombres con punto): %s"
+msgid "recursive query \"%s\" must not contain data-modifying statements"
+msgstr ""
+"la consulta recursiva «%s» no debe contener sentencias que modifiquen datos"
 
-#: parser/parse_type.c:105
+#: parser/parse_cte.c:666
 #, c-format
-msgid "improper %%TYPE reference (too many dotted names): %s"
+msgid ""
+"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
+"recursive-term"
 msgstr ""
-"la referencia a %%TYPE es inapropiada (demasiados nombres con punto): %s"
+"la consulta recursiva «%s» no tiene la forma término-no-recursivo UNION "
+"[ALL] término-recursivo"
 
-#: parser/parse_type.c:127
-#, c-format
-msgid "type reference %s converted to %s"
-msgstr "la referencia al tipo %s convertida a %s"
+#: parser/parse_cte.c:698
+msgid "ORDER BY in a recursive query is not implemented"
+msgstr "ORDER BY no está implementado en una consulta recursiva"
 
-#: parser/parse_type.c:202 utils/cache/typcache.c:151
-#, c-format
-msgid "type \"%s\" is only a shell"
-msgstr "el tipo «%s» está inconcluso"
+#: parser/parse_cte.c:704
+msgid "OFFSET in a recursive query is not implemented"
+msgstr "OFFSET no está implementado en una consulta recursiva"
 
-#: parser/parse_type.c:270
-#, c-format
-msgid "type modifier is not allowed for type \"%s\""
-msgstr "un modificador de tipo no está permitido para el tipo «%s»"
+#: parser/parse_cte.c:710
+msgid "LIMIT in a recursive query is not implemented"
+msgstr "LIMIT no está implementado en una consulta recursiva"
 
-#: parser/parse_type.c:313
-msgid "type modifiers must be simple constants or identifiers"
-msgstr ""
-"los modificadores de tipo deben ser constantes simples o identificadores"
+#: parser/parse_cte.c:716
+msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
+msgstr "FOR UPDATE/SHARE no está implementado en una consulta recursiva"
 
-#: parser/parse_type.c:548 parser/parse_type.c:647
+#: parser/parse_cte.c:773
 #, c-format
-msgid "invalid type name \"%s\""
-msgstr "el nombre de tipo «%s» no es válido"
+msgid "recursive reference to query \"%s\" must not appear more than once"
+msgstr ""
+"la referencia recursiva a la consulta «%s» no debe aparecer más de una vez"
 
-#: parser/parse_utilcmd.c:306
-msgid "array of serial is not implemented"
-msgstr "array de serial no está implementado"
+#: parser/parse_expr.c:364 parser/parse_expr.c:757
+#, c-format
+msgid "column %s.%s does not exist"
+msgstr "no existe la columna %s.%s"
 
-#: parser/parse_utilcmd.c:350
+#: parser/parse_expr.c:376
 #, c-format
-msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
-msgstr "%s creará una secuencia implícita «%s» para la columna serial «%s.%s»"
+msgid "column \"%s\" not found in data type %s"
+msgstr "la columna «%s» no fue encontrado en el tipo %s"
 
-#: parser/parse_utilcmd.c:451 parser/parse_utilcmd.c:463
+#: parser/parse_expr.c:382
 #, c-format
-msgid ""
-"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
-msgstr ""
-"las declaraciones NULL/NOT NULL no son coincidentes para la columna «%s» de "
-"la tabla «%s»"
+msgid "could not identify column \"%s\" in record data type"
+msgstr "no se pudo identificar la columna «%s» en el tipo de dato record"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_expr.c:388
 #, c-format
-msgid "multiple default values specified for column \"%s\" of table \"%s\""
+msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr ""
-"múltiples valores default especificados para columna «%s» de tabla «%s»"
+"la notación de columna .%s fue aplicada al tipo %s, que no es un tipo "
+"compuesto"
 
-#: parser/parse_utilcmd.c:832
-#, c-format
-msgid "type %s is not a composite type"
-msgstr "el tipo %s no es un tipo compuesto"
+#: parser/parse_expr.c:418 parser/parse_target.c:617
+msgid "row expansion via \"*\" is not supported here"
+msgstr "la expansión de filas a través de «*» no está soportado aquí"
 
-#: parser/parse_utilcmd.c:1457
+#: parser/parse_expr.c:741 parser/parse_relation.c:478
+#: parser/parse_relation.c:551 parser/parse_target.c:1064
 #, c-format
-msgid "column \"%s\" appears twice in primary key constraint"
-msgstr "la columna «%s» aparece dos veces en llave primaria"
+msgid "column reference \"%s\" is ambiguous"
+msgstr "la referencia a la columna «%s» es ambigua"
 
-#: parser/parse_utilcmd.c:1462
+#: parser/parse_expr.c:809 parser/parse_param.c:109 parser/parse_param.c:141
+#: parser/parse_param.c:198 parser/parse_param.c:297
 #, c-format
-msgid "column \"%s\" appears twice in unique constraint"
-msgstr "la columna «%s» aparece dos veces en restricción unique"
+msgid "there is no parameter $%d"
+msgstr "no hay parámetro $%d"
 
-#: parser/parse_utilcmd.c:1615
-msgid "index expression cannot return a set"
-msgstr "las expresiones de índice no pueden retornar conjuntos"
+#: parser/parse_expr.c:1018
+msgid "NULLIF requires = operator to yield boolean"
+msgstr "NULLIF requiere que el operador = retorne boolean"
 
-#: parser/parse_utilcmd.c:1625
-msgid ""
-"index expressions and predicates can refer only to the table being indexed"
-msgstr ""
-"las expresiones y predicados de índice sólo pueden referirse a la tabla en "
-"indexación"
+#: parser/parse_expr.c:1197
+msgid "arguments of row IN must all be row expressions"
+msgstr "los argumentos de IN de registros deben ser expresiones de registro"
 
-#: parser/parse_utilcmd.c:1720
-msgid "rule WHERE condition cannot contain references to other relations"
-msgstr ""
-"la condición WHERE de la regla no puede contener referencias a otras "
-"relaciones"
+#: parser/parse_expr.c:1411
+msgid "subquery cannot have SELECT INTO"
+msgstr "una subconsulta no puede tener SELECT INTO"
 
-#: parser/parse_utilcmd.c:1726
-msgid "cannot use aggregate function in rule WHERE condition"
+#: parser/parse_expr.c:1439
+msgid "subquery must return a column"
+msgstr "la subconsulta debe retornar una columna"
+
+#: parser/parse_expr.c:1446
+msgid "subquery must return only one column"
+msgstr "la subconsulta debe retornar sólo una columna"
+
+#: parser/parse_expr.c:1506
+msgid "subquery has too many columns"
+msgstr "la subconsulta tiene demasiadas columnas"
+
+#: parser/parse_expr.c:1511
+msgid "subquery has too few columns"
+msgstr "la subconsulta tiene muy pocas columnas"
+
+#: parser/parse_expr.c:1607
+msgid "cannot determine type of empty array"
+msgstr "no se puede determinar el tipo de un array vacío"
+
+#: parser/parse_expr.c:1608
+msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr ""
-"no se pueden usar funciones de agregación en condición WHERE de una regla"
+"Agregue una conversión de tipo explícita al tipo deseado, por ejemplo ARRAY"
+"[]::integer[]."
 
-#: parser/parse_utilcmd.c:1730
-msgid "cannot use window function in rule WHERE condition"
+#: parser/parse_expr.c:1622
+#, c-format
+msgid "could not find element type for data type %s"
 msgstr ""
-"no se pueden usar funciones de ventana deslizante en condición WHERE de una "
-"regla"
+"no se pudo encontrar el tipo de dato de elemento para el tipo de dato %s"
 
-#: parser/parse_utilcmd.c:1802
-msgid ""
-"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
-"actions"
+#: parser/parse_expr.c:1823
+msgid "unnamed XML attribute value must be a column reference"
 msgstr ""
-"las reglas con condiciones WHERE sólo pueden tener acciones SELECT, INSERT, "
-"UPDATE o DELETE"
+"el valor del atributo XML sin nombre debe ser una referencia a una columna"
 
-#: parser/parse_utilcmd.c:1820 parser/parse_utilcmd.c:1890
-#: rewrite/rewriteHandler.c:432 rewrite/rewriteManip.c:1021
-msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
+#: parser/parse_expr.c:1824
+msgid "unnamed XML element value must be a column reference"
 msgstr ""
-"las sentencias UNION/INTERSECT/EXCEPT condicionales no están implementadas"
+"el valor del elemento XML sin nombre debe ser una referencia a una columna"
 
-#: parser/parse_utilcmd.c:1838
-msgid "ON SELECT rule cannot use OLD"
-msgstr "una regla ON SELECT no puede usar OLD"
+#: parser/parse_expr.c:1839
+#, c-format
+msgid "XML attribute name \"%s\" appears more than once"
+msgstr "el nombre de atributo XML «%s» aparece más de una vez"
 
-#: parser/parse_utilcmd.c:1842
-msgid "ON SELECT rule cannot use NEW"
-msgstr "una regla ON SELECT no puede usar NEW"
+#: parser/parse_expr.c:1946
+#, c-format
+msgid "cannot cast XMLSERIALIZE result to %s"
+msgstr "no se puede convertir el resultado de XMLSERIALIZE a %s"
 
-#: parser/parse_utilcmd.c:1851
-msgid "ON INSERT rule cannot use OLD"
-msgstr "una regla ON INSERT no puede usar OLD"
+#: parser/parse_expr.c:2182 parser/parse_expr.c:2382
+msgid "unequal number of entries in row expressions"
+msgstr "número desigual de entradas en expresiones de registro"
 
-#: parser/parse_utilcmd.c:1857
-msgid "ON DELETE rule cannot use NEW"
-msgstr "una regla ON DELETE no puede usar NEW"
-
-#: parser/parse_utilcmd.c:2138
-msgid "misplaced DEFERRABLE clause"
-msgstr "cláusula DEFERRABLE mal puesta"
-
-#: parser/parse_utilcmd.c:2143 parser/parse_utilcmd.c:2158
-msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
-msgstr "no se permiten múltiples cláusulas DEFERRABLE/NOT DEFERRABLE"
-
-#: parser/parse_utilcmd.c:2153
-msgid "misplaced NOT DEFERRABLE clause"
-msgstr "la cláusula NOT DEFERRABLE está mal puesta"
-
-#: parser/parse_utilcmd.c:2166 parser/parse_utilcmd.c:2192 gram.y:3485
-#: gram.y:3501
-msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
-msgstr "una restricción declarada INITIALLY DEFERRED debe ser DEFERRABLE"
-
-#: parser/parse_utilcmd.c:2174
-msgid "misplaced INITIALLY DEFERRED clause"
-msgstr "la cláusula INITIALLY DEFERRED está mal puesta"
+#: parser/parse_expr.c:2192
+msgid "cannot compare rows of zero length"
+msgstr "no se pueden comparar registros de largo cero"
 
-#: parser/parse_utilcmd.c:2179 parser/parse_utilcmd.c:2205
-msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
-msgstr "no se permiten múltiples cláusulas INITIALLY IMMEDIATE/DEFERRED"
+#: parser/parse_expr.c:2217
+#, c-format
+msgid "row comparison operator must yield type boolean, not type %s"
+msgstr ""
+"el operador de comparación de registros debe retornar tipo boolean, no tipo "
+"%s"
 
-#: parser/parse_utilcmd.c:2200
-msgid "misplaced INITIALLY IMMEDIATE clause"
-msgstr "la cláusula INITIALLY IMMEDIATE está mal puesta"
+#: parser/parse_expr.c:2224
+msgid "row comparison operator must not return a set"
+msgstr "el operador de comparación de registros no puede retornar un conjunto"
 
-#: parser/parse_utilcmd.c:2373
+#: parser/parse_expr.c:2283 parser/parse_expr.c:2328
 #, c-format
-msgid ""
-"CREATE specifies a schema (%s) different from the one being created (%s)"
+msgid "could not determine interpretation of row comparison operator %s"
 msgstr ""
-"CREATE especifica un esquema (%s) diferente del que se está creando (%s)"
+"no se pudo determinar la interpretación del operador de comparación de "
+"registros %s"
 
-#: gram.y:1255
-msgid "current database cannot be changed"
-msgstr "no se puede cambiar la base de datos activa"
+#: parser/parse_expr.c:2285
+msgid ""
+"Row comparison operators must be associated with btree operator families."
+msgstr ""
+"Los operadores de comparación de registros deben estar asociados a una "
+"familia de operadores btree."
 
-#: gram.y:1373 gram.y:1388
-msgid "time zone interval must be HOUR or HOUR TO MINUTE"
-msgstr "el intervalo de huso horario debe ser HOUR o HOUR TO MINUTE"
+#: parser/parse_expr.c:2330
+msgid "There are multiple equally-plausible candidates."
+msgstr "Hay múltiples candidatos igualmente plausibles."
 
-#: gram.y:1393 gram.y:8280 gram.y:10731
-msgid "interval precision specified twice"
-msgstr "la precisión de interval fue especificada dos veces"
+#: parser/parse_expr.c:2422
+msgid "IS DISTINCT FROM requires = operator to yield boolean"
+msgstr "IS DISTINCT FROM requiere que el operador = retorne boolean"
 
-#: gram.y:2522
-msgid "CHECK constraints cannot be deferred"
-msgstr "las restricciones CHECK no puede ser postergadas"
-
-#: gram.y:2611 utils/adt/ri_triggers.c:373 utils/adt/ri_triggers.c:433
-#: utils/adt/ri_triggers.c:596 utils/adt/ri_triggers.c:836
-#: utils/adt/ri_triggers.c:1024 utils/adt/ri_triggers.c:1186
-#: utils/adt/ri_triggers.c:1374 utils/adt/ri_triggers.c:1545
-#: utils/adt/ri_triggers.c:1728 utils/adt/ri_triggers.c:1899
-#: utils/adt/ri_triggers.c:2115 utils/adt/ri_triggers.c:2297
-#: utils/adt/ri_triggers.c:2500 utils/adt/ri_triggers.c:2548
-#: utils/adt/ri_triggers.c:2593 utils/adt/ri_triggers.c:2721
-msgid "MATCH PARTIAL not yet implemented"
-msgstr "MATCH PARTIAL no está implementada"
+#: parser/parse_func.c:147
+#, c-format
+msgid "argument name \"%s\" used more than once"
+msgstr "el nombre de argumento «%s» fue especificado más de una vez"
 
-#: gram.y:2726
-msgid "CREATE TABLE AS cannot specify INTO"
-msgstr "CREATE TABLE AS no puede especificar INTO"
+#: parser/parse_func.c:158
+msgid "positional argument cannot follow named argument"
+msgstr "un argumento posicional no puede seguir a un argumento con nombre"
 
-#: gram.y:3396
-msgid "duplicate trigger events specified"
-msgstr "se han especificado eventos de disparador duplicados"
+#: parser/parse_func.c:236
+#, c-format
+msgid "%s(*) specified, but %s is not an aggregate function"
+msgstr "se especificó %s(*), pero %s no es una función de agregación"
 
-#: gram.y:3565
-msgid "CREATE ASSERTION is not yet implemented"
-msgstr "CREATE ASSERTION no está implementado"
+#: parser/parse_func.c:243
+#, c-format
+msgid "DISTINCT specified, but %s is not an aggregate function"
+msgstr "se especificó DISTINCT, pero %s no es una función de agregación"
 
-#: gram.y:3581
-msgid "DROP ASSERTION is not yet implemented"
-msgstr "DROP ASSERTION no está implementado"
+#: parser/parse_func.c:249
+#, c-format
+msgid "ORDER BY specified, but %s is not an aggregate function"
+msgstr "se especificó ORDER BY, pero %s no es una función de agregación"
 
-#: gram.y:3882
-msgid "RECHECK is no longer required"
-msgstr "RECHECK ya no es requerido"
+#: parser/parse_func.c:255
+#, c-format
+msgid ""
+"OVER specified, but %s is not a window function nor an aggregate function"
+msgstr ""
+"se especificó OVER, pero %s no es una función de ventana deslizante ni una "
+"función de agregación"
 
-#: gram.y:3883
-msgid "Update your data type."
-msgstr "Actualice su tipo de datos."
+#: parser/parse_func.c:277
+#, c-format
+msgid "function %s is not unique"
+msgstr "la función %s no es única"
 
-#: gram.y:5422 utils/adt/regproc.c:630
-msgid "missing argument"
-msgstr "falta un argumento"
+#: parser/parse_func.c:280
+msgid ""
+"Could not choose a best candidate function. You might need to add explicit "
+"type casts."
+msgstr ""
+"No se pudo escoger la función más adecuada. Puede ser necesario agregar "
+"conversiones explícitas de tipos."
 
-#: gram.y:5423 utils/adt/regproc.c:631
-msgid "Use NONE to denote the missing argument of a unary operator."
-msgstr "Use NONE para denotar el argumento faltante de un operador unario."
+#: parser/parse_func.c:291
+msgid ""
+"No aggregate function matches the given name and argument types. Perhaps you "
+"misplaced ORDER BY; ORDER BY must appear after all regular arguments of the "
+"aggregate."
+msgstr ""
+"Ninguna función coincide en el nombre y tipos de argumentos. Quizás puso "
+"ORDER BY en una mala posición; ORDER BY debe aparecer después de todos los "
+"argumentos normales de la función de agregación."
 
-#: gram.y:6358 gram.y:6364 gram.y:6370
-msgid "WITH CHECK OPTION is not implemented"
-msgstr "WITH CHECK OPTION no está implementado"
+#: parser/parse_func.c:302
+msgid ""
+"No function matches the given name and argument types. You might need to add "
+"explicit type casts."
+msgstr ""
+"Ninguna función coincide en el nombre y tipos de argumentos. Puede ser "
+"necesario agregar conversión explícita de tipos."
 
-#: gram.y:7046
-msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
-msgstr "no se permite una lista de columnas en CREATE TABLE / AS EXECUTE "
+#: parser/parse_func.c:412 parser/parse_func.c:478
+#, c-format
+msgid "%s(*) must be used to call a parameterless aggregate function"
+msgstr ""
+"%s(*) debe ser usado para invocar una función de agregación sin parámetros"
 
-#: gram.y:7267
-msgid "number of columns does not match number of values"
-msgstr "el número de columnas no coincide con el número de valores"
+#: parser/parse_func.c:419
+msgid "aggregates cannot return sets"
+msgstr "las funciones de agregación no pueden retornar conjuntos"
 
-#: gram.y:7707
-msgid "LIMIT #,# syntax is not supported"
-msgstr "la sintaxis LIMIT #,# no está soportada"
+#: parser/parse_func.c:431
+msgid "aggregates cannot use named arguments"
+msgstr "las funciones de agregación no pueden usar argumentos con nombre"
 
-#: gram.y:7708
-msgid "Use separate LIMIT and OFFSET clauses."
-msgstr "Use cláusulas LIMIT y OFFSET separadas."
+#: parser/parse_func.c:450
+msgid "window function call requires an OVER clause"
+msgstr ""
+"la invocación de una función de ventana deslizante requiere una cláusula OVER"
 
-#: gram.y:7926
-msgid "VALUES in FROM must have an alias"
-msgstr "VALUES en FROM debe tener un alias"
+#: parser/parse_func.c:468
+msgid "DISTINCT is not implemented for window functions"
+msgstr "DISTINCT no está implementado para funciones de ventana deslizante"
 
-#: gram.y:7927
-msgid "For example, FROM (VALUES ...) [AS] foo."
-msgstr "Por ejemplo, FROM (VALUES ...) [AS] foo."
+#: parser/parse_func.c:488
+msgid "aggregate ORDER BY is not implemented for window functions"
+msgstr ""
+"el ORDER BY de funciones de agregación no está implementado para funciones "
+"de ventana deslizante"
 
-#: gram.y:7932
-msgid "subquery in FROM must have an alias"
-msgstr "las subconsultas en FROM deben tener un alias"
+#: parser/parse_func.c:494
+msgid "window functions cannot return sets"
+msgstr "las funciones de ventana deslizante no pueden retornar conjuntos"
 
-#: gram.y:7933
-msgid "For example, FROM (SELECT ...) [AS] foo."
-msgstr "Por ejemplo, FROM (SELECT ...) [AS] foo."
+#: parser/parse_func.c:505
+msgid "window functions cannot use named arguments"
+msgstr ""
+"las funciones de ventana deslizante no pueden usar argumentos con nombre"
 
-#: gram.y:8406
-msgid "precision for type float must be at least 1 bit"
-msgstr "la precisión para el tipo float debe ser al menos 1 bit"
+#: parser/parse_func.c:1589
+#, c-format
+msgid "aggregate %s(*) does not exist"
+msgstr "no existe la función de agregación %s(*)"
 
-#: gram.y:8415
-msgid "precision for type float must be less than 54 bits"
-msgstr "la precisión para el tipo float debe ser menor de 54 bits"
+#: parser/parse_func.c:1594
+#, c-format
+msgid "aggregate %s does not exist"
+msgstr "no existe la función de agregación %s"
 
-#: gram.y:9121
-msgid "UNIQUE predicate is not yet implemented"
-msgstr "el predicado UNIQUE no está implementado"
+#: parser/parse_func.c:1613
+#, c-format
+msgid "function %s is not an aggregate"
+msgstr "la función %s no es una función de agregación"
 
-#: gram.y:9993
-msgid "RANGE PRECEDING is only supported with UNBOUNDED"
-msgstr "RANGE PRECEDING sólo está soportado con UNBOUNDED"
+#: parser/parse_node.c:83
+#, c-format
+msgid "target lists can have at most %d entries"
+msgstr "las listas de resultados pueden tener a lo más %d entradas"
 
-#: gram.y:9999
-msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
-msgstr "RANGE FOLLOWING sólo está soportado con UNBOUNDED"
+#: parser/parse_node.c:240
+#, c-format
+msgid "cannot subscript type %s because it is not an array"
+msgstr "no se puede poner subíndices al tipo %s porque no es un array"
 
-#: gram.y:10026 gram.y:10049
-msgid "frame start cannot be UNBOUNDED FOLLOWING"
-msgstr "el inicio de «frame» no puede ser UNBOUNDED FOLLOWING"
+#: parser/parse_node.c:342 parser/parse_node.c:369
+msgid "array subscript must have type integer"
+msgstr "los subíndices de arrays deben tener tipo entero"
 
-#: gram.y:10031
-msgid "frame starting from following row cannot end with current row"
+#: parser/parse_node.c:393
+#, c-format
+msgid "array assignment requires type %s but expression is of type %s"
 msgstr ""
-"el «frame» que se inicia desde la siguiente fila no puede terminar en la "
-"fila actual"
+"la asignación de array debe tener tipo %s pero la expresión es de tipo %s"
 
-#: gram.y:10054
-msgid "frame end cannot be UNBOUNDED PRECEDING"
-msgstr "el fin de «frame» no puede ser UNBOUNDED PRECEDING"
+#: parser/parse_oper.c:124 parser/parse_oper.c:718 utils/adt/regproc.c:464
+#: utils/adt/regproc.c:484 utils/adt/regproc.c:643
+#, c-format
+msgid "operator does not exist: %s"
+msgstr "el operador no existe: %s"
 
-#: gram.y:10060
-msgid "frame starting from current row cannot have preceding rows"
-msgstr ""
-"el «frame» que se inicia desde la fila actual no puede tener filas "
-"precedentes"
+#: parser/parse_oper.c:221
+msgid "Use an explicit ordering operator or modify the query."
+msgstr "Use un operador de ordenamiento explícito o modifique la consulta."
 
-#: gram.y:10067
-msgid "frame starting from following row cannot have preceding rows"
-msgstr ""
-"el «frame» que se inicia desde la fila siguiente no puede tener filas "
-"precedentes"
+#: parser/parse_oper.c:225 utils/adt/arrayfuncs.c:3176
+#: utils/adt/arrayfuncs.c:3695 utils/adt/rowtypes.c:1157
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "no se pudo identificar un operador de igualdad para el tipo %s"
 
-#: gram.y:10706
-msgid "type modifier cannot have parameter name"
-msgstr "el modificador de tipo no puede tener nombre de parámetro"
+#: parser/parse_oper.c:476
+#, c-format
+msgid "operator requires run-time type coercion: %s"
+msgstr "el operador requiere conversión explícita de tipos: %s"
 
-#: gram.y:11303 gram.y:11511
-msgid "improper use of \"*\""
-msgstr "uso impropio de «*»"
+#: parser/parse_oper.c:710
+#, c-format
+msgid "operator is not unique: %s"
+msgstr "el operador no es único: %s"
 
-#: gram.y:11442
-msgid "wrong number of parameters on left side of OVERLAPS expression"
+#: parser/parse_oper.c:712
+msgid ""
+"Could not choose a best candidate operator. You might need to add explicit "
+"type casts."
 msgstr ""
-"el número de parámetros es incorrecto al lado izquierdo de la expresión "
-"OVERLAPS"
+"No se pudo escoger el operador más adecuado. Puede ser necesario agregar "
+"conversiones explícitas de tipos."
 
-#: gram.y:11449
-msgid "wrong number of parameters on right side of OVERLAPS expression"
+#: parser/parse_oper.c:720
+msgid ""
+"No operator matches the given name and argument type(s). You might need to "
+"add explicit type casts."
 msgstr ""
-"el número de parámetros es incorrecto al lado derecho de la expresión "
-"OVERLAPS"
-
-#: gram.y:11574
-msgid "multiple ORDER BY clauses not allowed"
-msgstr "no se permiten múltiples cláusulas ORDER BY"
+"Ningún operador coincide con el nombre y el tipo de los argumentos. Puede "
+"ser necesario agregar conversiones explícitas de tipos."
 
-#: gram.y:11585
-msgid "multiple OFFSET clauses not allowed"
-msgstr "no se permiten múltiples cláusulas OFFSET"
+#: parser/parse_oper.c:779 parser/parse_oper.c:893
+#, c-format
+msgid "operator is only a shell: %s"
+msgstr "el operador está inconcluso: %s"
 
-#: gram.y:11594
-msgid "multiple LIMIT clauses not allowed"
-msgstr "no se permiten múltiples cláusulas LIMIT"
+#: parser/parse_oper.c:881
+msgid "op ANY/ALL (array) requires array on right side"
+msgstr "op ANY/ALL (array) requiere un array al lado derecho"
 
-#: gram.y:11603
-msgid "multiple WITH clauses not allowed"
-msgstr "no se permiten múltiples cláusulas WITH"
+#: parser/parse_oper.c:923
+msgid "op ANY/ALL (array) requires operator to yield boolean"
+msgstr "op ANY/ALL (array) requiere un operador que entregue boolean"
 
-#: gram.y:11757
-msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
-msgstr "los argumentos OUT e INOUT no están permitidos en funciones TABLE"
+#: parser/parse_oper.c:928
+msgid "op ANY/ALL (array) requires operator not to return a set"
+msgstr "op ANY/ALL (array) requiere un operador que no retorne un conjunto"
 
-#: scan.l:411
-msgid "unterminated /* comment"
-msgstr "un comentario /* está inconcluso"
+#: parser/parse_param.c:215
+#, c-format
+msgid "inconsistent types deduced for parameter $%d"
+msgstr "para el parámetro $%d se dedujeron tipos de dato inconsistentes"
 
-#: scan.l:440
-msgid "unterminated bit string literal"
-msgstr "una cadena de bits está inconclusa"
-
-#: scan.l:461
-msgid "unterminated hexadecimal string literal"
-msgstr "una cadena hexadecimal está inconclusa"
+#: parser/parse_relation.c:147
+#, c-format
+msgid "table reference \"%s\" is ambiguous"
+msgstr "la referencia a la tabla «%s» es ambigua"
 
-#: scan.l:511
-msgid "unsafe use of string constant with Unicode escapes"
-msgstr "uso inseguro de literal de cadena con escapes Unicode"
+#: parser/parse_relation.c:183
+#, c-format
+msgid "table reference %u is ambiguous"
+msgstr "la referencia a la tabla %u es ambigua"
 
-#: scan.l:512
-msgid ""
-"String constants with Unicode escapes cannot be used when "
-"standard_conforming_strings is off."
-msgstr ""
-"Los literales de cadena con escapes Unicode no pueden usarse cuando "
-"standard_conforming_strings está desactivado."
+#: parser/parse_relation.c:343
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "el nombre de tabla «%s» fue especificado más de una vez"
 
-#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
-#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
-msgid "invalid Unicode surrogate pair"
-msgstr "par sustituto (surrogate) Unicode no válido"
+#: parser/parse_relation.c:754 parser/parse_relation.c:1045
+#: parser/parse_relation.c:1432
+#, c-format
+msgid "table \"%s\" has %d columns available but %d columns specified"
+msgstr "la tabla «%s» tiene %d columnas pero se especificaron %d"
 
-#: scan.l:586
-msgid "invalid Unicode escape"
-msgstr "valor de escape Unicode no válido"
+#: parser/parse_relation.c:784
+#, c-format
+msgid "too many column aliases specified for function %s"
+msgstr "se especificaron demasiados alias de columna para la función %s"
 
-#: scan.l:587
-msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
-msgstr "Los escapes Unicode deben ser \\uXXXX o \\UXXXXXXXX."
+#: parser/parse_relation.c:850
+#, c-format
+msgid ""
+"There is a WITH item named \"%s\", but it cannot be referenced from this "
+"part of the query."
+msgstr ""
+"Hay un elemento WITH llamado «%s», pero no puede ser referenciada desde esta "
+"parte de la consulta."
 
-#: scan.l:598
-msgid "unsafe use of \\' in a string literal"
-msgstr "uso inseguro de \\' en un literal de cadena"
+#: parser/parse_relation.c:852
+msgid ""
+"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
+msgstr ""
+"Use WITH RECURSIVE, o reordene los elementos de WITH para eliminar "
+"referencias hacia adelante."
 
-#: scan.l:599
+#: parser/parse_relation.c:1125
 msgid ""
-"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
+"a column definition list is only allowed for functions returning \"record\""
 msgstr ""
-"Use '' para escribir comillas en cadenas. \\' es inseguro en codificaciones "
-"de sólo cliente."
+"sólo se permite una lista de definición de columnas en funciones que "
+"retornan «record»"
 
-#: scan.l:629
-msgid "unterminated quoted string"
-msgstr "una cadena de caracteres entre comillas está inconclusa"
+#: parser/parse_relation.c:1133
+msgid "a column definition list is required for functions returning \"record\""
+msgstr ""
+"se requiere una lista de definición de columnas para funciones que retornan "
+"«record»"
 
-#: scan.l:674
-msgid "unterminated dollar-quoted string"
-msgstr "una cadena separada por $ está inconclusa"
+#: parser/parse_relation.c:1184
+#, c-format
+msgid "function \"%s\" in FROM has unsupported return type %s"
+msgstr "la función «%s» en FROM tiene el tipo de retorno no soportado %s"
 
-#: scan.l:691 scan.l:703 scan.l:717
-msgid "zero-length delimited identifier"
-msgstr "un identificador delimitado tiene largo cero"
+#: parser/parse_relation.c:1258
+#, c-format
+msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
+msgstr ""
+"la lista VALUES «%s» tiene %d columnas disponibles pero se especificaron %d"
 
-#: scan.l:730
-msgid "unterminated quoted identifier"
-msgstr "un identificador entre comillas está inconcluso"
+#: parser/parse_relation.c:1314
+#, c-format
+msgid "joins can have at most %d columns"
+msgstr "los joins pueden tener a lo más %d columnas"
 
-#: scan.l:834
-msgid "operator too long"
-msgstr "el operador es demasiado largo"
+#: parser/parse_relation.c:1405
+#, c-format
+msgid "WITH query \"%s\" does not have a RETURNING clause"
+msgstr "la consulta WITH «%s» no tiene una cláusula RETURNING"
 
-#. translator: %s is typically the translation of "syntax error"
-#: scan.l:992
+#: parser/parse_relation.c:2087
 #, c-format
-msgid "%s at end of input"
-msgstr "%s al final de la entrada"
+msgid "column %d of relation \"%s\" does not exist"
+msgstr "no existe la columna %d en la relación «%s»"
 
-#. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1000
+#: parser/parse_relation.c:2471
 #, c-format
-msgid "%s at or near \"%s\""
-msgstr "%s en o cerca de «%s»"
+msgid "invalid reference to FROM-clause entry for table \"%s\""
+msgstr ""
+"referencia a la entrada de la cláusula FROM para la tabla «%s» no válida"
 
-#: scan.l:1161 scan.l:1193
+#: parser/parse_relation.c:2474
+#, c-format
+msgid "Perhaps you meant to reference the table alias \"%s\"."
+msgstr "Probablemente quiera hacer referencia al alias de la tabla «%s»."
+
+#: parser/parse_relation.c:2476
+#, c-format
 msgid ""
-"Unicode escape values cannot be used for code point values above 007F when "
-"the server encoding is not UTF8"
+"There is an entry for table \"%s\", but it cannot be referenced from this "
+"part of the query."
 msgstr ""
-"Los valores de escape Unicode no puede ser usados para valores de «code "
-"point» sobre 007F cuando la codificación de servidor no es UTF8"
+"Hay una entrada para la tabla «%s», pero no puede ser referenciada desde "
+"esta parte de la consulta."
 
-#: scan.l:1189 scan.l:1325
-msgid "invalid Unicode escape value"
-msgstr "valor de escape Unicode no válido"
+#: parser/parse_relation.c:2482
+#, c-format
+msgid "missing FROM-clause entry for table \"%s\""
+msgstr "falta una entrada para la tabla «%s» en la cláusula FROM"
 
-#: scan.l:1214
-msgid "invalid Unicode escape character"
-msgstr "carácter de escape Unicode no válido"
+#: parser/parse_target.c:382 parser/parse_target.c:670
+#, c-format
+msgid "cannot assign to system column \"%s\""
+msgstr "no se puede asignar a la columna de sistema «%s»"
 
-#: scan.l:1381
-msgid "nonstandard use of \\' in a string literal"
-msgstr "uso no estandar de \\' en un literal de cadena"
+#: parser/parse_target.c:410
+msgid "cannot set an array element to DEFAULT"
+msgstr "no se puede definir un elemento de array a DEFAULT"
 
-#: scan.l:1382
+#: parser/parse_target.c:415
+msgid "cannot set a subfield to DEFAULT"
+msgstr "no se puede definir un subcampo a DEFAULT"
+
+#: parser/parse_target.c:484
+#, c-format
+msgid "column \"%s\" is of type %s but expression is of type %s"
+msgstr "la columna «%s» es de tipo %s pero la expresión es de tipo %s"
+
+#: parser/parse_target.c:654
+#, c-format
 msgid ""
-"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
+"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
+"composite type"
 msgstr ""
-"Use '' para escribir comillas en cadenas, o use la sintaxis de escape de "
-"cadenas (E'...')."
+"no se puede asignar al campo «%s» de la columna «%s» porque su tipo %s no es "
+"un tipo compuesto"
 
-#: scan.l:1391
-msgid "nonstandard use of \\\\ in a string literal"
-msgstr "uso no estandar de \\\\ en un literal de cadena"
+#: parser/parse_target.c:663
+#, c-format
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because there is no such "
+"column in data type %s"
+msgstr ""
+"no se puede asignar al campo «%s» de la columna «%s» porque no existe esa "
+"columna en el tipo de dato %s"
 
-#: scan.l:1392
-msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
+#: parser/parse_target.c:730
+#, c-format
+msgid ""
+"array assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr ""
-"Use '' para escribir comillas en cadenas, o use la sintaxis de escape de "
-"cadenas (E'\\\\')."
+"la asignación de array a «%s» requiere tipo %s pero la expresión es de tipo "
+"%s"
 
-#: scan.l:1406
-msgid "nonstandard use of escape in a string literal"
-msgstr "uso no estandar de escape en un literal de cadena"
+#: parser/parse_target.c:740
+#, c-format
+msgid "subfield \"%s\" is of type %s but expression is of type %s"
+msgstr "el subcampo «%s» es de tipo %s pero la expresión es de tipo %s"
 
-#: scan.l:1407
-msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
-msgstr "Use la sintaxis de escape para cadenas, por ej. E'\\r\\n'."
+#: parser/parse_target.c:1126
+msgid "SELECT * with no tables specified is not valid"
+msgstr "SELECT * sin especificar tablas no es válido"
 
-#: port/win32/security.c:43
+#: parser/parse_type.c:83
 #, c-format
-msgid "could not open process token: error code %d\n"
-msgstr "no se pudo abrir el token de proceso: código de error %d\n"
+msgid "improper %%TYPE reference (too few dotted names): %s"
+msgstr "referencia %%TYPE inapropiada (muy pocos nombres con punto): %s"
 
-#: port/win32/security.c:63
+#: parser/parse_type.c:105
 #, c-format
-msgid "could not get SID for Administrators group: error code %d\n"
+msgid "improper %%TYPE reference (too many dotted names): %s"
 msgstr ""
-"no se pudo obtener el SID del grupo Administrators: código de error %d\n"
+"la referencia a %%TYPE es inapropiada (demasiados nombres con punto): %s"
 
-#: port/win32/security.c:72
+#: parser/parse_type.c:127
 #, c-format
-msgid "could not get SID for PowerUsers group: error code %d\n"
-msgstr "no se pudo obtener el SID del grupo PowerUsers: código de error %d\n"
+msgid "type reference %s converted to %s"
+msgstr "la referencia al tipo %s convertida a %s"
 
-#: port/win32/signal.c:189
+#: parser/parse_type.c:202 utils/cache/typcache.c:195
 #, c-format
-msgid "could not create signal listener pipe for pid %d: error code %d"
-msgstr ""
-"no se pudo crear tubería para escuchar señales para el pid %d: código de "
-"error %d"
+msgid "type \"%s\" is only a shell"
+msgstr "el tipo «%s» está inconcluso"
 
-#: port/win32/signal.c:269 port/win32/signal.c:301
+#: parser/parse_type.c:287
 #, c-format
-msgid "could not create signal listener pipe: error code %d; retrying\n"
+msgid "type modifier is not allowed for type \"%s\""
+msgstr "un modificador de tipo no está permitido para el tipo «%s»"
+
+#: parser/parse_type.c:330
+msgid "type modifiers must be simple constants or identifiers"
 msgstr ""
-"no se pudo crear tubería para escuchar señales: código de error %d; "
-"reintentando\n"
+"los modificadores de tipo deben ser constantes simples o identificadores"
 
-#: port/win32/signal.c:312
+#: parser/parse_type.c:641 parser/parse_type.c:740
 #, c-format
-msgid "could not create signal dispatch thread: error code %d\n"
-msgstr "no se pudo crear thread de despacho de señales: código de error %d\n"
+msgid "invalid type name \"%s\""
+msgstr "el nombre de tipo «%s» no es válido"
 
-#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
+#: parser/parse_utilcmd.c:181
 #, c-format
-msgid "could not create shared memory segment: %lu"
-msgstr "no se pudo crear el segmento de memoria compartida: %lu"
+msgid "relation \"%s\" already exists, skipping"
+msgstr "la relación «%s» ya existe, ignorando"
 
-#: port/win32_shmem.c:169
-#, c-format
-msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
-msgstr "La llamada a sistema fallida fue CreateFileMapping(size=%lu, name=%s)."
+#: parser/parse_utilcmd.c:334
+msgid "array of serial is not implemented"
+msgstr "array de serial no está implementado"
 
-#: port/win32_shmem.c:193
-msgid "pre-existing shared memory block is still in use"
-msgstr "el bloque de memoria compartida preexistente aún está en uso"
+#: parser/parse_utilcmd.c:382
+#, c-format
+msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
+msgstr "%s creará una secuencia implícita «%s» para la columna serial «%s.%s»"
 
-#: port/win32_shmem.c:194
+#: parser/parse_utilcmd.c:483 parser/parse_utilcmd.c:495
+#, c-format
 msgid ""
-"Check if there are any old server processes still running, and terminate "
-"them."
+"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr ""
-"Verifique si hay procesos de servidor antiguos aún en funcionamiento, y "
-"termínelos."
-
-#: port/win32_shmem.c:204
-msgid "Failed system call was DuplicateHandle."
-msgstr "La llamada a sistema fallida fue DuplicateHandle."
+"las declaraciones NULL/NOT NULL no son coincidentes para la columna «%s» de "
+"la tabla «%s»"
 
-#: port/win32_shmem.c:225
-msgid "Failed system call was MapViewOfFileEx."
-msgstr "La llamada a sistema fallida fue MapViewOfFileEx."
-
-#: port/sysv_sema.c:114 port/pg_sema.c:114
+#: parser/parse_utilcmd.c:507
 #, c-format
-msgid "could not create semaphores: %m"
-msgstr "no se pudo crear semáforos: %m"
+msgid "multiple default values specified for column \"%s\" of table \"%s\""
+msgstr ""
+"múltiples valores default especificados para columna «%s» de tabla «%s»"
 
-#: port/sysv_sema.c:115 port/pg_sema.c:115
-#, c-format
-msgid "Failed system call was semget(%lu, %d, 0%o)."
-msgstr "La llamada a sistema fallida fue semget(%lu, %d, 0%o)."
+#: parser/parse_utilcmd.c:1440
+msgid "cannot use an existing index in CREATE TABLE"
+msgstr "no se puede usar un índice existente en CREATE TABLE"
 
-#: port/sysv_sema.c:119 port/pg_sema.c:119
+#: parser/parse_utilcmd.c:1460
 #, c-format
-msgid ""
-"This error does *not* mean that you have run out of disk space.\n"
-"It occurs when either the system limit for the maximum number of semaphore "
-"sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), "
-"would be exceeded.  You need to raise the respective kernel parameter.  "
-"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
-"max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about configuring "
-"your system for PostgreSQL."
-msgstr ""
-"Este error *no* significa que se haya quedado sin espacio en disco.\n"
-"Ocurre cuando se alcanza el límite del sistema del número de semáforos "
-"(SEMMNI), o bien cuando se excede el total de semáforos del sistema (SEMMNS)."
-"Necesita incrementar el parámetro respectivo del kernel.  Alternativamente, "
-"reduzca el consumo de semáforos de PostgreSQL reduciendo el parámetro "
-"max_connections (actualmente %d).\n"
-"La documentación de PostgreSQL contiene más información acerca de cómo "
-"configurar su sistema para PostgreSQL."
+msgid "index \"%s\" is already associated with a constraint"
+msgstr "el índice «%s» ya está asociado a una restricción"
 
-#: port/sysv_sema.c:148 port/pg_sema.c:148
+#: parser/parse_utilcmd.c:1468
 #, c-format
-msgid ""
-"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
-"Look into the PostgreSQL documentation for details."
-msgstr ""
-"Probablemente necesita incrementar el valor SEMVMX del kernel hasta al menos "
-"%d.  Examine la documentación de PostgreSQL para obtener más detalles."
+msgid "index \"%s\" does not belong to table \"%s\""
+msgstr "el índice «%s» no pertenece a la tabla «%s»"
 
-#: port/sysv_shmem.c:147 port/pg_shmem.c:147
+#: parser/parse_utilcmd.c:1475
 #, c-format
-msgid "could not create shared memory segment: %m"
-msgstr "no se pudo crear el segmento de memoria compartida: %m"
+msgid "index \"%s\" is not valid"
+msgstr "el índice «%s» no es válido"
 
-#: port/sysv_shmem.c:148 port/pg_shmem.c:148
+#: parser/parse_utilcmd.c:1481
 #, c-format
-msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
-msgstr "La llamada a sistema fallida fue shmget(key=%lu, size=%lu, 0%o)."
+msgid "index \"%s\" is not ready"
+msgstr "el índice «%s» no está listo"
 
-#: port/sysv_shmem.c:152 port/pg_shmem.c:152
+#: parser/parse_utilcmd.c:1487
 #, c-format
-msgid ""
-"This error usually means that PostgreSQL's request for a shared memory "
-"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
-"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
-"request size (currently %lu bytes), reduce PostgreSQL's shared_buffers "
-"parameter (currently %d) and/or its max_connections parameter (currently "
-"%d).\n"
-"If the request size is already small, it's possible that it is less than "
-"your kernel's SHMMIN parameter, in which case raising the request size or "
-"reconfiguring SHMMIN is called for.\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
-msgstr ""
-"Este error normalmente significa que una petición de PostgreSQL para obtener "
-"un segmento de memoria compartida excedió el parámetro SHMMAX del kernel.  "
-"Puede reducir el tamaño de la petición o reconfigurar el kernel con un "
-"SHMMAX superior.  Para reducir el tamaño de la petición (actualmente %lu "
-"bytes), reduzca el parámetro de PostgreSQL shared_buffers (actualmente %d) y/"
-"o el parámetro max_connections (actualmente %d).\n"
-"Si el tamaño de la petición ya es pequeño, es posible que sea inferior al "
-"parámetro SHMMIN del kernel, en cuyo caso se requiere alzar el tamaño de la "
-"petición o disminuir SHMMIN.\n"
-"La documentación de PostgreSQL contiene más información acerca de la "
-"configuración de memoria compartida."
+msgid "\"%s\" is not a unique index"
+msgstr "«%s» no es un índice único"
 
-#: port/sysv_shmem.c:165 port/pg_shmem.c:165
-#, c-format
-msgid ""
-"This error usually means that PostgreSQL's request for a shared memory "
-"segment exceeded available memory or swap space, or exceeded your kernel's "
-"SHMALL parameter.  You can either reduce the request size or reconfigure the "
-"kernel with larger SHMALL.  To reduce the request size (currently %lu "
-"bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or "
-"its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+#: parser/parse_utilcmd.c:1488 parser/parse_utilcmd.c:1495
+#: parser/parse_utilcmd.c:1502 parser/parse_utilcmd.c:1572
+msgid "Cannot create a primary key or unique constraint using such an index."
 msgstr ""
-"Este error normalmente significa que la petición de un segmento de memoria "
-"compartida de PostgreSQL excedía la memoria disponible o el espacio de "
-"intercambio (swap), o excedía el valor SHMALL del kernel.  Para reducir el "
-"tamaño de la petición (actualmente %lu bytes), reduzca el parámetro de "
-"PostgreSQL shared_buffers (actualmente %d) y/o el parámetro max_connections "
-"(actualmente %d).\n"
-"La documentación de PostgreSQL contiene más información acerca de la "
-"configuración de memoria compartida."
+"No se puede crear una restricción de llave primaria o única usando un índice "
+"así."
 
-#: port/sysv_shmem.c:176 port/pg_shmem.c:176
+#: parser/parse_utilcmd.c:1494
 #, c-format
-msgid ""
-"This error does *not* mean that you have run out of disk space. It occurs "
-"either if all available shared memory IDs have been taken, in which case you "
-"need to raise the SHMMNI parameter in your kernel, or because the system's "
-"overall limit for shared memory has been reached.  If you cannot increase "
-"the shared memory limit, reduce PostgreSQL's shared memory request "
-"(currently %lu bytes), by reducing its shared_buffers parameter (currently "
-"%d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
-msgstr ""
-"Este error *no* significa que se haya quedado sin espacio en disco.  Ocurre "
-"cuando se han usado todos los IDs de memoria compartida disponibles, en cuyo "
-"caso puede incrementar el parámetro SHMMNI del kernel, o bien porque se ha "
-"alcanzado el límite total de memoria compartida.  Si no puede incrementar el "
-"límite de memoria compartida, reduzca el tamaño de petición de PostgreSQL "
-"(actualmente %lu bytes) reduciendo el parámetro shared_buffers (actualmente "
-"%d) y/o el parámetro max_connections (actualmente %d).\n"
-"La documentación de PostgreSQL contiene más información acerca de la "
-"configuración de memoria compartida."
+msgid "index \"%s\" contains expressions"
+msgstr "el índice «%s» contiene expresiones"
 
-#: port/sysv_shmem.c:431 port/pg_shmem.c:431
+#: parser/parse_utilcmd.c:1501
 #, c-format
-msgid "could not stat data directory \"%s\": %m"
-msgstr "no se pudo verificar el directorio de datos «%s»: %m"
+msgid "\"%s\" is a partial index"
+msgstr "«%s» es un índice parcial"
 
-#: port/win32_sema.c:94
+#: parser/parse_utilcmd.c:1513
 #, c-format
-msgid "could not create semaphore: error code %d"
-msgstr "no se pudo crear semáforo: código de error %d"
+msgid "\"%s\" is a deferrable index"
+msgstr "«%s» no es un índice postergable (deferrable)"
 
-#: port/win32_sema.c:161
-#, c-format
-msgid "could not lock semaphore: error code %d"
-msgstr "no se pudo bloquear semáforo: código de error %d"
+#: parser/parse_utilcmd.c:1514
+msgid "Cannot create a non-deferrable constraint using a deferrable index."
+msgstr ""
+"No se puede crear una restricción no postergable usando un índice "
+"postergable."
 
-#: port/win32_sema.c:174
+#: parser/parse_utilcmd.c:1571
 #, c-format
-msgid "could not unlock semaphore: error code %d"
-msgstr "no se pudo desbloquear semáforo: código de error %d"
+msgid "index \"%s\" does not have default sorting behavior"
+msgstr "el índice «%s» no tiene el comportamiento de ordenamiento por omisión"
 
-#: port/win32_sema.c:203
+#: parser/parse_utilcmd.c:1716
 #, c-format
-msgid "could not try-lock semaphore: error code %d"
-msgstr ""
-"no se pudo intentar-bloquear (try-lock) el semáforo: código de error %d"
+msgid "column \"%s\" appears twice in primary key constraint"
+msgstr "la columna «%s» aparece dos veces en llave primaria"
 
-#: postmaster/autovacuum.c:359
+#: parser/parse_utilcmd.c:1722
 #, c-format
-msgid "could not fork autovacuum launcher process: %m"
-msgstr "no se pudo iniciar el lanzador autovacuum: %m"
+msgid "column \"%s\" appears twice in unique constraint"
+msgstr "la columna «%s» aparece dos veces en restricción unique"
 
-#: postmaster/autovacuum.c:404
-msgid "autovacuum launcher started"
-msgstr "lanzador de autovacuum iniciado"
+#: parser/parse_utilcmd.c:1887
+msgid "index expression cannot return a set"
+msgstr "las expresiones de índice no pueden retornar conjuntos"
 
-#: postmaster/autovacuum.c:760
-msgid "autovacuum launcher shutting down"
-msgstr "apagando lanzador de autovacuum"
+#: parser/parse_utilcmd.c:1897
+msgid ""
+"index expressions and predicates can refer only to the table being indexed"
+msgstr ""
+"las expresiones y predicados de índice sólo pueden referirse a la tabla en "
+"indexación"
 
-#: postmaster/autovacuum.c:1394
-#, c-format
-msgid "could not fork autovacuum worker process: %m"
-msgstr "no se pudo lanzar el proceso «autovacuum worker»: %m"
+#: parser/parse_utilcmd.c:1994
+msgid "rule WHERE condition cannot contain references to other relations"
+msgstr ""
+"la condición WHERE de la regla no puede contener referencias a otras "
+"relaciones"
 
-#: postmaster/autovacuum.c:1595
-#, c-format
-msgid "autovacuum: processing database \"%s\""
-msgstr "autovacuum: procesando la base de datos «%s»"
+#: parser/parse_utilcmd.c:2000
+msgid "cannot use aggregate function in rule WHERE condition"
+msgstr ""
+"no se pueden usar funciones de agregación en condición WHERE de una regla"
 
-#: postmaster/autovacuum.c:1998
-#, c-format
-msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
+#: parser/parse_utilcmd.c:2004
+msgid "cannot use window function in rule WHERE condition"
 msgstr ""
-"autovacuum: eliminando la tabla temporal huérfana «%s».«%s» en la base de "
-"datos «%s»"
+"no se pueden usar funciones de ventana deslizante en condición WHERE de una "
+"regla"
 
-#: postmaster/autovacuum.c:2010
-#, c-format
-msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
+#: parser/parse_utilcmd.c:2076
+msgid ""
+"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
+"actions"
 msgstr ""
-"autovacuum: se encontró una tabla temporal huérfana «%s».«%s» en la base de "
-"datos «%s»"
+"las reglas con condiciones WHERE sólo pueden tener acciones SELECT, INSERT, "
+"UPDATE o DELETE"
 
-#: postmaster/autovacuum.c:2280
-#, c-format
-msgid "automatic vacuum of table \"%s.%s.%s\""
-msgstr "vacuum automático de la tabla «%s.%s.%s»"
+#: parser/parse_utilcmd.c:2094 parser/parse_utilcmd.c:2193
+#: rewrite/rewriteHandler.c:442 rewrite/rewriteManip.c:1024
+msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
+msgstr ""
+"las sentencias UNION/INTERSECT/EXCEPT condicionales no están implementadas"
 
-#: postmaster/autovacuum.c:2283
-#, c-format
-msgid "automatic analyze of table \"%s.%s.%s\""
-msgstr "análisis automático de la tabla «%s.%s.%s»"
+#: parser/parse_utilcmd.c:2112
+msgid "ON SELECT rule cannot use OLD"
+msgstr "una regla ON SELECT no puede usar OLD"
 
-#: postmaster/autovacuum.c:2761
-msgid "autovacuum not started because of misconfiguration"
-msgstr "autovacuum no fue iniciado debido a un error de configuración"
+#: parser/parse_utilcmd.c:2116
+msgid "ON SELECT rule cannot use NEW"
+msgstr "una regla ON SELECT no puede usar NEW"
 
-#: postmaster/autovacuum.c:2762
-msgid "Enable the \"track_counts\" option."
-msgstr "Active la opción «track_counts»."
+#: parser/parse_utilcmd.c:2125
+msgid "ON INSERT rule cannot use OLD"
+msgstr "una regla ON INSERT no puede usar OLD"
 
-#: postmaster/bgwriter.c:472
-#, c-format
-msgid "checkpoints are occurring too frequently (%d second apart)"
-msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
-msgstr[0] ""
-"los puntos de control están ocurriendo con demasiada frecuencia (cada %d "
-"segundo)"
-msgstr[1] ""
-"los puntos de control están ocurriendo con demasiada frecuencia (cada %d "
-"segundos)"
+#: parser/parse_utilcmd.c:2131
+msgid "ON DELETE rule cannot use NEW"
+msgstr "una regla ON DELETE no puede usar NEW"
 
-#: postmaster/bgwriter.c:476
-msgid ""
-"Consider increasing the configuration parameter \"checkpoint_segments\"."
-msgstr ""
-"Considere incrementar el parámetro de configuración «checkpoint_segments»."
+#: parser/parse_utilcmd.c:2159
+msgid "cannot refer to OLD within WITH query"
+msgstr "no se puede hacer referencia a OLD dentro de una consulta WITH"
 
-#: postmaster/bgwriter.c:588
-#, c-format
-msgid "transaction log switch forced (archive_timeout=%d)"
-msgstr "cambio forzado de registro de transacción (archive_timeout=%d)"
+#: parser/parse_utilcmd.c:2166
+msgid "cannot refer to NEW within WITH query"
+msgstr "no se puede hacer referencia a NEW dentro de una consulta WITH"
 
-#: postmaster/bgwriter.c:1044
-msgid "checkpoint request failed"
-msgstr "falló la petición de punto de control"
+#: parser/parse_utilcmd.c:2449
+msgid "misplaced DEFERRABLE clause"
+msgstr "cláusula DEFERRABLE mal puesta"
 
-#: postmaster/bgwriter.c:1045
-msgid "Consult recent messages in the server log for details."
-msgstr ""
-"Vea los mensajes recientes en el registro del servidor para obtener más "
-"detalles."
+#: parser/parse_utilcmd.c:2454 parser/parse_utilcmd.c:2469
+msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
+msgstr "no se permiten múltiples cláusulas DEFERRABLE/NOT DEFERRABLE"
 
-#: postmaster/pgarch.c:158
-#, c-format
-msgid "could not fork archiver: %m"
-msgstr "no se pudo lanzar el proceso archivador: %m"
+#: parser/parse_utilcmd.c:2464
+msgid "misplaced NOT DEFERRABLE clause"
+msgstr "la cláusula NOT DEFERRABLE está mal puesta"
 
-#: postmaster/pgarch.c:450
-msgid "archive_mode enabled, yet archive_command is not set"
-msgstr "archive_mode activado, pero archive_command no está definido"
+#: parser/parse_utilcmd.c:2477 parser/parse_utilcmd.c:2503 gram.y:4153
+msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+msgstr "una restricción declarada INITIALLY DEFERRED debe ser DEFERRABLE"
 
-#: postmaster/pgarch.c:465
-#, c-format
-msgid "transaction log file \"%s\" could not be archived: too many failures"
-msgstr ""
-"el archivo de transacción «%s» no pudo ser archivado: demasiadas fallas"
+#: parser/parse_utilcmd.c:2485
+msgid "misplaced INITIALLY DEFERRED clause"
+msgstr "la cláusula INITIALLY DEFERRED está mal puesta"
 
-#: postmaster/pgarch.c:568
+#: parser/parse_utilcmd.c:2490 parser/parse_utilcmd.c:2516
+msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
+msgstr "no se permiten múltiples cláusulas INITIALLY IMMEDIATE/DEFERRED"
+
+#: parser/parse_utilcmd.c:2511
+msgid "misplaced INITIALLY IMMEDIATE clause"
+msgstr "la cláusula INITIALLY IMMEDIATE está mal puesta"
+
+#: parser/parse_utilcmd.c:2702
 #, c-format
-msgid "archive command failed with exit code %d"
-msgstr "la orden de archivado falló con código de retorno %d"
+msgid ""
+"CREATE specifies a schema (%s) different from the one being created (%s)"
+msgstr ""
+"CREATE especifica un esquema (%s) diferente del que se está creando (%s)"
 
-#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
-#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
+#: parser/scansup.c:190
 #, c-format
-msgid "The failed archive command was: %s"
-msgstr "La orden fallida era: «%s»"
+msgid "identifier \"%s\" will be truncated to \"%s\""
+msgstr "el identificador «%s» se truncará a «%s»"
 
-#: postmaster/pgarch.c:577
+#: parser/parse_collate.c:214 parser/parse_collate.c:538
 #, c-format
-msgid "archive command was terminated by exception 0x%X"
-msgstr "la orden de archivado fue terminada por una excepción 0x%X"
+msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgstr ""
+"discordancia de ordenamientos (collation) entre los ordenamientos implícitos "
+"«%s» y «%s»"
 
-#: postmaster/pgarch.c:579 postmaster/postmaster.c:2840
+#: parser/parse_collate.c:217 parser/parse_collate.c:541
 msgid ""
-"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
+"You can choose the collation by applying the COLLATE clause to one or both "
+"expressions."
 msgstr ""
-"Vea el archivo «ntstatus.h» para una descripción del valor hexadecimal."
+"Puede elegir el ordenamiento aplicando la cláusula COLLATE a una o ambas "
+"expresiones."
 
-#: postmaster/pgarch.c:584
+#: parser/parse_collate.c:763
 #, c-format
-msgid "archive command was terminated by signal %d: %s"
-msgstr "la orden de archivado fue terminada por una señal %d: %s"
+msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+msgstr ""
+"discordancia de ordenamientos (collation) entre los ordenamientos explícitos "
+"«%s» y «%s»"
 
-#: postmaster/pgarch.c:591
+#: gram.y:915
 #, c-format
-msgid "archive command was terminated by signal %d"
-msgstr "la orden de archivado fue terminada por una señal %d"
+msgid "unrecognized role option \"%s\""
+msgstr "opción de rol no reconocida «%s»"
 
-#: postmaster/pgarch.c:600
-#, c-format
-msgid "archive command exited with unrecognized status %d"
-msgstr "la orden de archivado fue terminada con código no reconocido %d"
+#: gram.y:1301
+msgid "current database cannot be changed"
+msgstr "no se puede cambiar la base de datos activa"
 
-#: postmaster/pgarch.c:612
-#, c-format
-msgid "archived transaction log file \"%s\""
-msgstr "el archivo de registro «%s» ha sido archivado"
+#: gram.y:1419 gram.y:1434
+msgid "time zone interval must be HOUR or HOUR TO MINUTE"
+msgstr "el intervalo de huso horario debe ser HOUR o HOUR TO MINUTE"
 
-#: postmaster/pgarch.c:661
-#, c-format
-msgid "could not open archive status directory \"%s\": %m"
-msgstr "no se pudo abrir el directorio de estado de archivado «%s»: %m"
+#: gram.y:1439 gram.y:9246 gram.y:11736
+msgid "interval precision specified twice"
+msgstr "la precisión de interval fue especificada dos veces"
 
-#: postmaster/pgstat.c:328
-#, c-format
-msgid "could not resolve \"localhost\": %s"
-msgstr "no se pudo resolver «localhost»: %s"
+#: gram.y:2887 utils/adt/ri_triggers.c:375 utils/adt/ri_triggers.c:435
+#: utils/adt/ri_triggers.c:598 utils/adt/ri_triggers.c:838
+#: utils/adt/ri_triggers.c:1026 utils/adt/ri_triggers.c:1188
+#: utils/adt/ri_triggers.c:1376 utils/adt/ri_triggers.c:1547
+#: utils/adt/ri_triggers.c:1730 utils/adt/ri_triggers.c:1901
+#: utils/adt/ri_triggers.c:2117 utils/adt/ri_triggers.c:2299
+#: utils/adt/ri_triggers.c:2502 utils/adt/ri_triggers.c:2550
+#: utils/adt/ri_triggers.c:2595 utils/adt/ri_triggers.c:2757
+msgid "MATCH PARTIAL not yet implemented"
+msgstr "MATCH PARTIAL no está implementada"
 
-#: postmaster/pgstat.c:351
-msgid "trying another address for the statistics collector"
-msgstr "intentando otra dirección para el recolector de estadísticas"
+#: gram.y:3005
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS no puede especificar INTO"
 
-#: postmaster/pgstat.c:360
-#, c-format
-msgid "could not create socket for statistics collector: %m"
-msgstr "no se pudo crear el socket para el recolector de estadísticas: %m"
+#: gram.y:4058
+msgid "duplicate trigger events specified"
+msgstr "se han especificado eventos de disparador duplicados"
 
-#: postmaster/pgstat.c:372
-#, c-format
-msgid "could not bind socket for statistics collector: %m"
-msgstr ""
-"no se pudo enlazar (bind) el socket para el recolector de estadísticas: %m"
+#: gram.y:4160
+msgid "conflicting constraint properties"
+msgstr "propiedades de restricción contradictorias"
 
-#: postmaster/pgstat.c:383
-#, c-format
-msgid "could not get address of socket for statistics collector: %m"
-msgstr "no se pudo obtener la dirección del socket de estadísticas: %m"
+#: gram.y:4221
+msgid "CREATE ASSERTION is not yet implemented"
+msgstr "CREATE ASSERTION no está implementado"
 
-#: postmaster/pgstat.c:399
-#, c-format
-msgid "could not connect socket for statistics collector: %m"
-msgstr "no se pudo conectar el socket para el recolector de estadísticas: %m"
+#: gram.y:4237
+msgid "DROP ASSERTION is not yet implemented"
+msgstr "DROP ASSERTION no está implementado"
 
-#: postmaster/pgstat.c:420
-#, c-format
-msgid "could not send test message on socket for statistics collector: %m"
-msgstr ""
-"no se pudo enviar el mensaje de prueba al recolector de estadísticas: %m"
+#: gram.y:4573
+msgid "RECHECK is no longer required"
+msgstr "RECHECK ya no es requerido"
 
-#: postmaster/pgstat.c:446 postmaster/pgstat.c:2909
-#, c-format
-msgid "select() failed in statistics collector: %m"
-msgstr "select() falló en el recolector de estadísticas: %m"
+#: gram.y:4574
+msgid "Update your data type."
+msgstr "Actualice su tipo de datos."
 
-#: postmaster/pgstat.c:461
-msgid "test message did not get through on socket for statistics collector"
-msgstr ""
-"el mensaje de prueba al recolector de estadísticas no ha sido recibido en el "
-"socket"
+#: gram.y:6217 utils/adt/regproc.c:630
+msgid "missing argument"
+msgstr "falta un argumento"
 
-#: postmaster/pgstat.c:476
-#, c-format
-msgid "could not receive test message on socket for statistics collector: %m"
-msgstr ""
-"no se pudo recibir el mensaje de prueba en el socket del recolector de "
-"estadísticas: %m"
+#: gram.y:6218 utils/adt/regproc.c:631
+msgid "Use NONE to denote the missing argument of a unary operator."
+msgstr "Use NONE para denotar el argumento faltante de un operador unario."
 
-#: postmaster/pgstat.c:486
-msgid "incorrect test message transmission on socket for statistics collector"
-msgstr ""
-"transmisión del mensaje de prueba incorrecta en el socket del recolector de "
-"estadísticas"
+#: gram.y:7297 gram.y:7303 gram.y:7309
+msgid "WITH CHECK OPTION is not implemented"
+msgstr "WITH CHECK OPTION no está implementado"
 
-#: postmaster/pgstat.c:509
-#, c-format
-msgid "could not set statistics collector socket to nonblocking mode: %m"
-msgstr "no se pudo poner el socket de estadísticas en modo no bloqueante: %m"
+#: gram.y:7986
+msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
+msgstr "no se permite una lista de columnas en CREATE TABLE / AS EXECUTE "
 
-#: postmaster/pgstat.c:519
-msgid "disabling statistics collector for lack of working socket"
-msgstr "desactivando el recolector de estadísticas por falla del socket"
+#: gram.y:8210
+msgid "number of columns does not match number of values"
+msgstr "el número de columnas no coincide con el número de valores"
 
-#: postmaster/pgstat.c:621
-#, c-format
-msgid "could not fork statistics collector: %m"
-msgstr "no se pudo crear el proceso para el recolector de estadísticas: %m"
+#: gram.y:8660
+msgid "LIMIT #,# syntax is not supported"
+msgstr "la sintaxis LIMIT #,# no está soportada"
 
-#: postmaster/pgstat.c:1151 postmaster/pgstat.c:1175 postmaster/pgstat.c:1206
-msgid "must be superuser to reset statistics counters"
-msgstr ""
-"debe ser superusuario para reinicializar los contadores de estadísticas"
+#: gram.y:8661
+msgid "Use separate LIMIT and OFFSET clauses."
+msgstr "Use cláusulas LIMIT y OFFSET separadas."
 
-#: postmaster/pgstat.c:1182
-#, c-format
-msgid "unrecognized reset target: \"%s\""
-msgstr "destino de reset no reconocido: «%s»"
+#: gram.y:8879
+msgid "VALUES in FROM must have an alias"
+msgstr "VALUES en FROM debe tener un alias"
 
-#: postmaster/pgstat.c:1183
-msgid "Target must be \"bgwriter\"."
-msgstr "El destino debe ser «bgwriter»."
+#: gram.y:8880
+msgid "For example, FROM (VALUES ...) [AS] foo."
+msgstr "Por ejemplo, FROM (VALUES ...) [AS] foo."
 
-#: postmaster/pgstat.c:2888
-#, c-format
-msgid "poll() failed in statistics collector: %m"
-msgstr "poll() falló en el recolector de estadísticas: %m"
+#: gram.y:8885
+msgid "subquery in FROM must have an alias"
+msgstr "las subconsultas en FROM deben tener un alias"
 
-#: postmaster/pgstat.c:2933
-#, c-format
-msgid "could not read statistics message: %m"
-msgstr "no se pudo leer un mensaje de estadísticas: %m"
+#: gram.y:8886
+msgid "For example, FROM (SELECT ...) [AS] foo."
+msgstr "Por ejemplo, FROM (SELECT ...) [AS] foo."
 
-#: postmaster/pgstat.c:3190
-#, c-format
-msgid "could not open temporary statistics file \"%s\": %m"
-msgstr "no se pudo abrir el archivo temporal de estadísticas «%s»: %m"
+#: gram.y:9372
+msgid "precision for type float must be at least 1 bit"
+msgstr "la precisión para el tipo float debe ser al menos 1 bit"
 
-#: postmaster/pgstat.c:3262
-#, c-format
-msgid "could not write temporary statistics file \"%s\": %m"
-msgstr "no se pudo escribir el archivo temporal de estadísticas «%s»: %m"
+#: gram.y:9381
+msgid "precision for type float must be less than 54 bits"
+msgstr "la precisión para el tipo float debe ser menor de 54 bits"
 
-#: postmaster/pgstat.c:3271
-#, c-format
-msgid "could not close temporary statistics file \"%s\": %m"
-msgstr "no se pudo cerrar el archivo temporal de estadísticas «%s»: %m"
+#: gram.y:10095
+msgid "UNIQUE predicate is not yet implemented"
+msgstr "el predicado UNIQUE no está implementado"
 
-#: postmaster/pgstat.c:3279
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr ""
-"no se pudo cambiar el nombre al archivo temporal de estadísticas de «%s» a "
-"«%s»: %m"
+#: gram.y:11003
+msgid "RANGE PRECEDING is only supported with UNBOUNDED"
+msgstr "RANGE PRECEDING sólo está soportado con UNBOUNDED"
 
-#: postmaster/pgstat.c:3379 postmaster/pgstat.c:3608
-#, c-format
-msgid "could not open statistics file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de estadísticas «%s»: %m"
+#: gram.y:11009
+msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
+msgstr "RANGE FOLLOWING sólo está soportado con UNBOUNDED"
 
-#: postmaster/pgstat.c:3391 postmaster/pgstat.c:3401 postmaster/pgstat.c:3423
-#: postmaster/pgstat.c:3438 postmaster/pgstat.c:3501 postmaster/pgstat.c:3519
-#: postmaster/pgstat.c:3535 postmaster/pgstat.c:3553 postmaster/pgstat.c:3569
-#: postmaster/pgstat.c:3620 postmaster/pgstat.c:3631
-#, c-format
-msgid "corrupted statistics file \"%s\""
-msgstr "el archivo de estadísticas «%s» está corrupto"
+#: gram.y:11036 gram.y:11059
+msgid "frame start cannot be UNBOUNDED FOLLOWING"
+msgstr "el inicio de «frame» no puede ser UNBOUNDED FOLLOWING"
 
-#: postmaster/pgstat.c:3925
-msgid "database hash table corrupted during cleanup --- abort"
+#: gram.y:11041
+msgid "frame starting from following row cannot end with current row"
 msgstr ""
-"el hash de bases de datos se corrompió durante la finalización; abortando"
-
-#: postmaster/postmaster.c:566
-#, c-format
-msgid "%s: invalid argument for option -f: \"%s\"\n"
-msgstr "%s: argumento no válido para la opción -f: «%s»\n"
-
-#: postmaster/postmaster.c:652
-#, c-format
-msgid "%s: invalid argument for option -t: \"%s\"\n"
-msgstr "%s: argumento no válido para la opción -t: «%s»\n"
-
-#: postmaster/postmaster.c:703
-#, c-format
-msgid "%s: invalid argument: \"%s\"\n"
-msgstr "%s: argumento no válido: «%s»\n"
+"el «frame» que se inicia desde la siguiente fila no puede terminar en la "
+"fila actual"
 
-#: postmaster/postmaster.c:728
-#, c-format
-msgid "%s: superuser_reserved_connections must be less than max_connections\n"
-msgstr ""
-"%s: superuser_reserved_connections debe ser menor que max_connections\n"
+#: gram.y:11064
+msgid "frame end cannot be UNBOUNDED PRECEDING"
+msgstr "el fin de «frame» no puede ser UNBOUNDED PRECEDING"
 
-#: postmaster/postmaster.c:733
-msgid ""
-"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
-"\"hot_standby\""
+#: gram.y:11070
+msgid "frame starting from current row cannot have preceding rows"
 msgstr ""
-"el archivado de WAL (archive_mode=on) requiere wal_level «archive» o "
-"«hot_standby»"
+"el «frame» que se inicia desde la fila actual no puede tener filas "
+"precedentes"
 
-#: postmaster/postmaster.c:736
-msgid ""
-"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
-"\"hot_standby\""
+#: gram.y:11077
+msgid "frame starting from following row cannot have preceding rows"
 msgstr ""
-"el flujo de WAL (max_wal_senders > 0) requiere wal_level «archive» o "
-"«hot_standby»"
+"el «frame» que se inicia desde la fila siguiente no puede tener filas "
+"precedentes"
 
-#: postmaster/postmaster.c:744
-#, c-format
-msgid "%s: invalid datetoken tables, please fix\n"
-msgstr "%s: las tablas de palabras clave de fecha no son válidas, arréglelas\n"
+#: gram.y:11711
+msgid "type modifier cannot have parameter name"
+msgstr "el modificador de tipo no puede tener nombre de parámetro"
 
-#: postmaster/postmaster.c:850
-msgid "invalid list syntax for \"listen_addresses\""
-msgstr "la sintaxis de lista no es válida para el parámetro «listen_addresses»"
+#: gram.y:12306 gram.y:12514
+msgid "improper use of \"*\""
+msgstr "uso impropio de «*»"
 
-#: postmaster/postmaster.c:871
-#, c-format
-msgid "could not create listen socket for \"%s\""
-msgstr "no se pudo crear el socket de escucha para «%s»"
+#: gram.y:12445
+msgid "wrong number of parameters on left side of OVERLAPS expression"
+msgstr ""
+"el número de parámetros es incorrecto al lado izquierdo de la expresión "
+"OVERLAPS"
 
-#: postmaster/postmaster.c:877
-msgid "could not create any TCP/IP sockets"
-msgstr "no se pudo crear ningún socket TCP/IP"
+#: gram.y:12452
+msgid "wrong number of parameters on right side of OVERLAPS expression"
+msgstr ""
+"el número de parámetros es incorrecto al lado derecho de la expresión "
+"OVERLAPS"
 
-#: postmaster/postmaster.c:928
-msgid "could not create Unix-domain socket"
-msgstr "no se pudo crear el socket de dominio Unix"
+#: gram.y:12577
+msgid "multiple ORDER BY clauses not allowed"
+msgstr "no se permiten múltiples cláusulas ORDER BY"
 
-#: postmaster/postmaster.c:936
-msgid "no socket created for listening"
-msgstr "no se creó el socket de atención"
+#: gram.y:12588
+msgid "multiple OFFSET clauses not allowed"
+msgstr "no se permiten múltiples cláusulas OFFSET"
 
-#: postmaster/postmaster.c:962
-msgid "could not create I/O completion port for child queue"
-msgstr ""
-"no se pudo crear el port E/S de reporte de completitud para la cola de "
-"procesos hijos"
+#: gram.y:12597
+msgid "multiple LIMIT clauses not allowed"
+msgstr "no se permiten múltiples cláusulas LIMIT"
 
-#: postmaster/postmaster.c:1006
-#, c-format
-msgid "%s: could not write external PID file \"%s\": %s\n"
-msgstr "%s: no pudo escribir en el archivo externo de PID «%s»: %s\n"
+#: gram.y:12606
+msgid "multiple WITH clauses not allowed"
+msgstr "no se permiten múltiples cláusulas WITH"
 
-#: postmaster/postmaster.c:1074 utils/init/postinit.c:197
-msgid "could not load pg_hba.conf"
-msgstr "no se pudo cargar pg_hba.conf"
+#: gram.y:12751
+msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
+msgstr "los argumentos OUT e INOUT no están permitidos en funciones TABLE"
 
-#: postmaster/postmaster.c:1121
-#, c-format
-msgid "%s: could not locate matching postgres executable"
-msgstr "%s: no se pudo localizar el ejecutable postgres correspondiente"
+#: gram.y:12852
+msgid "multiple COLLATE clauses not allowed"
+msgstr "no se permiten múltiples cláusulas COLLATE"
 
-#: postmaster/postmaster.c:1144 utils/misc/tzparser.c:347
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12890 gram.y:12903
 #, c-format
-msgid ""
-"This may indicate an incomplete PostgreSQL installation, or that the file "
-"\"%s\" has been moved away from its proper location."
-msgstr ""
-"Esto puede indicar una instalación de PostgreSQL incompleta, o que el "
-"archivo «%s» ha sido movido de la ubicación adecuada."
+msgid "%s constraints cannot be marked DEFERRABLE"
+msgstr "las restricciones %s no pueden ser marcadas DEFERRABLE"
 
-#: postmaster/postmaster.c:1172
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12916
 #, c-format
-msgid "data directory \"%s\" does not exist"
-msgstr "no existe el directorio de datos «%s»"
+msgid "%s constraints cannot be marked NOT VALID"
+msgstr "las restricciones %s no pueden ser marcadas NOT VALID"
 
-#: postmaster/postmaster.c:1177
-#, c-format
-msgid "could not read permissions of directory \"%s\": %m"
-msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
+#: scan.l:411
+msgid "unterminated /* comment"
+msgstr "un comentario /* está inconcluso"
 
-#: postmaster/postmaster.c:1185
-#, c-format
-msgid "specified data directory \"%s\" is not a directory"
-msgstr "el directorio de datos especificado «%s» no es un directorio"
+#: scan.l:440
+msgid "unterminated bit string literal"
+msgstr "una cadena de bits está inconclusa"
 
-#: postmaster/postmaster.c:1201
-#, c-format
-msgid "data directory \"%s\" has wrong ownership"
-msgstr "el directorio de datos «%s» tiene dueño equivocado"
+#: scan.l:461
+msgid "unterminated hexadecimal string literal"
+msgstr "una cadena hexadecimal está inconclusa"
 
-#: postmaster/postmaster.c:1203
-msgid "The server must be started by the user that owns the data directory."
-msgstr ""
-"El servidor debe ser iniciado por el usuario dueño del directorio de datos."
-
-#: postmaster/postmaster.c:1223
-#, c-format
-msgid "data directory \"%s\" has group or world access"
-msgstr "el directorio de datos «%s» tiene acceso para el grupo u otros"
-
-#: postmaster/postmaster.c:1225
-msgid "Permissions should be u=rwx (0700)."
-msgstr "Los permisos deberían ser u=rwx (0700)."
+#: scan.l:511
+msgid "unsafe use of string constant with Unicode escapes"
+msgstr "uso inseguro de literal de cadena con escapes Unicode"
 
-#: postmaster/postmaster.c:1236
-#, c-format
+#: scan.l:512
 msgid ""
-"%s: could not find the database system\n"
-"Expected to find it in the directory \"%s\",\n"
-"but could not open file \"%s\": %s\n"
+"String constants with Unicode escapes cannot be used when "
+"standard_conforming_strings is off."
 msgstr ""
-"%s: no se pudo encontrar el sistema de base de datos.\n"
-"Se esperaba encontrar en el directorio PGDATA «%s»,\n"
-"pero no se pudo abrir el archivo «%s»: %s\n"
-
-#: postmaster/postmaster.c:1272
-#, c-format
-msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: no se pudo abrir el archivo «%s»: %s\n"
-
-#: postmaster/postmaster.c:1279
-#, c-format
-msgid "%s: could not open log file \"%s/%s\": %s\n"
-msgstr "%s: no se pudo abrir archivo de log «%s/%s»: %s\n"
-
-#: postmaster/postmaster.c:1290
-#, c-format
-msgid "%s: could not fork background process: %s\n"
-msgstr "%s: no se pudo lanzar el proceso en segundo plano: %s\n"
-
-#: postmaster/postmaster.c:1312
-#, c-format
-msgid "%s: could not dissociate from controlling TTY: %s\n"
-msgstr "%s: no se pudo disociar del TTY de control: %s\n"
+"Los literales de cadena con escapes Unicode no pueden usarse cuando "
+"standard_conforming_strings está desactivado."
 
-#: postmaster/postmaster.c:1407
-#, c-format
-msgid "select() failed in postmaster: %m"
-msgstr "select() falló en postmaster: %m"
+#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
+#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
+msgid "invalid Unicode surrogate pair"
+msgstr "par sustituto (surrogate) Unicode no válido"
 
-#: postmaster/postmaster.c:1564 postmaster/postmaster.c:1595
-msgid "incomplete startup packet"
-msgstr "el paquete de inicio está incompleto"
+#: scan.l:586
+msgid "invalid Unicode escape"
+msgstr "valor de escape Unicode no válido"
 
-#: postmaster/postmaster.c:1576
-msgid "invalid length of startup packet"
-msgstr "el de paquete de inicio tiene largo incorrecto"
+#: scan.l:587
+msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
+msgstr "Los escapes Unicode deben ser \\uXXXX o \\UXXXXXXXX."
 
-#: postmaster/postmaster.c:1633
-#, c-format
-msgid "failed to send SSL negotiation response: %m"
-msgstr "no se pudo enviar la respuesta de negociación SSL: %m"
+#: scan.l:598
+msgid "unsafe use of \\' in a string literal"
+msgstr "uso inseguro de \\' en un literal de cadena"
 
-#: postmaster/postmaster.c:1662
-#, c-format
-msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
+#: scan.l:599
+msgid ""
+"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr ""
-"el protocolo %u.%u no está soportado: servidor soporta %u.0 hasta %u.%u"
-
-#: postmaster/postmaster.c:1713
-msgid "invalid value for boolean option \"replication\""
-msgstr "valor no válido para la opción booleana «replication»"
+"Use '' para escribir comillas en cadenas. \\' es inseguro en codificaciones "
+"de sólo cliente."
 
-#: postmaster/postmaster.c:1733
-msgid "invalid startup packet layout: expected terminator as last byte"
-msgstr ""
-"el paquete de inicio no es válido: se esperaba un terminador en el último "
-"byte"
+#: scan.l:629 repl_scanner.l:97
+msgid "unterminated quoted string"
+msgstr "una cadena de caracteres entre comillas está inconclusa"
 
-#: postmaster/postmaster.c:1761
-msgid "no PostgreSQL user name specified in startup packet"
-msgstr "no se especifica un nombre de usuario en el paquete de inicio"
+#: scan.l:674
+msgid "unterminated dollar-quoted string"
+msgstr "una cadena separada por $ está inconclusa"
 
-#: postmaster/postmaster.c:1818
-msgid "the database system is starting up"
-msgstr "el sistema de base de datos está iniciándose"
+#: scan.l:691 scan.l:703 scan.l:717
+msgid "zero-length delimited identifier"
+msgstr "un identificador delimitado tiene largo cero"
 
-#: postmaster/postmaster.c:1823
-msgid "the database system is shutting down"
-msgstr "el sistema de base de datos está apagándose"
+#: scan.l:730
+msgid "unterminated quoted identifier"
+msgstr "un identificador entre comillas está inconcluso"
 
-#: postmaster/postmaster.c:1828
-msgid "the database system is in recovery mode"
-msgstr "el sistema de base de datos está en modo de recuperación"
+#: scan.l:834
+msgid "operator too long"
+msgstr "el operador es demasiado largo"
 
-#: postmaster/postmaster.c:1895
+#. translator: %s is typically the translation of "syntax error"
+#: scan.l:992
 #, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "llave incorrecta en la petición de cancelación para el proceso %d"
+msgid "%s at end of input"
+msgstr "%s al final de la entrada"
 
-#: postmaster/postmaster.c:1903
+#. translator: first %s is typically the translation of "syntax error"
+#: scan.l:1000
 #, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr ""
-"el PID %d en la petición de cancelación no coincidió con ningún proceso"
-
-#: postmaster/postmaster.c:2109
-msgid "received SIGHUP, reloading configuration files"
-msgstr "se recibió SIGHUP, releyendo el archivo de configuración"
-
-#: postmaster/postmaster.c:2132
-msgid "pg_hba.conf not reloaded"
-msgstr "pg_hba.conf no ha sido recargado"
-
-#: postmaster/postmaster.c:2175
-msgid "received smart shutdown request"
-msgstr "se recibió petición de apagado inteligente"
-
-#: postmaster/postmaster.c:2222
-msgid "received fast shutdown request"
-msgstr "se recibió petición de apagado rápido"
-
-#: postmaster/postmaster.c:2240
-msgid "aborting any active transactions"
-msgstr "abortando transacciones activas"
-
-#: postmaster/postmaster.c:2269
-msgid "received immediate shutdown request"
-msgstr "se recibió petición de apagado inmediato"
-
-#: postmaster/postmaster.c:2345 postmaster/postmaster.c:2373
-msgid "startup process"
-msgstr "proceso de inicio"
-
-#: postmaster/postmaster.c:2348
-msgid "aborting startup due to startup process failure"
-msgstr "abortando el inicio debido a una falla en el procesamiento de inicio"
+msgid "%s at or near \"%s\""
+msgstr "%s en o cerca de «%s»"
 
-#: postmaster/postmaster.c:2407
-msgid "database system is ready to accept connections"
-msgstr "el sistema de bases de datos está listo para aceptar conexiones"
+#: scan.l:1161 scan.l:1193
+msgid ""
+"Unicode escape values cannot be used for code point values above 007F when "
+"the server encoding is not UTF8"
+msgstr ""
+"Los valores de escape Unicode no puede ser usados para valores de «code "
+"point» sobre 007F cuando la codificación de servidor no es UTF8"
 
-#: postmaster/postmaster.c:2462
-msgid "background writer process"
-msgstr "proceso background writer"
+#: scan.l:1189 scan.l:1325
+msgid "invalid Unicode escape value"
+msgstr "valor de escape Unicode no válido"
 
-#: postmaster/postmaster.c:2478
-msgid "WAL writer process"
-msgstr "proceso escritor de WAL"
+#: scan.l:1214
+msgid "invalid Unicode escape character"
+msgstr "carácter de escape Unicode no válido"
 
-#: postmaster/postmaster.c:2492
-msgid "WAL receiver process"
-msgstr "proceso receptor de WAL"
+#: scan.l:1381
+msgid "nonstandard use of \\' in a string literal"
+msgstr "uso no estandar de \\' en un literal de cadena"
 
-#: postmaster/postmaster.c:2507
-msgid "autovacuum launcher process"
-msgstr "proceso lanzador de autovacuum"
+#: scan.l:1382
+msgid ""
+"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
+msgstr ""
+"Use '' para escribir comillas en cadenas, o use la sintaxis de escape de "
+"cadenas (E'...')."
 
-#: postmaster/postmaster.c:2522
-msgid "archiver process"
-msgstr "proceso de archivado"
+#: scan.l:1391
+msgid "nonstandard use of \\\\ in a string literal"
+msgstr "uso no estandar de \\\\ en un literal de cadena"
 
-#: postmaster/postmaster.c:2538
-msgid "statistics collector process"
-msgstr "recolector de estadísticas"
+#: scan.l:1392
+msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
+msgstr ""
+"Use '' para escribir comillas en cadenas, o use la sintaxis de escape de "
+"cadenas (E'\\\\')."
 
-#: postmaster/postmaster.c:2552
-msgid "system logger process"
-msgstr "proceso de log"
+#: scan.l:1406
+msgid "nonstandard use of escape in a string literal"
+msgstr "uso no estandar de escape en un literal de cadena"
 
-#: postmaster/postmaster.c:2587 postmaster/postmaster.c:2603
-#: postmaster/postmaster.c:2610 postmaster/postmaster.c:2628
-msgid "server process"
-msgstr "proceso de servidor"
+#: scan.l:1407
+msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
+msgstr "Use la sintaxis de escape para cadenas, por ej. E'\\r\\n'."
 
-#: postmaster/postmaster.c:2664
-msgid "terminating any other active server processes"
-msgstr "terminando todos los otros procesos de servidor activos"
+#: port/win32/security.c:43
+#, c-format
+msgid "could not open process token: error code %d\n"
+msgstr "no se pudo abrir el token de proceso: código de error %d\n"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2829
+#: port/win32/security.c:63
 #, c-format
-msgid "%s (PID %d) exited with exit code %d"
-msgstr "%s (PID %d) terminó con código de salida %d"
+msgid "could not get SID for Administrators group: error code %d\n"
+msgstr ""
+"no se pudo obtener el SID del grupo Administrators: código de error %d\n"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2838
+#: port/win32/security.c:72
 #, c-format
-msgid "%s (PID %d) was terminated by exception 0x%X"
-msgstr "%s (PID %d) fue terminado por una excepción 0x%X"
+msgid "could not get SID for PowerUsers group: error code %d\n"
+msgstr "no se pudo obtener el SID del grupo PowerUsers: código de error %d\n"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2847
+#: port/win32/signal.c:189
 #, c-format
-msgid "%s (PID %d) was terminated by signal %d: %s"
-msgstr "%s (PID %d) fue terminado por una señal %d: %s"
+msgid "could not create signal listener pipe for PID %d: error code %d"
+msgstr ""
+"no se pudo crear tubería para escuchar señales para el PID %d: código de "
+"error %d"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2857
+#: port/win32/signal.c:269 port/win32/signal.c:301
 #, c-format
-msgid "%s (PID %d) was terminated by signal %d"
-msgstr "%s (PID %d) fue terminado por una señal %d"
+msgid "could not create signal listener pipe: error code %d; retrying\n"
+msgstr ""
+"no se pudo crear tubería para escuchar señales: código de error %d; "
+"reintentando\n"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2866
+#: port/win32/signal.c:312
 #, c-format
-msgid "%s (PID %d) exited with unrecognized status %d"
-msgstr "%s (PID %d) terminó con código no reconocido %d"
+msgid "could not create signal dispatch thread: error code %d\n"
+msgstr "no se pudo crear thread de despacho de señales: código de error %d\n"
 
-#: postmaster/postmaster.c:3046
-msgid "abnormal database system shutdown"
-msgstr "apagado anormal del sistema de bases de datos"
+#: port/win32/crashdump.c:108
+msgid "could not load dbghelp.dll, cannot write crash dump\n"
+msgstr ""
+"no se pudo cargar dbghelp.dll, no se puede escribir el volcado de la caída\n"
 
-#: postmaster/postmaster.c:3084
-msgid "all server processes terminated; reinitializing"
-msgstr "todos los procesos fueron terminados; reinicializando"
+#: port/win32/crashdump.c:116
+msgid ""
+"could not load required functions in dbghelp.dll, cannot write crash dump\n"
+msgstr ""
+"no fue posible cargar las funciones requeridas desde dbghelp.dll, no se "
+"puede escribir el volcado de la caída\n"
 
-#: postmaster/postmaster.c:3256
+#: port/win32/crashdump.c:147
 #, c-format
-msgid "could not fork new process for connection: %m"
-msgstr "no se pudo lanzar el nuevo proceso para la conexión: %m"
-
-#: postmaster/postmaster.c:3298
-msgid "could not fork new process for connection: "
-msgstr "no se pudo lanzar el nuevo proceso para la conexión: "
+msgid "could not open crash dump file \"%s\" for writing: error code %u\n"
+msgstr ""
+"no se pudo abrir el archivo del volcado de caída «%s» para escritura: código "
+"de error %u\n"
 
-#: postmaster/postmaster.c:3412
+#: port/win32/crashdump.c:154
 #, c-format
-msgid "connection received: host=%s port=%s"
-msgstr "conexión recibida: host=%s port=%s"
+msgid "wrote crash dump to file \"%s\"\n"
+msgstr "se escribió el volcado de caída en el archivo «%s».\n"
 
-#: postmaster/postmaster.c:3417
+#: port/win32/crashdump.c:156
 #, c-format
-msgid "connection received: host=%s"
-msgstr "conexión recibida: host=%s"
+msgid "could not write crash dump to file \"%s\": error code %08x\n"
+msgstr ""
+"no se pudo escribir el volcado de caída al archivo «%s»: código de error "
+"%08x\n"
 
-#: postmaster/postmaster.c:3684
+#: port/sysv_sema.c:114 port/pg_sema.c:114
 #, c-format
-msgid "could not execute server process \"%s\": %m"
-msgstr "no se pudo lanzar el proceso servidor «%s»: %m"
+msgid "could not create semaphores: %m"
+msgstr "no se pudo crear semáforos: %m"
 
-#: postmaster/postmaster.c:4201
-msgid "database system is ready to accept read only connections"
+#: port/sysv_sema.c:115 port/pg_sema.c:115
+#, c-format
+msgid "Failed system call was semget(%lu, %d, 0%o)."
+msgstr "La llamada a sistema fallida fue semget(%lu, %d, 0%o)."
+
+#: port/sysv_sema.c:119 port/pg_sema.c:119
+msgid ""
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"when either the system limit for the maximum number of semaphore sets "
+"(SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be "
+"exceeded.  You need to raise the respective kernel parameter.  "
+"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
+"max_connections parameter.\n"
+"The PostgreSQL documentation contains more information about configuring "
+"your system for PostgreSQL."
 msgstr ""
-"el sistema de bases de datos está listo para aceptar conexiones de sólo "
-"lectura"
+"Este error *no* significa que se haya quedado sin espacio en disco.\n"
+"Ocurre cuando se alcanza el límite del sistema del número de semáforos "
+"(SEMMNI), o bien cuando se excede el total de semáforos del sistema (SEMMNS)."
+"Necesita incrementar el parámetro respectivo del kernel.  Alternativamente, "
+"reduzca el consumo de semáforos de PostgreSQL reduciendo el parámetro "
+"max_connections.\n"
+"La documentación de PostgreSQL contiene más información acerca de cómo "
+"configurar su sistema para PostgreSQL."
 
-#: postmaster/postmaster.c:4442
+#: port/sysv_sema.c:146 port/pg_sema.c:146
 #, c-format
-msgid "could not fork startup process: %m"
-msgstr "no se pudo lanzar el proceso de inicio: %m"
+msgid ""
+"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
+"Look into the PostgreSQL documentation for details."
+msgstr ""
+"Probablemente necesita incrementar el valor SEMVMX del kernel hasta al menos "
+"%d.  Examine la documentación de PostgreSQL para obtener más detalles."
 
-#: postmaster/postmaster.c:4446
+#: port/sysv_shmem.c:147 port/pg_shmem.c:147
 #, c-format
-msgid "could not fork background writer process: %m"
-msgstr "no se pudo lanzar el background writer: %m"
+msgid "could not create shared memory segment: %m"
+msgstr "no se pudo crear el segmento de memoria compartida: %m"
 
-#: postmaster/postmaster.c:4450
+#: port/sysv_shmem.c:148 port/pg_shmem.c:148
 #, c-format
-msgid "could not fork WAL writer process: %m"
-msgstr "no se pudo lanzar el proceso escritor de WAL: %m"
+msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
+msgstr "La llamada a sistema fallida fue shmget(key=%lu, size=%lu, 0%o)."
 
-#: postmaster/postmaster.c:4454
+#: port/sysv_shmem.c:152 port/pg_shmem.c:152
 #, c-format
-msgid "could not fork WAL receiver process: %m"
-msgstr "no se pudo lanzar el proceso receptor de WAL: %m"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
+"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
+"request size (currently %lu bytes), reduce PostgreSQL's shared memory usage, "
+"perhaps by reducing shared_buffers or max_connections.\n"
+"If the request size is already small, it's possible that it is less than "
+"your kernel's SHMMIN parameter, in which case raising the request size or "
+"reconfiguring SHMMIN is called for.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Este error normalmente significa que una petición de PostgreSQL para obtener "
+"un segmento de memoria compartida excedió el parámetro SHMMAX del kernel.  "
+"Puede reducir el tamaño de la petición o reconfigurar el kernel con un "
+"SHMMAX superior.  Para reducir el tamaño de la petición (actualmente %lu "
+"bytes), reduzca el parámetro de PostgreSQL shared_buffers y/o el parámetro "
+"max_connections.\n"
+"Si el tamaño de la petición ya es pequeño, es posible que sea inferior al "
+"parámetro SHMMIN del kernel, en cuyo caso se requiere alzar el tamaño de la "
+"petición o disminuir SHMMIN.\n"
+"La documentación de PostgreSQL contiene más información acerca de la "
+"configuración de memoria compartida."
 
-#: postmaster/postmaster.c:4458
+#: port/sysv_shmem.c:165 port/pg_shmem.c:165
 #, c-format
-msgid "could not fork process: %m"
-msgstr "no se pudo lanzar el proceso: %m"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded available memory or swap space, or exceeded your kernel's "
+"SHMALL parameter.  You can either reduce the request size or reconfigure the "
+"kernel with larger SHMALL.  To reduce the request size (currently %lu "
+"bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing "
+"shared_buffers or max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Este error normalmente significa que la petición de un segmento de memoria "
+"compartida de PostgreSQL excedía la memoria disponible o el espacio de "
+"intercambio (swap), o excedía el valor SHMALL del kernel.  Para reducir el "
+"tamaño de la petición (actualmente %lu bytes), reduzca el parámetro de "
+"PostgreSQL shared_buffers y/o el parámetro max_connections.\n"
+"La documentación de PostgreSQL contiene más información acerca de la "
+"configuración de memoria compartida."
 
-#: postmaster/postmaster.c:4740
+#: port/sysv_shmem.c:176 port/pg_shmem.c:176
 #, c-format
-msgid "could not duplicate socket %d for use in backend: error code %d"
+msgid ""
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"either if all available shared memory IDs have been taken, in which case you "
+"need to raise the SHMMNI parameter in your kernel, or because the system's "
+"overall limit for shared memory has been reached.  If you cannot increase "
+"the shared memory limit, reduce PostgreSQL's shared memory request "
+"(currently %lu bytes), perhaps by reducing shared_buffers or "
+"max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
 msgstr ""
-"no se pudo duplicar el socket %d para su empleo en el backend: código de "
-"error %d"
+"Este error *no* significa que se haya quedado sin espacio en disco.  Ocurre "
+"cuando se han usado todos los IDs de memoria compartida disponibles, en cuyo "
+"caso puede incrementar el parámetro SHMMNI del kernel, o bien porque se ha "
+"alcanzado el límite total de memoria compartida.  Si no puede incrementar el "
+"límite de memoria compartida, reduzca el tamaño de petición de PostgreSQL "
+"(actualmente %lu bytes) reduciendo el parámetro shared_buffers y/o el "
+"parámetro max_connections.\n"
+"La documentación de PostgreSQL contiene más información acerca de la "
+"configuración de memoria compartida."
 
-#: postmaster/postmaster.c:4772
+#: port/sysv_shmem.c:439 port/pg_shmem.c:439
 #, c-format
-msgid "could not create inherited socket: error code %d\n"
-msgstr "no se pudo crear el socket heradado: código de error %d\n"
+msgid "could not stat data directory \"%s\": %m"
+msgstr "no se pudo verificar el directorio de datos «%s»: %m"
 
-#: postmaster/postmaster.c:4801 postmaster/postmaster.c:4808
+#: port/unix_latch.c:237 port/pg_latch.c:237
+#: replication/libpqwalreceiver/libpqwalreceiver.c:233
 #, c-format
-msgid "could not read from backend variables file \"%s\": %s\n"
-msgstr "no se pudo leer el archivo de variables de servidor «%s»: %s\n"
+msgid "select() failed: %m"
+msgstr "select() fallida: %m"
 
-#: postmaster/postmaster.c:4817
+#: port/win32_sema.c:94
 #, c-format
-msgid "could not remove file \"%s\": %s\n"
-msgstr "no se pudo eliminar el archivo «%s»: %s\n"
+msgid "could not create semaphore: error code %d"
+msgstr "no se pudo crear semáforo: código de error %d"
 
-#: postmaster/postmaster.c:4834
+#: port/win32_sema.c:161
 #, c-format
-msgid "could not map view of backend variables: error code %d\n"
-msgstr ""
-"no se pudo mapear la vista del archivo de variables: código de error %d\n"
+msgid "could not lock semaphore: error code %d"
+msgstr "no se pudo bloquear semáforo: código de error %d"
 
-#: postmaster/postmaster.c:4843
+#: port/win32_sema.c:174
 #, c-format
-msgid "could not unmap view of backend variables: error code %d\n"
+msgid "could not unlock semaphore: error code %d"
+msgstr "no se pudo desbloquear semáforo: código de error %d"
+
+#: port/win32_sema.c:203
+#, c-format
+msgid "could not try-lock semaphore: error code %d"
 msgstr ""
-"no se pudo desmapear la vista del archivo de variables: código de error %d\n"
+"no se pudo intentar-bloquear (try-lock) el semáforo: código de error %d"
 
-#: postmaster/postmaster.c:4850
+#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
 #, c-format
-msgid "could not close handle to backend parameter variables: error code %d\n"
+msgid "could not create shared memory segment: %lu"
+msgstr "no se pudo crear el segmento de memoria compartida: %lu"
+
+#: port/win32_shmem.c:169
+#, c-format
+msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
+msgstr "La llamada a sistema fallida fue CreateFileMapping(size=%lu, name=%s)."
+
+#: port/win32_shmem.c:193
+msgid "pre-existing shared memory block is still in use"
+msgstr "el bloque de memoria compartida preexistente aún está en uso"
+
+#: port/win32_shmem.c:194
+msgid ""
+"Check if there are any old server processes still running, and terminate "
+"them."
 msgstr ""
-"no se pudo cerrar el archivo de variables de servidor: código de error %d\n"
+"Verifique si hay procesos de servidor antiguos aún en funcionamiento, y "
+"termínelos."
 
-#: postmaster/postmaster.c:4993
-msgid "could not read exit code for process\n"
-msgstr "no se pudo leer el código de salida del proceso\n"
+#: port/win32_shmem.c:204
+msgid "Failed system call was DuplicateHandle."
+msgstr "La llamada a sistema fallida fue DuplicateHandle."
 
-#: postmaster/postmaster.c:4998
-msgid "could not post child completion status\n"
-msgstr "no se pudo publicar el estado de completitud del proceso hijo\n"
+#: port/win32_shmem.c:225
+msgid "Failed system call was MapViewOfFileEx."
+msgstr "La llamada a sistema fallida fue MapViewOfFileEx."
 
-#: postmaster/syslogger.c:387
+#: postmaster/autovacuum.c:359
 #, c-format
-msgid "select() failed in logger process: %m"
-msgstr "select() falló en proceso de log: %m"
+msgid "could not fork autovacuum launcher process: %m"
+msgstr "no se pudo iniciar el lanzador autovacuum: %m"
 
-#: postmaster/syslogger.c:399 postmaster/syslogger.c:973
-#, c-format
-msgid "could not read from logger pipe: %m"
-msgstr "no se pudo leer desde la tubería de log: %m"
+#: postmaster/autovacuum.c:404
+msgid "autovacuum launcher started"
+msgstr "lanzador de autovacuum iniciado"
 
-#: postmaster/syslogger.c:446
-msgid "logger shutting down"
-msgstr "apagando proceso de log"
+#: postmaster/autovacuum.c:760
+msgid "autovacuum launcher shutting down"
+msgstr "apagando lanzador de autovacuum"
 
-#: postmaster/syslogger.c:490 postmaster/syslogger.c:504
+#: postmaster/autovacuum.c:1395
 #, c-format
-msgid "could not create pipe for syslog: %m"
-msgstr "no se pudo crear la tubería para syslog: %m"
+msgid "could not fork autovacuum worker process: %m"
+msgstr "no se pudo lanzar el proceso «autovacuum worker»: %m"
 
-#: postmaster/syslogger.c:524 postmaster/syslogger.c:1012
+#: postmaster/autovacuum.c:1604
 #, c-format
-msgid "could not create log file \"%s\": %m"
-msgstr "no se pudo crear archivo de log «%s»: %m"
+msgid "autovacuum: processing database \"%s\""
+msgstr "autovacuum: procesando la base de datos «%s»"
 
-#: postmaster/syslogger.c:539
+#: postmaster/autovacuum.c:2007
 #, c-format
-msgid "could not fork system logger: %m"
-msgstr "no se pudo crear el proceso de log: %m"
+msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autovacuum: eliminando la tabla temporal huérfana «%s».«%s» en la base de "
+"datos «%s»"
 
-#: postmaster/syslogger.c:570
+#: postmaster/autovacuum.c:2019
 #, c-format
-msgid "could not redirect stdout: %m"
-msgstr "no se pudo redirigir stdout: %m"
+msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autovacuum: se encontró una tabla temporal huérfana «%s».«%s» en la base de "
+"datos «%s»"
 
-#: postmaster/syslogger.c:575 postmaster/syslogger.c:593
+#: postmaster/autovacuum.c:2289
 #, c-format
-msgid "could not redirect stderr: %m"
-msgstr "no se pudo redirigir stderr: %m"
+msgid "automatic vacuum of table \"%s.%s.%s\""
+msgstr "vacuum automático de la tabla «%s.%s.%s»"
 
-#: postmaster/syslogger.c:928
+#: postmaster/autovacuum.c:2292
 #, c-format
-msgid "could not write to log file: %s\n"
-msgstr "no se pudo escribir al archivo de log: %s\n"
+msgid "automatic analyze of table \"%s.%s.%s\""
+msgstr "análisis automático de la tabla «%s.%s.%s»"
 
-#: postmaster/syslogger.c:1083 postmaster/syslogger.c:1141
-#, c-format
-msgid "could not open new log file \"%s\": %m"
-msgstr "no se pudo abrir el nuevo archivo de log «%s»: %m"
+#: postmaster/autovacuum.c:2778
+msgid "autovacuum not started because of misconfiguration"
+msgstr "autovacuum no fue iniciado debido a un error de configuración"
 
-#: postmaster/syslogger.c:1095 postmaster/syslogger.c:1153
-msgid "disabling automatic rotation (use SIGHUP to re-enable)"
-msgstr "desactivando rotación automática (use SIGHUP para reactivarla)"
+#: postmaster/autovacuum.c:2779
+msgid "Enable the \"track_counts\" option."
+msgstr "Active la opción «track_counts»."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:100
+#: postmaster/bgwriter.c:482
 #, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "no se pudo hacer la conexión al servidor primario: %s"
+msgid "checkpoints are occurring too frequently (%d second apart)"
+msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
+msgstr[0] ""
+"los puntos de control están ocurriendo con demasiada frecuencia (cada %d "
+"segundo)"
+msgstr[1] ""
+"los puntos de control están ocurriendo con demasiada frecuencia (cada %d "
+"segundos)"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:112
-#, c-format
+#: postmaster/bgwriter.c:486
 msgid ""
-"could not receive database system identifier and timeline ID from the "
-"primary server: %s"
+"Consider increasing the configuration parameter \"checkpoint_segments\"."
 msgstr ""
-"no se pudo recibir el identificador de sistema y el ID de timeline del "
-"servidor primario: %s"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:123
-msgid "invalid response from primary server"
-msgstr "respuesta no válida del servidor primario"
+"Considere incrementar el parámetro de configuración «checkpoint_segments»."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:124
+#: postmaster/bgwriter.c:598
 #, c-format
-msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
-msgstr ""
-"Se esperaba 1 tupla con 2 campos, se obtuvieron %d tuplas con %d campos."
+msgid "transaction log switch forced (archive_timeout=%d)"
+msgstr "cambio forzado de registro de transacción (archive_timeout=%d)"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:139
-msgid "database system identifier differs between the primary and standby"
-msgstr "el identificador de sistema difiere entre el primario y el standby"
+#: postmaster/bgwriter.c:1056
+msgid "checkpoint request failed"
+msgstr "falló la petición de punto de control"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:140
-#, c-format
-msgid "The primary's identifier is %s, the standby's identifier is %s."
+#: postmaster/bgwriter.c:1057
+msgid "Consult recent messages in the server log for details."
 msgstr ""
-"El identificador del primario es %s, el identificador del standby es %s."
+"Vea los mensajes recientes en el registro del servidor para obtener más "
+"detalles."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:152
+#: postmaster/bgwriter.c:1223
 #, c-format
-msgid "timeline %u of the primary does not match recovery target timeline %u"
-msgstr ""
-"el timeline %u del primario no coincide con el timeline destino de "
-"recuperación %u"
+msgid "compacted fsync request queue from %d entries to %d entries"
+msgstr "la cola de peticiones de fsync fue compactada de %d a %d elementos"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:164
+#: postmaster/pgarch.c:158
 #, c-format
-msgid "could not start WAL streaming: %s"
-msgstr "no se pudo iniciar el flujo de WAL: %s"
+msgid "could not fork archiver: %m"
+msgstr "no se pudo lanzar el proceso archivador: %m"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:171
-msgid "streaming replication successfully connected to primary"
-msgstr "la replicación en flujo se ha conectado exitosamente al primario"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:193
-msgid "socket not open"
-msgstr "el socket no está abierto"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:233
-#, c-format
-msgid "select() failed: %m"
-msgstr "select() fallida: %m"
+#: postmaster/pgarch.c:450
+msgid "archive_mode enabled, yet archive_command is not set"
+msgstr "archive_mode activado, pero archive_command no está definido"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:364
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
-#: replication/libpqwalreceiver/libpqwalreceiver.c:391
+#: postmaster/pgarch.c:465
 #, c-format
-msgid "could not receive data from WAL stream: %s"
-msgstr "no se pudo recibir datos desde el flujo de WAL: %s"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:382
-msgid "replication terminated by primary server"
-msgstr "replicación terminada por el servidor primario"
-
-#: replication/walreceiver.c:138
-msgid "terminating walreceiver process due to administrator command"
-msgstr "terminando el proceso walreceiver debido a una orden del administrador"
-
-#: replication/walreceiver.c:287
-msgid "cannot continue WAL streaming, recovery has already ended"
-msgstr "no se puede continuar el flujo de WAL; la recuperación ya ha terminado"
-
-#: replication/walsender.c:116
-msgid "recovery is still in progress, can't accept WAL streaming connections"
+msgid "transaction log file \"%s\" could not be archived: too many failures"
 msgstr ""
-"la recuperación aún está en proceso; no se pueden aceptar conexiones de "
-"flujos de WAL"
-
-#: replication/walsender.c:278
-msgid "standby connections not allowed because wal_level=minimal"
-msgstr "las conexiones standby no están permitidas porque wal_level=minimal"
+"el archivo de transacción «%s» no pudo ser archivado: demasiadas fallas"
 
-#: replication/walsender.c:300
+#: postmaster/pgarch.c:568
 #, c-format
-msgid "invalid standby query string: %s"
-msgstr "la cadena de consulta de standby no es válida: %s"
-
-#: replication/walsender.c:313 replication/walsender.c:339
-msgid "unexpected EOF on standby connection"
-msgstr "se encontró fin de archivo inesperado en la conexión standby"
+msgid "archive command failed with exit code %d"
+msgstr "la orden de archivado falló con código de retorno %d"
 
-#: replication/walsender.c:319
+#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
+#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
 #, c-format
-msgid "invalid standby handshake message type %d"
-msgstr "el tipo %d de mensaje de saludo del standby no es válido"
+msgid "The failed archive command was: %s"
+msgstr "La orden fallida era: «%s»"
 
-#: replication/walsender.c:360
+#: postmaster/pgarch.c:577
 #, c-format
-msgid "invalid standby closing message type %d"
-msgstr "el tipo %d de mensaje de cierre del standby no es válido"
+msgid "archive command was terminated by exception 0x%X"
+msgstr "la orden de archivado fue terminada por una excepción 0x%X"
 
-#: replication/walsender.c:506
-#, c-format
+#: postmaster/pgarch.c:579 postmaster/postmaster.c:2871
 msgid ""
-"number of requested standby connections exceeds max_wal_senders (currently "
-"%d)"
+"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr ""
-"la cantidad de conexiones standby pedidas excede max_wal_senders "
-"(actualmente %d)"
+"Vea el archivo «ntstatus.h» para una descripción del valor hexadecimal."
 
-#: replication/walsender.c:578 replication/walsender.c:640
+#: postmaster/pgarch.c:584
 #, c-format
-msgid "requested WAL segment %s has already been removed"
-msgstr "el segmento de WAL solicitado %s ya ha sido eliminado"
+msgid "archive command was terminated by signal %d: %s"
+msgstr "la orden de archivado fue terminada por una señal %d: %s"
 
-#: replication/walsender.c:611
+#: postmaster/pgarch.c:591
 #, c-format
-msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
-msgstr ""
-"no se pudo leer desde el archivo de registro %u, segmento %u en la posición "
-"%u, largo %lu: %m"
+msgid "archive command was terminated by signal %d"
+msgstr "la orden de archivado fue terminada por una señal %d"
 
-#: rewrite/rewriteDefine.c:108 rewrite/rewriteDefine.c:756
+#: postmaster/pgarch.c:600
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" already exists"
-msgstr "ya existe una regla llamada «%s» para la relación «%s»"
-
-#: rewrite/rewriteDefine.c:282
-msgid "rule actions on OLD are not implemented"
-msgstr "las acciones de regla en OLD no están implementadas"
-
-#: rewrite/rewriteDefine.c:283
-msgid "Use views or triggers instead."
-msgstr "Use vistas o triggers en su lugar."
-
-#: rewrite/rewriteDefine.c:287
-msgid "rule actions on NEW are not implemented"
-msgstr "las acciones de regla en NEW no están implementadas"
+msgid "archive command exited with unrecognized status %d"
+msgstr "la orden de archivado fue terminada con código no reconocido %d"
 
-#: rewrite/rewriteDefine.c:288
-msgid "Use triggers instead."
-msgstr "Use triggers en su lugar."
+#: postmaster/pgarch.c:612
+#, c-format
+msgid "archived transaction log file \"%s\""
+msgstr "el archivo de registro «%s» ha sido archivado"
 
-#: rewrite/rewriteDefine.c:301
-msgid "INSTEAD NOTHING rules on SELECT are not implemented"
-msgstr "las reglas INSTEAD NOTHING en SELECT no están implementadas"
+#: postmaster/pgarch.c:661
+#, c-format
+msgid "could not open archive status directory \"%s\": %m"
+msgstr "no se pudo abrir el directorio de estado de archivado «%s»: %m"
 
-#: rewrite/rewriteDefine.c:302
-msgid "Use views instead."
-msgstr "Use vistas en su lugar."
+#: postmaster/pgstat.c:330
+#, c-format
+msgid "could not resolve \"localhost\": %s"
+msgstr "no se pudo resolver «localhost»: %s"
 
-#: rewrite/rewriteDefine.c:310
-msgid "multiple actions for rules on SELECT are not implemented"
-msgstr "las reglas de múltiples acciones en SELECT no están implementadas"
+#: postmaster/pgstat.c:353
+msgid "trying another address for the statistics collector"
+msgstr "intentando otra dirección para el recolector de estadísticas"
 
-#: rewrite/rewriteDefine.c:322
-msgid "rules on SELECT must have action INSTEAD SELECT"
-msgstr "las reglas en SELECT deben tener una acción INSTEAD SELECT"
+#: postmaster/pgstat.c:362
+#, c-format
+msgid "could not create socket for statistics collector: %m"
+msgstr "no se pudo crear el socket para el recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:330
-msgid "event qualifications are not implemented for rules on SELECT"
+#: postmaster/pgstat.c:374
+#, c-format
+msgid "could not bind socket for statistics collector: %m"
 msgstr ""
-"las calificaciones de eventos no están implementadas para las reglas en "
-"SELECT"
+"no se pudo enlazar (bind) el socket para el recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:355
+#: postmaster/pgstat.c:385
 #, c-format
-msgid "\"%s\" is already a view"
-msgstr "«%s» ya es una vista"
+msgid "could not get address of socket for statistics collector: %m"
+msgstr "no se pudo obtener la dirección del socket de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:379
+#: postmaster/pgstat.c:401
 #, c-format
-msgid "view rule for \"%s\" must be named \"%s\""
-msgstr "la regla de vista para «%s» debe llamarse «%s»"
+msgid "could not connect socket for statistics collector: %m"
+msgstr "no se pudo conectar el socket para el recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:404
+#: postmaster/pgstat.c:422
 #, c-format
-msgid "could not convert table \"%s\" to a view because it is not empty"
-msgstr "no se pudo convertir la tabla «%s» en vista porque no está vacía"
+msgid "could not send test message on socket for statistics collector: %m"
+msgstr ""
+"no se pudo enviar el mensaje de prueba al recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:411
+#: postmaster/pgstat.c:448 postmaster/pgstat.c:2996
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has triggers"
-msgstr "no se pudo convertir la tabla «%s» en vista porque tiene triggers"
+msgid "select() failed in statistics collector: %m"
+msgstr "select() falló en el recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:413
-msgid ""
-"In particular, the table cannot be involved in any foreign key relationships."
+#: postmaster/pgstat.c:463
+msgid "test message did not get through on socket for statistics collector"
 msgstr ""
-"En particular, la tabla no puede estar involucrada en relaciones de llave "
-"foránea."
+"el mensaje de prueba al recolector de estadísticas no ha sido recibido en el "
+"socket"
 
-#: rewrite/rewriteDefine.c:418
+#: postmaster/pgstat.c:478
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has indexes"
-msgstr "no se pudo convertir la tabla «%s» en vista porque tiene índices"
+msgid "could not receive test message on socket for statistics collector: %m"
+msgstr ""
+"no se pudo recibir el mensaje de prueba en el socket del recolector de "
+"estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:424
+#: postmaster/pgstat.c:488
+msgid "incorrect test message transmission on socket for statistics collector"
+msgstr ""
+"transmisión del mensaje de prueba incorrecta en el socket del recolector de "
+"estadísticas"
+
+#: postmaster/pgstat.c:511
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has child tables"
-msgstr "no se pudo convertir la tabla «%s» en vista porque tiene tablas hijas"
+msgid "could not set statistics collector socket to nonblocking mode: %m"
+msgstr "no se pudo poner el socket de estadísticas en modo no bloqueante: %m"
 
-#: rewrite/rewriteDefine.c:451
-msgid "cannot have multiple RETURNING lists in a rule"
-msgstr "no se pueden tener múltiples listas RETURNING en una regla"
+#: postmaster/pgstat.c:521
+msgid "disabling statistics collector for lack of working socket"
+msgstr "desactivando el recolector de estadísticas por falla del socket"
 
-#: rewrite/rewriteDefine.c:456
-msgid "RETURNING lists are not supported in conditional rules"
-msgstr "listas de RETURNING no están soportadas en reglas condicionales"
+#: postmaster/pgstat.c:623
+#, c-format
+msgid "could not fork statistics collector: %m"
+msgstr "no se pudo crear el proceso para el recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:460
-msgid "RETURNING lists are not supported in non-INSTEAD rules"
+#: postmaster/pgstat.c:1153 postmaster/pgstat.c:1177 postmaster/pgstat.c:1208
+msgid "must be superuser to reset statistics counters"
 msgstr ""
-"listas de RETURNING no están soportadas en reglas que no estén marcadas "
-"INSTEAD"
+"debe ser superusuario para reinicializar los contadores de estadísticas"
 
-#: rewrite/rewriteDefine.c:539
-msgid "SELECT rule's target list has too many entries"
-msgstr "la lista de destinos en la regla de SELECT tiene demasiadas entradas"
+#: postmaster/pgstat.c:1184 utils/adt/pgstatfuncs.c:1547
+#, c-format
+msgid "unrecognized reset target: \"%s\""
+msgstr "destino de reset no reconocido: «%s»"
 
-#: rewrite/rewriteDefine.c:540
-msgid "RETURNING list has too many entries"
-msgstr "la lista de RETURNING tiene demasiadas entradas"
+#: postmaster/pgstat.c:1185 utils/adt/pgstatfuncs.c:1548
+msgid "Target must be \"bgwriter\"."
+msgstr "El destino debe ser «bgwriter»."
 
-#: rewrite/rewriteDefine.c:556
-msgid "cannot convert relation containing dropped columns to view"
-msgstr ""
-"no se puede convertir en vista una relación que contiene columnas eliminadas"
+#: postmaster/pgstat.c:2975
+#, c-format
+msgid "poll() failed in statistics collector: %m"
+msgstr "poll() falló en el recolector de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:561
+#: postmaster/pgstat.c:3020
 #, c-format
-msgid "SELECT rule's target entry %d has different column name from \"%s\""
-msgstr ""
-"la entrada de destino %d de la regla de SELECT tiene un nombre de columna "
-"diferente de «%s»"
+msgid "could not read statistics message: %m"
+msgstr "no se pudo leer un mensaje de estadísticas: %m"
 
-#: rewrite/rewriteDefine.c:567
+#: postmaster/pgstat.c:3291
 #, c-format
-msgid "SELECT rule's target entry %d has different type from column \"%s\""
-msgstr ""
-"el destino %d de la regla de SELECT tiene un tipo diferente de la columna "
-"«%s»"
+msgid "could not open temporary statistics file \"%s\": %m"
+msgstr "no se pudo abrir el archivo temporal de estadísticas «%s»: %m"
 
-#: rewrite/rewriteDefine.c:569
+#: postmaster/pgstat.c:3363
 #, c-format
-msgid "RETURNING list's entry %d has different type from column \"%s\""
-msgstr ""
-"el destino %d de la lista de RETURNING tiene un tipo diferente de la columna "
-"«%s»"
+msgid "could not write temporary statistics file \"%s\": %m"
+msgstr "no se pudo escribir el archivo temporal de estadísticas «%s»: %m"
 
-#: rewrite/rewriteDefine.c:584
+#: postmaster/pgstat.c:3372
 #, c-format
-msgid "SELECT rule's target entry %d has different size from column \"%s\""
-msgstr ""
-"el destino %d de la regla de SELECT tiene un tamaño diferente de la columna "
-"«%s»"
+msgid "could not close temporary statistics file \"%s\": %m"
+msgstr "no se pudo cerrar el archivo temporal de estadísticas «%s»: %m"
 
-#: rewrite/rewriteDefine.c:586
+#: postmaster/pgstat.c:3380
 #, c-format
-msgid "RETURNING list's entry %d has different size from column \"%s\""
+msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
 msgstr ""
-"el destino %d de la lista RETURNING tiene un tamaño diferente de la columna "
-"«%s»"
+"no se pudo cambiar el nombre al archivo temporal de estadísticas de «%s» a "
+"«%s»: %m"
 
-#: rewrite/rewriteDefine.c:594
-msgid "SELECT rule's target list has too few entries"
-msgstr "la lista de destinos de regla de SELECT tiene muy pocas entradas"
+#: postmaster/pgstat.c:3486 postmaster/pgstat.c:3715
+#, c-format
+msgid "could not open statistics file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de estadísticas «%s»: %m"
 
-#: rewrite/rewriteDefine.c:595
-msgid "RETURNING list has too few entries"
-msgstr "la lista de RETURNING tiene muy pocas entradas"
+#: postmaster/pgstat.c:3498 postmaster/pgstat.c:3508 postmaster/pgstat.c:3530
+#: postmaster/pgstat.c:3545 postmaster/pgstat.c:3608 postmaster/pgstat.c:3626
+#: postmaster/pgstat.c:3642 postmaster/pgstat.c:3660 postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3727 postmaster/pgstat.c:3738
+#, c-format
+msgid "corrupted statistics file \"%s\""
+msgstr "el archivo de estadísticas «%s» está corrupto"
 
-#: rewrite/rewriteHandler.c:495
-msgid "cannot have RETURNING lists in multiple rules"
-msgstr "no se puede usar RETURNING en múltiples reglas"
+#: postmaster/pgstat.c:4036
+msgid "database hash table corrupted during cleanup --- abort"
+msgstr ""
+"el hash de bases de datos se corrompió durante la finalización; abortando"
 
-#: rewrite/rewriteHandler.c:796 rewrite/rewriteHandler.c:814
+#: postmaster/postmaster.c:572
 #, c-format
-msgid "multiple assignments to same column \"%s\""
-msgstr "hay múltiples asignaciones a la misma columna «%s»"
+msgid "%s: invalid argument for option -f: \"%s\"\n"
+msgstr "%s: argumento no válido para la opción -f: «%s»\n"
 
-#: rewrite/rewriteHandler.c:1417 rewrite/rewriteHandler.c:1740
+#: postmaster/postmaster.c:658
 #, c-format
-msgid "infinite recursion detected in rules for relation \"%s\""
-msgstr "se detectó recursión infinita en las reglas de la relación «%s»"
+msgid "%s: invalid argument for option -t: \"%s\"\n"
+msgstr "%s: argumento no válido para la opción -t: «%s»\n"
 
-#: rewrite/rewriteHandler.c:1778
+#: postmaster/postmaster.c:709
 #, c-format
-msgid "cannot perform INSERT RETURNING on relation \"%s\""
-msgstr "no se puede hacer INSERT RETURNING a la relación «%s»"
-
-#: rewrite/rewriteHandler.c:1780
-msgid ""
-"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
-msgstr ""
-"Necesita un regla incondicional ON INSERT DO INSTEAD con una cláusula "
-"RETURNING."
+msgid "%s: invalid argument: \"%s\"\n"
+msgstr "%s: argumento no válido: «%s»\n"
 
-#: rewrite/rewriteHandler.c:1785
+#: postmaster/postmaster.c:734
 #, c-format
-msgid "cannot perform UPDATE RETURNING on relation \"%s\""
-msgstr "no se puede hacer UPDATE RETURNING a la relación «%s»"
+msgid "%s: superuser_reserved_connections must be less than max_connections\n"
+msgstr ""
+"%s: superuser_reserved_connections debe ser menor que max_connections\n"
 
-#: rewrite/rewriteHandler.c:1787
+#: postmaster/postmaster.c:739
 msgid ""
-"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
+"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
+"\"hot_standby\""
 msgstr ""
-"Necesita un regla incondicional ON UPDATE DO INSTEAD con una cláusula "
-"RETURNING."
-
-#: rewrite/rewriteHandler.c:1792
-#, c-format
-msgid "cannot perform DELETE RETURNING on relation \"%s\""
-msgstr "no se puede hacer DELETE RETURNING a la relación «%s»"
+"el archivado de WAL (archive_mode=on) requiere wal_level «archive» o "
+"«hot_standby»"
 
-#: rewrite/rewriteHandler.c:1794
+#: postmaster/postmaster.c:742
 msgid ""
-"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
+"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
+"\"hot_standby\""
 msgstr ""
-"Necesita un regla incondicional ON DELETE DO INSTEAD con una clásula "
-"RETURNING."
-
-#: rewrite/rewriteHandler.c:1892
-msgid "cannot insert into a view"
-msgstr "no se puede insertar en una vista"
-
-#: rewrite/rewriteHandler.c:1893
-msgid "You need an unconditional ON INSERT DO INSTEAD rule."
-msgstr "Necesita un regla incondicional ON INSERT DO INSTEAD."
-
-#: rewrite/rewriteHandler.c:1898
-msgid "cannot update a view"
-msgstr "no se puede actualizar una vista"
-
-#: rewrite/rewriteHandler.c:1899
-msgid "You need an unconditional ON UPDATE DO INSTEAD rule."
-msgstr "Necesita un regla incondicional ON UPDATE DO INSTEAD."
-
-#: rewrite/rewriteHandler.c:1904
-msgid "cannot delete from a view"
-msgstr "no se puede eliminar de una vista"
-
-#: rewrite/rewriteHandler.c:1905
-msgid "You need an unconditional ON DELETE DO INSTEAD rule."
-msgstr "Necesita un regla incondicional ON DELETE DO INSTEAD."
+"el flujo de WAL (max_wal_senders > 0) requiere wal_level «archive» o "
+"«hot_standby»"
 
-#: rewrite/rewriteManip.c:1009
-msgid "conditional utility statements are not implemented"
-msgstr "las sentencias condicionales de utilidad no están implementadas"
+#: postmaster/postmaster.c:750
+#, c-format
+msgid "%s: invalid datetoken tables, please fix\n"
+msgstr "%s: las tablas de palabras clave de fecha no son válidas, arréglelas\n"
 
-#: rewrite/rewriteManip.c:1174
-msgid "WHERE CURRENT OF on a view is not implemented"
-msgstr "WHERE CURRENT OF no está implementado en una vista"
+#: postmaster/postmaster.c:856
+msgid "invalid list syntax for \"listen_addresses\""
+msgstr "la sintaxis de lista no es válida para el parámetro «listen_addresses»"
 
-#: rewrite/rewriteRemove.c:66
+#: postmaster/postmaster.c:886
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "la regla «%s» para la relación «%s» no existe, ignorando"
+msgid "could not create listen socket for \"%s\""
+msgstr "no se pudo crear el socket de escucha para «%s»"
 
-#: utils/cache/typcache.c:331
-#, c-format
-msgid "type %s is not composite"
-msgstr "el tipo %s no es compuesto"
+#: postmaster/postmaster.c:892
+msgid "could not create any TCP/IP sockets"
+msgstr "no se pudo crear ningún socket TCP/IP"
 
-#: utils/cache/typcache.c:345
-msgid "record type has not been registered"
-msgstr "el tipo record no ha sido registrado"
+#: postmaster/postmaster.c:943
+msgid "could not create Unix-domain socket"
+msgstr "no se pudo crear el socket de dominio Unix"
 
-#: utils/cache/lsyscache.c:2234 utils/cache/lsyscache.c:2267
-#: utils/cache/lsyscache.c:2300 utils/cache/lsyscache.c:2333
-#, c-format
-msgid "type %s is only a shell"
-msgstr "el tipo %s está inconcluso"
+#: postmaster/postmaster.c:951
+msgid "no socket created for listening"
+msgstr "no se creó el socket de atención"
 
-#: utils/cache/lsyscache.c:2239
-#, c-format
-msgid "no input function available for type %s"
-msgstr "no hay una función de entrada para el tipo %s"
+#: postmaster/postmaster.c:985
+msgid "could not create I/O completion port for child queue"
+msgstr ""
+"no se pudo crear el port E/S de reporte de completitud para la cola de "
+"procesos hijos"
 
-#: utils/cache/lsyscache.c:2272
+#: postmaster/postmaster.c:1029
 #, c-format
-msgid "no output function available for type %s"
-msgstr "no hay una función de salida para el tipo %s"
+msgid "%s: could not write external PID file \"%s\": %s\n"
+msgstr "%s: no pudo escribir en el archivo externo de PID «%s»: %s\n"
 
-#: utils/cache/lsyscache.c:2305 utils/adt/arrayfuncs.c:1282
-#, c-format
-msgid "no binary input function available for type %s"
-msgstr "no hay una función binaria de entrada para el tipo %s"
+#: postmaster/postmaster.c:1097 utils/init/postinit.c:197
+msgid "could not load pg_hba.conf"
+msgstr "no se pudo cargar pg_hba.conf"
 
-#: utils/cache/lsyscache.c:2338 utils/adt/arrayfuncs.c:1504
+#: postmaster/postmaster.c:1144
 #, c-format
-msgid "no binary output function available for type %s"
-msgstr "no hay una función binaria de salida para el tipo %s"
-
-#: utils/cache/plancache.c:589
-msgid "cached plan must not change result type"
-msgstr "el plan almacenado no debe cambiar el tipo de resultado"
+msgid "%s: could not locate matching postgres executable"
+msgstr "%s: no se pudo localizar el ejecutable postgres correspondiente"
 
-#: utils/cache/relcache.c:4289
+#: postmaster/postmaster.c:1167 utils/misc/tzparser.c:325
 #, c-format
-msgid "could not create relation-cache initialization file \"%s\": %m"
-msgstr "no se pudo crear el archivo de cache de catálogos de sistema «%s»: %m"
-
-#: utils/cache/relcache.c:4291
-msgid "Continuing anyway, but there's something wrong."
-msgstr "Prosiguiendo de todas maneras, pero hay algo mal."
-
-#: utils/cache/relmapper.c:454
-msgid "cannot PREPARE a transaction that modified relation mapping"
+msgid ""
+"This may indicate an incomplete PostgreSQL installation, or that the file "
+"\"%s\" has been moved away from its proper location."
 msgstr ""
-"no se puede hacer PREPARE de una transacción que ha modificado el mapeo de "
-"relaciones"
+"Esto puede indicar una instalación de PostgreSQL incompleta, o que el "
+"archivo «%s» ha sido movido de la ubicación adecuada."
 
-#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
+#: postmaster/postmaster.c:1195
 #, c-format
-msgid "could not open relation mapping file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de mapeo de relaciones «%s»: %m"
+msgid "data directory \"%s\" does not exist"
+msgstr "no existe el directorio de datos «%s»"
 
-#: utils/cache/relmapper.c:609
+#: postmaster/postmaster.c:1200
 #, c-format
-msgid "could not read relation mapping file \"%s\": %m"
-msgstr "no se pudo leer el archivo de mapeo de relaciones «%s»: %m"
+msgid "could not read permissions of directory \"%s\": %m"
+msgstr "no se pudo obtener los permisos del directorio «%s»: %m"
 
-#: utils/cache/relmapper.c:619
+#: postmaster/postmaster.c:1208
 #, c-format
-msgid "relation mapping file \"%s\" contains invalid data"
-msgstr "el archivo de mapeo de relaciones «%s» contiene datos no válidos"
+msgid "specified data directory \"%s\" is not a directory"
+msgstr "el directorio de datos especificado «%s» no es un directorio"
 
-#: utils/cache/relmapper.c:629
+#: postmaster/postmaster.c:1224
 #, c-format
-msgid "relation mapping file \"%s\" contains incorrect checksum"
+msgid "data directory \"%s\" has wrong ownership"
+msgstr "el directorio de datos «%s» tiene dueño equivocado"
+
+#: postmaster/postmaster.c:1226
+msgid "The server must be started by the user that owns the data directory."
 msgstr ""
-"el archivo de mapeo de relaciones «%s» tiene una suma de verificación "
-"incorrecta"
+"El servidor debe ser iniciado por el usuario dueño del directorio de datos."
 
-#: utils/cache/relmapper.c:741
+#: postmaster/postmaster.c:1246
 #, c-format
-msgid "could not write to relation mapping file \"%s\": %m"
-msgstr "no se pudo escribir el archivo de mapeo de relaciones «%s»: %m"
+msgid "data directory \"%s\" has group or world access"
+msgstr "el directorio de datos «%s» tiene acceso para el grupo u otros"
 
-#: utils/cache/relmapper.c:754
-#, c-format
-msgid "could not fsync relation mapping file \"%s\": %m"
-msgstr ""
-"no se pudo sincronizar (fsync) el archivo de mapeo de relaciones «%s»: %m"
+#: postmaster/postmaster.c:1248
+msgid "Permissions should be u=rwx (0700)."
+msgstr "Los permisos deberían ser u=rwx (0700)."
 
-#: utils/cache/relmapper.c:760
+#: postmaster/postmaster.c:1259
 #, c-format
-msgid "could not close relation mapping file \"%s\": %m"
-msgstr "no se pudo cerrar el archivo de mapeo de relaciones «%s»: %m"
+msgid ""
+"%s: could not find the database system\n"
+"Expected to find it in the directory \"%s\",\n"
+"but could not open file \"%s\": %s\n"
+msgstr ""
+"%s: no se pudo encontrar el sistema de base de datos.\n"
+"Se esperaba encontrar en el directorio PGDATA «%s»,\n"
+"pero no se pudo abrir el archivo «%s»: %s\n"
 
-#: utils/sort/logtape.c:213
+#: postmaster/postmaster.c:1295
 #, c-format
-msgid "could not write block %ld of temporary file: %m"
-msgstr "no se pudo escribir el bloque %ld del archivo temporal: %m"
-
-#: utils/sort/logtape.c:215
-msgid "Perhaps out of disk space?"
-msgstr "¿Quizás se agotó el espacio en disco?"
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: no se pudo abrir el archivo «%s»: %s\n"
 
-#: utils/sort/logtape.c:232
+#: postmaster/postmaster.c:1302
 #, c-format
-msgid "could not read block %ld of temporary file: %m"
-msgstr "no se pudo leer el bloque %ld del archivo temporal: %m"
+msgid "%s: could not open log file \"%s/%s\": %s\n"
+msgstr "%s: no se pudo abrir archivo de log «%s/%s»: %s\n"
 
-#: utils/sort/tuplesort.c:2806
+#: postmaster/postmaster.c:1313
 #, c-format
-msgid "could not create unique index \"%s\""
-msgstr "no se pudo crear el índice único «%s»"
+msgid "%s: could not fork background process: %s\n"
+msgstr "%s: no se pudo lanzar el proceso en segundo plano: %s\n"
 
-#: utils/sort/tuplesort.c:2808
+#: postmaster/postmaster.c:1335
 #, c-format
-msgid "Key %s is duplicated."
-msgstr "La llave %s está duplicada."
+msgid "%s: could not dissociate from controlling TTY: %s\n"
+msgstr "%s: no se pudo disociar del TTY de control: %s\n"
 
-#: utils/mmgr/aset.c:409
+#: postmaster/postmaster.c:1430
 #, c-format
-msgid "Failed while creating memory context \"%s\"."
-msgstr "Falla al crear el contexto de memoria «%s»."
+msgid "select() failed in postmaster: %m"
+msgstr "select() falló en postmaster: %m"
 
-#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:771 utils/mmgr/aset.c:977
-#, c-format
-msgid "Failed on request of size %lu."
-msgstr "Falla en petición de tamaño %lu."
+#: postmaster/postmaster.c:1592 postmaster/postmaster.c:1623
+msgid "incomplete startup packet"
+msgstr "el paquete de inicio está incompleto"
 
-#: utils/mmgr/portalmem.c:207
-#, c-format
-msgid "cursor \"%s\" already exists"
-msgstr "el cursor «%s» ya existe"
+#: postmaster/postmaster.c:1604
+msgid "invalid length of startup packet"
+msgstr "el de paquete de inicio tiene largo incorrecto"
 
-#: utils/mmgr/portalmem.c:211
+#: postmaster/postmaster.c:1661
 #, c-format
-msgid "closing existing cursor \"%s\""
-msgstr "cerrando el cursor «%s» preexistente"
+msgid "failed to send SSL negotiation response: %m"
+msgstr "no se pudo enviar la respuesta de negociación SSL: %m"
 
-#: utils/mmgr/portalmem.c:422
+#: postmaster/postmaster.c:1690
 #, c-format
-msgid "cannot drop active portal \"%s\""
-msgstr "no se puede eliminar el portal activo «%s»"
-
-#: utils/mmgr/portalmem.c:627
-msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
+msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
-"no se puede hacer PREPARE de una transacción que ha creado un cursor WITH "
-"HOLD"
+"el protocolo %u.%u no está soportado: servidor soporta %u.0 hasta %u.%u"
 
-#: utils/adt/xml.c:135
-msgid "unsupported XML feature"
-msgstr "característica XML no soportada"
+#: postmaster/postmaster.c:1741
+msgid "invalid value for boolean option \"replication\""
+msgstr "valor no válido para la opción booleana «replication»"
 
-#: utils/adt/xml.c:136
-msgid "This functionality requires the server to be built with libxml support."
+#: postmaster/postmaster.c:1761
+msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr ""
-"Esta funcionalidad requiere que el servidor haya sido construido con soporte "
-"libxml."
+"el paquete de inicio no es válido: se esperaba un terminador en el último "
+"byte"
 
-#: utils/adt/xml.c:137
-msgid "You need to rebuild PostgreSQL using --with-libxml."
-msgstr "Necesita reconstruir PostgreSQL usando --with-libxml."
+#: postmaster/postmaster.c:1789
+msgid "no PostgreSQL user name specified in startup packet"
+msgstr "no se especifica un nombre de usuario en el paquete de inicio"
 
-#: utils/adt/xml.c:156 utils/mb/mbutils.c:476
-#, c-format
-msgid "invalid encoding name \"%s\""
-msgstr "nombre de codificación «%s» no válido"
+#: postmaster/postmaster.c:1846
+msgid "the database system is starting up"
+msgstr "el sistema de base de datos está iniciándose"
 
-#: utils/adt/xml.c:402 utils/adt/xml.c:407
-msgid "invalid XML comment"
-msgstr "comentario XML no válido"
+#: postmaster/postmaster.c:1851
+msgid "the database system is shutting down"
+msgstr "el sistema de base de datos está apagándose"
 
-#: utils/adt/xml.c:536
-msgid "not an XML document"
-msgstr "no es un documento XML"
+#: postmaster/postmaster.c:1856
+msgid "the database system is in recovery mode"
+msgstr "el sistema de base de datos está en modo de recuperación"
 
-#: utils/adt/xml.c:689 utils/adt/xml.c:712
-msgid "invalid XML processing instruction"
-msgstr "instrucción de procesamiento XML no válida"
+#: postmaster/postmaster.c:1923
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "llave incorrecta en la petición de cancelación para el proceso %d"
 
-#: utils/adt/xml.c:690
+#: postmaster/postmaster.c:1931
 #, c-format
-msgid "XML processing instruction target name cannot be \"%s\"."
+msgid "PID %d in cancel request did not match any process"
 msgstr ""
-"el nombre de destino de la instrucción de procesamiento XML no puede ser "
-"«%s»."
+"el PID %d en la petición de cancelación no coincidió con ningún proceso"
 
-#: utils/adt/xml.c:713
-msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "la instrucción de procesamiento XML no puede contener «?>»."
+#: postmaster/postmaster.c:2137
+msgid "received SIGHUP, reloading configuration files"
+msgstr "se recibió SIGHUP, releyendo el archivo de configuración"
 
-#: utils/adt/xml.c:792
-msgid "xmlvalidate is not implemented"
-msgstr "xmlvalidate no está implementado"
+#: postmaster/postmaster.c:2160
+msgid "pg_hba.conf not reloaded"
+msgstr "pg_hba.conf no ha sido recargado"
 
-#: utils/adt/xml.c:877
-msgid "could not initialize XML library"
-msgstr "no se pudo inicializar la biblioteca XML"
+#: postmaster/postmaster.c:2203
+msgid "received smart shutdown request"
+msgstr "se recibió petición de apagado inteligente"
 
-#: utils/adt/xml.c:878
-#, c-format
-msgid ""
-"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
-msgstr ""
-"libxml2 tiene tipo char incompatible: sizeof(char)=%u, sizeof(xmlChar)=%u."
+#: postmaster/postmaster.c:2250
+msgid "received fast shutdown request"
+msgstr "se recibió petición de apagado rápido"
 
-#: utils/adt/xml.c:1417
-msgid "Invalid character value."
-msgstr "Valor de carácter no válido."
-
-#: utils/adt/xml.c:1420
-msgid "Space required."
-msgstr "Se requiere un espacio."
-
-#: utils/adt/xml.c:1423
-msgid "standalone accepts only 'yes' or 'no'."
-msgstr "standalone acepta sólo 'yes' y 'no'."
+#: postmaster/postmaster.c:2268
+msgid "aborting any active transactions"
+msgstr "abortando transacciones activas"
 
-#: utils/adt/xml.c:1426
-msgid "Malformed declaration: missing version."
-msgstr "Declaración mal formada: falta la versión."
+#: postmaster/postmaster.c:2297
+msgid "received immediate shutdown request"
+msgstr "se recibió petición de apagado inmediato"
 
-#: utils/adt/xml.c:1429
-msgid "Missing encoding in text declaration."
-msgstr "Falta especificación de codificación en declaración de texto."
+#: postmaster/postmaster.c:2373 postmaster/postmaster.c:2401
+msgid "startup process"
+msgstr "proceso de inicio"
 
-#: utils/adt/xml.c:1432
-msgid "Parsing XML declaration: '?>' expected."
-msgstr "Procesando declaración XML: se esperaba '?>'."
+#: postmaster/postmaster.c:2376
+msgid "aborting startup due to startup process failure"
+msgstr "abortando el inicio debido a una falla en el procesamiento de inicio"
 
-#: utils/adt/xml.c:1435
-#, c-format
-msgid "Unrecognized libxml error code: %d."
-msgstr "Código de error libxml no reconocido: %d."
+#: postmaster/postmaster.c:2435
+msgid "database system is ready to accept connections"
+msgstr "el sistema de bases de datos está listo para aceptar conexiones"
 
-#: utils/adt/xml.c:1688 utils/adt/date.c:217
-msgid "date out of range"
-msgstr "la fecha fuera de rango"
+#: postmaster/postmaster.c:2490
+msgid "background writer process"
+msgstr "proceso background writer"
 
-#: utils/adt/xml.c:1689
-msgid "XML does not support infinite date values."
-msgstr "XML no soporta valores infinitos de fecha."
+#: postmaster/postmaster.c:2506
+msgid "WAL writer process"
+msgstr "proceso escritor de WAL"
 
-#: utils/adt/xml.c:1711 utils/adt/xml.c:1718 utils/adt/xml.c:1738
-#: utils/adt/xml.c:1745 utils/adt/date.c:880 utils/adt/date.c:927
-#: utils/adt/date.c:1483 utils/adt/date.c:1520 utils/adt/date.c:2394
-#: utils/adt/formatting.c:2956 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3056 utils/adt/nabstime.c:480
-#: utils/adt/nabstime.c:523 utils/adt/nabstime.c:553 utils/adt/nabstime.c:596
-#: utils/adt/timestamp.c:226 utils/adt/timestamp.c:269
-#: utils/adt/timestamp.c:491 utils/adt/timestamp.c:531
-#: utils/adt/timestamp.c:2530 utils/adt/timestamp.c:2551
-#: utils/adt/timestamp.c:2564 utils/adt/timestamp.c:2573
-#: utils/adt/timestamp.c:2631 utils/adt/timestamp.c:2654
-#: utils/adt/timestamp.c:2667 utils/adt/timestamp.c:2678
-#: utils/adt/timestamp.c:3114 utils/adt/timestamp.c:3244
-#: utils/adt/timestamp.c:3285 utils/adt/timestamp.c:3373
-#: utils/adt/timestamp.c:3420 utils/adt/timestamp.c:3531
-#: utils/adt/timestamp.c:3844 utils/adt/timestamp.c:3981
-#: utils/adt/timestamp.c:3988 utils/adt/timestamp.c:4002
-#: utils/adt/timestamp.c:4012 utils/adt/timestamp.c:4075
-#: utils/adt/timestamp.c:4215 utils/adt/timestamp.c:4225
-#: utils/adt/timestamp.c:4440 utils/adt/timestamp.c:4519
-#: utils/adt/timestamp.c:4526 utils/adt/timestamp.c:4553
-#: utils/adt/timestamp.c:4557 utils/adt/timestamp.c:4614
-msgid "timestamp out of range"
-msgstr "el timestamp está fuera de rango"
+#: postmaster/postmaster.c:2520
+msgid "WAL receiver process"
+msgstr "proceso receptor de WAL"
 
-#: utils/adt/xml.c:1712 utils/adt/xml.c:1739
-msgid "XML does not support infinite timestamp values."
-msgstr "XML no soporta valores infinitos de timestamp."
+#: postmaster/postmaster.c:2535
+msgid "autovacuum launcher process"
+msgstr "proceso lanzador de autovacuum"
 
-#: utils/adt/xml.c:2123
-msgid "invalid query"
-msgstr "consulta no válido"
+#: postmaster/postmaster.c:2550
+msgid "archiver process"
+msgstr "proceso de archivado"
 
-#: utils/adt/xml.c:3352
-msgid "invalid array for XML namespace mapping"
-msgstr "array no válido para mapeo de espacio de nombres XML"
+#: postmaster/postmaster.c:2566
+msgid "statistics collector process"
+msgstr "recolector de estadísticas"
 
-#: utils/adt/xml.c:3353
-msgid ""
-"The array must be two-dimensional with length of the second axis equal to 2."
-msgstr "El array debe ser bidimensional y el largo del segundo eje igual a 2."
+#: postmaster/postmaster.c:2580
+msgid "system logger process"
+msgstr "proceso de log"
 
-#: utils/adt/xml.c:3377
-msgid "empty XPath expression"
-msgstr "expresion XPath vacía"
+#: postmaster/postmaster.c:2615 postmaster/postmaster.c:2634
+#: postmaster/postmaster.c:2641 postmaster/postmaster.c:2659
+msgid "server process"
+msgstr "proceso de servidor"
 
-#: utils/adt/xml.c:3425
-msgid "neither namespace name nor URI may be null"
-msgstr "ni el espacio de nombres ni la URI pueden ser vacíos"
+#: postmaster/postmaster.c:2695
+msgid "terminating any other active server processes"
+msgstr "terminando todos los otros procesos de servidor activos"
 
-#: utils/adt/xml.c:3432
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2860
 #, c-format
-msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
-msgstr ""
-"no se pudo registrar un espacio de nombres XML llamado «%s» con URI «%s»"
-
-#: utils/adt/acl.c:164 utils/adt/name.c:87
-msgid "identifier too long"
-msgstr "el identificador es demasiado largo"
+msgid "%s (PID %d) exited with exit code %d"
+msgstr "%s (PID %d) terminó con código de salida %d"
 
-#: utils/adt/acl.c:165 utils/adt/name.c:88
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2869
 #, c-format
-msgid "Identifier must be less than %d characters."
-msgstr "El identificador debe ser menor a %d caracteres."
+msgid "%s (PID %d) was terminated by exception 0x%X"
+msgstr "%s (PID %d) fue terminado por una excepción 0x%X"
 
-#: utils/adt/acl.c:251
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2878
 #, c-format
-msgid "unrecognized key word: \"%s\""
-msgstr "palabra clave no reconocida: «%s»"
-
-#: utils/adt/acl.c:252
-msgid "ACL key word must be \"group\" or \"user\"."
-msgstr "Palabra clave de ACL debe ser «group» o «user»."
-
-#: utils/adt/acl.c:257
-msgid "missing name"
-msgstr "falta un nombre"
-
-#: utils/adt/acl.c:258
-msgid "A name must follow the \"group\" or \"user\" key word."
-msgstr "Debe venir un nombre después de una palabra clave «group» o «user»."
-
-#: utils/adt/acl.c:264
-msgid "missing \"=\" sign"
-msgstr "falta un signo «=»"
+msgid "%s (PID %d) was terminated by signal %d: %s"
+msgstr "%s (PID %d) fue terminado por una señal %d: %s"
 
-#: utils/adt/acl.c:317
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2888
 #, c-format
-msgid "invalid mode character: must be one of \"%s\""
-msgstr "carácter de modo no válido: debe ser uno de «%s»"
-
-#: utils/adt/acl.c:339
-msgid "a name must follow the \"/\" sign"
-msgstr "debe venir un nombre después del signo «/»"
+msgid "%s (PID %d) was terminated by signal %d"
+msgstr "%s (PID %d) fue terminado por una señal %d"
 
-#: utils/adt/acl.c:347
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2897
 #, c-format
-msgid "defaulting grantor to user ID %u"
-msgstr "usando el cedente por omisión con ID %u"
+msgid "%s (PID %d) exited with unrecognized status %d"
+msgstr "%s (PID %d) terminó con código no reconocido %d"
 
-#: utils/adt/acl.c:538
-msgid "ACL array contains wrong data type"
-msgstr "el array ACL contiene tipo de datos incorrecto"
+#: postmaster/postmaster.c:3077
+msgid "abnormal database system shutdown"
+msgstr "apagado anormal del sistema de bases de datos"
 
-#: utils/adt/acl.c:542
-msgid "ACL arrays must be one-dimensional"
-msgstr "los array de ACL debe ser unidimensional"
+#: postmaster/postmaster.c:3116
+msgid "all server processes terminated; reinitializing"
+msgstr "todos los procesos fueron terminados; reinicializando"
 
-#: utils/adt/acl.c:546
-msgid "ACL arrays must not contain null values"
-msgstr "los arrays de ACL no pueden contener valores nulos"
+#: postmaster/postmaster.c:3299
+#, c-format
+msgid "could not fork new process for connection: %m"
+msgstr "no se pudo lanzar el nuevo proceso para la conexión: %m"
 
-#: utils/adt/acl.c:570
-msgid "extra garbage at the end of the ACL specification"
-msgstr "basura extra al final de la especificación de la ACL"
+#: postmaster/postmaster.c:3341
+msgid "could not fork new process for connection: "
+msgstr "no se pudo lanzar el nuevo proceso para la conexión: "
 
-#: utils/adt/acl.c:1127
-msgid "grant options cannot be granted back to your own grantor"
-msgstr "la opción de grant no puede ser otorgada de vuelta a quien la otorgó"
+#: postmaster/postmaster.c:3455
+#, c-format
+msgid "connection received: host=%s port=%s"
+msgstr "conexión recibida: host=%s port=%s"
 
-#: utils/adt/acl.c:1188
-msgid "dependent privileges exist"
-msgstr "existen privilegios dependientes"
+#: postmaster/postmaster.c:3460
+#, c-format
+msgid "connection received: host=%s"
+msgstr "conexión recibida: host=%s"
 
-#: utils/adt/acl.c:1189
-msgid "Use CASCADE to revoke them too."
-msgstr "Use CASCADE para revocarlos también."
+#: postmaster/postmaster.c:3729
+#, c-format
+msgid "could not execute server process \"%s\": %m"
+msgstr "no se pudo lanzar el proceso servidor «%s»: %m"
 
-#: utils/adt/acl.c:1468
-msgid "aclinsert is no longer supported"
-msgstr "aclinsert ya no está soportado"
+#: postmaster/postmaster.c:4246
+msgid "database system is ready to accept read only connections"
+msgstr ""
+"el sistema de bases de datos está listo para aceptar conexiones de sólo "
+"lectura"
 
-#: utils/adt/acl.c:1478
-msgid "aclremove is no longer supported"
-msgstr "aclremove ya no está soportado"
+#: postmaster/postmaster.c:4513
+#, c-format
+msgid "could not fork startup process: %m"
+msgstr "no se pudo lanzar el proceso de inicio: %m"
 
-#: utils/adt/acl.c:1564 utils/adt/acl.c:1618
+#: postmaster/postmaster.c:4517
 #, c-format
-msgid "unrecognized privilege type: \"%s\""
-msgstr "tipo de privilegio no reconocido: «%s»"
+msgid "could not fork background writer process: %m"
+msgstr "no se pudo lanzar el background writer: %m"
 
-#: utils/adt/acl.c:3364 utils/adt/regproc.c:118 utils/adt/regproc.c:139
-#: utils/adt/regproc.c:289
+#: postmaster/postmaster.c:4521
 #, c-format
-msgid "function \"%s\" does not exist"
-msgstr "no existe la función «%s»"
+msgid "could not fork WAL writer process: %m"
+msgstr "no se pudo lanzar el proceso escritor de WAL: %m"
 
-#: utils/adt/acl.c:4635
+#: postmaster/postmaster.c:4525
 #, c-format
-msgid "must be member of role \"%s\""
-msgstr "debe ser miembro del rol «%s»"
+msgid "could not fork WAL receiver process: %m"
+msgstr "no se pudo lanzar el proceso receptor de WAL: %m"
 
-#: utils/adt/array_userfuncs.c:48
-msgid "could not determine input data types"
-msgstr "no se pudo determinar el tipo de datos de entrada"
+#: postmaster/postmaster.c:4529
+#, c-format
+msgid "could not fork process: %m"
+msgstr "no se pudo lanzar el proceso: %m"
 
-#: utils/adt/array_userfuncs.c:82
-msgid "neither input type is an array"
-msgstr "ninguno de los tipos de entrada es un array"
+#: postmaster/postmaster.c:4811
+#, c-format
+msgid "could not duplicate socket %d for use in backend: error code %d"
+msgstr ""
+"no se pudo duplicar el socket %d para su empleo en el backend: código de "
+"error %d"
 
-#: utils/adt/array_userfuncs.c:103 utils/adt/array_userfuncs.c:113
-#: utils/adt/arrayfuncs.c:1251 utils/adt/float.c:1101 utils/adt/float.c:1160
-#: utils/adt/float.c:2711 utils/adt/float.c:2727 utils/adt/int.c:622
-#: utils/adt/int.c:651 utils/adt/int.c:672 utils/adt/int.c:692
-#: utils/adt/int.c:714 utils/adt/int.c:739 utils/adt/int.c:753
-#: utils/adt/int.c:768 utils/adt/int.c:903 utils/adt/int.c:924
-#: utils/adt/int.c:951 utils/adt/int.c:991 utils/adt/int.c:1012
-#: utils/adt/int.c:1039 utils/adt/int.c:1066 utils/adt/int.c:1120
-#: utils/adt/int8.c:1196 utils/adt/numeric.c:2062 utils/adt/numeric.c:2071
-#: utils/adt/varbit.c:1098 utils/adt/varbit.c:1483 utils/adt/varlena.c:942
-#: utils/adt/varlena.c:1915
-msgid "integer out of range"
-msgstr "el entero está fuera de rango"
+#: postmaster/postmaster.c:4843
+#, c-format
+msgid "could not create inherited socket: error code %d\n"
+msgstr "no se pudo crear el socket heradado: código de error %d\n"
 
-#: utils/adt/array_userfuncs.c:121
-msgid "argument must be empty or one-dimensional array"
-msgstr "el argumento debe ser vacío o un array unidimensional"
+#: postmaster/postmaster.c:4872 postmaster/postmaster.c:4879
+#, c-format
+msgid "could not read from backend variables file \"%s\": %s\n"
+msgstr "no se pudo leer el archivo de variables de servidor «%s»: %s\n"
 
-#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
-#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
-#: utils/adt/array_userfuncs.c:357
-msgid "cannot concatenate incompatible arrays"
-msgstr "no se pueden concatenar arrays incompatibles"
+#: postmaster/postmaster.c:4888
+#, c-format
+msgid "could not remove file \"%s\": %s\n"
+msgstr "no se pudo eliminar el archivo «%s»: %s\n"
 
-#: utils/adt/array_userfuncs.c:225
+#: postmaster/postmaster.c:4905
 #, c-format
-msgid ""
-"Arrays with element types %s and %s are not compatible for concatenation."
+msgid "could not map view of backend variables: error code %d\n"
 msgstr ""
-"Los arrays con elementos de tipo %s y %s son incompatibles para la "
-"concatenación."
+"no se pudo mapear la vista del archivo de variables: código de error %d\n"
 
-#: utils/adt/array_userfuncs.c:264
+#: postmaster/postmaster.c:4914
 #, c-format
-msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
+msgid "could not unmap view of backend variables: error code %d\n"
 msgstr ""
-"Los arrays de dimesiones %d y %d son incompatibles para la concatenación."
+"no se pudo desmapear la vista del archivo de variables: código de error %d\n"
 
-#: utils/adt/array_userfuncs.c:301
-msgid ""
-"Arrays with differing element dimensions are not compatible for "
-"concatenation."
+#: postmaster/postmaster.c:4921
+#, c-format
+msgid "could not close handle to backend parameter variables: error code %d\n"
 msgstr ""
-"Los arrays con elementos de diferentes dimensiones son incompatibles para la "
-"concatenación."
+"no se pudo cerrar el archivo de variables de servidor: código de error %d\n"
 
-#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
-msgid "Arrays with differing dimensions are not compatible for concatenation."
-msgstr ""
-"Los arrays con diferentes dimensiones son incompatibles para la "
-"concatenación."
+#: postmaster/postmaster.c:5064
+msgid "could not read exit code for process\n"
+msgstr "no se pudo leer el código de salida del proceso\n"
+
+#: postmaster/postmaster.c:5069
+msgid "could not post child completion status\n"
+msgstr "no se pudo publicar el estado de completitud del proceso hijo\n"
 
-#: utils/adt/array_userfuncs.c:424 utils/adt/arrayfuncs.c:1214
-#: utils/adt/arrayfuncs.c:2882 utils/adt/arrayfuncs.c:4562
+#: postmaster/syslogger.c:390
 #, c-format
-msgid "invalid number of dimensions: %d"
-msgstr "número incorrecto de dimensiones: %d"
+msgid "select() failed in logger process: %m"
+msgstr "select() falló en proceso de log: %m"
 
-#: utils/adt/array_userfuncs.c:484
-msgid "could not determine input data type"
-msgstr "no se pudo determinar el tipo de dato de entrada"
+#: postmaster/syslogger.c:402 postmaster/syslogger.c:968
+#, c-format
+msgid "could not read from logger pipe: %m"
+msgstr "no se pudo leer desde la tubería de log: %m"
 
-#: utils/adt/arrayfuncs.c:211 utils/adt/arrayfuncs.c:223
-msgid "missing dimension value"
-msgstr "falta un valor de dimensión"
+#: postmaster/syslogger.c:449
+msgid "logger shutting down"
+msgstr "apagando proceso de log"
 
-#: utils/adt/arrayfuncs.c:233
-msgid "missing \"]\" in array dimensions"
-msgstr "falta un «]» en las dimensiones de array"
-
-#: utils/adt/arrayfuncs.c:241 utils/adt/arrayfuncs.c:2411
-#: utils/adt/arrayfuncs.c:2439 utils/adt/arrayfuncs.c:2454
-msgid "upper bound cannot be less than lower bound"
-msgstr "el límite superior no puede ser menor que el límite inferior"
+#: postmaster/syslogger.c:493 postmaster/syslogger.c:507
+#, c-format
+msgid "could not create pipe for syslog: %m"
+msgstr "no se pudo crear la tubería para syslog: %m"
 
-#: utils/adt/arrayfuncs.c:253 utils/adt/arrayfuncs.c:279
-msgid "array value must start with \"{\" or dimension information"
-msgstr "el valor de array debe comenzar con «{» o información de dimensión"
+#: postmaster/syslogger.c:534
+#, c-format
+msgid "could not fork system logger: %m"
+msgstr "no se pudo crear el proceso de log: %m"
 
-#: utils/adt/arrayfuncs.c:267
-msgid "missing assignment operator"
-msgstr "falta un operador de asignación"
+#: postmaster/syslogger.c:565
+#, c-format
+msgid "could not redirect stdout: %m"
+msgstr "no se pudo redirigir stdout: %m"
 
-#: utils/adt/arrayfuncs.c:284 utils/adt/arrayfuncs.c:290
-msgid "array dimensions incompatible with array literal"
-msgstr "las dimensiones del array no son compatibles con el literal"
+#: postmaster/syslogger.c:570 postmaster/syslogger.c:588
+#, c-format
+msgid "could not redirect stderr: %m"
+msgstr "no se pudo redirigir stderr: %m"
 
-#: utils/adt/arrayfuncs.c:420 utils/adt/arrayfuncs.c:435
-#: utils/adt/arrayfuncs.c:444 utils/adt/arrayfuncs.c:458
-#: utils/adt/arrayfuncs.c:478 utils/adt/arrayfuncs.c:506
-#: utils/adt/arrayfuncs.c:511 utils/adt/arrayfuncs.c:551
-#: utils/adt/arrayfuncs.c:572 utils/adt/arrayfuncs.c:591
-#: utils/adt/arrayfuncs.c:701 utils/adt/arrayfuncs.c:710
-#: utils/adt/arrayfuncs.c:740 utils/adt/arrayfuncs.c:755
-#: utils/adt/arrayfuncs.c:808
+#: postmaster/syslogger.c:923
 #, c-format
-msgid "malformed array literal: \"%s\""
-msgstr "literal de array no es válido: «%s»"
+msgid "could not write to log file: %s\n"
+msgstr "no se pudo escribir al archivo de log: %s\n"
 
-#: utils/adt/arrayfuncs.c:847 utils/adt/arrayfuncs.c:1448
-#: utils/adt/arrayfuncs.c:2766 utils/adt/arrayfuncs.c:2914
-#: utils/adt/arrayfuncs.c:4662 utils/adt/arrayutils.c:93
-#: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
+#: postmaster/syslogger.c:1042
 #, c-format
-msgid "array size exceeds the maximum allowed (%d)"
-msgstr "el tamaño del array excede el máximo permitido (%d)"
+msgid "could not open log file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de registro «%s»: %m"
 
-#: utils/adt/arrayfuncs.c:1225
-msgid "invalid array flags"
-msgstr "opciones de array no válidas"
+#: postmaster/syslogger.c:1111 postmaster/syslogger.c:1156
+msgid "disabling automatic rotation (use SIGHUP to re-enable)"
+msgstr "desactivando rotación automática (use SIGHUP para reactivarla)"
 
-#: utils/adt/arrayfuncs.c:1233
-msgid "wrong element type"
-msgstr "el tipo de elemento es erróneo"
+#: regex/regc_pg_locale.c:258 utils/adt/selfuncs.c:5028
+msgid "could not determine which collation to use for regular expression"
+msgstr "no se pudo determinar qué ordenamiento usar para la expresión regular"
 
-#: utils/adt/arrayfuncs.c:1422
+#: replication/libpqwalreceiver/libpqwalreceiver.c:101
 #, c-format
-msgid "improper binary format in array element %d"
-msgstr "el formato binario no es válido en elemento %d de array"
+msgid "could not connect to the primary server: %s"
+msgstr "no se pudo hacer la conexión al servidor primario: %s"
 
-#: utils/adt/arrayfuncs.c:1878
-msgid "slices of fixed-length arrays not implemented"
-msgstr "no está implementada la obtención de segmentos de arrays de largo fijo"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:113
+#, c-format
+msgid ""
+"could not receive database system identifier and timeline ID from the "
+"primary server: %s"
+msgstr ""
+"no se pudo recibir el identificador de sistema y el ID de timeline del "
+"servidor primario: %s"
 
-#: utils/adt/arrayfuncs.c:2051 utils/adt/arrayfuncs.c:2073
-#: utils/adt/arrayfuncs.c:2107 utils/adt/arrayfuncs.c:2393
-#: utils/adt/arrayfuncs.c:4542 utils/adt/arrayfuncs.c:4574
-#: utils/adt/arrayfuncs.c:4591
-msgid "wrong number of array subscripts"
-msgstr "número incorrecto de subíndices del array"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:124
+msgid "invalid response from primary server"
+msgstr "respuesta no válida del servidor primario"
 
-#: utils/adt/arrayfuncs.c:2056 utils/adt/arrayfuncs.c:2149
-#: utils/adt/arrayfuncs.c:2444
-msgid "array subscript out of range"
-msgstr "los subíndices de arrays están fuera de rango"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:125
+#, c-format
+msgid "Expected 1 tuple with 3 fields, got %d tuples with %d fields."
+msgstr ""
+"Se esperaba 1 tupla con 3 campos, se obtuvieron %d tuplas con %d campos."
 
-#: utils/adt/arrayfuncs.c:2061
-msgid "cannot assign null value to an element of a fixed-length array"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:140
+msgid "database system identifier differs between the primary and standby"
+msgstr "el identificador de sistema difiere entre el primario y el standby"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:141
+#, c-format
+msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr ""
-"no se puede asignar un valor nulo a un elemento de un array de longitud fija"
+"El identificador del primario es %s, el identificador del standby es %s."
 
-#: utils/adt/arrayfuncs.c:2347
-msgid "updates on slices of fixed-length arrays not implemented"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:153
+#, c-format
+msgid "timeline %u of the primary does not match recovery target timeline %u"
 msgstr ""
-"no están implementadas las actualizaciones en segmentos de arrays de largo "
-"fija"
+"el timeline %u del primario no coincide con el timeline destino de "
+"recuperación %u"
 
-#: utils/adt/arrayfuncs.c:2383 utils/adt/arrayfuncs.c:2470
-msgid "source array too small"
-msgstr "el array de origen es demasiado pequeño"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:165
+#, c-format
+msgid "could not start WAL streaming: %s"
+msgstr "no se pudo iniciar el flujo de WAL: %s"
 
-#: utils/adt/arrayfuncs.c:3021
-msgid "null array element not allowed in this context"
-msgstr "los arrays con elementos null no son permitidos en este contexto"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:171
+msgid "streaming replication successfully connected to primary"
+msgstr "la replicación en flujo se ha conectado exitosamente al primario"
 
-#: utils/adt/arrayfuncs.c:3082 utils/adt/arrayfuncs.c:3289
-#: utils/adt/arrayfuncs.c:3489
-msgid "cannot compare arrays of different element types"
-msgstr "no se pueden comparar arrays con elementos de distintos tipos"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:193
+msgid "socket not open"
+msgstr "el socket no está abierto"
 
-#: utils/adt/arrayfuncs.c:4440 utils/adt/arrayfuncs.c:4480
-msgid "dimension array or low bound array cannot be NULL"
-msgstr ""
-"el array de dimensiones o el array de límites inferiores no puede ser NULL"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:367
+#: replication/libpqwalreceiver/libpqwalreceiver.c:388
+#: replication/libpqwalreceiver/libpqwalreceiver.c:393
+#, c-format
+msgid "could not receive data from WAL stream: %s"
+msgstr "no se pudo recibir datos desde el flujo de WAL: %s"
 
-#: utils/adt/arrayfuncs.c:4543 utils/adt/arrayfuncs.c:4575
-msgid "Dimension array must be one dimensional."
-msgstr "El array de dimensiones debe ser unidimensional."
+#: replication/libpqwalreceiver/libpqwalreceiver.c:384
+msgid "replication terminated by primary server"
+msgstr "replicación terminada por el servidor primario"
 
-#: utils/adt/arrayfuncs.c:4548 utils/adt/arrayfuncs.c:4580
-msgid "wrong range of array subscripts"
-msgstr "rango incorrecto en los subíndices del array"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:415
+#, c-format
+msgid "could not send data to WAL stream: %s"
+msgstr "no se pudo enviar datos al flujo de WAL: %s"
 
-#: utils/adt/arrayfuncs.c:4549 utils/adt/arrayfuncs.c:4581
-msgid "Lower bound of dimension array must be one."
-msgstr "El límite inferior del array de dimensiones debe ser uno."
+#: replication/walreceiver.c:150
+msgid "terminating walreceiver process due to administrator command"
+msgstr "terminando el proceso walreceiver debido a una orden del administrador"
 
-#: utils/adt/arrayfuncs.c:4554 utils/adt/arrayfuncs.c:4586
-msgid "dimension values cannot be null"
-msgstr "los valores de dimensión no pueden ser null"
+#: replication/walreceiver.c:299
+msgid "cannot continue WAL streaming, recovery has already ended"
+msgstr "no se puede continuar el flujo de WAL; la recuperación ya ha terminado"
 
-#: utils/adt/arrayfuncs.c:4592
-msgid "Low bound array has different size than dimensions array."
+#: replication/walsender.c:141
+msgid "recovery is still in progress, can't accept WAL streaming connections"
 msgstr ""
-"El array de límites inferiores tiene tamaño diferente que el array de "
-"dimensiones."
+"la recuperación aún está en proceso; no se pueden aceptar conexiones de "
+"flujos de WAL"
 
-#: utils/adt/arrayutils.c:209
-msgid "typmod array must be type cstring[]"
-msgstr "el array de typmod debe ser de tipo cstring[]"
+#: replication/walsender.c:261 replication/walsender.c:489
+#: replication/walsender.c:547
+msgid "unexpected EOF on standby connection"
+msgstr "se encontró fin de archivo inesperado en la conexión standby"
 
-#: utils/adt/arrayutils.c:214
-msgid "typmod array must be one-dimensional"
-msgstr "array de typmod debe ser unidimensional"
+#: replication/walsender.c:267
+#, c-format
+msgid "invalid standby handshake message type %d"
+msgstr "el tipo %d de mensaje de saludo del standby no es válido"
 
-#: utils/adt/arrayutils.c:219
-msgid "typmod array must not contain nulls"
-msgstr "los arrays de typmod no deben contener valores nulos"
+#: replication/walsender.c:379
+msgid "standby connections not allowed because wal_level=minimal"
+msgstr "las conexiones standby no están permitidas porque wal_level=minimal"
 
-#: utils/adt/ascii.c:75
+#: replication/walsender.c:461
 #, c-format
-msgid "encoding conversion from %s to ASCII not supported"
-msgstr "la conversión de codificación de %s a ASCII no está soportada"
+msgid "invalid standby query string: %s"
+msgstr "la cadena de consulta de standby no es válida: %s"
 
-#: utils/adt/bool.c:153
+#: replication/walsender.c:518
 #, c-format
-msgid "invalid input syntax for type boolean: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo boolean: «%s»"
+msgid "invalid standby message type \"%c\""
+msgstr "el tipo «%c» de mensaje del standby no es válido"
 
-#: utils/adt/cash.c:232
+#: replication/walsender.c:569
 #, c-format
-msgid "invalid input syntax for type money: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo money: «%s»"
-
-#: utils/adt/cash.c:524 utils/adt/cash.c:575 utils/adt/cash.c:624
-#: utils/adt/cash.c:676 utils/adt/cash.c:726 utils/adt/float.c:764
-#: utils/adt/float.c:828 utils/adt/float.c:2470 utils/adt/float.c:2533
-#: utils/adt/geo_ops.c:4128 utils/adt/int.c:728 utils/adt/int.c:869
-#: utils/adt/int.c:965 utils/adt/int.c:1053 utils/adt/int.c:1079
-#: utils/adt/int.c:1099 utils/adt/int8.c:597 utils/adt/int8.c:644
-#: utils/adt/int8.c:820 utils/adt/int8.c:916 utils/adt/int8.c:1004
-#: utils/adt/int8.c:1100 utils/adt/numeric.c:4298 utils/adt/numeric.c:4581
-#: utils/adt/timestamp.c:2876
-msgid "division by zero"
-msgstr "división por cero"
-
-#: utils/adt/char.c:169
-msgid "\"char\" out of range"
-msgstr "«char» está fuera de rango"
+msgid "unexpected message type \"%c\""
+msgstr "mensaje de tipo «%c» inesperado"
 
-#: utils/adt/date.c:66 utils/adt/timestamp.c:92 utils/adt/varbit.c:49
-#: utils/adt/varchar.c:43
-msgid "invalid type modifier"
-msgstr "el modificador de tipo no es válido"
+#: replication/walsender.c:822
+msgid "terminating walsender process due to replication timeout"
+msgstr ""
+"terminando el proceso walsender debido a que se agotó el tiempo de espera de "
+"replicación"
 
-#: utils/adt/date.c:71
+#: replication/walsender.c:838
 #, c-format
-msgid "TIME(%d)%s precision must not be negative"
-msgstr "la precisión de TIME(%d)%s no debe ser negativa"
+msgid "standby \"%s\" has now caught up with primary"
+msgstr "el standby «%s» ahora está actualizado respecto del primario"
 
-#: utils/adt/date.c:77
+#: replication/walsender.c:907
 #, c-format
-msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
-msgstr "la precisión de TIME(%d)%s fue reducida al máximo permitido, %d"
-
-#: utils/adt/date.c:142 utils/adt/datetime.c:1186 utils/adt/datetime.c:1934
-msgid "date/time value \"current\" is no longer supported"
-msgstr "valor de hora/fecha «current» ya no está soportado"
+msgid ""
+"number of requested standby connections exceeds max_wal_senders (currently "
+"%d)"
+msgstr ""
+"la cantidad de conexiones standby pedidas excede max_wal_senders "
+"(actualmente %d)"
 
-#: utils/adt/date.c:167
+#: replication/walsender.c:985 replication/walsender.c:1047
 #, c-format
-msgid "date out of range: \"%s\""
-msgstr "fecha fuera de rango: «%s»"
+msgid "requested WAL segment %s has already been removed"
+msgstr "el segmento de WAL solicitado %s ya ha sido eliminado"
 
-#: utils/adt/date.c:359
-msgid "cannot subtract infinite dates"
-msgstr "no se pueden restar fechas infinitas"
+#: replication/walsender.c:1018
+#, c-format
+msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
+msgstr ""
+"no se pudo leer desde el archivo de registro %u, segmento %u en la posición "
+"%u, largo %lu: %m"
 
-#: utils/adt/date.c:416 utils/adt/date.c:453
-msgid "date out of range for timestamp"
-msgstr "fecha fuera de rango para timestamp"
+#: replication/basebackup.c:122 replication/basebackup.c:631
+#, c-format
+msgid "could not read symbolic link \"%s\": %m"
+msgstr "no se pudo leer el enlace simbólico «%s»: %m"
 
-#: utils/adt/date.c:953
-msgid "cannot convert reserved abstime value to date"
-msgstr "no se puede convertir un valor reservado de abstime a date"
+#: replication/basebackup.c:231 replication/basebackup.c:743
+msgid "base backup could not send data, aborting backup"
+msgstr "el respaldo base no pudo enviar datos, abortando el respaldo"
 
-#: utils/adt/date.c:1107 utils/adt/date.c:1114 utils/adt/date.c:1882
-#: utils/adt/date.c:1889
-msgid "time out of range"
-msgstr "hora fuera de rango"
+#: replication/basebackup.c:278 replication/basebackup.c:287
+#: replication/basebackup.c:296 replication/basebackup.c:305
+#: replication/basebackup.c:314
+#, c-format
+msgid "duplicate option \"%s\""
+msgstr "nombre de opción «%s» duplicada"
 
-#: utils/adt/date.c:1760 utils/adt/date.c:1777
+#: replication/basebackup.c:366
 #, c-format
-msgid "\"time\" units \"%s\" not recognized"
-msgstr "las unidades de «time» «%s» no son reconocidas"
+msgid "could not open directory \"pg_tblspc\": %m"
+msgstr "no se pudo abrir el directorio «pg_tblspc»: %m"
 
-#: utils/adt/date.c:1899
-msgid "time zone displacement out of range"
-msgstr "desplazamiento de huso horario fuera de rango"
+#: replication/basebackup.c:576
+msgid "shutdown requested, aborting active base backup"
+msgstr "apagado solicitado, abortando el respaldo base activo"
 
-#: utils/adt/date.c:2524 utils/adt/date.c:2541
+#: replication/basebackup.c:589
 #, c-format
-msgid "\"time with time zone\" units \"%s\" not recognized"
-msgstr "las unidades de «timestamp with time zone» «%s» no son reconocidas"
+msgid "could not stat file or directory \"%s\": %m"
+msgstr "no se pudo hacer stat al archivo o directorio «%s»: %m"
 
-#: utils/adt/date.c:2599 utils/adt/datetime.c:928 utils/adt/datetime.c:1663
-#: utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
+#: replication/basebackup.c:660
 #, c-format
-msgid "time zone \"%s\" not recognized"
-msgstr "el huso horario «%s» no es reconocido"
+msgid "skipping special file \"%s\""
+msgstr "ignorando el archivo especial «%s»"
 
-#: utils/adt/date.c:2639
+#: replication/basebackup.c:733
 #, c-format
-msgid "\"interval\" time zone \"%s\" not valid"
-msgstr "el huso horario «%s» de «interval» no es válido"
+msgid "archive member \"%s\" too large for tar format"
+msgstr "el miembro de archivador «%s» es demasiado grande para el formato tar"
 
-#: utils/adt/datetime.c:3529 utils/adt/datetime.c:3536
-#, c-format
-msgid "date/time field value out of range: \"%s\""
-msgstr "el valor de hora/fecha está fuera de rango: «%s»"
+#: replication/syncrep.c:210
+msgid ""
+"canceling the wait for synchronous replication and terminating connection "
+"due to administrator command"
+msgstr ""
+"cancelando la espera para la replicación sincrónica y terminando la conexión "
+"debido a una orden del administrador"
 
-#: utils/adt/datetime.c:3538
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Quizás necesite una configuración diferente de «datestyle»."
+#: replication/syncrep.c:211 replication/syncrep.c:228
+msgid ""
+"The transaction has already committed locally, but might not have been "
+"replicated to the standby."
+msgstr ""
+"La transacción ya fue comprometida localmente, pero pudo no haber sido "
+"replicada al standby."
 
-#: utils/adt/datetime.c:3543
-#, c-format
-msgid "interval field value out of range: \"%s\""
-msgstr "el valor de interval está fuera de rango: «%s»"
+#: replication/syncrep.c:227
+msgid "canceling wait for synchronous replication due to user request"
+msgstr ""
+"cancelando espera para la replicación sincrónica debido a una petición del "
+"usuario"
 
-#: utils/adt/datetime.c:3549
+#: replication/syncrep.c:358
 #, c-format
-msgid "time zone displacement out of range: \"%s\""
-msgstr "el desplazamiento de huso horario está fuera de rango: «%s»"
+msgid "standby \"%s\" now has synchronous standby priority %u"
+msgstr "el standby «%s» ahora tiene prioridad sincrónica %u"
 
-#. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3556 utils/adt/network.c:107
+#: replication/syncrep.c:451
 #, c-format
-msgid "invalid input syntax for type %s: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo %s: «%s»"
-
-#: utils/adt/datum.c:80 utils/adt/datum.c:92
-msgid "invalid Datum pointer"
-msgstr "puntero a Datum no válido"
+msgid "standby \"%s\" is now the synchronous standby with priority %u"
+msgstr "el standby «%s» es ahora el standby sincrónico con prioridad %u"
 
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:195
-#, c-format
-msgid "could not open tablespace directory \"%s\": %m"
-msgstr "no se pudo abrir el directorio de tablespace «%s»: %m"
+#: repl_scanner.l:76
+msgid "invalid streaming start location"
+msgstr "posición de inicio de flujo de WAL no válida"
 
-#: utils/adt/domains.c:80
+#: repl_scanner.l:107
 #, c-format
-msgid "type %s is not a domain"
-msgstr "tipo «%s» no es un dominio"
+msgid "syntax error: unexpected character \"%s\""
+msgstr "error de sintaxis: carácter «%s» inesperado"
 
-#: utils/adt/encode.c:55 utils/adt/encode.c:91
+#: rewrite/rewriteDefine.c:109 rewrite/rewriteDefine.c:769
 #, c-format
-msgid "unrecognized encoding: \"%s\""
-msgstr "no se reconoce la codificación: «%s»"
+msgid "rule \"%s\" for relation \"%s\" already exists"
+msgstr "ya existe una regla llamada «%s» para la relación «%s»"
 
-#: utils/adt/encode.c:150
-#, c-format
-msgid "invalid hexadecimal digit: \"%c\""
-msgstr "el dígito hexadecimal no es válido: «%c»"
+#: rewrite/rewriteDefine.c:287
+msgid "rule actions on OLD are not implemented"
+msgstr "las acciones de regla en OLD no están implementadas"
 
-#: utils/adt/encode.c:178
-msgid "invalid hexadecimal data: odd number of digits"
-msgstr "el dato hexadecimal no es válido: tiene un número impar de dígitos"
+#: rewrite/rewriteDefine.c:288
+msgid "Use views or triggers instead."
+msgstr "Use vistas o triggers en su lugar."
 
-#: utils/adt/encode.c:295
-msgid "unexpected \"=\""
-msgstr "«=» inesperado"
+#: rewrite/rewriteDefine.c:292
+msgid "rule actions on NEW are not implemented"
+msgstr "las acciones de regla en NEW no están implementadas"
 
-#: utils/adt/encode.c:307
-msgid "invalid symbol"
-msgstr "símbolo no válido"
+#: rewrite/rewriteDefine.c:293
+msgid "Use triggers instead."
+msgstr "Use triggers en su lugar."
 
-#: utils/adt/encode.c:327
-msgid "invalid end sequence"
-msgstr "secuencia de término no válida"
-
-#: utils/adt/encode.c:441 utils/adt/encode.c:506 utils/adt/varlena.c:238
-#: utils/adt/varlena.c:279
-msgid "invalid input syntax for type bytea"
-msgstr "sintaxis de entrada no válida para tipo bytea"
+#: rewrite/rewriteDefine.c:306
+msgid "INSTEAD NOTHING rules on SELECT are not implemented"
+msgstr "las reglas INSTEAD NOTHING en SELECT no están implementadas"
 
-#: utils/adt/enum.c:44 utils/adt/enum.c:54 utils/adt/enum.c:109
-#: utils/adt/enum.c:119
-#, c-format
-msgid "invalid input value for enum %s: \"%s\""
-msgstr "la sintaxis de entrada no es válida para el enum %s: «%s»"
+#: rewrite/rewriteDefine.c:307
+msgid "Use views instead."
+msgstr "Use vistas en su lugar."
 
-#: utils/adt/enum.c:81 utils/adt/enum.c:144
-#, c-format
-msgid "invalid internal value for enum: %u"
-msgstr "el valor interno no es válido para enum: %u"
+#: rewrite/rewriteDefine.c:315
+msgid "multiple actions for rules on SELECT are not implemented"
+msgstr "las reglas de múltiples acciones en SELECT no están implementadas"
 
-#: utils/adt/enum.c:264 utils/adt/enum.c:303 utils/adt/enum.c:350
-#: utils/adt/enum.c:370
-msgid "could not determine actual enum type"
-msgstr "no se pudo determinar el tipo enum efectivo"
+#: rewrite/rewriteDefine.c:327
+msgid "rules on SELECT must have action INSTEAD SELECT"
+msgstr "las reglas en SELECT deben tener una acción INSTEAD SELECT"
 
-#: utils/adt/float.c:54
-msgid "value out of range: overflow"
-msgstr "valor fuera de rango: desbordamiento"
+#: rewrite/rewriteDefine.c:335
+msgid "rules on SELECT must not contain data-modifying statements in WITH"
+msgstr ""
+"las reglas en SELECT no deben contener sentencias que modifiquen datos en "
+"WITH"
 
-#: utils/adt/float.c:59
-msgid "value out of range: underflow"
-msgstr "valor fuera de rango: desbordamiento por abajo"
+#: rewrite/rewriteDefine.c:343
+msgid "event qualifications are not implemented for rules on SELECT"
+msgstr ""
+"las calificaciones de eventos no están implementadas para las reglas en "
+"SELECT"
 
-#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
+#: rewrite/rewriteDefine.c:368
 #, c-format
-msgid "invalid input syntax for type real: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo real: «%s»"
+msgid "\"%s\" is already a view"
+msgstr "«%s» ya es una vista"
 
-#: utils/adt/float.c:242
+#: rewrite/rewriteDefine.c:392
 #, c-format
-msgid "\"%s\" is out of range for type real"
-msgstr "«%s» está fuera de rango para el tipo real"
+msgid "view rule for \"%s\" must be named \"%s\""
+msgstr "la regla de vista para «%s» debe llamarse «%s»"
 
-#: utils/adt/float.c:399 utils/adt/float.c:440 utils/adt/float.c:491
-#: utils/adt/numeric.c:3760 utils/adt/numeric.c:3786
+#: rewrite/rewriteDefine.c:417
 #, c-format
-msgid "invalid input syntax for type double precision: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo double precision: «%s»"
+msgid "could not convert table \"%s\" to a view because it is not empty"
+msgstr "no se pudo convertir la tabla «%s» en vista porque no está vacía"
 
-#: utils/adt/float.c:435
+#: rewrite/rewriteDefine.c:424
 #, c-format
-msgid "\"%s\" is out of range for type double precision"
-msgstr "«%s» está fuera de rango para el tipo double precision"
-
-#: utils/adt/float.c:1119 utils/adt/float.c:1177 utils/adt/int.c:348
-#: utils/adt/int.c:784 utils/adt/int.c:813 utils/adt/int.c:834
-#: utils/adt/int.c:854 utils/adt/int.c:882 utils/adt/int.c:1135
-#: utils/adt/int8.c:1221 utils/adt/numeric.c:2163 utils/adt/numeric.c:2174
-msgid "smallint out of range"
-msgstr "smallint está fuera de rango"
-
-#: utils/adt/float.c:1303 utils/adt/numeric.c:4974
-msgid "cannot take square root of a negative number"
-msgstr "no se puede calcular la raíz cuadrada un de número negativo"
-
-#: utils/adt/float.c:1345 utils/adt/numeric.c:1975
-msgid "zero raised to a negative power is undefined"
-msgstr "cero elevado a una potencia negativa es indefinido"
+msgid "could not convert table \"%s\" to a view because it has triggers"
+msgstr "no se pudo convertir la tabla «%s» en vista porque tiene triggers"
 
-#: utils/adt/float.c:1349 utils/adt/numeric.c:1981
-msgid "a negative number raised to a non-integer power yields a complex result"
+#: rewrite/rewriteDefine.c:426
+msgid ""
+"In particular, the table cannot be involved in any foreign key relationships."
 msgstr ""
-"un número negativo elevado a una potencia no positiva entrega un resultado "
-"complejo"
+"En particular, la tabla no puede estar involucrada en relaciones de llave "
+"foránea."
 
-#: utils/adt/float.c:1415 utils/adt/float.c:1445 utils/adt/numeric.c:5192
-msgid "cannot take logarithm of zero"
-msgstr "no se puede calcular logaritmo de cero"
+#: rewrite/rewriteDefine.c:431
+#, c-format
+msgid "could not convert table \"%s\" to a view because it has indexes"
+msgstr "no se pudo convertir la tabla «%s» en vista porque tiene índices"
 
-#: utils/adt/float.c:1419 utils/adt/float.c:1449 utils/adt/numeric.c:5196
-msgid "cannot take logarithm of a negative number"
-msgstr "no se puede calcular logaritmo de un número negativo"
+#: rewrite/rewriteDefine.c:437
+#, c-format
+msgid "could not convert table \"%s\" to a view because it has child tables"
+msgstr "no se pudo convertir la tabla «%s» en vista porque tiene tablas hijas"
 
-#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
-#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
-#: utils/adt/float.c:1604 utils/adt/float.c:1625
-msgid "input is out of range"
-msgstr "la entrada está fuera de rango"
+#: rewrite/rewriteDefine.c:464
+msgid "cannot have multiple RETURNING lists in a rule"
+msgstr "no se pueden tener múltiples listas RETURNING en una regla"
 
-#: utils/adt/float.c:2687 utils/adt/numeric.c:982
-msgid "count must be greater than zero"
-msgstr "count debe ser mayor que cero"
+#: rewrite/rewriteDefine.c:469
+msgid "RETURNING lists are not supported in conditional rules"
+msgstr "listas de RETURNING no están soportadas en reglas condicionales"
 
-#: utils/adt/float.c:2692 utils/adt/numeric.c:989
-msgid "operand, lower bound and upper bound cannot be NaN"
-msgstr "el operando, límite inferior y límite superior no pueden ser NaN"
+#: rewrite/rewriteDefine.c:473
+msgid "RETURNING lists are not supported in non-INSTEAD rules"
+msgstr ""
+"listas de RETURNING no están soportadas en reglas que no estén marcadas "
+"INSTEAD"
 
-#: utils/adt/float.c:2698
-msgid "lower and upper bounds must be finite"
-msgstr "los límites inferior y superior deben ser finitos"
+#: rewrite/rewriteDefine.c:552
+msgid "SELECT rule's target list has too many entries"
+msgstr "la lista de destinos en la regla de SELECT tiene demasiadas entradas"
 
-#: utils/adt/float.c:2736 utils/adt/numeric.c:1002
-msgid "lower bound cannot equal upper bound"
-msgstr "el límite superior no puede ser igual al límite inferior"
+#: rewrite/rewriteDefine.c:553
+msgid "RETURNING list has too many entries"
+msgstr "la lista de RETURNING tiene demasiadas entradas"
 
-#: utils/adt/formatting.c:491
-msgid "invalid format specification for an interval value"
-msgstr "especificación de formato no válida para un valor de interval"
+#: rewrite/rewriteDefine.c:569
+msgid "cannot convert relation containing dropped columns to view"
+msgstr ""
+"no se puede convertir en vista una relación que contiene columnas eliminadas"
 
-#: utils/adt/formatting.c:492
-msgid "Intervals are not tied to specific calendar dates."
+#: rewrite/rewriteDefine.c:574
+#, c-format
+msgid "SELECT rule's target entry %d has different column name from \"%s\""
 msgstr ""
-"Los Interval no están ... a valores determinados de fechas de calendario."
+"la entrada de destino %d de la regla de SELECT tiene un nombre de columna "
+"diferente de «%s»"
 
-#: utils/adt/formatting.c:1059
-msgid "\"EEEE\" must be the last pattern used"
-msgstr "«EEEE» debe ser el último patrón usado"
+#: rewrite/rewriteDefine.c:580
+#, c-format
+msgid "SELECT rule's target entry %d has different type from column \"%s\""
+msgstr ""
+"el destino %d de la regla de SELECT tiene un tipo diferente de la columna "
+"«%s»"
 
-#: utils/adt/formatting.c:1067
-msgid "\"9\" must be ahead of \"PR\""
-msgstr "«9» debe ir antes de «PR»"
+#: rewrite/rewriteDefine.c:582
+#, c-format
+msgid "RETURNING list's entry %d has different type from column \"%s\""
+msgstr ""
+"el destino %d de la lista de RETURNING tiene un tipo diferente de la columna "
+"«%s»"
 
-#: utils/adt/formatting.c:1083
-msgid "\"0\" must be ahead of \"PR\""
-msgstr "«0» debe ir antes de «PR»"
+#: rewrite/rewriteDefine.c:597
+#, c-format
+msgid "SELECT rule's target entry %d has different size from column \"%s\""
+msgstr ""
+"el destino %d de la regla de SELECT tiene un tamaño diferente de la columna "
+"«%s»"
 
-#: utils/adt/formatting.c:1109
-msgid "multiple decimal points"
-msgstr "hay múltiples puntos decimales"
+#: rewrite/rewriteDefine.c:599
+#, c-format
+msgid "RETURNING list's entry %d has different size from column \"%s\""
+msgstr ""
+"el destino %d de la lista RETURNING tiene un tamaño diferente de la columna "
+"«%s»"
 
-#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
-msgid "cannot use \"V\" and decimal point together"
-msgstr "no se puede usar «V» y un punto decimal simultáneamente"
+#: rewrite/rewriteDefine.c:607
+msgid "SELECT rule's target list has too few entries"
+msgstr "la lista de destinos de regla de SELECT tiene muy pocas entradas"
 
-#: utils/adt/formatting.c:1125
-msgid "cannot use \"S\" twice"
-msgstr "no se puede usar «S» dos veces"
+#: rewrite/rewriteDefine.c:608
+msgid "RETURNING list has too few entries"
+msgstr "la lista de RETURNING tiene muy pocas entradas"
 
-#: utils/adt/formatting.c:1129
-msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
-msgstr "no se puede usar «S» y «PL»/«MI»/«SG»/«PR» simultáneamente"
+#: rewrite/rewriteDefine.c:700 rewrite/rewriteDefine.c:762
+#: rewrite/rewriteRemove.c:62 rewrite/rewriteSupport.c:117
+#, c-format
+msgid "rule \"%s\" for relation \"%s\" does not exist"
+msgstr "no existe la regla «%s» para la relación «%s»"
 
-#: utils/adt/formatting.c:1149
-msgid "cannot use \"S\" and \"MI\" together"
-msgstr "no se puede usar «S» y «MI» simultáneamente"
+#: rewrite/rewriteHandler.c:485
+#, c-format
+msgid ""
+"WITH query name \"%s\" appears in both a rule action and the query being "
+"rewritten"
+msgstr ""
+"el nombre de consulta WITH «%s» aparece tanto en una acción de regla y en la "
+"consulta que está siendo reescrita"
 
-#: utils/adt/formatting.c:1159
-msgid "cannot use \"S\" and \"PL\" together"
-msgstr "no se puede usar «S» y «PL» simultáneamente"
+#: rewrite/rewriteHandler.c:543
+msgid "cannot have RETURNING lists in multiple rules"
+msgstr "no se puede usar RETURNING en múltiples reglas"
 
-#: utils/adt/formatting.c:1169
-msgid "cannot use \"S\" and \"SG\" together"
-msgstr "no se puede usar «S» y «SG» simultáneamente"
+#: rewrite/rewriteHandler.c:874 rewrite/rewriteHandler.c:892
+#, c-format
+msgid "multiple assignments to same column \"%s\""
+msgstr "hay múltiples asignaciones a la misma columna «%s»"
 
-#: utils/adt/formatting.c:1178
-msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
-msgstr "no se puede usar «PR» y «S»/«PL»/«MI»/«SG» simultáneamente"
+#: rewrite/rewriteHandler.c:1626 rewrite/rewriteHandler.c:2021
+#, c-format
+msgid "infinite recursion detected in rules for relation \"%s\""
+msgstr "se detectó recursión infinita en las reglas de la relación «%s»"
 
-#: utils/adt/formatting.c:1204
-msgid "cannot use \"EEEE\" twice"
-msgstr "no se puede usar «EEEE» dos veces"
+#: rewrite/rewriteHandler.c:1882
+msgid ""
+"DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
+"WITH"
+msgstr ""
+"las reglas DO INSTEAD NOTHING no están soportadas para sentencias que "
+"modifiquen datos en WITH"
 
-#: utils/adt/formatting.c:1210
-msgid "\"EEEE\" is incompatible with other formats"
-msgstr "«EEEE» es incompatible con otros formatos"
+#: rewrite/rewriteHandler.c:1896
+msgid ""
+"conditional DO INSTEAD rules are not supported for data-modifying statements "
+"in WITH"
+msgstr ""
+"las reglas DO INSTEAD condicionales no están soportadas para sentencias que "
+"modifiquen datos en WITH"
 
-#: utils/adt/formatting.c:1211
+#: rewrite/rewriteHandler.c:1900
+msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"las reglas DO ALSO no están soportadas para sentencias que modifiquen datos "
+"en WITH"
+
+#: rewrite/rewriteHandler.c:1905
 msgid ""
-"\"EEEE\" may only be used together with digit and decimal point patterns."
+"multi-statement DO INSTEAD rules are not supported for data-modifying "
+"statements in WITH"
 msgstr ""
-"«EEEE» sólo puede ser usado en conjunción con patrones de dígitos y puntos "
-"decimales."
+"las reglas DO INSTEAD de múltiples sentencias no están soportadas para "
+"sentencias que modifiquen datos en WITH"
 
-#: utils/adt/formatting.c:1411
+#: rewrite/rewriteHandler.c:2059
 #, c-format
-msgid "\"%s\" is not a number"
-msgstr "«%s» no es un número"
-
-#: utils/adt/formatting.c:1788
-msgid "invalid combination of date conventions"
-msgstr "combinacion invalida de convenciones de fecha"
+msgid "cannot perform INSERT RETURNING on relation \"%s\""
+msgstr "no se puede hacer INSERT RETURNING a la relación «%s»"
 
-#: utils/adt/formatting.c:1789
+#: rewrite/rewriteHandler.c:2061
 msgid ""
-"Do not mix Gregorian and ISO week date conventions in a formatting template."
+"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr ""
-" No mezclar convenciones de semana Gregorianas e ISO en una plantilla "
-"formateada"
+"Necesita un regla incondicional ON INSERT DO INSTEAD con una cláusula "
+"RETURNING."
 
-#: utils/adt/formatting.c:1806
+#: rewrite/rewriteHandler.c:2066
 #, c-format
-msgid "conflicting values for \"%s\" field in formatting string"
-msgstr "valores en conflicto para le campo \"%s\" en un string formateado"
+msgid "cannot perform UPDATE RETURNING on relation \"%s\""
+msgstr "no se puede hacer UPDATE RETURNING a la relación «%s»"
 
-#: utils/adt/formatting.c:1808
-msgid "This value contradicts a previous setting for the same field type."
+#: rewrite/rewriteHandler.c:2068
+msgid ""
+"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
-"Este valor se contradice con un seteo previo para el mismo tipo de campo"
+"Necesita un regla incondicional ON UPDATE DO INSTEAD con una cláusula "
+"RETURNING."
 
-#: utils/adt/formatting.c:1869
+#: rewrite/rewriteHandler.c:2073
 #, c-format
-msgid "source string too short for \"%s\" formatting field"
-msgstr "cadena de texto fuente muy corta para campo formateado \"%s\" "
+msgid "cannot perform DELETE RETURNING on relation \"%s\""
+msgstr "no se puede hacer DELETE RETURNING a la relación «%s»"
 
-#: utils/adt/formatting.c:1871
-#, c-format
-msgid "Field requires %d characters, but only %d remain."
-msgstr "El campo requiere %d caractéres, pero solo quedan %d."
+#: rewrite/rewriteHandler.c:2075
+msgid ""
+"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
+msgstr ""
+"Necesita un regla incondicional ON DELETE DO INSTEAD con una clásula "
+"RETURNING."
 
-#: utils/adt/formatting.c:1874 utils/adt/formatting.c:1888
+#: rewrite/rewriteHandler.c:2139
 msgid ""
-"If your source string is not fixed-width, try using the \"FM\" modifier."
+"WITH cannot be used in a query that is rewritten by rules into multiple "
+"queries"
 msgstr ""
-"Si su cadena de texto no es de ancho modificado, trate de usar el "
-"modificador \"FM\" "
+"WITH no puede ser usado en una consulta que está siendo convertida en "
+"múltiples consultas a través de reglas"
 
-#: utils/adt/formatting.c:1884 utils/adt/formatting.c:1897
-#: utils/adt/formatting.c:2027
-#, c-format
-msgid "invalid value \"%s\" for \"%s\""
-msgstr "el valor «%s» no es válido para «%s»"
+#: rewrite/rewriteManip.c:1012
+msgid "conditional utility statements are not implemented"
+msgstr "las sentencias condicionales de utilidad no están implementadas"
 
-#: utils/adt/formatting.c:1886
-#, c-format
-msgid "Field requires %d characters, but only %d could be parsed."
-msgstr "El campo requiere %d caracteres, pero sólo %d pudieron ser analizados."
+#: rewrite/rewriteManip.c:1177
+msgid "WHERE CURRENT OF on a view is not implemented"
+msgstr "WHERE CURRENT OF no está implementado en una vista"
 
-#: utils/adt/formatting.c:1899
-msgid "Value must be an integer."
-msgstr "El valor debe ser un entero."
+#: rewrite/rewriteRemove.c:66
+#, c-format
+msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
+msgstr "la regla «%s» para la relación «%s» no existe, ignorando"
 
-#: utils/adt/formatting.c:1904
+#: rewrite/rewriteSupport.c:156
 #, c-format
-msgid "value for \"%s\" in source string is out of range"
-msgstr "el valor para «%s» en la cadena de origen está fuera de rango"
+msgid "rule \"%s\" does not exist"
+msgstr "no existe la regla «%s»"
 
-#: utils/adt/formatting.c:1906
+#: rewrite/rewriteSupport.c:165
 #, c-format
-msgid "Value must be in the range %d to %d."
-msgstr "EL valor debe estar en el rango de %d a %d."
+msgid "there are multiple rules named \"%s\""
+msgstr "hay múltiples reglas llamadas «%s»"
 
-#: utils/adt/formatting.c:2029
-msgid "The given value did not match any of the allowed values for this field."
+#: rewrite/rewriteSupport.c:166
+msgid "Specify a relation name as well as a rule name."
+msgstr "Especifique un nombre de relación además del nombre de regla."
+
+#: utils/init/miscinit.c:115
+#, c-format
+msgid "could not change directory to \"%s\": %m"
+msgstr "no se pudo cambiar al directorio «%s»: %m"
+
+#: utils/init/miscinit.c:381 utils/misc/guc.c:5257
+#, c-format
+msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr ""
-"El valor dado no concuerda con ninguno de los valores permitidos para este "
-"campo."
+"no se puede definir el parámetro «%s» dentro de una operación restringida "
+"por seguridad"
 
-#: utils/adt/formatting.c:2585
-msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
-msgstr "los patrones de formato «TZ»/«tz» no están soportados en to_date"
+#: utils/init/miscinit.c:460
+#, c-format
+msgid "role \"%s\" is not permitted to log in"
+msgstr "al rol «%s» no se le permite conectarse"
 
-#: utils/adt/formatting.c:2689
-msgid "invalid input string for \"Y,YYY\""
-msgstr "cadena de entrada no válida para «Y,YYY»"
+#: utils/init/miscinit.c:478
+#, c-format
+msgid "too many connections for role \"%s\""
+msgstr "demasiadas conexiones para el rol «%s»"
 
-#: utils/adt/formatting.c:3206
+#: utils/init/miscinit.c:538
+msgid "permission denied to set session authorization"
+msgstr "se ha denegado el permiso para cambiar el usuario actual"
+
+#: utils/init/miscinit.c:618
 #, c-format
-msgid "hour \"%d\" is invalid for the 12-hour clock"
-msgstr "la hora «%d» no es válida para el reloj de 12 horas"
+msgid "invalid role OID: %u"
+msgstr "el OID de rol no es válido: %u"
 
-#: utils/adt/formatting.c:3208
-msgid "Use the 24-hour clock, or give an hour between 1 and 12."
-msgstr "Use el reloj de 24 horas, o entregue una hora entre 1 y 12."
+#: utils/init/miscinit.c:750
+#, c-format
+msgid "could not create lock file \"%s\": %m"
+msgstr "no se pudo crear el archivo de bloqueo «%s»: %m"
 
-#: utils/adt/formatting.c:3246
+#: utils/init/miscinit.c:764
 #, c-format
-msgid "inconsistent use of year %04d and \"BC\""
-msgstr "el uso del año %04d y «BC» es inconsistente"
+msgid "could not open lock file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de bloqueo «%s»: %m"
 
-#: utils/adt/formatting.c:3293
-msgid "cannot calculate day of year without year information"
-msgstr "no se puede calcular el día del año sin conocer el año"
+#: utils/init/miscinit.c:770
+#, c-format
+msgid "could not read lock file \"%s\": %m"
+msgstr "no se pudo leer el archivo de bloqueo «%s»: %m"
 
-#: utils/adt/formatting.c:4151
-msgid "\"EEEE\" not supported for input"
-msgstr "«EEEE» no está soportado en la entrada"
+#: utils/init/miscinit.c:818
+#, c-format
+msgid "lock file \"%s\" already exists"
+msgstr "el archivo de bloqueo «%s» ya existe"
 
-#: utils/adt/formatting.c:4163
-msgid "\"RN\" not supported for input"
-msgstr "«RN» no está soportado en la entrada"
+#: utils/init/miscinit.c:822
+#, c-format
+msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+msgstr "¿Hay otro postgres (PID %d) corriendo en el directorio de datos «%s»?"
 
-#: utils/adt/genfile.c:58
-msgid "reference to parent directory (\"..\") not allowed"
-msgstr "no se permiten referencias a directorios padre («..»)"
+#: utils/init/miscinit.c:824
+#, c-format
+msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"¿Hay otro postmaster (PID %d) corriendo en el directorio de datos «%s»?"
 
-#: utils/adt/genfile.c:72
-msgid "absolute path not allowed"
-msgstr "no se permiten rutas absolutas"
+#: utils/init/miscinit.c:827
+#, c-format
+msgid "Is another postgres (PID %d) using socket file \"%s\"?"
+msgstr "¿Hay otro postgres (PID %d) usando el socket «%s»?"
 
-#: utils/adt/genfile.c:99
-msgid "must be superuser to read files"
-msgstr "debe ser superusuario para leer archivos"
+#: utils/init/miscinit.c:829
+#, c-format
+msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
+msgstr "¿Hay otro postmaster (PID %d) usando el socket «%s»?"
 
-#: utils/adt/genfile.c:113
+#: utils/init/miscinit.c:865
 #, c-format
-msgid "could not seek in file \"%s\": %m"
-msgstr "no se pudo posicionar (seek) el archivo «%s»: %m"
+msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgstr ""
+"el bloque de memoria compartida preexistente (clave %lu, ID %lu) aún está en "
+"uso"
 
-#: utils/adt/genfile.c:118
-msgid "requested length cannot be negative"
-msgstr "el tamaño solicitado no puede ser negativo"
+#: utils/init/miscinit.c:868
+#, c-format
+msgid ""
+"If you're sure there are no old server processes still running, remove the "
+"shared memory block or just delete the file \"%s\"."
+msgstr ""
+"Si está seguro que no hay procesos de servidor antiguos aún en ejecución, "
+"elimine el bloque de memoria compartida, o simplemente borre el archivo «%s»."
 
-#: utils/adt/genfile.c:124 utils/adt/oracle_compat.c:181
-#: utils/adt/oracle_compat.c:279 utils/adt/oracle_compat.c:755
-#: utils/adt/oracle_compat.c:1045
-msgid "requested length too large"
-msgstr "el tamaño solicitado es demasiado grande"
+#: utils/init/miscinit.c:884
+#, c-format
+msgid "could not remove old lock file \"%s\": %m"
+msgstr "no se pudo eliminar el archivo de bloqueo antiguo «%s»: %m"
 
-#: utils/adt/genfile.c:163
-msgid "must be superuser to get file information"
-msgstr "debe ser superusuario obtener información de archivos"
+#: utils/init/miscinit.c:886
+msgid ""
+"The file seems accidentally left over, but it could not be removed. Please "
+"remove the file by hand and try again."
+msgstr ""
+"El archivo parece accidentalmente abandonado, pero no pudo ser eliminado. "
+"Por favor elimine el archivo manualmente e intente nuevamente."
 
-#: utils/adt/genfile.c:227
-msgid "must be superuser to get directory listings"
-msgstr "debe ser superusuario para obtener listados de directorio"
+#: utils/init/miscinit.c:920 utils/init/miscinit.c:931
+#: utils/init/miscinit.c:941
+#, c-format
+msgid "could not write lock file \"%s\": %m"
+msgstr "no se pudo escribir el archivo de bloqueo «%s»: %m"
 
-#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4249 utils/adt/geo_ops.c:5166
-msgid "too many points requested"
-msgstr "se pidieron demasiados puntos"
+#: utils/init/miscinit.c:1048 utils/misc/guc.c:7517
+#, c-format
+msgid "could not read from file \"%s\": %m"
+msgstr "no se pudo leer el archivo «%s»: %m"
 
-#: utils/adt/geo_ops.c:317
-msgid "could not format \"path\" value"
-msgstr "no se pudo dar formato a «path»"
+#: utils/init/miscinit.c:1147 utils/init/miscinit.c:1160
+#, c-format
+msgid "\"%s\" is not a valid data directory"
+msgstr "«%s» no es un directorio de datos válido"
 
-#: utils/adt/geo_ops.c:392
+#: utils/init/miscinit.c:1149
 #, c-format
-msgid "invalid input syntax for type box: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo box: «%s»"
+msgid "File \"%s\" is missing."
+msgstr "Falta el archivo «%s»."
 
-#: utils/adt/geo_ops.c:956
+#: utils/init/miscinit.c:1162
 #, c-format
-msgid "invalid input syntax for type line: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo line: «%s»"
+msgid "File \"%s\" does not contain valid data."
+msgstr "El archivo «%s» no contiene datos válidos."
 
-#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
-#: utils/adt/geo_ops.c:1057
-msgid "type \"line\" not yet implemented"
-msgstr "el tipo «line» no está implementado"
+#: utils/init/miscinit.c:1164
+msgid "You might need to initdb."
+msgstr "Puede ser necesario ejecutar initdb."
 
-#: utils/adt/geo_ops.c:1411 utils/adt/geo_ops.c:1434
+#: utils/init/miscinit.c:1172
 #, c-format
-msgid "invalid input syntax for type path: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo «path»: «%s»"
+msgid ""
+"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
+"not compatible with this version %s."
+msgstr ""
+"El directorio de datos fue inicializado por PostgreSQL versión %ld.%ld, que "
+"no es compatible con esta versión %s."
 
-#: utils/adt/geo_ops.c:1473
-msgid "invalid number of points in external \"path\" value"
-msgstr "el número de puntos no es válido en el valor «path» externo"
+#: utils/init/miscinit.c:1220
+#, c-format
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "la sintaxis de lista no es válida para el parámetro «%s»"
 
-#: utils/adt/geo_ops.c:1814
+#: utils/init/miscinit.c:1257
 #, c-format
-msgid "invalid input syntax for type point: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo point: «%s»"
+msgid "loaded library \"%s\""
+msgstr "biblioteca «%s» cargada"
 
-#: utils/adt/geo_ops.c:2042
+#: utils/init/postinit.c:225
 #, c-format
-msgid "invalid input syntax for type lseg: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo lseg: «%s»"
+msgid "replication connection authorized: user=%s"
+msgstr "conexión de replicación autorizada: usuario=%s"
 
-#: utils/adt/geo_ops.c:2646
-msgid "function \"dist_lb\" not implemented"
-msgstr "la función «dist_lb» no está implementada"
+#: utils/init/postinit.c:229
+#, c-format
+msgid "connection authorized: user=%s database=%s"
+msgstr "conexión autorizada: usuario=%s database=%s"
 
-#: utils/adt/geo_ops.c:3159
-msgid "function \"close_lb\" not implemented"
-msgstr "la función «close_lb» no está implementada"
+#: utils/init/postinit.c:260
+#, c-format
+msgid "database \"%s\" has disappeared from pg_database"
+msgstr "la base de datos «%s» ha desaparecido de pg_database"
 
-#: utils/adt/geo_ops.c:3448
-msgid "cannot create bounding box for empty polygon"
-msgstr "no se puede crear una caja de contorno para un polígono vacío"
+#: utils/init/postinit.c:262
+#, c-format
+msgid "Database OID %u now seems to belong to \"%s\"."
+msgstr "Base de datos con OID %u ahora parece pertenecer a «%s»."
 
-#: utils/adt/geo_ops.c:3472 utils/adt/geo_ops.c:3484
+#: utils/init/postinit.c:282
 #, c-format
-msgid "invalid input syntax for type polygon: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo polygon: «%s»"
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "la base de datos «%s» no acepta conexiones"
 
-#: utils/adt/geo_ops.c:3524
-msgid "invalid number of points in external \"polygon\" value"
-msgstr "el número de puntos no es válido en «polygon» externo"
+#: utils/init/postinit.c:295
+#, c-format
+msgid "permission denied for database \"%s\""
+msgstr "permiso denegado a la base de datos «%s»"
 
-#: utils/adt/geo_ops.c:4047
-msgid "function \"poly_distance\" not implemented"
-msgstr "la función «poly_distance» no está implementada"
+#: utils/init/postinit.c:296
+msgid "User does not have CONNECT privilege."
+msgstr "Usuario no tiene privilegios de conexión."
 
-#: utils/adt/geo_ops.c:4359
-msgid "function \"path_center\" not implemented"
-msgstr "la función «path_center» no está implementada"
+#: utils/init/postinit.c:313
+#, c-format
+msgid "too many connections for database \"%s\""
+msgstr "demasiadas conexiones para la base de datos «%s»"
 
-#: utils/adt/geo_ops.c:4376
-msgid "open path cannot be converted to polygon"
-msgstr "no se puede convertir un camino abierto en polygon"
+#: utils/init/postinit.c:335 utils/init/postinit.c:342
+msgid "database locale is incompatible with operating system"
+msgstr "la configuración regional es incompatible con el sistema operativo"
 
-#: utils/adt/geo_ops.c:4543 utils/adt/geo_ops.c:4553 utils/adt/geo_ops.c:4568
-#: utils/adt/geo_ops.c:4574
+#: utils/init/postinit.c:336
 #, c-format
-msgid "invalid input syntax for type circle: \"%s\""
-msgstr "la sintaxis de entrada no es válida para el tipo circle: «%s»"
+msgid ""
+"The database was initialized with LC_COLLATE \"%s\",  which is not "
+"recognized by setlocale()."
+msgstr ""
+"La base de datos fue inicializada con LC_COLLATE «%s», el cual no es "
+"reconocido por setlocale()."
 
-#: utils/adt/geo_ops.c:4596 utils/adt/geo_ops.c:4604
-msgid "could not format \"circle\" value"
-msgstr "no se pudo dar formato al valor «circle»"
+#: utils/init/postinit.c:338 utils/init/postinit.c:345
+msgid ""
+"Recreate the database with another locale or install the missing locale."
+msgstr ""
+"Recree la base de datos con otra configuración regional, o instale la "
+"configuración regional faltante."
 
-#: utils/adt/geo_ops.c:4631
-msgid "invalid radius in external \"circle\" value"
-msgstr "el radio no es válido en el valor «circle» externo"
+#: utils/init/postinit.c:343
+#, c-format
+msgid ""
+"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
+"by setlocale()."
+msgstr ""
+"La base de datos fueron inicializada con LC_CTYPE «%s», el cual no es "
+"reconocido por setlocale()."
 
-#: utils/adt/geo_ops.c:5152
-msgid "cannot convert circle with radius zero to polygon"
-msgstr "no se puede convertir un círculo de radio cero a polygon"
+#: utils/init/postinit.c:599
+msgid "no roles are defined in this database system"
+msgstr "no hay roles definidos en esta base de datos"
 
-#: utils/adt/geo_ops.c:5157
-msgid "must request at least 2 points"
-msgstr "debe pedir al menos 2 puntos"
+#: utils/init/postinit.c:600
+#, c-format
+msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
+msgstr "Debería ejecutar imediatamente CREATE USER \"%s\" SUPERUSER;."
 
-#: utils/adt/geo_ops.c:5201 utils/adt/geo_ops.c:5224
-msgid "cannot convert empty polygon to circle"
-msgstr "no se puede convertir polígono vacío a circle"
+#: utils/init/postinit.c:623
+msgid "new replication connections are not allowed during database shutdown"
+msgstr ""
+"nuevas conexiones de replicación no son permitidas durante el apagado de la "
+"base de datos"
 
-#: utils/adt/int.c:162
-msgid "int2vector has too many elements"
-msgstr "int2vector tiene demasiados elementos"
+#: utils/init/postinit.c:627
+msgid "must be superuser to connect during database shutdown"
+msgstr ""
+"debe ser superusuario para conectarse durante el apagado de la base de datos"
 
-#: utils/adt/int.c:236
-msgid "invalid int2vector data"
-msgstr "datos de int2vector no válidos"
+#: utils/init/postinit.c:637
+msgid "must be superuser to connect in binary upgrade mode"
+msgstr "debe ser superusuario para conectarse en modo de actualización binaria"
 
-#: utils/adt/int.c:242 utils/adt/oid.c:212 utils/adt/oid.c:292
-msgid "oidvector has too many elements"
-msgstr "el oidvector tiene demasiados elementos"
+#: utils/init/postinit.c:651
+msgid ""
+"remaining connection slots are reserved for non-replication superuser "
+"connections"
+msgstr ""
+"las conexiones restantes están reservadas a superusuarios y no de replicación"
 
-#: utils/adt/int.c:1323 utils/adt/int8.c:1358 utils/adt/timestamp.c:4712
-#: utils/adt/timestamp.c:4793
-msgid "step size cannot equal zero"
-msgstr "el tamaño de paso no puede ser cero"
+#: utils/init/postinit.c:666
+msgid "must be replication role to start walsender"
+msgstr "debe ser ser rol de replicación para iniciar el walsender"
 
-#: utils/adt/int8.c:97 utils/adt/int8.c:132 utils/adt/numutils.c:53
-#: utils/adt/numutils.c:63 utils/adt/numutils.c:105
+#: utils/init/postinit.c:726
 #, c-format
-msgid "invalid input syntax for integer: \"%s\""
-msgstr "la sintaxis de entrada no es válida para integer: «%s»"
+msgid "database %u does not exist"
+msgstr "no existe la base de datos %u"
 
-#: utils/adt/int8.c:113
-#, c-format
-msgid "value \"%s\" is out of range for type bigint"
-msgstr "el valor «%s» está fuera de rango para el tipo bigint"
+#: utils/init/postinit.c:778
+msgid "It seems to have just been dropped or renamed."
+msgstr "Parece haber sido eliminada o renombrada."
 
-#: utils/adt/int8.c:502 utils/adt/int8.c:531 utils/adt/int8.c:552
-#: utils/adt/int8.c:582 utils/adt/int8.c:610 utils/adt/int8.c:628
-#: utils/adt/int8.c:672 utils/adt/int8.c:689 utils/adt/int8.c:758
-#: utils/adt/int8.c:779 utils/adt/int8.c:806 utils/adt/int8.c:833
-#: utils/adt/int8.c:854 utils/adt/int8.c:875 utils/adt/int8.c:902
-#: utils/adt/int8.c:942 utils/adt/int8.c:963 utils/adt/int8.c:990
-#: utils/adt/int8.c:1017 utils/adt/int8.c:1038 utils/adt/int8.c:1059
-#: utils/adt/int8.c:1086 utils/adt/int8.c:1259 utils/adt/int8.c:1298
-#: utils/adt/numeric.c:2115 utils/adt/varbit.c:1563
-msgid "bigint out of range"
-msgstr "bigint está fuera de rango"
-
-#: utils/adt/int8.c:1315
-msgid "OID out of range"
-msgstr "OID está fuera de rango"
-
-#: utils/adt/like_match.c:103 utils/adt/like_match.c:163
-msgid "LIKE pattern must not end with escape character"
-msgstr "el patrón LIKE no debe terminar con un carácter de escape"
+#: utils/init/postinit.c:796
+#, c-format
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "Falta el subdirectorio de base de datos «%s»."
 
-#: utils/adt/like_match.c:287 utils/adt/regexp.c:668
-msgid "invalid escape string"
-msgstr "la cadena de escape no es válida"
+#: utils/init/postinit.c:801
+#, c-format
+msgid "could not access directory \"%s\": %m"
+msgstr "no se pudo acceder al directorio «%s»: %m"
 
-#: utils/adt/like_match.c:288 utils/adt/regexp.c:669
-msgid "Escape string must be empty or one character."
-msgstr "La cadena de escape debe estar vacía o tener un solo carácter."
+#: utils/adt/acl.c:166 utils/adt/name.c:87
+msgid "identifier too long"
+msgstr "el identificador es demasiado largo"
 
-#: utils/adt/mac.c:65
+#: utils/adt/acl.c:167 utils/adt/name.c:88
 #, c-format
-msgid "invalid input syntax for type macaddr: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo macaddr: «%s»"
+msgid "Identifier must be less than %d characters."
+msgstr "El identificador debe ser menor a %d caracteres."
 
-#: utils/adt/mac.c:72
+#: utils/adt/acl.c:253
 #, c-format
-msgid "invalid octet value in \"macaddr\" value: \"%s\""
-msgstr "el valor de octeto no es válido en «macaddr»: «%s»"
+msgid "unrecognized key word: \"%s\""
+msgstr "palabra clave no reconocida: «%s»"
 
-#: utils/adt/misc.c:80
-msgid "must be superuser to signal other server processes"
-msgstr "debe ser superusuario para enviar señales a otros procesos"
+#: utils/adt/acl.c:254
+msgid "ACL key word must be \"group\" or \"user\"."
+msgstr "Palabra clave de ACL debe ser «group» o «user»."
 
-#: utils/adt/misc.c:89
-#, c-format
-msgid "PID %d is not a PostgreSQL server process"
-msgstr "el proceso con PID %d no es un proceso servidor PostgreSQL"
+#: utils/adt/acl.c:259
+msgid "missing name"
+msgstr "falta un nombre"
 
-#: utils/adt/misc.c:126
-msgid "must be superuser to signal the postmaster"
-msgstr "debe ser superusuario para enviar señales a postmaster"
+#: utils/adt/acl.c:260
+msgid "A name must follow the \"group\" or \"user\" key word."
+msgstr "Debe venir un nombre después de una palabra clave «group» o «user»."
 
-#: utils/adt/misc.c:131
+#: utils/adt/acl.c:266
+msgid "missing \"=\" sign"
+msgstr "falta un signo «=»"
+
+#: utils/adt/acl.c:319
 #, c-format
-msgid "failed to send signal to postmaster: %m"
-msgstr "no se pudo enviar la señal al postmaster: %m"
+msgid "invalid mode character: must be one of \"%s\""
+msgstr "carácter de modo no válido: debe ser uno de «%s»"
 
-#: utils/adt/misc.c:148
-msgid "must be superuser to rotate log files"
-msgstr "debe ser superusuario para rotar archivos de registro"
+#: utils/adt/acl.c:341
+msgid "a name must follow the \"/\" sign"
+msgstr "debe venir un nombre después del signo «/»"
 
-#: utils/adt/misc.c:153
-msgid "rotation not possible because log collection not active"
-msgstr ""
-"la rotación no es posible, porque la recolección del logs no está activa"
+#: utils/adt/acl.c:349
+#, c-format
+msgid "defaulting grantor to user ID %u"
+msgstr "usando el cedente por omisión con ID %u"
 
-#: utils/adt/misc.c:195
-msgid "global tablespace never has databases"
-msgstr "el tablespace global nunca tiene bases de datos"
+#: utils/adt/acl.c:540
+msgid "ACL array contains wrong data type"
+msgstr "el array ACL contiene tipo de datos incorrecto"
 
-#: utils/adt/misc.c:216
-#, c-format
-msgid "%u is not a tablespace OID"
-msgstr "%u no es un OID de tablespace"
+#: utils/adt/acl.c:544
+msgid "ACL arrays must be one-dimensional"
+msgstr "los array de ACL debe ser unidimensional"
 
-#: utils/adt/misc.c:352
-msgid "unreserved"
-msgstr "no reservada"
+#: utils/adt/acl.c:548
+msgid "ACL arrays must not contain null values"
+msgstr "los arrays de ACL no pueden contener valores nulos"
 
-#: utils/adt/misc.c:356
-msgid "unreserved (cannot be function or type name)"
-msgstr "no reservada (no puede ser nombre de función o tipo)"
+#: utils/adt/acl.c:572
+msgid "extra garbage at the end of the ACL specification"
+msgstr "basura extra al final de la especificación de la ACL"
 
-#: utils/adt/misc.c:360
-msgid "reserved (can be function or type name)"
-msgstr "reservada (puede ser nombre de función o tipo)"
+#: utils/adt/acl.c:1129
+msgid "grant options cannot be granted back to your own grantor"
+msgstr "la opción de grant no puede ser otorgada de vuelta a quien la otorgó"
 
-#: utils/adt/misc.c:364
-msgid "reserved"
-msgstr "reservada"
+#: utils/adt/acl.c:1190
+msgid "dependent privileges exist"
+msgstr "existen privilegios dependientes"
 
-#: utils/adt/nabstime.c:160
-#, c-format
-msgid "invalid time zone name: \"%s\""
-msgstr "el nombre de huso horario no es válido: «%s»"
+#: utils/adt/acl.c:1191
+msgid "Use CASCADE to revoke them too."
+msgstr "Use CASCADE para revocarlos también."
 
-#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
-msgid "cannot convert abstime \"invalid\" to timestamp"
-msgstr "no se puede convertir abstime «invalid» a timestamp"
+#: utils/adt/acl.c:1470
+msgid "aclinsert is no longer supported"
+msgstr "aclinsert ya no está soportado"
 
-#: utils/adt/nabstime.c:806
-msgid "invalid status in external \"tinterval\" value"
-msgstr "el estado no es válido en el valor «tinterval» externo"
+#: utils/adt/acl.c:1480
+msgid "aclremove is no longer supported"
+msgstr "aclremove ya no está soportado"
 
-#: utils/adt/nabstime.c:880
-msgid "cannot convert reltime \"invalid\" to interval"
-msgstr "no se puede convertir reltime «invalid» a interval"
+#: utils/adt/acl.c:1566 utils/adt/acl.c:1620
+#, c-format
+msgid "unrecognized privilege type: \"%s\""
+msgstr "tipo de privilegio no reconocido: «%s»"
 
-#: utils/adt/nabstime.c:1562
+#: utils/adt/acl.c:3359 utils/adt/regproc.c:118 utils/adt/regproc.c:139
+#: utils/adt/regproc.c:289
 #, c-format
-msgid "invalid input syntax for type tinterval: \"%s\""
-msgstr "la sintaxis de entrada no es válida para el tipo tinterval: «%s»"
+msgid "function \"%s\" does not exist"
+msgstr "no existe la función «%s»"
 
-#: utils/adt/network.c:118
+#: utils/adt/acl.c:4608
 #, c-format
-msgid "invalid cidr value: \"%s\""
-msgstr "el formato de cidr no es válido: «%s»"
+msgid "must be member of role \"%s\""
+msgstr "debe ser miembro del rol «%s»"
 
-#: utils/adt/network.c:119 utils/adt/network.c:249
-msgid "Value has bits set to right of mask."
-msgstr "El valor tiene bits a la derecha de la máscara."
+#: utils/adt/array_userfuncs.c:48
+msgid "could not determine input data types"
+msgstr "no se pudo determinar el tipo de datos de entrada"
 
-#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
-#: utils/adt/network.c:664
-#, c-format
-msgid "could not format inet value: %m"
-msgstr "no se pudo dar formato al valor inet: %m"
+#: utils/adt/array_userfuncs.c:82
+msgid "neither input type is an array"
+msgstr "ninguno de los tipos de entrada es un array"
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:217
-#, c-format
-msgid "invalid address family in external \"%s\" value"
-msgstr "la familia de la dirección no es válida en valor «%s» externo"
+#: utils/adt/array_userfuncs.c:103 utils/adt/array_userfuncs.c:113
+#: utils/adt/arrayfuncs.c:1276 utils/adt/float.c:1101 utils/adt/float.c:1160
+#: utils/adt/float.c:2711 utils/adt/float.c:2727 utils/adt/int.c:623
+#: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:693
+#: utils/adt/int.c:715 utils/adt/int.c:744 utils/adt/int.c:758
+#: utils/adt/int.c:773 utils/adt/int.c:912 utils/adt/int.c:933
+#: utils/adt/int.c:960 utils/adt/int.c:1000 utils/adt/int.c:1021
+#: utils/adt/int.c:1048 utils/adt/int.c:1079 utils/adt/int.c:1142
+#: utils/adt/int8.c:1211 utils/adt/numeric.c:2253 utils/adt/numeric.c:2262
+#: utils/adt/varbit.c:1111 utils/adt/varbit.c:1503 utils/adt/varlena.c:950
+#: utils/adt/varlena.c:1968
+msgid "integer out of range"
+msgstr "el entero está fuera de rango"
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:224
+#: utils/adt/array_userfuncs.c:121
+msgid "argument must be empty or one-dimensional array"
+msgstr "el argumento debe ser vacío o un array unidimensional"
+
+#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
+#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
+#: utils/adt/array_userfuncs.c:357
+msgid "cannot concatenate incompatible arrays"
+msgstr "no se pueden concatenar arrays incompatibles"
+
+#: utils/adt/array_userfuncs.c:225
 #, c-format
-msgid "invalid bits in external \"%s\" value"
-msgstr "bits no válidos en el valor «%s» externo"
+msgid ""
+"Arrays with element types %s and %s are not compatible for concatenation."
+msgstr ""
+"Los arrays con elementos de tipo %s y %s son incompatibles para la "
+"concatenación."
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:233
+#: utils/adt/array_userfuncs.c:264
 #, c-format
-msgid "invalid length in external \"%s\" value"
-msgstr "largo no válido en valor «%s» externo"
+msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
+msgstr ""
+"Los arrays de dimesiones %d y %d son incompatibles para la concatenación."
 
-#: utils/adt/network.c:248
-msgid "invalid external \"cidr\" value"
-msgstr "el valor externo «cidr» no es válido"
+#: utils/adt/array_userfuncs.c:301
+msgid ""
+"Arrays with differing element dimensions are not compatible for "
+"concatenation."
+msgstr ""
+"Los arrays con elementos de diferentes dimensiones son incompatibles para la "
+"concatenación."
 
-#: utils/adt/network.c:370 utils/adt/network.c:397
-#, c-format
-msgid "invalid mask length: %d"
-msgstr "el largo de el máscara no es válido: %d"
+#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
+msgid "Arrays with differing dimensions are not compatible for concatenation."
+msgstr ""
+"Los arrays con diferentes dimensiones son incompatibles para la "
+"concatenación."
 
-#: utils/adt/network.c:682
+#: utils/adt/array_userfuncs.c:426 utils/adt/arrayfuncs.c:1238
+#: utils/adt/arrayfuncs.c:2911 utils/adt/arrayfuncs.c:4936
 #, c-format
-msgid "could not format cidr value: %m"
-msgstr "no se pudo dar formato al valor cidr: %m"
-
-#: utils/adt/network.c:1255
-msgid "cannot AND inet values of different sizes"
-msgstr "no se puede hacer AND entre valores inet de distintos tamaños"
+msgid "invalid number of dimensions: %d"
+msgstr "número incorrecto de dimensiones: %d"
 
-#: utils/adt/network.c:1287
-msgid "cannot OR inet values of different sizes"
-msgstr "no se puede hacer OR entre valor inet de distintos tamaños"
+#: utils/adt/array_userfuncs.c:487
+msgid "could not determine input data type"
+msgstr "no se pudo determinar el tipo de dato de entrada"
 
-#: utils/adt/network.c:1348 utils/adt/network.c:1424
-msgid "result is out of range"
-msgstr "el resultado está fuera de rango"
+#: utils/adt/arrayfuncs.c:235 utils/adt/arrayfuncs.c:247
+msgid "missing dimension value"
+msgstr "falta un valor de dimensión"
 
-#: utils/adt/network.c:1389
-msgid "cannot subtract inet values of different sizes"
-msgstr "no se puede restar valores inet de distintos tamaños"
+#: utils/adt/arrayfuncs.c:257
+msgid "missing \"]\" in array dimensions"
+msgstr "falta un «]» en las dimensiones de array"
 
-#: utils/adt/numeric.c:352 utils/adt/numeric.c:379 utils/adt/numeric.c:3083
-#: utils/adt/numeric.c:3106 utils/adt/numeric.c:3130 utils/adt/numeric.c:3137
-#, c-format
-msgid "invalid input syntax for type numeric: \"%s\""
-msgstr "la sintaxis de entrada no es válida para el tipo numeric: «%s»"
+#: utils/adt/arrayfuncs.c:265 utils/adt/arrayfuncs.c:2436
+#: utils/adt/arrayfuncs.c:2464 utils/adt/arrayfuncs.c:2479
+msgid "upper bound cannot be less than lower bound"
+msgstr "el límite superior no puede ser menor que el límite inferior"
 
-#: utils/adt/numeric.c:482
-msgid "invalid length in external \"numeric\" value"
-msgstr "el largo no es válido en el valor «numeric» externo"
+#: utils/adt/arrayfuncs.c:277 utils/adt/arrayfuncs.c:303
+msgid "array value must start with \"{\" or dimension information"
+msgstr "el valor de array debe comenzar con «{» o información de dimensión"
 
-#: utils/adt/numeric.c:493
-msgid "invalid sign in external \"numeric\" value"
-msgstr "el signo no es válido en el valor «numeric» externo"
+#: utils/adt/arrayfuncs.c:291
+msgid "missing assignment operator"
+msgstr "falta un operador de asignación"
 
-#: utils/adt/numeric.c:503
-msgid "invalid digit in external \"numeric\" value"
-msgstr "hay un dígito no válido en el valor «numeric» externo"
+#: utils/adt/arrayfuncs.c:308 utils/adt/arrayfuncs.c:314
+msgid "array dimensions incompatible with array literal"
+msgstr "las dimensiones del array no son compatibles con el literal"
 
-#: utils/adt/numeric.c:634 utils/adt/numeric.c:648
+#: utils/adt/arrayfuncs.c:444 utils/adt/arrayfuncs.c:459
+#: utils/adt/arrayfuncs.c:468 utils/adt/arrayfuncs.c:482
+#: utils/adt/arrayfuncs.c:502 utils/adt/arrayfuncs.c:530
+#: utils/adt/arrayfuncs.c:535 utils/adt/arrayfuncs.c:575
+#: utils/adt/arrayfuncs.c:596 utils/adt/arrayfuncs.c:615
+#: utils/adt/arrayfuncs.c:725 utils/adt/arrayfuncs.c:734
+#: utils/adt/arrayfuncs.c:764 utils/adt/arrayfuncs.c:779
+#: utils/adt/arrayfuncs.c:832
 #, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
-msgstr "la precisión %d de NUMERIC debe estar entre 1 y %d"
+msgid "malformed array literal: \"%s\""
+msgstr "literal de array no es válido: «%s»"
 
-#: utils/adt/numeric.c:639
+#: utils/adt/arrayfuncs.c:871 utils/adt/arrayfuncs.c:1473
+#: utils/adt/arrayfuncs.c:2795 utils/adt/arrayfuncs.c:2943
+#: utils/adt/arrayfuncs.c:5036 utils/adt/arrayutils.c:93
+#: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
 #, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
-msgstr "la escala de NUMERIC, %d, debe estar entre 0 y la precisión %d"
+msgid "array size exceeds the maximum allowed (%d)"
+msgstr "el tamaño del array excede el máximo permitido (%d)"
 
-#: utils/adt/numeric.c:657
-msgid "invalid NUMERIC type modifier"
-msgstr "modificador de tipo NUMERIC no es válido"
+#: utils/adt/arrayfuncs.c:1249
+msgid "invalid array flags"
+msgstr "opciones de array no válidas"
 
-#: utils/adt/numeric.c:1690 utils/adt/numeric.c:3545
-msgid "value overflows numeric format"
-msgstr "el valor excede el formato numeric"
+#: utils/adt/arrayfuncs.c:1257
+msgid "wrong element type"
+msgstr "el tipo de elemento es erróneo"
 
-#: utils/adt/numeric.c:2038
-msgid "cannot convert NaN to integer"
-msgstr "no se puede convertir NaN a entero"
-
-#: utils/adt/numeric.c:2106
-msgid "cannot convert NaN to bigint"
-msgstr "no se puede convertir NaN a bigint"
-
-#: utils/adt/numeric.c:2154
-msgid "cannot convert NaN to smallint"
-msgstr "no se puede convertir NaN a smallint"
-
-#: utils/adt/numeric.c:3615
-msgid "numeric field overflow"
-msgstr "desbordamiento de campo numeric"
-
-#: utils/adt/numeric.c:3616
-#, c-format
-msgid ""
-"A field with precision %d, scale %d must round to an absolute value less "
-"than %s%d."
-msgstr ""
-"Un campo con precisión %d, escala %d debe redondear a un valor absoluto "
-"menor que %s%d."
-
-#: utils/adt/numeric.c:5064
-msgid "argument for function \"exp\" too big"
-msgstr "el argumento a la función «exp» es demasiado grande"
-
-#: utils/adt/numutils.c:77
+#: utils/adt/arrayfuncs.c:1307 utils/cache/lsyscache.c:2485
 #, c-format
-msgid "value \"%s\" is out of range for type integer"
-msgstr "el valor «%s» está fuera de rango para el tipo integer"
+msgid "no binary input function available for type %s"
+msgstr "no hay una función binaria de entrada para el tipo %s"
 
-#: utils/adt/numutils.c:83
+#: utils/adt/arrayfuncs.c:1447
 #, c-format
-msgid "value \"%s\" is out of range for type smallint"
-msgstr "el valor «%s» está fuera de rango para el tipo smallint"
+msgid "improper binary format in array element %d"
+msgstr "el formato binario no es válido en elemento %d de array"
 
-#: utils/adt/numutils.c:89
+#: utils/adt/arrayfuncs.c:1529 utils/cache/lsyscache.c:2518
 #, c-format
-msgid "value \"%s\" is out of range for 8-bit integer"
-msgstr "el valor «%s» está fuera de rango para un entero de 8 bits"
+msgid "no binary output function available for type %s"
+msgstr "no hay una función binaria de salida para el tipo %s"
 
-#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
-#, c-format
-msgid "invalid input syntax for type oid: \"%s\""
-msgstr "la sintaxis de entrada no es válida para el tipo oid: «%s»"
+#: utils/adt/arrayfuncs.c:1903
+msgid "slices of fixed-length arrays not implemented"
+msgstr "no está implementada la obtención de segmentos de arrays de largo fijo"
 
-#: utils/adt/oid.c:69 utils/adt/oid.c:107
-#, c-format
-msgid "value \"%s\" is out of range for type oid"
-msgstr "el valor «%s» está fuera de rango para el tipo oid"
+#: utils/adt/arrayfuncs.c:2076 utils/adt/arrayfuncs.c:2098
+#: utils/adt/arrayfuncs.c:2132 utils/adt/arrayfuncs.c:2418
+#: utils/adt/arrayfuncs.c:4916 utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4965
+msgid "wrong number of array subscripts"
+msgstr "número incorrecto de subíndices del array"
 
-#: utils/adt/oid.c:286
-msgid "invalid oidvector data"
-msgstr "datos de oidvector no válidos"
+#: utils/adt/arrayfuncs.c:2081 utils/adt/arrayfuncs.c:2174
+#: utils/adt/arrayfuncs.c:2469
+msgid "array subscript out of range"
+msgstr "los subíndices de arrays están fuera de rango"
 
-#: utils/adt/oracle_compat.c:892
-msgid "requested character too large"
-msgstr "el carácter solicitado es demasiado grande"
+#: utils/adt/arrayfuncs.c:2086
+msgid "cannot assign null value to an element of a fixed-length array"
+msgstr ""
+"no se puede asignar un valor nulo a un elemento de un array de longitud fija"
 
-#: utils/adt/oracle_compat.c:938 utils/adt/oracle_compat.c:992
-#, c-format
-msgid "requested character too large for encoding: %d"
-msgstr "el carácter pedido es demasiado largo para el encoding: %d"
+#: utils/adt/arrayfuncs.c:2372
+msgid "updates on slices of fixed-length arrays not implemented"
+msgstr ""
+"no están implementadas las actualizaciones en segmentos de arrays de largo "
+"fija"
 
-#: utils/adt/oracle_compat.c:985
-msgid "null character not permitted"
-msgstr "el carácter nulo no está permitido"
+#: utils/adt/arrayfuncs.c:2408 utils/adt/arrayfuncs.c:2495
+msgid "source array too small"
+msgstr "el array de origen es demasiado pequeño"
 
-#: utils/adt/pseudotypes.c:94
-msgid "cannot accept a value of type any"
-msgstr "no se puede aceptar un valor de tipo any"
+#: utils/adt/arrayfuncs.c:3050
+msgid "null array element not allowed in this context"
+msgstr "los arrays con elementos null no son permitidos en este contexto"
 
-#: utils/adt/pseudotypes.c:107
-msgid "cannot display a value of type any"
-msgstr "no se puede desplegar un valor de tipo any"
+#: utils/adt/arrayfuncs.c:3153 utils/adt/arrayfuncs.c:3361
+#: utils/adt/arrayfuncs.c:3678
+msgid "cannot compare arrays of different element types"
+msgstr "no se pueden comparar arrays con elementos de distintos tipos"
 
-#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
-msgid "cannot accept a value of type anyarray"
-msgstr "no se puede aceptar un valor de tipo anyarray"
+#: utils/adt/arrayfuncs.c:3563
+#, c-format
+msgid "could not identify a hash function for type %s"
+msgstr "no se pudo identificar una función de hash para el tipo %s"
 
-#: utils/adt/pseudotypes.c:174
-msgid "cannot accept a value of type anyenum"
-msgstr "no se puede aceptar un valor de tipo anyenum"
+#: utils/adt/arrayfuncs.c:4814 utils/adt/arrayfuncs.c:4854
+msgid "dimension array or low bound array cannot be null"
+msgstr ""
+"el array de dimensiones o el array de límites inferiores debe ser no nulo"
 
-#: utils/adt/pseudotypes.c:224
-msgid "cannot accept a value of type trigger"
-msgstr "no se puede aceptar un valor de tipo trigger"
+#: utils/adt/arrayfuncs.c:4917 utils/adt/arrayfuncs.c:4949
+msgid "Dimension array must be one dimensional."
+msgstr "El array de dimensiones debe ser unidimensional."
 
-#: utils/adt/pseudotypes.c:237
-msgid "cannot display a value of type trigger"
-msgstr "no se puede desplegar un valor de tipo trigger"
+#: utils/adt/arrayfuncs.c:4922 utils/adt/arrayfuncs.c:4954
+msgid "wrong range of array subscripts"
+msgstr "rango incorrecto en los subíndices del array"
 
-#: utils/adt/pseudotypes.c:251
-msgid "cannot accept a value of type language_handler"
-msgstr "no se puede aceptar un valor de tipo language_handler"
+#: utils/adt/arrayfuncs.c:4923 utils/adt/arrayfuncs.c:4955
+msgid "Lower bound of dimension array must be one."
+msgstr "El límite inferior del array de dimensiones debe ser uno."
 
-#: utils/adt/pseudotypes.c:264
-msgid "cannot display a value of type language_handler"
-msgstr "no se puede desplegar un valor de tipo language_handler"
+#: utils/adt/arrayfuncs.c:4928 utils/adt/arrayfuncs.c:4960
+msgid "dimension values cannot be null"
+msgstr "los valores de dimensión no pueden ser null"
 
-#: utils/adt/pseudotypes.c:278
-msgid "cannot accept a value of type internal"
-msgstr "no se puede aceptar un valor de tipo internal"
+#: utils/adt/arrayfuncs.c:4966
+msgid "Low bound array has different size than dimensions array."
+msgstr ""
+"El array de límites inferiores tiene tamaño diferente que el array de "
+"dimensiones."
 
-#: utils/adt/pseudotypes.c:291
-msgid "cannot display a value of type internal"
-msgstr "no se puede desplegar un valor de tipo internal"
+#: utils/adt/arrayutils.c:209
+msgid "typmod array must be type cstring[]"
+msgstr "el array de typmod debe ser de tipo cstring[]"
 
-#: utils/adt/pseudotypes.c:305
-msgid "cannot accept a value of type opaque"
-msgstr "no se puede aceptar un valor de tipo opaque"
+#: utils/adt/arrayutils.c:214
+msgid "typmod array must be one-dimensional"
+msgstr "array de typmod debe ser unidimensional"
 
-#: utils/adt/pseudotypes.c:318
-msgid "cannot display a value of type opaque"
-msgstr "no se puede desplegar un valor de tipo opaque"
+#: utils/adt/arrayutils.c:219
+msgid "typmod array must not contain nulls"
+msgstr "los arrays de typmod no deben contener valores nulos"
 
-#: utils/adt/pseudotypes.c:332
-msgid "cannot accept a value of type anyelement"
-msgstr "no se puede aceptar un valor de tipo anyelement"
+#: utils/adt/ascii.c:75
+#, c-format
+msgid "encoding conversion from %s to ASCII not supported"
+msgstr "la conversión de codificación de %s a ASCII no está soportada"
 
-#: utils/adt/pseudotypes.c:345
-msgid "cannot display a value of type anyelement"
-msgstr "no se puede desplegar un valor de tipo anyelement"
+#: utils/adt/bool.c:153
+#, c-format
+msgid "invalid input syntax for type boolean: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo boolean: «%s»"
 
-#: utils/adt/pseudotypes.c:358
-msgid "cannot accept a value of type anynonarray"
-msgstr "no se puede aceptar un valor de tipo anynonarray"
+#: utils/adt/cash.c:232
+#, c-format
+msgid "invalid input syntax for type money: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo money: «%s»"
 
-#: utils/adt/pseudotypes.c:371
-msgid "cannot display a value of type anynonarray"
-msgstr "no se puede desplegar un valor de tipo anynonarray"
+#: utils/adt/cash.c:493 utils/adt/cash.c:543 utils/adt/cash.c:594
+#: utils/adt/cash.c:643 utils/adt/cash.c:695 utils/adt/cash.c:745
+#: utils/adt/float.c:764 utils/adt/float.c:828 utils/adt/float.c:2470
+#: utils/adt/float.c:2533 utils/adt/geo_ops.c:4130 utils/adt/int.c:730
+#: utils/adt/int.c:875 utils/adt/int.c:974 utils/adt/int.c:1063
+#: utils/adt/int.c:1093 utils/adt/int.c:1117 utils/adt/int8.c:596
+#: utils/adt/int8.c:647 utils/adt/int8.c:828 utils/adt/int8.c:927
+#: utils/adt/int8.c:1016 utils/adt/int8.c:1115 utils/adt/numeric.c:4507
+#: utils/adt/numeric.c:4790 utils/adt/timestamp.c:2876
+msgid "division by zero"
+msgstr "división por cero"
 
-#: utils/adt/pseudotypes.c:384
-msgid "cannot accept a value of a shell type"
-msgstr "no se puede aceptar un valor de un tipo inconcluso"
+#: utils/adt/char.c:169
+msgid "\"char\" out of range"
+msgstr "«char» está fuera de rango"
 
-#: utils/adt/pseudotypes.c:397
-msgid "cannot display a value of a shell type"
-msgstr "no se puede desplegar un valor de un tipo inconcluso"
+#: utils/adt/date.c:66 utils/adt/timestamp.c:92 utils/adt/varbit.c:51
+#: utils/adt/varchar.c:43
+msgid "invalid type modifier"
+msgstr "el modificador de tipo no es válido"
 
-#: utils/adt/regexp.c:269 utils/adt/varlena.c:2797
+#: utils/adt/date.c:71
 #, c-format
-msgid "regular expression failed: %s"
-msgstr "la expresión regular falló: %s"
+msgid "TIME(%d)%s precision must not be negative"
+msgstr "la precisión de TIME(%d)%s no debe ser negativa"
 
-#: utils/adt/regexp.c:404
+#: utils/adt/date.c:77
 #, c-format
-msgid "invalid regexp option: \"%c\""
-msgstr "la opción de expresión regular no es válida: «%c»"
-
-#: utils/adt/regexp.c:865
-msgid "regexp_split does not support the global option"
-msgstr "regex_split no soporta la opción «global»"
+msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
+msgstr "la precisión de TIME(%d)%s fue reducida al máximo permitido, %d"
 
-#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
-#, c-format
-msgid "more than one function named \"%s\""
-msgstr "existe más de una función llamada «%s»"
+#: utils/adt/date.c:142 utils/adt/datetime.c:1186 utils/adt/datetime.c:1934
+msgid "date/time value \"current\" is no longer supported"
+msgstr "valor de hora/fecha «current» ya no está soportado"
 
-#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
+#: utils/adt/date.c:167
 #, c-format
-msgid "more than one operator named %s"
-msgstr "existe más de un operador llamado %s"
-
-#: utils/adt/regproc.c:635 utils/adt/regproc.c:1485 utils/adt/ruleutils.c:5517
-#: utils/adt/ruleutils.c:5572 utils/adt/ruleutils.c:5609
-msgid "too many arguments"
-msgstr "demasiados argumentos"
+msgid "date out of range: \"%s\""
+msgstr "fecha fuera de rango: «%s»"
 
-#: utils/adt/regproc.c:636
-msgid "Provide two argument types for operator."
-msgstr "Provea dos tipos de argumento para un operador."
+#: utils/adt/date.c:217 utils/adt/xml.c:1689
+msgid "date out of range"
+msgstr "la fecha fuera de rango"
 
-#: utils/adt/regproc.c:1320 utils/adt/regproc.c:1325 utils/adt/varlena.c:2198
-#: utils/adt/varlena.c:2203
-msgid "invalid name syntax"
-msgstr "la sintaxis de nombre no es válida"
+#: utils/adt/date.c:359
+msgid "cannot subtract infinite dates"
+msgstr "no se pueden restar fechas infinitas"
 
-#: utils/adt/regproc.c:1383
-msgid "expected a left parenthesis"
-msgstr "se esperaba un paréntesis izquierdo"
+#: utils/adt/date.c:416 utils/adt/date.c:453
+msgid "date out of range for timestamp"
+msgstr "fecha fuera de rango para timestamp"
 
-#: utils/adt/regproc.c:1399
-msgid "expected a right parenthesis"
-msgstr "se esperaba un paréntesis derecho"
+#: utils/adt/date.c:913 utils/adt/date.c:960 utils/adt/date.c:1516
+#: utils/adt/date.c:1553 utils/adt/date.c:2427 utils/adt/formatting.c:3185
+#: utils/adt/formatting.c:3217 utils/adt/formatting.c:3285
+#: utils/adt/nabstime.c:480 utils/adt/nabstime.c:523 utils/adt/nabstime.c:553
+#: utils/adt/nabstime.c:596 utils/adt/timestamp.c:226
+#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
+#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
+#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
+#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
+#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
+#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
+#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
+#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
+#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
+#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
+#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
+#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
+#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
+#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
+#: utils/adt/timestamp.c:4614 utils/adt/xml.c:1712 utils/adt/xml.c:1719
+#: utils/adt/xml.c:1739 utils/adt/xml.c:1746
+msgid "timestamp out of range"
+msgstr "el timestamp está fuera de rango"
 
-#: utils/adt/regproc.c:1418
-msgid "expected a type name"
-msgstr "se esperaba un nombre de tipo"
+#: utils/adt/date.c:986
+msgid "cannot convert reserved abstime value to date"
+msgstr "no se puede convertir un valor reservado de abstime a date"
 
-#: utils/adt/regproc.c:1450
-msgid "improper type name"
-msgstr "el nombre de tipo no es válido"
+#: utils/adt/date.c:1140 utils/adt/date.c:1147 utils/adt/date.c:1915
+#: utils/adt/date.c:1922
+msgid "time out of range"
+msgstr "hora fuera de rango"
 
-#: utils/adt/ri_triggers.c:407 utils/adt/ri_triggers.c:2803
-#: utils/adt/ri_triggers.c:3454 utils/adt/ri_triggers.c:3486
+#: utils/adt/date.c:1793 utils/adt/date.c:1810
 #, c-format
-msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
-msgstr "inserción o actualización en la tabla «%s» viola la llave foránea «%s»"
+msgid "\"time\" units \"%s\" not recognized"
+msgstr "las unidades de «time» «%s» no son reconocidas"
 
-#: utils/adt/ri_triggers.c:410 utils/adt/ri_triggers.c:2806
-msgid "MATCH FULL does not allow mixing of null and nonnull key values."
-msgstr "MATCH FULL no permite la mezcla de valores de clave nulos y no nulos."
+#: utils/adt/date.c:1932
+msgid "time zone displacement out of range"
+msgstr "desplazamiento de huso horario fuera de rango"
 
-#: utils/adt/ri_triggers.c:3016
+#: utils/adt/date.c:2557 utils/adt/date.c:2574
 #, c-format
-msgid "function \"%s\" must be fired for INSERT"
-msgstr "la función «%s» debe ser ejecutada en INSERT"
+msgid "\"time with time zone\" units \"%s\" not recognized"
+msgstr "las unidades de «timestamp with time zone» «%s» no son reconocidas"
 
-#: utils/adt/ri_triggers.c:3022
+#: utils/adt/date.c:2632 utils/adt/datetime.c:928 utils/adt/datetime.c:1663
+#: utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
 #, c-format
-msgid "function \"%s\" must be fired for UPDATE"
-msgstr "la función «%s» debe ser ejecutada en UPDATE"
+msgid "time zone \"%s\" not recognized"
+msgstr "el huso horario «%s» no es reconocido"
 
-#: utils/adt/ri_triggers.c:3036
+#: utils/adt/date.c:2672
 #, c-format
-msgid "function \"%s\" must be fired for DELETE"
-msgstr "la función «%s» debe ser ejecutada en DELETE"
+msgid "\"interval\" time zone \"%s\" not valid"
+msgstr "el huso horario «%s» de «interval» no es válido"
 
-#: utils/adt/ri_triggers.c:3065
+#: utils/adt/datetime.c:3532 utils/adt/datetime.c:3539
 #, c-format
-msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
-msgstr "no hay una entrada en pg_constraint para el trigger «%s» en tabla «%s»"
+msgid "date/time field value out of range: \"%s\""
+msgstr "el valor de hora/fecha está fuera de rango: «%s»"
 
-#: utils/adt/ri_triggers.c:3067
-msgid ""
-"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
-"ADD CONSTRAINT."
-msgstr ""
-"Elimine este trigger de integridad referencial y sus pares, y utilice ALTER "
-"TABLE ADD CONSTRAINT."
+#: utils/adt/datetime.c:3541
+msgid "Perhaps you need a different \"datestyle\" setting."
+msgstr "Quizás necesite una configuración diferente de «datestyle»."
 
-#: utils/adt/ri_triggers.c:3421
+#: utils/adt/datetime.c:3546
 #, c-format
-msgid ""
-"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
-"unexpected result"
-msgstr ""
-"la consulta de integridad referencial en «%s» de la restricción «%s» en «%s» "
-"entregó un resultado inesperado"
+msgid "interval field value out of range: \"%s\""
+msgstr "el valor de interval está fuera de rango: «%s»"
 
-#: utils/adt/ri_triggers.c:3425
-msgid "This is most likely due to a rule having rewritten the query."
-msgstr ""
-"Esto probablemente es causado por una regla que reescribió la consulta."
-
-#: utils/adt/ri_triggers.c:3456
+#: utils/adt/datetime.c:3552
 #, c-format
-msgid "No rows were found in \"%s\"."
-msgstr "No se encontraron registros en «%s»."
+msgid "time zone displacement out of range: \"%s\""
+msgstr "el desplazamiento de huso horario está fuera de rango: «%s»"
 
-#: utils/adt/ri_triggers.c:3488
+#. translator: first %s is inet or cidr
+#: utils/adt/datetime.c:3559 utils/adt/network.c:107
 #, c-format
-msgid "Key (%s)=(%s) is not present in table \"%s\"."
-msgstr "La llave (%s)=(%s) no está presente en la tabla «%s»."
+msgid "invalid input syntax for type %s: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo %s: «%s»"
 
-#: utils/adt/ri_triggers.c:3494
-#, c-format
-msgid ""
-"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
-"table \"%s\""
-msgstr "update o delete en «%s» viola la llave foránea «%s» en la tabla «%s»"
+#: utils/adt/datum.c:80 utils/adt/datum.c:92
+msgid "invalid Datum pointer"
+msgstr "puntero a Datum no válido"
 
-#: utils/adt/ri_triggers.c:3497
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:189
 #, c-format
-msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
-msgstr "La llave (%s)=(%s) todavía es referida desde la tabla «%s»."
-
-#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
-msgid "input of anonymous composite types is not implemented"
-msgstr "el ingreso de tipos compuestos anónimos no está implementado"
+msgid "could not open tablespace directory \"%s\": %m"
+msgstr "no se pudo abrir el directorio de tablespace «%s»: %m"
 
-#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
-#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
+#: utils/adt/domains.c:80
 #, c-format
-msgid "malformed record literal: \"%s\""
-msgstr "literal de record no es válido: «%s»"
+msgid "type %s is not a domain"
+msgstr "tipo «%s» no es un dominio"
 
-#: utils/adt/rowtypes.c:152
-msgid "Missing left parenthesis."
-msgstr "Falta paréntesis izquierdo."
+#: utils/adt/encode.c:55 utils/adt/encode.c:91
+#, c-format
+msgid "unrecognized encoding: \"%s\""
+msgstr "no se reconoce la codificación: «%s»"
 
-#: utils/adt/rowtypes.c:180
-msgid "Too few columns."
-msgstr "Muy pocas columnas."
+#: utils/adt/encode.c:150
+#, c-format
+msgid "invalid hexadecimal digit: \"%c\""
+msgstr "el dígito hexadecimal no es válido: «%c»"
 
-#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
-msgid "Unexpected end of input."
-msgstr "Fin inesperado de la entrada."
+#: utils/adt/encode.c:178
+msgid "invalid hexadecimal data: odd number of digits"
+msgstr "el dato hexadecimal no es válido: tiene un número impar de dígitos"
 
-#: utils/adt/rowtypes.c:263
-msgid "Too many columns."
-msgstr "Demasiadas columnas."
+#: utils/adt/encode.c:295
+msgid "unexpected \"=\""
+msgstr "«=» inesperado"
 
-#: utils/adt/rowtypes.c:271
-msgid "Junk after right parenthesis."
-msgstr "Basura después del paréntesis derecho."
+#: utils/adt/encode.c:307
+msgid "invalid symbol"
+msgstr "símbolo no válido"
 
-#: utils/adt/rowtypes.c:522
-#, c-format
-msgid "wrong number of columns: %d, expected %d"
-msgstr "número de columnas erróneo: %d, se esperaban %d"
+#: utils/adt/encode.c:327
+msgid "invalid end sequence"
+msgstr "secuencia de término no válida"
 
-#: utils/adt/rowtypes.c:549
-#, c-format
-msgid "wrong data type: %u, expected %u"
-msgstr "tipo de dato erróneo: %u, se esperaba %u"
+#: utils/adt/encode.c:441 utils/adt/encode.c:506 utils/adt/varlena.c:246
+#: utils/adt/varlena.c:287
+msgid "invalid input syntax for type bytea"
+msgstr "sintaxis de entrada no válida para tipo bytea"
 
-#: utils/adt/rowtypes.c:610
+#: utils/adt/enum.c:48 utils/adt/enum.c:58 utils/adt/enum.c:113
+#: utils/adt/enum.c:123
 #, c-format
-msgid "improper binary format in record column %d"
-msgstr "formato binario incorrecto en la columna record %d"
+msgid "invalid input value for enum %s: \"%s\""
+msgstr "la sintaxis de entrada no es válida para el enum %s: «%s»"
 
-#: utils/adt/rowtypes.c:896 utils/adt/rowtypes.c:1122
+#: utils/adt/enum.c:85 utils/adt/enum.c:148 utils/adt/enum.c:198
 #, c-format
-msgid "cannot compare dissimilar column types %s and %s at record column %d"
-msgstr ""
-"no se pueden comparar los tipos de columnas disímiles %s y %s en la columna "
-"%d"
+msgid "invalid internal value for enum: %u"
+msgstr "el valor interno no es válido para enum: %u"
 
-#: utils/adt/rowtypes.c:974 utils/adt/rowtypes.c:1185
-msgid "cannot compare record types with different numbers of columns"
-msgstr "no se pueden comparar registros con cantidad distinta de columnas"
+#: utils/adt/enum.c:357 utils/adt/enum.c:386 utils/adt/enum.c:426
+#: utils/adt/enum.c:446
+msgid "could not determine actual enum type"
+msgstr "no se pudo determinar el tipo enum efectivo"
 
-#: utils/adt/ruleutils.c:2237
+#: utils/adt/enum.c:365 utils/adt/enum.c:394
 #, c-format
-msgid "rule \"%s\" has unsupported event type %d"
-msgstr "la regla «%s» tiene el tipo de evento no soportado %d"
+msgid "enum %s contains no values"
+msgstr "el enum %s no contiene valores"
 
-#: utils/adt/selfuncs.c:4762 utils/adt/selfuncs.c:5191
-msgid "case insensitive matching not supported on type bytea"
-msgstr "no está soportada la comparación insensible a mayúsculas en bytea"
+#: utils/adt/float.c:54
+msgid "value out of range: overflow"
+msgstr "valor fuera de rango: desbordamiento"
 
-#: utils/adt/selfuncs.c:4867 utils/adt/selfuncs.c:5351
-msgid "regular-expression matching not supported on type bytea"
-msgstr "no está soportada la comparación con expresiones regulares en bytea"
+#: utils/adt/float.c:59
+msgid "value out of range: underflow"
+msgstr "valor fuera de rango: desbordamiento por abajo"
 
-#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
+#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
 #, c-format
-msgid "invalid input syntax for type tid: \"%s\""
-msgstr "la sintaxis de entrada no es válida para tipo tid: «%s»"
+msgid "invalid input syntax for type real: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo real: «%s»"
 
-#: utils/adt/timestamp.c:97
+#: utils/adt/float.c:242
 #, c-format
-msgid "TIMESTAMP(%d)%s precision must not be negative"
-msgstr "la precisión de TIMESTAMP(%d)%s no debe ser negativa"
+msgid "\"%s\" is out of range for type real"
+msgstr "«%s» está fuera de rango para el tipo real"
 
-#: utils/adt/timestamp.c:103
+#: utils/adt/float.c:399 utils/adt/float.c:440 utils/adt/float.c:491
+#: utils/adt/numeric.c:3969 utils/adt/numeric.c:3995
 #, c-format
-msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
-msgstr "la precisión de TIMESTAMP(%d)%s fue reducida al máximo permitido, %d"
+msgid "invalid input syntax for type double precision: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo double precision: «%s»"
 
-#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
+#: utils/adt/float.c:435
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp fuera de rango: «%s»"
+msgid "\"%s\" is out of range for type double precision"
+msgstr "«%s» está fuera de rango para el tipo double precision"
 
-#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
-#: utils/adt/timestamp.c:664
-#, c-format
-msgid "date/time value \"%s\" is no longer supported"
-msgstr "el valor de date/time «%s» ya no está soportado"
+#: utils/adt/float.c:1119 utils/adt/float.c:1177 utils/adt/int.c:349
+#: utils/adt/int.c:789 utils/adt/int.c:818 utils/adt/int.c:839
+#: utils/adt/int.c:859 utils/adt/int.c:891 utils/adt/int.c:1157
+#: utils/adt/int8.c:1236 utils/adt/numeric.c:2354 utils/adt/numeric.c:2365
+msgid "smallint out of range"
+msgstr "smallint está fuera de rango"
 
-#: utils/adt/timestamp.c:260
-msgid "timestamp cannot be NaN"
-msgstr "el timestamp no puede ser NaN"
+#: utils/adt/float.c:1303 utils/adt/numeric.c:5183
+msgid "cannot take square root of a negative number"
+msgstr "no se puede calcular la raíz cuadrada un de número negativo"
 
-#: utils/adt/timestamp.c:370
-#, c-format
-msgid "timestamp(%d) precision must be between %d and %d"
-msgstr "la precisión de timestamp(%d) debe estar entre %d y %d"
+#: utils/adt/float.c:1345 utils/adt/numeric.c:2166
+msgid "zero raised to a negative power is undefined"
+msgstr "cero elevado a una potencia negativa es indefinido"
 
-#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
-#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
-msgid "interval out of range"
-msgstr "interval fuera de rango"
+#: utils/adt/float.c:1349 utils/adt/numeric.c:2172
+msgid "a negative number raised to a non-integer power yields a complex result"
+msgstr ""
+"un número negativo elevado a una potencia no positiva entrega un resultado "
+"complejo"
 
-#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
-msgid "invalid INTERVAL type modifier"
-msgstr "modificador de tipo INTERVAL no válido"
+#: utils/adt/float.c:1415 utils/adt/float.c:1445 utils/adt/numeric.c:5401
+msgid "cannot take logarithm of zero"
+msgstr "no se puede calcular logaritmo de cero"
 
-#: utils/adt/timestamp.c:803
-#, c-format
-msgid "INTERVAL(%d) precision must not be negative"
-msgstr "la precisión de INTERVAL(%d) no debe ser negativa"
+#: utils/adt/float.c:1419 utils/adt/float.c:1449 utils/adt/numeric.c:5405
+msgid "cannot take logarithm of a negative number"
+msgstr "no se puede calcular logaritmo de un número negativo"
 
-#: utils/adt/timestamp.c:809
-#, c-format
-msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
-msgstr "la precisión de INTERVAL(%d) fue reducida al máximo permitido, %d"
+#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
+#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
+#: utils/adt/float.c:1604 utils/adt/float.c:1625
+msgid "input is out of range"
+msgstr "la entrada está fuera de rango"
 
-#: utils/adt/timestamp.c:1101
-#, c-format
-msgid "interval(%d) precision must be between %d and %d"
-msgstr "la precisión de interval(%d) debe estar entre %d y %d"
+#: utils/adt/float.c:2687 utils/adt/numeric.c:1171
+msgid "count must be greater than zero"
+msgstr "count debe ser mayor que cero"
 
-#: utils/adt/timestamp.c:2306
-msgid "cannot subtract infinite timestamps"
-msgstr "no se pueden restar timestamps infinitos"
+#: utils/adt/float.c:2692 utils/adt/numeric.c:1178
+msgid "operand, lower bound and upper bound cannot be NaN"
+msgstr "el operando, límite inferior y límite superior no pueden ser NaN"
 
-#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
-#: utils/adt/timestamp.c:4020
-#, c-format
-msgid "timestamp units \"%s\" not supported"
-msgstr "las unidades de timestamp «%s» no están soportadas"
+#: utils/adt/float.c:2698
+msgid "lower and upper bounds must be finite"
+msgstr "los límites inferior y superior deben ser finitos"
 
-#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
-#, c-format
-msgid "timestamp units \"%s\" not recognized"
-msgstr "las unidades de timestamp «%s» no son reconocidas"
+#: utils/adt/float.c:2736 utils/adt/numeric.c:1191
+msgid "lower bound cannot equal upper bound"
+msgstr "el límite superior no puede ser igual al límite inferior"
 
-#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
-#: utils/adt/timestamp.c:4233
-#, c-format
-msgid "timestamp with time zone units \"%s\" not supported"
-msgstr "las unidades de timestamp with time zone «%s» no están soportadas"
+#: utils/adt/formatting.c:492
+msgid "invalid format specification for an interval value"
+msgstr "especificación de formato no válida para un valor de interval"
 
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
-#, c-format
-msgid "timestamp with time zone units \"%s\" not recognized"
-msgstr "las unidades de timestamp with time zone «%s» no son reconocidas"
+#: utils/adt/formatting.c:493
+msgid "Intervals are not tied to specific calendar dates."
+msgstr ""
+"Los Interval no están ... a valores determinados de fechas de calendario."
 
-#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
-#, c-format
-msgid "interval units \"%s\" not supported"
-msgstr "las unidades de interval «%s» no están soportadas"
+#: utils/adt/formatting.c:1060
+msgid "\"EEEE\" must be the last pattern used"
+msgstr "«EEEE» debe ser el último patrón usado"
 
-#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
-#, c-format
-msgid "interval units \"%s\" not recognized"
-msgstr "las unidades de interval «%s» no son reconocidas"
+#: utils/adt/formatting.c:1068
+msgid "\"9\" must be ahead of \"PR\""
+msgstr "«9» debe ir antes de «PR»"
 
-#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
-#, c-format
-msgid "could not convert to time zone \"%s\""
-msgstr "no se pudo convertir al huso horario «%s»"
+#: utils/adt/formatting.c:1084
+msgid "\"0\" must be ahead of \"PR\""
+msgstr "«0» debe ir antes de «PR»"
 
-#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
-#, c-format
-msgid "interval time zone \"%s\" must not specify month"
-msgstr "el intervalo de huso horario «%s» no debe especificar mes"
+#: utils/adt/formatting.c:1110
+msgid "multiple decimal points"
+msgstr "hay múltiples puntos decimales"
 
-#: utils/adt/trigfuncs.c:41
-msgid "suppress_redundant_updates_trigger: must be called as trigger"
-msgstr "suppress_redundant_updates_trigger: debe ser invocado como trigger"
+#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+msgid "cannot use \"V\" and decimal point together"
+msgstr "no se puede usar «V» y un punto decimal simultáneamente"
 
-#: utils/adt/trigfuncs.c:47
-msgid "suppress_redundant_updates_trigger: must be called on update"
-msgstr "suppress_redundant_updates_trigger: debe ser invocado en «UPDATE»"
+#: utils/adt/formatting.c:1126
+msgid "cannot use \"S\" twice"
+msgstr "no se puede usar «S» dos veces"
 
-#: utils/adt/trigfuncs.c:53
-msgid "suppress_redundant_updates_trigger: must be called before update"
-msgstr "suppress_redundant_updates_trigger: debe ser invocado «BEFORE UPDATE»"
+#: utils/adt/formatting.c:1130
+msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
+msgstr "no se puede usar «S» y «PL»/«MI»/«SG»/«PR» simultáneamente"
 
-#: utils/adt/trigfuncs.c:59
-msgid "suppress_redundant_updates_trigger: must be called for each row"
-msgstr "suppress_redundant_updates_trigger: debe ser invocado «FOR EACH ROW»"
+#: utils/adt/formatting.c:1150
+msgid "cannot use \"S\" and \"MI\" together"
+msgstr "no se puede usar «S» y «MI» simultáneamente"
 
-#: utils/adt/tsgistidx.c:100
-msgid "gtsvector_in not implemented"
-msgstr "gtsvector_in no está implementado"
+#: utils/adt/formatting.c:1160
+msgid "cannot use \"S\" and \"PL\" together"
+msgstr "no se puede usar «S» y «PL» simultáneamente"
 
-#: utils/adt/tsquery.c:156 utils/adt/tsquery.c:392
-#: utils/adt/tsvector_parser.c:136
-#, c-format
-msgid "syntax error in tsquery: \"%s\""
-msgstr "error de sintaxis en tsquery: «%s»"
+#: utils/adt/formatting.c:1170
+msgid "cannot use \"S\" and \"SG\" together"
+msgstr "no se puede usar «S» y «SG» simultáneamente"
 
-#: utils/adt/tsquery.c:177
-#, c-format
-msgid "no operand in tsquery: \"%s\""
-msgstr "no hay operando en tsquery: «%s»"
+#: utils/adt/formatting.c:1179
+msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
+msgstr "no se puede usar «PR» y «S»/«PL»/«MI»/«SG» simultáneamente"
 
-#: utils/adt/tsquery.c:250
-#, c-format
-msgid "value is too big in tsquery: \"%s\""
-msgstr "el valor es demasiado grande en tsquery: «%s»"
+#: utils/adt/formatting.c:1205
+msgid "cannot use \"EEEE\" twice"
+msgstr "no se puede usar «EEEE» dos veces"
 
-#: utils/adt/tsquery.c:255
-#, c-format
-msgid "operand is too long in tsquery: \"%s\""
-msgstr "el operando es muy largo en tsquery: «%s»"
+#: utils/adt/formatting.c:1211
+msgid "\"EEEE\" is incompatible with other formats"
+msgstr "«EEEE» es incompatible con otros formatos"
 
-#: utils/adt/tsquery.c:283
-#, c-format
-msgid "word is too long in tsquery: \"%s\""
-msgstr "palabra demasiado larga en tsquery: «%s»"
+#: utils/adt/formatting.c:1212
+msgid ""
+"\"EEEE\" may only be used together with digit and decimal point patterns."
+msgstr ""
+"«EEEE» sólo puede ser usado en conjunción con patrones de dígitos y puntos "
+"decimales."
 
-#: utils/adt/tsquery.c:512
+#: utils/adt/formatting.c:1412
 #, c-format
-msgid "text-search query doesn't contain lexemes: \"%s\""
-msgstr "la consulta de búsqueda en texto no contiene lexemas: «%s»"
+msgid "\"%s\" is not a number"
+msgstr "«%s» no es un número"
 
-#: utils/adt/tsquery_cleanup.c:285
-msgid ""
-"text-search query contains only stop words or doesn't contain lexemes, "
-"ignored"
+#: utils/adt/formatting.c:1519 utils/adt/formatting.c:1569
+msgid "could not determine which collation to use for lower() function"
 msgstr ""
-"la consulta de búsqueda en texto contiene sólo stopwords o no contiene "
-"lexemas; ignorada"
-
-#: utils/adt/tsquery_rewrite.c:296
-msgid "ts_rewrite query must return two tsquery columns"
-msgstr "consulta ts_rewrite debe retornar dos columnas tsquery"
+"no se pudo determinar qué ordenamiento (collation) usar para la función lower"
+"()"
 
-#: utils/adt/tsrank.c:404
-msgid "array of weight must be one-dimensional"
-msgstr "el array de pesos debe ser unidimensional"
+#: utils/adt/formatting.c:1640 utils/adt/formatting.c:1690
+msgid "could not determine which collation to use for upper() function"
+msgstr ""
+"no se pudo determinar qué ordenamiento (collation) usar para la función upper"
+"()"
 
-#: utils/adt/tsrank.c:409
-msgid "array of weight is too short"
-msgstr "el array de pesos es muy corto"
+#: utils/adt/formatting.c:1773 utils/adt/formatting.c:1835
+msgid "could not determine which collation to use for initcap() function"
+msgstr ""
+"no se pudo determinar qué ordenamiento (collation) usar para la función "
+"initcap()"
 
-#: utils/adt/tsrank.c:414
-msgid "array of weight must not contain nulls"
-msgstr "los arrays de pesos no deben contener valores nulos"
+#: utils/adt/formatting.c:2017
+msgid "invalid combination of date conventions"
+msgstr "combinacion invalida de convenciones de fecha"
 
-#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
-msgid "weight out of range"
-msgstr "el peso está fuera de rango"
+#: utils/adt/formatting.c:2018
+msgid ""
+"Do not mix Gregorian and ISO week date conventions in a formatting template."
+msgstr ""
+" No mezclar convenciones de semana Gregorianas e ISO en una plantilla "
+"formateada"
 
-#: utils/adt/tsvector.c:215
+#: utils/adt/formatting.c:2035
 #, c-format
-msgid "word is too long (%ld bytes, max %ld bytes)"
-msgstr "la palabra es demasiado larga (%ld, máximo %ld bytes)"
+msgid "conflicting values for \"%s\" field in formatting string"
+msgstr "valores en conflicto para le campo \"%s\" en un string formateado"
 
-#: utils/adt/tsvector.c:222
-#, c-format
-msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
+#: utils/adt/formatting.c:2037
+msgid "This value contradicts a previous setting for the same field type."
 msgstr ""
-"la cadena es demasiado larga para tsvector (%ld bytes, máximo %ld bytes)"
-
-#: utils/adt/tsvector_op.c:1103
-msgid "ts_stat query must return one tsvector column"
-msgstr "la consulta ts_stat debe retornar una columna tsvector"
+"Este valor se contradice con un seteo previo para el mismo tipo de campo"
 
-#: utils/adt/tsvector_op.c:1283
+#: utils/adt/formatting.c:2098
 #, c-format
-msgid "tsvector column \"%s\" does not exist"
-msgstr "la columna tsvector «%s» no existe"
+msgid "source string too short for \"%s\" formatting field"
+msgstr "cadena de texto fuente muy corta para campo formateado \"%s\" "
 
-#: utils/adt/tsvector_op.c:1289
+#: utils/adt/formatting.c:2100
 #, c-format
-msgid "column \"%s\" is not of tsvector type"
-msgstr "la columna «%s» no es de tipo tsvector"
+msgid "Field requires %d characters, but only %d remain."
+msgstr "El campo requiere %d caractéres, pero solo quedan %d."
+
+#: utils/adt/formatting.c:2103 utils/adt/formatting.c:2117
+msgid ""
+"If your source string is not fixed-width, try using the \"FM\" modifier."
+msgstr ""
+"Si su cadena de texto no es de ancho modificado, trate de usar el "
+"modificador \"FM\" "
 
-#: utils/adt/tsvector_op.c:1301
+#: utils/adt/formatting.c:2113 utils/adt/formatting.c:2126
+#: utils/adt/formatting.c:2256
 #, c-format
-msgid "configuration column \"%s\" does not exist"
-msgstr "la columna de configuración «%s» no existe"
+msgid "invalid value \"%s\" for \"%s\""
+msgstr "el valor «%s» no es válido para «%s»"
 
-#: utils/adt/tsvector_op.c:1307
+#: utils/adt/formatting.c:2115
 #, c-format
-msgid "column \"%s\" is not of regconfig type"
-msgstr "la columna «%s» no es de tipo regconfig"
+msgid "Field requires %d characters, but only %d could be parsed."
+msgstr "El campo requiere %d caracteres, pero sólo %d pudieron ser analizados."
 
-#: utils/adt/tsvector_op.c:1314
+#: utils/adt/formatting.c:2128
+msgid "Value must be an integer."
+msgstr "El valor debe ser un entero."
+
+#: utils/adt/formatting.c:2133
 #, c-format
-msgid "configuration column \"%s\" must not be null"
-msgstr "la columna de configuración «%s» no debe ser nula"
+msgid "value for \"%s\" in source string is out of range"
+msgstr "el valor para «%s» en la cadena de origen está fuera de rango"
 
-#: utils/adt/tsvector_op.c:1327
+#: utils/adt/formatting.c:2135
 #, c-format
-msgid "text search configuration name \"%s\" must be schema-qualified"
+msgid "Value must be in the range %d to %d."
+msgstr "EL valor debe estar en el rango de %d a %d."
+
+#: utils/adt/formatting.c:2258
+msgid "The given value did not match any of the allowed values for this field."
 msgstr ""
-"el nombre de la configuración de búsqueda «%s» debe ser calificada con "
-"esquema"
+"El valor dado no concuerda con ninguno de los valores permitidos para este "
+"campo."
 
-#: utils/adt/tsvector_op.c:1352
-#, c-format
-msgid "column \"%s\" is not of a character type"
-msgstr "la columna «%s» no es de un tipo textual"
+#: utils/adt/formatting.c:2814
+msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
+msgstr "los patrones de formato «TZ»/«tz» no están soportados en to_date"
 
-#: utils/adt/tsvector_parser.c:137
-#, c-format
-msgid "syntax error in tsvector: \"%s\""
-msgstr "error de sintaxis en tsvector: «%s»"
+#: utils/adt/formatting.c:2918
+msgid "invalid input string for \"Y,YYY\""
+msgstr "cadena de entrada no válida para «Y,YYY»"
 
-#: utils/adt/tsvector_parser.c:202
+#: utils/adt/formatting.c:3435
 #, c-format
-msgid "there is no escaped character: \"%s\""
-msgstr "no hay carácter escapado: «%s»"
+msgid "hour \"%d\" is invalid for the 12-hour clock"
+msgstr "la hora «%d» no es válida para el reloj de 12 horas"
 
-#: utils/adt/tsvector_parser.c:319
-#, c-format
-msgid "wrong position info in tsvector: \"%s\""
-msgstr "información posicional incorrecta en tsvector: «%s»"
+#: utils/adt/formatting.c:3437
+msgid "Use the 24-hour clock, or give an hour between 1 and 12."
+msgstr "Use el reloj de 24 horas, o entregue una hora entre 1 y 12."
 
-#: utils/adt/uuid.c:128
+#: utils/adt/formatting.c:3475
 #, c-format
-msgid "invalid input syntax for uuid: \"%s\""
-msgstr "la sintaxis de entrada no es válida para el tipo uuid: «%s»"
+msgid "inconsistent use of year %04d and \"BC\""
+msgstr "el uso del año %04d y «BC» es inconsistente"
 
-#: utils/adt/varbit.c:54 utils/adt/varchar.c:48
-#, c-format
-msgid "length for type %s must be at least 1"
-msgstr "el largo para el tipo %s debe ser al menos 1"
+#: utils/adt/formatting.c:3522
+msgid "cannot calculate day of year without year information"
+msgstr "no se puede calcular el día del año sin conocer el año"
 
-#: utils/adt/varbit.c:59 utils/adt/varchar.c:52
-#, c-format
-msgid "length for type %s cannot exceed %d"
-msgstr "el largo del tipo %s no puede exceder %d"
+#: utils/adt/formatting.c:4384
+msgid "\"EEEE\" not supported for input"
+msgstr "«EEEE» no está soportado en la entrada"
 
-#: utils/adt/varbit.c:162 utils/adt/varbit.c:302 utils/adt/varbit.c:358
-#, c-format
-msgid "bit string length %d does not match type bit(%d)"
-msgstr "el largo de la cadena de bits %d no coincide con el tipo bit(%d)"
+#: utils/adt/formatting.c:4396
+msgid "\"RN\" not supported for input"
+msgstr "«RN» no está soportado en la entrada"
 
-#: utils/adt/varbit.c:184 utils/adt/varbit.c:482
-#, c-format
-msgid "\"%c\" is not a valid binary digit"
-msgstr "«%c» no es un dígito binario válido"
+#: utils/adt/genfile.c:60
+msgid "reference to parent directory (\"..\") not allowed"
+msgstr "no se permiten referencias a directorios padre («..»)"
 
-#: utils/adt/varbit.c:209 utils/adt/varbit.c:507
-#, c-format
-msgid "\"%c\" is not a valid hexadecimal digit"
-msgstr "«%c» no es un dígito hexadecimal válido"
+#: utils/adt/genfile.c:71
+msgid "absolute path not allowed"
+msgstr "no se permiten rutas absolutas"
 
-#: utils/adt/varbit.c:293 utils/adt/varbit.c:594
-msgid "invalid length in external bit string"
-msgstr "el largo largo no es válido en cadena de bits externa"
+#: utils/adt/genfile.c:76
+msgid "path must be in or below the current directory"
+msgstr "la ruta debe estar en o debajo del directorio actual"
+
+#: utils/adt/genfile.c:117 utils/adt/oracle_compat.c:184
+#: utils/adt/oracle_compat.c:282 utils/adt/oracle_compat.c:758
+#: utils/adt/oracle_compat.c:1048
+msgid "requested length too large"
+msgstr "el tamaño solicitado es demasiado grande"
 
-#: utils/adt/varbit.c:460 utils/adt/varbit.c:603 utils/adt/varbit.c:664
+#: utils/adt/genfile.c:129
 #, c-format
-msgid "bit string too long for type bit varying(%d)"
-msgstr "la cadena de bits es demasiado larga para el tipo bit varying(%d)"
+msgid "could not seek in file \"%s\": %m"
+msgstr "no se pudo posicionar (seek) el archivo «%s»: %m"
 
-#: utils/adt/varbit.c:991 utils/adt/varbit.c:1093 utils/adt/varlena.c:729
-#: utils/adt/varlena.c:793 utils/adt/varlena.c:937 utils/adt/varlena.c:1843
-#: utils/adt/varlena.c:1910
-msgid "negative substring length not allowed"
-msgstr "no se permite un largo negativo de subcadena"
+#: utils/adt/genfile.c:179 utils/adt/genfile.c:203 utils/adt/genfile.c:224
+#: utils/adt/genfile.c:248
+msgid "must be superuser to read files"
+msgstr "debe ser superusuario para leer archivos"
 
-#: utils/adt/varbit.c:1149
-msgid "cannot AND bit strings of different sizes"
-msgstr "no se puede hacer AND entre cadenas de bits de distintos tamaños"
+#: utils/adt/genfile.c:186 utils/adt/genfile.c:231
+msgid "requested length cannot be negative"
+msgstr "el tamaño solicitado no puede ser negativo"
 
-#: utils/adt/varbit.c:1190
-msgid "cannot OR bit strings of different sizes"
-msgstr "no se puede hacer OR entre cadenas de bits de distintos tamaños"
+#: utils/adt/genfile.c:272
+msgid "must be superuser to get file information"
+msgstr "debe ser superusuario obtener información de archivos"
 
-#: utils/adt/varbit.c:1236
-msgid "cannot XOR bit strings of different sizes"
-msgstr "no se puede hacer XOR entre cadenas de bits de distintos tamaños"
+#: utils/adt/genfile.c:336
+msgid "must be superuser to get directory listings"
+msgstr "debe ser superusuario para obtener listados de directorio"
 
-#: utils/adt/varbit.c:1710 utils/adt/varbit.c:1768
-#, c-format
-msgid "bit index %d out of valid range (0..%d)"
-msgstr "el índice de bit %d está fuera del rango válido (0..%d)"
+#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4251 utils/adt/geo_ops.c:5172
+msgid "too many points requested"
+msgstr "se pidieron demasiados puntos"
 
-#: utils/adt/varbit.c:1719 utils/adt/varlena.c:2110
-msgid "new bit must be 0 or 1"
-msgstr "el nuevo bit debe ser 0 o 1"
+#: utils/adt/geo_ops.c:317
+msgid "could not format \"path\" value"
+msgstr "no se pudo dar formato a «path»"
 
-#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
+#: utils/adt/geo_ops.c:392
 #, c-format
-msgid "value too long for type character(%d)"
-msgstr "el valor es demasiado largo para el tipo character(%d)"
+msgid "invalid input syntax for type box: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo box: «%s»"
 
-#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#: utils/adt/geo_ops.c:956
 #, c-format
-msgid "value too long for type character varying(%d)"
-msgstr "el valor es demasiado largo para el tipo character varying(%d)"
+msgid "invalid input syntax for type line: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo line: «%s»"
 
-#: utils/adt/varlena.c:1333 utils/adt/varlena.c:1346
-#, c-format
-msgid "could not convert string to UTF-16: error %lu"
-msgstr "no se pudo convertir la cadena a UTF-16: error %lu"
+#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
+#: utils/adt/geo_ops.c:1057
+msgid "type \"line\" not yet implemented"
+msgstr "el tipo «line» no está implementado"
 
-#: utils/adt/varlena.c:1356
+#: utils/adt/geo_ops.c:1411 utils/adt/geo_ops.c:1434
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "no se pudieron comparar las cadenas Unicode: %m"
+msgid "invalid input syntax for type path: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo «path»: «%s»"
+
+#: utils/adt/geo_ops.c:1473
+msgid "invalid number of points in external \"path\" value"
+msgstr "el número de puntos no es válido en el valor «path» externo"
 
-#: utils/adt/varlena.c:1988 utils/adt/varlena.c:2019 utils/adt/varlena.c:2055
-#: utils/adt/varlena.c:2098
+#: utils/adt/geo_ops.c:1816
 #, c-format
-msgid "index %d out of valid range, 0..%d"
-msgstr "el índice %d está fuera de rango [0..%d]"
+msgid "invalid input syntax for type point: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo point: «%s»"
 
-#: utils/adt/varlena.c:2890
-msgid "field position must be greater than zero"
-msgstr "la posición del campo debe ser mayor que cero"
+#: utils/adt/geo_ops.c:2044
+#, c-format
+msgid "invalid input syntax for type lseg: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo lseg: «%s»"
 
-#: utils/adt/windowfuncs.c:243
-msgid "argument of ntile must be greater than zero"
-msgstr "el argumento de ntile debe ser mayor que cero"
-
-#: utils/adt/windowfuncs.c:465
-msgid "argument of nth_value must be greater than zero"
-msgstr "el argumento de nth_value debe ser mayor que cero"
+#: utils/adt/geo_ops.c:2648
+msgid "function \"dist_lb\" not implemented"
+msgstr "la función «dist_lb» no está implementada"
 
-#: utils/misc/tzparser.c:63
-#, c-format
-msgid ""
-"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
-"zone file \"%s\", line %d"
-msgstr ""
-"la abreviación del huso horario «%s» es demasiado larga (máximo %d "
-"caracteres) en archivo de huso horario «%s», línea %d"
+#: utils/adt/geo_ops.c:3161
+msgid "function \"close_lb\" not implemented"
+msgstr "la función «close_lb» no está implementada"
 
-#: utils/misc/tzparser.c:72
-#, c-format
-msgid ""
-"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
-"\"%s\", line %d"
-msgstr ""
-"desplazamiento de huso horario %d no es un múltiplo de 900 segundos (15 "
-"minutos) en archivo de huso horario «%s», línea %d"
+#: utils/adt/geo_ops.c:3450
+msgid "cannot create bounding box for empty polygon"
+msgstr "no se puede crear una caja de contorno para un polígono vacío"
 
-#: utils/misc/tzparser.c:86
+#: utils/adt/geo_ops.c:3474 utils/adt/geo_ops.c:3486
 #, c-format
-msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
-msgstr ""
-"desplazamiento de huso horario %d está fuera de rango en el archivo de huso "
-"horario «%s», línea %d"
+msgid "invalid input syntax for type polygon: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo polygon: «%s»"
 
-#: utils/misc/tzparser.c:123
-#, c-format
-msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr ""
-"falta una abreviación de huso horario en el archivo de huso horario «%s», "
-"línea %d"
+#: utils/adt/geo_ops.c:3526
+msgid "invalid number of points in external \"polygon\" value"
+msgstr "el número de puntos no es válido en «polygon» externo"
 
-#: utils/misc/tzparser.c:134
-#, c-format
-msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr ""
-"falta un desplazamiento de huso horario en el archivo de huso horario «%s», "
-"línea %d"
+#: utils/adt/geo_ops.c:4049
+msgid "function \"poly_distance\" not implemented"
+msgstr "la función «poly_distance» no está implementada"
 
-#: utils/misc/tzparser.c:143
-#, c-format
-msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
-msgstr ""
-"número no válido para desplazamiento de huso horario en archivo de huso "
-"horario «%s», línea %d"
+#: utils/adt/geo_ops.c:4363
+msgid "function \"path_center\" not implemented"
+msgstr "la función «path_center» no está implementada"
 
-#: utils/misc/tzparser.c:168
-#, c-format
-msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "sintaxis no válida en archivo de huso horario «%s», línea %d"
+#: utils/adt/geo_ops.c:4380
+msgid "open path cannot be converted to polygon"
+msgstr "no se puede convertir un camino abierto en polygon"
 
-#: utils/misc/tzparser.c:234
+#: utils/adt/geo_ops.c:4549 utils/adt/geo_ops.c:4559 utils/adt/geo_ops.c:4574
+#: utils/adt/geo_ops.c:4580
 #, c-format
-msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "abreviación de huso horario «%s» está definida múltiples veces"
+msgid "invalid input syntax for type circle: \"%s\""
+msgstr "la sintaxis de entrada no es válida para el tipo circle: «%s»"
 
-#: utils/misc/tzparser.c:236
-#, c-format
-msgid ""
-"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
-"\", line %d."
-msgstr ""
-"Entrada en archivo de huso horario «%s», línea %d, causa conflictos con "
-"entrada en archivo «%s», línea %d."
+#: utils/adt/geo_ops.c:4602 utils/adt/geo_ops.c:4610
+msgid "could not format \"circle\" value"
+msgstr "no se pudo dar formato al valor «circle»"
 
-#: utils/misc/tzparser.c:303
-#, c-format
-msgid "invalid time zone file name \"%s\""
-msgstr "nombre de huso horario «%s» no válido"
+#: utils/adt/geo_ops.c:4637
+msgid "invalid radius in external \"circle\" value"
+msgstr "el radio no es válido en el valor «circle» externo"
 
-#: utils/misc/tzparser.c:318
-#, c-format
-msgid "time zone file recursion limit exceeded in file \"%s\""
-msgstr "límite de recursión excedido en el archivo «%s»"
+#: utils/adt/geo_ops.c:5158
+msgid "cannot convert circle with radius zero to polygon"
+msgstr "no se puede convertir un círculo de radio cero a polygon"
 
-#: utils/misc/tzparser.c:361 utils/misc/tzparser.c:376
-#, c-format
-msgid "could not read time zone file \"%s\": %m"
-msgstr "no se pudo leer archivo de huso horario «%s»: %m"
+#: utils/adt/geo_ops.c:5163
+msgid "must request at least 2 points"
+msgstr "debe pedir al menos 2 puntos"
 
-#: utils/misc/tzparser.c:388
-#, c-format
-msgid "line is too long in time zone file \"%s\", line %d"
-msgstr "línea demasiado larga en archivo de huso horario «%s», línea %d"
+#: utils/adt/geo_ops.c:5207 utils/adt/geo_ops.c:5230
+msgid "cannot convert empty polygon to circle"
+msgstr "no se puede convertir polígono vacío a circle"
 
-#: utils/misc/tzparser.c:413
-#, c-format
-msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr ""
-"@INCLUDE sin nombre de archivo en archivo de huso horario «%s», línea %d"
+#: utils/adt/int.c:162
+msgid "int2vector has too many elements"
+msgstr "int2vector tiene demasiados elementos"
 
-#: utils/misc/guc.c:476
-msgid "Ungrouped"
-msgstr "Sin Grupo"
+#: utils/adt/int.c:237
+msgid "invalid int2vector data"
+msgstr "datos de int2vector no válidos"
 
-#: utils/misc/guc.c:478
-msgid "File Locations"
-msgstr "Ubicaciones de Archivos"
+#: utils/adt/int.c:243 utils/adt/oid.c:212 utils/adt/oid.c:293
+msgid "oidvector has too many elements"
+msgstr "el oidvector tiene demasiados elementos"
 
-#: utils/misc/guc.c:480
-msgid "Connections and Authentication"
-msgstr "Conexiones y Autentificación"
+#: utils/adt/int.c:1345 utils/adt/int8.c:1373 utils/adt/timestamp.c:4712
+#: utils/adt/timestamp.c:4793
+msgid "step size cannot equal zero"
+msgstr "el tamaño de paso no puede ser cero"
 
-#: utils/misc/guc.c:482
-msgid "Connections and Authentication / Connection Settings"
-msgstr "Conexiones y Autentificación / Parámetros de Conexión"
+#: utils/adt/int8.c:98 utils/adt/int8.c:133 utils/adt/numutils.c:51
+#: utils/adt/numutils.c:61 utils/adt/numutils.c:103
+#, c-format
+msgid "invalid input syntax for integer: \"%s\""
+msgstr "la sintaxis de entrada no es válida para integer: «%s»"
 
-#: utils/misc/guc.c:484
-msgid "Connections and Authentication / Security and Authentication"
-msgstr "Conexiones y Autentificación / Seguridad y Autentificación"
+#: utils/adt/int8.c:114
+#, c-format
+msgid "value \"%s\" is out of range for type bigint"
+msgstr "el valor «%s» está fuera de rango para el tipo bigint"
 
-#: utils/misc/guc.c:486
-msgid "Resource Usage"
-msgstr "Uso de Recursos"
+#: utils/adt/int8.c:500 utils/adt/int8.c:529 utils/adt/int8.c:550
+#: utils/adt/int8.c:580 utils/adt/int8.c:612 utils/adt/int8.c:630
+#: utils/adt/int8.c:679 utils/adt/int8.c:696 utils/adt/int8.c:765
+#: utils/adt/int8.c:786 utils/adt/int8.c:813 utils/adt/int8.c:844
+#: utils/adt/int8.c:865 utils/adt/int8.c:886 utils/adt/int8.c:913
+#: utils/adt/int8.c:953 utils/adt/int8.c:974 utils/adt/int8.c:1001
+#: utils/adt/int8.c:1032 utils/adt/int8.c:1053 utils/adt/int8.c:1074
+#: utils/adt/int8.c:1101 utils/adt/int8.c:1274 utils/adt/int8.c:1313
+#: utils/adt/numeric.c:2306 utils/adt/varbit.c:1583
+msgid "bigint out of range"
+msgstr "bigint está fuera de rango"
 
-#: utils/misc/guc.c:488
-msgid "Resource Usage / Memory"
-msgstr "Uso de Recursos / Memoria"
+#: utils/adt/int8.c:1330
+msgid "OID out of range"
+msgstr "OID está fuera de rango"
 
-#: utils/misc/guc.c:490
-msgid "Resource Usage / Kernel Resources"
-msgstr "Uso de Recursos / Recursos del Kernel"
+#: utils/adt/like.c:211 utils/adt/selfuncs.c:4911
+msgid "could not determine which collation to use for ILIKE"
+msgstr "no se pudo determinar qué ordenamiento (collation) usar para ILIKE"
 
-#: utils/misc/guc.c:492
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Uso de Recursos / Retardo de Vacuum por Costos"
+#: utils/adt/like_match.c:104 utils/adt/like_match.c:164
+msgid "LIKE pattern must not end with escape character"
+msgstr "el patrón LIKE no debe terminar con un carácter de escape"
 
-#: utils/misc/guc.c:494
-msgid "Resource Usage / Background Writer"
-msgstr "Uso de Recursos / Escritor en Segundo Plano"
+#: utils/adt/like_match.c:289 utils/adt/regexp.c:684
+msgid "invalid escape string"
+msgstr "la cadena de escape no es válida"
 
-#: utils/misc/guc.c:496
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Uso de Recursos / Comportamiento Asíncrono"
+#: utils/adt/like_match.c:290 utils/adt/regexp.c:685
+msgid "Escape string must be empty or one character."
+msgstr "La cadena de escape debe estar vacía o tener un solo carácter."
 
-#: utils/misc/guc.c:498
-msgid "Write-Ahead Log"
-msgstr "Write-Ahead Log"
+#: utils/adt/mac.c:65
+#, c-format
+msgid "invalid input syntax for type macaddr: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo macaddr: «%s»"
 
-#: utils/misc/guc.c:500
-msgid "Write-Ahead Log / Settings"
-msgstr "Write-Ahead Log / Configuraciones"
+#: utils/adt/mac.c:72
+#, c-format
+msgid "invalid octet value in \"macaddr\" value: \"%s\""
+msgstr "el valor de octeto no es válido en «macaddr»: «%s»"
 
-#: utils/misc/guc.c:502
-msgid "Write-Ahead Log / Checkpoints"
-msgstr "Write-Ahead Log / Puntos de Control (Checkpoints)"
+#: utils/adt/misc.c:80
+msgid "must be superuser to signal other server processes"
+msgstr "debe ser superusuario para enviar señales a otros procesos"
 
-#: utils/misc/guc.c:504
-msgid "Write-Ahead Log / Archiving"
-msgstr "Write-Ahead Log / Archivado"
+#: utils/adt/misc.c:89
+#, c-format
+msgid "PID %d is not a PostgreSQL server process"
+msgstr "el proceso con PID %d no es un proceso servidor PostgreSQL"
 
-#: utils/misc/guc.c:506
-msgid "Write-Ahead Log / Streaming Replication"
-msgstr "Write-Ahead Log / Replicación en Flujo"
+#: utils/adt/misc.c:126
+msgid "must be superuser to signal the postmaster"
+msgstr "debe ser superusuario para enviar señales a postmaster"
 
-#: utils/misc/guc.c:508
-msgid "Write-Ahead Log / Standby Servers"
-msgstr "Write-Ahead Log / Servidores Standby"
+#: utils/adt/misc.c:131
+#, c-format
+msgid "failed to send signal to postmaster: %m"
+msgstr "no se pudo enviar la señal al postmaster: %m"
 
-#: utils/misc/guc.c:510
-msgid "Query Tuning"
-msgstr "Afinamiento de Consultas"
+#: utils/adt/misc.c:148
+msgid "must be superuser to rotate log files"
+msgstr "debe ser superusuario para rotar archivos de registro"
 
-#: utils/misc/guc.c:512
-msgid "Query Tuning / Planner Method Configuration"
-msgstr "Afinamiento de Consultas / Configuración de Métodos del Planner"
+#: utils/adt/misc.c:153
+msgid "rotation not possible because log collection not active"
+msgstr ""
+"la rotación no es posible, porque la recolección del logs no está activa"
 
-#: utils/misc/guc.c:514
-msgid "Query Tuning / Planner Cost Constants"
-msgstr "Afinamiento de Consultas / Constantes de Costo del Planner"
+#: utils/adt/misc.c:195
+msgid "global tablespace never has databases"
+msgstr "el tablespace global nunca tiene bases de datos"
 
-#: utils/misc/guc.c:516
-msgid "Query Tuning / Genetic Query Optimizer"
-msgstr "Afinamiento de Consultas / Optimizador Genético de Consultas"
+#: utils/adt/misc.c:216
+#, c-format
+msgid "%u is not a tablespace OID"
+msgstr "%u no es un OID de tablespace"
 
-#: utils/misc/guc.c:518
-msgid "Query Tuning / Other Planner Options"
-msgstr "Afinamiento de Consultas / Otras Opciones del Planner"
+#: utils/adt/misc.c:352
+msgid "unreserved"
+msgstr "no reservada"
 
-#: utils/misc/guc.c:520
-msgid "Reporting and Logging"
-msgstr "Reporte y Registro"
+#: utils/adt/misc.c:356
+msgid "unreserved (cannot be function or type name)"
+msgstr "no reservada (no puede ser nombre de función o tipo)"
 
-#: utils/misc/guc.c:522
-msgid "Reporting and Logging / Where to Log"
-msgstr "Reporte y Registro / Cuándo Registrar"
+#: utils/adt/misc.c:360
+msgid "reserved (can be function or type name)"
+msgstr "reservada (puede ser nombre de función o tipo)"
 
-#: utils/misc/guc.c:524
-msgid "Reporting and Logging / When to Log"
-msgstr "Reporte y Registro / Cuándo Registrar"
+#: utils/adt/misc.c:364
+msgid "reserved"
+msgstr "reservada"
 
-#: utils/misc/guc.c:526
-msgid "Reporting and Logging / What to Log"
-msgstr "Reporte y Registro / Qué Registrar"
+#: utils/adt/nabstime.c:160
+#, c-format
+msgid "invalid time zone name: \"%s\""
+msgstr "el nombre de huso horario no es válido: «%s»"
 
-#: utils/misc/guc.c:528
-msgid "Statistics"
-msgstr "Estadísticas"
+#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
+msgid "cannot convert abstime \"invalid\" to timestamp"
+msgstr "no se puede convertir abstime «invalid» a timestamp"
 
-#: utils/misc/guc.c:530
-msgid "Statistics / Monitoring"
-msgstr "Estadísticas / Monitoreo"
+#: utils/adt/nabstime.c:806
+msgid "invalid status in external \"tinterval\" value"
+msgstr "el estado no es válido en el valor «tinterval» externo"
 
-#: utils/misc/guc.c:532
-msgid "Statistics / Query and Index Statistics Collector"
-msgstr "Estadísticas / Recolector de Estadísticas de Consultas e �ndices"
+#: utils/adt/nabstime.c:880
+msgid "cannot convert reltime \"invalid\" to interval"
+msgstr "no se puede convertir reltime «invalid» a interval"
 
-#: utils/misc/guc.c:534
-msgid "Autovacuum"
-msgstr "Autovacuum"
+#: utils/adt/nabstime.c:1575
+#, c-format
+msgid "invalid input syntax for type tinterval: \"%s\""
+msgstr "la sintaxis de entrada no es válida para el tipo tinterval: «%s»"
 
-#: utils/misc/guc.c:536
-msgid "Client Connection Defaults"
-msgstr "Valores por Omisión de Conexiones"
+#: utils/adt/network.c:118
+#, c-format
+msgid "invalid cidr value: \"%s\""
+msgstr "el formato de cidr no es válido: «%s»"
 
-#: utils/misc/guc.c:538
-msgid "Client Connection Defaults / Statement Behavior"
-msgstr "Valores por Omisión de Conexiones / Comportamiento de Sentencias"
+#: utils/adt/network.c:119 utils/adt/network.c:249
+msgid "Value has bits set to right of mask."
+msgstr "El valor tiene bits a la derecha de la máscara."
 
-#: utils/misc/guc.c:540
-msgid "Client Connection Defaults / Locale and Formatting"
-msgstr ""
-"Valores por Omisión de Conexiones / Configuraciones Regionales y Formateo"
+#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
+#: utils/adt/network.c:664
+#, c-format
+msgid "could not format inet value: %m"
+msgstr "no se pudo dar formato al valor inet: %m"
 
-#: utils/misc/guc.c:542
-msgid "Client Connection Defaults / Other Defaults"
-msgstr "Valores por Omisión de Conexiones / Otros Valores"
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:217
+#, c-format
+msgid "invalid address family in external \"%s\" value"
+msgstr "la familia de la dirección no es válida en valor «%s» externo"
 
-#: utils/misc/guc.c:544
-msgid "Lock Management"
-msgstr "Manejo de Bloqueos"
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:224
+#, c-format
+msgid "invalid bits in external \"%s\" value"
+msgstr "bits no válidos en el valor «%s» externo"
 
-#: utils/misc/guc.c:546
-msgid "Version and Platform Compatibility"
-msgstr "Compatibilidad de Versión y Plataforma"
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:233
+#, c-format
+msgid "invalid length in external \"%s\" value"
+msgstr "largo no válido en valor «%s» externo"
 
-#: utils/misc/guc.c:548
-msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
-msgstr ""
-"Compatibilidad de Versión y Plataforma / Versiones Anteriores de PostgreSQL"
+#: utils/adt/network.c:248
+msgid "invalid external \"cidr\" value"
+msgstr "el valor externo «cidr» no es válido"
 
-#: utils/misc/guc.c:550
-msgid "Version and Platform Compatibility / Other Platforms and Clients"
-msgstr "Compatibilidad de Versión y Plataforma / Otras Plataformas y Clientes"
+#: utils/adt/network.c:370 utils/adt/network.c:397
+#, c-format
+msgid "invalid mask length: %d"
+msgstr "el largo de el máscara no es válido: %d"
 
-#: utils/misc/guc.c:552
-msgid "Preset Options"
-msgstr "Opciones Predefinidas"
+#: utils/adt/network.c:682
+#, c-format
+msgid "could not format cidr value: %m"
+msgstr "no se pudo dar formato al valor cidr: %m"
 
-#: utils/misc/guc.c:554
-msgid "Customized Options"
-msgstr "Opciones Personalizadas"
+#: utils/adt/network.c:1255
+msgid "cannot AND inet values of different sizes"
+msgstr "no se puede hacer AND entre valores inet de distintos tamaños"
 
-#: utils/misc/guc.c:556
-msgid "Developer Options"
-msgstr "Opciones de Desarrollador"
+#: utils/adt/network.c:1287
+msgid "cannot OR inet values of different sizes"
+msgstr "no se puede hacer OR entre valor inet de distintos tamaños"
 
-#: utils/misc/guc.c:610
-msgid "Enables the planner's use of sequential-scan plans."
-msgstr "Permitir el uso de planes de recorrido secuencial."
+#: utils/adt/network.c:1348 utils/adt/network.c:1424
+msgid "result is out of range"
+msgstr "el resultado está fuera de rango"
 
-#: utils/misc/guc.c:618
-msgid "Enables the planner's use of index-scan plans."
-msgstr "Permitir el uso de planes de recorrido de índice."
+#: utils/adt/network.c:1389
+msgid "cannot subtract inet values of different sizes"
+msgstr "no se puede restar valores inet de distintos tamaños"
 
-#: utils/misc/guc.c:626
-msgid "Enables the planner's use of bitmap-scan plans."
-msgstr "Permitir el uso de planes de recorrido de índice por mapas de bits."
+#: utils/adt/numeric.c:473 utils/adt/numeric.c:500 utils/adt/numeric.c:3275
+#: utils/adt/numeric.c:3298 utils/adt/numeric.c:3322 utils/adt/numeric.c:3329
+#, c-format
+msgid "invalid input syntax for type numeric: \"%s\""
+msgstr "la sintaxis de entrada no es válida para el tipo numeric: «%s»"
 
-#: utils/misc/guc.c:634
-msgid "Enables the planner's use of TID scan plans."
-msgstr "Permitir el uso de planes de recorrido por TID."
+#: utils/adt/numeric.c:653
+msgid "invalid length in external \"numeric\" value"
+msgstr "el largo no es válido en el valor «numeric» externo"
 
-#: utils/misc/guc.c:642
-msgid "Enables the planner's use of explicit sort steps."
-msgstr "Permitir el uso de pasos explícitos de ordenamiento."
+#: utils/adt/numeric.c:664
+msgid "invalid sign in external \"numeric\" value"
+msgstr "el signo no es válido en el valor «numeric» externo"
 
-#: utils/misc/guc.c:650
-msgid "Enables the planner's use of hashed aggregation plans."
-msgstr "Permitir el uso de planes de agregación a través de hash."
+#: utils/adt/numeric.c:674
+msgid "invalid digit in external \"numeric\" value"
+msgstr "hay un dígito no válido en el valor «numeric» externo"
 
-#: utils/misc/guc.c:658
-msgid "Enables the planner's use of materialization."
-msgstr "Permitir el uso de materialización de planes."
+#: utils/adt/numeric.c:814 utils/adt/numeric.c:828
+#, c-format
+msgid "NUMERIC precision %d must be between 1 and %d"
+msgstr "la precisión %d de NUMERIC debe estar entre 1 y %d"
 
-#: utils/misc/guc.c:666
-msgid "Enables the planner's use of nested-loop join plans."
-msgstr "Permitir el uso de planes «nested-loop join»."
+#: utils/adt/numeric.c:819
+#, c-format
+msgid "NUMERIC scale %d must be between 0 and precision %d"
+msgstr "la escala de NUMERIC, %d, debe estar entre 0 y la precisión %d"
 
-#: utils/misc/guc.c:674
-msgid "Enables the planner's use of merge join plans."
-msgstr "Permitir el uso de planes «merge join»."
+#: utils/adt/numeric.c:837
+msgid "invalid NUMERIC type modifier"
+msgstr "modificador de tipo NUMERIC no es válido"
 
-#: utils/misc/guc.c:682
-msgid "Enables the planner's use of hash join plans."
-msgstr "Permitir el uso de planes «hash join»."
+#: utils/adt/numeric.c:1881 utils/adt/numeric.c:3754
+msgid "value overflows numeric format"
+msgstr "el valor excede el formato numeric"
 
-#: utils/misc/guc.c:690
-msgid "Enables genetic query optimization."
-msgstr "Permitir el uso del optimizador genético de consultas."
+#: utils/adt/numeric.c:2229
+msgid "cannot convert NaN to integer"
+msgstr "no se puede convertir NaN a entero"
 
-#: utils/misc/guc.c:691
-msgid "This algorithm attempts to do planning without exhaustive searching."
+#: utils/adt/numeric.c:2297
+msgid "cannot convert NaN to bigint"
+msgstr "no se puede convertir NaN a bigint"
+
+#: utils/adt/numeric.c:2345
+msgid "cannot convert NaN to smallint"
+msgstr "no se puede convertir NaN a smallint"
+
+#: utils/adt/numeric.c:3824
+msgid "numeric field overflow"
+msgstr "desbordamiento de campo numeric"
+
+#: utils/adt/numeric.c:3825
+#, c-format
+msgid ""
+"A field with precision %d, scale %d must round to an absolute value less "
+"than %s%d."
 msgstr ""
-"Este algoritmo intenta planear las consultas sin hacer búsqueda exhaustiva."
+"Un campo con precisión %d, escala %d debe redondear a un valor absoluto "
+"menor que %s%d."
 
-#: utils/misc/guc.c:700
-msgid "Shows whether the current user is a superuser."
-msgstr "Indica si el usuario actual es superusuario."
+#: utils/adt/numeric.c:5273
+msgid "argument for function \"exp\" too big"
+msgstr "el argumento a la función «exp» es demasiado grande"
 
-#: utils/misc/guc.c:709
-msgid "Enables advertising the server via Bonjour."
-msgstr "Permitir la publicación del servidor vía Bonjour."
+#: utils/adt/numutils.c:75
+#, c-format
+msgid "value \"%s\" is out of range for type integer"
+msgstr "el valor «%s» está fuera de rango para el tipo integer"
 
-#: utils/misc/guc.c:717
-msgid "Enables SSL connections."
-msgstr "Permitir conexiones SSL."
+#: utils/adt/numutils.c:81
+#, c-format
+msgid "value \"%s\" is out of range for type smallint"
+msgstr "el valor «%s» está fuera de rango para el tipo smallint"
 
-#: utils/misc/guc.c:725
-msgid "Forces synchronization of updates to disk."
-msgstr "Forzar la sincronización de escrituras a disco."
+#: utils/adt/numutils.c:87
+#, c-format
+msgid "value \"%s\" is out of range for 8-bit integer"
+msgstr "el valor «%s» está fuera de rango para un entero de 8 bits"
 
-#: utils/misc/guc.c:726
-msgid ""
-"The server will use the fsync() system call in several places to make sure "
-"that updates are physically written to disk. This insures that a database "
-"cluster will recover to a consistent state after an operating system or "
-"hardware crash."
-msgstr ""
-"El servidor usará la llamada a sistema fsync() en varios lugares para "
-"asegurarse que las actualizaciones son escritas físicamente a disco. Esto "
-"asegura que las bases de datos se recuperarán a un estado consistente "
-"después de una caída de hardware o sistema operativo."
+#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
+#, c-format
+msgid "invalid input syntax for type oid: \"%s\""
+msgstr "la sintaxis de entrada no es válida para el tipo oid: «%s»"
+
+#: utils/adt/oid.c:69 utils/adt/oid.c:107
+#, c-format
+msgid "value \"%s\" is out of range for type oid"
+msgstr "el valor «%s» está fuera de rango para el tipo oid"
 
-#: utils/misc/guc.c:736
-msgid "Sets immediate fsync at commit."
-msgstr "Activar fsync inmediato al comprometer transacciones."
+#: utils/adt/oid.c:287
+msgid "invalid oidvector data"
+msgstr "datos de oidvector no válidos"
 
-#: utils/misc/guc.c:744
-msgid "Continues processing past damaged page headers."
-msgstr "Continuar procesando más allá de encabezados de página dañados."
+#: utils/adt/oracle_compat.c:895
+msgid "requested character too large"
+msgstr "el carácter solicitado es demasiado grande"
+
+#: utils/adt/oracle_compat.c:941 utils/adt/oracle_compat.c:995
+#, c-format
+msgid "requested character too large for encoding: %d"
+msgstr "el carácter pedido es demasiado largo para el encoding: %d"
+
+#: utils/adt/oracle_compat.c:988
+msgid "null character not permitted"
+msgstr "el carácter nulo no está permitido"
+
+#: utils/adt/pg_locale.c:953
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "no se pudo crear la configuración regional «%s»: %m"
 
-#: utils/misc/guc.c:745
+#: utils/adt/pg_locale.c:956
+#, c-format
 msgid ""
-"Detection of a damaged page header normally causes PostgreSQL to report an "
-"error, aborting the current transaction. Setting zero_damaged_pages to true "
-"causes the system to instead report a warning, zero out the damaged page, "
-"and continue processing. This behavior will destroy data, namely all the "
-"rows on the damaged page."
+"The operating system could not find any locale data for the locale name \"%s"
+"\"."
 msgstr ""
-"La detección de un encabezado de página dañado normalmente hace que "
-"PostgreSQL reporte un error, abortando la transacción en curso. Definiendo "
-"zero_damaged_pages a true hace que el sistema reporte un mensaje de warning, "
-"escriba ceros en toda la página, y continúe el procesamiento. Este "
-"comportamiento destruirá datos; en particular, todas las tuplas en la página "
-"dañada."
+"El sistema operativo no pudo encontrar datos de configuración regional para "
+"la configuración «%s»."
 
-#: utils/misc/guc.c:757
-msgid "Writes full pages to WAL when first modified after a checkpoint."
+#: utils/adt/pg_locale.c:1043
+msgid ""
+"collations with different collate and ctype values are not supported on this "
+"platform"
 msgstr ""
-"Escribe páginas completas a WAL cuando son modificadas después de un punto "
-"de control."
+"los ordenamientos (collation) con valores collate y ctype diferentes no "
+"están soportados en esta plataforma"
 
-#: utils/misc/guc.c:758
-msgid ""
-"A page write in process during an operating system crash might be only "
-"partially written to disk.  During recovery, the row changes stored in WAL "
-"are not enough to recover.  This option writes pages when first modified "
-"after a checkpoint to WAL so full recovery is possible."
+#: utils/adt/pg_locale.c:1058
+msgid "nondefault collations are not supported on this platform"
 msgstr ""
-"Una escritura de página que está siendo procesada durante una caída del "
-"sistema operativo puede ser completada sólo parcialmente.  Durante la "
-"recuperación, los cambios de registros (tuplas) almacenados en WAL no son "
-"suficientes para la recuperación. Esta opción activa la escritura de las "
-"páginas a WAL cuando son modificadas por primera vez después de un punto de "
-"control, de manera que una recuperación total es posible."
+"los ordenamientos (collation) distintos del ordenamiento por omisión no "
+"están soportados en esta plataforma"
 
-#: utils/misc/guc.c:769
-msgid "Runs the server silently."
-msgstr "Ejecuta el servidor silenciosamente."
+#: utils/adt/pg_locale.c:1229
+msgid "invalid multibyte character for locale"
+msgstr "el carácter multibyte no es válido para esta configuración regional"
 
-#: utils/misc/guc.c:770
+#: utils/adt/pg_locale.c:1230
 msgid ""
-"If this parameter is set, the server will automatically run in the "
-"background and any controlling terminals are dissociated."
+"The server's LC_CTYPE locale is probably incompatible with the database "
+"encoding."
 msgstr ""
-"Si esta opción está activada, el servidor se ejecutará automáticamente en "
-"segundo plano y los terminales de control serán disociados."
+"La configuración regional LC_CTYPE del servidor es probablemente "
+"incompatible con la codificación de la base de datos."
 
-#: utils/misc/guc.c:778
-msgid "Logs each checkpoint."
-msgstr "Registrar cada punto de control."
+#: utils/adt/pseudotypes.c:94
+msgid "cannot accept a value of type any"
+msgstr "no se puede aceptar un valor de tipo any"
 
-#: utils/misc/guc.c:786
-msgid "Logs each successful connection."
-msgstr "Registrar cada conexión exitosa."
+#: utils/adt/pseudotypes.c:107
+msgid "cannot display a value of type any"
+msgstr "no se puede desplegar un valor de tipo any"
 
-#: utils/misc/guc.c:794
-msgid "Logs end of a session, including duration."
-msgstr "Registrar el fin de una sesión, incluyendo su duración."
+#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
+msgid "cannot accept a value of type anyarray"
+msgstr "no se puede aceptar un valor de tipo anyarray"
 
-#: utils/misc/guc.c:802
-msgid "Turns on various assertion checks."
-msgstr "Activar varios chequeos de integridad (assertion checks)."
+#: utils/adt/pseudotypes.c:174
+msgid "cannot accept a value of type anyenum"
+msgstr "no se puede aceptar un valor de tipo anyenum"
 
-#: utils/misc/guc.c:803
-msgid "This is a debugging aid."
-msgstr "Esto es una ayuda para la depuración."
+#: utils/adt/pseudotypes.c:252
+msgid "cannot accept a value of type trigger"
+msgstr "no se puede aceptar un valor de tipo trigger"
 
-#: utils/misc/guc.c:817 utils/misc/guc.c:899 utils/misc/guc.c:958
-#: utils/misc/guc.c:967 utils/misc/guc.c:976 utils/misc/guc.c:985
-#: utils/misc/guc.c:1587 utils/misc/guc.c:1596
-msgid "No description available."
-msgstr "No hay descripción disponible."
+#: utils/adt/pseudotypes.c:265
+msgid "cannot display a value of type trigger"
+msgstr "no se puede desplegar un valor de tipo trigger"
 
-#: utils/misc/guc.c:826
-msgid "Logs the duration of each completed SQL statement."
-msgstr "Registrar la duración de cada sentencia SQL ejecutada."
+#: utils/adt/pseudotypes.c:279
+msgid "cannot accept a value of type language_handler"
+msgstr "no se puede aceptar un valor de tipo language_handler"
 
-#: utils/misc/guc.c:834
-msgid "Logs each query's parse tree."
-msgstr "Registrar cada arbol analizado de consulta "
+#: utils/adt/pseudotypes.c:292
+msgid "cannot display a value of type language_handler"
+msgstr "no se puede desplegar un valor de tipo language_handler"
 
-#: utils/misc/guc.c:842
-msgid "Logs each query's rewritten parse tree."
-msgstr "Registrar cada reescritura del arból analizado de consulta"
+#: utils/adt/pseudotypes.c:306
+msgid "cannot accept a value of type fdw_handler"
+msgstr "no se puede aceptar un valor de tipo fdw_handler"
 
-#: utils/misc/guc.c:850
-msgid "Logs each query's execution plan."
-msgstr "Registrar el plan de ejecución de cada consulta."
+#: utils/adt/pseudotypes.c:319
+msgid "cannot display a value of type fdw_handler"
+msgstr "no se puede desplegar un valor de tipo fdw_handler"
 
-#: utils/misc/guc.c:858
-msgid "Indents parse and plan tree displays."
-msgstr "Indentar los árboles de parse y plan."
+#: utils/adt/pseudotypes.c:333
+msgid "cannot accept a value of type internal"
+msgstr "no se puede aceptar un valor de tipo internal"
 
-#: utils/misc/guc.c:866
-msgid "Writes parser performance statistics to the server log."
-msgstr "Escribir estadísticas de parser al registro del servidor."
+#: utils/adt/pseudotypes.c:346
+msgid "cannot display a value of type internal"
+msgstr "no se puede desplegar un valor de tipo internal"
 
-#: utils/misc/guc.c:874
-msgid "Writes planner performance statistics to the server log."
-msgstr "Escribir estadísticas de planner al registro del servidor."
+#: utils/adt/pseudotypes.c:360
+msgid "cannot accept a value of type opaque"
+msgstr "no se puede aceptar un valor de tipo opaque"
 
-#: utils/misc/guc.c:882
-msgid "Writes executor performance statistics to the server log."
-msgstr "Escribir estadísticas del executor al registro del servidor."
+#: utils/adt/pseudotypes.c:373
+msgid "cannot display a value of type opaque"
+msgstr "no se puede desplegar un valor de tipo opaque"
 
-#: utils/misc/guc.c:890
-msgid "Writes cumulative performance statistics to the server log."
-msgstr "Escribir estadísticas acumulativas al registro del servidor."
+#: utils/adt/pseudotypes.c:387
+msgid "cannot accept a value of type anyelement"
+msgstr "no se puede aceptar un valor de tipo anyelement"
 
-#: utils/misc/guc.c:910
-msgid "Collects information about executing commands."
-msgstr "Recolectar estadísticas sobre órdenes en ejecución."
+#: utils/adt/pseudotypes.c:400
+msgid "cannot display a value of type anyelement"
+msgstr "no se puede desplegar un valor de tipo anyelement"
 
-#: utils/misc/guc.c:911
-msgid ""
-"Enables the collection of information on the currently executing command of "
-"each session, along with the time at which that command began execution."
-msgstr ""
-"Activa la recolección de información sobre la orden actualmente en ejecución "
-"en cada sesión, junto con el momento en el cual esa orden comenzó la "
-"ejecución."
+#: utils/adt/pseudotypes.c:413
+msgid "cannot accept a value of type anynonarray"
+msgstr "no se puede aceptar un valor de tipo anynonarray"
 
-#: utils/misc/guc.c:920
-msgid "Collects statistics on database activity."
-msgstr "Recolectar estadísticas de actividad de la base de datos."
+#: utils/adt/pseudotypes.c:426
+msgid "cannot display a value of type anynonarray"
+msgstr "no se puede desplegar un valor de tipo anynonarray"
 
-#: utils/misc/guc.c:929
-msgid "Updates the process title to show the active SQL command."
-msgstr "Actualiza el título del proceso para mostrar la orden SQL activo."
+#: utils/adt/pseudotypes.c:439
+msgid "cannot accept a value of a shell type"
+msgstr "no se puede aceptar un valor de un tipo inconcluso"
 
-#: utils/misc/guc.c:930
-msgid ""
-"Enables updating of the process title every time a new SQL command is "
-"received by the server."
-msgstr ""
-"Habilita que se actualice el título del proceso cada vez que una orden SQL "
-"es recibido por el servidor."
+#: utils/adt/pseudotypes.c:452
+msgid "cannot display a value of a shell type"
+msgstr "no se puede desplegar un valor de un tipo inconcluso"
 
-#: utils/misc/guc.c:938
-msgid "Starts the autovacuum subprocess."
-msgstr "Iniciar el subproceso de autovacuum."
+#: utils/adt/pseudotypes.c:474 utils/adt/pseudotypes.c:498
+msgid "cannot accept a value of type pg_node_tree"
+msgstr "no se puede aceptar un valor de tipo pg_node_tree"
 
-#: utils/misc/guc.c:947
-msgid "Generates debugging output for LISTEN and NOTIFY."
-msgstr "Generar salida de depuración para LISTEN y NOTIFY."
+#: utils/adt/regexp.c:275 utils/adt/varlena.c:2866
+#, c-format
+msgid "regular expression failed: %s"
+msgstr "la expresión regular falló: %s"
 
-#: utils/misc/guc.c:996
-msgid "Logs long lock waits."
-msgstr "Registrar esperas largas de bloqueos."
+#: utils/adt/regexp.c:412
+#, c-format
+msgid "invalid regexp option: \"%c\""
+msgstr "la opción de expresión regular no es válida: «%c»"
 
-#: utils/misc/guc.c:1005
-msgid "Logs the host name in the connection logs."
-msgstr "Registrar el nombre del host en la conexión."
+#: utils/adt/regexp.c:884
+msgid "regexp_split does not support the global option"
+msgstr "regex_split no soporta la opción «global»"
 
-#: utils/misc/guc.c:1006
-msgid ""
-"By default, connection logs only show the IP address of the connecting host. "
-"If you want them to show the host name you can turn this on, but depending "
-"on your host name resolution setup it might impose a non-negligible "
-"performance penalty."
-msgstr ""
-"Por omisión, los registros de conexión sólo muestran la dirección IP del "
-"host que establece la conexión. Si desea que se despliegue el nombre del "
-"host puede activar esta opción, pero dependiendo de su configuración de "
-"resolución de nombres esto puede imponer una penalización de rendimiento no "
-"despreciable."
+#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
+#, c-format
+msgid "more than one function named \"%s\""
+msgstr "existe más de una función llamada «%s»"
 
-#: utils/misc/guc.c:1016
-msgid "Causes subtables to be included by default in various commands."
-msgstr "Incluir, por omisión, subtablas en varias órdenes."
+#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
+#, c-format
+msgid "more than one operator named %s"
+msgstr "existe más de un operador llamado %s"
 
-#: utils/misc/guc.c:1024
-msgid "Encrypt passwords."
-msgstr "Cifrar contraseñas."
+#: utils/adt/regproc.c:635 utils/adt/regproc.c:1485 utils/adt/ruleutils.c:5858
+#: utils/adt/ruleutils.c:5913 utils/adt/ruleutils.c:5950
+msgid "too many arguments"
+msgstr "demasiados argumentos"
 
-#: utils/misc/guc.c:1025
-msgid ""
-"When a password is specified in CREATE USER or ALTER USER without writing "
-"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
-"password is to be encrypted."
-msgstr ""
-"Cuando se entrega una contraseña en CREATE USER o ALTER USER sin especificar "
-"ENCRYPTED ni UNENCRYPTED, esta opción determina si la password deberá ser "
-"encriptada."
+#: utils/adt/regproc.c:636
+msgid "Provide two argument types for operator."
+msgstr "Provea dos tipos de argumento para un operador."
 
-#: utils/misc/guc.c:1034
-msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
-msgstr "Tratar expr=NULL como expr IS NULL."
+#: utils/adt/regproc.c:1320 utils/adt/regproc.c:1325 utils/adt/varlena.c:2251
+#: utils/adt/varlena.c:2256
+msgid "invalid name syntax"
+msgstr "la sintaxis de nombre no es válida"
 
-#: utils/misc/guc.c:1035
-msgid ""
-"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
-"treated as expr IS NULL, that is, they return true if expr evaluates to the "
-"null value, and false otherwise. The correct behavior of expr = NULL is to "
-"always return null (unknown)."
-msgstr ""
-"Cuando está activado, expresiones de la forma expr = NULL (o NULL = expr) "
-"son tratadas como expr IS NULL, esto es, retornarán verdadero si expr es "
-"evaluada al valor nulo, y falso en caso contrario. El comportamiento "
-"correcto de expr = NULL es retornar siempre null (desconocido)."
+#: utils/adt/regproc.c:1383
+msgid "expected a left parenthesis"
+msgstr "se esperaba un paréntesis izquierdo"
 
-#: utils/misc/guc.c:1046
-msgid "Enables per-database user names."
-msgstr "Activar el uso de nombre de usuario locales a cada base de datos."
+#: utils/adt/regproc.c:1399
+msgid "expected a right parenthesis"
+msgstr "se esperaba un paréntesis derecho"
 
-#: utils/misc/guc.c:1055
-msgid "This parameter doesn't do anything."
-msgstr "Este parámetro no hace nada."
+#: utils/adt/regproc.c:1418
+msgid "expected a type name"
+msgstr "se esperaba un nombre de tipo"
 
-#: utils/misc/guc.c:1056
-msgid ""
-"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
-"vintage clients."
-msgstr ""
-"Está aquí sólo para poder aceptar SET AUTOCOMMIT TO ON desde clientes de la "
-"línea 7.3."
+#: utils/adt/regproc.c:1450
+msgid "improper type name"
+msgstr "el nombre de tipo no es válido"
 
-#: utils/misc/guc.c:1064
-msgid "Sets the default read-only status of new transactions."
-msgstr "Estado por omisión de sólo lectura de nuevas transacciones."
+#: utils/adt/ri_triggers.c:409 utils/adt/ri_triggers.c:2839
+#: utils/adt/ri_triggers.c:3537 utils/adt/ri_triggers.c:3569
+#, c-format
+msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
+msgstr "inserción o actualización en la tabla «%s» viola la llave foránea «%s»"
 
-#: utils/misc/guc.c:1072
-msgid "Sets the current transaction's read-only status."
-msgstr "Activa el estado de sólo lectura de la transacción en curso."
+#: utils/adt/ri_triggers.c:412 utils/adt/ri_triggers.c:2842
+msgid "MATCH FULL does not allow mixing of null and nonnull key values."
+msgstr "MATCH FULL no permite la mezcla de valores de clave nulos y no nulos."
 
-#: utils/misc/guc.c:1081
-msgid "Check function bodies during CREATE FUNCTION."
-msgstr "Verificar definición de funciones durante CREATE FUNCTION."
+#: utils/adt/ri_triggers.c:3099
+#, c-format
+msgid "function \"%s\" must be fired for INSERT"
+msgstr "la función «%s» debe ser ejecutada en INSERT"
 
-#: utils/misc/guc.c:1089
-msgid "Enable input of NULL elements in arrays."
-msgstr "Habilita el ingreso de elementos nulos en arrays."
+#: utils/adt/ri_triggers.c:3105
+#, c-format
+msgid "function \"%s\" must be fired for UPDATE"
+msgstr "la función «%s» debe ser ejecutada en UPDATE"
 
-#: utils/misc/guc.c:1090
-msgid ""
-"When turned on, unquoted NULL in an array input value means a null value; "
-"otherwise it is taken literally."
-msgstr ""
-"Cuando está activo, un valor NULL sin comillas en la entrada de un array "
-"significa un valor nulo; en caso contrario es tomado literalmente."
+#: utils/adt/ri_triggers.c:3119
+#, c-format
+msgid "function \"%s\" must be fired for DELETE"
+msgstr "la función «%s» debe ser ejecutada en DELETE"
 
-#: utils/misc/guc.c:1099
-msgid "Create new tables with OIDs by default."
-msgstr "Crea nuevas tablas con OIDs por omisión."
+#: utils/adt/ri_triggers.c:3148
+#, c-format
+msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
+msgstr "no hay una entrada en pg_constraint para el trigger «%s» en tabla «%s»"
 
-#: utils/misc/guc.c:1107
+#: utils/adt/ri_triggers.c:3150
 msgid ""
-"Start a subprocess to capture stderr output and/or csvlogs into log files."
+"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
+"ADD CONSTRAINT."
 msgstr ""
-"Lanzar un subproceso para capturar stderr y/o logs CSV en archivos de log."
+"Elimine este trigger de integridad referencial y sus pares, y utilice ALTER "
+"TABLE ADD CONSTRAINT."
 
-#: utils/misc/guc.c:1115
-msgid "Truncate existing log files of same name during log rotation."
-msgstr "Truncar archivos de log del mismo nombre durante la rotación."
+#: utils/adt/ri_triggers.c:3504
+#, c-format
+msgid ""
+"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
+"unexpected result"
+msgstr ""
+"la consulta de integridad referencial en «%s» de la restricción «%s» en «%s» "
+"entregó un resultado inesperado"
 
-#: utils/misc/guc.c:1125
-msgid "Emit information about resource usage in sorting."
+#: utils/adt/ri_triggers.c:3508
+msgid "This is most likely due to a rule having rewritten the query."
 msgstr ""
-"Emitir información acerca de uso de recursos durante los ordenamientos."
+"Esto probablemente es causado por una regla que reescribió la consulta."
 
-#: utils/misc/guc.c:1138
-msgid "Generate debugging output for synchronized scanning."
-msgstr "Generar salida de depuración para recorrido sincronizado."
+#: utils/adt/ri_triggers.c:3539
+#, c-format
+msgid "No rows were found in \"%s\"."
+msgstr "No se encontraron registros en «%s»."
 
-#: utils/misc/guc.c:1152
-msgid "Enable bounded sorting using heap sort."
-msgstr "Activar ordenamiento acotado usando «heap sort»."
+#: utils/adt/ri_triggers.c:3571
+#, c-format
+msgid "Key (%s)=(%s) is not present in table \"%s\"."
+msgstr "La llave (%s)=(%s) no está presente en la tabla «%s»."
 
-#: utils/misc/guc.c:1164
-msgid "Emit WAL-related debugging output."
-msgstr "Activar salida de depuración de WAL."
+#: utils/adt/ri_triggers.c:3577
+#, c-format
+msgid ""
+"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
+"table \"%s\""
+msgstr "update o delete en «%s» viola la llave foránea «%s» en la tabla «%s»"
 
-#: utils/misc/guc.c:1175
-msgid "Datetimes are integer based."
-msgstr "Las fechas y horas se basan en tipos enteros."
+#: utils/adt/ri_triggers.c:3580
+#, c-format
+msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
+msgstr "La llave (%s)=(%s) todavía es referida desde la tabla «%s»."
 
-#: utils/misc/guc.c:1189
-msgid ""
-"Sets whether Kerberos and GSSAPI user names should be treated as case-"
-"insensitive."
-msgstr ""
-"Define que los nombres de usuario Kerberos y GSSAPI deberían ser tratados "
-"sin distinción de mayúsculas."
+#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
+msgid "input of anonymous composite types is not implemented"
+msgstr "el ingreso de tipos compuestos anónimos no está implementado"
 
-#: utils/misc/guc.c:1198
-msgid "Warn about backslash escapes in ordinary string literals."
-msgstr ""
-"Avisa acerca de escapes de backslash en literales de cadena corrientes."
+#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
+#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
+#, c-format
+msgid "malformed record literal: \"%s\""
+msgstr "literal de record no es válido: «%s»"
+
+#: utils/adt/rowtypes.c:152
+msgid "Missing left parenthesis."
+msgstr "Falta paréntesis izquierdo."
+
+#: utils/adt/rowtypes.c:180
+msgid "Too few columns."
+msgstr "Muy pocas columnas."
+
+#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
+msgid "Unexpected end of input."
+msgstr "Fin inesperado de la entrada."
+
+#: utils/adt/rowtypes.c:263
+msgid "Too many columns."
+msgstr "Demasiadas columnas."
+
+#: utils/adt/rowtypes.c:271
+msgid "Junk after right parenthesis."
+msgstr "Basura después del paréntesis derecho."
+
+#: utils/adt/rowtypes.c:522
+#, c-format
+msgid "wrong number of columns: %d, expected %d"
+msgstr "número de columnas erróneo: %d, se esperaban %d"
+
+#: utils/adt/rowtypes.c:549
+#, c-format
+msgid "wrong data type: %u, expected %u"
+msgstr "tipo de dato erróneo: %u, se esperaba %u"
+
+#: utils/adt/rowtypes.c:610
+#, c-format
+msgid "improper binary format in record column %d"
+msgstr "formato binario incorrecto en la columna record %d"
+
+#: utils/adt/rowtypes.c:897 utils/adt/rowtypes.c:1132
+#, c-format
+msgid "cannot compare dissimilar column types %s and %s at record column %d"
+msgstr ""
+"no se pueden comparar los tipos de columnas disímiles %s y %s en la columna "
+"%d"
+
+#: utils/adt/rowtypes.c:983 utils/adt/rowtypes.c:1203
+msgid "cannot compare record types with different numbers of columns"
+msgstr "no se pueden comparar registros con cantidad distinta de columnas"
+
+#: utils/adt/ruleutils.c:2429
+#, c-format
+msgid "rule \"%s\" has unsupported event type %d"
+msgstr "la regla «%s» tiene el tipo de evento no soportado %d"
+
+#: utils/adt/selfuncs.c:4896 utils/adt/selfuncs.c:5350
+msgid "case insensitive matching not supported on type bytea"
+msgstr "no está soportada la comparación insensible a mayúsculas en bytea"
+
+#: utils/adt/selfuncs.c:5011 utils/adt/selfuncs.c:5510
+msgid "regular-expression matching not supported on type bytea"
+msgstr "no está soportada la comparación con expresiones regulares en bytea"
+
+#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
+#, c-format
+msgid "invalid input syntax for type tid: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo tid: «%s»"
+
+#: utils/adt/timestamp.c:97
+#, c-format
+msgid "TIMESTAMP(%d)%s precision must not be negative"
+msgstr "la precisión de TIMESTAMP(%d)%s no debe ser negativa"
+
+#: utils/adt/timestamp.c:103
+#, c-format
+msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
+msgstr "la precisión de TIMESTAMP(%d)%s fue reducida al máximo permitido, %d"
+
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp fuera de rango: «%s»"
+
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
+#: utils/adt/timestamp.c:664
+#, c-format
+msgid "date/time value \"%s\" is no longer supported"
+msgstr "el valor de date/time «%s» ya no está soportado"
+
+#: utils/adt/timestamp.c:260
+msgid "timestamp cannot be NaN"
+msgstr "el timestamp no puede ser NaN"
+
+#: utils/adt/timestamp.c:370
+#, c-format
+msgid "timestamp(%d) precision must be between %d and %d"
+msgstr "la precisión de timestamp(%d) debe estar entre %d y %d"
+
+#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
+#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
+msgid "interval out of range"
+msgstr "interval fuera de rango"
+
+#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
+msgid "invalid INTERVAL type modifier"
+msgstr "modificador de tipo INTERVAL no válido"
+
+#: utils/adt/timestamp.c:803
+#, c-format
+msgid "INTERVAL(%d) precision must not be negative"
+msgstr "la precisión de INTERVAL(%d) no debe ser negativa"
+
+#: utils/adt/timestamp.c:809
+#, c-format
+msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
+msgstr "la precisión de INTERVAL(%d) fue reducida al máximo permitido, %d"
+
+#: utils/adt/timestamp.c:1101
+#, c-format
+msgid "interval(%d) precision must be between %d and %d"
+msgstr "la precisión de interval(%d) debe estar entre %d y %d"
+
+#: utils/adt/timestamp.c:2306
+msgid "cannot subtract infinite timestamps"
+msgstr "no se pueden restar timestamps infinitos"
+
+#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
+#: utils/adt/timestamp.c:4020
+#, c-format
+msgid "timestamp units \"%s\" not supported"
+msgstr "las unidades de timestamp «%s» no están soportadas"
+
+#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
+#, c-format
+msgid "timestamp units \"%s\" not recognized"
+msgstr "las unidades de timestamp «%s» no son reconocidas"
+
+#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
+#: utils/adt/timestamp.c:4233
+#, c-format
+msgid "timestamp with time zone units \"%s\" not supported"
+msgstr "las unidades de timestamp with time zone «%s» no están soportadas"
+
+#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
+#, c-format
+msgid "timestamp with time zone units \"%s\" not recognized"
+msgstr "las unidades de timestamp with time zone «%s» no son reconocidas"
+
+#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
+#, c-format
+msgid "interval units \"%s\" not supported"
+msgstr "las unidades de interval «%s» no están soportadas"
+
+#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
+#, c-format
+msgid "interval units \"%s\" not recognized"
+msgstr "las unidades de interval «%s» no son reconocidas"
+
+#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
+#, c-format
+msgid "could not convert to time zone \"%s\""
+msgstr "no se pudo convertir al huso horario «%s»"
+
+#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
+#, c-format
+msgid "interval time zone \"%s\" must not specify month"
+msgstr "el intervalo de huso horario «%s» no debe especificar mes"
+
+#: utils/adt/trigfuncs.c:41
+msgid "suppress_redundant_updates_trigger: must be called as trigger"
+msgstr "suppress_redundant_updates_trigger: debe ser invocado como trigger"
+
+#: utils/adt/trigfuncs.c:47
+msgid "suppress_redundant_updates_trigger: must be called on update"
+msgstr "suppress_redundant_updates_trigger: debe ser invocado en «UPDATE»"
+
+#: utils/adt/trigfuncs.c:53
+msgid "suppress_redundant_updates_trigger: must be called before update"
+msgstr "suppress_redundant_updates_trigger: debe ser invocado «BEFORE UPDATE»"
+
+#: utils/adt/trigfuncs.c:59
+msgid "suppress_redundant_updates_trigger: must be called for each row"
+msgstr "suppress_redundant_updates_trigger: debe ser invocado «FOR EACH ROW»"
+
+#: utils/adt/tsgistidx.c:100
+msgid "gtsvector_in not implemented"
+msgstr "gtsvector_in no está implementado"
+
+#: utils/adt/tsquery.c:156 utils/adt/tsquery.c:392
+#: utils/adt/tsvector_parser.c:136
+#, c-format
+msgid "syntax error in tsquery: \"%s\""
+msgstr "error de sintaxis en tsquery: «%s»"
+
+#: utils/adt/tsquery.c:177
+#, c-format
+msgid "no operand in tsquery: \"%s\""
+msgstr "no hay operando en tsquery: «%s»"
+
+#: utils/adt/tsquery.c:250
+#, c-format
+msgid "value is too big in tsquery: \"%s\""
+msgstr "el valor es demasiado grande en tsquery: «%s»"
+
+#: utils/adt/tsquery.c:255
+#, c-format
+msgid "operand is too long in tsquery: \"%s\""
+msgstr "el operando es muy largo en tsquery: «%s»"
+
+#: utils/adt/tsquery.c:283
+#, c-format
+msgid "word is too long in tsquery: \"%s\""
+msgstr "palabra demasiado larga en tsquery: «%s»"
+
+#: utils/adt/tsquery.c:512
+#, c-format
+msgid "text-search query doesn't contain lexemes: \"%s\""
+msgstr "la consulta de búsqueda en texto no contiene lexemas: «%s»"
+
+#: utils/adt/tsquery_cleanup.c:285
+msgid ""
+"text-search query contains only stop words or doesn't contain lexemes, "
+"ignored"
+msgstr ""
+"la consulta de búsqueda en texto contiene sólo stopwords o no contiene "
+"lexemas; ignorada"
+
+#: utils/adt/tsquery_rewrite.c:296
+msgid "ts_rewrite query must return two tsquery columns"
+msgstr "consulta ts_rewrite debe retornar dos columnas tsquery"
+
+#: utils/adt/tsrank.c:404
+msgid "array of weight must be one-dimensional"
+msgstr "el array de pesos debe ser unidimensional"
+
+#: utils/adt/tsrank.c:409
+msgid "array of weight is too short"
+msgstr "el array de pesos es muy corto"
+
+#: utils/adt/tsrank.c:414
+msgid "array of weight must not contain nulls"
+msgstr "los arrays de pesos no deben contener valores nulos"
+
+#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
+msgid "weight out of range"
+msgstr "el peso está fuera de rango"
+
+#: utils/adt/tsvector.c:215
+#, c-format
+msgid "word is too long (%ld bytes, max %ld bytes)"
+msgstr "la palabra es demasiado larga (%ld, máximo %ld bytes)"
+
+#: utils/adt/tsvector.c:222
+#, c-format
+msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
+msgstr ""
+"la cadena es demasiado larga para tsvector (%ld bytes, máximo %ld bytes)"
+
+#: utils/adt/tsvector_op.c:1173
+msgid "ts_stat query must return one tsvector column"
+msgstr "la consulta ts_stat debe retornar una columna tsvector"
+
+#: utils/adt/tsvector_op.c:1353
+#, c-format
+msgid "tsvector column \"%s\" does not exist"
+msgstr "la columna tsvector «%s» no existe"
+
+#: utils/adt/tsvector_op.c:1359
+#, c-format
+msgid "column \"%s\" is not of tsvector type"
+msgstr "la columna «%s» no es de tipo tsvector"
+
+#: utils/adt/tsvector_op.c:1371
+#, c-format
+msgid "configuration column \"%s\" does not exist"
+msgstr "la columna de configuración «%s» no existe"
+
+#: utils/adt/tsvector_op.c:1377
+#, c-format
+msgid "column \"%s\" is not of regconfig type"
+msgstr "la columna «%s» no es de tipo regconfig"
+
+#: utils/adt/tsvector_op.c:1384
+#, c-format
+msgid "configuration column \"%s\" must not be null"
+msgstr "la columna de configuración «%s» no debe ser nula"
+
+#: utils/adt/tsvector_op.c:1397
+#, c-format
+msgid "text search configuration name \"%s\" must be schema-qualified"
+msgstr ""
+"el nombre de la configuración de búsqueda «%s» debe ser calificada con "
+"esquema"
+
+#: utils/adt/tsvector_op.c:1422
+#, c-format
+msgid "column \"%s\" is not of a character type"
+msgstr "la columna «%s» no es de un tipo textual"
+
+#: utils/adt/tsvector_parser.c:137
+#, c-format
+msgid "syntax error in tsvector: \"%s\""
+msgstr "error de sintaxis en tsvector: «%s»"
+
+#: utils/adt/tsvector_parser.c:202
+#, c-format
+msgid "there is no escaped character: \"%s\""
+msgstr "no hay carácter escapado: «%s»"
+
+#: utils/adt/tsvector_parser.c:319
+#, c-format
+msgid "wrong position info in tsvector: \"%s\""
+msgstr "información posicional incorrecta en tsvector: «%s»"
+
+#: utils/adt/uuid.c:128
+#, c-format
+msgid "invalid input syntax for uuid: \"%s\""
+msgstr "la sintaxis de entrada no es válida para el tipo uuid: «%s»"
+
+#: utils/adt/varbit.c:56 utils/adt/varchar.c:48
+#, c-format
+msgid "length for type %s must be at least 1"
+msgstr "el largo para el tipo %s debe ser al menos 1"
+
+#: utils/adt/varbit.c:61 utils/adt/varchar.c:52
+#, c-format
+msgid "length for type %s cannot exceed %d"
+msgstr "el largo del tipo %s no puede exceder %d"
+
+#: utils/adt/varbit.c:166 utils/adt/varbit.c:309 utils/adt/varbit.c:366
+#, c-format
+msgid "bit string length %d does not match type bit(%d)"
+msgstr "el largo de la cadena de bits %d no coincide con el tipo bit(%d)"
+
+#: utils/adt/varbit.c:188 utils/adt/varbit.c:490
+#, c-format
+msgid "\"%c\" is not a valid binary digit"
+msgstr "«%c» no es un dígito binario válido"
+
+#: utils/adt/varbit.c:213 utils/adt/varbit.c:515
+#, c-format
+msgid "\"%c\" is not a valid hexadecimal digit"
+msgstr "«%c» no es un dígito hexadecimal válido"
+
+#: utils/adt/varbit.c:300 utils/adt/varbit.c:603
+msgid "invalid length in external bit string"
+msgstr "el largo largo no es válido en cadena de bits externa"
+
+#: utils/adt/varbit.c:468 utils/adt/varbit.c:612 utils/adt/varbit.c:674
+#, c-format
+msgid "bit string too long for type bit varying(%d)"
+msgstr "la cadena de bits es demasiado larga para el tipo bit varying(%d)"
+
+#: utils/adt/varbit.c:1004 utils/adt/varbit.c:1106 utils/adt/varlena.c:737
+#: utils/adt/varlena.c:801 utils/adt/varlena.c:945 utils/adt/varlena.c:1896
+#: utils/adt/varlena.c:1963
+msgid "negative substring length not allowed"
+msgstr "no se permite un largo negativo de subcadena"
+
+#: utils/adt/varbit.c:1164
+msgid "cannot AND bit strings of different sizes"
+msgstr "no se puede hacer AND entre cadenas de bits de distintos tamaños"
+
+#: utils/adt/varbit.c:1206
+msgid "cannot OR bit strings of different sizes"
+msgstr "no se puede hacer OR entre cadenas de bits de distintos tamaños"
+
+#: utils/adt/varbit.c:1253
+msgid "cannot XOR bit strings of different sizes"
+msgstr "no se puede hacer XOR entre cadenas de bits de distintos tamaños"
+
+#: utils/adt/varbit.c:1731 utils/adt/varbit.c:1789
+#, c-format
+msgid "bit index %d out of valid range (0..%d)"
+msgstr "el índice de bit %d está fuera del rango válido (0..%d)"
+
+#: utils/adt/varbit.c:1740 utils/adt/varlena.c:2163
+msgid "new bit must be 0 or 1"
+msgstr "el nuevo bit debe ser 0 o 1"
+
+#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
+#, c-format
+msgid "value too long for type character(%d)"
+msgstr "el valor es demasiado largo para el tipo character(%d)"
+
+#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#, c-format
+msgid "value too long for type character varying(%d)"
+msgstr "el valor es demasiado largo para el tipo character varying(%d)"
+
+#: utils/adt/varlena.c:1314
+msgid "could not determine which collation to use for string comparison"
+msgstr ""
+"no se pudo determinar qué ordenamiento usar para la comparación de cadenas"
+
+#: utils/adt/varlena.c:1358 utils/adt/varlena.c:1371
+#, c-format
+msgid "could not convert string to UTF-16: error %lu"
+msgstr "no se pudo convertir la cadena a UTF-16: error %lu"
+
+#: utils/adt/varlena.c:1386
+#, c-format
+msgid "could not compare Unicode strings: %m"
+msgstr "no se pudieron comparar las cadenas Unicode: %m"
+
+#: utils/adt/varlena.c:2041 utils/adt/varlena.c:2072 utils/adt/varlena.c:2108
+#: utils/adt/varlena.c:2151
+#, c-format
+msgid "index %d out of valid range, 0..%d"
+msgstr "el índice %d está fuera de rango [0..%d]"
+
+#: utils/adt/varlena.c:2959
+msgid "field position must be greater than zero"
+msgstr "la posición del campo debe ser mayor que cero"
+
+#: utils/adt/varlena.c:3828 utils/adt/varlena.c:3889
+msgid "unterminated conversion specifier"
+msgstr "especificador de conversión inconcluso"
+
+#: utils/adt/varlena.c:3852 utils/adt/varlena.c:3868
+msgid "argument number is out of range"
+msgstr "número de argumento fuera del rango"
+
+#: utils/adt/varlena.c:3895
+msgid "conversion specifies argument 0, but arguments are numbered from 1"
+msgstr ""
+"la conversión especifica el argumento 0, pero los argumentos se numeran "
+"desde 1"
+
+#: utils/adt/varlena.c:3902
+msgid "too few arguments for format"
+msgstr "muy pocos argumentos para el formato"
+
+#: utils/adt/varlena.c:3923
+#, c-format
+msgid "unrecognized conversion specifier \"%c\""
+msgstr "espeficiador de conversión no reconocido: «%c»"
+
+#: utils/adt/varlena.c:3952
+msgid "null values cannot be formatted as an SQL identifier"
+msgstr "los valores nulos no pueden ser formateados como un identificador SQL"
+
+#: utils/adt/windowfuncs.c:243
+msgid "argument of ntile must be greater than zero"
+msgstr "el argumento de ntile debe ser mayor que cero"
+
+#: utils/adt/windowfuncs.c:465
+msgid "argument of nth_value must be greater than zero"
+msgstr "el argumento de nth_value debe ser mayor que cero"
+
+#: utils/adt/xml.c:135
+msgid "unsupported XML feature"
+msgstr "característica XML no soportada"
+
+#: utils/adt/xml.c:136
+msgid "This functionality requires the server to be built with libxml support."
+msgstr ""
+"Esta funcionalidad requiere que el servidor haya sido construido con soporte "
+"libxml."
+
+#: utils/adt/xml.c:137
+msgid "You need to rebuild PostgreSQL using --with-libxml."
+msgstr "Necesita reconstruir PostgreSQL usando --with-libxml."
+
+#: utils/adt/xml.c:156 utils/mb/mbutils.c:515
+#, c-format
+msgid "invalid encoding name \"%s\""
+msgstr "nombre de codificación «%s» no válido"
+
+#: utils/adt/xml.c:402 utils/adt/xml.c:407
+msgid "invalid XML comment"
+msgstr "comentario XML no válido"
+
+#: utils/adt/xml.c:536
+msgid "not an XML document"
+msgstr "no es un documento XML"
+
+#: utils/adt/xml.c:689 utils/adt/xml.c:712
+msgid "invalid XML processing instruction"
+msgstr "instrucción de procesamiento XML no válida"
+
+#: utils/adt/xml.c:690
+#, c-format
+msgid "XML processing instruction target name cannot be \"%s\"."
+msgstr ""
+"el nombre de destino de la instrucción de procesamiento XML no puede ser "
+"«%s»."
+
+#: utils/adt/xml.c:713
+msgid "XML processing instruction cannot contain \"?>\"."
+msgstr "la instrucción de procesamiento XML no puede contener «?>»."
+
+#: utils/adt/xml.c:792
+msgid "xmlvalidate is not implemented"
+msgstr "xmlvalidate no está implementado"
+
+#: utils/adt/xml.c:877
+msgid "could not initialize XML library"
+msgstr "no se pudo inicializar la biblioteca XML"
+
+#: utils/adt/xml.c:878
+#, c-format
+msgid ""
+"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
+msgstr ""
+"libxml2 tiene tipo char incompatible: sizeof(char)=%u, sizeof(xmlChar)=%u."
+
+#: utils/adt/xml.c:1420
+msgid "Invalid character value."
+msgstr "Valor de carácter no válido."
+
+#: utils/adt/xml.c:1423
+msgid "Space required."
+msgstr "Se requiere un espacio."
+
+#: utils/adt/xml.c:1426
+msgid "standalone accepts only 'yes' or 'no'."
+msgstr "standalone acepta sólo 'yes' y 'no'."
+
+#: utils/adt/xml.c:1429
+msgid "Malformed declaration: missing version."
+msgstr "Declaración mal formada: falta la versión."
+
+#: utils/adt/xml.c:1432
+msgid "Missing encoding in text declaration."
+msgstr "Falta especificación de codificación en declaración de texto."
+
+#: utils/adt/xml.c:1435
+msgid "Parsing XML declaration: '?>' expected."
+msgstr "Procesando declaración XML: se esperaba '?>'."
+
+#: utils/adt/xml.c:1438
+#, c-format
+msgid "Unrecognized libxml error code: %d."
+msgstr "Código de error libxml no reconocido: %d."
+
+#: utils/adt/xml.c:1690
+msgid "XML does not support infinite date values."
+msgstr "XML no soporta valores infinitos de fecha."
+
+#: utils/adt/xml.c:1713 utils/adt/xml.c:1740
+msgid "XML does not support infinite timestamp values."
+msgstr "XML no soporta valores infinitos de timestamp."
+
+#: utils/adt/xml.c:2125
+msgid "invalid query"
+msgstr "consulta no válido"
+
+#: utils/adt/xml.c:3349
+msgid "invalid array for XML namespace mapping"
+msgstr "array no válido para mapeo de espacio de nombres XML"
+
+#: utils/adt/xml.c:3350
+msgid ""
+"The array must be two-dimensional with length of the second axis equal to 2."
+msgstr "El array debe ser bidimensional y el largo del segundo eje igual a 2."
+
+#: utils/adt/xml.c:3374
+msgid "empty XPath expression"
+msgstr "expresion XPath vacía"
+
+#: utils/adt/xml.c:3422
+msgid "neither namespace name nor URI may be null"
+msgstr "ni el espacio de nombres ni la URI pueden ser vacíos"
+
+#: utils/adt/xml.c:3429
+#, c-format
+msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
+msgstr ""
+"no se pudo registrar un espacio de nombres XML llamado «%s» con URI «%s»"
+
+#: utils/sort/logtape.c:213
+#, c-format
+msgid "could not write block %ld of temporary file: %m"
+msgstr "no se pudo escribir el bloque %ld del archivo temporal: %m"
+
+#: utils/sort/logtape.c:215
+msgid "Perhaps out of disk space?"
+msgstr "¿Quizás se agotó el espacio en disco?"
+
+#: utils/sort/logtape.c:232
+#, c-format
+msgid "could not read block %ld of temporary file: %m"
+msgstr "no se pudo leer el bloque %ld del archivo temporal: %m"
+
+#: utils/sort/tuplesort.c:3131
+#, c-format
+msgid "could not create unique index \"%s\""
+msgstr "no se pudo crear el índice único «%s»"
+
+#: utils/sort/tuplesort.c:3133
+#, c-format
+msgid "Key %s is duplicated."
+msgstr "La llave %s está duplicada."
+
+#: utils/cache/lsyscache.c:2414 utils/cache/lsyscache.c:2447
+#: utils/cache/lsyscache.c:2480 utils/cache/lsyscache.c:2513
+#, c-format
+msgid "type %s is only a shell"
+msgstr "el tipo %s está inconcluso"
+
+#: utils/cache/lsyscache.c:2419
+#, c-format
+msgid "no input function available for type %s"
+msgstr "no hay una función de entrada para el tipo %s"
+
+#: utils/cache/lsyscache.c:2452
+#, c-format
+msgid "no output function available for type %s"
+msgstr "no hay una función de salida para el tipo %s"
+
+#: utils/cache/plancache.c:589
+msgid "cached plan must not change result type"
+msgstr "el plan almacenado no debe cambiar el tipo de resultado"
+
+#: utils/cache/relcache.c:4285
+#, c-format
+msgid "could not create relation-cache initialization file \"%s\": %m"
+msgstr "no se pudo crear el archivo de cache de catálogos de sistema «%s»: %m"
+
+#: utils/cache/relcache.c:4287
+msgid "Continuing anyway, but there's something wrong."
+msgstr "Prosiguiendo de todas maneras, pero hay algo mal."
+
+#: utils/cache/relcache.c:4501
+#, c-format
+msgid "could not remove cache file \"%s\": %m"
+msgstr "no se pudo eliminar el archivo de cache «%s»: %m"
+
+#: utils/cache/relmapper.c:454
+msgid "cannot PREPARE a transaction that modified relation mapping"
+msgstr ""
+"no se puede hacer PREPARE de una transacción que ha modificado el mapeo de "
+"relaciones"
+
+#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
+#, c-format
+msgid "could not open relation mapping file \"%s\": %m"
+msgstr "no se pudo abrir el archivo de mapeo de relaciones «%s»: %m"
+
+#: utils/cache/relmapper.c:609
+#, c-format
+msgid "could not read relation mapping file \"%s\": %m"
+msgstr "no se pudo leer el archivo de mapeo de relaciones «%s»: %m"
+
+#: utils/cache/relmapper.c:619
+#, c-format
+msgid "relation mapping file \"%s\" contains invalid data"
+msgstr "el archivo de mapeo de relaciones «%s» contiene datos no válidos"
+
+#: utils/cache/relmapper.c:629
+#, c-format
+msgid "relation mapping file \"%s\" contains incorrect checksum"
+msgstr ""
+"el archivo de mapeo de relaciones «%s» tiene una suma de verificación "
+"incorrecta"
+
+#: utils/cache/relmapper.c:741
+#, c-format
+msgid "could not write to relation mapping file \"%s\": %m"
+msgstr "no se pudo escribir el archivo de mapeo de relaciones «%s»: %m"
+
+#: utils/cache/relmapper.c:754
+#, c-format
+msgid "could not fsync relation mapping file \"%s\": %m"
+msgstr ""
+"no se pudo sincronizar (fsync) el archivo de mapeo de relaciones «%s»: %m"
+
+#: utils/cache/relmapper.c:760
+#, c-format
+msgid "could not close relation mapping file \"%s\": %m"
+msgstr "no se pudo cerrar el archivo de mapeo de relaciones «%s»: %m"
+
+#: utils/cache/typcache.c:629
+#, c-format
+msgid "type %s is not composite"
+msgstr "el tipo %s no es compuesto"
+
+#: utils/cache/typcache.c:643
+msgid "record type has not been registered"
+msgstr "el tipo record no ha sido registrado"
+
+#: utils/mmgr/aset.c:417
+#, c-format
+msgid "Failed while creating memory context \"%s\"."
+msgstr "Falla al crear el contexto de memoria «%s»."
+
+#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:766 utils/mmgr/aset.c:967
+#, c-format
+msgid "Failed on request of size %lu."
+msgstr "Falla en petición de tamaño %lu."
+
+#: utils/mmgr/portalmem.c:207
+#, c-format
+msgid "cursor \"%s\" already exists"
+msgstr "el cursor «%s» ya existe"
+
+#: utils/mmgr/portalmem.c:211
+#, c-format
+msgid "closing existing cursor \"%s\""
+msgstr "cerrando el cursor «%s» preexistente"
+
+#: utils/mmgr/portalmem.c:448
+#, c-format
+msgid "cannot drop active portal \"%s\""
+msgstr "no se puede eliminar el portal activo «%s»"
+
+#: utils/mmgr/portalmem.c:635
+msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
+msgstr ""
+"no se puede hacer PREPARE de una transacción que ha creado un cursor WITH "
+"HOLD"
+
+#: utils/fmgr/dfmgr.c:125
+#, c-format
+msgid "could not find function \"%s\" in file \"%s\""
+msgstr "no se encuentra la función «%s» en el archivo «%s»"
+
+#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
+#, c-format
+msgid "could not access file \"%s\": %m"
+msgstr "no se pudo acceder al archivo «%s»: %m"
+
+#: utils/fmgr/dfmgr.c:242
+#, c-format
+msgid "could not load library \"%s\": %s"
+msgstr "no se pudo cargar la biblioteca «%s»: %s"
+
+#: utils/fmgr/dfmgr.c:274
+#, c-format
+msgid "incompatible library \"%s\": missing magic block"
+msgstr "biblioteca «%s» incompatible: no se encuentra el bloque mágico"
+
+#: utils/fmgr/dfmgr.c:276
+msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
+msgstr ""
+"Se requiere que las bibliotecas de extensión usen la macro PG_MODULE_MAGIC."
+
+#: utils/fmgr/dfmgr.c:312
+#, c-format
+msgid "incompatible library \"%s\": version mismatch"
+msgstr "biblioteca «%s» incompatible: versión no coincide"
+
+#: utils/fmgr/dfmgr.c:314
+#, c-format
+msgid "Server is version %d.%d, library is version %d.%d."
+msgstr "Servidor tiene versión %d.%d, biblioteca es versión %d.%d."
+
+#: utils/fmgr/dfmgr.c:333
+#, c-format
+msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+msgstr "El servidor tiene FUNC_MAX_ARGS = %d, la librería tiene %d"
+
+#: utils/fmgr/dfmgr.c:342
+#, c-format
+msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+msgstr "El servidor tiene INDEX_MAX_KEYS = %d, la librería tiene %d"
+
+#: utils/fmgr/dfmgr.c:351
+#, c-format
+msgid "Server has NAMEDATALEN = %d, library has %d."
+msgstr "El servidor tiene NAMEDATALEN = %d, la librería tiene %d"
+
+#: utils/fmgr/dfmgr.c:360
+#, c-format
+msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
+msgstr "El servidor tiene FLOAT4PASSBYVAL = %s, la librería tiene %s"
+
+#: utils/fmgr/dfmgr.c:369
+#, c-format
+msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+msgstr "El servidor tiene FLOAT8PASSBYVAL = %s, la librería tiene %s"
+
+#: utils/fmgr/dfmgr.c:376
+msgid "Magic block has unexpected length or padding difference."
+msgstr ""
+"El bloque mágico tiene un largo inesperado, o una diferencia de relleno."
+
+#: utils/fmgr/dfmgr.c:379
+#, c-format
+msgid "incompatible library \"%s\": magic block mismatch"
+msgstr "biblioteca «%s» incompatible: bloque mágico no coincide"
+
+#: utils/fmgr/dfmgr.c:545
+#, c-format
+msgid "access to library \"%s\" is not allowed"
+msgstr "no está permitido el acceso a la biblioteca «%s»"
+
+#: utils/fmgr/dfmgr.c:572
+#, c-format
+msgid "invalid macro name in dynamic library path: %s"
+msgstr "el nombre de macro no es válido en la ruta a biblioteca dinámica: %s"
+
+#: utils/fmgr/dfmgr.c:617
+msgid "zero-length component in parameter \"dynamic_library_path\""
+msgstr ""
+"se encontró componente de largo cero en el parámetro «dynamic_library_path»"
+
+#: utils/fmgr/dfmgr.c:636
+msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+msgstr ""
+"un componente en el parámetro «dynamic_library_path» no es una ruta absoluta"
+
+#: utils/fmgr/fmgr.c:270
+#, c-format
+msgid "internal function \"%s\" is not in internal lookup table"
+msgstr "la función interna «%s» no está en la tabla interna de búsqueda"
+
+#: utils/fmgr/fmgr.c:474
+#, c-format
+msgid "unrecognized API version %d reported by info function \"%s\""
+msgstr "la versión de API %d no reconocida fue reportada por la función «%s»"
+
+#: utils/fmgr/fmgr.c:845 utils/fmgr/fmgr.c:2106
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr "la función %u tiene demasiados argumentos (%d, el máximo es %d)"
+
+#: utils/fmgr/funcapi.c:354
+#, c-format
+msgid ""
+"could not determine actual result type for function \"%s\" declared to "
+"return type %s"
+msgstr ""
+"no se pudo determinar el tipo verdadero de resultado para la función «%s»  "
+"declarada retornando tipo %s"
+
+#: utils/fmgr/funcapi.c:1208 utils/fmgr/funcapi.c:1239
+msgid "number of aliases does not match number of columns"
+msgstr "el número de aliases no calza con el número de columnas"
+
+#: utils/fmgr/funcapi.c:1233
+msgid "no column alias was provided"
+msgstr "no se entregó alias de columna"
+
+#: utils/fmgr/funcapi.c:1257
+msgid "could not determine row description for function returning record"
+msgstr ""
+"no se pudo encontrar descripción de registro de función que retorna record"
+
+#: utils/error/assert.c:37
+msgid "TRAP: ExceptionalCondition: bad arguments\n"
+msgstr "TRAP: ExceptionalConditions: argumentos erróneos\n"
+
+#: utils/error/assert.c:40
+#, c-format
+msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
+msgstr "TRAP: %s(«%s», Archivo: «%s», Línea: %d)\n"
+
+#: utils/error/elog.c:1507
+#, c-format
+msgid "could not reopen file \"%s\" as stderr: %m"
+msgstr "no se pudo reabrir «%s» para error estándar: %m"
+
+#: utils/error/elog.c:1520
+#, c-format
+msgid "could not reopen file \"%s\" as stdout: %m"
+msgstr "no se pudo reabrir «%s» para usar como salida estándar: %m"
+
+#: utils/error/elog.c:1910 utils/error/elog.c:1920 utils/error/elog.c:1930
+msgid "[unknown]"
+msgstr "[desconocido]"
+
+#: utils/error/elog.c:2281 utils/error/elog.c:2561 utils/error/elog.c:2639
+msgid "missing error text"
+msgstr "falta un texto de mensaje de error"
+
+#: utils/error/elog.c:2284 utils/error/elog.c:2287 utils/error/elog.c:2642
+#: utils/error/elog.c:2645
+#, c-format
+msgid " at character %d"
+msgstr " en carácter %d"
+
+#: utils/error/elog.c:2297 utils/error/elog.c:2304
+msgid "DETAIL:  "
+msgstr "DETALLE:  "
+
+#: utils/error/elog.c:2311
+msgid "HINT:  "
+msgstr "HINT:  "
+
+#: utils/error/elog.c:2318
+msgid "QUERY:  "
+msgstr "CONSULTA:  "
+
+#: utils/error/elog.c:2325
+msgid "CONTEXT:  "
+msgstr "CONTEXTO:  "
+
+#: utils/error/elog.c:2335
+#, c-format
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "UBICACIÓN:  %s, %s:%d\n"
+
+#: utils/error/elog.c:2342
+#, c-format
+msgid "LOCATION:  %s:%d\n"
+msgstr "UBICACIÓN:  %s:%d\n"
+
+#: utils/error/elog.c:2356
+msgid "STATEMENT:  "
+msgstr "SENTENCIA:  "
+
+#. translator: This string will be truncated at 47
+#. characters expanded.
+#: utils/error/elog.c:2754
+#, c-format
+msgid "operating system error %d"
+msgstr "error %d de sistema operativo"
+
+#: utils/error/elog.c:2777
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: utils/error/elog.c:2781
+msgid "LOG"
+msgstr "LOG"
+
+#: utils/error/elog.c:2784
+msgid "INFO"
+msgstr "INFO"
+
+#: utils/error/elog.c:2787
+msgid "NOTICE"
+msgstr "NOTICE"
+
+#: utils/error/elog.c:2790
+msgid "WARNING"
+msgstr "WARNING"
+
+#: utils/error/elog.c:2793
+msgid "ERROR"
+msgstr "ERROR"
+
+#: utils/error/elog.c:2796
+msgid "FATAL"
+msgstr "FATAL"
+
+#: utils/error/elog.c:2799
+msgid "PANIC"
+msgstr "PANIC"
+
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
+#, c-format
+msgid "unexpected encoding ID %d for ISO 8859 character sets"
+msgstr "ID de codificación %d inesperado para juegos de caracteres ISO 8859"
+
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#, c-format
+msgid "unexpected encoding ID %d for WIN character sets"
+msgstr "ID de codificación %d inesperado para juegos de caracteres WIN"
+
+#: utils/mb/encnames.c:485
+msgid "encoding name too long"
+msgstr "el nombre de codificación es demasiado largo"
+
+#: utils/mb/mbutils.c:281
+#, c-format
+msgid "conversion between %s and %s is not supported"
+msgstr "la conversión entre %s y %s no está soportada"
+
+#: utils/mb/mbutils.c:351
+#, c-format
+msgid ""
+"default conversion function for encoding \"%s\" to \"%s\" does not exist"
+msgstr ""
+"no existe el procedimiento por omisión de conversión desde la codificación "
+"«%s» a «%s»"
+
+#: utils/mb/mbutils.c:375 utils/mb/mbutils.c:676
+#, c-format
+msgid "String of %d bytes is too long for encoding conversion."
+msgstr "La cadena de %d bytes es demasiado larga para la recodificación."
+
+#: utils/mb/mbutils.c:462
+#, c-format
+msgid "invalid source encoding name \"%s\""
+msgstr "la codificación de origen «%s» no es válida"
+
+#: utils/mb/mbutils.c:467
+#, c-format
+msgid "invalid destination encoding name \"%s\""
+msgstr "la codificación de destino «%s» no es válida"
+
+#: utils/mb/mbutils.c:589
+#, c-format
+msgid "invalid byte value for encoding \"%s\": 0x%02x"
+msgstr "byte no válido para codificación «%s»: 0x%02x"
+
+#: utils/mb/wchar.c:1611
+#, c-format
+msgid "invalid byte sequence for encoding \"%s\": 0x%s"
+msgstr "secuencia de bytes no válida para codificación «%s»: 0x%s"
+
+#: utils/mb/wchar.c:1640
+#, c-format
+msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
+msgstr "carácter 0x%s de codificación «%s» no tiene equivalente en «%s»"
+
+#: utils/mb/conv.c:509
+#, c-format
+msgid "invalid encoding number: %d"
+msgstr "el número de codificación no es válido: %d"
+
+#: utils/misc/guc.c:525
+msgid "Ungrouped"
+msgstr "Sin Grupo"
+
+#: utils/misc/guc.c:527
+msgid "File Locations"
+msgstr "Ubicaciones de Archivos"
+
+#: utils/misc/guc.c:529
+msgid "Connections and Authentication"
+msgstr "Conexiones y Autentificación"
+
+#: utils/misc/guc.c:531
+msgid "Connections and Authentication / Connection Settings"
+msgstr "Conexiones y Autentificación / Parámetros de Conexión"
+
+#: utils/misc/guc.c:533
+msgid "Connections and Authentication / Security and Authentication"
+msgstr "Conexiones y Autentificación / Seguridad y Autentificación"
+
+#: utils/misc/guc.c:535
+msgid "Resource Usage"
+msgstr "Uso de Recursos"
+
+#: utils/misc/guc.c:537
+msgid "Resource Usage / Memory"
+msgstr "Uso de Recursos / Memoria"
+
+#: utils/misc/guc.c:539
+msgid "Resource Usage / Kernel Resources"
+msgstr "Uso de Recursos / Recursos del Kernel"
 
-#: utils/misc/guc.c:1207
-msgid "Causes '...' strings to treat backslashes literally."
-msgstr ""
-"Provoca que las cadenas '...' traten las barras inclinadas inversas (\\) en "
-"forma literal."
+#: utils/misc/guc.c:541
+msgid "Resource Usage / Cost-Based Vacuum Delay"
+msgstr "Uso de Recursos / Retardo de Vacuum por Costos"
 
-#: utils/misc/guc.c:1217
-msgid "Enable synchronized sequential scans."
-msgstr "Permitir la sincronización de recorridos secuenciales."
+#: utils/misc/guc.c:543
+msgid "Resource Usage / Background Writer"
+msgstr "Uso de Recursos / Escritor en Segundo Plano"
 
-#: utils/misc/guc.c:1226
-msgid "Allows archiving of WAL files using archive_command."
-msgstr "Permite el archivado de WAL usando archive_command."
+#: utils/misc/guc.c:545
+msgid "Resource Usage / Asynchronous Behavior"
+msgstr "Uso de Recursos / Comportamiento Asíncrono"
 
-#: utils/misc/guc.c:1235
-msgid "Allows connections and queries during recovery."
-msgstr "Permite conexiones y consultas durante la recuperación."
+#: utils/misc/guc.c:547
+msgid "Write-Ahead Log"
+msgstr "Write-Ahead Log"
 
-#: utils/misc/guc.c:1244
-msgid "Allows modifications of the structure of system tables."
-msgstr "Permite modificaciones de la estructura de las tablas del sistema."
+#: utils/misc/guc.c:549
+msgid "Write-Ahead Log / Settings"
+msgstr "Write-Ahead Log / Configuraciones"
 
-#: utils/misc/guc.c:1254
-msgid "Disables reading from system indexes."
-msgstr "Deshabilita lectura de índices del sistema."
+#: utils/misc/guc.c:551
+msgid "Write-Ahead Log / Checkpoints"
+msgstr "Write-Ahead Log / Puntos de Control (Checkpoints)"
 
-#: utils/misc/guc.c:1255
-msgid ""
-"It does not prevent updating the indexes, so it is safe to use.  The worst "
-"consequence is slowness."
-msgstr ""
-"No evita la actualización de índices, así que es seguro. Lo peor que puede "
-"ocurrir es lentitud del sistema."
+#: utils/misc/guc.c:553
+msgid "Write-Ahead Log / Archiving"
+msgstr "Write-Ahead Log / Archivado"
 
-#: utils/misc/guc.c:1265
-msgid ""
-"Enables backward compatibility mode for privilege checks on large objects."
-msgstr ""
-"Activa el modo de compatibilidad con versiones anteriores de las "
-"comprobaciones de privilegios de objetos grandes."
+#: utils/misc/guc.c:555
+msgid "Replication"
+msgstr "Replicación"
 
-#: utils/misc/guc.c:1266
-msgid ""
-"Skips privilege checks when reading or modifying large objects, for "
-"compatibility with PostgreSQL releases prior to 9.0."
-msgstr ""
-"Omite las comprobaciones de privilegios cuando se leen o modifican los "
-"objetos grandes, para compatibilidad con versiones de PostgreSQL anteriores "
-"a 9.0."
+#: utils/misc/guc.c:557
+msgid "Replication / Master Server"
+msgstr "Replicación / Servidor Maestro"
 
-#: utils/misc/guc.c:1284
-msgid ""
-"Forces a switch to the next xlog file if a new file has not been started "
-"within N seconds."
-msgstr ""
-"Fuerza el cambio al siguiente archivo xlog si un nuevo archivo no ha sido "
-"iniciado dentro de N segundos."
+#: utils/misc/guc.c:559
+msgid "Replication / Standby Servers"
+msgstr "Replicación / Servidores Standby"
 
-#: utils/misc/guc.c:1294
-msgid "Waits N seconds on connection startup after authentication."
-msgstr ""
-"Espera N segundos al inicio de la conexión después de la autentificación."
+#: utils/misc/guc.c:561
+msgid "Query Tuning"
+msgstr "Afinamiento de Consultas"
 
-#: utils/misc/guc.c:1295 utils/misc/guc.c:1670
-msgid "This allows attaching a debugger to the process."
-msgstr "Esto permite adjuntar un depurador al proceso."
+#: utils/misc/guc.c:563
+msgid "Query Tuning / Planner Method Configuration"
+msgstr "Afinamiento de Consultas / Configuración de Métodos del Planner"
 
-#: utils/misc/guc.c:1303
-msgid "Sets the default statistics target."
-msgstr "Definir el valor por omisión de toma de estadísticas."
+#: utils/misc/guc.c:565
+msgid "Query Tuning / Planner Cost Constants"
+msgstr "Afinamiento de Consultas / Constantes de Costo del Planner"
 
-#: utils/misc/guc.c:1304
-msgid ""
-"This applies to table columns that have not had a column-specific target set "
-"via ALTER TABLE SET STATISTICS."
-msgstr ""
-"Esto se aplica a columnas de tablas que no tienen un valor definido a través "
-"de ALTER TABLE SET STATISTICS."
+#: utils/misc/guc.c:567
+msgid "Query Tuning / Genetic Query Optimizer"
+msgstr "Afinamiento de Consultas / Optimizador Genético de Consultas"
 
-#: utils/misc/guc.c:1312
-msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
-msgstr ""
-"Tamaño de lista de FROM a partir del cual subconsultas no serán colapsadas."
+#: utils/misc/guc.c:569
+msgid "Query Tuning / Other Planner Options"
+msgstr "Afinamiento de Consultas / Otras Opciones del Planner"
 
-#: utils/misc/guc.c:1314
-msgid ""
-"The planner will merge subqueries into upper queries if the resulting FROM "
-"list would have no more than this many items."
-msgstr ""
-"El planner mezclará subconsultas en consultas de nivel superior si la lista "
-"FROM resultante es menor que esta cantidad de ítems."
+#: utils/misc/guc.c:571
+msgid "Reporting and Logging"
+msgstr "Reporte y Registro"
 
-#: utils/misc/guc.c:1323
-msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
-msgstr ""
-"Tamaño de lista de FROM a partir del cual constructos JOIN no serán "
-"aplanados."
+#: utils/misc/guc.c:573
+msgid "Reporting and Logging / Where to Log"
+msgstr "Reporte y Registro / Cuándo Registrar"
 
-#: utils/misc/guc.c:1325
-msgid ""
-"The planner will flatten explicit JOIN constructs into lists of FROM items "
-"whenever a list of no more than this many items would result."
-msgstr ""
-"El planner aplanará constructos JOIN explícitos en listas de ítems FROM "
-"siempre que la lista resultante no tenga más que esta cantidad de ítems."
+#: utils/misc/guc.c:575
+msgid "Reporting and Logging / When to Log"
+msgstr "Reporte y Registro / Cuándo Registrar"
 
-#: utils/misc/guc.c:1334
-msgid "Sets the threshold of FROM items beyond which GEQO is used."
-msgstr "Umbral de ítems en FROM a partir del cual se usará GEQO."
+#: utils/misc/guc.c:577
+msgid "Reporting and Logging / What to Log"
+msgstr "Reporte y Registro / Qué Registrar"
 
-#: utils/misc/guc.c:1342
-msgid "GEQO: effort is used to set the default for other GEQO parameters."
-msgstr ""
-"GEQO: effort se usa para determinar los valores por defecto para otros "
-"parámetros."
+#: utils/misc/guc.c:579
+msgid "Statistics"
+msgstr "Estadísticas"
 
-#: utils/misc/guc.c:1350
-msgid "GEQO: number of individuals in the population."
-msgstr "GEQO: número de individuos en una población."
+#: utils/misc/guc.c:581
+msgid "Statistics / Monitoring"
+msgstr "Estadísticas / Monitoreo"
 
-#: utils/misc/guc.c:1351 utils/misc/guc.c:1359
-msgid "Zero selects a suitable default value."
-msgstr "Cero selecciona un valor por omisión razonable."
+#: utils/misc/guc.c:583
+msgid "Statistics / Query and Index Statistics Collector"
+msgstr "Estadísticas / Recolector de Estadísticas de Consultas e �ndices"
 
-#: utils/misc/guc.c:1358
-msgid "GEQO: number of iterations of the algorithm."
-msgstr "GEQO: número de iteraciones del algoritmo."
+#: utils/misc/guc.c:585
+msgid "Autovacuum"
+msgstr "Autovacuum"
 
-#: utils/misc/guc.c:1368
-msgid "Sets the time to wait on a lock before checking for deadlock."
-msgstr "Define el tiempo a esperar un lock antes de buscar un deadlock."
+#: utils/misc/guc.c:587
+msgid "Client Connection Defaults"
+msgstr "Valores por Omisión de Conexiones"
 
-#: utils/misc/guc.c:1378
-msgid ""
-"Sets the maximum delay before canceling queries when a hot standby server is "
-"processing archived WAL data."
-msgstr ""
-"Define el máximo retardo antes de cancelar consultas cuando un servidor hot "
-"standby está procesando datos de WAL archivado."
+#: utils/misc/guc.c:589
+msgid "Client Connection Defaults / Statement Behavior"
+msgstr "Valores por Omisión de Conexiones / Comportamiento de Sentencias"
 
-#: utils/misc/guc.c:1388
-msgid ""
-"Sets the maximum delay before canceling queries when a hot standby server is "
-"processing streamed WAL data."
+#: utils/misc/guc.c:591
+msgid "Client Connection Defaults / Locale and Formatting"
 msgstr ""
-"Define el máximo retardo antes de cancelar consultas cuando un servidor hot "
-"standby está procesando datos de WAL en flujo."
+"Valores por Omisión de Conexiones / Configuraciones Regionales y Formateo"
 
-#: utils/misc/guc.c:1408
-msgid "Sets the maximum number of concurrent connections."
-msgstr "Número máximo de conexiones concurrentes."
+#: utils/misc/guc.c:593
+msgid "Client Connection Defaults / Other Defaults"
+msgstr "Valores por Omisión de Conexiones / Otros Valores"
 
-#: utils/misc/guc.c:1417
-msgid "Sets the number of connection slots reserved for superusers."
-msgstr "Número de conexiones reservadas para superusuarios."
+#: utils/misc/guc.c:595
+msgid "Lock Management"
+msgstr "Manejo de Bloqueos"
 
-#: utils/misc/guc.c:1426
-msgid "Sets the number of shared memory buffers used by the server."
-msgstr "Número de búfers de memoria compartida usados por el servidor."
+#: utils/misc/guc.c:597
+msgid "Version and Platform Compatibility"
+msgstr "Compatibilidad de Versión y Plataforma"
 
-#: utils/misc/guc.c:1436
-msgid "Sets the maximum number of temporary buffers used by each session."
-msgstr "Número de búfers de memoria temporal usados por cada sesión."
+#: utils/misc/guc.c:599
+msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
+msgstr ""
+"Compatibilidad de Versión y Plataforma / Versiones Anteriores de PostgreSQL"
 
-#: utils/misc/guc.c:1446
-msgid "Sets the TCP port the server listens on."
-msgstr "Puerto TCP en el cual escuchará el servidor."
+#: utils/misc/guc.c:601
+msgid "Version and Platform Compatibility / Other Platforms and Clients"
+msgstr "Compatibilidad de Versión y Plataforma / Otras Plataformas y Clientes"
 
-#: utils/misc/guc.c:1455
-msgid "Sets the access permissions of the Unix-domain socket."
-msgstr "Privilegios de acceso al socket Unix."
+#: utils/misc/guc.c:603
+msgid "Error Handling"
+msgstr "Gestión de Errores"
 
-#: utils/misc/guc.c:1456
-msgid ""
-"Unix-domain sockets use the usual Unix file system permission set. The "
-"parameter value is expected to be a numeric mode specification in the form "
-"accepted by the chmod and umask system calls. (To use the customary octal "
-"format the number must start with a 0 (zero).)"
-msgstr ""
-"Los sockets de dominio Unix usan la funcionalidad de permisos de archivos "
-"estándar de Unix. Se espera que el valor de esta opción sea una "
-"especificación numérica de modo, en la forma aceptada por las llamadas a "
-"sistema chmod y umask. Para usar el modo octal acostumbrado, comience el "
-"número con un 0 (cero)."
+#: utils/misc/guc.c:605
+msgid "Preset Options"
+msgstr "Opciones Predefinidas"
 
-#: utils/misc/guc.c:1468
-msgid "Sets the maximum memory to be used for query workspaces."
-msgstr ""
-"Establece el límite de memoria que se usará para espacios de trabajo de "
-"consultas."
+#: utils/misc/guc.c:607
+msgid "Customized Options"
+msgstr "Opciones Personalizadas"
 
-#: utils/misc/guc.c:1469
-msgid ""
-"This much memory can be used by each internal sort operation and hash table "
-"before switching to temporary disk files."
-msgstr ""
-"Esta es la cantidad máxima de memoria que se usará para operaciones internas "
-"de ordenamiento y tablas de hashing, antes de comenzar a usar archivos "
-"temporales en disco."
+#: utils/misc/guc.c:609
+msgid "Developer Options"
+msgstr "Opciones de Desarrollador"
 
-#: utils/misc/guc.c:1480
-msgid "Sets the maximum memory to be used for maintenance operations."
-msgstr ""
-"Establece el límite de memoria que se usará para operaciones de mantención."
+#: utils/misc/guc.c:663
+msgid "Enables the planner's use of sequential-scan plans."
+msgstr "Permitir el uso de planes de recorrido secuencial."
 
-#: utils/misc/guc.c:1481
-msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr "Esto incluye operaciones como VACUUM y CREATE INDEX."
+#: utils/misc/guc.c:672
+msgid "Enables the planner's use of index-scan plans."
+msgstr "Permitir el uso de planes de recorrido de índice."
 
-#: utils/misc/guc.c:1490
-msgid "Sets the maximum stack depth, in kilobytes."
-msgstr "Establece el tamaño máximo del stack, en kilobytes."
+#: utils/misc/guc.c:681
+msgid "Enables the planner's use of bitmap-scan plans."
+msgstr "Permitir el uso de planes de recorrido de índice por mapas de bits."
 
-#: utils/misc/guc.c:1500
-msgid "Vacuum cost for a page found in the buffer cache."
-msgstr "Costo de Vacuum de una página encontrada en el buffer."
+#: utils/misc/guc.c:690
+msgid "Enables the planner's use of TID scan plans."
+msgstr "Permitir el uso de planes de recorrido por TID."
 
-#: utils/misc/guc.c:1509
-msgid "Vacuum cost for a page not found in the buffer cache."
-msgstr "Costo de Vacuum de una página no encontrada en el cache."
+#: utils/misc/guc.c:699
+msgid "Enables the planner's use of explicit sort steps."
+msgstr "Permitir el uso de pasos explícitos de ordenamiento."
 
-#: utils/misc/guc.c:1518
-msgid "Vacuum cost for a page dirtied by vacuum."
-msgstr "Costo de Vacuum de una página ensuciada por vacuum."
+#: utils/misc/guc.c:708
+msgid "Enables the planner's use of hashed aggregation plans."
+msgstr "Permitir el uso de planes de agregación a través de hash."
 
-#: utils/misc/guc.c:1527
-msgid "Vacuum cost amount available before napping."
-msgstr "Costo de Vacuum disponible antes de descansar."
+#: utils/misc/guc.c:717
+msgid "Enables the planner's use of materialization."
+msgstr "Permitir el uso de materialización de planes."
 
-#: utils/misc/guc.c:1536
-msgid "Vacuum cost delay in milliseconds."
-msgstr "Tiempo de descanso de vacuum en milisegundos."
+#: utils/misc/guc.c:726
+msgid "Enables the planner's use of nested-loop join plans."
+msgstr "Permitir el uso de planes «nested-loop join»."
 
-#: utils/misc/guc.c:1546
-msgid "Vacuum cost delay in milliseconds, for autovacuum."
-msgstr "Tiempo de descanso de vacuum en milisegundos, para autovacuum."
+#: utils/misc/guc.c:735
+msgid "Enables the planner's use of merge join plans."
+msgstr "Permitir el uso de planes «merge join»."
 
-#: utils/misc/guc.c:1556
-msgid "Vacuum cost amount available before napping, for autovacuum."
-msgstr "Costo de Vacuum disponible antes de descansar, para autovacuum."
+#: utils/misc/guc.c:744
+msgid "Enables the planner's use of hash join plans."
+msgstr "Permitir el uso de planes «hash join»."
 
-#: utils/misc/guc.c:1565
-msgid ""
-"Sets the maximum number of simultaneously open files for each server process."
-msgstr "Define la cantidad máxima de archivos abiertos por cada subproceso."
+#: utils/misc/guc.c:753
+msgid "Enables genetic query optimization."
+msgstr "Permitir el uso del optimizador genético de consultas."
 
-#: utils/misc/guc.c:1577
-msgid "Sets the maximum number of simultaneously prepared transactions."
-msgstr "Define la cantidad máxima de transacciones preparadas simultáneas."
+#: utils/misc/guc.c:754
+msgid "This algorithm attempts to do planning without exhaustive searching."
+msgstr ""
+"Este algoritmo intenta planear las consultas sin hacer búsqueda exhaustiva."
 
-#: utils/misc/guc.c:1607
-msgid "Sets the maximum allowed duration of any statement."
-msgstr "Define la duración máxima permitida de sentencias."
+#: utils/misc/guc.c:764
+msgid "Shows whether the current user is a superuser."
+msgstr "Indica si el usuario actual es superusuario."
 
-#: utils/misc/guc.c:1608
-msgid "A value of 0 turns off the timeout."
-msgstr "Un valor de 0 desactiva el máximo."
+#: utils/misc/guc.c:774
+msgid "Enables advertising the server via Bonjour."
+msgstr "Permitir la publicación del servidor vía Bonjour."
 
-#: utils/misc/guc.c:1617
-msgid "Minimum age at which VACUUM should freeze a table row."
-msgstr ""
-"Mínima edad a la cual VACUUM debería congelar (freeze) una fila de una tabla."
+#: utils/misc/guc.c:783
+msgid "Enables SSL connections."
+msgstr "Permitir conexiones SSL."
 
-#: utils/misc/guc.c:1626
-msgid "Age at which VACUUM should scan whole table to freeze tuples."
-msgstr ""
-"Edad a la cual VACUUM debería recorrer una tabla completa para congelar "
-"(freeze) las filas."
+#: utils/misc/guc.c:792
+msgid "Forces synchronization of updates to disk."
+msgstr "Forzar la sincronización de escrituras a disco."
 
-#: utils/misc/guc.c:1635
+#: utils/misc/guc.c:793
 msgid ""
-"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
-"if any."
+"The server will use the fsync() system call in several places to make sure "
+"that updates are physically written to disk. This insures that a database "
+"cluster will recover to a consistent state after an operating system or "
+"hardware crash."
 msgstr ""
-"Número de transacciones por las cuales VACUUM y la limpieza HOT deberían "
-"postergarse."
+"El servidor usará la llamada a sistema fsync() en varios lugares para "
+"asegurarse que las actualizaciones son escritas físicamente a disco. Esto "
+"asegura que las bases de datos se recuperarán a un estado consistente "
+"después de una caída de hardware o sistema operativo."
 
-#: utils/misc/guc.c:1647
-msgid "Sets the maximum number of locks per transaction."
-msgstr "Cantidad máxima de bloqueos (locks) por transacción."
+#: utils/misc/guc.c:804
+msgid "Continues processing past damaged page headers."
+msgstr "Continuar procesando más allá de encabezados de página dañados."
 
-#: utils/misc/guc.c:1648
+#: utils/misc/guc.c:805
 msgid ""
-"The shared lock table is sized on the assumption that at most "
-"max_locks_per_transaction * max_connections distinct objects will need to be "
-"locked at any one time."
+"Detection of a damaged page header normally causes PostgreSQL to report an "
+"error, aborting the current transaction. Setting zero_damaged_pages to true "
+"causes the system to instead report a warning, zero out the damaged page, "
+"and continue processing. This behavior will destroy data, namely all the "
+"rows on the damaged page."
 msgstr ""
-"El tamaño de la tabla compartida de bloqueos se calcula usando la suposición "
-"de que a lo más max_locks_per_transaction * max_connections objetos "
-"necesitarán ser bloqueados simultáneamente."
-
-#: utils/misc/guc.c:1658
-msgid "Sets the maximum allowed time to complete client authentication."
-msgstr "Define el tiempo máximo para completar proceso de autentificación."
+"La detección de un encabezado de página dañado normalmente hace que "
+"PostgreSQL reporte un error, abortando la transacción en curso. Definiendo "
+"zero_damaged_pages a true hace que el sistema reporte un mensaje de warning, "
+"escriba ceros en toda la página, y continúe el procesamiento. Este "
+"comportamiento destruirá datos; en particular, todas las tuplas en la página "
+"dañada."
 
-#: utils/misc/guc.c:1669
-msgid "Waits N seconds on connection startup before authentication."
+#: utils/misc/guc.c:818
+msgid "Writes full pages to WAL when first modified after a checkpoint."
 msgstr ""
-"Espera N segundos al inicio de la conexión antes de la autentificación."
-
-#: utils/misc/guc.c:1679
-msgid "Sets the number of WAL files held for standby servers."
-msgstr "Número de archivos WAL conservados para servidores standby."
+"Escribe páginas completas a WAL cuando son modificadas después de un punto "
+"de control."
 
-#: utils/misc/guc.c:1688
+#: utils/misc/guc.c:819
 msgid ""
-"Sets the maximum distance in log segments between automatic WAL checkpoints."
+"A page write in process during an operating system crash might be only "
+"partially written to disk.  During recovery, the row changes stored in WAL "
+"are not enough to recover.  This option writes pages when first modified "
+"after a checkpoint to WAL so full recovery is possible."
 msgstr ""
-"Define la distancia máxima, en cantidad de segmentos, entre puntos de "
-"control de WAL automáticos."
-
-#: utils/misc/guc.c:1697
-msgid "Sets the maximum time between automatic WAL checkpoints."
-msgstr "Define el tiempo máximo entre puntos de control de WAL automáticos."
+"Una escritura de página que está siendo procesada durante una caída del "
+"sistema operativo puede ser completada sólo parcialmente.  Durante la "
+"recuperación, los cambios de registros (tuplas) almacenados en WAL no son "
+"suficientes para la recuperación. Esta opción activa la escritura de las "
+"páginas a WAL cuando son modificadas por primera vez después de un punto de "
+"control, de manera que una recuperación total es posible."
 
-#: utils/misc/guc.c:1707
-msgid ""
-"Enables warnings if checkpoint segments are filled more frequently than this."
-msgstr "Registrar si el llenado de segmentos de WAL es más frecuente que esto."
+#: utils/misc/guc.c:831
+msgid "Runs the server silently."
+msgstr "Ejecuta el servidor silenciosamente."
 
-#: utils/misc/guc.c:1709
+#: utils/misc/guc.c:832
 msgid ""
-"Write a message to the server log if checkpoints caused by the filling of "
-"checkpoint segment files happens more frequently than this number of "
-"seconds. Zero turns off the warning."
+"If this parameter is set, the server will automatically run in the "
+"background and any controlling terminals are dissociated."
 msgstr ""
-"Envía un mensaje a los registros del servidor si los punto de control "
-"causados por el llenado de archivos de segmento sucede con más frecuencia "
-"que este número de segundos. Un valor de 0 (cero) desactiva la opción."
+"Si esta opción está activada, el servidor se ejecutará automáticamente en "
+"segundo plano y los terminales de control serán disociados."
 
-#: utils/misc/guc.c:1720
-msgid "Sets the number of disk-page buffers in shared memory for WAL."
-msgstr "Búfers en memoria compartida para páginas de WAL."
+#: utils/misc/guc.c:841
+msgid "Logs each checkpoint."
+msgstr "Registrar cada punto de control."
 
-#: utils/misc/guc.c:1730
-msgid "WAL writer sleep time between WAL flushes."
-msgstr ""
-"Tiempo de descanso del escritor de WAL entre escrituras de WAL consecutivas."
+#: utils/misc/guc.c:850
+msgid "Logs each successful connection."
+msgstr "Registrar cada conexión exitosa."
 
-#: utils/misc/guc.c:1741
-msgid "Sets the maximum number of simultaneously running WAL sender processes."
-msgstr "Define la cantidad máxima de procesos «WAL sender» simultáneos."
+#: utils/misc/guc.c:859
+msgid "Logs end of a session, including duration."
+msgstr "Registrar el fin de una sesión, incluyendo su duración."
 
-#: utils/misc/guc.c:1750
-msgid "WAL sender sleep time between WAL replications."
-msgstr ""
-"Tiempo de descanso de «WAL sender» entre replicaciones de WAL consecutivas."
+#: utils/misc/guc.c:868
+msgid "Turns on various assertion checks."
+msgstr "Activar varios chequeos de integridad (assertion checks)."
 
-#: utils/misc/guc.c:1760
-msgid ""
-"Sets the delay in microseconds between transaction commit and flushing WAL "
-"to disk."
-msgstr ""
-"Retardo en microsegundos entre completar una transacción y escribir WAL a "
-"disco."
+#: utils/misc/guc.c:869
+msgid "This is a debugging aid."
+msgstr "Esto es una ayuda para la depuración."
 
-#: utils/misc/guc.c:1770
-msgid ""
-"Sets the minimum concurrent open transactions before performing commit_delay."
-msgstr "Mínimo de transacciones concurrentes para esperar commit_delay."
+#: utils/misc/guc.c:883
+msgid "Terminate session on any error."
+msgstr "Terminar sesión ante cualquier error."
 
-#: utils/misc/guc.c:1780
-msgid "Sets the number of digits displayed for floating-point values."
-msgstr "Ajustar el número de dígitos mostrados para valores de coma flotante."
+#: utils/misc/guc.c:892
+msgid "Reinitialize server after backend crash."
+msgstr "Reinicializar el servidor después de una caída de un proceso servidor."
 
-#: utils/misc/guc.c:1781
-msgid ""
-"This affects real, double precision, and geometric data types. The parameter "
-"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
-"appropriate)."
-msgstr ""
-"Afecta los tipos real, double precision y geométricos. El valor del "
-"parámetro se agrega al número estándar de dígitos (FLT_DIG o DBL_DIG según "
-"corresponda)"
+#: utils/misc/guc.c:902
+msgid "Logs the duration of each completed SQL statement."
+msgstr "Registrar la duración de cada sentencia SQL ejecutada."
 
-#: utils/misc/guc.c:1791
-msgid "Sets the minimum execution time above which statements will be logged."
-msgstr ""
-"Tiempo mínimo de ejecución a partir del cual se registran las consultas."
+#: utils/misc/guc.c:911
+msgid "Logs each query's parse tree."
+msgstr "Registrar cada arbol analizado de consulta "
 
-#: utils/misc/guc.c:1793
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Cero registra todas las consultas. -1 desactiva esta característica."
+#: utils/misc/guc.c:920
+msgid "Logs each query's rewritten parse tree."
+msgstr "Registrar cada reescritura del arból analizado de consulta"
 
-#: utils/misc/guc.c:1802
-msgid ""
-"Sets the minimum execution time above which autovacuum actions will be "
-"logged."
-msgstr ""
-"Tiempo mínimo de ejecución a partir del cual se registran las acciones de "
-"autovacuum."
+#: utils/misc/guc.c:929
+msgid "Logs each query's execution plan."
+msgstr "Registrar el plan de ejecución de cada consulta."
 
-#: utils/misc/guc.c:1804
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr ""
-"Cero registra todas las acciones. -1 desactiva el registro de autovacuum."
+#: utils/misc/guc.c:938
+msgid "Indents parse and plan tree displays."
+msgstr "Indentar los árboles de parse y plan."
 
-#: utils/misc/guc.c:1813
-msgid "Background writer sleep time between rounds."
-msgstr "Tiempo de descanso entre rondas del background writer"
+#: utils/misc/guc.c:947
+msgid "Writes parser performance statistics to the server log."
+msgstr "Escribir estadísticas de parser al registro del servidor."
 
-#: utils/misc/guc.c:1823
-msgid "Background writer maximum number of LRU pages to flush per round."
-msgstr ""
-"Número máximo de páginas LRU a escribir en cada ronda del background writer"
+#: utils/misc/guc.c:956
+msgid "Writes planner performance statistics to the server log."
+msgstr "Escribir estadísticas de planner al registro del servidor."
 
-#: utils/misc/guc.c:1838
-msgid ""
-"Number of simultaneous requests that can be handled efficiently by the disk "
-"subsystem."
-msgstr ""
-"Cantidad máxima de peticiones simultáneas que pueden ser manejadas "
-"eficientemente por el sistema de disco."
+#: utils/misc/guc.c:965
+msgid "Writes executor performance statistics to the server log."
+msgstr "Escribir estadísticas del executor al registro del servidor."
 
-#: utils/misc/guc.c:1839
-msgid ""
-"For RAID arrays, this should be approximately the number of drive spindles "
-"in the array."
-msgstr ""
-"Para arrays RAID, esto debería ser aproximadamente la cantidad de discos en "
-"el array."
+#: utils/misc/guc.c:974
+msgid "Writes cumulative performance statistics to the server log."
+msgstr "Escribir estadísticas acumulativas al registro del servidor."
 
-#: utils/misc/guc.c:1852
-msgid "Automatic log file rotation will occur after N minutes."
-msgstr ""
-"La rotación automática de archivos de log se efectuará después de N minutos."
+#: utils/misc/guc.c:984 utils/misc/guc.c:1049 utils/misc/guc.c:1059
+#: utils/misc/guc.c:1069 utils/misc/guc.c:1079 utils/misc/guc.c:1804
+#: utils/misc/guc.c:1814
+msgid "No description available."
+msgstr "No hay descripción disponible."
 
-#: utils/misc/guc.c:1862
-msgid "Automatic log file rotation will occur after N kilobytes."
+#: utils/misc/guc.c:996
+msgid "Collects information about executing commands."
+msgstr "Recolectar estadísticas sobre órdenes en ejecución."
+
+#: utils/misc/guc.c:997
+msgid ""
+"Enables the collection of information on the currently executing command of "
+"each session, along with the time at which that command began execution."
 msgstr ""
-"La rotación automática de archivos de log se efectuará después de N "
-"kilobytes."
+"Activa la recolección de información sobre la orden actualmente en ejecución "
+"en cada sesión, junto con el momento en el cual esa orden comenzó la "
+"ejecución."
 
-#: utils/misc/guc.c:1872
-msgid "Shows the maximum number of function arguments."
-msgstr "Muestra la cantidad máxima de argumentos de funciones."
+#: utils/misc/guc.c:1007
+msgid "Collects statistics on database activity."
+msgstr "Recolectar estadísticas de actividad de la base de datos."
 
-#: utils/misc/guc.c:1882
-msgid "Shows the maximum number of index keys."
-msgstr "Muestra la cantidad máxima de claves de índices."
+#: utils/misc/guc.c:1017
+msgid "Updates the process title to show the active SQL command."
+msgstr "Actualiza el título del proceso para mostrar la orden SQL activo."
 
-#: utils/misc/guc.c:1892
-msgid "Shows the maximum identifier length."
-msgstr "Muestra el largo máximo de identificadores."
+#: utils/misc/guc.c:1018
+msgid ""
+"Enables updating of the process title every time a new SQL command is "
+"received by the server."
+msgstr ""
+"Habilita que se actualice el título del proceso cada vez que una orden SQL "
+"es recibido por el servidor."
 
-#: utils/misc/guc.c:1902
-msgid "Shows the size of a disk block."
-msgstr "Muestra el tamaño de un bloque de disco."
+#: utils/misc/guc.c:1027
+msgid "Starts the autovacuum subprocess."
+msgstr "Iniciar el subproceso de autovacuum."
 
-#: utils/misc/guc.c:1912
-msgid "Shows the number of pages per disk file."
-msgstr "Muestra el número de páginas por archivo en disco."
+#: utils/misc/guc.c:1037
+msgid "Generates debugging output for LISTEN and NOTIFY."
+msgstr "Generar salida de depuración para LISTEN y NOTIFY."
 
-#: utils/misc/guc.c:1922
-msgid "Shows the block size in the write ahead log."
-msgstr "Muestra el tamaño de bloque en el write-ahead log."
+#: utils/misc/guc.c:1091
+msgid "Logs long lock waits."
+msgstr "Registrar esperas largas de bloqueos."
 
-#: utils/misc/guc.c:1932
-msgid "Shows the number of pages per write ahead log segment."
-msgstr "Muestra el número de páginas por cada segmento de write-ahead log."
+#: utils/misc/guc.c:1101
+msgid "Logs the host name in the connection logs."
+msgstr "Registrar el nombre del host en la conexión."
 
-#: utils/misc/guc.c:1945
-msgid "Time to sleep between autovacuum runs."
-msgstr "Tiempo de descanso entre ejecuciones de autovacuum."
+#: utils/misc/guc.c:1102
+msgid ""
+"By default, connection logs only show the IP address of the connecting host. "
+"If you want them to show the host name you can turn this on, but depending "
+"on your host name resolution setup it might impose a non-negligible "
+"performance penalty."
+msgstr ""
+"Por omisión, los registros de conexión sólo muestran la dirección IP del "
+"host que establece la conexión. Si desea que se despliegue el nombre del "
+"host puede activar esta opción, pero dependiendo de su configuración de "
+"resolución de nombres esto puede imponer una penalización de rendimiento no "
+"despreciable."
 
-#: utils/misc/guc.c:1954
-msgid "Minimum number of tuple updates or deletes prior to vacuum."
-msgstr "Número mínimo de updates o deletes antes de ejecutar vacuum."
+#: utils/misc/guc.c:1113
+msgid "Causes subtables to be included by default in various commands."
+msgstr "Incluir, por omisión, subtablas en varias órdenes."
 
-#: utils/misc/guc.c:1962
-msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
-msgstr "Número mínimo de inserts, updates, deletes antes de ejecutar analyze."
+#: utils/misc/guc.c:1122
+msgid "Encrypt passwords."
+msgstr "Cifrar contraseñas."
 
-#: utils/misc/guc.c:1971
+#: utils/misc/guc.c:1123
 msgid ""
-"Age at which to autovacuum a table to prevent transaction ID wraparound."
+"When a password is specified in CREATE USER or ALTER USER without writing "
+"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
+"password is to be encrypted."
 msgstr ""
-"Edad a la cual aplicar VACUUM automáticamente a una tabla para prevenir "
-"problemas por reciclaje de ID de transacción."
+"Cuando se entrega una contraseña en CREATE USER o ALTER USER sin especificar "
+"ENCRYPTED ni UNENCRYPTED, esta opción determina si la password deberá ser "
+"encriptada."
 
-#: utils/misc/guc.c:1981
-msgid ""
-"Sets the maximum number of simultaneously running autovacuum worker "
-"processes."
-msgstr "Define la cantidad máxima de procesos «autovacuum worker» simultáneos."
+#: utils/misc/guc.c:1133
+msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
+msgstr "Tratar expr=NULL como expr IS NULL."
 
-#: utils/misc/guc.c:1990
-msgid "Time between issuing TCP keepalives."
-msgstr "Tiempo entre cada emisión de TCP keepalive."
+#: utils/misc/guc.c:1134
+msgid ""
+"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
+"treated as expr IS NULL, that is, they return true if expr evaluates to the "
+"null value, and false otherwise. The correct behavior of expr = NULL is to "
+"always return null (unknown)."
+msgstr ""
+"Cuando está activado, expresiones de la forma expr = NULL (o NULL = expr) "
+"son tratadas como expr IS NULL, esto es, retornarán verdadero si expr es "
+"evaluada al valor nulo, y falso en caso contrario. El comportamiento "
+"correcto de expr = NULL es retornar siempre null (desconocido)."
 
-#: utils/misc/guc.c:1991 utils/misc/guc.c:2001
-msgid "A value of 0 uses the system default."
-msgstr "Un valor 0 usa el valor por omisión del sistema."
+#: utils/misc/guc.c:1146
+msgid "Enables per-database user names."
+msgstr "Activar el uso de nombre de usuario locales a cada base de datos."
 
-#: utils/misc/guc.c:2000
-msgid "Time between TCP keepalive retransmits."
-msgstr "Tiempo entre retransmisiones TCP keepalive."
+#: utils/misc/guc.c:1156
+msgid "This parameter doesn't do anything."
+msgstr "Este parámetro no hace nada."
 
-#: utils/misc/guc.c:2010
+#: utils/misc/guc.c:1157
 msgid ""
-"Set the amount of traffic to send and receive before renegotiating the "
-"encryption keys."
+"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
+"vintage clients."
 msgstr ""
-"Define la cantidad de tráfico a enviar y recibir antes de renegociar las "
-"llaves de cifrado."
+"Está aquí sólo para poder aceptar SET AUTOCOMMIT TO ON desde clientes de la "
+"línea 7.3."
 
-#: utils/misc/guc.c:2020
-msgid "Maximum number of TCP keepalive retransmits."
-msgstr "Cantidad máxima de retransmisiones TCP keepalive."
+#: utils/misc/guc.c:1166
+msgid "Sets the default read-only status of new transactions."
+msgstr "Estado por omisión de sólo lectura de nuevas transacciones."
+
+#: utils/misc/guc.c:1175
+msgid "Sets the current transaction's read-only status."
+msgstr "Activa el estado de sólo lectura de la transacción en curso."
 
-#: utils/misc/guc.c:2021
+#: utils/misc/guc.c:1185
+msgid "Sets the default deferrable status of new transactions."
+msgstr "Estado por omisión de postergable de nuevas transacciones."
+
+#: utils/misc/guc.c:1194
 msgid ""
-"This controls the number of consecutive keepalive retransmits that can be "
-"lost before a connection is considered dead. A value of 0 uses the system "
-"default."
+"Whether to defer a read-only serializable transaction until it can be "
+"executed with no possible serialization failures."
 msgstr ""
-"Esto controla el número de retransmisiones consecutivas de keepalive que "
-"pueden ser perdidas antes que la conexión sea considerada muerta.  Un valor "
-"0 usa el valor por omisión del sistema."
+"Si está activo, las transacciones serializables de sólo lectura serán "
+"pausadas hasta que puedan ejecutarse sin posibles fallas de serialización."
 
-#: utils/misc/guc.c:2031
-msgid "Sets the maximum allowed result for exact search by GIN."
-msgstr ""
-"Define el máximo de resultados permitidos por búsquedas exactas con GIN."
+#: utils/misc/guc.c:1204
+msgid "Check function bodies during CREATE FUNCTION."
+msgstr "Verificar definición de funciones durante CREATE FUNCTION."
 
-#: utils/misc/guc.c:2041
-msgid "Sets the planner's assumption about the size of the disk cache."
-msgstr "Define la suposición del tamaño del cache de disco."
+#: utils/misc/guc.c:1213
+msgid "Enable input of NULL elements in arrays."
+msgstr "Habilita el ingreso de elementos nulos en arrays."
 
-#: utils/misc/guc.c:2042
+#: utils/misc/guc.c:1214
 msgid ""
-"That is, the portion of the kernel's disk cache that will be used for "
-"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
-"kB each."
+"When turned on, unquoted NULL in an array input value means a null value; "
+"otherwise it is taken literally."
 msgstr ""
-"Esto es, la porción del cache de disco que será usado para archivos de datos "
-"de PostgreSQL. Esto se mide en cantidad de páginas, que normalmente son de 8 "
-"kB cada una."
+"Cuando está activo, un valor NULL sin comillas en la entrada de un array "
+"significa un valor nulo; en caso contrario es tomado literalmente."
 
-#: utils/misc/guc.c:2054
-msgid "Shows the server version as an integer."
-msgstr "Muestra la versión del servidor como un número entero."
+#: utils/misc/guc.c:1224
+msgid "Create new tables with OIDs by default."
+msgstr "Crea nuevas tablas con OIDs por omisión."
 
-#: utils/misc/guc.c:2064
-msgid "Log the use of temporary files larger than this number of kilobytes."
+#: utils/misc/guc.c:1233
+msgid ""
+"Start a subprocess to capture stderr output and/or csvlogs into log files."
 msgstr ""
-"Registra el uso de archivos temporales que crezcan más allá de este número "
-"de kilobytes."
+"Lanzar un subproceso para capturar stderr y/o logs CSV en archivos de log."
 
-#: utils/misc/guc.c:2065
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
+#: utils/misc/guc.c:1242
+msgid "Truncate existing log files of same name during log rotation."
+msgstr "Truncar archivos de log del mismo nombre durante la rotación."
+
+#: utils/misc/guc.c:1253
+msgid "Emit information about resource usage in sorting."
 msgstr ""
-"Cero registra todos los archivos. El valor por omisión es -1 (lo cual "
-"desactiva el registro)."
+"Emitir información acerca de uso de recursos durante los ordenamientos."
 
-#: utils/misc/guc.c:2074
-msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
-msgstr "Tamaño reservado para pg_stat_activity.current_query, en bytes."
+#: utils/misc/guc.c:1267
+msgid "Generate debugging output for synchronized scanning."
+msgstr "Generar salida de depuración para recorrido sincronizado."
 
-#: utils/misc/guc.c:2092
-msgid ""
-"Sets the planner's estimate of the cost of a sequentially fetched disk page."
-msgstr "Estimación del costo de una página leída secuencialmente."
+#: utils/misc/guc.c:1282
+msgid "Enable bounded sorting using heap sort."
+msgstr "Activar ordenamiento acotado usando «heap sort»."
 
-#: utils/misc/guc.c:2101
-msgid ""
-"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
-"page."
-msgstr "Estimación del costo de una página leída no secuencialmente."
+#: utils/misc/guc.c:1295
+msgid "Emit WAL-related debugging output."
+msgstr "Activar salida de depuración de WAL."
 
-#: utils/misc/guc.c:2110
-msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
-msgstr "Estimación del costo de procesar cada tupla (fila)."
+#: utils/misc/guc.c:1307
+msgid "Datetimes are integer based."
+msgstr "Las fechas y horas se basan en tipos enteros."
 
-#: utils/misc/guc.c:2119
+#: utils/misc/guc.c:1322
 msgid ""
-"Sets the planner's estimate of the cost of processing each index entry "
-"during an index scan."
+"Sets whether Kerberos and GSSAPI user names should be treated as case-"
+"insensitive."
 msgstr ""
-"Estimación del costo de procesar cada fila de índice durante un recorrido de "
-"índice."
-
-#: utils/misc/guc.c:2128
-msgid ""
-"Sets the planner's estimate of the cost of processing each operator or "
-"function call."
-msgstr "Estimación del costo de procesar cada operador o llamada a función."
+"Define que los nombres de usuario Kerberos y GSSAPI deberían ser tratados "
+"sin distinción de mayúsculas."
 
-#: utils/misc/guc.c:2138
-msgid ""
-"Sets the planner's estimate of the fraction of a cursor's rows that will be "
-"retrieved."
-msgstr "Estimación de la fracción de filas de un cursor que serán extraídas."
+#: utils/misc/guc.c:1332
+msgid "Warn about backslash escapes in ordinary string literals."
+msgstr ""
+"Avisa acerca de escapes de backslash en literales de cadena corrientes."
 
-#: utils/misc/guc.c:2148
-msgid "GEQO: selective pressure within the population."
-msgstr "GEQO: presión selectiva dentro de la población."
+#: utils/misc/guc.c:1342
+msgid "Causes '...' strings to treat backslashes literally."
+msgstr ""
+"Provoca que las cadenas '...' traten las barras inclinadas inversas (\\) en "
+"forma literal."
 
-#: utils/misc/guc.c:2157
-msgid "GEQO: seed for random path selection."
-msgstr "GEQO: semilla para la selección aleatoria de caminos."
+#: utils/misc/guc.c:1353
+msgid "Enable synchronized sequential scans."
+msgstr "Permitir la sincronización de recorridos secuenciales."
 
-#: utils/misc/guc.c:2166
-msgid "Multiple of the average buffer usage to free per round."
-msgstr "Múltiplo del uso promedio de búfers que liberar en cada ronda."
+#: utils/misc/guc.c:1363
+msgid "Allows archiving of WAL files using archive_command."
+msgstr "Permite el archivado de WAL usando archive_command."
 
-#: utils/misc/guc.c:2175
-msgid "Sets the seed for random-number generation."
-msgstr "Semilla para la generación de números aleatorios."
+#: utils/misc/guc.c:1373
+msgid "Allows connections and queries during recovery."
+msgstr "Permite conexiones y consultas durante la recuperación."
 
-#: utils/misc/guc.c:2185
+#: utils/misc/guc.c:1383
 msgid ""
-"Number of tuple updates or deletes prior to vacuum as a fraction of "
-"reltuples."
+"Allows feedback from a hot standby to the primary that will avoid query "
+"conflicts."
 msgstr ""
-"Número de updates o deletes de tuplas antes de ejecutar un vacuum, como "
-"fracción de reltuples."
+"Permite retroalimentación desde un hot standby hacia el primario que evitará "
+"conflictos en consultas."
 
-#: utils/misc/guc.c:2193
+#: utils/misc/guc.c:1393
+msgid "Allows modifications of the structure of system tables."
+msgstr "Permite modificaciones de la estructura de las tablas del sistema."
+
+#: utils/misc/guc.c:1404
+msgid "Disables reading from system indexes."
+msgstr "Deshabilita lectura de índices del sistema."
+
+#: utils/misc/guc.c:1405
 msgid ""
-"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
-"of reltuples."
+"It does not prevent updating the indexes, so it is safe to use.  The worst "
+"consequence is slowness."
 msgstr ""
-"Número de inserts, updates o deletes de tuplas antes de ejecutar un analyze, "
-"como fracción de reltuples."
+"No evita la actualización de índices, así que es seguro. Lo peor que puede "
+"ocurrir es lentitud del sistema."
 
-#: utils/misc/guc.c:2202
+#: utils/misc/guc.c:1416
 msgid ""
-"Time spent flushing dirty buffers during checkpoint, as fraction of "
-"checkpoint interval."
+"Enables backward compatibility mode for privilege checks on large objects."
 msgstr ""
-"Tiempo utilizado en escribir páginas «sucias» durante los puntos de control, "
-"medido como fracción del intervalo del punto de control."
-
-#: utils/misc/guc.c:2220
-msgid "Sets the shell command that will be called to archive a WAL file."
-msgstr "Orden de shell que se invocará para archivar un archivo WAL."
+"Activa el modo de compatibilidad con versiones anteriores de las "
+"comprobaciones de privilegios de objetos grandes."
 
-#: utils/misc/guc.c:2229
-msgid "Sets the client's character set encoding."
-msgstr "Codificación del juego de caracteres del cliente."
+#: utils/misc/guc.c:1417
+msgid ""
+"Skips privilege checks when reading or modifying large objects, for "
+"compatibility with PostgreSQL releases prior to 9.0."
+msgstr ""
+"Omite las comprobaciones de privilegios cuando se leen o modifican los "
+"objetos grandes, para compatibilidad con versiones de PostgreSQL anteriores "
+"a 9.0."
 
-#: utils/misc/guc.c:2239
-msgid "Controls information prefixed to each log line."
-msgstr "Controla el prefijo que antecede cada línea registrada."
+#: utils/misc/guc.c:1427
+msgid "When generating SQL fragments, quote all identifiers."
+msgstr "Al generar fragmentos SQL, entrecomillar todos los identificadores."
 
-#: utils/misc/guc.c:2240
-msgid "If blank, no prefix is used."
-msgstr "si está en blanco, no se usa prefijo."
+#: utils/misc/guc.c:1446
+msgid ""
+"Forces a switch to the next xlog file if a new file has not been started "
+"within N seconds."
+msgstr ""
+"Fuerza el cambio al siguiente archivo xlog si un nuevo archivo no ha sido "
+"iniciado dentro de N segundos."
 
-#: utils/misc/guc.c:2248
-msgid "Sets the time zone to use in log messages."
-msgstr "Define el huso horario usando en los mensajes registrados."
+#: utils/misc/guc.c:1457
+msgid "Waits N seconds on connection startup after authentication."
+msgstr ""
+"Espera N segundos al inicio de la conexión después de la autentificación."
 
-#: utils/misc/guc.c:2257
-msgid "Sets the display format for date and time values."
-msgstr "Formato de salida para valores de horas y fechas."
+#: utils/misc/guc.c:1458 utils/misc/guc.c:1907
+msgid "This allows attaching a debugger to the process."
+msgstr "Esto permite adjuntar un depurador al proceso."
 
-#: utils/misc/guc.c:2258
-msgid "Also controls interpretation of ambiguous date inputs."
-msgstr "También controla la interpretación de entradas ambiguas de fechas"
+#: utils/misc/guc.c:1467
+msgid "Sets the default statistics target."
+msgstr "Definir el valor por omisión de toma de estadísticas."
 
-#: utils/misc/guc.c:2268
-msgid "Sets the default tablespace to create tables and indexes in."
-msgstr "Define el tablespace en el cual crear tablas e índices."
+#: utils/misc/guc.c:1468
+msgid ""
+"This applies to table columns that have not had a column-specific target set "
+"via ALTER TABLE SET STATISTICS."
+msgstr ""
+"Esto se aplica a columnas de tablas que no tienen un valor definido a través "
+"de ALTER TABLE SET STATISTICS."
 
-#: utils/misc/guc.c:2269
-msgid "An empty string selects the database's default tablespace."
+#: utils/misc/guc.c:1477
+msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr ""
-"Una cadena vacía especifica el tablespace por omisión de la base de datos."
+"Tamaño de lista de FROM a partir del cual subconsultas no serán colapsadas."
 
-#: utils/misc/guc.c:2278
-msgid "Sets the tablespace(s) to use for temporary tables and sort files."
+#: utils/misc/guc.c:1479
+msgid ""
+"The planner will merge subqueries into upper queries if the resulting FROM "
+"list would have no more than this many items."
 msgstr ""
-"Define el/los tablespace/s en el cual crear tablas temporales y archivos de "
-"ordenamiento."
+"El planner mezclará subconsultas en consultas de nivel superior si la lista "
+"FROM resultante es menor que esta cantidad de ítems."
 
-#: utils/misc/guc.c:2288
-msgid "Sets the path for dynamically loadable modules."
-msgstr "Ruta para módulos dinámicos."
+#: utils/misc/guc.c:1489
+msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
+msgstr ""
+"Tamaño de lista de FROM a partir del cual constructos JOIN no serán "
+"aplanados."
 
-#: utils/misc/guc.c:2289
+#: utils/misc/guc.c:1491
 msgid ""
-"If a dynamically loadable module needs to be opened and the specified name "
-"does not have a directory component (i.e., the name does not contain a "
-"slash), the system will search this path for the specified file."
+"The planner will flatten explicit JOIN constructs into lists of FROM items "
+"whenever a list of no more than this many items would result."
 msgstr ""
-"Si se necesita abrir un módulo dinámico y el nombre especificado no tiene un "
-"componente de directorio (es decir, no contiene un slash), el sistema "
-"buscará el archivo especificado en esta ruta."
+"El planner aplanará constructos JOIN explícitos en listas de ítems FROM "
+"siempre que la lista resultante no tenga más que esta cantidad de ítems."
 
-#: utils/misc/guc.c:2301
-msgid "Sets the location of the Kerberos server key file."
-msgstr "Ubicación del archivo de llave del servidor Kerberos."
+#: utils/misc/guc.c:1501
+msgid "Sets the threshold of FROM items beyond which GEQO is used."
+msgstr "Umbral de ítems en FROM a partir del cual se usará GEQO."
 
-#: utils/misc/guc.c:2311
-msgid "Sets the name of the Kerberos service."
-msgstr "Nombre del servicio Kerberos."
+#: utils/misc/guc.c:1510
+msgid "GEQO: effort is used to set the default for other GEQO parameters."
+msgstr ""
+"GEQO: effort se usa para determinar los valores por defecto para otros "
+"parámetros."
 
-#: utils/misc/guc.c:2320
-msgid "Sets the Bonjour service name."
-msgstr "Nombre del servicio Bonjour."
+#: utils/misc/guc.c:1519
+msgid "GEQO: number of individuals in the population."
+msgstr "GEQO: número de individuos en una población."
 
-#: utils/misc/guc.c:2331
-msgid "Shows the collation order locale."
-msgstr "Configuración regional de ordenamiento de cadenas (collation)."
+#: utils/misc/guc.c:1520 utils/misc/guc.c:1529
+msgid "Zero selects a suitable default value."
+msgstr "Cero selecciona un valor por omisión razonable."
 
-#: utils/misc/guc.c:2341
-msgid "Shows the character classification and case conversion locale."
-msgstr ""
-"Configuración regional de clasificación de caracteres y conversión de "
-"mayúsculas."
+#: utils/misc/guc.c:1528
+msgid "GEQO: number of iterations of the algorithm."
+msgstr "GEQO: número de iteraciones del algoritmo."
 
-#: utils/misc/guc.c:2351
-msgid "Sets the language in which messages are displayed."
-msgstr "Idioma en el que se despliegan los mensajes."
+#: utils/misc/guc.c:1539
+msgid "Sets the time to wait on a lock before checking for deadlock."
+msgstr "Define el tiempo a esperar un lock antes de buscar un deadlock."
 
-#: utils/misc/guc.c:2360
-msgid "Sets the locale for formatting monetary amounts."
-msgstr "Configuración regional para formatos de moneda."
+#: utils/misc/guc.c:1550
+msgid ""
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing archived WAL data."
+msgstr ""
+"Define el máximo retardo antes de cancelar consultas cuando un servidor hot "
+"standby está procesando datos de WAL archivado."
 
-#: utils/misc/guc.c:2369
-msgid "Sets the locale for formatting numbers."
-msgstr "Configuración regional para formatos de números."
+#: utils/misc/guc.c:1561
+msgid ""
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing streamed WAL data."
+msgstr ""
+"Define el máximo retardo antes de cancelar consultas cuando un servidor hot "
+"standby está procesando datos de WAL en flujo."
 
-#: utils/misc/guc.c:2378
-msgid "Sets the locale for formatting date and time values."
-msgstr "Configuración regional para formatos de horas y fechas."
+#: utils/misc/guc.c:1572
+msgid ""
+"Sets the maximum interval between WAL receiver status reports to the primary."
+msgstr ""
+"Define el intervalo máximo entre reportes de estado desde un proceso "
+"receptor de WAL hacia el primario."
 
-#: utils/misc/guc.c:2387
-msgid "Lists shared libraries to preload into server."
-msgstr "Bibliotecas compartidas a precargar en el servidor."
+#: utils/misc/guc.c:1583
+msgid "Sets the maximum number of concurrent connections."
+msgstr "Número máximo de conexiones concurrentes."
 
-#: utils/misc/guc.c:2397
-msgid "Lists shared libraries to preload into each backend."
-msgstr "Bibliotecas compartidas a precargar en cada proceso."
+#: utils/misc/guc.c:1593
+msgid "Sets the number of connection slots reserved for superusers."
+msgstr "Número de conexiones reservadas para superusuarios."
 
-#: utils/misc/guc.c:2407
-msgid "Sets the schema search order for names that are not schema-qualified."
-msgstr "Orden de búsqueda en schemas para nombres que no especifican schema."
+#: utils/misc/guc.c:1607
+msgid "Sets the number of shared memory buffers used by the server."
+msgstr "Número de búfers de memoria compartida usados por el servidor."
 
-#: utils/misc/guc.c:2418
-msgid "Sets the server (database) character set encoding."
-msgstr "Codificación de caracteres del servidor (bases de datos)."
+#: utils/misc/guc.c:1618
+msgid "Sets the maximum number of temporary buffers used by each session."
+msgstr "Número de búfers de memoria temporal usados por cada sesión."
 
-#: utils/misc/guc.c:2429
-msgid "Shows the server version."
-msgstr "Versión del servidor."
+#: utils/misc/guc.c:1629
+msgid "Sets the TCP port the server listens on."
+msgstr "Puerto TCP en el cual escuchará el servidor."
 
-#: utils/misc/guc.c:2440
-msgid "Sets the current role."
-msgstr "Define el rol actual."
+#: utils/misc/guc.c:1639
+msgid "Sets the access permissions of the Unix-domain socket."
+msgstr "Privilegios de acceso al socket Unix."
 
-#: utils/misc/guc.c:2451
-msgid "Sets the session user name."
-msgstr "Define el nombre del usuario de sesión."
+#: utils/misc/guc.c:1640
+msgid ""
+"Unix-domain sockets use the usual Unix file system permission set. The "
+"parameter value is expected to be a numeric mode specification in the form "
+"accepted by the chmod and umask system calls. (To use the customary octal "
+"format the number must start with a 0 (zero).)"
+msgstr ""
+"Los sockets de dominio Unix usan la funcionalidad de permisos de archivos "
+"estándar de Unix. Se espera que el valor de esta opción sea una "
+"especificación numérica de modo, en la forma aceptada por las llamadas a "
+"sistema chmod y umask. Para usar el modo octal acostumbrado, comience el "
+"número con un 0 (cero)."
 
-#: utils/misc/guc.c:2461
-msgid "Sets the destination for server log output."
-msgstr "Define el destino de la salida del registro del servidor."
+#: utils/misc/guc.c:1654
+msgid "Sets the file permissions for log files."
+msgstr "Define los privilegios para los archivos del registro del servidor."
 
-#: utils/misc/guc.c:2462
+#: utils/misc/guc.c:1655
 msgid ""
-"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
-"\"eventlog\", depending on the platform."
+"The parameter value is expected to be a numeric mode specification in the "
+"form accepted by the chmod and umask system calls. (To use the customary "
+"octal format the number must start with a 0 (zero).)"
 msgstr ""
-"Valores aceptables son combinaciones de «stderr», «syslog», «csvlog» y "
-"«eventlog», dependiendo de la plataforma."
+"Se espera que el valor de esta opción sea una especificación numérica de "
+"modo, en la forma aceptada por las llamadas a sistema chmod y umask. Para "
+"usar el modo octal acostumbrado, comience el número con un 0 (cero)."
 
-#: utils/misc/guc.c:2472
-msgid "Sets the destination directory for log files."
+#: utils/misc/guc.c:1668
+msgid "Sets the maximum memory to be used for query workspaces."
 msgstr ""
-"Define el directorio de destino de los archivos del registro del servidor."
+"Establece el límite de memoria que se usará para espacios de trabajo de "
+"consultas."
 
-#: utils/misc/guc.c:2473
-msgid "Can be specified as relative to the data directory or as absolute path."
+#: utils/misc/guc.c:1669
+msgid ""
+"This much memory can be used by each internal sort operation and hash table "
+"before switching to temporary disk files."
 msgstr ""
-"Puede ser una ruta relativa al directorio de datos o una ruta absoluta."
+"Esta es la cantidad máxima de memoria que se usará para operaciones internas "
+"de ordenamiento y tablas de hashing, antes de comenzar a usar archivos "
+"temporales en disco."
 
-#: utils/misc/guc.c:2482
-msgid "Sets the file name pattern for log files."
+#: utils/misc/guc.c:1681
+msgid "Sets the maximum memory to be used for maintenance operations."
 msgstr ""
-"Define el patrón para los nombres de archivo del registro del servidor."
+"Establece el límite de memoria que se usará para operaciones de mantención."
 
-#: utils/misc/guc.c:2493
-msgid "Sets the program name used to identify PostgreSQL messages in syslog."
-msgstr "Nombre de programa para identificar PostgreSQL en mensajes de syslog."
+#: utils/misc/guc.c:1682
+msgid "This includes operations such as VACUUM and CREATE INDEX."
+msgstr "Esto incluye operaciones como VACUUM y CREATE INDEX."
 
-#: utils/misc/guc.c:2504
-msgid "Sets the time zone for displaying and interpreting time stamps."
-msgstr "Huso horario para desplegar e interpretar valores de tiempo."
+#: utils/misc/guc.c:1697
+msgid "Sets the maximum stack depth, in kilobytes."
+msgstr "Establece el tamaño máximo del stack, en kilobytes."
 
-#: utils/misc/guc.c:2513
-msgid "Selects a file of time zone abbreviations."
-msgstr "Selecciona un archivo de abreviaciones de huso horario."
+#: utils/misc/guc.c:1708
+msgid "Vacuum cost for a page found in the buffer cache."
+msgstr "Costo de Vacuum de una página encontrada en el buffer."
 
-#: utils/misc/guc.c:2522
-msgid "Sets the current transaction's isolation level."
-msgstr "Define el nivel de aislación de la transacción en curso."
+#: utils/misc/guc.c:1718
+msgid "Vacuum cost for a page not found in the buffer cache."
+msgstr "Costo de Vacuum de una página no encontrada en el cache."
 
-#: utils/misc/guc.c:2532
-msgid "Sets the owning group of the Unix-domain socket."
-msgstr "Grupo dueño del socket de dominio Unix."
+#: utils/misc/guc.c:1728
+msgid "Vacuum cost for a page dirtied by vacuum."
+msgstr "Costo de Vacuum de una página ensuciada por vacuum."
+
+#: utils/misc/guc.c:1738
+msgid "Vacuum cost amount available before napping."
+msgstr "Costo de Vacuum disponible antes de descansar."
+
+#: utils/misc/guc.c:1748
+msgid "Vacuum cost delay in milliseconds."
+msgstr "Tiempo de descanso de vacuum en milisegundos."
+
+#: utils/misc/guc.c:1759
+msgid "Vacuum cost delay in milliseconds, for autovacuum."
+msgstr "Tiempo de descanso de vacuum en milisegundos, para autovacuum."
 
-#: utils/misc/guc.c:2533
+#: utils/misc/guc.c:1770
+msgid "Vacuum cost amount available before napping, for autovacuum."
+msgstr "Costo de Vacuum disponible antes de descansar, para autovacuum."
+
+#: utils/misc/guc.c:1780
 msgid ""
-"The owning user of the socket is always the user that starts the server."
-msgstr ""
-"El usuario dueño del socket siempre es el usuario que inicia el servidor."
+"Sets the maximum number of simultaneously open files for each server process."
+msgstr "Define la cantidad máxima de archivos abiertos por cada subproceso."
 
-#: utils/misc/guc.c:2542
-msgid "Sets the directory where the Unix-domain socket will be created."
-msgstr "Directorio donde ser creará el socket de dominio Unix."
+#: utils/misc/guc.c:1793
+msgid "Sets the maximum number of simultaneously prepared transactions."
+msgstr "Define la cantidad máxima de transacciones preparadas simultáneas."
 
-#: utils/misc/guc.c:2552
-msgid "Sets the host name or IP address(es) to listen to."
-msgstr "Define el nombre de anfitrión o dirección IP en la cual escuchar."
+#: utils/misc/guc.c:1826
+msgid "Sets the maximum allowed duration of any statement."
+msgstr "Define la duración máxima permitida de sentencias."
 
-#: utils/misc/guc.c:2562
-msgid "Sets the list of known custom variable classes."
-msgstr "Define la lista de clases adicionales de variables conocidas."
+#: utils/misc/guc.c:1827
+msgid "A value of 0 turns off the timeout."
+msgstr "Un valor de 0 desactiva el máximo."
 
-#: utils/misc/guc.c:2572
-msgid "Sets the server's data directory."
-msgstr "Define la ubicación del directorio de datos."
+#: utils/misc/guc.c:1837
+msgid "Minimum age at which VACUUM should freeze a table row."
+msgstr ""
+"Mínima edad a la cual VACUUM debería congelar (freeze) una fila de una tabla."
 
-#: utils/misc/guc.c:2582
-msgid "Sets the server's main configuration file."
+#: utils/misc/guc.c:1847
+msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
-"Define la ubicación del archivo principal de configuración del servidor."
+"Edad a la cual VACUUM debería recorrer una tabla completa para congelar "
+"(freeze) las filas."
 
-#: utils/misc/guc.c:2592
-msgid "Sets the server's \"hba\" configuration file."
-msgstr "Define la ubicación del archivo de configuración «hba» del servidor."
+#: utils/misc/guc.c:1857
+msgid ""
+"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
+"if any."
+msgstr ""
+"Número de transacciones por las cuales VACUUM y la limpieza HOT deberían "
+"postergarse."
 
-#: utils/misc/guc.c:2602
-msgid "Sets the server's \"ident\" configuration file."
-msgstr "Define la ubicación del archivo de configuración «ident» del servidor."
+#: utils/misc/guc.c:1870
+msgid "Sets the maximum number of locks per transaction."
+msgstr "Cantidad máxima de candados (locks) por transacción."
 
-#: utils/misc/guc.c:2612
-msgid "Writes the postmaster PID to the specified file."
-msgstr "Registra el PID de postmaster en el archivo especificado."
+#: utils/misc/guc.c:1871
+msgid ""
+"The shared lock table is sized on the assumption that at most "
+"max_locks_per_transaction * max_connections distinct objects will need to be "
+"locked at any one time."
+msgstr ""
+"El tamaño de la tabla compartida de candados se calcula usando la suposición "
+"de que a lo más max_locks_per_transaction * max_connections objetos "
+"necesitarán ser bloqueados simultáneamente."
 
-#: utils/misc/guc.c:2622
-msgid "Writes temporary statistics files to the specified directory."
+#: utils/misc/guc.c:1882
+msgid "Sets the maximum number of predicate locks per transaction."
+msgstr "Cantidad máxima de candados (locks) de predicado por transacción."
+
+#: utils/misc/guc.c:1883
+msgid ""
+"The shared predicate lock table is sized on the assumption that at most "
+"max_pred_locks_per_transaction * max_connections distinct objects will need "
+"to be locked at any one time."
 msgstr ""
-"Escribe los archivos temporales de estadísticas al directorio especificado."
+"El tamaño de la tabla compartida de candados se calcula usando la suposición "
+"de que a lo más max_pred_locks_per_transaction * max_connections objetos "
+"necesitarán ser bloqueados simultáneamente."
 
-#: utils/misc/guc.c:2632
-msgid "Sets default text search configuration."
-msgstr "Define la configuración de búsqueda en texto por omisión."
+#: utils/misc/guc.c:1894
+msgid "Sets the maximum allowed time to complete client authentication."
+msgstr "Define el tiempo máximo para completar proceso de autentificación."
 
-#: utils/misc/guc.c:2642
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Define la lista de cifrados SSL permitidos."
+#: utils/misc/guc.c:1906
+msgid "Waits N seconds on connection startup before authentication."
+msgstr ""
+"Espera N segundos al inicio de la conexión antes de la autentificación."
 
-#: utils/misc/guc.c:2653
-msgid "Sets the application name to be reported in statistics and logs."
-msgstr "Define el nombre de aplicación a reportarse en estadísticas y logs."
+#: utils/misc/guc.c:1917
+msgid "Sets the number of WAL files held for standby servers."
+msgstr "Número de archivos WAL conservados para servidores standby."
 
-#: utils/misc/guc.c:2672
-msgid "Sets whether \"\\'\" is allowed in string literals."
-msgstr "Define si «\\'» está permitido en literales de cadena."
+#: utils/misc/guc.c:1927
+msgid ""
+"Sets the maximum distance in log segments between automatic WAL checkpoints."
+msgstr ""
+"Define la distancia máxima, en cantidad de segmentos, entre puntos de "
+"control de WAL automáticos."
 
-#: utils/misc/guc.c:2681
-msgid "Sets the output format for bytea."
-msgstr "Formato de salida para bytea."
+#: utils/misc/guc.c:1937
+msgid "Sets the maximum time between automatic WAL checkpoints."
+msgstr "Define el tiempo máximo entre puntos de control de WAL automáticos."
 
-#: utils/misc/guc.c:2690
-msgid "Sets the message levels that are sent to the client."
-msgstr "Nivel de mensajes enviados al cliente."
+#: utils/misc/guc.c:1948
+msgid ""
+"Enables warnings if checkpoint segments are filled more frequently than this."
+msgstr "Registrar si el llenado de segmentos de WAL es más frecuente que esto."
 
-#: utils/misc/guc.c:2691 utils/misc/guc.c:2740 utils/misc/guc.c:2750
-#: utils/misc/guc.c:2790
+#: utils/misc/guc.c:1950
 msgid ""
-"Each level includes all the levels that follow it. The later the level, the "
-"fewer messages are sent."
+"Write a message to the server log if checkpoints caused by the filling of "
+"checkpoint segment files happens more frequently than this number of "
+"seconds. Zero turns off the warning."
 msgstr ""
-"Cada nivel incluye todos los niveles que lo siguen.  Mientras más posterior "
-"el nivel, menos mensajes se enviarán."
+"Envía un mensaje a los registros del servidor si los punto de control "
+"causados por el llenado de archivos de segmento sucede con más frecuencia "
+"que este número de segundos. Un valor de 0 (cero) desactiva la opción."
 
-#: utils/misc/guc.c:2700
-msgid "Enables the planner to use constraints to optimize queries."
-msgstr "Permitir el uso de restricciones para limitar los accesos a tablas."
+#: utils/misc/guc.c:1962
+msgid "Sets the number of disk-page buffers in shared memory for WAL."
+msgstr "Búfers en memoria compartida para páginas de WAL."
 
-#: utils/misc/guc.c:2701
-msgid ""
-"Table scans will be skipped if their constraints guarantee that no rows "
-"match the query."
+#: utils/misc/guc.c:1973
+msgid "WAL writer sleep time between WAL flushes."
 msgstr ""
-"Las tablas no serán recorridas si sus restricciones garantizan que ninguna "
-"fila coincidirá con la consulta."
-
-#: utils/misc/guc.c:2711
-msgid "Sets the transaction isolation level of each new transaction."
-msgstr "Nivel de aislación (isolation level) de transacciones nuevas."
+"Tiempo de descanso del escritor de WAL entre escrituras de WAL consecutivas."
 
-#: utils/misc/guc.c:2720
-msgid "Sets the display format for interval values."
-msgstr "Formato de salida para valores de intervalos."
+#: utils/misc/guc.c:1985
+msgid "Sets the maximum number of simultaneously running WAL sender processes."
+msgstr "Define la cantidad máxima de procesos «WAL sender» simultáneos."
 
-#: utils/misc/guc.c:2730
-msgid "Sets the verbosity of logged messages."
-msgstr "Verbosidad de los mensajes registrados."
+#: utils/misc/guc.c:1995
+msgid "WAL sender sleep time between WAL replications."
+msgstr ""
+"Tiempo de descanso de «WAL sender» entre replicaciones de WAL consecutivas."
 
-#: utils/misc/guc.c:2739
-msgid "Sets the message levels that are logged."
-msgstr "Nivel de mensajes registrados."
+#: utils/misc/guc.c:2006
+msgid "Sets the maximum time to wait for WAL replication."
+msgstr "Define el tiempo máximo a esperar la replicación de WAL."
 
-#: utils/misc/guc.c:2749
+#: utils/misc/guc.c:2017
 msgid ""
-"Causes all statements generating error at or above this level to be logged."
+"Sets the delay in microseconds between transaction commit and flushing WAL "
+"to disk."
 msgstr ""
-"Registrar sentencias que generan error de nivel superior o igual a éste."
+"Retardo en microsegundos entre completar una transacción y escribir WAL a "
+"disco."
 
-#: utils/misc/guc.c:2759
-msgid "Sets the type of statements logged."
-msgstr "Define el tipo de sentencias que se registran."
+#: utils/misc/guc.c:2028
+msgid ""
+"Sets the minimum concurrent open transactions before performing commit_delay."
+msgstr "Mínimo de transacciones concurrentes para esperar commit_delay."
 
-#: utils/misc/guc.c:2769
-msgid "Sets the syslog \"facility\" to be used when syslog enabled."
-msgstr "«Facility» de syslog que se usará cuando syslog esté habilitado."
+#: utils/misc/guc.c:2039
+msgid "Sets the number of digits displayed for floating-point values."
+msgstr "Ajustar el número de dígitos mostrados para valores de coma flotante."
 
-#: utils/misc/guc.c:2779
-msgid "Sets the session's behavior for triggers and rewrite rules."
+#: utils/misc/guc.c:2040
+msgid ""
+"This affects real, double precision, and geometric data types. The parameter "
+"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
+"appropriate)."
 msgstr ""
-"Define el comportamiento de la sesión con respecto a disparadores y reglas "
-"de reescritura."
+"Afecta los tipos real, double precision y geométricos. El valor del "
+"parámetro se agrega al número estándar de dígitos (FLT_DIG o DBL_DIG según "
+"corresponda)"
 
-#: utils/misc/guc.c:2789
-msgid "Enables logging of recovery-related debugging information."
-msgstr "Recolectar información de depuración relacionada con la recuperación."
+#: utils/misc/guc.c:2051
+msgid "Sets the minimum execution time above which statements will be logged."
+msgstr ""
+"Tiempo mínimo de ejecución a partir del cual se registran las consultas."
 
-#: utils/misc/guc.c:2803
-msgid "Collects function-level statistics on database activity."
-msgstr "Recolectar estadísticas de actividad de funciones en la base de datos."
+#: utils/misc/guc.c:2053
+msgid "Zero prints all queries. -1 turns this feature off."
+msgstr "Cero registra todas las consultas. -1 desactiva esta característica."
 
-#: utils/misc/guc.c:2812
-msgid "Set the level of information written to the WAL."
-msgstr "Nivel de información escrita a WAL."
+#: utils/misc/guc.c:2063
+msgid ""
+"Sets the minimum execution time above which autovacuum actions will be "
+"logged."
+msgstr ""
+"Tiempo mínimo de ejecución a partir del cual se registran las acciones de "
+"autovacuum."
 
-#: utils/misc/guc.c:2821
-msgid "Selects the method used for forcing WAL updates to disk."
-msgstr "Selecciona el método usado para forzar escritura de WAL a disco."
+#: utils/misc/guc.c:2065
+msgid "Zero prints all actions. -1 turns autovacuum logging off."
+msgstr ""
+"Cero registra todas las acciones. -1 desactiva el registro de autovacuum."
 
-#: utils/misc/guc.c:2831
-msgid "Sets how binary values are to be encoded in XML."
-msgstr "Define cómo se codificarán los valores binarios en XML."
+#: utils/misc/guc.c:2075
+msgid "Background writer sleep time between rounds."
+msgstr "Tiempo de descanso entre rondas del background writer"
 
-#: utils/misc/guc.c:2840
-msgid ""
-"Sets whether XML data in implicit parsing and serialization operations is to "
-"be considered as documents or content fragments."
+#: utils/misc/guc.c:2086
+msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr ""
-"Define si los datos XML implícitos en operaciones de análisis y "
-"serialización serán considerados documentos o fragmentos de contenido."
+"Número máximo de páginas LRU a escribir en cada ronda del background writer"
 
-#: utils/misc/guc.c:3612
-#, c-format
+#: utils/misc/guc.c:2102
 msgid ""
-"%s does not know where to find the server configuration file.\n"
-"You must specify the --config-file or -D invocation option or set the PGDATA "
-"environment variable.\n"
+"Number of simultaneous requests that can be handled efficiently by the disk "
+"subsystem."
 msgstr ""
-"%s no sabe dónde encontrar el archivo de configuración del servidor.\n"
-"Debe especificar la opción --config-file o -D o definir la variable de "
-"ambiente PGDATA.\n"
-
-#: utils/misc/guc.c:3631
-#, c-format
-msgid "%s cannot access the server configuration file \"%s\": %s\n"
-msgstr "%s no pudo examinar el archivo de configuración «%s»: %s\n"
+"Cantidad máxima de peticiones simultáneas que pueden ser manejadas "
+"eficientemente por el sistema de disco."
 
-#: utils/misc/guc.c:3651
-#, c-format
+#: utils/misc/guc.c:2103
 msgid ""
-"%s does not know where to find the database system data.\n"
-"This can be specified as \"data_directory\" in \"%s\", or by the -D "
-"invocation option, or by the PGDATA environment variable.\n"
+"For RAID arrays, this should be approximately the number of drive spindles "
+"in the array."
 msgstr ""
-"%s no sabe dónde encontrar los archivos de sistema de la base de datos.\n"
-"Esto puede especificarse como «data_directory» en «%s», o usando la opción -"
-"D, o a través de la variable de ambiente PGDATA.\n"
+"Para arrays RAID, esto debería ser aproximadamente la cantidad de discos en "
+"el array."
 
-#: utils/misc/guc.c:3682
-#, c-format
-msgid ""
-"%s does not know where to find the \"hba\" configuration file.\n"
-"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
-"option, or by the PGDATA environment variable.\n"
+#: utils/misc/guc.c:2116
+msgid "Automatic log file rotation will occur after N minutes."
 msgstr ""
-"%s no sabe dónde encontrar el archivo de configuración «hba».\n"
-"Esto puede especificarse como «hba_file» en «%s», o usando la opción -D, o a "
-"través de la variable de ambiente PGDATA.\n"
+"La rotación automática de archivos de log se efectuará después de N minutos."
 
-#: utils/misc/guc.c:3705
-#, c-format
-msgid ""
-"%s does not know where to find the \"ident\" configuration file.\n"
-"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
-"option, or by the PGDATA environment variable.\n"
+#: utils/misc/guc.c:2127
+msgid "Automatic log file rotation will occur after N kilobytes."
 msgstr ""
-"%s no sabe dónde encontrar el archivo de configuración «ident».\n"
-"Esto puede especificarse como «ident_file» en «%s», o usando la opción -D, o "
-"a través de la variable de ambiente PGDATA.\n"
+"La rotación automática de archivos de log se efectuará después de N "
+"kilobytes."
 
-#: utils/misc/guc.c:4310 utils/misc/guc.c:4474
-msgid "Value exceeds integer range."
-msgstr "El valor excede el rango para enteros."
+#: utils/misc/guc.c:2138
+msgid "Shows the maximum number of function arguments."
+msgstr "Muestra la cantidad máxima de argumentos de funciones."
 
-#: utils/misc/guc.c:4329
-msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
-msgstr "Unidades válidas para este parámetro son «kB», «MB» y «GB»."
+#: utils/misc/guc.c:2149
+msgid "Shows the maximum number of index keys."
+msgstr "Muestra la cantidad máxima de claves de índices."
 
-#: utils/misc/guc.c:4388
-msgid ""
-"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
-msgstr "Unidades válidas para este parámetro son «ms», «s», «min», «h» y «d»."
+#: utils/misc/guc.c:2160
+msgid "Shows the maximum identifier length."
+msgstr "Muestra el largo máximo de identificadores."
 
-#: utils/misc/guc.c:4697 utils/misc/guc.c:5361 utils/misc/guc.c:5411
-#: utils/misc/guc.c:6115 utils/misc/guc.c:6274 utils/misc/guc.c:7496
-#: guc-file.l:217
-#, c-format
-msgid "unrecognized configuration parameter \"%s\""
-msgstr "parámetro de configuración no reconocido: «%s»"
+#: utils/misc/guc.c:2171
+msgid "Shows the size of a disk block."
+msgstr "Muestra el tamaño de un bloque de disco."
 
-#: utils/misc/guc.c:4724
-#, c-format
-msgid "parameter \"%s\" cannot be changed"
-msgstr "no se puede cambiar el parámetro «%s»"
+#: utils/misc/guc.c:2182
+msgid "Shows the number of pages per disk file."
+msgstr "Muestra el número de páginas por archivo en disco."
 
-#: utils/misc/guc.c:4741 utils/misc/guc.c:4749 guc-file.l:264
-#, c-format
-msgid "parameter \"%s\" cannot be changed without restarting the server"
-msgstr "el parámetro «%s» no se puede cambiar sin reiniciar el servidor"
+#: utils/misc/guc.c:2193
+msgid "Shows the block size in the write ahead log."
+msgstr "Muestra el tamaño de bloque en el write-ahead log."
 
-#: utils/misc/guc.c:4759
-#, c-format
-msgid "parameter \"%s\" cannot be changed now"
-msgstr "el parámetro «%s» no se puede cambiar en este momento"
+#: utils/misc/guc.c:2204
+msgid "Shows the number of pages per write ahead log segment."
+msgstr "Muestra el número de páginas por cada segmento de write-ahead log."
 
-#: utils/misc/guc.c:4790
-#, c-format
-msgid "parameter \"%s\" cannot be set after connection start"
-msgstr "el parámetro «%s» no se puede cambiar después de efectuar la conexión"
+#: utils/misc/guc.c:2217
+msgid "Time to sleep between autovacuum runs."
+msgstr "Tiempo de descanso entre ejecuciones de autovacuum."
 
-#: utils/misc/guc.c:4800 utils/misc/guc.c:7511
-#, c-format
-msgid "permission denied to set parameter \"%s\""
-msgstr "se ha denegado el permiso para cambiar la opción «%s»"
+#: utils/misc/guc.c:2227
+msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgstr "Número mínimo de updates o deletes antes de ejecutar vacuum."
 
-#: utils/misc/guc.c:4838
-#, c-format
-msgid "cannot set parameter \"%s\" within security-definer function"
+#: utils/misc/guc.c:2236
+msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
+msgstr "Número mínimo de inserts, updates, deletes antes de ejecutar analyze."
+
+#: utils/misc/guc.c:2246
+msgid ""
+"Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
-"no se puede definir el parámetro «%s» dentro una función security-definer"
+"Edad a la cual aplicar VACUUM automáticamente a una tabla para prevenir "
+"problemas por reciclaje de ID de transacción."
 
-#: utils/misc/guc.c:4846 utils/init/miscinit.c:380
-#, c-format
-msgid "cannot set parameter \"%s\" within security-restricted operation"
+#: utils/misc/guc.c:2257
+msgid ""
+"Sets the maximum number of simultaneously running autovacuum worker "
+"processes."
+msgstr "Define la cantidad máxima de procesos «autovacuum worker» simultáneos."
+
+#: utils/misc/guc.c:2267
+msgid "Time between issuing TCP keepalives."
+msgstr "Tiempo entre cada emisión de TCP keepalive."
+
+#: utils/misc/guc.c:2268 utils/misc/guc.c:2279
+msgid "A value of 0 uses the system default."
+msgstr "Un valor 0 usa el valor por omisión del sistema."
+
+#: utils/misc/guc.c:2278
+msgid "Time between TCP keepalive retransmits."
+msgstr "Tiempo entre retransmisiones TCP keepalive."
+
+#: utils/misc/guc.c:2289
+msgid ""
+"Set the amount of traffic to send and receive before renegotiating the "
+"encryption keys."
 msgstr ""
-"no se puede definir el parámetro «%s» dentro de una operación restringida "
-"por seguridad"
+"Define la cantidad de tráfico a enviar y recibir antes de renegociar las "
+"llaves de cifrado."
 
-#: utils/misc/guc.c:4917 utils/misc/guc.c:4992
-#, c-format
-msgid "invalid value for parameter \"%s\": %d"
-msgstr "valor no válido para el parámetro «%s»: %d"
+#: utils/misc/guc.c:2300
+msgid "Maximum number of TCP keepalive retransmits."
+msgstr "Cantidad máxima de retransmisiones TCP keepalive."
 
-#: utils/misc/guc.c:4961 utils/misc/guc.c:5163 utils/misc/guc.c:5229
-#: utils/misc/guc.c:5255 guc-file.l:178
-#, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "valor no válido para el parámetro «%s»: «%s»"
+#: utils/misc/guc.c:2301
+msgid ""
+"This controls the number of consecutive keepalive retransmits that can be "
+"lost before a connection is considered dead. A value of 0 uses the system "
+"default."
+msgstr ""
+"Esto controla el número de retransmisiones consecutivas de keepalive que "
+"pueden ser perdidas antes que la conexión sea considerada muerta.  Un valor "
+"0 usa el valor por omisión del sistema."
 
-#: utils/misc/guc.c:4970
-#, c-format
-msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
-msgstr "%d está fuera del rango aceptable para el parámetro «%s» (%d .. %d)"
+#: utils/misc/guc.c:2312
+msgid "Sets the maximum allowed result for exact search by GIN."
+msgstr ""
+"Define el máximo de resultados permitidos por búsquedas exactas con GIN."
 
-#: utils/misc/guc.c:5034
-#, c-format
-msgid "parameter \"%s\" requires a numeric value"
-msgstr "parámetro «%s» requiere un valor numérico"
+#: utils/misc/guc.c:2323
+msgid "Sets the planner's assumption about the size of the disk cache."
+msgstr "Define la suposición del tamaño del cache de disco."
 
-#: utils/misc/guc.c:5042
-#, c-format
-msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
-msgstr "%g está fuera del rango aceptable para el parámetro «%s» (%g .. %g)"
+#: utils/misc/guc.c:2324
+msgid ""
+"That is, the portion of the kernel's disk cache that will be used for "
+"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
+"kB each."
+msgstr ""
+"Esto es, la porción del cache de disco que será usado para archivos de datos "
+"de PostgreSQL. Esto se mide en cantidad de páginas, que normalmente son de 8 "
+"kB cada una."
+
+#: utils/misc/guc.c:2337
+msgid "Shows the server version as an integer."
+msgstr "Muestra la versión del servidor como un número entero."
+
+#: utils/misc/guc.c:2348
+msgid "Log the use of temporary files larger than this number of kilobytes."
+msgstr ""
+"Registra el uso de archivos temporales que crezcan más allá de este número "
+"de kilobytes."
 
-#: utils/misc/guc.c:5064
-#, c-format
-msgid "invalid value for parameter \"%s\": %g"
-msgstr "valor no válido para el parámetro «%s»: %g"
+#: utils/misc/guc.c:2349
+msgid "Zero logs all files. The default is -1 (turning this feature off)."
+msgstr ""
+"Cero registra todos los archivos. El valor por omisión es -1 (lo cual "
+"desactiva el registro)."
 
-#: utils/misc/guc.c:5367 utils/misc/guc.c:5415 utils/misc/guc.c:6278
-#, c-format
-msgid "must be superuser to examine \"%s\""
-msgstr "debe ser superusuario para examinar «%s»"
+#: utils/misc/guc.c:2359
+msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
+msgstr "Tamaño reservado para pg_stat_activity.current_query, en bytes."
 
-#: utils/misc/guc.c:5526
-#, c-format
-msgid "SET %s takes only one argument"
-msgstr "SET %s lleva sólo un argumento"
+#: utils/misc/guc.c:2378
+msgid ""
+"Sets the planner's estimate of the cost of a sequentially fetched disk page."
+msgstr "Estimación del costo de una página leída secuencialmente."
 
-#: utils/misc/guc.c:5753
-msgid "SET requires parameter name"
-msgstr "SET requiere el nombre de un parámetro"
+#: utils/misc/guc.c:2388
+msgid ""
+"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
+"page."
+msgstr "Estimación del costo de una página leída no secuencialmente."
 
-#: utils/misc/guc.c:5868
-#, c-format
-msgid "attempt to redefine parameter \"%s\""
-msgstr "intento de cambiar la opción «%s»"
+#: utils/misc/guc.c:2398
+msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
+msgstr "Estimación del costo de procesar cada tupla (fila)."
 
-#: utils/misc/guc.c:7212
-#, c-format
-msgid "could not parse setting for parameter \"%s\""
-msgstr "no se pudo interpretar el valor de para el parámetro «%s»"
+#: utils/misc/guc.c:2408
+msgid ""
+"Sets the planner's estimate of the cost of processing each index entry "
+"during an index scan."
+msgstr ""
+"Estimación del costo de procesar cada fila de índice durante un recorrido de "
+"índice."
 
-#: utils/misc/guc.c:7555
-msgid "invalid list syntax for parameter \"log_destination\""
-msgstr "la sintaxis de lista no es válida para el parámetro «log_destination»"
+#: utils/misc/guc.c:2418
+msgid ""
+"Sets the planner's estimate of the cost of processing each operator or "
+"function call."
+msgstr "Estimación del costo de procesar cada operador o llamada a función."
 
-#: utils/misc/guc.c:7579
-#, c-format
-msgid "unrecognized \"log_destination\" key word: \"%s\""
-msgstr "palabra clave de «log_destination» no reconocida: «%s»"
+#: utils/misc/guc.c:2429
+msgid ""
+"Sets the planner's estimate of the fraction of a cursor's rows that will be "
+"retrieved."
+msgstr "Estimación de la fracción de filas de un cursor que serán extraídas."
 
-#: utils/misc/guc.c:7654
-msgid "SET AUTOCOMMIT TO OFF is no longer supported"
-msgstr "SET AUTOCOMMIT TO OFF ya no está soportado"
+#: utils/misc/guc.c:2440
+msgid "GEQO: selective pressure within the population."
+msgstr "GEQO: presión selectiva dentro de la población."
 
-#: utils/misc/guc.c:7726
-msgid "assertion checking is not supported by this build"
-msgstr ""
-"la revisión de aseveraciones (asserts) no está soportada en este servidor"
+#: utils/misc/guc.c:2450
+msgid "GEQO: seed for random path selection."
+msgstr "GEQO: semilla para la selección aleatoria de caminos."
 
-#: utils/misc/guc.c:7741
-msgid "Bonjour is not supported by this build"
-msgstr "Bonjour no está soportado en este servidor"
+#: utils/misc/guc.c:2460
+msgid "Multiple of the average buffer usage to free per round."
+msgstr "Múltiplo del uso promedio de búfers que liberar en cada ronda."
 
-#: utils/misc/guc.c:7756
-msgid "SSL is not supported by this build"
-msgstr "SSL no está soportado en este servidor"
+#: utils/misc/guc.c:2470
+msgid "Sets the seed for random-number generation."
+msgstr "Semilla para la generación de números aleatorios."
 
-#: utils/misc/guc.c:7770
-msgid "cannot enable parameter when \"log_statement_stats\" is true"
+#: utils/misc/guc.c:2481
+msgid ""
+"Number of tuple updates or deletes prior to vacuum as a fraction of "
+"reltuples."
 msgstr ""
-"no se puede activar el parámetro cuando «log_statement_stats» es verdadero"
+"Número de updates o deletes de tuplas antes de ejecutar un vacuum, como "
+"fracción de reltuples."
 
-#: utils/misc/guc.c:7786
+#: utils/misc/guc.c:2490
 msgid ""
-"cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
-"\"log_planner_stats\", or \"log_executor_stats\" is true"
+"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
+"of reltuples."
 msgstr ""
-"no se puede activar «log_statement_stats» cuando "
-"«log_parser_stats»,«log_planner_stats» o «log_executor_stats» están activos."
+"Número de inserts, updates o deletes de tuplas antes de ejecutar un analyze, "
+"como fracción de reltuples."
 
-#: utils/misc/guc.c:7804
-msgid "cannot set transaction read-write mode inside a read-only transaction"
+#: utils/misc/guc.c:2500
+msgid ""
+"Time spent flushing dirty buffers during checkpoint, as fraction of "
+"checkpoint interval."
 msgstr ""
-"no se puede poner en modo de escritura dentro de una transacción de sólo "
-"lectura"
+"Tiempo utilizado en escribir páginas «sucias» durante los puntos de control, "
+"medido como fracción del intervalo del punto de control."
 
-#: utils/misc/guc.c:7815
-msgid "cannot set transaction read-write mode during recovery"
-msgstr "no se puede poner en modo de escritura durante la recuperación"
+#: utils/misc/guc.c:2519
+msgid "Sets the shell command that will be called to archive a WAL file."
+msgstr "Orden de shell que se invocará para archivar un archivo WAL."
 
-#: utils/misc/help_config.c:131
-msgid "internal error: unrecognized run-time parameter type\n"
-msgstr "error interno: tipo parámetro no reconocido\n"
+#: utils/misc/guc.c:2529
+msgid "Sets the client's character set encoding."
+msgstr "Codificación del juego de caracteres del cliente."
 
-#: guc-file.l:288
-#, c-format
-msgid "parameter \"%s\" removed from configuration file, reset to default"
+#: utils/misc/guc.c:2540
+msgid "Controls information prefixed to each log line."
+msgstr "Controla el prefijo que antecede cada línea registrada."
+
+#: utils/misc/guc.c:2541
+msgid "If blank, no prefix is used."
+msgstr "si está en blanco, no se usa prefijo."
+
+#: utils/misc/guc.c:2550
+msgid "Sets the time zone to use in log messages."
+msgstr "Define el huso horario usando en los mensajes registrados."
+
+#: utils/misc/guc.c:2560
+msgid "Sets the display format for date and time values."
+msgstr "Formato de salida para valores de horas y fechas."
+
+#: utils/misc/guc.c:2561
+msgid "Also controls interpretation of ambiguous date inputs."
+msgstr "También controla la interpretación de entradas ambiguas de fechas"
+
+#: utils/misc/guc.c:2572
+msgid "Sets the default tablespace to create tables and indexes in."
+msgstr "Define el tablespace en el cual crear tablas e índices."
+
+#: utils/misc/guc.c:2573
+msgid "An empty string selects the database's default tablespace."
 msgstr ""
-"parámetro «%s» eliminado del archivo de configuración, volviendo al valor "
-"por omisión"
+"Una cadena vacía especifica el tablespace por omisión de la base de datos."
 
-#: guc-file.l:344
-#, c-format
-msgid "parameter \"%s\" changed to \"%s\""
-msgstr "el parámetro «%s» fue cambiado a «%s»"
+#: utils/misc/guc.c:2583
+msgid "Sets the tablespace(s) to use for temporary tables and sort files."
+msgstr ""
+"Define el/los tablespace/s en el cual crear tablas temporales y archivos de "
+"ordenamiento."
 
-#: guc-file.l:412
-#, c-format
+#: utils/misc/guc.c:2594
+msgid "Sets the path for dynamically loadable modules."
+msgstr "Ruta para módulos dinámicos."
+
+#: utils/misc/guc.c:2595
 msgid ""
-"could not open configuration file \"%s\": maximum nesting depth exceeded"
+"If a dynamically loadable module needs to be opened and the specified name "
+"does not have a directory component (i.e., the name does not contain a "
+"slash), the system will search this path for the specified file."
 msgstr ""
-"no se pudo abrir el archivo de configuración «%s»: nivel de anidamiento "
-"máximo excedido"
+"Si se necesita abrir un módulo dinámico y el nombre especificado no tiene un "
+"componente de directorio (es decir, no contiene un slash), el sistema "
+"buscará el archivo especificado en esta ruta."
 
-#: guc-file.l:575
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "error de sintaxis en el archivo «%s» línea %u, cerca del fin de línea"
+#: utils/misc/guc.c:2608
+msgid "Sets the location of the Kerberos server key file."
+msgstr "Ubicación del archivo de llave del servidor Kerberos."
 
-#: guc-file.l:580
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near token \"%s\""
-msgstr ""
-"error de sintaxis en el archivo «%s» línea %u, cerca de la palabra «%s»"
+#: utils/misc/guc.c:2619
+msgid "Sets the name of the Kerberos service."
+msgstr "Nombre del servicio Kerberos."
 
-#: utils/error/assert.c:37
-msgid "TRAP: ExceptionalCondition: bad arguments\n"
-msgstr "TRAP: ExceptionalConditions: argumentos erróneos\n"
+#: utils/misc/guc.c:2629
+msgid "Sets the Bonjour service name."
+msgstr "Nombre del servicio Bonjour."
 
-#: utils/error/assert.c:40
-#, c-format
-msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP: %s(«%s», Archivo: «%s», Línea: %d)\n"
+#: utils/misc/guc.c:2641
+msgid "Shows the collation order locale."
+msgstr "Configuración regional de ordenamiento de cadenas (collation)."
 
-#: utils/error/elog.c:1413
-#, c-format
-msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "no se pudo reabrir «%s» para error estándar: %m"
+#: utils/misc/guc.c:2652
+msgid "Shows the character classification and case conversion locale."
+msgstr ""
+"Configuración regional de clasificación de caracteres y conversión de "
+"mayúsculas."
 
-#: utils/error/elog.c:1426
-#, c-format
-msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "no se pudo reabrir «%s» para usar como salida estándar: %m"
+#: utils/misc/guc.c:2663
+msgid "Sets the language in which messages are displayed."
+msgstr "Idioma en el que se despliegan los mensajes."
 
-#: utils/error/elog.c:1811 utils/error/elog.c:1821 utils/error/elog.c:1831
-msgid "[unknown]"
-msgstr "[desconocido]"
+#: utils/misc/guc.c:2673
+msgid "Sets the locale for formatting monetary amounts."
+msgstr "Configuración regional para formatos de moneda."
 
-#: utils/error/elog.c:2179 utils/error/elog.c:2459 utils/error/elog.c:2537
-msgid "missing error text"
-msgstr "falta un texto de mensaje de error"
+#: utils/misc/guc.c:2683
+msgid "Sets the locale for formatting numbers."
+msgstr "Configuración regional para formatos de números."
 
-#: utils/error/elog.c:2182 utils/error/elog.c:2185 utils/error/elog.c:2540
-#: utils/error/elog.c:2543
-#, c-format
-msgid " at character %d"
-msgstr " en carácter %d"
+#: utils/misc/guc.c:2693
+msgid "Sets the locale for formatting date and time values."
+msgstr "Configuración regional para formatos de horas y fechas."
 
-#: utils/error/elog.c:2195 utils/error/elog.c:2202
-msgid "DETAIL:  "
-msgstr "DETALLE:  "
+#: utils/misc/guc.c:2703
+msgid "Lists shared libraries to preload into server."
+msgstr "Bibliotecas compartidas a precargar en el servidor."
 
-#: utils/error/elog.c:2209
-msgid "HINT:  "
-msgstr "HINT:  "
+#: utils/misc/guc.c:2714
+msgid "Lists shared libraries to preload into each backend."
+msgstr "Bibliotecas compartidas a precargar en cada proceso."
 
-#: utils/error/elog.c:2216
-msgid "QUERY:  "
-msgstr "CONSULTA:  "
+#: utils/misc/guc.c:2725
+msgid "Sets the schema search order for names that are not schema-qualified."
+msgstr "Orden de búsqueda en schemas para nombres que no especifican schema."
 
-#: utils/error/elog.c:2223
-msgid "CONTEXT:  "
-msgstr "CONTEXTO:  "
+#: utils/misc/guc.c:2737
+msgid "Sets the server (database) character set encoding."
+msgstr "Codificación de caracteres del servidor (bases de datos)."
 
-#: utils/error/elog.c:2233
-#, c-format
-msgid "LOCATION:  %s, %s:%d\n"
-msgstr "UBICACIÓN:  %s, %s:%d\n"
+#: utils/misc/guc.c:2749
+msgid "Shows the server version."
+msgstr "Versión del servidor."
 
-#: utils/error/elog.c:2240
-#, c-format
-msgid "LOCATION:  %s:%d\n"
-msgstr "UBICACIÓN:  %s:%d\n"
+#: utils/misc/guc.c:2761
+msgid "Sets the current role."
+msgstr "Define el rol actual."
 
-#: utils/error/elog.c:2254
-msgid "STATEMENT:  "
-msgstr "SENTENCIA:  "
+#: utils/misc/guc.c:2773
+msgid "Sets the session user name."
+msgstr "Define el nombre del usuario de sesión."
 
-#. translator: This string will be truncated at 47
-#. characters expanded.
-#: utils/error/elog.c:2652
-#, c-format
-msgid "operating system error %d"
-msgstr "error %d de sistema operativo"
+#: utils/misc/guc.c:2784
+msgid "Sets the destination for server log output."
+msgstr "Define el destino de la salida del registro del servidor."
 
-#: utils/error/elog.c:2675
-msgid "DEBUG"
-msgstr "DEBUG"
+#: utils/misc/guc.c:2785
+msgid ""
+"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
+"\"eventlog\", depending on the platform."
+msgstr ""
+"Valores aceptables son combinaciones de «stderr», «syslog», «csvlog» y "
+"«eventlog», dependiendo de la plataforma."
 
-#: utils/error/elog.c:2679
-msgid "LOG"
-msgstr "LOG"
+#: utils/misc/guc.c:2796
+msgid "Sets the destination directory for log files."
+msgstr ""
+"Define el directorio de destino de los archivos del registro del servidor."
 
-#: utils/error/elog.c:2682
-msgid "INFO"
-msgstr "INFO"
+#: utils/misc/guc.c:2797
+msgid "Can be specified as relative to the data directory or as absolute path."
+msgstr ""
+"Puede ser una ruta relativa al directorio de datos o una ruta absoluta."
 
-#: utils/error/elog.c:2685
-msgid "NOTICE"
-msgstr "NOTICE"
+#: utils/misc/guc.c:2807
+msgid "Sets the file name pattern for log files."
+msgstr ""
+"Define el patrón para los nombres de archivo del registro del servidor."
 
-#: utils/error/elog.c:2688
-msgid "WARNING"
-msgstr "WARNING"
+#: utils/misc/guc.c:2818
+msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+msgstr "Nombre de programa para identificar PostgreSQL en mensajes de syslog."
+
+#: utils/misc/guc.c:2829
+msgid "Sets the time zone for displaying and interpreting time stamps."
+msgstr "Huso horario para desplegar e interpretar valores de tiempo."
+
+#: utils/misc/guc.c:2839
+msgid "Selects a file of time zone abbreviations."
+msgstr "Selecciona un archivo de abreviaciones de huso horario."
 
-#: utils/error/elog.c:2691
-msgid "ERROR"
-msgstr "ERROR"
+#: utils/misc/guc.c:2849
+msgid "Sets the current transaction's isolation level."
+msgstr "Define el nivel de aislación de la transacción en curso."
 
-#: utils/error/elog.c:2694
-msgid "FATAL"
-msgstr "FATAL"
+#: utils/misc/guc.c:2860
+msgid "Sets the owning group of the Unix-domain socket."
+msgstr "Grupo dueño del socket de dominio Unix."
 
-#: utils/error/elog.c:2697
-msgid "PANIC"
-msgstr "PANIC"
+#: utils/misc/guc.c:2861
+msgid ""
+"The owning user of the socket is always the user that starts the server."
+msgstr ""
+"El usuario dueño del socket siempre es el usuario que inicia el servidor."
 
-#: utils/fmgr/dfmgr.c:125
-#, c-format
-msgid "could not find function \"%s\" in file \"%s\""
-msgstr "no se encuentra la función «%s» en el archivo «%s»"
+#: utils/misc/guc.c:2871
+msgid "Sets the directory where the Unix-domain socket will be created."
+msgstr "Directorio donde ser creará el socket de dominio Unix."
 
-#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
-#, c-format
-msgid "could not access file \"%s\": %m"
-msgstr "no se pudo acceder al archivo «%s»: %m"
+#: utils/misc/guc.c:2882
+msgid "Sets the host name or IP address(es) to listen to."
+msgstr "Define el nombre de anfitrión o dirección IP en la cual escuchar."
 
-#: utils/fmgr/dfmgr.c:242
-#, c-format
-msgid "could not load library \"%s\": %s"
-msgstr "no se pudo cargar la biblioteca «%s»: %s"
+#: utils/misc/guc.c:2893
+msgid "Sets the list of known custom variable classes."
+msgstr "Define la lista de clases adicionales de variables conocidas."
 
-#: utils/fmgr/dfmgr.c:274
-#, c-format
-msgid "incompatible library \"%s\": missing magic block"
-msgstr "biblioteca «%s» incompatible: no se encuentra el bloque mágico"
+#: utils/misc/guc.c:2904
+msgid "Sets the server's data directory."
+msgstr "Define la ubicación del directorio de datos."
 
-#: utils/fmgr/dfmgr.c:276
-msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
+#: utils/misc/guc.c:2915
+msgid "Sets the server's main configuration file."
 msgstr ""
-"Se requiere que las bibliotecas de extensión usen la macro PG_MODULE_MAGIC."
+"Define la ubicación del archivo principal de configuración del servidor."
 
-#: utils/fmgr/dfmgr.c:312
-#, c-format
-msgid "incompatible library \"%s\": version mismatch"
-msgstr "biblioteca «%s» incompatible: versión no coincide"
+#: utils/misc/guc.c:2926
+msgid "Sets the server's \"hba\" configuration file."
+msgstr "Define la ubicación del archivo de configuración «hba» del servidor."
 
-#: utils/fmgr/dfmgr.c:314
-#, c-format
-msgid "Server is version %d.%d, library is version %d.%d."
-msgstr "Servidor tiene versión %d.%d, biblioteca es versión %d.%d."
+#: utils/misc/guc.c:2937
+msgid "Sets the server's \"ident\" configuration file."
+msgstr "Define la ubicación del archivo de configuración «ident» del servidor."
 
-#: utils/fmgr/dfmgr.c:333
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "El servidor tiene FUNC_MAX_ARGS = %d, la librería tiene %d"
+#: utils/misc/guc.c:2948
+msgid "Writes the postmaster PID to the specified file."
+msgstr "Registra el PID de postmaster en el archivo especificado."
 
-#: utils/fmgr/dfmgr.c:342
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "El servidor tiene INDEX_MAX_KEYS = %d, la librería tiene %d"
+#: utils/misc/guc.c:2959
+msgid "Writes temporary statistics files to the specified directory."
+msgstr ""
+"Escribe los archivos temporales de estadísticas al directorio especificado."
 
-#: utils/fmgr/dfmgr.c:351
-#, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "El servidor tiene NAMEDATALEN = %d, la librería tiene %d"
+#: utils/misc/guc.c:2970
+msgid "List of names of potential synchronous standbys."
+msgstr "Lista de nombres de potenciales standbys sincrónicos."
 
-#: utils/fmgr/dfmgr.c:360
-#, c-format
-msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
-msgstr "El servidor tiene FLOAT4PASSBYVAL = %s, la librería tiene %s"
+#: utils/misc/guc.c:2981
+msgid "Sets default text search configuration."
+msgstr "Define la configuración de búsqueda en texto por omisión."
 
-#: utils/fmgr/dfmgr.c:369
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "El servidor tiene FLOAT8PASSBYVAL = %s, la librería tiene %s"
+#: utils/misc/guc.c:2991
+msgid "Sets the list of allowed SSL ciphers."
+msgstr "Define la lista de cifrados SSL permitidos."
 
-#: utils/fmgr/dfmgr.c:376
-msgid "Magic block has unexpected length or padding difference."
-msgstr ""
-"El bloque mágico tiene un largo inesperado, o una diferencia de relleno."
+#: utils/misc/guc.c:3006
+msgid "Sets the application name to be reported in statistics and logs."
+msgstr "Define el nombre de aplicación a reportarse en estadísticas y logs."
 
-#: utils/fmgr/dfmgr.c:379
-#, c-format
-msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "biblioteca «%s» incompatible: bloque mágico no coincide"
+#: utils/misc/guc.c:3026
+msgid "Sets whether \"\\'\" is allowed in string literals."
+msgstr "Define si «\\'» está permitido en literales de cadena."
 
-#: utils/fmgr/dfmgr.c:545
-#, c-format
-msgid "access to library \"%s\" is not allowed"
-msgstr "no está permitido el acceso a la biblioteca «%s»"
+#: utils/misc/guc.c:3036
+msgid "Sets the output format for bytea."
+msgstr "Formato de salida para bytea."
 
-#: utils/fmgr/dfmgr.c:572
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "el nombre de macro no es válido en la ruta a biblioteca dinámica: %s"
+#: utils/misc/guc.c:3046
+msgid "Sets the message levels that are sent to the client."
+msgstr "Nivel de mensajes enviados al cliente."
 
-#: utils/fmgr/dfmgr.c:617
-msgid "zero-length component in parameter \"dynamic_library_path\""
+#: utils/misc/guc.c:3047 utils/misc/guc.c:3100 utils/misc/guc.c:3111
+#: utils/misc/guc.c:3167
+msgid ""
+"Each level includes all the levels that follow it. The later the level, the "
+"fewer messages are sent."
 msgstr ""
-"se encontró componente de largo cero en el parámetro «dynamic_library_path»"
+"Cada nivel incluye todos los niveles que lo siguen.  Mientras más posterior "
+"el nivel, menos mensajes se enviarán."
 
-#: utils/fmgr/dfmgr.c:636
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+#: utils/misc/guc.c:3057
+msgid "Enables the planner to use constraints to optimize queries."
+msgstr "Permitir el uso de restricciones para limitar los accesos a tablas."
+
+#: utils/misc/guc.c:3058
+msgid ""
+"Table scans will be skipped if their constraints guarantee that no rows "
+"match the query."
 msgstr ""
-"un componente en el parámetro «dynamic_library_path» no es una ruta absoluta"
+"Las tablas no serán recorridas si sus restricciones garantizan que ninguna "
+"fila coincidirá con la consulta."
 
-#: utils/fmgr/fmgr.c:264
-#, c-format
-msgid "internal function \"%s\" is not in internal lookup table"
-msgstr "la función interna «%s» no está en la tabla interna de búsqueda"
+#: utils/misc/guc.c:3068
+msgid "Sets the transaction isolation level of each new transaction."
+msgstr "Nivel de aislación (isolation level) de transacciones nuevas."
 
-#: utils/fmgr/fmgr.c:468
-#, c-format
-msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "la versión de API %d no reconocida fue reportada por la función «%s»"
+#: utils/misc/guc.c:3078
+msgid "Sets the display format for interval values."
+msgstr "Formato de salida para valores de intervalos."
 
-#: utils/fmgr/fmgr.c:839 utils/fmgr/fmgr.c:2071
-#, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr "la función %u tiene demasiados argumentos (%d, el máximo es %d)"
+#: utils/misc/guc.c:3089
+msgid "Sets the verbosity of logged messages."
+msgstr "Verbosidad de los mensajes registrados."
 
-#: utils/fmgr/funcapi.c:354
-#, c-format
+#: utils/misc/guc.c:3099
+msgid "Sets the message levels that are logged."
+msgstr "Nivel de mensajes registrados."
+
+#: utils/misc/guc.c:3110
 msgid ""
-"could not determine actual result type for function \"%s\" declared to "
-"return type %s"
+"Causes all statements generating error at or above this level to be logged."
 msgstr ""
-"no se pudo determinar el tipo verdadero de resultado para la función «%s»  "
-"declarada retornando tipo %s"
+"Registrar sentencias que generan error de nivel superior o igual a éste."
 
-#: utils/fmgr/funcapi.c:1187 utils/fmgr/funcapi.c:1218
-msgid "number of aliases does not match number of columns"
-msgstr "el número de aliases no calza con el número de columnas"
+#: utils/misc/guc.c:3121
+msgid "Sets the type of statements logged."
+msgstr "Define el tipo de sentencias que se registran."
 
-#: utils/fmgr/funcapi.c:1212
-msgid "no column alias was provided"
-msgstr "no se entregó alias de columna"
+#: utils/misc/guc.c:3131
+msgid "Sets the syslog \"facility\" to be used when syslog enabled."
+msgstr "«Facility» de syslog que se usará cuando syslog esté habilitado."
 
-#: utils/fmgr/funcapi.c:1236
-msgid "could not determine row description for function returning record"
+#: utils/misc/guc.c:3146
+msgid "Sets the session's behavior for triggers and rewrite rules."
 msgstr ""
-"no se pudo encontrar descripción de registro de función que retorna record"
+"Define el comportamiento de la sesión con respecto a disparadores y reglas "
+"de reescritura."
 
-#: utils/init/miscinit.c:114
-#, c-format
-msgid "could not change directory to \"%s\": %m"
-msgstr "no se pudo cambiar al directorio «%s»: %m"
+#: utils/misc/guc.c:3156
+msgid "Sets the current transaction's synchronization level."
+msgstr "Define el nivel de sincronización de la transacción en curso."
 
-#: utils/init/miscinit.c:441
-#, c-format
-msgid "role \"%s\" is not permitted to log in"
-msgstr "al rol «%s» no se le permite conectarse"
+#: utils/misc/guc.c:3166
+msgid "Enables logging of recovery-related debugging information."
+msgstr "Recolectar información de depuración relacionada con la recuperación."
 
-#: utils/init/miscinit.c:459
-#, c-format
-msgid "too many connections for role \"%s\""
-msgstr "demasiadas conexiones para el rol «%s»"
+#: utils/misc/guc.c:3182
+msgid "Collects function-level statistics on database activity."
+msgstr "Recolectar estadísticas de actividad de funciones en la base de datos."
 
-#: utils/init/miscinit.c:519
-msgid "permission denied to set session authorization"
-msgstr "se ha denegado el permiso para cambiar el usuario actual"
+#: utils/misc/guc.c:3192
+msgid "Set the level of information written to the WAL."
+msgstr "Nivel de información escrita a WAL."
 
-#: utils/init/miscinit.c:599
-#, c-format
-msgid "invalid role OID: %u"
-msgstr "el OID de rol no es válido: %u"
+#: utils/misc/guc.c:3202
+msgid "Selects the method used for forcing WAL updates to disk."
+msgstr "Selecciona el método usado para forzar escritura de WAL a disco."
 
-#: utils/init/miscinit.c:731
-#, c-format
-msgid "could not create lock file \"%s\": %m"
-msgstr "no se pudo crear el archivo de bloqueo «%s»: %m"
+#: utils/misc/guc.c:3212
+msgid "Sets how binary values are to be encoded in XML."
+msgstr "Define cómo se codificarán los valores binarios en XML."
+
+#: utils/misc/guc.c:3222
+msgid ""
+"Sets whether XML data in implicit parsing and serialization operations is to "
+"be considered as documents or content fragments."
+msgstr ""
+"Define si los datos XML implícitos en operaciones de análisis y "
+"serialización serán considerados documentos o fragmentos de contenido."
 
-#: utils/init/miscinit.c:745
+#: utils/misc/guc.c:4064
 #, c-format
-msgid "could not open lock file \"%s\": %m"
-msgstr "no se pudo abrir el archivo de bloqueo «%s»: %m"
+msgid ""
+"%s does not know where to find the server configuration file.\n"
+"You must specify the --config-file or -D invocation option or set the PGDATA "
+"environment variable.\n"
+msgstr ""
+"%s no sabe dónde encontrar el archivo de configuración del servidor.\n"
+"Debe especificar la opción --config-file o -D o definir la variable de "
+"ambiente PGDATA.\n"
 
-#: utils/init/miscinit.c:751
+#: utils/misc/guc.c:4083
 #, c-format
-msgid "could not read lock file \"%s\": %m"
-msgstr "no se pudo leer el archivo de bloqueo «%s»: %m"
+msgid "%s cannot access the server configuration file \"%s\": %s\n"
+msgstr "%s no pudo examinar el archivo de configuración «%s»: %s\n"
 
-#: utils/init/miscinit.c:799
+#: utils/misc/guc.c:4103
 #, c-format
-msgid "lock file \"%s\" already exists"
-msgstr "el archivo de bloqueo «%s» ya existe"
+msgid ""
+"%s does not know where to find the database system data.\n"
+"This can be specified as \"data_directory\" in \"%s\", or by the -D "
+"invocation option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s no sabe dónde encontrar los archivos de sistema de la base de datos.\n"
+"Esto puede especificarse como «data_directory» en «%s», o usando la opción -"
+"D, o a través de la variable de ambiente PGDATA.\n"
 
-#: utils/init/miscinit.c:803
+#: utils/misc/guc.c:4134
 #, c-format
-msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
-msgstr "¿Hay otro postgres (PID %d) corriendo en el directorio de datos «%s»?"
+msgid ""
+"%s does not know where to find the \"hba\" configuration file.\n"
+"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s no sabe dónde encontrar el archivo de configuración «hba».\n"
+"Esto puede especificarse como «hba_file» en «%s», o usando la opción -D, o a "
+"través de la variable de ambiente PGDATA.\n"
 
-#: utils/init/miscinit.c:805
+#: utils/misc/guc.c:4157
 #, c-format
-msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgid ""
+"%s does not know where to find the \"ident\" configuration file.\n"
+"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
 msgstr ""
-"¿Hay otro postmaster (PID %d) corriendo en el directorio de datos «%s»?"
+"%s no sabe dónde encontrar el archivo de configuración «ident».\n"
+"Esto puede especificarse como «ident_file» en «%s», o usando la opción -D, o "
+"a través de la variable de ambiente PGDATA.\n"
+
+#: utils/misc/guc.c:4737 utils/misc/guc.c:4901
+msgid "Value exceeds integer range."
+msgstr "El valor excede el rango para enteros."
+
+#: utils/misc/guc.c:4756
+msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
+msgstr "Unidades válidas para este parámetro son «kB», «MB» y «GB»."
+
+#: utils/misc/guc.c:4815
+msgid ""
+"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
+msgstr "Unidades válidas para este parámetro son «ms», «s», «min», «h» y «d»."
+
+#: utils/misc/guc.c:5098 utils/misc/guc.c:5867 utils/misc/guc.c:5919
+#: utils/misc/guc.c:6592 utils/misc/guc.c:6751 utils/misc/guc.c:7912
+#: guc-file.l:203
+#, c-format
+msgid "unrecognized configuration parameter \"%s\""
+msgstr "parámetro de configuración no reconocido: «%s»"
 
-#: utils/init/miscinit.c:808
+#: utils/misc/guc.c:5131
 #, c-format
-msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr "¿Hay otro postgres (PID %d) usando el socket «%s»?"
+msgid "parameter \"%s\" cannot be changed"
+msgstr "no se puede cambiar el parámetro «%s»"
 
-#: utils/init/miscinit.c:810
+#: utils/misc/guc.c:5160 utils/misc/guc.c:5334 utils/misc/guc.c:5431
+#: utils/misc/guc.c:5525 utils/misc/guc.c:5639 utils/misc/guc.c:5740
+#: guc-file.l:250
 #, c-format
-msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr "¿Hay otro postmaster (PID %d) usando el socket «%s»?"
+msgid "parameter \"%s\" cannot be changed without restarting the server"
+msgstr "el parámetro «%s» no se puede cambiar sin reiniciar el servidor"
 
-#: utils/init/miscinit.c:841
+#: utils/misc/guc.c:5170
 #, c-format
-msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
-msgstr ""
-"el bloque de memoria compartida preexistente (clave %lu, ID %lu) aún está en "
-"uso"
+msgid "parameter \"%s\" cannot be changed now"
+msgstr "el parámetro «%s» no se puede cambiar en este momento"
 
-#: utils/init/miscinit.c:844
+#: utils/misc/guc.c:5201
 #, c-format
-msgid ""
-"If you're sure there are no old server processes still running, remove the "
-"shared memory block or just delete the file \"%s\"."
-msgstr ""
-"Si está seguro que no hay procesos de servidor antiguos aún en ejecución, "
-"elimine el bloque de memoria compartida, o simplemente borre el archivo «%s»."
+msgid "parameter \"%s\" cannot be set after connection start"
+msgstr "el parámetro «%s» no se puede cambiar después de efectuar la conexión"
 
-#: utils/init/miscinit.c:861
+#: utils/misc/guc.c:5211 utils/misc/guc.c:7927
 #, c-format
-msgid "could not remove old lock file \"%s\": %m"
-msgstr "no se pudo eliminar el archivo de bloqueo antiguo «%s»: %m"
+msgid "permission denied to set parameter \"%s\""
+msgstr "se ha denegado el permiso para cambiar la opción «%s»"
 
-#: utils/init/miscinit.c:863
-msgid ""
-"The file seems accidentally left over, but it could not be removed. Please "
-"remove the file by hand and try again."
+#: utils/misc/guc.c:5249
+#, c-format
+msgid "cannot set parameter \"%s\" within security-definer function"
 msgstr ""
-"El archivo parece accidentalmente abandonado, pero no pudo ser eliminado. "
-"Por favor elimine el archivo manualmente e intente nuevamente."
+"no se puede definir el parámetro «%s» dentro una función security-definer"
 
-#: utils/init/miscinit.c:885 utils/init/miscinit.c:896
-#: utils/init/miscinit.c:906
+#: utils/misc/guc.c:5395 utils/misc/guc.c:5709 utils/misc/guc.c:8091
+#: utils/misc/guc.c:8125
 #, c-format
-msgid "could not write lock file \"%s\": %m"
-msgstr "no se pudo escribir el archivo de bloqueo «%s»: %m"
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "valor no válido para el parámetro «%s»: «%s»"
 
-#: utils/init/miscinit.c:1112 utils/init/miscinit.c:1125
+#: utils/misc/guc.c:5404
 #, c-format
-msgid "\"%s\" is not a valid data directory"
-msgstr "«%s» no es un directorio de datos válido"
+msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
+msgstr "%d está fuera del rango aceptable para el parámetro «%s» (%d .. %d)"
 
-#: utils/init/miscinit.c:1114
+#: utils/misc/guc.c:5490
 #, c-format
-msgid "File \"%s\" is missing."
-msgstr "Falta el archivo «%s»."
+msgid "parameter \"%s\" requires a numeric value"
+msgstr "parámetro «%s» requiere un valor numérico"
 
-#: utils/init/miscinit.c:1127
+#: utils/misc/guc.c:5498
 #, c-format
-msgid "File \"%s\" does not contain valid data."
-msgstr "El archivo «%s» no contiene datos válidos."
-
-#: utils/init/miscinit.c:1129
-msgid "You might need to initdb."
-msgstr "Puede necesitar ejecutar initdb."
+msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
+msgstr "%g está fuera del rango aceptable para el parámetro «%s» (%g .. %g)"
 
-#: utils/init/miscinit.c:1137
+#: utils/misc/guc.c:5875 utils/misc/guc.c:5923 utils/misc/guc.c:6755
 #, c-format
-msgid ""
-"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
-"not compatible with this version %s."
-msgstr ""
-"El directorio de datos fue inicializado por PostgreSQL versión %ld.%ld, que "
-"no es compatible con esta versión %s."
+msgid "must be superuser to examine \"%s\""
+msgstr "debe ser superusuario para examinar «%s»"
 
-#: utils/init/miscinit.c:1185
+#: utils/misc/guc.c:5989
 #, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "la sintaxis de lista no es válida para el parámetro «%s»"
+msgid "SET %s takes only one argument"
+msgstr "SET %s lleva sólo un argumento"
 
-#: utils/init/miscinit.c:1222
-#, c-format
-msgid "loaded library \"%s\""
-msgstr "biblioteca «%s» cargada"
+#: utils/misc/guc.c:6222
+msgid "SET requires parameter name"
+msgstr "SET requiere el nombre de un parámetro"
 
-#: utils/init/postinit.c:229
+#: utils/misc/guc.c:6337
 #, c-format
-msgid "replication connection authorized: user=%s host=%s port=%s"
-msgstr "conexión de replicación autorizada: usuario=%s host=%s port=%s"
+msgid "attempt to redefine parameter \"%s\""
+msgstr "intento de cambiar la opción «%s»"
 
-#: utils/init/postinit.c:235
+#: utils/misc/guc.c:7628
 #, c-format
-msgid "replication connection authorized: user=%s host=%s"
-msgstr "conexión de replicación autorizada: usuario=%s host=%s"
+msgid "could not parse setting for parameter \"%s\""
+msgstr "no se pudo interpretar el valor de para el parámetro «%s»"
 
-#: utils/init/postinit.c:241
+#: utils/misc/guc.c:7989 utils/misc/guc.c:8023
 #, c-format
-msgid "connection authorized: user=%s database=%s"
-msgstr "conexión autorizada: usuario=%s database=%s"
+msgid "invalid value for parameter \"%s\": %d"
+msgstr "valor no válido para el parámetro «%s»: %d"
 
-#: utils/init/postinit.c:271
+#: utils/misc/guc.c:8057
 #, c-format
-msgid "database \"%s\" has disappeared from pg_database"
-msgstr "la base de datos «%s» ha desaparecido de pg_database"
+msgid "invalid value for parameter \"%s\": %g"
+msgstr "valor no válido para el parámetro «%s»: %g"
 
-#: utils/init/postinit.c:273
-#, c-format
-msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "Base de datos con OID %u ahora parece pertenecer a «%s»."
+#: utils/misc/guc.c:8247
+msgid ""
+"\"temp_buffers\" cannot be changed after any temporary tables have been "
+"accessed in the session."
+msgstr ""
+"«temp_buffers» no puede ser cambiado después de que cualquier tabla temporal "
+"haya sido accedida en la sesión."
 
-#: utils/init/postinit.c:293
-#, c-format
-msgid "database \"%s\" is not currently accepting connections"
-msgstr "la base de datos «%s» no acepta conexiones"
+#: utils/misc/guc.c:8259
+msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+msgstr "SET AUTOCOMMIT TO OFF ya no está soportado"
 
-#: utils/init/postinit.c:306
-#, c-format
-msgid "permission denied for database \"%s\""
-msgstr "permiso denegado a la base de datos «%s»"
+#: utils/misc/guc.c:8334
+msgid "assertion checking is not supported by this build"
+msgstr ""
+"la revisión de aseveraciones (asserts) no está soportada en este servidor"
 
-#: utils/init/postinit.c:307
-msgid "User does not have CONNECT privilege."
-msgstr "Usuario no tiene privilegios de conexión."
+#: utils/misc/guc.c:8347
+msgid "Bonjour is not supported by this build"
+msgstr "Bonjour no está soportado en este servidor"
 
-#: utils/init/postinit.c:324
-#, c-format
-msgid "too many connections for database \"%s\""
-msgstr "demasiadas conexiones para la base de datos «%s»"
+#: utils/misc/guc.c:8360
+msgid "SSL is not supported by this build"
+msgstr "SSL no está soportado en este servidor"
 
-#: utils/init/postinit.c:346 utils/init/postinit.c:353
-msgid "database locale is incompatible with operating system"
-msgstr "la configuración regional es incompatible con el sistema operativo"
+#: utils/misc/guc.c:8372
+msgid "Cannot enable parameter when \"log_statement_stats\" is true."
+msgstr ""
+"No se puede activar el parámetro cuando «log_statement_stats» está activo."
 
-#: utils/init/postinit.c:347
-#, c-format
+#: utils/misc/guc.c:8384
 msgid ""
-"The database was initialized with LC_COLLATE \"%s\",  which is not "
-"recognized by setlocale()."
+"Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
+"\"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr ""
-"La base de datos fue inicializada con LC_COLLATE «%s», el cual no es "
-"reconocido por setlocale()."
+"No se puede activar «log_statement_stats» cuando «log_parser_stats», "
+"«log_planner_stats» o «log_executor_stats» están activos."
+
+#: utils/misc/help_config.c:131
+msgid "internal error: unrecognized run-time parameter type\n"
+msgstr "error interno: tipo parámetro no reconocido\n"
 
-#: utils/init/postinit.c:349 utils/init/postinit.c:356
+#: utils/misc/tzparser.c:61
+#, c-format
 msgid ""
-"Recreate the database with another locale or install the missing locale."
+"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
+"zone file \"%s\", line %d"
 msgstr ""
-"Recree la base de datos con otra configuración regional, o instale la "
-"configuración regional faltante."
+"la abreviación del huso horario «%s» es demasiado larga (máximo %d "
+"caracteres) en archivo de huso horario «%s», línea %d"
 
-#: utils/init/postinit.c:354
+#: utils/misc/tzparser.c:68
 #, c-format
 msgid ""
-"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
-"by setlocale()."
+"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
+"\"%s\", line %d"
 msgstr ""
-"La base de datos fueron inicializada con LC_CTYPE «%s», el cual no es "
-"reconocido por setlocale()."
-
-#: utils/init/postinit.c:608
-msgid "no roles are defined in this database system"
-msgstr "no hay roles definidos en esta base de datos"
+"desplazamiento de huso horario %d no es un múltiplo de 900 segundos (15 "
+"minutos) en archivo de huso horario «%s», línea %d"
 
-#: utils/init/postinit.c:609
+#: utils/misc/tzparser.c:80
 #, c-format
-msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
-msgstr "Debería ejecutar imediatamente CREATE USER \"%s\" SUPERUSER;."
-
-#: utils/init/postinit.c:632
-msgid "new replication connections are not allowed during database shutdown"
+msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
 msgstr ""
-"nuevas conexiones de replicación no son permitidas durante el apagado de la "
-"base de datos"
+"desplazamiento de huso horario %d está fuera de rango en el archivo de huso "
+"horario «%s», línea %d"
 
-#: utils/init/postinit.c:636
-msgid "must be superuser to connect during database shutdown"
+#: utils/misc/tzparser.c:115
+#, c-format
+msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
 msgstr ""
-"debe ser superusuario para conectarse durante el apagado de la base de datos"
+"falta una abreviación de huso horario en el archivo de huso horario «%s», "
+"línea %d"
 
-#: utils/init/postinit.c:650
-msgid ""
-"remaining connection slots are reserved for non-replication superuser "
-"connections"
+#: utils/misc/tzparser.c:124
+#, c-format
+msgid "missing time zone offset in time zone file \"%s\", line %d"
 msgstr ""
-"las conexiones restantes están reservadas a superusuarios y no de replicación"
-
-#: utils/init/postinit.c:665
-msgid "must be superuser to start walsender"
-msgstr "debe ser superusuario para iniciar el walsender"
+"falta un desplazamiento de huso horario en el archivo de huso horario «%s», "
+"línea %d"
 
-#: utils/init/postinit.c:725
+#: utils/misc/tzparser.c:131
 #, c-format
-msgid "database %u does not exist"
-msgstr "no existe la base de datos %u"
-
-#: utils/init/postinit.c:777
-msgid "It seems to have just been dropped or renamed."
-msgstr "Parece haber sido eliminada o renombrada."
+msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
+msgstr ""
+"número no válido para desplazamiento de huso horario en archivo de huso "
+"horario «%s», línea %d"
 
-#: utils/init/postinit.c:795
+#: utils/misc/tzparser.c:154
 #, c-format
-msgid "The database subdirectory \"%s\" is missing."
-msgstr "Falta el subdirectorio de base de datos «%s»."
+msgid "invalid syntax in time zone file \"%s\", line %d"
+msgstr "sintaxis no válida en archivo de huso horario «%s», línea %d"
 
-#: utils/init/postinit.c:800
+#: utils/misc/tzparser.c:218
 #, c-format
-msgid "could not access directory \"%s\": %m"
-msgstr "no se pudo acceder al directorio «%s»: %m"
+msgid "time zone abbreviation \"%s\" is multiply defined"
+msgstr "abreviación de huso horario «%s» está definida múltiples veces"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
+#: utils/misc/tzparser.c:220
 #, c-format
-msgid "unexpected encoding ID %d for ISO 8859 character sets"
-msgstr "ID de codificación %d inesperado para juegos de caracteres ISO 8859"
+msgid ""
+"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
+"\", line %d."
+msgstr ""
+"Entrada en archivo de huso horario «%s», línea %d, causa conflictos con "
+"entrada en archivo «%s», línea %d."
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#: utils/misc/tzparser.c:285
 #, c-format
-msgid "unexpected encoding ID %d for WIN character sets"
-msgstr "ID de codificación %d inesperado para juegos de caracteres WIN"
+msgid "invalid time zone file name \"%s\""
+msgstr "nombre de huso horario «%s» no válido"
 
-#: utils/mb/conv.c:509
+#: utils/misc/tzparser.c:298
 #, c-format
-msgid "invalid encoding number: %d"
-msgstr "el número de codificación no es válido: %d"
-
-#: utils/mb/encnames.c:485
-msgid "encoding name too long"
-msgstr "el nombre de codificación es demasiado largo"
+msgid "time zone file recursion limit exceeded in file \"%s\""
+msgstr "límite de recursión excedido en el archivo «%s»"
 
-#: utils/mb/mbutils.c:311
+#: utils/misc/tzparser.c:337 utils/misc/tzparser.c:350
 #, c-format
-msgid ""
-"default conversion function for encoding \"%s\" to \"%s\" does not exist"
-msgstr ""
-"no existe el procedimiento por omisión de conversión desde la codificación "
-"«%s» a «%s»"
+msgid "could not read time zone file \"%s\": %m"
+msgstr "no se pudo leer archivo de huso horario «%s»: %m"
 
-#: utils/mb/mbutils.c:335 utils/mb/mbutils.c:607
+#: utils/misc/tzparser.c:360
 #, c-format
-msgid "String of %d bytes is too long for encoding conversion."
-msgstr "La cadena de %d bytes es demasiado larga para la recodificación."
+msgid "line is too long in time zone file \"%s\", line %d"
+msgstr "línea demasiado larga en archivo de huso horario «%s», línea %d"
 
-#: utils/mb/mbutils.c:422
+#: utils/misc/tzparser.c:383
 #, c-format
-msgid "invalid source encoding name \"%s\""
-msgstr "la codificación de origen «%s» no es válida"
+msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
+msgstr ""
+"@INCLUDE sin nombre de archivo en archivo de huso horario «%s», línea %d"
 
-#: utils/mb/mbutils.c:427
+#: guc-file.l:274
 #, c-format
-msgid "invalid destination encoding name \"%s\""
-msgstr "la codificación de destino «%s» no es válida"
+msgid "parameter \"%s\" removed from configuration file, reset to default"
+msgstr ""
+"parámetro «%s» eliminado del archivo de configuración, volviendo al valor "
+"por omisión"
 
-#: utils/mb/mbutils.c:539
+#: guc-file.l:333
 #, c-format
-msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "byte no válido para codificación «%s»: 0x%02x"
-
-#: utils/mb/mbutils.c:734
-msgid "invalid multibyte character for locale"
-msgstr "el carácter multibyte no es válido para esta configuración regional"
+msgid "parameter \"%s\" changed to \"%s\""
+msgstr "el parámetro «%s» fue cambiado a «%s»"
 
-#: utils/mb/mbutils.c:735
+#: guc-file.l:374
+#, c-format
 msgid ""
-"The server's LC_CTYPE locale is probably incompatible with the database "
-"encoding."
+"could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr ""
-"La configuración regional LC_CTYPE del servidor es probablemente "
-"incompatible con la codificación de la base de datos."
+"no se pudo abrir el archivo de configuración «%s»: nivel de anidamiento "
+"máximo excedido"
 
-#: utils/mb/wchar.c:1609
+#: guc-file.l:589
 #, c-format
-msgid "invalid byte sequence for encoding \"%s\": 0x%s"
-msgstr "secuencia de bytes no válida para codificación «%s»: 0x%s"
+msgid "syntax error in file \"%s\" line %u, near end of line"
+msgstr "error de sintaxis en el archivo «%s» línea %u, cerca del fin de línea"
 
-#: utils/mb/wchar.c:1638
+#: guc-file.l:594
 #, c-format
-msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
-msgstr "carácter 0x%s de codificación «%s» no tiene equivalente en «%s»"
+msgid "syntax error in file \"%s\" line %u, near token \"%s\""
+msgstr ""
+"error de sintaxis en el archivo «%s» línea %u, cerca de la palabra «%s»"
 
-#: ../port/chklocale.c:326 ../port/chklocale.c:332
+#: ../port/chklocale.c:328 ../port/chklocale.c:334
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr ""
 "no se pudo determinar la codificación para la configuración regional «%s»: "
 "el codeset es «%s»"
 
-#: ../port/chklocale.c:334
+#: ../port/chklocale.c:336
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Por favor reporte esto a <pgsql-bugs@postgresql.org>."
 
@@ -17324,22 +18739,32 @@ msgstr "no se pudo definir un junction para «%s»: %s"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "no se pudo definir un junction para «%s»: %s\n"
 
-#: ../port/dirmod.c:325
+#: ../port/dirmod.c:358
+#, c-format
+msgid "could not get junction for \"%s\": %s"
+msgstr "no se pudo obtener junction para «%s»: %s"
+
+#: ../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "no se pudo obtener junction para «%s»: %s\n"
+
+#: ../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "no se pudo abrir el directorio «%s»: %s\n"
 
-#: ../port/dirmod.c:362
+#: ../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "no se pudo leer el directorio «%s»: %s\n"
 
-#: ../port/dirmod.c:445
+#: ../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "no se pudo hacer stat al archivo o directorio «%s»: %s\n"
 
-#: ../port/dirmod.c:472 ../port/dirmod.c:489
+#: ../port/dirmod.c:590 ../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "no se pudo eliminar el directorio «%s»: %s\n"
@@ -17374,27 +18799,27 @@ msgstr "no se pudo cambiar al directorio «%s»"
 msgid "could not read symbolic link \"%s\""
 msgstr "no se pudo leer el enlace simbólico «%s»"
 
-#: ../port/exec.c:516
+#: ../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "el proceso hijo terminó con código de salida %d"
 
-#: ../port/exec.c:520
+#: ../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "el proceso hijo fue terminado por la excepción 0x%X"
 
-#: ../port/exec.c:529
+#: ../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "el proceso hijo fue terminado por una señal %s"
 
-#: ../port/exec.c:532
+#: ../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "el proceso hijo fue terminado por una señal %d"
 
-#: ../port/exec.c:536
+#: ../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
@@ -17429,12 +18854,12 @@ msgstr ""
 msgid "unrecognized error %d"
 msgstr "código de error no reconocido: %d"
 
-#: ../port/win32error.c:184
+#: ../port/win32error.c:188
 #, c-format
 msgid "mapped win32 error code %lu to %d"
 msgstr "código de error win32 %lu mapeado a %d"
 
-#: ../port/win32error.c:195
+#: ../port/win32error.c:199
 #, c-format
 msgid "unrecognized win32 error code: %lu"
 msgstr "código de error win32 no reconocido: %lu"
diff --git a/src/backend/po/fr.po b/src/backend/po/fr.po
index 9b9c06b25c38c..ae879a93e93be 100644
--- a/src/backend/po/fr.po
+++ b/src/backend/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-04-11 21:00+0000\n"
-"PO-Revision-Date: 2011-04-12 08:57+0100\n"
+"POT-Creation-Date: 2011-09-21 16:58+0000\n"
+"PO-Revision-Date: 2011-09-21 23:57+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
 "Language: fr\n"
@@ -20,814 +20,722 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: main/main.c:230
+#: nodes/nodeFuncs.c:114
+#: nodes/nodeFuncs.c:140
+#: parser/parse_coerce.c:1645
+#: parser/parse_coerce.c:1662
+#: parser/parse_coerce.c:1724
+#: parser/parse_expr.c:1633
+#: parser/parse_func.c:367
+#: parser/parse_oper.c:948
 #, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr "%s : setsysinfo a échoué : %s\n"
+msgid "could not find array type for data type %s"
+msgstr "n'a pas pu trouver le type array pour le type de données %s"
 
-#: main/main.c:249
-#, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s : WSAStartup a échoué : %d\n"
+#: tsearch/dict_ispell.c:53
+#: tsearch/dict_thesaurus.c:615
+msgid "multiple DictFile parameters"
+msgstr "multiples paramètres DictFile"
 
-#: main/main.c:268
-#, c-format
-msgid ""
-"%s is the PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s est le serveur PostgreSQL.\n"
-"\n"
+#: tsearch/dict_ispell.c:64
+msgid "multiple AffFile parameters"
+msgstr "multiples paramètres AffFile"
 
-#: main/main.c:269
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION]...\n"
-"\n"
-msgstr ""
-"Usage :\n"
-"  %s [OPTION]...\n"
-"\n"
+#: tsearch/dict_ispell.c:75
+#: tsearch/dict_simple.c:50
+#: snowball/dict_snowball.c:206
+msgid "multiple StopWords parameters"
+msgstr "plusieurs paramètres StopWords"
 
-#: main/main.c:270
+#: tsearch/dict_ispell.c:83
 #, c-format
-msgid "Options:\n"
-msgstr "Options :\n"
+msgid "unrecognized Ispell parameter: \"%s\""
+msgstr "paramètre Ispell non reconnu : « %s »"
 
-#: main/main.c:272
-#, c-format
-msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr ""
-"  -A 1|0             active/désactive la vérification des limites (assert) à\n"
-"                     l'exécution\n"
+#: tsearch/dict_ispell.c:97
+msgid "missing AffFile parameter"
+msgstr "paramètre AffFile manquant"
 
-#: main/main.c:274
-#, c-format
-msgid "  -B NBUFFERS     number of shared buffers\n"
-msgstr "  -B NBUFFERS        nombre de tampons partagés\n"
+#: tsearch/dict_ispell.c:103
+#: tsearch/dict_thesaurus.c:639
+msgid "missing DictFile parameter"
+msgstr "paramètre DictFile manquant"
 
-#: main/main.c:275
-#, c-format
-msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr "  -c NOM=VALEUR      configure un paramètre d'exécution\n"
+#: tsearch/dict_simple.c:59
+msgid "multiple Accept parameters"
+msgstr "multiples paramètres Accept"
 
-#: main/main.c:276
+#: tsearch/dict_simple.c:67
 #, c-format
-msgid "  -d 1-5          debugging level\n"
-msgstr "  -d 1-5             niveau de débogage\n"
+msgid "unrecognized simple dictionary parameter: \"%s\""
+msgstr "paramètre de dictionnaire simple non reconnu : « %s »"
 
-#: main/main.c:277
+#: tsearch/dict_synonym.c:119
 #, c-format
-msgid "  -D DATADIR      database directory\n"
-msgstr "  -D REPDONNEES      répertoire de la base de données\n"
+msgid "unrecognized synonym parameter: \"%s\""
+msgstr "paramètre synonyme non reconnu : « %s »"
 
-#: main/main.c:278
-#, c-format
-msgid "  -e              use European date input format (DMY)\n"
-msgstr "  -e                 utilise le format de saisie européen des dates (DMY)\n"
+#: tsearch/dict_synonym.c:126
+msgid "missing Synonyms parameter"
+msgstr "paramètre Synonyms manquant"
 
-#: main/main.c:279
+#: tsearch/dict_synonym.c:133
 #, c-format
-msgid "  -F              turn fsync off\n"
-msgstr "  -F                 désactive fsync\n"
+msgid "could not open synonym file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier synonyme « %s » : %m"
 
-#: main/main.c:280
+#: tsearch/dict_thesaurus.c:180
 #, c-format
-msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr "  -h NOMHOTE         nom d'hôte ou adresse IP à écouter\n"
+msgid "could not open thesaurus file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le thésaurus « %s » : %m"
 
-#: main/main.c:281
-#, c-format
-msgid "  -i              enable TCP/IP connections\n"
-msgstr "  -i                 active les connexions TCP/IP\n"
+#: tsearch/dict_thesaurus.c:213
+msgid "unexpected delimiter"
+msgstr "délimiteur inattendu"
 
-#: main/main.c:282
-#, c-format
-msgid "  -k DIRECTORY    Unix-domain socket location\n"
-msgstr "  -k REPERTOIRE      emplacement des sockets de domaine Unix\n"
+#: tsearch/dict_thesaurus.c:263
+#: tsearch/dict_thesaurus.c:279
+msgid "unexpected end of line or lexeme"
+msgstr "fin de ligne ou lexeme inattendu"
 
-#: main/main.c:284
-#, c-format
-msgid "  -l              enable SSL connections\n"
-msgstr "  -l                 active les connexions SSL\n"
+#: tsearch/dict_thesaurus.c:288
+msgid "unexpected end of line"
+msgstr "fin de ligne inattendue"
 
-#: main/main.c:286
+#: tsearch/dict_thesaurus.c:412
 #, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
-msgstr "  -N MAX-CONNECT     nombre maximum de connexions simultanées\n"
+msgid "thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"le mot d'exemple « %s » du thésaurus n'est pas reconnu par le\n"
+"sous-dictionnaire (règle %d)"
 
-#: main/main.c:287
+#: tsearch/dict_thesaurus.c:418
 #, c-format
-msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
-msgstr "  -o OPTIONS         passe « OPTIONS » à chaque processus serveur (obsolète)\n"
+msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
+msgstr "le mot d'exemple « %s » du thésaurus est un terme courant (règle %d)"
 
-#: main/main.c:288
-#, c-format
-msgid "  -p PORT         port number to listen on\n"
-msgstr "  -p PORT            numéro du port à écouter\n"
+#: tsearch/dict_thesaurus.c:421
+msgid "Use \"?\" to represent a stop word within a sample phrase."
+msgstr "Utilisez « ? » pour représenter un terme courant dans une phrase."
 
-#: main/main.c:289
+#: tsearch/dict_thesaurus.c:567
 #, c-format
-msgid "  -s              show statistics after each query\n"
-msgstr "  -s                 affiche les statistiques après chaque requête\n"
+msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
+msgstr "le mot substitut « %s » du thésaurus est un terme courant (règle %d)"
 
-#: main/main.c:290
+#: tsearch/dict_thesaurus.c:574
 #, c-format
-msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
-msgstr "  -S WORK-MEM        configure la mémoire pour les tris (en Ko)\n"
+msgid "thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"le mot substitut « %s » du thésaurus n'est pas reconnu par le\n"
+"sous-dictionnaire (règle %d)"
 
-#: main/main.c:291
+#: tsearch/dict_thesaurus.c:586
 #, c-format
-msgid "  --NAME=VALUE    set run-time parameter\n"
-msgstr "  -c NOM=VALEUR      configure un paramètre d'exécution\n"
+msgid "thesaurus substitute phrase is empty (rule %d)"
+msgstr "la phrase substitut du thésaurus est vide (règle %d)"
 
-#: main/main.c:292
-#, c-format
-msgid "  --describe-config  describe configuration parameters, then exit\n"
-msgstr "  --describe-config  décrit les paramètres de configuration, puis quitte\n"
+#: tsearch/dict_thesaurus.c:624
+msgid "multiple Dictionary parameters"
+msgstr "multiples paramètres Dictionary"
 
-#: main/main.c:293
+#: tsearch/dict_thesaurus.c:631
 #, c-format
-msgid "  --help          show this help, then exit\n"
-msgstr "  --help             affiche cette aide, puis quitte\n"
+msgid "unrecognized Thesaurus parameter: \"%s\""
+msgstr "paramètre Thesaurus non reconnu : « %s »"
 
-#: main/main.c:294
-#, c-format
-msgid "  --version       output version information, then exit\n"
-msgstr "  --version          affiche la version, puis quitte\n"
+#: tsearch/dict_thesaurus.c:643
+msgid "missing Dictionary parameter"
+msgstr "paramètre Dictionary manquant"
 
-#: main/main.c:296
+#: tsearch/spell.c:276
 #, c-format
-msgid ""
-"\n"
-"Developer options:\n"
-msgstr ""
-"\n"
-"Options pour le développeur :\n"
+msgid "could not open dictionary file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier dictionnaire « %s » : %m"
 
-#: main/main.c:297
+#: tsearch/spell.c:439
+#: utils/adt/regexp.c:195
 #, c-format
-msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
-msgstr "  -f s|i|n|m|h       interdit l'utilisation de certains types de plan\n"
+msgid "invalid regular expression: %s"
+msgstr "expression rationnelle invalide : %s"
 
-#: main/main.c:298
-#, c-format
-msgid "  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
-"  -n                 ne réinitialise pas la mémoire partagée après un arrêt\n"
-"                     brutal\n"
+#: tsearch/spell.c:518
+#: tsearch/spell.c:535
+#: tsearch/spell.c:552
+#: tsearch/spell.c:569
+#: tsearch/spell.c:591
+#: gram.y:12477
+#: gram.y:12494
+msgid "syntax error"
+msgstr "erreur de syntaxe"
 
-#: main/main.c:299
-#, c-format
-msgid "  -O              allow system table structure changes\n"
-msgstr ""
-"  -O                 autorise les modifications de structure des tables\n"
-"                     système\n"
+#: tsearch/spell.c:596
+#: tsearch/spell.c:842
+#: tsearch/spell.c:862
+msgid "multibyte flag character is not allowed"
+msgstr "un caractère drapeau multi-octet n'est pas autorisé"
 
-#: main/main.c:300
+#: tsearch/spell.c:629
+#: tsearch/spell.c:687
+#: tsearch/spell.c:780
 #, c-format
-msgid "  -P              disable system indexes\n"
-msgstr "  -P                 désactive les index système\n"
+msgid "could not open affix file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier affixe « %s » : %m"
 
-#: main/main.c:301
-#, c-format
-msgid "  -t pa|pl|ex     show timings after each query\n"
-msgstr "  -t pa|pl|ex     affiche les temps pour chaque requête\n"
+#: tsearch/spell.c:675
+msgid "Ispell dictionary supports only default flag value"
+msgstr "le dictionnaire Ispell supporte seulement la valeur par défaut du drapeau"
 
-#: main/main.c:302
-#, c-format
-msgid "  -T              send SIGSTOP to all backend servers if one dies\n"
-msgstr ""
-"  -T                 envoie SIGSTOP à tous les processus serveur si l'un\n"
-"                     d'entre eux meurt\n"
+#: tsearch/spell.c:873
+msgid "wrong affix file format for flag"
+msgstr "mauvais format de fichier affixe pour le drapeau"
 
-#: main/main.c:303
+#: tsearch/to_tsany.c:165
+#: utils/adt/tsvector.c:272
+#: utils/adt/tsvector_op.c:530
 #, c-format
-msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
-msgstr ""
-"  -W NUM             attends NUM secondes pour permettre l'attache d'un\n"
-"                     débogueur\n"
+msgid "string is too long for tsvector (%d bytes, max %d bytes)"
+msgstr "la chaîne est trop longue (%d octets, max %d octets)"
 
-#: main/main.c:305
+#: tsearch/ts_locale.c:177
 #, c-format
-msgid ""
-"\n"
-"Options for single-user mode:\n"
-msgstr ""
-"\n"
-"Options pour le mode mono-utilisateur :\n"
+msgid "line %d of configuration file \"%s\": \"%s\""
+msgstr "ligne %d du fichier de configuration « %s » : « %s »"
 
-#: main/main.c:306
+#: tsearch/ts_locale.c:182
+#: libpq/hba.c:781
+#: libpq/hba.c:797
+#: libpq/hba.c:833
+#: libpq/hba.c:855
+#: libpq/hba.c:864
+#: libpq/hba.c:887
+#: libpq/hba.c:899
+#: libpq/hba.c:912
+#: libpq/hba.c:927
+#: libpq/hba.c:982
+#: libpq/hba.c:1002
+#: libpq/hba.c:1016
+#: libpq/hba.c:1033
+#: libpq/hba.c:1046
+#: libpq/hba.c:1062
+#: libpq/hba.c:1077
+#: libpq/hba.c:1119
+#: libpq/hba.c:1151
+#: libpq/hba.c:1162
+#: libpq/hba.c:1182
+#: libpq/hba.c:1193
+#: libpq/hba.c:1204
+#: libpq/hba.c:1221
+#: libpq/hba.c:1242
+#: libpq/hba.c:1272
+#: libpq/hba.c:1284
+#: libpq/hba.c:1297
+#: libpq/hba.c:1331
+#: libpq/hba.c:1405
+#: libpq/hba.c:1423
+#: libpq/hba.c:1444
+#: libpq/hba.c:1475
+#: libpq/hba.c:1485
 #, c-format
-msgid "  --single        selects single-user mode (must be first argument)\n"
-msgstr ""
-"  --single           sélectionne le mode mono-utilisateur (doit être le\n"
-"                     premier argument)\n"
+msgid "line %d of configuration file \"%s\""
+msgstr "ligne %d du fichier de configuration « %s »"
 
-#: main/main.c:307
+#: tsearch/ts_locale.c:302
 #, c-format
-msgid "  DBNAME          database name (defaults to user name)\n"
-msgstr "  NOMBASE            nom de la base (par défaut, celui de l'utilisateur)\n"
+msgid "conversion from wchar_t to server encoding failed: %m"
+msgstr "échec de l'encodage de wchar_t vers l'encodage du serveur : %m"
 
-#: main/main.c:308
-#, c-format
-msgid "  -d 0-5          override debugging level\n"
-msgstr "  -d 0-5             surcharge le niveau de débogage\n"
+#: tsearch/ts_parse.c:391
+#: tsearch/ts_parse.c:398
+#: tsearch/ts_parse.c:561
+#: tsearch/ts_parse.c:568
+msgid "word is too long to be indexed"
+msgstr "le mot est trop long pour être indexé"
 
-#: main/main.c:309
-#, c-format
-msgid "  -E              echo statement before execution\n"
-msgstr "  -E                 affiche la requête avant de l'exécuter\n"
-
-#: main/main.c:310
-#, c-format
-msgid "  -j              do not use newline as interactive query delimiter\n"
-msgstr ""
-"  -N                 n'utilise pas le retour à la ligne comme délimiteur de\n"
-"                     requête\n"
-
-#: main/main.c:311
-#: main/main.c:316
-#, c-format
-msgid "  -r FILENAME     send stdout and stderr to given file\n"
-msgstr "  -r FICHIER         envoie stdout et stderr dans le fichier indiqué\n"
-
-#: main/main.c:313
-#, c-format
-msgid ""
-"\n"
-"Options for bootstrapping mode:\n"
-msgstr ""
-"\n"
-"Options pour le mode « bootstrapping » :\n"
-
-#: main/main.c:314
-#, c-format
-msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
-msgstr ""
-"  --boot             sélectionne le mode « bootstrapping » (doit être le\n"
-"                     premier argument)\n"
-
-#: main/main.c:315
-#, c-format
-msgid "  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
-msgstr "  NOMBASE            nom de la base (argument obligatoire dans ce mode)\n"
-
-#: main/main.c:317
-#, c-format
-msgid "  -x NUM          internal use\n"
-msgstr "  -x NUM             utilisation interne\n"
-
-#: main/main.c:319
+#: tsearch/ts_parse.c:392
+#: tsearch/ts_parse.c:399
+#: tsearch/ts_parse.c:562
+#: tsearch/ts_parse.c:569
 #, c-format
-msgid ""
-"\n"
-"Please read the documentation for the complete list of run-time\n"
-"configuration settings and how to set them on the command line or in\n"
-"the configuration file.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Merci de lire la documentation pour la liste complète des paramètres de\n"
-"configuration à l'exécution et pour savoir comment les configurer à la\n"
-"ligne de commande ou dans le fichier de configuration.\n"
-"\n"
-"Rapportez les bogues à <pgsql-bugs@postgresql.org>.\n"
-
-#: main/main.c:333
-msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"L'exécution du serveur PostgreSQL par l'utilisateur « root » n'est pas\n"
-"autorisée.\n"
-"Le serveur doit être lancé avec un utilisateur non privilégié pour empêcher\n"
-"tout problème possible de sécurité sur le serveur. Voir la documentation pour\n"
-"plus d'informations sur le lancement propre du serveur.\n"
+msgid "Words longer than %d characters are ignored."
+msgstr "Les mots de plus de %d caractères sont ignorés."
 
-#: main/main.c:350
+#: tsearch/ts_utils.c:53
 #, c-format
-msgid "%s: real and effective user IDs must match\n"
-msgstr "%s : les identifiants réel et effectif de l'utilisateur doivent correspondre\n"
-
-#: main/main.c:357
-msgid ""
-"Execution of PostgreSQL by a user with administrative permissions is not\n"
-"permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromises.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"L'exécution du serveur PostgreSQL par un utilisateur doté de droits d'administrateur n'est pas permise.\n"
-"Le serveur doit être lancé avec un utilisateur non privilégié pour empêcher\n"
-"tout problème de sécurité sur le serveur. Voir la documentation pour\n"
-"plus d'informations sur le lancement propre du serveur.\n"
+msgid "invalid text search configuration file name \"%s\""
+msgstr "nom du fichier de configuration de la recherche plein texte invalide : « %s »"
 
-#: main/main.c:378
+#: tsearch/ts_utils.c:91
 #, c-format
-msgid "%s: invalid effective UID: %d\n"
-msgstr "%s : UID effectif invalide : %d\n"
+msgid "could not open stop-word file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier des termes courants « %s » : %m"
 
-#: main/main.c:391
-#, c-format
-msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr "%s : n'a pas pu déterminer le nom de l'utilisateur (GetUserName a échoué)\n"
+#: tsearch/wparser.c:314
+msgid "text search parser does not support headline creation"
+msgstr "l'analyseur de recherche plein texte ne supporte pas headline"
 
-#: tsearch/wparser_def.c:2533
+#: tsearch/wparser_def.c:2551
 #, c-format
 msgid "unrecognized headline parameter: \"%s\""
 msgstr "paramètre headline « %s » non reconnu"
 
-#: tsearch/wparser_def.c:2542
+#: tsearch/wparser_def.c:2560
 msgid "MinWords should be less than MaxWords"
 msgstr "MinWords doit avoir une valeur plus petite que celle de MaxWords"
 
-#: tsearch/wparser_def.c:2546
+#: tsearch/wparser_def.c:2564
 msgid "MinWords should be positive"
 msgstr "MinWords doit être positif"
 
-#: tsearch/wparser_def.c:2550
+#: tsearch/wparser_def.c:2568
 msgid "ShortWord should be >= 0"
 msgstr "ShortWord devrait être positif ou nul"
 
-#: tsearch/wparser_def.c:2554
+#: tsearch/wparser_def.c:2572
 msgid "MaxFragments should be >= 0"
 msgstr "MaxFragments devrait être positif ou nul"
 
-#: tsearch/dict_ispell.c:52
-#: tsearch/dict_thesaurus.c:615
-msgid "multiple DictFile parameters"
-msgstr "multiples paramètres DictFile"
-
-#: tsearch/dict_ispell.c:63
-msgid "multiple AffFile parameters"
-msgstr "multiples paramètres AffFile"
+#: access/hash/hashinsert.c:73
+#, c-format
+msgid "index row size %lu exceeds hash maximum %lu"
+msgstr "la taille de la ligne index, %lu, dépasse le hachage maximum, %lu"
 
-#: tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:50
-#: snowball/dict_snowball.c:206
-msgid "multiple StopWords parameters"
-msgstr "plusieurs paramètres StopWords"
+#: access/hash/hashinsert.c:76
+msgid "Values larger than a buffer page cannot be indexed."
+msgstr "Les valeurs plus larges qu'une page de tampon ne peuvent pas être indexées."
 
-#: tsearch/dict_ispell.c:82
+#: access/hash/hashovfl.c:547
 #, c-format
-msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "paramètre Ispell non reconnu : « %s »"
+msgid "out of overflow pages in hash index \"%s\""
+msgstr "en dehors des pages surchargées dans l'index haché « %s »"
 
-#: tsearch/dict_ispell.c:96
-msgid "missing AffFile parameter"
-msgstr "paramètre AffFile manquant"
+#: access/hash/hashsearch.c:152
+msgid "hash indexes do not support whole-index scans"
+msgstr "les index hâchés ne supportent pas les parcours complets d'index"
 
-#: tsearch/dict_ispell.c:102
-#: tsearch/dict_thesaurus.c:639
-msgid "missing DictFile parameter"
-msgstr "paramètre DictFile manquant"
+#: access/hash/hashutil.c:170
+#: access/gist/gistutil.c:589
+#: access/nbtree/nbtpage.c:433
+#, c-format
+msgid "index \"%s\" contains unexpected zero page at block %u"
+msgstr "l'index « %s » contient une page zéro inattendue au bloc %u"
 
-#: tsearch/dict_simple.c:59
-msgid "multiple Accept parameters"
-msgstr "multiples paramètres Accept"
+#: access/hash/hashutil.c:173
+#: access/hash/hashutil.c:184
+#: access/hash/hashutil.c:196
+#: access/hash/hashutil.c:217
+#: access/gist/gist.c:718
+#: access/gist/gistutil.c:592
+#: access/gist/gistutil.c:603
+#: access/gist/gistvacuum.c:274
+#: access/nbtree/nbtpage.c:436
+#: access/nbtree/nbtpage.c:447
+msgid "Please REINDEX it."
+msgstr "Merci d'exécuter REINDEX sur cet objet."
 
-#: tsearch/dict_simple.c:67
+#: access/hash/hashutil.c:181
+#: access/hash/hashutil.c:193
+#: access/gist/gistutil.c:600
+#: access/nbtree/nbtpage.c:444
 #, c-format
-msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "paramètre de dictionnaire simple non reconnu : « %s »"
+msgid "index \"%s\" contains corrupted page at block %u"
+msgstr "l'index « %s » contient une page corrompue au bloc %u"
 
-#: tsearch/dict_synonym.c:119
+#: access/hash/hashutil.c:209
 #, c-format
-msgid "unrecognized synonym parameter: \"%s\""
-msgstr "paramètre synonyme non reconnu : « %s »"
+msgid "index \"%s\" is not a hash index"
+msgstr "l'index « %s » n'est pas un index haché"
 
-#: tsearch/dict_synonym.c:126
-msgid "missing Synonyms parameter"
-msgstr "paramètre Synonyms manquant"
+#: access/hash/hashutil.c:215
+#, c-format
+msgid "index \"%s\" has wrong hash version"
+msgstr "l'index « %s » a la mauvaise version de hachage"
 
-#: tsearch/dict_synonym.c:133
+#: access/common/heaptuple.c:646
+#: access/common/heaptuple.c:1398
 #, c-format
-msgid "could not open synonym file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier synonyme « %s » : %m"
+msgid "number of columns (%d) exceeds limit (%d)"
+msgstr "le nombre de colonnes (%d) dépasse la limite (%d)"
 
-#: tsearch/dict_thesaurus.c:180
+#: access/common/indextuple.c:57
 #, c-format
-msgid "could not open thesaurus file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le thésaurus « %s » : %m"
+msgid "number of index columns (%d) exceeds limit (%d)"
+msgstr "le nombre de colonnes indexées (%d) dépasse la limite (%d)"
 
-#: tsearch/dict_thesaurus.c:213
-msgid "unexpected delimiter"
-msgstr "délimiteur inattendu"
+#: access/common/indextuple.c:168
+#, c-format
+msgid "index row requires %lu bytes, maximum size is %lu"
+msgstr "la ligne index requiert %lu octets, la taille maximum est %lu"
 
-#: tsearch/dict_thesaurus.c:263
-#: tsearch/dict_thesaurus.c:279
-msgid "unexpected end of line or lexeme"
-msgstr "fin de ligne ou lexeme inattendu"
+#: access/common/printtup.c:278
+#: tcop/fastpath.c:180
+#: tcop/fastpath.c:554
+#: tcop/postgres.c:1664
+#, c-format
+msgid "unsupported format code: %d"
+msgstr "code de format non supporté : %d"
 
-#: tsearch/dict_thesaurus.c:288
-msgid "unexpected end of line"
-msgstr "fin de ligne inattendue"
+#: access/common/reloptions.c:323
+msgid "user-defined relation parameter types limit exceeded"
+msgstr "limite dépassée des types de paramètres de la relation définie par l'utilisateur"
 
-#: tsearch/dict_thesaurus.c:412
-#, c-format
-msgid "thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"le mot d'exemple « %s » du thésaurus n'est pas reconnu par le\n"
-"sous-dictionnaire (règle %d)"
+#: access/common/reloptions.c:622
+msgid "RESET must not include values for parameters"
+msgstr "RESET ne doit pas inclure de valeurs pour les paramètres"
 
-#: tsearch/dict_thesaurus.c:418
+#: access/common/reloptions.c:655
 #, c-format
-msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr "le mot d'exemple « %s » du thésaurus est un terme courant (règle %d)"
-
-#: tsearch/dict_thesaurus.c:421
-msgid "Use \"?\" to represent a stop word within a sample phrase."
-msgstr "Utilisez « ? » pour représenter un terme courant dans une phrase."
+msgid "unrecognized parameter namespace \"%s\""
+msgstr "espace de nom du paramètre « %s » non reconnu"
 
-#: tsearch/dict_thesaurus.c:567
+#: access/common/reloptions.c:898
 #, c-format
-msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr "le mot substitut « %s » du thésaurus est un terme courant (règle %d)"
+msgid "unrecognized parameter \"%s\""
+msgstr "paramètre « %s » non reconnu"
 
-#: tsearch/dict_thesaurus.c:574
+#: access/common/reloptions.c:923
 #, c-format
-msgid "thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"le mot substitut « %s » du thésaurus n'est pas reconnu par le\n"
-"sous-dictionnaire (règle %d)"
+msgid "parameter \"%s\" specified more than once"
+msgstr "le paramètre « %s » est spécifié plus d'une fois"
 
-#: tsearch/dict_thesaurus.c:586
+#: access/common/reloptions.c:938
 #, c-format
-msgid "thesaurus substitute phrase is empty (rule %d)"
-msgstr "la phrase substitut du thésaurus est vide (règle %d)"
+msgid "invalid value for boolean option \"%s\": %s"
+msgstr "valeur invalide pour l'option booléenne « %s » : %s"
 
-#: tsearch/dict_thesaurus.c:624
-msgid "multiple Dictionary parameters"
-msgstr "multiples paramètres Dictionary"
+#: access/common/reloptions.c:949
+#, c-format
+msgid "invalid value for integer option \"%s\": %s"
+msgstr "valeur invalide pour l'option de type integer « %s » : %s"
 
-#: tsearch/dict_thesaurus.c:631
+#: access/common/reloptions.c:954
+#: access/common/reloptions.c:972
 #, c-format
-msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "paramètre Thesaurus non reconnu : « %s »"
+msgid "value %s out of bounds for option \"%s\""
+msgstr "valeur %s en dehors des limites pour l'option « %s »"
 
-#: tsearch/dict_thesaurus.c:643
-msgid "missing Dictionary parameter"
-msgstr "paramètre Dictionary manquant"
+#: access/common/reloptions.c:956
+#, c-format
+msgid "Valid values are between \"%d\" and \"%d\"."
+msgstr "Les valeurs valides sont entre « %d » et « %d »."
 
-#: tsearch/spell.c:204
+#: access/common/reloptions.c:967
 #, c-format
-msgid "could not open dictionary file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier dictionnaire « %s » : %m"
+msgid "invalid value for floating point option \"%s\": %s"
+msgstr "valeur invalide pour l'option de type float « %s » : %s"
 
-#: tsearch/spell.c:365
-#: utils/adt/regexp.c:190
+#: access/common/reloptions.c:974
 #, c-format
-msgid "invalid regular expression: %s"
-msgstr "expression rationnelle invalide : %s"
+msgid "Valid values are between \"%f\" and \"%f\"."
+msgstr "Les valeurs valides sont entre « %f » et « %f »."
 
-#: tsearch/spell.c:444
-#: tsearch/spell.c:461
-#: tsearch/spell.c:478
-#: tsearch/spell.c:495
-#: tsearch/spell.c:517
-#: gram.y:11474
-#: gram.y:11491
-msgid "syntax error"
-msgstr "erreur de syntaxe"
+#: access/common/tupconvert.c:107
+#, c-format
+msgid "Returned type %s does not match expected type %s in column %d."
+msgstr "Le type %s renvoyé ne correspond pas au type %s attendu dans la colonne %d."
 
-#: tsearch/spell.c:522
-#: tsearch/spell.c:772
-#: tsearch/spell.c:792
-msgid "multibyte flag character is not allowed"
-msgstr "un caractère drapeau multi-octet n'est pas autorisé"
-
-#: tsearch/spell.c:557
-#: tsearch/spell.c:615
-#: tsearch/spell.c:710
+#: access/common/tupconvert.c:135
 #, c-format
-msgid "could not open affix file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier affixe « %s » : %m"
-
-#: tsearch/spell.c:603
-msgid "Ispell dictionary supports only default flag value"
-msgstr "le dictionnaire Ispell supporte seulement la valeur par défaut du drapeau"
-
-#: tsearch/spell.c:803
-msgid "wrong affix file format for flag"
-msgstr "mauvais format de fichier affixe pour le drapeau"
+msgid "Number of returned columns (%d) does not match expected column count (%d)."
+msgstr ""
+"Le nombre de colonnes renvoyées (%d) ne correspond pas au nombre de colonnes\n"
+"attendues (%d)."
 
-#: tsearch/to_tsany.c:165
-#: utils/adt/tsvector.c:272
-#: utils/adt/tsvector_op.c:514
+#: access/common/tupconvert.c:240
 #, c-format
-msgid "string is too long for tsvector (%d bytes, max %d bytes)"
-msgstr "la chaîne est trop longue (%d octets, max %d octets)"
+msgid "Attribute \"%s\" of type %s does not match corresponding attribute of type %s."
+msgstr "L'attribut « %s » du type %s ne correspond pas à l'attribut correspondant de type %s."
 
-#: tsearch/ts_locale.c:168
+#: access/common/tupconvert.c:252
 #, c-format
-msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "ligne %d du fichier de configuration « %s » : « %s »"
+msgid "Attribute \"%s\" of type %s does not exist in type %s."
+msgstr "L'attribut « %s » du type %s n'existe pas dans le type %s."
 
-#: tsearch/ts_locale.c:173
-#: libpq/hba.c:653
-#: libpq/hba.c:669
-#: libpq/hba.c:715
-#: libpq/hba.c:738
-#: libpq/hba.c:750
-#: libpq/hba.c:763
-#: libpq/hba.c:778
-#: libpq/hba.c:825
-#: libpq/hba.c:848
-#: libpq/hba.c:865
-#: libpq/hba.c:878
-#: libpq/hba.c:894
-#: libpq/hba.c:909
-#: libpq/hba.c:949
-#: libpq/hba.c:981
-#: libpq/hba.c:992
-#: libpq/hba.c:1004
-#: libpq/hba.c:1015
-#: libpq/hba.c:1032
-#: libpq/hba.c:1053
-#: libpq/hba.c:1082
-#: libpq/hba.c:1094
-#: libpq/hba.c:1107
-#: libpq/hba.c:1141
-#: libpq/hba.c:1215
-#: libpq/hba.c:1233
-#: libpq/hba.c:1254
-#: libpq/hba.c:1285
-#: libpq/hba.c:1295
+#: access/common/tupdesc.c:575
+#: parser/parse_relation.c:1169
 #, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "ligne %d du fichier de configuration « %s »"
+msgid "column \"%s\" cannot be declared SETOF"
+msgstr "la colonne « %s » ne peut pas être déclarée SETOF"
 
-#: tsearch/ts_locale.c:288
+#: access/gin/ginentrypage.c:101
+#: access/nbtree/nbtinsert.c:531
+#: access/nbtree/nbtsort.c:483
 #, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "échec de l'encodage de wchar_t vers l'encodage du serveur : %m"
+msgid "index row size %lu exceeds maximum %lu for index \"%s\""
+msgstr "la taille de la ligne index, %lu, dépasse le maximum, %lu, pour l'index « %s »"
 
-#: tsearch/ts_parse.c:391
-#: tsearch/ts_parse.c:398
-#: tsearch/ts_parse.c:561
-#: tsearch/ts_parse.c:568
-msgid "word is too long to be indexed"
-msgstr "le mot est trop long pour être indexé"
+#: access/gin/ginscan.c:401
+msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
+msgstr ""
+"les anciens index GIN ne supportent pas les parcours complets d'index et les\n"
+"recherches de valeurs NULL"
 
-#: tsearch/ts_parse.c:392
-#: tsearch/ts_parse.c:399
-#: tsearch/ts_parse.c:562
-#: tsearch/ts_parse.c:569
+#: access/gin/ginscan.c:402
 #, c-format
-msgid "Words longer than %d characters are ignored."
-msgstr "Les mots de plus de %d caractères sont ignorés."
+msgid "To fix this, do REINDEX INDEX \"%s\"."
+msgstr "Pour corriger ceci, faites un REINDEX INDEX « %s »."
 
-#: tsearch/ts_utils.c:53
+#: access/gist/gist.c:230
+msgid "unlogged GiST indexes are not supported"
+msgstr "les index GiST non tracés ne sont pas supportés"
+
+#: access/gist/gist.c:715
+#: access/gist/gistvacuum.c:271
 #, c-format
-msgid "invalid text search configuration file name \"%s\""
-msgstr "nom du fichier de configuration de la recherche plein texte invalide : « %s »"
+msgid "index \"%s\" contains an inner tuple marked as invalid"
+msgstr "l'index « %s » contient une ligne interne marquée comme invalide"
 
-#: tsearch/ts_utils.c:91
+#: access/gist/gist.c:717
+#: access/gist/gistvacuum.c:273
+msgid "This is caused by an incomplete page split at crash recovery before upgrading to PostgreSQL 9.1."
+msgstr ""
+"Ceci est dû à la division d'une page incomplète à la restauration suite à un\n"
+"crash avant la mise à jour en 9.1."
+
+#: access/gist/gistsplit.c:375
 #, c-format
-msgid "could not open stop-word file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier des termes courants « %s » : %m"
+msgid "picksplit method for column %d of index \"%s\" failed"
+msgstr "échec de la méthode picksplit pour la colonne %d de l'index « %s »"
 
-#: tsearch/wparser.c:314
-msgid "text search parser does not support headline creation"
-msgstr "l'analyseur de recherche plein texte ne supporte pas headline"
+#: access/gist/gistsplit.c:377
+msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
+msgstr ""
+"L'index n'est pas optimal. Pour l'optimiser, contactez un développeur\n"
+"ou essayez d'utiliser la colonne comme second dans la commande\n"
+"CREATE INDEX."
 
-#: access/transam/slru.c:595
+#: access/transam/slru.c:609
 #, c-format
 msgid "file \"%s\" doesn't exist, reading as zeroes"
 msgstr "le fichier « %s » n'existe pas, contenu lu comme des zéros"
 
-#: access/transam/slru.c:825
-#: access/transam/slru.c:831
-#: access/transam/slru.c:838
+#: access/transam/slru.c:839
 #: access/transam/slru.c:845
 #: access/transam/slru.c:852
 #: access/transam/slru.c:859
+#: access/transam/slru.c:866
+#: access/transam/slru.c:873
 #, c-format
 msgid "could not access status of transaction %u"
 msgstr "n'a pas pu accéder au statut de la transaction %u"
 
-#: access/transam/slru.c:826
+#: access/transam/slru.c:840
 #, c-format
 msgid "Could not open file \"%s\": %m."
 msgstr "N'a pas pu ouvrir le fichier « %s » : %m"
 
-#: access/transam/slru.c:832
+#: access/transam/slru.c:846
 #, c-format
 msgid "Could not seek in file \"%s\" to offset %u: %m."
 msgstr "N'a pas pu se déplacer dans le fichier « %s » au décalage %u : %m"
 
-#: access/transam/slru.c:839
+#: access/transam/slru.c:853
 #, c-format
 msgid "Could not read from file \"%s\" at offset %u: %m."
 msgstr "N'a pas pu lire le fichier « %s » au décalage %u : %m"
 
-#: access/transam/slru.c:846
+#: access/transam/slru.c:860
 #, c-format
 msgid "Could not write to file \"%s\" at offset %u: %m."
 msgstr "N'a pas pu écrire le fichier « %s » au décalage %u : %m"
 
-#: access/transam/slru.c:853
+#: access/transam/slru.c:867
 #, c-format
 msgid "Could not fsync file \"%s\": %m."
 msgstr "N'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: access/transam/slru.c:860
+#: access/transam/slru.c:874
 #, c-format
 msgid "Could not close file \"%s\": %m."
 msgstr "N'a pas pu fermer le fichier « %s » : %m"
 
-#: access/transam/slru.c:1087
+#: access/transam/slru.c:1101
 #, c-format
 msgid "could not truncate directory \"%s\": apparent wraparound"
 msgstr "n'a pas pu tronquer le répertoire « %s » : contournement apparent"
 
-#: access/transam/slru.c:1168
+#: access/transam/slru.c:1182
 #, c-format
 msgid "removing file \"%s\""
 msgstr "suppression du fichier « %s »"
 
-#: access/transam/twophase.c:247
+#: access/transam/twophase.c:250
 #, c-format
 msgid "transaction identifier \"%s\" is too long"
 msgstr "l'identifiant de la transaction « %s » est trop long"
 
-#: access/transam/twophase.c:254
+#: access/transam/twophase.c:257
 msgid "prepared transactions are disabled"
 msgstr "les transactions préparées sont désactivées"
 
-#: access/transam/twophase.c:255
+#: access/transam/twophase.c:258
 msgid "Set max_prepared_transactions to a nonzero value."
 msgstr "Configure max_prepared_transactions à une valeur différente de zéro."
 
-#: access/transam/twophase.c:288
+#: access/transam/twophase.c:291
 #, c-format
 msgid "transaction identifier \"%s\" is already in use"
 msgstr "l'identifiant de la transaction « %s » est déjà utilisé"
 
-#: access/transam/twophase.c:297
+#: access/transam/twophase.c:300
 msgid "maximum number of prepared transactions reached"
 msgstr "nombre maximum de transactions préparées obtenu"
 
-#: access/transam/twophase.c:298
+#: access/transam/twophase.c:301
 #, c-format
 msgid "Increase max_prepared_transactions (currently %d)."
 msgstr "Augmentez max_prepared_transactions (actuellement %d)."
 
-#: access/transam/twophase.c:418
+#: access/transam/twophase.c:421
 #, c-format
 msgid "prepared transaction with identifier \"%s\" is busy"
 msgstr "la transaction préparée d'identifiant « %s » est occupée"
 
-#: access/transam/twophase.c:426
+#: access/transam/twophase.c:429
 msgid "permission denied to finish prepared transaction"
 msgstr "droit refusé pour terminer la transaction préparée"
 
-#: access/transam/twophase.c:427
+#: access/transam/twophase.c:430
 msgid "Must be superuser or the user that prepared the transaction."
 msgstr "Doit être super-utilisateur ou l'utilisateur qui a préparé la transaction."
 
-#: access/transam/twophase.c:438
+#: access/transam/twophase.c:441
 msgid "prepared transaction belongs to another database"
 msgstr "la transaction préparée appartient à une autre base de données"
 
-#: access/transam/twophase.c:439
+#: access/transam/twophase.c:442
 msgid "Connect to the database where the transaction was prepared to finish it."
 msgstr ""
 "Connectez-vous à la base de données où la transaction a été préparée pour\n"
 "la terminer."
 
-#: access/transam/twophase.c:453
+#: access/transam/twophase.c:456
 #, c-format
 msgid "prepared transaction with identifier \"%s\" does not exist"
 msgstr "la transaction préparée d'identifiant « %s » n'existe pas"
 
-#: access/transam/twophase.c:936
+#: access/transam/twophase.c:939
 msgid "two-phase state file maximum length exceeded"
 msgstr ""
 "longueur maximale dépassée pour le fichier de statut de la validation en\n"
 "deux phase"
 
-#: access/transam/twophase.c:954
+#: access/transam/twophase.c:957
 #, c-format
 msgid "could not create two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu créer le fichier de statut de la validation en deux phases nommé\n"
 "« %s » : %m"
 
-#: access/transam/twophase.c:968
-#: access/transam/twophase.c:985
-#: access/transam/twophase.c:1034
-#: access/transam/twophase.c:1445
-#: access/transam/twophase.c:1452
+#: access/transam/twophase.c:971
+#: access/transam/twophase.c:988
+#: access/transam/twophase.c:1044
+#: access/transam/twophase.c:1465
+#: access/transam/twophase.c:1472
 #, c-format
 msgid "could not write two-phase state file: %m"
 msgstr "n'a pas pu écrire dans le fichier d'état de la validation en deux phases : %m"
 
-#: access/transam/twophase.c:994
+#: access/transam/twophase.c:997
 #, c-format
 msgid "could not seek in two-phase state file: %m"
 msgstr ""
 "n'a pas pu se déplacer dans le fichier de statut de la validation en deux\n"
 "phases : %m"
 
-#: access/transam/twophase.c:1040
-#: access/transam/twophase.c:1470
+#: access/transam/twophase.c:1050
+#: access/transam/twophase.c:1490
 #, c-format
 msgid "could not close two-phase state file: %m"
 msgstr "n'a pas pu fermer le fichier d'état de la validation en deux phases : %m"
 
-#: access/transam/twophase.c:1112
-#: access/transam/twophase.c:1550
+#: access/transam/twophase.c:1130
+#: access/transam/twophase.c:1570
 #, c-format
 msgid "could not open two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu ouvrir le fichier d'état de la validation en deux phases nommé\n"
 "« %s » : %m"
 
-#: access/transam/twophase.c:1129
+#: access/transam/twophase.c:1147
 #, c-format
 msgid "could not stat two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu récupérer des informations sur le fichier d'état de la validation\n"
 "en deux phases nommé « %s » : %m"
 
-#: access/transam/twophase.c:1161
+#: access/transam/twophase.c:1179
 #, c-format
 msgid "could not read two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu lire le fichier d'état de la validation en deux phases nommé\n"
 "« %s » : %m"
 
-#: access/transam/twophase.c:1253
+#: access/transam/twophase.c:1271
 #, c-format
 msgid "two-phase state file for transaction %u is corrupt"
 msgstr ""
 "le fichier d'état de la validation en deux phases est corrompu pour la\n"
 "transaction %u"
 
-#: access/transam/twophase.c:1407
+#: access/transam/twophase.c:1427
 #, c-format
 msgid "could not remove two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu supprimer le fichier d'état de la validation en deux phases\n"
 "« %s » : %m"
 
-#: access/transam/twophase.c:1436
+#: access/transam/twophase.c:1456
 #, c-format
 msgid "could not recreate two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu re-créer le fichier d'état de la validation en deux phases nommé\n"
 "« %s » : %m"
 
-#: access/transam/twophase.c:1464
+#: access/transam/twophase.c:1484
 #, c-format
 msgid "could not fsync two-phase state file: %m"
 msgstr ""
 "n'a pas pu synchroniser sur disque (fsync) le fichier d'état de la\n"
 "validation en deux phases : %m"
 
-#: access/transam/twophase.c:1559
+#: access/transam/twophase.c:1579
 #, c-format
 msgid "could not fsync two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu synchroniser sur disque (fsync) le fichier d'état de la\n"
 "validation en deux phases nommé « %s » : %m"
 
-#: access/transam/twophase.c:1566
+#: access/transam/twophase.c:1586
 #, c-format
 msgid "could not close two-phase state file \"%s\": %m"
 msgstr ""
 "n'a pas pu fermer le fichier d'état de la validation en deux phases nommé\n"
 "« %s » : %m"
 
-#: access/transam/twophase.c:1631
+#: access/transam/twophase.c:1651
 #, c-format
 msgid "removing future two-phase state file \"%s\""
 msgstr "suppression du futur fichier d'état de la validation en deux phases nommé « %s »"
 
-#: access/transam/twophase.c:1647
-#: access/transam/twophase.c:1658
-#: access/transam/twophase.c:1771
-#: access/transam/twophase.c:1782
-#: access/transam/twophase.c:1855
+#: access/transam/twophase.c:1667
+#: access/transam/twophase.c:1678
+#: access/transam/twophase.c:1791
+#: access/transam/twophase.c:1802
+#: access/transam/twophase.c:1875
 #, c-format
 msgid "removing corrupt two-phase state file \"%s\""
 msgstr ""
 "suppression du fichier d'état corrompu de la validation en deux phases nommé\n"
 "« %s »"
 
-#: access/transam/twophase.c:1760
-#: access/transam/twophase.c:1844
+#: access/transam/twophase.c:1780
+#: access/transam/twophase.c:1864
 #, c-format
 msgid "removing stale two-phase state file \"%s\""
 msgstr "suppression du vieux fichier d'état de la validation en deux phases nommé « %s »"
 
-#: access/transam/twophase.c:1862
+#: access/transam/twophase.c:1882
 #, c-format
 msgid "recovering prepared transaction %u"
 msgstr "récupération de la transaction préparée %u"
@@ -893,35 +801,35 @@ msgstr ""
 "la limite de réinitialisation de l'identifiant de transaction est %u,\n"
 "limité par la base de données d'OID %u"
 
-#: access/transam/xact.c:716
+#: access/transam/xact.c:729
 msgid "cannot have more than 2^32-1 commands in a transaction"
 msgstr "ne peux pas avoir plus de 2^32-1 commandes dans une transaction"
 
-#: access/transam/xact.c:1236
+#: access/transam/xact.c:1268
 #, c-format
 msgid "maximum number of committed subtransactions (%d) exceeded"
 msgstr "nombre maximum de sous-transactions validées (%d) dépassé"
 
-#: access/transam/xact.c:1993
+#: access/transam/xact.c:2044
 msgid "cannot PREPARE a transaction that has operated on temporary tables"
 msgstr ""
 "ne peut pas préparer (PREPARE) une transaction qui a travaillé sur des\n"
 "tables temporaires"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2782
+#: access/transam/xact.c:2835
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s ne peut pas être exécuté dans un bloc de transaction"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2792
+#: access/transam/xact.c:2845
 #, c-format
 msgid "%s cannot run inside a subtransaction"
 msgstr "%s ne peut pas être exécuté dans un sous-bloc de transaction"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2802
+#: access/transam/xact.c:2855
 #, c-format
 msgid "%s cannot be executed from a function or multi-command string"
 msgstr ""
@@ -929,495 +837,512 @@ msgstr ""
 "contenant plusieurs commandes"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2853
+#: access/transam/xact.c:2906
 #, c-format
 msgid "%s can only be used in transaction blocks"
 msgstr "%s peut seulement être utilisé dans des blocs de transaction"
 
-#: access/transam/xact.c:3035
+#: access/transam/xact.c:3088
 msgid "there is already a transaction in progress"
 msgstr "une transaction est déjà en cours"
 
-#: access/transam/xact.c:3202
-#: access/transam/xact.c:3294
+#: access/transam/xact.c:3255
+#: access/transam/xact.c:3347
 msgid "there is no transaction in progress"
 msgstr "aucune transaction en cours"
 
-#: access/transam/xact.c:3388
-#: access/transam/xact.c:3438
-#: access/transam/xact.c:3444
-#: access/transam/xact.c:3488
-#: access/transam/xact.c:3536
-#: access/transam/xact.c:3542
+#: access/transam/xact.c:3441
+#: access/transam/xact.c:3491
+#: access/transam/xact.c:3497
+#: access/transam/xact.c:3541
+#: access/transam/xact.c:3589
+#: access/transam/xact.c:3595
 msgid "no such savepoint"
 msgstr "aucun point de sauvegarde"
 
-#: access/transam/xact.c:4172
+#: access/transam/xact.c:4225
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "ne peut pas avoir plus de 2^32-1 sous-transactions dans une transaction"
 
-#: access/transam/xlog.c:1276
+#: access/transam/xlog.c:1329
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier de statut d'archivage « %s » : %m"
 
-#: access/transam/xlog.c:1284
+#: access/transam/xlog.c:1337
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "n'a pas pu écrire le fichier de statut d'archivage « %s » : %m"
 
-#: access/transam/xlog.c:1739
-#: access/transam/xlog.c:9602
-#: replication/walreceiver.c:482
-#: replication/walsender.c:596
+#: access/transam/xlog.c:1792
+#: access/transam/xlog.c:10386
+#: replication/walreceiver.c:510
+#: replication/walsender.c:1003
 #, c-format
 msgid "could not seek in log file %u, segment %u to offset %u: %m"
 msgstr ""
 "n'a pas pu se déplacer dans le journal de transactions %u, du segment %u au\n"
 "segment %u : %m"
 
-#: access/transam/xlog.c:1756
-#: replication/walreceiver.c:499
+#: access/transam/xlog.c:1809
+#: replication/walreceiver.c:527
 #, c-format
 msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
 msgstr ""
 "n'a pas pu écrire le journal de transactions %u, segment %u au décalage %u,\n"
 "longueur %lu : %m"
 
-#: access/transam/xlog.c:1958
+#: access/transam/xlog.c:2011
 #, c-format
 msgid "updated min recovery point to %X/%X"
 msgstr "mise à jour du point minimum de restauration sur %X/%X"
 
-#: access/transam/xlog.c:2299
-#: access/transam/xlog.c:2403
-#: access/transam/xlog.c:2632
-#: access/transam/xlog.c:2703
-#: access/transam/xlog.c:2760
-#: replication/walsender.c:584
+#: access/transam/xlog.c:2352
+#: access/transam/xlog.c:2456
+#: access/transam/xlog.c:2685
+#: access/transam/xlog.c:2756
+#: access/transam/xlog.c:2813
+#: replication/walsender.c:991
 #, c-format
 msgid "could not open file \"%s\" (log file %u, segment %u): %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » (journal de transactions %u, segment %u) : %m"
 
-#: access/transam/xlog.c:2324
-#: access/transam/xlog.c:2457
-#: access/transam/xlog.c:4287
-#: access/transam/xlog.c:8464
-#: access/transam/xlog.c:8619
-#: storage/smgr/md.c:278
+#: access/transam/xlog.c:2377
+#: access/transam/xlog.c:2510
+#: access/transam/xlog.c:4408
+#: access/transam/xlog.c:9034
+#: access/transam/xlog.c:9274
 #: storage/file/copydir.c:172
-#: postmaster/postmaster.c:3645
+#: storage/smgr/md.c:285
+#: postmaster/postmaster.c:3690
 #, c-format
 msgid "could not create file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2356
-#: access/transam/xlog.c:2489
-#: access/transam/xlog.c:4339
-#: access/transam/xlog.c:4395
-#: commands/copy.c:1316
+#: access/transam/xlog.c:2409
+#: access/transam/xlog.c:2542
+#: access/transam/xlog.c:4460
+#: access/transam/xlog.c:4523
 #: storage/file/copydir.c:197
-#: postmaster/postmaster.c:3655
-#: postmaster/postmaster.c:3665
-#: utils/misc/guc.c:7008
-#: utils/misc/guc.c:7033
-#: utils/init/miscinit.c:1054
-#: utils/init/miscinit.c:1063
-#: utils/init/miscinit.c:1070
+#: postmaster/postmaster.c:3700
+#: postmaster/postmaster.c:3710
+#: utils/init/miscinit.c:1089
+#: utils/init/miscinit.c:1098
+#: utils/init/miscinit.c:1105
+#: utils/misc/guc.c:7424
+#: utils/misc/guc.c:7449
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "n'a pas pu écrire dans le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2364
-#: access/transam/xlog.c:2496
-#: access/transam/xlog.c:4401
-#: storage/smgr/md.c:909
-#: storage/smgr/md.c:1083
-#: storage/smgr/md.c:1226
+#: access/transam/xlog.c:2417
+#: access/transam/xlog.c:2549
+#: access/transam/xlog.c:4529
 #: storage/file/copydir.c:269
+#: storage/smgr/md.c:924
+#: storage/smgr/md.c:1130
+#: storage/smgr/md.c:1281
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2369
-#: access/transam/xlog.c:2501
-#: access/transam/xlog.c:4406
+#: access/transam/xlog.c:2422
+#: access/transam/xlog.c:2554
+#: access/transam/xlog.c:4534
+#: commands/copy.c:1329
 #: storage/file/copydir.c:211
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2442
-#: access/transam/xlog.c:4114
-#: access/transam/xlog.c:4208
-#: access/transam/xlog.c:4306
-#: storage/smgr/md.c:532
-#: storage/smgr/md.c:785
+#: access/transam/xlog.c:2495
+#: access/transam/xlog.c:4177
+#: access/transam/xlog.c:4271
+#: access/transam/xlog.c:4427
 #: storage/file/copydir.c:165
 #: storage/file/copydir.c:255
-#: utils/error/elog.c:1403
-#: utils/init/miscinit.c:1005
-#: utils/init/miscinit.c:1118
+#: storage/smgr/md.c:542
+#: storage/smgr/md.c:802
+#: replication/basebackup.c:725
+#: utils/init/miscinit.c:1039
+#: utils/init/miscinit.c:1153
+#: utils/error/elog.c:1497
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2470
-#: access/transam/xlog.c:4318
-#: access/transam/xlog.c:8567
-#: access/transam/xlog.c:8641
-#: access/transam/xlog.c:9024
-#: access/transam/xlog.c:9049
+#: access/transam/xlog.c:2523
+#: access/transam/xlog.c:4439
+#: access/transam/xlog.c:9206
+#: access/transam/xlog.c:9219
+#: access/transam/xlog.c:9753
+#: access/transam/xlog.c:9788
 #: storage/file/copydir.c:186
-#: utils/adt/genfile.c:133
+#: utils/adt/genfile.c:138
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "n'a pas pu lire le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2473
+#: access/transam/xlog.c:2526
 #, c-format
 msgid "not enough data in file \"%s\""
 msgstr "données insuffisantes dans le fichier « %s »"
 
-#: access/transam/xlog.c:2592
+#: access/transam/xlog.c:2645
 #, c-format
 msgid "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m"
 msgstr ""
 "n'a pas pu lier le fichier « %s » à « %s » (initialisation du journal de\n"
 "transactions %u, segment %u) : %m"
 
-#: access/transam/xlog.c:2604
+#: access/transam/xlog.c:2657
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m"
 msgstr ""
 "n'a pas pu renommer le fichier « %s » en « %s » (initialisation du journal\n"
 "de transactions %u, segment %u) : %m"
 
-#: access/transam/xlog.c:2787
-#: replication/walreceiver.c:456
+#: access/transam/xlog.c:2840
+#: replication/walreceiver.c:484
 #, c-format
 msgid "could not close log file %u, segment %u: %m"
 msgstr "n'a pas pu fermer le journal de transactions %u, segment %u : %m"
 
-#: access/transam/xlog.c:2859
-#: access/transam/xlog.c:3024
-#: access/transam/xlog.c:8447
+#: access/transam/xlog.c:2912
+#: access/transam/xlog.c:3077
+#: access/transam/xlog.c:9019
+#: access/transam/xlog.c:9194
 #: storage/file/copydir.c:86
 #: storage/file/copydir.c:125
 #: utils/adt/dbsize.c:65
-#: utils/adt/dbsize.c:217
-#: utils/adt/dbsize.c:288
-#: utils/adt/genfile.c:170
+#: utils/adt/dbsize.c:211
+#: utils/adt/dbsize.c:276
+#: utils/adt/genfile.c:107
+#: utils/adt/genfile.c:279
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n'a pas pu tester le fichier « %s » : %m"
 
-#: access/transam/xlog.c:2867
-#: access/transam/xlog.c:8646
-#: storage/smgr/md.c:348
-#: storage/smgr/md.c:395
-#: storage/smgr/md.c:1192
+#: access/transam/xlog.c:2920
+#: access/transam/xlog.c:9224
+#: storage/smgr/md.c:358
+#: storage/smgr/md.c:405
+#: storage/smgr/md.c:1244
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "n'a pas pu supprimer le fichier « %s » : %m"
 
-#: access/transam/xlog.c:3003
+#: access/transam/xlog.c:3056
 #, c-format
 msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
 msgstr "le fichier d'archive « %s » a la mauvaise taille : %lu au lieu de %lu"
 
-#: access/transam/xlog.c:3012
+#: access/transam/xlog.c:3065
 #, c-format
 msgid "restored log file \"%s\" from archive"
 msgstr "restauration du journal de transactions « %s » à partir de l'archive"
 
-#: access/transam/xlog.c:3062
+#: access/transam/xlog.c:3115
 #, c-format
 msgid "could not restore file \"%s\" from archive: return code %d"
 msgstr "n'a pas pu restaurer le fichier « %s » à partir de l'archive : code de retour %d"
 
-#: access/transam/xlog.c:3177
+#. translator: First %s represents a recovery.conf parameter name like
+#. "recovery_end_command", and the 2nd is the value of that parameter.
+#: access/transam/xlog.c:3229
 #, c-format
 msgid "%s \"%s\": return code %d"
 msgstr "%s « %s » : code de retour %d"
 
-#: access/transam/xlog.c:3287
-#: access/transam/xlog.c:3470
+#: access/transam/xlog.c:3339
+#: access/transam/xlog.c:3522
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire des journaux de transactions « %s » : %m"
 
-#: access/transam/xlog.c:3341
+#: access/transam/xlog.c:3393
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "recyclage du journal de transactions « %s »"
 
-#: access/transam/xlog.c:3357
+#: access/transam/xlog.c:3409
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "suppression du journal de transactions « %s »"
 
-#: access/transam/xlog.c:3380
+#: access/transam/xlog.c:3432
 #, c-format
 msgid "could not rename old transaction log file \"%s\": %m"
 msgstr "n'a pas pu renommer l'ancien journal de transactions « %s » : %m"
 
-#: access/transam/xlog.c:3392
+#: access/transam/xlog.c:3444
 #, c-format
 msgid "could not remove old transaction log file \"%s\": %m"
 msgstr "n'a pas pu supprimer l'ancien journal de transaction « %s » : %m"
 
-#: access/transam/xlog.c:3430
-#: access/transam/xlog.c:3440
+#: access/transam/xlog.c:3482
+#: access/transam/xlog.c:3492
 #, c-format
 msgid "required WAL directory \"%s\" does not exist"
 msgstr "le répertoire « %s » requis pour les journaux de transactions n'existe pas"
 
-#: access/transam/xlog.c:3446
+#: access/transam/xlog.c:3498
 #, c-format
 msgid "creating missing WAL directory \"%s\""
 msgstr "création du répertoire manquant « %s » pour les journaux de transactions"
 
-#: access/transam/xlog.c:3449
+#: access/transam/xlog.c:3501
 #, c-format
 msgid "could not create missing directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » manquant : %m"
 
-#: access/transam/xlog.c:3483
+#: access/transam/xlog.c:3535
 #, c-format
 msgid "removing transaction log backup history file \"%s\""
 msgstr "suppression du fichier historique des journaux de transaction « %s »"
 
-#: access/transam/xlog.c:3603
+#: access/transam/xlog.c:3655
 #, c-format
 msgid "incorrect hole size in record at %X/%X"
 msgstr "taille du trou incorrect à l'enregistrement %X/%X"
 
-#: access/transam/xlog.c:3616
+#: access/transam/xlog.c:3668
 #, c-format
 msgid "incorrect total length in record at %X/%X"
 msgstr "longueur totale incorrecte à l'enregistrement %X/%X"
 
-#: access/transam/xlog.c:3629
+#: access/transam/xlog.c:3681
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "somme de contrôle des données du gestionnaire de ressources incorrecte à\n"
 "l'enregistrement %X/%X"
 
-#: access/transam/xlog.c:3698
-#: access/transam/xlog.c:3734
+#: access/transam/xlog.c:3759
+#: access/transam/xlog.c:3797
 #, c-format
 msgid "invalid record offset at %X/%X"
 msgstr "décalage invalide de l'enregistrement %X/%X"
 
-#: access/transam/xlog.c:3742
+#: access/transam/xlog.c:3805
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "« contrecord » est requis par %X/%X"
 
-#: access/transam/xlog.c:3757
+#: access/transam/xlog.c:3820
 #, c-format
 msgid "invalid xlog switch record at %X/%X"
 msgstr "enregistrement de basculement du journal de transaction invalide à %X/%X"
 
-#: access/transam/xlog.c:3765
+#: access/transam/xlog.c:3828
 #, c-format
 msgid "record with zero length at %X/%X"
 msgstr "enregistrement de longueur nulle à %X/%X"
 
-#: access/transam/xlog.c:3774
+#: access/transam/xlog.c:3837
 #, c-format
 msgid "invalid record length at %X/%X"
 msgstr "longueur invalide de l'enregistrement à %X/%X"
 
-#: access/transam/xlog.c:3781
+#: access/transam/xlog.c:3844
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "identifiant du gestionnaire de ressources invalide %u à %X/%X"
 
-#: access/transam/xlog.c:3794
-#: access/transam/xlog.c:3810
+#: access/transam/xlog.c:3857
+#: access/transam/xlog.c:3873
 #, c-format
 msgid "record with incorrect prev-link %X/%X at %X/%X"
 msgstr "enregistrement avec prev-link %X/%X incorrect à %X/%X"
 
-#: access/transam/xlog.c:3839
+#: access/transam/xlog.c:3902
 #, c-format
 msgid "record length %u at %X/%X too long"
 msgstr "longueur trop importante de l'enregistrement %u à %X/%X"
 
-#: access/transam/xlog.c:3879
+#: access/transam/xlog.c:3942
 #, c-format
 msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 "il n'y a pas de drapeaux « contrecord » dans le journal de transactions %u,\n"
 "segment %u, décalage %u"
 
-#: access/transam/xlog.c:3889
+#: access/transam/xlog.c:3952
 #, c-format
 msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 msgstr ""
 "longueur invalide du « contrecord » %u dans le journal de tranasctions %u,\n"
 "segment %u, décalage %u"
 
-#: access/transam/xlog.c:3979
+#: access/transam/xlog.c:4042
 #, c-format
 msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 "numéro magique invalide %04X dans le journal de transactions %u, segment %u,\n"
 "décalage %u"
 
-#: access/transam/xlog.c:3986
-#: access/transam/xlog.c:4032
+#: access/transam/xlog.c:4049
+#: access/transam/xlog.c:4095
 #, c-format
 msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 "bits info %04X invalides dans le journal de transactions %u, segment %u,\n"
 "décalage %u"
 
-#: access/transam/xlog.c:4008
-#: access/transam/xlog.c:4016
-#: access/transam/xlog.c:4023
+#: access/transam/xlog.c:4071
+#: access/transam/xlog.c:4079
+#: access/transam/xlog.c:4086
 msgid "WAL file is from different database system"
 msgstr "le journal de transactions provient d'un système de bases de données différent"
 
-#: access/transam/xlog.c:4009
+#: access/transam/xlog.c:4072
 #, c-format
 msgid "WAL file database system identifier is %s, pg_control database system identifier is %s."
 msgstr ""
 "L'identifiant du journal de transactions du système de base de données est %s,\n"
 "l'identifiant de pg_control du système de base de données est %s."
 
-#: access/transam/xlog.c:4017
+#: access/transam/xlog.c:4080
 msgid "Incorrect XLOG_SEG_SIZE in page header."
 msgstr "XLOG_SEG_SIZE incorrecte dans l'en-tête de page."
 
-#: access/transam/xlog.c:4024
+#: access/transam/xlog.c:4087
 msgid "Incorrect XLOG_BLCKSZ in page header."
 msgstr "XLOG_BLCKSZ incorrect dans l'en-tête de page."
 
-#: access/transam/xlog.c:4040
+#: access/transam/xlog.c:4103
 #, c-format
 msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 "pageaddr %X/%X inattendue dans le journal de transactions %u, segment %u,\n"
 "décalage %u"
 
-#: access/transam/xlog.c:4052
+#: access/transam/xlog.c:4115
 #, c-format
 msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
 msgstr ""
 "identifiant timeline %u inattendu dans le journal de transactions %u,\n"
 "segment %u, décalage %u"
 
-#: access/transam/xlog.c:4070
+#: access/transam/xlog.c:4133
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset %u"
 msgstr ""
 "identifiant timeline %u hors de la séquence (après %u) dans le journal de\n"
 "transactions %u, segment %u, décalage %u"
 
-#: access/transam/xlog.c:4143
+#: access/transam/xlog.c:4206
 #, c-format
 msgid "syntax error in history file: %s"
 msgstr "erreur de syntaxe dans le fichier historique : %s"
 
-#: access/transam/xlog.c:4144
+#: access/transam/xlog.c:4207
 msgid "Expected a numeric timeline ID."
 msgstr "Identifiant timeline numérique attendue"
 
-#: access/transam/xlog.c:4149
+#: access/transam/xlog.c:4212
 #, c-format
 msgid "invalid data in history file: %s"
 msgstr "données invalides dans le fichier historique : « %s »"
 
-#: access/transam/xlog.c:4150
+#: access/transam/xlog.c:4213
 msgid "Timeline IDs must be in increasing sequence."
 msgstr "Les identifiants timeline doivent être en ordre croissant."
 
-#: access/transam/xlog.c:4163
+#: access/transam/xlog.c:4226
 #, c-format
 msgid "invalid data in history file \"%s\""
 msgstr "données invalides dans le fichier historique « %s »"
 
-#: access/transam/xlog.c:4164
+#: access/transam/xlog.c:4227
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr ""
 "Les identifiants timeline doivent être plus petits que les enfants des\n"
 "identifiants timeline."
 
-#: access/transam/xlog.c:4423
+#: access/transam/xlog.c:4313
+#, c-format
+msgid "new timeline %u is not a child of database system timeline %u"
+msgstr ""
+"le nouveau timeline %u n'est pas un fils du timeline %u du système de bases\n"
+"de données"
+
+#: access/transam/xlog.c:4326
+#, c-format
+msgid "new target timeline is %u"
+msgstr "la nouvelle timeline cible est %u"
+
+#: access/transam/xlog.c:4551
 #, c-format
 msgid "could not link file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu lier le fichier « %s » à « %s » : %m"
 
-#: access/transam/xlog.c:4430
-#: access/transam/xlog.c:5385
-#: access/transam/xlog.c:5438
-#: access/transam/xlog.c:6030
+#: access/transam/xlog.c:4558
+#: access/transam/xlog.c:5518
+#: access/transam/xlog.c:5571
+#: access/transam/xlog.c:6350
 #: postmaster/pgarch.c:715
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n'a pas pu renommer le fichier « %s » en « %s » : %m"
 
-#: access/transam/xlog.c:4512
+#: access/transam/xlog.c:4640
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier de contrôle « %s » : %m"
 
-#: access/transam/xlog.c:4523
-#: access/transam/xlog.c:4748
+#: access/transam/xlog.c:4651
+#: access/transam/xlog.c:4876
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "n'a pas pu écrire le fichier de contrôle : %m"
 
-#: access/transam/xlog.c:4529
-#: access/transam/xlog.c:4754
+#: access/transam/xlog.c:4657
+#: access/transam/xlog.c:4882
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "n'a pas pu synchroniser sur disque (fsync) le fichier de contrôle : %m"
 
-#: access/transam/xlog.c:4534
-#: access/transam/xlog.c:4759
+#: access/transam/xlog.c:4662
+#: access/transam/xlog.c:4887
 #, c-format
 msgid "could not close control file: %m"
 msgstr "n'a pas pu fermer le fichier de contrôle : %m"
 
-#: access/transam/xlog.c:4552
-#: access/transam/xlog.c:4737
+#: access/transam/xlog.c:4680
+#: access/transam/xlog.c:4865
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier de contrôle « %s » : %m"
 
-#: access/transam/xlog.c:4558
+#: access/transam/xlog.c:4686
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "n'a pas pu lire le fichier de contrôle : %m"
 
-#: access/transam/xlog.c:4571
-#: access/transam/xlog.c:4580
-#: access/transam/xlog.c:4604
-#: access/transam/xlog.c:4611
-#: access/transam/xlog.c:4618
-#: access/transam/xlog.c:4623
-#: access/transam/xlog.c:4630
-#: access/transam/xlog.c:4637
-#: access/transam/xlog.c:4644
-#: access/transam/xlog.c:4651
-#: access/transam/xlog.c:4658
-#: access/transam/xlog.c:4665
-#: access/transam/xlog.c:4674
-#: access/transam/xlog.c:4681
-#: access/transam/xlog.c:4690
-#: access/transam/xlog.c:4697
-#: access/transam/xlog.c:4706
-#: access/transam/xlog.c:4713
-#: utils/init/miscinit.c:1136
+#: access/transam/xlog.c:4699
+#: access/transam/xlog.c:4708
+#: access/transam/xlog.c:4732
+#: access/transam/xlog.c:4739
+#: access/transam/xlog.c:4746
+#: access/transam/xlog.c:4751
+#: access/transam/xlog.c:4758
+#: access/transam/xlog.c:4765
+#: access/transam/xlog.c:4772
+#: access/transam/xlog.c:4779
+#: access/transam/xlog.c:4786
+#: access/transam/xlog.c:4793
+#: access/transam/xlog.c:4802
+#: access/transam/xlog.c:4809
+#: access/transam/xlog.c:4818
+#: access/transam/xlog.c:4825
+#: access/transam/xlog.c:4834
+#: access/transam/xlog.c:4841
+#: utils/init/miscinit.c:1171
 msgid "database files are incompatible with server"
 msgstr "les fichiers de la base de données sont incompatibles avec le serveur"
 
-#: access/transam/xlog.c:4572
+#: access/transam/xlog.c:4700
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
 msgstr ""
@@ -1425,304 +1350,282 @@ msgstr ""
 "%d (0x%08x) alors que le serveur a été compilé avec un PG_CONTROL_VERSION à\n"
 "%d (0x%08x)."
 
-#: access/transam/xlog.c:4576
+#: access/transam/xlog.c:4704
 msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
 msgstr ""
 "Ceci peut être un problème d'incohérence dans l'ordre des octets.\n"
 "Il se peut que vous ayez besoin d'initdb."
 
-#: access/transam/xlog.c:4581
+#: access/transam/xlog.c:4709
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr ""
 "Le cluster de base de données a été initialisé avec un PG_CONTROL_VERSION à\n"
 "%d alors que le serveur a été compilé avec un PG_CONTROL_VERSION à %d."
 
-#: access/transam/xlog.c:4584
-#: access/transam/xlog.c:4608
-#: access/transam/xlog.c:4615
-#: access/transam/xlog.c:4620
+#: access/transam/xlog.c:4712
+#: access/transam/xlog.c:4736
+#: access/transam/xlog.c:4743
+#: access/transam/xlog.c:4748
 msgid "It looks like you need to initdb."
 msgstr "Il semble que vous avez besoin d'initdb."
 
-#: access/transam/xlog.c:4595
+#: access/transam/xlog.c:4723
 msgid "incorrect checksum in control file"
 msgstr "somme de contrôle incorrecte dans le fichier de contrôle"
 
-#: access/transam/xlog.c:4605
+#: access/transam/xlog.c:4733
 #, c-format
 msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
 msgstr ""
 "Le cluster de base de données a été initialisé avec un CATALOG_VERSION_NO à\n"
 "%d alors que le serveur a été compilé avec un CATALOG_VERSION_NO à %d."
 
-#: access/transam/xlog.c:4612
+#: access/transam/xlog.c:4740
 #, c-format
 msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
 msgstr ""
 "Le cluster de bases de données a été initialisé avec un MAXALIGN à %d alors\n"
 "que le serveur a été compilé avec un MAXALIGN à %d."
 
-#: access/transam/xlog.c:4619
+#: access/transam/xlog.c:4747
 msgid "The database cluster appears to use a different floating-point number format than the server executable."
 msgstr ""
 "Le cluster de bases de données semble utiliser un format différent pour les\n"
 "nombres à virgule flottante de celui de l'exécutable serveur."
 
-#: access/transam/xlog.c:4624
+#: access/transam/xlog.c:4752
 #, c-format
 msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
 msgstr ""
 "Le cluster de base de données a été initialisé avec un BLCKSZ à %d alors que\n"
 "le serveur a été compilé avec un BLCKSZ à %d."
 
-#: access/transam/xlog.c:4627
-#: access/transam/xlog.c:4634
-#: access/transam/xlog.c:4641
-#: access/transam/xlog.c:4648
-#: access/transam/xlog.c:4655
-#: access/transam/xlog.c:4662
-#: access/transam/xlog.c:4669
-#: access/transam/xlog.c:4677
-#: access/transam/xlog.c:4684
-#: access/transam/xlog.c:4693
-#: access/transam/xlog.c:4700
-#: access/transam/xlog.c:4709
-#: access/transam/xlog.c:4716
+#: access/transam/xlog.c:4755
+#: access/transam/xlog.c:4762
+#: access/transam/xlog.c:4769
+#: access/transam/xlog.c:4776
+#: access/transam/xlog.c:4783
+#: access/transam/xlog.c:4790
+#: access/transam/xlog.c:4797
+#: access/transam/xlog.c:4805
+#: access/transam/xlog.c:4812
+#: access/transam/xlog.c:4821
+#: access/transam/xlog.c:4828
+#: access/transam/xlog.c:4837
+#: access/transam/xlog.c:4844
 msgid "It looks like you need to recompile or initdb."
 msgstr "Il semble que vous avez besoin de recompiler ou de relancer initdb."
 
-#: access/transam/xlog.c:4631
+#: access/transam/xlog.c:4759
 #, c-format
 msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
 msgstr ""
 "Le cluster de bases de données a été initialisé avec un RELSEG_SIZE à %d\n"
 "alors que le serveur a été compilé avec un RELSEG_SIZE à %d."
 
-#: access/transam/xlog.c:4638
+#: access/transam/xlog.c:4766
 #, c-format
 msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
 msgstr ""
 "Le cluster de base de données a été initialisé avec un XLOG_BLCKSZ à %d\n"
 "alors que le serveur a été compilé avec un XLOG_BLCKSZ à %d."
 
-#: access/transam/xlog.c:4645
+#: access/transam/xlog.c:4773
 #, c-format
 msgid "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server was compiled with XLOG_SEG_SIZE %d."
 msgstr ""
 "Le cluster de bases de données a été initialisé avec un XLOG_SEG_SIZE à %d\n"
 "alors que le serveur a été compilé avec un XLOG_SEG_SIZE à %d."
 
-#: access/transam/xlog.c:4652
+#: access/transam/xlog.c:4780
 #, c-format
 msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
 msgstr ""
 "Le cluster de bases de données a été initialisé avec un NAMEDATALEN à %d\n"
 "alors que le serveur a été compilé avec un NAMEDATALEN à %d."
 
-#: access/transam/xlog.c:4659
+#: access/transam/xlog.c:4787
 #, c-format
 msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
 msgstr ""
 "Le groupe de bases de données a été initialisé avec un INDEX_MAX_KEYS à %d\n"
 "alors que le serveur a été compilé avec un INDEX_MAX_KEYS à %d."
 
-#: access/transam/xlog.c:4666
+#: access/transam/xlog.c:4794
 #, c-format
 msgid "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the server was compiled with TOAST_MAX_CHUNK_SIZE %d."
 msgstr ""
 "Le cluster de bases de données a été initialisé avec un TOAST_MAX_CHUNK_SIZE\n"
 "à %d alors que le serveur a été compilé avec un TOAST_MAX_CHUNK_SIZE à %d."
 
-#: access/transam/xlog.c:4675
+#: access/transam/xlog.c:4803
 msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
 msgstr "Le cluster de bases de données a été initialisé sans HAVE_INT64_TIMESTAMPalors que le serveur a été compilé avec."
 
-#: access/transam/xlog.c:4682
+#: access/transam/xlog.c:4810
 msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr ""
 "Le cluster de bases de données a été initialisé avec HAVE_INT64_TIMESTAMP\n"
 "alors que le serveur a été compilé sans."
 
-#: access/transam/xlog.c:4691
+#: access/transam/xlog.c:4819
 msgid "The database cluster was initialized without USE_FLOAT4_BYVAL but the server was compiled with USE_FLOAT4_BYVAL."
 msgstr ""
 "Le cluster de base de données a été initialisé sans USE_FLOAT4_BYVAL\n"
 "alors que le serveur a été compilé avec USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4698
+#: access/transam/xlog.c:4826
 msgid "The database cluster was initialized with USE_FLOAT4_BYVAL but the server was compiled without USE_FLOAT4_BYVAL."
 msgstr ""
 "Le cluster de base de données a été initialisé avec USE_FLOAT4_BYVAL\n"
 "alors que le serveur a été compilé sans USE_FLOAT4_BYVAL."
 
-#: access/transam/xlog.c:4707
+#: access/transam/xlog.c:4835
 msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
 msgstr ""
 "Le cluster de base de données a été initialisé sans USE_FLOAT8_BYVAL\n"
 "alors que le serveur a été compilé avec USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4714
+#: access/transam/xlog.c:4842
 msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
 msgstr ""
 "Le cluster de base de données a été initialisé avec USE_FLOAT8_BYVAL\n"
 "alors que le serveur a été compilé sans USE_FLOAT8_BYVAL."
 
-#: access/transam/xlog.c:4963
+#: access/transam/xlog.c:5167
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr "n'a pas pu écrire le « bootstrap » du journal des transactions : %m"
 
-#: access/transam/xlog.c:4969
+#: access/transam/xlog.c:5173
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr ""
 "n'a pas pu synchroniser sur disque (fsync) le « bootstrap » du journal des\n"
 "transactions : %m"
 
-#: access/transam/xlog.c:4974
+#: access/transam/xlog.c:5178
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr "n'a pas pu fermer le « bootstrap » du journal des transactions : %m"
 
-#: access/transam/xlog.c:5136
+#: access/transam/xlog.c:5245
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier de restauration « %s » : %m"
 
-#: access/transam/xlog.c:5160
-#, c-format
-msgid "restore_command = '%s'"
-msgstr "restore_command = '%s'"
-
-#: access/transam/xlog.c:5167
-#, c-format
-msgid "recovery_end_command = '%s'"
-msgstr "recovery_end_command = '%s'"
-
-#: access/transam/xlog.c:5174
+#: access/transam/xlog.c:5283
+#: access/transam/xlog.c:5374
+#: access/transam/xlog.c:5385
+#: commands/extension.c:526
+#: commands/extension.c:534
+#: utils/misc/guc.c:5307
 #, c-format
-msgid "archive_cleanup_command = '%s'"
-msgstr "archive_cleanup_command = '%s'"
+msgid "parameter \"%s\" requires a Boolean value"
+msgstr "le paramètre « %s » requiert une valeur booléenne"
 
-#: access/transam/xlog.c:5188
+#: access/transam/xlog.c:5299
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr "recovery_target_timeline n'est pas un nombre valide : « %s »"
 
-#: access/transam/xlog.c:5193
-#, c-format
-msgid "recovery_target_timeline = %u"
-msgstr "recovery_target_timeline = %u"
-
-#: access/transam/xlog.c:5196
-msgid "recovery_target_timeline = latest"
-msgstr "recovery_target_timeline = latest"
-
-#: access/transam/xlog.c:5204
+#: access/transam/xlog.c:5315
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr "recovery_target_xid n'est pas un nombre valide : « %s »"
 
-#: access/transam/xlog.c:5207
-#, c-format
-msgid "recovery_target_xid = %u"
-msgstr "recovery_target_xid = %u"
-
-#: access/transam/xlog.c:5230
-#, c-format
-msgid "recovery_target_time = '%s'"
-msgstr "recovery_target_time = '%s'"
-
-#: access/transam/xlog.c:5241
-#: access/transam/xlog.c:5250
-#: utils/misc/guc.c:4895
-#, c-format
-msgid "parameter \"%s\" requires a Boolean value"
-msgstr "le paramètre « %s » requiert une valeur booléenne"
-
-#: access/transam/xlog.c:5243
-#, c-format
-msgid "recovery_target_inclusive = %s"
-msgstr "recovery_target_inclusive = %s"
-
-#: access/transam/xlog.c:5252
-#, c-format
-msgid "standby_mode = '%s'"
-msgstr "standby_mode = '%s'"
-
-#: access/transam/xlog.c:5258
-#, c-format
-msgid "primary_conninfo = '%s'"
-msgstr "primary_conninfo = '%s'"
-
-#: access/transam/xlog.c:5265
+#: access/transam/xlog.c:5359
 #, c-format
-msgid "trigger_file = '%s'"
-msgstr "trigger_file = '%s'"
+msgid "recovery_target_name is too long (maximum %d characters)"
+msgstr "recovery_target_name est trop long (%d caractères maximum)"
 
-#: access/transam/xlog.c:5270
+#: access/transam/xlog.c:5406
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "paramètre de restauration « %s » non reconnu"
 
-#: access/transam/xlog.c:5278
-#, c-format
-msgid "syntax error in recovery command file: %s"
-msgstr "erreur de syntaxe dans le fichier de restauration : %s"
-
-#: access/transam/xlog.c:5280
-msgid "Lines should have the format parameter = 'value'."
-msgstr "Les lignes devraient avoir le format paramètre = 'valeur'"
-
-#: access/transam/xlog.c:5289
+#: access/transam/xlog.c:5417
 #, c-format
 msgid "recovery command file \"%s\" specified neither primary_conninfo nor restore_command"
 msgstr "le fichier de restauration « %s » n'a spécifié ni primary_conninfo ni restore_command"
 
-#: access/transam/xlog.c:5291
+#: access/transam/xlog.c:5419
 msgid "The database server will regularly poll the pg_xlog subdirectory to check for files placed there."
 msgstr ""
 "Le serveur de la base de données va régulièrement interroger le sous-répertoire\n"
 "pg_xlog pour vérifier les fichiers placés ici."
 
-#: access/transam/xlog.c:5297
+#: access/transam/xlog.c:5425
 #, c-format
 msgid "recovery command file \"%s\" must specify restore_command when standby mode is not enabled"
 msgstr ""
 "le fichier de restauration « %s » doit spécifier restore_command quand le mode\n"
 "de restauration n'est pas activé"
 
-#: access/transam/xlog.c:5317
+#: access/transam/xlog.c:5445
 #, c-format
 msgid "recovery target timeline %u does not exist"
 msgstr "le timeline cible, %u, de la restauration n'existe pas"
 
-#: access/transam/xlog.c:5442
+#: access/transam/xlog.c:5575
 msgid "archive recovery complete"
 msgstr "restauration terminée de l'archive"
 
-#: access/transam/xlog.c:5532
+#: access/transam/xlog.c:5693
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "arrêt de la restauration après validation de la transaction %u, %s"
 
-#: access/transam/xlog.c:5537
+#: access/transam/xlog.c:5698
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "arrêt de la restauration avant validation de la transaction %u, %s"
 
-#: access/transam/xlog.c:5545
+#: access/transam/xlog.c:5706
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "arrêt de la restauration après annulation de la transaction %u, %s"
 
-#: access/transam/xlog.c:5550
+#: access/transam/xlog.c:5711
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "arrêt de la restauration avant annulation de la transaction %u, %s"
 
-#: access/transam/xlog.c:5633
+#: access/transam/xlog.c:5720
+#, c-format
+msgid "recovery stopping at restore point \"%s\", time %s"
+msgstr "restauration en arrêt au point de restauration « %s », heure %s"
+
+#: access/transam/xlog.c:5748
+msgid "recovery has paused"
+msgstr "restauration en pause"
+
+#: access/transam/xlog.c:5749
+msgid "Execute pg_xlog_replay_resume() to continue."
+msgstr "Exécuter pg_xlog_replay_resume() pour continuer."
+
+#: access/transam/xlog.c:5792
+#: access/transam/xlog.c:5814
+#: access/transam/xlog.c:5836
+msgid "must be superuser to control recovery"
+msgstr "doit être super-utilisateur pour contrôler la restauration"
+
+#: access/transam/xlog.c:5797
+#: access/transam/xlog.c:5819
+#: access/transam/xlog.c:5841
+msgid "recovery is not in progress"
+msgstr "la restauration n'est pas en cours"
+
+#: access/transam/xlog.c:5798
+#: access/transam/xlog.c:5820
+#: access/transam/xlog.c:5842
+msgid "Recovery control functions can only be executed during recovery."
+msgstr ""
+"Les fonctions de contrôle de la restauration peuvent seulement être exécutées\n"
+"lors de la restauration."
+
+#: access/transam/xlog.c:5934
 #, c-format
 msgid "hot standby is not possible because %s = %d is a lower setting than on the master server (its value was %d)"
 msgstr ""
@@ -1730,1038 +1633,784 @@ msgstr ""
 "paramètrage plus bas que celui du serveur maître des journaux de transactions\n"
 "(la valeur était %d)"
 
-#: access/transam/xlog.c:5655
+#: access/transam/xlog.c:5956
 msgid "WAL was generated with wal_level=minimal, data may be missing"
 msgstr ""
 "le journal de transactions a été généré avec le paramètre wal_level configuré\n"
 "à « minimal », des données pourraient manquer"
 
-#: access/transam/xlog.c:5656
+#: access/transam/xlog.c:5957
 msgid "This happens if you temporarily set wal_level=minimal without taking a new base backup."
 msgstr ""
 "Ceci peut arriver si vous configurez temporairement wal_level à minimal sans avoir\n"
 "pris une nouvelle sauvegarde de base."
 
-#: access/transam/xlog.c:5667
+#: access/transam/xlog.c:5968
 msgid "hot standby is not possible because wal_level was not set to \"hot_standby\" on the master server"
 msgstr ""
 "les connexions en restauration ne sont pas possibles parce que le paramètre\n"
 "wal_level n'a pas été configuré à « hot_standby » sur le serveur maître"
 
-#: access/transam/xlog.c:5668
+#: access/transam/xlog.c:5969
 msgid "Either set wal_level to \"hot_standby\" on the master, or turn off hot_standby here."
 msgstr ""
 "Soit vous initialisez wal_level à « hot_standby » sur le maître, soit vous\n"
 "désactivez hot_standby ici."
 
-#: access/transam/xlog.c:5715
+#: access/transam/xlog.c:6017
 msgid "control file contains invalid data"
 msgstr "le fichier de contrôle contient des données invalides"
 
-#: access/transam/xlog.c:5719
+#: access/transam/xlog.c:6021
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "le système de bases de données a été arrêté à %s"
 
-#: access/transam/xlog.c:5723
+#: access/transam/xlog.c:6025
 #, c-format
 msgid "database system was shut down in recovery at %s"
 msgstr "le système de bases de données a été arrêté pendant la restauration à %s"
 
-#: access/transam/xlog.c:5727
+#: access/transam/xlog.c:6029
 #, c-format
 msgid "database system shutdown was interrupted; last known up at %s"
 msgstr "le système de bases de données a été interrompu ; dernier lancement connu à %s"
 
-#: access/transam/xlog.c:5731
+#: access/transam/xlog.c:6033
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "le système de bases de données a été interrompu lors d'une restauration à %s"
 
-#: access/transam/xlog.c:5733
+#: access/transam/xlog.c:6035
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr ""
 "Ceci signifie probablement que des données ont été corrompues et que vous\n"
 "devrez utiliser la dernière sauvegarde pour la restauration."
 
-#: access/transam/xlog.c:5737
+#: access/transam/xlog.c:6039
 #, c-format
 msgid "database system was interrupted while in recovery at log time %s"
 msgstr ""
 "le système de bases de données a été interrompu lors d'une récupération à %s\n"
 "(moment de la journalisation)"
 
-#: access/transam/xlog.c:5739
+#: access/transam/xlog.c:6041
 msgid "If this has occurred more than once some data might be corrupted and you might need to choose an earlier recovery target."
 msgstr ""
 "Si c'est arrivé plus d'une fois, des données ont pu être corrompues et vous\n"
 "pourriez avoir besoin de choisir une cible de récupération antérieure."
 
-#: access/transam/xlog.c:5743
+#: access/transam/xlog.c:6045
 #, c-format
 msgid "database system was interrupted; last known up at %s"
 msgstr "le système de bases de données a été interrompu ; dernier lancement connu à %s"
 
-#: access/transam/xlog.c:5792
+#: access/transam/xlog.c:6094
 #, c-format
 msgid "requested timeline %u is not a child of database system timeline %u"
 msgstr ""
 "le timeline requis %u n'est pas un fils du timeline %u du système de bases\n"
 "de données"
 
-#: access/transam/xlog.c:5810
+#: access/transam/xlog.c:6112
 msgid "entering standby mode"
 msgstr "entre en mode standby"
 
-#: access/transam/xlog.c:5813
+#: access/transam/xlog.c:6115
 #, c-format
 msgid "starting point-in-time recovery to XID %u"
 msgstr "début de la restauration de l'archive au XID %u"
 
-#: access/transam/xlog.c:5817
+#: access/transam/xlog.c:6119
 #, c-format
 msgid "starting point-in-time recovery to %s"
 msgstr "début de la restauration de l'archive à %s"
 
-#: access/transam/xlog.c:5821
+#: access/transam/xlog.c:6123
+#, c-format
+msgid "starting point-in-time recovery to \"%s\""
+msgstr "début de la restauration PITR à « %s »"
+
+#: access/transam/xlog.c:6127
 msgid "starting archive recovery"
 msgstr "début de la restauration de l'archive"
 
-#: access/transam/xlog.c:5836
-#: access/transam/xlog.c:5876
+#: access/transam/xlog.c:6149
+#: access/transam/xlog.c:6189
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "l'enregistrement du point de vérification est à %X/%X"
 
-#: access/transam/xlog.c:5850
+#: access/transam/xlog.c:6163
 msgid "could not find redo location referenced by checkpoint record"
 msgstr "n'a pas pu localiser l'enregistrement redo référencé par le point de vérification"
 
-#: access/transam/xlog.c:5851
-#: access/transam/xlog.c:5858
+#: access/transam/xlog.c:6164
+#: access/transam/xlog.c:6171
 #, c-format
 msgid "If you are not restoring from a backup, try removing the file \"%s/backup_label\"."
 msgstr ""
 "Si vous n'avez pas pu restaurer une sauvegarde, essayez de supprimer le\n"
 "fichier « %s/backup_label »."
 
-#: access/transam/xlog.c:5857
+#: access/transam/xlog.c:6170
 msgid "could not locate required checkpoint record"
 msgstr "n'a pas pu localiser l'enregistrement d'un point de vérification requis"
 
-#: access/transam/xlog.c:5886
-#: access/transam/xlog.c:5901
+#: access/transam/xlog.c:6199
+#: access/transam/xlog.c:6214
 msgid "could not locate a valid checkpoint record"
 msgstr "n'a pas pu localiser un enregistrement d'un point de vérification valide"
 
-#: access/transam/xlog.c:5895
+#: access/transam/xlog.c:6208
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "utilisation du précédent enregistrement d'un point de vérification à %X/%X"
 
-#: access/transam/xlog.c:5910
+#: access/transam/xlog.c:6223
 #, c-format
 msgid "redo record is at %X/%X; shutdown %s"
 msgstr "l'enregistrement à ré-exécuter se trouve à %X/%X ; arrêt %s"
 
-#: access/transam/xlog.c:5914
+#: access/transam/xlog.c:6227
 #, c-format
 msgid "next transaction ID: %u/%u; next OID: %u"
 msgstr "prochain identifiant de transaction : %u/%u ; prochain OID : %u"
 
-#: access/transam/xlog.c:5918
+#: access/transam/xlog.c:6231
 #, c-format
 msgid "next MultiXactId: %u; next MultiXactOffset: %u"
 msgstr "prochain MultiXactId : %u ; prochain MultiXactOffset : %u"
 
-#: access/transam/xlog.c:5921
+#: access/transam/xlog.c:6234
 #, c-format
 msgid "oldest unfrozen transaction ID: %u, in database %u"
 msgstr ""
 "identifiant de transaction non gelé le plus ancien : %u, dans la base de\n"
 "données %u"
 
-#: access/transam/xlog.c:5925
+#: access/transam/xlog.c:6238
 msgid "invalid next transaction ID"
 msgstr "prochain ID de transaction invalide"
 
-#: access/transam/xlog.c:5944
+#: access/transam/xlog.c:6257
 msgid "invalid redo in checkpoint record"
 msgstr "ré-exécution invalide dans l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:5955
+#: access/transam/xlog.c:6268
 msgid "invalid redo record in shutdown checkpoint"
 msgstr "enregistrement de ré-exécution invalide dans le point de vérification d'arrêt"
 
-#: access/transam/xlog.c:5985
+#: access/transam/xlog.c:6298
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 "le système de bases de données n'a pas été arrêté proprement ; restauration\n"
 "automatique en cours"
 
-#: access/transam/xlog.c:6049
+#: access/transam/xlog.c:6377
 msgid "initializing for hot standby"
 msgstr "initialisation pour « Hot Standby »"
 
-#: access/transam/xlog.c:6175
+#: access/transam/xlog.c:6505
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "la ré-exécution commence à %X/%X"
 
-#: access/transam/xlog.c:6274
+#: access/transam/xlog.c:6620
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "ré-exécution faite à %X/%X"
 
-#: access/transam/xlog.c:6279
-#: access/transam/xlog.c:7748
+#: access/transam/xlog.c:6625
+#: access/transam/xlog.c:8195
 #, c-format
 msgid "last completed transaction was at log time %s"
 msgstr "la dernière transaction a eu lieu à %s (moment de la journalisation)"
 
-#: access/transam/xlog.c:6287
+#: access/transam/xlog.c:6633
 msgid "redo is not required"
 msgstr "la ré-exécution n'est pas nécessaire"
 
-#: access/transam/xlog.c:6327
+#: access/transam/xlog.c:6681
 msgid "requested recovery stop point is before consistent recovery point"
 msgstr ""
 "le point d'arrêt de la restauration demandée se trouve avant le point\n"
 "cohérent de restauration"
 
-#: access/transam/xlog.c:6330
+#: access/transam/xlog.c:6690
+msgid "WAL ends before end of online backup"
+msgstr "le journal de transactions se termine avant la fin de la sauvegarde de base"
+
+#: access/transam/xlog.c:6691
+msgid "Online backup started with pg_start_backup() must be ended with pg_stop_backup(), and all WAL up to that point must be available at recovery."
+msgstr ""
+"Une sauvegarde en ligne commencée avec pg_start_backup() doit se terminer avec\n"
+"pg_stop_backup() et tous les journaux de transactions générés entre les deux\n"
+"doivent être disponibles pour la restauration."
+
+#: access/transam/xlog.c:6694
 msgid "WAL ends before consistent recovery point"
 msgstr "Le journal de transaction se termine avant un point de restauration cohérent"
 
-#: access/transam/xlog.c:6351
+#: access/transam/xlog.c:6715
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "identifiant d'un timeline nouvellement sélectionné : %u"
 
-#: access/transam/xlog.c:6587
+#: access/transam/xlog.c:6957
 #, c-format
 msgid "consistent recovery state reached at %X/%X"
 msgstr "état de restauration cohérent atteint à %X/%X"
 
-#: access/transam/xlog.c:6713
+#: access/transam/xlog.c:7123
 msgid "invalid primary checkpoint link in control file"
 msgstr "lien du point de vérification primaire invalide dans le fichier de contrôle"
 
-#: access/transam/xlog.c:6717
+#: access/transam/xlog.c:7127
 msgid "invalid secondary checkpoint link in control file"
 msgstr "lien du point de vérification secondaire invalide dans le fichier de contrôle"
 
-#: access/transam/xlog.c:6721
+#: access/transam/xlog.c:7131
 msgid "invalid checkpoint link in backup_label file"
 msgstr "lien du point de vérification invalide dans le fichier backup_label"
 
-#: access/transam/xlog.c:6735
+#: access/transam/xlog.c:7145
 msgid "invalid primary checkpoint record"
 msgstr "enregistrement du point de vérification primaire invalide"
 
-#: access/transam/xlog.c:6739
+#: access/transam/xlog.c:7149
 msgid "invalid secondary checkpoint record"
 msgstr "enregistrement du point de vérification secondaire invalide"
 
-#: access/transam/xlog.c:6743
+#: access/transam/xlog.c:7153
 msgid "invalid checkpoint record"
 msgstr "enregistrement du point de vérification invalide"
 
-#: access/transam/xlog.c:6754
+#: access/transam/xlog.c:7164
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr "identifiant du gestionnaire de ressource invalide dans l'enregistrement primaire du point de vérification"
 
-#: access/transam/xlog.c:6758
+#: access/transam/xlog.c:7168
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr "identifiant du gestionnaire de ressource invalide dans l'enregistrement secondaire du point de vérification"
 
-#: access/transam/xlog.c:6762
+#: access/transam/xlog.c:7172
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "identifiant du gestionnaire de ressource invalide dans l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:6774
+#: access/transam/xlog.c:7184
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "xl_info invalide dans l'enregistrement du point de vérification primaire"
 
-#: access/transam/xlog.c:6778
+#: access/transam/xlog.c:7188
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "xl_info invalide  dans l'enregistrement du point de vérification secondaire"
 
-#: access/transam/xlog.c:6782
+#: access/transam/xlog.c:7192
 msgid "invalid xl_info in checkpoint record"
 msgstr "xl_info invalide dans l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:6794
+#: access/transam/xlog.c:7204
 msgid "invalid length of primary checkpoint record"
 msgstr "longueur invalide de l'enregistrement primaire du point de vérification"
 
-#: access/transam/xlog.c:6798
+#: access/transam/xlog.c:7208
 msgid "invalid length of secondary checkpoint record"
 msgstr "longueur invalide de l'enregistrement secondaire du point de vérification"
 
-#: access/transam/xlog.c:6802
+#: access/transam/xlog.c:7212
 msgid "invalid length of checkpoint record"
 msgstr "longueur invalide de l'enregistrement du point de vérification"
 
-#: access/transam/xlog.c:6964
+#: access/transam/xlog.c:7374
 msgid "shutting down"
 msgstr "arrêt en cours"
 
-#: access/transam/xlog.c:6986
+#: access/transam/xlog.c:7396
 msgid "database system is shut down"
 msgstr "le système de base de données est arrêté"
 
-#: access/transam/xlog.c:7379
+#: access/transam/xlog.c:7822
 msgid "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 "activité en cours du journal de transactions alors que le système de bases\n"
 "de données est en cours d'arrêt"
 
-#: access/transam/xlog.c:7611
+#: access/transam/xlog.c:8056
 msgid "skipping restartpoint, recovery has already ended"
 msgstr "restartpoint ignoré, la récupération est déjà terminée"
 
-#: access/transam/xlog.c:7636
+#: access/transam/xlog.c:8081
 #, c-format
 msgid "skipping restartpoint, already performed at %X/%X"
 msgstr "ignore le point de redémarrage, déjà réalisé à %X/%X"
 
-#: access/transam/xlog.c:7746
+#: access/transam/xlog.c:8193
 #, c-format
 msgid "recovery restart point at %X/%X"
 msgstr "la ré-exécution en restauration commence à %X/%X"
 
-#: access/transam/xlog.c:7915
-msgid "online backup was cancelled, recovery cannot continue"
-msgstr "le mode de sauvegarde en ligne a été annulé, la restauration ne peut pas continuer"
+#: access/transam/xlog.c:8293
+#, c-format
+msgid "restore point \"%s\" created at %X/%X"
+msgstr "point de restauration « %s » créé à %X/%X"
+
+#: access/transam/xlog.c:8390
+msgid "online backup was canceled, recovery cannot continue"
+msgstr "la sauvegarde en ligne a été annulée, la restauration ne peut pas continuer"
 
-#: access/transam/xlog.c:7967
+#: access/transam/xlog.c:8442
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr ""
 "identifiant timeline %u inattendu (après %u) dans l'enregistrement du point\n"
 "de vérification"
 
-#: access/transam/xlog.c:8003
+#: access/transam/xlog.c:8478
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr ""
 "identifiant timeline %u inattendu (devrait être %u) dans l'enregistrement du\n"
 "point de vérification"
 
-#: access/transam/xlog.c:8259
-#: access/transam/xlog.c:8285
+#: access/transam/xlog.c:8742
+#: access/transam/xlog.c:8766
 #, c-format
 msgid "could not fsync log file %u, segment %u: %m"
 msgstr ""
 "n'a pas pu synchroniser sur disque (fsync) le journal des transactions %u,\n"
 "segment %u : %m"
 
-#: access/transam/xlog.c:8293
+#: access/transam/xlog.c:8774
 #, c-format
 msgid "could not fsync write-through log file %u, segment %u: %m"
 msgstr ""
 "n'a pas pu synchroniser sur disque (fsync) le journal des transactions %u,\n"
 "segment %u : %m"
 
-#: access/transam/xlog.c:8302
+#: access/transam/xlog.c:8783
 #, c-format
 msgid "could not fdatasync log file %u, segment %u: %m"
 msgstr ""
 "n'a pas pu synchroniser sur disque (fdatasync) le journal de transactions\n"
 "%u, segment %u : %m"
 
-#: access/transam/xlog.c:8345
-#: access/transam/xlog.c:8537
-msgid "must be superuser to run a backup"
-msgstr "doit être super-utilisateur pour exécuter une sauvegarde"
-
-#: access/transam/xlog.c:8350
-#: access/transam/xlog.c:8542
-#: access/transam/xlog.c:8745
-#: access/transam/xlog.c:8773
-#: access/transam/xlog.c:8806
-#: access/transam/xlog.c:8898
-#: access/transam/xlog.c:8973
+#: access/transam/xlog.c:8864
+#: access/transam/xlog.c:9142
+msgid "must be superuser or replication role to run a backup"
+msgstr "doit être super-utilisateur ou avoir l'attribut de réplication pour exécuter une sauvegarde"
+
+#: access/transam/xlog.c:8869
+#: access/transam/xlog.c:9147
+#: access/transam/xlog.c:9410
+#: access/transam/xlog.c:9442
+#: access/transam/xlog.c:9483
+#: access/transam/xlog.c:9516
+#: access/transam/xlog.c:9623
+#: access/transam/xlog.c:9698
 msgid "recovery is in progress"
 msgstr "restauration en cours"
 
-#: access/transam/xlog.c:8351
-#: access/transam/xlog.c:8543
-#: access/transam/xlog.c:8746
-#: access/transam/xlog.c:8774
-#: access/transam/xlog.c:8807
+#: access/transam/xlog.c:8870
+#: access/transam/xlog.c:9148
+#: access/transam/xlog.c:9411
+#: access/transam/xlog.c:9443
+#: access/transam/xlog.c:9484
+#: access/transam/xlog.c:9517
 msgid "WAL control functions cannot be executed during recovery."
 msgstr ""
 "les fonctions de contrôle des journaux de transactions ne peuvent pas\n"
 "être exécutées lors de la restauration."
 
-#: access/transam/xlog.c:8356
-#: access/transam/xlog.c:8548
+#: access/transam/xlog.c:8875
+#: access/transam/xlog.c:9153
 msgid "WAL level not sufficient for making an online backup"
 msgstr ""
 "Le niveau de journalisation (configuré par wal_level) n'est pas suffisant pour\n"
 "faire une sauvegarde en ligne."
 
-#: access/transam/xlog.c:8357
-#: access/transam/xlog.c:8549
+#: access/transam/xlog.c:8876
+#: access/transam/xlog.c:9154
+#: access/transam/xlog.c:9449
 msgid "wal_level must be set to \"archive\" or \"hot_standby\" at server start."
 msgstr ""
 "wal_level doit être configuré à « archive » ou « hot_standby » au démarrage\n"
 "du serveur."
 
-#: access/transam/xlog.c:8384
-#: access/transam/xlog.c:8453
+#: access/transam/xlog.c:8881
+#, c-format
+msgid "backup label too long (max %d bytes)"
+msgstr "label de sauvegarde trop long (%d octets maximum)"
+
+#: access/transam/xlog.c:8922
+#: access/transam/xlog.c:9025
 msgid "a backup is already in progress"
 msgstr "une sauvegarde est déjà en cours"
 
-#: access/transam/xlog.c:8385
+#: access/transam/xlog.c:8923
 msgid "Run pg_stop_backup() and try again."
 msgstr "Exécutez pg_stop_backup() et tentez de nouveau."
 
-#: access/transam/xlog.c:8454
+#: access/transam/xlog.c:9026
 #, c-format
 msgid "If you're sure there is no backup in progress, remove file \"%s\" and try again."
 msgstr ""
 "Si vous êtes certain qu'aucune sauvegarde n'est en cours, supprimez le\n"
 "fichier « %s » et recommencez de nouveau."
 
-#: access/transam/xlog.c:8475
-#: access/transam/xlog.c:8632
+#: access/transam/xlog.c:9040
+#: access/transam/xlog.c:9286
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "impossible d'écrire le fichier « %s » : %m"
 
-#: access/transam/xlog.c:8571
+#: access/transam/xlog.c:9198
 msgid "a backup is not in progress"
 msgstr "une sauvegarde n'est pas en cours"
 
-#: access/transam/xlog.c:8583
-#: access/transam/xlog.c:9039
-#: access/transam/xlog.c:9045
+#: access/transam/xlog.c:9237
+#: access/transam/xlog.c:9768
+#: access/transam/xlog.c:9774
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "données invalides dans le fichier « %s »"
 
-#: access/transam/xlog.c:8695
+#: access/transam/xlog.c:9335
 msgid "pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
 msgstr "nettoyage de pg_stop_backup terminé, en attente des journaux de transactions requis à archiver"
 
-#: access/transam/xlog.c:8705
+#: access/transam/xlog.c:9345
 #, c-format
 msgid "pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)"
 msgstr ""
 "pg_stop_backup toujours en attente de la fin de l'archivage des segments de\n"
 "journaux de transactions requis (%d secondes passées)"
 
-#: access/transam/xlog.c:8707
-msgid "Check that your archive_command is executing properly.  pg_stop_backup can be cancelled safely, but the database backup will not be usable without all the WAL segments."
+#: access/transam/xlog.c:9347
+msgid "Check that your archive_command is executing properly.  pg_stop_backup can be canceled safely, but the database backup will not be usable without all the WAL segments."
 msgstr ""
 "Vérifiez que votre archive_command s'exécute correctement. pg_stop_backup\n"
 "peut être annulé avec sûreté mais la sauvegarde de la base ne sera pas\n"
 "utilisable sans tous les segments WAL."
 
-#: access/transam/xlog.c:8714
+#: access/transam/xlog.c:9354
 msgid "pg_stop_backup complete, all required WAL segments have been archived"
 msgstr "pg_stop_backup terminé, tous les journaux de transactions requis ont été archivés"
 
-#: access/transam/xlog.c:8718
+#: access/transam/xlog.c:9358
 msgid "WAL archiving is not enabled; you must ensure that all required WAL segments are copied through other means to complete the backup"
 msgstr ""
 "L'archivage des journaux de transactions n'est pas activé ;\n"
 "vous devez vous assurer que tous les fichiers requis des journaux de\n"
 "transactions sont copiés par d'autre moyens pour terminer la sauvegarde."
 
-#: access/transam/xlog.c:8740
+#: access/transam/xlog.c:9405
 msgid "must be superuser to switch transaction log files"
 msgstr "doit être super-utilisateur pour changer de journal de transactions"
 
-#: access/transam/xlog.c:8899
+#: access/transam/xlog.c:9437
+msgid "must be superuser to create a restore point"
+msgstr "doit être super-utilisateur pour créer un point de restauration"
+
+#: access/transam/xlog.c:9448
+msgid "WAL level not sufficient for creating a restore point"
+msgstr ""
+"le niveau de journalisation (configuré par wal_level) n'est pas suffisant pour\n"
+"créer un point de restauration"
+
+#: access/transam/xlog.c:9456
+#, c-format
+msgid "value too long for restore point (maximum %d characters)"
+msgstr "valeur trop longue pour le point de restauration (%d caractères maximum)"
+
+#: access/transam/xlog.c:9624
 msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
 msgstr "pg_xlogfile_name_offset() ne peut pas être exécuté lors de la restauration."
 
-#: access/transam/xlog.c:8909
-#: access/transam/xlog.c:8981
+#: access/transam/xlog.c:9634
+#: access/transam/xlog.c:9706
 #, c-format
 msgid "could not parse transaction log location \"%s\""
 msgstr ""
 "n'a pas pu analyser l'emplacement du journal des transactions nommé « %s » :\n"
 "%m"
 
-#: access/transam/xlog.c:8974
+#: access/transam/xlog.c:9699
 msgid "pg_xlogfile_name() cannot be executed during recovery."
 msgstr "pg_xlogfile_name() ne peut pas être exécuté lors de la restauration."
 
-#: access/transam/xlog.c:9071
+#: access/transam/xlog.c:9810
 #, c-format
 msgid "xlog redo %s"
 msgstr "xlog redo %s"
 
-#: access/transam/xlog.c:9111
-msgid "online backup mode cancelled"
+#: access/transam/xlog.c:9850
+msgid "online backup mode canceled"
 msgstr "mode de sauvegarde en ligne annulé"
 
-#: access/transam/xlog.c:9112
+#: access/transam/xlog.c:9851
 #, c-format
 msgid "\"%s\" was renamed to \"%s\"."
 msgstr "« %s » a été renommé en « %s »."
 
-#: access/transam/xlog.c:9119
-msgid "online backup mode was not cancelled"
+#: access/transam/xlog.c:9858
+msgid "online backup mode was not canceled"
 msgstr "le mode de sauvegarde en ligne n'a pas été annulé"
 
-#: access/transam/xlog.c:9120
+#: access/transam/xlog.c:9859
 #, c-format
 msgid "Could not rename \"%s\" to \"%s\": %m."
 msgstr "N'a pas pu renommer « %s » en « %s » : %m"
 
-#: access/transam/xlog.c:9588
-#: access/transam/xlog.c:9610
+#: access/transam/xlog.c:10372
+#: access/transam/xlog.c:10394
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u: %m"
 msgstr "n'a pas pu lire le journal de transactions %u, segment %u, décalage %u : %m"
 
-#: access/transam/xlog.c:9698
+#: access/transam/xlog.c:10483
+msgid "received promote request"
+msgstr "a reçu une demande de promotion"
+
+#: access/transam/xlog.c:10496
 #, c-format
 msgid "trigger file found: %s"
 msgstr "fichier trigger trouvé : %s"
 
-#: access/common/tupdesc.c:545
-#: parser/parse_relation.c:1165
+#: access/heap/heapam.c:1082
+#: access/heap/heapam.c:1110
+#: access/heap/heapam.c:1140
+#: catalog/aclchk.c:1678
 #, c-format
-msgid "column \"%s\" cannot be declared SETOF"
-msgstr "la colonne « %s » ne peut pas être déclarée SETOF"
+msgid "\"%s\" is an index"
+msgstr "« %s » est un index"
 
-#: access/common/heaptuple.c:646
-#: access/common/heaptuple.c:1398
+#: access/heap/heapam.c:1087
+#: access/heap/heapam.c:1115
+#: access/heap/heapam.c:1145
+#: catalog/aclchk.c:1685
+#: commands/tablecmds.c:2269
+#: commands/tablecmds.c:7436
+#: commands/tablecmds.c:9018
 #, c-format
-msgid "number of columns (%d) exceeds limit (%d)"
-msgstr "le nombre de colonnes (%d) dépasse la limite (%d)"
+msgid "\"%s\" is a composite type"
+msgstr "« %s » est un type composite"
 
-#: access/common/indextuple.c:57
+#: access/heap/heapam.c:3216
+#: access/heap/heapam.c:3247
+#: access/heap/heapam.c:3282
 #, c-format
-msgid "number of index columns (%d) exceeds limit (%d)"
-msgstr "le nombre de colonnes indexées (%d) dépasse la limite (%d)"
+msgid "could not obtain lock on row in relation \"%s\""
+msgstr "n'a pas pu obtenir un verrou sur la relation « %s »"
 
-#: access/common/indextuple.c:168
+#: access/heap/hio.c:175
+#: access/heap/rewriteheap.c:597
 #, c-format
-msgid "index row requires %lu bytes, maximum size is %lu"
-msgstr "la ligne index requiert %lu octets, la taille maximum est %lu"
+msgid "row is too big: size %lu, maximum size %lu"
+msgstr "la ligne est trop grande : taille %lu, taille maximale %lu"
 
-#: access/common/printtup.c:278
-#: tcop/fastpath.c:181
-#: tcop/fastpath.c:561
-#: tcop/postgres.c:1704
+#: access/index/indexam.c:161
+#: catalog/objectaddress.c:391
+#: commands/indexcmds.c:1542
+#: commands/tablecmds.c:220
+#: commands/tablecmds.c:2486
 #, c-format
-msgid "unsupported format code: %d"
-msgstr "code de format non supporté : %d"
-
-#: access/common/reloptions.c:323
-msgid "user-defined relation parameter types limit exceeded"
-msgstr "limite dépassée des types de paramètres de la relation définie par l'utilisateur"
-
-#: access/common/reloptions.c:622
-msgid "RESET must not include values for parameters"
-msgstr "RESET ne doit pas inclure de valeurs pour les paramètres"
+msgid "\"%s\" is not an index"
+msgstr "« %s » n'est pas un index"
 
-#: access/common/reloptions.c:655
+#: access/nbtree/nbtinsert.c:393
 #, c-format
-msgid "unrecognized parameter namespace \"%s\""
-msgstr "espace de nom du paramètre « %s » non reconnu"
+msgid "duplicate key value violates unique constraint \"%s\""
+msgstr "la valeur d'une clé dupliquée rompt la contrainte unique « %s »"
 
-#: access/common/reloptions.c:895
+#: access/nbtree/nbtinsert.c:395
 #, c-format
-msgid "unrecognized parameter \"%s\""
-msgstr "paramètre « %s » non reconnu"
+msgid "Key %s already exists."
+msgstr "La clé « %s » existe déjà."
 
-#: access/common/reloptions.c:920
+#: access/nbtree/nbtinsert.c:457
 #, c-format
-msgid "parameter \"%s\" specified more than once"
-msgstr "le paramètre « %s » est spécifié plus d'une fois"
+msgid "failed to re-find tuple within index \"%s\""
+msgstr "échec pour retrouver la ligne dans l'index « %s »"
 
-#: access/common/reloptions.c:935
-#, c-format
-msgid "invalid value for boolean option \"%s\": %s"
-msgstr "valeur invalide pour l'option booléenne « %s » : %s"
+#: access/nbtree/nbtinsert.c:459
+msgid "This may be because of a non-immutable index expression."
+msgstr "Ceci peut être dû à une expression d'index immutable."
 
-#: access/common/reloptions.c:946
-#, c-format
-msgid "invalid value for integer option \"%s\": %s"
-msgstr "valeur invalide pour l'option de type integer « %s » : %s"
+#: access/nbtree/nbtinsert.c:535
+#: access/nbtree/nbtsort.c:487
+msgid ""
+"Values larger than 1/3 of a buffer page cannot be indexed.\n"
+"Consider a function index of an MD5 hash of the value, or use full text indexing."
+msgstr ""
+"Les valeurs plus larges qu'un tiers d'une page de tampon ne peuvent pas être\n"
+"indexées.\n"
+"Utilisez un index sur le hachage MD5 de la valeur ou passez à l'indexation\n"
+"de la recherche plein texte."
 
-#: access/common/reloptions.c:951
-#: access/common/reloptions.c:969
+#: access/nbtree/nbtpage.c:161
+#: access/nbtree/nbtpage.c:365
+#: parser/parse_utilcmd.c:1527
 #, c-format
-msgid "value %s out of bounds for option \"%s\""
-msgstr "valeur %s en dehors des limites pour l'option « %s »"
+msgid "index \"%s\" is not a btree"
+msgstr "l'index « %s » n'est pas un btree"
 
-#: access/common/reloptions.c:953
+#: access/nbtree/nbtpage.c:167
+#: access/nbtree/nbtpage.c:371
 #, c-format
-msgid "Valid values are between \"%d\" and \"%d\"."
-msgstr "Les valeurs valides sont entre « %d » et « %d »."
+msgid "version mismatch in index \"%s\": file version %d, code version %d"
+msgstr "la version ne correspond pas dans l'index « %s » : version du fichier %d, version du code %d"
 
-#: access/common/reloptions.c:964
+#: bootstrap/bootstrap.c:277
+#: tcop/postgres.c:3388
+#: postmaster/postmaster.c:681
 #, c-format
-msgid "invalid value for floating point option \"%s\": %s"
-msgstr "valeur invalide pour l'option de type float « %s » : %s"
+msgid "--%s requires a value"
+msgstr "--%s requiert une valeur"
 
-#: access/common/reloptions.c:971
+#: bootstrap/bootstrap.c:282
+#: tcop/postgres.c:3393
+#: postmaster/postmaster.c:686
 #, c-format
-msgid "Valid values are between \"%f\" and \"%f\"."
-msgstr "Les valeurs valides sont entre « %f » et « %f »."
+msgid "-c %s requires a value"
+msgstr "-c %s requiert une valeur"
 
-#: access/common/tupconvert.c:107
+#: bootstrap/bootstrap.c:293
+#: postmaster/postmaster.c:698
+#: postmaster/postmaster.c:711
 #, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "Le type %s renvoyé ne correspond pas au type %s attendu dans la colonne %d."
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
-#: access/common/tupconvert.c:135
-#, c-format
-msgid "Number of returned columns (%d) does not match expected column count (%d)."
-msgstr ""
-"Le nombre de colonnes renvoyées (%d) ne correspond pas au nombre de colonnes\n"
-"attendues (%d)."
-
-#: access/common/tupconvert.c:240
-#, c-format
-msgid "Attribute \"%s\" of type %s does not match corresponding attribute of type %s."
-msgstr "L'attribut « %s » du type %s ne correspond pas à l'attribut correspondant de type %s."
-
-#: access/common/tupconvert.c:252
-#, c-format
-msgid "Attribute \"%s\" of type %s does not exist in type %s."
-msgstr "L'attribut « %s » du type %s n'existe pas dans le type %s."
-
-#: access/gin/ginarrayproc.c:30
-msgid "array must not contain null values"
-msgstr "le tableau ne doit pas contenir de valeurs NULL"
-
-#: access/gin/ginentrypage.c:83
-#: access/gin/ginentrypage.c:118
-#: access/nbtree/nbtinsert.c:522
-#: access/nbtree/nbtsort.c:483
-#, c-format
-msgid "index row size %lu exceeds maximum %lu for index \"%s\""
-msgstr "la taille de la ligne index, %lu, dépasse le maximum, %lu, pour l'index « %s »"
-
-#: access/gin/ginscan.c:168
-#: access/gin/ginscan.c:231
-msgid "GIN indexes do not support whole-index scans"
-msgstr "les index GIN ne supportent pas les parcours complets d'index"
-
-#: access/gist/gistxlog.c:803
-#, c-format
-msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr ""
-"l'index  %u/%u/%u a besoin d'un VACUUM FULL ou d'un REINDEX pour terminer la\n"
-"récupération suite à un arrêt brutal"
-
-#: access/gist/gistxlog.c:805
-msgid "Incomplete insertion detected during crash replay."
-msgstr ""
-"Insertion incomplète détectée lors de la ré-exécution des requêtes suite à\n"
-"l'arrêt brutal."
-
-#: access/gist/gistsplit.c:372
-#, c-format
-msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr "échec de la méthode picksplit pour la colonne %d de l'index « %s »"
-
-#: access/gist/gistsplit.c:374
-msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
-msgstr ""
-"L'index n'est pas optimal. Pour l'optimiser, contactez un développeur\n"
-"ou essayez d'utiliser la colonne comme second dans la commande\n"
-"CREATE INDEX."
-
-#: access/gist/gistutil.c:407
-#, c-format
-msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
-msgstr ""
-"l'index  « %s » a besoin d'un VACUUM ou d'un REINDEX pour terminer la\n"
-"récupération suite à un arrêt brutal"
-
-#: access/gist/gistutil.c:588
-#: access/hash/hashutil.c:165
-#: access/nbtree/nbtpage.c:432
-#, c-format
-msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "l'index « %s » contient une page zéro inattendue au bloc %u"
-
-#: access/gist/gistutil.c:591
-#: access/gist/gistutil.c:602
-#: access/hash/hashutil.c:168
-#: access/hash/hashutil.c:179
-#: access/hash/hashutil.c:191
-#: access/hash/hashutil.c:212
-#: access/nbtree/nbtpage.c:435
-#: access/nbtree/nbtpage.c:446
-msgid "Please REINDEX it."
-msgstr "Merci d'exécuter REINDEX sur cet objet."
-
-#: access/gist/gistutil.c:599
-#: access/hash/hashutil.c:176
-#: access/hash/hashutil.c:188
-#: access/nbtree/nbtpage.c:443
-#, c-format
-msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "l'index « %s » contient une page corrompue au bloc %u"
-
-#: access/gist/gistvacuum.c:72
-#, c-format
-msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr ""
-"l'index  « %s » a besoin d'un VACUUM FULL ou d'un REINDEX pour terminer la\n"
-"récupération suite à un arrêt brutal"
-
-#: access/hash/hashutil.c:204
-#, c-format
-msgid "index \"%s\" is not a hash index"
-msgstr "l'index « %s » n'est pas un index haché"
-
-#: access/hash/hashutil.c:210
-#, c-format
-msgid "index \"%s\" has wrong hash version"
-msgstr "l'index « %s » a la mauvaise version de hachage"
-
-#: access/hash/hashinsert.c:73
-#, c-format
-msgid "index row size %lu exceeds hash maximum %lu"
-msgstr "la taille de la ligne index, %lu, dépasse le hachage maximum, %lu"
-
-#: access/hash/hashinsert.c:76
-msgid "Values larger than a buffer page cannot be indexed."
-msgstr "Les valeurs plus larges qu'une page de tampon ne peuvent pas être indexées."
-
-#: access/hash/hashovfl.c:546
-#, c-format
-msgid "out of overflow pages in hash index \"%s\""
-msgstr "en dehors des pages surchargées dans l'index haché « %s »"
-
-#: access/hash/hashsearch.c:152
-msgid "hash indexes do not support whole-index scans"
-msgstr "les index hâchés ne supportent pas les parcours complets d'index"
-
-#: access/heap/heapam.c:1076
-#: access/heap/heapam.c:1104
-#: access/heap/heapam.c:1134
-#: catalog/aclchk.c:1720
-#, c-format
-msgid "\"%s\" is an index"
-msgstr "« %s » est un index"
-
-#: access/heap/heapam.c:1081
-#: access/heap/heapam.c:1109
-#: access/heap/heapam.c:1139
-#: catalog/aclchk.c:1727
-#: commands/tablecmds.c:2162
-#: commands/tablecmds.c:6550
-#: commands/tablecmds.c:7856
-#, c-format
-msgid "\"%s\" is a composite type"
-msgstr "« %s » est un type composite"
-
-#: access/heap/heapam.c:3149
-#: access/heap/heapam.c:3180
-#: access/heap/heapam.c:3215
-#, c-format
-msgid "could not obtain lock on row in relation \"%s\""
-msgstr "n'a pas pu obtenir un verrou sur la relation « %s »"
-
-#: access/heap/hio.c:175
-#: access/heap/rewriteheap.c:592
-#, c-format
-msgid "row is too big: size %lu, maximum size %lu"
-msgstr "la ligne est trop grande : taille %lu, taille maximale %lu"
-
-#: access/index/indexam.c:149
-#: commands/comment.c:559
-#: commands/indexcmds.c:1595
-#: commands/tablecmds.c:212
-#: commands/tablecmds.c:2357
-#, c-format
-msgid "\"%s\" is not an index"
-msgstr "« %s » n'est pas un index"
-
-#: access/nbtree/nbtinsert.c:384
-#, c-format
-msgid "duplicate key value violates unique constraint \"%s\""
-msgstr "la valeur d'une clé dupliquée rompt la contrainte unique « %s »"
-
-#: access/nbtree/nbtinsert.c:386
-#, c-format
-msgid "Key %s already exists."
-msgstr "La clé « %s » existe déjà."
-
-#: access/nbtree/nbtinsert.c:448
-#: executor/execUtils.c:1319
-#, c-format
-msgid "failed to re-find tuple within index \"%s\""
-msgstr "échec pour retrouver la ligne dans l'index « %s »"
-
-#: access/nbtree/nbtinsert.c:450
-#: executor/execUtils.c:1321
-msgid "This may be because of a non-immutable index expression."
-msgstr "Ceci peut être dû à une expression d'index immutable."
-
-#: access/nbtree/nbtinsert.c:526
-#: access/nbtree/nbtsort.c:487
-msgid ""
-"Values larger than 1/3 of a buffer page cannot be indexed.\n"
-"Consider a function index of an MD5 hash of the value, or use full text indexing."
-msgstr ""
-"Les valeurs plus larges qu'un tiers d'une page de tampon ne peuvent pas être\n"
-"indexées.\n"
-"Utilisez un index sur le hachage MD5 de la valeur ou passez à l'indexation\n"
-"de la recherche plein texte."
-
-#: access/nbtree/nbtpage.c:160
-#: access/nbtree/nbtpage.c:364
-#, c-format
-msgid "index \"%s\" is not a btree"
-msgstr "l'index « %s » n'est pas un btree"
-
-#: access/nbtree/nbtpage.c:166
-#: access/nbtree/nbtpage.c:370
-#, c-format
-msgid "version mismatch in index \"%s\": file version %d, code version %d"
-msgstr "la version ne correspond pas dans l'index « %s » : version du fichier %d, version du code %d"
-
-#: bootstrap/bootstrap.c:272
-#: tcop/postgres.c:3393
-#: postmaster/postmaster.c:675
-#, c-format
-msgid "--%s requires a value"
-msgstr "--%s requiert une valeur"
-
-#: bootstrap/bootstrap.c:277
-#: tcop/postgres.c:3398
-#: postmaster/postmaster.c:680
-#, c-format
-msgid "-c %s requires a value"
-msgstr "-c %s requiert une valeur"
-
-#: bootstrap/bootstrap.c:288
-#: postmaster/postmaster.c:692
-#: postmaster/postmaster.c:705
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Essayez « %s --help » pour plus d'informations.\n"
-
-#: bootstrap/bootstrap.c:297
+#: bootstrap/bootstrap.c:302
 #, c-format
 msgid "%s: invalid command-line arguments\n"
 msgstr "%s : arguments invalides en ligne de commande\n"
 
-#: catalog/toasting.c:91
-#: commands/comment.c:573
-#: commands/indexcmds.c:187
-#: commands/indexcmds.c:1627
-#: commands/lockcmds.c:149
-#: commands/tablecmds.c:194
-#: commands/tablecmds.c:1096
-#: commands/tablecmds.c:3355
-#: commands/trigger.c:149
-#: commands/trigger.c:1063
-#, c-format
-msgid "\"%s\" is not a table"
-msgstr "« %s » n'est pas une table"
-
-#: catalog/toasting.c:141
-msgid "shared tables cannot be toasted after initdb"
-msgstr ""
-"les tables partagées ne peuvent pas avoir une table TOAST après la commande\n"
-"initdb"
-
-#: catalog/aclchk.c:196
+#: catalog/aclchk.c:200
 msgid "grant options can only be granted to roles"
 msgstr "les options grant peuvent seulement être données aux rôles"
 
-#: catalog/aclchk.c:312
+#: catalog/aclchk.c:316
 #, c-format
 msgid "no privileges were granted for column \"%s\" of relation \"%s\""
 msgstr "aucun droit n'a pu être accordé pour la colonne « %s » de la relation « %s »"
 
-#: catalog/aclchk.c:317
+#: catalog/aclchk.c:321
 #, c-format
 msgid "no privileges were granted for \"%s\""
 msgstr "aucun droit n'a été accordé pour « %s »"
 
-#: catalog/aclchk.c:325
+#: catalog/aclchk.c:329
 #, c-format
 msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
 msgstr "certains droits n'ont pu être accordé pour la colonne « %s » de la relation « %s »"
 
-#: catalog/aclchk.c:330
+#: catalog/aclchk.c:334
 #, c-format
 msgid "not all privileges were granted for \"%s\""
 msgstr "tous les droits n'ont pas été accordés pour « %s »"
 
-#: catalog/aclchk.c:341
+#: catalog/aclchk.c:345
 #, c-format
 msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
 msgstr "aucun droit n'a pu être révoqué pour la colonne « %s » de la relation « %s »"
 
-#: catalog/aclchk.c:346
+#: catalog/aclchk.c:350
 #, c-format
 msgid "no privileges could be revoked for \"%s\""
 msgstr "aucun droit n'a pu être révoqué pour « %s »"
 
-#: catalog/aclchk.c:354
+#: catalog/aclchk.c:358
 #, c-format
 msgid "not all privileges could be revoked for column \"%s\" of relation \"%s\""
 msgstr "certains droits n'ont pu être révoqué pour la colonne « %s » de la relation « %s »"
 
-#: catalog/aclchk.c:359
+#: catalog/aclchk.c:363
 #, c-format
 msgid "not all privileges could be revoked for \"%s\""
 msgstr "certains droits n'ont pu être révoqué pour « %s »"
 
-#: catalog/aclchk.c:438
-#: catalog/aclchk.c:927
+#: catalog/aclchk.c:442
+#: catalog/aclchk.c:891
 #, c-format
 msgid "invalid privilege type %s for relation"
 msgstr "droit %s invalide pour la relation"
 
-#: catalog/aclchk.c:442
-#: catalog/aclchk.c:931
+#: catalog/aclchk.c:446
+#: catalog/aclchk.c:895
 #, c-format
 msgid "invalid privilege type %s for sequence"
 msgstr "droit %s invalide pour la séquence"
 
-#: catalog/aclchk.c:446
+#: catalog/aclchk.c:450
 #, c-format
 msgid "invalid privilege type %s for database"
 msgstr "droit %s invalide pour la base de données"
 
-#: catalog/aclchk.c:450
-#: catalog/aclchk.c:935
+#: catalog/aclchk.c:454
+#: catalog/aclchk.c:899
 #, c-format
 msgid "invalid privilege type %s for function"
 msgstr "droit %s invalide pour la fonction"
 
-#: catalog/aclchk.c:454
+#: catalog/aclchk.c:458
 #, c-format
 msgid "invalid privilege type %s for language"
 msgstr "droit %s invalide pour le langage"
 
-#: catalog/aclchk.c:458
+#: catalog/aclchk.c:462
 #, c-format
 msgid "invalid privilege type %s for large object"
 msgstr "type de droit invalide, %s, pour le Large Object"
 
-#: catalog/aclchk.c:462
+#: catalog/aclchk.c:466
 #, c-format
 msgid "invalid privilege type %s for schema"
 msgstr "droit %s invalide pour le schéma"
 
-#: catalog/aclchk.c:466
+#: catalog/aclchk.c:470
 #, c-format
 msgid "invalid privilege type %s for tablespace"
 msgstr "droit %s invalide pour le tablespace"
 
-#: catalog/aclchk.c:470
+#: catalog/aclchk.c:474
 #, c-format
 msgid "invalid privilege type %s for foreign-data wrapper"
 msgstr "type de droit %s invalide pour le wrapper de données distantes"
 
-#: catalog/aclchk.c:474
+#: catalog/aclchk.c:478
 #, c-format
 msgid "invalid privilege type %s for foreign server"
 msgstr "type de droit %s invalide pour le serveur distant"
 
-#: catalog/aclchk.c:513
+#: catalog/aclchk.c:517
 msgid "column privileges are only valid for relations"
 msgstr "les droits sur la colonne sont seulement valides pour les relations"
 
-#: catalog/aclchk.c:614
-#: commands/comment.c:698
-#: commands/dbcommands.c:760
-#: commands/dbcommands.c:905
-#: commands/dbcommands.c:1004
-#: commands/dbcommands.c:1181
-#: commands/dbcommands.c:1366
-#: commands/dbcommands.c:1410
-#: commands/dbcommands.c:1456
-#: utils/adt/acl.c:2975
-#: utils/adt/dbsize.c:149
-#: utils/init/postinit.c:708
-#: utils/init/postinit.c:776
-#: utils/init/postinit.c:793
-#, c-format
-msgid "database \"%s\" does not exist"
-msgstr "la base de données « %s » n'existe pas"
-
-#: catalog/aclchk.c:640
-#: commands/comment.c:1220
-#: commands/functioncmds.c:836
-#: commands/functioncmds.c:1990
-#: commands/proclang.c:531
-#: commands/proclang.c:600
-#: commands/proclang.c:640
-#: utils/adt/acl.c:3562
-#, c-format
-msgid "language \"%s\" does not exist"
-msgstr "le langage « %s » n'existe pas"
-
-#: catalog/aclchk.c:656
-#: catalog/aclchk.c:3690
-#: catalog/aclchk.c:4381
+#: catalog/aclchk.c:647
+#: catalog/aclchk.c:3677
+#: catalog/aclchk.c:4368
+#: catalog/objectaddress.c:199
 #: catalog/pg_largeobject.c:116
 #: catalog/pg_largeobject.c:176
-#: commands/comment.c:1415
-#: storage/large_object/inv_api.c:272
+#: storage/large_object/inv_api.c:277
 #, c-format
 msgid "large object %u does not exist"
 msgstr "le « Large Object » %u n'existe pas"
 
-#: catalog/aclchk.c:673
-#: catalog/aclchk.c:1051
-#: catalog/namespace.c:340
-#: catalog/namespace.c:2307
-#: catalog/namespace.c:2346
-#: catalog/namespace.c:2393
-#: catalog/namespace.c:3320
-#: commands/comment.c:806
-#: commands/schemacmds.c:190
-#: commands/schemacmds.c:264
-#: commands/schemacmds.c:335
-#: utils/adt/acl.c:3760
-#, c-format
-msgid "schema \"%s\" does not exist"
-msgstr "le schéma « %s » n'existe pas"
-
-#: catalog/aclchk.c:702
-#: commands/comment.c:737
-#: commands/dbcommands.c:436
-#: commands/dbcommands.c:1037
-#: commands/indexcmds.c:225
-#: commands/tablecmds.c:430
-#: commands/tablecmds.c:6809
-#: commands/tablespace.c:410
-#: commands/tablespace.c:808
-#: commands/tablespace.c:875
-#: commands/tablespace.c:980
-#: commands/tablespace.c:1036
-#: commands/tablespace.c:1160
-#: executor/execMain.c:2189
-#: utils/adt/acl.c:4134
-#: utils/adt/dbsize.c:248
-#, c-format
-msgid "tablespace \"%s\" does not exist"
-msgstr "le tablespace « %s » n'existe pas"
-
-#: catalog/aclchk.c:869
-#: catalog/aclchk.c:877
-#: commands/copy.c:751
-#: commands/copy.c:769
-#: commands/copy.c:777
-#: commands/copy.c:785
-#: commands/copy.c:793
-#: commands/copy.c:801
-#: commands/copy.c:809
-#: commands/copy.c:817
-#: commands/copy.c:833
+#: catalog/aclchk.c:833
+#: catalog/aclchk.c:841
+#: commands/copy.c:863
+#: commands/copy.c:881
+#: commands/copy.c:889
+#: commands/copy.c:897
+#: commands/copy.c:905
+#: commands/copy.c:913
+#: commands/copy.c:921
+#: commands/copy.c:929
+#: commands/copy.c:945
+#: commands/copy.c:959
 #: commands/dbcommands.c:146
 #: commands/dbcommands.c:154
 #: commands/dbcommands.c:162
@@ -2771,449 +2420,490 @@ msgstr "le tablespace 
 #: commands/dbcommands.c:194
 #: commands/dbcommands.c:1315
 #: commands/dbcommands.c:1323
-#: commands/functioncmds.c:485
-#: commands/functioncmds.c:575
-#: commands/functioncmds.c:583
-#: commands/functioncmds.c:591
-#: commands/functioncmds.c:1953
-#: commands/functioncmds.c:1961
-#: commands/sequence.c:1025
-#: commands/sequence.c:1033
-#: commands/sequence.c:1041
-#: commands/sequence.c:1049
-#: commands/sequence.c:1057
-#: commands/sequence.c:1065
-#: commands/sequence.c:1073
-#: commands/sequence.c:1081
-#: commands/typecmds.c:274
-#: commands/user.c:140
-#: commands/user.c:157
-#: commands/user.c:165
-#: commands/user.c:173
-#: commands/user.c:181
-#: commands/user.c:189
-#: commands/user.c:197
-#: commands/user.c:205
-#: commands/user.c:213
-#: commands/user.c:221
-#: commands/user.c:229
-#: commands/user.c:467
-#: commands/user.c:479
-#: commands/user.c:487
-#: commands/user.c:495
-#: commands/user.c:503
-#: commands/user.c:511
-#: commands/user.c:519
-#: commands/user.c:528
-#: commands/user.c:536
+#: commands/foreigncmds.c:396
+#: commands/foreigncmds.c:405
+#: commands/functioncmds.c:488
+#: commands/functioncmds.c:578
+#: commands/functioncmds.c:586
+#: commands/functioncmds.c:594
+#: commands/functioncmds.c:1982
+#: commands/functioncmds.c:1990
+#: commands/user.c:133
+#: commands/user.c:150
+#: commands/user.c:158
+#: commands/user.c:166
+#: commands/user.c:174
+#: commands/user.c:182
+#: commands/user.c:190
+#: commands/user.c:198
+#: commands/user.c:206
+#: commands/user.c:214
+#: commands/user.c:222
+#: commands/user.c:230
+#: commands/user.c:501
+#: commands/user.c:513
+#: commands/user.c:521
+#: commands/user.c:529
+#: commands/user.c:537
+#: commands/user.c:545
+#: commands/user.c:553
+#: commands/user.c:561
+#: commands/user.c:570
+#: commands/user.c:578
+#: commands/sequence.c:1135
+#: commands/sequence.c:1143
+#: commands/sequence.c:1151
+#: commands/sequence.c:1159
+#: commands/sequence.c:1167
+#: commands/sequence.c:1175
+#: commands/sequence.c:1183
+#: commands/sequence.c:1191
+#: commands/typecmds.c:282
+#: commands/extension.c:1249
+#: commands/extension.c:1257
+#: commands/extension.c:1265
+#: commands/extension.c:2483
+#: commands/collationcmds.c:93
 msgid "conflicting or redundant options"
 msgstr "options en conflit ou redondantes"
 
-#: catalog/aclchk.c:968
+#: catalog/aclchk.c:932
 msgid "default privileges cannot be set for columns"
 msgstr "les droits par défaut ne peuvent pas être configurés pour les colonnes"
 
-#: catalog/aclchk.c:1470
-#: commands/analyze.c:341
-#: commands/comment.c:651
-#: commands/copy.c:3441
-#: commands/sequence.c:1309
-#: commands/tablecmds.c:3952
-#: commands/tablecmds.c:4042
-#: commands/tablecmds.c:4089
-#: commands/tablecmds.c:4185
-#: commands/tablecmds.c:4229
-#: commands/tablecmds.c:4308
-#: commands/tablecmds.c:4389
-#: commands/tablecmds.c:5840
-#: commands/tablecmds.c:5980
-#: commands/trigger.c:527
-#: parser/analyze.c:1823
-#: parser/parse_relation.c:1996
-#: parser/parse_relation.c:2051
-#: parser/parse_target.c:808
+#: catalog/aclchk.c:1428
+#: catalog/objectaddress.c:541
+#: commands/analyze.c:343
+#: commands/copy.c:3774
+#: commands/sequence.c:1419
+#: commands/tablecmds.c:4591
+#: commands/tablecmds.c:4681
+#: commands/tablecmds.c:4728
+#: commands/tablecmds.c:4824
+#: commands/tablecmds.c:4868
+#: commands/tablecmds.c:4947
+#: commands/tablecmds.c:5031
+#: commands/tablecmds.c:6647
+#: commands/tablecmds.c:6856
+#: commands/trigger.c:585
+#: parser/analyze.c:2039
+#: parser/parse_relation.c:2043
+#: parser/parse_relation.c:2100
+#: parser/parse_target.c:895
 #: parser/parse_type.c:117
-#: utils/adt/acl.c:2770
-#: utils/adt/ruleutils.c:1524
+#: utils/adt/acl.c:2772
+#: utils/adt/ruleutils.c:1580
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
 msgstr "la colonne « %s » de la relation « %s » n'existe pas"
 
-#: catalog/aclchk.c:1735
-#: commands/comment.c:566
-#: commands/sequence.c:953
-#: commands/tablecmds.c:200
-#: commands/tablecmds.c:2146
-#: commands/tablecmds.c:2365
-#: commands/tablecmds.c:7815
-#: utils/adt/acl.c:2006
-#: utils/adt/acl.c:2036
-#: utils/adt/acl.c:2068
-#: utils/adt/acl.c:2100
-#: utils/adt/acl.c:2128
-#: utils/adt/acl.c:2158
+#: catalog/aclchk.c:1693
+#: catalog/objectaddress.c:398
+#: commands/sequence.c:1035
+#: commands/tablecmds.c:208
+#: commands/tablecmds.c:2247
+#: commands/tablecmds.c:2494
+#: commands/tablecmds.c:8968
+#: utils/adt/acl.c:2008
+#: utils/adt/acl.c:2038
+#: utils/adt/acl.c:2070
+#: utils/adt/acl.c:2102
+#: utils/adt/acl.c:2130
+#: utils/adt/acl.c:2160
 #, c-format
 msgid "\"%s\" is not a sequence"
 msgstr "« %s » n'est pas une séquence"
 
-#: catalog/aclchk.c:1773
+#: catalog/aclchk.c:1731
 #, c-format
 msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
 msgstr "la séquence « %s » accepte seulement les droits USAGE, SELECT et UPDATE"
 
-#: catalog/aclchk.c:1790
+#: catalog/aclchk.c:1748
 msgid "invalid privilege type USAGE for table"
 msgstr "droit USAGE invalide pour la table"
 
-#: catalog/aclchk.c:1940
+#: catalog/aclchk.c:1913
 #, c-format
 msgid "invalid privilege type %s for column"
 msgstr "type de droit %s invalide pour la colonne"
 
-#: catalog/aclchk.c:1953
+#: catalog/aclchk.c:1926
 #, c-format
 msgid "sequence \"%s\" only supports SELECT column privileges"
 msgstr "la séquence « %s » accepte seulement le droit SELECT pour les colonnes"
 
-#: catalog/aclchk.c:2537
+#: catalog/aclchk.c:2510
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "le langage « %s » n'est pas de confiance"
 
-#: catalog/aclchk.c:2539
+#: catalog/aclchk.c:2512
 msgid "Only superusers can use untrusted languages."
 msgstr ""
 "Seuls les super-utilisateurs peuvent utiliser des langages qui ne sont pas\n"
 "de confiance."
 
-#: catalog/aclchk.c:3046
+#: catalog/aclchk.c:3019
 #, c-format
 msgid "unrecognized privilege type \"%s\""
 msgstr "droit « %s » non reconnu"
 
-#: catalog/aclchk.c:3095
+#: catalog/aclchk.c:3068
 #, c-format
 msgid "permission denied for column %s"
 msgstr "droit refusé pour la colonne %s"
 
-#: catalog/aclchk.c:3097
+#: catalog/aclchk.c:3070
 #, c-format
 msgid "permission denied for relation %s"
 msgstr "droit refusé pour la relation %s"
 
-#: catalog/aclchk.c:3099
-#: commands/sequence.c:469
-#: commands/sequence.c:668
-#: commands/sequence.c:710
-#: commands/sequence.c:746
+#: catalog/aclchk.c:3072
+#: commands/sequence.c:550
+#: commands/sequence.c:749
+#: commands/sequence.c:791
+#: commands/sequence.c:827
+#: commands/sequence.c:1470
 #, c-format
 msgid "permission denied for sequence %s"
 msgstr "droit refusé pour la séquence %s"
 
-#: catalog/aclchk.c:3101
+#: catalog/aclchk.c:3074
 #, c-format
 msgid "permission denied for database %s"
 msgstr "droit refusé pour la base de données %s"
 
-#: catalog/aclchk.c:3103
+#: catalog/aclchk.c:3076
 #, c-format
 msgid "permission denied for function %s"
 msgstr "droit refusé pour la fonction %s"
 
-#: catalog/aclchk.c:3105
+#: catalog/aclchk.c:3078
 #, c-format
 msgid "permission denied for operator %s"
 msgstr "droit refusé pour l'opérateur %s"
 
-#: catalog/aclchk.c:3107
+#: catalog/aclchk.c:3080
 #, c-format
 msgid "permission denied for type %s"
 msgstr "droit refusé pour le type %s"
 
-#: catalog/aclchk.c:3109
+#: catalog/aclchk.c:3082
 #, c-format
 msgid "permission denied for language %s"
 msgstr "droit refusé pour le langage %s"
 
-#: catalog/aclchk.c:3111
+#: catalog/aclchk.c:3084
 #, c-format
 msgid "permission denied for large object %s"
 msgstr "droit refusé pour le Large Object %s"
 
-#: catalog/aclchk.c:3113
+#: catalog/aclchk.c:3086
 #, c-format
 msgid "permission denied for schema %s"
 msgstr "droit refusé pour le schéma %s"
 
-#: catalog/aclchk.c:3115
+#: catalog/aclchk.c:3088
 #, c-format
 msgid "permission denied for operator class %s"
 msgstr "droit refusé pour la classe d'opérateur %s"
 
-#: catalog/aclchk.c:3117
+#: catalog/aclchk.c:3090
 #, c-format
 msgid "permission denied for operator family %s"
 msgstr "droit refusé pour la famille d'opérateur %s"
 
-#: catalog/aclchk.c:3119
+#: catalog/aclchk.c:3092
+#, c-format
+msgid "permission denied for collation %s"
+msgstr "droit refusé pour le collationnement %s"
+
+#: catalog/aclchk.c:3094
 #, c-format
 msgid "permission denied for conversion %s"
 msgstr "droit refusé pour la conversion %s"
 
-#: catalog/aclchk.c:3121
+#: catalog/aclchk.c:3096
 #, c-format
 msgid "permission denied for tablespace %s"
 msgstr "droit refusé pour le tablespace %s"
 
-#: catalog/aclchk.c:3123
+#: catalog/aclchk.c:3098
 #, c-format
 msgid "permission denied for text search dictionary %s"
 msgstr "droit refusé pour le dictionnaire de recherche plein texte %s"
 
-#: catalog/aclchk.c:3125
+#: catalog/aclchk.c:3100
 #, c-format
 msgid "permission denied for text search configuration %s"
 msgstr "droit refusé pour la configuration de recherche plein texte %s"
 
-#: catalog/aclchk.c:3127
+#: catalog/aclchk.c:3102
 #, c-format
 msgid "permission denied for foreign-data wrapper %s"
 msgstr "droit refusé pour le wrapper de données distantes %s"
 
-#: catalog/aclchk.c:3129
+#: catalog/aclchk.c:3104
 #, c-format
 msgid "permission denied for foreign server %s"
 msgstr "droit refusé pour le serveur distant %s"
 
-#: catalog/aclchk.c:3135
-#: catalog/aclchk.c:3137
+#: catalog/aclchk.c:3106
+#, c-format
+msgid "permission denied for extension %s"
+msgstr "droit refusé pour l'extension %s"
+
+#: catalog/aclchk.c:3112
+#: catalog/aclchk.c:3114
 #, c-format
 msgid "must be owner of relation %s"
 msgstr "doit être le propriétaire de la relation %s"
 
-#: catalog/aclchk.c:3139
+#: catalog/aclchk.c:3116
 #, c-format
 msgid "must be owner of sequence %s"
 msgstr "doit être le propriétaire de la séquence %s"
 
-#: catalog/aclchk.c:3141
+#: catalog/aclchk.c:3118
 #, c-format
 msgid "must be owner of database %s"
 msgstr "doit être le propriétaire de la base de données %s"
 
-#: catalog/aclchk.c:3143
+#: catalog/aclchk.c:3120
 #, c-format
 msgid "must be owner of function %s"
 msgstr "doit être le propriétaire de la fonction %s"
 
-#: catalog/aclchk.c:3145
+#: catalog/aclchk.c:3122
 #, c-format
 msgid "must be owner of operator %s"
 msgstr "doit être le prorpriétaire de l'opérateur %s"
 
-#: catalog/aclchk.c:3147
+#: catalog/aclchk.c:3124
 #, c-format
 msgid "must be owner of type %s"
 msgstr "doit être le propriétaire du type %s"
 
-#: catalog/aclchk.c:3149
+#: catalog/aclchk.c:3126
 #, c-format
 msgid "must be owner of language %s"
 msgstr "doit être le propriétaire du langage %s"
 
-#: catalog/aclchk.c:3151
+#: catalog/aclchk.c:3128
 #, c-format
 msgid "must be owner of large object %s"
 msgstr "doit être le propriétaire du Large Object %s"
 
-#: catalog/aclchk.c:3153
+#: catalog/aclchk.c:3130
 #, c-format
 msgid "must be owner of schema %s"
 msgstr "doit être le propriétaire du schéma %s"
 
-#: catalog/aclchk.c:3155
+#: catalog/aclchk.c:3132
 #, c-format
 msgid "must be owner of operator class %s"
 msgstr "doit être le propriétaire de la classe d'opérateur %s"
 
-#: catalog/aclchk.c:3157
+#: catalog/aclchk.c:3134
 #, c-format
 msgid "must be owner of operator family %s"
 msgstr "doit être le prorpriétaire de la famille d'opérateur %s"
 
-#: catalog/aclchk.c:3159
+#: catalog/aclchk.c:3136
+#, c-format
+msgid "must be owner of collation %s"
+msgstr "doit être le propriétaire du collationnement %s"
+
+#: catalog/aclchk.c:3138
 #, c-format
 msgid "must be owner of conversion %s"
 msgstr "doit être le propriétaire de la conversion %s"
 
-#: catalog/aclchk.c:3161
+#: catalog/aclchk.c:3140
 #, c-format
 msgid "must be owner of tablespace %s"
 msgstr "doit être le propriétaire du tablespace %s"
 
-#: catalog/aclchk.c:3163
+#: catalog/aclchk.c:3142
 #, c-format
 msgid "must be owner of text search dictionary %s"
 msgstr "doit être le propriétaire du dictionnaire de recherche plein texte %s"
 
-#: catalog/aclchk.c:3165
+#: catalog/aclchk.c:3144
 #, c-format
 msgid "must be owner of text search configuration %s"
 msgstr "doit être le propriétaire de la configuration de recherche plein texte %s"
 
-#: catalog/aclchk.c:3167
+#: catalog/aclchk.c:3146
 #, c-format
 msgid "must be owner of foreign-data wrapper %s"
 msgstr "doit être le propriétaire du wrapper de données distantes %s"
 
-#: catalog/aclchk.c:3169
+#: catalog/aclchk.c:3148
 #, c-format
 msgid "must be owner of foreign server %s"
 msgstr "doit être le propriétaire de serveur distant %s"
 
-#: catalog/aclchk.c:3211
+#: catalog/aclchk.c:3150
+#, c-format
+msgid "must be owner of extension %s"
+msgstr "doit être le propriétaire de l'extension %s"
+
+#: catalog/aclchk.c:3192
 #, c-format
 msgid "permission denied for column \"%s\" of relation \"%s\""
 msgstr "droit refusé pour la colonne « %s » de la relation « %s »"
 
-#: catalog/aclchk.c:3238
+#: catalog/aclchk.c:3219
 #, c-format
 msgid "role with OID %u does not exist"
 msgstr "le rôle d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3331
-#: catalog/aclchk.c:3339
+#: catalog/aclchk.c:3312
+#: catalog/aclchk.c:3320
 #, c-format
 msgid "attribute %d of relation with OID %u does not exist"
 msgstr "l'attribut %d de la relation d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3412
-#: catalog/aclchk.c:4232
+#: catalog/aclchk.c:3393
+#: catalog/aclchk.c:4219
 #, c-format
 msgid "relation with OID %u does not exist"
 msgstr "la relation d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3506
-#: catalog/aclchk.c:4596
+#: catalog/aclchk.c:3493
+#: catalog/aclchk.c:4610
 #: utils/adt/dbsize.c:127
 #, c-format
 msgid "database with OID %u does not exist"
 msgstr "la base de données d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3560
-#: catalog/aclchk.c:4310
-#: tcop/fastpath.c:222
+#: catalog/aclchk.c:3547
+#: catalog/aclchk.c:4297
+#: tcop/fastpath.c:221
 #, c-format
 msgid "function with OID %u does not exist"
 msgstr "la fonction d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3614
-#: catalog/aclchk.c:4336
+#: catalog/aclchk.c:3601
+#: catalog/aclchk.c:4323
 #, c-format
 msgid "language with OID %u does not exist"
 msgstr "le langage d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3775
-#: catalog/aclchk.c:4408
+#: catalog/aclchk.c:3762
+#: catalog/aclchk.c:4395
 #, c-format
 msgid "schema with OID %u does not exist"
 msgstr "le schéma d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3829
-#: catalog/aclchk.c:4435
+#: catalog/aclchk.c:3816
+#: catalog/aclchk.c:4422
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "le tablespace d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3887
+#: catalog/aclchk.c:3874
+#: catalog/aclchk.c:4556
 #, c-format
 msgid "foreign-data wrapper with OID %u does not exist"
 msgstr "le wrapper de données distantes d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:3948
-#: catalog/aclchk.c:4569
+#: catalog/aclchk.c:3935
+#: catalog/aclchk.c:4583
 #, c-format
 msgid "foreign server with OID %u does not exist"
 msgstr "le serveur distant d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4258
+#: catalog/aclchk.c:4245
 #, c-format
 msgid "type with OID %u does not exist"
 msgstr "le type d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4284
+#: catalog/aclchk.c:4271
 #, c-format
 msgid "operator with OID %u does not exist"
 msgstr "l'opérateur d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4461
+#: catalog/aclchk.c:4448
 #, c-format
 msgid "operator class with OID %u does not exist"
 msgstr "la classe d'opérateur d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4488
+#: catalog/aclchk.c:4475
 #, c-format
 msgid "operator family with OID %u does not exist"
 msgstr "la famille d'opérateur d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4515
+#: catalog/aclchk.c:4502
 #, c-format
 msgid "text search dictionary with OID %u does not exist"
 msgstr "le dictionnaire de recherche plein texte d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4542
+#: catalog/aclchk.c:4529
 #, c-format
 msgid "text search configuration with OID %u does not exist"
 msgstr "la configuration de recherche plein texte d'OID %u n'existe pas"
 
-#: catalog/aclchk.c:4622
+#: catalog/aclchk.c:4636
+#, c-format
+msgid "collation with OID %u does not exist"
+msgstr "le collationnement d'OID %u n'existe pas"
+
+#: catalog/aclchk.c:4662
 #, c-format
 msgid "conversion with OID %u does not exist"
 msgstr "la conversion d'OID %u n'existe pas"
 
-#: catalog/catalog.c:75
+#: catalog/aclchk.c:4703
+#, c-format
+msgid "extension with OID %u does not exist"
+msgstr "l'extension d'OID %u n'existe pas"
+
+#: catalog/catalog.c:76
 msgid "invalid fork name"
 msgstr "nom du fork invalide"
 
-#: catalog/catalog.c:76
+#: catalog/catalog.c:77
 msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
 msgstr "Les noms de fork valides sont « main », « fsm » et « vm »."
 
-#: catalog/dependency.c:578
+#: catalog/dependency.c:574
 #, c-format
 msgid "cannot drop %s because %s requires it"
 msgstr "n'a pas pu supprimer %s car il est requis par %s"
 
-#: catalog/dependency.c:581
+#: catalog/dependency.c:577
 #, c-format
 msgid "You can drop %s instead."
 msgstr "Vous pouvez supprimer %s à la place."
 
-#: catalog/dependency.c:734
-#: catalog/pg_shdepend.c:560
+#: catalog/dependency.c:738
+#: catalog/pg_shdepend.c:562
 #, c-format
 msgid "cannot drop %s because it is required by the database system"
 msgstr "n'a pas pu supprimer %s car il est requis par le système de bases de données"
 
-#: catalog/dependency.c:848
+#: catalog/dependency.c:854
 #, c-format
 msgid "drop auto-cascades to %s"
 msgstr "DROP cascade automatiquement sur %s"
 
-#: catalog/dependency.c:860
-#: catalog/dependency.c:869
+#: catalog/dependency.c:866
+#: catalog/dependency.c:875
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s dépend de %s"
 
-#: catalog/dependency.c:881
-#: catalog/dependency.c:890
+#: catalog/dependency.c:887
+#: catalog/dependency.c:896
 #, c-format
 msgid "drop cascades to %s"
 msgstr "DROP cascade sur %s"
 
-#: catalog/dependency.c:898
-#: catalog/pg_shdepend.c:671
+#: catalog/dependency.c:904
+#: catalog/pg_shdepend.c:673
 #, c-format
 msgid ""
 "\n"
@@ -3228,466 +2918,522 @@ msgstr[1] ""
 "\n"
 "et %d autres objets (voir le journal applicatif du serveur pour une liste)"
 
-#: catalog/dependency.c:910
+#: catalog/dependency.c:916
 #, c-format
 msgid "cannot drop %s because other objects depend on it"
 msgstr "n'a pas pu supprimer %s car d'autres objets en dépendent"
 
-#: catalog/dependency.c:912
-#: catalog/dependency.c:913
+#: catalog/dependency.c:918
 #: catalog/dependency.c:919
-#: catalog/dependency.c:920
-#: catalog/dependency.c:931
-#: catalog/dependency.c:932
-#: commands/tablecmds.c:658
-#: commands/trigger.c:832
-#: commands/trigger.c:848
-#: commands/trigger.c:860
-#: commands/user.c:902
-#: commands/user.c:903
-#: tcop/postgres.c:4300
-#: storage/lmgr/deadlock.c:942
+#: catalog/dependency.c:925
+#: catalog/dependency.c:926
+#: catalog/dependency.c:937
+#: catalog/dependency.c:938
+#: catalog/objectaddress.c:315
+#: commands/user.c:957
+#: commands/tablecmds.c:689
 #: storage/lmgr/deadlock.c:943
-#: nodes/print.c:85
-#: utils/adt/xml.c:1363
-#: utils/adt/xml.c:1364
-#: utils/adt/xml.c:1370
-#: utils/adt/xml.c:1441
-#: utils/misc/guc.c:4963
-#: utils/misc/guc.c:5231
-#: utils/fmgr/dfmgr.c:381
+#: port/win32/security.c:51
+#: utils/misc/guc.c:5397
+#: utils/misc/guc.c:5711
+#: utils/misc/guc.c:7994
+#: utils/misc/guc.c:8028
+#: utils/misc/guc.c:8062
+#: utils/misc/guc.c:8096
+#: utils/misc/guc.c:8131
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: catalog/dependency.c:914
-#: catalog/dependency.c:921
+#: catalog/dependency.c:920
+#: catalog/dependency.c:927
 msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr "Utilisez DROP ... CASCADE pour supprimer aussi les objets dépendants."
 
-#: catalog/dependency.c:918
+#: catalog/dependency.c:924
 msgid "cannot drop desired object(s) because other objects depend on them"
 msgstr "ne peut pas supprimer les objets désirés car d'autres objets en dépendent"
 
 #. translator: %d always has a value larger than 1
-#: catalog/dependency.c:927
+#: catalog/dependency.c:933
 #, c-format
 msgid "drop cascades to %d other object"
 msgid_plural "drop cascades to %d other objects"
 msgstr[0] "DROP cascade sur %d autre objet"
 msgstr[1] "DROP cascade sur %d autres objets"
 
-#: catalog/dependency.c:2110
+#: catalog/dependency.c:2204
 #, c-format
 msgid " column %s"
 msgstr " colonne %s"
 
-#: catalog/dependency.c:2116
+#: catalog/dependency.c:2210
 #, c-format
 msgid "function %s"
 msgstr "fonction %s"
 
-#: catalog/dependency.c:2121
+#: catalog/dependency.c:2215
 #, c-format
 msgid "type %s"
 msgstr "type %s"
 
-#: catalog/dependency.c:2151
+#: catalog/dependency.c:2245
 #, c-format
 msgid "cast from %s to %s"
 msgstr "conversion de %s en %s"
 
-#: catalog/dependency.c:2178
+#: catalog/dependency.c:2265
+#, c-format
+msgid "collation %s"
+msgstr "collationnement %s"
+
+#: catalog/dependency.c:2289
 #, c-format
 msgid "constraint %s on %s"
 msgstr "contrainte %s sur %s"
 
-#: catalog/dependency.c:2184
+#: catalog/dependency.c:2295
 #, c-format
 msgid "constraint %s"
 msgstr "contrainte %s"
 
-#: catalog/dependency.c:2201
+#: catalog/dependency.c:2312
 #, c-format
 msgid "conversion %s"
 msgstr "conversion %s"
 
-#: catalog/dependency.c:2238
+#: catalog/dependency.c:2349
 #, c-format
 msgid "default for %s"
 msgstr "valeur par défaut pour %s"
 
-#: catalog/dependency.c:2255
+#: catalog/dependency.c:2366
 #, c-format
 msgid "language %s"
 msgstr "langage %s"
 
-#: catalog/dependency.c:2261
+#: catalog/dependency.c:2372
 #, c-format
 msgid "large object %u"
 msgstr "« Large Object » %u"
 
-#: catalog/dependency.c:2266
+#: catalog/dependency.c:2377
 #, c-format
 msgid "operator %s"
 msgstr "opérateur %s"
 
-#: catalog/dependency.c:2298
+#: catalog/dependency.c:2409
 #, c-format
 msgid "operator class %s for access method %s"
 msgstr "classe d'opérateur %s pour la méthode d'accès %s"
 
-#: catalog/dependency.c:2348
+#. translator: %d is the operator strategy (a number), the
+#. first two %s's are data type names, the third %s is the
+#. description of the operator family, and the last %s is the
+#. textual form of the operator with arguments.
+#: catalog/dependency.c:2459
 #, c-format
-msgid "operator %d %s of %s"
-msgstr "opérateur %d %s de %s"
+msgid "operator %d (%s, %s) of %s: %s"
+msgstr "opérateur %d (%s, %s) de %s : %s"
 
-#: catalog/dependency.c:2395
+#. translator: %d is the function number, the first two %s's
+#. are data type names, the third %s is the description of the
+#. operator family, and the last %s is the textual form of the
+#. function with arguments.
+#: catalog/dependency.c:2509
 #, c-format
-msgid "function %d %s of %s"
-msgstr "fonction %d %s de %s"
+msgid "function %d (%s, %s) of %s: %s"
+msgstr "fonction %d (%s, %s) de %s : %s"
 
-#: catalog/dependency.c:2432
+#: catalog/dependency.c:2549
 #, c-format
 msgid "rule %s on "
 msgstr "règle %s active"
 
-#: catalog/dependency.c:2467
+#: catalog/dependency.c:2584
 #, c-format
 msgid "trigger %s on "
 msgstr "trigger %s actif "
 
-#: catalog/dependency.c:2484
+#: catalog/dependency.c:2601
 #, c-format
 msgid "schema %s"
 msgstr "schéma %s"
 
-#: catalog/dependency.c:2497
+#: catalog/dependency.c:2614
 #, c-format
 msgid "text search parser %s"
 msgstr "analyseur %s de la recherche plein texte"
 
-#: catalog/dependency.c:2512
+#: catalog/dependency.c:2629
 #, c-format
 msgid "text search dictionary %s"
 msgstr "dictionnaire %s de la recherche plein texte"
 
-#: catalog/dependency.c:2527
+#: catalog/dependency.c:2644
 #, c-format
 msgid "text search template %s"
 msgstr "modèle %s de la recherche plein texte"
 
-#: catalog/dependency.c:2542
+#: catalog/dependency.c:2659
 #, c-format
 msgid "text search configuration %s"
 msgstr "configuration %s de recherche plein texte"
 
-#: catalog/dependency.c:2550
+#: catalog/dependency.c:2667
 #, c-format
 msgid "role %s"
 msgstr "rôle %s"
 
-#: catalog/dependency.c:2563
+#: catalog/dependency.c:2680
 #, c-format
 msgid "database %s"
 msgstr "base de données %s"
 
-#: catalog/dependency.c:2575
+#: catalog/dependency.c:2692
 #, c-format
 msgid "tablespace %s"
 msgstr "tablespace %s"
 
-#: catalog/dependency.c:2584
+#: catalog/dependency.c:2701
 #, c-format
 msgid "foreign-data wrapper %s"
 msgstr "wrapper de données distantes %s"
 
-#: catalog/dependency.c:2593
+#: catalog/dependency.c:2710
 #, c-format
 msgid "server %s"
 msgstr "serveur %s"
 
-#: catalog/dependency.c:2618
+#: catalog/dependency.c:2735
 #, c-format
 msgid "user mapping for %s"
 msgstr "correspondance utilisateur pour %s"
 
-#: catalog/dependency.c:2652
+#: catalog/dependency.c:2769
 #, c-format
 msgid "default privileges on new relations belonging to role %s"
 msgstr "droits par défaut pour les nouvelles relations appartenant au rôle %s"
 
-#: catalog/dependency.c:2657
+#: catalog/dependency.c:2774
 #, c-format
 msgid "default privileges on new sequences belonging to role %s"
 msgstr "droits par défaut pour les nouvelles séquences appartenant au rôle %s"
 
-#: catalog/dependency.c:2662
+#: catalog/dependency.c:2779
 #, c-format
 msgid "default privileges on new functions belonging to role %s"
 msgstr "droits par défaut pour les nouvelles fonctions appartenant au rôle %s"
 
-#: catalog/dependency.c:2668
+#: catalog/dependency.c:2785
 #, c-format
 msgid "default privileges belonging to role %s"
 msgstr "droits par défaut appartenant au rôle %s"
 
-#: catalog/dependency.c:2676
+#: catalog/dependency.c:2793
 #, c-format
 msgid " in schema %s"
 msgstr " dans le schéma %s"
 
-#: catalog/dependency.c:2724
+#: catalog/dependency.c:2810
+#, c-format
+msgid "extension %s"
+msgstr "extension %s"
+
+#: catalog/dependency.c:2868
 #, c-format
 msgid "table %s"
 msgstr "table %s"
 
-#: catalog/dependency.c:2728
+#: catalog/dependency.c:2872
 #, c-format
 msgid "index %s"
 msgstr "index %s"
 
-#: catalog/dependency.c:2732
+#: catalog/dependency.c:2876
 #, c-format
 msgid "sequence %s"
 msgstr "séquence %s"
 
-#: catalog/dependency.c:2736
+#: catalog/dependency.c:2880
 #, c-format
 msgid "uncataloged table %s"
 msgstr "table %s sans catalogue"
 
-#: catalog/dependency.c:2740
+#: catalog/dependency.c:2884
 #, c-format
 msgid "toast table %s"
 msgstr "table TOAST %s"
 
-#: catalog/dependency.c:2744
+#: catalog/dependency.c:2888
 #, c-format
 msgid "view %s"
 msgstr "vue %s"
 
-#: catalog/dependency.c:2748
+#: catalog/dependency.c:2892
 #, c-format
 msgid "composite type %s"
 msgstr "type composite %s"
 
-#: catalog/dependency.c:2753
+#: catalog/dependency.c:2896
+#, c-format
+msgid "foreign table %s"
+msgstr "table distante %s"
+
+#: catalog/dependency.c:2901
 #, c-format
 msgid "relation %s"
 msgstr "relation %s"
 
-#: catalog/dependency.c:2790
+#: catalog/dependency.c:2938
 #, c-format
 msgid "operator family %s for access method %s"
 msgstr "famille d'opérateur %s pour la méthode d'accès %s"
 
-#: catalog/heap.c:257
+#: catalog/heap.c:264
 #, c-format
 msgid "permission denied to create \"%s.%s\""
 msgstr "droit refusé pour créer « %s.%s »"
 
-#: catalog/heap.c:259
+#: catalog/heap.c:266
 msgid "System catalog modifications are currently disallowed."
 msgstr "Les modifications du catalogue système sont actuellement interdites."
 
-#: catalog/heap.c:380
-#: commands/tablecmds.c:1235
-#: commands/tablecmds.c:1619
-#: commands/tablecmds.c:3723
+#: catalog/heap.c:389
+#: commands/tablecmds.c:1268
+#: commands/tablecmds.c:1685
+#: commands/tablecmds.c:4276
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "les tables peuvent avoir au plus %d colonnes"
 
-#: catalog/heap.c:397
+#: catalog/heap.c:406
 #, c-format
 msgid "column name \"%s\" conflicts with a system column name"
 msgstr "le nom de la colonne « %s » entre en conflit avec le nom d'une colonne système"
 
-#: catalog/heap.c:413
+#: catalog/heap.c:422
 #, c-format
 msgid "column name \"%s\" specified more than once"
 msgstr "colonne « %s » spécifiée plus d'une fois"
 
-#: catalog/heap.c:461
+#: catalog/heap.c:472
 #, c-format
 msgid "column \"%s\" has type \"unknown\""
 msgstr "la colonne « %s » est de type « unknown »"
 
-#: catalog/heap.c:462
+#: catalog/heap.c:473
 msgid "Proceeding with relation creation anyway."
 msgstr "Poursuit malgré tout la création de la relation."
 
-#: catalog/heap.c:475
+#: catalog/heap.c:486
 #, c-format
 msgid "column \"%s\" has pseudo-type %s"
 msgstr "la colonne « %s » a le pseudo type %s"
 
-#: catalog/heap.c:498
+#: catalog/heap.c:516
 #, c-format
 msgid "composite type %s cannot be made a member of itself"
 msgstr "le type composite %s ne peut pas être membre de lui-même"
 
-#: catalog/heap.c:963
-#: catalog/index.c:621
-#: commands/tablecmds.c:2211
+#: catalog/heap.c:558
+#, c-format
+msgid "no collation was derived for column \"%s\" with collatable type %s"
+msgstr "aucun collationnement n'a été dérivé pour la colonne « %s » de type collationnable %s"
+
+#: catalog/heap.c:560
+#: commands/indexcmds.c:931
+#: commands/view.c:145
+#: regex/regc_pg_locale.c:259
+#: utils/adt/formatting.c:1520
+#: utils/adt/formatting.c:1570
+#: utils/adt/formatting.c:1641
+#: utils/adt/formatting.c:1691
+#: utils/adt/formatting.c:1774
+#: utils/adt/formatting.c:1836
+#: utils/adt/like.c:212
+#: utils/adt/selfuncs.c:4912
+#: utils/adt/selfuncs.c:5029
+#: utils/adt/varlena.c:1315
+msgid "Use the COLLATE clause to set the collation explicitly."
+msgstr "Utilisez la clause COLLARE pour configurer explicitement le collationnement."
+
+#: catalog/heap.c:1011
+#: catalog/index.c:769
+#: commands/tablecmds.c:2318
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr "la relation « %s » existe déjà"
 
-#: catalog/heap.c:979
-#: catalog/pg_type.c:385
-#: catalog/pg_type.c:665
-#: commands/typecmds.c:218
-#: commands/typecmds.c:795
-#: commands/typecmds.c:1120
-#: commands/typecmds.c:1543
+#: catalog/heap.c:1027
+#: catalog/pg_type.c:396
+#: catalog/pg_type.c:695
+#: commands/typecmds.c:224
+#: commands/typecmds.c:806
+#: commands/typecmds.c:1145
+#: commands/typecmds.c:1622
 #, c-format
 msgid "type \"%s\" already exists"
 msgstr "le type « %s » existe déjà"
 
-#: catalog/heap.c:980
+#: catalog/heap.c:1028
 msgid "A relation has an associated type of the same name, so you must use a name that doesn't conflict with any existing type."
 msgstr ""
 "Une relation a un type associé du même nom, donc vous devez utiliser un nom\n"
 "qui n'entre pas en conflit avec un type existant."
 
-#: catalog/heap.c:2023
+#: catalog/heap.c:2141
 #, c-format
 msgid "check constraint \"%s\" already exists"
 msgstr "la contrainte de vérification « %s » existe déjà"
 
-#: catalog/heap.c:2167
-#: catalog/pg_constraint.c:639
-#: commands/tablecmds.c:4636
+#: catalog/heap.c:2287
+#: catalog/pg_constraint.c:645
+#: commands/tablecmds.c:5350
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr "la contrainte « %s » de la relation « %s » existe déjà"
 
-#: catalog/heap.c:2171
+#: catalog/heap.c:2291
 #, c-format
 msgid "merging constraint \"%s\" with inherited definition"
 msgstr "assemblage de la contrainte « %s » avec une définition héritée"
 
-#: catalog/heap.c:2269
+#: catalog/heap.c:2389
 msgid "cannot use column references in default expression"
 msgstr "ne peut pas utiliser les références de colonnes dans l'expression par défaut"
 
-#: catalog/heap.c:2277
+#: catalog/heap.c:2397
 msgid "default expression must not return a set"
 msgstr "l'expression par défaut ne doit pas renvoyer un ensemble"
 
-#: catalog/heap.c:2285
+#: catalog/heap.c:2405
 msgid "cannot use subquery in default expression"
 msgstr "ne peut pas utiliser une sous-requête dans l'expression par défaut"
 
-#: catalog/heap.c:2289
+#: catalog/heap.c:2409
 msgid "cannot use aggregate function in default expression"
 msgstr "ne peut pas utiliser une fonction d'agrégat dans une expression par défaut"
 
-#: catalog/heap.c:2293
+#: catalog/heap.c:2413
 msgid "cannot use window function in default expression"
 msgstr "ne peut pas utiliser une fonction window dans une expression par défaut"
 
-#: catalog/heap.c:2312
-#: rewrite/rewriteHandler.c:952
+#: catalog/heap.c:2432
+#: rewrite/rewriteHandler.c:1030
 #, c-format
 msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "la colonne « %s » est de type %s alors que l'expression par défaut est de type %s"
 
-#: catalog/heap.c:2317
-#: commands/prepare.c:369
-#: parser/parse_node.c:370
-#: parser/parse_target.c:475
-#: parser/parse_target.c:734
-#: parser/parse_target.c:744
-#: rewrite/rewriteHandler.c:957
+#: catalog/heap.c:2437
+#: commands/prepare.c:370
+#: parser/parse_node.c:397
+#: parser/parse_target.c:489
+#: parser/parse_target.c:735
+#: parser/parse_target.c:745
+#: rewrite/rewriteHandler.c:1035
 msgid "You will need to rewrite or cast the expression."
 msgstr "Vous devez réécrire l'expression ou lui appliquer une transformation de type."
 
-#: catalog/heap.c:2353
+#: catalog/heap.c:2483
 #, c-format
 msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "seule la table « %s » peut être référencée dans la contrainte de vérification"
 
-#: catalog/heap.c:2362
-#: commands/typecmds.c:2298
+#: catalog/heap.c:2492
+#: commands/typecmds.c:2386
 msgid "cannot use subquery in check constraint"
 msgstr "ne peut pas utiliser une sous-requête dans la contrainte de vérification"
 
-#: catalog/heap.c:2366
-#: commands/typecmds.c:2302
+#: catalog/heap.c:2496
+#: commands/typecmds.c:2390
 msgid "cannot use aggregate function in check constraint"
 msgstr "ne peut pas utiliser une fonction d'aggrégat dans une contrainte de vérification"
 
-#: catalog/heap.c:2370
-#: commands/typecmds.c:2306
+#: catalog/heap.c:2500
+#: commands/typecmds.c:2394
 msgid "cannot use window function in check constraint"
 msgstr "ne peut pas utiliser une fonction window dans une contrainte de vérification"
 
-#: catalog/heap.c:2609
+#: catalog/heap.c:2739
 msgid "unsupported ON COMMIT and foreign key combination"
 msgstr "combinaison ON COMMIT et clé étrangère non supportée"
 
-#: catalog/heap.c:2610
+#: catalog/heap.c:2740
 #, c-format
 msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
 msgstr ""
 "La table « %s » référence « %s » mais elles n'ont pas la même valeur pour le\n"
 "paramètre ON COMMIT."
 
-#: catalog/heap.c:2615
+#: catalog/heap.c:2745
 msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr "ne peut pas tronquer une table référencée dans une contrainte de clé étrangère"
 
-#: catalog/heap.c:2616
+#: catalog/heap.c:2746
 #, c-format
 msgid "Table \"%s\" references \"%s\"."
 msgstr "La table « %s » référence « %s »."
 
-#: catalog/heap.c:2618
+#: catalog/heap.c:2748
 #, c-format
 msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
 msgstr "Tronquez la table « %s » en même temps, ou utilisez TRUNCATE ... CASCADE."
 
-#: catalog/index.c:582
+#: catalog/index.c:202
+#: parser/parse_utilcmd.c:1296
+#: parser/parse_utilcmd.c:1382
+#, c-format
+msgid "multiple primary keys for table \"%s\" are not allowed"
+msgstr "les clés primaires multiples ne sont pas autorisées pour la table « %s »"
+
+#: catalog/index.c:220
+msgid "primary keys cannot be expressions"
+msgstr "les clés primaires ne peuvent pas être des expressions"
+
+#: catalog/index.c:730
+#: catalog/index.c:1124
 msgid "user-defined indexes on system catalog tables are not supported"
 msgstr "les index définis par l'utilisateur sur les tables du catalogue système ne sont pas supportés"
 
-#: catalog/index.c:592
+#: catalog/index.c:740
 msgid "concurrent index creation on system catalog tables is not supported"
 msgstr ""
 "la création en parallèle d'un index sur les tables du catalogue système\n"
 "n'est pas supportée"
 
-#: catalog/index.c:610
+#: catalog/index.c:758
 msgid "shared indexes cannot be created after initdb"
 msgstr "les index partagés ne peuvent pas être créés après initdb"
 
-#: catalog/index.c:2432
+#: catalog/index.c:1727
+#, c-format
+msgid "building index \"%s\" on table \"%s\""
+msgstr "construction de l'index « %s » sur la table « %s »"
+
+#: catalog/index.c:2800
 msgid "cannot reindex temporary tables of other sessions"
 msgstr "ne peut pas ré-indexer les tables temporaires des autres sessions"
 
-#: catalog/namespace.c:232
-#: catalog/namespace.c:306
-#: commands/trigger.c:3961
+#: catalog/namespace.c:234
+#: catalog/namespace.c:318
+#: commands/trigger.c:4147
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
 msgstr "les références entre bases de données ne sont pas implémentées : « %s.%s.%s »"
 
-#: catalog/namespace.c:250
-#: catalog/namespace.c:317
+#: catalog/namespace.c:260
 msgid "temporary tables cannot specify a schema name"
 msgstr "les tables temporaires ne peuvent pas spécifier un nom de schéma"
 
-#: catalog/namespace.c:273
+#: catalog/namespace.c:285
 #: commands/lockcmds.c:122
 #: parser/parse_relation.c:835
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relation « %s.%s » n'existe pas"
 
-#: catalog/namespace.c:278
+#: catalog/namespace.c:290
 #: commands/lockcmds.c:127
 #: parser/parse_relation.c:848
 #: parser/parse_relation.c:856
@@ -3697,64 +3443,210 @@ msgid "relation \"%s\" does not exist"
 msgstr "la relation « %s » n'existe pas"
 
 #: catalog/namespace.c:358
-#: catalog/namespace.c:2410
+#: catalog/namespace.c:2589
 msgid "no schema has been selected to create in"
 msgstr "aucun schéma n'a été sélectionné pour cette création"
 
-#: catalog/namespace.c:1748
-#: commands/tsearchcmds.c:306
+#: catalog/namespace.c:410
+#: catalog/namespace.c:423
+msgid "cannot create relations in temporary schemas of other sessions"
+msgstr "ne peut pas créer les relations dans les schémas temporaires d'autres sessions"
+
+#: catalog/namespace.c:414
+msgid "cannot create temporary relation in non-temporary schema"
+msgstr "ne peut pas créer une relation temporaire dans un schéma non temporaire"
+
+#: catalog/namespace.c:429
+msgid "only temporary relations may be created in temporary schemas"
+msgstr "seules les relations temporaires peuvent être créées dans des schémas temporaires"
+
+#: catalog/namespace.c:1906
+#: commands/tsearchcmds.c:320
 #, c-format
 msgid "text search parser \"%s\" does not exist"
 msgstr "l'analyseur de recherche plein texte « %s » n'existe pas"
 
-#: catalog/namespace.c:1871
-#: commands/tsearchcmds.c:654
+#: catalog/namespace.c:2029
+#: commands/tsearchcmds.c:769
 #, c-format
 msgid "text search dictionary \"%s\" does not exist"
 msgstr "le dictionnaire de recherche plein texte « %s » n'existe pas"
 
-#: catalog/namespace.c:1995
-#: commands/tsearchcmds.c:1137
+#: catalog/namespace.c:2153
+#: commands/tsearchcmds.c:1304
 #, c-format
 msgid "text search template \"%s\" does not exist"
 msgstr "le modèle de recherche plein texte « %s » n'existe pas"
 
-#: catalog/namespace.c:2118
-#: commands/tsearchcmds.c:1532
-#: commands/tsearchcmds.c:1688
+#: catalog/namespace.c:2276
+#: commands/tsearchcmds.c:1753
+#: commands/tsearchcmds.c:1909
 #, c-format
 msgid "text search configuration \"%s\" does not exist"
 msgstr "la configuration de recherche plein texte « %s » n'existe pas"
 
-#: catalog/namespace.c:2231
-#: parser/parse_expr.c:769
-#: parser/parse_target.c:998
+#: catalog/namespace.c:2389
+#: parser/parse_expr.c:775
+#: parser/parse_target.c:1085
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "les références entre bases de données ne sont pas implémentées : %s"
 
-#: catalog/namespace.c:2237
-#: parser/parse_expr.c:776
-#: parser/parse_target.c:1005
-#: gram.y:3673
-#: gram.y:10605
+#: catalog/namespace.c:2395
+#: parser/parse_expr.c:782
+#: parser/parse_target.c:1092
+#: gram.y:11611
+#: gram.y:12810
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "mauvaise qualification du nom (trop de points entre les noms) : %s"
 
-#: catalog/namespace.c:2442
-#, c-format
-msgid "improper relation name (too many dotted names): %s"
-msgstr "nom de relation incorrecte (trop de points entre les noms) : %s"
-
-#: catalog/namespace.c:3024
+#: catalog/namespace.c:2523
 #, c-format
-msgid "permission denied to create temporary tables in database \"%s\""
-msgstr "droit refusé pour la création de tables temporaires dans la base de données « %s »"
+msgid "%s is already in schema \"%s\""
+msgstr "%s existe déjà dans le schéma « %s »"
 
-#: catalog/namespace.c:3040
-msgid "cannot create temporary tables during recovery"
-msgstr "ne peut pas créer des tables temporaires lors de la restauration"
+#: catalog/namespace.c:2531
+msgid "cannot move objects into or out of temporary schemas"
+msgstr "ne peut pas déplacer les objets dans ou à partir des schémas temporaires"
+
+#: catalog/namespace.c:2537
+msgid "cannot move objects into or out of TOAST schema"
+msgstr "ne peut pas déplacer les objets dans ou à partir des schémas TOAST"
+
+#: catalog/namespace.c:2610
+#: catalog/namespace.c:3595
+#: catalog/namespace.c:3598
+#: commands/schemacmds.c:253
+#: commands/schemacmds.c:322
+#, c-format
+msgid "schema \"%s\" does not exist"
+msgstr "le schéma « %s » n'existe pas"
+
+#: catalog/namespace.c:2641
+#, c-format
+msgid "improper relation name (too many dotted names): %s"
+msgstr "nom de relation incorrecte (trop de points entre les noms) : %s"
+
+#: catalog/namespace.c:3040
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" does not exist"
+msgstr "le collationnement « %s » pour l'encodage « %s » n'existe pas"
+
+#: catalog/namespace.c:3092
+#, c-format
+msgid "conversion \"%s\" does not exist"
+msgstr "la conversion « %s » n'existe pas"
+
+#: catalog/namespace.c:3297
+#, c-format
+msgid "permission denied to create temporary tables in database \"%s\""
+msgstr "droit refusé pour la création de tables temporaires dans la base de données « %s »"
+
+#: catalog/namespace.c:3313
+msgid "cannot create temporary tables during recovery"
+msgstr "ne peut pas créer des tables temporaires lors de la restauration"
+
+#: catalog/namespace.c:3557
+#: commands/tablespace.c:1121
+#: commands/variable.c:59
+#: replication/syncrep.c:656
+#: utils/misc/guc.c:8161
+msgid "List syntax is invalid."
+msgstr "La syntaxe de la liste est invalide."
+
+#: catalog/objectaddress.c:286
+msgid "database name cannot be qualified"
+msgstr "le nom de la base de donnée ne peut être qualifié"
+
+#: catalog/objectaddress.c:289
+#: commands/extension.c:1595
+#: commands/extension.c:2255
+msgid "extension name cannot be qualified"
+msgstr "le nom de l'extension ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:292
+msgid "tablespace name cannot be qualified"
+msgstr "le nom du tablespace ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:295
+msgid "role name cannot be qualified"
+msgstr "le nom du rôle ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:298
+#: commands/schemacmds.c:178
+msgid "schema name cannot be qualified"
+msgstr "le nom du schéma ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:301
+msgid "language name cannot be qualified"
+msgstr "le nom du langage ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:304
+msgid "foreign-data wrapper name cannot be qualified"
+msgstr "le nom du wrapper de données distantes ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:307
+msgid "server name cannot be qualified"
+msgstr "le nom du serveur ne peut pas être qualifié"
+
+#: catalog/objectaddress.c:405
+#: catalog/toasting.c:91
+#: commands/indexcmds.c:200
+#: commands/indexcmds.c:1574
+#: commands/lockcmds.c:149
+#: commands/tablecmds.c:202
+#: commands/tablecmds.c:1129
+#: commands/tablecmds.c:2478
+#: commands/tablecmds.c:3825
+#: commands/tablecmds.c:6759
+#, c-format
+msgid "\"%s\" is not a table"
+msgstr "« %s » n'est pas une table"
+
+#: catalog/objectaddress.c:412
+#: commands/tablecmds.c:214
+#: commands/tablecmds.c:2253
+#: commands/tablecmds.c:2510
+#: commands/tablecmds.c:3840
+#: commands/tablecmds.c:8976
+#: commands/view.c:181
+#, c-format
+msgid "\"%s\" is not a view"
+msgstr "« %s » n'est pas une vue"
+
+#: catalog/objectaddress.c:419
+#: commands/tablecmds.c:232
+#: commands/tablecmds.c:2259
+#: commands/tablecmds.c:2518
+#: commands/tablecmds.c:3843
+#: commands/tablecmds.c:8984
+#, c-format
+msgid "\"%s\" is not a foreign table"
+msgstr "« %s » n'est pas une table distante"
+
+#: catalog/objectaddress.c:824
+#: catalog/pg_largeobject.c:200
+#: libpq/be-fsstubs.c:287
+#, c-format
+msgid "must be owner of large object %u"
+msgstr "doit être le propriétaire du Large Object %u"
+
+#: catalog/objectaddress.c:839
+#: commands/functioncmds.c:1526
+#: commands/functioncmds.c:1814
+#, c-format
+msgid "must be owner of type %s or type %s"
+msgstr "doit être le propriétaire du type %s ou du type %s"
+
+#: catalog/objectaddress.c:870
+#: catalog/objectaddress.c:886
+msgid "must be superuser"
+msgstr "doit être super-utilisateur"
+
+#: catalog/objectaddress.c:877
+msgid "must have CREATEROLE privilege"
+msgstr "doit avoir l'attribut CREATEROLE"
 
 #: catalog/pg_aggregate.c:100
 msgid "cannot determine transition data type"
@@ -3779,7 +3671,7 @@ msgstr ""
 "entrée"
 
 #: catalog/pg_aggregate.c:175
-#: catalog/pg_proc.c:204
+#: catalog/pg_proc.c:205
 msgid "cannot determine result data type"
 msgstr "n'a pas pu déterminer le type de données en résultat"
 
@@ -3790,12 +3682,12 @@ msgstr ""
 "de type polymorphique."
 
 #: catalog/pg_aggregate.c:188
-#: catalog/pg_proc.c:210
+#: catalog/pg_proc.c:211
 msgid "unsafe use of pseudo-type \"internal\""
 msgstr "utilisation non sûre des pseudo-types « INTERNAL »"
 
 #: catalog/pg_aggregate.c:189
-#: catalog/pg_proc.c:211
+#: catalog/pg_proc.c:212
 msgid "A function returning \"internal\" must have at least one \"internal\" argument."
 msgstr ""
 "Une fonction renvoyant « internal » doit avoir au moins un argument du type\n"
@@ -3806,16 +3698,16 @@ msgid "sort operator can only be specified for single-argument aggregates"
 msgstr "l'opérateur de tri peut seulement être indiqué pour des agrégats à un seul argument"
 
 #: catalog/pg_aggregate.c:331
-#: commands/typecmds.c:1269
-#: commands/typecmds.c:1320
-#: commands/typecmds.c:1351
-#: commands/typecmds.c:1374
-#: commands/typecmds.c:1395
-#: commands/typecmds.c:1422
-#: commands/typecmds.c:1449
-#: parser/parse_func.c:294
-#: parser/parse_func.c:305
-#: parser/parse_func.c:1464
+#: commands/typecmds.c:1350
+#: commands/typecmds.c:1401
+#: commands/typecmds.c:1432
+#: commands/typecmds.c:1455
+#: commands/typecmds.c:1476
+#: commands/typecmds.c:1503
+#: commands/typecmds.c:1530
+#: parser/parse_func.c:288
+#: parser/parse_func.c:299
+#: parser/parse_func.c:1481
 #, c-format
 msgid "function %s does not exist"
 msgstr "la fonction %s n'existe pas"
@@ -3830,216 +3722,222 @@ msgstr "la fonction %s renvoie un ensemble"
 msgid "function %s requires run-time type coercion"
 msgstr "la fonction %s requiert une coercion sur le type à l'exécution"
 
-#: catalog/pg_constraint.c:648
-#: commands/typecmds.c:2239
+#: catalog/pg_constraint.c:654
+#: commands/typecmds.c:2321
 #, c-format
 msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr "la contrainte « %s » du domaine « %s » existe déjà"
 
-#: catalog/pg_constraint.c:767
+#: catalog/pg_constraint.c:773
 #, c-format
 msgid "table \"%s\" has multiple constraints named \"%s\""
 msgstr "la table « %s » a de nombreuses contraintes nommées « %s »"
 
-#: catalog/pg_constraint.c:779
+#: catalog/pg_constraint.c:785
 #, c-format
 msgid "constraint \"%s\" for table \"%s\" does not exist"
 msgstr "la contrainte « %s » de la table « %s » n'existe pas"
 
-#: catalog/pg_conversion.c:66
+#: catalog/pg_conversion.c:67
 #, c-format
 msgid "conversion \"%s\" already exists"
 msgstr "la conversion « %s » existe déjà"
 
-#: catalog/pg_conversion.c:79
+#: catalog/pg_conversion.c:80
 #, c-format
 msgid "default conversion for %s to %s already exists"
 msgstr "la conversion par défaut de %s vers %s existe déjà"
 
-#: catalog/pg_depend.c:209
+#: catalog/pg_depend.c:164
+#: commands/extension.c:2735
+#, c-format
+msgid "%s is already a member of extension \"%s\""
+msgstr "%s est déjà un membre de l'extension « %s »"
+
+#: catalog/pg_depend.c:323
 #, c-format
 msgid "cannot remove dependency on %s because it is a system object"
 msgstr "ne peut pas supprimer la dépendance sur %s car il s'agit d'un objet système"
 
-#: catalog/pg_enum.c:70
-msgid "EnumValuesCreate() can only set a single OID"
-msgstr "EnumValuesCreate() peut seulement initialiser un seul OID"
-
-#: catalog/pg_enum.c:110
+#: catalog/pg_enum.c:113
+#: catalog/pg_enum.c:199
 #, c-format
 msgid "invalid enum label \"%s\""
 msgstr "nom du label enum « %s » invalide"
 
-#: catalog/pg_enum.c:111
+#: catalog/pg_enum.c:114
+#: catalog/pg_enum.c:200
 #, c-format
 msgid "Labels must be %d characters or less."
 msgstr "Les labels doivent avoir au plus %d caractères"
 
-#: catalog/pg_largeobject.c:200
-#: commands/comment.c:1422
-#: libpq/be-fsstubs.c:287
+#: catalog/pg_enum.c:264
 #, c-format
-msgid "must be owner of large object %u"
-msgstr "doit être le propriétaire du Large Object %u"
+msgid "\"%s\" is not an existing enum label"
+msgstr "« %s » n'est pas un label enum existant"
+
+#: catalog/pg_enum.c:325
+msgid "ALTER TYPE ADD BEFORE/AFTER is incompatible with binary upgrade"
+msgstr "ALTER TYPE ADD BEFORE/AFTER est incompatible avec la mise à jour binaire"
 
-#: catalog/pg_namespace.c:50
-#: commands/schemacmds.c:272
+#: catalog/pg_namespace.c:52
+#: commands/schemacmds.c:259
 #, c-format
 msgid "schema \"%s\" already exists"
 msgstr "le schéma « %s » existe déjà"
 
-#: catalog/pg_operator.c:220
-#: catalog/pg_operator.c:358
+#: catalog/pg_operator.c:221
+#: catalog/pg_operator.c:363
 #, c-format
 msgid "\"%s\" is not a valid operator name"
 msgstr "« %s » n'est pas un nom d'opérateur valide"
 
-#: catalog/pg_operator.c:367
+#: catalog/pg_operator.c:372
 msgid "only binary operators can have commutators"
 msgstr "seuls les opérateurs binaires peuvent avoir des commutateurs"
 
-#: catalog/pg_operator.c:371
+#: catalog/pg_operator.c:376
 msgid "only binary operators can have join selectivity"
 msgstr "seuls les opérateurs binaires peuvent avoir une sélectivité des jointures"
 
-#: catalog/pg_operator.c:375
+#: catalog/pg_operator.c:380
 msgid "only binary operators can merge join"
 msgstr "seuls les opérateurs binaires peuvent exécuter des jointures MERGE"
 
-#: catalog/pg_operator.c:379
+#: catalog/pg_operator.c:384
 msgid "only binary operators can hash"
 msgstr "seuls les opérateurs binaires ont du hachage"
 
-#: catalog/pg_operator.c:390
+#: catalog/pg_operator.c:395
 msgid "only boolean operators can have negators"
 msgstr "seuls les opérateurs booléens peuvent avoir des négations"
 
-#: catalog/pg_operator.c:394
+#: catalog/pg_operator.c:399
 msgid "only boolean operators can have restriction selectivity"
 msgstr "seuls les opérateurs booléens peuvent avoir une sélectivité des restrictions"
 
-#: catalog/pg_operator.c:398
+#: catalog/pg_operator.c:403
 msgid "only boolean operators can have join selectivity"
 msgstr "seuls les opérateurs booléens peuvent avoir une sélectivité des jointures"
 
-#: catalog/pg_operator.c:402
+#: catalog/pg_operator.c:407
 msgid "only boolean operators can merge join"
 msgstr "seuls les opérateurs booléens peuvent exécuter des jointures MERGE"
 
-#: catalog/pg_operator.c:406
+#: catalog/pg_operator.c:411
 msgid "only boolean operators can hash"
 msgstr "seuls les opérateurs booléens peuvent hacher"
 
-#: catalog/pg_operator.c:418
+#: catalog/pg_operator.c:423
 #, c-format
 msgid "operator %s already exists"
 msgstr "l'opérateur %s existe déjà"
 
-#: catalog/pg_operator.c:607
+#: catalog/pg_operator.c:616
 msgid "operator cannot be its own negator or sort operator"
 msgstr "l'opérateur ne peut pas être son propre opérateur de négation ou de tri"
 
-#: catalog/pg_proc.c:123
-#: parser/parse_func.c:1509
-#: parser/parse_func.c:1549
+#: catalog/pg_proc.c:124
+#: parser/parse_func.c:1526
+#: parser/parse_func.c:1566
 #, c-format
 msgid "functions cannot have more than %d argument"
 msgid_plural "functions cannot have more than %d arguments"
 msgstr[0] "les fonctions ne peuvent avoir plus de %d argument"
 msgstr[1] "les fonctions ne peuvent avoir plus de %d arguments"
 
-#: catalog/pg_proc.c:205
+#: catalog/pg_proc.c:206
 msgid "A function returning a polymorphic type must have at least one polymorphic argument."
 msgstr ""
 "Une fonction renvoyant un type polymorphique doit avoir au moins un argument\n"
 "de type polymorphique."
 
-#: catalog/pg_proc.c:223
+#: catalog/pg_proc.c:224
 #, c-format
 msgid "\"%s\" is already an attribute of type %s"
 msgstr "« %s » est déjà un attribut du type %s"
 
-#: catalog/pg_proc.c:362
+#: catalog/pg_proc.c:363
 #, c-format
 msgid "function \"%s\" already exists with same argument types"
 msgstr "la fonction « %s » existe déjà avec des types d'arguments identiques"
 
-#: catalog/pg_proc.c:376
-#: catalog/pg_proc.c:398
+#: catalog/pg_proc.c:377
+#: catalog/pg_proc.c:399
 msgid "cannot change return type of existing function"
 msgstr "ne peut pas modifier le type de retour d'une fonction existante"
 
-#: catalog/pg_proc.c:377
-#: catalog/pg_proc.c:400
-#: catalog/pg_proc.c:442
-#: catalog/pg_proc.c:465
-#: catalog/pg_proc.c:491
+#: catalog/pg_proc.c:378
+#: catalog/pg_proc.c:401
+#: catalog/pg_proc.c:443
+#: catalog/pg_proc.c:466
+#: catalog/pg_proc.c:492
 msgid "Use DROP FUNCTION first."
 msgstr "Utilisez tout d'abord DROP FUNCTION."
 
-#: catalog/pg_proc.c:399
+#: catalog/pg_proc.c:400
 msgid "Row type defined by OUT parameters is different."
 msgstr "Le type de ligne défini par les paramètres OUT est différent."
 
-#: catalog/pg_proc.c:440
+#: catalog/pg_proc.c:441
 #, c-format
 msgid "cannot change name of input parameter \"%s\""
 msgstr "ne peut pas modifier le nom du paramètre en entrée « %s »"
 
-#: catalog/pg_proc.c:464
+#: catalog/pg_proc.c:465
 msgid "cannot remove parameter defaults from existing function"
 msgstr ""
 "ne peut pas supprimer les valeurs par défaut des paramètres de la\n"
 "fonction existante"
 
-#: catalog/pg_proc.c:490
+#: catalog/pg_proc.c:491
 msgid "cannot change data type of existing parameter default value"
 msgstr ""
 "ne peut pas modifier le type de données d'un paramètre avec une valeur\n"
 "par défaut"
 
-#: catalog/pg_proc.c:502
+#: catalog/pg_proc.c:503
 #, c-format
 msgid "function \"%s\" is an aggregate function"
 msgstr "la fonction « %s » est une fonction d'agrégat"
 
-#: catalog/pg_proc.c:507
+#: catalog/pg_proc.c:508
 #, c-format
 msgid "function \"%s\" is not an aggregate function"
 msgstr "la fonction « %s » n'est pas une fonction d'agrégat"
 
-#: catalog/pg_proc.c:515
+#: catalog/pg_proc.c:516
 #, c-format
 msgid "function \"%s\" is a window function"
 msgstr "la fonction « %s » est une fonction window"
 
-#: catalog/pg_proc.c:520
+#: catalog/pg_proc.c:521
 #, c-format
 msgid "function \"%s\" is not a window function"
 msgstr "la fonction « %s » n'est pas une fonction window"
 
-#: catalog/pg_proc.c:688
+#: catalog/pg_proc.c:693
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "il n'existe pas de fonction intégrée nommée « %s »"
 
-#: catalog/pg_proc.c:780
+#: catalog/pg_proc.c:785
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "les fonctions SQL ne peuvent pas renvoyer un type %s"
 
-#: catalog/pg_proc.c:795
+#: catalog/pg_proc.c:800
 #, c-format
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "les fonctions SQL ne peuvent avoir d'arguments du type %s"
 
-#: catalog/pg_proc.c:861
-#: executor/functions.c:936
+#: catalog/pg_proc.c:886
+#: executor/functions.c:1162
 #, c-format
 msgid "SQL function \"%s\""
 msgstr "Fonction SQL « %s »"
 
-#: catalog/pg_shdepend.c:678
+#: catalog/pg_shdepend.c:680
 #, c-format
 msgid ""
 "\n"
@@ -4056,117 +3954,101 @@ msgstr[1] ""
 "et des objets dans %d autres bases de données (voir le journal applicatif du\n"
 "serveur pour une liste)"
 
-#: catalog/pg_shdepend.c:990
+#: catalog/pg_shdepend.c:992
 #, c-format
 msgid "role %u was concurrently dropped"
 msgstr "le rôle %u a été supprimé simultanément"
 
-#: catalog/pg_shdepend.c:1009
+#: catalog/pg_shdepend.c:1011
 #, c-format
 msgid "tablespace %u was concurrently dropped"
 msgstr "le tablespace %u a été supprimé simultanément"
 
-#: catalog/pg_shdepend.c:1024
+#: catalog/pg_shdepend.c:1026
 #, c-format
 msgid "database %u was concurrently dropped"
 msgstr "la base de données %u a été supprimé simultanément"
 
-#: catalog/pg_shdepend.c:1068
+#: catalog/pg_shdepend.c:1070
 #, c-format
 msgid "owner of %s"
 msgstr "propriétaire de %s"
 
-#: catalog/pg_shdepend.c:1070
+#: catalog/pg_shdepend.c:1072
 #, c-format
 msgid "privileges for %s"
 msgstr "droits pour « %s »"
 
 #. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1078
+#: catalog/pg_shdepend.c:1080
 #, c-format
 msgid "%d object in %s"
 msgid_plural "%d objects in %s"
 msgstr[0] "%d objet dans %s"
 msgstr[1] "%d objets dans %s"
 
-#: catalog/pg_shdepend.c:1189
-#: catalog/pg_shdepend.c:1285
+#: catalog/pg_shdepend.c:1191
 #, c-format
 msgid "cannot drop objects owned by %s because they are required by the database system"
 msgstr ""
 "n'a pas pu supprimer les objets appartenant à %s car ils sont nécessaires au\n"
 "système de bases de données"
 
-#: catalog/pg_type.c:231
+#: catalog/pg_shdepend.c:1287
+#, c-format
+msgid "cannot reassign ownership of objects owned by %s because they are required by the database system"
+msgstr ""
+"ne peut pas réaffecter les objets appartenant à %s car ils sont nécessaires au\n"
+"système de bases de données"
+
+#: catalog/pg_type.c:241
 #, c-format
 msgid "invalid type internal size %d"
 msgstr "taille interne de type invalide %d"
 
-#: catalog/pg_type.c:247
-#: catalog/pg_type.c:255
-#: catalog/pg_type.c:263
-#: catalog/pg_type.c:272
+#: catalog/pg_type.c:257
+#: catalog/pg_type.c:265
+#: catalog/pg_type.c:273
+#: catalog/pg_type.c:282
 #, c-format
 msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
 msgstr "l'alignement « %c » est invalide pour le type passé par valeur de taille %d"
 
-#: catalog/pg_type.c:279
+#: catalog/pg_type.c:289
 #, c-format
 msgid "internal size %d is invalid for passed-by-value type"
 msgstr "la taille interne %d est invalide pour le type passé par valeur"
 
-#: catalog/pg_type.c:288
-#: catalog/pg_type.c:294
+#: catalog/pg_type.c:298
+#: catalog/pg_type.c:304
 #, c-format
 msgid "alignment \"%c\" is invalid for variable-length type"
 msgstr "l'alignement « %c » est invalide pour le type de longueur variable"
 
-#: catalog/pg_type.c:302
+#: catalog/pg_type.c:312
 msgid "fixed-size types must have storage PLAIN"
 msgstr "les types de taille fixe doivent avoir un stockage de base"
 
-#: catalog/pg_type.c:730
+#: catalog/pg_type.c:760
 #, c-format
 msgid "could not form array type name for type \"%s\""
 msgstr "n'a pas pu former le nom du type array pour le type de données %s"
 
-#: commands/view.c:139
-msgid "view must have at least one column"
-msgstr "la vue doit avoir au moins une colonne"
-
-#: commands/view.c:163
-#: commands/comment.c:580
-#: commands/tablecmds.c:206
-#: commands/tablecmds.c:2152
-#: commands/tablecmds.c:2373
-#: commands/tablecmds.c:7823
-#, c-format
-msgid "\"%s\" is not a view"
-msgstr "« %s » n'est pas une vue"
-
-#: commands/view.c:260
-#: commands/view.c:272
-msgid "cannot drop columns from view"
-msgstr "ne peut pas supprimer les colonnes d'une vue"
-
-#: commands/view.c:277
-#, c-format
-msgid "cannot change name of view column \"%s\" to \"%s\""
-msgstr "ne peut pas modifier le nom de la colonne « %s » de la vue en « %s »"
+#: catalog/toasting.c:142
+msgid "shared tables cannot be toasted after initdb"
+msgstr ""
+"les tables partagées ne peuvent pas avoir une table TOAST après la commande\n"
+"initdb"
 
-#: commands/view.c:285
+#: catalog/pg_collation.c:75
 #, c-format
-msgid "cannot change data type of view column \"%s\" from %s to %s"
-msgstr "ne peut pas modifier le type de données de la colonne « %s » de la vue de %s à %s"
-
-#: commands/view.c:441
-msgid "CREATE VIEW specifies more column names than columns"
-msgstr "CREATE VIEW spécifie plus de noms de colonnes que de colonnes"
+msgid "collation \"%s\" for encoding \"%s\" already exists"
+msgstr "le collationnement « %s » pour l'encodage « %s » existe déjà"
 
-#: commands/view.c:457
+#: catalog/pg_collation.c:89
 #, c-format
-msgid "view \"%s\" will be a temporary view"
-msgstr "la vue « %s » sera une vue temporaire"
+msgid "collation \"%s\" already exists"
+msgstr "le collationnement « %s » existe déjà"
 
 #: commands/aggregatecmds.c:103
 #, c-format
@@ -4200,51 +4082,66 @@ msgid "aggregate %s(%s) does not exist, skipping"
 msgstr "L'agrégat %s(%s) n'existe pas, poursuite du traitement"
 
 #: commands/aggregatecmds.c:292
-#: commands/functioncmds.c:1119
+#: commands/functioncmds.c:1122
 #, c-format
 msgid "function %s already exists in schema \"%s\""
 msgstr "la fonction %s existe déjà dans le schéma « %s »"
 
-#: commands/analyze.c:166
+#: commands/alter.c:423
+#, c-format
+msgid "must be superuser to set schema of %s"
+msgstr "doit être super-utilisateur pour configurer le schéma de %s"
+
+#: commands/alter.c:451
+#, c-format
+msgid "%s already exists in schema \"%s\""
+msgstr "%s existe déjà dans le schéma « %s »"
+
+#: commands/analyze.c:153
+#, c-format
+msgid "skipping analyze of \"%s\" --- lock not available"
+msgstr "ignore l'analyse de « %s » --- verrou non disponible"
+
+#: commands/analyze.c:170
 #, c-format
 msgid "skipping \"%s\" --- only superuser can analyze it"
 msgstr "ignore « %s » --- seul le super-utilisateur peut l'analyser"
 
-#: commands/analyze.c:170
+#: commands/analyze.c:174
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
 msgstr ""
 "ignore « %s » --- seul le super-utilisateur ou le propriétaire de la base de\n"
 "données peut l'analyser"
 
-#: commands/analyze.c:174
+#: commands/analyze.c:178
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can analyze it"
 msgstr ""
 "ignore « %s » --- seul le propriétaire de la table ou de la base de données\n"
 "peut l'analyser"
 
-#: commands/analyze.c:190
+#: commands/analyze.c:194
 #, c-format
-msgid "skipping \"%s\" --- cannot analyze indexes, views, or special system tables"
-msgstr "ignore « %s » --- ne peut pas analyser les index, vues ou tables système"
+msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
+msgstr "ignore « %s » --- ne peut pas analyser les objets autres que les tables et les tables système"
 
-#: commands/analyze.c:283
+#: commands/analyze.c:285
 #, c-format
 msgid "analyzing \"%s.%s\" inheritance tree"
 msgstr "analyse l'arbre d'héritage « %s.%s »"
 
-#: commands/analyze.c:288
+#: commands/analyze.c:290
 #, c-format
 msgid "analyzing \"%s.%s\""
 msgstr "analyse « %s.%s »"
 
-#: commands/analyze.c:609
+#: commands/analyze.c:598
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
 msgstr "ANALYZE automatique de la table « %s.%s.%s » ; utilisation système : %s"
 
-#: commands/analyze.c:1249
+#: commands/analyze.c:1238
 #, c-format
 msgid "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead rows; %d rows in sample, %.0f estimated total rows"
 msgstr ""
@@ -4253,8 +4150,8 @@ msgstr ""
 "  %d lignes dans l'échantillon,\n"
 "  %.0f lignes totales estimées"
 
-#: commands/analyze.c:1510
-#: executor/execQual.c:2735
+#: commands/analyze.c:1499
+#: executor/execQual.c:2734
 msgid "could not convert row type"
 msgstr "n'a pas pu convertir le type de ligne"
 
@@ -4280,617 +4177,507 @@ msgstr ""
 msgid "too many notifications in the NOTIFY queue"
 msgstr "trop de notifications dans la queue NOTIFY"
 
-#: commands/async.c:1421
+#: commands/async.c:1430
 #, c-format
 msgid "NOTIFY queue is %.0f%% full"
 msgstr "la queue NOTIFY est pleine à %.0f%%"
 
-#: commands/async.c:1423
+#: commands/async.c:1432
 #, c-format
 msgid "The server process with PID %d is among those with the oldest transactions."
 msgstr "Le processus serveur de PID %d est parmi ceux qui ont les transactions les plus anciennes."
 
-#: commands/async.c:1426
+#: commands/async.c:1435
 msgid "The NOTIFY queue cannot be emptied until that process ends its current transaction."
 msgstr ""
 "La queue NOTIFY ne peut pas être vidée jusqu'à ce que le processus finisse\n"
 "sa transaction en cours."
 
-#: commands/cluster.c:126
-#: commands/cluster.c:364
+#: commands/cluster.c:134
+#: commands/cluster.c:372
 msgid "cannot cluster temporary tables of other sessions"
 msgstr "ne peut pas exécuter CLUSTER sur les tables temporaires des autres sessions"
 
-#: commands/cluster.c:156
+#: commands/cluster.c:164
 #, c-format
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "Il n'existe pas d'index CLUSTER pour la table « %s »"
 
-#: commands/cluster.c:170
-#: commands/tablecmds.c:6773
+#: commands/cluster.c:178
+#: commands/tablecmds.c:7659
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "l'index « %s » pour la table « %s » n'existe pas"
 
-#: commands/cluster.c:353
+#: commands/cluster.c:361
 msgid "cannot cluster a shared catalog"
 msgstr "ne peut pas exécuter CLUSTER sur un catalogue partagé"
 
-#: commands/cluster.c:368
+#: commands/cluster.c:376
 msgid "cannot vacuum temporary tables of other sessions"
 msgstr "ne peut pas exécuter VACUUM sur les tables temporaires des autres sessions"
 
-#: commands/cluster.c:384
-#, c-format
-msgid "clustering \"%s.%s\""
-msgstr "exécution de CLUSTER sur « %s.%s »"
-
-#: commands/cluster.c:389
-#: commands/vacuumlazy.c:320
-#, c-format
-msgid "vacuuming \"%s.%s\""
-msgstr "exécution du VACUUM sur « %s.%s »"
-
-#: commands/cluster.c:421
+#: commands/cluster.c:426
 #, c-format
 msgid "\"%s\" is not an index for table \"%s\""
 msgstr "« %s » n'est pas un index de la table « %s »"
 
-#: commands/cluster.c:429
+#: commands/cluster.c:434
 #, c-format
 msgid "cannot cluster on index \"%s\" because access method does not support clustering"
 msgstr ""
 "ne peut pas exécuter CLUSTER sur l'index « %s » car la méthode d'accès de\n"
 "l'index ne gère pas cette commande"
 
-#: commands/cluster.c:441
+#: commands/cluster.c:446
 #, c-format
 msgid "cannot cluster on partial index \"%s\""
 msgstr "ne peut pas exécuter CLUSTER sur l'index partiel « %s »"
 
-#: commands/cluster.c:461
-#, c-format
-msgid "cannot cluster on index \"%s\" because access method does not handle null values"
-msgstr ""
-"ne peut pas créer un cluster sur l'index « %s » car la méthode d'accès de\n"
-"l'index ne gère pas les valeurs NULL"
-
-#: commands/cluster.c:464
-#, c-format
-msgid "You might be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table."
-msgstr ""
-"Vous pourriez contourner ceci en marquant la colonne « %s » avec la\n"
-"contrainte NOT NULL ou en utilisant ALTER TABLE ... SET WITHOUT CLUSTER pour\n"
-"supprimer la spécification CLUSTER de la table."
-
-#: commands/cluster.c:466
-#, c-format
-msgid "You might be able to work around this by marking column \"%s\" NOT NULL."
-msgstr "Vous pouvez contourner ceci en marquant la colonne « %s » comme NOT NULL."
-
-#: commands/cluster.c:477
-#, c-format
-msgid "cannot cluster on expressional index \"%s\" because its index access method does not handle null values"
-msgstr ""
-"ne peut pas exécuter CLUSTER sur l'index à expression « %s » car sa méthode\n"
-"d'accès ne gère pas les valeurs NULL"
-
-#: commands/cluster.c:492
+#: commands/cluster.c:460
 #, c-format
 msgid "cannot cluster on invalid index \"%s\""
 msgstr "ne peut pas exécuter la commande CLUSTER sur l'index invalide « %s »"
 
-#: commands/comment.c:642
-#, c-format
-msgid "\"%s\" is not a table, view, or composite type"
-msgstr "« %s » n'est pas une table, une vue ou un type composite"
-
-#: commands/comment.c:681
-msgid "database name cannot be qualified"
-msgstr "le nom de la base de donnée ne peut être qualifié"
-
-#: commands/comment.c:729
-msgid "tablespace name cannot be qualified"
-msgstr "le nom du tablespace ne peut pas être qualifié"
-
-#: commands/comment.c:766
-msgid "role name cannot be qualified"
-msgstr "le nom du rôle ne peut pas être qualifié"
-
-#: commands/comment.c:775
-#, c-format
-msgid "must be member of role \"%s\" to comment upon it"
-msgstr "doit être un membre du rôle « %s » pour le commenter"
-
-#: commands/comment.c:799
-#: commands/schemacmds.c:178
-msgid "schema name cannot be qualified"
-msgstr "le nom du schéma ne peut pas être qualifié"
-
-#: commands/comment.c:874
-#, c-format
-msgid "rule \"%s\" does not exist"
-msgstr "la règle « %s » n'existe pas"
-
-#: commands/comment.c:882
-#, c-format
-msgid "there are multiple rules named \"%s\""
-msgstr "il existe de nombreuses règles nommées « %s »"
-
-#: commands/comment.c:883
-msgid "Specify a relation name as well as a rule name."
-msgstr "Spécifier un nom de relation ainsi qu'un nom de règle."
-
-#: commands/comment.c:910
-#: rewrite/rewriteDefine.c:687
-#: rewrite/rewriteDefine.c:749
-#: rewrite/rewriteRemove.c:62
-#, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist"
-msgstr "la règle « %s » de la relation « %s » n'existe pas"
-
-#: commands/comment.c:1105
-#: commands/trigger.c:994
-#: commands/trigger.c:1194
-#: commands/trigger.c:1305
+#: commands/cluster.c:883
 #, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist"
-msgstr "le trigger « %s » de la table « %s » n'existe pas"
+msgid "clustering \"%s.%s\" using index scan on \"%s\""
+msgstr "cluster sur « %s.%s » en utilisant un parcours d'index sur « %s »"
 
-#: commands/comment.c:1183
-#: commands/conversioncmds.c:153
-#: commands/conversioncmds.c:209
-#: commands/conversioncmds.c:262
+#: commands/cluster.c:889
 #, c-format
-msgid "conversion \"%s\" does not exist"
-msgstr "la conversion « %s » n'existe pas"
+msgid "clustering \"%s.%s\" using sequential scan and sort"
+msgstr "cluster sur « %s.%s » en utilisant un parcours séquentiel puis un tri"
 
-#: commands/comment.c:1213
-msgid "language name cannot be qualified"
-msgstr "le nom du langage ne peut pas être qualifié"
-
-#: commands/comment.c:1226
-msgid "must be superuser to comment on procedural language"
-msgstr ""
-"doit être super-utilisateur pour ajouter un commentaire sur un langage de\n"
-"procédures"
-
-#: commands/comment.c:1261
-#: commands/comment.c:1342
-#: commands/indexcmds.c:295
-#: commands/opclasscmds.c:281
-#: commands/opclasscmds.c:669
-#: commands/opclasscmds.c:769
-#: commands/opclasscmds.c:1495
-#: commands/opclasscmds.c:1556
-#: commands/opclasscmds.c:1718
-#: commands/opclasscmds.c:1812
-#: commands/opclasscmds.c:1903
-#: commands/opclasscmds.c:2046
+#: commands/cluster.c:894
+#: commands/vacuumlazy.c:339
 #, c-format
-msgid "access method \"%s\" does not exist"
-msgstr "la méthode d'accès « %s » n'existe pas"
+msgid "vacuuming \"%s.%s\""
+msgstr "exécution du VACUUM sur « %s.%s »"
 
-#: commands/comment.c:1289
-#: commands/comment.c:1297
-#: commands/indexcmds.c:1149
-#: commands/indexcmds.c:1157
-#: commands/opclasscmds.c:1507
-#: commands/opclasscmds.c:1511
-#: commands/opclasscmds.c:1739
-#: commands/opclasscmds.c:1750
-#: commands/opclasscmds.c:1926
-#: commands/opclasscmds.c:1937
+#: commands/cluster.c:1054
 #, c-format
-msgid "operator class \"%s\" does not exist for access method \"%s\""
-msgstr "la classe d'opérateur « %s » n'existe pas pour la méthode d'accès « %s »"
+msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
+msgstr ""
+"« %s » : %.0f versions de ligne supprimables, %.0f non supprimables\n"
+"parmi %u pages"
 
-#: commands/comment.c:1370
-#: commands/comment.c:1378
-#: commands/opclasscmds.c:343
-#: commands/opclasscmds.c:789
-#: commands/opclasscmds.c:1568
-#: commands/opclasscmds.c:1572
-#: commands/opclasscmds.c:1833
-#: commands/opclasscmds.c:1844
-#: commands/opclasscmds.c:2069
-#: commands/opclasscmds.c:2080
+#: commands/cluster.c:1058
 #, c-format
-msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "la famille d'opérateur « %s » n'existe pas pour la méthode d'accès « %s »"
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"%s."
+msgstr ""
+"%.0f versions de lignes ne peuvent pas encore être supprimées.\n"
+"%s."
 
-#: commands/comment.c:1469
-#: commands/functioncmds.c:1777
+#: commands/comment.c:60
+#: commands/dbcommands.c:764
+#: commands/dbcommands.c:909
+#: commands/dbcommands.c:1008
+#: commands/dbcommands.c:1181
+#: commands/dbcommands.c:1366
+#: commands/dbcommands.c:1451
+#: commands/dbcommands.c:1854
+#: utils/init/postinit.c:709
+#: utils/init/postinit.c:777
+#: utils/init/postinit.c:794
 #, c-format
-msgid "cast from type %s to type %s does not exist"
-msgstr "la conversion du type %s vers le type %s n'existe pas"
+msgid "database \"%s\" does not exist"
+msgstr "la base de données « %s » n'existe pas"
 
-#: commands/comment.c:1481
-#: commands/functioncmds.c:1522
-#: commands/functioncmds.c:1794
+#: commands/comment.c:97
+#: commands/seclabel.c:113
 #, c-format
-msgid "must be owner of type %s or type %s"
-msgstr "doit être le propriétaire du type %s ou du type %s"
-
-#: commands/comment.c:1501
-msgid "must be superuser to comment on text search parser"
-msgstr ""
-"doit être super-utilisateur pour ajouter un commentaire sur l'analyseur de\n"
-"recherche plein texte"
-
-#: commands/comment.c:1530
-msgid "must be superuser to comment on text search template"
-msgstr ""
-"doit être super-utilisateur pour ajouter un commentaire sur un modèle de\n"
-"recherche plein texte"
+msgid "\"%s\" is not a table, view, composite type, or foreign table"
+msgstr "« %s » n'est ni une table, ni une vue, ni un type composite, ni une table distante"
 
 #: commands/constraint.c:59
-#: utils/adt/ri_triggers.c:2999
+#: utils/adt/ri_triggers.c:3082
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr "la fonction « %s » n'a pas été appelée par le gestionnaire de triggers"
 
 #: commands/constraint.c:66
-#: utils/adt/ri_triggers.c:3008
+#: utils/adt/ri_triggers.c:3091
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr "la fonction « %s » doit être exécutée pour l'instruction AFTER ROW"
 
 #: commands/constraint.c:80
-#: utils/adt/ri_triggers.c:3029
+#: utils/adt/ri_triggers.c:3112
 #, c-format
 msgid "function \"%s\" must be fired for INSERT or UPDATE"
 msgstr "la fonction « %s » doit être exécutée pour les instructions INSERT ou UPDATE"
 
-#: commands/conversioncmds.c:69
+#: commands/conversioncmds.c:71
 #, c-format
 msgid "source encoding \"%s\" does not exist"
 msgstr "le codage source « %s » n'existe pas"
 
-#: commands/conversioncmds.c:76
+#: commands/conversioncmds.c:78
 #, c-format
 msgid "destination encoding \"%s\" does not exist"
 msgstr "l'encodage de destination « %s » n'existe pas"
 
-#: commands/conversioncmds.c:90
+#: commands/conversioncmds.c:92
 #, c-format
 msgid "encoding conversion function %s must return type \"void\""
 msgstr "la fonction de conversion d'encodage %s doit renvoyer le type « void »"
 
-#: commands/conversioncmds.c:159
+#: commands/conversioncmds.c:152
 #, c-format
 msgid "conversion \"%s\" does not exist, skipping"
 msgstr "la conversion « %s » n'existe pas, poursuite du traitement"
 
-#: commands/conversioncmds.c:224
+#: commands/conversioncmds.c:211
 #, c-format
 msgid "conversion \"%s\" already exists in schema \"%s\""
 msgstr "la conversion « %s » existe déjà dans le schéma « %s »"
 
-#: commands/copy.c:312
-#: commands/copy.c:324
-#: commands/copy.c:358
-#: commands/copy.c:368
+#: commands/copy.c:339
+#: commands/copy.c:351
+#: commands/copy.c:385
+#: commands/copy.c:395
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr "COPY BINARY n'est pas supporté vers stdout ou à partir de stdin"
 
-#: commands/copy.c:446
+#: commands/copy.c:473
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "n'a pas pu écrire dans le fichier COPY : %m"
 
-#: commands/copy.c:458
+#: commands/copy.c:485
 msgid "connection lost during COPY to stdout"
 msgstr "connexion perdue lors de l'opération COPY vers stdout"
 
-#: commands/copy.c:499
+#: commands/copy.c:526
 #, c-format
 msgid "could not read from COPY file: %m"
 msgstr "n'a pas pu lire le fichier COPY : %m"
 
-#: commands/copy.c:515
-#: commands/copy.c:534
-#: commands/copy.c:538
-#: tcop/fastpath.c:291
-#: tcop/postgres.c:348
-#: tcop/postgres.c:371
+#: commands/copy.c:542
+#: commands/copy.c:561
+#: commands/copy.c:565
+#: tcop/fastpath.c:290
+#: tcop/postgres.c:349
+#: tcop/postgres.c:372
 msgid "unexpected EOF on client connection"
 msgstr "fin de fichier (EOF) inattendue de la connexion du client"
 
-#: commands/copy.c:550
+#: commands/copy.c:577
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "échec de la commande COPY à partir de stdin : %s"
 
-#: commands/copy.c:566
+#: commands/copy.c:593
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "type 0x%02X du message, inattendu, lors d'une opération COPY à partir de stdin"
 
-#: commands/copy.c:762
+#: commands/copy.c:745
+msgid "must be superuser to COPY to or from a file"
+msgstr "doit être super-utilisateur pour utiliser COPY à partir ou vers un fichier"
+
+#: commands/copy.c:746
+msgid "Anyone can COPY to stdout or from stdin. psql's \\copy command also works for anyone."
+msgstr ""
+"Tout le monde peut utiliser COPY vers stdout ou à partir de stdin.\n"
+"La commande \\copy de psql fonctionne aussi pour tout le monde."
+
+#: commands/copy.c:874
 #, c-format
 msgid "COPY format \"%s\" not recognized"
 msgstr "format COPY « %s » non reconnu"
 
-#: commands/copy.c:825
-#: commands/copy.c:839
+#: commands/copy.c:937
+#: commands/copy.c:951
 #, c-format
 msgid "argument to option \"%s\" must be a list of column names"
 msgstr "l'argument de l'option « %s » doit être une liste de noms de colonnes"
 
-#: commands/copy.c:845
+#: commands/copy.c:964
+#, c-format
+msgid "argument to option \"%s\" must be a valid encoding name"
+msgstr "l'argument de l'option « %s » doit être un nom d'encodage valide"
+
+#: commands/copy.c:970
 #, c-format
 msgid "option \"%s\" not recognized"
 msgstr "option « %s » non reconnu"
 
-#: commands/copy.c:856
+#: commands/copy.c:981
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "ne peut pas spécifier le délimiteur (DELIMITER) en mode binaire (BINARY)"
 
-#: commands/copy.c:861
+#: commands/copy.c:986
 msgid "cannot specify NULL in BINARY mode"
 msgstr "ne peut pas spécifier NULL en mode binaire (BINARY)"
 
-#: commands/copy.c:883
+#: commands/copy.c:1008
 msgid "COPY delimiter must be a single one-byte character"
 msgstr "le délimiteur COPY doit être sur un seul caractère sur un octet"
 
-#: commands/copy.c:890
+#: commands/copy.c:1015
 msgid "COPY delimiter cannot be newline or carriage return"
 msgstr "le délimiteur de COPY ne peut pas être un retour à la ligne ou un retour chariot"
 
-#: commands/copy.c:896
+#: commands/copy.c:1021
 msgid "COPY null representation cannot use newline or carriage return"
 msgstr ""
 "la représentation du NULL dans COPY ne peut pas utiliser le caractère du\n"
 "retour à la ligne ou du retour chariot"
 
-#: commands/copy.c:913
+#: commands/copy.c:1038
 #, c-format
 msgid "COPY delimiter cannot be \"%s\""
 msgstr "le délimiteur de COPY ne peut pas être « %s »"
 
-#: commands/copy.c:919
+#: commands/copy.c:1044
 msgid "COPY HEADER available only in CSV mode"
 msgstr "COPY HEADER disponible uniquement en mode CSV"
 
-#: commands/copy.c:925
+#: commands/copy.c:1050
 msgid "COPY quote available only in CSV mode"
 msgstr "le guillemet COPY n'est disponible que dans le mode CSV"
 
-#: commands/copy.c:930
+#: commands/copy.c:1055
 msgid "COPY quote must be a single one-byte character"
 msgstr "le guillemet COPY doit être sur un seul caractère sur un octet"
 
-#: commands/copy.c:935
+#: commands/copy.c:1060
 msgid "COPY delimiter and quote must be different"
 msgstr "le délimiteur de COPY ne doit pas être un guillemet"
 
-#: commands/copy.c:941
+#: commands/copy.c:1066
 msgid "COPY escape available only in CSV mode"
 msgstr "le caractère d'échappement COPY n'est disponible que dans le mode CSV"
 
-#: commands/copy.c:946
+#: commands/copy.c:1071
 msgid "COPY escape must be a single one-byte character"
 msgstr "le caractère d'échappement COPY doit être sur un seul caractère sur un octet"
 
-#: commands/copy.c:952
+#: commands/copy.c:1077
 msgid "COPY force quote available only in CSV mode"
 msgstr "le guillemet forcé COPY n'est disponible que dans le mode CSV"
 
-#: commands/copy.c:956
+#: commands/copy.c:1081
 msgid "COPY force quote only available using COPY TO"
 msgstr "le guillemet forcé COPY n'est disponible qu'en utilisant COPY TO"
 
-#: commands/copy.c:962
+#: commands/copy.c:1087
 msgid "COPY force not null available only in CSV mode"
 msgstr "« COPY force not null » n'est disponible que dans la version CSV"
 
-#: commands/copy.c:966
+#: commands/copy.c:1091
 msgid "COPY force not null only available using COPY FROM"
 msgstr "« COPY force not null » n'est disponible qu'en utilisant COPY FROM"
 
-#: commands/copy.c:972
+#: commands/copy.c:1097
 msgid "COPY delimiter must not appear in the NULL specification"
 msgstr "le délimiteur COPY ne doit pas apparaître dans la spécification de NULL"
 
-#: commands/copy.c:979
+#: commands/copy.c:1104
 msgid "CSV quote character must not appear in the NULL specification"
 msgstr "le caractère guillemet de CSV ne doit pas apparaître dans la spécification de NULL"
 
-#: commands/copy.c:985
-msgid "must be superuser to COPY to or from a file"
-msgstr "doit être super-utilisateur pour utiliser COPY à partir ou vers un fichier"
-
-#: commands/copy.c:986
-msgid "Anyone can COPY to stdout or from stdin. psql's \\copy command also works for anyone."
-msgstr ""
-"Tout le monde peut utiliser COPY vers stdout ou à partir de stdin.\n"
-"La commande \\copy de psql fonctionne aussi pour tout le monde."
-
-#: commands/copy.c:1032
+#: commands/copy.c:1166
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "la table « %s » n'a pas d'OID"
 
-#: commands/copy.c:1049
+#: commands/copy.c:1183
 msgid "COPY (SELECT) WITH OIDS is not supported"
 msgstr "COPY (SELECT) WITH OIDS n'est pas supporté"
 
-#: commands/copy.c:1076
+#: commands/copy.c:1210
 msgid "COPY (SELECT INTO) is not supported"
 msgstr "COPY (SELECT INTO) n'est pas supporté"
 
-#: commands/copy.c:1135
+#: commands/copy.c:1270
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
 msgstr "la colonne « %s » FORCE QUOTE n'est pas référencée par COPY"
 
-#: commands/copy.c:1157
+#: commands/copy.c:1292
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
 msgstr "la colonne « %s » FORCE NOT NULL n'est pas référencée par COPY"
 
-#: commands/copy.c:1235
+#: commands/copy.c:1356
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "ne peut pas copier à partir de la vue « %s »"
 
-#: commands/copy.c:1237
+#: commands/copy.c:1358
+#: commands/copy.c:1364
 msgid "Try the COPY (SELECT ...) TO variant."
 msgstr "Tentez la variante COPY (SELECT ...) TO."
 
-#: commands/copy.c:1241
+#: commands/copy.c:1362
+#, c-format
+msgid "cannot copy from foreign table \"%s\""
+msgstr "ne peut pas copier à partir de la table distante « %s »"
+
+#: commands/copy.c:1368
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "ne peut pas copier à partir de la séquence « %s »"
 
-#: commands/copy.c:1246
+#: commands/copy.c:1373
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "ne peut pas copier à partir de la relation « %s », qui n'est pas une table"
 
-#: commands/copy.c:1270
+#: commands/copy.c:1397
 msgid "relative path not allowed for COPY to file"
 msgstr "un chemin relatif n'est pas autorisé à utiliser COPY vers un fichier"
 
-#: commands/copy.c:1279
+#: commands/copy.c:1407
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » en écriture : %m"
 
-#: commands/copy.c:1286
-#: commands/copy.c:1781
+#: commands/copy.c:1414
+#: commands/copy.c:2200
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
 
-#: commands/copy.c:1572
+#: commands/copy.c:1738
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, ligne %d, colonne %s"
 
-#: commands/copy.c:1576
-#: commands/copy.c:1621
+#: commands/copy.c:1742
+#: commands/copy.c:1787
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, ligne %d"
 
-#: commands/copy.c:1587
+#: commands/copy.c:1753
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, ligne %d, colonne %s : « %s »"
 
-#: commands/copy.c:1595
+#: commands/copy.c:1761
 #, c-format
 msgid "COPY %s, line %d, column %s: null input"
 msgstr "COPY %s, ligne %d, colonne %s : NULL en entrée"
 
-#: commands/copy.c:1607
+#: commands/copy.c:1773
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, ligne %d : « %s »"
 
-#: commands/copy.c:1709
+#: commands/copy.c:1857
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "ne peut pas copier vers la vue « %s »"
 
-#: commands/copy.c:1714
+#: commands/copy.c:1862
+#, c-format
+msgid "cannot copy to foreign table \"%s\""
+msgstr "ne peut pas copier vers la table distante « %s »"
+
+#: commands/copy.c:1867
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "ne peut pas copier vers la séquence « %s »"
 
-#: commands/copy.c:1719
+#: commands/copy.c:1872
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "ne peut pas copier vers une relation « %s » qui n'est pas une table"
 
-#: commands/copy.c:1774
-#: utils/adt/genfile.c:106
+#: commands/copy.c:2193
+#: utils/adt/genfile.c:122
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "n'a pas pu ouvrir le fichier « %s » pour une lecture : %m"
 
-#: commands/copy.c:1887
+#: commands/copy.c:2219
 msgid "COPY file signature not recognized"
 msgstr "la signature du fichier COPY n'est pas reconnue"
 
-#: commands/copy.c:1892
+#: commands/copy.c:2224
 msgid "invalid COPY file header (missing flags)"
 msgstr "en-tête du fichier COPY invalide (options manquantes)"
 
-#: commands/copy.c:1898
+#: commands/copy.c:2230
 msgid "unrecognized critical flags in COPY file header"
 msgstr "options critiques non reconnues dans l'en-tête du fichier COPY"
 
-#: commands/copy.c:1904
+#: commands/copy.c:2236
 msgid "invalid COPY file header (missing length)"
 msgstr "en-tête du fichier COPY invalide (longueur manquante)"
 
-#: commands/copy.c:1911
+#: commands/copy.c:2243
 msgid "invalid COPY file header (wrong length)"
 msgstr "en-tête du fichier COPY invalide (mauvaise longueur)"
 
-#: commands/copy.c:2002
+#: commands/copy.c:2376
+#: commands/copy.c:3058
+#: commands/copy.c:3275
+msgid "extra data after last expected column"
+msgstr "données supplémentaires après la dernière colonne attendue"
+
+#: commands/copy.c:2386
 msgid "missing data for OID column"
 msgstr "données manquantes pour la colonne OID"
 
-#: commands/copy.c:2008
+#: commands/copy.c:2392
 msgid "null OID in COPY data"
 msgstr "OID NULL dans les données du COPY"
 
-#: commands/copy.c:2018
-#: commands/copy.c:2090
+#: commands/copy.c:2402
+#: commands/copy.c:2501
 msgid "invalid OID in COPY data"
 msgstr "OID invalide dans les données du COPY"
 
-#: commands/copy.c:2033
+#: commands/copy.c:2417
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "données manquantes pour la colonne « %s »"
 
-#: commands/copy.c:2074
+#: commands/copy.c:2476
+msgid "received copy data after EOF marker"
+msgstr "a reçu des données de COPY après le marqueur de fin"
+
+#: commands/copy.c:2483
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "le nombre de champs de la ligne est %d, %d attendus"
 
-#: commands/copy.c:2217
-#: utils/misc/guc.c:7101
-#: utils/init/miscinit.c:1014
-#, c-format
-msgid "could not read from file \"%s\": %m"
-msgstr "n'a pas pu lire à partir du fichier « %s » : %m"
-
-#: commands/copy.c:2494
-#: commands/copy.c:2511
+#: commands/copy.c:2822
+#: commands/copy.c:2839
 msgid "literal carriage return found in data"
 msgstr "retour chariot trouvé dans les données"
 
-#: commands/copy.c:2495
-#: commands/copy.c:2512
+#: commands/copy.c:2823
+#: commands/copy.c:2840
 msgid "unquoted carriage return found in data"
 msgstr "retour chariot sans guillemet trouvé dans les données"
 
-#: commands/copy.c:2497
-#: commands/copy.c:2514
+#: commands/copy.c:2825
+#: commands/copy.c:2842
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "Utilisez « \\r » pour représenter un retour chariot."
 
-#: commands/copy.c:2498
-#: commands/copy.c:2515
+#: commands/copy.c:2826
+#: commands/copy.c:2843
 msgid "Use quoted CSV field to represent carriage return."
 msgstr "Utiliser le champ CSV entre guillemets pour représenter un retour chariot."
 
-#: commands/copy.c:2527
+#: commands/copy.c:2855
 msgid "literal newline found in data"
 msgstr "retour à la ligne trouvé dans les données"
 
-#: commands/copy.c:2528
+#: commands/copy.c:2856
 msgid "unquoted newline found in data"
 msgstr "retour à la ligne trouvé dans les données"
 
-#: commands/copy.c:2530
+#: commands/copy.c:2858
 msgid ""
 "Use \"\\n"
 "\" to represent newline."
@@ -4898,59 +4685,52 @@ msgstr ""
 "Utilisez « \\n"
 " » pour représenter un retour à la ligne."
 
-#: commands/copy.c:2531
+#: commands/copy.c:2859
 msgid "Use quoted CSV field to represent newline."
 msgstr "Utiliser un champ CSV entre guillemets pour représenter un retour à la ligne."
 
-#: commands/copy.c:2577
-#: commands/copy.c:2613
+#: commands/copy.c:2905
+#: commands/copy.c:2941
 msgid "end-of-copy marker does not match previous newline style"
 msgstr "le marqueur fin-de-copie ne correspond pas à un précédent style de fin de ligne"
 
-#: commands/copy.c:2586
-#: commands/copy.c:2602
+#: commands/copy.c:2914
+#: commands/copy.c:2930
 msgid "end-of-copy marker corrupt"
 msgstr "marqueur fin-de-copie corrompu"
 
-#: commands/copy.c:2729
-#: commands/copy.c:2764
-#: commands/copy.c:2944
-#: commands/copy.c:2979
-msgid "extra data after last expected column"
-msgstr "données supplémentaires après la dernière colonne attendue"
-
-#: commands/copy.c:3026
+#: commands/copy.c:3359
 msgid "unterminated CSV quoted field"
 msgstr "champ CSV entre guillemets non terminé"
 
-#: commands/copy.c:3103
-#: commands/copy.c:3122
+#: commands/copy.c:3436
+#: commands/copy.c:3455
 msgid "unexpected EOF in COPY data"
 msgstr "fin de fichier (EOF) inattendu dans les données du COPY"
 
-#: commands/copy.c:3112
+#: commands/copy.c:3445
 msgid "invalid field size"
 msgstr "taille du champ invalide"
 
-#: commands/copy.c:3135
+#: commands/copy.c:3468
 msgid "incorrect binary data format"
 msgstr "format de données binaires incorrect"
 
-#: commands/copy.c:3446
-#: commands/indexcmds.c:908
-#: commands/tablecmds.c:1260
-#: commands/tablecmds.c:2065
-#: parser/parse_expr.c:758
-#: utils/adt/tsvector_op.c:1347
+#: commands/copy.c:3779
+#: commands/indexcmds.c:846
+#: commands/tablecmds.c:1293
+#: commands/tablecmds.c:2148
+#: parser/parse_expr.c:764
+#: utils/adt/tsvector_op.c:1417
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "la colonne « %s » n'existe pas"
 
-#: commands/copy.c:3453
-#: commands/tablecmds.c:1286
-#: commands/trigger.c:536
-#: parser/parse_target.c:824
-#: parser/parse_target.c:835
+#: commands/copy.c:3786
+#: commands/tablecmds.c:1319
+#: commands/trigger.c:594
+#: parser/parse_target.c:911
+#: parser/parse_target.c:922
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "la colonne « %s » est spécifiée plus d'une fois"
@@ -4977,8 +4757,8 @@ msgstr "%s n'est pas un nom d'encodage valide"
 
 #: commands/dbcommands.c:253
 #: commands/dbcommands.c:1347
-#: commands/user.c:255
-#: commands/user.c:562
+#: commands/user.c:267
+#: commands/user.c:606
 #, c-format
 msgid "invalid connection limit: %d"
 msgstr "limite de connexion invalide : %d"
@@ -5008,118 +4788,118 @@ msgstr "encodage serveur %d invalide"
 msgid "invalid locale name %s"
 msgstr "nom de locale « %s » invalide"
 
-#: commands/dbcommands.c:369
-#: commands/dbcommands.c:384
-#, c-format
-msgid "encoding %s does not match locale %s"
-msgstr "l'encodage %s ne correspond pas à la locale %s"
-
-#: commands/dbcommands.c:372
-#, c-format
-msgid "The chosen LC_CTYPE setting requires encoding %s."
-msgstr "Le paramètre LC_CTYPE choisi nécessite l'encodage %s."
-
-#: commands/dbcommands.c:387
-#, c-format
-msgid "The chosen LC_COLLATE setting requires encoding %s."
-msgstr "Le paramètre LC_COLLATE choisi nécessite l'encodage %s."
-
-#: commands/dbcommands.c:405
+#: commands/dbcommands.c:352
 #, c-format
 msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
 msgstr ""
 "le nouvel encodage (%sà est incompatible avec l'encodage de la base de\n"
 "données modèle (%s)"
 
-#: commands/dbcommands.c:408
+#: commands/dbcommands.c:355
 msgid "Use the same encoding as in the template database, or use template0 as template."
 msgstr ""
 "Utilisez le même encodage que celui de la base de données modèle,\n"
 "ou utilisez template0 comme modèle."
 
-#: commands/dbcommands.c:413
+#: commands/dbcommands.c:360
 #, c-format
 msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
 msgstr ""
 "le nouveau tri (%s) est incompatible avec le tri de la base de\n"
 "données modèle (%s)"
 
-#: commands/dbcommands.c:415
+#: commands/dbcommands.c:362
 msgid "Use the same collation as in the template database, or use template0 as template."
 msgstr ""
 "Utilisez le même tri que celui de la base de données modèle,\n"
 "ou utilisez template0 comme modèle."
 
-#: commands/dbcommands.c:420
+#: commands/dbcommands.c:367
 #, c-format
 msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
 msgstr ""
 "le nouveau LC_CTYPE (%s) est incompatible avec le LC_CTYPE de la base de\n"
 "données modèle (%s)"
 
-#: commands/dbcommands.c:422
+#: commands/dbcommands.c:369
 msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
 msgstr ""
 "Utilisez le même LC_CTYPE que celui de la base de données modèle,\n"
 "ou utilisez template0 comme modèle."
 
-#: commands/dbcommands.c:449
+#: commands/dbcommands.c:391
 #: commands/dbcommands.c:1054
 msgid "pg_global cannot be used as default tablespace"
 msgstr "pg_global ne peut pas être utilisé comme tablespace par défaut"
 
-#: commands/dbcommands.c:475
+#: commands/dbcommands.c:417
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "ne peut pas affecter un nouveau tablespace par défaut « %s »"
 
-#: commands/dbcommands.c:477
+#: commands/dbcommands.c:419
 #, c-format
 msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
 msgstr ""
 "Il existe un conflit car la base de données « %s » a déjà quelques tables\n"
 "dans son tablespace."
 
-#: commands/dbcommands.c:497
-#: commands/dbcommands.c:925
+#: commands/dbcommands.c:439
+#: commands/dbcommands.c:929
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "la base de données « %s » existe déjà"
 
-#: commands/dbcommands.c:511
+#: commands/dbcommands.c:453
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "la base de données source « %s » est accédée par d'autres utilisateurs"
 
-#: commands/dbcommands.c:767
+#: commands/dbcommands.c:695
+#: commands/dbcommands.c:710
+#, c-format
+msgid "encoding %s does not match locale %s"
+msgstr "l'encodage %s ne correspond pas à la locale %s"
+
+#: commands/dbcommands.c:698
+#, c-format
+msgid "The chosen LC_CTYPE setting requires encoding %s."
+msgstr "Le paramètre LC_CTYPE choisi nécessite l'encodage %s."
+
+#: commands/dbcommands.c:713
+#, c-format
+msgid "The chosen LC_COLLATE setting requires encoding %s."
+msgstr "Le paramètre LC_COLLATE choisi nécessite l'encodage %s."
+
+#: commands/dbcommands.c:771
 #, c-format
 msgid "database \"%s\" does not exist, skipping"
 msgstr "la base de données « %s » n'existe pas, poursuite du traitement"
 
-#: commands/dbcommands.c:788
+#: commands/dbcommands.c:792
 msgid "cannot drop a template database"
 msgstr "ne peut pas supprimer une base de données modèle"
 
-#: commands/dbcommands.c:794
+#: commands/dbcommands.c:798
 msgid "cannot drop the currently open database"
 msgstr "ne peut pas supprimer la base de données actuellement ouverte"
 
-#: commands/dbcommands.c:805
-#: commands/dbcommands.c:947
+#: commands/dbcommands.c:809
+#: commands/dbcommands.c:951
 #: commands/dbcommands.c:1076
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "la base de données « %s » est en cours d'utilisation par d'autres utilisateurs"
 
-#: commands/dbcommands.c:916
+#: commands/dbcommands.c:920
 msgid "permission denied to rename database"
 msgstr "droit refusé pour le renommage de la base de données"
 
-#: commands/dbcommands.c:936
+#: commands/dbcommands.c:940
 msgid "current database cannot be renamed"
 msgstr "la base de données actuelle ne peut pas être renommée"
 
-#: commands/dbcommands.c:1028
+#: commands/dbcommands.c:1032
 msgid "cannot change the tablespace of the currently open database"
 msgstr "ne peut pas modifier le tablespace de la base de données actuellement ouverte"
 
@@ -5137,31 +4917,31 @@ msgstr ""
 "de données avant d'utiliser cette commande."
 
 #: commands/dbcommands.c:1246
-#: commands/dbcommands.c:1719
-#: commands/dbcommands.c:1913
-#: commands/dbcommands.c:1961
-#: commands/tablespace.c:579
+#: commands/dbcommands.c:1714
+#: commands/dbcommands.c:1915
+#: commands/dbcommands.c:1963
+#: commands/tablespace.c:584
 #, c-format
 msgid "some useless files may be left behind in old database directory \"%s\""
 msgstr ""
 "certains fichiers inutiles pourraient se trouver dans l'ancien répertoire\n"
 "de la base de données « %s »"
 
-#: commands/dbcommands.c:1495
+#: commands/dbcommands.c:1490
 msgid "permission denied to change owner of database"
 msgstr "droit refusé pour modifier le propriétaire de la base de données"
 
-#: commands/dbcommands.c:1807
+#: commands/dbcommands.c:1802
 #, c-format
 msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
 msgstr "%d autres sessions et %d transactions préparées utilisent la base de données."
 
-#: commands/dbcommands.c:1810
+#: commands/dbcommands.c:1805
 #, c-format
 msgid "There are %d other session(s) using the database."
 msgstr "%d autres sessions utilisent la base de données."
 
-#: commands/dbcommands.c:1813
+#: commands/dbcommands.c:1808
 #, c-format
 msgid "There are %d prepared transaction(s) using the database."
 msgstr "%d transaction(s) préparée(s) utilisent la base de données"
@@ -5207,580 +4987,614 @@ msgstr "%s requiert une valeur enti
 msgid "invalid argument for %s: \"%s\""
 msgstr "argument invalide pour %s : « %s »"
 
-#: commands/explain.c:149
+#: commands/explain.c:153
 #, c-format
 msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
 msgstr "valeur non reconnue pour l'option EXPLAIN « %s » : %s"
 
-#: commands/explain.c:155
+#: commands/explain.c:159
 #, c-format
 msgid "unrecognized EXPLAIN option \"%s\""
 msgstr "option EXPLAIN « %s » non reconnu"
 
-#: commands/explain.c:162
+#: commands/explain.c:166
 msgid "EXPLAIN option BUFFERS requires ANALYZE"
 msgstr "l'option BUFFERS d'EXPLAIN nécessite ANALYZE"
 
-#: commands/foreigncmds.c:132
-#: commands/foreigncmds.c:141
+#: commands/foreigncmds.c:135
+#: commands/foreigncmds.c:144
 #, c-format
 msgid "option \"%s\" not found"
 msgstr "option « %s » non trouvé"
 
-#: commands/foreigncmds.c:151
+#: commands/foreigncmds.c:154
 #, c-format
 msgid "option \"%s\" provided more than once"
 msgstr "option « %s » fournie plus d'une fois"
 
-#: commands/foreigncmds.c:209
-#: commands/foreigncmds.c:217
+#: commands/foreigncmds.c:224
+#: commands/foreigncmds.c:232
 #, c-format
 msgid "permission denied to change owner of foreign-data wrapper \"%s\""
 msgstr "droit refusé pour modifier le propriétaire du wrapper de données distantes « %s »"
 
-#: commands/foreigncmds.c:211
+#: commands/foreigncmds.c:226
 msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr ""
 "Doit être super-utilisateur pour modifier le propriétaire du wrapper de\n"
 "données distantes."
 
-#: commands/foreigncmds.c:219
+#: commands/foreigncmds.c:234
 msgid "The owner of a foreign-data wrapper must be a superuser."
 msgstr "Le propriétaire du wrapper de données distantes doit être un super-utilisateur."
 
-#: commands/foreigncmds.c:228
-#: commands/foreigncmds.c:452
-#: commands/foreigncmds.c:553
-#: foreign/foreign.c:90
+#: commands/foreigncmds.c:241
+#: commands/foreigncmds.c:564
+#: commands/foreigncmds.c:712
+#: foreign/foreign.c:524
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist"
 msgstr "le wrapper de données distantes « %s » n'existe pas"
 
-#: commands/foreigncmds.c:270
-#: commands/foreigncmds.c:723
-#: commands/foreigncmds.c:813
-#: commands/foreigncmds.c:1089
-#: foreign/foreign.c:179
+#: commands/foreigncmds.c:284
+#: commands/foreigncmds.c:890
+#: commands/foreigncmds.c:978
+#: commands/foreigncmds.c:1262
+#: foreign/foreign.c:544
 #, c-format
 msgid "server \"%s\" does not exist"
 msgstr "le serveur « %s » n'existe pas"
 
-#: commands/foreigncmds.c:347
+#: commands/foreigncmds.c:346
+#, c-format
+msgid "function %s must return type \"fdw_handler\""
+msgstr "la fonction %s doit renvoyer le type « fdw_handler »"
+
+#: commands/foreigncmds.c:441
 #, c-format
 msgid "permission denied to create foreign-data wrapper \"%s\""
 msgstr "droit refusé pour la création du wrapper de données distantes « %s »"
 
-#: commands/foreigncmds.c:349
+#: commands/foreigncmds.c:443
 msgid "Must be superuser to create a foreign-data wrapper."
 msgstr "Doit être super-utilisateur pour créer un wrapper de données distantes."
 
-#: commands/foreigncmds.c:360
+#: commands/foreigncmds.c:454
 #, c-format
 msgid "foreign-data wrapper \"%s\" already exists"
 msgstr "le wrapper de données distantes « %s » existe déjà"
 
-#: commands/foreigncmds.c:442
+#: commands/foreigncmds.c:554
 #, c-format
 msgid "permission denied to alter foreign-data wrapper \"%s\""
 msgstr "droit refusé pour modifier le wrapper de données distantes « %s »"
 
-#: commands/foreigncmds.c:444
+#: commands/foreigncmds.c:556
 msgid "Must be superuser to alter a foreign-data wrapper."
 msgstr "Doit être super-utilisateur pour modifier un wrapper de données distantes"
 
-#: commands/foreigncmds.c:472
+#: commands/foreigncmds.c:587
+msgid "changing the foreign-data wrapper handler can change behavior of existing foreign tables"
+msgstr ""
+"la modification du validateur de wrapper de données distantes peut modifier\n"
+"le comportement des tables distantes existantes"
+
+#: commands/foreigncmds.c:601
 msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
 msgstr ""
 "la modification du validateur du wrapper de données distantes peut faire en\n"
 "sorte que les options des objets dépendants deviennent invalides"
 
-#: commands/foreigncmds.c:544
+#: commands/foreigncmds.c:703
 #, c-format
 msgid "permission denied to drop foreign-data wrapper \"%s\""
 msgstr "droit refusé pour supprimer le wrapper de données distantes « %s »"
 
-#: commands/foreigncmds.c:546
+#: commands/foreigncmds.c:705
 msgid "Must be superuser to drop a foreign-data wrapper."
 msgstr "Doit être super-utilisateur pour supprimer un wrapper de données distantes."
 
-#: commands/foreigncmds.c:558
+#: commands/foreigncmds.c:717
 #, c-format
 msgid "foreign-data wrapper \"%s\" does not exist, skipping"
 msgstr "le wrapper de données distantes « %s » n'existe pas, poursuite du traitement"
 
-#: commands/foreigncmds.c:625
+#: commands/foreigncmds.c:786
 #, c-format
 msgid "server \"%s\" already exists"
 msgstr "le serveur « %s » existe déjà"
 
-#: commands/foreigncmds.c:817
+#: commands/foreigncmds.c:982
 #, c-format
 msgid "server \"%s\" does not exist, skipping"
 msgstr "le serveur « %s » n'existe pas, poursuite du traitement"
 
-#: commands/foreigncmds.c:920
+#: commands/foreigncmds.c:1087
 #, c-format
 msgid "user mapping \"%s\" already exists for server %s"
 msgstr "la correspondance utilisateur « %s » existe déjà dans le serveur « %s »"
 
-#: commands/foreigncmds.c:998
-#: commands/foreigncmds.c:1105
+#: commands/foreigncmds.c:1173
+#: commands/foreigncmds.c:1278
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server"
 msgstr "la correspondance utilisateur « %s » n'existe pas pour le serveur"
 
-#: commands/foreigncmds.c:1092
+#: commands/foreigncmds.c:1265
 msgid "server does not exist, skipping"
 msgstr "le serveur n'existe pas, poursuite du traitement"
 
-#: commands/foreigncmds.c:1110
+#: commands/foreigncmds.c:1283
 #, c-format
 msgid "user mapping \"%s\" does not exist for the server, skipping"
 msgstr ""
 "la correspondance utilisateur « %s » n'existe pas pour le serveur, poursuite\n"
 "du traitement"
 
-#: commands/functioncmds.c:98
+#: commands/functioncmds.c:100
 #, c-format
 msgid "SQL function cannot return shell type %s"
 msgstr "la fonction SQL ne peut pas retourner le type shell %s"
 
-#: commands/functioncmds.c:103
+#: commands/functioncmds.c:105
 #, c-format
 msgid "return type %s is only a shell"
 msgstr "le type de retour %s est seulement un shell"
 
-#: commands/functioncmds.c:126
-#: commands/tablecmds.c:216
-#: commands/typecmds.c:650
-#: commands/typecmds.c:2572
-#: parser/parse_func.c:1485
+#: commands/functioncmds.c:128
+#: commands/tablecmds.c:224
+#: commands/typecmds.c:660
+#: commands/typecmds.c:2661
+#: parser/parse_func.c:1502
 #: parser/parse_type.c:196
 #: utils/adt/regproc.c:973
 #, c-format
 msgid "type \"%s\" does not exist"
 msgstr "le type « %s » n'existe pas"
 
-#: commands/functioncmds.c:132
-#: parser/parse_type.c:261
+#: commands/functioncmds.c:134
+#: parser/parse_type.c:278
 #, c-format
 msgid "type modifier cannot be specified for shell type \"%s\""
 msgstr "le modificateur de type ne peut pas être précisé pour le type shell « %s »"
 
-#: commands/functioncmds.c:138
+#: commands/functioncmds.c:140
 #, c-format
 msgid "type \"%s\" is not yet defined"
 msgstr "le type « %s » n'est pas encore défini"
 
-#: commands/functioncmds.c:139
+#: commands/functioncmds.c:141
 msgid "Creating a shell type definition."
 msgstr "Création d'une définition d'un type shell."
 
-#: commands/functioncmds.c:218
+#: commands/functioncmds.c:220
 #, c-format
 msgid "SQL function cannot accept shell type %s"
 msgstr "la fonction SQL ne peut pas accepter le type shell %s"
 
-#: commands/functioncmds.c:223
+#: commands/functioncmds.c:225
 #, c-format
 msgid "argument type %s is only a shell"
 msgstr "le type d'argument %s est seulement un shell"
 
-#: commands/functioncmds.c:233
+#: commands/functioncmds.c:235
 #, c-format
 msgid "type %s does not exist"
 msgstr "le type %s n'existe pas"
 
-#: commands/functioncmds.c:241
+#: commands/functioncmds.c:243
 msgid "functions cannot accept set arguments"
 msgstr "les fonctions ne peuvent pas accepter des arguments d'ensemble"
 
-#: commands/functioncmds.c:250
+#: commands/functioncmds.c:252
 msgid "VARIADIC parameter must be the last input parameter"
 msgstr "le paramètre VARIADIC doit être le dernier paramètre en entrée"
 
-#: commands/functioncmds.c:277
+#: commands/functioncmds.c:279
 msgid "VARIADIC parameter must be an array"
 msgstr "le paramètre VARIADIC doit être un tableau"
 
-#: commands/functioncmds.c:317
+#: commands/functioncmds.c:319
 #, c-format
 msgid "parameter name \"%s\" used more than once"
 msgstr "le nom du paramètre « %s » est utilisé plus d'une fois"
 
-#: commands/functioncmds.c:332
+#: commands/functioncmds.c:334
 msgid "only input parameters can have default values"
 msgstr "seuls les paramètres en entrée peuvent avoir des valeurs par défaut"
 
-#: commands/functioncmds.c:344
+#: commands/functioncmds.c:347
 msgid "cannot use table references in parameter default value"
 msgstr ""
 "ne peut pas utiliser les références de tables dans la valeur par défaut des\n"
 "paramètres"
 
-#: commands/functioncmds.c:360
+#: commands/functioncmds.c:363
 msgid "cannot use subquery in parameter default value"
 msgstr "ne peut pas utiliser une sous-requête dans une valeur par défaut d'un paramètre"
 
-#: commands/functioncmds.c:364
+#: commands/functioncmds.c:367
 msgid "cannot use aggregate function in parameter default value"
 msgstr ""
 "ne peut pas utiliser une fonction d'agrégat dans la valeur par défaut d'un\n"
 "paramètre"
 
-#: commands/functioncmds.c:368
+#: commands/functioncmds.c:371
 msgid "cannot use window function in parameter default value"
 msgstr "ne peut pas utiliser la fonction window dans la valeur par défaut d'un paramètre"
 
-#: commands/functioncmds.c:378
+#: commands/functioncmds.c:381
 msgid "input parameters after one with a default value must also have defaults"
 msgstr "les paramètres en entrée suivant un paramètre avec valeur par défaut doivent aussi avoir des valeurs par défaut"
 
-#: commands/functioncmds.c:617
+#: commands/functioncmds.c:620
 msgid "no function body specified"
 msgstr "aucun corps de fonction spécifié"
 
-#: commands/functioncmds.c:627
+#: commands/functioncmds.c:630
 msgid "no language specified"
 msgstr "aucun langage spécifié"
 
-#: commands/functioncmds.c:648
-#: commands/functioncmds.c:1349
+#: commands/functioncmds.c:651
+#: commands/functioncmds.c:1352
 msgid "COST must be positive"
 msgstr "COST doit être positif"
 
-#: commands/functioncmds.c:656
-#: commands/functioncmds.c:1357
+#: commands/functioncmds.c:659
+#: commands/functioncmds.c:1360
 msgid "ROWS must be positive"
 msgstr "ROWS doit être positif"
 
-#: commands/functioncmds.c:695
+#: commands/functioncmds.c:698
 #, c-format
 msgid "unrecognized function attribute \"%s\" ignored"
 msgstr "l'attribut « %s » non reconnu de la fonction a été ignoré"
 
-#: commands/functioncmds.c:746
+#: commands/functioncmds.c:749
 #, c-format
 msgid "only one AS item needed for language \"%s\""
 msgstr "seul un élément AS est nécessaire pour le langage « %s »"
 
-#: commands/functioncmds.c:838
-#: commands/functioncmds.c:1992
+#: commands/functioncmds.c:839
+#: commands/functioncmds.c:2019
+#: commands/proclang.c:600
+#: commands/proclang.c:640
+#: commands/proclang.c:754
+#, c-format
+msgid "language \"%s\" does not exist"
+msgstr "le langage « %s » n'existe pas"
+
+#: commands/functioncmds.c:841
+#: commands/functioncmds.c:2021
 msgid "Use CREATE LANGUAGE to load the language into the database."
 msgstr "Utiliser CREATE LANGUAGE pour charger le langage dans la base de données."
 
-#: commands/functioncmds.c:885
+#: commands/functioncmds.c:888
 #, c-format
 msgid "function result type must be %s because of OUT parameters"
 msgstr "le type de résultat de la fonction doit être %s à cause des paramètres OUT"
 
-#: commands/functioncmds.c:898
+#: commands/functioncmds.c:901
 msgid "function result type must be specified"
 msgstr "le type de résultat de la fonction doit être spécifié"
 
-#: commands/functioncmds.c:933
-#: commands/functioncmds.c:1361
+#: commands/functioncmds.c:936
+#: commands/functioncmds.c:1364
 msgid "ROWS is not applicable when function does not return a set"
 msgstr "ROWS n'est pas applicable quand la fonction ne renvoie pas un ensemble"
 
-#: commands/functioncmds.c:985
+#: commands/functioncmds.c:988
 #, c-format
 msgid "function %s(%s) does not exist, skipping"
 msgstr "la fonction %s(%s) n'existe pas, poursuite du traitement"
 
-#: commands/functioncmds.c:1005
-#: commands/functioncmds.c:1105
-#: commands/functioncmds.c:1168
-#: commands/functioncmds.c:1319
-#: utils/adt/ruleutils.c:1635
+#: commands/functioncmds.c:1008
+#: commands/functioncmds.c:1108
+#: commands/functioncmds.c:1171
+#: commands/functioncmds.c:1322
+#: utils/adt/ruleutils.c:1696
 #, c-format
 msgid "\"%s\" is an aggregate function"
 msgstr "« %s » est une fonction d'agrégat"
 
-#: commands/functioncmds.c:1007
+#: commands/functioncmds.c:1010
 msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr "Utiliser DROP AGGREGATE pour supprimer les fonctions d'agrégat."
 
-#: commands/functioncmds.c:1014
+#: commands/functioncmds.c:1017
 #, c-format
 msgid "removing built-in function \"%s\""
 msgstr "suppression de la fonction interne « %s »"
 
-#: commands/functioncmds.c:1107
+#: commands/functioncmds.c:1110
 msgid "Use ALTER AGGREGATE to rename aggregate functions."
 msgstr "Utiliser ALTER AGGREGATE pour renommer les fonctions d'agrégat."
 
-#: commands/functioncmds.c:1170
+#: commands/functioncmds.c:1173
 msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
 msgstr "Utiliser ALTER AGGREGATE pour changer le propriétaire des fonctions d'agrégat."
 
-#: commands/functioncmds.c:1508
+#: commands/functioncmds.c:1512
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr "le type de données source %s est un pseudo-type"
 
-#: commands/functioncmds.c:1514
+#: commands/functioncmds.c:1518
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr "le type de données cible %s est un pseudo-type"
 
-#: commands/functioncmds.c:1551
+#: commands/functioncmds.c:1555
 msgid "cast function must take one to three arguments"
 msgstr "la fonction de conversion doit prendre de un à trois arguments"
 
-#: commands/functioncmds.c:1555
+#: commands/functioncmds.c:1559
 msgid "argument of cast function must match or be binary-coercible from source data type"
 msgstr ""
 "l'argument de la fonction de conversion doit correspondre ou être binary-coercible\n"
 "à partir du type de la donnée source"
 
-#: commands/functioncmds.c:1559
+#: commands/functioncmds.c:1563
 msgid "second argument of cast function must be type integer"
 msgstr "le second argument de la fonction de conversion doit être de type entier"
 
-#: commands/functioncmds.c:1563
+#: commands/functioncmds.c:1567
 msgid "third argument of cast function must be type boolean"
 msgstr "le troisième argument de la fonction de conversion doit être de type booléen"
 
-#: commands/functioncmds.c:1567
+#: commands/functioncmds.c:1571
 msgid "return data type of cast function must match or be binary-coercible to target data type"
 msgstr ""
 "le type de donnée en retour de la fonction de conversion doit correspondre\n"
 "ou être coercible binairement au type de données cible"
 
-#: commands/functioncmds.c:1578
+#: commands/functioncmds.c:1582
 msgid "cast function must not be volatile"
 msgstr "la fonction de conversion ne doit pas être volatile"
 
-#: commands/functioncmds.c:1583
+#: commands/functioncmds.c:1587
 msgid "cast function must not be an aggregate function"
 msgstr "la fonction de conversion ne doit pas être une fonction d'agrégat"
 
-#: commands/functioncmds.c:1587
+#: commands/functioncmds.c:1591
 msgid "cast function must not be a window function"
 msgstr "la fonction de conversion ne doit pas être une fonction window"
 
-#: commands/functioncmds.c:1591
+#: commands/functioncmds.c:1595
 msgid "cast function must not return a set"
 msgstr "la fonction de conversion ne doit pas renvoyer un ensemble"
 
-#: commands/functioncmds.c:1617
+#: commands/functioncmds.c:1621
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr "doit être super-utilisateur pour créer une fonction de conversion SANS FONCTION"
 
-#: commands/functioncmds.c:1632
+#: commands/functioncmds.c:1636
 msgid "source and target data types are not physically compatible"
 msgstr "les types de données source et cible ne sont pas physiquement compatibles"
 
-#: commands/functioncmds.c:1647
+#: commands/functioncmds.c:1651
 msgid "composite data types are not binary-compatible"
 msgstr "les types de données composites ne sont pas compatibles binairement"
 
-#: commands/functioncmds.c:1653
+#: commands/functioncmds.c:1657
 msgid "enum data types are not binary-compatible"
 msgstr "les types de données enum ne sont pas compatibles binairement"
 
-#: commands/functioncmds.c:1659
+#: commands/functioncmds.c:1663
 msgid "array data types are not binary-compatible"
 msgstr "les types de données tableau ne sont pas compatibles binairement"
 
-#: commands/functioncmds.c:1669
+#: commands/functioncmds.c:1680
+msgid "domain data types must not be marked binary-compatible"
+msgstr "les types de données domaines ne sont pas compatibles binairement"
+
+#: commands/functioncmds.c:1690
 msgid "source data type and target data type are the same"
 msgstr "les types de données source et cible sont identiques"
 
-#: commands/functioncmds.c:1702
+#: commands/functioncmds.c:1723
 #, c-format
 msgid "cast from type %s to type %s already exists"
 msgstr "la conversion du type %s vers le type %s existe déjà"
 
-#: commands/functioncmds.c:1782
+#: commands/functioncmds.c:1803
 #, c-format
 msgid "cast from type %s to type %s does not exist, skipping"
 msgstr "la conversion du type %s vers le type %s n'existe pas, poursuite du traitement"
 
-#: commands/functioncmds.c:1879
+#: commands/functioncmds.c:1841
 #, c-format
-msgid "function \"%s\" is already in schema \"%s\""
-msgstr "la fonction « %s » existe déjà dans le schéma « %s »"
-
-#: commands/functioncmds.c:1887
-#: commands/tablecmds.c:7884
-#: commands/typecmds.c:2794
-msgid "cannot move objects into or out of temporary schemas"
-msgstr "ne peut pas déplacer les objets dans ou à partir des schémas temporaires"
-
-#: commands/functioncmds.c:1893
-#: commands/tablecmds.c:7890
-#: commands/typecmds.c:2800
-msgid "cannot move objects into or out of TOAST schema"
-msgstr "ne peut pas déplacer les objets dans ou à partir des schémas TOAST"
+msgid "cast from type %s to type %s does not exist"
+msgstr "la conversion du type %s vers le type %s n'existe pas"
 
-#: commands/functioncmds.c:1902
+#: commands/functioncmds.c:1929
 #, c-format
 msgid "function \"%s\" already exists in schema \"%s\""
 msgstr "la fonction « %s » existe déjà dans le schéma « %s »"
 
-#: commands/functioncmds.c:1974
+#: commands/functioncmds.c:2003
 msgid "no inline code specified"
 msgstr "aucun code en ligne spécifié"
 
-#: commands/functioncmds.c:2022
+#: commands/functioncmds.c:2051
 #, c-format
 msgid "language \"%s\" does not support inline code execution"
 msgstr "le langage « %s » ne supporte pas l'exécution de code en ligne"
 
-#: commands/indexcmds.c:162
+#: commands/indexcmds.c:163
 msgid "must specify at least one column"
 msgstr "doit spécifier au moins une colonne"
 
-#: commands/indexcmds.c:166
+#: commands/indexcmds.c:167
 #, c-format
 msgid "cannot use more than %d columns in an index"
 msgstr "ne peut pas utiliser plus de %d colonnes dans un index"
 
-#: commands/indexcmds.c:196
+#: commands/indexcmds.c:195
+#, c-format
+msgid "cannot create index on foreign table \"%s\""
+msgstr "ne peut pas créer un index sur la table distante « %s »"
+
+#: commands/indexcmds.c:210
 msgid "cannot create indexes on temporary tables of other sessions"
 msgstr "ne peut pas créer les index sur les tables temporaires des autres sessions"
 
-#: commands/indexcmds.c:256
-#: commands/tablecmds.c:455
-#: commands/tablecmds.c:7000
+#: commands/indexcmds.c:265
+#: commands/tablecmds.c:479
+#: commands/tablecmds.c:7882
 msgid "only shared relations can be placed in pg_global tablespace"
 msgstr "seules les relations partagées peuvent être placées dans le tablespace pg_global"
 
-#: commands/indexcmds.c:287
+#: commands/indexcmds.c:296
 msgid "substituting access method \"gist\" for obsolete method \"rtree\""
 msgstr "substitution de la méthode d'accès obsolète « rtree » par « gist » "
 
 #: commands/indexcmds.c:304
+#: commands/opclasscmds.c:369
+#: commands/opclasscmds.c:790
+#: commands/opclasscmds.c:2203
+#, c-format
+msgid "access method \"%s\" does not exist"
+msgstr "la méthode d'accès « %s » n'existe pas"
+
+#: commands/indexcmds.c:313
 #, c-format
 msgid "access method \"%s\" does not support unique indexes"
 msgstr "la méthode d'accès « %s » ne supporte pas les index uniques"
 
-#: commands/indexcmds.c:309
+#: commands/indexcmds.c:318
 #, c-format
 msgid "access method \"%s\" does not support multicolumn indexes"
 msgstr "la méthode d'accès « %s » ne supporte pas les index multi-colonnes"
 
-#: commands/indexcmds.c:314
+#: commands/indexcmds.c:323
 #, c-format
 msgid "access method \"%s\" does not support exclusion constraints"
 msgstr "la méthode d'accès « %s » ne supporte pas les contraintes d'exclusion"
 
-#: commands/indexcmds.c:347
-#: parser/parse_utilcmd.c:1212
-#: parser/parse_utilcmd.c:1298
-#, c-format
-msgid "multiple primary keys for table \"%s\" are not allowed"
-msgstr "les clés primaires multiples ne sont pas autorisées pour la table « %s »"
-
-#: commands/indexcmds.c:364
-msgid "primary keys cannot be expressions"
-msgstr "les clés primaires ne peuvent pas être des expressions"
-
-#: commands/indexcmds.c:394
-#: commands/indexcmds.c:903
-#: parser/parse_utilcmd.c:1445
-#, c-format
-msgid "column \"%s\" named in key does not exist"
-msgstr "la colonne « %s » nommée dans la clé n'existe pas"
-
-#: commands/indexcmds.c:468
+#: commands/indexcmds.c:399
 #, c-format
 msgid "%s %s will create implicit index \"%s\" for table \"%s\""
 msgstr "%s %s créera un index implicite « %s » pour la table « %s »"
 
-#: commands/indexcmds.c:827
+#: commands/indexcmds.c:763
 msgid "cannot use subquery in index predicate"
 msgstr "ne peut pas utiliser une sous-requête dans un prédicat d'index"
 
-#: commands/indexcmds.c:831
+#: commands/indexcmds.c:767
 msgid "cannot use aggregate in index predicate"
 msgstr "ne peut pas utiliser un agrégat dans un prédicat d'index"
 
-#: commands/indexcmds.c:840
+#: commands/indexcmds.c:776
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "les fonctions dans un prédicat d'index doivent être marquées comme IMMUTABLE"
 
-#: commands/indexcmds.c:942
+#: commands/indexcmds.c:841
+#: parser/parse_utilcmd.c:1704
+#, c-format
+msgid "column \"%s\" named in key does not exist"
+msgstr "la colonne « %s » nommée dans la clé n'existe pas"
+
+#: commands/indexcmds.c:894
 msgid "cannot use subquery in index expression"
 msgstr "ne peut pas utiliser la sous-requête dans l'expression de l'index"
 
-#: commands/indexcmds.c:946
+#: commands/indexcmds.c:898
 msgid "cannot use aggregate function in index expression"
 msgstr "ne peut pas utiliser la fonction d'agrégat dans l'expression de l'index"
 
-#: commands/indexcmds.c:956
+#: commands/indexcmds.c:909
 msgid "functions in index expression must be marked IMMUTABLE"
 msgstr ""
 "les fonctions dans l'expression de l'index doivent être marquées comme\n"
 "IMMUTABLE"
 
-#: commands/indexcmds.c:991
+#: commands/indexcmds.c:930
+msgid "could not determine which collation to use for index expression"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour l'expression d'index"
+
+#: commands/indexcmds.c:938
+#: commands/typecmds.c:843
+#: parser/parse_expr.c:2140
+#: parser/parse_type.c:492
+#: parser/parse_utilcmd.c:2556
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "les collationnements ne sont pas supportés par le type %s"
+
+#: commands/indexcmds.c:976
 #, c-format
 msgid "operator %s is not commutative"
 msgstr "l'opérateur %s n'est pas commutatif"
 
-#: commands/indexcmds.c:993
+#: commands/indexcmds.c:978
 msgid "Only commutative operators can be used in exclusion constraints."
 msgstr "Seuls les opérateurs commutatifs peuvent être utilisés dans les contraintes d'exclusion."
 
-#: commands/indexcmds.c:1019
+#: commands/indexcmds.c:1004
 #, c-format
 msgid "operator %s is not a member of operator family \"%s\""
 msgstr "l'opérateur %s n'est pas un membre de la famille d'opérateur « %s »"
 
-#: commands/indexcmds.c:1022
+#: commands/indexcmds.c:1007
 msgid "The exclusion operator must be related to the index operator class for the constraint."
 msgstr ""
 "L'opérateur d'exclusion doit être en relation avec la classe d'opérateur de\n"
 "l'index pour la contrainte."
 
-#: commands/indexcmds.c:1057
+#: commands/indexcmds.c:1042
 #, c-format
 msgid "access method \"%s\" does not support ASC/DESC options"
 msgstr "la méthode d'accès « %s » ne supporte pas les options ASC/DESC"
 
-#: commands/indexcmds.c:1062
+#: commands/indexcmds.c:1047
 #, c-format
 msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
 msgstr "la méthode d'accès « %s » ne supporte pas les options NULLS FIRST/LAST"
 
-#: commands/indexcmds.c:1118
+#: commands/indexcmds.c:1103
 #, c-format
 msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
 "le type de données %s n'a pas de classe d'opérateurs par défaut pour la\n"
 "méthode d'accès « %s »"
 
-#: commands/indexcmds.c:1120
+#: commands/indexcmds.c:1105
 msgid "You must specify an operator class for the index or define a default operator class for the data type."
 msgstr ""
 "Vous devez spécifier une classe d'opérateur pour l'index ou définir une\n"
 "classe d'opérateur par défaut pour le type de données."
 
-#: commands/indexcmds.c:1170
+#: commands/indexcmds.c:1134
+#: commands/indexcmds.c:1142
+#: commands/opclasscmds.c:212
+#: commands/opclasscmds.c:1568
+#, c-format
+msgid "operator class \"%s\" does not exist for access method \"%s\""
+msgstr "la classe d'opérateur « %s » n'existe pas pour la méthode d'accès « %s »"
+
+#: commands/indexcmds.c:1155
 #, c-format
 msgid "operator class \"%s\" does not accept data type %s"
 msgstr "la classe d'opérateur « %s » n'accepte pas le type de données %s"
 
-#: commands/indexcmds.c:1260
+#: commands/indexcmds.c:1245
 #, c-format
 msgid "there are multiple default operator classes for data type %s"
 msgstr ""
 "il existe de nombreuses classes d'opérateur par défaut pour le type de\n"
 "données %s"
 
-#: commands/indexcmds.c:1639
+#: commands/indexcmds.c:1586
 #, c-format
 msgid "table \"%s\" has no indexes"
 msgstr "la table « %s » n'a pas d'index"
 
-#: commands/indexcmds.c:1667
+#: commands/indexcmds.c:1614
 msgid "can only reindex the currently open database"
 msgstr "peut seulement réindexer la base de données en cours"
 
-#: commands/indexcmds.c:1752
+#: commands/indexcmds.c:1699
 #, c-format
 msgid "table \"%s.%s\" was reindexed"
 msgstr "la table « %s.%s » a été réindexée"
@@ -5795,193 +5609,207 @@ msgstr "n'a pas pu obtenir un verrou sur la relation 
 msgid "could not obtain lock on relation with OID %u"
 msgstr "n'a pas pu obtenir un verrou sur la relation d'OID « %u »"
 
-#: commands/opclasscmds.c:190
-#: commands/opclasscmds.c:701
+#: commands/opclasscmds.c:136
+#: commands/opclasscmds.c:1619
+#: commands/opclasscmds.c:1839
+#: commands/opclasscmds.c:1850
+#: commands/opclasscmds.c:2084
+#: commands/opclasscmds.c:2095
+#, c-format
+msgid "operator family \"%s\" does not exist for access method \"%s\""
+msgstr "la famille d'opérateur « %s » n'existe pas pour la méthode d'accès « %s »"
+
+#: commands/opclasscmds.c:271
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists"
 msgstr "la famille d'opérateur « %s » existe déjà pour la méthode d'accès « %s »"
 
-#: commands/opclasscmds.c:320
+#: commands/opclasscmds.c:408
 msgid "must be superuser to create an operator class"
 msgstr "doit être super-utilisateur pour créer une classe d'opérateur"
 
-#: commands/opclasscmds.c:403
-#: commands/opclasscmds.c:849
-#: commands/opclasscmds.c:971
+#: commands/opclasscmds.c:480
+#: commands/opclasscmds.c:864
+#: commands/opclasscmds.c:994
 #, c-format
 msgid "invalid operator number %d, must be between 1 and %d"
 msgstr "numéro d'opérateur %d invalide, doit être compris entre 1 et %d"
 
-#: commands/opclasscmds.c:446
-#: commands/opclasscmds.c:892
-#: commands/opclasscmds.c:986
+#: commands/opclasscmds.c:531
+#: commands/opclasscmds.c:915
+#: commands/opclasscmds.c:1009
 #, c-format
 msgid "invalid procedure number %d, must be between 1 and %d"
 msgstr "numéro de procédure %d invalide, doit être compris entre 1 et %d"
 
-#: commands/opclasscmds.c:476
+#: commands/opclasscmds.c:561
 msgid "storage type specified more than once"
 msgstr "type de stockage spécifié plus d'une fois"
 
-#: commands/opclasscmds.c:504
+#: commands/opclasscmds.c:589
 #, c-format
 msgid "storage type cannot be different from data type for access method \"%s\""
 msgstr ""
 "le type de stockage ne peut pas être différent du type de données pour la\n"
 "méthode d'accès « %s »"
 
-#: commands/opclasscmds.c:520
+#: commands/opclasscmds.c:605
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists"
 msgstr "la classe d'opérateur « %s » existe déjà pour la méthode d'accès « %s »"
 
-#: commands/opclasscmds.c:548
+#: commands/opclasscmds.c:633
 #, c-format
 msgid "could not make operator class \"%s\" be default for type %s"
 msgstr "n'a pas pu rendre la classe d'opérateur « %s » par défaut pour le type %s"
 
-#: commands/opclasscmds.c:551
+#: commands/opclasscmds.c:636
 #, c-format
 msgid "Operator class \"%s\" already is the default."
 msgstr "La classe d'opérateur « %s » est déjà la classe par défaut."
 
-#: commands/opclasscmds.c:687
+#: commands/opclasscmds.c:760
 msgid "must be superuser to create an operator family"
 msgstr "doit être super-utilisateur pour créer une famille d'opérateur"
 
-#: commands/opclasscmds.c:802
+#: commands/opclasscmds.c:816
 msgid "must be superuser to alter an operator family"
 msgstr "doit être super-utilisateur pour modifier une famille d'opérateur"
 
-#: commands/opclasscmds.c:865
+#: commands/opclasscmds.c:880
 msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
 msgstr ""
 "les types d'argument de l'opérateur doivent être indiqués dans ALTER\n"
 "OPERATOR FAMILY"
 
-#: commands/opclasscmds.c:921
+#: commands/opclasscmds.c:944
 msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
 msgstr "STORAGE ne peut pas être spécifié dans ALTER OPERATOR FAMILY"
 
-#: commands/opclasscmds.c:1037
+#: commands/opclasscmds.c:1060
 msgid "one or two argument types must be specified"
 msgstr "un ou deux types d'argument doit être spécifié"
 
-#: commands/opclasscmds.c:1063
+#: commands/opclasscmds.c:1086
 msgid "index operators must be binary"
 msgstr "les opérateurs d'index doivent être binaires"
 
-#: commands/opclasscmds.c:1067
-msgid "index operators must return boolean"
-msgstr "les opérateurs d'index doivent renvoyer un booléen"
+#: commands/opclasscmds.c:1111
+#, c-format
+msgid "access method \"%s\" does not support ordering operators"
+msgstr "la méthode d'accès « %s » ne supporte pas les opérateurs de tri"
+
+#: commands/opclasscmds.c:1124
+msgid "index search operators must return boolean"
+msgstr "les opérateurs de recherche d'index doivent renvoyer un booléen"
 
-#: commands/opclasscmds.c:1105
+#: commands/opclasscmds.c:1163
 msgid "btree procedures must have two arguments"
 msgstr "les procédures btree doivent avoir deux arguments"
 
-#: commands/opclasscmds.c:1109
+#: commands/opclasscmds.c:1167
 msgid "btree procedures must return integer"
 msgstr "les procédures btree doivent renvoyer un entier"
 
-#: commands/opclasscmds.c:1124
+#: commands/opclasscmds.c:1182
 msgid "hash procedures must have one argument"
 msgstr "les procédures de hachage doivent avoir un argument"
 
-#: commands/opclasscmds.c:1128
+#: commands/opclasscmds.c:1186
 msgid "hash procedures must return integer"
 msgstr "les procédures de hachage doivent renvoyer un entier"
 
-#: commands/opclasscmds.c:1153
+#: commands/opclasscmds.c:1211
 msgid "associated data types must be specified for index support procedure"
 msgstr ""
 "les types de données associés doivent être indiqués pour la procédure de\n"
 "support de l'index"
 
-#: commands/opclasscmds.c:1179
+#: commands/opclasscmds.c:1237
 #, c-format
 msgid "procedure number %d for (%s,%s) appears more than once"
 msgstr "le numéro de procédure %d pour (%s, %s) apparaît plus d'une fois"
 
-#: commands/opclasscmds.c:1186
+#: commands/opclasscmds.c:1244
 #, c-format
 msgid "operator number %d for (%s,%s) appears more than once"
 msgstr "le numéro d'opérateur %d pour (%s, %s) apparaît plus d'une fois"
 
-#: commands/opclasscmds.c:1234
+#: commands/opclasscmds.c:1293
 #, c-format
 msgid "operator %d(%s,%s) already exists in operator family \"%s\""
 msgstr "l'opérateur %d(%s, %s) existe déjà dans la famille d'opérateur « %s »"
 
-#: commands/opclasscmds.c:1334
+#: commands/opclasscmds.c:1406
 #, c-format
 msgid "function %d(%s,%s) already exists in operator family \"%s\""
 msgstr "la fonction %d(%s, %s) existe déjà dans la famille d'opérateur « %s »"
 
-#: commands/opclasscmds.c:1421
+#: commands/opclasscmds.c:1493
 #, c-format
 msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "l'opérateur %d(%s, %s) n'existe pas dans la famille d'opérateur « %s »"
 
-#: commands/opclasscmds.c:1461
+#: commands/opclasscmds.c:1533
 #, c-format
 msgid "function %d(%s,%s) does not exist in operator family \"%s\""
 msgstr "la fonction %d(%s, %s) n'existe pas dans la famille d'opérateur « %s »"
 
-#: commands/opclasscmds.c:1768
+#: commands/opclasscmds.c:1779
 #, c-format
 msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr ""
 "la classe d'opérateur « %s » de la méthode d'accès « %s » existe déjà dans\n"
 "le schéma « %s »"
 
-#: commands/opclasscmds.c:1862
+#: commands/opclasscmds.c:1868
 #, c-format
 msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr ""
 "la famille d'opérateur « %s » de la méthode d'accès « %s » existe déjà dans\n"
 "le schéma « %s »"
 
-#: commands/operatorcmds.c:98
+#: commands/operatorcmds.c:100
 msgid "=> is deprecated as an operator name"
 msgstr "=> est un nom d'opérateur obsolète"
 
-#: commands/operatorcmds.c:99
+#: commands/operatorcmds.c:101
 msgid "This name may be disallowed altogether in future versions of PostgreSQL."
 msgstr "Ce nom pourrait être interdit dans les prochaines versions de PostgreSQL."
 
-#: commands/operatorcmds.c:120
-#: commands/operatorcmds.c:128
+#: commands/operatorcmds.c:122
+#: commands/operatorcmds.c:130
 msgid "SETOF type not allowed for operator argument"
 msgstr "type SETOF non autorisé pour l'argument de l'opérateur"
 
-#: commands/operatorcmds.c:156
+#: commands/operatorcmds.c:158
 #, c-format
 msgid "operator attribute \"%s\" not recognized"
 msgstr "l'attribut « %s » de l'opérateur n'est pas reconnu"
 
-#: commands/operatorcmds.c:166
+#: commands/operatorcmds.c:168
 msgid "operator procedure must be specified"
 msgstr "la procédure de l'opérateur doit être spécifiée"
 
-#: commands/operatorcmds.c:177
+#: commands/operatorcmds.c:179
 msgid "at least one of leftarg or rightarg must be specified"
 msgstr "au moins un des arguments (le gauche ou le droit) doit être spécifié"
 
-#: commands/operatorcmds.c:226
+#: commands/operatorcmds.c:228
 #, c-format
 msgid "restriction estimator function %s must return type \"float8\""
 msgstr ""
 "la fonction d'estimation de la restriction, de nom %s, doit renvoyer le type\n"
 "« float8 »"
 
-#: commands/operatorcmds.c:265
+#: commands/operatorcmds.c:267
 #, c-format
 msgid "join estimator function %s must return type \"float8\""
 msgstr ""
 "la fonction d'estimation de la jointure, de nom %s, doit renvoyer le type\n"
 "« float8 »"
 
-#: commands/operatorcmds.c:316
+#: commands/operatorcmds.c:318
 #, c-format
 msgid "operator %s does not exist, skipping"
 msgstr "l'opérateur %s n'existe pas, poursuite du traitement"
@@ -5995,518 +5823,713 @@ msgstr "nom de curseur invalide : il ne doit pas 
 #: commands/portalcmds.c:168
 #: commands/portalcmds.c:222
 #: executor/execCurrent.c:66
-#: utils/adt/xml.c:2044
-#: utils/adt/xml.c:2208
+#: utils/adt/xml.c:2046
+#: utils/adt/xml.c:2210
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "le curseur « %s » n'existe pas"
 
-#: commands/portalcmds.c:329
-#: tcop/pquery.c:748
-#: tcop/pquery.c:1371
+#: commands/portalcmds.c:336
+#: tcop/pquery.c:738
+#: tcop/pquery.c:1401
 #, c-format
 msgid "portal \"%s\" cannot be run"
 msgstr "le portail « %s » ne peut pas être exécuté de nouveau"
 
-#: commands/portalcmds.c:402
+#: commands/portalcmds.c:409
 msgid "could not reposition held cursor"
 msgstr "n'a pas pu repositionner le curseur détenu"
 
-#: commands/prepare.c:70
+#: commands/prepare.c:71
 msgid "invalid statement name: must not be empty"
 msgstr "nom de l'instruction invalide : ne doit pas être vide"
 
-#: commands/prepare.c:121
-#: tcop/postgres.c:1307
-#: parser/parse_param.c:293
+#: commands/prepare.c:122
+#: tcop/postgres.c:1267
+#: parser/parse_param.c:303
 #, c-format
 msgid "could not determine data type of parameter $%d"
 msgstr "n'a pas pu déterminer le type de données du paramètre $%d"
 
-#: commands/prepare.c:139
+#: commands/prepare.c:140
 msgid "utility statements cannot be prepared"
 msgstr "les instructions utilitaires ne peuvent pas être préparées"
 
-#: commands/prepare.c:239
-#: commands/prepare.c:246
-#: commands/prepare.c:702
+#: commands/prepare.c:240
+#: commands/prepare.c:247
+#: commands/prepare.c:706
 msgid "prepared statement is not a SELECT"
 msgstr "l'instruction préparée n'est pas un SELECT"
 
-#: commands/prepare.c:313
+#: commands/prepare.c:314
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr "mauvais nombre de paramètres pour l'instruction préparée « %s »"
 
-#: commands/prepare.c:315
+#: commands/prepare.c:316
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr "%d paramètres attendus mais %d reçus."
 
-#: commands/prepare.c:344
+#: commands/prepare.c:345
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "ne peut pas utiliser les sous-requêtes dans le paramètre EXECUTE"
 
-#: commands/prepare.c:348
+#: commands/prepare.c:349
 msgid "cannot use aggregate function in EXECUTE parameter"
 msgstr "ne peut pas utiliser la fonction d'agrégat dans le paramètre EXECUTE"
 
-#: commands/prepare.c:352
+#: commands/prepare.c:353
 msgid "cannot use window function in EXECUTE parameter"
 msgstr "ne peut pas utiliser une fonction window dans le paramètre EXECUTE"
 
-#: commands/prepare.c:365
+#: commands/prepare.c:366
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr ""
 "le paramètre $%d de type %s ne peut être utilisé dans la coercion à cause du\n"
 "type %s attendu"
 
-#: commands/prepare.c:463
+#: commands/prepare.c:467
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "l'instruction préparée « %s » existe déjà"
 
-#: commands/prepare.c:521
+#: commands/prepare.c:525
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "l'instruction préparée « %s » n'existe pas"
 
-#: commands/prepare.c:747
-#: executor/execQual.c:1615
-#: executor/execQual.c:1640
-#: executor/execQual.c:2001
-#: executor/execQual.c:5100
-#: executor/functions.c:652
-#: foreign/foreign.c:271
-#: utils/mmgr/portalmem.c:937
+#: commands/prepare.c:751
+#: commands/extension.c:1689
+#: commands/extension.c:1798
+#: commands/extension.c:1991
+#: executor/execQual.c:1613
+#: executor/execQual.c:1638
+#: executor/execQual.c:1999
+#: executor/execQual.c:5115
+#: executor/functions.c:785
+#: foreign/foreign.c:350
+#: replication/walsender.c:1403
+#: utils/mmgr/portalmem.c:946
 #: utils/fmgr/funcapi.c:60
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "la fonction avec set-value a été appelé dans un contexte qui n'accepte pas\n"
 "un ensemble"
 
-#: commands/prepare.c:751
-#: foreign/foreign.c:276
-#: utils/mmgr/portalmem.c:941
+#: commands/prepare.c:755
+#: commands/extension.c:1693
+#: commands/extension.c:1802
+#: commands/extension.c:1995
+#: foreign/foreign.c:355
+#: replication/walsender.c:1407
+#: utils/mmgr/portalmem.c:950
 msgid "materialize mode required, but it is not allowed in this context"
 msgstr "mode matérialisé requis mais interdit dans ce contexte"
 
-#: commands/proclang.c:92
+#: commands/user.c:143
+msgid "SYSID can no longer be specified"
+msgstr "SYSID ne peut plus être spécifié"
+
+#: commands/user.c:284
+msgid "must be superuser to create superusers"
+msgstr "doit être super-utilisateur pour créer des super-utilisateurs"
+
+#: commands/user.c:291
+msgid "must be superuser to create replication users"
+msgstr "doit être super-utilisateur pour créer des utilisateurs avec l'attribut réplication"
+
+#: commands/user.c:298
+msgid "permission denied to create role"
+msgstr "droit refusé pour créer un rôle"
+
+#: commands/user.c:305
+#: commands/user.c:1087
+#, c-format
+msgid "role name \"%s\" is reserved"
+msgstr "le nom du rôle « %s » est réservé"
+
+#: commands/user.c:318
+#: commands/user.c:1081
+#, c-format
+msgid "role \"%s\" already exists"
+msgstr "le rôle « %s » existe déjà"
+
+#: commands/user.c:623
+#: commands/user.c:825
+#: commands/user.c:905
+#: commands/user.c:1056
+#: commands/variable.c:882
+#: commands/variable.c:954
+#: utils/init/miscinit.c:432
+#: utils/adt/acl.c:4822
+#, c-format
+msgid "role \"%s\" does not exist"
+msgstr "le rôle « %s » n'existe pas"
+
+#: commands/user.c:636
+#: commands/user.c:842
+#: commands/user.c:1321
+#: commands/user.c:1458
+msgid "must be superuser to alter superusers"
+msgstr "doit être super-utilisateur pour modifier des super-utilisateurs"
+
+#: commands/user.c:643
+msgid "must be superuser to alter replication users"
+msgstr "doit être super-utilisateur pour modifier des utilisateurs ayant l'attribut réplication"
+
+#: commands/user.c:659
+#: commands/user.c:850
+msgid "permission denied"
+msgstr "droit refusé"
+
+#: commands/user.c:878
+msgid "permission denied to drop role"
+msgstr "droit refusé pour supprimer le rôle"
+
+#: commands/user.c:910
+#, c-format
+msgid "role \"%s\" does not exist, skipping"
+msgstr "le rôle « %s » n'existe pas, poursuite du traitement"
+
+#: commands/user.c:922
+#: commands/user.c:926
+msgid "current user cannot be dropped"
+msgstr "l'utilisateur actuel ne peut pas être supprimé"
+
+#: commands/user.c:930
+msgid "session user cannot be dropped"
+msgstr "l'utilisateur de la session ne peut pas être supprimé"
+
+#: commands/user.c:941
+msgid "must be superuser to drop superusers"
+msgstr "doit être super-utilisateur pour supprimer des super-utilisateurs"
+
+#: commands/user.c:954
+#, c-format
+msgid "role \"%s\" cannot be dropped because some objects depend on it"
+msgstr "le rôle « %s » ne peut pas être supprimé car d'autres objets en dépendent"
+
+#: commands/user.c:1071
+msgid "session user cannot be renamed"
+msgstr "l'utilisateur de la session ne peut pas être renommé"
+
+#: commands/user.c:1075
+msgid "current user cannot be renamed"
+msgstr "l'utilisateur courant ne peut pas être renommé"
+
+#: commands/user.c:1098
+msgid "must be superuser to rename superusers"
+msgstr "doit être super-utilisateur pour renommer les super-utilisateurs"
+
+#: commands/user.c:1105
+msgid "permission denied to rename role"
+msgstr "droit refusé pour renommer le rôle"
+
+#: commands/user.c:1126
+msgid "MD5 password cleared because of role rename"
+msgstr "mot de passe MD5 effacé à cause du renommage du rôle"
+
+#: commands/user.c:1182
+msgid "column names cannot be included in GRANT/REVOKE ROLE"
+msgstr "les noms de colonne ne peuvent pas être inclus dans GRANT/REVOKE ROLE"
+
+#: commands/user.c:1220
+msgid "permission denied to drop objects"
+msgstr "droit refusé pour supprimer les objets"
+
+#: commands/user.c:1247
+#: commands/user.c:1256
+msgid "permission denied to reassign objects"
+msgstr "droit refusé pour ré-affecter les objets"
+
+#: commands/user.c:1329
+#: commands/user.c:1466
+#, c-format
+msgid "must have admin option on role \"%s\""
+msgstr "doit avoir l'option admin sur le rôle « %s »"
+
+#: commands/user.c:1337
+msgid "must be superuser to set grantor"
+msgstr "doit être super-utilisateur pour configurer le « donneur de droits »"
+
+#: commands/user.c:1362
+#, c-format
+msgid "role \"%s\" is a member of role \"%s\""
+msgstr "le rôle « %s » est un membre du rôle « %s »"
+
+#: commands/user.c:1377
+#, c-format
+msgid "role \"%s\" is already a member of role \"%s\""
+msgstr "le rôle « %s » est déjà un membre du rôle « %s »"
+
+#: commands/user.c:1488
+#, c-format
+msgid "role \"%s\" is not a member of role \"%s\""
+msgstr "le rôle « %s » n'est pas un membre du rôle « %s »"
+
+#: commands/proclang.c:93
 msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
 msgstr ""
 "utilisation des informations de pg_pltemplate au lieu des paramètres de\n"
 "CREATE LANGUAGE"
 
-#: commands/proclang.c:102
+#: commands/proclang.c:103
 #, c-format
 msgid "must be superuser to create procedural language \"%s\""
 msgstr "doit être super-utilisateur pour créer le langage de procédures « %s »"
 
-#: commands/proclang.c:122
-#: commands/proclang.c:278
+#: commands/proclang.c:123
+#: commands/proclang.c:279
 #, c-format
 msgid "function %s must return type \"language_handler\""
 msgstr "la fonction %s doit renvoyer le type « language_handler »"
 
-#: commands/proclang.c:242
+#: commands/proclang.c:243
 #, c-format
 msgid "unsupported language \"%s\""
 msgstr "langage non supporté « %s »"
 
-#: commands/proclang.c:244
+#: commands/proclang.c:245
 msgid "The supported languages are listed in the pg_pltemplate system catalog."
 msgstr "Les langages supportés sont listés dans le catalogue système pg_pltemplate."
 
-#: commands/proclang.c:252
+#: commands/proclang.c:253
 msgid "must be superuser to create custom procedural language"
 msgstr "doit être super-utilisateur pour créer un langage de procédures personnalisé"
 
-#: commands/proclang.c:271
+#: commands/proclang.c:272
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"language_handler\""
 msgstr ""
 "changement du type du code retour de la fonction %s d'« opaque » à\n"
 "« language_handler »"
 
-#: commands/proclang.c:356
+#: commands/proclang.c:357
 #: commands/proclang.c:606
 #, c-format
 msgid "language \"%s\" already exists"
 msgstr "le langage « %s » existe déjà"
 
-#: commands/proclang.c:534
+#: commands/proclang.c:537
 #, c-format
 msgid "language \"%s\" does not exist, skipping"
 msgstr "le langage « %s » n'existe pas, poursuite du traitement"
 
 #: commands/schemacmds.c:82
-#: commands/schemacmds.c:288
+#: commands/schemacmds.c:275
 #, c-format
 msgid "unacceptable schema name \"%s\""
 msgstr "nom de schéma « %s » inacceptable"
 
 #: commands/schemacmds.c:83
-#: commands/schemacmds.c:289
+#: commands/schemacmds.c:276
 msgid "The prefix \"pg_\" is reserved for system schemas."
 msgstr "Le préfixe « pg_ » est réservé pour les schémas système."
 
-#: commands/schemacmds.c:196
+#: commands/schemacmds.c:186
 #, c-format
 msgid "schema \"%s\" does not exist, skipping"
 msgstr "le schéma « %s » n'existe pas, poursuite du traitement"
 
-#: commands/sequence.c:553
+#: commands/sequence.c:126
+msgid "unlogged sequences are not supported"
+msgstr "les séquences non tracées ne sont pas supportées"
+
+#: commands/sequence.c:634
 #, c-format
 msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
 msgstr "nextval : valeur maximale de la séquence « %s » (%s) atteinte"
 
-#: commands/sequence.c:576
+#: commands/sequence.c:657
 #, c-format
 msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
 msgstr "nextval : valeur minimale de la séquence « %s » (%s) atteinte"
 
-#: commands/sequence.c:674
+#: commands/sequence.c:755
 #, c-format
 msgid "currval of sequence \"%s\" is not yet defined in this session"
 msgstr ""
 "la valeur courante (currval) de la séquence « %s » n'est pas encore définie\n"
 "dans cette session"
 
-#: commands/sequence.c:693
-#: commands/sequence.c:699
+#: commands/sequence.c:774
+#: commands/sequence.c:780
 msgid "lastval is not yet defined in this session"
 msgstr "la dernière valeur (lastval) n'est pas encore définie dans cette session"
 
-#: commands/sequence.c:767
+#: commands/sequence.c:848
 #, c-format
 msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
 msgstr "setval : la valeur %s est en dehors des limites de la séquence « %s » (%s..%s)"
 
-#: commands/sequence.c:936
+#: commands/sequence.c:1017
 #: lib/stringinfo.c:266
-#: libpq/auth.c:1020
-#: libpq/auth.c:1374
-#: libpq/auth.c:1442
-#: libpq/auth.c:2016
-#: storage/buffer/buf_init.c:154
-#: storage/buffer/localbuf.c:348
-#: storage/file/fd.c:356
-#: storage/file/fd.c:739
-#: storage/file/fd.c:857
-#: storage/ipc/procarray.c:786
-#: storage/ipc/procarray.c:1176
+#: libpq/auth.c:1022
+#: libpq/auth.c:1382
+#: libpq/auth.c:1450
+#: libpq/auth.c:1852
+#: storage/ipc/procarray.c:784
 #: storage/ipc/procarray.c:1183
-#: storage/ipc/procarray.c:1418
-#: storage/ipc/procarray.c:1812
-#: postmaster/postmaster.c:1973
-#: postmaster/postmaster.c:2006
-#: postmaster/postmaster.c:3188
-#: postmaster/postmaster.c:3870
-#: postmaster/postmaster.c:3951
-#: postmaster/postmaster.c:4539
-#: utils/mmgr/aset.c:408
+#: storage/ipc/procarray.c:1190
+#: storage/ipc/procarray.c:1425
+#: storage/ipc/procarray.c:1819
+#: storage/buffer/buf_init.c:154
+#: storage/buffer/localbuf.c:350
+#: storage/file/fd.c:358
+#: storage/file/fd.c:742
+#: storage/file/fd.c:860
+#: postmaster/postmaster.c:2003
+#: postmaster/postmaster.c:2034
+#: postmaster/postmaster.c:3231
+#: postmaster/postmaster.c:3915
+#: postmaster/postmaster.c:3996
+#: postmaster/postmaster.c:4610
+#: utils/init/miscinit.c:150
+#: utils/init/miscinit.c:171
+#: utils/init/miscinit.c:181
+#: utils/adt/formatting.c:1529
+#: utils/adt/formatting.c:1650
+#: utils/adt/formatting.c:1783
+#: utils/adt/regexp.c:210
+#: utils/adt/varlena.c:3474
+#: utils/adt/varlena.c:3495
+#: utils/mmgr/aset.c:416
 #: utils/mmgr/aset.c:587
-#: utils/mmgr/aset.c:770
-#: utils/mmgr/aset.c:976
-#: utils/adt/formatting.c:1491
-#: utils/adt/formatting.c:1547
-#: utils/adt/formatting.c:1604
-#: utils/adt/regexp.c:205
-#: utils/adt/varlena.c:3246
-#: utils/adt/varlena.c:3267
-#: utils/misc/guc.c:2915
-#: utils/misc/guc.c:2928
-#: utils/misc/guc.c:2941
+#: utils/mmgr/aset.c:765
+#: utils/mmgr/aset.c:966
 #: utils/fmgr/dfmgr.c:224
-#: utils/hash/dynahash.c:363
-#: utils/hash/dynahash.c:435
-#: utils/hash/dynahash.c:929
-#: utils/init/miscinit.c:149
-#: utils/init/miscinit.c:170
-#: utils/init/miscinit.c:180
-#: utils/mb/mbutils.c:334
-#: utils/mb/mbutils.c:606
+#: utils/hash/dynahash.c:364
+#: utils/hash/dynahash.c:436
+#: utils/hash/dynahash.c:932
+#: utils/mb/mbutils.c:374
+#: utils/mb/mbutils.c:675
+#: utils/misc/guc.c:3298
+#: utils/misc/guc.c:3311
+#: utils/misc/guc.c:3324
+#: utils/misc/tzparser.c:455
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
-#: commands/sequence.c:1096
+#: commands/sequence.c:1206
 msgid "INCREMENT must not be zero"
 msgstr "la valeur INCREMENT ne doit pas être zéro"
 
-#: commands/sequence.c:1142
+#: commands/sequence.c:1252
 #, c-format
 msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr "la valeur MINVALUE (%s) doit être moindre que la valeur MAXVALUE (%s)"
 
-#: commands/sequence.c:1167
+#: commands/sequence.c:1277
 #, c-format
 msgid "START value (%s) cannot be less than MINVALUE (%s)"
 msgstr "la valeur START (%s) ne peut pas être plus petite que celle de MINVALUE (%s)"
 
-#: commands/sequence.c:1179
+#: commands/sequence.c:1289
 #, c-format
 msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
 msgstr "la valeur START (%s) ne peut pas être plus grande que celle de MAXVALUE (%s)"
 
-#: commands/sequence.c:1210
+#: commands/sequence.c:1320
 #, c-format
 msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
 msgstr "la valeur RESTART (%s) ne peut pas être plus petite que celle de MINVALUE (%s)"
 
-#: commands/sequence.c:1222
+#: commands/sequence.c:1332
 #, c-format
 msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
 msgstr "la valeur RESTART (%s) ne peut pas être plus grande que celle de MAXVALUE (%s)"
 
-#: commands/sequence.c:1237
+#: commands/sequence.c:1347
 #, c-format
 msgid "CACHE (%s) must be greater than zero"
 msgstr "la valeur CACHE (%s) doit être plus grande que zéro"
 
-#: commands/sequence.c:1268
+#: commands/sequence.c:1378
 msgid "invalid OWNED BY option"
 msgstr "option OWNED BY invalide"
 
-#: commands/sequence.c:1269
+#: commands/sequence.c:1379
 msgid "Specify OWNED BY table.column or OWNED BY NONE."
 msgstr "Indiquer OWNED BY table.colonne ou OWNED BY NONE."
 
-#: commands/sequence.c:1291
-#: commands/tablecmds.c:4811
+#: commands/sequence.c:1401
+#: commands/tablecmds.c:5525
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "la relation référencée « %s » n'est pas une table"
 
-#: commands/sequence.c:1298
+#: commands/sequence.c:1408
 msgid "sequence must have same owner as table it is linked to"
 msgstr "la séquence doit avoir le même propriétaire que la table avec laquelle elle est liée"
 
-#: commands/sequence.c:1302
+#: commands/sequence.c:1412
 msgid "sequence must be in same schema as table it is linked to"
 msgstr "la séquence doit être dans le même schéma que la table avec laquelle elle est liée"
 
-#: commands/tablecmds.c:192
+#: commands/tablecmds.c:200
 #, c-format
 msgid "table \"%s\" does not exist"
 msgstr "la table « %s » n'existe pas"
 
-#: commands/tablecmds.c:193
+#: commands/tablecmds.c:201
 #, c-format
 msgid "table \"%s\" does not exist, skipping"
 msgstr "la table « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:195
+#: commands/tablecmds.c:203
 msgid "Use DROP TABLE to remove a table."
 msgstr "Utilisez DROP TABLE pour supprimer une table."
 
-#: commands/tablecmds.c:198
+#: commands/tablecmds.c:206
 #, c-format
 msgid "sequence \"%s\" does not exist"
 msgstr "la séquence « %s » n'existe pas"
 
-#: commands/tablecmds.c:199
+#: commands/tablecmds.c:207
 #, c-format
 msgid "sequence \"%s\" does not exist, skipping"
 msgstr "la séquence « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:201
+#: commands/tablecmds.c:209
 msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr "Utilisez DROP SEQUENCE pour supprimer une séquence."
 
-#: commands/tablecmds.c:204
+#: commands/tablecmds.c:212
 #, c-format
 msgid "view \"%s\" does not exist"
 msgstr "la vue « %s » n'existe pas"
 
-#: commands/tablecmds.c:205
+#: commands/tablecmds.c:213
 #, c-format
 msgid "view \"%s\" does not exist, skipping"
 msgstr "la vue « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:207
+#: commands/tablecmds.c:215
 msgid "Use DROP VIEW to remove a view."
 msgstr "Utilisez DROP VIEW pour supprimer une vue."
 
-#: commands/tablecmds.c:210
+#: commands/tablecmds.c:218
+#: parser/parse_utilcmd.c:1449
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "l'index « %s » n'existe pas"
 
-#: commands/tablecmds.c:211
+#: commands/tablecmds.c:219
 #, c-format
 msgid "index \"%s\" does not exist, skipping"
 msgstr "l'index « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:213
+#: commands/tablecmds.c:221
 msgid "Use DROP INDEX to remove an index."
 msgstr "Utilisez DROP INDEX pour supprimer un index."
 
-#: commands/tablecmds.c:217
-#: commands/typecmds.c:656
+#: commands/tablecmds.c:225
+#: commands/typecmds.c:666
 #, c-format
 msgid "type \"%s\" does not exist, skipping"
 msgstr "le type « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablecmds.c:218
+#: commands/tablecmds.c:226
 #, c-format
 msgid "\"%s\" is not a type"
 msgstr "« %s » n'est pas un type"
 
-#: commands/tablecmds.c:219
+#: commands/tablecmds.c:227
 msgid "Use DROP TYPE to remove a type."
 msgstr "Utilisez DROP TYPE pour supprimer un type."
 
-#: commands/tablecmds.c:390
-#: executor/execMain.c:2155
+#: commands/tablecmds.c:230
+#: commands/tablecmds.c:8888
+#, c-format
+msgid "foreign table \"%s\" does not exist"
+msgstr "la table distante « %s » n'existe pas"
+
+#: commands/tablecmds.c:231
+#, c-format
+msgid "foreign table \"%s\" does not exist, skipping"
+msgstr "la table distante « %s » n'existe pas, poursuite du traitement"
+
+#: commands/tablecmds.c:233
+msgid "Use DROP FOREIGN TABLE to remove a foreign table."
+msgstr "Utilisez DROP FOREIGN TABLE pour supprimer une table distante."
+
+#: commands/tablecmds.c:425
+#: executor/execMain.c:2416
 msgid "ON COMMIT can only be used on temporary tables"
 msgstr "ON COMMIT peut seulement être utilisé sur des tables temporaires"
 
-#: commands/tablecmds.c:400
-#: executor/execMain.c:2165
+#: commands/tablecmds.c:429
+msgid "constraints on foreign tables are not supported"
+msgstr "les contraintes sur les tables distantes ne sont pas supportées"
+
+#: commands/tablecmds.c:447
+#: executor/execMain.c:2434
 msgid "cannot create temporary table within security-restricted operation"
 msgstr ""
 "ne peut pas créer une table temporaire à l'intérieur d'une fonction\n"
 "restreinte pour sécurité"
 
-#: commands/tablecmds.c:777
-#: commands/tablecmds.c:1109
-#: commands/tablecmds.c:2001
-#: commands/tablecmds.c:3367
-#: commands/tablecmds.c:3396
-#: commands/tablecmds.c:4817
-#: commands/trigger.c:155
-#: commands/trigger.c:1069
-#: tcop/utility.c:92
-#: rewrite/rewriteDefine.c:258
+#: commands/tablecmds.c:545
+#: commands/tablecmds.c:4351
+msgid "default values on foreign tables are not supported"
+msgstr "les valeurs par défaut ne sont pas supportées sur les tables distantes"
+
+#: commands/tablecmds.c:813
+#: commands/tablecmds.c:1142
+#: commands/tablecmds.c:2070
+#: commands/tablecmds.c:3807
+#: commands/tablecmds.c:5531
+#: commands/trigger.c:192
+#: commands/trigger.c:1098
+#: tcop/utility.c:95
+#: rewrite/rewriteDefine.c:263
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "droit refusé : « %s » est un catalogue système"
 
-#: commands/tablecmds.c:889
+#: commands/tablecmds.c:925
 #, c-format
 msgid "truncate cascades to table \"%s\""
 msgstr "TRUNCATE cascade sur la table « %s »"
 
-#: commands/tablecmds.c:1119
+#: commands/tablecmds.c:1152
 msgid "cannot truncate temporary tables of other sessions"
 msgstr "ne peut pas tronquer les tables temporaires des autres sessions"
 
-#: commands/tablecmds.c:1314
-#: parser/parse_utilcmd.c:590
-#: parser/parse_utilcmd.c:1408
+#: commands/tablecmds.c:1354
+#: parser/parse_utilcmd.c:621
+#: parser/parse_utilcmd.c:1667
 #, c-format
 msgid "inherited relation \"%s\" is not a table"
 msgstr "la relation héritée « %s » n'est pas une table"
 
-#: commands/tablecmds.c:1320
-#: commands/tablecmds.c:7228
+#: commands/tablecmds.c:1361
+#: commands/tablecmds.c:8114
 #, c-format
 msgid "cannot inherit from temporary relation \"%s\""
 msgstr "ine peut pas hériter à partir d'une relation temporaire « %s »"
 
-#: commands/tablecmds.c:1337
-#: commands/tablecmds.c:7256
+#: commands/tablecmds.c:1378
+#: commands/tablecmds.c:8142
 #, c-format
 msgid "relation \"%s\" would be inherited from more than once"
 msgstr "la relation « %s » serait héritée plus d'une fois"
 
-#: commands/tablecmds.c:1392
+#: commands/tablecmds.c:1434
 #, c-format
 msgid "merging multiple inherited definitions of column \"%s\""
 msgstr "assemblage de plusieurs définitions d'héritage pour la colonne « %s »"
 
-#: commands/tablecmds.c:1400
+#: commands/tablecmds.c:1442
 #, c-format
 msgid "inherited column \"%s\" has a type conflict"
 msgstr "la colonne héritée « %s » a un conflit de type"
 
-#: commands/tablecmds.c:1402
-#: commands/tablecmds.c:1414
-#: commands/tablecmds.c:1574
-#: commands/tablecmds.c:1586
-#: parser/parse_coerce.c:1438
-#: parser/parse_coerce.c:1457
-#: parser/parse_coerce.c:1502
-#: parser/parse_param.c:214
+#: commands/tablecmds.c:1444
+#: commands/tablecmds.c:1465
+#: commands/tablecmds.c:1630
+#: commands/tablecmds.c:1652
+#: parser/parse_coerce.c:1514
+#: parser/parse_coerce.c:1534
+#: parser/parse_coerce.c:1579
+#: parser/parse_param.c:217
 #, c-format
 msgid "%s versus %s"
 msgstr "%s versus %s"
 
-#: commands/tablecmds.c:1412
+#: commands/tablecmds.c:1451
+#, c-format
+msgid "inherited column \"%s\" has a collation conflict"
+msgstr "la colonne héritée « %s » a un conflit sur le collationnement"
+
+#: commands/tablecmds.c:1453
+#: commands/tablecmds.c:1640
+#: commands/tablecmds.c:4220
+#, c-format
+msgid "\"%s\" versus \"%s\""
+msgstr "« %s » versus « %s »"
+
+#: commands/tablecmds.c:1463
 #, c-format
 msgid "inherited column \"%s\" has a storage parameter conflict"
 msgstr "la colonne héritée « %s » a un conflit de paramètre de stockage"
 
-#: commands/tablecmds.c:1564
+#: commands/tablecmds.c:1620
 #, c-format
 msgid "merging column \"%s\" with inherited definition"
 msgstr "assemblage de la colonne « %s » avec une définition héritée"
 
-#: commands/tablecmds.c:1572
+#: commands/tablecmds.c:1628
 #, c-format
 msgid "column \"%s\" has a type conflict"
 msgstr "la colonne « %s » a un conflit de type"
 
-#: commands/tablecmds.c:1584
+#: commands/tablecmds.c:1638
+#, c-format
+msgid "column \"%s\" has a collation conflict"
+msgstr "la colonne « %s » a un conflit sur le collationnement"
+
+#: commands/tablecmds.c:1650
 #, c-format
 msgid "column \"%s\" has a storage parameter conflict"
 msgstr "la colonne « %s » a un conflit de paramètre de stockage"
 
-#: commands/tablecmds.c:1636
+#: commands/tablecmds.c:1702
 #, c-format
 msgid "column \"%s\" inherits conflicting default values"
 msgstr "la colonne « %s » hérite de valeurs par défaut conflictuelles"
 
-#: commands/tablecmds.c:1638
+#: commands/tablecmds.c:1704
 msgid "To resolve the conflict, specify a default explicitly."
 msgstr "Pour résoudre le conflit, spécifiez explicitement une valeur par défaut."
 
-#: commands/tablecmds.c:1685
+#: commands/tablecmds.c:1751
 #, c-format
 msgid "check constraint name \"%s\" appears multiple times but with different expressions"
 msgstr ""
 "le nom de la contrainte de vérification, « %s », apparaît plusieurs fois\n"
 "mais avec des expressions différentes"
 
-#: commands/tablecmds.c:1973
+#: commands/tablecmds.c:2041
 msgid "cannot rename column of typed table"
 msgstr "ne peut pas renommer une colonne d'une table typée"
 
-#: commands/tablecmds.c:1989
+#: commands/tablecmds.c:2058
 #, c-format
-msgid "\"%s\" is not a table, view, composite type or index"
-msgstr "« %s » n'est ni une table, ni une vue, ni un type composite, ni une séquence"
+msgid "\"%s\" is not a table, view, composite type, index or foreign table"
+msgstr "« %s » n'est ni une table, ni une vue, ni un type composite, ni une table distante"
 
-#: commands/tablecmds.c:2055
+#: commands/tablecmds.c:2124
 #, c-format
 msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr "la colonne héritée « %s » doit aussi être renommée pour les tables filles"
 
-#: commands/tablecmds.c:2073
+#: commands/tablecmds.c:2156
 #, c-format
 msgid "cannot rename system column \"%s\""
 msgstr "ne peut pas renommer la colonne système « %s »"
 
-#: commands/tablecmds.c:2088
+#: commands/tablecmds.c:2171
 #, c-format
 msgid "cannot rename inherited column \"%s\""
 msgstr "ne peut pas renommer la colonne héritée « %s »"
 
-#: commands/tablecmds.c:2099
-#: commands/tablecmds.c:3711
+#: commands/tablecmds.c:2182
+#: commands/tablecmds.c:4264
 #, c-format
 msgid "column \"%s\" of relation \"%s\" already exists"
 msgstr "la colonne « %s » de la relation « %s » existe déjà"
 
-#: commands/tablecmds.c:2164
-#: commands/tablecmds.c:6552
-#: commands/tablecmds.c:7858
+#: commands/tablecmds.c:2271
+#: commands/tablecmds.c:7438
+#: commands/tablecmds.c:9020
 msgid "Use ALTER TYPE instead."
 msgstr "Utilisez ALTER TYPE à la place."
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2287
+#: commands/tablecmds.c:2394
 #, c-format
 msgid "cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr ""
@@ -6514,1167 +6537,1191 @@ msgstr ""
 "des requêtes actives dans cette session"
 
 #. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2296
+#: commands/tablecmds.c:2403
 #, c-format
 msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr "ne peut pas exécuter %s « %s » car il reste des événements sur les triggers"
 
-#: commands/tablecmds.c:2909
+#: commands/tablecmds.c:2502
+#, c-format
+msgid "\"%s\" is not a composite type"
+msgstr "« %s » n'est pas un type composite"
+
+#: commands/tablecmds.c:3327
 #, c-format
 msgid "cannot rewrite system relation \"%s\""
 msgstr "ne peut pas ré-écrire la relation système « %s »"
 
-#: commands/tablecmds.c:2919
+#: commands/tablecmds.c:3337
 msgid "cannot rewrite temporary tables of other sessions"
 msgstr "ne peut pas ré-écrire les tables temporaires des autres sessions"
 
-#: commands/tablecmds.c:3244
+#: commands/tablecmds.c:3562
+#, c-format
+msgid "rewriting table \"%s\""
+msgstr "ré-écriture de la table « %s »"
+
+#: commands/tablecmds.c:3566
+#, c-format
+msgid "verifying table \"%s\""
+msgstr "vérification de la table « %s »"
+
+#: commands/tablecmds.c:3673
 #, c-format
 msgid "column \"%s\" contains null values"
 msgstr "la colonne « %s » contient des valeurs NULL"
 
-#: commands/tablecmds.c:3258
+#: commands/tablecmds.c:3687
 #, c-format
 msgid "check constraint \"%s\" is violated by some row"
 msgstr "la contrainte de vérification « %s » est rompue par une ligne"
 
-#: commands/tablecmds.c:3349
-#: rewrite/rewriteDefine.c:252
+#: commands/tablecmds.c:3828
+#: commands/tablecmds.c:4778
+#, c-format
+msgid "\"%s\" is not a table or index"
+msgstr "« %s » n'est pas une table ou un index"
+
+#: commands/tablecmds.c:3831
+#: commands/trigger.c:186
+#: commands/trigger.c:1092
+#: rewrite/rewriteDefine.c:257
 #, c-format
 msgid "\"%s\" is not a table or view"
 msgstr "« %s » n'est pas une table ou une vue"
 
-#: commands/tablecmds.c:3385
-#: commands/tablecmds.c:4139
+#: commands/tablecmds.c:3834
 #, c-format
-msgid "\"%s\" is not a table or index"
-msgstr "« %s » n'est pas une table ou un index"
+msgid "\"%s\" is not a table or foreign table"
+msgstr "« %s » n'est pas une table ou une table distante"
 
-#: commands/tablecmds.c:3540
+#: commands/tablecmds.c:3837
 #, c-format
-msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
-msgstr ""
-"ne peut pas modifier la table « %s » car la colonne « %s ».« %s » utilise\n"
-"son type de ligne"
+msgid "\"%s\" is not a table, composite type, or foreign table"
+msgstr "« %s » n'est ni une table, ni un type composite, ni une table distante"
 
-#: commands/tablecmds.c:3547
+#: commands/tablecmds.c:3847
 #, c-format
-msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
-msgstr "ne peux pas modifier le type « %s » car la colonne « %s ».« %s » l'utilise"
+msgid "\"%s\" is of the wrong type"
+msgstr "« %s » est du mauvais type"
 
-#: commands/tablecmds.c:3594
-msgid "cannot add column to typed table"
-msgstr "ne peut pas ajouter une colonne à une table typée"
+#: commands/tablecmds.c:3996
+#: commands/tablecmds.c:4003
+#, c-format
+msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
+msgstr "ne peux pas modifier le type « %s » car la colonne « %s.%s » l'utilise"
 
-#: commands/tablecmds.c:3623
-msgid "column must be added to child tables too"
-msgstr "la colonne doit aussi être ajoutée aux tables filles"
+#: commands/tablecmds.c:4010
+#, c-format
+msgid "cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
+msgstr ""
+"ne peut pas modifier la table distante « %s » car la colonne « %s.%s » utilise\n"
+"son type de ligne"
 
-#: commands/tablecmds.c:3668
-#: commands/tablecmds.c:7412
+#: commands/tablecmds.c:4017
 #, c-format
-msgid "child table \"%s\" has different type for column \"%s\""
-msgstr "la table fille « %s » a un type différent pour la colonne « %s »"
+msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
+msgstr ""
+"ne peut pas modifier la table « %s » car la colonne « %s.%s » utilise\n"
+"son type de ligne"
 
-#: commands/tablecmds.c:3675
+#: commands/tablecmds.c:4079
+#, c-format
+msgid "cannot alter type \"%s\" because it is the type of a typed table"
+msgstr "ne peut pas modifier le type « %s » car il s'agit du type d'une table de type"
+
+#: commands/tablecmds.c:4081
+msgid "Use ALTER ... CASCADE to alter the typed tables too."
+msgstr "Utilisez ALTER ... CASCADE pour modifier aussi les tables de type."
+
+#: commands/tablecmds.c:4125
+#, c-format
+msgid "type %s is not a composite type"
+msgstr "le type %s n'est pas un type composite"
+
+#: commands/tablecmds.c:4151
+msgid "cannot add column to typed table"
+msgstr "ne peut pas ajouter une colonne à une table typée"
+
+#: commands/tablecmds.c:4212
+#: commands/tablecmds.c:8296
+#, c-format
+msgid "child table \"%s\" has different type for column \"%s\""
+msgstr "la table fille « %s » a un type différent pour la colonne « %s »"
+
+#: commands/tablecmds.c:4218
+#: commands/tablecmds.c:8303
+#, c-format
+msgid "child table \"%s\" has different collation for column \"%s\""
+msgstr "la table fille « %s » a un collationnement différent pour la colonne « %s »"
+
+#: commands/tablecmds.c:4228
 #, c-format
 msgid "child table \"%s\" has a conflicting \"%s\" column"
 msgstr "la table fille « %s » a une colonne conflictuelle, « %s »"
 
-#: commands/tablecmds.c:3687
+#: commands/tablecmds.c:4240
 #, c-format
 msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr "assemblage de la définition de la colonne « %s » pour le fils « %s »"
 
-#: commands/tablecmds.c:3961
-#: commands/tablecmds.c:4051
-#: commands/tablecmds.c:4096
-#: commands/tablecmds.c:4192
-#: commands/tablecmds.c:4236
-#: commands/tablecmds.c:4315
-#: commands/tablecmds.c:5849
+#: commands/tablecmds.c:4470
+msgid "column must be added to child tables too"
+msgstr "la colonne doit aussi être ajoutée aux tables filles"
+
+#: commands/tablecmds.c:4600
+#: commands/tablecmds.c:4690
+#: commands/tablecmds.c:4735
+#: commands/tablecmds.c:4831
+#: commands/tablecmds.c:4875
+#: commands/tablecmds.c:4954
+#: commands/tablecmds.c:6656
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "n'a pas pu modifier la colonne système « %s »"
 
-#: commands/tablecmds.c:3995
+#: commands/tablecmds.c:4634
 #, c-format
 msgid "column \"%s\" is in a primary key"
 msgstr "la colonne « %s » est dans une clé primaire"
 
-#: commands/tablecmds.c:4166
+#: commands/tablecmds.c:4805
 #, c-format
 msgid "statistics target %d is too low"
 msgstr "la cible statistique %d est trop basse"
 
-#: commands/tablecmds.c:4174
+#: commands/tablecmds.c:4813
 #, c-format
 msgid "lowering statistics target to %d"
 msgstr "abaissement de la cible statistique à %d"
 
-#: commands/tablecmds.c:4296
+#: commands/tablecmds.c:4935
 #, c-format
 msgid "invalid storage type \"%s\""
 msgstr "type « %s » de stockage invalide"
 
-#: commands/tablecmds.c:4327
+#: commands/tablecmds.c:4966
 #, c-format
 msgid "column data type %s can only have storage PLAIN"
 msgstr ""
 "le type de données %s de la colonne peut seulement avoir un stockage texte\n"
 "(PLAIN)"
 
-#: commands/tablecmds.c:4356
+#: commands/tablecmds.c:4996
 msgid "cannot drop column from typed table"
 msgstr "ne peut pas supprimer une colonne à une table typée"
 
-#: commands/tablecmds.c:4395
+#: commands/tablecmds.c:5037
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "la colonne « %s » de la relation « %s » n'existe pas, ignore"
 
-#: commands/tablecmds.c:4408
+#: commands/tablecmds.c:5050
 #, c-format
 msgid "cannot drop system column \"%s\""
 msgstr "ne peut pas supprimer la colonne système « %s »"
 
-#: commands/tablecmds.c:4415
+#: commands/tablecmds.c:5057
 #, c-format
 msgid "cannot drop inherited column \"%s\""
 msgstr "ne peut pas supprimer la colonne héritée « %s »"
 
-#: commands/tablecmds.c:4746
+#: commands/tablecmds.c:5283
+#, c-format
+msgid "ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
+msgstr "ALTER TABLE / ADD CONSTRAINT USING INDEX renommera l'index « %s » en « %s »"
+
+#: commands/tablecmds.c:5460
 msgid "constraint must be added to child tables too"
 msgstr "la contrainte doit aussi être ajoutée aux tables filles"
 
-#: commands/tablecmds.c:4833
-msgid "cannot reference temporary table from permanent table constraint"
-msgstr ""
-"ne peut pas référencer une table temporaire à partir d'une contrainte de\n"
-"table permanente"
+#: commands/tablecmds.c:5548
+msgid "constraints on permanent tables may reference only permanent tables"
+msgstr "les contraintes sur les tables permanentes peuvent seulement référencer des tables permanentes"
+
+#: commands/tablecmds.c:5555
+msgid "constraints on unlogged tables may reference only permanent or unlogged tables"
+msgstr "les contraintes sur les tables non tracées peuvent seulement référencer des tables permanentes ou non tracées"
 
-#: commands/tablecmds.c:4840
-msgid "cannot reference permanent table from temporary table constraint"
+#: commands/tablecmds.c:5561
+msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
-"ne peut pas référencer une table permanente à partir de la contrainte de\n"
-"table temporaire"
+"les constraintes sur des tables temporaires ne peuvent référencer que des\n"
+"tables temporaires"
 
-#: commands/tablecmds.c:4900
+#: commands/tablecmds.c:5622
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr "nombre de colonnes de référence et référencées pour la clé étrangère en désaccord"
 
-#: commands/tablecmds.c:4989
+#: commands/tablecmds.c:5711
 #, c-format
 msgid "foreign key constraint \"%s\" cannot be implemented"
 msgstr "la contrainte de clé étrangère « %s » ne peut pas être implémentée"
 
-#: commands/tablecmds.c:4992
+#: commands/tablecmds.c:5714
 #, c-format
 msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
 msgstr "Les colonnes clés « %s » et « %s » sont de types incompatibles : %s et %s."
 
-#: commands/tablecmds.c:5087
+#: commands/tablecmds.c:5827
+#, c-format
+msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "la clé étrangère « %s » de la relation « %s » n'existe pas"
+
+#: commands/tablecmds.c:5890
 #, c-format
 msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr "la colonne « %s » référencée dans la contrainte de clé étrangère n'existe pas"
 
-#: commands/tablecmds.c:5092
+#: commands/tablecmds.c:5895
 #, c-format
 msgid "cannot have more than %d keys in a foreign key"
 msgstr "ne peut pas avoir plus de %d clés dans une clé étrangère"
 
-#: commands/tablecmds.c:5157
+#: commands/tablecmds.c:5960
 #, c-format
 msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr "ne peut pas utiliser une clé primaire déferrable pour la table « %s » référencée"
 
-#: commands/tablecmds.c:5174
+#: commands/tablecmds.c:5977
 #, c-format
 msgid "there is no primary key for referenced table \"%s\""
 msgstr "il n'existe pas de clé étrangère pour la table « %s » référencée"
 
-#: commands/tablecmds.c:5324
+#: commands/tablecmds.c:6127
 #, c-format
 msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
 "ne peut pas utiliser une contrainte unique déferrable pour la table\n"
 "référencée « %s »"
 
-#: commands/tablecmds.c:5329
+#: commands/tablecmds.c:6132
 #, c-format
 msgid "there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr ""
 "il n'existe aucune contrainte unique correspondant aux clés données pour la\n"
 "table « %s » référencée"
 
-#: commands/tablecmds.c:5659
+#: commands/tablecmds.c:6183
+#, c-format
+msgid "validating foreign key constraint \"%s\""
+msgstr "validation de la contraintes de clé étrangère « %s »"
+
+#: commands/tablecmds.c:6465
 #, c-format
 msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
 msgstr "ne peut pas supprimer la contrainte héritée « %s » de la relation « %s »"
 
-#: commands/tablecmds.c:5686
-#: commands/tablecmds.c:5800
+#: commands/tablecmds.c:6492
+#: commands/tablecmds.c:6605
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist"
 msgstr "la contrainte « %s » de la relation « %s » n'existe pas"
 
-#: commands/tablecmds.c:5692
+#: commands/tablecmds.c:6498
 #, c-format
 msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
 msgstr "la contrainte « %s » de la relation « %s » n'existe pas, ignore"
 
-#: commands/tablecmds.c:5833
+#: commands/tablecmds.c:6640
 msgid "cannot alter column type of typed table"
 msgstr "ne peut pas modifier le type d'une colonne appartenant à une table typée"
 
-#: commands/tablecmds.c:5856
+#: commands/tablecmds.c:6663
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "ne peut pas modifier la colonne héritée « %s »"
 
-#: commands/tablecmds.c:5893
+#: commands/tablecmds.c:6705
 msgid "transform expression must not return a set"
 msgstr "l'expression de transformation ne doit pas renvoyer un ensemble"
 
-#: commands/tablecmds.c:5899
+#: commands/tablecmds.c:6711
 msgid "cannot use subquery in transform expression"
 msgstr "ne peut pas utiliser une sous-requête dans l'expression de transformation"
 
-#: commands/tablecmds.c:5903
+#: commands/tablecmds.c:6715
 msgid "cannot use aggregate function in transform expression"
 msgstr "ne peut pas utiliser la fonction d'agrégat dans l'expression de la transformation"
 
-#: commands/tablecmds.c:5907
+#: commands/tablecmds.c:6719
 msgid "cannot use window function in transform expression"
 msgstr "ne peut pas utiliser la fonction window dans l'expression de la transformation"
 
-#: commands/tablecmds.c:5925
+#: commands/tablecmds.c:6738
 #, c-format
 msgid "column \"%s\" cannot be cast to type %s"
 msgstr "la colonne « %s » ne peut pas être convertie vers le type %s"
 
-#: commands/tablecmds.c:5951
+#: commands/tablecmds.c:6785
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr "le type de colonne héritée « %s » doit aussi être renommée pour les tables filles"
 
-#: commands/tablecmds.c:5990
+#: commands/tablecmds.c:6866
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "ne peut pas modifier la colonne « %s » deux fois"
 
-#: commands/tablecmds.c:6024
+#: commands/tablecmds.c:6902
 #, c-format
 msgid "default for column \"%s\" cannot be cast to type %s"
 msgstr ""
 "la valeur par défaut de la colonne « %s » ne peut pas être convertie vers le\n"
 "type %s"
 
-#: commands/tablecmds.c:6150
+#: commands/tablecmds.c:7028
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "ne peut pas modifier le type d'une colonne utilisée dans une vue ou une règle"
 
-#: commands/tablecmds.c:6151
-#: commands/tablecmds.c:6169
+#: commands/tablecmds.c:7029
+#: commands/tablecmds.c:7048
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s dépend de la colonne « %s »"
 
-#: commands/tablecmds.c:6168
+#: commands/tablecmds.c:7047
 msgid "cannot alter type of a column used in a trigger definition"
 msgstr "ne peut pas modifier le type d'une colonne utilisée dans la définition d'un trigger"
 
-#: commands/tablecmds.c:6520
+#: commands/tablecmds.c:7406
 #, c-format
 msgid "cannot change owner of index \"%s\""
 msgstr "ne peut pas modifier le propriétaire de l'index « %s »"
 
-#: commands/tablecmds.c:6522
+#: commands/tablecmds.c:7408
 msgid "Change the ownership of the index's table, instead."
 msgstr "Modifier à la place le propriétaire de la table concernée par l'index."
 
-#: commands/tablecmds.c:6538
+#: commands/tablecmds.c:7424
 #, c-format
 msgid "cannot change owner of sequence \"%s\""
 msgstr "ne peut pas modifier le propriétaire de la séquence « %s »"
 
-#: commands/tablecmds.c:6540
-#: commands/tablecmds.c:7848
+#: commands/tablecmds.c:7426
+#: commands/tablecmds.c:9010
 #, c-format
 msgid "Sequence \"%s\" is linked to table \"%s\"."
 msgstr "La séquence « %s » est liée à la table « %s »."
 
-#: commands/tablecmds.c:6561
-#: commands/tablecmds.c:7866
+#: commands/tablecmds.c:7447
+#: commands/tablecmds.c:9028
 #, c-format
-msgid "\"%s\" is not a table, view, or sequence"
-msgstr "« %s » n'est pas une table, une vue ou une séquence"
+msgid "\"%s\" is not a table, view, sequence, or foreign table"
+msgstr "« %s » n'est pas une table, une vue, une séquence ou une table distante"
 
-#: commands/tablecmds.c:6820
+#: commands/tablecmds.c:7702
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "ne peut pas avoir de nombreuses sous-commandes SET TABLESPACE"
 
-#: commands/tablecmds.c:6872
+#: commands/tablecmds.c:7754
 #, c-format
 msgid "\"%s\" is not a table, index, or TOAST table"
 msgstr "« %s » n'est pas une table, un index ou une table TOAST"
 
-#: commands/tablecmds.c:6993
+#: commands/tablecmds.c:7875
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "ne peut pas déplacer la colonne système « %s »"
 
-#: commands/tablecmds.c:7009
+#: commands/tablecmds.c:7891
 msgid "cannot move temporary tables of other sessions"
 msgstr "ne peut pas déplacer les tables temporaires d'autres sessions"
 
-#: commands/tablecmds.c:7198
+#: commands/tablecmds.c:8083
 msgid "cannot change inheritance of typed table"
 msgstr "ne peut pas modifier l'héritage d'une table typée"
 
-#: commands/tablecmds.c:7283
+#: commands/tablecmds.c:8169
 msgid "circular inheritance not allowed"
 msgstr "héritage circulaire interdit"
 
-#: commands/tablecmds.c:7284
+#: commands/tablecmds.c:8170
 #, c-format
 msgid "\"%s\" is already a child of \"%s\"."
 msgstr "« %s » est déjà un enfant de « %s »."
 
-#: commands/tablecmds.c:7292
+#: commands/tablecmds.c:8178
 #, c-format
 msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
 msgstr "la table « %s » qui n'a pas d'OID ne peut pas hériter de la table « %s » qui en a"
 
-#: commands/tablecmds.c:7419
+#: commands/tablecmds.c:8314
 #, c-format
 msgid "column \"%s\" in child table must be marked NOT NULL"
 msgstr "la colonne « %s » de la table enfant doit être marquée comme NOT NULL"
 
-#: commands/tablecmds.c:7435
+#: commands/tablecmds.c:8330
 #, c-format
 msgid "child table is missing column \"%s\""
 msgstr "la colonne « %s » manque à la table enfant"
 
-#: commands/tablecmds.c:7514
+#: commands/tablecmds.c:8409
 #, c-format
 msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr "la table fille « %s » a un type différent pour la contrainte de vérification « %s »"
 
-#: commands/tablecmds.c:7538
+#: commands/tablecmds.c:8433
 #, c-format
 msgid "child table is missing constraint \"%s\""
 msgstr "la contrainte « %s » manque à la table enfant"
 
-#: commands/tablecmds.c:7619
+#: commands/tablecmds.c:8513
 #, c-format
 msgid "relation \"%s\" is not a parent of relation \"%s\""
 msgstr "la relation « %s » n'est pas un parent de la relation « %s »"
 
-#: commands/tablecmds.c:7847
-msgid "cannot move an owned sequence into another schema"
-msgstr "ne peut pas déplacer une séquence OWNED BY dans un autre schéma"
+#: commands/tablecmds.c:8730
+msgid "typed tables cannot inherit"
+msgstr "les tables avec type ne peuvent pas hériter d'autres tables"
 
-#: commands/tablecmds.c:7876
+#: commands/tablecmds.c:8761
 #, c-format
-msgid "relation \"%s\" is already in schema \"%s\""
-msgstr "la relation « %s » existe déjà dans le schéma « %s »"
+msgid "table is missing column \"%s\""
+msgstr "la colonne « %s » manque à la table"
 
-#: commands/tablecmds.c:7939
+#: commands/tablecmds.c:8771
+#, c-format
+msgid "table has column \"%s\" where type requires \"%s\""
+msgstr "la table a une colonne « %s » alors que le type impose « %s »."
+
+#: commands/tablecmds.c:8780
+#, c-format
+msgid "table \"%s\" has different type for column \"%s\""
+msgstr "la table « %s » a un type différent pour la colonne « %s »"
+
+#: commands/tablecmds.c:8793
+#, c-format
+msgid "table has extra column \"%s\""
+msgstr "la table a une colonne supplémentaire « %s »"
+
+#: commands/tablecmds.c:8840
+#, c-format
+msgid "\"%s\" is not a typed table"
+msgstr "« %s » n'est pas une table typée"
+
+#: commands/tablecmds.c:9009
+msgid "cannot move an owned sequence into another schema"
+msgstr "ne peut pas déplacer une séquence OWNED BY dans un autre schéma"
+
+#: commands/tablecmds.c:9085
 #, c-format
 msgid "relation \"%s\" already exists in schema \"%s\""
 msgstr "la relation « %s » existe déjà dans le schéma « %s »"
 
-#: commands/tablespace.c:157
-#: commands/tablespace.c:174
-#: commands/tablespace.c:185
-#: commands/tablespace.c:193
-#: commands/tablespace.c:598
+#: commands/tablespace.c:158
+#: commands/tablespace.c:175
+#: commands/tablespace.c:186
+#: commands/tablespace.c:194
+#: commands/tablespace.c:603
 #: storage/file/copydir.c:61
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "n'a pas pu créer le répertoire « %s » : %m"
 
-#: commands/tablespace.c:204
+#: commands/tablespace.c:205
 #, c-format
 msgid "could not stat directory \"%s\": %m"
 msgstr "n'a pas pu lire les informations sur le répertoire « %s » : %m"
 
-#: commands/tablespace.c:213
+#: commands/tablespace.c:214
 #, c-format
 msgid "\"%s\" exists but is not a directory"
 msgstr "« %s » existe mais n'est pas un répertoire"
 
-#: commands/tablespace.c:243
+#: commands/tablespace.c:244
 #, c-format
 msgid "permission denied to create tablespace \"%s\""
 msgstr "droit refusé pour créer le tablespace « %s »"
 
-#: commands/tablespace.c:245
+#: commands/tablespace.c:246
 msgid "Must be superuser to create a tablespace."
 msgstr "Doit être super-utilisateur pour créer un tablespace."
 
-#: commands/tablespace.c:261
+#: commands/tablespace.c:262
 msgid "tablespace location cannot contain single quotes"
 msgstr "le chemin du tablespace ne peut pas contenir de guillemets simples"
 
-#: commands/tablespace.c:271
+#: commands/tablespace.c:272
 msgid "tablespace location must be an absolute path"
 msgstr "le chemin du tablespace doit être un chemin absolu"
 
-#: commands/tablespace.c:282
+#: commands/tablespace.c:283
 #, c-format
 msgid "tablespace location \"%s\" is too long"
 msgstr "le chemin du tablespace « %s » est trop long"
 
-#: commands/tablespace.c:292
-#: commands/tablespace.c:824
+#: commands/tablespace.c:293
+#: commands/tablespace.c:829
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
 msgstr "nom inacceptable pour le tablespace « %s »"
 
-#: commands/tablespace.c:294
-#: commands/tablespace.c:825
+#: commands/tablespace.c:295
+#: commands/tablespace.c:830
 msgid "The prefix \"pg_\" is reserved for system tablespaces."
 msgstr "Le préfixe « pg_ » est réservé pour les tablespaces système."
 
-#: commands/tablespace.c:304
-#: commands/tablespace.c:837
+#: commands/tablespace.c:305
+#: commands/tablespace.c:842
 #, c-format
 msgid "tablespace \"%s\" already exists"
 msgstr "le tablespace « %s » existe déjà"
 
-#: commands/tablespace.c:372
-#: commands/tablespace.c:524
+#: commands/tablespace.c:377
+#: commands/tablespace.c:529
 msgid "tablespaces are not supported on this platform"
 msgstr "les tablespaces ne sont pas supportés sur cette plateforme"
 
-#: commands/tablespace.c:416
+#: commands/tablespace.c:415
+#: commands/tablespace.c:813
+#: commands/tablespace.c:880
+#: commands/tablespace.c:985
+#: commands/tablespace.c:1358
+#, c-format
+msgid "tablespace \"%s\" does not exist"
+msgstr "le tablespace « %s » n'existe pas"
+
+#: commands/tablespace.c:421
 #, c-format
 msgid "tablespace \"%s\" does not exist, skipping"
 msgstr "le tablespace « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tablespace.c:481
+#: commands/tablespace.c:486
 #, c-format
 msgid "tablespace \"%s\" is not empty"
 msgstr "le tablespace « %s » n'est pas vide"
 
-#: commands/tablespace.c:555
+#: commands/tablespace.c:560
 #, c-format
 msgid "directory \"%s\" does not exist"
 msgstr "le répertoire « %s » n'existe pas"
 
-#: commands/tablespace.c:556
-#, c-format
-msgid "Create directory \"%s\" for this tablespace before restarting the server."
-msgstr "Créer le répertoire « %s » pour ce tablespace avant de redémarrer le serveur."
-
 #: commands/tablespace.c:561
+msgid "Create this directory for the tablespace before restarting the server."
+msgstr "Créer le répertoire pour ce tablespace avant de redémarrer le serveur."
+
+#: commands/tablespace.c:566
 #, c-format
 msgid "could not set permissions on directory \"%s\": %m"
 msgstr "n'a pas pu configurer les droits du répertoire « %s » : %m"
 
-#: commands/tablespace.c:593
+#: commands/tablespace.c:598
 #, c-format
 msgid "directory \"%s\" already in use as a tablespace"
 msgstr "répertoire « %s » déjà en cours d'utilisation"
 
-#: commands/tablespace.c:608
-#: commands/tablespace.c:745
+#: commands/tablespace.c:613
+#: commands/tablespace.c:750
 #, c-format
 msgid "could not remove symbolic link \"%s\": %m"
 msgstr "n'a pas pu supprimer le lien symbolique « %s » : %m"
 
-#: commands/tablespace.c:618
+#: commands/tablespace.c:623
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "n'a pas pu créer le lien symbolique « %s » : %m"
 
-#: commands/tablespace.c:679
+#: commands/tablespace.c:684
 #: storage/file/copydir.c:67
 #: storage/file/copydir.c:106
-#: storage/file/fd.c:1600
-#: postmaster/postmaster.c:1142
-#: utils/adt/genfile.c:244
+#: storage/file/fd.c:1624
+#: postmaster/postmaster.c:1165
+#: utils/adt/genfile.c:353
 #: utils/adt/misc.c:213
-#: utils/misc/tzparser.c:345
+#: utils/misc/tzparser.c:323
 #, c-format
 msgid "could not open directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %m"
 
-#: commands/tablespace.c:709
-#: commands/tablespace.c:721
-#: commands/tablespace.c:737
+#: commands/tablespace.c:714
+#: commands/tablespace.c:726
+#: commands/tablespace.c:742
 #, c-format
 msgid "could not remove directory \"%s\": %m"
 msgstr "n'a pas pu supprimer le répertoire « %s » : %m"
 
-#: commands/tablespace.c:1421
+#: commands/tablespace.c:1039
+#, c-format
+msgid "Tablespace \"%s\" does not exist."
+msgstr "Le tablespace « %s » n'existe pas."
+
+#: commands/tablespace.c:1450
 #, c-format
 msgid "tablespace %u is not empty"
 msgstr "le tablespace %u n'est pas vide"
 
-#: commands/trigger.c:192
+#: commands/trigger.c:159
+#, c-format
+msgid "\"%s\" is a table"
+msgstr "« %s » est une table"
+
+#: commands/trigger.c:161
+msgid "Tables cannot have INSTEAD OF triggers."
+msgstr "Les tables ne peuvent pas avoir de triggers INSTEAD OF."
+
+#: commands/trigger.c:172
+#: commands/trigger.c:179
+#, c-format
+msgid "\"%s\" is a view"
+msgstr "« %s » est une vue"
+
+#: commands/trigger.c:174
+msgid "Views cannot have row-level BEFORE or AFTER triggers."
+msgstr "Les vues ne peuvent pas avoir de trigger BEFORE ou AFTER au niveau ligne."
+
+#: commands/trigger.c:181
+msgid "Views cannot have TRUNCATE triggers."
+msgstr "Les vues ne peuvent pas avoir de triggers TRUNCATE."
+
+#: commands/trigger.c:228
 msgid "TRUNCATE FOR EACH ROW triggers are not supported"
 msgstr "les triggers TRUNCATE FOR EACH ROW ne sont pas supportés"
 
-#: commands/trigger.c:233
+#: commands/trigger.c:236
+msgid "INSTEAD OF triggers must be FOR EACH ROW"
+msgstr "les triggers INSTEAD OF doivent être FOR EACH ROW"
+
+#: commands/trigger.c:240
+msgid "INSTEAD OF triggers cannot have WHEN conditions"
+msgstr "les triggers INSTEAD OF ne peuvent pas avoir de conditions WHEN"
+
+#: commands/trigger.c:244
+msgid "INSTEAD OF triggers cannot have column lists"
+msgstr "les triggers INSTEAD OF ne peuvent pas avoir de liste de colonnes"
+
+#: commands/trigger.c:288
 msgid "cannot use subquery in trigger WHEN condition"
 msgstr "ne peut pas utiliser une sous-requête dans la condition WHEN d'un trigger"
 
-#: commands/trigger.c:237
+#: commands/trigger.c:292
 msgid "cannot use aggregate function in trigger WHEN condition"
 msgstr "ne peut pas utiliser la fonction d'agrégat dans la condition WHEN d'un trigger"
 
-#: commands/trigger.c:241
+#: commands/trigger.c:296
 msgid "cannot use window function in trigger WHEN condition"
 msgstr "ne peut pas utiliser la fonction window dans la condition WHEN d'un trigger"
 
-#: commands/trigger.c:261
-#: commands/trigger.c:274
+#: commands/trigger.c:318
+#: commands/trigger.c:331
 msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr ""
 "la condition WHEN de l'instruction du trigger ne peut pas référencer les valeurs\n"
 "des colonnes"
 
-#: commands/trigger.c:266
+#: commands/trigger.c:323
 msgid "INSERT trigger's WHEN condition cannot reference OLD values"
 msgstr "la condition WHEN du trigger INSERT ne peut pas référencer les valeurs OLD"
 
-#: commands/trigger.c:279
+#: commands/trigger.c:336
 msgid "DELETE trigger's WHEN condition cannot reference NEW values"
 msgstr "la condition WHEN du trigger DELETE ne peut pas référencer les valeurs NEW"
 
-#: commands/trigger.c:284
+#: commands/trigger.c:341
 msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr ""
 "la condition WHEN d'un trigger BEFORE ne doit pas référencer les colonnes\n"
 "système avec NEW"
 
-#: commands/trigger.c:322
+#: commands/trigger.c:379
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"trigger\""
 msgstr "changement du type de retour de la fonction %s de « opaque » vers « trigger »"
 
-#: commands/trigger.c:329
+#: commands/trigger.c:386
 #, c-format
 msgid "function %s must return type \"trigger\""
 msgstr "la fonction %s doit renvoyer le type « trigger »"
 
-#: commands/trigger.c:438
-#: commands/trigger.c:1152
+#: commands/trigger.c:496
+#: commands/trigger.c:1234
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" already exists"
 msgstr "le trigger « %s » de la relation « %s » existe déjà"
 
-#: commands/trigger.c:719
+#: commands/trigger.c:781
 msgid "Found referenced table's UPDATE trigger."
 msgstr "Trigger UPDATE de la table référencée trouvé."
 
-#: commands/trigger.c:720
+#: commands/trigger.c:782
 msgid "Found referenced table's DELETE trigger."
 msgstr "Trigger DELETE de la table référencée trouvé."
 
-#: commands/trigger.c:721
+#: commands/trigger.c:783
 msgid "Found referencing table's trigger."
 msgstr "Trigger de la table référencée trouvé."
 
-#: commands/trigger.c:830
-#: commands/trigger.c:846
+#: commands/trigger.c:892
+#: commands/trigger.c:908
 #, c-format
 msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
 msgstr "ignore le groupe de trigger incomplet pour la contrainte « %s » %s"
 
-#: commands/trigger.c:858
+#: commands/trigger.c:920
 #, c-format
 msgid "converting trigger group into constraint \"%s\" %s"
 msgstr "conversion du groupe de trigger en une contrainte « %s » %s"
 
-#: commands/trigger.c:998
+#: commands/trigger.c:1036
 #, c-format
 msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
 msgstr "le trigger « %s » pour la table « %s » n'existe pas, poursuite du traitement"
 
-#: commands/trigger.c:1273
+#: commands/trigger.c:1163
+#: commands/trigger.c:1276
+#: commands/trigger.c:1387
+#, c-format
+msgid "trigger \"%s\" for table \"%s\" does not exist"
+msgstr "le trigger « %s » de la table « %s » n'existe pas"
+
+#: commands/trigger.c:1355
 #, c-format
 msgid "permission denied: \"%s\" is a system trigger"
 msgstr "droit refusé : « %s » est un trigger système"
 
-#: commands/trigger.c:1848
+#: commands/trigger.c:1837
 #, c-format
 msgid "trigger function %u returned null value"
 msgstr "la fonction trigger %u a renvoyé la valeur NULL"
 
-#: commands/trigger.c:1908
-#: commands/trigger.c:2023
-#: commands/trigger.c:2160
-#: commands/trigger.c:2335
+#: commands/trigger.c:1896
+#: commands/trigger.c:2095
+#: commands/trigger.c:2279
+#: commands/trigger.c:2521
 msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr "le trigger BEFORE STATEMENT ne peut pas renvoyer une valeur"
 
-#: commands/trigger.c:2397
-#: executor/execMain.c:1613
+#: commands/trigger.c:2583
+#: executor/execMain.c:1864
 #: executor/nodeLockRows.c:137
-#: executor/nodeModifyTable.c:334
-#: executor/nodeModifyTable.c:505
+#: executor/nodeModifyTable.c:366
+#: executor/nodeModifyTable.c:582
 msgid "could not serialize access due to concurrent update"
 msgstr "n'a pas pu sérialiser un accès à cause d'une mise à jour en parallèle"
 
-#: commands/trigger.c:4012
+#: commands/trigger.c:4198
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "la contrainte « %s » n'est pas DEFERRABLE"
 
-#: commands/trigger.c:4035
+#: commands/trigger.c:4221
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "la contrainte « %s » n'existe pas"
 
-#: commands/tsearchcmds.c:109
-#: commands/tsearchcmds.c:929
+#: commands/tsearchcmds.c:117
+#: commands/tsearchcmds.c:1044
 #, c-format
 msgid "function %s should return type %s"
 msgstr "la fonction %s doit renvoyer le type %s"
 
-#: commands/tsearchcmds.c:178
+#: commands/tsearchcmds.c:189
 msgid "must be superuser to create text search parsers"
 msgstr "doit être super-utilisateur pour créer des analyseurs de recherche plein texte"
 
-#: commands/tsearchcmds.c:226
+#: commands/tsearchcmds.c:237
 #, c-format
 msgid "text search parser parameter \"%s\" not recognized"
 msgstr "paramètre de l'analyseur de recherche plein texte « %s » non reconnu"
 
-#: commands/tsearchcmds.c:236
+#: commands/tsearchcmds.c:247
 msgid "text search parser start method is required"
 msgstr "la méthode start de l'analyseur de recherche plein texte est requise"
 
-#: commands/tsearchcmds.c:241
+#: commands/tsearchcmds.c:252
 msgid "text search parser gettoken method is required"
 msgstr "la méthode gettoken de l'analyseur de recherche plein texte est requise"
 
-#: commands/tsearchcmds.c:246
+#: commands/tsearchcmds.c:257
 msgid "text search parser end method is required"
 msgstr "la méthode end l'analyseur de recherche de texte est requise"
 
-#: commands/tsearchcmds.c:251
+#: commands/tsearchcmds.c:262
 msgid "text search parser lextypes method is required"
 msgstr "la méthode lextypes de l'analyseur de recherche plein texte est requise"
 
-#: commands/tsearchcmds.c:283
+#: commands/tsearchcmds.c:297
 msgid "must be superuser to drop text search parsers"
 msgstr ""
 "doit être super-utilisateur pour supprimer des analyseurs de recherche plein\n"
 "texte"
 
-#: commands/tsearchcmds.c:312
+#: commands/tsearchcmds.c:326
 #, c-format
 msgid "text search parser \"%s\" does not exist, skipping"
 msgstr ""
 "l'analyseur de recherche plein texte « %s » n'existe pas, poursuite du\n"
 "traitement"
 
-#: commands/tsearchcmds.c:367
+#: commands/tsearchcmds.c:381
 msgid "must be superuser to rename text search parsers"
 msgstr ""
 "doit être super-utilisateur pour renommer les analyseurs de recherche plein\n"
 "texte"
 
-#: commands/tsearchcmds.c:385
+#: commands/tsearchcmds.c:399
 #, c-format
 msgid "text search parser \"%s\" already exists"
 msgstr "l'analyseur de recherche plein texte « %s » existe déjà"
 
-#: commands/tsearchcmds.c:462
+#: commands/tsearchcmds.c:525
 #, c-format
 msgid "text search template \"%s\" does not accept options"
 msgstr "le modèle de recherche plein texte « %s » n'accepte pas d'options"
 
-#: commands/tsearchcmds.c:535
+#: commands/tsearchcmds.c:598
 msgid "text search template is required"
 msgstr "le modèle de la recherche plein texte est requis"
 
-#: commands/tsearchcmds.c:600
+#: commands/tsearchcmds.c:667
 #, c-format
 msgid "text search dictionary \"%s\" already exists"
 msgstr "le dictionnaire de recherche plein texte « %s » existe déjà"
 
-#: commands/tsearchcmds.c:660
+#: commands/tsearchcmds.c:775
 #, c-format
 msgid "text search dictionary \"%s\" does not exist, skipping"
 msgstr ""
 "le dictionnaire de recherche plein texte « %s » n'existe pas, poursuite du\n"
 "traitement"
 
-#: commands/tsearchcmds.c:990
+#: commands/tsearchcmds.c:1108
 msgid "must be superuser to create text search templates"
 msgstr "doit être super-utilisateur pour créer des modèles de recherche plein texte"
 
-#: commands/tsearchcmds.c:1027
+#: commands/tsearchcmds.c:1145
 #, c-format
 msgid "text search template parameter \"%s\" not recognized"
 msgstr "paramètre de modèle de recherche plein texte « %s » non reconnu"
 
-#: commands/tsearchcmds.c:1037
+#: commands/tsearchcmds.c:1155
 msgid "text search template lexize method is required"
 msgstr "la méthode lexize du modèle de recherche plein texte est requise"
 
-#: commands/tsearchcmds.c:1072
+#: commands/tsearchcmds.c:1193
 msgid "must be superuser to rename text search templates"
 msgstr "doit être super-utilisateur pour renommer les modèles de recherche plein texte"
 
-#: commands/tsearchcmds.c:1091
+#: commands/tsearchcmds.c:1212
 #, c-format
 msgid "text search template \"%s\" already exists"
 msgstr "le modèle de recherche plein texte « %s » existe déjà"
 
-#: commands/tsearchcmds.c:1114
+#: commands/tsearchcmds.c:1281
 msgid "must be superuser to drop text search templates"
 msgstr "doit être super-utilisateur pour supprimer des modèles de recherche plein texte"
 
-#: commands/tsearchcmds.c:1143
+#: commands/tsearchcmds.c:1310
 #, c-format
 msgid "text search template \"%s\" does not exist, skipping"
 msgstr "le modèle de recherche plein texte « %s » n'existe pas, poursuite du traitement"
 
-#: commands/tsearchcmds.c:1338
+#: commands/tsearchcmds.c:1508
 #, c-format
 msgid "text search configuration parameter \"%s\" not recognized"
 msgstr "paramètre de configuration de recherche plein texte « %s » non reconnu"
 
-#: commands/tsearchcmds.c:1345
+#: commands/tsearchcmds.c:1515
 msgid "cannot specify both PARSER and COPY options"
 msgstr "ne peut pas spécifier à la fois PARSER et COPY"
 
-#: commands/tsearchcmds.c:1373
+#: commands/tsearchcmds.c:1543
 msgid "text search parser is required"
 msgstr "l'analyseur de la recherche plein texte est requis"
 
-#: commands/tsearchcmds.c:1479
+#: commands/tsearchcmds.c:1652
 #, c-format
 msgid "text search configuration \"%s\" already exists"
 msgstr "la configuration de recherche plein texte « %s » existe déjà"
 
-#: commands/tsearchcmds.c:1538
+#: commands/tsearchcmds.c:1759
 #, c-format
 msgid "text search configuration \"%s\" does not exist, skipping"
 msgstr ""
 "la configuration de recherche plein texte « %s » n'existe pas, poursuite du\n"
 "traitement"
 
-#: commands/tsearchcmds.c:1760
+#: commands/tsearchcmds.c:1981
 #, c-format
 msgid "token type \"%s\" does not exist"
 msgstr "le type de jeton « %s » n'existe pas"
 
-#: commands/tsearchcmds.c:1984
+#: commands/tsearchcmds.c:2203
 #, c-format
 msgid "mapping for token type \"%s\" does not exist"
 msgstr "la correspondance pour le type de jeton « %s » n'existe pas"
 
-#: commands/tsearchcmds.c:1990
+#: commands/tsearchcmds.c:2209
 #, c-format
 msgid "mapping for token type \"%s\" does not exist, skipping"
 msgstr ""
 "la correspondance pour le type de jeton « %s » n'existe pas, poursuite du\n"
 "traitement"
 
-#: commands/tsearchcmds.c:2143
-#: commands/tsearchcmds.c:2254
+#: commands/tsearchcmds.c:2362
+#: commands/tsearchcmds.c:2473
 #, c-format
 msgid "invalid parameter list format: \"%s\""
 msgstr "format de liste de paramètres invalide : « %s »"
 
-#: commands/typecmds.c:163
+#: commands/typecmds.c:169
 msgid "must be superuser to create a base type"
 msgstr "doit être super-utilisateur pour créer un type de base"
 
-#: commands/typecmds.c:267
+#: commands/typecmds.c:275
 #, c-format
 msgid "type attribute \"%s\" not recognized"
 msgstr "attribut du type « %s » non reconnu"
 
-#: commands/typecmds.c:321
+#: commands/typecmds.c:329
 #, c-format
 msgid "invalid type category \"%s\": must be simple ASCII"
 msgstr "catégorie de type « %s » invalide : doit être de l'ASCII pur"
 
-#: commands/typecmds.c:340
+#: commands/typecmds.c:348
 #, c-format
 msgid "array element type cannot be %s"
 msgstr "le type d'élément tableau ne peut pas être %s"
 
-#: commands/typecmds.c:372
+#: commands/typecmds.c:380
 #, c-format
 msgid "alignment \"%s\" not recognized"
 msgstr "alignement « %s » non reconnu"
 
-#: commands/typecmds.c:389
+#: commands/typecmds.c:397
 #, c-format
 msgid "storage \"%s\" not recognized"
 msgstr "stockage « %s » non reconnu"
 
-#: commands/typecmds.c:398
+#: commands/typecmds.c:408
 msgid "type input function must be specified"
 msgstr "le type d'entrée de la fonction doit être spécifié"
 
-#: commands/typecmds.c:402
+#: commands/typecmds.c:412
 msgid "type output function must be specified"
 msgstr "le type de sortie de la fonction doit être spécifié"
 
-#: commands/typecmds.c:407
+#: commands/typecmds.c:417
 msgid "type modifier output function is useless without a type modifier input function"
 msgstr ""
 "la fonction en sortie du modificateur de type est inutile sans une fonction\n"
 "en entrée du modificateur de type"
 
-#: commands/typecmds.c:430
+#: commands/typecmds.c:440
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to %s"
 msgstr "changement du type de retour de la fonction %s d'« opaque » vers %s"
 
-#: commands/typecmds.c:437
+#: commands/typecmds.c:447
 #, c-format
 msgid "type input function %s must return type %s"
 msgstr "le type d'entrée de la fonction %s doit être %s"
 
-#: commands/typecmds.c:447
+#: commands/typecmds.c:457
 #, c-format
 msgid "changing return type of function %s from \"opaque\" to \"cstring\""
 msgstr "changement du type de retour de la fonction %s d'« opaque » vers « cstring »"
 
-#: commands/typecmds.c:454
+#: commands/typecmds.c:464
 #, c-format
 msgid "type output function %s must return type \"cstring\""
 msgstr "le type de sortie de la fonction %s doit être « cstring »"
 
-#: commands/typecmds.c:463
+#: commands/typecmds.c:473
 #, c-format
 msgid "type receive function %s must return type %s"
 msgstr "la fonction receive du type %s doit renvoyer le type %s"
 
-#: commands/typecmds.c:472
+#: commands/typecmds.c:482
 #, c-format
 msgid "type send function %s must return type \"bytea\""
 msgstr "la fonction send du type %s doit renvoyer le type « bytea »"
 
-#: commands/typecmds.c:677
-#: commands/typecmds.c:2205
+#: commands/typecmds.c:687
 #, c-format
 msgid "\"%s\" is not a domain"
 msgstr "« %s » n'est pas un domaine"
 
-#: commands/typecmds.c:816
+#: commands/typecmds.c:827
 #, c-format
 msgid "\"%s\" is not a valid base type for a domain"
 msgstr "« %s » n'est pas un type de base valide pour un domaine"
 
-#: commands/typecmds.c:885
+#: commands/typecmds.c:909
 msgid "multiple default expressions"
 msgstr "multiples expressions par défaut"
 
-#: commands/typecmds.c:949
-#: commands/typecmds.c:958
+#: commands/typecmds.c:973
+#: commands/typecmds.c:982
 msgid "conflicting NULL/NOT NULL constraints"
 msgstr "contraintes NULL/NOT NULL en conflit"
 
-#: commands/typecmds.c:977
-#: commands/typecmds.c:1902
+#: commands/typecmds.c:1001
+#: commands/typecmds.c:1984
 msgid "unique constraints not possible for domains"
 msgstr "contraintes uniques impossible pour les domaines"
 
-#: commands/typecmds.c:983
-#: commands/typecmds.c:1908
+#: commands/typecmds.c:1007
+#: commands/typecmds.c:1990
 msgid "primary key constraints not possible for domains"
 msgstr "contraintes de clé primaire impossible pour les domaines"
 
-#: commands/typecmds.c:989
-#: commands/typecmds.c:1914
+#: commands/typecmds.c:1013
+#: commands/typecmds.c:1996
 msgid "exclusion constraints not possible for domains"
 msgstr "contraintes d'exclusion impossible pour les domaines"
 
-#: commands/typecmds.c:995
-#: commands/typecmds.c:1920
+#: commands/typecmds.c:1019
+#: commands/typecmds.c:2002
 msgid "foreign key constraints not possible for domains"
 msgstr "contraintes de clé étrangère impossible pour les domaines"
 
-#: commands/typecmds.c:1004
-#: commands/typecmds.c:1929
+#: commands/typecmds.c:1028
+#: commands/typecmds.c:2011
 msgid "specifying constraint deferrability not supported for domains"
 msgstr "spécifier des contraintes déferrantes n'est pas supporté par les domaines"
 
-#: commands/typecmds.c:1251
+#: commands/typecmds.c:1272
+#: utils/cache/typcache.c:996
+#, c-format
+msgid "%s is not an enum"
+msgstr "%s n'est pas un enum"
+
+#: commands/typecmds.c:1332
 #, c-format
 msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
 msgstr "changement du type d'argument de la fonction %s d'« opaque » à « cstring »"
 
-#: commands/typecmds.c:1302
+#: commands/typecmds.c:1383
 #, c-format
 msgid "changing argument type of function %s from \"opaque\" to %s"
 msgstr "changement du type d'argument de la fonction %s d'« opaque » à %s"
 
-#: commands/typecmds.c:1401
+#: commands/typecmds.c:1482
 #, c-format
 msgid "typmod_in function %s must return type \"integer\""
 msgstr "la fonction typmod_in %s doit renvoyer le type « entier »"
 
-#: commands/typecmds.c:1428
+#: commands/typecmds.c:1509
 #, c-format
 msgid "typmod_out function %s must return type \"cstring\""
 msgstr "la fonction typmod_out %s doit renvoyer le type « cstring »"
 
-#: commands/typecmds.c:1455
+#: commands/typecmds.c:1536
 #, c-format
 msgid "type analyze function %s must return type \"boolean\""
 msgstr "la fonction analyze du type %s doit renvoyer le type « boolean »"
 
-#: commands/typecmds.c:1513
-msgid "composite type must have at least one attribute"
-msgstr "le type composite doit avoir au moins un attribut"
-
-#: commands/typecmds.c:1754
+#: commands/typecmds.c:1836
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains null values"
 msgstr "la colonne « %s » de la table « %s » contient des valeurs NULL"
 
-#: commands/typecmds.c:2000
+#: commands/typecmds.c:2082
 #, c-format
 msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
 msgstr ""
 "la colonne « %s » de la table « %s » contient des valeurs violant la\n"
 "nouvelle contrainte"
 
-#: commands/typecmds.c:2281
-#: commands/typecmds.c:2290
+#: commands/typecmds.c:2287
+#, c-format
+msgid "%s is not a domain"
+msgstr "%s n'est pas un domaine"
+
+#: commands/typecmds.c:2369
+#: commands/typecmds.c:2378
 msgid "cannot use table references in domain check constraint"
 msgstr ""
 "ne peut pas utiliser les références de table dans la contrainte de\n"
 "vérification du domaine"
 
-#: commands/typecmds.c:2519
-#: commands/typecmds.c:2591
-#: commands/typecmds.c:2822
+#: commands/typecmds.c:2608
+#: commands/typecmds.c:2680
+#: commands/typecmds.c:2904
 #, c-format
 msgid "%s is a table's row type"
 msgstr "« %s » est du type ligne de table"
 
-#: commands/typecmds.c:2521
-#: commands/typecmds.c:2593
-#: commands/typecmds.c:2824
+#: commands/typecmds.c:2610
+#: commands/typecmds.c:2682
+#: commands/typecmds.c:2906
 msgid "Use ALTER TABLE instead."
 msgstr "Utilisez ALTER TABLE à la place."
 
-#: commands/typecmds.c:2528
-#: commands/typecmds.c:2600
-#: commands/typecmds.c:2739
+#: commands/typecmds.c:2617
+#: commands/typecmds.c:2689
+#: commands/typecmds.c:2835
 #, c-format
 msgid "cannot alter array type %s"
 msgstr "ne peut pas modifier le type array %s"
 
-#: commands/typecmds.c:2530
-#: commands/typecmds.c:2602
-#: commands/typecmds.c:2741
+#: commands/typecmds.c:2619
+#: commands/typecmds.c:2691
+#: commands/typecmds.c:2837
 #, c-format
 msgid "You can alter type %s, which will alter the array type as well."
 msgstr "Vous pouvez modifier le type %s, ce qui va modifier aussi le type tableau."
 
-#: commands/typecmds.c:2786
-#, c-format
-msgid "type %s is already in schema \"%s\""
-msgstr "le type « %s » existe déjà dans le schéma « %s »"
-
-#: commands/typecmds.c:2808
+#: commands/typecmds.c:2890
 #, c-format
 msgid "type \"%s\" already exists in schema \"%s\""
 msgstr "le type « %s » existe déjà dans le schéma « %s »"
 
-#: commands/user.c:150
-msgid "SYSID can no longer be specified"
-msgstr "SYSID ne peut plus être spécifié"
-
-#: commands/user.c:272
-msgid "must be superuser to create superusers"
-msgstr "doit être super-utilisateur pour créer des super-utilisateurs"
-
-#: commands/user.c:279
-msgid "permission denied to create role"
-msgstr "droit refusé pour créer un rôle"
-
-#: commands/user.c:286
-#: commands/user.c:1033
-#, c-format
-msgid "role name \"%s\" is reserved"
-msgstr "le nom du rôle « %s » est réservé"
-
-#: commands/user.c:300
-#: commands/user.c:1027
-#, c-format
-msgid "role \"%s\" already exists"
-msgstr "le rôle « %s » existe déjà"
-
-#: commands/user.c:579
-#: commands/user.c:767
-#: commands/user.c:851
-#: commands/user.c:1002
-#: commands/variable.c:735
-#: commands/variable.c:849
-#: utils/cache/lsyscache.c:2669
-#: utils/init/miscinit.c:413
-#, c-format
-msgid "role \"%s\" does not exist"
-msgstr "le rôle « %s » n'existe pas"
-
-#: commands/user.c:592
-#: commands/user.c:784
-#: commands/user.c:1267
-#: commands/user.c:1404
-msgid "must be superuser to alter superusers"
-msgstr "doit être super-utilisateur pour modifier des super-utilisateurs"
-
-#: commands/user.c:607
-#: commands/user.c:792
-msgid "permission denied"
-msgstr "droit refusé"
-
-#: commands/user.c:802
-#, c-format
-msgid "database \"%s\" not found"
-msgstr "base de données « %s » non trouvée"
-
-#: commands/user.c:824
-msgid "permission denied to drop role"
-msgstr "droit refusé pour supprimer le rôle"
-
-#: commands/user.c:856
-#, c-format
-msgid "role \"%s\" does not exist, skipping"
-msgstr "le rôle « %s » n'existe pas, poursuite du traitement"
-
-#: commands/user.c:868
-#: commands/user.c:872
-msgid "current user cannot be dropped"
-msgstr "l'utilisateur actuel ne peut pas être supprimé"
-
-#: commands/user.c:876
-msgid "session user cannot be dropped"
-msgstr "l'utilisateur de la session ne peut pas être supprimé"
-
-#: commands/user.c:887
-msgid "must be superuser to drop superusers"
-msgstr "doit être super-utilisateur pour supprimer des super-utilisateurs"
-
-#: commands/user.c:900
-#, c-format
-msgid "role \"%s\" cannot be dropped because some objects depend on it"
-msgstr "le rôle « %s » ne peut pas être supprimé car d'autres objets en dépendent"
-
-#: commands/user.c:1017
-msgid "session user cannot be renamed"
-msgstr "l'utilisateur de la session ne peut pas être renommé"
-
-#: commands/user.c:1021
-msgid "current user cannot be renamed"
-msgstr "l'utilisateur courant ne peut pas être renommé"
-
-#: commands/user.c:1044
-msgid "must be superuser to rename superusers"
-msgstr "doit être super-utilisateur pour renommer les super-utilisateurs"
-
-#: commands/user.c:1051
-msgid "permission denied to rename role"
-msgstr "droit refusé pour renommer le rôle"
-
-#: commands/user.c:1072
-msgid "MD5 password cleared because of role rename"
-msgstr "mot de passe MD5 effacé à cause du renommage du rôle"
-
-#: commands/user.c:1128
-msgid "column names cannot be included in GRANT/REVOKE ROLE"
-msgstr "les noms de colonne ne peuvent pas être inclus dans GRANT/REVOKE ROLE"
-
-#: commands/user.c:1166
-msgid "permission denied to drop objects"
-msgstr "droit refusé pour supprimer les objets"
-
-#: commands/user.c:1193
-#: commands/user.c:1202
-msgid "permission denied to reassign objects"
-msgstr "droit refusé pour ré-affecter les objets"
-
-#: commands/user.c:1275
-#: commands/user.c:1412
-#, c-format
-msgid "must have admin option on role \"%s\""
-msgstr "doit avoir l'option admin sur le rôle « %s »"
-
-#: commands/user.c:1283
-msgid "must be superuser to set grantor"
-msgstr "doit être super-utilisateur pour configurer le « donneur de droits »"
-
-#: commands/user.c:1308
-#, c-format
-msgid "role \"%s\" is a member of role \"%s\""
-msgstr "le rôle « %s » est un membre du rôle « %s »"
-
-#: commands/user.c:1323
-#, c-format
-msgid "role \"%s\" is already a member of role \"%s\""
-msgstr "le rôle « %s » est déjà un membre du rôle « %s »"
-
-#: commands/user.c:1434
-#, c-format
-msgid "role \"%s\" is not a member of role \"%s\""
-msgstr "le rôle « %s » n'est pas un membre du rôle « %s »"
-
-#: commands/vacuum.c:421
+#: commands/vacuum.c:419
 msgid "oldest xmin is far in the past"
 msgstr "le plus ancien xmin est loin dans le passé"
 
-#: commands/vacuum.c:422
+#: commands/vacuum.c:420
 msgid "Close open transactions soon to avoid wraparound problems."
 msgstr ""
 "Fermez les transactions ouvertes rapidement pour éviter des problèmes de\n"
 "réinitialisation."
 
-#: commands/vacuum.c:747
+#: commands/vacuum.c:811
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 "certaines bases de données n'ont pas eu droit à l'opération de maintenance\n"
 "VACUUM depuis plus de 2 milliards de transactions"
 
-#: commands/vacuum.c:748
+#: commands/vacuum.c:812
 msgid "You might have already suffered transaction-wraparound data loss."
 msgstr ""
 "Vous pouvez avoir déjà souffert de pertes de données suite à une\n"
 "réinitialisation de l'identifiant des transactions."
 
-#: commands/vacuum.c:873
+#: commands/vacuum.c:919
+#, c-format
+msgid "skipping vacuum of \"%s\" --- lock not available"
+msgstr "ignore le vacuum de « %s » --- verrou non disponible"
+
+#: commands/vacuum.c:945
 #, c-format
 msgid "skipping \"%s\" --- only superuser can vacuum it"
 msgstr "ignore « %s » --- seul le super-utilisateur peut exécuter un VACUUM"
 
-#: commands/vacuum.c:877
+#: commands/vacuum.c:949
 #, c-format
 msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr ""
 "ignore « %s » --- seul le super-utilisateur ou le propriétaire de la base de données\n"
 "peuvent exécuter un VACUUM"
 
-#: commands/vacuum.c:881
+#: commands/vacuum.c:953
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr ""
 "ignore « %s » --- seul le propriétaire de la table ou de la base de données\n"
 "peut exécuter un VACUUM"
 
-#: commands/vacuum.c:898
+#: commands/vacuum.c:970
 #, c-format
-msgid "skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
+msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
 msgstr ""
-"ignore « %s » --- n'a pas pu exécuter un VACUUM sur les index, vues ou\n"
-"tables système"
+"ignore « %s » --- n'a pas pu exécuter un VACUUM sur les objets autres que\n"
+"des tables et les tables systèmes"
 
-#: commands/vacuumlazy.c:234
+#: commands/vacuumlazy.c:254
 #, c-format
 msgid ""
 "automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
@@ -7687,24 +7734,24 @@ msgstr ""
 "lignes : %.0f supprimés, %.0f restantes\n"
 "utilisation système : %s"
 
-#: commands/vacuumlazy.c:450
+#: commands/vacuumlazy.c:508
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr "relation « %s » : la page %u n'est pas initialisée --- correction en cours"
 
-#: commands/vacuumlazy.c:801
+#: commands/vacuumlazy.c:865
 #, c-format
 msgid "\"%s\": removed %.0f row versions in %u pages"
 msgstr "« %s » : %.0f versions de ligne supprimées parmi %u pages"
 
-#: commands/vacuumlazy.c:806
+#: commands/vacuumlazy.c:870
 #, c-format
 msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages"
 msgstr ""
 "« %s » : %.0f versions de ligne supprimables, %.0f non supprimables\n"
 "parmi %u pages sur %u"
 
-#: commands/vacuumlazy.c:809
+#: commands/vacuumlazy.c:874
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -7717,29 +7764,29 @@ msgstr ""
 "%u pages sont entièrement vides.\n"
 "%s."
 
-#: commands/vacuumlazy.c:867
+#: commands/vacuumlazy.c:932
 #, c-format
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr "« %s »: %d versions de ligne supprimée parmi %d pages"
 
-#: commands/vacuumlazy.c:870
-#: commands/vacuumlazy.c:962
-#: commands/vacuumlazy.c:1087
+#: commands/vacuumlazy.c:935
+#: commands/vacuumlazy.c:1027
+#: commands/vacuumlazy.c:1160
 #, c-format
 msgid "%s."
 msgstr "%s."
 
-#: commands/vacuumlazy.c:959
+#: commands/vacuumlazy.c:1024
 #, c-format
 msgid "scanned index \"%s\" to remove %d row versions"
 msgstr "a parcouru l'index « %s » pour supprimer %d versions de lignes"
 
-#: commands/vacuumlazy.c:1001
+#: commands/vacuumlazy.c:1065
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "l'index « %s » contient maintenant %.0f versions de ligne dans %u pages"
 
-#: commands/vacuumlazy.c:1005
+#: commands/vacuumlazy.c:1069
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -7750,424 +7797,739 @@ msgstr ""
 "%u pages d'index ont été supprimées, %u sont actuellement réutilisables.\n"
 "%s."
 
-#: commands/vacuumlazy.c:1084
+#: commands/vacuumlazy.c:1157
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "« %s » : %u pages tronqués en %u"
 
-#: commands/variable.c:62
-msgid "invalid list syntax for parameter \"datestyle\""
-msgstr "syntaxe de liste invalide pour le paramètre « datestyle »"
-
-#: commands/variable.c:161
+#: commands/variable.c:160
+#: utils/misc/guc.c:8185
 #, c-format
-msgid "unrecognized \"datestyle\" key word: \"%s\""
-msgstr "mot clé « datestyle » non reconnu : « %s »"
-
-#: commands/variable.c:175
-msgid "conflicting \"datestyle\" specifications"
-msgstr "spécifications « datestyle » conflictuelles"
+msgid "Unrecognized key word: \"%s\"."
+msgstr "Mot clé non reconnu : « %s »"
 
-#: commands/variable.c:285
-msgid "invalid interval value for time zone: month not allowed"
-msgstr "valeur d'intervalle invalide pour le fuseau horaire : les mois ne sont pas autorisés"
+#: commands/variable.c:172
+msgid "Conflicting \"datestyle\" specifications."
+msgstr "Spécifications « datestyle » conflictuelles"
 
-#: commands/variable.c:293
-msgid "invalid interval value for time zone: day not allowed"
-msgstr "valeur d'intervalle invalide pour le fuseau horaire : jour non autorisé"
+#: commands/variable.c:328
+msgid "Cannot specify months in time zone interval."
+msgstr "Ne peut pas spécifier des mois dans un interval avec fuseau horaire."
 
-#: commands/variable.c:361
-#: commands/variable.c:493
-#, c-format
-msgid "unrecognized time zone name: \"%s\""
-msgstr "nom de fuseau horaire non reconnu : « %s »"
+#: commands/variable.c:334
+msgid "Cannot specify days in time zone interval."
+msgstr "Ne peut pas spécifier des jours dans un interval avec fuseau horaire."
 
-#: commands/variable.c:370
-#: commands/variable.c:502
+#: commands/variable.c:378
+#: commands/variable.c:517
 #, c-format
 msgid "time zone \"%s\" appears to use leap seconds"
 msgstr "le fuseau horaire « %s » semble utiliser les secondes « leap »"
 
-#: commands/variable.c:372
-#: commands/variable.c:504
+#: commands/variable.c:380
+#: commands/variable.c:519
 msgid "PostgreSQL does not support leap seconds."
 msgstr "PostgreSQL ne supporte pas les secondes « leap »."
 
-#: commands/variable.c:557
+#: commands/variable.c:582
+msgid "cannot set transaction read-write mode inside a read-only transaction"
+msgstr ""
+"ne peut pas initialiser le mode lecture-écriture de la transaction à\n"
+"l'intérieur d'une transaction en lecture seule"
+
+#: commands/variable.c:589
+msgid "transaction read-write mode must be set before any query"
+msgstr ""
+"le mode de transaction lecture/écriture doit être configuré avant d'exécuter\n"
+"la première requête"
+
+#: commands/variable.c:595
+msgid "cannot set transaction read-write mode during recovery"
+msgstr ""
+"ne peut pas initialiser le mode lecture-écriture des transactions lors de la\n"
+"restauration"
+
+#: commands/variable.c:642
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr "SET TRANSACTION ISOLATION LEVEL doit être appelé avant toute requête"
 
-#: commands/variable.c:566
+#: commands/variable.c:649
 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr ""
 "SET TRANSACTION ISOLATION LEVEL ne doit pas être appelé dans une\n"
 "sous-transaction"
 
-#: commands/variable.c:665
-#: utils/mb/mbutils.c:241
+#: commands/variable.c:655
+msgid "cannot use serializable mode in a hot standby"
+msgstr "ne peut pas utiliser le mode sérialisable sur un serveur en « Hot Standby »"
+
+#: commands/variable.c:656
+msgid "You can use REPEATABLE READ instead."
+msgstr "Vous pouvez utiliser REPEATABLE READ à la place."
+
+#: commands/variable.c:704
+msgid "SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
+msgstr ""
+"SET TRANSACTION [NOT] DEFERRABLE ne doit pas être appelé dans une\n"
+"sous-transaction"
+
+#: commands/variable.c:710
+msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
+msgstr "SET TRANSACTION [NOT] DEFERRABLE doit être appelé avant toute requête"
+
+#: commands/variable.c:792
 #, c-format
-msgid "conversion between %s and %s is not supported"
-msgstr "la conversion entre %s et %s n'est pas supportée"
+msgid "Conversion between %s and %s is not supported."
+msgstr "La conversion entre %s et %s n'est pas supportée."
+
+#: commands/variable.c:799
+msgid "Cannot change \"client_encoding\" now."
+msgstr "Ne peut pas modifier « client_encoding » maintenant."
 
-#: commands/variable.c:865
+#: commands/variable.c:969
 #, c-format
 msgid "permission denied to set role \"%s\""
 msgstr "droit refusé pour configurer le rôle « %s »"
 
-#: tcop/fastpath.c:110
-#: tcop/fastpath.c:492
-#: tcop/fastpath.c:622
+#: commands/view.c:143
 #, c-format
-msgid "invalid argument size %d in function call message"
-msgstr "taille de l'argument %d invalide dans le message d'appel de la fonction"
-
-#: tcop/fastpath.c:304
-#: tcop/postgres.c:957
-#: tcop/postgres.c:1267
-#: tcop/postgres.c:1548
-#: tcop/postgres.c:1990
-#: tcop/postgres.c:2358
-#: tcop/postgres.c:2439
-msgid "current transaction is aborted, commands ignored until end of transaction block"
+msgid "could not determine which collation to use for view column \"%s\""
 msgstr ""
-"la transaction est annulée, les commandes sont ignorées jusqu'à la fin du bloc\n"
-"de la transaction"
+"n'a pas pu déterminer le collationnement à utiliser pour la colonne « %s »\n"
+"de la vue"
 
-#: tcop/fastpath.c:332
-#, c-format
-msgid "fastpath function call: \"%s\" (OID %u)"
-msgstr "appel de fonction fastpath : « %s » (OID %u)"
+#: commands/view.c:158
+msgid "view must have at least one column"
+msgstr "la vue doit avoir au moins une colonne"
 
-#: tcop/fastpath.c:359
-#: parser/parse_func.c:1654
-msgid "argument to pg_get_expr() must come from system catalogs"
-msgstr "l'argument de pg_get_expr() doit provenir des catalogues systèmes"
+#: commands/view.c:283
+#: commands/view.c:295
+msgid "cannot drop columns from view"
+msgstr "ne peut pas supprimer les colonnes d'une vue"
 
-#: tcop/fastpath.c:418
-#: tcop/postgres.c:1127
-#: tcop/postgres.c:1414
-#: tcop/postgres.c:1831
-#: tcop/postgres.c:2048
+#: commands/view.c:300
 #, c-format
-msgid "duration: %s ms"
-msgstr "durée : %s ms"
+msgid "cannot change name of view column \"%s\" to \"%s\""
+msgstr "ne peut pas modifier le nom de la colonne « %s » de la vue en « %s »"
 
-#: tcop/fastpath.c:422
+#: commands/view.c:308
 #, c-format
-msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
-msgstr "durée : %s ms, appel de fonction fastpath : « %s » (OID %u)"
+msgid "cannot change data type of view column \"%s\" from %s to %s"
+msgstr "ne peut pas modifier le type de données de la colonne « %s » de la vue de %s à %s"
 
-#: tcop/fastpath.c:460
-#: tcop/fastpath.c:587
-#, c-format
-msgid "function call message contains %d arguments but function requires %d"
-msgstr ""
-"le message d'appel de la fonction contient %d arguments mais la fonction en\n"
-"requiert %d"
+#: commands/view.c:447
+msgid "views must not contain SELECT INTO"
+msgstr "les vues ne peuvent pas contenir SELECT INTO"
 
-#: tcop/fastpath.c:468
-#, c-format
-msgid "function call message contains %d argument formats but %d arguments"
-msgstr ""
-"le message d'appel de la fonction contient %d formats d'argument mais %d\n"
-" arguments"
+#: commands/view.c:451
+msgid "views must not contain data-modifying statements in WITH"
+msgstr "les vues ne peuvent pas contenir d'instructions de modifications de données avec WITH"
 
-#: tcop/fastpath.c:555
-#: tcop/fastpath.c:638
-#, c-format
-msgid "incorrect binary data format in function argument %d"
-msgstr "format des données binaires incorrect dans l'argument de la fonction %d"
+#: commands/view.c:479
+msgid "CREATE VIEW specifies more column names than columns"
+msgstr "CREATE VIEW spécifie plus de noms de colonnes que de colonnes"
+
+#: commands/view.c:487
+msgid "views cannot be unlogged because they do not have storage"
+msgstr "les vues ne peuvent pas être non tracées car elles n'ont pas de stockage"
 
-#: tcop/postgres.c:398
-#: tcop/postgres.c:410
-#: tcop/postgres.c:421
-#: tcop/postgres.c:433
-#: tcop/postgres.c:4156
+#: commands/view.c:501
 #, c-format
-msgid "invalid frontend message type %d"
-msgstr "type %d du message de l'interface invalide"
+msgid "view \"%s\" will be a temporary view"
+msgstr "la vue « %s » sera une vue temporaire"
 
-#: tcop/postgres.c:898
+#: commands/seclabel.c:58
+msgid "no security label providers have been loaded"
+msgstr "aucun fournisseur de label de sécurité n'a été chargé"
+
+#: commands/seclabel.c:62
+msgid "must specify provider when multiple security label providers have been loaded"
+msgstr "doit indiquer le fournisseur quand plusieurs fournisseurs de labels de sécurité sont chargés"
+
+#: commands/seclabel.c:80
 #, c-format
-msgid "statement: %s"
-msgstr "instruction : %s"
+msgid "security label provider \"%s\" is not loaded"
+msgstr "le fournisseur « %s » de label de sécurité n'est pas chargé"
 
-#: tcop/postgres.c:1132
+#: commands/extension.c:148
+#: commands/extension.c:2441
 #, c-format
-msgid "duration: %s ms  statement: %s"
-msgstr "durée : %s ms, instruction : %s"
+msgid "extension \"%s\" does not exist"
+msgstr "l'extension « %s » n'existe pas"
 
-#: tcop/postgres.c:1182
+#: commands/extension.c:247
+#: commands/extension.c:256
+#: commands/extension.c:268
+#: commands/extension.c:278
 #, c-format
-msgid "parse %s: %s"
-msgstr "analyse %s : %s"
+msgid "invalid extension name: \"%s\""
+msgstr "nom d'extension invalide : « %s »"
 
-#: tcop/postgres.c:1240
-msgid "cannot insert multiple commands into a prepared statement"
-msgstr "ne peut pas insérer les commandes multiples dans une instruction préparée"
+#: commands/extension.c:248
+msgid "Extension names must not be empty."
+msgstr "Les noms d'extension ne doivent pas être vides."
 
-#: tcop/postgres.c:1419
-#, c-format
-msgid "duration: %s ms  parse %s: %s"
+#: commands/extension.c:257
+msgid "Extension names must not contain \"--\"."
+msgstr "Les noms d'extension ne doivent pas contenir « -- »."
+
+#: commands/extension.c:269
+msgid "Extension names must not begin or end with \"-\"."
+msgstr "Les noms des extensions ne doivent pas commencer ou finir avec un tiret (« - »)."
+
+#: commands/extension.c:279
+msgid "Extension names must not contain directory separator characters."
+msgstr "Les noms des extensions ne doivent pas contenir des caractères séparateurs de répertoire."
+
+#: commands/extension.c:294
+#: commands/extension.c:303
+#: commands/extension.c:312
+#: commands/extension.c:322
+#, c-format
+msgid "invalid extension version name: \"%s\""
+msgstr "nom de version de l'extension invalide :  « %s »"
+
+#: commands/extension.c:295
+msgid "Version names must not be empty."
+msgstr "Les noms de version ne doivent pas être vides."
+
+#: commands/extension.c:304
+msgid "Version names must not contain \"--\"."
+msgstr "Les noms de version ne doivent pas contenir « -- »."
+
+#: commands/extension.c:313
+msgid "Version names must not begin or end with \"-\"."
+msgstr "Les noms de version ne doivent ni commencer ni se terminer avec un tiret."
+
+#: commands/extension.c:323
+msgid "Version names must not contain directory separator characters."
+msgstr ""
+"Les noms de version ne doivent pas contenir de caractères séparateurs de\n"
+"répertoire."
+
+#: commands/extension.c:473
+#, c-format
+msgid "could not open extension control file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier de contrôle d'extension « %s » : %m"
+
+#: commands/extension.c:494
+#: commands/extension.c:504
+#, c-format
+msgid "parameter \"%s\" cannot be set in a secondary extension control file"
+msgstr ""
+"le paramètre « %s » ne peut pas être configuré dans un fichier de contrôle\n"
+"secondaire de l'extension"
+
+#: commands/extension.c:543
+#, c-format
+msgid "\"%s\" is not a valid encoding name"
+msgstr "« %s » n'est pas un nom d'encodage valide"
+
+#: commands/extension.c:557
+#, c-format
+msgid "parameter \"%s\" must be a list of extension names"
+msgstr "l'argument « %s » doit être une liste de noms d'extension"
+
+#: commands/extension.c:564
+#, c-format
+msgid "unrecognized parameter \"%s\" in file \"%s\""
+msgstr "paramètre « %s » non reconnu dans le fichier « %s »"
+
+#: commands/extension.c:573
+msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
+msgstr "le paramètre « schema » ne peut pas être indiqué quand « relocatable » est vrai"
+
+#: commands/extension.c:725
+msgid "transaction control statements are not allowed within an extension script"
+msgstr ""
+"les instructions de contrôle des transactions ne sont pas autorisées dans un\n"
+"script d'extension"
+
+#: commands/extension.c:795
+#, c-format
+msgid "permission denied to create extension \"%s\""
+msgstr "droit refusé pour créer l'extension « %s »"
+
+#: commands/extension.c:797
+msgid "Must be superuser to create this extension."
+msgstr "Doit être super-utilisateur pour créer cette extension."
+
+#: commands/extension.c:801
+#, c-format
+msgid "permission denied to update extension \"%s\""
+msgstr "droit refusé pour mettre à jour l'extension « %s »"
+
+#: commands/extension.c:803
+msgid "Must be superuser to update this extension."
+msgstr "Doit être super-utilisateur pour mettre à jour cette extension."
+
+#: commands/extension.c:1083
+#, c-format
+msgid "extension \"%s\" has no update path from version \"%s\" to version \"%s\""
+msgstr "l'extension « %s » n'a pas de chemin de mise à jour pour aller de la version « %s » à la version « %s »"
+
+#: commands/extension.c:1210
+#, c-format
+msgid "extension \"%s\" already exists, skipping"
+msgstr "l'extension « %s » existe déjà, poursuite du traitement"
+
+#: commands/extension.c:1217
+#, c-format
+msgid "extension \"%s\" already exists"
+msgstr "l'extension « %s » existe déjà"
+
+#: commands/extension.c:1228
+msgid "nested CREATE EXTENSION is not supported"
+msgstr "CREATE EXTENSION imbriqué n'est pas supporté"
+
+#: commands/extension.c:1283
+#: commands/extension.c:2501
+msgid "version to install must be specified"
+msgstr "la version à installer doit être précisée"
+
+#: commands/extension.c:1300
+#, c-format
+msgid "FROM version must be different from installation target version \"%s\""
+msgstr "la version FROM doit être différente de la version cible d'installation « %s »"
+
+#: commands/extension.c:1355
+#, c-format
+msgid "extension \"%s\" must be installed in schema \"%s\""
+msgstr "l'extension « %s » doit être installée dans le schéma « %s »"
+
+#: commands/extension.c:1434
+#: commands/extension.c:2642
+#, c-format
+msgid "required extension \"%s\" is not installed"
+msgstr "l'extension « %s » requise n'est pas installée"
+
+#: commands/extension.c:1603
+#, c-format
+msgid "extension \"%s\" does not exist, skipping"
+msgstr "l'extension « %s » n'existe pas, poursuite du traitement"
+
+#: commands/extension.c:2111
+msgid "pg_extension_config_dump() can only be called from an SQL script executed by CREATE EXTENSION"
+msgstr ""
+"pg_extension_config_dump() peut seulement être appelé à partir d'un script SQL\n"
+"exécuté par CREATE EXTENSION"
+
+#: commands/extension.c:2123
+#, c-format
+msgid "OID %u does not refer to a table"
+msgstr "l'OID %u ne fait pas référence à une table"
+
+#: commands/extension.c:2128
+#, c-format
+msgid "table \"%s\" is not a member of the extension being created"
+msgstr "la table « %s » n'est pas un membre de l'extension en cours de création"
+
+#: commands/extension.c:2311
+#: commands/extension.c:2370
+#, c-format
+msgid "extension \"%s\" does not support SET SCHEMA"
+msgstr "l'extension « %s » ne supporte pas SET SCHEMA"
+
+#: commands/extension.c:2372
+#, c-format
+msgid "%s is not in the extension's schema \"%s\""
+msgstr "%s n'est pas dans le schéma « %s » de l'extension"
+
+#: commands/extension.c:2421
+msgid "nested ALTER EXTENSION is not supported"
+msgstr "un ALTER EXTENSION imbriqué n'est pas supporté"
+
+#: commands/extension.c:2512
+#, c-format
+msgid "version \"%s\" of extension \"%s\" is already installed"
+msgstr "la version « %s » de l'extension « %s » est déjà installée"
+
+#: commands/extension.c:2752
+#, c-format
+msgid "%s is not a member of extension \"%s\""
+msgstr "%s n'est pas un membre de l'extension « %s »"
+
+#: commands/collationcmds.c:81
+#, c-format
+msgid "collation attribute \"%s\" not recognized"
+msgstr "attribut de collationnement « %s » non reconnu"
+
+#: commands/collationcmds.c:126
+msgid "parameter \"lc_collate\" must be specified"
+msgstr "le paramètre « lc_collate » doit être spécifié"
+
+#: commands/collationcmds.c:131
+msgid "parameter \"lc_ctype\" must be specified"
+msgstr "le paramètre « lc_ctype » doit être spécifié"
+
+#: commands/collationcmds.c:177
+#, c-format
+msgid "collation \"%s\" does not exist, skipping"
+msgstr "le collationnement « %s » n'existe pas, poursuite du traitement"
+
+#: commands/collationcmds.c:237
+#: commands/collationcmds.c:416
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
+msgstr "le collationnament « %s » pour l'encodage « %s » existe déjà dans le schéma « %s »"
+
+#: commands/collationcmds.c:249
+#: commands/collationcmds.c:428
+#, c-format
+msgid "collation \"%s\" already exists in schema \"%s\""
+msgstr "le collationnement « %s » existe déjà dans le schéma « %s »"
+
+#: tcop/fastpath.c:109
+#: tcop/fastpath.c:485
+#: tcop/fastpath.c:615
+#, c-format
+msgid "invalid argument size %d in function call message"
+msgstr "taille de l'argument %d invalide dans le message d'appel de la fonction"
+
+#: tcop/fastpath.c:303
+#: tcop/postgres.c:917
+#: tcop/postgres.c:1227
+#: tcop/postgres.c:1508
+#: tcop/postgres.c:1950
+#: tcop/postgres.c:2318
+#: tcop/postgres.c:2399
+msgid "current transaction is aborted, commands ignored until end of transaction block"
+msgstr ""
+"la transaction est annulée, les commandes sont ignorées jusqu'à la fin du bloc\n"
+"de la transaction"
+
+#: tcop/fastpath.c:331
+#, c-format
+msgid "fastpath function call: \"%s\" (OID %u)"
+msgstr "appel de fonction fastpath : « %s » (OID %u)"
+
+#: tcop/fastpath.c:411
+#: tcop/postgres.c:1087
+#: tcop/postgres.c:1374
+#: tcop/postgres.c:1791
+#: tcop/postgres.c:2008
+#, c-format
+msgid "duration: %s ms"
+msgstr "durée : %s ms"
+
+#: tcop/fastpath.c:415
+#, c-format
+msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
+msgstr "durée : %s ms, appel de fonction fastpath : « %s » (OID %u)"
+
+#: tcop/fastpath.c:453
+#: tcop/fastpath.c:580
+#, c-format
+msgid "function call message contains %d arguments but function requires %d"
+msgstr ""
+"le message d'appel de la fonction contient %d arguments mais la fonction en\n"
+"requiert %d"
+
+#: tcop/fastpath.c:461
+#, c-format
+msgid "function call message contains %d argument formats but %d arguments"
+msgstr ""
+"le message d'appel de la fonction contient %d formats d'argument mais %d\n"
+" arguments"
+
+#: tcop/fastpath.c:548
+#: tcop/fastpath.c:631
+#, c-format
+msgid "incorrect binary data format in function argument %d"
+msgstr "format des données binaires incorrect dans l'argument de la fonction %d"
+
+#: tcop/postgres.c:399
+#: tcop/postgres.c:411
+#: tcop/postgres.c:422
+#: tcop/postgres.c:434
+#: tcop/postgres.c:4152
+#, c-format
+msgid "invalid frontend message type %d"
+msgstr "type %d du message de l'interface invalide"
+
+#: tcop/postgres.c:858
+#, c-format
+msgid "statement: %s"
+msgstr "instruction : %s"
+
+#: tcop/postgres.c:1092
+#, c-format
+msgid "duration: %s ms  statement: %s"
+msgstr "durée : %s ms, instruction : %s"
+
+#: tcop/postgres.c:1142
+#, c-format
+msgid "parse %s: %s"
+msgstr "analyse %s : %s"
+
+#: tcop/postgres.c:1200
+msgid "cannot insert multiple commands into a prepared statement"
+msgstr "ne peut pas insérer les commandes multiples dans une instruction préparée"
+
+#: tcop/postgres.c:1379
+#, c-format
+msgid "duration: %s ms  parse %s: %s"
 msgstr "durée : %s ms, analyse %s : %s"
 
-#: tcop/postgres.c:1465
+#: tcop/postgres.c:1425
 #, c-format
 msgid "bind %s to %s"
 msgstr "lie %s à %s"
 
-#: tcop/postgres.c:1484
-#: tcop/postgres.c:2338
+#: tcop/postgres.c:1444
+#: tcop/postgres.c:2298
 msgid "unnamed prepared statement does not exist"
 msgstr "l'instruction préparée non nommée n'existe pas"
 
-#: tcop/postgres.c:1526
+#: tcop/postgres.c:1486
 #, c-format
 msgid "bind message has %d parameter formats but %d parameters"
 msgstr "le message bind a %d formats de paramètres mais %d paramètres"
 
-#: tcop/postgres.c:1532
+#: tcop/postgres.c:1492
 #, c-format
 msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr ""
 "le message bind fournit %d paramètres, mais l'instruction préparée « %s » en\n"
 "requiert %d"
 
-#: tcop/postgres.c:1697
+#: tcop/postgres.c:1657
 #, c-format
 msgid "incorrect binary data format in bind parameter %d"
 msgstr "format des données binaires incorrect dans le paramètre bind %d"
 
-#: tcop/postgres.c:1836
+#: tcop/postgres.c:1796
 #, c-format
 msgid "duration: %s ms  bind %s%s%s: %s"
 msgstr "durée : %s ms, lien %s%s%s : %s"
 
-#: tcop/postgres.c:1884
-#: tcop/postgres.c:2425
+#: tcop/postgres.c:1844
+#: tcop/postgres.c:2385
 #, c-format
 msgid "portal \"%s\" does not exist"
 msgstr "le portail « %s » n'existe pas"
 
-#: tcop/postgres.c:1971
-#: tcop/postgres.c:2056
+#: tcop/postgres.c:1931
+#: tcop/postgres.c:2016
 msgid "execute fetch from"
 msgstr "exécute fetch à partir de"
 
-#: tcop/postgres.c:1972
-#: tcop/postgres.c:2057
+#: tcop/postgres.c:1932
+#: tcop/postgres.c:2017
 msgid "execute"
 msgstr "exécute"
 
-#: tcop/postgres.c:1969
+#: tcop/postgres.c:1929
 #, c-format
 msgid "%s %s%s%s: %s"
 msgstr "%s %s%s%s: %s"
 
-#: tcop/postgres.c:2053
+#: tcop/postgres.c:2013
 #, c-format
 msgid "duration: %s ms  %s %s%s%s: %s"
 msgstr "durée : %s ms  %s %s%s%s: %s"
 
-#: tcop/postgres.c:2179
+#: tcop/postgres.c:2139
 #, c-format
 msgid "prepare: %s"
 msgstr "préparation : %s"
 
-#: tcop/postgres.c:2242
+#: tcop/postgres.c:2202
 #, c-format
 msgid "parameters: %s"
 msgstr "paramètres : %s"
 
-#: tcop/postgres.c:2261
+#: tcop/postgres.c:2221
 msgid "abort reason: recovery conflict"
 msgstr "raison de l'annulation : conflit de restauration"
 
-#: tcop/postgres.c:2277
+#: tcop/postgres.c:2237
 msgid "User was holding shared buffer pin for too long."
 msgstr "L'utilisateur conservait des blocs disques en mémoire partagée depuis trop longtemps."
 
-#: tcop/postgres.c:2280
+#: tcop/postgres.c:2240
 msgid "User was holding a relation lock for too long."
 msgstr "L'utilisateur conservait un verrou sur une relation depuis trop longtemps."
 
-#: tcop/postgres.c:2283
+#: tcop/postgres.c:2243
 msgid "User was or might have been using tablespace that must be dropped."
 msgstr "L'utilisateur utilisait ou pouvait utiliser un tablespace qui doit être supprimé."
 
-#: tcop/postgres.c:2286
+#: tcop/postgres.c:2246
 msgid "User query might have needed to see row versions that must be removed."
 msgstr ""
 "La requête de l'utilisateur pourrait avoir eu besoin de voir des versions de\n"
 "lignes qui doivent être supprimées."
 
-#: tcop/postgres.c:2289
-#: storage/ipc/standby.c:494
+#: tcop/postgres.c:2249
+#: storage/ipc/standby.c:491
 msgid "User transaction caused buffer deadlock with recovery."
 msgstr "La transaction de l'utilisateur causait un verrou mortel lors de la restauration."
 
-#: tcop/postgres.c:2292
+#: tcop/postgres.c:2252
 msgid "User was connected to a database that must be dropped."
 msgstr "L'utilisateur était connecté à une base de donnée qui doit être supprimé."
 
-#: tcop/postgres.c:2626
+#: tcop/postgres.c:2586
 msgid "terminating connection because of crash of another server process"
 msgstr "arrêt de la connexion à cause de l'arrêt brutal d'un autre processus serveur"
 
-#: tcop/postgres.c:2627
+#: tcop/postgres.c:2587
 msgid "The postmaster has commanded this server process to roll back the current transaction and exit, because another server process exited abnormally and possibly corrupted shared memory."
 msgstr ""
 "Le postmaster a commandé à ce processus serveur d'annuler la transaction\n"
 "courante et de quitter car un autre processus serveur a quitté anormalement\n"
 "et qu'il existe probablement de la mémoire partagée corrompue."
 
-#: tcop/postgres.c:2631
-#: tcop/postgres.c:2963
+#: tcop/postgres.c:2591
+#: tcop/postgres.c:2941
 msgid "In a moment you should be able to reconnect to the database and repeat your command."
 msgstr ""
 "Dans un moment, vous devriez être capable de vous reconnecter à la base de\n"
 "données et de relancer votre commande."
 
-#: tcop/postgres.c:2735
+#: tcop/postgres.c:2703
 msgid "floating-point exception"
 msgstr "exception dû à une virgule flottante"
 
-#: tcop/postgres.c:2736
+#: tcop/postgres.c:2704
 msgid "An invalid floating-point operation was signaled. This probably means an out-of-range result or an invalid operation, such as division by zero."
 msgstr ""
 "Une opération invalide sur les virgules flottantes a été signalée.\n"
 "Ceci signifie probablement un résultat en dehors de l'échelle ou une\n"
 "opération invalide telle qu'une division par zéro."
 
-#: tcop/postgres.c:2903
+#: tcop/postgres.c:2872
 msgid "terminating autovacuum process due to administrator command"
 msgstr "arrêt du processus autovacuum suite à la demande de l'administrateur"
 
-#: tcop/postgres.c:2907
-#: tcop/postgres.c:2912
-#: tcop/postgres.c:2961
+#: tcop/postgres.c:2878
+#: tcop/postgres.c:2888
+#: tcop/postgres.c:2939
 msgid "terminating connection due to conflict with recovery"
 msgstr "arrêt de la connexion à cause d'un conflit avec la restauration"
 
-#: tcop/postgres.c:2917
+#: tcop/postgres.c:2894
 msgid "terminating connection due to administrator command"
 msgstr "arrêt des connexions suite à la demande de l'administrateur"
 
-#: tcop/postgres.c:2932
+#: tcop/postgres.c:2909
 msgid "canceling authentication due to timeout"
 msgstr "annulation de l'authentification à cause du délai écoulé"
 
-#: tcop/postgres.c:2941
+#: tcop/postgres.c:2918
 msgid "canceling statement due to statement timeout"
 msgstr "annulation de la requête à cause du délai écoulé pour l'exécution de l'instruction"
 
-#: tcop/postgres.c:2950
+#: tcop/postgres.c:2927
 msgid "canceling autovacuum task"
 msgstr "annulation de la tâche d'autovacuum"
 
-#: tcop/postgres.c:2968
-#: storage/ipc/standby.c:493
+#: tcop/postgres.c:2946
+#: storage/ipc/standby.c:490
 msgid "canceling statement due to conflict with recovery"
 msgstr "annulation de la requête à cause d'un conflit avec la restauration"
 
-#: tcop/postgres.c:2984
+#: tcop/postgres.c:2962
 msgid "canceling statement due to user request"
 msgstr "annulation de la requête à la demande de l'utilisateur"
 
-#: tcop/postgres.c:3060
-#: tcop/postgres.c:3081
+#: tcop/postgres.c:3043
+#: tcop/postgres.c:3065
 msgid "stack depth limit exceeded"
 msgstr "dépassement de limite (en profondeur) de la pile"
 
-#: tcop/postgres.c:3061
-#: tcop/postgres.c:3082
-msgid "Increase the configuration parameter \"max_stack_depth\", after ensuring the platform's stack depth limit is adequate."
+#: tcop/postgres.c:3044
+#: tcop/postgres.c:3066
+#, c-format
+msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
 msgstr ""
-"Augmenter le paramètre « max_stack_depth » après vous être assuré que la\n"
-"limite de profondeur de la pile de la plateforme est adéquate."
+"Augmenter le paramètre « max_stack_depth » (actuellement %d Ko) après vous\n"
+"être assuré que la limite de profondeur de la pile de la plateforme est\n"
+"adéquate."
 
-#: tcop/postgres.c:3099
+#: tcop/postgres.c:3082
 #, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB"
-msgstr "« max_stack_depth » ne doit pas dépasser %ld Ko"
+msgid "\"max_stack_depth\" must not exceed %ldkB."
+msgstr "« max_stack_depth » ne doit pas dépasser %ld Ko."
 
-#: tcop/postgres.c:3101
+#: tcop/postgres.c:3084
 msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
 msgstr ""
 "Augmenter la limite de profondeur de la pile sur votre plateforme via\n"
 "« ulimit -s » ou l'équivalent local."
 
-#: tcop/postgres.c:3424
+#: tcop/postgres.c:3419
 msgid "invalid command-line arguments for server process"
 msgstr "arguments invalides en ligne de commande pour le processus serveur"
 
-#: tcop/postgres.c:3425
-#: tcop/postgres.c:3431
+#: tcop/postgres.c:3420
+#: tcop/postgres.c:3426
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Essayez « %s --help » pour plus d'informations."
 
-#: tcop/postgres.c:3429
+#: tcop/postgres.c:3424
 #, c-format
 msgid "%s: invalid command-line arguments"
 msgstr "%s : arguments invalides en ligne de commande"
 
-#: tcop/postgres.c:3528
+#: tcop/postgres.c:3523
 #, c-format
 msgid "%s: no database nor user name specified"
 msgstr "%s : aucune base de données et aucun utilisateur spécifiés"
 
-#: tcop/postgres.c:4066
+#: tcop/postgres.c:4062
 #, c-format
 msgid "invalid CLOSE message subtype %d"
 msgstr "sous-type %d du message CLOSE invalide"
 
-#: tcop/postgres.c:4099
+#: tcop/postgres.c:4095
 #, c-format
 msgid "invalid DESCRIBE message subtype %d"
 msgstr "sous-type %d du message DESCRIBE invalide"
 
-#: tcop/postgres.c:4330
+#: tcop/postgres.c:4329
 #, c-format
 msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
 msgstr ""
 "déconnexion : durée de la session : %d:%02d:%02d.%03d\n"
 "utilisateur=%s base=%s hôte=%s%s%s"
 
-#: tcop/pquery.c:670
+#: tcop/pquery.c:660
 #, c-format
 msgid "bind message has %d result formats but query has %d columns"
 msgstr "le message bind a %d formats de résultat mais la requête a %d colonnes"
 
-#: tcop/pquery.c:978
+#: tcop/pquery.c:969
 msgid "cursor can only scan forward"
 msgstr "le curseur peut seulement parcourir en avant"
 
-#: tcop/pquery.c:979
+#: tcop/pquery.c:970
 msgid "Declare it with SCROLL option to enable backward scan."
 msgstr "Déclarez-le avec l'option SCROLL pour activer le parcours inverse."
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:242
+#: tcop/utility.c:253
 #, c-format
 msgid "cannot execute %s in a read-only transaction"
 msgstr "ne peut pas exécuter %s dans une transaction en lecture seule"
 
 #. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:261
+#: tcop/utility.c:272
 #, c-format
 msgid "cannot execute %s during recovery"
 msgstr "ne peut pas exécuté %s lors de la restauration"
 
 #. translator: %s is name of a SQL command, eg PREPARE
-#: tcop/utility.c:279
+#: tcop/utility.c:290
 #, c-format
 msgid "cannot execute %s within security-restricted operation"
 msgstr ""
 "ne peut pas exécuter %s à l'intérieur d'une fonction restreinte\n"
 "pour sécurité"
 
-#: tcop/utility.c:1129
+#: tcop/utility.c:1194
 msgid "must be superuser to do CHECKPOINT"
 msgstr "doit être super-utilisateur pour exécuter un point de vérification (CHECKPOINT)"
 
@@ -8203,80 +8565,132 @@ msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
 msgstr "le curseur « %s » n'est pas un parcours modifiable de la table « %s »"
 
 #: executor/execCurrent.c:230
-#: executor/execQual.c:1024
+#: executor/execQual.c:1033
 #, c-format
 msgid "type of parameter %d (%s) does not match that when preparing the plan (%s)"
 msgstr "le type de paramètre %d (%s) ne correspond pas à ce qui est préparé dans le plan (%s)"
 
 #: executor/execCurrent.c:242
-#: executor/execQual.c:1035
+#: executor/execQual.c:1045
 #, c-format
 msgid "no value found for parameter %d"
 msgstr "aucune valeur trouvée pour le paramètre %d"
 
-#: executor/execMain.c:874
+#: executor/execMain.c:996
 #, c-format
 msgid "cannot change sequence \"%s\""
 msgstr "ne peut pas modifier la séquence « %s »"
 
-#: executor/execMain.c:880
+#: executor/execMain.c:1002
 #, c-format
 msgid "cannot change TOAST relation \"%s\""
 msgstr "ne peut pas modifier la relation TOAST « %s »"
 
-#: executor/execMain.c:886
+#: executor/execMain.c:1012
+#, c-format
+msgid "cannot insert into view \"%s\""
+msgstr "ne peut pas insérer dans la vue « %s »"
+
+#: executor/execMain.c:1014
+msgid "You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT trigger."
+msgstr "Vous avez besoin d'une règle ON INSERT DO INSTEAD sans condition ou d'un trigger INSTEAD OF INSERT."
+
+#: executor/execMain.c:1020
+#, c-format
+msgid "cannot update view \"%s\""
+msgstr "ne peut pas mettre à jour la vue « %s »"
+
+#: executor/execMain.c:1022
+msgid "You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE trigger."
+msgstr "Vous avez besoin d'une règle non conditionnelle ON UPDATE DO INSTEAD ou d'un trigger INSTEAD OF UPDATE."
+
+#: executor/execMain.c:1028
+#, c-format
+msgid "cannot delete from view \"%s\""
+msgstr "ne peut pas supprimer à partir de la vue « %s »"
+
+#: executor/execMain.c:1030
+msgid "You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE trigger."
+msgstr "Vous avez besoin d'une règle inconditionnelle ON DELETE DO INSTEAD ou d'un trigger INSTEAD OF DELETE."
+
+#: executor/execMain.c:1040
 #, c-format
-msgid "cannot change view \"%s\""
-msgstr "ne peut pas modifier la vue « %s »"
+msgid "cannot change foreign table \"%s\""
+msgstr "ne peut pas modifier la table distante « %s »"
 
-#: executor/execMain.c:892
+#: executor/execMain.c:1046
 #, c-format
 msgid "cannot change relation \"%s\""
 msgstr "ne peut pas modifier la relation « %s »"
 
-#: executor/execMain.c:1317
+#: executor/execMain.c:1070
+#, c-format
+msgid "cannot lock rows in sequence \"%s\""
+msgstr "ne peut pas verrouiller les lignes dans la séquence « %s »"
+
+#: executor/execMain.c:1077
+#, c-format
+msgid "cannot lock rows in TOAST relation \"%s\""
+msgstr "ne peut pas verrouiller les lignes dans la relation TOAST « %s »"
+
+#: executor/execMain.c:1084
+#, c-format
+msgid "cannot lock rows in view \"%s\""
+msgstr "ne peut pas verrouiller les lignes dans la vue « %s »"
+
+#: executor/execMain.c:1091
+#, c-format
+msgid "cannot lock rows in foreign table \"%s\""
+msgstr "ne peut pas verrouiller la table distante « %s »"
+
+#: executor/execMain.c:1097
+#, c-format
+msgid "cannot lock rows in relation \"%s\""
+msgstr "n'a pas pu verrouiller les lignes dans la relation « %s »"
+
+#: executor/execMain.c:1568
 #, c-format
 msgid "null value in column \"%s\" violates not-null constraint"
 msgstr "une valeur NULL viole la contrainte NOT NULL de la colonne « %s »"
 
-#: executor/execMain.c:1329
+#: executor/execMain.c:1580
 #, c-format
 msgid "new row for relation \"%s\" violates check constraint \"%s\""
 msgstr "la nouvelle ligne viole la contrainte de vérification « %s » de la relation « %s »"
 
-#: executor/execQual.c:296
-#: executor/execQual.c:324
-#: executor/execQual.c:2988
-#: utils/adt/array_userfuncs.c:428
-#: utils/adt/arrayfuncs.c:204
-#: utils/adt/arrayfuncs.c:483
-#: utils/adt/arrayfuncs.c:1218
-#: utils/adt/arrayfuncs.c:2890
-#: utils/adt/arrayfuncs.c:4570
+#: executor/execQual.c:298
+#: executor/execQual.c:326
+#: executor/execQual.c:2987
+#: utils/adt/array_userfuncs.c:430
+#: utils/adt/arrayfuncs.c:228
+#: utils/adt/arrayfuncs.c:507
+#: utils/adt/arrayfuncs.c:1242
+#: utils/adt/arrayfuncs.c:2915
+#: utils/adt/arrayfuncs.c:4940
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "le nombre de dimensions du tableau (%d) dépasse le maximum autorisé (%d)"
 
-#: executor/execQual.c:309
-#: executor/execQual.c:337
+#: executor/execQual.c:311
+#: executor/execQual.c:339
 msgid "array subscript in assignment must not be null"
 msgstr "l'indice du tableau dans l'affectation ne doit pas être NULL"
 
-#: executor/execQual.c:633
-#: executor/execQual.c:3906
+#: executor/execQual.c:635
+#: executor/execQual.c:3905
 #, c-format
 msgid "attribute %d has wrong type"
 msgstr "l'attribut %d a un type invalide"
 
-#: executor/execQual.c:634
-#: executor/execQual.c:3907
+#: executor/execQual.c:636
+#: executor/execQual.c:3906
 #, c-format
 msgid "Table has type %s, but query expects %s."
 msgstr "La table a le type %s alors que la requête attend %s."
 
-#: executor/execQual.c:698
-#: executor/execQual.c:717
-#: executor/execQual.c:916
+#: executor/execQual.c:700
+#: executor/execQual.c:719
+#: executor/execQual.c:918
 #: executor/nodeModifyTable.c:82
 #: executor/nodeModifyTable.c:92
 #: executor/nodeModifyTable.c:109
@@ -8284,296 +8698,295 @@ msgstr "La table a le type %s alors que la requ
 msgid "table row type and query-specified row type do not match"
 msgstr "Le type de ligne de la table et celui spécifié par la requête ne correspondent pas"
 
-#: executor/execQual.c:699
+#: executor/execQual.c:701
 #, c-format
 msgid "Table row contains %d attribute, but query expects %d."
 msgid_plural "Table row contains %d attributes, but query expects %d."
 msgstr[0] "La ligne de la table contient %d attribut alors que la requête en attend %d."
 msgstr[1] "La ligne de la table contient %d attributs alors que la requête en attend %d."
 
-#: executor/execQual.c:718
+#: executor/execQual.c:720
 #: executor/nodeModifyTable.c:93
 #, c-format
 msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr "La table a le type %s à la position ordinale %d alors que la requête attend %s."
 
-#: executor/execQual.c:917
-#: executor/execQual.c:1505
+#: executor/execQual.c:919
+#: executor/execQual.c:1519
 #, c-format
 msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
 msgstr ""
 "Le stockage physique ne correspond pas à l'attribut supprimé à la position\n"
 "ordinale %d."
 
-#: executor/execQual.c:1189
-#: parser/parse_func.c:97
-#: parser/parse_func.c:329
-#: parser/parse_func.c:645
+#: executor/execQual.c:1198
+#: parser/parse_func.c:91
+#: parser/parse_func.c:323
+#: parser/parse_func.c:640
 #, c-format
 msgid "cannot pass more than %d argument to a function"
 msgid_plural "cannot pass more than %d arguments to a function"
 msgstr[0] "ne peut pas passer plus de %d argument à une fonction"
 msgstr[1] "ne peut pas passer plus de %d arguments à une fonction"
 
-#: executor/execQual.c:1373
+#: executor/execQual.c:1387
 msgid "functions and operators can take at most one set argument"
 msgstr "les fonctions et opérateurs peuvent prendre au plus un argument d'ensemble"
 
-#: executor/execQual.c:1423
+#: executor/execQual.c:1437
 msgid "function returning setof record called in context that cannot accept type record"
 msgstr ""
 "la fonction renvoyant des lignes a été appelée dans un contexte qui\n"
 "n'accepte pas un ensemble"
 
-#: executor/execQual.c:1478
-#: executor/execQual.c:1494
-#: executor/execQual.c:1504
+#: executor/execQual.c:1492
+#: executor/execQual.c:1508
+#: executor/execQual.c:1518
 msgid "function return row and query-specified return row do not match"
 msgstr "la ligne de retour spécifiée par la requête et la ligne de retour de la fonction ne correspondent pas"
 
-#: executor/execQual.c:1479
+#: executor/execQual.c:1493
 #, c-format
 msgid "Returned row contains %d attribute, but query expects %d."
 msgid_plural "Returned row contains %d attributes, but query expects %d."
 msgstr[0] "La ligne renvoyée contient %d attribut mais la requête en attend %d."
 msgstr[1] "La ligne renvoyée contient %d attributs mais la requête en attend %d."
 
-#: executor/execQual.c:1495
+#: executor/execQual.c:1509
 #, c-format
 msgid "Returned type %s at ordinal position %d, but query expects %s."
 msgstr "A renvoyé le type %s à la position ordinale %d, mais la requête attend %s."
 
-#: executor/execQual.c:1748
-#: executor/execQual.c:2171
+#: executor/execQual.c:1745
+#: executor/execQual.c:2170
 msgid "table-function protocol for materialize mode was not followed"
 msgstr "le protocole de la fonction table pour le mode matérialisé n'a pas été respecté"
 
-#: executor/execQual.c:1768
-#: executor/execQual.c:2178
+#: executor/execQual.c:1765
+#: executor/execQual.c:2177
 #, c-format
 msgid "unrecognized table-function returnMode: %d"
 msgstr "returnMode de la fonction table non reconnu : %d"
 
-#: executor/execQual.c:2088
+#: executor/execQual.c:2087
 msgid "function returning set of rows cannot return null value"
 msgstr ""
 "la fonction renvoyant un ensemble de lignes ne peut pas renvoyer une valeur\n"
 "NULL"
 
-#: executor/execQual.c:2145
+#: executor/execQual.c:2144
 msgid "rows returned by function are not all of the same row type"
 msgstr "les lignes renvoyées par la fonction ne sont pas toutes du même type ligne"
 
-#: executor/execQual.c:2338
+#: executor/execQual.c:2335
 msgid "IS DISTINCT FROM does not support set arguments"
 msgstr "IS DISTINCT FROM ne supporte pas les arguments d'ensemble"
 
-#: executor/execQual.c:2413
+#: executor/execQual.c:2412
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr ""
 "l'opérateur ANY/ALL (pour les types array) ne supporte pas les arguments\n"
 "d'ensemble"
 
-#: executor/execQual.c:2966
+#: executor/execQual.c:2965
 msgid "cannot merge incompatible arrays"
 msgstr "ne peut pas fusionner les tableaux incompatibles"
 
-#: executor/execQual.c:2967
+#: executor/execQual.c:2966
 #, c-format
 msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr "Le tableau avec le type d'élément %s ne peut pas être inclus dans la construction ARRAY avec le type d'élément %s."
 
-#: executor/execQual.c:3008
-#: executor/execQual.c:3035
-#: utils/adt/arrayfuncs.c:518
+#: executor/execQual.c:3007
+#: executor/execQual.c:3034
+#: utils/adt/arrayfuncs.c:542
 msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr ""
 "les tableaux multidimensionnels doivent avoir des expressions de tableaux\n"
 "avec les dimensions correspondantes"
 
-#: executor/execQual.c:3550
+#: executor/execQual.c:3549
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF ne supporte pas les arguments d'ensemble"
 
-#: executor/execQual.c:3780
+#: executor/execQual.c:3779
 #: utils/adt/domains.c:128
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "le domaine %s n'autorise pas les valeurs NULL"
 
-#: executor/execQual.c:3809
+#: executor/execQual.c:3808
 #: utils/adt/domains.c:164
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "la valeur pour le domaine %s viole la contrainte de vérification « %s »"
 
-#: executor/execQual.c:4277
+#: executor/execQual.c:4288
 #: optimizer/util/clauses.c:572
-#: parser/parse_agg.c:160
+#: parser/parse_agg.c:164
 msgid "aggregate function calls cannot be nested"
 msgstr "les appels à la fonction d'agrégat ne peuvent pas être imbriqués"
 
-#: executor/execQual.c:4315
+#: executor/execQual.c:4326
 #: optimizer/util/clauses.c:646
-#: parser/parse_agg.c:207
+#: parser/parse_agg.c:211
 msgid "window function calls cannot be nested"
 msgstr "les appels à la fonction window ne peuvent pas être imbriqués"
 
-#: executor/execQual.c:4515
+#: executor/execQual.c:4538
 msgid "target type is not an array"
 msgstr "le type cible n'est pas un tableau"
 
-#: executor/execQual.c:4628
+#: executor/execQual.c:4651
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "une colonne ROW() a le type %s au lieu du type %s"
 
-#: executor/execQual.c:4759
-#: utils/adt/arrayfuncs.c:3310
-#: utils/adt/rowtypes.c:913
+#: executor/execQual.c:4786
+#: utils/adt/arrayfuncs.c:3378
+#: utils/adt/rowtypes.c:922
 #, c-format
 msgid "could not identify a comparison function for type %s"
 msgstr "n'a pas pu identifier une fonction de comparaison pour le type %s"
 
-#: executor/execUtils.c:1296
+#: executor/execUtils.c:1305
 #, c-format
 msgid "could not create exclusion constraint \"%s\""
 msgstr "n'a pas pu créer la contrainte d'exclusion « %s »"
 
-#: executor/execUtils.c:1298
+#: executor/execUtils.c:1307
 #, c-format
 msgid "Key %s conflicts with key %s."
 msgstr "La clé %s est en conflit avec la clé %s."
 
-#: executor/execUtils.c:1303
+#: executor/execUtils.c:1312
 #, c-format
 msgid "conflicting key value violates exclusion constraint \"%s\""
 msgstr "la valeur d'une clé en conflit rompt la contrainte d'exclusion « %s »"
 
-#: executor/execUtils.c:1305
+#: executor/execUtils.c:1314
 #, c-format
 msgid "Key %s conflicts with existing key %s."
 msgstr "La clé %s est en conflit avec la clé existante %s."
 
+#: executor/functions.c:195
+#, c-format
+msgid "could not determine actual type of argument declared %s"
+msgstr "n'a pas pu déterminer le type actuel de l'argument déclaré %s"
+
 #. translator: %s is a SQL statement name
-#: executor/functions.c:154
+#: executor/functions.c:295
 #, c-format
 msgid "%s is not allowed in a SQL function"
 msgstr "%s n'est pas autorisé dans une fonction SQL"
 
 #. translator: %s is a SQL statement name
-#: executor/functions.c:161
+#: executor/functions.c:302
 #: executor/spi.c:1256
-#: executor/spi.c:1846
+#: executor/spi.c:1891
 #, c-format
 msgid "%s is not allowed in a non-volatile function"
 msgstr "%s n'est pas autorisé dans une fonction non volatile"
 
-#: executor/functions.c:259
+#: executor/functions.c:408
 #, c-format
 msgid "could not determine actual result type for function declared to return type %s"
 msgstr ""
 "n'a pas pu déterminer le type du résultat actuel pour la fonction déclarant\n"
 "renvoyer le type %s"
 
-#: executor/functions.c:298
-#, c-format
-msgid "could not determine actual type of argument declared %s"
-msgstr "n'a pas pu déterminer le type actuel de l'argument déclaré %s"
-
-#: executor/functions.c:923
+#: executor/functions.c:1146
 #, c-format
 msgid "SQL function \"%s\" statement %d"
 msgstr "fonction SQL « %s », instruction %d"
 
-#: executor/functions.c:946
+#: executor/functions.c:1172
 #, c-format
 msgid "SQL function \"%s\" during startup"
 msgstr "fonction SQL « %s » lors du lancement"
 
-#: executor/functions.c:1091
-#: executor/functions.c:1127
-#: executor/functions.c:1139
-#: executor/functions.c:1250
-#: executor/functions.c:1282
-#: executor/functions.c:1311
+#: executor/functions.c:1332
+#: executor/functions.c:1368
+#: executor/functions.c:1380
+#: executor/functions.c:1493
+#: executor/functions.c:1526
+#: executor/functions.c:1556
 #, c-format
 msgid "return type mismatch in function declared to return %s"
 msgstr "le type de retour ne correspond pas à la fonction déclarant renvoyer %s"
 
-#: executor/functions.c:1093
+#: executor/functions.c:1334
 msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
 msgstr ""
 "L'instruction finale de la fonction doit être un SELECT ou un\n"
 "INSERT/UPDATE/DELETE RETURNING."
 
-#: executor/functions.c:1129
+#: executor/functions.c:1370
 msgid "Final statement must return exactly one column."
 msgstr "L'instruction finale doit renvoyer exactement une colonne."
 
-#: executor/functions.c:1141
+#: executor/functions.c:1382
 #, c-format
 msgid "Actual return type is %s."
 msgstr "Le code de retour réel est %s."
 
-#: executor/functions.c:1252
+#: executor/functions.c:1495
 msgid "Final statement returns too many columns."
 msgstr "L'instruction finale renvoie beaucoup trop de colonnes."
 
-#: executor/functions.c:1284
+#: executor/functions.c:1528
 #, c-format
 msgid "Final statement returns %s instead of %s at column %d."
 msgstr "L'instruction finale renvoie %s au lieu de %s pour la colonne %d."
 
-#: executor/functions.c:1313
+#: executor/functions.c:1558
 msgid "Final statement returns too few columns."
 msgstr "L'instruction finale renvoie trop peu de colonnes."
 
-#: executor/functions.c:1361
+#: executor/functions.c:1607
 #, c-format
 msgid "return type %s is not supported for SQL functions"
 msgstr "le type de retour %s n'est pas supporté pour les fonctions SQL"
 
-#: executor/nodeAgg.c:1717
-#: executor/nodeWindowAgg.c:1842
+#: executor/nodeAgg.c:1730
+#: executor/nodeWindowAgg.c:1851
 #, c-format
 msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 "L'agrégat %u a besoin d'avoir un type en entrée compatible avec le type en\n"
 "transition"
 
-#: executor/nodeHashjoin.c:721
-#: executor/nodeHashjoin.c:755
+#: executor/nodeHashjoin.c:814
+#: executor/nodeHashjoin.c:844
 #, c-format
 msgid "could not rewind hash-join temporary file: %m"
 msgstr "n'a pas pu revenir au début du fichier temporaire de la jointure hâchée : %m"
 
-#: executor/nodeHashjoin.c:789
-#: executor/nodeHashjoin.c:795
+#: executor/nodeHashjoin.c:879
+#: executor/nodeHashjoin.c:885
 #, c-format
 msgid "could not write to hash-join temporary file: %m"
 msgstr "n'a pas pu écrire le fichier temporaire de la jointure hâchée : %m"
 
-#: executor/nodeHashjoin.c:829
-#: executor/nodeHashjoin.c:839
+#: executor/nodeHashjoin.c:919
+#: executor/nodeHashjoin.c:929
 #, c-format
 msgid "could not read from hash-join temporary file: %m"
 msgstr "n'a pas pu lire le fichier temporaire contenant la jointure hâchée : %m"
 
-#: executor/nodeLimit.c:251
+#: executor/nodeLimit.c:253
 msgid "OFFSET must not be negative"
 msgstr "OFFSET ne doit pas être négatif"
 
-#: executor/nodeLimit.c:278
+#: executor/nodeLimit.c:280
 msgid "LIMIT must not be negative"
 msgstr "LIMIT ne doit pas être négative"
 
-#: executor/nodeMergejoin.c:1586
+#: executor/nodeMergejoin.c:1604
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
 msgstr "RIGHT JOIN est supporté seulement avec les conditions de jointures MERGE"
 
-#: executor/nodeMergejoin.c:1606
-#: optimizer/path/joinpath.c:1072
+#: executor/nodeMergejoin.c:1624
 msgid "FULL JOIN is only supported with merge-joinable join conditions"
 msgstr "FULL JOIN est supporté seulement avec les conditions de jointures MERGE"
 
@@ -8598,19 +9011,19 @@ msgstr "La requ
 msgid "more than one row returned by a subquery used as an expression"
 msgstr "plus d'une ligne renvoyée par une sous-requête utilisée comme une expression"
 
-#: executor/nodeWindowAgg.c:1233
+#: executor/nodeWindowAgg.c:1238
 msgid "frame starting offset must not be null"
 msgstr "l'offset de début de frame ne doit pas être NULL"
 
-#: executor/nodeWindowAgg.c:1246
+#: executor/nodeWindowAgg.c:1251
 msgid "frame starting offset must not be negative"
 msgstr "l'offset de début de frame ne doit pas être négatif"
 
-#: executor/nodeWindowAgg.c:1259
+#: executor/nodeWindowAgg.c:1264
 msgid "frame ending offset must not be null"
 msgstr "l'offset de fin de frame ne doit pas être NULL"
 
-#: executor/nodeWindowAgg.c:1272
+#: executor/nodeWindowAgg.c:1277
 msgid "frame ending offset must not be negative"
 msgstr "l'offset de fin de frame ne doit pas être négatif"
 
@@ -8638,31 +9051,36 @@ msgid "cannot open %s query as cursor"
 msgstr "ne peut pas ouvrir la requête %s comme curseur"
 
 #: executor/spi.c:1233
-#: parser/analyze.c:1978
+#: parser/analyze.c:2206
 msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE n'est pas supporté"
 
 #: executor/spi.c:1234
-#: parser/analyze.c:1979
+#: parser/analyze.c:2207
 msgid "Scrollable cursors must be READ ONLY."
 msgstr "Les curseurs déplaçables doivent être en lecture seule (READ ONLY)."
 
-#: executor/spi.c:2142
+#: executor/spi.c:2157
 #, c-format
 msgid "SQL statement \"%s\""
 msgstr "instruction SQL « %s »"
 
-#: foreign/foreign.c:230
+#: foreign/foreign.c:198
 #, c-format
 msgid "user mapping not found for \"%s\""
 msgstr "correspondance utilisateur non trouvée pour « %s »"
 
-#: foreign/foreign.c:408
+#: foreign/foreign.c:321
+#, c-format
+msgid "foreign-data wrapper \"%s\" has no handler"
+msgstr "le wrapper de données distantes « %s » n'a pas de gestionnaire"
+
+#: foreign/foreign.c:498
 #, c-format
 msgid "invalid option \"%s\""
 msgstr "option « %s » invalide"
 
-#: foreign/foreign.c:409
+#: foreign/foreign.c:499
 #, c-format
 msgid "Valid options in this context are: %s"
 msgstr "Les options valides dans ce contexte sont %s"
@@ -8672,529 +9090,518 @@ msgstr "Les options valides dans ce contexte sont %s"
 msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr "Ne peut pas agrandir de %d octets le tampon de chaîne contenant déjà %d octets"
 
-#: libpq/auth.c:255
+#: libpq/auth.c:257
 #, c-format
 msgid "authentication failed for user \"%s\": host rejected"
 msgstr "authentification échouée pour l'utilisateur « %s » : hôte rejeté"
 
-#: libpq/auth.c:258
+#: libpq/auth.c:260
 #, c-format
 msgid "Kerberos 5 authentication failed for user \"%s\""
 msgstr "authentification Kerberos 5 échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:261
+#: libpq/auth.c:263
 #, c-format
 msgid "\"trust\" authentication failed for user \"%s\""
 msgstr "authentification « trust » échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:264
+#: libpq/auth.c:266
 #, c-format
 msgid "Ident authentication failed for user \"%s\""
 msgstr "authentification Ident échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:268
+#: libpq/auth.c:269
+#, c-format
+msgid "Peer authentication failed for user \"%s\""
+msgstr "authentification peer échouée pour l'utilisateur « %s »"
+
+#: libpq/auth.c:273
 #, c-format
 msgid "password authentication failed for user \"%s\""
 msgstr "authentification par mot de passe échouée pour l'utilisateur  « %s »"
 
-#: libpq/auth.c:273
+#: libpq/auth.c:278
 #, c-format
 msgid "GSSAPI authentication failed for user \"%s\""
 msgstr "authentification GSSAPI échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:276
+#: libpq/auth.c:281
 #, c-format
 msgid "SSPI authentication failed for user \"%s\""
 msgstr "authentification SSPI échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:279
+#: libpq/auth.c:284
 #, c-format
 msgid "PAM authentication failed for user \"%s\""
 msgstr "authentification PAM échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:282
+#: libpq/auth.c:287
 #, c-format
 msgid "LDAP authentication failed for user \"%s\""
 msgstr "authentification LDAP échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:285
+#: libpq/auth.c:290
 #, c-format
 msgid "certificate authentication failed for user \"%s\""
 msgstr "authentification par le certificat échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:288
+#: libpq/auth.c:293
 #, c-format
 msgid "RADIUS authentication failed for user \"%s\""
 msgstr "authentification RADIUS échouée pour l'utilisateur « %s »"
 
-#: libpq/auth.c:291
+#: libpq/auth.c:296
 #, c-format
 msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr ""
 "authentification échouée pour l'utilisateur « %s » :\n"
 "méthode d'authentification invalide"
 
-#: libpq/auth.c:320
+#: libpq/auth.c:325
 msgid "missing or erroneous pg_hba.conf file"
 msgstr "fichier pg_hba.conf manquant ou erroné"
 
-#: libpq/auth.c:321
+#: libpq/auth.c:326
 msgid "See server log for details."
 msgstr "Voir les journaux applicatifs du serveur pour plus de détails."
 
-#: libpq/auth.c:351
+#: libpq/auth.c:356
 msgid "connection requires a valid client certificate"
 msgstr "la connexion requiert un certificat client valide"
 
-#: libpq/auth.c:395
-#: libpq/auth.c:411
-#: libpq/auth.c:448
+#: libpq/auth.c:400
+#: libpq/auth.c:416
 #: libpq/auth.c:464
+#: libpq/auth.c:482
 msgid "SSL on"
 msgstr "SSL actif"
 
-#: libpq/auth.c:395
-#: libpq/auth.c:411
-#: libpq/auth.c:448
+#: libpq/auth.c:400
+#: libpq/auth.c:416
 #: libpq/auth.c:464
+#: libpq/auth.c:482
 msgid "SSL off"
 msgstr "SSL inactif"
 
-#: libpq/auth.c:393
+#: libpq/auth.c:398
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr ""
 "pg_hba.conf rejette la connexion de la réplication pour l'hôte « %s »,\n"
 "utilisateur « %s », %s"
 
-#: libpq/auth.c:399
+#: libpq/auth.c:404
 #, c-format
 msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
 msgstr ""
 "pg_hba.conf rejette la connexion de la réplication pour l'hôte « %s »,\n"
 "utilisateur « %s »"
 
-#: libpq/auth.c:408
+#: libpq/auth.c:413
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 "pg_hba.conf rejette la connexion pour l'hôte « %s », utilisateur « %s », base\n"
 "de données « %s », %s"
 
-#: libpq/auth.c:415
+#: libpq/auth.c:420
 #, c-format
 msgid "pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
 "pg_hba.conf rejette la connexion pour l'hôte « %s », utilisateur « %s », base\n"
 "de données « %s »"
 
-#: libpq/auth.c:446
+#: libpq/auth.c:449
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup matches."
+msgstr "Adresse IP du client résolue en « %s », la recherche inverse correspond bien."
+
+#: libpq/auth.c:451
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup not checked."
+msgstr "Adresse IP du client résolue en « %s », la recherche inverse n'est pas vérifiée."
+
+#: libpq/auth.c:453
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup does not match."
+msgstr "Adresse IP du client résolue en « %s », la recherche inverse ne correspond pas."
+
+#: libpq/auth.c:462
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s"
 msgstr ""
 "aucune entrée dans pg_hba.conf pour la connexion de la réplication à partir de\n"
 "l'hôte « %s », utilisateur « %s », %s"
 
-#: libpq/auth.c:452
+#: libpq/auth.c:469
 #, c-format
 msgid "no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
 msgstr ""
 "aucune entrée dans pg_hba.conf pour la connexion de la réplication à partir de\n"
 "l'hôte « %s », utilisateur « %s »"
 
-#: libpq/auth.c:461
+#: libpq/auth.c:479
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 "aucune entrée dans pg_hba.conf pour l'hôte « %s », utilisateur « %s »,\n"
 "base de données « %s », %s"
 
-#: libpq/auth.c:468
+#: libpq/auth.c:487
 #, c-format
 msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
 "aucune entrée dans pg_hba.conf pour l'hôte « %s », utilisateur « %s »,\n"
 "base de données « %s »"
 
-#: libpq/auth.c:526
-#, c-format
-msgid "could not enable credential reception: %m"
-msgstr "n'a pas pu activer la réception de lettres de créance : %m"
-
 #: libpq/auth.c:539
-#: libpq/hba.c:948
+#: libpq/hba.c:1118
 msgid "MD5 authentication is not supported when \"db_user_namespace\" is enabled"
 msgstr "l'authentification MD5 n'est pas supportée quand « db_user_namespace » est activé"
 
-#: libpq/auth.c:660
+#: libpq/auth.c:663
 #, c-format
 msgid "expected password response, got message type %d"
 msgstr "en attente du mot de passe, a reçu un type de message %d"
 
-#: libpq/auth.c:688
+#: libpq/auth.c:691
 msgid "invalid password packet size"
 msgstr "taille du paquet du mot de passe invalide"
 
-#: libpq/auth.c:692
+#: libpq/auth.c:695
 msgid "received password packet"
 msgstr "paquet du mot de passe reçu"
 
-#: libpq/auth.c:750
+#: libpq/auth.c:753
 #, c-format
 msgid "Kerberos initialization returned error %d"
 msgstr "l'initialisation de Kerberos a retourné l'erreur %d"
 
-#: libpq/auth.c:760
+#: libpq/auth.c:763
 #, c-format
 msgid "Kerberos keytab resolving returned error %d"
 msgstr "la résolution keytab de Kerberos a renvoyé l'erreur %d"
 
-#: libpq/auth.c:784
+#: libpq/auth.c:787
 #, c-format
 msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
 msgstr "sname_to_principal(« %s », « %s ») de Kerberos a renvoyé l'erreur %d"
 
-#: libpq/auth.c:829
+#: libpq/auth.c:832
 #, c-format
 msgid "Kerberos recvauth returned error %d"
 msgstr "recvauth de Kerberos a renvoyé l'erreur %d"
 
-#: libpq/auth.c:852
+#: libpq/auth.c:855
 #, c-format
 msgid "Kerberos unparse_name returned error %d"
 msgstr "unparse_name de Kerberos a renvoyé l'erreur %d"
 
-#: libpq/auth.c:975
-#, c-format
-msgid "%s: %s"
-msgstr "%s : %s"
-
-#: libpq/auth.c:1001
+#: libpq/auth.c:1003
 msgid "GSSAPI is not supported in protocol version 2"
 msgstr "GSSAPI n'est pas supporté dans le protocole de version 2"
 
-#: libpq/auth.c:1056
+#: libpq/auth.c:1058
 #, c-format
 msgid "expected GSS response, got message type %d"
 msgstr "en attente d'une réponse GSS, a reçu un message de type %d"
 
-#: libpq/auth.c:1119
+#: libpq/auth.c:1121
 msgid "accepting GSS security context failed"
 msgstr "échec de l'acceptation du contexte de sécurité GSS"
 
-#: libpq/auth.c:1145
+#: libpq/auth.c:1147
 msgid "retrieving GSS user name failed"
 msgstr "échec lors de la récupération du nom de l'utilisateur avec GSS"
 
-#: libpq/auth.c:1218
-#, c-format
-msgid "SSPI error %x"
-msgstr "erreur SSPI : %x"
-
-#: libpq/auth.c:1222
-#, c-format
-msgid "%s (%x)"
-msgstr "%s (%x)"
-
-#: libpq/auth.c:1262
+#: libpq/auth.c:1264
 msgid "SSPI is not supported in protocol version 2"
 msgstr "SSPI n'est pas supporté dans le protocole de version 2"
 
-#: libpq/auth.c:1277
+#: libpq/auth.c:1279
 msgid "could not acquire SSPI credentials"
 msgstr "n'a pas pu obtenir les pièces d'identité SSPI"
 
-#: libpq/auth.c:1294
+#: libpq/auth.c:1296
 #, c-format
 msgid "expected SSPI response, got message type %d"
 msgstr "en attente d'une réponse SSPI, a reçu un message de type %d"
 
-#: libpq/auth.c:1366
+#: libpq/auth.c:1368
 msgid "could not accept SSPI security context"
 msgstr "n'a pas pu accepter le contexte de sécurité SSPI"
 
-#: libpq/auth.c:1422
+#: libpq/auth.c:1430
 msgid "could not get token from SSPI security context"
 msgstr "n'a pas pu obtenir le jeton du contexte de sécurité SSPI"
 
-#: libpq/auth.c:1665
+#: libpq/auth.c:1674
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "n'a pas pu créer le socket pour la connexion Ident : %m"
 
-#: libpq/auth.c:1680
+#: libpq/auth.c:1689
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr "n'a pas pu se lier à l'adresse locale « %s » : %m"
 
-#: libpq/auth.c:1692
+#: libpq/auth.c:1701
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "n'a pas pu se connecter au serveur Ident à l'adresse « %s », port %s : %m"
 
-#: libpq/auth.c:1712
+#: libpq/auth.c:1721
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "n'a pas pu envoyer la requête au serveur Ident à l'adresse « %s », port %s : %m"
 
-#: libpq/auth.c:1727
+#: libpq/auth.c:1736
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
 "n'a pas pu recevoir la réponse du serveur Ident à l'adresse « %s », port %s :\n"
 "%m"
 
-#: libpq/auth.c:1737
+#: libpq/auth.c:1746
 #, c-format
 msgid "invalidly formatted response from Ident server: \"%s\""
 msgstr "réponse mal formatée du serveur Ident : « %s »"
 
-#: libpq/auth.c:1772
-#: libpq/auth.c:1802
-#: libpq/auth.c:1830
-#: libpq/auth.c:1906
+#: libpq/auth.c:1785
+msgid "peer authentication is not supported on this platform"
+msgstr "la méthode d'authentification «peer n'est pas supportée sur cette plateforme"
+
+#: libpq/auth.c:1789
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr "n'a pas pu obtenir l'authentification de l'autre : %m"
 
-#: libpq/auth.c:1781
-#: libpq/auth.c:1811
-#: libpq/auth.c:1848
-#: libpq/auth.c:1917
+#: libpq/auth.c:1798
 #, c-format
 msgid "local user with ID %d does not exist"
 msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas"
 
-#: libpq/auth.c:1838
-#, c-format
-msgid "could not get effective UID from peer credentials: %m"
-msgstr "n'a pas pu obtenir l'UID réel à partir des pièces d'identité de l'autre : %m"
-
-#: libpq/auth.c:1928
-msgid "Ident authentication is not supported on local connections on this platform"
-msgstr "l'authentification Ident n'est pas supportée sur les connexions locales sur cette plateforme"
-
-#: libpq/auth.c:2045
-#: libpq/auth.c:2317
-#: libpq/auth.c:2677
+#: libpq/auth.c:1881
+#: libpq/auth.c:2153
+#: libpq/auth.c:2513
 msgid "empty password returned by client"
 msgstr "mot de passe vide renvoyé par le client"
 
-#: libpq/auth.c:2055
+#: libpq/auth.c:1891
 #, c-format
 msgid "error from underlying PAM layer: %s"
 msgstr "erreur provenant de la couche PAM : %s"
 
-#: libpq/auth.c:2124
+#: libpq/auth.c:1960
 #, c-format
 msgid "could not create PAM authenticator: %s"
 msgstr "n'a pas pu créer l'authenticateur PAM : %s"
 
-#: libpq/auth.c:2135
+#: libpq/auth.c:1971
 #, c-format
 msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr "pam_set_item(PAM_USER) a échoué : %s"
 
-#: libpq/auth.c:2146
+#: libpq/auth.c:1982
 #, c-format
 msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr "pam_set_item(PAM_CONV) a échoué : %s"
 
-#: libpq/auth.c:2157
+#: libpq/auth.c:1993
 #, c-format
 msgid "pam_authenticate failed: %s"
 msgstr "pam_authenticate a échoué : %s"
 
-#: libpq/auth.c:2168
+#: libpq/auth.c:2004
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
 msgstr "pam_acct_mgmt a échoué : %s"
 
-#: libpq/auth.c:2179
+#: libpq/auth.c:2015
 #, c-format
 msgid "could not release PAM authenticator: %s"
 msgstr "n'a pas pu fermer l'authenticateur PAM : %s"
 
-#: libpq/auth.c:2212
-#: libpq/auth.c:2216
+#: libpq/auth.c:2048
+#: libpq/auth.c:2052
 #, c-format
 msgid "could not initialize LDAP: error code %d"
 msgstr "n'a pas pu initialiser LDAP : code d'erreur %d"
 
-#: libpq/auth.c:2226
+#: libpq/auth.c:2062
 #, c-format
 msgid "could not set LDAP protocol version: error code %d"
 msgstr "n'a pas pu initialiser la version du protocole LDAP : code d'erreur %d"
 
-#: libpq/auth.c:2255
+#: libpq/auth.c:2091
 msgid "could not load wldap32.dll"
 msgstr "n'a pas pu charger wldap32.dll"
 
-#: libpq/auth.c:2263
+#: libpq/auth.c:2099
 msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
 msgstr "n'a pas pu charger la fonction _ldap_start_tls_sA de wldap32.dll"
 
-#: libpq/auth.c:2264
+#: libpq/auth.c:2100
 msgid "LDAP over SSL is not supported on this platform."
 msgstr "LDAP via SSL n'est pas supporté sur cette plateforme."
 
-#: libpq/auth.c:2279
+#: libpq/auth.c:2115
 #, c-format
 msgid "could not start LDAP TLS session: error code %d"
 msgstr "n'a pas pu démarrer la session TLS LDAP : code d'erreur %d"
 
-#: libpq/auth.c:2301
+#: libpq/auth.c:2137
 msgid "LDAP server not specified"
 msgstr "serveur LDAP non précisé"
 
-#: libpq/auth.c:2353
+#: libpq/auth.c:2189
 msgid "invalid character in user name for LDAP authentication"
 msgstr "caractère invalide dans le nom de l'utilisateur pour l'authentification LDAP"
 
-#: libpq/auth.c:2368
+#: libpq/auth.c:2204
 #, c-format
 msgid "could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "n'a pas pu réaliser la connexion LDAP initiale pour ldapbinddn « %s » sur le\n"
 "serveur « %s » : code d'erreur %d"
 
-#: libpq/auth.c:2393
+#: libpq/auth.c:2229
 #, c-format
 msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "n'a pas pu rechercher dans LDAP pour filtrer « %s » sur le serveur « %s » :\n"
 "code d'erreur %d"
 
-#: libpq/auth.c:2403
+#: libpq/auth.c:2239
 #, c-format
 msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
 msgstr ""
 "échec de la recherche LDAP pour le filtre « %s » sur le serveur « %s » :\n"
 "utilisateur non trouvé"
 
-#: libpq/auth.c:2407
+#: libpq/auth.c:2243
 #, c-format
 msgid "LDAP search failed for filter \"%s\" on server \"%s\": user is not unique (%ld matches)"
 msgstr ""
 "échec de la recherche LDAP pour le filtre « %s » sur le serveur « %s » :\n"
 "utilisateur non unique (%ld correspondances)"
 
-#: libpq/auth.c:2424
+#: libpq/auth.c:2260
 #, c-format
 msgid "could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
 msgstr ""
 "n'a pas pu obtenir le dn pour la première entrée correspondante « %s » sur\n"
 "le serveur « %s » : %s"
 
-#: libpq/auth.c:2444
+#: libpq/auth.c:2280
 #, c-format
 msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
 msgstr ""
 "n'a pas pu exécuter le unbind après la recherche de l'utilisateur « %s »\n"
 "sur le serveur « %s » : %s"
 
-#: libpq/auth.c:2481
+#: libpq/auth.c:2317
 #, c-format
 msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
 msgstr ""
 "échec de connexion LDAP pour l'utilisateur « %s » sur le serveur « %s » :\n"
 "code d'erreur %d"
 
-#: libpq/auth.c:2509
+#: libpq/auth.c:2345
 #, c-format
 msgid "certificate authentication failed for user \"%s\": client certificate contains no user name"
 msgstr ""
 "l'authentification par le certificat a échoué pour l'utilisateur « %s » :\n"
 "le certificat du client ne contient aucun nom d'utilisateur"
 
-#: libpq/auth.c:2633
+#: libpq/auth.c:2469
 msgid "RADIUS server not specified"
 msgstr "serveur RADIUS non précisé"
 
-#: libpq/auth.c:2640
+#: libpq/auth.c:2476
 msgid "RADIUS secret not specified"
 msgstr "secret RADIUS non précisé"
 
-#: libpq/auth.c:2656
-#: libpq/hba.c:1213
+#: libpq/auth.c:2492
+#: libpq/hba.c:1403
 #, c-format
 msgid "could not translate RADIUS server name \"%s\" to address: %s"
 msgstr "n'a pas pu traduire le nom du serveur RADIUS « %s » en une adresse : %s"
 
-#: libpq/auth.c:2684
+#: libpq/auth.c:2520
 msgid "RADIUS authentication does not support passwords longer than 16 characters"
 msgstr ""
 "l'authentification RADIUS ne supporte pas les mots de passe de plus de 16\n"
 "caractères"
 
-#: libpq/auth.c:2695
+#: libpq/auth.c:2531
 msgid "could not generate random encryption vector"
 msgstr "n'a pas pu générer le vecteur de chiffrement aléatoire"
 
-#: libpq/auth.c:2718
+#: libpq/auth.c:2554
 msgid "could not perform MD5 encryption of password"
 msgstr "n'a pas pu réaliser le chiffrement MD5 du mot de passe"
 
-#: libpq/auth.c:2740
+#: libpq/auth.c:2576
 #, c-format
 msgid "could not create RADIUS socket: %m"
 msgstr "n'a pas pu créer le socket RADIUS : %m"
 
-#: libpq/auth.c:2761
+#: libpq/auth.c:2597
 #, c-format
 msgid "could not bind local RADIUS socket: %m"
 msgstr "n'a pas pu se lier à la socket RADIUS : %m"
 
-#: libpq/auth.c:2771
+#: libpq/auth.c:2607
 #, c-format
 msgid "could not send RADIUS packet: %m"
 msgstr "n'a pas pu transmettre le paquet RADIUS : %m"
 
-#: libpq/auth.c:2800
-#: libpq/auth.c:2825
+#: libpq/auth.c:2636
+#: libpq/auth.c:2661
 msgid "timeout waiting for RADIUS response"
 msgstr "dépassement du délai pour la réponse du RADIUS"
 
-#: libpq/auth.c:2818
+#: libpq/auth.c:2654
 #, c-format
 msgid "could not check status on RADIUS socket: %m"
 msgstr "n'a pas pu vérifier le statut sur la socket RADIUS : %m"
 
-#: libpq/auth.c:2847
+#: libpq/auth.c:2683
 #, c-format
 msgid "could not read RADIUS response: %m"
 msgstr "n'a pas pu lire la réponse RADIUS : %m"
 
-#: libpq/auth.c:2859
-#: libpq/auth.c:2863
+#: libpq/auth.c:2695
+#: libpq/auth.c:2699
 #, c-format
 msgid "RADIUS response was sent from incorrect port: %i"
 msgstr "la réponse RADIUS a été envoyée à partir d'un mauvais port : %i"
 
-#: libpq/auth.c:2872
+#: libpq/auth.c:2708
 #, c-format
 msgid "RADIUS response too short: %i"
 msgstr "réponse RADIUS trop courte : %i"
 
-#: libpq/auth.c:2879
+#: libpq/auth.c:2715
 #, c-format
 msgid "RADIUS response has corrupt length: %i (actual length %i)"
 msgstr "la réponse RADIUS a une longueur corrompue : %i (longueur actuelle %i)"
 
-#: libpq/auth.c:2887
+#: libpq/auth.c:2723
 #, c-format
 msgid "RADIUS response is to a different request: %i (should be %i)"
 msgstr "la réponse RADIUS correspond à une demande différente : %i (devrait être %i)"
 
-#: libpq/auth.c:2912
+#: libpq/auth.c:2748
 msgid "could not perform MD5 encryption of received packet"
 msgstr "n'a pas pu réaliser le chiffrement MD5 du paquet reçu"
 
-#: libpq/auth.c:2921
+#: libpq/auth.c:2757
 msgid "RADIUS response has incorrect MD5 signature"
 msgstr "la réponse RADIUS a une signature MD5 erronée"
 
-#: libpq/auth.c:2938
+#: libpq/auth.c:2774
 #, c-format
 msgid "RADIUS response has invalid code (%i) for user \"%s\""
 msgstr "la réponse RADIUS a un code invalide (%i) pour l'utilisateur « %s »"
@@ -9204,14 +9611,14 @@ msgstr "la r
 #: libpq/be-fsstubs.c:189
 #: libpq/be-fsstubs.c:225
 #: libpq/be-fsstubs.c:272
-#: libpq/be-fsstubs.c:518
+#: libpq/be-fsstubs.c:519
 #, c-format
 msgid "invalid large-object descriptor: %d"
 msgstr "descripteur invalide de « Large Object » : %d"
 
 #: libpq/be-fsstubs.c:173
 #: libpq/be-fsstubs.c:205
-#: libpq/be-fsstubs.c:528
+#: libpq/be-fsstubs.c:529
 #, c-format
 msgid "permission denied for large object %u"
 msgstr "droit refusé pour le Large Object %u"
@@ -9247,12 +9654,12 @@ msgstr "doit 
 msgid "Anyone can use the client-side lo_export() provided by libpq."
 msgstr "Tout le monde peut utiliser lo_export(), fournie par libpq, du côté client."
 
-#: libpq/be-fsstubs.c:483
+#: libpq/be-fsstubs.c:484
 #, c-format
 msgid "could not create server file \"%s\": %m"
 msgstr "n'a pas pu créer le fichier serveur « %s » : %m"
 
-#: libpq/be-fsstubs.c:495
+#: libpq/be-fsstubs.c:496
 #, c-format
 msgid "could not write server file \"%s\": %m"
 msgstr "n'a pas pu écrire le fichier serveur « %s » : %m"
@@ -9265,7 +9672,7 @@ msgstr "erreur SSL : %s"
 
 #: libpq/be-secure.c:292
 #: libpq/be-secure.c:387
-#: libpq/be-secure.c:951
+#: libpq/be-secure.c:957
 #, c-format
 msgid "unrecognized SSL error code: %d"
 msgstr "code d'erreur SSL inconnu : %d"
@@ -9285,379 +9692,407 @@ msgstr "SSL a 
 msgid "could not create SSL context: %s"
 msgstr "n'a pas pu créer le contexte SSL : %s"
 
-#: libpq/be-secure.c:746
+#: libpq/be-secure.c:752
 #, c-format
 msgid "could not load server certificate file \"%s\": %s"
 msgstr "n'a pas pu charger le fichier du certificat serveur « %s » : %s"
 
-#: libpq/be-secure.c:752
+#: libpq/be-secure.c:758
 #, c-format
 msgid "could not access private key file \"%s\": %m"
 msgstr "n'a pas pu accéder au fichier de la clé privée « %s » : %m"
 
-#: libpq/be-secure.c:767
+#: libpq/be-secure.c:773
 #, c-format
 msgid "private key file \"%s\" has group or world access"
 msgstr ""
 "le fichier de clé privé « %s » est accessible par le groupe et/ou par les\n"
 "autres"
 
-#: libpq/be-secure.c:769
+#: libpq/be-secure.c:775
 msgid "Permissions should be u=rw (0600) or less."
 msgstr "Les droits devraient être u=rwx (0600) ou inférieures."
 
-#: libpq/be-secure.c:776
+#: libpq/be-secure.c:782
 #, c-format
 msgid "could not load private key file \"%s\": %s"
 msgstr "n'a pas pu charger le fichier de clé privée « %s » : %s"
 
-#: libpq/be-secure.c:781
+#: libpq/be-secure.c:787
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "échec de la vérification de la clé privée : %s"
 
-#: libpq/be-secure.c:809
+#: libpq/be-secure.c:815
 #, c-format
 msgid "could not access root certificate file \"%s\": %m"
 msgstr "n'a pas pu accéder au fichier du certificat racine « %s » : %m"
 
-#: libpq/be-secure.c:820
+#: libpq/be-secure.c:826
 #, c-format
 msgid "could not load root certificate file \"%s\": %s"
 msgstr "n'a pas pu charger le fichier du certificat racine « %s » : %s"
 
-#: libpq/be-secure.c:843
+#: libpq/be-secure.c:849
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" ignored"
 msgstr "liste de révocation des certificats SSL « %s » ignorée"
 
-#: libpq/be-secure.c:845
+#: libpq/be-secure.c:851
 msgid "SSL library does not support certificate revocation lists."
 msgstr "La bibliothèque SSL ne supporte pas les listes de révocation des certificats."
 
-#: libpq/be-secure.c:852
+#: libpq/be-secure.c:858
 #, c-format
 msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
 msgstr "liste de révocation des certificats SSL « %s » introuvable, continue : %s"
 
-#: libpq/be-secure.c:854
+#: libpq/be-secure.c:860
 msgid "Certificates will not be checked against revocation list."
 msgstr "Les certificats ne seront pas vérifiés avec la liste de révocation."
 
-#: libpq/be-secure.c:896
+#: libpq/be-secure.c:902
 #, c-format
 msgid "could not initialize SSL connection: %s"
 msgstr "n'a pas pu initialiser la connexion SSL : %s"
 
-#: libpq/be-secure.c:905
+#: libpq/be-secure.c:911
 #, c-format
 msgid "could not set SSL socket: %s"
 msgstr "n'a pas pu créer le socket SSL : %s"
 
-#: libpq/be-secure.c:931
+#: libpq/be-secure.c:937
 #, c-format
 msgid "could not accept SSL connection: %m"
 msgstr "n'a pas pu accepter la connexion SSL : %m"
 
-#: libpq/be-secure.c:935
-#: libpq/be-secure.c:946
+#: libpq/be-secure.c:941
+#: libpq/be-secure.c:952
 msgid "could not accept SSL connection: EOF detected"
 msgstr "n'a pas pu accepter la connexion SSL : fin de fichier détecté"
 
-#: libpq/be-secure.c:940
+#: libpq/be-secure.c:946
 #, c-format
 msgid "could not accept SSL connection: %s"
 msgstr "n'a pas pu accepter la connexion SSL : %s"
 
-#: libpq/be-secure.c:991
+#: libpq/be-secure.c:997
 msgid "SSL certificate's common name contains embedded null"
 msgstr "le nom commun du certificat SSL contient des NULL"
 
-#: libpq/be-secure.c:998
+#: libpq/be-secure.c:1004
 #, c-format
 msgid "SSL connection from \"%s\""
 msgstr "connexion SSL de « %s »"
 
-#: libpq/be-secure.c:1042
+#: libpq/be-secure.c:1048
 msgid "no SSL error reported"
 msgstr "aucune erreur SSL reportée"
 
-#: libpq/be-secure.c:1046
+#: libpq/be-secure.c:1052
 #, c-format
 msgid "SSL error code %lu"
 msgstr "erreur SSL %lu"
 
-#: libpq/hba.c:158
+#: libpq/hba.c:160
 #, c-format
 msgid "authentication file token too long, skipping: \"%s\""
 msgstr "jeton du fichier d'authentification trop long, ignore : « %s »"
 
-#: libpq/hba.c:351
+#: libpq/hba.c:355
 #, c-format
 msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
 msgstr ""
 "n'a pas pu ouvrir le fichier d'authentification secondaire « @%s » comme\n"
 "« %s » : %m"
 
+#: libpq/hba.c:628
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s"
+msgstr "n'a pas pu traduire le nom d'hôte « %s » en adresse : %s"
+
 #. translator: the second %s is a list of auth methods
-#: libpq/hba.c:651
+#: libpq/hba.c:779
 #, c-format
 msgid "authentication option \"%s\" is only valid for authentication methods %s"
 msgstr ""
 "l'option d'authentification « %s » est seulement valide pour les méthodes\n"
 "d'authentification « %s »"
 
-#: libpq/hba.c:667
+#: libpq/hba.c:795
 #, c-format
 msgid "authentication method \"%s\" requires argument \"%s\" to be set"
 msgstr "la méthode d'authentification « %s » requiert un argument « %s » pour êtremise en place"
 
-#: libpq/hba.c:713
-msgid "hostssl not supported on this platform"
-msgstr "hostssl non supporté sur cette plateforme"
+#: libpq/hba.c:832
+msgid "local connections are not supported by this build"
+msgstr "les connexions locales ne sont pas supportées dans cette installation"
+
+#: libpq/hba.c:853
+msgid "hostssl requires SSL to be turned on"
+msgstr "hostssl requiert que SSL soit activé"
 
-#: libpq/hba.c:714
+#: libpq/hba.c:854
+msgid "Set ssl = on in postgresql.conf."
+msgstr "Configurez ssl = on dans le postgresql.conf."
+
+#: libpq/hba.c:862
+msgid "hostssl is not supported by this build"
+msgstr "hostssl n'est pas supporté par cette installation"
+
+#: libpq/hba.c:863
 msgid "Compile with --with-openssl to use SSL connections."
 msgstr "Compilez avec --with-ssl pour utiliser les connexions SSL"
 
-#: libpq/hba.c:736
+#: libpq/hba.c:885
 #, c-format
 msgid "invalid connection type \"%s\""
 msgstr "type de connexion « %s » invalide"
 
-#: libpq/hba.c:749
+#: libpq/hba.c:898
 msgid "end-of-line before database specification"
 msgstr "fin de ligne avant la spécification de la base de données"
 
-#: libpq/hba.c:762
+#: libpq/hba.c:911
 msgid "end-of-line before role specification"
 msgstr "fin de ligne avant la spécification du rôle"
 
-#: libpq/hba.c:777
+#: libpq/hba.c:926
 msgid "end-of-line before IP address specification"
 msgstr "fin de ligne avant la spécification de l'adresse IP"
 
-#: libpq/hba.c:823
+#: libpq/hba.c:980
 #, c-format
 msgid "invalid IP address \"%s\": %s"
 msgstr "adresse IP « %s » invalide : %s"
 
-#: libpq/hba.c:846
+#: libpq/hba.c:1000
+#, c-format
+msgid "specifying both host name and CIDR mask is invalid: \"%s\""
+msgstr "spécifier le nom d'hôte et le masque CIDR n'est pas valide : « %s »"
+
+#: libpq/hba.c:1014
 #, c-format
 msgid "invalid CIDR mask in address \"%s\""
 msgstr "masque CIDR invalide dans l'adresse « %s »"
 
-#: libpq/hba.c:864
+#: libpq/hba.c:1032
 msgid "end-of-line before netmask specification"
 msgstr "fin de ligne avant la spécification du masque réseau"
 
-#: libpq/hba.c:876
+#: libpq/hba.c:1044
 #, c-format
 msgid "invalid IP mask \"%s\": %s"
 msgstr "masque IP « %s » invalide : %s"
 
-#: libpq/hba.c:893
+#: libpq/hba.c:1061
 msgid "IP address and mask do not match"
 msgstr "l'adresse IP et le masque ne correspondent pas"
 
-#: libpq/hba.c:908
+#: libpq/hba.c:1076
 msgid "end-of-line before authentication method"
 msgstr "fin de ligne avant la méthode d'authentification"
 
-#: libpq/hba.c:979
+#: libpq/hba.c:1149
 #, c-format
 msgid "invalid authentication method \"%s\""
 msgstr "méthode d'authentification « %s » invalide"
 
-#: libpq/hba.c:990
+#: libpq/hba.c:1160
 #, c-format
-msgid "invalid authentication method \"%s\": not supported on this platform"
+msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr ""
 "méthode d'authentification « %s » invalide : non supportée sur cette\n"
-"plateforme"
+"installation"
 
-#: libpq/hba.c:1003
+#: libpq/hba.c:1181
 msgid "krb5 authentication is not supported on local sockets"
 msgstr ""
 "l'authentification krb5 n'est pas supportée sur les connexions locales par\n"
 "socket"
 
-#: libpq/hba.c:1014
+#: libpq/hba.c:1192
 msgid "gssapi authentication is not supported on local sockets"
 msgstr ""
 "l'authentification gssapi n'est pas supportée sur les connexions locales par\n"
 "socket"
 
-#: libpq/hba.c:1031
+#: libpq/hba.c:1203
+msgid "peer authentication is only supported on local sockets"
+msgstr ""
+"l'authentification peer est seulement supportée sur les connexions locales par\n"
+"socket"
+
+#: libpq/hba.c:1220
 msgid "cert authentication is only supported on hostssl connections"
 msgstr "l'authentification cert est seulement supportée sur les connexions hostssl"
 
-#: libpq/hba.c:1052
+#: libpq/hba.c:1241
 #, c-format
 msgid "authentication option not in name=value format: %s"
 msgstr "l'option d'authentification n'est pas dans le format nom=valeur : %s"
 
-#: libpq/hba.c:1067
-msgid "ident, krb5, gssapi, sspi and cert"
-msgstr "ident, krb5, gssapi, sspi et cert"
+#: libpq/hba.c:1257
+msgid "ident, peer, krb5, gssapi, sspi and cert"
+msgstr "ident, peer, krb5, gssapi, sspi et cert"
 
-#: libpq/hba.c:1081
+#: libpq/hba.c:1271
 msgid "clientcert can only be configured for \"hostssl\" rows"
 msgstr "clientcert peut seulement être configuré pour les lignes « hostssl »"
 
-#: libpq/hba.c:1092
+#: libpq/hba.c:1282
 msgid "client certificates can only be checked if a root certificate store is available"
 msgstr ""
 "les certificats cert peuvent seulement être vérifiés si un emplacement de\n"
 "certificat racine est disponible"
 
-#: libpq/hba.c:1093
+#: libpq/hba.c:1283
 msgid "Make sure the root.crt file is present and readable."
 msgstr "Assurez-vous que le certificat racine (root.crt) est présent et lisible"
 
-#: libpq/hba.c:1106
+#: libpq/hba.c:1296
 msgid "clientcert can not be set to 0 when using \"cert\" authentication"
 msgstr "clientcert ne peut pas être initialisé à 0 si vous utilisez l'authentification « cert »"
 
-#: libpq/hba.c:1140
+#: libpq/hba.c:1330
 #, c-format
 msgid "invalid LDAP port number: \"%s\""
 msgstr "numéro de port LDAP invalide : « %s »"
 
-#: libpq/hba.c:1186
-#: libpq/hba.c:1194
+#: libpq/hba.c:1376
+#: libpq/hba.c:1384
 msgid "krb5, gssapi and sspi"
 msgstr "krb5, gssapi et sspi"
 
-#: libpq/hba.c:1232
+#: libpq/hba.c:1422
 #, c-format
 msgid "invalid RADIUS port number: \"%s\""
 msgstr "numéro de port RADIUS invalide : « %s »"
 
-#: libpq/hba.c:1252
+#: libpq/hba.c:1442
 #, c-format
 msgid "unrecognized authentication option name: \"%s\""
 msgstr "nom d'option de l'authentification inconnu : « %s »"
 
-#: libpq/hba.c:1284
+#: libpq/hba.c:1474
 msgid "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute together with ldapprefix"
 msgstr ""
 "ne peut pas utiliser ldapbasedn, ldapbinddn, ldapbindpasswd\n"
 "ou ldapsearchattribute avec ldapprefix"
 
-#: libpq/hba.c:1294
+#: libpq/hba.c:1484
 msgid "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"
 msgstr ""
 "la méthode d'authentification « ldap » requiert un argument « ldapbasedn »,\n"
 "« ldapprefix » ou « ldapsuffix » pour être mise en place"
 
-#: libpq/hba.c:1482
-#: guc-file.l:436
+#: libpq/hba.c:1683
+#: guc-file.l:409
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier de configuration « %s » : %m"
 
-#: libpq/hba.c:1614
+#: libpq/hba.c:1815
 #, c-format
 msgid "invalid regular expression \"%s\": %s"
 msgstr "expression rationnelle invalide « %s » : %s"
 
-#: libpq/hba.c:1637
+#: libpq/hba.c:1838
 #, c-format
 msgid "regular expression match for \"%s\" failed: %s"
 msgstr "la correspondance de l'expression rationnelle pour « %s » a échoué : %s"
 
-#: libpq/hba.c:1655
+#: libpq/hba.c:1856
 #, c-format
 msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
 msgstr ""
 "l'expression rationnelle « %s » n'a pas de sous-expressions comme celle\n"
 "demandée par la référence dans « %s »"
 
-#: libpq/hba.c:1721
+#: libpq/hba.c:1922
 #, c-format
 msgid "missing entry in file \"%s\" at end of line %d"
 msgstr "entrée manquante dans le fichier « %s » à la fin de la ligne %d"
 
-#: libpq/hba.c:1762
+#: libpq/hba.c:1963
 #, c-format
 msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr ""
 "le nom d'utilisateur (%s) et le nom d'utilisateur authentifié (%s) fournis ne\n"
 "correspondent pas"
 
-#: libpq/hba.c:1783
+#: libpq/hba.c:1984
 #, c-format
 msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr ""
 "pas de correspondance dans la usermap « %s » pour l'utilisateur « %s »\n"
 "authentifié en tant que « %s »"
 
-#: libpq/hba.c:1807
+#: libpq/hba.c:2008
 #, c-format
 msgid "could not open usermap file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier usermap « %s » : %m"
 
-#: libpq/pqcomm.c:294
+#: libpq/pqcomm.c:306
 #, c-format
 msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
 msgstr "n'a pas pu résoudre le nom de l'hôte « %s », service « %s » par l'adresse : %s"
 
-#: libpq/pqcomm.c:298
+#: libpq/pqcomm.c:310
 #, c-format
 msgid "could not translate service \"%s\" to address: %s"
 msgstr "n'a pas pu résoudre le service « %s » par l'adresse : %s"
 
-#: libpq/pqcomm.c:325
+#: libpq/pqcomm.c:337
 #, c-format
 msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
 msgstr "n'a pas pu se lier à toutes les adresses requises : MAXLISTEN (%d) dépassé"
 
-#: libpq/pqcomm.c:334
+#: libpq/pqcomm.c:346
 msgid "IPv4"
 msgstr "IPv4"
 
-#: libpq/pqcomm.c:338
+#: libpq/pqcomm.c:350
 msgid "IPv6"
 msgstr "IPv6"
 
-#: libpq/pqcomm.c:343
+#: libpq/pqcomm.c:355
 msgid "Unix"
 msgstr "Unix"
 
-#: libpq/pqcomm.c:348
+#: libpq/pqcomm.c:360
 #, c-format
 msgid "unrecognized address family %d"
 msgstr "famille d'adresse %d non reconnue"
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:359
+#: libpq/pqcomm.c:371
 #, c-format
 msgid "could not create %s socket: %m"
 msgstr "n'a pas pu créer le socket %s : %m"
 
-#: libpq/pqcomm.c:384
+#: libpq/pqcomm.c:396
 #, c-format
 msgid "setsockopt(SO_REUSEADDR) failed: %m"
 msgstr "setsockopt(SO_REUSEADDR) a échoué : %m"
 
-#: libpq/pqcomm.c:399
+#: libpq/pqcomm.c:411
 #, c-format
 msgid "setsockopt(IPV6_V6ONLY) failed: %m"
 msgstr "setsockopt(IPV6_V6ONLY) a échoué : %m"
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:418
+#: libpq/pqcomm.c:430
 #, c-format
 msgid "could not bind %s socket: %m"
 msgstr "n'a pas pu se lier à la socket %s : %m"
 
-#: libpq/pqcomm.c:421
+#: libpq/pqcomm.c:433
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, remove socket file \"%s\" and retry."
 msgstr "Un autre postmaster fonctionne-t'il déjà sur le port %d ?Sinon, supprimez le fichier socket « %s » et réessayez."
 
-#: libpq/pqcomm.c:424
+#: libpq/pqcomm.c:436
 #, c-format
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr ""
@@ -9665,62 +10100,61 @@ msgstr ""
 "Sinon, attendez quelques secondes et réessayez."
 
 #. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:457
+#: libpq/pqcomm.c:469
 #, c-format
 msgid "could not listen on %s socket: %m"
 msgstr "n'a pas pu écouter sur le socket %s : %m"
 
-#: libpq/pqcomm.c:542
+#: libpq/pqcomm.c:554
 #, c-format
 msgid "group \"%s\" does not exist"
 msgstr "le groupe « %s » n'existe pas"
 
-#: libpq/pqcomm.c:552
+#: libpq/pqcomm.c:564
 #, c-format
 msgid "could not set group of file \"%s\": %m"
 msgstr "n'a pas pu initialiser le groupe du fichier « %s » : %m"
 
-#: libpq/pqcomm.c:563
+#: libpq/pqcomm.c:575
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
 msgstr "n'a pas pu initialiser les droits du fichier « %s » : %m"
 
-#: libpq/pqcomm.c:593
+#: libpq/pqcomm.c:605
 #, c-format
 msgid "could not accept new connection: %m"
 msgstr "n'a pas pu accepter la nouvelle connexion : %m"
 
-#: libpq/pqcomm.c:779
-#: libpq/pqcomm.c:879
-#, c-format
-msgid "could not receive data from client: %m"
-msgstr "n'a pas pu recevoir les données du client : %m"
-
-#: libpq/pqcomm.c:854
+#: libpq/pqcomm.c:773
 #, c-format
 msgid "could not set socket to non-blocking mode: %m"
 msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %m"
 
-#: libpq/pqcomm.c:900
-#: libpq/pqcomm.c:911
+#: libpq/pqcomm.c:779
 #, c-format
 msgid "could not set socket to blocking mode: %m"
 msgstr "n'a pas pu activer le mode bloquant pour la socket : %m"
 
-#: libpq/pqcomm.c:1056
+#: libpq/pqcomm.c:831
+#: libpq/pqcomm.c:921
+#, c-format
+msgid "could not receive data from client: %m"
+msgstr "n'a pas pu recevoir les données du client : %m"
+
+#: libpq/pqcomm.c:1072
 msgid "unexpected EOF within message length word"
 msgstr "fin de fichier (EOF) inattendue à l'intérieur de la longueur du message"
 
-#: libpq/pqcomm.c:1067
+#: libpq/pqcomm.c:1083
 msgid "invalid message length"
 msgstr "longueur du message invalide"
 
-#: libpq/pqcomm.c:1089
-#: libpq/pqcomm.c:1099
+#: libpq/pqcomm.c:1105
+#: libpq/pqcomm.c:1115
 msgid "incomplete message from client"
 msgstr "message incomplet du client"
 
-#: libpq/pqcomm.c:1208
+#: libpq/pqcomm.c:1245
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "n'a pas pu envoyer les données au client : %m"
@@ -9732,7 +10166,7 @@ msgstr "pas de donn
 #: libpq/pqformat.c:556
 #: libpq/pqformat.c:574
 #: libpq/pqformat.c:595
-#: utils/adt/arrayfuncs.c:1386
+#: utils/adt/arrayfuncs.c:1411
 #: utils/adt/rowtypes.c:557
 msgid "insufficient data left in message"
 msgstr "données insuffisantes laissées dans le message"
@@ -9763,224 +10197,233 @@ msgstr "param
 msgid "missing Language parameter"
 msgstr "paramètre Language manquant"
 
-#: storage/smgr/md.c:371
-#: storage/smgr/md.c:839
-#, c-format
-msgid "could not truncate file \"%s\": %m"
-msgstr "n'a pas pu tronquer le fichier « %s » : %m"
+#: storage/ipc/procarray.c:270
+#: storage/ipc/sinvaladt.c:302
+#: storage/lmgr/proc.c:297
+#: postmaster/postmaster.c:1861
+msgid "sorry, too many clients already"
+msgstr "désolé, trop de clients sont déjà connectés"
+
+#: storage/ipc/procarray.c:637
+msgid "consistent state delayed because recovery snapshot incomplete"
+msgstr "état de cohérence pas encore atteint à cause d'un snapshot de restauration incomplet"
+
+#: storage/ipc/shmem.c:190
+#: storage/lmgr/lock.c:631
+#: storage/lmgr/lock.c:700
+#: storage/lmgr/lock.c:2163
+#: storage/lmgr/lock.c:2542
+#: storage/lmgr/lock.c:2607
+#: storage/lmgr/proc.c:197
+#: storage/lmgr/proc.c:216
+#: storage/lmgr/predicate.c:2233
+#: storage/lmgr/predicate.c:2248
+#: storage/lmgr/predicate.c:3623
+#: storage/lmgr/predicate.c:4770
+#: utils/hash/dynahash.c:928
+msgid "out of shared memory"
+msgstr "mémoire partagée épuisée"
 
-#: storage/smgr/md.c:439
+#: storage/ipc/shmem.c:346
+#: storage/ipc/shmem.c:399
 #, c-format
-msgid "cannot extend file \"%s\" beyond %u blocks"
-msgstr "ne peut pas étendre le fichier « %s » de plus de %u blocs"
+msgid "not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+msgstr "pas assez de mémoire partagée pour la structure de données « %s » (%lu octets demandés)"
 
-#: storage/smgr/md.c:461
-#: storage/smgr/md.c:621
-#: storage/smgr/md.c:694
+#: storage/ipc/shmem.c:365
 #, c-format
-msgid "could not seek to block %u in file \"%s\": %m"
-msgstr "n'a pas pu trouver le bloc %u dans le fichier « %s » : %m"
+msgid "could not create ShmemIndex entry for data structure \"%s\""
+msgstr "n'a pas pu créer l'entrée ShmemIndex pour la structure de données « %s »"
 
-#: storage/smgr/md.c:469
+#: storage/ipc/shmem.c:380
 #, c-format
-msgid "could not extend file \"%s\": %m"
-msgstr "n'a pas pu étendre le fichier « %s » : %m"
+msgid "ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, actual %lu"
+msgstr "La taille de l'entrée shmemIndex est mauvaise pour la structure de données « %s » : %lu obtenu, %lu attendu"
 
-#: storage/smgr/md.c:471
-#: storage/smgr/md.c:478
-#: storage/smgr/md.c:720
-msgid "Check free disk space."
-msgstr "Vérifiez l'espace disque disponible."
-
-#: storage/smgr/md.c:475
-#, c-format
-msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
-msgstr ""
-"n'a pas pu étendre le fichier « %s » : a écrit seulement %d octets sur %d\n"
-"au bloc %u"
-
-#: storage/smgr/md.c:638
-#, c-format
-msgid "could not read block %u in file \"%s\": %m"
-msgstr "n'a pas pu lire le bloc %u dans le fichier « %s » : %m"
-
-#: storage/smgr/md.c:654
-#, c-format
-msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
-msgstr ""
-"n'a pas pu lire le bloc %u du fichier « %s » : a lu seulement %d octets\n"
-"sur %d"
-
-#: storage/smgr/md.c:711
-#, c-format
-msgid "could not write block %u in file \"%s\": %m"
-msgstr "n'a pas pu écrire le bloc %u dans le fichier « %s » : %m"
-
-#: storage/smgr/md.c:716
-#, c-format
-msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
-msgstr ""
-"n'a pas pu écrire le bloc %u du fichier « %s » : a seulement écrit %d\n"
-"octets sur %d"
-
-#: storage/smgr/md.c:815
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
-msgstr "n'a pas pu tronquer le fichier « %s » en %u blocs : il y a seulement %u blocs"
-
-#: storage/smgr/md.c:864
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: %m"
-msgstr "n'a pas pu tronquer le fichier « %s » en %u blocs : %m"
-
-#: storage/smgr/md.c:1087
-#, c-format
-msgid "could not fsync file \"%s\" but retrying: %m"
-msgstr ""
-"n'a pas pu synchroniser sur disque (fsync) le fichier « %s », nouvelle\n"
-"tentative : %m"
-
-#: storage/smgr/md.c:1586
-#, c-format
-msgid "could not open file \"%s\" (target block %u): %m"
-msgstr "n'a pas pu ouvrir le fichier « %s » (bloc cible %u) : %m"
-
-#: storage/smgr/md.c:1608
-#, c-format
-msgid "could not seek to end of file \"%s\": %m"
-msgstr "n'a pas pu trouver la fin du fichier « %s » : %m"
+#: storage/ipc/shmem.c:427
+#: storage/ipc/shmem.c:446
+msgid "requested shared memory size overflows size_t"
+msgstr "la taille de la mémoire partagée demandée dépasse size_t"
 
-#: storage/buffer/bufmgr.c:131
-#: storage/buffer/bufmgr.c:235
+#: storage/buffer/bufmgr.c:134
+#: storage/buffer/bufmgr.c:239
 msgid "cannot access temporary tables of other sessions"
 msgstr "ne peut pas accéder aux tables temporaires d'autres sessions"
 
-#: storage/buffer/bufmgr.c:364
+#: storage/buffer/bufmgr.c:373
 #, c-format
 msgid "unexpected data beyond EOF in block %u of relation %s"
 msgstr ""
 "données inattendues après la fin de fichier dans le bloc %u de la relation\n"
 "%s"
 
-#: storage/buffer/bufmgr.c:366
+#: storage/buffer/bufmgr.c:375
 msgid "This has been seen to occur with buggy kernels; consider updating your system."
 msgstr ""
 "Ceci s'est déjà vu avec des noyaux buggés ; pensez à mettre à jour votre\n"
 "système."
 
-#: storage/buffer/bufmgr.c:438
+#: storage/buffer/bufmgr.c:447
 #, c-format
 msgid "invalid page header in block %u of relation %s; zeroing out page"
 msgstr ""
 "en-tête de page invalide dans le bloc %u de la relation %s ; remplacement\n"
 "de la page par des zéros"
 
-#: storage/buffer/bufmgr.c:446
+#: storage/buffer/bufmgr.c:455
 #, c-format
 msgid "invalid page header in block %u of relation %s"
 msgstr "en-tête de page invalide dans le bloc %u de la relation %s"
 
-#: storage/buffer/bufmgr.c:2706
+#: storage/buffer/bufmgr.c:2735
 #, c-format
 msgid "could not write block %u of %s"
 msgstr "n'a pas pu écrire le bloc %u de %s"
 
-#: storage/buffer/bufmgr.c:2708
+#: storage/buffer/bufmgr.c:2737
 msgid "Multiple failures --- write error might be permanent."
 msgstr "Échecs multiples --- l'erreur d'écriture pourrait être permanent."
 
-#: storage/buffer/bufmgr.c:2729
+#: storage/buffer/bufmgr.c:2758
+#: storage/buffer/bufmgr.c:2777
 #, c-format
 msgid "writing block %u of relation %s"
 msgstr "écriture du bloc %u de la relation %s"
 
-#: storage/buffer/localbuf.c:189
+#: storage/buffer/localbuf.c:190
 msgid "no empty local buffer available"
 msgstr "aucun tampon local vide disponible"
 
-#: storage/file/fd.c:403
+#: storage/file/fd.c:405
 #, c-format
 msgid "getrlimit failed: %m"
 msgstr "échec de getrlimit : %m"
 
-#: storage/file/fd.c:493
+#: storage/file/fd.c:495
 msgid "insufficient file descriptors available to start server process"
 msgstr "nombre de descripteurs de fichier insuffisants pour lancer le processus serveur"
 
-#: storage/file/fd.c:494
+#: storage/file/fd.c:496
 #, c-format
 msgid "System allows %d, we need at least %d."
 msgstr "Le système autorise %d, nous avons besoin d'au moins %d."
 
-#: storage/file/fd.c:535
-#: storage/file/fd.c:1446
-#: storage/file/fd.c:1561
+#: storage/file/fd.c:537
+#: storage/file/fd.c:1469
+#: storage/file/fd.c:1585
 #, c-format
 msgid "out of file descriptors: %m; release and retry"
 msgstr "plus de descripteurs de fichiers : %m; quittez et ré-essayez"
 
-#: storage/file/fd.c:1088
+#: storage/file/fd.c:1110
 #, c-format
 msgid "temporary file: path \"%s\", size %lu"
 msgstr "fichier temporaire : chemin « %s », taille %lu"
 
-#: storage/file/fd.c:1620
+#: storage/file/fd.c:1644
 #, c-format
 msgid "could not read directory \"%s\": %m"
 msgstr "n'a pas pu lire le répertoire « %s » : %m"
 
-#: storage/ipc/procarray.c:270
-#: storage/ipc/sinvaladt.c:302
-#: storage/lmgr/proc.c:289
-#: postmaster/postmaster.c:1833
-msgid "sorry, too many clients already"
-msgstr "désolé, trop de clients sont déjà connectés"
+#: storage/smgr/md.c:381
+#: storage/smgr/md.c:855
+#, c-format
+msgid "could not truncate file \"%s\": %m"
+msgstr "n'a pas pu tronquer le fichier « %s » : %m"
 
-#: storage/ipc/procarray.c:639
-msgid "consistent state delayed because recovery snapshot incomplete"
-msgstr "état de cohérence pas encore atteint à cause d'un snapshot de restauration incomplet"
+#: storage/smgr/md.c:449
+#, c-format
+msgid "cannot extend file \"%s\" beyond %u blocks"
+msgstr "ne peut pas étendre le fichier « %s » de plus de %u blocs"
 
-#: storage/ipc/shmem.c:190
-#: storage/lmgr/lock.c:629
-#: storage/lmgr/lock.c:698
-#: storage/lmgr/lock.c:2132
-#: storage/lmgr/lock.c:2511
-#: storage/lmgr/lock.c:2576
-#: storage/lmgr/proc.c:192
-#: storage/lmgr/proc.c:210
-#: utils/hash/dynahash.c:925
-msgid "out of shared memory"
-msgstr "mémoire partagée épuisée"
+#: storage/smgr/md.c:471
+#: storage/smgr/md.c:635
+#: storage/smgr/md.c:710
+#, c-format
+msgid "could not seek to block %u in file \"%s\": %m"
+msgstr "n'a pas pu trouver le bloc %u dans le fichier « %s » : %m"
 
-#: storage/ipc/shmem.c:346
-#: storage/ipc/shmem.c:399
+#: storage/smgr/md.c:479
 #, c-format
-msgid "not enough shared memory for data structure \"%s\" (%lu bytes requested)"
-msgstr "pas assez de mémoire partagée pour la structure de données « %s » (%lu octets demandés)"
+msgid "could not extend file \"%s\": %m"
+msgstr "n'a pas pu étendre le fichier « %s » : %m"
 
-#: storage/ipc/shmem.c:365
+#: storage/smgr/md.c:481
+#: storage/smgr/md.c:488
+#: storage/smgr/md.c:737
+msgid "Check free disk space."
+msgstr "Vérifiez l'espace disque disponible."
+
+#: storage/smgr/md.c:485
 #, c-format
-msgid "could not create ShmemIndex entry for data structure \"%s\""
-msgstr "n'a pas pu créer l'entrée ShmemIndex pour la structure de données « %s »"
+msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
+msgstr ""
+"n'a pas pu étendre le fichier « %s » : a écrit seulement %d octets sur %d\n"
+"au bloc %u"
 
-#: storage/ipc/shmem.c:380
+#: storage/smgr/md.c:653
 #, c-format
-msgid "ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, actual %lu"
-msgstr "La taille de l'entrée shmemIndex est mauvaise pour la structure de données « %s » : %lu obtenu, %lu attendu"
+msgid "could not read block %u in file \"%s\": %m"
+msgstr "n'a pas pu lire le bloc %u dans le fichier « %s » : %m"
 
-#: storage/ipc/shmem.c:427
-#: storage/ipc/shmem.c:446
-msgid "requested shared memory size overflows size_t"
-msgstr "la taille de la mémoire partagée demandée dépasse size_t"
+#: storage/smgr/md.c:669
+#, c-format
+msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
+msgstr ""
+"n'a pas pu lire le bloc %u du fichier « %s » : a lu seulement %d octets\n"
+"sur %d"
+
+#: storage/smgr/md.c:728
+#, c-format
+msgid "could not write block %u in file \"%s\": %m"
+msgstr "n'a pas pu écrire le bloc %u dans le fichier « %s » : %m"
+
+#: storage/smgr/md.c:733
+#, c-format
+msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
+msgstr ""
+"n'a pas pu écrire le bloc %u du fichier « %s » : a seulement écrit %d\n"
+"octets sur %d"
+
+#: storage/smgr/md.c:831
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
+msgstr "n'a pas pu tronquer le fichier « %s » en %u blocs : il y a seulement %u blocs"
+
+#: storage/smgr/md.c:880
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: %m"
+msgstr "n'a pas pu tronquer le fichier « %s » en %u blocs : %m"
+
+#: storage/smgr/md.c:1134
+#, c-format
+msgid "could not fsync file \"%s\" but retrying: %m"
+msgstr ""
+"n'a pas pu synchroniser sur disque (fsync) le fichier « %s », nouvelle\n"
+"tentative : %m"
 
-#: storage/large_object/inv_api.c:550
-#: storage/large_object/inv_api.c:747
+#: storage/smgr/md.c:1276
+msgid "could not forward fsync request because request queue is full"
+msgstr "n'a pas pu envoyer la requête fsync car la queue des requêtes est pleine"
+
+#: storage/smgr/md.c:1646
+#, c-format
+msgid "could not open file \"%s\" (target block %u): %m"
+msgstr "n'a pas pu ouvrir le fichier « %s » (bloc cible %u) : %m"
+
+#: storage/smgr/md.c:1668
+#, c-format
+msgid "could not seek to end of file \"%s\": %m"
+msgstr "n'a pas pu trouver la fin du fichier « %s » : %m"
+
+#: storage/large_object/inv_api.c:555
+#: storage/large_object/inv_api.c:752
 #, c-format
 msgid "large object %u was not opened for writing"
 msgstr "le « Large Object » %u n'a pas été ouvert en écriture"
 
-#: storage/large_object/inv_api.c:557
-#: storage/large_object/inv_api.c:754
+#: storage/large_object/inv_api.c:562
+#: storage/large_object/inv_api.c:759
 #, c-format
 msgid "large object %u was already dropped"
 msgstr "le « Large Object » %u a déjà été supprimé"
@@ -10003,115 +10446,184 @@ msgstr "Bloquage mortel d
 msgid "See server log for query details."
 msgstr "Voir les journaux applicatifs du serveur pour les détails sur la requête."
 
-#: storage/lmgr/lmgr.c:717
+#: storage/lmgr/lmgr.c:720
 #, c-format
 msgid "relation %u of database %u"
 msgstr "relation %u de la base de données %u"
 
-#: storage/lmgr/lmgr.c:723
+#: storage/lmgr/lmgr.c:726
 #, c-format
 msgid "extension of relation %u of database %u"
 msgstr "extension de la relation %u de la base de données %u"
 
-#: storage/lmgr/lmgr.c:729
+#: storage/lmgr/lmgr.c:732
 #, c-format
 msgid "page %u of relation %u of database %u"
 msgstr "page %u de la relation %u de la base de données %u"
 
-#: storage/lmgr/lmgr.c:736
+#: storage/lmgr/lmgr.c:739
 #, c-format
 msgid "tuple (%u,%u) of relation %u of database %u"
 msgstr "ligne (%u,%u) de la relation %u de la base de données %u"
 
-#: storage/lmgr/lmgr.c:744
+#: storage/lmgr/lmgr.c:747
 #, c-format
 msgid "transaction %u"
 msgstr "transaction %u"
 
-#: storage/lmgr/lmgr.c:749
+#: storage/lmgr/lmgr.c:752
 #, c-format
 msgid "virtual transaction %d/%u"
 msgstr "transaction virtuelle %d/%u"
 
-#: storage/lmgr/lmgr.c:755
+#: storage/lmgr/lmgr.c:758
 #, c-format
 msgid "object %u of class %u of database %u"
 msgstr "objet %u de la classe %u de la base de données %u"
 
-#: storage/lmgr/lmgr.c:763
+#: storage/lmgr/lmgr.c:766
 #, c-format
 msgid "user lock [%u,%u,%u]"
 msgstr "verrou utilisateur [%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:770
+#: storage/lmgr/lmgr.c:773
 #, c-format
 msgid "advisory lock [%u,%u,%u,%u]"
 msgstr "verrou informatif [%u,%u,%u,%u]"
 
-#: storage/lmgr/lmgr.c:778
+#: storage/lmgr/lmgr.c:781
 #, c-format
 msgid "unrecognized locktag type %d"
 msgstr "type locktag non reconnu %d"
 
-#: storage/lmgr/lock.c:516
+#: storage/lmgr/lock.c:517
 #, c-format
 msgid "cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr ""
 "ne peut pas acquérir le mode de verrou %s sur les objets de base de données\n"
 "alors que la restauration est en cours"
 
-#: storage/lmgr/lock.c:518
+#: storage/lmgr/lock.c:519
 msgid "Only RowExclusiveLock or less can be acquired on database objects during recovery."
 msgstr ""
 "Seuls RowExclusiveLock et les verrous inférieurs peuvent être acquis sur les\n"
 "objets d'une base pendant une restauration."
 
-#: storage/lmgr/lock.c:630
-#: storage/lmgr/lock.c:699
-#: storage/lmgr/lock.c:2512
-#: storage/lmgr/lock.c:2577
+#: storage/lmgr/lock.c:632
+#: storage/lmgr/lock.c:701
+#: storage/lmgr/lock.c:2543
+#: storage/lmgr/lock.c:2608
 msgid "You might need to increase max_locks_per_transaction."
 msgstr "Vous pourriez avoir besoin d'augmenter max_locks_per_transaction."
 
-#: storage/lmgr/lock.c:2133
+#: storage/lmgr/lock.c:2164
 msgid "Not enough memory for reassigning the prepared transaction's locks."
 msgstr "Pas assez de mémoire pour réaffecter les verrous des transactions préparées."
 
-#: storage/lmgr/proc.c:1006
+#: storage/lmgr/proc.c:1046
 #: utils/adt/misc.c:102
 #, c-format
 msgid "could not send signal to process %d: %m"
 msgstr "n'a pas pu envoyer le signal au processus %d : %m"
 
-#: storage/lmgr/proc.c:1040
+#: storage/lmgr/proc.c:1080
 #, c-format
 msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
 msgstr ""
 "le processus %d a évité un verrou mortel pour %s sur %s en modifiant l'ordre\n"
 "de la queue après %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1052
+#: storage/lmgr/proc.c:1092
 #, c-format
 msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr ""
 "le processus %d a détecté un verrou mortel alors qu'il était en attente de\n"
 "%s sur %s après %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1058
+#: storage/lmgr/proc.c:1098
 #, c-format
 msgid "process %d still waiting for %s on %s after %ld.%03d ms"
 msgstr "le processus %d est toujours en attente de %s sur %s après %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1062
+#: storage/lmgr/proc.c:1102
 #, c-format
 msgid "process %d acquired %s on %s after %ld.%03d ms"
 msgstr "le processus %d a acquis %s sur %s après %ld.%03d ms"
 
-#: storage/lmgr/proc.c:1078
+#: storage/lmgr/proc.c:1118
 #, c-format
 msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
 msgstr "le processus %d a échoué pour l'acquisition de %s sur %s après %ld.%03d ms"
 
+#: storage/lmgr/predicate.c:665
+msgid "not enough elements in RWConflictPool to record a read/write conflict"
+msgstr "pas assez d'éléments dans RWConflictPool pour enregistrer un conflit en lecture/écriture"
+
+#: storage/lmgr/predicate.c:666
+#: storage/lmgr/predicate.c:694
+msgid "You might need to run fewer transactions at a time or increase max_connections."
+msgstr ""
+"Il est possible que vous ayez à exécuter moins de transactions à la fois\n"
+"ou d'augmenter max_connections."
+
+#: storage/lmgr/predicate.c:693
+msgid "not enough elements in RWConflictPool to record a potential read/write conflict"
+msgstr "pas assez d'éléments dans RWConflictPool pour enregistrer un conflit en lecture/écriture potentiel"
+
+#: storage/lmgr/predicate.c:898
+msgid "memory for serializable conflict tracking is nearly exhausted"
+msgstr "la mémoire pour tracer les conflits sérialisables est pratiquement pleine"
+
+#: storage/lmgr/predicate.c:899
+msgid "There might be an idle transaction or a forgotten prepared transaction causing this."
+msgstr ""
+"Il pourait y avoir une transaction en attente ou une transaction préparée\n"
+"oubliée causant cela."
+
+#: storage/lmgr/predicate.c:1181
+#: storage/lmgr/predicate.c:1253
+#, c-format
+msgid "not enough shared memory for elements of data structure \"%s\" (%lu bytes requested)"
+msgstr ""
+"pas assez de mémoire partagée pour les éléments de la structure de données\n"
+"« %s » (%lu octets demandés)"
+
+#: storage/lmgr/predicate.c:1536
+msgid "deferrable snapshot was unsafe; trying a new one"
+msgstr "l'image déferrable est non sûre ; tentative avec une nouvelle image"
+
+#: storage/lmgr/predicate.c:2234
+#: storage/lmgr/predicate.c:2249
+#: storage/lmgr/predicate.c:3624
+msgid "You might need to increase max_pred_locks_per_transaction."
+msgstr "Vous pourriez avoir besoin d'augmenter max_pred_locks_per_transaction."
+
+#: storage/lmgr/predicate.c:3778
+#: storage/lmgr/predicate.c:3867
+#: storage/lmgr/predicate.c:3875
+#: storage/lmgr/predicate.c:3914
+#: storage/lmgr/predicate.c:4153
+#: storage/lmgr/predicate.c:4491
+#: storage/lmgr/predicate.c:4503
+#: storage/lmgr/predicate.c:4545
+#: storage/lmgr/predicate.c:4583
+msgid "could not serialize access due to read/write dependencies among transactions"
+msgstr ""
+"n'a pas pu sérialiser un accès à cause des dépendances de lecture/écriture\n"
+"parmi les transactions"
+
+#: storage/lmgr/predicate.c:3780
+#: storage/lmgr/predicate.c:3869
+#: storage/lmgr/predicate.c:3877
+#: storage/lmgr/predicate.c:3916
+#: storage/lmgr/predicate.c:4155
+#: storage/lmgr/predicate.c:4493
+#: storage/lmgr/predicate.c:4505
+#: storage/lmgr/predicate.c:4547
+#: storage/lmgr/predicate.c:4585
+msgid "The transaction might succeed if retried."
+msgstr "La transaction pourrait réussir après une nouvelle tentative."
+
 #: storage/page/bufpage.c:143
 #: storage/page/bufpage.c:390
 #: storage/page/bufpage.c:623
@@ -10137,950 +10649,1293 @@ msgstr "longueurs d'
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "pointeur d'élément corrompu : décalage = %u, taille = %u"
 
-#: nodes/nodeFuncs.c:110
-#: nodes/nodeFuncs.c:136
-#: parser/parse_coerce.c:1568
-#: parser/parse_coerce.c:1585
-#: parser/parse_coerce.c:1643
-#: parser/parse_expr.c:1606
-#: parser/parse_func.c:373
-#: parser/parse_oper.c:983
+#: main/main.c:237
 #, c-format
-msgid "could not find array type for data type %s"
-msgstr "n'a pas pu trouver le type array pour le type de données %s"
-
-#: optimizer/plan/initsplan.c:585
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer join"
-msgstr ""
-"SELECT FOR UPDATE/SHARE ne peut être appliqué sur le côté possiblement NULL\n"
-"d'une jointure externe"
-
-#: optimizer/plan/planner.c:947
-#: parser/analyze.c:1205
-#: parser/analyze.c:1393
-#: parser/analyze.c:2035
-msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
-msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec UNION/INTERSECT/EXCEPT"
+msgid "%s: setsysinfo failed: %s\n"
+msgstr "%s : setsysinfo a échoué : %s\n"
 
-#: optimizer/plan/planner.c:2215
-msgid "could not implement GROUP BY"
-msgstr "n'a pas pu implanté GROUP BY"
+#: main/main.c:259
+#, c-format
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s : WSAStartup a échoué : %d\n"
 
-#: optimizer/plan/planner.c:2216
-#: optimizer/plan/planner.c:2385
-#: optimizer/prep/prepunion.c:769
-msgid "Some of the datatypes only support hashing, while others only support sorting."
+#: main/main.c:278
+#, c-format
+msgid ""
+"%s is the PostgreSQL server.\n"
+"\n"
 msgstr ""
-"Certains des types de données supportent seulement le hachage,\n"
-"alors que les autres supportent seulement le tri."
+"%s est le serveur PostgreSQL.\n"
+"\n"
 
-#: optimizer/plan/planner.c:2384
-msgid "could not implement DISTINCT"
-msgstr "n'a pas pu implanté DISTINCT"
+#: main/main.c:279
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
+msgstr ""
+"Usage :\n"
+"  %s [OPTION]...\n"
+"\n"
 
-#: optimizer/plan/planner.c:2828
-msgid "could not implement window PARTITION BY"
-msgstr "n'a pas pu implanter PARTITION BY de window"
+#: main/main.c:280
+#, c-format
+msgid "Options:\n"
+msgstr "Options :\n"
 
-#: optimizer/plan/planner.c:2829
-msgid "Window partitioning columns must be of sortable datatypes."
+#: main/main.c:282
+#, c-format
+msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr ""
-"Les colonnes de partitionnement de window doivent être d'un type de données\n"
-"triables."
+"  -A 1|0             active/désactive la vérification des limites (assert) à\n"
+"                     l'exécution\n"
 
-#: optimizer/plan/planner.c:2833
-msgid "could not implement window ORDER BY"
-msgstr "n'a pas pu implanter ORDER BY dans le window"
+#: main/main.c:284
+#, c-format
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B NBUFFERS        nombre de tampons partagés\n"
 
-#: optimizer/plan/planner.c:2834
-msgid "Window ordering columns must be of sortable datatypes."
-msgstr "Les colonnes de tri de la window doivent être d'un type de données triable."
+#: main/main.c:285
+#, c-format
+msgid "  -c NAME=VALUE   set run-time parameter\n"
+msgstr "  -c NOM=VALEUR      configure un paramètre d'exécution\n"
 
-#: optimizer/util/clauses.c:4030
+#: main/main.c:286
 #, c-format
-msgid "SQL function \"%s\" during inlining"
-msgstr "fonction SQL « %s » durant « inlining »"
+msgid "  -d 1-5          debugging level\n"
+msgstr "  -d 1-5             niveau de débogage\n"
 
-#: optimizer/prep/prepunion.c:374
-msgid "could not implement recursive UNION"
-msgstr "n'a pas pu implanté le UNION récursif"
+#: main/main.c:287
+#, c-format
+msgid "  -D DATADIR      database directory\n"
+msgstr "  -D REPDONNEES      répertoire de la base de données\n"
 
-#: optimizer/prep/prepunion.c:375
-msgid "All column datatypes must be hashable."
-msgstr "Tous les types de données colonnes doivent être hachables."
+#: main/main.c:288
+#, c-format
+msgid "  -e              use European date input format (DMY)\n"
+msgstr "  -e                 utilise le format de saisie européen des dates (DMY)\n"
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:768
+#: main/main.c:289
 #, c-format
-msgid "could not implement %s"
-msgstr "n'a pas pu implanté %s"
+msgid "  -F              turn fsync off\n"
+msgstr "  -F                 désactive fsync\n"
 
-#: parser/scansup.c:190
+#: main/main.c:290
 #, c-format
-msgid "identifier \"%s\" will be truncated to \"%s\""
-msgstr "l'identifiant « %s » sera tronqué en « %s »"
+msgid "  -h HOSTNAME     host name or IP address to listen on\n"
+msgstr "  -h NOMHOTE         nom d'hôte ou adresse IP à écouter\n"
 
-#: parser/analyze.c:450
-msgid "INSERT ... SELECT cannot specify INTO"
-msgstr "INSERT ... SELECT ne peut pas avoir INTO"
+#: main/main.c:291
+#, c-format
+msgid "  -i              enable TCP/IP connections\n"
+msgstr "  -i                 active les connexions TCP/IP\n"
 
-#: parser/analyze.c:552
-#: parser/analyze.c:977
-msgid "VALUES lists must all be the same length"
-msgstr "les listes VALUES doivent toutes être de la même longueur"
+#: main/main.c:292
+#, c-format
+msgid "  -k DIRECTORY    Unix-domain socket location\n"
+msgstr "  -k REPERTOIRE      emplacement des sockets de domaine Unix\n"
 
-#: parser/analyze.c:573
-#: parser/analyze.c:1082
-msgid "VALUES must not contain table references"
-msgstr "VALUES ne doit pas contenir de références de table"
+#: main/main.c:294
+#, c-format
+msgid "  -l              enable SSL connections\n"
+msgstr "  -l                 active les connexions SSL\n"
 
-#: parser/analyze.c:587
-#: parser/analyze.c:1096
-msgid "VALUES must not contain OLD or NEW references"
-msgstr "VALUES ne doit pas contenir des références à OLD et NEW"
+#: main/main.c:296
+#, c-format
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N MAX-CONNECT     nombre maximum de connexions simultanées\n"
 
-#: parser/analyze.c:588
-#: parser/analyze.c:1097
-msgid "Use SELECT ... UNION ALL ... instead."
+#: main/main.c:297
+#, c-format
+msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgstr "  -o OPTIONS         passe « OPTIONS » à chaque processus serveur (obsolète)\n"
+
+#: main/main.c:298
+#, c-format
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p PORT            numéro du port à écouter\n"
+
+#: main/main.c:299
+#, c-format
+msgid "  -s              show statistics after each query\n"
+msgstr "  -s                 affiche les statistiques après chaque requête\n"
+
+#: main/main.c:300
+#, c-format
+msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
+msgstr "  -S WORK-MEM        configure la mémoire pour les tris (en Ko)\n"
+
+#: main/main.c:301
+#, c-format
+msgid "  --NAME=VALUE    set run-time parameter\n"
+msgstr "  -c NOM=VALEUR      configure un paramètre d'exécution\n"
+
+#: main/main.c:302
+#, c-format
+msgid "  --describe-config  describe configuration parameters, then exit\n"
+msgstr "  --describe-config  décrit les paramètres de configuration, puis quitte\n"
+
+#: main/main.c:303
+#, c-format
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help             affiche cette aide, puis quitte\n"
+
+#: main/main.c:304
+#, c-format
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version          affiche la version, puis quitte\n"
+
+#: main/main.c:306
+#, c-format
+msgid ""
+"\n"
+"Developer options:\n"
+msgstr ""
+"\n"
+"Options pour le développeur :\n"
+
+#: main/main.c:307
+#, c-format
+msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
+msgstr "  -f s|i|n|m|h       interdit l'utilisation de certains types de plan\n"
+
+#: main/main.c:308
+#, c-format
+msgid "  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr ""
+"  -n                 ne réinitialise pas la mémoire partagée après un arrêt\n"
+"                     brutal\n"
+
+#: main/main.c:309
+#, c-format
+msgid "  -O              allow system table structure changes\n"
+msgstr ""
+"  -O                 autorise les modifications de structure des tables\n"
+"                     système\n"
+
+#: main/main.c:310
+#, c-format
+msgid "  -P              disable system indexes\n"
+msgstr "  -P                 désactive les index système\n"
+
+#: main/main.c:311
+#, c-format
+msgid "  -t pa|pl|ex     show timings after each query\n"
+msgstr "  -t pa|pl|ex     affiche les temps pour chaque requête\n"
+
+#: main/main.c:312
+#, c-format
+msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
+msgstr ""
+"  -T                 envoie SIGSTOP à tous les processus serveur si l'un\n"
+"                     d'entre eux meurt\n"
+
+#: main/main.c:313
+#, c-format
+msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
+msgstr ""
+"  -W NUM             attends NUM secondes pour permettre l'attache d'un\n"
+"                     débogueur\n"
+
+#: main/main.c:315
+#, c-format
+msgid ""
+"\n"
+"Options for single-user mode:\n"
+msgstr ""
+"\n"
+"Options pour le mode mono-utilisateur :\n"
+
+#: main/main.c:316
+#, c-format
+msgid "  --single        selects single-user mode (must be first argument)\n"
+msgstr ""
+"  --single           sélectionne le mode mono-utilisateur (doit être le\n"
+"                     premier argument)\n"
+
+#: main/main.c:317
+#, c-format
+msgid "  DBNAME          database name (defaults to user name)\n"
+msgstr "  NOMBASE            nom de la base (par défaut, celui de l'utilisateur)\n"
+
+#: main/main.c:318
+#, c-format
+msgid "  -d 0-5          override debugging level\n"
+msgstr "  -d 0-5             surcharge le niveau de débogage\n"
+
+#: main/main.c:319
+#, c-format
+msgid "  -E              echo statement before execution\n"
+msgstr "  -E                 affiche la requête avant de l'exécuter\n"
+
+#: main/main.c:320
+#, c-format
+msgid "  -j              do not use newline as interactive query delimiter\n"
+msgstr ""
+"  -N                 n'utilise pas le retour à la ligne comme délimiteur de\n"
+"                     requête\n"
+
+#: main/main.c:321
+#: main/main.c:326
+#, c-format
+msgid "  -r FILENAME     send stdout and stderr to given file\n"
+msgstr "  -r FICHIER         envoie stdout et stderr dans le fichier indiqué\n"
+
+#: main/main.c:323
+#, c-format
+msgid ""
+"\n"
+"Options for bootstrapping mode:\n"
+msgstr ""
+"\n"
+"Options pour le mode « bootstrapping » :\n"
+
+#: main/main.c:324
+#, c-format
+msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
+msgstr ""
+"  --boot             sélectionne le mode « bootstrapping » (doit être le\n"
+"                     premier argument)\n"
+
+#: main/main.c:325
+#, c-format
+msgid "  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
+msgstr "  NOMBASE            nom de la base (argument obligatoire dans ce mode)\n"
+
+#: main/main.c:327
+#, c-format
+msgid "  -x NUM          internal use\n"
+msgstr "  -x NUM             utilisation interne\n"
+
+#: main/main.c:329
+#, c-format
+msgid ""
+"\n"
+"Please read the documentation for the complete list of run-time\n"
+"configuration settings and how to set them on the command line or in\n"
+"the configuration file.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Merci de lire la documentation pour la liste complète des paramètres de\n"
+"configuration à l'exécution et pour savoir comment les configurer à la\n"
+"ligne de commande ou dans le fichier de configuration.\n"
+"\n"
+"Rapportez les bogues à <pgsql-bugs@postgresql.org>.\n"
+
+#: main/main.c:343
+msgid ""
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"L'exécution du serveur PostgreSQL par l'utilisateur « root » n'est pas\n"
+"autorisée.\n"
+"Le serveur doit être lancé avec un utilisateur non privilégié pour empêcher\n"
+"tout problème possible de sécurité sur le serveur. Voir la documentation pour\n"
+"plus d'informations sur le lancement propre du serveur.\n"
+
+#: main/main.c:360
+#, c-format
+msgid "%s: real and effective user IDs must match\n"
+msgstr "%s : les identifiants réel et effectif de l'utilisateur doivent correspondre\n"
+
+#: main/main.c:367
+msgid ""
+"Execution of PostgreSQL by a user with administrative permissions is not\n"
+"permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromises.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"L'exécution du serveur PostgreSQL par un utilisateur doté de droits d'administrateur n'est pas permise.\n"
+"Le serveur doit être lancé avec un utilisateur non privilégié pour empêcher\n"
+"tout problème de sécurité sur le serveur. Voir la documentation pour\n"
+"plus d'informations sur le lancement propre du serveur.\n"
+
+#: main/main.c:388
+#, c-format
+msgid "%s: invalid effective UID: %d\n"
+msgstr "%s : UID effectif invalide : %d\n"
+
+#: main/main.c:401
+#, c-format
+msgid "%s: could not determine user name (GetUserName failed)\n"
+msgstr "%s : n'a pas pu déterminer le nom de l'utilisateur (GetUserName a échoué)\n"
+
+#: optimizer/prep/prepunion.c:385
+msgid "could not implement recursive UNION"
+msgstr "n'a pas pu implanté le UNION récursif"
+
+#: optimizer/prep/prepunion.c:386
+msgid "All column datatypes must be hashable."
+msgstr "Tous les types de données colonnes doivent être hachables."
+
+#. translator: %s is UNION, INTERSECT, or EXCEPT
+#: optimizer/prep/prepunion.c:790
+#, c-format
+msgid "could not implement %s"
+msgstr "n'a pas pu implanté %s"
+
+#: optimizer/prep/prepunion.c:791
+#: optimizer/plan/planner.c:2255
+#: optimizer/plan/planner.c:2427
+msgid "Some of the datatypes only support hashing, while others only support sorting."
+msgstr ""
+"Certains des types de données supportent seulement le hachage,\n"
+"alors que les autres supportent seulement le tri."
+
+#: optimizer/util/clauses.c:4165
+#, c-format
+msgid "SQL function \"%s\" during inlining"
+msgstr "fonction SQL « %s » durant « inlining »"
+
+#: optimizer/util/plancat.c:97
+msgid "cannot access temporary or unlogged relations during recovery"
+msgstr "ne peut pas accéder à des tables temporaires et non tracées lors de la restauration"
+
+#: optimizer/plan/initsplan.c:595
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer join"
+msgstr ""
+"SELECT FOR UPDATE/SHARE ne peut être appliqué sur le côté possiblement NULL\n"
+"d'une jointure externe"
+
+#: optimizer/plan/planner.c:959
+#: parser/analyze.c:1337
+#: parser/analyze.c:1534
+#: parser/analyze.c:2263
+msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
+msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec UNION/INTERSECT/EXCEPT"
+
+#: optimizer/plan/planner.c:2254
+msgid "could not implement GROUP BY"
+msgstr "n'a pas pu implanté GROUP BY"
+
+#: optimizer/plan/planner.c:2426
+msgid "could not implement DISTINCT"
+msgstr "n'a pas pu implanté DISTINCT"
+
+#: optimizer/plan/planner.c:2877
+msgid "could not implement window PARTITION BY"
+msgstr "n'a pas pu implanter PARTITION BY de window"
+
+#: optimizer/plan/planner.c:2878
+msgid "Window partitioning columns must be of sortable datatypes."
+msgstr ""
+"Les colonnes de partitionnement de window doivent être d'un type de données\n"
+"triables."
+
+#: optimizer/plan/planner.c:2882
+msgid "could not implement window ORDER BY"
+msgstr "n'a pas pu implanter ORDER BY dans le window"
+
+#: optimizer/plan/planner.c:2883
+msgid "Window ordering columns must be of sortable datatypes."
+msgstr "Les colonnes de tri de la window doivent être d'un type de données triable."
+
+#: optimizer/path/joinrels.c:673
+msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join conditions"
+msgstr ""
+"FULL JOIN est supporté seulement avec les conditions de jointures MERGE et de\n"
+"jointures HASH JOIN"
+
+#: parser/analyze.c:471
+msgid "INSERT ... SELECT cannot specify INTO"
+msgstr "INSERT ... SELECT ne peut pas avoir INTO"
+
+#: parser/analyze.c:564
+#: parser/analyze.c:1070
+msgid "VALUES lists must all be the same length"
+msgstr "les listes VALUES doivent toutes être de la même longueur"
+
+#: parser/analyze.c:606
+#: parser/analyze.c:1211
+msgid "VALUES must not contain table references"
+msgstr "VALUES ne doit pas contenir de références de table"
+
+#: parser/analyze.c:620
+#: parser/analyze.c:1225
+msgid "VALUES must not contain OLD or NEW references"
+msgstr "VALUES ne doit pas contenir des références à OLD et NEW"
+
+#: parser/analyze.c:621
+#: parser/analyze.c:1226
+msgid "Use SELECT ... UNION ALL ... instead."
 msgstr "Utilisez à la place SELECT ... UNION ALL ..."
 
-#: parser/analyze.c:698
-#: parser/analyze.c:1109
+#: parser/analyze.c:725
+#: parser/analyze.c:1238
 msgid "cannot use aggregate function in VALUES"
 msgstr "ne peut pas utiliser la fonction d'agrégat dans un VALUES"
 
-#: parser/analyze.c:704
-#: parser/analyze.c:1115
+#: parser/analyze.c:731
+#: parser/analyze.c:1244
 msgid "cannot use window function in VALUES"
 msgstr "ne peut pas utiliser la fonction window dans un VALUES"
 
-#: parser/analyze.c:736
+#: parser/analyze.c:765
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT a plus d'expressions que les colonnes cibles"
 
-#: parser/analyze.c:744
+#: parser/analyze.c:783
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT a plus de colonnes cibles que d'expressions"
 
-#: parser/analyze.c:993
+#: parser/analyze.c:787
+msgid "The insertion source is a row expression containing the same number of columns expected by the INSERT. Did you accidentally use extra parentheses?"
+msgstr ""
+"La source d'insertion est une expression de ligne contenant le même nombre\n"
+"de colonnes que celui attendu par INSERT. Auriez-vous utilisé des parenthèses\n"
+"supplémentaires ?"
+
+#: parser/analyze.c:1084
 msgid "DEFAULT can only appear in a VALUES list within INSERT"
 msgstr "DEFAULT peut seulement apparaître dans la liste VALUES comprise dans un INSERT"
 
-#: parser/analyze.c:1063
-#: parser/analyze.c:2183
+#: parser/analyze.c:1192
+#: parser/analyze.c:2414
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
 msgstr "SELECT FOR UPDATE/SHARE ne peut pas être appliqué à VALUES"
 
-#: parser/analyze.c:1316
+#: parser/analyze.c:1452
 msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
 msgstr "clause UNION/INTERSECT/EXCEPT ORDER BY invalide"
 
-#: parser/analyze.c:1317
+#: parser/analyze.c:1453
 msgid "Only result column names can be used, not expressions or functions."
 msgstr ""
 "Seuls les noms de colonnes résultats peuvent être utilisés, pas les\n"
 "expressions et les fonctions."
 
-#: parser/analyze.c:1318
+#: parser/analyze.c:1454
 msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
 msgstr "Ajouter l'expression/fonction à chaque SELECT, ou déplacer l'UNION dans une clause FROM."
 
-#: parser/analyze.c:1385
+#: parser/analyze.c:1526
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO est autorisé uniquement sur le premier SELECT d'un UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:1445
+#: parser/analyze.c:1586
 msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
 msgstr ""
 "L'instruction membre UNION/INTERSECT/EXCEPT ne peut pas faire référence à\n"
 "d'autres relations que celles de la requête de même niveau"
 
-#: parser/analyze.c:1530
+#: parser/analyze.c:1674
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "chaque requête %s doit avoir le même nombre de colonnes"
 
-#: parser/analyze.c:1722
+#: parser/analyze.c:1930
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS spécifie trop de noms de colonnes"
 
-#: parser/analyze.c:1772
+#: parser/analyze.c:1988
 msgid "cannot use aggregate function in UPDATE"
 msgstr "ne peut pas utiliser une fonction d'agrégat dans un UPDATE"
 
-#: parser/analyze.c:1778
+#: parser/analyze.c:1994
 msgid "cannot use window function in UPDATE"
 msgstr "ne peut pas utiliser une fonction window dans un UPDATE"
 
-#: parser/analyze.c:1885
+#: parser/analyze.c:2103
 msgid "cannot use aggregate function in RETURNING"
 msgstr "ne peut pas utiliser une fonction d'agrégat dans RETURNING"
 
-#: parser/analyze.c:1891
+#: parser/analyze.c:2109
 msgid "cannot use window function in RETURNING"
 msgstr "ne peut pas utiliser une fonction window dans RETURNING"
 
-#: parser/analyze.c:1910
+#: parser/analyze.c:2128
 msgid "RETURNING cannot contain references to other relations"
 msgstr "RETURNING ne doit pas contenir de références à d'autres relations"
 
-#: parser/analyze.c:1949
+#: parser/analyze.c:2167
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "ne peut pas spécifier à la fois SCROLL et NO SCROLL"
 
-#: parser/analyze.c:1963
+#: parser/analyze.c:2181
 msgid "DECLARE CURSOR cannot specify INTO"
 msgstr "DECLARE CURSOR ne peut pas spécifier INTO"
 
-#: parser/analyze.c:1971
+#: parser/analyze.c:2193
+msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
+msgstr "DECLARE CURSOR ne doit pas contenir des instructions de modification de données dans WITH"
+
+#: parser/analyze.c:2199
 msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE n'est pas supporté"
 
-#: parser/analyze.c:1972
+#: parser/analyze.c:2200
 msgid "Holdable cursors must be READ ONLY."
 msgstr "Les curseurs détenables doivent être en lecture seule (READ ONLY)."
 
-#: parser/analyze.c:1985
+#: parser/analyze.c:2213
 msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
 msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE n'est pas supporté"
 
-#: parser/analyze.c:1986
+#: parser/analyze.c:2214
 msgid "Insensitive cursors must be READ ONLY."
 msgstr "Les curseurs insensibles doivent être en lecture seule (READ ONLY)."
 
-#: parser/analyze.c:2039
+#: parser/analyze.c:2267
 msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
 msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec la clause DISTINCT"
 
-#: parser/analyze.c:2043
+#: parser/analyze.c:2271
 msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
 msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec la clause GROUP BY"
 
-#: parser/analyze.c:2047
+#: parser/analyze.c:2275
 msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
 msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec la clause HAVING"
 
-#: parser/analyze.c:2051
+#: parser/analyze.c:2279
 msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
 msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec les fonctions d'agrégats"
 
-#: parser/analyze.c:2055
+#: parser/analyze.c:2283
 msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
 msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé avec les fonctions window"
 
-#: parser/analyze.c:2059
+#: parser/analyze.c:2287
 msgid "SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the target list"
 msgstr ""
 "SELECT FOR UPDATE/SHARE n'est pas autorisé avec les fonctions renvoyant plusieurs lignes\n"
 "dans la liste cible"
 
-#: parser/analyze.c:2135
+#: parser/analyze.c:2366
 msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
 msgstr "SELECT FOR UPDATE/SHARE doit indiqué les noms de relation non qualifiés"
 
-#: parser/analyze.c:2165
+#: parser/analyze.c:2383
+#, c-format
+msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
+msgstr "SELECT FOR UPDATE/SHARE ne peut pas être utilisé avec une table distante « %s »"
+
+#: parser/analyze.c:2402
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
 msgstr "SELECT FOR UPDATE/SHARE ne peut pas être appliqué à une jointure"
 
-#: parser/analyze.c:2171
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
-msgstr "SELECT FOR UPDATE/SHARE ne peut pas être appliqué à NEW et OLD"
-
-#: parser/analyze.c:2177
+#: parser/analyze.c:2408
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
 msgstr "SELECT FOR UPDATE/SHARE ne peut pas être appliqué à une fonction"
 
-#: parser/analyze.c:2189
+#: parser/analyze.c:2420
 msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
 msgstr ""
 "SELECT FOR UPDATE/SHARE ne peut pas être appliqué à une requête\n"
 "WITH"
 
-#: parser/analyze.c:2203
+#: parser/analyze.c:2434
 #, c-format
 msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
 msgstr "la relation « %s » d'une clause FOR UPDATE/SHARE introuvable dans la clause FROM"
 
-#: parser/parse_agg.c:127
-#: parser/parse_oper.c:254
+#: parser/parse_agg.c:131
+#: parser/parse_oper.c:219
 #, c-format
 msgid "could not identify an ordering operator for type %s"
 msgstr "n'a pas pu identifier un opérateur de tri pour le type %s"
 
-#: parser/parse_agg.c:129
+#: parser/parse_agg.c:133
 msgid "Aggregates with DISTINCT must be able to sort their inputs."
 msgstr "Les agrégats avec DISTINCT doivent être capable de trier leur entrée."
 
-#: parser/parse_agg.c:170
+#: parser/parse_agg.c:174
 msgid "aggregate function calls cannot contain window function calls"
 msgstr ""
 "les appels à la fonction d'agrégat ne peuvent pas contenir des appels à la\n"
 "fonction window"
 
-#: parser/parse_agg.c:241
-#: parser/parse_clause.c:1620
+#: parser/parse_agg.c:245
+#: parser/parse_clause.c:1637
 #, c-format
 msgid "window \"%s\" does not exist"
 msgstr "le window « %s » n'existe pas"
 
-#: parser/parse_agg.c:331
+#: parser/parse_agg.c:336
 msgid "aggregates not allowed in WHERE clause"
 msgstr "agrégats non autorisés dans une clause WHERE"
 
-#: parser/parse_agg.c:337
+#: parser/parse_agg.c:342
 msgid "aggregates not allowed in JOIN conditions"
 msgstr "agrégats non autorisés dans une condition JOIN"
 
-#: parser/parse_agg.c:358
+#: parser/parse_agg.c:363
 msgid "aggregates not allowed in GROUP BY clause"
 msgstr "agrégats non autorisés dans une clause GROUP BY"
 
-#: parser/parse_agg.c:426
+#: parser/parse_agg.c:433
 msgid "aggregate functions not allowed in a recursive query's recursive term"
 msgstr ""
 "fonctions d'agrégat non autorisées dans le terme récursif de la requête\n"
 "récursive"
 
-#: parser/parse_agg.c:451
+#: parser/parse_agg.c:458
 msgid "window functions not allowed in WHERE clause"
 msgstr "fonctions window non autorisées dans une clause WHERE"
 
-#: parser/parse_agg.c:457
+#: parser/parse_agg.c:464
 msgid "window functions not allowed in JOIN conditions"
 msgstr "fonctions window non autorisées dans une condition JOIN"
 
-#: parser/parse_agg.c:463
+#: parser/parse_agg.c:470
 msgid "window functions not allowed in HAVING clause"
 msgstr "fonctions window non autorisées dans une clause WHERE"
 
-#: parser/parse_agg.c:476
+#: parser/parse_agg.c:483
 msgid "window functions not allowed in GROUP BY clause"
 msgstr "fonctions window non autorisées dans une clause GROUP BY"
 
-#: parser/parse_agg.c:495
-#: parser/parse_agg.c:508
+#: parser/parse_agg.c:502
+#: parser/parse_agg.c:515
 msgid "window functions not allowed in window definition"
 msgstr "fonctions window non autorisées dans une définition window"
 
-#: parser/parse_agg.c:630
+#: parser/parse_agg.c:673
 #, c-format
 msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
 msgstr "la colonne « %s.%s » doit apparaître dans la clause GROUP BY ou doit être utilisé dans une fonction d'agrégat"
 
-#: parser/parse_agg.c:636
+#: parser/parse_agg.c:679
 #, c-format
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr ""
 "la sous-requête utilise une colonne « %s.%s » non groupée dans la requête\n"
 "externe"
 
-#: parser/parse_clause.c:420
+#: parser/parse_clause.c:421
 #, c-format
 msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
 msgstr "la clause JOIN/ON se réfère à « %s », qui ne fait pas partie du JOIN"
 
-#: parser/parse_clause.c:501
+#: parser/parse_clause.c:502
 msgid "subquery in FROM cannot have SELECT INTO"
 msgstr "la sous-requête du FROM ne peut pas avoir de SELECT INTO"
 
-#: parser/parse_clause.c:523
+#: parser/parse_clause.c:524
 msgid "subquery in FROM cannot refer to other relations of same query level"
 msgstr ""
 "la sous-requête du FROM ne peut pas faire référence à d'autres relations\n"
 "dans le même niveau de la requête"
 
-#: parser/parse_clause.c:574
+#: parser/parse_clause.c:580
 msgid "function expression in FROM cannot refer to other relations of same query level"
 msgstr ""
 "l'expression de la fonction du FROM ne peut pas faire référence à d'autres\n"
 "relations sur le même niveau de la requête"
 
-#: parser/parse_clause.c:587
+#: parser/parse_clause.c:593
 msgid "cannot use aggregate function in function expression in FROM"
 msgstr ""
 "ne peut pas utiliser la fonction d'agrégat dans l'expression de la fonction\n"
 "du FROM"
 
-#: parser/parse_clause.c:594
+#: parser/parse_clause.c:600
 msgid "cannot use window function in function expression in FROM"
 msgstr ""
 "ne peut pas utiliser la fonction window dans l'expression de la fonction\n"
 "du FROM"
 
-#: parser/parse_clause.c:870
+#: parser/parse_clause.c:877
 #, c-format
 msgid "column name \"%s\" appears more than once in USING clause"
 msgstr "le nom de la colonne « %s » apparaît plus d'une fois dans la clause USING"
 
-#: parser/parse_clause.c:885
+#: parser/parse_clause.c:892
 #, c-format
 msgid "common column name \"%s\" appears more than once in left table"
 msgstr ""
 "le nom commun de la colonne « %s » apparaît plus d'une fois dans la table de\n"
 "gauche"
 
-#: parser/parse_clause.c:894
+#: parser/parse_clause.c:901
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in left table"
 msgstr ""
 "la colonne « %s » spécifiée dans la clause USING n'existe pas dans la table\n"
 "de gauche"
 
-#: parser/parse_clause.c:908
+#: parser/parse_clause.c:915
 #, c-format
 msgid "common column name \"%s\" appears more than once in right table"
 msgstr ""
 "le nom commun de la colonne « %s » apparaît plus d'une fois dans la table de\n"
 " droite"
 
-#: parser/parse_clause.c:917
+#: parser/parse_clause.c:924
 #, c-format
 msgid "column \"%s\" specified in USING clause does not exist in right table"
 msgstr ""
 "la colonne « %s » spécifiée dans la clause USING n'existe pas dans la table\n"
 "de droite"
 
-#: parser/parse_clause.c:974
+#: parser/parse_clause.c:981
 #, c-format
 msgid "column alias list for \"%s\" has too many entries"
 msgstr "la liste d'alias de colonnes pour « %s » a beaucoup trop d'entrées"
 
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1211
+#: parser/parse_clause.c:1228
 #, c-format
 msgid "argument of %s must not contain variables"
 msgstr "l'argument de « %s » ne doit pas contenir de variables"
 
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1222
+#: parser/parse_clause.c:1239
 #, c-format
 msgid "argument of %s must not contain aggregate functions"
 msgstr "l'argument de %s ne doit pas contenir de fonctions d'agrégats"
 
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1233
+#: parser/parse_clause.c:1250
 #, c-format
 msgid "argument of %s must not contain window functions"
 msgstr "l'argument de %s ne doit pas contenir des fonctions window"
 
 #. translator: first %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1350
+#: parser/parse_clause.c:1367
 #, c-format
 msgid "%s \"%s\" is ambiguous"
 msgstr "%s « %s » est ambigu"
 
 #. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1374
+#: parser/parse_clause.c:1391
 #, c-format
 msgid "non-integer constant in %s"
 msgstr "constante non entière dans %s"
 
 #. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1392
+#: parser/parse_clause.c:1409
 #, c-format
 msgid "%s position %d is not in select list"
 msgstr "%s, à la position %d, n'est pas dans la liste SELECT"
 
-#: parser/parse_clause.c:1608
+#: parser/parse_clause.c:1625
 #, c-format
 msgid "window \"%s\" is already defined"
 msgstr "le window « %s » est déjà définie"
 
-#: parser/parse_clause.c:1662
+#: parser/parse_clause.c:1679
 #, c-format
 msgid "cannot override PARTITION BY clause of window \"%s\""
 msgstr "n'a pas pu surcharger la clause PARTITION BY de window « %s »"
 
-#: parser/parse_clause.c:1674
+#: parser/parse_clause.c:1691
 #, c-format
 msgid "cannot override ORDER BY clause of window \"%s\""
 msgstr "n'a pas pu surcharger la clause ORDER BY de window « %s »"
 
-#: parser/parse_clause.c:1696
+#: parser/parse_clause.c:1713
 #, c-format
 msgid "cannot override frame clause of window \"%s\""
 msgstr "ne peut pas surcharger la frame clause du window « %s »"
 
-#: parser/parse_clause.c:1762
+#: parser/parse_clause.c:1779
 msgid "in an aggregate with DISTINCT, ORDER BY expressions must appear in argument list"
 msgstr ""
 "dans un agrégat avec DISTINCT, les expressions ORDER BY doivent apparaître\n"
 "dans la liste d'argument"
 
-#: parser/parse_clause.c:1763
+#: parser/parse_clause.c:1780
 msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
 msgstr ""
 "pour SELECT DISTINCT, ORDER BY, les expressions doivent apparaître dans la\n"
 "liste SELECT"
 
-#: parser/parse_clause.c:1849
-#: parser/parse_clause.c:1881
+#: parser/parse_clause.c:1866
+#: parser/parse_clause.c:1898
 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
 msgstr ""
 "les expressions SELECT DISTINCT ON doivent correspondre aux expressions\n"
 "ORDER BY initiales"
 
-#: parser/parse_clause.c:2000
+#: parser/parse_clause.c:2020
 #, c-format
 msgid "operator %s is not a valid ordering operator"
 msgstr "l'opérateur %s n'est pas un opérateur de tri valide"
 
-#: parser/parse_clause.c:2002
+#: parser/parse_clause.c:2022
 msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
 msgstr ""
 "Les opérateurs de tri doivent être les membres « < » ou « > » des familles\n"
 "d'opérateurs btree."
 
-#: parser/parse_coerce.c:841
-#: parser/parse_coerce.c:870
-#: parser/parse_coerce.c:888
-#: parser/parse_coerce.c:903
-#: parser/parse_expr.c:1640
-#: parser/parse_expr.c:2079
+#: parser/parse_coerce.c:906
+#: parser/parse_coerce.c:936
+#: parser/parse_coerce.c:954
+#: parser/parse_coerce.c:969
+#: parser/parse_expr.c:1667
+#: parser/parse_expr.c:2109
+#: parser/parse_target.c:829
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "ne peut pas convertir le type %s en %s"
 
-#: parser/parse_coerce.c:873
+#: parser/parse_coerce.c:939
 msgid "Input has too few columns."
 msgstr "L'entrée n'a pas assez de colonnes."
 
-#: parser/parse_coerce.c:891
+#: parser/parse_coerce.c:957
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "ne peut pas convertir le type %s en %s dans la colonne %d"
 
-#: parser/parse_coerce.c:906
+#: parser/parse_coerce.c:972
 msgid "Input has too many columns."
 msgstr "L'entrée a trop de colonnes."
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:949
+#: parser/parse_coerce.c:1015
 #, c-format
 msgid "argument of %s must be type boolean, not type %s"
 msgstr "l'argument de %s doit être de type booléen, et non du type %s"
 
 #. translator: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:959
-#: parser/parse_coerce.c:1008
+#: parser/parse_coerce.c:1025
+#: parser/parse_coerce.c:1074
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "l'argument de %s ne doit pas renvoyer un ensemble"
 
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:996
+#: parser/parse_coerce.c:1062
 #, c-format
 msgid "argument of %s must be type %s, not type %s"
 msgstr "l'argument de %s doit être de type %s, et non du type %s"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1129
+#: parser/parse_coerce.c:1195
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "les %s types %s et %s ne peuvent pas correspondre"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1196
+#: parser/parse_coerce.c:1262
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s n'a pas pu convertir le type %s en %s"
 
-#: parser/parse_coerce.c:1437
+#: parser/parse_coerce.c:1513
 msgid "arguments declared \"anyelement\" are not all alike"
 msgstr "les arguments déclarés « anyelement » ne sont pas tous identiques"
 
-#: parser/parse_coerce.c:1456
+#: parser/parse_coerce.c:1533
 msgid "arguments declared \"anyarray\" are not all alike"
 msgstr "les arguments déclarés « anyarray » ne sont pas tous identiques"
 
-#: parser/parse_coerce.c:1485
-#: parser/parse_coerce.c:1629
-#: parser/parse_coerce.c:1660
+#: parser/parse_coerce.c:1562
+#: parser/parse_coerce.c:1710
+#: parser/parse_coerce.c:1742
 #, c-format
 msgid "argument declared \"anyarray\" is not an array but type %s"
 msgstr "l'argument déclaré « anyarray » n'est pas un tableau mais est du type %s"
 
-#: parser/parse_coerce.c:1501
+#: parser/parse_coerce.c:1578
 msgid "argument declared \"anyarray\" is not consistent with argument declared \"anyelement\""
 msgstr ""
 "l'argument déclaré « anyarray » n'est pas cohérent avec l'argument déclaré\n"
 "« anyelement »"
 
-#: parser/parse_coerce.c:1519
+#: parser/parse_coerce.c:1596
 msgid "could not determine polymorphic type because input has type \"unknown\""
 msgstr ""
 "n'a pas pu déterminer le type polymorphique car l'entrée dispose du type\n"
 "« unknown »"
 
-#: parser/parse_coerce.c:1529
+#: parser/parse_coerce.c:1606
 #, c-format
 msgid "type matched to anynonarray is an array type: %s"
 msgstr "le type déclaré anynonarray est un type tableau : %s"
 
-#: parser/parse_coerce.c:1539
+#: parser/parse_coerce.c:1616
 #, c-format
 msgid "type matched to anyenum is not an enum type: %s"
 msgstr "le type déclaré anyenum n'est pas un type enum : %s"
 
-#: parser/parse_cte.c:40
+#: parser/parse_cte.c:42
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within its non-recursive term"
 msgstr ""
 "la référence récursive à la requête « %s » ne doit pas apparaître à\n"
 "l'intérieur de son terme non récursif"
 
-#: parser/parse_cte.c:42
+#: parser/parse_cte.c:44
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within a subquery"
 msgstr ""
 "la référence récursive à la requête « %s » ne doit pas apparaître à\n"
 "l'intérieur d'une sous-requête"
 
-#: parser/parse_cte.c:44
+#: parser/parse_cte.c:46
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within an outer join"
 msgstr ""
 "la référence récursive à la requête « %s » ne doit pas apparaître à\n"
 "l'intérieur d'une jointure externe"
 
-#: parser/parse_cte.c:46
+#: parser/parse_cte.c:48
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
 msgstr ""
 "la référence récursive à la requête « %s » ne doit pas apparaître à\n"
 "l'intérieur d'INTERSECT"
 
-#: parser/parse_cte.c:48
+#: parser/parse_cte.c:50
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
 msgstr ""
 "la référence récursive à la requête « %s » ne doit pas apparaître à\n"
 "l'intérieur d'EXCEPT"
 
-#: parser/parse_cte.c:130
+#: parser/parse_cte.c:132
 #, c-format
 msgid "WITH query name \"%s\" specified more than once"
 msgstr "le nom de la requête WITH « %s » est spécifié plus d'une fois"
 
-#: parser/parse_cte.c:247
+#: parser/parse_cte.c:259
 msgid "subquery in WITH cannot have SELECT INTO"
 msgstr "la sous-requête du WITH ne peut pas avoir de SELECT INTO"
 
-#: parser/parse_cte.c:288
+#: parser/parse_cte.c:271
+msgid "WITH clause containing a data-modifying statement must be at the top level"
+msgstr ""
+"la clause WITH contenant une instruction de modification de données doit être\n"
+"au plus haut niveau"
+
+#: parser/parse_cte.c:320
 #, c-format
 msgid "recursive query \"%s\" column %d has type %s in non-recursive term but type %s overall"
 msgstr ""
 "dans la requête récursive « %s », la colonne %d a le type %s dans le terme non\n"
 "récursif mais le type global %s"
 
-#: parser/parse_cte.c:294
+#: parser/parse_cte.c:326
 msgid "Cast the output of the non-recursive term to the correct type."
 msgstr "Convertit la sortie du terme non récursif dans le bon type."
 
-#: parser/parse_cte.c:376
+#: parser/parse_cte.c:331
+#, c-format
+msgid "recursive query \"%s\" column %d has collation \"%s\" in non-recursive term but collation \"%s\" overall"
+msgstr "requête récursive « %s » : la colonne %d a le collationnement « %s » dans un terme non récursifet un collationnement « %s » global"
+
+#: parser/parse_cte.c:335
+msgid "Use the COLLATE clause to set the collation of the non-recursive term."
+msgstr "Utilisez la clause COLLATE pour configurer le collationnement du terme non récursif."
+
+#: parser/parse_cte.c:426
 #, c-format
 msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr "la requête WITH « %s » a %d colonnes disponibles mais %d colonnes spécifiées"
 
-#: parser/parse_cte.c:556
+#: parser/parse_cte.c:606
 msgid "mutual recursion between WITH items is not implemented"
 msgstr "la récursion mutuelle entre des éléments WITH n'est pas implantée"
 
-#: parser/parse_cte.c:608
+#: parser/parse_cte.c:658
+#, c-format
+msgid "recursive query \"%s\" must not contain data-modifying statements"
+msgstr "la requête récursive « %s » ne doit pas contenir des instructions de modification de données"
+
+#: parser/parse_cte.c:666
 #, c-format
 msgid "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] recursive-term"
 msgstr ""
 "la requête récursive « %s » n'a pas la forme terme-non-récursive UNION [ALL]\n"
 "terme-récursive"
 
-#: parser/parse_cte.c:640
+#: parser/parse_cte.c:698
 msgid "ORDER BY in a recursive query is not implemented"
 msgstr "ORDER BY dans une requête récursive n'est pas implanté"
 
-#: parser/parse_cte.c:646
+#: parser/parse_cte.c:704
 msgid "OFFSET in a recursive query is not implemented"
 msgstr "OFFSET dans une requête récursive n'est pas implémenté"
 
-#: parser/parse_cte.c:652
+#: parser/parse_cte.c:710
 msgid "LIMIT in a recursive query is not implemented"
 msgstr "LIMIT dans une requête récursive n'est pas implémenté"
 
-#: parser/parse_cte.c:658
+#: parser/parse_cte.c:716
 msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
 msgstr "FOR UPDATE/SHARE dans une requête récursive n'est pas implémenté"
 
-#: parser/parse_cte.c:715
+#: parser/parse_cte.c:773
 #, c-format
 msgid "recursive reference to query \"%s\" must not appear more than once"
 msgstr "la référence récursive à la requête « %s » ne doit pas apparaître plus d'une fois"
 
-#: parser/parse_expr.c:358
-#: parser/parse_expr.c:751
+#: parser/parse_expr.c:364
+#: parser/parse_expr.c:757
 #, c-format
 msgid "column %s.%s does not exist"
 msgstr "la colonne %s.%s n'existe pas"
 
-#: parser/parse_expr.c:370
+#: parser/parse_expr.c:376
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "colonne « %s » introuvable pour le type de données %s"
 
-#: parser/parse_expr.c:376
+#: parser/parse_expr.c:382
 #, c-format
 msgid "could not identify column \"%s\" in record data type"
 msgstr "n'a pas pu identifier la colonne « %s » dans le type de données de l'enregistrement"
 
-#: parser/parse_expr.c:382
+#: parser/parse_expr.c:388
 #, c-format
 msgid "column notation .%s applied to type %s, which is not a composite type"
 msgstr "notation d'attribut .%s appliqué au type %s, qui n'est pas un type composé"
 
-#: parser/parse_expr.c:412
-#: parser/parse_target.c:600
+#: parser/parse_expr.c:418
+#: parser/parse_target.c:617
 msgid "row expansion via \"*\" is not supported here"
 msgstr "l'expansion de ligne via « * » n'est pas supporté ici"
 
-#: parser/parse_expr.c:735
+#: parser/parse_expr.c:741
 #: parser/parse_relation.c:478
 #: parser/parse_relation.c:551
-#: parser/parse_target.c:977
+#: parser/parse_target.c:1064
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la référence à la colonne « %s » est ambigu"
 
-#: parser/parse_expr.c:803
-#: parser/parse_param.c:108
-#: parser/parse_param.c:139
-#: parser/parse_param.c:195
-#: parser/parse_param.c:287
+#: parser/parse_expr.c:809
+#: parser/parse_param.c:109
+#: parser/parse_param.c:141
+#: parser/parse_param.c:198
+#: parser/parse_param.c:297
 #, c-format
 msgid "there is no parameter $%d"
 msgstr "Il n'existe pas de paramètres $%d"
 
-#: parser/parse_expr.c:1008
+#: parser/parse_expr.c:1018
 msgid "NULLIF requires = operator to yield boolean"
 msgstr "NULLIF requiert l'opérateur = pour comparer des booleéns"
 
-#: parser/parse_expr.c:1181
+#: parser/parse_expr.c:1197
 msgid "arguments of row IN must all be row expressions"
 msgstr "les arguments de la ligne IN doivent tous être des expressions de ligne"
 
-#: parser/parse_expr.c:1385
+#: parser/parse_expr.c:1411
 msgid "subquery cannot have SELECT INTO"
 msgstr "la sous-requête ne peut pas avoir de SELECT INTO"
 
-#: parser/parse_expr.c:1413
+#: parser/parse_expr.c:1439
 msgid "subquery must return a column"
 msgstr "la sous-requête doit renvoyer une colonne"
 
-#: parser/parse_expr.c:1420
+#: parser/parse_expr.c:1446
 msgid "subquery must return only one column"
 msgstr "la sous-requête doit renvoyer une seule colonne"
 
-#: parser/parse_expr.c:1479
+#: parser/parse_expr.c:1506
 msgid "subquery has too many columns"
 msgstr "la sous-requête a trop de colonnes"
 
-#: parser/parse_expr.c:1484
+#: parser/parse_expr.c:1511
 msgid "subquery has too few columns"
 msgstr "la sous-requête n'a pas assez de colonnes"
 
-#: parser/parse_expr.c:1580
+#: parser/parse_expr.c:1607
 msgid "cannot determine type of empty array"
 msgstr "ne peut pas déterminer le type d'un tableau vide"
 
-#: parser/parse_expr.c:1581
+#: parser/parse_expr.c:1608
 msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
 msgstr "Convertit explicitement vers le type désiré, par exemple ARRAY[]::integer[]."
 
-#: parser/parse_expr.c:1595
+#: parser/parse_expr.c:1622
 #, c-format
 msgid "could not find element type for data type %s"
 msgstr "n'a pas pu trouver le type d'élément pour le type de données %s"
 
-#: parser/parse_expr.c:1793
+#: parser/parse_expr.c:1823
 msgid "unnamed XML attribute value must be a column reference"
 msgstr "la valeur d'un attribut XML sans nom doit être une référence de colonne"
 
-#: parser/parse_expr.c:1794
+#: parser/parse_expr.c:1824
 msgid "unnamed XML element value must be a column reference"
 msgstr "la valeur d'un élément XML sans nom doit être une référence de colonne"
 
-#: parser/parse_expr.c:1809
+#: parser/parse_expr.c:1839
 #, c-format
 msgid "XML attribute name \"%s\" appears more than once"
 msgstr "le nom de l'attribut XML « %s » apparaît plus d'une fois"
 
-#: parser/parse_expr.c:1916
+#: parser/parse_expr.c:1946
 #, c-format
 msgid "cannot cast XMLSERIALIZE result to %s"
 msgstr "ne peut pas convertir le résultat XMLSERIALIZE en %s"
 
-#: parser/parse_expr.c:2120
-#: parser/parse_expr.c:2318
+#: parser/parse_expr.c:2182
+#: parser/parse_expr.c:2382
 msgid "unequal number of entries in row expressions"
 msgstr "nombre différent d'entrées dans les expressions de ligne"
 
-#: parser/parse_expr.c:2130
+#: parser/parse_expr.c:2192
 msgid "cannot compare rows of zero length"
 msgstr "n'a pas pu comparer des lignes de taille zéro"
 
-#: parser/parse_expr.c:2155
+#: parser/parse_expr.c:2217
 #, c-format
 msgid "row comparison operator must yield type boolean, not type %s"
 msgstr ""
 "l'opérateur de comparaison de ligne doit renvoyer le type booléen, et non le\n"
 "type %s"
 
-#: parser/parse_expr.c:2162
+#: parser/parse_expr.c:2224
 msgid "row comparison operator must not return a set"
 msgstr "l'opérateur de comparaison de ligne ne doit pas renvoyer un ensemble"
 
-#: parser/parse_expr.c:2221
-#: parser/parse_expr.c:2265
+#: parser/parse_expr.c:2283
+#: parser/parse_expr.c:2328
 #, c-format
 msgid "could not determine interpretation of row comparison operator %s"
 msgstr "n'a pas pu déterminer l'interprétation de l'opérateur de comparaison de ligne %s"
 
-#: parser/parse_expr.c:2223
+#: parser/parse_expr.c:2285
 msgid "Row comparison operators must be associated with btree operator families."
 msgstr ""
 "Les opérateurs de comparaison de lignes doivent être associés à des familles\n"
 "d'opérateurs btree."
 
-#: parser/parse_expr.c:2267
+#: parser/parse_expr.c:2330
 msgid "There are multiple equally-plausible candidates."
 msgstr "Il existe de nombreus candidats également plausibles."
 
-#: parser/parse_expr.c:2358
+#: parser/parse_expr.c:2422
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr "IS DISTINCT FROM requiert l'opérateur = pour comparer des booléens"
 
-#: parser/parse_func.c:153
+#: parser/parse_func.c:147
 #, c-format
 msgid "argument name \"%s\" used more than once"
 msgstr "nom « %s » de l'argument spécifié plus d'une fois"
 
-#: parser/parse_func.c:164
+#: parser/parse_func.c:158
 msgid "positional argument cannot follow named argument"
 msgstr "l'argument positionné ne doit pas suivre l'argument nommé"
 
-#: parser/parse_func.c:242
+#: parser/parse_func.c:236
 #, c-format
 msgid "%s(*) specified, but %s is not an aggregate function"
 msgstr "%s(*) spécifié, mais %s n'est pas une fonction d'agrégat"
 
-#: parser/parse_func.c:249
+#: parser/parse_func.c:243
 #, c-format
 msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr "DISTINCT spécifié mais %s n'est pas une fonction d'agrégat"
 
-#: parser/parse_func.c:255
+#: parser/parse_func.c:249
 #, c-format
 msgid "ORDER BY specified, but %s is not an aggregate function"
 msgstr "ORDER BY spécifié, mais %s n'est pas une fonction d'agrégat"
 
-#: parser/parse_func.c:261
+#: parser/parse_func.c:255
 #, c-format
 msgid "OVER specified, but %s is not a window function nor an aggregate function"
 msgstr "OVER spécifié, mais %s n'est pas une fonction window ou une fonction d'agrégat"
 
-#: parser/parse_func.c:283
+#: parser/parse_func.c:277
 #, c-format
 msgid "function %s is not unique"
 msgstr "la fonction %s n'est pas unique"
 
-#: parser/parse_func.c:286
+#: parser/parse_func.c:280
 msgid "Could not choose a best candidate function. You might need to add explicit type casts."
 msgstr ""
 "N'a pas pu choisir un meilleur candidat dans les fonctions. Vous pourriez\n"
 "avoir besoin d'ajouter des conversions explicites de type."
 
-#: parser/parse_func.c:297
+#: parser/parse_func.c:291
 msgid "No aggregate function matches the given name and argument types. Perhaps you misplaced ORDER BY; ORDER BY must appear after all regular arguments of the aggregate."
 msgstr ""
 "Aucune fonction d'agrégat ne correspond au nom donné et aux types d'arguments.\n"
 "Peut-être avez-vous mal placé la clause ORDER BY.\n"
 "Cette dernière doit apparaître après tous les arguments standards de l'agrégat."
 
-#: parser/parse_func.c:308
+#: parser/parse_func.c:302
 msgid "No function matches the given name and argument types. You might need to add explicit type casts."
 msgstr ""
 "Aucune fonction ne correspond au nom donné et aux types d'arguments.\n"
 "Vous devez ajouter des conversions explicites de type."
 
-#: parser/parse_func.c:415
-#: parser/parse_func.c:480
+#: parser/parse_func.c:412
+#: parser/parse_func.c:478
 #, c-format
 msgid "%s(*) must be used to call a parameterless aggregate function"
 msgstr "%s(*) doit être utilisé pour appeler une fonction d'agrégat sans paramètre"
 
-#: parser/parse_func.c:422
+#: parser/parse_func.c:419
 msgid "aggregates cannot return sets"
 msgstr "les agrégats ne peuvent pas renvoyer des ensembles"
 
-#: parser/parse_func.c:434
+#: parser/parse_func.c:431
 msgid "aggregates cannot use named arguments"
 msgstr "les agrégats ne peuvent pas utiliser des aguments nommés"
 
-#: parser/parse_func.c:453
+#: parser/parse_func.c:450
 msgid "window function call requires an OVER clause"
 msgstr "l'appel à la fonction window nécessite une clause OVER"
 
-#: parser/parse_func.c:470
+#: parser/parse_func.c:468
 msgid "DISTINCT is not implemented for window functions"
 msgstr "DISTINCT n'est pas implémenté pour des fonctions window"
 
-#: parser/parse_func.c:490
+#: parser/parse_func.c:488
 msgid "aggregate ORDER BY is not implemented for window functions"
 msgstr "l'agrégat ORDER BY n'est pas implémenté pour des fonctions window"
 
-#: parser/parse_func.c:496
+#: parser/parse_func.c:494
 msgid "window functions cannot return sets"
 msgstr "les fonctions window ne peuvent pas renvoyer des ensembles"
 
-#: parser/parse_func.c:507
+#: parser/parse_func.c:505
 msgid "window functions cannot use named arguments"
 msgstr "les fonctions window ne peuvent pas renvoyer des arguments nommés"
 
-#: parser/parse_func.c:1572
+#: parser/parse_func.c:1589
 #, c-format
 msgid "aggregate %s(*) does not exist"
 msgstr "l'agrégat %s(*) n'existe pas"
 
-#: parser/parse_func.c:1577
+#: parser/parse_func.c:1594
 #, c-format
 msgid "aggregate %s does not exist"
 msgstr "l'agrégat %s n'existe pas"
 
-#: parser/parse_func.c:1596
+#: parser/parse_func.c:1613
 #, c-format
 msgid "function %s is not an aggregate"
 msgstr "la fonction %s n'est pas un agrégat"
 
-#: parser/parse_node.c:82
+#: parser/parse_node.c:83
 #, c-format
 msgid "target lists can have at most %d entries"
 msgstr "les listes cibles peuvent avoir au plus %d colonnes"
 
-#: parser/parse_node.c:222
+#: parser/parse_node.c:240
 #, c-format
 msgid "cannot subscript type %s because it is not an array"
 msgstr "ne peut pas indicer le type %s car il ne s'agit pas d'un tableau"
 
-#: parser/parse_node.c:316
 #: parser/parse_node.c:342
+#: parser/parse_node.c:369
 msgid "array subscript must have type integer"
 msgstr "l'indice d'un tableau doit être de type entier"
 
-#: parser/parse_node.c:366
+#: parser/parse_node.c:393
 #, c-format
 msgid "array assignment requires type %s but expression is of type %s"
 msgstr "l'affectation de tableaux requiert le type %s mais l'expression est de type %s"
 
 #: parser/parse_oper.c:124
-#: parser/parse_oper.c:751
+#: parser/parse_oper.c:718
 #: utils/adt/regproc.c:464
 #: utils/adt/regproc.c:484
 #: utils/adt/regproc.c:643
@@ -11088,59 +11943,59 @@ msgstr "l'affectation de tableaux requiert le type %s mais l'expression est de t
 msgid "operator does not exist: %s"
 msgstr "l'opérateur n'existe pas : %s"
 
-#: parser/parse_oper.c:256
+#: parser/parse_oper.c:221
 msgid "Use an explicit ordering operator or modify the query."
 msgstr "Utilisez un opérateur explicite de tri ou modifiez la requête."
 
-#: parser/parse_oper.c:260
-#: utils/adt/arrayfuncs.c:3109
-#: utils/adt/arrayfuncs.c:3510
-#: utils/adt/rowtypes.c:1139
+#: parser/parse_oper.c:225
+#: utils/adt/arrayfuncs.c:3176
+#: utils/adt/arrayfuncs.c:3695
+#: utils/adt/rowtypes.c:1157
 #, c-format
 msgid "could not identify an equality operator for type %s"
 msgstr "n'a pas pu identifier un opérateur d'égalité pour le type %s"
 
-#: parser/parse_oper.c:509
+#: parser/parse_oper.c:476
 #, c-format
 msgid "operator requires run-time type coercion: %s"
 msgstr "l'opérateur requiert la coercion du type à l'exécution : %s"
 
-#: parser/parse_oper.c:743
+#: parser/parse_oper.c:710
 #, c-format
 msgid "operator is not unique: %s"
 msgstr "l'opérateur n'est pas unique : %s"
 
-#: parser/parse_oper.c:745
+#: parser/parse_oper.c:712
 msgid "Could not choose a best candidate operator. You might need to add explicit type casts."
 msgstr ""
 "N'a pas pu choisir un meilleur candidat pour l'opérateur. Vous devez ajouter une\n"
 "conversion explicite de type."
 
-#: parser/parse_oper.c:753
+#: parser/parse_oper.c:720
 msgid "No operator matches the given name and argument type(s). You might need to add explicit type casts."
 msgstr ""
 "Aucun opérateur ne correspond au nom donné et aux types d'arguments.\n"
 "Vous devez ajouter des conversions explicites de type."
 
-#: parser/parse_oper.c:812
-#: parser/parse_oper.c:928
+#: parser/parse_oper.c:779
+#: parser/parse_oper.c:893
 #, c-format
 msgid "operator is only a shell: %s"
 msgstr "l'opérateur est seulement un shell : %s"
 
-#: parser/parse_oper.c:916
+#: parser/parse_oper.c:881
 msgid "op ANY/ALL (array) requires array on right side"
 msgstr "op ANY/ALL (tableau) requiert un tableau sur le côté droit"
 
-#: parser/parse_oper.c:958
+#: parser/parse_oper.c:923
 msgid "op ANY/ALL (array) requires operator to yield boolean"
 msgstr "op ANY/ALL (tableau) requiert un opérateur pour comparer des booléens"
 
-#: parser/parse_oper.c:963
+#: parser/parse_oper.c:928
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (tableau) requiert que l'opérateur ne renvoie pas un ensemble"
 
-#: parser/parse_param.c:212
+#: parser/parse_param.c:215
 #, c-format
 msgid "inconsistent types deduced for parameter $%d"
 msgstr "types incohérents déduit pour le paramètre $%d"
@@ -11161,8 +12016,8 @@ msgid "table name \"%s\" specified more than once"
 msgstr "le nom de la table « %s » est spécifié plus d'une fois"
 
 #: parser/parse_relation.c:754
-#: parser/parse_relation.c:1043
-#: parser/parse_relation.c:1403
+#: parser/parse_relation.c:1045
+#: parser/parse_relation.c:1432
 #, c-format
 msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr "la table « %s » a %d colonnes disponibles mais %d colonnes spécifiées"
@@ -11185,108 +12040,113 @@ msgstr ""
 "Utilisez WITH RECURSIVE ou ré-ordonnez les éléments WITH pour supprimer\n"
 "les références en avant."
 
-#: parser/parse_relation.c:1122
+#: parser/parse_relation.c:1125
 msgid "a column definition list is only allowed for functions returning \"record\""
 msgstr ""
 "une liste de définition de colonnes est uniquement autorisée pour les fonctions\n"
 "renvoyant un « record »"
 
-#: parser/parse_relation.c:1130
+#: parser/parse_relation.c:1133
 msgid "a column definition list is required for functions returning \"record\""
 msgstr ""
 "une liste de définition de colonnes est requise pour les fonctions renvoyant\n"
 "un « record »"
 
-#: parser/parse_relation.c:1177
+#: parser/parse_relation.c:1184
 #, c-format
 msgid "function \"%s\" in FROM has unsupported return type %s"
 msgstr "la fonction « %s » dans la clause FROM a un type de retour %s non supporté"
 
-#: parser/parse_relation.c:1249
+#: parser/parse_relation.c:1258
 #, c-format
 msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr ""
 "les listes « %s » de VALUES ont %d colonnes disponibles mais %d colonnes\n"
 "spécifiées"
 
-#: parser/parse_relation.c:1305
+#: parser/parse_relation.c:1314
 #, c-format
 msgid "joins can have at most %d columns"
 msgstr "les jointures peuvent avoir au plus %d colonnes"
 
-#: parser/parse_relation.c:2038
+#: parser/parse_relation.c:1405
+#, c-format
+msgid "WITH query \"%s\" does not have a RETURNING clause"
+msgstr "La requête WITH « %s » n'a pas de clause RETURNING"
+
+#: parser/parse_relation.c:2087
 #, c-format
 msgid "column %d of relation \"%s\" does not exist"
 msgstr "la colonne %d de la relation « %s » n'existe pas"
 
-#: parser/parse_relation.c:2397
+#: parser/parse_relation.c:2471
 #, c-format
 msgid "invalid reference to FROM-clause entry for table \"%s\""
 msgstr "référence invalide d'une entrée de la clause FROM pour la table « %s »"
 
-#: parser/parse_relation.c:2400
+#: parser/parse_relation.c:2474
 #, c-format
 msgid "Perhaps you meant to reference the table alias \"%s\"."
 msgstr "Peut-être que vous souhaitiez référencer l'alias de la table « %s »."
 
-#: parser/parse_relation.c:2402
+#: parser/parse_relation.c:2476
 #, c-format
 msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
 msgstr ""
 "Il existe une entrée pour la table « %s » mais elle ne peut pas être\n"
 "référencée de cette partie de la requête."
 
-#: parser/parse_relation.c:2408
+#: parser/parse_relation.c:2482
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "entrée manquante de la clause FROM pour la table « %s »"
 
-#: parser/parse_target.c:373
-#: parser/parse_target.c:661
+#: parser/parse_target.c:382
+#: parser/parse_target.c:670
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "ne peut pas affecter à une colonne système « %s »"
 
-#: parser/parse_target.c:398
+#: parser/parse_target.c:410
 msgid "cannot set an array element to DEFAULT"
 msgstr "ne peut pas initialiser un élément d'un tableau avec DEFAULT"
 
-#: parser/parse_target.c:403
+#: parser/parse_target.c:415
 msgid "cannot set a subfield to DEFAULT"
 msgstr "ne peut pas initialiser un sous-champ avec DEFAULT"
 
-#: parser/parse_target.c:470
+#: parser/parse_target.c:484
 #, c-format
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr "la colonne « %s » est de type %s mais l'expression est de type %s"
 
-#: parser/parse_target.c:645
+#: parser/parse_target.c:654
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
 msgstr ""
 "ne peut pas l'affecter au champ « %s » de la colonne « %s » parce que son\n"
 "type %s n'est pas un type composé"
 
-#: parser/parse_target.c:654
+#: parser/parse_target.c:663
 #, c-format
 msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
 msgstr ""
 "ne peut pas l'affecter au champ « %s » de la colonne « %s » parce qu'il n'existe\n"
 "pas une telle colonne dans le type de données %s"
 
-#: parser/parse_target.c:729
+#: parser/parse_target.c:730
 #, c-format
 msgid "array assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr ""
 "l'affectation d'un tableau avec « %s » requiert le type %s mais l'expression est\n"
 "de type %s"
 
-#: parser/parse_target.c:739
+#: parser/parse_target.c:740
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "le sous-champ « %s » est de type %s mais l'expression est de type %s"
 
-#: parser/parse_target.c:1039
+#: parser/parse_target.c:1126
 msgid "SELECT * with no tables specified is not valid"
 msgstr "Un SELECT * sans table spécifiée n'est pas valide"
 
@@ -11306,343 +12166,453 @@ msgid "type reference %s converted to %s"
 msgstr "référence de type %s convertie en %s"
 
 #: parser/parse_type.c:202
-#: utils/cache/typcache.c:151
+#: utils/cache/typcache.c:195
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "le type « %s » est seulement un shell"
 
-#: parser/parse_type.c:270
+#: parser/parse_type.c:287
 #, c-format
 msgid "type modifier is not allowed for type \"%s\""
 msgstr "le modificateur de type n'est pas autorisé pour le type « %s »"
 
-#: parser/parse_type.c:313
+#: parser/parse_type.c:330
 msgid "type modifiers must be simple constants or identifiers"
 msgstr "les modificateurs de type doivent être des constantes ou des identifiants"
 
-#: parser/parse_type.c:548
-#: parser/parse_type.c:647
+#: parser/parse_type.c:641
+#: parser/parse_type.c:740
 #, c-format
 msgid "invalid type name \"%s\""
 msgstr "nom de type « %s » invalide"
 
-#: parser/parse_utilcmd.c:306
+#: parser/parse_utilcmd.c:181
+#, c-format
+msgid "relation \"%s\" already exists, skipping"
+msgstr "la relation « %s » existe déjà, poursuite du traitement"
+
+#: parser/parse_utilcmd.c:334
 msgid "array of serial is not implemented"
 msgstr "le tableau de type serial n'est pas implanté"
 
-#: parser/parse_utilcmd.c:350
+#: parser/parse_utilcmd.c:382
 #, c-format
 msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
 msgstr "%s créera des séquences implicites « %s » pour la colonne serial « %s.%s »"
 
-#: parser/parse_utilcmd.c:451
-#: parser/parse_utilcmd.c:463
+#: parser/parse_utilcmd.c:483
+#: parser/parse_utilcmd.c:495
 #, c-format
 msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "déclarations NULL/NOT NULL en conflit pour la colonne « %s » de la table « %s »"
 
-#: parser/parse_utilcmd.c:475
+#: parser/parse_utilcmd.c:507
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr ""
 "plusieurs valeurs par défaut sont spécifiées pour la colonne « %s » de la table\n"
 "« %s »"
 
-#: parser/parse_utilcmd.c:832
+#: parser/parse_utilcmd.c:1440
+msgid "cannot use an existing index in CREATE TABLE"
+msgstr "ne peut pas utiliser un index existant dans CREATE TABLE"
+
+#: parser/parse_utilcmd.c:1460
 #, c-format
-msgid "type %s is not a composite type"
-msgstr "le type %s n'est pas un type composite"
+msgid "index \"%s\" is already associated with a constraint"
+msgstr "l'index « %s » est déjà associé à une contrainte"
+
+#: parser/parse_utilcmd.c:1468
+#, c-format
+msgid "index \"%s\" does not belong to table \"%s\""
+msgstr "l'index « %s » n'appartient pas à la table « %s »"
+
+#: parser/parse_utilcmd.c:1475
+#, c-format
+msgid "index \"%s\" is not valid"
+msgstr "l'index « %s » n'est pas valide"
+
+#: parser/parse_utilcmd.c:1481
+#, c-format
+msgid "index \"%s\" is not ready"
+msgstr "l'index « %s » n'est pas prêt"
+
+#: parser/parse_utilcmd.c:1487
+#, c-format
+msgid "\"%s\" is not a unique index"
+msgstr "« %s » n'est pas un index unique"
+
+#: parser/parse_utilcmd.c:1488
+#: parser/parse_utilcmd.c:1495
+#: parser/parse_utilcmd.c:1502
+#: parser/parse_utilcmd.c:1572
+msgid "Cannot create a primary key or unique constraint using such an index."
+msgstr "Ne peut pas créer une clé primaire ou une contrainte unique avec cet index."
+
+#: parser/parse_utilcmd.c:1494
+#, c-format
+msgid "index \"%s\" contains expressions"
+msgstr "l'index « %s » contient des expressions"
+
+#: parser/parse_utilcmd.c:1501
+#, c-format
+msgid "\"%s\" is a partial index"
+msgstr "« %s » est un index partiel"
 
-#: parser/parse_utilcmd.c:1457
+#: parser/parse_utilcmd.c:1513
+#, c-format
+msgid "\"%s\" is a deferrable index"
+msgstr "« %s » est un index déferrable"
+
+#: parser/parse_utilcmd.c:1514
+msgid "Cannot create a non-deferrable constraint using a deferrable index."
+msgstr "Ne peut pas créer une contrainte non-déferrable utilisant un index déferrable."
+
+#: parser/parse_utilcmd.c:1571
+#, c-format
+msgid "index \"%s\" does not have default sorting behavior"
+msgstr "l'index « %s » n'a pas de comportement de tri par défaut"
+
+#: parser/parse_utilcmd.c:1716
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr "la colonne « %s » apparaît deux fois dans la contrainte de la clé primaire"
 
-#: parser/parse_utilcmd.c:1462
+#: parser/parse_utilcmd.c:1722
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr "la colonne « %s » apparaît deux fois sur une contrainte unique"
 
-#: parser/parse_utilcmd.c:1615
+#: parser/parse_utilcmd.c:1887
 msgid "index expression cannot return a set"
 msgstr "l'expression de l'index ne peut pas renvoyer un ensemble"
 
-#: parser/parse_utilcmd.c:1625
+#: parser/parse_utilcmd.c:1897
 msgid "index expressions and predicates can refer only to the table being indexed"
 msgstr "les expressions et prédicats d'index peuvent seulement faire référence à la table en cours d'indexage"
 
-#: parser/parse_utilcmd.c:1720
+#: parser/parse_utilcmd.c:1994
 msgid "rule WHERE condition cannot contain references to other relations"
 msgstr ""
 "la condition WHERE d'une règle ne devrait pas contenir de références à d'autres\n"
 "relations"
 
-#: parser/parse_utilcmd.c:1726
+#: parser/parse_utilcmd.c:2000
 msgid "cannot use aggregate function in rule WHERE condition"
 msgstr "ne peut pas utiliser la fonction d'agrégat dans la condition d'une règle WHERE"
 
-#: parser/parse_utilcmd.c:1730
+#: parser/parse_utilcmd.c:2004
 msgid "cannot use window function in rule WHERE condition"
 msgstr "ne peut pas utiliser la fonction window dans la condition d'une règle WHERE"
 
-#: parser/parse_utilcmd.c:1802
+#: parser/parse_utilcmd.c:2076
 msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr ""
 "les règles avec des conditions WHERE ne peuvent contenir que des actions\n"
 "SELECT, INSERT, UPDATE ou DELETE "
 
-#: parser/parse_utilcmd.c:1820
-#: parser/parse_utilcmd.c:1890
-#: rewrite/rewriteHandler.c:432
-#: rewrite/rewriteManip.c:1021
+#: parser/parse_utilcmd.c:2094
+#: parser/parse_utilcmd.c:2193
+#: rewrite/rewriteHandler.c:442
+#: rewrite/rewriteManip.c:1024
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr ""
 "les instructions conditionnelles UNION/INTERSECT/EXCEPT ne sont pas\n"
 "implémentées"
 
-#: parser/parse_utilcmd.c:1838
+#: parser/parse_utilcmd.c:2112
 msgid "ON SELECT rule cannot use OLD"
 msgstr "la règle ON SELECT ne peut pas utiliser OLD"
 
-#: parser/parse_utilcmd.c:1842
+#: parser/parse_utilcmd.c:2116
 msgid "ON SELECT rule cannot use NEW"
 msgstr "la règle ON SELECT ne peut pas utiliser NEW"
 
-#: parser/parse_utilcmd.c:1851
+#: parser/parse_utilcmd.c:2125
 msgid "ON INSERT rule cannot use OLD"
 msgstr "la règle ON INSERT ne peut pas utiliser OLD"
 
-#: parser/parse_utilcmd.c:1857
+#: parser/parse_utilcmd.c:2131
 msgid "ON DELETE rule cannot use NEW"
 msgstr "la règle ON INSERT ne peut pas utiliser NEW"
 
-#: parser/parse_utilcmd.c:2138
+#: parser/parse_utilcmd.c:2159
+msgid "cannot refer to OLD within WITH query"
+msgstr "ne peut référencer OLD dans une requête WITH"
+
+#: parser/parse_utilcmd.c:2166
+msgid "cannot refer to NEW within WITH query"
+msgstr "ne peut référencer NEW dans une requête WITH"
+
+#: parser/parse_utilcmd.c:2449
 msgid "misplaced DEFERRABLE clause"
 msgstr "clause DEFERRABLE mal placée"
 
-#: parser/parse_utilcmd.c:2143
-#: parser/parse_utilcmd.c:2158
+#: parser/parse_utilcmd.c:2454
+#: parser/parse_utilcmd.c:2469
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "clauses DEFERRABLE/NOT DEFERRABLE multiples non autorisées"
 
-#: parser/parse_utilcmd.c:2153
+#: parser/parse_utilcmd.c:2464
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "clause NOT DEFERRABLE mal placée"
 
-#: parser/parse_utilcmd.c:2166
-#: parser/parse_utilcmd.c:2192
-#: gram.y:3485
-#: gram.y:3501
+#: parser/parse_utilcmd.c:2477
+#: parser/parse_utilcmd.c:2503
+#: gram.y:4153
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "la contrainte déclarée INITIALLY DEFERRED doit être DEFERRABLE"
 
-#: parser/parse_utilcmd.c:2174
+#: parser/parse_utilcmd.c:2485
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "clause INITIALLY DEFERRED mal placée"
 
-#: parser/parse_utilcmd.c:2179
-#: parser/parse_utilcmd.c:2205
+#: parser/parse_utilcmd.c:2490
+#: parser/parse_utilcmd.c:2516
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "clauses INITIALLY IMMEDIATE/DEFERRED multiples non autorisées"
 
-#: parser/parse_utilcmd.c:2200
+#: parser/parse_utilcmd.c:2511
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "clause INITIALLY IMMEDIATE mal placée"
 
-#: parser/parse_utilcmd.c:2373
+#: parser/parse_utilcmd.c:2702
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "CREATE spécifie un schéma (%s) différent de celui tout juste créé (%s)"
 
-#: gram.y:1255
+#: parser/scansup.c:190
+#, c-format
+msgid "identifier \"%s\" will be truncated to \"%s\""
+msgstr "l'identifiant « %s » sera tronqué en « %s »"
+
+#: parser/parse_collate.c:214
+#: parser/parse_collate.c:538
+#, c-format
+msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgstr "le collationnement ne correspond pas aux collationnements implicites « %s » et « %s »"
+
+#: parser/parse_collate.c:217
+#: parser/parse_collate.c:541
+msgid "You can choose the collation by applying the COLLATE clause to one or both expressions."
+msgstr "Vous pouvez choisir le collationnement en appliquant la clause COLLATE à une ou aux deux expressions."
+
+#: parser/parse_collate.c:763
+#, c-format
+msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+msgstr "le collationnement ne correspond pas aux collationnements explicites « %s » et « %s »"
+
+#: gram.y:915
+#, c-format
+msgid "unrecognized role option \"%s\""
+msgstr "option « %s » du rôle non reconnu"
+
+#: gram.y:1301
 msgid "current database cannot be changed"
 msgstr "la base de données actuelle ne peut pas être changée"
 
-#: gram.y:1373
-#: gram.y:1388
+#: gram.y:1419
+#: gram.y:1434
 msgid "time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr "l'intervalle de fuseau horaire doit être HOUR ou HOUR TO MINUTE"
 
-#: gram.y:1393
-#: gram.y:8280
-#: gram.y:10731
+#: gram.y:1439
+#: gram.y:9246
+#: gram.y:11736
 msgid "interval precision specified twice"
 msgstr "précision d'intervalle spécifiée deux fois"
 
-#: gram.y:2522
-msgid "CHECK constraints cannot be deferred"
-msgstr "les contraintes CHECK ne sont pas DEFERRABLE"
-
-#: gram.y:2611
-#: utils/adt/ri_triggers.c:373
-#: utils/adt/ri_triggers.c:433
-#: utils/adt/ri_triggers.c:596
-#: utils/adt/ri_triggers.c:836
-#: utils/adt/ri_triggers.c:1024
-#: utils/adt/ri_triggers.c:1186
-#: utils/adt/ri_triggers.c:1374
-#: utils/adt/ri_triggers.c:1545
-#: utils/adt/ri_triggers.c:1728
-#: utils/adt/ri_triggers.c:1899
-#: utils/adt/ri_triggers.c:2115
-#: utils/adt/ri_triggers.c:2297
-#: utils/adt/ri_triggers.c:2500
-#: utils/adt/ri_triggers.c:2548
-#: utils/adt/ri_triggers.c:2593
-#: utils/adt/ri_triggers.c:2721
+#: gram.y:2887
+#: utils/adt/ri_triggers.c:375
+#: utils/adt/ri_triggers.c:435
+#: utils/adt/ri_triggers.c:598
+#: utils/adt/ri_triggers.c:838
+#: utils/adt/ri_triggers.c:1026
+#: utils/adt/ri_triggers.c:1188
+#: utils/adt/ri_triggers.c:1376
+#: utils/adt/ri_triggers.c:1547
+#: utils/adt/ri_triggers.c:1730
+#: utils/adt/ri_triggers.c:1901
+#: utils/adt/ri_triggers.c:2117
+#: utils/adt/ri_triggers.c:2299
+#: utils/adt/ri_triggers.c:2502
+#: utils/adt/ri_triggers.c:2550
+#: utils/adt/ri_triggers.c:2595
+#: utils/adt/ri_triggers.c:2757
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL non implémenté"
 
-#: gram.y:2726
+#: gram.y:3005
 msgid "CREATE TABLE AS cannot specify INTO"
 msgstr "CREATE TABLE AS ne peut pas spécifier INTO"
 
-#: gram.y:3396
+#: gram.y:4058
 msgid "duplicate trigger events specified"
 msgstr "événements de trigger dupliqués spécifiés"
 
-#: gram.y:3565
+#: gram.y:4160
+msgid "conflicting constraint properties"
+msgstr "propriétés de contrainte en conflit"
+
+#: gram.y:4221
 msgid "CREATE ASSERTION is not yet implemented"
 msgstr "CREATE ASSERTION n'est pas encore implémenté"
 
-#: gram.y:3581
+#: gram.y:4237
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION n'est pas encore implémenté"
 
-#: gram.y:3882
+#: gram.y:4573
 msgid "RECHECK is no longer required"
 msgstr "RECHECK n'est plus nécessaire"
 
-#: gram.y:3883
+#: gram.y:4574
 msgid "Update your data type."
 msgstr "Mettez à jour votre type de données."
 
-#: gram.y:5422
+#: gram.y:6217
 #: utils/adt/regproc.c:630
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: gram.y:5423
+#: gram.y:6218
 #: utils/adt/regproc.c:631
 msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr "Utilisez NONE pour dénoter l'argument manquant d'un opérateur unitaire."
 
-#: gram.y:6358
-#: gram.y:6364
-#: gram.y:6370
+#: gram.y:7297
+#: gram.y:7303
+#: gram.y:7309
 msgid "WITH CHECK OPTION is not implemented"
 msgstr "WITH CHECK OPTION n'est pas implémenté"
 
-#: gram.y:7046
+#: gram.y:7986
 msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
 msgstr "la liste de noms de colonnes n'est pas autorisée dans CREATE TABLE / AS EXECUTE"
 
-#: gram.y:7267
+#: gram.y:8210
 msgid "number of columns does not match number of values"
 msgstr "le nombre de colonnes ne correspond pas au nombre de valeurs"
 
-#: gram.y:7707
+#: gram.y:8660
 msgid "LIMIT #,# syntax is not supported"
 msgstr "la syntaxe LIMIT #,# n'est pas supportée"
 
-#: gram.y:7708
+#: gram.y:8661
 msgid "Use separate LIMIT and OFFSET clauses."
 msgstr "Utilisez les clauses séparées LIMIT et OFFSET."
 
-#: gram.y:7926
+#: gram.y:8879
 msgid "VALUES in FROM must have an alias"
 msgstr "VALUES dans FROM doit avoir un alias"
 
-#: gram.y:7927
+#: gram.y:8880
 msgid "For example, FROM (VALUES ...) [AS] foo."
 msgstr "Par exemple, FROM (VALUES ...) [AS] quelquechose."
 
-#: gram.y:7932
+#: gram.y:8885
 msgid "subquery in FROM must have an alias"
 msgstr "la sous-requête du FROM doit avoir un alias"
 
-#: gram.y:7933
+#: gram.y:8886
 msgid "For example, FROM (SELECT ...) [AS] foo."
 msgstr "Par exemple, FROM (SELECT...) [AS] quelquechose."
 
-#: gram.y:8406
+#: gram.y:9372
 msgid "precision for type float must be at least 1 bit"
 msgstr "la précision du type float doit être d'au moins un bit"
 
-#: gram.y:8415
+#: gram.y:9381
 msgid "precision for type float must be less than 54 bits"
 msgstr "la précision du type float doit être inférieur à 54 bits"
 
-#: gram.y:9121
+#: gram.y:10095
 msgid "UNIQUE predicate is not yet implemented"
 msgstr "prédicat UNIQUE non implémenté"
 
-#: gram.y:9993
+#: gram.y:11003
 msgid "RANGE PRECEDING is only supported with UNBOUNDED"
 msgstr "RANGE PRECEDING est seulement supporté avec UNBOUNDED"
 
-#: gram.y:9999
+#: gram.y:11009
 msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
 msgstr "RANGE FOLLOWING est seulement supporté avec UNBOUNDED"
 
-#: gram.y:10026
-#: gram.y:10049
+#: gram.y:11036
+#: gram.y:11059
 msgid "frame start cannot be UNBOUNDED FOLLOWING"
 msgstr "la fin du frame ne peut pas être UNBOUNDED FOLLOWING"
 
-#: gram.y:10031
+#: gram.y:11041
 msgid "frame starting from following row cannot end with current row"
 msgstr "la frame commençant après la ligne suivante ne peut pas se terminer avec la ligne actuelle"
 
-#: gram.y:10054
+#: gram.y:11064
 msgid "frame end cannot be UNBOUNDED PRECEDING"
 msgstr "la fin du frame ne peut pas être UNBOUNDED PRECEDING"
 
-#: gram.y:10060
+#: gram.y:11070
 msgid "frame starting from current row cannot have preceding rows"
 msgstr "la frame commençant à la ligne courante ne peut pas avoir des lignes précédentes"
 
-#: gram.y:10067
+#: gram.y:11077
 msgid "frame starting from following row cannot have preceding rows"
 msgstr "la frame commençant à la ligne suivante ne peut pas avoir des lignes précédentes"
 
-#: gram.y:10706
+#: gram.y:11711
 msgid "type modifier cannot have parameter name"
 msgstr "le modificateur de type ne peut pas avoir de nom de paramètre"
 
-#: gram.y:11303
-#: gram.y:11511
+#: gram.y:12306
+#: gram.y:12514
 msgid "improper use of \"*\""
 msgstr "mauvaise utilisation de « * »"
 
-#: gram.y:11442
+#: gram.y:12445
 msgid "wrong number of parameters on left side of OVERLAPS expression"
 msgstr "mauvais nombre de paramètres sur le côté gauche de l'expression OVERLAPS"
 
-#: gram.y:11449
+#: gram.y:12452
 msgid "wrong number of parameters on right side of OVERLAPS expression"
 msgstr "mauvais nombre de paramètres sur le côté droit de l'expression OVERLAPS"
 
-#: gram.y:11574
+#: gram.y:12577
 msgid "multiple ORDER BY clauses not allowed"
 msgstr "clauses ORDER BY multiples non autorisées"
 
-#: gram.y:11585
+#: gram.y:12588
 msgid "multiple OFFSET clauses not allowed"
 msgstr "clauses OFFSET multiples non autorisées"
 
-#: gram.y:11594
+#: gram.y:12597
 msgid "multiple LIMIT clauses not allowed"
 msgstr "clauses LIMIT multiples non autorisées"
 
-#: gram.y:11603
+#: gram.y:12606
 msgid "multiple WITH clauses not allowed"
 msgstr "clauses WITH multiples non autorisées"
 
-#: gram.y:11757
+#: gram.y:12751
 msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
 msgstr "les arguments OUT et INOUT ne sont pas autorisés dans des fonctions TABLE"
 
+#: gram.y:12852
+msgid "multiple COLLATE clauses not allowed"
+msgstr "clauses COLLATE multiples non autorisées"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12890
+#: gram.y:12903
+#, c-format
+msgid "%s constraints cannot be marked DEFERRABLE"
+msgstr "les contraintes %s ne peuvent pas être marquées comme DEFERRABLE"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12916
+#, c-format
+msgid "%s constraints cannot be marked NOT VALID"
+msgstr "les contraintes %s ne peuvent pas être marquées comme NOT VALID"
+
 #: scan.l:411
 msgid "unterminated /* comment"
 msgstr "commentaire /* non terminé"
@@ -11698,6 +12668,7 @@ msgstr ""
 "pour les encodages clients."
 
 #: scan.l:629
+#: repl_scanner.l:97
 msgid "unterminated quoted string"
 msgstr "chaîne entre guillemets non terminée"
 
@@ -11798,9 +12769,9 @@ msgstr ""
 
 #: port/win32/signal.c:189
 #, c-format
-msgid "could not create signal listener pipe for pid %d: error code %d"
+msgid "could not create signal listener pipe for PID %d: error code %d"
 msgstr ""
-"n'a pas pu créer le tube d'écoute de signal pour le id processus %d :\n"
+"n'a pas pu créer le tube d'écoute de signal pour l'identifiant de processus %d :\n"
 "code d'erreur %d"
 
 #: port/win32/signal.c:269
@@ -11814,35 +12785,28 @@ msgstr "n'a pas pu cr
 msgid "could not create signal dispatch thread: error code %d\n"
 msgstr "n'a pas pu créer le thread de répartition des signaux : code d'erreur %d\n"
 
-#: port/win32_shmem.c:168
-#: port/win32_shmem.c:203
-#: port/win32_shmem.c:224
-#, c-format
-msgid "could not create shared memory segment: %lu"
-msgstr "n'a pas pu créer le segment de mémoire partagée : %lu"
+#: port/win32/crashdump.c:108
+msgid "could not load dbghelp.dll, cannot write crash dump\n"
+msgstr "n'a pas pu charger dbghelp.dll, ne peut pas écrire le « crashdump »\n"
 
-#: port/win32_shmem.c:169
-#, c-format
-msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
-msgstr "L'appel système qui a échoué était CreateFileMapping(taille=%lu, nom=%s)."
+#: port/win32/crashdump.c:116
+msgid "could not load required functions in dbghelp.dll, cannot write crash dump\n"
+msgstr "n'a pas pu charger les fonctions requises dans dbghelp.dll, ne peut pas écrire le « crashdump »\n"
 
-#: port/win32_shmem.c:193
-msgid "pre-existing shared memory block is still in use"
-msgstr "le bloc de mémoire partagé pré-existant est toujours en cours d'utilisation"
-
-#: port/win32_shmem.c:194
-msgid "Check if there are any old server processes still running, and terminate them."
-msgstr ""
-"Vérifier s'il n'y a pas de vieux processus serveur en cours d'exécution. Si c'est le\n"
-"cas, fermez-les."
+#: port/win32/crashdump.c:147
+#, c-format
+msgid "could not open crash dump file \"%s\" for writing: error code %u\n"
+msgstr "n'a pas pu ouvrir le fichier « crashdump » « %s » en écriture : code d'erreur %u\n"
 
-#: port/win32_shmem.c:204
-msgid "Failed system call was DuplicateHandle."
-msgstr "L'appel système qui a échoué était DuplicateHandle."
+#: port/win32/crashdump.c:154
+#, c-format
+msgid "wrote crash dump to file \"%s\"\n"
+msgstr "a écrit le « crash dump » dans le fichier « %s »\n"
 
-#: port/win32_shmem.c:225
-msgid "Failed system call was MapViewOfFileEx."
-msgstr "L'appel système qui a échoué était MapViewOfFileEx."
+#: port/win32/crashdump.c:156
+#, c-format
+msgid "could not write crash dump to file \"%s\": error code %08x\n"
+msgstr "n'a pas pu écrire le « crashdump » dans le fichier « %s » : code d'erreur %08x\n"
 
 #: port/sysv_sema.c:114
 #: port/pg_sema.c:114
@@ -11858,23 +12822,21 @@ msgstr "L'appel syst
 
 #: port/sysv_sema.c:119
 #: port/pg_sema.c:119
-#, c-format
 msgid ""
-"This error does *not* mean that you have run out of disk space.\n"
-"It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its max_connections parameter (currently %d).\n"
+"This error does *not* mean that you have run out of disk space.  It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its max_connections parameter.\n"
 "The PostgreSQL documentation contains more information about configuring your system for PostgreSQL."
 msgstr ""
-"Cette erreur ne signifie *pas* que vous manquez d'espace disque.\n"
-"Il arrive que soit la limite système de nombre maximum d'ensembles de\n"
-"sémaphores (SEMMNI) ou le nombre maximum de sémaphores pour le système\n"
-"(SEMMNS) soit dépassée. Vous avez besoin d'augmenter le paramètre noyau\n"
-"respectif. Autrement, réduisez la consomnation de sémaphores par PostgreSQL\n"
-"en réduisant son paramètre max_connections (actuellement %d).\n"
+"Cette erreur ne signifie *pas* que vous manquez d'espace disque. Il arrive\n"
+"que soit la limite système du nombre maximum d'ensembles de sémaphores\n"
+"(SEMMNI) ou le nombre maximum de sémaphores pour le système (SEMMNS) soit\n"
+"dépassée. Vous avez besoin d'augmenter le paramètre noyau respectif.\n"
+"Autrement, réduisez la consommation de sémaphores par PostgreSQL en réduisant\n"
+"son paramètre max_connections.\n"
 "La documentation de PostgreSQL contient plus d'informations sur la\n"
 "configuration de votre système avec PostgreSQL."
 
-#: port/sysv_sema.c:148
-#: port/pg_sema.c:148
+#: port/sysv_sema.c:146
+#: port/pg_sema.c:146
 #, c-format
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr ""
@@ -11897,7 +12859,7 @@ msgstr "L'appel syst
 #: port/pg_shmem.c:152
 #, c-format
 msgid ""
-"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMMAX.  To reduce the request size (currently %lu bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMMAX.  To reduce the request size (currently %lu bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing shared_buffers or max_connections.\n"
 "If the request size is already small, it's possible that it is less than your kernel's SHMMIN parameter, in which case raising the request size or reconfiguring SHMMIN is called for.\n"
 "The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
@@ -11905,9 +12867,7 @@ msgstr ""
 "segment de mémoire partagée a dépassé le paramètre SHMMAX de votre noyau.\n"
 "Vous pouvez soit réduire la taille de la requête soit reconfigurer le noyau\n"
 "avec un SHMMAX plus important. Pour réduire la taille de la requête\n"
-"(actuellement %lu octets), réduisez le paramètre de shared_buffers de\n"
-"PostgreSQL (actuellement %d) et/ou le paramètre max_connections\n"
-"(actuellement %d).\n"
+"(actuellement %lu octets), réduisez l'utilisation de la mémoire partagée par PostgreSQL,par exemple en réduisant shared_buffers ou max_connections\n"
 "Si la taille de la requête est déjà petite, il est possible qu'elle soit\n"
 "moindre que le paramètre SHMMIN de votre noyau, auquel cas, augmentez la\n"
 "taille de la requête ou reconfigurez SHMMIN.\n"
@@ -11918,7 +12878,7 @@ msgstr ""
 #: port/pg_shmem.c:165
 #, c-format
 msgid ""
-"This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory or swap space, or exceeded your kernel's SHMALL parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMALL.  To reduce the request size (currently %lu bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory or swap space, or exceeded your kernel's SHMALL parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMALL.  To reduce the request size (currently %lu bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing shared_buffers or max_connections.\n"
 "The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 "Cette erreur signifie habituellement que la demande de PostgreSQL pour un\n"
@@ -11927,8 +12887,7 @@ msgstr ""
 "Vous pouvez soit réduire la taille demandée soit reconfigurer le noyau avec\n"
 "un SHMALL plus gros.\n"
 "Pour réduire la taille demandée (actuellement %lu octets), diminuez la valeur\n"
-"du paramètre shared_buffers de PostgreSQL (actuellement %d) et/ou le paramètre\n"
-"max_connections (actuellement %d).\n"
+"du paramètre shared_buffers de PostgreSQL ou le paramètre max_connections.\n"
 "La documentation de PostgreSQL contient plus d'informations sur la\n"
 "configuration de la mémoire partagée."
 
@@ -11936,26 +12895,32 @@ msgstr ""
 #: port/pg_shmem.c:176
 #, c-format
 msgid ""
-"This error does *not* mean that you have run out of disk space. It occurs either if all available shared memory IDs have been taken, in which case you need to raise the SHMMNI parameter in your kernel, or because the system's overall limit for shared memory has been reached.  If you cannot increase the shared memory limit, reduce PostgreSQL's shared memory request (currently %lu bytes), by reducing its shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"This error does *not* mean that you have run out of disk space.  It occurs either if all available shared memory IDs have been taken, in which case you need to raise the SHMMNI parameter in your kernel, or because the system's overall limit for shared memory has been reached.  If you cannot increase the shared memory limit, reduce PostgreSQL's shared memory request (currently %lu bytes), perhaps by reducing shared_buffers or max_connections.\n"
 "The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 "Cette erreur ne signifie *pas* que vous manquez d'espace disque. Elle\n"
 "survient si tous les identifiants de mémoire partagé disponibles ont été\n"
-"pris, auquel cas vous devez augmenter le paramètre SHMMIN de votre noyau, ou\n"
+"pris, auquel cas vous devez augmenter le paramètre SHMMNI de votre noyau, ou\n"
 "parce que la limite maximum de la mémoire partagée de votre système a été\n"
 "atteinte. Si vous ne pouvez pas augmenter la limite de la mémoire partagée,\n"
 "réduisez la demande de mémoire partagée de PostgreSQL (actuellement %lu\n"
-"octets) en réduisant le paramètre shared_buffers (actuellement %d) et/ou le\n"
-"paramètre max_connections (actuellement %d).\n"
+"octets) en réduisant le paramètre shared_buffers ou max_connections.\n"
 "La documentation de PostgreSQL contient plus d'informations sur la\n"
 "configuration de la mémoire partagée."
 
-#: port/sysv_shmem.c:431
-#: port/pg_shmem.c:431
+#: port/sysv_shmem.c:439
+#: port/pg_shmem.c:439
 #, c-format
 msgid "could not stat data directory \"%s\": %m"
 msgstr "n'a pas pu lire les informations sur le répertoire des données « %s » : %m"
 
+#: port/unix_latch.c:237
+#: port/pg_latch.c:237
+#: replication/libpqwalreceiver/libpqwalreceiver.c:233
+#, c-format
+msgid "select() failed: %m"
+msgstr "échec de select() : %m"
+
 #: port/win32_sema.c:94
 #, c-format
 msgid "could not create semaphore: error code %d"
@@ -11976,6 +12941,36 @@ msgstr "n'a pas pu d
 msgid "could not try-lock semaphore: error code %d"
 msgstr "n'a pas pu tenter le verrouillage de la sémaphore : code d'erreur %d"
 
+#: port/win32_shmem.c:168
+#: port/win32_shmem.c:203
+#: port/win32_shmem.c:224
+#, c-format
+msgid "could not create shared memory segment: %lu"
+msgstr "n'a pas pu créer le segment de mémoire partagée : %lu"
+
+#: port/win32_shmem.c:169
+#, c-format
+msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
+msgstr "L'appel système qui a échoué était CreateFileMapping(taille=%lu, nom=%s)."
+
+#: port/win32_shmem.c:193
+msgid "pre-existing shared memory block is still in use"
+msgstr "le bloc de mémoire partagé pré-existant est toujours en cours d'utilisation"
+
+#: port/win32_shmem.c:194
+msgid "Check if there are any old server processes still running, and terminate them."
+msgstr ""
+"Vérifier s'il n'y a pas de vieux processus serveur en cours d'exécution. Si c'est le\n"
+"cas, fermez-les."
+
+#: port/win32_shmem.c:204
+msgid "Failed system call was DuplicateHandle."
+msgstr "L'appel système qui a échoué était DuplicateHandle."
+
+#: port/win32_shmem.c:225
+msgid "Failed system call was MapViewOfFileEx."
+msgstr "L'appel système qui a échoué était MapViewOfFileEx."
+
 #: postmaster/autovacuum.c:359
 #, c-format
 msgid "could not fork autovacuum launcher process: %m"
@@ -11989,49 +12984,49 @@ msgstr "lancement du processus autovacuum"
 msgid "autovacuum launcher shutting down"
 msgstr "arrêt du processus autovacuum"
 
-#: postmaster/autovacuum.c:1394
+#: postmaster/autovacuum.c:1395
 #, c-format
 msgid "could not fork autovacuum worker process: %m"
 msgstr "n'a pas pu exécuter le processus autovacuum worker : %m"
 
-#: postmaster/autovacuum.c:1595
+#: postmaster/autovacuum.c:1604
 #, c-format
 msgid "autovacuum: processing database \"%s\""
 msgstr "autovacuum : traitement de la base de données « %s »"
 
-#: postmaster/autovacuum.c:1998
+#: postmaster/autovacuum.c:2007
 #, c-format
 msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
 "autovacuum : suppression de la table temporaire orpheline « %s.%s » dans la\n"
 "base de données « %s »"
 
-#: postmaster/autovacuum.c:2010
+#: postmaster/autovacuum.c:2019
 #, c-format
 msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
 "autovacuum : a trouvé la table temporaire orpheline « %s.%s » dans la base de\n"
 "données « %s »"
 
-#: postmaster/autovacuum.c:2280
+#: postmaster/autovacuum.c:2289
 #, c-format
 msgid "automatic vacuum of table \"%s.%s.%s\""
 msgstr "VACUUM automatique de la table « %s.%s.%s »"
 
-#: postmaster/autovacuum.c:2283
+#: postmaster/autovacuum.c:2292
 #, c-format
 msgid "automatic analyze of table \"%s.%s.%s\""
 msgstr "ANALYZE automatique de la table « %s.%s.%s »"
 
-#: postmaster/autovacuum.c:2761
+#: postmaster/autovacuum.c:2778
 msgid "autovacuum not started because of misconfiguration"
 msgstr "autovacuum non exécuté à cause d'une mauvaise configuration"
 
-#: postmaster/autovacuum.c:2762
+#: postmaster/autovacuum.c:2779
 msgid "Enable the \"track_counts\" option."
 msgstr "Activez l'option « track_counts »."
 
-#: postmaster/bgwriter.c:472
+#: postmaster/bgwriter.c:482
 #, c-format
 msgid "checkpoints are occurring too frequently (%d second apart)"
 msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
@@ -12042,25 +13037,30 @@ msgstr[1] ""
 "les points de vérification (checkpoints) arrivent trop fréquemment\n"
 "(toutes les %d secondes)"
 
-#: postmaster/bgwriter.c:476
+#: postmaster/bgwriter.c:486
 msgid "Consider increasing the configuration parameter \"checkpoint_segments\"."
 msgstr "Considèrez l'augmentation du paramètre « checkpoint_segments »."
 
-#: postmaster/bgwriter.c:588
+#: postmaster/bgwriter.c:598
 #, c-format
 msgid "transaction log switch forced (archive_timeout=%d)"
 msgstr "changement forcé du journal de transaction (archive_timeout=%d)"
 
-#: postmaster/bgwriter.c:1044
+#: postmaster/bgwriter.c:1056
 msgid "checkpoint request failed"
 msgstr "échec de la demande de point de vérification"
 
-#: postmaster/bgwriter.c:1045
+#: postmaster/bgwriter.c:1057
 msgid "Consult recent messages in the server log for details."
 msgstr ""
 "Consultez les messages récents du serveur dans les journaux applicatifs pour\n"
 "plus de détails."
 
+#: postmaster/bgwriter.c:1223
+#, c-format
+msgid "compacted fsync request queue from %d entries to %d entries"
+msgstr "a compacté la queue de requêtes fsync de %d entrées à %d"
+
 #: postmaster/pgarch.c:158
 #, c-format
 msgid "could not fork archiver: %m"
@@ -12095,7 +13095,7 @@ msgid "archive command was terminated by exception 0x%X"
 msgstr "la commande d'archivage a été terminée par l'exception 0x%X"
 
 #: postmaster/pgarch.c:579
-#: postmaster/postmaster.c:2840
+#: postmaster/postmaster.c:2871
 msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr ""
 "Voir le fichier d'en-tête C « ntstatus.h » pour une description de la valeur\n"
@@ -12126,282 +13126,284 @@ msgstr "journal des transactions archiv
 msgid "could not open archive status directory \"%s\": %m"
 msgstr "n'a pas pu accéder au répertoire du statut des archives « %s » : %m"
 
-#: postmaster/pgstat.c:328
+#: postmaster/pgstat.c:330
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "n'a pas pu résoudre « localhost » : %s"
 
-#: postmaster/pgstat.c:351
+#: postmaster/pgstat.c:353
 msgid "trying another address for the statistics collector"
 msgstr "nouvelle tentative avec une autre adresse pour le récupérateur de statistiques"
 
-#: postmaster/pgstat.c:360
+#: postmaster/pgstat.c:362
 #, c-format
 msgid "could not create socket for statistics collector: %m"
 msgstr "n'a pas pu créer la socket pour le récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:372
+#: postmaster/pgstat.c:374
 #, c-format
 msgid "could not bind socket for statistics collector: %m"
 msgstr "n'a pas pu lier la socket au récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:383
+#: postmaster/pgstat.c:385
 #, c-format
 msgid "could not get address of socket for statistics collector: %m"
 msgstr "n'a pas pu obtenir l'adresse de la socket du récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:399
+#: postmaster/pgstat.c:401
 #, c-format
 msgid "could not connect socket for statistics collector: %m"
 msgstr "n'a pas pu connecter la socket au récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:420
+#: postmaster/pgstat.c:422
 #, c-format
 msgid "could not send test message on socket for statistics collector: %m"
 msgstr ""
 "n'a pas pu envoyer le message de tests sur la socket du récupérateur de\n"
 "statistiques : %m"
 
-#: postmaster/pgstat.c:446
-#: postmaster/pgstat.c:2909
+#: postmaster/pgstat.c:448
+#: postmaster/pgstat.c:2996
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "échec du select() dans le récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:461
+#: postmaster/pgstat.c:463
 msgid "test message did not get through on socket for statistics collector"
 msgstr ""
 "le message de test n'a pas pu arriver sur la socket du récupérateur de\n"
 "statistiques : %m"
 
-#: postmaster/pgstat.c:476
+#: postmaster/pgstat.c:478
 #, c-format
 msgid "could not receive test message on socket for statistics collector: %m"
 msgstr ""
 "n'a pas pu recevoir le message de tests sur la socket du récupérateur de\n"
 "statistiques : %m"
 
-#: postmaster/pgstat.c:486
+#: postmaster/pgstat.c:488
 msgid "incorrect test message transmission on socket for statistics collector"
 msgstr ""
 "transmission incorrecte du message de tests sur la socket du récupérateur de\n"
 "statistiques"
 
-#: postmaster/pgstat.c:509
+#: postmaster/pgstat.c:511
 #, c-format
 msgid "could not set statistics collector socket to nonblocking mode: %m"
 msgstr ""
 "n'a pas pu initialiser la socket du récupérateur de statistiques dans le mode\n"
 "non bloquant : %m"
 
-#: postmaster/pgstat.c:519
+#: postmaster/pgstat.c:521
 msgid "disabling statistics collector for lack of working socket"
 msgstr ""
 "désactivation du récupérateur de statistiques à cause du manque de socket\n"
 "fonctionnel"
 
-#: postmaster/pgstat.c:621
+#: postmaster/pgstat.c:623
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr ""
 "n'a pas pu lancer le processus fils correspondant au récupérateur de\n"
 "statistiques : %m"
 
-#: postmaster/pgstat.c:1151
-#: postmaster/pgstat.c:1175
-#: postmaster/pgstat.c:1206
+#: postmaster/pgstat.c:1153
+#: postmaster/pgstat.c:1177
+#: postmaster/pgstat.c:1208
 msgid "must be superuser to reset statistics counters"
 msgstr "doit être super-utilisateur pour réinitialiser les compteurs statistiques"
 
-#: postmaster/pgstat.c:1182
+#: postmaster/pgstat.c:1184
+#: utils/adt/pgstatfuncs.c:1547
 #, c-format
 msgid "unrecognized reset target: \"%s\""
 msgstr "cible reset non reconnu : « %s »"
 
-#: postmaster/pgstat.c:1183
+#: postmaster/pgstat.c:1185
+#: utils/adt/pgstatfuncs.c:1548
 msgid "Target must be \"bgwriter\"."
 msgstr "La cible doit être « bgwriter »."
 
-#: postmaster/pgstat.c:2888
+#: postmaster/pgstat.c:2975
 #, c-format
 msgid "poll() failed in statistics collector: %m"
 msgstr "échec du poll() dans le récupérateur de statistiques : %m"
 
-#: postmaster/pgstat.c:2933
+#: postmaster/pgstat.c:3020
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "n'a pas pu lire le message des statistiques : %m"
 
-#: postmaster/pgstat.c:3190
+#: postmaster/pgstat.c:3291
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier temporaire des statistiques « %s » : %m"
 
-#: postmaster/pgstat.c:3262
+#: postmaster/pgstat.c:3363
 #, c-format
 msgid "could not write temporary statistics file \"%s\": %m"
 msgstr "n'a pas pu écrire le fichier temporaire des statistiques « %s » : %m"
 
-#: postmaster/pgstat.c:3271
+#: postmaster/pgstat.c:3372
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "n'a pas pu fermer le fichier temporaire des statistiques « %s » : %m"
 
-#: postmaster/pgstat.c:3279
+#: postmaster/pgstat.c:3380
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
 msgstr ""
 "n'a pas pu renommer le fichier temporaire des statistiques « %s » en\n"
 "« %s » : %m"
 
-#: postmaster/pgstat.c:3379
-#: postmaster/pgstat.c:3608
+#: postmaster/pgstat.c:3486
+#: postmaster/pgstat.c:3715
 #, c-format
 msgid "could not open statistics file \"%s\": %m"
 msgstr "n'a pas pu ouvrir le fichier de statistiques « %s » : %m"
 
-#: postmaster/pgstat.c:3391
-#: postmaster/pgstat.c:3401
-#: postmaster/pgstat.c:3423
-#: postmaster/pgstat.c:3438
-#: postmaster/pgstat.c:3501
-#: postmaster/pgstat.c:3519
-#: postmaster/pgstat.c:3535
-#: postmaster/pgstat.c:3553
-#: postmaster/pgstat.c:3569
-#: postmaster/pgstat.c:3620
-#: postmaster/pgstat.c:3631
+#: postmaster/pgstat.c:3498
+#: postmaster/pgstat.c:3508
+#: postmaster/pgstat.c:3530
+#: postmaster/pgstat.c:3545
+#: postmaster/pgstat.c:3608
+#: postmaster/pgstat.c:3626
+#: postmaster/pgstat.c:3642
+#: postmaster/pgstat.c:3660
+#: postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3727
+#: postmaster/pgstat.c:3738
 #, c-format
 msgid "corrupted statistics file \"%s\""
 msgstr "fichier de statistiques « %s » corrompu"
 
-#: postmaster/pgstat.c:3925
+#: postmaster/pgstat.c:4036
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr ""
 "corruption de la table hachée de la base de données lors du lancement\n"
 "--- annulation"
 
-#: postmaster/postmaster.c:566
+#: postmaster/postmaster.c:572
 #, c-format
 msgid "%s: invalid argument for option -f: \"%s\"\n"
 msgstr "%s : argument invalide pour l'option -f : « %s »\n"
 
-#: postmaster/postmaster.c:652
+#: postmaster/postmaster.c:658
 #, c-format
 msgid "%s: invalid argument for option -t: \"%s\"\n"
 msgstr "%s : argument invalide pour l'option -t : « %s »\n"
 
-#: postmaster/postmaster.c:703
+#: postmaster/postmaster.c:709
 #, c-format
 msgid "%s: invalid argument: \"%s\"\n"
 msgstr "%s : argument invalide : « %s »\n"
 
-#: postmaster/postmaster.c:728
+#: postmaster/postmaster.c:734
 #, c-format
 msgid "%s: superuser_reserved_connections must be less than max_connections\n"
 msgstr "%s : superuser_reserved_connections doit être inférieur à max_connections\n"
 
-#: postmaster/postmaster.c:733
+#: postmaster/postmaster.c:739
 msgid "WAL archival (archive_mode=on) requires wal_level \"archive\" or \"hot_standby\""
 msgstr ""
 "l'archivage des journaux de transactions (archive_mode=on) nécessite que\n"
 "le paramètre wal_level soit initialisé avec « archive » ou « hot_standby »"
 
-#: postmaster/postmaster.c:736
+#: postmaster/postmaster.c:742
 msgid "WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or \"hot_standby\""
 msgstr ""
 "l'envoi d'un flux de transactions (max_wal_senders > 0) nécessite que\n"
 "le paramètre wal_level soit initialisé avec « archive » ou « hot_standby »"
 
-#: postmaster/postmaster.c:744
+#: postmaster/postmaster.c:750
 #, c-format
 msgid "%s: invalid datetoken tables, please fix\n"
 msgstr "%s : tables datetoken invalide, merci de corriger\n"
 
-#: postmaster/postmaster.c:850
+#: postmaster/postmaster.c:856
 msgid "invalid list syntax for \"listen_addresses\""
 msgstr "syntaxe de liste invalide pour le paramètre « listen_addresses »"
 
-#: postmaster/postmaster.c:871
+#: postmaster/postmaster.c:886
 #, c-format
 msgid "could not create listen socket for \"%s\""
 msgstr "n'a pas pu créer le socket d'écoute pour « %s »"
 
-#: postmaster/postmaster.c:877
+#: postmaster/postmaster.c:892
 msgid "could not create any TCP/IP sockets"
 msgstr "n'a pas pu créer de socket TCP/IP"
 
-#: postmaster/postmaster.c:928
+#: postmaster/postmaster.c:943
 msgid "could not create Unix-domain socket"
 msgstr "n'a pas pu créer le socket domaine Unix"
 
-#: postmaster/postmaster.c:936
+#: postmaster/postmaster.c:951
 msgid "no socket created for listening"
 msgstr "pas de socket créé pour l'écoute"
 
-#: postmaster/postmaster.c:962
+#: postmaster/postmaster.c:985
 msgid "could not create I/O completion port for child queue"
 msgstr "n'a pas pu créer un port de terminaison I/O pour la queue"
 
-#: postmaster/postmaster.c:1006
+#: postmaster/postmaster.c:1029
 #, c-format
 msgid "%s: could not write external PID file \"%s\": %s\n"
 msgstr "%s : n'a pas pu écrire le fichier PID externe « %s » : %s\n"
 
-#: postmaster/postmaster.c:1074
+#: postmaster/postmaster.c:1097
 #: utils/init/postinit.c:197
 msgid "could not load pg_hba.conf"
 msgstr "n'a pas pu charger pg_hba.conf"
 
-#: postmaster/postmaster.c:1121
+#: postmaster/postmaster.c:1144
 #, c-format
 msgid "%s: could not locate matching postgres executable"
 msgstr "%s : n'a pas pu localiser l'exécutable postgres correspondant"
 
-#: postmaster/postmaster.c:1144
-#: utils/misc/tzparser.c:347
+#: postmaster/postmaster.c:1167
+#: utils/misc/tzparser.c:325
 #, c-format
 msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
 msgstr "Ceci peut indiquer une installation PostgreSQL incomplète, ou que le fichier « %s » a été déplacé."
 
-#: postmaster/postmaster.c:1172
+#: postmaster/postmaster.c:1195
 #, c-format
 msgid "data directory \"%s\" does not exist"
 msgstr "le répertoire des données « %s » n'existe pas"
 
-#: postmaster/postmaster.c:1177
+#: postmaster/postmaster.c:1200
 #, c-format
 msgid "could not read permissions of directory \"%s\": %m"
 msgstr "n'a pas pu lire les droits du répertoire « %s » : %m"
 
-#: postmaster/postmaster.c:1185
+#: postmaster/postmaster.c:1208
 #, c-format
 msgid "specified data directory \"%s\" is not a directory"
 msgstr "le répertoire des données « %s » n'est pas un répertoire"
 
-#: postmaster/postmaster.c:1201
+#: postmaster/postmaster.c:1224
 #, c-format
 msgid "data directory \"%s\" has wrong ownership"
 msgstr "le répertoire des données « %s » a un mauvais propriétaire"
 
-#: postmaster/postmaster.c:1203
+#: postmaster/postmaster.c:1226
 msgid "The server must be started by the user that owns the data directory."
 msgstr ""
 "Le serveur doit être en cours d'exécution par l'utilisateur qui possède le\n"
 "répertoire des données."
 
-#: postmaster/postmaster.c:1223
+#: postmaster/postmaster.c:1246
 #, c-format
 msgid "data directory \"%s\" has group or world access"
 msgstr ""
 "le répertoire des données « %s » est accessible par le groupe et/ou par les\n"
 "autres"
 
-#: postmaster/postmaster.c:1225
+#: postmaster/postmaster.c:1248
 msgid "Permissions should be u=rwx (0700)."
 msgstr "Les droits devraient être u=rwx (0700)."
 
-#: postmaster/postmaster.c:1236
+#: postmaster/postmaster.c:1259
 #, c-format
 msgid ""
 "%s: could not find the database system\n"
@@ -12412,718 +13414,840 @@ msgstr ""
 "S'attendait à le trouver dans le répertoire « %s »,\n"
 "mais n'a pas réussi à ouvrir le fichier « %s »: %s\n"
 
-#: postmaster/postmaster.c:1272
+#: postmaster/postmaster.c:1295
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier « %s » : %s\n"
 
-#: postmaster/postmaster.c:1279
+#: postmaster/postmaster.c:1302
 #, c-format
 msgid "%s: could not open log file \"%s/%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le journal applicatif « %s/%s » : %s\n"
 
-#: postmaster/postmaster.c:1290
+#: postmaster/postmaster.c:1313
 #, c-format
 msgid "%s: could not fork background process: %s\n"
 msgstr "%s : n'a pas pu créer un processus fils : %s\n"
 
-#: postmaster/postmaster.c:1312
+#: postmaster/postmaster.c:1335
 #, c-format
 msgid "%s: could not dissociate from controlling TTY: %s\n"
 msgstr "%s : n'a pas pu se dissocier du TTY contrôlant : %s\n"
 
-#: postmaster/postmaster.c:1407
+#: postmaster/postmaster.c:1430
 #, c-format
 msgid "select() failed in postmaster: %m"
 msgstr "échec de select() dans postmaster : %m"
 
-#: postmaster/postmaster.c:1564
-#: postmaster/postmaster.c:1595
+#: postmaster/postmaster.c:1592
+#: postmaster/postmaster.c:1623
 msgid "incomplete startup packet"
 msgstr "paquet de démarrage incomplet"
 
-#: postmaster/postmaster.c:1576
+#: postmaster/postmaster.c:1604
 msgid "invalid length of startup packet"
 msgstr "longueur invalide du paquet de démarrage"
 
-#: postmaster/postmaster.c:1633
+#: postmaster/postmaster.c:1661
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr "échec lors de l'envoi de la réponse de négotiation SSL : %m"
 
-#: postmaster/postmaster.c:1662
+#: postmaster/postmaster.c:1690
 #, c-format
 msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
 "Protocole non supportée de l'interface %u.%u : le serveur supporte de %u.0 à\n"
 "%u.%u"
 
-#: postmaster/postmaster.c:1713
+#: postmaster/postmaster.c:1741
 msgid "invalid value for boolean option \"replication\""
 msgstr "valeur invalide pour l'option booléenne « replication »"
 
-#: postmaster/postmaster.c:1733
+#: postmaster/postmaster.c:1761
 msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr ""
 "configuration invalide du paquet de démarrage : terminaison attendue comme\n"
 "dernier octet"
 
-#: postmaster/postmaster.c:1761
+#: postmaster/postmaster.c:1789
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "aucun nom d'utilisateur PostgreSQL n'a été spécifié dans le paquet de démarrage"
 
-#: postmaster/postmaster.c:1818
+#: postmaster/postmaster.c:1846
 msgid "the database system is starting up"
 msgstr "le système de bases de données se lance"
 
-#: postmaster/postmaster.c:1823
+#: postmaster/postmaster.c:1851
 msgid "the database system is shutting down"
 msgstr "le système de base de données s'arrête"
 
-#: postmaster/postmaster.c:1828
+#: postmaster/postmaster.c:1856
 msgid "the database system is in recovery mode"
 msgstr "le système de bases de données est en cours de restauration"
 
-#: postmaster/postmaster.c:1895
+#: postmaster/postmaster.c:1923
 #, c-format
 msgid "wrong key in cancel request for process %d"
 msgstr "mauvaise clé dans la demande d'annulation pour le processus %d"
 
-#: postmaster/postmaster.c:1903
+#: postmaster/postmaster.c:1931
 #, c-format
 msgid "PID %d in cancel request did not match any process"
 msgstr "le PID %d dans la demande d'annulation ne correspond à aucun processus"
 
-#: postmaster/postmaster.c:2109
+#: postmaster/postmaster.c:2137
 msgid "received SIGHUP, reloading configuration files"
 msgstr "a reçu SIGHUP, rechargement des fichiers de configuration"
 
-#: postmaster/postmaster.c:2132
+#: postmaster/postmaster.c:2160
 msgid "pg_hba.conf not reloaded"
 msgstr "pg_hba.conf non lu"
 
-#: postmaster/postmaster.c:2175
+#: postmaster/postmaster.c:2203
 msgid "received smart shutdown request"
 msgstr "a reçu une demande d'arrêt intelligent"
 
-#: postmaster/postmaster.c:2222
+#: postmaster/postmaster.c:2250
 msgid "received fast shutdown request"
 msgstr "a reçu une demande d'arrêt rapide"
 
-#: postmaster/postmaster.c:2240
+#: postmaster/postmaster.c:2268
 msgid "aborting any active transactions"
 msgstr "annulation des transactions actives"
 
-#: postmaster/postmaster.c:2269
+#: postmaster/postmaster.c:2297
 msgid "received immediate shutdown request"
 msgstr "a reçu une demande d'arrêt immédiat"
 
-#: postmaster/postmaster.c:2345
 #: postmaster/postmaster.c:2373
+#: postmaster/postmaster.c:2401
 msgid "startup process"
 msgstr "processus de lancement"
 
-#: postmaster/postmaster.c:2348
+#: postmaster/postmaster.c:2376
 msgid "aborting startup due to startup process failure"
 msgstr "annulation du démarrage à cause d'un échec dans le processus de lancement"
 
-#: postmaster/postmaster.c:2407
+#: postmaster/postmaster.c:2435
 msgid "database system is ready to accept connections"
 msgstr "le système de bases de données est prêt pour accepter les connexions"
 
-#: postmaster/postmaster.c:2462
+#: postmaster/postmaster.c:2490
 msgid "background writer process"
 msgstr "processus d'écriture en tâche de fond"
 
-#: postmaster/postmaster.c:2478
+#: postmaster/postmaster.c:2506
 msgid "WAL writer process"
 msgstr "processus d'écriture des journaux de transaction"
 
-#: postmaster/postmaster.c:2492
+#: postmaster/postmaster.c:2520
 msgid "WAL receiver process"
 msgstr "processus de réception des journaux de transaction"
 
-#: postmaster/postmaster.c:2507
+#: postmaster/postmaster.c:2535
 msgid "autovacuum launcher process"
 msgstr "processus de l'autovacuum"
 
-#: postmaster/postmaster.c:2522
+#: postmaster/postmaster.c:2550
 msgid "archiver process"
 msgstr "processus d'archivage"
 
-#: postmaster/postmaster.c:2538
+#: postmaster/postmaster.c:2566
 msgid "statistics collector process"
 msgstr "processus de récupération des statistiques"
 
-#: postmaster/postmaster.c:2552
+#: postmaster/postmaster.c:2580
 msgid "system logger process"
 msgstr "processus des journaux applicatifs"
 
-#: postmaster/postmaster.c:2587
-#: postmaster/postmaster.c:2603
-#: postmaster/postmaster.c:2610
-#: postmaster/postmaster.c:2628
+#: postmaster/postmaster.c:2615
+#: postmaster/postmaster.c:2634
+#: postmaster/postmaster.c:2641
+#: postmaster/postmaster.c:2659
 msgid "server process"
 msgstr "processus serveur"
 
-#: postmaster/postmaster.c:2664
+#: postmaster/postmaster.c:2695
 msgid "terminating any other active server processes"
 msgstr "arrêt des autres processus serveur actifs"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2829
+#: postmaster/postmaster.c:2860
 #, c-format
 msgid "%s (PID %d) exited with exit code %d"
 msgstr "%s (PID %d) quitte avec le code de sortie %d"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2838
+#: postmaster/postmaster.c:2869
 #, c-format
 msgid "%s (PID %d) was terminated by exception 0x%X"
 msgstr "%s (PID %d) a été arrêté par l'exception 0x%X"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2847
+#: postmaster/postmaster.c:2878
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d: %s"
 msgstr "%s (PID %d) a été arrêté par le signal %d : %s"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2857
+#: postmaster/postmaster.c:2888
 #, c-format
 msgid "%s (PID %d) was terminated by signal %d"
 msgstr "%s (PID %d) a été arrêté par le signal %d"
 
 #. translator: %s is a noun phrase describing a child process, such as
 #. "server process"
-#: postmaster/postmaster.c:2866
+#: postmaster/postmaster.c:2897
 #, c-format
 msgid "%s (PID %d) exited with unrecognized status %d"
 msgstr "%s (PID %d) a quitté avec le statut inattendu %d"
 
-#: postmaster/postmaster.c:3046
+#: postmaster/postmaster.c:3077
 msgid "abnormal database system shutdown"
 msgstr "le système de base de données a été arrêté anormalement"
 
-#: postmaster/postmaster.c:3084
+#: postmaster/postmaster.c:3116
 msgid "all server processes terminated; reinitializing"
 msgstr "tous les processus serveur se sont arrêtés, réinitialisation"
 
-#: postmaster/postmaster.c:3256
+#: postmaster/postmaster.c:3299
 #, c-format
 msgid "could not fork new process for connection: %m"
 msgstr "n'a pas pu lancer le nouveau processus fils pour la connexion : %m"
 
-#: postmaster/postmaster.c:3298
+#: postmaster/postmaster.c:3341
 msgid "could not fork new process for connection: "
 msgstr "n'a pas pu lancer le nouveau processus fils pour la connexion : "
 
-#: postmaster/postmaster.c:3412
+#: postmaster/postmaster.c:3455
 #, c-format
 msgid "connection received: host=%s port=%s"
 msgstr "connexion reçue : hôte=%s port=%s"
 
-#: postmaster/postmaster.c:3417
+#: postmaster/postmaster.c:3460
 #, c-format
 msgid "connection received: host=%s"
 msgstr "connexion reçue : hôte=%s"
 
-#: postmaster/postmaster.c:3684
+#: postmaster/postmaster.c:3729
 #, c-format
 msgid "could not execute server process \"%s\": %m"
 msgstr "n'a pas pu exécuter le processus serveur « %s » : %m"
 
-#: postmaster/postmaster.c:4201
+#: postmaster/postmaster.c:4246
 msgid "database system is ready to accept read only connections"
 msgstr "le système de bases de données est prêt pour accepter les connexions en lecture seule"
 
-#: postmaster/postmaster.c:4442
+#: postmaster/postmaster.c:4513
 #, c-format
 msgid "could not fork startup process: %m"
 msgstr "n'a pas pu lancer le processus fils de démarrage : %m"
 
-#: postmaster/postmaster.c:4446
+#: postmaster/postmaster.c:4517
 #, c-format
 msgid "could not fork background writer process: %m"
 msgstr ""
 "n'a pas pu créer un processus fils du processus d'écriture en tâche de\n"
 "fond : %m"
 
-#: postmaster/postmaster.c:4450
+#: postmaster/postmaster.c:4521
 #, c-format
 msgid "could not fork WAL writer process: %m"
 msgstr ""
 "n'a pas pu créer un processus fils du processus d'écriture des journaux de\n"
 "transaction : %m"
 
-#: postmaster/postmaster.c:4454
+#: postmaster/postmaster.c:4525
 #, c-format
 msgid "could not fork WAL receiver process: %m"
 msgstr ""
 "n'a pas pu créer un processus fils de réception des journaux de\n"
 "transactions : %m"
 
-#: postmaster/postmaster.c:4458
+#: postmaster/postmaster.c:4529
 #, c-format
 msgid "could not fork process: %m"
 msgstr "n'a pas pu lancer le processus fils : %m"
 
-#: postmaster/postmaster.c:4740
+#: postmaster/postmaster.c:4811
 #, c-format
 msgid "could not duplicate socket %d for use in backend: error code %d"
 msgstr "n'a pas pu dupliquer la socket %d pour le serveur : code d'erreur %d"
 
-#: postmaster/postmaster.c:4772
+#: postmaster/postmaster.c:4843
 #, c-format
 msgid "could not create inherited socket: error code %d\n"
 msgstr "n'a pas pu créer la socket héritée : code d'erreur %d\n"
 
-#: postmaster/postmaster.c:4801
-#: postmaster/postmaster.c:4808
+#: postmaster/postmaster.c:4872
+#: postmaster/postmaster.c:4879
 #, c-format
 msgid "could not read from backend variables file \"%s\": %s\n"
 msgstr "n'a pas pu lire le fichier de configuration serveur « %s » : %s\n"
 
-#: postmaster/postmaster.c:4817
+#: postmaster/postmaster.c:4888
 #, c-format
 msgid "could not remove file \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le fichier « %s » : %s\n"
 
-#: postmaster/postmaster.c:4834
+#: postmaster/postmaster.c:4905
 #, c-format
 msgid "could not map view of backend variables: error code %d\n"
 msgstr ""
 "n'a pas pu exécuter MapViewOfFile sur les variables de configuration : code\n"
 "d'erreur %d\n"
 
-#: postmaster/postmaster.c:4843
+#: postmaster/postmaster.c:4914
 #, c-format
 msgid "could not unmap view of backend variables: error code %d\n"
 msgstr ""
 "n'a pas pu exécuter UnmapViewOfFile sur les variables de configuration : code\n"
 "d'erreur %d\n"
 
-#: postmaster/postmaster.c:4850
+#: postmaster/postmaster.c:4921
 #, c-format
 msgid "could not close handle to backend parameter variables: error code %d\n"
 msgstr ""
 "n'a pas pu fermer le lien vers les variables des paramètres du serveur :\n"
 "code d'erreur %d\n"
 
-#: postmaster/postmaster.c:4993
+#: postmaster/postmaster.c:5064
 msgid "could not read exit code for process\n"
 msgstr "n'a pas pu lire le code de sortie du processus\n"
 
-#: postmaster/postmaster.c:4998
+#: postmaster/postmaster.c:5069
 msgid "could not post child completion status\n"
 msgstr "n'a pas pu poster le statut de fin de l'enfant\n"
 
-#: postmaster/syslogger.c:387
+#: postmaster/syslogger.c:390
 #, c-format
 msgid "select() failed in logger process: %m"
 msgstr "échec de select() dans le processus des journaux applicatifs : %m"
 
-#: postmaster/syslogger.c:399
-#: postmaster/syslogger.c:973
+#: postmaster/syslogger.c:402
+#: postmaster/syslogger.c:968
 #, c-format
 msgid "could not read from logger pipe: %m"
 msgstr "n'a pas pu lire à partir du tube des journaux applicatifs : %m"
 
-#: postmaster/syslogger.c:446
+#: postmaster/syslogger.c:449
 msgid "logger shutting down"
 msgstr "arrêt en cours des journaux applicatifs"
 
-#: postmaster/syslogger.c:490
-#: postmaster/syslogger.c:504
+#: postmaster/syslogger.c:493
+#: postmaster/syslogger.c:507
 #, c-format
 msgid "could not create pipe for syslog: %m"
 msgstr "n'a pas pu créer un tube pour syslog : %m"
 
-#: postmaster/syslogger.c:524
-#: postmaster/syslogger.c:1012
-#, c-format
-msgid "could not create log file \"%s\": %m"
-msgstr "n'a pas pu créer le journal applicatif « %s » : %m"
-
-#: postmaster/syslogger.c:539
+#: postmaster/syslogger.c:534
 #, c-format
 msgid "could not fork system logger: %m"
 msgstr "n'a pas pu lancer le processus des journaux applicatifs : %m"
 
-#: postmaster/syslogger.c:570
+#: postmaster/syslogger.c:565
 #, c-format
 msgid "could not redirect stdout: %m"
 msgstr "n'a pas pu rediriger la sortie (stdout) : %m"
 
-#: postmaster/syslogger.c:575
-#: postmaster/syslogger.c:593
+#: postmaster/syslogger.c:570
+#: postmaster/syslogger.c:588
 #, c-format
 msgid "could not redirect stderr: %m"
 msgstr "n'a pas pu rediriger la sortie des erreurs (stderr) : %m"
 
-#: postmaster/syslogger.c:928
+#: postmaster/syslogger.c:923
 #, c-format
 msgid "could not write to log file: %s\n"
 msgstr "n'a pas pu écrire dans le journal applicatif : %s\n"
 
-#: postmaster/syslogger.c:1083
-#: postmaster/syslogger.c:1141
+#: postmaster/syslogger.c:1042
 #, c-format
-msgid "could not open new log file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le nouveau journal applicatif « %s » : %m"
+msgid "could not open log file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier applicatif « %s » : %m"
 
-#: postmaster/syslogger.c:1095
-#: postmaster/syslogger.c:1153
+#: postmaster/syslogger.c:1111
+#: postmaster/syslogger.c:1156
 msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr "désactivation de la rotation automatique (utilisez SIGHUP pour la réactiver)"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:99
+#: regex/regc_pg_locale.c:258
+#: utils/adt/selfuncs.c:5028
+msgid "could not determine which collation to use for regular expression"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour une expression rationnelle"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:101
 #, c-format
 msgid "could not connect to the primary server: %s"
 msgstr "n'a pas pu se connecter au serveur principal : %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:111
+#: replication/libpqwalreceiver/libpqwalreceiver.c:113
 #, c-format
 msgid "could not receive database system identifier and timeline ID from the primary server: %s"
 msgstr ""
 "n'a pas pu recevoir l'identifiant du système de bases de données et\n"
 "l'identifiant de la timeline à partir du serveur principal : %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:122
+#: replication/libpqwalreceiver/libpqwalreceiver.c:124
 msgid "invalid response from primary server"
 msgstr "réponse invalide du serveur principal"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:123
+#: replication/libpqwalreceiver/libpqwalreceiver.c:125
 #, c-format
-msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
-msgstr "Attendait 1 ligne avec 2 champs, a obtenu %d lignes avec %d champs."
+msgid "Expected 1 tuple with 3 fields, got %d tuples with %d fields."
+msgstr "Attendait 1 ligne avec 3 champs, a obtenu %d lignes avec %d champs."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:138
+#: replication/libpqwalreceiver/libpqwalreceiver.c:140
 msgid "database system identifier differs between the primary and standby"
 msgstr ""
 "l'identifiant du système de bases de données diffère entre le serveur principal\n"
 "et le serveur en attente"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:139
+#: replication/libpqwalreceiver/libpqwalreceiver.c:141
 #, c-format
 msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr ""
 "L'identifiant du serveur principal est %s, l'identifiant du serveur en attente\n"
 "est %s."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:151
+#: replication/libpqwalreceiver/libpqwalreceiver.c:153
 #, c-format
 msgid "timeline %u of the primary does not match recovery target timeline %u"
 msgstr ""
 "le timeline %u du serveur principal ne correspond pas au timeline %u de la\n"
 "cible de restauration"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:163
+#: replication/libpqwalreceiver/libpqwalreceiver.c:165
 #, c-format
 msgid "could not start WAL streaming: %s"
 msgstr "n'a pas pu démarrer l'envoi des WAL : %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:169
+#: replication/libpqwalreceiver/libpqwalreceiver.c:171
 msgid "streaming replication successfully connected to primary"
 msgstr "réplication de flux connecté avec succès au serveur principal"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:191
+#: replication/libpqwalreceiver/libpqwalreceiver.c:193
 msgid "socket not open"
 msgstr "socket non ouvert"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:231
-#, c-format
-msgid "select() failed: %m"
-msgstr "échec de select() : %m"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:364
-#: replication/libpqwalreceiver/libpqwalreceiver.c:385
-#: replication/libpqwalreceiver/libpqwalreceiver.c:390
+#: replication/libpqwalreceiver/libpqwalreceiver.c:367
+#: replication/libpqwalreceiver/libpqwalreceiver.c:388
+#: replication/libpqwalreceiver/libpqwalreceiver.c:393
 #, c-format
 msgid "could not receive data from WAL stream: %s"
 msgstr "n'a pas pu recevoir des données du flux de WAL : %s"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:381
+#: replication/libpqwalreceiver/libpqwalreceiver.c:384
 msgid "replication terminated by primary server"
 msgstr "réplication terminée par le serveur primaire"
 
-#: replication/walreceiver.c:138
+#: replication/libpqwalreceiver/libpqwalreceiver.c:415
+#, c-format
+msgid "could not send data to WAL stream: %s"
+msgstr "n'a pas pu transmettre les données au flux WAL : %s"
+
+#: replication/walreceiver.c:150
 msgid "terminating walreceiver process due to administrator command"
 msgstr "arrêt du processus walreceiver suite à la demande de l'administrateur"
 
-#: replication/walreceiver.c:287
+#: replication/walreceiver.c:299
 msgid "cannot continue WAL streaming, recovery has already ended"
 msgstr "ne peut pas continuer le flux de journaux de transactions, la récupération est déjà terminée"
 
-#: replication/walsender.c:116
+#: replication/walsender.c:141
 msgid "recovery is still in progress, can't accept WAL streaming connections"
 msgstr "la restauration est en cours, ne peut pas accepter les connexions de flux WAL"
 
-#: replication/walsender.c:278
+#: replication/walsender.c:261
+#: replication/walsender.c:489
+#: replication/walsender.c:547
+msgid "unexpected EOF on standby connection"
+msgstr "fin de fichier (EOF) inattendue de la connexion du serveur en attente"
+
+#: replication/walsender.c:267
+#, c-format
+msgid "invalid standby handshake message type %d"
+msgstr "type %d du message de handshake du serveur en attente invalide"
+
+#: replication/walsender.c:379
 msgid "standby connections not allowed because wal_level=minimal"
 msgstr "connexions standby non autorisées car wal_level=minimal"
 
-#: replication/walsender.c:300
+#: replication/walsender.c:461
 #, c-format
 msgid "invalid standby query string: %s"
 msgstr "chaîne de requête invalide sur le serveur en attente : %s"
 
-#: replication/walsender.c:313
-#: replication/walsender.c:339
-msgid "unexpected EOF on standby connection"
-msgstr "fin de fichier (EOF) inattendue de la connexion du serveur en attente"
+#: replication/walsender.c:518
+#, c-format
+msgid "invalid standby message type \"%c\""
+msgstr "type de message « %c » invalide pour le serveur en standby"
 
-#: replication/walsender.c:319
+#: replication/walsender.c:569
 #, c-format
-msgid "invalid standby handshake message type %d"
-msgstr "type %d du message de handshake du serveur en attente invalide"
+msgid "unexpected message type \"%c\""
+msgstr "type de message « %c » inattendu"
 
-#: replication/walsender.c:360
+#: replication/walsender.c:822
+msgid "terminating walsender process due to replication timeout"
+msgstr "arrêt du processus walreceiver suite à l'expiration du délai de réplication"
+
+#: replication/walsender.c:838
 #, c-format
-msgid "invalid standby closing message type %d"
-msgstr "type %d du message de fermeture du serveur en attente invalide"
+msgid "standby \"%s\" has now caught up with primary"
+msgstr "le serveur standby « %s » a maintenant rattrapé le serveur primaire"
 
-#: replication/walsender.c:506
+#: replication/walsender.c:907
 #, c-format
 msgid "number of requested standby connections exceeds max_wal_senders (currently %d)"
 msgstr ""
 "le nombre de connexions demandées par le serveur en attente dépasse\n"
 "max_wal_senders (actuellement %d)"
 
-#: replication/walsender.c:578
-#: replication/walsender.c:640
+#: replication/walsender.c:985
+#: replication/walsender.c:1047
 #, c-format
 msgid "requested WAL segment %s has already been removed"
 msgstr "le segment demandé du journal de transaction, %s, a déjà été supprimé"
 
-#: replication/walsender.c:611
+#: replication/walsender.c:1018
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
 msgstr ""
 "n'a pas pu lire le journal de transactions %u, segment %u au décalage %u,\n"
 "longueur %lu : %m"
 
-#: rewrite/rewriteDefine.c:108
-#: rewrite/rewriteDefine.c:756
+#: replication/basebackup.c:122
+#: replication/basebackup.c:631
+#, c-format
+msgid "could not read symbolic link \"%s\": %m"
+msgstr "n'a pas pu lire le lien symbolique « %s » : %m"
+
+#: replication/basebackup.c:231
+#: replication/basebackup.c:743
+msgid "base backup could not send data, aborting backup"
+msgstr "la sauvegarde de base n'a pas pu envoyer les données, annulation de la sauvegarde"
+
+#: replication/basebackup.c:278
+#: replication/basebackup.c:287
+#: replication/basebackup.c:296
+#: replication/basebackup.c:305
+#: replication/basebackup.c:314
+#, c-format
+msgid "duplicate option \"%s\""
+msgstr "option « %s » dupliquée"
+
+#: replication/basebackup.c:366
+#, c-format
+msgid "could not open directory \"pg_tblspc\": %m"
+msgstr "n'a pas pu ouvrir le répertoire « pg_tblspc » : %m"
+
+#: replication/basebackup.c:576
+msgid "shutdown requested, aborting active base backup"
+msgstr "arrêt demandé, annulation de la sauvegarde active de base"
+
+#: replication/basebackup.c:589
+#, c-format
+msgid "could not stat file or directory \"%s\": %m"
+msgstr ""
+"n'a pas pu récupérer les informations sur le fichier ou répertoire\n"
+"« %s » : %m"
+
+#: replication/basebackup.c:660
+#, c-format
+msgid "skipping special file \"%s\""
+msgstr "ignore le fichier spécial « %s »"
+
+#: replication/basebackup.c:733
+#, c-format
+msgid "archive member \"%s\" too large for tar format"
+msgstr "membre « %s » de l'archive trop volumineux pour le format tar"
+
+#: replication/syncrep.c:210
+msgid "canceling the wait for synchronous replication and terminating connection due to administrator command"
+msgstr ""
+"annulation de l'attente pour la réplication synchrone et arrêt des connexions\n"
+"suite à la demande de l'administrateur"
+
+#: replication/syncrep.c:211
+#: replication/syncrep.c:228
+msgid "The transaction has already committed locally, but might not have been replicated to the standby."
+msgstr ""
+"La transaction a déjà enregistré les données localement, mais il se peut que\n"
+"cela n'ait pas été répliqué sur le serveur en standby."
+
+#: replication/syncrep.c:227
+msgid "canceling wait for synchronous replication due to user request"
+msgstr "annulation de l'attente pour la réplication synchrone à la demande de l'utilisateur"
+
+#: replication/syncrep.c:358
+#, c-format
+msgid "standby \"%s\" now has synchronous standby priority %u"
+msgstr ""
+"le serveur « %s » en standby a maintenant une priorité %u en tant que standby\n"
+"synchrone"
+
+#: replication/syncrep.c:451
+#, c-format
+msgid "standby \"%s\" is now the synchronous standby with priority %u"
+msgstr "le serveur « %s » en standby est maintenant le serveur standby synchrone de priorité %u"
+
+#: repl_scanner.l:76
+msgid "invalid streaming start location"
+msgstr "emplacement de démarrage du flux de réplication invalide"
+
+#: repl_scanner.l:107
+#, c-format
+msgid "syntax error: unexpected character \"%s\""
+msgstr "erreur de syntaxe : caractère « %s » inattendu"
+
+#: rewrite/rewriteDefine.c:109
+#: rewrite/rewriteDefine.c:769
 #, c-format
 msgid "rule \"%s\" for relation \"%s\" already exists"
 msgstr "la règle « %s » existe déjà pour la relation « %s »"
 
-#: rewrite/rewriteDefine.c:282
+#: rewrite/rewriteDefine.c:287
 msgid "rule actions on OLD are not implemented"
 msgstr "les actions de la règle sur OLD ne sont pas implémentées"
 
-#: rewrite/rewriteDefine.c:283
+#: rewrite/rewriteDefine.c:288
 msgid "Use views or triggers instead."
 msgstr "Utilisez à la place des vues ou des triggers."
 
-#: rewrite/rewriteDefine.c:287
+#: rewrite/rewriteDefine.c:292
 msgid "rule actions on NEW are not implemented"
 msgstr "les actions de la règle sur NEW ne sont pas implémentées"
 
-#: rewrite/rewriteDefine.c:288
+#: rewrite/rewriteDefine.c:293
 msgid "Use triggers instead."
 msgstr "Utilisez des triggers à la place."
 
-#: rewrite/rewriteDefine.c:301
+#: rewrite/rewriteDefine.c:306
 msgid "INSTEAD NOTHING rules on SELECT are not implemented"
 msgstr "les règles INSTEAD NOTHING sur SELECT ne sont pas implémentées"
 
-#: rewrite/rewriteDefine.c:302
+#: rewrite/rewriteDefine.c:307
 msgid "Use views instead."
 msgstr "Utilisez les vues à la place."
 
-#: rewrite/rewriteDefine.c:310
+#: rewrite/rewriteDefine.c:315
 msgid "multiple actions for rules on SELECT are not implemented"
 msgstr "les actions multiples pour les règles sur SELECT ne sont pas implémentées"
 
-#: rewrite/rewriteDefine.c:322
+#: rewrite/rewriteDefine.c:327
 msgid "rules on SELECT must have action INSTEAD SELECT"
 msgstr "les règles sur SELECT doivent avoir une action INSTEAD SELECT"
 
-#: rewrite/rewriteDefine.c:330
+#: rewrite/rewriteDefine.c:335
+msgid "rules on SELECT must not contain data-modifying statements in WITH"
+msgstr ""
+"les règles sur SELECT ne doivent pas contenir d'instructions de modification\n"
+"de données avec WITH"
+
+#: rewrite/rewriteDefine.c:343
 msgid "event qualifications are not implemented for rules on SELECT"
 msgstr ""
 "les qualifications d'événements ne sont pas implémentées pour les règles sur\n"
 "SELECT"
 
-#: rewrite/rewriteDefine.c:355
+#: rewrite/rewriteDefine.c:368
 #, c-format
 msgid "\"%s\" is already a view"
 msgstr "« %s » est déjà une vue"
 
-#: rewrite/rewriteDefine.c:379
+#: rewrite/rewriteDefine.c:392
 #, c-format
 msgid "view rule for \"%s\" must be named \"%s\""
 msgstr "la règle de la vue pour « %s » doit être nommée « %s »"
 
-#: rewrite/rewriteDefine.c:404
+#: rewrite/rewriteDefine.c:417
 #, c-format
 msgid "could not convert table \"%s\" to a view because it is not empty"
 msgstr "n'a pas pu convertir la table « %s » en une vue car elle n'est pas vide"
 
-#: rewrite/rewriteDefine.c:411
+#: rewrite/rewriteDefine.c:424
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has triggers"
 msgstr "n'a pas pu convertir la table « %s » en une vue parce qu'elle a des triggers"
 
-#: rewrite/rewriteDefine.c:413
+#: rewrite/rewriteDefine.c:426
 msgid "In particular, the table cannot be involved in any foreign key relationships."
 msgstr ""
 "En particulier, la table ne peut pas être impliquée dans les relations des\n"
 "clés étrangères."
 
-#: rewrite/rewriteDefine.c:418
+#: rewrite/rewriteDefine.c:431
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has indexes"
 msgstr "n'a pas pu convertir la table « %s » en une vue parce qu'elle a des index"
 
-#: rewrite/rewriteDefine.c:424
+#: rewrite/rewriteDefine.c:437
 #, c-format
 msgid "could not convert table \"%s\" to a view because it has child tables"
 msgstr "n'a pas pu convertir la table « %s » en une vue parce qu'elle a des tables filles"
 
-#: rewrite/rewriteDefine.c:451
+#: rewrite/rewriteDefine.c:464
 msgid "cannot have multiple RETURNING lists in a rule"
 msgstr "ne peut pas avoir plusieurs listes RETURNING dans une règle"
 
-#: rewrite/rewriteDefine.c:456
+#: rewrite/rewriteDefine.c:469
 msgid "RETURNING lists are not supported in conditional rules"
 msgstr "les listes RETURNING ne sont pas supportés dans des règles conditionnelles"
 
-#: rewrite/rewriteDefine.c:460
+#: rewrite/rewriteDefine.c:473
 msgid "RETURNING lists are not supported in non-INSTEAD rules"
 msgstr "les listes RETURNING ne sont pas supportés dans des règles autres que INSTEAD"
 
-#: rewrite/rewriteDefine.c:539
+#: rewrite/rewriteDefine.c:552
 msgid "SELECT rule's target list has too many entries"
 msgstr "la liste cible de la règle SELECT a trop d'entrées"
 
-#: rewrite/rewriteDefine.c:540
+#: rewrite/rewriteDefine.c:553
 msgid "RETURNING list has too many entries"
 msgstr "la liste RETURNING a trop d'entrées"
 
-#: rewrite/rewriteDefine.c:556
+#: rewrite/rewriteDefine.c:569
 msgid "cannot convert relation containing dropped columns to view"
 msgstr "ne peut pas convertir la relation contenant les colonnes supprimées de la vue"
 
-#: rewrite/rewriteDefine.c:561
+#: rewrite/rewriteDefine.c:574
 #, c-format
 msgid "SELECT rule's target entry %d has different column name from \"%s\""
 msgstr ""
 "l'entrée cible de la règle SELECT %d a des noms de colonnes différents à\n"
 "partir de « %s »"
 
-#: rewrite/rewriteDefine.c:567
+#: rewrite/rewriteDefine.c:580
 #, c-format
 msgid "SELECT rule's target entry %d has different type from column \"%s\""
 msgstr "l'entrée cible de la règle SELECT %d a plusieurs types pour la colonne « %s »"
 
-#: rewrite/rewriteDefine.c:569
+#: rewrite/rewriteDefine.c:582
 #, c-format
 msgid "RETURNING list's entry %d has different type from column \"%s\""
 msgstr "l'entrée %d de la liste RETURNING a un type différent de la colonne « %s »"
 
-#: rewrite/rewriteDefine.c:584
+#: rewrite/rewriteDefine.c:597
 #, c-format
 msgid "SELECT rule's target entry %d has different size from column \"%s\""
 msgstr "l'entrée cible de la règle SELECT %d a plusieurs tailles pour la colonne « %s »"
 
-#: rewrite/rewriteDefine.c:586
+#: rewrite/rewriteDefine.c:599
 #, c-format
 msgid "RETURNING list's entry %d has different size from column \"%s\""
 msgstr "l'entrée %d de la liste RETURNING a plusieurs tailles pour la colonne « %s »"
 
-#: rewrite/rewriteDefine.c:594
+#: rewrite/rewriteDefine.c:607
 msgid "SELECT rule's target list has too few entries"
 msgstr "l'entrée cible de la règle SELECT n'a pas assez d'entrées"
 
-#: rewrite/rewriteDefine.c:595
+#: rewrite/rewriteDefine.c:608
 msgid "RETURNING list has too few entries"
 msgstr "la liste RETURNING n'a pas assez d'entrées"
 
-#: rewrite/rewriteHandler.c:495
+#: rewrite/rewriteDefine.c:700
+#: rewrite/rewriteDefine.c:762
+#: rewrite/rewriteRemove.c:62
+#: rewrite/rewriteSupport.c:117
+#, c-format
+msgid "rule \"%s\" for relation \"%s\" does not exist"
+msgstr "la règle « %s » de la relation « %s » n'existe pas"
+
+#: rewrite/rewriteHandler.c:485
+#, c-format
+msgid "WITH query name \"%s\" appears in both a rule action and the query being rewritten"
+msgstr ""
+"Le nom de la requête WITH «%s » apparaît à la fois dans l'action d'une règle\n"
+"et la requête en cours de ré-écriture."
+
+#: rewrite/rewriteHandler.c:543
 msgid "cannot have RETURNING lists in multiple rules"
 msgstr "ne peut pas avoir des listes RETURNING dans plusieurs règles"
 
-#: rewrite/rewriteHandler.c:796
-#: rewrite/rewriteHandler.c:814
+#: rewrite/rewriteHandler.c:874
+#: rewrite/rewriteHandler.c:892
 #, c-format
 msgid "multiple assignments to same column \"%s\""
 msgstr "affectations multiples pour la même colonne « %s »"
 
-#: rewrite/rewriteHandler.c:1417
-#: rewrite/rewriteHandler.c:1740
+#: rewrite/rewriteHandler.c:1626
+#: rewrite/rewriteHandler.c:2021
 #, c-format
 msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr "récursion infinie détectée dans les règles de la relation « %s »"
 
-#: rewrite/rewriteHandler.c:1778
+#: rewrite/rewriteHandler.c:1882
+msgid "DO INSTEAD NOTHING rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"les règles DO INSTEAD NOTHING ne sont pas supportées par les instructions\n"
+"de modification de données dans WITH"
+
+#: rewrite/rewriteHandler.c:1896
+msgid "conditional DO INSTEAD rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"les règles DO INSTEAD conditionnelles ne sont pas supportées par les\n"
+"instructions de modification de données dans WITH"
+
+#: rewrite/rewriteHandler.c:1900
+msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"les règles DO ALSO ne sont pas supportées par les instructions de modification\n"
+"de données dans WITH"
+
+#: rewrite/rewriteHandler.c:1905
+msgid "multi-statement DO INSTEAD rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"les règles DO INSTEAD multi-instructions ne sont pas supportées pour les\n"
+"instructions de modification de données dans WITH"
+
+#: rewrite/rewriteHandler.c:2059
 #, c-format
 msgid "cannot perform INSERT RETURNING on relation \"%s\""
 msgstr "ne peut pas exécuter INSERT RETURNING sur la relation « %s »"
 
-#: rewrite/rewriteHandler.c:1780
+#: rewrite/rewriteHandler.c:2061
 msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Vous avez besoin d'une règle ON INSERT DO INSTEAD sans condition avec une\n"
 "clause RETURNING."
 
-#: rewrite/rewriteHandler.c:1785
+#: rewrite/rewriteHandler.c:2066
 #, c-format
 msgid "cannot perform UPDATE RETURNING on relation \"%s\""
 msgstr "ne peut pas exécuter UPDATE RETURNING sur la relation « %s »"
 
-#: rewrite/rewriteHandler.c:1787
+#: rewrite/rewriteHandler.c:2068
 msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Vous avez besoin d'une règle ON UPDATE DO INSTEAD sans condition avec une\n"
 "clause RETURNING."
 
-#: rewrite/rewriteHandler.c:1792
+#: rewrite/rewriteHandler.c:2073
 #, c-format
 msgid "cannot perform DELETE RETURNING on relation \"%s\""
 msgstr "ne peut pas exécuter DELETE RETURNING sur la relation « %s »"
 
-#: rewrite/rewriteHandler.c:1794
+#: rewrite/rewriteHandler.c:2075
 msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
 "Vous avez besoin d'une règle ON DELETE DO INSTEAD sans condition avec une\n"
 "clause RETURNING."
 
-#: rewrite/rewriteHandler.c:1892
-msgid "cannot insert into a view"
-msgstr "ne peut pas insérer dans une vue"
-
-#: rewrite/rewriteHandler.c:1893
-msgid "You need an unconditional ON INSERT DO INSTEAD rule."
-msgstr "Vous avez besoin d'une règle ON INSERT DO INSTEAD."
-
-#: rewrite/rewriteHandler.c:1898
-msgid "cannot update a view"
-msgstr "ne peut pas mettre à jour une vue"
+#: rewrite/rewriteHandler.c:2139
+msgid "WITH cannot be used in a query that is rewritten by rules into multiple queries"
+msgstr "WITH ne peut pas être utilisé dans une requête réécrite par des règles en plusieurs requêtes"
 
-#: rewrite/rewriteHandler.c:1899
-msgid "You need an unconditional ON UPDATE DO INSTEAD rule."
-msgstr "Vous avez besoin d'une règle non conditionnelle ON UPDATE DO INSTEAD."
-
-#: rewrite/rewriteHandler.c:1904
-msgid "cannot delete from a view"
-msgstr "ne peut pas supprimer à partir d'une vue"
-
-#: rewrite/rewriteHandler.c:1905
-msgid "You need an unconditional ON DELETE DO INSTEAD rule."
-msgstr "Vous avez besoin d'une règle inconditionnelle ON DELETE DO INSTEAD."
-
-#: rewrite/rewriteManip.c:1009
+#: rewrite/rewriteManip.c:1012
 msgid "conditional utility statements are not implemented"
 msgstr "les instructions conditionnelles ne sont pas implémentées"
 
-#: rewrite/rewriteManip.c:1174
+#: rewrite/rewriteManip.c:1177
 msgid "WHERE CURRENT OF on a view is not implemented"
 msgstr "WHERE CURRENT OF n'est pas implémenté sur une vue"
 
@@ -13132,423 +14256,380 @@ msgstr "WHERE CURRENT OF n'est pas impl
 msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
 msgstr "la règle « %s » de la relation « %s » n'existe pas, poursuite du traitement"
 
-#: utils/cache/typcache.c:331
+#: rewrite/rewriteSupport.c:156
 #, c-format
-msgid "type %s is not composite"
-msgstr "le type %s n'est pas un type composite"
-
-#: utils/cache/typcache.c:345
-msgid "record type has not been registered"
-msgstr "le type d'enregistrement n'a pas été enregistré"
+msgid "rule \"%s\" does not exist"
+msgstr "la règle « %s » n'existe pas"
 
-#: utils/cache/lsyscache.c:2234
-#: utils/cache/lsyscache.c:2267
-#: utils/cache/lsyscache.c:2300
-#: utils/cache/lsyscache.c:2333
+#: rewrite/rewriteSupport.c:165
 #, c-format
-msgid "type %s is only a shell"
-msgstr "le type %s est seulement un shell"
+msgid "there are multiple rules named \"%s\""
+msgstr "il existe de nombreuses règles nommées « %s »"
 
-#: utils/cache/lsyscache.c:2239
-#, c-format
-msgid "no input function available for type %s"
-msgstr "aucune fonction en entrée disponible pour le type %s"
+#: rewrite/rewriteSupport.c:166
+msgid "Specify a relation name as well as a rule name."
+msgstr "Spécifier un nom de relation ainsi qu'un nom de règle."
 
-#: utils/cache/lsyscache.c:2272
+#: utils/init/miscinit.c:115
 #, c-format
-msgid "no output function available for type %s"
-msgstr "aucune fonction en sortie disponible pour le type %s"
+msgid "could not change directory to \"%s\": %m"
+msgstr "n'a pas pu modifier le répertoire par « %s » : %m"
 
-#: utils/cache/lsyscache.c:2305
-#: utils/adt/arrayfuncs.c:1282
+#: utils/init/miscinit.c:381
+#: utils/misc/guc.c:5257
 #, c-format
-msgid "no binary input function available for type %s"
-msgstr "aucune fonction d'entrée binaire disponible pour le type %s"
+msgid "cannot set parameter \"%s\" within security-restricted operation"
+msgstr ""
+"ne peut pas configurer le paramètre « %s » à l'intérieur d'une fonction\n"
+"restreinte pour sécurité"
 
-#: utils/cache/lsyscache.c:2338
-#: utils/adt/arrayfuncs.c:1504
+#: utils/init/miscinit.c:460
 #, c-format
-msgid "no binary output function available for type %s"
-msgstr "aucune fonction de sortie binaire disponible pour le type %s"
-
-#: utils/cache/plancache.c:589
-msgid "cached plan must not change result type"
-msgstr "le plan en cache ne doit pas modifier le type en résultat"
+msgid "role \"%s\" is not permitted to log in"
+msgstr "le rôle « %s » n'est pas autorisé à se connecter"
 
-#: utils/cache/relcache.c:4299
+#: utils/init/miscinit.c:478
 #, c-format
-msgid "could not create relation-cache initialization file \"%s\": %m"
-msgstr "n'a pas pu créer le fichier d'initialisation relation-cache « %s » : %m"
-
-#: utils/cache/relcache.c:4301
-msgid "Continuing anyway, but there's something wrong."
-msgstr "Continue malgré tout, mais quelque chose s'est mal passé."
+msgid "too many connections for role \"%s\""
+msgstr "trop de connexions pour le rôle « %s »"
 
-#: utils/cache/relmapper.c:454
-msgid "cannot PREPARE a transaction that modified relation mapping"
-msgstr ""
-"ne peut pas préparer (PREPARE) une transaction qui a modifié la correspondance\n"
-"de relation"
+#: utils/init/miscinit.c:538
+msgid "permission denied to set session authorization"
+msgstr "droit refusé pour initialiser une autorisation de session"
 
-#: utils/cache/relmapper.c:596
-#: utils/cache/relmapper.c:702
+#: utils/init/miscinit.c:618
 #, c-format
-msgid "could not open relation mapping file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier de correspondance des relations « %s » : %m"
+msgid "invalid role OID: %u"
+msgstr "OID du rôle invalide : %u"
 
-#: utils/cache/relmapper.c:609
+#: utils/init/miscinit.c:750
 #, c-format
-msgid "could not read relation mapping file \"%s\": %m"
-msgstr "n'a pas pu lire le fichier de correspondance des relations « %s » : %m"
+msgid "could not create lock file \"%s\": %m"
+msgstr "n'a pas pu créer le fichier verrou « %s » : %m"
 
-#: utils/cache/relmapper.c:619
+#: utils/init/miscinit.c:764
 #, c-format
-msgid "relation mapping file \"%s\" contains invalid data"
-msgstr "le fichier de correspondance des relations « %s » contient des données invalides"
+msgid "could not open lock file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier verrou « %s » : %m"
 
-#: utils/cache/relmapper.c:629
+#: utils/init/miscinit.c:770
 #, c-format
-msgid "relation mapping file \"%s\" contains incorrect checksum"
-msgstr ""
-"le fichier de correspondance des relations « %s » contient une somme de\n"
-"contrôle incorrecte"
+msgid "could not read lock file \"%s\": %m"
+msgstr "n'a pas pu lire le fichier verrou « %s » : %m"
 
-#: utils/cache/relmapper.c:741
+#: utils/init/miscinit.c:818
 #, c-format
-msgid "could not write to relation mapping file \"%s\": %m"
-msgstr "n'a pas pu écrire le fichier de correspondance des relations « %s » : %m"
+msgid "lock file \"%s\" already exists"
+msgstr "le fichier verrou « %s » existe déjà"
 
-#: utils/cache/relmapper.c:754
+#: utils/init/miscinit.c:822
 #, c-format
-msgid "could not fsync relation mapping file \"%s\": %m"
-msgstr "n'a pas pu synchroniser (fsync) le fichier de correspondance des relations « %s » : %m"
+msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Un autre postgres (de PID %d) est-il déjà lancé avec comme répertoire de\n"
+"données « %s » ?"
 
-#: utils/cache/relmapper.c:760
+#: utils/init/miscinit.c:824
 #, c-format
-msgid "could not close relation mapping file \"%s\": %m"
-msgstr "n'a pas pu fermer le fichier de correspondance des relations « %s » : %m"
+msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Un autre postmaster (de PID %d) est-il déjà lancé avec comme répertoire de\n"
+"données « %s » ?"
 
-#: utils/sort/logtape.c:213
+#: utils/init/miscinit.c:827
 #, c-format
-msgid "could not write block %ld of temporary file: %m"
-msgstr "n'a pas pu écrire le bloc %ld du fichier temporaire : %m"
-
-#: utils/sort/logtape.c:215
-msgid "Perhaps out of disk space?"
-msgstr "Peut-être manquez-vous de place disque ?"
+msgid "Is another postgres (PID %d) using socket file \"%s\"?"
+msgstr "Un autre postgres (de PID %d) est-il déjà lancé en utilisant la socket « %s » ?"
 
-#: utils/sort/logtape.c:232
+#: utils/init/miscinit.c:829
 #, c-format
-msgid "could not read block %ld of temporary file: %m"
-msgstr "n'a pas pu lire le bloc %ld du fichier temporaire : %m"
+msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
+msgstr "Un autre postmaster (de PID %d) est-il déjà lancé en utilisant la socket « %s » ?"
 
-#: utils/sort/tuplesort.c:2806
+#: utils/init/miscinit.c:865
 #, c-format
-msgid "could not create unique index \"%s\""
-msgstr "n'a pas pu créer l'index unique « %s »"
+msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgstr ""
+"le bloc de mémoire partagé pré-existant (clé %lu, ID %lu) est en cours\n"
+"d'utilisation"
 
-#: utils/sort/tuplesort.c:2808
+#: utils/init/miscinit.c:868
 #, c-format
-msgid "Key %s is duplicated."
-msgstr "La clé %s est dupliquée."
+msgid "If you're sure there are no old server processes still running, remove the shared memory block or just delete the file \"%s\"."
+msgstr ""
+"Si vous êtes sûr qu'aucun processus serveur n'est toujours en cours\n"
+"d'exécution, supprimez le bloc de mémoire partagée\n"
+"ou supprimez simplement le fichier « %s »."
 
-#: utils/mmgr/aset.c:409
+#: utils/init/miscinit.c:884
 #, c-format
-msgid "Failed while creating memory context \"%s\"."
-msgstr "Échec lors de la création du contexte mémoire « %s »."
+msgid "could not remove old lock file \"%s\": %m"
+msgstr "n'a pas pu supprimer le vieux fichier verrou « %s » : %m"
 
-#: utils/mmgr/aset.c:588
-#: utils/mmgr/aset.c:771
-#: utils/mmgr/aset.c:977
-#, c-format
-msgid "Failed on request of size %lu."
-msgstr "Échec d'une requête de taille %lu."
+#: utils/init/miscinit.c:886
+msgid "The file seems accidentally left over, but it could not be removed. Please remove the file by hand and try again."
+msgstr ""
+"Le fichier semble avoir été oublié accidentellement mais il ne peut pas être\n"
+"supprimé. Merci de supprimer ce fichier manuellement et de ré-essayer."
 
-#: utils/mmgr/portalmem.c:207
+#: utils/init/miscinit.c:920
+#: utils/init/miscinit.c:931
+#: utils/init/miscinit.c:941
 #, c-format
-msgid "cursor \"%s\" already exists"
-msgstr "le curseur « %s » existe déjà"
+msgid "could not write lock file \"%s\": %m"
+msgstr "n'a pas pu écrire le fichier verrou « %s » : %m"
 
-#: utils/mmgr/portalmem.c:211
+#: utils/init/miscinit.c:1048
+#: utils/misc/guc.c:7517
 #, c-format
-msgid "closing existing cursor \"%s\""
-msgstr "fermeture du curseur existant « %s »"
+msgid "could not read from file \"%s\": %m"
+msgstr "n'a pas pu lire à partir du fichier « %s » : %m"
 
-#: utils/mmgr/portalmem.c:422
+#: utils/init/miscinit.c:1147
+#: utils/init/miscinit.c:1160
 #, c-format
-msgid "cannot drop active portal \"%s\""
-msgstr "ne peut pas supprimer le portail actif « %s »"
-
-#: utils/mmgr/portalmem.c:627
-msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
-msgstr "ne peut pas préparer une transaction qui a créé un curseur WITH HOLD"
-
-#: utils/adt/xml.c:135
-msgid "unsupported XML feature"
-msgstr "fonctionnalité XML non supportée"
-
-#: utils/adt/xml.c:136
-msgid "This functionality requires the server to be built with libxml support."
-msgstr "Cette fonctionnalité nécessite que le serveur dispose du support de libxml."
-
-#: utils/adt/xml.c:137
-msgid "You need to rebuild PostgreSQL using --with-libxml."
-msgstr "Vous devez recompiler PostgreSQL en utilisant --with-libxml."
+msgid "\"%s\" is not a valid data directory"
+msgstr "« %s » n'est pas un répertoire de données valide"
 
-#: utils/adt/xml.c:156
-#: utils/mb/mbutils.c:476
+#: utils/init/miscinit.c:1149
 #, c-format
-msgid "invalid encoding name \"%s\""
-msgstr "nom d'encodage « %s » invalide"
+msgid "File \"%s\" is missing."
+msgstr "le fichier « %s » est manquant."
 
-#: utils/adt/xml.c:402
-#: utils/adt/xml.c:407
-msgid "invalid XML comment"
-msgstr "commentaire XML invalide"
+#: utils/init/miscinit.c:1162
+#, c-format
+msgid "File \"%s\" does not contain valid data."
+msgstr "le fichier « %s » ne contient aucune données valides."
 
-#: utils/adt/xml.c:536
-msgid "not an XML document"
-msgstr "pas un document XML"
+#: utils/init/miscinit.c:1164
+msgid "You might need to initdb."
+msgstr "Vous pouvez avoir besoin d'exécuter initdb."
 
-#: utils/adt/xml.c:689
-#: utils/adt/xml.c:712
-msgid "invalid XML processing instruction"
-msgstr "instruction de traitement XML invalide"
+#: utils/init/miscinit.c:1172
+#, c-format
+msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s."
+msgstr ""
+"Le répertoire des données a été initialisé avec PostgreSQL version %ld.%ld,\n"
+"qui est non compatible avec cette version %s."
 
-#: utils/adt/xml.c:690
+#: utils/init/miscinit.c:1220
 #, c-format
-msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr "le nom de cible de l'instruction de traitement XML ne peut pas être « %s »."
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "syntaxe de liste invalide pour le paramètre « %s »"
 
-#: utils/adt/xml.c:713
-msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "l'instruction de traitement XML ne peut pas contenir « ?> »."
+#: utils/init/miscinit.c:1257
+#, c-format
+msgid "loaded library \"%s\""
+msgstr "bibliothèque « %s » chargée"
 
-#: utils/adt/xml.c:792
-msgid "xmlvalidate is not implemented"
-msgstr "xmlvalidate n'est pas implémenté"
+#: utils/init/postinit.c:225
+#, c-format
+msgid "replication connection authorized: user=%s"
+msgstr "connexion de réplication autorisée : utilisateur=%s"
 
-#: utils/adt/xml.c:877
-msgid "could not initialize XML library"
-msgstr "n'a pas pu initialiser la bibliothèque XML"
+#: utils/init/postinit.c:229
+#, c-format
+msgid "connection authorized: user=%s database=%s"
+msgstr "connexion autorisée : utilisateur=%s, base de données=%s"
 
-#: utils/adt/xml.c:878
+#: utils/init/postinit.c:260
 #, c-format
-msgid "libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
-msgstr ""
-"libxml2 a un type de caractère incompatible : sizeof(char)=%u,\n"
-"sizeof(xmlChar)=%u."
+msgid "database \"%s\" has disappeared from pg_database"
+msgstr "la base de données « %s » a disparu de pg_database"
 
-#: utils/adt/xml.c:1417
-msgid "Invalid character value."
-msgstr "Valeur invalide pour le caractère."
+#: utils/init/postinit.c:262
+#, c-format
+msgid "Database OID %u now seems to belong to \"%s\"."
+msgstr "La base de données d'OID %u semble maintenant appartenir à « %s »."
 
-#: utils/adt/xml.c:1420
-msgid "Space required."
-msgstr "Espace requis."
+#: utils/init/postinit.c:282
+#, c-format
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "la base de données « %s » n'accepte plus les connexions"
 
-#: utils/adt/xml.c:1423
-msgid "standalone accepts only 'yes' or 'no'."
-msgstr "la version autonome accepte seulement 'yes' et 'no'."
+#: utils/init/postinit.c:295
+#, c-format
+msgid "permission denied for database \"%s\""
+msgstr "droit refusé pour la base de données « %s »"
 
-#: utils/adt/xml.c:1426
-msgid "Malformed declaration: missing version."
-msgstr "Déclaration mal formée : version manquante."
+#: utils/init/postinit.c:296
+msgid "User does not have CONNECT privilege."
+msgstr "L'utilisateur n'a pas le droit CONNECT."
 
-#: utils/adt/xml.c:1429
-msgid "Missing encoding in text declaration."
-msgstr "Encodage manquant dans la déclaration du texte."
+#: utils/init/postinit.c:313
+#, c-format
+msgid "too many connections for database \"%s\""
+msgstr "trop de connexions pour la base de données « %s »"
 
-#: utils/adt/xml.c:1432
-msgid "Parsing XML declaration: '?>' expected."
-msgstr "Analyse de la déclaration XML : « ?> » attendu."
+#: utils/init/postinit.c:335
+#: utils/init/postinit.c:342
+msgid "database locale is incompatible with operating system"
+msgstr "la locale de la base de données est incompatible avec le système d'exploitation"
 
-#: utils/adt/xml.c:1435
+#: utils/init/postinit.c:336
 #, c-format
-msgid "Unrecognized libxml error code: %d."
-msgstr "code d'erreur libxml inconnu : %d"
+msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
+msgstr ""
+"La base de données a été initialisée avec un LC_COLLATE à « %s »,\n"
+"qui n'est pas reconnu par setlocale()."
 
-#: utils/adt/xml.c:1688
-#: utils/adt/date.c:217
-msgid "date out of range"
-msgstr "date en dehors des limites"
+#: utils/init/postinit.c:338
+#: utils/init/postinit.c:345
+msgid "Recreate the database with another locale or install the missing locale."
+msgstr ""
+"Recréez la base de données avec une autre locale ou installez la locale\n"
+"manquante."
 
-#: utils/adt/xml.c:1689
-msgid "XML does not support infinite date values."
-msgstr "XML ne supporte pas les valeurs infinies de date."
+#: utils/init/postinit.c:343
+#, c-format
+msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
+msgstr ""
+"La base de données a été initialisée avec un LC_CTYPE à « %s »,\n"
+"qui n'est pas reconnu par setlocale()."
 
-#: utils/adt/xml.c:1711
-#: utils/adt/xml.c:1718
-#: utils/adt/xml.c:1738
-#: utils/adt/xml.c:1745
-#: utils/adt/date.c:913
-#: utils/adt/date.c:960
-#: utils/adt/date.c:1516
-#: utils/adt/date.c:1553
-#: utils/adt/date.c:2427
-#: utils/adt/formatting.c:2956
-#: utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3056
-#: utils/adt/nabstime.c:480
-#: utils/adt/nabstime.c:523
-#: utils/adt/nabstime.c:553
-#: utils/adt/nabstime.c:596
-#: utils/adt/timestamp.c:226
-#: utils/adt/timestamp.c:269
-#: utils/adt/timestamp.c:491
-#: utils/adt/timestamp.c:531
-#: utils/adt/timestamp.c:2530
-#: utils/adt/timestamp.c:2551
-#: utils/adt/timestamp.c:2564
-#: utils/adt/timestamp.c:2573
-#: utils/adt/timestamp.c:2631
-#: utils/adt/timestamp.c:2654
-#: utils/adt/timestamp.c:2667
-#: utils/adt/timestamp.c:2678
-#: utils/adt/timestamp.c:3114
-#: utils/adt/timestamp.c:3244
-#: utils/adt/timestamp.c:3285
-#: utils/adt/timestamp.c:3373
-#: utils/adt/timestamp.c:3420
-#: utils/adt/timestamp.c:3531
-#: utils/adt/timestamp.c:3844
-#: utils/adt/timestamp.c:3981
-#: utils/adt/timestamp.c:3988
-#: utils/adt/timestamp.c:4002
-#: utils/adt/timestamp.c:4012
-#: utils/adt/timestamp.c:4075
-#: utils/adt/timestamp.c:4215
-#: utils/adt/timestamp.c:4225
-#: utils/adt/timestamp.c:4440
-#: utils/adt/timestamp.c:4519
-#: utils/adt/timestamp.c:4526
-#: utils/adt/timestamp.c:4553
-#: utils/adt/timestamp.c:4557
-#: utils/adt/timestamp.c:4614
-msgid "timestamp out of range"
-msgstr "timestamp en dehors des limites"
+#: utils/init/postinit.c:599
+msgid "no roles are defined in this database system"
+msgstr "aucun rôle n'est défini dans le système de bases de données"
 
-#: utils/adt/xml.c:1712
-#: utils/adt/xml.c:1739
-msgid "XML does not support infinite timestamp values."
-msgstr "XML ne supporte pas les valeurs infinies de timestamp."
+#: utils/init/postinit.c:600
+#, c-format
+msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
+msgstr "Vous devez immédiatement exécuter « CREATE USER \"%s\" CREATEUSER; »."
 
-#: utils/adt/xml.c:2123
-msgid "invalid query"
-msgstr "requête invalide"
+#: utils/init/postinit.c:623
+msgid "new replication connections are not allowed during database shutdown"
+msgstr ""
+"les nouvelles connexions pour la réplication ne sont pas autorisées pendant\n"
+"l'arrêt du serveur de base de données"
 
-#: utils/adt/xml.c:3352
-msgid "invalid array for XML namespace mapping"
-msgstr "tableau invalide pour la correspondance de l'espace de nom XML"
+#: utils/init/postinit.c:627
+msgid "must be superuser to connect during database shutdown"
+msgstr ""
+"doit être super-utilisateur pour se connecter pendant un arrêt de la base de\n"
+"données"
 
-#: utils/adt/xml.c:3353
-msgid "The array must be two-dimensional with length of the second axis equal to 2."
+#: utils/init/postinit.c:637
+msgid "must be superuser to connect in binary upgrade mode"
+msgstr "doit être super-utilisateur pour se connecter en mode de mise à jour binaire"
+
+#: utils/init/postinit.c:651
+msgid "remaining connection slots are reserved for non-replication superuser connections"
 msgstr ""
-"Le tableau doit avoir deux dimensions avec une longueur de 2 pour le\n"
-"deuxième axe."
+"les emplacements de connexions restants sont réservés pour les connexion\n"
+"superutilisateur non relatif à la réplication"
 
-#: utils/adt/xml.c:3377
-msgid "empty XPath expression"
-msgstr "expression XPath vide"
+#: utils/init/postinit.c:666
+msgid "must be replication role to start walsender"
+msgstr "doit être un rôle ayant l'attribut de réplication pour exécuter walsender"
 
-#: utils/adt/xml.c:3425
-msgid "neither namespace name nor URI may be null"
-msgstr "ni le nom de l'espace de noms ni l'URI ne peuvent être NULL"
+#: utils/init/postinit.c:726
+#, c-format
+msgid "database %u does not exist"
+msgstr "la base de données « %u » n'existe pas"
+
+#: utils/init/postinit.c:778
+msgid "It seems to have just been dropped or renamed."
+msgstr "Cet objet semble avoir été tout juste supprimé ou renommé."
 
-#: utils/adt/xml.c:3432
+#: utils/init/postinit.c:796
 #, c-format
-msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
-msgstr "n'a pas pu enregistrer l'espace de noms XML de nom « %s » et d'URI « %s »"
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "Le sous-répertoire de la base de données « %s » est manquant."
+
+#: utils/init/postinit.c:801
+#, c-format
+msgid "could not access directory \"%s\": %m"
+msgstr "n'a pas pu accéder au répertoire « %s » : %m"
 
-#: utils/adt/acl.c:164
+#: utils/adt/acl.c:166
 #: utils/adt/name.c:87
 msgid "identifier too long"
 msgstr "identifiant trop long"
 
-#: utils/adt/acl.c:165
+#: utils/adt/acl.c:167
 #: utils/adt/name.c:88
 #, c-format
 msgid "Identifier must be less than %d characters."
 msgstr "L'identifiant doit faire moins de %d caractères."
 
-#: utils/adt/acl.c:251
+#: utils/adt/acl.c:253
 #, c-format
 msgid "unrecognized key word: \"%s\""
 msgstr "mot clé non reconnu : « %s »"
 
-#: utils/adt/acl.c:252
+#: utils/adt/acl.c:254
 msgid "ACL key word must be \"group\" or \"user\"."
 msgstr "le mot clé ACL doit être soit « group » soit « user »."
 
-#: utils/adt/acl.c:257
+#: utils/adt/acl.c:259
 msgid "missing name"
 msgstr "nom manquant"
 
-#: utils/adt/acl.c:258
+#: utils/adt/acl.c:260
 msgid "A name must follow the \"group\" or \"user\" key word."
 msgstr "Un nom doit suivre le mot clé « group » ou « user »."
 
-#: utils/adt/acl.c:264
+#: utils/adt/acl.c:266
 msgid "missing \"=\" sign"
 msgstr "signe « = » manquant"
 
-#: utils/adt/acl.c:317
+#: utils/adt/acl.c:319
 #, c-format
 msgid "invalid mode character: must be one of \"%s\""
 msgstr "mode caractère invalide : doit faire partie de « %s »"
 
-#: utils/adt/acl.c:339
+#: utils/adt/acl.c:341
 msgid "a name must follow the \"/\" sign"
 msgstr "un nom doit suivre le signe « / »"
 
-#: utils/adt/acl.c:347
+#: utils/adt/acl.c:349
 #, c-format
 msgid "defaulting grantor to user ID %u"
 msgstr "par défaut, le « donneur de droits » devient l'utilisateur d'identifiant %u"
 
-#: utils/adt/acl.c:538
+#: utils/adt/acl.c:540
 msgid "ACL array contains wrong data type"
 msgstr "le tableau ACL contient un type de données incorrect"
 
-#: utils/adt/acl.c:542
+#: utils/adt/acl.c:544
 msgid "ACL arrays must be one-dimensional"
 msgstr "les tableaux d'ACL doivent avoir une dimension"
 
-#: utils/adt/acl.c:546
+#: utils/adt/acl.c:548
 msgid "ACL arrays must not contain null values"
 msgstr "les tableaux d'ACL ne doivent pas contenir de valeurs NULL"
 
-#: utils/adt/acl.c:570
+#: utils/adt/acl.c:572
 msgid "extra garbage at the end of the ACL specification"
 msgstr "données superflues à la fin de la spécification de l'ACL"
 
-#: utils/adt/acl.c:1127
+#: utils/adt/acl.c:1129
 msgid "grant options cannot be granted back to your own grantor"
 msgstr "les options grant ne peuvent pas être rendues à votre propre donateur"
 
-#: utils/adt/acl.c:1188
+#: utils/adt/acl.c:1190
 msgid "dependent privileges exist"
 msgstr "des privilèges dépendants existent"
 
-#: utils/adt/acl.c:1189
+#: utils/adt/acl.c:1191
 msgid "Use CASCADE to revoke them too."
 msgstr "Utilisez CASCADE pour les révoquer aussi."
 
-#: utils/adt/acl.c:1468
+#: utils/adt/acl.c:1470
 msgid "aclinsert is no longer supported"
 msgstr "aclinsert n'est plus supporté"
 
-#: utils/adt/acl.c:1478
+#: utils/adt/acl.c:1480
 msgid "aclremove is no longer supported"
 msgstr "aclremove n'est plus supporté"
 
-#: utils/adt/acl.c:1564
-#: utils/adt/acl.c:1618
+#: utils/adt/acl.c:1566
+#: utils/adt/acl.c:1620
 #, c-format
 msgid "unrecognized privilege type: \"%s\""
 msgstr "type de droit non reconnu : « %s »"
 
-#: utils/adt/acl.c:3364
+#: utils/adt/acl.c:3359
 #: utils/adt/regproc.c:118
 #: utils/adt/regproc.c:139
 #: utils/adt/regproc.c:289
@@ -13556,7 +14637,7 @@ msgstr "type de droit non reconnu : 
 msgid "function \"%s\" does not exist"
 msgstr "la fonction « %s » n'existe pas"
 
-#: utils/adt/acl.c:4635
+#: utils/adt/acl.c:4608
 #, c-format
 msgid "must be member of role \"%s\""
 msgstr "doit être un membre du rôle « %s »"
@@ -13571,34 +14652,34 @@ msgstr "aucun type de donn
 
 #: utils/adt/array_userfuncs.c:103
 #: utils/adt/array_userfuncs.c:113
-#: utils/adt/arrayfuncs.c:1251
+#: utils/adt/arrayfuncs.c:1276
 #: utils/adt/float.c:1101
 #: utils/adt/float.c:1160
 #: utils/adt/float.c:2711
 #: utils/adt/float.c:2727
-#: utils/adt/int.c:622
-#: utils/adt/int.c:651
-#: utils/adt/int.c:672
-#: utils/adt/int.c:692
-#: utils/adt/int.c:714
-#: utils/adt/int.c:743
-#: utils/adt/int.c:757
-#: utils/adt/int.c:772
-#: utils/adt/int.c:911
-#: utils/adt/int.c:932
-#: utils/adt/int.c:959
-#: utils/adt/int.c:999
-#: utils/adt/int.c:1020
-#: utils/adt/int.c:1047
-#: utils/adt/int.c:1078
-#: utils/adt/int.c:1141
-#: utils/adt/int8.c:1213
-#: utils/adt/numeric.c:2062
-#: utils/adt/numeric.c:2071
-#: utils/adt/varbit.c:1098
-#: utils/adt/varbit.c:1483
-#: utils/adt/varlena.c:942
-#: utils/adt/varlena.c:1915
+#: utils/adt/int.c:623
+#: utils/adt/int.c:652
+#: utils/adt/int.c:673
+#: utils/adt/int.c:693
+#: utils/adt/int.c:715
+#: utils/adt/int.c:744
+#: utils/adt/int.c:758
+#: utils/adt/int.c:773
+#: utils/adt/int.c:912
+#: utils/adt/int.c:933
+#: utils/adt/int.c:960
+#: utils/adt/int.c:1000
+#: utils/adt/int.c:1021
+#: utils/adt/int.c:1048
+#: utils/adt/int.c:1079
+#: utils/adt/int.c:1142
+#: utils/adt/int8.c:1211
+#: utils/adt/numeric.c:2253
+#: utils/adt/numeric.c:2262
+#: utils/adt/varbit.c:1111
+#: utils/adt/varbit.c:1503
+#: utils/adt/varlena.c:950
+#: utils/adt/varlena.c:1968
 msgid "integer out of range"
 msgstr "entier en dehors des limites"
 
@@ -13641,74 +14722,74 @@ msgstr ""
 "Les tableaux de dimensions différentes ne sont pas compatibles pour\n"
 "une concaténation."
 
-#: utils/adt/array_userfuncs.c:424
-#: utils/adt/arrayfuncs.c:1214
-#: utils/adt/arrayfuncs.c:2886
-#: utils/adt/arrayfuncs.c:4566
+#: utils/adt/array_userfuncs.c:426
+#: utils/adt/arrayfuncs.c:1238
+#: utils/adt/arrayfuncs.c:2911
+#: utils/adt/arrayfuncs.c:4936
 #, c-format
 msgid "invalid number of dimensions: %d"
 msgstr "nombre de dimensions invalides : %d"
 
-#: utils/adt/array_userfuncs.c:484
+#: utils/adt/array_userfuncs.c:487
 msgid "could not determine input data type"
 msgstr "n'a pas pu déterminer le type de données date en entrée"
 
-#: utils/adt/arrayfuncs.c:211
-#: utils/adt/arrayfuncs.c:223
+#: utils/adt/arrayfuncs.c:235
+#: utils/adt/arrayfuncs.c:247
 msgid "missing dimension value"
 msgstr "valeur de la dimension manquant"
 
-#: utils/adt/arrayfuncs.c:233
+#: utils/adt/arrayfuncs.c:257
 msgid "missing \"]\" in array dimensions"
 msgstr "« ] » dans les dimensions manquant"
 
-#: utils/adt/arrayfuncs.c:241
-#: utils/adt/arrayfuncs.c:2411
-#: utils/adt/arrayfuncs.c:2439
-#: utils/adt/arrayfuncs.c:2454
+#: utils/adt/arrayfuncs.c:265
+#: utils/adt/arrayfuncs.c:2436
+#: utils/adt/arrayfuncs.c:2464
+#: utils/adt/arrayfuncs.c:2479
 msgid "upper bound cannot be less than lower bound"
 msgstr "la limite supérieure ne peut pas être plus petite que la limite inférieure"
 
-#: utils/adt/arrayfuncs.c:253
-#: utils/adt/arrayfuncs.c:279
+#: utils/adt/arrayfuncs.c:277
+#: utils/adt/arrayfuncs.c:303
 msgid "array value must start with \"{\" or dimension information"
 msgstr ""
 "la valeur du tableau doit commencer avec « { » ou avec l'information de la\n"
 "dimension"
 
-#: utils/adt/arrayfuncs.c:267
+#: utils/adt/arrayfuncs.c:291
 msgid "missing assignment operator"
 msgstr "opérateur d'affectation manquant"
 
-#: utils/adt/arrayfuncs.c:284
-#: utils/adt/arrayfuncs.c:290
+#: utils/adt/arrayfuncs.c:308
+#: utils/adt/arrayfuncs.c:314
 msgid "array dimensions incompatible with array literal"
 msgstr "les dimensions du tableau sont incompatibles avec le tableau litéral"
 
-#: utils/adt/arrayfuncs.c:420
-#: utils/adt/arrayfuncs.c:435
 #: utils/adt/arrayfuncs.c:444
-#: utils/adt/arrayfuncs.c:458
-#: utils/adt/arrayfuncs.c:478
-#: utils/adt/arrayfuncs.c:506
-#: utils/adt/arrayfuncs.c:511
-#: utils/adt/arrayfuncs.c:551
-#: utils/adt/arrayfuncs.c:572
-#: utils/adt/arrayfuncs.c:591
-#: utils/adt/arrayfuncs.c:701
-#: utils/adt/arrayfuncs.c:710
-#: utils/adt/arrayfuncs.c:740
-#: utils/adt/arrayfuncs.c:755
-#: utils/adt/arrayfuncs.c:808
+#: utils/adt/arrayfuncs.c:459
+#: utils/adt/arrayfuncs.c:468
+#: utils/adt/arrayfuncs.c:482
+#: utils/adt/arrayfuncs.c:502
+#: utils/adt/arrayfuncs.c:530
+#: utils/adt/arrayfuncs.c:535
+#: utils/adt/arrayfuncs.c:575
+#: utils/adt/arrayfuncs.c:596
+#: utils/adt/arrayfuncs.c:615
+#: utils/adt/arrayfuncs.c:725
+#: utils/adt/arrayfuncs.c:734
+#: utils/adt/arrayfuncs.c:764
+#: utils/adt/arrayfuncs.c:779
+#: utils/adt/arrayfuncs.c:832
 #, c-format
 msgid "malformed array literal: \"%s\""
 msgstr "tableau litéral mal formé : « %s »"
 
-#: utils/adt/arrayfuncs.c:847
-#: utils/adt/arrayfuncs.c:1448
-#: utils/adt/arrayfuncs.c:2770
-#: utils/adt/arrayfuncs.c:2918
-#: utils/adt/arrayfuncs.c:4666
+#: utils/adt/arrayfuncs.c:871
+#: utils/adt/arrayfuncs.c:1473
+#: utils/adt/arrayfuncs.c:2795
+#: utils/adt/arrayfuncs.c:2943
+#: utils/adt/arrayfuncs.c:5036
 #: utils/adt/arrayutils.c:93
 #: utils/adt/arrayutils.c:102
 #: utils/adt/arrayutils.c:109
@@ -13716,90 +14797,107 @@ msgstr "tableau lit
 msgid "array size exceeds the maximum allowed (%d)"
 msgstr "la taille du tableau dépasse le maximum permis (%d)"
 
-#: utils/adt/arrayfuncs.c:1225
+#: utils/adt/arrayfuncs.c:1249
 msgid "invalid array flags"
 msgstr "drapeaux de tableau invalides"
 
-#: utils/adt/arrayfuncs.c:1233
+#: utils/adt/arrayfuncs.c:1257
 msgid "wrong element type"
 msgstr "mauvais type d'élément"
 
-#: utils/adt/arrayfuncs.c:1422
+#: utils/adt/arrayfuncs.c:1307
+#: utils/cache/lsyscache.c:2485
+#, c-format
+msgid "no binary input function available for type %s"
+msgstr "aucune fonction d'entrée binaire disponible pour le type %s"
+
+#: utils/adt/arrayfuncs.c:1447
 #, c-format
 msgid "improper binary format in array element %d"
 msgstr "format binaire mal conçu dans l'élément du tableau %d"
 
-#: utils/adt/arrayfuncs.c:1878
+#: utils/adt/arrayfuncs.c:1529
+#: utils/cache/lsyscache.c:2518
+#, c-format
+msgid "no binary output function available for type %s"
+msgstr "aucune fonction de sortie binaire disponible pour le type %s"
+
+#: utils/adt/arrayfuncs.c:1903
 msgid "slices of fixed-length arrays not implemented"
 msgstr "les morceaux des tableaux à longueur fixe ne sont pas implémentés"
 
-#: utils/adt/arrayfuncs.c:2051
-#: utils/adt/arrayfuncs.c:2073
-#: utils/adt/arrayfuncs.c:2107
-#: utils/adt/arrayfuncs.c:2393
-#: utils/adt/arrayfuncs.c:4546
-#: utils/adt/arrayfuncs.c:4578
-#: utils/adt/arrayfuncs.c:4595
+#: utils/adt/arrayfuncs.c:2076
+#: utils/adt/arrayfuncs.c:2098
+#: utils/adt/arrayfuncs.c:2132
+#: utils/adt/arrayfuncs.c:2418
+#: utils/adt/arrayfuncs.c:4916
+#: utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4965
 msgid "wrong number of array subscripts"
 msgstr "mauvais nombre d'indices du tableau"
 
-#: utils/adt/arrayfuncs.c:2056
-#: utils/adt/arrayfuncs.c:2149
-#: utils/adt/arrayfuncs.c:2444
+#: utils/adt/arrayfuncs.c:2081
+#: utils/adt/arrayfuncs.c:2174
+#: utils/adt/arrayfuncs.c:2469
 msgid "array subscript out of range"
 msgstr "indice du tableau en dehors de l'échelle"
 
-#: utils/adt/arrayfuncs.c:2061
+#: utils/adt/arrayfuncs.c:2086
 msgid "cannot assign null value to an element of a fixed-length array"
 msgstr "ne peut pas affecter une valeur NULL à un élément d'un tableau à longueur fixe"
 
-#: utils/adt/arrayfuncs.c:2347
+#: utils/adt/arrayfuncs.c:2372
 msgid "updates on slices of fixed-length arrays not implemented"
 msgstr ""
 "les mises à jour de morceaux des tableaux à longueur fixe ne sont pas\n"
 "implémentées"
 
-#: utils/adt/arrayfuncs.c:2383
-#: utils/adt/arrayfuncs.c:2470
+#: utils/adt/arrayfuncs.c:2408
+#: utils/adt/arrayfuncs.c:2495
 msgid "source array too small"
 msgstr "tableau source trop petit"
 
-#: utils/adt/arrayfuncs.c:3025
+#: utils/adt/arrayfuncs.c:3050
 msgid "null array element not allowed in this context"
 msgstr "élément NULL de tableau interdit dans ce contexte"
 
-#: utils/adt/arrayfuncs.c:3086
-#: utils/adt/arrayfuncs.c:3293
-#: utils/adt/arrayfuncs.c:3493
+#: utils/adt/arrayfuncs.c:3153
+#: utils/adt/arrayfuncs.c:3361
+#: utils/adt/arrayfuncs.c:3678
 msgid "cannot compare arrays of different element types"
 msgstr "ne peut pas comparer des tableaux ayant des types d'éléments différents"
 
-#: utils/adt/arrayfuncs.c:4444
-#: utils/adt/arrayfuncs.c:4484
-msgid "dimension array or low bound array cannot be NULL"
+#: utils/adt/arrayfuncs.c:3563
+#, c-format
+msgid "could not identify a hash function for type %s"
+msgstr "n'a pas pu identifier une fonction de hachage pour le type %s"
+
+#: utils/adt/arrayfuncs.c:4814
+#: utils/adt/arrayfuncs.c:4854
+msgid "dimension array or low bound array cannot be null"
 msgstr "la dimension ou la limite basse du tableau ne peut pas être NULL"
 
-#: utils/adt/arrayfuncs.c:4547
-#: utils/adt/arrayfuncs.c:4579
+#: utils/adt/arrayfuncs.c:4917
+#: utils/adt/arrayfuncs.c:4949
 msgid "Dimension array must be one dimensional."
 msgstr "le tableau doit avoir une seule dimension"
 
-#: utils/adt/arrayfuncs.c:4552
-#: utils/adt/arrayfuncs.c:4584
+#: utils/adt/arrayfuncs.c:4922
+#: utils/adt/arrayfuncs.c:4954
 msgid "wrong range of array subscripts"
 msgstr "mauvais échelle des indices du tableau"
 
-#: utils/adt/arrayfuncs.c:4553
-#: utils/adt/arrayfuncs.c:4585
+#: utils/adt/arrayfuncs.c:4923
+#: utils/adt/arrayfuncs.c:4955
 msgid "Lower bound of dimension array must be one."
 msgstr "La limite inférieure du tableau doit valoir un."
 
-#: utils/adt/arrayfuncs.c:4558
-#: utils/adt/arrayfuncs.c:4590
+#: utils/adt/arrayfuncs.c:4928
+#: utils/adt/arrayfuncs.c:4960
 msgid "dimension values cannot be null"
 msgstr "les valeurs de dimension ne peuvent pas être NULL"
 
-#: utils/adt/arrayfuncs.c:4596
+#: utils/adt/arrayfuncs.c:4966
 msgid "Low bound array has different size than dimensions array."
 msgstr "La limite basse du tableau a une taille différentes des dimensions du tableau."
 
@@ -13830,30 +14928,31 @@ msgstr "syntaxe en entr
 msgid "invalid input syntax for type money: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type money : « %s »"
 
-#: utils/adt/cash.c:524
-#: utils/adt/cash.c:575
-#: utils/adt/cash.c:624
-#: utils/adt/cash.c:676
-#: utils/adt/cash.c:726
+#: utils/adt/cash.c:493
+#: utils/adt/cash.c:543
+#: utils/adt/cash.c:594
+#: utils/adt/cash.c:643
+#: utils/adt/cash.c:695
+#: utils/adt/cash.c:745
 #: utils/adt/float.c:764
 #: utils/adt/float.c:828
 #: utils/adt/float.c:2470
 #: utils/adt/float.c:2533
-#: utils/adt/geo_ops.c:4128
-#: utils/adt/int.c:729
-#: utils/adt/int.c:874
-#: utils/adt/int.c:973
-#: utils/adt/int.c:1062
-#: utils/adt/int.c:1092
-#: utils/adt/int.c:1116
-#: utils/adt/int8.c:598
-#: utils/adt/int8.c:649
-#: utils/adt/int8.c:830
-#: utils/adt/int8.c:929
-#: utils/adt/int8.c:1018
-#: utils/adt/int8.c:1117
-#: utils/adt/numeric.c:4298
-#: utils/adt/numeric.c:4581
+#: utils/adt/geo_ops.c:4130
+#: utils/adt/int.c:730
+#: utils/adt/int.c:875
+#: utils/adt/int.c:974
+#: utils/adt/int.c:1063
+#: utils/adt/int.c:1093
+#: utils/adt/int.c:1117
+#: utils/adt/int8.c:596
+#: utils/adt/int8.c:647
+#: utils/adt/int8.c:828
+#: utils/adt/int8.c:927
+#: utils/adt/int8.c:1016
+#: utils/adt/int8.c:1115
+#: utils/adt/numeric.c:4507
+#: utils/adt/numeric.c:4790
 #: utils/adt/timestamp.c:2876
 msgid "division by zero"
 msgstr "division par zéro"
@@ -13864,7 +14963,7 @@ msgstr "
 
 #: utils/adt/date.c:66
 #: utils/adt/timestamp.c:92
-#: utils/adt/varbit.c:49
+#: utils/adt/varbit.c:51
 #: utils/adt/varchar.c:43
 msgid "invalid type modifier"
 msgstr "modifieur de type invalide"
@@ -13890,6 +14989,11 @@ msgstr "la valeur 
 msgid "date out of range: \"%s\""
 msgstr "date en dehors des limites : « %s »"
 
+#: utils/adt/date.c:217
+#: utils/adt/xml.c:1689
+msgid "date out of range"
+msgstr "date en dehors des limites"
+
 #: utils/adt/date.c:359
 msgid "cannot subtract infinite dates"
 msgstr "ne peut pas soustraire les valeurs dates infinies"
@@ -13899,6 +15003,57 @@ msgstr "ne peut pas soustraire les valeurs dates infinies"
 msgid "date out of range for timestamp"
 msgstr "date en dehors des limites pour un timestamp"
 
+#: utils/adt/date.c:913
+#: utils/adt/date.c:960
+#: utils/adt/date.c:1516
+#: utils/adt/date.c:1553
+#: utils/adt/date.c:2427
+#: utils/adt/formatting.c:3185
+#: utils/adt/formatting.c:3217
+#: utils/adt/formatting.c:3285
+#: utils/adt/nabstime.c:480
+#: utils/adt/nabstime.c:523
+#: utils/adt/nabstime.c:553
+#: utils/adt/nabstime.c:596
+#: utils/adt/timestamp.c:226
+#: utils/adt/timestamp.c:269
+#: utils/adt/timestamp.c:491
+#: utils/adt/timestamp.c:531
+#: utils/adt/timestamp.c:2530
+#: utils/adt/timestamp.c:2551
+#: utils/adt/timestamp.c:2564
+#: utils/adt/timestamp.c:2573
+#: utils/adt/timestamp.c:2631
+#: utils/adt/timestamp.c:2654
+#: utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2678
+#: utils/adt/timestamp.c:3114
+#: utils/adt/timestamp.c:3244
+#: utils/adt/timestamp.c:3285
+#: utils/adt/timestamp.c:3373
+#: utils/adt/timestamp.c:3420
+#: utils/adt/timestamp.c:3531
+#: utils/adt/timestamp.c:3844
+#: utils/adt/timestamp.c:3981
+#: utils/adt/timestamp.c:3988
+#: utils/adt/timestamp.c:4002
+#: utils/adt/timestamp.c:4012
+#: utils/adt/timestamp.c:4075
+#: utils/adt/timestamp.c:4215
+#: utils/adt/timestamp.c:4225
+#: utils/adt/timestamp.c:4440
+#: utils/adt/timestamp.c:4519
+#: utils/adt/timestamp.c:4526
+#: utils/adt/timestamp.c:4553
+#: utils/adt/timestamp.c:4557
+#: utils/adt/timestamp.c:4614
+#: utils/adt/xml.c:1712
+#: utils/adt/xml.c:1719
+#: utils/adt/xml.c:1739
+#: utils/adt/xml.c:1746
+msgid "timestamp out of range"
+msgstr "timestamp en dehors des limites"
+
 #: utils/adt/date.c:986
 msgid "cannot convert reserved abstime value to date"
 msgstr "ne peut pas convertir la valeur réservée abstime en date"
@@ -13940,28 +15095,28 @@ msgstr "le fuseau horaire 
 msgid "\"interval\" time zone \"%s\" not valid"
 msgstr "le fuseau horaire « %s » n'est pas valide pour le type « interval »"
 
-#: utils/adt/datetime.c:3529
-#: utils/adt/datetime.c:3536
+#: utils/adt/datetime.c:3532
+#: utils/adt/datetime.c:3539
 #, c-format
 msgid "date/time field value out of range: \"%s\""
 msgstr "valeur du champ date/time en dehors des limites : « %s »"
 
-#: utils/adt/datetime.c:3538
+#: utils/adt/datetime.c:3541
 msgid "Perhaps you need a different \"datestyle\" setting."
 msgstr "Peut-être avez-vous besoin d'un paramètrage « datestyle » différent."
 
-#: utils/adt/datetime.c:3543
+#: utils/adt/datetime.c:3546
 #, c-format
 msgid "interval field value out of range: \"%s\""
 msgstr "valeur du champ interval en dehors des limites : « %s »"
 
-#: utils/adt/datetime.c:3549
+#: utils/adt/datetime.c:3552
 #, c-format
 msgid "time zone displacement out of range: \"%s\""
 msgstr "déplacement du fuseau horaire en dehors des limites : « %s »"
 
 #. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3556
+#: utils/adt/datetime.c:3559
 #: utils/adt/network.c:107
 #, c-format
 msgid "invalid input syntax for type %s: \"%s\""
@@ -13973,7 +15128,7 @@ msgid "invalid Datum pointer"
 msgstr "pointeur Datum invalide"
 
 #: utils/adt/dbsize.c:105
-#: utils/adt/dbsize.c:195
+#: utils/adt/dbsize.c:189
 #, c-format
 msgid "could not open tablespace directory \"%s\": %m"
 msgstr "n'a pas pu ouvrir le répertoire du tablespace « %s » : %m"
@@ -14012,32 +15167,39 @@ msgstr "fin de s
 
 #: utils/adt/encode.c:441
 #: utils/adt/encode.c:506
-#: utils/adt/varlena.c:238
-#: utils/adt/varlena.c:279
+#: utils/adt/varlena.c:246
+#: utils/adt/varlena.c:287
 msgid "invalid input syntax for type bytea"
 msgstr "syntaxe en entrée invalide pour le type bytea"
 
-#: utils/adt/enum.c:44
-#: utils/adt/enum.c:54
-#: utils/adt/enum.c:109
-#: utils/adt/enum.c:119
+#: utils/adt/enum.c:48
+#: utils/adt/enum.c:58
+#: utils/adt/enum.c:113
+#: utils/adt/enum.c:123
 #, c-format
 msgid "invalid input value for enum %s: \"%s\""
 msgstr "valeur en entrée invalide pour le enum %s : « %s »"
 
-#: utils/adt/enum.c:81
-#: utils/adt/enum.c:144
+#: utils/adt/enum.c:85
+#: utils/adt/enum.c:148
+#: utils/adt/enum.c:198
 #, c-format
 msgid "invalid internal value for enum: %u"
 msgstr "valeur interne invalide pour le enum : %u"
 
-#: utils/adt/enum.c:264
-#: utils/adt/enum.c:303
-#: utils/adt/enum.c:350
-#: utils/adt/enum.c:370
+#: utils/adt/enum.c:357
+#: utils/adt/enum.c:386
+#: utils/adt/enum.c:426
+#: utils/adt/enum.c:446
 msgid "could not determine actual enum type"
 msgstr "n'a pas pu déterminer le type enum actuel"
 
+#: utils/adt/enum.c:365
+#: utils/adt/enum.c:394
+#, c-format
+msgid "enum %s contains no values"
+msgstr "l'énumération « %s » ne contient aucune valeur"
+
 #: utils/adt/float.c:54
 msgid "value out of range: overflow"
 msgstr "valeur en dehors des limites : dépassement"
@@ -14061,8 +15223,8 @@ msgstr "
 #: utils/adt/float.c:399
 #: utils/adt/float.c:440
 #: utils/adt/float.c:491
-#: utils/adt/numeric.c:3760
-#: utils/adt/numeric.c:3786
+#: utils/adt/numeric.c:3969
+#: utils/adt/numeric.c:3995
 #, c-format
 msgid "invalid input syntax for type double precision: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type double precision : « %s »"
@@ -14074,43 +15236,43 @@ msgstr "
 
 #: utils/adt/float.c:1119
 #: utils/adt/float.c:1177
-#: utils/adt/int.c:348
-#: utils/adt/int.c:788
-#: utils/adt/int.c:817
-#: utils/adt/int.c:838
-#: utils/adt/int.c:858
-#: utils/adt/int.c:890
-#: utils/adt/int.c:1156
-#: utils/adt/int8.c:1238
-#: utils/adt/numeric.c:2163
-#: utils/adt/numeric.c:2174
+#: utils/adt/int.c:349
+#: utils/adt/int.c:789
+#: utils/adt/int.c:818
+#: utils/adt/int.c:839
+#: utils/adt/int.c:859
+#: utils/adt/int.c:891
+#: utils/adt/int.c:1157
+#: utils/adt/int8.c:1236
+#: utils/adt/numeric.c:2354
+#: utils/adt/numeric.c:2365
 msgid "smallint out of range"
 msgstr "smallint en dehors des limites"
 
 #: utils/adt/float.c:1303
-#: utils/adt/numeric.c:4974
+#: utils/adt/numeric.c:5183
 msgid "cannot take square root of a negative number"
 msgstr "ne peut pas calculer la racine carré d'un nombre négatif"
 
 #: utils/adt/float.c:1345
-#: utils/adt/numeric.c:1975
+#: utils/adt/numeric.c:2166
 msgid "zero raised to a negative power is undefined"
 msgstr "zéro à une puissance négative est indéfini"
 
 #: utils/adt/float.c:1349
-#: utils/adt/numeric.c:1981
+#: utils/adt/numeric.c:2172
 msgid "a negative number raised to a non-integer power yields a complex result"
 msgstr "un nombre négatif élevé à une puissance non entière donne un résultat complexe"
 
 #: utils/adt/float.c:1415
 #: utils/adt/float.c:1445
-#: utils/adt/numeric.c:5192
+#: utils/adt/numeric.c:5401
 msgid "cannot take logarithm of zero"
 msgstr "ne peut pas calculer le logarithme de zéro"
 
 #: utils/adt/float.c:1419
 #: utils/adt/float.c:1449
-#: utils/adt/numeric.c:5196
+#: utils/adt/numeric.c:5405
 msgid "cannot take logarithm of a negative number"
 msgstr "ne peut pas calculer le logarithme sur un nombre négatif"
 
@@ -14126,12 +15288,12 @@ msgid "input is out of range"
 msgstr "l'entrée est en dehors des limites"
 
 #: utils/adt/float.c:2687
-#: utils/adt/numeric.c:982
+#: utils/adt/numeric.c:1171
 msgid "count must be greater than zero"
 msgstr "le total doit être supérieur à zéro"
 
 #: utils/adt/float.c:2692
-#: utils/adt/numeric.c:989
+#: utils/adt/numeric.c:1178
 msgid "operand, lower bound and upper bound cannot be NaN"
 msgstr "la limite inférieure et supérieure de l'opérande ne peuvent pas être NaN"
 
@@ -14140,220 +15302,243 @@ msgid "lower and upper bounds must be finite"
 msgstr "les limites basse et haute doivent être finies"
 
 #: utils/adt/float.c:2736
-#: utils/adt/numeric.c:1002
+#: utils/adt/numeric.c:1191
 msgid "lower bound cannot equal upper bound"
 msgstr "la limite inférieure ne peut pas être plus égale à la limite supérieure"
 
-#: utils/adt/formatting.c:491
+#: utils/adt/formatting.c:492
 msgid "invalid format specification for an interval value"
 msgstr "format de spécification invalide pour une valeur intervalle"
 
-#: utils/adt/formatting.c:492
+#: utils/adt/formatting.c:493
 msgid "Intervals are not tied to specific calendar dates."
 msgstr "Les intervalles ne sont pas liés aux dates de calendriers spécifiques."
 
-#: utils/adt/formatting.c:1059
+#: utils/adt/formatting.c:1060
 msgid "\"EEEE\" must be the last pattern used"
 msgstr "« EEEE » doit être le dernier motif utilisé"
 
-#: utils/adt/formatting.c:1067
+#: utils/adt/formatting.c:1068
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "« 9 » doit être avant « PR »"
 
-#: utils/adt/formatting.c:1083
+#: utils/adt/formatting.c:1084
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "« 0 » doit être avant « PR »"
 
-#: utils/adt/formatting.c:1109
+#: utils/adt/formatting.c:1110
 msgid "multiple decimal points"
 msgstr "multiples points décimaux"
 
-#: utils/adt/formatting.c:1113
-#: utils/adt/formatting.c:1196
+#: utils/adt/formatting.c:1114
+#: utils/adt/formatting.c:1197
 msgid "cannot use \"V\" and decimal point together"
 msgstr "ne peut pas utiliser « V » et le point décimal ensemble"
 
-#: utils/adt/formatting.c:1125
+#: utils/adt/formatting.c:1126
 msgid "cannot use \"S\" twice"
 msgstr "ne peut pas utiliser « S » deux fois"
 
-#: utils/adt/formatting.c:1129
+#: utils/adt/formatting.c:1130
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "ne peut pas utiliser « S » et « PL »/« MI »/« SG »/« PR » ensemble"
 
-#: utils/adt/formatting.c:1149
+#: utils/adt/formatting.c:1150
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "ne peut pas utiliser « S » et « MI » ensemble"
 
-#: utils/adt/formatting.c:1159
+#: utils/adt/formatting.c:1160
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "ne peut pas utiliser « S » et « PL » ensemble"
 
-#: utils/adt/formatting.c:1169
+#: utils/adt/formatting.c:1170
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "ne peut pas utiliser « S » et « SG » ensemble"
 
-#: utils/adt/formatting.c:1178
+#: utils/adt/formatting.c:1179
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "ne peut pas utiliser « PR » et « S »/« PL »/« MI »/« SG » ensemble"
 
-#: utils/adt/formatting.c:1204
+#: utils/adt/formatting.c:1205
 msgid "cannot use \"EEEE\" twice"
 msgstr "ne peut pas utiliser « EEEE » deux fois"
 
-#: utils/adt/formatting.c:1210
+#: utils/adt/formatting.c:1211
 msgid "\"EEEE\" is incompatible with other formats"
 msgstr "« EEEE » est incompatible avec les autres formats"
 
-#: utils/adt/formatting.c:1211
+#: utils/adt/formatting.c:1212
 msgid "\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr "« EEEE » peut seulement être utilisé avec les motifs de chiffres et de points décimaux."
 
-#: utils/adt/formatting.c:1411
+#: utils/adt/formatting.c:1412
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "« %s » n'est pas un nombre"
 
-#: utils/adt/formatting.c:1788
+#: utils/adt/formatting.c:1519
+#: utils/adt/formatting.c:1569
+msgid "could not determine which collation to use for lower() function"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour la fonction lower()"
+
+#: utils/adt/formatting.c:1640
+#: utils/adt/formatting.c:1690
+msgid "could not determine which collation to use for upper() function"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour la fonction upper()"
+
+#: utils/adt/formatting.c:1773
+#: utils/adt/formatting.c:1835
+msgid "could not determine which collation to use for initcap() function"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour la fonction initcap()"
+
+#: utils/adt/formatting.c:2017
 msgid "invalid combination of date conventions"
 msgstr "combinaison invalide des conventions de date"
 
-#: utils/adt/formatting.c:1789
+#: utils/adt/formatting.c:2018
 msgid "Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr ""
 "Ne pas mixer les conventions de jour de semaine grégorien et ISO dans un\n"
 "modèle de formatage."
 
-#: utils/adt/formatting.c:1806
+#: utils/adt/formatting.c:2035
 #, c-format
 msgid "conflicting values for \"%s\" field in formatting string"
 msgstr "valeur conflictuelle pour le champ « %s » dans la chaîne de formatage"
 
-#: utils/adt/formatting.c:1808
+#: utils/adt/formatting.c:2037
 msgid "This value contradicts a previous setting for the same field type."
 msgstr "Cette valeur contredit une configuration précédente pour le même type de champ."
 
-#: utils/adt/formatting.c:1869
+#: utils/adt/formatting.c:2098
 #, c-format
 msgid "source string too short for \"%s\" formatting field"
 msgstr "chaîne source trop petite pour le champ de formatage « %s »"
 
-#: utils/adt/formatting.c:1871
+#: utils/adt/formatting.c:2100
 #, c-format
 msgid "Field requires %d characters, but only %d remain."
 msgstr "Le champ requiert %d caractères, mais seuls %d restent."
 
-#: utils/adt/formatting.c:1874
-#: utils/adt/formatting.c:1888
+#: utils/adt/formatting.c:2103
+#: utils/adt/formatting.c:2117
 msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
 msgstr ""
 "Si votre chaîne source n'a pas une taille fixe, essayez d'utiliser le\n"
 "modifieur « FM »."
 
-#: utils/adt/formatting.c:1884
-#: utils/adt/formatting.c:1897
-#: utils/adt/formatting.c:2027
+#: utils/adt/formatting.c:2113
+#: utils/adt/formatting.c:2126
+#: utils/adt/formatting.c:2256
 #, c-format
 msgid "invalid value \"%s\" for \"%s\""
 msgstr "valeur « %s » invalide pour « %s »"
 
-#: utils/adt/formatting.c:1886
+#: utils/adt/formatting.c:2115
 #, c-format
 msgid "Field requires %d characters, but only %d could be parsed."
 msgstr "Le champ nécessite %d caractères, mais seulement %d ont pu être analysés."
 
-#: utils/adt/formatting.c:1899
+#: utils/adt/formatting.c:2128
 msgid "Value must be an integer."
 msgstr "La valeur doit être un entier"
 
-#: utils/adt/formatting.c:1904
+#: utils/adt/formatting.c:2133
 #, c-format
 msgid "value for \"%s\" in source string is out of range"
 msgstr "la valeur pour « %s » dans la chaîne source est en dehors des limites"
 
-#: utils/adt/formatting.c:1906
+#: utils/adt/formatting.c:2135
 #, c-format
 msgid "Value must be in the range %d to %d."
 msgstr "La valeur doit être compris entre %d et %d"
 
-#: utils/adt/formatting.c:2029
+#: utils/adt/formatting.c:2258
 msgid "The given value did not match any of the allowed values for this field."
 msgstr "La valeur donnée ne correspond pas aux valeurs autorisées pour ce champ."
 
-#: utils/adt/formatting.c:2585
+#: utils/adt/formatting.c:2814
 msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
 msgstr "les motifs de format « TZ »/ « tz » ne sont pas supportés dans to_date"
 
-#: utils/adt/formatting.c:2689
+#: utils/adt/formatting.c:2918
 msgid "invalid input string for \"Y,YYY\""
 msgstr "chaîne invalide en entrée pour « Y,YYY »"
 
-#: utils/adt/formatting.c:3206
+#: utils/adt/formatting.c:3435
 #, c-format
 msgid "hour \"%d\" is invalid for the 12-hour clock"
 msgstr "l'heure « %d » est invalide pour une horloge sur 12 heures"
 
-#: utils/adt/formatting.c:3208
+#: utils/adt/formatting.c:3437
 msgid "Use the 24-hour clock, or give an hour between 1 and 12."
 msgstr "Utilisez une horloge sur 24 heures ou donnez une heure entre 1 et 12."
 
-#: utils/adt/formatting.c:3246
+#: utils/adt/formatting.c:3475
 #, c-format
 msgid "inconsistent use of year %04d and \"BC\""
 msgstr "utilisation non cohérente de l'année %04d et de « BC »"
 
-#: utils/adt/formatting.c:3293
+#: utils/adt/formatting.c:3522
 msgid "cannot calculate day of year without year information"
 msgstr "ne peut pas calculer le jour de l'année sans information sur l'année"
 
-#: utils/adt/formatting.c:4151
+#: utils/adt/formatting.c:4384
 msgid "\"EEEE\" not supported for input"
 msgstr "« EEEE » non supporté en entrée"
 
-#: utils/adt/formatting.c:4163
+#: utils/adt/formatting.c:4396
 msgid "\"RN\" not supported for input"
 msgstr "« RN » non supporté en entrée"
 
-#: utils/adt/genfile.c:58
+#: utils/adt/genfile.c:60
 msgid "reference to parent directory (\"..\") not allowed"
 msgstr "référence non autorisée au répertoire parent (« .. »)"
 
-#: utils/adt/genfile.c:72
+#: utils/adt/genfile.c:71
 msgid "absolute path not allowed"
 msgstr "chemin absolu non autorisé"
 
-#: utils/adt/genfile.c:99
-msgid "must be superuser to read files"
-msgstr "doit être super-utilisateur pour lire des fichiers"
+#: utils/adt/genfile.c:76
+msgid "path must be in or below the current directory"
+msgstr "le chemin doit être dans ou en-dessous du répertoire courant"
+
+#: utils/adt/genfile.c:117
+#: utils/adt/oracle_compat.c:184
+#: utils/adt/oracle_compat.c:282
+#: utils/adt/oracle_compat.c:758
+#: utils/adt/oracle_compat.c:1048
+msgid "requested length too large"
+msgstr "longueur demandée trop importante"
 
-#: utils/adt/genfile.c:113
+#: utils/adt/genfile.c:129
 #, c-format
 msgid "could not seek in file \"%s\": %m"
 msgstr "n'a pas pu parcourir le fichier « %s » : %m"
 
-#: utils/adt/genfile.c:118
+#: utils/adt/genfile.c:179
+#: utils/adt/genfile.c:203
+#: utils/adt/genfile.c:224
+#: utils/adt/genfile.c:248
+msgid "must be superuser to read files"
+msgstr "doit être super-utilisateur pour lire des fichiers"
+
+#: utils/adt/genfile.c:186
+#: utils/adt/genfile.c:231
 msgid "requested length cannot be negative"
 msgstr "la longueur demandée ne peut pas être négative"
 
-#: utils/adt/genfile.c:124
-#: utils/adt/oracle_compat.c:181
-#: utils/adt/oracle_compat.c:279
-#: utils/adt/oracle_compat.c:755
-#: utils/adt/oracle_compat.c:1045
-msgid "requested length too large"
-msgstr "longueur demandée trop importante"
-
-#: utils/adt/genfile.c:163
+#: utils/adt/genfile.c:272
 msgid "must be superuser to get file information"
 msgstr "doit être super-utilisateur pour obtenir des informations sur le fichier"
 
-#: utils/adt/genfile.c:227
+#: utils/adt/genfile.c:336
 msgid "must be superuser to get directory listings"
 msgstr "doit être super-utilisateur pour obtenir le contenu du répertoire"
 
 #: utils/adt/geo_ops.c:294
-#: utils/adt/geo_ops.c:4249
-#: utils/adt/geo_ops.c:5166
+#: utils/adt/geo_ops.c:4251
+#: utils/adt/geo_ops.c:5172
 msgid "too many points requested"
 msgstr "trop de points demandé"
 
@@ -14388,77 +15573,77 @@ msgstr "syntaxe en entr
 msgid "invalid number of points in external \"path\" value"
 msgstr "nombre de points invalide dans la valeur externe de « path »"
 
-#: utils/adt/geo_ops.c:1814
+#: utils/adt/geo_ops.c:1816
 #, c-format
 msgid "invalid input syntax for type point: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type point : « %s »"
 
-#: utils/adt/geo_ops.c:2042
+#: utils/adt/geo_ops.c:2044
 #, c-format
 msgid "invalid input syntax for type lseg: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type lseg : « %s »"
 
-#: utils/adt/geo_ops.c:2646
+#: utils/adt/geo_ops.c:2648
 msgid "function \"dist_lb\" not implemented"
 msgstr "la fonction « dist_lb » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:3159
+#: utils/adt/geo_ops.c:3161
 msgid "function \"close_lb\" not implemented"
 msgstr "la fonction « close_lb » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:3448
+#: utils/adt/geo_ops.c:3450
 msgid "cannot create bounding box for empty polygon"
 msgstr "ne peut pas créer une boîte entourée pour un polygône vide"
 
-#: utils/adt/geo_ops.c:3472
-#: utils/adt/geo_ops.c:3484
+#: utils/adt/geo_ops.c:3474
+#: utils/adt/geo_ops.c:3486
 #, c-format
 msgid "invalid input syntax for type polygon: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type polygon : « %s »"
 
-#: utils/adt/geo_ops.c:3524
+#: utils/adt/geo_ops.c:3526
 msgid "invalid number of points in external \"polygon\" value"
 msgstr "nombre de points invalide dans la valeur externe de « polygon »"
 
-#: utils/adt/geo_ops.c:4047
+#: utils/adt/geo_ops.c:4049
 msgid "function \"poly_distance\" not implemented"
 msgstr "la fonction « poly_distance » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:4359
+#: utils/adt/geo_ops.c:4363
 msgid "function \"path_center\" not implemented"
 msgstr "la fonction « path_center » n'est pas implémentée"
 
-#: utils/adt/geo_ops.c:4376
+#: utils/adt/geo_ops.c:4380
 msgid "open path cannot be converted to polygon"
 msgstr "le chemin ouvert ne peut être converti en polygône"
 
-#: utils/adt/geo_ops.c:4543
-#: utils/adt/geo_ops.c:4553
-#: utils/adt/geo_ops.c:4568
+#: utils/adt/geo_ops.c:4549
+#: utils/adt/geo_ops.c:4559
 #: utils/adt/geo_ops.c:4574
+#: utils/adt/geo_ops.c:4580
 #, c-format
 msgid "invalid input syntax for type circle: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type circle : « %s »"
 
-#: utils/adt/geo_ops.c:4596
-#: utils/adt/geo_ops.c:4604
+#: utils/adt/geo_ops.c:4602
+#: utils/adt/geo_ops.c:4610
 msgid "could not format \"circle\" value"
 msgstr "n'a pas pu formater la valeur « circle »"
 
-#: utils/adt/geo_ops.c:4631
+#: utils/adt/geo_ops.c:4637
 msgid "invalid radius in external \"circle\" value"
 msgstr "diamètre invalide pour la valeur externe de « circle »"
 
-#: utils/adt/geo_ops.c:5152
+#: utils/adt/geo_ops.c:5158
 msgid "cannot convert circle with radius zero to polygon"
 msgstr "ne peut pas convertir le cercle avec un diamètre zéro en un polygône"
 
-#: utils/adt/geo_ops.c:5157
+#: utils/adt/geo_ops.c:5163
 msgid "must request at least 2 points"
 msgstr "doit demander au moins deux points"
 
-#: utils/adt/geo_ops.c:5201
-#: utils/adt/geo_ops.c:5224
+#: utils/adt/geo_ops.c:5207
+#: utils/adt/geo_ops.c:5230
 msgid "cannot convert empty polygon to circle"
 msgstr "ne peut pas convertir un polygône vide en cercle"
 
@@ -14466,82 +15651,87 @@ msgstr "ne peut pas convertir un polyg
 msgid "int2vector has too many elements"
 msgstr "int2vector a trop d'éléments"
 
-#: utils/adt/int.c:236
+#: utils/adt/int.c:237
 msgid "invalid int2vector data"
 msgstr "données int2vector invalide"
 
-#: utils/adt/int.c:242
+#: utils/adt/int.c:243
 #: utils/adt/oid.c:212
-#: utils/adt/oid.c:292
+#: utils/adt/oid.c:293
 msgid "oidvector has too many elements"
 msgstr "oidvector a trop d'éléments"
 
-#: utils/adt/int.c:1344
-#: utils/adt/int8.c:1375
+#: utils/adt/int.c:1345
+#: utils/adt/int8.c:1373
 #: utils/adt/timestamp.c:4712
 #: utils/adt/timestamp.c:4793
 msgid "step size cannot equal zero"
 msgstr "la taille du pas ne peut pas valoir zéro"
 
-#: utils/adt/int8.c:97
-#: utils/adt/int8.c:132
-#: utils/adt/numutils.c:53
-#: utils/adt/numutils.c:63
-#: utils/adt/numutils.c:105
+#: utils/adt/int8.c:98
+#: utils/adt/int8.c:133
+#: utils/adt/numutils.c:51
+#: utils/adt/numutils.c:61
+#: utils/adt/numutils.c:103
 #, c-format
 msgid "invalid input syntax for integer: \"%s\""
 msgstr "syntaxe en entrée invalide pour l'entier : « %s »"
 
-#: utils/adt/int8.c:113
+#: utils/adt/int8.c:114
 #, c-format
 msgid "value \"%s\" is out of range for type bigint"
 msgstr "la valeur « %s » est en dehors des limites du type bigint"
 
-#: utils/adt/int8.c:502
-#: utils/adt/int8.c:531
-#: utils/adt/int8.c:552
-#: utils/adt/int8.c:582
-#: utils/adt/int8.c:614
-#: utils/adt/int8.c:632
-#: utils/adt/int8.c:681
-#: utils/adt/int8.c:698
-#: utils/adt/int8.c:767
-#: utils/adt/int8.c:788
-#: utils/adt/int8.c:815
-#: utils/adt/int8.c:846
-#: utils/adt/int8.c:867
-#: utils/adt/int8.c:888
-#: utils/adt/int8.c:915
-#: utils/adt/int8.c:955
-#: utils/adt/int8.c:976
-#: utils/adt/int8.c:1003
-#: utils/adt/int8.c:1034
-#: utils/adt/int8.c:1055
-#: utils/adt/int8.c:1076
-#: utils/adt/int8.c:1103
-#: utils/adt/int8.c:1276
-#: utils/adt/int8.c:1315
-#: utils/adt/numeric.c:2115
-#: utils/adt/varbit.c:1563
+#: utils/adt/int8.c:500
+#: utils/adt/int8.c:529
+#: utils/adt/int8.c:550
+#: utils/adt/int8.c:580
+#: utils/adt/int8.c:612
+#: utils/adt/int8.c:630
+#: utils/adt/int8.c:679
+#: utils/adt/int8.c:696
+#: utils/adt/int8.c:765
+#: utils/adt/int8.c:786
+#: utils/adt/int8.c:813
+#: utils/adt/int8.c:844
+#: utils/adt/int8.c:865
+#: utils/adt/int8.c:886
+#: utils/adt/int8.c:913
+#: utils/adt/int8.c:953
+#: utils/adt/int8.c:974
+#: utils/adt/int8.c:1001
+#: utils/adt/int8.c:1032
+#: utils/adt/int8.c:1053
+#: utils/adt/int8.c:1074
+#: utils/adt/int8.c:1101
+#: utils/adt/int8.c:1274
+#: utils/adt/int8.c:1313
+#: utils/adt/numeric.c:2306
+#: utils/adt/varbit.c:1583
 msgid "bigint out of range"
 msgstr "bigint en dehors des limites"
 
-#: utils/adt/int8.c:1332
+#: utils/adt/int8.c:1330
 msgid "OID out of range"
 msgstr "OID en dehors des limites"
 
-#: utils/adt/like_match.c:103
-#: utils/adt/like_match.c:163
+#: utils/adt/like.c:211
+#: utils/adt/selfuncs.c:4911
+msgid "could not determine which collation to use for ILIKE"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour ILIKE"
+
+#: utils/adt/like_match.c:104
+#: utils/adt/like_match.c:164
 msgid "LIKE pattern must not end with escape character"
 msgstr "le motif LIKE ne se termine pas de caractères d'échappement"
 
-#: utils/adt/like_match.c:287
-#: utils/adt/regexp.c:668
+#: utils/adt/like_match.c:289
+#: utils/adt/regexp.c:684
 msgid "invalid escape string"
 msgstr "chaîne d'échappement invalide"
 
-#: utils/adt/like_match.c:288
-#: utils/adt/regexp.c:669
+#: utils/adt/like_match.c:290
+#: utils/adt/regexp.c:685
 msgid "Escape string must be empty or one character."
 msgstr "La chaîne d'échappement doit être vide ou ne contenir qu'un caractère."
 
@@ -14624,7 +15814,7 @@ msgstr "statut invalide dans la valeur externe 
 msgid "cannot convert reltime \"invalid\" to interval"
 msgstr "ne peut pas convertir reltime « invalid » en interval"
 
-#: utils/adt/nabstime.c:1562
+#: utils/adt/nabstime.c:1575
 #, c-format
 msgid "invalid input syntax for type tinterval: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type tinterval : « %s »"
@@ -14701,86 +15891,86 @@ msgstr "le r
 msgid "cannot subtract inet values of different sizes"
 msgstr "ne peut pas soustraire des valeurs inet de tailles différentes"
 
-#: utils/adt/numeric.c:352
-#: utils/adt/numeric.c:379
-#: utils/adt/numeric.c:3083
-#: utils/adt/numeric.c:3106
-#: utils/adt/numeric.c:3130
-#: utils/adt/numeric.c:3137
+#: utils/adt/numeric.c:473
+#: utils/adt/numeric.c:500
+#: utils/adt/numeric.c:3275
+#: utils/adt/numeric.c:3298
+#: utils/adt/numeric.c:3322
+#: utils/adt/numeric.c:3329
 #, c-format
 msgid "invalid input syntax for type numeric: \"%s\""
 msgstr "syntaxe en entrée invalide pour le type numeric : « %s »"
 
-#: utils/adt/numeric.c:482
+#: utils/adt/numeric.c:653
 msgid "invalid length in external \"numeric\" value"
 msgstr "longueur invalide dans la valeur externe « numeric »"
 
-#: utils/adt/numeric.c:493
+#: utils/adt/numeric.c:664
 msgid "invalid sign in external \"numeric\" value"
 msgstr "signe invalide dans la valeur externe « numeric »"
 
-#: utils/adt/numeric.c:503
+#: utils/adt/numeric.c:674
 msgid "invalid digit in external \"numeric\" value"
 msgstr "chiffre invalide dans la valeur externe « numeric »"
 
-#: utils/adt/numeric.c:634
-#: utils/adt/numeric.c:648
+#: utils/adt/numeric.c:814
+#: utils/adt/numeric.c:828
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr "la précision NUMERIC %d doit être comprise entre 1 et %d"
 
-#: utils/adt/numeric.c:639
+#: utils/adt/numeric.c:819
 #, c-format
 msgid "NUMERIC scale %d must be between 0 and precision %d"
 msgstr "l'échelle NUMERIC %d doit être comprise entre 0 et %d"
 
-#: utils/adt/numeric.c:657
+#: utils/adt/numeric.c:837
 msgid "invalid NUMERIC type modifier"
 msgstr "modificateur de type NUMERIC invalide"
 
-#: utils/adt/numeric.c:1690
-#: utils/adt/numeric.c:3545
+#: utils/adt/numeric.c:1881
+#: utils/adt/numeric.c:3754
 msgid "value overflows numeric format"
 msgstr "la valeur dépasse le format numeric"
 
-#: utils/adt/numeric.c:2038
+#: utils/adt/numeric.c:2229
 msgid "cannot convert NaN to integer"
 msgstr "ne peut pas convertir NaN en un entier"
 
-#: utils/adt/numeric.c:2106
+#: utils/adt/numeric.c:2297
 msgid "cannot convert NaN to bigint"
 msgstr "ne peut pas convertir NaN en un entier de type bigint"
 
-#: utils/adt/numeric.c:2154
+#: utils/adt/numeric.c:2345
 msgid "cannot convert NaN to smallint"
 msgstr "ne peut pas convertir NaN en un entier de type smallint"
 
-#: utils/adt/numeric.c:3615
+#: utils/adt/numeric.c:3824
 msgid "numeric field overflow"
 msgstr "champ numérique en dehors des limites"
 
-#: utils/adt/numeric.c:3616
+#: utils/adt/numeric.c:3825
 #, c-format
 msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
 msgstr ""
 "Un champ de précision %d et d'échelle %d doit être arrondi à une valeur\n"
 "absolue inférieure à %s%d."
 
-#: utils/adt/numeric.c:5064
+#: utils/adt/numeric.c:5273
 msgid "argument for function \"exp\" too big"
 msgstr "l'argument de la fonction « exp » est trop gros"
 
-#: utils/adt/numutils.c:77
+#: utils/adt/numutils.c:75
 #, c-format
 msgid "value \"%s\" is out of range for type integer"
 msgstr "la valeur « %s » est en dehors des limites du type integer"
 
-#: utils/adt/numutils.c:83
+#: utils/adt/numutils.c:81
 #, c-format
 msgid "value \"%s\" is out of range for type smallint"
 msgstr "la valeur « %s » est en dehors des limites du type smallint"
 
-#: utils/adt/numutils.c:89
+#: utils/adt/numutils.c:87
 #, c-format
 msgid "value \"%s\" is out of range for 8-bit integer"
 msgstr "la valeur « %s » est en dehors des limites des entiers sur 8 bits"
@@ -14799,24 +15989,54 @@ msgstr "syntaxe invalide en entr
 msgid "value \"%s\" is out of range for type oid"
 msgstr "la valeur « %s » est en dehors des limites pour le type oid"
 
-#: utils/adt/oid.c:286
+#: utils/adt/oid.c:287
 msgid "invalid oidvector data"
 msgstr "donnée oidvector invalide"
 
-#: utils/adt/oracle_compat.c:892
+#: utils/adt/oracle_compat.c:895
 msgid "requested character too large"
 msgstr "caractère demandé trop long"
 
-#: utils/adt/oracle_compat.c:938
-#: utils/adt/oracle_compat.c:992
+#: utils/adt/oracle_compat.c:941
+#: utils/adt/oracle_compat.c:995
 #, c-format
 msgid "requested character too large for encoding: %d"
 msgstr "caractère demandé trop long pour l'encodage : %d"
 
-#: utils/adt/oracle_compat.c:985
+#: utils/adt/oracle_compat.c:988
 msgid "null character not permitted"
 msgstr "caractère nul interdit"
 
+#: utils/adt/pg_locale.c:953
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "n'a pas pu créer la locale « %s » : %m"
+
+#: utils/adt/pg_locale.c:956
+#, c-format
+msgid "The operating system could not find any locale data for the locale name \"%s\"."
+msgstr "Le système d'exploitation n'a pas pu trouver des données de locale pour la locale « %s »."
+
+#: utils/adt/pg_locale.c:1043
+msgid "collations with different collate and ctype values are not supported on this platform"
+msgstr ""
+"les collationnements avec des valeurs différents pour le tri et le jeu de\n"
+"caractères ne sont pas supportés sur cette plateforme"
+
+#: utils/adt/pg_locale.c:1058
+msgid "nondefault collations are not supported on this platform"
+msgstr "les collationnements autres que par défaut ne sont pas supportés sur cette plateforme"
+
+#: utils/adt/pg_locale.c:1229
+msgid "invalid multibyte character for locale"
+msgstr "caractère multi-octets invalide pour la locale"
+
+#: utils/adt/pg_locale.c:1230
+msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
+msgstr ""
+"La locale LC_CTYPE du serveur est probablement incompatible avec l'encodage\n"
+"de la base de données."
+
 #: utils/adt/pseudotypes.c:94
 msgid "cannot accept a value of type any"
 msgstr "ne peut pas accepter une valeur de type any"
@@ -14834,74 +16054,87 @@ msgstr "ne peut pas accepter une valeur de type anyarray"
 msgid "cannot accept a value of type anyenum"
 msgstr "ne peut pas accepter une valeur de type anyenum"
 
-#: utils/adt/pseudotypes.c:224
+#: utils/adt/pseudotypes.c:252
 msgid "cannot accept a value of type trigger"
 msgstr "ne peut pas accepter une valeur de type trigger"
 
-#: utils/adt/pseudotypes.c:237
+#: utils/adt/pseudotypes.c:265
 msgid "cannot display a value of type trigger"
 msgstr "ne peut pas afficher une valeur de type trigger"
 
-#: utils/adt/pseudotypes.c:251
+#: utils/adt/pseudotypes.c:279
 msgid "cannot accept a value of type language_handler"
 msgstr "ne peut pas accepter une valeur de type language_handler"
 
-#: utils/adt/pseudotypes.c:264
+#: utils/adt/pseudotypes.c:292
 msgid "cannot display a value of type language_handler"
 msgstr "ne peut pas afficher une valeur de type language_handler"
 
-#: utils/adt/pseudotypes.c:278
+#: utils/adt/pseudotypes.c:306
+msgid "cannot accept a value of type fdw_handler"
+msgstr "ne peut pas accepter une valeur de type fdw_handler"
+
+#: utils/adt/pseudotypes.c:319
+msgid "cannot display a value of type fdw_handler"
+msgstr "ne peut pas afficher une valeur de type fdw_handler"
+
+#: utils/adt/pseudotypes.c:333
 msgid "cannot accept a value of type internal"
 msgstr "ne peut pas accepter une valeur de type internal"
 
-#: utils/adt/pseudotypes.c:291
+#: utils/adt/pseudotypes.c:346
 msgid "cannot display a value of type internal"
 msgstr "ne peut pas afficher une valeur de type internal"
 
-#: utils/adt/pseudotypes.c:305
+#: utils/adt/pseudotypes.c:360
 msgid "cannot accept a value of type opaque"
 msgstr "ne peut pas accepter une valeur de type opaque"
 
-#: utils/adt/pseudotypes.c:318
+#: utils/adt/pseudotypes.c:373
 msgid "cannot display a value of type opaque"
 msgstr "ne peut pas afficher une valeur de type opaque"
 
-#: utils/adt/pseudotypes.c:332
+#: utils/adt/pseudotypes.c:387
 msgid "cannot accept a value of type anyelement"
 msgstr "ne peut pas accepter une valeur de type anyelement"
 
-#: utils/adt/pseudotypes.c:345
+#: utils/adt/pseudotypes.c:400
 msgid "cannot display a value of type anyelement"
 msgstr "ne peut pas afficher une valeur de type anyelement"
 
-#: utils/adt/pseudotypes.c:358
+#: utils/adt/pseudotypes.c:413
 msgid "cannot accept a value of type anynonarray"
 msgstr "ne peut pas accepter une valeur de type anynonarray"
 
-#: utils/adt/pseudotypes.c:371
+#: utils/adt/pseudotypes.c:426
 msgid "cannot display a value of type anynonarray"
 msgstr "ne peut pas afficher une valeur de type anynonarray"
 
-#: utils/adt/pseudotypes.c:384
+#: utils/adt/pseudotypes.c:439
 msgid "cannot accept a value of a shell type"
 msgstr "ne peut pas accepter une valeur de type shell"
 
-#: utils/adt/pseudotypes.c:397
+#: utils/adt/pseudotypes.c:452
 msgid "cannot display a value of a shell type"
 msgstr "ne peut pas afficher une valeur de type shell"
 
-#: utils/adt/regexp.c:269
-#: utils/adt/varlena.c:2797
+#: utils/adt/pseudotypes.c:474
+#: utils/adt/pseudotypes.c:498
+msgid "cannot accept a value of type pg_node_tree"
+msgstr "ne peut pas accepter une valeur de type pg_node_tree"
+
+#: utils/adt/regexp.c:275
+#: utils/adt/varlena.c:2866
 #, c-format
 msgid "regular expression failed: %s"
 msgstr "l'expression rationnelle a échoué : %s"
 
-#: utils/adt/regexp.c:404
+#: utils/adt/regexp.c:412
 #, c-format
 msgid "invalid regexp option: \"%c\""
 msgstr "option invalide de l'expression rationnelle : « %c »"
 
-#: utils/adt/regexp.c:865
+#: utils/adt/regexp.c:884
 msgid "regexp_split does not support the global option"
 msgstr "regexp_split ne supporte pas l'option globale"
 
@@ -14919,9 +16152,9 @@ msgstr "il existe plus d'un op
 
 #: utils/adt/regproc.c:635
 #: utils/adt/regproc.c:1485
-#: utils/adt/ruleutils.c:5513
-#: utils/adt/ruleutils.c:5568
-#: utils/adt/ruleutils.c:5605
+#: utils/adt/ruleutils.c:5858
+#: utils/adt/ruleutils.c:5913
+#: utils/adt/ruleutils.c:5950
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
@@ -14931,8 +16164,8 @@ msgstr "Fournit deux types d'argument pour l'op
 
 #: utils/adt/regproc.c:1320
 #: utils/adt/regproc.c:1325
-#: utils/adt/varlena.c:2198
-#: utils/adt/varlena.c:2203
+#: utils/adt/varlena.c:2251
+#: utils/adt/varlena.c:2256
 msgid "invalid name syntax"
 msgstr "syntaxe du nom invalide"
 
@@ -14952,76 +16185,76 @@ msgstr "attendait un nom de type"
 msgid "improper type name"
 msgstr "nom du type invalide"
 
-#: utils/adt/ri_triggers.c:407
-#: utils/adt/ri_triggers.c:2803
-#: utils/adt/ri_triggers.c:3454
-#: utils/adt/ri_triggers.c:3486
+#: utils/adt/ri_triggers.c:409
+#: utils/adt/ri_triggers.c:2839
+#: utils/adt/ri_triggers.c:3537
+#: utils/adt/ri_triggers.c:3569
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 "une instruction insert ou update sur la table « %s » viole la contrainte de clé\n"
 "étrangère « %s »"
 
-#: utils/adt/ri_triggers.c:410
-#: utils/adt/ri_triggers.c:2806
+#: utils/adt/ri_triggers.c:412
+#: utils/adt/ri_triggers.c:2842
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr "MATCH FULL n'autorise pas le mixage de valeurs clés NULL et non NULL."
 
-#: utils/adt/ri_triggers.c:3016
+#: utils/adt/ri_triggers.c:3099
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr "la fonction « %s » doit être exécutée pour l'instruction INSERT"
 
-#: utils/adt/ri_triggers.c:3022
+#: utils/adt/ri_triggers.c:3105
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr "la fonction « %s » doit être exécutée pour l'instruction UPDATE"
 
-#: utils/adt/ri_triggers.c:3036
+#: utils/adt/ri_triggers.c:3119
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr "la fonction « %s » doit être exécutée pour l'instruction DELETE"
 
-#: utils/adt/ri_triggers.c:3065
+#: utils/adt/ri_triggers.c:3148
 #, c-format
 msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
 msgstr "aucune entrée pg_constraint pour le trigger « %s » sur la table « %s »"
 
-#: utils/adt/ri_triggers.c:3067
+#: utils/adt/ri_triggers.c:3150
 msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 msgstr ""
 "Supprimez ce trigger sur une intégrité référentielle et ses enfants,\n"
 "puis faites un ALTER TABLE ADD CONSTRAINT."
 
-#: utils/adt/ri_triggers.c:3421
+#: utils/adt/ri_triggers.c:3504
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr ""
 "la requête d'intégrité référentielle sur « %s » à partir de la contrainte « %s »\n"
 "sur « %s » donne des résultats inattendus"
 
-#: utils/adt/ri_triggers.c:3425
+#: utils/adt/ri_triggers.c:3508
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr "Ceci est certainement dû à une règle qui a ré-écrit la requête."
 
-#: utils/adt/ri_triggers.c:3456
+#: utils/adt/ri_triggers.c:3539
 #, c-format
 msgid "No rows were found in \"%s\"."
 msgstr "Aucune ligne trouvée dans « %s »."
 
-#: utils/adt/ri_triggers.c:3488
+#: utils/adt/ri_triggers.c:3571
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr "La clé (%s)=(%s) n'est pas présente dans la table « %s »."
 
-#: utils/adt/ri_triggers.c:3494
+#: utils/adt/ri_triggers.c:3577
 #, c-format
 msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
 msgstr ""
 "UPDATE ou DELETE sur la table « %s » viole la contrainte de clé étrangère\n"
 "« %s » de la table « %s »"
 
-#: utils/adt/ri_triggers.c:3497
+#: utils/adt/ri_triggers.c:3580
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr "La clé (%s)=(%s) est toujours référencée à partir de la table « %s »."
@@ -15077,33 +16310,33 @@ msgstr "mauvais type de donn
 msgid "improper binary format in record column %d"
 msgstr "format binaire invalide dans l'enregistrement de la colonne %d"
 
-#: utils/adt/rowtypes.c:896
-#: utils/adt/rowtypes.c:1122
+#: utils/adt/rowtypes.c:897
+#: utils/adt/rowtypes.c:1132
 #, c-format
 msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr ""
 "ne peut pas comparer les types de colonnes non similaires %s et %s pour la\n"
 "colonne %d de l'enregistrement"
 
-#: utils/adt/rowtypes.c:974
-#: utils/adt/rowtypes.c:1185
+#: utils/adt/rowtypes.c:983
+#: utils/adt/rowtypes.c:1203
 msgid "cannot compare record types with different numbers of columns"
 msgstr ""
 "ne peut pas comparer les types d'enregistrement avec des numéros différents\n"
 "des colonnes"
 
-#: utils/adt/ruleutils.c:2237
+#: utils/adt/ruleutils.c:2429
 #, c-format
 msgid "rule \"%s\" has unsupported event type %d"
 msgstr "la règle « %s » a un type d'événement %d non supporté"
 
-#: utils/adt/selfuncs.c:4761
-#: utils/adt/selfuncs.c:5190
+#: utils/adt/selfuncs.c:4896
+#: utils/adt/selfuncs.c:5350
 msgid "case insensitive matching not supported on type bytea"
 msgstr "la recherche insensible à la casse n'est pas supportée avec le type bytea"
 
-#: utils/adt/selfuncs.c:4866
-#: utils/adt/selfuncs.c:5350
+#: utils/adt/selfuncs.c:5011
+#: utils/adt/selfuncs.c:5510
 msgid "regular-expression matching not supported on type bytea"
 msgstr "la recherche par expression rationnelle n'est pas supportée sur le type bytea"
 
@@ -15320,43 +16553,43 @@ msgstr "le mot est trop long (%ld octets, max %ld octets)"
 msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
 msgstr "la chaîne est trop longue pour tsvector (%ld octets, max %ld octets)"
 
-#: utils/adt/tsvector_op.c:1103
+#: utils/adt/tsvector_op.c:1173
 msgid "ts_stat query must return one tsvector column"
 msgstr "la requête ts_stat doit renvoyer une colonne tsvector"
 
-#: utils/adt/tsvector_op.c:1283
+#: utils/adt/tsvector_op.c:1353
 #, c-format
 msgid "tsvector column \"%s\" does not exist"
 msgstr "la colonne tsvector « %s » n'existe pas"
 
-#: utils/adt/tsvector_op.c:1289
+#: utils/adt/tsvector_op.c:1359
 #, c-format
 msgid "column \"%s\" is not of tsvector type"
 msgstr "la colonne « %s » n'est pas de type tsvector"
 
-#: utils/adt/tsvector_op.c:1301
+#: utils/adt/tsvector_op.c:1371
 #, c-format
 msgid "configuration column \"%s\" does not exist"
 msgstr "la colonne de configuration « %s » n'existe pas"
 
-#: utils/adt/tsvector_op.c:1307
+#: utils/adt/tsvector_op.c:1377
 #, c-format
 msgid "column \"%s\" is not of regconfig type"
 msgstr "la colonne « %s » n'est pas de type regconfig"
 
-#: utils/adt/tsvector_op.c:1314
+#: utils/adt/tsvector_op.c:1384
 #, c-format
 msgid "configuration column \"%s\" must not be null"
 msgstr "la colonne de configuration « %s » ne doit pas être NULL"
 
-#: utils/adt/tsvector_op.c:1327
+#: utils/adt/tsvector_op.c:1397
 #, c-format
 msgid "text search configuration name \"%s\" must be schema-qualified"
 msgstr ""
 "le nom de la configuration de la recherche plein texte « %s » doit être\n"
 "qualifié par son schéma"
 
-#: utils/adt/tsvector_op.c:1352
+#: utils/adt/tsvector_op.c:1422
 #, c-format
 msgid "column \"%s\" is not of a character type"
 msgstr "la colonne « %s » n'est pas de type caractère"
@@ -15381,79 +16614,79 @@ msgstr "mauvaise information de position dans tsvector : 
 msgid "invalid input syntax for uuid: \"%s\""
 msgstr "syntaxe invalide en entrée pour l'uuid : « %s »"
 
-#: utils/adt/varbit.c:54
+#: utils/adt/varbit.c:56
 #: utils/adt/varchar.c:48
 #, c-format
 msgid "length for type %s must be at least 1"
 msgstr "la longueur du type %s doit être d'au moins 1"
 
-#: utils/adt/varbit.c:59
+#: utils/adt/varbit.c:61
 #: utils/adt/varchar.c:52
 #, c-format
 msgid "length for type %s cannot exceed %d"
 msgstr "la longueur du type %s ne peut pas excéder %d"
 
-#: utils/adt/varbit.c:162
-#: utils/adt/varbit.c:302
-#: utils/adt/varbit.c:358
+#: utils/adt/varbit.c:166
+#: utils/adt/varbit.c:309
+#: utils/adt/varbit.c:366
 #, c-format
 msgid "bit string length %d does not match type bit(%d)"
 msgstr "la longueur (en bits) de la chaîne %d ne doit pas correspondre au type bit(%d)"
 
-#: utils/adt/varbit.c:184
-#: utils/adt/varbit.c:482
+#: utils/adt/varbit.c:188
+#: utils/adt/varbit.c:490
 #, c-format
 msgid "\"%c\" is not a valid binary digit"
 msgstr "« %c » n'est pas un chiffre binaire valide"
 
-#: utils/adt/varbit.c:209
-#: utils/adt/varbit.c:507
+#: utils/adt/varbit.c:213
+#: utils/adt/varbit.c:515
 #, c-format
 msgid "\"%c\" is not a valid hexadecimal digit"
 msgstr "« %c » n'est pas un chiffre hexadécimal valide"
 
-#: utils/adt/varbit.c:293
-#: utils/adt/varbit.c:594
+#: utils/adt/varbit.c:300
+#: utils/adt/varbit.c:603
 msgid "invalid length in external bit string"
 msgstr "longueur invalide dans la chaîne bit externe"
 
-#: utils/adt/varbit.c:460
-#: utils/adt/varbit.c:603
-#: utils/adt/varbit.c:664
+#: utils/adt/varbit.c:468
+#: utils/adt/varbit.c:612
+#: utils/adt/varbit.c:674
 #, c-format
 msgid "bit string too long for type bit varying(%d)"
 msgstr "la chaîne bit est trop longue pour le type bit varying(%d)"
 
-#: utils/adt/varbit.c:991
-#: utils/adt/varbit.c:1093
-#: utils/adt/varlena.c:729
-#: utils/adt/varlena.c:793
-#: utils/adt/varlena.c:937
-#: utils/adt/varlena.c:1843
-#: utils/adt/varlena.c:1910
+#: utils/adt/varbit.c:1004
+#: utils/adt/varbit.c:1106
+#: utils/adt/varlena.c:737
+#: utils/adt/varlena.c:801
+#: utils/adt/varlena.c:945
+#: utils/adt/varlena.c:1896
+#: utils/adt/varlena.c:1963
 msgid "negative substring length not allowed"
 msgstr "longueur de sous-chaîne négative non autorisée"
 
-#: utils/adt/varbit.c:1149
+#: utils/adt/varbit.c:1164
 msgid "cannot AND bit strings of different sizes"
 msgstr "ne peut pas utiliser l'opérateur AND sur des chaînes bit de tailles différentes"
 
-#: utils/adt/varbit.c:1190
+#: utils/adt/varbit.c:1206
 msgid "cannot OR bit strings of different sizes"
 msgstr "ne peut pas utiliser l'opérateur OR sur des chaînes bit de tailles différentes"
 
-#: utils/adt/varbit.c:1236
+#: utils/adt/varbit.c:1253
 msgid "cannot XOR bit strings of different sizes"
 msgstr "ne peut pas utiliser l'opérateur XOR sur des chaînes bit de tailles différentes"
 
-#: utils/adt/varbit.c:1710
-#: utils/adt/varbit.c:1768
+#: utils/adt/varbit.c:1731
+#: utils/adt/varbit.c:1789
 #, c-format
 msgid "bit index %d out of valid range (0..%d)"
 msgstr "index de bit %d en dehors des limites valides (0..%d)"
 
-#: utils/adt/varbit.c:1719
-#: utils/adt/varlena.c:2110
+#: utils/adt/varbit.c:1740
+#: utils/adt/varlena.c:2163
 msgid "new bit must be 0 or 1"
 msgstr "le nouveau bit doit valoir soit 0 soit 1"
 
@@ -15469,29 +16702,62 @@ msgstr "valeur trop longue pour le type character(%d)"
 msgid "value too long for type character varying(%d)"
 msgstr "valeur trop longue pour le type character varying(%d)"
 
-#: utils/adt/varlena.c:1333
-#: utils/adt/varlena.c:1346
+#: utils/adt/varlena.c:1314
+msgid "could not determine which collation to use for string comparison"
+msgstr "n'a pas pu déterminer le collationnement à utiliser pour la comparaison de chaîne"
+
+#: utils/adt/varlena.c:1358
+#: utils/adt/varlena.c:1371
 #, c-format
 msgid "could not convert string to UTF-16: error %lu"
 msgstr "n'a pas pu convertir la chaîne en UTF16 : erreur %lu"
 
-#: utils/adt/varlena.c:1356
+#: utils/adt/varlena.c:1386
 #, c-format
 msgid "could not compare Unicode strings: %m"
 msgstr "n'a pas pu comparer les chaînes unicode : %m"
 
-#: utils/adt/varlena.c:1988
-#: utils/adt/varlena.c:2019
-#: utils/adt/varlena.c:2055
-#: utils/adt/varlena.c:2098
+#: utils/adt/varlena.c:2041
+#: utils/adt/varlena.c:2072
+#: utils/adt/varlena.c:2108
+#: utils/adt/varlena.c:2151
 #, c-format
 msgid "index %d out of valid range, 0..%d"
 msgstr "index %d en dehors des limites valides, 0..%d"
 
-#: utils/adt/varlena.c:2890
+#: utils/adt/varlena.c:2959
 msgid "field position must be greater than zero"
 msgstr "la position du champ doit être plus grand que zéro"
 
+#: utils/adt/varlena.c:3828
+#: utils/adt/varlena.c:3889
+msgid "unterminated conversion specifier"
+msgstr "spécificateur de conversion non terminé"
+
+#: utils/adt/varlena.c:3852
+#: utils/adt/varlena.c:3868
+msgid "argument number is out of range"
+msgstr "le nombre en argument est en dehors des limites"
+
+#: utils/adt/varlena.c:3895
+msgid "conversion specifies argument 0, but arguments are numbered from 1"
+msgstr ""
+"la conversion spécifie l'argument 0 mais les arguments doivent être numérotés\n"
+"à partir de 1"
+
+#: utils/adt/varlena.c:3902
+msgid "too few arguments for format"
+msgstr "trop peu d'arguments pour le format"
+
+#: utils/adt/varlena.c:3923
+#, c-format
+msgid "unrecognized conversion specifier \"%c\""
+msgstr "spécificateur de conversion « %c » inconnu"
+
+#: utils/adt/varlena.c:3952
+msgid "null values cannot be formatted as an SQL identifier"
+msgstr "les valeurs NULL ne peuvent pas être formatés comme un identifiant SQL"
+
 #: utils/adt/windowfuncs.c:243
 msgid "argument of ntile must be greater than zero"
 msgstr "l'argument de ntile doit être supérieur à zéro"
@@ -15500,2328 +16766,2377 @@ msgstr "l'argument de ntile doit 
 msgid "argument of nth_value must be greater than zero"
 msgstr "l'argument de nth_value doit être supérieur à zéro"
 
-#: utils/misc/tzparser.c:63
-#, c-format
-msgid "time zone abbreviation \"%s\" is too long (maximum %d characters) in time zone file \"%s\", line %d"
-msgstr ""
-"l'abréviation « %s » du fuseau horaire est trop long (maximum %d caractères)\n"
-"dans le fichier de fuseaux horaires « %s », ligne %d"
+#: utils/adt/xml.c:135
+msgid "unsupported XML feature"
+msgstr "fonctionnalité XML non supportée"
 
-#: utils/misc/tzparser.c:72
-#, c-format
-msgid "time zone offset %d is not a multiple of 900 sec (15 min) in time zone file \"%s\", line %d"
-msgstr ""
-"le décalage %d du fuseau horaire n'est pas un multiples de 900 secondes\n"
-"(15 minutes) dans le fichier des fuseaux horaires « %s », ligne %d"
+#: utils/adt/xml.c:136
+msgid "This functionality requires the server to be built with libxml support."
+msgstr "Cette fonctionnalité nécessite que le serveur dispose du support de libxml."
 
-#: utils/misc/tzparser.c:86
-#, c-format
-msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
-msgstr ""
-"le décalage %d du fuseau horaire est en dehors des limites dans le fichier\n"
-"des fuseaux horaires « %s », ligne %d"
+#: utils/adt/xml.c:137
+msgid "You need to rebuild PostgreSQL using --with-libxml."
+msgstr "Vous devez recompiler PostgreSQL en utilisant --with-libxml."
 
-#: utils/misc/tzparser.c:123
+#: utils/adt/xml.c:156
+#: utils/mb/mbutils.c:515
 #, c-format
-msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr "abréviation du fuseau horaire manquant dans le fichier « %s », ligne %d"
+msgid "invalid encoding name \"%s\""
+msgstr "nom d'encodage « %s » invalide"
 
-#: utils/misc/tzparser.c:134
-#, c-format
-msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr "décalage du fuseau horaire manquant dans le fichier « %s », ligne %d"
+#: utils/adt/xml.c:402
+#: utils/adt/xml.c:407
+msgid "invalid XML comment"
+msgstr "commentaire XML invalide"
 
-#: utils/misc/tzparser.c:143
-#, c-format
-msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
-msgstr ""
-"nombre invalide pour le décalage du fuseau horaire dans le fichier des\n"
-"fuseaux horaires « %s », ligne %d"
+#: utils/adt/xml.c:536
+msgid "not an XML document"
+msgstr "pas un document XML"
 
-#: utils/misc/tzparser.c:168
-#, c-format
-msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "syntaxe invalide dans le fichier des fuseaux horaires « %s », ligne %d"
+#: utils/adt/xml.c:689
+#: utils/adt/xml.c:712
+msgid "invalid XML processing instruction"
+msgstr "instruction de traitement XML invalide"
 
-#: utils/misc/tzparser.c:234
+#: utils/adt/xml.c:690
 #, c-format
-msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "l'abréviation « %s » du fuseau horaire est définie plusieurs fois"
+msgid "XML processing instruction target name cannot be \"%s\"."
+msgstr "le nom de cible de l'instruction de traitement XML ne peut pas être « %s »."
 
-#: utils/misc/tzparser.c:236
-#, c-format
-msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
-msgstr ""
-"L'entrée dans le fichier des fuseaux horaires « %s », ligne %d, est en\n"
-"conflit avec l'entrée du fichier « %s », ligne %d."
+#: utils/adt/xml.c:713
+msgid "XML processing instruction cannot contain \"?>\"."
+msgstr "l'instruction de traitement XML ne peut pas contenir « ?> »."
 
-#: utils/misc/tzparser.c:303
-#, c-format
-msgid "invalid time zone file name \"%s\""
-msgstr "nom du fichier de fuseaux horaires invalide : « %s »"
+#: utils/adt/xml.c:792
+msgid "xmlvalidate is not implemented"
+msgstr "xmlvalidate n'est pas implémenté"
 
-#: utils/misc/tzparser.c:318
+#: utils/adt/xml.c:877
+msgid "could not initialize XML library"
+msgstr "n'a pas pu initialiser la bibliothèque XML"
+
+#: utils/adt/xml.c:878
 #, c-format
-msgid "time zone file recursion limit exceeded in file \"%s\""
+msgid "libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
 msgstr ""
-"limite de récursion dépassée dans le fichier « %s » (fichier des fuseaux\n"
-"horaires)"
+"libxml2 a un type de caractère incompatible : sizeof(char)=%u,\n"
+"sizeof(xmlChar)=%u."
 
-#: utils/misc/tzparser.c:361
-#: utils/misc/tzparser.c:376
-#, c-format
-msgid "could not read time zone file \"%s\": %m"
-msgstr "n'a pas pu lire le fichier des fuseaux horaires « %s » : %m"
+#: utils/adt/xml.c:1420
+msgid "Invalid character value."
+msgstr "Valeur invalide pour le caractère."
 
-#: utils/misc/tzparser.c:388
-#, c-format
-msgid "line is too long in time zone file \"%s\", line %d"
-msgstr ""
-"une ligne est trop longue dans le fichier des fuseaux horaires « %s »,\n"
-"ligne %d"
+#: utils/adt/xml.c:1423
+msgid "Space required."
+msgstr "Espace requis."
 
-#: utils/misc/tzparser.c:413
-#, c-format
-msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr ""
-"@INCLUDE sans nom de fichier dans le fichier des fuseaux horaires « %s »,\n"
-"ligne %d"
+#: utils/adt/xml.c:1426
+msgid "standalone accepts only 'yes' or 'no'."
+msgstr "la version autonome accepte seulement 'yes' et 'no'."
 
-#: utils/misc/guc.c:476
-msgid "Ungrouped"
-msgstr "Dégroupé"
+#: utils/adt/xml.c:1429
+msgid "Malformed declaration: missing version."
+msgstr "Déclaration mal formée : version manquante."
 
-#: utils/misc/guc.c:478
-msgid "File Locations"
-msgstr "Emplacement des fichiers"
+#: utils/adt/xml.c:1432
+msgid "Missing encoding in text declaration."
+msgstr "Encodage manquant dans la déclaration du texte."
 
-#: utils/misc/guc.c:480
-msgid "Connections and Authentication"
-msgstr "Connexions et authentification"
+#: utils/adt/xml.c:1435
+msgid "Parsing XML declaration: '?>' expected."
+msgstr "Analyse de la déclaration XML : « ?> » attendu."
 
-#: utils/misc/guc.c:482
-msgid "Connections and Authentication / Connection Settings"
-msgstr "Connexions et authentification / Paramètrages de connexion"
+#: utils/adt/xml.c:1438
+#, c-format
+msgid "Unrecognized libxml error code: %d."
+msgstr "code d'erreur libxml inconnu : %d"
 
-#: utils/misc/guc.c:484
-msgid "Connections and Authentication / Security and Authentication"
-msgstr "Connexions et authentification / Sécurité et authentification"
+#: utils/adt/xml.c:1690
+msgid "XML does not support infinite date values."
+msgstr "XML ne supporte pas les valeurs infinies de date."
 
-#: utils/misc/guc.c:486
-msgid "Resource Usage"
-msgstr "Utilisation des ressources"
+#: utils/adt/xml.c:1713
+#: utils/adt/xml.c:1740
+msgid "XML does not support infinite timestamp values."
+msgstr "XML ne supporte pas les valeurs infinies de timestamp."
 
-#: utils/misc/guc.c:488
-msgid "Resource Usage / Memory"
-msgstr "Utilisation des ressources / Mémoire"
+#: utils/adt/xml.c:2125
+msgid "invalid query"
+msgstr "requête invalide"
 
-#: utils/misc/guc.c:490
-msgid "Resource Usage / Kernel Resources"
-msgstr "Utilisation des ressources / Ressources noyau"
+#: utils/adt/xml.c:3349
+msgid "invalid array for XML namespace mapping"
+msgstr "tableau invalide pour la correspondance de l'espace de nom XML"
 
-#: utils/misc/guc.c:492
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Utilisation des ressources / Délai du VACUUM basé sur le coût"
+#: utils/adt/xml.c:3350
+msgid "The array must be two-dimensional with length of the second axis equal to 2."
+msgstr ""
+"Le tableau doit avoir deux dimensions avec une longueur de 2 pour le\n"
+"deuxième axe."
 
-#: utils/misc/guc.c:494
-msgid "Resource Usage / Background Writer"
-msgstr "Utilisation des ressources / Processus d'écriture en tâche de fond"
+#: utils/adt/xml.c:3374
+msgid "empty XPath expression"
+msgstr "expression XPath vide"
 
-#: utils/misc/guc.c:496
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Utilisation des ressources / Comportement asynchrone"
+#: utils/adt/xml.c:3422
+msgid "neither namespace name nor URI may be null"
+msgstr "ni le nom de l'espace de noms ni l'URI ne peuvent être NULL"
 
-#: utils/misc/guc.c:498
-msgid "Write-Ahead Log"
-msgstr "Write-Ahead Log"
+#: utils/adt/xml.c:3429
+#, c-format
+msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
+msgstr "n'a pas pu enregistrer l'espace de noms XML de nom « %s » et d'URI « %s »"
 
-#: utils/misc/guc.c:500
-msgid "Write-Ahead Log / Settings"
-msgstr "Write-Ahead Log / Paramètrages"
+#: utils/sort/logtape.c:213
+#, c-format
+msgid "could not write block %ld of temporary file: %m"
+msgstr "n'a pas pu écrire le bloc %ld du fichier temporaire : %m"
 
-#: utils/misc/guc.c:502
-msgid "Write-Ahead Log / Checkpoints"
-msgstr "Write-Ahead Log / Points de vérification (Checkpoints)"
+#: utils/sort/logtape.c:215
+msgid "Perhaps out of disk space?"
+msgstr "Peut-être manquez-vous de place disque ?"
 
-#: utils/misc/guc.c:504
-msgid "Write-Ahead Log / Archiving"
-msgstr "Write-Ahead Log / Archivage"
+#: utils/sort/logtape.c:232
+#, c-format
+msgid "could not read block %ld of temporary file: %m"
+msgstr "n'a pas pu lire le bloc %ld du fichier temporaire : %m"
 
-#: utils/misc/guc.c:506
-msgid "Write-Ahead Log / Streaming Replication"
-msgstr "Write-Ahead Log / Réplication en flux"
+#: utils/sort/tuplesort.c:3131
+#, c-format
+msgid "could not create unique index \"%s\""
+msgstr "n'a pas pu créer l'index unique « %s »"
 
-#: utils/misc/guc.c:508
-msgid "Write-Ahead Log / Standby Servers"
-msgstr "Write-Ahead Log / Serveurs en attente"
+#: utils/sort/tuplesort.c:3133
+#, c-format
+msgid "Key %s is duplicated."
+msgstr "La clé %s est dupliquée."
 
-#: utils/misc/guc.c:510
-msgid "Query Tuning"
-msgstr "Optimisation des requêtes"
+#: utils/cache/lsyscache.c:2414
+#: utils/cache/lsyscache.c:2447
+#: utils/cache/lsyscache.c:2480
+#: utils/cache/lsyscache.c:2513
+#, c-format
+msgid "type %s is only a shell"
+msgstr "le type %s est seulement un shell"
 
-#: utils/misc/guc.c:512
-msgid "Query Tuning / Planner Method Configuration"
-msgstr "Optimisation des requêtes / Configuration de la méthode du planificateur"
+#: utils/cache/lsyscache.c:2419
+#, c-format
+msgid "no input function available for type %s"
+msgstr "aucune fonction en entrée disponible pour le type %s"
 
-#: utils/misc/guc.c:514
-msgid "Query Tuning / Planner Cost Constants"
-msgstr "Optimisation des requêtes / Constantes des coûts du planificateur"
+#: utils/cache/lsyscache.c:2452
+#, c-format
+msgid "no output function available for type %s"
+msgstr "aucune fonction en sortie disponible pour le type %s"
+
+#: utils/cache/plancache.c:589
+msgid "cached plan must not change result type"
+msgstr "le plan en cache ne doit pas modifier le type en résultat"
 
-#: utils/misc/guc.c:516
-msgid "Query Tuning / Genetic Query Optimizer"
-msgstr "Optimisation des requêtes / Optimiseur génétique de requêtes"
+#: utils/cache/relcache.c:4285
+#, c-format
+msgid "could not create relation-cache initialization file \"%s\": %m"
+msgstr "n'a pas pu créer le fichier d'initialisation relation-cache « %s » : %m"
 
-#: utils/misc/guc.c:518
-msgid "Query Tuning / Other Planner Options"
-msgstr "Optimisation des requêtes / Autres options du planificateur"
+#: utils/cache/relcache.c:4287
+msgid "Continuing anyway, but there's something wrong."
+msgstr "Continue malgré tout, mais quelque chose s'est mal passé."
 
-#: utils/misc/guc.c:520
-msgid "Reporting and Logging"
-msgstr "Rapports et traces"
+#: utils/cache/relcache.c:4501
+#, c-format
+msgid "could not remove cache file \"%s\": %m"
+msgstr "n'a pas pu supprimer le fichier cache « %s » : %m"
 
-#: utils/misc/guc.c:522
-msgid "Reporting and Logging / Where to Log"
-msgstr "Rapports et traces / Où tracer"
+#: utils/cache/relmapper.c:454
+msgid "cannot PREPARE a transaction that modified relation mapping"
+msgstr ""
+"ne peut pas préparer (PREPARE) une transaction qui a modifié la correspondance\n"
+"de relation"
 
-#: utils/misc/guc.c:524
-msgid "Reporting and Logging / When to Log"
-msgstr "Rapports et traces / Quand tracer"
+#: utils/cache/relmapper.c:596
+#: utils/cache/relmapper.c:702
+#, c-format
+msgid "could not open relation mapping file \"%s\": %m"
+msgstr "n'a pas pu ouvrir le fichier de correspondance des relations « %s » : %m"
 
-#: utils/misc/guc.c:526
-msgid "Reporting and Logging / What to Log"
-msgstr "Rapports et traces / Que tracer"
+#: utils/cache/relmapper.c:609
+#, c-format
+msgid "could not read relation mapping file \"%s\": %m"
+msgstr "n'a pas pu lire le fichier de correspondance des relations « %s » : %m"
 
-#: utils/misc/guc.c:528
-msgid "Statistics"
-msgstr "Statistiques"
+#: utils/cache/relmapper.c:619
+#, c-format
+msgid "relation mapping file \"%s\" contains invalid data"
+msgstr "le fichier de correspondance des relations « %s » contient des données invalides"
 
-#: utils/misc/guc.c:530
-msgid "Statistics / Monitoring"
-msgstr "Statistiques / Surveillance"
+#: utils/cache/relmapper.c:629
+#, c-format
+msgid "relation mapping file \"%s\" contains incorrect checksum"
+msgstr ""
+"le fichier de correspondance des relations « %s » contient une somme de\n"
+"contrôle incorrecte"
 
-#: utils/misc/guc.c:532
-msgid "Statistics / Query and Index Statistics Collector"
-msgstr "Statistiques / Récupérateur des statistiques sur les requêtes et sur les index"
+#: utils/cache/relmapper.c:741
+#, c-format
+msgid "could not write to relation mapping file \"%s\": %m"
+msgstr "n'a pas pu écrire le fichier de correspondance des relations « %s » : %m"
 
-#: utils/misc/guc.c:534
-msgid "Autovacuum"
-msgstr "Autovacuum"
+#: utils/cache/relmapper.c:754
+#, c-format
+msgid "could not fsync relation mapping file \"%s\": %m"
+msgstr "n'a pas pu synchroniser (fsync) le fichier de correspondance des relations « %s » : %m"
 
-#: utils/misc/guc.c:536
-msgid "Client Connection Defaults"
-msgstr "Valeurs par défaut pour les connexions client"
+#: utils/cache/relmapper.c:760
+#, c-format
+msgid "could not close relation mapping file \"%s\": %m"
+msgstr "n'a pas pu fermer le fichier de correspondance des relations « %s » : %m"
 
-#: utils/misc/guc.c:538
-msgid "Client Connection Defaults / Statement Behavior"
-msgstr "Valeurs par défaut pour les connexions client / Comportement des instructions"
+#: utils/cache/typcache.c:629
+#, c-format
+msgid "type %s is not composite"
+msgstr "le type %s n'est pas un type composite"
 
-#: utils/misc/guc.c:540
-msgid "Client Connection Defaults / Locale and Formatting"
-msgstr "Valeurs par défaut pour les connexions client / Locale et formattage"
+#: utils/cache/typcache.c:643
+msgid "record type has not been registered"
+msgstr "le type d'enregistrement n'a pas été enregistré"
 
-#: utils/misc/guc.c:542
-msgid "Client Connection Defaults / Other Defaults"
-msgstr "Valeurs par défaut pour les connexions client / Autres valeurs par défaut"
+#: utils/mmgr/aset.c:417
+#, c-format
+msgid "Failed while creating memory context \"%s\"."
+msgstr "Échec lors de la création du contexte mémoire « %s »."
 
-#: utils/misc/guc.c:544
-msgid "Lock Management"
-msgstr "Gestion des verrous"
+#: utils/mmgr/aset.c:588
+#: utils/mmgr/aset.c:766
+#: utils/mmgr/aset.c:967
+#, c-format
+msgid "Failed on request of size %lu."
+msgstr "Échec d'une requête de taille %lu."
 
-#: utils/misc/guc.c:546
-msgid "Version and Platform Compatibility"
-msgstr "Compatibilité des versions et des plateformes"
+#: utils/mmgr/portalmem.c:207
+#, c-format
+msgid "cursor \"%s\" already exists"
+msgstr "le curseur « %s » existe déjà"
 
-#: utils/misc/guc.c:548
-msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
-msgstr "Compatibilité des versions et des plateformes / Anciennes versions de PostgreSQL"
+#: utils/mmgr/portalmem.c:211
+#, c-format
+msgid "closing existing cursor \"%s\""
+msgstr "fermeture du curseur existant « %s »"
 
-#: utils/misc/guc.c:550
-msgid "Version and Platform Compatibility / Other Platforms and Clients"
-msgstr "Compatibilité des versions et des plateformes / Anciennes plateformes et anciens clients"
+#: utils/mmgr/portalmem.c:448
+#, c-format
+msgid "cannot drop active portal \"%s\""
+msgstr "ne peut pas supprimer le portail actif « %s »"
 
-#: utils/misc/guc.c:552
-msgid "Preset Options"
-msgstr "Options pré-configurées"
+#: utils/mmgr/portalmem.c:635
+msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
+msgstr "ne peut pas préparer une transaction qui a créé un curseur WITH HOLD"
 
-#: utils/misc/guc.c:554
-msgid "Customized Options"
-msgstr "Options personnalisées"
+#: utils/fmgr/dfmgr.c:125
+#, c-format
+msgid "could not find function \"%s\" in file \"%s\""
+msgstr "n'a pas pu trouver la fonction « %s » dans le fichier « %s »"
 
-#: utils/misc/guc.c:556
-msgid "Developer Options"
-msgstr "Options pour le développeur"
+#: utils/fmgr/dfmgr.c:204
+#: utils/fmgr/dfmgr.c:413
+#: utils/fmgr/dfmgr.c:461
+#, c-format
+msgid "could not access file \"%s\": %m"
+msgstr "n'a pas pu accéder au fichier « %s » : %m"
 
-#: utils/misc/guc.c:610
-msgid "Enables the planner's use of sequential-scan plans."
-msgstr "Active l'utilisation des parcours séquentiels par le planificateur."
+#: utils/fmgr/dfmgr.c:242
+#, c-format
+msgid "could not load library \"%s\": %s"
+msgstr "n'a pas pu charger la bibliothèque « %s » : %s"
 
-#: utils/misc/guc.c:618
-msgid "Enables the planner's use of index-scan plans."
-msgstr "Active l'utilisation des parcours d'index par le planificateur."
+#: utils/fmgr/dfmgr.c:274
+#, c-format
+msgid "incompatible library \"%s\": missing magic block"
+msgstr "bibliothèque « %s » incompatible : bloc magique manquant"
 
-#: utils/misc/guc.c:626
-msgid "Enables the planner's use of bitmap-scan plans."
-msgstr "Active l'utilisation des parcours de bitmap par le planificateur."
+#: utils/fmgr/dfmgr.c:276
+msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
+msgstr ""
+"Les bibliothèques étendues nécessitent l'utilisation de la macro\n"
+"PG_MODULE_MAGIC."
 
-#: utils/misc/guc.c:634
-msgid "Enables the planner's use of TID scan plans."
-msgstr "Active l'utilisation de plans de parcours TID par le planificateur."
+#: utils/fmgr/dfmgr.c:312
+#, c-format
+msgid "incompatible library \"%s\": version mismatch"
+msgstr "bibliothèque « %s » incompatible : versions différentes"
 
-#: utils/misc/guc.c:642
-msgid "Enables the planner's use of explicit sort steps."
-msgstr "Active l'utilisation des étapes de tris explicites par le planificateur."
+#: utils/fmgr/dfmgr.c:314
+#, c-format
+msgid "Server is version %d.%d, library is version %d.%d."
+msgstr "La version du serveur est %d.%d, celle de la bibliothèque est %d.%d."
 
-#: utils/misc/guc.c:650
-msgid "Enables the planner's use of hashed aggregation plans."
-msgstr "Active l'utilisation de plans d'agrégats hâchés par le planificateur."
+#: utils/fmgr/dfmgr.c:333
+#, c-format
+msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+msgstr "Le serveur a FUNC_MAX_ARGS = %d, la bibliothèque a %d."
 
-#: utils/misc/guc.c:658
-msgid "Enables the planner's use of materialization."
-msgstr "Active l'utilisation de la matérialisation par le planificateur."
+#: utils/fmgr/dfmgr.c:342
+#, c-format
+msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+msgstr "Le serveur a INDEX_MAX_KEYS = %d, la bibliothèque a %d."
 
-#: utils/misc/guc.c:666
-msgid "Enables the planner's use of nested-loop join plans."
-msgstr "Active l'utilisation de plans avec des jointures imbriquées par le planificateur."
+#: utils/fmgr/dfmgr.c:351
+#, c-format
+msgid "Server has NAMEDATALEN = %d, library has %d."
+msgstr "Le serveur a NAMEDATALEN = %d, la bibliothèque a %d."
 
-#: utils/misc/guc.c:674
-msgid "Enables the planner's use of merge join plans."
-msgstr "Active l'utilisation de plans de jointures MERGE par le planificateur."
+#: utils/fmgr/dfmgr.c:360
+#, c-format
+msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
+msgstr "Le serveur a FLOAT4PASSBYVAL = %s, la bibliothèque a %s."
 
-#: utils/misc/guc.c:682
-msgid "Enables the planner's use of hash join plans."
-msgstr "Active l'utilisation de plans de jointures hâchées par le planificateur."
+#: utils/fmgr/dfmgr.c:369
+#, c-format
+msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+msgstr "Le serveur a FLOAT8PASSBYVAL = %s, la bibliothèque a %s."
 
-#: utils/misc/guc.c:690
-msgid "Enables genetic query optimization."
-msgstr "Active l'optimisation génétique des requêtes."
+#: utils/fmgr/dfmgr.c:376
+msgid "Magic block has unexpected length or padding difference."
+msgstr "Le bloc magique a une longueur inattendue ou une différence de padding."
 
-#: utils/misc/guc.c:691
-msgid "This algorithm attempts to do planning without exhaustive searching."
-msgstr "Cet algorithme essaie de faire une planification sans recherche exhaustive."
+#: utils/fmgr/dfmgr.c:379
+#, c-format
+msgid "incompatible library \"%s\": magic block mismatch"
+msgstr "bibliothèque « %s » incompatible : différences dans le bloc magique"
 
-#: utils/misc/guc.c:700
-msgid "Shows whether the current user is a superuser."
-msgstr "Affiche si l'utilisateur actuel est un super-utilisateur."
+#: utils/fmgr/dfmgr.c:545
+#, c-format
+msgid "access to library \"%s\" is not allowed"
+msgstr "l'accès à la bibliothèque « %s » n'est pas autorisé"
 
-#: utils/misc/guc.c:709
-msgid "Enables advertising the server via Bonjour."
-msgstr "Active la publication du serveur via Bonjour."
+#: utils/fmgr/dfmgr.c:572
+#, c-format
+msgid "invalid macro name in dynamic library path: %s"
+msgstr "nom de macro invalide dans le chemin des bibliothèques partagées : %s"
 
-#: utils/misc/guc.c:717
-msgid "Enables SSL connections."
-msgstr "Active les connexions SSL."
+#: utils/fmgr/dfmgr.c:617
+msgid "zero-length component in parameter \"dynamic_library_path\""
+msgstr "composant de longueur zéro dans le paramètre « dynamic_library_path »"
 
-#: utils/misc/guc.c:725
-msgid "Forces synchronization of updates to disk."
-msgstr "Force la synchronisation des mises à jour sur le disque."
+#: utils/fmgr/dfmgr.c:636
+msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+msgstr "Un composant du paramètre « dynamic_library_path » n'est pas un chemin absolu"
 
-#: utils/misc/guc.c:726
-msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This insures that a database cluster will recover to a consistent state after an operating system or hardware crash."
-msgstr ""
-"Le serveur utilisera l'appel système fsync() à différents endroits pour\n"
-"s'assurer que les mises à jour sont écrites physiquement sur le disque. Ceci\n"
-"nous assure qu'un groupe de bases de données se retrouvera dans un état\n"
-"cohérent après un arrêt brutal dû au système d'exploitation ou au matériel."
+#: utils/fmgr/fmgr.c:270
+#, c-format
+msgid "internal function \"%s\" is not in internal lookup table"
+msgstr "la fonction interne « %s » n'est pas dans une table de recherche interne"
 
-#: utils/misc/guc.c:736
-msgid "Sets immediate fsync at commit."
-msgstr "Configure un fsync immédiat lors du commit."
+#: utils/fmgr/fmgr.c:474
+#, c-format
+msgid "unrecognized API version %d reported by info function \"%s\""
+msgstr "version API %d non reconnue mais rapportée par la fonction info « %s »"
 
-#: utils/misc/guc.c:744
-msgid "Continues processing past damaged page headers."
-msgstr "Continue le travail après les en-têtes de page endommagés."
+#: utils/fmgr/fmgr.c:845
+#: utils/fmgr/fmgr.c:2106
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr "la fonction %u a trop d'arguments (%d, le maximum étant %d)"
 
-#: utils/misc/guc.c:745
-msgid "Detection of a damaged page header normally causes PostgreSQL to report an error, aborting the current transaction. Setting zero_damaged_pages to true causes the system to instead report a warning, zero out the damaged page, and continue processing. This behavior will destroy data, namely all the rows on the damaged page."
+#: utils/fmgr/funcapi.c:354
+#, c-format
+msgid "could not determine actual result type for function \"%s\" declared to return type %s"
 msgstr ""
-"La détection d'une en-tête de page endommagée cause normalement le rapport\n"
-"d'une erreur par PostgreSQL, l'annulation de la transaction en cours.\n"
-"Initialiser zero_damaged_pages à true fait que le système ne rapporte qu'un\n"
-"message d'attention et continue à travailler. Ce comportement détruira des\n"
-"données, notamment toutes les lignes de la page endommagée."
+"n'a pas pu déterminer le type du résultat actuel pour la fonction « %s »\n"
+"déclarant retourner le type %s"
 
-#: utils/misc/guc.c:757
-msgid "Writes full pages to WAL when first modified after a checkpoint."
-msgstr ""
-"Écrit des pages complètes dans les WAL lors d'une première modification après\n"
-"un point de vérification."
+#: utils/fmgr/funcapi.c:1208
+#: utils/fmgr/funcapi.c:1239
+msgid "number of aliases does not match number of columns"
+msgstr "le nombre d'alias ne correspond pas au nombre de colonnes"
+
+#: utils/fmgr/funcapi.c:1233
+msgid "no column alias was provided"
+msgstr "aucun alias de colonne n'a été fourni"
 
-#: utils/misc/guc.c:758
-msgid "A page write in process during an operating system crash might be only partially written to disk.  During recovery, the row changes stored in WAL are not enough to recover.  This option writes pages when first modified after a checkpoint to WAL so full recovery is possible."
+#: utils/fmgr/funcapi.c:1257
+msgid "could not determine row description for function returning record"
 msgstr ""
-"Une page écrite au moment d'un arrêt brutal du système d'exploitation\n"
-"pourrait être seulement partiellement écrite sur le disque. Lors de la\n"
-"récupération, les modifications de la ligne, stockées dans le journal de\n"
-"transaction, ne seront pas suffisantes pour terminer la récupération. Cette\n"
-"option écrit les pages lors de la première modification après un point de\n"
-"vérification des journaux de transaction pour que la récupération complète\n"
-"soit possible."
+"n'a pas pu déterminer la description de la ligne pour la fonction renvoyant\n"
+"l'enregistrement"
 
-#: utils/misc/guc.c:769
-msgid "Runs the server silently."
-msgstr "Lance le serveur de manière silencieuse."
+#: utils/error/assert.c:37
+msgid "TRAP: ExceptionalCondition: bad arguments\n"
+msgstr "TRAP : ExceptionalCondition : mauvais arguments\n"
 
-#: utils/misc/guc.c:770
-msgid "If this parameter is set, the server will automatically run in the background and any controlling terminals are dissociated."
-msgstr ""
-"Si ce paramètre est initialisé, le serveur sera exécuté automatiquement en\n"
-"tâche de fond et les terminaux de contrôles seront dés-associés."
+#: utils/error/assert.c:40
+#, c-format
+msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
+msgstr "TRAP : %s(« %s », fichier : « %s », ligne : %d)\n"
 
-#: utils/misc/guc.c:778
-msgid "Logs each checkpoint."
-msgstr "Trace tous les points de vérification."
+#: utils/error/elog.c:1507
+#, c-format
+msgid "could not reopen file \"%s\" as stderr: %m"
+msgstr "n'a pas pu ré-ouvrir le fichier « %s » comme stderr : %m"
 
-#: utils/misc/guc.c:786
-msgid "Logs each successful connection."
-msgstr "Trace toutes les connexions réussies."
+#: utils/error/elog.c:1520
+#, c-format
+msgid "could not reopen file \"%s\" as stdout: %m"
+msgstr "n'a pas pu ré-ouvrir le fichier « %s » comme stdout : %m"
 
-#: utils/misc/guc.c:794
-msgid "Logs end of a session, including duration."
-msgstr "Trace la fin d'une session, avec sa durée."
+#: utils/error/elog.c:1910
+#: utils/error/elog.c:1920
+#: utils/error/elog.c:1930
+msgid "[unknown]"
+msgstr "[inconnu]"
 
-#: utils/misc/guc.c:802
-msgid "Turns on various assertion checks."
-msgstr "Active les différentes vérifications des assertions."
+#: utils/error/elog.c:2281
+#: utils/error/elog.c:2561
+#: utils/error/elog.c:2639
+msgid "missing error text"
+msgstr "texte d'erreur manquant"
 
-#: utils/misc/guc.c:803
-msgid "This is a debugging aid."
-msgstr "C'est une aide de débogage."
+#: utils/error/elog.c:2284
+#: utils/error/elog.c:2287
+#: utils/error/elog.c:2642
+#: utils/error/elog.c:2645
+#, c-format
+msgid " at character %d"
+msgstr " au caractère %d"
 
-#: utils/misc/guc.c:817
-#: utils/misc/guc.c:899
-#: utils/misc/guc.c:958
-#: utils/misc/guc.c:967
-#: utils/misc/guc.c:976
-#: utils/misc/guc.c:985
-#: utils/misc/guc.c:1587
-#: utils/misc/guc.c:1596
-msgid "No description available."
-msgstr "Aucune description disponible."
+#: utils/error/elog.c:2297
+#: utils/error/elog.c:2304
+msgid "DETAIL:  "
+msgstr "DÉTAIL:  "
 
-#: utils/misc/guc.c:826
-msgid "Logs the duration of each completed SQL statement."
-msgstr "Trace la durée de chaque instruction SQL terminée."
+#: utils/error/elog.c:2311
+msgid "HINT:  "
+msgstr "ASTUCE :  "
 
-#: utils/misc/guc.c:834
-msgid "Logs each query's parse tree."
-msgstr "Trace l'arbre d'analyse de chaque requête."
+#: utils/error/elog.c:2318
+msgid "QUERY:  "
+msgstr "REQUÊTE :  "
 
-#: utils/misc/guc.c:842
-msgid "Logs each query's rewritten parse tree."
-msgstr "Trace l'arbre d'analyse réécrit de chaque requête."
+#: utils/error/elog.c:2325
+msgid "CONTEXT:  "
+msgstr "CONTEXTE :  "
 
-#: utils/misc/guc.c:850
-msgid "Logs each query's execution plan."
-msgstr "Trace le plan d'exécution de chaque requête."
+#: utils/error/elog.c:2335
+#, c-format
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "EMPLACEMENT :  %s, %s:%d\n"
 
-#: utils/misc/guc.c:858
-msgid "Indents parse and plan tree displays."
-msgstr "Indente l'affichage des arbres d'analyse et de planification."
+#: utils/error/elog.c:2342
+#, c-format
+msgid "LOCATION:  %s:%d\n"
+msgstr "EMPLACEMENT :  %s:%d\n"
 
-#: utils/misc/guc.c:866
-msgid "Writes parser performance statistics to the server log."
-msgstr ""
-"Écrit les statistiques de performance de l'analyseur dans les journaux applicatifs\n"
-"du serveur."
+#: utils/error/elog.c:2356
+msgid "STATEMENT:  "
+msgstr "INSTRUCTION :  "
 
-#: utils/misc/guc.c:874
-msgid "Writes planner performance statistics to the server log."
-msgstr ""
-"Écrit les statistiques de performance de planification dans les journaux\n"
-"applicatifs du serveur."
+#. translator: This string will be truncated at 47
+#. characters expanded.
+#: utils/error/elog.c:2754
+#, c-format
+msgid "operating system error %d"
+msgstr "erreur %d du système d'exploitation"
 
-#: utils/misc/guc.c:882
-msgid "Writes executor performance statistics to the server log."
-msgstr ""
-"Écrit les statistiques de performance de l'exécuteur dans les journaux applicatifs\n"
-"du serveur."
+#: utils/error/elog.c:2777
+msgid "DEBUG"
+msgstr "DEBUG"
 
-#: utils/misc/guc.c:890
-msgid "Writes cumulative performance statistics to the server log."
-msgstr ""
-"Écrit les statistiques de performance cumulatives dans les journaux applicatifs\n"
-"du serveur."
+#: utils/error/elog.c:2781
+msgid "LOG"
+msgstr "LOG"
 
-#: utils/misc/guc.c:910
-msgid "Collects information about executing commands."
-msgstr "Récupère les statistiques sur les commandes en exécution."
+#: utils/error/elog.c:2784
+msgid "INFO"
+msgstr "INFO"
 
-#: utils/misc/guc.c:911
-msgid "Enables the collection of information on the currently executing command of each session, along with the time at which that command began execution."
-msgstr ""
-"Active la récupération d'informations sur la commande en cours d'exécution\n"
-"pour chaque session, avec l'heure de début de l'exécution de la commande."
+#: utils/error/elog.c:2787
+msgid "NOTICE"
+msgstr "NOTICE"
 
-#: utils/misc/guc.c:920
-msgid "Collects statistics on database activity."
-msgstr "Récupère les statistiques sur l'activité de la base de données."
+#: utils/error/elog.c:2790
+msgid "WARNING"
+msgstr "ATTENTION"
 
-#: utils/misc/guc.c:929
-msgid "Updates the process title to show the active SQL command."
-msgstr ""
-"Met à jour le titre du processus pour indiquer la commande SQL en cours\n"
-"d'exécution."
+#: utils/error/elog.c:2793
+msgid "ERROR"
+msgstr "ERREUR"
 
-#: utils/misc/guc.c:930
-msgid "Enables updating of the process title every time a new SQL command is received by the server."
-msgstr ""
-"Active la mise à jour du titre du processus chaque fois qu'une nouvelle\n"
-"commande SQL est reçue par le serveur."
+#: utils/error/elog.c:2796
+msgid "FATAL"
+msgstr "FATAL"
 
-#: utils/misc/guc.c:938
-msgid "Starts the autovacuum subprocess."
-msgstr "Exécute le sous-processus de l'autovacuum."
+#: utils/error/elog.c:2799
+msgid "PANIC"
+msgstr "PANIC"
 
-#: utils/misc/guc.c:947
-msgid "Generates debugging output for LISTEN and NOTIFY."
-msgstr "Génère une sortie de débogage pour LISTEN et NOTIFY."
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
+#, c-format
+msgid "unexpected encoding ID %d for ISO 8859 character sets"
+msgstr "identifiant d'encodage %d inattendu pour les jeux de caractères ISO-8859"
 
-#: utils/misc/guc.c:996
-msgid "Logs long lock waits."
-msgstr "Trace les attentes longues de verrou."
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#, c-format
+msgid "unexpected encoding ID %d for WIN character sets"
+msgstr "identifiant d'encodage %d inattendu pour les jeux de caractères WIN"
 
-#: utils/misc/guc.c:1005
-msgid "Logs the host name in the connection logs."
-msgstr "Trace le nom d'hôte dans les traces de connexion."
+#: utils/mb/encnames.c:485
+msgid "encoding name too long"
+msgstr "nom d'encodage trop long"
 
-#: utils/misc/guc.c:1006
-msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty."
-msgstr ""
-"Par défaut, les traces de connexion n'affichent que l'adresse IP de l'hôte\n"
-"se connectant. Si vous voulez que s'affiche le nom de l'hôte, vous devez\n"
-"activer cette option mais suivant la configuration de la résolution de noms\n"
-"pour votre hôte, cela pourrait imposer des dégradations de performances non\n"
-"négligeables."
+#: utils/mb/mbutils.c:281
+#, c-format
+msgid "conversion between %s and %s is not supported"
+msgstr "la conversion entre %s et %s n'est pas supportée"
 
-#: utils/misc/guc.c:1016
-msgid "Causes subtables to be included by default in various commands."
+#: utils/mb/mbutils.c:351
+#, c-format
+msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr ""
-"Fait que les sous-tables soient incluses par défaut dans les différentes\n"
-"commandes."
+"la fonction de conversion par défaut pour l'encodage de « %s » en « %s »\n"
+"n'existe pas"
 
-#: utils/misc/guc.c:1024
-msgid "Encrypt passwords."
-msgstr "Chiffre les mots de passe."
+#: utils/mb/mbutils.c:375
+#: utils/mb/mbutils.c:676
+#, c-format
+msgid "String of %d bytes is too long for encoding conversion."
+msgstr "Une chaîne de %d octets est trop longue pour la conversion d'encodage."
 
-#: utils/misc/guc.c:1025
-msgid "When a password is specified in CREATE USER or ALTER USER without writing either ENCRYPTED or UNENCRYPTED, this parameter determines whether the password is to be encrypted."
-msgstr ""
-"Lorsqu'un mot de passe est spécifié dans CREATE USER ou ALTER USER sans\n"
-"indiquer ENCRYPTED ou UNENCRYPTED, ce paramètre détermine si le mot de passe\n"
-"doit être chiffré."
+#: utils/mb/mbutils.c:462
+#, c-format
+msgid "invalid source encoding name \"%s\""
+msgstr "nom de l'encodage source « %s » invalide"
 
-#: utils/misc/guc.c:1034
-msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
-msgstr "Traite « expr=NULL » comme « expr IS NULL »."
+#: utils/mb/mbutils.c:467
+#, c-format
+msgid "invalid destination encoding name \"%s\""
+msgstr "nom de l'encodage destination « %s » invalide"
 
-#: utils/misc/guc.c:1035
-msgid "When turned on, expressions of the form expr = NULL (or NULL = expr) are treated as expr IS NULL, that is, they return true if expr evaluates to the null value, and false otherwise. The correct behavior of expr = NULL is to always return null (unknown)."
-msgstr ""
-"Une fois activé, les expressions de la forme expr = NULL (ou NULL = expr)\n"
-"sont traitées comme expr IS NULL, c'est-à-dire qu'elles renvoient true si\n"
-"l'expression est évaluée comme étant NULL et false sinon. Le comportement\n"
-"correct de expr = NULL est de toujours renvoyer NULL (inconnu)."
+#: utils/mb/mbutils.c:589
+#, c-format
+msgid "invalid byte value for encoding \"%s\": 0x%02x"
+msgstr "valeur d'octet invalide pour l'encodage « %s » : 0x%02x"
 
-#: utils/misc/guc.c:1046
-msgid "Enables per-database user names."
-msgstr "Active les noms d'utilisateur par base de données."
+#: utils/mb/wchar.c:1611
+#, c-format
+msgid "invalid byte sequence for encoding \"%s\": 0x%s"
+msgstr "séquence d'octets invalide pour l'encodage « %s » : 0x%s"
 
-#: utils/misc/guc.c:1055
-msgid "This parameter doesn't do anything."
-msgstr "Ce paramètre ne fait rien."
+#: utils/mb/wchar.c:1640
+#, c-format
+msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
+msgstr "le caractère 0x%s du codage « %s » n'a pas d'équivalent dans « %s »"
 
-#: utils/misc/guc.c:1056
-msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients."
-msgstr ""
-"C'est ici uniquement pour ne pas avoir de problèmes avec le SET AUTOCOMMIT\n"
-"TO ON des clients 7.3."
+#: utils/mb/conv.c:509
+#, c-format
+msgid "invalid encoding number: %d"
+msgstr "numéro d'encodage invalide : %d"
 
-#: utils/misc/guc.c:1064
-msgid "Sets the default read-only status of new transactions."
-msgstr "Initialise le statut de lecture seule par défaut des nouvelles transactions."
+#: utils/misc/guc.c:525
+msgid "Ungrouped"
+msgstr "Dégroupé"
 
-#: utils/misc/guc.c:1072
-msgid "Sets the current transaction's read-only status."
-msgstr "Affiche le statut de lecture seule de la transaction actuelle."
+#: utils/misc/guc.c:527
+msgid "File Locations"
+msgstr "Emplacement des fichiers"
 
-#: utils/misc/guc.c:1081
-msgid "Check function bodies during CREATE FUNCTION."
-msgstr "Vérifie les corps de fonction lors du CREATE FUNCTION."
+#: utils/misc/guc.c:529
+msgid "Connections and Authentication"
+msgstr "Connexions et authentification"
 
-#: utils/misc/guc.c:1089
-msgid "Enable input of NULL elements in arrays."
-msgstr "Active la saisie d'éléments NULL dans les tableaux."
+#: utils/misc/guc.c:531
+msgid "Connections and Authentication / Connection Settings"
+msgstr "Connexions et authentification / Paramètrages de connexion"
 
-#: utils/misc/guc.c:1090
-msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
-msgstr ""
-"Si activé, un NULL sans guillemets en tant que valeur d'entrée dans un\n"
-"tableau signifie une valeur NULL ; sinon, il sera pris littéralement."
+#: utils/misc/guc.c:533
+msgid "Connections and Authentication / Security and Authentication"
+msgstr "Connexions et authentification / Sécurité et authentification"
 
-#: utils/misc/guc.c:1099
-msgid "Create new tables with OIDs by default."
-msgstr "Crée des nouvelles tables avec des OID par défaut."
+#: utils/misc/guc.c:535
+msgid "Resource Usage"
+msgstr "Utilisation des ressources"
 
-#: utils/misc/guc.c:1107
-msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
-msgstr ""
-"Lance un sous-processus pour capturer la sortie d'erreurs (stderr) et/ou\n"
-"csvlogs dans des journaux applicatifs."
+#: utils/misc/guc.c:537
+msgid "Resource Usage / Memory"
+msgstr "Utilisation des ressources / Mémoire"
+
+#: utils/misc/guc.c:539
+msgid "Resource Usage / Kernel Resources"
+msgstr "Utilisation des ressources / Ressources noyau"
+
+#: utils/misc/guc.c:541
+msgid "Resource Usage / Cost-Based Vacuum Delay"
+msgstr "Utilisation des ressources / Délai du VACUUM basé sur le coût"
 
-#: utils/misc/guc.c:1115
-msgid "Truncate existing log files of same name during log rotation."
-msgstr ""
-"Tronque les journaux applicatifs existants du même nom lors de la rotation\n"
-"des journaux applicatifs."
+#: utils/misc/guc.c:543
+msgid "Resource Usage / Background Writer"
+msgstr "Utilisation des ressources / Processus d'écriture en tâche de fond"
 
-#: utils/misc/guc.c:1125
-msgid "Emit information about resource usage in sorting."
-msgstr "Émet des informations sur l'utilisation des ressources lors d'un tri."
+#: utils/misc/guc.c:545
+msgid "Resource Usage / Asynchronous Behavior"
+msgstr "Utilisation des ressources / Comportement asynchrone"
 
-#: utils/misc/guc.c:1138
-msgid "Generate debugging output for synchronized scanning."
-msgstr "Génère une sortie de débogage pour les parcours synchronisés."
+#: utils/misc/guc.c:547
+msgid "Write-Ahead Log"
+msgstr "Write-Ahead Log"
 
-#: utils/misc/guc.c:1152
-msgid "Enable bounded sorting using heap sort."
-msgstr "Active le tri limité en utilisant le tri de heap."
+#: utils/misc/guc.c:549
+msgid "Write-Ahead Log / Settings"
+msgstr "Write-Ahead Log / Paramètrages"
 
-#: utils/misc/guc.c:1164
-msgid "Emit WAL-related debugging output."
-msgstr "Émet une sortie de débogage concernant les journaux de transactions."
+#: utils/misc/guc.c:551
+msgid "Write-Ahead Log / Checkpoints"
+msgstr "Write-Ahead Log / Points de vérification (Checkpoints)"
 
-#: utils/misc/guc.c:1175
-msgid "Datetimes are integer based."
-msgstr "Les types datetime sont basés sur des entiers"
+#: utils/misc/guc.c:553
+msgid "Write-Ahead Log / Archiving"
+msgstr "Write-Ahead Log / Archivage"
 
-#: utils/misc/guc.c:1189
-msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
-msgstr ""
-"Indique si les noms d'utilisateurs Kerberos et GSSAPI devraient être traités\n"
-"sans se soucier de la casse."
+#: utils/misc/guc.c:555
+msgid "Replication"
+msgstr "Réplication"
 
-#: utils/misc/guc.c:1198
-msgid "Warn about backslash escapes in ordinary string literals."
-msgstr "Avertie sur les échappements par antislash dans les chaînes ordinaires."
+#: utils/misc/guc.c:557
+msgid "Replication / Master Server"
+msgstr "Réplication / Serveur maître"
 
-#: utils/misc/guc.c:1207
-msgid "Causes '...' strings to treat backslashes literally."
-msgstr "Fait que les chaînes '...' traitent les antislashs littéralement."
+#: utils/misc/guc.c:559
+msgid "Replication / Standby Servers"
+msgstr "Réplication / Serveurs en attente"
 
-#: utils/misc/guc.c:1217
-msgid "Enable synchronized sequential scans."
-msgstr "Active l'utilisation des parcours séquentiels synchronisés."
+#: utils/misc/guc.c:561
+msgid "Query Tuning"
+msgstr "Optimisation des requêtes"
 
-#: utils/misc/guc.c:1226
-msgid "Allows archiving of WAL files using archive_command."
-msgstr "Autorise l'archivage des journaux de transactions en utilisant archive_command."
+#: utils/misc/guc.c:563
+msgid "Query Tuning / Planner Method Configuration"
+msgstr "Optimisation des requêtes / Configuration de la méthode du planificateur"
 
-#: utils/misc/guc.c:1235
-msgid "Allows connections and queries during recovery."
-msgstr "Autorise les connexions et les requêtes pendant la restauration."
+#: utils/misc/guc.c:565
+msgid "Query Tuning / Planner Cost Constants"
+msgstr "Optimisation des requêtes / Constantes des coûts du planificateur"
 
-#: utils/misc/guc.c:1244
-msgid "Allows modifications of the structure of system tables."
-msgstr "Permet les modifications de la structure des tables systèmes."
+#: utils/misc/guc.c:567
+msgid "Query Tuning / Genetic Query Optimizer"
+msgstr "Optimisation des requêtes / Optimiseur génétique de requêtes"
 
-#: utils/misc/guc.c:1254
-msgid "Disables reading from system indexes."
-msgstr "Désactive la lecture des index système."
+#: utils/misc/guc.c:569
+msgid "Query Tuning / Other Planner Options"
+msgstr "Optimisation des requêtes / Autres options du planificateur"
 
-#: utils/misc/guc.c:1255
-msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
-msgstr ""
-"Cela n'empêche pas la mise à jour des index, donc vous pouvez l'utiliser en\n"
-"toute sécurité. La pire conséquence est la lenteur."
+#: utils/misc/guc.c:571
+msgid "Reporting and Logging"
+msgstr "Rapports et traces"
 
-#: utils/misc/guc.c:1265
-msgid "Enables backward compatibility mode for privilege checks on large objects."
-msgstr ""
-"Active la compatibilité ascendante pour la vérification des droits sur les\n"
-"Large Objects."
+#: utils/misc/guc.c:573
+msgid "Reporting and Logging / Where to Log"
+msgstr "Rapports et traces / Où tracer"
 
-#: utils/misc/guc.c:1266
-msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
-msgstr ""
-"Ignore la vérification des droits lors de la lecture et de la modification\n"
-"des Larges Objects, pour la compatibilité avec les versions antérieures à la\n"
-"9.0."
+#: utils/misc/guc.c:575
+msgid "Reporting and Logging / When to Log"
+msgstr "Rapports et traces / Quand tracer"
 
-#: utils/misc/guc.c:1284
-msgid "Forces a switch to the next xlog file if a new file has not been started within N seconds."
-msgstr ""
-"Force un changement du journal de transaction si un nouveau fichier n'a pas\n"
-"été créé depuis N secondes."
+#: utils/misc/guc.c:577
+msgid "Reporting and Logging / What to Log"
+msgstr "Rapports et traces / Que tracer"
 
-#: utils/misc/guc.c:1294
-msgid "Waits N seconds on connection startup after authentication."
-msgstr "Attends N secondes après l'authentification."
+#: utils/misc/guc.c:579
+msgid "Statistics"
+msgstr "Statistiques"
 
-#: utils/misc/guc.c:1295
-#: utils/misc/guc.c:1670
-msgid "This allows attaching a debugger to the process."
-msgstr "Ceci permet d'attacher un débogueur au processus."
+#: utils/misc/guc.c:581
+msgid "Statistics / Monitoring"
+msgstr "Statistiques / Surveillance"
 
-#: utils/misc/guc.c:1303
-msgid "Sets the default statistics target."
-msgstr "Initialise la cible par défaut des statistiques."
+#: utils/misc/guc.c:583
+msgid "Statistics / Query and Index Statistics Collector"
+msgstr "Statistiques / Récupérateur des statistiques sur les requêtes et sur les index"
 
-#: utils/misc/guc.c:1304
-msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
-msgstr ""
-"Ceci s'applique aux colonnes de tables qui n'ont pas de cible spécifique\n"
-"pour la colonne initialisée via ALTER TABLE SET STATISTICS."
+#: utils/misc/guc.c:585
+msgid "Autovacuum"
+msgstr "Autovacuum"
 
-#: utils/misc/guc.c:1312
-msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
-msgstr ""
-"Initialise la taille de la liste FROM en dehors de laquelle les\n"
-"sous-requêtes ne sont pas rassemblées."
+#: utils/misc/guc.c:587
+msgid "Client Connection Defaults"
+msgstr "Valeurs par défaut pour les connexions client"
 
-#: utils/misc/guc.c:1314
-msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
-msgstr ""
-"Le planificateur fusionne les sous-requêtes dans des requêtes supérieures\n"
-"si la liste FROM résultante n'a pas plus de ce nombre d'éléments."
+#: utils/misc/guc.c:589
+msgid "Client Connection Defaults / Statement Behavior"
+msgstr "Valeurs par défaut pour les connexions client / Comportement des instructions"
 
-#: utils/misc/guc.c:1323
-msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
-msgstr ""
-"Initialise la taille de la liste FROM en dehors de laquelle les contructions\n"
-"JOIN ne sont pas aplanies."
+#: utils/misc/guc.c:591
+msgid "Client Connection Defaults / Locale and Formatting"
+msgstr "Valeurs par défaut pour les connexions client / Locale et formattage"
 
-#: utils/misc/guc.c:1325
-msgid "The planner will flatten explicit JOIN constructs into lists of FROM items whenever a list of no more than this many items would result."
-msgstr ""
-"La planificateur applanira les constructions JOIN explicites dans des listes\n"
-"d'éléments FROM lorsqu'une liste d'au plus ce nombre d'éléments en\n"
-"résulterait."
+#: utils/misc/guc.c:593
+msgid "Client Connection Defaults / Other Defaults"
+msgstr "Valeurs par défaut pour les connexions client / Autres valeurs par défaut"
 
-#: utils/misc/guc.c:1334
-msgid "Sets the threshold of FROM items beyond which GEQO is used."
-msgstr "Initialise la limite des éléments FROM en dehors de laquelle GEQO est utilisé."
+#: utils/misc/guc.c:595
+msgid "Lock Management"
+msgstr "Gestion des verrous"
 
-#: utils/misc/guc.c:1342
-msgid "GEQO: effort is used to set the default for other GEQO parameters."
-msgstr ""
-"GEQO : l'effort est utilisé pour initialiser une valeur par défaut pour les\n"
-"autres paramètres GEQO."
+#: utils/misc/guc.c:597
+msgid "Version and Platform Compatibility"
+msgstr "Compatibilité des versions et des plateformes"
 
-#: utils/misc/guc.c:1350
-msgid "GEQO: number of individuals in the population."
-msgstr "GEQO : nombre d'individus dans une population."
+#: utils/misc/guc.c:599
+msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
+msgstr "Compatibilité des versions et des plateformes / Anciennes versions de PostgreSQL"
 
-#: utils/misc/guc.c:1351
-#: utils/misc/guc.c:1359
-msgid "Zero selects a suitable default value."
-msgstr "Zéro sélectionne une valeur par défaut convenable."
+#: utils/misc/guc.c:601
+msgid "Version and Platform Compatibility / Other Platforms and Clients"
+msgstr "Compatibilité des versions et des plateformes / Anciennes plateformes et anciens clients"
 
-#: utils/misc/guc.c:1358
-msgid "GEQO: number of iterations of the algorithm."
-msgstr "GEQO : nombre d'itérations dans l'algorithme."
+#: utils/misc/guc.c:603
+msgid "Error Handling"
+msgstr "Gestion des erreurs"
 
-#: utils/misc/guc.c:1368
-msgid "Sets the time to wait on a lock before checking for deadlock."
-msgstr "Temps d'attente du verrou avant de vérifier les verrous bloqués."
+#: utils/misc/guc.c:605
+msgid "Preset Options"
+msgstr "Options pré-configurées"
 
-#: utils/misc/guc.c:1378
-msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
-msgstr ""
-"Initialise le délai maximum avant d'annuler les requêtes lorsqu'un serveur en\n"
-"hotstandby traite les données des journaux de transactions archivés"
+#: utils/misc/guc.c:607
+msgid "Customized Options"
+msgstr "Options personnalisées"
 
-#: utils/misc/guc.c:1388
-msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
-msgstr ""
-"Initialise le délai maximum avant d'annuler les requêtes lorsqu'un serveur en\n"
-"hotstandby traite les données des journaux de transactions envoyés en flux."
+#: utils/misc/guc.c:609
+msgid "Developer Options"
+msgstr "Options pour le développeur"
 
-#: utils/misc/guc.c:1408
-msgid "Sets the maximum number of concurrent connections."
-msgstr "Nombre maximum de connexions simultanées."
+#: utils/misc/guc.c:663
+msgid "Enables the planner's use of sequential-scan plans."
+msgstr "Active l'utilisation des parcours séquentiels par le planificateur."
 
-#: utils/misc/guc.c:1417
-msgid "Sets the number of connection slots reserved for superusers."
-msgstr "Nombre de connexions réservées aux super-utilisateurs."
+#: utils/misc/guc.c:672
+msgid "Enables the planner's use of index-scan plans."
+msgstr "Active l'utilisation des parcours d'index par le planificateur."
 
-#: utils/misc/guc.c:1426
-msgid "Sets the number of shared memory buffers used by the server."
-msgstr "Nombre de tampons en mémoire partagée utilisé par le serveur."
+#: utils/misc/guc.c:681
+msgid "Enables the planner's use of bitmap-scan plans."
+msgstr "Active l'utilisation des parcours de bitmap par le planificateur."
 
-#: utils/misc/guc.c:1436
-msgid "Sets the maximum number of temporary buffers used by each session."
-msgstr "Nombre maximum de tampons en mémoire partagée utilisés par chaque session."
+#: utils/misc/guc.c:690
+msgid "Enables the planner's use of TID scan plans."
+msgstr "Active l'utilisation de plans de parcours TID par le planificateur."
 
-#: utils/misc/guc.c:1446
-msgid "Sets the TCP port the server listens on."
-msgstr "Port TCP sur lequel le serveur écoutera."
+#: utils/misc/guc.c:699
+msgid "Enables the planner's use of explicit sort steps."
+msgstr "Active l'utilisation des étapes de tris explicites par le planificateur."
 
-#: utils/misc/guc.c:1455
-msgid "Sets the access permissions of the Unix-domain socket."
-msgstr "Droits d'accès au socket domaine Unix."
+#: utils/misc/guc.c:708
+msgid "Enables the planner's use of hashed aggregation plans."
+msgstr "Active l'utilisation de plans d'agrégats hâchés par le planificateur."
 
-#: utils/misc/guc.c:1456
-msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
-msgstr ""
-"Les sockets de domaine Unix utilise l'ensemble des droits habituels du système\n"
-"de fichiers Unix. La valeur de ce paramètre doit être une spécification en\n"
-"mode numérique de la forme acceptée par les appels système chmod et umask\n"
-"(pour utiliser le format octal, le nombre doit commencer avec un zéro)."
+#: utils/misc/guc.c:717
+msgid "Enables the planner's use of materialization."
+msgstr "Active l'utilisation de la matérialisation par le planificateur."
 
-#: utils/misc/guc.c:1468
-msgid "Sets the maximum memory to be used for query workspaces."
-msgstr "Initialise la mémoire maximum utilisée pour les espaces de travail des requêtes."
+#: utils/misc/guc.c:726
+msgid "Enables the planner's use of nested-loop join plans."
+msgstr "Active l'utilisation de plans avec des jointures imbriquées par le planificateur."
 
-#: utils/misc/guc.c:1469
-msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
-msgstr ""
-"Spécifie la mémoire à utiliser par les opérations de tris internes et par\n"
-"les tables de hachage avant de passer sur des fichiers temporaires sur disque."
+#: utils/misc/guc.c:735
+msgid "Enables the planner's use of merge join plans."
+msgstr "Active l'utilisation de plans de jointures MERGE par le planificateur."
 
-#: utils/misc/guc.c:1480
-msgid "Sets the maximum memory to be used for maintenance operations."
-msgstr "Initialise la mémoire maximum utilisée pour les opérations de maintenance."
+#: utils/misc/guc.c:744
+msgid "Enables the planner's use of hash join plans."
+msgstr "Active l'utilisation de plans de jointures hâchées par le planificateur."
 
-#: utils/misc/guc.c:1481
-msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr "Ceci inclut les opérations comme VACUUM et CREATE INDEX."
+#: utils/misc/guc.c:753
+msgid "Enables genetic query optimization."
+msgstr "Active l'optimisation génétique des requêtes."
 
-#: utils/misc/guc.c:1490
-msgid "Sets the maximum stack depth, in kilobytes."
-msgstr "Initialise la profondeur maximale de la pile, en Ko."
+#: utils/misc/guc.c:754
+msgid "This algorithm attempts to do planning without exhaustive searching."
+msgstr "Cet algorithme essaie de faire une planification sans recherche exhaustive."
 
-#: utils/misc/guc.c:1500
-msgid "Vacuum cost for a page found in the buffer cache."
-msgstr "Coût d'un VACUUM pour une page trouvée dans le cache du tampon."
+#: utils/misc/guc.c:764
+msgid "Shows whether the current user is a superuser."
+msgstr "Affiche si l'utilisateur actuel est un super-utilisateur."
 
-#: utils/misc/guc.c:1509
-msgid "Vacuum cost for a page not found in the buffer cache."
-msgstr "Coût d'un VACUUM pour une page introuvable dans le cache du tampon."
+#: utils/misc/guc.c:774
+msgid "Enables advertising the server via Bonjour."
+msgstr "Active la publication du serveur via Bonjour."
 
-#: utils/misc/guc.c:1518
-msgid "Vacuum cost for a page dirtied by vacuum."
-msgstr "Coût d'un VACUUM pour une page modifiée par VACUUM."
+#: utils/misc/guc.c:783
+msgid "Enables SSL connections."
+msgstr "Active les connexions SSL."
 
-#: utils/misc/guc.c:1527
-msgid "Vacuum cost amount available before napping."
-msgstr "Coût du VACUUM disponible avant un repos."
+#: utils/misc/guc.c:792
+msgid "Forces synchronization of updates to disk."
+msgstr "Force la synchronisation des mises à jour sur le disque."
 
-#: utils/misc/guc.c:1536
-msgid "Vacuum cost delay in milliseconds."
-msgstr "Délai d'un coût de VACUUM en millisecondes."
+#: utils/misc/guc.c:793
+msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This insures that a database cluster will recover to a consistent state after an operating system or hardware crash."
+msgstr ""
+"Le serveur utilisera l'appel système fsync() à différents endroits pour\n"
+"s'assurer que les mises à jour sont écrites physiquement sur le disque. Ceci\n"
+"nous assure qu'un groupe de bases de données se retrouvera dans un état\n"
+"cohérent après un arrêt brutal dû au système d'exploitation ou au matériel."
 
-#: utils/misc/guc.c:1546
-msgid "Vacuum cost delay in milliseconds, for autovacuum."
-msgstr "Délai d'un coût de VACUUM en millisecondes, pour autovacuum."
+#: utils/misc/guc.c:804
+msgid "Continues processing past damaged page headers."
+msgstr "Continue le travail après les en-têtes de page endommagés."
+
+#: utils/misc/guc.c:805
+msgid "Detection of a damaged page header normally causes PostgreSQL to report an error, aborting the current transaction. Setting zero_damaged_pages to true causes the system to instead report a warning, zero out the damaged page, and continue processing. This behavior will destroy data, namely all the rows on the damaged page."
+msgstr ""
+"La détection d'une en-tête de page endommagée cause normalement le rapport\n"
+"d'une erreur par PostgreSQL, l'annulation de la transaction en cours.\n"
+"Initialiser zero_damaged_pages à true fait que le système ne rapporte qu'un\n"
+"message d'attention et continue à travailler. Ce comportement détruira des\n"
+"données, notamment toutes les lignes de la page endommagée."
 
-#: utils/misc/guc.c:1556
-msgid "Vacuum cost amount available before napping, for autovacuum."
-msgstr "Coût du VACUUM disponible avant un repos, pour autovacuum."
+#: utils/misc/guc.c:818
+msgid "Writes full pages to WAL when first modified after a checkpoint."
+msgstr ""
+"Écrit des pages complètes dans les WAL lors d'une première modification après\n"
+"un point de vérification."
 
-#: utils/misc/guc.c:1565
-msgid "Sets the maximum number of simultaneously open files for each server process."
+#: utils/misc/guc.c:819
+msgid "A page write in process during an operating system crash might be only partially written to disk.  During recovery, the row changes stored in WAL are not enough to recover.  This option writes pages when first modified after a checkpoint to WAL so full recovery is possible."
 msgstr ""
-"Initialise le nombre maximum de fichiers ouverts simultanément pour chaque\n"
-"processus serveur."
+"Une page écrite au moment d'un arrêt brutal du système d'exploitation\n"
+"pourrait être seulement partiellement écrite sur le disque. Lors de la\n"
+"récupération, les modifications de la ligne, stockées dans le journal de\n"
+"transaction, ne seront pas suffisantes pour terminer la récupération. Cette\n"
+"option écrit les pages lors de la première modification après un point de\n"
+"vérification des journaux de transaction pour que la récupération complète\n"
+"soit possible."
 
-#: utils/misc/guc.c:1577
-msgid "Sets the maximum number of simultaneously prepared transactions."
-msgstr "Initialise le nombre maximum de transactions préparées simultanément."
+#: utils/misc/guc.c:831
+msgid "Runs the server silently."
+msgstr "Lance le serveur de manière silencieuse."
 
-#: utils/misc/guc.c:1607
-msgid "Sets the maximum allowed duration of any statement."
-msgstr "Initialise la durée maximum permise pour toute instruction."
+#: utils/misc/guc.c:832
+msgid "If this parameter is set, the server will automatically run in the background and any controlling terminals are dissociated."
+msgstr ""
+"Si ce paramètre est initialisé, le serveur sera exécuté automatiquement en\n"
+"tâche de fond et les terminaux de contrôles seront dés-associés."
 
-#: utils/misc/guc.c:1608
-msgid "A value of 0 turns off the timeout."
-msgstr "Une valeur de 0 désactive le timeout."
+#: utils/misc/guc.c:841
+msgid "Logs each checkpoint."
+msgstr "Trace tous les points de vérification."
 
-#: utils/misc/guc.c:1617
-msgid "Minimum age at which VACUUM should freeze a table row."
-msgstr "Âge minimum à partir duquel VACUUM devra geler une ligne de table."
+#: utils/misc/guc.c:850
+msgid "Logs each successful connection."
+msgstr "Trace toutes les connexions réussies."
 
-#: utils/misc/guc.c:1626
-msgid "Age at which VACUUM should scan whole table to freeze tuples."
-msgstr ""
-"Âge à partir duquel VACUUM devra parcourir une table complète pour geler les\n"
-"lignes."
+#: utils/misc/guc.c:859
+msgid "Logs end of a session, including duration."
+msgstr "Trace la fin d'une session, avec sa durée."
 
-#: utils/misc/guc.c:1635
-msgid "Number of transactions by which VACUUM and HOT cleanup should be deferred, if any."
-msgstr "Nombre de transactions à partir duquel les nettoyages VACUUM et HOT doivent être déferrés."
+#: utils/misc/guc.c:868
+msgid "Turns on various assertion checks."
+msgstr "Active les différentes vérifications des assertions."
 
-#: utils/misc/guc.c:1647
-msgid "Sets the maximum number of locks per transaction."
-msgstr "Initialise le nombre maximum de verrous par transaction."
+#: utils/misc/guc.c:869
+msgid "This is a debugging aid."
+msgstr "C'est une aide de débogage."
 
-#: utils/misc/guc.c:1648
-msgid "The shared lock table is sized on the assumption that at most max_locks_per_transaction * max_connections distinct objects will need to be locked at any one time."
-msgstr ""
-"La table des verrous partagés est dimensionnée sur l'idée qu'au plus\n"
-"max_locks_per_transaction * max_connections objets distincts auront besoin\n"
-"d'être verrouillés à tout moment."
+#: utils/misc/guc.c:883
+msgid "Terminate session on any error."
+msgstr "Termine la session sans erreur."
 
-#: utils/misc/guc.c:1658
-msgid "Sets the maximum allowed time to complete client authentication."
-msgstr ""
-"Initialise le temps maximum en secondes pour terminer l'authentification du\n"
-"client."
+#: utils/misc/guc.c:892
+msgid "Reinitialize server after backend crash."
+msgstr "Réinitialisation du serveur après un arrêt brutal d'un processus serveur."
 
-#: utils/misc/guc.c:1669
-msgid "Waits N seconds on connection startup before authentication."
-msgstr "Attends N secondes au lancement de la connexion avant l'authentification."
+#: utils/misc/guc.c:902
+msgid "Logs the duration of each completed SQL statement."
+msgstr "Trace la durée de chaque instruction SQL terminée."
 
-#: utils/misc/guc.c:1679
-msgid "Sets the number of WAL files held for standby servers."
-msgstr "Initialise le nombre de journaux de transactions conservés tenus par les seveurs en attente."
+#: utils/misc/guc.c:911
+msgid "Logs each query's parse tree."
+msgstr "Trace l'arbre d'analyse de chaque requête."
 
-#: utils/misc/guc.c:1688
-msgid "Sets the maximum distance in log segments between automatic WAL checkpoints."
-msgstr ""
-"Initialise la distance maximale dans les journaux de transaction entre chaque\n"
-"point de vérification (checkpoints) des journaux."
+#: utils/misc/guc.c:920
+msgid "Logs each query's rewritten parse tree."
+msgstr "Trace l'arbre d'analyse réécrit de chaque requête."
 
-#: utils/misc/guc.c:1697
-msgid "Sets the maximum time between automatic WAL checkpoints."
-msgstr ""
-"Initialise le temps maximum entre des points de vérification (checkpoints)\n"
-"pour les journaux de transactions."
+#: utils/misc/guc.c:929
+msgid "Logs each query's execution plan."
+msgstr "Trace le plan d'exécution de chaque requête."
 
-#: utils/misc/guc.c:1707
-msgid "Enables warnings if checkpoint segments are filled more frequently than this."
-msgstr ""
-"Active des messages d'avertissement si les segments des points de\n"
-"vérifications se remplissent plus fréquemment que cette durée."
+#: utils/misc/guc.c:938
+msgid "Indents parse and plan tree displays."
+msgstr "Indente l'affichage des arbres d'analyse et de planification."
 
-#: utils/misc/guc.c:1709
-msgid "Write a message to the server log if checkpoints caused by the filling of checkpoint segment files happens more frequently than this number of seconds. Zero turns off the warning."
+#: utils/misc/guc.c:947
+msgid "Writes parser performance statistics to the server log."
 msgstr ""
-"Écrit un message dans les journaux applicatifs du serveur si les points de\n"
-"vérifications causées par le remplissage des journaux de transaction avec\n"
-"des points de vérification qui arrivent plus fréquemment que ce nombre de\n"
-"secondes. Une valeur 0 désactive l'avertissement."
+"Écrit les statistiques de performance de l'analyseur dans les journaux applicatifs\n"
+"du serveur."
 
-#: utils/misc/guc.c:1720
-msgid "Sets the number of disk-page buffers in shared memory for WAL."
+#: utils/misc/guc.c:956
+msgid "Writes planner performance statistics to the server log."
 msgstr ""
-"Initialise le nombre de tampons de pages disque dans la mémoire partagée\n"
-"pour les journaux de transactions."
+"Écrit les statistiques de performance de planification dans les journaux\n"
+"applicatifs du serveur."
 
-#: utils/misc/guc.c:1730
-msgid "WAL writer sleep time between WAL flushes."
+#: utils/misc/guc.c:965
+msgid "Writes executor performance statistics to the server log."
 msgstr ""
-"Temps d'endormissement du processus d'écriture pendant le vidage des\n"
-"journaux de transactions en millisecondes."
+"Écrit les statistiques de performance de l'exécuteur dans les journaux applicatifs\n"
+"du serveur."
 
-#: utils/misc/guc.c:1741
-msgid "Sets the maximum number of simultaneously running WAL sender processes."
+#: utils/misc/guc.c:974
+msgid "Writes cumulative performance statistics to the server log."
 msgstr ""
-"Initialise le nombre maximum de processus d'envoi des journaux de transactions\n"
-"exécutés simultanément."
+"Écrit les statistiques de performance cumulatives dans les journaux applicatifs\n"
+"du serveur."
 
-#: utils/misc/guc.c:1750
-msgid "WAL sender sleep time between WAL replications."
-msgstr ""
-"Temps d'endormissement du processus d'envoi des journaux de transactions entre\n"
-"les réplications des journaux de transactions."
+#: utils/misc/guc.c:984
+#: utils/misc/guc.c:1049
+#: utils/misc/guc.c:1059
+#: utils/misc/guc.c:1069
+#: utils/misc/guc.c:1079
+#: utils/misc/guc.c:1804
+#: utils/misc/guc.c:1814
+msgid "No description available."
+msgstr "Aucune description disponible."
 
-#: utils/misc/guc.c:1760
-msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
-msgstr ""
-"Initialise le délai en microsecondes entre l'acceptation de la transaction\n"
-"et le vidage du journal de transaction sur disque."
+#: utils/misc/guc.c:996
+msgid "Collects information about executing commands."
+msgstr "Récupère les statistiques sur les commandes en exécution."
 
-#: utils/misc/guc.c:1770
-msgid "Sets the minimum concurrent open transactions before performing commit_delay."
+#: utils/misc/guc.c:997
+msgid "Enables the collection of information on the currently executing command of each session, along with the time at which that command began execution."
 msgstr ""
-"Initialise le nombre minimum de transactions ouvertes simultanément avant le\n"
-"commit_delay."
+"Active la récupération d'informations sur la commande en cours d'exécution\n"
+"pour chaque session, avec l'heure de début de l'exécution de la commande."
 
-#: utils/misc/guc.c:1780
-msgid "Sets the number of digits displayed for floating-point values."
-msgstr "Initialise le nombre de chiffres affichés pour les valeurs à virgule flottante."
+#: utils/misc/guc.c:1007
+msgid "Collects statistics on database activity."
+msgstr "Récupère les statistiques sur l'activité de la base de données."
 
-#: utils/misc/guc.c:1781
-msgid "This affects real, double precision, and geometric data types. The parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate)."
+#: utils/misc/guc.c:1017
+msgid "Updates the process title to show the active SQL command."
 msgstr ""
-"Ceci affecte les types de données real, double precision et géométriques.\n"
-"La valeur du paramètre est ajoutée au nombre standard de chiffres (FLT_DIG\n"
-"ou DBL_DIG comme approprié)."
+"Met à jour le titre du processus pour indiquer la commande SQL en cours\n"
+"d'exécution."
 
-#: utils/misc/guc.c:1791
-msgid "Sets the minimum execution time above which statements will be logged."
+#: utils/misc/guc.c:1018
+msgid "Enables updating of the process title every time a new SQL command is received by the server."
 msgstr ""
-"Initialise le temps d'exécution minimum au-dessus de lequel les instructions\n"
-"seront tracées."
+"Active la mise à jour du titre du processus chaque fois qu'une nouvelle\n"
+"commande SQL est reçue par le serveur."
 
-#: utils/misc/guc.c:1793
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Zéro affiche toutes les requêtes. -1 désactive cette fonctionnalité."
+#: utils/misc/guc.c:1027
+msgid "Starts the autovacuum subprocess."
+msgstr "Exécute le sous-processus de l'autovacuum."
 
-#: utils/misc/guc.c:1802
-msgid "Sets the minimum execution time above which autovacuum actions will be logged."
-msgstr ""
-"Initialise le temps d'exécution minimum au-dessus duquel les actions\n"
-"autovacuum seront tracées."
+#: utils/misc/guc.c:1037
+msgid "Generates debugging output for LISTEN and NOTIFY."
+msgstr "Génère une sortie de débogage pour LISTEN et NOTIFY."
 
-#: utils/misc/guc.c:1804
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr "Zéro affiche toutes les requêtes. -1 désactive cette fonctionnalité."
+#: utils/misc/guc.c:1091
+msgid "Logs long lock waits."
+msgstr "Trace les attentes longues de verrou."
 
-#: utils/misc/guc.c:1813
-msgid "Background writer sleep time between rounds."
+#: utils/misc/guc.c:1101
+msgid "Logs the host name in the connection logs."
+msgstr "Trace le nom d'hôte dans les traces de connexion."
+
+#: utils/misc/guc.c:1102
+msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty."
 msgstr ""
-"Temps d'endormissement du processus d'écriture en tâche de fond en\n"
-"millisecondes."
+"Par défaut, les traces de connexion n'affichent que l'adresse IP de l'hôte\n"
+"se connectant. Si vous voulez que s'affiche le nom de l'hôte, vous devez\n"
+"activer cette option mais suivant la configuration de la résolution de noms\n"
+"pour votre hôte, cela pourrait imposer des dégradations de performances non\n"
+"négligeables."
 
-#: utils/misc/guc.c:1823
-msgid "Background writer maximum number of LRU pages to flush per round."
+#: utils/misc/guc.c:1113
+msgid "Causes subtables to be included by default in various commands."
 msgstr ""
-"Nombre de pages LRU maximum à nettoyer par le processus d'écriture en\n"
-"tâche de fond."
+"Fait que les sous-tables soient incluses par défaut dans les différentes\n"
+"commandes."
 
-#: utils/misc/guc.c:1838
-msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
-msgstr "Nombre de requêtes simultanées pouvant être gérées efficacement par le sous-système disque."
+#: utils/misc/guc.c:1122
+msgid "Encrypt passwords."
+msgstr "Chiffre les mots de passe."
 
-#: utils/misc/guc.c:1839
-msgid "For RAID arrays, this should be approximately the number of drive spindles in the array."
+#: utils/misc/guc.c:1123
+msgid "When a password is specified in CREATE USER or ALTER USER without writing either ENCRYPTED or UNENCRYPTED, this parameter determines whether the password is to be encrypted."
 msgstr ""
-"Pour les systèmes RAID, cela devrait être approximativement le nombre de\n"
-"têtes de lecture du système."
+"Lorsqu'un mot de passe est spécifié dans CREATE USER ou ALTER USER sans\n"
+"indiquer ENCRYPTED ou UNENCRYPTED, ce paramètre détermine si le mot de passe\n"
+"doit être chiffré."
 
-#: utils/misc/guc.c:1852
-msgid "Automatic log file rotation will occur after N minutes."
+#: utils/misc/guc.c:1133
+msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
+msgstr "Traite « expr=NULL » comme « expr IS NULL »."
+
+#: utils/misc/guc.c:1134
+msgid "When turned on, expressions of the form expr = NULL (or NULL = expr) are treated as expr IS NULL, that is, they return true if expr evaluates to the null value, and false otherwise. The correct behavior of expr = NULL is to always return null (unknown)."
 msgstr ""
-"La rotation automatique des journaux applicatifs s'effectue toutes les N\n"
-"minutes."
+"Une fois activé, les expressions de la forme expr = NULL (ou NULL = expr)\n"
+"sont traitées comme expr IS NULL, c'est-à-dire qu'elles renvoient true si\n"
+"l'expression est évaluée comme étant NULL et false sinon. Le comportement\n"
+"correct de expr = NULL est de toujours renvoyer NULL (inconnu)."
 
-#: utils/misc/guc.c:1862
-msgid "Automatic log file rotation will occur after N kilobytes."
-msgstr "La rotation automatique des journaux applicatifs s'effectue après N Ko."
+#: utils/misc/guc.c:1146
+msgid "Enables per-database user names."
+msgstr "Active les noms d'utilisateur par base de données."
 
-#: utils/misc/guc.c:1872
-msgid "Shows the maximum number of function arguments."
-msgstr "Affiche le nombre maximum d'arguments de fonction."
+#: utils/misc/guc.c:1156
+msgid "This parameter doesn't do anything."
+msgstr "Ce paramètre ne fait rien."
 
-#: utils/misc/guc.c:1882
-msgid "Shows the maximum number of index keys."
-msgstr "Affiche le nombre maximum de clés d'index."
+#: utils/misc/guc.c:1157
+msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients."
+msgstr ""
+"C'est ici uniquement pour ne pas avoir de problèmes avec le SET AUTOCOMMIT\n"
+"TO ON des clients 7.3."
 
-#: utils/misc/guc.c:1892
-msgid "Shows the maximum identifier length."
-msgstr "Affiche la longueur maximum d'un identifiant"
+#: utils/misc/guc.c:1166
+msgid "Sets the default read-only status of new transactions."
+msgstr "Initialise le statut de lecture seule par défaut des nouvelles transactions."
 
-#: utils/misc/guc.c:1902
-msgid "Shows the size of a disk block."
-msgstr "Affiche la taille d'un bloc de disque."
+#: utils/misc/guc.c:1175
+msgid "Sets the current transaction's read-only status."
+msgstr "Affiche le statut de lecture seule de la transaction actuelle."
 
-#: utils/misc/guc.c:1912
-msgid "Shows the number of pages per disk file."
-msgstr "Affiche le nombre de pages par fichier."
+#: utils/misc/guc.c:1185
+msgid "Sets the default deferrable status of new transactions."
+msgstr "Initialise le statut déferrable par défaut des nouvelles transactions."
 
-#: utils/misc/guc.c:1922
-msgid "Shows the block size in the write ahead log."
-msgstr "Affiche la taille du bloc dans les journaux de transactions."
+#: utils/misc/guc.c:1194
+msgid "Whether to defer a read-only serializable transaction until it can be executed with no possible serialization failures."
+msgstr ""
+"S'il faut repousser une transaction sérialisable en lecture seule jusqu'à ce qu'elle\n"
+"puisse être exécutée sans échecs possibles de sérialisation."
 
-#: utils/misc/guc.c:1932
-msgid "Shows the number of pages per write ahead log segment."
-msgstr "Affiche le nombre de pages par journal de transactions."
+#: utils/misc/guc.c:1204
+msgid "Check function bodies during CREATE FUNCTION."
+msgstr "Vérifie les corps de fonction lors du CREATE FUNCTION."
 
-#: utils/misc/guc.c:1945
-msgid "Time to sleep between autovacuum runs."
-msgstr "Durée d'endormissement entre deux exécutions d'autovacuum."
+#: utils/misc/guc.c:1213
+msgid "Enable input of NULL elements in arrays."
+msgstr "Active la saisie d'éléments NULL dans les tableaux."
 
-#: utils/misc/guc.c:1954
-msgid "Minimum number of tuple updates or deletes prior to vacuum."
-msgstr "Nombre minimum de lignes mises à jour ou supprimées avant le VACUUM."
+#: utils/misc/guc.c:1214
+msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
+msgstr ""
+"Si activé, un NULL sans guillemets en tant que valeur d'entrée dans un\n"
+"tableau signifie une valeur NULL ; sinon, il sera pris littéralement."
 
-#: utils/misc/guc.c:1962
-msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
-msgstr "Nombre minimum de lignes insérées, mises à jour ou supprimées avant un ANALYZE."
+#: utils/misc/guc.c:1224
+msgid "Create new tables with OIDs by default."
+msgstr "Crée des nouvelles tables avec des OID par défaut."
 
-#: utils/misc/guc.c:1971
-msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
+#: utils/misc/guc.c:1233
+msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
 msgstr ""
-"Âge à partir duquel l'autovacuum se déclenche sur une table pour empêcher la\n"
-"réinitialisation de l'identifiant de transaction"
+"Lance un sous-processus pour capturer la sortie d'erreurs (stderr) et/ou\n"
+"csvlogs dans des journaux applicatifs."
 
-#: utils/misc/guc.c:1981
-msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
-msgstr "Initialise le nombre maximum de processus autovacuum exécutés simultanément."
+#: utils/misc/guc.c:1242
+msgid "Truncate existing log files of same name during log rotation."
+msgstr ""
+"Tronque les journaux applicatifs existants du même nom lors de la rotation\n"
+"des journaux applicatifs."
 
-#: utils/misc/guc.c:1990
-msgid "Time between issuing TCP keepalives."
-msgstr "Secondes entre l'exécution de « TCP keepalives »."
+#: utils/misc/guc.c:1253
+msgid "Emit information about resource usage in sorting."
+msgstr "Émet des informations sur l'utilisation des ressources lors d'un tri."
 
-#: utils/misc/guc.c:1991
-#: utils/misc/guc.c:2001
-msgid "A value of 0 uses the system default."
-msgstr "Une valeur de 0 désactive la valeur système par défaut."
+#: utils/misc/guc.c:1267
+msgid "Generate debugging output for synchronized scanning."
+msgstr "Génère une sortie de débogage pour les parcours synchronisés."
 
-#: utils/misc/guc.c:2000
-msgid "Time between TCP keepalive retransmits."
-msgstr "Secondes entre les retransmissions de « TCP keepalive »."
+#: utils/misc/guc.c:1282
+msgid "Enable bounded sorting using heap sort."
+msgstr "Active le tri limité en utilisant le tri de heap."
 
-#: utils/misc/guc.c:2010
-msgid "Set the amount of traffic to send and receive before renegotiating the encryption keys."
-msgstr ""
-"Configure la quantité de trafic à envoyer et recevoir avant la renégotiation\n"
-"des clés d'enchiffrement."
+#: utils/misc/guc.c:1295
+msgid "Emit WAL-related debugging output."
+msgstr "Émet une sortie de débogage concernant les journaux de transactions."
 
-#: utils/misc/guc.c:2020
-msgid "Maximum number of TCP keepalive retransmits."
-msgstr "Nombre maximum de retransmissions de « TCP keepalive »."
+#: utils/misc/guc.c:1307
+msgid "Datetimes are integer based."
+msgstr "Les types datetime sont basés sur des entiers"
 
-#: utils/misc/guc.c:2021
-msgid "This controls the number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
+#: utils/misc/guc.c:1322
+msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
 msgstr ""
-"Ceci contrôle le nombre de retransmissions keepalive consécutives qui\n"
-"peuvent être perdues avant qu'une connexion ne soit considérée morte. Une\n"
-"valeur de 0 utilise la valeur par défaut du système."
+"Indique si les noms d'utilisateurs Kerberos et GSSAPI devraient être traités\n"
+"sans se soucier de la casse."
 
-#: utils/misc/guc.c:2031
-msgid "Sets the maximum allowed result for exact search by GIN."
-msgstr "Configure le nombre maximum de résultats lors d'une recherche par GIN."
+#: utils/misc/guc.c:1332
+msgid "Warn about backslash escapes in ordinary string literals."
+msgstr "Avertie sur les échappements par antislash dans les chaînes ordinaires."
 
-#: utils/misc/guc.c:2041
-msgid "Sets the planner's assumption about the size of the disk cache."
-msgstr "Initialise le sentiment du planificateur sur la taille du cache disque."
+#: utils/misc/guc.c:1342
+msgid "Causes '...' strings to treat backslashes literally."
+msgstr "Fait que les chaînes '...' traitent les antislashs littéralement."
 
-#: utils/misc/guc.c:2042
-msgid "That is, the portion of the kernel's disk cache that will be used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
-msgstr ""
-"C'est-à-dire, la portion du cache disque du noyau qui sera utilisé pour les\n"
-"fichiers de données de PostgreSQL. C'est mesuré en pages disque, qui font\n"
-"normalement 8 Ko chaque."
+#: utils/misc/guc.c:1353
+msgid "Enable synchronized sequential scans."
+msgstr "Active l'utilisation des parcours séquentiels synchronisés."
 
-#: utils/misc/guc.c:2054
-msgid "Shows the server version as an integer."
-msgstr "Affiche la version du serveur sous la forme d'un entier."
+#: utils/misc/guc.c:1363
+msgid "Allows archiving of WAL files using archive_command."
+msgstr "Autorise l'archivage des journaux de transactions en utilisant archive_command."
 
-#: utils/misc/guc.c:2064
-msgid "Log the use of temporary files larger than this number of kilobytes."
-msgstr ""
-"Trace l'utilisation de fichiers temporaires plus gros que ce nombre de\n"
-"kilooctets."
+#: utils/misc/guc.c:1373
+msgid "Allows connections and queries during recovery."
+msgstr "Autorise les connexions et les requêtes pendant la restauration."
 
-#: utils/misc/guc.c:2065
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
+#: utils/misc/guc.c:1383
+msgid "Allows feedback from a hot standby to the primary that will avoid query conflicts."
 msgstr ""
-"Zéro trace toutes les requêtes. La valeur par défaut est -1 (désactivant\n"
-"cette fonctionnalité)."
+"Permet l'envoi d'informations d'un serveur Hot Standby vers le serveur\n"
+"principal pour éviter les conflits de requêtes."
 
-#: utils/misc/guc.c:2074
-msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
-msgstr "Configure la taille réservée pour pg_stat_activity.current_query, en octets."
+#: utils/misc/guc.c:1393
+msgid "Allows modifications of the structure of system tables."
+msgstr "Permet les modifications de la structure des tables systèmes."
 
-#: utils/misc/guc.c:2092
-msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
-msgstr ""
-"Initialise l'estimation du planificateur pour le coût d'une page disque\n"
-"récupérée séquentiellement."
+#: utils/misc/guc.c:1404
+msgid "Disables reading from system indexes."
+msgstr "Désactive la lecture des index système."
 
-#: utils/misc/guc.c:2101
-msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
+#: utils/misc/guc.c:1405
+msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
 msgstr ""
-"Initialise l'estimation du plnnificateur pour le coût d'une page disque\n"
-"récupérée non séquentiellement."
+"Cela n'empêche pas la mise à jour des index, donc vous pouvez l'utiliser en\n"
+"toute sécurité. La pire conséquence est la lenteur."
 
-#: utils/misc/guc.c:2110
-msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
+#: utils/misc/guc.c:1416
+msgid "Enables backward compatibility mode for privilege checks on large objects."
 msgstr ""
-"Initialise l'estimation du planificateur pour le coût d'exécution sur chaque\n"
-"ligne."
+"Active la compatibilité ascendante pour la vérification des droits sur les\n"
+"Large Objects."
 
-#: utils/misc/guc.c:2119
-msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
+#: utils/misc/guc.c:1417
+msgid "Skips privilege checks when reading or modifying large objects, for compatibility with PostgreSQL releases prior to 9.0."
 msgstr ""
-"Initialise l'estimation du planificateur pour le coût de traitement de\n"
-"chaque ligne indexée lors d'un parcours d'index."
+"Ignore la vérification des droits lors de la lecture et de la modification\n"
+"des Larges Objects, pour la compatibilité avec les versions antérieures à la\n"
+"9.0."
 
-#: utils/misc/guc.c:2128
-msgid "Sets the planner's estimate of the cost of processing each operator or function call."
+#: utils/misc/guc.c:1427
+msgid "When generating SQL fragments, quote all identifiers."
+msgstr "Lors de la génération des rragments SQL, mettre entre guillemets tous les identifiants."
+
+#: utils/misc/guc.c:1446
+msgid "Forces a switch to the next xlog file if a new file has not been started within N seconds."
 msgstr ""
-"Initialise l'estimation du planificateur pour le coût de traitement de\n"
-"chaque opérateur ou appel de fonction."
+"Force un changement du journal de transaction si un nouveau fichier n'a pas\n"
+"été créé depuis N secondes."
 
-#: utils/misc/guc.c:2138
-msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
-msgstr "Initialise l'estimation du planificateur de la fraction des lignes d'un curseur à récupérer."
+#: utils/misc/guc.c:1457
+msgid "Waits N seconds on connection startup after authentication."
+msgstr "Attends N secondes après l'authentification."
 
-#: utils/misc/guc.c:2148
-msgid "GEQO: selective pressure within the population."
-msgstr "GEQO : pression sélective dans la population."
+#: utils/misc/guc.c:1458
+#: utils/misc/guc.c:1907
+msgid "This allows attaching a debugger to the process."
+msgstr "Ceci permet d'attacher un débogueur au processus."
 
-#: utils/misc/guc.c:2157
-msgid "GEQO: seed for random path selection."
-msgstr "GEQO : graine pour la sélection du chemin aléatoire."
+#: utils/misc/guc.c:1467
+msgid "Sets the default statistics target."
+msgstr "Initialise la cible par défaut des statistiques."
 
-#: utils/misc/guc.c:2166
-msgid "Multiple of the average buffer usage to free per round."
-msgstr "Multiplede l'utilisation moyenne des tampons à libérer à chaque tour."
+#: utils/misc/guc.c:1468
+msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
+msgstr ""
+"Ceci s'applique aux colonnes de tables qui n'ont pas de cible spécifique\n"
+"pour la colonne initialisée via ALTER TABLE SET STATISTICS."
 
-#: utils/misc/guc.c:2175
-msgid "Sets the seed for random-number generation."
-msgstr "Initialise la clé pour la génération de nombres aléatoires."
+#: utils/misc/guc.c:1477
+msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
+msgstr ""
+"Initialise la taille de la liste FROM en dehors de laquelle les\n"
+"sous-requêtes ne sont pas rassemblées."
 
-#: utils/misc/guc.c:2185
-msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
+#: utils/misc/guc.c:1479
+msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
 msgstr ""
-"Nombre de lignes modifiées ou supprimées avant d'exécuter un VACUUM\n"
-"(fraction de reltuples)."
+"Le planificateur fusionne les sous-requêtes dans des requêtes supérieures\n"
+"si la liste FROM résultante n'a pas plus de ce nombre d'éléments."
 
-#: utils/misc/guc.c:2193
-msgid "Number of tuple inserts, updates or deletes prior to analyze as a fraction of reltuples."
+#: utils/misc/guc.c:1489
+msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr ""
-"Nombre de lignes insérées, mises à jour ou supprimées avant d'analyser\n"
-"(fraction de reltuples)."
+"Initialise la taille de la liste FROM en dehors de laquelle les contructions\n"
+"JOIN ne sont pas aplanies."
 
-#: utils/misc/guc.c:2202
-msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
+#: utils/misc/guc.c:1491
+msgid "The planner will flatten explicit JOIN constructs into lists of FROM items whenever a list of no more than this many items would result."
 msgstr ""
-"Temps passé à vider les tampons lors du point de vérification, en tant que\n"
-"fraction de l'intervalle du point de vérification."
+"La planificateur applanira les constructions JOIN explicites dans des listes\n"
+"d'éléments FROM lorsqu'une liste d'au plus ce nombre d'éléments en\n"
+"résulterait."
 
-#: utils/misc/guc.c:2220
-msgid "Sets the shell command that will be called to archive a WAL file."
-msgstr "La commande shell qui sera appelée pour archiver un journal de transaction."
+#: utils/misc/guc.c:1501
+msgid "Sets the threshold of FROM items beyond which GEQO is used."
+msgstr "Initialise la limite des éléments FROM en dehors de laquelle GEQO est utilisé."
 
-#: utils/misc/guc.c:2229
-msgid "Sets the client's character set encoding."
-msgstr "Initialise l'encodage du client."
+#: utils/misc/guc.c:1510
+msgid "GEQO: effort is used to set the default for other GEQO parameters."
+msgstr ""
+"GEQO : l'effort est utilisé pour initialiser une valeur par défaut pour les\n"
+"autres paramètres GEQO."
 
-#: utils/misc/guc.c:2239
-msgid "Controls information prefixed to each log line."
-msgstr "Contrôle l'information préfixée sur chaque ligne de trace."
+#: utils/misc/guc.c:1519
+msgid "GEQO: number of individuals in the population."
+msgstr "GEQO : nombre d'individus dans une population."
 
-#: utils/misc/guc.c:2240
-msgid "If blank, no prefix is used."
-msgstr "Si vide, aucun préfixe n'est utilisé."
+#: utils/misc/guc.c:1520
+#: utils/misc/guc.c:1529
+msgid "Zero selects a suitable default value."
+msgstr "Zéro sélectionne une valeur par défaut convenable."
 
-#: utils/misc/guc.c:2248
-msgid "Sets the time zone to use in log messages."
-msgstr "Initialise le fuseau horaire à utiliser pour les journaux applicatifs."
+#: utils/misc/guc.c:1528
+msgid "GEQO: number of iterations of the algorithm."
+msgstr "GEQO : nombre d'itérations dans l'algorithme."
 
-#: utils/misc/guc.c:2257
-msgid "Sets the display format for date and time values."
-msgstr "Initialise le format d'affichage des valeurs date et time."
+#: utils/misc/guc.c:1539
+msgid "Sets the time to wait on a lock before checking for deadlock."
+msgstr "Temps d'attente du verrou avant de vérifier les verrous bloqués."
 
-#: utils/misc/guc.c:2258
-msgid "Also controls interpretation of ambiguous date inputs."
-msgstr "Contrôle aussi l'interprétation des dates ambigues en entrée."
+#: utils/misc/guc.c:1550
+msgid "Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."
+msgstr ""
+"Initialise le délai maximum avant d'annuler les requêtes lorsqu'un serveur en\n"
+"hotstandby traite les données des journaux de transactions archivés"
 
-#: utils/misc/guc.c:2268
-msgid "Sets the default tablespace to create tables and indexes in."
-msgstr "Initialise le tablespace par défaut pour créer les tables et index."
+#: utils/misc/guc.c:1561
+msgid "Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."
+msgstr ""
+"Initialise le délai maximum avant d'annuler les requêtes lorsqu'un serveur en\n"
+"hotstandby traite les données des journaux de transactions envoyés en flux."
 
-#: utils/misc/guc.c:2269
-msgid "An empty string selects the database's default tablespace."
-msgstr "Une chaîne vide sélectionne le tablespace par défaut de la base de données."
+#: utils/misc/guc.c:1572
+msgid "Sets the maximum interval between WAL receiver status reports to the primary."
+msgstr "Configure l'intervalle maximum entre chaque envoi d'un rapport de statut du walreceiver vers le serveur maître."
 
-#: utils/misc/guc.c:2278
-msgid "Sets the tablespace(s) to use for temporary tables and sort files."
-msgstr ""
-"Initialise le(s) tablespace(s) à utiliser pour les tables temporaires et les\n"
-"fichiers de tri."
+#: utils/misc/guc.c:1583
+msgid "Sets the maximum number of concurrent connections."
+msgstr "Nombre maximum de connexions simultanées."
 
-#: utils/misc/guc.c:2288
-msgid "Sets the path for dynamically loadable modules."
-msgstr "Initialise le chemin des modules chargeables dynamiquement."
+#: utils/misc/guc.c:1593
+msgid "Sets the number of connection slots reserved for superusers."
+msgstr "Nombre de connexions réservées aux super-utilisateurs."
 
-#: utils/misc/guc.c:2289
-msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e., the name does not contain a slash), the system will search this path for the specified file."
-msgstr ""
-"Si un module chargeable dynamiquement a besoin d'être ouvert et que le nom\n"
-"spécifié n'a pas une composante répertoire (c'est-à-dire que le nom ne\n"
-"contient pas un '/'), le système cherche le fichier spécifié sur ce chemin."
+#: utils/misc/guc.c:1607
+msgid "Sets the number of shared memory buffers used by the server."
+msgstr "Nombre de tampons en mémoire partagée utilisé par le serveur."
 
-#: utils/misc/guc.c:2301
-msgid "Sets the location of the Kerberos server key file."
-msgstr "Initalise l'emplacement du fichier de la clé serveur pour Kerberos."
+#: utils/misc/guc.c:1618
+msgid "Sets the maximum number of temporary buffers used by each session."
+msgstr "Nombre maximum de tampons en mémoire partagée utilisés par chaque session."
 
-#: utils/misc/guc.c:2311
-msgid "Sets the name of the Kerberos service."
-msgstr "Initialise le nom du service Kerberos."
+#: utils/misc/guc.c:1629
+msgid "Sets the TCP port the server listens on."
+msgstr "Port TCP sur lequel le serveur écoutera."
 
-#: utils/misc/guc.c:2320
-msgid "Sets the Bonjour service name."
-msgstr "Initialise le nom du service Bonjour."
+#: utils/misc/guc.c:1639
+msgid "Sets the access permissions of the Unix-domain socket."
+msgstr "Droits d'accès au socket domaine Unix."
 
-#: utils/misc/guc.c:2331
-msgid "Shows the collation order locale."
-msgstr "Affiche la locale de tri et de groupement."
+#: utils/misc/guc.c:1640
+msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
+msgstr ""
+"Les sockets de domaine Unix utilise l'ensemble des droits habituels du système\n"
+"de fichiers Unix. La valeur de ce paramètre doit être une spécification en\n"
+"mode numérique de la forme acceptée par les appels système chmod et umask\n"
+"(pour utiliser le format octal, le nombre doit commencer avec un zéro)."
 
-#: utils/misc/guc.c:2341
-msgid "Shows the character classification and case conversion locale."
-msgstr "Affiche la classification des caractères et la locale de conversions."
+#: utils/misc/guc.c:1654
+msgid "Sets the file permissions for log files."
+msgstr "Initialise les droits des fichiers de trace."
 
-#: utils/misc/guc.c:2351
-msgid "Sets the language in which messages are displayed."
-msgstr "Initialise le langage dans lequel les messages sont affichés."
+#: utils/misc/guc.c:1655
+msgid "The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
+msgstr ""
+"La valeur du paramètre est attendue dans le format numérique du mode accepté\n"
+"par les appels système chmod et umask (pour utiliser le format octal\n"
+"personnalisé, le numéro doit commencer avec un zéro)."
 
-#: utils/misc/guc.c:2360
-msgid "Sets the locale for formatting monetary amounts."
-msgstr "Initialise la locale pour le formattage des montants monétaires."
+#: utils/misc/guc.c:1668
+msgid "Sets the maximum memory to be used for query workspaces."
+msgstr "Initialise la mémoire maximum utilisée pour les espaces de travail des requêtes."
 
-#: utils/misc/guc.c:2369
-msgid "Sets the locale for formatting numbers."
-msgstr "Initialise la locale pour formater les nombres."
+#: utils/misc/guc.c:1669
+msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
+msgstr ""
+"Spécifie la mémoire à utiliser par les opérations de tris internes et par\n"
+"les tables de hachage avant de passer sur des fichiers temporaires sur disque."
 
-#: utils/misc/guc.c:2378
-msgid "Sets the locale for formatting date and time values."
-msgstr "Initialise la locale pour formater les valeurs date et time."
+#: utils/misc/guc.c:1681
+msgid "Sets the maximum memory to be used for maintenance operations."
+msgstr "Initialise la mémoire maximum utilisée pour les opérations de maintenance."
 
-#: utils/misc/guc.c:2387
-msgid "Lists shared libraries to preload into server."
-msgstr "Liste les bibliothèques partagées à précharger dans le serveur."
+#: utils/misc/guc.c:1682
+msgid "This includes operations such as VACUUM and CREATE INDEX."
+msgstr "Ceci inclut les opérations comme VACUUM et CREATE INDEX."
 
-#: utils/misc/guc.c:2397
-msgid "Lists shared libraries to preload into each backend."
-msgstr "Liste les bibliothèques partagées à précharger dans chaque processus serveur."
+#: utils/misc/guc.c:1697
+msgid "Sets the maximum stack depth, in kilobytes."
+msgstr "Initialise la profondeur maximale de la pile, en Ko."
 
-#: utils/misc/guc.c:2407
-msgid "Sets the schema search order for names that are not schema-qualified."
-msgstr ""
-"Initialise l'ordre de recherche des schémas pour les noms qui ne précisent\n"
-"pas le schéma."
+#: utils/misc/guc.c:1708
+msgid "Vacuum cost for a page found in the buffer cache."
+msgstr "Coût d'un VACUUM pour une page trouvée dans le cache du tampon."
 
-#: utils/misc/guc.c:2418
-msgid "Sets the server (database) character set encoding."
-msgstr "Initialise le codage des caractères pour le serveur (base de données)."
+#: utils/misc/guc.c:1718
+msgid "Vacuum cost for a page not found in the buffer cache."
+msgstr "Coût d'un VACUUM pour une page introuvable dans le cache du tampon."
 
-#: utils/misc/guc.c:2429
-msgid "Shows the server version."
-msgstr "Affiche la version du serveur."
+#: utils/misc/guc.c:1728
+msgid "Vacuum cost for a page dirtied by vacuum."
+msgstr "Coût d'un VACUUM pour une page modifiée par VACUUM."
 
-#: utils/misc/guc.c:2440
-msgid "Sets the current role."
-msgstr "Initialise le rôle courant."
+#: utils/misc/guc.c:1738
+msgid "Vacuum cost amount available before napping."
+msgstr "Coût du VACUUM disponible avant un repos."
 
-#: utils/misc/guc.c:2451
-msgid "Sets the session user name."
-msgstr "Initialise le nom de l'utilisateur de la session."
+#: utils/misc/guc.c:1748
+msgid "Vacuum cost delay in milliseconds."
+msgstr "Délai d'un coût de VACUUM en millisecondes."
 
-#: utils/misc/guc.c:2461
-msgid "Sets the destination for server log output."
-msgstr "Initialise la destination des journaux applicatifs du serveur."
+#: utils/misc/guc.c:1759
+msgid "Vacuum cost delay in milliseconds, for autovacuum."
+msgstr "Délai d'un coût de VACUUM en millisecondes, pour autovacuum."
 
-#: utils/misc/guc.c:2462
-msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and \"eventlog\", depending on the platform."
+#: utils/misc/guc.c:1770
+msgid "Vacuum cost amount available before napping, for autovacuum."
+msgstr "Coût du VACUUM disponible avant un repos, pour autovacuum."
+
+#: utils/misc/guc.c:1780
+msgid "Sets the maximum number of simultaneously open files for each server process."
 msgstr ""
-"Les valeurs valides sont une combinaison de « stderr », « syslog »,\n"
-"« csvlog » et « eventlog », suivant la plateforme."
+"Initialise le nombre maximum de fichiers ouverts simultanément pour chaque\n"
+"processus serveur."
 
-#: utils/misc/guc.c:2472
-msgid "Sets the destination directory for log files."
-msgstr "Initialise le répertoire de destination pour les journaux applicatifs."
+#: utils/misc/guc.c:1793
+msgid "Sets the maximum number of simultaneously prepared transactions."
+msgstr "Initialise le nombre maximum de transactions préparées simultanément."
 
-#: utils/misc/guc.c:2473
-msgid "Can be specified as relative to the data directory or as absolute path."
-msgstr "Accepte un chemin relatif ou absolu pour le répertoire des données."
+#: utils/misc/guc.c:1826
+msgid "Sets the maximum allowed duration of any statement."
+msgstr "Initialise la durée maximum permise pour toute instruction."
 
-#: utils/misc/guc.c:2482
-msgid "Sets the file name pattern for log files."
-msgstr "Initialise le modèle de nom de fichiers pour les journaux applicatifs."
+#: utils/misc/guc.c:1827
+msgid "A value of 0 turns off the timeout."
+msgstr "Une valeur de 0 désactive le timeout."
 
-#: utils/misc/guc.c:2493
-msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+#: utils/misc/guc.c:1837
+msgid "Minimum age at which VACUUM should freeze a table row."
+msgstr "Âge minimum à partir duquel VACUUM devra geler une ligne de table."
+
+#: utils/misc/guc.c:1847
+msgid "Age at which VACUUM should scan whole table to freeze tuples."
 msgstr ""
-"Initialise le nom du programme utilisé pour identifier les messages de\n"
-"PostgreSQL dans syslog."
+"Âge à partir duquel VACUUM devra parcourir une table complète pour geler les\n"
+"lignes."
 
-#: utils/misc/guc.c:2504
-msgid "Sets the time zone for displaying and interpreting time stamps."
-msgstr "Initialise la zone horaire pour afficher et interpréter les dates/heures."
+#: utils/misc/guc.c:1857
+msgid "Number of transactions by which VACUUM and HOT cleanup should be deferred, if any."
+msgstr "Nombre de transactions à partir duquel les nettoyages VACUUM et HOT doivent être déferrés."
 
-#: utils/misc/guc.c:2513
-msgid "Selects a file of time zone abbreviations."
-msgstr "Sélectionne un fichier contenant les abréviations des fuseaux horaires."
+#: utils/misc/guc.c:1870
+msgid "Sets the maximum number of locks per transaction."
+msgstr "Initialise le nombre maximum de verrous par transaction."
 
-#: utils/misc/guc.c:2522
-msgid "Sets the current transaction's isolation level."
-msgstr "Initialise le niveau d'isolation de la transaction courante."
+#: utils/misc/guc.c:1871
+msgid "The shared lock table is sized on the assumption that at most max_locks_per_transaction * max_connections distinct objects will need to be locked at any one time."
+msgstr ""
+"La table des verrous partagés est dimensionnée sur l'idée qu'au plus\n"
+"max_locks_per_transaction * max_connections objets distincts auront besoin\n"
+"d'être verrouillés à tout moment."
 
-#: utils/misc/guc.c:2532
-msgid "Sets the owning group of the Unix-domain socket."
-msgstr "Initialise le groupe d'appartenance du socket domaine Unix."
+#: utils/misc/guc.c:1882
+msgid "Sets the maximum number of predicate locks per transaction."
+msgstr "Initialise le nombre maximum de verrous prédicats par transaction."
 
-#: utils/misc/guc.c:2533
-msgid "The owning user of the socket is always the user that starts the server."
-msgstr "Le propriétaire du socket est toujours l'utilisateur qui a lancé le serveur."
+#: utils/misc/guc.c:1883
+msgid "The shared predicate lock table is sized on the assumption that at most max_pred_locks_per_transaction * max_connections distinct objects will need to be locked at any one time."
+msgstr ""
+"La table des verrous de prédicat partagés est dimensionnée sur l'idée qu'au plus\n"
+"max_pred_locks_per_transaction * max_connections objets distincts auront besoin\n"
+"d'être verrouillés à tout moment."
 
-#: utils/misc/guc.c:2542
-msgid "Sets the directory where the Unix-domain socket will be created."
-msgstr "Initialise le répertoire où le socket domaine Unix sera créé."
+#: utils/misc/guc.c:1894
+msgid "Sets the maximum allowed time to complete client authentication."
+msgstr ""
+"Initialise le temps maximum en secondes pour terminer l'authentification du\n"
+"client."
 
-#: utils/misc/guc.c:2552
-msgid "Sets the host name or IP address(es) to listen to."
-msgstr "Initialise le nom de l'hôte ou l'adresse IP à écouter."
+#: utils/misc/guc.c:1906
+msgid "Waits N seconds on connection startup before authentication."
+msgstr "Attends N secondes au lancement de la connexion avant l'authentification."
 
-#: utils/misc/guc.c:2562
-msgid "Sets the list of known custom variable classes."
-msgstr "Initialise la liste des classes variables personnalisées connues."
+#: utils/misc/guc.c:1917
+msgid "Sets the number of WAL files held for standby servers."
+msgstr "Initialise le nombre de journaux de transactions conservés tenus par les seveurs en attente."
 
-#: utils/misc/guc.c:2572
-msgid "Sets the server's data directory."
-msgstr "Initialise le répertoire des données du serveur."
+#: utils/misc/guc.c:1927
+msgid "Sets the maximum distance in log segments between automatic WAL checkpoints."
+msgstr ""
+"Initialise la distance maximale dans les journaux de transaction entre chaque\n"
+"point de vérification (checkpoints) des journaux."
 
-#: utils/misc/guc.c:2582
-msgid "Sets the server's main configuration file."
-msgstr "Voir le fichier de configuration principal du serveur."
+#: utils/misc/guc.c:1937
+msgid "Sets the maximum time between automatic WAL checkpoints."
+msgstr ""
+"Initialise le temps maximum entre des points de vérification (checkpoints)\n"
+"pour les journaux de transactions."
 
-#: utils/misc/guc.c:2592
-msgid "Sets the server's \"hba\" configuration file."
-msgstr "Initialise le fichier de configuration « hba » du serveur."
+#: utils/misc/guc.c:1948
+msgid "Enables warnings if checkpoint segments are filled more frequently than this."
+msgstr ""
+"Active des messages d'avertissement si les segments des points de\n"
+"vérifications se remplissent plus fréquemment que cette durée."
 
-#: utils/misc/guc.c:2602
-msgid "Sets the server's \"ident\" configuration file."
-msgstr "Initialise le fichier de configuration « ident » du serveur."
+#: utils/misc/guc.c:1950
+msgid "Write a message to the server log if checkpoints caused by the filling of checkpoint segment files happens more frequently than this number of seconds. Zero turns off the warning."
+msgstr ""
+"Écrit un message dans les journaux applicatifs du serveur si les points de\n"
+"vérifications causées par le remplissage des journaux de transaction avec\n"
+"des points de vérification qui arrivent plus fréquemment que ce nombre de\n"
+"secondes. Une valeur 0 désactive l'avertissement."
 
-#: utils/misc/guc.c:2612
-msgid "Writes the postmaster PID to the specified file."
-msgstr "Écrit le PID du postmaster PID dans le fichier spécifié."
+#: utils/misc/guc.c:1962
+msgid "Sets the number of disk-page buffers in shared memory for WAL."
+msgstr ""
+"Initialise le nombre de tampons de pages disque dans la mémoire partagée\n"
+"pour les journaux de transactions."
 
-#: utils/misc/guc.c:2622
-msgid "Writes temporary statistics files to the specified directory."
-msgstr "Écrit les fichiers statistiques temporaires dans le répertoire indiqué."
+#: utils/misc/guc.c:1973
+msgid "WAL writer sleep time between WAL flushes."
+msgstr ""
+"Temps d'endormissement du processus d'écriture pendant le vidage des\n"
+"journaux de transactions en millisecondes."
 
-#: utils/misc/guc.c:2632
-msgid "Sets default text search configuration."
-msgstr "Initialise le configuration par défaut de la recherche plein texte"
+#: utils/misc/guc.c:1985
+msgid "Sets the maximum number of simultaneously running WAL sender processes."
+msgstr ""
+"Initialise le nombre maximum de processus d'envoi des journaux de transactions\n"
+"exécutés simultanément."
 
-#: utils/misc/guc.c:2642
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Initialise la liste des chiffrements SSL autorisés."
+#: utils/misc/guc.c:1995
+msgid "WAL sender sleep time between WAL replications."
+msgstr ""
+"Temps d'endormissement du processus d'envoi des journaux de transactions entre\n"
+"les réplications des journaux de transactions."
 
-#: utils/misc/guc.c:2653
-msgid "Sets the application name to be reported in statistics and logs."
-msgstr "Configure le nom de l'application à indiquer dans les statistiques et les journaux."
+#: utils/misc/guc.c:2006
+msgid "Sets the maximum time to wait for WAL replication."
+msgstr "Initialise le temps maximum à attendre pour la réplication des WAL."
 
-#: utils/misc/guc.c:2672
-msgid "Sets whether \"\\'\" is allowed in string literals."
-msgstr "Indique si « \\' » est autorisé dans une constante de chaîne."
+#: utils/misc/guc.c:2017
+msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
+msgstr ""
+"Initialise le délai en microsecondes entre l'acceptation de la transaction\n"
+"et le vidage du journal de transaction sur disque."
 
-#: utils/misc/guc.c:2681
-msgid "Sets the output format for bytea."
-msgstr "Initialise le format de sortie pour bytea."
+#: utils/misc/guc.c:2028
+msgid "Sets the minimum concurrent open transactions before performing commit_delay."
+msgstr ""
+"Initialise le nombre minimum de transactions ouvertes simultanément avant le\n"
+"commit_delay."
 
-#: utils/misc/guc.c:2690
-msgid "Sets the message levels that are sent to the client."
-msgstr "Initialise les niveaux de message envoyés au client."
+#: utils/misc/guc.c:2039
+msgid "Sets the number of digits displayed for floating-point values."
+msgstr "Initialise le nombre de chiffres affichés pour les valeurs à virgule flottante."
 
-#: utils/misc/guc.c:2691
-#: utils/misc/guc.c:2740
-#: utils/misc/guc.c:2750
-#: utils/misc/guc.c:2790
-msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
+#: utils/misc/guc.c:2040
+msgid "This affects real, double precision, and geometric data types. The parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate)."
 msgstr ""
-"Chaque niveau inclut les niveaux qui suivent. Plus loin sera le niveau,\n"
-"moindre sera le nombre de messages envoyés."
-
-#: utils/misc/guc.c:2700
-msgid "Enables the planner to use constraints to optimize queries."
-msgstr "Active l'utilisation des contraintes par le planificateur pour optimiser les requêtes."
+"Ceci affecte les types de données real, double precision et géométriques.\n"
+"La valeur du paramètre est ajoutée au nombre standard de chiffres (FLT_DIG\n"
+"ou DBL_DIG comme approprié)."
 
-#: utils/misc/guc.c:2701
-msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
+#: utils/misc/guc.c:2051
+msgid "Sets the minimum execution time above which statements will be logged."
 msgstr ""
-"Les parcours de tables seront ignorés si leur contraintes garantissent\n"
-"qu'aucune ligne ne correspond à la requête."
+"Initialise le temps d'exécution minimum au-dessus de lequel les instructions\n"
+"seront tracées."
 
-#: utils/misc/guc.c:2711
-msgid "Sets the transaction isolation level of each new transaction."
-msgstr "Initialise le niveau d'isolation des transactions pour chaque nouvelle transaction."
+#: utils/misc/guc.c:2053
+msgid "Zero prints all queries. -1 turns this feature off."
+msgstr "Zéro affiche toutes les requêtes. -1 désactive cette fonctionnalité."
 
-#: utils/misc/guc.c:2720
-msgid "Sets the display format for interval values."
-msgstr "Initialise le format d'affichage des valeurs interval."
+#: utils/misc/guc.c:2063
+msgid "Sets the minimum execution time above which autovacuum actions will be logged."
+msgstr ""
+"Initialise le temps d'exécution minimum au-dessus duquel les actions\n"
+"autovacuum seront tracées."
 
-#: utils/misc/guc.c:2730
-msgid "Sets the verbosity of logged messages."
-msgstr "Initialise la verbosité des messages tracés."
+#: utils/misc/guc.c:2065
+msgid "Zero prints all actions. -1 turns autovacuum logging off."
+msgstr "Zéro affiche toutes les requêtes. -1 désactive cette fonctionnalité."
 
-#: utils/misc/guc.c:2739
-msgid "Sets the message levels that are logged."
-msgstr "Initialise les niveaux de messages tracés."
+#: utils/misc/guc.c:2075
+msgid "Background writer sleep time between rounds."
+msgstr ""
+"Temps d'endormissement du processus d'écriture en tâche de fond en\n"
+"millisecondes."
 
-#: utils/misc/guc.c:2749
-msgid "Causes all statements generating error at or above this level to be logged."
+#: utils/misc/guc.c:2086
+msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr ""
-"Génère une trace pour toutes les instructions qui produisent une erreur de\n"
-"ce niveau ou de niveaux plus importants."
+"Nombre de pages LRU maximum à nettoyer par le processus d'écriture en\n"
+"tâche de fond."
 
-#: utils/misc/guc.c:2759
-msgid "Sets the type of statements logged."
-msgstr "Initialise le type d'instructions tracées."
+#: utils/misc/guc.c:2102
+msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
+msgstr "Nombre de requêtes simultanées pouvant être gérées efficacement par le sous-système disque."
 
-#: utils/misc/guc.c:2769
-msgid "Sets the syslog \"facility\" to be used when syslog enabled."
+#: utils/misc/guc.c:2103
+msgid "For RAID arrays, this should be approximately the number of drive spindles in the array."
 msgstr ""
-"Initialise le niveau (« facility ») de syslog à utilisé lors de l'activation\n"
-"de syslog."
+"Pour les systèmes RAID, cela devrait être approximativement le nombre de\n"
+"têtes de lecture du système."
 
-#: utils/misc/guc.c:2779
-msgid "Sets the session's behavior for triggers and rewrite rules."
+#: utils/misc/guc.c:2116
+msgid "Automatic log file rotation will occur after N minutes."
 msgstr ""
-"Configure le comportement des sessions pour les triggers et les règles de\n"
-"ré-écriture."
+"La rotation automatique des journaux applicatifs s'effectue toutes les N\n"
+"minutes."
+
+#: utils/misc/guc.c:2127
+msgid "Automatic log file rotation will occur after N kilobytes."
+msgstr "La rotation automatique des journaux applicatifs s'effectue après N Ko."
+
+#: utils/misc/guc.c:2138
+msgid "Shows the maximum number of function arguments."
+msgstr "Affiche le nombre maximum d'arguments de fonction."
 
-#: utils/misc/guc.c:2789
-msgid "Enables logging of recovery-related debugging information."
-msgstr "Active les traces sur les informations de débogage relatives à la restauration."
+#: utils/misc/guc.c:2149
+msgid "Shows the maximum number of index keys."
+msgstr "Affiche le nombre maximum de clés d'index."
 
-#: utils/misc/guc.c:2803
-msgid "Collects function-level statistics on database activity."
-msgstr "Récupère les statistiques niveau fonction sur l'activité de la base de données."
+#: utils/misc/guc.c:2160
+msgid "Shows the maximum identifier length."
+msgstr "Affiche la longueur maximum d'un identifiant"
 
-#: utils/misc/guc.c:2812
-msgid "Set the level of information written to the WAL."
-msgstr "Configure le niveau des informations écrites dans les journaux de transactions."
+#: utils/misc/guc.c:2171
+msgid "Shows the size of a disk block."
+msgstr "Affiche la taille d'un bloc de disque."
 
-#: utils/misc/guc.c:2821
-msgid "Selects the method used for forcing WAL updates to disk."
-msgstr ""
-"Sélectionne la méthode utilisée pour forcer la mise à jour des journaux de\n"
-"transactions sur le disque."
+#: utils/misc/guc.c:2182
+msgid "Shows the number of pages per disk file."
+msgstr "Affiche le nombre de pages par fichier."
 
-#: utils/misc/guc.c:2831
-msgid "Sets how binary values are to be encoded in XML."
-msgstr "Configure comment les valeurs binaires seront codées en XML."
+#: utils/misc/guc.c:2193
+msgid "Shows the block size in the write ahead log."
+msgstr "Affiche la taille du bloc dans les journaux de transactions."
 
-#: utils/misc/guc.c:2840
-msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
-msgstr ""
-"Configure si les données XML dans des opérations d'analyse et de\n"
-"sérialisation implicite doivent être considérées comme des documents\n"
-"ou des fragments de contenu."
+#: utils/misc/guc.c:2204
+msgid "Shows the number of pages per write ahead log segment."
+msgstr "Affiche le nombre de pages par journal de transactions."
 
-#: utils/misc/guc.c:3612
-#, c-format
-msgid ""
-"%s does not know where to find the server configuration file.\n"
-"You must specify the --config-file or -D invocation option or set the PGDATA environment variable.\n"
-msgstr ""
-"%s ne sait pas où trouver le fichier de configuration du serveur.\n"
-"Vous devez soit spécifier l'option --config-file soit spécifier l'option -D\n"
-"soit initialiser la variable d'environnement.\n"
+#: utils/misc/guc.c:2217
+msgid "Time to sleep between autovacuum runs."
+msgstr "Durée d'endormissement entre deux exécutions d'autovacuum."
 
-#: utils/misc/guc.c:3631
-#, c-format
-msgid "%s cannot access the server configuration file \"%s\": %s\n"
-msgstr "%s ne peut pas accéder au fichier de configuration « %s » : %s\n"
+#: utils/misc/guc.c:2227
+msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgstr "Nombre minimum de lignes mises à jour ou supprimées avant le VACUUM."
 
-#: utils/misc/guc.c:3651
-#, c-format
-msgid ""
-"%s does not know where to find the database system data.\n"
-"This can be specified as \"data_directory\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s ne sait pas où trouver les données du système de bases de données.\n"
-"Il est configurable avec « data_directory » dans « %s » ou avec l'option -D\n"
-"ou encore avec la variable d'environnement PGDATA.\n"
+#: utils/misc/guc.c:2236
+msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
+msgstr "Nombre minimum de lignes insérées, mises à jour ou supprimées avant un ANALYZE."
 
-#: utils/misc/guc.c:3682
-#, c-format
-msgid ""
-"%s does not know where to find the \"hba\" configuration file.\n"
-"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
+#: utils/misc/guc.c:2246
+msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
-"%s ne sait pas où trouver le fichier de configuration « hba ».\n"
-"Il est configurable avec « hba_file » dans « %s » ou avec l'option -D ou\n"
-"encore avec la variable d'environnement PGDATA.\n"
+"Âge à partir duquel l'autovacuum se déclenche sur une table pour empêcher la\n"
+"réinitialisation de l'identifiant de transaction"
 
-#: utils/misc/guc.c:3705
-#, c-format
-msgid ""
-"%s does not know where to find the \"ident\" configuration file.\n"
-"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s ne sait pas où trouver le fichier de configuration « hba ».\n"
-"Il est configurable avec « ident_file » dans « %s » ou avec l'option -D ou\n"
-"encore avec la variable d'environnement PGDATA.\n"
+#: utils/misc/guc.c:2257
+msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
+msgstr "Initialise le nombre maximum de processus autovacuum exécutés simultanément."
 
-#: utils/misc/guc.c:4310
-#: utils/misc/guc.c:4474
-msgid "Value exceeds integer range."
-msgstr "La valeur dépasse l'échelle des entiers."
+#: utils/misc/guc.c:2267
+msgid "Time between issuing TCP keepalives."
+msgstr "Secondes entre l'exécution de « TCP keepalives »."
 
-#: utils/misc/guc.c:4329
-msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
-msgstr "Les unités valides pour ce paramètre sont « kB », « MB » et « GB »."
+#: utils/misc/guc.c:2268
+#: utils/misc/guc.c:2279
+msgid "A value of 0 uses the system default."
+msgstr "Une valeur de 0 désactive la valeur système par défaut."
 
-#: utils/misc/guc.c:4388
-msgid "Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
+#: utils/misc/guc.c:2278
+msgid "Time between TCP keepalive retransmits."
+msgstr "Secondes entre les retransmissions de « TCP keepalive »."
+
+#: utils/misc/guc.c:2289
+msgid "Set the amount of traffic to send and receive before renegotiating the encryption keys."
 msgstr ""
-"Les unités valides pour ce paramètre sont « ms », « s », « min », « h » et\n"
-"« d »."
+"Configure la quantité de trafic à envoyer et recevoir avant la renégotiation\n"
+"des clés d'enchiffrement."
 
-#: utils/misc/guc.c:4697
-#: utils/misc/guc.c:5361
-#: utils/misc/guc.c:5411
-#: utils/misc/guc.c:6115
-#: utils/misc/guc.c:6274
-#: utils/misc/guc.c:7496
-#: guc-file.l:217
-#, c-format
-msgid "unrecognized configuration parameter \"%s\""
-msgstr "paramètre de configuration « %s » non reconnu"
+#: utils/misc/guc.c:2300
+msgid "Maximum number of TCP keepalive retransmits."
+msgstr "Nombre maximum de retransmissions de « TCP keepalive »."
 
-#: utils/misc/guc.c:4724
-#, c-format
-msgid "parameter \"%s\" cannot be changed"
-msgstr "le paramètre « %s » ne peut pas être changé"
+#: utils/misc/guc.c:2301
+msgid "This controls the number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
+msgstr ""
+"Ceci contrôle le nombre de retransmissions keepalive consécutives qui\n"
+"peuvent être perdues avant qu'une connexion ne soit considérée morte. Une\n"
+"valeur de 0 utilise la valeur par défaut du système."
 
-#: utils/misc/guc.c:4741
-#: utils/misc/guc.c:4749
-#: guc-file.l:264
-#, c-format
-msgid "parameter \"%s\" cannot be changed without restarting the server"
-msgstr "le paramètre « %s » ne peut pas être modifié sans redémarrer le serveur"
+#: utils/misc/guc.c:2312
+msgid "Sets the maximum allowed result for exact search by GIN."
+msgstr "Configure le nombre maximum de résultats lors d'une recherche par GIN."
 
-#: utils/misc/guc.c:4759
-#, c-format
-msgid "parameter \"%s\" cannot be changed now"
-msgstr "le paramètre « %s » ne peut pas être modifié maintenant"
+#: utils/misc/guc.c:2323
+msgid "Sets the planner's assumption about the size of the disk cache."
+msgstr "Initialise le sentiment du planificateur sur la taille du cache disque."
 
-#: utils/misc/guc.c:4790
-#, c-format
-msgid "parameter \"%s\" cannot be set after connection start"
-msgstr "le paramètre « %s » ne peut pas être initialisé après le lancement du serveur"
+#: utils/misc/guc.c:2324
+msgid "That is, the portion of the kernel's disk cache that will be used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
+msgstr ""
+"C'est-à-dire, la portion du cache disque du noyau qui sera utilisé pour les\n"
+"fichiers de données de PostgreSQL. C'est mesuré en pages disque, qui font\n"
+"normalement 8 Ko chaque."
 
-#: utils/misc/guc.c:4800
-#: utils/misc/guc.c:7511
-#, c-format
-msgid "permission denied to set parameter \"%s\""
-msgstr "droit refusé pour initialiser le paramètre « %s »"
+#: utils/misc/guc.c:2337
+msgid "Shows the server version as an integer."
+msgstr "Affiche la version du serveur sous la forme d'un entier."
 
-#: utils/misc/guc.c:4838
-#, c-format
-msgid "cannot set parameter \"%s\" within security-definer function"
+#: utils/misc/guc.c:2348
+msgid "Log the use of temporary files larger than this number of kilobytes."
 msgstr ""
-"ne peut pas configurer le paramètre « %s » à l'intérieur d'une fonction\n"
-"SECURITY DEFINER"
+"Trace l'utilisation de fichiers temporaires plus gros que ce nombre de\n"
+"kilooctets."
 
-#: utils/misc/guc.c:4846
-#: utils/init/miscinit.c:380
-#, c-format
-msgid "cannot set parameter \"%s\" within security-restricted operation"
+#: utils/misc/guc.c:2349
+msgid "Zero logs all files. The default is -1 (turning this feature off)."
 msgstr ""
-"ne peut pas configurer le paramètre « %s » à l'intérieur d'une fonction\n"
-"restreinte pour sécurité"
+"Zéro trace toutes les requêtes. La valeur par défaut est -1 (désactivant\n"
+"cette fonctionnalité)."
 
-#: utils/misc/guc.c:4917
-#: utils/misc/guc.c:4992
-#, c-format
-msgid "invalid value for parameter \"%s\": %d"
-msgstr "valeur invalide pour le paramètre « %s » : %d"
+#: utils/misc/guc.c:2359
+msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
+msgstr "Configure la taille réservée pour pg_stat_activity.current_query, en octets."
 
-#: utils/misc/guc.c:4961
-#: utils/misc/guc.c:5163
-#: utils/misc/guc.c:5229
-#: utils/misc/guc.c:5255
-#: guc-file.l:178
-#, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "valeur invalide pour le paramètre « %s » : « %s »"
+#: utils/misc/guc.c:2378
+msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
+msgstr ""
+"Initialise l'estimation du planificateur pour le coût d'une page disque\n"
+"récupérée séquentiellement."
 
-#: utils/misc/guc.c:4970
-#, c-format
-msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
-msgstr "%d est en dehors des limites valides pour le paramètre « %s » (%d .. %d)"
+#: utils/misc/guc.c:2388
+msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
+msgstr ""
+"Initialise l'estimation du plnnificateur pour le coût d'une page disque\n"
+"récupérée non séquentiellement."
 
-#: utils/misc/guc.c:5034
-#, c-format
-msgid "parameter \"%s\" requires a numeric value"
-msgstr "le paramètre « %s » requiert une valeur numérique"
+#: utils/misc/guc.c:2398
+msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
+msgstr ""
+"Initialise l'estimation du planificateur pour le coût d'exécution sur chaque\n"
+"ligne."
 
-#: utils/misc/guc.c:5042
-#, c-format
-msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
-msgstr "%g est en dehors des limites valides pour le paramètre « %s » (%g .. %g)"
+#: utils/misc/guc.c:2408
+msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
+msgstr ""
+"Initialise l'estimation du planificateur pour le coût de traitement de\n"
+"chaque ligne indexée lors d'un parcours d'index."
 
-#: utils/misc/guc.c:5064
-#, c-format
-msgid "invalid value for parameter \"%s\": %g"
-msgstr "valeur invalide pour le paramètre « %s » : %g"
+#: utils/misc/guc.c:2418
+msgid "Sets the planner's estimate of the cost of processing each operator or function call."
+msgstr ""
+"Initialise l'estimation du planificateur pour le coût de traitement de\n"
+"chaque opérateur ou appel de fonction."
 
-#: utils/misc/guc.c:5367
-#: utils/misc/guc.c:5415
-#: utils/misc/guc.c:6278
-#, c-format
-msgid "must be superuser to examine \"%s\""
-msgstr "doit être super-utilisateur pour examiner « %s »"
+#: utils/misc/guc.c:2429
+msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
+msgstr "Initialise l'estimation du planificateur de la fraction des lignes d'un curseur à récupérer."
 
-#: utils/misc/guc.c:5526
-#, c-format
-msgid "SET %s takes only one argument"
-msgstr "SET %s prend un seul argument"
+#: utils/misc/guc.c:2440
+msgid "GEQO: selective pressure within the population."
+msgstr "GEQO : pression sélective dans la population."
 
-#: utils/misc/guc.c:5753
-msgid "SET requires parameter name"
-msgstr "SET requiert le nom du paramètre"
+#: utils/misc/guc.c:2450
+msgid "GEQO: seed for random path selection."
+msgstr "GEQO : graine pour la sélection du chemin aléatoire."
 
-#: utils/misc/guc.c:5868
-#, c-format
-msgid "attempt to redefine parameter \"%s\""
-msgstr "tentative de redéfinition du paramètre « %s »"
+#: utils/misc/guc.c:2460
+msgid "Multiple of the average buffer usage to free per round."
+msgstr "Multiplede l'utilisation moyenne des tampons à libérer à chaque tour."
 
-#: utils/misc/guc.c:7212
-#, c-format
-msgid "could not parse setting for parameter \"%s\""
-msgstr "n'a pas pu analyser la configuration du paramètre « %s »"
+#: utils/misc/guc.c:2470
+msgid "Sets the seed for random-number generation."
+msgstr "Initialise la clé pour la génération de nombres aléatoires."
 
-#: utils/misc/guc.c:7555
-msgid "invalid list syntax for parameter \"log_destination\""
-msgstr "syntaxe de liste invalide pour le paramètre « log_destination »"
+#: utils/misc/guc.c:2481
+msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
+msgstr ""
+"Nombre de lignes modifiées ou supprimées avant d'exécuter un VACUUM\n"
+"(fraction de reltuples)."
 
-#: utils/misc/guc.c:7579
-#, c-format
-msgid "unrecognized \"log_destination\" key word: \"%s\""
-msgstr "mot clé « log_destination » non reconnu : « %s »"
+#: utils/misc/guc.c:2490
+msgid "Number of tuple inserts, updates or deletes prior to analyze as a fraction of reltuples."
+msgstr ""
+"Nombre de lignes insérées, mises à jour ou supprimées avant d'analyser\n"
+"(fraction de reltuples)."
 
-#: utils/misc/guc.c:7654
-msgid "SET AUTOCOMMIT TO OFF is no longer supported"
-msgstr "SET AUTOCOMMIT TO OFF n'est plus supporté"
+#: utils/misc/guc.c:2500
+msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
+msgstr ""
+"Temps passé à vider les tampons lors du point de vérification, en tant que\n"
+"fraction de l'intervalle du point de vérification."
 
-#: utils/misc/guc.c:7726
-msgid "assertion checking is not supported by this build"
-msgstr "la vérification de l'assertion n'a pas été intégrée lors de la compilation"
+#: utils/misc/guc.c:2519
+msgid "Sets the shell command that will be called to archive a WAL file."
+msgstr "La commande shell qui sera appelée pour archiver un journal de transaction."
 
-#: utils/misc/guc.c:7741
-msgid "Bonjour is not supported by this build"
-msgstr "Bonjour n'est pas supporté dans cette installation"
+#: utils/misc/guc.c:2529
+msgid "Sets the client's character set encoding."
+msgstr "Initialise l'encodage du client."
 
-#: utils/misc/guc.c:7756
-msgid "SSL is not supported by this build"
-msgstr "SSL n'est pas supporté dans cette installation"
+#: utils/misc/guc.c:2540
+msgid "Controls information prefixed to each log line."
+msgstr "Contrôle l'information préfixée sur chaque ligne de trace."
 
-#: utils/misc/guc.c:7770
-msgid "cannot enable parameter when \"log_statement_stats\" is true"
-msgstr "ne peut pas activer le paramètre avec « log_statement_stats » à true"
+#: utils/misc/guc.c:2541
+msgid "If blank, no prefix is used."
+msgstr "Si vide, aucun préfixe n'est utilisé."
 
-#: utils/misc/guc.c:7786
-msgid "cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true"
-msgstr ""
-"ne peut pas activer « log_statement_stats » lorsque « log_parser_stats »,\n"
-"« log_planner_stats » ou « log_executor_stats » est true"
+#: utils/misc/guc.c:2550
+msgid "Sets the time zone to use in log messages."
+msgstr "Initialise le fuseau horaire à utiliser pour les journaux applicatifs."
 
-#: utils/misc/guc.c:7804
-msgid "cannot set transaction read-write mode inside a read-only transaction"
-msgstr ""
-"ne peut pas initialiser le mode lecture-écriture de la transaction à\n"
-"l'intérieur d'une transaction en lecture seule"
+#: utils/misc/guc.c:2560
+msgid "Sets the display format for date and time values."
+msgstr "Initialise le format d'affichage des valeurs date et time."
+
+#: utils/misc/guc.c:2561
+msgid "Also controls interpretation of ambiguous date inputs."
+msgstr "Contrôle aussi l'interprétation des dates ambigues en entrée."
 
-#: utils/misc/guc.c:7815
-msgid "cannot set transaction read-write mode during recovery"
-msgstr ""
-"ne peut pas initialiser le mode lecture-écriture des transactions lors de la\n"
-"restauration"
+#: utils/misc/guc.c:2572
+msgid "Sets the default tablespace to create tables and indexes in."
+msgstr "Initialise le tablespace par défaut pour créer les tables et index."
 
-#: utils/misc/help_config.c:131
-msgid "internal error: unrecognized run-time parameter type\n"
-msgstr "erreur interne : type de paramètre d'exécution non reconnu\n"
+#: utils/misc/guc.c:2573
+msgid "An empty string selects the database's default tablespace."
+msgstr "Une chaîne vide sélectionne le tablespace par défaut de la base de données."
 
-#: guc-file.l:288
-#, c-format
-msgid "parameter \"%s\" removed from configuration file, reset to default"
+#: utils/misc/guc.c:2583
+msgid "Sets the tablespace(s) to use for temporary tables and sort files."
 msgstr ""
-"paramètre « %s » supprimé du fichier de configuration ;\n"
-"réinitialisation à la valeur par défaut"
+"Initialise le(s) tablespace(s) à utiliser pour les tables temporaires et les\n"
+"fichiers de tri."
 
-#: guc-file.l:344
-#, c-format
-msgid "parameter \"%s\" changed to \"%s\""
-msgstr "paramètre « %s » modifié par « %s »"
+#: utils/misc/guc.c:2594
+msgid "Sets the path for dynamically loadable modules."
+msgstr "Initialise le chemin des modules chargeables dynamiquement."
 
-#: guc-file.l:412
-#, c-format
-msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
+#: utils/misc/guc.c:2595
+msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e., the name does not contain a slash), the system will search this path for the specified file."
 msgstr ""
-"n'a pas pu ouvrir le fichier de configuration « %s » : profondeur\n"
-"d'imbrication dépassé"
-
-#: guc-file.l:575
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "erreur de syntaxe dans le fichier « %s », ligne %u, près de la fin de ligne"
+"Si un module chargeable dynamiquement a besoin d'être ouvert et que le nom\n"
+"spécifié n'a pas une composante répertoire (c'est-à-dire que le nom ne\n"
+"contient pas un '/'), le système cherche le fichier spécifié sur ce chemin."
 
-#: guc-file.l:580
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near token \"%s\""
-msgstr "erreur de syntaxe dans le fichier « %s », ligne %u, près du mot clé « %s »"
+#: utils/misc/guc.c:2608
+msgid "Sets the location of the Kerberos server key file."
+msgstr "Initalise l'emplacement du fichier de la clé serveur pour Kerberos."
 
-#: utils/error/assert.c:37
-msgid "TRAP: ExceptionalCondition: bad arguments\n"
-msgstr "TRAP : ExceptionalCondition : mauvais arguments\n"
+#: utils/misc/guc.c:2619
+msgid "Sets the name of the Kerberos service."
+msgstr "Initialise le nom du service Kerberos."
 
-#: utils/error/assert.c:40
-#, c-format
-msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP : %s(« %s », fichier : « %s », ligne : %d)\n"
+#: utils/misc/guc.c:2629
+msgid "Sets the Bonjour service name."
+msgstr "Initialise le nom du service Bonjour."
 
-#: utils/error/elog.c:1413
-#, c-format
-msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "n'a pas pu ré-ouvrir le fichier « %s » comme stderr : %m"
+#: utils/misc/guc.c:2641
+msgid "Shows the collation order locale."
+msgstr "Affiche la locale de tri et de groupement."
 
-#: utils/error/elog.c:1426
-#, c-format
-msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "n'a pas pu ré-ouvrir le fichier « %s » comme stdout : %m"
+#: utils/misc/guc.c:2652
+msgid "Shows the character classification and case conversion locale."
+msgstr "Affiche la classification des caractères et la locale de conversions."
 
-#: utils/error/elog.c:1815
-#: utils/error/elog.c:1825
-#: utils/error/elog.c:1835
-msgid "[unknown]"
-msgstr "[inconnu]"
+#: utils/misc/guc.c:2663
+msgid "Sets the language in which messages are displayed."
+msgstr "Initialise le langage dans lequel les messages sont affichés."
 
-#: utils/error/elog.c:2183
-#: utils/error/elog.c:2463
-#: utils/error/elog.c:2541
-msgid "missing error text"
-msgstr "texte d'erreur manquant"
+#: utils/misc/guc.c:2673
+msgid "Sets the locale for formatting monetary amounts."
+msgstr "Initialise la locale pour le formattage des montants monétaires."
 
-#: utils/error/elog.c:2186
-#: utils/error/elog.c:2189
-#: utils/error/elog.c:2544
-#: utils/error/elog.c:2547
-#, c-format
-msgid " at character %d"
-msgstr " au caractère %d"
+#: utils/misc/guc.c:2683
+msgid "Sets the locale for formatting numbers."
+msgstr "Initialise la locale pour formater les nombres."
 
-#: utils/error/elog.c:2199
-#: utils/error/elog.c:2206
-msgid "DETAIL:  "
-msgstr "DÉTAIL:  "
+#: utils/misc/guc.c:2693
+msgid "Sets the locale for formatting date and time values."
+msgstr "Initialise la locale pour formater les valeurs date et time."
 
-#: utils/error/elog.c:2213
-msgid "HINT:  "
-msgstr "ASTUCE :  "
+#: utils/misc/guc.c:2703
+msgid "Lists shared libraries to preload into server."
+msgstr "Liste les bibliothèques partagées à précharger dans le serveur."
 
-#: utils/error/elog.c:2220
-msgid "QUERY:  "
-msgstr "REQUÊTE :  "
+#: utils/misc/guc.c:2714
+msgid "Lists shared libraries to preload into each backend."
+msgstr "Liste les bibliothèques partagées à précharger dans chaque processus serveur."
 
-#: utils/error/elog.c:2227
-msgid "CONTEXT:  "
-msgstr "CONTEXTE :  "
+#: utils/misc/guc.c:2725
+msgid "Sets the schema search order for names that are not schema-qualified."
+msgstr ""
+"Initialise l'ordre de recherche des schémas pour les noms qui ne précisent\n"
+"pas le schéma."
 
-#: utils/error/elog.c:2237
-#, c-format
-msgid "LOCATION:  %s, %s:%d\n"
-msgstr "EMPLACEMENT :  %s, %s:%d\n"
+#: utils/misc/guc.c:2737
+msgid "Sets the server (database) character set encoding."
+msgstr "Initialise le codage des caractères pour le serveur (base de données)."
 
-#: utils/error/elog.c:2244
-#, c-format
-msgid "LOCATION:  %s:%d\n"
-msgstr "EMPLACEMENT :  %s:%d\n"
+#: utils/misc/guc.c:2749
+msgid "Shows the server version."
+msgstr "Affiche la version du serveur."
 
-#: utils/error/elog.c:2258
-msgid "STATEMENT:  "
-msgstr "INSTRUCTION :  "
+#: utils/misc/guc.c:2761
+msgid "Sets the current role."
+msgstr "Initialise le rôle courant."
 
-#. translator: This string will be truncated at 47
-#. characters expanded.
-#: utils/error/elog.c:2656
-#, c-format
-msgid "operating system error %d"
-msgstr "erreur %d du système d'exploitation"
+#: utils/misc/guc.c:2773
+msgid "Sets the session user name."
+msgstr "Initialise le nom de l'utilisateur de la session."
 
-#: utils/error/elog.c:2679
-msgid "DEBUG"
-msgstr "DEBUG"
+#: utils/misc/guc.c:2784
+msgid "Sets the destination for server log output."
+msgstr "Initialise la destination des journaux applicatifs du serveur."
 
-#: utils/error/elog.c:2683
-msgid "LOG"
-msgstr "LOG"
+#: utils/misc/guc.c:2785
+msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and \"eventlog\", depending on the platform."
+msgstr ""
+"Les valeurs valides sont une combinaison de « stderr », « syslog »,\n"
+"« csvlog » et « eventlog », suivant la plateforme."
 
-#: utils/error/elog.c:2686
-msgid "INFO"
-msgstr "INFO"
+#: utils/misc/guc.c:2796
+msgid "Sets the destination directory for log files."
+msgstr "Initialise le répertoire de destination pour les journaux applicatifs."
 
-#: utils/error/elog.c:2689
-msgid "NOTICE"
-msgstr "NOTICE"
+#: utils/misc/guc.c:2797
+msgid "Can be specified as relative to the data directory or as absolute path."
+msgstr "Accepte un chemin relatif ou absolu pour le répertoire des données."
 
-#: utils/error/elog.c:2692
-msgid "WARNING"
-msgstr "ATTENTION"
+#: utils/misc/guc.c:2807
+msgid "Sets the file name pattern for log files."
+msgstr "Initialise le modèle de nom de fichiers pour les journaux applicatifs."
 
-#: utils/error/elog.c:2695
-msgid "ERROR"
-msgstr "ERREUR"
+#: utils/misc/guc.c:2818
+msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+msgstr ""
+"Initialise le nom du programme utilisé pour identifier les messages de\n"
+"PostgreSQL dans syslog."
 
-#: utils/error/elog.c:2698
-msgid "FATAL"
-msgstr "FATAL"
+#: utils/misc/guc.c:2829
+msgid "Sets the time zone for displaying and interpreting time stamps."
+msgstr "Initialise la zone horaire pour afficher et interpréter les dates/heures."
 
-#: utils/error/elog.c:2701
-msgid "PANIC"
-msgstr "PANIC"
+#: utils/misc/guc.c:2839
+msgid "Selects a file of time zone abbreviations."
+msgstr "Sélectionne un fichier contenant les abréviations des fuseaux horaires."
 
-#: utils/fmgr/dfmgr.c:125
-#, c-format
-msgid "could not find function \"%s\" in file \"%s\""
-msgstr "n'a pas pu trouver la fonction « %s » dans le fichier « %s »"
+#: utils/misc/guc.c:2849
+msgid "Sets the current transaction's isolation level."
+msgstr "Initialise le niveau d'isolation de la transaction courante."
 
-#: utils/fmgr/dfmgr.c:204
-#: utils/fmgr/dfmgr.c:413
-#: utils/fmgr/dfmgr.c:461
-#, c-format
-msgid "could not access file \"%s\": %m"
-msgstr "n'a pas pu accéder au fichier « %s » : %m"
+#: utils/misc/guc.c:2860
+msgid "Sets the owning group of the Unix-domain socket."
+msgstr "Initialise le groupe d'appartenance du socket domaine Unix."
 
-#: utils/fmgr/dfmgr.c:242
-#, c-format
-msgid "could not load library \"%s\": %s"
-msgstr "n'a pas pu charger la bibliothèque « %s » : %s"
+#: utils/misc/guc.c:2861
+msgid "The owning user of the socket is always the user that starts the server."
+msgstr "Le propriétaire du socket est toujours l'utilisateur qui a lancé le serveur."
 
-#: utils/fmgr/dfmgr.c:274
-#, c-format
-msgid "incompatible library \"%s\": missing magic block"
-msgstr "bibliothèque « %s » incompatible : bloc magique manquant"
+#: utils/misc/guc.c:2871
+msgid "Sets the directory where the Unix-domain socket will be created."
+msgstr "Initialise le répertoire où le socket domaine Unix sera créé."
 
-#: utils/fmgr/dfmgr.c:276
-msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
-msgstr ""
-"Les bibliothèques étendues nécessitent l'utilisation de la macro\n"
-"PG_MODULE_MAGIC."
+#: utils/misc/guc.c:2882
+msgid "Sets the host name or IP address(es) to listen to."
+msgstr "Initialise le nom de l'hôte ou l'adresse IP à écouter."
 
-#: utils/fmgr/dfmgr.c:312
-#, c-format
-msgid "incompatible library \"%s\": version mismatch"
-msgstr "bibliothèque « %s » incompatible : versions différentes"
+#: utils/misc/guc.c:2893
+msgid "Sets the list of known custom variable classes."
+msgstr "Initialise la liste des classes variables personnalisées connues."
 
-#: utils/fmgr/dfmgr.c:314
-#, c-format
-msgid "Server is version %d.%d, library is version %d.%d."
-msgstr "La version du serveur est %d.%d, celle de la bibliothèque est %d.%d."
+#: utils/misc/guc.c:2904
+msgid "Sets the server's data directory."
+msgstr "Initialise le répertoire des données du serveur."
 
-#: utils/fmgr/dfmgr.c:333
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "Le serveur a FUNC_MAX_ARGS = %d, la bibliothèque a %d."
+#: utils/misc/guc.c:2915
+msgid "Sets the server's main configuration file."
+msgstr "Voir le fichier de configuration principal du serveur."
 
-#: utils/fmgr/dfmgr.c:342
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "Le serveur a INDEX_MAX_KEYS = %d, la bibliothèque a %d."
+#: utils/misc/guc.c:2926
+msgid "Sets the server's \"hba\" configuration file."
+msgstr "Initialise le fichier de configuration « hba » du serveur."
 
-#: utils/fmgr/dfmgr.c:351
-#, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "Le serveur a NAMEDATALEN = %d, la bibliothèque a %d."
+#: utils/misc/guc.c:2937
+msgid "Sets the server's \"ident\" configuration file."
+msgstr "Initialise le fichier de configuration « ident » du serveur."
 
-#: utils/fmgr/dfmgr.c:360
-#, c-format
-msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
-msgstr "Le serveur a FLOAT4PASSBYVAL = %s, la bibliothèque a %s."
+#: utils/misc/guc.c:2948
+msgid "Writes the postmaster PID to the specified file."
+msgstr "Écrit le PID du postmaster PID dans le fichier spécifié."
 
-#: utils/fmgr/dfmgr.c:369
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "Le serveur a FLOAT8PASSBYVAL = %s, la bibliothèque a %s."
+#: utils/misc/guc.c:2959
+msgid "Writes temporary statistics files to the specified directory."
+msgstr "Écrit les fichiers statistiques temporaires dans le répertoire indiqué."
 
-#: utils/fmgr/dfmgr.c:376
-msgid "Magic block has unexpected length or padding difference."
-msgstr "Le bloc magique a une longueur inattendue ou une différence de padding."
+#: utils/misc/guc.c:2970
+msgid "List of names of potential synchronous standbys."
+msgstr "Liste de noms de serveurs standbys synchrones potentiels."
 
-#: utils/fmgr/dfmgr.c:379
-#, c-format
-msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "bibliothèque « %s » incompatible : différences dans le bloc magique"
+#: utils/misc/guc.c:2981
+msgid "Sets default text search configuration."
+msgstr "Initialise le configuration par défaut de la recherche plein texte"
 
-#: utils/fmgr/dfmgr.c:545
-#, c-format
-msgid "access to library \"%s\" is not allowed"
-msgstr "l'accès à la bibliothèque « %s » n'est pas autorisé"
+#: utils/misc/guc.c:2991
+msgid "Sets the list of allowed SSL ciphers."
+msgstr "Initialise la liste des chiffrements SSL autorisés."
 
-#: utils/fmgr/dfmgr.c:572
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "nom de macro invalide dans le chemin des bibliothèques partagées : %s"
+#: utils/misc/guc.c:3006
+msgid "Sets the application name to be reported in statistics and logs."
+msgstr "Configure le nom de l'application à indiquer dans les statistiques et les journaux."
 
-#: utils/fmgr/dfmgr.c:617
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "composant de longueur zéro dans le paramètre « dynamic_library_path »"
+#: utils/misc/guc.c:3026
+msgid "Sets whether \"\\'\" is allowed in string literals."
+msgstr "Indique si « \\' » est autorisé dans une constante de chaîne."
 
-#: utils/fmgr/dfmgr.c:636
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "Un composant du paramètre « dynamic_library_path » n'est pas un chemin absolu"
+#: utils/misc/guc.c:3036
+msgid "Sets the output format for bytea."
+msgstr "Initialise le format de sortie pour bytea."
 
-#: utils/fmgr/fmgr.c:264
-#, c-format
-msgid "internal function \"%s\" is not in internal lookup table"
-msgstr "la fonction interne « %s » n'est pas dans une table de recherche interne"
+#: utils/misc/guc.c:3046
+msgid "Sets the message levels that are sent to the client."
+msgstr "Initialise les niveaux de message envoyés au client."
 
-#: utils/fmgr/fmgr.c:468
-#, c-format
-msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "version API %d non reconnue mais rapportée par la fonction info « %s »"
+#: utils/misc/guc.c:3047
+#: utils/misc/guc.c:3100
+#: utils/misc/guc.c:3111
+#: utils/misc/guc.c:3167
+msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
+msgstr ""
+"Chaque niveau inclut les niveaux qui suivent. Plus loin sera le niveau,\n"
+"moindre sera le nombre de messages envoyés."
 
-#: utils/fmgr/fmgr.c:839
-#: utils/fmgr/fmgr.c:2071
-#, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr "la fonction %u a trop d'arguments (%d, le maximum étant %d)"
+#: utils/misc/guc.c:3057
+msgid "Enables the planner to use constraints to optimize queries."
+msgstr "Active l'utilisation des contraintes par le planificateur pour optimiser les requêtes."
 
-#: utils/fmgr/funcapi.c:354
-#, c-format
-msgid "could not determine actual result type for function \"%s\" declared to return type %s"
+#: utils/misc/guc.c:3058
+msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
 msgstr ""
-"n'a pas pu déterminer le type du résultat actuel pour la fonction « %s »\n"
-"déclarant retourner le type %s"
+"Les parcours de tables seront ignorés si leur contraintes garantissent\n"
+"qu'aucune ligne ne correspond à la requête."
 
-#: utils/fmgr/funcapi.c:1187
-#: utils/fmgr/funcapi.c:1218
-msgid "number of aliases does not match number of columns"
-msgstr "le nombre d'alias ne correspond pas au nombre de colonnes"
+#: utils/misc/guc.c:3068
+msgid "Sets the transaction isolation level of each new transaction."
+msgstr "Initialise le niveau d'isolation des transactions pour chaque nouvelle transaction."
 
-#: utils/fmgr/funcapi.c:1212
-msgid "no column alias was provided"
-msgstr "aucun alias de colonne n'a été fourni"
+#: utils/misc/guc.c:3078
+msgid "Sets the display format for interval values."
+msgstr "Initialise le format d'affichage des valeurs interval."
 
-#: utils/fmgr/funcapi.c:1236
-msgid "could not determine row description for function returning record"
+#: utils/misc/guc.c:3089
+msgid "Sets the verbosity of logged messages."
+msgstr "Initialise la verbosité des messages tracés."
+
+#: utils/misc/guc.c:3099
+msgid "Sets the message levels that are logged."
+msgstr "Initialise les niveaux de messages tracés."
+
+#: utils/misc/guc.c:3110
+msgid "Causes all statements generating error at or above this level to be logged."
 msgstr ""
-"n'a pas pu déterminer la description de la ligne pour la fonction renvoyant\n"
-"l'enregistrement"
+"Génère une trace pour toutes les instructions qui produisent une erreur de\n"
+"ce niveau ou de niveaux plus importants."
 
-#: utils/init/miscinit.c:114
-#, c-format
-msgid "could not change directory to \"%s\": %m"
-msgstr "n'a pas pu modifier le répertoire par « %s » : %m"
+#: utils/misc/guc.c:3121
+msgid "Sets the type of statements logged."
+msgstr "Initialise le type d'instructions tracées."
 
-#: utils/init/miscinit.c:441
-#, c-format
-msgid "role \"%s\" is not permitted to log in"
-msgstr "le rôle « %s » n'est pas autorisé à se connecter"
+#: utils/misc/guc.c:3131
+msgid "Sets the syslog \"facility\" to be used when syslog enabled."
+msgstr ""
+"Initialise le niveau (« facility ») de syslog à utilisé lors de l'activation\n"
+"de syslog."
 
-#: utils/init/miscinit.c:459
-#, c-format
-msgid "too many connections for role \"%s\""
-msgstr "trop de connexions pour le rôle « %s »"
+#: utils/misc/guc.c:3146
+msgid "Sets the session's behavior for triggers and rewrite rules."
+msgstr ""
+"Configure le comportement des sessions pour les triggers et les règles de\n"
+"ré-écriture."
 
-#: utils/init/miscinit.c:519
-msgid "permission denied to set session authorization"
-msgstr "droit refusé pour initialiser une autorisation de session"
+#: utils/misc/guc.c:3156
+msgid "Sets the current transaction's synchronization level."
+msgstr "Initialise le niveau d'isolation de la transaction courante."
 
-#: utils/init/miscinit.c:599
-#, c-format
-msgid "invalid role OID: %u"
-msgstr "OID du rôle invalide : %u"
+#: utils/misc/guc.c:3166
+msgid "Enables logging of recovery-related debugging information."
+msgstr "Active les traces sur les informations de débogage relatives à la restauration."
 
-#: utils/init/miscinit.c:731
-#, c-format
-msgid "could not create lock file \"%s\": %m"
-msgstr "n'a pas pu créer le fichier verrou « %s » : %m"
+#: utils/misc/guc.c:3182
+msgid "Collects function-level statistics on database activity."
+msgstr "Récupère les statistiques niveau fonction sur l'activité de la base de données."
 
-#: utils/init/miscinit.c:745
-#, c-format
-msgid "could not open lock file \"%s\": %m"
-msgstr "n'a pas pu ouvrir le fichier verrou « %s » : %m"
+#: utils/misc/guc.c:3192
+msgid "Set the level of information written to the WAL."
+msgstr "Configure le niveau des informations écrites dans les journaux de transactions."
 
-#: utils/init/miscinit.c:751
-#, c-format
-msgid "could not read lock file \"%s\": %m"
-msgstr "n'a pas pu lire le fichier verrou « %s » : %m"
+#: utils/misc/guc.c:3202
+msgid "Selects the method used for forcing WAL updates to disk."
+msgstr ""
+"Sélectionne la méthode utilisée pour forcer la mise à jour des journaux de\n"
+"transactions sur le disque."
 
-#: utils/init/miscinit.c:799
-#, c-format
-msgid "lock file \"%s\" already exists"
-msgstr "le fichier verrou « %s » existe déjà"
+#: utils/misc/guc.c:3212
+msgid "Sets how binary values are to be encoded in XML."
+msgstr "Configure comment les valeurs binaires seront codées en XML."
 
-#: utils/init/miscinit.c:803
-#, c-format
-msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+#: utils/misc/guc.c:3222
+msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
 msgstr ""
-"Un autre postgres (de PID %d) est-il déjà lancé avec comme répertoire de\n"
-"données « %s » ?"
+"Configure si les données XML dans des opérations d'analyse et de\n"
+"sérialisation implicite doivent être considérées comme des documents\n"
+"ou des fragments de contenu."
 
-#: utils/init/miscinit.c:805
+#: utils/misc/guc.c:4064
 #, c-format
-msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgid ""
+"%s does not know where to find the server configuration file.\n"
+"You must specify the --config-file or -D invocation option or set the PGDATA environment variable.\n"
 msgstr ""
-"Un autre postmaster (de PID %d) est-il déjà lancé avec comme répertoire de\n"
-"données « %s » ?"
+"%s ne sait pas où trouver le fichier de configuration du serveur.\n"
+"Vous devez soit spécifier l'option --config-file soit spécifier l'option -D\n"
+"soit initialiser la variable d'environnement.\n"
 
-#: utils/init/miscinit.c:808
+#: utils/misc/guc.c:4083
 #, c-format
-msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr "Un autre postgres (de PID %d) est-il déjà lancé en utilisant la socket « %s » ?"
+msgid "%s cannot access the server configuration file \"%s\": %s\n"
+msgstr "%s ne peut pas accéder au fichier de configuration « %s » : %s\n"
 
-#: utils/init/miscinit.c:810
+#: utils/misc/guc.c:4103
 #, c-format
-msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr "Un autre postmaster (de PID %d) est-il déjà lancé en utilisant la socket « %s » ?"
+msgid ""
+"%s does not know where to find the database system data.\n"
+"This can be specified as \"data_directory\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s ne sait pas où trouver les données du système de bases de données.\n"
+"Il est configurable avec « data_directory » dans « %s » ou avec l'option -D\n"
+"ou encore avec la variable d'environnement PGDATA.\n"
 
-#: utils/init/miscinit.c:841
+#: utils/misc/guc.c:4134
 #, c-format
-msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgid ""
+"%s does not know where to find the \"hba\" configuration file.\n"
+"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
 msgstr ""
-"le bloc de mémoire partagé pré-existant (clé %lu, ID %lu) est en cours\n"
-"d'utilisation"
+"%s ne sait pas où trouver le fichier de configuration « hba ».\n"
+"Il est configurable avec « hba_file » dans « %s » ou avec l'option -D ou\n"
+"encore avec la variable d'environnement PGDATA.\n"
 
-#: utils/init/miscinit.c:844
+#: utils/misc/guc.c:4157
 #, c-format
-msgid "If you're sure there are no old server processes still running, remove the shared memory block or just delete the file \"%s\"."
+msgid ""
+"%s does not know where to find the \"ident\" configuration file.\n"
+"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
 msgstr ""
-"Si vous êtes sûr qu'aucun processus serveur n'est toujours en cours\n"
-"d'exécution, supprimez le bloc de mémoire partagée\n"
-"ou supprimez simplement le fichier « %s »."
+"%s ne sait pas où trouver le fichier de configuration « hba ».\n"
+"Il est configurable avec « ident_file » dans « %s » ou avec l'option -D ou\n"
+"encore avec la variable d'environnement PGDATA.\n"
 
-#: utils/init/miscinit.c:861
-#, c-format
-msgid "could not remove old lock file \"%s\": %m"
-msgstr "n'a pas pu supprimer le vieux fichier verrou « %s » : %m"
+#: utils/misc/guc.c:4737
+#: utils/misc/guc.c:4901
+msgid "Value exceeds integer range."
+msgstr "La valeur dépasse l'échelle des entiers."
 
-#: utils/init/miscinit.c:863
-msgid "The file seems accidentally left over, but it could not be removed. Please remove the file by hand and try again."
+#: utils/misc/guc.c:4756
+msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
+msgstr "Les unités valides pour ce paramètre sont « kB », « MB » et « GB »."
+
+#: utils/misc/guc.c:4815
+msgid "Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr ""
-"Le fichier semble avoir été oublié accidentellement mais il ne peut pas être\n"
-"supprimé. Merci de supprimer ce fichier manuellement et de ré-essayer."
+"Les unités valides pour ce paramètre sont « ms », « s », « min », « h » et\n"
+"« d »."
 
-#: utils/init/miscinit.c:885
-#: utils/init/miscinit.c:896
-#: utils/init/miscinit.c:906
+#: utils/misc/guc.c:5098
+#: utils/misc/guc.c:5867
+#: utils/misc/guc.c:5919
+#: utils/misc/guc.c:6592
+#: utils/misc/guc.c:6751
+#: utils/misc/guc.c:7912
+#: guc-file.l:203
 #, c-format
-msgid "could not write lock file \"%s\": %m"
-msgstr "n'a pas pu écrire le fichier verrou « %s » : %m"
+msgid "unrecognized configuration parameter \"%s\""
+msgstr "paramètre de configuration « %s » non reconnu"
 
-#: utils/init/miscinit.c:1112
-#: utils/init/miscinit.c:1125
+#: utils/misc/guc.c:5131
 #, c-format
-msgid "\"%s\" is not a valid data directory"
-msgstr "« %s » n'est pas un répertoire de données valide"
+msgid "parameter \"%s\" cannot be changed"
+msgstr "le paramètre « %s » ne peut pas être changé"
 
-#: utils/init/miscinit.c:1114
+#: utils/misc/guc.c:5160
+#: utils/misc/guc.c:5334
+#: utils/misc/guc.c:5431
+#: utils/misc/guc.c:5525
+#: utils/misc/guc.c:5639
+#: utils/misc/guc.c:5740
+#: guc-file.l:250
 #, c-format
-msgid "File \"%s\" is missing."
-msgstr "le fichier « %s » est manquant."
+msgid "parameter \"%s\" cannot be changed without restarting the server"
+msgstr "le paramètre « %s » ne peut pas être modifié sans redémarrer le serveur"
 
-#: utils/init/miscinit.c:1127
+#: utils/misc/guc.c:5170
 #, c-format
-msgid "File \"%s\" does not contain valid data."
-msgstr "le fichier « %s » ne contient aucune données valides."
+msgid "parameter \"%s\" cannot be changed now"
+msgstr "le paramètre « %s » ne peut pas être modifié maintenant"
 
-#: utils/init/miscinit.c:1129
-msgid "You might need to initdb."
-msgstr "Vous pouvez avoir besoin d'exécuter initdb."
+#: utils/misc/guc.c:5201
+#, c-format
+msgid "parameter \"%s\" cannot be set after connection start"
+msgstr "le paramètre « %s » ne peut pas être initialisé après le lancement du serveur"
 
-#: utils/init/miscinit.c:1137
+#: utils/misc/guc.c:5211
+#: utils/misc/guc.c:7927
 #, c-format
-msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s."
-msgstr ""
-"Le répertoire des données a été initialisé avec PostgreSQL version %ld.%ld,\n"
-"qui est non compatible avec cette version %s."
+msgid "permission denied to set parameter \"%s\""
+msgstr "droit refusé pour initialiser le paramètre « %s »"
 
-#: utils/init/miscinit.c:1185
+#: utils/misc/guc.c:5249
 #, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "syntaxe de liste invalide pour le paramètre « %s »"
+msgid "cannot set parameter \"%s\" within security-definer function"
+msgstr ""
+"ne peut pas configurer le paramètre « %s » à l'intérieur d'une fonction\n"
+"SECURITY DEFINER"
 
-#: utils/init/miscinit.c:1222
+#: utils/misc/guc.c:5395
+#: utils/misc/guc.c:5709
+#: utils/misc/guc.c:8091
+#: utils/misc/guc.c:8125
 #, c-format
-msgid "loaded library \"%s\""
-msgstr "bibliothèque « %s » chargée"
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "valeur invalide pour le paramètre « %s » : « %s »"
 
-#: utils/init/postinit.c:229
+#: utils/misc/guc.c:5404
 #, c-format
-msgid "replication connection authorized: user=%s host=%s port=%s"
-msgstr "connexion de réplication autorisée : utilisateur=%s, base de données=%s, port=%s"
+msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
+msgstr "%d est en dehors des limites valides pour le paramètre « %s » (%d .. %d)"
 
-#: utils/init/postinit.c:235
+#: utils/misc/guc.c:5490
 #, c-format
-msgid "replication connection authorized: user=%s host=%s"
-msgstr "connexion de réplication autorisée : utilisateur=%s, base de données=%s"
+msgid "parameter \"%s\" requires a numeric value"
+msgstr "le paramètre « %s » requiert une valeur numérique"
 
-#: utils/init/postinit.c:241
+#: utils/misc/guc.c:5498
 #, c-format
-msgid "connection authorized: user=%s database=%s"
-msgstr "connexion autorisée : utilisateur=%s, base de données=%s"
+msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
+msgstr "%g est en dehors des limites valides pour le paramètre « %s » (%g .. %g)"
 
-#: utils/init/postinit.c:271
+#: utils/misc/guc.c:5875
+#: utils/misc/guc.c:5923
+#: utils/misc/guc.c:6755
 #, c-format
-msgid "database \"%s\" has disappeared from pg_database"
-msgstr "la base de données « %s » a disparu de pg_database"
+msgid "must be superuser to examine \"%s\""
+msgstr "doit être super-utilisateur pour examiner « %s »"
 
-#: utils/init/postinit.c:273
+#: utils/misc/guc.c:5989
 #, c-format
-msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "La base de données d'OID %u semble maintenant appartenir à « %s »."
+msgid "SET %s takes only one argument"
+msgstr "SET %s prend un seul argument"
+
+#: utils/misc/guc.c:6222
+msgid "SET requires parameter name"
+msgstr "SET requiert le nom du paramètre"
 
-#: utils/init/postinit.c:293
+#: utils/misc/guc.c:6337
 #, c-format
-msgid "database \"%s\" is not currently accepting connections"
-msgstr "la base de données « %s » n'accepte plus les connexions"
+msgid "attempt to redefine parameter \"%s\""
+msgstr "tentative de redéfinition du paramètre « %s »"
 
-#: utils/init/postinit.c:306
+#: utils/misc/guc.c:7628
 #, c-format
-msgid "permission denied for database \"%s\""
-msgstr "droit refusé pour la base de données « %s »"
+msgid "could not parse setting for parameter \"%s\""
+msgstr "n'a pas pu analyser la configuration du paramètre « %s »"
 
-#: utils/init/postinit.c:307
-msgid "User does not have CONNECT privilege."
-msgstr "L'utilisateur n'a pas le droit CONNECT."
+#: utils/misc/guc.c:7989
+#: utils/misc/guc.c:8023
+#, c-format
+msgid "invalid value for parameter \"%s\": %d"
+msgstr "valeur invalide pour le paramètre « %s » : %d"
 
-#: utils/init/postinit.c:324
+#: utils/misc/guc.c:8057
 #, c-format
-msgid "too many connections for database \"%s\""
-msgstr "trop de connexions pour la base de données « %s »"
+msgid "invalid value for parameter \"%s\": %g"
+msgstr "valeur invalide pour le paramètre « %s » : %g"
 
-#: utils/init/postinit.c:346
-#: utils/init/postinit.c:353
-msgid "database locale is incompatible with operating system"
-msgstr "la locale de la base de données est incompatible avec le système d'exploitation"
+#: utils/misc/guc.c:8247
+msgid "\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session."
+msgstr "« temp_buffers » ne peut pas être modifié après que des tables temporaires aient été utilisées dans la session."
 
-#: utils/init/postinit.c:347
-#, c-format
-msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
-msgstr ""
-"La base de données a été initialisée avec un LC_COLLATE à « %s »,\n"
-"qui n'est pas reconnu par setlocale()."
+#: utils/misc/guc.c:8259
+msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+msgstr "SET AUTOCOMMIT TO OFF n'est plus supporté"
 
-#: utils/init/postinit.c:349
-#: utils/init/postinit.c:356
-msgid "Recreate the database with another locale or install the missing locale."
-msgstr ""
-"Recréez la base de données avec une autre locale ou installez la locale\n"
-"manquante."
+#: utils/misc/guc.c:8334
+msgid "assertion checking is not supported by this build"
+msgstr "la vérification de l'assertion n'a pas été intégrée lors de la compilation"
 
-#: utils/init/postinit.c:354
-#, c-format
-msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
+#: utils/misc/guc.c:8347
+msgid "Bonjour is not supported by this build"
+msgstr "Bonjour n'est pas supporté dans cette installation"
+
+#: utils/misc/guc.c:8360
+msgid "SSL is not supported by this build"
+msgstr "SSL n'est pas supporté dans cette installation"
+
+#: utils/misc/guc.c:8372
+msgid "Cannot enable parameter when \"log_statement_stats\" is true."
+msgstr "Ne peut pas activer le paramètre avec « log_statement_stats » à true."
+
+#: utils/misc/guc.c:8384
+msgid "Cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr ""
-"La base de données a été initialisée avec un LC_CTYPE à « %s »,\n"
-"qui n'est pas reconnu par setlocale()."
+"Ne peut pas activer « log_statement_stats » lorsque « log_parser_stats »,\n"
+"« log_planner_stats » ou « log_executor_stats » est true."
 
-#: utils/init/postinit.c:608
-msgid "no roles are defined in this database system"
-msgstr "aucun rôle n'est défini dans le système de bases de données"
+#: utils/misc/help_config.c:131
+msgid "internal error: unrecognized run-time parameter type\n"
+msgstr "erreur interne : type de paramètre d'exécution non reconnu\n"
 
-#: utils/init/postinit.c:609
+#: utils/misc/tzparser.c:61
 #, c-format
-msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
-msgstr "Vous devez immédiatement exécuter « CREATE USER \"%s\" CREATEUSER; »."
-
-#: utils/init/postinit.c:632
-msgid "new replication connections are not allowed during database shutdown"
+msgid "time zone abbreviation \"%s\" is too long (maximum %d characters) in time zone file \"%s\", line %d"
 msgstr ""
-"les nouvelles connexions pour la réplication ne sont pas autorisées pendant\n"
-"l'arrêt du serveur de base de données"
+"l'abréviation « %s » du fuseau horaire est trop long (maximum %d caractères)\n"
+"dans le fichier de fuseaux horaires « %s », ligne %d"
 
-#: utils/init/postinit.c:636
-msgid "must be superuser to connect during database shutdown"
+#: utils/misc/tzparser.c:68
+#, c-format
+msgid "time zone offset %d is not a multiple of 900 sec (15 min) in time zone file \"%s\", line %d"
 msgstr ""
-"doit être super-utilisateur pour se connecter pendant un arrêt de la base de\n"
-"données"
+"le décalage %d du fuseau horaire n'est pas un multiples de 900 secondes\n"
+"(15 minutes) dans le fichier des fuseaux horaires « %s », ligne %d"
 
-#: utils/init/postinit.c:650
-msgid "remaining connection slots are reserved for non-replication superuser connections"
+#: utils/misc/tzparser.c:80
+#, c-format
+msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
 msgstr ""
-"les emplacements de connexions restants sont réservés pour les connexion\n"
-"superutilisateur non relatif à la réplication"
-
-#: utils/init/postinit.c:665
-msgid "must be superuser to start walsender"
-msgstr "doit être super-utilisateur pour exécuter walsender"
+"le décalage %d du fuseau horaire est en dehors des limites dans le fichier\n"
+"des fuseaux horaires « %s », ligne %d"
 
-#: utils/init/postinit.c:725
+#: utils/misc/tzparser.c:115
 #, c-format
-msgid "database %u does not exist"
-msgstr "la base de données « %u » n'existe pas"
-
-#: utils/init/postinit.c:777
-msgid "It seems to have just been dropped or renamed."
-msgstr "Cet objet semble avoir été tout juste supprimé ou renommé."
+msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
+msgstr "abréviation du fuseau horaire manquant dans le fichier « %s », ligne %d"
 
-#: utils/init/postinit.c:795
+#: utils/misc/tzparser.c:124
 #, c-format
-msgid "The database subdirectory \"%s\" is missing."
-msgstr "Le sous-répertoire de la base de données « %s » est manquant."
+msgid "missing time zone offset in time zone file \"%s\", line %d"
+msgstr "décalage du fuseau horaire manquant dans le fichier « %s », ligne %d"
 
-#: utils/init/postinit.c:800
+#: utils/misc/tzparser.c:131
 #, c-format
-msgid "could not access directory \"%s\": %m"
-msgstr "n'a pas pu accéder au répertoire « %s » : %m"
+msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
+msgstr ""
+"nombre invalide pour le décalage du fuseau horaire dans le fichier des\n"
+"fuseaux horaires « %s », ligne %d"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
+#: utils/misc/tzparser.c:154
 #, c-format
-msgid "unexpected encoding ID %d for ISO 8859 character sets"
-msgstr "identifiant d'encodage %d inattendu pour les jeux de caractères ISO-8859"
+msgid "invalid syntax in time zone file \"%s\", line %d"
+msgstr "syntaxe invalide dans le fichier des fuseaux horaires « %s », ligne %d"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#: utils/misc/tzparser.c:218
 #, c-format
-msgid "unexpected encoding ID %d for WIN character sets"
-msgstr "identifiant d'encodage %d inattendu pour les jeux de caractères WIN"
+msgid "time zone abbreviation \"%s\" is multiply defined"
+msgstr "l'abréviation « %s » du fuseau horaire est définie plusieurs fois"
 
-#: utils/mb/conv.c:509
+#: utils/misc/tzparser.c:220
 #, c-format
-msgid "invalid encoding number: %d"
-msgstr "numéro d'encodage invalide : %d"
+msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
+msgstr ""
+"L'entrée dans le fichier des fuseaux horaires « %s », ligne %d, est en\n"
+"conflit avec l'entrée du fichier « %s », ligne %d."
 
-#: utils/mb/encnames.c:485
-msgid "encoding name too long"
-msgstr "nom d'encodage trop long"
+#: utils/misc/tzparser.c:285
+#, c-format
+msgid "invalid time zone file name \"%s\""
+msgstr "nom du fichier de fuseaux horaires invalide : « %s »"
 
-#: utils/mb/mbutils.c:311
+#: utils/misc/tzparser.c:298
 #, c-format
-msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
+msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr ""
-"la fonction de conversion par défaut pour l'encodage de « %s » en « %s »\n"
-"n'existe pas"
+"limite de récursion dépassée dans le fichier « %s » (fichier des fuseaux\n"
+"horaires)"
 
-#: utils/mb/mbutils.c:335
-#: utils/mb/mbutils.c:607
+#: utils/misc/tzparser.c:337
+#: utils/misc/tzparser.c:350
 #, c-format
-msgid "String of %d bytes is too long for encoding conversion."
-msgstr "Une chaîne de %d octets est trop longue pour la conversion d'encodage."
+msgid "could not read time zone file \"%s\": %m"
+msgstr "n'a pas pu lire le fichier des fuseaux horaires « %s » : %m"
 
-#: utils/mb/mbutils.c:422
+#: utils/misc/tzparser.c:360
 #, c-format
-msgid "invalid source encoding name \"%s\""
-msgstr "nom de l'encodage source « %s » invalide"
+msgid "line is too long in time zone file \"%s\", line %d"
+msgstr ""
+"une ligne est trop longue dans le fichier des fuseaux horaires « %s »,\n"
+"ligne %d"
 
-#: utils/mb/mbutils.c:427
+#: utils/misc/tzparser.c:383
 #, c-format
-msgid "invalid destination encoding name \"%s\""
-msgstr "nom de l'encodage destination « %s » invalide"
+msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
+msgstr ""
+"@INCLUDE sans nom de fichier dans le fichier des fuseaux horaires « %s »,\n"
+"ligne %d"
 
-#: utils/mb/mbutils.c:539
+#: guc-file.l:274
 #, c-format
-msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "valeur d'octet invalide pour l'encodage « %s » : 0x%02x"
+msgid "parameter \"%s\" removed from configuration file, reset to default"
+msgstr ""
+"paramètre « %s » supprimé du fichier de configuration ;\n"
+"réinitialisation à la valeur par défaut"
 
-#: utils/mb/mbutils.c:734
-msgid "invalid multibyte character for locale"
-msgstr "caractère multi-octets invalide pour la locale"
+#: guc-file.l:333
+#, c-format
+msgid "parameter \"%s\" changed to \"%s\""
+msgstr "paramètre « %s » modifié par « %s »"
 
-#: utils/mb/mbutils.c:735
-msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
+#: guc-file.l:374
+#, c-format
+msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr ""
-"La locale LC_CTYPE du serveur est probablement incompatible avec l'encodage\n"
-"de la base de données."
+"n'a pas pu ouvrir le fichier de configuration « %s » : profondeur\n"
+"d'imbrication dépassé"
 
-#: utils/mb/wchar.c:1609
+#: guc-file.l:589
 #, c-format
-msgid "invalid byte sequence for encoding \"%s\": 0x%s"
-msgstr "séquence d'octets invalide pour l'encodage « %s » : 0x%s"
+msgid "syntax error in file \"%s\" line %u, near end of line"
+msgstr "erreur de syntaxe dans le fichier « %s », ligne %u, près de la fin de ligne"
 
-#: utils/mb/wchar.c:1638
+#: guc-file.l:594
 #, c-format
-msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
-msgstr "le caractère 0x%s du codage « %s » n'a pas d'équivalent dans « %s »"
+msgid "syntax error in file \"%s\" line %u, near token \"%s\""
+msgstr "erreur de syntaxe dans le fichier « %s », ligne %u, près du mot clé « %s »"
 
-#: ../port/chklocale.c:326
-#: ../port/chklocale.c:332
+#: ../port/chklocale.c:328
+#: ../port/chklocale.c:334
 #, c-format
 msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
 msgstr "n'a pas pu déterminer l'encodage pour la locale « %s » : le codeset vaut « %s »"
 
-#: ../port/chklocale.c:334
+#: ../port/chklocale.c:336
 msgid "Please report this to <pgsql-bugs@postgresql.org>."
 msgstr "Veuillez rapporter ceci à <pgsql-bugs@postgresql.org>."
 
@@ -17842,25 +19157,35 @@ msgstr "n'a pas pu configurer la jonction pour 
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "n'a pas pu configurer la jonction pour « %s » : %s\n"
 
-#: ../port/dirmod.c:325
+#: ../port/dirmod.c:358
+#, c-format
+msgid "could not get junction for \"%s\": %s"
+msgstr "n'a pas pu obtenir la jonction pour « %s » : %s"
+
+#: ../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "n'a pas pu obtenir la jonction pour « %s » : %s\n"
+
+#: ../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %s\n"
 
-#: ../port/dirmod.c:362
+#: ../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "n'a pas pu lire le répertoire « %s » : %s\n"
 
-#: ../port/dirmod.c:445
+#: ../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr ""
 "n'a pas pu récupérer les informations sur le fichier ou répertoire\n"
 "« %s » : %s\n"
 
-#: ../port/dirmod.c:472
-#: ../port/dirmod.c:489
+#: ../port/dirmod.c:590
+#: ../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le fichier ou répertoire « %s » : %s\n"
@@ -17882,84 +19207,292 @@ msgstr "binaire 
 msgid "could not read binary \"%s\""
 msgstr "n'a pas pu lire le binaire « %s »"
 
-#: ../port/exec.c:200
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "n'a pas pu trouver un « %s » à exécuter"
+#: ../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "n'a pas pu trouver un « %s » à exécuter"
+
+#: ../port/exec.c:255
+#: ../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "n'a pas pu accéder au répertoire « %s »"
+
+#: ../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "n'a pas pu lire le lien symbolique « %s »"
+
+#: ../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "le processus fils a quitté avec le code de sortie %d"
+
+#: ../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "le processus fils a été terminé par l'exception 0x%X"
+
+#: ../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "le processus fils a été terminé par le signal %s"
+
+#: ../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "le processus fils a été terminé par le signal %d"
+
+#: ../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "le processus fils a quitté avec un statut %d non reconnu"
+
+#: ../port/open.c:113
+msgid "sharing violation"
+msgstr "violation du partage"
+
+#: ../port/open.c:113
+msgid "lock violation"
+msgstr "violation du verrou"
+
+#: ../port/open.c:112
+#, c-format
+msgid "could not open file \"%s\": %s"
+msgstr "n'a pas pu ouvrir le fichier « %s » : %s"
+
+#: ../port/open.c:114
+msgid "Continuing to retry for 30 seconds."
+msgstr "Continue à tenter pendant 30 secondes."
+
+#: ../port/open.c:115
+msgid "You might have antivirus, backup, or similar software interfering with the database system."
+msgstr ""
+"Vous pouvez avoir un antivirus, un outil de sauvegarde ou un logiciel\n"
+"similaire interférant avec le système de bases de données."
+
+#: ../port/strerror.c:25
+#, c-format
+msgid "unrecognized error %d"
+msgstr "erreur %d non reconnue"
+
+#: ../port/win32error.c:188
+#, c-format
+msgid "mapped win32 error code %lu to %d"
+msgstr "correspondance du code d'erreur win32 %lu en %d"
+
+#: ../port/win32error.c:199
+#, c-format
+msgid "unrecognized win32 error code: %lu"
+msgstr "code d'erreur win32 non reconnu : %lu"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s : %s"
+
+#~ msgid "SSPI error %x"
+#~ msgstr "erreur SSPI : %x"
+
+#~ msgid "%s (%x)"
+#~ msgstr "%s (%x)"
+
+#~ msgid "resetting unlogged relations: cleanup %d init %d"
+#~ msgstr ""
+#~ "réinitialisation des relations non tracées : nettoyage %d initialisation "
+#~ "%d"
+
+#~ msgid "must be superuser to SET SCHEMA of %s"
+#~ msgstr "doit être super-utilisateur pour exécuter SET SCHEMA vers %s"
+
+#~ msgid "ALTER TYPE USING is only supported on plain tables"
+#~ msgstr "ALTER TYPE USING est seulement supportés sur les tables standards"
+
+#~ msgid "index \"%s\" is not a b-tree"
+#~ msgstr "l'index « %s » n'est pas un btree"
+
+#~ msgid "unable to read symbolic link %s: %m"
+#~ msgstr "incapable de lire le lien symbolique %s : %m"
+
+#~ msgid "unable to open directory pg_tblspc: %m"
+#~ msgstr "impossible d'ouvrir le répertoire p_tblspc : %m"
+
+#~ msgid "Write-Ahead Log / Streaming Replication"
+#~ msgstr "Write-Ahead Log / Réplication en flux"
+
+#~ msgid "syntax error in recovery command file: %s"
+#~ msgstr "erreur de syntaxe dans le fichier de restauration : %s"
+
+#~ msgid "Lines should have the format parameter = 'value'."
+#~ msgstr "Les lignes devraient avoir le format paramètre = 'valeur'"
+
+#~ msgid "array must not contain null values"
+#~ msgstr "le tableau ne doit pas contenir de valeurs NULL"
+
+#~ msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
+#~ msgstr ""
+#~ "l'index  %u/%u/%u a besoin d'un VACUUM FULL ou d'un REINDEX pour terminer "
+#~ "la\n"
+#~ "récupération suite à un arrêt brutal"
+
+#~ msgid "Incomplete insertion detected during crash replay."
+#~ msgstr ""
+#~ "Insertion incomplète détectée lors de la ré-exécution des requêtes suite "
+#~ "à\n"
+#~ "l'arrêt brutal."
+
+#~ msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
+#~ msgstr ""
+#~ "l'index  « %s » a besoin d'un VACUUM ou d'un REINDEX pour terminer la\n"
+#~ "récupération suite à un arrêt brutal"
+
+#~ msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
+#~ msgstr ""
+#~ "l'index  « %s » a besoin d'un VACUUM FULL ou d'un REINDEX pour terminer "
+#~ "la\n"
+#~ "récupération suite à un arrêt brutal"
+
+#~ msgid "EnumValuesCreate() can only set a single OID"
+#~ msgstr "EnumValuesCreate() peut seulement initialiser un seul OID"
+
+#~ msgid "clustering \"%s.%s\""
+#~ msgstr "exécution de CLUSTER sur « %s.%s »"
+
+#~ msgid ""
+#~ "cannot cluster on index \"%s\" because access method does not handle null "
+#~ "values"
+#~ msgstr ""
+#~ "ne peut pas créer un cluster sur l'index « %s » car la méthode d'accès "
+#~ "de\n"
+#~ "l'index ne gère pas les valeurs NULL"
+
+#~ msgid ""
+#~ "You might be able to work around this by marking column \"%s\" NOT NULL, "
+#~ "or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster "
+#~ "specification from the table."
+#~ msgstr ""
+#~ "Vous pourriez contourner ceci en marquant la colonne « %s » avec la\n"
+#~ "contrainte NOT NULL ou en utilisant ALTER TABLE ... SET WITHOUT CLUSTER "
+#~ "pour\n"
+#~ "supprimer la spécification CLUSTER de la table."
+
+#~ msgid ""
+#~ "You might be able to work around this by marking column \"%s\" NOT NULL."
+#~ msgstr ""
+#~ "Vous pouvez contourner ceci en marquant la colonne « %s » comme NOT NULL."
+
+#~ msgid ""
+#~ "cannot cluster on expressional index \"%s\" because its index access "
+#~ "method does not handle null values"
+#~ msgstr ""
+#~ "ne peut pas exécuter CLUSTER sur l'index à expression « %s » car sa "
+#~ "méthode\n"
+#~ "d'accès ne gère pas les valeurs NULL"
+
+#~ msgid "\"%s\" is not a table, view, or composite type"
+#~ msgstr "« %s » n'est pas une table, une vue ou un type composite"
+
+#~ msgid "must be member of role \"%s\" to comment upon it"
+#~ msgstr "doit être un membre du rôle « %s » pour le commenter"
+
+#~ msgid "must be superuser to comment on procedural language"
+#~ msgstr ""
+#~ "doit être super-utilisateur pour ajouter un commentaire sur un langage "
+#~ "de\n"
+#~ "procédures"
+
+#~ msgid "must be superuser to comment on text search parser"
+#~ msgstr ""
+#~ "doit être super-utilisateur pour ajouter un commentaire sur l'analyseur "
+#~ "de\n"
+#~ "recherche plein texte"
+
+#~ msgid "must be superuser to comment on text search template"
+#~ msgstr ""
+#~ "doit être super-utilisateur pour ajouter un commentaire sur un modèle de\n"
+#~ "recherche plein texte"
+
+#~ msgid "function \"%s\" is already in schema \"%s\""
+#~ msgstr "la fonction « %s » existe déjà dans le schéma « %s »"
+
+#~ msgid "cannot reference temporary table from permanent table constraint"
+#~ msgstr ""
+#~ "ne peut pas référencer une table temporaire à partir d'une contrainte de\n"
+#~ "table permanente"
+
+#~ msgid "cannot reference permanent table from temporary table constraint"
+#~ msgstr ""
+#~ "ne peut pas référencer une table permanente à partir de la contrainte de\n"
+#~ "table temporaire"
+
+#~ msgid "composite type must have at least one attribute"
+#~ msgstr "le type composite doit avoir au moins un attribut"
+
+#~ msgid "database \"%s\" not found"
+#~ msgstr "base de données « %s » non trouvée"
+
+#~ msgid "invalid list syntax for parameter \"datestyle\""
+#~ msgstr "syntaxe de liste invalide pour le paramètre « datestyle »"
+
+#~ msgid "unrecognized \"datestyle\" key word: \"%s\""
+#~ msgstr "mot clé « datestyle » non reconnu : « %s »"
 
-#: ../port/exec.c:255
-#: ../port/exec.c:291
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "n'a pas pu accéder au répertoire « %s »"
+#~ msgid "invalid interval value for time zone: month not allowed"
+#~ msgstr ""
+#~ "valeur d'intervalle invalide pour le fuseau horaire : les mois ne sont "
+#~ "pas autorisés"
 
-#: ../port/exec.c:270
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "n'a pas pu lire le lien symbolique « %s »"
+#~ msgid "invalid interval value for time zone: day not allowed"
+#~ msgstr ""
+#~ "valeur d'intervalle invalide pour le fuseau horaire : jour non autorisé"
 
-#: ../port/exec.c:516
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "le processus fils a quitté avec le code de sortie %d"
+#~ msgid "unrecognized time zone name: \"%s\""
+#~ msgstr "nom de fuseau horaire non reconnu : « %s »"
 
-#: ../port/exec.c:520
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "le processus fils a été terminé par l'exception 0x%X"
+#~ msgid "argument to pg_get_expr() must come from system catalogs"
+#~ msgstr "l'argument de pg_get_expr() doit provenir des catalogues systèmes"
 
-#: ../port/exec.c:529
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "le processus fils a été terminé par le signal %s"
+#~ msgid "cannot change view \"%s\""
+#~ msgstr "ne peut pas modifier la vue « %s »"
 
-#: ../port/exec.c:532
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "le processus fils a été terminé par le signal %d"
+#~ msgid "could not enable credential reception: %m"
+#~ msgstr "n'a pas pu activer la réception de lettres de créance : %m"
 
-#: ../port/exec.c:536
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "le processus fils a quitté avec un statut %d non reconnu"
+#~ msgid "could not get effective UID from peer credentials: %m"
+#~ msgstr ""
+#~ "n'a pas pu obtenir l'UID réel à partir des pièces d'identité de l'autre : "
+#~ "%m"
 
-#: ../port/open.c:113
-msgid "sharing violation"
-msgstr "violation du partage"
+#~ msgid ""
+#~ "Ident authentication is not supported on local connections on this "
+#~ "platform"
+#~ msgstr ""
+#~ "l'authentification Ident n'est pas supportée sur les connexions locales "
+#~ "sur cette plateforme"
 
-#: ../port/open.c:113
-msgid "lock violation"
-msgstr "violation du verrou"
+#~ msgid "hostssl not supported on this platform"
+#~ msgstr "hostssl non supporté sur cette plateforme"
 
-#: ../port/open.c:112
-#, c-format
-msgid "could not open file \"%s\": %s"
-msgstr "n'a pas pu ouvrir le fichier « %s » : %s"
+#~ msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
+#~ msgstr "SELECT FOR UPDATE/SHARE ne peut pas être appliqué à NEW et OLD"
 
-#: ../port/open.c:114
-msgid "Continuing to retry for 30 seconds."
-msgstr "Continue à tenter pendant 30 secondes."
+#~ msgid "could not create log file \"%s\": %m"
+#~ msgstr "n'a pas pu créer le journal applicatif « %s » : %m"
 
-#: ../port/open.c:115
-msgid "You might have antivirus, backup, or similar software interfering with the database system."
-msgstr ""
-"Vous pouvez avoir un antivirus, un outil de sauvegarde ou un logiciel\n"
-"similaire interférant avec le système de bases de données."
+#~ msgid "could not open new log file \"%s\": %m"
+#~ msgstr "n'a pas pu ouvrir le nouveau journal applicatif « %s » : %m"
 
-#: ../port/strerror.c:25
-#, c-format
-msgid "unrecognized error %d"
-msgstr "erreur %d non reconnue"
+#~ msgid "Sets immediate fsync at commit."
+#~ msgstr "Configure un fsync immédiat lors du commit."
 
-#: ../port/win32error.c:184
-#, c-format
-msgid "mapped win32 error code %lu to %d"
-msgstr "correspondance du code d'erreur win32 %lu en %d"
+#~ msgid "invalid list syntax for parameter \"log_destination\""
+#~ msgstr "syntaxe de liste invalide pour le paramètre « log_destination »"
 
-#: ../port/win32error.c:195
-#, c-format
-msgid "unrecognized win32 error code: %lu"
-msgstr "code d'erreur win32 non reconnu : %lu"
+#~ msgid "unrecognized \"log_destination\" key word: \"%s\""
+#~ msgstr "mot clé « log_destination » non reconnu : « %s »"
+
+#~ msgid "replication connection authorized: user=%s host=%s port=%s"
+#~ msgstr ""
+#~ "connexion de réplication autorisée : utilisateur=%s, base de données=%s, "
+#~ "port=%s"
 
 #~ msgid ""
 #~ "cannot drop \"%s\" because it is being used by active queries in this "
@@ -17968,37 +19501,49 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "ne peut pas supprimer « %s » car cet objet est en cours d'utilisation "
 #~ "par\n"
 #~ "des requêtes actives dans cette session"
+
 #~ msgid "parameter \"recovery_target_inclusive\" requires a Boolean value"
 #~ msgstr ""
 #~ "le paramètre « recovery_target_inclusive » requiert une valeur booléenne"
+
 #~ msgid "parameter \"standby_mode\" requires a Boolean value"
 #~ msgstr "le paramètre « standby_mode » requiert une valeur booléenne"
+
 #~ msgid "access to %s"
 #~ msgstr "accès à %s"
+
 #~ msgid "Sets the message levels that are logged during recovery."
 #~ msgstr ""
 #~ "Initialise les niveaux de messages qui sont tracés lors de la "
 #~ "restauration."
+
 #~ msgid "Not safe to send CSV data\n"
 #~ msgstr "Envoi non sûr des données CSV\n"
+
 #~ msgid "recovery restart point at %X/%X with latest known log time %s"
 #~ msgstr ""
 #~ "point de relancement de la restauration sur %X/%X avec %s comme dernière\n"
 #~ "date connue du journal"
+
 #~ msgid "restartpoint_command = '%s'"
 #~ msgstr "restartpoint_command = '%s'"
+
 #~ msgid "usermap \"%s\""
 #~ msgstr "correspondance utilisateur « %s »"
+
 #~ msgid "WAL archiving is not active"
 #~ msgstr "l'archivage des journaux de transactions n'est pas actif"
+
 #~ msgid "archive_mode must be enabled at server start."
 #~ msgstr "archive_mode doit être activé au lancement du serveur."
+
 #~ msgid ""
 #~ "archive_command must be defined before online backups can be made safely."
 #~ msgstr ""
 #~ "archive_command doit être défini avant que les sauvegardes à chaud "
 #~ "puissent\n"
 #~ "s'effectuer correctement."
+
 #~ msgid ""
 #~ "During recovery, allows connections and queries.  During normal running, "
 #~ "causes additional info to be written to WAL to enable hot standby mode on "
@@ -18011,23 +19556,29 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "les journaux de transactions pour activer le mode Hot Standby sur les "
 #~ "n½uds\n"
 #~ "en attente."
+
 #~ msgid "unlogged operation performed, data may be missing"
 #~ msgstr "opération réalisée non tracée, les données pourraient manquer"
+
 #~ msgid "not enough shared memory for walsender"
 #~ msgstr ""
 #~ "pas assez de mémoire partagée pour le processus d'envoi des journaux de "
 #~ "transactions"
+
 #~ msgid "not enough shared memory for walreceiver"
 #~ msgstr ""
 #~ "pas assez de mémoire partagée pour le processus de réception des journaux "
 #~ "de\n"
 #~ "transactions"
+
 #~ msgid "connection limit exceeded for non-superusers"
 #~ msgstr "limite de connexions dépassée pour les utilisateurs standards"
+
 #~ msgid "not enough shared memory for background writer"
 #~ msgstr ""
 #~ "pas assez de mémoire partagée pour le processus d'écriture en tâche de "
 #~ "fond"
+
 #~ msgid "could not allocate shared memory segment \"%s\""
 #~ msgstr "n'a pas pu allouer un segment de mémoire partagée « %s »"
 
@@ -18038,6 +19589,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #, fuzzy
 #~ msgid "couldn't put socket to blocking mode: %m"
 #~ msgstr "n'a pas pu activer le mode bloquant pour la socket : %s\n"
+
 #~ msgid "WAL file SYSID is %s, pg_control SYSID is %s"
 #~ msgstr ""
 #~ "le SYSID du journal de transactions WAL est %s, celui de pg_control est %s"
@@ -18053,14 +19605,19 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #, fuzzy
 #~ msgid "invalid replication message type %d"
 #~ msgstr "type %d du message de l'interface invalide"
+
 #~ msgid "PID %d is among the slowest backends."
 #~ msgstr "Le PID %d est parmi les processus serveur les plus lents."
+
 #~ msgid "transaction is read-only"
 #~ msgstr "la transaction est en lecture seule"
+
 #~ msgid "binary value is out of range for type bigint"
 #~ msgstr "la valeur binaire est en dehors des limites du type bigint"
+
 #~ msgid "redo starts at %X/%X, consistency will be reached at %X/%X"
 #~ msgstr "la restauration comme à %X/%X, la cohérence sera atteinte à %X/%X"
+
 #~ msgid ""
 #~ "This error can also happen if the byte sequence does not match the "
 #~ "encoding expected by the server, which is controlled by \"client_encoding"
@@ -18070,31 +19627,40 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "pas\n"
 #~ "au jeu de caractères attendu par le serveur, le jeu étant contrôlé par\n"
 #~ "« client_encoding »."
+
 #~ msgid "Sets the language used in DO statement if LANGUAGE is not specified."
 #~ msgstr ""
 #~ "Configure le langage utilisé dans une instruction DO si la clause "
 #~ "LANGUAGE n'est\n"
 #~ "pas spécifiée."
+
 #~ msgid "shared index \"%s\" can only be reindexed in stand-alone mode"
 #~ msgstr ""
 #~ "un index partagé « %s » peut seulement être réindexé en mode autonome"
+
 #~ msgid "\"%s\" is a system catalog"
 #~ msgstr "« %s » est un catalogue système"
+
 #~ msgid "shared table \"%s\" can only be reindexed in stand-alone mode"
 #~ msgstr ""
 #~ "la table partagée « %s » peut seulement être réindexé en mode autonome"
+
 #~ msgid "cannot truncate system relation \"%s\""
 #~ msgstr "ne peut pas tronquer la relation système « %s »"
+
 #~ msgid "number of distinct values %g is too low"
 #~ msgstr "le nombre de valeurs distinctes %g est trop basse"
+
 #~ msgid "directory \"%s\" is not empty"
 #~ msgstr "le répertoire « %s » n'est pas vide"
+
 #~ msgid ""
 #~ "relation \"%s\" TID %u/%u: XMIN_COMMITTED not set for transaction %u --- "
 #~ "cannot shrink relation"
 #~ msgstr ""
 #~ "relation « %s », TID %u/%u : XMIN_COMMITTED non configuré pour la\n"
 #~ "transaction %u --- n'a pas pu diminuer la taille de la relation"
+
 #~ msgid ""
 #~ "relation \"%s\" TID %u/%u: dead HOT-updated tuple --- cannot shrink "
 #~ "relation"
@@ -18102,6 +19668,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "relation « %s », TID %u/%u : ligne morte mise à jour par HOT --- n'a pas "
 #~ "pu\n"
 #~ "diminuer la taille de la relation"
+
 #~ msgid ""
 #~ "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot "
 #~ "shrink relation"
@@ -18109,6 +19676,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "relation « %s », TID %u/%u : InsertTransactionInProgress %u --- n'a pas "
 #~ "pu\n"
 #~ "diminuer la taille de la relation"
+
 #~ msgid ""
 #~ "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot "
 #~ "shrink relation"
@@ -18116,11 +19684,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "relation « %s », TID %u/%u : DeleteTransactionInProgress %u --- n'a pas "
 #~ "pu\n"
 #~ "diminuer la taille de la relation"
-#~ msgid ""
-#~ "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
-#~ msgstr ""
-#~ "« %s » : %.0f versions de ligne supprimables, %.0f non supprimables\n"
-#~ "parmi %u pages"
+
 #~ msgid ""
 #~ "%.0f dead row versions cannot be removed yet.\n"
 #~ "Nonremovable row versions range from %lu to %lu bytes long.\n"
@@ -18142,14 +19706,17 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "déplacement\n"
 #~ "disponibles.\n"
 #~ "%s."
+
 #~ msgid "\"%s\": moved %u row versions, truncated %u to %u pages"
 #~ msgstr "« %s » : %u versions de ligne déplacées, %u pages tronquées sur %u"
+
 #~ msgid ""
 #~ "%u index pages have been deleted, %u are currently reusable.\n"
 #~ "%s."
 #~ msgstr ""
 #~ "%u pages d'index ont été supprimées, %u sont actuellement réutilisables.\n"
 #~ "%s."
+
 #~ msgid ""
 #~ "index \"%s\" contains %.0f row versions, but table contains %.0f row "
 #~ "versions"
@@ -18157,43 +19724,59 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "l'index « %s » contient %.0f versions de ligne, mais la table contient "
 #~ "%.0f\n"
 #~ "versions de ligne"
+
 #~ msgid "Rebuild the index with REINDEX."
 #~ msgstr "Reconstruisez l'index avec REINDEX."
+
 #~ msgid "frame start at CURRENT ROW is not implemented"
 #~ msgstr "début du frame à CURRENT ROW n'est pas implémenté"
+
 #~ msgid "database system is in consistent recovery mode"
 #~ msgstr ""
 #~ "le système de bases de données est dans un mode de restauration cohérent"
+
 #~ msgid "DISTINCT is supported only for single-argument aggregates"
 #~ msgstr ""
 #~ "DISTINCT est seulement supporté pour les agrégats à un seul argument"
+
 #~ msgid "index row size %lu exceeds btree maximum, %lu"
 #~ msgstr "la taille de la ligne index %lu dépasse le maximum de btree, %lu"
+
 #~ msgid "Table contains duplicated values."
 #~ msgstr "La table contient des valeurs dupliquées."
+
 #~ msgid "Automatically adds missing table references to FROM clauses."
 #~ msgstr ""
 #~ "Ajoute automatiquement les références à la table manquant dans les "
 #~ "clauses\n"
 #~ "FROM."
+
 #~ msgid "Sets the regular expression \"flavor\"."
 #~ msgstr "Initialise l'expression rationnelle « flavor »."
+
 #~ msgid "attempted change of parameter \"%s\" ignored"
 #~ msgstr "tentative de modification du paramètre « %s » ignoré"
+
 #~ msgid "This parameter cannot be changed after server start."
 #~ msgstr "Ce paramètre ne peut pas être modifié après le lancement du serveur"
+
 #~ msgid "invalid database name \"%s\""
 #~ msgstr "nom de base de données « %s » invalide"
+
 #~ msgid "invalid role name \"%s\""
 #~ msgstr "nom de rôle « %s » invalide"
+
 #~ msgid "invalid role password \"%s\""
 #~ msgstr "mot de passe « %s » de l'utilisateur invalide"
+
 #~ msgid "cannot specify CSV in BINARY mode"
 #~ msgstr "ne peut pas spécifier CSV en mode binaire (BINARY)"
+
 #~ msgid "cannot set session authorization within security-definer function"
 #~ msgstr ""
 #~ "ne peut pas exécuter SESSION AUTHORIZATION sur la fonction SECURITY "
 #~ "DEFINER"
+
 #~ msgid ""
 #~ "SELECT FOR UPDATE/SHARE is not supported within a query with multiple "
 #~ "result relations"
@@ -18201,68 +19784,94 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "SELECT FOR UPDATE/SHARE n'est pas supporté dans une requête avec "
 #~ "plusieurs\n"
 #~ "relations"
+
 #~ msgid "could not remove relation %s: %m"
 #~ msgstr "n'a pas pu supprimer la relation %s : %m"
+
 #~ msgid "could not remove segment %u of relation %s: %m"
 #~ msgstr "n'a pas pu supprimer le segment %u de la relation %s : %m"
+
 #~ msgid "could not seek to block %u of relation %s: %m"
 #~ msgstr "n'a pas pu se positionner sur le bloc %u de la relation %s : %m"
+
 #~ msgid "could not extend relation %s: %m"
 #~ msgstr "n'a pas pu étendre la relation %s : %m"
+
 #~ msgid "could not open relation %s: %m"
 #~ msgstr "n'a pas pu ouvrir la relation %s : %m"
+
 #~ msgid "could not read block %u of relation %s: %m"
 #~ msgstr "n'a pas pu lire le bloc %u de la relation %s : %m"
+
 #~ msgid "could not write block %u of relation %s: %m"
 #~ msgstr "n'a pas pu écrire le bloc %u de la relation %s : %m"
+
 #~ msgid "could not open segment %u of relation %s: %m"
 #~ msgstr "n'a pas pu ouvrir le segment %u de la relation %s : %m"
+
 #~ msgid "could not fsync segment %u of relation %s: %m"
 #~ msgstr ""
 #~ "n'a pas pu synchroniser sur disque (fsync) le segment %u de la relation\n"
 #~ "%s : %m"
+
 #~ msgid "could not fsync segment %u of relation %s but retrying: %m"
 #~ msgstr ""
 #~ "n'a pas pu synchroniser sur disque (fsync) le segment %u de la relation\n"
 #~ "%s, nouvelle tentative : %m"
+
 #~ msgid "could not seek to end of segment %u of relation %s: %m"
 #~ msgstr ""
 #~ "n'a pas pu se déplacer à la fin du segment %u de la relation %s : %m"
+
 #~ msgid "unsupported PAM conversation %d/%s"
 #~ msgstr "conversation PAM %d/%s non supportée"
+
 #~ msgid "SELECT FOR UPDATE/SHARE is not allowed in subqueries"
 #~ msgstr "SELECT FOR UPDATE/SHARE n'est pas autorisé dans les sous-requêtes"
+
 #~ msgid "adding missing FROM-clause entry for table \"%s\""
 #~ msgstr "ajout d'une entrée manquante dans FROM (table « %s »)"
+
 #~ msgid "OLD used in query that is not in a rule"
 #~ msgstr "OLD utilisé dans une requête qui n'est pas une règle"
+
 #~ msgid "NEW used in query that is not in a rule"
 #~ msgstr "NEW utilisé dans une requête qui ne fait pas partie d'une règle"
+
 #~ msgid "hurrying in-progress restartpoint"
 #~ msgstr "accélération du restartpoint en cours"
+
 #~ msgid "multiple DELETE events specified"
 #~ msgstr "multiples événements DELETE spécifiés"
+
 #~ msgid "multiple UPDATE events specified"
 #~ msgstr "multiples événements UPDATE spécifiés"
+
 #~ msgid "multiple TRUNCATE events specified"
 #~ msgstr "multiples événements TRUNCATE spécifiés"
+
 #~ msgid "could not create XPath object"
 #~ msgstr "n'a pas pu créer l'objet XPath"
 
 #, fuzzy
 #~ msgid "wrong number of array_subscripts"
 #~ msgstr "mauvais nombre d'indices du tableau"
+
 #~ msgid "fillfactor=%d is out of range (should be between %d and 100)"
 #~ msgstr ""
 #~ "le facteur de remplissage (%d) est en dehors des limites (il devrait être "
 #~ "entre %d et 100)"
+
 #~ msgid "GIN index does not support search with void query"
 #~ msgstr ""
 #~ "les index GIN ne supportent pas la recherche avec des requêtes vides"
+
 #~ msgid "invalid LC_COLLATE setting"
 #~ msgstr "paramètre LC_COLLATE invalide"
+
 #~ msgid "invalid LC_CTYPE setting"
 #~ msgstr "paramètre LC_CTYPE invalide"
+
 #~ msgid ""
 #~ "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the "
 #~ "server was compiled with LOCALE_NAME_BUFLEN %d."
@@ -18270,40 +19879,47 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Le cluster de bases de données a été initialisé avec un "
 #~ "LOCALE_NAME_BUFLEN\n"
 #~ "à %d alors que le serveur a été compilé avec un LOCALE_NAME_BUFLEN à %d."
+
 #~ msgid "It looks like you need to initdb or install locale support."
 #~ msgstr ""
 #~ "Il semble que vous avez besoin d'exécuter initdb ou d'installer le "
 #~ "support\n"
 #~ "des locales."
+
 #~ msgid "log_restartpoints = %s"
 #~ msgstr "log_restartpoints = %s"
-#~ msgid "WAL ends before end time of backup dump"
-#~ msgstr ""
-#~ "le journal de transactions se termine avant l'heure de fin de la "
-#~ "sauvegarde"
+
 #~ msgid "syntax error: cannot back up"
 #~ msgstr "erreur de syntaxe : n'a pas pu revenir"
+
 #~ msgid "syntax error; also virtual memory exhausted"
 #~ msgstr "erreur de syntaxe ; de plus, mémoire virtuelle saturée"
+
 #~ msgid "parser stack overflow"
 #~ msgstr "saturation de la pile de l'analyseur"
+
 #~ msgid "failed to drop all objects depending on %s"
 #~ msgstr "échec lors de la suppression de tous les objets dépendant de %s"
+
 #~ msgid "there are objects dependent on %s"
 #~ msgstr "des objets dépendent de %s"
+
 #~ msgid "multiple constraints named \"%s\" were dropped"
 #~ msgstr "les contraintes multiples nommées « %s » ont été supprimées"
+
 #~ msgid "constraint definition for check constraint \"%s\" does not match"
 #~ msgstr ""
 #~ "la définition de la contrainte « %s » pour la contrainte de vérification "
 #~ "ne\n"
 #~ "correspond pas"
+
 #~ msgid ""
 #~ "relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful "
 #~ "free space"
 #~ msgstr ""
 #~ "la relation « %s.%s » contient plus de « max_fsm_pages » pages d'espace\n"
 #~ "libre utile"
+
 #~ msgid ""
 #~ "Consider using VACUUM FULL on this relation or increasing the "
 #~ "configuration parameter \"max_fsm_pages\"."
@@ -18311,11 +19927,14 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Pensez à compacter cette relation en utilisant VACUUM FULL ou à augmenter "
 #~ "le\n"
 #~ "paramètre de configuration « max_fsm_pages »."
+
 #~ msgid "Consider increasing the configuration parameter \"max_fsm_pages\"."
 #~ msgstr ""
 #~ "Considérez l'augmentation du paramètre de configuration « max_fsm_pages »."
+
 #~ msgid "cannot change number of columns in view"
 #~ msgstr "ne peut pas modifier le nombre de colonnes dans la vue"
+
 #~ msgid ""
 #~ "unexpected Kerberos user name received from client (received \"%s\", "
 #~ "expected \"%s\")"
@@ -18323,14 +19942,19 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "nom d'utilisateur Kerberos inattendu reçu à partir du client (reçu « %s "
 #~ "»,\n"
 #~ "attendu « %s »)"
+
 #~ msgid "Kerberos 5 not implemented on this server"
 #~ msgstr "Kerberos 5 non implémenté sur ce serveur"
+
 #~ msgid "GSSAPI not implemented on this server"
 #~ msgstr "GSSAPI non implémenté sur ce serveur"
+
 #~ msgid "could not get security token from context"
 #~ msgstr "n'a pas pu récupérer le jeton de sécurité à partir du contexte"
+
 #~ msgid "unsafe permissions on private key file \"%s\""
 #~ msgstr "droits non sûrs sur le fichier de la clé privée « %s »"
+
 #~ msgid ""
 #~ "File must be owned by the database user and must have no permissions for "
 #~ "\"group\" or \"other\"."
@@ -18338,6 +19962,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Le fichier doit appartenir au propriétaire de la base de données et ne "
 #~ "doit\n"
 #~ "pas avoir de droits pour un groupe ou pour les autres."
+
 #~ msgid ""
 #~ "cannot use authentication method \"crypt\" because password is MD5-"
 #~ "encrypted"
@@ -18345,38 +19970,51 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "n'a pas pu utiliser la méthode d'authentification « crypt » car le mot "
 #~ "de\n"
 #~ "passe est chiffré avec MD5"
+
 #~ msgid "invalid entry in file \"%s\" at line %d, token \"%s\""
 #~ msgstr "entrée invalide dans le fichier « %s » à la ligne %d, jeton « %s »"
+
 #~ msgid "missing field in file \"%s\" at end of line %d"
 #~ msgstr "champ manquant dans le fichier « %s » à la fin de la ligne %d"
+
 #~ msgid "cannot use Ident authentication without usermap field"
 #~ msgstr "n'a pas pu utiliser l'authentication Ident sans le champ usermap"
+
 #~ msgid "Ident protocol identifies remote user as \"%s\""
 #~ msgstr "le protocole Ident identifie l'utilisateur distant comme « %s »"
+
 #~ msgid "SELECT FOR UPDATE/SHARE is not supported for inheritance queries"
 #~ msgstr ""
 #~ "SELECT FOR UPDATE/SHARE n'est pas supporté pour les requêtes d'héritage"
+
 #~ msgid "missing FROM-clause entry in subquery for table \"%s\""
 #~ msgstr ""
 #~ "entrée manquante de la clause FROM dans la sous-requête de la table « %s »"
+
 #~ msgid "adding missing FROM-clause entry in subquery for table \"%s\""
 #~ msgstr ""
 #~ "entrée manquante de la clause FROM dans la sous-requête pour la table « "
 #~ "%s »"
+
 #~ msgid ""
 #~ "%s: the number of buffers (-B) must be at least twice the number of "
 #~ "allowed connections (-N) and at least 16\n"
 #~ msgstr ""
 #~ "%s : le nombre de tampons (-B) doit être au moins deux fois le nombre de\n"
 #~ "connexions disponibles (-N) et au moins 16\n"
+
 #~ msgid "could not set statistics collector timer: %m"
 #~ msgstr "n'a pas pu configurer le timer du récupérateur de statistiques : %m"
+
 #~ msgid "insufficient shared memory for free space map"
 #~ msgstr "mémoire partagée insuffisante pour la structure FSM"
+
 #~ msgid "max_fsm_pages must exceed max_fsm_relations * %d"
 #~ msgstr "max_fsm_pages doit excéder max_fsm_relations * %d"
+
 #~ msgid "free space map contains %d pages in %d relations"
 #~ msgstr "la structure FSM contient %d pages dans %d relations"
+
 #~ msgid ""
 #~ "A total of %.0f page slots are in use (including overhead).\n"
 #~ "%.0f page slots are required to track all free space.\n"
@@ -18387,8 +20025,10 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "%.0f emplacements de pages sont requis pour tracer tout l'espace libre.\n"
 #~ "Les limites actuelles sont : %d emplacements de pages, %d relations,\n"
 #~ "utilisant %.0f Ko."
+
 #~ msgid "max_fsm_relations(%d) equals the number of relations checked"
 #~ msgstr "max_fsm_relations(%d) équivaut au nombre de relations tracées"
+
 #~ msgid ""
 #~ "You have at least %d relations.  Consider increasing the configuration "
 #~ "parameter \"max_fsm_relations\"."
@@ -18396,10 +20036,12 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Vous avez au moins %d relations.Considèrez l'augmentation du paramètre "
 #~ "de\n"
 #~ "configuration « max_fsm_relations »."
+
 #~ msgid "number of page slots needed (%.0f) exceeds max_fsm_pages (%d)"
 #~ msgstr ""
 #~ "le nombre d'emplacements de pages nécessaires (%.0f) dépasse "
 #~ "max_fsm_pages (%d)"
+
 #~ msgid ""
 #~ "Consider increasing the configuration parameter \"max_fsm_pages\" to a "
 #~ "value over %.0f."
@@ -18407,19 +20049,25 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Considérez l'augmentation du paramètre de configuration « max_fsm_pages "
 #~ "»\n"
 #~ "à une valeur supérieure à %.0f."
+
 #~ msgid "string is too long for tsvector"
 #~ msgstr "la chaîne est trop longue pour un tsvector"
+
 #~ msgid "Prints the parse tree to the server log."
 #~ msgstr "Affiche l'arbre d'analyse dans les journaux applicatifs du serveur."
+
 #~ msgid "Prints the parse tree after rewriting to server log."
 #~ msgstr ""
 #~ "Affiche l'arbre d'analyse après ré-écriture dans les journaux applicatifs "
 #~ "du serveur."
+
 #~ msgid "Prints the execution plan to server log."
 #~ msgstr ""
 #~ "Affiche le plan d'exécution dans les journaux applicatifs du serveur."
+
 #~ msgid "Uses the indented output format for EXPLAIN VERBOSE."
 #~ msgstr "Utilise le format de sortie indenté pour EXPLAIN VERBOSE."
+
 #~ msgid ""
 #~ "Sets the maximum number of tables and indexes for which free space is "
 #~ "tracked."
@@ -18427,14 +20075,17 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Initialise le nombre maximum de tables et index pour lesquels l'espace "
 #~ "libre\n"
 #~ "est tracé."
+
 #~ msgid ""
 #~ "Sets the maximum number of disk pages for which free space is tracked."
 #~ msgstr ""
 #~ "Initialise le nombre maximum de pages disque pour lesquelles l'espace "
 #~ "libre\n"
 #~ "est tracé."
+
 #~ msgid "Valid values are ON, OFF, and SAFE_ENCODING."
 #~ msgstr "Les valeurs valides sont ON, OFF et SAFE_ENCODING."
+
 #~ msgid ""
 #~ "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, "
 #~ "WARNING, ERROR, LOG, FATAL, and PANIC. Each level includes all the levels "
@@ -18444,6 +20095,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "NOTICE, WARNING, ERROR, LOG, FATAL et PANIC. Chaque niveau incut tous "
 #~ "les\n"
 #~ "niveaux qui le suit."
+
 #~ msgid ""
 #~ "All SQL statements that cause an error of the specified level or a higher "
 #~ "level are logged."
@@ -18451,6 +20103,7 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Toutes les instructions SQL causant une erreur du niveau spécifié ou "
 #~ "d'un\n"
 #~ "niveau supérieur sont tracées."
+
 #~ msgid ""
 #~ "Each SQL transaction has an isolation level, which can be either \"read "
 #~ "uncommitted\", \"read committed\", \"repeatable read\", or \"serializable"
@@ -18459,127 +20112,181 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "Chaque transaction SQL a un niveau d'isolation qui peut être soit « read\n"
 #~ "uncommitted », soit « read committed », soit « repeatable read », soit\n"
 #~ "« serializable »."
+
 #~ msgid "Each session can be either \"origin\", \"replica\", or \"local\"."
 #~ msgstr ""
 #~ "Chaque session peut valoir soit « origin » soit « replica » soit « local "
 #~ "»."
+
 #~ msgid "Sets realm to match Kerberos and GSSAPI users against."
 #~ msgstr ""
 #~ "Indique le royaume pour l'authentification des utilisateurs via Kerberos "
 #~ "et\n"
 #~ "GSSAPI."
+
 #~ msgid "Sets the hostname of the Kerberos server."
 #~ msgstr "Initalise le nom d'hôte du serveur Kerberos."
+
 #~ msgid "This can be set to advanced, extended, or basic."
 #~ msgstr ""
 #~ "Ceci peut être initialisé avec advanced (avancé), extended (étendu) ou\n"
 #~ "basic (basique)."
+
 #~ msgid ""
 #~ "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, "
 #~ "LOCAL7."
 #~ msgstr ""
 #~ "Les valeurs valides sont LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5,\n"
 #~ "LOCAL6, LOCAL7."
+
 #~ msgid "Valid values are BASE64 and HEX."
 #~ msgstr "Les valeurs valides sont BASE64 et HEX."
+
 #~ msgid "Valid values are DOCUMENT and CONTENT."
 #~ msgstr "Les valeurs valides sont DOCUMENT et CONTENT."
+
 #~ msgid "invalid argument for power function"
 #~ msgstr "argument invalide pour la fonction puissance (power)"
+
 #~ msgid "not unique \"S\""
 #~ msgstr "« S » non unique"
+
 #~ msgid "invalid AM/PM string"
 #~ msgstr "chaîne AM/PM invalide"
+
 #~ msgid "\"TZ\"/\"tz\" not supported"
 #~ msgstr "« TZ »/« tz » non supporté"
+
 #~ msgid "January"
 #~ msgstr "Janvier"
+
 #~ msgid "February"
 #~ msgstr "Février"
+
 #~ msgid "March"
 #~ msgstr "Mars"
+
 #~ msgid "April"
 #~ msgstr "Avril"
+
 #~ msgid "May"
 #~ msgstr "Mai"
+
 #~ msgid "June"
 #~ msgstr "Juin"
+
 #~ msgid "July"
 #~ msgstr "Juillet"
+
 #~ msgid "August"
 #~ msgstr "Août"
+
 #~ msgid "September"
 #~ msgstr "Septembre"
+
 #~ msgid "October"
 #~ msgstr "Octobre"
+
 #~ msgid "November"
 #~ msgstr "Novembre"
+
 #~ msgid "December"
 #~ msgstr "Décembre"
+
 #~ msgid "Jan"
 #~ msgstr "Jan"
+
 #~ msgid "Feb"
 #~ msgstr "Fév"
+
 #~ msgid "Mar"
 #~ msgstr "Mar"
+
 #~ msgid "Apr"
 #~ msgstr "Avr"
+
 #~ msgid "S:May"
 #~ msgstr "S:Mai"
+
 #~ msgid "Jun"
 #~ msgstr "Juin"
+
 #~ msgid "Jul"
 #~ msgstr "Juil"
+
 #~ msgid "Aug"
 #~ msgstr "Aoû"
+
 #~ msgid "Sep"
 #~ msgstr "Sep"
+
 #~ msgid "Oct"
 #~ msgstr "Oct"
+
 #~ msgid "Nov"
 #~ msgstr "Nov"
+
 #~ msgid "Dec"
 #~ msgstr "Déc"
+
 #~ msgid "Sunday"
 #~ msgstr "Dimanche"
+
 #~ msgid "Monday"
 #~ msgstr "Lundi"
+
 #~ msgid "Tuesday"
 #~ msgstr "Mardi"
+
 #~ msgid "Wednesday"
 #~ msgstr "Mercredi"
+
 #~ msgid "Thursday"
 #~ msgstr "Jeudi"
+
 #~ msgid "Friday"
 #~ msgstr "Vendredi"
+
 #~ msgid "Saturday"
 #~ msgstr "Samedi"
+
 #~ msgid "Sun"
 #~ msgstr "Dim"
+
 #~ msgid "Mon"
 #~ msgstr "Lun"
+
 #~ msgid "Tue"
 #~ msgstr "Mar"
+
 #~ msgid "Wed"
 #~ msgstr "Mer"
+
 #~ msgid "Thu"
 #~ msgstr "Jeu"
+
 #~ msgid "Fri"
 #~ msgstr "Ven"
+
 #~ msgid "Sat"
 #~ msgstr "Sam"
+
 #~ msgid "AM/PM hour must be between 1 and 12"
 #~ msgstr "l'heure AM/PM doit être compris entre 1 et 12"
+
 #~ msgid "UTF-16 to UTF-8 translation failed: %lu"
 #~ msgstr "échec de la conversion d'UTF16 vers UTF8 : %lu"
+
 #~ msgid "cannot calculate week number without year information"
 #~ msgstr ""
 #~ "ne peut pas calculer le numéro de la semaine sans informations sur l'année"
+
 #~ msgid "query requires full scan, which is not supported by GIN indexes"
 #~ msgstr ""
 #~ "la requête nécessite un parcours complet, ce qui n'est pas supporté par "
 #~ "les\n"
 #~ "index GIN"
+
 #~ msgid ""
 #~ "@@ operator does not support lexeme weight restrictions in GIN index "
 #~ "searches"
@@ -18587,17 +20294,22 @@ msgstr "code d'erreur win32 non reconnu : %lu"
 #~ "l'opérateur @@ ne supporte pas les restrictions de poids de lexeme dans "
 #~ "les\n"
 #~ "recherches par index GIN"
+
 #~ msgid "Use the @@@ operator instead."
 #~ msgstr "Utilisez à la place l'opérateur @@@."
+
 #~ msgid "unexpected delimiter at line %d of thesaurus file \"%s\""
 #~ msgstr "délimiteur inattendu sur la ligne %d du thesaurus « %s »"
+
 #~ msgid "unexpected end of line or lexeme at line %d of thesaurus file \"%s\""
 #~ msgstr ""
 #~ "fin de ligne ou de lexeme inattendu sur la ligne %d du thesaurus « %s »"
+
 #~ msgid "unexpected end of line at line %d of thesaurus file \"%s\""
 #~ msgstr "fin de ligne inattendue à la ligne %d du thésaurus « %s »"
+
 #~ msgid "syntax error at line %d of affix file \"%s\""
 #~ msgstr "erreur de syntaxe à la ligne %d du fichier affixe « %s »"
+
 #~ msgid "could not remove database directory \"%s\""
 #~ msgstr "n'a pas pu supprimer le répertoire de bases de données « %s »"
-
diff --git a/src/backend/po/ja.po b/src/backend/po/ja.po
index 287ad2e2e61ee..cf352eb50b886 100644
--- a/src/backend/po/ja.po
+++ b/src/backend/po/ja.po
@@ -1,12 +1,12 @@
 # backend.po
-# HOTTA Michihide <hotta@net-newbie.com>, 2010.
+# HOTTA Michihide <hotta@net-newbie.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
+"Project-Id-Version: PostgreSQL 9.1 beta 2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-19 21:50+0900\n"
-"PO-Revision-Date: 2011-01-15 22:36+0900\n"
+"POT-Creation-Date: 2011-06-15 21:32+0900\n"
+"PO-Revision-Date: 2011-06-29 23:47+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -14,10447 +14,11619 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: executor/nodeSubplan.c:308 executor/nodeSubplan.c:347
-#: executor/nodeSubplan.c:962
-msgid "more than one row returned by a subquery used as an expression"
-msgstr "副������1行を超�る行を返�も������使用�れ���"
-
-#: executor/nodeHashjoin.c:721 executor/nodeHashjoin.c:755
+#: snowball/dict_snowball.c:183
 #, c-format
-msgid "could not rewind hash-join temporary file: %m"
-msgstr "�ッシュ��用一時ファイルを巻�戻�����ん"
+msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
+msgstr ""
+"言語\"%s\"�よ�符�化方�\"%s\"用�使用�能�Snowball語幹抽出��り��ん"
+
+#: snowball/dict_snowball.c:206 tsearch/dict_simple.c:50
+#: tsearch/dict_ispell.c:75
+msgid "multiple StopWords parameters"
+msgstr "�複�るStopWordsパラメータ"
+
+#: snowball/dict_snowball.c:215
+msgid "multiple Language parameters"
+msgstr "�複�るLanguageパラメータ"
 
-#: executor/nodeHashjoin.c:789 executor/nodeHashjoin.c:795
+#: snowball/dict_snowball.c:222
 #, c-format
-msgid "could not write to hash-join temporary file: %m"
-msgstr "�ッシュ��用一時ファイルを書�出���ん: %m"
+msgid "unrecognized Snowball parameter: \"%s\""
+msgstr "未知�Snowballパラメータ: \"%s\""
+
+#: snowball/dict_snowball.c:230
+msgid "missing Language parameter"
+msgstr "Languageパラメータ��り��ん"
 
-#: executor/nodeHashjoin.c:829 executor/nodeHashjoin.c:839
+#: main/main.c:237
 #, c-format
-msgid "could not read from hash-join temporary file: %m"
-msgstr "�ッシュ��用一時ファイル�ら読��れ��ん: %m"
+msgid "%s: setsysinfo failed: %s\n"
+msgstr "%s: setsysinfo�失敗����: %s\n"
 
-#: executor/execMain.c:876
+#: main/main.c:259
 #, c-format
-msgid "cannot change sequence \"%s\""
-msgstr "シーケンス\"%s\"を変更����ん"
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: WSAStartup�失敗����: %d\n"
 
-#: executor/execMain.c:882
+#: main/main.c:278
 #, c-format
-msgid "cannot change TOAST relation \"%s\""
-msgstr "TOASTリレーション\"%s\"を変更����ん"
+msgid ""
+"%s is the PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s�PostgreSQLサー���\n"
+"\n"
 
-#: executor/execMain.c:888
+#: main/main.c:279
 #, c-format
-msgid "cannot change view \"%s\""
-msgstr "ビュー\"%s\"を変更����ん"
+msgid ""
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
+msgstr ""
+"使用方法:\n"
+"\"  %s [オプション]...\n"
+"\n"
 
-#: executor/execMain.c:894
+#: main/main.c:280
 #, c-format
-msgid "cannot change relation \"%s\""
-msgstr "リレーション\"%s\"を変更����ん"
+msgid "Options:\n"
+msgstr "オプション:\n"
 
-#: executor/execMain.c:1319
+#: main/main.c:282
 #, c-format
-msgid "null value in column \"%s\" violates not-null constraint"
-msgstr "列\"%s\"内�NULL値�NOT NULL制約����"
+msgid "  -A 1|0          enable/disable run-time assert checking\n"
+msgstr "  -A 1|0          実行時�アサート検査を有効/無効����\n"
 
-#: executor/execMain.c:1331
+#: main/main.c:284
 #, c-format
-msgid "new row for relation \"%s\" violates check constraint \"%s\""
-msgstr "リレーション\"%s\"�新��行�検査制約\"%s\"��������"
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B NBUFFERS     共有�ッファ数��\n"
 
-#: executor/execMain.c:1544 executor/nodeLockRows.c:136
-#: executor/nodeModifyTable.c:334 executor/nodeModifyTable.c:522
-#: commands/trigger.c:2366
-msgid "could not serialize access due to concurrent update"
-msgstr "�時更新���直列化アクセス�����ん���"
+#: main/main.c:285
+#, c-format
+msgid "  -c NAME=VALUE   set run-time parameter\n"
+msgstr "  -c NAME=VALUE   実行時パラメータを設定���\n"
 
-#: executor/execMain.c:2091 commands/tablecmds.c:378
-msgid "ON COMMIT can only be used on temporary tables"
-msgstr "ON COMMIT�一時テーブル���使用����"
+#: main/main.c:286
+#, c-format
+msgid "  -d 1-5          debugging level\n"
+msgstr "  -d 1-5          デ�ッグレベル��\n"
 
-#: executor/execMain.c:2101 commands/tablecmds.c:388
-msgid "cannot create temporary table within security-restricted operation"
-msgstr "セキュリティー制��作中��一時テーブルを作�����ん"
+#: main/main.c:287
+#, c-format
+msgid "  -D DATADIR      database directory\n"
+msgstr "  -D DATADIR      データベースディレクトリ��\n"
 
-#: executor/execMain.c:2125 commands/indexcmds.c:225 commands/tablecmds.c:418
-#: commands/tablecmds.c:6746 commands/comment.c:737 commands/tablespace.c:410
-#: commands/tablespace.c:779 commands/tablespace.c:846
-#: commands/tablespace.c:951 commands/tablespace.c:1007
-#: commands/tablespace.c:1131 commands/dbcommands.c:436
-#: commands/dbcommands.c:1037 catalog/aclchk.c:702 utils/adt/dbsize.c:248
-#: utils/adt/acl.c:4134
+#: main/main.c:288
 #, c-format
-msgid "tablespace \"%s\" does not exist"
-msgstr "テーブル空間\"%s\"�存在���ん"
+msgid "  -e              use European date input format (DMY)\n"
+msgstr "  -e              ヨーロッパ方��日付入力を行���(DMY)\n"
 
-#: executor/nodeAgg.c:1717 executor/nodeWindowAgg.c:1842
+#: main/main.c:289
 #, c-format
-msgid "aggregate %u needs to have compatible input type and transition type"
-msgstr "集約%u�入力データ型��移用�型間�互�性�必���"
+msgid "  -F              turn fsync off\n"
+msgstr "  -F              fsyncを無効����\n"
 
-#: executor/spi.c:210
-msgid "transaction left non-empty SPI stack"
-msgstr "トランザクション�空���SPIスタックを残����"
+#: main/main.c:290
+#, c-format
+msgid "  -h HOSTNAME     host name or IP address to listen on\n"
+msgstr "  -h HOSTNAME     接続を監視�るホスト����IPアドレス��\n"
 
-#: executor/spi.c:211 executor/spi.c:275
-msgid "Check for missing \"SPI_finish\" calls."
-msgstr "\"SPI_finish\"呼出�抜�を確�����"
+#: main/main.c:291
+#, c-format
+msgid "  -i              enable TCP/IP connections\n"
+msgstr "  -i              TCP/IP接続を有効����\n"
 
-#: executor/spi.c:274
-msgid "subtransaction left non-empty SPI stack"
-msgstr "サブトランザクション�空���SPIスタックを残����"
+#: main/main.c:292
+#, c-format
+msgid "  -k DIRECTORY    Unix-domain socket location\n"
+msgstr "  -k DIRECTORY    Unixドメインソケット�場所��\n"
 
-#: executor/spi.c:1137
-msgid "cannot open multi-query plan as cursor"
-msgstr "カーソル�マル�クエリプランを開��������ん"
+#: main/main.c:294
+#, c-format
+msgid "  -l              enable SSL connections\n"
+msgstr "  -l              SSL接続を有効����\n"
 
-#. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1142
+#: main/main.c:296
 #, c-format
-msgid "cannot open %s query as cursor"
-msgstr "カーソル�%s�����を開��������ん"
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N MAX-CONNECT  許容�る最大接続数��\n"
 
-#: executor/spi.c:1233 parser/analyze.c:1969
-msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE�サ�ート�れ����ん"
+#: main/main.c:297
+#, c-format
+msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgstr ""
+"  -o OPTIONS      個々�サー�プロセス�\"OPTIONS\"を渡���(��形�)\n"
 
-#: executor/spi.c:1234 parser/analyze.c:1970
-msgid "Scrollable cursors must be READ ONLY."
-msgstr "スクロール�能カーソル�読��り�����れ��り��ん"
+#: main/main.c:298
+#, c-format
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p PORT         接続を監視�る�ート番���\n"
 
-#. translator: %s is a SQL statement name
-#: executor/spi.c:1256 executor/spi.c:1846 executor/functions.c:161
+#: main/main.c:299
 #, c-format
-msgid "%s is not allowed in a non-volatile function"
-msgstr "volatile関数以外��%s�許�れ��ん"
+msgid "  -s              show statistics after each query\n"
+msgstr "  -s              �������後�統計情報を表示���\n"
 
-#: executor/spi.c:2142
+#: main/main.c:300
 #, c-format
-msgid "SQL statement \"%s\""
-msgstr "SQLæ–‡ \"%s\""
+msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
+msgstr "  -S WORK-MEM     ソート用�メモリ���(KB��)\n"
 
-#: executor/execUtils.c:1296
+#: main/main.c:301
 #, c-format
-msgid "could not create exclusion constraint \"%s\""
-msgstr "排除制約 \"%s\" を作�����ん���"
+msgid "  --NAME=VALUE    set run-time parameter\n"
+msgstr "  --NAME=VALUE    実行時パラメータを設定���\n"
 
-#: executor/execUtils.c:1298
+#: main/main.c:302
 #, c-format
-msgid "Key %s conflicts with key %s."
-msgstr "キー %s �キー %s �競������"
+msgid "  --describe-config  describe configuration parameters, then exit\n"
+msgstr "  --describe-config  設定パラメータを出力�終了���\n"
 
-#: executor/execUtils.c:1303
+#: main/main.c:303
 #, c-format
-msgid "conflicting key value violates exclusion constraint \"%s\""
-msgstr "�複キー�値�排除制約 \"%s\" ��������"
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          ヘルプを表示�終了���\n"
 
-#: executor/execUtils.c:1305
+#: main/main.c:304
 #, c-format
-msgid "Key %s conflicts with existing key %s."
-msgstr "キー %s �既存�キー %s �競������"
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       �ージョン情報を出力�終了���\n"
 
-#: executor/execUtils.c:1319 access/nbtree/nbtinsert.c:449
+#: main/main.c:306
 #, c-format
-msgid "failed to re-find tuple within index \"%s\""
-msgstr "インデックス \"%s\" 内�行��検索�失敗����"
+msgid ""
+"\n"
+"Developer options:\n"
+msgstr ""
+"\n"
+"開発者��オプション:\n"
 
-#: executor/execUtils.c:1321 access/nbtree/nbtinsert.c:451
-msgid "This may be because of a non-immutable index expression."
-msgstr "�れ��変���インデックス評価��原因��る�能性��り��"
+#: main/main.c:307
+#, c-format
+msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
+msgstr "�����計画型を�止���\n"
 
-#: executor/execCurrent.c:66 commands/portalcmds.c:168
-#: commands/portalcmds.c:222 utils/adt/xml.c:2044 utils/adt/xml.c:2208
+#: main/main.c:308
 #, c-format
-msgid "cursor \"%s\" does not exist"
-msgstr "カーソル\"%s\"�存在���ん"
+msgid ""
+"  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr "  -n              異常終了後�共有メモリ���期化を行���ん\n"
 
-#: executor/execCurrent.c:75
+#: main/main.c:309
 #, c-format
-msgid "cursor \"%s\" is not a SELECT query"
-msgstr "カーソル\"%s\"�SELECT��������り��ん"
+msgid "  -O              allow system table structure changes\n"
+msgstr "  -O              システムテーブル構造�変更を許����\n"
 
-#: executor/execCurrent.c:81
+#: main/main.c:310
 #, c-format
-msgid "cursor \"%s\" is held from a previous transaction"
-msgstr "カーソル\"%s\"�以��トランザクション�ら���れ����"
+msgid "  -P              disable system indexes\n"
+msgstr "  -P              システムインデックスを無効����\n"
 
-#: executor/execCurrent.c:113
+#: main/main.c:311
 #, c-format
-msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
-msgstr ""
-"カーソル \"%s\" ��テーブル \"%s\" �対�る複数� FOR UPDATE/SHARE�照���"
-"れ����"
+msgid "  -t pa|pl|ex     show timings after each query\n"
+msgstr "  -t pa|pl|ex     �������後�タイミングを表示���\n"
 
-#: executor/execCurrent.c:122
+#: main/main.c:312
 #, c-format
-msgid ""
-"cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
+msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
 msgstr ""
-"カーソル \"%s\" �テーブル \"%s\" �� FOR UPDATE/SHARE �照を������ん"
+"  -T              1���ックエンドサー���止��時�全���ックエンド"
+"サー�� SIGSTOP を�信���\n"
 
-#: executor/execCurrent.c:132 executor/execCurrent.c:178
+#: main/main.c:313
 #, c-format
-msgid "cursor \"%s\" is not positioned on a row"
-msgstr "カーソル\"%s\"�行上��置�����ん"
+msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
+msgstr "  -W NUM          デ�ッガを設定��るよ��NUM秒待機���\n"
 
-#: executor/execCurrent.c:165
+#: main/main.c:315
 #, c-format
-msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
-msgstr "カーソル\"%s\"�テーブル\"%s\"を�純�更新�能スキャン���り��ん"
-
-#: executor/execCurrent.c:230 executor/execQual.c:1024
 msgid ""
-"type of parameter %d (%s) does not match that when preparing the plan (%s)"
+"\n"
+"Options for single-user mode:\n"
 msgstr ""
-"パラメータ�型 %d (%s) �プラン (%s) を準備�る時点�一致���ん"
+"\n"
+"シングルユーザモード用�オプション:\n"
 
-#: executor/execCurrent.c:242 executor/execQual.c:1035
+#: main/main.c:316
 #, c-format
-msgid "no value found for parameter %d"
-msgstr "パラメータ%d�値��り��ん"
+msgid "  --single        selects single-user mode (must be first argument)\n"
+msgstr ""
+"  --single        シングルユーザモードを�択���（最��引数���れ��り"
+"��ん）\n"
 
-#: executor/execQual.c:296 executor/execQual.c:324 executor/execQual.c:2978
-#: utils/adt/arrayfuncs.c:203 utils/adt/arrayfuncs.c:461
-#: utils/adt/arrayfuncs.c:1196 utils/adt/arrayfuncs.c:2860
-#: utils/adt/arrayfuncs.c:4540 utils/adt/array_userfuncs.c:428
+#: main/main.c:317
 #, c-format
-msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
-msgstr "�列�次数(%d)�上�(%d)を超�����"
+msgid "  DBNAME          database name (defaults to user name)\n"
+msgstr "  DBNAME          データベース（デフォルト�ユーザ���）\n"
 
-#: executor/execQual.c:309 executor/execQual.c:337
-msgid "array subscript in assignment must not be null"
-msgstr "代入���る�列�添�字�NULL������ん"
+#: main/main.c:318
+#, c-format
+msgid "  -d 0-5          override debugging level\n"
+msgstr "  -d 1-5          デ�ッグレベルを上書����\n"
 
-#: executor/execQual.c:633 executor/execQual.c:3896
+#: main/main.c:319
 #, c-format
-msgid "attribute %d has wrong type"
-msgstr "属性%d�型�間������"
+msgid "  -E              echo statement before execution\n"
+msgstr "  -E              実行��文を表示���\n"
 
-#: executor/execQual.c:634 executor/execQual.c:3897
+#: main/main.c:320
 #, c-format
-msgid "Table has type %s, but query expects %s."
-msgstr "テーブル�型�%s�����������%sを想定�����。"
+msgid "  -j              do not use newline as interactive query delimiter\n"
+msgstr "  -j              対話�������区切り���改行を使用���ん\n"
 
-#: executor/execQual.c:698 executor/execQual.c:717 executor/execQual.c:916
-#: executor/nodeModifyTable.c:82 executor/nodeModifyTable.c:92
-#: executor/nodeModifyTable.c:109 executor/nodeModifyTable.c:117
-msgid "table row type and query-specified row type do not match"
-msgstr "テーブル�行型�������指定��行型�一致���ん"
-
-#: executor/execQual.c:699
+#: main/main.c:321 main/main.c:326
 #, c-format
-msgid "Table row contains %d attribute, but query expects %d."
-msgid_plural "Table row contains %d attributes, but query expects %d."
-msgstr[0] "テーブル行��%d属性�り�����������%dを想定�����。"
-msgstr[1] "テーブル行��%d属性�り�����������%dを想定�����。"
+msgid "  -r FILENAME     send stdout and stderr to given file\n"
+msgstr ""
+"  -r FILENAME     標準出力�標準エラー出力を指定��ファイル��信���\n"
 
-#: executor/execQual.c:718 executor/nodeModifyTable.c:93
+#: main/main.c:323
 #, c-format
-msgid "Table has type %s at ordinal position %d, but query expects %s."
+msgid ""
+"\n"
+"Options for bootstrapping mode:\n"
 msgstr ""
-"テーブル�� %2$d 番目�型� %1$s ����������� %3$s を想定����"
-"�。"
+"\n"
+"�期起動用�オプション:\n"
 
-#: executor/execQual.c:917 executor/execQual.c:1505
+#: main/main.c:324
 #, c-format
-msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
-msgstr "�数�置%d�削除�れ�属性���る物�格�方��一致���ん。"
+msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
+msgstr ""
+"  --boot          �期起動モードを�択���（最��引数���れ��り��"
+"ん）\n"
 
-#: executor/execQual.c:1189 parser/parse_func.c:91 parser/parse_func.c:310
-#: parser/parse_func.c:623
+#: main/main.c:325
 #, c-format
-msgid "cannot pass more than %d argument to a function"
-msgid_plural "cannot pass more than %d arguments to a function"
-msgstr[0] "関数�%dを超�る引数を渡���ん"
-msgstr[1] "関数�%dを超�る引数を渡���ん"
+msgid ""
+"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
+msgstr "  DBNAME         データベース�（�期起動モード��義務的�引数）\n"
 
-#: executor/execQual.c:1373
-msgid "functions and operators can take at most one set argument"
-msgstr "関数�演算��多��も1��集�引数を�る�������"
+#: main/main.c:327
+#, c-format
+msgid "  -x NUM          internal use\n"
+msgstr "  -x NUM          内部使用\n"
 
-#: executor/execQual.c:1423
+#: main/main.c:329
+#, c-format
 msgid ""
-"function returning setof record called in context that cannot accept type "
-"record"
+"\n"
+"Please read the documentation for the complete list of run-time\n"
+"configuration settings and how to set them on the command line or in\n"
+"the configuration file.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
-"複数行レコードを返�関数��レコード型を��付���文脈�呼�出�れ���"
+"\n"
+"実効時設定パラメータ�全一覧�コマンドラインや設定ファイル���る\n"
+"設定方法�����ドキュメントを�照������。\n"
+"\n"
+"�具��<pgsql-bugs@postgresql.org>��報告������\n"
 
-#: executor/execQual.c:1478 executor/execQual.c:1494 executor/execQual.c:1504
-msgid "function return row and query-specified return row do not match"
-msgstr "������指定��戻り値�行�実際�関数�戻り値�行�一致���ん"
+#: main/main.c:343
+msgid ""
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"PostgreSQLを\"root\"�実行�る�������ん。\n"
+"システムセキュリティ��険防止����特権ユーザID�サー�を起動��\n"
+"�れ��り��ん。�切�サー��起動方法�関�る詳細�ドキュメントを\n"
+"�照������\n"
 
-#: executor/execQual.c:1479
+#: main/main.c:360
 #, c-format
-msgid "Returned row contains %d attribute, but query expects %d."
-msgid_plural "Returned row contains %d attributes, but query expects %d."
-msgstr[0] "%d属性を��行�返�れ���。�������%dを想定�����。"
-msgstr[1] "%d属性を��行�返�れ���。�������%dを想定�����。"
+msgid "%s: real and effective user IDs must match\n"
+msgstr "%s: リアルユーザID�実効ユーザID�一致���れ��り��ん\n"
 
-#: executor/execQual.c:1495
-#, c-format
-msgid "Returned type %s at ordinal position %d, but query expects %s."
+#: main/main.c:367
+msgid ""
+"Execution of PostgreSQL by a user with administrative permissions is not\n"
+"permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromises.  See the documentation for\n"
+"more information on how to properly start the server.\n"
 msgstr ""
-"�数�置%2$d�型%1$s�返�れ���。�������%3$sを想定�����。"
-
-#: executor/execQual.c:1615 executor/execQual.c:1640 executor/execQual.c:2001
-#: executor/execQual.c:5090 executor/functions.c:652 commands/prepare.c:747
-#: utils/mmgr/portalmem.c:926 utils/fmgr/funcapi.c:60 foreign/foreign.c:271
-msgid "set-valued function called in context that cannot accept a set"
-msgstr "��コンテキスト�集�値�関数�集�を��付�られ��ん"
-
-#: executor/execQual.c:1748 executor/execQual.c:2161
-msgid "table-function protocol for materialize mode was not followed"
-msgstr "materializeモード��テーブル関数プロトコル�従���ん"
+"PostgreSQLを管�者権�を��ユーザ�実行�る�������ん。\n"
+"システムセキュリティ��険防止����特権ユーザID�サー�を起動��\n"
+"�れ��り��ん。�切�サー��起動方法�関�る詳細�ドキュメントを\n"
+"�照������\n"
 
-#: executor/execQual.c:1768 executor/execQual.c:2168
+#: main/main.c:388
 #, c-format
-msgid "unrecognized table-function returnMode: %d"
-msgstr "テーブル関数�returnMode��明��: %d"
-
-#: executor/execQual.c:2088
-msgid "function returning set of rows cannot return null value"
-msgstr "行�集�を返�関数�NULL値を返��������ん"
+msgid "%s: invalid effective UID: %d\n"
+msgstr "%s: 実効UID�無効��: %d\n"
 
-#: executor/execQual.c:2328
-msgid "IS DISTINCT FROM does not support set arguments"
-msgstr "IS DISTINCT FROM<�集�引数をサ�ート���ん"
+#: main/main.c:401
+#, c-format
+msgid "%s: could not determine user name (GetUserName failed)\n"
+msgstr "%s: ユーザ�を決定����ん���(GetUserName�失敗����)\n"
 
-#: executor/execQual.c:2403
-msgid "op ANY/ALL (array) does not support set arguments"
-msgstr "op ANY/ALL (array)�集�引数をサ�ート���ん"
+#: regex/regc_pg_locale.c:258 utils/adt/selfuncs.c:4969
+#, 
+msgid "could not determine which collation to use for regular expression"
+msgstr "正�表��際���照��則を使����を決定����ん���"
 
-#: executor/execQual.c:2725 commands/analyze.c:1481
-msgid "could not convert row type"
-msgstr "行�型�変�����ん���"
+#: regex/regc_pg_locale.c:259 catalog/heap.c:560 utils/adt/formatting.c:1520
+#: utils/adt/formatting.c:1570 utils/adt/formatting.c:1641
+#: utils/adt/formatting.c:1691 utils/adt/formatting.c:1774
+#: utils/adt/formatting.c:1836 utils/adt/varlena.c:1315 utils/adt/like.c:212
+#: utils/adt/selfuncs.c:4853 utils/adt/selfuncs.c:4970
+#: commands/indexcmds.c:931 commands/view.c:145
+msgid "Use the COLLATE clause to set the collation explicitly."
+msgstr "照�順�を明示�る�� COLLATE �を使���"
 
-#: executor/execQual.c:2956
-msgid "cannot merge incompatible arrays"
-msgstr "互�性����列をマージ����ん"
+#: access/gin/ginscan.c:401
+#,
+msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
+msgstr "�� GIN インデックス�インデックス全体�スキャンや NULL �検索を"
+"サ�ート�����ん"
 
-#: executor/execQual.c:2957
+#: access/gin/ginscan.c:402
 #, c-format
-msgid ""
-"Array with element type %s cannot be included in ARRAY construct with "
-"element type %s."
-msgstr "�素型%s��列を�素型%s�ARRAY����られ��ん"
-
-#: executor/execQual.c:2998 executor/execQual.c:3025
-#: utils/adt/arrayfuncs.c:496
-msgid ""
-"multidimensional arrays must have array expressions with matching dimensions"
-msgstr "多次元�列�次数�����列�を����れ��り��ん"
-
-#: executor/execQual.c:3540
-msgid "NULLIF does not support set arguments"
-msgstr "NULLIF�集�引数をサ�ート���ん"
+msgid "To fix this, do REINDEX INDEX \"%s\"."
+msgstr "修復�る�� REINDEX INDEX \"%s\" を���������"
 
-#: executor/execQual.c:3770 utils/adt/domains.c:128
+#: access/gin/ginentrypage.c:101 access/nbtree/nbtinsert.c:531
+#: access/nbtree/nbtsort.c:483
 #, c-format
-msgid "domain %s does not allow null values"
-msgstr "ドメイン%s�NULL値を許���ん"
+msgid "index row size %lu exceeds maximum %lu for index \"%s\""
+msgstr ""
+"インデックス \"%3$s\" �インデックス行�サイズ %1$lu �最大値 %2$lu を"
+"超�����"
 
-#: executor/execQual.c:3799 utils/adt/domains.c:164
+#: access/index/indexam.c:161 catalog/objectaddress.c:391
+#: commands/tablecmds.c:220 commands/tablecmds.c:2485
+#: commands/indexcmds.c:1542
 #, c-format
-msgid "value for domain %s violates check constraint \"%s\""
-msgstr "ドメイン%s�値�検査制約\"%s\"��������"
-
-#: executor/execQual.c:4267 optimizer/util/clauses.c:560
-#: parser/parse_agg.c:160
-msgid "aggregate function calls cannot be nested"
-msgstr "集約関数�呼�出�を入れ���る�������ん"
+msgid "\"%s\" is not an index"
+msgstr "\"%s\"�インデックス���り��ん"
 
-#: executor/execQual.c:4305 optimizer/util/clauses.c:634
-#: parser/parse_agg.c:207
-msgid "window function calls cannot be nested"
-msgstr "ウィンドウ関数�呼�出�を入れ���る�������ん"
+#: access/transam/xlog.c:1328
+#, c-format
+msgid "could not create archive status file \"%s\": %m"
+msgstr "アーカイブステータスファイル\"%s\"を作�����ん���: %m"
 
-#: executor/execQual.c:4505
-msgid "target type is not an array"
-msgstr "対照型��列���り��ん"
+#: access/transam/xlog.c:1336
+#, c-format
+msgid "could not write archive status file \"%s\": %m"
+msgstr "アーカイブステータスファイル\\\"%s\\\"を書�出���ん���: %m"
 
-#: executor/execQual.c:4618
+#: access/transam/xlog.c:1791 access/transam/xlog.c:10337
+#: replication/walsender.c:1003 replication/walreceiver.c:506
 #, c-format
-msgid "ROW() column has type %s instead of type %s"
-msgstr "ROW()�列�型%2$s����型%1$sを����"
+msgid "could not seek in log file %u, segment %u to offset %u: %m"
+msgstr ""
+"ログファイル%u�セグメント%uをオフセット%u��シーク����ん���: %m"
 
-#: executor/execQual.c:4749 utils/adt/arrayfuncs.c:3280
-#: utils/adt/rowtypes.c:913
+#: access/transam/xlog.c:1808 replication/walreceiver.c:523
 #, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "型%s�比較関数を識別����ん"
+msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
+msgstr ""
+"ログファイル%u�セグメント%uをオフセット%u�長�%lu�書�出���ん���: %m"
 
-#: executor/nodeWindowAgg.c:1233
-msgid "frame starting offset must not be null"
-msgstr "フレーム�インタ�オフセット� NULL ������り��ん"
+#: access/transam/xlog.c:2010
+#, c-format
+msgid "updated min recovery point to %X/%X"
+msgstr "最�リカ�リ�イントを %X/%X �更新����"
 
-#: executor/nodeWindowAgg.c:1246
-msgid "frame starting offset must not be negative"
-msgstr "フレーム開始オフセット�負数������り��ん"
+#: access/transam/xlog.c:2351 access/transam/xlog.c:2455
+#: access/transam/xlog.c:2684 access/transam/xlog.c:2755
+#: access/transam/xlog.c:2812 replication/walsender.c:991
+#, c-format
+msgid "could not open file \"%s\" (log file %u, segment %u): %m"
+msgstr ""
+"ファイル\"%s\"(ログファイル%u�セグメント%u)をオープン����ん���: %m"
 
-#: executor/nodeWindowAgg.c:1259
-msgid "frame ending offset must not be null"
-msgstr "フレーム終了オフセット� NULL ������り��ん"
+#: access/transam/xlog.c:2376 access/transam/xlog.c:2509
+#: access/transam/xlog.c:4397 access/transam/xlog.c:9015
+#: access/transam/xlog.c:9255 postmaster/postmaster.c:3690
+#: storage/smgr/md.c:285 storage/file/copydir.c:172
+#, c-format
+msgid "could not create file \"%s\": %m"
+msgstr "ファイル\"%s\"を作�����ん���: %m"
 
-#: executor/nodeWindowAgg.c:1272
-msgid "frame ending offset must not be negative"
-msgstr "フレーム終了オフセット�負数������り��ん"
+#: access/transam/xlog.c:2408 access/transam/xlog.c:2541
+#: access/transam/xlog.c:4449 access/transam/xlog.c:4512
+#: postmaster/postmaster.c:3700 postmaster/postmaster.c:3710
+#: storage/file/copydir.c:197 utils/init/miscinit.c:1089
+#: utils/init/miscinit.c:1098 utils/init/miscinit.c:1105 utils/misc/guc.c:7414
+#: utils/misc/guc.c:7439
+#, c-format
+msgid "could not write to file \"%s\": %m"
+msgstr "ファイル\"%s\"を書�出���ん���: %m"
 
-#: executor/nodeLimit.c:251
-msgid "OFFSET must not be negative"
-msgstr "OFFSET �負数������り��ん"
+#: access/transam/xlog.c:2416 access/transam/xlog.c:2548
+#: access/transam/xlog.c:4518 storage/smgr/md.c:918 storage/smgr/md.c:1124
+#: storage/smgr/md.c:1275 storage/file/copydir.c:269
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "ファイル\"%s\"をfsync����ん���: %m"
 
-#: executor/nodeLimit.c:278
-msgid "LIMIT must not be negative"
-msgstr "LIMIT �負数������り��ん"
+#: access/transam/xlog.c:2421 access/transam/xlog.c:2553
+#: access/transam/xlog.c:4523 storage/file/copydir.c:211 commands/copy.c:1329
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "ファイル\"%s\"をクローズ����ん���: %m"
 
-#: executor/nodeModifyTable.c:83
-msgid "Query has too many columns."
-msgstr "������列�多����"
+#: access/transam/xlog.c:2494 access/transam/xlog.c:4166
+#: access/transam/xlog.c:4260 access/transam/xlog.c:4416
+#: replication/basebackup.c:725 storage/smgr/md.c:539 storage/smgr/md.c:796
+#: storage/file/copydir.c:165 storage/file/copydir.c:255
+#: utils/error/elog.c:1469 utils/init/miscinit.c:1039
+#: utils/init/miscinit.c:1153
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "ファイル\"%s\"をオープン����ん���: %m"
 
-#: executor/nodeModifyTable.c:110
+#: access/transam/xlog.c:2522 access/transam/xlog.c:4428
+#: access/transam/xlog.c:9187 access/transam/xlog.c:9200
+#: access/transam/xlog.c:9730 access/transam/xlog.c:9755
+#: storage/file/copydir.c:186 utils/adt/genfile.c:138
 #, c-format
-msgid "Query provides a value for a dropped column at ordinal position %d."
-msgstr "クエリー� %d 番目�削除�れるカラム�値を指定�����。"
+msgid "could not read file \"%s\": %m"
+msgstr "ファイル\"%s\"を読�込���ん���: %m"
 
-#: executor/nodeModifyTable.c:118
-msgid "Query has too few columns."
-msgstr "������列�少�����"
+#: access/transam/xlog.c:2525
+#, c-format
+msgid "not enough data in file \"%s\""
+msgstr "ファイル\"%s\"内�データ���分��"
 
-#. translator: %s is a SQL statement name
-#: executor/functions.c:154
+#: access/transam/xlog.c:2644
 #, c-format
-msgid "%s is not allowed in a SQL function"
-msgstr "SQL関数��%s�許�れ��ん"
+msgid ""
+"could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
+"%u): %m"
+msgstr ""
+"ファイル\"%s\"を\"%s\"�リンク����ん���(ログファイル%u�セグメント%u�"
+"�期化): %m"
 
-#: executor/functions.c:259
+#: access/transam/xlog.c:2656
 #, c-format
 msgid ""
-"could not determine actual result type for function declared to return type %"
-"s"
-msgstr "戻り値型%s���宣言�れ�関数�実際��果型を決定����ん"
+"could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
+"segment %u): %m"
+msgstr ""
+"ファイル\"%s\"���を\"%s\"�変更����ん���(ログファイル%u�セグメン"
+"ト%u��期化): %m"
 
-#: executor/functions.c:298
+#: access/transam/xlog.c:2839 replication/walreceiver.c:480
 #, c-format
-msgid "could not determine actual type of argument declared %s"
-msgstr "%s都宣言�れ�引数�型を決定����ん"
+msgid "could not close log file %u, segment %u: %m"
+msgstr "ログファイル%u�セグメント%uをクローズ����ん���: %m"
 
-#: executor/functions.c:923
+#: access/transam/xlog.c:2911 access/transam/xlog.c:3076
+#: access/transam/xlog.c:9000 access/transam/xlog.c:9175
+#: storage/file/copydir.c:86 storage/file/copydir.c:125 utils/adt/dbsize.c:65
+#: utils/adt/dbsize.c:211 utils/adt/dbsize.c:276 utils/adt/genfile.c:107
+#: utils/adt/genfile.c:279
 #, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "SQL関数\"%s\"�行番� %d"
+msgid "could not stat file \"%s\": %m"
+msgstr "ファイル\"%s\"�stat�����ん���: %m"
 
-#: executor/functions.c:936 catalog/pg_proc.c:861
+#: access/transam/xlog.c:2919 access/transam/xlog.c:9205 storage/smgr/md.c:355
+#: storage/smgr/md.c:402 storage/smgr/md.c:1238
 #, c-format
-msgid "SQL function \"%s\""
-msgstr "SQL関数\"%s\""
+msgid "could not remove file \"%s\": %m"
+msgstr "ファイル\"%s\"を削除����ん���: %m"
 
-#: executor/functions.c:946
+#: access/transam/xlog.c:3055
 #, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "SQL関数\"%s\"�起動中"
+msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
+msgstr "アーカイブファイル\"%s\"�サイズ��正��: %lu。%luを想定"
 
-#: executor/functions.c:1091 executor/functions.c:1127
-#: executor/functions.c:1139 executor/functions.c:1245
-#: executor/functions.c:1277 executor/functions.c:1306
+#: access/transam/xlog.c:3064
 #, c-format
-msgid "return type mismatch in function declared to return %s"
-msgstr "%sを返��宣言�れ�関数����戻り値型�一致���ん"
+msgid "restored log file \"%s\" from archive"
+msgstr "ログファイル\"%s\"をアーカイブ�らリストア����"
 
-#: executor/functions.c:1093
-msgid ""
-"Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
-msgstr ""
-"関数�最後�ステートメント� SELECT も��� RETURNING 付��INSERT/UPDATE/"
-"DELETE ���れ����れ��り��ん"
+#: access/transam/xlog.c:3114
+#, c-format
+msgid "could not restore file \"%s\" from archive: return code %d"
+msgstr "アーカイブ�らファイル\"%s\"をリストア����ん���: 戻りコード %d"
 
-#: executor/functions.c:1129
-msgid "Final statement must return exactly one column."
-msgstr "最後�ステートメント�正確�1列を返���れ��り��ん"
+#: access/transam/xlog.c:3229
+#, c-format
+msgid "%s \"%s\": return code %d"
+msgstr "%s \"%s\": リターンコード %d"
 
-#: executor/functions.c:1141
+#: access/transam/xlog.c:3339 access/transam/xlog.c:3522
 #, c-format
-msgid "Actual return type is %s."
-msgstr "実際�戻り値型�%s��"
+msgid "could not open transaction log directory \"%s\": %m"
+msgstr "トランザクションログディレクトリ\"%s\"をオープン����ん���: %m"
 
-#: executor/functions.c:1247
-msgid "Final statement returns too many columns."
-msgstr "最後�ステートメント�返�列�多����"
+#: access/transam/xlog.c:3393
+#, c-format
+msgid "recycled transaction log file \"%s\""
+msgstr "トランザクションログファイル\"%s\"を回�����"
 
-#: executor/functions.c:1279
+#: access/transam/xlog.c:3409
 #, c-format
-msgid "Final statement returns %s instead of %s at column %d."
-msgstr "最後�ステートメント�列 %3$d � %2$s ���� %1$s を返����"
-
-#: executor/functions.c:1308
-msgid "Final statement returns too few columns."
-msgstr "最後�ステートメント�返�列�少�����"
+msgid "removing transaction log file \"%s\""
+msgstr "トランザクションログファイル\"%s\"を削除����"
 
-#: executor/functions.c:1356
+#: access/transam/xlog.c:3432
 #, c-format
-msgid "return type %s is not supported for SQL functions"
-msgstr "戻り値型%s�SQL関数�サ�ート�れ����ん"
-
-#: executor/nodeMergejoin.c:1586
-msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
-msgstr "RIGHT JOIN�マージ���能����件���サ�ート�れ����"
-
-#: executor/nodeMergejoin.c:1606 optimizer/path/joinpath.c:1072
-msgid "FULL JOIN is only supported with merge-joinable join conditions"
-msgstr "FULL JOIN�マージ���能����件���サ�ート�れ����"
-
-#: rewrite/rewriteManip.c:1009
-msgid "conditional utility statements are not implemented"
-msgstr "�件付��ユーティリティ文�実装�れ����ん"
+msgid "could not rename old transaction log file \"%s\": %m"
+msgstr "��トランザクションログファイル \"%s\" をリ�ーム����ん���: %m"
 
-#: rewrite/rewriteManip.c:1021 rewrite/rewriteHandler.c:432
-#: parser/parse_utilcmd.c:1808 parser/parse_utilcmd.c:1878
-msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
-msgstr "�件付��UNION/INTERSECT/EXCEPT文�実装�れ����ん"
+#: access/transam/xlog.c:3444
+#, c-format
+msgid "could not remove old transaction log file \"%s\": %m"
+msgstr "��トランザクションログファイル \"%s\" を削除����ん���: %m"
 
-#: rewrite/rewriteManip.c:1174
-msgid "WHERE CURRENT OF on a view is not implemented"
-msgstr "ビュー�対�るWHERE CURRENT OF�実装�れ����ん"
+#: access/transam/xlog.c:3482 access/transam/xlog.c:3492
+#, c-format
+msgid "required WAL directory \"%s\" does not exist"
+msgstr "WAL ディレクトリ\"%s\"�存在���ん"
 
-#: rewrite/rewriteRemove.c:62 rewrite/rewriteDefine.c:687
-#: rewrite/rewriteDefine.c:749 commands/comment.c:910
+#: access/transam/xlog.c:3498
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist"
-msgstr "リレーション\"%2$s\"�ルール\"%1$s\"�存在���ん"
+msgid "creating missing WAL directory \"%s\""
+msgstr "見��ら���� WAL ディレクトリ \"%s\" を作������ ... "
 
-#: rewrite/rewriteRemove.c:66
+#: access/transam/xlog.c:3501
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "リレーション\"%2$s\"�ルール\"%1$s\"�存在���ん。�略���"
+msgid "could not create missing directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"を作�����ん���: %m"
 
-#: rewrite/rewriteDefine.c:108 rewrite/rewriteDefine.c:756
+#: access/transam/xlog.c:3535
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" already exists"
-msgstr "リレーション\"%2$s\"�ルール\"%1$s\"����存在���"
+msgid "removing transaction log backup history file \"%s\""
+msgstr "トランザクションログ�ックアップ履歴ファイル\"%s\"を削除�����"
 
-#: rewrite/rewriteDefine.c:252 commands/tablecmds.c:3329
+#: access/transam/xlog.c:3655
 #, c-format
-msgid "\"%s\" is not a table or view"
-msgstr "\"%s\"�テーブルやビュー���り��ん"
+msgid "incorrect hole size in record at %X/%X"
+msgstr "%X/%X�レコード�ホールサイズ��正��"
 
-#: rewrite/rewriteDefine.c:258 tcop/utility.c:92 commands/tablecmds.c:761
-#: commands/tablecmds.c:1093 commands/tablecmds.c:1985
-#: commands/tablecmds.c:3347 commands/tablecmds.c:3376
-#: commands/tablecmds.c:4778 commands/trigger.c:155 commands/trigger.c:1069
+#: access/transam/xlog.c:3668
 #, c-format
-msgid "permission denied: \"%s\" is a system catalog"
-msgstr "権���り��ん: \"%s\"�システムカタログ��"
+msgid "incorrect total length in record at %X/%X"
+msgstr "%X/%X�レコード内�全長��正��"
 
-#: rewrite/rewriteDefine.c:282
-msgid "rule actions on OLD are not implemented"
-msgstr "OLD�対�るルールアクション�実装�れ����ん"
+#: access/transam/xlog.c:3681
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr "%X/%X�レコード内�リソースマ�ージャデータ��ェックサム��正��"
 
-#: rewrite/rewriteDefine.c:283
-msgid "Use views or triggers instead."
-msgstr "代�り�ビュー�トリガを使用������。"
+#: access/transam/xlog.c:3750 access/transam/xlog.c:3786
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "%X/%X�レコードオフセット�無効��"
 
-#: rewrite/rewriteDefine.c:287
-msgid "rule actions on NEW are not implemented"
-msgstr "NEW�対�るルールアクション�実装�れ����ん"
+#: access/transam/xlog.c:3794
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "%X/%X��contrecord�必���"
 
-#: rewrite/rewriteDefine.c:288
-msgid "Use triggers instead."
-msgstr "代�り�トリガを使用������。"
+#: access/transam/xlog.c:3809
+#, c-format
+msgid "invalid xlog switch record at %X/%X"
+msgstr "%X/%X�xlog切り替�レコード�無効��"
 
-#: rewrite/rewriteDefine.c:301
-msgid "INSTEAD NOTHING rules on SELECT are not implemented"
-msgstr "SELECT�対�るINSTEAD NOTHINGルール�実装�れ����ん"
+#: access/transam/xlog.c:3817
+#, c-format
+msgid "record with zero length at %X/%X"
+msgstr "%X/%X�レコード�サイズ�0��"
 
-#: rewrite/rewriteDefine.c:302
-msgid "Use views instead."
-msgstr "代�り�ビューを使用������"
+#: access/transam/xlog.c:3826
+#, c-format
+msgid "invalid record length at %X/%X"
+msgstr "%X/%X�レコード長�無効��"
 
-#: rewrite/rewriteDefine.c:310
-msgid "multiple actions for rules on SELECT are not implemented"
-msgstr "SELECT�対�るルール���る複数�アクション�実装�れ����ん"
+#: access/transam/xlog.c:3833
+#, c-format
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "%2$X/%3$X�リソースマ�ージャID %1$u�無効��"
 
-#: rewrite/rewriteDefine.c:322
-msgid "rules on SELECT must have action INSTEAD SELECT"
-msgstr "SELECT�対�るルール�INSTEAD SELECTアクションを����れ��り��ん"
+#: access/transam/xlog.c:3846 access/transam/xlog.c:3862
+#, c-format
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "直��リンク%1$X/%2$X��正�レコード�%3$X/%4$X��り��"
 
-#: rewrite/rewriteDefine.c:330
-msgid "event qualifications are not implemented for rules on SELECT"
-msgstr "SELECT�対�るルール��イベント�件�実装�れ����ん"
+#: access/transam/xlog.c:3891
+#, c-format
+msgid "record length %u at %X/%X too long"
+msgstr "%2$X/%3$X�レコード長%1$u�大�����"
 
-#: rewrite/rewriteDefine.c:355
+#: access/transam/xlog.c:3931
 #, c-format
-msgid "\"%s\" is already a view"
-msgstr "\"%s\"����ビュー��"
+msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
+msgstr "ログファイル%u�セグメント%u�オフセット%u�contrecord��り��ん"
 
-#: rewrite/rewriteDefine.c:379
+#: access/transam/xlog.c:3941
 #, c-format
-msgid "view rule for \"%s\" must be named \"%s\""
-msgstr "\"%s\"用�ビュー�ルール����\"%s\"���れ��り��ん"
+msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
+msgstr ""
+"ログファイル%2$u�セグメント%3$u�オフセット%4$u�contrecord�長�%1$u�無効"
+"��"
 
-#: rewrite/rewriteDefine.c:404
+#: access/transam/xlog.c:4031
 #, c-format
-msgid "could not convert table \"%s\" to a view because it is not empty"
-msgstr "空���り��ん��テーブル\"%s\"をビュー�変�����ん"
+msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
+msgstr ""
+"ログファイル%2$u�セグメント%3$u�オフセット%4$u�マジック番�%1$04X�無効�"
+"�"
 
-#: rewrite/rewriteDefine.c:411
+#: access/transam/xlog.c:4038 access/transam/xlog.c:4084
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has triggers"
-msgstr "トリガを����る��テーブル\"%s\"をビュー�変�����ん���"
+msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
+msgstr ""
+"ログファイル %2$u �セグメント %3$u�オフセット %4$u �情報ビット %1$04X �無"
+"効��"
 
-#: rewrite/rewriteDefine.c:413
-msgid ""
-"In particular, the table cannot be involved in any foreign key relationships."
-msgstr "具体的���テーブル�外部キー関係を���る�������ん"
+#: access/transam/xlog.c:4060 access/transam/xlog.c:4068
+#: access/transam/xlog.c:4075
+msgid "WAL file is from different database system"
+msgstr "WAL ファイル�異�るデータベースシステム由��も���"
 
-#: rewrite/rewriteDefine.c:418
+#: access/transam/xlog.c:4061
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has indexes"
+msgid ""
+"WAL file database system identifier is %s, pg_control database system "
+"identifier is %s."
 msgstr ""
-"インデックスを����る��テーブル\"%s\"をビュー�変�����ん���"
+"WAL ファイル���るデータベースシステム�識別�� %s ��pg_control ���る"
+"データベースシステム�識別�� %s ��。"
 
-#: rewrite/rewriteDefine.c:424
-#, c-format
-msgid "could not convert table \"%s\" to a view because it has child tables"
-msgstr "�テーブルを����る��テーブル\"%s\"をビュー�変�����ん���"
+#: access/transam/xlog.c:4069
+msgid "Incorrect XLOG_SEG_SIZE in page header."
+msgstr "ページヘッダ内�XLOG_SEG_SIZE��正��。"
 
-#: rewrite/rewriteDefine.c:451
-msgid "cannot have multiple RETURNING lists in a rule"
-msgstr "ルール��複数�RETURNING行を���������ん"
+#: access/transam/xlog.c:4076
+msgid "Incorrect XLOG_BLCKSZ in page header."
+msgstr "ページヘッダ内�XLOG_BLCKSZ��正��。"
 
-#: rewrite/rewriteDefine.c:456
-msgid "RETURNING lists are not supported in conditional rules"
-msgstr "�件付�ルール��RETURNINGリスト�サ�ート�れ��ん"
+#: access/transam/xlog.c:4092
+#, c-format
+msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
+msgstr ""
+"ログファイル%3$u�セグメント%4$u�オフセット%5$u�ページアドレス%1$X/%2$X�想"
+"定外��"
 
-#: rewrite/rewriteDefine.c:460
-msgid "RETURNING lists are not supported in non-INSTEAD rules"
-msgstr "INSTEAD以外�ルール��RETURNING�サ�ート�れ��ん"
+#: access/transam/xlog.c:4104
+#, c-format
+msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
+msgstr ""
+"ログファイル%2$u�セグメント%3$u�オフセット%4$u�時系列ID%1$u�想定外��"
 
-#: rewrite/rewriteDefine.c:539
-msgid "SELECT rule's target list has too many entries"
-msgstr "SELECTルール�対象リスト�項目�多����"
+#: access/transam/xlog.c:4122
+#, c-format
+msgid ""
+"out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
+"%u"
+msgstr ""
+"ログファイル%3$u�セグメント%4$u�オフセット%5$u�時系列ID %1$u(%2$u�後)�順"
+"��従�����ん"
 
-#: rewrite/rewriteDefine.c:540
-msgid "RETURNING list has too many entries"
-msgstr "RETURNINGリスト�項目�多����"
+#: access/transam/xlog.c:4195
+#, c-format
+msgid "syntax error in history file: %s"
+msgstr "履歴ファイル内�構文エラー: %s"
 
-#: rewrite/rewriteDefine.c:556
-msgid "cannot convert relation containing dropped columns to view"
-msgstr "削除�れ�列を��リレーションをビュー�変�����ん"
+#: access/transam/xlog.c:4196
+msgid "Expected a numeric timeline ID."
+msgstr "数字�時系列IDを想定����。"
 
-#: rewrite/rewriteDefine.c:561
+#: access/transam/xlog.c:4201
 #, c-format
-msgid "SELECT rule's target entry %d has different column name from \"%s\""
-msgstr "SELECTルール�対象項目%d�\"%s\"�異�る列�を������"
+msgid "invalid data in history file: %s"
+msgstr "履歴ファイル内�無効�データ: %s"
 
-#: rewrite/rewriteDefine.c:567
-#, c-format
-msgid "SELECT rule's target entry %d has different type from column \"%s\""
-msgstr "SELECTルール�対象項目%d�\"%s\"�異�る列型を������"
+#: access/transam/xlog.c:4202
+msgid "Timeline IDs must be in increasing sequence."
+msgstr "時系列ID�昇順�並����れ��り��ん"
 
-#: rewrite/rewriteDefine.c:569
+#: access/transam/xlog.c:4215
 #, c-format
-msgid "RETURNING list's entry %d has different type from column \"%s\""
-msgstr "RETURNINGリスト項目%d�\"%s\"�異�る列型を������"
+msgid "invalid data in history file \"%s\""
+msgstr "履歴ファイル\"%s\"内�無効�データ��り���"
 
-#: rewrite/rewriteDefine.c:584
+#: access/transam/xlog.c:4216
+msgid "Timeline IDs must be less than child timeline's ID."
+msgstr "時系列ID�副時系列IDより�����れ��り��ん。"
+
+#: access/transam/xlog.c:4302
 #, c-format
-msgid "SELECT rule's target entry %d has different size from column \"%s\""
-msgstr "SELECTルール�対象項目%d�\"%s\"�異�る列�サイズを������"
+msgid "new timeline %u is not a child of database system timeline %u"
+msgstr "新��時系列 %u �データベースシステム�時系列 %u �系列���り��ん"
 
-#: rewrite/rewriteDefine.c:586
+#: access/transam/xlog.c:4315
 #, c-format
-msgid "RETURNING list's entry %d has different size from column \"%s\""
-msgstr "RETURNINGリスト項目%d�\"%s\"�異�る列�サイズを������"
+msgid "new target timeline is %u"
+msgstr "新��対象時系列� %u ��"
 
-#: rewrite/rewriteDefine.c:594
-msgid "SELECT rule's target list has too few entries"
-msgstr "SELECTルール�対象リスト�項目�少�����"
+#: access/transam/xlog.c:4540
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "ファイル\"%s\"�ら\"%s\"��リンク�����ん���: %m"
 
-#: rewrite/rewriteDefine.c:595
-msgid "RETURNING list has too few entries"
-msgstr "RETURNINGリスト�項目�少�����"
+#: access/transam/xlog.c:4547 access/transam/xlog.c:5502
+#: access/transam/xlog.c:5555 access/transam/xlog.c:6326
+#: postmaster/pgarch.c:715
+#, c-format
+msgid "could not rename file \"%s\" to \"%s\": %m"
+msgstr "ファイル\"%s\"���を\"%s\"�変更����ん���: %m"
 
-#: rewrite/rewriteHandler.c:495
-msgid "cannot have RETURNING lists in multiple rules"
-msgstr "複数ルール��RETURNINGリストを���������ん"
+#: access/transam/xlog.c:4629
+#, c-format
+msgid "could not create control file \"%s\": %m"
+msgstr "制御ファイル\"%s\"を作�����ん���: %m"
 
-#: rewrite/rewriteHandler.c:796 rewrite/rewriteHandler.c:814
+#: access/transam/xlog.c:4640 access/transam/xlog.c:4865
 #, c-format
-msgid "multiple assignments to same column \"%s\""
-msgstr "��列\"%s\"�複数�代入��り��"
+msgid "could not write to control file: %m"
+msgstr "制御ファイルを書�出���ん���: %m"
 
-#: rewrite/rewriteHandler.c:952 catalog/heap.c:2280
+#: access/transam/xlog.c:4646 access/transam/xlog.c:4871
 #, c-format
-msgid "column \"%s\" is of type %s but default expression is of type %s"
-msgstr "列\"%s\"�型�%s����デフォルト��型�%s��"
+msgid "could not fsync control file: %m"
+msgstr "制御ファイルをfsync����ん���: %m"
 
-#: rewrite/rewriteHandler.c:957 commands/prepare.c:369 catalog/heap.c:2285
-#: parser/parse_node.c:370 parser/parse_target.c:475 parser/parse_target.c:734
-#: parser/parse_target.c:744
-msgid "You will need to rewrite or cast the expression."
-msgstr "�を書���る�キャスト���れ��り��ん"
+#: access/transam/xlog.c:4651 access/transam/xlog.c:4876
+#, c-format
+msgid "could not close control file: %m"
+msgstr "制御ファイルをクローズ����ん���: %m"
 
-#: rewrite/rewriteHandler.c:1417 rewrite/rewriteHandler.c:1740
+#: access/transam/xlog.c:4669 access/transam/xlog.c:4854
 #, c-format
-msgid "infinite recursion detected in rules for relation \"%s\""
-msgstr "リレーション\"%s\"�ルール�無��帰を検出����"
+msgid "could not open control file \"%s\": %m"
+msgstr "制御ファイル\"%s\"をオープン����ん���: %m"
 
-#: rewrite/rewriteHandler.c:1778
+#: access/transam/xlog.c:4675
 #, c-format
-msgid "cannot perform INSERT RETURNING on relation \"%s\""
-msgstr "リレーション\"%s\"��INSERT RETURNINGを行��������ん"
+msgid "could not read from control file: %m"
+msgstr "制御ファイルを読��れ��ん���: %m"
 
-#: rewrite/rewriteHandler.c:1780
-msgid ""
-"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
-msgstr "RETURNING�を��無�件�ON INSERT DO INSTEADルール�必���。"
+#: access/transam/xlog.c:4688 access/transam/xlog.c:4697
+#: access/transam/xlog.c:4721 access/transam/xlog.c:4728
+#: access/transam/xlog.c:4735 access/transam/xlog.c:4740
+#: access/transam/xlog.c:4747 access/transam/xlog.c:4754
+#: access/transam/xlog.c:4761 access/transam/xlog.c:4768
+#: access/transam/xlog.c:4775 access/transam/xlog.c:4782
+#: access/transam/xlog.c:4791 access/transam/xlog.c:4798
+#: access/transam/xlog.c:4807 access/transam/xlog.c:4814
+#: access/transam/xlog.c:4823 access/transam/xlog.c:4830
+#: utils/init/miscinit.c:1171
+msgid "database files are incompatible with server"
+msgstr "データベースファイル�サー��互�性��り��ん"
 
-#: rewrite/rewriteHandler.c:1785
+#: access/transam/xlog.c:4689
 #, c-format
-msgid "cannot perform UPDATE RETURNING on relation \"%s\""
-msgstr "リレーション\"%s\"��UPDATE RETURNINGを行��������ん"
+msgid ""
+"The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
+"but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
+msgstr ""
+"データベースクラスタ�PG_CONTROL_VERSION %d (0x%08x)��期化�れ�����"
+"サー��PG_CONTROL_VERSION %d (0x%08x)�コンパイル�れ����。"
 
-#: rewrite/rewriteHandler.c:1787
+#: access/transam/xlog.c:4693
 msgid ""
-"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
-msgstr "RETURNING�を��無�件�ON UPDATE DO INSTEADルール�必���。"
+"This could be a problem of mismatched byte ordering.  It looks like you need "
+"to initdb."
+msgstr ""
+"�れ��イトオーダ��整��題��り得��。initdb���れ��ら��\n"
+"よ���。"
 
-#: rewrite/rewriteHandler.c:1792
+#: access/transam/xlog.c:4698
 #, c-format
-msgid "cannot perform DELETE RETURNING on relation \"%s\""
-msgstr "リレーション\"%s\"��DELETE RETURNINGを行��������ん"
-
-#: rewrite/rewriteHandler.c:1794
 msgid ""
-"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
-msgstr "RETURNING�を��無�件�ON DELETE DO INSTEADルール�必���。"
-
-#: rewrite/rewriteHandler.c:1892
-msgid "cannot insert into a view"
-msgstr "ビュー��挿入�����ん"
+"The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
+"server was compiled with PG_CONTROL_VERSION %d."
+msgstr ""
+"データベースクラスタ�PG_CONTROL_VERSION %d ��期化�れ�����サー�� "
+"PG_CONTROL_VERSION %d �コンパイル�れ����。"
 
-#: rewrite/rewriteHandler.c:1893
-msgid "You need an unconditional ON INSERT DO INSTEAD rule."
-msgstr "無�件�ON INSERT DO INSTEADルール�必���。"
-
-#: rewrite/rewriteHandler.c:1898
-msgid "cannot update a view"
-msgstr "ビュー�更新�����ん"
-
-#: rewrite/rewriteHandler.c:1899
-msgid "You need an unconditional ON UPDATE DO INSTEAD rule."
-msgstr "無�件�ON UPDATE DO INSTEADルール�必���。"
+#: access/transam/xlog.c:4701 access/transam/xlog.c:4725
+#: access/transam/xlog.c:4732 access/transam/xlog.c:4737
+msgid "It looks like you need to initdb."
+msgstr "initdb�必��よ���"
 
-#: rewrite/rewriteHandler.c:1904
-msgid "cannot delete from a view"
-msgstr "ビュー�ら�削除�����ん"
+#: access/transam/xlog.c:4712
+msgid "incorrect checksum in control file"
+msgstr "制御ファイル内��ェックサム��正��"
 
-#: rewrite/rewriteHandler.c:1905
-msgid "You need an unconditional ON DELETE DO INSTEAD rule."
-msgstr "無�件�ON DELETE DO INSTEADルール�必���。"
+#: access/transam/xlog.c:4722
+#, c-format
+msgid ""
+"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
+"server was compiled with CATALOG_VERSION_NO %d."
+msgstr ""
+"データベースクラスタ� CATALOG_VERSION_NO %d ��期化�れ�����サー�� "
+"CATALOG_VERSION_NO %d �コンパイル�れ����。"
 
-#. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:242
-msgid "cannot execute %s in a read-only transaction"
+#: access/transam/xlog.c:4729
+#, c-format
+msgid ""
+"The database cluster was initialized with MAXALIGN %d, but the server was "
+"compiled with MAXALIGN %d."
 msgstr ""
-"リードオンリー�トランザクション�� %s を実行����ん"
+"データベースクラスタ� MAXALIGN %d ��期化�れ�����サー�� MAXALIGN %"
+"d �コンパイル�れ����。"
 
-#. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:261
-msgid "cannot execute %s during recovery"
-msgstr "リカ�リー中� %s を実行����ん"
+#: access/transam/xlog.c:4736
+msgid ""
+"The database cluster appears to use a different floating-point number format "
+"than the server executable."
+msgstr ""
+"データベースクラスタ�サー�実行ファイル�異�る浮動�数点書�を使用���る"
+"よ���。"
 
-#. translator: %s is name of a SQL command, eg PREPARE
-#: tcop/utility.c:279
+#: access/transam/xlog.c:4741
 #, c-format
-msgid "cannot execute %s within security-restricted operation"
-msgstr "セキュリティー制��作�中�� %s を実行����ん"
+msgid ""
+"The database cluster was initialized with BLCKSZ %d, but the server was "
+"compiled with BLCKSZ %d."
+msgstr ""
+"データベースクラスタ� BLCKSZ %d ��期化�れ�����サー�� BLCKSZ %d �"
+"コンパイル�れ����。"
 
-#: tcop/utility.c:1128
-msgid "must be superuser to do CHECKPOINT"
-msgstr "CHECKPOINTを実行�る��スーパーユーザ���れ��り��ん"
+#: access/transam/xlog.c:4744 access/transam/xlog.c:4751
+#: access/transam/xlog.c:4758 access/transam/xlog.c:4765
+#: access/transam/xlog.c:4772 access/transam/xlog.c:4779
+#: access/transam/xlog.c:4786 access/transam/xlog.c:4794
+#: access/transam/xlog.c:4801 access/transam/xlog.c:4810
+#: access/transam/xlog.c:4817 access/transam/xlog.c:4826
+#: access/transam/xlog.c:4833
+msgid "It looks like you need to recompile or initdb."
+msgstr "�コンパイルも��� initdb �必�����"
 
-#: tcop/fastpath.c:110 tcop/fastpath.c:492 tcop/fastpath.c:622
+#: access/transam/xlog.c:4748
 #, c-format
-msgid "invalid argument size %d in function call message"
-msgstr "関数呼�出�メッセージ内�引数サイズ%d�無効��"
+msgid ""
+"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
+"compiled with RELSEG_SIZE %d."
+msgstr ""
+"データベースクラスタ� RELSEG_SIZE %d ��期化�れ�����サー�� "
+"RELSEG_SIZE %d �コンパイル�れ����。"
 
-#: tcop/fastpath.c:181 tcop/fastpath.c:561 tcop/postgres.c:1698
-#: access/common/printtup.c:278
+#: access/transam/xlog.c:4755
 #, c-format
-msgid "unsupported format code: %d"
-msgstr "未サ�ート�書�コード: %d"
+msgid ""
+"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
+"compiled with XLOG_BLCKSZ %d."
+msgstr ""
+"データベースクラスタ� XLOG_BLCKSZ %d ��期化�れ�����サー�� "
+"XLOG_BLCKSZ %d �コンパイル�れ����。"
 
-#: tcop/fastpath.c:222 catalog/aclchk.c:3554 catalog/aclchk.c:4304
+#: access/transam/xlog.c:4762
 #, c-format
-msgid "function with OID %u does not exist"
-msgstr "OID %u�関数�存在���ん"
+msgid ""
+"The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
+"was compiled with XLOG_SEG_SIZE %d."
+msgstr ""
+"データベースクラスタ� XLOG_SEG_SIZE %d ��期化�れ�����サー�� "
+"XLOG_SEG_SIZE %d �コンパイル�れ����。"
 
-#: tcop/fastpath.c:291 tcop/postgres.c:342 tcop/postgres.c:365
-#: commands/copy.c:515 commands/copy.c:534 commands/copy.c:538
-msgid "unexpected EOF on client connection"
-msgstr "クライアント接続�想定外�EOF��り���"
+#: access/transam/xlog.c:4769
+#, c-format
+msgid ""
+"The database cluster was initialized with NAMEDATALEN %d, but the server was "
+"compiled with NAMEDATALEN %d."
+msgstr ""
+"データベースクラスタ� NAMEDATALEN %d ��期化�れ�����サー�� "
+"NAMEDATALEN %d �コンパイル�れ����。"
 
-#: tcop/fastpath.c:304 tcop/postgres.c:951 tcop/postgres.c:1261
-#: tcop/postgres.c:1542 tcop/postgres.c:1984 tcop/postgres.c:2352
-#: tcop/postgres.c:2433
+#: access/transam/xlog.c:4776
+#, c-format
 msgid ""
-"current transaction is aborted, commands ignored until end of transaction "
-"block"
+"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
+"was compiled with INDEX_MAX_KEYS %d."
 msgstr ""
-"�在�トランザクション�アボート����。トランザクションブロック�終�る�"
-"�コマンド�無視�れ��"
+"データベースクラスタ� INDEX_MAX_KEYS %d ��期化�れ�����サー�� "
+"INDEX_MAX_KEYS %d �コンパイル�れ����。"
 
-#: tcop/fastpath.c:332
+#: access/transam/xlog.c:4783
 #, c-format
-msgid "fastpath function call: \"%s\" (OID %u)"
-msgstr "近�関数呼�出�: \"%s\"(OID %u）)"
+msgid ""
+"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
+"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
+msgstr ""
+"データベースクラスタ� TOAST_MAX_CHUNK_SIZE %d ��期化�れ�����サー�"
+"� TOAST_MAX_CHUNK_SIZE %d �コンパイル�れ����。"
 
-#: tcop/fastpath.c:359 parser/parse_expr.c:1315
-msgid "argument to pg_get_expr() must come from system catalogs"
-msgstr "pg_get_expr() ��引数�システムカタログ由��も����れ��り��ん"
+#: access/transam/xlog.c:4792
+msgid ""
+"The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
+"server was compiled with HAVE_INT64_TIMESTAMP."
+msgstr ""
+"データベースクラスタ� HAVE_INT64_TIMESTAMP ����期化�れ�����サー�"
+"� HAVE_INT64_TIMESTAMP �コンパイル�れ����。"
 
-#: tcop/fastpath.c:418 tcop/postgres.c:1121 tcop/postgres.c:1408
-#: tcop/postgres.c:1825 tcop/postgres.c:2042
-#, c-format
-msgid "duration: %s ms"
-msgstr "期間: %s ミリ秒"
+#: access/transam/xlog.c:4799
+msgid ""
+"The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
+"server was compiled without HAVE_INT64_TIMESTAMP."
+msgstr ""
+"データベースクラスタ� HAVE_INT64_TIMESTAMP ��期化�れ�����サー�� "
+"HAVE_INT64_TIMESTAMP ���コンパイル�れ����。"
 
-#: tcop/fastpath.c:422
-#, c-format
-msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
-msgstr "期間: %s ミリ秒  近�関数呼�出�: \"%s\" (OID %u)"
+#: access/transam/xlog.c:4808
+msgid ""
+"The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
+"was compiled with USE_FLOAT4_BYVAL."
+msgstr ""
+"データベースクラスタ� USE_FLOAT4_BYVAL ����期化�れ�����サー��� "
+"USE_FLOAT4_BYVAL 付��コンパイル�れ����。"
 
-#: tcop/fastpath.c:460 tcop/fastpath.c:587
-#, c-format
-msgid "function call message contains %d arguments but function requires %d"
-msgstr "関数呼�出�メッセージ��%d引数�り�����関数��%d必���"
+#: access/transam/xlog.c:4815
+msgid ""
+"The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
+"was compiled without USE_FLOAT4_BYVAL."
+msgstr ""
+"データベースクラスタ� USE_FLOAT4_BYVAL 付���期化�れ�����サー��� "
+"USE_FLOAT4_BYVAL ���コンパイル�れ����。"
 
-#: tcop/fastpath.c:468
-#, c-format
-msgid "function call message contains %d argument formats but %d arguments"
-msgstr "関数呼�出�メッセージ��%d�引数書���り�����引数�%d���"
+#: access/transam/xlog.c:4824
+msgid ""
+"The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
+"was compiled with USE_FLOAT8_BYVAL."
+msgstr ""
+"データベースクラスタ� USE_FLOAT8_BYVAL ����期化�れ�����サー��� "
+"USE_FLOAT8_BYVAL 付��コンパイル�れ����。"
 
-#: tcop/fastpath.c:555 tcop/fastpath.c:638
-#, c-format
-msgid "incorrect binary data format in function argument %d"
-msgstr "関数引数%d��イナリデータ書���正��"
+#: access/transam/xlog.c:4831
+msgid ""
+"The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
+"was compiled without USE_FLOAT8_BYVAL."
+msgstr ""
+"データベースクラスタ� USE_FLOAT8_BYVAL 付���期化�れ�����サー��� "
+"USE_FLOAT8_BYVAL ���コンパイル�れ����。"
 
-#: tcop/pquery.c:670
+#: access/transam/xlog.c:5156
 #, c-format
-msgid "bind message has %d result formats but query has %d columns"
-msgstr "�インドメッセージ�%d��果書���り�����������%d列���"
+msgid "could not write bootstrap transaction log file: %m"
+msgstr ""
+"ブートストラップ・トランザクション�ログファイルを書�出���ん���: %m"
 
-#: tcop/pquery.c:748 tcop/pquery.c:1371 commands/portalcmds.c:329
+#: access/transam/xlog.c:5162
 #, c-format
-msgid "portal \"%s\" cannot be run"
-msgstr "�ータル\"%s\"を実行����ん"
-
-#: tcop/pquery.c:978
-msgid "cursor can only scan forward"
-msgstr "カーゾル��方��スキャン������ん"
+msgid "could not fsync bootstrap transaction log file: %m"
+msgstr ""
+"ブートストラップ・トランザクションログファイルをfsync����ん���: %m"
 
-#: tcop/pquery.c:979
-msgid "Declare it with SCROLL option to enable backward scan."
+#: access/transam/xlog.c:5167
+#, c-format
+msgid "could not close bootstrap transaction log file: %m"
 msgstr ""
-"後方スキャンを有効��る����SCROLLオプションを付��宣言������。"
+"ブートストラップ・トランザクションログファイルをクローズ����ん���: %m"
 
-#: tcop/postgres.c:392 tcop/postgres.c:404 tcop/postgres.c:415
-#: tcop/postgres.c:427 tcop/postgres.c:4094
+#: access/transam/xlog.c:5234
 #, c-format
-msgid "invalid frontend message type %d"
-msgstr "フロントエンドメッセージ種類%d�無効��"
+msgid "could not open recovery command file \"%s\": %m"
+msgstr "リカ�リコマンドファイル \"%s\" をオープン����ん���: %m"
 
-#: tcop/postgres.c:892
+#: access/transam/xlog.c:5250
 #, c-format
-msgid "statement: %s"
-msgstr "æ–‡: %s"
+msgid "restore_command = '%s'"
+msgstr "restore_command = '%s'"
 
-#: tcop/postgres.c:1126
+#: access/transam/xlog.c:5257
 #, c-format
-msgid "duration: %s ms  statement: %s"
-msgstr "期間: %s ミリ秒  文: %s"
+msgid "recovery_end_command = '%s'"
+msgstr "recovery_end_command = '%s'"
 
-#: tcop/postgres.c:1176
+#: access/transam/xlog.c:5264
 #, c-format
-msgid "parse %s: %s"
-msgstr "解� %s: %s"
+msgid "archive_cleanup_command = '%s'"
+msgstr "archive_cleanup_command = '%s'"
 
-#: tcop/postgres.c:1234
-msgid "cannot insert multiple commands into a prepared statement"
-msgstr "準備�れ�文�複数�コマンドを挿入����ん"
+#: access/transam/xlog.c:5272 access/transam/xlog.c:5361
+#: access/transam/xlog.c:5370 utils/misc/guc.c:5305 commands/extension.c:525
+#: commands/extension.c:533
+#, c-format
+msgid "parameter \"%s\" requires a Boolean value"
+msgstr "パラメータ\"%s\"�boolean値�必���"
 
-#: tcop/postgres.c:1301 commands/prepare.c:121 parser/parse_param.c:293
+#: access/transam/xlog.c:5274
 #, c-format
-msgid "could not determine data type of parameter $%d"
-msgstr "パラメータ$%d�データ型�決定����ん"
+msgid "pause_at_recovery_target = '%s'"
+msgstr "pause_at_recovery_target = '%s'"
 
-#: tcop/postgres.c:1413
+#: access/transam/xlog.c:5287
 #, c-format
-msgid "duration: %s ms  parse %s: %s"
-msgstr "期間: %s ミリ秒  解�%s : %s"
+msgid "recovery_target_timeline is not a valid number: \"%s\""
+msgstr "recovery_target_timeline�無効�番���: \"%s\""
 
-#: tcop/postgres.c:1459
+#: access/transam/xlog.c:5292
 #, c-format
-msgid "bind %s to %s"
-msgstr "�インド%s: %s"
+msgid "recovery_target_timeline = %u"
+msgstr "recovery_target_timeline = %u"
 
-#: tcop/postgres.c:1478 tcop/postgres.c:2332
-msgid "unnamed prepared statement does not exist"
-msgstr "無��準備�れ�文�存在���ん"
+#: access/transam/xlog.c:5295
+msgid "recovery_target_timeline = latest"
+msgstr "recovery_target_timeline = latest"
 
-#: tcop/postgres.c:1520
+#: access/transam/xlog.c:5303
 #, c-format
-msgid "bind message has %d parameter formats but %d parameters"
-msgstr "�インドメッセージ�%dパラメータ書��り����パラメータ�%d���"
+msgid "recovery_target_xid is not a valid number: \"%s\""
+msgstr "recovery_target_xid�無効�番���: \"%s\""
 
-#: tcop/postgres.c:1526
+#: access/transam/xlog.c:5306
 #, c-format
-msgid ""
-"bind message supplies %d parameters, but prepared statement \"%s\" requires %"
-"d"
-msgstr ""
-"�インドメッセージ�%dパラメータを�供������準備�れ�文\"%s\"��%d必"
-"����"
+msgid "recovery_target_xid = %u"
+msgstr "recovery_target_xid = %u"
 
-#: tcop/postgres.c:1691
+#: access/transam/xlog.c:5330
 #, c-format
-msgid "incorrect binary data format in bind parameter %d"
-msgstr "�インドパラメータ%d�����イナリデータ書���正��"
+msgid "recovery_target_time = '%s'"
+msgstr "recovery_target_time = '%s'"
 
-#: tcop/postgres.c:1830
+#: access/transam/xlog.c:5347
 #, c-format
-msgid "duration: %s ms  bind %s%s%s: %s"
-msgstr "期間: %s ミリ秒  �インド %s%s%s: %s"
+msgid "recovery_target_name is too long (maximum %d characters)"
+msgstr ""
 
-#: tcop/postgres.c:1878 tcop/postgres.c:2419
+#: access/transam/xlog.c:5350
 #, c-format
-msgid "portal \"%s\" does not exist"
-msgstr "�ータル\"%s\"�存在���ん"
+msgid "recovery_target_name = '%s'"
+msgstr "recovery_target_name = '%s'"
 
-#: tcop/postgres.c:1963
+#: access/transam/xlog.c:5363
 #, c-format
-msgid "%s %s%s%s: %s"
-msgstr "%s %s%s%s: %s"
+msgid "recovery_target_inclusive = %s"
+msgstr "recovery_target_inclusive = %s"
 
-#: tcop/postgres.c:1965 tcop/postgres.c:2050
-msgid "execute fetch from"
-msgstr "�り出�実行"
+#: access/transam/xlog.c:5372
+#, c-format
+msgid "standby_mode = '%s'"
+msgstr "standby_mode = '%s'"
 
-#: tcop/postgres.c:1966 tcop/postgres.c:2051
-msgid "execute"
-msgstr "実行"
+#: access/transam/xlog.c:5378
+#, c-format
+msgid "primary_conninfo = '%s'"
+msgstr "primary_conninfo = '%s'"
 
-#: tcop/postgres.c:2047
+#: access/transam/xlog.c:5385
 #, c-format
-msgid "duration: %s ms  %s %s%s%s: %s"
-msgstr "期間: %s ミリ秒  %s %s%s%s: %s"
+msgid "trigger_file = '%s'"
+msgstr "trigger_file = '%s'"
 
-#: tcop/postgres.c:2173
+#: access/transam/xlog.c:5390
 #, c-format
-msgid "prepare: %s"
-msgstr "準備: %s"
+msgid "unrecognized recovery parameter \"%s\""
+msgstr "リカ�リパラメータ \"%s\"��明��"
 
-#: tcop/postgres.c:2236
+#: access/transam/xlog.c:5401
 #, c-format
-msgid "parameters: %s"
-msgstr "パラメータ: %s"
+msgid ""
+"recovery command file \"%s\" specified neither primary_conninfo nor "
+"restore_command"
+msgstr ""
+"リカ�リコマンドファイル \"%s\" � primary_conninfo � restore_command ���"
+"れも指定�れ����ん"
 
-#: tcop/postgres.c:2255ã‚Š
-msgid "abort reason: recovery conflict"
-msgstr "異常終了��由：リカ�リ�������"
+#: access/transam/xlog.c:5403
+msgid ""
+"The database server will regularly poll the pg_xlog subdirectory to check "
+"for files placed there."
+msgstr ""
+"データベースサー��通常 pg_xlog サブディレクトリを poll ��（定期的�監視�"
+"�）����ファイル�置�れ�����を調���。"
 
-#: tcop/postgres.c:2271
-msgid "User was holding shared buffer pin for too long."
-msgstr "ユーザ�共有�ッファ・ピンを長�����������"
+#: access/transam/xlog.c:5409
+#, c-format
+msgid ""
+"recovery command file \"%s\" must specify restore_command when standby mode "
+"is not enabled"
+msgstr ""
+"スタン�イモード�有効���場��リカ�リコマンドファイル \"%s\" � "
+"restore_command を指定���れ��り��ん"
 
-#: tcop/postgres.c:2274
-msgid "User was holding a relation lock for too long."
-msgstr "ユーザリレーション�ロックを長�����������"
+#: access/transam/xlog.c:5429
+#, c-format
+msgid "recovery target timeline %u does not exist"
+msgstr "リカ�リ対象時系列%u�存在���ん"
 
-#: tcop/postgres.c:2277
-msgid "User was or might have been using tablespace that must be dropped."
-msgstr "削除�れる��テーブルスペースをユーザ�使������（も������能性��り���）。"
+#: access/transam/xlog.c:5559
+msgid "archive recovery complete"
+msgstr "アーカイブリカ�リ�完了����"
 
-#: tcop/postgres.c:2280
-msgid "User query might have needed to see row versions that must be removed."
-msgstr "削除�れる���ージョン�行をユーザクエリ��照���れ��ら�����能性��り���。"
+#: access/transam/xlog.c:5677
+#, c-format
+msgid "recovery stopping after commit of transaction %u, time %s"
+msgstr "リカ�リ�トランザクション%u�コミット�時刻%s�後��止����"
 
-#: tcop/postgres.c:2283 storage/ipc/standby.c:507
-msgid "User transaction caused buffer deadlock with recovery."
-msgstr "リカ�リ時�ユーザ�トランザクション��ッファ�デッドロックを引�起�����。"
+#: access/transam/xlog.c:5682
+#, c-format
+msgid "recovery stopping before commit of transaction %u, time %s"
+msgstr "リカ�リ�トランザクション%u�コミット�時刻%s����止����"
 
-#: tcop/postgres.c:2286
-msgid "User was connected to a database that must be dropped."
-msgstr "削除�れる��データベース�ユーザ�接続������。"
+#: access/transam/xlog.c:5690
+#, c-format
+msgid "recovery stopping after abort of transaction %u, time %s"
+msgstr "リカ�リ�トランザクション%u�アボート�時刻%s�後��止����"
 
-#: tcop/postgres.c:2620
-msgid "terminating connection because of crash of another server process"
-msgstr "他�サー�プロセス�クラッシュ����接続を終了�����"
+#: access/transam/xlog.c:5695
+#, c-format
+msgid "recovery stopping before abort of transaction %u, time %s"
+msgstr "リカ�リ�トランザクション%u�アボート�時刻%s����止����"
 
-#: tcop/postgres.c:2621
-msgid ""
-"The postmaster has commanded this server process to roll back the current "
-"transaction and exit, because another server process exited abnormally and "
-"possibly corrupted shared memory."
-msgstr ""
-"他�サー�プロセス�異常終了�共有メモリ�破����能性��り������\n"
-"postmaster���サー�プロセス�対���在�トランザクションをロール�ック\n"
-"�終了�るよ�指示����。"
+#: access/transam/xlog.c:5704
+#, c-format
+msgid "recovery stopping at restore point \"%s\", time %s"
+msgstr "リカ�リ�時刻 %2$s �復元�イント \"%1$s\" ��止����"
 
-#: tcop/postgres.c:2625 tcop/postgres.c:2957
-msgid ""
-"In a moment you should be able to reconnect to the database and repeat your "
-"command."
-msgstr "��後�データベース��接続��コマンドを繰り返���れ��り��ん。"
+#: access/transam/xlog.c:5732
+#, 
+msgid "recovery has paused"
+msgstr "リカ�リ�����止�れ����"
 
-#: tcop/postgres.c:2729
-msgid "floating-point exception"
-msgstr "浮動�数点例外"
+#: access/transam/xlog.c:5733
+msgid "Execute pg_xlog_replay_resume() to continue."
+msgstr "pg_xlog_replay_resume() を動���処�を継続������"
+
+#: access/transam/xlog.c:5776 access/transam/xlog.c:5798
+#: access/transam/xlog.c:5820
+#, 
+msgid "must be superuser to control recovery"
+msgstr "リカ�リを制御�る��スーパーユーザ���れ��り��ん"
+
+#: access/transam/xlog.c:5781 access/transam/xlog.c:5803
+#: access/transam/xlog.c:5825
+#, 
+msgid "recovery is not in progress"
+msgstr "リカ�リ�実行中���り��ん"
+
+#: access/transam/xlog.c:5782 access/transam/xlog.c:5804
+#: access/transam/xlog.c:5826
+#, 
+msgid "Recovery control functions can only be executed during recovery."
+msgstr "リカ�リ制御関数を実行��る��リカ�リ中����"
 
-#: tcop/postgres.c:2730
+#: access/transam/xlog.c:5918
+#, c-format
 msgid ""
-"An invalid floating-point operation was signaled. This probably means an out-"
-"of-range result or an invalid operation, such as division by zero."
+"hot standby is not possible because %s = %d is a lower setting than on the "
+"master server (its value was %d)"
 msgstr ""
-"無効�浮動�数点�作�通知�れ���。��ら��れ��範囲外��果や0割り�\n"
-"��無効��作を�味�����。"
+"%s = %d �マスターサー��設定値（%d）より������ホットスタン�イ�利用"
+"����ん"
 
-#: tcop/postgres.c:2897
-msgid "terminating autovacuum process due to administrator command"
-msgstr "管�者コマンド�より自動�キュームを終了�����"
+#: access/transam/xlog.c:5940
+msgid "WAL was generated with wal_level=minimal, data may be missing"
+msgstr ""
+"wal_level=minimal � WAL �生��れ���。データ���場���り��。"
 
-#: tcop/postgres.c:2901 tcop/postgres.c:2906 tcop/postgres.c:2955
-msgid "terminating connection due to conflict with recovery"
-msgstr "リカ�リ�競��発生�����接続を終了�����"
+#: access/transam/xlog.c:5941
+msgid ""
+"This happens if you temporarily set wal_level=minimal without taking a new "
+"base backup."
+msgstr ""
+"�れ�起�る���新��ベース�ックアップを行�����一時的� "
+"wal_level=minimal ���場���。"
 
-#: tcop/postgres.c:2911
-msgid "terminating connection due to administrator command"
-msgstr "管�者コマンド�より接続を終了�����"
+#: access/transam/xlog.c:5952
+msgid ""
+"hot standby is not possible because wal_level was not set to \"hot_standby\" "
+"on the master server"
+msgstr ""
+"マスターサー�� wal_level � \"hot_standby\" ������������ホット"
+"スタン�イを使用����ん"
 
-#: tcop/postgres.c:2926
-msgid "canceling authentication due to timeout"
-msgstr "タイムアウト�より�証処�をキャンセル�����"
+#: access/transam/xlog.c:5953
+msgid ""
+"Either set wal_level to \"hot_standby\" on the master, or turn off "
+"hot_standby here."
+msgstr ""
+"マスター� wal_level を \"hot_standby\" ��る��������ホットスタン�"
+"イを無効�������。"
 
-#: tcop/postgres.c:2935
-msgid "canceling statement due to statement timeout"
-msgstr "ステートメント�タイムアウト�よりステートメントをキャンセル�����"
+#: access/transam/xlog.c:6000
+msgid "control file contains invalid data"
+msgstr "制御ファイル内�無効�データ��り��"
 
-#: tcop/postgres.c:2944
-msgid "canceling autovacuum task"
-msgstr "自動�キューム作業をキャンセル�����"
+#: access/transam/xlog.c:6004
+#, c-format
+msgid "database system was shut down at %s"
+msgstr "データベースシステム� %s �シャットダウン����"
 
-#: tcop/postgres.c:2962 storage/ipc/standby.c:506
-msgid "canceling statement due to conflict with recovery"
-msgstr "リカ�リー�競��発生����ステートメントをキャンセル�����"
+#: access/transam/xlog.c:6008
+#, c-format
+msgid "database system was shut down in recovery at %s"
+msgstr "データベースシステム�リカ�リ中� %s �シャットダウン����"
 
-#: tcop/postgres.c:2978
-msgid "canceling statement due to user request"
-msgstr "ユーザ�ら��求�より文をキャンセル�����"
+#: access/transam/xlog.c:6012
+#, c-format
+msgid "database system shutdown was interrupted; last known up at %s"
+msgstr ""
+"データベースシステム�シャットダウン�中断�れ���:今回� %s ���到���"
+"��"
 
-#: tcop/postgres.c:3023
-msgid "stack depth limit exceeded"
-msgstr "スタック長制�を越����"
+#: access/transam/xlog.c:6016
+#, c-format
+msgid "database system was interrupted while in recovery at %s"
+msgstr "データベースシステム�リカ�リ中� %s �中断�れ���"
 
-#: tcop/postgres.c:3024
+#: access/transam/xlog.c:6018
 msgid ""
-"Increase the configuration parameter \"max_stack_depth\", after ensuring the "
-"platform's stack depth limit is adequate."
+"This probably means that some data is corrupted and you will have to use the "
+"last backup for recovery."
 msgstr ""
-"プラットフォーム�スタック長上������を確���後��設定パラメータ"
-"\"max_stack_depth\"を増や������。"
+"�れ���ら�データ破���能性��り�リカ�リ����直���ックアップを"
+"使用���れ��ら����を�味���。"
 
-#: tcop/postgres.c:3040
+#: access/transam/xlog.c:6022
 #, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB"
-msgstr "\"max_stack_depth\"�%ldkBを越�������ん"
+msgid "database system was interrupted while in recovery at log time %s"
+msgstr "データベースシステム�ログ時間%s�リカ�リ中�中断�れ���"
 
-#: tcop/postgres.c:3042
+#: access/transam/xlog.c:6024
 msgid ""
-"Increase the platform's stack depth limit via \"ulimit -s\" or local "
-"equivalent."
+"If this has occurred more than once some data might be corrupted and you "
+"might need to choose an earlier recovery target."
 msgstr ""
-"プラットフォーム�スタック長を\"ulimit -s\"（システム���������）を使"
-"用��増加������"
+"�れ�何回も発生�る場��データ�破����る�能性��り��。�れ以��状"
+"態��リカ�リー�戻��やら��������も�れ��ん。"
 
-#: tcop/postgres.c:3334 postmaster/postmaster.c:675 bootstrap/bootstrap.c:272
+#: access/transam/xlog.c:6028
 #, c-format
-msgid "--%s requires a value"
-msgstr "--%s��値�必���"
+msgid "database system was interrupted; last known up at %s"
+msgstr "データベースシステム�中断�れ���: 今回� %s ���到������"
 
-#: tcop/postgres.c:3339 postmaster/postmaster.c:680 bootstrap/bootstrap.c:277
+#: access/transam/xlog.c:6077
 #, c-format
-msgid "-c %s requires a value"
-msgstr "-c %s�値�必���"
+msgid "requested timeline %u is not a child of database system timeline %u"
+msgstr "�求�れ�時系列%u�データベースシステム�時系列%u�系列���り��ん"
 
-#: tcop/postgres.c:3365
-msgid "invalid command-line arguments for server process"
-msgstr "サー�プロセス用�コマンドラインオプション�無効��"
+#: access/transam/xlog.c:6095
+msgid "entering standby mode"
+msgstr "スタン�イモード�入り��"
 
-#: tcop/postgres.c:3366 tcop/postgres.c:3372
+#: access/transam/xlog.c:6098
 #, c-format
-msgid "Try \"%s --help\" for more information."
-msgstr "詳細�\"%s --help\"を実行������。"
+msgid "starting point-in-time recovery to XID %u"
+msgstr "XID %u �対���イントインタイムリカ�リを開始�����"
 
-#: tcop/postgres.c:3370
+#: access/transam/xlog.c:6102
 #, c-format
-msgid "%s: invalid command-line arguments"
-msgstr "%s: コマンドライン引数�無効��"
+msgid "starting point-in-time recovery to %s"
+msgstr "%s �対���イントインタイムリカ�リを開始�����"
 
-#: tcop/postgres.c:3466
+#: access/transam/xlog.c:6106
 #, c-format
-msgid "%s: no database nor user name specified"
-msgstr "%s: データベース�もユーザ�も指定�れ����ん"
+msgid "starting point-in-time recovery to \"%s\""
+msgstr "\"%s\" �対���イントインタイムリカ�リを開始�����"
 
-#: tcop/postgres.c:4004
-#, c-format
-msgid "invalid CLOSE message subtype %d"
-msgstr "CLOSEメッセージ�サブタイプ%d�無効��"
+#: access/transam/xlog.c:6110
+msgid "starting archive recovery"
+msgstr "アーカイブリカ�リを開始�����"
 
-#: tcop/postgres.c:4037
+#: access/transam/xlog.c:6132 access/transam/xlog.c:6172
 #, c-format
-msgid "invalid DESCRIBE message subtype %d"
-msgstr "DESCRIBEメッセージ�サブタイプ%d�無効��"
+msgid "checkpoint record is at %X/%X"
+msgstr "%X/%X���る�ェック�イントレコード��"
 
-#: tcop/postgres.c:4238 commands/tablecmds.c:642 commands/user.c:902
-#: commands/user.c:903 commands/trigger.c:832 commands/trigger.c:848
-#: commands/trigger.c:860 catalog/dependency.c:912 catalog/dependency.c:913
-#: catalog/dependency.c:919 catalog/dependency.c:920 catalog/dependency.c:931
-#: catalog/dependency.c:932 utils/adt/xml.c:1363 utils/adt/xml.c:1364
-#: utils/adt/xml.c:1370 utils/adt/xml.c:1441 utils/misc/guc.c:4959
-#: utils/misc/guc.c:5227 utils/fmgr/dfmgr.c:381 storage/lmgr/deadlock.c:942
-#: storage/lmgr/deadlock.c:943 nodes/print.c:85
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: access/transam/xlog.c:6146
+#, 
+msgid "could not find redo location referenced by checkpoint record"
+msgstr ""
+"�ェック�イントレコード��照���る redo �置を見��られ��ん���"
 
-#: tcop/postgres.c:4268
+#: access/transam/xlog.c:6147 access/transam/xlog.c:6154
 #, c-format
 msgid ""
-"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%"
-"s"
+"If you are not restoring from a backup, try removing the file \"%s/"
+"backup_label\"."
 msgstr ""
-"接続を切断: セッション期間: %d:%02d:%02d.%03d ユーザ=%s データベース=%s ホス"
-"ト=%s%s%s"
-
-#: commands/schemacmds.c:82 commands/schemacmds.c:288
-#, c-format
-msgid "unacceptable schema name \"%s\""
-msgstr "スキーマ�\"%s\"���付�られ��ん"
+"�ックアップ�順�を変更�����場���ファイル \"%s/backup_label\" を削除"
+"������"
 
-#: commands/schemacmds.c:83 commands/schemacmds.c:289
-msgid "The prefix \"pg_\" is reserved for system schemas."
-msgstr "接頭辞\"pg_\"�システムスキーマ用�予約�れ����"
+#: access/transam/xlog.c:6153
+msgid "could not locate required checkpoint record"
+msgstr "�求�ェック�イント�置�移動����ん���"
 
-#: commands/schemacmds.c:178 commands/comment.c:799
-msgid "schema name cannot be qualified"
-msgstr "スキーマ�を修飾�る�������ん"
+#: access/transam/xlog.c:6182 access/transam/xlog.c:6197
+msgid "could not locate a valid checkpoint record"
+msgstr "有効��ェック�イント�移動����ん���"
 
-#: commands/schemacmds.c:190 commands/schemacmds.c:264
-#: commands/schemacmds.c:335 commands/comment.c:806 catalog/namespace.c:340
-#: catalog/namespace.c:2307 catalog/namespace.c:2346 catalog/namespace.c:2393
-#: catalog/namespace.c:3312 catalog/aclchk.c:673 catalog/aclchk.c:1051
-#: utils/adt/acl.c:3760
+#: access/transam/xlog.c:6191
 #, c-format
-msgid "schema \"%s\" does not exist"
-msgstr "スキーマ\"%s\"�存在���ん"
+msgid "using previous checkpoint record at %X/%X"
+msgstr "%X/%X���る�ェック�イントレコード��を使用�����"
 
-#: commands/schemacmds.c:196
+#: access/transam/xlog.c:6206
 #, c-format
-msgid "schema \"%s\" does not exist, skipping"
-msgstr "スキーマ\"%s\"�存在���ん。�略���"
+msgid "redo record is at %X/%X; shutdown %s"
+msgstr "REDOレコード�%X/%X シャットダウン %s"
 
-#: commands/schemacmds.c:272 catalog/pg_namespace.c:50
+#: access/transam/xlog.c:6210
 #, c-format
-msgid "schema \"%s\" already exists"
-msgstr "スキーマ\"%s\"����存在���"
+msgid "next transaction ID: %u/%u; next OID: %u"
+msgstr "次�トランザクションID: %u/%u 次�OID: %u"
 
-#: commands/define.c:67 commands/define.c:222 commands/define.c:254
-#: commands/define.c:282
+#: access/transam/xlog.c:6214
 #, c-format
-msgid "%s requires a parameter"
-msgstr "%s�パラメータ�必���"
+msgid "next MultiXactId: %u; next MultiXactOffset: %u"
+msgstr "次�MultiXactId: %u 次�MultiXactOffset: %u"
 
-#: commands/define.c:108 commands/define.c:119 commands/define.c:189
-#: commands/define.c:207
+#: access/transam/xlog.c:6217
 #, c-format
-msgid "%s requires a numeric value"
-msgstr "%s�数値�必���"
+msgid "oldest unfrozen transaction ID: %u, in database %u"
+msgstr "データベース %2$u 内�最��未��トランザクション ID: %1$u"
 
-#: commands/define.c:175
-#, c-format
-msgid "%s requires a Boolean value"
-msgstr "パラメータ\"%s\"�boolean値�必���"
+#: access/transam/xlog.c:6221
+msgid "invalid next transaction ID"
+msgstr "次�トランザクションID�無効��"
 
-#: commands/define.c:236
-#, c-format
-msgid "argument of %s must be a name"
-msgstr "%s�引数������れ��り��ん"
+#: access/transam/xlog.c:6240
+msgid "invalid redo in checkpoint record"
+msgstr "�ェック�イントレコード内�REDO�無効��"
 
-#: commands/define.c:266
-#, c-format
-msgid "argument of %s must be a type name"
-msgstr "%s�引数�型����れ��り��ん"
+#: access/transam/xlog.c:6251
+msgid "invalid redo record in shutdown checkpoint"
+msgstr "シャットダウン・�ェック�イント���るREDOレコード�無効��"
 
-#: commands/define.c:291
-#, c-format
-msgid "%s requires an integer value"
-msgstr "%s�整数値�必���"
+#: access/transam/xlog.c:6281
+msgid ""
+"database system was not properly shut down; automatic recovery in progress"
+msgstr ""
+"データベースシステム��切�シャットダウン�れ��ん���。自動リカ�リを"
+"行�����"
 
-#: commands/define.c:312
-#, c-format
-msgid "invalid argument for %s: \"%s\""
-msgstr "%s�引数�無効��: \"%s\""
+#: access/transam/xlog.c:6353
+msgid "initializing for hot standby"
+msgstr "ホットスタン�イ�����期化を行�����"
 
-#: commands/foreigncmds.c:132 commands/foreigncmds.c:141
+#: access/transam/xlog.c:6481
 #, c-format
-msgid "option \"%s\" not found"
-msgstr "オプション \"%s\" �見��り��ん"
+msgid "redo starts at %X/%X"
+msgstr "%X/%X�REDOを開始���"
 
-#: commands/foreigncmds.c:151
+#: access/transam/xlog.c:6596
 #, c-format
-msgid "option \"%s\" provided more than once"
-msgstr "オプション \"%s\" �２回以上指定�れ���"
+msgid "redo done at %X/%X"
+msgstr "%X/%X�REDO�終�り���"
 
-#: commands/foreigncmds.c:209 commands/foreigncmds.c:217
+#: access/transam/xlog.c:6601 access/transam/xlog.c:8178
 #, c-format
-msgid "permission denied to change owner of foreign-data wrapper \"%s\""
-msgstr "外部データラッパー \"%s\" �所有者を変更�る権���り��ん"
+msgid "last completed transaction was at log time %s"
+msgstr "最後�完了��トランザクション�ログ時刻%s���"
 
-#: commands/foreigncmds.c:211
-msgid "Must be superuser to change owner of a foreign-data wrapper."
-msgstr "スーパーユーザ���外部データラッパー�所有者を変更����"
+#: access/transam/xlog.c:6609
+msgid "redo is not required"
+msgstr "REDO�必��り��ん"
 
-#: commands/foreigncmds.c:219
-msgid "The owner of a foreign-data wrapper must be a superuser."
-msgstr "外部データラッパー�所有者�スーパーユーザ���れ��り��ん"
+#: access/transam/xlog.c:6657
+msgid "requested recovery stop point is before consistent recovery point"
+msgstr ""
+"�求�れ�リカ�リ�止�イント��対応�るリカ�リ�イントより���り��"
 
-#: commands/foreigncmds.c:228 commands/foreigncmds.c:452
-#: commands/foreigncmds.c:553 foreign/foreign.c:90
-#, c-format
-msgid "foreign-data wrapper \"%s\" does not exist"
-msgstr "外部データラッパー \"%s\" �存在���ん"
+#: access/transam/xlog.c:6673
+#, 
+msgid "WAL ends before end of online backup"
+msgstr "オンライン�ックアップ�終了より�� WAL �終了����"
+
+#: access/transam/xlog.c:6674
+msgid ""
+"Online backup started with pg_start_backup() must be ended with "
+"pg_stop_backup(), and all WAL up to that point must be available at recovery."
+msgstr ""
+"pg_start_backup() を使��オンライン�ックアップ� pg_stop_backup() �"
+"終了�る必���り�����時点������� WAL �リカ�リ����"
+"利用�能���れ��り��ん"
+
+#: access/transam/xlog.c:6677
+msgid "WAL ends before consistent recovery point"
+msgstr "WAL �対応�るリカ�リ�イントより��終了���"
 
-#: commands/foreigncmds.c:270 commands/foreigncmds.c:723
-#: commands/foreigncmds.c:813 commands/foreigncmds.c:1089
-#: foreign/foreign.c:179
+#: access/transam/xlog.c:6699
 #, c-format
-msgid "server \"%s\" does not exist"
-msgstr "サー�ー \"%s\" �存在���ん"
+msgid "selected new timeline ID: %u"
+msgstr "�択�れ�新��タイムラインID: %u"
 
-#: commands/foreigncmds.c:347
+#: access/transam/xlog.c:6941
 #, c-format
-msgid "permission denied to create foreign-data wrapper \"%s\""
-msgstr "外部データラッパー \"%s\" を作��る権���り��ん"
+msgid "consistent recovery state reached at %X/%X"
+msgstr "%X/%X �リカ�リー状態�整���れ���"
 
-#: commands/foreigncmds.c:349
-msgid "Must be superuser to create a foreign-data wrapper."
-msgstr "テーブル空間を作��る��スーパーユーザ���れ��り��ん"
+#: access/transam/xlog.c:7107
+msgid "invalid primary checkpoint link in control file"
+msgstr "制御ファイル内�プライマリ�ェック�イントリンク�無効��"
 
-#: commands/foreigncmds.c:360
-#, c-format
-msgid "foreign-data wrapper \"%s\" already exists"
-msgstr "外部データラッパー \"%s\" ����存在���"
+#: access/transam/xlog.c:7111
+msgid "invalid secondary checkpoint link in control file"
+msgstr "制御ファイル内�セカンダリ�ェック�イントリンク�無効��"
 
-#: commands/foreigncmds.c:442
-#, c-format
-msgid "permission denied to alter foreign-data wrapper \"%s\""
-msgstr "外部データラッパー \"%s\" を変更�る権���り��ん"
+#: access/transam/xlog.c:7115
+msgid "invalid checkpoint link in backup_label file"
+msgstr "backup_labelファイル内��ェック�イントリンク�無効��"
 
-#: commands/foreigncmds.c:444
-msgid "Must be superuser to alter a foreign-data wrapper."
-msgstr "外部データラッパーを変更�る��スーパーユーザ���れ��り��ん"
+#: access/transam/xlog.c:7129
+msgid "invalid primary checkpoint record"
+msgstr "プライマリ�ェック�イントレコード�無効��"
 
-#: commands/foreigncmds.c:472
-msgid ""
-"changing the foreign-data wrapper validator can cause the options for "
-"dependent objects to become invalid"
-msgstr ""
-"外部データラッパー��リデータ（検証用関数）を変更�る���れ��存�るオプ"
-"ション�無効��る場���り��"
+#: access/transam/xlog.c:7133
+msgid "invalid secondary checkpoint record"
+msgstr "セカンダリ�ェック�イントレコード�無効��"
 
-#: commands/foreigncmds.c:544
-#, c-format
-msgid "permission denied to drop foreign-data wrapper \"%s\""
-msgstr "外部データラッパー \"%s\" を削除�る権���り��ん"
+#: access/transam/xlog.c:7137
+msgid "invalid checkpoint record"
+msgstr "�ェック�イントレコード�無効��"
 
-#: commands/foreigncmds.c:546
-msgid "Must be superuser to drop a foreign-data wrapper."
-msgstr "外部データラッパーを削除�る��スーパーユーザ���れ��り��ん"
+#: access/transam/xlog.c:7148
+msgid "invalid resource manager ID in primary checkpoint record"
+msgstr "プライマリ�ェック�イントレコード内�リソースマ�ージャID�無効��"
 
-#: commands/foreigncmds.c:558
-#, c-format
-msgid "foreign-data wrapper \"%s\" does not exist, skipping"
-msgstr "外部データラッパー \"%s\" �存在���ん。スキップ���"
+#: access/transam/xlog.c:7152
+msgid "invalid resource manager ID in secondary checkpoint record"
+msgstr "セカンダリ�ェック�イントレコード内�リソースマ�ージャID�無効��"
 
-#: commands/foreigncmds.c:625
-#, c-format
-msgid "server \"%s\" already exists"
-msgstr "サー�ー \"%s\" ����存在���"
+#: access/transam/xlog.c:7156
+msgid "invalid resource manager ID in checkpoint record"
+msgstr "�ェック�イントレコード内�リソースマ�ージャID�無効��"
 
-#: commands/foreigncmds.c:817
-#, c-format
-msgid "server \"%s\" does not exist, skipping"
-msgstr "外部データラッパー \"%s\" �存在���ん。スキップ���"
+#: access/transam/xlog.c:7168
+msgid "invalid xl_info in primary checkpoint record"
+msgstr "プライマリ�ェック�イントレコード内�xl_info�無効��"
 
-#: commands/foreigncmds.c:920
-#, c-format
-msgid "user mapping \"%s\" already exists for server %s"
-msgstr "ユーザーマッピング \"%s\" �サー�ー \"%s\" 用������存在���"
+#: access/transam/xlog.c:7172
+msgid "invalid xl_info in secondary checkpoint record"
+msgstr "セカンダリ�ェック�イントレコード内�xl_info�無効��"
 
-#: commands/foreigncmds.c:998 commands/foreigncmds.c:1105
-#, c-format
-msgid "user mapping \"%s\" does not exist for the server"
-msgstr "��サー�ー用�ユーザーマッピング \"%s\" �存在���ん"
+#: access/transam/xlog.c:7176
+msgid "invalid xl_info in checkpoint record"
+msgstr "�ェック�イントレコード内�xl_info�無効��"
 
-#: commands/foreigncmds.c:1092
-msgid "server does not exist, skipping"
-msgstr "サー�ー�存在���ん。スキップ���"
+#: access/transam/xlog.c:7188
+msgid "invalid length of primary checkpoint record"
+msgstr "プライマリ�ェック�イントレコード�サイズ�無効��"
 
-#: commands/foreigncmds.c:1110
-#, c-format
-msgid "user mapping \"%s\" does not exist for the server, skipping"
-msgstr ""
-"��サー�ー用�ユーザーマッピング \"%s\" �存在���ん。スキップ���"
+#: access/transam/xlog.c:7192
+msgid "invalid length of secondary checkpoint record"
+msgstr "セカンダリ�ェック�イントレコード�サイズ�無効��"
 
-#: commands/cluster.c:126 commands/cluster.c:364
-msgid "cannot cluster temporary tables of other sessions"
-msgstr "他�セッション�一時テーブルをクラスタ化����ん"
+#: access/transam/xlog.c:7196
+msgid "invalid length of checkpoint record"
+msgstr "�ェック�イントレコード�サイズ�無効��"
 
-#: commands/cluster.c:156
-#, c-format
-msgid "there is no previously clustered index for table \"%s\""
-msgstr "テーブル\"%s\"��事��クラスタ化�れ�インデックス��り��ん"
+#: access/transam/xlog.c:7358
+msgid "shutting down"
+msgstr "シャットダウン�����"
 
-#: commands/cluster.c:170 commands/tablecmds.c:6710
-#, c-format
-msgid "index \"%s\" for table \"%s\" does not exist"
-msgstr "テーブル\"%2$s\"��インデックス\"%1$s\"�存在���ん"
+#: access/transam/xlog.c:7380
+msgid "database system is shut down"
+msgstr "データベースシステム�シャットダウン����"
 
-#: commands/cluster.c:353
-msgid "cannot cluster a shared catalog"
-msgstr "共有カタログをクラスタ化����ん"
+#: access/transam/xlog.c:7806
+msgid ""
+"concurrent transaction log activity while database system is shutting down"
+msgstr ""
+"データベースシャットダウン中���時�実行中�トランザクションログ処���り"
+"���"
 
-#: commands/cluster.c:368
-msgid "cannot vacuum temporary tables of other sessions"
-msgstr "他�セッション�一時テーブル��キューム����ん"
+#: access/transam/xlog.c:8039
+msgid "skipping restartpoint, recovery has already ended"
+msgstr "�開�イントをスキップ���。リカ�リ����終������。"
 
-#: commands/cluster.c:384
+#: access/transam/xlog.c:8064
 #, c-format
-msgid "clustering \"%s.%s\""
-msgstr "\"%s.%s\"をクラスタ化�����"
+msgid "skipping restartpoint, already performed at %X/%X"
+msgstr "%X/%X ����実行済���開�イントをスキップ�����"
 
-#: commands/cluster.c:389 commands/vacuumlazy.c:320
+#: access/transam/xlog.c:8176
 #, c-format
-msgid "vacuuming \"%s.%s\""
-msgstr "\"%s.%s\"を�キューム�����"
+msgid "recovery restart point at %X/%X"
+msgstr "�イント %X/%X �リカ�リを�開���"
 
-#: commands/cluster.c:421
+#: access/transam/xlog.c:8276
 #, c-format
-msgid "\"%s\" is not an index for table \"%s\""
-msgstr "\"%s\"�テーブル\"%s\"�インデックス���り��ん"
+msgid "restore point \"%s\" created at %X/%X"
+msgstr "%2$X/%3$X �リストア�イント \"%1$s\" を書�込����"
 
-#: commands/cluster.c:429
-#, c-format
-msgid ""
-"cannot cluster on index \"%s\" because access method does not support "
-"clustering"
-msgstr ""
-"インデックス\"%s\"�クラスタ化����ん。アクセスメソッド�クラスタ化をサ"
-"�ート�������"
+#: access/transam/xlog.c:8373
+msgid "online backup was cancelled, recovery cannot continue"
+msgstr "オンライン�ックアップ�キャンセル�れ�リカ�リを継続����ん"
 
-#: commands/cluster.c:441
+#: access/transam/xlog.c:8425
 #, c-format
-msgid "cannot cluster on partial index \"%s\""
-msgstr "部分インデックス\"%s\"をクラスタ化����ん"
+msgid "unexpected timeline ID %u (after %u) in checkpoint record"
+msgstr ""
+"�ェック�イントレコード����想定外�時系列ID %u(%u�後)��り���"
 
-#: commands/cluster.c:461
+#: access/transam/xlog.c:8461
 #, c-format
-msgid ""
-"cannot cluster on index \"%s\" because access method does not handle null "
-"values"
+msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr ""
-"インデックス\"%s\"�クラスタ化����ん。アクセスメソッド�NULL値を扱���"
-"����"
+"�ェック�イントレコード����想定外�時系列ID %u(%u���)��り���"
 
-#: commands/cluster.c:464
+#: access/transam/xlog.c:8725 access/transam/xlog.c:8749
 #, c-format
-msgid ""
-"You might be able to work around this by marking column \"%s\" NOT NULL, or "
-"use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification "
-"from the table."
-msgstr ""
-"列\"%s\"を NOT NULL��る�����ALTER TABLE ... SET WITHOUT CLUSTERを使用"
-"��テー\n"
-"ブル�らクラスタ指定を削除�る�������題を回���る�能性��り��。"
+msgid "could not fsync log file %u, segment %u: %m"
+msgstr "ログファイル%u�セグメント%uをfsync����ん���: %m"
 
-#: commands/cluster.c:466
+#: access/transam/xlog.c:8757
 #, c-format
-msgid ""
-"You might be able to work around this by marking column \"%s\" NOT NULL."
-msgstr "列\"%s\"をNOT NULL��る�����れを回���る�も�れ��ん"
+msgid "could not fsync write-through log file %u, segment %u: %m"
+msgstr "write-throughログファイル%u�セグメント%uをfsync����ん���: %m"
 
-#: commands/cluster.c:477
+#: access/transam/xlog.c:8766
 #, c-format
+msgid "could not fdatasync log file %u, segment %u: %m"
+msgstr "ログファイル%u�セグメント%uをfdatasync����ん���: %m"
+
+#: access/transam/xlog.c:8847 access/transam/xlog.c:9123
+#, 
+msgid "must be superuser or replication role to run a backup"
+msgstr "�ックアップを実行�る��スーパーユーザも���レプリケーションロール"
+"���れ��り��ん"
+
+#: access/transam/xlog.c:8852 access/transam/xlog.c:9128
+#: access/transam/xlog.c:9391 access/transam/xlog.c:9423
+#: access/transam/xlog.c:9464 access/transam/xlog.c:9497
+#: access/transam/xlog.c:9604 access/transam/xlog.c:9679
+msgid "recovery is in progress"
+msgstr "リカ�リー����実行中��"
+
+#: access/transam/xlog.c:8853 access/transam/xlog.c:9129
+#: access/transam/xlog.c:9392 access/transam/xlog.c:9424
+#: access/transam/xlog.c:9465 access/transam/xlog.c:9498
+msgid "WAL control functions cannot be executed during recovery."
+msgstr "リカ�リー中� WAL 制御関数を実行����ん"
+
+#: access/transam/xlog.c:8858 access/transam/xlog.c:9134
+msgid "WAL level not sufficient for making an online backup"
+msgstr "オンライン�ックアップを行��� WAL レベル��足�����"
+
+#: access/transam/xlog.c:8859 access/transam/xlog.c:9135
+#: access/transam/xlog.c:9430
 msgid ""
-"cannot cluster on expressional index \"%s\" because its index access method "
-"does not handle null values"
+"wal_level must be set to \"archive\" or \"hot_standby\" at server start."
 msgstr ""
-"�インデックス\"%s\"�クラスタ化����ん。インデックスアクセスメソッド�"
-"NULL値を扱�������"
+"サー��開始時� wal_level を \"archive\" ��� \"hot_standby\" �セット��"
+"����"
 
-#: commands/cluster.c:492
+#: access/transam/xlog.c:8864
 #, c-format
-msgid "cannot cluster on invalid index \"%s\""
-msgstr "無効�インデックス\"%s\"をクラスタ化����ん"
+msgid "backup label too long (max %d bytes)"
+msgstr "�ックアップラベル�長����(最大 %d �イト)"
+
+#: access/transam/xlog.c:8905 access/transam/xlog.c:9006
+msgid "a backup is already in progress"
+msgstr "����ックアップ�進行中��"
+
+#: access/transam/xlog.c:8906
+msgid "Run pg_stop_backup() and try again."
+msgstr "pg_stop_backup()を実行���試行������"
 
-#: commands/vacuumlazy.c:234
+#: access/transam/xlog.c:9007
 #, c-format
 msgid ""
-"automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
-"pages: %d removed, %d remain\n"
-"tuples: %.0f removed, %.0f remain\n"
-"system usage: %s"
+"If you're sure there is no backup in progress, remove file \"%s\" and try "
+"again."
 msgstr ""
-"テーブル\"%s.%s.%s\"�自動�キューム: インデックススキャン: %d\n"
-"ページ: %dを削除�%d�残存\n"
-"タプル: %.0fを削除�%.0f�残存\n"
-"システム使用状�: %s"
+"�ックアップを行��������確実��れ��ファイル\"%s\"を削除���実行"
+"������"
 
-#: commands/vacuumlazy.c:449
+#: access/transam/xlog.c:9021 access/transam/xlog.c:9267
 #, c-format
-msgid "relation \"%s\" page %u is uninitialized --- fixing"
-msgstr "リレーション\"%s\" ページ%u��期化�れ����ん --- 修正�����"
+msgid "could not write file \"%s\": %m"
+msgstr "ファイル\"%s\"を書�出���ん���: %m"
 
-#: commands/vacuumlazy.c:785
-#, c-format
-msgid "\"%s\": removed %.0f row versions in %u pages"
-msgstr "\"%s\": %.0f行�ージョンを%uページ�ら削除����"
+#: access/transam/xlog.c:9179
+msgid "a backup is not in progress"
+msgstr "�ックアップ�実行中���り��ん"
 
-#: commands/vacuumlazy.c:790
+#: access/transam/xlog.c:9218 access/transam/xlog.c:9745
+#: access/transam/xlog.c:9751
 #, c-format
+msgid "invalid data in file \"%s\""
+msgstr "ファイル\"%s\"内�データ�無効��"
+
+#: access/transam/xlog.c:9316
 msgid ""
-"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
-"pages"
+"pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
 msgstr ""
-"\"%1$s\": 全 %5$u ページ中� %4$u ページ�見����行�ージョン：移動�能 %2"
-"$.0f 行�削除�� %3$.0f 行"
+"pg_stop_backup �クリーンアップ�終了���求�れ� WAL セグメント�アーカイ"
+"ブ�れる�を待�����"
 
-#: commands/vacuumlazy.c:793
+#: access/transam/xlog.c:9326
 #, c-format
 msgid ""
-"%.0f dead row versions cannot be removed yet.\n"
-"There were %.0f unused item pointers.\n"
-"%u pages are entirely empty.\n"
-"%s."
+"pg_stop_backup still waiting for all required WAL segments to be archived (%"
+"d seconds elapsed)"
 msgstr ""
-"%.0f ����行�ージョン���削除����ん。\n"
-"未使用アイテム���インタ� %.0f 個�り���。\n"
-"%u ページ�完全�空��。\n"
-"%s"
-
-#: commands/vacuumlazy.c:851
-#, c-format
-msgid "\"%s\": removed %d row versions in %d pages"
-msgstr "\"%s\": %d行�ージョンを%dページ�ら削除����"
-
-#: commands/vacuumlazy.c:854 commands/vacuumlazy.c:946
-#: commands/vacuumlazy.c:1071
-#, c-format
-msgid "%s."
-msgstr "%s。"
+"pg_stop_backup �未���求�れ����� WAL セグメント�アーカイブ�れる�"
+"を待�����（%d 秒経�）"
 
-#: commands/vacuumlazy.c:943
-#, c-format
-msgid "scanned index \"%s\" to remove %d row versions"
-msgstr "%2$d行�ージョンを削除�る��インデックス\"%1$s\"をスキャン����"
+#: access/transam/xlog.c:9328
+msgid ""
+"Check that your archive_command is executing properly.  pg_stop_backup can "
+"be cancelled safely, but the database backup will not be usable without all "
+"the WAL segments."
+msgstr ""
+"archive_command ��切�実行�れ���を確�������。pg_stop_backup �安"
+"全��り消�������������� WAL セグメント����データベース�"
+"�ックアップ�使用����ん。"
 
-#: commands/vacuumlazy.c:985
-#, c-format
-msgid "index \"%s\" now contains %.0f row versions in %u pages"
-msgstr "�在インデックス\"%s\"�%.0f行�ージョンを%uページ��ん����"
+#: access/transam/xlog.c:9335
+msgid "pg_stop_backup complete, all required WAL segments have been archived"
+msgstr ""
+"pg_stop_backup �完了���求�れ����� WAL セグメント�アーカイブ�れ�"
+"��"
 
-#: commands/vacuumlazy.c:989
-#, c-format
+#: access/transam/xlog.c:9339
 msgid ""
-"%.0f index row versions were removed.\n"
-"%u index pages have been deleted, %u are currently reusable.\n"
-"%s."
+"WAL archiving is not enabled; you must ensure that all required WAL segments "
+"are copied through other means to complete the backup"
 msgstr ""
-"%.0fインデックス行�ージョン�削除�れ���\n"
-"%uインデックスページ�削除�れ�%u��在�利用�能��\n"
-"%s"
+"WAL アーカイブ�有効�������ん。�求�れ����� WAL セグメント�別�"
+"方法�コピー�れ��ックアップ�完了��る��を確�������。"
 
-#: commands/vacuumlazy.c:1068
-#, c-format
-msgid "\"%s\": truncated %u to %u pages"
-msgstr "\"%s\": %u削除�れ�%uページ��り���"
+#: access/transam/xlog.c:9386
+msgid "must be superuser to switch transaction log files"
+msgstr "トランザクションログファイルを切り替�られる��スーパーユーザ����"
 
-#: commands/indexcmds.c:162
-msgid "must specify at least one column"
-msgstr "少���も1��列を指定���れ��り��ん"
+#: access/transam/xlog.c:9418
+#, 
+msgid "must be superuser to create a restore point"
+msgstr "リストア�イントを作れる��スーパーユーザ����"
 
-#: commands/indexcmds.c:166
-#, c-format
-msgid "cannot use more than %d columns in an index"
-msgstr "インデックス��%dを超�る列を使用����ん"
+#: access/transam/xlog.c:9429
+#, 
+msgid "WAL level not sufficient for creating a restore point"
+msgstr "リストア�イントを作る�� WAL レベル��足�����"
 
-#: commands/indexcmds.c:187 commands/indexcmds.c:1627 commands/tablecmds.c:194
-#: commands/tablecmds.c:1080 commands/tablecmds.c:3335 commands/comment.c:573
-#: commands/trigger.c:149 commands/trigger.c:1063 commands/lockcmds.c:149
-#: catalog/toasting.c:91
+#: access/transam/xlog.c:9437
 #, c-format
-msgid "\"%s\" is not a table"
-msgstr "\"%s\"�テーブル���り��ん"
-
-#: commands/indexcmds.c:196
-msgid "cannot create indexes on temporary tables of other sessions"
-msgstr "他�セッション�一時テーブル�対�るインデックスを作�����ん"
+msgid "value too long for restore point (maximum %d characters)"
+msgstr "リストア�イント����値�長����（最大 %d 文字）"
 
-#: commands/indexcmds.c:256 commands/tablecmds.c:443 commands/tablecmds.c:6937
-msgid "only shared relations can be placed in pg_global tablespace"
-msgstr "共有リレーション��をpg_globalテーブル空間�格��る�������"
+#: access/transam/xlog.c:9605
+msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
+msgstr "リカ�リ中� pg_xlogfile_name_offset() を実行����ん"
 
-#: commands/indexcmds.c:287
-msgid "substituting access method \"gist\" for obsolete method \"rtree\""
-msgstr "��メソッド\"rtree\"をアクセスメソッド\"gist\"�置������"
-
-#: commands/indexcmds.c:295 commands/opclasscmds.c:281
-#: commands/opclasscmds.c:669 commands/opclasscmds.c:769
-#: commands/opclasscmds.c:1495 commands/opclasscmds.c:1556
-#: commands/opclasscmds.c:1718 commands/opclasscmds.c:1812
-#: commands/opclasscmds.c:1903 commands/opclasscmds.c:2046
-#: commands/comment.c:1261 commands/comment.c:1342
+#: access/transam/xlog.c:9615 access/transam/xlog.c:9687
 #, c-format
-msgid "access method \"%s\" does not exist"
-msgstr "アクセスメソッド\"%s\"�存在���ん"
+msgid "could not parse transaction log location \"%s\""
+msgstr "トランザクションログ�置\"%s\"を解�����ん���"
 
-#: commands/indexcmds.c:304
-#, c-format
-msgid "access method \"%s\" does not support unique indexes"
-msgstr "アクセスメソッド \"%s\" ��一�性インデックスをサ�ート�����ん"
+#: access/transam/xlog.c:9680
+msgid "pg_xlogfile_name() cannot be executed during recovery."
+msgstr "リカ�リ中� pg_xlogfile_name() を実行����ん"
 
-#: commands/indexcmds.c:309
+#: access/transam/xlog.c:9777
 #, c-format
-msgid "access method \"%s\" does not support multicolumn indexes"
-msgstr "アクセスメソッド\"%s\"�複数列インデックスをサ�ート���ん"
+msgid "xlog redo %s"
+msgstr "xlog �実行 %s"
 
-#: commands/indexcmds.c:314
-#, c-format
-msgid "access method \"%s\" does not support exclusion constraints"
-msgstr "アクセスメソッド \"%s\" �排除制約をサ�ート�����ん"
+#: access/transam/xlog.c:9817
+msgid "online backup mode cancelled"
+msgstr "オンライン�ックアップモード�キャンセル�れ���"
 
-#: commands/indexcmds.c:347 parser/parse_utilcmd.c:1200
-#: parser/parse_utilcmd.c:1286
+#: access/transam/xlog.c:9818
 #, c-format
-msgid "multiple primary keys for table \"%s\" are not allowed"
-msgstr "テーブル\"%s\"�複数�プライマリキーを���る�������ん"
+msgid "\"%s\" was renamed to \"%s\"."
+msgstr "\"%s\" � \"%s\" �リ�ーム�れ���"
 
-#: commands/indexcmds.c:364
-msgid "primary keys cannot be expressions"
-msgstr "プライマリキーを���る�������ん"
+#: access/transam/xlog.c:9825
+msgid "online backup mode was not cancelled"
+msgstr "オンライン�ックアップモード�キャンセル�れ����ん"
 
-#: commands/indexcmds.c:394 commands/indexcmds.c:903
-#: parser/parse_utilcmd.c:1433
+#: access/transam/xlog.c:9826
 #, c-format
-msgid "column \"%s\" named in key does not exist"
-msgstr "キー���指��れ�列\"%s\"�存在���ん"
+msgid "Could not rename \"%s\" to \"%s\": %m."
+msgstr "\"%s\" �����を \"%s\" �変更����ん���: %m"
 
-#: commands/indexcmds.c:468
+#: access/transam/xlog.c:10323 access/transam/xlog.c:10345
 #, c-format
-msgid "%s %s will create implicit index \"%s\" for table \"%s\""
-msgstr "%1$s %2$s�テーブル\"%4$s\"�暗黙的�インデックス\"%3$s\"を作����"
-
-#: commands/indexcmds.c:827
-msgid "cannot use subquery in index predicate"
-msgstr "インデックス�述部�副�����を使用����ん"
-
-#: commands/indexcmds.c:831
-msgid "cannot use aggregate in index predicate"
-msgstr "インデックス�述部�集約を使用����ん"
+msgid "could not read from log file %u, segment %u, offset %u: %m"
+msgstr "ログファイル%u�セグメント%u�オフセット%uを読��れ��ん���: %m"
 
-#: commands/indexcmds.c:840
-msgid "functions in index predicate must be marked IMMUTABLE"
-msgstr "インデックス�述部�関数�IMMUTABLEマーク�必���"
+#: access/transam/xlog.c:10434
+#, 
+msgid "received promote request"
+msgstr "推進�求(promote request)を���り���"
 
-#: commands/indexcmds.c:908 commands/copy.c:3446 commands/tablecmds.c:1244
-#: commands/tablecmds.c:2049 utils/adt/tsvector_op.c:1347
-#: parser/parse_expr.c:762
+#: access/transam/xlog.c:10447
 #, c-format
-msgid "column \"%s\" does not exist"
-msgstr "列\"%s\"�存在���ん"
-
-#: commands/indexcmds.c:942
-msgid "cannot use subquery in index expression"
-msgstr "�インデックス��副�����を使用����ん"
-
-#: commands/indexcmds.c:946
-msgid "cannot use aggregate function in index expression"
-msgstr "�インデックス��集約関数を使用����ん"
-
-#: commands/indexcmds.c:956
-msgid "functions in index expression must be marked IMMUTABLE"
-msgstr "�インデックス�関数�IMMUTABLEマーク�必���"
-
-#: commands/indexcmds.c:991
-msgid "operator %s is not commutative"
-msgstr "演算� %s �交��能���り��ん"
-
-#: commands/indexcmds.c:993
-msgid "Only commutative operators can be used in exclusion constraints."
-msgstr "排除制約�使�る��交�演算�����"
+msgid "trigger file found: %s"
+msgstr "トリガファイル�見��り���：%s"
 
-#: commands/indexcmds.c:1019
+#: access/transam/varsup.c:114
 #, c-format
-msgid "operator %s is not a member of operator family \"%s\""
-msgstr "演算� %s �演算�ファミリー \"%s\" �メン�ー���り��ん"
-
-#: commands/indexcmds.c:1022
 msgid ""
-"The exclusion operator must be related to the index operator class for the "
-"constraint."
+"database is not accepting commands to avoid wraparound data loss in database "
+"\"%s\""
 msgstr ""
-"��制約�件������インデックス演算�クラス�対��排除制約�関連付�ら"
-"れ��れ��り��ん"
+"データベース\"%s\"���る周回�よるデータ�失を防�����データベース��"
+"����を�付���ん"
 
-#: commands/indexcmds.c:1057
-#, c-format
-msgid "access method \"%s\" does not support ASC/DESC options"
-msgstr "アクセスメソッド\"%s\"�ASC/DESCオプションをサ�ート���ん"
+#: access/transam/varsup.c:116 access/transam/varsup.c:123
+msgid ""
+"Stop the postmaster and use a standalone backend to vacuum that database.\n"
+"You might also need to commit or roll back old prepared transactions."
+msgstr ""
+"postmaster を�止後�スタンドアロン�ックエンドを使����データベースを�"
+"キューム������。\n"
+"��準備済�トランザクション�コミット���ロール�ック�必��場�も�り�"
+"�。"
 
-#: commands/indexcmds.c:1062
+#: access/transam/varsup.c:121
 #, c-format
-msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
-msgstr "アクセスメソッド\"%s\"�NULLS FIRST/LASTオプションをサ�ート���ん"
+msgid ""
+"database is not accepting commands to avoid wraparound data loss in database "
+"with OID %u"
+msgstr ""
+"OID %u を��データベース�周回�よるデータ�失を防������在������"
+"を�付���状態�������"
 
-#: commands/indexcmds.c:1118
+#: access/transam/varsup.c:133 access/transam/varsup.c:368
 #, c-format
-msgid "data type %s has no default operator class for access method \"%s\""
+msgid "database \"%s\" must be vacuumed within %u transactions"
 msgstr ""
-"アクセスメソッド\"%2$s\"��データ型%1$s用�デフォルト�演算�クラス��り�"
-"�ん"
+"データベース\"%s\"�%uトランザクション以内��キューム���れ��り��ん"
 
-#: commands/indexcmds.c:1120
+#: access/transam/varsup.c:136 access/transam/varsup.c:143
+#: access/transam/varsup.c:371 access/transam/varsup.c:378
 msgid ""
-"You must specify an operator class for the index or define a default "
-"operator class for the data type."
+"To avoid a database shutdown, execute a database-wide VACUUM in that "
+"database.\n"
+"You might also need to commit or roll back old prepared transactions."
 msgstr ""
-"��インデックス用�演算�クラスを指定�る��る����データ型�デフォルト"
-"演算�クラスを定義���れ��り��ん"
+"データベース��止を防�����データベース全体� VACUUM を実行�����"
+"�。\n"
+"��準備済�トランザクション�コミット���ロール�ック�必��場�も�り�"
+"�。"
 
-#: commands/indexcmds.c:1149 commands/indexcmds.c:1157
-#: commands/opclasscmds.c:1507 commands/opclasscmds.c:1511
-#: commands/opclasscmds.c:1739 commands/opclasscmds.c:1750
-#: commands/opclasscmds.c:1926 commands/opclasscmds.c:1937
-#: commands/comment.c:1289 commands/comment.c:1297
+#: access/transam/varsup.c:140 access/transam/varsup.c:375
 #, c-format
-msgid "operator class \"%s\" does not exist for access method \"%s\""
-msgstr "アクセスメソッド\"%2$s\"用�演算�クラス\"%1$s\"�存在���ん"
+msgid "database with OID %u must be vacuumed within %u transactions"
+msgstr ""
+"OID %u を��データベース� %u トランザクション以内��キューム�れ��れ��"
+"り��ん"
 
-#: commands/indexcmds.c:1170
+#: access/transam/varsup.c:333
 #, c-format
-msgid "operator class \"%s\" does not accept data type %s"
-msgstr "演算�クラス\"%s\"�データ型%sを��付���ん"
+msgid "transaction ID wrap limit is %u, limited by database with OID %u"
+msgstr ""
+"トランザクション ID �周回制�� %u ��OID %u を��データベース�より制��"
+"れ����"
 
-#: commands/indexcmds.c:1260
+#: access/transam/twophase.c:250
 #, c-format
-msgid "there are multiple default operator classes for data type %s"
-msgstr "データ型%s��複数�デフォルト�演算�クラス��り��"
+msgid "transaction identifier \"%s\" is too long"
+msgstr "トランザクション識別�\"%s\"�長����"
+
+#: access/transam/twophase.c:257
+msgid "prepared transactions are disabled"
+msgstr "準備�れ�トランザクション�無効��。"
+
+#: access/transam/twophase.c:258
+msgid "Set max_prepared_transactions to a nonzero value."
+msgstr "max_prepared_transactionsを�ゼロ�設定������。"
 
-#: commands/indexcmds.c:1595 commands/tablecmds.c:212
-#: commands/tablecmds.c:2341 commands/comment.c:559 access/index/indexam.c:149
+#: access/transam/twophase.c:291
 #, c-format
-msgid "\"%s\" is not an index"
-msgstr "\"%s\"�インデックス���り��ん"
+msgid "transaction identifier \"%s\" is already in use"
+msgstr "トランザクション識別�\"%s\"����存在���"
+
+#: access/transam/twophase.c:300
+msgid "maximum number of prepared transactions reached"
+msgstr "準備済��トランザクション�最大数������"
 
-#: commands/indexcmds.c:1639
+#: access/transam/twophase.c:301
 #, c-format
-msgid "table \"%s\" has no indexes"
-msgstr "テーブル\"%s\"��インデックス��り��ん"
+msgid "Increase max_prepared_transactions (currently %d)."
+msgstr "max_prepared_transactionsを増加������（�状%d）。"
 
-#: commands/indexcmds.c:1667
-msgid "can only reindex the currently open database"
-msgstr ""
-"�在オープン���るデータベース��を�インデックス付��る�������"
+#: access/transam/twophase.c:421
+#, c-format
+msgid "prepared transaction with identifier \"%s\" is busy"
+msgstr "準備�れ�トランザクション識別�\"%s\"�実行中��"
 
-#: commands/indexcmds.c:1752
-msgid "table \"%s.%s\" was reindexed"
-msgstr "テーブル\"%s.%s\"��インデックス化�れ���"
+#: access/transam/twophase.c:429
+msgid "permission denied to finish prepared transaction"
+msgstr "準備�れ�トランザクションを終了�る���権���り��ん"
 
-#: commands/proclang.c:92
-msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
-msgstr "CREATE LANGUAGEパラメータ�代�り�pg_pltemplate�情報を使用�����"
+#: access/transam/twophase.c:430
+msgid "Must be superuser or the user that prepared the transaction."
+msgstr "トランザクションを準備�るユーザ�スーパーユーザ���れ��り��ん。"
+
+#: access/transam/twophase.c:441
+msgid "prepared transaction belongs to another database"
+msgstr "準備�れ�トランザクション�別�データベース�属�����"
+
+#: access/transam/twophase.c:442
+msgid ""
+"Connect to the database where the transaction was prepared to finish it."
+msgstr ""
+"終了��る������トランザクションを準備��データベース�接続�����"
+"�"
 
-#: commands/proclang.c:102
+#: access/transam/twophase.c:456
 #, c-format
-msgid "must be superuser to create procedural language \"%s\""
-msgstr "手続�言語\"%s\"�作���スーパーユーザ���れ��り��ん"
+msgid "prepared transaction with identifier \"%s\" does not exist"
+msgstr "準備�れ�トランザクション�中�識別� \"%s\" を��も���り��ん"
 
-#: commands/proclang.c:122 commands/proclang.c:278
+#: access/transam/twophase.c:939
+msgid "two-phase state file maximum length exceeded"
+msgstr "2相状態ファイル�最大長�制�を超����"
+
+#: access/transam/twophase.c:957
 #, c-format
-msgid "function %s must return type \"language_handler\""
-msgstr "関数%s�\"language_handler\"型を返���れ��り��ん"
+msgid "could not create two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"を作�����ん���: %m"
 
-#: commands/proclang.c:242
+#: access/transam/twophase.c:971 access/transam/twophase.c:988
+#: access/transam/twophase.c:1044 access/transam/twophase.c:1465
+#: access/transam/twophase.c:1472
 #, c-format
-msgid "unsupported language \"%s\""
-msgstr "言語\"%s\"�サ�ート�れ����ん"
+msgid "could not write two-phase state file: %m"
+msgstr "2相状態ファイル�書�出���ん���: %m"
 
-#: commands/proclang.c:244
-msgid "The supported languages are listed in the pg_pltemplate system catalog."
-msgstr ""
-"サ�ート�れ��る言語�pg_pltemplateシステムカタログ内�列挙�れ����"
+#: access/transam/twophase.c:997
+#, c-format
+msgid "could not seek in two-phase state file: %m"
+msgstr "2相状態ファイルをシーク����ん���: %m"
 
-#: commands/proclang.c:252
-msgid "must be superuser to create custom procedural language"
-msgstr "手続�言語�作���スーパーユーザ���れ��り��ん"
+#: access/transam/twophase.c:1050 access/transam/twophase.c:1490
+#, c-format
+msgid "could not close two-phase state file: %m"
+msgstr "2相状態ファイルをクローズ����ん���: %m"
 
-#: commands/proclang.c:271
+#: access/transam/twophase.c:1130 access/transam/twophase.c:1570
 #, c-format
-msgid ""
-"changing return type of function %s from \"opaque\" to \"language_handler\""
-msgstr "関数%s�戻り値型を\"opaque\"�ら\"language_handler\"�変更�����"
+msgid "could not open two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"をオープン����ん���: %m"
 
-#: commands/proclang.c:356 commands/proclang.c:606
+#: access/transam/twophase.c:1147
 #, c-format
-msgid "language \"%s\" already exists"
-msgstr "言語\"%s\"����存在���"
+msgid "could not stat two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"�stat�����ん���: %m"
 
-#: commands/proclang.c:531 commands/proclang.c:600 commands/proclang.c:640
-#: commands/comment.c:1220 commands/functioncmds.c:836
-#: commands/functioncmds.c:1990 catalog/aclchk.c:640 utils/adt/acl.c:3562
+#: access/transam/twophase.c:1179
 #, c-format
-msgid "language \"%s\" does not exist"
-msgstr "言語\"%s\"�存在���ん"
+msgid "could not read two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"を読��れ��ん���: %m"
 
-#: commands/proclang.c:534
+#: access/transam/twophase.c:1271
 #, c-format
-msgid "language \"%s\" does not exist, skipping"
-msgstr "言語\"%s\"�存在���ん。�略���"
+msgid "two-phase state file for transaction %u is corrupt"
+msgstr "トランザクション%u用�2相状態ファイル�破������"
 
-#: commands/copy.c:312 commands/copy.c:324 commands/copy.c:358
-#: commands/copy.c:368
-msgid "COPY BINARY is not supported to stdout or from stdin"
-msgstr "標準入出力を介��COPY BINARY�サ�ート�れ����ん"
+#: access/transam/twophase.c:1427
+#, c-format
+msgid "could not remove two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"を削除����ん���: %m"
 
-#: commands/copy.c:446
+#: access/transam/twophase.c:1456
 #, c-format
-msgid "could not write to COPY file: %m"
-msgstr "COPYファイル�書�出���ん���: %m"
+msgid "could not recreate two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"を�作�����ん���: %m"
 
-#: commands/copy.c:458
-msgid "connection lost during COPY to stdout"
-msgstr "標準出力��COPY中�接続�失�れ���"
+#: access/transam/twophase.c:1484
+#, c-format
+msgid "could not fsync two-phase state file: %m"
+msgstr "2相状態ファイルをfsync����ん���: %m"
 
-#: commands/copy.c:499
+#: access/transam/twophase.c:1579
 #, c-format
-msgid "could not read from COPY file: %m"
-msgstr "COPYファイル�ら読�込���ん���: %m"
+msgid "could not fsync two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"をfsync����ん���: %m"
 
-#: commands/copy.c:550
+#: access/transam/twophase.c:1586
 #, c-format
-msgid "COPY from stdin failed: %s"
-msgstr "標準入力�ら�COPY�失敗����: %s"
+msgid "could not close two-phase state file \"%s\": %m"
+msgstr "2相状態ファイル\"%s\"をクローズ����ん���: %m"
 
-#: commands/copy.c:566
+#: access/transam/twophase.c:1651
 #, c-format
-msgid "unexpected message type 0x%02X during COPY from stdin"
-msgstr "標準入力�ら�COPY中�想定外�メッセージ種類0x%02X��り���"
+msgid "removing future two-phase state file \"%s\""
+msgstr "将��2相状態ファイル\"%s\"を削除�����"
 
-#: commands/copy.c:751 commands/copy.c:769 commands/copy.c:777
-#: commands/copy.c:785 commands/copy.c:793 commands/copy.c:801
-#: commands/copy.c:809 commands/copy.c:817 commands/copy.c:833
-#: commands/typecmds.c:274 commands/user.c:140 commands/user.c:157
-#: commands/user.c:165 commands/user.c:173 commands/user.c:181
-#: commands/user.c:189 commands/user.c:197 commands/user.c:205
-#: commands/user.c:213 commands/user.c:221 commands/user.c:229
-#: commands/user.c:467 commands/user.c:479 commands/user.c:487
-#: commands/user.c:495 commands/user.c:503 commands/user.c:511
-#: commands/user.c:519 commands/user.c:528 commands/user.c:536
-#: commands/functioncmds.c:485 commands/functioncmds.c:575
-#: commands/functioncmds.c:583 commands/functioncmds.c:591
-#: commands/functioncmds.c:1953 commands/functioncmds.c:1961
-#: commands/sequence.c:1025 commands/sequence.c:1033 commands/sequence.c:1041
-#: commands/sequence.c:1049 commands/sequence.c:1057 commands/sequence.c:1065
-#: commands/sequence.c:1073 commands/sequence.c:1081 commands/dbcommands.c:146
-#: commands/dbcommands.c:154 commands/dbcommands.c:162
-#: commands/dbcommands.c:170 commands/dbcommands.c:178
-#: commands/dbcommands.c:186 commands/dbcommands.c:194
-#: commands/dbcommands.c:1315 commands/dbcommands.c:1323 catalog/aclchk.c:869
-#: catalog/aclchk.c:877
-msgid "conflicting or redundant options"
-msgstr "競��るオプション��る��余計�オプション��り��"
+#: access/transam/twophase.c:1667 access/transam/twophase.c:1678
+#: access/transam/twophase.c:1791 access/transam/twophase.c:1802
+#: access/transam/twophase.c:1875
+#, c-format
+msgid "removing corrupt two-phase state file \"%s\""
+msgstr "破���2相状態ファイル\"%s\"を削除�����"
 
-#: commands/copy.c:762
+#: access/transam/twophase.c:1780 access/transam/twophase.c:1864
 #, c-format
-msgid "COPY format \"%s\" not recognized"
-msgstr "COPY フォーマット \"%s\" を�識����ん"
+msgid "removing stale two-phase state file \"%s\""
+msgstr "�����2相状態ファイル\"%s\"を削除�����"
 
-#: commands/copy.c:825 commands/copy.c:839
+#: access/transam/twophase.c:1882
 #, c-format
-msgid "argument to option \"%s\" must be a list of column names"
-msgstr "オプション \"%s\" �引数�列��並����れ��り��ん"
+msgid "recovering prepared transaction %u"
+msgstr "準備�れ�トランザクション%uを復旧�����"
 
-#: commands/copy.c:845
+#: access/transam/slru.c:609
 #, c-format
-msgid "option \"%s\" not recognized"
-msgstr "時間帯 \"%s\" を�識����ん"
+msgid "file \"%s\" doesn't exist, reading as zeroes"
+msgstr "ファイル\"%s\"�存在���ん。ゼロ���読�込���"
 
-#: commands/copy.c:856
-msgid "cannot specify DELIMITER in BINARY mode"
-msgstr "BINARYモード��DELIMITERを指定����ん"
+#: access/transam/slru.c:839 access/transam/slru.c:845
+#: access/transam/slru.c:852 access/transam/slru.c:859
+#: access/transam/slru.c:866 access/transam/slru.c:873
+#, c-format
+msgid "could not access status of transaction %u"
+msgstr "トランザクション%u�ステータス�アクセス����ん���"
 
-#: commands/copy.c:861
-msgid "cannot specify NULL in BINARY mode"
-msgstr "BINARYモード��NULLを指定����ん"
+#: access/transam/slru.c:840
+#, c-format
+msgid "Could not open file \"%s\": %m."
+msgstr "ファイル\"%s\"をオープン����ん���: %m。"
 
-#: commands/copy.c:883
-msgid "COPY delimiter must be a single one-byte character"
-msgstr "COPY�区切り文字��一�１�イト文字���れ��り��ん"
+#: access/transam/slru.c:846
+#, c-format
+msgid "Could not seek in file \"%s\" to offset %u: %m."
+msgstr "ファイル\"%s\"�オフセット%u�シーク����ん���: %m。"
 
-#: commands/copy.c:890
-msgid "COPY delimiter cannot be newline or carriage return"
-msgstr "COPY�区切り文字�改行や復帰記���る�������ん"
+#: access/transam/slru.c:853
+#, c-format
+msgid "Could not read from file \"%s\" at offset %u: %m."
+msgstr "ファイル\"%s\"�オフセット%uを読��れ��ん���: %m。"
 
-#: commands/copy.c:896
-msgid "COPY null representation cannot use newline or carriage return"
-msgstr "COPY�NULL表���改行や復帰記�を使用�る�������ん"
+#: access/transam/slru.c:860
+#, c-format
+msgid "Could not write to file \"%s\" at offset %u: %m."
+msgstr "ファイル\"%s\"�オフセット%u�書�出���ん���: %m。"
 
-#: commands/copy.c:913
+#: access/transam/slru.c:867
 #, c-format
-msgid "COPY delimiter cannot be \"%s\""
-msgstr "COPY�区切り文字を\"%s\"��る�������ん"
+msgid "Could not fsync file \"%s\": %m."
+msgstr "ファイル\"%s\"をfsync����ん���: %m。"
 
-#: commands/copy.c:919
-msgid "COPY HEADER available only in CSV mode"
-msgstr "COPY HEADER�CSVモード���使用����"
+#: access/transam/slru.c:874
+#, c-format
+msgid "Could not close file \"%s\": %m."
+msgstr "ファイル\"%s\"をクローズ����ん���: %m。"
 
-#: commands/copy.c:925
-msgid "COPY quote available only in CSV mode"
-msgstr "COPY�引用符�CSVモード���使用����"
+#: access/transam/slru.c:1101
+#, c-format
+msgid "could not truncate directory \"%s\": apparent wraparound"
+msgstr "ディレクトリ\"%s\"を切り詰�����ん���: 周回���る様�"
 
-#: commands/copy.c:930
-msgid "COPY quote must be a single one-byte character"
-msgstr "COPY�引用符��一�1�イト文字���れ��り��ん"
+#: access/transam/slru.c:1182
+#, c-format
+msgid "removing file \"%s\""
+msgstr "ファイル\"%s\"を削除�����"
 
-#: commands/copy.c:935
-msgid "COPY delimiter and quote must be different"
-msgstr "COPY�区切り文字�引用符�異�る文字���れ��り��ん"
+#: access/transam/xact.c:729
+msgid "cannot have more than 2^32-1 commands in a transaction"
+msgstr "1 トランザクション内�� 2^32-1 個以上�コマンドを������ん"
 
-#: commands/copy.c:941
-msgid "COPY escape available only in CSV mode"
-msgstr "COPY�エスケープ�CSVモード���使用����"
+#: access/transam/xact.c:1268
+#, c-format
+msgid "maximum number of committed subtransactions (%d) exceeded"
+msgstr "コミット�れ�サブトランザクション�最大数 (%d) �制�を越����"
 
-#: commands/copy.c:946
-msgid "COPY escape must be a single one-byte character"
-msgstr "COPY�エスケープ��一�1�イト文字���れ��り��ん"
+#: access/transam/xact.c:2044
+msgid "cannot PREPARE a transaction that has operated on temporary tables"
+msgstr ""
+"一時テーブル�対�る�作を行�トランザクションをPREPARE�る�������ん"
 
-#: commands/copy.c:952
-msgid "COPY force quote available only in CSV mode"
-msgstr "COPY� force quote��CSVモード���使用����"
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2835
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr "%s�トランザクションブロック�内���実行����ん"
 
-#: commands/copy.c:956
-msgid "COPY force quote only available using COPY TO"
-msgstr "COPY� force quote��COPY TO���使用����"
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2845
+#, c-format
+msgid "%s cannot run inside a subtransaction"
+msgstr "%s�サブトランザクションブロック�内���実行����ん"
 
-#: commands/copy.c:962
-msgid "COPY force not null available only in CSV mode"
-msgstr "COPY� force not null��CSVモード���使用����"
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2855
+#, c-format
+msgid "%s cannot be executed from a function or multi-command string"
+msgstr "%s�関数���複数コマンド文字列�ら実行����ん"
 
-#: commands/copy.c:966
-msgid "COPY force not null only available using COPY FROM"
-msgstr "COPY� force not null��COPY FROM���使用����"
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2906
+#, c-format
+msgid "%s can only be used in transaction blocks"
+msgstr "%s�トランザクションブロック内���使用����"
 
-#: commands/copy.c:972
-msgid "COPY delimiter must not appear in the NULL specification"
-msgstr "COPY�区切り文字をNULL��値�使用����ん"
+#: access/transam/xact.c:3088
+msgid "there is already a transaction in progress"
+msgstr "���トランザクション�進行中��"
 
-#: commands/copy.c:979
-msgid "CSV quote character must not appear in the NULL specification"
-msgstr "COPY�引用符をNULL��値�使用����ん"
+#: access/transam/xact.c:3255 access/transam/xact.c:3347
+msgid "there is no transaction in progress"
+msgstr "進行中�トランザクション��り��ん"
 
-#: commands/copy.c:985
-msgid "must be superuser to COPY to or from a file"
+#: access/transam/xact.c:3441 access/transam/xact.c:3491
+#: access/transam/xact.c:3497 access/transam/xact.c:3541
+#: access/transam/xact.c:3589 access/transam/xact.c:3595
+msgid "no such savepoint"
+msgstr "��よ��セーブ�イント��り��ん"
+
+#: access/transam/xact.c:4225
+msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr ""
-"ファイル経由�COPY FROM�COPY TOを行���スーパーユーザ���れ��り��ん"
+"1 トランザクション内�� 2^32-1 個以上�サブトランザクションを������ん"
 
-#: commands/copy.c:986
-msgid ""
-"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
-"for anyone."
+#: access/nbtree/nbtpage.c:161 access/nbtree/nbtpage.c:365
+#, c-format
+msgid "index \"%s\" is not a btree"
+msgstr "インデックス\"%s\"�btree���り��ん"
+
+#: access/nbtree/nbtpage.c:167 access/nbtree/nbtpage.c:371
+#, c-format
+msgid "version mismatch in index \"%s\": file version %d, code version %d"
 msgstr ""
-"標準入出力経由�COPY�誰�も実行�能��。��psql�\\\\copyも誰�も実行��"
-"��"
+"インデックス\"%s\"���る�ージョン��整�: ファイル�ージョン %d�コード"
+"�ージョン %d"
 
-#: commands/copy.c:1032
+#: access/nbtree/nbtpage.c:433 access/hash/hashutil.c:170
+#: access/gist/gistutil.c:589
 #, c-format
-msgid "table \"%s\" does not have OIDs"
-msgstr "テーブル\"%s\"�OIDを����ん"
+msgid "index \"%s\" contains unexpected zero page at block %u"
+msgstr "インデックス\"%s\"�ブロック %u�予期���ゼロページ��り��"
 
-#: commands/copy.c:1049
-msgid "COPY (SELECT) WITH OIDS is not supported"
-msgstr "COPY (SELECT) WITH OIDS�サ�ート�れ����ん"
+#: access/nbtree/nbtpage.c:436 access/nbtree/nbtpage.c:447
+#: access/hash/hashutil.c:173 access/hash/hashutil.c:184
+#: access/hash/hashutil.c:196 access/hash/hashutil.c:217
+#: access/gist/gistutil.c:592 access/gist/gistutil.c:603
+#: access/gist/gist.c:718 access/gist/gistvacuum.c:274
+msgid "Please REINDEX it."
+msgstr "REINDEXを行������。"
 
-#: commands/copy.c:1076
-msgid "COPY (SELECT INTO) is not supported"
-msgstr "COPY (SELECT INTO)�サ�ート�れ����ん"
+#: access/nbtree/nbtpage.c:444 access/hash/hashutil.c:181
+#: access/hash/hashutil.c:193 access/gist/gistutil.c:600
+#, c-format
+msgid "index \"%s\" contains corrupted page at block %u"
+msgstr "インデックス\"%s\"�ブロック %u�破���ページ��り��"
 
-#: commands/copy.c:1135
+#: access/nbtree/nbtinsert.c:393
 #, c-format
-msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
-msgstr "FORCE QUOTE�れ�列\"%s\"�COPY��照�れ��ん"
+msgid "duplicate key value violates unique constraint \"%s\""
+msgstr "�複キー�一�性制約\"%s\"��������"
 
-#: commands/copy.c:1157
+#: access/nbtree/nbtinsert.c:395
 #, c-format
-msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
-msgstr "FORCE NOT NULL�れ�列\"%s\"�COPY��照�れ��ん"
+msgid "Key %s already exists."
+msgstr "キー %s ����存在���"
 
-#: commands/copy.c:1235
+#: access/nbtree/nbtinsert.c:457
 #, c-format
-msgid "cannot copy from view \"%s\""
-msgstr "ビュー\"%s\"�ら�コピー�����ん"
+msgid "failed to re-find tuple within index \"%s\""
+msgstr "インデックス \"%s\" 内�行��検索�失敗����"
 
-#: commands/copy.c:1237
-msgid "Try the COPY (SELECT ...) TO variant."
-msgstr "COPY (SELECT ...) TO構文を試������"
+#: access/nbtree/nbtinsert.c:459
+msgid "This may be because of a non-immutable index expression."
+msgstr "�れ��変���インデックス評価��原因��る�能性��り��"
 
-#: commands/copy.c:1241
-#, c-format
-msgid "cannot copy from sequence \"%s\""
-msgstr "シーケンス\"%s\"�ら�コピー�����ん"
+#: access/nbtree/nbtinsert.c:535 access/nbtree/nbtsort.c:487
+msgid ""
+"Values larger than 1/3 of a buffer page cannot be indexed.\n"
+"Consider a function index of an MD5 hash of the value, or use full text "
+"indexing."
+msgstr ""
+"�ッファページ�1/3を超�る値をインデックス�る�������ん。\n"
+"値�MD5�ッシュ��インデックスを行�関数インデックスを検討�る��"
+"も���全文テキストインデックスを使用������。"
 
-#: commands/copy.c:1246
+#: access/heap/rewriteheap.c:597 access/heap/hio.c:175
 #, c-format
-msgid "cannot copy from non-table relation \"%s\""
-msgstr "テーブル以外�リレーション\"%s\"�ら�コピー�����ん"
+msgid "row is too big: size %lu, maximum size %lu"
+msgstr "行�大�����: サイズ�%lu�上��%lu"
 
-#: commands/copy.c:1270
-msgid "relative path not allowed for COPY to file"
-msgstr "ファイル��COPY��相対パス�指定����ん"
+#: access/heap/heapam.c:1086 access/heap/heapam.c:1114
+#: access/heap/heapam.c:1144 catalog/aclchk.c:1678
+#, c-format
+msgid "\"%s\" is an index"
+msgstr "\"%s\"�インデックス��"
 
-#: commands/copy.c:1279
+#: access/heap/heapam.c:1091 access/heap/heapam.c:1119
+#: access/heap/heapam.c:1149 catalog/aclchk.c:1685 commands/tablecmds.c:2268
+#: commands/tablecmds.c:7400 commands/tablecmds.c:8982
 #, c-format
-msgid "could not open file \"%s\" for writing: %m"
-msgstr "ファイル\"%s\"を書�込�用�オープン����ん���: %m"
+msgid "\"%s\" is a composite type"
+msgstr "\"%s\"�複�型��"
 
-#: commands/copy.c:1286 commands/copy.c:1781
+#: access/heap/heapam.c:3201 access/heap/heapam.c:3232
+#: access/heap/heapam.c:3267
 #, c-format
-msgid "\"%s\" is a directory"
-msgstr "\"%s\"�ディレクトリ��"
+msgid "could not obtain lock on row in relation \"%s\""
+msgstr "リレーション\"%s\"�行ロックを�得����ん���"
+
+#: access/hash/hashsearch.c:152
+msgid "hash indexes do not support whole-index scans"
+msgstr "�ッシュインデックス�インデックス全体�スキャンをサ�ート�����ん"
 
-#: commands/copy.c:1316 utils/init/miscinit.c:1040 utils/init/miscinit.c:1049
-#: utils/misc/guc.c:7004 utils/misc/guc.c:7029 storage/file/copydir.c:197
-#: postmaster/postmaster.c:3637 postmaster/postmaster.c:3647
-#: access/transam/xlog.c:2355 access/transam/xlog.c:2488
-#: access/transam/xlog.c:4338 access/transam/xlog.c:4394
+#: access/hash/hashutil.c:209
 #, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "ファイル\"%s\"を書�出���ん���: %m"
+msgid "index \"%s\" is not a hash index"
+msgstr "インデックス\"%s\"��ッシュインデックス���り��ん"
 
-#: commands/copy.c:1572
+#: access/hash/hashutil.c:215
 #, c-format
-msgid "COPY %s, line %d, column %s"
-msgstr "%s�COPY。行番� %d。列 %s"
+msgid "index \"%s\" has wrong hash version"
+msgstr "インデックス\"%s\"��ッシュ�ージョン��正��"
 
-#: commands/copy.c:1576 commands/copy.c:1621
+#: access/hash/hashovfl.c:547
 #, c-format
-msgid "COPY %s, line %d"
-msgstr "%s�COPY。行番� %d"
+msgid "out of overflow pages in hash index \"%s\""
+msgstr "�ッシュインデックス\"%s\"�中�オー�ーフローページ��り��ん"
 
-#: commands/copy.c:1587
+#: access/hash/hashinsert.c:73
 #, c-format
-msgid "COPY %s, line %d, column %s: \"%s\""
-msgstr "%s�COPY。行番� %d。列 %s: \"%s\""
+msgid "index row size %lu exceeds hash maximum %lu"
+msgstr "インデックス�行サイズ%lu��ッシュ�最大%luを超�����"
+
+#: access/hash/hashinsert.c:76
+msgid "Values larger than a buffer page cannot be indexed."
+msgstr "�ッファページよりも大��値をインデックス�る�������ん。"
 
-#: commands/copy.c:1595
+#: access/common/tupdesc.c:575 parser/parse_relation.c:1169
 #, c-format
-msgid "COPY %s, line %d, column %s: null input"
-msgstr "%s�COPY。行番� %d。列 %s: 入力�ヌル��"
+msgid "column \"%s\" cannot be declared SETOF"
+msgstr "列\"%s\"をSETOF�宣言����ん"
 
-#: commands/copy.c:1607
+#: access/common/tupconvert.c:107
 #, c-format
-msgid "COPY %s, line %d: \"%s\""
-msgstr "%s�COPY。行番� %d: \"%s\""
+msgid "Returned type %s does not match expected type %s in column %d."
+msgstr "列 %3$d �返�れ�型 %1$s �期待�る型 %2$s �一致���ん"
 
-#: commands/copy.c:1709
+#: access/common/tupconvert.c:135
 #, c-format
-msgid "cannot copy to view \"%s\""
-msgstr "ビュー\"%s\"��コピー�����ん"
+msgid ""
+"Number of returned columns (%d) does not match expected column count (%d)."
+msgstr "返�れ�列数(%d)�期待�る列数(%d)�一致���ん"
 
-#: commands/copy.c:1714
+#: access/common/tupconvert.c:240
 #, c-format
-msgid "cannot copy to sequence \"%s\""
-msgstr "シーケンス\"%s\"��コピー�����ん"
+msgid ""
+"Attribute \"%s\" of type %s does not match corresponding attribute of type %"
+"s."
+msgstr "型 %1$s �属性 \"%2$s\" �対応�る型 %3$s �属性��致���ん"
 
-#: commands/copy.c:1719
+#: access/common/tupconvert.c:252
 #, c-format
-msgid "cannot copy to non-table relation \"%s\""
-msgstr "テーブル以外�リレーション\"%s\"��コピー�����ん"
+msgid "Attribute \"%s\" of type %s does not exist in type %s."
+msgstr "型 %2$s �属性 \"%1$s\" �型 %3$s 中�存在���ん"
 
-#: commands/copy.c:1774 utils/adt/genfile.c:106
+#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
 #, c-format
-msgid "could not open file \"%s\" for reading: %m"
-msgstr "ファイル\"%s\"を読��り用�オープン����ん���: %m"
+msgid "number of columns (%d) exceeds limit (%d)"
+msgstr "列数(%d)�上�(%d)を超�����"
 
-#: commands/copy.c:1887
-msgid "COPY file signature not recognized"
-msgstr "COPYファイル�シグ��ャ��明��"
+#: access/common/reloptions.c:323
+msgid "user-defined relation parameter types limit exceeded"
+msgstr "ユーザ定義リレーション�パラメータ型�制�を超����"
 
-#: commands/copy.c:1892
-msgid "invalid COPY file header (missing flags)"
-msgstr "COPYファイル�ヘッダ�無効��(フラグ��り��ん)"
+#: access/common/reloptions.c:622
+msgid "RESET must not include values for parameters"
+msgstr "RESET��パラメータ�値を��������ん"
 
-#: commands/copy.c:1898
-msgid "unrecognized critical flags in COPY file header"
-msgstr "COPYファイル�ヘッダ内����フラグ��明��"
+#: access/common/reloptions.c:655
+#, c-format
+msgid "unrecognized parameter namespace \"%s\""
+msgstr "未知�パラメータ namaspace \"%s\""
 
-#: commands/copy.c:1904
-msgid "invalid COPY file header (missing length)"
-msgstr "COPYファイル�ヘッダ�無効��(サイズ��り��ん)"
+#: access/common/reloptions.c:898
+#, c-format
+msgid "unrecognized parameter \"%s\""
+msgstr "未知�パラメータ \"%s\""
 
-#: commands/copy.c:1911
-msgid "invalid COPY file header (wrong length)"
-msgstr "COPYファイル�ヘッダ�無効��(サイズ��正��)"
+#: access/common/reloptions.c:923
+#, c-format
+msgid "parameter \"%s\" specified more than once"
+msgstr "パラメータ\"%s\"�複数指定�れ���"
 
-#: commands/copy.c:2002
-msgid "missing data for OID column"
-msgstr "OID列�データ��り��ん"
+#: access/common/reloptions.c:938
+#, c-format
+msgid "invalid value for boolean option \"%s\": %s"
+msgstr "ブールオプション値 \"%s\" �無効��: %s"
 
-#: commands/copy.c:2008
-msgid "null OID in COPY data"
-msgstr "COPYデータ�OID�NULL���"
+#: access/common/reloptions.c:949
+#, c-format
+msgid "invalid value for integer option \"%s\": %s"
+msgstr "整数値オプション�値 \"%s\" �無効��: %s"
 
-#: commands/copy.c:2018 commands/copy.c:2090
-msgid "invalid OID in COPY data"
-msgstr "COPYデータ�OID�無効��"
+#: access/common/reloptions.c:954 access/common/reloptions.c:972
+#, c-format
+msgid "value %s out of bounds for option \"%s\""
+msgstr "値 %s �オプション \"%s\" �範囲外��"
 
-#: commands/copy.c:2033
+#: access/common/reloptions.c:956
 #, c-format
-msgid "missing data for column \"%s\""
-msgstr "列\"%s\"�データ��り��ん"
+msgid "Valid values are between \"%d\" and \"%d\"."
+msgstr "有効�値�範囲� \"%d\" ～ \"%d\" ��。"
 
-#: commands/copy.c:2074
+#: access/common/reloptions.c:967
 #, c-format
-msgid "row field count is %d, expected %d"
-msgstr "行�フィールド数�%d���期待値�%d��"
+msgid "invalid value for floating point option \"%s\": %s"
+msgstr "浮動�数点オプション�値 \"%s\" �無効��: %s"
 
-#: commands/copy.c:2217 utils/init/miscinit.c:1000 utils/misc/guc.c:7097
+#: access/common/reloptions.c:974
 #, c-format
-msgid "could not read from file \"%s\": %m"
-msgstr "ファイル\"%s\"�ら読��れ��ん���: %m"
+msgid "Valid values are between \"%f\" and \"%f\"."
+msgstr "有効�値�範囲� \"%f\" ～ \"%f\" ��。"
 
-#: commands/copy.c:2494 commands/copy.c:2511
-msgid "literal carriage return found in data"
-msgstr "データ�中�復帰記���も���り���"
+#: access/common/printtup.c:278 tcop/postgres.c:1664 tcop/fastpath.c:180
+#: tcop/fastpath.c:554
+#, c-format
+msgid "unsupported format code: %d"
+msgstr "未サ�ート�書�コード: %d"
 
-#: commands/copy.c:2495 commands/copy.c:2512
-msgid "unquoted carriage return found in data"
-msgstr "データ�中�引用符���復帰記���り���"
+#: access/common/indextuple.c:57
+#, c-format
+msgid "number of index columns (%d) exceeds limit (%d)"
+msgstr "インデックス列数(%d)�上�(%d)を超�����"
 
-#: commands/copy.c:2497 commands/copy.c:2514
-msgid "Use \"\\r\" to represent carriage return."
-msgstr "復帰記��\"\\r\"�表�������"
+#: access/common/indextuple.c:168
+#, c-format
+msgid "index row requires %lu bytes, maximum size is %lu"
+msgstr "インデックス行�%lu�イト�求。最大サイズ�%lu��"
 
-#: commands/copy.c:2498 commands/copy.c:2515
-msgid "Use quoted CSV field to represent carriage return."
-msgstr "復帰記�を表��る��CSVフィールドを引用符�括������"
+#: access/gist/gistsplit.c:375
+#, c-format
+msgid "picksplit method for column %d of index \"%s\" failed"
+msgstr ""
+"インデックス\"%2$s\"�列%1$d�対�るピックスプリットメソッド�失敗����"
 
-#: commands/copy.c:2527
-msgid "literal newline found in data"
-msgstr "データ�中�改行記���も���り���"
+#: access/gist/gistsplit.c:377
+msgid ""
+"The index is not optimal. To optimize it, contact a developer, or try to use "
+"the column as the second one in the CREATE INDEX command."
+msgstr ""
+"インデックス�最����り��ん。最�化�る����開発者�連絡�る�\n"
+"��列をCREATE INDEXコマンド�2番目�も����使用�る��を試������"
 
-#: commands/copy.c:2528
-msgid "unquoted newline found in data"
-msgstr "データ�中�引用符���改行記���り���"
+#: access/gist/gist.c:230
+#, 
+msgid "unlogged GiST indexes are not supported"
+msgstr "ログ��得を行���(unlogged) GiST インデックス�サ�ート�れ��ん"
 
-#: commands/copy.c:2530
-msgid "Use \"\\n\" to represent newline."
-msgstr "改行記��\"\\n\"�表�������"
+#: access/gist/gist.c:715 access/gist/gistvacuum.c:271
+#, c-format
+msgid "index \"%s\" contains an inner tuple marked as invalid"
+msgstr "インデックス \"%s\" 内�無効�判断�れ��る内部タプル��り��"
 
-#: commands/copy.c:2531
-msgid "Use quoted CSV field to represent newline."
-msgstr "改行記�を表��る��CSVフィールドを引用符�括������"
+#: access/gist/gist.c:717 access/gist/gistvacuum.c:273
+msgid ""
+"This is caused by an incomplete page split at crash recovery before "
+"upgrading to 9.1."
+msgstr ""
 
-#: commands/copy.c:2577 commands/copy.c:2613
-msgid "end-of-copy marker does not match previous newline style"
-msgstr "コピー終端記���れ���改行方��一致���ん"
+#: executor/nodeAgg.c:1730 executor/nodeWindowAgg.c:1851
+#, c-format
+msgid "aggregate %u needs to have compatible input type and transition type"
+msgstr "集約%u�入力データ型��移用�型間�互�性�必���"
 
-#: commands/copy.c:2586 commands/copy.c:2602
-msgid "end-of-copy marker corrupt"
-msgstr "コピー終端記��破������"
+#: executor/execUtils.c:1304
+#, c-format
+msgid "could not create exclusion constraint \"%s\""
+msgstr "排除制約 \"%s\" を作�����ん���"
 
-#: commands/copy.c:2729 commands/copy.c:2764 commands/copy.c:2944
-#: commands/copy.c:2979
-msgid "extra data after last expected column"
-msgstr "推定最終列�後�余計�データ��り���"
+#: executor/execUtils.c:1306
+#, c-format
+msgid "Key %s conflicts with key %s."
+msgstr "キー %s �キー %s �競������"
 
-#: commands/copy.c:3026
-msgid "unterminated CSV quoted field"
-msgstr "CSV引用符�閉�����ん"
+#: executor/execUtils.c:1311
+#, c-format
+msgid "conflicting key value violates exclusion constraint \"%s\""
+msgstr "�複キー�値�排除制約 \"%s\" ��������"
 
-#: commands/copy.c:3103 commands/copy.c:3122
-msgid "unexpected EOF in COPY data"
-msgstr "COPYデータ�中�想定外�EOF��り��"
+#: executor/execUtils.c:1313
+#, c-format
+msgid "Key %s conflicts with existing key %s."
+msgstr "キー %s �既存�キー %s �競������"
 
-#: commands/copy.c:3112
-msgid "invalid field size"
-msgstr "フィールドサイズ�無効��"
+#: executor/nodeMergejoin.c:1604
+msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
+msgstr "RIGHT JOIN�マージ���能����件���サ�ート�れ����"
 
-#: commands/copy.c:3135
-msgid "incorrect binary data format"
-msgstr "�イナリデータ書���正��"
+#: executor/nodeMergejoin.c:1624
+msgid "FULL JOIN is only supported with merge-joinable join conditions"
+msgstr "FULL JOIN�マージ���能����件���サ�ート�れ����"
 
-#: commands/copy.c:3441 commands/tablecmds.c:3930 commands/tablecmds.c:4020
-#: commands/tablecmds.c:4067 commands/tablecmds.c:4163
-#: commands/tablecmds.c:4207 commands/tablecmds.c:4286
-#: commands/tablecmds.c:4359 commands/tablecmds.c:5796
-#: commands/tablecmds.c:5934 commands/comment.c:651 commands/sequence.c:1309
-#: commands/trigger.c:527 commands/analyze.c:340 catalog/aclchk.c:1464
-#: utils/adt/acl.c:2770 utils/adt/ruleutils.c:1523 parser/parse_type.c:117
-#: parser/parse_target.c:808 parser/parse_relation.c:1996
-#: parser/parse_relation.c:2051 parser/analyze.c:1814
+#: executor/functions.c:195
 #, c-format
-msgid "column \"%s\" of relation \"%s\" does not exist"
-msgstr "リレーション\"%2$s\"�列\"%1$s\"�存在���ん"
+msgid "could not determine actual type of argument declared %s"
+msgstr "%s都宣言�れ�引数�型を決定����ん"
 
-#: commands/copy.c:3453 commands/tablecmds.c:1270 commands/trigger.c:536
-#: parser/parse_target.c:824 parser/parse_target.c:835
+#. translator: %s is a SQL statement name
+#: executor/functions.c:295
 #, c-format
-msgid "column \"%s\" specified more than once"
-msgstr "列\"%s\"�複数指定�れ���"
-
-#: commands/typecmds.c:163
-msgid "must be superuser to create a base type"
-msgstr "基本型を作���る��スーパーユーザ����"
+msgid "%s is not allowed in a SQL function"
+msgstr "SQL関数��%s�許�れ��ん"
 
-#: commands/typecmds.c:218 commands/typecmds.c:795 commands/typecmds.c:1120
-#: commands/typecmds.c:1543 catalog/heap.c:943 catalog/pg_type.c:385
-#: catalog/pg_type.c:665
+#. translator: %s is a SQL statement name
+#: executor/functions.c:302 executor/spi.c:1256 executor/spi.c:1891
 #, c-format
-msgid "type \"%s\" already exists"
-msgstr "型\"%s\"����存在���"
+msgid "%s is not allowed in a non-volatile function"
+msgstr "volatile関数以外��%s�許�れ��ん"
 
-#: commands/typecmds.c:267
+#: executor/functions.c:408
 #, c-format
-msgid "type attribute \"%s\" not recognized"
-msgstr "型�属性\"%s\"��明��"
+msgid ""
+"could not determine actual result type for function declared to return type %"
+"s"
+msgstr "戻り値型%s���宣言�れ�関数�実際��果型を決定����ん"
 
-#: commands/typecmds.c:321
-#, c-format
-msgid "invalid type category \"%s\": must be simple ASCII"
-msgstr "型カテゴリ \"%s\" �無効��。�純� ASCII ���れ��り��ん"
+#: executor/functions.c:785 executor/execQual.c:1613 executor/execQual.c:1638
+#: executor/execQual.c:1999 executor/execQual.c:5115
+#: replication/walsender.c:1387 utils/fmgr/funcapi.c:60
+#: utils/mmgr/portalmem.c:946 foreign/foreign.c:350 commands/prepare.c:751
+#: commands/extension.c:1679 commands/extension.c:1788
+#: commands/extension.c:1981
+msgid "set-valued function called in context that cannot accept a set"
+msgstr "��コンテキスト�集�値�関数�集�を��付�られ��ん"
 
-#: commands/typecmds.c:340
+#: executor/functions.c:1146
 #, c-format
-msgid "array element type cannot be %s"
-msgstr "%sを�列�素�型��る�������ん"
+msgid "SQL function \"%s\" statement %d"
+msgstr "SQL関数\"%s\"�行番� %d"
 
-#: commands/typecmds.c:372
+#: executor/functions.c:1162 catalog/pg_proc.c:888
 #, c-format
-msgid "alignment \"%s\" not recognized"
-msgstr "アライメント\"%s\"��明��"
+msgid "SQL function \"%s\""
+msgstr "SQL関数\"%s\""
 
-#: commands/typecmds.c:389
+#: executor/functions.c:1172
 #, c-format
-msgid "storage \"%s\" not recognized"
-msgstr "格�方�\"%s\"��明��"
-
-#: commands/typecmds.c:398
-msgid "type input function must be specified"
-msgstr "型�入力関数を指定���れ��り��ん"
+msgid "SQL function \"%s\" during startup"
+msgstr "SQL関数\"%s\"�起動中"
 
-#: commands/typecmds.c:402
-msgid "type output function must be specified"
-msgstr "型�出力関数を指定���れ��り��ん"
+#: executor/functions.c:1332 executor/functions.c:1368
+#: executor/functions.c:1380 executor/functions.c:1493
+#: executor/functions.c:1526 executor/functions.c:1556
+#, c-format
+msgid "return type mismatch in function declared to return %s"
+msgstr "%sを返��宣言�れ�関数����戻り値型�一致���ん"
 
-#: commands/typecmds.c:407
+#: executor/functions.c:1334
 msgid ""
-"type modifier output function is useless without a type modifier input "
-"function"
-msgstr "型修正入力関数���場��型修正出力関数��味��り��ん"
-
-#: commands/typecmds.c:430
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to %s"
-msgstr "関数%s�戻り値型を\"opaque\"�ら%s�変更�����"
+"Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
+msgstr ""
+"関数�最後�ステートメント� SELECT も��� RETURNING 付��INSERT/UPDATE/"
+"DELETE ���れ����れ��り��ん"
 
-#: commands/typecmds.c:437
-#, c-format
-msgid "type input function %s must return type %s"
-msgstr "型�入力関数%s�型%sを返���れ��り��ん"
+#: executor/functions.c:1370
+msgid "Final statement must return exactly one column."
+msgstr "最後�ステートメント�正確�1列を返���れ��り��ん"
 
-#: commands/typecmds.c:447
+#: executor/functions.c:1382
 #, c-format
-msgid "changing return type of function %s from \"opaque\" to \"cstring\""
-msgstr "関数%s�戻り値型を\"opaque\"�ら\"cstring\"�変更�����"
+msgid "Actual return type is %s."
+msgstr "実際�戻り値型�%s��"
 
-#: commands/typecmds.c:454
-#, c-format
-msgid "type output function %s must return type \"cstring\""
-msgstr "型�出力関数%s�型\"cstring\"を返���れ��り��ん"
+#: executor/functions.c:1495
+msgid "Final statement returns too many columns."
+msgstr "最後�ステートメント�返�列�多����"
 
-#: commands/typecmds.c:463
+#: executor/functions.c:1528
 #, c-format
-msgid "type receive function %s must return type %s"
-msgstr "型��信関数%s�型%sを返���れ��り��ん"
+msgid "Final statement returns %s instead of %s at column %d."
+msgstr "最後�ステートメント�列 %3$d � %2$s ���� %1$s を返����"
 
-#: commands/typecmds.c:472
-#, c-format
-msgid "type send function %s must return type \"bytea\""
-msgstr "型��信関数%s�型\"bytea\"を返���れ��り��ん"
+#: executor/functions.c:1558
+msgid "Final statement returns too few columns."
+msgstr "最後�ステートメント�返�列�少�����"
 
-#: commands/typecmds.c:650 commands/typecmds.c:2572 commands/tablecmds.c:216
-#: commands/functioncmds.c:126 utils/adt/regproc.c:973 parser/parse_type.c:196
-#: parser/parse_func.c:1463
+#: executor/functions.c:1607
 #, c-format
-msgid "type \"%s\" does not exist"
-msgstr "型\"%s\"�存在���ん"
+msgid "return type %s is not supported for SQL functions"
+msgstr "戻り値型%s�SQL関数�サ�ート�れ����ん"
 
-#: commands/typecmds.c:656 commands/tablecmds.c:217
+#: executor/execMain.c:995
 #, c-format
-msgid "type \"%s\" does not exist, skipping"
-msgstr "型\"%s\"�存在���ん。�略���"
+msgid "cannot change sequence \"%s\""
+msgstr "シーケンス\"%s\"を変更����ん"
 
-#: commands/typecmds.c:677 commands/typecmds.c:2205
+#: executor/execMain.c:1001
 #, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\"�ドメイン���り��ん"
+msgid "cannot change TOAST relation \"%s\""
+msgstr "TOASTリレーション\"%s\"を変更����ん"
 
-#: commands/typecmds.c:816
+#: executor/execMain.c:1011
 #, c-format
-msgid "\"%s\" is not a valid base type for a domain"
-msgstr "\"%s\"�ドメイン�基本型���無効��"
-
-#: commands/typecmds.c:885
-msgid "multiple default expressions"
-msgstr "デフォルト��複数�り��"
-
-#: commands/typecmds.c:949 commands/typecmds.c:958
-msgid "conflicting NULL/NOT NULL constraints"
-msgstr "NULL制約�NOT NULL制約�競������"
+msgid "cannot insert into view \"%s\""
+msgstr "ビュー \"%s\" ��挿入(INSERT)����ん"
 
-#: commands/typecmds.c:977 commands/typecmds.c:1902
-msgid "unique constraints not possible for domains"
-msgstr "ドメイン��一�性制約�使用����ん"
+#: executor/execMain.c:1013
+#, 
+msgid ""
+"You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT "
+"trigger."
+msgstr "無�件� ON INSERT DO INSTEAD ルールも���"
+" INSTEAD OF INSERT トリガー�必���"
 
-#: commands/typecmds.c:983 commands/typecmds.c:1908
-msgid "primary key constraints not possible for domains"
-msgstr "ドメイン��プライマリキー制約�����ん"
+#: executor/execMain.c:1019
+#, c-format
+msgid "cannot update view \"%s\""
+msgstr "ビュー \"%s\" �更新����ん"
 
-#: commands/typecmds.c:989 commands/typecmds.c:1914
-msgid "exclusion constraints not possible for domains"
-msgstr "ドメイン��排除制約�使用����ん"
+#: executor/execMain.c:1021
+#, 
+msgid ""
+"You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE "
+"trigger."
+msgstr "無�件� ON UPDATE DO INSTEAD ルールも���"
+" INSTEAD OF UPDATE トリガー�必���"
 
-#: commands/typecmds.c:995 commands/typecmds.c:1920
-msgid "foreign key constraints not possible for domains"
-msgstr "ドメイン用�外部キー制約�����ん"
+#: executor/execMain.c:1027
+#, c-format
+msgid "cannot delete from view \"%s\""
+msgstr "ビュー \"%s\" �ら�削除����ん"
 
-#: commands/typecmds.c:1004 commands/typecmds.c:1929
-msgid "specifying constraint deferrability not supported for domains"
-msgstr "ドメイン��制約�延�指定�サ�ート�����ん"
+#: executor/execMain.c:1029
+#, 
+msgid ""
+"You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE "
+"trigger."
+msgstr "無�件� ON DELETE DO INSTEAD ルールも���"
+" INSTEAD OF DELETE トリガー�必���"
 
-#: commands/typecmds.c:1251
+#: executor/execMain.c:1039
 #, c-format
-msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
-msgstr "関数%s�引数型を\"opaque\"�ら\"cstring\"�変更�����"
+msgid "cannot change foreign table \"%s\""
+msgstr "外部テーブル \"%s\"を変更����ん"
 
-#: commands/typecmds.c:1269 commands/typecmds.c:1320 commands/typecmds.c:1351
-#: commands/typecmds.c:1374 commands/typecmds.c:1395 commands/typecmds.c:1422
-#: commands/typecmds.c:1449 catalog/pg_aggregate.c:331 parser/parse_func.c:286
-#: parser/parse_func.c:1442
+#: executor/execMain.c:1045
 #, c-format
-msgid "function %s does not exist"
-msgstr "関数%s�存在���ん"
+msgid "cannot change relation \"%s\""
+msgstr "リレーション\"%s\"を変更����ん"
 
-#: commands/typecmds.c:1302
+#: executor/execMain.c:1069
 #, c-format
-msgid "changing argument type of function %s from \"opaque\" to %s"
-msgstr "関数%s�引数型を\"opaque\"�ら%s�変更�����"
+msgid "cannot lock rows in sequence \"%s\""
+msgstr "シーケンス \"%s\" ��行�ロック�����ん"
 
-#: commands/typecmds.c:1401
+#: executor/execMain.c:1076
 #, c-format
-msgid "typmod_in function %s must return type \"integer\""
-msgstr "typmod_in関数%s�\"integer\"型を返���れ��り��ん"
+msgid "cannot lock rows in TOAST relation \"%s\""
+msgstr "TOAST リレーション \"%s\" ��行�ロック�����ん"
 
-#: commands/typecmds.c:1428
+#: executor/execMain.c:1083
 #, c-format
-msgid "typmod_out function %s must return type \"cstring\""
-msgstr "typmod_out関数%s�型\"cstring\"を返���れ��り��ん"
+msgid "cannot lock rows in view \"%s\""
+msgstr "ビュー \"%s\" ��行�ロック�����ん"
 
-#: commands/typecmds.c:1455
+#: executor/execMain.c:1090
 #, c-format
-msgid "type analyze function %s must return type \"boolean\""
-msgstr "型�解�関数%s�\"boolean\"型を返���れ��り��ん"
-
-#: commands/typecmds.c:1513
-msgid "composite type must have at least one attribute"
-msgstr "複�型�少���も1��属性を����れ��り��ん"
+msgid "cannot lock rows in foreign table \"%s\""
+msgstr "外部テーブル \"%s\" ��行�ロック�����ん"
 
-#: commands/typecmds.c:1754
+#: executor/execMain.c:1096
 #, c-format
-msgid "column \"%s\" of table \"%s\" contains null values"
-msgstr "テーブル\"%2$s\"�列\"%1$s\"�NULL値��り��"
+msgid "cannot lock rows in relation \"%s\""
+msgstr "リレーション \"%s\" ��行�ロック�����ん"
 
-#: commands/typecmds.c:2000
+#: executor/execMain.c:1567
 #, c-format
-msgid ""
-"column \"%s\" of table \"%s\" contains values that violate the new constraint"
-msgstr "テーブル\"%2$s\"�列\"%1$s\"�新��制約����る値��り��"
+msgid "null value in column \"%s\" violates not-null constraint"
+msgstr "列\"%s\"内�NULL値�NOT NULL制約����"
 
-#: commands/typecmds.c:2239 catalog/pg_constraint.c:648
+#: executor/execMain.c:1579
 #, c-format
-msgid "constraint \"%s\" for domain \"%s\" already exists"
-msgstr "ドメイン\"%2$s\"�制約\"%1$s\"����存在���"
-
-#: commands/typecmds.c:2281 commands/typecmds.c:2290
-msgid "cannot use table references in domain check constraint"
-msgstr "ドメイン�検査制約��テーブル�照を使用����ん"
+msgid "new row for relation \"%s\" violates check constraint \"%s\""
+msgstr "リレーション\"%s\"�新��行�検査制約\"%s\"��������"
 
-#: commands/typecmds.c:2298 catalog/heap.c:2330
-msgid "cannot use subquery in check constraint"
-msgstr "�ェック制約��副�����を使用����ん"
+#: executor/execMain.c:1863 executor/nodeLockRows.c:137
+#: executor/nodeModifyTable.c:366 executor/nodeModifyTable.c:582
+#: commands/trigger.c:2589
+msgid "could not serialize access due to concurrent update"
+msgstr "�時更新���直列化アクセス�����ん���"
 
-#: commands/typecmds.c:2302 catalog/heap.c:2334
-msgid "cannot use aggregate function in check constraint"
-msgstr "�ェック制約��集約関数を使用����ん"
+#: executor/execMain.c:2415 commands/tablecmds.c:425
+msgid "ON COMMIT can only be used on temporary tables"
+msgstr "ON COMMIT�一時テーブル���使用����"
 
-#: commands/typecmds.c:2306 catalog/heap.c:2338
-msgid "cannot use window function in check constraint"
-msgstr "�ェック制約��ウィンドウ関数を使用����ん"
+#: executor/execMain.c:2426 commands/tablecmds.c:440
+msgid "cannot create temporary table within security-restricted operation"
+msgstr "セキュリティー制��作中��一時テーブルを作�����ん"
 
-#: commands/typecmds.c:2519 commands/typecmds.c:2591 commands/typecmds.c:2822
+#: executor/nodeHashjoin.c:814 executor/nodeHashjoin.c:844
 #, c-format
-msgid "%s is a table's row type"
-msgstr "%s�テーブル�行型��"
+msgid "could not rewind hash-join temporary file: %m"
+msgstr "�ッシュ��用一時ファイルを巻�戻�����ん"
 
-#: commands/typecmds.c:2521 commands/typecmds.c:2593 commands/typecmds.c:2824
-msgid "Use ALTER TABLE instead."
-msgstr "代�り�ALTER TABLEを使用������"
-
-#: commands/typecmds.c:2528 commands/typecmds.c:2600 commands/typecmds.c:2739
-#, c-format
-msgid "cannot alter array type %s"
-msgstr "�列型%sを変更����ん"
-
-#: commands/typecmds.c:2530 commands/typecmds.c:2602 commands/typecmds.c:2741
+#: executor/nodeHashjoin.c:879 executor/nodeHashjoin.c:885
 #, c-format
-msgid "You can alter type %s, which will alter the array type as well."
-msgstr "型%sを変更�る�������。�れ��時����列型も変更���。"
+msgid "could not write to hash-join temporary file: %m"
+msgstr "�ッシュ��用一時ファイルを書�出���ん: %m"
 
-#: commands/typecmds.c:2786
+#: executor/nodeHashjoin.c:919 executor/nodeHashjoin.c:929
 #, c-format
-msgid "type %s is already in schema \"%s\""
-msgstr "型%s����スキーマ\"%s\"内�存在���"
-
-#: commands/typecmds.c:2794 commands/tablecmds.c:7801
-#: commands/functioncmds.c:1887
-msgid "cannot move objects into or out of temporary schemas"
-msgstr "一時スキーマ�����一時スキーマ�らオブジェクトを移動����ん"
-
-#: commands/typecmds.c:2800 commands/tablecmds.c:7807
-#: commands/functioncmds.c:1893
-msgid "cannot move objects into or out of TOAST schema"
-msgstr "TOASTスキーマ�����TOASTスキーマ�らオブジェクトを移動����ん"
+msgid "could not read from hash-join temporary file: %m"
+msgstr "�ッシュ��用一時ファイル�ら読��れ��ん: %m"
 
-#: commands/typecmds.c:2808
+#: executor/execCurrent.c:66 utils/adt/xml.c:2046 utils/adt/xml.c:2210
+#: commands/portalcmds.c:168 commands/portalcmds.c:222
 #, c-format
-msgid "type \"%s\" already exists in schema \"%s\""
-msgstr "型\"%s\"�スキーマ\"%s\"内����存在���"
+msgid "cursor \"%s\" does not exist"
+msgstr "カーソル\"%s\"�存在���ん"
 
-#: commands/opclasscmds.c:190 commands/opclasscmds.c:701
+#: executor/execCurrent.c:75
 #, c-format
-msgid "operator family \"%s\" for access method \"%s\" already exists"
-msgstr "アクセスメソッド\"%2$s\"�演算��\"%1$s\"����存在���"
-
-#: commands/opclasscmds.c:320
-msgid "must be superuser to create an operator class"
-msgstr "演算�クラスを作��る��スーパーユーザ���れ��り��ん"
+msgid "cursor \"%s\" is not a SELECT query"
+msgstr "カーソル\"%s\"�SELECT��������り��ん"
 
-#: commands/opclasscmds.c:343 commands/opclasscmds.c:789
-#: commands/opclasscmds.c:1568 commands/opclasscmds.c:1572
-#: commands/opclasscmds.c:1833 commands/opclasscmds.c:1844
-#: commands/opclasscmds.c:2069 commands/opclasscmds.c:2080
-#: commands/comment.c:1370 commands/comment.c:1378
+#: executor/execCurrent.c:81
 #, c-format
-msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "アクセスメソッド\"%2$s\"用�演算��\"%1$s\"�存在���ん"
+msgid "cursor \"%s\" is held from a previous transaction"
+msgstr "カーソル\"%s\"�以��トランザクション�ら���れ����"
 
-#: commands/opclasscmds.c:403 commands/opclasscmds.c:849
-#: commands/opclasscmds.c:971
+#: executor/execCurrent.c:113
 #, c-format
-msgid "invalid operator number %d, must be between 1 and %d"
-msgstr "演算�番�%d�無効��。1�ら%d�����れ��り��ん"
+msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
+msgstr ""
+"カーソル \"%s\" ��テーブル \"%s\" �対�る複数� FOR UPDATE/SHARE�照���"
+"れ����"
 
-#: commands/opclasscmds.c:446 commands/opclasscmds.c:892
-#: commands/opclasscmds.c:986
+#: executor/execCurrent.c:122
 #, c-format
-msgid "invalid procedure number %d, must be between 1 and %d"
-msgstr "プロシージャ番�%d�無効��。1�ら%d�����れ��り��ん"
-
-#: commands/opclasscmds.c:476
-msgid "storage type specified more than once"
-msgstr "格�型�複数指定�れ���"
+msgid ""
+"cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
+msgstr ""
+"カーソル \"%s\" �テーブル \"%s\" �� FOR UPDATE/SHARE �照を������ん"
 
-#: commands/opclasscmds.c:504
+#: executor/execCurrent.c:132 executor/execCurrent.c:178
 #, c-format
-msgid ""
-"storage type cannot be different from data type for access method \"%s\""
-msgstr "アクセスメソッド\"%s\"用�データ型�異�る格�型を使用����ん"
+msgid "cursor \"%s\" is not positioned on a row"
+msgstr "カーソル\"%s\"�行上��置�����ん"
 
-#: commands/opclasscmds.c:520
+#: executor/execCurrent.c:165
 #, c-format
-msgid "operator class \"%s\" for access method \"%s\" already exists"
-msgstr "アクセスメソッド\"%2$s\"�演算�クラス\"%1$s\"����存在���"
+msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
+msgstr "カーソル\"%s\"�テーブル\"%s\"を�純�更新�能スキャン���り��ん"
 
-#: commands/opclasscmds.c:548
+#: executor/execCurrent.c:230 executor/execQual.c:1033
 #, c-format
-msgid "could not make operator class \"%s\" be default for type %s"
-msgstr "演算�クラス\"%s\"を型%s�デフォルト��る�������ん���"
+msgid ""
+"type of parameter %d (%s) does not match that when preparing the plan (%s)"
+msgstr "パラメータ�型 %d (%s) �プラン (%s) を準備�る時点�一致���ん"
 
-#: commands/opclasscmds.c:551
+#: executor/execCurrent.c:242 executor/execQual.c:1045
 #, c-format
-msgid "Operator class \"%s\" already is the default."
-msgstr "演算�クラス\"%s\"����デフォルト��。"
+msgid "no value found for parameter %d"
+msgstr "パラメータ%d�値��り��ん"
 
-#: commands/opclasscmds.c:687
-msgid "must be superuser to create an operator family"
-msgstr "演算��を作��る��スーパーユーザ���れ��り��ん"
+#: executor/nodeSubplan.c:301 executor/nodeSubplan.c:340
+#: executor/nodeSubplan.c:962
+msgid "more than one row returned by a subquery used as an expression"
+msgstr "副������1行を超�る行を返�も������使用�れ���"
 
-#: commands/opclasscmds.c:802
-msgid "must be superuser to alter an operator family"
-msgstr "演算��を変更�る��スーパーユーザ���れ��り��ん"
+#: executor/nodeWindowAgg.c:1238
+msgid "frame starting offset must not be null"
+msgstr "フレーム�インタ�オフセット� NULL ������り��ん"
 
-#: commands/opclasscmds.c:865
-msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
-msgstr "演算��引数型�ALTER OPERATOR FAMILY�指定���れ��り��ん"
+#: executor/nodeWindowAgg.c:1251
+msgid "frame starting offset must not be negative"
+msgstr "フレーム開始オフセット�負数������り��ん"
 
-#: commands/opclasscmds.c:921
-msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
-msgstr "ALTER OPERATOR FAMILY��STORAGEを指定����ん"
+#: executor/nodeWindowAgg.c:1264
+msgid "frame ending offset must not be null"
+msgstr "フレーム終了オフセット� NULL ������り��ん"
 
-#: commands/opclasscmds.c:1037
-msgid "one or two argument types must be specified"
-msgstr "1���2��引数型�指定�れ��れ��り��ん"
+#: executor/nodeWindowAgg.c:1277
+msgid "frame ending offset must not be negative"
+msgstr "フレーム終了オフセット�負数������り��ん"
 
-#: commands/opclasscmds.c:1063
-msgid "index operators must be binary"
-msgstr "インデックス演算��二項演算����れ��り��ん"
+#: executor/spi.c:210
+msgid "transaction left non-empty SPI stack"
+msgstr "トランザクション�空���SPIスタックを残����"
 
-#: commands/opclasscmds.c:1067
-msgid "index operators must return boolean"
-msgstr "インデックス演算��論�型を返���れ��り��ん"
+#: executor/spi.c:211 executor/spi.c:275
+msgid "Check for missing \"SPI_finish\" calls."
+msgstr "\"SPI_finish\"呼出�抜�を確�����"
 
-#: commands/opclasscmds.c:1105
-msgid "btree procedures must have two arguments"
-msgstr "btreeプロシージャ�2��引数を�ら��れ��り��ん"
+#: executor/spi.c:274
+msgid "subtransaction left non-empty SPI stack"
+msgstr "サブトランザクション�空���SPIスタックを残����"
 
-#: commands/opclasscmds.c:1109
-msgid "btree procedures must return integer"
-msgstr "btreeプロシージャ�整数を返���れ��り��ん"
+#: executor/spi.c:1137
+msgid "cannot open multi-query plan as cursor"
+msgstr "カーソル�マル�クエリプランを開��������ん"
 
-#: commands/opclasscmds.c:1124
-msgid "hash procedures must have one argument"
-msgstr "�ッシュプロシージャ�1��引数を�ら��れ��り��ん"
+#. translator: %s is name of a SQL command, eg INSERT
+#: executor/spi.c:1142
+#, c-format
+msgid "cannot open %s query as cursor"
+msgstr "カーソル�%s�����を開��������ん"
 
-#: commands/opclasscmds.c:1128
-msgid "hash procedures must return integer"
-msgstr "�ッシュプロシージャ�整数を返���れ��り��ん"
+#: executor/spi.c:1233 parser/analyze.c:2206
+msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE�サ�ート�れ����ん"
 
-#: commands/opclasscmds.c:1153
-msgid "associated data types must be specified for index support procedure"
-msgstr ""
-"関連�るデータ型�インデックスサ�ートプロシージャ�指定�れ��れ��り��"
-"ã‚“"
+#: executor/spi.c:1234 parser/analyze.c:2207
+msgid "Scrollable cursors must be READ ONLY."
+msgstr "スクロール�能カーソル�読��り�����れ��り��ん"
 
-#: commands/opclasscmds.c:1179
+#: executor/spi.c:2157
 #, c-format
-msgid "procedure number %d for (%s,%s) appears more than once"
-msgstr "(%2$s,%3$s)用�プロシージャ番�%1$d�複数�り��"
+msgid "SQL statement \"%s\""
+msgstr "SQLæ–‡ \"%s\""
 
-#: commands/opclasscmds.c:1186
+#: executor/execQual.c:298 executor/execQual.c:326 executor/execQual.c:2987
+#: utils/adt/array_userfuncs.c:430 utils/adt/arrayfuncs.c:228
+#: utils/adt/arrayfuncs.c:507 utils/adt/arrayfuncs.c:1242
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:4940
 #, c-format
-msgid "operator number %d for (%s,%s) appears more than once"
-msgstr "(%2$s,%3$s)用�演算�番�%1$d�複数�り��"
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "�列�次数(%d)�上�(%d)を超�����"
 
-#: commands/opclasscmds.c:1234
-#, c-format
-msgid "operator %d(%s,%s) already exists in operator family \"%s\""
-msgstr "演算�%d(%s,%s)����演算��\"%s\"�存在���"
+#: executor/execQual.c:311 executor/execQual.c:339
+msgid "array subscript in assignment must not be null"
+msgstr "代入���る�列�添�字�NULL������ん"
 
-#: commands/opclasscmds.c:1334
+#: executor/execQual.c:635 executor/execQual.c:3905
 #, c-format
-msgid "function %d(%s,%s) already exists in operator family \"%s\""
-msgstr "関数%d(%s,%s)����演算��\"%s\"内�存在���"
+msgid "attribute %d has wrong type"
+msgstr "属性%d�型�間������"
 
-#: commands/opclasscmds.c:1421
+#: executor/execQual.c:636 executor/execQual.c:3906
 #, c-format
-msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "演算�%d(%s,%s)�演算��\"%s\"内��り��ん"
+msgid "Table has type %s, but query expects %s."
+msgstr "テーブル�型�%s�����������%sを想定�����。"
 
-#: commands/opclasscmds.c:1461
-#, c-format
-msgid "function %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "関数%d(%s,%s)�演算��\"%s\"内�存在���ん"
+#: executor/execQual.c:700 executor/execQual.c:719 executor/execQual.c:918
+#: executor/nodeModifyTable.c:82 executor/nodeModifyTable.c:92
+#: executor/nodeModifyTable.c:109 executor/nodeModifyTable.c:117
+msgid "table row type and query-specified row type do not match"
+msgstr "テーブル�行型�������指定��行型�一致���ん"
 
-#: commands/opclasscmds.c:1768
+#: executor/execQual.c:701
 #, c-format
-msgid ""
-"operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
-"\""
-msgstr ""
-"アクセスメソッド\"%2$s\"用�演算�クラス\"%1$s\"�スキーマ\"%3$s\"内����"
-"存在���"
+msgid "Table row contains %d attribute, but query expects %d."
+msgid_plural "Table row contains %d attributes, but query expects %d."
+msgstr[0] "テーブル行��%d属性�り�����������%dを想定�����。"
+msgstr[1] "テーブル行��%d属性�り�����������%dを想定�����。"
 
-#: commands/opclasscmds.c:1862
+#: executor/execQual.c:720 executor/nodeModifyTable.c:93
 #, c-format
-msgid ""
-"operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
-"\""
+msgid "Table has type %s at ordinal position %d, but query expects %s."
 msgstr ""
-"アクセスメソッド\"%2$s\"用�演算��\"%1$s\"�スキーマ\"%3$s\"内����存在"
-"���"
-
-#: commands/portalcmds.c:61 commands/portalcmds.c:160
-#: commands/portalcmds.c:212
-msgid "invalid cursor name: must not be empty"
-msgstr "カーソル��無効��: 空������ん"
-
-#: commands/portalcmds.c:402
-msgid "could not reposition held cursor"
-msgstr "����カーソル��置を変更����ん���"
+"テーブル�� %2$d 番目�型� %1$s ����������� %3$s を想定����"
+"�。"
 
-#: commands/tablecmds.c:192
+#: executor/execQual.c:919 executor/execQual.c:1519
 #, c-format
-msgid "table \"%s\" does not exist"
-msgstr "テーブル\"%s\"�存在���ん"
+msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
+msgstr "�数�置%d�削除�れ�属性���る物�格�方��一致���ん。"
 
-#: commands/tablecmds.c:193
+#: executor/execQual.c:1198 parser/parse_func.c:91 parser/parse_func.c:323
+#: parser/parse_func.c:640
 #, c-format
-msgid "table \"%s\" does not exist, skipping"
-msgstr "テーブル\"%s\"�存在���ん。�略���"
+msgid "cannot pass more than %d argument to a function"
+msgid_plural "cannot pass more than %d arguments to a function"
+msgstr[0] "関数�%dを超�る引数を渡���ん"
+msgstr[1] "関数�%dを超�る引数を渡���ん"
 
-#: commands/tablecmds.c:195
-msgid "Use DROP TABLE to remove a table."
-msgstr "テーブルを削除�る��DROP TABLEを使用������。"
+#: executor/execQual.c:1387
+msgid "functions and operators can take at most one set argument"
+msgstr "関数�演算��多��も1��集�引数を�る�������"
 
-#: commands/tablecmds.c:198
-#, c-format
-msgid "sequence \"%s\" does not exist"
-msgstr "シーケンス\"%s\"�存在���ん"
+#: executor/execQual.c:1437
+msgid ""
+"function returning setof record called in context that cannot accept type "
+"record"
+msgstr ""
+"複数行レコードを返�関数��レコード型を��付���文脈�呼�出�れ���"
+
+#: executor/execQual.c:1492 executor/execQual.c:1508 executor/execQual.c:1518
+msgid "function return row and query-specified return row do not match"
+msgstr "������指定��戻り値�行�実際�関数�戻り値�行�一致���ん"
 
-#: commands/tablecmds.c:199
+#: executor/execQual.c:1493
 #, c-format
-msgid "sequence \"%s\" does not exist, skipping"
-msgstr "シーケンス\"%s\"�存在���ん。�略���"
+msgid "Returned row contains %d attribute, but query expects %d."
+msgid_plural "Returned row contains %d attributes, but query expects %d."
+msgstr[0] "%d属性を��行�返�れ���。�������%dを想定�����。"
+msgstr[1] "%d属性を��行�返�れ���。�������%dを想定�����。"
 
-#: commands/tablecmds.c:200 commands/tablecmds.c:2130
-#: commands/tablecmds.c:2349 commands/tablecmds.c:7732 commands/comment.c:566
-#: commands/sequence.c:953 catalog/aclchk.c:1729 utils/adt/acl.c:2006
-#: utils/adt/acl.c:2036 utils/adt/acl.c:2068 utils/adt/acl.c:2100
-#: utils/adt/acl.c:2128 utils/adt/acl.c:2158
+#: executor/execQual.c:1509
 #, c-format
-msgid "\"%s\" is not a sequence"
-msgstr "\"%s\"�シーケンス���り��ん"
+msgid "Returned type %s at ordinal position %d, but query expects %s."
+msgstr ""
+"�数�置%2$d�型%1$s�返�れ���。�������%3$sを想定�����。"
 
-#: commands/tablecmds.c:201
-msgid "Use DROP SEQUENCE to remove a sequence."
-msgstr "シーケンスを削除�る��DROP SEQUENCEを使用������。"
+#: executor/execQual.c:1745 executor/execQual.c:2170
+msgid "table-function protocol for materialize mode was not followed"
+msgstr "materializeモード��テーブル関数プロトコル�従���ん"
 
-#: commands/tablecmds.c:204
+#: executor/execQual.c:1765 executor/execQual.c:2177
 #, c-format
-msgid "view \"%s\" does not exist"
-msgstr "ビュー\"%s\"�存在���ん"
+msgid "unrecognized table-function returnMode: %d"
+msgstr "テーブル関数�returnMode��明��: %d"
 
-#: commands/tablecmds.c:205
-#, c-format
-msgid "view \"%s\" does not exist, skipping"
-msgstr "ビュー\"%s\"�存在���ん。�略���"
+#: executor/execQual.c:2087
+msgid "function returning set of rows cannot return null value"
+msgstr "行�集�を返�関数�NULL値を返��������ん"
 
-#: commands/tablecmds.c:206 commands/tablecmds.c:2136
-#: commands/tablecmds.c:2357 commands/tablecmds.c:7740 commands/comment.c:580
-#: commands/view.c:163
-#, c-format
-msgid "\"%s\" is not a view"
-msgstr "\"%s\"�ビュー���り��ん"
+#: executor/execQual.c:2144
+msgid "rows returned by function are not all of the same row type"
+msgstr "関数�ら戻�れ�行�������行型���り��ん"
 
-#: commands/tablecmds.c:207
-msgid "Use DROP VIEW to remove a view."
-msgstr "ビューを削除�る��DROP VIEWを使用������。"
+#: executor/execQual.c:2335
+msgid "IS DISTINCT FROM does not support set arguments"
+msgstr "IS DISTINCT FROM �集�引数をサ�ート���ん"
 
-#: commands/tablecmds.c:210
-#, c-format
-msgid "index \"%s\" does not exist"
-msgstr "インデックス\"%s\"�存在���ん"
+#: executor/execQual.c:2412
+msgid "op ANY/ALL (array) does not support set arguments"
+msgstr "op ANY/ALL (array)�集�引数をサ�ート���ん"
 
-#: commands/tablecmds.c:211
-#, c-format
-msgid "index \"%s\" does not exist, skipping"
-msgstr "インデックス\"%s\"�存在���ん。�略���"
+#: executor/execQual.c:2734 commands/analyze.c:1513
+msgid "could not convert row type"
+msgstr "行�型�変�����ん���"
 
-#: commands/tablecmds.c:213
-msgid "Use DROP INDEX to remove an index."
-msgstr "インデックスを削除�る��DROP INDEXを使用������"
+#: executor/execQual.c:2965
+msgid "cannot merge incompatible arrays"
+msgstr "互�性����列をマージ����ん"
 
-#: commands/tablecmds.c:218
+#: executor/execQual.c:2966
 #, c-format
-msgid "\"%s\" is not a type"
-msgstr "\"%s\"�型���り��ん"
-
-#: commands/tablecmds.c:219
-msgid "Use DROP TYPE to remove a type."
-msgstr "型を削除�る��DROP TYPEを使用������"
+msgid ""
+"Array with element type %s cannot be included in ARRAY construct with "
+"element type %s."
+msgstr "�素型%s��列を�素型%s�ARRAY����られ��ん"
 
-#: commands/tablecmds.c:873
-#, c-format
-msgid "truncate cascades to table \"%s\""
-msgstr "テーブル\"%s\"��カスケードを削除���"
+#: executor/execQual.c:3007 executor/execQual.c:3034
+#: utils/adt/arrayfuncs.c:542
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr "多次元�列�次数�����列�を����れ��り��ん"
 
-#: commands/tablecmds.c:1103
-msgid "cannot truncate temporary tables of other sessions"
-msgstr "他�セッション�一時テーブルを削除����ん"
+#: executor/execQual.c:3549
+msgid "NULLIF does not support set arguments"
+msgstr "NULLIF�集�引数をサ�ート���ん"
 
-#: commands/tablecmds.c:1219 commands/tablecmds.c:1603
-#: commands/tablecmds.c:3703 catalog/heap.c:380
+#: executor/execQual.c:3779 utils/adt/domains.c:128
 #, c-format
-msgid "tables can have at most %d columns"
-msgstr "テーブル�最大�%d列���������"
+msgid "domain %s does not allow null values"
+msgstr "ドメイン%s�NULL値を許���ん"
 
-#: commands/tablecmds.c:1298 parser/parse_utilcmd.c:578
-#: parser/parse_utilcmd.c:1396
+#: executor/execQual.c:3808 utils/adt/domains.c:164
 #, c-format
-msgid "inherited relation \"%s\" is not a table"
-msgstr "継承�れるリレーション\"%s\"�テーブル���り��ん"
+msgid "value for domain %s violates check constraint \"%s\""
+msgstr "ドメイン%s�値�検査制約\"%s\"��������"
 
-#: commands/tablecmds.c:1304 commands/tablecmds.c:7145
-#, c-format
-msgid "cannot inherit from temporary relation \"%s\""
-msgstr "一時リレーション\"%s\"�ら継承�る�������ん"
+#: executor/execQual.c:4288 parser/parse_agg.c:164
+#: optimizer/util/clauses.c:608
+msgid "aggregate function calls cannot be nested"
+msgstr "集約関数�呼�出�を入れ���る�������ん"
 
-#: commands/tablecmds.c:1321 commands/tablecmds.c:7173
-#, c-format
-msgid "relation \"%s\" would be inherited from more than once"
-msgstr "リレーション\"%s\"�複数回継承�れ���"
+#: executor/execQual.c:4326 parser/parse_agg.c:211
+#: optimizer/util/clauses.c:682
+msgid "window function calls cannot be nested"
+msgstr "ウィンドウ関数�呼�出�を入れ���る�������ん"
 
-#: commands/tablecmds.c:1376
-#, c-format
-msgid "merging multiple inherited definitions of column \"%s\""
-msgstr "複数�継承�れる列\"%s\"�定義をマージ�����"
+#: executor/execQual.c:4538
+msgid "target type is not an array"
+msgstr "対照型��列���り��ん"
 
-#: commands/tablecmds.c:1384
+#: executor/execQual.c:4651
 #, c-format
-msgid "inherited column \"%s\" has a type conflict"
-msgstr "継承�れる列\"%s\"�型�競������"
+msgid "ROW() column has type %s instead of type %s"
+msgstr "ROW()�列�型%2$s����型%1$sを����"
 
-#: commands/tablecmds.c:1386 commands/tablecmds.c:1398
-#: commands/tablecmds.c:1558 commands/tablecmds.c:1570
-#: parser/parse_coerce.c:1438 parser/parse_coerce.c:1457
-#: parser/parse_coerce.c:1502 parser/parse_param.c:214
+#: executor/execQual.c:4786 utils/adt/rowtypes.c:922
+#: utils/adt/arrayfuncs.c:3378
 #, c-format
-msgid "%s versus %s"
-msgstr "%s対%s"
+msgid "could not identify a comparison function for type %s"
+msgstr "型%s�比較関数を識別����ん"
 
-#: commands/tablecmds.c:1396
-#, c-format
-msgid "inherited column \"%s\" has a storage parameter conflict"
-msgstr "継承�れる列 \"%s\" �格�パラメーター�競������"
+#: executor/nodeModifyTable.c:83
+msgid "Query has too many columns."
+msgstr "������列�多����"
 
-#: commands/tablecmds.c:1548
+#: executor/nodeModifyTable.c:110
 #, c-format
-msgid "merging column \"%s\" with inherited definition"
-msgstr "継承�れる定義�列 \"%s\" をマージ�����"
+msgid "Query provides a value for a dropped column at ordinal position %d."
+msgstr "クエリー� %d 番目�削除�れるカラム�値を指定�����。"
+
+#: executor/nodeModifyTable.c:118
+msgid "Query has too few columns."
+msgstr "������列�少�����"
+
+#: executor/nodeLimit.c:253
+msgid "OFFSET must not be negative"
+msgstr "OFFSET �負数������り��ん"
+
+#: executor/nodeLimit.c:280
+msgid "LIMIT must not be negative"
+msgstr "LIMIT �負数������り��ん"
 
-#: commands/tablecmds.c:1556
+#: nodes/print.c:85 catalog/dependency.c:928 catalog/dependency.c:929
+#: catalog/dependency.c:935 catalog/dependency.c:936 catalog/dependency.c:947
+#: catalog/dependency.c:948 catalog/objectaddress.c:315 tcop/postgres.c:4297
+#: storage/lmgr/deadlock.c:942 storage/lmgr/deadlock.c:943
+#: utils/fmgr/dfmgr.c:381 utils/adt/xml.c:1366 utils/adt/xml.c:1367
+#: utils/adt/xml.c:1373 utils/adt/xml.c:1444 utils/misc/guc.c:5395
+#: utils/misc/guc.c:5709 utils/misc/guc.c:7978 utils/misc/guc.c:7982
+#: utils/misc/guc.c:7984 utils/misc/guc.c:8012 utils/misc/guc.c:8016
+#: utils/misc/guc.c:8018 utils/misc/guc.c:8046 utils/misc/guc.c:8050
+#: utils/misc/guc.c:8052 utils/misc/guc.c:8080 utils/misc/guc.c:8084
+#: utils/misc/guc.c:8086 utils/misc/guc.c:8114 utils/misc/guc.c:8119
+#: utils/misc/guc.c:8121 port/win32/security.c:51 commands/tablecmds.c:688
+#: commands/trigger.c:899 commands/trigger.c:915 commands/trigger.c:927
+#: commands/user.c:956 commands/user.c:957
 #, c-format
-msgid "column \"%s\" has a type conflict"
-msgstr "列\"%s\"�型�競������"
+msgid "%s"
+msgstr "%s"
 
-#: commands/tablecmds.c:1568
+#: nodes/nodeFuncs.c:114 nodes/nodeFuncs.c:140 parser/parse_oper.c:948
+#: parser/parse_expr.c:1633 parser/parse_func.c:367 parser/parse_coerce.c:1645
+#: parser/parse_coerce.c:1662 parser/parse_coerce.c:1724
 #, c-format
-msgid "column \"%s\" has a storage parameter conflict"
-msgstr "列 \"%s\" �格�パラメーター�競������"
+msgid "could not find array type for data type %s"
+msgstr "データ型%s��列型��り��ん���"
 
-#: commands/tablecmds.c:1620
+#: parser/parse_target.c:382 parser/parse_target.c:670
 #, c-format
-msgid "column \"%s\" inherits conflicting default values"
-msgstr "列\"%s\"�競��るデフォルト値を継承���"
+msgid "cannot assign to system column \"%s\""
+msgstr "システム列\"%s\"�代入����ん"
 
-#: commands/tablecmds.c:1622
-msgid "To resolve the conflict, specify a default explicitly."
-msgstr "競�を解消�る��明示的�デフォルトを指定������"
+#: parser/parse_target.c:410
+msgid "cannot set an array element to DEFAULT"
+msgstr "�列�素�DEFAULTを設定����ん"
 
-#: commands/tablecmds.c:1669
+#: parser/parse_target.c:415
+msgid "cannot set a subfield to DEFAULT"
+msgstr "サブフィールド�DEFAULTを設定����ん"
+
+#: parser/parse_target.c:484
 #, c-format
-msgid ""
-"check constraint name \"%s\" appears multiple times but with different "
-"expressions"
-msgstr "異�る�を��検査制約�\"%s\"�複数�り��。"
+msgid "column \"%s\" is of type %s but expression is of type %s"
+msgstr "列\"%s\"�型%s������型%s���"
 
-#: commands/tablecmds.c:1957
-msgid "cannot rename column of typed table"
-msgstr "型付��れ�テーブル�カラムをリ�ーム����ん"
+#: parser/parse_target.c:489 parser/parse_target.c:735
+#: parser/parse_target.c:745 parser/parse_node.c:397 catalog/heap.c:2432
+#: commands/prepare.c:370 rewrite/rewriteHandler.c:1035
+msgid "You will need to rewrite or cast the expression."
+msgstr "�を書���る�キャスト���れ��り��ん"
 
-#: commands/tablecmds.c:1973
-msgid "\"%s\" is not a table, view, composite type or index"
-msgstr "\"%s\"�テーブル�ビュー�複�インデックス���れ�も�り��ん"
+#: parser/parse_target.c:617 parser/parse_expr.c:418
+msgid "row expansion via \"*\" is not supported here"
+msgstr "\"*\" を通��行展開������サ�ート�れ����ん"
 
-#: commands/tablecmds.c:2039
+#: parser/parse_target.c:654
 #, c-format
-msgid "inherited column \"%s\" must be renamed in child tables too"
-msgstr "継承�れる列\"%s\"���を�テーブル�変更���れ��り��ん"
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
+"composite type"
+msgstr ""
+"型%3$s�複�型��り��ん���列\"%2$s\"�フィールド\"%1$s\"�代入����"
+"ん。"
 
-#: commands/tablecmds.c:2057
+#: parser/parse_target.c:663
 #, c-format
-msgid "cannot rename system column \"%s\""
-msgstr "システム列%s\"���を変更����ん"
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because there is no such "
+"column in data type %s"
+msgstr ""
+"データ型%3$s�列��り��ん���列\"%2$s\"�フィールド\"%1$s\"�代入���"
+"�ん。"
 
-#: commands/tablecmds.c:2072
+#: parser/parse_target.c:730
 #, c-format
-msgid "cannot rename inherited column \"%s\""
-msgstr "継承�れる列\"%s\"���を変更����ん"
+msgid ""
+"array assignment to \"%s\" requires type %s but expression is of type %s"
+msgstr "\"%s\"���列代入��型%s�必�������型%s���"
 
-#: commands/tablecmds.c:2083 commands/tablecmds.c:3691
+#: parser/parse_target.c:740
 #, c-format
-msgid "column \"%s\" of relation \"%s\" already exists"
-msgstr "リレーション\"%2$s\"�列\"%1$s\"����存在���"
+msgid "subfield \"%s\" is of type %s but expression is of type %s"
+msgstr "サブフィールド\"%s\"�型%s������型%s���"
 
-#: commands/tablecmds.c:2146 commands/tablecmds.c:6487
-#: commands/tablecmds.c:7773 catalog/aclchk.c:1721 access/heap/heapam.c:1081
-#: access/heap/heapam.c:1109 access/heap/heapam.c:1139
+#: parser/parse_target.c:829 parser/parse_expr.c:1667 parser/parse_expr.c:2109
+#: parser/parse_coerce.c:906 parser/parse_coerce.c:936
+#: parser/parse_coerce.c:954 parser/parse_coerce.c:969
 #, c-format
-msgid "\"%s\" is a composite type"
-msgstr "\"%s\"�複�型��"
+msgid "cannot cast type %s to %s"
+msgstr "型%s�ら%s�キャスト����ん"
 
-#: commands/tablecmds.c:2148 commands/tablecmds.c:6489
-#: commands/tablecmds.c:7775
-msgid "Use ALTER TYPE instead."
-msgstr "代�り�ALTER TYPEを使用������"
+#: parser/parse_target.c:895 parser/parse_relation.c:2043
+#: parser/parse_relation.c:2100 parser/analyze.c:2039 parser/parse_type.c:117
+#: catalog/aclchk.c:1428 catalog/objectaddress.c:536 utils/adt/acl.c:2772
+#: utils/adt/ruleutils.c:1581 commands/tablecmds.c:4564
+#: commands/tablecmds.c:4654 commands/tablecmds.c:4701
+#: commands/tablecmds.c:4797 commands/tablecmds.c:4841
+#: commands/tablecmds.c:4920 commands/tablecmds.c:5004
+#: commands/tablecmds.c:6612 commands/tablecmds.c:6820
+#: commands/sequence.c:1419 commands/analyze.c:344 commands/trigger.c:590
+#: commands/copy.c:3774
+#, c-format
+msgid "column \"%s\" of relation \"%s\" does not exist"
+msgstr "リレーション\"%2$s\"�列\"%1$s\"�存在���ん"
 
-#: commands/tablecmds.c:2195 catalog/heap.c:927 catalog/index.c:621
+#: parser/parse_target.c:911 parser/parse_target.c:922
+#: commands/tablecmds.c:1318 commands/trigger.c:599 commands/copy.c:3786
 #, c-format
-msgid "relation \"%s\" already exists"
-msgstr "リレーション\"%s\"����存在���"
+msgid "column \"%s\" specified more than once"
+msgstr "列\"%s\"�複数指定�れ���"
 
-#. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2271
+#: parser/parse_target.c:1064 parser/parse_relation.c:478
+#: parser/parse_relation.c:551 parser/parse_expr.c:741
 #, c-format
-msgid ""
-"cannot %s \"%s\" because it is being used by active queries in this session"
-msgstr ""
-"��セッション�実行中�������使用�れ��る�� \"%2$s\" を %1$s ��"
-"��ん"
+msgid "column reference \"%s\" is ambiguous"
+msgstr "列�照\"%s\"�曖昧��"
 
-#. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2280
+#: parser/parse_target.c:1085 parser/parse_expr.c:775 catalog/namespace.c:2348
 #, c-format
-msgid "cannot %s \"%s\" because it has pending trigger events"
-msgstr "トリガイベントを待機���る�� \"%2$s\" を %1$s ����ん"
+msgid "cross-database references are not implemented: %s"
+msgstr "データベース間��照�実装�れ����ん: %s"
 
-#: commands/tablecmds.c:2890
+#: parser/parse_target.c:1092 gram.y:11615 gram.y:12814
+#: parser/parse_expr.c:782 catalog/namespace.c:2354
 #, c-format
-msgid "cannot rewrite system relation \"%s\""
-msgstr "システムリレーション\"%sを書���られ��ん"
+msgid "improper qualified name (too many dotted names): %s"
+msgstr "修飾����切��(ドット付�����多����): %s"
 
-#: commands/tablecmds.c:2900
-msgid "cannot rewrite temporary tables of other sessions"
-msgstr "他�セッション�一時テーブルを書���られ��ん"
+#: parser/parse_target.c:1126
+msgid "SELECT * with no tables specified is not valid"
+msgstr "テーブル指定���SELECT *�無効��"
 
-#: commands/tablecmds.c:3224
+#: parser/parse_param.c:109 parser/parse_param.c:141 parser/parse_param.c:198
+#: parser/parse_param.c:297 parser/parse_expr.c:809
 #, c-format
-msgid "column \"%s\" contains null values"
-msgstr "列\"%s\"��NULL値��り��"
+msgid "there is no parameter $%d"
+msgstr "パラメータ$%d��り��ん"
 
-#: commands/tablecmds.c:3238
+#: parser/parse_param.c:215
 #, c-format
-msgid "check constraint \"%s\" is violated by some row"
-msgstr "一部�行�検査制約\"%s\"��������"
+msgid "inconsistent types deduced for parameter $%d"
+msgstr "パラメータ$%d����推定�れ�型��整���"
 
-#: commands/tablecmds.c:3365 commands/tablecmds.c:4117
+#: parser/parse_param.c:217 parser/parse_coerce.c:1514
+#: parser/parse_coerce.c:1534 parser/parse_coerce.c:1579
+#: commands/tablecmds.c:1443 commands/tablecmds.c:1464
+#: commands/tablecmds.c:1629 commands/tablecmds.c:1651
 #, c-format
-msgid "\"%s\" is not a table or index"
-msgstr "\"%s\"�テーブルやインデックス���り��ん"
+msgid "%s versus %s"
+msgstr "%s対%s"
 
-#: commands/tablecmds.c:3520
+#: parser/parse_param.c:303 tcop/postgres.c:1267 commands/prepare.c:122
 #, c-format
-msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
-msgstr ""
-"テーブル\"%s\"を変更����ん。��行型を列\"%s\".\"%s\"�使用���る���"
-"�"
+msgid "could not determine data type of parameter $%d"
+msgstr "パラメータ$%d�データ型�決定����ん"
 
-#: commands/tablecmds.c:3527
+#: parser/scansup.c:190
 #, c-format
-msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
+msgid "identifier \"%s\" will be truncated to \"%s\""
+msgstr "識別� \"%s\" を \"%s\" �切り詰���"
+
+#: parser/parse_clause.c:421
+#, c-format
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgstr "JOIN/ON��\"%s\"を�照��������れ�JOIN���れ����ん"
+
+#: parser/parse_clause.c:502
+msgid "subquery in FROM cannot have SELECT INTO"
+msgstr "FROM��副�������SELECT INTOを使用����ん"
+
+#: parser/parse_clause.c:524
+msgid "subquery in FROM cannot refer to other relations of same query level"
 msgstr ""
-"型\"%s\"を変更����ん。列\"%s\".\"%s\"���型を使用���る����"
+"FROM��副���������一�����レベル�他�リレーションを�照���"
+"�ん"
 
-#: commands/tablecmds.c:3598
-msgid "column must be added to child tables too"
-msgstr "列��テーブル�も追加���れ��り��ん"
+#: parser/parse_clause.c:580
+msgid ""
+"function expression in FROM cannot refer to other relations of same query "
+"level"
+msgstr ""
+"FROM��関数����一�����レベル�他�リレーションを�照����ん"
 
-#: commands/tablecmds.c:3622
-msgid "cannot add column to typed table"
-msgstr "型付��れ�テーブル�カラムを追加����ん"
+#: parser/parse_clause.c:593
+msgid "cannot use aggregate function in function expression in FROM"
+msgstr "FROM��関数���集約関数を使用����ん"
 
-#: commands/tablecmds.c:3648 commands/tablecmds.c:7329
-#, c-format
-msgid "child table \"%s\" has different type for column \"%s\""
-msgstr "�テーブル\"%s\"�異�る型�列\"%s\"を������"
+#: parser/parse_clause.c:600
+msgid "cannot use window function in function expression in FROM"
+msgstr "FROM �内�関数���ウィンドウ関数を使用����ん"
 
-#: commands/tablecmds.c:3655
+#: parser/parse_clause.c:877
 #, c-format
-msgid "child table \"%s\" has a conflicting \"%s\" column"
-msgstr "�テーブル \"%s\" �競��るカラム \"%s\" ��り��"
+msgid "column name \"%s\" appears more than once in USING clause"
+msgstr "USING��列�\"%s\"�複数�り��"
 
-#: commands/tablecmds.c:3667
+#: parser/parse_clause.c:892
 #, c-format
-msgid "merging definition of column \"%s\" for child \"%s\""
-msgstr "�\"%2$s\"�列\"%1$s\"�定義をマージ�����"
+msgid "common column name \"%s\" appears more than once in left table"
+msgstr "左テーブル�列�\"%s\"�複数�り��"
 
-#: commands/tablecmds.c:3939 commands/tablecmds.c:4029
-#: commands/tablecmds.c:4074 commands/tablecmds.c:4170
-#: commands/tablecmds.c:4214 commands/tablecmds.c:4293
-#: commands/tablecmds.c:5805
+#: parser/parse_clause.c:901
 #, c-format
-msgid "cannot alter system column \"%s\""
-msgstr "システム列\"%s\"を変更����ん"
+msgid "column \"%s\" specified in USING clause does not exist in left table"
+msgstr "USING��指定��列\"%s�左テーブル�存在���ん"
 
-#: commands/tablecmds.c:3973
+#: parser/parse_clause.c:915
 #, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "列\"%s\"�プライマリキー�使用�����"
+msgid "common column name \"%s\" appears more than once in right table"
+msgstr "�テーブル�列�\"%s\"�複数�り��"
 
-#: commands/tablecmds.c:4144
+#: parser/parse_clause.c:924
 #, c-format
-msgid "statistics target %d is too low"
-msgstr "統計情報対象%d�������"
+msgid "column \"%s\" specified in USING clause does not exist in right table"
+msgstr "USING��指定��列\"%s��テーブル�存在���ん"
 
-#: commands/tablecmds.c:4152
+#: parser/parse_clause.c:981
 #, c-format
-msgid "lowering statistics target to %d"
-msgstr "統計情報対象を%d�減ら�������"
+msgid "column alias list for \"%s\" has too many entries"
+msgstr "列\"%s\"�別�リスト�エントリ�多����"
 
-#: commands/tablecmds.c:4274
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1228
 #, c-format
-msgid "invalid storage type \"%s\""
-msgstr "�管方�\"%s\"�無効��"
+msgid "argument of %s must not contain variables"
+msgstr "%s�引数��変数を使用����ん"
 
-#: commands/tablecmds.c:4305
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1239
 #, c-format
-msgid "column data type %s can only have storage PLAIN"
-msgstr "列�データ型%s��管方�PLAIN���る�������ん"
+msgid "argument of %s must not contain aggregate functions"
+msgstr "%s �引数��集約関数を使用����ん"
 
-#: commands/tablecmds.c:4343
-msgid "cannot drop column from typed table"
-msgstr "型付��れ�テーブル�らカラムを削除����ん"
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1250
+#, c-format
+msgid "argument of %s must not contain window functions"
+msgstr "%s �引数��ウィンドウ関数を使用����ん"
 
-#: commands/tablecmds.c:4365
+#. translator: first %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1367
 #, c-format
-msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "リレーション \"%2$s\" �列 \"%1$s\" �存在���ん。スキップ���。"
+msgid "%s \"%s\" is ambiguous"
+msgstr "%s \"%s\"�曖昧��"
 
-#: commands/tablecmds.c:4378
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1391
 #, c-format
-msgid "cannot drop system column \"%s\""
-msgstr "システム列\"%s\"を削除����ん"
+msgid "non-integer constant in %s"
+msgstr "%s�整数以外�定数��り��"
 
-#: commands/tablecmds.c:4385
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1409
 #, c-format
-msgid "cannot drop inherited column \"%s\""
-msgstr "継承�れる列\"%s\"を削除����ん"
+msgid "%s position %d is not in select list"
+msgstr "%s��置%d�SELECTリスト��り��ん"
 
-#: commands/tablecmds.c:4606 catalog/heap.c:2135 catalog/pg_constraint.c:639
+#: parser/parse_clause.c:1625
 #, c-format
-msgid "constraint \"%s\" for relation \"%s\" already exists"
-msgstr "���制約\"%s\"�リレーション\"%s\"�存在���"
-
-#: commands/tablecmds.c:4707
-msgid "constraint must be added to child tables too"
-msgstr "制約��テーブル�も追加���れ��り��ん"
+msgid "window \"%s\" is already defined"
+msgstr "ウィンドウ \"%s\" ����定義済���"
 
-#: commands/tablecmds.c:4772 commands/sequence.c:1291
+#: parser/parse_clause.c:1637 parser/parse_agg.c:245
 #, c-format
-msgid "referenced relation \"%s\" is not a table"
-msgstr "�照先�リレーション\"%s\"�テーブル���り��ん"
-
-#: commands/tablecmds.c:4794
-msgid "cannot reference temporary table from permanent table constraint"
-msgstr "永続テーブル�制約�ら一時テーブルを�照����ん"
-
-#: commands/tablecmds.c:4801
-msgid "cannot reference permanent table from temporary table constraint"
-msgstr "一時テーブル�制約�ら永続テーブルを�照����ん"
-
-#: commands/tablecmds.c:4861
-msgid "number of referencing and referenced columns for foreign key disagree"
-msgstr "外部キー��照列数���照列数�����ん"
+msgid "window \"%s\" does not exist"
+msgstr "ウィンドウ \"%s\" �存在���ん"
 
-#: commands/tablecmds.c:4950
+#: parser/parse_clause.c:1679
 #, c-format
-msgid "foreign key constraint \"%s\" cannot be implemented"
-msgstr "外部キー制約\"%s�実装�れ����ん"
+msgid "cannot override PARTITION BY clause of window \"%s\""
+msgstr "ウィンドウ \"%s\" � PARTITION BY �をオー�ーライド����ん"
 
-#: commands/tablecmds.c:4953
+#: parser/parse_clause.c:1691
 #, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
-msgstr "キー��る列\"%s\"�\"%s\"��間�型�互�性��り��ん:%s�%s"
+msgid "cannot override ORDER BY clause of window \"%s\""
+msgstr "ウィンドウ \"%s\" � ORDER BY �をオー�ーライド����ん"
 
-#: commands/tablecmds.c:5048
+#: parser/parse_clause.c:1713
 #, c-format
-msgid "column \"%s\" referenced in foreign key constraint does not exist"
-msgstr "外部キー制約��照�れる列\"%s\"�存在���ん"
+msgid "cannot override frame clause of window \"%s\""
+msgstr "ウィンドウ \"%s\" �構��をオー�ーライド����ん"
 
-#: commands/tablecmds.c:5053
-#, c-format
-msgid "cannot have more than %d keys in a foreign key"
-msgstr "外部キー��%dを超�るキーを���������ん"
+#: parser/parse_clause.c:1779
+msgid ""
+"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
+"list"
+msgstr ""
+"DISTINCT や ORDER BY 表�を伴��集約�引数リスト�中��れ��れ��り��ん"
 
-#: commands/tablecmds.c:5118
-#, c-format
-msgid "cannot use a deferrable primary key for referenced table \"%s\""
-msgstr "被�照テーブル \"%s\" ���延�能プライマリキー�使用����ん"
+#: parser/parse_clause.c:1780
+msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
+msgstr "SELECT DISTINCT��ORDER BY���SELECTリスト内���れ��り��ん"
 
-#: commands/tablecmds.c:5135
-#, c-format
-msgid "there is no primary key for referenced table \"%s\""
-msgstr "被�照テーブル\"%s\"��プライマリキー��り��ん"
+#: parser/parse_clause.c:1866 parser/parse_clause.c:1898
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr "SELECT DISTINCT ON���ORDER BY��先頭�一致���れ��り��ん"
 
-#: commands/tablecmds.c:5285
+#: parser/parse_clause.c:2020
 #, c-format
-msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
-msgstr "被�照テーブル \"%s\" �対�����延�能�一�性制約�使用����ん"
+msgid "operator %s is not a valid ordering operator"
+msgstr "演算�\"%s\"�有効�順�付�演算�����り��ん"
 
-#: commands/tablecmds.c:5290
-#, c-format
+#: parser/parse_clause.c:2022
 msgid ""
-"there is no unique constraint matching given keys for referenced table \"%s\""
-msgstr "被�照テーブル \"%s\" ��指定��キー�一致�る一�性制約��り��ん"
-
-#: commands/tablecmds.c:5620
-#, c-format
-msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
-msgstr "リレーション  \"%2$s\" �継承�れ�制約 \"%1$s\" を削除����ん"
+"Ordering operators must be \"<\" or \">\" members of btree operator families."
+msgstr ""
+"順�付�演算��B-Tree演算���\"<\"���\">\"�素���れ��り��ん。"
 
-#: commands/tablecmds.c:5647 commands/tablecmds.c:5761
+#: parser/parse_utilcmd.c:180
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist"
-msgstr "リレーション \"%2$s\" �制約 \"%1$s\" �存在���ん"
+msgid "relation \"%s\" already exists, skipping"
+msgstr "リレーション \"%s\" ����存在���。スキップ���。"
 
-#: commands/tablecmds.c:5653
-#, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "リレーション \"%2$s\" �制約 \"%1$s\" �存在���ん。スキップ���。"
+#: parser/parse_utilcmd.c:333
+msgid "array of serial is not implemented"
+msgstr "連番(SERIAL)��列�実装�れ����ん"
 
-#: commands/tablecmds.c:5812
+#: parser/parse_utilcmd.c:378
 #, c-format
-msgid "cannot alter inherited column \"%s\""
-msgstr "継承�れる列\"%s\"を変更����ん"
-
-#: commands/tablecmds.c:5847
-msgid "transform expression must not return a set"
-msgstr "変���集�を返�������ん"
-
-#: commands/tablecmds.c:5853
-msgid "cannot use subquery in transform expression"
-msgstr "変����副�����を使用����ん"
-
-#: commands/tablecmds.c:5857
-msgid "cannot use aggregate function in transform expression"
-msgstr "変����集約関数を使用����ん"
-
-#: commands/tablecmds.c:5861
-msgid "cannot use window function in transform expression"
-msgstr "変���中��ウィンドウ関数�使用����ん"
+msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
+msgstr ""
+"%1$s�シリアル列\"%3$s.%4$s\"用�暗黙的�シーケンス\"%2$s\"を作����。"
 
-#: commands/tablecmds.c:5879
+#: parser/parse_utilcmd.c:479 parser/parse_utilcmd.c:491
 #, c-format
-msgid "column \"%s\" cannot be cast to type %s"
-msgstr "列\"%s\"を型\"%s\"�キャスト����ん"
+msgid ""
+"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
+msgstr "テーブル\"%2$s\"�列\"%1$s\"�NULL宣言�NOT NULL宣言�競������"
 
-#: commands/tablecmds.c:5905
+#: parser/parse_utilcmd.c:503
 #, c-format
-msgid "type of inherited column \"%s\" must be changed in child tables too"
-msgstr "継承�れる列\"%s\"�型を�テーブル�変更���れ��り��ん"
+msgid "multiple default values specified for column \"%s\" of table \"%s\""
+msgstr "テーブル\"%2$s\"�列\"%1$s\"�複数�デフォルト値�指定��り��"
 
-#: commands/tablecmds.c:5944
+#: parser/parse_utilcmd.c:617 parser/parse_utilcmd.c:1665
+#: commands/tablecmds.c:1353
 #, c-format
-msgid "cannot alter type of column \"%s\" twice"
-msgstr "列\"%s\"�型を2回変更�る�������ん"
+msgid "inherited relation \"%s\" is not a table"
+msgstr "継承�れるリレーション\"%s\"�テーブル���り��ん"
 
-#: commands/tablecmds.c:5978
+#: parser/parse_utilcmd.c:1294 parser/parse_utilcmd.c:1380 catalog/index.c:202
 #, c-format
-msgid "default for column \"%s\" cannot be cast to type %s"
-msgstr "列 \"%s\" �デフォルト値を \"%s\" 型�キャスト����ん"
+msgid "multiple primary keys for table \"%s\" are not allowed"
+msgstr "テーブル\"%s\"�複数�プライマリキーを���る�������ん"
 
-#: commands/tablecmds.c:6104
-msgid "cannot alter type of a column used by a view or rule"
-msgstr "ビュー���ルール�使用�れる列�型を変更����ん"
+#: parser/parse_utilcmd.c:1438
+msgid "cannot use an existing index in CREATE TABLE"
+msgstr "CREATE TABLE ��既存�インデックスを使���ん"
 
-#: commands/tablecmds.c:6105
+#: parser/parse_utilcmd.c:1447 commands/tablecmds.c:218
 #, c-format
-msgid "%s depends on column \"%s\""
-msgstr "%s�列\"%s\"��存�����"
+msgid "index \"%s\" does not exist"
+msgstr "インデックス\"%s\"�存在���ん"
 
-#: commands/tablecmds.c:6457
+#: parser/parse_utilcmd.c:1458
 #, c-format
-msgid "cannot change owner of index \"%s\""
-msgstr "インデックス\"%s\"�所有者を変更����ん"
+msgid "index \"%s\" is already associated with a constraint"
+msgstr "インデックス \"%s\" ����１��制約�割り当�られれ���"
 
-#: commands/tablecmds.c:6459
-msgid "Change the ownership of the index's table, instead."
-msgstr "代�り�インデックス�テーブル�所有者を変更������"
+#: parser/parse_utilcmd.c:1466
+#, c-format
+msgid "index \"%s\" does not belong to table \"%s\""
+msgstr "インデックス \"%s\" �テーブル \"%s\" ��属�����ん"
 
-#: commands/tablecmds.c:6475
+#: parser/parse_utilcmd.c:1473
 #, c-format
-msgid "cannot change owner of sequence \"%s\""
-msgstr "シーケンス\"%s\"�所有者を変更����ん"
+msgid "index \"%s\" is not valid"
+msgstr "インデックス \"%s\" �有効���り��ん"
 
-#: commands/tablecmds.c:6477 commands/tablecmds.c:7765
+#: parser/parse_utilcmd.c:1479
 #, c-format
-msgid "Sequence \"%s\" is linked to table \"%s\"."
-msgstr "シーケンス\"%s\"�テーブル\"%s\"�リンク�れ����"
+msgid "index \"%s\" is not ready"
+msgstr "インデックス \"%s\" �利用準備�������ん"
 
-#: commands/tablecmds.c:6498 commands/tablecmds.c:7783
+#: parser/parse_utilcmd.c:1485
 #, c-format
-msgid "\"%s\" is not a table, view, or sequence"
-msgstr "\"%s\"�テーブル�インデックス�ビュー�シーケンス���り��ん"
+msgid "\"%s\" is not a unique index"
+msgstr "\"%s\"�ユニークインデックス���り��ん"
 
-#: commands/tablecmds.c:6757
-msgid "cannot have multiple SET TABLESPACE subcommands"
-msgstr "SET TABLESPACEサブコマンドを複数指定����ん"
+#: parser/parse_utilcmd.c:1486 parser/parse_utilcmd.c:1493
+#: parser/parse_utilcmd.c:1500 parser/parse_utilcmd.c:1570
+msgid "Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."
+msgstr "��よ��インデックスを使��"
 
-#: commands/tablecmds.c:6809
+#: parser/parse_utilcmd.c:1492
 #, c-format
-msgid "\"%s\" is not a table, index, or TOAST table"
-msgstr "\"%s\"�テーブル�もインデックス�もTOASTテーブル�も�り��ん"
+msgid "index \"%s\" contains expressions"
+msgstr "インデックス \"%s\" ��を�ん����"
 
-#: commands/tablecmds.c:6930
+#: parser/parse_utilcmd.c:1499
 #, c-format
-msgid "cannot move system relation \"%s\""
-msgstr "システムリレーション\"%s\"を移動����ん"
-
-#: commands/tablecmds.c:6946
-msgid "cannot move temporary tables of other sessions"
-msgstr "他�セッション�一時テーブルを移動����ん"
+msgid "\"%s\" is a partial index"
+msgstr "\"%s\" �部分インデックス��"
 
-#: commands/tablecmds.c:7200
-msgid "circular inheritance not allowed"
-msgstr "循環��継承を行��������ん"
-
-#: commands/tablecmds.c:7201
+#: parser/parse_utilcmd.c:1511
 #, c-format
-msgid "\"%s\" is already a child of \"%s\"."
-msgstr "\"%s\"����\"%s\"����"
+msgid "\"%s\" is a deferrable index"
+msgstr "\"%s\" ��延�能インデックス��"
 
-#: commands/tablecmds.c:7209
-#, c-format
-msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
-msgstr ""
-"OIDを����テーブル\"%s\"をOIDを��テーブル\"%s\"�ら継承�る������"
-"�ん"
+#: parser/parse_utilcmd.c:1512
+#, 
+msgid "Cannot create a non-deferrable constraint using a deferrable index."
+msgstr "�延�能インデックスを使���延��制約�作れ��ん"
 
-#: commands/tablecmds.c:7336
+#: parser/parse_utilcmd.c:1525
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "�テーブル�列\"%s\"�NOT NULL��付�����れ��り��ん"
+msgid "index \"%s\" is not a b-tree"
+msgstr "インデックス \"%s\" �btree���り��ん"
 
-#: commands/tablecmds.c:7352
+#: parser/parse_utilcmd.c:1569
 #, c-format
-msgid "child table is missing column \"%s\""
-msgstr "�テーブル��列\"%s\"��り��ん"
+msgid "index \"%s\" does not have default sorting behavior"
+msgstr "インデックス \"%s\" �デフォルト�ソート動作を����ん"
 
-#: commands/tablecmds.c:7431
+#: parser/parse_utilcmd.c:1702 commands/indexcmds.c:841
 #, c-format
-msgid "child table \"%s\" has different definition for check constraint \"%s\""
-msgstr ""
-"�テーブル \"%s\" ���ェック制約 \"%s\" ����異���定義を������"
+msgid "column \"%s\" named in key does not exist"
+msgstr "キー���指��れ�列\"%s\"�存在���ん"
 
-#: commands/tablecmds.c:7455
+#: parser/parse_utilcmd.c:1714
 #, c-format
-msgid "child table is missing constraint \"%s\""
-msgstr "�テーブル��制約 \"%s\" ��り��ん"
+msgid "column \"%s\" appears twice in primary key constraint"
+msgstr "列\"%s\"�プライマリキー制約内�2回出����"
 
-#: commands/tablecmds.c:7536
+#: parser/parse_utilcmd.c:1720
 #, c-format
-msgid "relation \"%s\" is not a parent of relation \"%s\""
-msgstr "リレーション\"%s\"�リレーション\"%s\"�親���り��ん"
-
-#: commands/tablecmds.c:7764
-msgid "cannot move an owned sequence into another schema"
-msgstr "所有�るシーケンスを他�スキーマ�移動�る�������ん"
+msgid "column \"%s\" appears twice in unique constraint"
+msgstr "列 \"%s\" �一�性制約内�2回出����"
 
-#: commands/tablecmds.c:7793
-#, c-format
-msgid "relation \"%s\" is already in schema \"%s\""
-msgstr "リレーション\"%s\"�スキーマ\"%s\"内����存在���"
+#: parser/parse_utilcmd.c:1884
+msgid "index expression cannot return a set"
+msgstr "�インデックス�集�を返��������ん"
 
-#: commands/tablecmds.c:7856
-#, c-format
-msgid "relation \"%s\" already exists in schema \"%s\""
-msgstr "リレーション\"%s\"�スキーマ\"%s\"内����存在���"
+#: parser/parse_utilcmd.c:1894
+msgid ""
+"index expressions and predicates can refer only to the table being indexed"
+msgstr "インデックス��術後�インデックス付��れるテーブル��を�照����"
 
-#: commands/variable.c:62
-msgid "invalid list syntax for parameter \"datestyle\""
-msgstr "パラメータ\"datestyle\"用�リスト構文�無効��"
+#: parser/parse_utilcmd.c:1991
+msgid "rule WHERE condition cannot contain references to other relations"
+msgstr "ルール�WHERE�件�他�リレーション���照を���られ��ん"
 
-#: commands/variable.c:161
-#, c-format
-msgid "unrecognized \"datestyle\" key word: \"%s\""
-msgstr "\"datestyle\"キーワード��明��: \"%s\""
+#: parser/parse_utilcmd.c:1997
+msgid "cannot use aggregate function in rule WHERE condition"
+msgstr "ルール�WHERE�件��集約関数を使用����ん"
 
-#: commands/variable.c:175
-msgid "conflicting \"datestyle\" specifications"
-msgstr "\"datestyle\"指定�競������"
+#: parser/parse_utilcmd.c:2001
+msgid "cannot use window function in rule WHERE condition"
+msgstr "ルール� WHERE ���ウィンドウ関数を使用����ん"
 
-#: commands/variable.c:285
-msgid "invalid interval value for time zone: month not allowed"
-msgstr "時間帯�内部値�無効��: 月�許�れ��ん"
+#: parser/parse_utilcmd.c:2073
+msgid ""
+"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
+"actions"
+msgstr ""
+"ルール�WHERE�件�SELECT�INSERT�UPDATE�DELETE動作��を���������"
 
-#: commands/variable.c:293
-msgid "invalid interval value for time zone: day not allowed"
-msgstr "時間帯�時間間隔値�無効��: 日�許�れ��ん"
+#: parser/parse_utilcmd.c:2091 parser/parse_utilcmd.c:2190
+#: rewrite/rewriteHandler.c:442 rewrite/rewriteManip.c:1024
+msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
+msgstr "�件付��UNION/INTERSECT/EXCEPT文�実装�れ����ん"
 
-#: commands/variable.c:361 commands/variable.c:493
-#, c-format
-msgid "unrecognized time zone name: \"%s\""
-msgstr "時間帯���明��: \"%s\""
+#: parser/parse_utilcmd.c:2109
+msgid "ON SELECT rule cannot use OLD"
+msgstr "ON SELECTルール��OLDを使用����ん"
 
-#: commands/variable.c:370 commands/variable.c:502
-#, c-format
-msgid "time zone \"%s\" appears to use leap seconds"
-msgstr "時間帯\"%s\"��る�秒を使用�るよ���"
+#: parser/parse_utilcmd.c:2113
+msgid "ON SELECT rule cannot use NEW"
+msgstr "ON SELECTルール��NEWを使用����ん"
 
-#: commands/variable.c:372 commands/variable.c:504
-msgid "PostgreSQL does not support leap seconds."
-msgstr "PostgreSQL��る�秒をサ�ート�����ん"
+#: parser/parse_utilcmd.c:2122
+msgid "ON INSERT rule cannot use OLD"
+msgstr "ON INSERTルール��OLDを使用����ん"
 
-#: commands/variable.c:557
-msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
-msgstr ""
-"SET TRANSACTION ISOLATION LEVELを全����������呼�出���れ��り�"
-"�ん"
+#: parser/parse_utilcmd.c:2128
+msgid "ON DELETE rule cannot use NEW"
+msgstr "ON DELETEルール��NEWを使用����ん"
 
-#: commands/variable.c:566
-msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
-msgstr ""
-"SET TRANSACTION ISOLATION LEVELをサブトランザクション�呼�出����り��ん"
+#: parser/parse_utilcmd.c:2156
+msgid "cannot refer to OLD within WITH query"
+msgstr "WITH クエリー内�� OLD ��照����ん"
 
-#: commands/variable.c:665 utils/mb/mbutils.c:241
-#, c-format
-msgid "conversion between %s and %s is not supported"
-msgstr "%s�%s間�変��サ�ート�れ����ん"
+#: parser/parse_utilcmd.c:2163
+msgid "cannot refer to NEW within WITH query"
+msgstr "WITH クエリー内�� NEW ��照����ん"
 
-#: commands/variable.c:735 commands/variable.c:845 commands/user.c:579
-#: commands/user.c:767 commands/user.c:851 commands/user.c:1002
-#: utils/init/miscinit.c:413 utils/cache/lsyscache.c:2657
-#, c-format
-msgid "role \"%s\" does not exist"
-msgstr "ロール\"%s\"�存在���ん"
+#: parser/parse_utilcmd.c:2446
+msgid "misplaced DEFERRABLE clause"
+msgstr "DEFERRABLE��場所�間������"
 
-#: commands/variable.c:861
-#, c-format
-msgid "permission denied to set role \"%s\""
-msgstr "ロール\"%s\"を設定�る権���り��ん"
+#: parser/parse_utilcmd.c:2451 parser/parse_utilcmd.c:2466
+msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
+msgstr "複数�DEFERRABLE/NOT DEFERRABLE�を使用����ん"
 
-#: commands/comment.c:642
-msgid "\"%s\" is not a table, view, or composite type"
-msgstr "\"%s\"�テーブル�ビュー�複�型���れ�も�り��ん"
+#: parser/parse_utilcmd.c:2461
+msgid "misplaced NOT DEFERRABLE clause"
+msgstr "NOT DEFERRABLE��場所�間������"
 
-#: commands/comment.c:681
-msgid "database name cannot be qualified"
-msgstr "データベース�を修飾�る�������ん"
+#: parser/parse_utilcmd.c:2474 parser/parse_utilcmd.c:2500 gram.y:4145
+#: gram.y:4161
+msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+msgstr "INITIALLY DEFERRED�宣言�れ�制約�DEFERRABLE���れ��り��ん"
 
-#: commands/comment.c:698 commands/dbcommands.c:760 commands/dbcommands.c:905
-#: commands/dbcommands.c:1004 commands/dbcommands.c:1181
-#: commands/dbcommands.c:1366 commands/dbcommands.c:1410
-#: commands/dbcommands.c:1456 catalog/aclchk.c:614 utils/adt/dbsize.c:149
-#: utils/adt/acl.c:2975 utils/init/postinit.c:692 utils/init/postinit.c:760
-#: utils/init/postinit.c:777
-#, c-format
-msgid "database \"%s\" does not exist"
-msgstr "データベース\"%s\"�存在���ん"
+#: parser/parse_utilcmd.c:2482
+msgid "misplaced INITIALLY DEFERRED clause"
+msgstr "INITIALLY DEFERRED��場所�間������<"
 
-#: commands/comment.c:729
-msgid "tablespace name cannot be qualified"
-msgstr "テーブル空間�を修飾�る�������ん"
+#: parser/parse_utilcmd.c:2487 parser/parse_utilcmd.c:2513
+msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
+msgstr "複数�INITIALLY IMMEDIATE/DEFERRED�を使用����ん"
 
-#: commands/comment.c:766
-msgid "role name cannot be qualified"
-msgstr "ロール�を修飾����ん"
+#: parser/parse_utilcmd.c:2508
+msgid "misplaced INITIALLY IMMEDIATE clause"
+msgstr "INITIALLY IMMEDIATE��場所�間������<"
 
-#: commands/comment.c:775
+#: parser/parse_utilcmd.c:2553 parser/parse_expr.c:2140
+#: parser/parse_type.c:492 commands/indexcmds.c:938 commands/typecmds.c:843
 #, c-format
-msgid "must be member of role \"%s\" to comment upon it"
-msgstr "コメントを付与�る��ロール\"%s\"�メン����れ��り��ん"
+msgid "collations are not supported by type %s"
+msgstr "%s 型��照�順��サ�ート�れ��ん"
 
-#: commands/comment.c:874
+#: parser/parse_utilcmd.c:2699
 #, c-format
-msgid "rule \"%s\" does not exist"
-msgstr "ルール\"%s\"�存在���ん"
+msgid ""
+"CREATE specifies a schema (%s) different from the one being created (%s)"
+msgstr "CREATE�指定��スキーマ(%s)�作�先�スキーマ(%s)�異�り��"
 
-#: commands/comment.c:882
+#: parser/parse_relation.c:147
 #, c-format
-msgid "there are multiple rules named \"%s\""
-msgstr "複数�\"%s\"������ルール��り��"
-
-#: commands/comment.c:883
-msgid "Specify a relation name as well as a rule name."
-msgstr "ルール��加�リレーション�を指定������"
+msgid "table reference \"%s\" is ambiguous"
+msgstr "テーブル�照\"%s\"�曖昧��"
 
-#: commands/comment.c:1105 commands/trigger.c:994 commands/trigger.c:1194
-#: commands/trigger.c:1305
+#: parser/parse_relation.c:183
 #, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist"
-msgstr "テーブル\"%2$s\"�トリガ\"%1$s\"�存在���ん"
+msgid "table reference %u is ambiguous"
+msgstr "テーブル�照%u�曖昧��"
 
-#: commands/comment.c:1183 commands/conversioncmds.c:153
-#: commands/conversioncmds.c:209 commands/conversioncmds.c:262
+#: parser/parse_relation.c:343
 #, c-format
-msgid "conversion \"%s\" does not exist"
-msgstr "変�\"%s�存在���ん"
-
-#: commands/comment.c:1213
-msgid "language name cannot be qualified"
-msgstr "言語�を修飾����ん"
-
-#: commands/comment.c:1226
-msgid "must be superuser to comment on procedural language"
-msgstr "手続�言語�コメントを��る��スーパーユーザ���れ��り��ん"
+msgid "table name \"%s\" specified more than once"
+msgstr "テーブル�\"%s\"�複数指定�れ���"
 
-#: commands/comment.c:1415 catalog/pg_largeobject.c:116
-#: catalog/pg_largeobject.c:176 catalog/aclchk.c:656 catalog/aclchk.c:3684
-#: catalog/aclchk.c:4375 storage/large_object/inv_api.c:272
+#: parser/parse_relation.c:754 parser/parse_relation.c:1045
+#: parser/parse_relation.c:1432
 #, c-format
-msgid "large object %u does not exist"
-msgstr "ラージオブジェクト\"%u\"�存在���ん"
+msgid "table \"%s\" has %d columns available but %d columns specified"
+msgstr "テーブル\"%s\"��%d列使用������%d列指定�れ���"
 
-#: commands/comment.c:1422 catalog/pg_largeobject.c:200 libpq/be-fsstubs.c:287
+#: parser/parse_relation.c:784
 #, c-format
-msgid "must be owner of large object %u"
-msgstr "ラージオブジェクト %u �所有者���れ��り��ん"
+msgid "too many column aliases specified for function %s"
+msgstr "関数%s�指定�れ�列別��多����"
 
-#: commands/comment.c:1469 commands/functioncmds.c:1777
+#: parser/parse_relation.c:835 catalog/namespace.c:276 commands/lockcmds.c:122
 #, c-format
-msgid "cast from type %s to type %s does not exist"
-msgstr "型%s�ら型%s��キャスト�存在���ん"
+msgid "relation \"%s.%s\" does not exist"
+msgstr "リレーション\"%s.%s\"�存在���ん"
 
-#: commands/comment.c:1481 commands/functioncmds.c:1522
-#: commands/functioncmds.c:1794
+#: parser/parse_relation.c:848 parser/parse_relation.c:856
+#: catalog/namespace.c:281 utils/adt/regproc.c:810 commands/lockcmds.c:127
 #, c-format
-msgid "must be owner of type %s or type %s"
-msgstr "型%s���型%s�所有者���れ��り��ん"
+msgid "relation \"%s\" does not exist"
+msgstr "リレーション\"%s\"�存在���ん"
 
-#: commands/comment.c:1501
-msgid "must be superuser to comment on text search parser"
+#: parser/parse_relation.c:850
+#, c-format
+msgid ""
+"There is a WITH item named \"%s\", but it cannot be referenced from this "
+"part of the query."
 msgstr ""
-"テキスト検索パーサ�コメントを��る��スーパーユーザ���れ��り��ん"
+"\"%s\" ��� WITH 項目��り�����れ�クエリー���部分�ら��照���"
+"�ん。"
 
-#: commands/comment.c:1530
-msgid "must be superuser to comment on text search template"
+#: parser/parse_relation.c:852
+msgid ""
+"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr ""
-"テキスト検索テンプレート�コメントを��る��スーパーユーザ���れ��り�"
-"�ん"
+"WITH RECURSIVE を使���も��� WITH 項目�場所を変���方�照を�����"
+"���"
 
-#: commands/user.c:150
-msgid "SYSID can no longer be specified"
-msgstr "SYSID�も�指定�る�������ん"
+#: parser/parse_relation.c:1125
+msgid ""
+"a column definition list is only allowed for functions returning \"record\""
+msgstr "列定義リスト�\"record\"を返�関数���使用����"
 
-#: commands/user.c:255 commands/user.c:562 commands/dbcommands.c:253
-#: commands/dbcommands.c:1347
-#, c-format
-msgid "invalid connection limit: %d"
-msgstr "接続制�数 %d �無効��"
+#: parser/parse_relation.c:1133
+msgid "a column definition list is required for functions returning \"record\""
+msgstr "\"record\"を返�関数��列定義リスト�必���"
 
-#: commands/user.c:272
-msgid "must be superuser to create superusers"
-msgstr "スーパーユーザを作��る��スーパーユーザ���れ��り��ん"
+#: parser/parse_relation.c:1184
+#, c-format
+msgid "function \"%s\" in FROM has unsupported return type %s"
+msgstr "FROM��関数\"%s\"�サ�ート�れ��戻り値型%sを����"
 
-#: commands/user.c:279
-msgid "permission denied to create role"
-msgstr "ロールを作��る権���り��ん"
+#: parser/parse_relation.c:1258
+#, c-format
+msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
+msgstr "VALUESリスト\"%s\"�%d列使用�能����%d列�指定�れ���"
 
-#: commands/user.c:286 commands/user.c:1033
+#: parser/parse_relation.c:1314
 #, c-format
-msgid "role name \"%s\" is reserved"
-msgstr "ロール�\"%s\"�予約�れ����"
+msgid "joins can have at most %d columns"
+msgstr "JOIN �指定��る���最大 %d カラム��"
 
-#: commands/user.c:300 commands/user.c:1027
+#: parser/parse_relation.c:1405
 #, c-format
-msgid "role \"%s\" already exists"
-msgstr "ロール\"%s\"����存在���"
+msgid "WITH query \"%s\" does not have a RETURNING clause"
+msgstr "WITH クエリー \"%s\" � RETURNING ���り��ん"
 
-#: commands/user.c:592 commands/user.c:784 commands/user.c:1267
-#: commands/user.c:1404
-msgid "must be superuser to alter superusers"
-msgstr "スーパーユーザを変更�る��スーパーユーザ���れ��り��ん"
+#: parser/parse_relation.c:2087
+#, c-format
+msgid "column %d of relation \"%s\" does not exist"
+msgstr "リレーション\"%2$s\"�列\"%1$d\"�存在���ん"
 
-#: commands/user.c:607 commands/user.c:792
-msgid "permission denied"
-msgstr "権���り��ん"
+#: parser/parse_relation.c:2471
+#, c-format
+msgid "invalid reference to FROM-clause entry for table \"%s\""
+msgstr "テーブル\"%s\"用�FROM��対�る無効��照��。"
 
-#: commands/user.c:802
+#: parser/parse_relation.c:2474
 #, c-format
-msgid "database \"%s\" not found"
-msgstr "データベース \"%s\" �見��り��ん"
+msgid "Perhaps you meant to reference the table alias \"%s\"."
+msgstr "テーブル別�\"%s\"�対�る�照を�図���る�も�れ��ん"
 
-#: commands/user.c:824
-msgid "permission denied to drop role"
-msgstr "ロールを削除�る権���り��ん"
+#: parser/parse_relation.c:2476
+#, c-format
+msgid ""
+"There is an entry for table \"%s\", but it cannot be referenced from this "
+"part of the query."
+msgstr ""
+"テーブル\"%s\"�項目��り������������部分�ら��照����ん。"
+"\""
 
-#: commands/user.c:856
+#: parser/parse_relation.c:2482
 #, c-format
-msgid "role \"%s\" does not exist, skipping"
-msgstr "ロール\"%s\"�存在���ん。�略���"
+msgid "missing FROM-clause entry for table \"%s\""
+msgstr "テーブル\"%s\"用�FROM�エントリ��り��ん"
 
-#: commands/user.c:868 commands/user.c:872
-msgid "current user cannot be dropped"
-msgstr "�在�ユーザを削除����ん"
+#: gram.y:906
+#, c-format
+msgid "unrecognized role option \"%s\""
+msgstr "ロールオプション \"%s\" ��識����ん"
 
-#: commands/user.c:876
-msgid "session user cannot be dropped"
-msgstr "セッション�ユーザを削除����ん"
+#: gram.y:1292
+msgid "current database cannot be changed"
+msgstr "�在�データベースを変更����ん"
 
-#: commands/user.c:887
-msgid "must be superuser to drop superusers"
-msgstr "スーパーユーザを削除�る��スーパーユーザ���れ��り��ん"
+#: gram.y:1410 gram.y:1425
+msgid "time zone interval must be HOUR or HOUR TO MINUTE"
+msgstr "時間帯�間隔�HOUR���HOUR TO MINUTE���れ��り��ん"
 
-#: commands/user.c:900
-#, c-format
-msgid "role \"%s\" cannot be dropped because some objects depend on it"
-msgstr "他�オブジェクト��存�������ロール\"%s\"を削除����ん"
+#: gram.y:1430 gram.y:9250 gram.y:11740
+msgid "interval precision specified twice"
+msgstr "インター�ル型�精度�２回指定�れ���"
 
-#: commands/user.c:1017
-msgid "session user cannot be renamed"
-msgstr "セッションユーザ���を変更����ん"
+#: gram.y:2752
+msgid "CHECK constraints cannot be deferred"
+msgstr "CHECK 制約��延�能������ん"
 
-#: commands/user.c:1021
-msgid "current user cannot be renamed"
-msgstr "�在�ユーザ���を変更����ん"
+#: gram.y:2888 utils/adt/ri_triggers.c:375 utils/adt/ri_triggers.c:435
+#: utils/adt/ri_triggers.c:598 utils/adt/ri_triggers.c:838
+#: utils/adt/ri_triggers.c:1026 utils/adt/ri_triggers.c:1188
+#: utils/adt/ri_triggers.c:1376 utils/adt/ri_triggers.c:1547
+#: utils/adt/ri_triggers.c:1730 utils/adt/ri_triggers.c:1901
+#: utils/adt/ri_triggers.c:2117 utils/adt/ri_triggers.c:2299
+#: utils/adt/ri_triggers.c:2502 utils/adt/ri_triggers.c:2550
+#: utils/adt/ri_triggers.c:2595 utils/adt/ri_triggers.c:2757
+msgid "MATCH PARTIAL not yet implemented"
+msgstr "MMATCH PARTIAL ���実装�れ����ん"
 
-#: commands/user.c:1044
-msgid "must be superuser to rename superusers"
-msgstr "スーパーユーザ���を変更�る��スーパーユーザ���れ��り��ん"
+#: gram.y:3006
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS�INTOを指定����ん"
 
-#: commands/user.c:1051
-msgid "permission denied to rename role"
-msgstr "ロール���を変更�る権���り��ん"
+#: gram.y:4058
+msgid "duplicate trigger events specified"
+msgstr "�複��トリガーイベント�指定�れ���"
 
-#: commands/user.c:1072
-msgid "MD5 password cleared because of role rename"
-msgstr "ロール��変更�れ���MD5パスワード�クリア�れ���"
+#: gram.y:4225
+msgid "CREATE ASSERTION is not yet implemented"
+msgstr "CREATE ASSERTION���実装�れ����ん"
 
-#: commands/user.c:1128
-msgid "column names cannot be included in GRANT/REVOKE ROLE"
-msgstr "カラム�� GRANT/REVOKE ROLE ���れ�����り��ん"
+#: gram.y:4241
+msgid "DROP ASSERTION is not yet implemented"
+msgstr "DROP ASSERTION���実装�れ����ん"
 
-#: commands/user.c:1166
-msgid "permission denied to drop objects"
-msgstr "オブジェクトを削除�る権���り��ん"
+#: gram.y:4577
+msgid "RECHECK is no longer required"
+msgstr "RECHECK �も�や必���れ��ん"
 
-#: commands/user.c:1193 commands/user.c:1202
-msgid "permission denied to reassign objects"
-msgstr "オブジェクトを�割当��る権���り��ん"
+#: gram.y:4578
+msgid "Update your data type."
+msgstr "データ型を更新������"
 
-#: commands/user.c:1275 commands/user.c:1412
-#, c-format
-msgid "must have admin option on role \"%s\""
-msgstr "ロール\"%s\"�adminオプション���れ��り��ん"
+#: gram.y:6221 utils/adt/regproc.c:630
+msgid "missing argument"
+msgstr "引数��り��ん"
 
-#: commands/user.c:1283
-msgid "must be superuser to set grantor"
-msgstr "権�付与者を設定�る��スーパーユーザ���れ��り��ん"
+#: gram.y:6222 utils/adt/regproc.c:631
+msgid "Use NONE to denote the missing argument of a unary operator."
+msgstr "�項演算��存在���引数を表���NONEを使用������。"
 
-#: commands/user.c:1308
-#, c-format
-msgid "role \"%s\" is a member of role \"%s\""
-msgstr "ロール\"%s\"�ロール\"%s\"�メン����り��ん"
+#: gram.y:7301 gram.y:7307 gram.y:7313
+msgid "WITH CHECK OPTION is not implemented"
+msgstr "WITH CHECK OPTION�実装�れ����ん"
 
-#: commands/user.c:1323
-#, c-format
-msgid "role \"%s\" is already a member of role \"%s\""
-msgstr "ロール\"%s\"����ロール\"%s\"�メン���"
+#: gram.y:7990
+msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
+msgstr "CREATE TABLE / AS EXECUTE��列�リストを使用����ん"
 
-#: commands/user.c:1434
-#, c-format
-msgid "role \"%s\" is not a member of role \"%s\""
-msgstr "ロール\"%s\"�ロール\"%s\"�メン����り��ん"
+#: gram.y:8214
+msgid "number of columns does not match number of values"
+msgstr "列�数�VALUES�数�一致���ん"
 
-#: commands/functioncmds.c:98
-#, c-format
-msgid "SQL function cannot return shell type %s"
-msgstr "SQL関数�シェル型%sを����������ん"
+#: gram.y:8664
+msgid "LIMIT #,# syntax is not supported"
+msgstr "LIMIT #,#構文�実装�れ����ん"
 
-#: commands/functioncmds.c:103
-#, c-format
-msgid "return type %s is only a shell"
-msgstr "戻り値型%s���るシェル��"
+#: gram.y:8665
+msgid "Use separate LIMIT and OFFSET clauses."
+msgstr "分割��LIMIT�OFFSET�を使用������"
 
-#: commands/functioncmds.c:132 parser/parse_type.c:261
-#, c-format
-msgid "type modifier cannot be specified for shell type \"%s\""
-msgstr "シェル型\"%s\"�型修正�を指定����ん"
+#: gram.y:8883
+msgid "VALUES in FROM must have an alias"
+msgstr "FROM��VALUES�別�を����れ��り��ん"
 
-#: commands/functioncmds.c:138
-#, c-format
-msgid "type \"%s\" is not yet defined"
-msgstr "型\"%s\"�未定義��"
+#: gram.y:8884
+msgid "For example, FROM (VALUES ...) [AS] foo."
+msgstr "例���FROM (VALUES ...) [AS] foo。"
 
-#: commands/functioncmds.c:139
-msgid "Creating a shell type definition."
-msgstr "シェル型定義を作������"
+#: gram.y:8889
+msgid "subquery in FROM must have an alias"
+msgstr "FROM��副������別�を����れ��り��ん"
 
-#: commands/functioncmds.c:218
-#, c-format
-msgid "SQL function cannot accept shell type %s"
-msgstr "SQL関数�シェル型\"%s\"を��付�られ��ん"
+#: gram.y:8890
+msgid "For example, FROM (SELECT ...) [AS] foo."
+msgstr "例���FROM (SELECT ...) [AS] foo。"
 
-#: commands/functioncmds.c:223
-#, c-format
-msgid "argument type %s is only a shell"
-msgstr "引数型%s���るシェル��"
+#: gram.y:9376
+msgid "precision for type float must be at least 1 bit"
+msgstr "浮動�数点数�型�精度�最低�も1ビット��れ��り��ん"
 
-#: commands/functioncmds.c:233
-#, c-format
-msgid "type %s does not exist"
-msgstr "型%s�存在���ん"
+#: gram.y:9385
+msgid "precision for type float must be less than 54 bits"
+msgstr "浮動�数点数�型�精度�54ビットよりも�����れ��り��ん"
 
-#: commands/functioncmds.c:241
-msgid "functions cannot accept set arguments"
-msgstr "関数�集�を引数�����付�られ��ん"
+#: gram.y:10099
+msgid "UNIQUE predicate is not yet implemented"
+msgstr "UNIQUE 述部���実装�れ����ん"
 
-#: commands/functioncmds.c:250
-msgid "VARIADIC parameter must be the last input parameter"
-msgstr "VARIADIC パラメータ�最後�入力パラメータ���れ��り��ん"
+#: gram.y:11007
+msgid "RANGE PRECEDING is only supported with UNBOUNDED"
+msgstr "RANGE PRECEDING � UNBOUNDED ���場����サ�ート��"
 
-#: commands/functioncmds.c:277
-msgid "VARIADIC parameter must be an array"
-msgstr "VARIADIC パラメータ��列���れ��り��ん"
+#: gram.y:11013
+msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
+msgstr "RANGE FOLLOWING  � UNBOUNDED ���場����サ�ート��"
 
-#: commands/functioncmds.c:317
-#, c-format
-msgid "parameter name \"%s\" used more than once"
-msgstr "パラメータ \"%s\" �複数指定�れ���"
+#: gram.y:11040 gram.y:11063
+msgid "frame start cannot be UNBOUNDED FOLLOWING"
+msgstr "構��開始部分� UNBOUNDED FOLLOWING ������り��ん"
 
-#: commands/functioncmds.c:332
-msgid "only input parameters can have default values"
-msgstr "入力パラメータ���デフォルト値を����"
+#: gram.y:11045
+msgid "frame starting from following row cannot end with current row"
+msgstr "次�行�ら始�るフレーム���在行��終了����ん"
 
-#: commands/functioncmds.c:344
-msgid "cannot use table references in parameter default value"
-msgstr "パラメータ�デフォルト値���テーブル�照を使用����ん"
+#: gram.y:11068
+msgid "frame end cannot be UNBOUNDED PRECEDING"
+msgstr "構��末尾� UNBOUNDED PRECEDING ������り��ん"
 
-#: commands/functioncmds.c:360
-msgid "cannot use subquery in parameter default value"
-msgstr "パラメータ�デフォルト値���副�����を使用����ん"
+#: gram.y:11074
+msgid "frame starting from current row cannot have preceding rows"
+msgstr "�在行�ら始�るフレーム���れ���行を�む�������ん"
 
-#: commands/functioncmds.c:364
-msgid "cannot use aggregate function in parameter default value"
-msgstr "パラメータ�デフォルト値���集約関数を使用����ん"
+#: gram.y:11081
+msgid "frame starting from following row cannot have preceding rows"
+msgstr "次�行�ら始�るフレーム���れ���行を�む�������ん"
 
-#: commands/functioncmds.c:368
-msgid "cannot use window function in parameter default value"
-msgstr "パラメータ�デフォルト値���ウィンドウ関数を使用����ん"
+#: gram.y:11715
+msgid "type modifier cannot have parameter name"
+msgstr "型修正��パラメータ�を���������ん"
 
-#: commands/functioncmds.c:378
-msgid "input parameters after one with a default value must also have defaults"
-msgstr ""
-"デフォルト値を��パラメータ�後��る入力パラメータ��必�デフォルト値を�"
-"���れ��り��ん"
+#: gram.y:12310 gram.y:12518
+msgid "improper use of \"*\""
+msgstr " \"*\" �使�方���切��"
 
-#: commands/functioncmds.c:617
-msgid "no function body specified"
-msgstr "関数本体�指定��り��ん"
-
-#: commands/functioncmds.c:627
-msgid "no language specified"
-msgstr "言語�指定�れ����ん"
-
-#: commands/functioncmds.c:648 commands/functioncmds.c:1349
-msgid "COST must be positive"
-msgstr "コスト�正数���れ��り��ん"
+#: gram.y:12449
+msgid "wrong number of parameters on left side of OVERLAPS expression"
+msgstr "OVERLAPS��左辺�パラメータ数�間������"
 
-#: commands/functioncmds.c:656 commands/functioncmds.c:1357
-msgid "ROWS must be positive"
-msgstr "ROWS�正数���れ��り��ん"
+#: gram.y:12456
+msgid "wrong number of parameters on right side of OVERLAPS expression"
+msgstr "OVERLAPS���辺�パラメータ数�間������"
 
-#: commands/functioncmds.c:695
-#, c-format
-msgid "unrecognized function attribute \"%s\" ignored"
-msgstr "�明�関数属性\"%s\"�無視����"
+#: gram.y:12481 gram.y:12498 repl_gram.c:1225 tsearch/spell.c:518
+#: tsearch/spell.c:535 tsearch/spell.c:552 tsearch/spell.c:569
+#: tsearch/spell.c:591 bootparse.c:1605
+msgid "syntax error"
+msgstr "構文エラー"
 
-#: commands/functioncmds.c:746
-#, c-format
-msgid "only one AS item needed for language \"%s\""
-msgstr "言語\"%s\"��AS項目�1���必���"
+#: gram.y:12581
+msgid "multiple ORDER BY clauses not allowed"
+msgstr "複数�ORDER BY��使用����ん"
 
-#: commands/functioncmds.c:838 commands/functioncmds.c:1992
-msgid "Use CREATE LANGUAGE to load the language into the database."
-msgstr "言語をデータベース�読�込む����CREATE LANGUAGEを使用������"
+#: gram.y:12592
+msgid "multiple OFFSET clauses not allowed"
+msgstr "複数�OFFSET��使用����ん"
 
-#: commands/functioncmds.c:885
-#, c-format
-msgid "function result type must be %s because of OUT parameters"
-msgstr "OUTパラメータ����関数�戻り値型�%s���れ��り��ん。"
+#: gram.y:12601
+msgid "multiple LIMIT clauses not allowed"
+msgstr "複数�LIMIT��使用����ん"
 
-#: commands/functioncmds.c:898
-msgid "function result type must be specified"
-msgstr "関数��果型を指定���れ��り��ん"
+#: gram.y:12610
+msgid "multiple WITH clauses not allowed"
+msgstr "複数� WITH ��使用����ん"
 
-#: commands/functioncmds.c:933 commands/functioncmds.c:1361
-msgid "ROWS is not applicable when function does not return a set"
-msgstr "関数�集�を返�場��ROWS�������ん"
+#: gram.y:12755
+msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
+msgstr "テーブル関数�� OUT � INOUT 引数�使用����ん"
 
-#: commands/functioncmds.c:985
-#, c-format
-msgid "function %s(%s) does not exist, skipping"
-msgstr "関数%s(%s)�存在���ん。�略���"
+#: gram.y:12856
+#, 
+msgid "multiple COLLATE clauses not allowed"
+msgstr "複数� COLLATE ��使用����ん"
 
-#: commands/functioncmds.c:1005 commands/functioncmds.c:1105
-#: commands/functioncmds.c:1168 commands/functioncmds.c:1319
-#: utils/adt/ruleutils.c:1634
+#: parser/parse_oper.c:124 parser/parse_oper.c:718 utils/adt/regproc.c:464
+#: utils/adt/regproc.c:484 utils/adt/regproc.c:643
 #, c-format
-msgid "\"%s\" is an aggregate function"
-msgstr "\"%s\"�集約関数��"
-
-#: commands/functioncmds.c:1007
-msgid "Use DROP AGGREGATE to drop aggregate functions."
-msgstr "集約関数を削除�る��DROP AGGREGATEを使用������"
+msgid "operator does not exist: %s"
+msgstr "演算��存在���ん: %s"
 
-#: commands/functioncmds.c:1014
+#: parser/parse_oper.c:219 parser/parse_agg.c:131
 #, c-format
-msgid "removing built-in function \"%s\""
-msgstr "組�込�関数\"%s\"を削除�����"
+msgid "could not identify an ordering operator for type %s"
+msgstr "型%s�順�演算�を識別����ん���"
 
-#: commands/functioncmds.c:1107
-msgid "Use ALTER AGGREGATE to rename aggregate functions."
-msgstr "集約関数���を変更�る��ALTER AGGREGATEを使用������。"
+#: parser/parse_oper.c:221
+msgid "Use an explicit ordering operator or modify the query."
+msgstr "明示的�順�演算�を使用�る������を変更������"
 
-#: commands/functioncmds.c:1119 commands/aggregatecmds.c:292
+#: parser/parse_oper.c:225 utils/adt/rowtypes.c:1157
+#: utils/adt/arrayfuncs.c:3176 utils/adt/arrayfuncs.c:3695
 #, c-format
-msgid "function %s already exists in schema \"%s\""
-msgstr "関数%s����スキーマ\"%s\"内�存在���"
-
-#: commands/functioncmds.c:1170
-msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
-msgstr "集約関数�所有者を変更�る��ALTER AGGREGATEを使用������。"
+msgid "could not identify an equality operator for type %s"
+msgstr "型%s�等価性演算�を識別����ん���"
 
-#: commands/functioncmds.c:1508
+#: parser/parse_oper.c:476
 #, c-format
-msgid "source data type %s is a pseudo-type"
-msgstr "変�元データ型%s�仮想型��"
+msgid "operator requires run-time type coercion: %s"
+msgstr "演算��実行時�型強制�必���: %s"
 
-#: commands/functioncmds.c:1514
+#: parser/parse_oper.c:710
 #, c-format
-msgid "target data type %s is a pseudo-type"
-msgstr "変�先データ型%s�仮想型��"
-
-#: commands/functioncmds.c:1551
-msgid "cast function must take one to three arguments"
-msgstr "キャスト関数�引数�1��ら3������れ��り��ん"
+msgid "operator is not unique: %s"
+msgstr "演算��一����り��ん: %s"
 
-#: commands/functioncmds.c:1555
+#: parser/parse_oper.c:712
 msgid ""
-"argument of cast function must match or be binary-coercible from source data "
-"type"
+"Could not choose a best candidate operator. You might need to add explicit "
+"type casts."
 msgstr ""
-"キャスト関数�引数�変�元データ型�一致�る������イナリ型を強����"
-"�れ��り��ん"
-
-#: commands/functioncmds.c:1559
-msgid "second argument of cast function must be type integer"
-msgstr "キャスト関数�第2引数�整数型���れ��り��ん"
-
-#: commands/functioncmds.c:1563
-msgid "third argument of cast function must be type boolean"
-msgstr "キャスト関数�第3引数�論�型���れ��り��ん"
+"最善�候補演算�を�択����ん���。明示的�型キャスト�必��も�れ��"
+"ã‚“"
 
-#: commands/functioncmds.c:1567
+#: parser/parse_oper.c:720
 msgid ""
-"return data type of cast function must match or be binary-coercible to "
-"target data type"
-msgstr ""
-"キャスト関数�戻り値データ型�変�後データ型�一致�る������イナリ型を"
-"強�����れ��り��ん"
-
-#: commands/functioncmds.c:1578
-msgid "cast function must not be volatile"
-msgstr "キャスト関数�volatile������ん"
-
-#: commands/functioncmds.c:1583
-msgid "cast function must not be an aggregate function"
-msgstr "キャスト関数�集約関数������ん"
-
-#: commands/functioncmds.c:1587
-msgid "cast function must not be a window function"
-msgstr "キャスト関数�集約関数������ん"
-
-#: commands/functioncmds.c:1591
-msgid "cast function must not return a set"
-msgstr "キャスト関数�集�を返�������ん"
-
-#: commands/functioncmds.c:1617
-msgid "must be superuser to create a cast WITHOUT FUNCTION"
+"No operator matches the given name and argument type(s). You might need to "
+"add explicit type casts."
 msgstr ""
-"WITHOUT FUNCTION�付��キャストを作��る��スーパーユーザ���れ��り�"
-"�ん"
+"指定�称�指定引数型���演算���り��ん。明示的�型キャスト�必��も�"
+"れ��ん"
 
-#: commands/functioncmds.c:1632
-msgid "source and target data types are not physically compatible"
-msgstr "変�元�変�先�データ型�間��物�的�互�性��り��ん"
+#: parser/parse_oper.c:779 parser/parse_oper.c:893
+#, c-format
+msgid "operator is only a shell: %s"
+msgstr "演算����るシェル��：%s"
 
-#: commands/functioncmds.c:1647
-msgid "composite data types are not binary-compatible"
-msgstr "複�データ型��イナリ互����り��ん"
+#: parser/parse_oper.c:881
+msgid "op ANY/ALL (array) requires array on right side"
+msgstr "演算� ANY/ALL (�列) �����列�必���"
 
-#: commands/functioncmds.c:1653
-msgid "enum data types are not binary-compatible"
-msgstr "列挙データ型��イナリ互����り��ん"
+#: parser/parse_oper.c:923
+msgid "op ANY/ALL (array) requires operator to yield boolean"
+msgstr "演算� ANY/ALL (�列) �演算��ブール型を返���れ��り��ん"
 
-#: commands/functioncmds.c:1659
-msgid "array data types are not binary-compatible"
-msgstr "�列データ型��イナリ互����り��ん"
+#: parser/parse_oper.c:928
+msgid "op ANY/ALL (array) requires operator not to return a set"
+msgstr "演算� ANY/ALL (�列) �演算��集�を返�������ん"
 
-#: commands/functioncmds.c:1669
-msgid "source data type and target data type are the same"
-msgstr "変�元�変�先�データ型��一��"
+#: parser/parse_expr.c:364 parser/parse_expr.c:757
+#, c-format
+msgid "column %s.%s does not exist"
+msgstr "列%s.%s�存在���ん"
 
-#: commands/functioncmds.c:1702
+#: parser/parse_expr.c:376
 #, c-format
-msgid "cast from type %s to type %s already exists"
-msgstr "型%s�ら型%s��キャスト����存在�����"
+msgid "column \"%s\" not found in data type %s"
+msgstr "データ型%2$s�列\"%1$s\"��り��ん"
 
-#: commands/functioncmds.c:1782
+#: parser/parse_expr.c:382
 #, c-format
-msgid "cast from type %s to type %s does not exist, skipping"
-msgstr "型%s�ら型%s��キャスト�存在���ん。�略���"
+msgid "could not identify column \"%s\" in record data type"
+msgstr "レコードデータ型�列\"%s\"を識別����ん���"
 
-#: commands/functioncmds.c:1879
+#: parser/parse_expr.c:388
 #, c-format
-msgid "function \"%s\" is already in schema \"%s\""
-msgstr "関数\"%s\"����スキーマ\"%s\"内�存在���"
+msgid "column notation .%s applied to type %s, which is not a composite type"
+msgstr "列記法 .%s�型%s�使用�れ�������型�複�型���り��ん"
 
-#: commands/functioncmds.c:1902
+#: parser/parse_expr.c:764 utils/adt/tsvector_op.c:1393
+#: commands/tablecmds.c:1292 commands/tablecmds.c:2147 commands/copy.c:3779
+#: commands/indexcmds.c:846
 #, c-format
-msgid "function \"%s\" already exists in schema \"%s\""
-msgstr "関数\"%s\"����スキーマ\"%s\"内�存在���"
+msgid "column \"%s\" does not exist"
+msgstr "列\"%s\"�存在���ん"
 
-#: commands/functioncmds.c:1974
-msgid "no inline code specified"
-msgstr "インラインコード�指定��り��ん"
+#: parser/parse_expr.c:1018
+msgid "NULLIF requires = operator to yield boolean"
+msgstr "NULLIF��=演算��booleanを返���を必�����"
 
-#: commands/functioncmds.c:2022
-#, c-format
-msgid "language \"%s\" does not support inline code execution"
-msgstr "言語 \"%s\" ��インラインコード実行をサ�ート�����ん"
+#: parser/parse_expr.c:1197
+msgid "arguments of row IN must all be row expressions"
+msgstr "行�IN引数����行����れ��り��ん"
 
-#: commands/sequence.c:469 commands/sequence.c:668 commands/sequence.c:710
-#: commands/sequence.c:746 catalog/aclchk.c:3093
-#, c-format
-msgid "permission denied for sequence %s"
-msgstr "シーケンス%s�対�る権���り��ん"
+#: parser/parse_expr.c:1411
+msgid "subquery cannot have SELECT INTO"
+msgstr "副������� SELECT INTO を使用����ん"
 
-# (%s)
-#: commands/sequence.c:553
-#, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
-msgstr "nextval: シーケンス\"%s\"�最大値(%s)������"
+#: parser/parse_expr.c:1439
+msgid "subquery must return a column"
+msgstr "副������1列を返���れ��り��ん"
 
-#: commands/sequence.c:576
-#, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
-msgstr "nextval: シーケンス\"%s\"�最�値(%s)������"
+#: parser/parse_expr.c:1446
+msgid "subquery must return only one column"
+msgstr "副������1列��を返���れ��り��ん"
 
-#: commands/sequence.c:674
-#, c-format
-msgid "currval of sequence \"%s\" is not yet defined in this session"
-msgstr "本セッション�シーケンス\"%s\"�currval���定義�れ����ん"
+#: parser/parse_expr.c:1506
+msgid "subquery has too many columns"
+msgstr "副������列�多����"
 
-#: commands/sequence.c:693 commands/sequence.c:699
-msgid "lastval is not yet defined in this session"
-msgstr "本セッション�lastval���定義�れ����ん"
+#: parser/parse_expr.c:1511
+msgid "subquery has too few columns"
+msgstr "副������列�少�����"
+
+#: parser/parse_expr.c:1607
+msgid "cannot determine type of empty array"
+msgstr "空��列�データ型を決定����ん"
+
+#: parser/parse_expr.c:1608
+msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
+msgstr "希望�る型�明示的�キャスト������。例：ARRAY[]::integer[]"
 
-#: commands/sequence.c:767
+#: parser/parse_expr.c:1622
 #, c-format
-msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
-msgstr "setval: 値%s�シーケンス\"%s\"�範囲(%s..%s)外��\""
+msgid "could not find element type for data type %s"
+msgstr "データ型 %s ��素を見��られ��ん���"
 
-#: commands/sequence.c:936 utils/hash/dynahash.c:363 utils/hash/dynahash.c:435
-#: utils/hash/dynahash.c:929 utils/mmgr/aset.c:408 utils/mmgr/aset.c:587
-#: utils/mmgr/aset.c:770 utils/mmgr/aset.c:976 utils/adt/formatting.c:1491
-#: utils/adt/formatting.c:1547 utils/adt/formatting.c:1604
-#: utils/adt/regexp.c:205 utils/adt/varlena.c:3246 utils/adt/varlena.c:3267
-#: utils/init/miscinit.c:149 utils/init/miscinit.c:170
-#: utils/init/miscinit.c:180 utils/misc/guc.c:2911 utils/misc/guc.c:2924
-#: utils/misc/guc.c:2937 utils/fmgr/dfmgr.c:224 utils/mb/mbutils.c:334
-#: utils/mb/mbutils.c:606 storage/ipc/procarray.c:840
-#: storage/ipc/procarray.c:1205 storage/ipc/procarray.c:1212
-#: storage/ipc/procarray.c:1443 storage/ipc/procarray.c:1837
-#: storage/file/fd.c:355 storage/file/fd.c:738 storage/file/fd.c:856
-#: storage/buffer/localbuf.c:348 storage/buffer/buf_init.c:154
-#: postmaster/postmaster.c:1968 postmaster/postmaster.c:2001
-#: postmaster/postmaster.c:3170 postmaster/postmaster.c:3848
-#: postmaster/postmaster.c:3929 postmaster/postmaster.c:4517
-#: lib/stringinfo.c:266 libpq/auth.c:1020 libpq/auth.c:1374 libpq/auth.c:1442
-#: libpq/auth.c:2016
-msgid "out of memory"
-msgstr "メモリ�足��"
+#: parser/parse_expr.c:1823
+msgid "unnamed XML attribute value must be a column reference"
+msgstr "無��XML属性値�列�照���れ��り��ん"
 
-#: commands/sequence.c:1096
-msgid "INCREMENT must not be zero"
-msgstr "INCREMENT�ゼロ������ん"
+#: parser/parse_expr.c:1824
+msgid "unnamed XML element value must be a column reference"
+msgstr "無��XML�素値�列�照���れ��り��ん"
 
-#: commands/sequence.c:1142
+#: parser/parse_expr.c:1839
 #, c-format
-msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
-msgstr "MINVALUE (%s)�MAXVALUE (%s)より�����れ��り��ん"
+msgid "XML attribute name \"%s\" appears more than once"
+msgstr "XML属性�\"%s\"�複数�り��"
 
-#: commands/sequence.c:1167
+#: parser/parse_expr.c:1946
 #, c-format
-msgid "START value (%s) cannot be less than MINVALUE (%s)"
-msgstr "START�値(%s)�MINVALUE(%s)より����る�������ん"
+msgid "cannot cast XMLSERIALIZE result to %s"
+msgstr "XMLSERIALIZE ��果を %s �キャスト����ん"
 
-#: commands/sequence.c:1179
-#, c-format
-msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
-msgstr "START�値(%s)�MAXVALUE(%s)より大���る�������ん"
+#: parser/parse_expr.c:2183 parser/parse_expr.c:2382
+msgid "unequal number of entries in row expressions"
+msgstr "行�����項目数�一致���ん"
 
-#: commands/sequence.c:1210
-#, c-format
-msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
-msgstr "RESTART �値(%s)� MINVALUE(%s) より����る�������ん"
+#: parser/parse_expr.c:2193
+msgid "cannot compare rows of zero length"
+msgstr "長�0�行を比較����ん"
 
-#: commands/sequence.c:1222
+#: parser/parse_expr.c:2218
 #, c-format
-msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
-msgstr "RESTART �値(%s)� MAXVALUE(%s) より大���る�������ん"
+msgid "row comparison operator must yield type boolean, not type %s"
+msgstr "行比較演算��型%s����booleanを返���れ��り��ん"
 
-#: commands/sequence.c:1237
+#: parser/parse_expr.c:2225
+msgid "row comparison operator must not return a set"
+msgstr "行比較演算��集�を返�������ん"
+
+#: parser/parse_expr.c:2284 parser/parse_expr.c:2328
 #, c-format
-msgid "CACHE (%s) must be greater than zero"
-msgstr "CACHE(%s)�ゼロより大����れ��り��ん"
+msgid "could not determine interpretation of row comparison operator %s"
+msgstr "行比較演算�%s�解釈を決定����ん"
 
-#: commands/sequence.c:1268
-msgid "invalid OWNED BY option"
-msgstr "無効�OWNED BYオプション��"
+#: parser/parse_expr.c:2286
+msgid ""
+"Row comparison operators must be associated with btree operator families."
+msgstr "行比較演算��B-Tree演算���関連付��れ��れ��り��ん。"
 
-#: commands/sequence.c:1269
-msgid "Specify OWNED BY table.column or OWNED BY NONE."
-msgstr "OWNED BY table.column ��� OWNED BY NONEを指定������。"
+#: parser/parse_expr.c:2330
+msgid "There are multiple equally-plausible candidates."
+msgstr "複数�も��もら���等��候補�存在���。"
 
-#: commands/sequence.c:1298
-msgid "sequence must have same owner as table it is linked to"
-msgstr "シーケンス�関連�るテーブル���所有者���れ��り��ん"
+#: parser/parse_expr.c:2422
+msgid "IS DISTINCT FROM requires = operator to yield boolean"
+msgstr "IS DISTINCT FROM��=演算��booleanを返���れ��り��ん"
 
-#: commands/sequence.c:1302
-msgid "sequence must be in same schema as table it is linked to"
-msgstr "シーケンス�関連�るテーブル���スキーマ���れ��り��ん"
+#: parser/analyze.c:471
+msgid "INSERT ... SELECT cannot specify INTO"
+msgstr "INSERT ... SELECT��INTOを指定����ん"
 
-#: commands/trigger.c:192
-msgid "TRUNCATE FOR EACH ROW triggers are not supported"
-msgstr "TRUNCATE FOR EACH ROW トリガー�サ�ート�れ����ん"
+#: parser/analyze.c:564 parser/analyze.c:1070
+msgid "VALUES lists must all be the same length"
+msgstr "VALUESリスト������長����れ��り��ん"
 
-#: commands/trigger.c:233
-msgid "cannot use subquery in trigger WHEN condition"
-msgstr "トリガー� WHEN �件��副�����を使用����ん"
-
-#: commands/trigger.c:237
-msgid "cannot use aggregate function in trigger WHEN condition"
-msgstr "トリガー� WHEN �件��集約関数を使用����ん"
+#: parser/analyze.c:606 parser/analyze.c:1211
+msgid "VALUES must not contain table references"
+msgstr "VALUES��テーブル�照を��������ん"
 
-#: commands/trigger.c:241
-msgid "cannot use window function in trigger WHEN condition"
-msgstr "トリガー� WHEN �件��ウィンドウ関数を使用����ん"
+#: parser/analyze.c:620 parser/analyze.c:1225
+msgid "VALUES must not contain OLD or NEW references"
+msgstr "VALUES��OLDやNEW���照を��������ん"
 
-#: commands/trigger.c:261 commands/trigger.c:274
-msgid "statement trigger's WHEN condition cannot reference column values"
-msgstr "ステートメントトリガー� WHEN �件��カラム値を�照����ん"
+#: parser/analyze.c:621 parser/analyze.c:1226
+msgid "Use SELECT ... UNION ALL ... instead."
+msgstr "代�り�SELECT ... UNION ALL ... を使用������"
 
-#: commands/trigger.c:266
-msgid "INSERT trigger's WHEN condition cannot reference OLD values"
-msgstr "INSERT トリガー� WHEN �件�� OLD 値を�照����ん"
+#: parser/analyze.c:725 parser/analyze.c:1238
+msgid "cannot use aggregate function in VALUES"
+msgstr "VALUES�集約関数を使用����ん"
 
-#: commands/trigger.c:279
-msgid "DELETE trigger's WHEN condition cannot reference NEW values"
-msgstr "DELETE トリガー� WHEN �件�� NEW 値を�照����ん"
+#: parser/analyze.c:731 parser/analyze.c:1244
+msgid "cannot use window function in VALUES"
+msgstr "VALUES 内��ウィンドウ関数を使用����ん"
 
-#: commands/trigger.c:284
-msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
-msgstr "BEFORE トリガー� WHEN �件�� NEW システムカラムを�照����ん"
+#: parser/analyze.c:765
+msgid "INSERT has more expressions than target columns"
+msgstr "INSERT��対象列よりも多�����り��"
 
-#: commands/trigger.c:322
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"trigger\""
-msgstr "関数%s�戻り値型を\"opaque\"�ら\"trigger\"�変更�����"
+#: parser/analyze.c:783
+msgid "INSERT has more target columns than expressions"
+msgstr "INSERT���よりも多��対象列��り��"
 
-#: commands/trigger.c:329
-#, c-format
-msgid "function %s must return type \"trigger\""
-msgstr "関数%s�\"trigger\"型を返���れ��り��ん"
+#: parser/analyze.c:787
+msgid ""
+"The insertion source is a row expression containing the same number of "
+"columns expected by the INSERT. Did you accidentally use extra parentheses?"
+msgstr ""
+"挿入元�行表�� INSERT �期待�る����列数���れ����。"
+"���り余計�カッコを���り���ん����？"
 
-#: commands/trigger.c:438 commands/trigger.c:1152
-#, c-format
-msgid "trigger \"%s\" for relation \"%s\" already exists"
-msgstr "リレーション\"%2$s\"用�トリガ\"%1$s\"����存在���"
+#: parser/analyze.c:1084
+msgid "DEFAULT can only appear in a VALUES list within INSERT"
+msgstr "VALUESリスト内�DEFAULT�INSERT�場���使用����"
 
-#: commands/trigger.c:719
-msgid "Found referenced table's UPDATE trigger."
-msgstr "被�照テーブル�UPDATEトリガ�見��り���。"
+#: parser/analyze.c:1192 parser/analyze.c:2414
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
+msgstr "SELECT FOR UPDATE/SHAREをVALUES�使用����ん"
 
-#: commands/trigger.c:720
-msgid "Found referenced table's DELETE trigger."
-msgstr "被�照テーブル�DELETEトリガ�見��り���。"
+#: parser/analyze.c:1337 parser/analyze.c:1534 parser/analyze.c:2263
+#: optimizer/plan/planner.c:959
+msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
+msgstr "UNION/INTERSECT/EXCEPT��SELECT FOR UPDATE/SHAREを使用����ん"
 
-#: commands/trigger.c:721
-msgid "Found referencing table's trigger."
-msgstr "�照テーブル�トリガ�見��り���。"
+#: parser/analyze.c:1452
+msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
+msgstr "無効�UNION/INTERSECT/EXCEPT ORDER BY���"
 
-#: commands/trigger.c:830 commands/trigger.c:846
-#, c-format
-msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
-msgstr "制約\"%s\" %s�対�る�完全�トリガグループを無視���。"
+#: parser/analyze.c:1453
+msgid "Only result column names can be used, not expressions or functions."
+msgstr "�や関数������果列������使用�れ��。"
 
-#: commands/trigger.c:858
-#, c-format
-msgid "converting trigger group into constraint \"%s\" %s"
-msgstr "トリガグループを制約\"%s\" %s�変������"
+#: parser/analyze.c:1454
+msgid ""
+"Add the expression/function to every SELECT, or move the UNION into a FROM "
+"clause."
+msgstr ""
+"�/関数を����SELECT��������。���UNIONをFROM��移動�����"
+"�"
 
-#: commands/trigger.c:998
-#, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
-msgstr "テーブル\"%2$s\"�トリガ\"%1$s\"�存在���ん。�略���"
+#: parser/analyze.c:1526
+msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
+msgstr "INTO�UNION/INTERSECT/EXCEPT�最��SELECT���使用����"
 
-#: commands/trigger.c:1273
-#, c-format
-msgid "permission denied: \"%s\" is a system trigger"
-msgstr "権���り��ん: \"%s\"�システムトリガ��"
+#: parser/analyze.c:1586
+msgid ""
+"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
+"same query level"
+msgstr ""
+"UNION/INTERSECT/EXCEPT��素��る文���一�����レベル�他�リレーショ"
+"ンを�照����ん"
 
-#: commands/trigger.c:1848
+#: parser/analyze.c:1674
 #, c-format
-msgid "trigger function %u returned null value"
-msgstr "トリガ関数%u�NULL値を返����"
+msgid "each %s query must have the same number of columns"
+msgstr "%s�������れ�れ��列数を返���れ��り��ん"
 
-#: commands/trigger.c:1908 commands/trigger.c:2023 commands/trigger.c:2160
-#: commands/trigger.c:2304
-msgid "BEFORE STATEMENT trigger cannot return a value"
-msgstr "BEFORE STATEMENTトリガ�値を返��������ん"
+#: parser/analyze.c:1930
+msgid "CREATE TABLE AS specifies too many column names"
+msgstr "CREATE TABLE AS�指定��列数�多����"
 
-#: commands/trigger.c:3920 catalog/namespace.c:232 catalog/namespace.c:306
-#, c-format
-msgid "cross-database references are not implemented: \"%s.%s.%s\""
-msgstr "データベース間��照�実装�れ����ん: \"%s.%s.%s\""
+#: parser/analyze.c:1988
+msgid "cannot use aggregate function in UPDATE"
+msgstr "UPDATE��集約関数を使用����ん"
 
-#: commands/trigger.c:3971
-#, c-format
-msgid "constraint \"%s\" is not deferrable"
-msgstr "制約\"%s\"��延�能���り��ん"
+#: parser/analyze.c:1994
+msgid "cannot use window function in UPDATE"
+msgstr "UPDATE 内��ウィンドウ関数を使用����ん"
 
-#: commands/trigger.c:3994
-#, c-format
-msgid "constraint \"%s\" does not exist"
-msgstr "制約\"%s\"�存在���ん"
+#: parser/analyze.c:2103
+msgid "cannot use aggregate function in RETURNING"
+msgstr "RETURNING��集約関数を使用����ん"
 
-#: commands/explain.c:149
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "EXPLAIN オプション \"%s\" ��識����値��: \"%s\""
+#: parser/analyze.c:2109
+msgid "cannot use window function in RETURNING"
+msgstr "RETURNING ��ウィンドウ関数を使用����ん"
 
-#: commands/explain.c:155
-#, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "EXPLAIN オプション \"%s\" ��識����ん"
+#: parser/analyze.c:2128
+msgid "RETURNING cannot contain references to other relations"
+msgstr "RETURNING�他�リレーション���照を���られ��ん"
 
-#: commands/explain.c:162
-msgid "EXPLAIN option BUFFERS requires ANALYZE"
-msgstr "EXPLAIN オプション� BUFFERS �� ANALYZE 指定�必���"
+#: parser/analyze.c:2167
+msgid "cannot specify both SCROLL and NO SCROLL"
+msgstr "SCROLL�NO SCROLL�両方を指定����ん"
 
-#: commands/conversioncmds.c:69
-#, c-format
-msgid "source encoding \"%s\" does not exist"
-msgstr "変�元符�化方�\"%s\"�存在���ん"
+#: parser/analyze.c:2181
+msgid "DECLARE CURSOR cannot specify INTO"
+msgstr "DECLARE CURSOR��INTOを指定����ん"
 
-#: commands/conversioncmds.c:76
-#, c-format
-msgid "destination encoding \"%s\" does not exist"
-msgstr "変�先符�化方�\"%s\"�存在���ん"
+#: parser/analyze.c:2193
+msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
+msgstr ""
+"DECLARE CURSOR �� WITH �データを変更�るステートメントを�ん���り��ん"
 
-#: commands/conversioncmds.c:90
-#, c-format
-msgid "encoding conversion function %s must return type \"void\""
-msgstr "エンコード変�関数 %s � \"void\" 型を返���れ��り��ん"
+#: parser/analyze.c:2199
+msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE�サ�ート�れ����ん"
 
-#: commands/conversioncmds.c:159
-#, c-format
-msgid "conversion \"%s\" does not exist, skipping"
-msgstr "変�\"%s�存在���ん。�略���"
+#: parser/analyze.c:2200
+msgid "Holdable cursors must be READ ONLY."
+msgstr "���能カーソル�読��り�����れ��り��ん。"
 
-#: commands/conversioncmds.c:224
-#, c-format
-msgid "conversion \"%s\" already exists in schema \"%s\""
-msgstr "変�\"%s\"�スキーマ\"%s\"内����存在���"
+#: parser/analyze.c:2213
+msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr ""
+"DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE�サ�ート�れ����ん"
 
-#: commands/tablespace.c:157 commands/tablespace.c:174
-#: commands/tablespace.c:185 commands/tablespace.c:193
-#: commands/tablespace.c:579 storage/file/copydir.c:61
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"を作�����ん���: %m"
+#: parser/analyze.c:2214
+msgid "Insensitive cursors must be READ ONLY."
+msgstr "無�応カーソル�読��り�����れ��り��ん"
 
-#: commands/tablespace.c:204
-#, c-format
-msgid "could not stat directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"�stat�����ん���: %m"
+#: parser/analyze.c:2267
+msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
+msgstr "DISTINCT���SELECT FOR UPDATE/SHAREを使用����ん"
 
-#: commands/tablespace.c:213
-#, c-format
-msgid "\"%s\" exists but is not a directory"
-msgstr "\"%s\"�存在�����ディレクトリ���り��ん"
+#: parser/analyze.c:2271
+msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
+msgstr "GROUP BY���SELECT FOR UPDATE/SHAREを使用����ん"
 
-#: commands/tablespace.c:243
-#, c-format
-msgid "permission denied to create tablespace \"%s\""
-msgstr "テーブル空間\"%s\"を作��る権���り��ん"
+#: parser/analyze.c:2275
+msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
+msgstr "HAVING���SELECT FOR UPDATE/SHAREを使用����ん"
 
-#: commands/tablespace.c:245
-msgid "Must be superuser to create a tablespace."
-msgstr "テーブル空間を作��る��スーパーユーザ���れ��り��ん"
+#: parser/analyze.c:2279
+msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
+msgstr "集約関数��SELECT FOR UPDATE/SHAREを使用����ん"
 
-#: commands/tablespace.c:261
-msgid "tablespace location cannot contain single quotes"
-msgstr "テーブル空間�場所���一引用符を��る�������ん"
+#: parser/analyze.c:2283
+msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
+msgstr "ウィンドウ関数�� SELECT FOR UPDATE/SHARE を使用����ん"
 
-#: commands/tablespace.c:271
-msgid "tablespace location must be an absolute path"
-msgstr "テーブル空間�場所�絶対パス���れ��り��ん"
+#: parser/analyze.c:2287
+msgid ""
+"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
+"target list"
+msgstr ""
+"ターゲットリスト�中�� SELECT FOR UPDATE/SHARE を戻り値を返�関数�一緒�使"
+"��������ん"
 
-#: commands/tablespace.c:282
-#, c-format
-msgid "tablespace location \"%s\" is too long"
-msgstr "テーブル空間�場所\"%s\"�長����"
+#: parser/analyze.c:2366
+msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
+msgstr ""
+"SELECT FOR UPDATE/SHARE ��無�件�リレーション�を指定���れ��り��ん"
 
-#: commands/tablespace.c:292 commands/tablespace.c:795
+#: parser/analyze.c:2383
 #, c-format
-msgid "unacceptable tablespace name \"%s\""
-msgstr "テーブル空間�\"%s\"を��付�られ��ん"
+msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
+msgstr "SELECT FOR UPDATE/SHARE �外部テーブル \"%s\" �一緒��使用����ん"
 
-#: commands/tablespace.c:294 commands/tablespace.c:796
-msgid "The prefix \"pg_\" is reserved for system tablespaces."
-msgstr "接頭辞\"pg_\"�システムテーブル空間用�予約�れ����"
+#: parser/analyze.c:2402
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
+msgstr "SELECT FOR UPDATE/SHAREを���使用����ん"
 
-#: commands/tablespace.c:304 commands/tablespace.c:808
-#, c-format
-msgid "tablespace \"%s\" already exists"
-msgstr "テーブル空間\"%s\"����存在���"
+#: parser/analyze.c:2408
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
+msgstr "SELECT FOR UPDATE/SHAREを関数�使用����ん"
 
-#: commands/tablespace.c:372 commands/tablespace.c:524
-msgid "tablespaces are not supported on this platform"
-msgstr "��プラットフォーム��テーブル空間をサ�ート�����ん"
+#: parser/analyze.c:2420
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
+msgstr "SELECT FOR UPDATE/SHARE � WITH クエリー���用����ん"
 
-#: commands/tablespace.c:416
+#: parser/analyze.c:2434
 #, c-format
-msgid "tablespace \"%s\" does not exist, skipping"
-msgstr "テーブル空間\"%s\"�存在���ん。�略���"
+msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
+msgstr "FOR UPDATE/SHARE��リレーション\"%s\"�FROM���り��ん"
 
-#: commands/tablespace.c:481
-#, c-format
-msgid "tablespace \"%s\" is not empty"
-msgstr "テーブル空間\"%s\"�空���り��ん"
+#: parser/parse_agg.c:133
+msgid "Aggregates with DISTINCT must be able to sort their inputs."
+msgstr ""
+"DISTINCT 付��集約関数���れ�対�る入力をソート����れ��り��ん。"
 
-#: commands/tablespace.c:555
-msgid "directory \"%s\" does not exist"
-msgstr "ディレクトリ \"%s\" �存在���ん"
+#: parser/parse_agg.c:174
+msgid "aggregate function calls cannot contain window function calls"
+msgstr "集約関数�呼�出��ウィンドウ関数�呼�出�を�む�������ん"
 
-#: commands/tablespace.c:556
-msgid ""
-"Create directory \"%s\" for this tablespace before restarting the server."
-msgstr ""
-"パラメータ \"%s\" を変更�る��サー�ー��起動�必���"
+#: parser/parse_agg.c:336
+msgid "aggregates not allowed in WHERE clause"
+msgstr "WHERE���集約を使用����ん"
 
-#: commands/tablespace.c:561
-#, c-format
-msgid "could not set permissions on directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"�権�を設定����ん���: %m"
+#: parser/parse_agg.c:342
+msgid "aggregates not allowed in JOIN conditions"
+msgstr "JOIN�件�集約を使用����ん"
 
-#: commands/tablespace.c:574
-msgid "directory \"%s\" already in use as a tablespace"
-msgstr "ディレクトリ \"%s\" ����テーブルスペース���使�れ����"
+#: parser/parse_agg.c:363
+msgid "aggregates not allowed in GROUP BY clause"
+msgstr "GROUP BY��集約を使用����ん"
 
-#: commands/tablespace.c:589
-#, c-format
-msgid "could not create symbolic link \"%s\": %m"
-msgstr "シンボリックリンク\"%s\"を作�����ん���: %m"
+#: parser/parse_agg.c:433
+msgid "aggregate functions not allowed in a recursive query's recursive term"
+msgstr "�帰クエリー��帰項目中��集約関数を使用����ん"
 
-#: commands/tablespace.c:650 utils/adt/misc.c:213 utils/adt/genfile.c:244
-#: utils/misc/tzparser.c:345 storage/file/copydir.c:67
-#: storage/file/copydir.c:106 storage/file/fd.c:1572
-#: postmaster/postmaster.c:1142
-#, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"をオープン����ん���: %m"
+#: parser/parse_agg.c:458
+msgid "window functions not allowed in WHERE clause"
+msgstr "WHERE���ウィンドウ関数を使用����ん"
 
-#: commands/tablespace.c:680 commands/tablespace.c:692
-#: commands/tablespace.c:708
-#, c-format
-msgid "could not remove directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"を削除����ん���: %m"
+#: parser/parse_agg.c:464
+msgid "window functions not allowed in JOIN conditions"
+msgstr "JOIN�件��ウィンドウ関数を使用����ん"
 
-#: commands/tablespace.c:716
-#, c-format
-msgid "could not remove symbolic link \"%s\": %m"
-msgstr "シンボリックリンク\"%s\"を削除����ん���: %m"
+#: parser/parse_agg.c:470
+msgid "window functions not allowed in HAVING clause"
+msgstr "HAVING ���ウィンドウ関数を使用����ん"
 
-#: commands/tablespace.c:1392
-#, c-format
-msgid "tablespace %u is not empty"
-msgstr "テーブル空間%u�空���り��ん"
+#: parser/parse_agg.c:483
+msgid "window functions not allowed in GROUP BY clause"
+msgstr "GROUP BY ���ウィンドウ関数を使用����ん"
+
+#: parser/parse_agg.c:502 parser/parse_agg.c:515
+msgid "window functions not allowed in window definition"
+msgstr "ウィンドウ定義��ウィンドウ関数を使用����ん"
 
-#: commands/tsearchcmds.c:109 commands/tsearchcmds.c:929
+#: parser/parse_agg.c:673
 #, c-format
-msgid "function %s should return type %s"
-msgstr "関数%s�型%sを返��������ん"
-
-#: commands/tsearchcmds.c:178
-msgid "must be superuser to create text search parsers"
-msgstr "テキスト検索パーサを作��る��スーパーユーザ���れ��り��ん"
-
-#: commands/tsearchcmds.c:226
-#, c-format
-msgid "text search parser parameter \"%s\" not recognized"
-msgstr "テキスト検索パーサ\"%s\"��明��"
-
-#: commands/tsearchcmds.c:236
-msgid "text search parser start method is required"
-msgstr "テキスト検索パーサ�開始メソッド�必���"
-
-#: commands/tsearchcmds.c:241
-msgid "text search parser gettoken method is required"
-msgstr "テキスト検索パーサ�gettokenメソッド�必���"
-
-#: commands/tsearchcmds.c:246
-msgid "text search parser end method is required"
-msgstr "テキスト検索パーサ�終了メソッド�必���"
-
-#: commands/tsearchcmds.c:251
-msgid "text search parser lextypes method is required"
-msgstr "テキスト検索パーサ�lextypesメソッド�必���"
-
-#: commands/tsearchcmds.c:283
-msgid "must be superuser to drop text search parsers"
-msgstr "テキスト検索パーサを削除�る��スーパーユーザ���れ��り��ん"
+msgid ""
+"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
+"aggregate function"
+msgstr ""
+"列\"%s.%s\"�GROUP BY��出����れ��ら����集約関数内�使用���れ�"
+"�り��ん"
 
-#: commands/tsearchcmds.c:306 catalog/namespace.c:1748
+#: parser/parse_agg.c:679
 #, c-format
-msgid "text search parser \"%s\" does not exist"
-msgstr "テキスト検索パーサ\"%s\"�存在���ん"
+msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
+msgstr ""
+"外部������ら副������グループ化�れ����列\"%s.%s\"を使用���"
+"��"
 
-#: commands/tsearchcmds.c:312
+#: parser/parse_func.c:147
 #, c-format
-msgid "text search parser \"%s\" does not exist, skipping"
-msgstr "テキスト検索パーサ\"%s\"�存在���ん。�略���"
+msgid "argument name \"%s\" used more than once"
+msgstr "引数� \"%s\" �複数回指定�れ���"
 
-#: commands/tsearchcmds.c:367
-msgid "must be superuser to rename text search parsers"
-msgstr ""
-"テキスト検索パーサ���を変更�る��スーパーユーザ���れ��り��ん"
+#: parser/parse_func.c:158
+msgid "positional argument cannot follow named argument"
+msgstr "�置パラメーター�次����付��引数を指定����ん。"
 
-#: commands/tsearchcmds.c:385
+#: parser/parse_func.c:236
 #, c-format
-msgid "text search parser \"%s\" already exists"
-msgstr "テキスト検索パーサ\"%s\"����存在���"
+msgid "%s(*) specified, but %s is not an aggregate function"
+msgstr "%s(*)�指定�れ����%s�集約関数���り��ん"
 
-#: commands/tsearchcmds.c:462
+#: parser/parse_func.c:243
 #, c-format
-msgid "text search template \"%s\" does not accept options"
-msgstr "テキスト検索テンプレート\"%s\"�オプションを��付���ん"
-
-#: commands/tsearchcmds.c:535
-msgid "text search template is required"
-msgstr "テキスト検索テンプレート�必���"
+msgid "DISTINCT specified, but %s is not an aggregate function"
+msgstr "DISTINCT�指定�れ����%s�集約関数���り��ん"
 
-#: commands/tsearchcmds.c:600
+#: parser/parse_func.c:249
 #, c-format
-msgid "text search dictionary \"%s\" already exists"
-msgstr "テキスト検索辞書\"%s\"����存在���"
+msgid "ORDER BY specified, but %s is not an aggregate function"
+msgstr "ORDER BY �指定�れ�����%s �集約関数���り��ん"
 
-#: commands/tsearchcmds.c:654 catalog/namespace.c:1871
+#: parser/parse_func.c:255
 #, c-format
-msgid "text search dictionary \"%s\" does not exist"
-msgstr "テキスト検索辞書\"%s\"�存在���ん"
+msgid ""
+"OVER specified, but %s is not a window function nor an aggregate function"
+msgstr ""
+"OVER �指定�れ�����%s �ウィンドウ関数�集約関数���れ�も�り��ん"
 
-#: commands/tsearchcmds.c:660
+#: parser/parse_func.c:277
 #, c-format
-msgid "text search dictionary \"%s\" does not exist, skipping"
-msgstr "テキスト検索辞書\"%s\"�存在���ん。�略���"
+msgid "function %s is not unique"
+msgstr "関数 %s �一���り��ん"
 
-#: commands/tsearchcmds.c:990
-msgid "must be superuser to create text search templates"
+#: parser/parse_func.c:280
+msgid ""
+"Could not choose a best candidate function. You might need to add explicit "
+"type casts."
 msgstr ""
-"テキスト検索テンプレートを作��る��スーパーユーザ���れ��り��ん"
+"最善�候補関数を�択����ん���。明示的�型キャスト�必��も�れ��ん"
 
-#: commands/tsearchcmds.c:1027
+#: parser/parse_func.c:288 parser/parse_func.c:299 parser/parse_func.c:1481
+#: catalog/pg_aggregate.c:331 commands/typecmds.c:1350
+#: commands/typecmds.c:1401 commands/typecmds.c:1432 commands/typecmds.c:1455
+#: commands/typecmds.c:1476 commands/typecmds.c:1503 commands/typecmds.c:1530
 #, c-format
-msgid "text search template parameter \"%s\" not recognized"
-msgstr "テキスト検索テンプレート�パラメータ\"%s��明��。"
+msgid "function %s does not exist"
+msgstr "関数%s�存在���ん"
 
-#: commands/tsearchcmds.c:1037
-msgid "text search template lexize method is required"
-msgstr "テキスト検索テンプレート�lexizeメソッド�必���"
+#: parser/parse_func.c:291
+#, 
+msgid ""
+"No aggregate function matches the given name and argument types. Perhaps you "
+"misplaced ORDER BY; ORDER BY must appear after all regular arguments of the "
+"aggregate."
+msgstr ""
+"与�られ����引数��致�る集約関数��り��ん。"
+"��ら� ORDER BY ��置�誤り��り��。"
+"ORDER BY �集約関数�����正�表�引数�後��れ��れ��り��ん。"
 
-#: commands/tsearchcmds.c:1072
-msgid "must be superuser to rename text search templates"
+#: parser/parse_func.c:302
+msgid ""
+"No function matches the given name and argument types. You might need to add "
+"explicit type casts."
 msgstr ""
-"テキスト検索テンプレート���を変更�る��スーパーユーザ���れ��り��"
-"ã‚“"
+"指定�称�指定引数型���関数��り��ん。明示的�型キャスト�必��も�れ"
+"��ん"
 
-#: commands/tsearchcmds.c:1091
+#: parser/parse_func.c:412 parser/parse_func.c:478
 #, c-format
-msgid "text search template \"%s\" already exists"
-msgstr "テキスト検索テンプレート\"%s\"����存在���"
+msgid "%s(*) must be used to call a parameterless aggregate function"
+msgstr "%s(*)�パラメータ���集約関数�呼�出��使用���れ��り��ん"
 
-#: commands/tsearchcmds.c:1114
-msgid "must be superuser to drop text search templates"
-msgstr ""
-"テキスト検索テンプレートを削除�る��スーパーユーザ���れ��り��ん"
+#: parser/parse_func.c:419
+msgid "aggregates cannot return sets"
+msgstr "集約�集�を返���ん"
 
-#: commands/tsearchcmds.c:1137 catalog/namespace.c:1995
-#, c-format
-msgid "text search template \"%s\" does not exist"
-msgstr "テキスト検索テンプレート\"%s\"�存在���ん"
+#: parser/parse_func.c:431
+msgid "aggregates cannot use named arguments"
+msgstr "集約����付�引数�使���ん"
 
-#: commands/tsearchcmds.c:1143
-#, c-format
-msgid "text search template \"%s\" does not exist, skipping"
-msgstr "テキスト検索テンプレート\"%s\"�存在���ん。�略���"
+#: parser/parse_func.c:450
+msgid "window function call requires an OVER clause"
+msgstr "ウィンドウ関数�呼�出��� OVER ��必���"
 
-#: commands/tsearchcmds.c:1338
-#, c-format
-msgid "text search configuration parameter \"%s\" not recognized"
-msgstr "テキスト検索設定�パラメータ\"%s\"��明��"
+#: parser/parse_func.c:468
+msgid "DISTINCT is not implemented for window functions"
+msgstr "ウィンドウ関数�対�る DISTINCT �実装�れ����ん"
 
-#: commands/tsearchcmds.c:1345
-msgid "cannot specify both PARSER and COPY options"
-msgstr "PARSER�COPYオプションを����指定����ん"
+#: parser/parse_func.c:488
+msgid "aggregate ORDER BY is not implemented for window functions"
+msgstr "ウィンドウ関数�対�る集約� ORDER BY �実装�れ����ん"
 
-#: commands/tsearchcmds.c:1373
-msgid "text search parser is required"
-msgstr "テキスト検索パーサ�必���"
+#: parser/parse_func.c:494
+msgid "window functions cannot return sets"
+msgstr "ウィンドウ関数�集�を返��������ん"
 
-#: commands/tsearchcmds.c:1479
-#, c-format
-msgid "text search configuration \"%s\" already exists"
-msgstr "テキスト検索設定\"%s\"����存在���"
+#: parser/parse_func.c:505
+msgid "window functions cannot use named arguments"
+msgstr "ウィンドウ関数����付�引数を使���ん"
 
-#: commands/tsearchcmds.c:1532 commands/tsearchcmds.c:1688
-#: catalog/namespace.c:2118
+#: parser/parse_func.c:1502 parser/parse_type.c:196 utils/adt/regproc.c:973
+#: commands/tablecmds.c:224 commands/functioncmds.c:128
+#: commands/typecmds.c:660 commands/typecmds.c:2660
 #, c-format
-msgid "text search configuration \"%s\" does not exist"
-msgstr "テキスト検索設定\"%s\"�存在���ん"
+msgid "type \"%s\" does not exist"
+msgstr "型\"%s\"�存在���ん"
 
-#: commands/tsearchcmds.c:1538
+#: parser/parse_func.c:1526 parser/parse_func.c:1566 catalog/pg_proc.c:124
 #, c-format
-msgid "text search configuration \"%s\" does not exist, skipping"
-msgstr "テキスト検索設定\"%s�存在���ん。�略���"
+msgid "functions cannot have more than %d argument"
+msgid_plural "functions cannot have more than %d arguments"
+msgstr[0] "関数�%dを超�る引数を�る�������ん"
+msgstr[1] "関数�%dを超�る引数を�る�������ん"
 
-#: commands/tsearchcmds.c:1760
+#: parser/parse_func.c:1589
 #, c-format
-msgid "token type \"%s\" does not exist"
-msgstr "トークン型\"%s\"�存在���ん"
+msgid "aggregate %s(*) does not exist"
+msgstr "集約%s(*)�存在���ん"
 
-#: commands/tsearchcmds.c:1984
+#: parser/parse_func.c:1594
 #, c-format
-msgid "mapping for token type \"%s\" does not exist"
-msgstr "トークン型\"%s\"�対�るマップ�存在���ん"
+msgid "aggregate %s does not exist"
+msgstr "集約%s�存在���ん"
 
-#: commands/tsearchcmds.c:1990
+#: parser/parse_func.c:1613
 #, c-format
-msgid "mapping for token type \"%s\" does not exist, skipping"
-msgstr "トークン型\"%s\"�対�るマップ�存在���ん。�略���"
+msgid "function %s is not an aggregate"
+msgstr "関数%s�集約���り��ん"
+
+#: parser/parse_coerce.c:939
+msgid "Input has too few columns."
+msgstr "入力列�少�����"
 
-#: commands/tsearchcmds.c:2143 commands/tsearchcmds.c:2254
+#: parser/parse_coerce.c:957
 #, c-format
-msgid "invalid parameter list format: \"%s\""
-msgstr "無効�パラメータリスト�書���: \"%s\""
+msgid "Cannot cast type %s to %s in column %d."
+msgstr "列%3$d��型%1$s�ら%2$s�キャスト����ん"
 
-#: commands/view.c:139
-msgid "view must have at least one column"
-msgstr "ビュー��少���も1��列�必���"
+#: parser/parse_coerce.c:972
+msgid "Input has too many columns."
+msgstr "入力列�多����"
 
-#: commands/view.c:260 commands/view.c:272
-msgid "cannot drop columns from view"
-msgstr "ビュー�らカラムを削除����ん"
+#. translator: first %s is name of a SQL construct, eg WHERE
+#: parser/parse_coerce.c:1015
+#, c-format
+msgid "argument of %s must be type boolean, not type %s"
+msgstr "%s �引数� %s 型����ブール型���れ��り��ん"
 
-#: commands/view.c:277
+#. translator: %s is name of a SQL construct, eg WHERE
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1025 parser/parse_coerce.c:1074
 #, c-format
-msgid "cannot change name of view column \"%s\" to \"%s\""
-msgstr "ビュー�カラム���を \"%s\" �ら \"%s\" �変更����ん"
+msgid "argument of %s must not return a set"
+msgstr "%s�引数�集�を返����り��ん"
 
-#: commands/view.c:285
+#. translator: first %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1062
 #, c-format
-msgid "cannot change data type of view column \"%s\" from %s to %s"
-msgstr "ビュー�カラム \"%s\" �データ型を %s �ら %s �変更����ん"
+msgid "argument of %s must be type %s, not type %s"
+msgstr "%1$s�引数�型%3$s����%2$s型���れ��り��ん"
 
-#: commands/view.c:441
-msgid "CREATE VIEW specifies more column names than columns"
-msgstr "CREATE VIEW��列よりも多��列�を指定���れ��り��ん"
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1195
+#, c-format
+msgid "%s types %s and %s cannot be matched"
+msgstr "%s�型%s�%sを一致��る�������ん"
 
-#: commands/view.c:457
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1262
 #, c-format
-msgid "view \"%s\" will be a temporary view"
-msgstr "ビュー\"%s\"�一時ビュー��り��"
+msgid "%s could not convert type %s to %s"
+msgstr "%s�型%s�ら%s�変�����ん���"
 
-#: commands/async.c:567
-msgid "channel name cannot be empty"
-msgstr "�ャ�ル��空��る�������ん"
+#: parser/parse_coerce.c:1513
+msgid "arguments declared \"anyelement\" are not all alike"
+msgstr "\"anyelement\"�宣言�れ�引数�全�����り��ん"
 
-#: commands/async.c:572
-msgid "channel name too long"
-msgstr "�ャ�ル��長����"
+#: parser/parse_coerce.c:1533
+msgid "arguments declared \"anyarray\" are not all alike"
+msgstr "\"anyarray\"�宣言�れ�引数�全�����り��ん"
 
-#: commands/async.c:579
-msgid "payload string too long"
-msgstr "ペイロード文字列�長����"
+#: parser/parse_coerce.c:1562 parser/parse_coerce.c:1710
+#: parser/parse_coerce.c:1742
+#, c-format
+msgid "argument declared \"anyarray\" is not an array but type %s"
+msgstr "\"anyarray\"�宣言�れ�引数��列���型%s���"
 
-#: commands/async.c:763
+#: parser/parse_coerce.c:1578
 msgid ""
-"cannot PREPARE a transaction that has executed LISTEN, UNLISTEN or NOTIFY"
+"argument declared \"anyarray\" is not consistent with argument declared "
+"\"anyelement\""
 msgstr ""
-"��� LISTEN / UNLISTEN / NOTIFY を実行��トランザクション� PREPARE ����ん"
+"\"anyarray\"�宣言�れ�引数�\"anyelement\"�宣言�れ�引数��整�性��り"
+"��ん"
 
-#: commands/async.c:868
-msgid "too many notifications in the NOTIFY queue"
-msgstr "NOTIFY キュー�発生��通知イベント�多����"
+#: parser/parse_coerce.c:1596
+msgid "could not determine polymorphic type because input has type \"unknown\""
+msgstr "入力型�\"unknown\"������多様型を決定����ん���"
 
-#: commands/async.c:1421
+#: parser/parse_coerce.c:1606
 #, c-format
-msgid "NOTIFY queue is %.0f%% full"
-msgstr "NOTYFY キュー� %.0f%% ��一��������"
+msgid "type matched to anynonarray is an array type: %s"
+msgstr "anynonarray���型��列型��: %s"
 
-#: commands/async.c:1423
+#: parser/parse_coerce.c:1616
 #, c-format
-msgid ""
-"The server process with PID %d is among those with the oldest transactions."
-msgstr ""
-"PID %d �サー�プロセス��最も��トランザクション中��り��。"
+msgid "type matched to anyenum is not an enum type: %s"
+msgstr "anyenum���型�列挙型���り��ん: %s"
 
-#: commands/async.c:1426
+#: parser/parse_cte.c:42
+#, c-format
 msgid ""
-"The NOTIFY queue cannot be emptied until that process ends its current "
-"transaction."
-msgstr ""
-"プロセス��在�トランザクションを終了�る�� NOTYFY キューを空��る�������ん"
-
-#: commands/dbcommands.c:201
-msgid "LOCATION is not supported anymore"
-msgstr "LOCATION�も�やサ�ート�れ��ん"
+"recursive reference to query \"%s\" must not appear within its non-recursive "
+"term"
+msgstr "クエリー \"%s\" ���帰的�照������帰項目内��れ���り��ん"
 
-#: commands/dbcommands.c:202
-msgid "Consider using tablespaces instead."
-msgstr "代�り�テーブル空間�使用を検討������"
+#: parser/parse_cte.c:44
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within a subquery"
+msgstr "クエリー \"%s\" ���帰的�照��副�����内��れ���り��ん"
 
-#: commands/dbcommands.c:225 utils/adt/ascii.c:144
+#: parser/parse_cte.c:46
 #, c-format
-msgid "%d is not a valid encoding code"
-msgstr "%d�有効�符�化方�コード���り��ん"
-
-#: commands/dbcommands.c:235 utils/adt/ascii.c:126
-#, c-format
-msgid "%s is not a valid encoding name"
-msgstr "%s�有効�符�化方�����り��ん"
-
-#: commands/dbcommands.c:272
-msgid "permission denied to create database"
-msgstr "データベースを作��る権���り��ん"
-
-#: commands/dbcommands.c:295
-#, c-format
-msgid "template database \"%s\" does not exist"
-msgstr "テンプレートデータベース\"%s\"�存在���ん"
-
-#: commands/dbcommands.c:307
-#, c-format
-msgid "permission denied to copy database \"%s\""
-msgstr "データベース\"%s\"をコピー�る権���り��ん"
+msgid ""
+"recursive reference to query \"%s\" must not appear within an outer join"
+msgstr "クエリー \"%s\" ���帰的�照��外部��内��れ���り��ん"
 
-#: commands/dbcommands.c:323
+#: parser/parse_cte.c:48
 #, c-format
-msgid "invalid server encoding %d"
-msgstr "サー��符�化方�%d�無効��"
+msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
+msgstr "クエリー \"%s\" ���帰的�照��INTERSECT 内��れ���り��ん"
 
-#: commands/dbcommands.c:329 commands/dbcommands.c:333
+#: parser/parse_cte.c:50
 #, c-format
-msgid "invalid locale name %s"
-msgstr "ロケール� %s �無効��"
+msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
+msgstr "クエリー \"%s\" ���帰的�照��EXCEPT 内��れ���り��ん"
 
-#: commands/dbcommands.c:369 commands/dbcommands.c:384
+#: parser/parse_cte.c:132
 #, c-format
-msgid "encoding %s does not match locale %s"
-msgstr "符�化方� %s �ロケール %s �����ん"
+msgid "WITH query name \"%s\" specified more than once"
+msgstr "WITH クエリー� \"%s\" �複数回指定�れ���"
 
-#: commands/dbcommands.c:372
-#, c-format
-msgid "The chosen LC_CTYPE setting requires encoding %s."
-msgstr ""
-"�択�れ� LC_CTYPE を設定�る���符�化方� %s ��る必���り��。"
+#: parser/parse_cte.c:259
+msgid "subquery in WITH cannot have SELECT INTO"
+msgstr "WITH ���る副������� SELECT INTO を使用����ん"
 
-#: commands/dbcommands.c:387
-#, c-format
-msgid "The chosen LC_COLLATE setting requires encoding %s."
-msgstr "�択�れ�LC_COLLATEを設定�る���符�化方�%s��る必���り��。"
+#: parser/parse_cte.c:271
+msgid ""
+"WITH clause containing a data-modifying statement must be at the top level"
+msgstr "データを変更�るよ��ステートメントを�む WITH ��"
+"トップレベル���れ��り��ん"
 
-#: commands/dbcommands.c:405
+#: parser/parse_cte.c:320
 #, c-format
 msgid ""
-"new encoding (%s) is incompatible with the encoding of the template database "
-"(%s)"
+"recursive query \"%s\" column %d has type %s in non-recursive term but type %"
+"s overall"
 msgstr ""
-"新��符�化方�(%s)�テンプレートデータベース�符�化方�(%s)�互�性��り"
-"��ん"
+"�帰クエリー \"%s\" � %d 個目�カラム���帰項目内� %s 型�������"
+"��全体的�� %s 型�������"
 
-#: commands/dbcommands.c:408
-msgid ""
-"Use the same encoding as in the template database, or use template0 as "
-"template."
-msgstr ""
-"テンプレートデータベース�符�化方����も�を使���も��� template0 を"
-"テンプレート���使用������"
+#: parser/parse_cte.c:326
+msgid "Cast the output of the non-recursive term to the correct type."
+msgstr "��帰項目�出力を正��型�キャスト������"
 
-#: commands/dbcommands.c:413
+#: parser/parse_cte.c:331
 #, c-format
 msgid ""
-"new collation (%s) is incompatible with the collation of the template "
-"database (%s)"
+"recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
+"but collation \"%s\" overall"
 msgstr ""
-"新��照�順�(%s)�テンプレートデータベース�照�順�(%s)�互�性��り��"
-"ã‚“"
+"�帰クエリー \"%s\" � %d 個目�列���帰表�����照�順� \"%s\" を"
+"�求�������全体�照�順�� \"%s\" ��。"
 
-#: commands/dbcommands.c:415
-msgid ""
-"Use the same collation as in the template database, or use template0 as "
-"template."
-msgstr ""
-"テンプレートデータベース�照�順����も�を使���も��� template0 をテ"
-"ンプレート���使用������"
+#: parser/parse_cte.c:335
+msgid "Use the COLLATE clause to set the collation of the non-recursive term."
+msgstr "��帰項目�照�順�を設定�る�� COLLATE �を使������"
 
-#: commands/dbcommands.c:420
+#: parser/parse_cte.c:426
 #, c-format
-msgid ""
-"new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
-"(%s)"
-msgstr ""
-"新��LC_CTYPE(%s)�テンプレートデータベース(%s)�LC_CTYPE�互�性��り��"
-"ã‚“"
-
-#: commands/dbcommands.c:422
-msgid ""
-"Use the same LC_CTYPE as in the template database, or use template0 as "
-"template."
+msgid "WITH query \"%s\" has %d columns available but %d columns specified"
 msgstr ""
-"テンプレートデータベース�LC_CTYPE���も�を使���も���template0をテン"
-"プレート���使用������"
+"WITH クエリー \"%s\" �� %d 個�カラム�使用������%d 個�カラム�指定"
+"�れ���"
 
-#: commands/dbcommands.c:449 commands/dbcommands.c:1054
-msgid "pg_global cannot be used as default tablespace"
-msgstr "デフォルト�テーブル空間���pg_globalを使用����ん"
+#: parser/parse_cte.c:606
+msgid "mutual recursion between WITH items is not implemented"
+msgstr "WITH 項目間�士��帰�実装�れ����ん"
 
-#: commands/dbcommands.c:475
+#: parser/parse_cte.c:658
 #, c-format
-msgid "cannot assign new default tablespace \"%s\""
-msgstr "新��デフォルト�テーブル空間\"%s\"を割り当�られ��ん"
+msgid "recursive query \"%s\" must not contain data-modifying statements"
+msgstr "�帰クエリー \"%s\" �データを変更�るステートメントを�ん����"
+"�り��ん"
 
-#: commands/dbcommands.c:477
+#: parser/parse_cte.c:666
 #, c-format
 msgid ""
-"There is a conflict because database \"%s\" already has some tables in this "
-"tablespace."
-msgstr ""
-"データベース\"%s\"�����テーブル������テーブル空間��り�����"
-"競������"
-
-#: commands/dbcommands.c:497 commands/dbcommands.c:925
-#, c-format
-msgid "database \"%s\" already exists"
-msgstr "データベース\"%s\"����存在���"
+"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
+"recursive-term"
+msgstr "�帰クエリー \"%s\" � ��帰項目 UNION [ALL] �帰項目 ��り��ん"
 
-#: commands/dbcommands.c:511
-#, c-format
-msgid "source database \"%s\" is being accessed by other users"
-msgstr "元��るデータベース\"%s\"�他�ユーザ�よ��アクセス�れ����"
+#: parser/parse_cte.c:698
+msgid "ORDER BY in a recursive query is not implemented"
+msgstr "�帰クエリー内� ORDER BY �実装�れ����ん"
 
-#: commands/dbcommands.c:767
-#, c-format
-msgid "database \"%s\" does not exist, skipping"
-msgstr "データベース\"%s\"�存在���ん。�略���"
+#: parser/parse_cte.c:704
+msgid "OFFSET in a recursive query is not implemented"
+msgstr "�帰クエリー内� OFFSET �実装�れ����ん"
 
-#: commands/dbcommands.c:788
-msgid "cannot drop a template database"
-msgstr "テンプレートデータベースを削除����ん"
+#: parser/parse_cte.c:710
+msgid "LIMIT in a recursive query is not implemented"
+msgstr "�帰クエリー内� LIMIT �実装�れ����ん"
 
-#: commands/dbcommands.c:794
-msgid "cannot drop the currently open database"
-msgstr "�在オープン���るデータベースを削除����ん"
+#: parser/parse_cte.c:716
+msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
+msgstr "�帰クエリー内� FOR UPDATE/SHARE �実装�れ����ん"
 
-#: commands/dbcommands.c:805 commands/dbcommands.c:947
-#: commands/dbcommands.c:1076
+#: parser/parse_cte.c:773
 #, c-format
-msgid "database \"%s\" is being accessed by other users"
-msgstr "データベース\"%s\"�他�ユーザ�らアクセス�れ����"
+msgid "recursive reference to query \"%s\" must not appear more than once"
+msgstr "クエリー \"%s\" ���帰�照�２回以上�れ���り��ん"
 
-#: commands/dbcommands.c:916
-msgid "permission denied to rename database"
-msgstr "データベース���を変更�る権���り��ん"
+#: scan.l:411
+msgid "unterminated /* comment"
+msgstr "/*コメント�閉�����ん"
 
-#: commands/dbcommands.c:936
-msgid "current database cannot be renamed"
-msgstr "�在�データベース���を変更����ん"
+#: scan.l:440
+msgid "unterminated bit string literal"
+msgstr "ビット文字列リテラル�終端��り��ん"
 
-#: commands/dbcommands.c:1028
-msgid "cannot change the tablespace of the currently open database"
-msgstr "�在オープン中�データベース�テーブルスペース�変更����ん"
+#: scan.l:461
+msgid "unterminated hexadecimal string literal"
+msgstr "16進数文字列リテラル�終端��り��ん"
 
-#: commands/dbcommands.c:1116
-#, c-format
-msgid "some relations of database \"%s\" are already in tablespace \"%s\""
-msgstr ""
-"データベース \"%s\" �リレーション�中��テーブルスペース \"%s\"����存在"
-"�るも���り��"
+#: scan.l:511
+msgid "unsafe use of string constant with Unicode escapes"
+msgstr "Unicodeエスケープを使��文字列定数��険�使用"
 
-#: commands/dbcommands.c:1118
+#: scan.l:512
 msgid ""
-"You must move them back to the database's default tablespace before using "
-"this command."
+"String constants with Unicode escapes cannot be used when "
+"standard_conforming_strings is off."
 msgstr ""
-"��コマンドを使����データベース�デフォルト�テーブルスペース�戻���"
-"れ��り��ん。"
+"Unicodeエスケープ�standard_conforming_strings�無効�時�使用�る�����"
+"��ん。"
 
-#: commands/dbcommands.c:1246 commands/dbcommands.c:1719
-#: commands/dbcommands.c:1912 commands/dbcommands.c:1960
-#, c-format
-msgid "some useless files may be left behind in old database directory \"%s\""
-msgstr ""
-"元�データベース�ディレクトリ \"%s\" ����ファイル�残���る�も�れ�"
-"�ん"
+#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
+#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
+msgid "invalid Unicode surrogate pair"
+msgstr "Unicode �サロゲートペア�無効��"
 
-#: commands/dbcommands.c:1495
-msgid "permission denied to change owner of database"
-msgstr "データベース�所有者を変更�る権���り��ん"
+#: scan.l:586
+msgid "invalid Unicode escape"
+msgstr "Unicode �エスケープ�無効��"
 
-#: commands/dbcommands.c:1807
-#, c-format
+#: scan.l:587
+msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
+msgstr "Unicode エスケープ� \\uXXXX ��� \\UXXXXXXXX ���れ��り��ん。"
+
+#: scan.l:598
+msgid "unsafe use of \\' in a string literal"
+msgstr "文字列リテラル�安全����\\'�使用�れ���。"
+
+#: scan.l:599
 msgid ""
-"There are %d other session(s) and %d prepared transaction(s) using the "
-"database."
+"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
 msgstr ""
-"他���データベースを使���る %d 個�セッション� %d 個�準備済�トランザ"
-"クション��り��。"
+"文字列内�引用符を記述�る��''を使用������。\\'�クライアント���有"
+"効�符�化形���安全���り��ん。"
 
-#: commands/dbcommands.c:1810
-#, c-format
-msgid "There are %d other session(s) using the database."
-msgstr "他���データベースを使���る %d 個�セッション��り��。"
+#: scan.l:629 repl_scanner.l:97
+msgid "unterminated quoted string"
+msgstr "文字列�引用符�閉�����ん"
 
-#: commands/dbcommands.c:1813
-#, c-format
-msgid "There are %d prepared transaction(s) using the database."
-msgstr "��データベースを使用�る準備�れ�トランザクション�%d存在���。"
+#: scan.l:674
+msgid "unterminated dollar-quoted string"
+msgstr "文字列�ドル引用符�閉�����ん"
 
-#: commands/lockcmds.c:93
-#, c-format
-msgid "could not obtain lock on relation \"%s\""
-msgstr "リレーション\"%s\"�ロックを�得����ん���"
+#: scan.l:691 scan.l:703 scan.l:717
+msgid "zero-length delimited identifier"
+msgstr "区切り��識別��長��ゼロ��"
 
-#: commands/lockcmds.c:98
-#, c-format
-msgid "could not obtain lock on relation with OID %u"
-msgstr "OID %u �リレーション�対�るロックを�得����ん���"
+#: scan.l:730
+msgid "unterminated quoted identifier"
+msgstr "識別��引用符�閉�����ん"
 
-#: commands/lockcmds.c:122 catalog/namespace.c:273 parser/parse_relation.c:835
-#, c-format
-msgid "relation \"%s.%s\" does not exist"
-msgstr "リレーション\"%s.%s\"�存在���ん"
+#: scan.l:834
+msgid "operator too long"
+msgstr "演算��長����"
 
-#: commands/lockcmds.c:127 catalog/namespace.c:278 utils/adt/regproc.c:810
-#: parser/parse_relation.c:848 parser/parse_relation.c:856
+#. translator: %s is typically the translation of "syntax error"
+#: scan.l:992
 #, c-format
-msgid "relation \"%s\" does not exist"
-msgstr "リレーション\"%s\"�存在���ん"
+msgid "%s at end of input"
+msgstr "入力�最後� %s"
 
-#: commands/aggregatecmds.c:103
+#. translator: first %s is typically the translation of "syntax error"
+#: scan.l:1000
 #, c-format
-msgid "aggregate attribute \"%s\" not recognized"
-msgstr "集約�属性\"%s�存在���ん"
-
-#: commands/aggregatecmds.c:113
-msgid "aggregate stype must be specified"
-msgstr "集約�stypeを指定���れ��り��ん"
+msgid "%s at or near \"%s\""
+msgstr "\"%2$s\"�����近辺�%1$s"
 
-#: commands/aggregatecmds.c:117
-msgid "aggregate sfunc must be specified"
-msgstr "集約用�状態�移関数を指定���れ��り��ん"
+#: scan.l:1161 scan.l:1193
+msgid ""
+"Unicode escape values cannot be used for code point values above 007F when "
+"the server encoding is not UTF8"
+msgstr ""
+"サー�ー�エンコーディング� UTF-8 ����場��コード�イント�値� 007F 以"
+"上����� Unicode �エスケープ値�使用����ん"
 
-#: commands/aggregatecmds.c:134
-msgid "aggregate input type must be specified"
-msgstr "集約�入力型を指定���れ��り��ん"
-
-#: commands/aggregatecmds.c:159
-msgid "basetype is redundant with aggregate input type specification"
-msgstr "集約�入力型指定�基本型�冗長��"
-
-#: commands/aggregatecmds.c:191
-#, c-format
-msgid "aggregate transition data type cannot be %s"
-msgstr "集約��移データ�型を%s�����ん"
+#: scan.l:1189 scan.l:1325
+msgid "invalid Unicode escape value"
+msgstr "Unicode �エスケープシーケンス�無効��"
 
-#: commands/aggregatecmds.c:230
-#, c-format
-msgid "aggregate %s(%s) does not exist, skipping"
-msgstr "集約%s(%s)�存在���ん。�略���"
+#: scan.l:1214
+msgid "invalid Unicode escape character"
+msgstr "Unicode �エスケープ文字�無効��"
 
-#: commands/operatorcmds.c:98
-msgid "=> is deprecated as an operator name"
-msgstr ">= �演算�����廃止予定��り�推奨�れ��ん"
+#: scan.l:1381
+msgid "nonstandard use of \\' in a string literal"
+msgstr "文字列リテラル��標準的�\\'�使用�れ���。"
 
-#: commands/operatorcmds.c:99
+#: scan.l:1382
 msgid ""
-"This name may be disallowed altogether in future versions of PostgreSQL."
+"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
 msgstr ""
-"PostgreSQL �将���ージョン��������使����る�能性��り��"
+"文字列内�引用符を記述�る��''を使用������。���エスケープ文字列構"
+"文(E'...')を使用������。"
 
-#: commands/operatorcmds.c:120 commands/operatorcmds.c:128
-msgid "SETOF type not allowed for operator argument"
-msgstr "演算��引数��SETOF型を使用����ん"
+#: scan.l:1391
+msgid "nonstandard use of \\\\ in a string literal"
+msgstr "文字列リテラル��標準的�\\\\�使用�れ���。"
 
-#: commands/operatorcmds.c:156
-#, c-format
-msgid "operator attribute \"%s\" not recognized"
-msgstr "演算��属性\"%s\"��明��"
+#: scan.l:1392
+msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
+msgstr ""
+"�ックスラッシュ用�エスケープ文字列構文�例��E'\\\\'を使用������。"
 
-#: commands/operatorcmds.c:166
-msgid "operator procedure must be specified"
-msgstr "演算��プロシージャを指定���れ��り��ん"
+#: scan.l:1406
+msgid "nonstandard use of escape in a string literal"
+msgstr "文字列リテラル内��標準的�エスケープ�使用�れ���"
 
-#: commands/operatorcmds.c:177
-msgid "at least one of leftarg or rightarg must be specified"
-msgstr "少���も�辺�左辺���ら�を指定���れ��り��ん"
+#: scan.l:1407
+msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
+msgstr ""
+"エスケープ用�エスケープ文字列構文�例��E'\\\\r\\\\n'を使用������"
 
-#: commands/operatorcmds.c:226
+#: parser/parse_collate.c:214 parser/parse_collate.c:538
 #, c-format
-msgid "restriction estimator function %s must return type \"float8\""
-msgstr "制約推測用関数 %s � \"float8\" 型を返���れ��り��ん"
+msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgstr "暗黙�照�順� \"%s\" � \"%s\" �間�照�順��ミスマッ���り��"
 
-#: commands/operatorcmds.c:265
-#, c-format
-msgid "join estimator function %s must return type \"float8\""
-msgstr "JOIN 推測用関数 %s � \"float8\" 型を返���れ��り��ん"
+#: parser/parse_collate.c:217 parser/parse_collate.c:541
+msgid ""
+"You can choose the collation by applying the COLLATE clause to one or both "
+"expressions."
+msgstr ""
+"片方も���両方���対�� COLLATE �を�用�る���照�順�を�択����"
 
-#: commands/operatorcmds.c:316
+#: parser/parse_collate.c:763
 #, c-format
-msgid "operator %s does not exist, skipping"
-msgstr "演算�%s�存在���ん。�略���"
-
-#: commands/vacuum.c:421
-msgid "oldest xmin is far in the past"
-msgstr "最も��xmin������"
+msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+msgstr "明示的�照�順� \"%s\" � \"%s\" �間�照�順��ミスマッ���り��"
 
-#: commands/vacuum.c:422
-msgid "Close open transactions soon to avoid wraparound problems."
-msgstr ""
-"周回�題を回��る�����オープン���るトランザクションをクローズ���"
-"���。"
+#: parser/parse_node.c:83
+#, c-format
+msgid "target lists can have at most %d entries"
+msgstr "対象リスト�最大�%dエントリ���������"
 
-#: commands/vacuum.c:747
-msgid "some databases have not been vacuumed in over 2 billion transactions"
-msgstr ""
-"データベース�一部�20億トランザクション以上�間��キューム�れ����ん�"
-"��"
+#: parser/parse_node.c:240
+#, c-format
+msgid "cannot subscript type %s because it is not an array"
+msgstr "�列���り��ん���型%s�添�字を��られ��ん"
 
-#: commands/vacuum.c:748
-msgid "You might have already suffered transaction-wraparound data loss."
-msgstr "トランザクション�周回�よるデータ�失�発生���る�能性��り��"
+#: parser/parse_node.c:342 parser/parse_node.c:369
+msgid "array subscript must have type integer"
+msgstr "�列�添�字�整数型���れ��り��ん"
 
-#: commands/vacuum.c:873
+#: parser/parse_node.c:393
 #, c-format
-msgid "skipping \"%s\" --- only superuser can vacuum it"
-msgstr "\"%s\" をスキップ����� --- スーパーユーザ����キューム����"
+msgid "array assignment requires type %s but expression is of type %s"
+msgstr "�列�代入��型%s�必��������型%s���"
 
-#: commands/vacuum.c:877
+#: parser/parse_type.c:83
 #, c-format
-msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
-msgstr ""
-"\"%s\" をスキップ����� --- スーパーユーザも���データベース�所有者�"
-"���キューム����"
+msgid "improper %%TYPE reference (too few dotted names): %s"
+msgstr "%%TYPE�照���切��(ドット付�����少�����: %s"
 
-#: commands/vacuum.c:881
+#: parser/parse_type.c:105
 #, c-format
-msgid "skipping \"%s\" --- only table or database owner can vacuum it"
-msgstr ""
-"\"%s\"を飛������ --- テーブル���データベース�所有者����キューム"
-"�る�������"
+msgid "improper %%TYPE reference (too many dotted names): %s"
+msgstr "%%TYPE�照���切��(ドット付�����多����: %s"
 
-#: commands/vacuum.c:898
+#: parser/parse_type.c:127
 #, c-format
-msgid ""
-"skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
-msgstr ""
-"\"%s\"を飛������ --- インデックス�ビュー�特別�システムテーブルを�"
-"キューム�る�������ん"
+msgid "type reference %s converted to %s"
+msgstr "型�照%s�%s�変��れ���"
 
-#: commands/constraint.c:59 utils/adt/ri_triggers.c:2999
+#: parser/parse_type.c:202 utils/cache/typcache.c:195
 #, c-format
-msgid "function \"%s\" was not called by trigger manager"
-msgstr "関数\"%s\"�トリガ関数���呼�出�れ����ん"
+msgid "type \"%s\" is only a shell"
+msgstr "型\"%s\"���るシェル��"
 
-#: commands/constraint.c:66 utils/adt/ri_triggers.c:3008
+#: parser/parse_type.c:278 commands/functioncmds.c:134
 #, c-format
-msgid "function \"%s\" must be fired AFTER ROW"
-msgstr "関数\"%s\"をAFTER ROW�発行���れ��り��ん"
+msgid "type modifier cannot be specified for shell type \"%s\""
+msgstr "シェル型\"%s\"�型修正�を指定����ん"
 
-#: commands/constraint.c:80 utils/adt/ri_triggers.c:3029
+#: parser/parse_type.c:287
 #, c-format
-msgid "function \"%s\" must be fired for INSERT or UPDATE"
-msgstr "関数\"%s\"をINSERT���UPDATE�発行���れ��り��ん"
+msgid "type modifier is not allowed for type \"%s\""
+msgstr "型\"%s\"��型修正��許�れ��ん"
 
-#: commands/analyze.c:165
-#, c-format
-msgid "skipping \"%s\" --- only superuser can analyze it"
-msgstr "\"%s\" をスキップ����� --- スーパーユーザ���解�����"
+#: parser/parse_type.c:330
+msgid "type modifiers must be simple constants or identifiers"
+msgstr "型修正���純�定数���識別����れ��り��ん"
 
-#: commands/analyze.c:169
+#: parser/parse_type.c:641 parser/parse_type.c:740
 #, c-format
-msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
-msgstr ""
-"\"%s\" をスキップ����� --- スーパーユーザ���データベース�所有者��"
-"�解�����"
+msgid "invalid type name \"%s\""
+msgstr "型���\"%s\"�無効��"
 
-#: commands/analyze.c:173
-#, c-format
-msgid "skipping \"%s\" --- only table or database owner can analyze it"
-msgstr ""
-"\"%s\" をスキップ����� --- テーブル���データベース�所有者���解�"
-"����"
+#: replication/syncrep.c:214
+#, 
+msgid ""
+"canceling the wait for synchronous replication and terminating connection "
+"due to administrator command"
+msgstr "管�者コマンド�より�期レプリケーション�待�状態をキャンセル��"
+"接続を終了�����"
 
-#: commands/analyze.c:189
-#, c-format
+#: replication/syncrep.c:215 replication/syncrep.c:232
 msgid ""
-"skipping \"%s\" --- cannot analyze indexes, views, or special system tables"
+"The transaction has already committed locally, but may not have been "
+"replicated to the standby."
+msgstr "トランザクション�ローカル�����コミット済�����"
+"スタン�イ���レプリケーション�れ�����能性��り��。"
+
+#: replication/syncrep.c:231
+#, 
+msgid "canceling wait for synchronous replication due to user request"
 msgstr ""
-"\"%s\" をスキップ����� --- インデックス�ビュー�特殊�システムテーブル"
-"を解��る�������ん"
+"ユーザ�ら��求�より�期レプリケーション�待�状態をキャンセル�����"
 
-#: commands/analyze.c:282
-msgid "analyzing \"%s.%s\" inheritance tree"
-msgstr "\"%s.%s\"継承ツリーを解������"
+#: replication/syncrep.c:357
+#, c-format
+msgid "standby \"%s\" now has synchronous standby priority %u"
+msgstr "スタン�イ� \"%s\" ��優先度 %u ��期スタン�イ�設定�れ����"
 
-#: commands/analyze.c:287
+#: replication/syncrep.c:450
 #, c-format
-msgid "analyzing \"%s.%s\""
-msgstr "\"%s.%s\"を解������"
+msgid "standby \"%s\" is now the synchronous standby with priority %u"
+msgstr "スタン�イ� \"%s\" ��優先度 %u ��期スタン�イ�設定�れ����"
 
-#: commands/analyze.c:621
+#: replication/syncrep.c:657 catalog/namespace.c:3516 utils/misc/guc.c:8151
+#: commands/variable.c:59 commands/tablespace.c:1121
+msgid "List syntax is invalid."
+msgstr "リスト�文法�無効��"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:101
 #, c-format
-msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
-msgstr "テーブル\"%s.%s.%s�自動解�。システム使用状�: %s\""
+msgid "could not connect to the primary server: %s"
+msgstr "プライマリサー���接続�����ん���：%s"
 
-#: commands/analyze.c:1220
+#: replication/libpqwalreceiver/libpqwalreceiver.c:113
 #, c-format
 msgid ""
-"\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
-"rows; %d rows in sample, %.0f estimated total rows"
+"could not receive database system identifier and timeline ID from the "
+"primary server: %s"
 msgstr ""
-"\"%1$s\": %3$uページ�内%2$dをスキャン。%4$.0f�有効�行�%5$.0f����行を"
-"�有。%6$d行をサンプリング。推定�行数�%7$.0f"
+"プライマリサー��らデータベースシステム�識別��タイムライン ID を�信��"
+"��ん���：%s"
 
-#: commands/prepare.c:70
-msgid "invalid statement name: must not be empty"
-msgstr "文����無効��: 空������ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:124
+msgid "invalid response from primary server"
+msgstr "プライマリサー��ら�応答�無効��"
 
-#: commands/prepare.c:139
-msgid "utility statements cannot be prepared"
-msgstr "ユーティリティ文を準備����ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:125
+#, c-format
+msgid "Expected 1 tuple with 3 fields, got %d tuples with %d fields."
+msgstr ""
+"３個�フィールドを��１個�タプルを期待��������%2$d 個�フィールドを"
+"�� %1$d 個�タプルを�信����。"
 
-#: commands/prepare.c:239 commands/prepare.c:246 commands/prepare.c:702
-msgid "prepared statement is not a SELECT"
-msgstr "準備�れ�文�SELECT���り��ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:140
+msgid "database system identifier differs between the primary and standby"
+msgstr ""
+"データベースシステム�識別��プライマリサー��スタン�イサー�間�異�り�"
+"�"
 
-#: commands/prepare.c:313
+#: replication/libpqwalreceiver/libpqwalreceiver.c:141
 #, c-format
-msgid "wrong number of parameters for prepared statement \"%s\""
-msgstr "準備�れ�文\"%s\"�パラメータ数�間������"
+msgid "The primary's identifier is %s, the standby's identifier is %s."
+msgstr "プライマリ��識別�� %s ����スタン�イ��識別�� %s ��。"
 
-#: commands/prepare.c:315
+#: replication/libpqwalreceiver/libpqwalreceiver.c:153
 #, c-format
-msgid "Expected %d parameters but got %d."
-msgstr "%dパラメータを想定������%dパラメータ���"
+msgid "timeline %u of the primary does not match recovery target timeline %u"
+msgstr ""
+"プライマリ�タイムライン %u ��リカ�リターゲット�タイムライン %u �一致�"
+"��ん"
 
-#: commands/prepare.c:344
-msgid "cannot use subquery in EXECUTE parameter"
-msgstr "EXECUTE�パラメータ�副�����を使用����ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:165
+#, c-format
+msgid "could not start WAL streaming: %s"
+msgstr "WAL ストリーミングを開始����ん���: %s"
 
-#: commands/prepare.c:348
-msgid "cannot use aggregate function in EXECUTE parameter"
-msgstr "EXECUTE�パラメータ�集約関数を使用����ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:171
+msgid "streaming replication successfully connected to primary"
+msgstr "ストリーミングレプリケーション�プライマリ�無事接続�����"
 
-#: commands/prepare.c:352
-msgid "cannot use window function in EXECUTE parameter"
-msgstr "EXECUTE �パラメータ��ウィンドウ関数を使用����ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:193
+msgid "socket not open"
+msgstr "ソケット�オープン�れ����ん"
 
-#: commands/prepare.c:365
+#: replication/libpqwalreceiver/libpqwalreceiver.c:233 port/unix_latch.c:269
+#: port/pg_latch.c:269
 #, c-format
-msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
-msgstr "パラメータ$%d�型%sを想定���る型%s�強制�る�������ん"
+msgid "select() failed: %m"
+msgstr "select() �失敗����: %m"
 
-#: commands/prepare.c:463
+#: replication/libpqwalreceiver/libpqwalreceiver.c:367
+#: replication/libpqwalreceiver/libpqwalreceiver.c:388
+#: replication/libpqwalreceiver/libpqwalreceiver.c:393
 #, c-format
-msgid "prepared statement \"%s\" already exists"
-msgstr "準備�れ�文\"%s\"����存在���"
+msgid "could not receive data from WAL stream: %s"
+msgstr "WAL ストリーム�らデータを�信����ん���: %s"
 
-#: commands/prepare.c:521
-#, c-format
-msgid "prepared statement \"%s\" does not exist"
-msgstr "準備�れ�文\"%s\"�存在���ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:384
+msgid "replication terminated by primary server"
+msgstr "プライマリサー��よりレプリケーション�打�切られ���"
 
-#: commands/prepare.c:751 utils/mmgr/portalmem.c:930 foreign/foreign.c:276
-msgid "materialize mode required, but it is not allowed in this context"
-msgstr "実体化モード��求�れ�������文脈��許�れ��ん"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:415
+#, c-format
+msgid "could not send data to WAL stream: %s"
+msgstr "WAL ストリーム�データを�信����ん���: %s"
 
-#: optimizer/prep/prepunion.c:374
-msgid "could not implement recursive UNION"
-msgstr "�帰 UNION を実装����ん���"
+#: repl_scanner.l:76
+#, 
+msgid "invalid streaming start location"
+msgstr "ストリーミング�開始�置�無効��"
 
-#: optimizer/prep/prepunion.c:375
-msgid "All column datatypes must be hashable."
-msgstr "����カラム�データ型��ッシュ�能���れ��り��ん"
+#: repl_scanner.l:107
+#, c-format
+msgid "syntax error: unexpected character \"%s\""
+msgstr "構文エラー。予期���文字 \"%s\""
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:768
+#: replication/basebackup.c:122
 #, c-format
-msgid "could not implement %s"
-msgstr "%s を実装����ん���"
+msgid "unable to read symbolic link %s: %m"
+msgstr "シンボリックリンク \"%s\" を読�込���ん���: %m"
 
-#: optimizer/prep/prepunion.c:769 optimizer/plan/planner.c:2221
-#: optimizer/plan/planner.c:2390
-msgid ""
-"Some of the datatypes only support hashing, while others only support "
-"sorting."
+#: replication/basebackup.c:231 replication/basebackup.c:743
+msgid "base backup could not send data, aborting backup"
 msgstr ""
-"�ッシュ��をサ�ート�るデータ型も�れ��ソート��をサ�ート�るも�も�"
-"り��"
+"ベース�ックアップ�データを�信����ん���。�ックアップを中止�����"
 
-#: optimizer/util/clauses.c:3990
+#: replication/basebackup.c:278 replication/basebackup.c:287
+#: replication/basebackup.c:296 replication/basebackup.c:305
+#: replication/basebackup.c:314
 #, c-format
-msgid "SQL function \"%s\" during inlining"
-msgstr "SQL関数\"%s\"�インライン�������"
+msgid "duplicate option \"%s\""
+msgstr "\"%s\" オプション��複�����"
 
-#: optimizer/plan/initsplan.c:574
-msgid ""
-"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
-"join"
+#: replication/basebackup.c:366
+#, c-format
+msgid "unable to open directory pg_tblspc: %m"
+msgstr "ディレクトリ pg_tblspc をオープン����ん: %m"
+
+#: replication/basebackup.c:576
+msgid "shutdown requested, aborting active base backup"
 msgstr ""
-"外部���NULL��る�能性��る方��SELECT FOR UPDATE/SHAREを�用����ん"
+"シャットダウン��求���れ����動作中�ベース�ックアップを中止�����"
 
-#: optimizer/plan/planner.c:946 parser/analyze.c:1196 parser/analyze.c:1384
-#: parser/analyze.c:2026
-msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
-msgstr "UNION/INTERSECT/EXCEPT��SELECT FOR UPDATE/SHAREを使用����ん"
+#: replication/basebackup.c:589
+#, c-format
+msgid "could not stat file or directory \"%s\": %m"
+msgstr ""
+"\"%s\"���ファイル���ディレクトリ�情報を�得����ん���。: %m"
 
-#: optimizer/plan/planner.c:2220
-msgid "could not implement GROUP BY"
-msgstr "GROUP BY を実装����ん���"
+#: replication/basebackup.c:631
+#, c-format
+msgid "could not read symbolic link \"%s\": %m"
+msgstr "シンボリックリンク \"%s\" を読�込���ん���: %m"
 
-#: optimizer/plan/planner.c:2389
-msgid "could not implement DISTINCT"
-msgstr "DISTINCT を実装����ん���"
+#: replication/basebackup.c:660
+#, c-format
+msgid "skipping special file \"%s\""
+msgstr "スペシャルファイル \"%s\" をスキップ�����"
 
-#: optimizer/plan/planner.c:2833
-msgid "could not implement window PARTITION BY"
-msgstr "ウィンドウ� PARTITION BY を実装����ん���"
+#: replication/basebackup.c:733
+#, c-format
+msgid "archive member \"%s\" too large for tar format"
+msgstr "アーカイブメン� \"%s\" � tar 形�����大�����"
 
-#: optimizer/plan/planner.c:2834
-msgid "Window partitioning columns must be of sortable datatypes."
-msgstr ""
-"ウィンドウ・パーティショニング�るカラム��ソート�能�データ型���れ��"
-"り��ん"
+#: replication/walsender.c:141
+msgid "recovery is still in progress, can't accept WAL streaming connections"
+msgstr "リカ�リ���実行中����WAL ストリーミング接続を��付�られ��ん"
 
-#: optimizer/plan/planner.c:2838
-msgid "could not implement window ORDER BY"
-msgstr "ウィンドウ� ORDER BY を実装����ん���"
+#: replication/walsender.c:261 replication/walsender.c:489
+#: replication/walsender.c:547
+msgid "unexpected EOF on standby connection"
+msgstr "スタン�イ接続�想定外�EOF��り���"
 
-#: optimizer/plan/planner.c:2839
-msgid "Window ordering columns must be of sortable datatypes."
-msgstr ""
-"ウィンドウ�順�付�を�るカラム��ソート�能�データ型���れ��り��ん"
-
-#: catalog/heap.c:257
+#: replication/walsender.c:267
 #, c-format
-msgid "permission denied to create \"%s.%s\""
-msgstr "\"%s.%s\"を作��る権���り��ん"
+msgid "invalid standby handshake message type %d"
+msgstr "スタン�イ�ンドシェイクメッセージ�タイプ %d �無効��"
 
-#: catalog/heap.c:259
-msgid "System catalog modifications are currently disallowed."
-msgstr "�時点��システムカタログ�変更����ん"
+#: replication/walsender.c:379
+msgid "standby connections not allowed because wal_level=minimal"
+msgstr "wal_level=minimal ����スタン�イ接続�����ん"
 
-#: catalog/heap.c:397
+#: replication/walsender.c:461
 #, c-format
-msgid "column name \"%s\" conflicts with a system column name"
-msgstr "列�\"%s\"�システム用�列��競����"
+msgid "invalid standby query string: %s"
+msgstr "スタン�イクエリ文字列�無効��：%s"
 
-#: catalog/heap.c:413
+#: replication/walsender.c:518
 #, c-format
-msgid "column name \"%s\" specified more than once"
-msgstr "列�\"%s\"�複数指定�れ���"
+msgid "invalid standby message type %d"
+msgstr "スタン�イ�メッセージタイプ %d �無効��"
 
-#: catalog/heap.c:451
+#: replication/walsender.c:569
 #, c-format
-msgid "column \"%s\" has type \"unknown\""
-msgstr "列\"%s\"�\"unknown\"型��"
+msgid "unexpected message type %c"
+msgstr "想定���メッセージタイプ %c "
 
-#: catalog/heap.c:452
-msgid "Proceeding with relation creation anyway."
-msgstr "�り���リレーション�作�を進���"
+#: replication/walsender.c:822
+#, 
+msgid "terminating walsender process due to replication timeout"
+msgstr "レプリケーションタイムアウト�より WAL �信プロセスを終了�����"
 
-#: catalog/heap.c:465
+#: replication/walsender.c:838
 #, c-format
-msgid "column \"%s\" has pseudo-type %s"
-msgstr "列\"%s\"�仮想型%s��"
+msgid "standby \"%s\" has now caught up with primary"
+msgstr "スタン�イ� \"%s\" �プライマリ�昇格����"
 
-#: catalog/heap.c:944
+#: replication/walsender.c:907
+#, c-format
 msgid ""
-"A relation has an associated type of the same name, so you must use a name "
-"that doesn't conflict with any existing type."
-msgstr ""
-"リレーション������関連�る型を����。����既存�型�競�����"
-"�を使用���れ��り��ん"
+"number of requested standby connections exceeds max_wal_senders (currently %"
+"d)"
+msgstr "�求�れ�スタン�イ接続� max_wal_senders を超�����（�在� %d）"
 
-#: catalog/heap.c:1540
+#: replication/walsender.c:985 replication/walsender.c:1047
 #, c-format
-msgid ""
-"cannot drop \"%s\" because it is being used by active queries in this session"
+msgid "requested WAL segment %s has already been removed"
+msgstr "�求�れ� WAL セグメント %s ����削除�れ����"
+
+#: replication/walsender.c:1018
+#, c-format
+msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
 msgstr ""
-"��セッション�実行中�クエリー�使用�れ��る�� \"%s\" を削除����ん"
+"ログファイル %u をセグメント %u�オフセット %u�長� %lu �読�込���ん��"
+"�: %m"
+
+#: replication/walsender.c:1391 utils/mmgr/portalmem.c:950
+#: foreign/foreign.c:355 commands/prepare.c:755 commands/extension.c:1683
+#: commands/extension.c:1792 commands/extension.c:1985
+msgid "materialize mode required, but it is not allowed in this context"
+msgstr "実体化モード��求�れ�������文脈��許�れ��ん"
+
+#: repl_gram.c:494 bootparse.c:645
+msgid "syntax error: cannot back up"
+msgstr "構文エラー：�ックアップ����ん"
+
+#: repl_gram.c:1221 bootparse.c:1601
+msgid "syntax error; also virtual memory exhausted"
+msgstr "構文エラー：�ら�仮想メモリーオー�ー"
+
+#: repl_gram.c:1339 bootparse.c:1719
+msgid "parser stack overflow"
+msgstr "パーサースタックオー�ーフロー"
+
+#: replication/walreceiver.c:150
+msgid "terminating walreceiver process due to administrator command"
+msgstr "管�者コマンド�より WAL �信プロセスを終了�����"
+
+#: replication/walreceiver.c:299
+msgid "cannot continue WAL streaming, recovery has already ended"
+msgstr "WAL ストリーミングを継続����ん。リカ�リ����終������。"
 
-#: catalog/heap.c:1991
+#: libpq/auth.c:257
 #, c-format
-msgid "check constraint \"%s\" already exists"
-msgstr "�ェック制約\"%s\"����存在���"
+msgid "authentication failed for user \"%s\": host rejected"
+msgstr "ユーザ\"%s\"��証�失敗����: ホストを拒絶����"
 
-#: catalog/heap.c:2139
+#: libpq/auth.c:260
 #, c-format
-msgid "merging constraint \"%s\" with inherited definition"
-msgstr "継承�れ�定義�より制約 \"%s\" をマージ�����"
+msgid "Kerberos 5 authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�Kerberos 5�証�失敗����"
 
-#: catalog/heap.c:2237
-msgid "cannot use column references in default expression"
-msgstr "デフォルト���列�照を使用����ん"
+#: libpq/auth.c:263
+#, c-format
+msgid "\"trust\" authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�\"trust\"�証�失敗����"
 
-#: catalog/heap.c:2245
-msgid "default expression must not return a set"
-msgstr "デフォルト��集�を返����り��ん"
+#: libpq/auth.c:266
+#, c-format
+msgid "Ident authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�Ident�証�失敗����"
 
-#: catalog/heap.c:2253
-msgid "cannot use subquery in default expression"
-msgstr "デフォルト���副�����を使用����ん"
+#: libpq/auth.c:269
+#, c-format
+msgid "Peer authentication failed for user \"%s\""
+msgstr "ユーザ \"%s\" �対�(peer)�証�失敗����"
 
-#: catalog/heap.c:2257
-msgid "cannot use aggregate function in default expression"
-msgstr "デフォルト���集約関数を使用����ん"
+#: libpq/auth.c:273
+#, c-format
+msgid "password authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�パスワード�証�失敗����"
 
-#: catalog/heap.c:2261
-msgid "cannot use window function in default expression"
-msgstr "デフォルト���ウィンドウ関数を使用����ん"
+#: libpq/auth.c:278
+#, c-format
+msgid "GSSAPI authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�GSSAPI�証�失敗����"
 
-#: catalog/heap.c:2321
+#: libpq/auth.c:281
 #, c-format
-msgid "only table \"%s\" can be referenced in check constraint"
-msgstr "検査制約��テーブル\"%s\"��を�照�る�������"
+msgid "SSPI authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�SSPI�証�失敗����"
 
-#: catalog/heap.c:2577
-msgid "unsupported ON COMMIT and foreign key combination"
-msgstr "ON COMMIT�外部キー�組�����サ�ート�れ����ん"
+#: libpq/auth.c:284
+#, c-format
+msgid "PAM authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�PAM�証�失敗����"
 
-#: catalog/heap.c:2578
+#: libpq/auth.c:287
 #, c-format
-msgid ""
-"Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
-"setting."
-msgstr ""
-"テーブル\"%s\"�\"%s\"を�照���。�����れら�ON COMMIT設定��一���"
-"り��ん。"
+msgid "LDAP authentication failed for user \"%s\""
+msgstr "ユーザ\"%s\"�LDAP�証�失敗����"
 
-#: catalog/heap.c:2583
-msgid "cannot truncate a table referenced in a foreign key constraint"
-msgstr "外部キー制約��照�れ��るテーブルを削除����ん"
+#: libpq/auth.c:290
+#, c-format
+msgid "certificate authentication failed for user \"%s\""
+msgstr "ユーザ \"%s\" �証明書�証�失敗����"
 
-#: catalog/heap.c:2584
+#: libpq/auth.c:293
 #, c-format
-msgid "Table \"%s\" references \"%s\"."
-msgstr "テーブル\"%s\"�\"%s\"を�照���。"
+msgid "RADIUS authentication failed for user \"%s\""
+msgstr "ユーザ \"%s\" � RADIUS �証�失敗����"
 
-#: catalog/heap.c:2586
+#: libpq/auth.c:296
 #, c-format
-msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
-msgstr ""
-"�時�テーブル\"%s\"�truncate�れ���。TRUNCATE ... CASCADEを使用����"
-"��。"
+msgid "authentication failed for user \"%s\": invalid authentication method"
+msgstr "ユーザ\"%s\"��証�失敗����: �証方��無効��"
 
-#: catalog/pg_aggregate.c:100
-msgid "cannot determine transition data type"
-msgstr "�移用�データ型を決定����ん"
+#: libpq/auth.c:325
+msgid "missing or erroneous pg_hba.conf file"
+msgstr "pg_hba.confファイル�存在��������pg_hba.confファイル�エラー"
 
-#: catalog/pg_aggregate.c:101
-msgid ""
-"An aggregate using a polymorphic transition type must have at least one "
-"polymorphic argument."
-msgstr ""
-"�移用�型���多様型を使用�る集約�多様型�引数を少���も1��ら��れ�"
-"�り��ん。"
+#: libpq/auth.c:326
+msgid "See server log for details."
+msgstr "詳細�サー�ログを�照������"
 
-#: catalog/pg_aggregate.c:124
-#, c-format
-msgid "return type of transition function %s is not %s"
-msgstr "�移関数�戻り値型%s�%s���り��ん"
+#: libpq/auth.c:356
+msgid "connection requires a valid client certificate"
+msgstr "��接続��有効�クライアント証明�必���"
 
-#: catalog/pg_aggregate.c:144
-msgid ""
-"must not omit initial value when transition function is strict and "
-"transition type is not compatible with input type"
-msgstr ""
-"�移関数�STRICT���移用�型�入力型��イナリ互����場��期値を�略�"
-"���り��ん"
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:453 libpq/auth.c:469
+msgid "SSL on"
+msgstr "SSL有効"
 
-#: catalog/pg_aggregate.c:175 catalog/pg_proc.c:204
-msgid "cannot determine result data type"
-msgstr "�果�データ型を決定����ん"
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:453 libpq/auth.c:469
+msgid "SSL off"
+msgstr "SSL無効"
 
-#: catalog/pg_aggregate.c:176
+#: libpq/auth.c:398
+#, c-format
 msgid ""
-"An aggregate returning a polymorphic type must have at least one polymorphic "
-"argument."
+"pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr ""
-"多様型を返�集約�少���も1��多様型�引数を�ら��れ��り��ん。"
+"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\", %s 用�レプリケーション接続"
+"を拒�����"
 
-#: catalog/pg_aggregate.c:188 catalog/pg_proc.c:210
-msgid "unsafe use of pseudo-type \"internal\""
-msgstr "\"internal\"仮想型��険�使用"
+#: libpq/auth.c:404
+#, c-format
+msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
+msgstr ""
+"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\"用�レプリケーション接続を拒"
+"�����"
 
-#: catalog/pg_aggregate.c:189 catalog/pg_proc.c:211
+#: libpq/auth.c:413
+#, c-format
 msgid ""
-"A function returning \"internal\" must have at least one \"internal\" "
-"argument."
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
+"\", %s"
 msgstr ""
-"\"internal\"\"を返�関数�少���も1��\"internal\"型�引数を�ら��れ��"
-"り��ん。"
-
-#: catalog/pg_aggregate.c:197
-msgid "sort operator can only be specified for single-argument aggregates"
-msgstr "ソート演算���一引数�集約���指定�能��"
+"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\"�データベース \"%s\", %s"
+"�接続を拒�����"
 
-#: catalog/pg_aggregate.c:337
+#: libpq/auth.c:420
 #, c-format
-msgid "function %s returns a set"
-msgstr "関数%s�集�を返���"
+msgid ""
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
+msgstr ""
+"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\"�データベース \"%s\" 用�レ"
+"プリケーション接続を拒�����"
 
-#: catalog/pg_aggregate.c:362
+#: libpq/auth.c:451
 #, c-format
-msgid "function %s requires run-time type coercion"
-msgstr "関数%s�実行時�型強制�必���"
+msgid ""
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
+"\", %s"
+msgstr "pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\", %s用�エントリ��り��ん"
 
-#: catalog/pg_conversion.c:66
+#: libpq/auth.c:457
 #, c-format
-msgid "conversion \"%s\" already exists"
-msgstr "変�\"%s\"����存在���"
+msgid ""
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
+msgstr "pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\"用�エントリ��り��ん"
 
-#: catalog/pg_conversion.c:79
+#: libpq/auth.c:466
 #, c-format
-msgid "default conversion for %s to %s already exists"
-msgstr "%s�ら%s��デフォルト�変�����存在���"
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
+msgstr ""
+"pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\"�データベース\"%s, %s用�エントリ�"
+"�り��ん"
 
-#: catalog/pg_operator.c:220 catalog/pg_operator.c:358
+#: libpq/auth.c:473
 #, c-format
-msgid "\"%s\" is not a valid operator name"
-msgstr "\"%s\"�有効�演算�����り��ん"
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
+msgstr ""
+"pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\"�データベース\"%s用�エントリ��り"
+"��ん"
 
-#: catalog/pg_operator.c:367
-msgid "only binary operators can have commutators"
-msgstr "二項演算����交代演算�を���������"
+#: libpq/auth.c:524 libpq/hba.c:1118
+msgid ""
+"MD5 authentication is not supported when \"db_user_namespace\" is enabled"
+msgstr "\"db_user_namespace\" �有効�場��MD5 �証�サ�ート�れ��ん"
 
-#: catalog/pg_operator.c:371
-msgid "only binary operators can have join selectivity"
-msgstr "二項演算�������択性を���������"
+#: libpq/auth.c:648
+#, c-format
+msgid "expected password response, got message type %d"
+msgstr "パスワード応答を想定������メッセージ種類%dを���り���"
 
-#: catalog/pg_operator.c:375
-msgid "only binary operators can merge join"
-msgstr "二項演算����マージ���能��"
+#: libpq/auth.c:676
+msgid "invalid password packet size"
+msgstr "パスワードパケット�サイズ�無効��"
 
-#: catalog/pg_operator.c:379
-msgid "only binary operators can hash"
-msgstr "二項演算�����ッシュ�能��"
+#: libpq/auth.c:680
+msgid "received password packet"
+msgstr "パスワードパケットを���り���"
 
-#: catalog/pg_operator.c:390
-msgid "only boolean operators can have negators"
-msgstr "ブール型演算�����定演算�を���������"
+#: libpq/auth.c:738
+#, c-format
+msgid "Kerberos initialization returned error %d"
+msgstr "Kerberos��期化��エラー%d�返�れ���"
 
-#: catalog/pg_operator.c:394
-msgid "only boolean operators can have restriction selectivity"
-msgstr "ブール型演算����制��択性を���������"
+#: libpq/auth.c:748
+#, c-format
+msgid "Kerberos keytab resolving returned error %d"
+msgstr "Kerberos�keytab解決��エラー%d�返�れ���"
 
-#: catalog/pg_operator.c:398
-msgid "only boolean operators can have join selectivity"
-msgstr "ブール型演算�������択性を���������"
+#: libpq/auth.c:772
+#, c-format
+msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
+msgstr "Kerberos�sname_to_principal(\"%s\", \"%s\")��エラー%d�返�れ���"
 
-#: catalog/pg_operator.c:402
-msgid "only boolean operators can merge join"
-msgstr "ブール型演算����マージ���能��"
+#: libpq/auth.c:817
+#, c-format
+msgid "Kerberos recvauth returned error %d"
+msgstr "Kerberos�recvauth��エラー%d�返�れ���"
 
-#: catalog/pg_operator.c:406
-msgid "only boolean operators can hash"
-msgstr "ブール型演算�����ッシュ�能��"
+#: libpq/auth.c:840
+#, c-format
+msgid "Kerberos unparse_name returned error %d"
+msgstr "Kerberos�unparse_name��エラー%d�返�れ���"
 
-#: catalog/pg_operator.c:418
+#: libpq/auth.c:962
 #, c-format
-msgid "operator %s already exists"
-msgstr "演算�%s����存在���"
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: catalog/pg_operator.c:607
-msgid "operator cannot be its own negator or sort operator"
-msgstr "演算��自身��定�やソート演算���る�������ん"
+#: libpq/auth.c:988
+msgid "GSSAPI is not supported in protocol version 2"
+msgstr "プロトコル�ージョン 2 �� GSSAPI �サ�ート�れ����ん"
 
-#: catalog/namespace.c:250 catalog/namespace.c:317
-msgid "temporary tables cannot specify a schema name"
-msgstr "一時テーブル��スキーマ�を指定����ん"
+#: libpq/auth.c:1007 libpq/auth.c:1361 libpq/auth.c:1429 libpq/auth.c:1831
+#: postmaster/postmaster.c:2003 postmaster/postmaster.c:2034
+#: postmaster/postmaster.c:3231 postmaster/postmaster.c:3915
+#: postmaster/postmaster.c:3996 postmaster/postmaster.c:4610
+#: storage/buffer/buf_init.c:154 storage/buffer/localbuf.c:350
+#: storage/file/fd.c:359 storage/file/fd.c:742 storage/file/fd.c:860
+#: storage/ipc/procarray.c:784 storage/ipc/procarray.c:1183
+#: storage/ipc/procarray.c:1190 storage/ipc/procarray.c:1425
+#: storage/ipc/procarray.c:1819 utils/fmgr/dfmgr.c:224 utils/mmgr/aset.c:416
+#: utils/mmgr/aset.c:587 utils/mmgr/aset.c:765 utils/mmgr/aset.c:966
+#: utils/adt/formatting.c:1529 utils/adt/formatting.c:1650
+#: utils/adt/formatting.c:1783 utils/adt/regexp.c:210 utils/adt/varlena.c:3474
+#: utils/adt/varlena.c:3495 utils/init/miscinit.c:150
+#: utils/init/miscinit.c:171 utils/init/miscinit.c:181
+#: utils/hash/dynahash.c:364 utils/hash/dynahash.c:436
+#: utils/hash/dynahash.c:932 utils/mb/mbutils.c:374 utils/mb/mbutils.c:675
+#: utils/misc/tzparser.c:455 utils/misc/guc.c:3296 utils/misc/guc.c:3309
+#: utils/misc/guc.c:3322 commands/sequence.c:1017 lib/stringinfo.c:266
+msgid "out of memory"
+msgstr "メモリ�足��"
 
-#: catalog/namespace.c:358 catalog/namespace.c:2410
-msgid "no schema has been selected to create in"
-msgstr "作�先�スキーマ��択�れ����ん"
-
-#: catalog/namespace.c:2231 parser/parse_target.c:998 parser/parse_expr.c:773
+#: libpq/auth.c:1043
 #, c-format
-msgid "cross-database references are not implemented: %s"
-msgstr "データベース間��照�実装�れ����ん: %s"
+msgid "expected GSS response, got message type %d"
+msgstr "GSS応答を想定������メッセージタイプ %d を���り���"
 
-#: catalog/namespace.c:2237 gram.y:3671 gram.y:10604
-#: parser/parse_target.c:1005 parser/parse_expr.c:780
-#, c-format
-msgid "improper qualified name (too many dotted names): %s"
-msgstr "修飾����切��(ドット付�����多����): %s"
+#: libpq/auth.c:1106
+msgid "accepting GSS security context failed"
+msgstr "GSSセキュリティコンテキスト��付�失敗����"
 
-#: catalog/namespace.c:2442
-#, c-format
-msgid "improper relation name (too many dotted names): %s"
-msgstr "リレーション����切��(ドット付�����多����): %s"
+#: libpq/auth.c:1132
+msgid "retrieving GSS user name failed"
+msgstr "GSSユーザ���信�失敗����"
 
-#: catalog/namespace.c:3016
+#: libpq/auth.c:1205
 #, c-format
-msgid "permission denied to create temporary tables in database \"%s\""
-msgstr "データベース\"%s\"�一時テーブルを作��る権���り��ん"
+msgid "SSPI error %x"
+msgstr "SSPIエラー��: %x"
 
-#: catalog/namespace.c:3032
-msgid "cannot create temporary tables during recovery"
-msgstr "リカ�リ中�一時テーブルを作�����ん"
+#: libpq/auth.c:1209
+#, c-format
+msgid "%s (%x)"
+msgstr "%s (%x)"
 
-#: catalog/toasting.c:141
-msgid "shared tables cannot be toasted after initdb"
-msgstr "initdb�後�共有テーブルをTOAST化����ん"
+#: libpq/auth.c:1249
+msgid "SSPI is not supported in protocol version 2"
+msgstr "プロトコル�ージョン 2 �� SSPI �サ�ート�れ����ん"
 
-#: catalog/pg_enum.c:70
-msgid "EnumValuesCreate() can only set a single OID"
-msgstr "EnumValuesCreate() ��独� OID ��をセット����"
+#: libpq/auth.c:1264
+msgid "could not acquire SSPI credentials"
+msgstr "SSPI�資格�ンドルを入手����ん���"
 
-#: catalog/pg_enum.c:110
+#: libpq/auth.c:1281
 #, c-format
-msgid "invalid enum label \"%s\""
-msgstr "列挙ラベル\"%s\"�無効��"
+msgid "expected SSPI response, got message type %d"
+msgstr "SSPI応答を想定������メッセージ種類%dを���り���"
 
-#: catalog/pg_enum.c:111
-#, c-format
-msgid "Labels must be %d characters or less."
-msgstr "ラベル�%d文字数以内���れ��り��ん"
+#: libpq/auth.c:1353
+msgid "could not accept SSPI security context"
+msgstr "SSPIセキュリティコンテキストを��付�られ��ん���"
 
-#: catalog/pg_type.c:231
-#, c-format
-msgid "invalid type internal size %d"
-msgstr "型�内部サイズ%d�無効��"
+#: libpq/auth.c:1409
+msgid "could not get token from SSPI security context"
+msgstr "SSPIセキュリティコンテキスト�らトークンを入手����ん���"
 
-#: catalog/pg_type.c:247 catalog/pg_type.c:255 catalog/pg_type.c:263
-#: catalog/pg_type.c:272
+#: libpq/auth.c:1653
 #, c-format
-msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
-msgstr "値渡�型�サイズ� %2$d �場��アラインメント \"%1$c\" �無効��"
+msgid "could not create socket for Ident connection: %m"
+msgstr "Ident接続用�ソケットを作�����ん���: %m"
 
-#: catalog/pg_type.c:279
+#: libpq/auth.c:1668
 #, c-format
-msgid "internal size %d is invalid for passed-by-value type"
-msgstr "値渡�型�場��内部サイズ%d�無効��"
+msgid "could not bind to local address \"%s\": %m"
+msgstr "ローカルアドレス\"%s\"��インド����ん���: %m"
 
-#: catalog/pg_type.c:288 catalog/pg_type.c:294
+#: libpq/auth.c:1680
 #, c-format
-msgid "alignment \"%c\" is invalid for variable-length type"
-msgstr "�変長型�場��アラインメント \"%c\" �無効��"
-
-#: catalog/pg_type.c:302
-msgid "fixed-size types must have storage PLAIN"
-msgstr "固定長型�場�� PLAIN 格�方����れ��り��ん"
+msgid "could not connect to Ident server at address \"%s\", port %s: %m"
+msgstr "アドレス\"%s\"��ート%s�Identサー��接続����ん���: %m"
 
-#: catalog/pg_type.c:730
+#: libpq/auth.c:1700
 #, c-format
-msgid "could not form array type name for type \"%s\""
-msgstr "\"%s\"型����列型���を形�����ん���"
+msgid "could not send query to Ident server at address \"%s\", port %s: %m"
+msgstr ""
+"アドレス\"%s\"��ート%s�Identサー�������を�信����ん���: %m"
 
-#: catalog/pg_proc.c:123 parser/parse_func.c:1487 parser/parse_func.c:1527
+#: libpq/auth.c:1715
 #, c-format
-msgid "functions cannot have more than %d argument"
-msgid_plural "functions cannot have more than %d arguments"
-msgstr[0] "関数�%dを超�る引数を�る�������ん"
-msgstr[1] "関数�%dを超�る引数を�る�������ん"
-
-#: catalog/pg_proc.c:205
 msgid ""
-"A function returning a polymorphic type must have at least one polymorphic "
-"argument."
+"could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
-"多様型を返�関数�少���も1��多様型�引数を�ら��れ��り��ん。"
-
-#: catalog/pg_proc.c:223
-#, c-format
-msgid "\"%s\" is already an attribute of type %s"
-msgstr "\"%s\"����型%s�属性��"
+"アドレス\"%s\"��ート%s�Identサー��ら�応答を�信����ん���: %m"
 
-#: catalog/pg_proc.c:362
+#: libpq/auth.c:1725
 #, c-format
-msgid "function \"%s\" already exists with same argument types"
-msgstr "��引数型を��関数\"%s\"����存在���"
-
-#: catalog/pg_proc.c:376 catalog/pg_proc.c:398
-msgid "cannot change return type of existing function"
-msgstr "既存�関数�戻り値型を変更����ん"
-
-#: catalog/pg_proc.c:377 catalog/pg_proc.c:400 catalog/pg_proc.c:442
-#: catalog/pg_proc.c:465 catalog/pg_proc.c:491
-msgid "Use DROP FUNCTION first."
-msgstr "��DROP FUNCTIONを使用������。"
+msgid "invalidly formatted response from Ident server: \"%s\""
+msgstr "Identサー��ら�応答�書��無効��: \"%s\""
 
-#: catalog/pg_proc.c:399
-msgid "Row type defined by OUT parameters is different."
-msgstr "OUTパラメータ�定義�れ�行型�異�り��。"
+#: libpq/auth.c:1764
+#, 
+msgid "peer authentication is not supported on this platform"
+msgstr "��プラットフォーム��対�(peer)�証�サ�ート�れ����ん"
 
-#: catalog/pg_proc.c:440
+#: libpq/auth.c:1768
 #, c-format
-msgid "cannot change name of input parameter \"%s\""
-msgstr "入力パラメーター \"%s\" ��称を変更����ん"
+msgid "could not get peer credentials: %m"
+msgstr "ピア�資格証明を入手����ん���: %m"
 
-#: catalog/pg_proc.c:464
-msgid "cannot remove parameter defaults from existing function"
-msgstr "既存�関数�らパラメータ�デフォルト値を削除����ん"
+#: libpq/auth.c:1777
+#, c-format
+msgid "local user with ID %d does not exist"
+msgstr "ID %d�ローカルユーザ�存在���ん"
 
-#: catalog/pg_proc.c:490
-msgid "cannot change data type of existing parameter default value"
-msgstr "既存�パラメータ�デフォルト値�データ型を変更����ん"
+#: libpq/auth.c:1860 libpq/auth.c:2132 libpq/auth.c:2492
+msgid "empty password returned by client"
+msgstr "クライアント�ら空�パスワード�返�れ���"
 
-#: catalog/pg_proc.c:502
+#: libpq/auth.c:1870
 #, c-format
-msgid "function \"%s\" is an aggregate function"
-msgstr "関数 \"%s\" �集約関数��"
+msgid "error from underlying PAM layer: %s"
+msgstr "背後�PAM層�エラー��り���: %s"
 
-#: catalog/pg_proc.c:507
+#: libpq/auth.c:1939
 #, c-format
-msgid "function \"%s\" is not an aggregate function"
-msgstr "関数 \"%s\" �集約関数���り��ん"
+msgid "could not create PAM authenticator: %s"
+msgstr "PAM authenticatorを作�����ん���: %s"
 
-#: catalog/pg_proc.c:515
+#: libpq/auth.c:1950
 #, c-format
-msgid "function \"%s\" is a window function"
-msgstr "関数 \"%s\" �ウィンドウ関数��"
+msgid "pam_set_item(PAM_USER) failed: %s"
+msgstr "pam_set_item(PAM_USER)�失敗����: %s"
 
-#: catalog/pg_proc.c:520
+#: libpq/auth.c:1961
 #, c-format
-msgid "function \"%s\" is not a window function"
-msgstr "関数 \"%s\" �ウィンドウ関数���り��ん"
+msgid "pam_set_item(PAM_CONV) failed: %s"
+msgstr "\"pam_set_item(PAM_CONV)�失敗����: %s"
 
-#: catalog/pg_proc.c:688
+#: libpq/auth.c:1972
 #, c-format
-msgid "there is no built-in function named \"%s\""
-msgstr "\"%s\"������関数�組�込�れ����ん"
+msgid "pam_authenticate failed: %s"
+msgstr "\"pam_authenticate�失敗����: %s"
 
-#: catalog/pg_proc.c:780
+#: libpq/auth.c:1983
 #, c-format
-msgid "SQL functions cannot return type %s"
-msgstr "SQL関数�型%sを返��������ん"
+msgid "pam_acct_mgmt failed: %s"
+msgstr "pam_acct_mgmt�失敗����: %s"
 
-#: catalog/pg_proc.c:795
+#: libpq/auth.c:1994
 #, c-format
-msgid "SQL functions cannot have arguments of type %s"
-msgstr "SQL関数�型%s�引数��る�������ん"
+msgid "could not release PAM authenticator: %s"
+msgstr "PAM authenticatorを解放����ん���: %s"
 
-#: catalog/pg_constraint.c:767
+#: libpq/auth.c:2027 libpq/auth.c:2031
 #, c-format
-msgid "table \"%s\" has multiple constraints named \"%s\""
-msgstr "テーブル\"%s\"��複数�\"%s\"������制約��り��"
+msgid "could not initialize LDAP: error code %d"
+msgstr "LDAPを�期化����ん���: %d"
 
-#: catalog/pg_constraint.c:779
+#: libpq/auth.c:2041
 #, c-format
-msgid "constraint \"%s\" for table \"%s\" does not exist"
-msgstr "テーブル\"%2$s\"�制約\"%1$s\"�存在���ん"
-
-#: catalog/index.c:582
-msgid "user-defined indexes on system catalog tables are not supported"
-msgstr ""
-"ユーザ�よるシステムカタログテーブル�対�るインデックス�定義�サ�ート�れ"
-"����ん"
-
-#: catalog/index.c:592
-msgid "concurrent index creation on system catalog tables is not supported"
-msgstr "システムカタログテーブル��時インデックス作��サ�ート�れ����ん"
-
-#: catalog/index.c:610
-msgid "shared indexes cannot be created after initdb"
-msgstr "initdb�後�共有インデックスを作�����ん"
+msgid "could not set LDAP protocol version: error code %d"
+msgstr "LDAPプロトコル�ージョンを設定����ん���: エラーコード %d"
 
-#: catalog/index.c:2430
-msgid "cannot reindex temporary tables of other sessions"
-msgstr "他�セッション�一時テーブルを�インデックス付�����ん"
+#: libpq/auth.c:2070
+msgid "could not load wldap32.dll"
+msgstr "wldap32.dll�読�込������ん"
 
-#: catalog/catalog.c:75
-msgid "invalid fork name"
-msgstr "無効�分����"
+#: libpq/auth.c:2078
+msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
+msgstr "wldap32.dll�_ldap_start_tls_sA関数を読�込�����ん���"
 
-#: catalog/catalog.c:76
-msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
-msgstr "有効�分���\"main\"�\"fsm\"�よ�\"vm\" ��"
+#: libpq/auth.c:2079
+msgid "LDAP over SSL is not supported on this platform."
+msgstr "��プラットフォーム��LDAP over SSLをサ�ート�����ん。"
 
-#: catalog/pg_shdepend.c:560 catalog/dependency.c:734
+#: libpq/auth.c:2094
 #, c-format
-msgid "cannot drop %s because it is required by the database system"
-msgstr "データベースシステム�必�����る��%sを削除����ん"
+msgid "could not start LDAP TLS session: error code %d"
+msgstr "LDAP TLSセッションを開始����ん���: エラーコード %d"
 
-#: catalog/pg_shdepend.c:671 catalog/dependency.c:898
-#, c-format
-msgid ""
-"\n"
-"and %d other object (see server log for list)"
-msgid_plural ""
-"\n"
-"and %d other objects (see server log for list)"
-msgstr[0] ""
-"\n"
-"�よ�%d���他�オブジェクト(一覧�����サー�ログを�照������)"
-msgstr[1] ""
-"\n"
-"�よ�%d���他�オブジェクト(一覧�����サー�ログを�照������)"
+#: libpq/auth.c:2116
+msgid "LDAP server not specified"
+msgstr "LDAP サー�ー�指定��り��ん"
 
-#: catalog/pg_shdepend.c:678
+#: libpq/auth.c:2168
+msgid "invalid character in user name for LDAP authentication"
+msgstr "LDAP �証�ユーザー��中��正�文字��り��"
+
+#: libpq/auth.c:2183
 #, c-format
 msgid ""
-"\n"
-"and objects in %d other database (see server log for list)"
-msgid_plural ""
-"\n"
-"and objects in %d other databases (see server log for list)"
-msgstr[0] ""
-"\n"
-"�よ��他�%d�データベース内�オブジェクト(一覧�����サー�ログを�照�"
-"�����)"
-msgstr[1] ""
-"\n"
-"�よ��他�%d�データベース内�オブジェクト(一覧�����サー�ログを�照�"
-"�����)"
+"could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
+"error code %d"
+msgstr ""
+"サー�ー \"%2$s\" ��ldapbinddn \"%1$s\" �よる LDAP �インドを実行����"
+"ん���: エラーコード %3$d"
 
-#: catalog/pg_shdepend.c:990
+#: libpq/auth.c:2208
 #, c-format
-msgid "role %u was concurrently dropped"
-msgstr "ロール%u�削除��時�起����"
+msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
+msgstr ""
+"サー�ー \"%2$s\" ��フィルタ \"%1$s\" �よる LDAP 検索�����ん���: "
+"エラーコード %3$d"
 
-#: catalog/pg_shdepend.c:1009
+#: libpq/auth.c:2218
 #, c-format
-msgid "tablespace %u was concurrently dropped"
-msgstr "テーブル空間%u��時�削除�れ���"
+msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
+msgstr ""
+"サー�ー \"%2$s\" ��フィルタ \"%1$s\" �よる LDAP 検索�失敗����：��"
+"よ��ユーザー�見��り��ん"
 
-#: catalog/pg_shdepend.c:1024
+#: libpq/auth.c:2222
 #, c-format
-msgid "database %u was concurrently dropped"
-msgstr "データベース %u ��時�削除�れ���"
+msgid ""
+"LDAP search failed for filter \"%s\" on server \"%s\": user is not unique (%"
+"ld matches)"
+msgstr ""
+"サー� \"%2$s\" �フィルタ \"%1$s\" �よる LDAP 検索�失敗����：ユーザー"
+"�一����り��ん（%3$ld 個見��り���）"
 
-#: catalog/pg_shdepend.c:1068
+#: libpq/auth.c:2239
 #, c-format
-msgid "owner of %s"
-msgstr "%s�所有者"
+msgid ""
+"could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
+msgstr ""
+"サー� \"%2$s\" � \"%1$s\" �マッ��る最��エントリ� dn を�得����"
+"ん：%3$s"
 
-#: catalog/pg_shdepend.c:1070
+#: libpq/auth.c:2259
 #, c-format
-msgid "access to %s"
-msgstr "%s��アクセス"
+msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
+msgstr "サー�ー \"%s\" �ユーザー \"%s\" �検索後�unbind ����ん: %s"
 
-#. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1078
+#: libpq/auth.c:2296
 #, c-format
-msgid "%d object in %s"
-msgid_plural "%d objects in %s"
-msgstr[0] "%2$s内�%1$d個�オブジェクト"
-msgstr[1] "%2$s内�%1$d個�オブジェクト"
+msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
+msgstr ""
+"サー�\"%2$s\"�ユーザ\"%1$s\"�LDAPログイン�失敗����: エラーコード %3$d"
 
-#: catalog/pg_shdepend.c:1189 catalog/pg_shdepend.c:1285
+#: libpq/auth.c:2324
 #, c-format
 msgid ""
-"cannot drop objects owned by %s because they are required by the database "
-"system"
+"certificate authentication failed for user \"%s\": client certificate "
+"contains no user name"
 msgstr ""
-"データベースシステム�必�����る��%s�所有�るオブジェクトを削除���"
-"�ん"
+"ユーザ \"%s\" �証明書�証�失敗����：クライアント証明書�ユーザ����"
+"れ����ん"
 
-#: catalog/pg_depend.c:209
-#, c-format
-msgid "cannot remove dependency on %s because it is a system object"
-msgstr "システムオブジェクト��る���%s��存関係を削除����ん。"
-
-#: catalog/aclchk.c:196
-msgid "grant options can only be granted to roles"
-msgstr "グラントオプション�ロール���与�る�������"
+#: libpq/auth.c:2448
+msgid "RADIUS server not specified"
+msgstr "RADIUS サー�ー�指定�れ����ん"
 
-#: catalog/aclchk.c:312
-msgid "no privileges were granted for column \"%s\" of relation \"%s\""
-msgstr "リレーション \"%2$s\" �カラム \"%1$s\" ��権��付与�れ��ん���"
+#: libpq/auth.c:2455
+msgid "RADIUS secret not specified"
+msgstr "RADIUS secret �指定�れ����ん"
 
-#: catalog/aclchk.c:317
+#: libpq/auth.c:2471 libpq/hba.c:1403
 #, c-format
-msgid "no privileges were granted for \"%s\""
-msgstr "\"%s\"��権��付与�れ��ん���"
+msgid "could not translate RADIUS server name \"%s\" to address: %s"
+msgstr "RADIUS サー�� \"%s\" をアドレス�変�����ん���: %s"
 
-#: catalog/aclchk.c:325
-msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
-msgstr "リレーション \"%2$s\" �カラム \"%1$s\" ��全��権��付与�れ������り��ん"
+#: libpq/auth.c:2499
+msgid ""
+"RADIUS authentication does not support passwords longer than 16 characters"
+msgstr "RADIUS �証�� 16 文字以上�パスワード�サ�ート�����ん"
 
-#: catalog/aclchk.c:330
-#, c-format
-msgid "not all privileges were granted for \"%s\""
-msgstr "\"%s\"��全��権��付与�れ������り��ん"
+#: libpq/auth.c:2510
+msgid "could not generate random encryption vector"
+msgstr "乱数化ベクトルを生�����ん���"
 
-#: catalog/aclchk.c:341
-msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
-msgstr "リレーション \"%2$s\" �カラム \"%1$s\" �ら�権��剥奪�������能性��り��"
+#: libpq/auth.c:2533
+msgid "could not perform MD5 encryption of password"
+msgstr "パスワード� MD5 暗�化�失敗����"
 
-#: catalog/aclchk.c:346
+#: libpq/auth.c:2555
 #, c-format
-msgid "no privileges could be revoked for \"%s\""
-msgstr "\"%s\"�権�を剥奪�������能性��り��"
-
-#: catalog/aclchk.c:354
-msgid ""
-"not all privileges could be revoked for column \"%s\" of relation \"%s\""
-msgstr ""
-"リレーション \"%2$s\" �カラム \"%1$s\" �ら�全��権��剥奪��������り��ん"
+msgid "could not create RADIUS socket: %m"
+msgstr "RADIUS �ソケットを作�����ん���: %m"
 
-#: catalog/aclchk.c:359
+#: libpq/auth.c:2576
 #, c-format
-msgid "not all privileges could be revoked for \"%s\""
-msgstr "\"%s\"�全��権�を�り上�られ��ん���"
+msgid "could not bind local RADIUS socket: %m"
+msgstr "ローカル� RADIUS ソケットを�インド����ん���: %m"
 
-#: catalog/aclchk.c:438 catalog/aclchk.c:927
+#: libpq/auth.c:2586
 #, c-format
-msgid "invalid privilege type %s for relation"
-msgstr "リレーション��権��タイプ %s �無効��"
+msgid "could not send RADIUS packet: %m"
+msgstr "RADIUS パケットを�信����ん���: %m"
 
-#: catalog/aclchk.c:442 catalog/aclchk.c:931
-#, c-format
-msgid "invalid privilege type %s for sequence"
-msgstr "シーケンス��権��タイプ %s �無効��"
+#: libpq/auth.c:2615 libpq/auth.c:2640
+msgid "timeout waiting for RADIUS response"
+msgstr "RADIUS �応答待��タイムアウト����"
 
-#: catalog/aclchk.c:446
+#: libpq/auth.c:2633
 #, c-format
-msgid "invalid privilege type %s for database"
-msgstr "データベース��権��他タイプ %s �無効��"
+msgid "could not check status on RADIUS socket: %m"
+msgstr "RADIUS ソケット�状態を�ェック����ん���: %m"
 
-#: catalog/aclchk.c:450 catalog/aclchk.c:935
+#: libpq/auth.c:2662
 #, c-format
-msgid "invalid privilege type %s for function"
-msgstr "関数��権��タイプ %s �無効��"
+msgid "could not read RADIUS response: %m"
+msgstr "RADIUS 応答を読���ん����ん���: %m"
 
-#: catalog/aclchk.c:454
+#: libpq/auth.c:2674 libpq/auth.c:2678
 #, c-format
-msgid "invalid privilege type %s for language"
-msgstr "言語��権��タイプ %s �無効��"
+msgid "RADIUS response was sent from incorrect port: %i"
+msgstr "RADIUS 応答�誤���ート�ら�られ���：%i"
 
-#: catalog/aclchk.c:458
+#: libpq/auth.c:2687
 #, c-format
-msgid "invalid privilege type %s for large object"
-msgstr "ラージオブジェクト�対��権��タイプ %s �無効��"
+msgid "RADIUS response too short: %i"
+msgstr "RADIUS 応答�短����：%i"
 
-#: catalog/aclchk.c:462
+#: libpq/auth.c:2694
 #, c-format
-msgid "invalid privilege type %s for schema"
-msgstr "スキーマ��権��タイプ %s �無効��"
+msgid "RADIUS response has corrupt length: %i (actual length %i)"
+msgstr "RADIUS 応答�長��正���り��ん：%i（実際�長�� %i）"
 
-#: catalog/aclchk.c:466
+#: libpq/auth.c:2702
 #, c-format
-msgid "invalid privilege type %s for tablespace"
-msgstr "テーブルスペース��権��タイプ %s �無効��"
+msgid "RADIUS response is to a different request: %i (should be %i)"
+msgstr "別�リクエスト�対�る RADIUS 応答��：%i（%i ��る��）"
 
-#: catalog/aclchk.c:470
+#: libpq/auth.c:2727
+msgid "could not perform MD5 encryption of received packet"
+msgstr "�信パケット� MD5 暗�化�失敗����"
+
+#: libpq/auth.c:2736
+msgid "RADIUS response has incorrect MD5 signature"
+msgstr "RADIUS 応答� MD5 シグ��ャ�誤�����"
+
+#: libpq/auth.c:2753
 #, c-format
-msgid "invalid privilege type %s for foreign-data wrapper"
-msgstr "外部データラッパー��権��タイプ %s �無効��"
+msgid "RADIUS response has invalid code (%i) for user \"%s\""
+msgstr "ユーザ \"%2$s\" �対�る RADIUS 応答(%1$i)�無効��"
 
-#: catalog/aclchk.c:474
+#: libpq/be-secure.c:283 libpq/be-secure.c:378
 #, c-format
-msgid "invalid privilege type %s for foreign server"
-msgstr "外部サー���権��タイプ %s �無効��"
+msgid "SSL error: %s"
+msgstr "SSLエラー��: %s"
 
-#: catalog/aclchk.c:513
-msgid "column privileges are only valid for relations"
-msgstr "リレーション��権��タイプ %s �無効��"
+#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:951
+#, c-format
+msgid "unrecognized SSL error code: %d"
+msgstr "SSLエラーコード��明��: %d"
 
-#: catalog/aclchk.c:968
-msgid "default privileges cannot be set for columns"
-msgstr "デフォルト権��列��設定����ん"
+#: libpq/be-secure.c:331 libpq/be-secure.c:335 libpq/be-secure.c:345
+msgid "SSL renegotiation failure"
+msgstr "SSL�調��失敗"
 
-#: catalog/aclchk.c:1714 access/heap/heapam.c:1076 access/heap/heapam.c:1104
-#: access/heap/heapam.c:1134
-#, c-format
-msgid "\"%s\" is an index"
-msgstr "\"%s\"�インデックス��"
+#: libpq/be-secure.c:339
+msgid "SSL failed to send renegotiation request"
+msgstr "SSL��調��求��信�失敗����"
 
-#: catalog/aclchk.c:1767
+#: libpq/be-secure.c:736
 #, c-format
-msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
-msgstr "シーケンス \"%s\" �� USAGE, SELECT, UPDATE 権���をサ�ート���"
-
-#: catalog/aclchk.c:1784
-msgid "invalid privilege type USAGE for table"
-msgstr "テーブル��権�タイプ USAGE �無効��"
+msgid "could not create SSL context: %s"
+msgstr "SSLコンテキストを作�����ん���: %s"
 
-#: catalog/aclchk.c:1934
+#: libpq/be-secure.c:746
 #, c-format
-msgid "invalid privilege type %s for column"
-msgstr "カラム��権�タイプ %s �無効��"
+msgid "could not load server certificate file \"%s\": %s"
+msgstr "サー�証明書ファイル\"%s\"をロード����ん���: %s"
 
-#: catalog/aclchk.c:1947
+#: libpq/be-secure.c:752
 #, c-format
-msgid "sequence \"%s\" only supports SELECT column privileges"
-msgstr "シーケンス \"%s\" �� USAGE, SELECT, UPDATE ��をサ�ート���"
+msgid "could not access private key file \"%s\": %m"
+msgstr "秘密キーファイル\"%s\"�アクセス����ん���: %m"
 
-#: catalog/aclchk.c:2531
+#: libpq/be-secure.c:767
 #, c-format
-msgid "language \"%s\" is not trusted"
-msgstr "言語\"%s\"�信頼�れ����ん"
+msgid "private key file \"%s\" has group or world access"
+msgstr "秘密キーファイル \"%s\" �グループ���全員�らアクセス�能��"
 
-#: catalog/aclchk.c:2533
-msgid "Only superusers can use untrusted languages."
-msgstr "スーパーユーザ���信頼�れ��言語を使用�る�������"
+#: libpq/be-secure.c:769
+msgid "Permissions should be u=rw (0600) or less."
+msgstr "権��u=rwx(0700)���れ��り��ん"
 
-#: catalog/aclchk.c:3040
+#: libpq/be-secure.c:776
 #, c-format
-msgid "unrecognized privilege type \"%s\""
-msgstr "権�タイプ \"%s\" を�識����ん"
+msgid "could not load private key file \"%s\": %s"
+msgstr "秘密キーファイル\"%s\"をロード����ん���: %s"
 
-#: catalog/aclchk.c:3089
+#: libpq/be-secure.c:781
 #, c-format
-msgid "permission denied for column %s"
-msgstr "カラム %s ��権���り��ん"
+msgid "check of private key failed: %s"
+msgstr "秘密キー�検査�失敗����: %s"
 
-#: catalog/aclchk.c:3091
+#: libpq/be-secure.c:809
 #, c-format
-msgid "permission denied for relation %s"
-msgstr "リレーション %s ��権���り��ん"
+msgid "could not access root certificate file \"%s\": %m"
+msgstr "ルート証明ファイル \"%s\" �アクセス����ん���: %m"
 
-#: catalog/aclchk.c:3095
+#: libpq/be-secure.c:820
 #, c-format
-msgid "permission denied for database %s"
-msgstr "データベース %s ��権���り��ん"
+msgid "could not load root certificate file \"%s\": %s"
+msgstr "ルート証明ファイル\"%s\"をロード����ん���: %s"
 
-#: catalog/aclchk.c:3097
+#: libpq/be-secure.c:843
 #, c-format
-msgid "permission denied for function %s"
-msgstr "関数 %s ��権���り��ん"
+msgid "SSL certificate revocation list file \"%s\" ignored"
+msgstr "SSL証明書失効リストファイル\"%s\"�無視�れ���"
 
-#: catalog/aclchk.c:3099
-#, c-format
-msgid "permission denied for operator %s"
-msgstr "演算� %s ��権���り��ん"
+#: libpq/be-secure.c:845
+msgid "SSL library does not support certificate revocation lists."
+msgstr "SSLライブラリ�証明書失効リストをサ�ート�����ん。"
 
-#: catalog/aclchk.c:3101
+#: libpq/be-secure.c:852
 #, c-format
-msgid "permission denied for type %s"
-msgstr "型 %s ��権���り��ん"
+msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
+msgstr "SSL証明書失効リストファイル\"%s\"��り��ん。�略���: %s"
 
-#: catalog/aclchk.c:3103
-#, c-format
-msgid "permission denied for language %s"
-msgstr "言語 %s ��権���り��ん"
+#: libpq/be-secure.c:854
+msgid "Certificates will not be checked against revocation list."
+msgstr "証明書�失効リスト�対��検査�れ��ん。"
 
-#: catalog/aclchk.c:3105
+#: libpq/be-secure.c:896
 #, c-format
-msgid "permission denied for large object %s"
-msgstr "ラージオブジェクト %s �対�る権���り��ん"
+msgid "could not initialize SSL connection: %s"
+msgstr "SSL接続を�期化����ん���: %s"
 
-#: catalog/aclchk.c:3107
+#: libpq/be-secure.c:905
 #, c-format
-msgid "permission denied for schema %s"
-msgstr "スキーマ %s ��権���り��ん"
+msgid "could not set SSL socket: %s"
+msgstr "SSLソケットを設定����ん���: %s"
 
-#: catalog/aclchk.c:3109
+#: libpq/be-secure.c:931
 #, c-format
-msgid "permission denied for operator class %s"
-msgstr "演算�クラス%s�権���り��ん"
+msgid "could not accept SSL connection: %m"
+msgstr "SSL接続を��付�られ��ん���: %m"
 
-#: catalog/aclchk.c:3111
-#, c-format
-msgid "permission denied for operator family %s"
-msgstr "演算��%s�権���り��ん"
+#: libpq/be-secure.c:935 libpq/be-secure.c:946
+msgid "could not accept SSL connection: EOF detected"
+msgstr "SSL接続を��付�られ��ん���: EOFを検出����"
 
-#: catalog/aclchk.c:3113
+#: libpq/be-secure.c:940
 #, c-format
-msgid "permission denied for conversion %s"
-msgstr "変�%s�権���り��ん"
+msgid "could not accept SSL connection: %s"
+msgstr "SSL接続を��付�られ��ん���: %s"
 
-#: catalog/aclchk.c:3115
-#, c-format
-msgid "permission denied for tablespace %s"
-msgstr "テーブル空間%s�権���り��ん"
+#: libpq/be-secure.c:991
+msgid "SSL certificate's common name contains embedded null"
+msgstr "SSL 証明書�コモン�ーム� null ���れ����"
 
-#: catalog/aclchk.c:3117
+#: libpq/be-secure.c:998
 #, c-format
-msgid "permission denied for text search dictionary %s"
-msgstr "テキスト検索辞書%s�権���り��ん"
+msgid "SSL connection from \"%s\""
+msgstr "\"%s\"�ら�SSL接続"
 
-#: catalog/aclchk.c:3119
-#, c-format
-msgid "permission denied for text search configuration %s"
-msgstr "テキスト検索設定%s�権���り��ん"
+#: libpq/be-secure.c:1042
+msgid "no SSL error reported"
+msgstr "SSLエラー��り��ん���"
 
-#: catalog/aclchk.c:3121
+#: libpq/be-secure.c:1046
 #, c-format
-msgid "permission denied for foreign-data wrapper %s"
-msgstr "外部データラッパー %s ��権���り��ん"
+msgid "SSL error code %lu"
+msgstr "SSLエラーコード: %lu"
 
-#: catalog/aclchk.c:3123
+#: libpq/pqcomm.c:306
 #, c-format
-msgid "permission denied for foreign server %s"
-msgstr "外部サー� %s ��権���り��ん"
+msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
+msgstr "ホスト�\"%s\"�サービス\"%s\"をアドレス�変�����ん���: %s"
 
-#: catalog/aclchk.c:3129 catalog/aclchk.c:3131
+#: libpq/pqcomm.c:310
 #, c-format
-msgid "must be owner of relation %s"
-msgstr "リレーション%s�所有者���れ��り��ん"
+msgid "could not translate service \"%s\" to address: %s"
+msgstr "サービス\"%s\"をアドレス�変�����ん���: %s"
 
-#: catalog/aclchk.c:3133
+#: libpq/pqcomm.c:337
 #, c-format
-msgid "must be owner of sequence %s"
-msgstr "シーケンス%s�所有者���れ��り��ん"
+msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
+msgstr ""
+"�求�れ�アドレスを全��インド����ん���: MAXLISTEN (%d)を超����"
+"�"
 
-#: catalog/aclchk.c:3135
-#, c-format
-msgid "must be owner of database %s"
-msgstr "データベース%s�所有者���れ��り��ん"
+#: libpq/pqcomm.c:346
+msgid "IPv4"
+msgstr "IPv4"
 
-#: catalog/aclchk.c:3137
-#, c-format
-msgid "must be owner of function %s"
-msgstr "関数%s�所有者���れ��り��ん"
+#: libpq/pqcomm.c:350
+msgid "IPv6"
+msgstr "IPv6"
 
-#: catalog/aclchk.c:3139
+#: libpq/pqcomm.c:355
+msgid "Unix"
+msgstr "Unix"
+
+#: libpq/pqcomm.c:360
 #, c-format
-msgid "must be owner of operator %s"
-msgstr "演算�%s�所有者���れ��り��ん"
+msgid "unrecognized address family %d"
+msgstr "アドレスファミリ %d を�識����ん"
 
-#: catalog/aclchk.c:3141
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:371
 #, c-format
-msgid "must be owner of type %s"
-msgstr "型%s�所有者���れ��り��ん"
+msgid "could not create %s socket: %m"
+msgstr "%sソケットを作�����ん���: %m"
 
-#: catalog/aclchk.c:3143
+#: libpq/pqcomm.c:396
 #, c-format
-msgid "must be owner of language %s"
-msgstr "言語%s�所有者���れ��り��ん"
+msgid "setsockopt(SO_REUSEADDR) failed: %m"
+msgstr "setsockopt(SO_REUSEADDR)�失敗����: %m"
 
-#: catalog/aclchk.c:3145
+#: libpq/pqcomm.c:411
 #, c-format
-msgid "must be owner of large object %s"
-msgstr "ラージオブジェクト %s �所有者���れ��り��ん"
+msgid "setsockopt(IPV6_V6ONLY) failed: %m"
+msgstr "setsockopt(IPV6_V6ONLY)�失敗����: %m"
 
-#: catalog/aclchk.c:3147
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:430
 #, c-format
-msgid "must be owner of schema %s"
-msgstr "スキーマ%s�所有者���れ��り��ん"
+msgid "could not bind %s socket: %m"
+msgstr "%sソケットを�インド����ん���: %m"
 
-#: catalog/aclchk.c:3149
+#: libpq/pqcomm.c:433
 #, c-format
-msgid "must be owner of operator class %s"
-msgstr "演算�クラス%s�所有者���れ��り��ん"
+msgid ""
+"Is another postmaster already running on port %d? If not, remove socket file "
+"\"%s\" and retry."
+msgstr ""
+"���他�postmaster��ート%d�稼動�����ん�? 稼動�����れ�ソケッ"
+"トファイル\"%s\"を削除��実行������"
 
-#: catalog/aclchk.c:3151
+#: libpq/pqcomm.c:436
 #, c-format
-msgid "must be owner of operator family %s"
-msgstr "演算��%s�所有者���れ��り��ん"
+msgid ""
+"Is another postmaster already running on port %d? If not, wait a few seconds "
+"and retry."
+msgstr ""
+"���他�postmaster��ート%d�稼動�����ん�? 稼動�����れ�数秒"
+"待���ら�実行������"
 
-#: catalog/aclchk.c:3153
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:469
 #, c-format
-msgid "must be owner of conversion %s"
-msgstr "変�%s�所有者���れ��り��ん"
+msgid "could not listen on %s socket: %m"
+msgstr "%sソケットをlisten����ん���: %m"
 
-#: catalog/aclchk.c:3155
+#: libpq/pqcomm.c:554
 #, c-format
-msgid "must be owner of tablespace %s"
-msgstr "テーブル空間%s�所有者���れ��り��ん"
+msgid "group \"%s\" does not exist"
+msgstr "グループ\"%s\"�存在���ん"
 
-#: catalog/aclchk.c:3157
+#: libpq/pqcomm.c:564
 #, c-format
-msgid "must be owner of text search dictionary %s"
-msgstr "テキスト検索辞書%s�所有者���れ��り��ん"
+msgid "could not set group of file \"%s\": %m"
+msgstr "ファイル\"%s\"�グループを設定����ん���: %m"
 
-#: catalog/aclchk.c:3159
+#: libpq/pqcomm.c:575
 #, c-format
-msgid "must be owner of text search configuration %s"
-msgstr "テキスト検索設定%s�所有者���れ��り��ん"
+msgid "could not set permissions of file \"%s\": %m"
+msgstr "ファイル\"%s\"�権�を設定����ん���: %m"
 
-#: catalog/aclchk.c:3161
+#: libpq/pqcomm.c:605
 #, c-format
-msgid "must be owner of foreign-data wrapper %s"
-msgstr "外部データラッパー %s �所有者���れ��り��ん"
+msgid "could not accept new connection: %m"
+msgstr "新��接続を��付�る�������ん���: %m"
 
-#: catalog/aclchk.c:3163
+#: libpq/pqcomm.c:773
 #, c-format
-msgid "must be owner of foreign server %s"
-msgstr "外部サー� %s �所有者���れ��り��ん"
-
-#: catalog/aclchk.c:3205
-msgid "permission denied for column \"%s\" of relation \"%s\""
-msgstr "リレーション \"%2$s\" �カラム \"%1$s\" ��権���り��ん"
+msgid "could not set socket to non-blocking mode: %m"
+msgstr "ソケットを�ブロッキングモード�設定����ん���: %m"
 
-#: catalog/aclchk.c:3232
+#: libpq/pqcomm.c:779
 #, c-format
-msgid "role with OID %u does not exist"
-msgstr "OID � %u ��るロール�存在���ん"
+msgid "could not set socket to blocking mode: %m"
+msgstr "ソケットをブロッキングモード�設定����ん���: %m"
 
-#: catalog/aclchk.c:3325 catalog/aclchk.c:3333
+#: libpq/pqcomm.c:831 libpq/pqcomm.c:921
 #, c-format
-msgid "attribute %d of relation with OID %u does not exist"
-msgstr "OID � %2$u ��るリレーション�属性 %1$d �存在���ん"
+msgid "could not receive data from client: %m"
+msgstr "クライアント�らデータを�信����ん���: %m"
 
-#: catalog/aclchk.c:3406 catalog/aclchk.c:4226
-#, c-format
-msgid "relation with OID %u does not exist"
-msgstr "OID � %u ��るリレーション�存在���ん"
+#: libpq/pqcomm.c:1072
+msgid "unexpected EOF within message length word"
+msgstr "メッセージ長ワード内�EOF�想定外��"
 
-#: catalog/aclchk.c:3500 catalog/aclchk.c:4590 utils/adt/dbsize.c:127
-#, c-format
-msgid "database with OID %u does not exist"
-msgstr "OID %u�データベース�存在���ん"
+#: libpq/pqcomm.c:1083
+msgid "invalid message length"
+msgstr "メッセージ長�無効��"
 
-#: catalog/aclchk.c:3608 catalog/aclchk.c:4330
-#, c-format
-msgid "language with OID %u does not exist"
-msgstr "OID � %u ��る言語�存在���ん"
+#: libpq/pqcomm.c:1105 libpq/pqcomm.c:1115
+msgid "incomplete message from client"
+msgstr "クライアント�ら�メッセージ��完全��"
 
-#: catalog/aclchk.c:3769 catalog/aclchk.c:4402
+#: libpq/pqcomm.c:1245
 #, c-format
-msgid "schema with OID %u does not exist"
-msgstr "OID � %u ��るスキーマ�存在���ん"
+msgid "could not send data to client: %m"
+msgstr "クライアント�データを�信����ん���: %m"
 
-#: catalog/aclchk.c:3823 catalog/aclchk.c:4429
+#: libpq/hba.c:160
 #, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "OID � %u ��るテーブル空間�存在���ん"
+msgid "authentication file token too long, skipping: \"%s\""
+msgstr "�証ファイル�トークン�長�������飛����: \"%s\""
 
-#: catalog/aclchk.c:3881
+#: libpq/hba.c:355
 #, c-format
-msgid "foreign-data wrapper with OID %u does not exist"
-msgstr "OID � %u ��る外部データラッパー�存在���ん"
+msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
+msgstr ""
+"セカンダリ�証ファイル\"@%s\"を\"%s\"���オープン����ん���: %m"
 
-#: catalog/aclchk.c:3942 catalog/aclchk.c:4563
+#: libpq/hba.c:628
 #, c-format
-msgid "foreign server with OID %u does not exist"
-msgstr "OID � %u ��る外部サー��存在���ん"
+msgid "could not translate host name \"%s\" to address: %s"
+msgstr "ホスト� \"%s\" をアドレス�変�����ん���: %s"
 
-#: catalog/aclchk.c:4252
+#. translator: the second %s is a list of auth methods
+#: libpq/hba.c:779
 #, c-format
-msgid "type with OID %u does not exist"
-msgstr "OID � %u ��る型�存在���ん"
+msgid ""
+"authentication option \"%s\" is only valid for authentication methods %s"
+msgstr "�証オプション\"%s\"��証方�%s���有効��"
 
-#: catalog/aclchk.c:4278
+#: libpq/hba.c:781 libpq/hba.c:797 libpq/hba.c:833 libpq/hba.c:855
+#: libpq/hba.c:864 libpq/hba.c:887 libpq/hba.c:899 libpq/hba.c:912
+#: libpq/hba.c:927 libpq/hba.c:982 libpq/hba.c:1002 libpq/hba.c:1016
+#: libpq/hba.c:1033 libpq/hba.c:1046 libpq/hba.c:1062 libpq/hba.c:1077
+#: libpq/hba.c:1119 libpq/hba.c:1151 libpq/hba.c:1162 libpq/hba.c:1182
+#: libpq/hba.c:1193 libpq/hba.c:1204 libpq/hba.c:1221 libpq/hba.c:1242
+#: libpq/hba.c:1272 libpq/hba.c:1284 libpq/hba.c:1297 libpq/hba.c:1331
+#: libpq/hba.c:1405 libpq/hba.c:1423 libpq/hba.c:1444 libpq/hba.c:1475
+#: libpq/hba.c:1485 tsearch/ts_locale.c:182
 #, c-format
-msgid "operator with OID %u does not exist"
-msgstr "OID � %u ��る演算��存在���ん"
+msgid "line %d of configuration file \"%s\""
+msgstr "設定ファイル \"%2$s\" � %1$d 行目"
 
-#: catalog/aclchk.c:4455
+#: libpq/hba.c:795
 #, c-format
-msgid "operator class with OID %u does not exist"
-msgstr "OID � %u ��る演算�クラス�存在���ん"
+msgid "authentication method \"%s\" requires argument \"%s\" to be set"
+msgstr "�証方�\"%s\"�場��引数\"%s\"�セット�れ��れ��り��ん"
 
-#: catalog/aclchk.c:4482
-#, c-format
-msgid "operator family with OID %u does not exist"
-msgstr "OID � %u ��る演算���存在���ん"
+#: libpq/hba.c:832
+#, 
+msgid "local connections are not supported by this build"
+msgstr "��ビルド�� local 接続�サ�ート�れ����ん"
 
-#: catalog/aclchk.c:4509
-#, c-format
-msgid "text search dictionary with OID %u does not exist"
-msgstr "OID � %u ��るテキスト検索辞書�存在���ん"
+#: libpq/hba.c:853
+msgid "hostssl requires SSL to be turned on"
+msgstr "hostssl � SSL を有効��るよ��求�����"
 
-#: catalog/aclchk.c:4536
-#, c-format
-msgid "text search configuration with OID %u does not exist"
-msgstr "OID � %u ��るテキスト検索設定�存在���ん"
+#: libpq/hba.c:854
+msgid "Set ssl = on in postgresql.conf."
+msgstr "postgresql.conf � ssl = on �設定������"
 
-#: catalog/aclchk.c:4616
-#, c-format
-msgid "conversion with OID %u does not exist"
-msgstr "OID � %u ��る変��存在���ん"
+#: libpq/hba.c:862
+#, 
+msgid "hostssl is not supported by this build"
+msgstr "��ビルド�� hostssl �サ�ート�れ����ん"
 
-#: catalog/dependency.c:578
-#, c-format
-msgid "cannot drop %s because %s requires it"
-msgstr "%2$s�必�����る��%1$sを削除����ん"
+#: libpq/hba.c:863
+msgid "Compile with --with-openssl to use SSL connections."
+msgstr "SSL 接続を有効��る�� --with-openssl �コンパイル������"
 
-#: catalog/dependency.c:581
+#: libpq/hba.c:885
 #, c-format
-msgid "You can drop %s instead."
-msgstr "代�り�%sを削除����"
+msgid "invalid connection type \"%s\""
+msgstr "接続オプションタイプ \"%s\" �無効��"
+
+#: libpq/hba.c:898
+msgid "end-of-line before database specification"
+msgstr "データベース指定���行末を検出����"
+
+#: libpq/hba.c:911
+msgid "end-of-line before role specification"
+msgstr "ロール指定���行末を検出����"
+
+#: libpq/hba.c:926
+msgid "end-of-line before IP address specification"
+msgstr "IP アドレス指定���行末を検出����"
 
-#: catalog/dependency.c:848
+#: libpq/hba.c:980
 #, c-format
-msgid "drop auto-cascades to %s"
-msgstr "%s��自動カスケードを削除���"
+msgid "invalid IP address \"%s\": %s"
+msgstr "IP アドレス \"%s\" �有効���り��ん: %s"
 
-#: catalog/dependency.c:860 catalog/dependency.c:869
+#: libpq/hba.c:1000
 #, c-format
-msgid "%s depends on %s"
-msgstr "%s�%s��存���"
+msgid "specifying both host name and CIDR mask is invalid: \"%s\""
+msgstr "ホスト�� CIDR マスクを両方指定�る��無効��：\"%s\""
 
-#: catalog/dependency.c:881 catalog/dependency.c:890
+#: libpq/hba.c:1014
 #, c-format
-msgid "drop cascades to %s"
-msgstr "%s��カスケードを削除���"
+msgid "invalid CIDR mask in address \"%s\""
+msgstr "IP アドレス \"%s\" 内� CIDR マスク�無効��"
+
+#: libpq/hba.c:1032
+msgid "end-of-line before netmask specification"
+msgstr "�ットマスク指定���行末を検出����"
 
-#: catalog/dependency.c:910
+#: libpq/hba.c:1044
 #, c-format
-msgid "cannot drop %s because other objects depend on it"
-msgstr "他�オブジェクト��存�������%sを削除����ん"
+msgid "invalid IP mask \"%s\": %s"
+msgstr "IP マスク \"%s\" �有効���り��ん: %s"
 
-#: catalog/dependency.c:914 catalog/dependency.c:921
-msgid "Use DROP ... CASCADE to drop the dependent objects too."
-msgstr ""
-"�存���るオブジェクトも削除�る��DROP ... CASCADEを使用������"
+#: libpq/hba.c:1061
+msgid "IP address and mask do not match"
+msgstr "IPアドレス�マスク�一致���ん"
 
-#: catalog/dependency.c:918
-msgid "cannot drop desired object(s) because other objects depend on them"
-msgstr "他�オブジェクト��存���る��希望�るオブジェクトを削除����ん"
+#: libpq/hba.c:1076
+msgid "end-of-line before authentication method"
+msgstr "�証方�指定���行末を検出����"
 
-#. translator: %d always has a value larger than 1
-#: catalog/dependency.c:927
+#: libpq/hba.c:1149
 #, c-format
-msgid "drop cascades to %d other object"
-msgid_plural "drop cascades to %d other objects"
-msgstr[0] "他� %d 個�オブジェクト��カスケードを削除���"
-msgstr[1] "他� %d 個�オブジェクト��カスケードを削除���"
+msgid "invalid authentication method \"%s\""
+msgstr "�証方� \"%s\" �有効���り��ん"
 
-#: catalog/dependency.c:2097
+#: libpq/hba.c:1160
 #, c-format
-msgid " column %s"
-msgstr " 列 %s"
+msgid "invalid authentication method \"%s\": not supported by this build"
+msgstr "無効��証方� \"%s\"：��ビルド��サ�ート�れ����ん"
 
-#: catalog/dependency.c:2103
-#, c-format
-msgid "function %s"
-msgstr "関数 %s"
+#: libpq/hba.c:1181
+msgid "krb5 authentication is not supported on local sockets"
+msgstr "ローカルソケット上� KRB5 �証�サ�ート�����ん"
 
-#: catalog/dependency.c:2108
-#, c-format
-msgid "type %s"
-msgstr "åž‹ %s"
+#: libpq/hba.c:1192
+msgid "gssapi authentication is not supported on local sockets"
+msgstr "ローカルソケット�� gssapi �証をサ�ート�����ん"
 
-#: catalog/dependency.c:2138
-#, c-format
-msgid "cast from %s to %s"
-msgstr "%s�ら%s��キャスト"
+#: libpq/hba.c:1203
+#, 
+msgid "peer authentication is only supported on local sockets"
+msgstr "ピア�証�ローカルソケット���サ�ート�����"
 
-#: catalog/dependency.c:2165
-#, c-format
-msgid "constraint %s on %s"
-msgstr "%2$s �対�る制約 %1$s"
+#: libpq/hba.c:1220
+msgid "cert authentication is only supported on hostssl connections"
+msgstr "hostssl 接続��証明書�証��をサ�ート�����"
 
-#: catalog/dependency.c:2171
+#: libpq/hba.c:1241
 #, c-format
-msgid "constraint %s"
-msgstr "制約 %s"
+msgid "authentication option not in name=value format: %s"
+msgstr "�証オプション� ��=値 形��������ん：%s"
 
-#: catalog/dependency.c:2188
-#, c-format
-msgid "conversion %s"
-msgstr "変� %s"
+#: libpq/hba.c:1257
+#, 
+msgid "ident, peer, krb5, gssapi, sspi and cert"
+msgstr "ident�peer�krb5�gssapi�sspi�よ�cert"
 
-#: catalog/dependency.c:2225
-#, c-format
-msgid "default for %s"
-msgstr "%s用�デフォルト"
+#: libpq/hba.c:1271
+msgid "clientcert can only be configured for \"hostssl\" rows"
+msgstr "クライアント証明書� \"hostssl\" �行���設定����"
 
-#: catalog/dependency.c:2242
-#, c-format
-msgid "language %s"
-msgstr "言語%s"
+#: libpq/hba.c:1282
+msgid ""
+"client certificates can only be checked if a root certificate store is "
+"available"
+msgstr ""
+"クライアント証明書�ルート証明書ストア�利用��る場����検証�れ��"
 
-#: catalog/dependency.c:2248
-#, c-format
-msgid "large object %u"
-msgstr "ラージオブジェクト %u"
+#: libpq/hba.c:1283
+msgid "Make sure the root.crt file is present and readable."
+msgstr ""
+"root.crt ファイル�存在����読�る状態�����る��を確�������"
+
+#: libpq/hba.c:1296
+msgid "clientcert can not be set to 0 when using \"cert\" authentication"
+msgstr "\"cert\" �証を使�場�� clientcert � 0 ������り��ん"
 
-#: catalog/dependency.c:2253
+#: libpq/hba.c:1330
 #, c-format
-msgid "operator %s"
-msgstr "演算�%s"
+msgid "invalid LDAP port number: \"%s\""
+msgstr "無効�LDAP�ート番���: \"%s\""
 
-#: catalog/dependency.c:2285
+#: libpq/hba.c:1376 libpq/hba.c:1384
+msgid "krb5, gssapi and sspi"
+msgstr "krb5�gssapi�よ�sspi"
+
+#: libpq/hba.c:1422
 #, c-format
-msgid "operator class %s for access method %s"
-msgstr "アクセスメソッド%2$s用�演算�クラス%1$s"
+msgid "invalid RADIUS port number: \"%s\""
+msgstr "無効� RADIUS �ート番���: \"%s\""
 
-#: catalog/dependency.c:2335
+#: libpq/hba.c:1442
 #, c-format
-msgid "operator %d %s of %s"
-msgstr "演算� %1$d %3$s %2$s"
+msgid "unrecognized authentication option name: \"%s\""
+msgstr "�証オプション�を�識����ん: \"%s\""
 
-#: catalog/dependency.c:2382
+#: libpq/hba.c:1474
+msgid ""
+"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
+"together with ldapprefix"
+msgstr ""
+"ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute ��ldapprefix �"
+"�時��指定����ん"
+
+#: libpq/hba.c:1484
+msgid ""
+"authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
+"\", or \"ldapsuffix\" to be set"
+msgstr ""
+"\"ldap\" �証方��場��引数  \"ldapbasedn\", \"ldapprefix\" \"ldapsuffix\" "
+"���れ�を指定������"
+
+#: libpq/hba.c:1683 guc-file.l:409
 #, c-format
-msgid "function %d %s of %s"
-msgstr "関数 %1$d %3$s %2$s"
+msgid "could not open configuration file \"%s\": %m"
+msgstr "設定ファイル\"%s\"をオープン����ん���: %m"
 
-#: catalog/dependency.c:2419
+#: libpq/hba.c:1815
 #, c-format
-msgid "rule %s on "
-msgstr "�ルール %s"
+msgid "invalid regular expression \"%s\": %s"
+msgstr "正�表�\"%s\"�無効��: %s"
 
-#: catalog/dependency.c:2454
+#: libpq/hba.c:1838
 #, c-format
-msgid "trigger %s on "
-msgstr "トリガ %s�対象:"
+msgid "regular expression match for \"%s\" failed: %s"
+msgstr "正�表�\"%s\"�マッ�ング�失敗����: %s"
 
-#: catalog/dependency.c:2471
+#: libpq/hba.c:1856
 #, c-format
-msgid "schema %s"
-msgstr "スキーマ %s"
+msgid ""
+"regular expression \"%s\" has no subexpressions as requested by "
+"backreference in \"%s\""
+msgstr ""
+"正�表�\"%s\"��\"%s\"���る後方�照��求�る副表�����れ����ん"
 
-#: catalog/dependency.c:2484
+#: libpq/hba.c:1922
 #, c-format
-msgid "text search parser %s"
-msgstr "テキスト検索パーサ %s"
+msgid "missing entry in file \"%s\" at end of line %d"
+msgstr "ファイル\"%s\"�最終行%d�エントリ�足り��ん"
 
-#: catalog/dependency.c:2499
+#: libpq/hba.c:1963
 #, c-format
-msgid "text search dictionary %s"
-msgstr "テキスト検索辞書 %s"
+msgid "provided user name (%s) and authenticated user name (%s) do not match"
+msgstr "与�られ�ユーザー� (%s) ��証�れ�ユーザー� (%s) �一致���ん"
 
-#: catalog/dependency.c:2514
+#: libpq/hba.c:1984
 #, c-format
-msgid "text search template %s"
-msgstr "テキスト検索テンプレート %s"
+msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
+msgstr ""
+"\"%3$s\"����証�れ�ユーザ \"%2$s\" �ユーザマップ \"%1$s\" �一致���"
+"ã‚“"
 
-#: catalog/dependency.c:2529
+#: libpq/hba.c:2008
 #, c-format
-msgid "text search configuration %s"
-msgstr "テキスト検索設定 %s"
+msgid "could not open usermap file \"%s\": %m"
+msgstr "ユーザマップファイル \"%s\" をオープン����ん���: %m"
 
-#: catalog/dependency.c:2537
+#: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:163 libpq/be-fsstubs.c:189
+#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:519
 #, c-format
-msgid "role %s"
-msgstr "ロール %s"
+msgid "invalid large-object descriptor: %d"
+msgstr "ラージオブジェクト記述��無効��: %d"
 
-#: catalog/dependency.c:2550
+#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:529
 #, c-format
-msgid "database %s"
-msgstr "データベース %s"
+msgid "permission denied for large object %u"
+msgstr "ラージオブジェクト %u �対�る権���り��ん"
 
-#: catalog/dependency.c:2562
+#: libpq/be-fsstubs.c:194
 #, c-format
-msgid "tablespace %s"
-msgstr "テーブル空間 %s"
+msgid "large object descriptor %d was not opened for writing"
+msgstr "ラージオブジェクト記述�%d�書�込�用�開�れ����ん���"
 
-#: catalog/dependency.c:2571
+#: libpq/be-fsstubs.c:287 catalog/pg_largeobject.c:200
+#: catalog/objectaddress.c:819
 #, c-format
-msgid "foreign-data wrapper %s"
-msgstr "外部データラッパー %s"
+msgid "must be owner of large object %u"
+msgstr "ラージオブジェクト %u �所有者���れ��り��ん"
+
+#: libpq/be-fsstubs.c:392
+msgid "must be superuser to use server-side lo_import()"
+msgstr ""
+"サー�サイド�lo_import()を使用�る��スーパーユーザ���れ��り��ん"
 
-#: catalog/dependency.c:2580
+#: libpq/be-fsstubs.c:393
+msgid "Anyone can use the client-side lo_import() provided by libpq."
+msgstr "libpq��供�れるlo_import()�誰�も使用����"
+
+#: libpq/be-fsstubs.c:406
 #, c-format
-msgid "server %s"
-msgstr "サー� %s"
+msgid "could not open server file \"%s\": %m"
+msgstr "サー�ファイル\"%s\"をオープン����ん���: %m"
 
-#: catalog/dependency.c:2605
+#: libpq/be-fsstubs.c:428
 #, c-format
-msgid "user mapping for %s"
-msgstr "%s �ユーザマッピング"
+msgid "could not read server file \"%s\": %m"
+msgstr "サー�ファイル\"%s\"を読��れ��ん���: %m"
+
+#: libpq/be-fsstubs.c:458
+msgid "must be superuser to use server-side lo_export()"
+msgstr ""
+"サー�サイド�lo_export()を使用�る��スーパーユーザ���れ��り��ん"
+
+#: libpq/be-fsstubs.c:459
+msgid "Anyone can use the client-side lo_export() provided by libpq."
+msgstr "libpq��供�れるクライアントサイド�lo_export()�誰�も使用����"
 
-#: catalog/dependency.c:2639
+#: libpq/be-fsstubs.c:484
 #, c-format
-msgid "default privileges on new relations belonging to role %s"
-msgstr "新��リレーション�関�るデフォルト�権���ロール %s �属���。"
+msgid "could not create server file \"%s\": %m"
+msgstr "サー�ファイル\"%s\"を作�����ん���: %m"
 
-#: catalog/dependency.c:2644
+#: libpq/be-fsstubs.c:496
 #, c-format
-msgid "default privileges on new sequences belonging to role %s"
-msgstr "新��シーケンス�関�るデフォルト�権���ロール %s �属���。"
+msgid "could not write server file \"%s\": %m"
+msgstr "サー�ファイル\"%s\"を書�出���ん���: %m"
+
+#: libpq/pqformat.c:436
+msgid "no data left in message"
+msgstr "メッセージ内�データ�残�����ん"
+
+#: libpq/pqformat.c:556 libpq/pqformat.c:574 libpq/pqformat.c:595
+#: utils/adt/rowtypes.c:557 utils/adt/arrayfuncs.c:1411
+msgid "insufficient data left in message"
+msgstr "メッセージ内�残るデータ���分��"
+
+#: libpq/pqformat.c:636
+msgid "invalid string in message"
+msgstr "メッセージ内�文字列�無効��"
+
+#: libpq/pqformat.c:652
+msgid "invalid message format"
+msgstr "メッセージ�書��無効��"
 
-#: catalog/dependency.c:2649
+#: catalog/toasting.c:91 catalog/objectaddress.c:405 commands/tablecmds.c:202
+#: commands/tablecmds.c:1128 commands/tablecmds.c:2477
+#: commands/tablecmds.c:3798 commands/indexcmds.c:200
+#: commands/indexcmds.c:1574 commands/lockcmds.c:149
 #, c-format
-msgid "default privileges on new functions belonging to role %s"
-msgstr "新��関数�関�るデフォルト�権���ロール %s �属���。"
+msgid "\"%s\" is not a table"
+msgstr "\"%s\"�テーブル���り��ん"
 
-#: catalog/dependency.c:2655
+#: catalog/toasting.c:142
+msgid "shared tables cannot be toasted after initdb"
+msgstr "initdb�後�共有テーブルをTOAST化����ん"
+
+#: catalog/pg_shdepend.c:562 catalog/dependency.c:748
 #, c-format
-msgid "default privileges belonging to role %s"
-msgstr "デフォルト�権��ロール %s �属���。"
+msgid "cannot drop %s because it is required by the database system"
+msgstr "データベースシステム�必�����る��%sを削除����ん"
 
-#: catalog/dependency.c:2663
+#: catalog/pg_shdepend.c:673 catalog/dependency.c:914
 #, c-format
-msgid " in schema %s"
-msgstr "スキーマ %s ����"
+msgid ""
+"\n"
+"and %d other object (see server log for list)"
+msgid_plural ""
+"\n"
+"and %d other objects (see server log for list)"
+msgstr[0] ""
+"\n"
+"�よ�%d���他�オブジェクト(一覧�����サー�ログを�照������)"
+msgstr[1] ""
+"\n"
+"�よ�%d���他�オブジェクト(一覧�����サー�ログを�照������)"
 
-#: catalog/dependency.c:2711
+#: catalog/pg_shdepend.c:680
 #, c-format
-msgid "table %s"
-msgstr "テーブル %s"
+msgid ""
+"\n"
+"and objects in %d other database (see server log for list)"
+msgid_plural ""
+"\n"
+"and objects in %d other databases (see server log for list)"
+msgstr[0] ""
+"\n"
+"�よ��他�%d�データベース内�オブジェクト(一覧�����サー�ログを�照�"
+"�����)"
+msgstr[1] ""
+"\n"
+"�よ��他�%d�データベース内�オブジェクト(一覧�����サー�ログを�照�"
+"�����)"
 
-#: catalog/dependency.c:2715
+#: catalog/pg_shdepend.c:992
 #, c-format
-msgid "index %s"
-msgstr "インデックス %s"
+msgid "role %u was concurrently dropped"
+msgstr "ロール%u�削除��時�起����"
 
-#: catalog/dependency.c:2719
+#: catalog/pg_shdepend.c:1011
 #, c-format
-msgid "sequence %s"
-msgstr "シーケンス%s"
+msgid "tablespace %u was concurrently dropped"
+msgstr "テーブル空間%u��時�削除�れ���"
 
-#: catalog/dependency.c:2723
+#: catalog/pg_shdepend.c:1026
 #, c-format
-msgid "uncataloged table %s"
-msgstr "カタログ���テーブル%s"
+msgid "database %u was concurrently dropped"
+msgstr "データベース %u ��時�削除�れ���"
 
-#: catalog/dependency.c:2727
+#: catalog/pg_shdepend.c:1070
 #, c-format
-msgid "toast table %s"
-msgstr "TOASTテーブル%s"
+msgid "owner of %s"
+msgstr "%s�所有者"
 
-#: catalog/dependency.c:2731
+#: catalog/pg_shdepend.c:1072
 #, c-format
-msgid "view %s"
-msgstr "ビュー%s"
+msgid "privileges for %s"
+msgstr "%s �権�"
 
-#: catalog/dependency.c:2735
+#. translator: %s will always be "database %s"
+#: catalog/pg_shdepend.c:1080
 #, c-format
-msgid "composite type %s"
-msgstr "複�型%s"
+msgid "%d object in %s"
+msgid_plural "%d objects in %s"
+msgstr[0] "%2$s内�%1$d個�オブジェクト"
+msgstr[1] "%2$s内�%1$d個�オブジェクト"
 
-#: catalog/dependency.c:2740
+#: catalog/pg_shdepend.c:1191 catalog/pg_shdepend.c:1287
 #, c-format
-msgid "relation %s"
-msgstr "リレーション%s"
+msgid ""
+"cannot drop objects owned by %s because they are required by the database "
+"system"
+msgstr ""
+"データベースシステム�必�����る��%s�所有�るオブジェクトを削除���"
+"�ん"
 
-#: catalog/dependency.c:2777
+#: catalog/heap.c:264
 #, c-format
-msgid "operator family %s for access method %s"
-msgstr "アクセスメソッド%2$s用�演算��%1$s"
+msgid "permission denied to create \"%s.%s\""
+msgstr "\"%s.%s\"を作��る権���り��ん"
 
-#: utils/hash/dynahash.c:925 storage/ipc/shmem.c:190 storage/lmgr/proc.c:193
-#: storage/lmgr/proc.c:211 storage/lmgr/lock.c:610 storage/lmgr/lock.c:679
-#: storage/lmgr/lock.c:2119 storage/lmgr/lock.c:2498 storage/lmgr/lock.c:2563
-msgid "out of shared memory"
-msgstr "共有メモリ��足�����"
+#: catalog/heap.c:266
+msgid "System catalog modifications are currently disallowed."
+msgstr "�時点��システムカタログ�変更����ん"
 
-#: utils/mmgr/aset.c:409
+#: catalog/heap.c:389 commands/tablecmds.c:1267 commands/tablecmds.c:1684
+#: commands/tablecmds.c:4249
 #, c-format
-msgid "Failed while creating memory context \"%s\"."
-msgstr "メモリコンテキスト\"%s\"�作�時�失敗����"
+msgid "tables can have at most %d columns"
+msgstr "テーブル�最大�%d列���������"
 
-#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:771 utils/mmgr/aset.c:977
+#: catalog/heap.c:406
 #, c-format
-msgid "Failed on request of size %lu."
-msgstr "サイズ%lu��求�失敗����"
+msgid "column name \"%s\" conflicts with a system column name"
+msgstr "列�\"%s\"�システム用�列��競����"
 
-#: utils/mmgr/portalmem.c:207
+#: catalog/heap.c:422
 #, c-format
-msgid "cursor \"%s\" already exists"
-msgstr "カーソル\"%s\"����存在���"
+msgid "column name \"%s\" specified more than once"
+msgstr "列�\"%s\"�複数指定�れ���"
 
-#: utils/mmgr/portalmem.c:211
+#: catalog/heap.c:472
 #, c-format
-msgid "closing existing cursor \"%s\""
-msgstr "既存�カーソル\"%s\"をクローズ�����"
-
-#: utils/mmgr/portalmem.c:419
-msgid "cannot drop active portal \"%s\""
-msgstr "アクテイブ��ータル \"%s\" を削除����ん"
+msgid "column \"%s\" has type \"unknown\""
+msgstr "列\"%s\"�\"unknown\"型��"
 
-#: utils/mmgr/portalmem.c:624
-msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
-msgstr ""
-"WITH HOLD 付��カーソルを作���トランザクション� PREPARE ����ん"
+#: catalog/heap.c:473
+msgid "Proceeding with relation creation anyway."
+msgstr "�り���リレーション�作�を進���"
 
-#: utils/adt/varchar.c:43 utils/adt/timestamp.c:92 utils/adt/varbit.c:49
-#: utils/adt/date.c:66
-msgid "invalid type modifier"
-msgstr "無効�型修飾���。"
+#: catalog/heap.c:486
+#, c-format
+msgid "column \"%s\" has pseudo-type %s"
+msgstr "列\"%s\"�仮想型%s��"
 
-#: utils/adt/varchar.c:48 utils/adt/varbit.c:54
+#: catalog/heap.c:516
 #, c-format
-msgid "length for type %s must be at least 1"
-msgstr "型%s�長��最低�も1��"
+msgid "composite type %s cannot be made a member of itself"
+msgstr "複�型 %s ��れ自身�メン�ー��る�������ん"
 
-#: utils/adt/varchar.c:52 utils/adt/varbit.c:59
+#: catalog/heap.c:558
 #, c-format
-msgid "length for type %s cannot exceed %d"
-msgstr "型%s�長��%dを超�られ��ん"
+msgid "no collation was derived for column \"%s\" with collatable type %s"
+msgstr ""
+"照��能�型 %2$s を��列 \"%1$s\" ����照�順�を決定����ん���"
 
-#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
+#: catalog/heap.c:1011 catalog/index.c:769 commands/tablecmds.c:2317
 #, c-format
-msgid "value too long for type character(%d)"
-msgstr "値�型character(%d)����長����"
+msgid "relation \"%s\" already exists"
+msgstr "リレーション\"%s\"����存在���"
 
-#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#: catalog/heap.c:1027 catalog/pg_type.c:396 catalog/pg_type.c:696
+#: commands/typecmds.c:224 commands/typecmds.c:806 commands/typecmds.c:1145
+#: commands/typecmds.c:1621
 #, c-format
-msgid "value too long for type character varying(%d)"
-msgstr "値�型character varying(%d)����長����"
+msgid "type \"%s\" already exists"
+msgstr "型\"%s\"����存在���"
 
-#: utils/adt/tsquery_rewrite.c:296
-msgid "ts_rewrite query must return two tsquery columns"
-msgstr "ts_rewrite������2列�tsquery列を返���れ��り��ん"
+#: catalog/heap.c:1028
+msgid ""
+"A relation has an associated type of the same name, so you must use a name "
+"that doesn't conflict with any existing type."
+msgstr ""
+"リレーション������関連�る型を����。����既存�型�競�����"
+"�を使用���れ��り��ん"
 
-#: utils/adt/tsvector_parser.c:136 utils/adt/tsquery.c:156
-#: utils/adt/tsquery.c:392
+#: catalog/heap.c:2138
 #, c-format
-msgid "syntax error in tsquery: \"%s\""
-msgstr "tsquery内�構文エラー: \"%s\""
+msgid "check constraint \"%s\" already exists"
+msgstr "�ェック制約\"%s\"����存在���"
 
-#: utils/adt/tsvector_parser.c:137
+#: catalog/heap.c:2282 catalog/pg_constraint.c:645 commands/tablecmds.c:5323
 #, c-format
-msgid "syntax error in tsvector: \"%s\""
-msgstr "tsvector内�構文エラー: %s"
+msgid "constraint \"%s\" for relation \"%s\" already exists"
+msgstr "���制約\"%s\"�リレーション\"%s\"�存在���"
 
-#: utils/adt/tsvector_parser.c:202
+#: catalog/heap.c:2286
 #, c-format
-msgid "there is no escaped character: \"%s\""
-msgstr "エスケープ文字��り��ん: \"%s\""
+msgid "merging constraint \"%s\" with inherited definition"
+msgstr "継承�れ�定義�より制約 \"%s\" をマージ�����"
 
-#: utils/adt/tsvector_parser.c:319
-#, c-format
-msgid "wrong position info in tsvector: \"%s\""
-msgstr "tsvector内��置情報�間������: \"%s\""
+#: catalog/heap.c:2384
+msgid "cannot use column references in default expression"
+msgstr "デフォルト���列�照を使用����ん"
 
-#: utils/adt/domains.c:80
-#, c-format
-msgid "type %s is not a domain"
-msgstr "型%s�ドメイン���り��ん"
+#: catalog/heap.c:2392
+msgid "default expression must not return a set"
+msgstr "デフォルト��集�を返����り��ん"
 
-#: utils/adt/uuid.c:128
-#, c-format
-msgid "invalid input syntax for uuid: \"%s\""
-msgstr "uuid�入力構文�無効��: \"%s\""
+#: catalog/heap.c:2400
+msgid "cannot use subquery in default expression"
+msgstr "デフォルト���副�����を使用����ん"
+
+#: catalog/heap.c:2404
+msgid "cannot use aggregate function in default expression"
+msgstr "デフォルト���集約関数を使用����ん"
+
+#: catalog/heap.c:2408
+msgid "cannot use window function in default expression"
+msgstr "デフォルト���ウィンドウ関数を使用����ん"
 
-#: utils/adt/dbsize.c:65 utils/adt/dbsize.c:217 utils/adt/dbsize.c:288
-#: utils/adt/genfile.c:170 storage/file/copydir.c:86
-#: storage/file/copydir.c:125 access/transam/xlog.c:2858
-#: access/transam/xlog.c:3023 access/transam/xlog.c:8422
+#: catalog/heap.c:2427 rewrite/rewriteHandler.c:1030
 #, c-format
-msgid "could not stat file \"%s\": %m"
-msgstr "ファイル\"%s\"�stat�����ん���: %m"
+msgid "column \"%s\" is of type %s but default expression is of type %s"
+msgstr "列\"%s\"�型�%s����デフォルト��型�%s��"
 
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:195
+#: catalog/heap.c:2478
 #, c-format
-msgid "could not open tablespace directory \"%s\": %m"
-msgstr "テーブル空間�ディレクトリ\"%s\"をオープン����ん���: %m"
+msgid "only table \"%s\" can be referenced in check constraint"
+msgstr "検査制約��テーブル\"%s\"��を�照�る�������"
 
-#: utils/adt/arrayfuncs.c:210 utils/adt/arrayfuncs.c:222
-msgid "missing dimension value"
-msgstr "次元数��り��ん"
+#: catalog/heap.c:2487 commands/typecmds.c:2385
+msgid "cannot use subquery in check constraint"
+msgstr "�ェック制約��副�����を使用����ん"
 
-#: utils/adt/arrayfuncs.c:232
-msgid "missing \"]\" in array dimensions"
-msgstr "�列�次元�\"]\"��り��ん"
+#: catalog/heap.c:2491 commands/typecmds.c:2389
+msgid "cannot use aggregate function in check constraint"
+msgstr "�ェック制約��集約関数を使用����ん"
 
-#: utils/adt/arrayfuncs.c:240 utils/adt/arrayfuncs.c:2385
-#: utils/adt/arrayfuncs.c:2413 utils/adt/arrayfuncs.c:2428
-msgid "upper bound cannot be less than lower bound"
-msgstr "上�を下�より����る�������ん"
+#: catalog/heap.c:2495 commands/typecmds.c:2393
+msgid "cannot use window function in check constraint"
+msgstr "�ェック制約��ウィンドウ関数を使用����ん"
 
-#: utils/adt/arrayfuncs.c:252 utils/adt/arrayfuncs.c:278
-msgid "array value must start with \"{\" or dimension information"
-msgstr "�列値�\"[\"�次元情報�ら始�ら��れ��り��ん"
+#: catalog/heap.c:2734
+msgid "unsupported ON COMMIT and foreign key combination"
+msgstr "ON COMMIT�外部キー�組�����サ�ート�れ����ん"
 
-#: utils/adt/arrayfuncs.c:266
-msgid "missing assignment operator"
-msgstr "代入演算���り��ん"
+#: catalog/heap.c:2735
+#, c-format
+msgid ""
+"Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
+"setting."
+msgstr ""
+"テーブル\"%s\"�\"%s\"を�照���。�����れら�ON COMMIT設定��一���"
+"り��ん。"
 
-#: utils/adt/arrayfuncs.c:283 utils/adt/arrayfuncs.c:289
-msgid "array dimensions incompatible with array literal"
-msgstr "�列�次元��列リテラル�互�性��り��ん"
+#: catalog/heap.c:2740
+msgid "cannot truncate a table referenced in a foreign key constraint"
+msgstr "外部キー制約��照�れ��るテーブルを削除����ん"
 
-#: utils/adt/arrayfuncs.c:398 utils/adt/arrayfuncs.c:413
-#: utils/adt/arrayfuncs.c:422 utils/adt/arrayfuncs.c:436
-#: utils/adt/arrayfuncs.c:456 utils/adt/arrayfuncs.c:484
-#: utils/adt/arrayfuncs.c:489 utils/adt/arrayfuncs.c:529
-#: utils/adt/arrayfuncs.c:550 utils/adt/arrayfuncs.c:569
-#: utils/adt/arrayfuncs.c:679 utils/adt/arrayfuncs.c:688
-#: utils/adt/arrayfuncs.c:718 utils/adt/arrayfuncs.c:733
-#: utils/adt/arrayfuncs.c:786
+#: catalog/heap.c:2741
 #, c-format
-msgid "malformed array literal: \"%s\""
-msgstr "�列リテラル�書��誤�����: \"%s\""
+msgid "Table \"%s\" references \"%s\"."
+msgstr "テーブル\"%s\"�\"%s\"を�照���。"
 
-#: utils/adt/arrayfuncs.c:825 utils/adt/arrayfuncs.c:1422
-#: utils/adt/arrayfuncs.c:2740 utils/adt/arrayfuncs.c:2888
-#: utils/adt/arrayfuncs.c:4636 utils/adt/arrayutils.c:93
-#: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
+#: catalog/heap.c:2743
 #, c-format
-msgid "array size exceeds the maximum allowed (%d)"
-msgstr "�列�次数�上�(%d)を超�����"
+msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
+msgstr ""
+"�時�テーブル\"%s\"�truncate�れ���。TRUNCATE ... CASCADEを使用����"
+"��。"
 
-#: utils/adt/arrayfuncs.c:1192 utils/adt/arrayfuncs.c:2856
-#: utils/adt/arrayfuncs.c:4536 utils/adt/array_userfuncs.c:424
+#: catalog/pg_type.c:241
 #, c-format
-msgid "invalid number of dimensions: %d"
-msgstr "次数�無効��: %d"
-
-#: utils/adt/arrayfuncs.c:1203
-msgid "invalid array flags"
-msgstr "�列フラグ�無効��"
+msgid "invalid type internal size %d"
+msgstr "型�内部サイズ%d�無効��"
 
-#: utils/adt/arrayfuncs.c:1211
-msgid "wrong element type"
-msgstr "�素型�間������"
+#: catalog/pg_type.c:257 catalog/pg_type.c:265 catalog/pg_type.c:273
+#: catalog/pg_type.c:282
+#, c-format
+msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
+msgstr "値渡�型�サイズ� %2$d �場��アラインメント \"%1$c\" �無効��"
 
-#: utils/adt/arrayfuncs.c:1226 utils/adt/int.c:622 utils/adt/int.c:651
-#: utils/adt/int.c:672 utils/adt/int.c:692 utils/adt/int.c:714
-#: utils/adt/int.c:739 utils/adt/int.c:753 utils/adt/int.c:768
-#: utils/adt/int.c:903 utils/adt/int.c:924 utils/adt/int.c:951
-#: utils/adt/int.c:991 utils/adt/int.c:1012 utils/adt/int.c:1039
-#: utils/adt/int.c:1066 utils/adt/int.c:1120 utils/adt/varbit.c:1098
-#: utils/adt/varbit.c:1483 utils/adt/array_userfuncs.c:103
-#: utils/adt/array_userfuncs.c:113 utils/adt/int8.c:1196
-#: utils/adt/numeric.c:2062 utils/adt/numeric.c:2071 utils/adt/float.c:1101
-#: utils/adt/float.c:1160 utils/adt/float.c:2711 utils/adt/float.c:2727
-#: utils/adt/varlena.c:942 utils/adt/varlena.c:1915
-msgid "integer out of range"
-msgstr "integer�範囲外��"
+#: catalog/pg_type.c:289
+#, c-format
+msgid "internal size %d is invalid for passed-by-value type"
+msgstr "値渡�型�場��内部サイズ%d�無効��"
 
-#: utils/adt/arrayfuncs.c:1256 utils/cache/lsyscache.c:2305
+#: catalog/pg_type.c:298 catalog/pg_type.c:304
 #, c-format
-msgid "no binary input function available for type %s"
-msgstr "型%s���イナリ入力関数��り��ん"
+msgid "alignment \"%c\" is invalid for variable-length type"
+msgstr "�変長型�場��アラインメント \"%c\" �無効��"
 
-#: utils/adt/arrayfuncs.c:1360 utils/adt/rowtypes.c:557 libpq/pqformat.c:556
-#: libpq/pqformat.c:574 libpq/pqformat.c:595
-msgid "insufficient data left in message"
-msgstr "メッセージ内�残るデータ���分��"
+#: catalog/pg_type.c:312
+msgid "fixed-size types must have storage PLAIN"
+msgstr "固定長型�場�� PLAIN 格�方����れ��り��ん"
 
-#: utils/adt/arrayfuncs.c:1396
+#: catalog/pg_type.c:761
 #, c-format
-msgid "improper binary format in array element %d"
-msgstr "�列�素%d��イナリ書����切��"
+msgid "could not form array type name for type \"%s\""
+msgstr "\"%s\"型����列型���を形�����ん���"
 
-#: utils/adt/arrayfuncs.c:1478 utils/cache/lsyscache.c:2338
-#, c-format
-msgid "no binary output function available for type %s"
-msgstr "型%s���イナリ出力関数��り��ん"
+#: catalog/pg_aggregate.c:100
+msgid "cannot determine transition data type"
+msgstr "�移用�データ型を決定����ん"
 
-#: utils/adt/arrayfuncs.c:1852
-msgid "slices of fixed-length arrays not implemented"
-msgstr "固定長�列�部分�列�実装�れ����ん"
+#: catalog/pg_aggregate.c:101
+msgid ""
+"An aggregate using a polymorphic transition type must have at least one "
+"polymorphic argument."
+msgstr ""
+"�移用�型���多様型を使用�る集約�多様型�引数を少���も1��ら��れ�"
+"�り��ん。"
 
-#: utils/adt/arrayfuncs.c:2025 utils/adt/arrayfuncs.c:2047
-#: utils/adt/arrayfuncs.c:2081 utils/adt/arrayfuncs.c:2367
-#: utils/adt/arrayfuncs.c:4516 utils/adt/arrayfuncs.c:4548
-#: utils/adt/arrayfuncs.c:4565
-msgid "wrong number of array subscripts"
-msgstr "�列�添�字��正�数値��"
+#: catalog/pg_aggregate.c:124
+#, c-format
+msgid "return type of transition function %s is not %s"
+msgstr "�移関数�戻り値型%s�%s���り��ん"
 
-#: utils/adt/arrayfuncs.c:2030 utils/adt/arrayfuncs.c:2123
-#: utils/adt/arrayfuncs.c:2418
-msgid "array subscript out of range"
-msgstr "�列�添�字�範囲外��"
+#: catalog/pg_aggregate.c:144
+msgid ""
+"must not omit initial value when transition function is strict and "
+"transition type is not compatible with input type"
+msgstr ""
+"�移関数�STRICT���移用�型�入力型��イナリ互����場��期値を�略�"
+"���り��ん"
 
-#: utils/adt/arrayfuncs.c:2035
-msgid "cannot assign null value to an element of a fixed-length array"
-msgstr "固定長�列��素�NULL値を代入����ん"
+#: catalog/pg_aggregate.c:175 catalog/pg_proc.c:205
+msgid "cannot determine result data type"
+msgstr "�果�データ型を決定����ん"
 
-#: utils/adt/arrayfuncs.c:2321
-msgid "updates on slices of fixed-length arrays not implemented"
-msgstr "固定長�列�部分�列�更新�実装�れ����ん"
+#: catalog/pg_aggregate.c:176
+msgid ""
+"An aggregate returning a polymorphic type must have at least one polymorphic "
+"argument."
+msgstr ""
+"多様型を返�集約�少���も1��多様型�引数を�ら��れ��り��ん。"
 
-#: utils/adt/arrayfuncs.c:2357 utils/adt/arrayfuncs.c:2444
-msgid "source array too small"
-msgstr "元��列�������"
+#: catalog/pg_aggregate.c:188 catalog/pg_proc.c:211
+msgid "unsafe use of pseudo-type \"internal\""
+msgstr "\"internal\"仮想型��険�使用"
 
-#: utils/adt/arrayfuncs.c:2995
-msgid "null array element not allowed in this context"
-msgstr "��文脈��NULL��列�素�許�れ��ん"
+#: catalog/pg_aggregate.c:189 catalog/pg_proc.c:212
+msgid ""
+"A function returning \"internal\" must have at least one \"internal\" "
+"argument."
+msgstr ""
+"\"internal\"\"を返�関数�少���も1��\"internal\"型�引数を�ら��れ��"
+"り��ん。"
 
-#: utils/adt/arrayfuncs.c:3056 utils/adt/arrayfuncs.c:3263
-#: utils/adt/arrayfuncs.c:3463
-msgid "cannot compare arrays of different element types"
-msgstr "�素型�異�る�列を比較����ん"
+#: catalog/pg_aggregate.c:197
+msgid "sort operator can only be specified for single-argument aggregates"
+msgstr "ソート演算���一引数�集約���指定�能��"
 
-#: utils/adt/arrayfuncs.c:3079 utils/adt/arrayfuncs.c:3480
-#: utils/adt/rowtypes.c:1139 parser/parse_oper.c:260
+#: catalog/pg_aggregate.c:337
 #, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "型%s�等価性演算�を識別����ん���"
+msgid "function %s returns a set"
+msgstr "関数%s�集�を返���"
 
-#: utils/adt/arrayfuncs.c:4414 utils/adt/arrayfuncs.c:4454
-msgid "dimension array or low bound array cannot be NULL"
-msgstr "次元�列も���添字�下�� NULL ������り��ん"
+#: catalog/pg_aggregate.c:362
+#, c-format
+msgid "function %s requires run-time type coercion"
+msgstr "関数%s�実行時�型強制�必���"
 
-#: utils/adt/arrayfuncs.c:4517 utils/adt/arrayfuncs.c:4549
-msgid "Dimension array must be one dimensional."
-msgstr "次元�列�1次元���れ��り��ん"
+#: catalog/pg_largeobject.c:116 catalog/pg_largeobject.c:176
+#: catalog/aclchk.c:647 catalog/aclchk.c:3677 catalog/aclchk.c:4368
+#: catalog/objectaddress.c:199 storage/large_object/inv_api.c:277
+#, c-format
+msgid "large object %u does not exist"
+msgstr "ラージオブジェクト\"%u\"�存在���ん"
 
-#: utils/adt/arrayfuncs.c:4522 utils/adt/arrayfuncs.c:4554
-msgid "wrong range of array subscripts"
-msgstr "�列�添字�範囲�誤�����"
+#: catalog/index.c:220
+msgid "primary keys cannot be expressions"
+msgstr "プライマリキーを���る�������ん"
 
-#: utils/adt/arrayfuncs.c:4523 utils/adt/arrayfuncs.c:4555
-msgid "Lower bound of dimension array must be one."
-msgstr "次元�列�添字�下��１���れ��り��ん"
+#: catalog/index.c:730 catalog/index.c:1124
+msgid "user-defined indexes on system catalog tables are not supported"
+msgstr ""
+"ユーザ�よるシステムカタログテーブル�対�るインデックス�定義�サ�ート�れ"
+"����ん"
 
-#: utils/adt/arrayfuncs.c:4528 utils/adt/arrayfuncs.c:4560
-msgid "dimension values cannot be null"
-msgstr "次元値� null �許�れ��ん"
+#: catalog/index.c:740
+msgid "concurrent index creation on system catalog tables is not supported"
+msgstr "システムカタログテーブル��時インデックス作��サ�ート�れ����ん"
 
-#: utils/adt/arrayfuncs.c:4566
-msgid "Low bound array has different size than dimensions array."
-msgstr "下��列�次元�列�サイズ�異������"
+#: catalog/index.c:758
+msgid "shared indexes cannot be created after initdb"
+msgstr "initdb�後�共有インデックスを作�����ん"
 
-#: utils/adt/tsquery.c:177
+#: catalog/index.c:1727
 #, c-format
-msgid "no operand in tsquery: \"%s\""
-msgstr "tsquery内�オペランド��り��ん\"%s\""
+msgid "building index \"%s\" on table \"%s\""
+msgstr "テーブル\"%2$s\"用�インデックス \"%1$s\" を構築�����"
 
-#: utils/adt/tsquery.c:250
-#, c-format
-msgid "value is too big in tsquery: \"%s\""
-msgstr "tsquery内�値�大�����: \"%s\""
+#: catalog/index.c:2800
+msgid "cannot reindex temporary tables of other sessions"
+msgstr "他�セッション�一時テーブルを�インデックス付�����ん"
 
-#: utils/adt/tsquery.c:255
+#: catalog/pg_enum.c:113 catalog/pg_enum.c:199
 #, c-format
-msgid "operand is too long in tsquery: \"%s\""
-msgstr "tsquery�オペランド�長����: \"%s\""
+msgid "invalid enum label \"%s\""
+msgstr "列挙ラベル\"%s\"�無効��"
 
-#: utils/adt/tsquery.c:283
+#: catalog/pg_enum.c:114 catalog/pg_enum.c:200
 #, c-format
-msgid "word is too long in tsquery: \"%s\""
-msgstr "tsquery内��語�長����: \"%s\""
+msgid "Labels must be %d characters or less."
+msgstr "ラベル�%d文字数以内���れ��り��ん"
 
-#: utils/adt/tsquery.c:512
+#: catalog/pg_enum.c:264
 #, c-format
-msgid "text-search query doesn't contain lexemes: \"%s\""
-msgstr "テキスト検索������字��素を����ん: \"%s\""
+msgid "\"%s\" is not an existing enum label"
+msgstr "\"%s\" �既存�列挙型ラベル���り��ん"
 
-#: utils/adt/misc.c:80
-msgid "must be superuser to signal other server processes"
+#: catalog/pg_enum.c:325
+msgid "ALTER TYPE ADD BEFORE/AFTER is incompatible with binary upgrade"
 msgstr ""
-"他�サー�プロセス�シグナルを�る����スーパーユーザ���れ��り��ん"
+"ALTER TYPE ADD BEFORE/AFTER ��イナリアップグレード��互�性��り��ん"
 
-#: utils/adt/misc.c:89
-#, c-format
-msgid "PID %d is not a PostgreSQL server process"
-msgstr "PID %d�PostgreSQLサー�プロセス���り��ん"
+#: catalog/pg_proc.c:206
+msgid ""
+"A function returning a polymorphic type must have at least one polymorphic "
+"argument."
+msgstr ""
+"多様型を返�関数�少���も1��多様型�引数を�ら��れ��り��ん。"
 
-#: utils/adt/misc.c:102 storage/lmgr/proc.c:1012
+#: catalog/pg_proc.c:224
 #, c-format
-msgid "could not send signal to process %d: %m"
-msgstr "プロセス%d�シグナルを�信����ん���: %m"
-
-#: utils/adt/misc.c:126
-msgid "must be superuser to signal the postmaster"
-msgstr "postmaster�シグナルを�る����スーパーユーザ���れ��り��ん"
+msgid "\"%s\" is already an attribute of type %s"
+msgstr "\"%s\"����型%s�属性��"
 
-#: utils/adt/misc.c:131
+#: catalog/pg_proc.c:363
 #, c-format
-msgid "failed to send signal to postmaster: %m"
-msgstr "postmaster�シグナルを�信����ん���: %m"
+msgid "function \"%s\" already exists with same argument types"
+msgstr "��引数型を��関数\"%s\"����存在���"
 
-#: utils/adt/misc.c:148
-msgid "must be superuser to rotate log files"
-msgstr "ログファイルをローテート��る��スーパーユーザ���れ��り��ん"
+#: catalog/pg_proc.c:377 catalog/pg_proc.c:399
+msgid "cannot change return type of existing function"
+msgstr "既存�関数�戻り値型を変更����ん"
 
-#: utils/adt/misc.c:153
-msgid "rotation not possible because log collection not active"
-msgstr "ログ�集�活動�����ん��ローテーションを行��������ん"
+#: catalog/pg_proc.c:378 catalog/pg_proc.c:401 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:466 catalog/pg_proc.c:492
+msgid "Use DROP FUNCTION first."
+msgstr "��DROP FUNCTIONを使用������。"
 
-#: utils/adt/misc.c:195
-msgid "global tablespace never has databases"
-msgstr "グロー�ルテーブル空間�データベース��り��ん"
+#: catalog/pg_proc.c:400
+msgid "Row type defined by OUT parameters is different."
+msgstr "OUTパラメータ�定義�れ�行型�異�り��。"
 
-#: utils/adt/misc.c:216
+#: catalog/pg_proc.c:441
 #, c-format
-msgid "%u is not a tablespace OID"
-msgstr "%u�テーブル空間�OID���り��ん"
+msgid "cannot change name of input parameter \"%s\""
+msgstr "入力パラメーター \"%s\" ��称を変更����ん"
 
-#: utils/adt/misc.c:352
-msgid "unreserved"
-msgstr "予約�れ����ん"
-
-#: utils/adt/misc.c:356
-msgid "unreserved (cannot be function or type name)"
-msgstr "予約�れ����ん（関数���型�������ん）"
-
-#: utils/adt/misc.c:360
-msgid "reserved (can be function or type name)"
-msgstr "予約�れ����（関数���型������）"
+#: catalog/pg_proc.c:465
+msgid "cannot remove parameter defaults from existing function"
+msgstr "既存�関数�らパラメータ�デフォルト値を削除����ん"
 
-#: utils/adt/misc.c:364
-msgid "reserved"
-msgstr "予約�れ����"
+#: catalog/pg_proc.c:491
+msgid "cannot change data type of existing parameter default value"
+msgstr "既存�パラメータ�デフォルト値�データ型を変更����ん"
 
-#. translator: first %s is inet or cidr
-#: utils/adt/network.c:107 utils/adt/datetime.c:3543
+#: catalog/pg_proc.c:503
 #, c-format
-msgid "invalid input syntax for type %s: \"%s\""
-msgstr "\"%s\"型�入力構文�無効��: \"%s\""
+msgid "function \"%s\" is an aggregate function"
+msgstr "関数 \"%s\" �集約関数��"
 
-#: utils/adt/network.c:118
+#: catalog/pg_proc.c:508
 #, c-format
-msgid "invalid cidr value: \"%s\""
-msgstr "CIDR値�無効��: \"%s\""
+msgid "function \"%s\" is not an aggregate function"
+msgstr "関数 \"%s\" �集約関数���り��ん"
 
-#: utils/adt/network.c:119 utils/adt/network.c:249
-msgid "Value has bits set to right of mask."
-msgstr "値��マスク����セット�れ�ビット��り��"
+#: catalog/pg_proc.c:516
+#, c-format
+msgid "function \"%s\" is a window function"
+msgstr "関数 \"%s\" �ウィンドウ関数��"
 
-#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
-#: utils/adt/network.c:664
+#: catalog/pg_proc.c:521
 #, c-format
-msgid "could not format inet value: %m"
-msgstr "inet値を整形����ん: %m"
+msgid "function \"%s\" is not a window function"
+msgstr "関数 \"%s\" �ウィンドウ関数���り��ん"
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:217
+#: catalog/pg_proc.c:695
 #, c-format
-msgid "invalid address family in external \"%s\" value"
-msgstr "外部 \"%s\" 値内�アドレスファミリ�無効��"
+msgid "there is no built-in function named \"%s\""
+msgstr "\"%s\"������関数�組�込�れ����ん"
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:224
+#: catalog/pg_proc.c:787
 #, c-format
-msgid "invalid bits in external \"%s\" value"
-msgstr "外部 \"%s\" 値内�ビット�無効��"
+msgid "SQL functions cannot return type %s"
+msgstr "SQL関数�型%sを返��������ん"
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:233
+#: catalog/pg_proc.c:802
 #, c-format
-msgid "invalid length in external \"%s\" value"
-msgstr "外部 \"%s\" 値内�長��無効��"
+msgid "SQL functions cannot have arguments of type %s"
+msgstr "SQL関数�型%s�引数��る�������ん"
 
-#: utils/adt/network.c:248
-msgid "invalid external \"cidr\" value"
-msgstr "\"cidr\"�外部値�無効��"
+#: catalog/catalog.c:76
+msgid "invalid fork name"
+msgstr "無効�分����"
 
-#: utils/adt/network.c:370 utils/adt/network.c:397
+#: catalog/catalog.c:77
+msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
+msgstr "有効�分���\"main\"�\"fsm\"�よ�\"vm\" ��"
+
+#: catalog/dependency.c:589
 #, c-format
-msgid "invalid mask length: %d"
-msgstr "マスク長�無効��: %d"
+msgid "cannot drop %s because %s requires it"
+msgstr "%2$s�必�����る��%1$sを削除����ん"
 
-#: utils/adt/network.c:682
+#: catalog/dependency.c:592
 #, c-format
-msgid "could not format cidr value: %m"
-msgstr "cidr値を整形����ん: %m"
+msgid "You can drop %s instead."
+msgstr "代�り�%sを削除����"
 
-#: utils/adt/network.c:1255
-msgid "cannot AND inet values of different sizes"
-msgstr "サイズ�異�るinet値�AND�����ん"
+#: catalog/dependency.c:864
+#, c-format
+msgid "drop auto-cascades to %s"
+msgstr "%s��自動カスケードを削除���"
 
-#: utils/adt/network.c:1287
-msgid "cannot OR inet values of different sizes"
-msgstr "サイズ�異�るinet値�OR�����ん"
+#: catalog/dependency.c:876 catalog/dependency.c:885
+#, c-format
+msgid "%s depends on %s"
+msgstr "%s�%s��存���"
 
-#: utils/adt/network.c:1348 utils/adt/network.c:1424
-msgid "result is out of range"
-msgstr "�果�範囲外��"
+#: catalog/dependency.c:897 catalog/dependency.c:906
+#, c-format
+msgid "drop cascades to %s"
+msgstr "%s��カスケードを削除���"
 
-#: utils/adt/network.c:1389
-msgid "cannot subtract inet values of different sizes"
-msgstr "サイズ�異�るinet値�引�算�����ん"
+#: catalog/dependency.c:926
+#, c-format
+msgid "cannot drop %s because other objects depend on it"
+msgstr "他�オブジェクト��存�������%sを削除����ん"
 
-#: utils/adt/formatting.c:491
-msgid "invalid format specification for an interval value"
-msgstr "\"tinterval\"値�書�指定�無効��"
+#: catalog/dependency.c:930 catalog/dependency.c:937
+msgid "Use DROP ... CASCADE to drop the dependent objects too."
+msgstr ""
+"�存���るオブジェクトも削除�る��DROP ... CASCADEを使用������"
 
-#: utils/adt/formatting.c:492
-msgid "Intervals are not tied to specific calendar dates."
-msgstr "時間間隔�特定�暦日付���������ん"
+#: catalog/dependency.c:934
+msgid "cannot drop desired object(s) because other objects depend on them"
+msgstr "他�オブジェクト��存���る��希望�るオブジェクトを削除����ん"
 
-#: utils/adt/formatting.c:1059
-msgid "\"EEEE\" must be the last pattern used"
-msgstr "\"EEEE\" �最終パターン���れ��り��ん。"
+#. translator: %d always has a value larger than 1
+#: catalog/dependency.c:943
+#, c-format
+msgid "drop cascades to %d other object"
+msgid_plural "drop cascades to %d other objects"
+msgstr[0] "他� %d 個�オブジェクト��カスケードを削除���"
+msgstr[1] "他� %d 個�オブジェクト��カスケードを削除���"
 
-#: utils/adt/formatting.c:1067
-msgid "\"9\" must be ahead of \"PR\""
-msgstr "\"9\"�\"PR\"�����れ��り��ん"
+#: catalog/dependency.c:2177
+#, c-format
+msgid " column %s"
+msgstr " 列 %s"
 
-#: utils/adt/formatting.c:1083
-msgid "\"0\" must be ahead of \"PR\""
-msgstr "\"0\"�\"PR\"�����れ��り��ん"
+#: catalog/dependency.c:2183
+#, c-format
+msgid "function %s"
+msgstr "関数 %s"
 
-#: utils/adt/formatting.c:1109
-msgid "multiple decimal points"
-msgstr "複数��数点��り��"
+#: catalog/dependency.c:2188
+#, c-format
+msgid "type %s"
+msgstr "åž‹ %s"
 
-#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
-msgid "cannot use \"V\" and decimal point together"
-msgstr "\"V\"��数点を混在����ん"
+#: catalog/dependency.c:2218
+#, c-format
+msgid "cast from %s to %s"
+msgstr "%s�ら%s��キャスト"
 
-#: utils/adt/formatting.c:1125
-msgid "cannot use \"S\" twice"
-msgstr "\"S\" �１回��使用����ん"
+#: catalog/dependency.c:2238
+#, c-format
+msgid "collation %s"
+msgstr "照�順� %s"
 
-#: utils/adt/formatting.c:1129
-msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
-msgstr "\"S\"�\"PL\"/\"MI\"/\"SG\"/\"PR\"を混在����ん"
+#: catalog/dependency.c:2262
+#, c-format
+msgid "constraint %s on %s"
+msgstr "%2$s �対�る制約 %1$s"
 
-#: utils/adt/formatting.c:1149
-msgid "cannot use \"S\" and \"MI\" together"
-msgstr "\"S\"�\"MI\"を混在����ん"
+#: catalog/dependency.c:2268
+#, c-format
+msgid "constraint %s"
+msgstr "制約 %s"
 
-#: utils/adt/formatting.c:1159
-msgid "cannot use \"S\" and \"PL\" together"
-msgstr "\"S\"�\"PL\"を混在����ん"
+#: catalog/dependency.c:2285
+#, c-format
+msgid "conversion %s"
+msgstr "変� %s"
 
-#: utils/adt/formatting.c:1169
-msgid "cannot use \"S\" and \"SG\" together"
-msgstr "\"S\"�\"SG\"を混在����ん"
+#: catalog/dependency.c:2322
+#, c-format
+msgid "default for %s"
+msgstr "%s用�デフォルト"
 
-#: utils/adt/formatting.c:1178
-msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
-msgstr "\"PR\"�\"S\"/\"PL\"/\"MI\"/\"SG\"を混在����ん"
+#: catalog/dependency.c:2339
+#, c-format
+msgid "language %s"
+msgstr "言語%s"
 
-#: utils/adt/formatting.c:1204
-msgid "cannot use \"EEEE\" twice"
-msgstr "\"EEEE\" �１回��使用����ん"
+#: catalog/dependency.c:2345
+#, c-format
+msgid "large object %u"
+msgstr "ラージオブジェクト %u"
 
-#: utils/adt/formatting.c:1210
-msgid "\"EEEE\" is incompatible with other formats"
-msgstr "\"EEEE\" �他�フォーマット�互�性��り��ん。"
+#: catalog/dependency.c:2350
+#, c-format
+msgid "operator %s"
+msgstr "演算�%s"
 
-#: utils/adt/formatting.c:1211
-msgid ""
-"\"EEEE\" may only be used together with digit and decimal point patterns."
-msgstr "\"EEEE\" �数値����数点パターン�共�指定������。"
+#: catalog/dependency.c:2382
+#, c-format
+msgid "operator class %s for access method %s"
+msgstr "アクセスメソッド%2$s用�演算�クラス%1$s"
 
-#: utils/adt/formatting.c:1411
+#: catalog/dependency.c:2433
 #, c-format
-msgid "\"%s\" is not a number"
-msgstr "\"%s\"�数値���り��ん"
+msgid "operator %d (%s, %s) of %s: %s"
+msgstr "%4$s �演算� %1$d (%2$s, %3$s): %5$s"
 
-#: utils/adt/formatting.c:1788
-msgid "invalid combination of date conventions"
-msgstr "日付表��組�����無効��"
+#: catalog/dependency.c:2484
+#, c-format
+msgid "function %d (%s, %s) of %s: %s"
+msgstr "%4$s �関数 %1$d (%2$s, %3$s): %5$s"
 
-#: utils/adt/formatting.c:1789
-msgid ""
-"Do not mix Gregorian and ISO week date conventions in a formatting template."
-msgstr ""
-"書�テンプレート�中���グレゴリア暦� ISO �週日表�を混在�����り��"
-"ん。"
+#: catalog/dependency.c:2524
+#, c-format
+msgid "rule %s on "
+msgstr "�ルール %s"
 
-#: utils/adt/formatting.c:1806
+#: catalog/dependency.c:2559
 #, c-format
-msgid "conflicting values for \"%s\" field in formatting string"
-msgstr "\"%s\" フィールド�値�書�文字列�競������"
+msgid "trigger %s on "
+msgstr "トリガ %s�対象:"
 
-#: utils/adt/formatting.c:1808
-msgid "This value contradicts a previous setting for the same field type."
-msgstr "��値を��フィールド型��る���り�直��設定�矛盾�����"
+#: catalog/dependency.c:2576
+#, c-format
+msgid "schema %s"
+msgstr "スキーマ %s"
 
-#: utils/adt/formatting.c:1869
+#: catalog/dependency.c:2589
 #, c-format
-msgid "source string too short for \"%s\" formatting field"
-msgstr "書�フィールド \"%s\" ��元�文字列�短����"
+msgid "text search parser %s"
+msgstr "テキスト検索パーサ %s"
 
-#: utils/adt/formatting.c:1871
+#: catalog/dependency.c:2604
 #, c-format
-msgid "Field requires %d characters, but only %d remain."
-msgstr "フィールド�� %d 文字必�����%d 文字��残�����ん"
+msgid "text search dictionary %s"
+msgstr "テキスト検索辞書 %s"
 
-#: utils/adt/formatting.c:1874 utils/adt/formatting.c:1888
-msgid ""
-"If your source string is not fixed-width, try using the \"FM\" modifier."
-msgstr "元�文字列�固定長���場���修飾� \"FM\" を試��������"
+#: catalog/dependency.c:2619
+#, c-format
+msgid "text search template %s"
+msgstr "テキスト検索テンプレート %s"
 
-#: utils/adt/formatting.c:1884 utils/adt/formatting.c:1897
-#: utils/adt/formatting.c:2027
+#: catalog/dependency.c:2634
 #, c-format
-msgid "invalid value \"%s\" for \"%s\""
-msgstr " \"%2$s\" �セット�る���値 \"%1$s\" �無効��"
+msgid "text search configuration %s"
+msgstr "テキスト検索設定 %s"
 
-#: utils/adt/formatting.c:1886
+#: catalog/dependency.c:2642
 #, c-format
-msgid "Field requires %d characters, but only %d could be parsed."
-msgstr ""
-"��フィールド�� %d 文字必�����%d 文字��検出�れ��ん���。"
+msgid "role %s"
+msgstr "ロール %s"
 
-#: utils/adt/formatting.c:1899
-msgid "Value must be an integer."
-msgstr "�ッシュプロシージャ�整数を返���れ��り��ん"
+#: catalog/dependency.c:2655
+#, c-format
+msgid "database %s"
+msgstr "データベース %s"
 
-#: utils/adt/formatting.c:1904
+#: catalog/dependency.c:2667
 #, c-format
-msgid "value for \"%s\" in source string is out of range"
-msgstr "も��文字列����  \"%s\" ����値�範囲外��"
+msgid "tablespace %s"
+msgstr "テーブル空間 %s"
 
-#: utils/adt/formatting.c:1906
+#: catalog/dependency.c:2676
 #, c-format
-msgid "Value must be in the range %d to %d."
-msgstr "値� %d �ら %d ���範囲��る必���り��。"
+msgid "foreign-data wrapper %s"
+msgstr "外部データラッパー %s"
 
-#: utils/adt/formatting.c:2029
-msgid "The given value did not match any of the allowed values for this field."
-msgstr "与�られ�値���項目�対��許�れる��れ�値�もマッ����ん"
+#: catalog/dependency.c:2685
+#, c-format
+msgid "server %s"
+msgstr "サー� %s"
 
-#: utils/adt/formatting.c:2585
-msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
-msgstr "to_date �� \"TZ\"/\"tz\" 形��パターンをサ�ート�����ん"
+#: catalog/dependency.c:2710
+#, c-format
+msgid "user mapping for %s"
+msgstr "%s �ユーザマッピング"
 
-#: utils/adt/formatting.c:2689
-msgid "invalid input string for \"Y,YYY\""
-msgstr " \"Y,YYY\" �セット�る���入力文字列�有効���り��ん"
+#: catalog/dependency.c:2744
+#, c-format
+msgid "default privileges on new relations belonging to role %s"
+msgstr "新��リレーション�関�るデフォルト�権���ロール %s �属���。"
 
-#: utils/adt/formatting.c:2956 utils/adt/formatting.c:2988
-#: utils/adt/formatting.c:3056 utils/adt/timestamp.c:226
-#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
-#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
-#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
-#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
-#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
-#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
-#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
-#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
-#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
-#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
-#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
-#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
-#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
-#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
-#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
-#: utils/adt/timestamp.c:4614 utils/adt/nabstime.c:480
-#: utils/adt/nabstime.c:523 utils/adt/nabstime.c:553 utils/adt/nabstime.c:596
-#: utils/adt/date.c:880 utils/adt/date.c:927 utils/adt/date.c:1483
-#: utils/adt/date.c:1520 utils/adt/date.c:2394 utils/adt/xml.c:1711
-#: utils/adt/xml.c:1718 utils/adt/xml.c:1738 utils/adt/xml.c:1745
-msgid "timestamp out of range"
-msgstr "timestamp�範囲外��"
+#: catalog/dependency.c:2749
+#, c-format
+msgid "default privileges on new sequences belonging to role %s"
+msgstr "新��シーケンス�関�るデフォルト�権���ロール %s �属���。"
 
-#: utils/adt/formatting.c:3206
+#: catalog/dependency.c:2754
 #, c-format
-msgid "hour \"%d\" is invalid for the 12-hour clock"
-msgstr "12時間形��� \"%d\" 時�無効��"
+msgid "default privileges on new functions belonging to role %s"
+msgstr "新��関数�関�るデフォルト�権���ロール %s �属���。"
 
-#: utils/adt/formatting.c:3208
-msgid "Use the 24-hour clock, or give an hour between 1 and 12."
-msgstr "24時間形�を使���も��� 1 �ら 12 �間�指定������"
+#: catalog/dependency.c:2760
+#, c-format
+msgid "default privileges belonging to role %s"
+msgstr "デフォルト�権��ロール %s �属���。"
 
-#: utils/adt/formatting.c:3246
+#: catalog/dependency.c:2768
 #, c-format
-msgid "inconsistent use of year %04d and \"BC\""
-msgstr "年%04d�\"BC\"�使用��一貫性��り��ん"
+msgid " in schema %s"
+msgstr "スキーマ %s ����"
 
-#: utils/adt/formatting.c:3293
-msgid "cannot calculate day of year without year information"
-msgstr "年�情報����年内日数を計算����ん"
+#: catalog/dependency.c:2785
+#, c-format
+msgid "extension %s"
+msgstr "拡張機能 %s"
 
-#: utils/adt/formatting.c:4151
-msgid "\"EEEE\" not supported for input"
-msgstr "\"EEEE\" �入力��サ�ート�れ����ん"
+#: catalog/dependency.c:2843
+#, c-format
+msgid "table %s"
+msgstr "テーブル %s"
 
-#: utils/adt/formatting.c:4163
-msgid "\"RN\" not supported for input"
-msgstr "\"RN\" �入力��サ�ート�れ����ん"
+#: catalog/dependency.c:2847
+#, c-format
+msgid "index %s"
+msgstr "インデックス %s"
 
-#: utils/adt/pseudotypes.c:94
-msgid "cannot accept a value of type any"
-msgstr "型any�値を��付�られ��ん"
+#: catalog/dependency.c:2851
+#, c-format
+msgid "sequence %s"
+msgstr "シーケンス%s"
 
-#: utils/adt/pseudotypes.c:107
-msgid "cannot display a value of type any"
-msgstr "型any�値を表示����ん"
+#: catalog/dependency.c:2855
+#, c-format
+msgid "uncataloged table %s"
+msgstr "カタログ���テーブル%s"
 
-#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
-msgid "cannot accept a value of type anyarray"
-msgstr "型anyarray�値を��付�られ��ん"
+#: catalog/dependency.c:2859
+#, c-format
+msgid "toast table %s"
+msgstr "TOASTテーブル%s"
 
-#: utils/adt/pseudotypes.c:174
-msgid "cannot accept a value of type anyenum"
-msgstr "anyenum型�値を��付�られ��ん"
+#: catalog/dependency.c:2863
+#, c-format
+msgid "view %s"
+msgstr "ビュー%s"
 
-#: utils/adt/pseudotypes.c:224
-msgid "cannot accept a value of type trigger"
-msgstr "型trigger�値を��付�られ��ん"
+#: catalog/dependency.c:2867
+#, c-format
+msgid "composite type %s"
+msgstr "複�型%s"
 
-#: utils/adt/pseudotypes.c:237
-msgid "cannot display a value of type trigger"
-msgstr "型trigger�値を表示����ん"
+#: catalog/dependency.c:2871
+#, c-format
+msgid "foreign table %s"
+msgstr "外部テーブル %s"
 
-#: utils/adt/pseudotypes.c:251
-msgid "cannot accept a value of type language_handler"
-msgstr "型language_handler�値を��付�られ��ん"
+#: catalog/dependency.c:2876
+#, c-format
+msgid "relation %s"
+msgstr "リレーション%s"
 
-#: utils/adt/pseudotypes.c:264
-msgid "cannot display a value of type language_handler"
-msgstr "型language_handler�値を表示����ん"
+#: catalog/dependency.c:2913
+#, c-format
+msgid "operator family %s for access method %s"
+msgstr "アクセスメソッド%2$s用�演算��%1$s"
 
-#: utils/adt/pseudotypes.c:278
-msgid "cannot accept a value of type internal"
-msgstr "型interval�値を��付�られ��ん"
+#: catalog/pg_constraint.c:654 commands/typecmds.c:2320
+#, c-format
+msgid "constraint \"%s\" for domain \"%s\" already exists"
+msgstr "ドメイン\"%2$s\"�制約\"%1$s\"����存在���"
 
-#: utils/adt/pseudotypes.c:291
-msgid "cannot display a value of type internal"
-msgstr "型interval�値を表示����ん"
+#: catalog/pg_constraint.c:773
+#, c-format
+msgid "table \"%s\" has multiple constraints named \"%s\""
+msgstr "テーブル\"%s\"��複数�\"%s\"������制約��り��"
 
-#: utils/adt/pseudotypes.c:305
-msgid "cannot accept a value of type opaque"
-msgstr "型opaque�値を��付�られ��ん"
+#: catalog/pg_constraint.c:785
+#, c-format
+msgid "constraint \"%s\" for table \"%s\" does not exist"
+msgstr "テーブル\"%2$s\"�制約\"%1$s\"�存在���ん"
 
-#: utils/adt/pseudotypes.c:318
-msgid "cannot display a value of type opaque"
-msgstr "型opaque�値を表示����ん"
+#: catalog/aclchk.c:200
+msgid "grant options can only be granted to roles"
+msgstr "グラントオプション�ロール���与�る�������"
 
-#: utils/adt/pseudotypes.c:332
-msgid "cannot accept a value of type anyelement"
-msgstr "型anyelement�値を��付�られ��ん"
+#: catalog/aclchk.c:316
+#, c-format
+msgid "no privileges were granted for column \"%s\" of relation \"%s\""
+msgstr "リレーション \"%2$s\" �カラム \"%1$s\" ��権��付与�れ��ん���"
 
-#: utils/adt/pseudotypes.c:345
-msgid "cannot display a value of type anyelement"
-msgstr "型anyelement�値を表示����ん"
+#: catalog/aclchk.c:321
+#, c-format
+msgid "no privileges were granted for \"%s\""
+msgstr "\"%s\"��権��付与�れ��ん���"
 
-#: utils/adt/pseudotypes.c:358
-msgid "cannot accept a value of type anynonarray"
-msgstr "型anynonarray�値を��付�られ��ん"
+#: catalog/aclchk.c:329
+#, c-format
+msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
+msgstr ""
+"リレーション \"%2$s\" �カラム \"%1$s\" ��全��権��付与�れ������"
+"り��ん"
 
-#: utils/adt/pseudotypes.c:371
-msgid "cannot display a value of type anynonarray"
-msgstr "型anynonarray�値を表示����ん"
+#: catalog/aclchk.c:334
+#, c-format
+msgid "not all privileges were granted for \"%s\""
+msgstr "\"%s\"��全��権��付与�れ������り��ん"
 
-#: utils/adt/pseudotypes.c:384
-msgid "cannot accept a value of a shell type"
-msgstr "シェル型�値を��付�られ��ん"
+#: catalog/aclchk.c:345
+#, c-format
+msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
+msgstr ""
+"リレーション \"%2$s\" �カラム \"%1$s\" �ら�権��剥奪�������能性�"
+"�り��"
 
-#: utils/adt/pseudotypes.c:397
-msgid "cannot display a value of a shell type"
-msgstr "シェル型�値を表示����ん"
+#: catalog/aclchk.c:350
+#, c-format
+msgid "no privileges could be revoked for \"%s\""
+msgstr "\"%s\"�権�を剥奪�������能性��り��"
 
-#: utils/adt/int.c:162
-msgid "int2vector has too many elements"
-msgstr "int2vector��素数�多����"
+#: catalog/aclchk.c:358
+#, c-format
+msgid ""
+"not all privileges could be revoked for column \"%s\" of relation \"%s\""
+msgstr ""
+"リレーション \"%2$s\" �カラム \"%1$s\" �ら�全��権��剥奪�������"
+"�り��ん"
 
-#: utils/adt/int.c:236
-msgid "invalid int2vector data"
-msgstr "int2vectorデータ�無効��"
+#: catalog/aclchk.c:363
+#, c-format
+msgid "not all privileges could be revoked for \"%s\""
+msgstr "\"%s\"�全��権�を�り上�られ��ん���"
 
-#: utils/adt/int.c:242 utils/adt/oid.c:212 utils/adt/oid.c:292
-msgid "oidvector has too many elements"
-msgstr "oidvector��素�多����"
+#: catalog/aclchk.c:442 catalog/aclchk.c:891
+#, c-format
+msgid "invalid privilege type %s for relation"
+msgstr "リレーション��権��タイプ %s �無効��"
 
-#: utils/adt/int.c:348 utils/adt/int.c:784 utils/adt/int.c:813
-#: utils/adt/int.c:834 utils/adt/int.c:854 utils/adt/int.c:882
-#: utils/adt/int.c:1135 utils/adt/int8.c:1221 utils/adt/numeric.c:2163
-#: utils/adt/numeric.c:2174 utils/adt/float.c:1119 utils/adt/float.c:1177
-msgid "smallint out of range"
-msgstr "smallint�範囲外��"
+#: catalog/aclchk.c:446 catalog/aclchk.c:895
+#, c-format
+msgid "invalid privilege type %s for sequence"
+msgstr "シーケンス��権��タイプ %s �無効��"
 
-#: utils/adt/int.c:728 utils/adt/int.c:869 utils/adt/int.c:965
-#: utils/adt/int.c:1053 utils/adt/int.c:1079 utils/adt/int.c:1099
-#: utils/adt/geo_ops.c:4121 utils/adt/timestamp.c:2876 utils/adt/cash.c:524
-#: utils/adt/cash.c:575 utils/adt/cash.c:624 utils/adt/cash.c:676
-#: utils/adt/cash.c:726 utils/adt/int8.c:597 utils/adt/int8.c:644
-#: utils/adt/int8.c:820 utils/adt/int8.c:916 utils/adt/int8.c:1004
-#: utils/adt/int8.c:1100 utils/adt/numeric.c:4298 utils/adt/numeric.c:4581
-#: utils/adt/float.c:764 utils/adt/float.c:828 utils/adt/float.c:2470
-#: utils/adt/float.c:2533
-msgid "division by zero"
-msgstr "0 �よる除算�行�れ���"
+#: catalog/aclchk.c:450
+#, c-format
+msgid "invalid privilege type %s for database"
+msgstr "データベース��権��他タイプ %s �無効��"
 
-#: utils/adt/int.c:1323 utils/adt/timestamp.c:4712 utils/adt/timestamp.c:4793
-#: utils/adt/int8.c:1358
-msgid "step size cannot equal zero"
-msgstr "ステップ数をゼロ��る�������ん"
+#: catalog/aclchk.c:454 catalog/aclchk.c:899
+#, c-format
+msgid "invalid privilege type %s for function"
+msgstr "関数��権��タイプ %s �無効��"
 
-#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
+#: catalog/aclchk.c:458
 #, c-format
-msgid "invalid input syntax for type oid: \"%s\""
-msgstr "型oid�入力構文�無効��: \"%s\""
+msgid "invalid privilege type %s for language"
+msgstr "言語��権��タイプ %s �無効��"
 
-#: utils/adt/oid.c:69 utils/adt/oid.c:107
+#: catalog/aclchk.c:462
 #, c-format
-msgid "value \"%s\" is out of range for type oid"
-msgstr "値\"%s\"�型oid�範囲外��"
+msgid "invalid privilege type %s for large object"
+msgstr "ラージオブジェクト�対��権��タイプ %s �無効��"
 
-#: utils/adt/oid.c:286
-msgid "invalid oidvector data"
-msgstr "oidvectorデータ�無効��"
+#: catalog/aclchk.c:466
+#, c-format
+msgid "invalid privilege type %s for schema"
+msgstr "スキーマ��権��タイプ %s �無効��"
 
-#: utils/adt/acl.c:164 utils/adt/name.c:87
-msgid "identifier too long"
-msgstr "識別��長����"
+#: catalog/aclchk.c:470
+#, c-format
+msgid "invalid privilege type %s for tablespace"
+msgstr "テーブルスペース��権��タイプ %s �無効��"
 
-#: utils/adt/acl.c:165 utils/adt/name.c:88
+#: catalog/aclchk.c:474
 #, c-format
-msgid "Identifier must be less than %d characters."
-msgstr "識別��%d文字より短���れ��り��ん。"
+msgid "invalid privilege type %s for foreign-data wrapper"
+msgstr "外部データラッパー��権��タイプ %s �無効��"
 
-#: utils/adt/acl.c:251
+#: catalog/aclchk.c:478
 #, c-format
-msgid "unrecognized key word: \"%s\""
-msgstr "キーワード��明��: \"%s\""
+msgid "invalid privilege type %s for foreign server"
+msgstr "外部サー���権��タイプ %s �無効��"
 
-#: utils/adt/acl.c:252
-msgid "ACL key word must be \"group\" or \"user\"."
-msgstr "ACLキーワード�\"group\"���\"user\"���れ��り��ん。"
+#: catalog/aclchk.c:517
+msgid "column privileges are only valid for relations"
+msgstr "リレーション��権��タイプ %s �無効��"
 
-#: utils/adt/acl.c:257
-msgid "missing name"
-msgstr "����り��ん"
+#: catalog/aclchk.c:833 catalog/aclchk.c:841 commands/collationcmds.c:93
+#: commands/foreigncmds.c:386 commands/foreigncmds.c:395
+#: commands/sequence.c:1135 commands/sequence.c:1143 commands/sequence.c:1151
+#: commands/sequence.c:1159 commands/sequence.c:1167 commands/sequence.c:1175
+#: commands/sequence.c:1183 commands/sequence.c:1191
+#: commands/functioncmds.c:488 commands/functioncmds.c:578
+#: commands/functioncmds.c:586 commands/functioncmds.c:594
+#: commands/functioncmds.c:1982 commands/functioncmds.c:1990
+#: commands/extension.c:1248 commands/extension.c:1256
+#: commands/extension.c:1264 commands/extension.c:2473 commands/user.c:133
+#: commands/user.c:150 commands/user.c:158 commands/user.c:166
+#: commands/user.c:174 commands/user.c:182 commands/user.c:190
+#: commands/user.c:198 commands/user.c:206 commands/user.c:214
+#: commands/user.c:222 commands/user.c:230 commands/user.c:501
+#: commands/user.c:513 commands/user.c:521 commands/user.c:529
+#: commands/user.c:537 commands/user.c:545 commands/user.c:553
+#: commands/user.c:561 commands/user.c:570 commands/user.c:578
+#: commands/copy.c:863 commands/copy.c:881 commands/copy.c:889
+#: commands/copy.c:897 commands/copy.c:905 commands/copy.c:913
+#: commands/copy.c:921 commands/copy.c:929 commands/copy.c:945
+#: commands/copy.c:959 commands/dbcommands.c:146 commands/dbcommands.c:154
+#: commands/dbcommands.c:162 commands/dbcommands.c:170
+#: commands/dbcommands.c:178 commands/dbcommands.c:186
+#: commands/dbcommands.c:194 commands/dbcommands.c:1315
+#: commands/dbcommands.c:1323 commands/typecmds.c:282
+msgid "conflicting or redundant options"
+msgstr "競��るオプション��る��余計�オプション��り��"
 
-#: utils/adt/acl.c:258
-msgid "A name must follow the \"group\" or \"user\" key word."
-msgstr "\"group\"���\"user\"キーワード�後�����必���。"
+#: catalog/aclchk.c:932
+msgid "default privileges cannot be set for columns"
+msgstr "デフォルト権��列��設定����ん"
 
-#: utils/adt/acl.c:264
-msgid "missing \"=\" sign"
-msgstr "\"=\"記���り��ん"
+#: catalog/aclchk.c:1693 catalog/objectaddress.c:398 utils/adt/acl.c:2008
+#: utils/adt/acl.c:2038 utils/adt/acl.c:2070 utils/adt/acl.c:2102
+#: utils/adt/acl.c:2130 utils/adt/acl.c:2160 commands/tablecmds.c:208
+#: commands/tablecmds.c:2246 commands/tablecmds.c:2493
+#: commands/tablecmds.c:8932 commands/sequence.c:1035
+#, c-format
+msgid "\"%s\" is not a sequence"
+msgstr "\"%s\"�シーケンス���り��ん"
 
-#: utils/adt/acl.c:317
+#: catalog/aclchk.c:1731
 #, c-format
-msgid "invalid mode character: must be one of \"%s\""
-msgstr "モード文字�無効��: \"%s\"�一����れ��り��ん"
+msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
+msgstr "シーケンス \"%s\" �� USAGE, SELECT, UPDATE 権���をサ�ート���"
 
-#: utils/adt/acl.c:339
-msgid "a name must follow the \"/\" sign"
-msgstr "\"/\"記��後�����必���"
+#: catalog/aclchk.c:1748
+msgid "invalid privilege type USAGE for table"
+msgstr "テーブル��権�タイプ USAGE �無効��"
 
-#: utils/adt/acl.c:347
+#: catalog/aclchk.c:1913
 #, c-format
-msgid "defaulting grantor to user ID %u"
-msgstr "権�付与者をデフォルト�ユーザID %u������"
+msgid "invalid privilege type %s for column"
+msgstr "カラム��権�タイプ %s �無効��"
 
-#: utils/adt/acl.c:538
-msgid "ACL array contains wrong data type"
-msgstr "ACL�列��正�データ型��り��。"
+#: catalog/aclchk.c:1926
+#, c-format
+msgid "sequence \"%s\" only supports SELECT column privileges"
+msgstr "シーケンス \"%s\" �� USAGE, SELECT, UPDATE ��をサ�ート���"
 
-#: utils/adt/acl.c:542
-msgid "ACL arrays must be one-dimensional"
-msgstr "ACL�列�1次元��列���れ��り��ん"
+#: catalog/aclchk.c:2510
+#, c-format
+msgid "language \"%s\" is not trusted"
+msgstr "言語\"%s\"�信頼�れ����ん"
 
-#: utils/adt/acl.c:546
-msgid "ACL arrays must not contain null values"
-msgstr "ACL�列��NULL値を��������ん"
+#: catalog/aclchk.c:2512
+msgid "Only superusers can use untrusted languages."
+msgstr "スーパーユーザ���信頼�れ��言語を使用�る�������"
 
-#: utils/adt/acl.c:570
-msgid "extra garbage at the end of the ACL specification"
-msgstr "ACL指定�後�余計�����り��"
+#: catalog/aclchk.c:3019
+#, c-format
+msgid "unrecognized privilege type \"%s\""
+msgstr "権�タイプ \"%s\" を�識����ん"
 
-#: utils/adt/acl.c:1127
-msgid "grant options cannot be granted back to your own grantor"
-msgstr "グラントオプション���権�付与者�権�を戻��������ん"
+#: catalog/aclchk.c:3068
+#, c-format
+msgid "permission denied for column %s"
+msgstr "カラム %s ��権���り��ん"
 
-#: utils/adt/acl.c:1188
-msgid "dependent privileges exist"
-msgstr "�存�る権��存在���"
+#: catalog/aclchk.c:3070
+#, c-format
+msgid "permission denied for relation %s"
+msgstr "リレーション %s ��権���り��ん"
 
-#: utils/adt/acl.c:1189
-msgid "Use CASCADE to revoke them too."
-msgstr "�れらも�り上�る��CASCADEを使用������"
+#: catalog/aclchk.c:3072 commands/sequence.c:550 commands/sequence.c:749
+#: commands/sequence.c:791 commands/sequence.c:827 commands/sequence.c:1470
+#, c-format
+msgid "permission denied for sequence %s"
+msgstr "シーケンス%s�対�る権���り��ん"
 
-#: utils/adt/acl.c:1468
-msgid "aclinsert is no longer supported"
-msgstr "aclinsert�も�サ�ート�れ����ん"
+#: catalog/aclchk.c:3074
+#, c-format
+msgid "permission denied for database %s"
+msgstr "データベース %s ��権���り��ん"
 
-#: utils/adt/acl.c:1478
-msgid "aclremove is no longer supported"
-msgstr "aclremove�も�サ�ート�れ����ん"
+#: catalog/aclchk.c:3076
+#, c-format
+msgid "permission denied for function %s"
+msgstr "関数 %s ��権���り��ん"
 
-#: utils/adt/acl.c:1564 utils/adt/acl.c:1618
+#: catalog/aclchk.c:3078
 #, c-format
-msgid "unrecognized privilege type: \"%s\""
-msgstr "権�種類��明��: \"%s\""
+msgid "permission denied for operator %s"
+msgstr "演算� %s ��権���り��ん"
 
-#: utils/adt/acl.c:3364 utils/adt/regproc.c:118 utils/adt/regproc.c:139
-#: utils/adt/regproc.c:289
+#: catalog/aclchk.c:3080
 #, c-format
-msgid "function \"%s\" does not exist"
-msgstr "関数\"%s\"�存在���ん"
+msgid "permission denied for type %s"
+msgstr "型 %s ��権���り��ん"
 
-#: utils/adt/acl.c:4635
+#: catalog/aclchk.c:3082
 #, c-format
-msgid "must be member of role \"%s\""
-msgstr "ロール\"%s\"�メン����れ��り��ん"
+msgid "permission denied for language %s"
+msgstr "言語 %s ��権���り��ん"
 
-#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4242 utils/adt/geo_ops.c:5159
-msgid "too many points requested"
-msgstr "�求�れ��イント�多����"
+#: catalog/aclchk.c:3084
+#, c-format
+msgid "permission denied for large object %s"
+msgstr "ラージオブジェクト %s �対�る権���り��ん"
 
-#: utils/adt/geo_ops.c:317
-msgid "could not format \"path\" value"
-msgstr "\"path\"�値を整形����ん���"
+#: catalog/aclchk.c:3086
+#, c-format
+msgid "permission denied for schema %s"
+msgstr "スキーマ %s ��権���り��ん"
 
-#: utils/adt/geo_ops.c:392
+#: catalog/aclchk.c:3088
 #, c-format
-msgid "invalid input syntax for type box: \"%s\""
-msgstr "型box�入力構文�無効��: \"%s\""
+msgid "permission denied for operator class %s"
+msgstr "演算�クラス%s�権���り��ん"
 
-#: utils/adt/geo_ops.c:956
+#: catalog/aclchk.c:3090
 #, c-format
-msgid "invalid input syntax for type line: \"%s\""
-msgstr "型line�入力構文�無効��: \"%s\""
+msgid "permission denied for operator family %s"
+msgstr "演算��%s�権���り��ん"
 
-#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
-#: utils/adt/geo_ops.c:1057
-msgid "type \"line\" not yet implemented"
-msgstr "型\"line\"���実装�れ����ん"
+#: catalog/aclchk.c:3092
+#, c-format
+msgid "permission denied for collation %s"
+msgstr "照�順� %s ��権���り��ん"
 
-#: utils/adt/geo_ops.c:1404 utils/adt/geo_ops.c:1427
+#: catalog/aclchk.c:3094
 #, c-format
-msgid "invalid input syntax for type path: \"%s\""
-msgstr "型path�入力構文�無効��: \"%s\""
+msgid "permission denied for conversion %s"
+msgstr "変�%s�権���り��ん"
 
-#: utils/adt/geo_ops.c:1466
-msgid "invalid number of points in external \"path\" value"
-msgstr "\"path\"�外部値���る�イント数�無効��"
+#: catalog/aclchk.c:3096
+#, c-format
+msgid "permission denied for tablespace %s"
+msgstr "テーブル空間%s�権���り��ん"
 
-#: utils/adt/geo_ops.c:1807
+#: catalog/aclchk.c:3098
 #, c-format
-msgid "invalid input syntax for type point: \"%s\""
-msgstr "型point�入力構文�無効��: \"%s\""
+msgid "permission denied for text search dictionary %s"
+msgstr "テキスト検索辞書%s�権���り��ん"
 
-#: utils/adt/geo_ops.c:2035
+#: catalog/aclchk.c:3100
 #, c-format
-msgid "invalid input syntax for type lseg: \"%s\""
-msgstr "型lseg�入力構文�無効��: \"%s\""
+msgid "permission denied for text search configuration %s"
+msgstr "テキスト検索設定%s�権���り��ん"
 
-#: utils/adt/geo_ops.c:2639
-msgid "function \"dist_lb\" not implemented"
-msgstr "関数\"dist_lb\"�実装�れ����ん"
+#: catalog/aclchk.c:3102
+#, c-format
+msgid "permission denied for foreign-data wrapper %s"
+msgstr "外部データラッパー %s ��権���り��ん"
 
-#: utils/adt/geo_ops.c:3152
-msgid "function \"close_lb\" not implemented"
-msgstr "関数\"close_lb\"�実装�れ����ん"
+#: catalog/aclchk.c:3104
+#, c-format
+msgid "permission denied for foreign server %s"
+msgstr "外部サー� %s ��権���り��ん"
 
-#: utils/adt/geo_ops.c:3441
-msgid "cannot create bounding box for empty polygon"
-msgstr "空�多角形�対�る境界矩形を作�����ん"
+#: catalog/aclchk.c:3106
+#, c-format
+msgid "permission denied for extension %s"
+msgstr "拡張機能%s ��権���り��ん"
 
-#: utils/adt/geo_ops.c:3465 utils/adt/geo_ops.c:3477
+#: catalog/aclchk.c:3112 catalog/aclchk.c:3114
 #, c-format
-msgid "invalid input syntax for type polygon: \"%s\""
-msgstr "型polygon�入力構文�無効��: \"%s\""
+msgid "must be owner of relation %s"
+msgstr "リレーション%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:3517
-msgid "invalid number of points in external \"polygon\" value"
-msgstr "\"polygon\"�外部値��イント数�無効��"
+#: catalog/aclchk.c:3116
+#, c-format
+msgid "must be owner of sequence %s"
+msgstr "シーケンス%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:4040
-msgid "function \"poly_distance\" not implemented"
-msgstr "関数\"poly_distance\"�実装�れ����ん"
+#: catalog/aclchk.c:3118
+#, c-format
+msgid "must be owner of database %s"
+msgstr "データベース%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:4352
-msgid "function \"path_center\" not implemented"
-msgstr "関数\"path_center\"�実装�れ����ん"
+#: catalog/aclchk.c:3120
+#, c-format
+msgid "must be owner of function %s"
+msgstr "関数%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:4369
-msgid "open path cannot be converted to polygon"
-msgstr "開経路を多角形�変�����ん"
+#: catalog/aclchk.c:3122
+#, c-format
+msgid "must be owner of operator %s"
+msgstr "演算�%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:4536 utils/adt/geo_ops.c:4546 utils/adt/geo_ops.c:4561
-#: utils/adt/geo_ops.c:4567
+#: catalog/aclchk.c:3124
 #, c-format
-msgid "invalid input syntax for type circle: \"%s\""
-msgstr "型circle�入力構文�無効��: \"%s\""
+msgid "must be owner of type %s"
+msgstr "型%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:4589 utils/adt/geo_ops.c:4597
-msgid "could not format \"circle\" value"
-msgstr "\"circle\"値を整形����ん"
+#: catalog/aclchk.c:3126
+#, c-format
+msgid "must be owner of language %s"
+msgstr "言語%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:4624
-msgid "invalid radius in external \"circle\" value"
-msgstr "\"circle\"�外部値��径�無効��"
+#: catalog/aclchk.c:3128
+#, c-format
+msgid "must be owner of large object %s"
+msgstr "ラージオブジェクト %s �所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:5145
-msgid "cannot convert circle with radius zero to polygon"
-msgstr "�径0�円を多角形�返還����ん"
+#: catalog/aclchk.c:3130
+#, c-format
+msgid "must be owner of schema %s"
+msgstr "スキーマ%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:5150
-msgid "must request at least 2 points"
-msgstr "少���も2�イントを�求���れ��り��ん"
+#: catalog/aclchk.c:3132
+#, c-format
+msgid "must be owner of operator class %s"
+msgstr "演算�クラス%s�所有者���れ��り��ん"
 
-#: utils/adt/geo_ops.c:5194 utils/adt/geo_ops.c:5217
-msgid "cannot convert empty polygon to circle"
-msgstr "空�多角形を円�変�����ん"
+#: catalog/aclchk.c:3134
+#, c-format
+msgid "must be owner of operator family %s"
+msgstr "演算�ファミリー %s �所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:514 utils/adt/tsvector.c:272 tsearch/to_tsany.c:165
+#: catalog/aclchk.c:3136
 #, c-format
-msgid "string is too long for tsvector (%d bytes, max %d bytes)"
-msgstr "TSベクター����文字列�長����(%d�イト�最大�%d�イト)"
+msgid "must be owner of collation %s"
+msgstr "照�順� %s �所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1103
-msgid "ts_stat query must return one tsvector column"
-msgstr "ts_stat�1��tsvector列��を返���れ��り��ん"
+#: catalog/aclchk.c:3138
+#, c-format
+msgid "must be owner of conversion %s"
+msgstr "変�%s�所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1283
+#: catalog/aclchk.c:3140
 #, c-format
-msgid "tsvector column \"%s\" does not exist"
-msgstr "tsvector列\"%s\"�存在���ん"
+msgid "must be owner of tablespace %s"
+msgstr "テーブル空間%s�所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1289
+#: catalog/aclchk.c:3142
 #, c-format
-msgid "column \"%s\" is not of tsvector type"
-msgstr "値\"%s\"�型tsvector���り��ん"
+msgid "must be owner of text search dictionary %s"
+msgstr "テキスト検索辞書%s�所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1301
+#: catalog/aclchk.c:3144
 #, c-format
-msgid "configuration column \"%s\" does not exist"
-msgstr "設定列\"%s\"�存在���ん"
+msgid "must be owner of text search configuration %s"
+msgstr "テキスト検索設定%s�所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1307
+#: catalog/aclchk.c:3146
 #, c-format
-msgid "column \"%s\" is not of regconfig type"
-msgstr "%s列�regconfig型���り��ん"
+msgid "must be owner of foreign-data wrapper %s"
+msgstr "外部データラッパー %s �所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1314
+#: catalog/aclchk.c:3148
 #, c-format
-msgid "configuration column \"%s\" must not be null"
-msgstr "設定列\"%s\"をNULL��る�������ん"
+msgid "must be owner of foreign server %s"
+msgstr "外部サー� %s �所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1327
+#: catalog/aclchk.c:3150
 #, c-format
-msgid "text search configuration name \"%s\" must be schema-qualified"
-msgstr "テキスト検索設定�称\"%s\"�スキーマ修飾���れナ�り��ん"
+msgid "must be owner of extension %s"
+msgstr "拡張機能 %s �所有者���れ��り��ん"
 
-#: utils/adt/tsvector_op.c:1352
+#: catalog/aclchk.c:3192
 #, c-format
-msgid "column \"%s\" is not of a character type"
-msgstr "カラム \"%s\" �文字型���り��ん"
+msgid "permission denied for column \"%s\" of relation \"%s\""
+msgstr "リレーション \"%2$s\" �カラム \"%1$s\" ��権���り��ん"
 
-#: utils/adt/regexp.c:190 tsearch/spell.c:365
+#: catalog/aclchk.c:3219
 #, c-format
-msgid "invalid regular expression: %s"
-msgstr "正�表��無効��: %s"
+msgid "role with OID %u does not exist"
+msgstr "OID � %u ��るロール�存在���ん"
 
-#: utils/adt/regexp.c:269 utils/adt/varlena.c:2797
+#: catalog/aclchk.c:3312 catalog/aclchk.c:3320
 #, c-format
-msgid "regular expression failed: %s"
-msgstr "正�表��失敗����: %s"
+msgid "attribute %d of relation with OID %u does not exist"
+msgstr "OID � %2$u ��るリレーション�属性 %1$d �存在���ん"
 
-#: utils/adt/regexp.c:404
+#: catalog/aclchk.c:3393 catalog/aclchk.c:4219
 #, c-format
-msgid "invalid regexp option: \"%c\""
-msgstr "正�表�オプション�無効��: \"%c\""
+msgid "relation with OID %u does not exist"
+msgstr "OID � %u ��るリレーション�存在���ん"
 
-#: utils/adt/regexp.c:668 utils/adt/like_match.c:287
-msgid "invalid escape string"
-msgstr "エスケープシーケンス�無効��"
+#: catalog/aclchk.c:3493 catalog/aclchk.c:4610 utils/adt/dbsize.c:127
+#, c-format
+msgid "database with OID %u does not exist"
+msgstr "OID %u�データベース�存在���ん"
 
-#: utils/adt/regexp.c:669 utils/adt/like_match.c:288
-msgid "Escape string must be empty or one character."
-msgstr "エスケープ文字�空�1文字���れ��り��ん。"
+#: catalog/aclchk.c:3547 catalog/aclchk.c:4297 tcop/fastpath.c:221
+#, c-format
+msgid "function with OID %u does not exist"
+msgstr "OID %u�関数�存在���ん"
 
-#: utils/adt/regexp.c:865
-msgid "regexp_split does not support the global option"
-msgstr "regexp_split�グロー�ルオプションをサ�ート���ん"
+#: catalog/aclchk.c:3601 catalog/aclchk.c:4323
+#, c-format
+msgid "language with OID %u does not exist"
+msgstr "OID � %u ��る言語�存在���ん"
 
-#: utils/adt/genfile.c:58
-msgid "reference to parent directory (\"..\") not allowed"
-msgstr "親ディレクトリ��照（\"..\"）�����ん"
+#: catalog/aclchk.c:3762 catalog/aclchk.c:4395
+#, c-format
+msgid "schema with OID %u does not exist"
+msgstr "OID � %u ��るスキーマ�存在���ん"
 
-#: utils/adt/genfile.c:72
-msgid "absolute path not allowed"
-msgstr "絶対経路�����ん"
+#: catalog/aclchk.c:3816 catalog/aclchk.c:4422
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "OID � %u ��るテーブル空間�存在���ん"
 
-#: utils/adt/genfile.c:99
-msgid "must be superuser to read files"
-msgstr "ファイルを読�込む��スーパーユーザ���れ��り��ん"
+#: catalog/aclchk.c:3874 catalog/aclchk.c:4556
+#, c-format
+msgid "foreign-data wrapper with OID %u does not exist"
+msgstr "OID � %u ��る外部データラッパー�存在���ん"
 
-#: utils/adt/genfile.c:113
+#: catalog/aclchk.c:3935 catalog/aclchk.c:4583
 #, c-format
-msgid "could not seek in file \"%s\": %m"
-msgstr "ファイル\"%s\"をシーク����ん���: %m"
+msgid "foreign server with OID %u does not exist"
+msgstr "OID � %u ��る外部サー��存在���ん"
 
-#: utils/adt/genfile.c:118
-msgid "requested length cannot be negative"
-msgstr "負�長�を指定�る�������ん"
+#: catalog/aclchk.c:4245
+#, c-format
+msgid "type with OID %u does not exist"
+msgstr "OID � %u ��る型�存在���ん"
 
-#: utils/adt/genfile.c:124 utils/adt/oracle_compat.c:181
-#: utils/adt/oracle_compat.c:279 utils/adt/oracle_compat.c:755
-#: utils/adt/oracle_compat.c:1045
-msgid "requested length too large"
-msgstr "�求��長��長����"
+#: catalog/aclchk.c:4271
+#, c-format
+msgid "operator with OID %u does not exist"
+msgstr "OID � %u ��る演算��存在���ん"
 
-#: utils/adt/genfile.c:133 storage/file/copydir.c:186
-#: access/transam/xlog.c:2469 access/transam/xlog.c:4317
-#: access/transam/xlog.c:8542 access/transam/xlog.c:8616
-#: access/transam/xlog.c:8999 access/transam/xlog.c:9024
+#: catalog/aclchk.c:4448
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "ファイル\"%s\"を読�込���ん���: %m"
+msgid "operator class with OID %u does not exist"
+msgstr "OID � %u ��る演算�クラス�存在���ん"
 
-#: utils/adt/genfile.c:163
-msgid "must be superuser to get file information"
-msgstr "ファイル情報を入手�る��スーパーユーザ���れ��り��ん"
+#: catalog/aclchk.c:4475
+#, c-format
+msgid "operator family with OID %u does not exist"
+msgstr "OID � %u ��る演算���存在���ん"
 
-#: utils/adt/genfile.c:227
-msgid "must be superuser to get directory listings"
-msgstr "ディレクトリ一覧を得る��スーパーユーザ���れ��り��ん"
+#: catalog/aclchk.c:4502
+#, c-format
+msgid "text search dictionary with OID %u does not exist"
+msgstr "OID � %u ��るテキスト検索辞書�存在���ん"
 
-#: utils/adt/ascii.c:75
+#: catalog/aclchk.c:4529
 #, c-format
-msgid "encoding conversion from %s to ASCII not supported"
-msgstr "%s符�化方��らASCII��変��サ�ート�れ����ん"
+msgid "text search configuration with OID %u does not exist"
+msgstr "OID � %u ��るテキスト検索設定�存在���ん"
 
-#: utils/adt/timestamp.c:97
+#: catalog/aclchk.c:4636
 #, c-format
-msgid "TIMESTAMP(%d)%s precision must not be negative"
-msgstr "TIMESTAMP(%d)%s �精度�負������り��ん"
+msgid "collation with OID %u does not exist"
+msgstr "OID � %u ��る照�順��存在���ん"
 
-#: utils/adt/timestamp.c:103
+#: catalog/aclchk.c:4662
 #, c-format
-msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
-msgstr "TIMESTAMP(%d)%s���りを許容最大値%d��減ら����"
+msgid "conversion with OID %u does not exist"
+msgstr "OID � %u ��る変��存在���ん"
 
-#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
+#: catalog/aclchk.c:4703
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp�範囲外��: \"%s\""
+msgid "extension with OID %u does not exist"
+msgstr "OID � %u ��る拡張機能�存在���ん"
 
-#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
-#: utils/adt/timestamp.c:664
+#: catalog/pg_conversion.c:67
 #, c-format
-msgid "date/time value \"%s\" is no longer supported"
-msgstr "日付時刻�値\"%s\"�も�サ�ート�れ����ん"
+msgid "conversion \"%s\" already exists"
+msgstr "変�\"%s\"����存在���"
 
-#: utils/adt/timestamp.c:260
-msgid "timestamp cannot be NaN"
-msgstr "タイムスタンプ� NaN ������ん"
+#: catalog/pg_conversion.c:80
+#, c-format
+msgid "default conversion for %s to %s already exists"
+msgstr "%s�ら%s��デフォルト�変�����存在���"
 
-#: utils/adt/timestamp.c:370
+#: catalog/namespace.c:235 catalog/namespace.c:309 commands/trigger.c:4153
 #, c-format
-msgid "timestamp(%d) precision must be between %d and %d"
-msgstr "timestamp(%d)�精度�%d�ら%d�����れ��り��ん"
+msgid "cross-database references are not implemented: \"%s.%s.%s\""
+msgstr "データベース間��照�実装�れ����ん: \"%s.%s.%s\""
 
-#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
-#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
-msgid "interval out of range"
-msgstr "interval�範囲外��"
+#: catalog/namespace.c:253 catalog/namespace.c:320
+msgid "temporary tables cannot specify a schema name"
+msgstr "一時テーブル��スキーマ�を指定����ん"
 
-#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
-msgid "invalid INTERVAL type modifier"
-msgstr "無効�INTERVAL型�修正���"
+#: catalog/namespace.c:355 catalog/namespace.c:2548
+msgid "no schema has been selected to create in"
+msgstr "作�先�スキーマ��択�れ����ん"
 
-#: utils/adt/timestamp.c:803
+#: catalog/namespace.c:1865 commands/tsearchcmds.c:320
 #, c-format
-msgid "INTERVAL(%d) precision must not be negative"
-msgstr "INTERVAL(%d)�精度�負������ん"
+msgid "text search parser \"%s\" does not exist"
+msgstr "テキスト検索パーサ\"%s\"�存在���ん"
 
-#: utils/adt/timestamp.c:809
+#: catalog/namespace.c:1988 commands/tsearchcmds.c:769
 #, c-format
-msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
-msgstr "INTERVAL(%d)�精度を許容最大値%d��減ら����"
+msgid "text search dictionary \"%s\" does not exist"
+msgstr "テキスト検索辞書\"%s\"�存在���ん"
 
-#: utils/adt/timestamp.c:1101
+#: catalog/namespace.c:2112 commands/tsearchcmds.c:1304
 #, c-format
-msgid "interval(%d) precision must be between %d and %d"
-msgstr "interval(%d)�精度�%d�ら%d�����れ��り��ん"
-
-#: utils/adt/timestamp.c:2306
-msgid "cannot subtract infinite timestamps"
-msgstr "無�大�timestampを減算����ん"
+msgid "text search template \"%s\" does not exist"
+msgstr "テキスト検索テンプレート\"%s\"�存在���ん"
 
-#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
-#: utils/adt/timestamp.c:4020
+#: catalog/namespace.c:2235 commands/tsearchcmds.c:1754
+#: commands/tsearchcmds.c:1910
 #, c-format
-msgid "timestamp units \"%s\" not supported"
-msgstr "timestamp���\"%s\"�サ�ート�れ����ん"
+msgid "text search configuration \"%s\" does not exist"
+msgstr "テキスト検索設定\"%s\"�存在���ん"
 
-#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
+#: catalog/namespace.c:2482
 #, c-format
-msgid "timestamp units \"%s\" not recognized"
-msgstr "timestamp���\"%s\"��明��"
+msgid "%s is already in schema \"%s\""
+msgstr "%s ����スキーマ \"%s\" 内�存在���"
 
-#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
-#: utils/adt/timestamp.c:4233
-#, c-format
-msgid "timestamp with time zone units \"%s\" not supported"
-msgstr "timestamp with time zone���\"%s\"�サ�ート�れ����ん"
+#: catalog/namespace.c:2490
+msgid "cannot move objects into or out of temporary schemas"
+msgstr "一時スキーマ�����一時スキーマ�らオブジェクトを移動����ん"
 
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
-#, c-format
-msgid "timestamp with time zone units \"%s\" not recognized"
-msgstr "timestamp with time zone���\"%s\"��明��"
+#: catalog/namespace.c:2496
+msgid "cannot move objects into or out of TOAST schema"
+msgstr "TOASTスキーマ�����TOASTスキーマ�らオブジェクトを移動����ん"
 
-#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
+#: catalog/namespace.c:2569 catalog/namespace.c:3554 catalog/namespace.c:3557
+#: commands/schemacmds.c:253 commands/schemacmds.c:322
 #, c-format
-msgid "interval units \"%s\" not supported"
-msgstr "interval���\"%s\"�サ�ート�れ����ん"
+msgid "schema \"%s\" does not exist"
+msgstr "スキーマ\"%s\"�存在���ん"
 
-#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
+#: catalog/namespace.c:2600
 #, c-format
-msgid "interval units \"%s\" not recognized"
-msgstr "interval���\"%s\"��明��"
+msgid "improper relation name (too many dotted names): %s"
+msgstr "リレーション����切��(ドット付�����多����): %s"
 
-#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
+#: catalog/namespace.c:2999
 #, c-format
-msgid "could not convert to time zone \"%s\""
-msgstr "時間帯\"%s\"�変�����ん���"
+msgid "collation \"%s\" for encoding \"%s\" does not exist"
+msgstr "エンコーディング \"%2$s\" ����照�順� \"%1$s\" �存在���ん"
 
-#: utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
-#: utils/adt/datetime.c:925 utils/adt/datetime.c:1657 utils/adt/date.c:2599
+#: catalog/namespace.c:3051
 #, c-format
-msgid "time zone \"%s\" not recognized"
-msgstr "時間帯\"%s\"��明��"
+msgid "conversion \"%s\" does not exist"
+msgstr "変�\"%s�存在���ん"
 
-#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
+#: catalog/namespace.c:3256
 #, c-format
-msgid "interval time zone \"%s\" must not specify month"
-msgstr "interval�よる時間帯\"%s\"��月を指定�������ん"
-
-#: utils/adt/tsrank.c:404
-msgid "array of weight must be one-dimensional"
-msgstr "���列�1次元��列���れ��り��ん"
-
-#: utils/adt/tsrank.c:409
-msgid "array of weight is too short"
-msgstr "���列�短����"
+msgid "permission denied to create temporary tables in database \"%s\""
+msgstr "データベース\"%s\"�一時テーブルを作��る権���り��ん"
 
-#: utils/adt/tsrank.c:414
-msgid "array of weight must not contain nulls"
-msgstr "���列��NULL値を��������ん"
+#: catalog/namespace.c:3272
+msgid "cannot create temporary tables during recovery"
+msgstr "リカ�リ中�一時テーブルを作�����ん"
 
-#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
-msgid "weight out of range"
-msgstr "���範囲外��"
+#: catalog/objectaddress.c:286
+msgid "database name cannot be qualified"
+msgstr "データベース�を修飾�る�������ん"
 
-#: utils/adt/mac.c:65
-#, c-format
-msgid "invalid input syntax for type macaddr: \"%s\""
-msgstr "型macaddr�入力構文�無効��: \"%s\""
+#: catalog/objectaddress.c:289 commands/extension.c:1585
+#: commands/extension.c:2245
+#, 
+msgid "extension name cannot be qualified"
+msgstr "拡張機能�を修飾����ん"
 
-#: utils/adt/mac.c:72
-#, c-format
-msgid "invalid octet value in \"macaddr\" value: \"%s\""
-msgstr "\"macaddr\"�値�オクテット値�無効��: \"%s\""
+#: catalog/objectaddress.c:292
+msgid "tablespace name cannot be qualified"
+msgstr "テーブル空間�を修飾�る�������ん"
 
-#: utils/adt/cash.c:232
-#, c-format
-msgid "invalid input syntax for type money: \"%s\""
-msgstr "money型��入力構文�無効��: \"%s\""
+#: catalog/objectaddress.c:295
+msgid "role name cannot be qualified"
+msgstr "ロール�を修飾����ん"
 
-#: utils/adt/nabstime.c:160
-#, c-format
-msgid "invalid time zone name: \"%s\""
-msgstr "時間帯�称�無効��: \"%s\""
+#: catalog/objectaddress.c:298 commands/schemacmds.c:178
+msgid "schema name cannot be qualified"
+msgstr "スキーマ�を修飾�る�������ん"
 
-#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
-msgid "cannot convert abstime \"invalid\" to timestamp"
-msgstr "abstime�\"invalid\"をtimestamp�変�����ん"
+#: catalog/objectaddress.c:301
+msgid "language name cannot be qualified"
+msgstr "言語�を修飾����ん"
 
-#: utils/adt/nabstime.c:806
-msgid "invalid status in external \"tinterval\" value"
-msgstr "\"tinterval\"�外部値�ステータス�無効��"
+#: catalog/objectaddress.c:304
+#, 
+msgid "foreign-data wrapper name cannot be qualified"
+msgstr "外部データラッパー�を修飾�る�������ん"
 
-#: utils/adt/nabstime.c:880
-msgid "cannot convert reltime \"invalid\" to interval"
-msgstr "reltime�\"invalid\"をinterval�変�����ん"
+#: catalog/objectaddress.c:307
+#, 
+msgid "server name cannot be qualified"
+msgstr "サー��を修飾����ん"
 
-#: utils/adt/nabstime.c:1562
+#: catalog/objectaddress.c:412 commands/tablecmds.c:214
+#: commands/tablecmds.c:2252 commands/tablecmds.c:2509
+#: commands/tablecmds.c:3813 commands/tablecmds.c:8940 commands/view.c:182
 #, c-format
-msgid "invalid input syntax for type tinterval: \"%s\""
-msgstr "型tinterval�入力構文�無効��: \"%s\""
-
-#: utils/adt/datetime.c:1181 utils/adt/datetime.c:1926 utils/adt/date.c:142
-msgid "date/time value \"current\" is no longer supported"
-msgstr "日付時刻�値\"current\"�も�サ�ート�れ����ん"
+msgid "\"%s\" is not a view"
+msgstr "\"%s\"�ビュー���り��ん"
 
-#: utils/adt/datetime.c:3516 utils/adt/datetime.c:3523
+#: catalog/objectaddress.c:419 commands/tablecmds.c:232
+#: commands/tablecmds.c:2258 commands/tablecmds.c:2517
+#: commands/tablecmds.c:3816 commands/tablecmds.c:8948
 #, c-format
-msgid "date/time field value out of range: \"%s\""
-msgstr "日付時刻�フィールド�範囲外��: \"%s\""
-
-#: utils/adt/datetime.c:3525
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "他�\"datestyle\"設定�必��も�れ��ん。"
+msgid "\"%s\" is not a foreign table"
+msgstr "\"%s\" �外部テーブル���り��ん"
 
-#: utils/adt/datetime.c:3530
+#: catalog/objectaddress.c:834 commands/functioncmds.c:1525
+#: commands/functioncmds.c:1814
 #, c-format
-msgid "interval field value out of range: \"%s\""
-msgstr "intervalフィールド�値�範囲外��: \"%s\""
+msgid "must be owner of type %s or type %s"
+msgstr "型%s���型%s�所有者���れ��り��ん"
 
-#: utils/adt/datetime.c:3536
-#, c-format
-msgid "time zone displacement out of range: \"%s\""
-msgstr "時間帯�置��範囲外��: \"%s\""
+#: catalog/objectaddress.c:865 catalog/objectaddress.c:881
+#, 
+msgid "must be superuser"
+msgstr "スーパーユーザ���れ��り��ん"
 
-#: utils/adt/varbit.c:162 utils/adt/varbit.c:302 utils/adt/varbit.c:358
-#, c-format
-msgid "bit string length %d does not match type bit(%d)"
-msgstr "ビット文字列長%d�bit(%d)�一致���ん"
+#: catalog/objectaddress.c:872
+#, 
+msgid "must have CREATEROLE privilege"
+msgstr "CREATEROLE 権��必���"
 
-#: utils/adt/varbit.c:184 utils/adt/varbit.c:482
+#: catalog/pg_namespace.c:52 commands/schemacmds.c:259
 #, c-format
-msgid "\"%c\" is not a valid binary digit"
-msgstr "\"%c\"�有効�2進数表����り��ん"
+msgid "schema \"%s\" already exists"
+msgstr "スキーマ\"%s\"����存在���"
 
-#: utils/adt/varbit.c:209 utils/adt/varbit.c:507
+#: catalog/pg_operator.c:221 catalog/pg_operator.c:363
 #, c-format
-msgid "\"%c\" is not a valid hexadecimal digit"
-msgstr "\"%c\"�有効�16進数表����り��ん"
+msgid "\"%s\" is not a valid operator name"
+msgstr "\"%s\"�有効�演算�����り��ん"
 
-#: utils/adt/varbit.c:293 utils/adt/varbit.c:594
-msgid "invalid length in external bit string"
-msgstr "ビット文字列�外部表��長��無効��"
+#: catalog/pg_operator.c:372
+msgid "only binary operators can have commutators"
+msgstr "二項演算����交代演算�を���������"
 
-#: utils/adt/varbit.c:460 utils/adt/varbit.c:603 utils/adt/varbit.c:664
-#, c-format
-msgid "bit string too long for type bit varying(%d)"
-msgstr "ビット文字列�型bit varying(%d)��長����"
+#: catalog/pg_operator.c:376
+msgid "only binary operators can have join selectivity"
+msgstr "二項演算�������択性を���������"
 
-#: utils/adt/varbit.c:991 utils/adt/varbit.c:1093 utils/adt/varlena.c:729
-#: utils/adt/varlena.c:793 utils/adt/varlena.c:937 utils/adt/varlena.c:1843
-#: utils/adt/varlena.c:1910
-msgid "negative substring length not allowed"
-msgstr "負�長��substring�����ん"
+#: catalog/pg_operator.c:380
+msgid "only binary operators can merge join"
+msgstr "二項演算����マージ���能��"
 
-#: utils/adt/varbit.c:1149
-msgid "cannot AND bit strings of different sizes"
-msgstr "サイズ�異�るビット文字列�AND�����ん"
+#: catalog/pg_operator.c:384
+msgid "only binary operators can hash"
+msgstr "二項演算�����ッシュ�能��"
 
-#: utils/adt/varbit.c:1190
-msgid "cannot OR bit strings of different sizes"
-msgstr "サイズ�異�るビット文字列�OR�����ん"
+#: catalog/pg_operator.c:395
+msgid "only boolean operators can have negators"
+msgstr "ブール型演算�����定演算�を���������"
 
-#: utils/adt/varbit.c:1236
-msgid "cannot XOR bit strings of different sizes"
-msgstr "サイズ�異�るビット文字列�XOR�����ん"
+#: catalog/pg_operator.c:399
+msgid "only boolean operators can have restriction selectivity"
+msgstr "ブール型演算����制��択性を���������"
 
-#: utils/adt/varbit.c:1563 utils/adt/int8.c:502 utils/adt/int8.c:531
-#: utils/adt/int8.c:552 utils/adt/int8.c:582 utils/adt/int8.c:610
-#: utils/adt/int8.c:628 utils/adt/int8.c:672 utils/adt/int8.c:689
-#: utils/adt/int8.c:758 utils/adt/int8.c:779 utils/adt/int8.c:806
-#: utils/adt/int8.c:833 utils/adt/int8.c:854 utils/adt/int8.c:875
-#: utils/adt/int8.c:902 utils/adt/int8.c:942 utils/adt/int8.c:963
-#: utils/adt/int8.c:990 utils/adt/int8.c:1017 utils/adt/int8.c:1038
-#: utils/adt/int8.c:1059 utils/adt/int8.c:1086 utils/adt/int8.c:1259
-#: utils/adt/int8.c:1298 utils/adt/numeric.c:2115
-msgid "bigint out of range"
-msgstr "bigint�範囲外��"
+#: catalog/pg_operator.c:403
+msgid "only boolean operators can have join selectivity"
+msgstr "ブール型演算�������択性を���������"
 
-#: utils/adt/varbit.c:1710 utils/adt/varbit.c:1768
-msgid "bit index %d out of valid range (0..%d)"
-msgstr "ビット型インデックス %d �有効範囲 0 �ら %d ���間��り��ん"
+#: catalog/pg_operator.c:407
+msgid "only boolean operators can merge join"
+msgstr "ブール型演算����マージ���能��"
 
-#: utils/adt/varbit.c:1719 utils/adt/varlena.c:2110
-msgid "new bit must be 0 or 1"
-msgstr "新��ビット� 0 � 1 ���れ��り��ん"
+#: catalog/pg_operator.c:411
+msgid "only boolean operators can hash"
+msgstr "ブール型演算�����ッシュ�能��"
 
-#: utils/adt/numutils.c:53 utils/adt/numutils.c:63 utils/adt/numutils.c:105
-#: utils/adt/int8.c:97 utils/adt/int8.c:132
+#: catalog/pg_operator.c:423
 #, c-format
-msgid "invalid input syntax for integer: \"%s\""
-msgstr "型integer�入力構文�無効��: \"%s\""
+msgid "operator %s already exists"
+msgstr "演算�%s����存在���"
 
-#: utils/adt/numutils.c:77
-#, c-format
-msgid "value \"%s\" is out of range for type integer"
-msgstr "値\"%s\"�型integer�範囲外��"
+#: catalog/pg_operator.c:616
+msgid "operator cannot be its own negator or sort operator"
+msgstr "演算��自身��定�やソート演算���る�������ん"
 
-#: utils/adt/numutils.c:83
+#: catalog/pg_depend.c:293
 #, c-format
-msgid "value \"%s\" is out of range for type smallint"
-msgstr "値\"%s\"�型smallint�範囲外��"
+msgid "cannot remove dependency on %s because it is a system object"
+msgstr "システムオブジェクト��る���%s��存関係を削除����ん。"
 
-#: utils/adt/numutils.c:89
+#: catalog/pg_collation.c:75
 #, c-format
-msgid "value \"%s\" is out of range for 8-bit integer"
-msgstr "値\"%s\"�８ビット整数�範囲外��"
+msgid "collation \"%s\" for encoding \"%s\" already exists"
+msgstr "エンコーディング \"%2$s\" �照�順� \"%1$s\" ����存在���"
 
-#: utils/adt/enum.c:44 utils/adt/enum.c:54 utils/adt/enum.c:109
-#: utils/adt/enum.c:119
+#: catalog/pg_collation.c:89
 #, c-format
-msgid "invalid input value for enum %s: \"%s\""
-msgstr "列挙型%s�入力構文�無効��: \"%s\""
+msgid "collation \"%s\" already exists"
+msgstr "照�順� \"%s\" ����存在���"
 
-#: utils/adt/enum.c:81 utils/adt/enum.c:144
-#, c-format
-msgid "invalid internal value for enum: %u"
-msgstr "列挙型用�内部値�無効��: %u"
+#: optimizer/util/plancat.c:97
+#, 
+msgid "cannot access temporary or unlogged relations during recovery"
+msgstr "リカ�リ中�一時テーブルや記録�れ��(unlogged)テーブル��"
+"アクセス����ん"
 
-#: utils/adt/enum.c:264 utils/adt/enum.c:303 utils/adt/enum.c:350
-#: utils/adt/enum.c:370
-msgid "could not determine actual enum type"
-msgstr "実際�列挙型を決定����ん���"
+#: optimizer/util/clauses.c:4201
+#, c-format
+msgid "SQL function \"%s\" during inlining"
+msgstr "SQL関数\"%s\"�インライン�������"
 
-#: utils/adt/array_userfuncs.c:48
-msgid "could not determine input data types"
-msgstr "入力データ型を決定����ん���"
+#: optimizer/plan/initsplan.c:587
+msgid ""
+"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
+"join"
+msgstr ""
+"外部���NULL��る�能性��る方��SELECT FOR UPDATE/SHAREを�用����ん"
 
-#: utils/adt/array_userfuncs.c:82
-msgid "neither input type is an array"
-msgstr "入力型��列���り��ん"
+#: optimizer/plan/planner.c:2249
+msgid "could not implement GROUP BY"
+msgstr "GROUP BY を実装����ん���"
 
-#: utils/adt/array_userfuncs.c:121
-msgid "argument must be empty or one-dimensional array"
-msgstr "引数�空�1次元��列���れ��り��ん"
-
-#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
-#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
-#: utils/adt/array_userfuncs.c:357
-msgid "cannot concatenate incompatible arrays"
-msgstr "互�性����列を連�����ん"
-
-#: utils/adt/array_userfuncs.c:225
-#, c-format
+#: optimizer/plan/planner.c:2250 optimizer/plan/planner.c:2422
+#: optimizer/prep/prepunion.c:791
 msgid ""
-"Arrays with element types %s and %s are not compatible for concatenation."
-msgstr "�素型%s�%s��列�連���互�性��り��ん"
+"Some of the datatypes only support hashing, while others only support "
+"sorting."
+msgstr ""
+"�ッシュ��をサ�ート�るデータ型も�れ��ソート��をサ�ート�るも�も�"
+"り��"
 
-#: utils/adt/array_userfuncs.c:264
-#, c-format
-msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
-msgstr "�素数%d�%d��列�連���互�性��り��ん"
+#: optimizer/plan/planner.c:2421
+msgid "could not implement DISTINCT"
+msgstr "DISTINCT を実装����ん���"
 
-#: utils/adt/array_userfuncs.c:301
-msgid ""
-"Arrays with differing element dimensions are not compatible for "
-"concatenation."
-msgstr "異�る�素次数��列�連���互�性��り��ん。"
+#: optimizer/plan/planner.c:2868
+msgid "could not implement window PARTITION BY"
+msgstr "ウィンドウ� PARTITION BY を実装����ん���"
 
-#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
-msgid "Arrays with differing dimensions are not compatible for concatenation."
-msgstr "異�る次数��列�連���互�性��り��ん。"
+#: optimizer/plan/planner.c:2869
+msgid "Window partitioning columns must be of sortable datatypes."
+msgstr ""
+"ウィンドウ・パーティショニング�るカラム��ソート�能�データ型���れ��"
+"り��ん"
 
-#: utils/adt/array_userfuncs.c:484
-msgid "could not determine input data type"
-msgstr "入力データ型を特定����ん���"
+#: optimizer/plan/planner.c:2873
+msgid "could not implement window ORDER BY"
+msgstr "ウィンドウ� ORDER BY を実装����ん���"
 
-#: utils/adt/tsquery_cleanup.c:285
-msgid ""
-"text-search query contains only stop words or doesn't contain lexemes, "
-"ignored"
+#: optimizer/plan/planner.c:2874
+msgid "Window ordering columns must be of sortable datatypes."
 msgstr ""
-"テキスト検索������ストップワード��を�む��る���字��素を���"
-"�ん。無視�れ��"
-
-#: utils/adt/int8.c:113
-#, c-format
-msgid "value \"%s\" is out of range for type bigint"
-msgstr "値\"%s\"�型bigint�範囲外��"
+"ウィンドウ�順�付�を�るカラム��ソート�能�データ型���れ��り��ん"
 
-#: utils/adt/int8.c:1315
-msgid "OID out of range"
-msgstr "OID�範囲外��"
+#: optimizer/prep/prepunion.c:385
+msgid "could not implement recursive UNION"
+msgstr "�帰 UNION を実装����ん���"
 
-#: utils/adt/encode.c:55 utils/adt/encode.c:91
-#, c-format
-msgid "unrecognized encoding: \"%s\""
-msgstr "符�化方���明��: \"%s\""
+#: optimizer/prep/prepunion.c:386
+msgid "All column datatypes must be hashable."
+msgstr "����カラム�データ型��ッシュ�能���れ��り��ん"
 
-#: utils/adt/encode.c:150
+#. translator: %s is UNION, INTERSECT, or EXCEPT
+#: optimizer/prep/prepunion.c:790
 #, c-format
-msgid "invalid hexadecimal digit: \"%c\""
-msgstr "16進数表��無効��: \"%c\""
-
-#: utils/adt/encode.c:178
-msgid "invalid hexadecimal data: odd number of digits"
-msgstr "16進数データ�無効��: ����数値表���"
-
-#: utils/adt/encode.c:295
-msgid "unexpected \"=\""
-msgstr "\"=\"�想定外��"
-
-#: utils/adt/encode.c:307
-msgid "invalid symbol"
-msgstr "シンボル�無効��"
-
-#: utils/adt/encode.c:327
-msgid "invalid end sequence"
-msgstr "終了シーケンス�無効��"
+msgid "could not implement %s"
+msgstr "%s を実装����ん���"
 
-#: utils/adt/encode.c:441 utils/adt/encode.c:506 utils/adt/varlena.c:238
-#: utils/adt/varlena.c:279
-msgid "invalid input syntax for type bytea"
-msgstr "bytea型�入力構文�無効��"
+#: optimizer/path/joinrels.c:673
+#, 
+msgid ""
+"FULL JOIN is only supported with merge-joinable or hash-joinable join "
+"conditions"
+msgstr "FULL JOIN �マージ���能も����ッシュ���能�場���"
+"サ�ート�れ����"
 
-#: utils/adt/char.c:169
-msgid "\"char\" out of range"
-msgstr "\"char\"�範囲外��"
+#: tcop/postgres.c:349 tcop/postgres.c:372 tcop/fastpath.c:290
+#: commands/copy.c:542 commands/copy.c:561 commands/copy.c:565
+msgid "unexpected EOF on client connection"
+msgstr "クライアント接続�想定外�EOF��り���"
 
-#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
-msgid "input of anonymous composite types is not implemented"
-msgstr "匿�複�型�入力�実装�れ����ん"
+#: tcop/postgres.c:399 tcop/postgres.c:411 tcop/postgres.c:422
+#: tcop/postgres.c:434 tcop/postgres.c:4150
+#, c-format
+msgid "invalid frontend message type %d"
+msgstr "フロントエンドメッセージ種類%d�無効��"
 
-#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
-#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
+#: tcop/postgres.c:858
 #, c-format
-msgid "malformed record literal: \"%s\""
-msgstr "����レコードリテラル��: \"%s\""
+msgid "statement: %s"
+msgstr "æ–‡: %s"
 
-#: utils/adt/rowtypes.c:152
-msgid "Missing left parenthesis."
-msgstr "左括弧��り��ん"
+#: tcop/postgres.c:917 tcop/postgres.c:1227 tcop/postgres.c:1508
+#: tcop/postgres.c:1950 tcop/postgres.c:2318 tcop/postgres.c:2399
+#: tcop/fastpath.c:303
+msgid ""
+"current transaction is aborted, commands ignored until end of transaction "
+"block"
+msgstr ""
+"�在�トランザクション�アボート����。トランザクションブロック�終�る�"
+"�コマンド�無視�れ��"
 
-#: utils/adt/rowtypes.c:180
-msgid "Too few columns."
-msgstr "列�少�����"
+#: tcop/postgres.c:1087 tcop/postgres.c:1374 tcop/postgres.c:1791
+#: tcop/postgres.c:2008 tcop/fastpath.c:411
+#, c-format
+msgid "duration: %s ms"
+msgstr "期間: %s ミリ秒"
 
-#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
-msgid "Unexpected end of input."
-msgstr "想定外�入力�終端��"
+#: tcop/postgres.c:1092
+#, c-format
+msgid "duration: %s ms  statement: %s"
+msgstr "期間: %s ミリ秒  文: %s"
 
-#: utils/adt/rowtypes.c:263
-msgid "Too many columns."
-msgstr "列�多����"
+#: tcop/postgres.c:1142
+#, c-format
+msgid "parse %s: %s"
+msgstr "解� %s: %s"
 
-#: utils/adt/rowtypes.c:271
-msgid "Junk after right parenthesis."
-msgstr "�括弧�後�����り��"
+#: tcop/postgres.c:1200
+msgid "cannot insert multiple commands into a prepared statement"
+msgstr "準備�れ�文�複数�コマンドを挿入����ん"
 
-#: utils/adt/rowtypes.c:522
+#: tcop/postgres.c:1379
 #, c-format
-msgid "wrong number of columns: %d, expected %d"
-msgstr "列数�間������: %d。%dを想定������"
+msgid "duration: %s ms  parse %s: %s"
+msgstr "期間: %s ミリ秒  解�%s : %s"
 
-#: utils/adt/rowtypes.c:549
+#: tcop/postgres.c:1425
 #, c-format
-msgid "wrong data type: %u, expected %u"
-msgstr "データ型�間������: %u。%uを想定������"
+msgid "bind %s to %s"
+msgstr "�インド%s: %s"
 
-#: utils/adt/rowtypes.c:610
+#: tcop/postgres.c:1444 tcop/postgres.c:2298
+msgid "unnamed prepared statement does not exist"
+msgstr "無��準備�れ�文�存在���ん"
+
+#: tcop/postgres.c:1486
 #, c-format
-msgid "improper binary format in record column %d"
-msgstr "レコード列%d��イナリ書����切��"
+msgid "bind message has %d parameter formats but %d parameters"
+msgstr "�インドメッセージ�%dパラメータ書��り����パラメータ�%d���"
 
-#: utils/adt/rowtypes.c:896 utils/adt/rowtypes.c:1122
+#: tcop/postgres.c:1492
 #, c-format
-msgid "cannot compare dissimilar column types %s and %s at record column %d"
+msgid ""
+"bind message supplies %d parameters, but prepared statement \"%s\" requires %"
+"d"
 msgstr ""
-"レコード�カラム %3$d �����全�異�る型 %1$s � %2$s ��比較�����"
-"ã‚“"
-
-#: utils/adt/rowtypes.c:974 utils/adt/rowtypes.c:1185
-msgid "cannot compare record types with different numbers of columns"
-msgstr "個数�異�るカラム�士��レコード型�比較�����ん"
-
-#: utils/adt/selfuncs.c:4762 utils/adt/selfuncs.c:5191
-msgid "case insensitive matching not supported on type bytea"
-msgstr "型bytea��大文字�文字�区別を���マッ�をサ�ート���ん"
+"�インドメッセージ�%dパラメータを�供������準備�れ�文\"%s\"��%d必"
+"����"
 
-#: utils/adt/selfuncs.c:4867 utils/adt/selfuncs.c:5351
-msgid "regular-expression matching not supported on type bytea"
-msgstr "型bytea��正�表��マッ�をサ�ート���ん"
+#: tcop/postgres.c:1657
+#, c-format
+msgid "incorrect binary data format in bind parameter %d"
+msgstr "�インドパラメータ%d�����イナリデータ書���正��"
 
-#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
+#: tcop/postgres.c:1796
 #, c-format
-msgid "invalid input syntax for type tid: \"%s\""
-msgstr "型tid�入力構文�無効��: \"%s\""
+msgid "duration: %s ms  bind %s%s%s: %s"
+msgstr "期間: %s ミリ秒  �インド %s%s%s: %s"
 
-#: utils/adt/arrayutils.c:209
-msgid "typmod array must be type cstring[]"
-msgstr "typmod�列�cstring[]型���れ��り��ん"
+#: tcop/postgres.c:1844 tcop/postgres.c:2385
+#, c-format
+msgid "portal \"%s\" does not exist"
+msgstr "�ータル\"%s\"�存在���ん"
 
-#: utils/adt/arrayutils.c:214
-msgid "typmod array must be one-dimensional"
-msgstr "typmod�列�1次元��列���れ��り��ん"
+#: tcop/postgres.c:1931 tcop/postgres.c:2016
+msgid "execute fetch from"
+msgstr "�り出�実行"
 
-#: utils/adt/arrayutils.c:219
-msgid "typmod array must not contain nulls"
-msgstr "typmod�列��NULL値を��������ん"
+#: tcop/postgres.c:1932 tcop/postgres.c:2017
+msgid "execute"
+msgstr "実行"
 
-#: utils/adt/tsvector.c:215
+#: tcop/postgres.c:1929
 #, c-format
-msgid "word is too long (%ld bytes, max %ld bytes)"
-msgstr "�語�長����(%ld�イト�最大�%ld�イト)"
+msgid "%s %s%s%s: %s"
+msgstr "%s %s%s%s: %s"
 
-#: utils/adt/tsvector.c:222
+#: tcop/postgres.c:2013
 #, c-format
-msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
-msgstr "tsベクター����文字列�長����(%ld�イト�最大�%ld�イト)"
+msgid "duration: %s ms  %s %s%s%s: %s"
+msgstr "期間: %s ミリ秒  %s %s%s%s: %s"
 
-#: utils/adt/numeric.c:352 utils/adt/numeric.c:379 utils/adt/numeric.c:3083
-#: utils/adt/numeric.c:3106 utils/adt/numeric.c:3130 utils/adt/numeric.c:3137
+#: tcop/postgres.c:2139
 #, c-format
-msgid "invalid input syntax for type numeric: \"%s\""
-msgstr "numeric型�入力構文�無効��: \"%s\""
-
-#: utils/adt/numeric.c:482
-msgid "invalid length in external \"numeric\" value"
-msgstr "\"numeric\"�外部値�長��無効��"
-
-#: utils/adt/numeric.c:493
-msgid "invalid sign in external \"numeric\" value"
-msgstr "\"numeric\"�外部値�符��無効��"
-
-#: utils/adt/numeric.c:503
-msgid "invalid digit in external \"numeric\" value"
-msgstr "\"numeric\"�外部値���無効��"
+msgid "prepare: %s"
+msgstr "準備: %s"
 
-#: utils/adt/numeric.c:634 utils/adt/numeric.c:648
+#: tcop/postgres.c:2202
 #, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
-msgstr "NUMERIC�精度%d�1�ら%d�����れ��り��ん"
+msgid "parameters: %s"
+msgstr "パラメータ: %s"
 
-#: utils/adt/numeric.c:639
-#, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
-msgstr "NUMERIC���り%d�0�ら精度%d�����れ��り��ん"
+#: tcop/postgres.c:2221
+msgid "abort reason: recovery conflict"
+msgstr "異常終了��由：リカ�リ�������"
 
-#: utils/adt/numeric.c:657
-msgid "invalid NUMERIC type modifier"
-msgstr "無効�NUMERIC型�修正���"
+#: tcop/postgres.c:2237
+msgid "User was holding shared buffer pin for too long."
+msgstr "ユーザ�共有�ッファ・ピンを長�����������"
 
-#: utils/adt/numeric.c:982 utils/adt/float.c:2687
-msgid "count must be greater than zero"
-msgstr "カウント�0より大����れ��り��ん"
+#: tcop/postgres.c:2240
+msgid "User was holding a relation lock for too long."
+msgstr "ユーザリレーション�ロックを長�����������"
 
-#: utils/adt/numeric.c:989 utils/adt/float.c:2692
-msgid "operand, lower bound and upper bound cannot be NaN"
-msgstr "オペランド�下��上�をNaN��る�������ん"
+#: tcop/postgres.c:2243
+msgid "User was or might have been using tablespace that must be dropped."
+msgstr ""
+"削除�れる��テーブルスペースをユーザ�使������（も������能性�"
+"�り���）。"
 
-#: utils/adt/numeric.c:1002 utils/adt/float.c:2736
-msgid "lower bound cannot equal upper bound"
-msgstr "下�を上���������ん"
+#: tcop/postgres.c:2246
+msgid "User query might have needed to see row versions that must be removed."
+msgstr ""
+"削除�れる���ージョン�行をユーザクエリ��照���れ��ら�����能性"
+"��り���。"
 
-#: utils/adt/numeric.c:1690 utils/adt/numeric.c:3545
-msgid "value overflows numeric format"
-msgstr "値�numeric�書��オー�フロー�����"
+#: tcop/postgres.c:2249 storage/ipc/standby.c:490
+msgid "User transaction caused buffer deadlock with recovery."
+msgstr ""
+"リカ�リ時�ユーザ�トランザクション��ッファ�デッドロックを引�起����"
+"�。"
 
-#: utils/adt/numeric.c:1975 utils/adt/float.c:1345
-msgid "zero raised to a negative power is undefined"
-msgstr "0 �負数乗�定義�れ����ん"
+#: tcop/postgres.c:2252
+msgid "User was connected to a database that must be dropped."
+msgstr "削除�れる��データベース�ユーザ�接続������。"
 
-#: utils/adt/numeric.c:1981 utils/adt/float.c:1349
-msgid "a negative number raised to a non-integer power yields a complex result"
-msgstr "負数を整数���数���乗�る���果�複雑��り��"
+#: tcop/postgres.c:2586
+msgid "terminating connection because of crash of another server process"
+msgstr "他�サー�プロセス�クラッシュ����接続を終了�����"
 
-#: utils/adt/numeric.c:2038
-msgid "cannot convert NaN to integer"
-msgstr "NaNをinteger�変�����ん"
-
-#: utils/adt/numeric.c:2106
-msgid "cannot convert NaN to bigint"
-msgstr "NaNをbigint�変�����ん"
+#: tcop/postgres.c:2587
+msgid ""
+"The postmaster has commanded this server process to roll back the current "
+"transaction and exit, because another server process exited abnormally and "
+"possibly corrupted shared memory."
+msgstr ""
+"他�サー�プロセス�異常終了�共有メモリ�破����能性��り������\n"
+"postmaster���サー�プロセス�対���在�トランザクションをロール�ック\n"
+"�終了�るよ�指示����。"
 
-#: utils/adt/numeric.c:2154
-msgid "cannot convert NaN to smallint"
-msgstr "NaNをsmallint�変�����ん"
+#: tcop/postgres.c:2591 tcop/postgres.c:2939
+msgid ""
+"In a moment you should be able to reconnect to the database and repeat your "
+"command."
+msgstr "��後�データベース��接続��コマンドを繰り返���れ��り��ん。"
 
-#: utils/adt/numeric.c:3615
-msgid "numeric field overflow"
-msgstr "numericフィールド�オー�ーフロー�����"
+#: tcop/postgres.c:2701
+msgid "floating-point exception"
+msgstr "浮動�数点例外"
 
-#: utils/adt/numeric.c:3616
-#, c-format
+#: tcop/postgres.c:2702
 msgid ""
-"A field with precision %d, scale %d must round to an absolute value less "
-"than %s%d."
+"An invalid floating-point operation was signaled. This probably means an out-"
+"of-range result or an invalid operation, such as division by zero."
 msgstr ""
-"精度 %d���り %dを��フィールド��%s%dより���絶対値�丸�られ��。"
+"無効�浮動�数点�作�通知�れ���。��ら��れ��範囲外��果や0割り�\n"
+"��無効��作を�味�����。"
 
-#: utils/adt/numeric.c:3760 utils/adt/numeric.c:3786 utils/adt/float.c:399
-#: utils/adt/float.c:440 utils/adt/float.c:491
-#, c-format
-msgid "invalid input syntax for type double precision: \"%s\""
-msgstr "型double precision�入力構文�無効��: \"%s\""
+#: tcop/postgres.c:2870
+msgid "terminating autovacuum process due to administrator command"
+msgstr "管�者コマンド�より自動�キュームを終了�����"
 
-#: utils/adt/numeric.c:4974 utils/adt/float.c:1303
-msgid "cannot take square root of a negative number"
-msgstr "負�値�平方根を�る�������ん"
+#: tcop/postgres.c:2876 tcop/postgres.c:2886 tcop/postgres.c:2937
+msgid "terminating connection due to conflict with recovery"
+msgstr "リカ�リ�競��発生�����接続を終了�����"
 
-#: utils/adt/numeric.c:5064
-msgid "argument for function \"exp\" too big"
-msgstr "関数\"exp\"�引数�大�����"
+#: tcop/postgres.c:2892
+msgid "terminating connection due to administrator command"
+msgstr "管�者コマンド�より接続を終了�����"
 
-#: utils/adt/numeric.c:5192 utils/adt/float.c:1415 utils/adt/float.c:1445
-msgid "cannot take logarithm of zero"
-msgstr "ゼロ�対数を�る�������ん"
+#: tcop/postgres.c:2907
+msgid "canceling authentication due to timeout"
+msgstr "タイムアウト�より�証処�をキャンセル�����"
 
-#: utils/adt/numeric.c:5196 utils/adt/float.c:1419 utils/adt/float.c:1449
-msgid "cannot take logarithm of a negative number"
-msgstr "負�値�対数を�る�������ん"
+#: tcop/postgres.c:2916
+msgid "canceling statement due to statement timeout"
+msgstr "ステートメント�タイムアウト�よりステートメントをキャンセル�����"
 
-#: utils/adt/date.c:71
-#, c-format
-msgid "TIME(%d)%s precision must not be negative"
-msgstr "(%d)%s�精度�負������ん"
+#: tcop/postgres.c:2925
+msgid "canceling autovacuum task"
+msgstr "自動�キューム作業をキャンセル�����"
 
-#: utils/adt/date.c:77
-#, c-format
-msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
-msgstr "TIME(%d)%s���りを許容最大値%d��減ら����"
+#: tcop/postgres.c:2944 storage/ipc/standby.c:489
+msgid "canceling statement due to conflict with recovery"
+msgstr "リカ�リー�競��発生����ステートメントをキャンセル�����"
 
-#: utils/adt/date.c:167
-#, c-format
-msgid "date out of range: \"%s\""
-msgstr "日付�範囲外��: \"%s\""
+#: tcop/postgres.c:2960
+msgid "canceling statement due to user request"
+msgstr "ユーザ�ら��求�より文をキャンセル�����"
 
-#: utils/adt/date.c:217 utils/adt/xml.c:1688
-msgid "date out of range"
-msgstr "日付�範囲外��"
+#: tcop/postgres.c:3041 tcop/postgres.c:3063
+msgid "stack depth limit exceeded"
+msgstr "スタック長制�を越����"
 
-#: utils/adt/date.c:359
-msgid "cannot subtract infinite dates"
-msgstr "無�大�日付�減算����ん"
+#: tcop/postgres.c:3042 tcop/postgres.c:3064
+#, c-format
+msgid ""
+"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
+"after ensuring the platform's stack depth limit is adequate."
+msgstr ""
+"�使��プラットフォーム���るスタック長�制�����る��を確�後�"
+"設定パラメータ \"max_stack_depth\"（�在 %dkB）を増や������。"
 
-#: utils/adt/date.c:416 utils/adt/date.c:453
-msgid "date out of range for timestamp"
-msgstr "タイムスタンプ�日付�範囲外��"
+#: tcop/postgres.c:3080
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %ldkB."
+msgstr "\"max_stack_depth\" � %ldkB を越���よ��������"
 
-#: utils/adt/date.c:953
-msgid "cannot convert reserved abstime value to date"
-msgstr "予約�れ�abstime�らdate��変������ん"
+#: tcop/postgres.c:3082
+msgid ""
+"Increase the platform's stack depth limit via \"ulimit -s\" or local "
+"equivalent."
+msgstr ""
+"プラットフォーム�スタック長を\"ulimit -s\"（システム���������）を使"
+"用��増加������"
 
-#: utils/adt/date.c:1107 utils/adt/date.c:1114 utils/adt/date.c:1882
-#: utils/adt/date.c:1889
-msgid "time out of range"
-msgstr "時刻�範囲外��"
+#: tcop/postgres.c:3386 bootstrap/bootstrap.c:277 postmaster/postmaster.c:681
+#, c-format
+msgid "--%s requires a value"
+msgstr "--%s��値�必���"
 
-#: utils/adt/date.c:1760 utils/adt/date.c:1777
+#: tcop/postgres.c:3391 bootstrap/bootstrap.c:282 postmaster/postmaster.c:686
 #, c-format
-msgid "\"time\" units \"%s\" not recognized"
-msgstr "\"time\"���\"%s\"��明��"
+msgid "-c %s requires a value"
+msgstr "-c %s�値�必���"
 
-#: utils/adt/date.c:1899
-msgid "time zone displacement out of range"
-msgstr "時間帯�置��範囲外��"
+#: tcop/postgres.c:3417
+msgid "invalid command-line arguments for server process"
+msgstr "サー�プロセス用�コマンドラインオプション�無効��"
 
-#: utils/adt/date.c:2524 utils/adt/date.c:2541
+#: tcop/postgres.c:3418 tcop/postgres.c:3424
 #, c-format
-msgid "\"time with time zone\" units \"%s\" not recognized"
-msgstr "\"time with time zone\"���\"%s\"��明��"
+msgid "Try \"%s --help\" for more information."
+msgstr "詳細�\"%s --help\"を実行������。"
 
-#: utils/adt/date.c:2639
+#: tcop/postgres.c:3422
 #, c-format
-msgid "\"interval\" time zone \"%s\" not valid"
-msgstr "\"interval\"�時間帯\"%s\"�無効��"
+msgid "%s: invalid command-line arguments"
+msgstr "%s: コマンドライン引数�無効��"
 
-#: utils/adt/like_match.c:103 utils/adt/like_match.c:163
-msgid "LIKE pattern must not end with escape character"
-msgstr "LIKE パターン�エスケープ文字�終�����り��ん"
+#: tcop/postgres.c:3521
+#, c-format
+msgid "%s: no database nor user name specified"
+msgstr "%s: データベース�もユーザ�も指定�れ����ん"
 
-#: utils/adt/trigfuncs.c:41
-msgid "suppress_redundant_updates_trigger: must be called as trigger"
-msgstr ""
-"suppress_redundant_updates_trigger: トリガー���呼�れ��れ��り��ん"
+#: tcop/postgres.c:4060
+#, c-format
+msgid "invalid CLOSE message subtype %d"
+msgstr "CLOSEメッセージ�サブタイプ%d�無効��"
 
-#: utils/adt/trigfuncs.c:47
-msgid "suppress_redundant_updates_trigger: must be called on update"
-msgstr ""
-"suppress_redundant_updates_trigger: update 時�呼�れ��れ��り��ん"
+#: tcop/postgres.c:4093
+#, c-format
+msgid "invalid DESCRIBE message subtype %d"
+msgstr "DESCRIBEメッセージ�サブタイプ%d�無効��"
 
-#: utils/adt/trigfuncs.c:53
-msgid "suppress_redundant_updates_trigger: must be called before update"
+#: tcop/postgres.c:4327
+#, c-format
+msgid ""
+"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%"
+"s"
 msgstr ""
-"suppress_redundant_updates_trigger: update ��呼�れ��れ��り��ん"
-
-#: utils/adt/trigfuncs.c:59
-msgid "suppress_redundant_updates_trigger: must be called for each row"
-msgstr "suppress_redundant_updates_trigger: �行���呼�れ��れ��り��ん"
-
-#: utils/adt/float.c:54
-msgid "value out of range: overflow"
-msgstr "範囲外�値��: オー�ーフロー"
+"接続を切断: セッション期間: %d:%02d:%02d.%03d ユーザ=%s データベース=%s ホス"
+"ト=%s%s%s"
 
-#: utils/adt/float.c:59
-msgid "value out of range: underflow"
-msgstr "範囲外�値��: アンダーフロー"
+#: tcop/utility.c:95 commands/tablecmds.c:812 commands/tablecmds.c:1141
+#: commands/tablecmds.c:2069 commands/tablecmds.c:3780
+#: commands/tablecmds.c:5497 commands/trigger.c:199 commands/trigger.c:1104
+#: rewrite/rewriteDefine.c:265
+#, c-format
+msgid "permission denied: \"%s\" is a system catalog"
+msgstr "権���り��ん: \"%s\"�システムカタログ��"
 
-#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
+#. translator: %s is name of a SQL command, eg CREATE
+#: tcop/utility.c:253
 #, c-format
-msgid "invalid input syntax for type real: \"%s\""
-msgstr "型real�入力構文�無効��: \"%s\""
+msgid "cannot execute %s in a read-only transaction"
+msgstr "リードオンリー�トランザクション�� %s を実行����ん"
 
-#: utils/adt/float.c:242
+#. translator: %s is name of a SQL command, eg CREATE
+#: tcop/utility.c:272
 #, c-format
-msgid "\"%s\" is out of range for type real"
-msgstr "型real��\"%s\"�範囲外��"
+msgid "cannot execute %s during recovery"
+msgstr "リカ�リー中� %s を実行����ん"
 
-#: utils/adt/float.c:435
+#. translator: %s is name of a SQL command, eg PREPARE
+#: tcop/utility.c:290
 #, c-format
-msgid "\"%s\" is out of range for type double precision"
-msgstr "型double precision��\"%s\"�範囲外��"
+msgid "cannot execute %s within security-restricted operation"
+msgstr "セキュリティー制��作�中�� %s を実行����ん"
 
-#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
-#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
-#: utils/adt/float.c:1604 utils/adt/float.c:1625
-msgid "input is out of range"
-msgstr "入力�範囲外��"
+#: tcop/utility.c:1194
+msgid "must be superuser to do CHECKPOINT"
+msgstr "CHECKPOINTを実行�る��スーパーユーザ���れ��り��ん"
 
-#: utils/adt/float.c:2698
-msgid "lower and upper bounds must be finite"
-msgstr "下��よ�上��有����れ��り��ん"
+#: tcop/fastpath.c:109 tcop/fastpath.c:485 tcop/fastpath.c:615
+#, c-format
+msgid "invalid argument size %d in function call message"
+msgstr "関数呼�出�メッセージ内�引数サイズ%d�無効��"
 
-#: utils/adt/ri_triggers.c:373 utils/adt/ri_triggers.c:433
-#: utils/adt/ri_triggers.c:596 utils/adt/ri_triggers.c:836
-#: utils/adt/ri_triggers.c:1024 utils/adt/ri_triggers.c:1186
-#: utils/adt/ri_triggers.c:1374 utils/adt/ri_triggers.c:1545
-#: utils/adt/ri_triggers.c:1728 utils/adt/ri_triggers.c:1899
-#: utils/adt/ri_triggers.c:2115 utils/adt/ri_triggers.c:2297
-#: utils/adt/ri_triggers.c:2500 utils/adt/ri_triggers.c:2548
-#: utils/adt/ri_triggers.c:2593 utils/adt/ri_triggers.c:2721 gram.y:2610
-msgid "MATCH PARTIAL not yet implemented"
-msgstr "MMATCH PARTIAL ���実装�れ����ん"
+#: tcop/fastpath.c:331
+#, c-format
+msgid "fastpath function call: \"%s\" (OID %u)"
+msgstr "近�関数呼�出�: \"%s\"(OID %u）)"
 
-#: utils/adt/ri_triggers.c:407 utils/adt/ri_triggers.c:2803
-#: utils/adt/ri_triggers.c:3454 utils/adt/ri_triggers.c:3486
+#: tcop/fastpath.c:415
 #, c-format
-msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
-msgstr "テーブル\"%s\"��挿入�更新�外部キー制約\"%s\"��������"
+msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
+msgstr "期間: %s ミリ秒  近�関数呼�出�: \"%s\" (OID %u)"
 
-#: utils/adt/ri_triggers.c:410 utils/adt/ri_triggers.c:2806
-msgid "MATCH FULL does not allow mixing of null and nonnull key values."
-msgstr "MACTH FULL��NULLキー値��NULLキー値を混在����ん"
+#: tcop/fastpath.c:453 tcop/fastpath.c:580
+#, c-format
+msgid "function call message contains %d arguments but function requires %d"
+msgstr "関数呼�出�メッセージ��%d引数�り�����関数��%d必���"
 
-#: utils/adt/ri_triggers.c:3016
+#: tcop/fastpath.c:461
 #, c-format
-msgid "function \"%s\" must be fired for INSERT"
-msgstr "関数\"%s\"をINSERT�発行���れ��り��ん"
+msgid "function call message contains %d argument formats but %d arguments"
+msgstr "関数呼�出�メッセージ��%d�引数書���り�����引数�%d���"
 
-#: utils/adt/ri_triggers.c:3022
+#: tcop/fastpath.c:548 tcop/fastpath.c:631
 #, c-format
-msgid "function \"%s\" must be fired for UPDATE"
-msgstr "関数\"%s\"をUPDATE�発行���れ��り��ん"
+msgid "incorrect binary data format in function argument %d"
+msgstr "関数引数%d��イナリデータ書���正��"
 
-#: utils/adt/ri_triggers.c:3036
+#: tcop/pquery.c:660
 #, c-format
-msgid "function \"%s\" must be fired for DELETE"
-msgstr "関数\"%s\"をDELETE�発行���れ��り��ん"
+msgid "bind message has %d result formats but query has %d columns"
+msgstr "�インドメッセージ�%d��果書���り�����������%d列���"
 
-#: utils/adt/ri_triggers.c:3065
+#: tcop/pquery.c:738 tcop/pquery.c:1401 commands/portalcmds.c:336
 #, c-format
-msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
-msgstr "テーブル\"%2$s\"�トリガ\"%1$s\"用�pg_constraint項目��り��ん"
+msgid "portal \"%s\" cannot be run"
+msgstr "�ータル\"%s\"を実行����ん"
 
-#: utils/adt/ri_triggers.c:3067
-msgid ""
-"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
-"ADD CONSTRAINT."
+#: tcop/pquery.c:969
+msgid "cursor can only scan forward"
+msgstr "カーゾル��方��スキャン������ん"
+
+#: tcop/pquery.c:970
+msgid "Declare it with SCROLL option to enable backward scan."
 msgstr ""
-"���照整�性トリガ���対象を削除��ALTER TABLE ADD CONSTRAINTを実行��"
-"����"
+"後方スキャンを有効��る����SCROLLオプションを付��宣言������。"
 
-#: utils/adt/ri_triggers.c:3421
+#: tsearch/dict_thesaurus.c:180
 #, c-format
-msgid ""
-"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
-"unexpected result"
-msgstr ""
-"\"%3$s\"�制約\"%2$s\"�ら\"%1$s\"�行�れ��照整�性������想定外��"
-"果��り���"
+msgid "could not open thesaurus file \"%s\": %m"
+msgstr "シソーラスファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/adt/ri_triggers.c:3425
-msgid "This is most likely due to a rule having rewritten the query."
-msgstr "�れ���ん��場��������を書���るルール�原因��"
+#: tsearch/dict_thesaurus.c:213
+msgid "unexpected delimiter"
+msgstr "想定外�デリミタ��"
 
-#: utils/adt/ri_triggers.c:3456
-#, c-format
-msgid "No rows were found in \"%s\"."
-msgstr "\"%s\"�行��り��ん���"
+#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
+msgid "unexpected end of line or lexeme"
+msgstr "想定外�行末も����語�終端��"
 
-#: utils/adt/ri_triggers.c:3488
-#, c-format
-msgid "Key (%s)=(%s) is not present in table \"%s\"."
-msgstr "テーブル\"%3$s\"�キー(%1$s)=(%2$s)��り��ん"
+#: tsearch/dict_thesaurus.c:288
+msgid "unexpected end of line"
+msgstr "想定外�行末��"
 
-#: utils/adt/ri_triggers.c:3494
+#: tsearch/dict_thesaurus.c:412
 #, c-format
 msgid ""
-"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
-"table \"%s\""
-msgstr ""
-"テーブル\"%1$s\"�更新���削除��テーブル\"%3$s\"�外部キー制約\"%2$s\"�"
-"�����"
+"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr "シソーラスサンプル�語\"%s\"�副辞書��識�れ��ん(�則%d)"
 
-#: utils/adt/ri_triggers.c:3497
+#: tsearch/dict_thesaurus.c:418
 #, c-format
-msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
-msgstr "キー(%s)=(%s)���テーブル\"%s\"�ら�照�れ����"
+msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
+msgstr "シソーラスサンプル�語\"%s\"�ストップワード��(�則%d)"
+
+#: tsearch/dict_thesaurus.c:421
+msgid "Use \"?\" to represent a stop word within a sample phrase."
+msgstr "サンプルフレーズ内�ストップワードを表���\"?\"を使用������"
 
-#: utils/adt/ruleutils.c:2236
+#: tsearch/dict_thesaurus.c:567
 #, c-format
-msgid "rule \"%s\" has unsupported event type %d"
-msgstr "ルール\"%s\"�サ�ート�����イベント種類%dを����"
+msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
+msgstr "シソーラス置��語\"%s\"�ストップワード��(�則%d)"
 
-#: utils/adt/ruleutils.c:5473 utils/adt/ruleutils.c:5528
-#: utils/adt/ruleutils.c:5565 utils/adt/regproc.c:635 utils/adt/regproc.c:1485
-msgid "too many arguments"
-msgstr "引数�多����"
+#: tsearch/dict_thesaurus.c:574
+#, c-format
+msgid ""
+"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr "シソーラス置��語\"%s\"�副辞書��識�れ��ん(�則%d)"
 
-#: utils/adt/oracle_compat.c:892
-msgid "requested character too large"
-msgstr "�求��文字�長����"
+#: tsearch/dict_thesaurus.c:586
+#, c-format
+msgid "thesaurus substitute phrase is empty (rule %d)"
+msgstr "シソーラス置�フレーズ�空��(�則%d)"
+
+#: tsearch/dict_thesaurus.c:615 tsearch/dict_ispell.c:53
+msgid "multiple DictFile parameters"
+msgstr "�複�るDictFileパラメータ"
 
-#: utils/adt/oracle_compat.c:938 utils/adt/oracle_compat.c:992
+#: tsearch/dict_thesaurus.c:624
+msgid "multiple Dictionary parameters"
+msgstr "�複�る辞書パラメータ"
+
+#: tsearch/dict_thesaurus.c:631
 #, c-format
-msgid "requested character too large for encoding: %d"
-msgstr "�求��文字�符�化方���長����: %d"
+msgid "unrecognized Thesaurus parameter: \"%s\""
+msgstr "未知�シソーラスパラメータ \"%s\""
 
-#: utils/adt/oracle_compat.c:985
-msgid "null character not permitted"
-msgstr "NULL文字�許�れ��ん"
+#: tsearch/dict_thesaurus.c:639 tsearch/dict_ispell.c:103
+msgid "missing DictFile parameter"
+msgstr "DictFileパラメータ��り��ん"
 
-#: utils/adt/datum.c:80 utils/adt/datum.c:92
-msgid "invalid Datum pointer"
-msgstr "Datum�インタ�無効��"
+#: tsearch/dict_thesaurus.c:643
+msgid "missing Dictionary parameter"
+msgstr "Dictionaryパラメータ��り��ん"
 
-#: utils/adt/varlena.c:1333 utils/adt/varlena.c:1346
+#: tsearch/ts_utils.c:53
 #, c-format
-msgid "could not convert string to UTF-16: error %lu"
-msgstr "文字列をUTF-16�変�����ん���: エラー %lu"
+msgid "invalid text search configuration file name \"%s\""
+msgstr "テキスト検索設定ファイル��%s�無効��"
 
-#: utils/adt/varlena.c:1356
+#: tsearch/ts_utils.c:91
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "Unicode文字列を比較����ん���: %m"
+msgid "could not open stop-word file \"%s\": %m"
+msgstr "ストップワードファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/adt/varlena.c:1988 utils/adt/varlena.c:2019 utils/adt/varlena.c:2055
-#: utils/adt/varlena.c:2098
+#: tsearch/wparser_def.c:2551
 #, c-format
-msgid "index %d out of valid range, 0..%d"
-msgstr "インデックス%d�有効範囲0�ら%d���間��り��ん"
+msgid "unrecognized headline parameter: \"%s\""
+msgstr "未知�見出�パラメータ: \"%s\""
 
-#: utils/adt/varlena.c:2198 utils/adt/varlena.c:2203 utils/adt/regproc.c:1320
-#: utils/adt/regproc.c:1325
-msgid "invalid name syntax"
-msgstr "��構文�無効��"
+#: tsearch/wparser_def.c:2560
+msgid "MinWords should be less than MaxWords"
+msgstr "MinWords�MaxWordsより�����れ��り��ん"
 
-#: utils/adt/varlena.c:2890
-msgid "field position must be greater than zero"
-msgstr "フィールド�置�0より大����れ��り��ん"
+#: tsearch/wparser_def.c:2564
+msgid "MinWords should be positive"
+msgstr "MinWords�正���れ��り��ん"
 
-#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
+#: tsearch/wparser_def.c:2568
+msgid "ShortWord should be >= 0"
+msgstr "ShortWord�>= 0���れ��り��ん"
+
+#: tsearch/wparser_def.c:2572
+msgid "MaxFragments should be >= 0"
+msgstr "MaxFragments � 0 以上���れ��り��ん"
+
+#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:514
 #, c-format
-msgid "more than one function named \"%s\""
-msgstr "\"%s\"������関数�複数�り��"
+msgid "string is too long for tsvector (%d bytes, max %d bytes)"
+msgstr "TSベクター����文字列�長����(%d�イト�最大�%d�イト)"
+
+#: tsearch/dict_simple.c:59
+msgid "multiple Accept parameters"
+msgstr "�複�るAcceptパラメータ"
 
-#: utils/adt/regproc.c:464 utils/adt/regproc.c:484 utils/adt/regproc.c:643
-#: parser/parse_oper.c:124 parser/parse_oper.c:751
+#: tsearch/dict_simple.c:67
 #, c-format
-msgid "operator does not exist: %s"
-msgstr "演算��存在���ん: %s"
+msgid "unrecognized simple dictionary parameter: \"%s\""
+msgstr "未知��純辞書パラメータ: \"%s\""
 
-#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
+#: tsearch/spell.c:276
 #, c-format
-msgid "more than one operator named %s"
-msgstr "%s������演算��複数�り��"
+msgid "could not open dictionary file \"%s\": %m"
+msgstr "辞書ファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/adt/regproc.c:630 gram.y:5420
-msgid "missing argument"
-msgstr "引数��り��ん"
+#: tsearch/spell.c:439 utils/adt/regexp.c:195
+#, c-format
+msgid "invalid regular expression: %s"
+msgstr "正�表��無効��: %s"
 
-#: utils/adt/regproc.c:631 gram.y:5421
-msgid "Use NONE to denote the missing argument of a unary operator."
-msgstr "�項演算��存在���引数を表���NONEを使用������。"
+#: tsearch/spell.c:596 tsearch/spell.c:842 tsearch/spell.c:862
+msgid "multibyte flag character is not allowed"
+msgstr "マル��イトフラグ付��文字�使用����ん"
 
-#: utils/adt/regproc.c:636
-msgid "Provide two argument types for operator."
-msgstr "演算���2��引数型を�供������"
+#: tsearch/spell.c:629 tsearch/spell.c:687 tsearch/spell.c:780
+#, c-format
+msgid "could not open affix file \"%s\": %m"
+msgstr "affixファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/adt/regproc.c:1383
-msgid "expected a left parenthesis"
-msgstr "左括弧を想定������"
+#: tsearch/spell.c:675
+msgid "Ispell dictionary supports only default flag value"
+msgstr "Ispell �辞書�デフォルトフラグ値��をサ�ート���"
 
-#: utils/adt/regproc.c:1399
-msgid "expected a right parenthesis"
-msgstr "�括弧を想定������"
+#: tsearch/spell.c:873
+msgid "wrong affix file format for flag"
+msgstr "フラグ�関�る affix ファイル�書��誤�����"
 
-#: utils/adt/regproc.c:1418
-msgid "expected a type name"
-msgstr "型���を想定������"
+#: tsearch/dict_synonym.c:119
+#, c-format
+msgid "unrecognized synonym parameter: \"%s\""
+msgstr "未知�類義語パラメータ: \"%s\""
 
-#: utils/adt/regproc.c:1450
-msgid "improper type name"
-msgstr "型������切��"
+#: tsearch/dict_synonym.c:126
+msgid "missing Synonyms parameter"
+msgstr "類義語パラメータ��り��ん"
 
-#: utils/adt/bool.c:153
+#: tsearch/dict_synonym.c:133
 #, c-format
-msgid "invalid input syntax for type boolean: \"%s\""
-msgstr "boolean型��入力構文�無効��: \"%s\""
+msgid "could not open synonym file \"%s\": %m"
+msgstr "類義語ファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/adt/windowfuncs.c:243
-msgid "argument of ntile must be greater than zero"
-msgstr "ntile カウント�0より大����れ��り��ん"
+#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
+#: tsearch/ts_parse.c:568
+msgid "word is too long to be indexed"
+msgstr "インデックス付��る���語�長����"
 
-#: utils/adt/windowfuncs.c:465
-msgid "argument of nth_value must be greater than zero"
-msgstr "nth_value 引数� 0 より大����れ��り��ん"
+#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
+#: tsearch/ts_parse.c:569
+#, c-format
+msgid "Words longer than %d characters are ignored."
+msgstr "%dより長��語�無視�れ��。"
 
-#: utils/adt/xml.c:135
-msgid "unsupported XML feature"
-msgstr "未サ�ート�XML機能��。"
+#: tsearch/ts_locale.c:177
+#, c-format
+msgid "line %d of configuration file \"%s\": \"%s\""
+msgstr "設定ファイル\"%2$s\"�%1$d行目：\"%3$s\""
 
-#: utils/adt/xml.c:136
-msgid "This functionality requires the server to be built with libxml support."
-msgstr "��機能�libxmlサ�ートを付��サー��必���。"
+#: tsearch/ts_locale.c:302
+#, c-format
+msgid "conversion from wchar_t to server encoding failed: %m"
+msgstr "wchar_t�らサー�符�化方���変��失敗����: %m"
 
-#: utils/adt/xml.c:137
-msgid "You need to rebuild PostgreSQL using --with-libxml."
-msgstr "--with-libxmlを使用��PostgreSQLを�構築���れ��り��ん。"
+#: tsearch/wparser.c:314
+msgid "text search parser does not support headline creation"
+msgstr "テキスト検索パーサ�見出�作�をサ�ート���ん"
 
-#: utils/adt/xml.c:156 utils/mb/mbutils.c:476
-#, c-format
-msgid "invalid encoding name \"%s\""
-msgstr "符�化方��\"%s\"�無効��"
+#: tsearch/dict_ispell.c:64
+msgid "multiple AffFile parameters"
+msgstr "�複�るAffFileパラメータ"
 
-#: utils/adt/xml.c:402 utils/adt/xml.c:407
-msgid "invalid XML comment"
-msgstr "無効�XMLコメント��"
+#: tsearch/dict_ispell.c:83
+#, c-format
+msgid "unrecognized Ispell parameter: \"%s\""
+msgstr "未知�Ispellパラメータ: \"%s\""
 
-#: utils/adt/xml.c:536
-msgid "not an XML document"
-msgstr "XML文書���り��ん"
+#: tsearch/dict_ispell.c:97
+msgid "missing AffFile parameter"
+msgstr "AffFileパラメータ��り��ん"
 
-#: utils/adt/xml.c:689 utils/adt/xml.c:712
-msgid "invalid XML processing instruction"
-msgstr "無効�XML処�命令��"
+#: bootstrap/bootstrap.c:293 postmaster/postmaster.c:698
+#: postmaster/postmaster.c:711
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "詳細�\"%s --help\"を実行������。\n"
 
-#: utils/adt/xml.c:690
+#: bootstrap/bootstrap.c:302
 #, c-format
-msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr "XML処�命令�対象�を\"%s\"��る�������ん���。"
+msgid "%s: invalid command-line arguments\n"
+msgstr "%s: コマンドライン引数�無効��\n"
 
-#: utils/adt/xml.c:713
-msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "XML処�命令��\"?>\"を��る�������ん。"
+#: postmaster/postmaster.c:572
+#, c-format
+msgid "%s: invalid argument for option -f: \"%s\"\n"
+msgstr "%s: -fオプション�無効�引数: \"%s\"\n"
 
-#: utils/adt/xml.c:792
-msgid "xmlvalidate is not implemented"
-msgstr "XML �妥当性検査�実装�れ����ん"
+#: postmaster/postmaster.c:658
+#, c-format
+msgid "%s: invalid argument for option -t: \"%s\"\n"
+msgstr "%s: -tオプション�無効�引数: \"%s\"\n"
 
-#: utils/adt/xml.c:877
-msgid "could not initialize XML library"
-msgstr "XMLライブラリを�期化����ん���"
+#: postmaster/postmaster.c:709
+#, c-format
+msgid "%s: invalid argument: \"%s\"\n"
+msgstr "%s: 無効�引数: \"%s\"\n"
 
-#: utils/adt/xml.c:878
+#: postmaster/postmaster.c:734
 #, c-format
+msgid "%s: superuser_reserved_connections must be less than max_connections\n"
+msgstr ""
+"%s: superuser_reserved_connections�max_connectionsより�����れ��り��"
+"ã‚“\n"
+
+#: postmaster/postmaster.c:739
 msgid ""
-"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
+"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
+"\"hot_standby\""
 msgstr ""
-"libxml2�互�性���文字型を����: sizeof(char)=%u�sizeof(xmlChar)=%u"
+"WAL アーカイブ(archive_mode=on) �� wal_level を \"archive\" ��� "
+"\"hot_standby\" ��る必���り��"
 
-#: utils/adt/xml.c:1417
-msgid "Invalid character value."
-msgstr "文字�値�有効���り��ん"
+#: postmaster/postmaster.c:742
+msgid ""
+"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
+"\"hot_standby\""
+msgstr ""
+"WAL ストリーミング(max_wal_senders > 0) �� wal_level を \"archive\" ��� "
+"\"hot_standby\" ��る必���り��"
 
-#: utils/adt/xml.c:1420
-msgid "Space required."
-msgstr "スペースを�������"
+#: postmaster/postmaster.c:750
+#, c-format
+msgid "%s: invalid datetoken tables, please fix\n"
+msgstr "%s: データトークンテーブル�無効��。修復������\n"
 
-#: utils/adt/xml.c:1423
-msgid "standalone accepts only 'yes' or 'no'."
-msgstr "standalone �� 'yes' � 'no' ���有効��"
+#: postmaster/postmaster.c:856
+msgid "invalid list syntax for \"listen_addresses\""
+msgstr "\"listen_addresses\"用�リスト構文�無効��"
 
-#: utils/adt/xml.c:1426
-msgid "Malformed declaration: missing version."
-msgstr "宣言�誤�����：�ージョン��り��ん"
+#: postmaster/postmaster.c:886
+#, c-format
+msgid "could not create listen socket for \"%s\""
+msgstr "\"%s\"�関�る監視用ソケットを作�����ん���"
 
-#: utils/adt/xml.c:1429
-msgid "Missing encoding in text declaration."
-msgstr "テキスト宣言�エンコーディング�指定��り��ん"
-
-#: utils/adt/xml.c:1432
-msgid "Parsing XML declaration: '?>' expected."
-msgstr "XML 宣言�パース中： '>?' �必���。"
-
-#: utils/adt/xml.c:1435
-#, c-format
-msgid "Unrecognized libxml error code: %d."
-msgstr "libxml �エラーコードを�識����ん: %d"
-
-#: utils/adt/xml.c:1689
-msgid "XML does not support infinite date values."
-msgstr "XML�無��データ値をサ�ート���ん。"
-
-#: utils/adt/xml.c:1712 utils/adt/xml.c:1739
-msgid "XML does not support infinite timestamp values."
-msgstr "XML�無��タイムスタンプ値をサ�ート���ん。"
-
-#: utils/adt/xml.c:2123
-msgid "invalid query"
-msgstr "無効��������"
-
-#: utils/adt/xml.c:3352
-msgid "invalid array for XML namespace mapping"
-msgstr "XML��空間マッピング用��列�無効��"
+#: postmaster/postmaster.c:892
+msgid "could not create any TCP/IP sockets"
+msgstr "TCP/IPソケットを作�����ん���"
 
-#: utils/adt/xml.c:3353
-msgid ""
-"The array must be two-dimensional with length of the second axis equal to 2."
-msgstr "�列�第2軸�長��2��2次元�列���れ��り��ん。"
+#: postmaster/postmaster.c:943
+msgid "could not create Unix-domain socket"
+msgstr "Unixドメインソケットを作�����ん���"
 
-#: utils/adt/xml.c:3377
-msgid "empty XPath expression"
-msgstr "XPath��空��"
+#: postmaster/postmaster.c:951
+msgid "no socket created for listening"
+msgstr "監視用�作��るソケット��り��ん"
 
-#: utils/adt/xml.c:3425
-msgid "neither namespace name nor URI may be null"
-msgstr "��空間����URI�も空�も�り��ん"
+#: postmaster/postmaster.c:985
+msgid "could not create I/O completion port for child queue"
+msgstr "�キュー���I/O終了�ートを作�����ん���"
 
-#: utils/adt/xml.c:3432
+#: postmaster/postmaster.c:1029
 #, c-format
-msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
-msgstr "\"%s\"������XML��空間�よ�URI\"%s\"を登録����ん���。"
-
-#: utils/adt/tsgistidx.c:100
-msgid "gtsvector_in not implemented"
-msgstr "gtsvector_in�実装�れ����ん"
+msgid "%s: could not write external PID file \"%s\": %s\n"
+msgstr "%s: 外部PIDファイル\"%s\"�書�出���ん���: %s\n"
 
-#: utils/init/postinit.c:196 postmaster/postmaster.c:1074
+#: postmaster/postmaster.c:1097 utils/init/postinit.c:197
 msgid "could not load pg_hba.conf"
 msgstr "pg_hba.conf �読�込������ん���"
 
-#: utils/init/postinit.c:228
-msgid "replication connection authorized: user=%s host=%s port=%s"
-msgstr "レプリケーション接続��証完了: ユーザ=%s�データベース=%s��ート番�=%s"
-
-#: utils/init/postinit.c:234
-msgid "replication connection authorized: user=%s host=%s"
-msgstr "レプリケーション接続��証完了: ユーザ=%s�ホスト=%s"
-
-#: utils/init/postinit.c:240
+#: postmaster/postmaster.c:1144
 #, c-format
-msgid "connection authorized: user=%s database=%s"
-msgstr "接続��証完了: ユーザ=%s�データベース=%s"
+msgid "%s: could not locate matching postgres executable"
+msgstr "%s: 一致�るpostgres実行ファイル��り��ん���"
 
-#: utils/init/postinit.c:270
+#: postmaster/postmaster.c:1165 storage/file/fd.c:1605
+#: storage/file/copydir.c:67 storage/file/copydir.c:106 utils/adt/misc.c:213
+#: utils/adt/genfile.c:353 utils/misc/tzparser.c:323 commands/tablespace.c:684
 #, c-format
-msgid "database \"%s\" has disappeared from pg_database"
-msgstr "データベース\"%s\"�pg_database�ら消失����"
+msgid "could not open directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"をオープン����ん���: %m"
 
-#: utils/init/postinit.c:272
+#: postmaster/postmaster.c:1167 utils/misc/tzparser.c:325
 #, c-format
-msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "OID %u�データベース�\"%s\"�属�るよ���。"
+msgid ""
+"This may indicate an incomplete PostgreSQL installation, or that the file \"%"
+"s\" has been moved away from its proper location."
+msgstr ""
+"�れ��PostgreSQL�インストール��完全��る�����ファイル\"%s\"�"
+"本��場所�ら�����������を示�����。"
 
-#: utils/init/postinit.c:292
+#: postmaster/postmaster.c:1195
 #, c-format
-msgid "database \"%s\" is not currently accepting connections"
-msgstr "�在データベース\"%s\"�接続を��付���ん"
+msgid "data directory \"%s\" does not exist"
+msgstr "データディレクトリ\"%s\"�存在���ん"
 
-#: utils/init/postinit.c:305
+#: postmaster/postmaster.c:1200
 #, c-format
-msgid "permission denied for database \"%s\""
-msgstr "データベース\"%s\"�権���り��ん"
+msgid "could not read permissions of directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"�権�を読��れ��ん���: %m"
 
-#: utils/init/postinit.c:306
-msgid "User does not have CONNECT privilege."
-msgstr "ユーザ�CONNECT権�を����ん"
+#: postmaster/postmaster.c:1208
+#, c-format
+msgid "specified data directory \"%s\" is not a directory"
+msgstr "指定�れ�データディレクトリ \"%s\" �ディレクトリ���り��ん"
 
-#: utils/init/postinit.c:323
+#: postmaster/postmaster.c:1224
 #, c-format
-msgid "too many connections for database \"%s\""
-msgstr "データベース\"%s\"��接続�多����"
+msgid "data directory \"%s\" has wrong ownership"
+msgstr "データディレクトリ\"%s\"�所有者情報�間������"
 
-#: utils/init/postinit.c:345 utils/init/postinit.c:352
-msgid "database locale is incompatible with operating system"
-msgstr "データベース�ロケール�オペレーティングシステム�互�性��り��ん"
+#: postmaster/postmaster.c:1226
+msgid "The server must be started by the user that owns the data directory."
+msgstr "データディレクトリを所有�るユーザ�サー�を起動���れ��り��ん。"
 
-#: utils/init/postinit.c:346
+#: postmaster/postmaster.c:1246
 #, c-format
-msgid ""
-"The database was initialized with LC_COLLATE \"%s\",  which is not "
-"recognized by setlocale()."
-msgstr ""
-"データベース� LC_COLLATE \"%s\" ��期化�れ������setlocale() ��れを"
-"�識�れ��ん"
+msgid "data directory \"%s\" has group or world access"
+msgstr "データディレクトリ\"%s\"�グループ���第三者�らアクセス�能��"
 
-#: utils/init/postinit.c:348 utils/init/postinit.c:355
-msgid ""
-"Recreate the database with another locale or install the missing locale."
-msgstr ""
-"データベースを別�ロケール��生��る������足���るロケールをインス"
-"トール������"
+#: postmaster/postmaster.c:1248
+msgid "Permissions should be u=rwx (0700)."
+msgstr "権��u=rwx(0700)���れ��り��ん"
 
-#: utils/init/postinit.c:353
+#: postmaster/postmaster.c:1259
 #, c-format
 msgid ""
-"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
-"by setlocale()."
+"%s: could not find the database system\n"
+"Expected to find it in the directory \"%s\",\n"
+"but could not open file \"%s\": %s\n"
 msgstr ""
-"データベース� LC_CTYPE \"%s\" ��期化�れ������setlocale()��れを�"
-"識�れ��ん"
-
-#: utils/init/postinit.c:608
-msgid "no roles are defined in this database system"
-msgstr "データベースシステム内�ロール�定義�れ����ん"
+"%s: データベースシステム��り��ん���\n"
+"ディレクトリ\"%s\"��るも��想定��������\n"
+"ファイル\"%s\"をオープン����ん���: %s\n"
 
-#: utils/init/postinit.c:609
+#: postmaster/postmaster.c:1295
 #, c-format
-msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
-msgstr "��� CREATE USER \"%s\" SUPERUSER; を実行������。"
-
-#: utils/init/postinit.c:632
-msgid "new replication connections are not allowed during database shutdown"
-msgstr "データベース�シャットダウン中��新��レプリケーション接続�許��れ��ん"
-
-#: utils/init/postinit.c:636
-msgid "must be superuser to connect during database shutdown"
-msgstr "データベース�シャットダウン中�接続��る��スーパーユーザ����"
-
-#: utils/init/postinit.c:650
-msgid ""
-"remaining connection slots are reserved for non-replication superuser "
-"connections"
-msgstr "スーパーユーザ�よる接続用�予約�れる接続スロット�数を設定���。"
-
-#: utils/init/postinit.c:663
-msgid "must be superuser to start walsender"
-msgstr "WALSENDER を開始��る��スーパーユーザ����"
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: ファイル\"%s\"をオープン����ん���: %s\n"
 
-#: utils/init/postinit.c:709
+#: postmaster/postmaster.c:1302
 #, c-format
-msgid "database %u does not exist"
-msgstr "データベース %u �存在���ん"
-
-#: utils/init/postinit.c:761
-msgid "It seems to have just been dropped or renamed."
-msgstr "削除���リ�ーム�れ���り�よ���。"
+msgid "%s: could not open log file \"%s/%s\": %s\n"
+msgstr "%s: ログファイル \"%s/%s\" をオープン����ん: %s\n"
 
-#: utils/init/postinit.c:779
+#: postmaster/postmaster.c:1313
 #, c-format
-msgid "The database subdirectory \"%s\" is missing."
-msgstr "データベース�サブディレクトリ\"%s\"��り��ん。"
+msgid "%s: could not fork background process: %s\n"
+msgstr "%s: �ックグランドプロセスをfork����ん���: %s\n"
 
-#: utils/init/postinit.c:784
+#: postmaster/postmaster.c:1335
 #, c-format
-msgid "could not access directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"�アクセス����ん���: %m"
+msgid "%s: could not dissociate from controlling TTY: %s\n"
+msgstr "%s: 制御TTY�ら切り離���ん���: %s\n"
 
-#: utils/init/miscinit.c:114
+#: postmaster/postmaster.c:1430
 #, c-format
-msgid "could not change directory to \"%s\": %m"
-msgstr "ディレクトリ\"%s\"�移動����ん���: %m"
+msgid "select() failed in postmaster: %m"
+msgstr "postmaster�select()�失敗����: %m"
 
-#: utils/init/miscinit.c:380 utils/misc/guc.c:4842
-#, c-format
-msgid "cannot set parameter \"%s\" within security-restricted operation"
-msgstr "セキュリティー制��作内�パラメーター \"%s\" を設定����ん"
+#: postmaster/postmaster.c:1592 postmaster/postmaster.c:1623
+msgid "incomplete startup packet"
+msgstr "開始パケット��完全��"
 
-#: utils/init/miscinit.c:441
-#, c-format
-msgid "role \"%s\" is not permitted to log in"
-msgstr "ロール\"%s\"�ログイン�る���許�れ����ん"
+#: postmaster/postmaster.c:1604
+msgid "invalid length of startup packet"
+msgstr "開始パケット�長��無効��"
 
-#: utils/init/miscinit.c:459
+#: postmaster/postmaster.c:1661
 #, c-format
-msgid "too many connections for role \"%s\""
-msgstr "ロール\"%s\"�ら�接続�多����"
-
-#: utils/init/miscinit.c:519
-msgid "permission denied to set session authorization"
-msgstr "set session authorization用�権���り��ん"
+msgid "failed to send SSL negotiation response: %m"
+msgstr "SSL調�応答��信�失敗����: %m"
 
-#: utils/init/miscinit.c:599
+#: postmaster/postmaster.c:1690
 #, c-format
-msgid "invalid role OID: %u"
-msgstr "ロールID�無効��: %u"
+msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
+msgstr ""
+"フロントエンドプロトコル%u.%uをサ�ート�����ん: サー��%u.0�ら %u.%u�"
+"�をサ�ート���"
 
-#: utils/init/miscinit.c:731
-#, c-format
-msgid "could not create lock file \"%s\": %m"
-msgstr "ロックファイル\"%s\"を作�����ん���: %m"
+#: postmaster/postmaster.c:1741
+msgid "invalid value for boolean option \"replication\""
+msgstr "ブールオプション \"replication\" �無効��"
 
-#: utils/init/miscinit.c:745
-#, c-format
-msgid "could not open lock file \"%s\": %m"
-msgstr "ロックファイル\"%s\"をオープン����ん���: %m"
+#: postmaster/postmaster.c:1761
+msgid "invalid startup packet layout: expected terminator as last byte"
+msgstr ""
+"開始パケット�構��無効��。最終�イト�想定外�ターミ�ータ��り���"
 
-#: utils/init/miscinit.c:751
-#, c-format
-msgid "could not read lock file \"%s\": %m"
-msgstr "ロックファイル\"%s\"を読��れ��ん���: %m"
+#: postmaster/postmaster.c:1789
+msgid "no PostgreSQL user name specified in startup packet"
+msgstr "開始パケット中�指定�れ�PostgreSQLユーザ��存在���ん"
 
-#: utils/init/miscinit.c:799
-#, c-format
-msgid "lock file \"%s\" already exists"
-msgstr "ロックファイル\"%s\"����存在���"
+#: postmaster/postmaster.c:1846
+msgid "the database system is starting up"
+msgstr "データベースシステム�起動�����"
 
-#: utils/init/miscinit.c:803
-#, c-format
-msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
-msgstr "他�postgres(PID %d)�データディレクトリ\"%s\"�稼動�����ん�?"
+#: postmaster/postmaster.c:1851
+msgid "the database system is shutting down"
+msgstr "データベースシステム�シャットダウン�����"
 
-#: utils/init/miscinit.c:805
-#, c-format
-msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
-msgstr "他�postmaster(PID %d)�データディレクトリ\"%s\"�稼動�����ん�?"
+#: postmaster/postmaster.c:1856
+msgid "the database system is in recovery mode"
+msgstr "データベースシステム�リカ�リモード��"
 
-#: utils/init/miscinit.c:808
-#, c-format
-msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr "他�postgres(PID %d)�ソケットファイル\"%s\"を使用�����ん�?"
+#: postmaster/postmaster.c:1861 storage/lmgr/proc.c:293
+#: storage/ipc/sinvaladt.c:302 storage/ipc/procarray.c:270
+msgid "sorry, too many clients already"
+msgstr "�在クライアント数�多����"
 
-#: utils/init/miscinit.c:810
+#: postmaster/postmaster.c:1923
 #, c-format
-msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr "他�postmaster(PID %d)�ソケットファイル\"%s\"を使用�����ん�?"
+msgid "wrong key in cancel request for process %d"
+msgstr "プロセス%d�対�るキャンセル�求����キー�間������"
 
-#: utils/init/miscinit.c:838
+#: postmaster/postmaster.c:1931
 #, c-format
-msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
-msgstr "既存�共有メモリブロック(キー%lu�ID %lu)���使用中��"
+msgid "PID %d in cancel request did not match any process"
+msgstr "キャンセル�求内�PID %d���プロセス�も一致���ん"
 
-#: utils/init/miscinit.c:841
-#, c-format
-msgid ""
-"If you're sure there are no old server processes still running, remove the "
-"shared memory block or just delete the file \"%s\"."
-msgstr ""
-"��サー�プロセス�稼動中������確実��れ��共有メモリブロックを削除"
-"�る�������ファイル \"%s\" を削除������。"
+#: postmaster/postmaster.c:2137
+msgid "received SIGHUP, reloading configuration files"
+msgstr "SIGHUPを���り���。設定ファイルをリロード�����"
 
-#: utils/init/miscinit.c:858
-#, c-format
-msgid "could not remove old lock file \"%s\": %m"
-msgstr "��ロックファイル\"%s\"を削除����ん���: %m"
+#: postmaster/postmaster.c:2160
+msgid "pg_hba.conf not reloaded"
+msgstr "pg_hba.conf ��読�込��れ��ん"
 
-#: utils/init/miscinit.c:860
-msgid ""
-"The file seems accidentally left over, but it could not be removed. Please "
-"remove the file by hand and try again."
-msgstr ""
-"��ファイル��然残������よ�����削除����ん���。手作業��"
-"れを削除��実行������。"
+#: postmaster/postmaster.c:2203
+msgid "received smart shutdown request"
+msgstr "スマートシャットダウン�求を���り���"
 
-#: utils/init/miscinit.c:882 utils/init/miscinit.c:892
-#, c-format
-msgid "could not write lock file \"%s\": %m"
-msgstr "ロックファイル\"%s\"�書�出���ん���: %m"
+#: postmaster/postmaster.c:2250
+msgid "received fast shutdown request"
+msgstr "高速シャットダウン�求を���り���"
 
-#: utils/init/miscinit.c:991 utils/init/miscinit.c:1097
-#: utils/error/elog.c:1403 storage/file/copydir.c:165
-#: storage/file/copydir.c:255 storage/smgr/md.c:532 storage/smgr/md.c:785
-#: access/transam/xlog.c:2441 access/transam/xlog.c:4113
-#: access/transam/xlog.c:4207 access/transam/xlog.c:4305
-#, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "ファイル\"%s\"をオープン����ん���: %m"
+#: postmaster/postmaster.c:2268
+msgid "aborting any active transactions"
+msgstr "活動中�全トランザクションをアボート�����"
 
-#: utils/init/miscinit.c:1091 utils/init/miscinit.c:1104
-#, c-format
-msgid "\"%s\" is not a valid data directory"
-msgstr "\"%s\"�有効�データディレクトリ���り��ん"
+#: postmaster/postmaster.c:2297
+msgid "received immediate shutdown request"
+msgstr "�時シャットダウン�求を���り���"
 
-#: utils/init/miscinit.c:1093
-#, c-format
-msgid "File \"%s\" is missing."
-msgstr "ファイル\"%s\"�存在���ん"
+#: postmaster/postmaster.c:2373 postmaster/postmaster.c:2401
+msgid "startup process"
+msgstr "起動プロセス"
 
-#: utils/init/miscinit.c:1106
-#, c-format
-msgid "File \"%s\" does not contain valid data."
-msgstr "ファイル\"%s\"�有効�データ��り��ん。"
+#: postmaster/postmaster.c:2376
+msgid "aborting startup due to startup process failure"
+msgstr "起動プロセス�失敗���起動を中断�����"
 
-#: utils/init/miscinit.c:1108
-msgid "You might need to initdb."
-msgstr "initdb�る必���る�も�れ��ん"
+#: postmaster/postmaster.c:2435
+msgid "database system is ready to accept connections"
+msgstr "データベースシステム�接続�付準備�整����。"
 
-#: utils/init/miscinit.c:1115 access/transam/xlog.c:4570
-#: access/transam/xlog.c:4579 access/transam/xlog.c:4603
-#: access/transam/xlog.c:4610 access/transam/xlog.c:4617
-#: access/transam/xlog.c:4622 access/transam/xlog.c:4629
-#: access/transam/xlog.c:4636 access/transam/xlog.c:4643
-#: access/transam/xlog.c:4650 access/transam/xlog.c:4657
-#: access/transam/xlog.c:4664 access/transam/xlog.c:4673
-#: access/transam/xlog.c:4680 access/transam/xlog.c:4689
-#: access/transam/xlog.c:4696 access/transam/xlog.c:4705
-#: access/transam/xlog.c:4712
-msgid "database files are incompatible with server"
-msgstr "データベースファイル�サー��互�性��り��ん"
+#: postmaster/postmaster.c:2490
+msgid "background writer process"
+msgstr "�ックグランドライタプロセス"
 
-#: utils/init/miscinit.c:1116
-#, c-format
-msgid ""
-"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
-"not compatible with this version %s."
-msgstr ""
-"データディレクトリ�PostgreSQL�ージョン%ld.%ld��期化�れ������れ�"
-"�ージョン%s�互�性��り��ん"
+#: postmaster/postmaster.c:2506
+msgid "WAL writer process"
+msgstr "WALライタプロセス"
 
-#: utils/init/miscinit.c:1164
-#, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "パラメータ\"%s\"�リスト構文�無効��"
+#: postmaster/postmaster.c:2520
+msgid "WAL receiver process"
+msgstr "WAL �信プロセス"
 
-#: utils/init/miscinit.c:1201
-#, c-format
-msgid "loaded library \"%s\""
-msgstr "ライブラリ\"%s\"をロード����"
+#: postmaster/postmaster.c:2535
+msgid "autovacuum launcher process"
+msgstr "自動�キュームラン�ャプロセス"
 
-#: utils/error/elog.c:1413
-#, c-format
-msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "ファイル\"%s\"を標準エラー����オープン����ん���: %m"
+#: postmaster/postmaster.c:2550
+msgid "archiver process"
+msgstr "アーカイ�プロセス"
 
-#: utils/error/elog.c:1426
-#, c-format
-msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "ファイル\"%s\"を標準出力����オープン����ん���: %m"
+#: postmaster/postmaster.c:2566
+msgid "statistics collector process"
+msgstr "統計情報�集プロセス"
 
-#: utils/error/elog.c:1811 utils/error/elog.c:1821 utils/error/elog.c:1831
-msgid "[unknown]"
-msgstr "[unknown]"
+#: postmaster/postmaster.c:2580
+msgid "system logger process"
+msgstr "システムログ�得プロセス"
 
-#: utils/error/elog.c:2179 utils/error/elog.c:2461 utils/error/elog.c:2539
-msgid "missing error text"
-msgstr "エラーテキスト��り��ん"
+#: postmaster/postmaster.c:2615 postmaster/postmaster.c:2634
+#: postmaster/postmaster.c:2641 postmaster/postmaster.c:2659
+msgid "server process"
+msgstr "サー�プロセス"
 
-#: utils/error/elog.c:2182 utils/error/elog.c:2185 utils/error/elog.c:2542
-#: utils/error/elog.c:2545
-#, c-format
-msgid " at character %d"
-msgstr "(文字�置 %d)"
+#: postmaster/postmaster.c:2695
+msgid "terminating any other active server processes"
+msgstr "他�活動中�サー�プロセスを終了�����"
 
-#: utils/error/elog.c:2195 utils/error/elog.c:2202
-msgid "DETAIL:  "
-msgstr "詳細:  "
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2860
+#, c-format
+msgid "%s (PID %d) exited with exit code %d"
+msgstr "%s (PID %d)�終了コード%d�終了����"
 
-#: utils/error/elog.c:2209
-msgid "HINT:  "
-msgstr "ヒント:  "
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2869
+#, c-format
+msgid "%s (PID %d) was terminated by exception 0x%X"
+msgstr "%s (PID %d)�例外%X�終了����"
 
-#: utils/error/elog.c:2216
-msgid "QUERY:  "
-msgstr "クエリー:  "
+#: postmaster/postmaster.c:2871 postmaster/pgarch.c:579
+msgid ""
+"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
+msgstr ""
+"16進値�説明�����C インクルードファイル\"ntstatus.h\"を�照�����"
+"�。"
 
-#: utils/error/elog.c:2223
-msgid "CONTEXT:  "
-msgstr "コンテキスト:  "
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2878
+#, c-format
+msgid "%s (PID %d) was terminated by signal %d: %s"
+msgstr "%s (PID %d)�シグナル%d�終了����: %s"
 
-#: utils/error/elog.c:2233
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2888
 #, c-format
-msgid "LOCATION:  %s, %s:%d\n"
-msgstr "場所:  %s, %s:%d\n"
+msgid "%s (PID %d) was terminated by signal %d"
+msgstr "%s (PID %d)�シグナル%d�終了����"
 
-#: utils/error/elog.c:2240
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2897
 #, c-format
-msgid "LOCATION:  %s:%d\n"
-msgstr "場所:  %s:%d\n"
+msgid "%s (PID %d) exited with unrecognized status %d"
+msgstr "%s (PID %d)��識����ステータス%d�終了����"
 
-#: utils/error/elog.c:2254
-msgid "STATEMENT:  "
-msgstr "ステートメント:  "
+#: postmaster/postmaster.c:3077
+msgid "abnormal database system shutdown"
+msgstr "データベースシステム�異常�シャットダウン����"
 
-#: utils/error/elog.c:2351
-msgid "Not safe to send CSV data\n"
-msgstr "CSVデータを�信�る��安全���り��ん\n"
+#: postmaster/postmaster.c:3116
+msgid "all server processes terminated; reinitializing"
+msgstr "全��サー�プロセス�終了����: ��期化�����"
 
-#. translator: This string will be truncated at 47
-#. characters expanded.
-#: utils/error/elog.c:2654
+#: postmaster/postmaster.c:3299
 #, c-format
-msgid "operating system error %d"
-msgstr "オペレーティングシステムエラー %d"
+msgid "could not fork new process for connection: %m"
+msgstr "接続用�新��プロセスをfork����ん���: %m"
 
-#: utils/error/elog.c:2677
-msgid "DEBUG"
-msgstr "DEBUG"
+#: postmaster/postmaster.c:3341
+msgid "could not fork new process for connection: "
+msgstr "接続用�新��プロセスをfork����ん���"
 
-#: utils/error/elog.c:2681
-msgid "LOG"
-msgstr "LOG"
+#: postmaster/postmaster.c:3455
+#, c-format
+msgid "connection received: host=%s port=%s"
+msgstr "接続を��付����: ホスト=%s �ート番�=%s"
 
-#: utils/error/elog.c:2684
-msgid "INFO"
-msgstr "INFO"
+#: postmaster/postmaster.c:3460
+#, c-format
+msgid "connection received: host=%s"
+msgstr "接続を��付����: ホスト=%s"
 
-#: utils/error/elog.c:2687
-msgid "NOTICE"
-msgstr "NOTICE"
+#: postmaster/postmaster.c:3729
+#, c-format
+msgid "could not execute server process \"%s\": %m"
+msgstr "サー�プロセス\"%s\"を実行����ん���: %m"
 
-#: utils/error/elog.c:2690
-msgid "WARNING"
-msgstr "WARNING"
+#: postmaster/postmaster.c:4246
+msgid "database system is ready to accept read only connections"
+msgstr "データベースシステム�リードオンリー接続��付準備������"
 
-#: utils/error/elog.c:2693
-msgid "ERROR"
-msgstr "ERROR"
+#: postmaster/postmaster.c:4513
+#, c-format
+msgid "could not fork startup process: %m"
+msgstr "起動プロセスをfork����ん���: %m"
 
-#: utils/error/elog.c:2696
-msgid "FATAL"
-msgstr "FATAL"
+#: postmaster/postmaster.c:4517
+#, c-format
+msgid "could not fork background writer process: %m"
+msgstr "�ックグランドライタプロセスをfork����ん���: %m"
 
-#: utils/error/elog.c:2699
-msgid "PANIC"
-msgstr "PANIC"
+#: postmaster/postmaster.c:4521
+#, c-format
+msgid "could not fork WAL writer process: %m"
+msgstr "WALライタプロセスをfork����ん���: %m"
 
-#: utils/error/assert.c:37
-msgid "TRAP: ExceptionalCondition: bad arguments\n"
-msgstr "TRAP: ExceptionalCondition: �良�引数\n"
+#: postmaster/postmaster.c:4525
+#, c-format
+msgid "could not fork WAL receiver process: %m"
+msgstr "WAL �信プロセスを fork ����ん���: %m"
 
-#: utils/error/assert.c:40
+#: postmaster/postmaster.c:4529
 #, c-format
-msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP: %s(\\\"%s\\\", ファイル: \\\"%s\\\", 行数: %d)\n"
+msgid "could not fork process: %m"
+msgstr "プロセスをfork����ん���: %m"
 
-#: utils/sort/logtape.c:213
+#: postmaster/postmaster.c:4811
 #, c-format
-msgid "could not write block %ld of temporary file: %m"
-msgstr "一時ファイル�ブロック%ldを書�込���ん���: %m"
+msgid "could not duplicate socket %d for use in backend: error code %d"
+msgstr ""
+"�ックエンド�使用�る���ソケット%dを複製����ん���: エラーコード %d"
 
-#: utils/sort/logtape.c:215
-msgid "Perhaps out of disk space?"
-msgstr "ディスク容���足���る�能性��り��"
+#: postmaster/postmaster.c:4843
+#, c-format
+msgid "could not create inherited socket: error code %d\n"
+msgstr "継承��ソケットを作�����ん���: エラーコード %d\n"
 
-#: utils/sort/logtape.c:232
+#: postmaster/postmaster.c:4872 postmaster/postmaster.c:4879
 #, c-format
-msgid "could not read block %ld of temporary file: %m"
-msgstr "一時ファイル�ブロック%ldを読�込���ん���: %m"
+msgid "could not read from backend variables file \"%s\": %s\n"
+msgstr "�ックエンド変数ファイル\"%s\"�ら読��れ��ん���: %s\n"
 
-#: utils/sort/tuplesort.c:2806
+#: postmaster/postmaster.c:4888
 #, c-format
-msgid "could not create unique index \"%s\""
-msgstr "一�性インデックス \"%s\" を作�����ん���"
+msgid "could not remove file \"%s\": %s\n"
+msgstr "ファイル\"%s\"を削除����ん���: %s\n"
 
-#: utils/sort/tuplesort.c:2808
+#: postmaster/postmaster.c:4905
 #, c-format
-msgid "Key %s is duplicated."
-msgstr "キー %s ��複�����。"
+msgid "could not map view of backend variables: error code %d\n"
+msgstr "�ックエンド変数�ビューをマップ����ん���: エラーコード %d\n"
 
-#: utils/cache/relmapper.c:454
-msgid "cannot PREPARE a transaction that modified relation mapping"
+#: postmaster/postmaster.c:4914
+#, c-format
+msgid "could not unmap view of backend variables: error code %d\n"
 msgstr ""
-"リレーション�マッピングを変更��トランザクション� PREPARE ����ん"
+"�ックエンド変数�ビューをアンマップ����ん���: エラーコード %d\n"
 
-#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
-msgid "could not open relation mapping file \"%s\": %m"
-msgstr "リレーション�マッピング用ファイル \"%s\" をオープン����ん���: %m"
+#: postmaster/postmaster.c:4921
+#, c-format
+msgid "could not close handle to backend parameter variables: error code %d\n"
+msgstr ""
+"�ックエンドパラメータ変数��ンドルをクローズ����ん���: エラーコード%"
+"d\n"
 
-#: utils/cache/relmapper.c:609
-msgid "could not read relation mapping file \"%s\": %m"
-msgstr "リレーション�マッピング用ファイル \"%s\" �ら読��れ��ん���: %m"
+#: postmaster/postmaster.c:5064
+msgid "could not read exit code for process\n"
+msgstr "�プロセス�終了コード�読�込������ん���\n"
 
-#: utils/cache/relmapper.c:619
-msgid "relation mapping file \"%s\" contains invalid data"
-msgstr "リレーション�マッピング用ファイル \"%s\" �無効�データ��り��"
+#: postmaster/postmaster.c:5069
+msgid "could not post child completion status\n"
+msgstr "個プロセス�終了コードを投稿����ん���\n"
 
-#: utils/cache/relmapper.c:629
+#: postmaster/bgwriter.c:482
 #, c-format
-msgid "relation mapping file \"%s\" contains incorrect checksum"
-msgstr "リレーション�マッピング用ファイル \"%s\" �中��ェックサム�正���り��ん"
+msgid "checkpoints are occurring too frequently (%d second apart)"
+msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
+msgstr[0] "�ェック�イント�発生周期�短����(%d秒間隔)"
+msgstr[1] "�ェック�イント�発生周期�短����(%d秒間隔)"
 
-#: utils/cache/relmapper.c:741
-msgid "could not write to relation mapping file \"%s\": %m"
-msgstr "リレーション�マッピング用ファイル \"%s\" を書�出���ん���: %m"
+#: postmaster/bgwriter.c:486
+msgid ""
+"Consider increasing the configuration parameter \"checkpoint_segments\"."
+msgstr "設定パラメータ\"checkpoint_segments\"�増加を検討������"
 
-#: utils/cache/relmapper.c:754
-msgid "could not fsync relation mapping file \"%s\": %m"
-msgstr "リレーション�マッピング用ファイル \"%s\" を fsync ����ん���: %m"
+#: postmaster/bgwriter.c:598
+#, c-format
+msgid "transaction log switch forced (archive_timeout=%d)"
+msgstr "トランザクションログ切り替��強制�れ��（archive_timeout=%d）"
 
-#: utils/cache/relmapper.c:760
-msgid "could not close relation mapping file \"%s\": %m"
-msgstr "リレーション�マッピング用ファイル \"%s\" をクローズ����ん���: %m"
+#: postmaster/bgwriter.c:1056
+msgid "checkpoint request failed"
+msgstr "�ェック�イント�求�失敗����"
 
-#: utils/cache/lsyscache.c:2234 utils/cache/lsyscache.c:2267
-#: utils/cache/lsyscache.c:2300 utils/cache/lsyscache.c:2333
-#, c-format
-msgid "type %s is only a shell"
-msgstr "型%s���るシェル��"
+#: postmaster/bgwriter.c:1057
+msgid "Consult recent messages in the server log for details."
+msgstr "詳細�サー�ログ�最近�メッセージを調査������"
 
-#: utils/cache/lsyscache.c:2239
+#: postmaster/bgwriter.c:1223
 #, c-format
-msgid "no input function available for type %s"
-msgstr "型%s�利用�能�入力関数��り��ん"
+msgid "compacted fsync request queue from %d entries to %d entries"
+msgstr "���り詰��� fsync リクエスト�キュー���"
+" %d �ら %d ���エントリ"
 
-#: utils/cache/lsyscache.c:2272
+#: postmaster/pgstat.c:330
 #, c-format
-msgid "no output function available for type %s"
-msgstr "型%s�利用�能�出力関数��り��ん"
+msgid "could not resolve \"localhost\": %s"
+msgstr "\"localhost\"を解決����ん���: %s"
 
-#: utils/cache/plancache.c:587
-msgid "cached plan must not change result type"
-msgstr "キャッシュ��計画��果型を変更����り��ん"
+#: postmaster/pgstat.c:353
+msgid "trying another address for the statistics collector"
+msgstr "統計情報コレクタ用�別�アドレスを試�����"
 
-#: utils/cache/relcache.c:4298
+#: postmaster/pgstat.c:362
 #, c-format
-msgid "could not create relation-cache initialization file \"%s\": %m"
-msgstr "リレーションキャッシュ�期化ファイル\"%sを作�����ん: %m"
-
-#: utils/cache/relcache.c:4300
-msgid "Continuing anyway, but there's something wrong."
-msgstr "�り���続行�����何��間������"
+msgid "could not create socket for statistics collector: %m"
+msgstr "統計情報コレクタ用�ソケットを作�����ん���: %m"
 
-#: utils/cache/typcache.c:145 parser/parse_type.c:202
+#: postmaster/pgstat.c:374
 #, c-format
-msgid "type \"%s\" is only a shell"
-msgstr "型\"%s\"���るシェル��"
+msgid "could not bind socket for statistics collector: %m"
+msgstr "統計情報コレクタ�ソケットを�インド����ん���: %m"
 
-#: utils/cache/typcache.c:325
+#: postmaster/pgstat.c:385
 #, c-format
-msgid "type %s is not composite"
-msgstr "型%s�複�型���り��ん"
+msgid "could not get address of socket for statistics collector: %m"
+msgstr "統計情報コレクタ�ソケット�らアドレスを入手����ん���: %m"
 
-#: utils/cache/typcache.c:339
-msgid "record type has not been registered"
-msgstr "レコード型�登録�れ����ん"
-
-#: utils/misc/guc.c:476
-msgid "Ungrouped"
-msgstr "��他"
-
-#: utils/misc/guc.c:478
-msgid "File Locations"
-msgstr "ファイル��置"
-
-#: utils/misc/guc.c:480
-msgid "Connections and Authentication"
-msgstr "接続��証"
-
-#: utils/misc/guc.c:482
-msgid "Connections and Authentication / Connection Settings"
-msgstr "接続��証/接続設定"
-
-#: utils/misc/guc.c:484
-msgid "Connections and Authentication / Security and Authentication"
-msgstr "接続��証/セキュリティ��証"
+#: postmaster/pgstat.c:401
+#, c-format
+msgid "could not connect socket for statistics collector: %m"
+msgstr "統計情報コレクタ�ソケット�接続����ん���: %m"
 
-#: utils/misc/guc.c:486
-msgid "Resource Usage"
-msgstr "リソース�使用"
+#: postmaster/pgstat.c:422
+#, c-format
+msgid "could not send test message on socket for statistics collector: %m"
+msgstr "統計情報コレクタ�ソケット�試験メッセージを�信����ん���: %m"
 
-#: utils/misc/guc.c:488
-msgid "Resource Usage / Memory"
-msgstr "リソース�使用/メモリ"
+#: postmaster/pgstat.c:448 postmaster/pgstat.c:2996
+#, c-format
+msgid "select() failed in statistics collector: %m"
+msgstr "統計情報コレクタ�select()�失敗����: %m"
 
-#: utils/misc/guc.c:490
-msgid "Resource Usage / Kernel Resources"
-msgstr "リソース�使用/カー�ルリソース"
+#: postmaster/pgstat.c:463
+msgid "test message did not get through on socket for statistics collector"
+msgstr "統計情報コレクタ�ソケット�ら試験メッセージを入手����ん���"
 
-#: utils/misc/guc.c:492
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "使用リソース / コストベース� vacuum �延"
+#: postmaster/pgstat.c:478
+#, c-format
+msgid "could not receive test message on socket for statistics collector: %m"
+msgstr "統計情報コレクタ�ソケット�ら試験メッセージを�信����ん���"
 
-#: utils/misc/guc.c:494
-msgid "Resource Usage / Background Writer"
-msgstr "使用リソース / �ックグラウンド・ライタ"
+#: postmaster/pgstat.c:488
+msgid "incorrect test message transmission on socket for statistics collector"
+msgstr "統計情報コレクタ�ソケット��試験メッセージ��信��正��"
 
-#: utils/misc/guc.c:496
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "使用リソース / ��期処�"
+#: postmaster/pgstat.c:511
+#, c-format
+msgid "could not set statistics collector socket to nonblocking mode: %m"
+msgstr ""
+"統計情報コレクタ�ソケットを�ブロッキングモード�設定����ん���: %m"
 
-#: utils/misc/guc.c:498
-msgid "Write-Ahead Log"
-msgstr "ログ先行書�込�"
+#: postmaster/pgstat.c:521
+msgid "disabling statistics collector for lack of working socket"
+msgstr "作業用ソケット�欠����統計情報コレクタを無効������"
 
-#: utils/misc/guc.c:500
-msgid "Write-Ahead Log / Settings"
-msgstr "ログ先行書�込� / 設定"
+#: postmaster/pgstat.c:623
+#, c-format
+msgid "could not fork statistics collector: %m"
+msgstr "統計情報コレクタをfork����ん���: %m"
 
-#: utils/misc/guc.c:502
-msgid "Write-Ahead Log / Checkpoints"
-msgstr "ログ先行書�込� / �ェック�イント"
+#: postmaster/pgstat.c:1153 postmaster/pgstat.c:1177 postmaster/pgstat.c:1208
+msgid "must be superuser to reset statistics counters"
+msgstr "統計情報カウンタをリセット�る��スーパーユーザ���れ��り��ん"
 
-#: utils/misc/guc.c:504
-msgid "Write-Ahead Log / Archiving"
-msgstr "ログ先行書�込� / アーカイビング"
+#: postmaster/pgstat.c:1184
+#, c-format
+msgid "unrecognized reset target: \"%s\""
+msgstr "�識����リセットターゲット: \"%s\""
 
-#: utils/misc/guc.c:506
-msgid "Write-Ahead Log / Streaming Replication"
-msgstr "ログ先行書�込� / ストリーミング・レプリケーション"
+#: postmaster/pgstat.c:1185
+msgid "Target must be \"bgwriter\"."
+msgstr "ターゲット� \"bgwriter\" ���れ��り��ん"
 
-#: utils/misc/guc.c:508
-msgid "Write-Ahead Log / Standby Servers"
-msgstr "ログ先行書�込� / スタン�イサー�"
+#: postmaster/pgstat.c:2975
+#, c-format
+msgid "poll() failed in statistics collector: %m"
+msgstr "統計情報コレクタ�poll()�失敗����: %m"
 
-#: utils/misc/guc.c:510
-msgid "Query Tuning"
-msgstr "������調整"
+#: postmaster/pgstat.c:3020
+#, c-format
+msgid "could not read statistics message: %m"
+msgstr "統計情報メッセージを読��れ��ん���: %m"
 
-#: utils/misc/guc.c:512
-msgid "Query Tuning / Planner Method Configuration"
-msgstr "������調整/プランナ手法�設定"
+#: postmaster/pgstat.c:3291
+#, c-format
+msgid "could not open temporary statistics file \"%s\": %m"
+msgstr "一時統計情報ファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/misc/guc.c:514
-msgid "Query Tuning / Planner Cost Constants"
-msgstr "������調整/プランナ�コスト定数"
+#: postmaster/pgstat.c:3363
+#, c-format
+msgid "could not write temporary statistics file \"%s\": %m"
+msgstr "一時統計情報ファイル\"%s\"�書�込�����ん���: %m"
 
-#: utils/misc/guc.c:516
-msgid "Query Tuning / Genetic Query Optimizer"
-msgstr "������調整/��的�����オプティマイザ"
+#: postmaster/pgstat.c:3372
+#, c-format
+msgid "could not close temporary statistics file \"%s\": %m"
+msgstr "一時統計情報ファイル\"%s\"をクローズ����ん���: %m"
 
-#: utils/misc/guc.c:518
-msgid "Query Tuning / Other Planner Options"
-msgstr "������調整/��他�プラン��オプション"
+#: postmaster/pgstat.c:3380
+#, c-format
+msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+msgstr "一時統計情報ファイル\"%s\"���を\"%s\"�変更����ん���: %m"
 
-#: utils/misc/guc.c:520
-msgid "Reporting and Logging"
-msgstr "レ�ート�ログ"
+#: postmaster/pgstat.c:3486 postmaster/pgstat.c:3715
+#, c-format
+msgid "could not open statistics file \"%s\": %m"
+msgstr "統計情報ファイル\"%s\"をオープン����ん���: %m"
 
-#: utils/misc/guc.c:522
-msgid "Reporting and Logging / Where to Log"
-msgstr "レ�ート�ログ/ログ�場所"
+#: postmaster/pgstat.c:3498 postmaster/pgstat.c:3508 postmaster/pgstat.c:3530
+#: postmaster/pgstat.c:3545 postmaster/pgstat.c:3608 postmaster/pgstat.c:3626
+#: postmaster/pgstat.c:3642 postmaster/pgstat.c:3660 postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3727 postmaster/pgstat.c:3738
+#, c-format
+msgid "corrupted statistics file \"%s\""
+msgstr "統計情報ファイル \"%s\" �破������"
 
-#: utils/misc/guc.c:524
-msgid "Reporting and Logging / When to Log"
-msgstr "レ�ート�ログ/ログ�タイミング"
+#: postmaster/pgstat.c:4036
+msgid "database hash table corrupted during cleanup --- abort"
+msgstr ""
+"整�処�����データベース�ッシュテーブル�破����� --- 中断���"
 
-#: utils/misc/guc.c:526
-msgid "Reporting and Logging / What to Log"
-msgstr "レ�ート�ログ/ログ�内容"
+#: postmaster/syslogger.c:390
+#, c-format
+msgid "select() failed in logger process: %m"
+msgstr "ロガープロセス�select()�失敗����: %m"
 
-#: utils/misc/guc.c:528
-msgid "Statistics"
-msgstr "統計情報"
+#: postmaster/syslogger.c:402 postmaster/syslogger.c:968
+#, c-format
+msgid "could not read from logger pipe: %m"
+msgstr "ロガーパイプ�ら読��れ��ん���: %m"
 
-#: utils/misc/guc.c:530
-msgid "Statistics / Monitoring"
-msgstr "統計情報/監視"
+#: postmaster/syslogger.c:449
+msgid "logger shutting down"
+msgstr "ロガーを�止�����"
 
-#: utils/misc/guc.c:532
-msgid "Statistics / Query and Index Statistics Collector"
-msgstr "統計情報/������インデックス�統計情報�集器"
+#: postmaster/syslogger.c:493 postmaster/syslogger.c:507
+#, c-format
+msgid "could not create pipe for syslog: %m"
+msgstr "syslog用�パイプを作�����ん���: %m"
 
-#: utils/misc/guc.c:534
-msgid "Autovacuum"
-msgstr "自動�キューム"
+#: postmaster/syslogger.c:534
+#, c-format
+msgid "could not fork system logger: %m"
+msgstr "システムロガーをfork����ん���: %m"
 
-#: utils/misc/guc.c:536
-msgid "Client Connection Defaults"
-msgstr "クライアント接続�デフォルト"
+#: postmaster/syslogger.c:565
+#, c-format
+msgid "could not redirect stdout: %m"
+msgstr "標準出力�リダイレクト����ん���: %m"
 
-#: utils/misc/guc.c:538
-msgid "Client Connection Defaults / Statement Behavior"
-msgstr "クライアント接続�デフォルト/文�振舞�"
+#: postmaster/syslogger.c:570 postmaster/syslogger.c:588
+#, c-format
+msgid "could not redirect stderr: %m"
+msgstr "標準エラー出力�リダイレクト����ん���: %m"
 
-#: utils/misc/guc.c:540
-msgid "Client Connection Defaults / Locale and Formatting"
-msgstr "クライアント接続�デフォルト/ロケール�整形"
+#: postmaster/syslogger.c:923
+#, c-format
+msgid "could not write to log file: %s\n"
+msgstr "ログファイル�書�出���ん���: %s\n"
 
-#: utils/misc/guc.c:542
-msgid "Client Connection Defaults / Other Defaults"
-msgstr "クライアント接続�デフォルト/��他�デフォルト"
+#: postmaster/syslogger.c:1042
+#, c-format
+msgid "could not open log file \"%s\": %m"
+msgstr "ロックファイル \"%s\" をオープン����ん���: %m"
 
-#: utils/misc/guc.c:544
-msgid "Lock Management"
-msgstr "ロック管�"
+#: postmaster/syslogger.c:1111 postmaster/syslogger.c:1156
+msgid "disabling automatic rotation (use SIGHUP to re-enable)"
+msgstr ""
+"自動ローテーションを無効������(�度有効��る��SIGHUPを使用�����"
+"�)"
 
-#: utils/misc/guc.c:546
-msgid "Version and Platform Compatibility"
-msgstr "�ージョン�プラットフォーム間�互�性"
+#: postmaster/pgarch.c:158
+#, c-format
+msgid "could not fork archiver: %m"
+msgstr "アーカイ�をfork����ん���: %m"
 
-#: utils/misc/guc.c:548
-msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
-msgstr "�ージョン�プラットフォーム間�互�性/以���ージョン�PostgreSQL"
+#: postmaster/pgarch.c:450
+msgid "archive_mode enabled, yet archive_command is not set"
+msgstr "archive_mode�有効����archive_command�設定�れ����ん"
 
-#: utils/misc/guc.c:550
-msgid "Version and Platform Compatibility / Other Platforms and Clients"
+#: postmaster/pgarch.c:465
+#, c-format
+msgid "transaction log file \"%s\" could not be archived: too many failures"
 msgstr ""
-"�ージョン�プラットフォーム間�互�性/他�プラットフォーム�クライアント"
+"トランザクションログファイル\"%s\"をアーカイブ����ん���: 失敗�多��"
+"��"
 
-#: utils/misc/guc.c:552
-msgid "Preset Options"
-msgstr "事�設定オプション"
+#: postmaster/pgarch.c:568
+#, c-format
+msgid "archive command failed with exit code %d"
+msgstr "アーカイブコマンド�リターンコード %d�失敗����"
 
-#: utils/misc/guc.c:554
-msgid "Customized Options"
-msgstr "カスタマイズ用オプション"
+#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
+#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
+#, c-format
+msgid "The failed archive command was: %s"
+msgstr "失敗��アーカイブコマンド�次���り��: %s"
 
-#: utils/misc/guc.c:556
-msgid "Developer Options"
-msgstr "開発者��オプション"
+#: postmaster/pgarch.c:577
+#, c-format
+msgid "archive command was terminated by exception 0x%X"
+msgstr "アーカイブコマンド�例外0x%X�終了����"
 
-#: utils/misc/guc.c:610
-msgid "Enables the planner's use of sequential-scan plans."
-msgstr "プランナ�よるシーケンシャルスキャン計画�使用を有効����。"
+#: postmaster/pgarch.c:584
+#, c-format
+msgid "archive command was terminated by signal %d: %s"
+msgstr "アーカイブコマンド�シグナル%d�より終了����: %s"
 
-#: utils/misc/guc.c:618
-msgid "Enables the planner's use of index-scan plans."
-msgstr "プランナ�よるインデックススキャン計画�使用を有効����。"
+#: postmaster/pgarch.c:591
+#, c-format
+msgid "archive command was terminated by signal %d"
+msgstr "アーカイブコマンド�シグナル%d�より終了����"
 
-#: utils/misc/guc.c:626
-msgid "Enables the planner's use of bitmap-scan plans."
-msgstr "プランナ�よるビットマップスキャン計画�使用を有効����。"
+#: postmaster/pgarch.c:600
+#, c-format
+msgid "archive command exited with unrecognized status %d"
+msgstr "アーカイブコマンド��明�ステータス%d�終了����"
 
-#: utils/misc/guc.c:634
-msgid "Enables the planner's use of TID scan plans."
-msgstr "プランナ�よるTIDスキャン計画�使用を有効����。"
+#: postmaster/pgarch.c:612
+#, c-format
+msgid "archived transaction log file \"%s\""
+msgstr "トランザクションログファイル\"%s\"をアーカイブ����"
 
-#: utils/misc/guc.c:642
-msgid "Enables the planner's use of explicit sort steps."
-msgstr "プランナ�よる明示的ソート段階�使用を有効����。"
+#: postmaster/pgarch.c:661
+#, c-format
+msgid "could not open archive status directory \"%s\": %m"
+msgstr "アーカイブステータスディレクトリ\"%s\"をオープン����ん���: %m"
 
-#: utils/misc/guc.c:650
-msgid "Enables the planner's use of hashed aggregation plans."
-msgstr "プランナ�よる�ッシュ�れ�集約計画�使用を有効����。"
+#: postmaster/autovacuum.c:359
+#, c-format
+msgid "could not fork autovacuum launcher process: %m"
+msgstr "autovacuum ラン�ャープロセスを fork ����ん���: %m"
 
-#: utils/misc/guc.c:658
-msgid "Enables the planner's use of materialization."
-msgstr "プランナ�よる具体化(materialization)�使用を有効����。"
+#: postmaster/autovacuum.c:404
+msgid "autovacuum launcher started"
+msgstr "自動�キュームラン�ャプロセス"
 
-#: utils/misc/guc.c:666
-msgid "Enables the planner's use of nested-loop join plans."
-msgstr "プランナ�よる入れ�状ループ��計画�使用を有効����。"
+#: postmaster/autovacuum.c:760
+msgid "autovacuum launcher shutting down"
+msgstr "自動�キュームラン�ャを�止�����"
 
-#: utils/misc/guc.c:674
-msgid "Enables the planner's use of merge join plans."
-msgstr "プランナ�よるマージ��計画�使用を有効����。"
+#: postmaster/autovacuum.c:1395
+#, c-format
+msgid "could not fork autovacuum worker process: %m"
+msgstr "autovacuum ワーカープロセスを fork ����ん���: %m"
 
-#: utils/misc/guc.c:682
-msgid "Enables the planner's use of hash join plans."
-msgstr "プランナ�よる�ッシュ��計画�使用を有効����。"
+#: postmaster/autovacuum.c:1604
+#, c-format
+msgid "autovacuum: processing database \"%s\""
+msgstr "autovacuum: データベース\"%s\"�処�中��"
 
-#: utils/misc/guc.c:690
-msgid "Enables genetic query optimization."
-msgstr "��的�����最�化を有効����。"
+#: postmaster/autovacuum.c:2007
+#, c-format
+msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autovacuum: データベース \"%3$s\" �����親������一時テーブル \"%1$s"
+"\".\"%2$s\" を削除�����"
 
-#: utils/misc/guc.c:691
-msgid "This algorithm attempts to do planning without exhaustive searching."
-msgstr "��アルゴリズム����ら����検索を行���計画�作�を試���。"
+#: postmaster/autovacuum.c:2019
+#, c-format
+msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autovacuum: データベース \"%3$s\" �����親������一時テーブル \"%1$s"
+"\".\"%2$s\" �見��り���"
 
-#: utils/misc/guc.c:700
-msgid "Shows whether the current user is a superuser."
-msgstr "�在�ユーザ�スーパーユーザ����を表示���。"
+#: postmaster/autovacuum.c:2289
+#, c-format
+msgid "automatic vacuum of table \"%s.%s.%s\""
+msgstr "テーブル\"%s.%s.%s\"�自動�キューム"
 
-#: utils/misc/guc.c:709
-msgid "Enables advertising the server via Bonjour."
-msgstr "Bonjour を経由��サー�ー広告を有効����"
+#: postmaster/autovacuum.c:2292
+#, c-format
+msgid "automatic analyze of table \"%s.%s.%s\""
+msgstr "テーブル\"%s.%s.%s\"�自動解�"
 
-#: utils/misc/guc.c:717
-msgid "Enables SSL connections."
-msgstr "SSL接続を有効����。"
+#: postmaster/autovacuum.c:2778
+msgid "autovacuum not started because of misconfiguration"
+msgstr "誤設定���autovacuumを起動����ん"
 
-#: utils/misc/guc.c:725
-msgid "Forces synchronization of updates to disk."
-msgstr "強制的�更新をディスク��期���。"
+#: postmaster/autovacuum.c:2779
+msgid "Enable the \"track_counts\" option."
+msgstr "\"track_counts\"オプションを有効����。"
 
-#: utils/misc/guc.c:726
-msgid ""
-"The server will use the fsync() system call in several places to make sure "
-"that updates are physically written to disk. This insures that a database "
-"cluster will recover to a consistent state after an operating system or "
-"hardware crash."
-msgstr ""
-"サー���確実�更新�物�的�ディスク�書�込�れるよ��複数�����fsync"
-"()システムコールを使用���。�れ�より�オペレーティングシステムや�ード"
-"ウェア�クラッシュ��後�もデータベースクラスタ�一貫��状態�復旧�る��"
-"�����。"
+#: storage/buffer/localbuf.c:190
+msgid "no empty local buffer available"
+msgstr "利用��る�空�ローカル�ッファ��り��ん"
 
-#: utils/misc/guc.c:736
-msgid "Sets immediate fsync at commit."
-msgstr "コミット時��座�fsync�るよ�設定���"
+#: storage/buffer/bufmgr.c:134 storage/buffer/bufmgr.c:239
+msgid "cannot access temporary tables of other sessions"
+msgstr "他�セッション�一時テーブル��アクセス����ん"
 
-#: utils/misc/guc.c:744
-msgid "Continues processing past damaged page headers."
-msgstr "破���ページヘッダ����も処�を継続���。"
+#: storage/buffer/bufmgr.c:373
+#, c-format
+msgid "unexpected data beyond EOF in block %u of relation %s"
+msgstr ""
+"リレーション %2$s � %1$u ブロック目��EOF �先�想定外�データを検出���"
+"�"
 
-#: utils/misc/guc.c:745
+#: storage/buffer/bufmgr.c:375
 msgid ""
-"Detection of a damaged page header normally causes PostgreSQL to report an "
-"error, aborting the current transaction. Setting zero_damaged_pages to true "
-"causes the system to instead report a warning, zero out the damaged page, "
-"and continue processing. This behavior will destroy data, namely all the "
-"rows on the damaged page."
+"This has been seen to occur with buggy kernels; consider updating your "
+"system."
 msgstr ""
-"ページヘッダ�障害�分�る��通常PostgreSQL�エラー�報告を行����在�ト"
-"ランザクションを中断����。zero_damaged_pagesを真�設定�る���より�シ"
-"ステム�代�り�警告を報告��障害��るページをゼロ�埋��処�を継続��"
-"�。 ��動作�より�障害����ページ上��る全��行�データを破壊�れ�"
-"�。"
+"�れ�カー�ル��具��発生��模様��。システム�更新を検討������。"
 
-#: utils/misc/guc.c:757
-msgid "Writes full pages to WAL when first modified after a checkpoint."
+#: storage/buffer/bufmgr.c:447
+#, c-format
+msgid "invalid page header in block %u of relation %s; zeroing out page"
 msgstr ""
-"�ェック�イント�後最��変更�れ�時�ページ全体をWAL�書�出���。"
+"リレーション %2$s � %1$u ブロック目�ページヘッダ�無効��：ページをゼロ�"
+"埋����"
 
-#: utils/misc/guc.c:758
-msgid ""
-"A page write in process during an operating system crash might be only "
-"partially written to disk.  During recovery, the row changes stored in WAL "
-"are not enough to recover.  This option writes pages when first modified "
-"after a checkpoint to WAL so full recovery is possible."
+#: storage/buffer/bufmgr.c:455
+#, c-format
+msgid "invalid page header in block %u of relation %s"
+msgstr "リレーション %2$s � %1$u ブロック目�ページヘッダ�無効��"
+
+#: storage/buffer/bufmgr.c:2728
+#, c-format
+msgid "could not write block %u of %s"
+msgstr "%u ブロックを %s �書�出���ん���"
+
+#: storage/buffer/bufmgr.c:2730
+msgid "Multiple failures --- write error might be permanent."
+msgstr "複数回失敗���� ---���書�込�エラー�続��も�れ��ん。"
+
+#: storage/buffer/bufmgr.c:2751 storage/buffer/bufmgr.c:2770
+#, c-format
+msgid "writing block %u of relation %s"
+msgstr "ブロック %u を リレーション %s �書�込ん����"
+
+#: storage/smgr/md.c:378 storage/smgr/md.c:849
+#, c-format
+msgid "could not truncate file \"%s\": %m"
+msgstr "ファイル \"%s\" �切り詰�処������ん���: %m"
+
+#: storage/smgr/md.c:446
+#, c-format
+msgid "cannot extend file \"%s\" beyond %u blocks"
+msgstr "ファイル \"%s\" を %u ブロック以上�拡張����ん"
+
+#: storage/smgr/md.c:468 storage/smgr/md.c:629 storage/smgr/md.c:704
+#, c-format
+msgid "could not seek to block %u in file \"%s\": %m"
+msgstr "ファイル \"%2$s\" � %1$u ブロック目�シーク����ん���: %3$m"
+
+#: storage/smgr/md.c:476
+#, c-format
+msgid "could not extend file \"%s\": %m"
+msgstr "ファイル \"%s\" を拡張����ん���: %m"
+
+#: storage/smgr/md.c:478 storage/smgr/md.c:485 storage/smgr/md.c:731
+msgid "Check free disk space."
+msgstr "ディスク�空�容�を�ェック������。"
+
+#: storage/smgr/md.c:482
+#, c-format
+msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
 msgstr ""
-"オペレーティングシステム�クラッシュ��時�ページ書�込��実行中���場"
-"�\n"
-"����部分的�ディスク��書�出��起�る�能性��り��。リカ�リ中�"
-"WAL\n"
-"��存�れ�行�変更��完全�復旧��る�������ん。��オプション�よ"
-"り�\n"
-"�ェック�イント�後�最��変更時�WAL�ページを書�出������完全�復"
-"æ—§\n"
-"��能��り��。"
+"ファイル \"%1$s\" を拡張����ん���：%4$u ブロック� %3$d �イト中 %2$d "
+"�イト分��を書�出����。"
 
-#: utils/misc/guc.c:769
-msgid "Runs the server silently."
-msgstr "サー�を出力���実行���。"
+#: storage/smgr/md.c:647
+#, c-format
+msgid "could not read block %u in file \"%s\": %m"
+msgstr "ファイル \"%2$s\" � %1$u ブロックを読��れ��ん���: %3$m"
 
-#: utils/misc/guc.c:770
-msgid ""
-"If this parameter is set, the server will automatically run in the "
-"background and any controlling terminals are dissociated."
+#: storage/smgr/md.c:663
+#, c-format
+msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
 msgstr ""
-"��オプションを設定�る��サー��自動的��ックグランド�起動��制御端末"
-"を切り離���。"
+"ファイル \"%2$s\" �ブロック %1$u を読��れ��ん���：%4$d �イト中 %3$d "
+"�イト分��読��り���"
 
-#: utils/misc/guc.c:778
-msgid "Logs each checkpoint."
-msgstr "��ェック�イントをログ�出力���。"
+#: storage/smgr/md.c:722
+#, c-format
+msgid "could not write block %u in file \"%s\": %m"
+msgstr "ファイル \"%2$s\" � %1$u ブロック�書�出���ん���: %3$m"
 
-#: utils/misc/guc.c:786
-msgid "Logs each successful connection."
-msgstr "�功��接続を全�ログ�出力���。"
+#: storage/smgr/md.c:727
+#, c-format
+msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
+msgstr ""
+"ファイル \"%2$s\" �ブロック %1$u を書�込���ん���：%4$d �イト中 %3$d "
+"�イト分��書�込����"
 
-#: utils/misc/guc.c:794
-msgid "Logs end of a session, including duration."
-msgstr "セッション�終了時刻���期間をログ�出力���。"
+#: storage/smgr/md.c:825
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
+msgstr ""
+"ファイル \"%s\" を %u ブロック�切り詰�られ��ん���：�在� %u ブロック"
+"����り���"
 
-#: utils/misc/guc.c:802
-msgid "Turns on various assertion checks."
-msgstr "�種アサーション検査を有効����。"
+#: storage/smgr/md.c:874
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: %m"
+msgstr "ファイル \"%s\" を %u ブロック�切り詰�られ��ん���: %m"
 
-#: utils/misc/guc.c:803
-msgid "This is a debugging aid."
-msgstr "�れ�デ�ッグ用��。"
+#: storage/smgr/md.c:1128
+#, c-format
+msgid "could not fsync file \"%s\" but retrying: %m"
+msgstr "ファイル \"%s\" を fsync ����ん���: %m"
 
-#: utils/misc/guc.c:817 utils/misc/guc.c:899 utils/misc/guc.c:958
-#: utils/misc/guc.c:967 utils/misc/guc.c:976 utils/misc/guc.c:985
-#: utils/misc/guc.c:1587 utils/misc/guc.c:1596
-msgid "No description available."
-msgstr "説明文��り��ん"
+#: storage/smgr/md.c:1270
+msgid "could not forward fsync request because request queue is full"
+msgstr ""
+"リクエストキュー�満���� fsync リクエスト�フォワード�����ん���"
 
-#: utils/misc/guc.c:826
-msgid "Logs the duration of each completed SQL statement."
-msgstr "完了��SQL全��期間をログ�出力���。"
+#: storage/smgr/md.c:1637
+#, c-format
+msgid "could not open file \"%s\" (target block %u): %m"
+msgstr "ファイル \"%s\"（対象ブロック %u）をオープン����ん���: %m"
 
-#: utils/misc/guc.c:834
-msgid "Logs each query's parse tree."
-msgstr "�クエリー�パースツリー�ログを�り��"
+#: storage/smgr/md.c:1659
+#, c-format
+msgid "could not seek to end of file \"%s\": %m"
+msgstr "ファイル \"%s\" �終端(EOF)をシーク����ん���: %m"
 
-#: utils/misc/guc.c:842
-msgid "Logs each query's rewritten parse tree."
-msgstr "�クエリー�パースツリー��度書�れ�分�ログを�り��"
+#: storage/lmgr/lmgr.c:720
+#, c-format
+msgid "relation %u of database %u"
+msgstr "データベース%2$u�リレーション%1$u"
 
-#: utils/misc/guc.c:850
-msgid "Logs each query's execution plan."
-msgstr "�クエリー�実行計画をログ�出力���。"
+#: storage/lmgr/lmgr.c:726
+#, c-format
+msgid "extension of relation %u of database %u"
+msgstr "データベース%2$u�リレーション%1$u�拡張"
 
-#: utils/misc/guc.c:858
-msgid "Indents parse and plan tree displays."
-msgstr "解�ツリー�計画ツリー�表示をインデント���。"
+#: storage/lmgr/lmgr.c:732
+#, c-format
+msgid "page %u of relation %u of database %u"
+msgstr "データベース%3$u�リレーション%2$u�ページ%1$u"
 
-#: utils/misc/guc.c:866
-msgid "Writes parser performance statistics to the server log."
-msgstr "パーサ�性能統計情報をサー�ログ�出力���。"
+#: storage/lmgr/lmgr.c:739
+#, c-format
+msgid "tuple (%u,%u) of relation %u of database %u"
+msgstr "データベース%4$u�リレーション%3$u�タプル(%2$u,%1$u)"
 
-#: utils/misc/guc.c:874
-msgid "Writes planner performance statistics to the server log."
-msgstr "プランナ�性能統計情報をサー�ログ�出力���。"
+#: storage/lmgr/lmgr.c:747
+#, c-format
+msgid "transaction %u"
+msgstr "トランザクション %u"
 
-#: utils/misc/guc.c:882
-msgid "Writes executor performance statistics to the server log."
-msgstr "エグゼキュータ�性能統計情報をサー�ログ�出力���。"
+#: storage/lmgr/lmgr.c:752
+#, c-format
+msgid "virtual transaction %d/%u"
+msgstr "仮想トランザクション %d/%u"
 
-#: utils/misc/guc.c:890
-msgid "Writes cumulative performance statistics to the server log."
-msgstr "累��性能統計情報をサー�ログ�出力���。"
+#: storage/lmgr/lmgr.c:758
+#, c-format
+msgid "object %u of class %u of database %u"
+msgstr "データベース%3$u�リレーション%2$u�オブジェクト%1$u"
 
-#: utils/misc/guc.c:910
-msgid "Collects information about executing commands."
-msgstr "実行中�コマンド�関�る情報を�集���。"
+#: storage/lmgr/lmgr.c:766
+#, c-format
+msgid "user lock [%u,%u,%u]"
+msgstr "ユーザロック[%u,%u,%u]"
 
-#: utils/misc/guc.c:911
+#: storage/lmgr/lmgr.c:773
+#, c-format
+msgid "advisory lock [%u,%u,%u,%u]"
+msgstr "アド�イザリ・ロック[%u,%u,%u,%u]"
+
+#: storage/lmgr/lmgr.c:781
+#, c-format
+msgid "unrecognized locktag type %d"
+msgstr "ロックタグ種類%d��明��"
+
+#: storage/lmgr/predicate.c:584
+msgid "not enough elements in RWConflictPool to record a rw-conflict"
+msgstr "RWConflictPool �RW競�を記録�る����素��足�����"
+
+#: storage/lmgr/predicate.c:585 storage/lmgr/predicate.c:613
 msgid ""
-"Enables the collection of information on the currently executing command of "
-"each session, along with the time at which that command began execution."
-msgstr ""
-"�セッション��在実行中�コマンド�関�����コマンド�実行を開始��時点"
-"�時刻�一緒�情報��集を有効����。"
+"You might need to run fewer transactions at a time or increase "
+"max_connections."
+msgstr "トランザクション��時実行数を減ら�� max_connections を増や�"
+"必���る�も�れ��ん"
 
-#: utils/misc/guc.c:920
-msgid "Collects statistics on database activity."
-msgstr "データベース�活動����統計情報を�集���。"
+#: storage/lmgr/predicate.c:612
+msgid "not enough elements in RWConflictPool to record a potential rw-conflict"
+msgstr "RWConflictPool �RW競���能性を記録�る����素��足�����"
 
-#: utils/misc/guc.c:929
-msgid "Updates the process title to show the active SQL command."
-msgstr "活動中�SQLコマンドを表示�るよ�プロセスタイトルを更新���。"
+#: storage/lmgr/predicate.c:817
+msgid "memory for serializable conflict tracking is nearly exhausted"
+msgstr "シリアライズ�能�競�追跡����メモリ�も���一���り��"
 
-#: utils/misc/guc.c:930
+#: storage/lmgr/predicate.c:818
+#, 
 msgid ""
-"Enables updating of the process title every time a new SQL command is "
-"received by the server."
+"There may be an idle transaction or a forgotten prepared transaction causing "
+"this."
 msgstr ""
-"新��SQLコマンドをサー���信�る度�プロセスタイトルを更新�る��を有効�"
-"���。"
+"��原因�����る�アイドル状態�トランザクション���使�れ�����"
+"プリペアドステートメント��る�も�れ��ん"
 
-#: utils/misc/guc.c:938
-msgid "Starts the autovacuum subprocess."
-msgstr "subprocessサブプロセスを起動���。"
+#: storage/lmgr/predicate.c:1100 storage/lmgr/predicate.c:1171
+#, c-format
+msgid ""
+"not enough shared memory for elements of data structure \"%s\" (%lu bytes "
+"requested)"
+msgstr "データ構造体 \"%s\" ��素����共有メモリ��足�����"
+"（ %lu �イト必�）"
 
-#: utils/misc/guc.c:947
-msgid "Generates debugging output for LISTEN and NOTIFY."
-msgstr "LISTEN�NOTIFYコマンド����デ�ッグ出力を生����。"
+#: storage/lmgr/predicate.c:1445
+msgid "deferrable snapshot was unsafe; trying a new one"
+msgstr "�延�能スナップショット�安全���り��ん。"
+"新��スナップショットを�得�よ�������。"
 
-#: utils/misc/guc.c:996
-msgid "Logs long lock waits."
-msgstr "長期�ロック待機をログ�記録���。"
+#: storage/lmgr/predicate.c:2139 storage/lmgr/predicate.c:2154
+#: storage/lmgr/predicate.c:3511 storage/lmgr/predicate.c:4623
+#: storage/lmgr/lock.c:631 storage/lmgr/lock.c:700 storage/lmgr/lock.c:2170
+#: storage/lmgr/lock.c:2549 storage/lmgr/lock.c:2614 storage/lmgr/proc.c:193
+#: storage/lmgr/proc.c:212 storage/ipc/shmem.c:190 utils/hash/dynahash.c:928
+msgid "out of shared memory"
+msgstr "共有メモリ��足�����"
 
-#: utils/misc/guc.c:1005
-msgid "Logs the host name in the connection logs."
-msgstr "接続ログ内�ホスト�を出力���。"
+#: storage/lmgr/predicate.c:2140 storage/lmgr/predicate.c:2155
+#: storage/lmgr/predicate.c:3512
+#, 
+msgid "You might need to increase max_pred_locks_per_transaction."
+msgstr "max_pred_locks_per_transaction を増や�必���る�も�れ��ん"
 
-#: utils/misc/guc.c:1006
+#: storage/lmgr/predicate.c:3664 storage/lmgr/predicate.c:3753
+#: storage/lmgr/predicate.c:3761 storage/lmgr/predicate.c:3802
+#: storage/lmgr/predicate.c:4040 storage/lmgr/predicate.c:4362
+#: storage/lmgr/predicate.c:4374 storage/lmgr/predicate.c:4415
+#, 
 msgid ""
-"By default, connection logs only show the IP address of the connecting host. "
-"If you want them to show the host name you can turn this on, but depending "
-"on your host name resolution setup it might impose a non-negligible "
-"performance penalty."
-msgstr ""
-"デフォルト���接続ログメッセージ��接続ホスト�IPアドレス���表示�れ�"
-"�。 ��オプションを有効��る����ホスト�もログ�表示�れるよ���り�"
-"�。 ホスト�解決�設定次第��無視�������性能�悪化�課�られる���"
-"注�������。"
+"could not serialize access due to read/write dependencies among transactions"
+msgstr "トランザクション間� read/write ��存性�������"
+"アクセス�直列化�����ん���"
 
-#: utils/misc/guc.c:1016
-msgid "Causes subtables to be included by default in various commands."
-msgstr "�種コマンド�����デフォルト��テーブルを��るよ�����。"
+#: storage/lmgr/predicate.c:3665
+msgid "Cancelled on identification as a pivot, during conflict out checking."
+msgstr "競��ェック中�ピボット����識別処��キャンセル�れ���"
 
-#: utils/misc/guc.c:1024
-msgid "Encrypt passwords."
-msgstr "パスワードを暗�化���。"
+#: storage/lmgr/predicate.c:3666 storage/lmgr/predicate.c:3755
+#: storage/lmgr/predicate.c:3763 storage/lmgr/predicate.c:3804
+#: storage/lmgr/predicate.c:4042 storage/lmgr/predicate.c:4364
+#: storage/lmgr/predicate.c:4376 storage/lmgr/predicate.c:4417
+msgid "The transaction might succeed if retried."
+msgstr "リトライ�行�れ�場����トランザクション��功�る�も�れ��ん"
 
-#: utils/misc/guc.c:1025
+#: storage/lmgr/predicate.c:3754
+#, c-format
+msgid "Cancelled on conflict out to old pivot %u."
+msgstr "競��よりキャンセル�れ���ピボット %u �戻り���"
+
+#: storage/lmgr/predicate.c:3762
+#, c-format
 msgid ""
-"When a password is specified in CREATE USER or ALTER USER without writing "
-"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
-"password is to be encrypted."
-msgstr ""
-"ENCRYPTEDも���UNENCRYPTED�指定無��CREATE USERも���ALTER USER�パス"
-"ワード�指定�れ�場����オプション�パスワード�暗�化を行������を"
-"決定���。"
+"Cancelled on identification as a pivot, with conflict out to old committed "
+"transaction %u."
+msgstr "競��よりピボット����識別処��キャンセル�れ�"
+"��コミット済�トランザクション %u �戻り���"
 
-#: utils/misc/guc.c:1034
-msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
-msgstr "\"expr=NULL\"���形���\"expr IS NULL\"���扱���。"
+#: storage/lmgr/predicate.c:3803
+msgid "Cancelled on conflict out to old pivot."
+msgstr "競��よりキャンセル�れ���ピボット�戻り���"
 
-#: utils/misc/guc.c:1035
-msgid ""
-"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
-"treated as expr IS NULL, that is, they return true if expr evaluates to the "
-"null value, and false otherwise. The correct behavior of expr = NULL is to "
-"always return null (unknown)."
+#: storage/lmgr/predicate.c:4041
+msgid "Cancelled on identification as a pivot, during conflict in checking."
 msgstr ""
-"有効���場��expr = NULL(���NULL = expr)���形���expr IS NULL��"
-"�扱�れ��。��り�expr�評価�NULL値�場��真を��も����を返��"
-"�。expr = NULL�SQL仕様�基���正��動作�常�NULL(未知)を返�����。"
+"�ェック�際�競��発生��ピボット����識別処��キャンセル�れ���"
 
-#: utils/misc/guc.c:1046
-msgid "Enables per-database user names."
-msgstr "データベース毎�ユーザ�を許����。"
+#: storage/lmgr/predicate.c:4363
+msgid "Cancelled on identification as a pivot, during write."
+msgstr "書�込��際�ピボット����識別処��キャンセル�れ���"
 
-#: utils/misc/guc.c:1055
-msgid "This parameter doesn't do anything."
-msgstr "��パラメータ�何も���ん。"
+#: storage/lmgr/predicate.c:4375
+#, c-format
+msgid "Cancelled on conflict out to pivot %u, during read."
+msgstr "読�込��際�ピボット %u ��競��よりキャンセル�れ���"
 
-#: utils/misc/guc.c:1056
-msgid ""
-"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
-"vintage clients."
-msgstr ""
-"��7.3�クライアント�ら�SET AUTOCOMMIT TO ON�エラー�����������"
-"��れ�存在���。"
+#: storage/lmgr/predicate.c:4416
+msgid "Cancelled on identification as a pivot, during commit attempt."
+msgstr "コミット�試行中�ピボット����識別処��キャンセル�れ���"
 
-#: utils/misc/guc.c:1064
-msgid "Sets the default read-only status of new transactions."
+#: storage/lmgr/deadlock.c:915
+#, c-format
+msgid "Process %d waits for %s on %s; blocked by process %d."
 msgstr ""
-"新��トランザクション�読��り��ステータス�デフォルトを設定���。"
+"プロセス %d � %s を %s �待機��������プロセス %d �ブロック�れ���"
 
-#: utils/misc/guc.c:1072
-msgid "Sets the current transaction's read-only status."
-msgstr "�愛�トランザクション�読��り��ステータスを設定���。"
+#: storage/lmgr/deadlock.c:934
+#, c-format
+msgid "Process %d: %s"
+msgstr "プロセス %d: %s"
 
-#: utils/misc/guc.c:1081
-msgid "Check function bodies during CREATE FUNCTION."
-msgstr "CREATE FUNCTION中�関数本体を検査���。"
+#: storage/lmgr/deadlock.c:941
+msgid "deadlock detected"
+msgstr "デッドロックを検出����"
 
-#: utils/misc/guc.c:1089
-msgid "Enable input of NULL elements in arrays."
-msgstr "�列内�NULL�素入力を�能����「。"
+#: storage/lmgr/deadlock.c:944
+msgid "See server log for query details."
+msgstr "クエリー�詳細�サー�ログを�照������"
 
-#: utils/misc/guc.c:1090
+#: storage/lmgr/lock.c:517
+#, c-format
 msgid ""
-"When turned on, unquoted NULL in an array input value means a null value; "
-"otherwise it is taken literally."
+"cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr ""
-"有効��る���列入力値���る引用符���NULL�NULL値を�味�るよ���り"
-"��。�も�������解釈�れ��。"
-
-#: utils/misc/guc.c:1099
-msgid "Create new tables with OIDs by default."
-msgstr "新��テーブルをデフォルト�OID付��作����。"
+"リカ�リー�実行中�データベースオブジェクト�ロックモード %s を�得����"
+"ã‚“"
 
-#: utils/misc/guc.c:1107
+#: storage/lmgr/lock.c:519
 msgid ""
-"Start a subprocess to capture stderr output and/or csvlogs into log files."
+"Only RowExclusiveLock or less can be acquired on database objects during "
+"recovery."
 msgstr ""
-"標準エラー出力�CSVログ������両方をログファイル����る����プロセ"
-"スを開始���。"
-
-#: utils/misc/guc.c:1115
-msgid "Truncate existing log files of same name during log rotation."
-msgstr "ログローテーション時�既存��一�称�ログファイルを切り詰���。"
-
-#: utils/misc/guc.c:1125
-msgid "Emit information about resource usage in sorting."
-msgstr "ソート中�リソース使用状��関�る情報を発行���。"
-
-#: utils/misc/guc.c:1138
-msgid "Generate debugging output for synchronized scanning."
-msgstr "�期スキャン処��デ�ッグ出力を生����。"
+"リカ�リー�実行中��データベースオブジェクト� RowExclusiveLock も����"
+"れ以下����得����"
 
-#: utils/misc/guc.c:1152
-msgid "Enable bounded sorting using heap sort."
-msgstr "ヒープソートを使用��境界�ソート処�を有効����"
+#: storage/lmgr/lock.c:632 storage/lmgr/lock.c:701 storage/lmgr/lock.c:2550
+#: storage/lmgr/lock.c:2615
+msgid "You might need to increase max_locks_per_transaction."
+msgstr "max_locks_per_transactionを増や�必���る�も�れ��ん"
 
-#: utils/misc/guc.c:1164
-msgid "Emit WAL-related debugging output."
-msgstr "WAL関連�デ�ッグ出力を出力���。"
+#: storage/lmgr/lock.c:2171
+msgid "Not enough memory for reassigning the prepared transaction's locks."
+msgstr ""
+"準備�れ�トランザクション�ロックを�割り当��る��メモリ��足����"
+"�。"
 
-#: utils/misc/guc.c:1175
-msgid "Datetimes are integer based."
-msgstr "日付時刻�整数ベース��。"
+#: storage/lmgr/proc.c:1019 utils/adt/misc.c:102
+#, c-format
+msgid "could not send signal to process %d: %m"
+msgstr "プロセス%d�シグナルを�信����ん���: %m"
 
-#: utils/misc/guc.c:1189
+#: storage/lmgr/proc.c:1053
+#, c-format
 msgid ""
-"Sets whether Kerberos and GSSAPI user names should be treated as case-"
-"insensitive."
+"process %d avoided deadlock for %s on %s by rearranging queue order after %"
+"ld.%03d ms"
 msgstr ""
-"Kerberos�よ�GSSAPIユーザ�を大文字�文字を区別��扱�����を設定��"
-"�。"
-
-#: utils/misc/guc.c:1198
-msgid "Warn about backslash escapes in ordinary string literals."
-msgstr "普通�文字列リテラル内��ックスラッシュエスケープを警告���。"
+"プロセス%1$d��%4$ld.%5$03d ms後�キュー�順番を�調整�る����%3$s上�%2"
+"$s�対�るデッドロックを防����。"
 
-#: utils/misc/guc.c:1207
-msgid "Causes '...' strings to treat backslashes literally."
-msgstr "'...' 文字列��ックスラッシュを����扱���。"
+#: storage/lmgr/proc.c:1065
+#, c-format
+msgid ""
+"process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
+msgstr ""
+"プロセス%1$d��%3$s上�%2$s�対�%4$ld.%5$03d ms待機�るデッドロックを検知�"
+"���"
 
-#: utils/misc/guc.c:1217
-msgid "Enable synchronized sequential scans."
-msgstr "�期シーケンシャルスキャンを有効����。"
+#: storage/lmgr/proc.c:1071
+#, c-format
+msgid "process %d still waiting for %s on %s after %ld.%03d ms"
+msgstr "プロセス%d�%sを%s�待機�����。%ld.%03dミリ秒後"
 
-#: utils/misc/guc.c:1226
-msgid "Allows archiving of WAL files using archive_command."
-msgstr "archive_command.\"を使用��WALファイル�アーカイブ処�を許����。"
+#: storage/lmgr/proc.c:1075
+#, c-format
+msgid "process %d acquired %s on %s after %ld.%03d ms"
+msgstr "プロセス%1$d�%4$ld.%5$03d ms後�%3$s上�%2$sを�得����"
 
-#: utils/misc/guc.c:1235
-msgid "Allows connections and queries during recovery."
-msgstr "リカ�リー中�も接続�クエリを��付���"
+#: storage/lmgr/proc.c:1091
+#, c-format
+msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
+msgstr ""
+"プロセス%1$d�%4$ld.%5$03d ms後�%3$s上�%2$sを�得�る���失敗����"
 
-#: utils/misc/guc.c:1244
-msgid "Allows modifications of the structure of system tables."
-msgstr "システムテーブル構造�変更を許����。"
+#: storage/large_object/inv_api.c:555 storage/large_object/inv_api.c:752
+#, c-format
+msgid "large object %u was not opened for writing"
+msgstr "ラージオブジェクト%u�書�込�用�開�れ����ん"
 
-#: utils/misc/guc.c:1254
-msgid "Disables reading from system indexes."
-msgstr "システムインデックス�読��りを無効����。"
+#: storage/large_object/inv_api.c:562 storage/large_object/inv_api.c:759
+#, c-format
+msgid "large object %u was already dropped"
+msgstr "ラージオブジェクト %u ����削除�れ����"
 
-#: utils/misc/guc.c:1255
-msgid ""
-"It does not prevent updating the indexes, so it is safe to use.  The worst "
-"consequence is slowness."
-msgstr ""
-"�れ�インデックス�更新�防���ん���使用��も安全��。最大�影響�低"
-"速化��。"
+#: storage/file/fd.c:406
+#, c-format
+msgid "getrlimit failed: %m"
+msgstr "getrlimit�失敗����: %m"
 
-#: utils/misc/guc.c:1265
-msgid ""
-"Enables backward compatibility mode for privilege checks on large objects."
+#: storage/file/fd.c:496
+msgid "insufficient file descriptors available to start server process"
 msgstr ""
-"ラージオブジェクト�権��ェックを行�際�下�互�性モードを有効����。"
+"サー�プロセスを起動��る���利用��るファイル記述���足�����"
 
-#: utils/misc/guc.c:1266
-msgid ""
-"Skips privilege checks when reading or modifying large objects, for "
-"compatibility with PostgreSQL releases prior to 9.0."
-msgstr ""
-"9.0 以�� PostgreSQL ��互�����ラージオブジェクトを読ん�り変更��り�る際�権��ェックをスキップ�る。"
+#: storage/file/fd.c:497
+#, c-format
+msgid "System allows %d, we need at least %d."
+msgstr "システム��%d使用������少���も%d必���"
 
-#: utils/misc/guc.c:1284
-msgid ""
-"Forces a switch to the next xlog file if a new file has not been started "
-"within N seconds."
-msgstr ""
-"N秒以内�新��ファイル�始�ら��場��次�xlogファイル��切り替�を強制�"
-"��。"
+#: storage/file/fd.c:538 storage/file/fd.c:1450 storage/file/fd.c:1566
+#, c-format
+msgid "out of file descriptors: %m; release and retry"
+msgstr "ファイル記述���足�����: %m: 解放後�実行������"
 
-#: utils/misc/guc.c:1294
-msgid "Waits N seconds on connection startup after authentication."
-msgstr "�証後�接続開始��N秒待機���。"
+#: storage/file/fd.c:1091
+#, c-format
+msgid "temporary file: path \"%s\", size %lu"
+msgstr "一時ファイル: パス \"%s\"�サイズ %lu"
 
-#: utils/misc/guc.c:1295 utils/misc/guc.c:1670
-msgid "This allows attaching a debugger to the process."
-msgstr "�れ�よりデ�ッガ�プロセス�接続����。"
+#: storage/file/fd.c:1625
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"を読��れ��ん���: %m"
 
-#: utils/misc/guc.c:1303
-msgid "Sets the default statistics target."
-msgstr "デフォルト�統計情報対象を設定���。"
+#: storage/file/reinit.c:58
+#, c-format
+msgid "resetting unlogged relations: cleanup %d init %d"
+msgstr "ログを�ら��リレーションをリセット�����："
+"クリーンアップ：%d init: %d "
 
-#: utils/misc/guc.c:1304
-msgid ""
-"This applies to table columns that have not had a column-specific target set "
-"via ALTER TABLE SET STATISTICS."
-msgstr ""
-"ALTER TABLE SET STATISTICS経由�列指定�対象を����テーブル列�����デ"
-"フォルト�統計情報対象を設定���。"
+#: storage/file/copydir.c:61 commands/tablespace.c:158
+#: commands/tablespace.c:175 commands/tablespace.c:186
+#: commands/tablespace.c:194 commands/tablespace.c:603
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"を作�����ん���: %m"
 
-#: utils/misc/guc.c:1312
-msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
-msgstr "副�����を折り�����上��FROMリスト�サイズを設定���。"
+#: storage/ipc/procarray.c:637
+msgid "consistent state delayed because recovery snapshot incomplete"
+msgstr "リカ�リースナップショット��完全����一貫性状態��延����"
 
-#: utils/misc/guc.c:1314
+#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
+#, c-format
 msgid ""
-"The planner will merge subqueries into upper queries if the resulting FROM "
-"list would have no more than this many items."
-msgstr ""
-"最終的�FROMリスト���値以上多���場��プランナ�副�����を上���"
-"����マージ���。"
+"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+msgstr "データ構造体 \"%s\" 用�共有メモリ��足�����（ %lu �イト必�）"
 
-#: utils/misc/guc.c:1323
-msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
-msgstr "JOIN�を平�化���上��FROMリスト�サイズを設定���。"
+#: storage/ipc/shmem.c:365
+#, c-format
+msgid "could not create ShmemIndex entry for data structure \"%s\""
+msgstr "データ構造体 \"%s\" ���� ShmemIndex エントリを作�����ん���"
 
-#: utils/misc/guc.c:1325
+#: storage/ipc/shmem.c:380
+#, c-format
 msgid ""
-"The planner will flatten explicit JOIN constructs into lists of FROM items "
-"whenever a list of no more than this many items would result."
+"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
+"actual %lu"
 msgstr ""
-"最終的�リスト���値以下�項目数��る時�プランナ��明示的�JOIN構文を"
-"FROM項目�リスト�直���。 "
+"データ構造体 \"%s\" ���� ShmemIndex エントリ�サイズ�誤�����：期待"
+"値�%lu�実際�%lu"
 
-#: utils/misc/guc.c:1334
-msgid "Sets the threshold of FROM items beyond which GEQO is used."
-msgstr "GEQOを使用�るFROMアイテム数�閾値を設定���。"
+#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
+msgid "requested shared memory size overflows size_t"
+msgstr "�求�れ�共有メモリ�サイズ�size_tを超�����"
 
-#: utils/misc/guc.c:1342
-msgid "GEQO: effort is used to set the default for other GEQO parameters."
-msgstr ""
-"GEQO: effort�他�GEQOパラメータ�デフォルトを設定�る���使用�れ��。"
+#: storage/page/bufpage.c:143 storage/page/bufpage.c:390
+#: storage/page/bufpage.c:623 storage/page/bufpage.c:753
+#, c-format
+msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
+msgstr "ページ�インタ�破������: lower = %u, upper = %u, special = %u\""
 
-#: utils/misc/guc.c:1350
-msgid "GEQO: number of individuals in the population."
-msgstr "GEQO: ��的個体群内�個体数��。"
+#: storage/page/bufpage.c:433
+#, c-format
+msgid "corrupted item pointer: %u"
+msgstr "アイテム�インタ�破������: %u"
 
-#: utils/misc/guc.c:1351 utils/misc/guc.c:1359
-msgid "Zero selects a suitable default value."
-msgstr "0��切�デフォルト値を�択���。"
+#: storage/page/bufpage.c:444 storage/page/bufpage.c:805
+#, c-format
+msgid "corrupted item lengths: total %u, available space %u"
+msgstr "アイテム長�破������: �計 %u 利用�能空間 %u"
 
-#: utils/misc/guc.c:1358
-msgid "GEQO: number of iterations of the algorithm."
-msgstr "GEQO: アルゴリズム��復数��。"
+#: storage/page/bufpage.c:642 storage/page/bufpage.c:778
+#, c-format
+msgid "corrupted item pointer: offset = %u, size = %u"
+msgstr "アイテム�インタ�破������: オフセット = %u サイズ = %u"
 
-#: utils/misc/guc.c:1368
-msgid "Sets the time to wait on a lock before checking for deadlock."
-msgstr ""
-"デッドロック状態��る����を調�る��ロックを待�時間を設定���。"
+#: utils/sort/logtape.c:213
+#, c-format
+msgid "could not write block %ld of temporary file: %m"
+msgstr "一時ファイル�ブロック%ldを書�込���ん���: %m"
 
-#: utils/misc/guc.c:1378
-msgid ""
-"Sets the maximum delay before canceling queries when a hot standby server is "
-"processing archived WAL data."
-msgstr ""
-"ホットスタン�イサー��アーカイブ�れ� WAL データを処����る場���"
-"クエリをキャンセル�る���延秒数�最大値をセット������。"
+#: utils/sort/logtape.c:215
+msgid "Perhaps out of disk space?"
+msgstr "ディスク容���足���る�能性��り��"
 
-#: utils/misc/guc.c:1388
-msgid ""
-"Sets the maximum delay before canceling queries when a hot standby server is "
-"processing streamed WAL data."
-msgstr ""
-"ホットスタン�イサー��ストリーム� WAL データを処����る場���"
-"クエリをキャンセル�る���延秒数�最大値をセット������。"
+#: utils/sort/logtape.c:232
+#, c-format
+msgid "could not read block %ld of temporary file: %m"
+msgstr "一時ファイル�ブロック%ldを読�込���ん���: %m"
 
-#: utils/misc/guc.c:1408
-msgid "Sets the maximum number of concurrent connections."
-msgstr "�時接続数�最大値を設定���。"
+#: utils/sort/tuplesort.c:3131
+#, c-format
+msgid "could not create unique index \"%s\""
+msgstr "一�性インデックス \"%s\" を作�����ん���"
 
-#: utils/misc/guc.c:1417
-msgid "Sets the number of connection slots reserved for superusers."
-msgstr "スーパーユーザ�よる接続用�予約�れる接続スロット�数を設定���。"
+#: utils/sort/tuplesort.c:3133
+#, c-format
+msgid "Key %s is duplicated."
+msgstr "キー %s ��複�����。"
 
-#: utils/misc/guc.c:1426
-msgid "Sets the number of shared memory buffers used by the server."
-msgstr "サー��使用�れる共有メモリ��ッファ数を設定���。"
+#: utils/fmgr/dfmgr.c:125
+#, c-format
+msgid "could not find function \"%s\" in file \"%s\""
+msgstr "ファイル\"%2$s\"内�関数\"%1$s\"��り��ん���"
 
-#: utils/misc/guc.c:1436
-msgid "Sets the maximum number of temporary buffers used by each session."
-msgstr "�セッション�使用�れる一時�ッファ�最大数を設定���。"
+#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
+#, c-format
+msgid "could not access file \"%s\": %m"
+msgstr "ファイル\"%s\"�アクセス����ん���: %m"
 
-#: utils/misc/guc.c:1446
-msgid "Sets the TCP port the server listens on."
-msgstr "サー��接続を監視�るTCP�ートを設定���。"
+#: utils/fmgr/dfmgr.c:242
+#, c-format
+msgid "could not load library \"%s\": %s"
+msgstr "ライブラリ\"%s\"をロード����ん���: %s"
 
-#: utils/misc/guc.c:1455
-msgid "Sets the access permissions of the Unix-domain socket."
-msgstr "Unixドメインソケット�アクセス権�を設定���。"
+#: utils/fmgr/dfmgr.c:274
+#, c-format
+msgid "incompatible library \"%s\": missing magic block"
+msgstr "\"%s\"�互�性���ライブラリ��。マジックブロック�欠�"
 
-#: utils/misc/guc.c:1456
-msgid ""
-"Unix-domain sockets use the usual Unix file system permission set. The "
-"parameter value is expected to be a numeric mode specification in the form "
-"accepted by the chmod and umask system calls. (To use the customary octal "
-"format the number must start with a 0 (zero).)"
-msgstr ""
-"Unixドメインソケット��通常�Unixファイルシステム権��設定を使���。 ��"
-"パラメータ値� chmod � umask システムコール���付�る数値�モード指定を想"
-"定�����（慣習的�8進数書�を使������0(ゼロ)�始�ら�����り�"
-"�ん）。 "
+#: utils/fmgr/dfmgr.c:276
+msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
+msgstr "拡張ライブラリ�PG_MODULE_MAGICマクロを使用���れ��り��ん。"
 
-#: utils/misc/guc.c:1468
-msgid "Sets the maximum memory to be used for query workspaces."
-msgstr "������作業用空間���使用�れるメモリ�最大値を設定���。"
+#: utils/fmgr/dfmgr.c:312
+#, c-format
+msgid "incompatible library \"%s\": version mismatch"
+msgstr "\"%s\"�互�性���ライブラリ��: �ージョン��一致"
 
-#: utils/misc/guc.c:1469
-msgid ""
-"This much memory can be used by each internal sort operation and hash table "
-"before switching to temporary disk files."
-msgstr ""
-"一時ディスクファイル��切替�を行����内部ソート�作��ッシュテーブル�"
-"使�れるメモリ��を指定���。"
+#: utils/fmgr/dfmgr.c:314
+#, c-format
+msgid "Server is version %d.%d, library is version %d.%d."
+msgstr "サー���ージョン�%d.%d�ライブラリ��ージョン�%d.%d<��。"
 
-#: utils/misc/guc.c:1480
-msgid "Sets the maximum memory to be used for maintenance operations."
-msgstr "�守作業�使用�れる最大メモリ�を設定���。"
+#: utils/fmgr/dfmgr.c:333
+#, c-format
+msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+msgstr "サー��� FUNC_MAX_ARGS = %d ����ライブラリ�� %d ��"
 
-#: utils/misc/guc.c:1481
-msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr "VACUUMやCREATE INDEX���作業���れ��。"
+#: utils/fmgr/dfmgr.c:342
+#, c-format
+msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+msgstr "サー��� INDEX_MAX_KEYS = %d ����ライブラリ�� %d ��"
 
-#: utils/misc/guc.c:1490
-msgid "Sets the maximum stack depth, in kilobytes."
-msgstr "スタック長�最大値をキロ�イト���設定���。"
+#: utils/fmgr/dfmgr.c:351
+#, c-format
+msgid "Server has NAMEDATALEN = %d, library has %d."
+msgstr "サー��� NAMEDATALEN = %d ����ライブラリ�� %d ��"
 
-#: utils/misc/guc.c:1500
-msgid "Vacuum cost for a page found in the buffer cache."
-msgstr "�ッファキャッシュ��る�ッファを�キューム�る際�コスト��。"
+#: utils/fmgr/dfmgr.c:360
+#, c-format
+msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
+msgstr "サー���FLOAT4PASSBYVAL = %s����ライブラリ��%s��。"
 
-#: utils/misc/guc.c:1509
-msgid "Vacuum cost for a page not found in the buffer cache."
-msgstr "�ッファキャッシュ����ッファを�キューム�る際�コスト��。"
+#: utils/fmgr/dfmgr.c:369
+#, c-format
+msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+msgstr "サー���FLOAT8PASSBYVAL = %s����ライブラリ��%s��。"
 
-#: utils/misc/guc.c:1518
-msgid "Vacuum cost for a page dirtied by vacuum."
-msgstr "�キューム処��ページを変更�る際�課�られるコスト��。"
+#: utils/fmgr/dfmgr.c:376
+msgid "Magic block has unexpected length or padding difference."
+msgstr ""
+"マジックブロック��図���長���る�����パディング�異�り��。"
 
-#: utils/misc/guc.c:1527
-msgid "Vacuum cost amount available before napping."
-msgstr "�キューム処�プロセス�休止�る����るコスト��計��。 "
+#: utils/fmgr/dfmgr.c:379
+#, c-format
+msgid "incompatible library \"%s\": magic block mismatch"
+msgstr "\"%s\"�互�性���ライブラリ��: マジックブロック��一致"
 
-#: utils/misc/guc.c:1536
-msgid "Vacuum cost delay in milliseconds."
-msgstr "ミリ秒���コストベース��キューム��延時間��。"
+#: utils/fmgr/dfmgr.c:545
+#, c-format
+msgid "access to library \"%s\" is not allowed"
+msgstr "ライブラリ\"%s\"��アクセス�許�れ����ん"
 
-#: utils/misc/guc.c:1546
-msgid "Vacuum cost delay in milliseconds, for autovacuum."
-msgstr "autovacuum用�ミリ秒���コストベース��キューム��延時間��。"
+#: utils/fmgr/dfmgr.c:572
+#, c-format
+msgid "invalid macro name in dynamic library path: %s"
+msgstr "ダイナミックライブラリパス内�マクロ�無効��: %s"
 
-#: utils/misc/guc.c:1556
-msgid "Vacuum cost amount available before napping, for autovacuum."
-msgstr ""
-"autovacuum用��キューム処�プロセス�休止�る����るコスト��計��。 "
+#: utils/fmgr/dfmgr.c:617
+msgid "zero-length component in parameter \"dynamic_library_path\""
+msgstr "パラメータ\"dynamic_library_path\"内�長��0��素��り��"
+
+#: utils/fmgr/dfmgr.c:636
+msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+msgstr "パラメータ\"dynamic_library_path\"内��素�絶対パス��り��ん"
 
-#: utils/misc/guc.c:1565
+#: utils/fmgr/funcapi.c:354
+#, c-format
 msgid ""
-"Sets the maximum number of simultaneously open files for each server process."
-msgstr ""
-"�サー��プロセス��時�オープン��るファイル�最大数を設定���。 "
+"could not determine actual result type for function \"%s\" declared to "
+"return type %s"
+msgstr "戻り値型%2$s���宣言�れ�関数\"%1$s\"�実際��果型を決定����ん"
 
-#: utils/misc/guc.c:1577
-msgid "Sets the maximum number of simultaneously prepared transactions."
-msgstr "準備�れ�1トランザクション��時最大数を設定���。"
+#: utils/fmgr/funcapi.c:1208 utils/fmgr/funcapi.c:1239
+msgid "number of aliases does not match number of columns"
+msgstr "別��数�列�数�一致���ん"
 
-#: utils/misc/guc.c:1607
-msgid "Sets the maximum allowed duration of any statement."
-msgstr "全��文�最大実行時間を設定���。"
+#: utils/fmgr/funcapi.c:1233
+msgid "no column alias was provided"
+msgstr "列�別���供�れ����ん���"
 
-#: utils/misc/guc.c:1608
-msgid "A value of 0 turns off the timeout."
-msgstr "ゼロ���値���タイムアウトを無効����。 "
+#: utils/fmgr/funcapi.c:1257
+msgid "could not determine row description for function returning record"
+msgstr "レコードを返�関数�����説明�行を決定����ん���"
 
-#: utils/misc/guc.c:1617
-msgid "Minimum age at which VACUUM should freeze a table row."
-msgstr "VACUUM �テーブル行を���る���最�時間"
+#: utils/fmgr/fmgr.c:270
+#, c-format
+msgid "internal function \"%s\" is not in internal lookup table"
+msgstr "内部関数\"%s\"�内部用検索テーブル��り��ん"
 
-#: utils/misc/guc.c:1626
-msgid "Age at which VACUUM should scan whole table to freeze tuples."
-msgstr ""
-"テーブル行を���る��� VACUUM �テーブル全体をスキャン�る���時間"
+#: utils/fmgr/fmgr.c:474
+#, c-format
+msgid "unrecognized API version %d reported by info function \"%s\""
+msgstr "info関数\"%2$s\"�報告�れ�API�ージョン%1$d��明��"
 
-#: utils/misc/guc.c:1635
-msgid ""
-"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
-"if any."
-msgstr ""
-"も��れ��VACUUM や HOT �クリーンアップを�延��るトランザクション数"
+#: utils/fmgr/fmgr.c:845 utils/fmgr/fmgr.c:2106
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr "関数%u�引数�多����(%d。最大�%d)"
 
-#: utils/misc/guc.c:1647
-msgid "Sets the maximum number of locks per transaction."
-msgstr "1トランザクション当�り�最大ロック数を設定���。"
+#: utils/cache/plancache.c:589
+msgid "cached plan must not change result type"
+msgstr "キャッシュ��計画��果型を変更����り��ん"
 
-#: utils/misc/guc.c:1648
-msgid ""
-"The shared lock table is sized on the assumption that at most "
-"max_locks_per_transaction * max_connections distinct objects will need to be "
-"locked at any one time."
-msgstr ""
-"共有ロックテーブル�大����最大max_locks_per_transaction * max_connections"
-"個�個別�オブジェクト��る時点�ロック�れる必���る���仮定�決定�れ"
-"��。"
+#: utils/cache/typcache.c:629
+#, c-format
+msgid "type %s is not composite"
+msgstr "型%s�複�型���り��ん"
 
-#: utils/misc/guc.c:1658
-msgid "Sets the maximum allowed time to complete client authentication."
-msgstr "クライアント�証�完了���最大時間を設定���。"
+#: utils/cache/typcache.c:643
+msgid "record type has not been registered"
+msgstr "レコード型�登録�れ����ん"
 
-#: utils/misc/guc.c:1669
-msgid "Waits N seconds on connection startup before authentication."
-msgstr "�証��接続開始��N秒待機���。"
+#: utils/cache/typcache.c:996 commands/typecmds.c:1272
+#, c-format
+msgid "%s is not an enum"
+msgstr "%s �数値���り��ん"
 
-#: utils/misc/guc.c:1679
-msgid "Sets the number of WAL files held for standby servers."
-msgstr "待機用サー�����れる WAL ファイル数を設定���。"
+#: utils/cache/relcache.c:4274
+#, c-format
+msgid "could not create relation-cache initialization file \"%s\": %m"
+msgstr "リレーションキャッシュ�期化ファイル\"%sを作�����ん: %m"
 
-#: utils/misc/guc.c:1688
-msgid ""
-"Sets the maximum distance in log segments between automatic WAL checkpoints."
-msgstr ""
-"自動WAL�ェック�イント�間�最大�離を�ログファイルセグメント�数�設定��"
-"�。"
+#: utils/cache/relcache.c:4276
+msgid "Continuing anyway, but there's something wrong."
+msgstr "�り���続行�����何��間������"
 
-#: utils/misc/guc.c:1697
-msgid "Sets the maximum time between automatic WAL checkpoints."
-msgstr "自動WAL�ェック�イント�最大間隔を設定���。"
+#: utils/cache/relmapper.c:454
+msgid "cannot PREPARE a transaction that modified relation mapping"
+msgstr ""
+"リレーション�マッピングを変更��トランザクション� PREPARE ����ん"
 
-#: utils/misc/guc.c:1707
-msgid ""
-"Enables warnings if checkpoint segments are filled more frequently than this."
+#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
+#, c-format
+msgid "could not open relation mapping file \"%s\": %m"
 msgstr ""
-"�ェック�イントセグメント�溢れ頻度��れよりも多�れ�警告���。"
+"リレーション�マッピング用ファイル \"%s\" をオープン����ん���: %m"
+
+#: utils/cache/relmapper.c:609
+#, c-format
+msgid "could not read relation mapping file \"%s\": %m"
+msgstr "リレーション�マッピング用ファイル \"%s\" �ら読��れ��ん���: %m"
+
+#: utils/cache/relmapper.c:619
+#, c-format
+msgid "relation mapping file \"%s\" contains invalid data"
+msgstr "リレーション�マッピング用ファイル \"%s\" �無効�データ��り��"
+
+#: utils/cache/relmapper.c:629
+#, c-format
+msgid "relation mapping file \"%s\" contains incorrect checksum"
+msgstr ""
+"リレーション�マッピング用ファイル \"%s\" �中��ェックサム�正���り��"
+"ã‚“"
+
+#: utils/cache/relmapper.c:741
+#, c-format
+msgid "could not write to relation mapping file \"%s\": %m"
+msgstr "リレーション�マッピング用ファイル \"%s\" を書�出���ん���: %m"
+
+#: utils/cache/relmapper.c:754
+#, c-format
+msgid "could not fsync relation mapping file \"%s\": %m"
+msgstr ""
+"リレーション�マッピング用ファイル \"%s\" を fsync ����ん���: %m"
+
+#: utils/cache/relmapper.c:760
+#, c-format
+msgid "could not close relation mapping file \"%s\": %m"
+msgstr ""
+"リレーション�マッピング用ファイル \"%s\" をクローズ����ん���: %m"
+
+#: utils/cache/lsyscache.c:2393 utils/cache/lsyscache.c:2426
+#: utils/cache/lsyscache.c:2459 utils/cache/lsyscache.c:2492
+#, c-format
+msgid "type %s is only a shell"
+msgstr "型%s���るシェル��"
+
+#: utils/cache/lsyscache.c:2398
+#, c-format
+msgid "no input function available for type %s"
+msgstr "型%s�利用�能�入力関数��り��ん"
+
+#: utils/cache/lsyscache.c:2431
+#, c-format
+msgid "no output function available for type %s"
+msgstr "型%s�利用�能�出力関数��り��ん"
+
+#: utils/cache/lsyscache.c:2464 utils/adt/arrayfuncs.c:1307
+#, c-format
+msgid "no binary input function available for type %s"
+msgstr "型%s���イナリ入力関数��り��ん"
+
+#: utils/cache/lsyscache.c:2497 utils/adt/arrayfuncs.c:1529
+#, c-format
+msgid "no binary output function available for type %s"
+msgstr "型%s���イナリ出力関数��り��ん"
+
+#: utils/error/elog.c:1479
+#, c-format
+msgid "could not reopen file \"%s\" as stderr: %m"
+msgstr "ファイル\"%s\"を標準エラー����オープン����ん���: %m"
+
+#: utils/error/elog.c:1492
+#, c-format
+msgid "could not reopen file \"%s\" as stdout: %m"
+msgstr "ファイル\"%s\"を標準出力����オープン����ん���: %m"
+
+#: utils/error/elog.c:1882 utils/error/elog.c:1892 utils/error/elog.c:1902
+msgid "[unknown]"
+msgstr "[unknown]"
+
+#: utils/error/elog.c:2253 utils/error/elog.c:2533 utils/error/elog.c:2611
+msgid "missing error text"
+msgstr "エラーテキスト��り��ん"
+
+#: utils/error/elog.c:2256 utils/error/elog.c:2259 utils/error/elog.c:2614
+#: utils/error/elog.c:2617
+#, c-format
+msgid " at character %d"
+msgstr "(文字�置 %d)"
+
+#: utils/error/elog.c:2269 utils/error/elog.c:2276
+msgid "DETAIL:  "
+msgstr "詳細:  "
+
+#: utils/error/elog.c:2283
+msgid "HINT:  "
+msgstr "ヒント:  "
+
+#: utils/error/elog.c:2290
+msgid "QUERY:  "
+msgstr "クエリー:  "
+
+#: utils/error/elog.c:2297
+msgid "CONTEXT:  "
+msgstr "コンテキスト:  "
+
+#: utils/error/elog.c:2307
+#, c-format
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "場所:  %s, %s:%d\n"
+
+#: utils/error/elog.c:2314
+#, c-format
+msgid "LOCATION:  %s:%d\n"
+msgstr "場所:  %s:%d\n"
+
+#: utils/error/elog.c:2328
+msgid "STATEMENT:  "
+msgstr "ステートメント:  "
+
+#. translator: This string will be truncated at 47
+#. characters expanded.
+#: utils/error/elog.c:2726
+#, c-format
+msgid "operating system error %d"
+msgstr "オペレーティングシステムエラー %d"
+
+#: utils/error/elog.c:2749
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: utils/error/elog.c:2753
+msgid "LOG"
+msgstr "LOG"
+
+#: utils/error/elog.c:2756
+msgid "INFO"
+msgstr "INFO"
+
+#: utils/error/elog.c:2759
+msgid "NOTICE"
+msgstr "NOTICE"
+
+#: utils/error/elog.c:2762
+msgid "WARNING"
+msgstr "WARNING"
+
+#: utils/error/elog.c:2765
+msgid "ERROR"
+msgstr "ERROR"
+
+#: utils/error/elog.c:2768
+msgid "FATAL"
+msgstr "FATAL"
+
+#: utils/error/elog.c:2771
+msgid "PANIC"
+msgstr "PANIC"
+
+#: utils/error/assert.c:37
+msgid "TRAP: ExceptionalCondition: bad arguments\n"
+msgstr "TRAP: ExceptionalCondition: �良�引数\n"
+
+#: utils/error/assert.c:40
+#, c-format
+msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
+msgstr "TRAP: %s(\\\"%s\\\", ファイル: \\\"%s\\\", 行数: %d)\n"
+
+#: utils/mmgr/portalmem.c:207
+#, c-format
+msgid "cursor \"%s\" already exists"
+msgstr "カーソル\"%s\"����存在���"
+
+#: utils/mmgr/portalmem.c:211
+#, c-format
+msgid "closing existing cursor \"%s\""
+msgstr "既存�カーソル\"%s\"をクローズ�����"
+
+#: utils/mmgr/portalmem.c:448
+#, c-format
+msgid "cannot drop active portal \"%s\""
+msgstr "アクテイブ��ータル \"%s\" を削除����ん"
+
+#: utils/mmgr/portalmem.c:635
+msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
+msgstr ""
+"WITH HOLD 付��カーソルを作���トランザクション� PREPARE ����ん"
+
+#: utils/mmgr/aset.c:417
+#, c-format
+msgid "Failed while creating memory context \"%s\"."
+msgstr "メモリコンテキスト\"%s\"�作�時�失敗����"
+
+#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:766 utils/mmgr/aset.c:967
+#, c-format
+msgid "Failed on request of size %lu."
+msgstr "サイズ%lu��求�失敗����"
+
+#: utils/adt/tsvector.c:215
+#, c-format
+msgid "word is too long (%ld bytes, max %ld bytes)"
+msgstr "�語�長����(%ld�イト�最大�%ld�イト)"
+
+#: utils/adt/tsvector.c:222
+#, c-format
+msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
+msgstr "tsベクター����文字列�長����(%ld�イト�最大�%ld�イト)"
+
+#: utils/adt/windowfuncs.c:243
+msgid "argument of ntile must be greater than zero"
+msgstr "ntile カウント�0より大����れ��り��ん"
+
+#: utils/adt/windowfuncs.c:465
+msgid "argument of nth_value must be greater than zero"
+msgstr "nth_value 引数� 0 より大����れ��り��ん"
+
+#: utils/adt/array_userfuncs.c:48
+msgid "could not determine input data types"
+msgstr "入力データ型を決定����ん���"
+
+#: utils/adt/array_userfuncs.c:82
+msgid "neither input type is an array"
+msgstr "入力型��列���り��ん"
+
+#: utils/adt/array_userfuncs.c:103 utils/adt/array_userfuncs.c:113
+#: utils/adt/int8.c:1211 utils/adt/int.c:623 utils/adt/int.c:652
+#: utils/adt/int.c:673 utils/adt/int.c:693 utils/adt/int.c:715
+#: utils/adt/int.c:744 utils/adt/int.c:758 utils/adt/int.c:773
+#: utils/adt/int.c:912 utils/adt/int.c:933 utils/adt/int.c:960
+#: utils/adt/int.c:1000 utils/adt/int.c:1021 utils/adt/int.c:1048
+#: utils/adt/int.c:1079 utils/adt/int.c:1142 utils/adt/arrayfuncs.c:1276
+#: utils/adt/float.c:1101 utils/adt/float.c:1160 utils/adt/float.c:2711
+#: utils/adt/float.c:2727 utils/adt/varbit.c:1111 utils/adt/varbit.c:1503
+#: utils/adt/varlena.c:950 utils/adt/varlena.c:1968 utils/adt/numeric.c:2253
+#: utils/adt/numeric.c:2262
+msgid "integer out of range"
+msgstr "integer�範囲外��"
+
+#: utils/adt/array_userfuncs.c:121
+msgid "argument must be empty or one-dimensional array"
+msgstr "引数�空�1次元��列���れ��り��ん"
+
+#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
+#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
+#: utils/adt/array_userfuncs.c:357
+msgid "cannot concatenate incompatible arrays"
+msgstr "互�性����列を連�����ん"
+
+#: utils/adt/array_userfuncs.c:225
+#, c-format
+msgid ""
+"Arrays with element types %s and %s are not compatible for concatenation."
+msgstr "�素型%s�%s��列�連���互�性��り��ん"
+
+#: utils/adt/array_userfuncs.c:264
+#, c-format
+msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
+msgstr "�素数%d�%d��列�連���互�性��り��ん"
+
+#: utils/adt/array_userfuncs.c:301
+msgid ""
+"Arrays with differing element dimensions are not compatible for "
+"concatenation."
+msgstr "異�る�素次数��列�連���互�性��り��ん。"
+
+#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
+msgid "Arrays with differing dimensions are not compatible for concatenation."
+msgstr "異�る次数��列�連���互�性��り��ん。"
+
+#: utils/adt/array_userfuncs.c:426 utils/adt/arrayfuncs.c:1238
+#: utils/adt/arrayfuncs.c:2911 utils/adt/arrayfuncs.c:4936
+#, c-format
+msgid "invalid number of dimensions: %d"
+msgstr "次数�無効��: %d"
+
+#: utils/adt/array_userfuncs.c:487
+msgid "could not determine input data type"
+msgstr "入力データ型を特定����ん���"
+
+#: utils/adt/cash.c:232
+#, c-format
+msgid "invalid input syntax for type money: \"%s\""
+msgstr "money型��入力構文�無効��: \"%s\""
+
+#: utils/adt/cash.c:493 utils/adt/cash.c:543 utils/adt/cash.c:594
+#: utils/adt/cash.c:643 utils/adt/cash.c:695 utils/adt/cash.c:745
+#: utils/adt/timestamp.c:2876 utils/adt/int8.c:596 utils/adt/int8.c:647
+#: utils/adt/int8.c:828 utils/adt/int8.c:927 utils/adt/int8.c:1016
+#: utils/adt/int8.c:1115 utils/adt/int.c:730 utils/adt/int.c:875
+#: utils/adt/int.c:974 utils/adt/int.c:1063 utils/adt/int.c:1093
+#: utils/adt/int.c:1117 utils/adt/float.c:764 utils/adt/float.c:828
+#: utils/adt/float.c:2470 utils/adt/float.c:2533 utils/adt/geo_ops.c:4130
+#: utils/adt/numeric.c:4507 utils/adt/numeric.c:4790
+msgid "division by zero"
+msgstr "0 �よる除算�行�れ���"
+
+#: utils/adt/nabstime.c:160
+#, c-format
+msgid "invalid time zone name: \"%s\""
+msgstr "時間帯�称�無効��: \"%s\""
+
+#: utils/adt/nabstime.c:480 utils/adt/nabstime.c:523 utils/adt/nabstime.c:553
+#: utils/adt/nabstime.c:596 utils/adt/timestamp.c:226
+#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
+#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
+#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
+#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
+#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
+#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
+#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
+#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
+#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
+#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
+#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
+#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
+#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
+#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
+#: utils/adt/timestamp.c:4614 utils/adt/formatting.c:3185
+#: utils/adt/formatting.c:3217 utils/adt/formatting.c:3285
+#: utils/adt/xml.c:1712 utils/adt/xml.c:1719 utils/adt/xml.c:1739
+#: utils/adt/xml.c:1746 utils/adt/date.c:913 utils/adt/date.c:960
+#: utils/adt/date.c:1516 utils/adt/date.c:1553 utils/adt/date.c:2427
+msgid "timestamp out of range"
+msgstr "timestamp�範囲外��"
+
+#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
+msgid "cannot convert abstime \"invalid\" to timestamp"
+msgstr "abstime�\"invalid\"をtimestamp�変�����ん"
+
+#: utils/adt/nabstime.c:806
+msgid "invalid status in external \"tinterval\" value"
+msgstr "\"tinterval\"�外部値�ステータス�無効��"
+
+#: utils/adt/nabstime.c:880
+msgid "cannot convert reltime \"invalid\" to interval"
+msgstr "reltime�\"invalid\"をinterval�変�����ん"
+
+#: utils/adt/nabstime.c:1575
+#, c-format
+msgid "invalid input syntax for type tinterval: \"%s\""
+msgstr "型tinterval�入力構文�無効��: \"%s\""
+
+#: utils/adt/misc.c:80
+msgid "must be superuser to signal other server processes"
+msgstr ""
+"他�サー�プロセス�シグナルを�る����スーパーユーザ���れ��り��ん"
+
+#: utils/adt/misc.c:89
+#, c-format
+msgid "PID %d is not a PostgreSQL server process"
+msgstr "PID %d�PostgreSQLサー�プロセス���り��ん"
+
+#: utils/adt/misc.c:126
+msgid "must be superuser to signal the postmaster"
+msgstr "postmaster�シグナルを�る����スーパーユーザ���れ��り��ん"
+
+#: utils/adt/misc.c:131
+#, c-format
+msgid "failed to send signal to postmaster: %m"
+msgstr "postmaster�シグナルを�信����ん���: %m"
+
+#: utils/adt/misc.c:148
+msgid "must be superuser to rotate log files"
+msgstr "ログファイルをローテート��る��スーパーユーザ���れ��り��ん"
+
+#: utils/adt/misc.c:153
+msgid "rotation not possible because log collection not active"
+msgstr "ログ�集�活動�����ん��ローテーションを行��������ん"
+
+#: utils/adt/misc.c:195
+msgid "global tablespace never has databases"
+msgstr "グロー�ルテーブル空間�データベース��り��ん"
+
+#: utils/adt/misc.c:216
+#, c-format
+msgid "%u is not a tablespace OID"
+msgstr "%u�テーブル空間�OID���り��ん"
+
+#: utils/adt/misc.c:352
+msgid "unreserved"
+msgstr "予約�れ����ん"
+
+#: utils/adt/misc.c:356
+msgid "unreserved (cannot be function or type name)"
+msgstr "予約�れ����ん（関数���型�������ん）"
+
+#: utils/adt/misc.c:360
+msgid "reserved (can be function or type name)"
+msgstr "予約�れ����（関数���型������）"
+
+#: utils/adt/misc.c:364
+msgid "reserved"
+msgstr "予約�れ����"
+
+#: utils/adt/uuid.c:128
+#, c-format
+msgid "invalid input syntax for uuid: \"%s\""
+msgstr "uuid�入力構文�無効��: \"%s\""
+
+#: utils/adt/tsvector_parser.c:136 utils/adt/tsquery.c:156
+#: utils/adt/tsquery.c:392
+#, c-format
+msgid "syntax error in tsquery: \"%s\""
+msgstr "tsquery内�構文エラー: \"%s\""
+
+#: utils/adt/tsvector_parser.c:137
+#, c-format
+msgid "syntax error in tsvector: \"%s\""
+msgstr "tsvector内�構文エラー: %s"
+
+#: utils/adt/tsvector_parser.c:202
+#, c-format
+msgid "there is no escaped character: \"%s\""
+msgstr "エスケープ文字��り��ん: \"%s\""
+
+#: utils/adt/tsvector_parser.c:319
+#, c-format
+msgid "wrong position info in tsvector: \"%s\""
+msgstr "tsvector内��置情報�間������: \"%s\""
+
+#: utils/adt/regproc.c:118 utils/adt/regproc.c:139 utils/adt/regproc.c:289
+#: utils/adt/acl.c:3359
+#, c-format
+msgid "function \"%s\" does not exist"
+msgstr "関数\"%s\"�存在���ん"
+
+#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
+#, c-format
+msgid "more than one function named \"%s\""
+msgstr "\"%s\"������関数�複数�り��"
+
+#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
+#, c-format
+msgid "more than one operator named %s"
+msgstr "%s������演算��複数�り��"
+
+#: utils/adt/regproc.c:635 utils/adt/regproc.c:1485 utils/adt/ruleutils.c:5800
+#: utils/adt/ruleutils.c:5855 utils/adt/ruleutils.c:5892
+msgid "too many arguments"
+msgstr "引数�多����"
+
+#: utils/adt/regproc.c:636
+msgid "Provide two argument types for operator."
+msgstr "演算���2��引数型を�供������"
+
+#: utils/adt/regproc.c:1320 utils/adt/regproc.c:1325 utils/adt/varlena.c:2251
+#: utils/adt/varlena.c:2256
+msgid "invalid name syntax"
+msgstr "��構文�無効��"
+
+#: utils/adt/regproc.c:1383
+msgid "expected a left parenthesis"
+msgstr "左括弧を想定������"
+
+#: utils/adt/regproc.c:1399
+msgid "expected a right parenthesis"
+msgstr "�括弧を想定������"
+
+#: utils/adt/regproc.c:1418
+msgid "expected a type name"
+msgstr "型���を想定������"
+
+#: utils/adt/regproc.c:1450
+msgid "improper type name"
+msgstr "型������切��"
+
+#: utils/adt/timestamp.c:92 utils/adt/varchar.c:43 utils/adt/varbit.c:51
+#: utils/adt/date.c:66
+msgid "invalid type modifier"
+msgstr "無効�型修飾���。"
+
+#: utils/adt/timestamp.c:97
+#, c-format
+msgid "TIMESTAMP(%d)%s precision must not be negative"
+msgstr "TIMESTAMP(%d)%s �精度�負������り��ん"
+
+#: utils/adt/timestamp.c:103
+#, c-format
+msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
+msgstr "TIMESTAMP(%d)%s���りを許容最大値%d��減ら����"
+
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp�範囲外��: \"%s\""
+
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
+#: utils/adt/timestamp.c:664
+#, c-format
+msgid "date/time value \"%s\" is no longer supported"
+msgstr "日付時刻�値\"%s\"�も�サ�ート�れ����ん"
+
+#: utils/adt/timestamp.c:260
+msgid "timestamp cannot be NaN"
+msgstr "タイムスタンプ� NaN ������ん"
+
+#: utils/adt/timestamp.c:370
+#, c-format
+msgid "timestamp(%d) precision must be between %d and %d"
+msgstr "timestamp(%d)�精度�%d�ら%d�����れ��り��ん"
+
+#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
+#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
+msgid "interval out of range"
+msgstr "interval�範囲外��"
+
+#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
+msgid "invalid INTERVAL type modifier"
+msgstr "無効�INTERVAL型�修正���"
+
+#: utils/adt/timestamp.c:803
+#, c-format
+msgid "INTERVAL(%d) precision must not be negative"
+msgstr "INTERVAL(%d)�精度�負������ん"
+
+#: utils/adt/timestamp.c:809
+#, c-format
+msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
+msgstr "INTERVAL(%d)�精度を許容最大値%d��減ら����"
+
+#: utils/adt/timestamp.c:1101
+#, c-format
+msgid "interval(%d) precision must be between %d and %d"
+msgstr "interval(%d)�精度�%d�ら%d�����れ��り��ん"
+
+#: utils/adt/timestamp.c:2306
+msgid "cannot subtract infinite timestamps"
+msgstr "無�大�timestampを減算����ん"
+
+#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
+#: utils/adt/timestamp.c:4020
+#, c-format
+msgid "timestamp units \"%s\" not supported"
+msgstr "timestamp���\"%s\"�サ�ート�れ����ん"
+
+#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
+#, c-format
+msgid "timestamp units \"%s\" not recognized"
+msgstr "timestamp���\"%s\"��明��"
+
+#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
+#: utils/adt/timestamp.c:4233
+#, c-format
+msgid "timestamp with time zone units \"%s\" not supported"
+msgstr "timestamp with time zone���\"%s\"�サ�ート�れ����ん"
+
+#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
+#, c-format
+msgid "timestamp with time zone units \"%s\" not recognized"
+msgstr "timestamp with time zone���\"%s\"��明��"
+
+#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
+#, c-format
+msgid "interval units \"%s\" not supported"
+msgstr "interval���\"%s\"�サ�ート�れ����ん"
+
+#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
+#, c-format
+msgid "interval units \"%s\" not recognized"
+msgstr "interval���\"%s\"��明��"
+
+#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
+#, c-format
+msgid "could not convert to time zone \"%s\""
+msgstr "時間帯\"%s\"�変�����ん���"
+
+#: utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
+#: utils/adt/datetime.c:928 utils/adt/datetime.c:1663 utils/adt/date.c:2632
+#, c-format
+msgid "time zone \"%s\" not recognized"
+msgstr "時間帯\"%s\"��明��"
+
+#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
+#, c-format
+msgid "interval time zone \"%s\" must not specify month"
+msgstr "interval�よる時間帯\"%s\"��月を指定�������ん"
+
+#: utils/adt/timestamp.c:4712 utils/adt/timestamp.c:4793 utils/adt/int8.c:1373
+#: utils/adt/int.c:1345
+msgid "step size cannot equal zero"
+msgstr "ステップ数をゼロ��る�������ん"
+
+#: utils/adt/int8.c:98 utils/adt/int8.c:133 utils/adt/numutils.c:51
+#: utils/adt/numutils.c:61 utils/adt/numutils.c:103
+#, c-format
+msgid "invalid input syntax for integer: \"%s\""
+msgstr "型integer�入力構文�無効��: \"%s\""
+
+#: utils/adt/int8.c:114
+#, c-format
+msgid "value \"%s\" is out of range for type bigint"
+msgstr "値\"%s\"�型bigint�範囲外��"
+
+#: utils/adt/int8.c:500 utils/adt/int8.c:529 utils/adt/int8.c:550
+#: utils/adt/int8.c:580 utils/adt/int8.c:612 utils/adt/int8.c:630
+#: utils/adt/int8.c:679 utils/adt/int8.c:696 utils/adt/int8.c:765
+#: utils/adt/int8.c:786 utils/adt/int8.c:813 utils/adt/int8.c:844
+#: utils/adt/int8.c:865 utils/adt/int8.c:886 utils/adt/int8.c:913
+#: utils/adt/int8.c:953 utils/adt/int8.c:974 utils/adt/int8.c:1001
+#: utils/adt/int8.c:1032 utils/adt/int8.c:1053 utils/adt/int8.c:1074
+#: utils/adt/int8.c:1101 utils/adt/int8.c:1274 utils/adt/int8.c:1313
+#: utils/adt/varbit.c:1583 utils/adt/numeric.c:2306
+msgid "bigint out of range"
+msgstr "bigint�範囲外��"
+
+#: utils/adt/int8.c:1236 utils/adt/int.c:349 utils/adt/int.c:789
+#: utils/adt/int.c:818 utils/adt/int.c:839 utils/adt/int.c:859
+#: utils/adt/int.c:891 utils/adt/int.c:1157 utils/adt/float.c:1119
+#: utils/adt/float.c:1177 utils/adt/numeric.c:2354 utils/adt/numeric.c:2365
+msgid "smallint out of range"
+msgstr "smallint�範囲外��"
+
+#: utils/adt/int8.c:1330
+msgid "OID out of range"
+msgstr "OID�範囲外��"
+
+#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
+msgid "input of anonymous composite types is not implemented"
+msgstr "匿�複�型�入力�実装�れ����ん"
+
+#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
+#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
+#, c-format
+msgid "malformed record literal: \"%s\""
+msgstr "����レコードリテラル��: \"%s\""
+
+#: utils/adt/rowtypes.c:152
+msgid "Missing left parenthesis."
+msgstr "左括弧��り��ん"
+
+#: utils/adt/rowtypes.c:180
+msgid "Too few columns."
+msgstr "列�少�����"
+
+#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
+msgid "Unexpected end of input."
+msgstr "想定外�入力�終端��"
+
+#: utils/adt/rowtypes.c:263
+msgid "Too many columns."
+msgstr "列�多����"
+
+#: utils/adt/rowtypes.c:271
+msgid "Junk after right parenthesis."
+msgstr "�括弧�後�����り��"
+
+#: utils/adt/rowtypes.c:522
+#, c-format
+msgid "wrong number of columns: %d, expected %d"
+msgstr "列数�間������: %d。%dを想定������"
+
+#: utils/adt/rowtypes.c:549
+#, c-format
+msgid "wrong data type: %u, expected %u"
+msgstr "データ型�間������: %u。%uを想定������"
+
+#: utils/adt/rowtypes.c:610
+#, c-format
+msgid "improper binary format in record column %d"
+msgstr "レコード列%d��イナリ書����切��"
+
+#: utils/adt/rowtypes.c:897 utils/adt/rowtypes.c:1132
+#, c-format
+msgid "cannot compare dissimilar column types %s and %s at record column %d"
+msgstr ""
+"レコード�カラム %3$d �����全�異�る型 %1$s � %2$s ��比較�����"
+"ã‚“"
+
+#: utils/adt/rowtypes.c:983 utils/adt/rowtypes.c:1203
+msgid "cannot compare record types with different numbers of columns"
+msgstr "個数�異�るカラム�士��レコード型�比較�����ん"
+
+#: utils/adt/int.c:162
+msgid "int2vector has too many elements"
+msgstr "int2vector��素数�多����"
+
+#: utils/adt/int.c:237
+msgid "invalid int2vector data"
+msgstr "int2vectorデータ�無効��"
+
+#: utils/adt/int.c:243 utils/adt/oid.c:212 utils/adt/oid.c:293
+msgid "oidvector has too many elements"
+msgstr "oidvector��素�多����"
+
+#. translator: first %s is inet or cidr
+#: utils/adt/network.c:107 utils/adt/datetime.c:3559
+#, c-format
+msgid "invalid input syntax for type %s: \"%s\""
+msgstr "\"%s\"型�入力構文�無効��: \"%s\""
+
+#: utils/adt/network.c:118
+#, c-format
+msgid "invalid cidr value: \"%s\""
+msgstr "CIDR値�無効��: \"%s\""
+
+#: utils/adt/network.c:119 utils/adt/network.c:249
+msgid "Value has bits set to right of mask."
+msgstr "値��マスク����セット�れ�ビット��り��"
+
+#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
+#: utils/adt/network.c:664
+#, c-format
+msgid "could not format inet value: %m"
+msgstr "inet値を整形����ん: %m"
+
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:217
+#, c-format
+msgid "invalid address family in external \"%s\" value"
+msgstr "外部 \"%s\" 値内�アドレスファミリ�無効��"
+
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:224
+#, c-format
+msgid "invalid bits in external \"%s\" value"
+msgstr "外部 \"%s\" 値内�ビット�無効��"
+
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:233
+#, c-format
+msgid "invalid length in external \"%s\" value"
+msgstr "外部 \"%s\" 値内�長��無効��"
+
+#: utils/adt/network.c:248
+msgid "invalid external \"cidr\" value"
+msgstr "\"cidr\"�外部値�無効��"
+
+#: utils/adt/network.c:370 utils/adt/network.c:397
+#, c-format
+msgid "invalid mask length: %d"
+msgstr "マスク長�無効��: %d"
+
+#: utils/adt/network.c:682
+#, c-format
+msgid "could not format cidr value: %m"
+msgstr "cidr値を整形����ん: %m"
+
+#: utils/adt/network.c:1255
+msgid "cannot AND inet values of different sizes"
+msgstr "サイズ�異�るinet値�AND�����ん"
+
+#: utils/adt/network.c:1287
+msgid "cannot OR inet values of different sizes"
+msgstr "サイズ�異�るinet値�OR�����ん"
+
+#: utils/adt/network.c:1348 utils/adt/network.c:1424
+msgid "result is out of range"
+msgstr "�果�範囲外��"
+
+#: utils/adt/network.c:1389
+msgid "cannot subtract inet values of different sizes"
+msgstr "サイズ�異�るinet値�引�算�����ん"
+
+#: utils/adt/datum.c:80 utils/adt/datum.c:92
+msgid "invalid Datum pointer"
+msgstr "Datum�インタ�無効��"
+
+#: utils/adt/arrayfuncs.c:235 utils/adt/arrayfuncs.c:247
+msgid "missing dimension value"
+msgstr "次元数��り��ん"
+
+#: utils/adt/arrayfuncs.c:257
+msgid "missing \"]\" in array dimensions"
+msgstr "�列�次元�\"]\"��り��ん"
+
+#: utils/adt/arrayfuncs.c:265 utils/adt/arrayfuncs.c:2436
+#: utils/adt/arrayfuncs.c:2464 utils/adt/arrayfuncs.c:2479
+msgid "upper bound cannot be less than lower bound"
+msgstr "上�を下�より����る�������ん"
+
+#: utils/adt/arrayfuncs.c:277 utils/adt/arrayfuncs.c:303
+msgid "array value must start with \"{\" or dimension information"
+msgstr "�列値�\"[\"�次元情報�ら始�ら��れ��り��ん"
+
+#: utils/adt/arrayfuncs.c:291
+msgid "missing assignment operator"
+msgstr "代入演算���り��ん"
+
+#: utils/adt/arrayfuncs.c:308 utils/adt/arrayfuncs.c:314
+msgid "array dimensions incompatible with array literal"
+msgstr "�列�次元��列リテラル�互�性��り��ん"
+
+#: utils/adt/arrayfuncs.c:444 utils/adt/arrayfuncs.c:459
+#: utils/adt/arrayfuncs.c:468 utils/adt/arrayfuncs.c:482
+#: utils/adt/arrayfuncs.c:502 utils/adt/arrayfuncs.c:530
+#: utils/adt/arrayfuncs.c:535 utils/adt/arrayfuncs.c:575
+#: utils/adt/arrayfuncs.c:596 utils/adt/arrayfuncs.c:615
+#: utils/adt/arrayfuncs.c:725 utils/adt/arrayfuncs.c:734
+#: utils/adt/arrayfuncs.c:764 utils/adt/arrayfuncs.c:779
+#: utils/adt/arrayfuncs.c:832
+#, c-format
+msgid "malformed array literal: \"%s\""
+msgstr "�列リテラル�書��誤�����: \"%s\""
+
+#: utils/adt/arrayfuncs.c:871 utils/adt/arrayfuncs.c:1473
+#: utils/adt/arrayfuncs.c:2795 utils/adt/arrayfuncs.c:2943
+#: utils/adt/arrayfuncs.c:5036 utils/adt/arrayutils.c:93
+#: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
+#, c-format
+msgid "array size exceeds the maximum allowed (%d)"
+msgstr "�列�次数�上�(%d)を超�����"
+
+#: utils/adt/arrayfuncs.c:1249
+msgid "invalid array flags"
+msgstr "�列フラグ�無効��"
+
+#: utils/adt/arrayfuncs.c:1257
+msgid "wrong element type"
+msgstr "�素型�間������"
+
+#: utils/adt/arrayfuncs.c:1447
+#, c-format
+msgid "improper binary format in array element %d"
+msgstr "�列�素%d��イナリ書����切��"
+
+#: utils/adt/arrayfuncs.c:1903
+msgid "slices of fixed-length arrays not implemented"
+msgstr "固定長�列�部分�列�実装�れ����ん"
+
+#: utils/adt/arrayfuncs.c:2076 utils/adt/arrayfuncs.c:2098
+#: utils/adt/arrayfuncs.c:2132 utils/adt/arrayfuncs.c:2418
+#: utils/adt/arrayfuncs.c:4916 utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4965
+msgid "wrong number of array subscripts"
+msgstr "�列�添�字��正�数値��"
+
+#: utils/adt/arrayfuncs.c:2081 utils/adt/arrayfuncs.c:2174
+#: utils/adt/arrayfuncs.c:2469
+msgid "array subscript out of range"
+msgstr "�列�添�字�範囲外��"
+
+#: utils/adt/arrayfuncs.c:2086
+msgid "cannot assign null value to an element of a fixed-length array"
+msgstr "固定長�列��素�NULL値を代入����ん"
+
+#: utils/adt/arrayfuncs.c:2372
+msgid "updates on slices of fixed-length arrays not implemented"
+msgstr "固定長�列�部分�列�更新�実装�れ����ん"
+
+#: utils/adt/arrayfuncs.c:2408 utils/adt/arrayfuncs.c:2495
+msgid "source array too small"
+msgstr "元��列�������"
+
+#: utils/adt/arrayfuncs.c:3050
+msgid "null array element not allowed in this context"
+msgstr "��文脈��NULL��列�素�許�れ��ん"
+
+#: utils/adt/arrayfuncs.c:3153 utils/adt/arrayfuncs.c:3361
+#: utils/adt/arrayfuncs.c:3678
+msgid "cannot compare arrays of different element types"
+msgstr "�素型�異�る�列を比較����ん"
+
+#: utils/adt/arrayfuncs.c:3563
+#, c-format
+msgid "could not identify a hash function for type %s"
+msgstr "型 %s ��ッシュ関数を識別����ん"
+
+#: utils/adt/arrayfuncs.c:4814 utils/adt/arrayfuncs.c:4854
+#, 
+msgid "dimension array or low bound array cannot be null"
+msgstr "次元�列も���下�値�列� NULL ������り��ん"
+
+#: utils/adt/arrayfuncs.c:4917 utils/adt/arrayfuncs.c:4949
+msgid "Dimension array must be one dimensional."
+msgstr "次元�列�1次元���れ��り��ん"
+
+#: utils/adt/arrayfuncs.c:4922 utils/adt/arrayfuncs.c:4954
+msgid "wrong range of array subscripts"
+msgstr "�列�添字�範囲�誤�����"
+
+#: utils/adt/arrayfuncs.c:4923 utils/adt/arrayfuncs.c:4955
+msgid "Lower bound of dimension array must be one."
+msgstr "次元�列�添字�下��１���れ��り��ん"
+
+#: utils/adt/arrayfuncs.c:4928 utils/adt/arrayfuncs.c:4960
+msgid "dimension values cannot be null"
+msgstr "次元値� null �許�れ��ん"
+
+#: utils/adt/arrayfuncs.c:4966
+msgid "Low bound array has different size than dimensions array."
+msgstr "下��列�次元�列�サイズ�異������"
+
+#: utils/adt/float.c:54
+msgid "value out of range: overflow"
+msgstr "範囲外�値��: オー�ーフロー"
+
+#: utils/adt/float.c:59
+msgid "value out of range: underflow"
+msgstr "範囲外�値��: アンダーフロー"
+
+#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
+#, c-format
+msgid "invalid input syntax for type real: \"%s\""
+msgstr "型real�入力構文�無効��: \"%s\""
+
+#: utils/adt/float.c:242
+#, c-format
+msgid "\"%s\" is out of range for type real"
+msgstr "型real��\"%s\"�範囲外��"
+
+#: utils/adt/float.c:399 utils/adt/float.c:440 utils/adt/float.c:491
+#: utils/adt/numeric.c:3969 utils/adt/numeric.c:3995
+#, c-format
+msgid "invalid input syntax for type double precision: \"%s\""
+msgstr "型double precision�入力構文�無効��: \"%s\""
+
+#: utils/adt/float.c:435
+#, c-format
+msgid "\"%s\" is out of range for type double precision"
+msgstr "型double precision��\"%s\"�範囲外��"
+
+#: utils/adt/float.c:1303 utils/adt/numeric.c:5183
+msgid "cannot take square root of a negative number"
+msgstr "負�値�平方根を�る�������ん"
+
+#: utils/adt/float.c:1345 utils/adt/numeric.c:2166
+msgid "zero raised to a negative power is undefined"
+msgstr "0 �負数乗�定義�れ����ん"
+
+#: utils/adt/float.c:1349 utils/adt/numeric.c:2172
+msgid "a negative number raised to a non-integer power yields a complex result"
+msgstr "負数を整数���数���乗�る���果�複雑��り��"
 
-#: utils/misc/guc.c:1709
-msgid ""
-"Write a message to the server log if checkpoints caused by the filling of "
-"checkpoint segment files happens more frequently than this number of "
-"seconds. Zero turns off the warning."
-msgstr ""
-"�ェック�イントセグメントファイル�溢れる���原因�起�る�ェック�イント"
-"�����指定��秒数よりも頻��発生�る場��サー�ログ�メッセージを書�"
-"出���。 デフォルト�30秒��。 ゼロ���警告を無効����。 "
+#: utils/adt/float.c:1415 utils/adt/float.c:1445 utils/adt/numeric.c:5401
+msgid "cannot take logarithm of zero"
+msgstr "ゼロ�対数を�る�������ん"
 
-#: utils/misc/guc.c:1720
-msgid "Sets the number of disk-page buffers in shared memory for WAL."
-msgstr ""
-"共有メモリ内�割り当�られ��WALデータ用�ディスクページ�ッファ数��。"
+#: utils/adt/float.c:1419 utils/adt/float.c:1449 utils/adt/numeric.c:5405
+msgid "cannot take logarithm of a negative number"
+msgstr "負�値�対数を�る�������ん"
 
-#: utils/misc/guc.c:1730
-msgid "WAL writer sleep time between WAL flushes."
-msgstr "WAL��出��間�WALライタ�待機�る時間��。"
+#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
+#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
+#: utils/adt/float.c:1604 utils/adt/float.c:1625
+msgid "input is out of range"
+msgstr "入力�範囲外��"
 
-#: utils/misc/guc.c:1741
-msgid "Sets the maximum number of simultaneously running WAL sender processes."
-msgstr "WAL sender プロセス�最大�時実行数を設定���。"
+#: utils/adt/float.c:2687 utils/adt/numeric.c:1171
+msgid "count must be greater than zero"
+msgstr "カウント�0より大����れ��り��ん"
 
-#: utils/misc/guc.c:1750
-msgid "WAL sender sleep time between WAL replications."
-msgstr "WAL レプリケーション�間�WAL sender �待機�る時間��。"
+#: utils/adt/float.c:2692 utils/adt/numeric.c:1178
+msgid "operand, lower bound and upper bound cannot be NaN"
+msgstr "オペランド�下��上�をNaN��る�������ん"
 
-#: utils/misc/guc.c:1760
-msgid ""
-"Sets the delay in microseconds between transaction commit and flushing WAL "
-"to disk."
-msgstr ""
-"トランザクション�コミット�らWAL�ッファ�ディスク��出�����延時間をマ"
-"イクロ秒���設定���。"
+#: utils/adt/float.c:2698
+msgid "lower and upper bounds must be finite"
+msgstr "下��よ�上��有����れ��り��ん"
 
-#: utils/misc/guc.c:1770
-msgid ""
-"Sets the minimum concurrent open transactions before performing commit_delay."
-msgstr ""
-"commit_delay�延�実行��必���る��時�開���るトランザクション�最�"
-"数を設定���。"
+#: utils/adt/float.c:2736 utils/adt/numeric.c:1191
+msgid "lower bound cannot equal upper bound"
+msgstr "下�を上���������ん"
 
-#: utils/misc/guc.c:1780
-msgid "Sets the number of digits displayed for floating-point values."
-msgstr "浮動�数点値�表示�数を設定���。"
+#: utils/adt/oracle_compat.c:184 utils/adt/oracle_compat.c:282
+#: utils/adt/oracle_compat.c:758 utils/adt/oracle_compat.c:1048
+#: utils/adt/genfile.c:117
+msgid "requested length too large"
+msgstr "�求��長��長����"
 
-#: utils/misc/guc.c:1781
-msgid ""
-"This affects real, double precision, and geometric data types. The parameter "
-"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
-"appropriate)."
-msgstr ""
-"��パラメータ��real�double precision�幾何データ型�影響���。パラメー"
-"タ値�標準的��数(FLT_DIG も��� DBL_DIG��ら��切�方)�追加�れ��。"
+#: utils/adt/oracle_compat.c:895
+msgid "requested character too large"
+msgstr "�求��文字�長����"
 
-#: utils/misc/guc.c:1791
-msgid "Sets the minimum execution time above which statements will be logged."
-msgstr "ログを�る文�������最��文実行時間を設定���。"
+#: utils/adt/oracle_compat.c:941 utils/adt/oracle_compat.c:995
+#, c-format
+msgid "requested character too large for encoding: %d"
+msgstr "�求��文字�符�化方���長����: %d"
 
-#: utils/misc/guc.c:1793
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr ""
-"ゼロ��る��全�������を出力���。-1���機能を無効����。"
+#: utils/adt/oracle_compat.c:988
+msgid "null character not permitted"
+msgstr "NULL文字�許�れ��ん"
 
-#: utils/misc/guc.c:1802
-msgid ""
-"Sets the minimum execution time above which autovacuum actions will be "
-"logged."
-msgstr "自動�キューム�活動をログ��る文場��最��実行時間を設定���。"
+#: utils/adt/arrayutils.c:209
+msgid "typmod array must be type cstring[]"
+msgstr "typmod�列�cstring[]型���れ��り��ん"
 
-#: utils/misc/guc.c:1804
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr ""
-"ゼロ�����活動を出力���。-1�自動�キューム�ログ記録を無効����。"
+#: utils/adt/arrayutils.c:214
+msgid "typmod array must be one-dimensional"
+msgstr "typmod�列�1次元��列���れ��り��ん"
 
-#: utils/misc/guc.c:1813
-msgid "Background writer sleep time between rounds."
-msgstr "�ックグランドライタ�動作周期�待機時間"
+#: utils/adt/arrayutils.c:219
+msgid "typmod array must not contain nulls"
+msgstr "typmod�列��NULL値を��������ん"
 
-#: utils/misc/guc.c:1823
-msgid "Background writer maximum number of LRU pages to flush per round."
-msgstr "�ックグランドライタ�1周期���出�最大LRUページ数"
+#: utils/adt/trigfuncs.c:41
+msgid "suppress_redundant_updates_trigger: must be called as trigger"
+msgstr ""
+"suppress_redundant_updates_trigger: トリガー���呼�れ��れ��り��ん"
 
-#: utils/misc/guc.c:1838
-msgid ""
-"Number of simultaneous requests that can be handled efficiently by the disk "
-"subsystem."
-msgstr "ディスクサブシステム�よ���分処��能��時並行リクエスト数"
+#: utils/adt/trigfuncs.c:47
+msgid "suppress_redundant_updates_trigger: must be called on update"
+msgstr ""
+"suppress_redundant_updates_trigger: update 時�呼�れ��れ��り��ん"
 
-#: utils/misc/guc.c:1839
-msgid ""
-"For RAID arrays, this should be approximately the number of drive spindles "
-"in the array."
+#: utils/adt/trigfuncs.c:53
+msgid "suppress_redundant_updates_trigger: must be called before update"
 msgstr ""
-"RAID アレイ����れ���む�アレイ中�ドライブ�スピンドル数��り��"
+"suppress_redundant_updates_trigger: update ��呼�れ��れ��り��ん"
 
-#: utils/misc/guc.c:1852
-msgid "Automatic log file rotation will occur after N minutes."
-msgstr "ログファイル�自動ローテーション�N秒後�起�り��"
+#: utils/adt/trigfuncs.c:59
+msgid "suppress_redundant_updates_trigger: must be called for each row"
+msgstr "suppress_redundant_updates_trigger: �行���呼�れ��れ��り��ん"
 
-#: utils/misc/guc.c:1862
-msgid "Automatic log file rotation will occur after N kilobytes."
-msgstr "ログファイル�自動ローテーション�Nキロ�イト後�起�り��"
+#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
+#, c-format
+msgid "invalid input syntax for type oid: \"%s\""
+msgstr "型oid�入力構文�無効��: \"%s\""
 
-#: utils/misc/guc.c:1872
-msgid "Shows the maximum number of function arguments."
-msgstr "関数�引数�最大数を示���。"
+#: utils/adt/oid.c:69 utils/adt/oid.c:107
+#, c-format
+msgid "value \"%s\" is out of range for type oid"
+msgstr "値\"%s\"�型oid�範囲外��"
 
-#: utils/misc/guc.c:1882
-msgid "Shows the maximum number of index keys."
-msgstr "インデックスキー�最大数を示���。"
+#: utils/adt/oid.c:287
+msgid "invalid oidvector data"
+msgstr "oidvectorデータ�無効��"
 
-#: utils/misc/guc.c:1892
-msgid "Shows the maximum identifier length."
-msgstr "識別��最大長を示���。"
+#: utils/adt/bool.c:153
+#, c-format
+msgid "invalid input syntax for type boolean: \"%s\""
+msgstr "boolean型��入力構文�無効��: \"%s\""
 
-#: utils/misc/guc.c:1902
-msgid "Shows the size of a disk block."
-msgstr "ディスクブロックサイズを示���。"
+#: utils/adt/datetime.c:1186 utils/adt/datetime.c:1934 utils/adt/date.c:142
+msgid "date/time value \"current\" is no longer supported"
+msgstr "日付時刻�値\"current\"�も�サ�ート�れ����ん"
 
-#: utils/misc/guc.c:1912
-msgid "Shows the number of pages per disk file."
-msgstr "ディスクファイル���ページ数を表示���。"
+#: utils/adt/datetime.c:3532 utils/adt/datetime.c:3539
+#, c-format
+msgid "date/time field value out of range: \"%s\""
+msgstr "日付時刻�フィールド�範囲外��: \"%s\""
 
-#: utils/misc/guc.c:1922
-msgid "Shows the block size in the write ahead log."
-msgstr "先行書�込�ログ(WAL)���るブロックサイズを表示���"
+#: utils/adt/datetime.c:3541
+msgid "Perhaps you need a different \"datestyle\" setting."
+msgstr "他�\"datestyle\"設定�必��も�れ��ん。"
 
-#: utils/misc/guc.c:1932
-msgid "Shows the number of pages per write ahead log segment."
-msgstr "先行書�込�ログ(WAL)セグメント���ページ数を表示���"
+#: utils/adt/datetime.c:3546
+#, c-format
+msgid "interval field value out of range: \"%s\""
+msgstr "intervalフィールド�値�範囲外��: \"%s\""
 
-#: utils/misc/guc.c:1945
-msgid "Time to sleep between autovacuum runs."
-msgstr "自動�キューム�待機間隔）。"
+#: utils/adt/datetime.c:3552
+#, c-format
+msgid "time zone displacement out of range: \"%s\""
+msgstr "時間帯�置��範囲外��: \"%s\""
 
-#: utils/misc/guc.c:1954
-msgid "Minimum number of tuple updates or deletes prior to vacuum."
-msgstr "�キュームを行�����タプルを更新���削除��回数�最�値。"
+#: utils/adt/encode.c:55 utils/adt/encode.c:91
+#, c-format
+msgid "unrecognized encoding: \"%s\""
+msgstr "符�化方���明��: \"%s\""
 
-#: utils/misc/guc.c:1962
-msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
-msgstr "解��る����タプルを挿入�更新�削除��回数�最�値。"
+#: utils/adt/encode.c:150
+#, c-format
+msgid "invalid hexadecimal digit: \"%c\""
+msgstr "16進数表��無効��: \"%c\""
 
-#: utils/misc/guc.c:1971
-msgid ""
-"Age at which to autovacuum a table to prevent transaction ID wraparound."
-msgstr ""
-"トランザクションID周回を防����テーブルを自動�キューム�る年代��。"
+#: utils/adt/encode.c:178
+msgid "invalid hexadecimal data: odd number of digits"
+msgstr "16進数データ�無効��: ����数値表���"
 
-#: utils/misc/guc.c:1981
-msgid ""
-"Sets the maximum number of simultaneously running autovacuum worker "
-"processes."
-msgstr "自動�キューム�ワーカプロセス�最大�時実行数を設定���。"
+#: utils/adt/encode.c:295
+msgid "unexpected \"=\""
+msgstr "\"=\"�想定外��"
 
-#: utils/misc/guc.c:1990
-msgid "Time between issuing TCP keepalives."
-msgstr "TCPキープアライブを発行�る間隔。"
+#: utils/adt/encode.c:307
+msgid "invalid symbol"
+msgstr "シンボル�無効��"
 
-#: utils/misc/guc.c:1991 utils/misc/guc.c:2001
-msgid "A value of 0 uses the system default."
-msgstr "ゼロ���値�システム�デフォルトを使用���。"
+#: utils/adt/encode.c:327
+msgid "invalid end sequence"
+msgstr "終了シーケンス�無効��"
 
-#: utils/misc/guc.c:2000
-msgid "Time between TCP keepalive retransmits."
-msgstr "TCPキープアライブを��信�る���時間。"
+#: utils/adt/encode.c:441 utils/adt/encode.c:506 utils/adt/varlena.c:246
+#: utils/adt/varlena.c:287
+msgid "invalid input syntax for type bytea"
+msgstr "bytea型�入力構文�無効��"
 
-#: utils/misc/guc.c:2010
-msgid ""
-"Set the amount of traffic to send and receive before renegotiating the "
-"encryption keys."
-msgstr ""
-"暗�化キーを��ゴシエート�る����信�るトラフィック�をセット������。"
+#: utils/adt/tsvector_op.c:1149
+msgid "ts_stat query must return one tsvector column"
+msgstr "ts_stat�1��tsvector列��を返���れ��り��ん"
 
-#: utils/misc/guc.c:2020
-msgid "Maximum number of TCP keepalive retransmits."
-msgstr "TCPキープアライブ��利用数�最大数��。"
+#: utils/adt/tsvector_op.c:1329
+#, c-format
+msgid "tsvector column \"%s\" does not exist"
+msgstr "tsvector列\"%s\"�存在���ん"
 
-#: utils/misc/guc.c:2021
-msgid ""
-"This controls the number of consecutive keepalive retransmits that can be "
-"lost before a connection is considered dead. A value of 0 uses the system "
-"default."
-msgstr ""
-"�れ��接続�������������失�れる�能性��る�連続的�キープ"
-"ã‚¢\n"
-"ライブ��利用数をを制御���。0���値�システム�デフォルトを使用���。"
+#: utils/adt/tsvector_op.c:1335
+#, c-format
+msgid "column \"%s\" is not of tsvector type"
+msgstr "値\"%s\"�型tsvector���り��ん"
 
-#: utils/misc/guc.c:2031
-msgid "Sets the maximum allowed result for exact search by GIN."
-msgstr "GIN�よる正確�検索�対��許�れる最大��果数を設定���。"
+#: utils/adt/tsvector_op.c:1347
+#, c-format
+msgid "configuration column \"%s\" does not exist"
+msgstr "設定列\"%s\"�存在���ん"
 
-#: utils/misc/guc.c:2041
-msgid "Sets the planner's assumption about the size of the disk cache."
-msgstr "ディスクキャッシュ�サイズ�関�るプランナ�推測を設定���。"
+#: utils/adt/tsvector_op.c:1353
+#, c-format
+msgid "column \"%s\" is not of regconfig type"
+msgstr "%s列�regconfig型���り��ん"
 
-#: utils/misc/guc.c:2042
-msgid ""
-"That is, the portion of the kernel's disk cache that will be used for "
-"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
-"kB each."
-msgstr ""
-"��り�PostgreSQL�データファイル用�使用�れるカー�ル�ディスクキャッシュ"
-"����。�れ�通常8KB�ディスクページを������。"
+#: utils/adt/tsvector_op.c:1360
+#, c-format
+msgid "configuration column \"%s\" must not be null"
+msgstr "設定列\"%s\"をNULL��る�������ん"
 
-#: utils/misc/guc.c:2054
-msgid "Shows the server version as an integer."
-msgstr "サー���ージョンを整数値�表示���。"
+#: utils/adt/tsvector_op.c:1373
+#, c-format
+msgid "text search configuration name \"%s\" must be schema-qualified"
+msgstr "テキスト検索設定�称\"%s\"�スキーマ修飾���れナ�り��ん"
 
-#: utils/misc/guc.c:2064
-msgid "Log the use of temporary files larger than this number of kilobytes."
-msgstr ""
-"キロ�イト�����数値ｙり大��一時ファイル�使用をログ�記録���。"
+#: utils/adt/tsvector_op.c:1398
+#, c-format
+msgid "column \"%s\" is not of a character type"
+msgstr "カラム \"%s\" �文字型���り��ん"
+
+#: utils/adt/tsquery_rewrite.c:296
+msgid "ts_rewrite query must return two tsquery columns"
+msgstr "ts_rewrite������2列�tsquery列を返���れ��り��ん"
 
-#: utils/misc/guc.c:2065
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
-msgstr ""
-"ゼロ��る��全��ファイルを出力���。デフォルト�-1��。(��機能を無効"
-"����。)"
+#: utils/adt/ascii.c:75
+#, c-format
+msgid "encoding conversion from %s to ASCII not supported"
+msgstr "%s符�化方��らASCII��変��サ�ート�れ����ん"
 
-#: utils/misc/guc.c:2074
-msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
-msgstr ""
-"pg_stat_activity.current_query �予約�れ��るサイズを�イト���指定���"
-"���"
+#: utils/adt/ascii.c:126 commands/dbcommands.c:235
+#, c-format
+msgid "%s is not a valid encoding name"
+msgstr "%s�有効�符�化方�����り��ん"
 
-#: utils/misc/guc.c:2092
-msgid ""
-"Sets the planner's estimate of the cost of a sequentially fetched disk page."
-msgstr ""
-"プランナ�シーケンシャル��り��れ�ディスクページ�コスト�概算を設定��"
-"�。"
+#: utils/adt/ascii.c:144 commands/dbcommands.c:225
+#, c-format
+msgid "%d is not a valid encoding code"
+msgstr "%d�有効�符�化方�コード���り��ん"
 
-#: utils/misc/guc.c:2101
-msgid ""
-"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
-"page."
-msgstr ""
-"プランナ�順����り��れ�ディスクページ�コスト�概算を設定���。"
+#: utils/adt/ri_triggers.c:409 utils/adt/ri_triggers.c:2839
+#: utils/adt/ri_triggers.c:3537 utils/adt/ri_triggers.c:3569
+#, c-format
+msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
+msgstr "テーブル\"%s\"��挿入�更新�外部キー制約\"%s\"��������"
 
-#: utils/misc/guc.c:2110
-msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
-msgstr "プランナ��タプル(行)を処��るコストを設定���。"
+#: utils/adt/ri_triggers.c:412 utils/adt/ri_triggers.c:2842
+msgid "MATCH FULL does not allow mixing of null and nonnull key values."
+msgstr "MACTH FULL��NULLキー値��NULLキー値を混在����ん"
 
-#: utils/misc/guc.c:2119
-msgid ""
-"Sets the planner's estimate of the cost of processing each index entry "
-"during an index scan."
-msgstr ""
-"プランナ�インデックススキャン時��れ�れ�インデックス項目を処��る���"
-"概算コストを設定���。 "
+#: utils/adt/ri_triggers.c:3082 commands/constraint.c:59
+#, c-format
+msgid "function \"%s\" was not called by trigger manager"
+msgstr "関数\"%s\"�トリガ関数���呼�出�れ����ん"
 
-#: utils/misc/guc.c:2128
-msgid ""
-"Sets the planner's estimate of the cost of processing each operator or "
-"function call."
-msgstr ""
-"プランナ���演算�呼�出���関数呼�出�を処��る概算コストを設定��"
-"�。"
+#: utils/adt/ri_triggers.c:3091 commands/constraint.c:66
+#, c-format
+msgid "function \"%s\" must be fired AFTER ROW"
+msgstr "関数\"%s\"をAFTER ROW�発行���れ��り��ん"
 
-#: utils/misc/guc.c:2138
-msgid ""
-"Sets the planner's estimate of the fraction of a cursor's rows that will be "
-"retrieved."
-msgstr "�り出�れるカーソル行�割������プランナ�予測値を設定���。"
+#: utils/adt/ri_triggers.c:3099
+#, c-format
+msgid "function \"%s\" must be fired for INSERT"
+msgstr "関数\"%s\"をINSERT�発行���れ��り��ん"
 
-#: utils/misc/guc.c:2148
-msgid "GEQO: selective pressure within the population."
-msgstr "GEQO: 個体群内��択圧力��。"
+#: utils/adt/ri_triggers.c:3105
+#, c-format
+msgid "function \"%s\" must be fired for UPDATE"
+msgstr "関数\"%s\"をUPDATE�発行���れ��り��ん"
 
-#: utils/misc/guc.c:2157
-msgid "GEQO: seed for random path selection."
-msgstr "GEQO: 乱数パス�択用�シード"
+#: utils/adt/ri_triggers.c:3112 commands/constraint.c:80
+#, c-format
+msgid "function \"%s\" must be fired for INSERT or UPDATE"
+msgstr "関数\"%s\"をINSERT���UPDATE�発行���れ��り��ん"
 
-#: utils/misc/guc.c:2166
-msgid "Multiple of the average buffer usage to free per round."
-msgstr "１周���開放�る����ッファ�使用�平��掛�る�数"
+#: utils/adt/ri_triggers.c:3119
+#, c-format
+msgid "function \"%s\" must be fired for DELETE"
+msgstr "関数\"%s\"をDELETE�発行���れ��り��ん"
 
-#: utils/misc/guc.c:2175
-msgid "Sets the seed for random-number generation."
-msgstr "ランダム生�用�シードを設定���。"
+#: utils/adt/ri_triggers.c:3148
+#, c-format
+msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
+msgstr "テーブル\"%2$s\"�トリガ\"%1$s\"用�pg_constraint項目��り��ん"
 
-#: utils/misc/guc.c:2185
+#: utils/adt/ri_triggers.c:3150
 msgid ""
-"Number of tuple updates or deletes prior to vacuum as a fraction of "
-"reltuples."
+"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
+"ADD CONSTRAINT."
 msgstr ""
-"reltuples�一部����キュームを行�����タプル�更新���削除回数。"
+"���照整�性トリガ���対象を削除��ALTER TABLE ADD CONSTRAINTを実行��"
+"����"
 
-#: utils/misc/guc.c:2193
+#: utils/adt/ri_triggers.c:3504
+#, c-format
 msgid ""
-"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
-"of reltuples."
+"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
+"unexpected result"
 msgstr ""
-"reltuples�一部���解�を行�����タプル�挿入�更新���削除回数。"
+"\"%3$s\"�制約\"%2$s\"�ら\"%1$s\"�行�れ��照整�性������想定外��"
+"果��り���"
 
-#: utils/misc/guc.c:2202
-msgid ""
-"Time spent flushing dirty buffers during checkpoint, as fraction of "
-"checkpoint interval."
-msgstr ""
-"�ェック�イント���るダーティ�ッファ���出�����時間（�ェック\n"
-"�イント間隔���る割�）。"
+#: utils/adt/ri_triggers.c:3508
+msgid "This is most likely due to a rule having rewritten the query."
+msgstr "�れ���ん��場��������を書���るルール�原因��"
 
-#: utils/misc/guc.c:2220
-msgid "Sets the shell command that will be called to archive a WAL file."
-msgstr "WALファイル��管����呼�出�れるシェルスクリプトを設定���。"
+#: utils/adt/ri_triggers.c:3539
+#, c-format
+msgid "No rows were found in \"%s\"."
+msgstr "\"%s\"�行��り��ん���"
 
-#: utils/misc/guc.c:2229
-msgid "Sets the client's character set encoding."
-msgstr "クライアント�文字セット符�化方�を設定���。"
+#: utils/adt/ri_triggers.c:3571
+#, c-format
+msgid "Key (%s)=(%s) is not present in table \"%s\"."
+msgstr "テーブル\"%3$s\"�キー(%1$s)=(%2$s)��り��ん"
 
-#: utils/misc/guc.c:2239
-msgid "Controls information prefixed to each log line."
-msgstr "�ログ行���付�る情報を制御���。"
+#: utils/adt/ri_triggers.c:3577
+#, c-format
+msgid ""
+"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
+"table \"%s\""
+msgstr ""
+"テーブル\"%1$s\"�更新���削除��テーブル\"%3$s\"�外部キー制約\"%2$s\"�"
+"�����"
 
-#: utils/misc/guc.c:2240
-msgid "If blank, no prefix is used."
-msgstr "も�空��れ�接頭辞��り��ん"
+#: utils/adt/ri_triggers.c:3580
+#, c-format
+msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
+msgstr "キー(%s)=(%s)���テーブル\"%s\"�ら�照�れ����"
 
-#: utils/misc/guc.c:2248
-msgid "Sets the time zone to use in log messages."
-msgstr "ログメッセージ���割れる時間帯を設定���。"
+#: utils/adt/enum.c:48 utils/adt/enum.c:58 utils/adt/enum.c:113
+#: utils/adt/enum.c:123
+#, c-format
+msgid "invalid input value for enum %s: \"%s\""
+msgstr "列挙型%s�入力構文�無効��: \"%s\""
 
-#: utils/misc/guc.c:2257
-msgid "Sets the display format for date and time values."
-msgstr "日付時刻値�表示用書�を設定���。"
+#: utils/adt/enum.c:85 utils/adt/enum.c:148 utils/adt/enum.c:198
+#, c-format
+msgid "invalid internal value for enum: %u"
+msgstr "列挙型用�内部値�無効��: %u"
 
-#: utils/misc/guc.c:2258
-msgid "Also controls interpretation of ambiguous date inputs."
-msgstr "曖昧�日付�入力�解釈も制御���。"
+#: utils/adt/enum.c:357 utils/adt/enum.c:386 utils/adt/enum.c:426
+#: utils/adt/enum.c:446
+msgid "could not determine actual enum type"
+msgstr "実際�列挙型を決定����ん���"
 
-#: utils/misc/guc.c:2268
-msgid "Sets the default tablespace to create tables and indexes in."
-msgstr ""
-"テーブル�インデックス�作�先��るデフォルト�テーブル空間を設定���。"
+#: utils/adt/enum.c:365 utils/adt/enum.c:394
+#, c-format
+msgid "enum %s contains no values"
+msgstr "列挙型 %s �値��り��ん"
 
-#: utils/misc/guc.c:2269
-msgid "An empty string selects the database's default tablespace."
-msgstr "空文字列�データベース�デフォルト�テーブル空間を�択���。"
+#: utils/adt/formatting.c:492
+msgid "invalid format specification for an interval value"
+msgstr "\"tinterval\"値�書�指定�無効��"
 
-#: utils/misc/guc.c:2278
-msgid "Sets the tablespace(s) to use for temporary tables and sort files."
-msgstr "一時テーブル�ファイル�ソート�使用�れるテーブル空間を設定���。"
+#: utils/adt/formatting.c:493
+msgid "Intervals are not tied to specific calendar dates."
+msgstr "時間間隔�特定�暦日付���������ん"
 
-#: utils/misc/guc.c:2288
-msgid "Sets the path for dynamically loadable modules."
-msgstr "動的ロード�能モジュール�パスを設定���。"
+#: utils/adt/formatting.c:1060
+msgid "\"EEEE\" must be the last pattern used"
+msgstr "\"EEEE\" �最終パターン���れ��り��ん。"
 
-#: utils/misc/guc.c:2289
-msgid ""
-"If a dynamically loadable module needs to be opened and the specified name "
-"does not have a directory component (i.e., the name does not contain a "
-"slash), the system will search this path for the specified file."
-msgstr ""
-"オープン�る必���る動的ロード�能�モジュール�����指定�れ�ファイル"
-"��ディレクトリ�素���(��り����スラッシュ���れ��)場��システ"
-"ム�指定�れ�ファイルを��パス�ら検索���。 "
+#: utils/adt/formatting.c:1068
+msgid "\"9\" must be ahead of \"PR\""
+msgstr "\"9\"�\"PR\"�����れ��り��ん"
 
-#: utils/misc/guc.c:2301
-msgid "Sets the location of the Kerberos server key file."
-msgstr "Kerberosサー�キーファイル�場所を設定���。"
+#: utils/adt/formatting.c:1084
+msgid "\"0\" must be ahead of \"PR\""
+msgstr "\"0\"�\"PR\"�����れ��り��ん"
 
-#: utils/misc/guc.c:2311
-msgid "Sets the name of the Kerberos service."
-msgstr "Kerberosサービス�を設定���。"
+#: utils/adt/formatting.c:1110
+msgid "multiple decimal points"
+msgstr "複数��数点��り��"
 
-#: utils/misc/guc.c:2320
-msgid "Sets the Bonjour service name."
-msgstr "Bonjour サービス�を設定���。"
+#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+msgid "cannot use \"V\" and decimal point together"
+msgstr "\"V\"��数点を混在����ん"
 
-#: utils/misc/guc.c:2331
-msgid "Shows the collation order locale."
-msgstr "テキストデータ�ソート時�使用�れるロケールを表示���。"
+#: utils/adt/formatting.c:1126
+msgid "cannot use \"S\" twice"
+msgstr "\"S\" �１回��使用����ん"
 
-#: utils/misc/guc.c:2341
-msgid "Shows the character classification and case conversion locale."
-msgstr "文字クラス分類�大文字�文字変�を決定�るロケールを表示���。"
+#: utils/adt/formatting.c:1130
+msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
+msgstr "\"S\"�\"PL\"/\"MI\"/\"SG\"/\"PR\"を混在����ん"
 
-#: utils/misc/guc.c:2351
-msgid "Sets the language in which messages are displayed."
-msgstr "表示用メッセージ�言語を設定���。"
+#: utils/adt/formatting.c:1150
+msgid "cannot use \"S\" and \"MI\" together"
+msgstr "\"S\"�\"MI\"を混在����ん"
 
-#: utils/misc/guc.c:2360
-msgid "Sets the locale for formatting monetary amounts."
-msgstr "通貨書��使用�るロケールを設定���。 "
+#: utils/adt/formatting.c:1160
+msgid "cannot use \"S\" and \"PL\" together"
+msgstr "\"S\"�\"PL\"を混在����ん"
 
-#: utils/misc/guc.c:2369
-msgid "Sets the locale for formatting numbers."
-msgstr "数字�書��使用�るロケールを設定���。"
+#: utils/adt/formatting.c:1170
+msgid "cannot use \"S\" and \"SG\" together"
+msgstr "\"S\"�\"SG\"を混在����ん"
 
-#: utils/misc/guc.c:2378
-msgid "Sets the locale for formatting date and time values."
-msgstr "日付�時間�書��使用�るロケールを設定���。"
+#: utils/adt/formatting.c:1179
+msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
+msgstr "\"PR\"�\"S\"/\"PL\"/\"MI\"/\"SG\"を混在����ん"
 
-#: utils/misc/guc.c:2387
-msgid "Lists shared libraries to preload into server."
-msgstr "サー��事�ロード�る共有ライブラリを列挙���。"
+#: utils/adt/formatting.c:1205
+msgid "cannot use \"EEEE\" twice"
+msgstr "\"EEEE\" �１回��使用����ん"
 
-#: utils/misc/guc.c:2397
-msgid "Lists shared libraries to preload into each backend."
-msgstr "��ックエンド�事�ロード�る共有ライブラリを列挙���。"
+#: utils/adt/formatting.c:1211
+msgid "\"EEEE\" is incompatible with other formats"
+msgstr "\"EEEE\" �他�フォーマット�互�性��り��ん。"
 
-#: utils/misc/guc.c:2407
-msgid "Sets the schema search order for names that are not schema-qualified."
-msgstr "スキーマ部を�������対�るスキーマ�検索順を設定���。"
+#: utils/adt/formatting.c:1212
+msgid ""
+"\"EEEE\" may only be used together with digit and decimal point patterns."
+msgstr "\"EEEE\" �数値����数点パターン�共�指定������。"
 
-#: utils/misc/guc.c:2418
-msgid "Sets the server (database) character set encoding."
-msgstr "サー�(データベース)文字セット符�化方�を設定���。"
+#: utils/adt/formatting.c:1412
+#, c-format
+msgid "\"%s\" is not a number"
+msgstr "\"%s\"�数値���り��ん"
 
-#: utils/misc/guc.c:2429
-msgid "Shows the server version."
-msgstr "サー���ージョンを表示���。"
+#: utils/adt/formatting.c:1519 utils/adt/formatting.c:1569
+#, 
+msgid "could not determine which collation to use for lower() function"
+msgstr "lower() 関数�対����照�順�を�用����を決定����ん���"
 
-#: utils/misc/guc.c:2440
-msgid "Sets the current role."
-msgstr "�在�ロールを設定���。"
+#: utils/adt/formatting.c:1640 utils/adt/formatting.c:1690
+#, 
+msgid "could not determine which collation to use for upper() function"
+msgstr "upper() 関数�対����照�順�を�用����を決定����ん���"
 
-#: utils/misc/guc.c:2451
-msgid "Sets the session user name."
-msgstr "セッションユーザ�を設定���。"
+#: utils/adt/formatting.c:1773 utils/adt/formatting.c:1835
+#, 
+msgid "could not determine which collation to use for initcap() function"
+msgstr "initcap() 関数�対����照�順�を�用����を決定����ん���"
 
-#: utils/misc/guc.c:2461
-msgid "Sets the destination for server log output."
-msgstr "サー�ログ�出力先を設定���。"
+#: utils/adt/formatting.c:2017
+msgid "invalid combination of date conventions"
+msgstr "日付表��組�����無効��"
 
-#: utils/misc/guc.c:2462
+#: utils/adt/formatting.c:2018
 msgid ""
-"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
-"\"eventlog\", depending on the platform."
+"Do not mix Gregorian and ISO week date conventions in a formatting template."
 msgstr ""
-"有効�値��プラットフォーム��存�����\"stderr\"�\"syslog\"�\"csvlog"
-"\"�\"eventlog\"�組������。"
+"書�テンプレート�中���グレゴリア暦� ISO �週日表�を混在�����り��"
+"ん。"
+
+#: utils/adt/formatting.c:2035
+#, c-format
+msgid "conflicting values for \"%s\" field in formatting string"
+msgstr "\"%s\" フィールド�値�書�文字列�競������"
+
+#: utils/adt/formatting.c:2037
+msgid "This value contradicts a previous setting for the same field type."
+msgstr "��値を��フィールド型��る���り�直��設定�矛盾�����"
+
+#: utils/adt/formatting.c:2098
+#, c-format
+msgid "source string too short for \"%s\" formatting field"
+msgstr "書�フィールド \"%s\" ��元�文字列�短����"
 
-#: utils/misc/guc.c:2472
-msgid "Sets the destination directory for log files."
-msgstr "ログファイル�格�ディレクトリを設定���。"
+#: utils/adt/formatting.c:2100
+#, c-format
+msgid "Field requires %d characters, but only %d remain."
+msgstr "フィールド�� %d 文字必�����%d 文字��残�����ん"
 
-#: utils/misc/guc.c:2473
-msgid "Can be specified as relative to the data directory or as absolute path."
-msgstr "データディレクトリ�ら�相対パス�も絶対パス�も指定����"
+#: utils/adt/formatting.c:2103 utils/adt/formatting.c:2117
+msgid ""
+"If your source string is not fixed-width, try using the \"FM\" modifier."
+msgstr "元�文字列�固定長���場���修飾� \"FM\" を試��������"
 
-#: utils/misc/guc.c:2482
-msgid "Sets the file name pattern for log files."
-msgstr "ログファイル�ファイル�パターンを設定���。"
+#: utils/adt/formatting.c:2113 utils/adt/formatting.c:2126
+#: utils/adt/formatting.c:2256
+#, c-format
+msgid "invalid value \"%s\" for \"%s\""
+msgstr " \"%2$s\" �セット�る���値 \"%1$s\" �無効��"
 
-#: utils/misc/guc.c:2493
-msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+#: utils/adt/formatting.c:2115
+#, c-format
+msgid "Field requires %d characters, but only %d could be parsed."
 msgstr ""
-"syslog内�PostgreSQL�メッセージを識別�る���使用�れるプログラム�を設定"
-"���。"
+"��フィールド�� %d 文字必�����%d 文字��検出�れ��ん���。"
 
-#: utils/misc/guc.c:2504
-msgid "Sets the time zone for displaying and interpreting time stamps."
-msgstr "タイムスタンプ�表示�解釈�使用�る時間帯を設定���。"
+#: utils/adt/formatting.c:2128
+msgid "Value must be an integer."
+msgstr "�ッシュプロシージャ�整数を返���れ��り��ん"
 
-#: utils/misc/guc.c:2513
-msgid "Selects a file of time zone abbreviations."
-msgstr "時間帯�略形用�ファイルを�択���。"
+#: utils/adt/formatting.c:2133
+#, c-format
+msgid "value for \"%s\" in source string is out of range"
+msgstr "も��文字列����  \"%s\" ����値�範囲外��"
 
-#: utils/misc/guc.c:2522
-msgid "Sets the current transaction's isolation level."
-msgstr "�在�トランザクション�隔離レベルを設定���。"
+#: utils/adt/formatting.c:2135
+#, c-format
+msgid "Value must be in the range %d to %d."
+msgstr "値� %d �ら %d ���範囲��る必���り��。"
 
-#: utils/misc/guc.c:2532
-msgid "Sets the owning group of the Unix-domain socket."
-msgstr "Unixドメインソケットを所有�るグループを設定���。"
+#: utils/adt/formatting.c:2258
+msgid "The given value did not match any of the allowed values for this field."
+msgstr "与�られ�値���項目�対��許�れる��れ�値�もマッ����ん"
 
-#: utils/misc/guc.c:2533
-msgid ""
-"The owning user of the socket is always the user that starts the server."
-msgstr "ソケットを所有�るユーザ�常�サー�を開始��ユーザ��。"
+#: utils/adt/formatting.c:2814
+msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
+msgstr "to_date �� \"TZ\"/\"tz\" 形��パターンをサ�ート�����ん"
 
-#: utils/misc/guc.c:2542
-msgid "Sets the directory where the Unix-domain socket will be created."
-msgstr "Unixドメインソケット�作�先ディレクトリを設定���。"
+#: utils/adt/formatting.c:2918
+msgid "invalid input string for \"Y,YYY\""
+msgstr " \"Y,YYY\" �セット�る���入力文字列�有効���り��ん"
 
-#: utils/misc/guc.c:2552
-msgid "Sets the host name or IP address(es) to listen to."
-msgstr "接続を監視�るホスト����IPアドレスを設定���。"
+#: utils/adt/formatting.c:3435
+#, c-format
+msgid "hour \"%d\" is invalid for the 12-hour clock"
+msgstr "12時間形��� \"%d\" 時�無効��"
 
-#: utils/misc/guc.c:2562
-msgid "Sets the list of known custom variable classes."
-msgstr "既知�カスタム変数クラス�リストを設定���。"
+#: utils/adt/formatting.c:3437
+msgid "Use the 24-hour clock, or give an hour between 1 and 12."
+msgstr "24時間形�を使���も��� 1 �ら 12 �間�指定������"
 
-#: utils/misc/guc.c:2572
-msgid "Sets the server's data directory."
-msgstr "サー��データディレクトリを設定���。"
+#: utils/adt/formatting.c:3475
+#, c-format
+msgid "inconsistent use of year %04d and \"BC\""
+msgstr "年%04d�\"BC\"�使用��一貫性��り��ん"
 
-#: utils/misc/guc.c:2582
-msgid "Sets the server's main configuration file."
-msgstr "サー��メイン設定ファイルを設定���。"
+#: utils/adt/formatting.c:3522
+msgid "cannot calculate day of year without year information"
+msgstr "年�情報����年内日数を計算����ん"
 
-#: utils/misc/guc.c:2592
-msgid "Sets the server's \"hba\" configuration file."
-msgstr "サー��\"hba\"設定ファイルを設定���。"
+#: utils/adt/formatting.c:4380
+msgid "\"EEEE\" not supported for input"
+msgstr "\"EEEE\" �入力��サ�ート�れ����ん"
 
-#: utils/misc/guc.c:2602
-msgid "Sets the server's \"ident\" configuration file."
-msgstr "サー��\"ident\"設定ファイルを設定���。"
+#: utils/adt/formatting.c:4392
+msgid "\"RN\" not supported for input"
+msgstr "\"RN\" �入力��サ�ート�れ����ん"
 
-#: utils/misc/guc.c:2612
-msgid "Writes the postmaster PID to the specified file."
-msgstr "postmaster�PIDを指定��ファイル�書�込���。"
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:189
+#, c-format
+msgid "could not open tablespace directory \"%s\": %m"
+msgstr "テーブル空間�ディレクトリ\"%s\"をオープン����ん���: %m"
 
-#: utils/misc/guc.c:2622
-msgid "Writes temporary statistics files to the specified directory."
-msgstr "一時的�統計情報ファイルを指定��ディレクトリ�書�込���。"
+#: utils/adt/tsrank.c:404
+msgid "array of weight must be one-dimensional"
+msgstr "���列�1次元��列���れ��り��ん"
 
-#: utils/misc/guc.c:2632
-msgid "Sets default text search configuration."
-msgstr "デフォルト�テキスト検索設定を設定���。"
+#: utils/adt/tsrank.c:409
+msgid "array of weight is too short"
+msgstr "���列�短����"
 
-#: utils/misc/guc.c:2642
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "SSL暗����許�れるリストを設定���。"
+#: utils/adt/tsrank.c:414
+msgid "array of weight must not contain nulls"
+msgstr "���列��NULL値を��������ん"
 
-#: utils/misc/guc.c:2653
-msgid "Sets the application name to be reported in statistics and logs."
-msgstr "統計やログ�報告�れるアプリケーション�を設定���。"
+#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
+msgid "weight out of range"
+msgstr "���範囲外��"
 
-#: utils/misc/guc.c:2672
-msgid "Sets whether \"\\'\" is allowed in string literals."
-msgstr "\"\\'\"��れ��集��文字列リテラル�許�れ����。"
+#: utils/adt/regexp.c:275 utils/adt/varlena.c:2866
+#, c-format
+msgid "regular expression failed: %s"
+msgstr "正�表��失敗����: %s"
 
-#: utils/misc/guc.c:2681
-msgid "Sets the output format for bytea."
-msgstr "bytea �出力フォーマットを設定���。"
+#: utils/adt/regexp.c:412
+#, c-format
+msgid "invalid regexp option: \"%c\""
+msgstr "正�表�オプション�無効��: \"%c\""
 
-#: utils/misc/guc.c:2690
-msgid "Sets the message levels that are sent to the client."
-msgstr "クライアント��信�れる最��メッセージレベルを設定���。"
+#: utils/adt/regexp.c:684 utils/adt/like_match.c:289
+msgid "invalid escape string"
+msgstr "エスケープシーケンス�無効��"
 
-#: utils/misc/guc.c:2691 utils/misc/guc.c:2740 utils/misc/guc.c:2750
-#: utils/misc/guc.c:2790
-msgid ""
-"Each level includes all the levels that follow it. The later the level, the "
-"fewer messages are sent."
-msgstr ""
-" �レベル����レベル以下�全����れ��。レベルを低��る����信�れ"
-"るメッセージ�より少���り��。 "
+#: utils/adt/regexp.c:685 utils/adt/like_match.c:290
+msgid "Escape string must be empty or one character."
+msgstr "エスケープ文字�空�1文字���れ��り��ん。"
 
-#: utils/misc/guc.c:2700
-msgid "Enables the planner to use constraints to optimize queries."
-msgstr "プランナ�よる������を最�化�る制約�使用を有効����。"
+#: utils/adt/regexp.c:884
+msgid "regexp_split does not support the global option"
+msgstr "regexp_split�グロー�ルオプションをサ�ート���ん"
 
-#: utils/misc/guc.c:2701
-msgid ""
-"Table scans will be skipped if their constraints guarantee that no rows "
-"match the query."
-msgstr ""
-"制約�より�������一致�る行�存在�������証�れ��る場��テー"
-"ブル�スキャンを行���ん。"
+#: utils/adt/xml.c:135
+msgid "unsupported XML feature"
+msgstr "未サ�ート�XML機能��。"
 
-#: utils/misc/guc.c:2711
-msgid "Sets the transaction isolation level of each new transaction."
-msgstr "新�トランザクション�トランザクション隔離レベルを設定���。"
+#: utils/adt/xml.c:136
+msgid "This functionality requires the server to be built with libxml support."
+msgstr "��機能�libxmlサ�ートを付��サー��必���。"
 
-#: utils/misc/guc.c:2720
-msgid "Sets the display format for interval values."
-msgstr "時刻インター�ル値�表示フォーマットを設定���。"
+#: utils/adt/xml.c:137
+msgid "You need to rebuild PostgreSQL using --with-libxml."
+msgstr "--with-libxmlを使用��PostgreSQLを�構築���れ��り��ん。"
 
-#: utils/misc/guc.c:2730
-msgid "Sets the verbosity of logged messages."
-msgstr "ログ出力メッセージ�詳細度を設定���。"
+#: utils/adt/xml.c:156 utils/mb/mbutils.c:515
+#, c-format
+msgid "invalid encoding name \"%s\""
+msgstr "符�化方��\"%s\"�無効��"
 
-#: utils/misc/guc.c:2739
-msgid "Sets the message levels that are logged."
-msgstr "ログ�出力�るメッセージレベルを設定���。"
+#: utils/adt/xml.c:402 utils/adt/xml.c:407
+msgid "invalid XML comment"
+msgstr "無効�XMLコメント��"
 
-#: utils/misc/guc.c:2749
-msgid ""
-"Causes all statements generating error at or above this level to be logged."
-msgstr "��レベル以上�エラーを発生���全��SQL文をログ�記録���。"
+#: utils/adt/xml.c:536
+msgid "not an XML document"
+msgstr "XML文書���り��ん"
 
-#: utils/misc/guc.c:2759
-msgid "Sets the type of statements logged."
-msgstr "ログ出力�る文�種類を設定���。"
+#: utils/adt/xml.c:689 utils/adt/xml.c:712
+msgid "invalid XML processing instruction"
+msgstr "無効�XML処�命令��"
 
-#: utils/misc/guc.c:2769
-msgid "Sets the syslog \"facility\" to be used when syslog enabled."
-msgstr "syslogを有効���場��使用�るsyslog \"facility\"を設定���。"
+#: utils/adt/xml.c:690
+#, c-format
+msgid "XML processing instruction target name cannot be \"%s\"."
+msgstr "XML処�命令�対象�を\"%s\"��る�������ん���。"
 
-#: utils/misc/guc.c:2779
-msgid "Sets the session's behavior for triggers and rewrite rules."
-msgstr "トリガ�書���ルール�関�るセッション�動作を設定���。"
+#: utils/adt/xml.c:713
+msgid "XML processing instruction cannot contain \"?>\"."
+msgstr "XML処�命令��\"?>\"を��る�������ん。"
 
-#: utils/misc/guc.c:2789
-msgid "Sets the message levels that are logged during recovery."
-msgstr "リカ�リー中�ログを�る��メッセージ�レベルを設定���。"
+#: utils/adt/xml.c:792
+msgid "xmlvalidate is not implemented"
+msgstr "XML �妥当性検査�実装�れ����ん"
 
-#: utils/misc/guc.c:2799
-msgid "Collects function-level statistics on database activity."
-msgstr "データベース�動作�関���関数レベル�統計情報を�集���。"
+#: utils/adt/xml.c:877
+msgid "could not initialize XML library"
+msgstr "XMLライブラリを�期化����ん���"
 
-#: utils/misc/guc.c:2808
-msgid "Set the level of information written to the WAL."
-msgstr "WAL �書�出�れる情報�レベルを設定���。"
+#: utils/adt/xml.c:878
+#, c-format
+msgid ""
+"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
+msgstr ""
+"libxml2�互�性���文字型を����: sizeof(char)=%u�sizeof(xmlChar)=%u"
 
-#: utils/misc/guc.c:2817
-msgid "Selects the method used for forcing WAL updates to disk."
-msgstr "強制的�WAL�更新をディスク���出����方法を�択���。"
+#: utils/adt/xml.c:1420
+msgid "Invalid character value."
+msgstr "文字�値�有効���り��ん"
 
-#: utils/misc/guc.c:2827
-msgid "Sets how binary values are to be encoded in XML."
-msgstr "��よ���イナリ値をXML�符�化�る�を設定���。"
+#: utils/adt/xml.c:1423
+msgid "Space required."
+msgstr "スペースを�������"
 
-#: utils/misc/guc.c:2836
-msgid ""
-"Sets whether XML data in implicit parsing and serialization operations is to "
-"be considered as documents or content fragments."
-msgstr ""
-"暗黙的�解��よ�シリアライゼーション�作����XMLデータを文書�����断"
-"片�����を設定���。"
+#: utils/adt/xml.c:1426
+msgid "standalone accepts only 'yes' or 'no'."
+msgstr "standalone �� 'yes' � 'no' ���有効��"
 
-#: utils/misc/guc.c:3608
-#, c-format
-msgid ""
-"%s does not know where to find the server configuration file.\n"
-"You must specify the --config-file or -D invocation option or set the PGDATA "
-"environment variable.\n"
-msgstr ""
-"%s�サー�設定ファイル�場所��識����ん。\n"
-"--config-file���-Dオプションを指定�る��る��PGDATA環境変数を設\n"
-"定�る必���り��。\n"
+#: utils/adt/xml.c:1429
+msgid "Malformed declaration: missing version."
+msgstr "宣言�誤�����：�ージョン��り��ん"
 
-#: utils/misc/guc.c:3627
-#, c-format
-msgid "%s cannot access the server configuration file \"%s\": %s\n"
-msgstr "%s�サー�設定ファイル\"%s\"�アクセス����ん: %s\n"
+#: utils/adt/xml.c:1432
+msgid "Missing encoding in text declaration."
+msgstr "テキスト宣言�エンコーディング�指定��り��ん"
 
-#: utils/misc/guc.c:3647
-#, c-format
-msgid ""
-"%s does not know where to find the database system data.\n"
-"This can be specified as \"data_directory\" in \"%s\", or by the -D "
-"invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s�データベースシステムデータ�場所を�識����ん。\n"
-"\"%s\"内�\"data_directory\"を指定�る�-Dオプションを指定�る�PGDATA環\n"
-"境変数�設定�る�������。\n"
+#: utils/adt/xml.c:1435
+msgid "Parsing XML declaration: '?>' expected."
+msgstr "XML 宣言�パース中： '>?' �必���。"
 
-#: utils/misc/guc.c:3678
+#: utils/adt/xml.c:1438
 #, c-format
-msgid ""
-"%s does not know where to find the \"hba\" configuration file.\n"
-"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
-"option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s�\"hba\"設定ファイル�場所を�識����ん。\n"
-"\"%s\"内�\"hba_directory\"を指定�る�-Dオプションを指定�る�PGDATA環\n"
-"境変数�設定�る�������。\n"
+msgid "Unrecognized libxml error code: %d."
+msgstr "libxml �エラーコードを�識����ん: %d"
 
-#: utils/misc/guc.c:3701
-#, c-format
-msgid ""
-"%s does not know where to find the \"ident\" configuration file.\n"
-"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
-"option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s�\"ident\"設定ファイル�場所を�識����ん。\n"
-"\"%s\"内�\"ident_directory\"を指定�る�-Dオプションを指定�る�PGDATA環\n"
-"境変数�設定�る�������。\n"
+#: utils/adt/xml.c:1689 utils/adt/date.c:217
+msgid "date out of range"
+msgstr "日付�範囲外��"
 
-#: utils/misc/guc.c:4306 utils/misc/guc.c:4470
-msgid "Value exceeds integer range."
-msgstr "値�整数範囲を超�����。"
+#: utils/adt/xml.c:1690
+msgid "XML does not support infinite date values."
+msgstr "XML�無��データ値をサ�ート���ん。"
 
-#: utils/misc/guc.c:4325
-msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
-msgstr "��パラメータ�有効���\"kB\"�\"MB\"�\"GB\"��。"
+#: utils/adt/xml.c:1713 utils/adt/xml.c:1740
+msgid "XML does not support infinite timestamp values."
+msgstr "XML�無��タイムスタンプ値をサ�ート���ん。"
+
+#: utils/adt/xml.c:2125
+msgid "invalid query"
+msgstr "無効��������"
+
+#: utils/adt/xml.c:3349
+msgid "invalid array for XML namespace mapping"
+msgstr "XML��空間マッピング用��列�無効��"
 
-#: utils/misc/guc.c:4384
+#: utils/adt/xml.c:3350
 msgid ""
-"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
-msgstr "��パラメータ�有効���\"ms\"�\"s\"�\"min\"�\"h\"�\"d\"��。"
+"The array must be two-dimensional with length of the second axis equal to 2."
+msgstr "�列�第2軸�長��2��2次元�列���れ��り��ん。"
 
-#: utils/misc/guc.c:4693 utils/misc/guc.c:5357 utils/misc/guc.c:5407
-#: utils/misc/guc.c:6111 utils/misc/guc.c:6270 utils/misc/guc.c:7492
-#: guc-file.l:217
-#, c-format
-msgid "unrecognized configuration parameter \"%s\""
-msgstr "設定パラメータ\"%s\"��明��"
+#: utils/adt/xml.c:3374
+msgid "empty XPath expression"
+msgstr "XPath��空��"
 
-#: utils/misc/guc.c:4720
-#, c-format
-msgid "parameter \"%s\" cannot be changed"
-msgstr "パラメータ\"%s\"を変更����ん"
+#: utils/adt/xml.c:3422
+msgid "neither namespace name nor URI may be null"
+msgstr "��空間����URI�も空�も�り��ん"
 
-#: utils/misc/guc.c:4737 utils/misc/guc.c:4745 guc-file.l:264
+#: utils/adt/xml.c:3429
 #, c-format
-msgid "parameter \"%s\" cannot be changed without restarting the server"
-msgstr "パラメータ \"%s\" を変更�る��サー�ー��起動�必���"
+msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
+msgstr "\"%s\"������XML��空間�よ�URI\"%s\"を登録����ん���。"
 
-#: utils/misc/guc.c:4755
+#: utils/adt/numutils.c:75
 #, c-format
-msgid "parameter \"%s\" cannot be changed now"
-msgstr "�在パラメータ\"%s\"を変更����ん"
+msgid "value \"%s\" is out of range for type integer"
+msgstr "値\"%s\"�型integer�範囲外��"
 
-#: utils/misc/guc.c:4786
+#: utils/adt/numutils.c:81
 #, c-format
-msgid "parameter \"%s\" cannot be set after connection start"
-msgstr "接続開始後�パラメータ\"%s\"を変更����ん"
+msgid "value \"%s\" is out of range for type smallint"
+msgstr "値\"%s\"�型smallint�範囲外��"
 
-#: utils/misc/guc.c:4796 utils/misc/guc.c:7507
+#: utils/adt/numutils.c:87
 #, c-format
-msgid "permission denied to set parameter \"%s\""
-msgstr "パラメータ\"%s\"を設定�る権���り��ん"
+msgid "value \"%s\" is out of range for 8-bit integer"
+msgstr "値\"%s\"�８ビット整数�範囲外��"
 
-#: utils/misc/guc.c:4834
-#, c-format
-msgid "cannot set parameter \"%s\" within security-definer function"
-msgstr "セキュリティー定義用関数内�パラメーター \"%s\" を設定����ん"
+#: utils/adt/tsgistidx.c:100
+msgid "gtsvector_in not implemented"
+msgstr "gtsvector_in�実装�れ����ん"
 
-#: utils/misc/guc.c:4891
-#, c-format
-msgid "parameter \"%s\" requires a Boolean value"
-msgstr "パラメータ\"%s\"�boolean値�必���"
+#: utils/adt/name.c:87 utils/adt/acl.c:166
+msgid "identifier too long"
+msgstr "識別��長����"
 
-#: utils/misc/guc.c:4913 utils/misc/guc.c:4988
+#: utils/adt/name.c:88 utils/adt/acl.c:167
 #, c-format
-msgid "invalid value for parameter \"%s\": %d"
-msgstr "パラメータ\"%s\"�値�無効��: %d"
+msgid "Identifier must be less than %d characters."
+msgstr "識別��%d文字より短���れ��り��ん。"
 
-#: utils/misc/guc.c:4957 utils/misc/guc.c:5159 utils/misc/guc.c:5225
-#: utils/misc/guc.c:5251 guc-file.l:178
+#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
 #, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "パラメータ\"%s\"�値�無効��: \"%s\""
+msgid "invalid input syntax for type tid: \"%s\""
+msgstr "型tid�入力構文�無効��: \"%s\""
 
-#: utils/misc/guc.c:4966
+#: utils/adt/tsquery.c:177
 #, c-format
-msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
-msgstr "%d�パラメータ\"%s\"�有効範囲を超�����(%d .. %d)"
+msgid "no operand in tsquery: \"%s\""
+msgstr "tsquery内�オペランド��り��ん\"%s\""
 
-#: utils/misc/guc.c:5030
+#: utils/adt/tsquery.c:250
 #, c-format
-msgid "parameter \"%s\" requires a numeric value"
-msgstr "パラメータ\"%s\"�数値�必���"
+msgid "value is too big in tsquery: \"%s\""
+msgstr "tsquery内�値�大�����: \"%s\""
 
-#: utils/misc/guc.c:5038
+#: utils/adt/tsquery.c:255
 #, c-format
-msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
-msgstr "%g�パラメータ\"%s\"�有効範囲を超�����(%g .. %g)"
+msgid "operand is too long in tsquery: \"%s\""
+msgstr "tsquery�オペランド�長����: \"%s\""
 
-#: utils/misc/guc.c:5060
+#: utils/adt/tsquery.c:283
 #, c-format
-msgid "invalid value for parameter \"%s\": %g"
-msgstr "パラメータ\"%s\"�値�無効��: %g"
+msgid "word is too long in tsquery: \"%s\""
+msgstr "tsquery内��語�長����: \"%s\""
 
-#: utils/misc/guc.c:5363 utils/misc/guc.c:5411 utils/misc/guc.c:6274
+#: utils/adt/tsquery.c:512
 #, c-format
-msgid "must be superuser to examine \"%s\""
-msgstr "\"%s\"を確��る��スーパーユーザ���れ��り��ん"
+msgid "text-search query doesn't contain lexemes: \"%s\""
+msgstr "テキスト検索������字��素を����ん: \"%s\""
 
-#: utils/misc/guc.c:5522
+#: utils/adt/varchar.c:48 utils/adt/varbit.c:56
 #, c-format
-msgid "SET %s takes only one argument"
-msgstr "SET %s�1��引数��を�り��"
+msgid "length for type %s must be at least 1"
+msgstr "型%s�長��最低�も1��"
 
-#: utils/misc/guc.c:5749
-msgid "SET requires parameter name"
-msgstr "SET��パラメータ��必���"
+#: utils/adt/varchar.c:52 utils/adt/varbit.c:61
+#, c-format
+msgid "length for type %s cannot exceed %d"
+msgstr "型%s�長��%dを超�られ��ん"
 
-#: utils/misc/guc.c:5864
+#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
 #, c-format
-msgid "attempt to redefine parameter \"%s\""
-msgstr "パラメータ\"%s\"を�定義�よ�������"
+msgid "value too long for type character(%d)"
+msgstr "値�型character(%d)����長����"
 
-#: utils/misc/guc.c:7208
+#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
 #, c-format
-msgid "could not parse setting for parameter \"%s\""
-msgstr "パラメータ\"%s\"�設定を解�����ん"
+msgid "value too long for type character varying(%d)"
+msgstr "値�型character varying(%d)����長����"
 
-#: utils/misc/guc.c:7551
-msgid "invalid list syntax for parameter \"log_destination\""
-msgstr "パラメータ\"log_destination\"�リスト構文�無効��"
+#: utils/adt/genfile.c:60
+msgid "reference to parent directory (\"..\") not allowed"
+msgstr "親ディレクトリ��照（\"..\"）�����ん"
 
-#: utils/misc/guc.c:7575
-#, c-format
-msgid "unrecognized \"log_destination\" key word: \"%s\""
-msgstr "\"log_destination\"キーワード��明��: \"%s\""
+#: utils/adt/genfile.c:71
+msgid "absolute path not allowed"
+msgstr "絶対経路�����ん"
 
-#: utils/misc/guc.c:7650
-msgid "SET AUTOCOMMIT TO OFF is no longer supported"
-msgstr "SET AUTOCOMMIT TO OFF�も�サ�ート�れ����ん"
+#: utils/adt/genfile.c:76
+msgid "path must be in or below the current directory"
+msgstr "パス�カレントディレクトリも������下���れ��り��ん"
 
-#: utils/misc/guc.c:7722
-msgid "assertion checking is not supported by this build"
-msgstr "��インストレーション��アサート検査�組�込�れ����ん"
+#: utils/adt/genfile.c:122 commands/copy.c:2193
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "ファイル\"%s\"を読��り用�オープン����ん���: %m"
 
-#: utils/misc/guc.c:7737
-msgid "Bonjour is not supported by this build"
-msgstr "��ビルド�� bonjour �サ�ート�れ����ん"
+#: utils/adt/genfile.c:129
+#, c-format
+msgid "could not seek in file \"%s\": %m"
+msgstr "ファイル\"%s\"をシーク����ん���: %m"
 
-#: utils/misc/guc.c:7752
-msgid "SSL is not supported by this build"
-msgstr "��インストレーション��SSL�サ�ート�れ����ん"
+#: utils/adt/genfile.c:179 utils/adt/genfile.c:203 utils/adt/genfile.c:224
+#: utils/adt/genfile.c:248
+msgid "must be superuser to read files"
+msgstr "ファイルを読�込む��スーパーユーザ���れ��り��ん"
 
-#: utils/misc/guc.c:7766
-msgid "cannot enable parameter when \"log_statement_stats\" is true"
-msgstr "\"log_statement_stats\"�真�場��パラメータを有効�����ん"
+#: utils/adt/genfile.c:186 utils/adt/genfile.c:231
+msgid "requested length cannot be negative"
+msgstr "負�長�を指定�る�������ん"
 
-#: utils/misc/guc.c:7782
-msgid ""
-"cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
-"\"log_planner_stats\", or \"log_executor_stats\" is true"
-msgstr ""
-"\"log_parser_stats\"�\"log_planner_stats\"�\"log_executor_stats\"�真�場"
-"��\"log_statement_stats\"を有効�����ん"
+#: utils/adt/genfile.c:272
+msgid "must be superuser to get file information"
+msgstr "ファイル情報を入手�る��スーパーユーザ���れ��り��ん"
 
-#: utils/misc/guc.c:7800
-msgid "cannot set transaction read-write mode inside a read-only transaction"
-msgstr ""
-"読��り���トランザクション�トランザクションモードを読�書�モード�設定"
-"�る�������ん"
+#: utils/adt/genfile.c:336
+msgid "must be superuser to get directory listings"
+msgstr "ディレクトリ一覧を得る��スーパーユーザ���れ��り��ん"
 
-#: utils/misc/guc.c:7811
-msgid "cannot set transaction read-write mode during recovery"
-msgstr "リカ�リー中��トランザクションを読�書�モード�設定����ん"
+#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4251 utils/adt/geo_ops.c:5172
+msgid "too many points requested"
+msgstr "�求�れ��イント�多����"
 
-#: utils/misc/help_config.c:131
-msgid "internal error: unrecognized run-time parameter type\n"
-msgstr "内部エラー: 実行時パラメータ種類��明��\n"
+#: utils/adt/geo_ops.c:317
+msgid "could not format \"path\" value"
+msgstr "\"path\"�値を整形����ん���"
 
-#: utils/misc/tzparser.c:63
+#: utils/adt/geo_ops.c:392
 #, c-format
-msgid ""
-"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
-"zone file \"%s\", line %d"
-msgstr ""
-"時間帯ファイル\"%3$s\"�%4$d行�時間帯�略形\"%1$s\"�長����（最大%2$d文"
-"字）"
+msgid "invalid input syntax for type box: \"%s\""
+msgstr "型box�入力構文�無効��: \"%s\""
 
-#: utils/misc/tzparser.c:72
+#: utils/adt/geo_ops.c:956
 #, c-format
-msgid ""
-"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
-"\"%s\", line %d"
-msgstr ""
-"時間帯ファイル\"%2$s\"�%3$d行�時間帯オフセット%1$d�900秒（15分）��数��"
-"�り��ん。"
+msgid "invalid input syntax for type line: \"%s\""
+msgstr "型line�入力構文�無効��: \"%s\""
 
-#: utils/misc/tzparser.c:86
-#, c-format
-msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%2$s\"�%3$d行�時間帯オフセット%1$d�範囲外��"
+#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
+#: utils/adt/geo_ops.c:1057
+msgid "type \"line\" not yet implemented"
+msgstr "型\"line\"���実装�れ����ん"
 
-#: utils/misc/tzparser.c:123
+#: utils/adt/geo_ops.c:1411 utils/adt/geo_ops.c:1434
 #, c-format
-msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%s\"�行%d�時間帯�略形��り��ん"
+msgid "invalid input syntax for type path: \"%s\""
+msgstr "型path�入力構文�無効��: \"%s\""
 
-#: utils/misc/tzparser.c:134
-#, c-format
-msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%s\"�行%d�時間帯オフセット��り��ん"
+#: utils/adt/geo_ops.c:1473
+msgid "invalid number of points in external \"path\" value"
+msgstr "\"path\"�外部値���る�イント数�無効��"
 
-#: utils/misc/tzparser.c:143
+#: utils/adt/geo_ops.c:1816
 #, c-format
-msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%s\"�行%d�時間帯オフセット数値�無効��"
+msgid "invalid input syntax for type point: \"%s\""
+msgstr "型point�入力構文�無効��: \"%s\""
 
-#: utils/misc/tzparser.c:168
+#: utils/adt/geo_ops.c:2044
 #, c-format
-msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%s\"�行%d�構文�無効��"
+msgid "invalid input syntax for type lseg: \"%s\""
+msgstr "型lseg�入力構文�無効��: \"%s\""
 
-#: utils/misc/tzparser.c:234
-#, c-format
-msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "時間帯�略形\"%s\"�複数定義�れ����"
+#: utils/adt/geo_ops.c:2648
+msgid "function \"dist_lb\" not implemented"
+msgstr "関数\"dist_lb\"�実装�れ����ん"
 
-#: utils/misc/tzparser.c:236
-#, c-format
-msgid ""
-"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
-"\", line %d."
-msgstr "時間帯ファイル\"%s\"�行%d�項目��ファイル\"%s\"�行%d�競����。"
+#: utils/adt/geo_ops.c:3161
+msgid "function \"close_lb\" not implemented"
+msgstr "関数\"close_lb\"�実装�れ����ん"
 
-#: utils/misc/tzparser.c:303
-#, c-format
-msgid "invalid time zone file name \"%s\""
-msgstr "時間帯ファイル��無効��: \"%s\""
+#: utils/adt/geo_ops.c:3450
+msgid "cannot create bounding box for empty polygon"
+msgstr "空�多角形�対�る境界矩形を作�����ん"
 
-#: utils/misc/tzparser.c:318
+#: utils/adt/geo_ops.c:3474 utils/adt/geo_ops.c:3486
 #, c-format
-msgid "time zone file recursion limit exceeded in file \"%s\""
-msgstr "ファイル\"%s\"�時間帯ファイル��帰�上�を超����。"
+msgid "invalid input syntax for type polygon: \"%s\""
+msgstr "型polygon�入力構文�無効��: \"%s\""
+
+#: utils/adt/geo_ops.c:3526
+msgid "invalid number of points in external \"polygon\" value"
+msgstr "\"polygon\"�外部値��イント数�無効��"
+
+#: utils/adt/geo_ops.c:4049
+msgid "function \"poly_distance\" not implemented"
+msgstr "関数\"poly_distance\"�実装�れ����ん"
 
-#: utils/misc/tzparser.c:347 postmaster/postmaster.c:1144
+#: utils/adt/geo_ops.c:4363
+msgid "function \"path_center\" not implemented"
+msgstr "関数\"path_center\"�実装�れ����ん"
+
+#: utils/adt/geo_ops.c:4380
+msgid "open path cannot be converted to polygon"
+msgstr "開経路を多角形�変�����ん"
+
+#: utils/adt/geo_ops.c:4549 utils/adt/geo_ops.c:4559 utils/adt/geo_ops.c:4574
+#: utils/adt/geo_ops.c:4580
 #, c-format
-msgid ""
-"This may indicate an incomplete PostgreSQL installation, or that the file \"%"
-"s\" has been moved away from its proper location."
-msgstr ""
-"�れ��PostgreSQL�インストール��完全��る�������ファイル\"%s\"�"
-"本��場所�ら�����������を示�����。"
+msgid "invalid input syntax for type circle: \"%s\""
+msgstr "型circle�入力構文�無効��: \"%s\""
+
+#: utils/adt/geo_ops.c:4602 utils/adt/geo_ops.c:4610
+msgid "could not format \"circle\" value"
+msgstr "\"circle\"値を整形����ん"
+
+#: utils/adt/geo_ops.c:4637
+msgid "invalid radius in external \"circle\" value"
+msgstr "\"circle\"�外部値��径�無効��"
+
+#: utils/adt/geo_ops.c:5158
+msgid "cannot convert circle with radius zero to polygon"
+msgstr "�径0�円を多角形�返還����ん"
+
+#: utils/adt/geo_ops.c:5163
+msgid "must request at least 2 points"
+msgstr "少���も2�イントを�求���れ��り��ん"
 
-#: utils/misc/tzparser.c:361 utils/misc/tzparser.c:376
-#, c-format
-msgid "could not read time zone file \"%s\": %m"
-msgstr "時間帯ファイル\"%s\"を読�込���ん���: %m"
+#: utils/adt/geo_ops.c:5207 utils/adt/geo_ops.c:5230
+msgid "cannot convert empty polygon to circle"
+msgstr "空�多角形を円�変�����ん"
 
-#: utils/misc/tzparser.c:388
+#: utils/adt/varbit.c:166 utils/adt/varbit.c:309 utils/adt/varbit.c:366
 #, c-format
-msgid "line is too long in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%s\"�行%d�長����。"
+msgid "bit string length %d does not match type bit(%d)"
+msgstr "ビット文字列長%d�bit(%d)�一致���ん"
 
-#: utils/misc/tzparser.c:413
+#: utils/adt/varbit.c:188 utils/adt/varbit.c:490
 #, c-format
-msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr "時間帯ファイル\"%s\"�行%d�ファイル����@INCLUDE��り��"
+msgid "\"%c\" is not a valid binary digit"
+msgstr "\"%c\"�有効�2進数表����り��ん"
 
-#: guc-file.l:288
+#: utils/adt/varbit.c:213 utils/adt/varbit.c:515
 #, c-format
-msgid "parameter \"%s\" removed from configuration file, reset to default"
-msgstr ""
-"パラメーター \"%s\" �設定ファイル�ら削除�れ���。デフォルト値�戻り�"
-"�。"
+msgid "\"%c\" is not a valid hexadecimal digit"
+msgstr "\"%c\"�有効�16進数表����り��ん"
 
-#: guc-file.l:344
-#, c-format
-msgid "parameter \"%s\" changed to \"%s\""
-msgstr "パラメータ \"%s\" � \"%s\" �変更�れ���"
+#: utils/adt/varbit.c:300 utils/adt/varbit.c:603
+msgid "invalid length in external bit string"
+msgstr "ビット文字列�外部表��長��無効��"
 
-#: guc-file.l:412
+#: utils/adt/varbit.c:468 utils/adt/varbit.c:612 utils/adt/varbit.c:674
 #, c-format
-msgid ""
-"could not open configuration file \"%s\": maximum nesting depth exceeded"
-msgstr ""
-"設定ファイル\"%s\"をオープン����ん���: 入れ�長�上�を超�����"
+msgid "bit string too long for type bit varying(%d)"
+msgstr "ビット文字列�型bit varying(%d)��長����"
 
-#: guc-file.l:436 libpq/hba.c:1482
-#, c-format
-msgid "could not open configuration file \"%s\": %m"
-msgstr "設定ファイル\"%s\"をオープン����ん���: %m"
+#: utils/adt/varbit.c:1004 utils/adt/varbit.c:1106 utils/adt/varlena.c:737
+#: utils/adt/varlena.c:801 utils/adt/varlena.c:945 utils/adt/varlena.c:1896
+#: utils/adt/varlena.c:1963
+msgid "negative substring length not allowed"
+msgstr "負�長��substring�����ん"
 
-#: guc-file.l:575
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "ファイル\"%s\"�行%u�行末近辺��構文エラー��り���"
+#: utils/adt/varbit.c:1164
+msgid "cannot AND bit strings of different sizes"
+msgstr "サイズ�異�るビット文字列�AND�����ん"
 
-#: guc-file.l:580
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near token \"%s\""
-msgstr "ファイル\"%s\"�行%u�トークン\"%s\"近辺�構文エラー��り���"
+#: utils/adt/varbit.c:1206
+msgid "cannot OR bit strings of different sizes"
+msgstr "サイズ�異�るビット文字列�OR�����ん"
 
-#: utils/fmgr/dfmgr.c:125
-#, c-format
-msgid "could not find function \"%s\" in file \"%s\""
-msgstr "ファイル\"%2$s\"内�関数\"%1$s\"��り��ん���"
+#: utils/adt/varbit.c:1253
+msgid "cannot XOR bit strings of different sizes"
+msgstr "サイズ�異�るビット文字列�XOR�����ん"
 
-#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
+#: utils/adt/varbit.c:1731 utils/adt/varbit.c:1789
 #, c-format
-msgid "could not access file \"%s\": %m"
-msgstr "ファイル\"%s\"�アクセス����ん���: %m"
+msgid "bit index %d out of valid range (0..%d)"
+msgstr "ビット型インデックス %d �有効範囲 0 �ら %d ���間��り��ん"
 
-#: utils/fmgr/dfmgr.c:242
-#, c-format
-msgid "could not load library \"%s\": %s"
-msgstr "ライブラリ\"%s\"をロード����ん���: %s"
+#: utils/adt/varbit.c:1740 utils/adt/varlena.c:2163
+msgid "new bit must be 0 or 1"
+msgstr "新��ビット� 0 � 1 ���れ��り��ん"
 
-#: utils/fmgr/dfmgr.c:274
+#: utils/adt/acl.c:253
 #, c-format
-msgid "incompatible library \"%s\": missing magic block"
-msgstr "\"%s\"�互�性���ライブラリ��。マジックブロック�欠�"
+msgid "unrecognized key word: \"%s\""
+msgstr "キーワード��明��: \"%s\""
 
-#: utils/fmgr/dfmgr.c:276
-msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
-msgstr "拡張ライブラリ�PG_MODULE_MAGICマクロを使用���れ��り��ん。"
+#: utils/adt/acl.c:254
+msgid "ACL key word must be \"group\" or \"user\"."
+msgstr "ACLキーワード�\"group\"���\"user\"���れ��り��ん。"
 
-#: utils/fmgr/dfmgr.c:312
-#, c-format
-msgid "incompatible library \"%s\": version mismatch"
-msgstr "\"%s\"�互�性���ライブラリ��: �ージョン��一致"
+#: utils/adt/acl.c:259
+msgid "missing name"
+msgstr "����り��ん"
 
-#: utils/fmgr/dfmgr.c:314
-#, c-format
-msgid "Server is version %d.%d, library is version %d.%d."
-msgstr "サー���ージョン�%d.%d�ライブラリ��ージョン�%d.%d<��。"
+#: utils/adt/acl.c:260
+msgid "A name must follow the \"group\" or \"user\" key word."
+msgstr "\"group\"���\"user\"キーワード�後�����必���。"
 
-#: utils/fmgr/dfmgr.c:333
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "サー��� FUNC_MAX_ARGS = %d ����ライブラリ�� %d ��"
+#: utils/adt/acl.c:266
+msgid "missing \"=\" sign"
+msgstr "\"=\"記���り��ん"
 
-#: utils/fmgr/dfmgr.c:342
+#: utils/adt/acl.c:319
 #, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "サー��� INDEX_MAX_KEYS = %d ����ライブラリ�� %d ��"
+msgid "invalid mode character: must be one of \"%s\""
+msgstr "モード文字�無効��: \"%s\"�一����れ��り��ん"
 
-#: utils/fmgr/dfmgr.c:351
-#, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "サー��� NAMEDATALEN = %d ����ライブラリ�� %d ��"
+#: utils/adt/acl.c:341
+msgid "a name must follow the \"/\" sign"
+msgstr "\"/\"記��後�����必���"
 
-#: utils/fmgr/dfmgr.c:360
+#: utils/adt/acl.c:349
 #, c-format
-msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
-msgstr "サー���FLOAT4PASSBYVAL = %s����ライブラリ��%s��。"
+msgid "defaulting grantor to user ID %u"
+msgstr "権�付与者をデフォルト�ユーザID %u������"
 
-#: utils/fmgr/dfmgr.c:369
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "サー���FLOAT8PASSBYVAL = %s����ライブラリ��%s��。"
+#: utils/adt/acl.c:540
+msgid "ACL array contains wrong data type"
+msgstr "ACL�列��正�データ型��り��。"
 
-#: utils/fmgr/dfmgr.c:376
-msgid "Magic block has unexpected length or padding difference."
-msgstr ""
-"マジックブロック��図���長���る�����パディング�異�り��。"
+#: utils/adt/acl.c:544
+msgid "ACL arrays must be one-dimensional"
+msgstr "ACL�列�1次元��列���れ��り��ん"
 
-#: utils/fmgr/dfmgr.c:379
+#: utils/adt/acl.c:548
+msgid "ACL arrays must not contain null values"
+msgstr "ACL�列��NULL値を��������ん"
+
+#: utils/adt/acl.c:572
+msgid "extra garbage at the end of the ACL specification"
+msgstr "ACL指定�後�余計�����り��"
+
+#: utils/adt/acl.c:1129
+msgid "grant options cannot be granted back to your own grantor"
+msgstr "グラントオプション���権�付与者�権�を戻��������ん"
+
+#: utils/adt/acl.c:1190
+msgid "dependent privileges exist"
+msgstr "�存�る権��存在���"
+
+#: utils/adt/acl.c:1191
+msgid "Use CASCADE to revoke them too."
+msgstr "�れらも�り上�る��CASCADEを使用������"
+
+#: utils/adt/acl.c:1470
+msgid "aclinsert is no longer supported"
+msgstr "aclinsert�も�サ�ート�れ����ん"
+
+#: utils/adt/acl.c:1480
+msgid "aclremove is no longer supported"
+msgstr "aclremove�も�サ�ート�れ����ん"
+
+#: utils/adt/acl.c:1566 utils/adt/acl.c:1620
 #, c-format
-msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "\"%s\"�互�性���ライブラリ��: マジックブロック��一致"
+msgid "unrecognized privilege type: \"%s\""
+msgstr "権�種類��明��: \"%s\""
 
-#: utils/fmgr/dfmgr.c:545
+#: utils/adt/acl.c:4608
 #, c-format
-msgid "access to library \"%s\" is not allowed"
-msgstr "ライブラリ\"%s\"��アクセス�許�れ����ん"
+msgid "must be member of role \"%s\""
+msgstr "ロール\"%s\"�メン����れ��り��ん"
 
-#: utils/fmgr/dfmgr.c:572
+#: utils/adt/acl.c:4822 utils/init/miscinit.c:432 commands/variable.c:882
+#: commands/variable.c:954 commands/user.c:623 commands/user.c:825
+#: commands/user.c:905 commands/user.c:1056
 #, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "ダイナミックライブラリパス内�マクロ�無効��: %s"
+msgid "role \"%s\" does not exist"
+msgstr "ロール\"%s\"�存在���ん"
 
-#: utils/fmgr/dfmgr.c:617
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "パラメータ\"dynamic_library_path\"内�長��0��素��り��"
+#: utils/adt/date.c:71
+#, c-format
+msgid "TIME(%d)%s precision must not be negative"
+msgstr "(%d)%s�精度�負������ん"
 
-#: utils/fmgr/dfmgr.c:636
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "パラメータ\"dynamic_library_path\"内��素�絶対パス��り��ん"
+#: utils/adt/date.c:77
+#, c-format
+msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
+msgstr "TIME(%d)%s���りを許容最大値%d��減ら����"
 
-#: utils/fmgr/funcapi.c:354
+#: utils/adt/date.c:167
 #, c-format
-msgid ""
-"could not determine actual result type for function \"%s\" declared to "
-"return type %s"
-msgstr "戻り値型%2$s���宣言�れ�関数\"%1$s\"�実際��果型を決定����ん"
+msgid "date out of range: \"%s\""
+msgstr "日付�範囲外��: \"%s\""
 
-#: utils/fmgr/funcapi.c:1187 utils/fmgr/funcapi.c:1218
-msgid "number of aliases does not match number of columns"
-msgstr "別��数�列�数�一致���ん"
+#: utils/adt/date.c:359
+msgid "cannot subtract infinite dates"
+msgstr "無�大�日付�減算����ん"
 
-#: utils/fmgr/funcapi.c:1212
-msgid "no column alias was provided"
-msgstr "列�別���供�れ����ん���"
+#: utils/adt/date.c:416 utils/adt/date.c:453
+msgid "date out of range for timestamp"
+msgstr "タイムスタンプ�日付�範囲外��"
 
-#: utils/fmgr/funcapi.c:1236
-msgid "could not determine row description for function returning record"
-msgstr "レコードを返�関数�����説明�行を決定����ん���"
+#: utils/adt/date.c:986
+msgid "cannot convert reserved abstime value to date"
+msgstr "予約�れ�abstime�らdate��変������ん"
 
-#: utils/fmgr/fmgr.c:264
-#, c-format
-msgid "internal function \"%s\" is not in internal lookup table"
-msgstr "内部関数\"%s\"�内部用検索テーブル��り��ん"
+#: utils/adt/date.c:1140 utils/adt/date.c:1147 utils/adt/date.c:1915
+#: utils/adt/date.c:1922
+msgid "time out of range"
+msgstr "時刻�範囲外��"
 
-#: utils/fmgr/fmgr.c:468
+#: utils/adt/date.c:1793 utils/adt/date.c:1810
 #, c-format
-msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "info関数\"%2$s\"�報告�れ�API�ージョン%1$d��明��"
+msgid "\"time\" units \"%s\" not recognized"
+msgstr "\"time\"���\"%s\"��明��"
 
-#: utils/fmgr/fmgr.c:839 utils/fmgr/fmgr.c:2071
+#: utils/adt/date.c:1932
+msgid "time zone displacement out of range"
+msgstr "時間帯�置��範囲外��"
+
+#: utils/adt/date.c:2557 utils/adt/date.c:2574
 #, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr "関数%u�引数�多����(%d。最大�%d)"
+msgid "\"time with time zone\" units \"%s\" not recognized"
+msgstr "\"time with time zone\"���\"%s\"��明��"
 
-#: utils/mb/wchar.c:1609
+#: utils/adt/date.c:2672
 #, c-format
-msgid "invalid byte sequence for encoding \"%s\": 0x%s"
-msgstr "符�化方�\"%s\"�無効��イトシーケンス��: 0x%s"
+msgid "\"interval\" time zone \"%s\" not valid"
+msgstr "\"interval\"�時間帯\"%s\"�無効��"
 
-#: utils/mb/wchar.c:1638
+#: utils/adt/domains.c:80
 #, c-format
-msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
-msgstr "符�化方�\"%2$s\"文字0x%1$s<�\"%3$s\"������り��ん"
+msgid "type %s is not a domain"
+msgstr "型%s�ドメイン���り��ん"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#: utils/adt/mac.c:65
 #, c-format
-msgid "unexpected encoding ID %d for WIN character sets"
-msgstr "WIN文字セット�対�る符�化方�ID %d�想定外��<"
+msgid "invalid input syntax for type macaddr: \"%s\""
+msgstr "型macaddr�入力構文�無効��: \"%s\""
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
+#: utils/adt/mac.c:72
 #, c-format
-msgid "unexpected encoding ID %d for ISO 8859 character sets"
-msgstr "ISO8859文字セット�対�る符�化方�ID %d�想定外��"
+msgid "invalid octet value in \"macaddr\" value: \"%s\""
+msgstr "\"macaddr\"�値�オクテット値�無効��: \"%s\""
 
-#: utils/mb/encnames.c:485
-msgid "encoding name too long"
-msgstr "符�化方��称�長����"
+#: utils/adt/varlena.c:1314
+#, 
+msgid "could not determine which collation to use for string comparison"
+msgstr "文字列比較������照�順�を�用����を決定����ん���"
 
-#: utils/mb/conv.c:509
+#: utils/adt/varlena.c:1358 utils/adt/varlena.c:1371
 #, c-format
-msgid "invalid encoding number: %d"
-msgstr "符�化方�番��無効��: %d"
+msgid "could not convert string to UTF-16: error %lu"
+msgstr "文字列をUTF-16�変�����ん���: エラー %lu"
 
-#: utils/mb/mbutils.c:311
+#: utils/adt/varlena.c:1386
 #, c-format
-msgid ""
-"default conversion function for encoding \"%s\" to \"%s\" does not exist"
-msgstr "符�化方�\"%s\"�ら\"%s\"用�デフォルト変�関数�存在���ん"
+msgid "could not compare Unicode strings: %m"
+msgstr "Unicode文字列を比較����ん���: %m"
 
-#: utils/mb/mbutils.c:335 utils/mb/mbutils.c:607
+#: utils/adt/varlena.c:2041 utils/adt/varlena.c:2072 utils/adt/varlena.c:2108
+#: utils/adt/varlena.c:2151
 #, c-format
-msgid "String of %d bytes is too long for encoding conversion."
-msgstr "%d�イト�文字列�符�化変���長����。"
+msgid "index %d out of valid range, 0..%d"
+msgstr "インデックス%d�有効範囲0�ら%d���間��り��ん"
 
-#: utils/mb/mbutils.c:422
-#, c-format
-msgid "invalid source encoding name \"%s\""
-msgstr "変�元符�化方��無効��: \"%s\""
+#: utils/adt/varlena.c:2959
+msgid "field position must be greater than zero"
+msgstr "フィールド�置�0より大����れ��り��ん"
+
+#: utils/adt/varlena.c:3816 utils/adt/varlena.c:3877
+#, 
+msgid "unterminated conversion specifier"
+msgstr "変�識別��終端��り��ん"
+
+#: utils/adt/varlena.c:3840 utils/adt/varlena.c:3856
+#, 
+msgid "argument number is out of range"
+msgstr "引数�数�範囲を超�����"
+
+#: utils/adt/varlena.c:3883
+msgid "conversion specifies argument 0, but arguments are numbered from 1"
+msgstr "変��際�引数 0 を指定�������引数� 1 �ら始������"
+
+#: utils/adt/varlena.c:3890
+#, 
+msgid "too few arguments for format conversion"
+msgstr "書��変���引数�少�����"
 
-#: utils/mb/mbutils.c:427
+#: utils/adt/varlena.c:3911
 #, c-format
-msgid "invalid destination encoding name \"%s\""
-msgstr "変�先符�化方��無効��: \"%s\""
+msgid "unrecognized conversion specifier: %c"
+msgstr "変�指示���識����ん: %c"
 
-#: utils/mb/mbutils.c:539
+#: utils/adt/varlena.c:3940
+msgid "NULL cannot be escaped as an SQL identifier"
+msgstr "NULL � SQL 識別����エスケープ����ん"
+
+#: utils/adt/pg_locale.c:993 utils/adt/pg_locale.c:1006
+#: utils/adt/pg_locale.c:1012
 #, c-format
-msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "符�化方�\"%s\"�無効��イト値��: 0x%02x"
+msgid "could not create locale \"%s\": %m"
+msgstr "ロケール \"%s\" を作�����ん���: %m"
+
+#: utils/adt/pg_locale.c:1023
+#, 
+msgid ""
+"collations with different collate and ctype values are not supported on this "
+"platform"
+msgstr "��プラットフォーム��異��� collate � ctype �よる照�順�を"
+"サ�ート�����ん"
+
+#: utils/adt/pg_locale.c:1038
+#, 
+msgid "nondefault collations are not supported on this platform"
+msgstr "��プラットフォーム�デフォルト���照�順��サ�ート�れ����ん"
 
-#: utils/mb/mbutils.c:734
+#: utils/adt/pg_locale.c:1209
 msgid "invalid multibyte character for locale"
 msgstr "ロケール��マル��イト文字�無効��"
 
-#: utils/mb/mbutils.c:735
+#: utils/adt/pg_locale.c:1210
 msgid ""
 "The server's LC_CTYPE locale is probably incompatible with the database "
 "encoding."
@@ -10462,6160 +11634,6622 @@ msgstr ""
 "サー��LC_CTYPEロケール���ら�データベース�符�化方��互�性��り��"
 "ã‚“"
 
-#: storage/page/bufpage.c:143 storage/page/bufpage.c:390
-#: storage/page/bufpage.c:623 storage/page/bufpage.c:753
-#, c-format
-msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
-msgstr "ページ�インタ�破������: lower = %u, upper = %u, special = %u\""
+#: utils/adt/like.c:211 utils/adt/selfuncs.c:4852
+#, 
+msgid "could not determine which collation to use for ILIKE"
+msgstr "ILIKE �使用�る照�順�を特定����ん���"
 
-#: storage/page/bufpage.c:433
+#: utils/adt/tsquery_cleanup.c:285
+msgid ""
+"text-search query contains only stop words or doesn't contain lexemes, "
+"ignored"
+msgstr ""
+"テキスト検索������ストップワード��を�む��る���字��素を���"
+"�ん。無視�れ��"
+
+#: utils/adt/numeric.c:473 utils/adt/numeric.c:500 utils/adt/numeric.c:3275
+#: utils/adt/numeric.c:3298 utils/adt/numeric.c:3322 utils/adt/numeric.c:3329
 #, c-format
-msgid "corrupted item pointer: %u"
-msgstr "アイテム�インタ�破������: %u"
+msgid "invalid input syntax for type numeric: \"%s\""
+msgstr "numeric型�入力構文�無効��: \"%s\""
 
-#: storage/page/bufpage.c:444 storage/page/bufpage.c:805
+#: utils/adt/numeric.c:653
+msgid "invalid length in external \"numeric\" value"
+msgstr "\"numeric\"�外部値�長��無効��"
+
+#: utils/adt/numeric.c:664
+msgid "invalid sign in external \"numeric\" value"
+msgstr "\"numeric\"�外部値�符��無効��"
+
+#: utils/adt/numeric.c:674
+msgid "invalid digit in external \"numeric\" value"
+msgstr "\"numeric\"�外部値���無効��"
+
+#: utils/adt/numeric.c:814 utils/adt/numeric.c:828
 #, c-format
-msgid "corrupted item lengths: total %u, available space %u"
-msgstr "アイテム長�破������: �計 %u 利用�能空間 %u"
+msgid "NUMERIC precision %d must be between 1 and %d"
+msgstr "NUMERIC�精度%d�1�ら%d�����れ��り��ん"
 
-#: storage/page/bufpage.c:642 storage/page/bufpage.c:778
+#: utils/adt/numeric.c:819
 #, c-format
-msgid "corrupted item pointer: offset = %u, size = %u"
-msgstr "アイテム�インタ�破������: オフセット = %u サイズ = %u"
+msgid "NUMERIC scale %d must be between 0 and precision %d"
+msgstr "NUMERIC���り%d�0�ら精度%d�����れ��り��ん"
 
-#: storage/ipc/sinvaladt.c:302 storage/ipc/procarray.c:269
-#: storage/lmgr/proc.c:290 postmaster/postmaster.c:1833
-msgid "sorry, too many clients already"
-msgstr "�在クライアント数�多����"
+#: utils/adt/numeric.c:837
+msgid "invalid NUMERIC type modifier"
+msgstr "無効�NUMERIC型�修正���"
 
-#: storage/ipc/procarray.c:693
-msgid "consistent state delayed because recovery snapshot incomplete"
-msgstr "リカ�リースナップショット��完全����一貫性状態��延����"
+#: utils/adt/numeric.c:1881 utils/adt/numeric.c:3754
+msgid "value overflows numeric format"
+msgstr "値�numeric�書��オー�フロー�����"
 
-#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
-msgid ""
-"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
-msgstr ""
-"データ構造体 \"%s\" 用�共有メモリ��足�����（ %u �イト必�）"
+#: utils/adt/numeric.c:2229
+msgid "cannot convert NaN to integer"
+msgstr "NaNをinteger�変�����ん"
 
-#: storage/ipc/shmem.c:365
-msgid "could not create ShmemIndex entry for data structure \"%s\""
-msgstr "データ構造体 \"%s\" ���� ShmemIndex エントリを作�����ん���"
+#: utils/adt/numeric.c:2297
+msgid "cannot convert NaN to bigint"
+msgstr "NaNをbigint�変�����ん"
 
-#: storage/ipc/shmem.c:380
+#: utils/adt/numeric.c:2345
+msgid "cannot convert NaN to smallint"
+msgstr "NaNをsmallint�変�����ん"
+
+#: utils/adt/numeric.c:3824
+msgid "numeric field overflow"
+msgstr "numericフィールド�オー�ーフロー�����"
+
+#: utils/adt/numeric.c:3825
 #, c-format
 msgid ""
-"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
-"actual %lu"
+"A field with precision %d, scale %d must round to an absolute value less "
+"than %s%d."
 msgstr ""
-"データ構造体 \"%s\" ���� ShmemIndex エントリ�サイズ�誤�����："
-"期待値�%lu�実際�%lu"
+"精度 %d���り %dを��フィールド��%s%dより���絶対値�丸�られ��。"
 
-#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
-msgid "requested shared memory size overflows size_t"
-msgstr "�求�れ�共有メモリ�サイズ�size_tを超�����"
+#: utils/adt/numeric.c:5273
+msgid "argument for function \"exp\" too big"
+msgstr "関数\"exp\"�引数�大�����"
 
-#: storage/file/copydir.c:172 storage/smgr/md.c:278
-#: postmaster/postmaster.c:3627 access/transam/xlog.c:2323
-#: access/transam/xlog.c:2456 access/transam/xlog.c:4286
-#: access/transam/xlog.c:8439 access/transam/xlog.c:8594
-#, c-format
-msgid "could not create file \"%s\": %m"
-msgstr "ファイル\"%s\"を作�����ん���: %m"
+#: utils/adt/pseudotypes.c:94
+msgid "cannot accept a value of type any"
+msgstr "型any�値を��付�られ��ん"
 
-#: storage/file/copydir.c:211 access/transam/xlog.c:2368
-#: access/transam/xlog.c:2500 access/transam/xlog.c:4405
-#, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "ファイル\"%s\"をクローズ����ん���: %m"
+#: utils/adt/pseudotypes.c:107
+msgid "cannot display a value of type any"
+msgstr "型any�値を表示����ん"
 
-#: storage/file/copydir.c:269 storage/smgr/md.c:909 storage/smgr/md.c:1083
-#: storage/smgr/md.c:1226 access/transam/xlog.c:2363
-#: access/transam/xlog.c:2495 access/transam/xlog.c:4400
-#, c-format
-msgid "could not fsync file \"%s\": %m"
-msgstr "ファイル\"%s\"をfsync����ん���: %m"
+#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
+msgid "cannot accept a value of type anyarray"
+msgstr "型anyarray�値を��付�られ��ん"
 
-#: storage/file/fd.c:402
-#, c-format
-msgid "getrlimit failed: %m"
-msgstr "getrlimit�失敗����: %m"
+#: utils/adt/pseudotypes.c:174
+msgid "cannot accept a value of type anyenum"
+msgstr "anyenum型�値を��付�られ��ん"
 
-#: storage/file/fd.c:492
-msgid "insufficient file descriptors available to start server process"
-msgstr ""
-"サー�プロセスを起動��る���利用��るファイル記述���足�����"
+#: utils/adt/pseudotypes.c:252
+msgid "cannot accept a value of type trigger"
+msgstr "型trigger�値を��付�られ��ん"
 
-#: storage/file/fd.c:493
-#, c-format
-msgid "System allows %d, we need at least %d."
-msgstr "システム��%d使用������少���も%d必���"
+#: utils/adt/pseudotypes.c:265
+msgid "cannot display a value of type trigger"
+msgstr "型trigger�値を表示����ん"
 
-#: storage/file/fd.c:534 storage/file/fd.c:1418 storage/file/fd.c:1533
-#, c-format
-msgid "out of file descriptors: %m; release and retry"
-msgstr "ファイル記述���足�����: %m: 解放後�実行������"
+#: utils/adt/pseudotypes.c:279
+msgid "cannot accept a value of type language_handler"
+msgstr "型language_handler�値を��付�られ��ん"
 
-#: storage/file/fd.c:1067
-#, c-format
-msgid "temporary file: path \"%s\", size %lu"
-msgstr "一時ファイル: パス \"%s\"�サイズ %lu"
+#: utils/adt/pseudotypes.c:292
+msgid "cannot display a value of type language_handler"
+msgstr "型language_handler�値を表示����ん"
 
-#: storage/file/fd.c:1592
-#, c-format
-msgid "could not read directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"を読��れ��ん���: %m"
+#: utils/adt/pseudotypes.c:306
+#, 
+msgid "cannot accept a value of type fdw_handler"
+msgstr "fdw_handler 型�値���付�られ��ん"
 
-#: storage/large_object/inv_api.c:550 storage/large_object/inv_api.c:747
-#, c-format
-msgid "large object %u was not opened for writing"
-msgstr "ラージオブジェクト%u�書�込�用�開�れ����ん"
+#: utils/adt/pseudotypes.c:319
+#, 
+msgid "cannot display a value of type fdw_handler"
+msgstr "fdw_handler 型�値�表示����ん"
+
+#: utils/adt/pseudotypes.c:333
+msgid "cannot accept a value of type internal"
+msgstr "型interval�値を��付�られ��ん"
+
+#: utils/adt/pseudotypes.c:346
+msgid "cannot display a value of type internal"
+msgstr "型interval�値を表示����ん"
+
+#: utils/adt/pseudotypes.c:360
+msgid "cannot accept a value of type opaque"
+msgstr "型opaque�値を��付�られ��ん"
+
+#: utils/adt/pseudotypes.c:373
+msgid "cannot display a value of type opaque"
+msgstr "型opaque�値を表示����ん"
+
+#: utils/adt/pseudotypes.c:387
+msgid "cannot accept a value of type anyelement"
+msgstr "型anyelement�値を��付�られ��ん"
+
+#: utils/adt/pseudotypes.c:400
+msgid "cannot display a value of type anyelement"
+msgstr "型anyelement�値を表示����ん"
+
+#: utils/adt/pseudotypes.c:413
+msgid "cannot accept a value of type anynonarray"
+msgstr "型anynonarray�値を��付�られ��ん"
+
+#: utils/adt/pseudotypes.c:426
+msgid "cannot display a value of type anynonarray"
+msgstr "型anynonarray�値を表示����ん"
+
+#: utils/adt/pseudotypes.c:439
+msgid "cannot accept a value of a shell type"
+msgstr "シェル型�値を��付�られ��ん"
+
+#: utils/adt/pseudotypes.c:452
+msgid "cannot display a value of a shell type"
+msgstr "シェル型�値を表示����ん"
+
+#: utils/adt/pseudotypes.c:474 utils/adt/pseudotypes.c:498
+#, 
+msgid "cannot accept a value of type pg_node_tree"
+msgstr "pg_node_tree 型�値���付�られ��ん"
+
+#: utils/adt/char.c:169
+msgid "\"char\" out of range"
+msgstr "\"char\"�範囲外��"
+
+#: utils/adt/like_match.c:104 utils/adt/like_match.c:164
+msgid "LIKE pattern must not end with escape character"
+msgstr "LIKE パターン�エスケープ文字�終�����り��ん"
+
+#: utils/adt/selfuncs.c:4837 utils/adt/selfuncs.c:5291
+msgid "case insensitive matching not supported on type bytea"
+msgstr "型bytea��大文字�文字�区別を���マッ�をサ�ート���ん"
 
-#: storage/large_object/inv_api.c:557 storage/large_object/inv_api.c:754
+#: utils/adt/selfuncs.c:4952 utils/adt/selfuncs.c:5451
+msgid "regular-expression matching not supported on type bytea"
+msgstr "型bytea��正�表��マッ�をサ�ート���ん"
+
+#: utils/adt/ruleutils.c:1697 commands/functioncmds.c:1008
+#: commands/functioncmds.c:1108 commands/functioncmds.c:1171
+#: commands/functioncmds.c:1322
 #, c-format
-msgid "large object %u was already dropped"
-msgstr "ラージオブジェクト %u ����削除�れ����"
+msgid "\"%s\" is an aggregate function"
+msgstr "\"%s\"�集約関数��"
 
-#: storage/buffer/localbuf.c:189
-msgid "no empty local buffer available"
-msgstr "利用��る�空�ローカル�ッファ��り��ん"
+#: utils/adt/ruleutils.c:2430
+#, c-format
+msgid "rule \"%s\" has unsupported event type %d"
+msgstr "ルール\"%s\"�サ�ート�����イベント種類%dを����"
 
-#: storage/buffer/bufmgr.c:131 storage/buffer/bufmgr.c:235
-msgid "cannot access temporary tables of other sessions"
-msgstr "他�セッション�一時テーブル��アクセス����ん"
+#: utils/init/postinit.c:225
+#, c-format
+msgid "replication connection authorized: user=%s"
+msgstr "レプリケーション接続��証完了: ユーザ=%s"
 
-#: storage/buffer/bufmgr.c:364
+#: utils/init/postinit.c:229
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr ""
-"リレーション %2$s � %1$u ブロック目��EOF �先�想定外�データを検出���"
-"�"
+msgid "connection authorized: user=%s database=%s"
+msgstr "接続��証完了: ユーザ=%s�データベース=%s"
 
-#: storage/buffer/bufmgr.c:366
-msgid ""
-"This has been seen to occur with buggy kernels; consider updating your "
-"system."
-msgstr ""
-"�れ�カー�ル��具��発生��模様��。システム�更新を検討������。"
+#: utils/init/postinit.c:260
+#, c-format
+msgid "database \"%s\" has disappeared from pg_database"
+msgstr "データベース\"%s\"�pg_database�ら消失����"
 
-#: storage/buffer/bufmgr.c:438
+#: utils/init/postinit.c:262
 #, c-format
-msgid "invalid page header in block %u of relation %s; zeroing out page"
-msgstr ""
-"リレーション %2$s � %1$u ブロック目�ページヘッダ�無効��：ページをゼロ�"
-"埋����"
+msgid "Database OID %u now seems to belong to \"%s\"."
+msgstr "OID %u�データベース�\"%s\"�属�るよ���。"
 
-#: storage/buffer/bufmgr.c:446
+#: utils/init/postinit.c:282
 #, c-format
-msgid "invalid page header in block %u of relation %s"
-msgstr "リレーション %2$s � %1$u ブロック目�ページヘッダ�無効��"
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "�在データベース\"%s\"�接続を��付���ん"
 
-#: storage/buffer/bufmgr.c:2706
+#: utils/init/postinit.c:295
 #, c-format
-msgid "could not write block %u of %s"
-msgstr "%u ブロックを %s �書�出���ん���"
+msgid "permission denied for database \"%s\""
+msgstr "データベース\"%s\"�権���り��ん"
 
-#: storage/buffer/bufmgr.c:2708
-msgid "Multiple failures --- write error might be permanent."
-msgstr "複数回失敗���� ---���書�込�エラー�続��も�れ��ん。"
+#: utils/init/postinit.c:296
+msgid "User does not have CONNECT privilege."
+msgstr "ユーザ�CONNECT権�を����ん"
 
-#: storage/buffer/bufmgr.c:2729
+#: utils/init/postinit.c:313
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "ブロック %u を リレーション %s �書�込ん����"
+msgid "too many connections for database \"%s\""
+msgstr "データベース\"%s\"��接続�多����"
+
+#: utils/init/postinit.c:335 utils/init/postinit.c:342
+msgid "database locale is incompatible with operating system"
+msgstr "データベース�ロケール�オペレーティングシステム�互�性��り��ん"
 
-#: storage/lmgr/proc.c:1046
+#: utils/init/postinit.c:336
 #, c-format
 msgid ""
-"process %d avoided deadlock for %s on %s by rearranging queue order after %"
-"ld.%03d ms"
+"The database was initialized with LC_COLLATE \"%s\",  which is not "
+"recognized by setlocale()."
 msgstr ""
-"プロセス%1$d��%4$ld.%5$03d ms後�キュー�順番を�調整�る����%3$s上�%2"
-"$s�対�るデッドロックを防����。"
+"データベース� LC_COLLATE \"%s\" ��期化�れ������setlocale() ��れを"
+"�識�れ��ん"
 
-#: storage/lmgr/proc.c:1058
-#, c-format
+#: utils/init/postinit.c:338 utils/init/postinit.c:345
 msgid ""
-"process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
+"Recreate the database with another locale or install the missing locale."
 msgstr ""
-"プロセス%1$d��%3$s上�%2$s�対�%4$ld.%5$03d ms待機�るデッドロックを検知�"
-"���"
+"データベースを別�ロケール��生��る������足���るロケールをインス"
+"トール������"
 
-#: storage/lmgr/proc.c:1064
+#: utils/init/postinit.c:343
 #, c-format
-msgid "process %d still waiting for %s on %s after %ld.%03d ms"
-msgstr "プロセス%d�%sを%s�待機�����。%ld.%03dミリ秒後"
+msgid ""
+"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
+"by setlocale()."
+msgstr ""
+"データベース� LC_CTYPE \"%s\" ��期化�れ������setlocale()��れを�"
+"識�れ��ん"
+
+#: utils/init/postinit.c:597
+msgid "no roles are defined in this database system"
+msgstr "データベースシステム内�ロール�定義�れ����ん"
 
-#: storage/lmgr/proc.c:1068
+#: utils/init/postinit.c:598
 #, c-format
-msgid "process %d acquired %s on %s after %ld.%03d ms"
-msgstr "プロセス%1$d�%4$ld.%5$03d ms後�%3$s上�%2$sを�得����"
+msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
+msgstr "��� CREATE USER \"%s\" SUPERUSER; を実行������。"
 
-#: storage/lmgr/proc.c:1084
-#, c-format
-msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
+#: utils/init/postinit.c:621
+msgid "new replication connections are not allowed during database shutdown"
 msgstr ""
-"プロセス%1$d�%4$ld.%5$03d ms後�%3$s上�%2$sを�得�る���失敗����"
+"データベース�シャットダウン中��新��レプリケーション接続�許��れ��ん"
 
-#: storage/lmgr/lock.c:515
-msgid ""
-"cannot acquire lock mode %s on database objects while recovery is in progress"
-msgstr ""
-"リカ�リー�実行中�データベースオブジェクト�ロックモード %s を�得����ん"
+#: utils/init/postinit.c:625
+msgid "must be superuser to connect during database shutdown"
+msgstr "データベース�シャットダウン中�接続��る��スーパーユーザ����"
 
-#: storage/lmgr/lock.c:517
+#: utils/init/postinit.c:635
+#, 
+msgid "must be superuser to connect in binary upgrade mode"
+msgstr "�イナリアップグレードモード中�接続��る��スーパーユーザ����"
+
+#: utils/init/postinit.c:649
 msgid ""
-"Only RowExclusiveLock or less can be acquired on database objects during "
-"recovery."
-msgstr ""
-"リカ�リー�実行中��データベースオブジェクト� RowExclusiveLock も����"
-"れ以下����得����"
+"remaining connection slots are reserved for non-replication superuser "
+"connections"
+msgstr "スーパーユーザ�よる接続用�予約�れる接続スロット�数を設定���。"
 
-#: storage/lmgr/lock.c:611 storage/lmgr/lock.c:680 storage/lmgr/lock.c:2499
-#: storage/lmgr/lock.c:2564
-msgid "You might need to increase max_locks_per_transaction."
-msgstr "max_locks_per_transactionを増や�必���る�も�れ��ん"
+#: utils/init/postinit.c:664
+#, 
+msgid "must be replication role to start walsender"
+msgstr "WALSENDER を開始�る���� replication ロール���れ��り��ん"
 
-#: storage/lmgr/lock.c:2120
-msgid "Not enough memory for reassigning the prepared transaction's locks."
-msgstr ""
-"準備�れ�トランザクション�ロックを�割り当��る��メモリ��足����"
-"�。"
+#: utils/init/postinit.c:707 utils/init/postinit.c:775
+#: utils/init/postinit.c:792 commands/comment.c:60 commands/dbcommands.c:764
+#: commands/dbcommands.c:909 commands/dbcommands.c:1008
+#: commands/dbcommands.c:1181 commands/dbcommands.c:1366
+#: commands/dbcommands.c:1451 commands/dbcommands.c:1854
+#, c-format
+msgid "database \"%s\" does not exist"
+msgstr "データベース\"%s\"�存在���ん"
 
-#: storage/lmgr/lmgr.c:717
+#: utils/init/postinit.c:724
 #, c-format
-msgid "relation %u of database %u"
-msgstr "データベース%2$u�リレーション%1$u"
+msgid "database %u does not exist"
+msgstr "データベース %u �存在���ん"
 
-#: storage/lmgr/lmgr.c:723
+#: utils/init/postinit.c:776
+msgid "It seems to have just been dropped or renamed."
+msgstr "削除���リ�ーム�れ���り�よ���。"
+
+#: utils/init/postinit.c:794
 #, c-format
-msgid "extension of relation %u of database %u"
-msgstr "データベース%2$u�リレーション%1$u�拡張"
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "データベース�サブディレクトリ\"%s\"��り��ん。"
 
-#: storage/lmgr/lmgr.c:729
+#: utils/init/postinit.c:799
 #, c-format
-msgid "page %u of relation %u of database %u"
-msgstr "データベース%3$u�リレーション%2$u�ページ%1$u"
+msgid "could not access directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"�アクセス����ん���: %m"
 
-#: storage/lmgr/lmgr.c:736
+#: utils/init/miscinit.c:115
 #, c-format
-msgid "tuple (%u,%u) of relation %u of database %u"
-msgstr "データベース%4$u�リレーション%3$u�タプル(%2$u,%1$u)"
+msgid "could not change directory to \"%s\": %m"
+msgstr "ディレクトリ\"%s\"�移動����ん���: %m"
 
-#: storage/lmgr/lmgr.c:744
+#: utils/init/miscinit.c:381 utils/misc/guc.c:5255
 #, c-format
-msgid "transaction %u"
-msgstr "トランザクション %u"
+msgid "cannot set parameter \"%s\" within security-restricted operation"
+msgstr "セキュリティー制��作内�パラメーター \"%s\" を設定����ん"
 
-#: storage/lmgr/lmgr.c:749
+#: utils/init/miscinit.c:460
 #, c-format
-msgid "virtual transaction %d/%u"
-msgstr "仮想トランザクション %d/%u"
+msgid "role \"%s\" is not permitted to log in"
+msgstr "ロール\"%s\"�ログイン�る���許�れ����ん"
 
-#: storage/lmgr/lmgr.c:755
+#: utils/init/miscinit.c:478
 #, c-format
-msgid "object %u of class %u of database %u"
-msgstr "データベース%3$u�リレーション%2$u�オブジェクト%1$u"
+msgid "too many connections for role \"%s\""
+msgstr "ロール\"%s\"�ら�接続�多����"
+
+#: utils/init/miscinit.c:538
+msgid "permission denied to set session authorization"
+msgstr "set session authorization用�権���り��ん"
 
-#: storage/lmgr/lmgr.c:763
+#: utils/init/miscinit.c:618
 #, c-format
-msgid "user lock [%u,%u,%u]"
-msgstr "ユーザロック[%u,%u,%u]"
+msgid "invalid role OID: %u"
+msgstr "ロールID�無効��: %u"
 
-#: storage/lmgr/lmgr.c:770
+#: utils/init/miscinit.c:750
 #, c-format
-msgid "advisory lock [%u,%u,%u,%u]"
-msgstr "アド�イザリ・ロック[%u,%u,%u,%u]"
+msgid "could not create lock file \"%s\": %m"
+msgstr "ロックファイル\"%s\"を作�����ん���: %m"
 
-#: storage/lmgr/lmgr.c:778
+#: utils/init/miscinit.c:764
 #, c-format
-msgid "unrecognized locktag type %d"
-msgstr "ロックタグ種類%d��明��"
+msgid "could not open lock file \"%s\": %m"
+msgstr "ロックファイル\"%s\"をオープン����ん���: %m"
 
-#: storage/lmgr/deadlock.c:915
+#: utils/init/miscinit.c:770
 #, c-format
-msgid "Process %d waits for %s on %s; blocked by process %d."
-msgstr ""
-"プロセス%d�%sを%s�待機�����。�れ�プロセス%d�ブロック�れ����。"
+msgid "could not read lock file \"%s\": %m"
+msgstr "ロックファイル\"%s\"を読��れ��ん���: %m"
 
-#: storage/lmgr/deadlock.c:934
+#: utils/init/miscinit.c:818
 #, c-format
-msgid "Process %d: %s"
-msgstr "プロセス %d: %s"
+msgid "lock file \"%s\" already exists"
+msgstr "ロックファイル\"%s\"����存在���"
 
-#: storage/lmgr/deadlock.c:941
-msgid "deadlock detected"
-msgstr "デッドロックを検出����"
+#: utils/init/miscinit.c:822
+#, c-format
+msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+msgstr "他�postgres(PID %d)�データディレクトリ\"%s\"�稼動�����ん�?"
 
-#: storage/lmgr/deadlock.c:944
-msgid "See server log for query details."
-msgstr "クエリー�詳細�サー�ログを�照������"
+#: utils/init/miscinit.c:824
+#, c-format
+msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgstr "他�postmaster(PID %d)�データディレクトリ\"%s\"�稼動�����ん�?"
 
-#: storage/smgr/md.c:348 storage/smgr/md.c:395 storage/smgr/md.c:1192
-#: access/transam/xlog.c:2866 access/transam/xlog.c:8621
+#: utils/init/miscinit.c:827
 #, c-format
-msgid "could not remove file \"%s\": %m"
-msgstr "ファイル\"%s\"を削除����ん���: %m"
+msgid "Is another postgres (PID %d) using socket file \"%s\"?"
+msgstr "他�postgres(PID %d)�ソケットファイル\"%s\"を使用�����ん�?"
 
-#: storage/smgr/md.c:371 storage/smgr/md.c:839
+#: utils/init/miscinit.c:829
 #, c-format
-msgid "could not truncate file \"%s\": %m"
-msgstr "ファイル \"%s\" �切り詰�処������ん���: %m"
+msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
+msgstr "他�postmaster(PID %d)�ソケットファイル\"%s\"を使用�����ん�?"
 
-#: storage/smgr/md.c:439
+#: utils/init/miscinit.c:865
 #, c-format
-msgid "cannot extend file \"%s\" beyond %u blocks"
-msgstr "ファイル \"%s\" を %u ブロック以上�拡張����ん"
+msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgstr "既存�共有メモリブロック(キー%lu�ID %lu)���使用中��"
 
-#: storage/smgr/md.c:461 storage/smgr/md.c:621 storage/smgr/md.c:694
+#: utils/init/miscinit.c:868
 #, c-format
-msgid "could not seek to block %u in file \"%s\": %m"
-msgstr "ファイル \"%2$s\" � %1$u ブロック目�シーク����ん���: %3$m"
+msgid ""
+"If you're sure there are no old server processes still running, remove the "
+"shared memory block or just delete the file \"%s\"."
+msgstr ""
+"��サー�プロセス�稼動中������確実��れ��共有メモリブロックを削除"
+"�る�������ファイル \"%s\" を削除������。"
 
-#: storage/smgr/md.c:469
+#: utils/init/miscinit.c:884
 #, c-format
-msgid "could not extend file \"%s\": %m"
-msgstr "ファイル \"%s\" を拡張����ん���: %m"
+msgid "could not remove old lock file \"%s\": %m"
+msgstr "��ロックファイル\"%s\"を削除����ん���: %m"
 
-#: storage/smgr/md.c:471 storage/smgr/md.c:478 storage/smgr/md.c:720
-msgid "Check free disk space."
-msgstr "ディスク�空�容�を�ェック������。"
+#: utils/init/miscinit.c:886
+msgid ""
+"The file seems accidentally left over, but it could not be removed. Please "
+"remove the file by hand and try again."
+msgstr ""
+"��ファイル��然残������よ�����削除����ん���。手作業��"
+"れを削除��実行������。"
 
-#: storage/smgr/md.c:475
+#: utils/init/miscinit.c:920 utils/init/miscinit.c:931
+#: utils/init/miscinit.c:941
 #, c-format
-msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
-msgstr ""
-"ファイル \"%1$s\" を拡張����ん���：%4$u ブロック� %3$d �イト中 %2$d "
-"�イト分��を書�出����。"
+msgid "could not write lock file \"%s\": %m"
+msgstr "ロックファイル\"%s\"�書�出���ん���: %m"
 
-#: storage/smgr/md.c:638
+#: utils/init/miscinit.c:1048 utils/misc/guc.c:7507
 #, c-format
-msgid "could not read block %u in file \"%s\": %m"
-msgstr "ファイル \"%2$s\" � %1$u ブロックを読��れ��ん���: %3$m"
+msgid "could not read from file \"%s\": %m"
+msgstr "ファイル\"%s\"�ら読��れ��ん���: %m"
 
-#: storage/smgr/md.c:654
+#: utils/init/miscinit.c:1147 utils/init/miscinit.c:1160
 #, c-format
-msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
-msgstr ""
-"ファイル \"%2$s\" �ブロック %1$u を読��れ��ん���：%4$d �イト中 %3$d "
-"�イト分��読��り���"
+msgid "\"%s\" is not a valid data directory"
+msgstr "\"%s\"�有効�データディレクトリ���り��ん"
 
-#: storage/smgr/md.c:711
+#: utils/init/miscinit.c:1149
 #, c-format
-msgid "could not write block %u in file \"%s\": %m"
-msgstr "ファイル \"%2$s\" � %1$u ブロック�書�出���ん���: %3$m"
+msgid "File \"%s\" is missing."
+msgstr "ファイル\"%s\"�存在���ん"
 
-#: storage/smgr/md.c:716
+#: utils/init/miscinit.c:1162
 #, c-format
-msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
-msgstr ""
-"ファイル \"%2$s\" �ブロック %1$u を書�込���ん���：%4$d �イト中 %3$d "
-"�イト分��書�込����"
+msgid "File \"%s\" does not contain valid data."
+msgstr "ファイル\"%s\"�有効�データ��り��ん。"
+
+#: utils/init/miscinit.c:1164
+msgid "You might need to initdb."
+msgstr "initdb�る必���る�も�れ��ん"
 
-#: storage/smgr/md.c:815
+#: utils/init/miscinit.c:1172
 #, c-format
-msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
+msgid ""
+"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
+"not compatible with this version %s."
 msgstr ""
-"ファイル \"%s\" を %u ブロック�切り詰�られ��ん���：�在� %u ブロック"
-"����り���"
+"データディレクトリ�PostgreSQL�ージョン%ld.%ld��期化�れ������れ�"
+"�ージョン%s�互�性��り��ん"
 
-#: storage/smgr/md.c:864
+#: utils/init/miscinit.c:1220
 #, c-format
-msgid "could not truncate file \"%s\" to %u blocks: %m"
-msgstr "ファイル \"%s\" を %u ブロック�切り詰�られ��ん���: %m"
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "パラメータ\"%s\"�リスト構文�無効��"
 
-#: storage/smgr/md.c:1087
+#: utils/init/miscinit.c:1257
 #, c-format
-msgid "could not fsync file \"%s\" but retrying: %m"
-msgstr "ファイル \"%s\" を fsync ����ん���: %m"
+msgid "loaded library \"%s\""
+msgstr "ライブラリ\"%s\"をロード����"
 
-#: storage/smgr/md.c:1586
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
 #, c-format
-msgid "could not open file \"%s\" (target block %u): %m"
-msgstr "ファイル \"%s\"（対象ブロック %u）をオープン����ん���: %m"
+msgid "unexpected encoding ID %d for WIN character sets"
+msgstr "WIN文字セット�対�る符�化方�ID %d�想定外��<"
 
-#: storage/smgr/md.c:1608
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
 #, c-format
-msgid "could not seek to end of file \"%s\": %m"
-msgstr "ファイル \"%s\" �終端(EOF)をシーク����ん���: %m"
+msgid "unexpected encoding ID %d for ISO 8859 character sets"
+msgstr "ISO8859文字セット�対�る符�化方�ID %d�想定外��"
 
-#: postmaster/syslogger.c:387
+#: utils/mb/mbutils.c:281
 #, c-format
-msgid "select() failed in logger process: %m"
-msgstr "ロガープロセス�select()�失敗����: %m"
+msgid "conversion between %s and %s is not supported"
+msgstr "%s�%s間�変��サ�ート�れ����ん"
 
-#: postmaster/syslogger.c:399 postmaster/syslogger.c:973
+#: utils/mb/mbutils.c:351
 #, c-format
-msgid "could not read from logger pipe: %m"
-msgstr "ロガーパイプ�ら読��れ��ん���: %m"
-
-#: postmaster/syslogger.c:446
-msgid "logger shutting down"
-msgstr "ロガーを�止�����"
+msgid ""
+"default conversion function for encoding \"%s\" to \"%s\" does not exist"
+msgstr "符�化方�\"%s\"�ら\"%s\"用�デフォルト変�関数�存在���ん"
 
-#: postmaster/syslogger.c:490 postmaster/syslogger.c:504
+#: utils/mb/mbutils.c:375 utils/mb/mbutils.c:676
 #, c-format
-msgid "could not create pipe for syslog: %m"
-msgstr "syslog用�パイプを作�����ん���: %m"
+msgid "String of %d bytes is too long for encoding conversion."
+msgstr "%d�イト�文字列�符�化変���長����。"
 
-#: postmaster/syslogger.c:524 postmaster/syslogger.c:1012
+#: utils/mb/mbutils.c:462
 #, c-format
-msgid "could not create log file \"%s\": %m"
-msgstr "ログファイル\"%s\"を作�����ん���: %m"
+msgid "invalid source encoding name \"%s\""
+msgstr "変�元符�化方��無効��: \"%s\""
 
-#: postmaster/syslogger.c:539
+#: utils/mb/mbutils.c:467
 #, c-format
-msgid "could not fork system logger: %m"
-msgstr "システムロガーをfork����ん���: %m"
+msgid "invalid destination encoding name \"%s\""
+msgstr "変�先符�化方��無効��: \"%s\""
 
-#: postmaster/syslogger.c:570
+#: utils/mb/mbutils.c:589
 #, c-format
-msgid "could not redirect stdout: %m"
-msgstr "標準出力�リダイレクト����ん���: %m"
+msgid "invalid byte value for encoding \"%s\": 0x%02x"
+msgstr "符�化方�\"%s\"�無効��イト値��: 0x%02x"
+
+#: utils/mb/encnames.c:485
+msgid "encoding name too long"
+msgstr "符�化方��称�長����"
 
-#: postmaster/syslogger.c:575 postmaster/syslogger.c:593
+#: utils/mb/wchar.c:1611
 #, c-format
-msgid "could not redirect stderr: %m"
-msgstr "標準エラー出力�リダイレクト����ん���: %m"
+msgid "invalid byte sequence for encoding \"%s\": 0x%s"
+msgstr "符�化方�\"%s\"�無効��イトシーケンス��: 0x%s"
 
-#: postmaster/syslogger.c:928
+#: utils/mb/wchar.c:1640
 #, c-format
-msgid "could not write to log file: %s\n"
-msgstr "ログファイル�書�出���ん���: %s\n"
+msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
+msgstr "符�化方�\"%2$s\"文字0x%1$s<�\"%3$s\"������り��ん"
 
-#: postmaster/syslogger.c:1083 postmaster/syslogger.c:1141
+#: utils/mb/conv.c:509
 #, c-format
-msgid "could not open new log file \"%s\": %m"
-msgstr "新��ログファイル\"%s\"をオープン����ん���: %m"
+msgid "invalid encoding number: %d"
+msgstr "符�化方�番��無効��: %d"
 
-#: postmaster/syslogger.c:1095 postmaster/syslogger.c:1153
-msgid "disabling automatic rotation (use SIGHUP to re-enable)"
+#: utils/misc/tzparser.c:61
+#, c-format
+msgid ""
+"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
+"zone file \"%s\", line %d"
 msgstr ""
-"自動ローテーションを無効������(�度有効��る��SIGHUPを使用�����"
-"�)"
+"時間帯ファイル\"%3$s\"�%4$d行�時間帯�略形\"%1$s\"�長����（最大%2$d文"
+"字）"
 
-#: postmaster/autovacuum.c:359
+#: utils/misc/tzparser.c:68
 #, c-format
-msgid "could not fork autovacuum launcher process: %m"
-msgstr "autovacuum ラン�ャープロセスを fork ����ん���: %m"
+msgid ""
+"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
+"\"%s\", line %d"
+msgstr ""
+"時間帯ファイル\"%2$s\"�%3$d行�時間帯オフセット%1$d�900秒（15分）��数��"
+"�り��ん。"
 
-#: postmaster/autovacuum.c:404
-msgid "autovacuum launcher started"
-msgstr "自動�キュームラン�ャプロセス"
+#: utils/misc/tzparser.c:80
+#, c-format
+msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%2$s\"�%3$d行�時間帯オフセット%1$d�範囲外��"
 
-#: postmaster/autovacuum.c:760
-msgid "autovacuum launcher shutting down"
-msgstr "自動�キュームラン�ャを�止�����"
+#: utils/misc/tzparser.c:115
+#, c-format
+msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%s\"�行%d�時間帯�略形��り��ん"
 
-#: postmaster/autovacuum.c:1394
+#: utils/misc/tzparser.c:124
 #, c-format
-msgid "could not fork autovacuum worker process: %m"
-msgstr "autovacuum ワーカープロセスを fork ����ん���: %m"
+msgid "missing time zone offset in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%s\"�行%d�時間帯オフセット��り��ん"
 
-#: postmaster/autovacuum.c:1595
+#: utils/misc/tzparser.c:131
 #, c-format
-msgid "autovacuum: processing database \"%s\""
-msgstr "autovacuum: データベース\"%s\"�処�中��"
+msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%s\"�行%d�時間帯オフセット数値�無効��"
 
-#: postmaster/autovacuum.c:1976
+#: utils/misc/tzparser.c:154
 #, c-format
-msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
-msgstr ""
-"autovacuum: データベース \"%3$s\" �����親������一時テーブル \"%1$s"
-"\".\"%2$s\" を削除�����"
+msgid "invalid syntax in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%s\"�行%d�構文�無効��"
 
-#: postmaster/autovacuum.c:1988
+#: utils/misc/tzparser.c:218
 #, c-format
-msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
-msgstr ""
-"autovacuum: データベース \"%3$s\" �����親������一時テーブル \"%1$s"
-"\".\"%2$s\" �見��り���"
+msgid "time zone abbreviation \"%s\" is multiply defined"
+msgstr "時間帯�略形\"%s\"�複数定義�れ����"
 
-#: postmaster/autovacuum.c:2249
+#: utils/misc/tzparser.c:220
 #, c-format
-msgid "automatic vacuum of table \"%s.%s.%s\""
-msgstr "テーブル\"%s.%s.%s\"�自動�キューム"
+msgid ""
+"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
+"\", line %d."
+msgstr "時間帯ファイル\"%s\"�行%d�項目��ファイル\"%s\"�行%d�競����。"
 
-#: postmaster/autovacuum.c:2252
+#: utils/misc/tzparser.c:285
 #, c-format
-msgid "automatic analyze of table \"%s.%s.%s\""
-msgstr "テーブル\"%s.%s.%s\"�自動解�"
-
-#: postmaster/autovacuum.c:2720
-msgid "autovacuum not started because of misconfiguration"
-msgstr "誤設定���autovacuumを起動����ん"
+msgid "invalid time zone file name \"%s\""
+msgstr "時間帯ファイル��無効��: \"%s\""
 
-#: postmaster/autovacuum.c:2721
-msgid "Enable the \"track_counts\" option."
-msgstr "\"track_counts\"オプションを有効����。"
+#: utils/misc/tzparser.c:298
+#, c-format
+msgid "time zone file recursion limit exceeded in file \"%s\""
+msgstr "ファイル\"%s\"�時間帯ファイル��帰�上�を超����。"
 
-#: postmaster/bgwriter.c:472
+#: utils/misc/tzparser.c:337 utils/misc/tzparser.c:350
 #, c-format
-msgid "checkpoints are occurring too frequently (%d second apart)"
-msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
-msgstr[0] "�ェック�イント�発生周期�短����(%d秒間隔)"
-msgstr[1] "�ェック�イント�発生周期�短����(%d秒間隔)"
+msgid "could not read time zone file \"%s\": %m"
+msgstr "時間帯ファイル\"%s\"を読�込���ん���: %m"
 
-#: postmaster/bgwriter.c:476
-msgid ""
-"Consider increasing the configuration parameter \"checkpoint_segments\"."
-msgstr "設定パラメータ\"checkpoint_segments\"�増加を検討������"
+#: utils/misc/tzparser.c:360
+#, c-format
+msgid "line is too long in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%s\"�行%d�長����。"
 
-#: postmaster/bgwriter.c:588
+#: utils/misc/tzparser.c:383
 #, c-format
-msgid "transaction log switch forced (archive_timeout=%d)"
-msgstr "トランザクションログ切り替��強制�れ��（archive_timeout=%d）"
+msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
+msgstr "時間帯ファイル\"%s\"�行%d�ファイル����@INCLUDE��り��"
 
-#: postmaster/bgwriter.c:1044
-msgid "checkpoint request failed"
-msgstr "�ェック�イント�求�失敗����"
+#: utils/misc/help_config.c:131
+msgid "internal error: unrecognized run-time parameter type\n"
+msgstr "内部エラー: 実行時パラメータ種類��明��\n"
 
-#: postmaster/bgwriter.c:1045
-msgid "Consult recent messages in the server log for details."
-msgstr "詳細�サー�ログ�最近�メッセージを調査������"
+#: utils/misc/guc.c:525
+msgid "Ungrouped"
+msgstr "��他"
 
-#: postmaster/pgarch.c:158
-#, c-format
-msgid "could not fork archiver: %m"
-msgstr "アーカイ�をfork����ん���: %m"
+#: utils/misc/guc.c:527
+msgid "File Locations"
+msgstr "ファイル��置"
 
-#: postmaster/pgarch.c:450
-msgid "archive_mode enabled, yet archive_command is not set"
-msgstr "archive_mode�有効����archive_command�設定�れ����ん"
+#: utils/misc/guc.c:529
+msgid "Connections and Authentication"
+msgstr "接続��証"
 
-#: postmaster/pgarch.c:465
-#, c-format
-msgid "transaction log file \"%s\" could not be archived: too many failures"
-msgstr ""
-"トランザクションログファイル\"%s\"をアーカイブ����ん���: 失敗�多��"
-"��"
+#: utils/misc/guc.c:531
+msgid "Connections and Authentication / Connection Settings"
+msgstr "接続��証/接続設定"
 
-#: postmaster/pgarch.c:568
-#, c-format
-msgid "archive command failed with exit code %d"
-msgstr "アーカイブコマンド�リターンコード %d�失敗����"
+#: utils/misc/guc.c:533
+msgid "Connections and Authentication / Security and Authentication"
+msgstr "接続��証/セキュリティ��証"
 
-#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
-#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
-#, c-format
-msgid "The failed archive command was: %s"
-msgstr "失敗��アーカイブコマンド�次���り��: %s"
+#: utils/misc/guc.c:535
+msgid "Resource Usage"
+msgstr "リソース�使用"
 
-#: postmaster/pgarch.c:577
-#, c-format
-msgid "archive command was terminated by exception 0x%X"
-msgstr "アーカイブコマンド�例外0x%X�終了����"
+#: utils/misc/guc.c:537
+msgid "Resource Usage / Memory"
+msgstr "リソース�使用/メモリ"
 
-#: postmaster/pgarch.c:579 postmaster/postmaster.c:2822
-msgid ""
-"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
-msgstr ""
-"16進値�説明�����C インクルードファイル\"ntstatus.h\"を�照�����"
-"�。"
+#: utils/misc/guc.c:539
+msgid "Resource Usage / Kernel Resources"
+msgstr "リソース�使用/カー�ルリソース"
 
-#: postmaster/pgarch.c:584
-#, c-format
-msgid "archive command was terminated by signal %d: %s"
-msgstr "アーカイブコマンド�シグナル%d�より終了����: %s"
+#: utils/misc/guc.c:541
+msgid "Resource Usage / Cost-Based Vacuum Delay"
+msgstr "使用リソース / コストベース� vacuum �延"
 
-#: postmaster/pgarch.c:591
-#, c-format
-msgid "archive command was terminated by signal %d"
-msgstr "アーカイブコマンド�シグナル%d�より終了����"
+#: utils/misc/guc.c:543
+msgid "Resource Usage / Background Writer"
+msgstr "使用リソース / �ックグラウンド・ライタ"
 
-#: postmaster/pgarch.c:600
-#, c-format
-msgid "archive command exited with unrecognized status %d"
-msgstr "アーカイブコマンド��明�ステータス%d�終了����"
+#: utils/misc/guc.c:545
+msgid "Resource Usage / Asynchronous Behavior"
+msgstr "使用リソース / ��期処�"
 
-#: postmaster/pgarch.c:612
-#, c-format
-msgid "archived transaction log file \"%s\""
-msgstr "トランザクションログファイル\"%s\"をアーカイブ����"
+#: utils/misc/guc.c:547
+msgid "Write-Ahead Log"
+msgstr "ログ先行書�込�"
 
-#: postmaster/pgarch.c:661
-#, c-format
-msgid "could not open archive status directory \"%s\": %m"
-msgstr "アーカイブステータスディレクトリ\"%s\"をオープン����ん���: %m"
+#: utils/misc/guc.c:549
+msgid "Write-Ahead Log / Settings"
+msgstr "ログ先行書�込� / 設定"
 
-#: postmaster/pgarch.c:715 access/transam/xlog.c:4429
-#: access/transam/xlog.c:5378 access/transam/xlog.c:5431
-#: access/transam/xlog.c:6007
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "ファイル\"%s\"���を\"%s\"�変更����ん���: %m"
+#: utils/misc/guc.c:551
+msgid "Write-Ahead Log / Checkpoints"
+msgstr "ログ先行書�込� / �ェック�イント"
 
-#: postmaster/postmaster.c:566
-#, c-format
-msgid "%s: invalid argument for option -f: \"%s\"\n"
-msgstr "%s: -fオプション�無効�引数: \"%s\"\n"
+#: utils/misc/guc.c:553
+msgid "Write-Ahead Log / Archiving"
+msgstr "ログ先行書�込� / アーカイビング"
 
-#: postmaster/postmaster.c:652
-#, c-format
-msgid "%s: invalid argument for option -t: \"%s\"\n"
-msgstr "%s: -tオプション�無効�引数: \"%s\"\n"
+#: utils/misc/guc.c:555
+msgid "Write-Ahead Log / Streaming Replication"
+msgstr "ログ先行書�込� / ストリーミング・レプリケーション"
 
-#: postmaster/postmaster.c:692 postmaster/postmaster.c:705
-#: bootstrap/bootstrap.c:288
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "詳細�\"%s --help\"を実行������。\n"
+#: utils/misc/guc.c:557
+msgid "Write-Ahead Log / Standby Servers"
+msgstr "ログ先行書�込� / スタン�イサー�"
 
-#: postmaster/postmaster.c:703
-#, c-format
-msgid "%s: invalid argument: \"%s\"\n"
-msgstr "%s: 無効�引数: \"%s\"\n"
+#: utils/misc/guc.c:559
+msgid "Query Tuning"
+msgstr "������調整"
 
-#: postmaster/postmaster.c:728
-#, c-format
-msgid "%s: superuser_reserved_connections must be less than max_connections\n"
-msgstr ""
-"%s: superuser_reserved_connections�max_connectionsより�����れ��り��"
-"ã‚“\n"
+#: utils/misc/guc.c:561
+msgid "Query Tuning / Planner Method Configuration"
+msgstr "������調整/プランナ手法�設定"
 
-#: postmaster/postmaster.c:733
-msgid ""
-"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
-"\"hot_standby\""
-msgstr ""
-"WAL アーカイブ(archive_mode=on) �� wal_level を \"archive\" ��� \"hot_standby\" ��る必���り��"
+#: utils/misc/guc.c:563
+msgid "Query Tuning / Planner Cost Constants"
+msgstr "������調整/プランナ�コスト定数"
 
-#: postmaster/postmaster.c:736
-msgid ""
-"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
-"\"hot_standby\""
-msgstr ""
-"WAL ストリーミング(max_wal_senders > 0) �� wal_level を \"archive\" ��� \"hot_standby\" ��る必���り��"
+#: utils/misc/guc.c:565
+msgid "Query Tuning / Genetic Query Optimizer"
+msgstr "������調整/��的�����オプティマイザ"
 
-#: postmaster/postmaster.c:744
-#, c-format
-msgid "%s: invalid datetoken tables, please fix\n"
-msgstr "%s: データトークンテーブル�無効��。修復������\n"
+#: utils/misc/guc.c:567
+msgid "Query Tuning / Other Planner Options"
+msgstr "������調整/��他�プラン��オプション"
 
-#: postmaster/postmaster.c:850
-msgid "invalid list syntax for \"listen_addresses\""
-msgstr "\"listen_addresses\"用�リスト構文�無効��"
+#: utils/misc/guc.c:569
+msgid "Reporting and Logging"
+msgstr "レ�ート�ログ"
 
-#: postmaster/postmaster.c:871
-#, c-format
-msgid "could not create listen socket for \"%s\""
-msgstr "\"%s\"�関�る監視用ソケットを作�����ん���"
+#: utils/misc/guc.c:571
+msgid "Reporting and Logging / Where to Log"
+msgstr "レ�ート�ログ/ログ�場所"
 
-#: postmaster/postmaster.c:877
-msgid "could not create any TCP/IP sockets"
-msgstr "TCP/IPソケットを作�����ん���"
+#: utils/misc/guc.c:573
+msgid "Reporting and Logging / When to Log"
+msgstr "レ�ート�ログ/ログ�タイミング"
 
-#: postmaster/postmaster.c:928
-msgid "could not create Unix-domain socket"
-msgstr "Unixドメインソケットを作�����ん���"
+#: utils/misc/guc.c:575
+msgid "Reporting and Logging / What to Log"
+msgstr "レ�ート�ログ/ログ�内容"
 
-#: postmaster/postmaster.c:936
-msgid "no socket created for listening"
-msgstr "監視用�作��るソケット��り��ん"
+#: utils/misc/guc.c:577
+msgid "Statistics"
+msgstr "統計情報"
 
-#: postmaster/postmaster.c:962
-msgid "could not create I/O completion port for child queue"
-msgstr "�キュー���I/O終了�ートを作�����ん���"
+#: utils/misc/guc.c:579
+msgid "Statistics / Monitoring"
+msgstr "統計情報/監視"
 
-#: postmaster/postmaster.c:1006
-#, c-format
-msgid "%s: could not write external PID file \"%s\": %s\n"
-msgstr "%s: 外部PIDファイル\"%s\"�書�出���ん���: %s\n"
+#: utils/misc/guc.c:581
+msgid "Statistics / Query and Index Statistics Collector"
+msgstr "統計情報/������インデックス�統計情報�集器"
 
-#: postmaster/postmaster.c:1121
-#, c-format
-msgid "%s: could not locate matching postgres executable"
-msgstr "%s: 一致�るpostgres実行ファイル��り��ん���"
+#: utils/misc/guc.c:583
+msgid "Autovacuum"
+msgstr "自動�キューム"
 
-#: postmaster/postmaster.c:1172
-#, c-format
-msgid "data directory \"%s\" does not exist"
-msgstr "データディレクトリ\"%s\"�存在���ん"
+#: utils/misc/guc.c:585
+msgid "Client Connection Defaults"
+msgstr "クライアント接続�デフォルト"
 
-#: postmaster/postmaster.c:1177
-#, c-format
-msgid "could not read permissions of directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"�権�を読��れ��ん���: %m"
+#: utils/misc/guc.c:587
+msgid "Client Connection Defaults / Statement Behavior"
+msgstr "クライアント接続�デフォルト/文�振舞�"
 
-#: postmaster/postmaster.c:1185
-#, c-format
-msgid "specified data directory \"%s\" is not a directory"
-msgstr "指定�れ�データディレクトリ \"%s\" �ディレクトリ���り��ん"
+#: utils/misc/guc.c:589
+msgid "Client Connection Defaults / Locale and Formatting"
+msgstr "クライアント接続�デフォルト/ロケール�整形"
 
-#: postmaster/postmaster.c:1201
-#, c-format
-msgid "data directory \"%s\" has wrong ownership"
-msgstr "データディレクトリ\"%s\"�所有者情報�間������"
+#: utils/misc/guc.c:591
+msgid "Client Connection Defaults / Other Defaults"
+msgstr "クライアント接続�デフォルト/��他�デフォルト"
 
-#: postmaster/postmaster.c:1203
-msgid "The server must be started by the user that owns the data directory."
-msgstr "データディレクトリを所有�るユーザ�サー�を起動���れ��り��ん。"
+#: utils/misc/guc.c:593
+msgid "Lock Management"
+msgstr "ロック管�"
+
+#: utils/misc/guc.c:595
+msgid "Version and Platform Compatibility"
+msgstr "�ージョン�プラットフォーム間�互�性"
+
+#: utils/misc/guc.c:597
+msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
+msgstr "�ージョン�プラットフォーム間�互�性/以���ージョン�PostgreSQL"
+
+#: utils/misc/guc.c:599
+msgid "Version and Platform Compatibility / Other Platforms and Clients"
+msgstr ""
+"�ージョン�プラットフォーム間�互�性/他�プラットフォーム�クライアント"
 
-#: postmaster/postmaster.c:1223
-#, c-format
-msgid "data directory \"%s\" has group or world access"
-msgstr "データディレクトリ\"%s\"�グループ���第三者�らアクセス�能��"
+#: utils/misc/guc.c:601
+msgid "Error Handling"
+msgstr "エラー�ンドリング"
 
-#: postmaster/postmaster.c:1225
-msgid "Permissions should be u=rwx (0700)."
-msgstr "権��u=rwx(0700)���れ��り��ん"
+#: utils/misc/guc.c:603
+msgid "Preset Options"
+msgstr "事�設定オプション"
 
-#: postmaster/postmaster.c:1236
-#, c-format
-msgid ""
-"%s: could not find the database system\n"
-"Expected to find it in the directory \"%s\",\n"
-"but could not open file \"%s\": %s\n"
-msgstr ""
-"%s: データベースシステム��り��ん���\n"
-"ディレクトリ\"%s\"��るも��想定��������\n"
-"ファイル\"%s\"をオープン����ん���: %s\n"
+#: utils/misc/guc.c:605
+msgid "Customized Options"
+msgstr "カスタマイズ用オプション"
 
-#: postmaster/postmaster.c:1272
-#, c-format
-msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: ファイル\"%s\"をオープン����ん���: %s\n"
+#: utils/misc/guc.c:607
+msgid "Developer Options"
+msgstr "開発者��オプション"
 
-#: postmaster/postmaster.c:1279
-#, c-format
-msgid "%s: could not open log file \"%s/%s\": %s\n"
-msgstr "%s: ログファイル \"%s/%s\" をオープン����ん: %s\n"
+#: utils/misc/guc.c:661
+msgid "Enables the planner's use of sequential-scan plans."
+msgstr "プランナ�よるシーケンシャルスキャン計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1290
-#, c-format
-msgid "%s: could not fork background process: %s\n"
-msgstr "%s: �ックグランドプロセスをfork����ん���: %s\n"
+#: utils/misc/guc.c:670
+msgid "Enables the planner's use of index-scan plans."
+msgstr "プランナ�よるインデックススキャン計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1312
-#, c-format
-msgid "%s: could not dissociate from controlling TTY: %s\n"
-msgstr "%s: 制御TTY�ら切り離���ん���: %s\n"
+#: utils/misc/guc.c:679
+msgid "Enables the planner's use of bitmap-scan plans."
+msgstr "プランナ�よるビットマップスキャン計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1407
-#, c-format
-msgid "select() failed in postmaster: %m"
-msgstr "postmaster�select()�失敗����: %m"
+#: utils/misc/guc.c:688
+msgid "Enables the planner's use of TID scan plans."
+msgstr "プランナ�よるTIDスキャン計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1564 postmaster/postmaster.c:1595
-msgid "incomplete startup packet"
-msgstr "開始パケット��完全��"
+#: utils/misc/guc.c:697
+msgid "Enables the planner's use of explicit sort steps."
+msgstr "プランナ�よる明示的ソート段階�使用を有効����。"
 
-#: postmaster/postmaster.c:1576
-msgid "invalid length of startup packet"
-msgstr "開始パケット�長��無効��"
+#: utils/misc/guc.c:706
+msgid "Enables the planner's use of hashed aggregation plans."
+msgstr "プランナ�よる�ッシュ�れ�集約計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1633
-#, c-format
-msgid "failed to send SSL negotiation response: %m"
-msgstr "SSL調�応答��信�失敗����: %m"
+#: utils/misc/guc.c:715
+msgid "Enables the planner's use of materialization."
+msgstr "プランナ�よる具体化(materialization)�使用を有効����。"
 
-#: postmaster/postmaster.c:1662
-#, c-format
-msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
-msgstr ""
-"フロントエンドプロトコル%u.%uをサ�ート�����ん: サー��%u.0�ら %u.%u�"
-"�をサ�ート���"
+#: utils/misc/guc.c:724
+msgid "Enables the planner's use of nested-loop join plans."
+msgstr "プランナ�よる入れ�状ループ��計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1713
-msgid "invalid value for boolean option \"replication\""
-msgstr "ブールオプション \"replication\" �無効��"
+#: utils/misc/guc.c:733
+msgid "Enables the planner's use of merge join plans."
+msgstr "プランナ�よるマージ��計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1733
-msgid "invalid startup packet layout: expected terminator as last byte"
-msgstr ""
-"開始パケット�構��無効��。最終�イト�想定外�ターミ�ータ��り���"
+#: utils/misc/guc.c:742
+msgid "Enables the planner's use of hash join plans."
+msgstr "プランナ�よる�ッシュ��計画�使用を有効����。"
 
-#: postmaster/postmaster.c:1761
-msgid "no PostgreSQL user name specified in startup packet"
-msgstr "開始パケット中�指定�れ�PostgreSQLユーザ��存在���ん"
+#: utils/misc/guc.c:751
+msgid "Enables genetic query optimization."
+msgstr "��的�����最�化を有効����。"
 
-#: postmaster/postmaster.c:1818
-msgid "the database system is starting up"
-msgstr "データベースシステム�起動�����"
+#: utils/misc/guc.c:752
+msgid "This algorithm attempts to do planning without exhaustive searching."
+msgstr "��アルゴリズム����ら����検索を行���計画�作�を試���。"
 
-#: postmaster/postmaster.c:1823
-msgid "the database system is shutting down"
-msgstr "データベースシステム�シャットダウン�����"
+#: utils/misc/guc.c:762
+msgid "Shows whether the current user is a superuser."
+msgstr "�在�ユーザ�スーパーユーザ����を表示���。"
 
-#: postmaster/postmaster.c:1828
-msgid "the database system is in recovery mode"
-msgstr "データベースシステム�リカ�リモード��"
+#: utils/misc/guc.c:772
+msgid "Enables advertising the server via Bonjour."
+msgstr "Bonjour を経由��サー�ー広告を有効����"
 
-#: postmaster/postmaster.c:1895
-#, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "プロセス%d�対�るキャンセル�求����キー�間������"
+#: utils/misc/guc.c:781
+msgid "Enables SSL connections."
+msgstr "SSL接続を有効����。"
 
-#: postmaster/postmaster.c:1903
-#, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "キャンセル�求内�PID %d���プロセス�も一致���ん"
+#: utils/misc/guc.c:790
+msgid "Forces synchronization of updates to disk."
+msgstr "強制的�更新をディスク��期���。"
 
-#: postmaster/postmaster.c:2104
-msgid "received SIGHUP, reloading configuration files"
-msgstr "SIGHUPを���り���。設定ファイルをリロード�����"
+#: utils/misc/guc.c:791
+msgid ""
+"The server will use the fsync() system call in several places to make sure "
+"that updates are physically written to disk. This insures that a database "
+"cluster will recover to a consistent state after an operating system or "
+"hardware crash."
+msgstr ""
+"サー���確実�更新�物�的�ディスク�書�込�れるよ��複数�����fsync"
+"()システムコールを使用���。�れ�より�オペレーティングシステムや�ード"
+"ウェア�クラッシュ��後�もデータベースクラスタ�一貫��状態�復旧�る��"
+"�����。"
 
-#: postmaster/postmaster.c:2127
-msgid "pg_hba.conf not reloaded"
-msgstr "pg_hba.conf ��読�込��れ��ん"
+#: utils/misc/guc.c:802
+msgid "Continues processing past damaged page headers."
+msgstr "破���ページヘッダ����も処�を継続���。"
 
-#: postmaster/postmaster.c:2170
-msgid "received smart shutdown request"
-msgstr "スマートシャットダウン�求を���り���"
+#: utils/misc/guc.c:803
+msgid ""
+"Detection of a damaged page header normally causes PostgreSQL to report an "
+"error, aborting the current transaction. Setting zero_damaged_pages to true "
+"causes the system to instead report a warning, zero out the damaged page, "
+"and continue processing. This behavior will destroy data, namely all the "
+"rows on the damaged page."
+msgstr ""
+"ページヘッダ�障害�分�る��通常PostgreSQL�エラー�報告を行����在�ト"
+"ランザクションを中断����。zero_damaged_pagesを真�設定�る���より�シ"
+"ステム�代�り�警告を報告��障害��るページをゼロ�埋��処�を継続��"
+"�。 ��動作�より�障害����ページ上��る全��行�データを破壊�れ�"
+"�。"
 
-#: postmaster/postmaster.c:2217
-msgid "received fast shutdown request"
-msgstr "高速シャットダウン�求を���り���"
+#: utils/misc/guc.c:816
+msgid "Writes full pages to WAL when first modified after a checkpoint."
+msgstr ""
+"�ェック�イント�後最��変更�れ�時�ページ全体をWAL�書�出���。"
 
-#: postmaster/postmaster.c:2235
-msgid "aborting any active transactions"
-msgstr "活動中�全トランザクションをアボート�����"
+#: utils/misc/guc.c:817
+msgid ""
+"A page write in process during an operating system crash might be only "
+"partially written to disk.  During recovery, the row changes stored in WAL "
+"are not enough to recover.  This option writes pages when first modified "
+"after a checkpoint to WAL so full recovery is possible."
+msgstr ""
+"オペレーティングシステム�クラッシュ��時�ページ書�込��実行中���場"
+"�\n"
+"����部分的�ディスク��書�出��起�る�能性��り��。リカ�リ中�"
+"WAL\n"
+"��存�れ�行�変更��完全�復旧��る�������ん。��オプション�よ"
+"り�\n"
+"�ェック�イント�後�最��変更時�WAL�ページを書�出������完全�復"
+"æ—§\n"
+"��能��り��。"
 
-#: postmaster/postmaster.c:2264
-msgid "received immediate shutdown request"
-msgstr "�時シャットダウン�求を���り���"
+#: utils/misc/guc.c:829
+msgid "Runs the server silently."
+msgstr "サー�を出力���実行���。"
 
-#: postmaster/postmaster.c:2340 postmaster/postmaster.c:2368
-msgid "startup process"
-msgstr "起動プロセス"
+#: utils/misc/guc.c:830
+msgid ""
+"If this parameter is set, the server will automatically run in the "
+"background and any controlling terminals are dissociated."
+msgstr ""
+"��オプションを設定�る��サー��自動的��ックグランド�起動��制御端末"
+"を切り離���。"
 
-#: postmaster/postmaster.c:2343
-msgid "aborting startup due to startup process failure"
-msgstr "起動プロセス�失敗���起動を中断�����"
+#: utils/misc/guc.c:839
+msgid "Logs each checkpoint."
+msgstr "��ェック�イントをログ�出力���。"
 
-#: postmaster/postmaster.c:2402
-msgid "database system is ready to accept connections"
-msgstr "データベースシステム�接続�付準備�整����。"
+#: utils/misc/guc.c:848
+msgid "Logs each successful connection."
+msgstr "�功��接続を全�ログ�出力���。"
 
-#: postmaster/postmaster.c:2457
-msgid "background writer process"
-msgstr "�ックグランドライタプロセス"
+#: utils/misc/guc.c:857
+msgid "Logs end of a session, including duration."
+msgstr "セッション�終了時刻���期間をログ�出力���。"
 
-#: postmaster/postmaster.c:2473
-msgid "WAL writer process"
-msgstr "WALライタプロセス"
+#: utils/misc/guc.c:866
+msgid "Turns on various assertion checks."
+msgstr "�種アサーション検査を有効����。"
 
-#: postmaster/postmaster.c:2487
-msgid "WAL receiver process"
-msgstr "WAL �信プロセス"
+#: utils/misc/guc.c:867
+msgid "This is a debugging aid."
+msgstr "�れ�デ�ッグ用��。"
 
-#: postmaster/postmaster.c:2502
-msgid "autovacuum launcher process"
-msgstr "自動�キュームラン�ャプロセス"
+#: utils/misc/guc.c:881
+msgid "Terminate session on any error."
+msgstr "何�ら�エラー��れ�セッションを終了���"
 
-#: postmaster/postmaster.c:2517
-msgid "archiver process"
-msgstr "アーカイ�プロセス"
+#: utils/misc/guc.c:890
+msgid "Reinitialize after backend crash."
+msgstr "�ックエンド�クラッシュ��ら��期化���"
 
-#: postmaster/postmaster.c:2533
-msgid "statistics collector process"
-msgstr "統計情報�集プロセス"
+#: utils/misc/guc.c:900
+msgid "Logs the duration of each completed SQL statement."
+msgstr "完了��SQL全��期間をログ�出力���。"
 
-#: postmaster/postmaster.c:2547
-msgid "system logger process"
-msgstr "システムログ�得プロセス"
+#: utils/misc/guc.c:909
+msgid "Logs each query's parse tree."
+msgstr "�クエリー�パースツリー�ログを�り��"
 
-#: postmaster/postmaster.c:2582 postmaster/postmaster.c:2592
-#: postmaster/postmaster.c:2610
-msgid "server process"
-msgstr "サー�プロセス"
+#: utils/misc/guc.c:918
+msgid "Logs each query's rewritten parse tree."
+msgstr "�クエリー�パースツリー��度書�れ�分�ログを�り��"
 
-#: postmaster/postmaster.c:2646
-msgid "terminating any other active server processes"
-msgstr "他�活動中�サー�プロセスを終了�����"
+#: utils/misc/guc.c:927
+msgid "Logs each query's execution plan."
+msgstr "�クエリー�実行計画をログ�出力���。"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2811
-#, c-format
-msgid "%s (PID %d) exited with exit code %d"
-msgstr "%s (PID %d)�終了コード%d�終了����"
+#: utils/misc/guc.c:936
+msgid "Indents parse and plan tree displays."
+msgstr "解�ツリー�計画ツリー�表示をインデント���。"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2820
-#, c-format
-msgid "%s (PID %d) was terminated by exception 0x%X"
-msgstr "%s (PID %d)�例外%X�終了����"
+#: utils/misc/guc.c:945
+msgid "Writes parser performance statistics to the server log."
+msgstr "パーサ�性能統計情報をサー�ログ�出力���。"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2829
-#, c-format
-msgid "%s (PID %d) was terminated by signal %d: %s"
-msgstr "%s (PID %d)�シグナル%d�終了����: %s"
+#: utils/misc/guc.c:954
+msgid "Writes planner performance statistics to the server log."
+msgstr "プランナ�性能統計情報をサー�ログ�出力���。"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2839
-#, c-format
-msgid "%s (PID %d) was terminated by signal %d"
-msgstr "%s (PID %d)�シグナル%d�終了����"
+#: utils/misc/guc.c:963
+msgid "Writes executor performance statistics to the server log."
+msgstr "エグゼキュータ�性能統計情報をサー�ログ�出力���。"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2848
-#, c-format
-msgid "%s (PID %d) exited with unrecognized status %d"
-msgstr "%s (PID %d)��識����ステータス%d�終了����"
+#: utils/misc/guc.c:972
+msgid "Writes cumulative performance statistics to the server log."
+msgstr "累��性能統計情報をサー�ログ�出力���。"
 
-#: postmaster/postmaster.c:3028
-msgid "abnormal database system shutdown"
-msgstr "データベースシステム�異常�シャットダウン����"
+#: utils/misc/guc.c:982 utils/misc/guc.c:1047 utils/misc/guc.c:1057
+#: utils/misc/guc.c:1067 utils/misc/guc.c:1077 utils/misc/guc.c:1802
+#: utils/misc/guc.c:1812
+msgid "No description available."
+msgstr "説明文��り��ん"
 
-#: postmaster/postmaster.c:3066
-msgid "all server processes terminated; reinitializing"
-msgstr "全��サー�プロセス�終了����: ��期化�����"
+#: utils/misc/guc.c:994
+msgid "Collects information about executing commands."
+msgstr "実行中�コマンド�関�る情報を�集���。"
 
-#: postmaster/postmaster.c:3238
-#, c-format
-msgid "could not fork new process for connection: %m"
-msgstr "接続用�新��プロセスをfork����ん���: %m"
+#: utils/misc/guc.c:995
+msgid ""
+"Enables the collection of information on the currently executing command of "
+"each session, along with the time at which that command began execution."
+msgstr ""
+"�セッション��在実行中�コマンド�関�����コマンド�実行を開始��時点"
+"�時刻�一緒�情報��集を有効����。"
 
-#: postmaster/postmaster.c:3280
-msgid "could not fork new process for connection: "
-msgstr "接続用�新��プロセスをfork����ん���"
+#: utils/misc/guc.c:1005
+msgid "Collects statistics on database activity."
+msgstr "データベース�活動����統計情報を�集���。"
 
-#: postmaster/postmaster.c:3394
-msgid "connection received: host=%s port=%s"
-msgstr "接続を��付����: ホスト=%s �ート番�=%s"
+#: utils/misc/guc.c:1015
+msgid "Updates the process title to show the active SQL command."
+msgstr "活動中�SQLコマンドを表示�るよ�プロセスタイトルを更新���。"
 
-#: postmaster/postmaster.c:3399
-msgid "connection received: host=%s"
-msgstr "接続を��付����: ホスト=%s"
+#: utils/misc/guc.c:1016
+msgid ""
+"Enables updating of the process title every time a new SQL command is "
+"received by the server."
+msgstr ""
+"新��SQLコマンドをサー���信�る度�プロセスタイトルを更新�る��を有効�"
+"���。"
 
-#: postmaster/postmaster.c:3666
-#, c-format
-msgid "could not execute server process \"%s\": %m"
-msgstr "サー�プロセス\"%s\"を実行����ん���: %m"
+#: utils/misc/guc.c:1025
+msgid "Starts the autovacuum subprocess."
+msgstr "subprocessサブプロセスを起動���。"
 
-#: postmaster/postmaster.c:4179
-msgid "database system is ready to accept read only connections"
-msgstr "データベースシステム�リードオンリー接続��付準備������"
+#: utils/misc/guc.c:1035
+msgid "Generates debugging output for LISTEN and NOTIFY."
+msgstr "LISTEN�NOTIFYコマンド����デ�ッグ出力を生����。"
 
-#: postmaster/postmaster.c:4420
-#, c-format
-msgid "could not fork startup process: %m"
-msgstr "起動プロセスをfork����ん���: %m"
+#: utils/misc/guc.c:1089
+msgid "Logs long lock waits."
+msgstr "長期�ロック待機をログ�記録���。"
 
-#: postmaster/postmaster.c:4424
-#, c-format
-msgid "could not fork background writer process: %m"
-msgstr "�ックグランドライタプロセスをfork����ん���: %m"
+#: utils/misc/guc.c:1099
+msgid "Logs the host name in the connection logs."
+msgstr "接続ログ内�ホスト�を出力���。"
 
-#: postmaster/postmaster.c:4428
-#, c-format
-msgid "could not fork WAL writer process: %m"
-msgstr "WALライタプロセスをfork����ん���: %m"
+#: utils/misc/guc.c:1100
+msgid ""
+"By default, connection logs only show the IP address of the connecting host. "
+"If you want them to show the host name you can turn this on, but depending "
+"on your host name resolution setup it might impose a non-negligible "
+"performance penalty."
+msgstr ""
+"デフォルト���接続ログメッセージ��接続ホスト�IPアドレス���表示�れ�"
+"�。 ��オプションを有効��る����ホスト�もログ�表示�れるよ���り�"
+"�。 ホスト�解決�設定次第��無視�������性能�悪化�課�られる���"
+"注�������。"
 
-#: postmaster/postmaster.c:4432
-msgid "could not fork WAL receiver process: %m"
-msgstr "WAL �信プロセスを fork ����ん���: %m"
+#: utils/misc/guc.c:1111
+msgid "Causes subtables to be included by default in various commands."
+msgstr "�種コマンド�����デフォルト��テーブルを��るよ�����。"
 
-#: postmaster/postmaster.c:4436
-#, c-format
-msgid "could not fork process: %m"
-msgstr "プロセスをfork����ん���: %m"
+#: utils/misc/guc.c:1120
+msgid "Encrypt passwords."
+msgstr "パスワードを暗�化���。"
 
-#: postmaster/postmaster.c:4718
-#, c-format
-msgid "could not duplicate socket %d for use in backend: error code %d"
+#: utils/misc/guc.c:1121
+msgid ""
+"When a password is specified in CREATE USER or ALTER USER without writing "
+"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
+"password is to be encrypted."
 msgstr ""
-"�ックエンド�使用�る���ソケット%dを複製����ん���: エラーコード %d"
+"ENCRYPTEDも���UNENCRYPTED�指定無��CREATE USERも���ALTER USER�パス"
+"ワード�指定�れ�場����オプション�パスワード�暗�化を行������を"
+"決定���。"
 
-#: postmaster/postmaster.c:4750
-#, c-format
-msgid "could not create inherited socket: error code %d\n"
-msgstr "継承��ソケットを作�����ん���: エラーコード %d\n"
+#: utils/misc/guc.c:1131
+msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
+msgstr "\"expr=NULL\"���形���\"expr IS NULL\"���扱���。"
 
-#: postmaster/postmaster.c:4779 postmaster/postmaster.c:4786
-#, c-format
-msgid "could not read from backend variables file \"%s\": %s\n"
-msgstr "�ックエンド変数ファイル\"%s\"�ら読��れ��ん���: %s\n"
+#: utils/misc/guc.c:1132
+msgid ""
+"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
+"treated as expr IS NULL, that is, they return true if expr evaluates to the "
+"null value, and false otherwise. The correct behavior of expr = NULL is to "
+"always return null (unknown)."
+msgstr ""
+"有効���場��expr = NULL(���NULL = expr)���形���expr IS NULL��"
+"�扱�れ��。��り�expr�評価�NULL値�場��真を��も����を返��"
+"�。expr = NULL�SQL仕様�基���正��動作�常�NULL(未知)を返�����。"
 
-#: postmaster/postmaster.c:4795
-#, c-format
-msgid "could not remove file \"%s\": %s\n"
-msgstr "ファイル\"%s\"を削除����ん���: %s\n"
+#: utils/misc/guc.c:1144
+msgid "Enables per-database user names."
+msgstr "データベース毎�ユーザ�を許����。"
 
-#: postmaster/postmaster.c:4808
-#, c-format
-msgid "could not map view of backend variables: error code %d\n"
-msgstr "�ックエンド変数�ビューをマップ����ん���: エラーコード %d\n"
+#: utils/misc/guc.c:1154
+msgid "This parameter doesn't do anything."
+msgstr "��パラメータ�何も���ん。"
 
-#: postmaster/postmaster.c:4817
-#, c-format
-msgid "could not unmap view of backend variables: error code %d\n"
+#: utils/misc/guc.c:1155
+msgid ""
+"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
+"vintage clients."
 msgstr ""
-"�ックエンド変数�ビューをアンマップ����ん���: エラーコード %d\n"
+"��7.3�クライアント�ら�SET AUTOCOMMIT TO ON�エラー�����������"
+"��れ�存在���。"
 
-#: postmaster/postmaster.c:4824
-#, c-format
-msgid "could not close handle to backend parameter variables: error code %d\n"
+#: utils/misc/guc.c:1164
+msgid "Sets the default read-only status of new transactions."
 msgstr ""
-"�ックエンドパラメータ変数��ンドルをクローズ����ん���: エラーコード%"
-"d\n"
+"新��トランザクション�読��り��ステータス�デフォルトを設定���。"
 
-#: postmaster/postmaster.c:4967
-msgid "could not read exit code for process\n"
-msgstr "�プロセス�終了コード�読�込������ん���\n"
+#: utils/misc/guc.c:1173
+msgid "Sets the current transaction's read-only status."
+msgstr "�愛�トランザクション�読��り��ステータスを設定���。"
 
-#: postmaster/postmaster.c:4972
-msgid "could not post child completion status\n"
-msgstr "個プロセス�終了コードを投稿����ん���\n"
+#: utils/misc/guc.c:1183
+#, 
+msgid "Sets the default deferrable status of new transactions."
+msgstr "新��トランザクション��延�能ステータス�デフォルトを設定���。"
 
-#: postmaster/pgstat.c:328
-#, c-format
-msgid "could not resolve \"localhost\": %s"
-msgstr "\"localhost\"を解決����ん���: %s"
+#: utils/misc/guc.c:1192
+msgid ""
+"Whether to defer a read-only serializable transaction until it can be "
+"executed with no possible serialization failures."
+msgstr ""
+"リードオンリー�シリアライズ�能�トランザクションを�シリアライズ�失敗"
+"�る����実行��る��を�証��る���延��る����"
 
-#: postmaster/pgstat.c:351
-msgid "trying another address for the statistics collector"
-msgstr "統計情報コレクタ用�別�アドレスを試�����"
+#: utils/misc/guc.c:1202
+msgid "Check function bodies during CREATE FUNCTION."
+msgstr "CREATE FUNCTION中�関数本体を検査���。"
 
-#: postmaster/pgstat.c:360
-#, c-format
-msgid "could not create socket for statistics collector: %m"
-msgstr "統計情報コレクタ用�ソケットを作�����ん���: %m"
+#: utils/misc/guc.c:1211
+msgid "Enable input of NULL elements in arrays."
+msgstr "�列内�NULL�素入力を�能����「。"
 
-#: postmaster/pgstat.c:372
-#, c-format
-msgid "could not bind socket for statistics collector: %m"
-msgstr "統計情報コレクタ�ソケットを�インド����ん���: %m"
+#: utils/misc/guc.c:1212
+msgid ""
+"When turned on, unquoted NULL in an array input value means a null value; "
+"otherwise it is taken literally."
+msgstr ""
+"有効��る���列入力値���る引用符���NULL�NULL値を�味�るよ���り"
+"��。�も�������解釈�れ��。"
 
-#: postmaster/pgstat.c:383
-#, c-format
-msgid "could not get address of socket for statistics collector: %m"
-msgstr "統計情報コレクタ�ソケット�らアドレスを入手����ん���: %m"
+#: utils/misc/guc.c:1222
+msgid "Create new tables with OIDs by default."
+msgstr "新��テーブルをデフォルト�OID付��作����。"
 
-#: postmaster/pgstat.c:399
-#, c-format
-msgid "could not connect socket for statistics collector: %m"
-msgstr "統計情報コレクタ�ソケット�接続����ん���: %m"
+#: utils/misc/guc.c:1231
+msgid ""
+"Start a subprocess to capture stderr output and/or csvlogs into log files."
+msgstr ""
+"標準エラー出力�CSVログ������両方をログファイル����る����プロセ"
+"スを開始���。"
 
-#: postmaster/pgstat.c:420
-#, c-format
-msgid "could not send test message on socket for statistics collector: %m"
-msgstr "統計情報コレクタ�ソケット�試験メッセージを�信����ん���: %m"
+#: utils/misc/guc.c:1240
+msgid "Truncate existing log files of same name during log rotation."
+msgstr "ログローテーション時�既存��一�称�ログファイルを切り詰���。"
 
-#: postmaster/pgstat.c:446 postmaster/pgstat.c:2909
-#, c-format
-msgid "select() failed in statistics collector: %m"
-msgstr "統計情報コレクタ�select()�失敗����: %m"
+#: utils/misc/guc.c:1251
+msgid "Emit information about resource usage in sorting."
+msgstr "ソート中�リソース使用状��関�る情報を発行���。"
 
-#: postmaster/pgstat.c:461
-msgid "test message did not get through on socket for statistics collector"
-msgstr "統計情報コレクタ�ソケット�ら試験メッセージを入手����ん���"
+#: utils/misc/guc.c:1265
+msgid "Generate debugging output for synchronized scanning."
+msgstr "�期スキャン処��デ�ッグ出力を生����。"
 
-#: postmaster/pgstat.c:476
-#, c-format
-msgid "could not receive test message on socket for statistics collector: %m"
-msgstr "統計情報コレクタ�ソケット�ら試験メッセージを�信����ん���"
+#: utils/misc/guc.c:1280
+msgid "Enable bounded sorting using heap sort."
+msgstr "ヒープソートを使用��境界�ソート処�を有効����"
 
-#: postmaster/pgstat.c:486
-msgid "incorrect test message transmission on socket for statistics collector"
-msgstr "統計情報コレクタ�ソケット��試験メッセージ��信��正��"
+#: utils/misc/guc.c:1293
+msgid "Emit WAL-related debugging output."
+msgstr "WAL関連�デ�ッグ出力を出力���。"
 
-#: postmaster/pgstat.c:509
-#, c-format
-msgid "could not set statistics collector socket to nonblocking mode: %m"
+#: utils/misc/guc.c:1305
+msgid "Datetimes are integer based."
+msgstr "日付時刻�整数ベース��。"
+
+#: utils/misc/guc.c:1320
+msgid ""
+"Sets whether Kerberos and GSSAPI user names should be treated as case-"
+"insensitive."
 msgstr ""
-"統計情報コレクタ�ソケットを�ブロッキングモード�設定����ん���: %m"
+"Kerberos�よ�GSSAPIユーザ�を大文字�文字を区別��扱�����を設定��"
+"�。"
 
-#: postmaster/pgstat.c:519
-msgid "disabling statistics collector for lack of working socket"
-msgstr "作業用ソケット�欠����統計情報コレクタを無効������"
+#: utils/misc/guc.c:1330
+msgid "Warn about backslash escapes in ordinary string literals."
+msgstr "普通�文字列リテラル内��ックスラッシュエスケープを警告���。"
 
-#: postmaster/pgstat.c:621
-#, c-format
-msgid "could not fork statistics collector: %m"
-msgstr "統計情報コレクタをfork����ん���: %m"
+#: utils/misc/guc.c:1340
+msgid "Causes '...' strings to treat backslashes literally."
+msgstr "'...' 文字列��ックスラッシュを����扱���。"
 
-#: postmaster/pgstat.c:1151 postmaster/pgstat.c:1175 postmaster/pgstat.c:1206
-msgid "must be superuser to reset statistics counters"
-msgstr "統計情報カウンタをリセット�る��スーパーユーザ���れ��り��ん"
+#: utils/misc/guc.c:1351
+msgid "Enable synchronized sequential scans."
+msgstr "�期シーケンシャルスキャンを有効����。"
 
-#: postmaster/pgstat.c:1182
-msgid "unrecognized reset target: \"%s\""
-msgstr "�識����リセットターゲット: \"%s\""
+#: utils/misc/guc.c:1361
+msgid "Allows archiving of WAL files using archive_command."
+msgstr "archive_command.\"を使用��WALファイル�アーカイブ処�を許����。"
 
-#: postmaster/pgstat.c:1183
-msgid "Target must be \"bgwriter\"."
-msgstr "ターゲット� \"bgwriter\" ���れ��り��ん"
+#: utils/misc/guc.c:1371
+msgid "Allows connections and queries during recovery."
+msgstr "リカ�リー中�も接続�クエリを��付���"
 
-#: postmaster/pgstat.c:2888
-#, c-format
-msgid "poll() failed in statistics collector: %m"
-msgstr "統計情報コレクタ�poll()�失敗����: %m"
+#: utils/misc/guc.c:1381
+msgid ""
+"Allows feedback from a hot standby primary that will avoid query conflicts."
+msgstr "クエリー���を��るホットスタン�イ�プライマリ�ら�"
+"フィード�ックを��付���"
 
-#: postmaster/pgstat.c:2933
-#, c-format
-msgid "could not read statistics message: %m"
-msgstr "統計情報メッセージを読��れ��ん���: %m"
+#: utils/misc/guc.c:1391
+msgid "Allows modifications of the structure of system tables."
+msgstr "システムテーブル構造�変更を許����。"
 
-#: postmaster/pgstat.c:3190
-#, c-format
-msgid "could not open temporary statistics file \"%s\": %m"
-msgstr "一時統計情報ファイル\"%s\"をオープン����ん���: %m"
+#: utils/misc/guc.c:1402
+msgid "Disables reading from system indexes."
+msgstr "システムインデックス�読��りを無効����。"
 
-#: postmaster/pgstat.c:3262
-#, c-format
-msgid "could not write temporary statistics file \"%s\": %m"
-msgstr "一時統計情報ファイル\"%s\"�書�込�����ん���: %m"
+#: utils/misc/guc.c:1403
+msgid ""
+"It does not prevent updating the indexes, so it is safe to use.  The worst "
+"consequence is slowness."
+msgstr ""
+"�れ�インデックス�更新�防���ん���使用��も安全��。最大�影響�低"
+"速化��。"
 
-#: postmaster/pgstat.c:3271
-#, c-format
-msgid "could not close temporary statistics file \"%s\": %m"
-msgstr "一時統計情報ファイル\"%s\"をクローズ����ん���: %m"
+#: utils/misc/guc.c:1414
+msgid ""
+"Enables backward compatibility mode for privilege checks on large objects."
+msgstr ""
+"ラージオブジェクト�権��ェックを行�際�下�互�性モードを有効����。"
+
+#: utils/misc/guc.c:1415
+msgid ""
+"Skips privilege checks when reading or modifying large objects, for "
+"compatibility with PostgreSQL releases prior to 9.0."
+msgstr ""
+"9.0 以�� PostgreSQL ��互�����ラージオブジェクトを読ん�り変更��り"
+"�る際�権��ェックをスキップ�る。"
+
+#: utils/misc/guc.c:1425
+msgid "When generating SQL fragments, quote all identifiers."
+msgstr "SQL フラグメントを生��る時������識別�を引用符�囲ん�����"
+
+#: utils/misc/guc.c:1444
+msgid ""
+"Forces a switch to the next xlog file if a new file has not been started "
+"within N seconds."
+msgstr ""
+"N秒以内�新��ファイル�始�ら��場��次�xlogファイル��切り替�を強制�"
+"��。"
 
-#: postmaster/pgstat.c:3279
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "一時統計情報ファイル\"%s\"���を\"%s\"�変更����ん���: %m"
+#: utils/misc/guc.c:1455
+msgid "Waits N seconds on connection startup after authentication."
+msgstr "�証後�接続開始��N秒待機���。"
 
-#: postmaster/pgstat.c:3379 postmaster/pgstat.c:3608
-msgid "could not open statistics file \"%s\": %m"
-msgstr "統計情報ファイル\"%s\"をオープン����ん���: %m"
+#: utils/misc/guc.c:1456 utils/misc/guc.c:1905
+msgid "This allows attaching a debugger to the process."
+msgstr "�れ�よりデ�ッガ�プロセス�接続����。"
 
-#: postmaster/pgstat.c:3391 postmaster/pgstat.c:3401 postmaster/pgstat.c:3423
-#: postmaster/pgstat.c:3438 postmaster/pgstat.c:3501 postmaster/pgstat.c:3519
-#: postmaster/pgstat.c:3535 postmaster/pgstat.c:3553 postmaster/pgstat.c:3569
-#: postmaster/pgstat.c:3620 postmaster/pgstat.c:3631
-msgid "corrupted statistics file \"%s\""
-msgstr "統計情報ファイル \"%s\" �破������"
+#: utils/misc/guc.c:1465
+msgid "Sets the default statistics target."
+msgstr "デフォルト�統計情報対象を設定���。"
 
-#: postmaster/pgstat.c:3925
-msgid "database hash table corrupted during cleanup --- abort"
+#: utils/misc/guc.c:1466
+msgid ""
+"This applies to table columns that have not had a column-specific target set "
+"via ALTER TABLE SET STATISTICS."
 msgstr ""
-"整�処�����データベース�ッシュテーブル�破����� --- 中断���"
+"ALTER TABLE SET STATISTICS経由�列指定�対象を����テーブル列�����デ"
+"フォルト�統計情報対象を設定���。"
 
-#: bootparse.c:645
-msgid "syntax error: cannot back up"
-msgstr "構文エラー：�ックアップ����ん"
+#: utils/misc/guc.c:1475
+msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
+msgstr "副�����を折り�����上��FROMリスト�サイズを設定���。"
 
-#: bootparse.c:1598
-msgid "syntax error; also virtual memory exhausted"
-msgstr "構文エラー：�ら�仮想メモリーオー�ー"
+#: utils/misc/guc.c:1477
+msgid ""
+"The planner will merge subqueries into upper queries if the resulting FROM "
+"list would have no more than this many items."
+msgstr ""
+"最終的�FROMリスト���値以上多���場��プランナ�副�����を上���"
+"����マージ���。"
 
-#: bootparse.c:1602 tsearch/spell.c:444 tsearch/spell.c:461
-#: tsearch/spell.c:478 tsearch/spell.c:495 tsearch/spell.c:517 gram.y:11473
-#: gram.y:11490
-msgid "syntax error"
-msgstr "構文エラー"
+#: utils/misc/guc.c:1487
+msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
+msgstr "JOIN�を平�化���上��FROMリスト�サイズを設定���。"
 
-#: bootparse.c:1716
-msgid "parser stack overflow"
-msgstr "パーサースタックオー�ーフロー"
+#: utils/misc/guc.c:1489
+msgid ""
+"The planner will flatten explicit JOIN constructs into lists of FROM items "
+"whenever a list of no more than this many items would result."
+msgstr ""
+"最終的�リスト���値以下�項目数��る時�プランナ��明示的�JOIN構文を"
+"FROM項目�リスト�直���。 "
 
-#: bootstrap/bootstrap.c:297
-#, c-format
-msgid "%s: invalid command-line arguments\n"
-msgstr "%s: コマンドライン引数�無効��\n"
+#: utils/misc/guc.c:1499
+msgid "Sets the threshold of FROM items beyond which GEQO is used."
+msgstr "GEQOを使用�るFROMアイテム数�閾値を設定���。"
 
-#: lib/stringinfo.c:267
-#, c-format
-msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
+#: utils/misc/guc.c:1508
+msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr ""
-"%d�イトを��文字列�ッファを%d�イト多��大���る�������ん。"
+"GEQO: effort�他�GEQOパラメータ�デフォルトを設定�る���使用�れ��。"
 
-#: foreign/foreign.c:230
-#, c-format
-msgid "user mapping not found for \"%s\""
-msgstr "\"%s\" �対�るユーザ対応表�見��り��ん"
+#: utils/misc/guc.c:1517
+msgid "GEQO: number of individuals in the population."
+msgstr "GEQO: ��的個体群内�個体数��。"
 
-#: foreign/foreign.c:408
-#, c-format
-msgid "invalid option \"%s\""
-msgstr "\"%s\" オプション�無効��"
+#: utils/misc/guc.c:1518 utils/misc/guc.c:1527
+msgid "Zero selects a suitable default value."
+msgstr "0��切�デフォルト値を�択���。"
 
-#: foreign/foreign.c:409
-#, c-format
-msgid "Valid options in this context are: %s"
-msgstr "��文脈�有効�オプション：%s"
+#: utils/misc/guc.c:1526
+msgid "GEQO: number of iterations of the algorithm."
+msgstr "GEQO: アルゴリズム��復数��。"
 
-#: port/sysv_sema.c:114 port/pg_sema.c:114
-#, c-format
-msgid "could not create semaphores: %m"
-msgstr "セマフォを作�����ん���: %m"
+#: utils/misc/guc.c:1537
+msgid "Sets the time to wait on a lock before checking for deadlock."
+msgstr ""
+"デッドロック状態��る����を調�る��ロックを待�時間を設定���。"
 
-#: port/sysv_sema.c:115 port/pg_sema.c:115
-#, c-format
-msgid "Failed system call was semget(%lu, %d, 0%o)."
-msgstr "失敗��システムコール�semget(%lu, %d, 0%o)��。"
+#: utils/misc/guc.c:1548
+msgid ""
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing archived WAL data."
+msgstr ""
+"ホットスタン�イサー��アーカイブ�れ� WAL データを処����る場���クエ"
+"リをキャンセル�る���延秒数�最大値をセット������。"
 
-#: port/sysv_sema.c:119 port/pg_sema.c:119
-#, c-format
+#: utils/misc/guc.c:1559
 msgid ""
-"This error does *not* mean that you have run out of disk space.\n"
-"It occurs when either the system limit for the maximum number of semaphore "
-"sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), "
-"would be exceeded.  You need to raise the respective kernel parameter.  "
-"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
-"max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about configuring "
-"your system for PostgreSQL."
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing streamed WAL data."
 msgstr ""
-"��エラー�ディスク容��枯渇を�味��*���ん*。\n"
-"セマフォ群(SEMMNI)�最大数�関�るシステム上��システム全体�最大セマフォ\n"
-"数(SEMMNS)を超��場��起�り��。対応�るカー�ルパラメータを増加���\n"
-"�れ��り��ん。他�方法����max_connectionsパラメータ(�在%d)\n"
-"を少����PostgreSQL�セマフォ使用�を減ら���も����。\n"
-"PostgreSQL���システムを構��る方法�����情報�PostgreSQL�ドキュメ\n"
-"ント�記載�れ����。"
+"ホットスタン�イサー��ストリーム� WAL データを処����る場���クエリを"
+"キャンセル�る���延秒数�最大値をセット������。"
 
-#: port/sysv_sema.c:148 port/pg_sema.c:148
-#, c-format
+#: utils/misc/guc.c:1570
 msgid ""
-"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
-"Look into the PostgreSQL documentation for details."
+"Sets the maximum interval between WAL receiver status reports to the master."
 msgstr ""
-"��ら�カー�ル�SEMVMX値を最低�も%d��増や�必���り��。\n"
-"詳細�PostgreSQL�ドキュメントを調������。"
+"WAL レシー�ー�ステータスレ�ート�らマスター��最大間隔を設定���"
 
-#: port/sysv_shmem.c:141 port/pg_shmem.c:141
-#, c-format
-msgid "could not create shared memory segment: %m"
-msgstr "共有メモリセグメントを作�����ん: %m"
+#: utils/misc/guc.c:1581
+msgid "Sets the maximum number of concurrent connections."
+msgstr "�時接続数�最大値を設定���。"
 
-#: port/sysv_shmem.c:142 port/pg_shmem.c:142
-#, c-format
-msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
-msgstr "失敗��システムコール�shmget(key=%lu, size=%lu, 0%o)���。"
+#: utils/misc/guc.c:1591
+msgid "Sets the number of connection slots reserved for superusers."
+msgstr "スーパーユーザ�よる接続用�予約�れる接続スロット�数を設定���。"
 
-#: port/sysv_shmem.c:146 port/pg_shmem.c:146
-#, c-format
+#: utils/misc/guc.c:1605
+msgid "Sets the number of shared memory buffers used by the server."
+msgstr "サー��使用�れる共有メモリ��ッファ数を設定���。"
+
+#: utils/misc/guc.c:1616
+msgid "Sets the maximum number of temporary buffers used by each session."
+msgstr "�セッション�使用�れる一時�ッファ�最大数を設定���。"
+
+#: utils/misc/guc.c:1627
+msgid "Sets the TCP port the server listens on."
+msgstr "サー��接続を監視�るTCP�ートを設定���。"
+
+#: utils/misc/guc.c:1637
+msgid "Sets the access permissions of the Unix-domain socket."
+msgstr "Unixドメインソケット�アクセス権�を設定���。"
+
+#: utils/misc/guc.c:1638
 msgid ""
-"This error usually means that PostgreSQL's request for a shared memory "
-"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
-"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
-"request size (currently %lu bytes), reduce PostgreSQL's shared_buffers "
-"parameter (currently %d) and/or its max_connections parameter (currently %"
-"d).\n"
-"If the request size is already small, it's possible that it is less than "
-"your kernel's SHMMIN parameter, in which case raising the request size or "
-"reconfiguring SHMMIN is called for.\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+"Unix-domain sockets use the usual Unix file system permission set. The "
+"parameter value is expected to be a numeric mode specification in the form "
+"accepted by the chmod and umask system calls. (To use the customary octal "
+"format the number must start with a 0 (zero).)"
 msgstr ""
-"通常��エラー��PostgreSQL��求��共有メモリセグメント�カー�ル�\n"
-"SHMMAXパラメータを超����を�味���。���求サイズを減ら���も��\n"
-"����より大��SHMMAX�カー�ルを�構築�る��も����。�求サイズ(�\n"
-"在%lu�イト)を減ら���PostgreSQL�shared_buffersパラメータ(�在%d)�\n"
-"max_connections(�在%d)������両者を減ら������。\n"
-"�求サイズ�カー�ル�SHMMIN以下��る������������求サイズ��\n"
-"��場����求サイズを大���る�SHMINを�構築�る����求�れ���\n"
-"共有メモリ�設定�関�る情報�PostgreSQL�ドキュメント�記載�れ����。"
+"Unixドメインソケット��通常�Unixファイルシステム権��設定を使���。 ��"
+"パラメータ値� chmod � umask システムコール���付�る数値�モード指定を想"
+"定�����（慣習的�8進数書�を使������0(ゼロ)�始�ら�����り�"
+"�ん）。 "
 
-#: port/sysv_shmem.c:159 port/pg_shmem.c:159
-#, c-format
+#: utils/misc/guc.c:1652
+#, 
+msgid "Sets the file permissions for log files."
+msgstr "ログファイル�パーミッションを設定���。"
+
+#: utils/misc/guc.c:1653
+#, 
 msgid ""
-"This error usually means that PostgreSQL's request for a shared memory "
-"segment exceeded available memory or swap space. To reduce the request size "
-"(currently %lu bytes), reduce PostgreSQL's shared_buffers parameter "
-"(currently %d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+"The parameter value is expected to be a numeric mode specification in the "
+"form accepted by the chmod and umask system calls. (To use the customary "
+"octal format the number must start with a 0 (zero).)"
 msgstr ""
-"通常��エラー�PostgreSQL�利用�能�メモリやスワップ容�を超�る共有\n"
-"メモリセグメントを�求����を�味���。���求サイズ(�在%lu�イト)\n"
-"を減少��る���PostgreSQL�shared_buffersパラメータ(�在%d�イト)�\n"
-"max_connectionsパラメータ(�在%d)������両方を少��������。\n"
-"共有メモリ�設定�関�る情報�PostgreSQL�ドキュメント�記載�れ���\n"
-"�。"
+"��パタメータ値� chmod や umask システムコール�使�るよ��数値モード"
+"指定��る���想定�れ��（慣習的�記法��る 8 進数書�を使�場��"
+"先頭� 0 (ゼロ) を�������）。 "
 
-#: port/sysv_shmem.c:168 port/pg_shmem.c:168
-#, c-format
+#: utils/misc/guc.c:1666
+msgid "Sets the maximum memory to be used for query workspaces."
+msgstr "������作業用空間���使用�れるメモリ�最大値を設定���。"
+
+#: utils/misc/guc.c:1667
 msgid ""
-"This error does *not* mean that you have run out of disk space. It occurs "
-"either if all available shared memory IDs have been taken, in which case you "
-"need to raise the SHMMNI parameter in your kernel, or because the system's "
-"overall limit for shared memory has been reached.  If you cannot increase "
-"the shared memory limit, reduce PostgreSQL's shared memory request "
-"(currently %lu bytes), by reducing its shared_buffers parameter (currently %"
-"d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+"This much memory can be used by each internal sort operation and hash table "
+"before switching to temporary disk files."
 msgstr ""
-"��エラー�ディクス容��枯渇を�味��*���ん*。利用��る共有メモリIDを\n"
-"全�使用���る場�やシステム�共有メモリ�関�る全体的�制�����場��\n"
-"発生���。�者�場��カー�ル�SHMMNIパラメータを増や����必���。\n"
-"共有メモリ�制�を増加��る�������場��shared_buffersパラメータ(�在\n"
-"%2$d�イト)�max_connectionsパラメータ(�在%3$d)������両方を減ら���\n"
-"PostgreSQL�共有メモリ�求(�在%1$lu�イト)を少��������。\n"
-"共有メモリ�設定�関�る情報�PostgreSQL�ドキュメント�記載�れ����。"
+"一時ディスクファイル��切替�を行����内部ソート�作��ッシュテーブル�"
+"使�れるメモリ��を指定���。"
 
-#: port/sysv_shmem.c:423 port/pg_shmem.c:423
-#, c-format
-msgid "could not stat data directory \"%s\": %m"
-msgstr "データディレクトリ\"%s\"をstat����ん���: %m"
+#: utils/misc/guc.c:1679
+msgid "Sets the maximum memory to be used for maintenance operations."
+msgstr "�守作業�使用�れる最大メモリ�を設定���。"
 
-#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
-#, c-format
-msgid "could not create shared memory segment: %lu"
-msgstr "共有メモリセグメントを作�����ん: %lu"
+#: utils/misc/guc.c:1680
+msgid "This includes operations such as VACUUM and CREATE INDEX."
+msgstr "VACUUMやCREATE INDEX���作業���れ��。"
 
-#: port/win32_shmem.c:169
-#, c-format
-msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
-msgstr "失敗��システムコール�CreateFileMapping(size=%lu, name=%s)���。"
+#: utils/misc/guc.c:1695
+msgid "Sets the maximum stack depth, in kilobytes."
+msgstr "スタック長�最大値をキロ�イト���設定���。"
 
-#: port/win32_shmem.c:193
-msgid "pre-existing shared memory block is still in use"
-msgstr "既存�共有メモリブロック���使用中��"
+#: utils/misc/guc.c:1706
+msgid "Vacuum cost for a page found in the buffer cache."
+msgstr "�ッファキャッシュ��る�ッファを�キューム�る際�コスト��。"
 
-#: port/win32_shmem.c:194
+#: utils/misc/guc.c:1716
+msgid "Vacuum cost for a page not found in the buffer cache."
+msgstr "�ッファキャッシュ����ッファを�キューム�る際�コスト��。"
+
+#: utils/misc/guc.c:1726
+msgid "Vacuum cost for a page dirtied by vacuum."
+msgstr "�キューム処��ページを変更�る際�課�られるコスト��。"
+
+#: utils/misc/guc.c:1736
+msgid "Vacuum cost amount available before napping."
+msgstr "�キューム処�プロセス�休止�る����るコスト��計��。 "
+
+#: utils/misc/guc.c:1746
+msgid "Vacuum cost delay in milliseconds."
+msgstr "ミリ秒���コストベース��キューム��延時間��。"
+
+#: utils/misc/guc.c:1757
+msgid "Vacuum cost delay in milliseconds, for autovacuum."
+msgstr "autovacuum用�ミリ秒���コストベース��キューム��延時間��。"
+
+#: utils/misc/guc.c:1768
+msgid "Vacuum cost amount available before napping, for autovacuum."
+msgstr ""
+"autovacuum用��キューム処�プロセス�休止�る����るコスト��計��。 "
+
+#: utils/misc/guc.c:1778
 msgid ""
-"Check if there are any old server processes still running, and terminate "
-"them."
-msgstr "��サー�プロセス�実行中����検査���れを終了�������"
+"Sets the maximum number of simultaneously open files for each server process."
+msgstr ""
+"�サー��プロセス��時�オープン��るファイル�最大数を設定���。 "
 
-#: port/win32_shmem.c:204
-msgid "Failed system call was DuplicateHandle."
-msgstr "失敗��システムコール�MapViewOfFileEx���。"
+#: utils/misc/guc.c:1791
+msgid "Sets the maximum number of simultaneously prepared transactions."
+msgstr "準備�れ�1トランザクション��時最大数を設定���。"
 
-#: port/win32_shmem.c:225
-msgid "Failed system call was MapViewOfFileEx."
-msgstr "失敗��システムコール�MapViewOfFileEx���。"
+#: utils/misc/guc.c:1824
+msgid "Sets the maximum allowed duration of any statement."
+msgstr "全��文�最大実行時間を設定���。"
 
-#: port/win32/security.c:43
-#, c-format
-msgid "could not open process token: error code %d\n"
-msgstr "プロセストークンをオープン����ん���: エラーコード %d\n"
+#: utils/misc/guc.c:1825
+msgid "A value of 0 turns off the timeout."
+msgstr "ゼロ���値���タイムアウトを無効����。 "
 
-#: port/win32/security.c:63
-#, c-format
-msgid "could not get SID for Administrators group: error code %d\n"
-msgstr "管�者グループ�SIDを入手����ん���: エラーコード %d\n"
+#: utils/misc/guc.c:1835
+msgid "Minimum age at which VACUUM should freeze a table row."
+msgstr "VACUUM �テーブル行を���る���最�時間"
 
-#: port/win32/security.c:72
-#, c-format
-msgid "could not get SID for PowerUsers group: error code %d\n"
-msgstr "PowerUsersグループ�SIDを入手����ん���: エラーコード %d\n"
+#: utils/misc/guc.c:1845
+msgid "Age at which VACUUM should scan whole table to freeze tuples."
+msgstr ""
+"テーブル行を���る��� VACUUM �テーブル全体をスキャン�る���時間"
 
-#: port/win32/signal.c:189
-#, c-format
-msgid "could not create signal listener pipe for pid %d: error code %d"
+#: utils/misc/guc.c:1855
+msgid ""
+"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
+"if any."
+msgstr ""
+"も��れ��VACUUM や HOT �クリーンアップを�延��るトランザクション数"
+
+#: utils/misc/guc.c:1868
+msgid "Sets the maximum number of locks per transaction."
+msgstr "1トランザクション当�り�最大ロック数を設定���。"
+
+#: utils/misc/guc.c:1869
+msgid ""
+"The shared lock table is sized on the assumption that at most "
+"max_locks_per_transaction * max_connections distinct objects will need to be "
+"locked at any one time."
 msgstr ""
-"pid %d�対�るシグナル監視パイプを作�����ん���: エラーコード %d"
+"共有ロックテーブル�大����最大max_locks_per_transaction * max_connections"
+"個�個別�オブジェクト��る時点�ロック�れる必���る���仮定�決定�れ"
+"��。"
 
-#: port/win32/signal.c:269 port/win32/signal.c:301
-#, c-format
-msgid "could not create signal listener pipe: error code %d; retrying\n"
-msgstr "シグナル監視パイプを作�����ん���: エラーコード %d: �実行中\n"
+#: utils/misc/guc.c:1880
+#, 
+msgid "Sets the maximum number of predicate locks per transaction."
+msgstr "1 トランザクション当�り�最大ロック数を設定���。"
 
-#: port/win32/signal.c:312
-#, c-format
-msgid "could not create signal dispatch thread: error code %d\n"
+#: utils/misc/guc.c:1881
+#, 
+msgid ""
+"The shared predicate lock table is sized on the assumption that at most "
+"max_pred_locks_per_transaction * max_connections distinct objects will need "
+"to be locked at any one time."
 msgstr ""
-"シグナルディスパッ�用スレッドを作�����ん���: エラーコード %d\n"
+"共有ロックテーブル�大����最大 max_pred_locks_per_transaction * "
+"max_connections 個�個別�オブジェクト��時�ロック�れる必���る"
+"���仮定�元�決�られ��。"
 
-#: port/win32_sema.c:94
-#, c-format
-msgid "could not create semaphore: error code %d"
-msgstr "セマフォを作�����ん���: エラーコード %d"
+#: utils/misc/guc.c:1892
+msgid "Sets the maximum allowed time to complete client authentication."
+msgstr "クライアント�証�完了���最大時間を設定���。"
 
-#: port/win32_sema.c:161
-#, c-format
-msgid "could not lock semaphore: error code %d"
-msgstr "セマフォをロック����ん���: エラーコード %d"
+#: utils/misc/guc.c:1904
+msgid "Waits N seconds on connection startup before authentication."
+msgstr "�証��接続開始��N秒待機���。"
 
-#: port/win32_sema.c:174
-#, c-format
-msgid "could not unlock semaphore: error code %d"
-msgstr "セマフォ�ロックを解除����ん���: エラーコード %d"
+#: utils/misc/guc.c:1915
+msgid "Sets the number of WAL files held for standby servers."
+msgstr "待機用サー�����れる WAL ファイル数を設定���。"
 
-#: port/win32_sema.c:203
-#, c-format
-msgid "could not try-lock semaphore: error code %d"
-msgstr "セマフォ�ロックを試�る�������ん���: エラーコード %d"
+#: utils/misc/guc.c:1925
+msgid ""
+"Sets the maximum distance in log segments between automatic WAL checkpoints."
+msgstr ""
+"自動WAL�ェック�イント�間�最大�離を�ログファイルセグメント�数�設定��"
+"�。"
 
-#: access/nbtree/nbtsort.c:483 access/nbtree/nbtinsert.c:523
-#: access/gin/ginentrypage.c:83 access/gin/ginentrypage.c:118
-msgid "index row size %lu exceeds maximum %lu for index \"%s\""
-msgstr "インデックス \"%3$s\" �インデック行サイズ %l1$u �最大値 %l2$u を超�����"
+#: utils/misc/guc.c:1935
+msgid "Sets the maximum time between automatic WAL checkpoints."
+msgstr "自動WAL�ェック�イント�最大間隔を設定���。"
 
-#: access/nbtree/nbtsort.c:487 access/nbtree/nbtinsert.c:527
+#: utils/misc/guc.c:1946
 msgid ""
-"Values larger than 1/3 of a buffer page cannot be indexed.\n"
-"Consider a function index of an MD5 hash of the value, or use full text "
-"indexing."
-msgstr ""
-"�ッファページ�1/3を超�る値をインデックス�る�������ん。\n"
-"値�MD5�ッシュ��インデックスを行�関数インデックスを検討������。\n"
-"も���全文テキストインデックスを使用������。"
+"Enables warnings if checkpoint segments are filled more frequently than this."
+msgstr "�ェック�イントセグメント�溢れ頻度��れよりも多�れ�警告���。"
 
-#: access/nbtree/nbtpage.c:160 access/nbtree/nbtpage.c:364
-#, c-format
-msgid "index \"%s\" is not a btree"
-msgstr "インデックス\"%s\"�btree���り��ん"
+#: utils/misc/guc.c:1948
+msgid ""
+"Write a message to the server log if checkpoints caused by the filling of "
+"checkpoint segment files happens more frequently than this number of "
+"seconds. Zero turns off the warning."
+msgstr ""
+"�ェック�イントセグメントファイル�溢れる���原因�起�る�ェック�イント"
+"�����指定��秒数よりも頻��発生�る場��サー�ログ�メッセージを書�"
+"出���。 デフォルト�30秒��。 ゼロ���警告を無効����。 "
 
-#: access/nbtree/nbtpage.c:166 access/nbtree/nbtpage.c:370
-#, c-format
-msgid "version mismatch in index \"%s\": file version %d, code version %d"
+#: utils/misc/guc.c:1960
+msgid "Sets the number of disk-page buffers in shared memory for WAL."
 msgstr ""
-"インデックス\"%s\"���る�ージョン��整�: ファイル�ージョン %d�コード"
-"�ージョン %d"
+"共有メモリ内�割り当�られ��WALデータ用�ディスクページ�ッファ数��。"
 
-#: access/nbtree/nbtpage.c:432 access/hash/hashutil.c:165
-#: access/gist/gistutil.c:588
-#, c-format
-msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "インデックス\"%s\"�ブロック %u�予期���ゼロページ��り��"
+#: utils/misc/guc.c:1971
+msgid "WAL writer sleep time between WAL flushes."
+msgstr "WAL��出��間�WALライタ�待機�る時間��。"
 
-#: access/nbtree/nbtpage.c:435 access/nbtree/nbtpage.c:446
-#: access/hash/hashutil.c:168 access/hash/hashutil.c:179
-#: access/hash/hashutil.c:191 access/hash/hashutil.c:212
-#: access/gist/gistutil.c:591 access/gist/gistutil.c:602
-msgid "Please REINDEX it."
-msgstr "REINDEXを行������。"
+#: utils/misc/guc.c:1983
+msgid "Sets the maximum number of simultaneously running WAL sender processes."
+msgstr "WAL sender プロセス�最大�時実行数を設定���。"
 
-#: access/nbtree/nbtpage.c:443 access/hash/hashutil.c:176
-#: access/hash/hashutil.c:188 access/gist/gistutil.c:599
-#, c-format
-msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "インデックス\"%s\"�ブロック %u�破���ページ��り��"
+#: utils/misc/guc.c:1993
+msgid "WAL sender sleep time between WAL replications."
+msgstr "WAL レプリケーション�間�WAL sender �待機�る時間��。"
 
-#: access/nbtree/nbtinsert.c:385
-#, c-format
-msgid "duplicate key value violates unique constraint \"%s\""
-msgstr "�複キー�一�性制約\"%s\"��������"
+#: utils/misc/guc.c:2004
+#, 
+msgid "Sets the maximum time to wait for WAL replication."
+msgstr "WAL レプリケーション����最大�待�時間を設定���。"
 
-#: access/nbtree/nbtinsert.c:387
-#, c-format
-msgid "Key %s already exists."
-msgstr "キー %s ����存在���"
+#: utils/misc/guc.c:2015
+msgid ""
+"Sets the delay in microseconds between transaction commit and flushing WAL "
+"to disk."
+msgstr ""
+"トランザクション�コミット�らWAL�ッファ�ディスク��出�����延時間をマ"
+"イクロ秒���設定���。"
 
-#: access/hash/hashutil.c:204
-#, c-format
-msgid "index \"%s\" is not a hash index"
-msgstr "インデックス\"%s\"��ッシュインデックス���り��ん"
+#: utils/misc/guc.c:2026
+msgid ""
+"Sets the minimum concurrent open transactions before performing commit_delay."
+msgstr ""
+"commit_delay�延�実行��必���る��時�開���るトランザクション�最�"
+"数を設定���。"
 
-#: access/hash/hashutil.c:210
-#, c-format
-msgid "index \"%s\" has wrong hash version"
-msgstr "インデックス\"%s\"��ッシュ�ージョン��正��"
+#: utils/misc/guc.c:2037
+msgid "Sets the number of digits displayed for floating-point values."
+msgstr "浮動�数点値�表示�数を設定���。"
 
-#: access/hash/hashsearch.c:152
-msgid "hash indexes do not support whole-index scans"
-msgstr "�ッシュインデックス�インデックス全体�スキャンをサ�ート�����ん"
+#: utils/misc/guc.c:2038
+msgid ""
+"This affects real, double precision, and geometric data types. The parameter "
+"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
+"appropriate)."
+msgstr ""
+"��パラメータ��real�double precision�幾何データ型�影響���。パラメー"
+"タ値�標準的��数(FLT_DIG も��� DBL_DIG��ら��切�方)�追加�れ��。"
 
-#: access/hash/hashovfl.c:546
-#, c-format
-msgid "out of overflow pages in hash index \"%s\""
-msgstr "�ッシュインデックス\"%s\"�中�オー�ーフローページ��り��ん"
+#: utils/misc/guc.c:2049
+msgid "Sets the minimum execution time above which statements will be logged."
+msgstr "ログを�る文�������最��文実行時間を設定���。"
 
-#: access/hash/hashinsert.c:73
-#, c-format
-msgid "index row size %lu exceeds hash maximum %lu"
-msgstr "インデックス�行サイズ%lu��ッシュ�最大%luを超�����"
+#: utils/misc/guc.c:2051
+msgid "Zero prints all queries. -1 turns this feature off."
+msgstr ""
+"ゼロ��る��全�������を出力���。-1���機能を無効����。"
 
-#: access/hash/hashinsert.c:76
-msgid "Values larger than a buffer page cannot be indexed."
-msgstr "�ッファページよりも大��値をインデックス�る�������ん。"
+#: utils/misc/guc.c:2061
+msgid ""
+"Sets the minimum execution time above which autovacuum actions will be "
+"logged."
+msgstr "自動�キューム�活動をログ��る文場��最��実行時間を設定���。"
 
-#: access/common/tupdesc.c:545 parser/parse_relation.c:1165
-#, c-format
-msgid "column \"%s\" cannot be declared SETOF"
-msgstr "列\"%s\"をSETOF�宣言����ん"
+#: utils/misc/guc.c:2063
+msgid "Zero prints all actions. -1 turns autovacuum logging off."
+msgstr ""
+"ゼロ�����活動を出力���。-1�自動�キューム�ログ記録を無効����。"
 
-#: access/common/tupconvert.c:107
-#, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "列 %3$d �返�れ�型 %1$s �期待�る型 %2$s �一致���ん"
+#: utils/misc/guc.c:2073
+msgid "Background writer sleep time between rounds."
+msgstr "�ックグランドライタ�動作周期�待機時間"
 
-#: access/common/tupconvert.c:135
-#, c-format
-msgid ""
-"Number of returned columns (%d) does not match expected column count (%d)."
-msgstr "返�れ�列数(%d)�期待�る列数(%d)�一致���ん"
+#: utils/misc/guc.c:2084
+msgid "Background writer maximum number of LRU pages to flush per round."
+msgstr "�ックグランドライタ�1周期���出�最大LRUページ数"
 
-#: access/common/tupconvert.c:240
-#, c-format
+#: utils/misc/guc.c:2100
 msgid ""
-"Attribute \"%s\" of type %s does not match corresponding attribute of type %"
-"s."
-msgstr "型 %1$s �属性 \"%2$s\" �対応�る型 %3$s �属性��致���ん"
+"Number of simultaneous requests that can be handled efficiently by the disk "
+"subsystem."
+msgstr "ディスクサブシステム�よ���分処��能��時並行リクエスト数"
 
-#: access/common/tupconvert.c:252
-#, c-format
-msgid "Attribute \"%s\" of type %s does not exist in type %s."
-msgstr "型 %2$s �属性 \"%1$s\" �型 %3$s 中�存在���ん"
+#: utils/misc/guc.c:2101
+msgid ""
+"For RAID arrays, this should be approximately the number of drive spindles "
+"in the array."
+msgstr ""
+"RAID アレイ����れ���む�アレイ中�ドライブ�スピンドル数��り��"
 
-#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
-#, c-format
-msgid "number of columns (%d) exceeds limit (%d)"
-msgstr "列数(%d)�上�(%d)を超�����"
+#: utils/misc/guc.c:2114
+msgid "Automatic log file rotation will occur after N minutes."
+msgstr "ログファイル�自動ローテーション�N秒後�起�り��"
 
-#: access/common/indextuple.c:57
-#, c-format
-msgid "number of index columns (%d) exceeds limit (%d)"
-msgstr "インデックス列数(%d)�上�(%d)を超�����"
+#: utils/misc/guc.c:2125
+msgid "Automatic log file rotation will occur after N kilobytes."
+msgstr "ログファイル�自動ローテーション�Nキロ�イト後�起�り��"
 
-#: access/common/indextuple.c:168
-#, c-format
-msgid "index row requires %lu bytes, maximum size is %lu"
-msgstr "インデックス行�%lu�イト�求。最大サイズ�%lu��"
+#: utils/misc/guc.c:2136
+msgid "Shows the maximum number of function arguments."
+msgstr "関数�引数�最大数を示���。"
 
-#: access/common/reloptions.c:323
-msgid "user-defined relation parameter types limit exceeded"
-msgstr "ユーザ定義リレーション�パラメータ型�制�を超����"
+#: utils/misc/guc.c:2147
+msgid "Shows the maximum number of index keys."
+msgstr "インデックスキー�最大数を示���。"
 
-#: access/common/reloptions.c:622
-msgid "RESET must not include values for parameters"
-msgstr "RESET��パラメータ�値を��������ん"
+#: utils/misc/guc.c:2158
+msgid "Shows the maximum identifier length."
+msgstr "識別��最大長を示���。"
 
-#: access/common/reloptions.c:655
-#, c-format
-msgid "unrecognized parameter namespace \"%s\""
-msgstr "未知�パラメータ namaspace \"%s\""
+#: utils/misc/guc.c:2169
+msgid "Shows the size of a disk block."
+msgstr "ディスクブロックサイズを示���。"
 
-#: access/common/reloptions.c:895
-#, c-format
-msgid "unrecognized parameter \"%s\""
-msgstr "未知�パラメータ \"%s\""
+#: utils/misc/guc.c:2180
+msgid "Shows the number of pages per disk file."
+msgstr "ディスクファイル���ページ数を表示���。"
 
-#: access/common/reloptions.c:920
-#, c-format
-msgid "parameter \"%s\" specified more than once"
-msgstr "パラメータ\"%s\"�複数指定�れ���"
+#: utils/misc/guc.c:2191
+msgid "Shows the block size in the write ahead log."
+msgstr "先行書�込�ログ(WAL)���るブロックサイズを表示���"
 
-#: access/common/reloptions.c:935
-#, c-format
-msgid "invalid value for boolean option \"%s\": %s"
-msgstr "ブールオプション値 \"%s\" �無効��: %s"
+#: utils/misc/guc.c:2202
+msgid "Shows the number of pages per write ahead log segment."
+msgstr "先行書�込�ログ(WAL)セグメント���ページ数を表示���"
 
-#: access/common/reloptions.c:946
-#, c-format
-msgid "invalid value for integer option \"%s\": %s"
-msgstr "整数値オプション�値 \"%s\" �無効��: %s"
+#: utils/misc/guc.c:2215
+msgid "Time to sleep between autovacuum runs."
+msgstr "自動�キューム�待機間隔）。"
 
-#: access/common/reloptions.c:951 access/common/reloptions.c:969
-#, c-format
-msgid "value %s out of bounds for option \"%s\""
-msgstr "値 %s �オプション \"%s\" �範囲外��"
+#: utils/misc/guc.c:2225
+msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgstr "�キュームを行�����タプルを更新���削除��回数�最�値。"
 
-#: access/common/reloptions.c:953
-#, c-format
-msgid "Valid values are between \"%d\" and \"%d\"."
-msgstr "有効�値�範囲� \"%d\" ～ \"%d\" ��。"
+#: utils/misc/guc.c:2234
+msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
+msgstr "解��る����タプルを挿入�更新�削除��回数�最�値。"
 
-#: access/common/reloptions.c:964
-#, c-format
-msgid "invalid value for floating point option \"%s\": %s"
-msgstr "浮動�数点オプション�値 \"%s\" �無効��: %s"
+#: utils/misc/guc.c:2244
+msgid ""
+"Age at which to autovacuum a table to prevent transaction ID wraparound."
+msgstr ""
+"トランザクションID周回を防����テーブルを自動�キューム�る年代��。"
 
-#: access/common/reloptions.c:971
-#, c-format
-msgid "Valid values are between \"%f\" and \"%f\"."
-msgstr "有効�値�範囲� \"%f\" ～ \"%f\" ��。"
+#: utils/misc/guc.c:2255
+msgid ""
+"Sets the maximum number of simultaneously running autovacuum worker "
+"processes."
+msgstr "自動�キューム�ワーカプロセス�最大�時実行数を設定���。"
 
-#: access/heap/hio.c:175 access/heap/rewriteheap.c:592
-#, c-format
-msgid "row is too big: size %lu, maximum size %lu"
-msgstr "行�大�����: サイズ�%lu�上��%lu"
+#: utils/misc/guc.c:2265
+msgid "Time between issuing TCP keepalives."
+msgstr "TCPキープアライブを発行�る間隔。"
 
-#: access/heap/heapam.c:3149 access/heap/heapam.c:3180
-#: access/heap/heapam.c:3215
-#, c-format
-msgid "could not obtain lock on row in relation \"%s\""
-msgstr "リレーション\"%s\"�行ロックを�得����ん���"
+#: utils/misc/guc.c:2266 utils/misc/guc.c:2277
+msgid "A value of 0 uses the system default."
+msgstr "ゼロ���値�システム�デフォルトを使用���。"
 
-#: access/gin/ginarrayproc.c:30
-msgid "array must not contain null values"
-msgstr "�列��NULL値を��������ん"
+#: utils/misc/guc.c:2276
+msgid "Time between TCP keepalive retransmits."
+msgstr "TCPキープアライブを��信�る���時間。"
 
-#: access/gin/ginscan.c:166 access/gin/ginscan.c:229
-msgid "GIN indexes do not support whole-index scans"
-msgstr "GINインデックス�インデックス全体�スキャンをサ�ート�����ん"
+#: utils/misc/guc.c:2287
+msgid ""
+"Set the amount of traffic to send and receive before renegotiating the "
+"encryption keys."
+msgstr ""
+"暗�化キーを��ゴシエート�る����信�るトラフィック�をセット�����"
+"�。"
 
-#: access/transam/twophase.c:247
-#, c-format
-msgid "transaction identifier \"%s\" is too long"
-msgstr "トランザクション識別�\"%s\"�長����"
+#: utils/misc/guc.c:2298
+msgid "Maximum number of TCP keepalive retransmits."
+msgstr "TCPキープアライブ��利用数�最大数��。"
 
-#: access/transam/twophase.c:254
-msgid "prepared transactions are disabled"
-msgstr "準備�れ�トランザクション�無効��。"
+#: utils/misc/guc.c:2299
+msgid ""
+"This controls the number of consecutive keepalive retransmits that can be "
+"lost before a connection is considered dead. A value of 0 uses the system "
+"default."
+msgstr ""
+"�れ��接続�������������失�れる�能性��る�連続的�キープ"
+"ã‚¢\n"
+"ライブ��利用数をを制御���。0���値�システム�デフォルトを使用���。"
 
-#: access/transam/twophase.c:255
-msgid "Set max_prepared_transactions to a nonzero value."
-msgstr "max_prepared_transactionsを�ゼロ�設定������。"
+#: utils/misc/guc.c:2310
+msgid "Sets the maximum allowed result for exact search by GIN."
+msgstr "GIN�よる正確�検索�対��許�れる最大��果数を設定���。"
 
-#: access/transam/twophase.c:288
-#, c-format
-msgid "transaction identifier \"%s\" is already in use"
-msgstr "トランザクション識別�\"%s\"����存在���"
+#: utils/misc/guc.c:2321
+msgid "Sets the planner's assumption about the size of the disk cache."
+msgstr "ディスクキャッシュ�サイズ�関�るプランナ�推測を設定���。"
 
-#: access/transam/twophase.c:297
-msgid "maximum number of prepared transactions reached"
-msgstr "準備済��トランザクション�最大数������"
+#: utils/misc/guc.c:2322
+msgid ""
+"That is, the portion of the kernel's disk cache that will be used for "
+"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
+"kB each."
+msgstr ""
+"��り�PostgreSQL�データファイル用�使用�れるカー�ル�ディスクキャッシュ"
+"����。�れ�通常8KB�ディスクページを������。"
 
-#: access/transam/twophase.c:298
-#, c-format
-msgid "Increase max_prepared_transactions (currently %d)."
-msgstr "max_prepared_transactionsを増加������（�状%d）。"
+#: utils/misc/guc.c:2335
+msgid "Shows the server version as an integer."
+msgstr "サー���ージョンを整数値�表示���。"
 
-#: access/transam/twophase.c:418
-#, c-format
-msgid "prepared transaction with identifier \"%s\" is busy"
-msgstr "準備�れ�トランザクション識別�\"%s\"�実行中��"
+#: utils/misc/guc.c:2346
+msgid "Log the use of temporary files larger than this number of kilobytes."
+msgstr ""
+"キロ�イト�����数値ｙり大��一時ファイル�使用をログ�記録���。"
 
-#: access/transam/twophase.c:426
-msgid "permission denied to finish prepared transaction"
-msgstr "準備�れ�トランザクションを終了�る���権���り��ん"
+#: utils/misc/guc.c:2347
+msgid "Zero logs all files. The default is -1 (turning this feature off)."
+msgstr ""
+"ゼロ��る��全��ファイルを出力���。デフォルト�-1��。(��機能を無効"
+"����。)"
 
-#: access/transam/twophase.c:427
-msgid "Must be superuser or the user that prepared the transaction."
-msgstr "トランザクションを準備�るユーザ�スーパーユーザ���れ��り��ん。"
+#: utils/misc/guc.c:2357
+msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
+msgstr ""
+"pg_stat_activity.current_query �予約�れ��るサイズを�イト���指定���"
+"���"
 
-#: access/transam/twophase.c:438
-msgid "prepared transaction belongs to another database"
-msgstr "準備�れ�トランザクション�別�データベース�属�����"
+#: utils/misc/guc.c:2376
+msgid ""
+"Sets the planner's estimate of the cost of a sequentially fetched disk page."
+msgstr ""
+"プランナ�シーケンシャル��り��れ�ディスクページ�コスト�概算を設定��"
+"�。"
 
-#: access/transam/twophase.c:439
+#: utils/misc/guc.c:2386
 msgid ""
-"Connect to the database where the transaction was prepared to finish it."
+"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
+"page."
 msgstr ""
-"終了��る������トランザクションを準備��データベース�接続�����"
-"�"
+"プランナ�順����り��れ�ディスクページ�コスト�概算を設定���。"
 
-#: access/transam/twophase.c:453
-#, c-format
-msgid "prepared transaction with identifier \"%s\" does not exist"
-msgstr "準備�れ�トランザクション�中�識別� \"%s\" を��も���り��ん"
+#: utils/misc/guc.c:2396
+msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
+msgstr "プランナ��タプル(行)を処��るコストを設定���。"
 
-#: access/transam/twophase.c:936
-msgid "two-phase state file maximum length exceeded"
-msgstr "2相状態ファイル�最大長�制�を超����"
+#: utils/misc/guc.c:2406
+msgid ""
+"Sets the planner's estimate of the cost of processing each index entry "
+"during an index scan."
+msgstr ""
+"プランナ�インデックススキャン時��れ�れ�インデックス項目を処��る���"
+"概算コストを設定���。 "
 
-#: access/transam/twophase.c:954
-#, c-format
-msgid "could not create two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"を作�����ん���: %m"
+#: utils/misc/guc.c:2416
+msgid ""
+"Sets the planner's estimate of the cost of processing each operator or "
+"function call."
+msgstr ""
+"プランナ���演算�呼�出���関数呼�出�を処��る概算コストを設定��"
+"�。"
 
-#: access/transam/twophase.c:968 access/transam/twophase.c:985
-#: access/transam/twophase.c:1034 access/transam/twophase.c:1445
-#: access/transam/twophase.c:1452
-#, c-format
-msgid "could not write two-phase state file: %m"
-msgstr "2相状態ファイル�書�出���ん���: %m"
+#: utils/misc/guc.c:2427
+msgid ""
+"Sets the planner's estimate of the fraction of a cursor's rows that will be "
+"retrieved."
+msgstr "�り出�れるカーソル行�割������プランナ�予測値を設定���。"
 
-#: access/transam/twophase.c:994
-#, c-format
-msgid "could not seek in two-phase state file: %m"
-msgstr "2相状態ファイルをシーク����ん���: %m"
+#: utils/misc/guc.c:2438
+msgid "GEQO: selective pressure within the population."
+msgstr "GEQO: 個体群内��択圧力��。"
 
-#: access/transam/twophase.c:1040 access/transam/twophase.c:1470
-#, c-format
-msgid "could not close two-phase state file: %m"
-msgstr "2相状態ファイルをクローズ����ん���: %m"
+#: utils/misc/guc.c:2448
+msgid "GEQO: seed for random path selection."
+msgstr "GEQO: 乱数パス�択用�シード"
 
-#: access/transam/twophase.c:1112 access/transam/twophase.c:1550
-#, c-format
-msgid "could not open two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"をオープン����ん���: %m"
+#: utils/misc/guc.c:2458
+msgid "Multiple of the average buffer usage to free per round."
+msgstr "１周���開放�る����ッファ�使用�平��掛�る�数"
 
-#: access/transam/twophase.c:1129
-#, c-format
-msgid "could not stat two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"�stat�����ん���: %m"
+#: utils/misc/guc.c:2468
+msgid "Sets the seed for random-number generation."
+msgstr "ランダム生�用�シードを設定���。"
 
-#: access/transam/twophase.c:1161
-#, c-format
-msgid "could not read two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"を読��れ��ん���: %m"
+#: utils/misc/guc.c:2479
+msgid ""
+"Number of tuple updates or deletes prior to vacuum as a fraction of "
+"reltuples."
+msgstr ""
+"reltuples�一部����キュームを行�����タプル�更新���削除回数。"
 
-#: access/transam/twophase.c:1253
-#, c-format
-msgid "two-phase state file for transaction %u is corrupt"
-msgstr "トランザクション%u用�2相状態ファイル�破������"
+#: utils/misc/guc.c:2488
+msgid ""
+"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
+"of reltuples."
+msgstr ""
+"reltuples�一部���解�を行�����タプル�挿入�更新���削除回数。"
 
-#: access/transam/twophase.c:1407
-#, c-format
-msgid "could not remove two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"を削除����ん���: %m"
+#: utils/misc/guc.c:2498
+msgid ""
+"Time spent flushing dirty buffers during checkpoint, as fraction of "
+"checkpoint interval."
+msgstr ""
+"�ェック�イント���るダーティ�ッファ���出�����時間（�ェック\n"
+"�イント間隔���る割�）。"
 
-#: access/transam/twophase.c:1436
-#, c-format
-msgid "could not recreate two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"を�作�����ん���: %m"
+#: utils/misc/guc.c:2517
+msgid "Sets the shell command that will be called to archive a WAL file."
+msgstr "WALファイル��管����呼�出�れるシェルスクリプトを設定���。"
 
-#: access/transam/twophase.c:1464
-#, c-format
-msgid "could not fsync two-phase state file: %m"
-msgstr "2相状態ファイルをfsync����ん���: %m"
+#: utils/misc/guc.c:2527
+msgid "Sets the client's character set encoding."
+msgstr "クライアント�文字セット符�化方�を設定���。"
 
-#: access/transam/twophase.c:1559
-#, c-format
-msgid "could not fsync two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"をfsync����ん���: %m"
+#: utils/misc/guc.c:2538
+msgid "Controls information prefixed to each log line."
+msgstr "�ログ行���付�る情報を制御���。"
 
-#: access/transam/twophase.c:1566
-#, c-format
-msgid "could not close two-phase state file \"%s\": %m"
-msgstr "2相状態ファイル\"%s\"をクローズ����ん���: %m"
+#: utils/misc/guc.c:2539
+msgid "If blank, no prefix is used."
+msgstr "も�空��れ�接頭辞��り��ん"
 
-#: access/transam/twophase.c:1631
-#, c-format
-msgid "removing future two-phase state file \"%s\""
-msgstr "将��2相状態ファイル\"%s\"を削除�����"
+#: utils/misc/guc.c:2548
+msgid "Sets the time zone to use in log messages."
+msgstr "ログメッセージ���割れる時間帯を設定���。"
 
-#: access/transam/twophase.c:1647 access/transam/twophase.c:1658
-#: access/transam/twophase.c:1771 access/transam/twophase.c:1782
-#: access/transam/twophase.c:1855
-#, c-format
-msgid "removing corrupt two-phase state file \"%s\""
-msgstr "破���2相状態ファイル\"%s\"を削除�����"
+#: utils/misc/guc.c:2558
+msgid "Sets the display format for date and time values."
+msgstr "日付時刻値�表示用書�を設定���。"
 
-#: access/transam/twophase.c:1760 access/transam/twophase.c:1844
-#, c-format
-msgid "removing stale two-phase state file \"%s\""
-msgstr "�����2相状態ファイル\"%s\"を削除�����"
+#: utils/misc/guc.c:2559
+msgid "Also controls interpretation of ambiguous date inputs."
+msgstr "曖昧�日付�入力�解釈も制御���。"
 
-#: access/transam/twophase.c:1862
-#, c-format
-msgid "recovering prepared transaction %u"
-msgstr "準備�れ�トランザクション%uを復旧�����"
+#: utils/misc/guc.c:2570
+msgid "Sets the default tablespace to create tables and indexes in."
+msgstr ""
+"テーブル�インデックス�作�先��るデフォルト�テーブル空間を設定���。"
 
-#: access/transam/xlog.c:1275
-#, c-format
-msgid "could not create archive status file \"%s\": %m"
-msgstr "アーカイブステータスファイル\"%s\"を作�����ん���: %m"
+#: utils/misc/guc.c:2571
+msgid "An empty string selects the database's default tablespace."
+msgstr "空文字列�データベース�デフォルト�テーブル空間を�択���。"
 
-#: access/transam/xlog.c:1283
-#, c-format
-msgid "could not write archive status file \"%s\": %m"
-msgstr "アーカイブステータスファイル\\\"%s\\\"を書�出���ん���: %m"
+#: utils/misc/guc.c:2581
+msgid "Sets the tablespace(s) to use for temporary tables and sort files."
+msgstr "一時テーブル�ファイル�ソート�使用�れるテーブル空間を設定���。"
 
-#: access/transam/xlog.c:1738 access/transam/xlog.c:9577
-#: replication/walreceiver.c:479 replication/walsender.c:596
-#, c-format
-msgid "could not seek in log file %u, segment %u to offset %u: %m"
-msgstr ""
-"ログファイル%u�セグメント%uをオフセット%u��シーク����ん���: %m"
+#: utils/misc/guc.c:2592
+msgid "Sets the path for dynamically loadable modules."
+msgstr "動的ロード�能モジュール�パスを設定���。"
 
-#: access/transam/xlog.c:1755 replication/walreceiver.c:496
-#, c-format
-msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
+#: utils/misc/guc.c:2593
+msgid ""
+"If a dynamically loadable module needs to be opened and the specified name "
+"does not have a directory component (i.e., the name does not contain a "
+"slash), the system will search this path for the specified file."
 msgstr ""
-"ログファイル%u�セグメント%uをオフセット%u�長�%lu�書�出���ん���: %m"
+"オープン�る必���る動的ロード�能�モジュール�����指定�れ�ファイル"
+"��ディレクトリ�素���(��り����スラッシュ���れ��)場��システ"
+"ム�指定�れ�ファイルを��パス�ら検索���。 "
 
-#: access/transam/xlog.c:1957
-#, c-format
-msgid "updated min recovery point to %X/%X"
-msgstr "最�リカ�リ�イントを %X/%X �更新����"
+#: utils/misc/guc.c:2606
+msgid "Sets the location of the Kerberos server key file."
+msgstr "Kerberosサー�キーファイル�場所を設定���。"
 
-#: access/transam/xlog.c:2298 access/transam/xlog.c:2402
-#: access/transam/xlog.c:2631 access/transam/xlog.c:2702
-#: access/transam/xlog.c:2759 replication/walsender.c:584
-#, c-format
-msgid "could not open file \"%s\" (log file %u, segment %u): %m"
-msgstr ""
-"ファイル\"%s\"(ログファイル%u�セグメント%u)をオープン����ん���: %m"
+#: utils/misc/guc.c:2617
+msgid "Sets the name of the Kerberos service."
+msgstr "Kerberosサービス�を設定���。"
 
-#: access/transam/xlog.c:2472
-#, c-format
-msgid "not enough data in file \"%s\""
-msgstr "ファイル\"%s\"内�データ���分��"
+#: utils/misc/guc.c:2627
+msgid "Sets the Bonjour service name."
+msgstr "Bonjour サービス�を設定���。"
+
+#: utils/misc/guc.c:2639
+msgid "Shows the collation order locale."
+msgstr "テキストデータ�ソート時�使用�れるロケールを表示���。"
+
+#: utils/misc/guc.c:2650
+msgid "Shows the character classification and case conversion locale."
+msgstr "文字クラス分類�大文字�文字変�を決定�るロケールを表示���。"
+
+#: utils/misc/guc.c:2661
+msgid "Sets the language in which messages are displayed."
+msgstr "表示用メッセージ�言語を設定���。"
+
+#: utils/misc/guc.c:2671
+msgid "Sets the locale for formatting monetary amounts."
+msgstr "通貨書��使用�るロケールを設定���。 "
+
+#: utils/misc/guc.c:2681
+msgid "Sets the locale for formatting numbers."
+msgstr "数字�書��使用�るロケールを設定���。"
 
-#: access/transam/xlog.c:2591
-#, c-format
-msgid ""
-"could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
-"%u): %m"
-msgstr ""
-"ファイル\"%s\"を\"%s\"�リンク����ん���(ログファイル%u�セグメント%u�"
-"�期化): %m"
+#: utils/misc/guc.c:2691
+msgid "Sets the locale for formatting date and time values."
+msgstr "日付�時間�書��使用�るロケールを設定���。"
 
-#: access/transam/xlog.c:2603
-#, c-format
-msgid ""
-"could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
-"segment %u): %m"
-msgstr ""
-"ファイル\"%s\"���を\"%s\"�変更����ん���(ログファイル%u�セグメン"
-"ト%u��期化): %m"
+#: utils/misc/guc.c:2701
+msgid "Lists shared libraries to preload into server."
+msgstr "サー��事�ロード�る共有ライブラリを列挙���。"
 
-#: access/transam/xlog.c:2786 replication/walreceiver.c:453
-#, c-format
-msgid "could not close log file %u, segment %u: %m"
-msgstr "ログファイル%u�セグメント%uをクローズ����ん���: %m"
+#: utils/misc/guc.c:2712
+msgid "Lists shared libraries to preload into each backend."
+msgstr "��ックエンド�事�ロード�る共有ライブラリを列挙���。"
 
-#: access/transam/xlog.c:3002
-#, c-format
-msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
-msgstr "アーカイブファイル\"%s\"�サイズ��正��: %lu。%luを想定"
+#: utils/misc/guc.c:2723
+msgid "Sets the schema search order for names that are not schema-qualified."
+msgstr "スキーマ部を�������対�るスキーマ�検索順を設定���。"
 
-#: access/transam/xlog.c:3011
-#, c-format
-msgid "restored log file \"%s\" from archive"
-msgstr "ログファイル\"%s\"をアーカイブ�らリストア����"
+#: utils/misc/guc.c:2735
+msgid "Sets the server (database) character set encoding."
+msgstr "サー�(データベース)文字セット符�化方�を設定���。"
 
-#: access/transam/xlog.c:3061
-#, c-format
-msgid "could not restore file \"%s\" from archive: return code %d"
-msgstr "アーカイブ�らファイル\"%s\"をリストア����ん���: 戻りコード %d"
+#: utils/misc/guc.c:2747
+msgid "Shows the server version."
+msgstr "サー���ージョンを表示���。"
 
-#: access/transam/xlog.c:3176
-msgid "%s \"%s\": return code %d"
-msgstr "%s \"%s\": リターンコード %d"
+#: utils/misc/guc.c:2759
+msgid "Sets the current role."
+msgstr "�在�ロールを設定���。"
 
-#: access/transam/xlog.c:3289 access/transam/xlog.c:3469
-#, c-format
-msgid "could not open transaction log directory \"%s\": %m"
-msgstr "トランザクションログディレクトリ\"%s\"をオープン����ん���: %m"
+#: utils/misc/guc.c:2771
+msgid "Sets the session user name."
+msgstr "セッションユーザ�を設定���。"
 
-#: access/transam/xlog.c:3340
-#, c-format
-msgid "recycled transaction log file \"%s\""
-msgstr "トランザクションログファイル\"%s\"を回�����"
+#: utils/misc/guc.c:2782
+msgid "Sets the destination for server log output."
+msgstr "サー�ログ�出力先を設定���。"
 
-#: access/transam/xlog.c:3356
-#, c-format
-msgid "removing transaction log file \"%s\""
-msgstr "トランザクションログファイル\"%s\"を削除����"
+#: utils/misc/guc.c:2783
+msgid ""
+"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
+"\"eventlog\", depending on the platform."
+msgstr ""
+"有効�値��プラットフォーム��存�����\"stderr\"�\"syslog\"�\"csvlog"
+"\"�\"eventlog\"�組������。"
 
-#: access/transam/xlog.c:3379
-#, c-format
-msgid "could not rename old transaction log file \"%s\": %m"
-msgstr "��トランザクションログファイル \"%s\" をリ�ーム����ん���: %m"
+#: utils/misc/guc.c:2794
+msgid "Sets the destination directory for log files."
+msgstr "ログファイル�格�ディレクトリを設定���。"
 
-#: access/transam/xlog.c:3391
-#, c-format
-msgid "could not remove old transaction log file \"%s\": %m"
-msgstr "��トランザクションログファイル \"%s\" を削除����ん���: %m"
+#: utils/misc/guc.c:2795
+msgid "Can be specified as relative to the data directory or as absolute path."
+msgstr "データディレクトリ�ら�相対パス�も絶対パス�も指定����"
 
-#: access/transam/xlog.c:3429 access/transam/xlog.c:3439
-#, c-format
-msgid "required WAL directory \"%s\" does not exist"
-msgstr "WAL ディレクトリ\"%s\"�存在���ん"
+#: utils/misc/guc.c:2805
+msgid "Sets the file name pattern for log files."
+msgstr "ログファイル�ファイル�パターンを設定���。"
 
-#: access/transam/xlog.c:3445
-#, c-format
-msgid "creating missing WAL directory \"%s\""
-msgstr "WAL ディレクトリ%sを作������ ... "
+#: utils/misc/guc.c:2816
+msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+msgstr ""
+"syslog内�PostgreSQL�メッセージを識別�る���使用�れるプログラム�を設定"
+"���。"
 
-#: access/transam/xlog.c:3448
-#, c-format
-msgid "could not create missing directory \"%s\": %m"
-msgstr "ディレクトリ\"%s\"を作�����ん���: %m"
+#: utils/misc/guc.c:2827
+msgid "Sets the time zone for displaying and interpreting time stamps."
+msgstr "タイムスタンプ�表示�解釈�使用�る時間帯を設定���。"
 
-#: access/transam/xlog.c:3482
-#, c-format
-msgid "removing transaction log backup history file \"%s\""
-msgstr "トランザクションログ�ックアップ履歴ファイル\"%s\"を削除�����"
+#: utils/misc/guc.c:2837
+msgid "Selects a file of time zone abbreviations."
+msgstr "時間帯�略形用�ファイルを�択���。"
 
-#: access/transam/xlog.c:3602
-#, c-format
-msgid "incorrect hole size in record at %X/%X"
-msgstr "%X/%X�レコード�ホールサイズ��正��"
+#: utils/misc/guc.c:2847
+msgid "Sets the current transaction's isolation level."
+msgstr "�在�トランザクション�隔離レベルを設定���。"
 
-#: access/transam/xlog.c:3615
-#, c-format
-msgid "incorrect total length in record at %X/%X"
-msgstr "%X/%X�レコード内�全長��正��"
+#: utils/misc/guc.c:2858
+msgid "Sets the owning group of the Unix-domain socket."
+msgstr "Unixドメインソケットを所有�るグループを設定���。"
 
-#: access/transam/xlog.c:3628
-#, c-format
-msgid "incorrect resource manager data checksum in record at %X/%X"
-msgstr "%X/%X�レコード内�リソースマ�ージャデータ��ェックサム��正��"
+#: utils/misc/guc.c:2859
+msgid ""
+"The owning user of the socket is always the user that starts the server."
+msgstr "ソケットを所有�るユーザ�常�サー�を開始��ユーザ��。"
 
-#: access/transam/xlog.c:3697 access/transam/xlog.c:3733
-#, c-format
-msgid "invalid record offset at %X/%X"
-msgstr "%X/%X�レコードオフセット�無効��"
+#: utils/misc/guc.c:2869
+msgid "Sets the directory where the Unix-domain socket will be created."
+msgstr "Unixドメインソケット�作�先ディレクトリを設定���。"
 
-#: access/transam/xlog.c:3741
-#, c-format
-msgid "contrecord is requested by %X/%X"
-msgstr "%X/%X��contrecord�必���"
+#: utils/misc/guc.c:2880
+msgid "Sets the host name or IP address(es) to listen to."
+msgstr "接続を監視�るホスト����IPアドレスを設定���。"
 
-#: access/transam/xlog.c:3756
-#, c-format
-msgid "invalid xlog switch record at %X/%X"
-msgstr "%X/%X�xlog切り替�レコード�無効��"
+#: utils/misc/guc.c:2891
+msgid "Sets the list of known custom variable classes."
+msgstr "既知�カスタム変数クラス�リストを設定���。"
 
-#: access/transam/xlog.c:3764
-#, c-format
-msgid "record with zero length at %X/%X"
-msgstr "%X/%X�レコード�サイズ�0��"
+#: utils/misc/guc.c:2902
+msgid "Sets the server's data directory."
+msgstr "サー��データディレクトリを設定���。"
 
-#: access/transam/xlog.c:3773
-#, c-format
-msgid "invalid record length at %X/%X"
-msgstr "%X/%X�レコード長�無効��"
+#: utils/misc/guc.c:2913
+msgid "Sets the server's main configuration file."
+msgstr "サー��メイン設定ファイルを設定���。"
 
-#: access/transam/xlog.c:3780
-#, c-format
-msgid "invalid resource manager ID %u at %X/%X"
-msgstr "%2$X/%3$X�リソースマ�ージャID %1$u�無効��"
+#: utils/misc/guc.c:2924
+msgid "Sets the server's \"hba\" configuration file."
+msgstr "サー��\"hba\"設定ファイルを設定���。"
 
-#: access/transam/xlog.c:3793 access/transam/xlog.c:3809
-#, c-format
-msgid "record with incorrect prev-link %X/%X at %X/%X"
-msgstr "直��リンク%1$X/%2$X��正�レコード�%3$X/%4$X��り��"
+#: utils/misc/guc.c:2935
+msgid "Sets the server's \"ident\" configuration file."
+msgstr "サー��\"ident\"設定ファイルを設定���。"
 
-#: access/transam/xlog.c:3838
-#, c-format
-msgid "record length %u at %X/%X too long"
-msgstr "%2$X/%3$X�レコード長%1$u�大�����"
+#: utils/misc/guc.c:2946
+msgid "Writes the postmaster PID to the specified file."
+msgstr "postmaster�PIDを指定��ファイル�書�込���。"
 
-#: access/transam/xlog.c:3878
-#, c-format
-msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
-msgstr "ログファイル%u�セグメント%u�オフセット%u�contrecord��り��ん"
+#: utils/misc/guc.c:2957
+msgid "Writes temporary statistics files to the specified directory."
+msgstr "一時的�統計情報ファイルを指定��ディレクトリ�書�込���。"
 
-#: access/transam/xlog.c:3888
-#, c-format
-msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
-msgstr ""
-"ログファイル%2$u�セグメント%3$u�オフセット%4$u�contrecord�長�%1$u�無効"
-"��"
+#: utils/misc/guc.c:2968
+msgid "List of potential standby names to synchronise with."
+msgstr "�期���スタン�イ���能性��る一覧"
 
-#: access/transam/xlog.c:3978
-#, c-format
-msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
-msgstr ""
-"ログファイル%2$u�セグメント%3$u�オフセット%4$u�マジック番�%1$04X�無効�"
-"�"
+#: utils/misc/guc.c:2979
+msgid "Sets default text search configuration."
+msgstr "デフォルト�テキスト検索設定を設定���。"
 
-#: access/transam/xlog.c:3985 access/transam/xlog.c:4031
-#, c-format
-msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
-msgstr ""
-"ログファイル %2$u �セグメント %3$u�オフセット %4$u �情報ビット %1$04X �無"
-"効��"
+#: utils/misc/guc.c:2989
+msgid "Sets the list of allowed SSL ciphers."
+msgstr "SSL暗����許�れるリストを設定���。"
 
-#: access/transam/xlog.c:4007 access/transam/xlog.c:4015
-#: access/transam/xlog.c:4022
-msgid "WAL file is from different database system"
-msgstr "WAL ファイル�異�るデータベースシステム由��も���"
+#: utils/misc/guc.c:3004
+msgid "Sets the application name to be reported in statistics and logs."
+msgstr "統計やログ�報告�れるアプリケーション�を設定���。"
 
-#: access/transam/xlog.c:4008
-#, c-format
-msgid ""
-"WAL file database system identifier is %s, pg_control database system "
-"identifier is %s."
-msgstr ""
-"WAL ファイル���るデータベースシステム�識別�� %s ��"
-"pg_control ���るデータベースシステム�識別�� %s ��。"
+#: utils/misc/guc.c:3024
+msgid "Sets whether \"\\'\" is allowed in string literals."
+msgstr "\"\\'\"��れ��集��文字列リテラル�許�れ����。"
 
-#: access/transam/xlog.c:4016
-msgid "Incorrect XLOG_SEG_SIZE in page header."
-msgstr "ページヘッダ内�XLOG_SEG_SIZE��正��。"
+#: utils/misc/guc.c:3034
+msgid "Sets the output format for bytea."
+msgstr "bytea �出力フォーマットを設定���。"
 
-#: access/transam/xlog.c:4023
-msgid "Incorrect XLOG_BLCKSZ in page header."
-msgstr "ページヘッダ内�XLOG_BLCKSZ��正��。"
+#: utils/misc/guc.c:3044
+msgid "Sets the message levels that are sent to the client."
+msgstr "クライアント��信�れる最��メッセージレベルを設定���。"
 
-#: access/transam/xlog.c:4039
-#, c-format
-msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
+#: utils/misc/guc.c:3045 utils/misc/guc.c:3098 utils/misc/guc.c:3109
+#: utils/misc/guc.c:3165
+msgid ""
+"Each level includes all the levels that follow it. The later the level, the "
+"fewer messages are sent."
 msgstr ""
-"ログファイル%3$u�セグメント%4$u�オフセット%5$u�ページアドレス%1$X/%2$X�想"
-"定外��"
+" �レベル����レベル以下�全����れ��。レベルを低��る����信�れ"
+"るメッセージ�より少���り��。 "
 
-#: access/transam/xlog.c:4051
-#, c-format
-msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
-msgstr ""
-"ログファイル%2$u�セグメント%3$u�オフセット%4$u�時系列ID%1$u�想定外��"
+#: utils/misc/guc.c:3055
+msgid "Enables the planner to use constraints to optimize queries."
+msgstr "プランナ�よる������を最�化�る制約�使用を有効����。"
 
-#: access/transam/xlog.c:4069
-#, c-format
+#: utils/misc/guc.c:3056
 msgid ""
-"out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
-"%u"
+"Table scans will be skipped if their constraints guarantee that no rows "
+"match the query."
 msgstr ""
-"ログファイル%3$u�セグメント%4$u�オフセット%5$u�時系列ID %1$u(%2$u�後)�順"
-"��従�����ん"
+"制約�より�������一致�る行�存在�������証�れ��る場��テー"
+"ブル�スキャンを行���ん。"
 
-#: access/transam/xlog.c:4142
-#, c-format
-msgid "syntax error in history file: %s"
-msgstr "履歴ファイル内�構文エラー: %s"
+#: utils/misc/guc.c:3066
+msgid "Sets the transaction isolation level of each new transaction."
+msgstr "新�トランザクション�トランザクション隔離レベルを設定���。"
 
-#: access/transam/xlog.c:4143
-msgid "Expected a numeric timeline ID."
-msgstr "数字�時系列IDを想定����。"
+#: utils/misc/guc.c:3076
+msgid "Sets the display format for interval values."
+msgstr "時刻インター�ル値�表示フォーマットを設定���。"
 
-#: access/transam/xlog.c:4148
-#, c-format
-msgid "invalid data in history file: %s"
-msgstr "履歴ファイル内�無効�データ: %s"
+#: utils/misc/guc.c:3087
+msgid "Sets the verbosity of logged messages."
+msgstr "ログ出力メッセージ�詳細度を設定���。"
 
-#: access/transam/xlog.c:4149
-msgid "Timeline IDs must be in increasing sequence."
-msgstr "時系列ID�昇順�並����れ��り��ん"
+#: utils/misc/guc.c:3097
+msgid "Sets the message levels that are logged."
+msgstr "ログ�出力�るメッセージレベルを設定���。"
 
-#: access/transam/xlog.c:4162
-#, c-format
-msgid "invalid data in history file \"%s\""
-msgstr "履歴ファイル\"%s\"内�無効�データ��り���"
+#: utils/misc/guc.c:3108
+msgid ""
+"Causes all statements generating error at or above this level to be logged."
+msgstr "��レベル以上�エラーを発生���全��SQL文をログ�記録���。"
 
-#: access/transam/xlog.c:4163
-msgid "Timeline IDs must be less than child timeline's ID."
-msgstr "時系列ID�副時系列IDより�����れ��り��ん。"
+#: utils/misc/guc.c:3119
+msgid "Sets the type of statements logged."
+msgstr "ログ出力�る文�種類を設定���。"
 
-#: access/transam/xlog.c:4422
-#, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "ファイル\"%s\"�ら\"%s\"��リンク�����ん���: %m"
+#: utils/misc/guc.c:3129
+msgid "Sets the syslog \"facility\" to be used when syslog enabled."
+msgstr "syslogを有効���場��使用�るsyslog \"facility\"を設定���。"
+
+#: utils/misc/guc.c:3144
+msgid "Sets the session's behavior for triggers and rewrite rules."
+msgstr "トリガ�書���ルール�関�るセッション�動作を設定���。"
 
-#: access/transam/xlog.c:4511
-#, c-format
-msgid "could not create control file \"%s\": %m"
-msgstr "制御ファイル\"%s\"を作�����ん���: %m"
+#: utils/misc/guc.c:3154
+#, 
+msgid "Sets the current transaction's synchronization level."
+msgstr "�在�トランザクション��期レベルを設定���。"
 
-#: access/transam/xlog.c:4522 access/transam/xlog.c:4747
-#, c-format
-msgid "could not write to control file: %m"
-msgstr "制御ファイルを書�出���ん���: %m"
+#: utils/misc/guc.c:3164
+msgid "Enables logging of recovery-related debugging information."
+msgstr "リカ�リ関連�デ�ッグ情報�記録を行���"
 
-#: access/transam/xlog.c:4528 access/transam/xlog.c:4753
-#, c-format
-msgid "could not fsync control file: %m"
-msgstr "制御ファイルをfsync����ん���: %m"
+#: utils/misc/guc.c:3180
+msgid "Collects function-level statistics on database activity."
+msgstr "データベース�動作�関���関数レベル�統計情報を�集���。"
 
-#: access/transam/xlog.c:4533 access/transam/xlog.c:4758
-#, c-format
-msgid "could not close control file: %m"
-msgstr "制御ファイルをクローズ����ん���: %m"
+#: utils/misc/guc.c:3190
+msgid "Set the level of information written to the WAL."
+msgstr "WAL �書�出�れる情報�レベルを設定���。"
 
-#: access/transam/xlog.c:4551 access/transam/xlog.c:4736
-#, c-format
-msgid "could not open control file \"%s\": %m"
-msgstr "制御ファイル\"%s\"をオープン����ん���: %m"
+#: utils/misc/guc.c:3200
+msgid "Selects the method used for forcing WAL updates to disk."
+msgstr "強制的�WAL�更新をディスク���出����方法を�択���。"
 
-#: access/transam/xlog.c:4557
-#, c-format
-msgid "could not read from control file: %m"
-msgstr "制御ファイルを読��れ��ん���: %m"
+#: utils/misc/guc.c:3210
+msgid "Sets how binary values are to be encoded in XML."
+msgstr "��よ���イナリ値をXML�符�化�る�を設定���。"
 
-#: access/transam/xlog.c:4571
-#, c-format
+#: utils/misc/guc.c:3220
 msgid ""
-"The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
-"but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
+"Sets whether XML data in implicit parsing and serialization operations is to "
+"be considered as documents or content fragments."
 msgstr ""
-"データベースクラスタ�PG_CONTROL_VERSION %d (0x%08x)��期化�れ�����"
-"サー��PG_CONTROL_VERSION %d (0x%08x)�コンパイル�れ����。"
+"暗黙的�解��よ�シリアライゼーション�作����XMLデータを文書�����断"
+"片�����を設定���。"
 
-#: access/transam/xlog.c:4575
+#: utils/misc/guc.c:4062
+#, c-format
 msgid ""
-"This could be a problem of mismatched byte ordering.  It looks like you need "
-"to initdb."
+"%s does not know where to find the server configuration file.\n"
+"You must specify the --config-file or -D invocation option or set the PGDATA "
+"environment variable.\n"
 msgstr ""
-"�れ��イトオーダ��整��題��り得��。initdb���れ��ら��\n"
-"よ���。"
+"%s�サー�設定ファイル�場所��識����ん。\n"
+"--config-file���-Dオプションを指定�る��る��PGDATA環境変数を設\n"
+"定�る必���り��。\n"
+
+#: utils/misc/guc.c:4081
+#, c-format
+msgid "%s cannot access the server configuration file \"%s\": %s\n"
+msgstr "%s�サー�設定ファイル\"%s\"�アクセス����ん: %s\n"
 
-#: access/transam/xlog.c:4580
+#: utils/misc/guc.c:4101
 #, c-format
 msgid ""
-"The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
-"server was compiled with PG_CONTROL_VERSION %d."
+"%s does not know where to find the database system data.\n"
+"This can be specified as \"data_directory\" in \"%s\", or by the -D "
+"invocation option, or by the PGDATA environment variable.\n"
 msgstr ""
-"データベースクラスタ�PG_CONTROL_VERSION %d ��期化�れ�����サー�� "
-"PG_CONTROL_VERSION %d �コンパイル�れ����。"
-
-#: access/transam/xlog.c:4583 access/transam/xlog.c:4607
-#: access/transam/xlog.c:4614 access/transam/xlog.c:4619
-msgid "It looks like you need to initdb."
-msgstr "initdb�必��よ���"
-
-#: access/transam/xlog.c:4594
-msgid "incorrect checksum in control file"
-msgstr "制御ファイル内��ェックサム��正��"
+"%s�データベースシステムデータ�場所を�識����ん。\n"
+"\"%s\"内�\"data_directory\"を指定�る�-Dオプションを指定�る�PGDATA環\n"
+"境変数�設定�る�������。\n"
 
-#: access/transam/xlog.c:4604
+#: utils/misc/guc.c:4132
 #, c-format
 msgid ""
-"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
-"server was compiled with CATALOG_VERSION_NO %d."
+"%s does not know where to find the \"hba\" configuration file.\n"
+"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
 msgstr ""
-"データベースクラスタ� CATALOG_VERSION_NO %d ��期化�れ�����サー�� "
-"CATALOG_VERSION_NO %d �コンパイル�れ����。"
+"%s�\"hba\"設定ファイル�場所を�識����ん。\n"
+"\"%s\"内�\"hba_directory\"を指定�る�-Dオプションを指定�る�PGDATA環\n"
+"境変数�設定�る�������。\n"
 
-#: access/transam/xlog.c:4611
+#: utils/misc/guc.c:4155
 #, c-format
 msgid ""
-"The database cluster was initialized with MAXALIGN %d, but the server was "
-"compiled with MAXALIGN %d."
+"%s does not know where to find the \"ident\" configuration file.\n"
+"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
 msgstr ""
-"データベースクラスタ� MAXALIGN %d ��期化�れ�����サー�� MAXALIGN %"
-"d �コンパイル�れ����。"
+"%s�\"ident\"設定ファイル�場所を�識����ん。\n"
+"\"%s\"内�\"ident_directory\"を指定�る�-Dオプションを指定�る�PGDATA環\n"
+"境変数�設定�る�������。\n"
+
+#: utils/misc/guc.c:4735 utils/misc/guc.c:4899
+msgid "Value exceeds integer range."
+msgstr "値�整数範囲を超�����。"
+
+#: utils/misc/guc.c:4754
+msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
+msgstr "��パラメータ�有効���\"kB\"�\"MB\"�\"GB\"��。"
 
-#: access/transam/xlog.c:4618
+#: utils/misc/guc.c:4813
 msgid ""
-"The database cluster appears to use a different floating-point number format "
-"than the server executable."
-msgstr ""
-"データベースクラスタ�サー�実行ファイル�異�る浮動�数点書�を使用���る"
-"よ���。"
+"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
+msgstr "��パラメータ�有効���\"ms\"�\"s\"�\"min\"�\"h\"�\"d\"��。"
 
-#: access/transam/xlog.c:4623
+#: utils/misc/guc.c:5096 utils/misc/guc.c:5859 utils/misc/guc.c:5909
+#: utils/misc/guc.c:6582 utils/misc/guc.c:6741 utils/misc/guc.c:7902
+#: guc-file.l:203
 #, c-format
-msgid ""
-"The database cluster was initialized with BLCKSZ %d, but the server was "
-"compiled with BLCKSZ %d."
-msgstr ""
-"データベースクラスタ� BLCKSZ %d ��期化�れ�����サー�� BLCKSZ %d �"
-"コンパイル�れ����。"
+msgid "unrecognized configuration parameter \"%s\""
+msgstr "設定パラメータ\"%s\"��明��"
 
-#: access/transam/xlog.c:4626 access/transam/xlog.c:4633
-#: access/transam/xlog.c:4640 access/transam/xlog.c:4647
-#: access/transam/xlog.c:4654 access/transam/xlog.c:4661
-#: access/transam/xlog.c:4668 access/transam/xlog.c:4676
-#: access/transam/xlog.c:4683 access/transam/xlog.c:4692
-#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
-#: access/transam/xlog.c:4715
-msgid "It looks like you need to recompile or initdb."
-msgstr "�コンパイルも��� initdb �必�����"
+#: utils/misc/guc.c:5129
+#, c-format
+msgid "parameter \"%s\" cannot be changed"
+msgstr "パラメータ\"%s\"を変更����ん"
 
-#: access/transam/xlog.c:4630
+#: utils/misc/guc.c:5158 utils/misc/guc.c:5332 utils/misc/guc.c:5429
+#: utils/misc/guc.c:5523 utils/misc/guc.c:5637 utils/misc/guc.c:5738
+#: guc-file.l:250
 #, c-format
-msgid ""
-"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
-"compiled with RELSEG_SIZE %d."
-msgstr ""
-"データベースクラスタ� RELSEG_SIZE %d ��期化�れ�����サー�� "
-"RELSEG_SIZE %d �コンパイル�れ����。"
+msgid "parameter \"%s\" cannot be changed without restarting the server"
+msgstr "パラメータ \"%s\" を変更�る��サー�ー��起動�必���"
 
-#: access/transam/xlog.c:4637
+#: utils/misc/guc.c:5168
 #, c-format
-msgid ""
-"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
-"compiled with XLOG_BLCKSZ %d."
-msgstr ""
-"データベースクラスタ� XLOG_BLCKSZ %d ��期化�れ�����サー�� "
-"XLOG_BLCKSZ %d �コンパイル�れ����。"
+msgid "parameter \"%s\" cannot be changed now"
+msgstr "�在パラメータ\"%s\"を変更����ん"
 
-#: access/transam/xlog.c:4644
+#: utils/misc/guc.c:5199
 #, c-format
-msgid ""
-"The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
-"was compiled with XLOG_SEG_SIZE %d."
-msgstr ""
-"データベースクラスタ� XLOG_SEG_SIZE %d ��期化�れ�����サー�� "
-"XLOG_SEG_SIZE %d �コンパイル�れ����。"
+msgid "parameter \"%s\" cannot be set after connection start"
+msgstr "接続開始後�パラメータ\"%s\"を変更����ん"
 
-#: access/transam/xlog.c:4651
+#: utils/misc/guc.c:5209 utils/misc/guc.c:7917
 #, c-format
-msgid ""
-"The database cluster was initialized with NAMEDATALEN %d, but the server was "
-"compiled with NAMEDATALEN %d."
-msgstr ""
-"データベースクラスタ� NAMEDATALEN %d ��期化�れ�����サー�� "
-"NAMEDATALEN %d �コンパイル�れ����。"
+msgid "permission denied to set parameter \"%s\""
+msgstr "パラメータ\"%s\"を設定�る権���り��ん"
 
-#: access/transam/xlog.c:4658
+#: utils/misc/guc.c:5247
 #, c-format
-msgid ""
-"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
-"was compiled with INDEX_MAX_KEYS %d."
-msgstr ""
-"データベースクラスタ� INDEX_MAX_KEYS %d ��期化�れ�����サー�� "
-"INDEX_MAX_KEYS %d �コンパイル�れ����。"
+msgid "cannot set parameter \"%s\" within security-definer function"
+msgstr "セキュリティー定義用関数内�パラメーター \"%s\" を設定����ん"
 
-#: access/transam/xlog.c:4665
+#: utils/misc/guc.c:5393 utils/misc/guc.c:5707 utils/misc/guc.c:8081
+#: utils/misc/guc.c:8115
 #, c-format
-msgid ""
-"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
-"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
-msgstr ""
-"データベースクラスタ� TOAST_MAX_CHUNK_SIZE %d ��期化�れ�����サー�"
-"� TOAST_MAX_CHUNK_SIZE %d �コンパイル�れ����。"
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "パラメータ\"%s\"�値�無効��: \"%s\""
 
-#: access/transam/xlog.c:4674
-msgid ""
-"The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
-"server was compiled with HAVE_INT64_TIMESTAMP."
-msgstr ""
-"データベースクラスタ� HAVE_INT64_TIMESTAMP ����期化�れ�����サー�"
-"� HAVE_INT64_TIMESTAMP �コンパイル�れ����。"
+#: utils/misc/guc.c:5402
+#, c-format
+msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
+msgstr "%d�パラメータ\"%s\"�有効範囲を超�����(%d .. %d)"
 
-#: access/transam/xlog.c:4681
-msgid ""
-"The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
-"server was compiled without HAVE_INT64_TIMESTAMP."
-msgstr ""
-"データベースクラスタ� HAVE_INT64_TIMESTAMP ��期化�れ�����サー�� "
-"HAVE_INT64_TIMESTAMP ���コンパイル�れ����。"
+#: utils/misc/guc.c:5488
+#, c-format
+msgid "parameter \"%s\" requires a numeric value"
+msgstr "パラメータ\"%s\"�数値�必���"
 
-#: access/transam/xlog.c:4690
-msgid ""
-"The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
-"was compiled with USE_FLOAT4_BYVAL."
-msgstr ""
-"データベースクラスタ� USE_FLOAT4_BYVAL ����期化�れ�����サー��� "
-"USE_FLOAT4_BYVAL 付��コンパイル�れ����。"
+#: utils/misc/guc.c:5496
+#, c-format
+msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
+msgstr "%g�パラメータ\"%s\"�有効範囲を超�����(%g .. %g)"
 
-#: access/transam/xlog.c:4697
-msgid ""
-"The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
-"was compiled without USE_FLOAT4_BYVAL."
-msgstr ""
-"データベースクラスタ� USE_FLOAT4_BYVAL 付���期化�れ�����サー��� "
-"USE_FLOAT4_BYVAL ���コンパイル�れ����。"
+#: utils/misc/guc.c:5865 utils/misc/guc.c:5913 utils/misc/guc.c:6745
+#, c-format
+msgid "must be superuser to examine \"%s\""
+msgstr "\"%s\"を確��る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/xlog.c:4706
-msgid ""
-"The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
-"was compiled with USE_FLOAT8_BYVAL."
-msgstr ""
-"データベースクラスタ� USE_FLOAT8_BYVAL ����期化�れ�����サー��� "
-"USE_FLOAT8_BYVAL 付��コンパイル�れ����。"
+#: utils/misc/guc.c:5979
+#, c-format
+msgid "SET %s takes only one argument"
+msgstr "SET %s�1��引数��を�り��"
 
-#: access/transam/xlog.c:4713
-msgid ""
-"The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
-"was compiled without USE_FLOAT8_BYVAL."
-msgstr ""
-"データベースクラスタ� USE_FLOAT8_BYVAL 付���期化�れ�����サー��� "
-"USE_FLOAT8_BYVAL ���コンパイル�れ����。"
+#: utils/misc/guc.c:6212
+msgid "SET requires parameter name"
+msgstr "SET��パラメータ��必���"
 
-#: access/transam/xlog.c:4956
+#: utils/misc/guc.c:6327
 #, c-format
-msgid "could not write bootstrap transaction log file: %m"
-msgstr ""
-"ブートストラップ・トランザクション�ログファイルを書�出���ん���: %m"
+msgid "attempt to redefine parameter \"%s\""
+msgstr "パラメータ\"%s\"を�定義�よ�������"
 
-#: access/transam/xlog.c:4962
+#: utils/misc/guc.c:7618
 #, c-format
-msgid "could not fsync bootstrap transaction log file: %m"
-msgstr ""
-"ブートストラップ・トランザクションログファイルをfsync����ん���: %m"
+msgid "could not parse setting for parameter \"%s\""
+msgstr "パラメータ\"%s\"�設定を解�����ん"
 
-#: access/transam/xlog.c:4967
+#: utils/misc/guc.c:7979 utils/misc/guc.c:8013
 #, c-format
-msgid "could not close bootstrap transaction log file: %m"
-msgstr ""
-"ブートストラップ・トランザクションログファイルをクローズ����ん���: %m"
+msgid "invalid value for parameter \"%s\": %d"
+msgstr "パラメータ\"%s\"�値�無効��: %d"
 
-#: access/transam/xlog.c:5129
+#: utils/misc/guc.c:8047
 #, c-format
-msgid "could not open recovery command file \"%s\": %m"
-msgstr "リカ�リコマンドファイル \"%s\" をオープン����ん���: %m"
+msgid "invalid value for parameter \"%s\": %g"
+msgstr "パラメータ\"%s\"�値�無効��: %g"
 
-#: access/transam/xlog.c:5153
+#: utils/misc/guc.c:8175 commands/variable.c:160
 #, c-format
-msgid "restore_command = '%s'"
-msgstr "restore_command = '%s'"
+msgid "Unrecognized key word: \"%s\"."
+msgstr "�明�キーワード��: \"%s\""
 
-#: access/transam/xlog.c:5160
-#, c-format
-msgid "recovery_end_command = '%s'"
-msgstr "recovery_end_command = '%s'"
+#: utils/misc/guc.c:8237
+msgid ""
+"\"temp_buffers\" cannot be changed after any temp tables have been accessed "
+"in the session."
+msgstr ""
+"当該セッション���れ��一時テーブル�アクセス�れ�後� \"temp_buffers\""
+"を変更����ん"
 
-#: access/transam/xlog.c:5167
-msgid "archive_cleanup_command = '%s'"
-msgstr "archive_cleanup_command = '%s'"
+#: utils/misc/guc.c:8249
+msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+msgstr "SET AUTOCOMMIT TO OFF�も�サ�ート�れ����ん"
+
+#: utils/misc/guc.c:8324
+msgid "assertion checking is not supported by this build"
+msgstr "��インストレーション��アサート検査�組�込�れ����ん"
+
+#: utils/misc/guc.c:8337
+msgid "Bonjour is not supported by this build"
+msgstr "��ビルド�� bonjour �サ�ート�れ����ん"
+
+#: utils/misc/guc.c:8350
+msgid "SSL is not supported by this build"
+msgstr "��インストレーション��SSL�サ�ート�れ����ん"
+
+#: utils/misc/guc.c:8362
+#, 
+msgid "Cannot enable parameter when \"log_statement_stats\" is true."
+msgstr "\"log_statement_stats\"�真�場��パラメータを有効�����ん"
+
+#: utils/misc/guc.c:8374
+#, 
+msgid ""
+"Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
+"\"log_planner_stats\", or \"log_executor_stats\" is true."
+msgstr ""
+"\"log_parser_stats\"�\"log_planner_stats\"�\"log_executor_stats\""
+"���れ��真�場�� \"log_statement_stats\" を有効�����ん"
 
-#: access/transam/xlog.c:5181
+#: guc-file.l:274
 #, c-format
-msgid "recovery_target_timeline is not a valid number: \"%s\""
-msgstr "recovery_target_timeline�無効�番���: \"%s\""
+msgid "parameter \"%s\" removed from configuration file, reset to default"
+msgstr ""
+"パラメーター \"%s\" �設定ファイル�ら削除�れ���。デフォルト値�戻り�"
+"�。"
 
-#: access/transam/xlog.c:5186
+#: guc-file.l:333
 #, c-format
-msgid "recovery_target_timeline = %u"
-msgstr "recovery_target_timeline = %u"
-
-#: access/transam/xlog.c:5189
-msgid "recovery_target_timeline = latest"
-msgstr "recovery_target_timeline = latest"
+msgid "parameter \"%s\" changed to \"%s\""
+msgstr "パラメータ \"%s\" � \"%s\" �変更�れ���"
 
-#: access/transam/xlog.c:5197
+#: guc-file.l:374
 #, c-format
-msgid "recovery_target_xid is not a valid number: \"%s\""
-msgstr "recovery_target_xid�無効�番���: \"%s\""
+msgid ""
+"could not open configuration file \"%s\": maximum nesting depth exceeded"
+msgstr ""
+"設定ファイル\"%s\"をオープン����ん���: 入れ�長�上�を超�����"
 
-#: access/transam/xlog.c:5200
+#: guc-file.l:589
 #, c-format
-msgid "recovery_target_xid = %u"
-msgstr "recovery_target_xid = %u"
+msgid "syntax error in file \"%s\" line %u, near end of line"
+msgstr "ファイル\"%s\"�行%u�行末近辺��構文エラー��り���"
 
-#: access/transam/xlog.c:5223
+#: guc-file.l:594
 #, c-format
-msgid "recovery_target_time = '%s'"
-msgstr "recovery_target_time = '%s'"
-
-#: access/transam/xlog.c:5234
-msgid "parameter \"recovery_target_inclusive\" requires a Boolean value"
-msgstr "パラメータ \"recovery_target_inclusive\" ��ブール値を指定���"
+msgid "syntax error in file \"%s\" line %u, near token \"%s\""
+msgstr "ファイル\"%s\"�行%u�トークン\"%s\"近辺�構文エラー��り���"
 
-#: access/transam/xlog.c:5236
+#: foreign/foreign.c:198
 #, c-format
-msgid "recovery_target_inclusive = %s"
-msgstr "recovery_target_inclusive = %s"
+msgid "user mapping not found for \"%s\""
+msgstr "\"%s\" �対�るユーザ対応表�見��り��ん"
 
-#: access/transam/xlog.c:5243
-msgid "parameter \"standby_mode\" requires a Boolean value"
-msgstr "パラメータ \"standby_mode\" ��ブール値�必���"
+#: foreign/foreign.c:321
+#, c-format
+msgid "foreign-data wrapper \"%s\" has no handler"
+msgstr "外部データラッパー \"%s\" ���ンドラ��り��ん"
 
-#: access/transam/xlog.c:5245
+#: foreign/foreign.c:489
 #, c-format
-msgid "standby_mode = '%s'"
-msgstr "standby_mode = '%s'"
+msgid "invalid option \"%s\""
+msgstr "\"%s\" オプション�無効��"
 
-#: access/transam/xlog.c:5251
+#: foreign/foreign.c:490
 #, c-format
-msgid "primary_conninfo = '%s'"
-msgstr "primary_conninfo = '%s'"
+msgid "Valid options in this context are: %s"
+msgstr "��文脈�有効�オプション：%s"
 
-#: access/transam/xlog.c:5258
-msgid "trigger_file = '%s'"
-msgstr "trigger_file = '%s'"
+#: foreign/foreign.c:515 commands/foreigncmds.c:231 commands/foreigncmds.c:552
+#: commands/foreigncmds.c:703
+#, c-format
+msgid "foreign-data wrapper \"%s\" does not exist"
+msgstr "外部データラッパー \"%s\" �存在���ん"
 
-#: access/transam/xlog.c:5263
+#: foreign/foreign.c:535 commands/foreigncmds.c:274 commands/foreigncmds.c:879
+#: commands/foreigncmds.c:970 commands/foreigncmds.c:1255
 #, c-format
-msgid "unrecognized recovery parameter \"%s\""
-msgstr "リカ�リパラメータ \"%s\"��明��"
+msgid "server \"%s\" does not exist"
+msgstr "サー�ー \"%s\" �存在���ん"
 
-#: access/transam/xlog.c:5271
+#: port/pg_shmem.c:147 port/sysv_shmem.c:147
 #, c-format
-msgid "syntax error in recovery command file: %s"
-msgstr "リカ�リコマンドファイル内�構文エラー: %s"
+msgid "could not create shared memory segment: %m"
+msgstr "共有メモリセグメントを作�����ん: %m"
 
-#: access/transam/xlog.c:5273
-msgid "Lines should have the format parameter = 'value'."
-msgstr "行��parameter = 'value'���書����れ��り��ん。"
+#: port/pg_shmem.c:148 port/sysv_shmem.c:148
+#, c-format
+msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
+msgstr "失敗��システムコール�shmget(key=%lu, size=%lu, 0%o)���。"
 
-#: access/transam/xlog.c:5282
+#: port/pg_shmem.c:152 port/sysv_shmem.c:152
+#, c-format
 msgid ""
-"recovery command file \"%s\" specified neither primary_conninfo nor "
-"restore_command"
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
+"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
+"request size (currently %lu bytes), reduce PostgreSQL's shared memory usage, "
+"perhaps by reducing shared_buffers or max_connections.\n"
+"If the request size is already small, it's possible that it is less than "
+"your kernel's SHMMIN parameter, in which case raising the request size or "
+"reconfiguring SHMMIN is called for.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
 msgstr ""
-"リカ�リコマンドファイル \"%s\" � primary_conninfo � restore_command ���れも指定�れ����ん"
+"通常��エラー��PostgreSQL ��求��共有メモリセグメント�カー�ル�"
+"SHMMAX パラメータを超��場��発生���。���求サイズを減ら���も"
+"������SHMMAX を増や��カー�ルを�構築�る��も����。�求"
+"サイズ（�在 %lu �イト）を減ら���場�� PostgreSQL � shared_buffers "
+"も��� max_connections を減ら������。\n"
+"���求サイズ�������場���れ�カー�ル� SHMMIN より���"
+"��������る�も�れ��ん。��よ��場���求サイズを大���る��"
+" SHMMIN を�れ������値��構�������。\n"
+"共有メモリ�設定�関�る詳細情報��PostgreSQL �ドキュメント�記載�れ�"
+"���。"
 
-#: access/transam/xlog.c:5284
+#: port/pg_shmem.c:165 port/sysv_shmem.c:165
+#, c-format
 msgid ""
-"The database server will regularly poll the pg_xlog subdirectory to check "
-"for files placed there."
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded available memory or swap space, or exceeded your kernel's "
+"SHMALL parameter.  You can either reduce the request size or reconfigure the "
+"kernel with larger SHMALL.  To reduce the request size (currently %lu "
+"bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing "
+"shared_buffers or max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
 msgstr ""
-"データベースサー��通常 pg_xlog サブディレクトリを poll ��（定期的�監視��）�"
-"���ファイル�置�れ�����を調���。"
+"通常��エラー��PostgreSQL ��求�る共有メモリ�サイズ�利用�能�"
+"メモリやスワップ容�を超����も���カー�ル� SHMALL パラメータを"
+"超��場��発生���。対処�����求サイズを減ら������カー�ル�"
+" SHMALL を増や���。�求サイズ（�在 %lu �イト）を減ら����"
+"PostgreSQL � shared_buffers ��� max_connections を減ら����共有"
+"メモリ�サイズを減ら������。\n"
+"共有メモリ�設定�関�る詳細情報��PostgreSQL �ドキュメント�記載�れ�"
+"���。"
 
-#: access/transam/xlog.c:5290
+#: port/pg_shmem.c:176 port/sysv_shmem.c:176
+#, c-format
 msgid ""
-"recovery command file \"%s\" must specify restore_command when standby mode "
-"is not enabled"
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"either if all available shared memory IDs have been taken, in which case you "
+"need to raise the SHMMNI parameter in your kernel, or because the system's "
+"overall limit for shared memory has been reached.  If you cannot increase "
+"the shared memory limit, reduce PostgreSQL's shared memory request "
+"(currently %lu bytes), perhaps by reducing shared_buffers or "
+"max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
 msgstr ""
-"スタン�イモード�有効���場��リカ�リコマンドファイル \"%s\" � restore_command を指定���れ��り��ん"
+"��エラー�起����ら�����別�ディスク�足り���������"
+"�り��ん。��原因�����共有メモリ�識別�を使����場�����"
+"��場��カー�ル� SHMMNI を増や�必���り��。も������能性�"
+"システム全体�共有メモリを使����場���。共有メモリ�制�値を増や���"
+"場���PostgreSQL � shared_buffers ��� max_connections を減ら�����"
+"�求�る共有メモリ�サイズ（�在 %lu �イト）を減ら������。\n"
+"共有メモリ�設定�関�る詳細情報��PostgreSQL �ドキュメント�記載�れ�"
+"���。"
 
-#: access/transam/xlog.c:5310
+#: port/pg_shmem.c:439 port/sysv_shmem.c:439
 #, c-format
-msgid "recovery target timeline %u does not exist"
-msgstr "リカ�リ対象時系列%u�存在���ん"
+msgid "could not stat data directory \"%s\": %m"
+msgstr "データディレクトリ\"%s\"をstat����ん���: %m"
 
-#: access/transam/xlog.c:5435
-msgid "archive recovery complete"
-msgstr "アーカイブリカ�リ�完了����"
+#: port/win32/signal.c:189
+#, c-format
+msgid "could not create signal listener pipe for pid %d: error code %d"
+msgstr ""
+"pid %d�対�るシグナル監視パイプを作�����ん���: エラーコード %d"
 
-#: access/transam/xlog.c:5525
+#: port/win32/signal.c:269 port/win32/signal.c:301
 #, c-format
-msgid "recovery stopping after commit of transaction %u, time %s"
-msgstr "リカ�リ�トランザクション%u�コミット�時刻%s�後��止����"
+msgid "could not create signal listener pipe: error code %d; retrying\n"
+msgstr "シグナル監視パイプを作�����ん���: エラーコード %d: �実行中\n"
 
-#: access/transam/xlog.c:5530
+#: port/win32/signal.c:312
 #, c-format
-msgid "recovery stopping before commit of transaction %u, time %s"
-msgstr "リカ�リ�トランザクション%u�コミット�時刻%s����止����"
+msgid "could not create signal dispatch thread: error code %d\n"
+msgstr ""
+"シグナルディスパッ�用スレッドを作�����ん���: エラーコード %d\n"
 
-#: access/transam/xlog.c:5538
+#: port/win32/security.c:43
 #, c-format
-msgid "recovery stopping after abort of transaction %u, time %s"
-msgstr "リカ�リ�トランザクション%u�アボート�時刻%s�後��止����"
+msgid "could not open process token: error code %d\n"
+msgstr "プロセストークンをオープン����ん���: エラーコード %d\n"
 
-#: access/transam/xlog.c:5543
+#: port/win32/security.c:63
 #, c-format
-msgid "recovery stopping before abort of transaction %u, time %s"
-msgstr "リカ�リ�トランザクション%u�アボート�時刻%s����止����"
+msgid "could not get SID for Administrators group: error code %d\n"
+msgstr "管�者グループ�SIDを入手����ん���: エラーコード %d\n"
 
-#: access/transam/xlog.c:5626
-msgid ""
-"hot standby is not possible because %s = %d is a lower setting than on the "
-"master server (its value was %d)"
-msgstr ""
-"%s = %d �マスターサー��設定値（%d）より������ホットスタン�イ�"
-"利用����ん"
+#: port/win32/security.c:72
+#, c-format
+msgid "could not get SID for PowerUsers group: error code %d\n"
+msgstr "PowerUsersグループ�SIDを入手����ん���: エラーコード %d\n"
 
-#: access/transam/xlog.c:5648
-msgid "WAL was generated with wal_level=minimal, data may be missing"
-msgstr "wal_level=minimal � WAL �生��れ���。データ���場���り��。"
+#: port/win32/crashdump.c:108
+msgid "could not load dbghelp.dll, cannot write crashdump\n"
+msgstr "dbghelp.dll をロード����クラッシュダンプも書�込���ん\n"
 
-#: access/transam/xlog.c:5649
+#: port/win32/crashdump.c:116
+#, 
 msgid ""
-"This happens if you temporarily set wal_level=minimal without taking a new "
-"base backup."
-msgstr ""
-"�れ�起�る���新��ベース�ックアップを行�����一時的� wal_level=minimal ���場���。"
+"could not load required functions in dbghelp.dll, cannot write crashdump\n"
+msgstr "dbghelp.dll ��求�れ�関数をロード����ん���。"
+"クラッシュダンプを書�込���ん\n"
 
-#: access/transam/xlog.c:5660
-msgid ""
-"hot standby is not possible because wal_level was not set to \"hot_standby\" "
-"on the master server"
-msgstr ""
-"マスターサー�� wal_level � \"hot_standby\" ������������"
-"ホットスタン�イを使用����ん"
+#: port/win32/crashdump.c:147
+#, c-format
+msgid "could not open crash dump file %s for writing: error code %u\n"
+msgstr "クラッシュダンプファイル %s を書�込�用�オープン����ん���："
+"エラーコード %u\n"
 
-#: access/transam/xlog.c:5661
-msgid ""
-"Either set wal_level to \"hot_standby\" on the master, or turn off "
-"hot_standby here."
-msgstr ""
-"マスター� wal_level を \"hot_standby\" ��る��������ホットスタン�イを無効�������。"
+#: port/win32/crashdump.c:154
+#, c-format
+msgid "wrote crash dump to %s\n"
+msgstr "クラッシュダンプを %s �書�込����\n"
 
-#: access/transam/xlog.c:5708
-msgid "control file contains invalid data"
-msgstr "制御ファイル内�無効�データ��り��"
+#: port/win32/crashdump.c:156
+#, c-format
+msgid "could not write crash dump to %s: error code %08x\n"
+msgstr "クラッシュダンプを %s �書�込���ん���：エラーコード %08x\n"
 
-#: access/transam/xlog.c:5712
+#: port/win32_sema.c:94
 #, c-format
-msgid "database system was shut down at %s"
-msgstr "データベースシステム� %s �シャットダウン����"
+msgid "could not create semaphore: error code %d"
+msgstr "セマフォを作�����ん���: エラーコード %d"
 
-#: access/transam/xlog.c:5716
-msgid "database system was shut down in recovery at %s"
-msgstr "データベースシステム�リカ�リ中� %s �シャットダウン����"
+#: port/win32_sema.c:161
+#, c-format
+msgid "could not lock semaphore: error code %d"
+msgstr "セマフォをロック����ん���: エラーコード %d"
 
-#: access/transam/xlog.c:5720
+#: port/win32_sema.c:174
 #, c-format
-msgid "database system shutdown was interrupted; last known up at %s"
-msgstr ""
-"データベースシステム�シャットダウン�中断�れ���:今回� %s ���到���"
-"��"
+msgid "could not unlock semaphore: error code %d"
+msgstr "セマフォ�ロックを解除����ん���: エラーコード %d"
+
+#: port/win32_sema.c:203
+#, c-format
+msgid "could not try-lock semaphore: error code %d"
+msgstr "セマフォ�ロックを試�る�������ん���: エラーコード %d"
 
-#: access/transam/xlog.c:5724
+#: port/sysv_sema.c:114 port/pg_sema.c:114
 #, c-format
-msgid "database system was interrupted while in recovery at %s"
-msgstr "データベースシステム�リカ�リ中� %s �中断�れ���"
+msgid "could not create semaphores: %m"
+msgstr "セマフォを作�����ん���: %m"
+
+#: port/sysv_sema.c:115 port/pg_sema.c:115
+#, c-format
+msgid "Failed system call was semget(%lu, %d, 0%o)."
+msgstr "失敗��システムコール�semget(%lu, %d, 0%o)��。"
 
-#: access/transam/xlog.c:5726
+#: port/sysv_sema.c:119 port/pg_sema.c:119
+#, 
 msgid ""
-"This probably means that some data is corrupted and you will have to use the "
-"last backup for recovery."
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"when either the system limit for the maximum number of semaphore sets "
+"(SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be "
+"exceeded.  You need to raise the respective kernel parameter.  "
+"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
+"max_connections parameter.\n"
+"The PostgreSQL documentation contains more information about configuring "
+"your system for PostgreSQL."
 msgstr ""
-"�れ���ら�データ破���能性��り�リカ�リ����直���ックアップを"
-"使用���れ��ら����を�味���。"
+"��エラー�起����ら�����別�ディスク�足り���������"
+"�り��ん。��原因�セマフォセット�最大数(SEMMNI)���������"
+"システム全体�セマフォ数(SEMMNS)を使����場���。対処�����"
+"対応�るカー�ル�パラメータを増や�必���り��。も��� PostgreSQL"
+"� max_connections を減ら�����消費�るセマフォ�数を減ら������。\n"
+"共有メモリ�設定�関�る詳細情報��PostgreSQL �ドキュメント�記載�れ�"
+"���。"
 
-#: access/transam/xlog.c:5730
+#: port/sysv_sema.c:146 port/pg_sema.c:146
 #, c-format
-msgid "database system was interrupted while in recovery at log time %s"
-msgstr "データベースシステム�ログ時間%s�リカ�リ中�中断�れ���"
-
-#: access/transam/xlog.c:5732
 msgid ""
-"If this has occurred more than once some data might be corrupted and you "
-"might need to choose an earlier recovery target."
+"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
+"Look into the PostgreSQL documentation for details."
 msgstr ""
-"�れ�何回も発生�る場��データ�破����る�能性��り��。�れ以��状"
-"態��リカ�リー�戻��やら��������も�れ��ん。"
+"��ら�カー�ル�SEMVMX値を最低�も%d��増や�必���り��。\n"
+"詳細�PostgreSQL�ドキュメントを調������。"
 
-#: access/transam/xlog.c:5736
+#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
 #, c-format
-msgid "database system was interrupted; last known up at %s"
-msgstr "データベースシステム�中断�れ���: 今回� %s ���到������"
+msgid "could not create shared memory segment: %lu"
+msgstr "共有メモリセグメントを作�����ん: %lu"
 
-#: access/transam/xlog.c:5785
+#: port/win32_shmem.c:169
 #, c-format
-msgid "requested timeline %u is not a child of database system timeline %u"
-msgstr "�求�れ�時系列%u�データベースシステム�時系列%u�系列���り��ん"
+msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
+msgstr "失敗��システムコール�CreateFileMapping(size=%lu, name=%s)���。"
 
-#: access/transam/xlog.c:5803
-msgid "entering standby mode"
-msgstr "スタン�イモード�入り��"
+#: port/win32_shmem.c:193
+msgid "pre-existing shared memory block is still in use"
+msgstr "既存�共有メモリブロック���使用中��"
 
-#: access/transam/xlog.c:5806
-msgid "starting point-in-time recovery to XID %u"
-msgstr "XID %u �対���イントインタイムリカ�リを開始�����"
+#: port/win32_shmem.c:194
+msgid ""
+"Check if there are any old server processes still running, and terminate "
+"them."
+msgstr "��サー�プロセス�実行中����検査���れを終了�������"
 
-#: access/transam/xlog.c:5810
-msgid "starting point-in-time recovery to %s"
-msgstr "%s �対���イントインタイムリカ�リを開始�����"
+#: port/win32_shmem.c:204
+msgid "Failed system call was DuplicateHandle."
+msgstr "失敗��システムコール�MapViewOfFileEx���。"
 
-#: access/transam/xlog.c:5814
-msgid "starting archive recovery"
-msgstr "アーカイブリカ�リを開始�����"
+#: port/win32_shmem.c:225
+msgid "Failed system call was MapViewOfFileEx."
+msgstr "失敗��システムコール�MapViewOfFileEx���。"
+
+#: commands/vacuum.c:419
+msgid "oldest xmin is far in the past"
+msgstr "最も��xmin������"
+
+#: commands/vacuum.c:420
+msgid "Close open transactions soon to avoid wraparound problems."
+msgstr ""
+"周回�題を回��る�����オープン���るトランザクションをクローズ���"
+"���。"
+
+#: commands/vacuum.c:809
+msgid "some databases have not been vacuumed in over 2 billion transactions"
+msgstr ""
+"データベース�一部�20億トランザクション以上�間��キューム�れ����ん�"
+"��"
+
+#: commands/vacuum.c:810
+msgid "You might have already suffered transaction-wraparound data loss."
+msgstr "トランザクション�周回�よるデータ�失�発生���る�能性��り��"
 
-#: access/transam/xlog.c:5827 access/transam/xlog.c:5852
+#: commands/vacuum.c:917
 #, c-format
-msgid "checkpoint record is at %X/%X"
-msgstr "%X/%X���る�ェック�イントレコード��"
+msgid "skipping vacuum of \"%s\" --- lock not available"
+msgstr "\"%s\" ��キュームをスキップ����� -- ロックを利用����ん"
 
-#: access/transam/xlog.c:5834
-msgid "could not locate required checkpoint record"
-msgstr "�求�ェック�イント�置�移動����ん���"
+#: commands/vacuum.c:943
+#, c-format
+msgid "skipping \"%s\" --- only superuser can vacuum it"
+msgstr "\"%s\" をスキップ����� --- スーパーユーザ����キューム����"
 
-#: access/transam/xlog.c:5835
+#: commands/vacuum.c:947
 #, c-format
-msgid ""
-"If you are not restoring from a backup, try removing the file \"%s/"
-"backup_label\"."
+msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
 msgstr ""
-"�ックアップ�順�を変更�����場���ファイル \"%s/backup_label\" を削除"
-"������"
+"\"%s\" をスキップ����� --- スーパーユーザも���データベース�所有者�"
+"���キューム����"
 
-#: access/transam/xlog.c:5862 access/transam/xlog.c:5877
-msgid "could not locate a valid checkpoint record"
-msgstr "有効��ェック�イント�移動����ん���"
+#: commands/vacuum.c:951
+#, c-format
+msgid "skipping \"%s\" --- only table or database owner can vacuum it"
+msgstr ""
+"\"%s\"を飛������ --- テーブル���データベース�所有者����キューム"
+"�る�������"
 
-#: access/transam/xlog.c:5871
+#: commands/vacuum.c:968
 #, c-format
-msgid "using previous checkpoint record at %X/%X"
-msgstr "%X/%X���る�ェック�イントレコード��を使用�����"
+msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
+msgstr "\"%s\"をスキップ����� --- テーブル����も�や�"
+"特別�システムテーブル��キューム����ん"
 
-#: access/transam/xlog.c:5886
+#: commands/opclasscmds.c:136 commands/opclasscmds.c:1619
+#: commands/opclasscmds.c:1839 commands/opclasscmds.c:1850
+#: commands/opclasscmds.c:2084 commands/opclasscmds.c:2095
 #, c-format
-msgid "redo record is at %X/%X; shutdown %s"
-msgstr "REDOレコード�%X/%X シャットダウン %s"
+msgid "operator family \"%s\" does not exist for access method \"%s\""
+msgstr "アクセスメソッド\"%2$s\"用�演算��\"%1$s\"�存在���ん"
 
-#: access/transam/xlog.c:5890
+#: commands/opclasscmds.c:212 commands/opclasscmds.c:1568
+#: commands/indexcmds.c:1134 commands/indexcmds.c:1142
 #, c-format
-msgid "next transaction ID: %u/%u; next OID: %u"
-msgstr "次�トランザクションID: %u/%u 次�OID: %u"
+msgid "operator class \"%s\" does not exist for access method \"%s\""
+msgstr "アクセスメソッド\"%2$s\"用�演算�クラス\"%1$s\"�存在���ん"
 
-#: access/transam/xlog.c:5894
+#: commands/opclasscmds.c:271
 #, c-format
-msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-msgstr "次�MultiXactId: %u 次�MultiXactOffset: %u"
+msgid "operator family \"%s\" for access method \"%s\" already exists"
+msgstr "アクセスメソッド\"%2$s\"�演算��\"%1$s\"����存在���"
 
-#: access/transam/xlog.c:5897
+#: commands/opclasscmds.c:369 commands/opclasscmds.c:790
+#: commands/opclasscmds.c:2203 commands/indexcmds.c:304
 #, c-format
-msgid "oldest unfrozen transaction ID: %u, in database %u"
-msgstr "データベース %2$u 内�最��未��トランザクション ID: %1$u"
+msgid "access method \"%s\" does not exist"
+msgstr "アクセスメソッド\"%s\"�存在���ん"
 
-#: access/transam/xlog.c:5901
-msgid "invalid next transaction ID"
-msgstr "次�トランザクションID�無効��"
+#: commands/opclasscmds.c:408
+msgid "must be superuser to create an operator class"
+msgstr "演算�クラスを作��る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/xlog.c:5920
-msgid "invalid redo in checkpoint record"
-msgstr "�ェック�イントレコード内�REDO�無効��"
+#: commands/opclasscmds.c:480 commands/opclasscmds.c:864
+#: commands/opclasscmds.c:994
+#, c-format
+msgid "invalid operator number %d, must be between 1 and %d"
+msgstr "演算�番�%d�無効��。1�ら%d�����れ��り��ん"
 
-#: access/transam/xlog.c:5931
-msgid "invalid redo record in shutdown checkpoint"
-msgstr "シャットダウン・�ェック�イント���るREDOレコード�無効��"
+#: commands/opclasscmds.c:531 commands/opclasscmds.c:915
+#: commands/opclasscmds.c:1009
+#, c-format
+msgid "invalid procedure number %d, must be between 1 and %d"
+msgstr "プロシージャ番�%d�無効��。1�ら%d�����れ��り��ん"
 
-#: access/transam/xlog.c:5961
-msgid ""
-"database system was not properly shut down; automatic recovery in progress"
-msgstr ""
-"データベースシステム��切�シャットダウン�れ��ん���。自動リカ�リを"
-"行�����"
+#: commands/opclasscmds.c:561
+msgid "storage type specified more than once"
+msgstr "格�型�複数指定�れ���"
 
-#: access/transam/xlog.c:6026
-msgid "initializing for hot standby"
-msgstr "ホットスタン�イ�����期化を行�����"
+#: commands/opclasscmds.c:589
+#, c-format
+msgid ""
+"storage type cannot be different from data type for access method \"%s\""
+msgstr "アクセスメソッド\"%s\"用�データ型�異�る格�型を使用����ん"
 
-#: access/transam/xlog.c:6153
+#: commands/opclasscmds.c:605
 #, c-format
-msgid "redo starts at %X/%X"
-msgstr "%X/%X�REDOを開始���"
+msgid "operator class \"%s\" for access method \"%s\" already exists"
+msgstr "アクセスメソッド\"%2$s\"�演算�クラス\"%1$s\"����存在���"
 
-#: access/transam/xlog.c:6252
+#: commands/opclasscmds.c:633
 #, c-format
-msgid "redo done at %X/%X"
-msgstr "%X/%X�REDO�終�り���"
+msgid "could not make operator class \"%s\" be default for type %s"
+msgstr "演算�クラス\"%s\"を型%s�デフォルト��る�������ん���"
 
-#: access/transam/xlog.c:6257 access/transam/xlog.c:7722
+#: commands/opclasscmds.c:636
 #, c-format
-msgid "last completed transaction was at log time %s"
-msgstr "最後�完了��トランザクション�ログ時刻%s���"
+msgid "Operator class \"%s\" already is the default."
+msgstr "演算�クラス\"%s\"����デフォルト��。"
 
-#: access/transam/xlog.c:6265
-msgid "redo is not required"
-msgstr "REDO�必��り��ん"
+#: commands/opclasscmds.c:760
+msgid "must be superuser to create an operator family"
+msgstr "演算��を作��る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/xlog.c:6305
-msgid "requested recovery stop point is before consistent recovery point"
-msgstr ""
-"�求�れ�リカ�リ�止�イント��対応�るリカ�リ�イントより���り��"
+#: commands/opclasscmds.c:816
+msgid "must be superuser to alter an operator family"
+msgstr "演算��を変更�る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/xlog.c:6308
-msgid "WAL ends before consistent recovery point"
-msgstr "WAL �対応�るリカ�リ�イントより��終了���"
+#: commands/opclasscmds.c:880
+msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
+msgstr "演算��引数型�ALTER OPERATOR FAMILY�指定���れ��り��ん"
 
-#: access/transam/xlog.c:6329
-#, c-format
-msgid "selected new timeline ID: %u"
-msgstr "�択�れ�新��タイムラインID: %u"
+#: commands/opclasscmds.c:944
+msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
+msgstr "ALTER OPERATOR FAMILY��STORAGEを指定����ん"
 
-#: access/transam/xlog.c:6565
-#, c-format
-msgid "consistent recovery state reached at %X/%X"
-msgstr "%X/%X �リカ�リー状態�整���れ���"
+#: commands/opclasscmds.c:1060
+msgid "one or two argument types must be specified"
+msgstr "1���2��引数型�指定�れ��れ��り��ん"
 
-#: access/transam/xlog.c:6691
-msgid "invalid primary checkpoint link in control file"
-msgstr "制御ファイル内�プライマリ�ェック�イントリンク�無効��"
+#: commands/opclasscmds.c:1086
+msgid "index operators must be binary"
+msgstr "インデックス演算��二項演算����れ��り��ん"
 
-#: access/transam/xlog.c:6695
-msgid "invalid secondary checkpoint link in control file"
-msgstr "制御ファイル内�セカンダリ�ェック�イントリンク�無効��"
+#: commands/opclasscmds.c:1111
+#, c-format
+msgid "access method \"%s\" does not support ordering operators"
+msgstr "アクセスメソッド \"%s\" �並�替�演算�をサ�ート�����ん"
 
-#: access/transam/xlog.c:6699
-msgid "invalid checkpoint link in backup_label file"
-msgstr "backup_labelファイル内��ェック�イントリンク�無効��"
+#: commands/opclasscmds.c:1124
+#, 
+msgid "index search operators must return boolean"
+msgstr "インデックス検索演算��ブール型を返���れ��り��ん"
 
-#: access/transam/xlog.c:6713
-msgid "invalid primary checkpoint record"
-msgstr "プライマリ�ェック�イントレコード�無効��"
+#: commands/opclasscmds.c:1163
+msgid "btree procedures must have two arguments"
+msgstr "btreeプロシージャ�2��引数を�ら��れ��り��ん"
 
-#: access/transam/xlog.c:6717
-msgid "invalid secondary checkpoint record"
-msgstr "セカンダリ�ェック�イントレコード�無効��"
+#: commands/opclasscmds.c:1167
+msgid "btree procedures must return integer"
+msgstr "btreeプロシージャ�整数を返���れ��り��ん"
 
-#: access/transam/xlog.c:6721
-msgid "invalid checkpoint record"
-msgstr "�ェック�イントレコード�無効��"
+#: commands/opclasscmds.c:1182
+msgid "hash procedures must have one argument"
+msgstr "�ッシュプロシージャ�1��引数を�ら��れ��り��ん"
 
-#: access/transam/xlog.c:6732
-msgid "invalid resource manager ID in primary checkpoint record"
-msgstr "プライマリ�ェック�イントレコード内�リソースマ�ージャID�無効��"
+#: commands/opclasscmds.c:1186
+msgid "hash procedures must return integer"
+msgstr "�ッシュプロシージャ�整数を返���れ��り��ん"
 
-#: access/transam/xlog.c:6736
-msgid "invalid resource manager ID in secondary checkpoint record"
-msgstr "セカンダリ�ェック�イントレコード内�リソースマ�ージャID�無効��"
+#: commands/opclasscmds.c:1211
+msgid "associated data types must be specified for index support procedure"
+msgstr ""
+"関連�るデータ型�インデックスサ�ートプロシージャ�指定�れ��れ��り��"
+"ã‚“"
 
-#: access/transam/xlog.c:6740
-msgid "invalid resource manager ID in checkpoint record"
-msgstr "�ェック�イントレコード内�リソースマ�ージャID�無効��"
+#: commands/opclasscmds.c:1237
+#, c-format
+msgid "procedure number %d for (%s,%s) appears more than once"
+msgstr "(%2$s,%3$s)用�プロシージャ番�%1$d�複数�り��"
 
-#: access/transam/xlog.c:6752
-msgid "invalid xl_info in primary checkpoint record"
-msgstr "プライマリ�ェック�イントレコード内�xl_info�無効��"
+#: commands/opclasscmds.c:1244
+#, c-format
+msgid "operator number %d for (%s,%s) appears more than once"
+msgstr "(%2$s,%3$s)用�演算�番�%1$d�複数�り��"
 
-#: access/transam/xlog.c:6756
-msgid "invalid xl_info in secondary checkpoint record"
-msgstr "セカンダリ�ェック�イントレコード内�xl_info�無効��"
+#: commands/opclasscmds.c:1293
+#, c-format
+msgid "operator %d(%s,%s) already exists in operator family \"%s\""
+msgstr "演算�%d(%s,%s)����演算��\"%s\"�存在���"
 
-#: access/transam/xlog.c:6760
-msgid "invalid xl_info in checkpoint record"
-msgstr "�ェック�イントレコード内�xl_info�無効��"
+#: commands/opclasscmds.c:1406
+#, c-format
+msgid "function %d(%s,%s) already exists in operator family \"%s\""
+msgstr "関数%d(%s,%s)����演算��\"%s\"内�存在���"
 
-#: access/transam/xlog.c:6772
-msgid "invalid length of primary checkpoint record"
-msgstr "プライマリ�ェック�イントレコード�サイズ�無効��"
+#: commands/opclasscmds.c:1493
+#, c-format
+msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
+msgstr "演算�%d(%s,%s)�演算��\"%s\"内��り��ん"
 
-#: access/transam/xlog.c:6776
-msgid "invalid length of secondary checkpoint record"
-msgstr "セカンダリ�ェック�イントレコード�サイズ�無効��"
+#: commands/opclasscmds.c:1533
+#, c-format
+msgid "function %d(%s,%s) does not exist in operator family \"%s\""
+msgstr "関数%d(%s,%s)�演算��\"%s\"内�存在���ん"
 
-#: access/transam/xlog.c:6780
-msgid "invalid length of checkpoint record"
-msgstr "�ェック�イントレコード�サイズ�無効��"
+#: commands/opclasscmds.c:1779
+#, c-format
+msgid ""
+"operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
+msgstr ""
+"アクセスメソッド\"%2$s\"用�演算�クラス\"%1$s\"�スキーマ\"%3$s\"内����"
+"存在���"
 
-#: access/transam/xlog.c:6942
-msgid "shutting down"
-msgstr "シャットダウン�����"
+#: commands/opclasscmds.c:1868
+#, c-format
+msgid ""
+"operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
+msgstr ""
+"アクセスメソッド\"%2$s\"用�演算��\"%1$s\"�スキーマ\"%3$s\"内����存在"
+"���"
 
-#: access/transam/xlog.c:6964
-msgid "database system is shut down"
-msgstr "データベースシステム�シャットダウン����"
+#: commands/seclabel.c:58
+msgid "no security label providers have been loaded"
+msgstr "セキュリティラベル�プロ�イダ�ロード�れ��ん���"
 
-#: access/transam/xlog.c:7357
+#: commands/seclabel.c:62
 msgid ""
-"concurrent transaction log activity while database system is shutting down"
-msgstr ""
-"データベースシャットダウン中���時�実行中�トランザクションログ処���り"
-"���"
+"must specify provider when multiple security label providers have been loaded"
+msgstr "複数�セキュリティラベルプロ�イダ�ロード�れ�時��"
+"プロ�イダを指定���れ��り��ん"
 
-#: access/transam/xlog.c:7589
-msgid "skipping restartpoint, recovery has already ended"
-msgstr "�開�イントをスキップ���。リカ�リ����終������。"
+#: commands/seclabel.c:80
+#, c-format
+msgid "security label provider \"%s\" is not loaded"
+msgstr "セキュリティラベルプロ�イダ\"%s\" �ロード�れ����ん"
 
-#: access/transam/xlog.c:7614
+#: commands/seclabel.c:113 commands/comment.c:97
 #, c-format
-msgid "skipping restartpoint, already performed at %X/%X"
-msgstr "%X/%X ����実行済���開�イントをスキップ�����"
+msgid "\"%s\" is not a table, view, composite type, or foreign table"
+msgstr "\"%s\" �テーブル�ビュー�複�型�外部テーブル���れ�も�り��ん"
 
-#: access/transam/xlog.c:7720
-msgid "recovery restart point at %X/%X"
-msgstr "�イント %X/%X �リカ�リを�開���"
+#: commands/collationcmds.c:81
+#, c-format
+msgid "collation attribute \"%s\" not recognized"
+msgstr "照�順��属性 \"%s\" ��識����ん"
 
-#: access/transam/xlog.c:7890
-msgid "online backup was cancelled, recovery cannot continue"
-msgstr "オンライン�ックアップ�キャンセル�れ�リカ�リを継続����ん"
+#: commands/collationcmds.c:126
+#, 
+msgid "parameter \"lc_collate\" parameter must be specified"
+msgstr "\"lc_collate\" パラメータを指定���れ��り��ん"
+
+#: commands/collationcmds.c:131
+#, 
+msgid "parameter \"lc_ctype\" must be specified"
+msgstr "\"lc_ctype\" パラメータを指定���れ��り��ん"
 
-#: access/transam/xlog.c:7942
+#: commands/collationcmds.c:177
 #, c-format
-msgid "unexpected timeline ID %u (after %u) in checkpoint record"
-msgstr ""
-"�ェック�イントレコード����想定外�時系列ID %u(%u�後)��り���"
+msgid "collation \"%s\" does not exist, skipping"
+msgstr "照�順� \"%s\" �存在���ん。スキップ���"
 
-#: access/transam/xlog.c:7978
+#: commands/collationcmds.c:237 commands/collationcmds.c:416
 #, c-format
-msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
-msgstr ""
-"�ェック�イントレコード����想定外�時系列ID %u(%u���)��り���"
+msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
+msgstr "エンコーディング \"%2$s\" ����照�順� \"%1$s\" �"
+"���スキーマ \"%3$s\" 内�存在���"
 
-#: access/transam/xlog.c:8234 access/transam/xlog.c:8260
+#: commands/collationcmds.c:249 commands/collationcmds.c:428
 #, c-format
-msgid "could not fsync log file %u, segment %u: %m"
-msgstr "ログファイル%u�セグメント%uをfsync����ん���: %m"
+msgid "collation \"%s\" already exists in schema \"%s\""
+msgstr "照�順� \"%s\" ����スキーマ \"%s\" 内�存在���"
 
-#: access/transam/xlog.c:8268
+#: commands/explain.c:153
 #, c-format
-msgid "could not fsync write-through log file %u, segment %u: %m"
-msgstr "write-throughログファイル%u�セグメント%uをfsync����ん���: %m"
+msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+msgstr "EXPLAIN オプション \"%s\" ��識����値��: \"%s\""
 
-#: access/transam/xlog.c:8277
+#: commands/explain.c:159
 #, c-format
-msgid "could not fdatasync log file %u, segment %u: %m"
-msgstr "ログファイル%u�セグメント%uをfdatasync����ん���: %m"
+msgid "unrecognized EXPLAIN option \"%s\""
+msgstr "EXPLAIN オプション \"%s\" ��識����ん"
 
-#: access/transam/xlog.c:8320 access/transam/xlog.c:8512
-msgid "must be superuser to run a backup"
-msgstr "�ックアップ�スーパーユーザ�実行���れ��り��ん"
+#: commands/explain.c:166
+msgid "EXPLAIN option BUFFERS requires ANALYZE"
+msgstr "EXPLAIN オプション� BUFFERS �� ANALYZE 指定�必���"
 
-#: access/transam/xlog.c:8325 access/transam/xlog.c:8517
-#: access/transam/xlog.c:8720 access/transam/xlog.c:8748
-#: access/transam/xlog.c:8781 access/transam/xlog.c:8873
-#: access/transam/xlog.c:8948
-msgid "recovery is in progress"
-msgstr "リカ�リー����実行中��"
+#: commands/alter.c:423
+#, c-format
+msgid "must be superuser to SET SCHEMA of %s"
+msgstr "%s � SET SCHEMA を�る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/xlog.c:8326 access/transam/xlog.c:8518
-#: access/transam/xlog.c:8721 access/transam/xlog.c:8749
-#: access/transam/xlog.c:8782
-msgid "WAL control functions cannot be executed during recovery."
-msgstr "リカ�リー中� WAL 制御関数を実行����ん"
+#: commands/alter.c:451
+#, c-format
+msgid "%s already exists in schema \"%s\""
+msgstr "%s ����スキーマ \"%s\" 内�存在���"
 
-#: access/transam/xlog.c:8331 access/transam/xlog.c:8523
-msgid "WAL level not sufficient for making an online backup"
-msgstr "オンライン�ックアップを行��� WAL レベル��足�����"
+#: commands/aggregatecmds.c:103
+#, c-format
+msgid "aggregate attribute \"%s\" not recognized"
+msgstr "集約�属性\"%s�存在���ん"
 
-#: access/transam/xlog.c:8332 access/transam/xlog.c:8524
-msgid ""
-"wal_level must be set to \"archive\" or \"hot_standby\" at server start."
-msgstr ""
-"サー��開始時� wal_level を \"archive\" ��� \"hot_standby\" �セット������"
+#: commands/aggregatecmds.c:113
+msgid "aggregate stype must be specified"
+msgstr "集約�stypeを指定���れ��り��ん"
 
-#: access/transam/xlog.c:8359 access/transam/xlog.c:8428
-msgid "a backup is already in progress"
-msgstr "����ックアップ�進行中��"
+#: commands/aggregatecmds.c:117
+msgid "aggregate sfunc must be specified"
+msgstr "集約用�状態�移関数を指定���れ��り��ん"
 
-#: access/transam/xlog.c:8360
-msgid "Run pg_stop_backup() and try again."
-msgstr "pg_stop_backup()を実行���試行������"
+#: commands/aggregatecmds.c:134
+msgid "aggregate input type must be specified"
+msgstr "集約�入力型を指定���れ��り��ん"
+
+#: commands/aggregatecmds.c:159
+msgid "basetype is redundant with aggregate input type specification"
+msgstr "集約�入力型指定�基本型�冗長��"
 
-#: access/transam/xlog.c:8429
+#: commands/aggregatecmds.c:191
 #, c-format
-msgid ""
-"If you're sure there is no backup in progress, remove file \"%s\" and try "
-"again."
-msgstr ""
-"�ックアップを行��������確実��れ��ファイル\"%s\"を削除���実行"
-"������"
+msgid "aggregate transition data type cannot be %s"
+msgstr "集約��移データ�型を%s�����ん"
 
-#: access/transam/xlog.c:8450 access/transam/xlog.c:8607
+#: commands/aggregatecmds.c:230
 #, c-format
-msgid "could not write file \"%s\": %m"
-msgstr "ファイル\"%s\"を書�出���ん���: %m"
+msgid "aggregate %s(%s) does not exist, skipping"
+msgstr "集約%s(%s)�存在���ん。�略���"
 
-#: access/transam/xlog.c:8546
-msgid "a backup is not in progress"
-msgstr "�ックアップ�実行中���り��ん"
+#: commands/aggregatecmds.c:292 commands/functioncmds.c:1122
+#, c-format
+msgid "function %s already exists in schema \"%s\""
+msgstr "関数%s����スキーマ\"%s\"内�存在���"
 
-#: access/transam/xlog.c:8558 access/transam/xlog.c:9014
-#: access/transam/xlog.c:9020
+#: commands/vacuumlazy.c:230
 #, c-format
-msgid "invalid data in file \"%s\""
-msgstr "ファイル\"%s\"内�データ�無効��"
-
-#: access/transam/xlog.c:8670
 msgid ""
-"pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
+"automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
+"pages: %d removed, %d remain\n"
+"tuples: %.0f removed, %.0f remain\n"
+"system usage: %s"
 msgstr ""
-"pg_stop_backup �クリーンアップ�終了���求�れ� WAL セグメント�アーカイブ�れる�を待�����"
+"テーブル\"%s.%s.%s\"�自動�キューム: インデックススキャン: %d\n"
+"ページ: %dを削除�%d�残存\n"
+"タプル: %.0fを削除�%.0f�残存\n"
+"システム使用状�: %s"
 
-#: access/transam/xlog.c:8680
-msgid ""
-"pg_stop_backup still waiting for all required WAL segments to be archived (%"
-"d seconds elapsed)"
-msgstr ""
-"pg_stop_backup �未���求�れ����� WAL セグメント�アーカイブ�れる�を待�����（%d 秒経�）"
+#: commands/vacuumlazy.c:315 commands/cluster.c:890
+#, c-format
+msgid "vacuuming \"%s.%s\""
+msgstr "\"%s.%s\"を�キューム�����"
 
-#: access/transam/xlog.c:8682
-msgid ""
-"Check that your archive_command is executing properly.  pg_stop_backup can "
-"be cancelled safely, but the database backup will not be usable without all "
-"the WAL segments."
-msgstr ""
-"archive_command ��切�実行�れ���を確�������。"
-"pg_stop_backup �安全��り消�������������� WAL セグメント����"
-"データベース��ックアップ�使用����ん。"
+#: commands/vacuumlazy.c:484
+#, c-format
+msgid "relation \"%s\" page %u is uninitialized --- fixing"
+msgstr "リレーション\"%s\" ページ%u��期化�れ����ん --- 修正�����"
 
-#: access/transam/xlog.c:8689
-msgid "pg_stop_backup complete, all required WAL segments have been archived"
-msgstr ""
-"pg_stop_backup �完了���求�れ����� WAL セグメント�アーカイブ�れ���"
+#: commands/vacuumlazy.c:841
+#, c-format
+msgid "\"%s\": removed %.0f row versions in %u pages"
+msgstr "\"%s\": %.0f行�ージョンを%uページ�ら削除����"
 
-#: access/transam/xlog.c:8693
+#: commands/vacuumlazy.c:846
+#, c-format
 msgid ""
-"WAL archiving is not enabled; you must ensure that all required WAL segments "
-"are copied through other means to complete the backup"
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
+"pages"
 msgstr ""
-"WAL アーカイブ�有効�������ん。�求�れ����� WAL セグメント�"
-"別�方法�コピー�れ��ックアップ�完了��る��を確�������。"
+"\"%1$s\": 全 %5$u ページ中� %4$u ページ�見����行�ージョン：移動�能 %2"
+"$.0f 行�削除�� %3$.0f 行"
 
-#: access/transam/xlog.c:8715
-msgid "must be superuser to switch transaction log files"
+#: commands/vacuumlazy.c:850
+#, c-format
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"There were %.0f unused item pointers.\n"
+"%u pages are entirely empty.\n"
+"%s."
 msgstr ""
-"トランザクションログファイルを切り替�られる��スーパーユーザ����"
-
-#: access/transam/xlog.c:8874
-msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
-msgstr "リカ�リ中� pg_xlogfile_name_offset() を実行����ん"
+"%.0f ����行�ージョン���削除����ん。\n"
+"未使用アイテム���インタ� %.0f 個�り���。\n"
+"%u ページ�完全�空��。\n"
+"%s"
 
-#: access/transam/xlog.c:8884 access/transam/xlog.c:8956
+#: commands/vacuumlazy.c:908
 #, c-format
-msgid "could not parse transaction log location \"%s\""
-msgstr "トランザクションログ�置\"%s\"を解�����ん���"
-
-#: access/transam/xlog.c:8949
-msgid "pg_xlogfile_name() cannot be executed during recovery."
-msgstr "リカ�リ中� pg_xlogfile_name() を実行����ん"
+msgid "\"%s\": removed %d row versions in %d pages"
+msgstr "\"%s\": %d行�ージョンを%dページ�ら削除����"
 
-#: access/transam/xlog.c:9046
+#: commands/vacuumlazy.c:911 commands/vacuumlazy.c:1003
+#: commands/vacuumlazy.c:1136
 #, c-format
-msgid "xlog redo %s"
-msgstr "xlog �実行 %s"
-
-#: access/transam/xlog.c:9086
-msgid "online backup mode cancelled"
-msgstr "オンライン�ックアップモード�キャンセル�れ���"
+msgid "%s."
+msgstr "%s。"
 
-#: access/transam/xlog.c:9087
+#: commands/vacuumlazy.c:1000
 #, c-format
-msgid "\"%s\" was renamed to \"%s\"."
-msgstr "\"%s\" � \"%s\" �リ�ーム�れ���"
-
-#: access/transam/xlog.c:9094
-msgid "online backup mode was not cancelled"
-msgstr "オンライン�ックアップモード�キャンセル�れ����ん"
+msgid "scanned index \"%s\" to remove %d row versions"
+msgstr "%2$d行�ージョンを削除�る��インデックス\"%1$s\"をスキャン����"
 
-#: access/transam/xlog.c:9095
+#: commands/vacuumlazy.c:1041
 #, c-format
-msgid "Could not rename \"%s\" to \"%s\": %m."
-msgstr "\"%s\" �����を \"%s\" �変更����ん���: %m"
+msgid "index \"%s\" now contains %.0f row versions in %u pages"
+msgstr "�在インデックス\"%s\"�%.0f行�ージョンを%uページ��ん����"
 
-#: access/transam/xlog.c:9563 access/transam/xlog.c:9585
+#: commands/vacuumlazy.c:1045
 #, c-format
-msgid "could not read from log file %u, segment %u, offset %u: %m"
-msgstr "ログファイル%u�セグメント%u�オフセット%uを読��れ��ん���: %m"
-
-#: access/transam/xlog.c:9673
-msgid "trigger file found: %s"
-msgstr "トリガファイル�見��り���：%s"
+msgid ""
+"%.0f index row versions were removed.\n"
+"%u index pages have been deleted, %u are currently reusable.\n"
+"%s."
+msgstr ""
+"%.0fインデックス行�ージョン�削除�れ���\n"
+"%uインデックスページ�削除�れ�%u��在�利用�能��\n"
+"%s"
 
-#: access/transam/slru.c:595
+#: commands/vacuumlazy.c:1133
 #, c-format
-msgid "file \"%s\" doesn't exist, reading as zeroes"
-msgstr "ファイル\"%s\"�存在���ん。ゼロ���読�込���"
+msgid "\"%s\": truncated %u to %u pages"
+msgstr "\"%s\": %u削除�れ�%uページ��り���"
 
-#: access/transam/slru.c:825 access/transam/slru.c:831
-#: access/transam/slru.c:838 access/transam/slru.c:845
-#: access/transam/slru.c:852 access/transam/slru.c:859
+#: commands/foreigncmds.c:135 commands/foreigncmds.c:144
 #, c-format
-msgid "could not access status of transaction %u"
-msgstr "トランザクション%u�ステータス�アクセス����ん���"
+msgid "option \"%s\" not found"
+msgstr "オプション \"%s\" �見��り��ん"
 
-#: access/transam/slru.c:826
+#: commands/foreigncmds.c:154
 #, c-format
-msgid "Could not open file \"%s\": %m."
-msgstr "ファイル\"%s\"をオープン����ん���: %m。"
+msgid "option \"%s\" provided more than once"
+msgstr "オプション \"%s\" �２回以上指定�れ���"
 
-#: access/transam/slru.c:832
+#: commands/foreigncmds.c:212 commands/foreigncmds.c:220
 #, c-format
-msgid "Could not seek in file \"%s\" to offset %u: %m."
-msgstr "ファイル\"%s\"�オフセット%u�シーク����ん���: %m。"
+msgid "permission denied to change owner of foreign-data wrapper \"%s\""
+msgstr "外部データラッパー \"%s\" �所有者を変更�る権���り��ん"
 
-#: access/transam/slru.c:839
-#, c-format
-msgid "Could not read from file \"%s\" at offset %u: %m."
-msgstr "ファイル\"%s\"�オフセット%uを読��れ��ん���: %m。"
+#: commands/foreigncmds.c:214
+msgid "Must be superuser to change owner of a foreign-data wrapper."
+msgstr "スーパーユーザ���外部データラッパー�所有者を変更����"
 
-#: access/transam/slru.c:846
-#, c-format
-msgid "Could not write to file \"%s\" at offset %u: %m."
-msgstr "ファイル\"%s\"�オフセット%u�書�出���ん���: %m。"
+#: commands/foreigncmds.c:222
+msgid "The owner of a foreign-data wrapper must be a superuser."
+msgstr "外部データラッパー�所有者�スーパーユーザ���れ��り��ん"
 
-#: access/transam/slru.c:853
+#: commands/foreigncmds.c:336
 #, c-format
-msgid "Could not fsync file \"%s\": %m."
-msgstr "ファイル\"%s\"をfsync����ん���: %m。"
+msgid "function %s must return type \"fdw_handler\""
+msgstr "関数 %s � \"fdw_handler\" 型を返���れ��り��ん"
 
-#: access/transam/slru.c:860
+#: commands/foreigncmds.c:429
 #, c-format
-msgid "Could not close file \"%s\": %m."
-msgstr "ファイル\"%s\"をクローズ����ん���: %m。"
+msgid "permission denied to create foreign-data wrapper \"%s\""
+msgstr "外部データラッパー \"%s\" を作��る権���り��ん"
 
-#: access/transam/slru.c:1087
-#, c-format
-msgid "could not truncate directory \"%s\": apparent wraparound"
-msgstr "ディレクトリ\"%s\"を切り詰�����ん���: 周回���る様�"
+#: commands/foreigncmds.c:431
+msgid "Must be superuser to create a foreign-data wrapper."
+msgstr "テーブル空間を作��る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/slru.c:1168
+#: commands/foreigncmds.c:442
 #, c-format
-msgid "removing file \"%s\""
-msgstr "ファイル\"%s\"を削除�����"
+msgid "foreign-data wrapper \"%s\" already exists"
+msgstr "外部データラッパー \"%s\" ����存在���"
 
-#: access/transam/varsup.c:113
+#: commands/foreigncmds.c:542
 #, c-format
-msgid ""
-"database is not accepting commands to avoid wraparound data loss in database "
-"\"%s\""
-msgstr ""
-"データベース\"%s\"���る周回�よるデータ�失を防�����データベース��"
-"����を�付���ん"
+msgid "permission denied to alter foreign-data wrapper \"%s\""
+msgstr "外部データラッパー \"%s\" を変更�る権���り��ん"
+
+#: commands/foreigncmds.c:544
+msgid "Must be superuser to alter a foreign-data wrapper."
+msgstr "外部データラッパーを変更�る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/varsup.c:115 access/transam/varsup.c:122
+#: commands/foreigncmds.c:575
+#, 
 msgid ""
-"Stop the postmaster and use a standalone backend to vacuum that database.\n"
-"You might also need to commit or roll back old prepared transactions."
-msgstr ""
-"postmaster を�止後�スタンドアロン�ックエンドを使����データベースを�"
-"キューム������。\n"
-"��準備済�トランザクション�コミット���ロール�ック�必��場�も�り�"
-"�。"
+"changing the foreign-data wrapper handler can change behavior of existing "
+"foreign tables"
+msgstr "外部データラッパー��ンドラーを変更�る��"
+"既存�外部テーブル�振る舞��変�る����り��"
 
-#: access/transam/varsup.c:120
-#, c-format
+#: commands/foreigncmds.c:589
 msgid ""
-"database is not accepting commands to avoid wraparound data loss in database "
-"with OID %u"
+"changing the foreign-data wrapper validator can cause the options for "
+"dependent objects to become invalid"
 msgstr ""
-"OID %u を��データベース�周回�よるデータ�失を防������在������"
-"を�付���状態�������"
+"外部データラッパー��リデータ（検証用関数）を変更�る���れ��存�るオプ"
+"ション�無効��る場���り��"
 
-#: access/transam/varsup.c:132 access/transam/varsup.c:358
+#: commands/foreigncmds.c:694
 #, c-format
-msgid "database \"%s\" must be vacuumed within %u transactions"
-msgstr ""
-"データベース\"%s\"�%uトランザクション以内��キューム���れ��り��ん"
+msgid "permission denied to drop foreign-data wrapper \"%s\""
+msgstr "外部データラッパー \"%s\" を削除�る権���り��ん"
 
-#: access/transam/varsup.c:135 access/transam/varsup.c:142
-#: access/transam/varsup.c:361 access/transam/varsup.c:368
-msgid ""
-"To avoid a database shutdown, execute a database-wide VACUUM in that "
-"database.\n"
-"You might also need to commit or roll back old prepared transactions."
-msgstr ""
-"データベース��止を防�����データベース全体� VACUUM を実行������。\n"
-"��準備済�トランザクション�コミット���ロール�ック�必��場�も�り��。"
+#: commands/foreigncmds.c:696
+msgid "Must be superuser to drop a foreign-data wrapper."
+msgstr "外部データラッパーを削除�る��スーパーユーザ���れ��り��ん"
 
-#: access/transam/varsup.c:139 access/transam/varsup.c:365
+#: commands/foreigncmds.c:708
 #, c-format
-msgid "database with OID %u must be vacuumed within %u transactions"
-msgstr ""
-"OID %u を��データベース� %u トランザクション以内��キューム�れ��れ��"
-"り��ん"
+msgid "foreign-data wrapper \"%s\" does not exist, skipping"
+msgstr "外部データラッパー \"%s\" �存在���ん。スキップ���"
 
-#: access/transam/varsup.c:332
+#: commands/foreigncmds.c:775
 #, c-format
-msgid "transaction ID wrap limit is %u, limited by database with OID %u"
-msgstr ""
-"トランザクション ID �周回制�� %u ��OID %u を��データベース�より制��"
-"れ����"
+msgid "server \"%s\" already exists"
+msgstr "サー�ー \"%s\" ����存在���"
 
-#: access/transam/xact.c:694
-msgid "cannot have more than 2^32-1 commands in a transaction"
-msgstr "1 トランザクション内�� 2^32-1 個以上�コマンドを������ん"
+#: commands/foreigncmds.c:974
+#, c-format
+msgid "server \"%s\" does not exist, skipping"
+msgstr "外部データラッパー \"%s\" �存在���ん。スキップ���"
 
-#: access/transam/xact.c:1213
+#: commands/foreigncmds.c:1077
 #, c-format
-msgid "maximum number of committed subtransactions (%d) exceeded"
-msgstr "コミット�れ�サブトランザクション�最大数 (%d) �制�を越����"
+msgid "user mapping \"%s\" already exists for server %s"
+msgstr "ユーザーマッピング \"%s\" �サー�ー \"%s\" 用������存在���"
 
-#: access/transam/xact.c:1970
-msgid "cannot PREPARE a transaction that has operated on temporary tables"
+#: commands/foreigncmds.c:1163 commands/foreigncmds.c:1271
+#, c-format
+msgid "user mapping \"%s\" does not exist for the server"
+msgstr "��サー�ー用�ユーザーマッピング \"%s\" �存在���ん"
+
+#: commands/foreigncmds.c:1258
+msgid "server does not exist, skipping"
+msgstr "サー�ー�存在���ん。スキップ���"
+
+#: commands/foreigncmds.c:1276
+#, c-format
+msgid "user mapping \"%s\" does not exist for the server, skipping"
 msgstr ""
-"一時テーブル�対�る�作を行�トランザクションをPREPARE�る�������ん"
+"��サー�ー用�ユーザーマッピング \"%s\" �存在���ん。スキップ���"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2759
+#: commands/tablecmds.c:200
 #, c-format
-msgid "%s cannot run inside a transaction block"
-msgstr "%s�トランザクションブロック�内���実行����ん"
+msgid "table \"%s\" does not exist"
+msgstr "テーブル\"%s\"�存在���ん"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2769
+#: commands/tablecmds.c:201
 #, c-format
-msgid "%s cannot run inside a subtransaction"
-msgstr "%s�サブトランザクションブロック�内���実行����ん"
+msgid "table \"%s\" does not exist, skipping"
+msgstr "テーブル\"%s\"�存在���ん。�略���"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2779
+#: commands/tablecmds.c:203
+msgid "Use DROP TABLE to remove a table."
+msgstr "テーブルを削除�る��DROP TABLEを使用������。"
+
+#: commands/tablecmds.c:206
 #, c-format
-msgid "%s cannot be executed from a function or multi-command string"
-msgstr "%s�関数���複数コマンド文字列�ら実行����ん"
+msgid "sequence \"%s\" does not exist"
+msgstr "シーケンス\"%s\"�存在���ん"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2830
+#: commands/tablecmds.c:207
 #, c-format
-msgid "%s can only be used in transaction blocks"
-msgstr "%s�トランザクションブロック内���使用����"
+msgid "sequence \"%s\" does not exist, skipping"
+msgstr "シーケンス\"%s\"�存在���ん。�略���"
 
-#: access/transam/xact.c:3012
-msgid "there is already a transaction in progress"
-msgstr "���トランザクション�進行中��"
+#: commands/tablecmds.c:209
+msgid "Use DROP SEQUENCE to remove a sequence."
+msgstr "シーケンスを削除�る��DROP SEQUENCEを使用������。"
 
-#: access/transam/xact.c:3179 access/transam/xact.c:3271
-msgid "there is no transaction in progress"
-msgstr "進行中�トランザクション��り��ん"
+#: commands/tablecmds.c:212
+#, c-format
+msgid "view \"%s\" does not exist"
+msgstr "ビュー\"%s\"�存在���ん"
 
-#: access/transam/xact.c:3365 access/transam/xact.c:3415
-#: access/transam/xact.c:3421 access/transam/xact.c:3465
-#: access/transam/xact.c:3513 access/transam/xact.c:3519
-msgid "no such savepoint"
-msgstr "��よ��セーブ�イント��り��ん"
+#: commands/tablecmds.c:213
+#, c-format
+msgid "view \"%s\" does not exist, skipping"
+msgstr "ビュー\"%s\"�存在���ん。�略���"
 
-#: access/transam/xact.c:4149
-msgid "cannot have more than 2^32-1 subtransactions in a transaction"
-msgstr ""
-"1 トランザクション内�� 2^32-1 個以上�サブトランザクションを������ん"
+#: commands/tablecmds.c:215
+msgid "Use DROP VIEW to remove a view."
+msgstr "ビューを削除�る��DROP VIEWを使用������。"
 
-#: access/gist/gistsplit.c:372
+#: commands/tablecmds.c:219
 #, c-format
-msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr ""
-"インデックス\"%2$s\"�列%1$d�対�るピックスプリットメソッド�失敗����"
+msgid "index \"%s\" does not exist, skipping"
+msgstr "インデックス\"%s\"�存在���ん。�略���"
 
-#: access/gist/gistsplit.c:374
-msgid ""
-"The index is not optimal. To optimize it, contact a developer, or try to use "
-"the column as the second one in the CREATE INDEX command."
-msgstr ""
-"インデックス�最����り��ん。最�化�る����開発者�連絡�る�\n"
-"��列をCREATE INDEXコマンド�2番目�も����使用�る��を試������"
+#: commands/tablecmds.c:221
+msgid "Use DROP INDEX to remove an index."
+msgstr "インデックスを削除�る��DROP INDEXを使用������"
 
-#: access/gist/gistutil.c:407
+#: commands/tablecmds.c:225 commands/typecmds.c:666
 #, c-format
-msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
-msgstr ""
-"クラッシュリカ�リを完了�る��インデックス\"%s\"をVACUUM���REINDEX���"
-"れ��り��ん"
+msgid "type \"%s\" does not exist, skipping"
+msgstr "型\"%s\"�存在���ん。�略���"
 
-#: access/gist/gistxlog.c:803
+#: commands/tablecmds.c:226
 #, c-format
-msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr ""
-"クラッシュリカ�リを完了�る��インデックス%u/%u/%uをVACUUM FULL���"
-"REINDEX���れ��り��ん"
+msgid "\"%s\" is not a type"
+msgstr "\"%s\"�型���り��ん"
 
-#: access/gist/gistxlog.c:805
-msgid "Incomplete insertion detected during crash replay."
-msgstr "クラッシュリカ�リ中��完全�挿入を検知����"
+#: commands/tablecmds.c:227
+msgid "Use DROP TYPE to remove a type."
+msgstr "型を削除�る��DROP TYPEを使用������"
 
-#: access/gist/gistvacuum.c:72
+#: commands/tablecmds.c:230 commands/tablecmds.c:8852
 #, c-format
-msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr ""
-"クラッシュリカ�リを完了�る��インデックス\"%s\"をVACUUM FULL���REINDEX"
-"���れ��り��ん"
+msgid "foreign table \"%s\" does not exist"
+msgstr "外部テーブル \"%s\" �存在���ん"
 
-#: tsearch/wparser_def.c:2533
+#: commands/tablecmds.c:231
 #, c-format
-msgid "unrecognized headline parameter: \"%s\""
-msgstr "未知�見出�パラメータ: \"%s\""
+msgid "foreign table \"%s\" does not exist, skipping"
+msgstr "外部テーブル \"%s\" �存在���ん。スキップ���"
 
-#: tsearch/wparser_def.c:2542
-msgid "MinWords should be less than MaxWords"
-msgstr "MinWords�MaxWordsより�����れ��り��ん"
+#: commands/tablecmds.c:233
+#, 
+msgid "Use DROP FOREIGN TABLE to remove a foreign table."
+msgstr "外部テーブルを削除�る�� DROP FOREIGN TABLE を使用������。"
 
-#: tsearch/wparser_def.c:2546
-msgid "MinWords should be positive"
-msgstr "MinWords�正���れ��り��ん"
+#: commands/tablecmds.c:429
+#, 
+msgid "constraints on foreign tables are not supported"
+msgstr "外部テーブル��制約�サ�ート�れ����ん"
 
-#: tsearch/wparser_def.c:2550
-msgid "ShortWord should be >= 0"
-msgstr "ShortWord�>= 0���れ��り��ん"
+#: commands/tablecmds.c:478 commands/tablecmds.c:7846 commands/indexcmds.c:265
+msgid "only shared relations can be placed in pg_global tablespace"
+msgstr "共有リレーション��をpg_globalテーブル空間�格��る�������"
 
-#: tsearch/wparser_def.c:2554
-msgid "MaxFragments should be >= 0"
-msgstr "MaxFragments � 0 以上���れ��り��ん"
+#: commands/tablecmds.c:544 commands/tablecmds.c:4324
+#, 
+msgid "default values on foreign tables are not supported"
+msgstr "外部テーブル�対�るデフォルト値指定�サ�ート�れ����ん"
 
-#: tsearch/ts_utils.c:53
+#: commands/tablecmds.c:924
 #, c-format
-msgid "invalid text search configuration file name \"%s\""
-msgstr "テキスト検索設定ファイル��%s�無効��"
+msgid "truncate cascades to table \"%s\""
+msgstr "テーブル\"%s\"��カスケードを削除���"
 
-#: tsearch/ts_utils.c:91
+#: commands/tablecmds.c:1151
+msgid "cannot truncate temporary tables of other sessions"
+msgstr "他�セッション�一時テーブルを削除����ん"
+
+#: commands/tablecmds.c:1360 commands/tablecmds.c:8078
 #, c-format
-msgid "could not open stop-word file \"%s\": %m"
-msgstr "ストップワードファイル\"%s\"をオープン����ん���: %m"
+msgid "cannot inherit from temporary relation \"%s\""
+msgstr "一時リレーション\"%s\"�ら継承�る�������ん"
 
-#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
-#: tsearch/ts_parse.c:568
-msgid "word is too long to be indexed"
-msgstr "インデックス付��る���語�長����"
+#: commands/tablecmds.c:1377 commands/tablecmds.c:8106
+#, c-format
+msgid "relation \"%s\" would be inherited from more than once"
+msgstr "リレーション\"%s\"�複数回継承�れ���"
 
-#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
-#: tsearch/ts_parse.c:569
+#: commands/tablecmds.c:1433
 #, c-format
-msgid "Words longer than %d characters are ignored."
-msgstr "%dより長��語�無視�れ��。"
+msgid "merging multiple inherited definitions of column \"%s\""
+msgstr "複数�継承�れる列\"%s\"�定義をマージ�����"
 
-#: tsearch/spell.c:204
+#: commands/tablecmds.c:1441
 #, c-format
-msgid "could not open dictionary file \"%s\": %m"
-msgstr "辞書ファイル\"%s\"をオープン����ん���: %m"
+msgid "inherited column \"%s\" has a type conflict"
+msgstr "継承�れる列\"%s\"�型�競������"
 
-#: tsearch/spell.c:522 tsearch/spell.c:772 tsearch/spell.c:792
-msgid "multibyte flag character is not allowed"
-msgstr "マル��イトフラグ付��文字�使用����ん"
+#: commands/tablecmds.c:1450
+#, c-format
+msgid "inherited column \"%s\" has a collation conflict"
+msgstr "継承�れる列 \"%s\" �照�順��競������"
 
-#: tsearch/spell.c:557 tsearch/spell.c:615 tsearch/spell.c:710
+#: commands/tablecmds.c:1452 commands/tablecmds.c:1639
+#: commands/tablecmds.c:4193
 #, c-format
-msgid "could not open affix file \"%s\": %m"
-msgstr "affixファイル\"%s\"をオープン����ん���: %m"
+msgid "\"%s\" versus \"%s\""
+msgstr "\"%s\" 対 \"%s\""
 
-#: tsearch/spell.c:603
-msgid "Ispell dictionary supports only default flag value"
-msgstr "Ispell �辞書�デフォルトフラグ値��をサ�ート���"
+#: commands/tablecmds.c:1462
+#, c-format
+msgid "inherited column \"%s\" has a storage parameter conflict"
+msgstr "継承�れる列 \"%s\" �格�パラメーター�競������"
 
-#: tsearch/spell.c:803
-msgid "wrong affix file format for flag"
-msgstr "フラグ�関�る affix ファイル�書��誤�����"
+#: commands/tablecmds.c:1619
+#, c-format
+msgid "merging column \"%s\" with inherited definition"
+msgstr "継承�れる定義�列 \"%s\" をマージ�����"
 
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:615
-msgid "multiple DictFile parameters"
-msgstr "�複�るDictFileパラメータ"
+#: commands/tablecmds.c:1627
+#, c-format
+msgid "column \"%s\" has a type conflict"
+msgstr "列\"%s\"�型�競������"
 
-#: tsearch/dict_ispell.c:63
-msgid "multiple AffFile parameters"
-msgstr "�複�るAffFileパラメータ"
+#: commands/tablecmds.c:1637
+#, c-format
+msgid "column \"%s\" has a collation conflict"
+msgstr "列 \"%s\" �照�順��競������"
 
-#: tsearch/dict_ispell.c:74 tsearch/dict_simple.c:50
-#: snowball/dict_snowball.c:206
-msgid "multiple StopWords parameters"
-msgstr "�複�るStopWordsパラメータ"
+#: commands/tablecmds.c:1649
+#, c-format
+msgid "column \"%s\" has a storage parameter conflict"
+msgstr "列 \"%s\" �格�パラメーター�競������"
 
-#: tsearch/dict_ispell.c:82
+#: commands/tablecmds.c:1701
 #, c-format
-msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "未知�Ispellパラメータ: \"%s\""
+msgid "column \"%s\" inherits conflicting default values"
+msgstr "列\"%s\"�競��るデフォルト値を継承���"
 
-#: tsearch/dict_ispell.c:96
-msgid "missing AffFile parameter"
-msgstr "AffFileパラメータ��り��ん"
+#: commands/tablecmds.c:1703
+msgid "To resolve the conflict, specify a default explicitly."
+msgstr "競�を解消�る��明示的�デフォルトを指定������"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:639
-msgid "missing DictFile parameter"
-msgstr "DictFileパラメータ��り��ん"
+#: commands/tablecmds.c:1750
+#, c-format
+msgid ""
+"check constraint name \"%s\" appears multiple times but with different "
+"expressions"
+msgstr "異�る�を��検査制約�\"%s\"�複数�り��。"
 
-#: tsearch/dict_simple.c:59
-msgid "multiple Accept parameters"
-msgstr "�複�るAcceptパラメータ"
+#: commands/tablecmds.c:2040
+msgid "cannot rename column of typed table"
+msgstr "型付��れ�テーブル�カラムをリ�ーム����ん"
 
-#: tsearch/dict_simple.c:67
+#: commands/tablecmds.c:2057
 #, c-format
-msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "未知��純辞書パラメータ: \"%s\""
+msgid "\"%s\" is not a table, view, composite type, index or foreign table"
+msgstr "\"%s\" �テーブル�ビュー�複�型�インデックス�外部テーブル�"
+"��れ�も�り��ん"
 
-#: tsearch/dict_thesaurus.c:180
+#: commands/tablecmds.c:2123
 #, c-format
-msgid "could not open thesaurus file \"%s\": %m"
-msgstr "シソーラスファイル\"%s\"をオープン����ん���: %m"
+msgid "inherited column \"%s\" must be renamed in child tables too"
+msgstr "継承�れる列\"%s\"���を�テーブル�変更���れ��り��ん"
 
-#: tsearch/dict_thesaurus.c:213
-msgid "unexpected delimiter"
-msgstr "想定外�デリミタ��"
+#: commands/tablecmds.c:2155
+#, c-format
+msgid "cannot rename system column \"%s\""
+msgstr "システム列%s\"���を変更����ん"
 
-#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
-msgid "unexpected end of line or lexeme"
-msgstr "想定外�行末も����語�終端��"
+#: commands/tablecmds.c:2170
+#, c-format
+msgid "cannot rename inherited column \"%s\""
+msgstr "継承�れる列\"%s\"���を変更����ん"
 
-#: tsearch/dict_thesaurus.c:288
-msgid "unexpected end of line"
-msgstr "想定外�行末��"
+#: commands/tablecmds.c:2181 commands/tablecmds.c:4237
+#, c-format
+msgid "column \"%s\" of relation \"%s\" already exists"
+msgstr "リレーション\"%2$s\"�列\"%1$s\"����存在���"
 
-#: tsearch/dict_thesaurus.c:412
+#: commands/tablecmds.c:2270 commands/tablecmds.c:7402
+#: commands/tablecmds.c:8984
+msgid "Use ALTER TYPE instead."
+msgstr "代�り�ALTER TYPEを使用������"
+
+#. translator: first %s is a SQL command, eg ALTER TABLE
+#: commands/tablecmds.c:2393
 #, c-format
 msgid ""
-"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr "シソーラスサンプル�語\"%s\"�副辞書��識�れ��ん(�則%d)"
+"cannot %s \"%s\" because it is being used by active queries in this session"
+msgstr ""
+"��セッション�実行中�������使用�れ��る�� \"%2$s\" を %1$s ��"
+"��ん"
 
-#: tsearch/dict_thesaurus.c:418
+#. translator: first %s is a SQL command, eg ALTER TABLE
+#: commands/tablecmds.c:2402
 #, c-format
-msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr "シソーラスサンプル�語\"%s\"�ストップワード��(�則%d)"
+msgid "cannot %s \"%s\" because it has pending trigger events"
+msgstr "トリガイベントを待機���る�� \"%2$s\" を %1$s ����ん"
 
-#: tsearch/dict_thesaurus.c:421
-msgid "Use \"?\" to represent a stop word within a sample phrase."
-msgstr "サンプルフレーズ内�ストップワードを表���\"?\"を使用������"
+#: commands/tablecmds.c:2501
+#, c-format
+msgid "\"%s\" is not a composite type"
+msgstr "\"%s\" �複�型���り��ん"
 
-#: tsearch/dict_thesaurus.c:567
+#: commands/tablecmds.c:3298
 #, c-format
-msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr "シソーラス置��語\"%s\"�ストップワード��(�則%d)"
+msgid "cannot rewrite system relation \"%s\""
+msgstr "システムリレーション\"%sを書���られ��ん"
 
-#: tsearch/dict_thesaurus.c:574
+#: commands/tablecmds.c:3308
+msgid "cannot rewrite temporary tables of other sessions"
+msgstr "他�セッション�一時テーブルを書���られ��ん"
+
+#: commands/tablecmds.c:3535
 #, c-format
-msgid ""
-"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr "シソーラス置��語\"%s\"�副辞書��識�れ��ん(�則%d)"
+msgid "rewriting table \"%s\""
+msgstr "テーブル \"%s\" ��書込�����"
 
-#: tsearch/dict_thesaurus.c:586
+#: commands/tablecmds.c:3539
 #, c-format
-msgid "thesaurus substitute phrase is empty (rule %d)"
-msgstr "シソーラス置�フレーズ�空��(�則%d)"
+msgid "verifying table \"%s\""
+msgstr "テーブル \"%s\" を検証�����"
 
-#: tsearch/dict_thesaurus.c:624
-msgid "multiple Dictionary parameters"
-msgstr "�複�る辞書パラメータ"
+#: commands/tablecmds.c:3646
+#, c-format
+msgid "column \"%s\" contains null values"
+msgstr "列\"%s\"��NULL値��り��"
 
-#: tsearch/dict_thesaurus.c:631
+#: commands/tablecmds.c:3660
 #, c-format
-msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "未知�シソーラスパラメータ \"%s\""
+msgid "check constraint \"%s\" is violated by some row"
+msgstr "一部�行�検査制約\"%s\"��������"
 
-#: tsearch/dict_thesaurus.c:643
-msgid "missing Dictionary parameter"
-msgstr "Dictionaryパラメータ��り��ん"
+#: commands/tablecmds.c:3801 commands/tablecmds.c:4751
+#, c-format
+msgid "\"%s\" is not a table or index"
+msgstr "\"%s\"�テーブルやインデックス���り��ん"
 
-#: tsearch/ts_locale.c:168
+#: commands/tablecmds.c:3804 commands/trigger.c:193 commands/trigger.c:1098
+#: rewrite/rewriteDefine.c:259
 #, c-format
-msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "設定ファイル\"%2$s\"�%1$d行目：\"%3$s\""
+msgid "\"%s\" is not a table or view"
+msgstr "\"%s\"�テーブルやビュー���り��ん"
 
-#: tsearch/ts_locale.c:173 libpq/hba.c:653 libpq/hba.c:669 libpq/hba.c:715
-#: libpq/hba.c:738 libpq/hba.c:750 libpq/hba.c:763 libpq/hba.c:778
-#: libpq/hba.c:825 libpq/hba.c:848 libpq/hba.c:865 libpq/hba.c:878
-#: libpq/hba.c:894 libpq/hba.c:909 libpq/hba.c:949 libpq/hba.c:981
-#: libpq/hba.c:992 libpq/hba.c:1004 libpq/hba.c:1015 libpq/hba.c:1032
-#: libpq/hba.c:1053 libpq/hba.c:1082 libpq/hba.c:1094 libpq/hba.c:1107
-#: libpq/hba.c:1141 libpq/hba.c:1215 libpq/hba.c:1233 libpq/hba.c:1254
-#: libpq/hba.c:1285 libpq/hba.c:1295
+#: commands/tablecmds.c:3807
 #, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "設定ファイル \"%2$s\" � %1$d 行目"
+msgid "\"%s\" is not a table or foreign table"
+msgstr "\"%s\" �テーブルや外部テーブル���り��ん"
 
-#: tsearch/ts_locale.c:288
+#: commands/tablecmds.c:3810
 #, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "wchar_t�らサー�符�化方���変��失敗����: %m"
+msgid "\"%s\" is not a table, composite type, or foreign table"
+msgstr "\"%s\" �テーブル�複�型�外部テーブル���れ�も�り��ん"
 
-#: tsearch/dict_synonym.c:119
+#: commands/tablecmds.c:3820
 #, c-format
-msgid "unrecognized synonym parameter: \"%s\""
-msgstr "未知�類義語パラメータ: \"%s\""
+msgid "\"%s\" is of the wrong type"
+msgstr "\"%s\" �誤��型��"
 
-#: tsearch/dict_synonym.c:126
-msgid "missing Synonyms parameter"
-msgstr "類義語パラメータ��り��ん"
+#: commands/tablecmds.c:3969 commands/tablecmds.c:3976
+#, c-format
+msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
+msgstr ""
+"型\"%s\"を変更����ん。列\"%s\".\"%s\"���型を使用���る����"
 
-#: tsearch/dict_synonym.c:133
+#: commands/tablecmds.c:3983
 #, c-format
-msgid "could not open synonym file \"%s\": %m"
-msgstr "類義語ファイル\"%s\"をオープン����ん���: %m"
+msgid ""
+"cannot alter foreign table \"%s\" because column \"%s\".\"%s\" uses its "
+"rowtype"
+msgstr "列  \"%2$s\".\"%3$s\" ���行タイプを使用���る���"
+"外部テーブル \"%1$s\" を変更����ん。"
 
-#: tsearch/wparser.c:314
-msgid "text search parser does not support headline creation"
-msgstr "テキスト検索パーサ�見出�作�をサ�ート���ん"
+#: commands/tablecmds.c:3990
+#, c-format
+msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
+msgstr ""
+"テーブル\"%s\"を変更����ん。��行型を列\"%s\".\"%s\"�使用���る���"
+"�"
 
-#: snowball/dict_snowball.c:183
+#: commands/tablecmds.c:4052
 #, c-format
-msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
+msgid "cannot alter type \"%s\" because it is the type of a typed table"
 msgstr ""
-"言語\"%s\"�よ�符�化方�\"%s\"用�使用�能�Snowball語幹抽出��り��ん"
+"型付��れ�テーブル�型��る���外部テーブル \"%s\" を変更����ん。"
 
-#: snowball/dict_snowball.c:215
-msgid "multiple Language parameters"
-msgstr "�複�るLanguageパラメータ"
+#: commands/tablecmds.c:4054
+#, 
+msgid "Use ALTER ... CASCADE to alter the typed tables too."
+msgstr ""
+"型付��れ�テーブルを変更�る場�も ALTER .. CASCADE を使用������"
 
-#: snowball/dict_snowball.c:222
+#: commands/tablecmds.c:4098
 #, c-format
-msgid "unrecognized Snowball parameter: \"%s\""
-msgstr "未知�Snowballパラメータ: \"%s\""
+msgid "type %s is not a composite type"
+msgstr "型 %s �複�型���り��ん"
 
-#: snowball/dict_snowball.c:230
-msgid "missing Language parameter"
-msgstr "Languageパラメータ��り��ん"
+#: commands/tablecmds.c:4124
+msgid "cannot add column to typed table"
+msgstr "型付��れ�テーブル�カラムを追加����ん"
 
-#: libpq/auth.c:255
+#: commands/tablecmds.c:4185 commands/tablecmds.c:8260
 #, c-format
-msgid "authentication failed for user \"%s\": host rejected"
-msgstr "ユーザ\"%s\"��証�失敗����: ホストを拒絶����"
+msgid "child table \"%s\" has different type for column \"%s\""
+msgstr "�テーブル\"%s\"�異�る型�列\"%s\"を������"
 
-#: libpq/auth.c:258
+#: commands/tablecmds.c:4191 commands/tablecmds.c:8267
 #, c-format
-msgid "Kerberos 5 authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�Kerberos 5�証�失敗����"
+msgid "child table \"%s\" has different collation for column \"%s\""
+msgstr "�テーブル \"%s\" �異�る照�順��列 \"%s\" ��り��"
 
-#: libpq/auth.c:261
+#: commands/tablecmds.c:4201
 #, c-format
-msgid "\"trust\" authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�\"trust\"�証�失敗����"
+msgid "child table \"%s\" has a conflicting \"%s\" column"
+msgstr "�テーブル \"%s\" �競��るカラム \"%s\" ��り��"
+
+#: commands/tablecmds.c:4213
+#, c-format
+msgid "merging definition of column \"%s\" for child \"%s\""
+msgstr "�\"%2$s\"�列\"%1$s\"�定義をマージ�����"
+
+#: commands/tablecmds.c:4443
+msgid "column must be added to child tables too"
+msgstr "列��テーブル�も追加���れ��り��ん"
 
-#: libpq/auth.c:264
+#: commands/tablecmds.c:4573 commands/tablecmds.c:4663
+#: commands/tablecmds.c:4708 commands/tablecmds.c:4804
+#: commands/tablecmds.c:4848 commands/tablecmds.c:4927
+#: commands/tablecmds.c:6621
 #, c-format
-msgid "Ident authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�Ident�証�失敗����"
+msgid "cannot alter system column \"%s\""
+msgstr "システム列\"%s\"を変更����ん"
 
-#: libpq/auth.c:268
+#: commands/tablecmds.c:4607
 #, c-format
-msgid "password authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�パスワード�証�失敗����"
+msgid "column \"%s\" is in a primary key"
+msgstr "列\"%s\"�プライマリキー�使用�����"
 
-#: libpq/auth.c:273
+#: commands/tablecmds.c:4778
 #, c-format
-msgid "GSSAPI authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�GSSAPI�証�失敗����"
+msgid "statistics target %d is too low"
+msgstr "統計情報対象%d�������"
 
-#: libpq/auth.c:276
+#: commands/tablecmds.c:4786
 #, c-format
-msgid "SSPI authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�SSPI�証�失敗����"
+msgid "lowering statistics target to %d"
+msgstr "統計情報対象を%d�減ら�������"
 
-#: libpq/auth.c:279
+#: commands/tablecmds.c:4908
 #, c-format
-msgid "PAM authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�PAM�証�失敗����"
+msgid "invalid storage type \"%s\""
+msgstr "�管方�\"%s\"�無効��"
 
-#: libpq/auth.c:282
+#: commands/tablecmds.c:4939
 #, c-format
-msgid "LDAP authentication failed for user \"%s\""
-msgstr "ユーザ\"%s\"�LDAP�証�失敗����"
-
-#: libpq/auth.c:285
-msgid "certificate authentication failed for user \"%s\""
-msgstr "ユーザ \"%s\" �証明書�証�失敗����"
+msgid "column data type %s can only have storage PLAIN"
+msgstr "列�データ型%s��管方�PLAIN���る�������ん"
 
-#: libpq/auth.c:288
-msgid "RADIUS authentication failed for user \"%s\""
-msgstr "ユーザ \"%s\" � RADIUS �証�失敗����"
+#: commands/tablecmds.c:4969
+msgid "cannot drop column from typed table"
+msgstr "型付��れ�テーブル�らカラムを削除����ん"
 
-#: libpq/auth.c:291
+#: commands/tablecmds.c:5010
 #, c-format
-msgid "authentication failed for user \"%s\": invalid authentication method"
-msgstr "ユーザ\"%s\"��証�失敗����: �証方��無効��"
-
-#: libpq/auth.c:320
-msgid "missing or erroneous pg_hba.conf file"
-msgstr "pg_hba.confファイル�存在��������pg_hba.confファイル�エラー"
+msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "リレーション \"%2$s\" �列 \"%1$s\" �存在���ん。スキップ���。"
 
-#: libpq/auth.c:321
-msgid "See server log for details."
-msgstr "詳細�サー�ログを�照������"
+#: commands/tablecmds.c:5023
+#, c-format
+msgid "cannot drop system column \"%s\""
+msgstr "システム列\"%s\"を削除����ん"
 
-#: libpq/auth.c:351
-msgid "connection requires a valid client certificate"
-msgstr "��接続��有効�クライアント証明�必���"
+#: commands/tablecmds.c:5030
+#, c-format
+msgid "cannot drop inherited column \"%s\""
+msgstr "継承�れる列\"%s\"を削除����ん"
 
-#: libpq/auth.c:393
+#: commands/tablecmds.c:5256
+#, c-format
 msgid ""
-"pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
+"ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr ""
-"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\", %s 用�レプリケーション接続を拒�����"
-
-#: libpq/auth.c:395 libpq/auth.c:411 libpq/auth.c:448 libpq/auth.c:464
-msgid "SSL on"
-msgstr "SSL有効"
+"ALTER TABLE / ADD CONSTRAINT USING INDEX �インデックス \"%s\" を \"%s\""
+" �リ�ーム���"
 
-#: libpq/auth.c:395 libpq/auth.c:411 libpq/auth.c:448 libpq/auth.c:464
-msgid "SSL off"
-msgstr "SSL無効"
+#: commands/tablecmds.c:5433
+msgid "constraint must be added to child tables too"
+msgstr "制約��テーブル�も追加���れ��り��ん"
 
-#: libpq/auth.c:399
-msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
-msgstr ""
-"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\"用�レプリケーション接続を拒�����"
+#: commands/tablecmds.c:5491 commands/sequence.c:1401
+#, c-format
+msgid "referenced relation \"%s\" is not a table"
+msgstr "�照先�リレーション\"%s\"�テーブル���り��ん"
 
-#: libpq/auth.c:408
-msgid ""
-"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
-"\", %s"
-msgstr ""
-"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\"�データベース \"%s 用�レプリケーション接続を拒�����"
+#: commands/tablecmds.c:5514
+msgid "constraints on permanent tables may reference only permanent tables"
+msgstr "永続テーブル��制約�永続テーブル��を�照�る場���り��"
 
-#: libpq/auth.c:415
+#: commands/tablecmds.c:5521
 msgid ""
-"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
-msgstr ""
-"pg_hba.conf �設定�ホスト \"%s\"�ユーザ \"%s\"�データベース \"%s\" 用�レプリケーション接続を拒�����"
+"constraints on unlogged tables may reference only permanent or unlogged "
+"tables"
+msgstr "ログを�ら��(unlogged)テーブル�対�る制約��永続テーブル"
+"���ログを�ら��テーブル��を�照�る場���り��"
 
-#: libpq/auth.c:446
-msgid ""
-"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
-"\", %s"
-msgstr ""
-"pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\", %s用�エントリ��り��ん"
+#: commands/tablecmds.c:5527
+#, 
+msgid "constraints on temporary tables may reference only temporary tables"
+msgstr "一時テーブル�対�る制約�一時テーブル��を�照�る場���り��"
 
-#: libpq/auth.c:452
-msgid ""
-"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
-msgstr ""
-"pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\"用�エントリ��り��ん"
+#: commands/tablecmds.c:5588
+msgid "number of referencing and referenced columns for foreign key disagree"
+msgstr "外部キー��照列数���照列数�����ん"
 
-#: libpq/auth.c:461
+#: commands/tablecmds.c:5677
 #, c-format
-msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
-msgstr ""
-"pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\"�データベース\"%s, %s用�エントリ��り��ん"
+msgid "foreign key constraint \"%s\" cannot be implemented"
+msgstr "外部キー制約\"%s�実装�れ����ん"
 
-#: libpq/auth.c:468
+#: commands/tablecmds.c:5680
 #, c-format
-msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
-msgstr ""
-"pg_hba.conf �ホスト\"%s\"�ユーザ\"%s\"�データベース\"%s用�エントリ��り��ん"
+msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
+msgstr "キー��る列\"%s\"�\"%s\"��間�型�互�性��り��ん:%s�%s"
 
-#: libpq/auth.c:526
+#: commands/tablecmds.c:5793
 #, c-format
-msgid "could not enable credential reception: %m"
-msgstr "資格証明��信を有効�����ん���: %m"
+msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "リレーション \"%2$s\" �外部キー制約 \"%1$s\" �存在���ん"
 
-#: libpq/auth.c:539 libpq/hba.c:948
-msgid ""
-"MD5 authentication is not supported when \"db_user_namespace\" is enabled"
-msgstr "\"db_user_namespace\" �有効�場��MD5 �証�サ�ート�れ��ん"
+#: commands/tablecmds.c:5855
+#, c-format
+msgid "column \"%s\" referenced in foreign key constraint does not exist"
+msgstr "外部キー制約��照�れる列\"%s\"�存在���ん"
 
-#: libpq/auth.c:660
+#: commands/tablecmds.c:5860
 #, c-format
-msgid "expected password response, got message type %d"
-msgstr "パスワード応答を想定������メッセージ種類%dを���り���"
+msgid "cannot have more than %d keys in a foreign key"
+msgstr "外部キー��%dを超�るキーを���������ん"
 
-#: libpq/auth.c:688
-msgid "invalid password packet size"
-msgstr "パスワードパケット�サイズ�無効��"
+#: commands/tablecmds.c:5925
+#, c-format
+msgid "cannot use a deferrable primary key for referenced table \"%s\""
+msgstr "被�照テーブル \"%s\" ���延�能プライマリキー�使用����ん"
 
-#: libpq/auth.c:692
-msgid "received password packet"
-msgstr "パスワードパケットを���り���"
+#: commands/tablecmds.c:5942
+#, c-format
+msgid "there is no primary key for referenced table \"%s\""
+msgstr "被�照テーブル\"%s\"��プライマリキー��り��ん"
 
-#: libpq/auth.c:750
+#: commands/tablecmds.c:6092
 #, c-format
-msgid "Kerberos initialization returned error %d"
-msgstr "Kerberos��期化��エラー%d�返�れ���"
+msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
+msgstr "被�照テーブル \"%s\" �対�����延�能�一�性制約�使用����ん"
 
-#: libpq/auth.c:760
+#: commands/tablecmds.c:6097
 #, c-format
-msgid "Kerberos keytab resolving returned error %d"
-msgstr "Kerberos�keytab解決��エラー%d�返�れ���"
+msgid ""
+"there is no unique constraint matching given keys for referenced table \"%s\""
+msgstr "被�照テーブル \"%s\" ��指定��キー�一致�る一�性制約��り��ん"
 
-#: libpq/auth.c:784
+#: commands/tablecmds.c:6148
 #, c-format
-msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
-msgstr "Kerberos�sname_to_principal(\"%s\", \"%s\")��エラー%d�返�れ���"
+msgid "validating foreign key constraint \"%s\""
+msgstr "外部キー制約 \"%s\" を検証�����"
 
-#: libpq/auth.c:829
+#: commands/tablecmds.c:6430
 #, c-format
-msgid "Kerberos recvauth returned error %d"
-msgstr "Kerberos�recvauth��エラー%d�返�れ���"
+msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
+msgstr "リレーション  \"%2$s\" �継承�れ�制約 \"%1$s\" を削除����ん"
 
-#: libpq/auth.c:852
+#: commands/tablecmds.c:6457 commands/tablecmds.c:6570
 #, c-format
-msgid "Kerberos unparse_name returned error %d"
-msgstr "Kerberos�unparse_name��エラー%d�返�れ���"
+msgid "constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "リレーション \"%2$s\" �制約 \"%1$s\" �存在���ん"
 
-#: libpq/auth.c:975
+#: commands/tablecmds.c:6463
 #, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "リレーション \"%2$s\" �制約 \"%1$s\" �存在���ん。スキップ���。"
 
-#: libpq/auth.c:1001
-msgid "GSSAPI is not supported in protocol version 2"
-msgstr "プロトコル�ージョン 2 �� GSSAPI �サ�ート�れ����ん"
+#: commands/tablecmds.c:6605
+#, 
+msgid "cannot alter column type of typed table"
+msgstr "型付��れ�テーブル�列�型を変更����ん"
 
-#: libpq/auth.c:1056
+#: commands/tablecmds.c:6628
 #, c-format
-msgid "expected GSS response, got message type %d"
-msgstr "GSS応答を想定������メッセージタイプ %d を���り���"
+msgid "cannot alter inherited column \"%s\""
+msgstr "継承�れる列\"%s\"を変更����ん"
 
-#: libpq/auth.c:1119
-msgid "accepting GSS security context failed"
-msgstr "GSSセキュリティコンテキスト��付�失敗����"
+#: commands/tablecmds.c:6670
+msgid "transform expression must not return a set"
+msgstr "変���集�を返�������ん"
 
-#: libpq/auth.c:1145
-msgid "retrieving GSS user name failed"
-msgstr "GSSユーザ���信�失敗����"
+#: commands/tablecmds.c:6676
+msgid "cannot use subquery in transform expression"
+msgstr "変����副�����を使用����ん"
 
-#: libpq/auth.c:1218
-#, c-format
-msgid "SSPI error %x"
-msgstr "SSPIエラー��: %x"
+#: commands/tablecmds.c:6680
+msgid "cannot use aggregate function in transform expression"
+msgstr "変����集約関数を使用����ん"
 
-#: libpq/auth.c:1222
+#: commands/tablecmds.c:6684
+msgid "cannot use window function in transform expression"
+msgstr "変���中��ウィンドウ関数�使用����ん"
+
+#: commands/tablecmds.c:6703
 #, c-format
-msgid "%s (%x)"
-msgstr "%s (%x)"
+msgid "column \"%s\" cannot be cast to type %s"
+msgstr "列\"%s\"を型\"%s\"�キャスト����ん"
 
-#: libpq/auth.c:1262
-msgid "SSPI is not supported in protocol version 2"
-msgstr "プロトコル�ージョン 2 �� SSPI �サ�ート�れ����ん"
+#: commands/tablecmds.c:6724
+msgid "ALTER TYPE USING is only supported on plain tables"
+msgstr "ALTER TYPE USING ��純�テーブル���サ�ート�れ����"
 
-#: libpq/auth.c:1277
-msgid "could not acquire SSPI credentials"
-msgstr "SSPI�資格�ンドルを入手����ん���"
+#: commands/tablecmds.c:6749
+#, c-format
+msgid "type of inherited column \"%s\" must be changed in child tables too"
+msgstr "継承�れる列\"%s\"�型を�テーブル�変更���れ��り��ん"
 
-#: libpq/auth.c:1294
+#: commands/tablecmds.c:6830
 #, c-format
-msgid "expected SSPI response, got message type %d"
-msgstr "SSPI応答を想定������メッセージ種類%dを���り���"
+msgid "cannot alter type of column \"%s\" twice"
+msgstr "列\"%s\"�型を2回変更�る�������ん"
 
-#: libpq/auth.c:1366
-msgid "could not accept SSPI security context"
-msgstr "SSPIセキュリティコンテキストを��付�られ��ん���"
+#: commands/tablecmds.c:6866
+#, c-format
+msgid "default for column \"%s\" cannot be cast to type %s"
+msgstr "列 \"%s\" �デフォルト値を \"%s\" 型�キャスト����ん"
 
-#: libpq/auth.c:1422
-msgid "could not get token from SSPI security context"
-msgstr "SSPIセキュリティコンテキスト�らトークンを入手����ん���"
+#: commands/tablecmds.c:6992
+msgid "cannot alter type of a column used by a view or rule"
+msgstr "ビュー���ルール�使用�れる列�型を変更����ん"
 
-#: libpq/auth.c:1665
+#: commands/tablecmds.c:6993 commands/tablecmds.c:7012
 #, c-format
-msgid "could not create socket for Ident connection: %m"
-msgstr "Ident接続用�ソケットを作�����ん���: %m"
+msgid "%s depends on column \"%s\""
+msgstr "%s�列\"%s\"��存�����"
 
-#: libpq/auth.c:1680
+#: commands/tablecmds.c:7011
+#, 
+msgid "cannot alter type of a column used in a trigger definition"
+msgstr "トリガー定義�使用�れる列�型を変更����ん"
+
+#: commands/tablecmds.c:7370
 #, c-format
-msgid "could not bind to local address \"%s\": %m"
-msgstr "ローカルアドレス\"%s\"��インド����ん���: %m"
+msgid "cannot change owner of index \"%s\""
+msgstr "インデックス\"%s\"�所有者を変更����ん"
+
+#: commands/tablecmds.c:7372
+msgid "Change the ownership of the index's table, instead."
+msgstr "代�り�インデックス�テーブル�所有者を変更������"
 
-#: libpq/auth.c:1692
+#: commands/tablecmds.c:7388
 #, c-format
-msgid "could not connect to Ident server at address \"%s\", port %s: %m"
-msgstr "アドレス\"%s\"��ート%s�Identサー��接続����ん���: %m"
+msgid "cannot change owner of sequence \"%s\""
+msgstr "シーケンス\"%s\"�所有者を変更����ん"
 
-#: libpq/auth.c:1712
+#: commands/tablecmds.c:7390 commands/tablecmds.c:8974
 #, c-format
-msgid "could not send query to Ident server at address \"%s\", port %s: %m"
-msgstr ""
-"アドレス\"%s\"��ート%s�Identサー�������を�信����ん���: %m"
+msgid "Sequence \"%s\" is linked to table \"%s\"."
+msgstr "シーケンス\"%s\"�テーブル\"%s\"�リンク�れ����"
 
-#: libpq/auth.c:1727
+#: commands/tablecmds.c:7411 commands/tablecmds.c:8992
 #, c-format
-msgid ""
-"could not receive response from Ident server at address \"%s\", port %s: %m"
-msgstr ""
-"アドレス\"%s\"��ート%s�Identサー��ら�応答を�信����ん���: %m"
+msgid "\"%s\" is not a table, view, sequence, or foreign table"
+msgstr "\"%s\" �テーブル�ビュー�シーケンス�外部テーブル���り��ん"
 
-#: libpq/auth.c:1737
+#: commands/tablecmds.c:7623 commands/cluster.c:178
 #, c-format
-msgid "invalidly formatted response from Ident server: \"%s\""
-msgstr "Identサー��ら�応答�書��無効��: \"%s\""
+msgid "index \"%s\" for table \"%s\" does not exist"
+msgstr "テーブル\"%2$s\"��インデックス\"%1$s\"�存在���ん"
+
+#: commands/tablecmds.c:7666
+msgid "cannot have multiple SET TABLESPACE subcommands"
+msgstr "SET TABLESPACEサブコマンドを複数指定����ん"
 
-#: libpq/auth.c:1772 libpq/auth.c:1802 libpq/auth.c:1830 libpq/auth.c:1906
+#: commands/tablecmds.c:7718
 #, c-format
-msgid "could not get peer credentials: %m"
-msgstr "ピア�資格証明を入手����ん���: %m"
+msgid "\"%s\" is not a table, index, or TOAST table"
+msgstr "\"%s\"�テーブル�もインデックス�もTOASTテーブル�も�り��ん"
 
-#: libpq/auth.c:1781 libpq/auth.c:1811 libpq/auth.c:1848 libpq/auth.c:1917
+#: commands/tablecmds.c:7839
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "ID %d�ローカルユーザ�存在���ん"
+msgid "cannot move system relation \"%s\""
+msgstr "システムリレーション\"%s\"を移動����ん"
 
-#: libpq/auth.c:1838
+#: commands/tablecmds.c:7855
+msgid "cannot move temporary tables of other sessions"
+msgstr "他�セッション�一時テーブルを移動����ん"
+
+#: commands/tablecmds.c:8047
+#, 
+msgid "cannot change inheritance of typed table"
+msgstr "型付��れ�テーブル�継承を変更����ん"
+
+#: commands/tablecmds.c:8133
+msgid "circular inheritance not allowed"
+msgstr "循環��継承を行��������ん"
+
+#: commands/tablecmds.c:8134
 #, c-format
-msgid "could not get effective UID from peer credentials: %m"
-msgstr "相手��資格情報�ら実効 UID を�得����ん���: %m"
+msgid "\"%s\" is already a child of \"%s\"."
+msgstr "\"%s\"����\"%s\"����"
 
-#: libpq/auth.c:1928
-msgid ""
-"Ident authentication is not supported on local connections on this platform"
-msgstr "��プラットフォーム�ローカル接続��Ident�証をサ�ート�����ん"
+#: commands/tablecmds.c:8142
+#, c-format
+msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
+msgstr ""
+"OIDを����テーブル\"%s\"をOIDを��テーブル\"%s\"�ら継承�る������"
+"�ん"
 
-#: libpq/auth.c:2045 libpq/auth.c:2317 libpq/auth.c:2677
-msgid "empty password returned by client"
-msgstr "クライアント�ら空�パスワード�返�れ���"
+#: commands/tablecmds.c:8278
+#, c-format
+msgid "column \"%s\" in child table must be marked NOT NULL"
+msgstr "�テーブル�列\"%s\"�NOT NULL��付�����れ��り��ん"
 
-#: libpq/auth.c:2055
+#: commands/tablecmds.c:8294
 #, c-format
-msgid "error from underlying PAM layer: %s"
-msgstr "背後�PAM層�エラー��り���: %s"
+msgid "child table is missing column \"%s\""
+msgstr "�テーブル��列\"%s\"��り��ん"
 
-#: libpq/auth.c:2124
+#: commands/tablecmds.c:8373
 #, c-format
-msgid "could not create PAM authenticator: %s"
-msgstr "PAM authenticatorを作�����ん���: %s"
+msgid "child table \"%s\" has different definition for check constraint \"%s\""
+msgstr ""
+"�テーブル \"%s\" ���ェック制約 \"%s\" ����異���定義を������"
 
-#: libpq/auth.c:2135
+#: commands/tablecmds.c:8397
 #, c-format
-msgid "pam_set_item(PAM_USER) failed: %s"
-msgstr "pam_set_item(PAM_USER)�失敗����: %s"
+msgid "child table is missing constraint \"%s\""
+msgstr "�テーブル��制約 \"%s\" ��り��ん"
 
-#: libpq/auth.c:2146
+#: commands/tablecmds.c:8477
 #, c-format
-msgid "pam_set_item(PAM_CONV) failed: %s"
-msgstr "\"pam_set_item(PAM_CONV)�失敗����: %s"
+msgid "relation \"%s\" is not a parent of relation \"%s\""
+msgstr "リレーション\"%s\"�リレーション\"%s\"�親���り��ん"
+
+#: commands/tablecmds.c:8694
+#, 
+msgid "typed tables cannot inherit"
+msgstr "型付��れ�テーブル�継承����ん"
 
-#: libpq/auth.c:2157
+#: commands/tablecmds.c:8725
 #, c-format
-msgid "pam_authenticate failed: %s"
-msgstr "\"pam_authenticate�失敗����: %s"
+msgid "table is missing column \"%s\""
+msgstr "テーブル��列 \"%s\" ��り��ん"
 
-#: libpq/auth.c:2168
+#: commands/tablecmds.c:8735
 #, c-format
-msgid "pam_acct_mgmt failed: %s"
-msgstr "pam_acct_mgmt�失敗����: %s"
+msgid "table has column \"%s\" where type requires \"%s\""
+msgstr "テーブル��列 \"%s\" ��り���型� \"%s\" を�求�����"
 
-#: libpq/auth.c:2179
+#: commands/tablecmds.c:8744
 #, c-format
-msgid "could not release PAM authenticator: %s"
-msgstr "PAM authenticatorを解放����ん���: %s"
+msgid "table \"%s\" has different type for column \"%s\""
+msgstr "テーブル \"%s\" ��異�る型�列 \"%s\" ��り��"
 
-#: libpq/auth.c:2212 libpq/auth.c:2216
+#: commands/tablecmds.c:8757
 #, c-format
-msgid "could not initialize LDAP: error code %d"
-msgstr "LDAPを�期化����ん���: %d"
+msgid "table has extra column \"%s\""
+msgstr "テーブル�余計�列 \"%s\" ��り��"
 
-#: libpq/auth.c:2226
+#: commands/tablecmds.c:8804
 #, c-format
-msgid "could not set LDAP protocol version: error code %d"
-msgstr "LDAPプロトコル�ージョンを設定����ん���: エラーコード %d"
+msgid "\"%s\" is not a typed table"
+msgstr "\"%s\" �型付��れ�テーブル���り��ん"
 
-#: libpq/auth.c:2255
-msgid "could not load wldap32.dll"
-msgstr "wldap32.dll�読�込������ん"
+#: commands/tablecmds.c:8973
+msgid "cannot move an owned sequence into another schema"
+msgstr "所有�るシーケンスを他�スキーマ�移動�る�������ん"
 
-#: libpq/auth.c:2263
-msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
-msgstr "wldap32.dll�_ldap_start_tls_sA関数を読�込�����ん���"
+#: commands/tablecmds.c:9049
+#, c-format
+msgid "relation \"%s\" already exists in schema \"%s\""
+msgstr "リレーション\"%s\"�スキーマ\"%s\"内����存在���"
 
-#: libpq/auth.c:2264
-msgid "LDAP over SSL is not supported on this platform."
-msgstr "��プラットフォーム��LDAP over SSLをサ�ート�����ん。"
+#: commands/sequence.c:126
+#, 
+msgid "unlogged sequences are not supported"
+msgstr "ログを�ら��シーケンス�サ�ート�れ��ん"
 
-#: libpq/auth.c:2279
+# (%s)
+#: commands/sequence.c:634
 #, c-format
-msgid "could not start LDAP TLS session: error code %d"
-msgstr "LDAP TLSセッションを開始����ん���: エラーコード %d"
-
-#: libpq/auth.c:2301
-msgid "LDAP server not specified"
-msgstr "LDAP サー�ー�指定��り��ん"
+msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
+msgstr "nextval: シーケンス\"%s\"�最大値(%s)������"
 
-#: libpq/auth.c:2353
-msgid "invalid character in user name for LDAP authentication"
-msgstr "LDAP �証�ユーザー��中��正�文字��り��"
+#: commands/sequence.c:657
+#, c-format
+msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
+msgstr "nextval: シーケンス\"%s\"�最�値(%s)������"
 
-#: libpq/auth.c:2368
+#: commands/sequence.c:755
 #, c-format
-msgid ""
-"could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
-"error code %d"
-msgstr ""
-"サー�ー \"%2$s\" ��ldapbinddn \"%1$s\" �よる LDAP �インドを実行����"
-"ん���: エラーコード %3$d"
+msgid "currval of sequence \"%s\" is not yet defined in this session"
+msgstr "本セッション�シーケンス\"%s\"�currval���定義�れ����ん"
+
+#: commands/sequence.c:774 commands/sequence.c:780
+msgid "lastval is not yet defined in this session"
+msgstr "本セッション�lastval���定義�れ����ん"
 
-#: libpq/auth.c:2393
+#: commands/sequence.c:848
 #, c-format
-msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
-msgstr ""
-"サー�ー \"%2$s\" ��フィルタ \"%1$s\" �よる LDAP 検索�����ん���: "
-"エラーコード %3$d"
+msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
+msgstr "setval: 値%s�シーケンス\"%s\"�範囲(%s..%s)外��\""
+
+#: commands/sequence.c:1206
+msgid "INCREMENT must not be zero"
+msgstr "INCREMENT�ゼロ������ん"
 
-#: libpq/auth.c:2403
+#: commands/sequence.c:1252
 #, c-format
-msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
-msgstr ""
-"サー�ー \"%2$s\" ��フィルタ \"%1$s\" �よる LDAP 検索�失敗����：��"
-"よ��ユーザー�見��り��ん"
+msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
+msgstr "MINVALUE (%s)�MAXVALUE (%s)より�����れ��り��ん"
 
-#: libpq/auth.c:2407
-msgid ""
-"LDAP search failed for filter \"%s\" on server \"%s\": user is not unique (%"
-"ld matches)"
-msgstr ""
-"サー� \"%2$s\" �フィルタ \"%1$s\" �よる LDAP 検索�失敗����："
-"ユーザー�一����り��ん（%3$d 個見��り���）"
+#: commands/sequence.c:1277
+#, c-format
+msgid "START value (%s) cannot be less than MINVALUE (%s)"
+msgstr "START�値(%s)�MINVALUE(%s)より����る�������ん"
 
-#: libpq/auth.c:2424
+#: commands/sequence.c:1289
 #, c-format
-msgid ""
-"could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
-msgstr ""
-"サー� \"%2$s\" � \"%1$s\" �マッ��る最��エントリ� dn を�得����"
-"ん：%3$s"
+msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
+msgstr "START�値(%s)�MAXVALUE(%s)より大���る�������ん"
 
-#: libpq/auth.c:2444
+#: commands/sequence.c:1320
 #, c-format
-msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
-msgstr "サー�ー \"%s\" �ユーザー \"%s\" �検索後�unbind ����ん: %s"
+msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
+msgstr "RESTART �値(%s)� MINVALUE(%s) より����る�������ん"
 
-#: libpq/auth.c:2481
+#: commands/sequence.c:1332
 #, c-format
-msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
-msgstr ""
-"サー�\"%2$s\"�ユーザ\"%1$s\"�LDAPログイン�失敗����: エラーコード %3$d"
+msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
+msgstr "RESTART �値(%s)� MAXVALUE(%s) より大���る�������ん"
 
-#: libpq/auth.c:2509
-msgid ""
-"certificate authentication failed for user \"%s\": client certificate "
-"contains no user name"
-msgstr ""
-"ユーザ \"%s\" �証明書�証�失敗����："
-"クライアント証明書�ユーザ����れ����ん"
+#: commands/sequence.c:1347
+#, c-format
+msgid "CACHE (%s) must be greater than zero"
+msgstr "CACHE(%s)�ゼロより大����れ��り��ん"
 
-#: libpq/auth.c:2633
-msgid "RADIUS server not specified"
-msgstr "RADIUS サー�ー�指定�れ����ん"
+#: commands/sequence.c:1378
+msgid "invalid OWNED BY option"
+msgstr "無効�OWNED BYオプション��"
 
-#: libpq/auth.c:2640
-msgid "RADIUS secret not specified"
-msgstr "RADIUS secret �指定�れ����ん"
+#: commands/sequence.c:1379
+msgid "Specify OWNED BY table.column or OWNED BY NONE."
+msgstr "OWNED BY table.column ��� OWNED BY NONEを指定������。"
 
-#: libpq/auth.c:2656 libpq/hba.c:1213
-msgid "could not translate RADIUS server name \"%s\" to address: %s"
-msgstr "RADIUS サー�� \"%s\" をアドレス�変�����ん���: %s"
+#: commands/sequence.c:1408
+msgid "sequence must have same owner as table it is linked to"
+msgstr "シーケンス�関連�るテーブル���所有者���れ��り��ん"
 
-#: libpq/auth.c:2684
-msgid ""
-"RADIUS authentication does not support passwords longer than 16 characters"
-msgstr ""
-"RADIUS �証�� 16 文字以上�パスワード�サ�ート�����ん"
+#: commands/sequence.c:1412
+msgid "sequence must be in same schema as table it is linked to"
+msgstr "シーケンス�関連�るテーブル���スキーマ���れ��り��ん"
 
-#: libpq/auth.c:2695
-msgid "could not generate random encryption vector"
-msgstr "乱数化ベクトルを生�����ん���"
+#: commands/variable.c:172
+#, 
+msgid "Conflicting \"datestyle\" specifications."
+msgstr "\"datestyle\" 指定�競������"
 
-#: libpq/auth.c:2718
-msgid "could not perform MD5 encryption of password"
-msgstr "パスワード� MD5 暗�化�失敗����"
+#: commands/variable.c:328
+msgid "Cannot specify months in time zone interval."
+msgstr "タイムゾーン�インター�ル�月�指定����ん"
 
-#: libpq/auth.c:2740
-msgid "could not create RADIUS socket: %m"
-msgstr "RADIUS �ソケットを作�����ん���: %m"
+#: commands/variable.c:334
+msgid "Cannot specify days in time zone interval."
+msgstr "タイムゾーン�インター�ル�日�指定����ん"
 
-#: libpq/auth.c:2761
-msgid "could not bind local RADIUS socket: %m"
-msgstr "ローカル� RADIUS ソケットを�インド����ん���: %m"
+#: commands/variable.c:378 commands/variable.c:517
+#, c-format
+msgid "time zone \"%s\" appears to use leap seconds"
+msgstr "時間帯\"%s\"��る�秒を使用�るよ���"
 
-#: libpq/auth.c:2771
-msgid "could not send RADIUS packet: %m"
-msgstr "RADIUS パケットを�信����ん���: %m"
+#: commands/variable.c:380 commands/variable.c:519
+msgid "PostgreSQL does not support leap seconds."
+msgstr "PostgreSQL��る�秒をサ�ート�����ん"
 
-#: libpq/auth.c:2796
-msgid "could not check status on RADIUS socket: %m"
-msgstr "RADIUS ソケット�状態を�ェック����ん���: %m"
+#: commands/variable.c:582
+msgid "cannot set transaction read-write mode inside a read-only transaction"
+msgstr ""
+"読��り���トランザクション�トランザクションモードを読�書�モード�設定"
+"�る�������ん"
 
-#: libpq/auth.c:2803
-msgid "timeout waiting for RADIUS response"
-msgstr "RADIUS �応答待��タイムアウト����"
+#: commands/variable.c:589
+#, 
+msgid "transaction read-write mode must be set before any query"
+msgstr "トランザクションを読�書�モード�設定�る���何ら��クエリーを"
+"発行���れ��り��ん"
 
-#: libpq/auth.c:2819
-msgid "could not read RADIUS response: %m"
-msgstr "RADIUS 応答を読���ん����ん���: %m"
+#: commands/variable.c:595
+msgid "cannot set transaction read-write mode during recovery"
+msgstr "リカ�リー中��トランザクションを読�書�モード�設定����ん"
 
-#: libpq/auth.c:2834 libpq/auth.c:2838
-#, c-format
-msgid "RADIUS response was sent from incorrect port: %i"
-msgstr "RADIUS 応答�誤���ート�ら�られ���：%i"
+#: commands/variable.c:642
+msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
+msgstr ""
+"SET TRANSACTION ISOLATION LEVELを全����������呼�出���れ��り�"
+"�ん"
 
-#: libpq/auth.c:2847
-#, c-format
-msgid "RADIUS response too short: %i"
-msgstr "RADIUS 応答�短����：%i"
+#: commands/variable.c:649
+msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
+msgstr ""
+"SET TRANSACTION ISOLATION LEVELをサブトランザクション�呼�出����り��ん"
 
-#: libpq/auth.c:2854
-#, c-format
-msgid "RADIUS response has corrupt length: %i (actual length %i)"
-msgstr "RADIUS 応答�長��正���り��ん：%i（実際�長�� %i）"
+#: commands/variable.c:655
+#, 
+msgid "cannot use serializable mode in a hot standby"
+msgstr "ホットスタン�イ中�シリアライズモードを使用����ん"
 
-#: libpq/auth.c:2862
-#, c-format
-msgid "RADIUS response is to a different request: %i (should be %i)"
-msgstr "別�リクエスト�対�る RADIUS 応答��：%i（%i ��る��）"
+#: commands/variable.c:656
+#, 
+msgid "You can use REPEATABLE READ instead."
+msgstr "代�り� REPEATABLE READ を使������"
 
-#: libpq/auth.c:2887
-msgid "could not perform MD5 encryption of received packet"
-msgstr "�信パケット� MD5 暗�化�失敗����"
+#: commands/variable.c:704
+#, 
+msgid ""
+"SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
+msgstr "SET TRANSACTION [NOT] DEFERRABLE をサブトランザクション内部�"
+"呼�出����り��ん"
 
-#: libpq/auth.c:2896
-msgid "RADIUS response has incorrect MD5 signature"
-msgstr "RADIUS 応答� MD5 シグ��ャ�誤�����"
+#: commands/variable.c:710
+#, 
+msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
+msgstr "SET TRANSACTION [NOT] DEFERRABLE �������������"
+"呼�出���れ��り��ん"
 
-#: libpq/auth.c:2907
+#: commands/variable.c:792
 #, c-format
-msgid "RADIUS response has invalid code (%i) for user \"%s\""
-msgstr "ユーザ \"%2$s\" �対�る RADIUS 応答(%1$i)�無効��"
+msgid "Conversion between %s and %s is not supported."
+msgstr "%s � %s 間�変��サ�ート�れ����ん"
 
-#: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:163 libpq/be-fsstubs.c:189
-#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:518
-#, c-format
-msgid "invalid large-object descriptor: %d"
-msgstr "ラージオブジェクト記述��無効��: %d"
+#: commands/variable.c:799
+msgid "Cannot change \"client_encoding\" now."
+msgstr "�在� \"client_encoding\" を変更����ん"
 
-#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:528
+#: commands/variable.c:969
 #, c-format
-msgid "permission denied for large object %u"
-msgstr "ラージオブジェクト %u �対�る権���り��ん"
+msgid "permission denied to set role \"%s\""
+msgstr "ロール\"%s\"を設定�る権���り��ん"
 
-#: libpq/be-fsstubs.c:194
-#, c-format
-msgid "large object descriptor %d was not opened for writing"
-msgstr "ラージオブジェクト記述�%d�書�込�用�開�れ����ん���"
+#: commands/prepare.c:71
+msgid "invalid statement name: must not be empty"
+msgstr "文����無効��: 空������ん"
 
-#: libpq/be-fsstubs.c:392
-msgid "must be superuser to use server-side lo_import()"
-msgstr ""
-"サー�サイド�lo_import()を使用�る��スーパーユーザ���れ��り��ん"
+#: commands/prepare.c:140
+msgid "utility statements cannot be prepared"
+msgstr "ユーティリティ文を準備����ん"
 
-#: libpq/be-fsstubs.c:393
-msgid "Anyone can use the client-side lo_import() provided by libpq."
-msgstr "libpq��供�れるlo_import()�誰�も使用����"
+#: commands/prepare.c:240 commands/prepare.c:247 commands/prepare.c:706
+msgid "prepared statement is not a SELECT"
+msgstr "準備�れ�文�SELECT���り��ん"
 
-#: libpq/be-fsstubs.c:406
+#: commands/prepare.c:314
 #, c-format
-msgid "could not open server file \"%s\": %m"
-msgstr "サー�ファイル\"%s\"をオープン����ん���: %m"
+msgid "wrong number of parameters for prepared statement \"%s\""
+msgstr "準備�れ�文\"%s\"�パラメータ数�間������"
 
-#: libpq/be-fsstubs.c:428
+#: commands/prepare.c:316
 #, c-format
-msgid "could not read server file \"%s\": %m"
-msgstr "サー�ファイル\"%s\"を読��れ��ん���: %m"
+msgid "Expected %d parameters but got %d."
+msgstr "%dパラメータを想定������%dパラメータ���"
 
-#: libpq/be-fsstubs.c:458
-msgid "must be superuser to use server-side lo_export()"
-msgstr ""
-"サー�サイド�lo_export()を使用�る��スーパーユーザ���れ��り��ん"
+#: commands/prepare.c:345
+msgid "cannot use subquery in EXECUTE parameter"
+msgstr "EXECUTE�パラメータ�副�����を使用����ん"
 
-#: libpq/be-fsstubs.c:459
-msgid "Anyone can use the client-side lo_export() provided by libpq."
-msgstr "libpq��供�れるクライアントサイド�lo_export()�誰�も使用����"
+#: commands/prepare.c:349
+msgid "cannot use aggregate function in EXECUTE parameter"
+msgstr "EXECUTE�パラメータ�集約関数を使用����ん"
 
-#: libpq/be-fsstubs.c:483
-#, c-format
-msgid "could not create server file \"%s\": %m"
-msgstr "サー�ファイル\"%s\"を作�����ん���: %m"
+#: commands/prepare.c:353
+msgid "cannot use window function in EXECUTE parameter"
+msgstr "EXECUTE �パラメータ��ウィンドウ関数を使用����ん"
 
-#: libpq/be-fsstubs.c:495
+#: commands/prepare.c:366
 #, c-format
-msgid "could not write server file \"%s\": %m"
-msgstr "サー�ファイル\"%s\"を書�出���ん���: %m"
+msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
+msgstr "パラメータ$%d�型%sを想定���る型%s�強制�る�������ん"
 
-#: libpq/pqcomm.c:294
+#: commands/prepare.c:467
 #, c-format
-msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
-msgstr "ホスト�\"%s\"�サービス\"%s\"をアドレス�変�����ん���: %s"
+msgid "prepared statement \"%s\" already exists"
+msgstr "準備�れ�文\"%s\"����存在���"
 
-#: libpq/pqcomm.c:298
+#: commands/prepare.c:525
 #, c-format
-msgid "could not translate service \"%s\" to address: %s"
-msgstr "サービス\"%s\"をアドレス�変�����ん���: %s"
+msgid "prepared statement \"%s\" does not exist"
+msgstr "準備�れ�文\"%s\"�存在���ん"
 
-#: libpq/pqcomm.c:325
+#: commands/analyze.c:153
 #, c-format
-msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
+msgid "skipping analyze of \"%s\" --- lock not available"
 msgstr ""
-"�求�れ�アドレスを全��インド����ん���: MAXLISTEN (%d)を超����"
-"�"
-
-#: libpq/pqcomm.c:334
-msgid "IPv4"
-msgstr "IPv4"
 
-#: libpq/pqcomm.c:338
-msgid "IPv6"
-msgstr "IPv6"
+#: commands/analyze.c:170
+#, c-format
+msgid "skipping \"%s\" --- only superuser can analyze it"
+msgstr "\"%s\" をスキップ����� --- スーパーユーザ���解�����"
 
-#: libpq/pqcomm.c:343
-msgid "Unix"
-msgstr "Unix"
+#: commands/analyze.c:174
+#, c-format
+msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
+msgstr ""
+"\"%s\" をスキップ����� --- スーパーユーザ���データベース�所有者��"
+"�解�����"
 
-#: libpq/pqcomm.c:348
+#: commands/analyze.c:178
 #, c-format
-msgid "unrecognized address family %d"
-msgstr "アドレスファミリ %d を�識����ん"
+msgid "skipping \"%s\" --- only table or database owner can analyze it"
+msgstr ""
+"\"%s\" をスキップ����� --- テーブル���データベース�所有者���解�"
+"����"
 
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:359
+#: commands/analyze.c:194
 #, c-format
-msgid "could not create %s socket: %m"
-msgstr "%sソケットを作�����ん���: %m"
+msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
+msgstr ""
+"\"%s\" をスキップ����� --- テーブル���も�や特殊�システムテーブル"
+"を解��る�������ん"
 
-#: libpq/pqcomm.c:384
+#: commands/analyze.c:286
 #, c-format
-msgid "setsockopt(SO_REUSEADDR) failed: %m"
-msgstr "setsockopt(SO_REUSEADDR)�失敗����: %m"
+msgid "analyzing \"%s.%s\" inheritance tree"
+msgstr "\"%s.%s\"継承ツリーを解������"
 
-#: libpq/pqcomm.c:399
+#: commands/analyze.c:291
 #, c-format
-msgid "setsockopt(IPV6_V6ONLY) failed: %m"
-msgstr "setsockopt(IPV6_V6ONLY)�失敗����: %m"
+msgid "analyzing \"%s.%s\""
+msgstr "\"%s.%s\"を解������"
 
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:418
+#: commands/analyze.c:611
 #, c-format
-msgid "could not bind %s socket: %m"
-msgstr "%sソケットを�インド����ん���: %m"
+msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
+msgstr "テーブル\"%s.%s.%s�自動解�。システム使用状�: %s\""
 
-#: libpq/pqcomm.c:421
+#: commands/analyze.c:1252
 #, c-format
 msgid ""
-"Is another postmaster already running on port %d? If not, remove socket file "
-"\"%s\" and retry."
+"\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
+"rows; %d rows in sample, %.0f estimated total rows"
 msgstr ""
-"���他�postmaster��ート%d�稼動�����ん�? 稼動�����れ�ソケッ"
-"トファイル\"%s\"を削除��実行������"
+"\"%1$s\": %3$uページ�内%2$dをスキャン。%4$.0f�有効�行�%5$.0f����行を"
+"�有。%6$d行をサンプリング。推定�行数�%7$.0f"
 
-#: libpq/pqcomm.c:424
-#, c-format
-msgid ""
-"Is another postmaster already running on port %d? If not, wait a few seconds "
-"and retry."
-msgstr ""
-"���他�postmaster��ート%d�稼動�����ん�? 稼動�����れ�数秒"
-"待���ら�実行������"
+#: commands/cluster.c:134 commands/cluster.c:372
+msgid "cannot cluster temporary tables of other sessions"
+msgstr "他�セッション�一時テーブルをクラスタ化����ん"
 
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:457
+#: commands/cluster.c:164
 #, c-format
-msgid "could not listen on %s socket: %m"
-msgstr "%sソケットをlisten����ん���: %m"
+msgid "there is no previously clustered index for table \"%s\""
+msgstr "テーブル\"%s\"��事��クラスタ化�れ�インデックス��り��ん"
+
+#: commands/cluster.c:361
+msgid "cannot cluster a shared catalog"
+msgstr "共有カタログをクラスタ化����ん"
+
+#: commands/cluster.c:376
+msgid "cannot vacuum temporary tables of other sessions"
+msgstr "他�セッション�一時テーブル��キューム����ん"
 
-#: libpq/pqcomm.c:537
+#: commands/cluster.c:426
 #, c-format
-msgid "group \"%s\" does not exist"
-msgstr "グループ\"%s\"�存在���ん"
+msgid "\"%s\" is not an index for table \"%s\""
+msgstr "\"%s\"�テーブル\"%s\"�インデックス���り��ん"
 
-#: libpq/pqcomm.c:547
+#: commands/cluster.c:434
 #, c-format
-msgid "could not set group of file \"%s\": %m"
-msgstr "ファイル\"%s\"�グループを設定����ん���: %m"
+msgid ""
+"cannot cluster on index \"%s\" because access method does not support "
+"clustering"
+msgstr ""
+"インデックス\"%s\"�クラスタ化����ん。アクセスメソッド�クラスタ化をサ"
+"�ート�������"
 
-#: libpq/pqcomm.c:558
+#: commands/cluster.c:446
 #, c-format
-msgid "could not set permissions of file \"%s\": %m"
-msgstr "ファイル\"%s\"�権�を設定����ん���: %m"
+msgid "cannot cluster on partial index \"%s\""
+msgstr "部分インデックス\"%s\"をクラスタ化����ん"
 
-#: libpq/pqcomm.c:588
+#: commands/cluster.c:460
 #, c-format
-msgid "could not accept new connection: %m"
-msgstr "新��接続を��付�る�������ん���: %m"
+msgid "cannot cluster on invalid index \"%s\""
+msgstr "無効�インデックス\"%s\"をクラスタ化����ん"
 
-#: libpq/pqcomm.c:774 libpq/pqcomm.c:874
+#: commands/cluster.c:879
 #, c-format
-msgid "could not receive data from client: %m"
-msgstr "クライアント�らデータを�信����ん���: %m"
+msgid "clustering \"%s.%s\" using index scan on \"%s\""
+msgstr " \"%3$s\" �対�るインデックススキャンを使�� \"%1$s.%2$s\" を"
+"クラスタ化�����"
 
-#: libpq/pqcomm.c:849
-msgid "could not set socket to non-blocking mode: %m"
-msgstr "ソケットを�ブロッキングモード�設定����ん���: %m"
+#: commands/cluster.c:885
+#, c-format
+msgid "clustering \"%s.%s\" using sequential scan and sort"
+msgstr "シーケンシャルスキャン�ソートを使�� \"%s.%s\" をクラスタ化�����"
 
-#: libpq/pqcomm.c:895 libpq/pqcomm.c:906
-msgid "could not set socket to blocking mode: %m"
-msgstr "ソケットをブロッキングモード�設定����ん���: %m"
+#: commands/cluster.c:1050
+#, c-format
+msgid ""
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
+msgstr "\"%1$s\": 全 %4$u ページ中�見����行�ージョン"
+"：移動�能 %2$.0f 行�削除�� %3$.0f 行"
 
-#: libpq/pqcomm.c:1051
-msgid "unexpected EOF within message length word"
-msgstr "メッセージ長ワード内�EOF�想定外��"
+#: commands/cluster.c:1054
+#, c-format
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"%s."
+msgstr "%.0f 個�無効�行を今���削除����ん。\n"
+"%s."
 
-#: libpq/pqcomm.c:1062
-msgid "invalid message length"
-msgstr "メッセージ長�無効��"
+#: commands/portalcmds.c:61 commands/portalcmds.c:160
+#: commands/portalcmds.c:212
+msgid "invalid cursor name: must not be empty"
+msgstr "カーソル��無効��: 空������ん"
 
-#: libpq/pqcomm.c:1084 libpq/pqcomm.c:1094
-msgid "incomplete message from client"
-msgstr "クライアント�ら�メッセージ��完全��"
+#: commands/portalcmds.c:409
+msgid "could not reposition held cursor"
+msgstr "����カーソル��置を変更����ん���"
 
-#: libpq/pqcomm.c:1203
+#: commands/functioncmds.c:100
 #, c-format
-msgid "could not send data to client: %m"
-msgstr "クライアント�データを�信����ん���: %m"
+msgid "SQL function cannot return shell type %s"
+msgstr "SQL関数�シェル型%sを����������ん"
 
-#: libpq/be-secure.c:283 libpq/be-secure.c:378
+#: commands/functioncmds.c:105
 #, c-format
-msgid "SSL error: %s"
-msgstr "SSLエラー��: %s"
+msgid "return type %s is only a shell"
+msgstr "戻り値型%s���るシェル��"
 
-#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:951
+#: commands/functioncmds.c:140
 #, c-format
-msgid "unrecognized SSL error code: %d"
-msgstr "SSLエラーコード��明��: %d"
-
-#: libpq/be-secure.c:331 libpq/be-secure.c:335 libpq/be-secure.c:345
-msgid "SSL renegotiation failure"
-msgstr "SSL�調��失敗"
+msgid "type \"%s\" is not yet defined"
+msgstr "型\"%s\"�未定義��"
 
-#: libpq/be-secure.c:339
-msgid "SSL failed to send renegotiation request"
-msgstr "SSL��調��求��信�失敗����"
+#: commands/functioncmds.c:141
+msgid "Creating a shell type definition."
+msgstr "シェル型定義を作������"
 
-#: libpq/be-secure.c:736
+#: commands/functioncmds.c:220
 #, c-format
-msgid "could not create SSL context: %s"
-msgstr "SSLコンテキストを作�����ん���: %s"
+msgid "SQL function cannot accept shell type %s"
+msgstr "SQL関数�シェル型\"%s\"を��付�られ��ん"
 
-#: libpq/be-secure.c:746
+#: commands/functioncmds.c:225
 #, c-format
-msgid "could not load server certificate file \"%s\": %s"
-msgstr "サー�証明書ファイル\"%s\"をロード����ん���: %s"
+msgid "argument type %s is only a shell"
+msgstr "引数型%s���るシェル��"
 
-#: libpq/be-secure.c:752
+#: commands/functioncmds.c:235
 #, c-format
-msgid "could not access private key file \"%s\": %m"
-msgstr "秘密キーファイル\"%s\"�アクセス����ん���: %m"
+msgid "type %s does not exist"
+msgstr "型%s�存在���ん"
 
-#: libpq/be-secure.c:767
-#, c-format
-msgid "private key file \"%s\" has group or world access"
-msgstr "秘密キーファイル \"%s\" �グループ���全員�らアクセス�能��"
+#: commands/functioncmds.c:243
+msgid "functions cannot accept set arguments"
+msgstr "関数�集�を引数�����付�られ��ん"
 
-#: libpq/be-secure.c:769
-msgid "Permissions should be u=rw (0600) or less."
-msgstr "権��u=rwx(0700)���れ��り��ん"
+#: commands/functioncmds.c:252
+msgid "VARIADIC parameter must be the last input parameter"
+msgstr "VARIADIC パラメータ�最後�入力パラメータ���れ��り��ん"
 
-#: libpq/be-secure.c:776
-#, c-format
-msgid "could not load private key file \"%s\": %s"
-msgstr "秘密キーファイル\"%s\"をロード����ん���: %s"
+#: commands/functioncmds.c:279
+msgid "VARIADIC parameter must be an array"
+msgstr "VARIADIC パラメータ��列���れ��り��ん"
 
-#: libpq/be-secure.c:781
+#: commands/functioncmds.c:319
 #, c-format
-msgid "check of private key failed: %s"
-msgstr "秘密キー�検査�失敗����: %s"
+msgid "parameter name \"%s\" used more than once"
+msgstr "パラメータ \"%s\" �複数指定�れ���"
 
-#: libpq/be-secure.c:809
-#, c-format
-msgid "could not access root certificate file \"%s\": %m"
-msgstr "ルート証明ファイル \"%s\" �アクセス����ん���: %m"
+#: commands/functioncmds.c:334
+msgid "only input parameters can have default values"
+msgstr "入力パラメータ���デフォルト値を����"
 
-#: libpq/be-secure.c:820
-#, c-format
-msgid "could not load root certificate file \"%s\": %s"
-msgstr "ルート証明ファイル\"%s\"をロード����ん���: %s"
+#: commands/functioncmds.c:347
+msgid "cannot use table references in parameter default value"
+msgstr "パラメータ�デフォルト値���テーブル�照を使用����ん"
 
-#: libpq/be-secure.c:843
-#, c-format
-msgid "SSL certificate revocation list file \"%s\" ignored"
-msgstr "SSL証明書失効リストファイル\"%s\"�無視�れ���"
+#: commands/functioncmds.c:363
+msgid "cannot use subquery in parameter default value"
+msgstr "パラメータ�デフォルト値���副�����を使用����ん"
 
-#: libpq/be-secure.c:845
-msgid "SSL library does not support certificate revocation lists."
-msgstr "SSLライブラリ�証明書失効リストをサ�ート�����ん。"
+#: commands/functioncmds.c:367
+msgid "cannot use aggregate function in parameter default value"
+msgstr "パラメータ�デフォルト値���集約関数を使用����ん"
 
-#: libpq/be-secure.c:852
-#, c-format
-msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
-msgstr "SSL証明書失効リストファイル\"%s\"��り��ん。�略���: %s"
+#: commands/functioncmds.c:371
+msgid "cannot use window function in parameter default value"
+msgstr "パラメータ�デフォルト値���ウィンドウ関数を使用����ん"
 
-#: libpq/be-secure.c:854
-msgid "Certificates will not be checked against revocation list."
-msgstr "証明書�失効リスト�対��検査�れ��ん。"
+#: commands/functioncmds.c:381
+msgid "input parameters after one with a default value must also have defaults"
+msgstr ""
+"デフォルト値を��パラメータ�後��る入力パラメータ��必�デフォルト値を�"
+"���れ��り��ん"
 
-#: libpq/be-secure.c:896
+#: commands/functioncmds.c:620
+msgid "no function body specified"
+msgstr "関数本体�指定��り��ん"
+
+#: commands/functioncmds.c:630
+msgid "no language specified"
+msgstr "言語�指定�れ����ん"
+
+#: commands/functioncmds.c:651 commands/functioncmds.c:1352
+msgid "COST must be positive"
+msgstr "コスト�正数���れ��り��ん"
+
+#: commands/functioncmds.c:659 commands/functioncmds.c:1360
+msgid "ROWS must be positive"
+msgstr "ROWS�正数���れ��り��ん"
+
+#: commands/functioncmds.c:698
 #, c-format
-msgid "could not initialize SSL connection: %s"
-msgstr "SSL接続を�期化����ん���: %s"
+msgid "unrecognized function attribute \"%s\" ignored"
+msgstr "�明�関数属性\"%s\"�無視����"
 
-#: libpq/be-secure.c:905
+#: commands/functioncmds.c:749
 #, c-format
-msgid "could not set SSL socket: %s"
-msgstr "SSLソケットを設定����ん���: %s"
+msgid "only one AS item needed for language \"%s\""
+msgstr "言語\"%s\"��AS項目�1���必���"
 
-#: libpq/be-secure.c:931
+#: commands/functioncmds.c:839 commands/functioncmds.c:2019
+#: commands/proclang.c:602 commands/proclang.c:642 commands/proclang.c:756
 #, c-format
-msgid "could not accept SSL connection: %m"
-msgstr "SSL接続を��付�られ��ん���: %m"
+msgid "language \"%s\" does not exist"
+msgstr "言語\"%s\"�存在���ん"
 
-#: libpq/be-secure.c:935 libpq/be-secure.c:946
-msgid "could not accept SSL connection: EOF detected"
-msgstr "SSL接続を��付�られ��ん���: EOFを検出����"
+#: commands/functioncmds.c:841 commands/functioncmds.c:2021
+msgid "Use CREATE LANGUAGE to load the language into the database."
+msgstr "言語をデータベース�読�込む����CREATE LANGUAGEを使用������"
 
-#: libpq/be-secure.c:940
+#: commands/functioncmds.c:888
 #, c-format
-msgid "could not accept SSL connection: %s"
-msgstr "SSL接続を��付�られ��ん���: %s"
+msgid "function result type must be %s because of OUT parameters"
+msgstr "OUTパラメータ����関数�戻り値型�%s���れ��り��ん。"
 
-#: libpq/be-secure.c:991
-msgid "SSL certificate's common name contains embedded null"
-msgstr "SSL 証明書�コモン�ーム� null ���れ����"
+#: commands/functioncmds.c:901
+msgid "function result type must be specified"
+msgstr "関数��果型を指定���れ��り��ん"
 
-#: libpq/be-secure.c:998
+#: commands/functioncmds.c:936 commands/functioncmds.c:1364
+msgid "ROWS is not applicable when function does not return a set"
+msgstr "関数�集�を返�場��ROWS�������ん"
+
+#: commands/functioncmds.c:988
 #, c-format
-msgid "SSL connection from \"%s\""
-msgstr "\"%s\"�ら�SSL接続"
+msgid "function %s(%s) does not exist, skipping"
+msgstr "関数%s(%s)�存在���ん。�略���"
 
-#: libpq/be-secure.c:1042
-msgid "no SSL error reported"
-msgstr "SSLエラー��り��ん���"
+#: commands/functioncmds.c:1010
+msgid "Use DROP AGGREGATE to drop aggregate functions."
+msgstr "集約関数を削除�る��DROP AGGREGATEを使用������"
 
-#: libpq/be-secure.c:1046
+#: commands/functioncmds.c:1017
 #, c-format
-msgid "SSL error code %lu"
-msgstr "SSLエラーコード: %lu"
-
-#: libpq/pqformat.c:436
-msgid "no data left in message"
-msgstr "メッセージ内�データ�残�����ん"
+msgid "removing built-in function \"%s\""
+msgstr "組�込�関数\"%s\"を削除�����"
 
-#: libpq/pqformat.c:636
-msgid "invalid string in message"
-msgstr "メッセージ内�文字列�無効��"
+#: commands/functioncmds.c:1110
+msgid "Use ALTER AGGREGATE to rename aggregate functions."
+msgstr "集約関数���を変更�る��ALTER AGGREGATEを使用������。"
 
-#: libpq/pqformat.c:652
-msgid "invalid message format"
-msgstr "メッセージ�書��無効��"
+#: commands/functioncmds.c:1173
+msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
+msgstr "集約関数�所有者を変更�る��ALTER AGGREGATEを使用������。"
 
-#: libpq/hba.c:158
+#: commands/functioncmds.c:1511
 #, c-format
-msgid "authentication file token too long, skipping: \"%s\""
-msgstr "�証ファイル�トークン�長�������飛����: \"%s\""
+msgid "source data type %s is a pseudo-type"
+msgstr "変�元データ型%s�仮想型��"
 
-#: libpq/hba.c:351
+#: commands/functioncmds.c:1517
 #, c-format
-msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
-msgstr ""
-"セカンダリ�証ファイル\"@%s\"を\"%s\"���オープン����ん���: %m"
+msgid "target data type %s is a pseudo-type"
+msgstr "変�先データ型%s�仮想型��"
 
-#. translator: the second %s is a list of auth methods
-#: libpq/hba.c:651
-#, c-format
+#: commands/functioncmds.c:1554
+msgid "cast function must take one to three arguments"
+msgstr "キャスト関数�引数�1��ら3������れ��り��ん"
+
+#: commands/functioncmds.c:1558
 msgid ""
-"authentication option \"%s\" is only valid for authentication methods %s"
-msgstr "�証オプション\"%s\"��証方�%s���有効��"
+"argument of cast function must match or be binary-coercible from source data "
+"type"
+msgstr ""
+"キャスト関数�引数�変�元データ型�一致�る������イナリ型を強����"
+"�れ��り��ん"
 
-#: libpq/hba.c:667
-#, c-format
-msgid "authentication method \"%s\" requires argument \"%s\" to be set"
-msgstr "�証方�\"%s\"�場��引数\"%s\"�セット�れ��れ��り��ん"
+#: commands/functioncmds.c:1562
+msgid "second argument of cast function must be type integer"
+msgstr "キャスト関数�第2引数�整数型���れ��り��ん"
 
-#: libpq/hba.c:713
-msgid "hostssl not supported on this platform"
-msgstr "��プラットフォーム�� hostssl をサ�ート�����ん"
+#: commands/functioncmds.c:1566
+msgid "third argument of cast function must be type boolean"
+msgstr "キャスト関数�第3引数�論�型���れ��り��ん"
 
-#: libpq/hba.c:714
-msgid "Compile with --with-openssl to use SSL connections."
-msgstr "SSL 接続を有効��る�� --with-openssl �コンパイル������"
+#: commands/functioncmds.c:1570
+msgid ""
+"return data type of cast function must match or be binary-coercible to "
+"target data type"
+msgstr ""
+"キャスト関数�戻り値データ型�変�後データ型�一致�る������イナリ型を"
+"強�����れ��り��ん"
 
-#: libpq/hba.c:736
-#, c-format
-msgid "invalid connection type \"%s\""
-msgstr "接続オプションタイプ \"%s\" �無効��"
+#: commands/functioncmds.c:1581
+msgid "cast function must not be volatile"
+msgstr "キャスト関数�volatile������ん"
 
-#: libpq/hba.c:749
-msgid "end-of-line before database specification"
-msgstr "データベース指定���行末を検出����"
+#: commands/functioncmds.c:1586
+msgid "cast function must not be an aggregate function"
+msgstr "キャスト関数�集約関数������ん"
 
-#: libpq/hba.c:762
-msgid "end-of-line before role specification"
-msgstr "ロール指定���行末を検出����"
+#: commands/functioncmds.c:1590
+msgid "cast function must not be a window function"
+msgstr "キャスト関数�集約関数������ん"
 
-#: libpq/hba.c:777
-msgid "end-of-line before IP address specification"
-msgstr "IP アドレス指定���行末を検出����"
+#: commands/functioncmds.c:1594
+msgid "cast function must not return a set"
+msgstr "キャスト関数�集�を返�������ん"
 
-#: libpq/hba.c:823
-#, c-format
-msgid "invalid IP address \"%s\": %s"
-msgstr "IP アドレス \"%s\" �有効���り��ん: %s"
+#: commands/functioncmds.c:1620
+msgid "must be superuser to create a cast WITHOUT FUNCTION"
+msgstr ""
+"WITHOUT FUNCTION�付��キャストを作��る��スーパーユーザ���れ��り�"
+"�ん"
 
-#: libpq/hba.c:846
-#, c-format
-msgid "invalid CIDR mask in address \"%s\""
-msgstr "IP アドレス \"%s\" 内� CIDR マスク�無効��"
+#: commands/functioncmds.c:1635
+msgid "source and target data types are not physically compatible"
+msgstr "変�元�変�先�データ型�間��物�的�互�性��り��ん"
 
-#: libpq/hba.c:864
-msgid "end-of-line before netmask specification"
-msgstr "�ットマスク指定���行末を検出����"
+#: commands/functioncmds.c:1650
+msgid "composite data types are not binary-compatible"
+msgstr "複�データ型��イナリ互����り��ん"
 
-#: libpq/hba.c:876
-#, c-format
-msgid "invalid IP mask \"%s\": %s"
-msgstr "IP マスク \"%s\" �有効���り��ん: %s"
+#: commands/functioncmds.c:1656
+msgid "enum data types are not binary-compatible"
+msgstr "列挙データ型��イナリ互����り��ん"
 
-#: libpq/hba.c:893
-msgid "IP address and mask do not match"
-msgstr "IPアドレス�マスク�一致���ん"
+#: commands/functioncmds.c:1662
+msgid "array data types are not binary-compatible"
+msgstr "�列データ型��イナリ互����り��ん"
 
-#: libpq/hba.c:908
-msgid "end-of-line before authentication method"
-msgstr "�証方�指定���行末を検出����"
+#: commands/functioncmds.c:1679
+#, 
+msgid "domain data types must not be marked binary-compatible"
+msgstr "ドメインデータ型��イナリ互����マーク�れ�����り��ん"
+
+#: commands/functioncmds.c:1689
+msgid "source data type and target data type are the same"
+msgstr "変�元�変�先�データ型��一��"
 
-#: libpq/hba.c:979
+#: commands/functioncmds.c:1722
 #, c-format
-msgid "invalid authentication method \"%s\""
-msgstr "�証方� \"%s\" �有効���り��ん"
+msgid "cast from type %s to type %s already exists"
+msgstr "型%s�ら型%s��キャスト����存在�����"
 
-#: libpq/hba.c:990
+#: commands/functioncmds.c:1803
 #, c-format
-msgid "invalid authentication method \"%s\": not supported on this platform"
-msgstr "無効��証方� \"%s\"：��プラットフォーム��サ�ート�れ����ん"
+msgid "cast from type %s to type %s does not exist, skipping"
+msgstr "型%s�ら型%s��キャスト�存在���ん。�略���"
 
-#: libpq/hba.c:1003
-msgid "krb5 authentication is not supported on local sockets"
-msgstr "ローカルソケット上� KRB5 �証�サ�ート�����ん"
+#: commands/functioncmds.c:1841
+#, c-format
+msgid "cast from type %s to type %s does not exist"
+msgstr "型%s�ら型%s��キャスト�存在���ん"
 
-#: libpq/hba.c:1014
-msgid "gssapi authentication is not supported on local sockets"
-msgstr "ローカルソケット�� gssapi �証をサ�ート�����ん"
+#: commands/functioncmds.c:1929
+#, c-format
+msgid "function \"%s\" already exists in schema \"%s\""
+msgstr "関数\"%s\"����スキーマ\"%s\"内�存在���"
 
-#: libpq/hba.c:1031
-msgid "cert authentication is only supported on hostssl connections"
-msgstr "hostssl 接続��証明書�証��をサ�ート�����"
+#: commands/functioncmds.c:2003
+msgid "no inline code specified"
+msgstr "インラインコード�指定��り��ん"
 
-#: libpq/hba.c:1052
+#: commands/functioncmds.c:2051
 #, c-format
-msgid "authentication option not in name=value format: %s"
-msgstr "�証オプション� ��=値 形��������ん：%s"
+msgid "language \"%s\" does not support inline code execution"
+msgstr "言語 \"%s\" ��インラインコード実行をサ�ート�����ん"
 
-#: libpq/hba.c:1067
-msgid "ident, krb5, gssapi, sspi and cert"
-msgstr "ident�krb5�gssapi�sspi�よ�cert"
+#: commands/async.c:567
+msgid "channel name cannot be empty"
+msgstr "�ャ�ル��空��る�������ん"
 
-#: libpq/hba.c:1081
-msgid "clientcert can only be configured for \"hostssl\" rows"
-msgstr "クライアント証明書� \"hostssl\" �行���設定����"
+#: commands/async.c:572
+msgid "channel name too long"
+msgstr "�ャ�ル��長����"
+
+#: commands/async.c:579
+msgid "payload string too long"
+msgstr "ペイロード文字列�長����"
 
-#: libpq/hba.c:1092
+#: commands/async.c:763
 msgid ""
-"client certificates can only be checked if a root certificate store is "
-"available"
+"cannot PREPARE a transaction that has executed LISTEN, UNLISTEN or NOTIFY"
 msgstr ""
-"クライアント証明書�ルート証明書ストア�利用��る場����検証�れ��"
-
-#: libpq/hba.c:1093
-msgid "Make sure the root.crt file is present and readable."
-msgstr "root.crt ファイル�存在����読�る状態�����る��を確�������"
+"��� LISTEN / UNLISTEN / NOTIFY を実行��トランザクション� PREPARE ���"
+"�ん"
 
-#: libpq/hba.c:1106
-msgid "clientcert can not be set to 0 when using \"cert\" authentication"
-msgstr "\"cert\" �証を使�場�� clientcert � 0 ������り��ん"
+#: commands/async.c:868
+msgid "too many notifications in the NOTIFY queue"
+msgstr "NOTIFY キュー�発生��通知イベント�多����"
 
-#: libpq/hba.c:1140
+#: commands/async.c:1430
 #, c-format
-msgid "invalid LDAP port number: \"%s\""
-msgstr "無効�LDAP�ート番���: \"%s\""
-
-#: libpq/hba.c:1186 libpq/hba.c:1194
-msgid "krb5, gssapi and sspi"
-msgstr "krb5�gssapi�よ�sspi"
-
-#: libpq/hba.c:1232
-msgid "invalid RADIUS port number: \"%s\""
-msgstr "無効� RADIUS �ート番���: \"%s\""
-
-#: libpq/hba.c:1252
-msgid "unrecognized authentication option name: \"%s\""
-msgstr "�証オプション�を�識����ん: \"%s\""
+msgid "NOTIFY queue is %.0f%% full"
+msgstr "NOTYFY キュー� %.0f%% ��一��������"
 
-#: libpq/hba.c:1284
+#: commands/async.c:1432
+#, c-format
 msgid ""
-"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
-"together with ldapprefix"
-msgstr ""
-"ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute ��"
-"ldapprefix ��時��指定����ん"
+"The server process with PID %d is among those with the oldest transactions."
+msgstr "PID %d �サー�プロセス��最も��トランザクション中��り��。"
 
-#: libpq/hba.c:1294
+#: commands/async.c:1435
 msgid ""
-"authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
-"\", or \"ldapsuffix\" to be set"
+"The NOTIFY queue cannot be emptied until that process ends its current "
+"transaction."
 msgstr ""
-"\"ldap\" �証方��場��引数  \"ldapbasedn\", \"ldapprefix\" "
-"\"ldapsuffix\" ���れ�を指定������"
+"プロセス��在�トランザクションを終了�る�� NOTYFY キューを空��る���"
+"����ん"
 
-#: libpq/hba.c:1614
+#: commands/tsearchcmds.c:117 commands/tsearchcmds.c:1044
 #, c-format
-msgid "invalid regular expression \"%s\": %s"
-msgstr "正�表�\"%s\"�無効��: %s"
+msgid "function %s should return type %s"
+msgstr "関数%s�型%sを返��������ん"
 
-#: libpq/hba.c:1637
-#, c-format
-msgid "regular expression match for \"%s\" failed: %s"
-msgstr "正�表�\"%s\"�マッ�ング�失敗����: %s"
+#: commands/tsearchcmds.c:189
+msgid "must be superuser to create text search parsers"
+msgstr "テキスト検索パーサを作��る��スーパーユーザ���れ��り��ん"
 
-#: libpq/hba.c:1655
+#: commands/tsearchcmds.c:237
 #, c-format
-msgid ""
-"regular expression \"%s\" has no subexpressions as requested by "
-"backreference in \"%s\""
-msgstr ""
-"正�表�\"%s\"��\"%s\"���る後方�照��求�る副表�����れ����ん"
+msgid "text search parser parameter \"%s\" not recognized"
+msgstr "テキスト検索パーサ\"%s\"��明��"
 
-#: libpq/hba.c:1721
-#, c-format
-msgid "missing entry in file \"%s\" at end of line %d"
-msgstr "ファイル\"%s\"�最終行%d�エントリ�足り��ん"
+#: commands/tsearchcmds.c:247
+msgid "text search parser start method is required"
+msgstr "テキスト検索パーサ�開始メソッド�必���"
 
-#: libpq/hba.c:1762
-msgid "provided user name (%s) and authenticated user name (%s) do not match"
-msgstr "与�られ�ユーザー� (%s) ��証�れ�ユーザー� (%s) �一致���ん"
+#: commands/tsearchcmds.c:252
+msgid "text search parser gettoken method is required"
+msgstr "テキスト検索パーサ�gettokenメソッド�必���"
 
-#: libpq/hba.c:1783
-msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
-msgstr "\"%3$s\"����証�れ�ユーザ \"%2$s\" �ユーザマップ \"%1$s\" �一致���ん"
+#: commands/tsearchcmds.c:257
+msgid "text search parser end method is required"
+msgstr "テキスト検索パーサ�終了メソッド�必���"
 
-#: libpq/hba.c:1807
-msgid "could not open usermap file \"%s\": %m"
-msgstr "ユーザマップファイル \"%s\" をオープン����ん���: %m"
+#: commands/tsearchcmds.c:262
+msgid "text search parser lextypes method is required"
+msgstr "テキスト検索パーサ�lextypesメソッド�必���"
 
-#: parser/scansup.c:190
-msgid "identifier \"%s\" will be truncated to \"%s\""
-msgstr "識別� \"%s\" を \"%s\" �切り詰���"
+#: commands/tsearchcmds.c:297
+msgid "must be superuser to drop text search parsers"
+msgstr "テキスト検索パーサを削除�る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_type.c:83
+#: commands/tsearchcmds.c:326
 #, c-format
-msgid "improper %%TYPE reference (too few dotted names): %s"
-msgstr "%%TYPE�照���切��(ドット付�����少�����: %s"
+msgid "text search parser \"%s\" does not exist, skipping"
+msgstr "テキスト検索パーサ\"%s\"�存在���ん。�略���"
 
-#: parser/parse_type.c:105
-#, c-format
-msgid "improper %%TYPE reference (too many dotted names): %s"
-msgstr "%%TYPE�照���切��(ドット付�����多����: %s"
+#: commands/tsearchcmds.c:381
+msgid "must be superuser to rename text search parsers"
+msgstr ""
+"テキスト検索パーサ���を変更�る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_type.c:127
+#: commands/tsearchcmds.c:399
 #, c-format
-msgid "type reference %s converted to %s"
-msgstr "型�照%s�%s�変��れ���"
+msgid "text search parser \"%s\" already exists"
+msgstr "テキスト検索パーサ\"%s\"����存在���"
 
-#: parser/parse_type.c:270
+#: commands/tsearchcmds.c:525
 #, c-format
-msgid "type modifier is not allowed for type \"%s\""
-msgstr "型\"%s\"��型修正��許�れ��ん"
+msgid "text search template \"%s\" does not accept options"
+msgstr "テキスト検索テンプレート\"%s\"�オプションを��付���ん"
 
-#: parser/parse_type.c:313
-msgid "type modifiers must be simple constants or identifiers"
-msgstr "型修正���純�定数���識別����れ��り��ん"
+#: commands/tsearchcmds.c:598
+msgid "text search template is required"
+msgstr "テキスト検索テンプレート�必���"
 
-#: parser/parse_type.c:548 parser/parse_type.c:647
+#: commands/tsearchcmds.c:667
 #, c-format
-msgid "invalid type name \"%s\""
-msgstr "型���\"%s\"�無効��"
+msgid "text search dictionary \"%s\" already exists"
+msgstr "テキスト検索辞書\"%s\"����存在���"
 
-#: parser/parse_oper.c:254 parser/parse_agg.c:127
+#: commands/tsearchcmds.c:775
 #, c-format
-msgid "could not identify an ordering operator for type %s"
-msgstr "型%s�順�演算�を識別����ん���"
+msgid "text search dictionary \"%s\" does not exist, skipping"
+msgstr "テキスト検索辞書\"%s\"�存在���ん。�略���"
 
-#: parser/parse_oper.c:256
-msgid "Use an explicit ordering operator or modify the query."
-msgstr "明示的�順�演算�を使用�る������を変更������"
+#: commands/tsearchcmds.c:1108
+msgid "must be superuser to create text search templates"
+msgstr ""
+"テキスト検索テンプレートを作��る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_oper.c:509
+#: commands/tsearchcmds.c:1145
 #, c-format
-msgid "operator requires run-time type coercion: %s"
-msgstr "演算��実行時�型強制�必���: %s"
+msgid "text search template parameter \"%s\" not recognized"
+msgstr "テキスト検索テンプレート�パラメータ\"%s��明��。"
 
-#: parser/parse_oper.c:743
-#, c-format
-msgid "operator is not unique: %s"
-msgstr "演算��一����り��ん: %s"
+#: commands/tsearchcmds.c:1155
+msgid "text search template lexize method is required"
+msgstr "テキスト検索テンプレート�lexizeメソッド�必���"
 
-#: parser/parse_oper.c:745
-msgid ""
-"Could not choose a best candidate operator. You might need to add explicit "
-"type casts."
+#: commands/tsearchcmds.c:1193
+msgid "must be superuser to rename text search templates"
 msgstr ""
-"最善�候補演算�を�択����ん���。明示的�型キャスト�必��も�れ��"
+"テキスト検索テンプレート���を変更�る��スーパーユーザ���れ��り��"
 "ã‚“"
 
-#: parser/parse_oper.c:753
-msgid ""
-"No operator matches the given name and argument type(s). You might need to "
-"add explicit type casts."
-msgstr ""
-"指定�称�指定引数型���演算���り��ん。明示的�型キャスト�必��も�"
-"れ��ん"
-
-#: parser/parse_oper.c:812 parser/parse_oper.c:925
+#: commands/tsearchcmds.c:1212
 #, c-format
-msgid "operator is only a shell: %s"
-msgstr "演算����るシェル��：%s"
-
-#: parser/parse_oper.c:913
-msgid "op ANY/ALL (array) requires array on right side"
-msgstr "演算� ANY/ALL (�列) �����列�必���"
+msgid "text search template \"%s\" already exists"
+msgstr "テキスト検索テンプレート\"%s\"����存在���"
 
-#: parser/parse_oper.c:955
-msgid "op ANY/ALL (array) requires operator to yield boolean"
-msgstr "演算� ANY/ALL (�列) �演算��ブール型を返���れ��り��ん"
+#: commands/tsearchcmds.c:1281
+msgid "must be superuser to drop text search templates"
+msgstr ""
+"テキスト検索テンプレートを削除�る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_oper.c:960
-msgid "op ANY/ALL (array) requires operator not to return a set"
-msgstr "演算� ANY/ALL (�列) �演算��集�を返�������ん"
+#: commands/tsearchcmds.c:1310
+#, c-format
+msgid "text search template \"%s\" does not exist, skipping"
+msgstr "テキスト検索テンプレート\"%s\"�存在���ん。�略���"
 
-#: parser/parse_oper.c:980 parser/parse_coerce.c:1568
-#: parser/parse_coerce.c:1585 parser/parse_coerce.c:1643
-#: parser/parse_expr.c:1692 parser/parse_func.c:354 nodes/nodeFuncs.c:110
-#: nodes/nodeFuncs.c:136
+#: commands/tsearchcmds.c:1509
 #, c-format
-msgid "could not find array type for data type %s"
-msgstr "データ型%s��列型��り��ん���"
+msgid "text search configuration parameter \"%s\" not recognized"
+msgstr "テキスト検索設定�パラメータ\"%s\"��明��"
 
-#: parser/parse_utilcmd.c:306
-msgid "array of serial is not implemented"
-msgstr "連番(SERIAL)��列�実装�れ����ん"
+#: commands/tsearchcmds.c:1516
+msgid "cannot specify both PARSER and COPY options"
+msgstr "PARSER�COPYオプションを����指定����ん"
+
+#: commands/tsearchcmds.c:1544
+msgid "text search parser is required"
+msgstr "テキスト検索パーサ�必���"
 
-#: parser/parse_utilcmd.c:350
+#: commands/tsearchcmds.c:1653
 #, c-format
-msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
-msgstr ""
-"%1$s�シリアル列\"%3$s.%4$s\"用�暗黙的�シーケンス\"%2$s\"を作����。"
+msgid "text search configuration \"%s\" already exists"
+msgstr "テキスト検索設定\"%s\"����存在���"
 
-#: parser/parse_utilcmd.c:439 parser/parse_utilcmd.c:451
+#: commands/tsearchcmds.c:1760
 #, c-format
-msgid ""
-"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
-msgstr "テーブル\"%2$s\"�列\"%1$s\"�NULL宣言�NOT NULL宣言�競������"
+msgid "text search configuration \"%s\" does not exist, skipping"
+msgstr "テキスト検索設定\"%s�存在���ん。�略���"
 
-#: parser/parse_utilcmd.c:463
+#: commands/tsearchcmds.c:1982
 #, c-format
-msgid "multiple default values specified for column \"%s\" of table \"%s\""
-msgstr "テーブル\"%2$s\"�列\"%1$s\"�複数�デフォルト値�指定��り��"
+msgid "token type \"%s\" does not exist"
+msgstr "トークン型\"%s\"�存在���ん"
 
-#: parser/parse_utilcmd.c:820
-msgid "type %s is not a composite type"
-msgstr "型 %s �複�型���り��ん"
+#: commands/tsearchcmds.c:2204
+#, c-format
+msgid "mapping for token type \"%s\" does not exist"
+msgstr "トークン型\"%s\"�対�るマップ�存在���ん"
 
-#: parser/parse_utilcmd.c:1445
+#: commands/tsearchcmds.c:2210
 #, c-format
-msgid "column \"%s\" appears twice in primary key constraint"
-msgstr "列\"%s\"�プライマリキー制約内�2回出����"
+msgid "mapping for token type \"%s\" does not exist, skipping"
+msgstr "トークン型\"%s\"�対�るマップ�存在���ん。�略���"
 
-#: parser/parse_utilcmd.c:1450
+#: commands/tsearchcmds.c:2363 commands/tsearchcmds.c:2474
 #, c-format
-msgid "column \"%s\" appears twice in unique constraint"
-msgstr "列 \"%s\" �一�性制約内�2回出����"
+msgid "invalid parameter list format: \"%s\""
+msgstr "無効�パラメータリスト�書���: \"%s\""
 
-#: parser/parse_utilcmd.c:1603
-msgid "index expression cannot return a set"
-msgstr "�インデックス�集�を返��������ん"
+#: commands/extension.c:147 commands/extension.c:2431
+#, c-format
+msgid "extension \"%s\" does not exist"
+msgstr "拡張機能 \"%s\" �存在���ん"
 
-#: parser/parse_utilcmd.c:1613
-msgid ""
-"index expressions and predicates can refer only to the table being indexed"
-msgstr "インデックス��術後�インデックス付��れるテーブル��を�照����"
+#: commands/extension.c:246 commands/extension.c:255 commands/extension.c:267
+#: commands/extension.c:277
+#, c-format
+msgid "invalid extension name: \"%s\""
+msgstr "拡張機能��無効��: \"%s\""
 
-#: parser/parse_utilcmd.c:1708
-msgid "rule WHERE condition cannot contain references to other relations"
-msgstr "ルール�WHERE�件�他�リレーション���照を���られ��ん"
+#: commands/extension.c:247
+#, 
+msgid "Extension names must not be empty."
+msgstr "拡張機能��無効��: 空������り��ん"
 
-#: parser/parse_utilcmd.c:1714
-msgid "cannot use aggregate function in rule WHERE condition"
-msgstr "ルール�WHERE�件��集約関数を使用����ん"
+#: commands/extension.c:256
+#, 
+msgid "Extension names must not contain \"--\"."
+msgstr "拡張機能�� \"--\" ���れ�����り��ん"
 
-#: parser/parse_utilcmd.c:1718
-msgid "cannot use window function in rule WHERE condition"
-msgstr "ルール� WHERE ���ウィンドウ関数を使用����ん"
+#: commands/extension.c:268
+msgid "Extension names must not begin or end with \"-\"."
+msgstr "拡張機能�� \"-\" �始���り終���り����り��ん"
 
-#: parser/parse_utilcmd.c:1790
-msgid ""
-"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
-"actions"
-msgstr ""
-"ルール�WHERE�件�SELECT�INSERT�UPDATE�DELETE動作��を���������"
+#: commands/extension.c:278
+msgid "Extension names must not contain directory separator characters."
+msgstr "拡張機能��ディレクトリ�区切り文字���れ�����り��ん"
 
-#: parser/parse_utilcmd.c:1826
-msgid "ON SELECT rule cannot use OLD"
-msgstr "ON SELECTルール��OLDを使用����ん"
+#: commands/extension.c:293 commands/extension.c:302 commands/extension.c:311
+#: commands/extension.c:321
+#, c-format
+msgid "invalid extension version name: \"%s\""
+msgstr "拡張機能��ージョン��無効��: \"%s\""
 
-#: parser/parse_utilcmd.c:1830
-msgid "ON SELECT rule cannot use NEW"
-msgstr "ON SELECTルール��NEWを使用����ん"
+#: commands/extension.c:294
+#, 
+msgid "Version names must not be empty."
+msgstr "�ージョン��無効��: 空������り��ん"
 
-#: parser/parse_utilcmd.c:1839
-msgid "ON INSERT rule cannot use OLD"
-msgstr "ON INSERTルール��OLDを使用����ん"
+#: commands/extension.c:303
+#, 
+msgid "Version names must not contain \"--\"."
+msgstr "�ージョン�� \"--\" ���れ�����り��ん"
 
-#: parser/parse_utilcmd.c:1845
-msgid "ON DELETE rule cannot use NEW"
-msgstr "ON DELETEルール��NEWを使用����ん"
+#: commands/extension.c:312
+msgid "Version names must not begin or end with \"-\"."
+msgstr "�ージョン��\"-\" �始���り終���り����り��ん"
 
-#: parser/parse_utilcmd.c:2126
-msgid "misplaced DEFERRABLE clause"
-msgstr "DEFERRABLE��場所�間������"
+#: commands/extension.c:322
+msgid "Version names must not contain directory separator characters."
+msgstr "�ージョン��ディレクトリ�区切り文字���れ�����り��ん"
 
-#: parser/parse_utilcmd.c:2131 parser/parse_utilcmd.c:2146
-msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
-msgstr "複数�DEFERRABLE/NOT DEFERRABLE�を使用����ん"
+#: commands/extension.c:472
+#, c-format
+msgid "could not open extension control file \"%s\": %m"
+msgstr "拡張機能�制御ファイル \"%s\" をオープン����ん���: %m"
 
-#: parser/parse_utilcmd.c:2141
-msgid "misplaced NOT DEFERRABLE clause"
-msgstr "NOT DEFERRABLE��場所�間������"
+#: commands/extension.c:493 commands/extension.c:503
+#, c-format
+msgid "parameter \"%s\" cannot be set in a secondary extension control file"
+msgstr "セカンダリ�拡張機能制御ファイル�パラメータ \"%s\" を設定����ん"
 
-#: parser/parse_utilcmd.c:2154 parser/parse_utilcmd.c:2180 gram.y:3483
-#: gram.y:3499
-msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
-msgstr "INITIALLY DEFERRED�宣言�れ�制約�DEFERRABLE���れ��り��ん"
+#: commands/extension.c:542
+#, c-format
+msgid "\"%s\" is not a valid encoding name"
+msgstr "\"%s\" �有効�符�化方�����り��ん"
 
-#: parser/parse_utilcmd.c:2162
-msgid "misplaced INITIALLY DEFERRED clause"
-msgstr "INITIALLY DEFERRED��場所�間������<"
+#: commands/extension.c:556
+#, c-format
+msgid "parameter \"%s\" must be a list of extension names"
+msgstr "パラメータ \"%s\" �拡張機能��リスト���れ��り��ん"
 
-#: parser/parse_utilcmd.c:2167 parser/parse_utilcmd.c:2193
-msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
-msgstr "複数�INITIALLY IMMEDIATE/DEFERRED�を使用����ん"
+#: commands/extension.c:563
+#, c-format
+msgid "unrecognized parameter \"%s\" in file \"%s\""
+msgstr "ファイル \"%2$s\" 中��識����パラメータ \"%1$s\" ��り��"
 
-#: parser/parse_utilcmd.c:2188
-msgid "misplaced INITIALLY IMMEDIATE clause"
-msgstr "INITIALLY IMMEDIATE��場所�間������<"
+#: commands/extension.c:572
+#, 
+msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
+msgstr "\"relocatable\" �真�場��パラメータ \"schema\" �指定����ん"
 
-#: parser/parse_utilcmd.c:2361
-#, c-format
+#: commands/extension.c:724
 msgid ""
-"CREATE specifies a schema (%s) different from the one being created (%s)"
-msgstr "CREATE�指定��スキーマ(%s)�作�先�スキーマ(%s)�異�り��"
+"transaction control statements are not allowed within an extension script"
+msgstr "トランザクション制御ステートメントを拡張機能スクリプト�中�"
+"書��������ん"
 
-#: gram.y:1255
-msgid "current database cannot be changed"
-msgstr "�在�データベースを変更����ん"
+#: commands/extension.c:794
+#, c-format
+msgid "permission denied to create extension \"%s\""
+msgstr "拡張機能 \"%s\" を作��る権���り��ん"
 
-#: gram.y:1370 gram.y:1385
-msgid "time zone interval must be HOUR or HOUR TO MINUTE"
-msgstr "時間帯�間隔�HOUR���HOUR TO MINUTE���れ��り��ん"
+#: commands/extension.c:796
+#, 
+msgid "Must be superuser to create this extension."
+msgstr "��拡張機能を作��る��スーパーユーザ���れ��り��ん"
 
-#: gram.y:1390 gram.y:8279 gram.y:10730
-msgid "interval precision specified twice"
-msgstr "インター�ル型�精度�２回指定�れ���"
+#: commands/extension.c:800
+#, c-format
+msgid "permission denied to update extension \"%s\""
+msgstr "拡張機能 \"%s\" を更新�る権���り��ん"
 
-#: gram.y:2521
-msgid "CHECK constraints cannot be deferred"
-msgstr "CHECK 制約��延�能������ん"
+#: commands/extension.c:802
+#, 
+msgid "Must be superuser to update this extension."
+msgstr "��拡張機能を更新�る��スーパーユーザ���れ��り��ん"
 
-#: gram.y:2725
-msgid "CREATE TABLE AS cannot specify INTO"
-msgstr "CREATE TABLE AS�INTOを指定����ん"
+#: commands/extension.c:1082
+#, c-format
+msgid ""
+"extension \"%s\" has no update path from version \"%s\" to version \"%s\""
+msgstr "拡張機能 \"%s\" ������ージョン \"%s\" �ら"
+"�ージョン \"%s\" ��アップデートパス��り��ん"
 
-#: gram.y:3394
-msgid "duplicate trigger events specified"
-msgstr "�複��トリガーイベント�指定�れ���"
+#: commands/extension.c:1209
+#, c-format
+msgid "extension \"%s\" already exists, skipping"
+msgstr "拡張機能 \"%s\" ����存在���。スキップ�����"
 
-#: gram.y:3563
-msgid "CREATE ASSERTION is not yet implemented"
-msgstr "CREATE ASSERTION���実装�れ����ん"
+#: commands/extension.c:1216
+#, c-format
+msgid "extension \"%s\" already exists"
+msgstr "拡張機能 \"%s\" ����存在���"
 
-#: gram.y:3579
-msgid "DROP ASSERTION is not yet implemented"
-msgstr "DROP ASSERTION���実装�れ����ん"
+#: commands/extension.c:1227
+#, 
+msgid "nested CREATE EXTENSION is not supported"
+msgstr "入れ�� CREATE EXTENSION �サ�ート�れ��ん"
 
-#: gram.y:3880
-msgid "RECHECK is no longer required"
-msgstr "RECHECK �も�や必���れ��ん"
+#: commands/extension.c:1282 commands/extension.c:2491
+#, 
+msgid "version to install must be specified"
+msgstr "インストール�る�ージョンを指定���れ��り��ん"
 
-#: gram.y:3881
-msgid "Update your data type."
-msgstr "データ型を更新������"
+#: commands/extension.c:1299
+#, c-format
+msgid "FROM version must be different from installation target version \"%s\""
+msgstr "FROM ��ージョン�ターゲット��ージョン \"%s\" �異���"
+"���れ��り��ん"
 
-#: gram.y:6356 gram.y:6362 gram.y:6368
-msgid "WITH CHECK OPTION is not implemented"
-msgstr "WITH CHECK OPTION�実装�れ����ん"
+#: commands/extension.c:1354
+#, c-format
+msgid "extension \"%s\" must be installed in schema \"%s\""
+msgstr ""
+"拡張機能 \"%s\" �スキーマ \"%s\" 内�インストール�れ����れ��り��ん"
 
-#: gram.y:7045
-msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
-msgstr "CREATE TABLE / AS EXECUTE��列�リストを使用����ん"
+#: commands/extension.c:1424 commands/extension.c:2632
+#, c-format
+msgid "required extension \"%s\" is not installed"
+msgstr "�求�れ�拡張機能　\"%s\" �インストール�れ����ん"
 
-#: gram.y:7266
-msgid "number of columns does not match number of values"
-msgstr "列�数�VALUES�数�一致���ん"
+#: commands/extension.c:1593
+#, c-format
+msgid "extension \"%s\" does not exist, skipping"
+msgstr "拡張機能　\"%s\" �存在���ん。スキップ�����"
 
-#: gram.y:7706
-msgid "LIMIT #,# syntax is not supported"
-msgstr "LIMIT #,#構文�実装�れ����ん"
+#: commands/extension.c:2101
+msgid ""
+"pg_extension_config_dump() can only be called from a SQL script executed by "
+"CREATE EXTENSION"
+msgstr ""
+"pg_extension_config_dump() � CREATE EXTENSION �より実行�れる SQL "
+"スクリプト�ら��コール����"
 
-#: gram.y:7707
-msgid "Use separate LIMIT and OFFSET clauses."
-msgstr "分割��LIMIT�OFFSET�を使用������"
+#: commands/extension.c:2113
+#, c-format
+msgid "OID %u does not refer to a table"
+msgstr "OID %u �テーブルを�照�����ん"
 
-#: gram.y:7925
-msgid "VALUES in FROM must have an alias"
-msgstr "FROM��VALUES�別�を����れ��り��ん"
+#: commands/extension.c:2118
+#, c-format
+msgid "table \"%s\" is not a member of the extension being created"
+msgstr "テーブル \"%s\" �生��れよ�����る拡張機能�メン����り��ん"
 
-#: gram.y:7926
-msgid "For example, FROM (VALUES ...) [AS] foo."
-msgstr "例���FROM (VALUES ...) [AS] foo。"
+#: commands/extension.c:2301 commands/extension.c:2360
+#, c-format
+msgid "extension \"%s\" does not support SET SCHEMA"
+msgstr "拡張機能 \"%s\" � SET SCHEMAをサ�ート�����ん"
 
-#: gram.y:7931
-msgid "subquery in FROM must have an alias"
-msgstr "FROM��副������別�を����れ��り��ん"
+#: commands/extension.c:2362
+#, c-format
+msgid "%s is not in the extension's schema \"%s\""
+msgstr "拡張機能�スキーマ \"%2$s\" � %1$s �見��り��ん"
 
-#: gram.y:7932
-msgid "For example, FROM (SELECT ...) [AS] foo."
-msgstr "例���FROM (SELECT ...) [AS] foo。"
+#: commands/extension.c:2411
+#, 
+msgid "nested ALTER EXTENSION is not supported"
+msgstr "入れ����� ALTER EXTENSION �サ�ート�れ����ん"
 
-#: gram.y:8405
-msgid "precision for type float must be at least 1 bit"
-msgstr "浮動�数点数�型�精度�最低�も1ビット��れ��り��ん"
+#: commands/extension.c:2502
+#, c-format
+msgid "version \"%s\" of extension \"%s\" is already installed"
+msgstr ""
+"拡張機能 \"%2$s\" ��ージョン \"%1$s\" ����インストール�れ����"
 
-#: gram.y:8414
-msgid "precision for type float must be less than 54 bits"
-msgstr "浮動�数点数�型�精度�54ビットよりも�����れ��り��ん"
+#: commands/extension.c:2725
+#, c-format
+msgid "%s is already a member of extension \"%s\""
+msgstr "%s ����拡張機能 \"%s\" �メン���"
 
-#: gram.y:9120
-msgid "UNIQUE predicate is not yet implemented"
-msgstr "UNIQUE 述部���実装�れ����ん"
+#: commands/extension.c:2742
+#, c-format
+msgid "%s is not a member of extension \"%s\""
+msgstr "%s �拡張機能 \"%s\" �メン����り��ん"
 
-#: gram.y:9992
-msgid "RANGE PRECEDING is only supported with UNBOUNDED"
-msgstr "RANGE PRECEDING � UNBOUNDED ���場����サ�ート��"
+#: commands/proclang.c:93
+msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
+msgstr "CREATE LANGUAGEパラメータ�代�り�pg_pltemplate�情報を使用�����"
 
-#: gram.y:9998
-msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
-msgstr "RANGE FOLLOWING  � UNBOUNDED ���場����サ�ート��"
+#: commands/proclang.c:103
+#, c-format
+msgid "must be superuser to create procedural language \"%s\""
+msgstr "手続�言語\"%s\"�作���スーパーユーザ���れ��り��ん"
 
-#: gram.y:10025 gram.y:10048
-msgid "frame start cannot be UNBOUNDED FOLLOWING"
-msgstr "構��開始部分� UNBOUNDED FOLLOWING ������り��ん"
+#: commands/proclang.c:123 commands/proclang.c:279
+#, c-format
+msgid "function %s must return type \"language_handler\""
+msgstr "関数%s�\"language_handler\"型を返���れ��り��ん"
 
-#: gram.y:10030
-msgid "frame starting from following row cannot end with current row"
-msgstr "次�行�ら始�るフレーム���在行��終了����ん"
+#: commands/proclang.c:243
+#, c-format
+msgid "unsupported language \"%s\""
+msgstr "言語\"%s\"�サ�ート�れ����ん"
 
-#: gram.y:10053
-msgid "frame end cannot be UNBOUNDED PRECEDING"
-msgstr "構��末尾� UNBOUNDED PRECEDING ������り��ん"
+#: commands/proclang.c:245
+msgid "The supported languages are listed in the pg_pltemplate system catalog."
+msgstr ""
+"サ�ート�れ��る言語�pg_pltemplateシステムカタログ内�列挙�れ����"
 
-#: gram.y:10059
-msgid "frame starting from current row cannot have preceding rows"
-msgstr "�在行�ら始�るフレーム���れ���行を�む�������ん"
+#: commands/proclang.c:253
+msgid "must be superuser to create custom procedural language"
+msgstr "手続�言語�作���スーパーユーザ���れ��り��ん"
 
-#: gram.y:10066
-msgid "frame starting from following row cannot have preceding rows"
-msgstr "次�行�ら始�るフレーム���れ���行を�む�������ん"
+#: commands/proclang.c:272
+#, c-format
+msgid ""
+"changing return type of function %s from \"opaque\" to \"language_handler\""
+msgstr "関数%s�戻り値型を\"opaque\"�ら\"language_handler\"�変更�����"
 
-#: gram.y:10705
-msgid "type modifier cannot have parameter name"
-msgstr "型修正��パラメータ�を���������ん"
+#: commands/proclang.c:357 commands/proclang.c:608
+#, c-format
+msgid "language \"%s\" already exists"
+msgstr "言語\"%s\"����存在���"
 
-#: gram.y:11302 gram.y:11510
-msgid "improper use of \"*\""
-msgstr " \"*\" �使�方���切��"
+#: commands/proclang.c:539
+#, c-format
+msgid "language \"%s\" does not exist, skipping"
+msgstr "言語\"%s\"�存在���ん。�略���"
 
-#: gram.y:11441
-msgid "wrong number of parameters on left side of OVERLAPS expression"
-msgstr "OVERLAPS��左辺�パラメータ数�間������"
+#: commands/schemacmds.c:82 commands/schemacmds.c:275
+#, c-format
+msgid "unacceptable schema name \"%s\""
+msgstr "スキーマ�\"%s\"���付�られ��ん"
 
-#: gram.y:11448
-msgid "wrong number of parameters on right side of OVERLAPS expression"
-msgstr "OVERLAPS���辺�パラメータ数�間������"
+#: commands/schemacmds.c:83 commands/schemacmds.c:276
+msgid "The prefix \"pg_\" is reserved for system schemas."
+msgstr "接頭辞\"pg_\"�システムスキーマ用�予約�れ����"
 
-#: gram.y:11573
-msgid "multiple ORDER BY clauses not allowed"
-msgstr "複数�ORDER BY��使用����ん"
+#: commands/schemacmds.c:186
+#, c-format
+msgid "schema \"%s\" does not exist, skipping"
+msgstr "スキーマ\"%s\"�存在���ん。�略���"
 
-#: gram.y:11584
-msgid "multiple OFFSET clauses not allowed"
-msgstr "複数�OFFSET��使用����ん"
+#: commands/conversioncmds.c:71
+#, c-format
+msgid "source encoding \"%s\" does not exist"
+msgstr "変�元符�化方�\"%s\"�存在���ん"
 
-#: gram.y:11593
-msgid "multiple LIMIT clauses not allowed"
-msgstr "複数�LIMIT��使用����ん"
+#: commands/conversioncmds.c:78
+#, c-format
+msgid "destination encoding \"%s\" does not exist"
+msgstr "変�先符�化方�\"%s\"�存在���ん"
 
-#: gram.y:11602
-msgid "multiple WITH clauses not allowed"
-msgstr "複数� WITH ��使用����ん"
+#: commands/conversioncmds.c:92
+#, c-format
+msgid "encoding conversion function %s must return type \"void\""
+msgstr "エンコード変�関数 %s � \"void\" 型を返���れ��り��ん"
 
-#: gram.y:11756
-msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
-msgstr "テーブル関数�� OUT � INOUT 引数�使用����ん"
+#: commands/conversioncmds.c:152
+#, c-format
+msgid "conversion \"%s\" does not exist, skipping"
+msgstr "変�\"%s�存在���ん。�略���"
 
-#: parser/parse_clause.c:419
+#: commands/conversioncmds.c:211
 #, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
-msgstr "JOIN/ON��\"%s\"を�照��������れ�JOIN���れ����ん"
+msgid "conversion \"%s\" already exists in schema \"%s\""
+msgstr "変�\"%s\"�スキーマ\"%s\"内����存在���"
 
-#: parser/parse_clause.c:500
-msgid "subquery in FROM cannot have SELECT INTO"
-msgstr "FROM��副�������SELECT INTOを使用����ん"
+#: commands/tablespace.c:205
+#, c-format
+msgid "could not stat directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"�stat�����ん���: %m"
 
-#: parser/parse_clause.c:522
-msgid "subquery in FROM cannot refer to other relations of same query level"
-msgstr ""
-"FROM��副���������一�����レベル�他�リレーションを�照���"
-"�ん"
+#: commands/tablespace.c:214
+#, c-format
+msgid "\"%s\" exists but is not a directory"
+msgstr "\"%s\"�存在�����ディレクトリ���り��ん"
 
-#: parser/parse_clause.c:573
-msgid ""
-"function expression in FROM cannot refer to other relations of same query "
-"level"
-msgstr ""
-"FROM��関数����一�����レベル�他�リレーションを�照����ん"
+#: commands/tablespace.c:244
+#, c-format
+msgid "permission denied to create tablespace \"%s\""
+msgstr "テーブル空間\"%s\"を作��る権���り��ん"
 
-#: parser/parse_clause.c:586
-msgid "cannot use aggregate function in function expression in FROM"
-msgstr "FROM��関数���集約関数を使用����ん"
+#: commands/tablespace.c:246
+msgid "Must be superuser to create a tablespace."
+msgstr "テーブル空間を作��る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_clause.c:593
-msgid "cannot use window function in function expression in FROM"
-msgstr "FROM �内�関数���ウィンドウ関数を使用����ん"
+#: commands/tablespace.c:262
+msgid "tablespace location cannot contain single quotes"
+msgstr "テーブル空間�場所���一引用符を��る�������ん"
+
+#: commands/tablespace.c:272
+msgid "tablespace location must be an absolute path"
+msgstr "テーブル空間�場所�絶対パス���れ��り��ん"
 
-#: parser/parse_clause.c:869
+#: commands/tablespace.c:283
 #, c-format
-msgid "column name \"%s\" appears more than once in USING clause"
-msgstr "USING��列�\"%s\"�複数�り��"
+msgid "tablespace location \"%s\" is too long"
+msgstr "テーブル空間�場所\"%s\"�長����"
 
-#: parser/parse_clause.c:884
+#: commands/tablespace.c:293 commands/tablespace.c:829
 #, c-format
-msgid "common column name \"%s\" appears more than once in left table"
-msgstr "左テーブル�列�\"%s\"�複数�り��"
+msgid "unacceptable tablespace name \"%s\""
+msgstr "テーブル空間�\"%s\"を��付�られ��ん"
+
+#: commands/tablespace.c:295 commands/tablespace.c:830
+msgid "The prefix \"pg_\" is reserved for system tablespaces."
+msgstr "接頭辞\"pg_\"�システムテーブル空間用�予約�れ����"
 
-#: parser/parse_clause.c:893
+#: commands/tablespace.c:305 commands/tablespace.c:842
 #, c-format
-msgid "column \"%s\" specified in USING clause does not exist in left table"
-msgstr "USING��指定��列\"%s�左テーブル�存在���ん"
+msgid "tablespace \"%s\" already exists"
+msgstr "テーブル空間\"%s\"����存在���"
+
+#: commands/tablespace.c:377 commands/tablespace.c:529
+msgid "tablespaces are not supported on this platform"
+msgstr "��プラットフォーム��テーブル空間をサ�ート�����ん"
 
-#: parser/parse_clause.c:907
+#: commands/tablespace.c:415 commands/tablespace.c:813
+#: commands/tablespace.c:880 commands/tablespace.c:985
+#: commands/tablespace.c:1358
 #, c-format
-msgid "common column name \"%s\" appears more than once in right table"
-msgstr "�テーブル�列�\"%s\"�複数�り��"
+msgid "tablespace \"%s\" does not exist"
+msgstr "テーブル空間\"%s\"�存在���ん"
 
-#: parser/parse_clause.c:916
+#: commands/tablespace.c:421
 #, c-format
-msgid "column \"%s\" specified in USING clause does not exist in right table"
-msgstr "USING��指定��列\"%s��テーブル�存在���ん"
+msgid "tablespace \"%s\" does not exist, skipping"
+msgstr "テーブル空間\"%s\"�存在���ん。�略���"
 
-#: parser/parse_clause.c:973
+#: commands/tablespace.c:486
 #, c-format
-msgid "column alias list for \"%s\" has too many entries"
-msgstr "列\"%s\"�別�リスト�エントリ�多����"
+msgid "tablespace \"%s\" is not empty"
+msgstr "テーブル空間\"%s\"�空���り��ん"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1210
+#: commands/tablespace.c:560
 #, c-format
-msgid "argument of %s must not contain variables"
-msgstr "%s�引数��変数を使用����ん"
+msgid "directory \"%s\" does not exist"
+msgstr "ディレクトリ \"%s\" �存在���ん"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1221
+#: commands/tablespace.c:561
+#, 
+msgid "Create this directory for the tablespace before restarting the server."
+msgstr ""
+"サー�を�起動�る��テーブルスペース用�ディレクトリを作�������"
+
+#: commands/tablespace.c:566
 #, c-format
-msgid "argument of %s must not contain aggregate functions"
-msgstr "%s �引数��集約関数を使用����ん"
+msgid "could not set permissions on directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"�権�を設定����ん���: %m"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1232
+#: commands/tablespace.c:584 commands/dbcommands.c:1246
+#: commands/dbcommands.c:1714 commands/dbcommands.c:1915
+#: commands/dbcommands.c:1963
 #, c-format
-msgid "argument of %s must not contain window functions"
-msgstr "%s �引数��ウィンドウ関数を使用����ん"
+msgid "some useless files may be left behind in old database directory \"%s\""
+msgstr ""
+"元�データベース�ディレクトリ \"%s\" ����ファイル�残���る�も�れ�"
+"�ん"
 
-#. translator: first %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1349
+#: commands/tablespace.c:598
 #, c-format
-msgid "%s \"%s\" is ambiguous"
-msgstr "%s \"%s\"�曖昧��"
+msgid "directory \"%s\" already in use as a tablespace"
+msgstr "ディレクトリ \"%s\" ����テーブルスペース���使�れ����"
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1373
+#: commands/tablespace.c:613 commands/tablespace.c:750
 #, c-format
-msgid "non-integer constant in %s"
-msgstr "%s�整数以外�定数��り��"
+msgid "could not remove symbolic link \"%s\": %m"
+msgstr "シンボリックリンク\"%s\"を削除����ん���: %m"
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1391
+#: commands/tablespace.c:623
 #, c-format
-msgid "%s position %d is not in select list"
-msgstr "%s��置%d�SELECTリスト��り��ん"
+msgid "could not create symbolic link \"%s\": %m"
+msgstr "シンボリックリンク\"%s\"を作�����ん���: %m"
 
-#: parser/parse_clause.c:1595
+#: commands/tablespace.c:714 commands/tablespace.c:726
+#: commands/tablespace.c:742
 #, c-format
-msgid "window \"%s\" is already defined"
-msgstr "ウィンドウ \"%s\" ����定義済���"
+msgid "could not remove directory \"%s\": %m"
+msgstr "ディレクトリ\"%s\"を削除����ん���: %m"
 
-#: parser/parse_clause.c:1607 parser/parse_agg.c:241
+#: commands/tablespace.c:1039
 #, c-format
-msgid "window \"%s\" does not exist"
-msgstr "ウィンドウ \"%s\" �存在���ん"
+msgid "Tablespace \"%s\" does not exist."
+msgstr "テーブル空間 \"%s\" �存在���ん"
 
-#: parser/parse_clause.c:1649
+#: commands/tablespace.c:1450
 #, c-format
-msgid "cannot override PARTITION BY clause of window \"%s\""
-msgstr "ウィンドウ \"%s\" � PARTITION BY �をオー�ーライド����ん"
+msgid "tablespace %u is not empty"
+msgstr "テーブル空間 %u �空���り��ん"
 
-#: parser/parse_clause.c:1661
+#: commands/trigger.c:166
 #, c-format
-msgid "cannot override ORDER BY clause of window \"%s\""
-msgstr "ウィンドウ \"%s\" � ORDER BY �をオー�ーライド����ん"
+msgid "\"%s\" is a table"
+msgstr "\"%s\" �テーブル���り��ん"
+
+#: commands/trigger.c:168
+msgid "Tables cannot have INSTEAD OF triggers."
+msgstr "テーブル� INSTEAD OF トリガーを���������ん"
 
-#: parser/parse_clause.c:1683
+#: commands/trigger.c:179 commands/trigger.c:186
 #, c-format
-msgid "cannot override frame clause of window \"%s\""
-msgstr "ウィンドウ \"%s\" �構��をオー�ーライド����ん"
+msgid "\"%s\" is a view"
+msgstr "\"%s\" �ビュー��"
 
-#: parser/parse_clause.c:1749
-msgid ""
-"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
-"list"
-msgstr ""
-"DISTINCT や ORDER BY 表�を伴��集約�引数リスト�中��れ��れ��り��ん"
+#: commands/trigger.c:181
+msgid "Views cannot have row-level BEFORE or AFTER triggers."
+msgstr "ビュー�行レベル� BEFORE / AFTER トリガーを���������ん"
 
-#: parser/parse_clause.c:1750
-msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
-msgstr "SELECT DISTINCT��ORDER BY���SELECTリスト内���れ��り��ん"
+#: commands/trigger.c:188
+msgid "Views cannot have TRUNCATE triggers."
+msgstr "ビュー� TRUNCATE トリガーを���������ん"
 
-#: parser/parse_clause.c:1836 parser/parse_clause.c:1868
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
-msgstr "SELECT DISTINCT ON���ORDER BY��先頭�一致���れ��り��ん"
+#: commands/trigger.c:235
+msgid "TRUNCATE FOR EACH ROW triggers are not supported"
+msgstr "TRUNCATE FOR EACH ROW トリガー�サ�ート�れ����ん"
+
+#: commands/trigger.c:243
+msgid "INSTEAD OF triggers must be FOR EACH ROW"
+msgstr "INSTEAD OF トリガー� FOR EACH ROW ���れ��り��ん"
+
+#: commands/trigger.c:247
+msgid "INSTEAD OF triggers cannot have WHEN conditions"
+msgstr "INSTEAD OF トリガー� WHEN �件を���������ん"
+
+#: commands/trigger.c:251
+#, 
+msgid "INSTEAD OF triggers cannot have column lists"
+msgstr "INSTEAD OF トリガー�列リストを���������ん"
+
+#: commands/trigger.c:295
+msgid "cannot use subquery in trigger WHEN condition"
+msgstr "トリガー� WHEN �件��副�����を使用����ん"
+
+#: commands/trigger.c:299
+msgid "cannot use aggregate function in trigger WHEN condition"
+msgstr "トリガー� WHEN �件��集約関数を使用����ん"
+
+#: commands/trigger.c:303
+msgid "cannot use window function in trigger WHEN condition"
+msgstr "トリガー� WHEN �件��ウィンドウ関数を使用����ん"
+
+#: commands/trigger.c:323 commands/trigger.c:336
+msgid "statement trigger's WHEN condition cannot reference column values"
+msgstr "ステートメントトリガー� WHEN �件��カラム値を�照����ん"
 
-#: parser/parse_clause.c:1987
+#: commands/trigger.c:328
+msgid "INSERT trigger's WHEN condition cannot reference OLD values"
+msgstr "INSERT トリガー� WHEN �件�� OLD 値を�照����ん"
+
+#: commands/trigger.c:341
+msgid "DELETE trigger's WHEN condition cannot reference NEW values"
+msgstr "DELETE トリガー� WHEN �件�� NEW 値を�照����ん"
+
+#: commands/trigger.c:346
+msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
+msgstr "BEFORE トリガー� WHEN �件�� NEW システムカラムを�照����ん"
+
+#: commands/trigger.c:384
 #, c-format
-msgid "operator %s is not a valid ordering operator"
-msgstr "演算�\"%s\"�有効�順�付�演算�����り��ん"
+msgid "changing return type of function %s from \"opaque\" to \"trigger\""
+msgstr "関数%s�戻り値型を\"opaque\"�ら\"trigger\"�変更�����"
 
-#: parser/parse_clause.c:1989
-msgid ""
-"Ordering operators must be \"<\" or \">\" members of btree operator families."
-msgstr ""
-"順�付�演算��B-Tree演算���\"<\"���\">\"�素���れ��り��ん。"
+#: commands/trigger.c:391
+#, c-format
+msgid "function %s must return type \"trigger\""
+msgstr "関数%s�\"trigger\"型を返���れ��り��ん"
 
-#: parser/parse_coerce.c:841 parser/parse_coerce.c:870
-#: parser/parse_coerce.c:888 parser/parse_coerce.c:903
-#: parser/parse_expr.c:1726 parser/parse_expr.c:2237
+#: commands/trigger.c:501 commands/trigger.c:1240
 #, c-format
-msgid "cannot cast type %s to %s"
-msgstr "型%s�ら%s�キャスト����ん"
+msgid "trigger \"%s\" for relation \"%s\" already exists"
+msgstr "リレーション\"%2$s\"用�トリガ\"%1$s\"����存在���"
 
-#: parser/parse_coerce.c:873
-msgid "Input has too few columns."
-msgstr "入力列�少�����"
+#: commands/trigger.c:786
+msgid "Found referenced table's UPDATE trigger."
+msgstr "被�照テーブル�UPDATEトリガ�見��り���。"
+
+#: commands/trigger.c:787
+msgid "Found referenced table's DELETE trigger."
+msgstr "被�照テーブル�DELETEトリガ�見��り���。"
+
+#: commands/trigger.c:788
+msgid "Found referencing table's trigger."
+msgstr "�照テーブル�トリガ�見��り���。"
 
-#: parser/parse_coerce.c:891
+#: commands/trigger.c:897 commands/trigger.c:913
 #, c-format
-msgid "Cannot cast type %s to %s in column %d."
-msgstr "列%3$d��型%1$s�ら%2$s�キャスト����ん"
+msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
+msgstr "制約\"%s\" %s�対�る�完全�トリガグループを無視���。"
 
-#: parser/parse_coerce.c:906
-msgid "Input has too many columns."
-msgstr "入力列�多����"
+#: commands/trigger.c:925
+#, c-format
+msgid "converting trigger group into constraint \"%s\" %s"
+msgstr "トリガグループを制約\"%s\" %s�変������"
 
-#. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:949
+#: commands/trigger.c:1039
 #, c-format
-msgid "argument of %s must be type boolean, not type %s"
-msgstr "%s �引数� %s 型����ブール型���れ��り��ん"
+msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
+msgstr "テーブル\"%2$s\"�トリガ\"%1$s\"�存在���ん。�略���"
 
-#. translator: %s is name of a SQL construct, eg WHERE
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:959 parser/parse_coerce.c:1008
+#: commands/trigger.c:1169 commands/trigger.c:1282 commands/trigger.c:1393
 #, c-format
-msgid "argument of %s must not return a set"
-msgstr "%s�引数�集�を返����り��ん"
+msgid "trigger \"%s\" for table \"%s\" does not exist"
+msgstr "テーブル\"%2$s\"�トリガ\"%1$s\"�存在���ん"
 
-#. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:996
+#: commands/trigger.c:1361
 #, c-format
-msgid "argument of %s must be type %s, not type %s"
-msgstr "%1$s�引数�型%3$s����%2$s型���れ��り��ん"
+msgid "permission denied: \"%s\" is a system trigger"
+msgstr "権���り��ん: \"%s\"�システムトリガ��"
 
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1129
+#: commands/trigger.c:1843
 #, c-format
-msgid "%s types %s and %s cannot be matched"
-msgstr "%s�型%s�%sを一致��る�������ん"
+msgid "trigger function %u returned null value"
+msgstr "トリガ関数%u�NULL値を返����"
 
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1196
+#: commands/trigger.c:1902 commands/trigger.c:2101 commands/trigger.c:2285
+#: commands/trigger.c:2527
+msgid "BEFORE STATEMENT trigger cannot return a value"
+msgstr "BEFORE STATEMENTトリガ�値を返��������ん"
+
+#: commands/trigger.c:4204
 #, c-format
-msgid "%s could not convert type %s to %s"
-msgstr "%s�型%s�ら%s�変�����ん���"
+msgid "constraint \"%s\" is not deferrable"
+msgstr "制約\"%s\"��延�能���り��ん"
 
-#: parser/parse_coerce.c:1437
-msgid "arguments declared \"anyelement\" are not all alike"
-msgstr "\"anyelement\"�宣言�れ�引数�全�����り��ん"
+#: commands/trigger.c:4227
+#, c-format
+msgid "constraint \"%s\" does not exist"
+msgstr "制約\"%s\"�存在���ん"
 
-#: parser/parse_coerce.c:1456
-msgid "arguments declared \"anyarray\" are not all alike"
-msgstr "\"anyarray\"�宣言�れ�引数�全�����り��ん"
+#: commands/user.c:143
+msgid "SYSID can no longer be specified"
+msgstr "SYSID�も�指定�る�������ん"
 
-#: parser/parse_coerce.c:1485 parser/parse_coerce.c:1629
-#: parser/parse_coerce.c:1660
+#: commands/user.c:267 commands/user.c:606 commands/dbcommands.c:253
+#: commands/dbcommands.c:1347
 #, c-format
-msgid "argument declared \"anyarray\" is not an array but type %s"
-msgstr "\"anyarray\"�宣言�れ�引数��列���型%s���"
+msgid "invalid connection limit: %d"
+msgstr "接続制�数 %d �無効��"
 
-#: parser/parse_coerce.c:1501
-msgid ""
-"argument declared \"anyarray\" is not consistent with argument declared "
-"\"anyelement\""
-msgstr ""
-"\"anyarray\"�宣言�れ�引数�\"anyelement\"�宣言�れ�引数��整�性��り"
-"��ん"
+#: commands/user.c:284
+msgid "must be superuser to create superusers"
+msgstr "スーパーユーザを作��る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_coerce.c:1519
-msgid "could not determine polymorphic type because input has type \"unknown\""
-msgstr "入力型�\"unknown\"������多様型を決定����ん���"
+#: commands/user.c:291
+#, 
+msgid "must be superuser to create replication users"
+msgstr "レプリケーションユーザを作��る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_coerce.c:1529
+#: commands/user.c:298
+msgid "permission denied to create role"
+msgstr "ロールを作��る権���り��ん"
+
+#: commands/user.c:305 commands/user.c:1087
 #, c-format
-msgid "type matched to anynonarray is an array type: %s"
-msgstr "anynonarray���型��列型��: %s"
+msgid "role name \"%s\" is reserved"
+msgstr "ロール�\"%s\"�予約�れ����"
 
-#: parser/parse_coerce.c:1539
+#: commands/user.c:318 commands/user.c:1081
 #, c-format
-msgid "type matched to anyenum is not an enum type: %s"
-msgstr "anyenum���型�列挙型���り��ん: %s"
+msgid "role \"%s\" already exists"
+msgstr "ロール\"%s\"����存在���"
 
-#: parser/parse_agg.c:129
-msgid "Aggregates with DISTINCT must be able to sort their inputs."
-msgstr ""
-"DISTINCT 付��集約関数���れ�対�る入力をソート����れ��り��ん。"
+#: commands/user.c:636 commands/user.c:842 commands/user.c:1321
+#: commands/user.c:1458
+msgid "must be superuser to alter superusers"
+msgstr "スーパーユーザを変更�る��スーパーユーザ���れ��り��ん"
+
+#: commands/user.c:643
+#, 
+msgid "must be superuser to alter replication users"
+msgstr "レプリケーションユーザを変更�る��スーパーユーザ���れ��り��ん"
+
+#: commands/user.c:659 commands/user.c:850
+msgid "permission denied"
+msgstr "権���り��ん"
+
+#: commands/user.c:878
+msgid "permission denied to drop role"
+msgstr "ロールを削除�る権���り��ん"
+
+#: commands/user.c:910
+#, c-format
+msgid "role \"%s\" does not exist, skipping"
+msgstr "ロール\"%s\"�存在���ん。�略���"
+
+#: commands/user.c:922 commands/user.c:926
+msgid "current user cannot be dropped"
+msgstr "�在�ユーザを削除����ん"
+
+#: commands/user.c:930
+msgid "session user cannot be dropped"
+msgstr "セッション�ユーザを削除����ん"
 
-#: parser/parse_agg.c:170
-msgid "aggregate function calls cannot contain window function calls"
-msgstr "集約関数�呼�出��ウィンドウ関数�呼�出�を�む�������ん"
+#: commands/user.c:941
+msgid "must be superuser to drop superusers"
+msgstr "スーパーユーザを削除�る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_agg.c:331
-msgid "aggregates not allowed in WHERE clause"
-msgstr "WHERE���集約を使用����ん"
+#: commands/user.c:954
+#, c-format
+msgid "role \"%s\" cannot be dropped because some objects depend on it"
+msgstr "他�オブジェクト��存�������ロール\"%s\"を削除����ん"
 
-#: parser/parse_agg.c:337
-msgid "aggregates not allowed in JOIN conditions"
-msgstr "JOIN�件�集約を使用����ん"
+#: commands/user.c:1071
+msgid "session user cannot be renamed"
+msgstr "セッションユーザ���を変更����ん"
 
-#: parser/parse_agg.c:358
-msgid "aggregates not allowed in GROUP BY clause"
-msgstr "GROUP BY��集約を使用����ん"
+#: commands/user.c:1075
+msgid "current user cannot be renamed"
+msgstr "�在�ユーザ���を変更����ん"
 
-#: parser/parse_agg.c:426
-msgid "aggregate functions not allowed in a recursive query's recursive term"
-msgstr "�帰クエリー��帰項目中��集約関数を使用����ん"
+#: commands/user.c:1098
+msgid "must be superuser to rename superusers"
+msgstr "スーパーユーザ���を変更�る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_agg.c:451
-msgid "window functions not allowed in WHERE clause"
-msgstr "WHERE���ウィンドウ関数を使用����ん"
+#: commands/user.c:1105
+msgid "permission denied to rename role"
+msgstr "ロール���を変更�る権���り��ん"
 
-#: parser/parse_agg.c:457
-msgid "window functions not allowed in JOIN conditions"
-msgstr "JOIN�件��ウィンドウ関数を使用����ん"
+#: commands/user.c:1126
+msgid "MD5 password cleared because of role rename"
+msgstr "ロール��変更�れ���MD5パスワード�クリア�れ���"
 
-#: parser/parse_agg.c:463
-msgid "window functions not allowed in HAVING clause"
-msgstr "HAVING ���ウィンドウ関数を使用����ん"
+#: commands/user.c:1182
+msgid "column names cannot be included in GRANT/REVOKE ROLE"
+msgstr "カラム�� GRANT/REVOKE ROLE ���れ�����り��ん"
 
-#: parser/parse_agg.c:476
-msgid "window functions not allowed in GROUP BY clause"
-msgstr "GROUP BY ���ウィンドウ関数を使用����ん"
+#: commands/user.c:1220
+msgid "permission denied to drop objects"
+msgstr "オブジェクトを削除�る権���り��ん"
 
-#: parser/parse_agg.c:495 parser/parse_agg.c:508
-msgid "window functions not allowed in window definition"
-msgstr "ウィンドウ定義��ウィンドウ関数を使用����ん"
+#: commands/user.c:1247 commands/user.c:1256
+msgid "permission denied to reassign objects"
+msgstr "オブジェクトを�割当��る権���り��ん"
 
-#: parser/parse_agg.c:630
+#: commands/user.c:1329 commands/user.c:1466
 #, c-format
-msgid ""
-"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
-"aggregate function"
-msgstr ""
-"列\"%s.%s\"�GROUP BY��出����れ��ら����集約関数内�使用���れ�"
-"�り��ん"
+msgid "must have admin option on role \"%s\""
+msgstr "ロール\"%s\"�adminオプション���れ��り��ん"
+
+#: commands/user.c:1337
+msgid "must be superuser to set grantor"
+msgstr "権�付与者を設定�る��スーパーユーザ���れ��り��ん"
 
-#: parser/parse_agg.c:636
+#: commands/user.c:1362
 #, c-format
-msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
-msgstr ""
-"外部������ら副������グループ化�れ����列\"%s.%s\"を使用���"
-"��"
+msgid "role \"%s\" is a member of role \"%s\""
+msgstr "ロール\"%s\"�ロール\"%s\"�メン����り��ん"
 
-#: parser/parse_node.c:82
+#: commands/user.c:1377
 #, c-format
-msgid "target lists can have at most %d entries"
-msgstr "対象リスト�最大�%dエントリ���������"
+msgid "role \"%s\" is already a member of role \"%s\""
+msgstr "ロール\"%s\"����ロール\"%s\"�メン���"
 
-#: parser/parse_node.c:222
+#: commands/user.c:1488
 #, c-format
-msgid "cannot subscript type %s because it is not an array"
-msgstr "�列���り��ん���型%s�添�字を��られ��ん"
+msgid "role \"%s\" is not a member of role \"%s\""
+msgstr "ロール\"%s\"�ロール\"%s\"�メン����り��ん"
 
-#: parser/parse_node.c:316 parser/parse_node.c:342
-msgid "array subscript must have type integer"
-msgstr "�列�添�字�整数型���れ��り��ん"
+#: commands/copy.c:339 commands/copy.c:351 commands/copy.c:385
+#: commands/copy.c:395
+msgid "COPY BINARY is not supported to stdout or from stdin"
+msgstr "標準入出力を介��COPY BINARY�サ�ート�れ����ん"
 
-#: parser/parse_node.c:366
+#: commands/copy.c:473
 #, c-format
-msgid "array assignment requires type %s but expression is of type %s"
-msgstr "�列�代入��型%s�必��������型%s���"
+msgid "could not write to COPY file: %m"
+msgstr "COPYファイル�書�出���ん���: %m"
 
-#: parser/parse_target.c:373 parser/parse_target.c:661
-#, c-format
-msgid "cannot assign to system column \"%s\""
-msgstr "システム列\"%s\"�代入����ん"
+#: commands/copy.c:485
+msgid "connection lost during COPY to stdout"
+msgstr "標準出力��COPY中�接続�失�れ���"
 
-#: parser/parse_target.c:398
-msgid "cannot set an array element to DEFAULT"
-msgstr "�列�素�DEFAULTを設定����ん"
+#: commands/copy.c:526
+#, c-format
+msgid "could not read from COPY file: %m"
+msgstr "COPYファイル�ら読�込���ん���: %m"
 
-#: parser/parse_target.c:403
-msgid "cannot set a subfield to DEFAULT"
-msgstr "サブフィールド�DEFAULTを設定����ん"
+#: commands/copy.c:577
+#, c-format
+msgid "COPY from stdin failed: %s"
+msgstr "標準入力�ら�COPY�失敗����: %s"
 
-#: parser/parse_target.c:470
+#: commands/copy.c:593
 #, c-format
-msgid "column \"%s\" is of type %s but expression is of type %s"
-msgstr "列\"%s\"�型%s������型%s���"
+msgid "unexpected message type 0x%02X during COPY from stdin"
+msgstr "標準入力�ら�COPY中�想定外�メッセージ種類0x%02X��り���"
 
-#: parser/parse_target.c:600 parser/parse_expr.c:416
-msgid "row expansion via \"*\" is not supported here"
-msgstr "\"*\" を通��行展開������サ�ート�れ����ん"
+#: commands/copy.c:745
+msgid "must be superuser to COPY to or from a file"
+msgstr ""
+"ファイル経由�COPY FROM�COPY TOを行���スーパーユーザ���れ��り��ん"
 
-#: parser/parse_target.c:645
-#, c-format
+#: commands/copy.c:746
 msgid ""
-"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
-"composite type"
+"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
+"for anyone."
 msgstr ""
-"型%3$s�複�型��り��ん���列\"%2$s\"�フィールド\"%1$s\"�代入����"
-"ん。"
+"標準入出力経由�COPY�誰�も実行�能��。��psql�\\\\copyも誰�も実行��"
+"��"
 
-#: parser/parse_target.c:654
+#: commands/copy.c:874
 #, c-format
-msgid ""
-"cannot assign to field \"%s\" of column \"%s\" because there is no such "
-"column in data type %s"
-msgstr ""
-"データ型%3$s�列��り��ん���列\"%2$s\"�フィールド\"%1$s\"�代入���"
-"�ん。"
+msgid "COPY format \"%s\" not recognized"
+msgstr "COPY フォーマット \"%s\" を�識����ん"
 
-#: parser/parse_target.c:729
+#: commands/copy.c:937 commands/copy.c:951
 #, c-format
-msgid ""
-"array assignment to \"%s\" requires type %s but expression is of type %s"
-msgstr "\"%s\"���列代入��型%s�必�������型%s���"
+msgid "argument to option \"%s\" must be a list of column names"
+msgstr "オプション \"%s\" �引数�列��並����れ��り��ん"
 
-#: parser/parse_target.c:739
+#: commands/copy.c:964
 #, c-format
-msgid "subfield \"%s\" is of type %s but expression is of type %s"
-msgstr "サブフィールド\"%s\"�型%s������型%s���"
+msgid "argument to option \"%s\" must be a valid encoding name"
+msgstr "オプション \"%s\" �引数�有効�エンコーディング����れ��り��ん"
 
-#: parser/parse_target.c:977 parser/parse_expr.c:739
-#: parser/parse_relation.c:478 parser/parse_relation.c:551
+#: commands/copy.c:970
 #, c-format
-msgid "column reference \"%s\" is ambiguous"
-msgstr "列�照\"%s\"�曖昧��"
+msgid "option \"%s\" not recognized"
+msgstr "時間帯 \"%s\" を�識����ん"
 
-#: parser/parse_target.c:1039
-msgid "SELECT * with no tables specified is not valid"
-msgstr "テーブル指定���SELECT *�無効��"
+#: commands/copy.c:981
+msgid "cannot specify DELIMITER in BINARY mode"
+msgstr "BINARYモード��DELIMITERを指定����ん"
 
-#: parser/parse_expr.c:362 parser/parse_expr.c:755
-#, c-format
-msgid "column %s.%s does not exist"
-msgstr "列%s.%s�存在���ん"
+#: commands/copy.c:986
+msgid "cannot specify NULL in BINARY mode"
+msgstr "BINARYモード��NULLを指定����ん"
 
-#: parser/parse_expr.c:374
-#, c-format
-msgid "column \"%s\" not found in data type %s"
-msgstr "データ型%2$s�列\"%1$s\"��り��ん"
+#: commands/copy.c:1008
+msgid "COPY delimiter must be a single one-byte character"
+msgstr "COPY�区切り文字��一�１�イト文字���れ��り��ん"
 
-#: parser/parse_expr.c:380
-#, c-format
-msgid "could not identify column \"%s\" in record data type"
-msgstr "レコードデータ型�列\"%s\"を識別����ん���"
+#: commands/copy.c:1015
+msgid "COPY delimiter cannot be newline or carriage return"
+msgstr "COPY�区切り文字�改行や復帰記���る�������ん"
 
-#: parser/parse_expr.c:386
-#, c-format
-msgid "column notation .%s applied to type %s, which is not a composite type"
-msgstr "列記法 .%s�型%s�使用�れ�������型�複�型���り��ん"
+#: commands/copy.c:1021
+msgid "COPY null representation cannot use newline or carriage return"
+msgstr "COPY�NULL表���改行や復帰記�を使用�る�������ん"
 
-#: parser/parse_expr.c:807 parser/parse_param.c:108 parser/parse_param.c:139
-#: parser/parse_param.c:195 parser/parse_param.c:287
+#: commands/copy.c:1038
 #, c-format
-msgid "there is no parameter $%d"
-msgstr "パラメータ$%d��り��ん"
+msgid "COPY delimiter cannot be \"%s\""
+msgstr "COPY�区切り文字を\"%s\"��る�������ん"
 
-#: parser/parse_expr.c:1012
-msgid "NULLIF requires = operator to yield boolean"
-msgstr "NULLIF��=演算��booleanを返���を必�����"
+#: commands/copy.c:1044
+msgid "COPY HEADER available only in CSV mode"
+msgstr "COPY HEADER�CSVモード���使用����"
 
-#: parser/parse_expr.c:1185
-msgid "arguments of row IN must all be row expressions"
-msgstr "行�IN引数����行����れ��り��ん"
+#: commands/copy.c:1050
+msgid "COPY quote available only in CSV mode"
+msgstr "COPY�引用符�CSVモード���使用����"
 
-#: parser/parse_expr.c:1471
-msgid "subquery cannot have SELECT INTO"
-msgstr "副������� SELECT INTO を使用����ん"
+#: commands/copy.c:1055
+msgid "COPY quote must be a single one-byte character"
+msgstr "COPY�引用符��一�1�イト文字���れ��り��ん"
 
-#: parser/parse_expr.c:1499
-msgid "subquery must return a column"
-msgstr "副������1列を返���れ��り��ん"
+#: commands/copy.c:1060
+msgid "COPY delimiter and quote must be different"
+msgstr "COPY�区切り文字�引用符�異�る文字���れ��り��ん"
 
-#: parser/parse_expr.c:1506
-msgid "subquery must return only one column"
-msgstr "副������1列��を返���れ��り��ん"
+#: commands/copy.c:1066
+msgid "COPY escape available only in CSV mode"
+msgstr "COPY�エスケープ�CSVモード���使用����"
 
-#: parser/parse_expr.c:1565
-msgid "subquery has too many columns"
-msgstr "副������列�多����"
+#: commands/copy.c:1071
+msgid "COPY escape must be a single one-byte character"
+msgstr "COPY�エスケープ��一�1�イト文字���れ��り��ん"
 
-#: parser/parse_expr.c:1570
-msgid "subquery has too few columns"
-msgstr "副������列�少�����"
+#: commands/copy.c:1077
+msgid "COPY force quote available only in CSV mode"
+msgstr "COPY� force quote��CSVモード���使用����"
 
-#: parser/parse_expr.c:1666
-msgid "cannot determine type of empty array"
-msgstr "空��列�データ型を決定����ん"
+#: commands/copy.c:1081
+msgid "COPY force quote only available using COPY TO"
+msgstr "COPY� force quote��COPY TO���使用����"
 
-#: parser/parse_expr.c:1667
-msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
-msgstr "希望�る型�明示的�キャスト������。例：ARRAY[]::integer[]"
+#: commands/copy.c:1087
+msgid "COPY force not null available only in CSV mode"
+msgstr "COPY� force not null��CSVモード���使用����"
+
+#: commands/copy.c:1091
+msgid "COPY force not null only available using COPY FROM"
+msgstr "COPY� force not null��COPY FROM���使用����"
+
+#: commands/copy.c:1097
+msgid "COPY delimiter must not appear in the NULL specification"
+msgstr "COPY�区切り文字をNULL��値�使用����ん"
 
-#: parser/parse_expr.c:1681
+#: commands/copy.c:1104
+msgid "CSV quote character must not appear in the NULL specification"
+msgstr "COPY�引用符をNULL��値�使用����ん"
+
+#: commands/copy.c:1166
 #, c-format
-msgid "could not find element type for data type %s"
-msgstr "データ型 %s ��素を見��られ��ん���"
+msgid "table \"%s\" does not have OIDs"
+msgstr "テーブル\"%s\"�OIDを����ん"
 
-#: parser/parse_expr.c:1879
-msgid "unnamed XML attribute value must be a column reference"
-msgstr "無��XML属性値�列�照���れ��り��ん"
+#: commands/copy.c:1183
+msgid "COPY (SELECT) WITH OIDS is not supported"
+msgstr "COPY (SELECT) WITH OIDS�サ�ート�れ����ん"
 
-#: parser/parse_expr.c:1880
-msgid "unnamed XML element value must be a column reference"
-msgstr "無��XML�素値�列�照���れ��り��ん"
+#: commands/copy.c:1210
+msgid "COPY (SELECT INTO) is not supported"
+msgstr "COPY (SELECT INTO)�サ�ート�れ����ん"
 
-#: parser/parse_expr.c:1895
+#: commands/copy.c:1270
 #, c-format
-msgid "XML attribute name \"%s\" appears more than once"
-msgstr "XML属性�\"%s\"�複数�り��"
+msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
+msgstr "FORCE QUOTE�れ�列\"%s\"�COPY��照�れ��ん"
 
-#: parser/parse_expr.c:2002
+#: commands/copy.c:1292
 #, c-format
-msgid "cannot cast XMLSERIALIZE result to %s"
-msgstr "XMLSERIALIZE ��果を %s �キャスト����ん"
+msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
+msgstr "FORCE NOT NULL�れ�列\"%s\"�COPY��照�れ��ん"
 
-#: parser/parse_expr.c:2278 parser/parse_expr.c:2476
-msgid "unequal number of entries in row expressions"
-msgstr "行�����項目数�一致���ん"
+#: commands/copy.c:1356
+#, c-format
+msgid "cannot copy from view \"%s\""
+msgstr "ビュー\"%s\"�ら�コピー�����ん"
 
-#: parser/parse_expr.c:2288
-msgid "cannot compare rows of zero length"
-msgstr "長�0�行を比較����ん"
+#: commands/copy.c:1358 commands/copy.c:1364
+msgid "Try the COPY (SELECT ...) TO variant."
+msgstr "COPY (SELECT ...) TO構文を試������"
 
-#: parser/parse_expr.c:2313
+#: commands/copy.c:1362
 #, c-format
-msgid "row comparison operator must yield type boolean, not type %s"
-msgstr "行比較演算��型%s����booleanを返���れ��り��ん"
-
-#: parser/parse_expr.c:2320
-msgid "row comparison operator must not return a set"
-msgstr "行比較演算��集�を返�������ん"
+msgid "cannot copy from foreign table \"%s\""
+msgstr "外部テーブル \"%s\" �ら�コピー�����ん"
 
-#: parser/parse_expr.c:2379 parser/parse_expr.c:2423
+#: commands/copy.c:1368
 #, c-format
-msgid "could not determine interpretation of row comparison operator %s"
-msgstr "行比較演算�%s�解釈を決定����ん"
+msgid "cannot copy from sequence \"%s\""
+msgstr "シーケンス\"%s\"�ら�コピー�����ん"
 
-#: parser/parse_expr.c:2381
-msgid ""
-"Row comparison operators must be associated with btree operator families."
-msgstr "行比較演算��B-Tree演算���関連付��れ��れ��り��ん。"
+#: commands/copy.c:1373
+#, c-format
+msgid "cannot copy from non-table relation \"%s\""
+msgstr "テーブル以外�リレーション\"%s\"�ら�コピー�����ん"
 
-#: parser/parse_expr.c:2425
-msgid "There are multiple equally-plausible candidates."
-msgstr "複数�も��もら���等��候補�存在���。"
+#: commands/copy.c:1397
+msgid "relative path not allowed for COPY to file"
+msgstr "ファイル��COPY��相対パス�指定����ん"
 
-#: parser/parse_expr.c:2516
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr "IS DISTINCT FROM��=演算��booleanを返���れ��り��ん"
+#: commands/copy.c:1407
+#, c-format
+msgid "could not open file \"%s\" for writing: %m"
+msgstr "ファイル\"%s\"を書�込�用�オープン����ん���: %m"
 
-#: parser/parse_func.c:147
+#: commands/copy.c:1414 commands/copy.c:2200
 #, c-format
-msgid "argument name \"%s\" used more than once"
-msgstr "引数� \"%s\" �複数回指定�れ���"
+msgid "\"%s\" is a directory"
+msgstr "\"%s\"�ディレクトリ��"
 
-#: parser/parse_func.c:158
-msgid "positional argument cannot follow named argument"
-msgstr "�置パラメーター�次����付��引数を指定����ん。"
+#: commands/copy.c:1738
+#, c-format
+msgid "COPY %s, line %d, column %s"
+msgstr "%s�COPY。行番� %d。列 %s"
 
-#: parser/parse_func.c:236
+#: commands/copy.c:1742 commands/copy.c:1787
 #, c-format
-msgid "%s(*) specified, but %s is not an aggregate function"
-msgstr "%s(*)�指定�れ����%s�集約関数���り��ん"
+msgid "COPY %s, line %d"
+msgstr "%s�COPY。行番� %d"
 
-#: parser/parse_func.c:243
+#: commands/copy.c:1753
 #, c-format
-msgid "DISTINCT specified, but %s is not an aggregate function"
-msgstr "DISTINCT�指定�れ����%s�集約関数���り��ん"
+msgid "COPY %s, line %d, column %s: \"%s\""
+msgstr "%s�COPY。行番� %d。列 %s: \"%s\""
 
-#: parser/parse_func.c:249
+#: commands/copy.c:1761
 #, c-format
-msgid "ORDER BY specified, but %s is not an aggregate function"
-msgstr "ORDER BY �指定�れ�����%s �集約関数���り��ん"
+msgid "COPY %s, line %d, column %s: null input"
+msgstr "%s�COPY。行番� %d。列 %s: 入力�ヌル��"
 
-#: parser/parse_func.c:255
+#: commands/copy.c:1773
 #, c-format
-msgid ""
-"OVER specified, but %s is not a window function nor an aggregate function"
-msgstr ""
-"OVER �指定�れ�����%s �ウィンドウ関数�集約関数���れ�も�り��ん"
+msgid "COPY %s, line %d: \"%s\""
+msgstr "%s�COPY。行番� %d: \"%s\""
 
-#: parser/parse_func.c:277
+#: commands/copy.c:1857
 #, c-format
-msgid "function %s is not unique"
-msgstr "関数 %s �一���り��ん"
+msgid "cannot copy to view \"%s\""
+msgstr "ビュー\"%s\"��コピー�����ん"
 
-#: parser/parse_func.c:280
-msgid ""
-"Could not choose a best candidate function. You might need to add explicit "
-"type casts."
-msgstr ""
-"最善�候補関数を�択����ん���。明示的�型キャスト�必��も�れ��ん"
+#: commands/copy.c:1862
+#, c-format
+msgid "cannot copy to foreign table \"%s\""
+msgstr "外部テーブル \"%s\" ��コピー�����ん"
 
-#: parser/parse_func.c:289
-msgid ""
-"No function matches the given name and argument types. You might need to add "
-"explicit type casts."
-msgstr ""
-"指定�称�指定引数型���関数��り��ん。明示的�型キャスト�必��も�れ"
-"��ん"
+#: commands/copy.c:1867
+#, c-format
+msgid "cannot copy to sequence \"%s\""
+msgstr "シーケンス\"%s\"��コピー�����ん"
 
-#: parser/parse_func.c:396 parser/parse_func.c:461
+#: commands/copy.c:1872
 #, c-format
-msgid "%s(*) must be used to call a parameterless aggregate function"
-msgstr "%s(*)�パラメータ���集約関数�呼�出��使用���れ��り��ん"
+msgid "cannot copy to non-table relation \"%s\""
+msgstr "テーブル以外�リレーション\"%s\"��コピー�����ん"
 
-#: parser/parse_func.c:403
-msgid "aggregates cannot return sets"
-msgstr "集約�集�を返���ん"
+#: commands/copy.c:2219
+msgid "COPY file signature not recognized"
+msgstr "COPYファイル�シグ��ャ��明��"
 
-#: parser/parse_func.c:415
-msgid "aggregates cannot use named arguments"
-msgstr "集約����付�引数�使���ん"
+#: commands/copy.c:2224
+msgid "invalid COPY file header (missing flags)"
+msgstr "COPYファイル�ヘッダ�無効��(フラグ��り��ん)"
 
-#: parser/parse_func.c:434
-msgid "window function call requires an OVER clause"
-msgstr "ウィンドウ関数�呼�出��� OVER ��必���"
+#: commands/copy.c:2230
+msgid "unrecognized critical flags in COPY file header"
+msgstr "COPYファイル�ヘッダ内����フラグ��明��"
 
-#: parser/parse_func.c:451
-msgid "DISTINCT is not implemented for window functions"
-msgstr "ウィンドウ関数�対�る DISTINCT �実装�れ����ん"
+#: commands/copy.c:2236
+msgid "invalid COPY file header (missing length)"
+msgstr "COPYファイル�ヘッダ�無効��(サイズ��り��ん)"
 
-#: parser/parse_func.c:471
-msgid "aggregate ORDER BY is not implemented for window functions"
-msgstr "ウィンドウ関数�対�る集約� ORDER BY �実装�れ����ん"
+#: commands/copy.c:2243
+msgid "invalid COPY file header (wrong length)"
+msgstr "COPYファイル�ヘッダ�無効��(サイズ��正��)"
 
-#: parser/parse_func.c:477
-msgid "window functions cannot return sets"
-msgstr "ウィンドウ関数�集�を返��������ん"
+#: commands/copy.c:2376 commands/copy.c:3058 commands/copy.c:3275
+msgid "extra data after last expected column"
+msgstr "推定最終列�後�余計�データ��り���"
 
-#: parser/parse_func.c:488
-msgid "window functions cannot use named arguments"
-msgstr "ウィンドウ関数����付�引数を使���ん"
+#: commands/copy.c:2386
+msgid "missing data for OID column"
+msgstr "OID列�データ��り��ん"
 
-#: parser/parse_func.c:1550
-#, c-format
-msgid "aggregate %s(*) does not exist"
-msgstr "集約%s(*)�存在���ん"
+#: commands/copy.c:2392
+msgid "null OID in COPY data"
+msgstr "COPYデータ�OID�NULL���"
 
-#: parser/parse_func.c:1555
-#, c-format
-msgid "aggregate %s does not exist"
-msgstr "集約%s�存在���ん"
+#: commands/copy.c:2402 commands/copy.c:2501
+msgid "invalid OID in COPY data"
+msgstr "COPYデータ�OID�無効��"
 
-#: parser/parse_func.c:1574
+#: commands/copy.c:2417
 #, c-format
-msgid "function %s is not an aggregate"
-msgstr "関数%s�集約���り��ん"
+msgid "missing data for column \"%s\""
+msgstr "列\"%s\"�データ��り��ん"
 
-#: parser/parse_param.c:212
+#: commands/copy.c:2476
+msgid "received copy data after EOF marker"
+msgstr "EOF マーカー�後��コピーデータを�信����"
+
+#: commands/copy.c:2483
 #, c-format
-msgid "inconsistent types deduced for parameter $%d"
-msgstr "パラメータ$%d����推定�れ�型��整���"
+msgid "row field count is %d, expected %d"
+msgstr "行�フィールド数�%d���期待値�%d��"
 
-#: scan.l:411
-msgid "unterminated /* comment"
-msgstr "/*コメント�閉�����ん"
+#: commands/copy.c:2822 commands/copy.c:2839
+msgid "literal carriage return found in data"
+msgstr "データ�中�復帰記���も���り���"
 
-#: scan.l:440
-msgid "unterminated bit string literal"
-msgstr "ビット文字列リテラル�終端��り��ん"
+#: commands/copy.c:2823 commands/copy.c:2840
+msgid "unquoted carriage return found in data"
+msgstr "データ�中�引用符���復帰記���り���"
 
-#: scan.l:461
-msgid "unterminated hexadecimal string literal"
-msgstr "16進数文字列リテラル�終端��り��ん"
+#: commands/copy.c:2825 commands/copy.c:2842
+msgid "Use \"\\r\" to represent carriage return."
+msgstr "復帰記��\"\\r\"�表�������"
 
-#: scan.l:511
-msgid "unsafe use of string constant with Unicode escapes"
-msgstr "Unicodeエスケープを使��文字列定数��険�使用"
+#: commands/copy.c:2826 commands/copy.c:2843
+msgid "Use quoted CSV field to represent carriage return."
+msgstr "復帰記�を表��る��CSVフィールドを引用符�括������"
 
-#: scan.l:512
-msgid ""
-"String constants with Unicode escapes cannot be used when "
-"standard_conforming_strings is off."
-msgstr ""
-"Unicodeエスケープ�standard_conforming_strings�無効�時�使用�る�����"
-"��ん。"
+#: commands/copy.c:2855
+msgid "literal newline found in data"
+msgstr "データ�中�改行記���も���り���"
 
-#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
-#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
-msgid "invalid Unicode surrogate pair"
-msgstr "Unicode �サロゲートペア�無効��"
+#: commands/copy.c:2856
+msgid "unquoted newline found in data"
+msgstr "データ�中�引用符���改行記���り���"
 
-#: scan.l:586
-msgid "invalid Unicode escape"
-msgstr "Unicode �エスケープ�無効��"
+#: commands/copy.c:2858
+msgid "Use \"\\n\" to represent newline."
+msgstr "改行記��\"\\n\"�表�������"
 
-#: scan.l:587
-msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
-msgstr "Unicode エスケープ� \\uXXXX ��� \\UXXXXXXXX ���れ��り��ん。"
+#: commands/copy.c:2859
+msgid "Use quoted CSV field to represent newline."
+msgstr "改行記�を表��る��CSVフィールドを引用符�括������"
 
-#: scan.l:598
-msgid "unsafe use of \\' in a string literal"
-msgstr "文字列リテラル�安全����\\'�使用�れ���。"
+#: commands/copy.c:2905 commands/copy.c:2941
+msgid "end-of-copy marker does not match previous newline style"
+msgstr "コピー終端記���れ���改行方��一致���ん"
 
-#: scan.l:599
-msgid ""
-"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
-msgstr ""
-"文字列内�引用符を記述�る��''を使用������。\\'�クライアント���有"
-"効�符�化形���安全���り��ん。"
+#: commands/copy.c:2914 commands/copy.c:2930
+msgid "end-of-copy marker corrupt"
+msgstr "コピー終端記��破������"
 
-#: scan.l:629
-msgid "unterminated quoted string"
-msgstr "文字列�引用符�閉�����ん"
+#: commands/copy.c:3359
+msgid "unterminated CSV quoted field"
+msgstr "CSV引用符�閉�����ん"
 
-#: scan.l:674
-msgid "unterminated dollar-quoted string"
-msgstr "文字列�ドル引用符�閉�����ん"
+#: commands/copy.c:3436 commands/copy.c:3455
+msgid "unexpected EOF in COPY data"
+msgstr "COPYデータ�中�想定外�EOF��り��"
 
-#: scan.l:691 scan.l:703 scan.l:717
-msgid "zero-length delimited identifier"
-msgstr "区切り��識別��長��ゼロ��"
+#: commands/copy.c:3445
+msgid "invalid field size"
+msgstr "フィールドサイズ�無効��"
 
-#: scan.l:730
-msgid "unterminated quoted identifier"
-msgstr "識別��引用符�閉�����ん"
+#: commands/copy.c:3468
+msgid "incorrect binary data format"
+msgstr "�イナリデータ書���正��"
 
-#: scan.l:834
-msgid "operator too long"
-msgstr "演算��長����"
+#: commands/indexcmds.c:163
+msgid "must specify at least one column"
+msgstr "少���も1��列を指定���れ��り��ん"
 
-#. translator: %s is typically the translation of "syntax error"
-#: scan.l:992
+#: commands/indexcmds.c:167
 #, c-format
-msgid "%s at end of input"
-msgstr "入力�最後� %s"
+msgid "cannot use more than %d columns in an index"
+msgstr "インデックス��%dを超�る列を使用����ん"
 
-#. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1000
+#: commands/indexcmds.c:195
 #, c-format
-msgid "%s at or near \"%s\""
-msgstr "\"%2$s\"�����近辺�%1$s"
+msgid "cannot create index on foreign table \"%s\""
+msgstr "外部テーブル \"%s\" �インデックスを作�����ん"
 
-#: scan.l:1161 scan.l:1193
-msgid ""
-"Unicode escape values cannot be used for code point values above 007F when "
-"the server encoding is not UTF8"
-msgstr ""
-"サー�ー�エンコーディング� UTF-8 ����場��コード�イント�値� 007F 以"
-"上����� Unicode �エスケープ値�使用����ん"
+#: commands/indexcmds.c:210
+msgid "cannot create indexes on temporary tables of other sessions"
+msgstr "他�セッション�一時テーブル�対�るインデックスを作�����ん"
 
-#: scan.l:1189 scan.l:1325
-msgid "invalid Unicode escape value"
-msgstr "Unicode �エスケープシーケンス�無効��"
+#: commands/indexcmds.c:296
+msgid "substituting access method \"gist\" for obsolete method \"rtree\""
+msgstr "��メソッド\"rtree\"をアクセスメソッド\"gist\"�置������"
 
-#: scan.l:1214
-msgid "invalid Unicode escape character"
-msgstr "Unicode �エスケープ文字�無効��"
+#: commands/indexcmds.c:313
+#, c-format
+msgid "access method \"%s\" does not support unique indexes"
+msgstr "アクセスメソッド \"%s\" ��一�性インデックスをサ�ート�����ん"
 
-#: scan.l:1381
-msgid "nonstandard use of \\' in a string literal"
-msgstr "文字列リテラル��標準的�\\'�使用�れ���。"
+#: commands/indexcmds.c:318
+#, c-format
+msgid "access method \"%s\" does not support multicolumn indexes"
+msgstr "アクセスメソッド\"%s\"�複数列インデックスをサ�ート���ん"
 
-#: scan.l:1382
-msgid ""
-"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
-msgstr ""
-"文字列内�引用符を記述�る��''を使用������。���エスケープ文字列構"
-"文(E'...')を使用������。"
+#: commands/indexcmds.c:323
+#, c-format
+msgid "access method \"%s\" does not support exclusion constraints"
+msgstr "アクセスメソッド \"%s\" �排除制約をサ�ート�����ん"
 
-#: scan.l:1391
-msgid "nonstandard use of \\\\ in a string literal"
-msgstr "文字列リテラル��標準的�\\\\�使用�れ���。"
+#: commands/indexcmds.c:399
+#, c-format
+msgid "%s %s will create implicit index \"%s\" for table \"%s\""
+msgstr "%1$s %2$s�テーブル\"%4$s\"�暗黙的�インデックス\"%3$s\"を作����"
 
-#: scan.l:1392
-msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
-msgstr ""
-"�ックスラッシュ用�エスケープ文字列構文�例��E'\\\\'を使用������。"
+#: commands/indexcmds.c:763
+msgid "cannot use subquery in index predicate"
+msgstr "インデックス�述部�副�����を使用����ん"
+
+#: commands/indexcmds.c:767
+msgid "cannot use aggregate in index predicate"
+msgstr "インデックス�述部�集約を使用����ん"
+
+#: commands/indexcmds.c:776
+msgid "functions in index predicate must be marked IMMUTABLE"
+msgstr "インデックス�述部�関数�IMMUTABLEマーク�必���"
+
+#: commands/indexcmds.c:894
+msgid "cannot use subquery in index expression"
+msgstr "�インデックス��副�����を使用����ん"
+
+#: commands/indexcmds.c:898
+msgid "cannot use aggregate function in index expression"
+msgstr "�インデックス��集約関数を使用����ん"
 
-#: scan.l:1406
-msgid "nonstandard use of escape in a string literal"
-msgstr "文字列リテラル内��標準的�エスケープ�使用�れ���"
+#: commands/indexcmds.c:909
+msgid "functions in index expression must be marked IMMUTABLE"
+msgstr "�インデックス�関数�IMMUTABLEマーク�必���"
 
-#: scan.l:1407
-msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
-msgstr ""
-"エスケープ用�エスケープ文字列構文�例��E'\\\\r\\\\n'を使用������"
+#: commands/indexcmds.c:930
+#, 
+msgid "could not determine which collation to use for index expression"
+msgstr "インデックス��使用�る照�順�を決定����ん���"
 
-#: parser/parse_relation.c:147
+#: commands/indexcmds.c:976
 #, c-format
-msgid "table reference \"%s\" is ambiguous"
-msgstr "テーブル�照\"%s\"�曖昧��"
+msgid "operator %s is not commutative"
+msgstr "演算� %s �交��能���り��ん"
 
-#: parser/parse_relation.c:183
-#, c-format
-msgid "table reference %u is ambiguous"
-msgstr "テーブル�照%u�曖昧��"
+#: commands/indexcmds.c:978
+msgid "Only commutative operators can be used in exclusion constraints."
+msgstr "排除制約�使�る��交�演算�����"
 
-#: parser/parse_relation.c:343
+#: commands/indexcmds.c:1004
 #, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "テーブル�\"%s\"�複数指定�れ���"
+msgid "operator %s is not a member of operator family \"%s\""
+msgstr "演算� %s �演算�ファミリー \"%s\" �メン�ー���り��ん"
+
+#: commands/indexcmds.c:1007
+msgid ""
+"The exclusion operator must be related to the index operator class for the "
+"constraint."
+msgstr ""
+"��制約�件������インデックス演算�クラス�対��排除制約�関連付�ら"
+"れ��れ��り��ん"
 
-#: parser/parse_relation.c:754 parser/parse_relation.c:1043
-#: parser/parse_relation.c:1403
+#: commands/indexcmds.c:1042
 #, c-format
-msgid "table \"%s\" has %d columns available but %d columns specified"
-msgstr "テーブル\"%s\"��%d列使用������%d列指定�れ���"
+msgid "access method \"%s\" does not support ASC/DESC options"
+msgstr "アクセスメソッド\"%s\"�ASC/DESCオプションをサ�ート���ん"
 
-#: parser/parse_relation.c:784
+#: commands/indexcmds.c:1047
 #, c-format
-msgid "too many column aliases specified for function %s"
-msgstr "関数%s�指定�れ�列別��多����"
+msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
+msgstr "アクセスメソッド\"%s\"�NULLS FIRST/LASTオプションをサ�ート���ん"
 
-#: parser/parse_relation.c:850
+#: commands/indexcmds.c:1103
 #, c-format
-msgid ""
-"There is a WITH item named \"%s\", but it cannot be referenced from this "
-"part of the query."
+msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
-"\"%s\" ��� WITH 項目��り�����れ�クエリー���部分�ら��照���"
-"�ん。"
+"アクセスメソッド\"%2$s\"��データ型%1$s用�デフォルト�演算�クラス��り�"
+"�ん"
 
-#: parser/parse_relation.c:852
+#: commands/indexcmds.c:1105
 msgid ""
-"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
+"You must specify an operator class for the index or define a default "
+"operator class for the data type."
 msgstr ""
-"WITH RECURSIVE を使���も��� WITH 項目�場所を変���方�照を�����"
-"���"
-
-#: parser/parse_relation.c:1122
-msgid ""
-"a column definition list is only allowed for functions returning \"record\""
-msgstr "列定義リスト�\"record\"を返�関数���使用����"
-
-#: parser/parse_relation.c:1130
-msgid "a column definition list is required for functions returning \"record\""
-msgstr "\"record\"を返�関数��列定義リスト�必���"
+"��インデックス用�演算�クラスを指定�る��る����データ型�デフォルト"
+"演算�クラスを定義���れ��り��ん"
 
-#: parser/parse_relation.c:1177
+#: commands/indexcmds.c:1155
 #, c-format
-msgid "function \"%s\" in FROM has unsupported return type %s"
-msgstr "FROM��関数\"%s\"�サ�ート�れ��戻り値型%sを����"
+msgid "operator class \"%s\" does not accept data type %s"
+msgstr "演算�クラス\"%s\"�データ型%sを��付���ん"
 
-#: parser/parse_relation.c:1249
+#: commands/indexcmds.c:1245
 #, c-format
-msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
-msgstr "VALUESリスト\"%s\"�%d列使用�能����%d列�指定�れ���"
+msgid "there are multiple default operator classes for data type %s"
+msgstr "データ型%s��複数�デフォルト�演算�クラス��り��"
 
-#: parser/parse_relation.c:1305
+#: commands/indexcmds.c:1586
 #, c-format
-msgid "joins can have at most %d columns"
-msgstr "JOIN �指定��る���最大 %d カラム��"
+msgid "table \"%s\" has no indexes"
+msgstr "テーブル\"%s\"��インデックス��り��ん"
 
-#: parser/parse_relation.c:2038
-#, c-format
-msgid "column %d of relation \"%s\" does not exist"
-msgstr "リレーション\"%2$s\"�列\"%1$d\"�存在���ん"
+#: commands/indexcmds.c:1614
+msgid "can only reindex the currently open database"
+msgstr ""
+"�在オープン���るデータベース��を�インデックス付��る�������"
 
-#: parser/parse_relation.c:2397
+#: commands/indexcmds.c:1699
 #, c-format
-msgid "invalid reference to FROM-clause entry for table \"%s\""
-msgstr "テーブル\"%s\"用�FROM��対�る無効��照��。"
+msgid "table \"%s.%s\" was reindexed"
+msgstr "テーブル\"%s.%s\"��インデックス化�れ���"
 
-#: parser/parse_relation.c:2400
+#: commands/define.c:67 commands/define.c:222 commands/define.c:254
+#: commands/define.c:282
 #, c-format
-msgid "Perhaps you meant to reference the table alias \"%s\"."
-msgstr "テーブル別�\"%s\"�対�る�照を�図���る�も�れ��ん"
+msgid "%s requires a parameter"
+msgstr "%s�パラメータ�必���"
 
-#: parser/parse_relation.c:2402
+#: commands/define.c:108 commands/define.c:119 commands/define.c:189
+#: commands/define.c:207
 #, c-format
-msgid ""
-"There is an entry for table \"%s\", but it cannot be referenced from this "
-"part of the query."
-msgstr ""
-"テーブル\"%s\"�項目��り������������部分�ら��照����ん。"
-"\""
+msgid "%s requires a numeric value"
+msgstr "%s�数値�必���"
 
-#: parser/parse_relation.c:2408
+#: commands/define.c:175
 #, c-format
-msgid "missing FROM-clause entry for table \"%s\""
-msgstr "テーブル\"%s\"用�FROM�エントリ��り��ん"
-
-#: parser/analyze.c:441
-msgid "INSERT ... SELECT cannot specify INTO"
-msgstr "INSERT ... SELECT��INTOを指定����ん"
-
-#: parser/analyze.c:543 parser/analyze.c:968
-msgid "VALUES lists must all be the same length"
-msgstr "VALUESリスト������長����れ��り��ん"
+msgid "%s requires a Boolean value"
+msgstr "パラメータ\"%s\"�boolean値�必���"
 
-#: parser/analyze.c:564 parser/analyze.c:1073
-msgid "VALUES must not contain table references"
-msgstr "VALUES��テーブル�照を��������ん"
+#: commands/define.c:236
+#, c-format
+msgid "argument of %s must be a name"
+msgstr "%s�引数������れ��り��ん"
 
-#: parser/analyze.c:578 parser/analyze.c:1087
-msgid "VALUES must not contain OLD or NEW references"
-msgstr "VALUES��OLDやNEW���照を��������ん"
+#: commands/define.c:266
+#, c-format
+msgid "argument of %s must be a type name"
+msgstr "%s�引数�型����れ��り��ん"
 
-#: parser/analyze.c:579 parser/analyze.c:1088
-msgid "Use SELECT ... UNION ALL ... instead."
-msgstr "代�り�SELECT ... UNION ALL ... を使用������"
+#: commands/define.c:291
+#, c-format
+msgid "%s requires an integer value"
+msgstr "%s�整数値�必���"
 
-#: parser/analyze.c:689 parser/analyze.c:1100
-msgid "cannot use aggregate function in VALUES"
-msgstr "VALUES�集約関数を使用����ん"
+#: commands/define.c:312
+#, c-format
+msgid "invalid argument for %s: \"%s\""
+msgstr "%s�引数�無効��: \"%s\""
 
-#: parser/analyze.c:695 parser/analyze.c:1106
-msgid "cannot use window function in VALUES"
-msgstr "VALUES 内��ウィンドウ関数を使用����ん"
+#: commands/dbcommands.c:201
+msgid "LOCATION is not supported anymore"
+msgstr "LOCATION�も�やサ�ート�れ��ん"
 
-#: parser/analyze.c:727
-msgid "INSERT has more expressions than target columns"
-msgstr "INSERT��対象列よりも多�����り��"
+#: commands/dbcommands.c:202
+msgid "Consider using tablespaces instead."
+msgstr "代�り�テーブル空間�使用を検討������"
 
-#: parser/analyze.c:735
-msgid "INSERT has more target columns than expressions"
-msgstr "INSERT���よりも多��対象列��り��"
+#: commands/dbcommands.c:272
+msgid "permission denied to create database"
+msgstr "データベースを作��る権���り��ん"
 
-#: parser/analyze.c:984
-msgid "DEFAULT can only appear in a VALUES list within INSERT"
-msgstr "VALUESリスト内�DEFAULT�INSERT�場���使用����"
+#: commands/dbcommands.c:295
+#, c-format
+msgid "template database \"%s\" does not exist"
+msgstr "テンプレートデータベース\"%s\"�存在���ん"
 
-#: parser/analyze.c:1054 parser/analyze.c:2174
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
-msgstr "SELECT FOR UPDATE/SHAREをVALUES�使用����ん"
+#: commands/dbcommands.c:307
+#, c-format
+msgid "permission denied to copy database \"%s\""
+msgstr "データベース\"%s\"をコピー�る権���り��ん"
 
-#: parser/analyze.c:1307
-msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
-msgstr "無効�UNION/INTERSECT/EXCEPT ORDER BY���"
+#: commands/dbcommands.c:323
+#, c-format
+msgid "invalid server encoding %d"
+msgstr "サー��符�化方�%d�無効��"
 
-#: parser/analyze.c:1308
-msgid "Only result column names can be used, not expressions or functions."
-msgstr "�や関数������果列������使用�れ��。"
+#: commands/dbcommands.c:329 commands/dbcommands.c:333
+#, c-format
+msgid "invalid locale name %s"
+msgstr "ロケール� %s �無効��"
 
-#: parser/analyze.c:1309
+#: commands/dbcommands.c:352
+#, c-format
 msgid ""
-"Add the expression/function to every SELECT, or move the UNION into a FROM "
-"clause."
+"new encoding (%s) is incompatible with the encoding of the template database "
+"(%s)"
 msgstr ""
-"�/関数を����SELECT��������。���UNIONをFROM��移動�����"
-"�"
-
-#: parser/analyze.c:1376
-msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
-msgstr "INTO�UNION/INTERSECT/EXCEPT�最��SELECT���使用����"
+"新��符�化方�(%s)�テンプレートデータベース�符�化方�(%s)�互�性��り"
+"��ん"
 
-#: parser/analyze.c:1436
+#: commands/dbcommands.c:355
 msgid ""
-"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
-"same query level"
+"Use the same encoding as in the template database, or use template0 as "
+"template."
 msgstr ""
-"UNION/INTERSECT/EXCEPT��素��る文���一�����レベル�他�リレーショ"
-"ンを�照����ん"
+"テンプレートデータベース�符�化方����も�を使���も��� template0 を"
+"テンプレート���使用������"
 
-#: parser/analyze.c:1521
+#: commands/dbcommands.c:360
 #, c-format
-msgid "each %s query must have the same number of columns"
-msgstr "%s�������れ�れ��列数を返���れ��り��ん"
-
-#: parser/analyze.c:1713
-msgid "CREATE TABLE AS specifies too many column names"
-msgstr "CREATE TABLE AS�指定��列数�多����"
-
-#: parser/analyze.c:1763
-msgid "cannot use aggregate function in UPDATE"
-msgstr "UPDATE��集約関数を使用����ん"
-
-#: parser/analyze.c:1769
-msgid "cannot use window function in UPDATE"
-msgstr "UPDATE 内��ウィンドウ関数を使用����ん"
-
-#: parser/analyze.c:1876
-msgid "cannot use aggregate function in RETURNING"
-msgstr "RETURNING��集約関数を使用����ん"
-
-#: parser/analyze.c:1882
-msgid "cannot use window function in RETURNING"
-msgstr "RETURNING ��ウィンドウ関数を使用����ん"
+msgid ""
+"new collation (%s) is incompatible with the collation of the template "
+"database (%s)"
+msgstr ""
+"新��照�順�(%s)�テンプレートデータベース�照�順�(%s)�互�性��り��"
+"ã‚“"
 
-#: parser/analyze.c:1901
-msgid "RETURNING cannot contain references to other relations"
-msgstr "RETURNING�他�リレーション���照を���られ��ん"
+#: commands/dbcommands.c:362
+msgid ""
+"Use the same collation as in the template database, or use template0 as "
+"template."
+msgstr ""
+"テンプレートデータベース�照�順����も�を使���も��� template0 をテ"
+"ンプレート���使用������"
 
-#: parser/analyze.c:1940
-msgid "cannot specify both SCROLL and NO SCROLL"
-msgstr "SCROLL�NO SCROLL�両方を指定����ん"
+#: commands/dbcommands.c:367
+#, c-format
+msgid ""
+"new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
+"(%s)"
+msgstr ""
+"新��LC_CTYPE(%s)�テンプレートデータベース(%s)�LC_CTYPE�互�性��り��"
+"ã‚“"
 
-#: parser/analyze.c:1954
-msgid "DECLARE CURSOR cannot specify INTO"
-msgstr "DECLARE CURSOR��INTOを指定����ん"
+#: commands/dbcommands.c:369
+msgid ""
+"Use the same LC_CTYPE as in the template database, or use template0 as "
+"template."
+msgstr ""
+"テンプレートデータベース�LC_CTYPE���も�を使���も���template0をテン"
+"プレート���使用������"
 
-#: parser/analyze.c:1962
-msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE�サ�ート�れ����ん"
+#: commands/dbcommands.c:391 commands/dbcommands.c:1054
+msgid "pg_global cannot be used as default tablespace"
+msgstr "デフォルト�テーブル空間���pg_globalを使用����ん"
 
-#: parser/analyze.c:1963
-msgid "Holdable cursors must be READ ONLY."
-msgstr "���能カーソル�読��り�����れ��り��ん。"
+#: commands/dbcommands.c:417
+#, c-format
+msgid "cannot assign new default tablespace \"%s\""
+msgstr "新��デフォルト�テーブル空間\"%s\"を割り当�られ��ん"
 
-#: parser/analyze.c:1976
-msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
+#: commands/dbcommands.c:419
+#, c-format
+msgid ""
+"There is a conflict because database \"%s\" already has some tables in this "
+"tablespace."
 msgstr ""
-"DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE�サ�ート�れ����ん"
+"データベース\"%s\"�����テーブル������テーブル空間��り�����"
+"競������"
 
-#: parser/analyze.c:1977
-msgid "Insensitive cursors must be READ ONLY."
-msgstr "無�応カーソル�読��り�����れ��り��ん"
+#: commands/dbcommands.c:439 commands/dbcommands.c:929
+#, c-format
+msgid "database \"%s\" already exists"
+msgstr "データベース\"%s\"����存在���"
 
-#: parser/analyze.c:2030
-msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
-msgstr "DISTINCT���SELECT FOR UPDATE/SHAREを使用����ん"
+#: commands/dbcommands.c:453
+#, c-format
+msgid "source database \"%s\" is being accessed by other users"
+msgstr "元��るデータベース\"%s\"�他�ユーザ�よ��アクセス�れ����"
 
-#: parser/analyze.c:2034
-msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
-msgstr "GROUP BY���SELECT FOR UPDATE/SHAREを使用����ん"
+#: commands/dbcommands.c:695 commands/dbcommands.c:710
+#, c-format
+msgid "encoding %s does not match locale %s"
+msgstr "符�化方� %s �ロケール %s �����ん"
 
-#: parser/analyze.c:2038
-msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
-msgstr "HAVING���SELECT FOR UPDATE/SHAREを使用����ん"
+#: commands/dbcommands.c:698
+#, c-format
+msgid "The chosen LC_CTYPE setting requires encoding %s."
+msgstr ""
+"�択�れ� LC_CTYPE を設定�る���符�化方� %s ��る必���り��。"
 
-#: parser/analyze.c:2042
-msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
-msgstr "集約関数��SELECT FOR UPDATE/SHAREを使用����ん"
+#: commands/dbcommands.c:713
+#, c-format
+msgid "The chosen LC_COLLATE setting requires encoding %s."
+msgstr "�択�れ�LC_COLLATEを設定�る���符�化方�%s��る必���り��。"
 
-#: parser/analyze.c:2046
-msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
-msgstr "ウィンドウ関数�� SELECT FOR UPDATE/SHARE を使用����ん"
+#: commands/dbcommands.c:771
+#, c-format
+msgid "database \"%s\" does not exist, skipping"
+msgstr "データベース\"%s\"�存在���ん。�略���"
 
-#: parser/analyze.c:2050
-msgid ""
-"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
-"target list"
-msgstr ""
-"ターゲットリスト�中�� SELECT FOR UPDATE/SHARE を戻り値を返�関数�一緒�使"
-"��������ん"
+#: commands/dbcommands.c:792
+msgid "cannot drop a template database"
+msgstr "テンプレートデータベースを削除����ん"
 
-#: parser/analyze.c:2126
-msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
-msgstr ""
-"SELECT FOR UPDATE/SHARE ��無�件�リレーション�を指定���れ��り��ん"
+#: commands/dbcommands.c:798
+msgid "cannot drop the currently open database"
+msgstr "�在オープン���るデータベースを削除����ん"
 
-#: parser/analyze.c:2156
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
-msgstr "SELECT FOR UPDATE/SHAREを���使用����ん"
+#: commands/dbcommands.c:809 commands/dbcommands.c:951
+#: commands/dbcommands.c:1076
+#, c-format
+msgid "database \"%s\" is being accessed by other users"
+msgstr "データベース\"%s\"�他�ユーザ�らアクセス�れ����"
 
-#: parser/analyze.c:2162
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
-msgstr "SELECT FOR UPDATE/SHAREをNEWやOLD�使用����ん"
+#: commands/dbcommands.c:920
+msgid "permission denied to rename database"
+msgstr "データベース���を変更�る権���り��ん"
 
-#: parser/analyze.c:2168
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
-msgstr "SELECT FOR UPDATE/SHAREを関数�使用����ん"
+#: commands/dbcommands.c:940
+msgid "current database cannot be renamed"
+msgstr "�在�データベース���を変更����ん"
 
-#: parser/analyze.c:2180
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
-msgstr "SELECT FOR UPDATE/SHARE � WITH クエリー���用����ん"
+#: commands/dbcommands.c:1032
+msgid "cannot change the tablespace of the currently open database"
+msgstr "�在オープン中�データベース�テーブルスペース�変更����ん"
 
-#: parser/analyze.c:2194
+#: commands/dbcommands.c:1116
 #, c-format
-msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
-msgstr "FOR UPDATE/SHARE��リレーション\"%s\"�FROM���り��ん"
+msgid "some relations of database \"%s\" are already in tablespace \"%s\""
+msgstr ""
+"データベース \"%s\" �リレーション�中��テーブルスペース \"%s\"����存在"
+"�るも���り��"
 
-#: parser/parse_cte.c:40
-#, c-format
+#: commands/dbcommands.c:1118
 msgid ""
-"recursive reference to query \"%s\" must not appear within its non-recursive "
-"term"
-msgstr "クエリー \"%s\" ���帰的�照������帰項目内��れ���り��ん"
+"You must move them back to the database's default tablespace before using "
+"this command."
+msgstr ""
+"��コマンドを使����データベース�デフォルト�テーブルスペース�戻���"
+"れ��り��ん。"
 
-#: parser/parse_cte.c:42
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within a subquery"
-msgstr "クエリー \"%s\" ���帰的�照��副�����内��れ���り��ん"
+#: commands/dbcommands.c:1490
+msgid "permission denied to change owner of database"
+msgstr "データベース�所有者を変更�る権���り��ん"
 
-#: parser/parse_cte.c:44
+#: commands/dbcommands.c:1802
 #, c-format
 msgid ""
-"recursive reference to query \"%s\" must not appear within an outer join"
-msgstr "クエリー \"%s\" ���帰的�照��外部��内��れ���り��ん"
-
-#: parser/parse_cte.c:46
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
-msgstr "クエリー \"%s\" ���帰的�照��INTERSECT 内��れ���り��ん"
+"There are %d other session(s) and %d prepared transaction(s) using the "
+"database."
+msgstr ""
+"他���データベースを使���る %d 個�セッション� %d 個�準備済�トランザ"
+"クション��り��。"
 
-#: parser/parse_cte.c:48
+#: commands/dbcommands.c:1805
 #, c-format
-msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
-msgstr "クエリー \"%s\" ���帰的�照��EXCEPT 内��れ���り��ん"
+msgid "There are %d other session(s) using the database."
+msgstr "他���データベースを使���る %d 個�セッション��り��。"
 
-#: parser/parse_cte.c:130
+#: commands/dbcommands.c:1808
 #, c-format
-msgid "WITH query name \"%s\" specified more than once"
-msgstr "WITH クエリー� \"%s\" �複数回指定�れ���"
+msgid "There are %d prepared transaction(s) using the database."
+msgstr "��データベースを使用�る準備�れ�トランザクション�%d存在���。"
 
-#: parser/parse_cte.c:247
-msgid "subquery in WITH cannot have SELECT INTO"
-msgstr "WITH ���る副������� SELECT INTO を使用����ん"
+#: commands/operatorcmds.c:100
+msgid "=> is deprecated as an operator name"
+msgstr ">= �演算�����廃止予定��り�推奨�れ��ん"
 
-#: parser/parse_cte.c:288
-#, c-format
+#: commands/operatorcmds.c:101
 msgid ""
-"recursive query \"%s\" column %d has type %s in non-recursive term but type %"
-"s overall"
+"This name may be disallowed altogether in future versions of PostgreSQL."
 msgstr ""
-"�帰クエリー \"%s\" � %d 個目�カラム���帰項目内� %s 型�������"
-"��全体的�� %s 型�������"
+"PostgreSQL �将���ージョン��������使����る�能性��り��"
 
-#: parser/parse_cte.c:294
-msgid "Cast the output of the non-recursive term to the correct type."
-msgstr "��帰項目�出力を正��型�キャスト������"
+#: commands/operatorcmds.c:122 commands/operatorcmds.c:130
+msgid "SETOF type not allowed for operator argument"
+msgstr "演算��引数��SETOF型を使用����ん"
 
-#: parser/parse_cte.c:376
+#: commands/operatorcmds.c:158
 #, c-format
-msgid "WITH query \"%s\" has %d columns available but %d columns specified"
-msgstr ""
-"WITH クエリー \"%s\" �� %d 個�カラム�使用������%d 個�カラム�指定"
-"�れ���"
+msgid "operator attribute \"%s\" not recognized"
+msgstr "演算��属性\"%s\"��明��"
 
-#: parser/parse_cte.c:556
-msgid "mutual recursion between WITH items is not implemented"
-msgstr "WITH 項目間�士��帰�実装�れ����ん"
+#: commands/operatorcmds.c:168
+msgid "operator procedure must be specified"
+msgstr "演算��プロシージャを指定���れ��り��ん"
+
+#: commands/operatorcmds.c:179
+msgid "at least one of leftarg or rightarg must be specified"
+msgstr "少���も�辺�左辺���ら�を指定���れ��り��ん"
 
-#: parser/parse_cte.c:608
+#: commands/operatorcmds.c:228
 #, c-format
-msgid ""
-"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
-"recursive-term"
-msgstr "�帰クエリー \"%s\" � ��帰項目 UNION [ALL] �帰項目 ��り��ん"
+msgid "restriction estimator function %s must return type \"float8\""
+msgstr "制約推測用関数 %s � \"float8\" 型を返���れ��り��ん"
 
-#: parser/parse_cte.c:640
-msgid "ORDER BY in a recursive query is not implemented"
-msgstr "�帰クエリー内� ORDER BY �実装�れ����ん"
+#: commands/operatorcmds.c:267
+#, c-format
+msgid "join estimator function %s must return type \"float8\""
+msgstr "JOIN 推測用関数 %s � \"float8\" 型を返���れ��り��ん"
 
-#: parser/parse_cte.c:646
-msgid "OFFSET in a recursive query is not implemented"
-msgstr "�帰クエリー内� OFFSET �実装�れ����ん"
+#: commands/operatorcmds.c:318
+#, c-format
+msgid "operator %s does not exist, skipping"
+msgstr "演算�%s�存在���ん。�略���"
 
-#: parser/parse_cte.c:652
-msgid "LIMIT in a recursive query is not implemented"
-msgstr "�帰クエリー内� LIMIT �実装�れ����ん"
+#: commands/typecmds.c:169
+msgid "must be superuser to create a base type"
+msgstr "基本型を作���る��スーパーユーザ����"
 
-#: parser/parse_cte.c:658
-msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
-msgstr "�帰クエリー内� FOR UPDATE/SHARE �実装�れ����ん"
+#: commands/typecmds.c:275
+#, c-format
+msgid "type attribute \"%s\" not recognized"
+msgstr "型�属性\"%s\"��明��"
 
-#: parser/parse_cte.c:715
+#: commands/typecmds.c:329
 #, c-format
-msgid "recursive reference to query \"%s\" must not appear more than once"
-msgstr "クエリー \"%s\" ���帰�照�２回以上�れ���り��ん"
+msgid "invalid type category \"%s\": must be simple ASCII"
+msgstr "型カテゴリ \"%s\" �無効��。�純� ASCII ���れ��り��ん"
 
-#: main/main.c:230
+#: commands/typecmds.c:348
 #, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr "%s: setsysinfo�失敗����: %s\n"
+msgid "array element type cannot be %s"
+msgstr "%sを�列�素�型��る�������ん"
 
-#: main/main.c:249
+#: commands/typecmds.c:380
 #, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s: WSAStartup�失敗����: %d\n"
+msgid "alignment \"%s\" not recognized"
+msgstr "アライメント\"%s\"��明��"
 
-#: main/main.c:268
+#: commands/typecmds.c:397
 #, c-format
+msgid "storage \"%s\" not recognized"
+msgstr "格�方�\"%s\"��明��"
+
+#: commands/typecmds.c:408
+msgid "type input function must be specified"
+msgstr "型�入力関数を指定���れ��り��ん"
+
+#: commands/typecmds.c:412
+msgid "type output function must be specified"
+msgstr "型�出力関数を指定���れ��り��ん"
+
+#: commands/typecmds.c:417
 msgid ""
-"%s is the PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s�PostgreSQLサー���\n"
-"\n"
+"type modifier output function is useless without a type modifier input "
+"function"
+msgstr "型修正入力関数���場��型修正出力関数��味��り��ん"
 
-#: main/main.c:269
+#: commands/typecmds.c:440
 #, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION]...\n"
-"\n"
-msgstr ""
-"使用方法:\n"
-"\"  %s [オプション]...\n"
-"\n"
+msgid "changing return type of function %s from \"opaque\" to %s"
+msgstr "関数%s�戻り値型を\"opaque\"�ら%s�変更�����"
 
-#: main/main.c:270
+#: commands/typecmds.c:447
 #, c-format
-msgid "Options:\n"
-msgstr "オプション:\n"
+msgid "type input function %s must return type %s"
+msgstr "型�入力関数%s�型%sを返���れ��り��ん"
 
-#: main/main.c:272
+#: commands/typecmds.c:457
 #, c-format
-msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr "  -A 1|0          実行時�アサート検査を有効/無効����\n"
+msgid "changing return type of function %s from \"opaque\" to \"cstring\""
+msgstr "関数%s�戻り値型を\"opaque\"�ら\"cstring\"�変更�����"
 
-#: main/main.c:274
+#: commands/typecmds.c:464
 #, c-format
-msgid "  -B NBUFFERS     number of shared buffers\n"
-msgstr "  -B NBUFFERS     共有�ッファ数��\n"
+msgid "type output function %s must return type \"cstring\""
+msgstr "型�出力関数%s�型\"cstring\"を返���れ��り��ん"
 
-#: main/main.c:275
+#: commands/typecmds.c:473
 #, c-format
-msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr "  -c NAME=VALUE   実行時パラメータを設定���\n"
+msgid "type receive function %s must return type %s"
+msgstr "型��信関数%s�型%sを返���れ��り��ん"
 
-#: main/main.c:276
+#: commands/typecmds.c:482
 #, c-format
-msgid "  -d 1-5          debugging level\n"
-msgstr "  -d 1-5          デ�ッグレベル��\n"
+msgid "type send function %s must return type \"bytea\""
+msgstr "型��信関数%s�型\"bytea\"を返���れ��り��ん"
+
+#: commands/typecmds.c:687
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\"�ドメイン���り��ん"
+
+#: commands/typecmds.c:827
+#, c-format
+msgid "\"%s\" is not a valid base type for a domain"
+msgstr "\"%s\"�ドメイン�基本型���無効��"
+
+#: commands/typecmds.c:909
+msgid "multiple default expressions"
+msgstr "デフォルト��複数�り��"
+
+#: commands/typecmds.c:973 commands/typecmds.c:982
+msgid "conflicting NULL/NOT NULL constraints"
+msgstr "NULL制約�NOT NULL制約�競������"
+
+#: commands/typecmds.c:1001 commands/typecmds.c:1983
+msgid "unique constraints not possible for domains"
+msgstr "ドメイン��一�性制約�使用����ん"
+
+#: commands/typecmds.c:1007 commands/typecmds.c:1989
+msgid "primary key constraints not possible for domains"
+msgstr "ドメイン��プライマリキー制約�����ん"
+
+#: commands/typecmds.c:1013 commands/typecmds.c:1995
+msgid "exclusion constraints not possible for domains"
+msgstr "ドメイン��排除制約�使用����ん"
+
+#: commands/typecmds.c:1019 commands/typecmds.c:2001
+msgid "foreign key constraints not possible for domains"
+msgstr "ドメイン用�外部キー制約�����ん"
+
+#: commands/typecmds.c:1028 commands/typecmds.c:2010
+msgid "specifying constraint deferrability not supported for domains"
+msgstr "ドメイン��制約�延�指定�サ�ート�����ん"
 
-#: main/main.c:277
+#: commands/typecmds.c:1332
 #, c-format
-msgid "  -D DATADIR      database directory\n"
-msgstr "  -D DATADIR      データベースディレクトリ��\n"
+msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
+msgstr "関数%s�引数型を\"opaque\"�ら\"cstring\"�変更�����"
 
-#: main/main.c:278
+#: commands/typecmds.c:1383
 #, c-format
-msgid "  -e              use European date input format (DMY)\n"
-msgstr "  -e              ヨーロッパ方��日付入力を行���(DMY)\n"
+msgid "changing argument type of function %s from \"opaque\" to %s"
+msgstr "関数%s�引数型を\"opaque\"�ら%s�変更�����"
 
-#: main/main.c:279
+#: commands/typecmds.c:1482
 #, c-format
-msgid "  -F              turn fsync off\n"
-msgstr "  -F              fsyncを無効����\n"
+msgid "typmod_in function %s must return type \"integer\""
+msgstr "typmod_in関数%s�\"integer\"型を返���れ��り��ん"
 
-#: main/main.c:280
+#: commands/typecmds.c:1509
 #, c-format
-msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr "  -h HOSTNAME     接続を監視�るホスト����IPアドレス��\n"
+msgid "typmod_out function %s must return type \"cstring\""
+msgstr "typmod_out関数%s�型\"cstring\"を返���れ��り��ん"
 
-#: main/main.c:281
+#: commands/typecmds.c:1536
 #, c-format
-msgid "  -i              enable TCP/IP connections\n"
-msgstr "  -i              TCP/IP接続を有効����\n"
+msgid "type analyze function %s must return type \"boolean\""
+msgstr "型�解�関数%s�\"boolean\"型を返���れ��り��ん"
 
-#: main/main.c:282
+#: commands/typecmds.c:1835
 #, c-format
-msgid "  -k DIRECTORY    Unix-domain socket location\n"
-msgstr "  -k DIRECTORY    Unixドメインソケット�場所��\n"
+msgid "column \"%s\" of table \"%s\" contains null values"
+msgstr "テーブル\"%2$s\"�列\"%1$s\"�NULL値��り��"
 
-#: main/main.c:284
+#: commands/typecmds.c:2081
 #, c-format
-msgid "  -l              enable SSL connections\n"
-msgstr "  -l              SSL接続を有効����\n"
+msgid ""
+"column \"%s\" of table \"%s\" contains values that violate the new constraint"
+msgstr "テーブル\"%2$s\"�列\"%1$s\"�新��制約����る値��り��"
 
-#: main/main.c:286
+#: commands/typecmds.c:2286
 #, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
-msgstr "  -N MAX-CONNECT  許容�る最大接続数��\n"
+msgid "%s is not a domain"
+msgstr "%s �ドメイン���り��ん"
 
-#: main/main.c:287
+#: commands/typecmds.c:2368 commands/typecmds.c:2377
+msgid "cannot use table references in domain check constraint"
+msgstr "ドメイン�検査制約��テーブル�照を使用����ん"
+
+#: commands/typecmds.c:2607 commands/typecmds.c:2679 commands/typecmds.c:2903
 #, c-format
-msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
-msgstr ""
-"  -o OPTIONS      個々�サー�プロセス�\"OPTIONS\"を渡���(��形�)\n"
+msgid "%s is a table's row type"
+msgstr "%s�テーブル�行型��"
 
-#: main/main.c:288
+#: commands/typecmds.c:2609 commands/typecmds.c:2681 commands/typecmds.c:2905
+msgid "Use ALTER TABLE instead."
+msgstr "代�り�ALTER TABLEを使用������"
+
+#: commands/typecmds.c:2616 commands/typecmds.c:2688 commands/typecmds.c:2834
 #, c-format
-msgid "  -p PORT         port number to listen on\n"
-msgstr "  -p PORT         接続を監視�る�ート番���\n"
+msgid "cannot alter array type %s"
+msgstr "�列型%sを変更����ん"
 
-#: main/main.c:289
+#: commands/typecmds.c:2618 commands/typecmds.c:2690 commands/typecmds.c:2836
 #, c-format
-msgid "  -s              show statistics after each query\n"
-msgstr "  -s              �������後�統計情報を表示���\n"
+msgid "You can alter type %s, which will alter the array type as well."
+msgstr "型%sを変更�る�������。�れ��時����列型も変更���。"
 
-#: main/main.c:290
+#: commands/typecmds.c:2889
 #, c-format
-msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
-msgstr "  -S WORK-MEM     ソート用�メモリ���(KB��)\n"
+msgid "type \"%s\" already exists in schema \"%s\""
+msgstr "型\"%s\"�スキーマ\"%s\"内����存在���"
 
-#: main/main.c:291
+#: commands/lockcmds.c:93
 #, c-format
-msgid "  --NAME=VALUE    set run-time parameter\n"
-msgstr "  --NAME=VALUE    実行時パラメータを設定���\n"
+msgid "could not obtain lock on relation \"%s\""
+msgstr "リレーション\"%s\"�ロックを�得����ん���"
 
-#: main/main.c:292
+#: commands/lockcmds.c:98
 #, c-format
-msgid "  --describe-config  describe configuration parameters, then exit\n"
-msgstr "  --describe-config  設定パラメータを出力�終了���\n"
+msgid "could not obtain lock on relation with OID %u"
+msgstr "OID %u �リレーション�対�るロックを�得����ん���"
 
-#: main/main.c:293
+#: commands/view.c:143
 #, c-format
-msgid "  --help          show this help, then exit\n"
-msgstr "  --help          ヘルプを表示�終了���\n"
+msgid "could not determine which collation to use for view column \"%s\""
+msgstr "ビュー�列 \"%s\" �使用�る照�順�を決定����ん���"
 
-#: main/main.c:294
+#: commands/view.c:158
+msgid "view must have at least one column"
+msgstr "ビュー��少���も1��列�必���"
+
+#: commands/view.c:284 commands/view.c:296
+msgid "cannot drop columns from view"
+msgstr "ビュー�らカラムを削除����ん"
+
+#: commands/view.c:301
 #, c-format
-msgid "  --version       output version information, then exit\n"
-msgstr "  --version       �ージョン情報を出力�終了���\n"
+msgid "cannot change name of view column \"%s\" to \"%s\""
+msgstr "ビュー�カラム���を \"%s\" �ら \"%s\" �変更����ん"
 
-#: main/main.c:296
+#: commands/view.c:309
 #, c-format
-msgid ""
-"\n"
-"Developer options:\n"
+msgid "cannot change data type of view column \"%s\" from %s to %s"
+msgstr "ビュー�カラム \"%s\" �データ型を %s �ら %s �変更����ん"
+
+#: commands/view.c:447
+#, 
+msgid "views must not contain SELECT INTO"
+msgstr "ビュー�� SELECT INTO を使用����ん"
+
+#: commands/view.c:451
+msgid "views must not contain data-modifying statements in WITH"
 msgstr ""
-"\n"
-"開発者��オプション:\n"
+"ビュー�� WITH ��データを変更�るステートメントを�む�������ん"
 
-#: main/main.c:297
-#, c-format
-msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
-msgstr "�����計画型を�止���\n"
+#: commands/view.c:479
+msgid "CREATE VIEW specifies more column names than columns"
+msgstr "CREATE VIEW��列よりも多��列�を指定���れ��り��ん"
 
-#: main/main.c:298
+#: commands/view.c:496
 #, c-format
-msgid ""
-"  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr "  -n              異常終了後�共有メモリ��期化を行���ん\n"
+msgid "view \"%s\" will be a temporary view"
+msgstr "ビュー\"%s\"�一時ビュー��り��"
 
-#: main/main.c:299
+#: commands/view.c:504
+msgid "views cannot be unlogged because they do not have storage"
+msgstr "ビュー��れ用�格�領域を�������ログを�ら����許�れ��ん"
+
+#: lib/stringinfo.c:267
 #, c-format
-msgid "  -O              allow system table structure changes\n"
-msgstr "  -O              システムテーブル構造�変更を許����\n"
+msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
+msgstr ""
+"%d�イトを��文字列�ッファを%d�イト多��大���る�������ん。"
 
-#: main/main.c:300
+#: rewrite/rewriteSupport.c:117 rewrite/rewriteRemove.c:62
+#: rewrite/rewriteDefine.c:702 rewrite/rewriteDefine.c:764
 #, c-format
-msgid "  -P              disable system indexes\n"
-msgstr "  -P              システムインデックスを無効����\n"
+msgid "rule \"%s\" for relation \"%s\" does not exist"
+msgstr "リレーション\"%2$s\"�ルール\"%1$s\"�存在���ん"
 
-#: main/main.c:301
+#: rewrite/rewriteSupport.c:156
 #, c-format
-msgid "  -t pa|pl|ex     show timings after each query\n"
-msgstr "  -t pa|pl|ex     �������後�タイミングを表示���\n"
+msgid "rule \"%s\" does not exist"
+msgstr "ルール\"%s\"�存在���ん"
 
-#: main/main.c:302
+#: rewrite/rewriteSupport.c:165
 #, c-format
-msgid "  -T              send SIGSTOP to all backend servers if one dies\n"
-msgstr ""
-"  -T              1���ックエンドサー���止��時�全���ックグランド"
-"サー��SIGSTOPを�信���\n"
+msgid "there are multiple rules named \"%s\""
+msgstr "複数�\"%s\"������ルール��り��"
 
-#: main/main.c:303
+#: rewrite/rewriteSupport.c:166
+msgid "Specify a relation name as well as a rule name."
+msgstr "ルール��加�リレーション�を指定������"
+
+#: rewrite/rewriteRemove.c:66
 #, c-format
-msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
-msgstr "  -W NUM          デ�ッガを設定��るよ��NUM秒待機���\n"
+msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
+msgstr "リレーション\"%2$s\"�ルール\"%1$s\"�存在���ん。�略���"
 
-#: main/main.c:305
+#: rewrite/rewriteHandler.c:485
 #, c-format
 msgid ""
-"\n"
-"Options for single-user mode:\n"
+"WITH query name \"%s\" appears in both a rule action and the query being "
+"rewritten"
 msgstr ""
-"\n"
-"シングルユーザモード用�オプション:\n"
+"WITH �クエリー� \"%s\" ��ルール�アクション�書���られよ�����る"
+"クエリー�両方��れ����"
 
-#: main/main.c:306
-#, c-format
-msgid "  --single        selects single-user mode (must be first argument)\n"
-msgstr ""
-"  --single        シングルユーザモードを�択���（最��引数���れ��り"
-"��ん）\n"
+#: rewrite/rewriteHandler.c:543
+msgid "cannot have RETURNING lists in multiple rules"
+msgstr "複数ルール��RETURNINGリストを���������ん"
 
-#: main/main.c:307
+#: rewrite/rewriteHandler.c:874 rewrite/rewriteHandler.c:892
 #, c-format
-msgid "  DBNAME          database name (defaults to user name)\n"
-msgstr "  DBNAME          データベース（デフォルト�ユーザ���）\n"
+msgid "multiple assignments to same column \"%s\""
+msgstr "��列\"%s\"�複数�代入��り��"
 
-#: main/main.c:308
+#: rewrite/rewriteHandler.c:1626 rewrite/rewriteHandler.c:2021
 #, c-format
-msgid "  -d 0-5          override debugging level\n"
-msgstr "  -d 1-5          デ�ッグレベルを上書����\n"
+msgid "infinite recursion detected in rules for relation \"%s\""
+msgstr "リレーション\"%s\"�ルール�無��帰を検出����"
 
-#: main/main.c:309
-#, c-format
-msgid "  -E              echo statement before execution\n"
-msgstr "  -E              実行��文を表示���\n"
+#: rewrite/rewriteHandler.c:1882
+msgid ""
+"DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
+"WITH"
+msgstr "WITH �データを変更�るステートメント��る場��"
+" DO INSTEAD NOTHING ルール�サ�ート�れ��ん"
 
-#: main/main.c:310
-#, c-format
-msgid "  -j              do not use newline as interactive query delimiter\n"
-msgstr "  -j              対話�������区切り���改行を使用���ん\n"
+#: rewrite/rewriteHandler.c:1896
+msgid ""
+"conditional DO INSTEAD rules are not supported for data-modifying statements "
+"in WITH"
+msgstr "WITH �データを変更�るステートメント��る場���"
+"�件付� DO INSTEAD ルール�サ�ート�れ��ん"
 
-#: main/main.c:311 main/main.c:316
-#, c-format
-msgid "  -r FILENAME     send stdout and stderr to given file\n"
-msgstr ""
-"  -r FILENAME     標準出力�標準エラー出力を指定��ファイル��信���\n"
+#: rewrite/rewriteHandler.c:1900
+msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
+msgstr "WITH �データを変更�るステートメント��る場��"
+" DO ALSO ルール�サ�ート�れ��ん"
 
-#: main/main.c:313
-#, c-format
+#: rewrite/rewriteHandler.c:1905
 msgid ""
-"\n"
-"Options for bootstrapping mode:\n"
-msgstr ""
-"\n"
-"�期起動用�オプション:\n"
+"multi-statement DO INSTEAD rules are not supported for data-modifying "
+"statements in WITH"
+msgstr "WITH �データを変更�るステートメント��る場��"
+"マル�ステートメント� DO INSTEAD ルール�サ�ート�れ��ん"
 
-#: main/main.c:314
+#: rewrite/rewriteHandler.c:2059
 #, c-format
-msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
-msgstr ""
-"  --boot          �期起動モードを�択���（最��引数���れ��り��"
-"ん）\n"
+msgid "cannot perform INSERT RETURNING on relation \"%s\""
+msgstr "リレーション\"%s\"��INSERT RETURNINGを行��������ん"
 
-#: main/main.c:315
-#, c-format
+#: rewrite/rewriteHandler.c:2061
 msgid ""
-"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
-msgstr "  DBNAME         データベース�（�期起動モード��義務的�引数）\n"
+"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
+msgstr "RETURNING�を��無�件�ON INSERT DO INSTEADルール�必���。"
 
-#: main/main.c:317
+#: rewrite/rewriteHandler.c:2066
 #, c-format
-msgid "  -x NUM          internal use\n"
-msgstr "  -x NUM          内部使用\n"
+msgid "cannot perform UPDATE RETURNING on relation \"%s\""
+msgstr "リレーション\"%s\"��UPDATE RETURNINGを行��������ん"
 
-#: main/main.c:319
+#: rewrite/rewriteHandler.c:2068
+msgid ""
+"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
+msgstr "RETURNING�を��無�件�ON UPDATE DO INSTEADルール�必���。"
+
+#: rewrite/rewriteHandler.c:2073
 #, c-format
+msgid "cannot perform DELETE RETURNING on relation \"%s\""
+msgstr "リレーション\"%s\"��DELETE RETURNINGを行��������ん"
+
+#: rewrite/rewriteHandler.c:2075
 msgid ""
-"\n"
-"Please read the documentation for the complete list of run-time\n"
-"configuration settings and how to set them on the command line or in\n"
-"the configuration file.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"実効時設定パラメータ�全一覧�コマンドラインや設定ファイル���る\n"
-"設定方法�����ドキュメントを�照������。\n"
-"\n"
-"�具��<pgsql-bugs@postgresql.org>��報告������\n"
+"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
+msgstr "RETURNING�を��無�件�ON DELETE DO INSTEADルール�必���。"
 
-#: main/main.c:333
+#: rewrite/rewriteHandler.c:2139
 msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"PostgreSQLを\"root\"�実行�る�������ん。\n"
-"システムセキュリティ��険防止����特権ユーザID�サー�を起動��\n"
-"�れ��り��ん。�切�サー��起動方法�関�る詳細�ドキュメントを\n"
-"�照������\n"
+"WITH cannot be used in a query that is rewritten by rules into multiple "
+"queries"
+msgstr "複数クエリー�対�るルール�より書���られ�クエリー��"
+" WITH を使用����ん"
+
+#: rewrite/rewriteManip.c:1012
+msgid "conditional utility statements are not implemented"
+msgstr "�件付��ユーティリティ文�実装�れ����ん"
 
-#: main/main.c:350
+#: rewrite/rewriteManip.c:1177
+msgid "WHERE CURRENT OF on a view is not implemented"
+msgstr "ビュー�対�るWHERE CURRENT OF�実装�れ����ん"
+
+#: rewrite/rewriteDefine.c:109 rewrite/rewriteDefine.c:771
 #, c-format
-msgid "%s: real and effective user IDs must match\n"
-msgstr "%s: リアルユーザID�実効ユーザID�一致���れ��り��ん\n"
+msgid "rule \"%s\" for relation \"%s\" already exists"
+msgstr "リレーション\"%2$s\"�ルール\"%1$s\"����存在���"
 
-#: main/main.c:357
-msgid ""
-"Execution of PostgreSQL by a user with administrative permissions is not\n"
-"permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromises.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"PostgreSQLを管�者権�を��ユーザ�実行�る�������ん。\n"
-"システムセキュリティ��険防止����特権ユーザID�サー�を起動��\n"
-"�れ��り��ん。�切�サー��起動方法�関�る詳細�ドキュメントを\n"
-"�照������\n"
+#: rewrite/rewriteDefine.c:289
+msgid "rule actions on OLD are not implemented"
+msgstr "OLD�対�るルールアクション�実装�れ����ん"
 
-#: main/main.c:378
-#, c-format
-msgid "%s: invalid effective UID: %d\n"
-msgstr "%s: 実効UID�無効��: %d\n"
+#: rewrite/rewriteDefine.c:290
+msgid "Use views or triggers instead."
+msgstr "代�り�ビュー�トリガを使用������。"
 
-#: main/main.c:391
-#, c-format
-msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr "%s: ユーザ�を決定����ん���(GetUserName�失敗����)\n"
+#: rewrite/rewriteDefine.c:294
+msgid "rule actions on NEW are not implemented"
+msgstr "NEW�対�るルールアクション�実装�れ����ん"
 
-#: replication/walreceiver.c:138
-msgid "terminating walreceiver process due to administrator command"
-msgstr "管�者コマンド�より WAL �信プロセスを終了�����"
+#: rewrite/rewriteDefine.c:295
+msgid "Use triggers instead."
+msgstr "代�り�トリガを使用������。"
 
-#: replication/walreceiver.c:287
-msgid "cannot continue WAL streaming, recovery has already ended"
-msgstr "WAL ストリーミングを継続����ん。リカ�リ����終������。"
+#: rewrite/rewriteDefine.c:308
+msgid "INSTEAD NOTHING rules on SELECT are not implemented"
+msgstr "SELECT�対�るINSTEAD NOTHINGルール�実装�れ����ん"
 
-#: replication/walsender.c:116
-msgid "recovery is still in progress, can't accept WAL streaming connections"
-msgstr "リカ�リ���実行中����WAL ストリーミング接続を��付�られ��ん"
+#: rewrite/rewriteDefine.c:309
+msgid "Use views instead."
+msgstr "代�り�ビューを使用������"
 
-#: replication/walsender.c:278
-msgid "standby connections not allowed because wal_level=minimal"
-msgstr "wal_level=minimal ����スタン�イ接続�����ん"
+#: rewrite/rewriteDefine.c:317
+msgid "multiple actions for rules on SELECT are not implemented"
+msgstr "SELECT�対�るルール���る複数�アクション�実装�れ����ん"
 
-#: replication/walsender.c:300
-msgid "invalid standby query string: %s"
-msgstr "スタン�イクエリ文字列�無効��：%s"
+#: rewrite/rewriteDefine.c:329
+msgid "rules on SELECT must have action INSTEAD SELECT"
+msgstr "SELECT�対�るルール�INSTEAD SELECTアクションを����れ��り��ん"
 
-#: replication/walsender.c:313 replication/walsender.c:339
-msgid "unexpected EOF on standby connection"
-msgstr "スタン�イ接続�想定外�EOF��り���"
+#: rewrite/rewriteDefine.c:337
+msgid "rules on SELECT must not contain data-modifying statements in WITH"
+msgstr "SELECT �ルール�� WITH �データを変更�るステートメントを"
+"�む�������ん"
 
-#: replication/walsender.c:319
-msgid "invalid standby handshake message type %d"
-msgstr "スタン�イ�ンドシェイクメッセージ�タイプ %d �無効��"
+#: rewrite/rewriteDefine.c:345
+msgid "event qualifications are not implemented for rules on SELECT"
+msgstr "SELECT�対�るルール��イベント�件�実装�れ����ん"
 
-#: replication/walsender.c:360
-msgid "invalid standby closing message type %d"
-msgstr "スタン�イクロージングメッセージ�タイプ %d �無効��"
+#: rewrite/rewriteDefine.c:370
+#, c-format
+msgid "\"%s\" is already a view"
+msgstr "\"%s\"����ビュー��"
 
-#: replication/walsender.c:506
+#: rewrite/rewriteDefine.c:394
 #, c-format
-msgid ""
-"number of requested standby connections exceeds max_wal_senders (currently %"
-"d)"
-msgstr ""
-"�求�れ�スタン�イ接続� max_wal_senders を超�����"
-"（�在� %d）"
+msgid "view rule for \"%s\" must be named \"%s\""
+msgstr "\"%s\"用�ビュー�ルール����\"%s\"���れ��り��ん"
 
-#: replication/walsender.c:578 replication/walsender.c:640
+#: rewrite/rewriteDefine.c:419
 #, c-format
-msgid "requested WAL segment %s has already been removed"
-msgstr "�求�れ� WAL セグメント %s ����削除�れ����"
+msgid "could not convert table \"%s\" to a view because it is not empty"
+msgstr "空���り��ん��テーブル\"%s\"をビュー�変�����ん"
 
-#: replication/walsender.c:611
-msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
-msgstr ""
-"ログファイル %u をセグメント %u�オフセット %u�長� %lu �読�込���ん���: %m"
+#: rewrite/rewriteDefine.c:426
+#, c-format
+msgid "could not convert table \"%s\" to a view because it has triggers"
+msgstr "トリガを����る��テーブル\"%s\"をビュー�変�����ん���"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:100
-msgid "could not connect to the primary server: %s"
-msgstr "プライマリサー���接続�����ん���：%s"
+#: rewrite/rewriteDefine.c:428
+msgid ""
+"In particular, the table cannot be involved in any foreign key relationships."
+msgstr "具体的���テーブル�外部キー関係を���る�������ん"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:112
+#: rewrite/rewriteDefine.c:433
 #, c-format
-msgid ""
-"could not receive database system identifier and timeline ID from the "
-"primary server: %s"
+msgid "could not convert table \"%s\" to a view because it has indexes"
 msgstr ""
-"プライマリサー��らデータベースシステム�識別��"
-"タイムライン ID を�信����ん���：%s"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:123
-msgid "invalid response from primary server"
-msgstr "プライマリサー��ら�応答�無効��"
+"インデックスを����る��テーブル\"%s\"をビュー�変�����ん���"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:124
+#: rewrite/rewriteDefine.c:439
 #, c-format
-msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
-msgstr ""
-"２個�フィールドを��１個�タプルを期待��������"
-"%2$d 個�フィールドを�� %1$d 個�タプルを�信����。"
+msgid "could not convert table \"%s\" to a view because it has child tables"
+msgstr "�テーブルを����る��テーブル\"%s\"をビュー�変�����ん���"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:139
-msgid "database system identifier differs between the primary and standby"
-msgstr ""
-"データベースシステム�識別��プライマリサー��スタン�イサー�間�異�り��"
+#: rewrite/rewriteDefine.c:466
+msgid "cannot have multiple RETURNING lists in a rule"
+msgstr "ルール��複数�RETURNING行を���������ん"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:140
-#, c-format
-msgid "The primary's identifier is %s, the standby's identifier is %s."
-msgstr "プライマリ��識別�� %s ����スタン�イ��識別�� %s ��。"
+#: rewrite/rewriteDefine.c:471
+msgid "RETURNING lists are not supported in conditional rules"
+msgstr "�件付�ルール��RETURNINGリスト�サ�ート�れ��ん"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:152
-msgid "timeline %u of the primary does not match recovery target timeline %u"
-msgstr "プライマリ�タイムライン %u ��リカ�リターゲット�タイムライン %u �一致���ん"
+#: rewrite/rewriteDefine.c:475
+msgid "RETURNING lists are not supported in non-INSTEAD rules"
+msgstr "INSTEAD以外�ルール��RETURNING�サ�ート�れ��ん"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:164
-msgid "could not start WAL streaming: %s"
-msgstr "WAL ストリーミングを開始����ん���: %s"
+#: rewrite/rewriteDefine.c:554
+msgid "SELECT rule's target list has too many entries"
+msgstr "SELECTルール�対象リスト�項目�多����"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:171
-msgid "streaming replication successfully connected to primary"
-msgstr "ストリーミングレプリケーション�プライマリ�無事接続�����"
+#: rewrite/rewriteDefine.c:555
+msgid "RETURNING list has too many entries"
+msgstr "RETURNINGリスト�項目�多����"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:193
-msgid "socket not open"
-msgstr "ソケット�オープン�れ����ん"
+#: rewrite/rewriteDefine.c:571
+msgid "cannot convert relation containing dropped columns to view"
+msgstr "削除�れ�列を��リレーションをビュー�変�����ん"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:233
-msgid "select() failed: %m"
-msgstr "select() �失敗����: %m"
+#: rewrite/rewriteDefine.c:576
+#, c-format
+msgid "SELECT rule's target entry %d has different column name from \"%s\""
+msgstr "SELECTルール�対象項目%d�\"%s\"�異�る列�を������"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:364
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
-#: replication/libpqwalreceiver/libpqwalreceiver.c:391
-msgid "could not receive data from WAL stream: %s"
-msgstr "WAL ストリーム�らデータを�信����ん���: %s"
+#: rewrite/rewriteDefine.c:582
+#, c-format
+msgid "SELECT rule's target entry %d has different type from column \"%s\""
+msgstr "SELECTルール�対象項目%d�\"%s\"�異�る列型を������"
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:382
-msgid "replication terminated by primary server"
-msgstr "プライマリサー��よりレプリケーション�打�切られ���"
+#: rewrite/rewriteDefine.c:584
+#, c-format
+msgid "RETURNING list's entry %d has different type from column \"%s\""
+msgstr "RETURNINGリスト項目%d�\"%s\"�異�る列型を������"
 
-#: ../port/open.c:112
+#: rewrite/rewriteDefine.c:599
 #, c-format
-msgid "could not open file \"%s\": %s"
-msgstr "ファイル\"%s\"をオープン����ん���: %s"
+msgid "SELECT rule's target entry %d has different size from column \"%s\""
+msgstr "SELECTルール�対象項目%d�\"%s\"�異�る列�サイズを������"
+
+#: rewrite/rewriteDefine.c:601
+#, c-format
+msgid "RETURNING list's entry %d has different size from column \"%s\""
+msgstr "RETURNINGリスト項目%d�\"%s\"�異�る列�サイズを������"
+
+#: rewrite/rewriteDefine.c:609
+msgid "SELECT rule's target list has too few entries"
+msgstr "SELECTルール�対象リスト�項目�少�����"
+
+#: rewrite/rewriteDefine.c:610
+msgid "RETURNING list has too few entries"
+msgstr "RETURNINGリスト�項目�少�����"
 
 #: ../port/open.c:113
 msgid "sharing violation"
@@ -16625,6 +18259,11 @@ msgstr "共有��"
 msgid "lock violation"
 msgstr "ロック��"
 
+#: ../port/open.c:112
+#, c-format
+msgid "could not open file \"%s\": %s"
+msgstr "ファイル\"%s\"をオープン����ん���: %s"
+
 #: ../port/open.c:114
 msgid "Continuing to retry for 30 seconds."
 msgstr "�試行を30秒続���"
@@ -16637,14 +18276,56 @@ msgstr ""
 "データベースシステム�干渉�るアン�ウィルス��ックアップ���ソフトウェア"
 "�存在�る�能性��り��。"
 
-#: ../port/chklocale.c:326 ../port/chklocale.c:332
+#: ../port/dirmod.c:75 ../port/dirmod.c:88 ../port/dirmod.c:101
 #, c-format
-msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
-msgstr "ロケール\"%s\"用�符�化方�を決定����ん: コードセット�\"%s\"��"
+msgid "out of memory\n"
+msgstr "メモリ�足��\n"
 
-#: ../port/chklocale.c:334
-msgid "Please report this to <pgsql-bugs@postgresql.org>."
-msgstr "�れを<pgsql-bugs@postgresql.org>��報告������。"
+#: ../port/dirmod.c:283
+#, c-format
+msgid "could not set junction for \"%s\": %s"
+msgstr "\"%s\"�接�を設定����ん���: %s"
+
+#: ../port/dirmod.c:286
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "\"%s\"�接�を設定����ん���: %s\n"
+
+#: ../port/dirmod.c:358
+#, c-format
+msgid "could not get junction for \"%s\": %s"
+msgstr "\"%s\" �分�点 (junction) を�得����ん���:  %s"
+
+#: ../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "\"%s\"�junctionを入手����ん���:  %s\n"
+
+#: ../port/dirmod.c:443
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"をオープン����ん���: %s\n"
+
+#: ../port/dirmod.c:480
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "ディレクトリ\"%s\"を読��れ��ん���: %s\n"
+
+#: ../port/dirmod.c:563
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr ""
+"\"%s\"���ファイル���ディレクトリ�情報を�得����ん���。: %s\n"
+
+#: ../port/dirmod.c:590 ../port/dirmod.c:607
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "\"%s\"���ディレクトリ���ファイルを削除����ん���: %s\n"
+
+#: ../port/strerror.c:25
+#, c-format
+msgid "unrecognized error %d"
+msgstr "�明�エラー %d"
 
 #: ../port/exec.c:125 ../port/exec.c:239 ../port/exec.c:282
 #, c-format
@@ -16676,78 +18357,218 @@ msgstr "ディレクトリを\"%s\"�移動����ん���"
 msgid "could not read symbolic link \"%s\""
 msgstr "シンボリックリンク\"%s\"を読��れ��ん���"
 
-#: ../port/exec.c:516
+#: ../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "�プロセス�終了コード%d�終了����"
 
-#: ../port/exec.c:520
+#: ../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "�プロセス�例外0x%X�終了����"
 
-#: ../port/exec.c:529
+#: ../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "�プロセス�シグナル%s�終了����"
 
-#: ../port/exec.c:532
+#: ../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "�プロセス�シグナル%d�より終了����"
 
-#: ../port/exec.c:536
+#: ../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "�プロセス��明�ステータス%d�終了����"
 
-#: ../port/dirmod.c:75 ../port/dirmod.c:88 ../port/dirmod.c:101
+#: ../port/win32error.c:188
 #, c-format
-msgid "out of memory\n"
-msgstr "メモリ�足��\n"
+msgid "mapped win32 error code %lu to %d"
+msgstr "win32�エラーコード%luを%d�対応付����"
 
-#: ../port/dirmod.c:283
+#: ../port/win32error.c:199
 #, c-format
-msgid "could not set junction for \"%s\": %s"
-msgstr "\"%s\"�接�を設定����ん���: %s"
+msgid "unrecognized win32 error code: %lu"
+msgstr "未知�Win32エラーコード��明��: %lu"
 
-#: ../port/dirmod.c:286
+#: ../port/chklocale.c:328 ../port/chklocale.c:334
 #, c-format
-msgid "could not set junction for \"%s\": %s\n"
-msgstr "\"%s\"�接�を設定����ん���: %s\n"
+msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
+msgstr "ロケール\"%s\"用�符�化方�を決定����ん: コードセット�\"%s\"��"
 
-#: ../port/dirmod.c:325
-#, c-format
-msgid "could not open directory \"%s\": %s\n"
-msgstr "ディレクトリ\"%s\"をオープン����ん���: %s\n"
+#: ../port/chklocale.c:336
+msgid "Please report this to <pgsql-bugs@postgresql.org>."
+msgstr "�れを<pgsql-bugs@postgresql.org>��報告������。"
 
-#: ../port/dirmod.c:362
-#, c-format
-msgid "could not read directory \"%s\": %s\n"
-msgstr "ディレクトリ\"%s\"を読��れ��ん���: %s\n"
+#~ msgid "cannot change view \"%s\""
+#~ msgstr "ビュー\"%s\"を変更����ん"
 
-#: ../port/dirmod.c:445
-#, c-format
-msgid "could not stat file or directory \"%s\": %s\n"
-msgstr ""
-"\"%s\"���ファイル���ディレクトリ�情報を�得����ん���。: %s\n"
+#~ msgid "argument to pg_get_expr() must come from system catalogs"
+#~ msgstr ""
+#~ "pg_get_expr() ��引数�システムカタログ由��も����れ��り��ん"
 
-#: ../port/dirmod.c:472 ../port/dirmod.c:489
-#, c-format
-msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "\"%s\"���ディレクトリ���ファイルを削除����ん���: %s\n"
+#~ msgid "clustering \"%s.%s\""
+#~ msgstr "\"%s.%s\"をクラスタ化�����"
 
-#: ../port/strerror.c:25
-#, c-format
-msgid "unrecognized error %d"
-msgstr "�明�エラー %d"
+#~ msgid ""
+#~ "cannot cluster on index \"%s\" because access method does not handle null "
+#~ "values"
+#~ msgstr ""
+#~ "インデックス\"%s\"�クラスタ化����ん。アクセスメソッド�NULL値を扱��"
+#~ "�����"
 
-#: ../port/win32error.c:184
-#, c-format
-msgid "mapped win32 error code %lu to %d"
-msgstr "win32�エラーコード%luを%d�対応付����"
+#~ msgid ""
+#~ "You might be able to work around this by marking column \"%s\" NOT NULL, "
+#~ "or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster "
+#~ "specification from the table."
+#~ msgstr ""
+#~ "列\"%s\"を NOT NULL��る�����ALTER TABLE ... SET WITHOUT CLUSTERを使"
+#~ "用��テー\n"
+#~ "ブル�らクラスタ指定を削除�る�������題を回���る�能性��り�"
+#~ "�。"
 
-#: ../port/win32error.c:195
-#, c-format
-msgid "unrecognized win32 error code: %lu"
-msgstr "未知�Win32エラーコード��明��: %lu"
+#~ msgid ""
+#~ "You might be able to work around this by marking column \"%s\" NOT NULL."
+#~ msgstr "列\"%s\"をNOT NULL��る�����れを回���る�も�れ��ん"
+
+#~ msgid ""
+#~ "cannot cluster on expressional index \"%s\" because its index access "
+#~ "method does not handle null values"
+#~ msgstr ""
+#~ "�インデックス\"%s\"�クラスタ化����ん。インデックスアクセスメソッド�"
+#~ "NULL値を扱�������"
+
+#~ msgid "cannot reference temporary table from permanent table constraint"
+#~ msgstr "永続テーブル�制約�ら一時テーブルを�照����ん"
+
+#~ msgid "cannot reference permanent table from temporary table constraint"
+#~ msgstr "一時テーブル�制約�ら永続テーブルを�照����ん"
+
+#~ msgid "invalid list syntax for parameter \"datestyle\""
+#~ msgstr "パラメータ\"datestyle\"用�リスト構文�無効��"
+
+#~ msgid "unrecognized \"datestyle\" key word: \"%s\""
+#~ msgstr "\"datestyle\"キーワード��明��: \"%s\""
+
+#~ msgid "invalid interval value for time zone: month not allowed"
+#~ msgstr "時間帯�内部値�無効��: 月�許�れ��ん"
+
+#~ msgid "invalid interval value for time zone: day not allowed"
+#~ msgstr "時間帯�時間間隔値�無効��: 日�許�れ��ん"
+
+#~ msgid "unrecognized time zone name: \"%s\""
+#~ msgstr "時間帯���明��: \"%s\""
+
+#~ msgid "\"%s\" is not a table, view, or composite type"
+#~ msgstr "\"%s\"�テーブル�ビュー�複�型���れ�も�り��ん"
+
+#~ msgid "must be member of role \"%s\" to comment upon it"
+#~ msgstr "コメントを付与�る��ロール\"%s\"�メン����れ��り��ん"
+
+#~ msgid "must be superuser to comment on procedural language"
+#~ msgstr "手続�言語�コメントを��る��スーパーユーザ���れ��り��ん"
+
+#~ msgid "must be superuser to comment on text search parser"
+#~ msgstr ""
+#~ "テキスト検索パーサ�コメントを��る��スーパーユーザ���れ��り��ん"
+
+#~ msgid "must be superuser to comment on text search template"
+#~ msgstr ""
+#~ "テキスト検索テンプレート�コメントを��る��スーパーユーザ���れ��り"
+#~ "��ん"
+
+#~ msgid "database \"%s\" not found"
+#~ msgstr "データベース \"%s\" �見��り��ん"
+
+#~ msgid "function \"%s\" is already in schema \"%s\""
+#~ msgstr "関数\"%s\"����スキーマ\"%s\"内�存在���"
+
+#~ msgid ""
+#~ "cannot drop \"%s\" because it is being used by active queries in this "
+#~ "session"
+#~ msgstr ""
+#~ "��セッション�実行中�クエリー�使用�れ��る�� \"%s\" を削除����"
+#~ "ã‚“"
+
+#~ msgid "EnumValuesCreate() can only set a single OID"
+#~ msgstr "EnumValuesCreate() ��独� OID ��をセット����"
+
+#~ msgid "access to %s"
+#~ msgstr "%s��アクセス"
+
+#~ msgid "replication connection authorized: user=%s host=%s port=%s"
+#~ msgstr ""
+#~ "レプリケーション接続��証完了: ユーザ=%s�データベース=%s��ート番�=%s"
+
+#~ msgid "Not safe to send CSV data\n"
+#~ msgstr "CSVデータを�信�る��安全���り��ん\n"
+
+#~ msgid "Sets immediate fsync at commit."
+#~ msgstr "コミット時��座�fsync�るよ�設定���"
+
+#~ msgid "Sets the message levels that are logged during recovery."
+#~ msgstr "リカ�リー中�ログを�る��メッセージ�レベルを設定���。"
+
+#~ msgid "invalid list syntax for parameter \"log_destination\""
+#~ msgstr "パラメータ\"log_destination\"�リスト構文�無効��"
+
+#~ msgid "unrecognized \"log_destination\" key word: \"%s\""
+#~ msgstr "\"log_destination\"キーワード��明��: \"%s\""
+
+#~ msgid "could not create log file \"%s\": %m"
+#~ msgstr "ログファイル\"%s\"を作�����ん���: %m"
+
+#~ msgid "could not open new log file \"%s\": %m"
+#~ msgstr "新��ログファイル\"%s\"をオープン����ん���: %m"
+
+#~ msgid "array must not contain null values"
+#~ msgstr "�列��NULL値を��������ん"
+
+#~ msgid "parameter \"recovery_target_inclusive\" requires a Boolean value"
+#~ msgstr "パラメータ \"recovery_target_inclusive\" ��ブール値を指定���"
+
+#~ msgid "parameter \"standby_mode\" requires a Boolean value"
+#~ msgstr "パラメータ \"standby_mode\" ��ブール値�必���"
+
+#~ msgid "syntax error in recovery command file: %s"
+#~ msgstr "リカ�リコマンドファイル内�構文エラー: %s"
+
+#~ msgid "Lines should have the format parameter = 'value'."
+#~ msgstr "行��parameter = 'value'���書����れ��り��ん。"
+
+#~ msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
+#~ msgstr ""
+#~ "クラッシュリカ�リを完了�る��インデックス\"%s\"をVACUUM���REINDEX�"
+#~ "��れ��り��ん"
+
+#~ msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
+#~ msgstr ""
+#~ "クラッシュリカ�リを完了�る��インデックス%u/%u/%uをVACUUM FULL���"
+#~ "REINDEX���れ��り��ん"
+
+#~ msgid "Incomplete insertion detected during crash replay."
+#~ msgstr "クラッシュリカ�リ中��完全�挿入を検知����"
+
+#~ msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
+#~ msgstr ""
+#~ "クラッシュリカ�リを完了�る��インデックス\"%s\"をVACUUM FULL���"
+#~ "REINDEX���れ��り��ん"
+
+#~ msgid "could not enable credential reception: %m"
+#~ msgstr "資格証明��信を有効�����ん���: %m"
+
+#~ msgid "could not get effective UID from peer credentials: %m"
+#~ msgstr "相手��資格情報�ら実効 UID を�得����ん���: %m"
+
+#~ msgid ""
+#~ "Ident authentication is not supported on local connections on this "
+#~ "platform"
+#~ msgstr ""
+#~ "��プラットフォーム�ローカル接続��Ident�証をサ�ート�����ん"
+
+#~ msgid "hostssl not supported on this platform"
+#~ msgstr "��プラットフォーム�� hostssl をサ�ート�����ん"
+
+#~ msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
+#~ msgstr "SELECT FOR UPDATE/SHAREをNEWやOLD�使用����ん"
diff --git a/src/backend/po/pl.po b/src/backend/po/pl.po
new file mode 100644
index 0000000000000..e9d9573681202
--- /dev/null
+++ b/src/backend/po/pl.po
@@ -0,0 +1,18760 @@
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-10-08 08:46+0000\n"
+"PO-Revision-Date: 2011-10-09 16:30+0200\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+"X-Poedit-Language: Polish\n"
+"X-Poedit-Country: POLAND\n"
+
+#: nodes/nodeFuncs.c:114 nodes/nodeFuncs.c:140 parser/parse_coerce.c:1645
+#: parser/parse_coerce.c:1662 parser/parse_coerce.c:1724
+#: parser/parse_expr.c:1636 parser/parse_func.c:367 parser/parse_oper.c:948
+#, c-format
+msgid "could not find array type for data type %s"
+msgstr "nie znaleziono typu tablicowego dla danej typu %s"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:615
+msgid "multiple DictFile parameters"
+msgstr "wiele parametrów DictFile"
+
+#: tsearch/dict_ispell.c:64
+msgid "multiple AffFile parameters"
+msgstr "wiele parametrów AffFile"
+
+#: tsearch/dict_ispell.c:75 tsearch/dict_simple.c:50
+#: snowball/dict_snowball.c:206
+msgid "multiple StopWords parameters"
+msgstr "wiele parametrów StopWords"
+
+#: tsearch/dict_ispell.c:83
+#, c-format
+msgid "unrecognized Ispell parameter: \"%s\""
+msgstr "nierozpoznany parametr Ispell: \"%s\""
+
+#: tsearch/dict_ispell.c:97
+msgid "missing AffFile parameter"
+msgstr "brak parametru AffFile"
+
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:639
+msgid "missing DictFile parameter"
+msgstr "brak parametru DictFile"
+
+#: tsearch/dict_simple.c:59
+msgid "multiple Accept parameters"
+msgstr "wiele parametrów Accept"
+
+#: tsearch/dict_simple.c:67
+#, c-format
+msgid "unrecognized simple dictionary parameter: \"%s\""
+msgstr "nierozpoznany parametr słownika prostego: \"%s\""
+
+#: tsearch/dict_synonym.c:119
+#, c-format
+msgid "unrecognized synonym parameter: \"%s\""
+msgstr "nierozpoznany parametr synonimu: \"%s\""
+
+#: tsearch/dict_synonym.c:126
+msgid "missing Synonyms parameter"
+msgstr "brak parametru Synonyms"
+
+#: tsearch/dict_synonym.c:133
+#, c-format
+msgid "could not open synonym file \"%s\": %m"
+msgstr "nie można otworzyć pliku synonimów \"%s\": %m"
+
+#: tsearch/dict_thesaurus.c:180
+#, c-format
+msgid "could not open thesaurus file \"%s\": %m"
+msgstr "nie można otworzyć pliku tezaurusa \"%s\": %m"
+
+#: tsearch/dict_thesaurus.c:213
+msgid "unexpected delimiter"
+msgstr "nieoczekiwany ogranicznik"
+
+#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
+msgid "unexpected end of line or lexeme"
+msgstr "nieoczekiwany koniec linii lub leksemu"
+
+#: tsearch/dict_thesaurus.c:288
+msgid "unexpected end of line"
+msgstr "nieoczekiwany koniec linii"
+
+#: tsearch/dict_thesaurus.c:412
+#, c-format
+msgid ""
+"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"przykładowe słowo tezaurusa \"%s\" nie jest rozpoznawane przez podsłownik "
+"(reguła %d)"
+
+#: tsearch/dict_thesaurus.c:418
+#, c-format
+msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
+msgstr "przykładowe słowo tezaurusa \"%s\" nie jest słowem stopu (reguła %d)"
+
+#: tsearch/dict_thesaurus.c:421
+msgid "Use \"?\" to represent a stop word within a sample phrase."
+msgstr "Użyj \"?\" jako reprezentacji słowa stopu w wyrażeniu przykładowym."
+
+#: tsearch/dict_thesaurus.c:567
+#, c-format
+msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
+msgstr "zastępujące słowo tezaurusa \"%s\" nie jest słowem stopu (reguła %d)"
+
+#: tsearch/dict_thesaurus.c:574
+#, c-format
+msgid ""
+"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"zastępujące słowo tezaurusa \"%s\" nie jest rozpoznawane przez podsłownik "
+"(reguła %d)"
+
+#: tsearch/dict_thesaurus.c:586
+#, c-format
+msgid "thesaurus substitute phrase is empty (rule %d)"
+msgstr "wyrażenie zastępujące tezaurusa jest puste (reguła %d)"
+
+#: tsearch/dict_thesaurus.c:624
+msgid "multiple Dictionary parameters"
+msgstr "wiele parametrów Dictionary"
+
+#: tsearch/dict_thesaurus.c:631
+#, c-format
+msgid "unrecognized Thesaurus parameter: \"%s\""
+msgstr "nierozpoznany parametr Thesaurus: \"%s\""
+
+#: tsearch/dict_thesaurus.c:643
+msgid "missing Dictionary parameter"
+msgstr "brak parametru Dictionary"
+
+#: tsearch/spell.c:276
+#, c-format
+msgid "could not open dictionary file \"%s\": %m"
+msgstr "nie można otworzyć pliku słownika \"%s\": %m"
+
+#: tsearch/spell.c:439 utils/adt/regexp.c:195
+#, c-format
+msgid "invalid regular expression: %s"
+msgstr "nieprawidłowe wyrażenie regularne: %s"
+
+#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
+#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:12477 gram.y:12494
+msgid "syntax error"
+msgstr "błąd składni"
+
+#: tsearch/spell.c:596 tsearch/spell.c:842 tsearch/spell.c:862
+msgid "multibyte flag character is not allowed"
+msgstr "wielobajtowy znak flagi nie jest dozwolony"
+
+#: tsearch/spell.c:629 tsearch/spell.c:687 tsearch/spell.c:780
+#, c-format
+msgid "could not open affix file \"%s\": %m"
+msgstr "nie można otworzyć pliku affix \"%s\": %m"
+
+#: tsearch/spell.c:675
+msgid "Ispell dictionary supports only default flag value"
+msgstr "Słownik Ispell obsługuje tylko domyślną wartość flagi"
+
+#: tsearch/spell.c:873
+msgid "wrong affix file format for flag"
+msgstr "niepoprawny format pliku affix dla flagi"
+
+#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:530
+#, c-format
+msgid "string is too long for tsvector (%d bytes, max %d bytes)"
+msgstr ""
+"ciąg znaków jest za długi dla tsvector (%d bajtów, maksymalnie %d bajtów)"
+
+#: tsearch/ts_locale.c:177
+#, c-format
+msgid "line %d of configuration file \"%s\": \"%s\""
+msgstr "linia %d pliku konfiguracyjnego \"%s\": \"%s\""
+
+#: tsearch/ts_locale.c:182 libpq/hba.c:781 libpq/hba.c:797 libpq/hba.c:833
+#: libpq/hba.c:855 libpq/hba.c:864 libpq/hba.c:887 libpq/hba.c:899
+#: libpq/hba.c:912 libpq/hba.c:927 libpq/hba.c:982 libpq/hba.c:1002
+#: libpq/hba.c:1016 libpq/hba.c:1033 libpq/hba.c:1046 libpq/hba.c:1062
+#: libpq/hba.c:1077 libpq/hba.c:1119 libpq/hba.c:1151 libpq/hba.c:1162
+#: libpq/hba.c:1182 libpq/hba.c:1193 libpq/hba.c:1204 libpq/hba.c:1221
+#: libpq/hba.c:1242 libpq/hba.c:1272 libpq/hba.c:1284 libpq/hba.c:1297
+#: libpq/hba.c:1331 libpq/hba.c:1405 libpq/hba.c:1423 libpq/hba.c:1444
+#: libpq/hba.c:1475 libpq/hba.c:1485
+#, c-format
+msgid "line %d of configuration file \"%s\""
+msgstr "linia %d pliku konfiguracyjnego \"%s\""
+
+#: tsearch/ts_locale.c:302
+#, c-format
+msgid "conversion from wchar_t to server encoding failed: %m"
+msgstr "konwersja z wchar_t na kodowanie serwera nie powiodło się: %m"
+
+#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
+#: tsearch/ts_parse.c:568
+msgid "word is too long to be indexed"
+msgstr "słowo jest za długie do zindeksowania"
+
+#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
+#: tsearch/ts_parse.c:569
+#, c-format
+msgid "Words longer than %d characters are ignored."
+msgstr "Słowa dłuższe niż %d znaków są ignorowane."
+
+#: tsearch/ts_utils.c:53
+#, c-format
+msgid "invalid text search configuration file name \"%s\""
+msgstr "niepoprawna nazwa pliku konfiguracji wyszukiwania tekstowego \"%s\""
+
+#: tsearch/ts_utils.c:91
+#, c-format
+msgid "could not open stop-word file \"%s\": %m"
+msgstr "nie można otworzyć pliku słowa-stopu \"%s\": %m"
+
+#: tsearch/wparser.c:314
+msgid "text search parser does not support headline creation"
+msgstr "parser wyszukiwania tekstowego nie obsługuje tworzenia nagłówka"
+
+#: tsearch/wparser_def.c:2551
+#, c-format
+msgid "unrecognized headline parameter: \"%s\""
+msgstr "nierozpoznany parametr nagłówka: \"%s\""
+
+#: tsearch/wparser_def.c:2560
+msgid "MinWords should be less than MaxWords"
+msgstr "MinWords musi być mniejsze niż MaxWords"
+
+#: tsearch/wparser_def.c:2564
+msgid "MinWords should be positive"
+msgstr "MinWords musi być dodatnie"
+
+#: tsearch/wparser_def.c:2568
+msgid "ShortWord should be >= 0"
+msgstr "ShortWord powinno być >= 0"
+
+#: tsearch/wparser_def.c:2572
+msgid "MaxFragments should be >= 0"
+msgstr "MaxFragments powinno być >= 0"
+
+#: access/hash/hashinsert.c:73
+#, c-format
+msgid "index row size %lu exceeds hash maximum %lu"
+msgstr "rozmiar wiersza indeksu %lu przekracza maksymalny hasz %lu"
+
+#: access/hash/hashinsert.c:76
+msgid "Values larger than a buffer page cannot be indexed."
+msgstr "Wartości dłuższe niż strona bufora nie mogą być zindeksowane."
+
+#: access/hash/hashovfl.c:547
+#, c-format, fuzzy
+msgid "out of overflow pages in hash index \"%s\""
+msgstr "brak stron przepełnienia w indeksie haszującym \"%s\""
+
+#: access/hash/hashsearch.c:152
+msgid "hash indexes do not support whole-index scans"
+msgstr "indeksy haszujące nie obsługują pełnych skanów indeksu"
+
+#: access/hash/hashutil.c:170 access/gist/gistutil.c:589
+#: access/nbtree/nbtpage.c:433
+#, c-format
+msgid "index \"%s\" contains unexpected zero page at block %u"
+msgstr "indeks \"%s\" zawiera nieoczekiwanÄ… stronÄ™ zerowÄ… w bloku %u"
+
+#: access/hash/hashutil.c:173 access/hash/hashutil.c:184
+#: access/hash/hashutil.c:196 access/hash/hashutil.c:217
+#: access/gist/gist.c:718 access/gist/gistutil.c:592
+#: access/gist/gistutil.c:603 access/gist/gistvacuum.c:274
+#: access/nbtree/nbtpage.c:436 access/nbtree/nbtpage.c:447
+msgid "Please REINDEX it."
+msgstr "Proszę wykonać REINDEX."
+
+#: access/hash/hashutil.c:181 access/hash/hashutil.c:193
+#: access/gist/gistutil.c:600 access/nbtree/nbtpage.c:444
+#, c-format
+msgid "index \"%s\" contains corrupted page at block %u"
+msgstr "indeks \"%s\" zawiera uszkodzonÄ… stronÄ™ w bloku %u"
+
+#: access/hash/hashutil.c:209
+#, c-format
+msgid "index \"%s\" is not a hash index"
+msgstr "indeks \"%s\" nie jest indeksem haszujÄ…cym"
+
+#: access/hash/hashutil.c:215
+#, c-format
+msgid "index \"%s\" has wrong hash version"
+msgstr "indeks \"%s\" ma niepoprawnÄ… wersjÄ™ haszu"
+
+#: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
+#, c-format
+msgid "number of columns (%d) exceeds limit (%d)"
+msgstr "liczba kolumn (%d) osiągnęła limit (%d)"
+
+#: access/common/indextuple.c:57
+#, c-format
+msgid "number of index columns (%d) exceeds limit (%d)"
+msgstr "liczba kolumn indeksu (%d) osiągnęła limit (%d)"
+
+#: access/common/indextuple.c:168
+#, c-format
+msgid "index row requires %lu bytes, maximum size is %lu"
+msgstr "wiersz indeksu wymaga %lu bajtów, największy rozmiar to %lu"
+
+#: access/common/printtup.c:278 tcop/fastpath.c:180 tcop/fastpath.c:554
+#: tcop/postgres.c:1664
+#, c-format
+msgid "unsupported format code: %d"
+msgstr "nieobsługiwany kod formatu: %d"
+
+#: access/common/reloptions.c:323
+msgid "user-defined relation parameter types limit exceeded"
+msgstr ""
+"przekroczony limit typów parametrów relacji zdefiniowanej przez użytkownika"
+
+#: access/common/reloptions.c:622
+msgid "RESET must not include values for parameters"
+msgstr "RESET nie może zawierać wartości parametrów"
+
+#: access/common/reloptions.c:655
+#, c-format
+msgid "unrecognized parameter namespace \"%s\""
+msgstr "nierozpoznana przestrzeń nazw parametru \"%s\""
+
+#: access/common/reloptions.c:898
+#, c-format
+msgid "unrecognized parameter \"%s\""
+msgstr "nierozpoznany parametr \"%s\""
+
+#: access/common/reloptions.c:923
+#, c-format
+msgid "parameter \"%s\" specified more than once"
+msgstr "parametr \"%s\" użyty więcej niż raz"
+
+#: access/common/reloptions.c:938
+#, c-format
+msgid "invalid value for boolean option \"%s\": %s"
+msgstr "niepoprawna wartość dla opcji logicznej \"%s\": %s"
+
+#: access/common/reloptions.c:949
+#, c-format
+msgid "invalid value for integer option \"%s\": %s"
+msgstr "niepoprawna wartość dla opcji całkowitej \"%s\": %s"
+
+#: access/common/reloptions.c:954 access/common/reloptions.c:972
+#, c-format
+msgid "value %s out of bounds for option \"%s\""
+msgstr "wartość %s spoza zakresu dla opcji \"%s\""
+
+#: access/common/reloptions.c:956
+#, c-format
+msgid "Valid values are between \"%d\" and \"%d\"."
+msgstr "Prawidłowe wartości są pomiędzy \"%d\" a \"%d\"."
+
+#: access/common/reloptions.c:967
+#, c-format
+msgid "invalid value for floating point option \"%s\": %s"
+msgstr "niepoprawna wartość dla opcji liczby zmiennopozycyjnej \"%s\": %s"
+
+#: access/common/reloptions.c:974
+#, c-format
+msgid "Valid values are between \"%f\" and \"%f\"."
+msgstr "Prawidłowe wartości są pomiędzy \"%f\" a \"%f\"."
+
+#: access/common/tupconvert.c:107
+#, c-format
+msgid "Returned type %s does not match expected type %s in column %d."
+msgstr "Zwrócony typ %s nie pasuje do oczekiwanego typu %s dla kolumny %d."
+
+#: access/common/tupconvert.c:135
+#, c-format
+msgid ""
+"Number of returned columns (%d) does not match expected column count (%d)."
+msgstr ""
+"Liczba zwróconych kolumn (%d) nie jest równa oczekiwanej liczby kolumn (%d)."
+
+#: access/common/tupconvert.c:240
+#, c-format
+msgid ""
+"Attribute \"%s\" of type %s does not match corresponding attribute of type "
+"%s."
+msgstr "Atrybut \"%s\" typu %s nie pasuje do odpowiedniego atrybutu typu %s."
+
+#: access/common/tupconvert.c:252
+#, c-format
+msgid "Attribute \"%s\" of type %s does not exist in type %s."
+msgstr "Atrybut \"%s\" typu %s nie istnieje w typie %s."
+
+#: access/common/tupdesc.c:575 parser/parse_relation.c:1169
+#, c-format
+msgid "column \"%s\" cannot be declared SETOF"
+msgstr "kolumna \"%s\" nie może być zadeklarowana jako SETOF"
+
+#: access/gin/ginentrypage.c:101 access/nbtree/nbtinsert.c:531
+#: access/nbtree/nbtsort.c:483
+#, c-format
+msgid "index row size %lu exceeds maximum %lu for index \"%s\""
+msgstr "rozmiar indeksu wiersza %lu przekracza maksimum %lu dla indeksy \"%s\""
+
+#: access/gin/ginscan.c:401
+msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
+msgstr ""
+"stare indeksy GIN nie wspierają pełnego skanowania indeksu ani wyszukiwania "
+"wartości pustych"
+
+#: access/gin/ginscan.c:402
+#, c-format
+msgid "To fix this, do REINDEX INDEX \"%s\"."
+msgstr "By to naprawić, wykonaj REINDEX INDEX \"%s\"."
+
+#: access/gist/gist.c:230
+msgid "unlogged GiST indexes are not supported"
+msgstr "nielogowane indeksy GiST nie są obsługiwane"
+
+#: access/gist/gist.c:715 access/gist/gistvacuum.c:271
+#, c-format
+msgid "index \"%s\" contains an inner tuple marked as invalid"
+msgstr "indeks \"%s\" zawiera wewnętrzną krotkę oznaczoną jako niepoprawna"
+
+#: access/gist/gist.c:717 access/gist/gistvacuum.c:273
+msgid ""
+"This is caused by an incomplete page split at crash recovery before "
+"upgrading to PostgreSQL 9.1."
+msgstr ""
+"Jest to spowodowane przez niekompletny podział strony podczas odtwarzania po "
+"awarii, przed uaktualnieniem do PostgreSQL 9.1."
+
+#: access/gist/gistsplit.c:375
+#, c-format
+msgid "picksplit method for column %d of index \"%s\" failed"
+msgstr "metoda picksplit dla kolumny %d indeksu \"%s\" nie powiodła się"
+
+#: access/gist/gistsplit.c:377
+msgid ""
+"The index is not optimal. To optimize it, contact a developer, or try to use "
+"the column as the second one in the CREATE INDEX command."
+msgstr ""
+"Indeks nie jest optymalny. Aby go zoptymalizować, skontaktuj się z "
+"programistą lub spróbuj użyć tej kolumny jako drugiej w poleceniu CREATE "
+"INDEX."
+
+#: access/transam/slru.c:609
+#, c-format
+msgid "file \"%s\" doesn't exist, reading as zeroes"
+msgstr "plik \"%s\" nie istnieje, odczyt jako zera"
+
+#: access/transam/slru.c:839 access/transam/slru.c:845
+#: access/transam/slru.c:852 access/transam/slru.c:859
+#: access/transam/slru.c:866 access/transam/slru.c:873
+#, c-format
+msgid "could not access status of transaction %u"
+msgstr "brak dostępu do statusu transakcji %u"
+
+#: access/transam/slru.c:840
+#, c-format
+msgid "Could not open file \"%s\": %m."
+msgstr "Nie można otworzyć pliku \"%s\": %m."
+
+#: access/transam/slru.c:846
+#, c-format
+msgid "Could not seek in file \"%s\" to offset %u: %m."
+msgstr "Nie można pozycjonować pliku \"%s\" od pozycji %u: %m."
+
+#: access/transam/slru.c:853
+#, c-format
+msgid "Could not read from file \"%s\" at offset %u: %m."
+msgstr "Nie można czytać z pliku \"%s\" od pozycji %u: %m."
+
+#: access/transam/slru.c:860
+#, c-format
+msgid "Could not write to file \"%s\" at offset %u: %m."
+msgstr "Nie można pisać do pliku \"%s\" od pozycji %u: %m."
+
+#: access/transam/slru.c:867
+#, c-format
+msgid "Could not fsync file \"%s\": %m."
+msgstr "Nie udało się fsync na pliku \"%s\": %m."
+
+#: access/transam/slru.c:874
+#, c-format
+msgid "Could not close file \"%s\": %m."
+msgstr "Nie można zamknąć pliku \"%s\": %m."
+
+#: access/transam/slru.c:1101
+#, c-format
+msgid "could not truncate directory \"%s\": apparent wraparound"
+msgstr "nie można obciąć folderu \"%s\": pozorne zachodzenie na siebie"
+
+#: access/transam/slru.c:1182
+#, c-format
+msgid "removing file \"%s\""
+msgstr "usuwanie pliku \"%s\""
+
+#: access/transam/twophase.c:250
+#, c-format
+msgid "transaction identifier \"%s\" is too long"
+msgstr "identyfikator transakcji \"%s\" jest zbyt długi"
+
+#: access/transam/twophase.c:257
+msgid "prepared transactions are disabled"
+msgstr "przygotowane transakcje są wyłączone"
+
+#: access/transam/twophase.c:258
+msgid "Set max_prepared_transactions to a nonzero value."
+msgstr "Ustawienie wartości niezerowej max_prepared_transactions."
+
+#: access/transam/twophase.c:291
+#, c-format
+msgid "transaction identifier \"%s\" is already in use"
+msgstr "identyfikator transakcji \"%s\" jest już używany"
+
+#: access/transam/twophase.c:300
+msgid "maximum number of prepared transactions reached"
+msgstr "osiągnięto maksymalną liczbę przygotowanych transakcji"
+
+#: access/transam/twophase.c:301
+#, c-format
+msgid "Increase max_prepared_transactions (currently %d)."
+msgstr "Zwiększenie max_prepared_transactions (obecnie %d)."
+
+#: access/transam/twophase.c:421
+#, c-format
+msgid "prepared transaction with identifier \"%s\" is busy"
+msgstr "przygotowana transakcja o identyfikatorze \"%s\" jest zajęta"
+
+#: access/transam/twophase.c:429
+msgid "permission denied to finish prepared transaction"
+msgstr "brak dostępu do zakończenia przygotowanej transakcji"
+
+#: access/transam/twophase.c:430
+msgid "Must be superuser or the user that prepared the transaction."
+msgstr ""
+"Trzeba być superużytkownikiem lub użytkownikiem, który przygotował "
+"transakcjÄ™."
+
+#: access/transam/twophase.c:441
+msgid "prepared transaction belongs to another database"
+msgstr "przygotowana transakcja należy do innej bazy danych"
+
+#: access/transam/twophase.c:442
+msgid ""
+"Connect to the database where the transaction was prepared to finish it."
+msgstr ""
+"Połączenie do bazy danych gdzie była przygotowana transakcja by ją zakończyć."
+
+#: access/transam/twophase.c:456
+#, c-format
+msgid "prepared transaction with identifier \"%s\" does not exist"
+msgstr "przygotowana transakcja z identyfikatorem \"%s\" nie istnieje"
+
+#: access/transam/twophase.c:939
+msgid "two-phase state file maximum length exceeded"
+msgstr "przekroczona maksymalna długość pliku stanu dwufazowego"
+
+#: access/transam/twophase.c:957
+#, c-format
+msgid "could not create two-phase state file \"%s\": %m"
+msgstr "nie można utworzyć pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:971 access/transam/twophase.c:988
+#: access/transam/twophase.c:1044 access/transam/twophase.c:1465
+#: access/transam/twophase.c:1472
+#, c-format
+msgid "could not write two-phase state file: %m"
+msgstr "nie można pisać do pliku stanu dwufazowego: %m"
+
+#: access/transam/twophase.c:997
+#, c-format
+msgid "could not seek in two-phase state file: %m"
+msgstr "nie można pozycjonować w pliku stanu dwufazowego %m"
+
+#: access/transam/twophase.c:1050 access/transam/twophase.c:1490
+#, c-format
+msgid "could not close two-phase state file: %m"
+msgstr "nie można zamknąć pliku stanu dwufazowego: %m"
+
+#: access/transam/twophase.c:1130 access/transam/twophase.c:1570
+#, c-format
+msgid "could not open two-phase state file \"%s\": %m"
+msgstr "nie można otworzyć pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1147
+#, c-format
+msgid "could not stat two-phase state file \"%s\": %m"
+msgstr "nie można czytać pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1179
+#, c-format
+msgid "could not read two-phase state file \"%s\": %m"
+msgstr "nie można czytać pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1271
+#, c-format
+msgid "two-phase state file for transaction %u is corrupt"
+msgstr "plik stanu dwufazowego dla transakcji %u jest uszkodzony"
+
+#: access/transam/twophase.c:1427
+#, c-format
+msgid "could not remove two-phase state file \"%s\": %m"
+msgstr "nie można usunąć pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1456
+#, c-format
+msgid "could not recreate two-phase state file \"%s\": %m"
+msgstr "nie można utworzyć ponownie pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1484
+#, c-format
+msgid "could not fsync two-phase state file: %m"
+msgstr "nie można wykonać fsync na pliku stanu dwufazowego: %m"
+
+#: access/transam/twophase.c:1579
+#, c-format
+msgid "could not fsync two-phase state file \"%s\": %m"
+msgstr "nie można wykonać fsync na pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1586
+#, c-format
+msgid "could not close two-phase state file \"%s\": %m"
+msgstr "nie można zamknąć pliku stanu dwufazowego \"%s\": %m"
+
+#: access/transam/twophase.c:1651
+#, c-format
+msgid "removing future two-phase state file \"%s\""
+msgstr "usunięcie przyszłego pliku stanu dwufazowego \"%s\""
+
+#: access/transam/twophase.c:1667 access/transam/twophase.c:1678
+#: access/transam/twophase.c:1791 access/transam/twophase.c:1802
+#: access/transam/twophase.c:1875
+#, c-format
+msgid "removing corrupt two-phase state file \"%s\""
+msgstr "usunięcie uszkodzonego pliku stanu dwufazowego \"%s\""
+
+#: access/transam/twophase.c:1780 access/transam/twophase.c:1864
+#, c-format
+msgid "removing stale two-phase state file \"%s\""
+msgstr "usunięcie nieaktualnego pliku stanu dwufazowego \"%s\""
+
+#: access/transam/twophase.c:1882
+#, c-format
+msgid "recovering prepared transaction %u"
+msgstr "odzyskiwanie przygotowanej transakcji %u"
+
+#: access/transam/varsup.c:114
+#, c-format
+msgid ""
+"database is not accepting commands to avoid wraparound data loss in database "
+"\"%s\""
+msgstr ""
+"baza danych nie przyjmuje poleceń by uniknąć utraty nakładających się danych "
+"w bazie danych \"%s\""
+
+#: access/transam/varsup.c:116 access/transam/varsup.c:123
+msgid ""
+"Stop the postmaster and use a standalone backend to vacuum that database.\n"
+"You might also need to commit or roll back old prepared transactions."
+msgstr ""
+"Zatrzymaj postmastera i użyj autonomicznego backendu do odkurzenia tej bazy "
+"danych.\n"
+"Może być także konieczne zatwierdzenie lub wycofanie starych przygotowanych "
+"transakcji."
+
+#: access/transam/varsup.c:121
+#, c-format
+msgid ""
+"database is not accepting commands to avoid wraparound data loss in database "
+"with OID %u"
+msgstr ""
+"baza danych nie przyjmuje poleceń by uniknąć utraty nakładających się danych "
+"w bazie danych o OID %u"
+
+#: access/transam/varsup.c:133 access/transam/varsup.c:368
+#, c-format
+msgid "database \"%s\" must be vacuumed within %u transactions"
+msgstr "baza danych \"%s\" musi być odkurzona w %u transakcjach"
+
+#: access/transam/varsup.c:136 access/transam/varsup.c:143
+#: access/transam/varsup.c:371 access/transam/varsup.c:378
+msgid ""
+"To avoid a database shutdown, execute a database-wide VACUUM in that "
+"database.\n"
+"You might also need to commit or roll back old prepared transactions."
+msgstr ""
+"Aby uniknąć zamknięcia bazy danych, wykonaj VACUUM dla całej bazy danych w "
+"tej bazie.\n"
+"Może być także konieczne zatwierdzenie lub wycofanie starych przygotowanych "
+"transakcji."
+
+#: access/transam/varsup.c:140 access/transam/varsup.c:375
+#, c-format
+msgid "database with OID %u must be vacuumed within %u transactions"
+msgstr "baza danych o OID %u musi być odkurzona w %u transakcjach"
+
+#: access/transam/varsup.c:333
+#, c-format
+msgid "transaction ID wrap limit is %u, limited by database with OID %u"
+msgstr ""
+"limit zawijania transakcji ID to %u, ograniczone przez bazÄ™ danych o OID %u"
+
+#: access/transam/xact.c:729
+msgid "cannot have more than 2^32-1 commands in a transaction"
+msgstr "nie można zawrzeć więcej niż 2^32-1 poleceń w transakcji"
+
+#: access/transam/xact.c:1268
+#, c-format
+msgid "maximum number of committed subtransactions (%d) exceeded"
+msgstr "przekroczona maksymalna liczba zatwierdzonych podtransakcji (%d)"
+
+#: access/transam/xact.c:2044
+msgid "cannot PREPARE a transaction that has operated on temporary tables"
+msgstr ""
+"nie można wykonać PREPARE transakcji która przeprowadziła działania na "
+"tabelach tymczasowych"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2835
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr "%s nie można wykonać wewnątrz bloku transakcji"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2845
+#, c-format
+msgid "%s cannot run inside a subtransaction"
+msgstr "%s nie można wykonać wewnątrz podtransakcji"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2855
+#, c-format
+msgid "%s cannot be executed from a function or multi-command string"
+msgstr "%s nie może być wykonane z funkcji ani ciągu wielopoleceniowego"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2906
+#, c-format
+msgid "%s can only be used in transaction blocks"
+msgstr "%s może być użyty tylko w blokach transakcji"
+
+#: access/transam/xact.c:3088
+msgid "there is already a transaction in progress"
+msgstr "istnieje już aktywna transakcja"
+
+#: access/transam/xact.c:3255 access/transam/xact.c:3347
+msgid "there is no transaction in progress"
+msgstr "brak aktywnej transakcji"
+
+#: access/transam/xact.c:3441 access/transam/xact.c:3491
+#: access/transam/xact.c:3497 access/transam/xact.c:3541
+#: access/transam/xact.c:3589 access/transam/xact.c:3595
+msgid "no such savepoint"
+msgstr "nie ma takiego punktu zapisu"
+
+#: access/transam/xact.c:4225
+msgid "cannot have more than 2^32-1 subtransactions in a transaction"
+msgstr "nie można zawrzeć więcej niż 2^32-1 podtransakcji w transakcji"
+
+#: access/transam/xlog.c:1329
+#, c-format
+msgid "could not create archive status file \"%s\": %m"
+msgstr "nie można utworzyć pliku stanu archiwum \"%s\": %m"
+
+#: access/transam/xlog.c:1337
+#, c-format
+msgid "could not write archive status file \"%s\": %m"
+msgstr "nie można zapisać pliku stanu archiwum \"%s\": %m"
+
+#: access/transam/xlog.c:1792 access/transam/xlog.c:10386
+#: replication/walreceiver.c:510 replication/walsender.c:1003
+#, c-format
+msgid "could not seek in log file %u, segment %u to offset %u: %m"
+msgstr ""
+"nie można pozycjonować w pliku dziennika %u, segment %u do offsetu %u: %m"
+
+#: access/transam/xlog.c:1809 replication/walreceiver.c:527
+#, c-format
+msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
+msgstr ""
+"nie można pisać do pliku dziennika %u, segment %u do offsetu %u, długość "
+"%lu: %m"
+
+#: access/transam/xlog.c:2011
+#, c-format
+msgid "updated min recovery point to %X/%X"
+msgstr "zaktualizowano min punkt przywracania do %X/%X"
+
+#: access/transam/xlog.c:2352 access/transam/xlog.c:2456
+#: access/transam/xlog.c:2685 access/transam/xlog.c:2756
+#: access/transam/xlog.c:2813 replication/walsender.c:991
+#, c-format
+msgid "could not open file \"%s\" (log file %u, segment %u): %m"
+msgstr "nie można otworzyć pliku \"%s\" (plik dziennika %u, segment %u): %m"
+
+#: access/transam/xlog.c:2377 access/transam/xlog.c:2510
+#: access/transam/xlog.c:4408 access/transam/xlog.c:9034
+#: access/transam/xlog.c:9274 storage/file/copydir.c:172 storage/smgr/md.c:285
+#: postmaster/postmaster.c:3691
+#, c-format
+msgid "could not create file \"%s\": %m"
+msgstr "nie można utworzyć pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2409 access/transam/xlog.c:2542
+#: access/transam/xlog.c:4460 access/transam/xlog.c:4523
+#: storage/file/copydir.c:197 postmaster/postmaster.c:3701
+#: postmaster/postmaster.c:3711 utils/init/miscinit.c:1089
+#: utils/init/miscinit.c:1098 utils/init/miscinit.c:1105 utils/misc/guc.c:7432
+#: utils/misc/guc.c:7457
+#, c-format
+msgid "could not write to file \"%s\": %m"
+msgstr "nie można pisać do pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2417 access/transam/xlog.c:2549
+#: access/transam/xlog.c:4529 storage/file/copydir.c:269 storage/smgr/md.c:924
+#: storage/smgr/md.c:1130 storage/smgr/md.c:1281
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "nie udało się fsync na pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2422 access/transam/xlog.c:2554
+#: access/transam/xlog.c:4534 commands/copy.c:1329 storage/file/copydir.c:211
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "nie można zamknąć pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2495 access/transam/xlog.c:4177
+#: access/transam/xlog.c:4271 access/transam/xlog.c:4427
+#: storage/file/copydir.c:165 storage/file/copydir.c:255 storage/smgr/md.c:542
+#: storage/smgr/md.c:802 replication/basebackup.c:725
+#: utils/init/miscinit.c:1039 utils/init/miscinit.c:1153
+#: utils/error/elog.c:1497
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "nie można otworzyć pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2523 access/transam/xlog.c:4439
+#: access/transam/xlog.c:9206 access/transam/xlog.c:9219
+#: access/transam/xlog.c:9753 access/transam/xlog.c:9788
+#: storage/file/copydir.c:186 utils/adt/genfile.c:138
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "nie można czytać z pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2526
+#, c-format
+msgid "not enough data in file \"%s\""
+msgstr "niewystarczająca ilość danych w pliku \"%s\""
+
+#: access/transam/xlog.c:2645
+#, c-format
+msgid ""
+"could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
+"%u): %m"
+msgstr ""
+"nie można podlinkować pliku \"%s\" do \"%s\" (inicjacja pliku dziennika %u, "
+"segment %u): %m"
+
+#: access/transam/xlog.c:2657
+#, c-format
+msgid ""
+"could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
+"segment %u): %m"
+msgstr ""
+"nie można zmienić nazwy pliku \"%s\" do \"%s\" (inicjacja pliku dziennika "
+"%u, segment %u): %m"
+
+#: access/transam/xlog.c:2840 replication/walreceiver.c:484
+#, c-format
+msgid "could not close log file %u, segment %u: %m"
+msgstr "nie można zamknąć pliku dziennika %u, segment %u: %m"
+
+#: access/transam/xlog.c:2912 access/transam/xlog.c:3077
+#: access/transam/xlog.c:9019 access/transam/xlog.c:9194
+#: storage/file/copydir.c:86 storage/file/copydir.c:125 utils/adt/dbsize.c:65
+#: utils/adt/dbsize.c:211 utils/adt/dbsize.c:276 utils/adt/genfile.c:107
+#: utils/adt/genfile.c:279
+#, c-format
+msgid "could not stat file \"%s\": %m"
+msgstr "nie można wykonać stat na pliku \"%s\": %m"
+
+#: access/transam/xlog.c:2920 access/transam/xlog.c:9224 storage/smgr/md.c:358
+#: storage/smgr/md.c:405 storage/smgr/md.c:1244
+#, c-format
+msgid "could not remove file \"%s\": %m"
+msgstr "nie można usunąć pliku \"%s\": %m"
+
+#: access/transam/xlog.c:3056
+#, c-format
+msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
+msgstr "plik archiwum \"%s\" ma niepoprawny rozmiar: %lu zamiast %lu"
+
+#: access/transam/xlog.c:3065
+#, c-format
+msgid "restored log file \"%s\" from archive"
+msgstr "odtworzono plik dziennika \"%s\" z archiwum"
+
+#: access/transam/xlog.c:3115
+#, c-format
+msgid "could not restore file \"%s\" from archive: return code %d"
+msgstr "nie można przywrócić pliku \"%s\" z archiwum: zwrócony kod %d"
+
+#. translator: First %s represents a recovery.conf parameter name like
+#. "recovery_end_command", and the 2nd is the value of that parameter.
+#: access/transam/xlog.c:3229
+#, c-format
+msgid "%s \"%s\": return code %d"
+msgstr "%s \"%s\": kod powrotu %d"
+
+#: access/transam/xlog.c:3339 access/transam/xlog.c:3522
+#, c-format
+msgid "could not open transaction log directory \"%s\": %m"
+msgstr "nie można otworzyć katalogu dziennika transakcji \"%s\": %m"
+
+#: access/transam/xlog.c:3393
+#, c-format
+msgid "recycled transaction log file \"%s\""
+msgstr "odzyskano plik dziennika transakcji \"%s\""
+
+#: access/transam/xlog.c:3409
+#, c-format
+msgid "removing transaction log file \"%s\""
+msgstr "usuwanie pliku dziennika transakcji \"%s\""
+
+#: access/transam/xlog.c:3432
+#, c-format
+msgid "could not rename old transaction log file \"%s\": %m"
+msgstr "nie można zmienić nazwy starego pliku dziennika transakcji \"%s\": %m"
+
+#: access/transam/xlog.c:3444
+#, c-format
+msgid "could not remove old transaction log file \"%s\": %m"
+msgstr "nie można usunąć starego pliku dziennika transakcji \"%s\": %m"
+
+#: access/transam/xlog.c:3482 access/transam/xlog.c:3492
+#, c-format
+msgid "required WAL directory \"%s\" does not exist"
+msgstr "wymagany folder WAL \"%s\" nie istnieje"
+
+#: access/transam/xlog.c:3498
+#, c-format
+msgid "creating missing WAL directory \"%s\""
+msgstr "tworzenie brakujÄ…cego folderu WAL \"%s\""
+
+#: access/transam/xlog.c:3501
+#, c-format
+msgid "could not create missing directory \"%s\": %m"
+msgstr "nie można utworzyć brakującego katalogu \"%s\": %m"
+
+#: access/transam/xlog.c:3535
+#, c-format
+msgid "removing transaction log backup history file \"%s\""
+msgstr "usunięcie pliku kopii zapasowej historii dziennika transakcji \"%s\""
+
+#: access/transam/xlog.c:3655
+#, c-format
+msgid "incorrect hole size in record at %X/%X"
+msgstr "niepoprawna wielkość otworu w rekordzie w %X/%X"
+
+#: access/transam/xlog.c:3668
+#, c-format
+msgid "incorrect total length in record at %X/%X"
+msgstr "niepoprawna całkowita długość w rekordzie w %X/%X"
+
+#: access/transam/xlog.c:3681
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr ""
+"niepoprawna suma kontrolna danych menadżera zasobów w rekordzie w %X/%X"
+
+#: access/transam/xlog.c:3759 access/transam/xlog.c:3797
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "niepoprawne przesunięcie rekordu w %X/%X"
+
+#: access/transam/xlog.c:3805
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "wymagany kontrekord w %X/%X"
+
+#: access/transam/xlog.c:3820
+#, c-format
+msgid "invalid xlog switch record at %X/%X"
+msgstr "niepoprawny rekord przełącznika xlogu w %X/%X"
+
+#: access/transam/xlog.c:3828
+#, c-format
+msgid "record with zero length at %X/%X"
+msgstr "rekord o zerowej długości w %X/%X"
+
+#: access/transam/xlog.c:3837
+#, c-format
+msgid "invalid record length at %X/%X"
+msgstr "niepoprawna długość rekordu w %X/%X"
+
+#: access/transam/xlog.c:3844
+#, c-format
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "niepoprawny ID menażera zasobów %u w %X/%X"
+
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3873
+#, c-format
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "rekord z niepoprawnym poprz-linkiem %X/%X w %X/%X"
+
+#: access/transam/xlog.c:3902
+#, c-format
+msgid "record length %u at %X/%X too long"
+msgstr "za duża długość rekordu %u w %X/%X"
+
+#: access/transam/xlog.c:3942
+#, c-format
+msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
+msgstr ""
+"brak flagi kontrekordu w pliku dziennika %u, segment %u, przesunięcie %u"
+
+#: access/transam/xlog.c:3952
+#, c-format
+msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
+msgstr ""
+"niepoprawna długość kontrekordu %u w pliku dziennika %u, segment %u, "
+"przesunięcie %u"
+
+#: access/transam/xlog.c:4042
+#, c-format
+msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
+msgstr ""
+"niepoprawny magiczny numer %04X w pliku dziennika %u, segment %u, "
+"przesunięcie %u"
+
+#: access/transam/xlog.c:4049 access/transam/xlog.c:4095
+#, c-format
+msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
+msgstr ""
+"niepoprawny bity informacji %04X w pliku dziennika %u, segment %u, "
+"przesunięcie %u"
+
+#: access/transam/xlog.c:4071 access/transam/xlog.c:4079
+#: access/transam/xlog.c:4086
+msgid "WAL file is from different database system"
+msgstr "plik WAL jest z innego systemu bazy danych"
+
+#: access/transam/xlog.c:4072
+#, c-format
+msgid ""
+"WAL file database system identifier is %s, pg_control database system "
+"identifier is %s."
+msgstr ""
+"identyfikator systemu bazy danych w pliku WAL to %s, identyfikator systemu "
+"bazy danych pg_control to %s."
+
+#: access/transam/xlog.c:4080
+msgid "Incorrect XLOG_SEG_SIZE in page header."
+msgstr "Niepoprawny XLOG_SEG_SIZE w nagłówku strony."
+
+#: access/transam/xlog.c:4087
+msgid "Incorrect XLOG_BLCKSZ in page header."
+msgstr "Niepoprawny XLOG_BLCKSZ w nagłówku strony."
+
+#: access/transam/xlog.c:4103
+#, c-format
+msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
+msgstr ""
+"nieoczekiwany adrstrony %X/%X w pliku dziennika %u, segment %u, offset %u"
+
+#: access/transam/xlog.c:4115
+#, c-format
+msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
+msgstr ""
+"nieoczekiwany ID linii czasu %u w pliku dziennika %u, segment %u, offset %u"
+
+#: access/transam/xlog.c:4133
+#, c-format
+msgid ""
+"out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
+"%u"
+msgstr ""
+"nieoczekiwany ID linii czasu %u (po %u) w pliku dziennika %u, segment %u, "
+"offset %u"
+
+#: access/transam/xlog.c:4206
+#, c-format
+msgid "syntax error in history file: %s"
+msgstr "błąd składni w pliku historii: %s"
+
+#: access/transam/xlog.c:4207
+msgid "Expected a numeric timeline ID."
+msgstr "Oczekiwano numerycznego ID linii czasu."
+
+#: access/transam/xlog.c:4212
+#, c-format
+msgid "invalid data in history file: %s"
+msgstr "niepoprawne dane w pliku historii: %s"
+
+#: access/transam/xlog.c:4213
+msgid "Timeline IDs must be in increasing sequence."
+msgstr "IDy linii czasu muszą być w kolejności rosnącej."
+
+#: access/transam/xlog.c:4226
+#, c-format
+msgid "invalid data in history file \"%s\""
+msgstr "niepoprawne dane w pliku historii \"%s\""
+
+#: access/transam/xlog.c:4227
+msgid "Timeline IDs must be less than child timeline's ID."
+msgstr "IDy linii czasu muszą być mniejsze niż ID potomnej linii czasu."
+
+#: access/transam/xlog.c:4313
+#, c-format
+msgid "new timeline %u is not a child of database system timeline %u"
+msgstr ""
+"nowa linia czasu %u nie jest potomna dla linii czasu systemu bazy danych %u"
+
+#: access/transam/xlog.c:4326
+#, c-format
+msgid "new target timeline is %u"
+msgstr "nowa docelowa linia czasu to %u"
+
+#: access/transam/xlog.c:4551
+#, c-format
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "nie można podlinkować pliku \"%s\" do \"%s\": %m"
+
+#: access/transam/xlog.c:4558 access/transam/xlog.c:5518
+#: access/transam/xlog.c:5571 access/transam/xlog.c:6350
+#: postmaster/pgarch.c:715
+#, c-format
+msgid "could not rename file \"%s\" to \"%s\": %m"
+msgstr "nie można zmienić nazwy pliku \"%s\" na \"%s\": %m"
+
+#: access/transam/xlog.c:4640
+#, c-format
+msgid "could not create control file \"%s\": %m"
+msgstr "nie można utworzyć pliku kontrolnego \"%s\": %m"
+
+#: access/transam/xlog.c:4651 access/transam/xlog.c:4876
+#, c-format
+msgid "could not write to control file: %m"
+msgstr "nie można pisać do pliku kontrolnego: %m"
+
+#: access/transam/xlog.c:4657 access/transam/xlog.c:4882
+#, c-format
+msgid "could not fsync control file: %m"
+msgstr "nie można wykonać fsync na pliku kontrolnym: %m"
+
+#: access/transam/xlog.c:4662 access/transam/xlog.c:4887
+#, c-format
+msgid "could not close control file: %m"
+msgstr "nie można zamknąć pliku kontrolnego: %m"
+
+#: access/transam/xlog.c:4680 access/transam/xlog.c:4865
+#, c-format
+msgid "could not open control file \"%s\": %m"
+msgstr "nie można otworzyć pliku kontrolnego \"%s\": %m"
+
+#: access/transam/xlog.c:4686
+#, c-format
+msgid "could not read from control file: %m"
+msgstr "nie można czytać z pliku kontrolnego: %m"
+
+#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
+#: access/transam/xlog.c:4732 access/transam/xlog.c:4739
+#: access/transam/xlog.c:4746 access/transam/xlog.c:4751
+#: access/transam/xlog.c:4758 access/transam/xlog.c:4765
+#: access/transam/xlog.c:4772 access/transam/xlog.c:4779
+#: access/transam/xlog.c:4786 access/transam/xlog.c:4793
+#: access/transam/xlog.c:4802 access/transam/xlog.c:4809
+#: access/transam/xlog.c:4818 access/transam/xlog.c:4825
+#: access/transam/xlog.c:4834 access/transam/xlog.c:4841
+#: utils/init/miscinit.c:1171
+msgid "database files are incompatible with server"
+msgstr "pliki bazy danych sÄ… niezgodne z serwerem"
+
+#: access/transam/xlog.c:4700
+#, c-format
+msgid ""
+"The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
+"but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
+msgstr ""
+"Klaster bazy danych został zainicjowany z PG_CONTROL_VERSION %d (0x%08x), "
+"ale serwer był skompilowany z PG_CONTROL_VERSION %d (0x%08x)."
+
+#: access/transam/xlog.c:4704
+msgid ""
+"This could be a problem of mismatched byte ordering.  It looks like you need "
+"to initdb."
+msgstr ""
+"Może to być problem niepoprawnego uporządkowania bajtów.  Wydaje się jakby "
+"konieczne było initdb."
+
+#: access/transam/xlog.c:4709
+#, c-format
+msgid ""
+"The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
+"server was compiled with PG_CONTROL_VERSION %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z PG_CONTROL_VERSION %d, ale serwer "
+"był skompilowany z PG_CONTROL_VERSION %d."
+
+#: access/transam/xlog.c:4712 access/transam/xlog.c:4736
+#: access/transam/xlog.c:4743 access/transam/xlog.c:4748
+msgid "It looks like you need to initdb."
+msgstr "Wydaje się jakby konieczne było initdb."
+
+#: access/transam/xlog.c:4723
+msgid "incorrect checksum in control file"
+msgstr "niepoprawna suma kontrolna pliku kontrolnego"
+
+#: access/transam/xlog.c:4733
+#, c-format
+msgid ""
+"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
+"server was compiled with CATALOG_VERSION_NO %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z CATALOG_VERSION_NO %d, ale serwer "
+"był skompilowany z CATALOG_VERSION_NO %d."
+
+#: access/transam/xlog.c:4740
+#, c-format
+msgid ""
+"The database cluster was initialized with MAXALIGN %d, but the server was "
+"compiled with MAXALIGN %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z MAXALIGN %d, ale serwer był "
+"skompilowany z MAXALIGN %d."
+
+#: access/transam/xlog.c:4747
+msgid ""
+"The database cluster appears to use a different floating-point number format "
+"than the server executable."
+msgstr ""
+"Klaster bazy danych wydaje się używać innego formatu liczb "
+"zmiennoprzecinkowych niż plik wykonywalny serwera."
+
+#: access/transam/xlog.c:4752
+#, c-format
+msgid ""
+"The database cluster was initialized with BLCKSZ %d, but the server was "
+"compiled with BLCKSZ %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z BLCKSZ %d, ale serwer był "
+"skompilowany z BLCKSZ %d."
+
+#: access/transam/xlog.c:4755 access/transam/xlog.c:4762
+#: access/transam/xlog.c:4769 access/transam/xlog.c:4776
+#: access/transam/xlog.c:4783 access/transam/xlog.c:4790
+#: access/transam/xlog.c:4797 access/transam/xlog.c:4805
+#: access/transam/xlog.c:4812 access/transam/xlog.c:4821
+#: access/transam/xlog.c:4828 access/transam/xlog.c:4837
+#: access/transam/xlog.c:4844
+msgid "It looks like you need to recompile or initdb."
+msgstr "Wydaje się jakby konieczna była rekompilacja lub initdb."
+
+#: access/transam/xlog.c:4759
+#, c-format
+msgid ""
+"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
+"compiled with RELSEG_SIZE %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z RELSEG_SIZE %d, ale serwer był "
+"skompilowany z RELSEG_SIZE %d."
+
+#: access/transam/xlog.c:4766
+#, c-format
+msgid ""
+"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
+"compiled with XLOG_BLCKSZ %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z XLOG_BLCKSZ %d, ale serwer był "
+"skompilowany z XLOG_BLCKSZ %d."
+
+#: access/transam/xlog.c:4773
+#, c-format
+msgid ""
+"The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
+"was compiled with XLOG_SEG_SIZE %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z XLOG_SEG_SIZE %d, ale serwer był "
+"skompilowany z XLOG_SEG_SIZE %d."
+
+#: access/transam/xlog.c:4780
+#, c-format
+msgid ""
+"The database cluster was initialized with NAMEDATALEN %d, but the server was "
+"compiled with NAMEDATALEN %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z NAMEDATALEN %d, ale serwer był "
+"skompilowany z NAMEDATALEN %d."
+
+#: access/transam/xlog.c:4787
+#, c-format
+msgid ""
+"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
+"was compiled with INDEX_MAX_KEYS %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z INDEX_MAX_KEYS %d, ale serwer był "
+"skompilowany z INDEX_MAX_KEYS %d."
+
+#: access/transam/xlog.c:4794
+#, c-format
+msgid ""
+"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
+"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
+msgstr ""
+"Klaster bazy danych został zainicjowany z TOAST_MAX_CHUNK_SIZE %d, ale "
+"serwer był skompilowany z TOAST_MAX_CHUNK_SIZE %d."
+
+#: access/transam/xlog.c:4803
+msgid ""
+"The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
+"server was compiled with HAVE_INT64_TIMESTAMP."
+msgstr ""
+"Klaster bazy danych został zainicjowany bez HAVE_INT64_TIMESTAMP, ale serwer "
+"był skompilowany z HAVE_INT64_TIMESTAMP."
+
+#: access/transam/xlog.c:4810
+msgid ""
+"The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
+"server was compiled without HAVE_INT64_TIMESTAMP."
+msgstr ""
+"Klaster bazy danych został zainicjowany z HAVE_INT64_TIMESTAMP, ale serwer "
+"był skompilowany bez HAVE_INT64_TIMESTAMP."
+
+#: access/transam/xlog.c:4819
+msgid ""
+"The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
+"was compiled with USE_FLOAT4_BYVAL."
+msgstr ""
+"Klaster bazy danych został zainicjowany bez USE_FLOAT4_BYVAL, ale serwer był "
+"skompilowany z USE_FLOAT4_BYVAL."
+
+#: access/transam/xlog.c:4826
+msgid ""
+"The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
+"was compiled without USE_FLOAT4_BYVAL."
+msgstr ""
+"Klaster bazy danych został zainicjowany z USE_FLOAT4_BYVAL, ale serwer był "
+"skompilowany bez USE_FLOAT4_BYVAL."
+
+#: access/transam/xlog.c:4835
+msgid ""
+"The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
+"was compiled with USE_FLOAT8_BYVAL."
+msgstr ""
+"Klaster bazy danych został zainicjowany bez USE_FLOAT8_BYVAL, ale serwer był "
+"skompilowany z USE_FLOAT8_BYVAL."
+
+#: access/transam/xlog.c:4842
+msgid ""
+"The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
+"was compiled without USE_FLOAT8_BYVAL."
+msgstr ""
+"Klaster bazy danych został zainicjowany z USE_FLOAT8_BYVAL, ale serwer był "
+"skompilowany bez USE_FLOAT8_BYVAL."
+
+#: access/transam/xlog.c:5167
+#, c-format
+msgid "could not write bootstrap transaction log file: %m"
+msgstr "nie można pisać do pliku dziennika transakcji ładującej: %m"
+
+#: access/transam/xlog.c:5173
+#, c-format
+msgid "could not fsync bootstrap transaction log file: %m"
+msgstr "nie można wykonać fsync na pliku dziennika transakcji ładującej: %m"
+
+#: access/transam/xlog.c:5178
+#, c-format
+msgid "could not close bootstrap transaction log file: %m"
+msgstr "nie można zamknąć pliku dziennika transakcji ładującej: %m"
+
+#: access/transam/xlog.c:5245
+#, c-format
+msgid "could not open recovery command file \"%s\": %m"
+msgstr "nie można otworzyć pliku polecenia odtworzenia \"%s\": %m"
+
+#: access/transam/xlog.c:5283 access/transam/xlog.c:5374
+#: access/transam/xlog.c:5385 commands/extension.c:526
+#: commands/extension.c:534 utils/misc/guc.c:5309
+#, c-format
+msgid "parameter \"%s\" requires a Boolean value"
+msgstr "parametr \"%s\" wymaga wartości Boolean"
+
+#: access/transam/xlog.c:5299
+#, c-format
+msgid "recovery_target_timeline is not a valid number: \"%s\""
+msgstr "linia_czasu_celu_odzyskiwania nie jest poprawnÄ… liczbÄ…: \"%s\""
+
+#: access/transam/xlog.c:5315
+#, c-format
+msgid "recovery_target_xid is not a valid number: \"%s\""
+msgstr "xid_celu_odzyskiwania nie jest poprawnÄ… liczbÄ…: \"%s\""
+
+#: access/transam/xlog.c:5359
+#, c-format
+msgid "recovery_target_name is too long (maximum %d characters)"
+msgstr "nazwa_celu_odzyskiwania jest zbyt długa (maksymalnie %d znaki)"
+
+#: access/transam/xlog.c:5406
+#, c-format
+msgid "unrecognized recovery parameter \"%s\""
+msgstr "nierozpoznany parametr odzyskiwania: \"%s\""
+
+#: access/transam/xlog.c:5417
+#, c-format
+msgid ""
+"recovery command file \"%s\" specified neither primary_conninfo nor "
+"restore_command"
+msgstr ""
+"plik poleceń odzyskiwania \"%s\" nie wskazuje ani na infopołącz_pierwotnego "
+"ani polecenie_odtworzenia"
+
+#: access/transam/xlog.c:5419
+msgid ""
+"The database server will regularly poll the pg_xlog subdirectory to check "
+"for files placed there."
+msgstr ""
+"Serwer bazy danych będzie regularnie odpytywać podfolder pg_xlog by "
+"sprawdzić położone tu pliki."
+
+#: access/transam/xlog.c:5425
+#, c-format
+msgid ""
+"recovery command file \"%s\" must specify restore_command when standby mode "
+"is not enabled"
+msgstr ""
+"plik polecenia odzyskiwania \"%s\" musi wskazywać polecenie_odtworzenia gdy "
+"nie jest włączony tryb gotowości"
+
+#: access/transam/xlog.c:5445
+#, c-format
+msgid "recovery target timeline %u does not exist"
+msgstr "linia czasowa celu odtworzenia %u nie istnieje"
+
+#: access/transam/xlog.c:5575
+msgid "archive recovery complete"
+msgstr "wykonane odtworzenie archiwum"
+
+#: access/transam/xlog.c:5693
+#, c-format
+msgid "recovery stopping after commit of transaction %u, time %s"
+msgstr "zatrzymanie odzyskiwania po zatwierdzeniu transakcji %u, czas %s"
+
+#: access/transam/xlog.c:5698
+#, c-format
+msgid "recovery stopping before commit of transaction %u, time %s"
+msgstr "zatrzymanie odzyskiwania przed zatwierdzeniem transakcji %u, czas %s"
+
+#: access/transam/xlog.c:5706
+#, c-format
+msgid "recovery stopping after abort of transaction %u, time %s"
+msgstr "zatrzymanie odzyskiwania po przerwaniu transakcji %u, czas %s"
+
+#: access/transam/xlog.c:5711
+#, c-format
+msgid "recovery stopping before abort of transaction %u, time %s"
+msgstr "zatrzymanie odzyskiwania przed przerwaniem transakcji %u, czas %s"
+
+#: access/transam/xlog.c:5720
+#, c-format
+msgid "recovery stopping at restore point \"%s\", time %s"
+msgstr "zatrzymanie odzyskiwania w punkcie przywrócenia \"%s\", czas %s"
+
+#: access/transam/xlog.c:5748
+msgid "recovery has paused"
+msgstr "odzyskiwanie zostało wstrzymane"
+
+#: access/transam/xlog.c:5749
+msgid "Execute pg_xlog_replay_resume() to continue."
+msgstr "Wykonaj pg_xlog_replay_resume() by kontynuować."
+
+#: access/transam/xlog.c:5792 access/transam/xlog.c:5814
+#: access/transam/xlog.c:5836
+msgid "must be superuser to control recovery"
+msgstr "musisz być superużytkownikiem by kontrolować odzyskiwanie"
+
+#: access/transam/xlog.c:5797 access/transam/xlog.c:5819
+#: access/transam/xlog.c:5841
+msgid "recovery is not in progress"
+msgstr "odzyskiwanie nie jest w toku"
+
+#: access/transam/xlog.c:5798 access/transam/xlog.c:5820
+#: access/transam/xlog.c:5842
+msgid "Recovery control functions can only be executed during recovery."
+msgstr ""
+"Funkcje kontroli odzyskiwania mogą być wykonywane tylko w trakcie "
+"odzyskiwania."
+
+#: access/transam/xlog.c:5934
+#, c-format
+msgid ""
+"hot standby is not possible because %s = %d is a lower setting than on the "
+"master server (its value was %d)"
+msgstr ""
+"rezerwa dynamiczna nie jest możliwa ponieważ %s = %d jest niższym "
+"ustawieniem niż na serwerze podstawowym (jego wartość była %d)"
+
+#: access/transam/xlog.c:5956
+msgid "WAL was generated with wal_level=minimal, data may be missing"
+msgstr "WAL został utworzony z wal_level=minimal, może brakować danych"
+
+#: access/transam/xlog.c:5957
+msgid ""
+"This happens if you temporarily set wal_level=minimal without taking a new "
+"base backup."
+msgstr ""
+"To zdarza się, jeśli ustawi się tymczasowo wal_level=minimal bez wykonania "
+"nowej kopii zapasowej bazy."
+
+#: access/transam/xlog.c:5968
+msgid ""
+"hot standby is not possible because wal_level was not set to \"hot_standby\" "
+"on the master server"
+msgstr ""
+"rezerwa dynamiczna nie jest możliwa ponieważ wal_level nie był ustawiony na "
+"\"hot_standby\" na serwerze podstawowym"
+
+#: access/transam/xlog.c:5969
+msgid ""
+"Either set wal_level to \"hot_standby\" on the master, or turn off "
+"hot_standby here."
+msgstr ""
+"Albo ustaw wal_level na \"hot_standby\" na podstawowym, ambo wyłącz "
+"hot_standby tutaj."
+
+#: access/transam/xlog.c:6017
+msgid "control file contains invalid data"
+msgstr "plik kontrolny zawiera niepoprawne dane"
+
+#: access/transam/xlog.c:6021
+#, c-format
+msgid "database system was shut down at %s"
+msgstr "system bazy danych został zamknięty %s"
+
+#: access/transam/xlog.c:6025
+#, c-format
+msgid "database system was shut down in recovery at %s"
+msgstr "system bazy danych został zamknięty w odzysku %s"
+
+#: access/transam/xlog.c:6029
+#, c-format
+msgid "database system shutdown was interrupted; last known up at %s"
+msgstr ""
+"zamknięcie systemu bazy danych zostało przerwane; ostatnie znane "
+"podniesienie %s"
+
+#: access/transam/xlog.c:6033
+#, c-format
+msgid "database system was interrupted while in recovery at %s"
+msgstr "system bazy danych został przerwany podczas odzysku %s"
+
+#: access/transam/xlog.c:6035
+msgid ""
+"This probably means that some data is corrupted and you will have to use the "
+"last backup for recovery."
+msgstr ""
+"Oznacza to prawdopodobnie, że pewne dane zostały uszkodzone będzie konieczne "
+"użycie ostatniej kopii zapasowej do odzyskania."
+
+#: access/transam/xlog.c:6039
+#, c-format
+msgid "database system was interrupted while in recovery at log time %s"
+msgstr ""
+"system bazy danych został przerwany podczas odzysku - czas dziennika %s"
+
+#: access/transam/xlog.c:6041
+msgid ""
+"If this has occurred more than once some data might be corrupted and you "
+"might need to choose an earlier recovery target."
+msgstr ""
+"Jeśli zdarzyło się to więcej niż raz, pewne dane mogły zostać uszkodzone i "
+"należy wybrać wcześniejszy cel odzyskiwania."
+
+#: access/transam/xlog.c:6045
+#, c-format
+msgid "database system was interrupted; last known up at %s"
+msgstr ""
+"działanie systemu bazy danych zostało przerwane; ostatnie znane podniesienie "
+"%s"
+
+#: access/transam/xlog.c:6094
+#, c-format
+msgid "requested timeline %u is not a child of database system timeline %u"
+msgstr ""
+"żądana linia czasu %u nie jest potomna dla linii czasu systemu bazy danych %u"
+
+#: access/transam/xlog.c:6112
+msgid "entering standby mode"
+msgstr "wejście w tryb gotowości"
+
+#: access/transam/xlog.c:6115
+#, c-format
+msgid "starting point-in-time recovery to XID %u"
+msgstr "chwila poczÄ…tkowa odzyskiwania do XID %u"
+
+#: access/transam/xlog.c:6119
+#, c-format
+msgid "starting point-in-time recovery to %s"
+msgstr "chwila poczÄ…tkowa odzyskiwania do %s"
+
+#: access/transam/xlog.c:6123
+#, c-format
+msgid "starting point-in-time recovery to \"%s\""
+msgstr "chwila poczÄ…tkowa odzyskiwania do \"%s\""
+
+#: access/transam/xlog.c:6127
+msgid "starting archive recovery"
+msgstr "rozpoczęto odzyskiwanie archiwum"
+
+#: access/transam/xlog.c:6149 access/transam/xlog.c:6189
+#, c-format
+msgid "checkpoint record is at %X/%X"
+msgstr "rekord punktu kontrolnego jest w %X/%X"
+
+#: access/transam/xlog.c:6163
+msgid "could not find redo location referenced by checkpoint record"
+msgstr ""
+"nie można odnaleźć położenia ponowienia wskazywanego przez rekord punktu "
+"kontrolnego"
+
+#: access/transam/xlog.c:6164 access/transam/xlog.c:6171
+#, c-format
+msgid ""
+"If you are not restoring from a backup, try removing the file \"%s/"
+"backup_label\"."
+msgstr ""
+"Jeśli nie odtwarzasz z kopii zapasowej, spróbuj usunąć plik \"%s/backup_label"
+"\"."
+
+#: access/transam/xlog.c:6170
+msgid "could not locate required checkpoint record"
+msgstr "nie można odnaleźć wymaganego rekordu punktu kontrolnego"
+
+#: access/transam/xlog.c:6199 access/transam/xlog.c:6214
+msgid "could not locate a valid checkpoint record"
+msgstr "nie można odnaleźć poprawnego rekordu punktu kontrolnego"
+
+#: access/transam/xlog.c:6208
+#, c-format
+msgid "using previous checkpoint record at %X/%X"
+msgstr "użycie poprzedniego rekordu punktu kontrolnego w %X/%X"
+
+#: access/transam/xlog.c:6223
+#, c-format
+msgid "redo record is at %X/%X; shutdown %s"
+msgstr "rekord ponowienia w %X/%X; zamknięcie %s"
+
+#: access/transam/xlog.c:6227
+#, c-format
+msgid "next transaction ID: %u/%u; next OID: %u"
+msgstr "ID następnej transakcji: %u/%u; następny OID: %u"
+
+#: access/transam/xlog.c:6231
+#, c-format
+msgid "next MultiXactId: %u; next MultiXactOffset: %u"
+msgstr "następny MultiXactId: %u; następny MultiXactOffset: %u"
+
+#: access/transam/xlog.c:6234
+#, c-format
+msgid "oldest unfrozen transaction ID: %u, in database %u"
+msgstr "ID najstarszej niezamrożonej transakcji: %u; następny OID: %u"
+
+#: access/transam/xlog.c:6238
+msgid "invalid next transaction ID"
+msgstr "nieprawidłowy ID następnej transakcji"
+
+#: access/transam/xlog.c:6257
+msgid "invalid redo in checkpoint record"
+msgstr "niepoprawne ponowienie w rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:6268
+msgid "invalid redo record in shutdown checkpoint"
+msgstr "niepoprawny rekord ponowienia w punkcie kontrolnym zamknięcia"
+
+#: access/transam/xlog.c:6298
+msgid ""
+"database system was not properly shut down; automatic recovery in progress"
+msgstr ""
+"system bazy danych nie został poprawnie zamknięty; trwa automatyczne "
+"odzyskiwanie"
+
+#: access/transam/xlog.c:6377
+msgid "initializing for hot standby"
+msgstr "inicjacja dla rezerwy dynamicznej"
+
+#: access/transam/xlog.c:6505
+#, c-format
+msgid "redo starts at %X/%X"
+msgstr "ponowienie uruchamia siÄ™ w %X/%X"
+
+#: access/transam/xlog.c:6620
+#, c-format
+msgid "redo done at %X/%X"
+msgstr "ponowienie wykonane w %X/%X"
+
+#: access/transam/xlog.c:6625 access/transam/xlog.c:8195
+#, c-format
+msgid "last completed transaction was at log time %s"
+msgstr "czas ostatniej zakończonej transakcji według dziennika %s"
+
+#: access/transam/xlog.c:6633
+msgid "redo is not required"
+msgstr "ponowienie nie jest wymagane"
+
+#: access/transam/xlog.c:6681
+msgid "requested recovery stop point is before consistent recovery point"
+msgstr ""
+"żądany punkt zatrzymania odtworzenia znajduje się przed punktem spójnego "
+"odzyskania"
+
+#: access/transam/xlog.c:6690
+msgid "WAL ends before end of online backup"
+msgstr "WAL kończy się prze końcem backupu online"
+
+#: access/transam/xlog.c:6691
+msgid ""
+"Online backup started with pg_start_backup() must be ended with "
+"pg_stop_backup(), and all WAL up to that point must be available at recovery."
+msgstr ""
+"Backup online uruchomiony z pg_start_backup() musi być zakończony "
+"pg_stop_backup(), a wszystkie WALL do tego miejsca muszą być dostępne "
+"podczas odzyskiwania."
+
+#: access/transam/xlog.c:6694
+msgid "WAL ends before consistent recovery point"
+msgstr "WAL kończy się przed punktem spójnego odzyskiwania"
+
+#: access/transam/xlog.c:6715
+#, c-format
+msgid "selected new timeline ID: %u"
+msgstr "wybrany nowy ID linii czasowej: %u"
+
+#: access/transam/xlog.c:6957
+#, c-format
+msgid "consistent recovery state reached at %X/%X"
+msgstr "stan spójnego odzyskania osiągnięty w %X/%X"
+
+#: access/transam/xlog.c:7123
+msgid "invalid primary checkpoint link in control file"
+msgstr "niepoprawny link podstawowego punktu kontrolnego w pliku kontrolnym"
+
+#: access/transam/xlog.c:7127
+msgid "invalid secondary checkpoint link in control file"
+msgstr "niepoprawny link wtórnego punktu kontrolnego w pliku kontrolnym"
+
+#: access/transam/xlog.c:7131
+msgid "invalid checkpoint link in backup_label file"
+msgstr "niepoprawny link punktu kontrolnego w pliku etykiety_backupu"
+
+#: access/transam/xlog.c:7145
+msgid "invalid primary checkpoint record"
+msgstr "niepoprawny podstawowy rekord punktu kontrolnego"
+
+#: access/transam/xlog.c:7149
+msgid "invalid secondary checkpoint record"
+msgstr "niepoprawny wtórny rekord punktu kontrolnego"
+
+#: access/transam/xlog.c:7153
+msgid "invalid checkpoint record"
+msgstr "niepoprawny rekord punktu kontrolnego"
+
+#: access/transam/xlog.c:7164
+msgid "invalid resource manager ID in primary checkpoint record"
+msgstr ""
+"niepoprawny ID menadżera zasobów w podstawowym rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:7168
+msgid "invalid resource manager ID in secondary checkpoint record"
+msgstr ""
+"niepoprawny ID menadżera zasobów we wtórnym rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:7172
+msgid "invalid resource manager ID in checkpoint record"
+msgstr "niepoprawny ID menadżera zasobów w rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:7184
+msgid "invalid xl_info in primary checkpoint record"
+msgstr "niepoprawny xl_info w podstawowym rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:7188
+msgid "invalid xl_info in secondary checkpoint record"
+msgstr "niepoprawny xl_info we wtórnym rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:7192
+msgid "invalid xl_info in checkpoint record"
+msgstr "niepoprawny xl_info w rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:7204
+msgid "invalid length of primary checkpoint record"
+msgstr "niepoprawna długość podstawowego rekordu punktu kontrolnego"
+
+#: access/transam/xlog.c:7208
+msgid "invalid length of secondary checkpoint record"
+msgstr "niepoprawna długość wtórnego rekordu punktu kontrolnego"
+
+#: access/transam/xlog.c:7212
+msgid "invalid length of checkpoint record"
+msgstr "niepoprawna długość rekordu punktu kontrolnego"
+
+#: access/transam/xlog.c:7374
+msgid "shutting down"
+msgstr "zamykanie"
+
+#: access/transam/xlog.c:7396
+msgid "database system is shut down"
+msgstr "system bazy danych jest zamknięty"
+
+#: access/transam/xlog.c:7822
+msgid ""
+"concurrent transaction log activity while database system is shutting down"
+msgstr ""
+"równoczesna aktywność dziennika transakcji podczas gdy system bazy danych "
+"jest zamykany"
+
+#: access/transam/xlog.c:8056
+msgid "skipping restartpoint, recovery has already ended"
+msgstr "pominięcie punktu restartu, odzyskiwanie już się zakończyło"
+
+#: access/transam/xlog.c:8081
+#, c-format
+msgid "skipping restartpoint, already performed at %X/%X"
+msgstr "pominięcie punktu restartu, wykonano już w %X/%X"
+
+#: access/transam/xlog.c:8193
+#, c-format
+msgid "recovery restart point at %X/%X"
+msgstr "punkt restartu odzyskiwania w %X/%X"
+
+#: access/transam/xlog.c:8293
+#, c-format
+msgid "restore point \"%s\" created at %X/%X"
+msgstr "punkt przywrócenia \"%s\" utworzony w %X/%X"
+
+#: access/transam/xlog.c:8390
+msgid "online backup was canceled, recovery cannot continue"
+msgstr ""
+"zapis kopii roboczej online został anulowany, odzyskiwanie nie może być "
+"kontynuowane"
+
+#: access/transam/xlog.c:8442
+#, c-format
+msgid "unexpected timeline ID %u (after %u) in checkpoint record"
+msgstr "nieoczekiwany ID linii czasu %u (po %u) w rekordzie punktu kontrolnego"
+
+#: access/transam/xlog.c:8478
+#, c-format
+msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
+msgstr ""
+"nieoczekiwany ID linii czasu %u (powinien być %u) w rekordzie punktu "
+"kontrolnego"
+
+#: access/transam/xlog.c:8742 access/transam/xlog.c:8766
+#, c-format
+msgid "could not fsync log file %u, segment %u: %m"
+msgstr "nie można wykonać fsync na pliku dziennika %u, segment %u: %m"
+
+#: access/transam/xlog.c:8774
+#, c-format
+msgid "could not fsync write-through log file %u, segment %u: %m"
+msgstr ""
+"nie można wykonać fsync write-through na pliku dziennika %u, segment %u: %m"
+
+#: access/transam/xlog.c:8783
+#, c-format
+msgid "could not fdatasync log file %u, segment %u: %m"
+msgstr "nie można wykonać fdatasync na pliku dziennika %u, segment %u: %m"
+
+#: access/transam/xlog.c:8864 access/transam/xlog.c:9142
+msgid "must be superuser or replication role to run a backup"
+msgstr ""
+"musisz być superużytkownikiem lub rolą replikacji by uruchomić tworzenie "
+"kopii zapasowej"
+
+#: access/transam/xlog.c:8869 access/transam/xlog.c:9147
+#: access/transam/xlog.c:9410 access/transam/xlog.c:9442
+#: access/transam/xlog.c:9483 access/transam/xlog.c:9516
+#: access/transam/xlog.c:9623 access/transam/xlog.c:9698
+msgid "recovery is in progress"
+msgstr "trwa odzyskiwanie"
+
+#: access/transam/xlog.c:8870 access/transam/xlog.c:9148
+#: access/transam/xlog.c:9411 access/transam/xlog.c:9443
+#: access/transam/xlog.c:9484 access/transam/xlog.c:9517
+msgid "WAL control functions cannot be executed during recovery."
+msgstr "Funkcje kontroli WAL nie mogą być wykonywane w trakcie odzyskiwania."
+
+#: access/transam/xlog.c:8875 access/transam/xlog.c:9153
+msgid "WAL level not sufficient for making an online backup"
+msgstr "poziom WAL niewystarczajÄ…cy do wykonania kopii zapasowej online"
+
+#: access/transam/xlog.c:8876 access/transam/xlog.c:9154
+#: access/transam/xlog.c:9449
+msgid ""
+"wal_level must be set to \"archive\" or \"hot_standby\" at server start."
+msgstr ""
+"wal_level musi być ustawiony na \"archive\" lub \"hot_standby\" w czasie "
+"uruchomienia serwera."
+
+#: access/transam/xlog.c:8881
+#, c-format
+msgid "backup label too long (max %d bytes)"
+msgstr "za długa etykieta backupu (maks %d bajtów)"
+
+#: access/transam/xlog.c:8922 access/transam/xlog.c:9025
+msgid "a backup is already in progress"
+msgstr "tworzenie kopii zapasowej jest już w toku"
+
+#: access/transam/xlog.c:8923
+msgid "Run pg_stop_backup() and try again."
+msgstr "Uruchom pg_stop_backup() i spróbuj ponownie."
+
+#: access/transam/xlog.c:9026
+#, c-format
+msgid ""
+"If you're sure there is no backup in progress, remove file \"%s\" and try "
+"again."
+msgstr ""
+"Jeśli masz pewność, że nie jest wykonywany żaden backup, usuń plik \"%s\" i "
+"spróbuj raz jeszcze."
+
+#: access/transam/xlog.c:9040 access/transam/xlog.c:9286
+#, c-format
+msgid "could not write file \"%s\": %m"
+msgstr "nie można pisać do pliku \"%s\": %m"
+
+#: access/transam/xlog.c:9198
+msgid "a backup is not in progress"
+msgstr "tworzenie kopii zapasowej nie jest w toku"
+
+#: access/transam/xlog.c:9237 access/transam/xlog.c:9768
+#: access/transam/xlog.c:9774
+#, c-format
+msgid "invalid data in file \"%s\""
+msgstr "nieprawidłowe dane w pliku \"%s\""
+
+#: access/transam/xlog.c:9335
+msgid ""
+"pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
+msgstr ""
+"wykonano czyszczenie pg_stop_backup, oczekiwanie na wymagane segmenty WAL do "
+"zarchiwizowania"
+
+#: access/transam/xlog.c:9345
+#, c-format
+msgid ""
+"pg_stop_backup still waiting for all required WAL segments to be archived "
+"(%d seconds elapsed)"
+msgstr ""
+"pg_stop_backup, wciąż trwa oczekiwanie na wszystkie wymagane segmenty WAL do "
+"zarchiwizowania (upłynęło %d sekund)"
+
+#: access/transam/xlog.c:9347
+msgid ""
+"Check that your archive_command is executing properly.  pg_stop_backup can "
+"be canceled safely, but the database backup will not be usable without all "
+"the WAL segments."
+msgstr ""
+"Sprawdź, że archive_command jest poprawnie wykonywane.  pg_stop_backup może "
+"być bezpiecznie anulowane, ale backup bazy danych nie będzie zdatny do "
+"użytku bez wszystkich segmentów WAL."
+
+#: access/transam/xlog.c:9354
+msgid "pg_stop_backup complete, all required WAL segments have been archived"
+msgstr ""
+"pg_stop_backup kompletny, zarchiwizowano wszystkie wymagane segmenty WAL"
+
+#: access/transam/xlog.c:9358
+msgid ""
+"WAL archiving is not enabled; you must ensure that all required WAL segments "
+"are copied through other means to complete the backup"
+msgstr ""
+"archiwizacja WAL nie jest włączona; musisz upewnić się, że wszystkie "
+"segmenty WAL zostały skopiowane innymi środkami by w całości zakończyć backup"
+
+#: access/transam/xlog.c:9405
+msgid "must be superuser to switch transaction log files"
+msgstr ""
+"musisz być superużytkownikiem by przełączyć pliki dzienników transakcji"
+
+#: access/transam/xlog.c:9437
+msgid "must be superuser to create a restore point"
+msgstr "musisz być superużytkownikiem aby utworzyć punkt przywrócenia"
+
+#: access/transam/xlog.c:9448
+msgid "WAL level not sufficient for creating a restore point"
+msgstr "poziom WAL niewystarczający do utworzenia punktu przywrócenia"
+
+#: access/transam/xlog.c:9456
+#, c-format
+msgid "value too long for restore point (maximum %d characters)"
+msgstr "wartość zbyt długa punktu przywrócenia (maksimum %d znaków)"
+
+#: access/transam/xlog.c:9624
+msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
+msgstr ""
+"pg_xlogfile_name_offset() nie może być uruchomiony podczas trwania "
+"odzyskiwania."
+
+#: access/transam/xlog.c:9634 access/transam/xlog.c:9706
+#, c-format
+msgid "could not parse transaction log location \"%s\""
+msgstr "nie można sparsować położenia dziennika transakcji \"%s\""
+
+#: access/transam/xlog.c:9699
+msgid "pg_xlogfile_name() cannot be executed during recovery."
+msgstr "pg_xlogfile_name() nie może być uruchomiony podczas trwania."
+
+#: access/transam/xlog.c:9810
+#, c-format
+msgid "xlog redo %s"
+msgstr "ponowienie xlog %s"
+
+#: access/transam/xlog.c:9850
+msgid "online backup mode canceled"
+msgstr "tryb wykonania kopii zapasowej online anulowany"
+
+#: access/transam/xlog.c:9851
+#, c-format
+msgid "\"%s\" was renamed to \"%s\"."
+msgstr "\"%s\" został przemianowany na \"%s\"."
+
+#: access/transam/xlog.c:9858
+msgid "online backup mode was not canceled"
+msgstr "tryb wykonania kopii zapasowej online nie został anulowany"
+
+#: access/transam/xlog.c:9859
+#, c-format
+msgid "Could not rename \"%s\" to \"%s\": %m."
+msgstr "Nie można zmienić nazwy \"%s\" na \"%s\": %m."
+
+#: access/transam/xlog.c:10372 access/transam/xlog.c:10394
+#, c-format
+msgid "could not read from log file %u, segment %u, offset %u: %m"
+msgstr "nie można czytać z pliku logów %u, segment %u, offset %u: %m"
+
+#: access/transam/xlog.c:10483
+msgid "received promote request"
+msgstr "otrzymano żądanie rozgłoszenia"
+
+#: access/transam/xlog.c:10496
+#, c-format
+msgid "trigger file found: %s"
+msgstr "odnaleziono plik wyzwalacza: %s"
+
+#: access/heap/heapam.c:1082 access/heap/heapam.c:1110
+#: access/heap/heapam.c:1140 catalog/aclchk.c:1678
+#, c-format
+msgid "\"%s\" is an index"
+msgstr "\"%s\" jest indeksem"
+
+#: access/heap/heapam.c:1087 access/heap/heapam.c:1115
+#: access/heap/heapam.c:1145 catalog/aclchk.c:1685 commands/tablecmds.c:2269
+#: commands/tablecmds.c:7436 commands/tablecmds.c:9018
+#, c-format
+msgid "\"%s\" is a composite type"
+msgstr "\"%s\" jest typem złożonym"
+
+#: access/heap/heapam.c:3216 access/heap/heapam.c:3247
+#: access/heap/heapam.c:3282
+#, c-format
+msgid "could not obtain lock on row in relation \"%s\""
+msgstr "nie można nałożyć blokady na rekord w relacji \"%s\""
+
+#: access/heap/hio.c:175 access/heap/rewriteheap.c:597
+#, c-format
+msgid "row is too big: size %lu, maximum size %lu"
+msgstr "rekord jest zbyt duży: rozmiar %lu, maksymalny rozmiar %lu"
+
+#: access/index/indexam.c:161 catalog/objectaddress.c:391
+#: commands/indexcmds.c:1542 commands/tablecmds.c:220
+#: commands/tablecmds.c:2486
+#, c-format
+msgid "\"%s\" is not an index"
+msgstr "\"%s\" nie jest indeksem"
+
+#: access/nbtree/nbtinsert.c:393
+#, c-format
+msgid "duplicate key value violates unique constraint \"%s\""
+msgstr "podwójna wartość klucza narusza ograniczenie unikalności \"%s\""
+
+#: access/nbtree/nbtinsert.c:395
+#, c-format
+msgid "Key %s already exists."
+msgstr "Klucz %s już istnieje."
+
+#: access/nbtree/nbtinsert.c:457
+#, c-format
+msgid "failed to re-find tuple within index \"%s\""
+msgstr "nie udało się odnaleźć ponownie krotki w ramach indeksu \"%s\""
+
+#: access/nbtree/nbtinsert.c:459
+msgid "This may be because of a non-immutable index expression."
+msgstr "Może to być spowodowane nie niezmienny wyrażeniem indeksu."
+
+#: access/nbtree/nbtinsert.c:535 access/nbtree/nbtsort.c:487
+msgid ""
+"Values larger than 1/3 of a buffer page cannot be indexed.\n"
+"Consider a function index of an MD5 hash of the value, or use full text "
+"indexing."
+msgstr ""
+"Wartości większe niż 1/3 strony bufora nie może być zindeksowane.\n"
+"Rozważ indeks funkcji z haszem MD5 z wartości, lub użyj indeksowania pełnego "
+"indeksowania tekstowego."
+
+#: access/nbtree/nbtpage.c:161 access/nbtree/nbtpage.c:365
+#: parser/parse_utilcmd.c:1527
+#, c-format
+msgid "index \"%s\" is not a btree"
+msgstr "indeks \"%s\" nie jest indeksem btree"
+
+#: access/nbtree/nbtpage.c:167 access/nbtree/nbtpage.c:371
+#, c-format
+msgid "version mismatch in index \"%s\": file version %d, code version %d"
+msgstr "niezgodność wersji w indeksie \"%s\": wersja pliku %d, wersja kodu %d"
+
+#: bootstrap/bootstrap.c:277 tcop/postgres.c:3388 postmaster/postmaster.c:682
+#, c-format
+msgid "--%s requires a value"
+msgstr "--%s wymaga wartości"
+
+#: bootstrap/bootstrap.c:282 tcop/postgres.c:3393 postmaster/postmaster.c:687
+#, c-format
+msgid "-c %s requires a value"
+msgstr "-c %s wymaga wartości"
+
+#: bootstrap/bootstrap.c:293 postmaster/postmaster.c:699
+#: postmaster/postmaster.c:712
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Użyj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: bootstrap/bootstrap.c:302
+#, c-format
+msgid "%s: invalid command-line arguments\n"
+msgstr "%s: nieprawidłowe argumenty wiersza poleceń\n"
+
+#: catalog/aclchk.c:200
+msgid "grant options can only be granted to roles"
+msgstr "opcja przyznawania uprawnień może być przyznana tylko roli"
+
+#: catalog/aclchk.c:316
+#, c-format
+msgid "no privileges were granted for column \"%s\" of relation \"%s\""
+msgstr "nie przyznano żadnych uprawnień do kolumny \"%s\" relacji \"%s\""
+
+#: catalog/aclchk.c:321
+#, c-format
+msgid "no privileges were granted for \"%s\""
+msgstr "nie przyznano żadnych uprawnień do \"%s\""
+
+#: catalog/aclchk.c:329
+#, c-format
+msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
+msgstr "nie przyznano wszystkich uprawnień do kolumny \"%s\" relacji \"%s\""
+
+#: catalog/aclchk.c:334
+#, c-format
+msgid "not all privileges were granted for \"%s\""
+msgstr "nie przyznano wszystkich uprawnień do \"%s\""
+
+#: catalog/aclchk.c:345
+#, c-format
+msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
+msgstr "nie można odwołać żadnych uprawnień do kolumny \"%s\" relacji \"%s\""
+
+#: catalog/aclchk.c:350
+#, c-format
+msgid "no privileges could be revoked for \"%s\""
+msgstr "nie można odwołać żadnych uprawnień do \"%s\""
+
+#: catalog/aclchk.c:358
+#, c-format
+msgid ""
+"not all privileges could be revoked for column \"%s\" of relation \"%s\""
+msgstr ""
+"nie udało się odwołać wszystkich uprawnień do kolumny \"%s\" relacji \"%s\""
+
+#: catalog/aclchk.c:363
+#, c-format
+msgid "not all privileges could be revoked for \"%s\""
+msgstr "nie udało się odwołać wszystkich uprawnień do \"%s\""
+
+#: catalog/aclchk.c:442 catalog/aclchk.c:891
+#, c-format
+msgid "invalid privilege type %s for relation"
+msgstr "nieprawidłowy typ uprawnienia %s dla relacji"
+
+#: catalog/aclchk.c:446 catalog/aclchk.c:895
+#, c-format
+msgid "invalid privilege type %s for sequence"
+msgstr "nieprawidłowy typ uprawnienia %s dla sekwencji"
+
+#: catalog/aclchk.c:450
+#, c-format
+msgid "invalid privilege type %s for database"
+msgstr "nieprawidłowy typ uprawnienia %s dla bazy danych"
+
+#: catalog/aclchk.c:454 catalog/aclchk.c:899
+#, c-format
+msgid "invalid privilege type %s for function"
+msgstr "nieprawidłowy typ uprawnienia %s dla funkcji"
+
+#: catalog/aclchk.c:458
+#, c-format
+msgid "invalid privilege type %s for language"
+msgstr "nieprawidłowy typ uprawnienia %s dla języka"
+
+#: catalog/aclchk.c:462
+#, c-format
+msgid "invalid privilege type %s for large object"
+msgstr "nieprawidłowy typ uprawnienia %s dla dużego obiektu"
+
+#: catalog/aclchk.c:466
+#, c-format
+msgid "invalid privilege type %s for schema"
+msgstr "nieprawidłowy typ uprawnienia %s dla schematu"
+
+#: catalog/aclchk.c:470
+#, c-format
+msgid "invalid privilege type %s for tablespace"
+msgstr "nieprawidłowy typ uprawnienia %s dla przestrzeni tabel"
+
+#: catalog/aclchk.c:474
+#, c-format
+msgid "invalid privilege type %s for foreign-data wrapper"
+msgstr "nieprawidłowy typ uprawnienia %s dla opakowania obcych danych"
+
+#: catalog/aclchk.c:478
+#, c-format
+msgid "invalid privilege type %s for foreign server"
+msgstr "nieprawidłowy typ uprawnienia %s dla serwera obcego"
+
+#: catalog/aclchk.c:517
+msgid "column privileges are only valid for relations"
+msgstr "uprawnienia do kolumn sÄ… poprawne tylko dla relacji"
+
+#: catalog/aclchk.c:647 catalog/aclchk.c:3677 catalog/aclchk.c:4368
+#: catalog/objectaddress.c:199 catalog/pg_largeobject.c:116
+#: catalog/pg_largeobject.c:176 storage/large_object/inv_api.c:277
+#, c-format
+msgid "large object %u does not exist"
+msgstr "duży obiekt %u nie istnieje"
+
+#: catalog/aclchk.c:833 catalog/aclchk.c:841 commands/copy.c:863
+#: commands/copy.c:881 commands/copy.c:889 commands/copy.c:897
+#: commands/copy.c:905 commands/copy.c:913 commands/copy.c:921
+#: commands/copy.c:929 commands/copy.c:945 commands/copy.c:959
+#: commands/dbcommands.c:146 commands/dbcommands.c:154
+#: commands/dbcommands.c:162 commands/dbcommands.c:170
+#: commands/dbcommands.c:178 commands/dbcommands.c:186
+#: commands/dbcommands.c:194 commands/dbcommands.c:1315
+#: commands/dbcommands.c:1323 commands/foreigncmds.c:396
+#: commands/foreigncmds.c:405 commands/functioncmds.c:488
+#: commands/functioncmds.c:578 commands/functioncmds.c:586
+#: commands/functioncmds.c:594 commands/functioncmds.c:1982
+#: commands/functioncmds.c:1990 commands/user.c:133 commands/user.c:150
+#: commands/user.c:158 commands/user.c:166 commands/user.c:174
+#: commands/user.c:182 commands/user.c:190 commands/user.c:198
+#: commands/user.c:206 commands/user.c:214 commands/user.c:222
+#: commands/user.c:230 commands/user.c:501 commands/user.c:513
+#: commands/user.c:521 commands/user.c:529 commands/user.c:537
+#: commands/user.c:545 commands/user.c:553 commands/user.c:561
+#: commands/user.c:570 commands/user.c:578 commands/sequence.c:1135
+#: commands/sequence.c:1143 commands/sequence.c:1151 commands/sequence.c:1159
+#: commands/sequence.c:1167 commands/sequence.c:1175 commands/sequence.c:1183
+#: commands/sequence.c:1191 commands/typecmds.c:282 commands/extension.c:1235
+#: commands/extension.c:1243 commands/extension.c:1251
+#: commands/extension.c:2469 commands/collationcmds.c:93
+msgid "conflicting or redundant options"
+msgstr "sprzeczne lub zbędne opcje"
+
+#: catalog/aclchk.c:932
+msgid "default privileges cannot be set for columns"
+msgstr "uprawnienia domyślne nie mogą być ustawione dla kolumn"
+
+#: catalog/aclchk.c:1428 catalog/objectaddress.c:541 commands/analyze.c:343
+#: commands/copy.c:3774 commands/sequence.c:1419 commands/tablecmds.c:4591
+#: commands/tablecmds.c:4681 commands/tablecmds.c:4728
+#: commands/tablecmds.c:4824 commands/tablecmds.c:4868
+#: commands/tablecmds.c:4947 commands/tablecmds.c:5031
+#: commands/tablecmds.c:6647 commands/tablecmds.c:6856 commands/trigger.c:585
+#: parser/analyze.c:2039 parser/parse_relation.c:2043
+#: parser/parse_relation.c:2100 parser/parse_target.c:895
+#: parser/parse_type.c:117 utils/adt/acl.c:2772 utils/adt/ruleutils.c:1580
+#, c-format
+msgid "column \"%s\" of relation \"%s\" does not exist"
+msgstr "kolumna \"%s\" relacji \"%s\" nie istnieje"
+
+#: catalog/aclchk.c:1693 catalog/objectaddress.c:398 commands/sequence.c:1035
+#: commands/tablecmds.c:208 commands/tablecmds.c:2247
+#: commands/tablecmds.c:2494 commands/tablecmds.c:8968 utils/adt/acl.c:2008
+#: utils/adt/acl.c:2038 utils/adt/acl.c:2070 utils/adt/acl.c:2102
+#: utils/adt/acl.c:2130 utils/adt/acl.c:2160
+#, c-format
+msgid "\"%s\" is not a sequence"
+msgstr "\"%s\" nie jest sekwencjÄ…"
+
+#: catalog/aclchk.c:1731
+#, c-format
+msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
+msgstr "sekwencja \"%s\" pozwala jedynie na uprawnienia USAGE, SELECT i UPDATE"
+
+#: catalog/aclchk.c:1748
+msgid "invalid privilege type USAGE for table"
+msgstr "niepoprawny typ uprawnienia USAGE dla tabeli"
+
+#: catalog/aclchk.c:1913
+#, c-format
+msgid "invalid privilege type %s for column"
+msgstr "nieprawidłowy typ uprawnienia %s dla kolumny"
+
+#: catalog/aclchk.c:1926
+#, c-format
+msgid "sequence \"%s\" only supports SELECT column privileges"
+msgstr "sekwencja \"%s\" pozwala jedynie na uprawnienia kolumnowe SELECT"
+
+#: catalog/aclchk.c:2510
+#, c-format
+msgid "language \"%s\" is not trusted"
+msgstr "język \"%s\" nie jest zaufany"
+
+#: catalog/aclchk.c:2512
+msgid "Only superusers can use untrusted languages."
+msgstr "Jedynie superużytkownik może używać niezaufanych języków."
+
+#: catalog/aclchk.c:3019
+#, c-format
+msgid "unrecognized privilege type \"%s\""
+msgstr "nierozpoznany typ uprawnienia \"%s\""
+
+#: catalog/aclchk.c:3068
+#, c-format
+msgid "permission denied for column %s"
+msgstr "odmowa dostępu do kolumny %s"
+
+#: catalog/aclchk.c:3070
+#, c-format
+msgid "permission denied for relation %s"
+msgstr "odmowa dostępu do relacji %s"
+
+#: catalog/aclchk.c:3072 commands/sequence.c:550 commands/sequence.c:749
+#: commands/sequence.c:791 commands/sequence.c:827 commands/sequence.c:1470
+#, c-format
+msgid "permission denied for sequence %s"
+msgstr "odmowa dostępu do sekwencji %s"
+
+#: catalog/aclchk.c:3074
+#, c-format
+msgid "permission denied for database %s"
+msgstr "odmowa dostępu do bazy danych %s"
+
+#: catalog/aclchk.c:3076
+#, c-format
+msgid "permission denied for function %s"
+msgstr "odmowa dostępu do funkcji %s"
+
+#: catalog/aclchk.c:3078
+#, c-format
+msgid "permission denied for operator %s"
+msgstr "odmowa dostępu do operatora %s"
+
+#: catalog/aclchk.c:3080
+#, c-format
+msgid "permission denied for type %s"
+msgstr "odmowa dostępu do typu %s"
+
+#: catalog/aclchk.c:3082
+#, c-format
+msgid "permission denied for language %s"
+msgstr "odmowa dostępu do języka %s"
+
+#: catalog/aclchk.c:3084
+#, c-format
+msgid "permission denied for large object %s"
+msgstr "odmowa dostępu do dużego obiektu %s"
+
+#: catalog/aclchk.c:3086
+#, c-format
+msgid "permission denied for schema %s"
+msgstr "odmowa dostępu do schematu %s"
+
+#: catalog/aclchk.c:3088
+#, c-format
+msgid "permission denied for operator class %s"
+msgstr "odmowa dostępu do klasy operatora %s"
+
+#: catalog/aclchk.c:3090
+#, c-format
+msgid "permission denied for operator family %s"
+msgstr "odmowa dostępu do rodziny operatora %s"
+
+#: catalog/aclchk.c:3092
+#, c-format
+msgid "permission denied for collation %s"
+msgstr "odmowa dostępu do porównania %s"
+
+#: catalog/aclchk.c:3094
+#, c-format
+msgid "permission denied for conversion %s"
+msgstr "odmowa dostępu do konwersji %s"
+
+#: catalog/aclchk.c:3096
+#, c-format
+msgid "permission denied for tablespace %s"
+msgstr "odmowa dostępu do przestrzeni tabel %s"
+
+#: catalog/aclchk.c:3098
+#, c-format
+msgid "permission denied for text search dictionary %s"
+msgstr "odmowa dostępu do słownika wyszukiwania tekstowego %s"
+
+#: catalog/aclchk.c:3100
+#, c-format
+msgid "permission denied for text search configuration %s"
+msgstr "odmowa dostępu do konfiguracji wyszukiwania tekstowego %s"
+
+#: catalog/aclchk.c:3102
+#, c-format
+msgid "permission denied for foreign-data wrapper %s"
+msgstr "odmowa dostępu do opakowania obcych danych %s"
+
+#: catalog/aclchk.c:3104
+#, c-format
+msgid "permission denied for foreign server %s"
+msgstr "odmowa dostępu do serwera obcego %s"
+
+#: catalog/aclchk.c:3106
+#, c-format
+msgid "permission denied for extension %s"
+msgstr "odmowa dostępu do rozszerzenia %s"
+
+#: catalog/aclchk.c:3112 catalog/aclchk.c:3114
+#, c-format
+msgid "must be owner of relation %s"
+msgstr "musi być właścicielem relacji %s"
+
+#: catalog/aclchk.c:3116
+#, c-format
+msgid "must be owner of sequence %s"
+msgstr "musi być właścicielem sekwencji %s"
+
+#: catalog/aclchk.c:3118
+#, c-format
+msgid "must be owner of database %s"
+msgstr "musi być właścicielem bazy %s"
+
+#: catalog/aclchk.c:3120
+#, c-format
+msgid "must be owner of function %s"
+msgstr "musi być właścicielem funkcji %s"
+
+#: catalog/aclchk.c:3122
+#, c-format
+msgid "must be owner of operator %s"
+msgstr "musi być właścicielem operatora %s"
+
+#: catalog/aclchk.c:3124
+#, c-format
+msgid "must be owner of type %s"
+msgstr "musi być właścicielem typu %s"
+
+#: catalog/aclchk.c:3126
+#, c-format
+msgid "must be owner of language %s"
+msgstr "musi być właścicielem języka %s"
+
+#: catalog/aclchk.c:3128
+#, c-format
+msgid "must be owner of large object %s"
+msgstr "musi być właścicielem dużego obiektu %s"
+
+#: catalog/aclchk.c:3130
+#, c-format
+msgid "must be owner of schema %s"
+msgstr "musi być właścicielem schematu %s"
+
+#: catalog/aclchk.c:3132
+#, c-format
+msgid "must be owner of operator class %s"
+msgstr "musi być właścicielem klasy operatora %s"
+
+#: catalog/aclchk.c:3134
+#, c-format
+msgid "must be owner of operator family %s"
+msgstr "musi być właścicielem rodziny operatora %s"
+
+#: catalog/aclchk.c:3136
+#, c-format
+msgid "must be owner of collation %s"
+msgstr "musi być właścicielem porównania %s"
+
+#: catalog/aclchk.c:3138
+#, c-format
+msgid "must be owner of conversion %s"
+msgstr "musi być właścicielem konwersji %s"
+
+#: catalog/aclchk.c:3140
+#, c-format
+msgid "must be owner of tablespace %s"
+msgstr "musi być właścicielem przestrzeni tabel %s"
+
+#: catalog/aclchk.c:3142
+#, c-format
+msgid "must be owner of text search dictionary %s"
+msgstr "musi być właścicielem słownika wyszukiwania tekstowego %s"
+
+#: catalog/aclchk.c:3144
+#, c-format
+msgid "must be owner of text search configuration %s"
+msgstr "musi być właścicielem konfiguracji wyszukiwania tekstowego %s"
+
+#: catalog/aclchk.c:3146
+#, c-format
+msgid "must be owner of foreign-data wrapper %s"
+msgstr "musi być właścicielem opakowania obcych danych %s"
+
+#: catalog/aclchk.c:3148
+#, c-format
+msgid "must be owner of foreign server %s"
+msgstr "musi być właścicielem serwera obcego %s"
+
+#: catalog/aclchk.c:3150
+#, c-format
+msgid "must be owner of extension %s"
+msgstr "musi być właścicielem rozszerzenia %s"
+
+#: catalog/aclchk.c:3192
+#, c-format
+msgid "permission denied for column \"%s\" of relation \"%s\""
+msgstr "odmowa dostępu do kolumny \"%s\" relacji \"%s\""
+
+#: catalog/aclchk.c:3219
+#, c-format
+msgid "role with OID %u does not exist"
+msgstr "rola z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3312 catalog/aclchk.c:3320
+#, c-format
+msgid "attribute %d of relation with OID %u does not exist"
+msgstr "atrybut %d relacji o OID %u nie istnieje"
+
+#: catalog/aclchk.c:3393 catalog/aclchk.c:4219
+#, c-format
+msgid "relation with OID %u does not exist"
+msgstr "relacja z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3493 catalog/aclchk.c:4610 utils/adt/dbsize.c:127
+#, c-format
+msgid "database with OID %u does not exist"
+msgstr "baza z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3547 catalog/aclchk.c:4297 tcop/fastpath.c:221
+#, c-format
+msgid "function with OID %u does not exist"
+msgstr "funkcja z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3601 catalog/aclchk.c:4323
+#, c-format
+msgid "language with OID %u does not exist"
+msgstr "język z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3762 catalog/aclchk.c:4395
+#, c-format
+msgid "schema with OID %u does not exist"
+msgstr "schemat z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3816 catalog/aclchk.c:4422
+#, c-format
+msgid "tablespace with OID %u does not exist"
+msgstr "przestrzeń tabel z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3874 catalog/aclchk.c:4556
+#, c-format
+msgid "foreign-data wrapper with OID %u does not exist"
+msgstr "opakowanie obcych danych z OID %u nie istnieje"
+
+#: catalog/aclchk.c:3935 catalog/aclchk.c:4583
+#, c-format
+msgid "foreign server with OID %u does not exist"
+msgstr "serwer obcy z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4245
+#, c-format
+msgid "type with OID %u does not exist"
+msgstr "typ z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4271
+#, c-format
+msgid "operator with OID %u does not exist"
+msgstr "operator z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4448
+#, c-format
+msgid "operator class with OID %u does not exist"
+msgstr "klasa operatora z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4475
+#, c-format
+msgid "operator family with OID %u does not exist"
+msgstr "rodzina operatora z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4502
+#, c-format
+msgid "text search dictionary with OID %u does not exist"
+msgstr "słownik wyszukiwania tekstowego z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4529
+#, c-format
+msgid "text search configuration with OID %u does not exist"
+msgstr "konfiguracja wyszukiwania tekstowego z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4636
+#, c-format
+msgid "collation with OID %u does not exist"
+msgstr "porównanie z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4662
+#, c-format
+msgid "conversion with OID %u does not exist"
+msgstr "konwersja z OID %u nie istnieje"
+
+#: catalog/aclchk.c:4703
+#, c-format
+msgid "extension with OID %u does not exist"
+msgstr "rozszerzenie z OID %u nie istnieje"
+
+#: catalog/catalog.c:76
+msgid "invalid fork name"
+msgstr "nieprawidłowa nazwa rozwidlenia"
+
+#: catalog/catalog.c:77
+msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
+msgstr "Prawidłowymi wartościami rozwidlenia są \"main\", \"fsm\", i \"vm\"."
+
+#: catalog/dependency.c:574
+#, c-format
+msgid "cannot drop %s because %s requires it"
+msgstr "nie można skasować %s ponieważ jest wymagany przez %s"
+
+#: catalog/dependency.c:577
+#, c-format
+msgid "You can drop %s instead."
+msgstr "W zamian możesz usunąć %s."
+
+#: catalog/dependency.c:738 catalog/pg_shdepend.c:562
+#, c-format
+msgid "cannot drop %s because it is required by the database system"
+msgstr "nie można skasować %s ponieważ jest wymagany przez system bazy danych"
+
+#: catalog/dependency.c:854
+#, c-format
+msgid "drop auto-cascades to %s"
+msgstr "kasowanie z automatycznym kaskadowaniem do %s"
+
+#: catalog/dependency.c:866 catalog/dependency.c:875
+#, c-format
+msgid "%s depends on %s"
+msgstr "%s zależy od %s"
+
+#: catalog/dependency.c:887 catalog/dependency.c:896
+#, c-format
+msgid "drop cascades to %s"
+msgstr "kasowanie kaskadowe do %s"
+
+#: catalog/dependency.c:904 catalog/pg_shdepend.c:673
+#, c-format
+msgid ""
+"\n"
+"and %d other object (see server log for list)"
+msgid_plural ""
+"\n"
+"and %d other objects (see server log for list)"
+msgstr[0] ""
+"\n"
+"oraz %d inny obiekt (by obejrzeć listę sprawdź dziennik serwera)"
+msgstr[1] ""
+"\n"
+"oraz %d inne obiekty (by obejrzeć listę sprawdź dziennik serwera)"
+msgstr[2] ""
+"\n"
+"oraz %d innych obiektów (by obejrzeć listę sprawdź dziennik serwera)"
+
+#: catalog/dependency.c:916
+#, c-format
+msgid "cannot drop %s because other objects depend on it"
+msgstr "nie można usunąć %s ponieważ inne obiekty zależą od niego"
+
+#: catalog/dependency.c:918 catalog/dependency.c:919 catalog/dependency.c:925
+#: catalog/dependency.c:926 catalog/dependency.c:937 catalog/dependency.c:938
+#: catalog/objectaddress.c:315 commands/user.c:957 commands/tablecmds.c:689
+#: storage/lmgr/deadlock.c:943 port/win32/security.c:51 utils/misc/guc.c:5399
+#: utils/misc/guc.c:5713 utils/misc/guc.c:8014 utils/misc/guc.c:8048
+#: utils/misc/guc.c:8082 utils/misc/guc.c:8116 utils/misc/guc.c:8151
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: catalog/dependency.c:920 catalog/dependency.c:927
+msgid "Use DROP ... CASCADE to drop the dependent objects too."
+msgstr "Użyj DROP ... CASCADE aby usunąć wraz z obiektami zależnymi."
+
+#: catalog/dependency.c:924
+msgid "cannot drop desired object(s) because other objects depend on them"
+msgstr ""
+"nie można skasować żądanych obiektów ponieważ inne obiekty zależą od nich"
+
+#. translator: %d always has a value larger than 1
+#: catalog/dependency.c:933
+#, c-format
+msgid "drop cascades to %d other object"
+msgid_plural "drop cascades to %d other objects"
+msgstr[0] "kasuje kaskadowo %d inny obiekt"
+msgstr[1] "kasuje kaskadowo %d inne obiekty"
+msgstr[2] "kasuje kaskadowo %d innych obiektów"
+
+#: catalog/dependency.c:2204
+#, c-format
+msgid " column %s"
+msgstr " kolumna %s"
+
+#: catalog/dependency.c:2210
+#, c-format
+msgid "function %s"
+msgstr "funkcja %s"
+
+#: catalog/dependency.c:2215
+#, c-format
+msgid "type %s"
+msgstr "typ %s"
+
+#: catalog/dependency.c:2245
+#, c-format
+msgid "cast from %s to %s"
+msgstr "rzutowanie z %s na %s"
+
+#: catalog/dependency.c:2265
+#, c-format
+msgid "collation %s"
+msgstr "porównanie %s"
+
+#: catalog/dependency.c:2289
+#, c-format
+msgid "constraint %s on %s"
+msgstr "ograniczenie %s na %s"
+
+#: catalog/dependency.c:2295
+#, c-format
+msgid "constraint %s"
+msgstr "ograniczenie %s"
+
+#: catalog/dependency.c:2312
+#, c-format
+msgid "conversion %s"
+msgstr "konwersja %s"
+
+#: catalog/dependency.c:2349
+#, c-format
+msgid "default for %s"
+msgstr "domyślne dla %s"
+
+#: catalog/dependency.c:2366
+#, c-format
+msgid "language %s"
+msgstr "język %s"
+
+#: catalog/dependency.c:2372
+#, c-format
+msgid "large object %u"
+msgstr "duży obiekt %u nie istnieje"
+
+#: catalog/dependency.c:2377
+#, c-format
+msgid "operator %s"
+msgstr "operator %s"
+
+#: catalog/dependency.c:2409
+#, c-format
+msgid "operator class %s for access method %s"
+msgstr "klasa operatora %s dla metody dostępu %s"
+
+#. translator: %d is the operator strategy (a number), the
+#. first two %s's are data type names, the third %s is the
+#. description of the operator family, and the last %s is the
+#. textual form of the operator with arguments.
+#: catalog/dependency.c:2459
+#, c-format
+msgid "operator %d (%s, %s) of %s: %s"
+msgstr "operator %d (%s, %s) dla %s: %s"
+
+#. translator: %d is the function number, the first two %s's
+#. are data type names, the third %s is the description of the
+#. operator family, and the last %s is the textual form of the
+#. function with arguments.
+#: catalog/dependency.c:2509
+#, c-format
+msgid "function %d (%s, %s) of %s: %s"
+msgstr "funkcja %d (%s, %s) dla %s: %s"
+
+#: catalog/dependency.c:2549
+#, c-format
+msgid "rule %s on "
+msgstr "reguła %s na "
+
+#: catalog/dependency.c:2584
+#, c-format
+msgid "trigger %s on "
+msgstr "wyzwalacz %s na "
+
+#: catalog/dependency.c:2601
+#, c-format
+msgid "schema %s"
+msgstr "schemat %s"
+
+#: catalog/dependency.c:2614
+#, c-format
+msgid "text search parser %s"
+msgstr "parser wyszukiwania tekstowego %s"
+
+#: catalog/dependency.c:2629
+#, c-format
+msgid "text search dictionary %s"
+msgstr "słownik wyszukiwania tekstowego %s"
+
+#: catalog/dependency.c:2644
+#, c-format
+msgid "text search template %s"
+msgstr "szablon wyszukiwania tekstowego %s"
+
+#: catalog/dependency.c:2659
+#, c-format
+msgid "text search configuration %s"
+msgstr "konfiguracja wyszukiwania tekstowego %s"
+
+#: catalog/dependency.c:2667
+#, c-format
+msgid "role %s"
+msgstr "rola %s"
+
+#: catalog/dependency.c:2680
+#, c-format
+msgid "database %s"
+msgstr "baza danych %s"
+
+#: catalog/dependency.c:2692
+#, c-format
+msgid "tablespace %s"
+msgstr "przestrzeń tabel %s"
+
+#: catalog/dependency.c:2701
+#, c-format
+msgid "foreign-data wrapper %s"
+msgstr "opakowanie obcych danych %s"
+
+#: catalog/dependency.c:2710
+#, c-format
+msgid "server %s"
+msgstr "serwer %s"
+
+#: catalog/dependency.c:2735
+#, c-format
+msgid "user mapping for %s"
+msgstr "mapowanie użytkownika dla %s"
+
+#: catalog/dependency.c:2769
+#, c-format
+msgid "default privileges on new relations belonging to role %s"
+msgstr "uprawnienia domyślne do nowych relacji należących do roli %s"
+
+#: catalog/dependency.c:2774
+#, c-format
+msgid "default privileges on new sequences belonging to role %s"
+msgstr "uprawnienia domyślne do nowych sekwencji należących do roli %s"
+
+#: catalog/dependency.c:2779
+#, c-format
+msgid "default privileges on new functions belonging to role %s"
+msgstr "uprawnienia domyślne do nowych funkcji należących do roli %s"
+
+#: catalog/dependency.c:2785
+#, c-format
+msgid "default privileges belonging to role %s"
+msgstr "uprawnienia domyślne należące do roli %s"
+
+#: catalog/dependency.c:2793
+#, c-format
+msgid " in schema %s"
+msgstr " w schemacie %s"
+
+#: catalog/dependency.c:2810
+#, c-format
+msgid "extension %s"
+msgstr "rozszerzenie %s"
+
+#: catalog/dependency.c:2868
+#, c-format
+msgid "table %s"
+msgstr "tabela %s"
+
+#: catalog/dependency.c:2872
+#, c-format
+msgid "index %s"
+msgstr "indeks %s"
+
+#: catalog/dependency.c:2876
+#, c-format
+msgid "sequence %s"
+msgstr "sekwencja %s"
+
+#: catalog/dependency.c:2880
+#, c-format
+msgid "uncataloged table %s"
+msgstr "nieskatalogowana tabela %s"
+
+#: catalog/dependency.c:2884
+#, c-format
+msgid "toast table %s"
+msgstr "tabela toast %s"
+
+#: catalog/dependency.c:2888
+#, c-format
+msgid "view %s"
+msgstr "widok %s"
+
+#: catalog/dependency.c:2892
+#, c-format
+msgid "composite type %s"
+msgstr "typ złożony %s"
+
+#: catalog/dependency.c:2896
+#, c-format
+msgid "foreign table %s"
+msgstr "tabela obca %s"
+
+#: catalog/dependency.c:2901
+#, c-format
+msgid "relation %s"
+msgstr "relacja %s"
+
+#: catalog/dependency.c:2938
+#, c-format
+msgid "operator family %s for access method %s"
+msgstr "rodzina operatorów %s dla metody dostępu %s"
+
+#: catalog/heap.c:264
+#, c-format
+msgid "permission denied to create \"%s.%s\""
+msgstr "odmowa dostępu do tworzenia \"%s.%s\""
+
+#: catalog/heap.c:266
+msgid "System catalog modifications are currently disallowed."
+msgstr "Modyfikacje katalogu systemowego sÄ… aktualnie zabronione."
+
+#: catalog/heap.c:389 commands/tablecmds.c:1268 commands/tablecmds.c:1685
+#: commands/tablecmds.c:4276
+#, c-format
+msgid "tables can have at most %d columns"
+msgstr "tabele mogą posiadać maksymalnie do %d kolumn"
+
+#: catalog/heap.c:406
+#, c-format
+msgid "column name \"%s\" conflicts with a system column name"
+msgstr "nazwa kolumny \"%s\" powoduje konflikt z nazwÄ… kolumny systemowej"
+
+#: catalog/heap.c:422
+#, c-format
+msgid "column name \"%s\" specified more than once"
+msgstr "nazwa kolumny \"%s\" określona więcej niż raz"
+
+#: catalog/heap.c:472
+#, c-format
+msgid "column \"%s\" has type \"unknown\""
+msgstr "kolumna \"%s\" jest typu \"unknown\""
+
+#: catalog/heap.c:473
+msgid "Proceeding with relation creation anyway."
+msgstr "Kontynuacja utworzenia relacji mimo wszystko."
+
+#: catalog/heap.c:486
+#, c-format
+msgid "column \"%s\" has pseudo-type %s"
+msgstr "kolumna \"%s\" jest pseudotypu %s"
+
+#: catalog/heap.c:516
+#, c-format
+msgid "composite type %s cannot be made a member of itself"
+msgstr "złożony typ %s nie może być składnikiem samego siebie"
+
+#: catalog/heap.c:558
+#, c-format
+msgid "no collation was derived for column \"%s\" with collatable type %s"
+msgstr "nie określono porównania dla kolumny \"%s\" o typie porównywalnym %s"
+
+#: catalog/heap.c:560 commands/indexcmds.c:931 commands/view.c:145
+#: regex/regc_pg_locale.c:259 utils/adt/formatting.c:1520
+#: utils/adt/formatting.c:1570 utils/adt/formatting.c:1641
+#: utils/adt/formatting.c:1691 utils/adt/formatting.c:1774
+#: utils/adt/formatting.c:1836 utils/adt/like.c:212 utils/adt/selfuncs.c:4912
+#: utils/adt/selfuncs.c:5029 utils/adt/varlena.c:1315
+msgid "Use the COLLATE clause to set the collation explicitly."
+msgstr "Użyj klauzuli COLLATE by ustawić jawnie porównanie."
+
+#: catalog/heap.c:1011 catalog/index.c:769 commands/tablecmds.c:2318
+#, c-format
+msgid "relation \"%s\" already exists"
+msgstr "relacja \"%s\" już istnieje"
+
+#: catalog/heap.c:1027 catalog/pg_type.c:396 catalog/pg_type.c:695
+#: commands/typecmds.c:224 commands/typecmds.c:806 commands/typecmds.c:1145
+#: commands/typecmds.c:1622
+#, c-format
+msgid "type \"%s\" already exists"
+msgstr "typ \"%s\" już istnieje"
+
+#: catalog/heap.c:1028
+msgid ""
+"A relation has an associated type of the same name, so you must use a name "
+"that doesn't conflict with any existing type."
+msgstr ""
+"Relacja posiada powiązany typ o tej samej nazwie, musisz zatem użyć nazwy, "
+"która nie rodzi konfliktów z istniejącym typem."
+
+#: catalog/heap.c:2141
+#, c-format
+msgid "check constraint \"%s\" already exists"
+msgstr "ograniczenie kontrolne \"%s\" już istnieje"
+
+#: catalog/heap.c:2287 catalog/pg_constraint.c:645 commands/tablecmds.c:5350
+#, c-format
+msgid "constraint \"%s\" for relation \"%s\" already exists"
+msgstr "ograniczenie \"%s\" dla relacji \"%s\" już istnieje"
+
+#: catalog/heap.c:2291
+#, c-format
+msgid "merging constraint \"%s\" with inherited definition"
+msgstr "połączenie ograniczenia \"%s\" z dziedziczoną definicją"
+
+#: catalog/heap.c:2389
+msgid "cannot use column references in default expression"
+msgstr "nie można użyć referencji kolumn w domyślnym wyrażeniu"
+
+#: catalog/heap.c:2397
+msgid "default expression must not return a set"
+msgstr "domyślne wyrażenie nie może zwracać zbioru"
+
+#: catalog/heap.c:2405
+msgid "cannot use subquery in default expression"
+msgstr "nie można użyć podzapytania w domyślnym wyrażeniu"
+
+#: catalog/heap.c:2409
+msgid "cannot use aggregate function in default expression"
+msgstr "nie można użyć funkcji agregującej w domyślnym wyrażeniu"
+
+#: catalog/heap.c:2413
+msgid "cannot use window function in default expression"
+msgstr "nie można użyć funkcji okna w domyślnym wyrażeniu"
+
+#: catalog/heap.c:2432 rewrite/rewriteHandler.c:1030
+#, c-format
+msgid "column \"%s\" is of type %s but default expression is of type %s"
+msgstr "kolumna \"%s\" jest typu %s ale domyślne wyrażenie jest typu %s"
+
+#: catalog/heap.c:2437 commands/prepare.c:370 parser/parse_node.c:397
+#: parser/parse_target.c:489 parser/parse_target.c:735
+#: parser/parse_target.c:745 rewrite/rewriteHandler.c:1035
+msgid "You will need to rewrite or cast the expression."
+msgstr "Będziesz musiał przepisać lub rzutować wyrażenie."
+
+#: catalog/heap.c:2483
+#, c-format
+msgid "only table \"%s\" can be referenced in check constraint"
+msgstr "tylko tabela \"%s\" może być wskazana w ograniczeniu kontrolnym"
+
+#: catalog/heap.c:2492 commands/typecmds.c:2386
+msgid "cannot use subquery in check constraint"
+msgstr "nie można używać podzapytań w ograniczeniu kontrolnym"
+
+#: catalog/heap.c:2496 commands/typecmds.c:2390
+msgid "cannot use aggregate function in check constraint"
+msgstr "nie można używać funkcji agregującej w ograniczeniu kontrolnym"
+
+#: catalog/heap.c:2500 commands/typecmds.c:2394
+msgid "cannot use window function in check constraint"
+msgstr "nie można używać funkcji okna w ograniczeniu kontrolnym"
+
+#: catalog/heap.c:2739
+msgid "unsupported ON COMMIT and foreign key combination"
+msgstr "nieobsługiwana kombinacja ON COMMIT i klucza obcego"
+
+#: catalog/heap.c:2740
+#, c-format
+msgid ""
+"Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
+"setting."
+msgstr ""
+"Tabela \"%s\" wskazuje na \"%s\", ale nie majÄ… tego samego ustawienia ON "
+"COMMIT."
+
+#: catalog/heap.c:2745
+msgid "cannot truncate a table referenced in a foreign key constraint"
+msgstr "nie można obciąć tabeli wskazywanej w ograniczeniu klucza obcego"
+
+#: catalog/heap.c:2746
+#, c-format
+msgid "Table \"%s\" references \"%s\"."
+msgstr "Tabela \"%s\" wskazuje na \"%s\"."
+
+#: catalog/heap.c:2748
+#, c-format
+msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
+msgstr "Obetnij jednocześnie tabelę \"%s\", albo użyj TRUNCATE ... CASCADE."
+
+#: catalog/index.c:202 parser/parse_utilcmd.c:1296 parser/parse_utilcmd.c:1382
+#, c-format
+msgid "multiple primary keys for table \"%s\" are not allowed"
+msgstr "wielokrotne klucze główne dla tabeli \"%s\" nie są dopuszczalne"
+
+#: catalog/index.c:220
+msgid "primary keys cannot be expressions"
+msgstr "klucze główne nie mogą być wyrażeniami"
+
+#: catalog/index.c:730 catalog/index.c:1124
+msgid "user-defined indexes on system catalog tables are not supported"
+msgstr ""
+"indeksy utworzone przez użytkownika na tabelach katalogu systemowego nie są "
+"obsługiwane"
+
+#: catalog/index.c:740
+msgid "concurrent index creation on system catalog tables is not supported"
+msgstr ""
+"równoczesne tworzenie indeksów na tabelach katalogu systemowego nie jest "
+"obsługiwane"
+
+#: catalog/index.c:758
+msgid "shared indexes cannot be created after initdb"
+msgstr "indeksy współdzielone nie mogą być tworzone po initdb"
+
+#: catalog/index.c:1727
+#, c-format
+msgid "building index \"%s\" on table \"%s\""
+msgstr "tworzenie indeksu \"%s\" na tabeli \"%s\""
+
+#: catalog/index.c:2800
+msgid "cannot reindex temporary tables of other sessions"
+msgstr "nie można przeindeksować tabel tymczasowych z innych sesji"
+
+#: catalog/namespace.c:234 catalog/namespace.c:318 commands/trigger.c:4147
+#, c-format
+msgid "cross-database references are not implemented: \"%s.%s.%s\""
+msgstr "międzybazodanowe referencje nie są zaimplementowane: \"%s.%s.%s\""
+
+#: catalog/namespace.c:260
+msgid "temporary tables cannot specify a schema name"
+msgstr "tymczasowe tabele nie mogą wskazywać nazwy schematu"
+
+#: catalog/namespace.c:285 commands/lockcmds.c:122 parser/parse_relation.c:835
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "relacja \"%s.%s\" nie istnieje"
+
+#: catalog/namespace.c:290 commands/lockcmds.c:127 parser/parse_relation.c:848
+#: parser/parse_relation.c:856 utils/adt/regproc.c:810
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "relacja \"%s\" nie istnieje"
+
+#: catalog/namespace.c:358 catalog/namespace.c:2589
+msgid "no schema has been selected to create in"
+msgstr "nie wskazano schematu utworzenia obiektu"
+
+#: catalog/namespace.c:410 catalog/namespace.c:423
+msgid "cannot create relations in temporary schemas of other sessions"
+msgstr "nie można utworzyć relacji w schematach tymczasowych z innych sesji"
+
+#: catalog/namespace.c:414
+msgid "cannot create temporary relation in non-temporary schema"
+msgstr "nie można tworzyć obiektów tymczasowych w schematach nietymczasowych"
+
+#: catalog/namespace.c:429
+msgid "only temporary relations may be created in temporary schemas"
+msgstr "tylko relacje tymczasowe mogą być utworzone w schematach tymczasowych"
+
+#: catalog/namespace.c:1906 commands/tsearchcmds.c:320
+#, c-format
+msgid "text search parser \"%s\" does not exist"
+msgstr "parser wyszukiwania tekstowego \"%s\" nie istnieje"
+
+#: catalog/namespace.c:2029 commands/tsearchcmds.c:769
+#, c-format
+msgid "text search dictionary \"%s\" does not exist"
+msgstr "słownik wyszukiwania tekstowego \"%s\" nie istnieje"
+
+#: catalog/namespace.c:2153 commands/tsearchcmds.c:1304
+#, c-format
+msgid "text search template \"%s\" does not exist"
+msgstr "szablon wyszukiwania tekstowego \"%s\" nie istnieje"
+
+#: catalog/namespace.c:2276 commands/tsearchcmds.c:1753
+#: commands/tsearchcmds.c:1909
+#, c-format
+msgid "text search configuration \"%s\" does not exist"
+msgstr "konfiguracja wyszukiwania tekstowego \"%s\" nie istnieje"
+
+#: catalog/namespace.c:2389 parser/parse_expr.c:775 parser/parse_target.c:1085
+#, c-format
+msgid "cross-database references are not implemented: %s"
+msgstr "międzybazodanowe referencje nie są zaimplementowane: %s"
+
+#: catalog/namespace.c:2395 parser/parse_expr.c:782 parser/parse_target.c:1092
+#: gram.y:11611 gram.y:12810
+#, c-format
+msgid "improper qualified name (too many dotted names): %s"
+msgstr "niewłaściwa nazwa kwalifikowana (zbyt dużo nazw kropkowanych): %s"
+
+#: catalog/namespace.c:2523
+#, c-format
+msgid "%s is already in schema \"%s\""
+msgstr "%s jest już w schemacie \"%s\""
+
+#: catalog/namespace.c:2531
+msgid "cannot move objects into or out of temporary schemas"
+msgstr "nie można przenosić obiektów do lub poza schematy tymczasowe"
+
+#: catalog/namespace.c:2537
+msgid "cannot move objects into or out of TOAST schema"
+msgstr "nie można przenosić obiektów do lub poza schemat TOAST"
+
+#: catalog/namespace.c:2610 catalog/namespace.c:3595 catalog/namespace.c:3598
+#: commands/schemacmds.c:253 commands/schemacmds.c:322
+#, c-format
+msgid "schema \"%s\" does not exist"
+msgstr "schemat \"%s\" nie istnieje"
+
+#: catalog/namespace.c:2641
+#, c-format
+msgid "improper relation name (too many dotted names): %s"
+msgstr "niewłaściwa nazwa relacji (zbyt dużo nazw kropkowanych): %s"
+
+#: catalog/namespace.c:3040
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" does not exist"
+msgstr "porównanie \"%s\" dla kodowania \"%s\" nie istnieje"
+
+#: catalog/namespace.c:3092
+#, c-format
+msgid "conversion \"%s\" does not exist"
+msgstr "konwersja \"%s\" nie istnieje"
+
+#: catalog/namespace.c:3297
+#, c-format
+msgid "permission denied to create temporary tables in database \"%s\""
+msgstr "zabronione tworzenie tabel tymczasowych w bazie danych \"%s\""
+
+#: catalog/namespace.c:3313
+msgid "cannot create temporary tables during recovery"
+msgstr "nie można utworzyć tabel tymczasowych w czasie trwania odzyskiwania"
+
+#: catalog/namespace.c:3557 commands/tablespace.c:1121 commands/variable.c:59
+#: replication/syncrep.c:656 utils/misc/guc.c:8181
+msgid "List syntax is invalid."
+msgstr "Składnia listy jest niepoprawna."
+
+#: catalog/objectaddress.c:286
+msgid "database name cannot be qualified"
+msgstr "nazwa bazy danych nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:289 commands/extension.c:1581
+#: commands/extension.c:2241
+msgid "extension name cannot be qualified"
+msgstr "nazwa rozszerzenia nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:292
+msgid "tablespace name cannot be qualified"
+msgstr "nazwa przestrzeni tabel nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:295
+msgid "role name cannot be qualified"
+msgstr "nazwa roli nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:298 commands/schemacmds.c:178
+msgid "schema name cannot be qualified"
+msgstr "nazwa schematu nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:301
+msgid "language name cannot be qualified"
+msgstr "nazwa języka nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:304
+msgid "foreign-data wrapper name cannot be qualified"
+msgstr "opakowanie obcych danych nie może być kwalifikowane"
+
+#: catalog/objectaddress.c:307
+msgid "server name cannot be qualified"
+msgstr "nazwa serwera nie może być kwalifikowana"
+
+#: catalog/objectaddress.c:405 catalog/toasting.c:91 commands/indexcmds.c:200
+#: commands/indexcmds.c:1574 commands/lockcmds.c:149 commands/tablecmds.c:202
+#: commands/tablecmds.c:1129 commands/tablecmds.c:2478
+#: commands/tablecmds.c:3825 commands/tablecmds.c:6759
+#, c-format
+msgid "\"%s\" is not a table"
+msgstr "\"%s\" nie jest tabelÄ…"
+
+#: catalog/objectaddress.c:412 commands/tablecmds.c:214
+#: commands/tablecmds.c:2253 commands/tablecmds.c:2510
+#: commands/tablecmds.c:3840 commands/tablecmds.c:8976 commands/view.c:181
+#, c-format
+msgid "\"%s\" is not a view"
+msgstr "\"%s\" nie jest widokiem"
+
+#: catalog/objectaddress.c:419 commands/tablecmds.c:232
+#: commands/tablecmds.c:2259 commands/tablecmds.c:2518
+#: commands/tablecmds.c:3843 commands/tablecmds.c:8984
+#, c-format
+msgid "\"%s\" is not a foreign table"
+msgstr "\"%s\" nie jest tabelÄ… obcÄ…"
+
+#: catalog/objectaddress.c:824 catalog/pg_largeobject.c:200
+#: libpq/be-fsstubs.c:287
+#, c-format
+msgid "must be owner of large object %u"
+msgstr "musi być właścicielem dużego obiektu %u"
+
+#: catalog/objectaddress.c:839 commands/functioncmds.c:1526
+#: commands/functioncmds.c:1814
+#, c-format
+msgid "must be owner of type %s or type %s"
+msgstr "musi być właścicielem typu %s lub typu %s"
+
+#: catalog/objectaddress.c:870 catalog/objectaddress.c:886
+msgid "must be superuser"
+msgstr "musi być superużytkownikiem"
+
+#: catalog/objectaddress.c:877
+msgid "must have CREATEROLE privilege"
+msgstr "musi mieć uprawnienie CREATEROLE"
+
+#: catalog/pg_aggregate.c:100
+msgid "cannot determine transition data type"
+msgstr "nie można określić przejściowego typu danych"
+
+#: catalog/pg_aggregate.c:101
+msgid ""
+"An aggregate using a polymorphic transition type must have at least one "
+"polymorphic argument."
+msgstr ""
+"Agregat używający polimorficznego typu przejściowego musi mieć co najmniej "
+"jeden argument polimorficzny."
+
+#: catalog/pg_aggregate.c:124
+#, c-format
+msgid "return type of transition function %s is not %s"
+msgstr "zwracany typ funkcji przejściowej %s nie jest %s"
+
+#: catalog/pg_aggregate.c:144
+msgid ""
+"must not omit initial value when transition function is strict and "
+"transition type is not compatible with input type"
+msgstr ""
+"nie wolno pominąć wartości początkowej, gdy funkcja przejścia jest ścisła a "
+"typ transformacji nie jest zgodny z typem wejścia"
+
+#: catalog/pg_aggregate.c:175 catalog/pg_proc.c:205
+msgid "cannot determine result data type"
+msgstr "nie można określić typu wyniku"
+
+#: catalog/pg_aggregate.c:176
+msgid ""
+"An aggregate returning a polymorphic type must have at least one polymorphic "
+"argument."
+msgstr ""
+"Agregat zwracający typ polimorficzny musi mieć co najmniej jeden argument "
+"polimorficzny."
+
+#: catalog/pg_aggregate.c:188 catalog/pg_proc.c:211
+msgid "unsafe use of pseudo-type \"internal\""
+msgstr "niebezpieczne użycie pseudo-typu \"internal\""
+
+#: catalog/pg_aggregate.c:189 catalog/pg_proc.c:212
+msgid ""
+"A function returning \"internal\" must have at least one \"internal\" "
+"argument."
+msgstr ""
+"Funkcja zwracająca \"internal\" musi mieć co najmniej jeden argument "
+"\"internal\"."
+
+#: catalog/pg_aggregate.c:197
+msgid "sort operator can only be specified for single-argument aggregates"
+msgstr ""
+"operator sortowania może być określony tylko dla agregatów "
+"jednoargumentowych agregatów"
+
+#: catalog/pg_aggregate.c:331 commands/typecmds.c:1350
+#: commands/typecmds.c:1401 commands/typecmds.c:1432 commands/typecmds.c:1455
+#: commands/typecmds.c:1476 commands/typecmds.c:1503 commands/typecmds.c:1530
+#: parser/parse_func.c:288 parser/parse_func.c:299 parser/parse_func.c:1481
+#, c-format
+msgid "function %s does not exist"
+msgstr "funkcja %s nie istnieje"
+
+#: catalog/pg_aggregate.c:337
+#, c-format
+msgid "function %s returns a set"
+msgstr "funkcja %s zwraca zbiór"
+
+#: catalog/pg_aggregate.c:362
+#, fuzzy, c-format
+msgid "function %s requires run-time type coercion"
+msgstr "funkcja %s wymaga zgodności typu czasu wykonania"
+
+#: catalog/pg_constraint.c:654 commands/typecmds.c:2321
+#, c-format
+msgid "constraint \"%s\" for domain \"%s\" already exists"
+msgstr "ograniczenie \"%s\" dla domeny \"%s\" już istnieje"
+
+#: catalog/pg_constraint.c:773
+#, c-format
+msgid "table \"%s\" has multiple constraints named \"%s\""
+msgstr "tabela \"%s\" ma wiele ograniczeń o nazwie \"%s\""
+
+#: catalog/pg_constraint.c:785
+#, c-format
+msgid "constraint \"%s\" for table \"%s\" does not exist"
+msgstr "ograniczenie \"%s\" dla tabeli \"%s\" nie istnieje"
+
+#: catalog/pg_conversion.c:67
+#, c-format
+msgid "conversion \"%s\" already exists"
+msgstr "konwersja \"%s\" już istnieje"
+
+#: catalog/pg_conversion.c:80
+#, c-format
+msgid "default conversion for %s to %s already exists"
+msgstr "domyślna konwersja z %s na %s już istnieje"
+
+#: catalog/pg_depend.c:164 commands/extension.c:2721
+#, c-format
+msgid "%s is already a member of extension \"%s\""
+msgstr "%s jest już składnikiem rozszerzenia \"%s\""
+
+#: catalog/pg_depend.c:323
+#, c-format
+msgid "cannot remove dependency on %s because it is a system object"
+msgstr ""
+"nie można usunąć zależności od %s ponieważ jest ona obiektem systemowym"
+
+#: catalog/pg_enum.c:113 catalog/pg_enum.c:199
+#, c-format
+msgid "invalid enum label \"%s\""
+msgstr "nieprawidłowa etykieta enumeracji \"%s\""
+
+#: catalog/pg_enum.c:114 catalog/pg_enum.c:200
+#, c-format
+msgid "Labels must be %d characters or less."
+msgstr "Etykieta musi posiadać %d znaków lub mniej."
+
+#: catalog/pg_enum.c:264
+#, c-format
+msgid "\"%s\" is not an existing enum label"
+msgstr "\"%s\" nie jest istniejącą wartością enumeracji"
+
+#: catalog/pg_enum.c:325
+msgid "ALTER TYPE ADD BEFORE/AFTER is incompatible with binary upgrade"
+msgstr "ALTER TYPE ADD BEFORE/AFTER nie jest zgodna z aktualizacjÄ… binarnÄ…"
+
+#: catalog/pg_namespace.c:52 commands/schemacmds.c:259
+#, c-format
+msgid "schema \"%s\" already exists"
+msgstr "schemat \"%s\" już istnieje"
+
+#: catalog/pg_operator.c:221 catalog/pg_operator.c:363
+#, c-format
+msgid "\"%s\" is not a valid operator name"
+msgstr "\"%s\" nie jest prawidłową nazwą operatora"
+
+#: catalog/pg_operator.c:372
+msgid "only binary operators can have commutators"
+msgstr "tylko operatory binarne mogą mieć komutatory"
+
+#: catalog/pg_operator.c:376
+#, fuzzy
+msgid "only binary operators can have join selectivity"
+msgstr "tylko operatory binarne mogą mieć selektywność ograniczenia"
+
+#: catalog/pg_operator.c:380
+msgid "only binary operators can merge join"
+msgstr "tylko operatory binarne mogą łączyć przez scalenie"
+
+#: catalog/pg_operator.c:384
+msgid "only binary operators can hash"
+msgstr "tylko operatory binarne mogą haszować"
+
+#: catalog/pg_operator.c:395
+msgid "only boolean operators can have negators"
+msgstr "tylko operatory logiczne mogą mieć negatory"
+
+#: catalog/pg_operator.c:399
+msgid "only boolean operators can have restriction selectivity"
+msgstr "tylko operatory logiczne mogą mieć selektywność ograniczenia"
+
+#: catalog/pg_operator.c:403
+#, fuzzy
+msgid "only boolean operators can have join selectivity"
+msgstr "tylko operatory logiczne mogą mieć selektywność ograniczenia"
+
+#: catalog/pg_operator.c:407
+msgid "only boolean operators can merge join"
+msgstr "tylko operatory logiczne mogą łączyć przez scalenie"
+
+#: catalog/pg_operator.c:411
+msgid "only boolean operators can hash"
+msgstr "tylko operatory logiczne mogą haszować"
+
+#: catalog/pg_operator.c:423
+#, c-format
+msgid "operator %s already exists"
+msgstr "operator %s już istnieje"
+
+#: catalog/pg_operator.c:616
+msgid "operator cannot be its own negator or sort operator"
+msgstr "operator nie może być własnym negatorem ani operatorem sortowania"
+
+#: catalog/pg_proc.c:124 parser/parse_func.c:1526 parser/parse_func.c:1566
+#, c-format
+msgid "functions cannot have more than %d argument"
+msgid_plural "functions cannot have more than %d arguments"
+msgstr[0] "funkcje nie mogą mieć więcej niż %d argument"
+msgstr[1] "funkcje nie mogą mieć więcej niż %d argumenty"
+msgstr[2] "funkcje nie mogą mieć więcej niż %d argumentów"
+
+#: catalog/pg_proc.c:206
+msgid ""
+"A function returning a polymorphic type must have at least one polymorphic "
+"argument."
+msgstr ""
+"Funkcja zwracająca typ polimorficzny musi mieć co najmniej jeden argument "
+"polimorficzny."
+
+#: catalog/pg_proc.c:224
+#, c-format
+msgid "\"%s\" is already an attribute of type %s"
+msgstr "\"%s\" jest już atrybutem typu %s"
+
+#: catalog/pg_proc.c:363
+#, c-format
+msgid "function \"%s\" already exists with same argument types"
+msgstr "funkcja \"%s\" z argumentami identycznego typu już istnieje"
+
+#: catalog/pg_proc.c:377 catalog/pg_proc.c:399
+msgid "cannot change return type of existing function"
+msgstr "nie można zmieniać zwracanego typu istniejącej funkcji"
+
+#: catalog/pg_proc.c:378 catalog/pg_proc.c:401 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:466 catalog/pg_proc.c:492
+msgid "Use DROP FUNCTION first."
+msgstr "Użyj najpierw DROP FUNCTION."
+
+#: catalog/pg_proc.c:400
+msgid "Row type defined by OUT parameters is different."
+msgstr "Typ rekordu zdefiniowany przez parametr OUT jest inny."
+
+#: catalog/pg_proc.c:441
+#, c-format
+msgid "cannot change name of input parameter \"%s\""
+msgstr "nie można zmienić nazwy parametru wejściowego \"%s\""
+
+#: catalog/pg_proc.c:465
+msgid "cannot remove parameter defaults from existing function"
+msgstr "nie można zmieniać domyślnych wartości parametru z istniejącej funkcji"
+
+#: catalog/pg_proc.c:491
+msgid "cannot change data type of existing parameter default value"
+msgstr ""
+"nie można zmieniać typu danych wartości domyślnej istniejącego parametru"
+
+#: catalog/pg_proc.c:503
+#, c-format
+msgid "function \"%s\" is an aggregate function"
+msgstr "funkcja \"%s\" jest funkcjÄ… agregujÄ…cÄ…"
+
+#: catalog/pg_proc.c:508
+#, c-format
+msgid "function \"%s\" is not an aggregate function"
+msgstr "funkcja \"%s\" nie jest funkcjÄ… agregujÄ…cÄ…"
+
+#: catalog/pg_proc.c:516
+#, c-format
+msgid "function \"%s\" is a window function"
+msgstr "funkcja \"%s\" jest funkcjÄ… okna"
+
+#: catalog/pg_proc.c:521
+#, c-format
+msgid "function \"%s\" is not a window function"
+msgstr "funkcja \"%s\" nie jest funkcjÄ… okna"
+
+#: catalog/pg_proc.c:698
+#, c-format
+msgid "there is no built-in function named \"%s\""
+msgstr "brak wbudowanej funkcji o nazwie \"%s\""
+
+#: catalog/pg_proc.c:790
+#, c-format
+msgid "SQL functions cannot return type %s"
+msgstr "funkcja SQL nie może zwracać typu %s"
+
+#: catalog/pg_proc.c:805
+#, c-format
+msgid "SQL functions cannot have arguments of type %s"
+msgstr "funkcja SQL nie może posiadać argumentów typu %s"
+
+#: catalog/pg_proc.c:891 executor/functions.c:1162
+#, c-format
+msgid "SQL function \"%s\""
+msgstr "funkcja SQL \"%s\""
+
+#: catalog/pg_shdepend.c:680
+#, c-format
+msgid ""
+"\n"
+"and objects in %d other database (see server log for list)"
+msgid_plural ""
+"\n"
+"and objects in %d other databases (see server log for list)"
+msgstr[0] ""
+"\n"
+"i obiekty z %d innej bazy danych (lista w dzienniku serwera)"
+msgstr[1] ""
+"\n"
+"i obiekty z %d innych baz danych (lista w dzienniku serwera)"
+msgstr[2] ""
+"\n"
+"i obiekty z %d innych baz danych (lista w dzienniku serwera)"
+
+#: catalog/pg_shdepend.c:992
+#, c-format
+msgid "role %u was concurrently dropped"
+msgstr "rola %u została równocześnie usunięta"
+
+#: catalog/pg_shdepend.c:1011
+#, c-format
+msgid "tablespace %u was concurrently dropped"
+msgstr "przestrzeń tabel %u została równocześnie usunięta"
+
+#: catalog/pg_shdepend.c:1026
+#, c-format
+msgid "database %u was concurrently dropped"
+msgstr "baza danych %u została równocześnie usunięta"
+
+#: catalog/pg_shdepend.c:1070
+#, c-format
+msgid "owner of %s"
+msgstr "właściciel %s"
+
+#: catalog/pg_shdepend.c:1072
+#, c-format
+msgid "privileges for %s"
+msgstr "uprawnienia dla %s"
+
+#. translator: %s will always be "database %s"
+#: catalog/pg_shdepend.c:1080
+#, c-format
+msgid "%d object in %s"
+msgid_plural "%d objects in %s"
+msgstr[0] "%d obiekt w %s"
+msgstr[1] "%d obiekty w %s"
+msgstr[2] "%d obiektów w %s"
+
+#: catalog/pg_shdepend.c:1191
+#, c-format
+msgid ""
+"cannot drop objects owned by %s because they are required by the database "
+"system"
+msgstr ""
+"nie można skasować obiektów posiadanych przez %s ponieważ są one wymagane "
+"przez system bazy danych"
+
+#: catalog/pg_shdepend.c:1287
+#, c-format
+msgid ""
+"cannot reassign ownership of objects owned by %s because they are required "
+"by the database system"
+msgstr ""
+"nie można przydzielić ponownie obiektów posiadanych przez %s ponieważ są one "
+"wymagane przez system bazy danych"
+
+#: catalog/pg_type.c:241
+#, c-format
+msgid "invalid type internal size %d"
+msgstr "niepoprawny rozmiar wewnętrzny typu %d"
+
+#: catalog/pg_type.c:257 catalog/pg_type.c:265 catalog/pg_type.c:273
+#: catalog/pg_type.c:282
+#, c-format
+msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
+msgstr ""
+"wyrównanie \"%c\" jest niepoprawne dla przekazywanego przez wartość typu o "
+"rozmiarze %d"
+
+#: catalog/pg_type.c:289
+#, c-format
+msgid "internal size %d is invalid for passed-by-value type"
+msgstr ""
+"wewnętrzny rozmiar %d jest niepoprawny dla typu przekazywanego przez wartość"
+
+#: catalog/pg_type.c:298 catalog/pg_type.c:304
+#, c-format
+msgid "alignment \"%c\" is invalid for variable-length type"
+msgstr "wyrównanie \"%c\" jest niepoprawne dla typu o zmiennej długości"
+
+#: catalog/pg_type.c:312
+msgid "fixed-size types must have storage PLAIN"
+msgstr "typy o stałej długości muszą mieć przechowywanie PLAIN"
+
+#: catalog/pg_type.c:760
+#, c-format
+msgid "could not form array type name for type \"%s\""
+msgstr "nie udało się utworzyć nazwy typu tablicowego dla typu \"%s\""
+
+#: catalog/toasting.c:142
+#, fuzzy
+msgid "shared tables cannot be toasted after initdb"
+msgstr "tabele współdzielone nie mogą być prażone po initdb"
+
+#: catalog/pg_collation.c:75
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists"
+msgstr "ograniczenie \"%s\" dla kodowania \"%s\" już istnieje"
+
+#: catalog/pg_collation.c:89
+#, c-format
+msgid "collation \"%s\" already exists"
+msgstr "porównanie \"%s\" już istnieje"
+
+#: commands/aggregatecmds.c:103
+#, c-format
+msgid "aggregate attribute \"%s\" not recognized"
+msgstr "atrybut agregatu \"%s\" nie rozpoznany"
+
+#: commands/aggregatecmds.c:113
+msgid "aggregate stype must be specified"
+msgstr "konieczne wskazanie stype agregatu"
+
+#: commands/aggregatecmds.c:117
+msgid "aggregate sfunc must be specified"
+msgstr "konieczne wskazanie sfunc agregatu"
+
+#: commands/aggregatecmds.c:134
+msgid "aggregate input type must be specified"
+msgstr "konieczne wskazanie typu wejścia agregatu"
+
+#: commands/aggregatecmds.c:159
+msgid "basetype is redundant with aggregate input type specification"
+msgstr "typ bazowy jest nadmierny z jednoczesnym wskazaniem typu wejścia"
+
+#: commands/aggregatecmds.c:191
+#, c-format
+msgid "aggregate transition data type cannot be %s"
+msgstr "typ danych transformacji agregatu nie może być %s"
+
+#: commands/aggregatecmds.c:230
+#, c-format
+msgid "aggregate %s(%s) does not exist, skipping"
+msgstr "agregat %s(%s) nie istnieje, pominięto"
+
+#: commands/aggregatecmds.c:292 commands/functioncmds.c:1122
+#, c-format
+msgid "function %s already exists in schema \"%s\""
+msgstr "funkcja %s istnieje już w schemacie \"%s\""
+
+#: commands/alter.c:423
+#, c-format
+msgid "must be superuser to set schema of %s"
+msgstr "musisz być superużytkownikiem aby ustawić schemat dla %s"
+
+#: commands/alter.c:451
+#, c-format
+msgid "%s already exists in schema \"%s\""
+msgstr "%s już istnieje w schemacie \"%s\""
+
+#: commands/analyze.c:153
+#, c-format
+msgid "skipping analyze of \"%s\" --- lock not available"
+msgstr "pominięto analizę \"%s\" --- blokada niedostępna"
+
+#: commands/analyze.c:170
+#, c-format
+msgid "skipping \"%s\" --- only superuser can analyze it"
+msgstr "pominięto \"%s\" --- tylko superużytkownik może to analizować"
+
+#: commands/analyze.c:174
+#, c-format
+msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
+msgstr "pominięto \"%s\" --- tylko właściciel bazy danych może to analizować"
+
+#: commands/analyze.c:178
+#, c-format
+msgid "skipping \"%s\" --- only table or database owner can analyze it"
+msgstr ""
+"pominięto \"%s\" --- tylko właściciel tabeli lub bazy danych może to "
+"analizować"
+
+#: commands/analyze.c:194
+#, c-format
+msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
+msgstr ""
+"pominięto \"%s\" --- nie można analizować nie tabel ani specjalnych tabel "
+"systemowych"
+
+#: commands/analyze.c:285
+#, c-format
+msgid "analyzing \"%s.%s\" inheritance tree"
+msgstr "analiza drzewa dziedziczenia \"%s.%s\""
+
+#: commands/analyze.c:290
+#, c-format
+msgid "analyzing \"%s.%s\""
+msgstr "analiza \"%s.%s\""
+
+#: commands/analyze.c:598
+#, c-format
+msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
+msgstr "automatyczna analiza użycia tabeli \"%s.%s.%s\" przez system: %s"
+
+#: commands/analyze.c:1238
+#, c-format
+msgid ""
+"\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
+"rows; %d rows in sample, %.0f estimated total rows"
+msgstr ""
+"\"%s\": przeskanowano %d z %u stron, zawierających %.0f żywych wierszy i "
+"%.0f martwych wierszy; %d wierszy w przykładzie, %.0f szacowanych wszystkich "
+"wierszy"
+
+#: commands/analyze.c:1499 executor/execQual.c:2734
+msgid "could not convert row type"
+msgstr "nie można przekształcić typu wierszowego"
+
+#: commands/async.c:567
+msgid "channel name cannot be empty"
+msgstr "kanał nie może być pusty"
+
+#: commands/async.c:572
+msgid "channel name too long"
+msgstr "nazwa kanału zbyt długa"
+
+#: commands/async.c:579
+msgid "payload string too long"
+msgstr "ciąg znaków ładunku zbyt długi"
+
+#: commands/async.c:763
+msgid ""
+"cannot PREPARE a transaction that has executed LISTEN, UNLISTEN or NOTIFY"
+msgstr ""
+"nie można wykonać PREPARE transakcji, która uruchomiła już LISTEN, UNLISTEN "
+"lub NOTIFY"
+
+#: commands/async.c:868
+msgid "too many notifications in the NOTIFY queue"
+msgstr "zbyt wiele powiadomień w kolejce NOTIFY"
+
+#: commands/async.c:1430
+#, c-format
+msgid "NOTIFY queue is %.0f%% full"
+msgstr "kolejka NOTIFY jest zapełniona w %.0f%%"
+
+#: commands/async.c:1432
+#, c-format
+msgid ""
+"The server process with PID %d is among those with the oldest transactions."
+msgstr "Proces serwera o PID %d jest pośród tych z najstarszymi transakcjami."
+
+#: commands/async.c:1435
+msgid ""
+"The NOTIFY queue cannot be emptied until that process ends its current "
+"transaction."
+msgstr ""
+"Kolejka NOTIFY nie może być opróżniona dopóki procesy z niej nie zakończą "
+"swoich bieżące transakcji."
+
+#: commands/cluster.c:134 commands/cluster.c:372
+msgid "cannot cluster temporary tables of other sessions"
+msgstr "nie można sklastrować tabel tymczasowych z innych sesji"
+
+#: commands/cluster.c:164
+#, c-format
+msgid "there is no previously clustered index for table \"%s\""
+msgstr "nie ma uprzednio sklastrowanego indeksu dla tabeli \"%s\""
+
+#: commands/cluster.c:178 commands/tablecmds.c:7659
+#, c-format
+msgid "index \"%s\" for table \"%s\" does not exist"
+msgstr "indeks \"%s\" dla tabeli \"%s\" nie istnieje"
+
+#: commands/cluster.c:361
+msgid "cannot cluster a shared catalog"
+msgstr "nie można sklastrować współdzielonego katalogu"
+
+#: commands/cluster.c:376
+msgid "cannot vacuum temporary tables of other sessions"
+msgstr "nie można odkurzyć tabel tymczasowych z innych sesji"
+
+#: commands/cluster.c:426
+#, c-format
+msgid "\"%s\" is not an index for table \"%s\""
+msgstr "\"%s\" nie jest indeksem dla tabeli \"%s\""
+
+#: commands/cluster.c:434
+#, c-format
+msgid ""
+"cannot cluster on index \"%s\" because access method does not support "
+"clustering"
+msgstr ""
+"nie można klastrować na indeksie \"%s\" ponieważ metoda dostępu nie "
+"obsługuje klastrowania"
+
+#: commands/cluster.c:446
+#, c-format
+msgid "cannot cluster on partial index \"%s\""
+msgstr "nie można sklastrować indeksu częściowego \"%s\""
+
+#: commands/cluster.c:460
+#, c-format
+msgid "cannot cluster on invalid index \"%s\""
+msgstr "nie można sklastrować niepoprawnego indeksu \"%s\""
+
+#: commands/cluster.c:883
+#, c-format
+msgid "clustering \"%s.%s\" using index scan on \"%s\""
+msgstr "klastrowanie \"%s.%s\" przy użyciu skanowania indeksu na \"%s\""
+
+#: commands/cluster.c:889
+#, c-format
+msgid "clustering \"%s.%s\" using sequential scan and sort"
+msgstr "klastrowanie \"%s.%s\" przy użyciu skanu sekwencyjnego i sortowania"
+
+#: commands/cluster.c:894 commands/vacuumlazy.c:339
+#, c-format
+msgid "vacuuming \"%s.%s\""
+msgstr "odkurzanie \"%s.%s\""
+
+#: commands/cluster.c:1054
+#, c-format
+msgid ""
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
+msgstr ""
+"\"%s\": znaleziono %.0f usuwalnych, %.0f nieusuwalnych wersji wierszy na %u "
+"stronach"
+
+#: commands/cluster.c:1058
+#, c-format
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"%s."
+msgstr ""
+"%.0f martwych wersji wierszy nie może być jeszcze usuniętych.\n"
+"%s."
+
+#: commands/comment.c:60 commands/dbcommands.c:764 commands/dbcommands.c:909
+#: commands/dbcommands.c:1008 commands/dbcommands.c:1181
+#: commands/dbcommands.c:1366 commands/dbcommands.c:1451
+#: commands/dbcommands.c:1854 utils/init/postinit.c:709
+#: utils/init/postinit.c:777 utils/init/postinit.c:794
+#, c-format
+msgid "database \"%s\" does not exist"
+msgstr "baza danych \"%s\" nie istnieje"
+
+#: commands/comment.c:97 commands/seclabel.c:113
+#, c-format
+msgid "\"%s\" is not a table, view, composite type, or foreign table"
+msgstr "\"%s\" nie jest tabelą, widokiem, typem złożonym ani sekwencją"
+
+#: commands/constraint.c:59 utils/adt/ri_triggers.c:3080
+#, c-format
+msgid "function \"%s\" was not called by trigger manager"
+msgstr "funkcja \"%s\" nie była wywołana przez menadżera wyzwalaczy"
+
+#: commands/constraint.c:66 utils/adt/ri_triggers.c:3089
+#, c-format
+msgid "function \"%s\" must be fired AFTER ROW"
+msgstr "funkcja \"%s\" musi być odpalana AFTER ROW"
+
+#: commands/constraint.c:80 utils/adt/ri_triggers.c:3110
+#, c-format
+msgid "function \"%s\" must be fired for INSERT or UPDATE"
+msgstr "funkcja \"%s\" musi być odpalona dla INSERT lub UPDATE"
+
+#: commands/conversioncmds.c:71
+#, c-format
+msgid "source encoding \"%s\" does not exist"
+msgstr "kodowanie źródłowe \"%s\" nie istnieje"
+
+#: commands/conversioncmds.c:78
+#, c-format
+msgid "destination encoding \"%s\" does not exist"
+msgstr "kodowanie docelowe \"%s\" nie istnieje"
+
+#: commands/conversioncmds.c:92
+#, c-format
+msgid "encoding conversion function %s must return type \"void\""
+msgstr "funkcja konwersji kodowania %s musi zwracać typ \"void\""
+
+#: commands/conversioncmds.c:152
+#, c-format
+msgid "conversion \"%s\" does not exist, skipping"
+msgstr "konwersja \"%s\" nie istnieje, pominięto"
+
+#: commands/conversioncmds.c:211
+#, c-format
+msgid "conversion \"%s\" already exists in schema \"%s\""
+msgstr "konwersja \"%s\" istnieje już w schemacie \"%s\""
+
+#: commands/copy.c:339 commands/copy.c:351 commands/copy.c:385
+#: commands/copy.c:395
+msgid "COPY BINARY is not supported to stdout or from stdin"
+msgstr "COPY BINARY nie jest obsługiwane do stdout ani ze stdin"
+
+#: commands/copy.c:473
+#, c-format
+msgid "could not write to COPY file: %m"
+msgstr "nie można pisać do pliku COPY: %m"
+
+#: commands/copy.c:485
+msgid "connection lost during COPY to stdout"
+msgstr "utracono połączenie podczas DOPY do stdout"
+
+#: commands/copy.c:526
+#, c-format
+msgid "could not read from COPY file: %m"
+msgstr "nie można czytać z pliku COPY: %m"
+
+#: commands/copy.c:542 commands/copy.c:561 commands/copy.c:565
+#: tcop/fastpath.c:290 tcop/postgres.c:349 tcop/postgres.c:372
+msgid "unexpected EOF on client connection"
+msgstr "nieoczekiwany EOF w połączeniu klienta"
+
+#: commands/copy.c:577
+#, c-format
+msgid "COPY from stdin failed: %s"
+msgstr "nie powiodło się COPY ze stdin: %s"
+
+#: commands/copy.c:593
+#, c-format
+msgid "unexpected message type 0x%02X during COPY from stdin"
+msgstr "nieoczekiwany typ komunikatu 0x%02X podczas COPY ze stdin"
+
+#: commands/copy.c:745
+msgid "must be superuser to COPY to or from a file"
+msgstr "musisz być superużytkownikiem by wykonywać COPY z pliku"
+
+#: commands/copy.c:746
+msgid ""
+"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
+"for anyone."
+msgstr ""
+"Każdy może wykonać COPY do stdout lub ze stdin. Polecenie psql \\copy "
+"również może każdy uruchomić."
+
+#: commands/copy.c:874
+#, c-format
+msgid "COPY format \"%s\" not recognized"
+msgstr "format COPY \"%s\" nie rozpoznany"
+
+#: commands/copy.c:937 commands/copy.c:951
+#, c-format
+msgid "argument to option \"%s\" must be a list of column names"
+msgstr "argument dla opcji \"%s\" musi być listą nazw kolumn"
+
+#: commands/copy.c:964
+#, c-format
+msgid "argument to option \"%s\" must be a valid encoding name"
+msgstr "argument dla opcji \"%s\" musi być poprawną nazwą kodowania"
+
+#: commands/copy.c:970
+#, c-format
+msgid "option \"%s\" not recognized"
+msgstr "opcja \"%s\" nie rozpoznana"
+
+#: commands/copy.c:981
+msgid "cannot specify DELIMITER in BINARY mode"
+msgstr "nie można wskazać DELIMITER w trybie BINARY"
+
+#: commands/copy.c:986
+msgid "cannot specify NULL in BINARY mode"
+msgstr "nie można wskazać NULL w trybie BINARY"
+
+#: commands/copy.c:1008
+msgid "COPY delimiter must be a single one-byte character"
+msgstr "ogranicznik COPY musi być pojedynczym jednobajtowym znakiem"
+
+#: commands/copy.c:1015
+msgid "COPY delimiter cannot be newline or carriage return"
+msgstr "ogranicznik COPY nie może być znakiem nowej linii ani powrotu karetki"
+
+#: commands/copy.c:1021
+msgid "COPY null representation cannot use newline or carriage return"
+msgstr ""
+"reprezentacja null w COPY nie może używać znaku nowej linii ani powrotu "
+"karetki"
+
+#: commands/copy.c:1038
+#, c-format
+msgid "COPY delimiter cannot be \"%s\""
+msgstr "ogranicznik COPY nie może być \"%s\""
+
+#: commands/copy.c:1044
+msgid "COPY HEADER available only in CSV mode"
+msgstr "COPY HEADER dostępny tylko w trybie CSV"
+
+#: commands/copy.c:1050
+msgid "COPY quote available only in CSV mode"
+msgstr "cytowanie COPY dostępny tylko w trybie CSV"
+
+#: commands/copy.c:1055
+msgid "COPY quote must be a single one-byte character"
+msgstr "cytowanie COPY musi być pojedynczym jednobajtowym znakiem"
+
+#: commands/copy.c:1060
+msgid "COPY delimiter and quote must be different"
+msgstr "ogranicznik i cytowanie COPY muszą być różne"
+
+#: commands/copy.c:1066
+msgid "COPY escape available only in CSV mode"
+msgstr "znak ucieczki COPY dostępny tylko w trybie CSV"
+
+#: commands/copy.c:1071
+msgid "COPY escape must be a single one-byte character"
+msgstr "znak ucieczki COPY musi być pojedynczym jednobajtowym znakiem"
+
+#: commands/copy.c:1077
+msgid "COPY force quote available only in CSV mode"
+msgstr "znak wymuszenia cytowania COPY dostępny tylko w trybie CSV"
+
+#: commands/copy.c:1081
+msgid "COPY force quote only available using COPY TO"
+msgstr "znak wymuszenia cytowania COPY dostępny tylko podczas użycia COPY TO"
+
+#: commands/copy.c:1087
+msgid "COPY force not null available only in CSV mode"
+msgstr "znak wymuszenia niepustych COPY dostępny tylko w trybie CSV"
+
+#: commands/copy.c:1091
+msgid "COPY force not null only available using COPY FROM"
+msgstr "znak wymuszenia niepustych COPY dostępny tylko podczas użycia COPY TO"
+
+#: commands/copy.c:1097
+msgid "COPY delimiter must not appear in the NULL specification"
+msgstr "ogranicznik COPY nie może pojawić się w specyfikacji NULL"
+
+#: commands/copy.c:1104
+msgid "CSV quote character must not appear in the NULL specification"
+msgstr "znak ogranicznika CSV nie może pojawić się w specyfikacji NULL"
+
+#: commands/copy.c:1166
+#, c-format
+msgid "table \"%s\" does not have OIDs"
+msgstr "tabela \"%s\" nie ma OIDów"
+
+#: commands/copy.c:1183
+msgid "COPY (SELECT) WITH OIDS is not supported"
+msgstr "COPY (SELECT) WITH OIDS nie jest obsługiwane"
+
+#: commands/copy.c:1210
+msgid "COPY (SELECT INTO) is not supported"
+msgstr "COPY (SELECT INTO) nie jest obsługiwane"
+
+#: commands/copy.c:1270
+#, c-format
+msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
+msgstr "kolumna FORCE QUOTE \"%s\" nie jest wskazana w COPY"
+
+#: commands/copy.c:1292
+#, c-format
+msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
+msgstr "kolumna FORCE NOT NULL \"%s\" nie jest wskazana w COPY"
+
+#: commands/copy.c:1356
+#, c-format
+msgid "cannot copy from view \"%s\""
+msgstr "nie można kopiować z widoku \"%s\""
+
+#: commands/copy.c:1358 commands/copy.c:1364
+msgid "Try the COPY (SELECT ...) TO variant."
+msgstr "Spróbuj z alternatywnym COPY (SELECT ...) TO."
+
+#: commands/copy.c:1362
+#, c-format
+msgid "cannot copy from foreign table \"%s\""
+msgstr "nie można kopiować z tabeli obcej \"%s\""
+
+#: commands/copy.c:1368
+#, c-format
+msgid "cannot copy from sequence \"%s\""
+msgstr "nie można kopiować z sekwencji \"%s\""
+
+#: commands/copy.c:1373
+#, c-format
+msgid "cannot copy from non-table relation \"%s\""
+msgstr "nie można kopiować z relacji \"%s\" nie będącej tabelą"
+
+#: commands/copy.c:1397
+msgid "relative path not allowed for COPY to file"
+msgstr "ścieżka względna niedozwolona dla COPY do pliku"
+
+#: commands/copy.c:1407
+#, c-format
+msgid "could not open file \"%s\" for writing: %m"
+msgstr "nie można otworzyć pliku \"%s\" do zapisu: %m"
+
+#: commands/copy.c:1414 commands/copy.c:2200
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" jest katalogiem"
+
+#: commands/copy.c:1738
+#, c-format
+msgid "COPY %s, line %d, column %s"
+msgstr "COPY %s, linia %d, kolumna %s"
+
+#: commands/copy.c:1742 commands/copy.c:1787
+#, c-format
+msgid "COPY %s, line %d"
+msgstr "COPY %s, linia %d"
+
+#: commands/copy.c:1753
+#, c-format
+msgid "COPY %s, line %d, column %s: \"%s\""
+msgstr "COPY %s, linia %d, kolumna %s: \"%s\""
+
+#: commands/copy.c:1761
+#, c-format
+msgid "COPY %s, line %d, column %s: null input"
+msgstr "COPY %s, linia %d, kolumna %s: puste wejście"
+
+#: commands/copy.c:1773
+#, c-format
+msgid "COPY %s, line %d: \"%s\""
+msgstr "COPY %s, linia %d: \"%s\""
+
+#: commands/copy.c:1857
+#, c-format
+msgid "cannot copy to view \"%s\""
+msgstr "nie można kopiować do widoku \"%s\""
+
+#: commands/copy.c:1862
+#, c-format
+msgid "cannot copy to foreign table \"%s\""
+msgstr "nie można kopiować do tabeli obcej \"%s\""
+
+#: commands/copy.c:1867
+#, c-format
+msgid "cannot copy to sequence \"%s\""
+msgstr "nie można kopiować do sekwencji \"%s\""
+
+#: commands/copy.c:1872
+#, c-format
+msgid "cannot copy to non-table relation \"%s\""
+msgstr "nie można kopiować do relacji \"%s\" nie będącej tabelą"
+
+#: commands/copy.c:2193 utils/adt/genfile.c:122
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "nie można otworzyć pliku \"%s\" do odczytu: %m"
+
+#: commands/copy.c:2219
+msgid "COPY file signature not recognized"
+msgstr "nierozpoznana sygnatura pliku COPY"
+
+#: commands/copy.c:2224
+msgid "invalid COPY file header (missing flags)"
+msgstr "niepoprawny nagłówek pliku COPY (brakuje flag)"
+
+#: commands/copy.c:2230
+msgid "unrecognized critical flags in COPY file header"
+msgstr "nierozpoznane istotne flagi w nagłówku pliku COPY"
+
+#: commands/copy.c:2236
+msgid "invalid COPY file header (missing length)"
+msgstr "niepoprawny nagłówek pliku COPY (brakuje długości)"
+
+#: commands/copy.c:2243
+msgid "invalid COPY file header (wrong length)"
+msgstr "niepoprawny nagłówek pliku COPY (niepoprawna długość)"
+
+#: commands/copy.c:2376 commands/copy.c:3058 commands/copy.c:3275
+msgid "extra data after last expected column"
+msgstr "nieoczekiwane dane po ostatniej oczekiwanej kolumnie"
+
+#: commands/copy.c:2386
+msgid "missing data for OID column"
+msgstr "brak danych dla kolumny OID"
+
+#: commands/copy.c:2392
+msgid "null OID in COPY data"
+msgstr "pusty OID w danych COPY"
+
+#: commands/copy.c:2402 commands/copy.c:2501
+msgid "invalid OID in COPY data"
+msgstr "niepoprawny OID w danych COPY"
+
+#: commands/copy.c:2417
+#, c-format
+msgid "missing data for column \"%s\""
+msgstr "brak danych dla kolumny \"%s\""
+
+#: commands/copy.c:2476
+msgid "received copy data after EOF marker"
+msgstr "odebrano kopiowane dane po znaczniku EOF"
+
+#: commands/copy.c:2483
+#, c-format
+msgid "row field count is %d, expected %d"
+msgstr "liczba pól wiersza wynosi %d, oczekiwano %d"
+
+#: commands/copy.c:2822 commands/copy.c:2839
+msgid "literal carriage return found in data"
+msgstr "znaleziono literał powrotu karetki w danych"
+
+#: commands/copy.c:2823 commands/copy.c:2840
+msgid "unquoted carriage return found in data"
+msgstr "znaleziono niecytowany powrót karetki w danych"
+
+#: commands/copy.c:2825 commands/copy.c:2842
+msgid "Use \"\\r\" to represent carriage return."
+msgstr "Użyj \"\\r\" jako reprezentacji powrotu karetki."
+
+#: commands/copy.c:2826 commands/copy.c:2843
+msgid "Use quoted CSV field to represent carriage return."
+msgstr "Użyj cytowanego pola CSV jako reprezentacji powrotu karetki."
+
+#: commands/copy.c:2855
+msgid "literal newline found in data"
+msgstr "znaleziono literał nowej linii w danych"
+
+#: commands/copy.c:2856
+msgid "unquoted newline found in data"
+msgstr "znaleziono niecytowany znak nowej linii w danych"
+
+#: commands/copy.c:2858
+msgid "Use \"\\n\" to represent newline."
+msgstr "Użyj \"\\n\" jako reprezentacji znaku nowej linii."
+
+#: commands/copy.c:2859
+msgid "Use quoted CSV field to represent newline."
+msgstr "Użyj cytowanego pola CSV jako reprezentacji nowej linii."
+
+#: commands/copy.c:2905 commands/copy.c:2941
+msgid "end-of-copy marker does not match previous newline style"
+msgstr "znacznik końcowy kopii nie pasuje do poprzedniego stylu nowej linii"
+
+#: commands/copy.c:2914 commands/copy.c:2930
+msgid "end-of-copy marker corrupt"
+msgstr "uszkodzony znak końcowy kopii"
+
+#: commands/copy.c:3359
+msgid "unterminated CSV quoted field"
+msgstr "niezakończone cytowane pole CSV"
+
+#: commands/copy.c:3436 commands/copy.c:3455
+msgid "unexpected EOF in COPY data"
+msgstr "nieoczekiwany EOF w danych COPY"
+
+#: commands/copy.c:3445
+msgid "invalid field size"
+msgstr "nieprawidłowy rozmiar pola"
+
+#: commands/copy.c:3468
+msgid "incorrect binary data format"
+msgstr "nieprawidłowy binarny format danych"
+
+#: commands/copy.c:3779 commands/indexcmds.c:846 commands/tablecmds.c:1293
+#: commands/tablecmds.c:2148 parser/parse_expr.c:764
+#: utils/adt/tsvector_op.c:1417
+#, c-format
+msgid "column \"%s\" does not exist"
+msgstr "kolumna \"%s\" nie istnieje"
+
+#: commands/copy.c:3786 commands/tablecmds.c:1319 commands/trigger.c:594
+#: parser/parse_target.c:911 parser/parse_target.c:922
+#, c-format
+msgid "column \"%s\" specified more than once"
+msgstr "kolumna \"%s\" określona więcej niż raz"
+
+#: commands/dbcommands.c:201
+msgid "LOCATION is not supported anymore"
+msgstr "LOCATION nie jest już obsługiwane"
+
+#: commands/dbcommands.c:202
+msgid "Consider using tablespaces instead."
+msgstr "Rozważ w zamian użycie przestrzeni tabel."
+
+#: commands/dbcommands.c:225 utils/adt/ascii.c:144
+#, c-format
+msgid "%d is not a valid encoding code"
+msgstr "%d nie jest poprawnÄ… kodem kodowania"
+
+#: commands/dbcommands.c:235 utils/adt/ascii.c:126
+#, c-format
+msgid "%s is not a valid encoding name"
+msgstr "%s nie jest poprawnÄ… nazwÄ… kodowania"
+
+#: commands/dbcommands.c:253 commands/dbcommands.c:1347 commands/user.c:267
+#: commands/user.c:606
+#, c-format
+msgid "invalid connection limit: %d"
+msgstr "błędne ograniczenie liczby połączeń: %d"
+
+#: commands/dbcommands.c:272
+msgid "permission denied to create database"
+msgstr "odmowa dostępu do tworzenia bazy"
+
+#: commands/dbcommands.c:295
+#, c-format
+msgid "template database \"%s\" does not exist"
+msgstr "tymczasowa baza \"%s\" nie istnieje"
+
+#: commands/dbcommands.c:307
+#, c-format
+msgid "permission denied to copy database \"%s\""
+msgstr "odmowa dostępu do kopiowania bazy danych \"%s\""
+
+#: commands/dbcommands.c:323
+#, c-format
+msgid "invalid server encoding %d"
+msgstr "nieprawidłowe kodowanie serwera %d"
+
+#: commands/dbcommands.c:329 commands/dbcommands.c:333
+#, c-format
+msgid "invalid locale name %s"
+msgstr "nieprawidłowa nazwa lokalizacji %s"
+
+#: commands/dbcommands.c:352
+#, c-format
+msgid ""
+"new encoding (%s) is incompatible with the encoding of the template database "
+"(%s)"
+msgstr ""
+"nowe kodowanie (%s) jest niedopasowana do kodowania szablonu bazy danych (%s)"
+
+#: commands/dbcommands.c:355
+msgid ""
+"Use the same encoding as in the template database, or use template0 as "
+"template."
+msgstr ""
+"Użyj tego samego kodowania jak w szablonie bazy danych, lub użyj template0 "
+"jako szablonu."
+
+#: commands/dbcommands.c:360
+#, c-format
+msgid ""
+"new collation (%s) is incompatible with the collation of the template "
+"database (%s)"
+msgstr ""
+"nowe porównanie (%s) jest niedopasowana do porównania szablonu bazy danych "
+"(%s)"
+
+#: commands/dbcommands.c:362
+msgid ""
+"Use the same collation as in the template database, or use template0 as "
+"template."
+msgstr ""
+"Użyj tego samego porównania jak w szablonie bazy danych, lub użyj template0 "
+"jako szablonu."
+
+#: commands/dbcommands.c:367
+#, c-format
+msgid ""
+"new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
+"(%s)"
+msgstr ""
+"nowe LC_CTYPE (%s) jest niedopasowana do LC_CTYPE szablonu bazy danych (%s)"
+
+#: commands/dbcommands.c:369
+msgid ""
+"Use the same LC_CTYPE as in the template database, or use template0 as "
+"template."
+msgstr ""
+"Użyj tego samego LC_CTYPE jak w szablonie bazy danych, lub użyj template0 "
+"jako szablonu."
+
+#: commands/dbcommands.c:391 commands/dbcommands.c:1054
+msgid "pg_global cannot be used as default tablespace"
+msgstr "pg_global nie może być użyty jako domyślna przestrzeń tabel"
+
+#: commands/dbcommands.c:417
+#, c-format
+msgid "cannot assign new default tablespace \"%s\""
+msgstr "nie można przydzielić domyślnej przestrzeni tabel \"%s\""
+
+#: commands/dbcommands.c:419
+#, c-format
+msgid ""
+"There is a conflict because database \"%s\" already has some tables in this "
+"tablespace."
+msgstr ""
+"Wystąpił konflikt, ponieważ baza danych \"%s\" posiada już kilka tabel w tej "
+"przestrzeni tabel."
+
+#: commands/dbcommands.c:439 commands/dbcommands.c:929
+#, c-format
+msgid "database \"%s\" already exists"
+msgstr "baza danych \"%s\" już istnieje"
+
+#: commands/dbcommands.c:453
+#, c-format
+msgid "source database \"%s\" is being accessed by other users"
+msgstr "źródłowa baza danych \"%s\" jest używana przez innych użytkowników"
+
+#: commands/dbcommands.c:695 commands/dbcommands.c:710
+#, c-format
+msgid "encoding %s does not match locale %s"
+msgstr "kodowanie %s nie pasuje do ustawień lokalnych %s"
+
+#: commands/dbcommands.c:698
+#, c-format
+msgid "The chosen LC_CTYPE setting requires encoding %s."
+msgstr "Wybrane ustawienie LC_TYPE wymaga kodowania %s."
+
+#: commands/dbcommands.c:713
+#, c-format
+msgid "The chosen LC_COLLATE setting requires encoding %s."
+msgstr "Wybrane ustawienie LC_COLLATE wymaga kodowania %s."
+
+#: commands/dbcommands.c:771
+#, c-format
+msgid "database \"%s\" does not exist, skipping"
+msgstr "baza danych \"%s\" nie istnieje, pominięto"
+
+#: commands/dbcommands.c:792
+msgid "cannot drop a template database"
+msgstr "nie można usunąć tymczasowej bazy danych"
+
+#: commands/dbcommands.c:798
+msgid "cannot drop the currently open database"
+msgstr "nie można usunąć aktualnie otwartej bazy danych"
+
+#: commands/dbcommands.c:809 commands/dbcommands.c:951
+#: commands/dbcommands.c:1076
+#, c-format
+msgid "database \"%s\" is being accessed by other users"
+msgstr "baza danych \"%s\" jest używana przez innych użytkowników"
+
+#: commands/dbcommands.c:920
+msgid "permission denied to rename database"
+msgstr "odmowa dostępu do zmiany nazwy bazy"
+
+#: commands/dbcommands.c:940
+msgid "current database cannot be renamed"
+msgstr "nie można zmieniać nazwy aktualnie otwartej bazy"
+
+#: commands/dbcommands.c:1032
+msgid "cannot change the tablespace of the currently open database"
+msgstr "nie można usunąć aktualnie otwartej bazy danych"
+
+#: commands/dbcommands.c:1116
+#, c-format
+msgid "some relations of database \"%s\" are already in tablespace \"%s\""
+msgstr "pewne relacje bazy danych \"%s\" są już w przestrzeni tabel \"%s\""
+
+#: commands/dbcommands.c:1118
+msgid ""
+"You must move them back to the database's default tablespace before using "
+"this command."
+msgstr ""
+"Musisz przesunąć je z powrotem do domyślnej przestrzeni tabel bazy danych "
+"zanim użyjesz tego polecenia."
+
+#: commands/dbcommands.c:1246 commands/dbcommands.c:1714
+#: commands/dbcommands.c:1915 commands/dbcommands.c:1963
+#: commands/tablespace.c:584
+#, c-format
+msgid "some useless files may be left behind in old database directory \"%s\""
+msgstr ""
+"pewne niepotrzebne pliki mogą pozostać w starym folderze bazy danych \"%s\""
+
+#: commands/dbcommands.c:1490
+msgid "permission denied to change owner of database"
+msgstr "odmowa dostępu do zmiany właściciela bazy danych"
+
+#: commands/dbcommands.c:1802
+#, c-format
+msgid ""
+"There are %d other session(s) and %d prepared transaction(s) using the "
+"database."
+msgstr "Inne sesje (%d) i przygotowane transakcje (%d) używają bazy danych."
+
+#: commands/dbcommands.c:1805
+#, c-format
+msgid "There are %d other session(s) using the database."
+msgstr "Inne sesje (%d) używają bazy danych."
+
+#: commands/dbcommands.c:1808
+#, c-format
+msgid "There are %d prepared transaction(s) using the database."
+msgstr "Przygotowane transakcje (%d) używają bazy danych."
+
+#: commands/define.c:67 commands/define.c:222 commands/define.c:254
+#: commands/define.c:282
+#, c-format
+msgid "%s requires a parameter"
+msgstr "%s wymaga parametru"
+
+#: commands/define.c:108 commands/define.c:119 commands/define.c:189
+#: commands/define.c:207
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s wymaga wartości numerycznej"
+
+#: commands/define.c:175
+#, c-format
+msgid "%s requires a Boolean value"
+msgstr "%s wymaga wartości logicznej"
+
+#: commands/define.c:236
+#, c-format
+msgid "argument of %s must be a name"
+msgstr "argument %s musi być nazwą"
+
+#: commands/define.c:266
+#, c-format
+msgid "argument of %s must be a type name"
+msgstr "argument %s musi być nazwą typu"
+
+#: commands/define.c:291
+#, c-format
+msgid "%s requires an integer value"
+msgstr "%s wymaga wartości całkowitej"
+
+#: commands/define.c:312
+#, c-format
+msgid "invalid argument for %s: \"%s\""
+msgstr "nieprawidłowy argument dla %s: \"%s\""
+
+#: commands/explain.c:153
+#, c-format
+msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+msgstr "nieprawidłowa wartość dla opcji EXPLAIN \"%s\": \"%s\""
+
+#: commands/explain.c:159
+#, c-format
+msgid "unrecognized EXPLAIN option \"%s\""
+msgstr "nieznana opcja EXPLAIN \"%s\""
+
+#: commands/explain.c:166
+msgid "EXPLAIN option BUFFERS requires ANALYZE"
+msgstr "opcja EXPLAIN BUFFERS wymaga ANALYZE"
+
+#: commands/foreigncmds.c:135 commands/foreigncmds.c:144
+#, c-format
+msgid "option \"%s\" not found"
+msgstr "nie znaleziono opcji \"%s\""
+
+#: commands/foreigncmds.c:154
+#, c-format
+msgid "option \"%s\" provided more than once"
+msgstr "opcja \"%s\" wskazana więcej niż raz"
+
+#: commands/foreigncmds.c:224 commands/foreigncmds.c:232
+#, c-format
+msgid "permission denied to change owner of foreign-data wrapper \"%s\""
+msgstr "odmowa dostępu do zmiany właściciela opakowania obcych danych \"%s\""
+
+#: commands/foreigncmds.c:226
+msgid "Must be superuser to change owner of a foreign-data wrapper."
+msgstr ""
+"Musisz być superużytkownikiem by zmienić właściciela opakowania obcych "
+"danych."
+
+#: commands/foreigncmds.c:234
+msgid "The owner of a foreign-data wrapper must be a superuser."
+msgstr "Właściciel opakowania obcych danych musi być superużytkownikiem."
+
+#: commands/foreigncmds.c:241 commands/foreigncmds.c:564
+#: commands/foreigncmds.c:712 foreign/foreign.c:524
+#, c-format
+msgid "foreign-data wrapper \"%s\" does not exist"
+msgstr "opakowanie obcych danych \"%s\" nie istnieje"
+
+#: commands/foreigncmds.c:284 commands/foreigncmds.c:890
+#: commands/foreigncmds.c:978 commands/foreigncmds.c:1262
+#: foreign/foreign.c:544
+#, c-format
+msgid "server \"%s\" does not exist"
+msgstr "serwer \"%s\" nie istnieje"
+
+#: commands/foreigncmds.c:346
+#, c-format
+msgid "function %s must return type \"fdw_handler\""
+msgstr "funkcja %s musi zwracać typ \"fdw_handler\""
+
+#: commands/foreigncmds.c:441
+#, c-format
+msgid "permission denied to create foreign-data wrapper \"%s\""
+msgstr "odmowa dostępu do tworzenia opakowania obcych danych \"%s\""
+
+#: commands/foreigncmds.c:443
+msgid "Must be superuser to create a foreign-data wrapper."
+msgstr "Musisz być superużytkownikiem aby tworzyć opakowanie danych obcych."
+
+#: commands/foreigncmds.c:454
+#, c-format
+msgid "foreign-data wrapper \"%s\" already exists"
+msgstr "opakowanie danych obcych \"%s\" już istnieje"
+
+#: commands/foreigncmds.c:554
+#, c-format
+msgid "permission denied to alter foreign-data wrapper \"%s\""
+msgstr "odmowa dostępu do zmiany opakowania danych zewnętrznych \"%s\""
+
+#: commands/foreigncmds.c:556
+msgid "Must be superuser to alter a foreign-data wrapper."
+msgstr "Musisz być superużytkownikiem aby zmienić opakowanie danych obcych."
+
+#: commands/foreigncmds.c:587
+msgid ""
+"changing the foreign-data wrapper handler can change behavior of existing "
+"foreign tables"
+msgstr ""
+"zmiana programu obsługi opakowania danych obcych może zmienić zachowanie "
+"istniejÄ…cych tabel obcych"
+
+#: commands/foreigncmds.c:601
+msgid ""
+"changing the foreign-data wrapper validator can cause the options for "
+"dependent objects to become invalid"
+msgstr ""
+"zmiana walidatora opakowania danych obcych może sprawić, że opcje zależnych "
+"obiektów staną się niepoprawne"
+
+#: commands/foreigncmds.c:703
+#, c-format
+msgid "permission denied to drop foreign-data wrapper \"%s\""
+msgstr "odmowa dostępu do skasowania opakowania danych obcych \"%s\""
+
+#: commands/foreigncmds.c:705
+msgid "Must be superuser to drop a foreign-data wrapper."
+msgstr "Musisz być superużytkownikiem aby skasować opakowanie danych obcych."
+
+#: commands/foreigncmds.c:717
+#, c-format
+msgid "foreign-data wrapper \"%s\" does not exist, skipping"
+msgstr "opakowanie danych obcych \"%s\" nie istnieje, pominięto"
+
+#: commands/foreigncmds.c:786
+#, c-format
+msgid "server \"%s\" already exists"
+msgstr "serwer \"%s\" już istnieje"
+
+#: commands/foreigncmds.c:982
+#, c-format
+msgid "server \"%s\" does not exist, skipping"
+msgstr "serwer \"%s\" nie istnieje, pominięto"
+
+#: commands/foreigncmds.c:1087
+#, c-format
+msgid "user mapping \"%s\" already exists for server %s"
+msgstr "mapowanie użytkownika \"%s\" istnieje już w dla serwera %s"
+
+#: commands/foreigncmds.c:1173 commands/foreigncmds.c:1278
+#, c-format
+msgid "user mapping \"%s\" does not exist for the server"
+msgstr "mapowanie użytkownika \"%s\" nie istnieje dla tego serwera"
+
+#: commands/foreigncmds.c:1265
+msgid "server does not exist, skipping"
+msgstr "serwer nie istnieje, pominięto"
+
+#: commands/foreigncmds.c:1283
+#, c-format
+msgid "user mapping \"%s\" does not exist for the server, skipping"
+msgstr "mapowanie użytkownika \"%s\" nie istnieje dla tego serwera, pominięto"
+
+#: commands/functioncmds.c:100
+#, c-format
+msgid "SQL function cannot return shell type %s"
+msgstr "funkcja SQL nie może zwracać typu powłoki %s"
+
+#: commands/functioncmds.c:105
+#, c-format
+msgid "return type %s is only a shell"
+msgstr "zwrócony typ %s jest jedynie powłoką"
+
+#: commands/functioncmds.c:128 commands/tablecmds.c:224
+#: commands/typecmds.c:660 commands/typecmds.c:2661 parser/parse_func.c:1502
+#: parser/parse_type.c:196 utils/adt/regproc.c:973
+#, c-format
+msgid "type \"%s\" does not exist"
+msgstr "typ \"%s\" nie istnieje"
+
+#: commands/functioncmds.c:134 parser/parse_type.c:278
+#, c-format
+msgid "type modifier cannot be specified for shell type \"%s\""
+msgstr "modyfikator typu nie może być określony dla typu powłoki \"%s\""
+
+#: commands/functioncmds.c:140
+#, c-format
+msgid "type \"%s\" is not yet defined"
+msgstr "typ \"%s\" nie jest jeszcze zdefiniowany"
+
+#: commands/functioncmds.c:141
+msgid "Creating a shell type definition."
+msgstr "Tworzenie definicji typu powłoki."
+
+#: commands/functioncmds.c:220
+#, c-format
+msgid "SQL function cannot accept shell type %s"
+msgstr "funkcja SQL nie może przyjmować typu powłoki %s"
+
+#: commands/functioncmds.c:225
+#, c-format
+msgid "argument type %s is only a shell"
+msgstr "typ argumentu %s jest jedynie powłoką"
+
+#: commands/functioncmds.c:235
+#, c-format
+msgid "type %s does not exist"
+msgstr "typ %s nie istnieje"
+
+#: commands/functioncmds.c:243
+msgid "functions cannot accept set arguments"
+msgstr "funkcje nie mogą przyjmować grupy argumentów"
+
+#: commands/functioncmds.c:252
+msgid "VARIADIC parameter must be the last input parameter"
+msgstr "parametr VARIADIC musi być ostatnim parametrem wejścia"
+
+#: commands/functioncmds.c:279
+msgid "VARIADIC parameter must be an array"
+msgstr "parametr VARIADIC nie może być typu tablicowego"
+
+#: commands/functioncmds.c:319
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "nazwa parametru \"%s\" użyta więcej niż raz"
+
+#: commands/functioncmds.c:334
+msgid "only input parameters can have default values"
+msgstr "tylko parametry wejścia mogą posiadać wartości domyślne"
+
+#: commands/functioncmds.c:347
+msgid "cannot use table references in parameter default value"
+msgstr "nie można użyć odwołania do tabeli w domyślnej wartości parametru"
+
+#: commands/functioncmds.c:363
+msgid "cannot use subquery in parameter default value"
+msgstr "nie można używać podzapytań w wartości domyślnej parametru"
+
+#: commands/functioncmds.c:367
+msgid "cannot use aggregate function in parameter default value"
+msgstr "nie można użyć funkcji agregującej w wartości domyślnej parametru"
+
+#: commands/functioncmds.c:371
+msgid "cannot use window function in parameter default value"
+msgstr "nie można użyć funkcji okna w wartości domyślnej parametru"
+
+#: commands/functioncmds.c:381
+msgid "input parameters after one with a default value must also have defaults"
+msgstr ""
+"parametry wejścia po posiadającym wartość domyślną muszą również posiadać "
+"wartości domyślne"
+
+#: commands/functioncmds.c:620
+msgid "no function body specified"
+msgstr "nie określono ciała funkcji"
+
+#: commands/functioncmds.c:630
+msgid "no language specified"
+msgstr "nie określono języka"
+
+#: commands/functioncmds.c:651 commands/functioncmds.c:1352
+msgid "COST must be positive"
+msgstr "COST musi być dodatni"
+
+#: commands/functioncmds.c:659 commands/functioncmds.c:1360
+msgid "ROWS must be positive"
+msgstr "ROWS musi być dodatni"
+
+#: commands/functioncmds.c:698
+#, c-format
+msgid "unrecognized function attribute \"%s\" ignored"
+msgstr "pominięto nierozpoznany atrybut \"%s\" funkcji"
+
+#: commands/functioncmds.c:749
+#, c-format
+msgid "only one AS item needed for language \"%s\""
+msgstr "wyłącznie jeden element AS jest wymagany dla języka \"%s\""
+
+#: commands/functioncmds.c:839 commands/functioncmds.c:2019
+#: commands/proclang.c:600 commands/proclang.c:640 commands/proclang.c:754
+#, c-format
+msgid "language \"%s\" does not exist"
+msgstr "język \"%s\" nie istnieje"
+
+#: commands/functioncmds.c:841 commands/functioncmds.c:2021
+msgid "Use CREATE LANGUAGE to load the language into the database."
+msgstr "Użyj CREATE LANGUAGE aby załadować język do bazy danych."
+
+#: commands/functioncmds.c:888
+#, c-format
+msgid "function result type must be %s because of OUT parameters"
+msgstr "wynik funkcji musi być typu %s ze względu na parametry OUT"
+
+#: commands/functioncmds.c:901
+msgid "function result type must be specified"
+msgstr "wynik funkcji musi być określony"
+
+#: commands/functioncmds.c:936 commands/functioncmds.c:1364
+msgid "ROWS is not applicable when function does not return a set"
+msgstr "ROWS nie jest odpowiedni gdy funkcja nie zwraca zbioru"
+
+#: commands/functioncmds.c:988
+#, c-format
+msgid "function %s(%s) does not exist, skipping"
+msgstr "funkcja %s(%s) nie istnieje, pominięto"
+
+#: commands/functioncmds.c:1008 commands/functioncmds.c:1108
+#: commands/functioncmds.c:1171 commands/functioncmds.c:1322
+#: utils/adt/ruleutils.c:1696
+#, c-format
+msgid "\"%s\" is an aggregate function"
+msgstr "\"%s\" jest funkcjÄ… agregujÄ…cÄ…"
+
+#: commands/functioncmds.c:1010
+msgid "Use DROP AGGREGATE to drop aggregate functions."
+msgstr "Użyj DROP AGGREGATE aby usunąć funkcje agregujące."
+
+#: commands/functioncmds.c:1017
+#, c-format
+msgid "removing built-in function \"%s\""
+msgstr "usuwanie wbudowanej funkcji \"%s\""
+
+#: commands/functioncmds.c:1110
+msgid "Use ALTER AGGREGATE to rename aggregate functions."
+msgstr "Użyj ALTER AGGREGATE aby zmienić nazwy funkcji agregujących."
+
+#: commands/functioncmds.c:1173
+msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
+msgstr "Użyj ALTER AGGREGATE aby zmienić właściciela funkcji agregujących."
+
+#: commands/functioncmds.c:1512
+#, c-format
+msgid "source data type %s is a pseudo-type"
+msgstr "źródłowy typ danych %s jest pseudo-typem"
+
+#: commands/functioncmds.c:1518
+#, c-format
+msgid "target data type %s is a pseudo-type"
+msgstr "docelowy typ danych %s jest pseudo-typem"
+
+#: commands/functioncmds.c:1555
+msgid "cast function must take one to three arguments"
+msgstr "funkcja rzutująca musi przyjmować od jednego do trzech argumentów"
+
+#: commands/functioncmds.c:1559
+msgid ""
+"argument of cast function must match or be binary-coercible from source data "
+"type"
+msgstr ""
+"argumenty funkcji rzutującej muszą pasować lub być binarnie zgodne ze "
+"źródłowym typem danych"
+
+#: commands/functioncmds.c:1563
+msgid "second argument of cast function must be type integer"
+msgstr "drugi argument funkcji rzutującej musi być typu całkowitego"
+
+#: commands/functioncmds.c:1567
+msgid "third argument of cast function must be type boolean"
+msgstr "trzeci argument funkcji rzutującej musi być typu logicznego"
+
+#: commands/functioncmds.c:1571
+msgid ""
+"return data type of cast function must match or be binary-coercible to "
+"target data type"
+msgstr ""
+"zwracany typ danych funkcji rzutującej musi pasować lub być binarnie zgodny "
+"z docelowym typem danych"
+
+#: commands/functioncmds.c:1582
+msgid "cast function must not be volatile"
+msgstr "funkcja rzutująca nie może być zmienna"
+
+#: commands/functioncmds.c:1587
+msgid "cast function must not be an aggregate function"
+msgstr "funkcja rzutująca nie może być funkcją agregującą"
+
+#: commands/functioncmds.c:1591
+msgid "cast function must not be a window function"
+msgstr "funkcja rzutująca nie może być funkcją okna"
+
+#: commands/functioncmds.c:1595
+msgid "cast function must not return a set"
+msgstr "funkcja rzutująca nie może zwracać grupy"
+
+#: commands/functioncmds.c:1621
+msgid "must be superuser to create a cast WITHOUT FUNCTION"
+msgstr "musisz być superużytkownikiem aby utworzyć rzutowanie WITHOUT FUNCTION"
+
+#: commands/functioncmds.c:1636
+msgid "source and target data types are not physically compatible"
+msgstr "źródłowy i docelowy typ danych nie są fizycznie kompatybilne"
+
+#: commands/functioncmds.c:1651
+msgid "composite data types are not binary-compatible"
+msgstr "złożone typy danych nie są binarnie kompatybilne"
+
+#: commands/functioncmds.c:1657
+msgid "enum data types are not binary-compatible"
+msgstr "enumeracyjne typy danych nie sÄ… binarnie kompatybilne"
+
+#: commands/functioncmds.c:1663
+msgid "array data types are not binary-compatible"
+msgstr "tablicowe typy danych nie sÄ… binarnie kompatybilne"
+
+#: commands/functioncmds.c:1680
+msgid "domain data types must not be marked binary-compatible"
+msgstr ""
+"domenowe typy danych nie mogą być zaznaczone jako binarnie kompatybilne"
+
+#: commands/functioncmds.c:1690
+msgid "source data type and target data type are the same"
+msgstr "źródłowy typ danych i docelowy typ danych są takie same"
+
+#: commands/functioncmds.c:1723
+#, c-format
+msgid "cast from type %s to type %s already exists"
+msgstr "rzutowanie z typu %s na typ %s już istnieje"
+
+#: commands/functioncmds.c:1803
+#, c-format
+msgid "cast from type %s to type %s does not exist, skipping"
+msgstr "rzutowanie z typu %s na typ %s nie istnieje, pominięto"
+
+#: commands/functioncmds.c:1841
+#, c-format
+msgid "cast from type %s to type %s does not exist"
+msgstr "rzutowanie z typu %s do typu %s nie istnieje"
+
+#: commands/functioncmds.c:1929
+#, c-format
+msgid "function \"%s\" already exists in schema \"%s\""
+msgstr "funkcja \"%s\" już istnieje w schemacie \"%s\""
+
+#: commands/functioncmds.c:2003
+msgid "no inline code specified"
+msgstr "nie określono kodu wbudowanego"
+
+#: commands/functioncmds.c:2051
+#, c-format
+msgid "language \"%s\" does not support inline code execution"
+msgstr "język \"%s\" nie obsługuje wykonywania kodu wbudowanego"
+
+#: commands/indexcmds.c:163
+msgid "must specify at least one column"
+msgstr "musi określać przynajmniej jedną kolumnę"
+
+#: commands/indexcmds.c:167
+#, c-format
+msgid "cannot use more than %d columns in an index"
+msgstr "nie można użyć więcej niż %d kolumn w indeksie"
+
+#: commands/indexcmds.c:195
+#, c-format
+msgid "cannot create index on foreign table \"%s\""
+msgstr "nie można utworzyć indeksu na tabeli obcej \"%s\""
+
+#: commands/indexcmds.c:210
+msgid "cannot create indexes on temporary tables of other sessions"
+msgstr "nie można tworzyć indeksów na tabelach tymczasowych z innych sesji"
+
+#: commands/indexcmds.c:265 commands/tablecmds.c:479 commands/tablecmds.c:7882
+msgid "only shared relations can be placed in pg_global tablespace"
+msgstr ""
+"tylko relacje współdzielone mogą być umieszczone w przestrzeni tabel "
+"pg_global"
+
+#: commands/indexcmds.c:296
+msgid "substituting access method \"gist\" for obsolete method \"rtree\""
+msgstr "zastąpienie metodą dostępu \"gist\" przestarzałej metody \"rtree\""
+
+#: commands/indexcmds.c:304 commands/opclasscmds.c:369
+#: commands/opclasscmds.c:790 commands/opclasscmds.c:2203
+#, c-format
+msgid "access method \"%s\" does not exist"
+msgstr "metoda dostępu \"%s\" nie istnieje"
+
+#: commands/indexcmds.c:313
+#, c-format
+msgid "access method \"%s\" does not support unique indexes"
+msgstr "metoda dostępu \"%s\" nie obsługuje indeksów unikalnych"
+
+#: commands/indexcmds.c:318
+#, c-format
+msgid "access method \"%s\" does not support multicolumn indexes"
+msgstr "metoda dostępu \"%s\" nie obsługuje indeksów wielokolumnowych"
+
+#: commands/indexcmds.c:323
+#, c-format
+msgid "access method \"%s\" does not support exclusion constraints"
+msgstr "metoda dostępu \"%s\" nie obsługuje ograniczeń wykluczających"
+
+#: commands/indexcmds.c:399
+#, c-format
+msgid "%s %s will create implicit index \"%s\" for table \"%s\""
+msgstr "%s %s utworzy niejawny indeks \"%s\" na tabeli \"%s\""
+
+#: commands/indexcmds.c:763
+msgid "cannot use subquery in index predicate"
+msgstr "nie można używać podzapytań w predykacie indeksu"
+
+#: commands/indexcmds.c:767
+msgid "cannot use aggregate in index predicate"
+msgstr "nie można używać agregatu w predykacie indeksu"
+
+#: commands/indexcmds.c:776
+msgid "functions in index predicate must be marked IMMUTABLE"
+msgstr "funkcje w predykacie indeksu muszą być oznaczone jako IMMUTABLE"
+
+#: commands/indexcmds.c:841 parser/parse_utilcmd.c:1704
+#, c-format
+msgid "column \"%s\" named in key does not exist"
+msgstr "kolumna \"%s\" nazwana w kluczu nie istnieje"
+
+#: commands/indexcmds.c:894
+msgid "cannot use subquery in index expression"
+msgstr "nie można użyć podzapytania w wyrażeniu indeksu"
+
+#: commands/indexcmds.c:898
+msgid "cannot use aggregate function in index expression"
+msgstr "nie można użyć funkcji agregującej w wyrażeniu indeksu"
+
+#: commands/indexcmds.c:909
+msgid "functions in index expression must be marked IMMUTABLE"
+msgstr "funkcje w wyrażeniu indeksu muszą być oznaczone jako IMMUTABLE"
+
+#: commands/indexcmds.c:930
+msgid "could not determine which collation to use for index expression"
+msgstr "nie można określić, jakiego porównania użyć dla wyrażenia indeksu"
+
+#: commands/indexcmds.c:938 commands/typecmds.c:843 parser/parse_expr.c:2143
+#: parser/parse_type.c:492 parser/parse_utilcmd.c:2556
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "rzutowania nie są obsługiwane przez typ %s"
+
+#: commands/indexcmds.c:976
+#, c-format
+msgid "operator %s is not commutative"
+msgstr "operator %s nie jest przemienny"
+
+#: commands/indexcmds.c:978
+msgid "Only commutative operators can be used in exclusion constraints."
+msgstr ""
+"Tylko operatory przemienne mogą być używane w ograniczeniach wykluczających."
+
+#: commands/indexcmds.c:1004
+#, c-format
+msgid "operator %s is not a member of operator family \"%s\""
+msgstr "operator %s nie jest członkiem rodziny operatorów \"%s\""
+
+#: commands/indexcmds.c:1007
+#, fuzzy
+msgid ""
+"The exclusion operator must be related to the index operator class for the "
+"constraint."
+msgstr ""
+"Operator wykluczający musi być powiązany z klasą operatora indeksu do "
+"ograniczenia."
+
+#: commands/indexcmds.c:1042
+#, c-format
+msgid "access method \"%s\" does not support ASC/DESC options"
+msgstr "metoda dostępu \"%s\" nie obsługuje opcji ASC/DESC"
+
+#: commands/indexcmds.c:1047
+#, c-format
+msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
+msgstr "metoda dostępu \"%s\" nie obsługuje opcji NULLS FIRST/LAST"
+
+#: commands/indexcmds.c:1103
+#, c-format
+msgid "data type %s has no default operator class for access method \"%s\""
+msgstr ""
+"typ danych %s nie ma domyślnej klasy operatora dla metody dostępu \"%s\""
+
+#: commands/indexcmds.c:1105
+msgid ""
+"You must specify an operator class for the index or define a default "
+"operator class for the data type."
+msgstr ""
+"Musisz wskazać klasę operatora dla indeksu lub zdefiniować domyślną klasę "
+"operatora dla typu danych."
+
+#: commands/indexcmds.c:1134 commands/indexcmds.c:1142
+#: commands/opclasscmds.c:212 commands/opclasscmds.c:1568
+#, c-format
+msgid "operator class \"%s\" does not exist for access method \"%s\""
+msgstr "klasa operatora \"%s\" nie istnieje dla metody dostępu \"%s\""
+
+#: commands/indexcmds.c:1155
+#, c-format
+msgid "operator class \"%s\" does not accept data type %s"
+msgstr "klasa operatora \"%s\" nie akceptuje typu danych %s"
+
+#: commands/indexcmds.c:1245
+#, c-format
+msgid "there are multiple default operator classes for data type %s"
+msgstr "jest wiele domyślnych klas operatorów dla typu danych %s"
+
+#: commands/indexcmds.c:1586
+#, c-format
+msgid "table \"%s\" has no indexes"
+msgstr "tabela \"%s\" nie posiada indeksów"
+
+#: commands/indexcmds.c:1614
+msgid "can only reindex the currently open database"
+msgstr "nie można przeindeksować aktualnie otwartej bazy danych"
+
+#: commands/indexcmds.c:1699
+#, c-format
+msgid "table \"%s.%s\" was reindexed"
+msgstr "tabela \"%s.%s\" została przeindeksowana"
+
+#: commands/lockcmds.c:93
+#, c-format
+msgid "could not obtain lock on relation \"%s\""
+msgstr "nie można nałożyć blokady na relację \"%s\""
+
+#: commands/lockcmds.c:98
+#, c-format
+msgid "could not obtain lock on relation with OID %u"
+msgstr "nie można nałożyć blokady na relację z OID %u"
+
+#: commands/opclasscmds.c:136 commands/opclasscmds.c:1619
+#: commands/opclasscmds.c:1839 commands/opclasscmds.c:1850
+#: commands/opclasscmds.c:2084 commands/opclasscmds.c:2095
+#, c-format
+msgid "operator family \"%s\" does not exist for access method \"%s\""
+msgstr "rodzina operatora \"%s\" nie istnieje dla metody dostępu \"%s\""
+
+#: commands/opclasscmds.c:271
+#, c-format
+msgid "operator family \"%s\" for access method \"%s\" already exists"
+msgstr "rodzina operatora \"%s\" dla metody dostępu \"%s\" już istnieje"
+
+#: commands/opclasscmds.c:408
+msgid "must be superuser to create an operator class"
+msgstr "musisz być superużytkownikiem aby utworzyć klasę operatora"
+
+#: commands/opclasscmds.c:480 commands/opclasscmds.c:864
+#: commands/opclasscmds.c:994
+#, c-format
+msgid "invalid operator number %d, must be between 1 and %d"
+msgstr "niepoprawny numer operatora %d, musi być pomiędzy 1 a %d"
+
+#: commands/opclasscmds.c:531 commands/opclasscmds.c:915
+#: commands/opclasscmds.c:1009
+#, c-format
+msgid "invalid procedure number %d, must be between 1 and %d"
+msgstr "niepoprawny numer procedury %d, musi być pomiędzy 1 a %d"
+
+#: commands/opclasscmds.c:561
+msgid "storage type specified more than once"
+msgstr "typ składowania określony więcej niż raz"
+
+#: commands/opclasscmds.c:589
+#, c-format
+msgid ""
+"storage type cannot be different from data type for access method \"%s\""
+msgstr ""
+"typ składowania nie może być inny niż ten z typu danych dla metody dostępu "
+"\"%s\""
+
+#: commands/opclasscmds.c:605
+#, c-format
+msgid "operator class \"%s\" for access method \"%s\" already exists"
+msgstr "klasa operatora \"%s\" dla metody dostępu \"%s\" już istnieje"
+
+#: commands/opclasscmds.c:633
+#, c-format
+msgid "could not make operator class \"%s\" be default for type %s"
+msgstr "nie można uczynić klasy operatora \"%s\" domyślną dla typu %s"
+
+#: commands/opclasscmds.c:636
+#, c-format
+msgid "Operator class \"%s\" already is the default."
+msgstr "Klasa operatora \"%s\" jest już domyślna."
+
+#: commands/opclasscmds.c:760
+msgid "must be superuser to create an operator family"
+msgstr "musisz być superużytkownikiem aby utworzyć rodzinę operatora"
+
+#: commands/opclasscmds.c:816
+msgid "must be superuser to alter an operator family"
+msgstr "musisz być superużytkownikiem aby zmienić rodzinę operatora"
+
+#: commands/opclasscmds.c:880
+msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
+msgstr "typy argumentów operatora muszą być wskazane w ALTER OPERATOR FAMILY"
+
+#: commands/opclasscmds.c:944
+msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
+msgstr "STORAGE nie może być wskazana w ALTER OPERATOR FAMILY"
+
+#: commands/opclasscmds.c:1060
+msgid "one or two argument types must be specified"
+msgstr "jeden lub wiele typów argumentów musi być wskazane"
+
+#: commands/opclasscmds.c:1086
+msgid "index operators must be binary"
+msgstr "operatory indeksowe muszą być binarne"
+
+#: commands/opclasscmds.c:1111
+#, c-format
+msgid "access method \"%s\" does not support ordering operators"
+msgstr "metoda dostępu \"%s\" nie obsługuje operatorów porządkujących"
+
+#: commands/opclasscmds.c:1124
+msgid "index search operators must return boolean"
+msgstr "operatory przeszukiwania indeksu muszą zwracać wartości logiczne"
+
+#: commands/opclasscmds.c:1163
+msgid "btree procedures must have two arguments"
+msgstr "procedury btree muszą być dwuargumentowe"
+
+#: commands/opclasscmds.c:1167
+msgid "btree procedures must return integer"
+msgstr "procedury btree muszą zwracać wartości całkowite"
+
+#: commands/opclasscmds.c:1182
+msgid "hash procedures must have one argument"
+msgstr "procedury haszujące muszą być jednoargumentowe"
+
+#: commands/opclasscmds.c:1186
+msgid "hash procedures must return integer"
+msgstr "procedury haszujące muszą zwracać wartości całkowite"
+
+#: commands/opclasscmds.c:1211
+msgid "associated data types must be specified for index support procedure"
+msgstr ""
+"powiązane typy danych muszą być określone dla procedury wsparcia indeksu"
+
+#: commands/opclasscmds.c:1237
+#, c-format
+msgid "procedure number %d for (%s,%s) appears more than once"
+msgstr "numer procedury %d dla (%s,%s) pojawia się więcej niż raz"
+
+#: commands/opclasscmds.c:1244
+#, c-format
+msgid "operator number %d for (%s,%s) appears more than once"
+msgstr "numer operatora %d dla (%s,%s) pojawia się więcej niż raz"
+
+#: commands/opclasscmds.c:1293
+#, c-format
+msgid "operator %d(%s,%s) already exists in operator family \"%s\""
+msgstr "operator %d(%s,%s) już istnieje w rodzinie operatorów \"%s\""
+
+#: commands/opclasscmds.c:1406
+#, c-format
+msgid "function %d(%s,%s) already exists in operator family \"%s\""
+msgstr "funkcja %d(%s,%s) już istnieje w rodzinie operatorów \"%s\""
+
+#: commands/opclasscmds.c:1493
+#, c-format
+msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
+msgstr "operator %d(%s,%s) nie istnieje w rodzinie operatorów \"%s\""
+
+#: commands/opclasscmds.c:1533
+#, c-format
+msgid "function %d(%s,%s) does not exist in operator family \"%s\""
+msgstr "funkcja %d(%s,%s) nie istnieje w rodzinie operatorów \"%s\""
+
+#: commands/opclasscmds.c:1779
+#, c-format
+msgid ""
+"operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
+msgstr ""
+"klasa operatora \"%s\" dla metody dostępu \"%s\" już istnieje w schemacie "
+"\"%s\""
+
+#: commands/opclasscmds.c:1868
+#, c-format
+msgid ""
+"operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
+msgstr ""
+"rodzina operatora \"%s\" dla metody dostępu \"%s\" już istnieje w schemacie "
+"\"%s\""
+
+#: commands/operatorcmds.c:100
+msgid "=> is deprecated as an operator name"
+msgstr "=> jest przestarzały jako nazwa operatora"
+
+#: commands/operatorcmds.c:101
+msgid ""
+"This name may be disallowed altogether in future versions of PostgreSQL."
+msgstr ""
+"Ta nazwa może być zupełnie niedozwolona w przyszłych wersjach PostgreSQL."
+
+#: commands/operatorcmds.c:122 commands/operatorcmds.c:130
+msgid "SETOF type not allowed for operator argument"
+msgstr "typ SETOF niedozwolony jako argument operatora"
+
+#: commands/operatorcmds.c:158
+#, c-format
+msgid "operator attribute \"%s\" not recognized"
+msgstr "atrybut operatora \"%s\" nie rozpoznany"
+
+#: commands/operatorcmds.c:168
+msgid "operator procedure must be specified"
+msgstr "musi być wskazana procedura operatora"
+
+#: commands/operatorcmds.c:179
+msgid "at least one of leftarg or rightarg must be specified"
+msgstr "musi być wskazany co najmniej jeden lewyarg lub prawyarg"
+
+#: commands/operatorcmds.c:228
+#, c-format
+msgid "restriction estimator function %s must return type \"float8\""
+msgstr "funkcja estymatora ograniczenia %s musi zwracać typ \"float8\""
+
+#: commands/operatorcmds.c:267
+#, c-format
+msgid "join estimator function %s must return type \"float8\""
+msgstr "funkcja estymatora złączenia %s musi zwracać typ \"float8\""
+
+#: commands/operatorcmds.c:318
+#, c-format
+msgid "operator %s does not exist, skipping"
+msgstr "operator %s nie istnieje, pominięto"
+
+#: commands/portalcmds.c:61 commands/portalcmds.c:160
+#: commands/portalcmds.c:212
+msgid "invalid cursor name: must not be empty"
+msgstr "niepoprawna nazwa kursora: nie może być pusta"
+
+#: commands/portalcmds.c:168 commands/portalcmds.c:222
+#: executor/execCurrent.c:66 utils/adt/xml.c:2046 utils/adt/xml.c:2210
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "kursor \"%s\" nie istnieje"
+
+#: commands/portalcmds.c:336 tcop/pquery.c:738 tcop/pquery.c:1401
+#, c-format
+msgid "portal \"%s\" cannot be run"
+msgstr "portal \"%s\" nie może być uruchomiony"
+
+#: commands/portalcmds.c:409
+msgid "could not reposition held cursor"
+msgstr "nie można zmienić pozycji trzymanego kursora"
+
+#: commands/prepare.c:71
+msgid "invalid statement name: must not be empty"
+msgstr "niepoprawna nazwa wyrażenia: nie może być pusta"
+
+#: commands/prepare.c:122 tcop/postgres.c:1267 parser/parse_param.c:303
+#, c-format
+msgid "could not determine data type of parameter $%d"
+msgstr "nie można określić typu danych parametru $%d"
+
+#: commands/prepare.c:140
+msgid "utility statements cannot be prepared"
+msgstr "nie można przygotować wyrażeń narzędzia"
+
+#: commands/prepare.c:240 commands/prepare.c:247 commands/prepare.c:706
+msgid "prepared statement is not a SELECT"
+msgstr "przygotowane wyrażenie to nie SELECT"
+
+#: commands/prepare.c:314
+#, c-format
+msgid "wrong number of parameters for prepared statement \"%s\""
+msgstr "niepoprawna liczba parametrów dla przygotowanego wyrażenia \"%s\""
+
+#: commands/prepare.c:316
+#, c-format
+msgid "Expected %d parameters but got %d."
+msgstr "Oczekiwano %d parametrów ale otrzymano %d."
+
+#: commands/prepare.c:345
+msgid "cannot use subquery in EXECUTE parameter"
+msgstr "nie można używać podzapytań w parametrze EXECUTE"
+
+#: commands/prepare.c:349
+msgid "cannot use aggregate function in EXECUTE parameter"
+msgstr "nie można użyć funkcji agregującej w parametrze EXECUTE"
+
+#: commands/prepare.c:353
+msgid "cannot use window function in EXECUTE parameter"
+msgstr "nie można użyć funkcji okna w parametrze EXECUTE"
+
+#: commands/prepare.c:366
+#, c-format, fuzzy
+msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
+msgstr "parametr $%d typu %s nie może być nagięty do oczekiwanego typu %s"
+
+#: commands/prepare.c:467
+#, c-format
+msgid "prepared statement \"%s\" already exists"
+msgstr "przygotowane wyrażenie \"%s\" już istnieje"
+
+#: commands/prepare.c:525
+#, c-format
+msgid "prepared statement \"%s\" does not exist"
+msgstr "przygotowane wyrażenie \"%s\" nie istnieje"
+
+#: commands/prepare.c:751 commands/extension.c:1675 commands/extension.c:1784
+#: commands/extension.c:1977 executor/execQual.c:1613 executor/execQual.c:1638
+#: executor/execQual.c:1999 executor/execQual.c:5115 executor/functions.c:785
+#: foreign/foreign.c:350 replication/walsender.c:1410
+#: utils/mmgr/portalmem.c:946 utils/fmgr/funcapi.c:60
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"funkcja zwracająca zbiór rekordów wywołana w kontekście, w którym nie jest "
+"to dopuszczalne"
+
+#: commands/prepare.c:755 commands/extension.c:1679 commands/extension.c:1788
+#: commands/extension.c:1981 foreign/foreign.c:355
+#: replication/walsender.c:1414 utils/mmgr/portalmem.c:950
+msgid "materialize mode required, but it is not allowed in this context"
+msgstr ""
+"wymagany jest tryb materializacji, jednak nie jest on dopuszczalny w tym "
+"kontekście"
+
+#: commands/user.c:143
+msgid "SYSID can no longer be specified"
+msgstr "SYSID nie może być dłużej określony"
+
+#: commands/user.c:284
+msgid "must be superuser to create superusers"
+msgstr "musisz być superużytkownikiem aby tworzyć superużytkowników"
+
+#: commands/user.c:291
+msgid "must be superuser to create replication users"
+msgstr "musisz być superużytkownikiem aby tworzyć użytkowników replikacji"
+
+#: commands/user.c:298
+msgid "permission denied to create role"
+msgstr "odmowa dostępu do tworzenia roli"
+
+#: commands/user.c:305 commands/user.c:1087
+#, c-format
+msgid "role name \"%s\" is reserved"
+msgstr "nazwa roli \"%s\" jest zarezerwowana"
+
+#: commands/user.c:318 commands/user.c:1081
+#, c-format
+msgid "role \"%s\" already exists"
+msgstr "rola \"%s\" już istnieje"
+
+#: commands/user.c:623 commands/user.c:825 commands/user.c:905
+#: commands/user.c:1056 commands/variable.c:882 commands/variable.c:954
+#: utils/init/miscinit.c:432 utils/adt/acl.c:4822
+#, c-format
+msgid "role \"%s\" does not exist"
+msgstr "rola \"%s\" nie istnieje"
+
+#: commands/user.c:636 commands/user.c:842 commands/user.c:1321
+#: commands/user.c:1458
+msgid "must be superuser to alter superusers"
+msgstr "musisz być superużytkownikiem aby zmieniać superużytkowników"
+
+#: commands/user.c:643
+msgid "must be superuser to alter replication users"
+msgstr "musisz być superużytkownikiem aby zmieniać użytkowników replikacji"
+
+#: commands/user.c:659 commands/user.c:850
+msgid "permission denied"
+msgstr "odmowa dostępu"
+
+#: commands/user.c:878
+msgid "permission denied to drop role"
+msgstr "odmowa dostępu do skasowania roli"
+
+#: commands/user.c:910
+#, c-format
+msgid "role \"%s\" does not exist, skipping"
+msgstr "rola \"%s\" nie istnieje, pominięto"
+
+#: commands/user.c:922 commands/user.c:926
+msgid "current user cannot be dropped"
+msgstr "aktualny użytkownik nie może być usunięty"
+
+#: commands/user.c:930
+msgid "session user cannot be dropped"
+msgstr "użytkownik sesji nie może być usunięty"
+
+#: commands/user.c:941
+msgid "must be superuser to drop superusers"
+msgstr "musisz być superużytkownikiem aby usuwać superużytkowników"
+
+#: commands/user.c:954
+#, c-format
+msgid "role \"%s\" cannot be dropped because some objects depend on it"
+msgstr ""
+"rola \"%s\" nie może być usunięta ponieważ istnieją zależne od niej obiekty"
+
+#: commands/user.c:1071
+msgid "session user cannot be renamed"
+msgstr "nazwa użytkownika sesji nie może być zmieniona"
+
+#: commands/user.c:1075
+msgid "current user cannot be renamed"
+msgstr "nazwa aktualnego użytkownika nie może być zmieniona"
+
+#: commands/user.c:1098
+msgid "must be superuser to rename superusers"
+msgstr "musisz być superużytkownikiem aby zmieniać nazwy superużytkowników"
+
+#: commands/user.c:1105
+msgid "permission denied to rename role"
+msgstr "odmowa dostępu do zmiany nazwy roli"
+
+#: commands/user.c:1126
+msgid "MD5 password cleared because of role rename"
+msgstr "hasło MD5 zostało wyczyszczone ponieważ zmieniono nazwę roli"
+
+#: commands/user.c:1182
+msgid "column names cannot be included in GRANT/REVOKE ROLE"
+msgstr "nazwy kolumn nie mogą być zawarte w GRANT/REVOKE ROLE"
+
+#: commands/user.c:1220
+msgid "permission denied to drop objects"
+msgstr "odmowa dostępu do usunięcia obiektów"
+
+#: commands/user.c:1247 commands/user.c:1256
+msgid "permission denied to reassign objects"
+msgstr "odmowa dostępu do ponownego przypisania obiektów"
+
+#: commands/user.c:1329 commands/user.c:1466
+#, c-format
+msgid "must have admin option on role \"%s\""
+msgstr "musisz mieć opcję administratora na roli \"%s\""
+
+#: commands/user.c:1337
+msgid "must be superuser to set grantor"
+msgstr "musisz być superużytkownikiem by ustawić prawo nadawania uprawnień"
+
+#: commands/user.c:1362
+#, c-format
+msgid "role \"%s\" is a member of role \"%s\""
+msgstr "rola \"%s\" jest członkiem roli \"%s\""
+
+#: commands/user.c:1377
+#, c-format
+msgid "role \"%s\" is already a member of role \"%s\""
+msgstr "rola \"%s\" jest już członkiem roli \"%s\""
+
+#: commands/user.c:1488
+#, c-format
+msgid "role \"%s\" is not a member of role \"%s\""
+msgstr "rola \"%s\" nie jest członkiem roli \"%s\""
+
+#: commands/proclang.c:93
+msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
+msgstr "użycie informacji pg_pltemplate zamiast parametrów CREATE LANGUAGE"
+
+#: commands/proclang.c:103
+#, c-format
+msgid "must be superuser to create procedural language \"%s\""
+msgstr "musisz być superużytkownikiem aby stworzyć język proceduralny \"%s\""
+
+#: commands/proclang.c:123 commands/proclang.c:279
+#, c-format
+msgid "function %s must return type \"language_handler\""
+msgstr "funkcja %s musi zwracać typ \"language_handler\""
+
+#: commands/proclang.c:243
+#, c-format
+msgid "unsupported language \"%s\""
+msgstr "nieobsługiwany język \"%s\""
+
+#: commands/proclang.c:245
+msgid "The supported languages are listed in the pg_pltemplate system catalog."
+msgstr "Obsługiwane języki są wymienione w katalogu systemowym pg_pltemplate."
+
+#: commands/proclang.c:253
+msgid "must be superuser to create custom procedural language"
+msgstr "musisz być superużytkownikiem aby stworzyć własny język proceduralny"
+
+#: commands/proclang.c:272
+#, c-format
+msgid ""
+"changing return type of function %s from \"opaque\" to \"language_handler\""
+msgstr ""
+"zmiana typu zwracanego przez funkcjÄ™ %s z \"opaque\" na \"language_handler\""
+
+#: commands/proclang.c:357 commands/proclang.c:606
+#, c-format
+msgid "language \"%s\" already exists"
+msgstr "język \"%s\" już istnieje"
+
+#: commands/proclang.c:537
+#, c-format
+msgid "language \"%s\" does not exist, skipping"
+msgstr "język \"%s\" nie istnieje, pominięto"
+
+#: commands/schemacmds.c:82 commands/schemacmds.c:275
+#, c-format
+msgid "unacceptable schema name \"%s\""
+msgstr "nieprawidłowa nazwa schematu \"%s\""
+
+#: commands/schemacmds.c:83 commands/schemacmds.c:276
+msgid "The prefix \"pg_\" is reserved for system schemas."
+msgstr "Prefiks \"pg_\" jest zarezerwowany dla schematów systemowych."
+
+#: commands/schemacmds.c:186
+#, c-format
+msgid "schema \"%s\" does not exist, skipping"
+msgstr "schemat \"%s\" nie istnieje, pominięto"
+
+#: commands/sequence.c:126
+msgid "unlogged sequences are not supported"
+msgstr "nielogowane sekwencje nie są obsługiwane"
+
+#: commands/sequence.c:634
+#, c-format
+msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
+msgstr "nextval: osiągnięto maksymalną wartość sekwencji \"%s\" (%s)"
+
+#: commands/sequence.c:657
+#, c-format
+msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
+msgstr "nextval: osiągnięto minimalną wartość sekwencji \"%s\" (%s)"
+
+#: commands/sequence.c:755
+#, c-format
+msgid "currval of sequence \"%s\" is not yet defined in this session"
+msgstr "currval sekwencji \"%s\" nie jest jeszcze zdefiniowana w tej sesji"
+
+#: commands/sequence.c:774 commands/sequence.c:780
+msgid "lastval is not yet defined in this session"
+msgstr "lastval nie jest jeszcze zdefiniowana w tej sesji"
+
+#: commands/sequence.c:848
+#, c-format
+msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
+msgstr "setval: wartość %s jest poza zakresem sekwencji \"%s\" (%s..%s)"
+
+#: commands/sequence.c:1017 lib/stringinfo.c:266 libpq/auth.c:1022
+#: libpq/auth.c:1382 libpq/auth.c:1450 libpq/auth.c:1852
+#: storage/ipc/procarray.c:784 storage/ipc/procarray.c:1183
+#: storage/ipc/procarray.c:1190 storage/ipc/procarray.c:1425
+#: storage/ipc/procarray.c:1819 storage/buffer/buf_init.c:154
+#: storage/buffer/localbuf.c:350 storage/file/fd.c:358 storage/file/fd.c:742
+#: storage/file/fd.c:860 postmaster/postmaster.c:2004
+#: postmaster/postmaster.c:2035 postmaster/postmaster.c:3232
+#: postmaster/postmaster.c:3916 postmaster/postmaster.c:3997
+#: postmaster/postmaster.c:4611 utils/init/miscinit.c:150
+#: utils/init/miscinit.c:171 utils/init/miscinit.c:181
+#: utils/adt/formatting.c:1529 utils/adt/formatting.c:1650
+#: utils/adt/formatting.c:1783 utils/adt/regexp.c:210 utils/adt/varlena.c:3474
+#: utils/adt/varlena.c:3495 utils/mmgr/aset.c:416 utils/mmgr/aset.c:587
+#: utils/mmgr/aset.c:765 utils/mmgr/aset.c:966 utils/fmgr/dfmgr.c:224
+#: utils/hash/dynahash.c:364 utils/hash/dynahash.c:436
+#: utils/hash/dynahash.c:932 utils/mb/mbutils.c:374 utils/mb/mbutils.c:675
+#: utils/misc/guc.c:3298 utils/misc/guc.c:3311 utils/misc/guc.c:3324
+#: utils/misc/tzparser.c:455
+msgid "out of memory"
+msgstr "brak pamięci"
+
+#: commands/sequence.c:1206
+msgid "INCREMENT must not be zero"
+msgstr "INCREMENT nie może być zerowy"
+
+#: commands/sequence.c:1252
+#, c-format
+msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
+msgstr "MINVALUE (%s) musi być mniejsza niż MAXVALUE (%s)"
+
+#: commands/sequence.c:1277
+#, c-format
+msgid "START value (%s) cannot be less than MINVALUE (%s)"
+msgstr "wartość START (%s) nie może być mniejsza niż MINVALUE (%s)"
+
+#: commands/sequence.c:1289
+#, c-format
+msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
+msgstr "wartość START (%s) nie może być większa niż MAXVALUE (%s)"
+
+#: commands/sequence.c:1320
+#, c-format
+msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
+msgstr "wartość RESTART (%s) nie może być mniejsza niż MINVALUE (%s)"
+
+#: commands/sequence.c:1332
+#, c-format
+msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
+msgstr "wartość RESTART (%s) nie może być większa niż MAXVALUE (%s)"
+
+#: commands/sequence.c:1347
+#, c-format
+msgid "CACHE (%s) must be greater than zero"
+msgstr "CACHE (%s) musi być większa niż zero"
+
+#: commands/sequence.c:1378
+msgid "invalid OWNED BY option"
+msgstr "nieprawidłowa opcja OWNED BY"
+
+#: commands/sequence.c:1379
+msgid "Specify OWNED BY table.column or OWNED BY NONE."
+msgstr "Wskaż OWNED BY tabela.kolumna lub OWNED BY NONE."
+
+#: commands/sequence.c:1401 commands/tablecmds.c:5525
+#, c-format
+msgid "referenced relation \"%s\" is not a table"
+msgstr "wskazywana relacja \"%s\" nie jest tabelÄ…"
+
+#: commands/sequence.c:1408
+msgid "sequence must have same owner as table it is linked to"
+msgstr "sekwencja musi mieć tego samego właściciela co powiązana z nią tabela"
+
+#: commands/sequence.c:1412
+msgid "sequence must be in same schema as table it is linked to"
+msgstr "sekwencja musi być w tym samym schemacie co powiązana z nią tabela"
+
+#: commands/tablecmds.c:200
+#, c-format
+msgid "table \"%s\" does not exist"
+msgstr "tabela \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:201
+#, c-format
+msgid "table \"%s\" does not exist, skipping"
+msgstr "tabela \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:203
+msgid "Use DROP TABLE to remove a table."
+msgstr "Użyj DROP TABLE aby skasować tabelę."
+
+#: commands/tablecmds.c:206
+#, c-format
+msgid "sequence \"%s\" does not exist"
+msgstr "sekwencja \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:207
+#, c-format
+msgid "sequence \"%s\" does not exist, skipping"
+msgstr "sekwencja \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:209
+msgid "Use DROP SEQUENCE to remove a sequence."
+msgstr "Użyj DROP SEQUENCE aby usunąć sekwencję."
+
+#: commands/tablecmds.c:212
+#, c-format
+msgid "view \"%s\" does not exist"
+msgstr "widok \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:213
+#, c-format
+msgid "view \"%s\" does not exist, skipping"
+msgstr "widok \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:215
+msgid "Use DROP VIEW to remove a view."
+msgstr "Użyj DROP VIEW aby usunąć widok."
+
+#: commands/tablecmds.c:218 parser/parse_utilcmd.c:1449
+#, c-format
+msgid "index \"%s\" does not exist"
+msgstr "indeks \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:219
+#, c-format
+msgid "index \"%s\" does not exist, skipping"
+msgstr "indeks \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:221
+msgid "Use DROP INDEX to remove an index."
+msgstr "Użyj DROP INDEX aby usunąć indeks."
+
+#: commands/tablecmds.c:225 commands/typecmds.c:666
+#, c-format
+msgid "type \"%s\" does not exist, skipping"
+msgstr "typ \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:226
+#, c-format
+msgid "\"%s\" is not a type"
+msgstr "\"%s\" nie jest typem"
+
+#: commands/tablecmds.c:227
+msgid "Use DROP TYPE to remove a type."
+msgstr "Użyj DROP TYPE aby usunąć typ."
+
+#: commands/tablecmds.c:230 commands/tablecmds.c:8888
+#, c-format
+msgid "foreign table \"%s\" does not exist"
+msgstr "tabela obca \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:231
+#, c-format
+msgid "foreign table \"%s\" does not exist, skipping"
+msgstr "tabela obca \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:233
+msgid "Use DROP FOREIGN TABLE to remove a foreign table."
+msgstr "Użyj DROP FOREIGN TABLE aby usunąć tabelę obcą."
+
+#: commands/tablecmds.c:425 executor/execMain.c:2416
+msgid "ON COMMIT can only be used on temporary tables"
+msgstr "ON COMMIT może być używane jedynie na tabelach tymczasowych"
+
+#: commands/tablecmds.c:429
+msgid "constraints on foreign tables are not supported"
+msgstr "ograniczenia na tabelach obcych nie są obsługiwane"
+
+#: commands/tablecmds.c:447 executor/execMain.c:2434
+msgid "cannot create temporary table within security-restricted operation"
+msgstr ""
+"nie można utworzyć tabeli tymczasowej operacją o ograniczonym bezpieczeństwie"
+
+#: commands/tablecmds.c:545 commands/tablecmds.c:4351
+msgid "default values on foreign tables are not supported"
+msgstr "domyślne wartości dla tabel obcych nie są obsługiwane"
+
+#: commands/tablecmds.c:813 commands/tablecmds.c:1142
+#: commands/tablecmds.c:2070 commands/tablecmds.c:3807
+#: commands/tablecmds.c:5531 commands/trigger.c:192 commands/trigger.c:1098
+#: tcop/utility.c:95 rewrite/rewriteDefine.c:263
+#, c-format
+msgid "permission denied: \"%s\" is a system catalog"
+msgstr "odmowa dostępu: \"%s\" jest katalogiem systemowym"
+
+#: commands/tablecmds.c:925
+#, c-format
+msgid "truncate cascades to table \"%s\""
+msgstr "obcięcie kaskadowe do tabeli \"%s\""
+
+#: commands/tablecmds.c:1152
+msgid "cannot truncate temporary tables of other sessions"
+msgstr "nie można obcinać tabel tymczasowych z innych sesji"
+
+#: commands/tablecmds.c:1354 parser/parse_utilcmd.c:621
+#: parser/parse_utilcmd.c:1667
+#, c-format
+msgid "inherited relation \"%s\" is not a table"
+msgstr "dziedziczona relacja \"%s\" nie jest tabelÄ…"
+
+#: commands/tablecmds.c:1361 commands/tablecmds.c:8114
+#, c-format
+msgid "cannot inherit from temporary relation \"%s\""
+msgstr "nie można dziedziczyć z tymczasowej relacji \"%s\""
+
+#: commands/tablecmds.c:1378 commands/tablecmds.c:8142
+#, c-format
+msgid "relation \"%s\" would be inherited from more than once"
+msgstr "relacja \"%s\" byłaby dziedziczona więcej niż raz"
+
+#: commands/tablecmds.c:1434
+#, c-format
+msgid "merging multiple inherited definitions of column \"%s\""
+msgstr "Å‚Ä…czenie wielu dziedziczonych definicji kolumny \"%s\""
+
+#: commands/tablecmds.c:1442
+#, c-format
+msgid "inherited column \"%s\" has a type conflict"
+msgstr "kolumna dziedziczona \"%s\" jest w konflikcie typów"
+
+#: commands/tablecmds.c:1444 commands/tablecmds.c:1465
+#: commands/tablecmds.c:1630 commands/tablecmds.c:1652
+#: parser/parse_coerce.c:1514 parser/parse_coerce.c:1534
+#: parser/parse_coerce.c:1579 parser/parse_param.c:217
+#, c-format
+msgid "%s versus %s"
+msgstr "%s kontra %s"
+
+#: commands/tablecmds.c:1451
+#, c-format
+msgid "inherited column \"%s\" has a collation conflict"
+msgstr "kolumna dziedziczona \"%s\" jest konflikcie porównań"
+
+#: commands/tablecmds.c:1453 commands/tablecmds.c:1640
+#: commands/tablecmds.c:4220
+#, c-format
+msgid "\"%s\" versus \"%s\""
+msgstr "\"%s\" kontra \"%s\""
+
+#: commands/tablecmds.c:1463
+#, c-format
+msgid "inherited column \"%s\" has a storage parameter conflict"
+msgstr "kolumna dziedziczona \"%s\" jest konflikcie parametrów składowania"
+
+#: commands/tablecmds.c:1620
+#, c-format
+msgid "merging column \"%s\" with inherited definition"
+msgstr "połączenie kolumny \"%s\" z dziedziczoną definicją"
+
+#: commands/tablecmds.c:1628
+#, c-format
+msgid "column \"%s\" has a type conflict"
+msgstr "kolumna \"%s\" jest w konflikcie typów"
+
+#: commands/tablecmds.c:1638
+#, c-format
+msgid "column \"%s\" has a collation conflict"
+msgstr "kolumna \"%s\" jest w konflikcie porównań"
+
+#: commands/tablecmds.c:1650
+#, c-format
+msgid "column \"%s\" has a storage parameter conflict"
+msgstr "kolumna \"%s\" jest w konflikcie parametrów składowania"
+
+#: commands/tablecmds.c:1702
+#, c-format
+msgid "column \"%s\" inherits conflicting default values"
+msgstr "kolumna \"%s\" dziedziczy sprzeczne wartości domyślne"
+
+#: commands/tablecmds.c:1704
+msgid "To resolve the conflict, specify a default explicitly."
+msgstr "Aby rozwiązać konflikt, wskaż wyraźnie ustawienie domyślne."
+
+#: commands/tablecmds.c:1751
+#, c-format
+msgid ""
+"check constraint name \"%s\" appears multiple times but with different "
+"expressions"
+msgstr ""
+"nazwa ograniczenia kontrolnego \"%s\" pojawia się wielokrotnie w różnych "
+"wyrażeniach"
+
+#: commands/tablecmds.c:2041
+msgid "cannot rename column of typed table"
+msgstr "nie można zmienić nazwy kolumny tabeli typizowanej"
+
+#: commands/tablecmds.c:2058
+#, c-format
+msgid "\"%s\" is not a table, view, composite type, index or foreign table"
+msgstr ""
+"\"%s\" nie jest tabelą, widokiem, typem złożonym, indeksem ani tabelą obcą"
+
+#: commands/tablecmds.c:2124
+#, c-format
+msgid "inherited column \"%s\" must be renamed in child tables too"
+msgstr ""
+"kolumna dziedziczona \"%s\" musi być przemianowana również w tabelach "
+"potomnych"
+
+#: commands/tablecmds.c:2156
+#, c-format
+msgid "cannot rename system column \"%s\""
+msgstr "nie można zmienić nazwy kolumny systemowej \"%s\""
+
+#: commands/tablecmds.c:2171
+#, c-format
+msgid "cannot rename inherited column \"%s\""
+msgstr "nie można zmienić nazwy kolumny dziedziczonej \"%s\""
+
+#: commands/tablecmds.c:2182 commands/tablecmds.c:4264
+#, c-format
+msgid "column \"%s\" of relation \"%s\" already exists"
+msgstr "kolumna \"%s\" relacji \"%s\" już istnieje"
+
+#: commands/tablecmds.c:2271 commands/tablecmds.c:7438
+#: commands/tablecmds.c:9020
+msgid "Use ALTER TYPE instead."
+msgstr "W zamian użyj ALTER TYPE."
+
+#. translator: first %s is a SQL command, eg ALTER TABLE
+#: commands/tablecmds.c:2394
+#, c-format
+msgid ""
+"cannot %s \"%s\" because it is being used by active queries in this session"
+msgstr ""
+"nie można %s \"%s\" ponieważ jest używane przez aktywne zapytania w tej sesji"
+
+#. translator: first %s is a SQL command, eg ALTER TABLE
+#: commands/tablecmds.c:2403
+#, c-format
+msgid "cannot %s \"%s\" because it has pending trigger events"
+msgstr "nie można %s \"%s\" ponieważ posiada oczekujące zdarzenia wyzwalaczy"
+
+#: commands/tablecmds.c:2502
+#, c-format
+msgid "\"%s\" is not a composite type"
+msgstr "\"%s\" nie jest typem złożonym"
+
+#: commands/tablecmds.c:3327
+#, c-format
+msgid "cannot rewrite system relation \"%s\""
+msgstr "nie można nadpisać relacji systemowej \"%s\""
+
+#: commands/tablecmds.c:3337
+msgid "cannot rewrite temporary tables of other sessions"
+msgstr "nie można nadpisać tabel tymczasowych z innych sesji"
+
+#: commands/tablecmds.c:3562
+#, c-format
+msgid "rewriting table \"%s\""
+msgstr "nadpisanie tabeli \"%s\""
+
+#: commands/tablecmds.c:3566
+#, c-format
+msgid "verifying table \"%s\""
+msgstr "sprawdzanie tabeli \"%s\""
+
+#: commands/tablecmds.c:3673
+#, c-format
+msgid "column \"%s\" contains null values"
+msgstr "kolumna \"%s\" zawiera puste wartości"
+
+#: commands/tablecmds.c:3687
+#, c-format
+msgid "check constraint \"%s\" is violated by some row"
+msgstr "ograniczenie sprawdzające \"%s\" jest naruszone przez kilka rekordów"
+
+#: commands/tablecmds.c:3828 commands/tablecmds.c:4778
+#, c-format
+msgid "\"%s\" is not a table or index"
+msgstr "\"%s\" nie jest tabelÄ… ani indeksem"
+
+#: commands/tablecmds.c:3831 commands/trigger.c:186 commands/trigger.c:1092
+#: rewrite/rewriteDefine.c:257
+#, c-format
+msgid "\"%s\" is not a table or view"
+msgstr "\"%s\" nie jest tabelÄ… ani widokiem"
+
+#: commands/tablecmds.c:3834
+#, c-format
+msgid "\"%s\" is not a table or foreign table"
+msgstr "\"%s\" nie jest tabelÄ… ani tabelÄ… obcÄ…"
+
+#: commands/tablecmds.c:3837
+#, c-format
+msgid "\"%s\" is not a table, composite type, or foreign table"
+msgstr "\"%s\" nie jest tabelą, typem złożonym ani tabelą obcą"
+
+#: commands/tablecmds.c:3847
+#, c-format
+msgid "\"%s\" is of the wrong type"
+msgstr "\"%s\" jest niepoprawnego typu"
+
+#: commands/tablecmds.c:3996 commands/tablecmds.c:4003
+#, c-format
+msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
+msgstr "nie można zmieniać typu \"%s\" ponieważ używa go kolumna \"%s.%s\""
+
+#: commands/tablecmds.c:4010
+#, c-format
+msgid ""
+"cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
+msgstr ""
+"nie można zmieniać tabeli obcej \"%s\" ponieważ kolumna \"%s.%s\" używa jej "
+"typu wiersza"
+
+#: commands/tablecmds.c:4017
+#, c-format
+msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
+msgstr ""
+"nie można zmieniać tabeli \"%s\" ponieważ kolumna \"%s.%s\" używa jej typu "
+"wiersza"
+
+#: commands/tablecmds.c:4079
+#, c-format
+msgid "cannot alter type \"%s\" because it is the type of a typed table"
+msgstr ""
+"nie można zmienić typu \"%s\" ponieważ definiuje on typ tabeli typizowanej"
+
+#: commands/tablecmds.c:4081
+msgid "Use ALTER ... CASCADE to alter the typed tables too."
+msgstr "Użyj ALTER ... CASCADE aby zmienić również tabele typizowane."
+
+#: commands/tablecmds.c:4125
+#, c-format
+msgid "type %s is not a composite type"
+msgstr "typ %s nie jest typem złożonym"
+
+#: commands/tablecmds.c:4151
+msgid "cannot add column to typed table"
+msgstr "nie dodać kolumny tabeli typizowanej"
+
+#: commands/tablecmds.c:4212 commands/tablecmds.c:8296
+#, c-format
+msgid "child table \"%s\" has different type for column \"%s\""
+msgstr "tabela potomna \"%s\" posiada inny typ kolumny \"%s\""
+
+#: commands/tablecmds.c:4218 commands/tablecmds.c:8303
+#, c-format
+msgid "child table \"%s\" has different collation for column \"%s\""
+msgstr "tabela potomna \"%s\" posiada inne porównanie dla kolumny \"%s\""
+
+#: commands/tablecmds.c:4228
+#, c-format
+msgid "child table \"%s\" has a conflicting \"%s\" column"
+msgstr "tabela potomna \"%s\" posiada sprzecznÄ… kolumnÄ™ \"%s\""
+
+#: commands/tablecmds.c:4240
+#, c-format
+msgid "merging definition of column \"%s\" for child \"%s\""
+msgstr "łączenie definicji kolumny \"%s\" dla podrzędnej \"%s\""
+
+#: commands/tablecmds.c:4470
+msgid "column must be added to child tables too"
+msgstr "kolumna musi być dodana również do tabel podrzędnych"
+
+#: commands/tablecmds.c:4600 commands/tablecmds.c:4690
+#: commands/tablecmds.c:4735 commands/tablecmds.c:4831
+#: commands/tablecmds.c:4875 commands/tablecmds.c:4954
+#: commands/tablecmds.c:6656
+#, c-format
+msgid "cannot alter system column \"%s\""
+msgstr "nie można zmieniać kolumny systemowej \"%s\""
+
+#: commands/tablecmds.c:4634
+#, c-format
+msgid "column \"%s\" is in a primary key"
+msgstr "kolumna \"%s\" jest w kluczu głównym"
+
+#: commands/tablecmds.c:4805
+#, c-format
+msgid "statistics target %d is too low"
+msgstr "Próbka statystyczna %d jest zbyt mała"
+
+#: commands/tablecmds.c:4813
+#, c-format
+msgid "lowering statistics target to %d"
+msgstr "obniżanie próbki statystycznej do %d"
+
+#: commands/tablecmds.c:4935
+#, c-format
+msgid "invalid storage type \"%s\""
+msgstr "niepoprawny typ przechowywania \"%s\""
+
+#: commands/tablecmds.c:4966
+#, c-format
+msgid "column data type %s can only have storage PLAIN"
+msgstr "typ danych kolumny %s może mieć przechowywanie tylko PLAIN"
+
+#: commands/tablecmds.c:4996
+msgid "cannot drop column from typed table"
+msgstr "nie można skasować kolumn tabeli typizowanej"
+
+#: commands/tablecmds.c:5037
+#, c-format
+msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "kolumna \"%s\" relacji \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:5050
+#, c-format
+msgid "cannot drop system column \"%s\""
+msgstr "nie można usunąć kolumny systemowej \"%s\""
+
+#: commands/tablecmds.c:5057
+#, c-format
+msgid "cannot drop inherited column \"%s\""
+msgstr "nie można usunąć kolumny dziedziczonej \"%s\""
+
+#: commands/tablecmds.c:5283
+#, c-format
+msgid ""
+"ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
+msgstr ""
+"ALTER TABLE / ADD CONSTRAINT USING INDEX przemianuje indeks \"%s\" na \"%s\""
+
+#: commands/tablecmds.c:5460
+msgid "constraint must be added to child tables too"
+msgstr "ograniczenie musi być dodane również do tabel potomnych"
+
+#: commands/tablecmds.c:5548
+msgid "constraints on permanent tables may reference only permanent tables"
+msgstr "ograniczenia na tabelach trwałych mogą wskazywać tylko tabele trwałe"
+
+#: commands/tablecmds.c:5555
+msgid ""
+"constraints on unlogged tables may reference only permanent or unlogged "
+"tables"
+msgstr "ograniczenia na nielogowanych mogą wskazywać tylko tabele nielogowane"
+
+#: commands/tablecmds.c:5561
+msgid "constraints on temporary tables may reference only temporary tables"
+msgstr ""
+"ograniczenia na tabelach tymczasowych mogą wskazywać tylko tabele tymczasowe"
+
+#: commands/tablecmds.c:5622
+msgid "number of referencing and referenced columns for foreign key disagree"
+msgstr ""
+"nie zgadza siÄ™ liczba kolumn wskazujÄ…cych i wskazywanych w kluczu obcym"
+
+#: commands/tablecmds.c:5711
+#, c-format
+msgid "foreign key constraint \"%s\" cannot be implemented"
+msgstr "klucz obcy \"%s\" nie może być zaimplementowany"
+
+#: commands/tablecmds.c:5714
+#, c-format
+msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
+msgstr "Kolumny klucza \"%s\" i \"%s\" są różnych typów: %s i %s."
+
+#: commands/tablecmds.c:5827
+#, c-format
+msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "ograniczenie klucza obcego \"%s\" relacji \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:5890
+#, c-format
+msgid "column \"%s\" referenced in foreign key constraint does not exist"
+msgstr "kolumna \"%s\" wskazywana w ograniczeniu klucza obcego nie istnieje"
+
+#: commands/tablecmds.c:5895
+#, c-format
+msgid "cannot have more than %d keys in a foreign key"
+msgstr "nie można użyć więcej niż %d kluczy w kluczu obcym"
+
+#: commands/tablecmds.c:5960
+#, c-format
+msgid "cannot use a deferrable primary key for referenced table \"%s\""
+msgstr ""
+"nie można użyć odraczalnego klucza głównego dla tabeli referencyjnej \"%s\""
+
+#: commands/tablecmds.c:5977
+#, c-format
+msgid "there is no primary key for referenced table \"%s\""
+msgstr "brak klucza głównego dla tabeli referencyjnej \"%s\""
+
+#: commands/tablecmds.c:6127
+#, c-format
+msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
+msgstr ""
+"brak klucza odraczalnego ograniczenia unikalnego dla tabeli referencyjnej "
+"\"%s\""
+
+#: commands/tablecmds.c:6132
+#, c-format
+msgid ""
+"there is no unique constraint matching given keys for referenced table \"%s\""
+msgstr ""
+"brak ograniczenia unikalnego pasujÄ…cego do danych kluczy dla tabeli "
+"referencyjnej \"%s\""
+
+#: commands/tablecmds.c:6183
+#, c-format
+msgid "validating foreign key constraint \"%s\""
+msgstr "sprawdzenie ograniczenia klucza obcego \"%s\""
+
+#: commands/tablecmds.c:6465
+#, c-format
+msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
+msgstr "nie można skasować dziedziczonego ograniczenia \"%s\" relacji \"%s\""
+
+#: commands/tablecmds.c:6492 commands/tablecmds.c:6605
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "ograniczenie \"%s\" relacji \"%s\" nie istnieje"
+
+#: commands/tablecmds.c:6498
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "ograniczenie \"%s\" relacji \"%s\" nie istnieje, pominięto"
+
+#: commands/tablecmds.c:6640
+msgid "cannot alter column type of typed table"
+msgstr "nie można zmienić typu kolumny tabeli typizowanej"
+
+#: commands/tablecmds.c:6663
+#, c-format
+msgid "cannot alter inherited column \"%s\""
+msgstr "nie można zmieniać kolumny dziedziczonej \"%s\""
+
+#: commands/tablecmds.c:6705
+msgid "transform expression must not return a set"
+msgstr "wyrażenie przekształcenia nie może zwracać zbioru"
+
+#: commands/tablecmds.c:6711
+msgid "cannot use subquery in transform expression"
+msgstr "nie można użyć podzapytania w wyrażeniu przekształcenia"
+
+#: commands/tablecmds.c:6715
+msgid "cannot use aggregate function in transform expression"
+msgstr "nie można użyć funkcji agregującej w wyrażeniu przekształcenia"
+
+#: commands/tablecmds.c:6719
+msgid "cannot use window function in transform expression"
+msgstr "nie można użyć funkcji okna w wyrażeniu przekształcenia"
+
+#: commands/tablecmds.c:6738
+#, c-format
+msgid "column \"%s\" cannot be cast to type %s"
+msgstr "kolumna \"%s\" nie może być rzutowana na typ %s"
+
+#: commands/tablecmds.c:6785
+#, c-format
+msgid "type of inherited column \"%s\" must be changed in child tables too"
+msgstr ""
+"typ kolumny dziedziczonej \"%s\" musi być zmieniony również w tabelach "
+"potomnych"
+
+#: commands/tablecmds.c:6866
+#, c-format
+msgid "cannot alter type of column \"%s\" twice"
+msgstr "nie można zmieniać typu kolumny \"%s\" dwukrotnie"
+
+#: commands/tablecmds.c:6902
+#, c-format
+msgid "default for column \"%s\" cannot be cast to type %s"
+msgstr "wartość domyślna dla kolumny \"%s\" nie może być rzutowana na typ %s"
+
+#: commands/tablecmds.c:7028
+msgid "cannot alter type of a column used by a view or rule"
+msgstr "nie można zmieniać typu kolumny używanej przez widok lub regułę"
+
+#: commands/tablecmds.c:7029 commands/tablecmds.c:7048
+#, c-format
+msgid "%s depends on column \"%s\""
+msgstr "%s zależy od kolumny \"%s\""
+
+#: commands/tablecmds.c:7047
+msgid "cannot alter type of a column used in a trigger definition"
+msgstr "nie można zmieniać typu kolumny używanej przez definicję wyzwalacza"
+
+#: commands/tablecmds.c:7406
+#, c-format
+msgid "cannot change owner of index \"%s\""
+msgstr "nie można zmienić właściciela indeksu \"%s\""
+
+#: commands/tablecmds.c:7408
+msgid "Change the ownership of the index's table, instead."
+msgstr "W zamian zmień właściciela tabeli indeksu."
+
+#: commands/tablecmds.c:7424
+#, c-format
+msgid "cannot change owner of sequence \"%s\""
+msgstr "nie można zmienić właściciela sekwencji \"%s\""
+
+#: commands/tablecmds.c:7426 commands/tablecmds.c:9010
+#, c-format
+msgid "Sequence \"%s\" is linked to table \"%s\"."
+msgstr "Sekwencja \"%s\" jest połączona z tabelą \"%s\"."
+
+#: commands/tablecmds.c:7447 commands/tablecmds.c:9028
+#, c-format
+msgid "\"%s\" is not a table, view, sequence, or foreign table"
+msgstr "\"%s\" nie jest tabelÄ…, widokiem, sekwencjÄ… ani tabelÄ… obcÄ…"
+
+#: commands/tablecmds.c:7702
+msgid "cannot have multiple SET TABLESPACE subcommands"
+msgstr "nie można użyć wielu poleceń podrzędnych SET TABLESPACE"
+
+#: commands/tablecmds.c:7754
+#, c-format
+msgid "\"%s\" is not a table, index, or TOAST table"
+msgstr "\"%s\" nie jest tabelÄ…, indeksem ani tabelÄ… TOAST"
+
+#: commands/tablecmds.c:7875
+#, c-format
+msgid "cannot move system relation \"%s\""
+msgstr "nie można przenieść relacji systemowej \"%s\""
+
+#: commands/tablecmds.c:7891
+msgid "cannot move temporary tables of other sessions"
+msgstr "nie można przenieść tabel tymczasowych innych sesji"
+
+#: commands/tablecmds.c:8083
+msgid "cannot change inheritance of typed table"
+msgstr "nie można zmienić dziedziczenia tabeli typizowanej"
+
+#: commands/tablecmds.c:8169
+msgid "circular inheritance not allowed"
+msgstr "dziedziczenie cykliczne nie jest dozwolone"
+
+#: commands/tablecmds.c:8170
+#, c-format
+msgid "\"%s\" is already a child of \"%s\"."
+msgstr "\"%s\" jest już potomkiem \"%s\"."
+
+#: commands/tablecmds.c:8178
+#, c-format
+msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
+msgstr "tabela \"%s\" bez OIDu nie może dziedziczyć z tabeli \"%s\" z OIDem"
+
+#: commands/tablecmds.c:8314
+#, c-format
+msgid "column \"%s\" in child table must be marked NOT NULL"
+msgstr "kolumna \"%s\" w tabeli potomnej musi być oznaczona jako NOT NULL"
+
+#: commands/tablecmds.c:8330
+#, c-format
+msgid "child table is missing column \"%s\""
+msgstr "w tabeli potomnej brak kolumny \"%s\""
+
+#: commands/tablecmds.c:8409
+#, c-format
+msgid "child table \"%s\" has different definition for check constraint \"%s\""
+msgstr ""
+"tabela potomna \"%s\" posiada innÄ… definicjÄ™ ograniczenia sprawdzajÄ…cego \"%s"
+"\""
+
+#: commands/tablecmds.c:8433
+#, c-format
+msgid "child table is missing constraint \"%s\""
+msgstr "w tabeli potomnej brak ograniczenia \"%s\""
+
+#: commands/tablecmds.c:8513
+#, c-format
+msgid "relation \"%s\" is not a parent of relation \"%s\""
+msgstr "relacja \"%s\" nie jest rodzicem relacji \"%s\""
+
+#: commands/tablecmds.c:8730
+msgid "typed tables cannot inherit"
+msgstr "tabela typizowana nie może dziedziczyć"
+
+#: commands/tablecmds.c:8761
+#, c-format
+msgid "table is missing column \"%s\""
+msgstr "w tabeli brak kolumny \"%s\""
+
+#: commands/tablecmds.c:8771
+#, c-format
+msgid "table has column \"%s\" where type requires \"%s\""
+msgstr "tabela posiada kolumnę \"%s\", której typ wymaga \"%s\""
+
+#: commands/tablecmds.c:8780
+#, c-format
+msgid "table \"%s\" has different type for column \"%s\""
+msgstr "tabela \"%s\" posiada inny typ dla kolumny \"%s\""
+
+#: commands/tablecmds.c:8793
+#, c-format
+msgid "table has extra column \"%s\""
+msgstr "tabela posiada nadmiarowÄ… kolumnÄ™ \"%s\""
+
+#: commands/tablecmds.c:8840
+#, c-format
+msgid "\"%s\" is not a typed table"
+msgstr "\"%s\" nie jest tabelÄ… typizowanÄ…"
+
+#: commands/tablecmds.c:9009
+msgid "cannot move an owned sequence into another schema"
+msgstr "nie można przenieść sekwencji mającej właściciela do innego schematu"
+
+#: commands/tablecmds.c:9085
+#, c-format
+msgid "relation \"%s\" already exists in schema \"%s\""
+msgstr "relacja \"%s\" istnieje już w schemacie \"%s\""
+
+#: commands/tablespace.c:158 commands/tablespace.c:175
+#: commands/tablespace.c:186 commands/tablespace.c:194
+#: commands/tablespace.c:603 storage/file/copydir.c:61
+#, c-format
+msgid "could not create directory \"%s\": %m"
+msgstr "nie można utworzyć folderu \"%s\": %m"
+
+#: commands/tablespace.c:205
+#, c-format
+msgid "could not stat directory \"%s\": %m"
+msgstr "nie można wykonać stat na folderze \"%s\": %m"
+
+#: commands/tablespace.c:214
+#, c-format
+msgid "\"%s\" exists but is not a directory"
+msgstr "\"%s\" istnieje ale nie jest folderem"
+
+#: commands/tablespace.c:244
+#, c-format
+msgid "permission denied to create tablespace \"%s\""
+msgstr "odmowa dostępu do tworzenia przestrzeni tabel \"%s\""
+
+#: commands/tablespace.c:246
+msgid "Must be superuser to create a tablespace."
+msgstr "Musisz być superużytkownikiem aby utworzyć przestrzeń tabel."
+
+#: commands/tablespace.c:262
+msgid "tablespace location cannot contain single quotes"
+msgstr "położenie przestrzeni tabel nie może zawierać apostrofów"
+
+#: commands/tablespace.c:272
+msgid "tablespace location must be an absolute path"
+msgstr "położenie przestrzeni tabel musi być ścieżką bezwzględną"
+
+#: commands/tablespace.c:283
+#, c-format
+msgid "tablespace location \"%s\" is too long"
+msgstr "położenie przestrzeni tabel \"%s\" jest za długie"
+
+#: commands/tablespace.c:293 commands/tablespace.c:829
+#, c-format
+msgid "unacceptable tablespace name \"%s\""
+msgstr "nieprawidłowa nazwa przestrzeni tabel \"%s\""
+
+#: commands/tablespace.c:295 commands/tablespace.c:830
+msgid "The prefix \"pg_\" is reserved for system tablespaces."
+msgstr "Prefiks \"pg_\" jest zarezerwowany dla systemowych przestrzeni tabel."
+
+#: commands/tablespace.c:305 commands/tablespace.c:842
+#, c-format
+msgid "tablespace \"%s\" already exists"
+msgstr "przestrzeń tabel \"%s\" już istnieje"
+
+#: commands/tablespace.c:377 commands/tablespace.c:529
+msgid "tablespaces are not supported on this platform"
+msgstr "przestrzenie tabel nie są obsługiwane na tej platformie"
+
+#: commands/tablespace.c:415 commands/tablespace.c:813
+#: commands/tablespace.c:880 commands/tablespace.c:985
+#: commands/tablespace.c:1358
+#, c-format
+msgid "tablespace \"%s\" does not exist"
+msgstr "przestrzeń tabel \"%s\" nie istnieje"
+
+#: commands/tablespace.c:421
+#, c-format
+msgid "tablespace \"%s\" does not exist, skipping"
+msgstr "przestrzeń tabel \"%s\" nie istnieje, pominięto"
+
+#: commands/tablespace.c:486
+#, c-format
+msgid "tablespace \"%s\" is not empty"
+msgstr "przestrzeń tabel \"%s\" nie jest pusta"
+
+#: commands/tablespace.c:560
+#, c-format
+msgid "directory \"%s\" does not exist"
+msgstr "folder \"%s\" nie istnieje"
+
+#: commands/tablespace.c:561
+msgid "Create this directory for the tablespace before restarting the server."
+msgstr ""
+"Utwórz ten folder na przestrzeń tabel zanim uruchomisz ponownie serwer."
+
+#: commands/tablespace.c:566
+#, c-format
+msgid "could not set permissions on directory \"%s\": %m"
+msgstr "nie można określić uprawnień dla folderu \"%s\": %m"
+
+#: commands/tablespace.c:598
+#, c-format
+msgid "directory \"%s\" already in use as a tablespace"
+msgstr "folder \"%s\" jest już używany jako przestrzeń tabel"
+
+#: commands/tablespace.c:613 commands/tablespace.c:750
+#, c-format
+msgid "could not remove symbolic link \"%s\": %m"
+msgstr "nie można usunąć linku symbolicznego \"%s\": %m"
+
+#: commands/tablespace.c:623
+#, c-format
+msgid "could not create symbolic link \"%s\": %m"
+msgstr "nie można utworzyć linku symbolicznego \"%s\": %m"
+
+#: commands/tablespace.c:684 storage/file/copydir.c:67
+#: storage/file/copydir.c:106 storage/file/fd.c:1624
+#: postmaster/postmaster.c:1166 utils/adt/genfile.c:353 utils/adt/misc.c:213
+#: utils/misc/tzparser.c:323
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "nie można otworzyć folderu \"%s\": %m"
+
+#: commands/tablespace.c:714 commands/tablespace.c:726
+#: commands/tablespace.c:742
+#, c-format
+msgid "could not remove directory \"%s\": %m"
+msgstr "nie można usunąć folderu \"%s\": %m"
+
+#: commands/tablespace.c:1039
+#, c-format
+msgid "Tablespace \"%s\" does not exist."
+msgstr "Przestrzeń tabel \"%s\" nie istnieje."
+
+#: commands/tablespace.c:1450
+#, c-format
+msgid "tablespace %u is not empty"
+msgstr "przestrzeń tabel %u nie jest pusta"
+
+#: commands/trigger.c:159
+#, c-format
+msgid "\"%s\" is a table"
+msgstr "\"%s\" jest tabelÄ…"
+
+#: commands/trigger.c:161
+msgid "Tables cannot have INSTEAD OF triggers."
+msgstr "Tabele nie mogą posiadać wyzwalaczy INSTEAD OF."
+
+#: commands/trigger.c:172 commands/trigger.c:179
+#, c-format
+msgid "\"%s\" is a view"
+msgstr "\"%s\" jest widokiem"
+
+#: commands/trigger.c:174
+msgid "Views cannot have row-level BEFORE or AFTER triggers."
+msgstr "Widoki nie mogą posiadać wierszowych wyzwalaczy BEFORE ani AFTER."
+
+#: commands/trigger.c:181
+msgid "Views cannot have TRUNCATE triggers."
+msgstr "Widoki nie mogą posiadać wyzwalaczy TRUNCATE."
+
+#: commands/trigger.c:228
+msgid "TRUNCATE FOR EACH ROW triggers are not supported"
+msgstr "wyzwalacze TRUNCATE FOR EACH ROW nie są obsługiwane"
+
+#: commands/trigger.c:236
+msgid "INSTEAD OF triggers must be FOR EACH ROW"
+msgstr "wyzwalacze INSTEAD OF muszą być FOR EACH ROW"
+
+#: commands/trigger.c:240
+msgid "INSTEAD OF triggers cannot have WHEN conditions"
+msgstr "wyzwalacze INSTEAD OF nie mogą zawierać warunków WHEN"
+
+#: commands/trigger.c:244
+msgid "INSTEAD OF triggers cannot have column lists"
+msgstr "wyzwalacze INSTEAD OF nie mogą mieć listy kolumn"
+
+#: commands/trigger.c:288
+msgid "cannot use subquery in trigger WHEN condition"
+msgstr "nie można używać podzapytań w warunku WHEN wyzwalacza"
+
+#: commands/trigger.c:292
+msgid "cannot use aggregate function in trigger WHEN condition"
+msgstr "nie można używać funkcji agregującej w warunku WHEN wyzwalacza"
+
+#: commands/trigger.c:296
+msgid "cannot use window function in trigger WHEN condition"
+msgstr "nie można używać funkcji okna w warunku WHEN wyzwalacza"
+
+#: commands/trigger.c:318 commands/trigger.c:331
+msgid "statement trigger's WHEN condition cannot reference column values"
+msgstr ""
+"warunek WHEN instrukcji wyzwalacza nie może wskazywać na wartości kolumn"
+
+#: commands/trigger.c:323
+msgid "INSERT trigger's WHEN condition cannot reference OLD values"
+msgstr "warunek WHEN wyzwalacza INSERT nie może wskazywać na wartości OLD"
+
+#: commands/trigger.c:336
+msgid "DELETE trigger's WHEN condition cannot reference NEW values"
+msgstr "warunek WHEN wyzwalacza DELETE nie może wskazywać na wartości NEW"
+
+#: commands/trigger.c:341
+msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
+msgstr ""
+"warunek WHEN wyzwalacza BEFORE nie może wskazywać na NEW kolumn systemowych"
+
+#: commands/trigger.c:379
+#, c-format
+msgid "changing return type of function %s from \"opaque\" to \"trigger\""
+msgstr "zmiana zwracanego typu funkcji %s z \"opaque\" na \"trigger\""
+
+#: commands/trigger.c:386
+#, c-format
+msgid "function %s must return type \"trigger\""
+msgstr "funkcja %s musi zwracać typ \"trigger\""
+
+#: commands/trigger.c:496 commands/trigger.c:1234
+#, c-format
+msgid "trigger \"%s\" for relation \"%s\" already exists"
+msgstr "wyzwalacz \"%s\" dla relacji \"%s\" już istnieje"
+
+#: commands/trigger.c:781
+msgid "Found referenced table's UPDATE trigger."
+msgstr "Odnaleziono wyzwalacz UPDATE tabeli referowanej."
+
+#: commands/trigger.c:782
+msgid "Found referenced table's DELETE trigger."
+msgstr "Odnaleziono wyzwalacz DELETE tabeli referowanej."
+
+#: commands/trigger.c:783
+msgid "Found referencing table's trigger."
+msgstr "Odnaleziono wyzwalacz tabeli referowanej."
+
+#: commands/trigger.c:892 commands/trigger.c:908
+#, c-format
+msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
+msgstr "ignorowanie niepełnej grupy wyzwalaczy dla ograniczenia \"%s\" %s"
+
+#: commands/trigger.c:920
+#, c-format
+msgid "converting trigger group into constraint \"%s\" %s"
+msgstr "przekształcenie grupy wyzwalaczy w ograniczenie \"%s\" %s"
+
+#: commands/trigger.c:1036
+#, c-format
+msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
+msgstr "wyzwalacz \"%s\" dla tabeli \"%s\" nie istnieje, pominięto"
+
+#: commands/trigger.c:1163 commands/trigger.c:1276 commands/trigger.c:1387
+#, c-format
+msgid "trigger \"%s\" for table \"%s\" does not exist"
+msgstr "wyzwalacz \"%s\" dla tabeli \"%s\" nie istnieje"
+
+#: commands/trigger.c:1355
+#, c-format
+msgid "permission denied: \"%s\" is a system trigger"
+msgstr "odmowa dostępu: \"%s\" jest wyzwalaczem systemowym"
+
+#: commands/trigger.c:1837
+#, c-format
+msgid "trigger function %u returned null value"
+msgstr "funkcja wyzwalacza %u zwróciła pustą wartość"
+
+#: commands/trigger.c:1896 commands/trigger.c:2095 commands/trigger.c:2279
+#: commands/trigger.c:2521
+msgid "BEFORE STATEMENT trigger cannot return a value"
+msgstr "wyzwalacz BEFORE STATEMENT nie może zwracać wartości"
+
+#: commands/trigger.c:2583 executor/execMain.c:1864
+#: executor/nodeLockRows.c:137 executor/nodeModifyTable.c:366
+#: executor/nodeModifyTable.c:582
+msgid "could not serialize access due to concurrent update"
+msgstr "nie może serializować dostępu z powodu równoczesnej aktualizacji"
+
+#: commands/trigger.c:4198
+#, c-format
+msgid "constraint \"%s\" is not deferrable"
+msgstr "ograniczenie \"%s\" nie jest odraczalne"
+
+#: commands/trigger.c:4221
+#, c-format
+msgid "constraint \"%s\" does not exist"
+msgstr "ograniczenie \"%s\" nie istnieje"
+
+#: commands/tsearchcmds.c:117 commands/tsearchcmds.c:1044
+#, c-format
+msgid "function %s should return type %s"
+msgstr "funkcja %s powinna zwracać typ %s"
+
+#: commands/tsearchcmds.c:189
+msgid "must be superuser to create text search parsers"
+msgstr ""
+"musisz być superużytkownikiem aby tworzyć parsery wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:237
+#, c-format
+msgid "text search parser parameter \"%s\" not recognized"
+msgstr "parametr parsera wyszukiwania tekstowego \"%s\" nierozpoznany"
+
+#: commands/tsearchcmds.c:247
+msgid "text search parser start method is required"
+msgstr "wymagana jest metoda start parsera wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:252
+msgid "text search parser gettoken method is required"
+msgstr "wymagana jest metoda gettoken parsera wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:257
+msgid "text search parser end method is required"
+msgstr "wymagana jest metoda end parsera wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:262
+msgid "text search parser lextypes method is required"
+msgstr "wymagana jest metoda lextypes parsera wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:297
+msgid "must be superuser to drop text search parsers"
+msgstr ""
+"musisz być superużytkownikiem aby kasować parsery wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:326
+#, c-format
+msgid "text search parser \"%s\" does not exist, skipping"
+msgstr "parser wyszukiwania tekstowego \"%s\" nie istnieje, pominięto"
+
+#: commands/tsearchcmds.c:381
+msgid "must be superuser to rename text search parsers"
+msgstr ""
+"musisz być superużytkownikiem aby zmieniać nazwy parserów wyszukiwania "
+"tekstowego"
+
+#: commands/tsearchcmds.c:399
+#, c-format
+msgid "text search parser \"%s\" already exists"
+msgstr "parser wyszukiwania tekstowego \"%s\" już istnieje"
+
+#: commands/tsearchcmds.c:525
+#, c-format
+msgid "text search template \"%s\" does not accept options"
+msgstr "szablon wyszukiwania tekstowego \"%s\" nie akceptuje opcji"
+
+#: commands/tsearchcmds.c:598
+msgid "text search template is required"
+msgstr "wymagany szablon wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:667
+#, c-format
+msgid "text search dictionary \"%s\" already exists"
+msgstr "słownik wyszukiwania tekstowego \"%s\" już istnieje"
+
+#: commands/tsearchcmds.c:775
+#, c-format
+msgid "text search dictionary \"%s\" does not exist, skipping"
+msgstr "słownik wyszukiwania tekstowego \"%s\" nie istnieje, pominięto"
+
+#: commands/tsearchcmds.c:1108
+msgid "must be superuser to create text search templates"
+msgstr ""
+"musisz być superużytkownikiem aby tworzyć szablony wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:1145
+#, c-format
+msgid "text search template parameter \"%s\" not recognized"
+msgstr "parametr szablonu wyszukiwania tekstowego \"%s\" nierozpoznany"
+
+#: commands/tsearchcmds.c:1155
+msgid "text search template lexize method is required"
+msgstr "wymagana jest metoda lexize szablonu wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:1193
+msgid "must be superuser to rename text search templates"
+msgstr ""
+"musisz być superużytkownikiem aby zmieniać nazwy szablonów wyszukiwania "
+"tekstowego"
+
+#: commands/tsearchcmds.c:1212
+#, c-format
+msgid "text search template \"%s\" already exists"
+msgstr "szablon wyszukiwania tekstowego \"%s\" już istnieje"
+
+#: commands/tsearchcmds.c:1281
+msgid "must be superuser to drop text search templates"
+msgstr ""
+"musisz być superużytkownikiem aby kasować szablony wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:1310
+#, c-format
+msgid "text search template \"%s\" does not exist, skipping"
+msgstr "szablon wyszukiwania tekstowego \"%s\" nie istnieje, pominięto"
+
+#: commands/tsearchcmds.c:1508
+#, c-format
+msgid "text search configuration parameter \"%s\" not recognized"
+msgstr "parametr konfiguracji wyszukiwania tekstowego \"%s\" nierozpoznany"
+
+#: commands/tsearchcmds.c:1515
+msgid "cannot specify both PARSER and COPY options"
+msgstr "nie można jednocześnie wskazać opcji PARSER i COPY"
+
+#: commands/tsearchcmds.c:1543
+msgid "text search parser is required"
+msgstr "wymagany parser wyszukiwania tekstowego"
+
+#: commands/tsearchcmds.c:1652
+#, c-format
+msgid "text search configuration \"%s\" already exists"
+msgstr "konfiguracja wyszukiwania tekstowego \"%s\" już istnieje"
+
+#: commands/tsearchcmds.c:1759
+#, c-format
+msgid "text search configuration \"%s\" does not exist, skipping"
+msgstr "konfiguracja wyszukiwania tekstowego \"%s\" nie istnieje, pominięto"
+
+#: commands/tsearchcmds.c:1981
+#, c-format
+msgid "token type \"%s\" does not exist"
+msgstr "typ tokenu \"%s\" nie istnieje"
+
+#: commands/tsearchcmds.c:2203
+#, c-format
+msgid "mapping for token type \"%s\" does not exist"
+msgstr "mapowanie dla typu tokenu \"%s\" nie istnieje"
+
+#: commands/tsearchcmds.c:2209
+#, c-format
+msgid "mapping for token type \"%s\" does not exist, skipping"
+msgstr "mapowanie dla typu tokenu \"%s\" nie istnieje, pominięto"
+
+#: commands/tsearchcmds.c:2362 commands/tsearchcmds.c:2473
+#, c-format
+msgid "invalid parameter list format: \"%s\""
+msgstr "niepoprawny format listy parametrów: \"%s\""
+
+#: commands/typecmds.c:169
+msgid "must be superuser to create a base type"
+msgstr "musisz być superużytkownikiem aby utworzyć typ bazowy"
+
+#: commands/typecmds.c:275
+#, c-format
+msgid "type attribute \"%s\" not recognized"
+msgstr "atrybut typu \"%s\" nie rozpoznany"
+
+#: commands/typecmds.c:329
+#, c-format
+msgid "invalid type category \"%s\": must be simple ASCII"
+msgstr "niepoprawna kategoria typu \"%s\": musi być prostym ASCII"
+
+#: commands/typecmds.c:348
+#, c-format
+msgid "array element type cannot be %s"
+msgstr "element tablicy nie może być typu %s"
+
+#: commands/typecmds.c:380
+#, c-format
+msgid "alignment \"%s\" not recognized"
+msgstr "wyrównanie \"%s\" nie rozpoznane"
+
+#: commands/typecmds.c:397
+#, c-format
+msgid "storage \"%s\" not recognized"
+msgstr "składowanie \"%s\" nie rozpoznane"
+
+#: commands/typecmds.c:408
+#, fuzzy
+msgid "type input function must be specified"
+msgstr "musi być wskazana funkcja wejścia typu"
+
+#: commands/typecmds.c:412
+#, fuzzy
+msgid "type output function must be specified"
+msgstr "musi być wskazana funkcja wyjścia typu"
+
+#: commands/typecmds.c:417
+msgid ""
+"type modifier output function is useless without a type modifier input "
+"function"
+msgstr ""
+"funkcja wyjścia zmiany typu jest bezużyteczna bez funkcji wejścia zmiany "
+"typu"
+
+#: commands/typecmds.c:440
+#, c-format
+msgid "changing return type of function %s from \"opaque\" to %s"
+msgstr "zmiana zwracanego typu funkcji %s z \"opaque\" na %s"
+
+#: commands/typecmds.c:447
+#, c-format
+msgid "type input function %s must return type %s"
+msgstr "funkcja wejścia typu %s musi zwracać typ %s"
+
+#: commands/typecmds.c:457
+#, c-format
+msgid "changing return type of function %s from \"opaque\" to \"cstring\""
+msgstr "zmiana zwracanego typu dla funkcji %s \"opaque\" to \"cstring\""
+
+#: commands/typecmds.c:464
+#, c-format
+msgid "type output function %s must return type \"cstring\""
+msgstr "funkcja wyjścia typu %s musi zwracać typ \"cstring\""
+
+#: commands/typecmds.c:473
+#, c-format
+msgid "type receive function %s must return type %s"
+msgstr "funkcja odbioru typu %s musi zwracać typ %s"
+
+#: commands/typecmds.c:482
+#, c-format
+msgid "type send function %s must return type \"bytea\""
+msgstr "funkcja wysyłania typu %s musi zwracać typ \"bytea\""
+
+#: commands/typecmds.c:687
+#, c-format
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" nie jest domenÄ…"
+
+#: commands/typecmds.c:827
+#, c-format
+msgid "\"%s\" is not a valid base type for a domain"
+msgstr "\"%s\" nie jest poprawnym typem bazowym dla domeny"
+
+#: commands/typecmds.c:909
+msgid "multiple default expressions"
+msgstr "wiele wyrażeń domyślnych"
+
+#: commands/typecmds.c:973 commands/typecmds.c:982
+msgid "conflicting NULL/NOT NULL constraints"
+msgstr "konflikt ograniczeń NULL/NOT NULL"
+
+#: commands/typecmds.c:1001 commands/typecmds.c:1984
+msgid "unique constraints not possible for domains"
+msgstr "ograniczenia unikalności nie są dostępne dla domen"
+
+#: commands/typecmds.c:1007 commands/typecmds.c:1990
+msgid "primary key constraints not possible for domains"
+msgstr "klucze główne nie są dostępne dla domen"
+
+#: commands/typecmds.c:1013 commands/typecmds.c:1996
+msgid "exclusion constraints not possible for domains"
+msgstr "ograniczenia wykluczające nie są dostępne dla domen"
+
+#: commands/typecmds.c:1019 commands/typecmds.c:2002
+msgid "foreign key constraints not possible for domains"
+msgstr "klucze obce nie są dostępne dla domen"
+
+#: commands/typecmds.c:1028 commands/typecmds.c:2011
+msgid "specifying constraint deferrability not supported for domains"
+msgstr "określanie odraczalności ograniczenia nie jest obsługiwane dla domen"
+
+#: commands/typecmds.c:1272 utils/cache/typcache.c:996
+#, c-format
+msgid "%s is not an enum"
+msgstr "%s nie jest wyliczeniem"
+
+#: commands/typecmds.c:1332
+#, c-format
+msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
+msgstr "zmiana typu argumentu funkcji %s z \"opaque\" na \"cstring\""
+
+#: commands/typecmds.c:1383
+#, c-format
+msgid "changing argument type of function %s from \"opaque\" to %s"
+msgstr "zmiana typu argumentu funkcji %s z \"opaque\" na %s"
+
+#: commands/typecmds.c:1482
+#, c-format
+msgid "typmod_in function %s must return type \"integer\""
+msgstr "funkcja typmod_in %s musi zwracać typ \"integer\""
+
+#: commands/typecmds.c:1509
+#, c-format
+msgid "typmod_out function %s must return type \"cstring\""
+msgstr "funkcja typmod_out %s musi zwracać typ \"cstring\""
+
+#: commands/typecmds.c:1536
+#, c-format
+msgid "type analyze function %s must return type \"boolean\""
+msgstr "funkcja analizy typu %s musi zwracać typ \"boolean\""
+
+#: commands/typecmds.c:1836
+#, c-format
+msgid "column \"%s\" of table \"%s\" contains null values"
+msgstr "kolumna \"%s\" tabeli \"%s\" zawiera puste wartości"
+
+#: commands/typecmds.c:2082
+#, c-format
+msgid ""
+"column \"%s\" of table \"%s\" contains values that violate the new constraint"
+msgstr ""
+"kolumna \"%s\" tabeli \"%s\" zawiera wartości naruszające nowe ograniczenie"
+
+#: commands/typecmds.c:2287
+#, c-format
+msgid "%s is not a domain"
+msgstr "%s nie jest domenÄ…"
+
+#: commands/typecmds.c:2369 commands/typecmds.c:2378
+msgid "cannot use table references in domain check constraint"
+msgstr "nie można użyć wskazania na tabelę w ograniczeniu sprawdzającym domeny"
+
+#: commands/typecmds.c:2608 commands/typecmds.c:2680 commands/typecmds.c:2904
+#, c-format
+msgid "%s is a table's row type"
+msgstr "%s jest typem wiersza tabeli"
+
+#: commands/typecmds.c:2610 commands/typecmds.c:2682 commands/typecmds.c:2906
+msgid "Use ALTER TABLE instead."
+msgstr "Użyj w zamian ALTER TABLE."
+
+#: commands/typecmds.c:2617 commands/typecmds.c:2689 commands/typecmds.c:2835
+#, c-format
+msgid "cannot alter array type %s"
+msgstr "nie można zmieniać typu tablicowego %s"
+
+#: commands/typecmds.c:2619 commands/typecmds.c:2691 commands/typecmds.c:2837
+#, c-format
+msgid "You can alter type %s, which will alter the array type as well."
+msgstr "Możesz zmienić typ %s, co zmieni również typ tablicowy."
+
+#: commands/typecmds.c:2890
+#, c-format
+msgid "type \"%s\" already exists in schema \"%s\""
+msgstr "typ \"%s\" już istnieje w schemacie \"%s\""
+
+#: commands/vacuum.c:419
+msgid "oldest xmin is far in the past"
+msgstr "najstarszy xmin jest daleko w przeszłości"
+
+#: commands/vacuum.c:420
+msgid "Close open transactions soon to avoid wraparound problems."
+msgstr "Zamknij szybko otwarte transakcje by uniknąć problemów zawijania."
+
+#: commands/vacuum.c:811
+msgid "some databases have not been vacuumed in over 2 billion transactions"
+msgstr ""
+"niektóre bazy danych nie były odkurzone od ponad 2 miliardów transakcji"
+
+#: commands/vacuum.c:812
+msgid "You might have already suffered transaction-wraparound data loss."
+msgstr ""
+"Być może już odczułeś utratę danych wynikającej z zawijania transakcji."
+
+#: commands/vacuum.c:919
+#, c-format
+msgid "skipping vacuum of \"%s\" --- lock not available"
+msgstr "pominięto odkurzanie \"%s\" --- blokada niedostępna"
+
+#: commands/vacuum.c:945
+#, c-format
+msgid "skipping \"%s\" --- only superuser can vacuum it"
+msgstr "pominięto \"%s\" --- tylko superużytkownik może to odkurzyć"
+
+#: commands/vacuum.c:949
+#, c-format
+msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
+msgstr "pominięto \"%s\" --- tylko właściciel bazy danych może to odkurzać"
+
+#: commands/vacuum.c:953
+#, c-format
+msgid "skipping \"%s\" --- only table or database owner can vacuum it"
+msgstr ""
+"pominięto \"%s\" --- tylko właściciel tabeli lub bazy danych może to odkurzać"
+
+#: commands/vacuum.c:970
+#, c-format
+msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
+msgstr ""
+"pominięto \"%s\" --- nie można odkurzyć nie-tabel ani specjalnych tabel "
+"systemowych"
+
+#: commands/vacuumlazy.c:254
+#, c-format
+msgid ""
+"automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
+"pages: %d removed, %d remain\n"
+"tuples: %.0f removed, %.0f remain\n"
+"system usage: %s"
+msgstr ""
+"automatyczne odkurzanie tabeli \"%s.%s.%s\": skany indeksów: %d\n"
+"strony: %d przemianowano, %d pozostało\n"
+"krotki: %.0f usunięto, %.0f pozostało\n"
+"użycie systemu: %s"
+
+#: commands/vacuumlazy.c:508
+#, c-format
+msgid "relation \"%s\" page %u is uninitialized --- fixing"
+msgstr "w relacji \"%s\" strona %u nie jest zainicjowana --- naprawa"
+
+#: commands/vacuumlazy.c:865
+#, c-format
+msgid "\"%s\": removed %.0f row versions in %u pages"
+msgstr "\"%s\": usunięto %.0f wersji wierszy na %u stronach"
+
+#: commands/vacuumlazy.c:870
+#, c-format
+msgid ""
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
+"pages"
+msgstr ""
+"\"%s\": znaleziono %.0f usuwalnych, %.0f nieusuwalnych wersji wierszy na %u "
+"z %u stron"
+
+#: commands/vacuumlazy.c:874
+#, c-format
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"There were %.0f unused item pointers.\n"
+"%u pages are entirely empty.\n"
+"%s."
+msgstr ""
+"%.0f martwych wersji wierszy nie może być jeszcze usuniętych.\n"
+"Było %.0f nieużywanych wskaźników do elementów.\n"
+"%u stron jest zupełnie pustych.\n"
+"%s."
+
+#: commands/vacuumlazy.c:932
+#, c-format
+msgid "\"%s\": removed %d row versions in %d pages"
+msgstr "\"%s\": usunięto %d wersji wierszy na %d stronach"
+
+#: commands/vacuumlazy.c:935 commands/vacuumlazy.c:1027
+#: commands/vacuumlazy.c:1160
+#, c-format
+msgid "%s."
+msgstr "%s."
+
+#: commands/vacuumlazy.c:1024
+#, c-format
+msgid "scanned index \"%s\" to remove %d row versions"
+msgstr "przeskanowano indeks \"%s\" by usunąć %d wersji wierszy"
+
+#: commands/vacuumlazy.c:1065
+#, c-format
+msgid "index \"%s\" now contains %.0f row versions in %u pages"
+msgstr "indeks \"%s\" zawiera teraz %.0f wersji wierszy na %u stronach"
+
+#: commands/vacuumlazy.c:1069
+#, c-format
+msgid ""
+"%.0f index row versions were removed.\n"
+"%u index pages have been deleted, %u are currently reusable.\n"
+"%s."
+msgstr ""
+"%.0f wersji wierszy indeksu zostało usuniętych.\n"
+"%u strony indeksu zostały usunięte, %u jest obecnie ponownie używanych.\n"
+"%s."
+
+#: commands/vacuumlazy.c:1157
+#, c-format
+msgid "\"%s\": truncated %u to %u pages"
+msgstr "\"%s\": obcięto %u na %u stronach"
+
+#: commands/variable.c:160 utils/misc/guc.c:8205
+#, c-format
+msgid "Unrecognized key word: \"%s\"."
+msgstr "Nierozpoznane słowo kluczowe: \"%s\"."
+
+#: commands/variable.c:172
+msgid "Conflicting \"datestyle\" specifications."
+msgstr "Sprzeczne specyfikacje \"datestyle\"."
+
+#: commands/variable.c:328
+msgid "Cannot specify months in time zone interval."
+msgstr "Nie można używać miesięcy w przedziale strefy czasowej."
+
+#: commands/variable.c:334
+msgid "Cannot specify days in time zone interval."
+msgstr "Nie można używać dni w przedziale strefy czasowej."
+
+#: commands/variable.c:378 commands/variable.c:517
+#, c-format
+msgid "time zone \"%s\" appears to use leap seconds"
+msgstr "strefa czasowa \"%s\" wydaje się używać sekund przestępnych"
+
+#: commands/variable.c:380 commands/variable.c:519
+msgid "PostgreSQL does not support leap seconds."
+msgstr "PostgreSQL nie obsługuje sekund przestępnych."
+
+#: commands/variable.c:582
+msgid "cannot set transaction read-write mode inside a read-only transaction"
+msgstr ""
+"nie można ustawić trybu transakcji na odczyt i zapis wewnątrz transakcji "
+"tylko do odczytu"
+
+#: commands/variable.c:589
+msgid "transaction read-write mode must be set before any query"
+msgstr ""
+"tryb zapisu i odczytu transakcji musi być ustawiony przed jakimkolwiek "
+"zapytaniem"
+
+#: commands/variable.c:595
+msgid "cannot set transaction read-write mode during recovery"
+msgstr ""
+"nie można ustawić trybu zapisu i odczytu transakcji podczas odzyskiwania"
+
+#: commands/variable.c:642
+msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
+msgstr ""
+"SET TRANSACTION ISOLATION LEVEL musi być wywołane przed jakimkolwiek "
+"zapytaniem"
+
+#: commands/variable.c:649
+msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
+msgstr "SET TRANSACTION ISOLATION LEVEL nie może być wywołane w podtransakcji"
+
+#: commands/variable.c:655
+msgid "cannot use serializable mode in a hot standby"
+msgstr "nie można używać trybu"
+
+#: commands/variable.c:656
+msgid "You can use REPEATABLE READ instead."
+msgstr "Można w zamian użyć REPEATABLE READ."
+
+#: commands/variable.c:704
+msgid ""
+"SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
+msgstr "SET TRANSACTION [NOT] DEFERRABLE nie może być wywołane w podtransakcji"
+
+#: commands/variable.c:710
+msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
+msgstr ""
+"SET TRANSACTION [NOT] DEFERRABLE musi być wywołane przed jakimkolwiek "
+"zapytaniem"
+
+#: commands/variable.c:792
+#, c-format
+msgid "Conversion between %s and %s is not supported."
+msgstr "Konwersja pomiędzy %s i %s nie jest obsługiwana."
+
+#: commands/variable.c:799
+msgid "Cannot change \"client_encoding\" now."
+msgstr "Nie można teraz zmienić \"client_encoding\"."
+
+#: commands/variable.c:969
+#, c-format
+msgid "permission denied to set role \"%s\""
+msgstr "odmowa dostępu do ustawienia roli \"%s\""
+
+#: commands/view.c:143
+#, c-format
+msgid "could not determine which collation to use for view column \"%s\""
+msgstr "nie można określić, jakiego porównania użyć dla kolumny widoku \"%s\""
+
+#: commands/view.c:158
+msgid "view must have at least one column"
+msgstr "widok musi posiadać przynajmniej jedną kolumnę"
+
+#: commands/view.c:283 commands/view.c:295
+msgid "cannot drop columns from view"
+msgstr "nie można skasować kolumn z widoku"
+
+#: commands/view.c:300
+#, c-format
+msgid "cannot change name of view column \"%s\" to \"%s\""
+msgstr "nie można zmienić nazwy kolumny widoku \"%s\" na \"%s\""
+
+#: commands/view.c:308
+#, c-format
+msgid "cannot change data type of view column \"%s\" from %s to %s"
+msgstr "nie można zmienić typu danych kolumny widoku \"%s\" z %s na %s"
+
+#: commands/view.c:447
+msgid "views must not contain SELECT INTO"
+msgstr "widoki nie mogą zawierać SELECT INTO"
+
+#: commands/view.c:451
+msgid "views must not contain data-modifying statements in WITH"
+msgstr "widoki nie mogą zawierać wyrażeń zmieniających dane w WITH"
+
+#: commands/view.c:479
+msgid "CREATE VIEW specifies more column names than columns"
+msgstr "CREATE VIEW określa więcej nazw kolumn niż kolumn"
+
+#: commands/view.c:487
+msgid "views cannot be unlogged because they do not have storage"
+msgstr "widoki nie mogą być nielogowane ponieważ nie mają składowania"
+
+#: commands/view.c:501
+#, c-format
+msgid "view \"%s\" will be a temporary view"
+msgstr "widok \"%s\" będzie widokiem tymczasowym"
+
+#: commands/seclabel.c:58
+msgid "no security label providers have been loaded"
+msgstr "żaden dostawca etykiety bezpieczeństwa nie został wczytany"
+
+#: commands/seclabel.c:62
+msgid ""
+"must specify provider when multiple security label providers have been loaded"
+msgstr ""
+"wymagane wskazanie dostawcy gdy wczytano wielu dostawców etykiet "
+"bezpieczeństwa"
+
+#: commands/seclabel.c:80
+#, c-format
+msgid "security label provider \"%s\" is not loaded"
+msgstr "dostawca etykiety bezpieczeństwa \"%s\" nie jest wczytany"
+
+#: commands/extension.c:148 commands/extension.c:2427
+#, c-format
+msgid "extension \"%s\" does not exist"
+msgstr "rozszerzenie \"%s\" nie istnieje"
+
+#: commands/extension.c:247 commands/extension.c:256 commands/extension.c:268
+#: commands/extension.c:278
+#, c-format
+msgid "invalid extension name: \"%s\""
+msgstr "nieprawidłowa nazwa rozszerzenia: \"%s\""
+
+#: commands/extension.c:248
+msgid "Extension names must not be empty."
+msgstr "Nazwy rozszerzeń nie mogą być puste."
+
+#: commands/extension.c:257
+msgid "Extension names must not contain \"--\"."
+msgstr "Nazwy rozszerzeń nie mogą zawierać \"--\"."
+
+#: commands/extension.c:269
+msgid "Extension names must not begin or end with \"-\"."
+msgstr "Nazwy rozszerzeń nie mogą zaczynać się ani kończyć znakiem \"-\"."
+
+#: commands/extension.c:279
+msgid "Extension names must not contain directory separator characters."
+msgstr "Nazwy rozszerzeń nie mogą zawierać znaków rozdzielających słownika."
+
+#: commands/extension.c:294 commands/extension.c:303 commands/extension.c:312
+#: commands/extension.c:322
+#, c-format
+msgid "invalid extension version name: \"%s\""
+msgstr "nieprawidłowa nazwa wersji rozszerzenia: \"%s\""
+
+#: commands/extension.c:295
+msgid "Version names must not be empty."
+msgstr "Nazwy wersji nie mogą być puste."
+
+#: commands/extension.c:304
+msgid "Version names must not contain \"--\"."
+msgstr "Nazwy wersji nie mogą zawierać \"--\"."
+
+#: commands/extension.c:313
+msgid "Version names must not begin or end with \"-\"."
+msgstr "Nazwy wersji nie mogą zaczynać się ani kończyć znakiem \"-\"."
+
+#: commands/extension.c:323
+msgid "Version names must not contain directory separator characters."
+msgstr "Nazwy wersji nie mogą zawierać znaków rozdzielających słownika."
+
+#: commands/extension.c:473
+#, c-format
+msgid "could not open extension control file \"%s\": %m"
+msgstr "nie można otworzyć pliku kontrolnego rozszerzenia \"%s\": %m"
+
+#: commands/extension.c:494 commands/extension.c:504
+#, c-format
+msgid "parameter \"%s\" cannot be set in a secondary extension control file"
+msgstr ""
+"parametr \"%s\" nie może być ustawiony we wtórnym pliku kontrolnym "
+"rozszerzenia"
+
+#: commands/extension.c:543
+#, c-format
+msgid "\"%s\" is not a valid encoding name"
+msgstr "\"%s\" nie jest poprawnÄ… nazwÄ… kodowania"
+
+#: commands/extension.c:557
+#, c-format
+msgid "parameter \"%s\" must be a list of extension names"
+msgstr "parametr \"%s\" nie może być listą nazw rozszerzeń"
+
+#: commands/extension.c:564
+#, c-format
+msgid "unrecognized parameter \"%s\" in file \"%s\""
+msgstr "nierozpoznany parametr \"%s\" w pliku \"%s\""
+
+#: commands/extension.c:573
+msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
+msgstr ""
+"parametr \"schema\" nie może być wskazany gdy \"relocatable\" jest prawdą"
+
+#: commands/extension.c:725
+msgid ""
+"transaction control statements are not allowed within an extension script"
+msgstr ""
+"wyrażenia kontrolne transakcji nie są dopuszczalne w skryptach rozszerzeń"
+
+#: commands/extension.c:793
+#, c-format
+msgid "permission denied to create extension \"%s\""
+msgstr "odmowa dostępu do tworzenia rozszerzenia \"%s\""
+
+#: commands/extension.c:795
+msgid "Must be superuser to create this extension."
+msgstr "musisz być superużytkownikiem aby utworzyć to rozszerzenie."
+
+#: commands/extension.c:799
+#, c-format
+msgid "permission denied to update extension \"%s\""
+msgstr "odmowa dostępu do modyfikacji rozszerzenia \"%s\""
+
+#: commands/extension.c:801
+msgid "Must be superuser to update this extension."
+msgstr "Musisz być superużytkownikiem aby zmodyfikować to rozszerzenie."
+
+#: commands/extension.c:1069
+#, c-format
+msgid ""
+"extension \"%s\" has no update path from version \"%s\" to version \"%s\""
+msgstr ""
+"rozszerzenie \"%s\" nie ma ścieżki modyfikacji z wersji \"%s\" do wersji \"%s"
+"\""
+
+#: commands/extension.c:1196
+#, c-format
+msgid "extension \"%s\" already exists, skipping"
+msgstr "rozszerzenie \"%s\" już istnieje, pominięto"
+
+#: commands/extension.c:1203
+#, c-format
+msgid "extension \"%s\" already exists"
+msgstr "rozszerzenie \"%s\" już istnieje"
+
+#: commands/extension.c:1214
+msgid "nested CREATE EXTENSION is not supported"
+msgstr "zagnieżdżone CREATE EXTENSION nie jest obsługiwane"
+
+#: commands/extension.c:1269 commands/extension.c:2487
+msgid "version to install must be specified"
+msgstr "wersja do zainstalowanie musi być określona"
+
+#: commands/extension.c:1286
+#, c-format
+msgid "FROM version must be different from installation target version \"%s\""
+msgstr "wersja FROM musi być inna niż wersja docelowa instalacji \"%s\""
+
+#: commands/extension.c:1341
+#, c-format
+msgid "extension \"%s\" must be installed in schema \"%s\""
+msgstr "rozszerzenie \"%s\" musi być zainstalowane w schemacie \"%s\""
+
+#: commands/extension.c:1420 commands/extension.c:2628
+#, c-format
+msgid "required extension \"%s\" is not installed"
+msgstr "wymagane rozszerzenie \"%s\" nie jest zainstalowane"
+
+#: commands/extension.c:1589
+#, c-format
+msgid "extension \"%s\" does not exist, skipping"
+msgstr "rozszerzenie \"%s\" nie istnieje, pominięto"
+
+#: commands/extension.c:2097
+msgid ""
+"pg_extension_config_dump() can only be called from an SQL script executed by "
+"CREATE EXTENSION"
+msgstr ""
+"pg_extension_config_dump() może być wywołane tylko ze skryptu SQL "
+"wykonywanego przez CREATE EXTENSION"
+
+#: commands/extension.c:2109
+#, c-format
+msgid "OID %u does not refer to a table"
+msgstr "OID %u nie wskazuje na tabelÄ™"
+
+#: commands/extension.c:2114
+#, c-format
+msgid "table \"%s\" is not a member of the extension being created"
+msgstr "tabela \"%s\" nie jest składnikiem tworzonego właśnie rozszerzenia"
+
+#: commands/extension.c:2297 commands/extension.c:2356
+#, c-format
+msgid "extension \"%s\" does not support SET SCHEMA"
+msgstr "rozszerzenie \"%s\" nie obsługuje SET SCHEMA"
+
+#: commands/extension.c:2358
+#, c-format
+msgid "%s is not in the extension's schema \"%s\""
+msgstr "%s nie znajduje siÄ™ w schemacie \"%s\" rozszerzenia"
+
+#: commands/extension.c:2407
+msgid "nested ALTER EXTENSION is not supported"
+msgstr "zagnieżdżone ALTER EXTENSION nie jest obsługiwane"
+
+#: commands/extension.c:2498
+#, c-format
+msgid "version \"%s\" of extension \"%s\" is already installed"
+msgstr "wersja \"%s\" rozszerzenia \"%s\" jest już zainstalowana"
+
+#: commands/extension.c:2738
+#, c-format
+msgid "%s is not a member of extension \"%s\""
+msgstr "%s nie jest składnikiem rozszerzenia \"%s\""
+
+#: commands/collationcmds.c:81
+#, c-format
+msgid "collation attribute \"%s\" not recognized"
+msgstr "atrybut porównania \"%s\" nie rozpoznany"
+
+#: commands/collationcmds.c:126
+msgid "parameter \"lc_collate\" must be specified"
+msgstr "parametr \"lc_collate\" musi być określony"
+
+#: commands/collationcmds.c:131
+msgid "parameter \"lc_ctype\" must be specified"
+msgstr "parametr \"lc_ctype\" musi być określony"
+
+#: commands/collationcmds.c:177
+#, c-format
+msgid "collation \"%s\" does not exist, skipping"
+msgstr "porównanie \"%s\" nie istnieje, pominięto"
+
+#: commands/collationcmds.c:237 commands/collationcmds.c:416
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
+msgstr "porównanie \"%s\" kodowania \"%s\" istnieje już w schemacie \"%s\""
+
+#: commands/collationcmds.c:249 commands/collationcmds.c:428
+#, c-format
+msgid "collation \"%s\" already exists in schema \"%s\""
+msgstr "porównanie \"%s\" istnieje już w schemacie \"%s\""
+
+#: tcop/fastpath.c:109 tcop/fastpath.c:485 tcop/fastpath.c:615
+#, c-format
+msgid "invalid argument size %d in function call message"
+msgstr "niepoprawny rozmiar argumentu %d wiadomości wywołania funkcji"
+
+#: tcop/fastpath.c:303 tcop/postgres.c:917 tcop/postgres.c:1227
+#: tcop/postgres.c:1508 tcop/postgres.c:1950 tcop/postgres.c:2318
+#: tcop/postgres.c:2399
+msgid ""
+"current transaction is aborted, commands ignored until end of transaction "
+"block"
+msgstr ""
+"bieżąca transakcja została przerwana, polecenia ignorowane do końca bloku "
+"transakcji"
+
+#: tcop/fastpath.c:331
+#, c-format
+msgid "fastpath function call: \"%s\" (OID %u)"
+msgstr "wywołanie funkcji fastpath: \"%s\" (OID %u)"
+
+#: tcop/fastpath.c:411 tcop/postgres.c:1087 tcop/postgres.c:1374
+#: tcop/postgres.c:1791 tcop/postgres.c:2008
+#, c-format
+msgid "duration: %s ms"
+msgstr "czas trwania: %s ms"
+
+#: tcop/fastpath.c:415
+#, c-format
+msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
+msgstr "czas trwania: %s ms  wywołanie funkcji fastpath: \"%s\" (OID %u)"
+
+#: tcop/fastpath.c:453 tcop/fastpath.c:580
+#, c-format
+msgid "function call message contains %d arguments but function requires %d"
+msgstr ""
+"wiadomość wywołania funkcji zawiera %d argumentów zaś funkcja wymaga %d"
+
+#: tcop/fastpath.c:461
+#, c-format
+msgid "function call message contains %d argument formats but %d arguments"
+msgstr ""
+"wiadomość wywołania funkcji zawiera %d formatów argumentów a %d argumentów"
+
+#: tcop/fastpath.c:548 tcop/fastpath.c:631
+#, c-format
+msgid "incorrect binary data format in function argument %d"
+msgstr "niepoprawny format binarny w argumencie funkcji %d"
+
+#: tcop/postgres.c:399 tcop/postgres.c:411 tcop/postgres.c:422
+#: tcop/postgres.c:434 tcop/postgres.c:4152
+#, c-format
+msgid "invalid frontend message type %d"
+msgstr "niepoprawny typ komunikatu frontendu %d"
+
+#: tcop/postgres.c:858
+#, c-format
+msgid "statement: %s"
+msgstr "wyrażenie: %s"
+
+#: tcop/postgres.c:1092
+#, c-format
+msgid "duration: %s ms  statement: %s"
+msgstr "czas trwania: %s ms  wyrażenie: %s"
+
+#: tcop/postgres.c:1142
+#, c-format
+msgid "parse %s: %s"
+msgstr "parsowanie %s: %s"
+
+#: tcop/postgres.c:1200
+msgid "cannot insert multiple commands into a prepared statement"
+msgstr "nie można wstawić wielu poleceń w przygotowane wyrażenie"
+
+#: tcop/postgres.c:1379
+#, c-format
+msgid "duration: %s ms  parse %s: %s"
+msgstr "czas trwania: %s ms  parsowanie %s: %s"
+
+#: tcop/postgres.c:1425
+#, c-format
+msgid "bind %s to %s"
+msgstr "dowiÄ…zanie %s do %s"
+
+#: tcop/postgres.c:1444 tcop/postgres.c:2298
+msgid "unnamed prepared statement does not exist"
+msgstr "nienazwane przygotowane wyrażenie nie istnieje"
+
+#: tcop/postgres.c:1486
+#, c-format
+msgid "bind message has %d parameter formats but %d parameters"
+msgstr "komunikat dowiązania ma %d formatów parametrów, a %d parametrów"
+
+#: tcop/postgres.c:1492
+#, c-format
+msgid ""
+"bind message supplies %d parameters, but prepared statement \"%s\" requires "
+"%d"
+msgstr ""
+"komunikat dowiązania dostarcza %d parametrów, zaś przygotowane wyrażenie \"%s"
+"\" wymaga %d"
+
+#: tcop/postgres.c:1657
+#, c-format
+msgid "incorrect binary data format in bind parameter %d"
+msgstr "niepoprawny format binarny w dowiÄ…zanym parametrze %d"
+
+#: tcop/postgres.c:1796
+#, c-format
+msgid "duration: %s ms  bind %s%s%s: %s"
+msgstr "czas trwania: %s ms  dowiÄ…zanie %s%s%s: %s"
+
+#: tcop/postgres.c:1844 tcop/postgres.c:2385
+#, c-format
+msgid "portal \"%s\" does not exist"
+msgstr "portal \"%s\" nie istnieje"
+
+#: tcop/postgres.c:1931 tcop/postgres.c:2016
+msgid "execute fetch from"
+msgstr "wykonanie pobrania z"
+
+#: tcop/postgres.c:1932 tcop/postgres.c:2017
+msgid "execute"
+msgstr "wykonanie"
+
+#: tcop/postgres.c:1929
+#, c-format
+msgid "%s %s%s%s: %s"
+msgstr "%s %s%s%s: %s"
+
+#: tcop/postgres.c:2013
+#, c-format
+msgid "duration: %s ms  %s %s%s%s: %s"
+msgstr "czas trwania: %s ms  %s %s%s%s: %s"
+
+#: tcop/postgres.c:2139
+#, c-format
+msgid "prepare: %s"
+msgstr "przygotuj: %s"
+
+#: tcop/postgres.c:2202
+#, c-format
+msgid "parameters: %s"
+msgstr "parametry: %s"
+
+#: tcop/postgres.c:2221
+msgid "abort reason: recovery conflict"
+msgstr "powód przerwania: konflikt odzyskiwania"
+
+#: tcop/postgres.c:2237
+msgid "User was holding shared buffer pin for too long."
+msgstr "Użytkownik trzymał zbyt długo przypięty współdzielony bufor."
+
+#: tcop/postgres.c:2240
+msgid "User was holding a relation lock for too long."
+msgstr "Użytkownik trzymał zbyt długo blokadę relacji."
+
+#: tcop/postgres.c:2243
+msgid "User was or might have been using tablespace that must be dropped."
+msgstr ""
+"Użytkownik używał lub mógł używać przestrzeni tabel, które muszą być "
+"skasowane."
+
+#: tcop/postgres.c:2246
+msgid "User query might have needed to see row versions that must be removed."
+msgstr ""
+"Zapytanie użytkownika mogło wymagać przeglądania wersji wierszy, które muszą "
+"być usunięte."
+
+#: tcop/postgres.c:2249 storage/ipc/standby.c:491
+msgid "User transaction caused buffer deadlock with recovery."
+msgstr "Transakcja użytkownika spowodowała zakleszczenie bufora z odzyskaniem."
+
+#: tcop/postgres.c:2252
+msgid "User was connected to a database that must be dropped."
+msgstr "Użytkownik był połączony z baza danych, która musi być skasowana."
+
+#: tcop/postgres.c:2586
+msgid "terminating connection because of crash of another server process"
+msgstr "zakończenie połączenia spowodowane awarią innego procesu serwera"
+
+#: tcop/postgres.c:2587
+msgid ""
+"The postmaster has commanded this server process to roll back the current "
+"transaction and exit, because another server process exited abnormally and "
+"possibly corrupted shared memory."
+msgstr ""
+"Postmaster nakazał temu procesowi serwera wycofanie bieżącej transakcji i "
+"wyjście, gdyż inny proces serwera zakończył się nieprawidłowo i pamięć "
+"współdzielona może być uszkodzona."
+
+#: tcop/postgres.c:2591 tcop/postgres.c:2941
+msgid ""
+"In a moment you should be able to reconnect to the database and repeat your "
+"command."
+msgstr ""
+"Za chwilę będziesz mógł połączyć się ponownie do bazy danych i powtórzyć "
+"polecenie."
+
+#: tcop/postgres.c:2703
+msgid "floating-point exception"
+msgstr "wyjÄ…tek zwiÄ…zany z liczbÄ… zmiennoprzecinkowÄ…"
+
+#: tcop/postgres.c:2704
+msgid ""
+"An invalid floating-point operation was signaled. This probably means an out-"
+"of-range result or an invalid operation, such as division by zero."
+msgstr ""
+"Została zasygnalizowana niepoprawna operacja zmiennoprzecinkowa . Oznacza to "
+"prawdopodobnie wynik spoza zakresu lub niepoprawnÄ… operacjÄ™, jak dzielenie "
+"przez zero."
+
+#: tcop/postgres.c:2872
+msgid "terminating autovacuum process due to administrator command"
+msgstr "zakończono proces autoodkurzania na skutek polecenia administratora"
+
+#: tcop/postgres.c:2878 tcop/postgres.c:2888 tcop/postgres.c:2939
+msgid "terminating connection due to conflict with recovery"
+msgstr "zakończono połączenie na skutek konfliktu podczas odzyskiwania"
+
+#: tcop/postgres.c:2894
+msgid "terminating connection due to administrator command"
+msgstr "zakończono połączenie na skutek polecenia administratora"
+
+#: tcop/postgres.c:2909
+msgid "canceling authentication due to timeout"
+msgstr "anulowano autentykacjÄ™ z powodu przekroczonego czasu oczekiwania"
+
+#: tcop/postgres.c:2918
+msgid "canceling statement due to statement timeout"
+msgstr "anulowano polecenie z powodu przekroczonego czasu wykonania"
+
+#: tcop/postgres.c:2927
+msgid "canceling autovacuum task"
+msgstr "anulowano zadanie autoodkurzania"
+
+#: tcop/postgres.c:2946 storage/ipc/standby.c:490
+msgid "canceling statement due to conflict with recovery"
+msgstr "anulowano polecenie z powodu konfliktu podczas odzyskiwania"
+
+#: tcop/postgres.c:2962
+msgid "canceling statement due to user request"
+msgstr "anulowano polecenie na skutek żądania użytkownika"
+
+#: tcop/postgres.c:3043 tcop/postgres.c:3065
+msgid "stack depth limit exceeded"
+msgstr "przekroczono limit głębokości stosu"
+
+#: tcop/postgres.c:3044 tcop/postgres.c:3066
+#, c-format
+msgid ""
+"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
+"after ensuring the platform's stack depth limit is adequate."
+msgstr ""
+"Zwiększ parametr konfiguracji \"max_stack_depth\" (obecnie %dkB) po "
+"upewnieniu się że limit głębokości stosu platformy jest odpowiedni."
+
+#: tcop/postgres.c:3082
+#, c-format
+msgid "\"max_stack_depth\" must not exceed %ldkB."
+msgstr "\"max_stack_depth\" nie może przekraczać %ldkB."
+
+#: tcop/postgres.c:3084
+msgid ""
+"Increase the platform's stack depth limit via \"ulimit -s\" or local "
+"equivalent."
+msgstr ""
+"Zwiększ limit głębokości stosu platformy przez \"ulimit -s\" lub ekwiwalent "
+"lokalny."
+
+#: tcop/postgres.c:3419
+msgid "invalid command-line arguments for server process"
+msgstr "niepoprawny argument wiersza poleceń dla procesu serwera"
+
+#: tcop/postgres.c:3420 tcop/postgres.c:3426
+#, c-format
+msgid "Try \"%s --help\" for more information."
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji."
+
+#: tcop/postgres.c:3424
+#, c-format
+msgid "%s: invalid command-line arguments"
+msgstr "%s: nieprawidłowy argument wiersza poleceń"
+
+#: tcop/postgres.c:3523
+#, c-format
+msgid "%s: no database nor user name specified"
+msgstr "%s: nie wskazano ani bazy danych ani nazwy użytkownika"
+
+#: tcop/postgres.c:4062
+#, c-format
+msgid "invalid CLOSE message subtype %d"
+msgstr "niepoprawny podtyp %d komunikatu CLOSE"
+
+#: tcop/postgres.c:4095
+#, c-format
+msgid "invalid DESCRIBE message subtype %d"
+msgstr "niepoprawny podtyp %d komunikatu DESCRIBE"
+
+#: tcop/postgres.c:4329
+#, c-format
+msgid ""
+"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
+"%s"
+msgstr ""
+"rozłączenie: czas sesji: %d:%02d:%02d.%03d użytkownik=%s baza=%s host=%s%s%s"
+
+#: tcop/pquery.c:660
+#, c-format
+msgid "bind message has %d result formats but query has %d columns"
+msgstr "komunikat dowiązania ma %d formatowań wyniku a zapytanie ma %d kolumn"
+
+#: tcop/pquery.c:969
+msgid "cursor can only scan forward"
+msgstr "kursor może skanować tylko w przód"
+
+#: tcop/pquery.c:970
+msgid "Declare it with SCROLL option to enable backward scan."
+msgstr "Zadeklaruj go z opcją SCROLL aby włączyć skanowanie do tyłu."
+
+#. translator: %s is name of a SQL command, eg CREATE
+#: tcop/utility.c:253
+#, c-format
+msgid "cannot execute %s in a read-only transaction"
+msgstr "nie można wykonać %s wewnątrz transakcji tylko do odczytu"
+
+#. translator: %s is name of a SQL command, eg CREATE
+#: tcop/utility.c:272
+#, c-format
+msgid "cannot execute %s during recovery"
+msgstr "nie można wykonywać %s podczas odzyskiwania"
+
+#. translator: %s is name of a SQL command, eg PREPARE
+#: tcop/utility.c:290
+#, c-format
+msgid "cannot execute %s within security-restricted operation"
+msgstr "nie można wykonać %s operacją o ograniczonym bezpieczeństwie"
+
+#: tcop/utility.c:1194
+msgid "must be superuser to do CHECKPOINT"
+msgstr "musisz być superużytkownikiem by wykonać CHECKPOINT"
+
+#: executor/execCurrent.c:75
+#, c-format
+msgid "cursor \"%s\" is not a SELECT query"
+msgstr "kursor \"%s\" nie jest kwerendÄ… SELECT"
+
+#: executor/execCurrent.c:81
+#, c-format
+msgid "cursor \"%s\" is held from a previous transaction"
+msgstr "kursor \"%s\" wykonuje siÄ™ od poprzedniej transakcji"
+
+#: executor/execCurrent.c:113
+#, c-format
+msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
+msgstr ""
+"kursor \"%s\" posiada wielokrotne odwołanie FOR UPDATE/SHARE do tabeli \"%s\""
+
+#: executor/execCurrent.c:122
+#, c-format
+msgid ""
+"cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
+msgstr "kursor \"%s\" nie posiada odwołania FOR UPDATE/SHARE do tabeli \"%s\""
+
+#: executor/execCurrent.c:132 executor/execCurrent.c:178
+#, c-format
+msgid "cursor \"%s\" is not positioned on a row"
+msgstr "kursor \"%s\" nie jest ustawiony na wierszu"
+
+#: executor/execCurrent.c:165
+#, c-format
+msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
+msgstr "kursor \"%s\" nie jest prostym modyfikowalnym skanem tabeli \"%s\""
+
+#: executor/execCurrent.c:230 executor/execQual.c:1033
+#, c-format
+msgid ""
+"type of parameter %d (%s) does not match that when preparing the plan (%s)"
+msgstr ""
+"typ parametru %d (%s) nie pasuje do tego podczas przygotowania planu (%s)"
+
+#: executor/execCurrent.c:242 executor/execQual.c:1045
+#, c-format
+msgid "no value found for parameter %d"
+msgstr "nie odnaleziono wartości dla parametru %d"
+
+#: executor/execMain.c:996
+#, c-format
+msgid "cannot change sequence \"%s\""
+msgstr "nie można zmienić sekwencji \"%s\""
+
+#: executor/execMain.c:1002
+#, c-format
+msgid "cannot change TOAST relation \"%s\""
+msgstr "nie można zmienić relacji TOAST \"%s\""
+
+#: executor/execMain.c:1012
+#, c-format
+msgid "cannot insert into view \"%s\""
+msgstr "nie można wstawiać do widoku \"%s\""
+
+#: executor/execMain.c:1014
+msgid ""
+"You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT "
+"trigger."
+msgstr ""
+"Potrzebujesz bezwarunkowej reguły ON INSERT DO INSTEAD lub wyzwalacza "
+"INSTEAD OF INSERT."
+
+#: executor/execMain.c:1020
+#, c-format
+msgid "cannot update view \"%s\""
+msgstr "nie można modyfikować widoku \"%s\""
+
+#: executor/execMain.c:1022
+msgid ""
+"You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE "
+"trigger."
+msgstr ""
+"Potrzebujesz bezwarunkowej reguły ON UPDATE DO INSTEAD lub wyzwalacza "
+"INSTEAD OF UPDATE."
+
+#: executor/execMain.c:1028
+#, c-format
+msgid "cannot delete from view \"%s\""
+msgstr "nie można usuwać z widoku \"%s\""
+
+#: executor/execMain.c:1030
+msgid ""
+"You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE "
+"trigger."
+msgstr ""
+"Potrzebujesz bezwarunkowej reguły ON DELETE DO INSTEAD lub wyzwalacza "
+"INSTEAD OF DELETE."
+
+#: executor/execMain.c:1040
+#, c-format
+msgid "cannot change foreign table \"%s\""
+msgstr "nie można zmienić tabeli obcej \"%s\""
+
+#: executor/execMain.c:1046
+#, c-format
+msgid "cannot change relation \"%s\""
+msgstr "nie można zmienić relacji \"%s\""
+
+#: executor/execMain.c:1070
+#, c-format
+msgid "cannot lock rows in sequence \"%s\""
+msgstr "nie można blokować wierszy w sekwencji \"%s\""
+
+#: executor/execMain.c:1077
+#, c-format
+msgid "cannot lock rows in TOAST relation \"%s\""
+msgstr "nie można blokować wierszy w relacji TOAST \"%s\""
+
+#: executor/execMain.c:1084
+#, c-format
+msgid "cannot lock rows in view \"%s\""
+msgstr "nie można blokować wierszy w widoku \"%s\""
+
+#: executor/execMain.c:1091
+#, c-format
+msgid "cannot lock rows in foreign table \"%s\""
+msgstr "nie można blokować wierszy w tabeli obcej \"%s\""
+
+#: executor/execMain.c:1097
+#, c-format
+msgid "cannot lock rows in relation \"%s\""
+msgstr "nie można blokować wierszy w relacji \"%s\""
+
+#: executor/execMain.c:1568
+#, c-format
+msgid "null value in column \"%s\" violates not-null constraint"
+msgstr ""
+"pusta wartość w kolumnie \"%s\" narusza ograniczenie wymaganej wartości"
+
+#: executor/execMain.c:1580
+#, c-format
+msgid "new row for relation \"%s\" violates check constraint \"%s\""
+msgstr ""
+"nowy rekord dla relacji \"%s\" narusza ograniczenie sprawdzajÄ…ce \"%s\""
+
+#: executor/execQual.c:298 executor/execQual.c:326 executor/execQual.c:2987
+#: utils/adt/array_userfuncs.c:430 utils/adt/arrayfuncs.c:228
+#: utils/adt/arrayfuncs.c:507 utils/adt/arrayfuncs.c:1242
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:4940
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "liczba wymiarów tablicy (%d) przekracza maksimum (%d)"
+
+#: executor/execQual.c:311 executor/execQual.c:339
+msgid "array subscript in assignment must not be null"
+msgstr ""
+"w instrukcji przypisania do elementu tablicy indeksem elementu nie może być "
+"NULL"
+
+#: executor/execQual.c:635 executor/execQual.c:3905
+#, c-format
+msgid "attribute %d has wrong type"
+msgstr "atrybut %d posiada nieprawidłowy typ"
+
+#: executor/execQual.c:636 executor/execQual.c:3906
+#, c-format
+msgid "Table has type %s, but query expects %s."
+msgstr "Tabela posiada typ %s, ale zapytanie wymaga %s."
+
+#: executor/execQual.c:700 executor/execQual.c:719 executor/execQual.c:918
+#: executor/nodeModifyTable.c:82 executor/nodeModifyTable.c:92
+#: executor/nodeModifyTable.c:109 executor/nodeModifyTable.c:117
+msgid "table row type and query-specified row type do not match"
+msgstr ""
+"typ wiersza tabeli i typ wiersza określonego przez zapytanie nie zgadzają się"
+
+#: executor/execQual.c:701
+#, c-format
+msgid "Table row contains %d attribute, but query expects %d."
+msgid_plural "Table row contains %d attributes, but query expects %d."
+msgstr[0] "Wiersz tabeli posiada %d atrybut, ale zapytanie oczekuje %d."
+msgstr[1] "Wiersz tabeli posiada %d atrybuty, ale zapytanie oczekuje %d."
+msgstr[2] "Wiersz tabeli posiada %d atrybutów, ale zapytanie oczekuje %d."
+
+#: executor/execQual.c:720 executor/nodeModifyTable.c:93
+#, c-format
+msgid "Table has type %s at ordinal position %d, but query expects %s."
+msgstr ""
+"Tabela posiada typ %s na pozycji porzÄ…dkowej %d, ale zapytanie oczekuje %s."
+
+#: executor/execQual.c:919 executor/execQual.c:1519
+#, c-format
+msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
+msgstr ""
+"Niedopasowanie fizycznego przechowywania na skasowanym atrybucie na pozycji "
+"porzÄ…dkowej %d."
+
+#: executor/execQual.c:1198 parser/parse_func.c:91 parser/parse_func.c:323
+#: parser/parse_func.c:640
+#, c-format
+msgid "cannot pass more than %d argument to a function"
+msgid_plural "cannot pass more than %d arguments to a function"
+msgstr[0] "nie można przekazać więcej niż %d argument do funkcji"
+msgstr[1] "nie można przekazać więcej niż %d argumenty do funkcji"
+msgstr[2] "nie można przekazać więcej niż %d argumentów do funkcji"
+
+#: executor/execQual.c:1387
+msgid "functions and operators can take at most one set argument"
+msgstr ""
+"funkcje i operatory mogą przyjmować co najwyżej jeden zestaw argumentów"
+
+#: executor/execQual.c:1437
+#, fuzzy
+msgid ""
+"function returning setof record called in context that cannot accept type "
+"record"
+msgstr ""
+"funkcja zwracająca zbiór rekordów wywołana w kontekście nie dopuszczającym "
+"typu złożonego"
+
+#: executor/execQual.c:1492 executor/execQual.c:1508 executor/execQual.c:1518
+msgid "function return row and query-specified return row do not match"
+msgstr ""
+"wiersz zwrócony przez funkcję i wiersz określony przez zapytanie nie pasują"
+
+#: executor/execQual.c:1493
+#, c-format
+msgid "Returned row contains %d attribute, but query expects %d."
+msgid_plural "Returned row contains %d attributes, but query expects %d."
+msgstr[0] "Zwracany wiersz posiada %d atrybut, ale zapytanie oczekuje %d."
+msgstr[1] "Zwracany wiersz posiada %d atrybuty, ale zapytanie oczekuje %d."
+msgstr[2] "Zwracany wiersz posiada %d atrybutów, ale zapytanie oczekuje %d."
+
+#: executor/execQual.c:1509
+#, c-format
+msgid "Returned type %s at ordinal position %d, but query expects %s."
+msgstr "Zwracany typ %s na pozycji porzÄ…dkowej %d, ale zapytanie oczekuje %s."
+
+#: executor/execQual.c:1745 executor/execQual.c:2170
+#, fuzzy
+msgid "table-function protocol for materialize mode was not followed"
+msgstr "protokół tabela-funkcja dla trybu materializacji nie został spełniony"
+
+#: executor/execQual.c:1765 executor/execQual.c:2177
+#, c-format
+msgid "unrecognized table-function returnMode: %d"
+msgstr "nierozpoznany returnMode tabela-funkcja: %d"
+
+#: executor/execQual.c:2087
+msgid "function returning set of rows cannot return null value"
+msgstr "funkcja zwracająca zbiór rekordów nie może zwracać pustych wartości"
+
+#: executor/execQual.c:2144
+msgid "rows returned by function are not all of the same row type"
+msgstr "wiersze zwrócone przez funkcję nie są wszystkie tego samego typu"
+
+#: executor/execQual.c:2335
+msgid "IS DISTINCT FROM does not support set arguments"
+msgstr "IS DISTINCT FROM nie obsługuje argumentów grupowych"
+
+#: executor/execQual.c:2412
+msgid "op ANY/ALL (array) does not support set arguments"
+msgstr "op ANY/ALL (array) nie obsługuje argumentów grupowych"
+
+#: executor/execQual.c:2965
+msgid "cannot merge incompatible arrays"
+msgstr "nie można scalić niekompatybilnych tablic"
+
+#: executor/execQual.c:2966
+#, c-format
+msgid ""
+"Array with element type %s cannot be included in ARRAY construct with "
+"element type %s."
+msgstr ""
+"Tablica o typie elementu %s nie może być zawarta w konstrukcie ARRAY o typie "
+"elementu %s."
+
+#: executor/execQual.c:3007 executor/execQual.c:3034
+#: utils/adt/arrayfuncs.c:542
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"wielowymiarowe tablice muszą mieć wyrażenia tablicowe z pasującymi wymiarami"
+
+#: executor/execQual.c:3549
+msgid "NULLIF does not support set arguments"
+msgstr "NULLIF nie obsługuje argumentów grupowych"
+
+#: executor/execQual.c:3779 utils/adt/domains.c:128
+#, c-format
+msgid "domain %s does not allow null values"
+msgstr "domena %s nie zezwala na puste wartości"
+
+#: executor/execQual.c:3808 utils/adt/domains.c:164
+#, c-format
+msgid "value for domain %s violates check constraint \"%s\""
+msgstr "wartość dla domeny %s narusza ograniczenie sprawdzające \"%s\""
+
+#: executor/execQual.c:4288 optimizer/util/clauses.c:572
+#: parser/parse_agg.c:164
+msgid "aggregate function calls cannot be nested"
+msgstr "wywołania funkcji agregującej nie mogą być zagnieżdżone"
+
+#: executor/execQual.c:4326 optimizer/util/clauses.c:646
+#: parser/parse_agg.c:211
+msgid "window function calls cannot be nested"
+msgstr "wywołania funkcji okna nie mogą być zagnieżdżone"
+
+#: executor/execQual.c:4538
+msgid "target type is not an array"
+msgstr "typ docelowy nie jest tablica"
+
+#: executor/execQual.c:4651
+#, c-format
+msgid "ROW() column has type %s instead of type %s"
+msgstr "kolumna ROW() posiada typ %s zamiast typu %s"
+
+#: executor/execQual.c:4786 utils/adt/arrayfuncs.c:3378
+#: utils/adt/rowtypes.c:922
+#, c-format
+msgid "could not identify a comparison function for type %s"
+msgstr "nie można określić funkcji porównującej dla typu %s"
+
+#: executor/execUtils.c:1305
+#, c-format
+msgid "could not create exclusion constraint \"%s\""
+msgstr "nie można utworzyć ograniczenia wykluczającego \"%s\""
+
+#: executor/execUtils.c:1307
+#, c-format
+msgid "Key %s conflicts with key %s."
+msgstr "Klucz %s jest sprzeczny z kluczem %s."
+
+#: executor/execUtils.c:1312
+#, c-format
+msgid "conflicting key value violates exclusion constraint \"%s\""
+msgstr "sprzeczna wartość klucza narusza ograniczenie wykluczające \"%s\""
+
+#: executor/execUtils.c:1314
+#, c-format
+msgid "Key %s conflicts with existing key %s."
+msgstr "Klucz %s jest sprzeczny z istniejÄ…cym kluczem %s."
+
+#: executor/functions.c:195
+#, c-format
+msgid "could not determine actual type of argument declared %s"
+msgstr "nie można określić aktualnego typu argumentu deklarującego %s"
+
+#. translator: %s is a SQL statement name
+#: executor/functions.c:295
+#, c-format
+msgid "%s is not allowed in a SQL function"
+msgstr "%s nie jest dopuszczalne w funkcji SQL"
+
+#. translator: %s is a SQL statement name
+#: executor/functions.c:302 executor/spi.c:1256 executor/spi.c:1891
+#, c-format
+msgid "%s is not allowed in a non-volatile function"
+msgstr "%s nie jest dopuszczalne w niezmiennej funkcji"
+
+#: executor/functions.c:408
+#, c-format
+msgid ""
+"could not determine actual result type for function declared to return type "
+"%s"
+msgstr ""
+"nie można określić aktualnego typu wyniku dla funkcji zadeklarowanej jako "
+"zwracajÄ…ca typ %s"
+
+#: executor/functions.c:1146
+#, c-format
+msgid "SQL function \"%s\" statement %d"
+msgstr "funkcja SQL \"%s\" wyrażenie %d"
+
+#: executor/functions.c:1172
+#, c-format
+msgid "SQL function \"%s\" during startup"
+msgstr "funkcja SQL \"%s\" w czasie uruchamiania"
+
+#: executor/functions.c:1332 executor/functions.c:1368
+#: executor/functions.c:1380 executor/functions.c:1493
+#: executor/functions.c:1526 executor/functions.c:1556
+#, c-format
+msgid "return type mismatch in function declared to return %s"
+msgstr ""
+"zwracany typ nie zgadza siÄ™ w funkcji zadeklarowanej jako zwracajÄ…ca %s"
+
+#: executor/functions.c:1334
+msgid ""
+"Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
+msgstr ""
+"Końcowym wyrażeniem funkcji musi być SELECT lub INSERT/UPDATE/DELETE "
+"RETURNING."
+
+#: executor/functions.c:1370
+msgid "Final statement must return exactly one column."
+msgstr "Wyrażenie końcowe musi zwracać dokładnie jedną kolumnę."
+
+#: executor/functions.c:1382
+#, c-format
+msgid "Actual return type is %s."
+msgstr "Aktualny zwracany typ to %s."
+
+#: executor/functions.c:1495
+msgid "Final statement returns too many columns."
+msgstr "Wyrażenie końcowe zwraca zbyt wiele kolumn."
+
+#: executor/functions.c:1528
+#, c-format
+msgid "Final statement returns %s instead of %s at column %d."
+msgstr "Wyrażenie końcowe zwraca %s zamiast %s w kolumnie %d."
+
+#: executor/functions.c:1558
+msgid "Final statement returns too few columns."
+msgstr "Wyrażenie końcowe zwraca zbyt mało kolumn."
+
+#: executor/functions.c:1607
+#, c-format
+msgid "return type %s is not supported for SQL functions"
+msgstr "zwracany typ %s nie jest obsługiwany w funkcjach SQL"
+
+#: executor/nodeAgg.c:1730 executor/nodeWindowAgg.c:1851
+#, c-format
+msgid "aggregate %u needs to have compatible input type and transition type"
+msgstr "agregat %u wymaga zgodnego typu wejścia i typu przekształcenia"
+
+#: executor/nodeHashjoin.c:814 executor/nodeHashjoin.c:844
+#, c-format
+msgid "could not rewind hash-join temporary file: %m"
+msgstr "nie można przewinąć pliku tymczasowego hash-join: %m"
+
+#: executor/nodeHashjoin.c:879 executor/nodeHashjoin.c:885
+#, c-format
+msgid "could not write to hash-join temporary file: %m"
+msgstr "nie można zapisać do pliku tymczasowego hash-join: %m"
+
+#: executor/nodeHashjoin.c:919 executor/nodeHashjoin.c:929
+#, c-format
+msgid "could not read from hash-join temporary file: %m"
+msgstr "nie można czytać z pliku tymczasowego hash-join: %m"
+
+#: executor/nodeLimit.c:253
+msgid "OFFSET must not be negative"
+msgstr "OFFSET nie może być ujemny"
+
+#: executor/nodeLimit.c:280
+msgid "LIMIT must not be negative"
+msgstr "LIMIT może być ujemny"
+
+#: executor/nodeMergejoin.c:1604
+msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
+msgstr "RIGHT JOIN jest obsługiwane tylko dla warunków połączenia merge-join"
+
+#: executor/nodeMergejoin.c:1624
+msgid "FULL JOIN is only supported with merge-joinable join conditions"
+msgstr "FULL JOIN jest obsługiwane tylko dla warunków połączenia merge-join"
+
+#: executor/nodeModifyTable.c:83
+msgid "Query has too many columns."
+msgstr "Zapytanie posiada zbyt wiele kolumn."
+
+#: executor/nodeModifyTable.c:110
+#, c-format
+msgid "Query provides a value for a dropped column at ordinal position %d."
+msgstr ""
+"Kwerenda przewiduje wartość dla skasowanej kolumny na pozycji porządkowej %d."
+
+#: executor/nodeModifyTable.c:118
+msgid "Query has too few columns."
+msgstr "Zapytanie posiada zbyt mało kolumn."
+
+#: executor/nodeSubplan.c:301 executor/nodeSubplan.c:340
+#: executor/nodeSubplan.c:962
+msgid "more than one row returned by a subquery used as an expression"
+msgstr "ponad jeden wiersz zwrócony przez podzapytanie użyte jako wyrażenie"
+
+#: executor/nodeWindowAgg.c:1238
+msgid "frame starting offset must not be null"
+msgstr "początkowy offset ramki może być pusty"
+
+#: executor/nodeWindowAgg.c:1251
+msgid "frame starting offset must not be negative"
+msgstr "początkowy offset ramki nie może być ujemny"
+
+#: executor/nodeWindowAgg.c:1264
+msgid "frame ending offset must not be null"
+msgstr "końcowy offset ramki nie może być pusty"
+
+#: executor/nodeWindowAgg.c:1277
+msgid "frame ending offset must not be negative"
+msgstr "końcowy offset ramki może być ujemny"
+
+#: executor/spi.c:210
+msgid "transaction left non-empty SPI stack"
+msgstr "transakcja pozostawiła niepusty stos SPI"
+
+#: executor/spi.c:211 executor/spi.c:275
+msgid "Check for missing \"SPI_finish\" calls."
+msgstr "Sprawdź brakujące wywołania \"SPI_finish\"."
+
+#: executor/spi.c:274
+msgid "subtransaction left non-empty SPI stack"
+msgstr "podtransakcja pozostawiła niepusty stos SPI"
+
+#: executor/spi.c:1137
+msgid "cannot open multi-query plan as cursor"
+msgstr "nie można otworzyć wielozapytaniowego planu jako kursora"
+
+#. translator: %s is name of a SQL command, eg INSERT
+#: executor/spi.c:1142
+#, c-format
+msgid "cannot open %s query as cursor"
+msgstr "nie można otworzyć zapytania %s jako kursora"
+
+#: executor/spi.c:1233 parser/analyze.c:2206
+msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE nie jest wspierane"
+
+#: executor/spi.c:1234 parser/analyze.c:2207
+msgid "Scrollable cursors must be READ ONLY."
+msgstr "Kursory skrolowalne muszą być READ ONLY."
+
+#: executor/spi.c:2157
+#, c-format
+msgid "SQL statement \"%s\""
+msgstr "wyrażenie SQL \"%s\""
+
+#: foreign/foreign.c:198
+#, c-format
+msgid "user mapping not found for \"%s\""
+msgstr "nie znaleziono mapowania użytkownika dla \"%s\""
+
+#: foreign/foreign.c:321
+#, c-format
+msgid "foreign-data wrapper \"%s\" has no handler"
+msgstr "opakowanie obcych danych \"%s\" nie ma uchwytu"
+
+#: foreign/foreign.c:498
+#, c-format
+msgid "invalid option \"%s\""
+msgstr "błędna opcja \"%s\""
+
+#: foreign/foreign.c:499
+#, c-format
+msgid "Valid options in this context are: %s"
+msgstr "Poprawnymi opcjami dla tego kontekstu sÄ…: %s"
+
+#: lib/stringinfo.c:267
+#, c-format
+msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
+msgstr ""
+"Nie można poszerzyć bufora znakowego zawierającego %d bajtów o następne %d "
+"bajtów."
+
+#: libpq/auth.c:257
+#, c-format
+msgid "authentication failed for user \"%s\": host rejected"
+msgstr "nie powiodła się autoryzacja użytkownika \"%s\": odrzucono host"
+
+#: libpq/auth.c:260
+#, c-format
+msgid "Kerberos 5 authentication failed for user \"%s\""
+msgstr "autoryzacja Kerberos 5 nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:263
+#, c-format
+msgid "\"trust\" authentication failed for user \"%s\""
+msgstr "autoryzacja \"trust\" nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:266
+#, c-format
+msgid "Ident authentication failed for user \"%s\""
+msgstr "autoryzacja ident nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:269
+#, c-format
+msgid "Peer authentication failed for user \"%s\""
+msgstr "Równoległa autoryzacja nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:273
+#, c-format
+msgid "password authentication failed for user \"%s\""
+msgstr "autoryzacja hasłem nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:278
+#, c-format
+msgid "GSSAPI authentication failed for user \"%s\""
+msgstr "autoryzacja GSSAPI nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:281
+#, c-format
+msgid "SSPI authentication failed for user \"%s\""
+msgstr "Autoryzacja SSPI nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:284
+#, c-format
+msgid "PAM authentication failed for user \"%s\""
+msgstr "Autoryzacja PAM nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:287
+#, c-format
+msgid "LDAP authentication failed for user \"%s\""
+msgstr "Autoryzacja LDAP nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:290
+#, c-format
+msgid "certificate authentication failed for user \"%s\""
+msgstr "autoryzacja certyfikatem nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:293
+#, c-format
+msgid "RADIUS authentication failed for user \"%s\""
+msgstr "autoryzacja RADIUS nie powiodła się dla użytkownika \"%s\""
+
+#: libpq/auth.c:296
+#, c-format
+msgid "authentication failed for user \"%s\": invalid authentication method"
+msgstr ""
+"nie powiodła się autoryzacja użytkownika \"%s\": niepoprawna metoda "
+"autoryzacji"
+
+#: libpq/auth.c:325
+msgid "missing or erroneous pg_hba.conf file"
+msgstr "brak lub błędny plik pg_hba.conf"
+
+#: libpq/auth.c:326
+msgid "See server log for details."
+msgstr "Przejrzyj dziennik serwera by znaleźć szczegóły."
+
+#: libpq/auth.c:356
+msgid "connection requires a valid client certificate"
+msgstr "połączenie wymaga poprawnego certyfikatu klienta"
+
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
+msgid "SSL on"
+msgstr "SSL włączone"
+
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
+msgid "SSL off"
+msgstr "SSL wyłączone"
+
+#: libpq/auth.c:398
+#, c-format
+msgid ""
+"pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
+msgstr ""
+"pg_hba.conf odrzuca połączenia replikacji dla hosta \"%s\", użytkownika \"%s"
+"\", %s"
+
+#: libpq/auth.c:404
+#, c-format
+msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
+msgstr ""
+"pg_hba.conf odrzuca połączenie replikacji dla hosta \"%s\", użytkownika \"%s"
+"\""
+
+#: libpq/auth.c:413
+#, c-format
+msgid ""
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
+"\", %s"
+msgstr ""
+"pg_hba.conf odrzuca połączenie dla hosta \"%s\", użytkownika \"%s\", bazy "
+"\"%s\", %s"
+
+#: libpq/auth.c:420
+#, c-format
+msgid ""
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
+msgstr ""
+"pg_hba.conf odrzuca połączenie dla hosta \"%s\", użytkownika \"%s\", bazy "
+"\"%s\""
+
+#: libpq/auth.c:449
+#, c-format, fuzzy
+msgid "Client IP address resolved to \"%s\", forward lookup matches."
+msgstr "Adres IP klienta rozwiÄ…zany do \"%s\", sprawdzenie celu pasuje."
+
+#: libpq/auth.c:451
+#, c-format, fuzzy
+msgid "Client IP address resolved to \"%s\", forward lookup not checked."
+msgstr "Adres IP klienta rozwiÄ…zany do \"%s\", nie sprawdzono celu."
+
+#: libpq/auth.c:453
+#, c-format, fuzzy
+msgid "Client IP address resolved to \"%s\", forward lookup does not match."
+msgstr "Adres IP klienta rozwiÄ…zany do \"%s\", sprawdzenie celu nie pasuje."
+
+#: libpq/auth.c:462
+#, c-format
+msgid ""
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
+"\", %s"
+msgstr ""
+"brak wpisu w pg_hba.conf dla połączenia replikacji z hosta \"%s\", "
+"użytkownika \"%s\", %s"
+
+#: libpq/auth.c:469
+#, c-format
+msgid ""
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
+msgstr ""
+"brak wpisu w pg_hba.conf dla połączenia replikacji z hosta \"%s\", "
+"użytkownika \"%s\""
+
+#: libpq/auth.c:479
+#, c-format
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
+msgstr ""
+"brak wpisu w pg_hba.conf dla hosta \"%s\", użytkownika \"%s\", bazy \"%s\", "
+"%s"
+
+#: libpq/auth.c:487
+#, c-format
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
+msgstr ""
+"brak wpisu w pg_hba.conf dla hosta \"%s\", użytkownika \"%s\", bazy \"%s\""
+
+#: libpq/auth.c:539 libpq/hba.c:1118
+msgid ""
+"MD5 authentication is not supported when \"db_user_namespace\" is enabled"
+msgstr ""
+"autentykacja MD5 nie jest obsługiwana gdy włączone jest \"db_user_namespace\""
+
+#: libpq/auth.c:663
+#, c-format
+msgid "expected password response, got message type %d"
+msgstr "oczekiwano odpowiedzi hasła, otrzymano typ komunikatu %d"
+
+#: libpq/auth.c:691
+msgid "invalid password packet size"
+msgstr "niepoprawny rozmiar pakietu hasła"
+
+#: libpq/auth.c:695
+msgid "received password packet"
+msgstr "odebrano pakiet hasła"
+
+#: libpq/auth.c:753
+#, c-format
+msgid "Kerberos initialization returned error %d"
+msgstr "inicjacja Kerberos zwróciła błąd %d"
+
+#: libpq/auth.c:763
+#, c-format
+msgid "Kerberos keytab resolving returned error %d"
+msgstr "rozwiązywanie Kerberos keytab zwróciło błąd %d"
+
+#: libpq/auth.c:787
+#, c-format
+msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
+msgstr "sname_to_principal(\"%s\", \"%s\") Kerberos zwróciło błąd %d"
+
+#: libpq/auth.c:832
+#, c-format
+msgid "Kerberos recvauth returned error %d"
+msgstr "recvauth Kerberos zwróciła błąd %d"
+
+#: libpq/auth.c:855
+#, c-format
+msgid "Kerberos unparse_name returned error %d"
+msgstr "unparse_name Kerberos zwróciła błąd %d"
+
+#: libpq/auth.c:1003
+msgid "GSSAPI is not supported in protocol version 2"
+msgstr "GSSAPI nie jest obsługiwane przez wersję 2 protokołu"
+
+#: libpq/auth.c:1058
+#, c-format
+msgid "expected GSS response, got message type %d"
+msgstr "oczekiwano odpowiedzi GSS, otrzymano typ komunikatu %d"
+
+#: libpq/auth.c:1121
+msgid "accepting GSS security context failed"
+msgstr "nie powiodło się przyjmowanie kontekstu bezpieczeństwa GSS"
+
+#: libpq/auth.c:1147
+msgid "retrieving GSS user name failed"
+msgstr "nie powiodło się pobieranie nazwy użytkownika GSS"
+
+#: libpq/auth.c:1264
+msgid "SSPI is not supported in protocol version 2"
+msgstr "SSPI nie jest obsługiwane przez wersję 2 protokołu"
+
+#: libpq/auth.c:1279
+msgid "could not acquire SSPI credentials"
+msgstr "nie można nabyć poświadczeń SSPI"
+
+#: libpq/auth.c:1296
+#, c-format
+msgid "expected SSPI response, got message type %d"
+msgstr "oczekiwano odpowiedzi SSPI, otrzymano typ komunikatu %d"
+
+#: libpq/auth.c:1368
+msgid "could not accept SSPI security context"
+msgstr "nie można pobrać kontekstu zabezpieczeń SSPI"
+
+#: libpq/auth.c:1430
+msgid "could not get token from SSPI security context"
+msgstr "nie można pobrać tokenu z kontekstu zabezpieczeń SSPI"
+
+#: libpq/auth.c:1674
+#, c-format
+msgid "could not create socket for Ident connection: %m"
+msgstr "nie można utworzyć gniazda dla połączenia Ident: %m"
+
+#: libpq/auth.c:1689
+#, c-format
+msgid "could not bind to local address \"%s\": %m"
+msgstr "nie można dowiązać do adresu lokalnego \"%s\": %m"
+
+#: libpq/auth.c:1701
+#, c-format
+msgid "could not connect to Ident server at address \"%s\", port %s: %m"
+msgstr "nie można połączyć z serwerem Ident pod adresem \"%s\", port %s: %m"
+
+#: libpq/auth.c:1721
+#, c-format
+msgid "could not send query to Ident server at address \"%s\", port %s: %m"
+msgstr ""
+"nie można wysłać zapytania do serwera Ident pod adres \"%s\", port %s: %m"
+
+#: libpq/auth.c:1736
+#, c-format
+msgid ""
+"could not receive response from Ident server at address \"%s\", port %s: %m"
+msgstr ""
+"nie można otrzymać odpowiedzi z serwera Ident pod adresem \"%s\", port %s: %m"
+
+#: libpq/auth.c:1746
+#, c-format
+msgid "invalidly formatted response from Ident server: \"%s\""
+msgstr "niepoprawnie sformatowana odpowiedź z serwera Ident: \"%s\""
+
+#: libpq/auth.c:1785
+msgid "peer authentication is not supported on this platform"
+msgstr "autentykacja wzajemna nie jest obsługiwana na tej platformie"
+
+#: libpq/auth.c:1789
+#, c-format
+msgid "could not get peer credentials: %m"
+msgstr "nie można pobrać poświadczeń wzajemnych: %m"
+
+#: libpq/auth.c:1798
+#, c-format
+msgid "local user with ID %d does not exist"
+msgstr "lokalny użytkownik o ID %d nie istnieje"
+
+#: libpq/auth.c:1881 libpq/auth.c:2153 libpq/auth.c:2513
+msgid "empty password returned by client"
+msgstr "puste hasło zwrócone przez klienta"
+
+#: libpq/auth.c:1891
+#, c-format
+msgid "error from underlying PAM layer: %s"
+msgstr "błąd z podstawowej warstwy PAM: %s"
+
+#: libpq/auth.c:1960
+#, c-format
+msgid "could not create PAM authenticator: %s"
+msgstr "nie można utworzyć identyfikatora PAM: %s"
+
+#: libpq/auth.c:1971
+#, c-format
+msgid "pam_set_item(PAM_USER) failed: %s"
+msgstr "niepowodzenie pam_set_item(PAM_USER): %s"
+
+#: libpq/auth.c:1982
+#, c-format
+msgid "pam_set_item(PAM_CONV) failed: %s"
+msgstr "niepowodzenie pam_set_item(PAM_CONV): %s"
+
+#: libpq/auth.c:1993
+#, c-format
+msgid "pam_authenticate failed: %s"
+msgstr "niepowodzenie pam_authenticate: %s"
+
+#: libpq/auth.c:2004
+#, c-format
+msgid "pam_acct_mgmt failed: %s"
+msgstr "niepowodzenie pam_acct_mgmt: %s"
+
+#: libpq/auth.c:2015
+#, c-format
+msgid "could not release PAM authenticator: %s"
+msgstr "nie można opublikować uwierzytelnienia PAM: %s"
+
+#: libpq/auth.c:2048 libpq/auth.c:2052
+#, c-format
+msgid "could not initialize LDAP: error code %d"
+msgstr "nie można zainicjować LDAP: kod błędu %d"
+
+#: libpq/auth.c:2062
+#, c-format
+msgid "could not set LDAP protocol version: error code %d"
+msgstr "nie można ustawić wersji protokołu LDAP: kod błędu %d"
+
+#: libpq/auth.c:2091
+msgid "could not load wldap32.dll"
+msgstr "nie można załadować wldap32.dll"
+
+#: libpq/auth.c:2099
+msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
+msgstr "nie można załadować funkcji _ldap_start_tls_sA z wldap32.dll"
+
+#: libpq/auth.c:2100
+msgid "LDAP over SSL is not supported on this platform."
+msgstr "LDAP po SSL nie jest wspierany dla tej platformy."
+
+#: libpq/auth.c:2115
+#, c-format
+msgid "could not start LDAP TLS session: error code %d"
+msgstr "nie można rozpocząć sesji LDAP: kod błędu %d"
+
+#: libpq/auth.c:2137
+msgid "LDAP server not specified"
+msgstr "nie określono serwera LDAP"
+
+#: libpq/auth.c:2189
+msgid "invalid character in user name for LDAP authentication"
+msgstr "niepoprawny znak w nazwie użytkownika podczas autoryzacji LDAP"
+
+#: libpq/auth.c:2204
+#, c-format
+msgid ""
+"could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
+"error code %d"
+msgstr ""
+"nie można wykonać początkowego połączenia z LDAP dla ldapbinddn \"%s\" na "
+"serwerze \"%s\": kod błędu %d"
+
+#: libpq/auth.c:2229
+#, c-format
+msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
+msgstr ""
+"nie można wyszukać w LDAP z filtrem \"%s\" na serwerze \"%s\": kod błędu %d"
+
+#: libpq/auth.c:2239
+#, c-format
+msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
+msgstr ""
+"wyszukiwanie LDAP nie powiodło się dla filtra \"%s\" na serwerze \"%s\": "
+"brak takiego użytkownika"
+
+#: libpq/auth.c:2243
+#, c-format
+msgid ""
+"LDAP search failed for filter \"%s\" on server \"%s\": user is not unique "
+"(%ld matches)"
+msgstr ""
+"wyszukiwanie LDAP nie powiodło się dla filtra \"%s\" na serwerze \"%s\": "
+"użytkownik nie jest unikalny (%ld dopasowań)"
+
+#: libpq/auth.c:2260
+#, c-format
+msgid ""
+"could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
+msgstr ""
+"nie można pobrać nazwy wyróżniającej z pierwszego wpisu pasującego do \"%s\" "
+"na serwerze \"%s\": %s"
+
+#: libpq/auth.c:2280
+#, c-format
+msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
+msgstr ""
+"nie można odłączyć się po wyszukiwaniu użytkownika \"%s\" na serwerze \"%s"
+"\": %s"
+
+#: libpq/auth.c:2317
+#, c-format
+msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
+msgstr ""
+"logowanie LDAP nie powiodło się dla użytkownika \"%s\" na serwerze \"%s\": "
+"kod błędu %d"
+
+#: libpq/auth.c:2345
+#, c-format
+msgid ""
+"certificate authentication failed for user \"%s\": client certificate "
+"contains no user name"
+msgstr ""
+"autoryzacja certyfikatem nie powiodła się dla użytkownika \"%s\": certyfikat "
+"klienta nie zawiera nazwy użytkownika"
+
+#: libpq/auth.c:2469
+msgid "RADIUS server not specified"
+msgstr "nie określono serwera RADIUS"
+
+#: libpq/auth.c:2476
+msgid "RADIUS secret not specified"
+msgstr "nie określono szyfrowanego hasła RADIUS"
+
+#: libpq/auth.c:2492 libpq/hba.c:1403
+#, c-format
+msgid "could not translate RADIUS server name \"%s\" to address: %s"
+msgstr "nie można przetłumaczyć nazwy serwera RADIUS \"%s\" na adres: %s"
+
+#: libpq/auth.c:2520
+msgid ""
+"RADIUS authentication does not support passwords longer than 16 characters"
+msgstr "autoryzacja RADIUS nie obsługuje haseł dłuższych niż 16 znaków"
+
+#: libpq/auth.c:2531
+msgid "could not generate random encryption vector"
+msgstr "nie można wygenerować wektora losowego szyfrowania"
+
+#: libpq/auth.c:2554
+msgid "could not perform MD5 encryption of password"
+msgstr "nie można wykonać szyfrowania hasła skrótem MD5"
+
+#: libpq/auth.c:2576
+#, c-format
+msgid "could not create RADIUS socket: %m"
+msgstr "nie można utworzyć gniazda RADIUS: %m"
+
+#: libpq/auth.c:2597
+#, c-format
+msgid "could not bind local RADIUS socket: %m"
+msgstr "nie można połączyć do gniazda RADIUS: %m"
+
+#: libpq/auth.c:2607
+#, c-format
+msgid "could not send RADIUS packet: %m"
+msgstr "nie można wysłać pakietu RADIUS: %m"
+
+#: libpq/auth.c:2636 libpq/auth.c:2661
+msgid "timeout waiting for RADIUS response"
+msgstr "limit czasu oczekiwania na odpowiedź RADIUS"
+
+#: libpq/auth.c:2654
+#, c-format
+msgid "could not check status on RADIUS socket: %m"
+msgstr "nie można sprawdzić stanu gniazda RADIUS: %m"
+
+#: libpq/auth.c:2683
+#, c-format
+msgid "could not read RADIUS response: %m"
+msgstr "nie można odczytać odpowiedzi RADIUS: %m"
+
+#: libpq/auth.c:2695 libpq/auth.c:2699
+#, c-format
+msgid "RADIUS response was sent from incorrect port: %i"
+msgstr "odpowiedź RADIUS została wysłana z niepoprawnego portu: %i"
+
+#: libpq/auth.c:2708
+#, c-format
+msgid "RADIUS response too short: %i"
+msgstr "odpowiedź RADIUS zbyt krótka: %i"
+
+#: libpq/auth.c:2715
+#, c-format
+msgid "RADIUS response has corrupt length: %i (actual length %i)"
+msgstr "odpowiedź RADIUS ma uszkodzoną długość: %i (aktualna długość %i)"
+
+#: libpq/auth.c:2723
+#, c-format
+msgid "RADIUS response is to a different request: %i (should be %i)"
+msgstr "odpowiedź RADIUS dotyczy innego żądania: %i (powinna być %i)"
+
+#: libpq/auth.c:2748
+msgid "could not perform MD5 encryption of received packet"
+msgstr "nie można wykonać szyfrowania otrzymanego pakietu skrótem MD5"
+
+#: libpq/auth.c:2757
+msgid "RADIUS response has incorrect MD5 signature"
+msgstr "odpowiedź RADIUS ma niepoprawny podpis MD5"
+
+#: libpq/auth.c:2774
+#, c-format
+msgid "RADIUS response has invalid code (%i) for user \"%s\""
+msgstr "odpowiedź RADIUS posiada niepoprawny kod (%i) dla użytkownika \"%s\""
+
+#: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:163 libpq/be-fsstubs.c:189
+#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:519
+#, c-format
+msgid "invalid large-object descriptor: %d"
+msgstr "niepoprawny deskryptor dużego obiektu: %d"
+
+#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:529
+#, c-format
+msgid "permission denied for large object %u"
+msgstr "odmowa dostępu do dużego obiektu %u"
+
+#: libpq/be-fsstubs.c:194
+#, c-format
+msgid "large object descriptor %d was not opened for writing"
+msgstr "deskryptor dużego obiektu %d nie był otwarty do zapisu"
+
+#: libpq/be-fsstubs.c:392
+msgid "must be superuser to use server-side lo_import()"
+msgstr "musisz być superużytkownikiem by używać lo_import() po stronie serwera"
+
+#: libpq/be-fsstubs.c:393
+msgid "Anyone can use the client-side lo_import() provided by libpq."
+msgstr ""
+"Każdy może użyć lo_import() po stronie klienta dostarczane przez libpq."
+
+#: libpq/be-fsstubs.c:406
+#, c-format
+msgid "could not open server file \"%s\": %m"
+msgstr "nie można otworzyć pliku serwera \"%s\": %m"
+
+#: libpq/be-fsstubs.c:428
+#, c-format
+msgid "could not read server file \"%s\": %m"
+msgstr "nie można odczytać pliku serwera \"%s\": %m"
+
+#: libpq/be-fsstubs.c:458
+msgid "must be superuser to use server-side lo_export()"
+msgstr "musisz być superużytkownikiem by używać lo_export() po stronie serwera"
+
+#: libpq/be-fsstubs.c:459
+msgid "Anyone can use the client-side lo_export() provided by libpq."
+msgstr ""
+"Każdy może użyć lo_export() po stronie klienta dostarczane przez libpq."
+
+#: libpq/be-fsstubs.c:484
+#, c-format
+msgid "could not create server file \"%s\": %m"
+msgstr "nie można utworzyć pliku serwera \"%s\": %m"
+
+#: libpq/be-fsstubs.c:496
+#, c-format
+msgid "could not write server file \"%s\": %m"
+msgstr "nie można pisać do pliku serwera \"%s\": %m"
+
+#: libpq/be-secure.c:283 libpq/be-secure.c:378
+#, c-format
+msgid "SSL error: %s"
+msgstr "błąd SSL: %s"
+
+#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:957
+#, c-format
+msgid "unrecognized SSL error code: %d"
+msgstr "nieznany kod błędu SSL: %d"
+
+#: libpq/be-secure.c:331 libpq/be-secure.c:335 libpq/be-secure.c:345
+msgid "SSL renegotiation failure"
+msgstr "niepowodzenie renegocjacji SSL"
+
+#: libpq/be-secure.c:339
+msgid "SSL failed to send renegotiation request"
+msgstr "nie powiodło się wysyłanie żądania renegocjacji SSL"
+
+#: libpq/be-secure.c:736
+#, c-format
+msgid "could not create SSL context: %s"
+msgstr "nie można utworzyć kontekstu SSL: %s"
+
+#: libpq/be-secure.c:752
+#, c-format
+msgid "could not load server certificate file \"%s\": %s"
+msgstr "nie można załadować pliku z certyfikatem serwera \"%s\": %s"
+
+#: libpq/be-secure.c:758
+#, c-format
+msgid "could not access private key file \"%s\": %m"
+msgstr "nie można uzyskać dostępu do pliku z kluczem prywatnym \"%s\": %m"
+
+#: libpq/be-secure.c:773
+#, c-format
+msgid "private key file \"%s\" has group or world access"
+msgstr ""
+"plik z prywatnym kluczem \"%s\" posiada prawa dostępu dla grupy lub "
+"wszystkich"
+
+#: libpq/be-secure.c:775
+msgid "Permissions should be u=rw (0600) or less."
+msgstr "Prawa dostępu powinny być u=rw (0600) lub niżej."
+
+#: libpq/be-secure.c:782
+#, c-format
+msgid "could not load private key file \"%s\": %s"
+msgstr "nie można pobrać pliku z kluczem prywatnym \"%s\": %s"
+
+#: libpq/be-secure.c:787
+#, c-format
+msgid "check of private key failed: %s"
+msgstr "nie powiodło się sprawdzenie klucza prywatnego: %s"
+
+#: libpq/be-secure.c:815
+#, c-format
+msgid "could not access root certificate file \"%s\": %m"
+msgstr ""
+"nie można uzyskać dostępu do pliku z certyfikatem podstawowym \"%s\": %m"
+
+#: libpq/be-secure.c:826
+#, c-format
+msgid "could not load root certificate file \"%s\": %s"
+msgstr "nie można załadować pliku z certyfikatem głównym \"%s\": %s"
+
+#: libpq/be-secure.c:849
+#, c-format
+msgid "SSL certificate revocation list file \"%s\" ignored"
+msgstr "plik listy unieważnień certyfikatu SSL \"%s\" został zignorowany"
+
+#: libpq/be-secure.c:851
+msgid "SSL library does not support certificate revocation lists."
+msgstr "Biblioteka SSL nie obsługuje list unieważnień certyfikatów."
+
+#: libpq/be-secure.c:858
+#, c-format
+msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
+msgstr "nie znaleziono pliku listy unieważnień certyfikatu SSL \"%s\": %s"
+
+#: libpq/be-secure.c:860
+msgid "Certificates will not be checked against revocation list."
+msgstr "Certyfikaty nie zostaną sprawdzone pod kątem list unieważnień."
+
+#: libpq/be-secure.c:902
+#, c-format
+msgid "could not initialize SSL connection: %s"
+msgstr "nie można zainicjować połączenia SSL: %s"
+
+#: libpq/be-secure.c:911
+#, c-format
+msgid "could not set SSL socket: %s"
+msgstr "nie można ustawić gniazda SSL: %s"
+
+#: libpq/be-secure.c:937
+#, c-format
+msgid "could not accept SSL connection: %m"
+msgstr "nie można przyjąć połączenia SSL: %m"
+
+#: libpq/be-secure.c:941 libpq/be-secure.c:952
+msgid "could not accept SSL connection: EOF detected"
+msgstr "nie można przyjąć połączenia SSL: wykryto EOF"
+
+#: libpq/be-secure.c:946
+#, c-format
+msgid "could not accept SSL connection: %s"
+msgstr "nie można przyjąć połączenia SSL: %s"
+
+#: libpq/be-secure.c:997
+msgid "SSL certificate's common name contains embedded null"
+msgstr "nazwa zwyczajowa certyfikatu SSL zawiera osadzony null"
+
+#: libpq/be-secure.c:1004
+#, c-format
+msgid "SSL connection from \"%s\""
+msgstr "połączenie SSL od \"%s\""
+
+#: libpq/be-secure.c:1048
+msgid "no SSL error reported"
+msgstr "nie zgłoszono błędu SSL"
+
+#: libpq/be-secure.c:1052
+#, c-format
+msgid "SSL error code %lu"
+msgstr "kod błędu SSL %lu"
+
+#: libpq/hba.c:160
+#, c-format
+msgid "authentication file token too long, skipping: \"%s\""
+msgstr "token pliku autoryzacji jest zbyt długi, pominięto: \"%s\""
+
+#: libpq/hba.c:355
+#, c-format
+msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
+msgstr "nie można otworzyć wtórnego pliku autoryzacji \"@%s\" jako \"%s\": %m"
+
+#: libpq/hba.c:628
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s"
+msgstr "nie można przetłumaczyć nazwy hosta \"%s\" na adres: %s"
+
+#. translator: the second %s is a list of auth methods
+#: libpq/hba.c:779
+#, c-format
+msgid ""
+"authentication option \"%s\" is only valid for authentication methods %s"
+msgstr "opcja autoryzacji \"%s\" jest poprawna tylko dla metod autoryzacji %s"
+
+#: libpq/hba.c:795
+#, c-format
+msgid "authentication method \"%s\" requires argument \"%s\" to be set"
+msgstr "metoda autoryzacji \"%s\" wymaga do użycia argumentu \"%s\""
+
+#: libpq/hba.c:832
+msgid "local connections are not supported by this build"
+msgstr "połączenia lokalne nie są obsługiwane przez tą kompilację"
+
+#: libpq/hba.c:853
+msgid "hostssl requires SSL to be turned on"
+msgstr "hostssl by być włączone wymaga SSL"
+
+#: libpq/hba.c:854
+msgid "Set ssl = on in postgresql.conf."
+msgstr "Ustawienie ssl = on w postgresql.conf."
+
+#: libpq/hba.c:862
+msgid "hostssl is not supported by this build"
+msgstr "hostssl nie jest obsługiwany przez tą kompilację"
+
+#: libpq/hba.c:863
+msgid "Compile with --with-openssl to use SSL connections."
+msgstr "Skompiluj z --with-openssl by używać połączeń SSL."
+
+#: libpq/hba.c:885
+#, c-format
+msgid "invalid connection type \"%s\""
+msgstr "błędny typ połączenia \"%s\""
+
+#: libpq/hba.c:898
+msgid "end-of-line before database specification"
+msgstr "koniec-linii przed określeniem bazy danych"
+
+#: libpq/hba.c:911
+msgid "end-of-line before role specification"
+msgstr "koniec-linii przed określeniem roli"
+
+#: libpq/hba.c:926
+msgid "end-of-line before IP address specification"
+msgstr "koniec-linii przed wskazaniem adresu IP"
+
+#: libpq/hba.c:980
+#, c-format
+msgid "invalid IP address \"%s\": %s"
+msgstr "nieprawidłowy adres IP \"%s\": %s"
+
+#: libpq/hba.c:1000
+#, c-format
+msgid "specifying both host name and CIDR mask is invalid: \"%s\""
+msgstr ""
+"jednoczesne wskazanie nazwy hosta i maski CDIR jest niepoprawne: \"%s\""
+
+#: libpq/hba.c:1014
+#, c-format
+msgid "invalid CIDR mask in address \"%s\""
+msgstr "nieprawidłowa maska CIDR w adresie \"%s\""
+
+#: libpq/hba.c:1032
+msgid "end-of-line before netmask specification"
+msgstr "koniec-linii przed określeniem netmask"
+
+#: libpq/hba.c:1044
+#, c-format
+msgid "invalid IP mask \"%s\": %s"
+msgstr "nieprawidłowa maska IP \"%s\": %s"
+
+#: libpq/hba.c:1061
+msgid "IP address and mask do not match"
+msgstr "niezgodność adresu IP i maski"
+
+#: libpq/hba.c:1076
+msgid "end-of-line before authentication method"
+msgstr "koniec linii przed metodÄ… autoryzacji"
+
+#: libpq/hba.c:1149
+#, c-format
+msgid "invalid authentication method \"%s\""
+msgstr "niepoprawna metoda autoryzacji \"%s\""
+
+#: libpq/hba.c:1160
+#, c-format
+msgid "invalid authentication method \"%s\": not supported by this build"
+msgstr "niepoprawna metoda autoryzacji \"%s\": nieobsługiwana w tej kompilacji"
+
+#: libpq/hba.c:1181
+msgid "krb5 authentication is not supported on local sockets"
+msgstr "autoryzacja krb5 nie jest obsługiwana na gniazdach lokalnych"
+
+#: libpq/hba.c:1192
+msgid "gssapi authentication is not supported on local sockets"
+msgstr "autoryzacja gssapi nie jest obsługiwana na gniazdach lokalnych"
+
+#: libpq/hba.c:1203
+msgid "peer authentication is only supported on local sockets"
+msgstr "uwierzytelnianie wzajemne nie jest obsługiwane na gniazdach lokalnych"
+
+#: libpq/hba.c:1220
+msgid "cert authentication is only supported on hostssl connections"
+msgstr "uwierzytelnianie cert jest obsługiwane tylko w połączeniach hostssl"
+
+#: libpq/hba.c:1241
+#, c-format
+msgid "authentication option not in name=value format: %s"
+msgstr "opcja autoryzacji nie jest w formacie nazwa=wartość: %s"
+
+#: libpq/hba.c:1257
+msgid "ident, peer, krb5, gssapi, sspi and cert"
+msgstr "ident, peer, krb5, gssapi, sspi i cert"
+
+#: libpq/hba.c:1271
+msgid "clientcert can only be configured for \"hostssl\" rows"
+msgstr "clientcert może być skonfigurowany tylko dla wierszy \"hostssl\""
+
+#: libpq/hba.c:1282
+msgid ""
+"client certificates can only be checked if a root certificate store is "
+"available"
+msgstr ""
+"certyfikaty klienta mogą być sprawdzone tylko jeśli magazyn certyfikatów "
+"jest dostępny"
+
+#: libpq/hba.c:1283
+msgid "Make sure the root.crt file is present and readable."
+msgstr "Upewnij się, że plik root.crt istnieje jest dostępny do odczytu."
+
+#: libpq/hba.c:1296
+msgid "clientcert can not be set to 0 when using \"cert\" authentication"
+msgstr ""
+"clientcert nie może być ustawiony na 0 jeśli używana jest autoryzacja \"cert"
+"\""
+
+#: libpq/hba.c:1330
+#, c-format
+msgid "invalid LDAP port number: \"%s\""
+msgstr "nieprawidłowy numer portu LDAP: \"%s\""
+
+#: libpq/hba.c:1376 libpq/hba.c:1384
+msgid "krb5, gssapi and sspi"
+msgstr "krb5, gssapi i sspi"
+
+#: libpq/hba.c:1422
+#, c-format
+msgid "invalid RADIUS port number: \"%s\""
+msgstr "nieprawidłowy numer portu RADIUS: \"%s\""
+
+#: libpq/hba.c:1442
+#, c-format
+msgid "unrecognized authentication option name: \"%s\""
+msgstr "nierozpoznana nazwa opcji autoryzacji: \"%s\""
+
+#: libpq/hba.c:1474
+msgid ""
+"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
+"together with ldapprefix"
+msgstr ""
+"nie można użyć ldapbasedn, ldapbinddn, ldapbindpasswd, czy "
+"ldapsearchattribute razem z ldapprefix"
+
+#: libpq/hba.c:1484
+msgid ""
+"authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
+"\", or \"ldapsuffix\" to be set"
+msgstr ""
+"metoda autoryzacji \"ldap\" wymaga ustawienia argumentu \"ldapbasedn\", "
+"\"ldapprefix\", lub \"ldapsuffix\""
+
+#: libpq/hba.c:1683 guc-file.l:409
+#, c-format
+msgid "could not open configuration file \"%s\": %m"
+msgstr "nie można otworzyć pliku konfiguracyjnego \"%s\": %m"
+
+#: libpq/hba.c:1815
+#, c-format
+msgid "invalid regular expression \"%s\": %s"
+msgstr "niepoprawne wyrażenie regularne \"%s\": %s"
+
+#: libpq/hba.c:1838
+#, c-format
+msgid "regular expression match for \"%s\" failed: %s"
+msgstr "nie powiodło się dopasowanie wyrażenia regularnego dla \"%s\": %s"
+
+#: libpq/hba.c:1856
+#, c-format
+msgid ""
+"regular expression \"%s\" has no subexpressions as requested by "
+"backreference in \"%s\""
+msgstr ""
+"wyrażenie regularne \"%s\" nie ma podwyrażeń wymaganych przez referencją "
+"wstecznÄ… w \"%s\""
+
+#: libpq/hba.c:1922
+#, c-format
+msgid "missing entry in file \"%s\" at end of line %d"
+msgstr "brakująca pozycja w pliku \"%s\" na końcu linii %d"
+
+#: libpq/hba.c:1963
+#, c-format
+msgid "provided user name (%s) and authenticated user name (%s) do not match"
+msgstr ""
+"dostarczona nazwa użytkownika (%s) i nazwa użytkownika zautoryzowanego (%s) "
+"różnią się"
+
+#: libpq/hba.c:1984
+#, c-format
+msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
+msgstr ""
+"brak dopasowania w mapie użytkowników \"%s\" dla użytkownika \"%s\" "
+"autoryzowanego jako \"%s\""
+
+#: libpq/hba.c:2008
+#, c-format
+msgid "could not open usermap file \"%s\": %m"
+msgstr "nie można otworzyć pliku mapy użytkowników \"%s\": %m"
+
+#: libpq/pqcomm.c:306
+#, c-format
+msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
+msgstr "nie można przetłumaczyć nazwy hosta \"%s\", usługi \"%s\" na adres: %s"
+
+#: libpq/pqcomm.c:310
+#, c-format
+msgid "could not translate service \"%s\" to address: %s"
+msgstr "nie można przetłumaczyć usługi \"%s\" na adres: %s"
+
+#: libpq/pqcomm.c:337
+#, c-format
+msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
+msgstr ""
+"nie można dowiązać do wszystkich żądanych adresów: przekroczono MAXLISTEN "
+"(%d)"
+
+#: libpq/pqcomm.c:346
+msgid "IPv4"
+msgstr "IPv4"
+
+#: libpq/pqcomm.c:350
+msgid "IPv6"
+msgstr "IPv6"
+
+#: libpq/pqcomm.c:355
+msgid "Unix"
+msgstr "Unix"
+
+#: libpq/pqcomm.c:360
+#, c-format
+msgid "unrecognized address family %d"
+msgstr "nierozpoznana rodzina adresów %d"
+
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:371
+#, c-format
+msgid "could not create %s socket: %m"
+msgstr "nie można utworzyć gniazda %s: %m"
+
+#: libpq/pqcomm.c:396
+#, c-format
+msgid "setsockopt(SO_REUSEADDR) failed: %m"
+msgstr "nie powiodło się setsockopt(SO_REUSEADDR): %m"
+
+#: libpq/pqcomm.c:411
+#, c-format
+msgid "setsockopt(IPV6_V6ONLY) failed: %m"
+msgstr "nie powiodło się setsockopt(IPV6_V6ONLY): %m"
+
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:430
+#, c-format
+msgid "could not bind %s socket: %m"
+msgstr "nie można dowiązać gniazda %s: %m"
+
+#: libpq/pqcomm.c:433
+#, c-format
+msgid ""
+"Is another postmaster already running on port %d? If not, remove socket file "
+"\"%s\" and retry."
+msgstr ""
+"Czy inny postmaster jest już uruchomiony już na porcie %d? Jeśli nie, usuń "
+"plik gniazda \"%s\" i spróbuj ponownie."
+
+#: libpq/pqcomm.c:436
+#, c-format
+msgid ""
+"Is another postmaster already running on port %d? If not, wait a few seconds "
+"and retry."
+msgstr ""
+"Czy inny postmaster jest już uruchomiony już na porcie %d? Jeśli nie, "
+"odczekaj kilka sekund i spróbuj ponownie."
+
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:469
+#, c-format
+msgid "could not listen on %s socket: %m"
+msgstr "nie można nasłuchiwać na gnieździe %s: %m"
+
+#: libpq/pqcomm.c:554
+#, c-format
+msgid "group \"%s\" does not exist"
+msgstr "grupa \"%s\" nie istnieje"
+
+#: libpq/pqcomm.c:564
+#, c-format
+msgid "could not set group of file \"%s\": %m"
+msgstr "nie można ustawić grupy pliku \"%s\": %m"
+
+#: libpq/pqcomm.c:575
+#, c-format
+msgid "could not set permissions of file \"%s\": %m"
+msgstr "nie można określić uprawnień dla pliku \"%s\": %m"
+
+#: libpq/pqcomm.c:605
+#, c-format
+msgid "could not accept new connection: %m"
+msgstr "nie można przyjąć nowego połączenia: %m"
+
+#: libpq/pqcomm.c:773
+#, c-format
+msgid "could not set socket to non-blocking mode: %m"
+msgstr "nie można ustawić gniazda w tryb nieblokujący: %m"
+
+#: libpq/pqcomm.c:779
+#, c-format
+msgid "could not set socket to blocking mode: %m"
+msgstr "nie można ustawić gniazda w tryb blokujący: %m"
+
+#: libpq/pqcomm.c:831 libpq/pqcomm.c:921
+#, c-format
+msgid "could not receive data from client: %m"
+msgstr "nie można otrzymać danych od klienta: %m"
+
+#: libpq/pqcomm.c:1072
+msgid "unexpected EOF within message length word"
+msgstr "nieoczekiwane EOF wewnątrz słowa długości komunikatu"
+
+#: libpq/pqcomm.c:1083
+msgid "invalid message length"
+msgstr "niepoprawna długość komunikatu"
+
+#: libpq/pqcomm.c:1105 libpq/pqcomm.c:1115
+msgid "incomplete message from client"
+msgstr "niekompletny komunikat od klienta"
+
+#: libpq/pqcomm.c:1245
+#, c-format
+msgid "could not send data to client: %m"
+msgstr "nie można wysłać danych do klienta: %m"
+
+#: libpq/pqformat.c:436
+msgid "no data left in message"
+msgstr "nie pozostały żadne dane w wiadomości"
+
+#: libpq/pqformat.c:556 libpq/pqformat.c:574 libpq/pqformat.c:595
+#: utils/adt/arrayfuncs.c:1411 utils/adt/rowtypes.c:557
+msgid "insufficient data left in message"
+msgstr "pozostała niewystarczająca ilość danych w wiadomości"
+
+#: libpq/pqformat.c:636
+msgid "invalid string in message"
+msgstr "niepoprawny ciąg znaków w wiadomości"
+
+#: libpq/pqformat.c:652
+msgid "invalid message format"
+msgstr "niepoprawny format wiadomości"
+
+#: snowball/dict_snowball.c:183
+#, c-format
+msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
+msgstr ""
+"brak dostępnego tematyzera Snowball dla języka \"%s\" i kodowania \"%s\""
+
+#: snowball/dict_snowball.c:215
+msgid "multiple Language parameters"
+msgstr "wiele parametrów Language"
+
+#: snowball/dict_snowball.c:222
+#, c-format
+msgid "unrecognized Snowball parameter: \"%s\""
+msgstr "nierozpoznany parametr Snowball: \"%s\""
+
+#: snowball/dict_snowball.c:230
+msgid "missing Language parameter"
+msgstr "brakuje parametru Language"
+
+#: storage/ipc/procarray.c:270 storage/ipc/sinvaladt.c:302
+#: storage/lmgr/proc.c:297 postmaster/postmaster.c:1862
+msgid "sorry, too many clients already"
+msgstr "przepraszamy, mamy już zbyt wiele klientów"
+
+#: storage/ipc/procarray.c:637
+msgid "consistent state delayed because recovery snapshot incomplete"
+msgstr ""
+"opóźnienie stanu spójnego ze względu na niekompletne migawki odzyskiwania"
+
+#: storage/ipc/shmem.c:190 storage/lmgr/lock.c:631 storage/lmgr/lock.c:700
+#: storage/lmgr/lock.c:2163 storage/lmgr/lock.c:2542 storage/lmgr/lock.c:2607
+#: storage/lmgr/proc.c:197 storage/lmgr/proc.c:216
+#: storage/lmgr/predicate.c:2233 storage/lmgr/predicate.c:2248
+#: storage/lmgr/predicate.c:3623 storage/lmgr/predicate.c:4770
+#: utils/hash/dynahash.c:928
+msgid "out of shared memory"
+msgstr "brak pamięci współdzielonej"
+
+#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
+#, c-format
+msgid ""
+"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+msgstr ""
+"niewystarczająca ilość pamięci współdzielonej dla struktury danych \"%s"
+"\" (zadanie %lu bajtów)"
+
+#: storage/ipc/shmem.c:365
+#, c-format
+msgid "could not create ShmemIndex entry for data structure \"%s\""
+msgstr "nie można utworzyć wpisu ShmemIndex dla struktury danych \"%s\""
+
+#: storage/ipc/shmem.c:380
+#, c-format
+msgid ""
+"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
+"actual %lu"
+msgstr ""
+"rozmiar wpisu ShmemIndex jest nieprawidłowy dla struktury danych \"%s\": "
+"oczekiwano %lu, obecnie %lu"
+
+#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
+msgid "requested shared memory size overflows size_t"
+msgstr "żądana ilość pamięci współdzielonej przekracza size_t"
+
+#: storage/buffer/bufmgr.c:134 storage/buffer/bufmgr.c:239
+msgid "cannot access temporary tables of other sessions"
+msgstr "nie można uzyskać dostępu do tabel tymczasowych innych sesji"
+
+#: storage/buffer/bufmgr.c:373
+#, c-format
+msgid "unexpected data beyond EOF in block %u of relation %s"
+msgstr "nieoczekiwane dane za EOF w bloku %u relacji %s"
+
+#: storage/buffer/bufmgr.c:375
+msgid ""
+"This has been seen to occur with buggy kernels; consider updating your "
+"system."
+msgstr ""
+"Zaobserwowano takie zachowanie przy wadliwy jądrze; rozważ aktualizację "
+"systemu."
+
+#: storage/buffer/bufmgr.c:447
+#, c-format
+msgid "invalid page header in block %u of relation %s; zeroing out page"
+msgstr ""
+"nieprawidłowy nagłówek strony w bloku %u relacji %s: zerowanie strony wyjścia"
+
+#: storage/buffer/bufmgr.c:455
+#, c-format
+msgid "invalid page header in block %u of relation %s"
+msgstr "nieprawidłowy nagłówek strony w bloku %u relacji %s"
+
+#: storage/buffer/bufmgr.c:2735
+#, c-format
+msgid "could not write block %u of %s"
+msgstr "nie można zapisać bloku %u z %s"
+
+#: storage/buffer/bufmgr.c:2737
+msgid "Multiple failures --- write error might be permanent."
+msgstr "Wielokrotne awarie -- błąd zapisu może być trwały."
+
+#: storage/buffer/bufmgr.c:2758 storage/buffer/bufmgr.c:2777
+#, c-format
+msgid "writing block %u of relation %s"
+msgstr "zapis bloku %u relacji %s"
+
+#: storage/buffer/localbuf.c:190
+msgid "no empty local buffer available"
+msgstr "brak dostępnego pustego bufora lokalnego"
+
+#: storage/file/fd.c:405
+#, c-format
+msgid "getrlimit failed: %m"
+msgstr "nie powiodło się getrlimit: %m"
+
+#: storage/file/fd.c:495
+msgid "insufficient file descriptors available to start server process"
+msgstr ""
+"dostępna niewystarczająca ilość deskryptorów plików by uruchomić proces "
+"serwera"
+
+#: storage/file/fd.c:496
+#, c-format
+msgid "System allows %d, we need at least %d."
+msgstr "System dopuszcza %d, potrzeba nam co najmniej %d."
+
+#: storage/file/fd.c:537 storage/file/fd.c:1469 storage/file/fd.c:1585
+#, c-format
+msgid "out of file descriptors: %m; release and retry"
+msgstr "obecnie brak deskryptorów plików: %m; zwolnij je i spróbuj ponownie"
+
+#: storage/file/fd.c:1110
+#, c-format
+msgid "temporary file: path \"%s\", size %lu"
+msgstr "plik tymczasowy: ścieżka \"%s\", rozmiar %lu"
+
+#: storage/file/fd.c:1644
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "nie można czytać katalogu \"%s\": %m"
+
+#: storage/smgr/md.c:381 storage/smgr/md.c:855
+#, c-format
+msgid "could not truncate file \"%s\": %m"
+msgstr "nie można obciąć pliku \"%s\": %m"
+
+#: storage/smgr/md.c:449
+#, c-format
+msgid "cannot extend file \"%s\" beyond %u blocks"
+msgstr "nie można rozszerzyć pliku \"%s\" ponad %u bloków"
+
+#: storage/smgr/md.c:471 storage/smgr/md.c:635 storage/smgr/md.c:710
+#, c-format
+msgid "could not seek to block %u in file \"%s\": %m"
+msgstr "nie można pozycjonować do bloku %u w pliku \"%s\": %m"
+
+#: storage/smgr/md.c:479
+#, c-format
+msgid "could not extend file \"%s\": %m"
+msgstr "nie można rozszerzyć pliku \"%s\": %m"
+
+#: storage/smgr/md.c:481 storage/smgr/md.c:488 storage/smgr/md.c:737
+msgid "Check free disk space."
+msgstr "Sprawdź dostępne miejsce na dysku."
+
+#: storage/smgr/md.c:485
+#, c-format
+msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
+msgstr ""
+"nie można rozszerzyć pliku \"%s\": zapisano tylko %d z %d bajtów w bloku %u"
+
+#: storage/smgr/md.c:653
+#, c-format
+msgid "could not read block %u in file \"%s\": %m"
+msgstr "nie można odczytać bloku %u w pliku \"%s\": %m"
+
+#: storage/smgr/md.c:669
+#, c-format
+msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
+msgstr ""
+"nie można odczytać bloku %u z pliku \"%s\": odczytano tylko %d z %d bajtów"
+
+#: storage/smgr/md.c:728
+#, c-format
+msgid "could not write block %u in file \"%s\": %m"
+msgstr "nie można zapisać bloku %u do pliku \"%s\": %m"
+
+#: storage/smgr/md.c:733
+#, c-format
+msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
+msgstr ""
+"nie można zapisać bloku %u do pliku \"%s\": zapisano tylko %d z %d bajtów"
+
+#: storage/smgr/md.c:831
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
+msgstr ""
+"nie udało się obciąć pliku \"%s\" do %u bloków: jest tam teraz tylko %u "
+"bloków"
+
+#: storage/smgr/md.c:880
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: %m"
+msgstr "nie można obciąć pliku \"%s\" do %u bloków: %m"
+
+#: storage/smgr/md.c:1134
+#, c-format
+msgid "could not fsync file \"%s\" but retrying: %m"
+msgstr "nie można wykonać fsync na pliku \"%s\" ale trwa próba ponowienia: %m"
+
+#: storage/smgr/md.c:1276
+msgid "could not forward fsync request because request queue is full"
+msgstr ""
+"nie można przesłać dalej żądania fsync ponieważ kolejka żądań jest pełna"
+
+#: storage/smgr/md.c:1646
+#, c-format
+msgid "could not open file \"%s\" (target block %u): %m"
+msgstr "nie można otworzyć pliku \"%s\" (blok docelowy %u): %m"
+
+#: storage/smgr/md.c:1668
+#, c-format
+msgid "could not seek to end of file \"%s\": %m"
+msgstr "nie można pozycjonować do końca w pliku \"%s\": %m"
+
+#: storage/large_object/inv_api.c:555 storage/large_object/inv_api.c:752
+#, c-format
+msgid "large object %u was not opened for writing"
+msgstr "duży obiektu %u nie był otwarty do zapisu"
+
+#: storage/large_object/inv_api.c:562 storage/large_object/inv_api.c:759
+#, c-format
+msgid "large object %u was already dropped"
+msgstr "duży obiekt %u został już skasowany"
+
+#: storage/lmgr/deadlock.c:915
+#, c-format
+msgid "Process %d waits for %s on %s; blocked by process %d."
+msgstr "Proces %d oczekuje na %s na %s; zablokowany przez %d."
+
+#: storage/lmgr/deadlock.c:934
+#, c-format
+msgid "Process %d: %s"
+msgstr "Proces %d: %s"
+
+#: storage/lmgr/deadlock.c:941
+msgid "deadlock detected"
+msgstr "wykryto zakleszczenie"
+
+#: storage/lmgr/deadlock.c:944
+msgid "See server log for query details."
+msgstr "Przejrzyj dziennik serwera by znaleźć szczegóły zapytania."
+
+#: storage/lmgr/lmgr.c:720
+#, c-format
+msgid "relation %u of database %u"
+msgstr "relacja %u bazy danych %u"
+
+#: storage/lmgr/lmgr.c:726
+#, c-format
+msgid "extension of relation %u of database %u"
+msgstr "rozszerzenie relacji %u bazy danych %u"
+
+#: storage/lmgr/lmgr.c:732
+#, c-format
+msgid "page %u of relation %u of database %u"
+msgstr "strona %u relacji %u bazy danych %u"
+
+#: storage/lmgr/lmgr.c:739
+#, c-format
+msgid "tuple (%u,%u) of relation %u of database %u"
+msgstr "krotka (%u,%u) relacji %u bazy danych %u"
+
+#: storage/lmgr/lmgr.c:747
+#, c-format
+msgid "transaction %u"
+msgstr "transakcja %u"
+
+#: storage/lmgr/lmgr.c:752
+#, c-format
+msgid "virtual transaction %d/%u"
+msgstr "wirtualna transakcja %d/%u"
+
+#: storage/lmgr/lmgr.c:758
+#, c-format
+msgid "object %u of class %u of database %u"
+msgstr "obiekt %u relacji %u bazy danych %u"
+
+#: storage/lmgr/lmgr.c:766
+#, c-format
+msgid "user lock [%u,%u,%u]"
+msgstr "blokada użytkownika [%u,%u,%u]"
+
+#: storage/lmgr/lmgr.c:773
+#, c-format
+msgid "advisory lock [%u,%u,%u,%u]"
+msgstr "blokada konsultacyjna [%u,%u,%u,%u]"
+
+#: storage/lmgr/lmgr.c:781
+#, c-format
+msgid "unrecognized locktag type %d"
+msgstr "nierozpoznany typ locktag %d"
+
+#: storage/lmgr/lock.c:517
+#, c-format
+msgid ""
+"cannot acquire lock mode %s on database objects while recovery is in progress"
+msgstr ""
+"nie można nałożyć blokady w trybie %s na obiekty bazy danych podczas "
+"wykonywania odzyskania"
+
+#: storage/lmgr/lock.c:519
+msgid ""
+"Only RowExclusiveLock or less can be acquired on database objects during "
+"recovery."
+msgstr ""
+"Tylko RowExclusiveLock lub mniej może być nałożonych na obiekty bazy danych "
+"w czasie odzyskiwania."
+
+#: storage/lmgr/lock.c:632 storage/lmgr/lock.c:701 storage/lmgr/lock.c:2543
+#: storage/lmgr/lock.c:2608
+msgid "You might need to increase max_locks_per_transaction."
+msgstr "Możesz potrzebować podniesienia wartości max_locks_per_transaction."
+
+#: storage/lmgr/lock.c:2164
+msgid "Not enough memory for reassigning the prepared transaction's locks."
+msgstr ""
+"Niewystarczająca ilość pamięci do realokacji blokad przygotowanych "
+"transakcji."
+
+#: storage/lmgr/proc.c:1046 utils/adt/misc.c:102
+#, c-format
+msgid "could not send signal to process %d: %m"
+msgstr "nie udało się wysłać sygnału do procesu %d: %m"
+
+#: storage/lmgr/proc.c:1080
+#, c-format
+msgid ""
+"process %d avoided deadlock for %s on %s by rearranging queue order after "
+"%ld.%03d ms"
+msgstr ""
+"proces %d uniknÄ…Å‚ zakleszczenia dla %s na %s przez przestawienie porzÄ…dku "
+"kolejki po %ld.%03d ms"
+
+#: storage/lmgr/proc.c:1092
+#, c-format
+msgid ""
+"process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
+msgstr ""
+"proces %d wykrył zakleszczenie podczas oczekiwania na %s na %s po %ld.%03d ms"
+
+#: storage/lmgr/proc.c:1098
+#, c-format
+msgid "process %d still waiting for %s on %s after %ld.%03d ms"
+msgstr "proces %d wciąż oczekuje na %s na %s po %ld.%03d ms"
+
+#: storage/lmgr/proc.c:1102
+#, c-format
+msgid "process %d acquired %s on %s after %ld.%03d ms"
+msgstr "proces %d uzyskał %s na %s po %ld.%03d ms"
+
+#: storage/lmgr/proc.c:1118
+#, c-format
+msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
+msgstr "procesowi %d nie udało się uzyskanie %s na %s po %ld.%03d ms"
+
+#: storage/lmgr/predicate.c:665
+msgid "not enough elements in RWConflictPool to record a read/write conflict"
+msgstr ""
+"brak wystarczającej liczby elementów w RWConflictPool by nagrać konflikt "
+"odczytu/zapisu"
+
+#: storage/lmgr/predicate.c:666 storage/lmgr/predicate.c:694
+msgid ""
+"You might need to run fewer transactions at a time or increase "
+"max_connections."
+msgstr ""
+"Możesz potrzebować uruchomić mniejszą ilość transakcji jednocześnie lub "
+"zwiększyć max_connections."
+
+#: storage/lmgr/predicate.c:693
+msgid ""
+"not enough elements in RWConflictPool to record a potential read/write "
+"conflict"
+msgstr ""
+"brak wystarczającej liczby elementów w RWConflictPool by nagrać potencjalny "
+"konflikt odczytu/zapisu"
+
+#: storage/lmgr/predicate.c:898
+msgid "memory for serializable conflict tracking is nearly exhausted"
+msgstr "pamięć dla serializowanego śledzenia konfliktów jest prawie wyczerpana"
+
+#: storage/lmgr/predicate.c:899
+msgid ""
+"There might be an idle transaction or a forgotten prepared transaction "
+"causing this."
+msgstr ""
+"Spowodowała to najprawdopodobniej bezczynna transakcja lub zapomniana "
+"przygotowana transakcja."
+
+#: storage/lmgr/predicate.c:1181 storage/lmgr/predicate.c:1253
+#, c-format
+msgid ""
+"not enough shared memory for elements of data structure \"%s\" (%lu bytes "
+"requested)"
+msgstr ""
+"niewystarczająca ilość pamięci współdzielonej dla elementów struktury danych "
+"\"%s\" (zadanie %lu bajtów)"
+
+#: storage/lmgr/predicate.c:1536
+msgid "deferrable snapshot was unsafe; trying a new one"
+msgstr "odraczalny wyzwalacz był nie niebezpieczny; próba nowego"
+
+#: storage/lmgr/predicate.c:2234 storage/lmgr/predicate.c:2249
+#: storage/lmgr/predicate.c:3624
+msgid "You might need to increase max_pred_locks_per_transaction."
+msgstr ""
+"Możesz potrzebować zwiększenia wartości max_pred_locks_per_transaction."
+
+#: storage/lmgr/predicate.c:3778 storage/lmgr/predicate.c:3867
+#: storage/lmgr/predicate.c:3875 storage/lmgr/predicate.c:3914
+#: storage/lmgr/predicate.c:4153 storage/lmgr/predicate.c:4491
+#: storage/lmgr/predicate.c:4503 storage/lmgr/predicate.c:4545
+#: storage/lmgr/predicate.c:4583
+msgid ""
+"could not serialize access due to read/write dependencies among transactions"
+msgstr ""
+"nie można serializować dostępu ze względu na zależności odczytu/zapisu "
+"między transakcjami"
+
+#: storage/lmgr/predicate.c:3780 storage/lmgr/predicate.c:3869
+#: storage/lmgr/predicate.c:3877 storage/lmgr/predicate.c:3916
+#: storage/lmgr/predicate.c:4155 storage/lmgr/predicate.c:4493
+#: storage/lmgr/predicate.c:4505 storage/lmgr/predicate.c:4547
+#: storage/lmgr/predicate.c:4585
+msgid "The transaction might succeed if retried."
+msgstr "Transakcja może się powieść po powtórzeniu."
+
+#: storage/page/bufpage.c:143 storage/page/bufpage.c:390
+#: storage/page/bufpage.c:623 storage/page/bufpage.c:753
+#, c-format
+msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
+msgstr ""
+"uszkodzone wskaźniki do stron: niższy = %u, wyższy = %u, specjalny = %u"
+
+#: storage/page/bufpage.c:433
+#, c-format
+msgid "corrupted item pointer: %u"
+msgstr "uszkodzony wskaźnik do elementu: %u"
+
+#: storage/page/bufpage.c:444 storage/page/bufpage.c:805
+#, c-format
+msgid "corrupted item lengths: total %u, available space %u"
+msgstr "uszkodzone długości elementów: suma %u, dostępna przestrzeń %u"
+
+#: storage/page/bufpage.c:642 storage/page/bufpage.c:778
+#, c-format
+msgid "corrupted item pointer: offset = %u, size = %u"
+msgstr "uszkodzony wskaźnik do elementu: przesunięcie = %u, rozmiar = %u"
+
+#: main/main.c:237
+#, c-format
+msgid "%s: setsysinfo failed: %s\n"
+msgstr "%s: nie powiodło się setsysinfo: %s\n"
+
+#: main/main.c:259
+#, c-format
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: nie powiodło się WSAStartup: %d\n"
+
+#: main/main.c:278
+#, c-format
+msgid ""
+"%s is the PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s jest serwerem PostgreSQL.\n"
+"\n"
+
+#: main/main.c:279
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
+msgstr ""
+"Użycie:\n"
+"  %s [OPCJE]...\n"
+"\n"
+
+#: main/main.c:280
+#, c-format
+msgid "Options:\n"
+msgstr "Opcje:\n"
+
+#: main/main.c:282
+#, c-format
+msgid "  -A 1|0          enable/disable run-time assert checking\n"
+msgstr ""
+"  -A 1|0          włącza/wyłącza sprawdzanie asercji w czasie wykonania\n"
+
+#: main/main.c:284
+#, c-format
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B NBUFFERS     liczba współdzielonych buforów\n"
+
+#: main/main.c:285
+#, c-format
+msgid "  -c NAME=VALUE   set run-time parameter\n"
+msgstr "  -c NAZWA=WART   ustawia parametr czasu wykonania\n"
+
+#: main/main.c:286
+#, c-format
+msgid "  -d 1-5          debugging level\n"
+msgstr "  -d 1-5          poziom debugu\n"
+
+#: main/main.c:287
+#, c-format
+msgid "  -D DATADIR      database directory\n"
+msgstr "  -D FDRDANYCH    folder bazy danych\n"
+
+#: main/main.c:288
+#, c-format
+msgid "  -e              use European date input format (DMY)\n"
+msgstr ""
+"  -e              używa europejskiego formatu wprowadzania daty (DMY)\n"
+
+#: main/main.c:289
+#, c-format
+msgid "  -F              turn fsync off\n"
+msgstr "  -F              wyłącza fsync\n"
+
+#: main/main.c:290
+#, c-format
+msgid "  -h HOSTNAME     host name or IP address to listen on\n"
+msgstr "  -h HOSTNAME     nazwa hosta lub adres IP do nasluchiwania\n"
+
+#: main/main.c:291
+#, c-format
+msgid "  -i              enable TCP/IP connections\n"
+msgstr "  -i              umożliwia połączenia TCP/IP\n"
+
+#: main/main.c:292
+#, c-format
+msgid "  -k DIRECTORY    Unix-domain socket location\n"
+msgstr "  -k FOLDER       położenie gniazd domeny Unix\n"
+
+#: main/main.c:294
+#, c-format
+msgid "  -l              enable SSL connections\n"
+msgstr "  -l              umożliwia połączenia SSL\n"
+
+#: main/main.c:296
+#, c-format
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N MAX-CONNECT  maksymalna liczba dozwolonych połączen\n"
+
+#: main/main.c:297
+#, c-format
+msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgstr ""
+"  -o OPCJE        przekazuje \"OPCJE\" do każdego procesu serwera "
+"(przestarzały)\n"
+
+#: main/main.c:298
+#, c-format
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p PORT         numer portu do nasłuchiwania\n"
+
+#: main/main.c:299
+#, c-format
+msgid "  -s              show statistics after each query\n"
+msgstr "  -s              pokazuje statystyki po wykonaniu każdego zapytania\n"
+
+#: main/main.c:300
+#, c-format
+msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
+msgstr "  -S WORK-MEM     ustawia wielkość pamięci dla sortowań (w kB)\n"
+
+#: main/main.c:301
+#, c-format
+msgid "  --NAME=VALUE    set run-time parameter\n"
+msgstr "  --NAZWA=WART    ustawia parametr czasu wykonania\n"
+
+#: main/main.c:302
+#, c-format
+msgid "  --describe-config  describe configuration parameters, then exit\n"
+msgstr "  --describe-config  opisuje parametry konfiguracji i kończy\n"
+
+#: main/main.c:303
+#, c-format
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          pokazuje ten ekran pomocy i kończy\n"
+
+#: main/main.c:304
+#, c-format
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       wypisuje informacje o wersji i kończy\n"
+
+#: main/main.c:306
+#, c-format
+msgid ""
+"\n"
+"Developer options:\n"
+msgstr ""
+"\n"
+"Opcje deweloperskie:\n"
+
+#: main/main.c:307
+#, c-format
+msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
+msgstr "  -f s|i|n|m|h    zabrania użycia pewnych typów planu\n"
+
+#: main/main.c:308
+#, c-format
+msgid ""
+"  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr ""
+"  -n              nie reinicjuje pamięci współdzielonej po nieprawidłowym "
+"wyjściu\n"
+
+#: main/main.c:309
+#, c-format
+msgid "  -O              allow system table structure changes\n"
+msgstr "  -O              pozwala na zmiany struktury tabel systemowych\n"
+
+#: main/main.c:310
+#, c-format
+msgid "  -P              disable system indexes\n"
+msgstr "  -P              wyłącza indeksy systemowe\n"
+
+#: main/main.c:311
+#, c-format
+msgid "  -t pa|pl|ex     show timings after each query\n"
+msgstr "  -t pa|pl|ex     pokazuje czasy wykonania po każdym zapytaniu\n"
+
+#: main/main.c:312
+#, c-format
+msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
+msgstr ""
+"  -T              wysyła SIGSTOP do wszystkich procesów działających w tle "
+"jeśli jeden zginie\n"
+
+#: main/main.c:313
+#, c-format
+msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
+msgstr ""
+"  -W NUM          oczekuje NUM sekund aby umożliwić podłączenie z debugera\n"
+
+#: main/main.c:315
+#, c-format
+msgid ""
+"\n"
+"Options for single-user mode:\n"
+msgstr ""
+"\n"
+"Opcje dla trybu pojedynczego użytkownika:\n"
+
+#: main/main.c:316
+#, c-format
+msgid "  --single        selects single-user mode (must be first argument)\n"
+msgstr ""
+"  --single        wybiera tryb pojedynczego użytkownika (musi być pierwszym "
+"argumentem)\n"
+
+#: main/main.c:317
+#, c-format
+msgid "  DBNAME          database name (defaults to user name)\n"
+msgstr ""
+"  NAZWADB         nazwa bazy danych (domyślnie taka jak nazwa użytkownika)\n"
+
+#: main/main.c:318
+#, c-format
+msgid "  -d 0-5          override debugging level\n"
+msgstr "  -d 0-5          nadpisuje poziom debugu\n"
+
+#: main/main.c:319
+#, c-format
+msgid "  -E              echo statement before execution\n"
+msgstr "  -E              wypisuje na wyjście wyrażenie przed wykonaniem\n"
+
+#: main/main.c:320
+#, c-format
+msgid "  -j              do not use newline as interactive query delimiter\n"
+msgstr ""
+"  -j              nie używa nowej linii jako interaktywnego ogranicznika "
+"zapytania\n"
+
+#: main/main.c:321 main/main.c:326
+#, c-format
+msgid "  -r FILENAME     send stdout and stderr to given file\n"
+msgstr "  -r NAZWAPLIKU   wysyła stdout i stderr do wskazanego pliku\n"
+
+#: main/main.c:323
+#, c-format
+msgid ""
+"\n"
+"Options for bootstrapping mode:\n"
+msgstr ""
+"\n"
+"Opcje dla trybu Å‚adowania:\n"
+
+#: main/main.c:324
+#, c-format
+msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
+msgstr ""
+"  --boot          wybiera tryb ładowania (musi być pierwszym argumentem)\n"
+
+#: main/main.c:325
+#, c-format
+msgid ""
+"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
+msgstr ""
+"  NAZWADB         nazwa bazy danych (domyślnie taka jak nazwa użytkownika)\n"
+
+#: main/main.c:327
+#, c-format
+msgid "  -x NUM          internal use\n"
+msgstr "  -x NUM          do użytku wewnętrznego\n"
+
+#: main/main.c:329
+#, c-format
+msgid ""
+"\n"
+"Please read the documentation for the complete list of run-time\n"
+"configuration settings and how to set them on the command line or in\n"
+"the configuration file.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Proszę zapoznać się z dokumentacją by uzyskać pełną listę ustawień\n"
+"konfiguracyjnych czasu wykonania i jak ustawić je w linii poleceń\n"
+"lub pliku konfiguracyjnym.\n"
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: main/main.c:343
+msgid ""
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"Uruchomienie serwera PostgreSQL jako \"root\" jest niedozwolone.\n"
+"Serwer musi być uruchomiony spod ID użytkownika nieuprzywilejowanego\n"
+"aby zapobiec możliwemu złamaniu zabezpieczeń systemu.  Przejrzyj "
+"dokumentacjÄ™\n"
+"by uzyskać więcej informacji jak poprawnie uruchomić serwer.\n"
+
+#: main/main.c:360
+#, c-format
+msgid "%s: real and effective user IDs must match\n"
+msgstr "%s: realne i efektywne IDy użytkowników muszą się zgadzać\n"
+
+#: main/main.c:367
+msgid ""
+"Execution of PostgreSQL by a user with administrative permissions is not\n"
+"permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromises.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"Uruchomienie serwera PostgreSQL przez użytkownika z uprawnieniami \n"
+"administracyjnymi jest niedozwolone.\n"
+"Serwer musi być uruchomiony spod ID użytkownika nieuprzywilejowanego\n"
+"aby zapobiec możliwemu złamaniu zabezpieczeń systemu.  Przejrzyj "
+"dokumentacjÄ™\n"
+"by uzyskać więcej informacji jak poprawnie uruchomić serwer.\n"
+
+#: main/main.c:388
+#, c-format
+msgid "%s: invalid effective UID: %d\n"
+msgstr "%s: niepoprawny efektywny UID: %d\n"
+
+#: main/main.c:401
+#, c-format
+msgid "%s: could not determine user name (GetUserName failed)\n"
+msgstr ""
+"%s: nie można określić nazwy użytkownika (nie powiodło się GetUserName)\n"
+
+#: optimizer/prep/prepunion.c:385
+msgid "could not implement recursive UNION"
+msgstr "nie udało się zaimplementować rekurencyjnej UNION"
+
+#: optimizer/prep/prepunion.c:386
+msgid "All column datatypes must be hashable."
+msgstr "Wszystkie typy danych kolumn muszą być haszowalne."
+
+#. translator: %s is UNION, INTERSECT, or EXCEPT
+#: optimizer/prep/prepunion.c:790
+#, c-format
+msgid "could not implement %s"
+msgstr "nie udało się zaimplementować %s"
+
+#: optimizer/prep/prepunion.c:791 optimizer/plan/planner.c:2255
+#: optimizer/plan/planner.c:2427
+msgid ""
+"Some of the datatypes only support hashing, while others only support "
+"sorting."
+msgstr ""
+"Niektóre z typów danych obsługują tylko haszowania, podczas gdy inne "
+"obsługują tylko sortowanie."
+
+#: optimizer/util/clauses.c:4165
+#, c-format
+msgid "SQL function \"%s\" during inlining"
+msgstr "funkcja SQL \"%s\" w czasie wbudowywania"
+
+#: optimizer/util/plancat.c:97
+msgid "cannot access temporary or unlogged relations during recovery"
+msgstr ""
+"nie można uzyskać dostępu do tymczasowej lub nielogowanej relacji podczas "
+"odzyskiwania"
+
+#: optimizer/plan/initsplan.c:595
+msgid ""
+"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
+"join"
+msgstr ""
+"SELECT FOR UPDATE/SHARE nie może być zastosowane do niewymaganej strony "
+"złączenia zewnętrznego"
+
+#: optimizer/plan/planner.c:959 parser/analyze.c:1337 parser/analyze.c:1534
+#: parser/analyze.c:2263
+msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
+msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne z UNION/INTERSECT/EXCEPT"
+
+#: optimizer/plan/planner.c:2254
+msgid "could not implement GROUP BY"
+msgstr "nie udało się zaimplementować GROUP BY"
+
+#: optimizer/plan/planner.c:2426
+msgid "could not implement DISTINCT"
+msgstr "nie udało się zaimplementować DISTINCT"
+
+#: optimizer/plan/planner.c:2877
+msgid "could not implement window PARTITION BY"
+msgstr "nie udało się zaimplementować okna PARTITION BY"
+
+#: optimizer/plan/planner.c:2878
+msgid "Window partitioning columns must be of sortable datatypes."
+msgstr "Kolumny podziału okna muszą być typów sortowalnych."
+
+#: optimizer/plan/planner.c:2882
+msgid "could not implement window ORDER BY"
+msgstr "nie udało się zaimplementować okna ORDER BY"
+
+#: optimizer/plan/planner.c:2883
+msgid "Window ordering columns must be of sortable datatypes."
+msgstr "Kolumny porządkujące okno muszą być typów sortowalnych."
+
+#: optimizer/path/joinrels.c:673
+msgid ""
+"FULL JOIN is only supported with merge-joinable or hash-joinable join "
+"conditions"
+msgstr ""
+"FULL JOIN jest obsługiwane tylko dla warunków połączenia merge-join lub hash-"
+"join"
+
+#: parser/analyze.c:471
+msgid "INSERT ... SELECT cannot specify INTO"
+msgstr "INSERT ... SELECT nie może określać INTO"
+
+#: parser/analyze.c:564 parser/analyze.c:1070
+msgid "VALUES lists must all be the same length"
+msgstr "wszystkie listy VALUES muszą posiadać tą samą długość"
+
+#: parser/analyze.c:606 parser/analyze.c:1211
+msgid "VALUES must not contain table references"
+msgstr "VALUES nie może zawierać odnośników do tabel"
+
+#: parser/analyze.c:620 parser/analyze.c:1225
+msgid "VALUES must not contain OLD or NEW references"
+msgstr "VALUES nie może zawierać odnośników OLD lub NEW"
+
+#: parser/analyze.c:621 parser/analyze.c:1226
+msgid "Use SELECT ... UNION ALL ... instead."
+msgstr "Użyj SELECT ... UNION ALL ... w zamian."
+
+#: parser/analyze.c:725 parser/analyze.c:1238
+msgid "cannot use aggregate function in VALUES"
+msgstr "nie można używać funkcji agregujących w klauzuli VALUES"
+
+#: parser/analyze.c:731 parser/analyze.c:1244
+msgid "cannot use window function in VALUES"
+msgstr "nie można używać funkcji okna w klauzuli VALUES"
+
+#: parser/analyze.c:765
+msgid "INSERT has more expressions than target columns"
+msgstr "INSERT posiada więcej wyrażeń niż docelowych kolumn"
+
+#: parser/analyze.c:783
+msgid "INSERT has more target columns than expressions"
+msgstr "INSERT posiada więcej docelowych kolumn niż wyrażeń"
+
+#: parser/analyze.c:787
+msgid ""
+"The insertion source is a row expression containing the same number of "
+"columns expected by the INSERT. Did you accidentally use extra parentheses?"
+msgstr ""
+"Źródło wstawienia jest wyrażenie wierszowe zawierające ta samą liczbę kolumn "
+"jak oczekiwana przez INSERT. Czy nie użyłeś przypadkowo nadmiarowych "
+"nawiasów?"
+
+#: parser/analyze.c:1084
+msgid "DEFAULT can only appear in a VALUES list within INSERT"
+msgstr "DEFAULT może pojawiać się jedynie na liście VALUES wewnątrz INSERT"
+
+#: parser/analyze.c:1192 parser/analyze.c:2414
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
+msgstr "SELECT FOR UPDATE/SHARE nie może być stosowane do VALUES"
+
+#: parser/analyze.c:1452
+msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
+msgstr "nieprawidłowa klauzula UNION/INTERSECT/EXCEPT ORDER BY"
+
+#: parser/analyze.c:1453
+msgid "Only result column names can be used, not expressions or functions."
+msgstr ""
+"Mogą być użyte tylko nazwy kolumn wynikowych, nie zaś wyrażenia ani funkcje."
+
+#: parser/analyze.c:1454
+msgid ""
+"Add the expression/function to every SELECT, or move the UNION into a FROM "
+"clause."
+msgstr ""
+"Dodaj wyrażenie/funkcję do każdego SELECT, lub przenieś UNION do klauzuli "
+"FROM."
+
+#: parser/analyze.c:1526
+msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
+msgstr ""
+"INTO jest dopuszczalne jedynie dla pierwszego SELECT z UNION/INTERSECT/EXCEPT"
+
+#: parser/analyze.c:1586
+msgid ""
+"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
+"same query level"
+msgstr ""
+"składnik wyrażenia UNION/INTERSECT/EXCEPT nie może odwoływać się do relacji "
+"z tego samego poziomu zapytania"
+
+#: parser/analyze.c:1674
+#, c-format
+msgid "each %s query must have the same number of columns"
+msgstr "każde zapytanie %s musi mieć tą samą liczbę kolumn"
+
+#: parser/analyze.c:1930
+msgid "CREATE TABLE AS specifies too many column names"
+msgstr "CREATE TABLE AS określa zbyt wiele nazw kolumn"
+
+#: parser/analyze.c:1988
+msgid "cannot use aggregate function in UPDATE"
+msgstr "nie można użyć funkcji agregującej w poleceniu UPDATE"
+
+#: parser/analyze.c:1994
+msgid "cannot use window function in UPDATE"
+msgstr "nie można użyć funkcji okna w poleceniu UPDATE"
+
+#: parser/analyze.c:2103
+msgid "cannot use aggregate function in RETURNING"
+msgstr "nie można użyć funkcji agregującej w poleceniu RETURNING"
+
+#: parser/analyze.c:2109
+msgid "cannot use window function in RETURNING"
+msgstr "nie można użyć funkcji okna w poleceniu RETURNING"
+
+#: parser/analyze.c:2128
+msgid "RETURNING cannot contain references to other relations"
+msgstr "RETURNING nie może zawierać odniesień do innych relacji"
+
+#: parser/analyze.c:2167
+msgid "cannot specify both SCROLL and NO SCROLL"
+msgstr "nie można określić obu SCROLL i NO SCROLL"
+
+#: parser/analyze.c:2181
+msgid "DECLARE CURSOR cannot specify INTO"
+msgstr "DECLARE CURSOR nie może określać INTO"
+
+#: parser/analyze.c:2193
+msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
+msgstr "DECLARE CURSOR nie może zawierać wyrażeń zmieniających dane w WITH"
+
+#: parser/analyze.c:2199
+msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE nie jest obsługiwane"
+
+#: parser/analyze.c:2200
+#, fuzzy
+msgid "Holdable cursors must be READ ONLY."
+msgstr "Kursory ponadtransakcyjne muszą być READ ONLY."
+
+#: parser/analyze.c:2213
+msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE nie jest obsługiwane"
+
+#: parser/analyze.c:2214
+msgid "Insensitive cursors must be READ ONLY."
+msgstr "Kursory nieczułe muszą być READ ONLY."
+
+#: parser/analyze.c:2267
+msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
+msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne z klauzulÄ… DISTINCT"
+
+#: parser/analyze.c:2271
+msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
+msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne z klauzulÄ… GROUP BY"
+
+#: parser/analyze.c:2275
+msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
+msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne z klauzulÄ… HAVING"
+
+#: parser/analyze.c:2279
+msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
+msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne z funkcjami agregujÄ…cymi"
+
+#: parser/analyze.c:2283
+msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
+msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne z funkcjami okna"
+
+#: parser/analyze.c:2287
+msgid ""
+"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
+"target list"
+msgstr ""
+"SELECT FOR UPDATE/SHARE z funkcjami zwracającymi zbiór na liście docelowej "
+"nie jest dopuszczalny"
+
+#: parser/analyze.c:2366
+msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
+msgstr "SELECT FOR UPDATE/SHARE musi wskazywać niekwalifikowane nazwy relacji"
+
+#: parser/analyze.c:2383
+#, c-format
+msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
+msgstr ""
+"SELECT FOR UPDATE/SHARE nie może być zastosowane do tabeli obcej \"%s\""
+
+#: parser/analyze.c:2402
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
+msgstr "SELECT FOR UPDATE/SHARE nie może być zastosowane do złączenia"
+
+#: parser/analyze.c:2408
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
+msgstr "SELECT FOR UPDATE/SHARE nie może być zastosowane dla funkcji"
+
+#: parser/analyze.c:2420
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
+msgstr "SELECT FOR UPDATE/SHARE nie może być zastosowane do zapytania WITH"
+
+#: parser/analyze.c:2434
+#, c-format
+msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
+msgstr ""
+"relacja \"%s\" w klauzuli FOR UPDATE/SHARE nie odnaleziona w klauzuli FROM"
+
+#: parser/parse_agg.c:131 parser/parse_oper.c:219
+#, c-format
+msgid "could not identify an ordering operator for type %s"
+msgstr "nie można określić operatora porządkującego dla typu %s"
+
+#: parser/parse_agg.c:133
+msgid "Aggregates with DISTINCT must be able to sort their inputs."
+msgstr "Agregaty z DISTINCT muszą potrafić sortować swoje wejścia."
+
+#: parser/parse_agg.c:174
+msgid "aggregate function calls cannot contain window function calls"
+msgstr "wywołania funkcji agregujących nie mogą zawierać wywołań funkcji okna"
+
+#: parser/parse_agg.c:245 parser/parse_clause.c:1637
+#, c-format
+msgid "window \"%s\" does not exist"
+msgstr "okno \"%s\" nie istnieje"
+
+#: parser/parse_agg.c:336
+msgid "aggregates not allowed in WHERE clause"
+msgstr "agregaty nie sÄ… dopuszczalne w klauzuli WHERE"
+
+#: parser/parse_agg.c:342
+msgid "aggregates not allowed in JOIN conditions"
+msgstr "agregaty nie sÄ… dopuszczalne w warunku JOIN"
+
+#: parser/parse_agg.c:363
+msgid "aggregates not allowed in GROUP BY clause"
+msgstr "agregaty nie sÄ… dopuszczalne w klauzuli GROUP BY"
+
+#: parser/parse_agg.c:433
+msgid "aggregate functions not allowed in a recursive query's recursive term"
+msgstr ""
+"funkcje agregujące są niedopuszczalne w określeniu rekurencyjności zapytań "
+"rekursywnych"
+
+#: parser/parse_agg.c:458
+msgid "window functions not allowed in WHERE clause"
+msgstr "funkcje okna nie sÄ… dopuszczalne w klauzuli WHERE"
+
+#: parser/parse_agg.c:464
+msgid "window functions not allowed in JOIN conditions"
+msgstr "funkcje okna nie sÄ… dopuszczalne w warunku JOIN"
+
+#: parser/parse_agg.c:470
+msgid "window functions not allowed in HAVING clause"
+msgstr "funkcje okna nie sÄ… dopuszczalne w klauzuli WHERE"
+
+#: parser/parse_agg.c:483
+msgid "window functions not allowed in GROUP BY clause"
+msgstr "funkcje okna nie sÄ… dopuszczalne w klauzuli GROUP BY"
+
+#: parser/parse_agg.c:502 parser/parse_agg.c:515
+msgid "window functions not allowed in window definition"
+msgstr "funkcje okna nie sÄ… dopuszczalne w definicji okna"
+
+#: parser/parse_agg.c:673
+#, c-format
+msgid ""
+"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
+"aggregate function"
+msgstr ""
+"kolumna \"%s.%s\" musi występować w klauzuli GROUP BY lub być użyta w "
+"funkcji agregujÄ…cej"
+
+#: parser/parse_agg.c:679
+#, c-format
+msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
+msgstr ""
+"podzapytanie używa niegrupowanej kolumny \"%s.%s\" z zapytania zewnętrznego"
+
+#: parser/parse_clause.c:421
+#, c-format
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgstr "klauzula JOIN/ON odwołuje się do \"%s\", co nie jest częścią JOIN"
+
+#: parser/parse_clause.c:502
+msgid "subquery in FROM cannot have SELECT INTO"
+msgstr "podzapytanie w klauzuli FROM nie może posiadać SELECT INTO"
+
+#: parser/parse_clause.c:524
+msgid "subquery in FROM cannot refer to other relations of same query level"
+msgstr ""
+"podzapytanie w FROM nie może odwoływać się do innych relacji tego samego "
+"poziomu zapytania"
+
+#: parser/parse_clause.c:580
+msgid ""
+"function expression in FROM cannot refer to other relations of same query "
+"level"
+msgstr ""
+"wyrażenie funkcyjne w FROM nie może odwoływać się do innych relacji tego "
+"samego poziomu zapytania"
+
+#: parser/parse_clause.c:593
+msgid "cannot use aggregate function in function expression in FROM"
+msgstr "nie można użyć funkcji agregującej w wyrażeniu funkcyjnym w FROM"
+
+#: parser/parse_clause.c:600
+msgid "cannot use window function in function expression in FROM"
+msgstr "nie można użyć funkcji okna w wyrażeniu funkcyjnym w FROM"
+
+#: parser/parse_clause.c:877
+#, c-format
+msgid "column name \"%s\" appears more than once in USING clause"
+msgstr "nazwa kolumny \"%s\" występuje więcej niż raz w klauzuli USING"
+
+#: parser/parse_clause.c:892
+#, c-format
+msgid "common column name \"%s\" appears more than once in left table"
+msgstr "wspólna nazwa kolumny \"%s\" występuje więcej niż raz w lewej tabeli"
+
+#: parser/parse_clause.c:901
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in left table"
+msgstr "kolumna \"%s\" określona w klauzuli USING nie istnieje w lewej tabeli"
+
+#: parser/parse_clause.c:915
+#, c-format
+msgid "common column name \"%s\" appears more than once in right table"
+msgstr "wspólna nazwa kolumny \"%s\" występuje więcej niż raz w prawej tabeli"
+
+#: parser/parse_clause.c:924
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in right table"
+msgstr "kolumna \"%s\" określona w klauzuli USING nie istnieje w prawej tabeli"
+
+#: parser/parse_clause.c:981
+#, c-format
+msgid "column alias list for \"%s\" has too many entries"
+msgstr "lista aliasów kolumn dla \"%s\" posiada zbyt wiele pozycji"
+
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1228
+#, c-format
+msgid "argument of %s must not contain variables"
+msgstr "argument %s nie może zawierać zmiennych"
+
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1239
+#, c-format
+msgid "argument of %s must not contain aggregate functions"
+msgstr "argument %s nie może zawierać funkcji agregujących"
+
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1250
+#, c-format
+msgid "argument of %s must not contain window functions"
+msgstr "argument %s nie może zawierać funkcji okna"
+
+#. translator: first %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1367
+#, c-format
+msgid "%s \"%s\" is ambiguous"
+msgstr "%s \"%s\" jest niejednoznaczny"
+
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1391
+#, c-format
+msgid "non-integer constant in %s"
+msgstr "niecałkowita stała w %s"
+
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1409
+#, c-format
+msgid "%s position %d is not in select list"
+msgstr "%s pozycja %d nie jest na liście wyboru"
+
+#: parser/parse_clause.c:1625
+#, c-format
+msgid "window \"%s\" is already defined"
+msgstr "okno \"%s\" jest już zdefiniowane"
+
+#: parser/parse_clause.c:1679
+#, c-format
+msgid "cannot override PARTITION BY clause of window \"%s\""
+msgstr "nie można nadpisać klauzuli PARTITION BY okna \"%s\""
+
+#: parser/parse_clause.c:1691
+#, c-format
+msgid "cannot override ORDER BY clause of window \"%s\""
+msgstr "nie można nadpisać klauzuli ORDER BY okna \"%s\""
+
+#: parser/parse_clause.c:1713
+#, c-format
+msgid "cannot override frame clause of window \"%s\""
+msgstr "nie można nadpisać klauzuli ramki okna \"%s\""
+
+#: parser/parse_clause.c:1779
+#, fuzzy
+msgid ""
+"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
+"list"
+msgstr ""
+"w agregacie z DISTINCT, wyrażenia ORDER BY muszą występować na liście "
+"argumentów"
+
+#: parser/parse_clause.c:1780
+msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
+msgstr ""
+"dla SELECT DISTINCT, ORDER BY wyrażenia muszą występować na liście wyboru"
+
+#: parser/parse_clause.c:1866 parser/parse_clause.c:1898
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr "wyrażenia SELECT DISTINCT ON muszą odpowiadać wyrażeniom ORDER BY"
+
+#: parser/parse_clause.c:2020
+#, c-format
+msgid "operator %s is not a valid ordering operator"
+msgstr "operator %s nie jest prawidłowym operatorem porządkującym"
+
+#: parser/parse_clause.c:2022
+msgid ""
+"Ordering operators must be \"<\" or \">\" members of btree operator families."
+msgstr ""
+"Operatory porządkujące muszą być składnikami \"<\" lub \">\" rodzin "
+"operatora btree."
+
+#: parser/parse_coerce.c:906 parser/parse_coerce.c:936
+#: parser/parse_coerce.c:954 parser/parse_coerce.c:969
+#: parser/parse_expr.c:1670 parser/parse_expr.c:2112 parser/parse_target.c:829
+#, c-format
+msgid "cannot cast type %s to %s"
+msgstr "nie można rzutować typu %s na %s"
+
+#: parser/parse_coerce.c:939
+msgid "Input has too few columns."
+msgstr "Wejście posiada zbyt mało kolumn."
+
+#: parser/parse_coerce.c:957
+#, c-format
+msgid "Cannot cast type %s to %s in column %d."
+msgstr "Nie można rzutować typu %s na %s w kolumnie %d."
+
+#: parser/parse_coerce.c:972
+msgid "Input has too many columns."
+msgstr "Wejście posiada zbyt wiele kolumn."
+
+#. translator: first %s is name of a SQL construct, eg WHERE
+#: parser/parse_coerce.c:1015
+#, c-format
+msgid "argument of %s must be type boolean, not type %s"
+msgstr "argument %s musi być typu logicznego, nie typu %s"
+
+#. translator: %s is name of a SQL construct, eg WHERE
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1025 parser/parse_coerce.c:1074
+#, c-format
+msgid "argument of %s must not return a set"
+msgstr "argument %s nie może zwracać zbioru"
+
+#. translator: first %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1062
+#, c-format
+msgid "argument of %s must be type %s, not type %s"
+msgstr "argument %s musi być typu %s, nie typu %s"
+
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1195
+#, c-format
+msgid "%s types %s and %s cannot be matched"
+msgstr "%s typy %s i %s nie mogą być dopasowane"
+
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1262
+#, c-format
+msgid "%s could not convert type %s to %s"
+msgstr "%s nie może przekształcić typu %s do %s"
+
+#: parser/parse_coerce.c:1513
+msgid "arguments declared \"anyelement\" are not all alike"
+msgstr ""
+"argumenty zadeklarowane jako \"anyelement\" nie wszystkie sÄ… do siebie "
+"podobne"
+
+#: parser/parse_coerce.c:1533
+msgid "arguments declared \"anyarray\" are not all alike"
+msgstr ""
+"argumenty zadeklarowane jako \"anyarray\" nie wszystkie sÄ… do siebie podobne"
+
+#: parser/parse_coerce.c:1562 parser/parse_coerce.c:1710
+#: parser/parse_coerce.c:1742
+#, c-format
+msgid "argument declared \"anyarray\" is not an array but type %s"
+msgstr ""
+"argument zadeklarowany jako \"anyarray\" nie jest tablicÄ… ale jest typu %s"
+
+#: parser/parse_coerce.c:1578
+msgid ""
+"argument declared \"anyarray\" is not consistent with argument declared "
+"\"anyelement\""
+msgstr ""
+"argument zadeklarowany jako \"anyarray\" nie jest zgodny z argumentem "
+"zadeklarowanym jako \"anyelement\""
+
+#: parser/parse_coerce.c:1596
+msgid "could not determine polymorphic type because input has type \"unknown\""
+msgstr ""
+"nie można ustalić typu polimorficznego ponieważ wejście ma typ \"unknown\""
+
+#: parser/parse_coerce.c:1606
+#, c-format
+msgid "type matched to anynonarray is an array type: %s"
+msgstr "typ dopasowany do anynonarray jest typem tablicowym: %s"
+
+#: parser/parse_coerce.c:1616
+#, c-format
+msgid "type matched to anyenum is not an enum type: %s"
+msgstr "typ dopasowany do anyenum nie jest typem enumeracji: %s"
+
+#: parser/parse_cte.c:42
+#, c-format
+msgid ""
+"recursive reference to query \"%s\" must not appear within its non-recursive "
+"term"
+msgstr ""
+"rekurencyjne odwołanie do zapytania \"%s\" nie może pojawiać się wewnątrz "
+"określenia nierekurencyjnego"
+
+#: parser/parse_cte.c:44
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within a subquery"
+msgstr ""
+"rekurencyjne odwołanie do zapytania \"%s\" nie może pojawiać się wewnątrz "
+"podzapytania"
+
+#: parser/parse_cte.c:46
+#, c-format
+msgid ""
+"recursive reference to query \"%s\" must not appear within an outer join"
+msgstr ""
+"rekurencyjne odwołanie do zapytania \"%s\" nie może pojawiać się wewnątrz "
+"złączenia zewnętrznego"
+
+#: parser/parse_cte.c:48
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
+msgstr ""
+"rekurencyjne odwołanie do zapytania \"%s\" nie może pojawiać się wewnątrz "
+"INTERSECT"
+
+#: parser/parse_cte.c:50
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
+msgstr ""
+"rekurencyjne odwołanie do zapytania \"%s\" nie może pojawiać się wewnątrz "
+"EXCEPT"
+
+#: parser/parse_cte.c:132
+#, c-format
+msgid "WITH query name \"%s\" specified more than once"
+msgstr "nazwa \"%s\" kwerendy WITH określona więcej niż raz"
+
+#: parser/parse_cte.c:259
+msgid "subquery in WITH cannot have SELECT INTO"
+msgstr "podzapytanie w klauzuli WITH nie może posiadać SELECT INTO"
+
+#: parser/parse_cte.c:271
+msgid ""
+"WITH clause containing a data-modifying statement must be at the top level"
+msgstr ""
+"klauzula WITH zawierająca wyrażenie zmieniające dane musi być na najwyższym "
+"poziomie"
+
+#: parser/parse_cte.c:320
+#, c-format
+msgid ""
+"recursive query \"%s\" column %d has type %s in non-recursive term but type "
+"%s overall"
+msgstr ""
+"w zapytaniu rekurencyjnym \"%s\" kolumna %d jest typu %s w określeniu "
+"nierekursywnym, zaś ogólnie typu %s"
+
+#: parser/parse_cte.c:326
+msgid "Cast the output of the non-recursive term to the correct type."
+msgstr "Rzutuj wyjście z nierekurencyjnego określenia na poprawny typ."
+
+#: parser/parse_cte.c:331
+#, c-format
+msgid ""
+"recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
+"but collation \"%s\" overall"
+msgstr ""
+"w zapytaniu rekurencyjnym \"%s\" kolumna %d posiada porównania \"%s\" w "
+"określeniu nierekursywnym, zaś ogólnie porównanie \"%s\""
+
+#: parser/parse_cte.c:335
+msgid "Use the COLLATE clause to set the collation of the non-recursive term."
+msgstr ""
+"Użyj klauzuli COLLATE by ustawić jawnie porównanie określenia "
+"nierekursywnego."
+
+#: parser/parse_cte.c:426
+#, c-format
+msgid "WITH query \"%s\" has %d columns available but %d columns specified"
+msgstr ""
+"kwerenda WITH \"%s\" posiada %d dostępnych kolumn ale %d kolumn określonych"
+
+#: parser/parse_cte.c:606
+msgid "mutual recursion between WITH items is not implemented"
+msgstr "wzajemnej rekursja między elementami WITH nie jest realizowana"
+
+#: parser/parse_cte.c:658
+#, c-format
+msgid "recursive query \"%s\" must not contain data-modifying statements"
+msgstr ""
+"kwerenda rekurencyjna \"%s\" nie może zawierać wyrażeń zmieniających dane"
+
+#: parser/parse_cte.c:666
+#, c-format
+msgid ""
+"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
+"recursive-term"
+msgstr ""
+"kwerenda rekurencyjna \"%s\" nie posiada formy nierekursywnego-określenia "
+"dla rekursywnego-określenia UNION [ALL]"
+
+#: parser/parse_cte.c:698
+msgid "ORDER BY in a recursive query is not implemented"
+msgstr "ORDER BY w zapytaniu rekurencyjnym nie jest realizowana"
+
+#: parser/parse_cte.c:704
+msgid "OFFSET in a recursive query is not implemented"
+msgstr "OFFSET w zapytaniu rekurencyjnym nie jest realizowana"
+
+#: parser/parse_cte.c:710
+msgid "LIMIT in a recursive query is not implemented"
+msgstr "LIMIT w zapytaniu rekurencyjnym nie jest realizowana"
+
+#: parser/parse_cte.c:716
+msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
+msgstr "FOR UPDATE/SHARE w zapytaniu rekurencyjnym nie jest realizowana"
+
+#: parser/parse_cte.c:773
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear more than once"
+msgstr ""
+"rekurencyjne odwołanie do zapytania \"%s\" nie może pojawiać się więcej niż "
+"raz"
+
+#: parser/parse_expr.c:364 parser/parse_expr.c:757
+#, c-format
+msgid "column %s.%s does not exist"
+msgstr "kolumna %s.%s nie istnieje"
+
+#: parser/parse_expr.c:376
+#, c-format
+msgid "column \"%s\" not found in data type %s"
+msgstr "nie odnaleziono kolumny \"%s\" w typie danych %s"
+
+#: parser/parse_expr.c:382
+#, c-format
+msgid "could not identify column \"%s\" in record data type"
+msgstr "nie można zidentyfikować kolumny \"%s\" w rekordowym typie danych"
+
+#: parser/parse_expr.c:388
+#, c-format
+msgid "column notation .%s applied to type %s, which is not a composite type"
+msgstr ""
+"zapis kolumny .%s zastosowany do typu %s, który nie jest typem złożonym"
+
+#: parser/parse_expr.c:418 parser/parse_target.c:617
+msgid "row expansion via \"*\" is not supported here"
+msgstr "wyrażenie wierszowe przez \"*\" nie jest tu dostępne"
+
+#: parser/parse_expr.c:741 parser/parse_relation.c:478
+#: parser/parse_relation.c:551 parser/parse_target.c:1064
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "odnośnik kolumny \"%s\" jest niejednoznaczny"
+
+#: parser/parse_expr.c:809 parser/parse_param.c:109 parser/parse_param.c:141
+#: parser/parse_param.c:198 parser/parse_param.c:297
+#, c-format
+msgid "there is no parameter $%d"
+msgstr "brak parametru $%d"
+
+#: parser/parse_expr.c:1021
+msgid "NULLIF requires = operator to yield boolean"
+msgstr "NULLIF wymaga operatora = w celu uzyskania typu logicznego"
+
+#: parser/parse_expr.c:1200
+msgid "arguments of row IN must all be row expressions"
+msgstr "argumenty wiersza IN muszą być wszystkie wyrażeniami wierszowymi"
+
+#: parser/parse_expr.c:1414
+msgid "subquery cannot have SELECT INTO"
+msgstr "podzapytanie nie może posiadać SELECT INTO"
+
+#: parser/parse_expr.c:1442
+msgid "subquery must return a column"
+msgstr "podzapytanie musi zwracać kolumnę"
+
+#: parser/parse_expr.c:1449
+msgid "subquery must return only one column"
+msgstr "podzapytanie musi zwracać tylko jedną kolumnę"
+
+#: parser/parse_expr.c:1509
+msgid "subquery has too many columns"
+msgstr "podzapytanie posiada zbyt wiele kolumn"
+
+#: parser/parse_expr.c:1514
+msgid "subquery has too few columns"
+msgstr "podzapytanie posiada zbyt mało kolumn"
+
+#: parser/parse_expr.c:1610
+msgid "cannot determine type of empty array"
+msgstr "nie można określić typu pustej tabeli"
+
+#: parser/parse_expr.c:1611
+msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
+msgstr "Jawnie rzutuj na wymagany typ, na przykład ARRAY[]::integer[]."
+
+#: parser/parse_expr.c:1625
+#, c-format
+msgid "could not find element type for data type %s"
+msgstr "nie odnaleziono typu elementu dla typu danych %s"
+
+#: parser/parse_expr.c:1826
+msgid "unnamed XML attribute value must be a column reference"
+msgstr "wartość atrybutu XML bez nazwy musi być wskazaniem na kolumnę"
+
+#: parser/parse_expr.c:1827
+msgid "unnamed XML element value must be a column reference"
+msgstr "wartość elementu XML bez nazwy musi być wskazaniem na kolumnę"
+
+#: parser/parse_expr.c:1842
+#, c-format
+msgid "XML attribute name \"%s\" appears more than once"
+msgstr "nazwa atrybutu XML \"%s\" pojawia się więcej niż raz"
+
+#: parser/parse_expr.c:1949
+#, c-format
+msgid "cannot cast XMLSERIALIZE result to %s"
+msgstr "nie można rzutować wyniku XMLSERIALIZE na %s"
+
+#: parser/parse_expr.c:2185 parser/parse_expr.c:2385
+msgid "unequal number of entries in row expressions"
+msgstr "nierówna liczba wpisów w wyrażeniach wierszowych"
+
+#: parser/parse_expr.c:2195
+msgid "cannot compare rows of zero length"
+msgstr "nie można porównywać wierszy zerowej długości"
+
+#: parser/parse_expr.c:2220
+#, c-format
+msgid "row comparison operator must yield type boolean, not type %s"
+msgstr "operator porównywania wierszy musi zwracać typ logiczny, nie typ %s"
+
+#: parser/parse_expr.c:2227
+msgid "row comparison operator must not return a set"
+msgstr "operator porównywania wierszy nie może zwracać grupy"
+
+#: parser/parse_expr.c:2286 parser/parse_expr.c:2331
+#, c-format
+msgid "could not determine interpretation of row comparison operator %s"
+msgstr "nie można określić interpretacji operatora porównywania wierszy %s"
+
+#: parser/parse_expr.c:2288
+msgid ""
+"Row comparison operators must be associated with btree operator families."
+msgstr ""
+"Operator porównywania wierszy musi być przypisany do rodzin operatorów btree."
+
+#: parser/parse_expr.c:2333
+msgid "There are multiple equally-plausible candidates."
+msgstr "Jest wiele równie odpowiednich kandydatów."
+
+#: parser/parse_expr.c:2425
+msgid "IS DISTINCT FROM requires = operator to yield boolean"
+msgstr "IS DISTINCT FROM wymaga operatora = w celu uzyskania typu logicznego"
+
+#: parser/parse_func.c:147
+#, c-format
+msgid "argument name \"%s\" used more than once"
+msgstr "nazwa argumentu \"%s\" użyta więcej niż raz"
+
+#: parser/parse_func.c:158
+msgid "positional argument cannot follow named argument"
+msgstr "argument pozycyjny nie może występować po argumencie nazwanym"
+
+#: parser/parse_func.c:236
+#, c-format
+msgid "%s(*) specified, but %s is not an aggregate function"
+msgstr "%s(*) określono, ale %s nie jest funkcją agregującą"
+
+#: parser/parse_func.c:243
+#, c-format
+msgid "DISTINCT specified, but %s is not an aggregate function"
+msgstr "określono klauzulę DISTINCT, ale %s nie jest funkcją agregującą"
+
+#: parser/parse_func.c:249
+#, c-format
+msgid "ORDER BY specified, but %s is not an aggregate function"
+msgstr "określono ORDER BY, ale %s nie jest funkcją agregującą"
+
+#: parser/parse_func.c:255
+#, c-format
+msgid ""
+"OVER specified, but %s is not a window function nor an aggregate function"
+msgstr "określono OVER, ale %s nie jest funkcją okna ani funkcją agregującą"
+
+#: parser/parse_func.c:277
+#, c-format
+msgid "function %s is not unique"
+msgstr "funkcja %s nie jest unikalna"
+
+#: parser/parse_func.c:280
+msgid ""
+"Could not choose a best candidate function. You might need to add explicit "
+"type casts."
+msgstr ""
+"Nie można wybrać najlepiej pasującej funkcji. Być może należy dodać jawne "
+"rzutowanie typów."
+
+#: parser/parse_func.c:291
+msgid ""
+"No aggregate function matches the given name and argument types. Perhaps you "
+"misplaced ORDER BY; ORDER BY must appear after all regular arguments of the "
+"aggregate."
+msgstr ""
+"Brak funkcji pasującej do podanej nazwy i typów argumentów. Być może "
+"niepoprawnie umieszczono ORDER BY; ORDER BY musi znajdować się za wszystkimi "
+"regularnymi argumentami agregatu."
+
+#: parser/parse_func.c:302
+msgid ""
+"No function matches the given name and argument types. You might need to add "
+"explicit type casts."
+msgstr ""
+"Brak funkcji pasującej do podanej nazwy i typów argumentów. Być może należy "
+"dodać jawne rzutowanie typów."
+
+#: parser/parse_func.c:412 parser/parse_func.c:478
+#, c-format
+msgid "%s(*) must be used to call a parameterless aggregate function"
+msgstr "musi być użyta %s(*) by wywołać bezparametrową funkcję agregującą"
+
+#: parser/parse_func.c:419
+msgid "aggregates cannot return sets"
+msgstr "agregaty nie mogą zwracać grup"
+
+#: parser/parse_func.c:431
+msgid "aggregates cannot use named arguments"
+msgstr "agregaty nie mogą używać nazwanych argumentów"
+
+#: parser/parse_func.c:450
+msgid "window function call requires an OVER clause"
+msgstr "wywołanie funkcji okna wymaga klauzuli OVER"
+
+#: parser/parse_func.c:468
+msgid "DISTINCT is not implemented for window functions"
+msgstr "DISTINCT nie zostało zaimplementowane w funkcjach okna"
+
+#: parser/parse_func.c:488
+msgid "aggregate ORDER BY is not implemented for window functions"
+msgstr "agregat ORDER BY nie został zaimplementowany dla funkcji okna"
+
+#: parser/parse_func.c:494
+msgid "window functions cannot return sets"
+msgstr "funkcja okna nie może zwracać zbiorów"
+
+#: parser/parse_func.c:505
+msgid "window functions cannot use named arguments"
+msgstr "funkcje nie mogą używać nazwanych argumentów"
+
+#: parser/parse_func.c:1589
+#, c-format
+msgid "aggregate %s(*) does not exist"
+msgstr "agregat %s(*) nie istnieje"
+
+#: parser/parse_func.c:1594
+#, c-format
+msgid "aggregate %s does not exist"
+msgstr "agregat %s nie istnieje"
+
+#: parser/parse_func.c:1613
+#, c-format
+msgid "function %s is not an aggregate"
+msgstr "funkcja %s nie jest agregatem"
+
+#: parser/parse_node.c:83
+#, c-format
+msgid "target lists can have at most %d entries"
+msgstr "listy docelowe mogą mieć najwyżej %d pozycji"
+
+#: parser/parse_node.c:240
+#, c-format
+msgid "cannot subscript type %s because it is not an array"
+msgstr "nie indeksować typu %s ponieważ nie jest tablicą"
+
+#: parser/parse_node.c:342 parser/parse_node.c:369
+msgid "array subscript must have type integer"
+msgstr "indeks tablicy musi mieć typ integer"
+
+#: parser/parse_node.c:393
+#, c-format
+msgid "array assignment requires type %s but expression is of type %s"
+msgstr "przypisanie tablicy wymaga typu %s ale wyrażenie jest typu %s"
+
+#: parser/parse_oper.c:124 parser/parse_oper.c:718 utils/adt/regproc.c:464
+#: utils/adt/regproc.c:484 utils/adt/regproc.c:643
+#, c-format
+msgid "operator does not exist: %s"
+msgstr "operator nie istnieje: %s"
+
+#: parser/parse_oper.c:221
+msgid "Use an explicit ordering operator or modify the query."
+msgstr "Użyj jawnego operatora porządkującego lub zmodyfikuj kwerendę."
+
+#: parser/parse_oper.c:225 utils/adt/arrayfuncs.c:3176
+#: utils/adt/arrayfuncs.c:3695 utils/adt/rowtypes.c:1157
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "nie można określić operatora porównującego dla typu %s"
+
+#: parser/parse_oper.c:476
+#, c-format
+msgid "operator requires run-time type coercion: %s"
+msgstr "operator wymaga zgodności typu czasu wykonania: %s"
+
+#: parser/parse_oper.c:710
+#, c-format
+msgid "operator is not unique: %s"
+msgstr "operator nie jest unikalny: %s"
+
+#: parser/parse_oper.c:712
+msgid ""
+"Could not choose a best candidate operator. You might need to add explicit "
+"type casts."
+msgstr ""
+"Nie można wybrać najlepiej pasującego operatora. Być może należy dodać jawne "
+"rzutowanie typów."
+
+#: parser/parse_oper.c:720
+msgid ""
+"No operator matches the given name and argument type(s). You might need to "
+"add explicit type casts."
+msgstr ""
+"Brak operatora pasującego do podanej nazwy i typu(ów) argumentów. Być może "
+"należy dodać jawne rzutowanie typów."
+
+#: parser/parse_oper.c:779 parser/parse_oper.c:893
+#, c-format
+msgid "operator is only a shell: %s"
+msgstr "operator jest jedynie powłoką: %s"
+
+#: parser/parse_oper.c:881
+msgid "op ANY/ALL (array) requires array on right side"
+msgstr "op ANY/ALL (tablica) wymaga tablicy po prawej stronie"
+
+#: parser/parse_oper.c:923
+msgid "op ANY/ALL (array) requires operator to yield boolean"
+msgstr "op ANY/ALL (tablica) wymaga operatora zwracajÄ…cego typ logiczny"
+
+#: parser/parse_oper.c:928
+msgid "op ANY/ALL (array) requires operator not to return a set"
+msgstr "op ANY/ALL (tablica) wymaga operatora nie zwracajÄ…cego grupy"
+
+#: parser/parse_param.c:215
+#, c-format
+msgid "inconsistent types deduced for parameter $%d"
+msgstr "niezgodne typy wyprowadzone dla parametru $%d"
+
+#: parser/parse_relation.c:147
+#, c-format
+msgid "table reference \"%s\" is ambiguous"
+msgstr "wskazanie tabeli \"%s\" jest niejednoznaczne"
+
+#: parser/parse_relation.c:183
+#, c-format
+msgid "table reference %u is ambiguous"
+msgstr "wskazanie tabeli %u jest niejednoznaczne"
+
+#: parser/parse_relation.c:343
+#, c-format
+msgid "table name \"%s\" specified more than once"
+msgstr "nazwa tabeli \"%s\" określona więcej niż raz"
+
+#: parser/parse_relation.c:754 parser/parse_relation.c:1045
+#: parser/parse_relation.c:1432
+#, c-format
+msgid "table \"%s\" has %d columns available but %d columns specified"
+msgstr "tabela \"%s\" posiada %d dostępnych kolumn ale %d kolumn określonych"
+
+#: parser/parse_relation.c:784
+#, c-format
+msgid "too many column aliases specified for function %s"
+msgstr "określono zbyt wiele aliasów kolumn w funkcji %s"
+
+#: parser/parse_relation.c:850
+#, c-format
+msgid ""
+"There is a WITH item named \"%s\", but it cannot be referenced from this "
+"part of the query."
+msgstr ""
+"Występuje element WITH o nazwie \"%s\", ale nie może mieć odniesień z tej "
+"części zapytania."
+
+#: parser/parse_relation.c:852
+msgid ""
+"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
+msgstr ""
+"Użyj WITH RECURSIVE, lub zmień porządek elementów WITH by usunąć odwołania "
+"wyprzedzajÄ…ce."
+
+#: parser/parse_relation.c:1125
+msgid ""
+"a column definition list is only allowed for functions returning \"record\""
+msgstr ""
+"definicja listy kolumn jest dozwolona jedynie dla funkcji zwracajÄ…cych "
+"\"record\""
+
+#: parser/parse_relation.c:1133
+msgid "a column definition list is required for functions returning \"record\""
+msgstr ""
+"definicja listy kolumn jest wymagana dla funkcji zwracajÄ…cych \"record\""
+
+#: parser/parse_relation.c:1184
+#, c-format
+msgid "function \"%s\" in FROM has unsupported return type %s"
+msgstr "funkcja \"%s\" w klauzuli FROM posiada niewspierany typ zwracany %s"
+
+#: parser/parse_relation.c:1258
+#, c-format
+msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
+msgstr ""
+"lista VALUES \"%s\" posiada %d kolumn dostępnych ale %d kolumn określonych"
+
+#: parser/parse_relation.c:1314
+#, c-format
+msgid "joins can have at most %d columns"
+msgstr "złączenia mogą mieć maksymalnie do %d kolumn"
+
+#: parser/parse_relation.c:1405
+#, c-format
+msgid "WITH query \"%s\" does not have a RETURNING clause"
+msgstr "kwerenda WITH \"%s\" nie posiada klauzuli RETURNING"
+
+#: parser/parse_relation.c:2087
+#, c-format
+msgid "column %d of relation \"%s\" does not exist"
+msgstr "kolumna %d relacji \"%s\" nie istnieje"
+
+#: parser/parse_relation.c:2471
+#, c-format
+msgid "invalid reference to FROM-clause entry for table \"%s\""
+msgstr "nieprawidłowe wskazanie na pozycję w klauzuli FROM dla tabeli \"%s\""
+
+#: parser/parse_relation.c:2474
+#, c-format
+msgid "Perhaps you meant to reference the table alias \"%s\"."
+msgstr "Być może chodziło ci o wskazanie aliasu tabeli \"%s\"."
+
+#: parser/parse_relation.c:2476
+#, c-format
+msgid ""
+"There is an entry for table \"%s\", but it cannot be referenced from this "
+"part of the query."
+msgstr ""
+"Występuje wpis dla tabeli \"%s\", ale nie może mieć odniesień z tej części "
+"zapytania."
+
+#: parser/parse_relation.c:2482
+#, c-format
+msgid "missing FROM-clause entry for table \"%s\""
+msgstr "brakujÄ…ca klauzula FROM dla tabeli \"%s\""
+
+#: parser/parse_target.c:382 parser/parse_target.c:670
+#, c-format
+msgid "cannot assign to system column \"%s\""
+msgstr "nie można przypisywać do kolumny systemowej \"%s\""
+
+#: parser/parse_target.c:410
+msgid "cannot set an array element to DEFAULT"
+msgstr "nie można ustawić elementu tabeli na DEFAULT"
+
+#: parser/parse_target.c:415
+msgid "cannot set a subfield to DEFAULT"
+msgstr "nie można ustawić pola podrzędnego na DEFAULT"
+
+#: parser/parse_target.c:484
+#, c-format
+msgid "column \"%s\" is of type %s but expression is of type %s"
+msgstr "kolumna \"%s\" jest typu %s ale wyrażenie jest typu %s"
+
+#: parser/parse_target.c:654
+#, c-format
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
+"composite type"
+msgstr ""
+"nie można przypisać do pola \"%s\" kolumny \"%s\" ponieważ jego typ %s nie "
+"jest typem złożonym"
+
+#: parser/parse_target.c:663
+#, c-format
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because there is no such "
+"column in data type %s"
+msgstr ""
+"nie można przypisać do pola \"%s\" kolumny \"%s\" ponieważ nie występuje "
+"kolumna o typie danych %s"
+
+#: parser/parse_target.c:730
+#, c-format
+msgid ""
+"array assignment to \"%s\" requires type %s but expression is of type %s"
+msgstr ""
+"przypisanie tablicy do \"%s\" wymaga typu %s ale wyrażenie jest typu %s"
+
+#: parser/parse_target.c:740
+#, c-format
+msgid "subfield \"%s\" is of type %s but expression is of type %s"
+msgstr "pole podrzędne \"%s\" jest typu %s ale wyrażenie jest typu %s"
+
+#: parser/parse_target.c:1126
+msgid "SELECT * with no tables specified is not valid"
+msgstr "SELECT * bez określonych tabel nie jest poprawne"
+
+#: parser/parse_type.c:83
+#, c-format
+msgid "improper %%TYPE reference (too few dotted names): %s"
+msgstr "niepoprawne wskazanie %%TYPE (za mało nazw oddzielonych kropkami): %s"
+
+#: parser/parse_type.c:105
+#, c-format
+msgid "improper %%TYPE reference (too many dotted names): %s"
+msgstr "niepoprawne wskazanie %%TYPE (za wiele nazw oddzielonych kropkami): %s"
+
+#: parser/parse_type.c:127
+#, c-format
+msgid "type reference %s converted to %s"
+msgstr "wskazanie typu %s przekształcone do %s"
+
+#: parser/parse_type.c:202 utils/cache/typcache.c:195
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "typ \"%s\" jest jedynie powłoką"
+
+#: parser/parse_type.c:287
+#, c-format
+msgid "type modifier is not allowed for type \"%s\""
+msgstr "modyfikator typu nie jest dopuszczalny dla typu \"%s\""
+
+#: parser/parse_type.c:330
+msgid "type modifiers must be simple constants or identifiers"
+msgstr "modyfikatory typów muszą być prostymi stałymi lub identyfikatorami"
+
+#: parser/parse_type.c:641 parser/parse_type.c:740
+#, c-format
+msgid "invalid type name \"%s\""
+msgstr "nieprawidłowa nazwa typu \"%s\""
+
+#: parser/parse_utilcmd.c:181
+#, c-format
+msgid "relation \"%s\" already exists, skipping"
+msgstr "relacja \"%s\" już istnieje, pominięto"
+
+#: parser/parse_utilcmd.c:334
+#, fuzzy
+msgid "array of serial is not implemented"
+msgstr "tablica serialu nie jest zrealizowana"
+
+#: parser/parse_utilcmd.c:382
+#, c-format
+msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
+msgstr ""
+"%s utworzy niejawnÄ… sekwencjÄ™ \"%s\" dla kolumny serializowanej \"%s.%s\""
+
+#: parser/parse_utilcmd.c:483 parser/parse_utilcmd.c:495
+#, c-format
+msgid ""
+"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
+msgstr "sprzeczne NULL/NOT NULL deklaracje dla kolumny \"%s\" tabeli \"%s\""
+
+#: parser/parse_utilcmd.c:507
+#, c-format
+msgid "multiple default values specified for column \"%s\" of table \"%s\""
+msgstr ""
+"określono wielokrotnie wartości domyślne dla kolumny \"%s\" tabeli \"%s\""
+
+#: parser/parse_utilcmd.c:1440
+msgid "cannot use an existing index in CREATE TABLE"
+msgstr "nie można użyć istniejącego indeksu w CREATE TABLE"
+
+#: parser/parse_utilcmd.c:1460
+#, c-format
+msgid "index \"%s\" is already associated with a constraint"
+msgstr "indeks \"%s\" jest już związany z ograniczeniem"
+
+#: parser/parse_utilcmd.c:1468
+#, c-format
+msgid "index \"%s\" does not belong to table \"%s\""
+msgstr "indeks \"%s\" nie należy do tabeli \"%s\""
+
+#: parser/parse_utilcmd.c:1475
+#, c-format
+msgid "index \"%s\" is not valid"
+msgstr "indeks \"%s\" nie jest poprawny"
+
+#: parser/parse_utilcmd.c:1481
+#, c-format
+msgid "index \"%s\" is not ready"
+msgstr "indeks \"%s\" nie jest gotowy"
+
+#: parser/parse_utilcmd.c:1487
+#, c-format
+msgid "\"%s\" is not a unique index"
+msgstr "\"%s\" nie jest indeksem unikalnym"
+
+#: parser/parse_utilcmd.c:1488 parser/parse_utilcmd.c:1495
+#: parser/parse_utilcmd.c:1502 parser/parse_utilcmd.c:1572
+msgid "Cannot create a primary key or unique constraint using such an index."
+msgstr ""
+"Nie można utworzyć klucza głównego ani klucza unikalnego przy użyciu takiego "
+"indeksu."
+
+#: parser/parse_utilcmd.c:1494
+#, c-format
+msgid "index \"%s\" contains expressions"
+msgstr "indeks \"%s\" zawiera wyrażenia"
+
+#: parser/parse_utilcmd.c:1501
+#, c-format
+msgid "\"%s\" is a partial index"
+msgstr "\"%s\" jest indeksem częściowym"
+
+#: parser/parse_utilcmd.c:1513
+#, c-format
+msgid "\"%s\" is a deferrable index"
+msgstr "\"%s\" jest indeksem odraczalnym"
+
+#: parser/parse_utilcmd.c:1514
+msgid "Cannot create a non-deferrable constraint using a deferrable index."
+msgstr ""
+"Nie można utworzyć nieodraczalnego ograniczenia przy użyciu odraczalnego "
+"indeksu."
+
+#: parser/parse_utilcmd.c:1571
+#, c-format
+msgid "index \"%s\" does not have default sorting behavior"
+msgstr "indeks \"%s\" nie ma domyślnego zachowania sortowania"
+
+#: parser/parse_utilcmd.c:1716
+#, c-format
+msgid "column \"%s\" appears twice in primary key constraint"
+msgstr "kolumna \"%s\" występuje dwukrotnie w kluczu głównym"
+
+#: parser/parse_utilcmd.c:1722
+#, c-format
+msgid "column \"%s\" appears twice in unique constraint"
+msgstr "kolumna \"%s\" występuje dwukrotnie w ograniczeniu unikalnym"
+
+#: parser/parse_utilcmd.c:1887
+msgid "index expression cannot return a set"
+msgstr "wyrażenie indeksowe nie może zwracać zbioru"
+
+#: parser/parse_utilcmd.c:1897
+msgid ""
+"index expressions and predicates can refer only to the table being indexed"
+msgstr ""
+"wyrażenia indeksowe i predykaty mogą wskazywać tylko zindeksowane tabele"
+
+#: parser/parse_utilcmd.c:1994
+msgid "rule WHERE condition cannot contain references to other relations"
+msgstr "warunek WHERE reguły nie może zawierać odnośników do innych relacji"
+
+#: parser/parse_utilcmd.c:2000
+msgid "cannot use aggregate function in rule WHERE condition"
+msgstr "nie można użyć funkcji agregującej w warunku WHERE reguły"
+
+#: parser/parse_utilcmd.c:2004
+msgid "cannot use window function in rule WHERE condition"
+msgstr "nie można używać funkcji okna w warunku WHERE reguły"
+
+#: parser/parse_utilcmd.c:2076
+msgid ""
+"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
+"actions"
+msgstr ""
+"reguły z warunkami WHERE mogą posiadać jedynie akcje SELECT, INSERT, UPDATE, "
+"lub DELETE"
+
+#: parser/parse_utilcmd.c:2094 parser/parse_utilcmd.c:2193
+#: rewrite/rewriteHandler.c:442 rewrite/rewriteManip.c:1024
+msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
+msgstr "warunkowe wyrażenia UNION/INTERSECT/EXCEPT nie są zaimplementowane"
+
+#: parser/parse_utilcmd.c:2112
+msgid "ON SELECT rule cannot use OLD"
+msgstr "reguła ON SELECT nie może używać OLD"
+
+#: parser/parse_utilcmd.c:2116
+msgid "ON SELECT rule cannot use NEW"
+msgstr "reguła ON SELECT nie może używać NEW"
+
+#: parser/parse_utilcmd.c:2125
+msgid "ON INSERT rule cannot use OLD"
+msgstr "reguła ON INSERT nie może używać OLD"
+
+#: parser/parse_utilcmd.c:2131
+msgid "ON DELETE rule cannot use NEW"
+msgstr "reguła ON DELETE nie może używać NEW"
+
+#: parser/parse_utilcmd.c:2159
+msgid "cannot refer to OLD within WITH query"
+msgstr "nie może odnosić się do OLD z kwerendy WITH"
+
+#: parser/parse_utilcmd.c:2166
+msgid "cannot refer to NEW within WITH query"
+msgstr "nie może odnosić się do NEW z kwerendy WITH"
+
+#: parser/parse_utilcmd.c:2449
+msgid "misplaced DEFERRABLE clause"
+msgstr "niewłaściwie położona klauzula DEFERRABLE"
+
+#: parser/parse_utilcmd.c:2454 parser/parse_utilcmd.c:2469
+msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
+msgstr "wielokrotne klauzule DEFERRABLE/NOT DEFERRABLE niedozwolone"
+
+#: parser/parse_utilcmd.c:2464
+msgid "misplaced NOT DEFERRABLE clause"
+msgstr "niewłaściwie położona klauzula NOT DEFERRABLE"
+
+#: parser/parse_utilcmd.c:2477 parser/parse_utilcmd.c:2503 gram.y:4153
+msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+msgstr "ograniczenie zadeklarowane jako INITIALLY DEFERRED musi być DEFERRABLE"
+
+#: parser/parse_utilcmd.c:2485
+msgid "misplaced INITIALLY DEFERRED clause"
+msgstr "niewłaściwie położona klauzula INITIALLY DEFERRABLE"
+
+#: parser/parse_utilcmd.c:2490 parser/parse_utilcmd.c:2516
+msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
+msgstr "wielokrotne klauzule INITIALLY IMMEDIATE/DEFERRED niedozwolone"
+
+#: parser/parse_utilcmd.c:2511
+msgid "misplaced INITIALLY IMMEDIATE clause"
+msgstr "niewłaściwie położona klauzula INITIALLY IMMEDIATE"
+
+#: parser/parse_utilcmd.c:2702
+#, c-format
+msgid ""
+"CREATE specifies a schema (%s) different from the one being created (%s)"
+msgstr "CREATE wskazuje schemat (%s) różny od właśnie tworzonego (%s)"
+
+#: parser/scansup.c:190
+#, c-format
+msgid "identifier \"%s\" will be truncated to \"%s\""
+msgstr "identyfikator \"%s\" zostanie obcięty do \"%s\""
+
+#: parser/parse_collate.c:214 parser/parse_collate.c:538
+#, c-format
+msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgstr ""
+"niedopasowanie porównań pomiędzy niejawnymi porównaniami \"%s\" i \"%s\""
+
+#: parser/parse_collate.c:217 parser/parse_collate.c:541
+msgid ""
+"You can choose the collation by applying the COLLATE clause to one or both "
+"expressions."
+msgstr ""
+"Możesz wybrać porównanie przez zastosowanie klauzuli COLLATE do jednego lub "
+"obu wyrażeń."
+
+#: parser/parse_collate.c:763
+#, c-format
+msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+msgstr "niedopasowanie porównań pomiędzy jawnymi porównaniami \"%s\" i \"%s\""
+
+#: gram.y:915
+#, c-format
+msgid "unrecognized role option \"%s\""
+msgstr "nieznana opcja roli \"%s\""
+
+#: gram.y:1301
+msgid "current database cannot be changed"
+msgstr "bieżąca baza danych nie może być zmieniona"
+
+#: gram.y:1419 gram.y:1434
+msgid "time zone interval must be HOUR or HOUR TO MINUTE"
+msgstr "przedział strefy czasowej musi być HOUR lub HOUR TO MINUTE"
+
+#: gram.y:1439 gram.y:9246 gram.y:11736
+msgid "interval precision specified twice"
+msgstr "dokładność interwału wskazana dwukrotnie"
+
+#: gram.y:2887 utils/adt/ri_triggers.c:375 utils/adt/ri_triggers.c:435
+#: utils/adt/ri_triggers.c:598 utils/adt/ri_triggers.c:838
+#: utils/adt/ri_triggers.c:1026 utils/adt/ri_triggers.c:1188
+#: utils/adt/ri_triggers.c:1376 utils/adt/ri_triggers.c:1547
+#: utils/adt/ri_triggers.c:1730 utils/adt/ri_triggers.c:1901
+#: utils/adt/ri_triggers.c:2117 utils/adt/ri_triggers.c:2299
+#: utils/adt/ri_triggers.c:2502 utils/adt/ri_triggers.c:2550
+#: utils/adt/ri_triggers.c:2595 utils/adt/ri_triggers.c:2757
+msgid "MATCH PARTIAL not yet implemented"
+msgstr "MATCH PARTIAL jeszcze nie zaimplementowano"
+
+#: gram.y:3005
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS nie może zawierać INTO"
+
+#: gram.y:4058
+msgid "duplicate trigger events specified"
+msgstr "wskazano powielone zdarzenia wyzwalacza"
+
+#: gram.y:4160
+msgid "conflicting constraint properties"
+msgstr "konflikt właściwości ograniczeń"
+
+#: gram.y:4221
+msgid "CREATE ASSERTION is not yet implemented"
+msgstr "CREATE ASSERTION jeszcze nie zaimplementowano"
+
+#: gram.y:4237
+msgid "DROP ASSERTION is not yet implemented"
+msgstr "DROP ASSERTION jeszcze nie zaimplementowano"
+
+#: gram.y:4573
+msgid "RECHECK is no longer required"
+msgstr "RECHECK nie jest dłużej wymagane"
+
+#: gram.y:4574
+msgid "Update your data type."
+msgstr "Zaktualizuj swój typ danych."
+
+#: gram.y:6217 utils/adt/regproc.c:630
+msgid "missing argument"
+msgstr "brakujÄ…cy argument"
+
+#: gram.y:6218 utils/adt/regproc.c:631
+msgid "Use NONE to denote the missing argument of a unary operator."
+msgstr ""
+"Użyj NONE do oznaczenia brakuje argumentów w jednoargumentowym operatorze."
+
+#: gram.y:7297 gram.y:7303 gram.y:7309
+msgid "WITH CHECK OPTION is not implemented"
+msgstr "WITH CHECK OPTION jeszcze nie zaimplementowano"
+
+#: gram.y:7986
+msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
+msgstr "lista nazw kolumn jest niedozwolona w CREATE TABLE / AS EXECUTE"
+
+#: gram.y:8210
+msgid "number of columns does not match number of values"
+msgstr "liczba kolumn nie zgadza się z liczbą wartości"
+
+#: gram.y:8660
+msgid "LIMIT #,# syntax is not supported"
+msgstr "składnia LIMIT #,# jest nieobsługiwana"
+
+#: gram.y:8661
+msgid "Use separate LIMIT and OFFSET clauses."
+msgstr "Użyj oddzielnych klauzul LIMIT i OFFSET."
+
+#: gram.y:8879
+msgid "VALUES in FROM must have an alias"
+msgstr "VALUES we FROM musi mieć alias"
+
+#: gram.y:8880
+msgid "For example, FROM (VALUES ...) [AS] foo."
+msgstr "Dla przykładu, FROM (VALUES ...) [AS] foo."
+
+#: gram.y:8885
+msgid "subquery in FROM must have an alias"
+msgstr "podzapytanie z FROM musi mieć alias"
+
+#: gram.y:8886
+msgid "For example, FROM (SELECT ...) [AS] foo."
+msgstr "Dla przykładu, FROM (SELECT ...) [AS] foo."
+
+#: gram.y:9372
+msgid "precision for type float must be at least 1 bit"
+msgstr "precyzja dla typu zmiennoprzecinkowego musi mieć co najmniej 1 bit"
+
+#: gram.y:9381
+msgid "precision for type float must be less than 54 bits"
+msgstr "precyzja dla typu zmiennoprzecinkowego musi mieć co najwyżej 54 bity"
+
+#: gram.y:10095
+msgid "UNIQUE predicate is not yet implemented"
+msgstr "predykat UNIQUE nie jest jeszcze zaimplementowany"
+
+#: gram.y:11003
+msgid "RANGE PRECEDING is only supported with UNBOUNDED"
+msgstr "RANGE PRECEDING jest obsługiwany tylko z UNBOUNDED"
+
+#: gram.y:11009
+msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
+msgstr "RANGE FOLLOWING jest obsługiwany tylko z UNBOUNDED"
+
+#: gram.y:11036 gram.y:11059
+msgid "frame start cannot be UNBOUNDED FOLLOWING"
+msgstr "UNBOUNDED FOLLOWING nie może być początkiem ramki"
+
+#: gram.y:11041
+msgid "frame starting from following row cannot end with current row"
+msgstr ""
+"początek ramki z kolejnego wiersza nie może kończyć się na bieżącym wierszu"
+
+#: gram.y:11064
+msgid "frame end cannot be UNBOUNDED PRECEDING"
+msgstr "UNBOUNDED PRECEDING nie może być końcem ramki"
+
+#: gram.y:11070
+msgid "frame starting from current row cannot have preceding rows"
+msgstr "początek ramki z bieżącego wiersza nie może mieć poprzednich wierszy"
+
+#: gram.y:11077
+msgid "frame starting from following row cannot have preceding rows"
+msgstr "początek ramki z kolejnego wiersza nie może mieć poprzednich wierszy"
+
+#: gram.y:11711
+msgid "type modifier cannot have parameter name"
+msgstr "modyfikator typu nie mieć nazwy parametru"
+
+#: gram.y:12306 gram.y:12514
+msgid "improper use of \"*\""
+msgstr "niepoprawne użycie \"*\""
+
+#: gram.y:12445
+msgid "wrong number of parameters on left side of OVERLAPS expression"
+msgstr "niepoprawna liczba parametrów po lewej stronie wyrażenia OVERLAPS"
+
+#: gram.y:12452
+msgid "wrong number of parameters on right side of OVERLAPS expression"
+msgstr "niepoprawna liczba parametrów po prawej stronie wyrażenia OVERLAPS"
+
+#: gram.y:12577
+msgid "multiple ORDER BY clauses not allowed"
+msgstr "wielokrotna klauzula ORDER BY nie jest dopuszczalna"
+
+#: gram.y:12588
+msgid "multiple OFFSET clauses not allowed"
+msgstr "wielokrotna klauzula OFFSET nie jest dopuszczalna"
+
+#: gram.y:12597
+msgid "multiple LIMIT clauses not allowed"
+msgstr "wielokrotna klauzula LIMIT nie jest dopuszczalna"
+
+#: gram.y:12606
+msgid "multiple WITH clauses not allowed"
+msgstr "wielokrotna klauzula WITH nie jest dopuszczalna"
+
+#: gram.y:12751
+msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
+msgstr "argumenty OUT i INOUT nie sÄ… dozwolone w funkcji TABLE"
+
+#: gram.y:12852
+msgid "multiple COLLATE clauses not allowed"
+msgstr "wielokrotna klauzula COLLATE nie jest dopuszczalna"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12890 gram.y:12903
+#, c-format
+msgid "%s constraints cannot be marked DEFERRABLE"
+msgstr "ograniczenia %s nie mogą być oznaczone jako DEFERRABLE"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12916
+#, c-format
+msgid "%s constraints cannot be marked NOT VALID"
+msgstr "ograniczenia %s nie mogą być oznaczone jako NOT VALID"
+
+#: scan.l:411
+msgid "unterminated /* comment"
+msgstr "nie zakończony komentarz /*"
+
+#: scan.l:440
+msgid "unterminated bit string literal"
+msgstr "niezakończona stała łańcucha bitów"
+
+#: scan.l:461
+msgid "unterminated hexadecimal string literal"
+msgstr "niezakończona stała łańcucha szesnastkowego"
+
+#: scan.l:511
+msgid "unsafe use of string constant with Unicode escapes"
+msgstr "niebezpieczne jest używanie stałej łańcuchowej z ucieczkami Unikodu"
+
+#: scan.l:512
+msgid ""
+"String constants with Unicode escapes cannot be used when "
+"standard_conforming_strings is off."
+msgstr ""
+"Stałe łańcuchowe z ucieczkami Unikodowymi nie mogą być używane gdy "
+"standard_conforming_strings jest wyłączony."
+
+#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
+#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
+msgid "invalid Unicode surrogate pair"
+msgstr "niepoprawna Unikodowa para zastępcza"
+
+#: scan.l:586
+msgid "invalid Unicode escape"
+msgstr "nieprawidłowa ucieczka Unikodowa"
+
+#: scan.l:587
+msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
+msgstr "ucieczki Unikodowe muszą mieć format \\uXXXX lub \\UXXXXXXXX."
+
+#: scan.l:598
+msgid "unsafe use of \\' in a string literal"
+msgstr "niebezpieczne użycie \\' w literałach znakowych"
+
+#: scan.l:599
+msgid ""
+"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
+msgstr ""
+"Użyj '' by zapisać cytat w ciągach znaków. \\' jest niebezpieczne w "
+"wyłącznie klienckich kodowaniach."
+
+#: scan.l:629 repl_scanner.l:97
+msgid "unterminated quoted string"
+msgstr "niezakończona stała łańcuchowa"
+
+#: scan.l:674
+msgid "unterminated dollar-quoted string"
+msgstr "niezakończona stała łańcuchowa cytowana znakiem dolara"
+
+#: scan.l:691 scan.l:703 scan.l:717
+msgid "zero-length delimited identifier"
+msgstr "identyfikator ogranicznika o długości zero"
+
+#: scan.l:730
+msgid "unterminated quoted identifier"
+msgstr "niezakończony identyfikator cytowany"
+
+#: scan.l:834
+msgid "operator too long"
+msgstr "operator zbyt długi"
+
+#. translator: %s is typically the translation of "syntax error"
+#: scan.l:992
+#, c-format
+msgid "%s at end of input"
+msgstr "%s na końcu danych wejściowych"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: scan.l:1000
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s w lub blisko \"%s\""
+
+#: scan.l:1161 scan.l:1193
+msgid ""
+"Unicode escape values cannot be used for code point values above 007F when "
+"the server encoding is not UTF8"
+msgstr ""
+"wartości ucieczki Unikodowej nie mogą być używane dla wartości punktu "
+"kodowego powyżej 007F, gdy kodowanie serwera to nie UTF8"
+
+#: scan.l:1189 scan.l:1325
+msgid "invalid Unicode escape value"
+msgstr "błędna wartość ucieczki Unikodowej"
+
+#: scan.l:1214
+msgid "invalid Unicode escape character"
+msgstr "błędny znak ucieczki Unikodowej"
+
+#: scan.l:1381
+msgid "nonstandard use of \\' in a string literal"
+msgstr "niestandardowe użycie \\' w łańcuchu znaków"
+
+#: scan.l:1382
+msgid ""
+"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
+msgstr ""
+"Użyj '' by zapisać cytowanie w ciągach znaków, lub użyj składni ciągu znaków "
+"ucieczki (E'...')."
+
+#: scan.l:1391
+msgid "nonstandard use of \\\\ in a string literal"
+msgstr "niestandardowe użycie \\\\ w łańcuchu znaków"
+
+#: scan.l:1392
+msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
+msgstr ""
+"Użyj składni ciągu znaków ucieczki dla odwrotnych ukośników np., E'\\\\'."
+
+#: scan.l:1406
+msgid "nonstandard use of escape in a string literal"
+msgstr "niestandardowe użycie ucieczki w łańcuchu znaków"
+
+#: scan.l:1407
+msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
+msgstr "Użyj składni ciągu znaków ucieczki dla ucieczek np., E'\\r\\n'."
+
+#: port/win32/security.c:43
+#, c-format
+msgid "could not open process token: error code %d\n"
+msgstr "nie można otworzyć tokenu procesu: kod błędu %d\n"
+
+#: port/win32/security.c:63
+#, c-format
+msgid "could not get SID for Administrators group: error code %d\n"
+msgstr "nie można pobrać SID dla grupy Administratorów: kod błędu %d\n"
+
+#: port/win32/security.c:72
+#, c-format
+msgid "could not get SID for PowerUsers group: error code %d\n"
+msgstr ""
+"nie można pobrać SID dla grupy Użytkowników zaawansowanych: kod błędu %d\n"
+
+#: port/win32/signal.c:189
+#, c-format
+msgid "could not create signal listener pipe for PID %d: error code %d"
+msgstr "nie można utworzyć rury nasłuchu sygnału dla PID %d: kod błędu %d"
+
+#: port/win32/signal.c:269 port/win32/signal.c:301
+#, c-format
+msgid "could not create signal listener pipe: error code %d; retrying\n"
+msgstr "nie można utworzyć rury nasłuchu sygnału: kod błędu %d; ponawianie\n"
+
+#: port/win32/signal.c:312
+#, c-format
+msgid "could not create signal dispatch thread: error code %d\n"
+msgstr "nie można utworzyć wątku wysyłki sygnału: kod błędu %d\n"
+
+#: port/win32/crashdump.c:108
+msgid "could not load dbghelp.dll, cannot write crash dump\n"
+msgstr "nie można wczytać dbghelp.dll, nie można zapisać zrzutu awaryjnego\n"
+
+#: port/win32/crashdump.c:116
+msgid ""
+"could not load required functions in dbghelp.dll, cannot write crash dump\n"
+msgstr ""
+"nie można wczytać wymaganych funkcji z dbghelp.dll, nie można zapisać zrzutu "
+"awaryjnego\n"
+
+#: port/win32/crashdump.c:147
+#, c-format
+msgid "could not open crash dump file \"%s\" for writing: error code %u\n"
+msgstr ""
+"nie udało się otworzyć pliku zrzutu awaryjnego \"%s\" do zapisu: kod błędu "
+"%u\n"
+
+#: port/win32/crashdump.c:154
+#, c-format
+msgid "wrote crash dump to file \"%s\"\n"
+msgstr "zapisano zrzut awaryjny do pliku \"%s\"\n"
+
+#: port/win32/crashdump.c:156
+#, c-format
+msgid "could not write crash dump to file \"%s\": error code %08x\n"
+msgstr ""
+"nie udało się zapisać zrzutu awaryjnego do pliku \"%s\": kod błędu %08x\n"
+
+#: port/sysv_sema.c:114 port/pg_sema.c:114
+#, c-format
+msgid "could not create semaphores: %m"
+msgstr "nie można utworzyć semaforów: %m"
+
+#: port/sysv_sema.c:115 port/pg_sema.c:115
+#, c-format
+msgid "Failed system call was semget(%lu, %d, 0%o)."
+msgstr "Nieudanym wywołaniem systemowym było semget(%lu, %d, 0%o)."
+
+#: port/sysv_sema.c:119 port/pg_sema.c:119
+msgid ""
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"when either the system limit for the maximum number of semaphore sets "
+"(SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be "
+"exceeded.  You need to raise the respective kernel parameter.  "
+"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
+"max_connections parameter.\n"
+"The PostgreSQL documentation contains more information about configuring "
+"your system for PostgreSQL."
+msgstr ""
+"Ten błąd *nie* oznacza, że brakuje Ci miejsca na dysku.  Zdarza się to gdy "
+"albo limit systemu dla maksymalnej liczby grup semaforów (SEMMNI) albo "
+"maksymalna liczba semaforów dla całego systemu (SEMMNS) zostanie "
+"przekroczona.  Trzeba zwiększyć odpowiednie parametry jądra.  Ewentualnie "
+"można zmniejszyć zużycie semaforów PostgreSQL przez zmniejszenie parametru "
+"max_connections.\n"
+"Dokumentacja PostgreSQL zawiera więcej informacji na temat konfiguracji "
+"systemu PostgreSQL."
+
+#: port/sysv_sema.c:146 port/pg_sema.c:146
+#, c-format
+msgid ""
+"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
+"Look into the PostgreSQL documentation for details."
+msgstr ""
+"Prawdopodobnie powinieneś zwiększyć wartość SEMVMX jądra do co najmniej %d.  "
+"Sprawdź dokumentację PostgreSQL by uzyskać szczegóły."
+
+#: port/sysv_shmem.c:147 port/pg_shmem.c:147
+#, c-format
+msgid "could not create shared memory segment: %m"
+msgstr "nie można utworzyć segmentu pamięci współdzielonej: %m"
+
+#: port/sysv_shmem.c:148 port/pg_shmem.c:148
+#, c-format
+msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
+msgstr "Nieudanym wywołaniem systemowym było shmget(key=%lu, size=%lu, 0%o)."
+
+#: port/sysv_shmem.c:152 port/pg_shmem.c:152
+#, c-format
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
+"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
+"request size (currently %lu bytes), reduce PostgreSQL's shared memory usage, "
+"perhaps by reducing shared_buffers or max_connections.\n"
+"If the request size is already small, it's possible that it is less than "
+"your kernel's SHMMIN parameter, in which case raising the request size or "
+"reconfiguring SHMMIN is called for.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Błąd ten zwykle oznacza, że żądanie współdzielonego segmentu pamięci "
+"PostgreSQL przekroczyło parametr jądra SHMMAX.  Możesz albo zmniejszyć "
+"rozmiar żądania albo zmienić konfigurację jądra przez zwiększenie SHMMAX.  "
+"Aby zmniejszyć rozmiar żądania (obecnie %lu bajtów), zmniejsz zużycie przez "
+"PostgreSQL pamięci współdzielonej, być może przez zmniejszenie "
+"shared_buffers lub max_connections.\n"
+"Jeśli rozmiar żądania jest już mały, możliwe, że jest mniejszy niż parametr "
+"jądra SHMMIN, w którym to przypadku jest wymagane podniesienie wielkości "
+"żądania lub rekonfiguracja SHMMIN.\n"
+"Dokumentacja PostgreSQL zawiera więcej informacji o konfiguracji pamięci "
+"współdzielonej."
+
+#: port/sysv_shmem.c:165 port/pg_shmem.c:165
+#, c-format
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded available memory or swap space, or exceeded your kernel's "
+"SHMALL parameter.  You can either reduce the request size or reconfigure the "
+"kernel with larger SHMALL.  To reduce the request size (currently %lu "
+"bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing "
+"shared_buffers or max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Ten błąd zwykle oznacza, że ​​żądanie segmentu pamięci współdzielonej przez "
+"PostgreSQL przekracza ilość dostępnej pamięci lub przestrzeni wymiany, albo "
+"przekroczony został parametr jądra SHMALL.  Można zmniejszyć rozmiar żądania "
+"lub skonfigurować jądro z większym parametrem SHMALL.  Aby zmniejszyć "
+"rozmiar żądania (obecnie %lu bajtów), zmniejsz zużycie pamięci "
+"współdzielonej przez PostgreSQL, być może poprzez zmniejszenie "
+"shared_buffers lub max_connections.\n"
+"Dokumentacja PostgreSQL zawiera więcej informacji o konfiguracji pamięci "
+"współdzielonej."
+
+#: port/sysv_shmem.c:176 port/pg_shmem.c:176
+#, c-format
+msgid ""
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"either if all available shared memory IDs have been taken, in which case you "
+"need to raise the SHMMNI parameter in your kernel, or because the system's "
+"overall limit for shared memory has been reached.  If you cannot increase "
+"the shared memory limit, reduce PostgreSQL's shared memory request "
+"(currently %lu bytes), perhaps by reducing shared_buffers or "
+"max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Ten błąd *nie* oznacza, że kończy się miejsce na dysku.  Występuje, jeżeli "
+"wszystkie dostępne identyfikatory pamięci współdzielonej zostały pobrane, w "
+"takim przypadku trzeba zwiększyć parametr SHMMNI w jądrze, albo dlatego, że "
+"został osiągnięty systemowy ogólny limit pamięci współdzielonej.  Jeśli nie "
+"można zwiększyć limitu pamięci współdzielonej, zmniejsz żądania PostgreSQL "
+"pamięci współdzielonej (obecnie %lu bajtów), być może poprzez zmniejszenie "
+"shared_buffers lub max_connections.\n"
+"Dokumentacja PostgreSQL zawiera więcej informacji o konfiguracji pamięci "
+"współdzielonej."
+
+#: port/sysv_shmem.c:439 port/pg_shmem.c:439
+#, c-format
+msgid "could not stat data directory \"%s\": %m"
+msgstr "nie można wykonać stat na folderze danych \"%s\": %m"
+
+#: port/unix_latch.c:237 port/pg_latch.c:237
+#: replication/libpqwalreceiver/libpqwalreceiver.c:233
+#, c-format
+msgid "select() failed: %m"
+msgstr "select() nie powiodła się: %m"
+
+#: port/win32_sema.c:94
+#, c-format
+msgid "could not create semaphore: error code %d"
+msgstr "nie można utworzyć semafora: kod błędu %d"
+
+#: port/win32_sema.c:161
+#, c-format
+msgid "could not lock semaphore: error code %d"
+msgstr "nie można zablokować semafora: kod błędu %d"
+
+#: port/win32_sema.c:174
+#, c-format
+msgid "could not unlock semaphore: error code %d"
+msgstr "nie można odblokować semafora: kod błędu %d"
+
+#: port/win32_sema.c:203
+#, c-format
+msgid "could not try-lock semaphore: error code %d"
+msgstr "nie można wypróbować blokady semafora: kod błędu %d"
+
+#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
+#, c-format
+msgid "could not create shared memory segment: %lu"
+msgstr "nie można utworzyć segmentu pamięci współdzielonej: %lu"
+
+#: port/win32_shmem.c:169
+#, c-format
+msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
+msgstr ""
+"Nieudanym wywołaniem systemowym było CreateFileMapping(size=%lu, name=%s)."
+
+#: port/win32_shmem.c:193
+msgid "pre-existing shared memory block is still in use"
+msgstr "istniejący już blok pamięci współdzielonej jest ciągle używany"
+
+#: port/win32_shmem.c:194
+msgid ""
+"Check if there are any old server processes still running, and terminate "
+"them."
+msgstr ""
+"Sprawdź, czy są jeszcze wykonywane jakieś procesy serwera i zakończ je."
+
+#: port/win32_shmem.c:204
+msgid "Failed system call was DuplicateHandle."
+msgstr "Nieudanym wywołaniem systemowym było DuplicateHandle."
+
+#: port/win32_shmem.c:225
+msgid "Failed system call was MapViewOfFileEx."
+msgstr "Nieudanym wywołaniem systemowym było MapViewOfFileEx."
+
+#: postmaster/autovacuum.c:359
+#, c-format
+msgid "could not fork autovacuum launcher process: %m"
+msgstr "nie można rozwidlić procesu uruchamiania autoodkurzania: %m"
+
+#: postmaster/autovacuum.c:404
+msgid "autovacuum launcher started"
+msgstr "uruchomiono program wywołujący autoodkurzanie"
+
+#: postmaster/autovacuum.c:760
+msgid "autovacuum launcher shutting down"
+msgstr "zamknięto program wywołujący autoodkurzanie"
+
+#: postmaster/autovacuum.c:1395
+#, c-format
+msgid "could not fork autovacuum worker process: %m"
+msgstr "nie można rozwidlić proces roboczego autoodkurzania: %m"
+
+#: postmaster/autovacuum.c:1604
+#, c-format
+msgid "autovacuum: processing database \"%s\""
+msgstr "autoodkurzanie: przetwarzanie bazy danych \"%s\""
+
+#: postmaster/autovacuum.c:2007
+#, c-format
+msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autoodkurzanie: kasowanie sierot tabeli tymcz \"%s\".\"%s\" w bazie \"%s\""
+
+#: postmaster/autovacuum.c:2019
+#, c-format
+msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autoodkurzanie: znaleziono sieroty tabeli tymcz \"%s\".\"%s\" w bazie \"%s\""
+
+#: postmaster/autovacuum.c:2289
+#, c-format
+msgid "automatic vacuum of table \"%s.%s.%s\""
+msgstr "automatyczne odkurzanie tabeli \"%s.%s.%s\""
+
+#: postmaster/autovacuum.c:2292
+#, c-format
+msgid "automatic analyze of table \"%s.%s.%s\""
+msgstr "automatyczna analiza tabeli \"%s.%s.%s\""
+
+#: postmaster/autovacuum.c:2778
+msgid "autovacuum not started because of misconfiguration"
+msgstr "nie uruchomiono autoodkurzanie przez błąd konfiguracji"
+
+#: postmaster/autovacuum.c:2779
+msgid "Enable the \"track_counts\" option."
+msgstr "WÅ‚Ä…cz opcjÄ™ \"track_counts\"."
+
+#: postmaster/bgwriter.c:482
+#, c-format
+msgid "checkpoints are occurring too frequently (%d second apart)"
+msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
+msgstr[0] "punkty kontrolne występują zbyt często (co %d sekundę)"
+msgstr[1] "punkty kontrolne występują zbyt często (co %d sekundy)"
+msgstr[2] "punkty kontrolne występują zbyt często (co %d sekund)"
+
+#: postmaster/bgwriter.c:486
+msgid ""
+"Consider increasing the configuration parameter \"checkpoint_segments\"."
+msgstr "Rozważ zwiększenie parametru konfiguracyjnego \"checkpoint_segments\"."
+
+#: postmaster/bgwriter.c:598
+#, c-format
+msgid "transaction log switch forced (archive_timeout=%d)"
+msgstr "wymuszono przełączenie dziennika transakcji (archive_timeout=%d)"
+
+#: postmaster/bgwriter.c:1056
+msgid "checkpoint request failed"
+msgstr "żądanie punktu kontrolnego nie powiodło się"
+
+#: postmaster/bgwriter.c:1057
+msgid "Consult recent messages in the server log for details."
+msgstr "Sprawdź poprzednie komunikaty w dzienniku serwera by poznać szczegóły."
+
+#: postmaster/bgwriter.c:1223
+#, c-format
+msgid "compacted fsync request queue from %d entries to %d entries"
+msgstr "zagęszczono kolejkę żądań fsync od pozycji %d do pozycji %d"
+
+#: postmaster/pgarch.c:158
+#, c-format
+msgid "could not fork archiver: %m"
+msgstr "nie można rozwidlić archiwizatora: %m"
+
+#: postmaster/pgarch.c:450
+msgid "archive_mode enabled, yet archive_command is not set"
+msgstr "włączono archive_mode, choć nie ustawiono jeszcze archive_command"
+
+#: postmaster/pgarch.c:465
+#, c-format
+msgid "transaction log file \"%s\" could not be archived: too many failures"
+msgstr ""
+"plik dziennika transakcji \"%s\" nie mógł zostać zarchiwizowany: zbyt wiele "
+"awarii"
+
+#: postmaster/pgarch.c:568
+#, c-format
+msgid "archive command failed with exit code %d"
+msgstr "polecenie archiwizacji nie powiodło się z kodem wyjścia %d"
+
+#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
+#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
+#, c-format
+msgid "The failed archive command was: %s"
+msgstr "Nieudane polecenie archiwizacji było: %s"
+
+#: postmaster/pgarch.c:577
+#, c-format
+msgid "archive command was terminated by exception 0x%X"
+msgstr "polecenie archiwizacji zostało zatrzymane przez wyjątek 0x%X"
+
+#: postmaster/pgarch.c:579 postmaster/postmaster.c:2872
+msgid ""
+"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
+msgstr ""
+"Przejrzyj plik nagłówkowy C \"ntstatus.h\" by sprawdzić opis wartości "
+"szesnastkowej."
+
+#: postmaster/pgarch.c:584
+#, c-format
+msgid "archive command was terminated by signal %d: %s"
+msgstr "polecenie archiwizacji zostało zatrzymane przez sygnał %d: %s"
+
+#: postmaster/pgarch.c:591
+#, c-format
+msgid "archive command was terminated by signal %d"
+msgstr "polecenie archiwizacji zostało zatrzymane przez sygnał %d"
+
+#: postmaster/pgarch.c:600
+#, c-format
+msgid "archive command exited with unrecognized status %d"
+msgstr "polecenie archiwizacji zakończyło działanie z nieznanym stanem %d"
+
+#: postmaster/pgarch.c:612
+#, c-format
+msgid "archived transaction log file \"%s\""
+msgstr "zarchiwizowano plik dziennika transakcji \"%s\""
+
+#: postmaster/pgarch.c:661
+#, c-format
+msgid "could not open archive status directory \"%s\": %m"
+msgstr "nie można otworzyć folderu stanu archiwum \"%s\": %m"
+
+#: postmaster/pgstat.c:330
+#, c-format
+msgid "could not resolve \"localhost\": %s"
+msgstr "nie może rozwiązać \"localhost\": %s"
+
+#: postmaster/pgstat.c:353
+msgid "trying another address for the statistics collector"
+msgstr "próba innego adresu do kolektora statystyk"
+
+#: postmaster/pgstat.c:362
+#, c-format
+msgid "could not create socket for statistics collector: %m"
+msgstr "nie można utworzyć gniazda dla kolektora statystyk: %m"
+
+#: postmaster/pgstat.c:374
+#, c-format
+msgid "could not bind socket for statistics collector: %m"
+msgstr "nie można dowiązać gniazda dla kolektora statystyk: %m"
+
+#: postmaster/pgstat.c:385
+#, c-format
+msgid "could not get address of socket for statistics collector: %m"
+msgstr "nie można pobrać adresu gniazda dla kolektora statystyk: %m"
+
+#: postmaster/pgstat.c:401
+#, c-format
+msgid "could not connect socket for statistics collector: %m"
+msgstr "nie można połączyć z gniazdem dla kolektora statystyk: %m"
+
+#: postmaster/pgstat.c:422
+#, c-format
+msgid "could not send test message on socket for statistics collector: %m"
+msgstr ""
+"nie można wysłać komunikatu testowego na gnieździe dla kolektora statystyk: "
+"%m"
+
+#: postmaster/pgstat.c:448 postmaster/pgstat.c:2996
+#, c-format
+msgid "select() failed in statistics collector: %m"
+msgstr "nie powiodło się select() na kolektorze statystyk: %m"
+
+#: postmaster/pgstat.c:463
+msgid "test message did not get through on socket for statistics collector"
+msgstr "komunikat testowy nie dotarł na gniazdo dla kolektora statystyk"
+
+#: postmaster/pgstat.c:478
+#, c-format
+msgid "could not receive test message on socket for statistics collector: %m"
+msgstr ""
+"nie można odebrać komunikatu testowego na gnieździe dla kolektora statystyk: "
+"%m"
+
+#: postmaster/pgstat.c:488
+msgid "incorrect test message transmission on socket for statistics collector"
+msgstr ""
+"niepoprawna transmisja komunikatu testowego na gnieździe dla kolektora "
+"statystyk"
+
+#: postmaster/pgstat.c:511
+#, c-format
+msgid "could not set statistics collector socket to nonblocking mode: %m"
+msgstr "nie można ustawić kolektora statystyk w tryb nieblokujący: %m"
+
+#: postmaster/pgstat.c:521
+msgid "disabling statistics collector for lack of working socket"
+msgstr "wyłączenie kolektora statystyk ze względu na brak działającego gniazda"
+
+#: postmaster/pgstat.c:623
+#, c-format
+msgid "could not fork statistics collector: %m"
+msgstr "nie można rozwidlić gniazda dla kolektora statystyk: %m"
+
+#: postmaster/pgstat.c:1153 postmaster/pgstat.c:1177 postmaster/pgstat.c:1208
+msgid "must be superuser to reset statistics counters"
+msgstr "musisz być superużytkownikiem by zresetować liczniki statystyk"
+
+#: postmaster/pgstat.c:1184 utils/adt/pgstatfuncs.c:1547
+#, c-format
+msgid "unrecognized reset target: \"%s\""
+msgstr "nierozpoznany cel resetu \"%s\""
+
+#: postmaster/pgstat.c:1185 utils/adt/pgstatfuncs.c:1548
+msgid "Target must be \"bgwriter\"."
+msgstr "Celem musi być \"bgwriter\"."
+
+#: postmaster/pgstat.c:2975
+#, c-format
+msgid "poll() failed in statistics collector: %m"
+msgstr "nie powiodło się poll() na kolektorze statystyk: %m"
+
+#: postmaster/pgstat.c:3020
+#, c-format
+msgid "could not read statistics message: %m"
+msgstr "nie można odczytać komunikatu statystyk: %m"
+
+#: postmaster/pgstat.c:3291
+#, c-format
+msgid "could not open temporary statistics file \"%s\": %m"
+msgstr "nie można otworzyć tymczasowego pliku statystyk \"%s\": %m"
+
+#: postmaster/pgstat.c:3363
+#, c-format
+msgid "could not write temporary statistics file \"%s\": %m"
+msgstr "nie można pisać do tymczasowego pliku statystyk \"%s\": %m"
+
+#: postmaster/pgstat.c:3372
+#, c-format
+msgid "could not close temporary statistics file \"%s\": %m"
+msgstr "nie można zamknąć tymczasowego pliku statystyk \"%s\": %m"
+
+#: postmaster/pgstat.c:3380
+#, c-format
+msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+msgstr ""
+"nie można zmienić nazwy tymczasowego pliku statystyk \"%s\" na \"%s\": %m"
+
+#: postmaster/pgstat.c:3486 postmaster/pgstat.c:3715
+#, c-format
+msgid "could not open statistics file \"%s\": %m"
+msgstr "nie można otworzyć pliku statystyk \"%s\": %m"
+
+#: postmaster/pgstat.c:3498 postmaster/pgstat.c:3508 postmaster/pgstat.c:3530
+#: postmaster/pgstat.c:3545 postmaster/pgstat.c:3608 postmaster/pgstat.c:3626
+#: postmaster/pgstat.c:3642 postmaster/pgstat.c:3660 postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3727 postmaster/pgstat.c:3738
+#, c-format
+msgid "corrupted statistics file \"%s\""
+msgstr "uszkodzony plik statystyk \"%s\""
+
+#: postmaster/pgstat.c:4036
+msgid "database hash table corrupted during cleanup --- abort"
+msgstr "tabeli haszy bazy danych uszkodzona podczas czyszczenia --- przerwano"
+
+#: postmaster/postmaster.c:573
+#, c-format
+msgid "%s: invalid argument for option -f: \"%s\"\n"
+msgstr "%s: niepoprawny argument dla opcji -f: \"%s\"\n"
+
+#: postmaster/postmaster.c:659
+#, c-format
+msgid "%s: invalid argument for option -t: \"%s\"\n"
+msgstr "%s: niepoprawny argument dla opcji -t: \"%s\"\n"
+
+#: postmaster/postmaster.c:710
+#, c-format
+msgid "%s: invalid argument: \"%s\"\n"
+msgstr "%s: niepoprawny argument: \"%s\"\n"
+
+#: postmaster/postmaster.c:735
+#, c-format
+msgid "%s: superuser_reserved_connections must be less than max_connections\n"
+msgstr ""
+"%s: superuser_reserved_connections musi być mniejszy niż max_connections\n"
+
+#: postmaster/postmaster.c:740
+msgid ""
+"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
+"\"hot_standby\""
+msgstr ""
+"archiwalny WAL (archive_mode=on) wymaga dla wal_level wartości \"archive\" "
+"lub \"hot_standby\""
+
+#: postmaster/postmaster.c:743
+msgid ""
+"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
+"\"hot_standby\""
+msgstr ""
+"archiwalny WAL (max_wal_senders > 0) wymaga dla wal_level wartości \"archive"
+"\" lub \"hot_standby\""
+
+#: postmaster/postmaster.c:751
+#, c-format
+msgid "%s: invalid datetoken tables, please fix\n"
+msgstr "%s: niepoprawne tabele datetoken, proszę naprawić\n"
+
+#: postmaster/postmaster.c:857
+msgid "invalid list syntax for \"listen_addresses\""
+msgstr "nieprawidłowa składnie listy dla \"listen_addresses\""
+
+#: postmaster/postmaster.c:887
+#, c-format
+msgid "could not create listen socket for \"%s\""
+msgstr "nie można utworzyć gniazda nasłuchu dla \"%s\""
+
+#: postmaster/postmaster.c:893
+msgid "could not create any TCP/IP sockets"
+msgstr "nie można stworzyć żadnego gniazda TCP/IP"
+
+#: postmaster/postmaster.c:944
+msgid "could not create Unix-domain socket"
+msgstr "nie można stworzyć gniazda domeny Uniksa"
+
+#: postmaster/postmaster.c:952
+msgid "no socket created for listening"
+msgstr "nie utworzono żadnego gniazda do nasłuchiwania"
+
+#: postmaster/postmaster.c:986
+msgid "could not create I/O completion port for child queue"
+msgstr ""
+"nie można utworzyć portu zakończenia wejścia/wyjścia dla kolejki potomnej"
+
+#: postmaster/postmaster.c:1030
+#, c-format
+msgid "%s: could not write external PID file \"%s\": %s\n"
+msgstr "%s: nie można zapisać pliku zewnętrznego PID \"%s\": %s\n"
+
+#: postmaster/postmaster.c:1098 utils/init/postinit.c:197
+msgid "could not load pg_hba.conf"
+msgstr "nie można załadować pg_hba.conf"
+
+#: postmaster/postmaster.c:1145
+#, c-format
+msgid "%s: could not locate matching postgres executable"
+msgstr "%s: nie można odnaleźć pasującego programu wykonywalnego postgres"
+
+#: postmaster/postmaster.c:1168 utils/misc/tzparser.c:325
+#, c-format
+msgid ""
+"This may indicate an incomplete PostgreSQL installation, or that the file "
+"\"%s\" has been moved away from its proper location."
+msgstr ""
+"Może to wskazywać na niepełną instalację PostgreSQL lub że plik \"%s\" "
+"został przeniesiony gdzieś z właściwej lokalizacji."
+
+#: postmaster/postmaster.c:1196
+#, c-format
+msgid "data directory \"%s\" does not exist"
+msgstr "folder danych \"%s\" nie istnieje"
+
+#: postmaster/postmaster.c:1201
+#, c-format
+msgid "could not read permissions of directory \"%s\": %m"
+msgstr "nie można odczytać uprawnień dla folderu \"%s\": %m"
+
+#: postmaster/postmaster.c:1209
+#, c-format
+msgid "specified data directory \"%s\" is not a directory"
+msgstr "wskazany folder danych \"%s\" nie jest folderem"
+
+#: postmaster/postmaster.c:1225
+#, c-format
+msgid "data directory \"%s\" has wrong ownership"
+msgstr "słownik danych \"%s\" ma niepoprawną własność"
+
+#: postmaster/postmaster.c:1227
+msgid "The server must be started by the user that owns the data directory."
+msgstr ""
+"Serwer musi być uruchomiony przez użytkownika, który jest właścicielem "
+"folderu."
+
+#: postmaster/postmaster.c:1247
+#, c-format
+msgid "data directory \"%s\" has group or world access"
+msgstr "folder danych \"%s\" posiada prawa dostępu dla grupy lub wszystkich"
+
+#: postmaster/postmaster.c:1249
+msgid "Permissions should be u=rwx (0700)."
+msgstr "Prawa dostępu powinny być u=rwx (0700)."
+
+#: postmaster/postmaster.c:1260
+#, c-format
+msgid ""
+"%s: could not find the database system\n"
+"Expected to find it in the directory \"%s\",\n"
+"but could not open file \"%s\": %s\n"
+msgstr ""
+"%s: nie udało się znaleźć systemu bazy danych\n"
+"Powinien był znajdować się w folderze \"%s\",\n"
+"ale nie udało się otworzyć pliku \"%s\": %s\n"
+
+#: postmaster/postmaster.c:1296
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku \"%s\": %s\n"
+
+#: postmaster/postmaster.c:1303
+#, c-format
+msgid "%s: could not open log file \"%s/%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku dziennika \"%s/%s\": %s\n"
+
+#: postmaster/postmaster.c:1314
+#, c-format
+msgid "%s: could not fork background process: %s\n"
+msgstr "%s: nie udało się rozwidlenie procesu w tle: %s\n"
+
+#: postmaster/postmaster.c:1336
+#, c-format
+msgid "%s: could not dissociate from controlling TTY: %s\n"
+msgstr "%s: nie udało się odciąć od kontroli TTY: %s\n"
+
+#: postmaster/postmaster.c:1431
+#, c-format
+msgid "select() failed in postmaster: %m"
+msgstr "nie powiodło się select() w postmasterze: %m"
+
+#: postmaster/postmaster.c:1593 postmaster/postmaster.c:1624
+msgid "incomplete startup packet"
+msgstr "niekompletny pakiet uruchomieniowy"
+
+#: postmaster/postmaster.c:1605
+msgid "invalid length of startup packet"
+msgstr "niepoprawna długość pakietu uruchomieniowego"
+
+#: postmaster/postmaster.c:1662
+#, c-format
+msgid "failed to send SSL negotiation response: %m"
+msgstr "nie powiodło się wysłanie odpowiedzi negocjacji SSL: %m"
+
+#: postmaster/postmaster.c:1691
+#, c-format
+msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
+msgstr ""
+"nieobsługiwany protokół frontendu %u.%u: serwer obsługuje %u.0 do %u.%u"
+
+#: postmaster/postmaster.c:1742
+msgid "invalid value for boolean option \"replication\""
+msgstr "niepoprawna wartość dla opcji logicznej \"replication\""
+
+#: postmaster/postmaster.c:1762
+msgid "invalid startup packet layout: expected terminator as last byte"
+msgstr ""
+"niepoprawny układ pakietu uruchomieniowego: oczekiwano terminatora na "
+"ostatnim bajcie"
+
+#: postmaster/postmaster.c:1790
+msgid "no PostgreSQL user name specified in startup packet"
+msgstr "brak użytkownika PostgreSQL wskazanego w pakiecie uruchomieniowym"
+
+#: postmaster/postmaster.c:1847
+msgid "the database system is starting up"
+msgstr "system bazy danych uruchamia siÄ™"
+
+#: postmaster/postmaster.c:1852
+msgid "the database system is shutting down"
+msgstr "system bazy danych jest zamykany"
+
+#: postmaster/postmaster.c:1857
+msgid "the database system is in recovery mode"
+msgstr "system bazy danych jest w trybie odzyskiwania"
+
+#: postmaster/postmaster.c:1924
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "niepoprawny klucz w żądaniu anulowania dla procesu %d"
+
+#: postmaster/postmaster.c:1932
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "PID %d w żądaniu anulowania ni pasuje do żadnego procesu"
+
+#: postmaster/postmaster.c:2138
+msgid "received SIGHUP, reloading configuration files"
+msgstr "odebrano SIGHUP, przeładowanie plików konfiguracyjnych"
+
+#: postmaster/postmaster.c:2161
+msgid "pg_hba.conf not reloaded"
+msgstr "pg_hba.conf nie przeładowany"
+
+#: postmaster/postmaster.c:2204
+msgid "received smart shutdown request"
+msgstr "odebrano żądanie inteligentnego zamknięcia"
+
+#: postmaster/postmaster.c:2251
+msgid "received fast shutdown request"
+msgstr "odebrano żądanie szybkiego zamknięcia"
+
+#: postmaster/postmaster.c:2269
+msgid "aborting any active transactions"
+msgstr "przerywanie wszelkich aktywnych transakcji"
+
+#: postmaster/postmaster.c:2298
+msgid "received immediate shutdown request"
+msgstr "odebrano żądanie natychmiastowego zamknięcia"
+
+#: postmaster/postmaster.c:2374 postmaster/postmaster.c:2402
+msgid "startup process"
+msgstr "proces uruchomienia"
+
+#: postmaster/postmaster.c:2377
+msgid "aborting startup due to startup process failure"
+msgstr ""
+"przerwanie uruchomienia ze względu na niepowodzenie procesu uruchomienia"
+
+#: postmaster/postmaster.c:2436
+msgid "database system is ready to accept connections"
+msgstr "system bazy danych jest gotowy do przyjmowania połączeń"
+
+#: postmaster/postmaster.c:2491
+msgid "background writer process"
+msgstr "proces zapisu działający w tle"
+
+#: postmaster/postmaster.c:2507
+msgid "WAL writer process"
+msgstr "proces zapisu WAL"
+
+#: postmaster/postmaster.c:2521
+msgid "WAL receiver process"
+msgstr "proces odbioru WAL"
+
+#: postmaster/postmaster.c:2536
+msgid "autovacuum launcher process"
+msgstr "proces wywołujący autoodkurzanie"
+
+#: postmaster/postmaster.c:2551
+msgid "archiver process"
+msgstr "proces archiwizera"
+
+#: postmaster/postmaster.c:2567
+msgid "statistics collector process"
+msgstr "proces kolektora statystyk"
+
+#: postmaster/postmaster.c:2581
+msgid "system logger process"
+msgstr "proces rejestratora systemowego"
+
+#: postmaster/postmaster.c:2616 postmaster/postmaster.c:2635
+#: postmaster/postmaster.c:2642 postmaster/postmaster.c:2660
+msgid "server process"
+msgstr "proces serwera"
+
+#: postmaster/postmaster.c:2696
+msgid "terminating any other active server processes"
+msgstr "kończenie wszelkich innych aktywnych procesów serwera"
+
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2861
+#, c-format
+msgid "%s (PID %d) exited with exit code %d"
+msgstr "%s (PID %d) wyszedł z kodem zakończenia %d"
+
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2870
+#, c-format
+msgid "%s (PID %d) was terminated by exception 0x%X"
+msgstr "%s (PID %d) został zatrzymany przez wyjątek 0x%X"
+
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2879
+#, c-format
+msgid "%s (PID %d) was terminated by signal %d: %s"
+msgstr "%s (PID %d) został zatrzymany przez sygnał %d: %s"
+
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2889
+#, c-format
+msgid "%s (PID %d) was terminated by signal %d"
+msgstr "%s (PID %d) został zatrzymany przez sygnał %d"
+
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2898
+#, c-format
+msgid "%s (PID %d) exited with unrecognized status %d"
+msgstr "%s (PID %d) zakończył działanie z nieznanym stanem %d"
+
+#: postmaster/postmaster.c:3078
+msgid "abnormal database system shutdown"
+msgstr "nieprawidłowe zamknięcie systemu bazy danych"
+
+#: postmaster/postmaster.c:3117
+msgid "all server processes terminated; reinitializing"
+msgstr "wszelkie procesy serwera zakończone; ponowna inicjacja"
+
+#: postmaster/postmaster.c:3300
+#, c-format
+msgid "could not fork new process for connection: %m"
+msgstr "nie można rozwidlić procesu połączenia: %m"
+
+#: postmaster/postmaster.c:3342
+msgid "could not fork new process for connection: "
+msgstr "nie można rozwidlić nowego procesu połączenia: "
+
+#: postmaster/postmaster.c:3456
+#, c-format
+msgid "connection received: host=%s port=%s"
+msgstr "odebrano połączenie: host=%s port=%s"
+
+#: postmaster/postmaster.c:3461
+#, c-format
+msgid "connection received: host=%s"
+msgstr "odebrano połączenie: host=%s"
+
+#: postmaster/postmaster.c:3730
+#, c-format
+msgid "could not execute server process \"%s\": %m"
+msgstr "nie można wykonać procesu serwera \"%s\": %m"
+
+#: postmaster/postmaster.c:4247
+msgid "database system is ready to accept read only connections"
+msgstr ""
+"system bazy danych jest gotowy do przyjmowania połączeń tylko do odczytu"
+
+#: postmaster/postmaster.c:4514
+#, c-format
+msgid "could not fork startup process: %m"
+msgstr "nie można rozwidlić procesu uruchamiającego: %m"
+
+#: postmaster/postmaster.c:4518
+#, c-format
+msgid "could not fork background writer process: %m"
+msgstr "nie udało się rozwidlenie procesu zapisu w tle: %m"
+
+#: postmaster/postmaster.c:4522
+#, c-format
+msgid "could not fork WAL writer process: %m"
+msgstr "nie można rozwidlić procesu zapisu WAL: %m"
+
+#: postmaster/postmaster.c:4526
+#, c-format
+msgid "could not fork WAL receiver process: %m"
+msgstr "nie można rozwidlić procesu odbioru WAL: %m"
+
+#: postmaster/postmaster.c:4530
+#, c-format
+msgid "could not fork process: %m"
+msgstr "nie można rozwidlić procesu: %m"
+
+#: postmaster/postmaster.c:4813
+#, c-format
+msgid "could not duplicate socket %d for use in backend: error code %d"
+msgstr "nie można powielić gniazda %d do użycia w backendzie: kod błędu %d"
+
+#: postmaster/postmaster.c:4845
+#, c-format
+msgid "could not create inherited socket: error code %d\n"
+msgstr "nie można utworzyć dziedziczonego gniazda: kod błędu %d\n"
+
+#: postmaster/postmaster.c:4874 postmaster/postmaster.c:4881
+#, c-format
+msgid "could not read from backend variables file \"%s\": %s\n"
+msgstr "nie można czytać z pliku zmiennych backendu \"%s\": %s\n"
+
+#: postmaster/postmaster.c:4890
+#, c-format
+msgid "could not remove file \"%s\": %s\n"
+msgstr "nie można usunąć pliku \"%s\": %s\n"
+
+#: postmaster/postmaster.c:4907
+#, c-format
+msgid "could not map view of backend variables: error code %d\n"
+msgstr "nie można zmapować widoku zmiennych backendu: kod błędu %d\n"
+
+#: postmaster/postmaster.c:4916
+#, c-format
+msgid "could not unmap view of backend variables: error code %d\n"
+msgstr "nie można odmapować widoku zmiennych backendu: kod błędu %d\n"
+
+#: postmaster/postmaster.c:4923
+#, c-format
+msgid "could not close handle to backend parameter variables: error code %d\n"
+msgstr ""
+"nie można zamknąć uchwytu do zmiennych parametryzujących backendu: kod błędu "
+"%d\n"
+
+#: postmaster/postmaster.c:5067
+msgid "could not read exit code for process\n"
+msgstr "nie można odczytać kodu wyjścia procesu\n"
+
+#: postmaster/postmaster.c:5072
+msgid "could not post child completion status\n"
+msgstr "nie można wysłać statusu zakończenia potomka\n"
+
+#: postmaster/syslogger.c:390
+#, c-format
+msgid "select() failed in logger process: %m"
+msgstr "nie powiodło się select() w procesie rejestratora: %m"
+
+#: postmaster/syslogger.c:402 postmaster/syslogger.c:968
+#, c-format
+msgid "could not read from logger pipe: %m"
+msgstr "nie można czytać z rury rejestratora: %m"
+
+#: postmaster/syslogger.c:449
+msgid "logger shutting down"
+msgstr "zatrzymanie rejestratora"
+
+#: postmaster/syslogger.c:493 postmaster/syslogger.c:507
+#, c-format
+msgid "could not create pipe for syslog: %m"
+msgstr "nie można utworzyć rury do syslogu: %m"
+
+#: postmaster/syslogger.c:534
+#, c-format
+msgid "could not fork system logger: %m"
+msgstr "nie udało się rozwidlić rejestratora systemowego: %m"
+
+#: postmaster/syslogger.c:565
+#, c-format
+msgid "could not redirect stdout: %m"
+msgstr "nie udało się przekierować na standardowe wyjście: %m"
+
+#: postmaster/syslogger.c:570 postmaster/syslogger.c:588
+#, c-format
+msgid "could not redirect stderr: %m"
+msgstr "nie udało się przekierować na standardowe wyjście błędów: %m"
+
+#: postmaster/syslogger.c:923
+#, c-format
+msgid "could not write to log file: %s\n"
+msgstr "nie można zapisać do pliku dziennika: %s\n"
+
+#: postmaster/syslogger.c:1042
+#, c-format
+msgid "could not open log file \"%s\": %m"
+msgstr "nie można otworzyć pliku dziennika \"%s\": %m"
+
+#: postmaster/syslogger.c:1111 postmaster/syslogger.c:1156
+msgid "disabling automatic rotation (use SIGHUP to re-enable)"
+msgstr "wyłączanie automatycznej rotacji (użyj SIGHUP by włączyć ponownie)"
+
+#: regex/regc_pg_locale.c:258 utils/adt/selfuncs.c:5028
+msgid "could not determine which collation to use for regular expression"
+msgstr "nie można określić, jakiego porównania użyć dla wyrażenia regularnego"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:101
+#, c-format
+msgid "could not connect to the primary server: %s"
+msgstr "nie można połączyć się do serwera podstawowego: %s"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:113
+#, c-format
+msgid ""
+"could not receive database system identifier and timeline ID from the "
+"primary server: %s"
+msgstr ""
+"nie udało się odebrać identyfikatora systemu bazy danych ani ID ścieżki "
+"czasowej z serwera podstawowego: %s"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:124
+msgid "invalid response from primary server"
+msgstr "nieprawidłowa odpowiedź z serwera podstawowego"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:125
+#, c-format
+msgid "Expected 1 tuple with 3 fields, got %d tuples with %d fields."
+msgstr "Oczekiwano 1 krotki z 3 polami, jest %d krotek z %d polami."
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:140
+msgid "database system identifier differs between the primary and standby"
+msgstr ""
+"identyfikator systemu bazy danych różni się od podstawowego i gotowości"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:141
+#, c-format
+msgid "The primary's identifier is %s, the standby's identifier is %s."
+msgstr "Identyfikator podstawowego jest %s, identyfikator gotowości to %s."
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:153
+#, c-format
+msgid "timeline %u of the primary does not match recovery target timeline %u"
+msgstr ""
+"linia czasu %u podstawowego nie zgadza siÄ™ z docelowÄ… liniÄ… czasu "
+"odzyskiwania %u"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:165
+#, c-format
+msgid "could not start WAL streaming: %s"
+msgstr "nie udało się rozpocząć przesyłania strumieniowego WAL: %s"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:171
+msgid "streaming replication successfully connected to primary"
+msgstr "replikacja strumieniowa z powodzeniem podłączona do podstawowego"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:193
+msgid "socket not open"
+msgstr "gniazdo nie jest otwarte"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:367
+#: replication/libpqwalreceiver/libpqwalreceiver.c:388
+#: replication/libpqwalreceiver/libpqwalreceiver.c:393
+#, c-format
+msgid "could not receive data from WAL stream: %s"
+msgstr "nie można otrzymać danych ze strumienia WAL: %s"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:384
+msgid "replication terminated by primary server"
+msgstr "replikacja zakończona przez serwer podstawowy"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:415
+#, c-format
+msgid "could not send data to WAL stream: %s"
+msgstr "nie można wysłać danych do strumienia WAL: %s"
+
+#: replication/walreceiver.c:150
+msgid "terminating walreceiver process due to administrator command"
+msgstr "przerwano proces walreceiver na skutek polecenia administratora"
+
+#: replication/walreceiver.c:299
+msgid "cannot continue WAL streaming, recovery has already ended"
+msgstr ""
+"nie można kontynuować transmisji strumieniowej WAL odzyskiwanie już "
+"zakończone"
+
+#: replication/walsender.c:141
+msgid "recovery is still in progress, can't accept WAL streaming connections"
+msgstr ""
+"odzyskiwanie jest w toku, nie może zaakceptować WAL połączeń transmisji "
+"strumieniowej"
+
+#: replication/walsender.c:261 replication/walsender.c:489
+#: replication/walsender.c:547
+msgid "unexpected EOF on standby connection"
+msgstr "nieoczekiwany EOF na połączeniu gotowości"
+
+#: replication/walsender.c:267
+#, c-format
+msgid "invalid standby handshake message type %d"
+msgstr "nieprawidłowy typ komunikatu uzgadniania %d z gotowości"
+
+#: replication/walsender.c:379
+msgid "standby connections not allowed because wal_level=minimal"
+msgstr "połączenia z gotowości niedozwolone ponieważ wal_level=minimal"
+
+#: replication/walsender.c:461
+#, c-format
+msgid "invalid standby query string: %s"
+msgstr "nieprawidłowe łańcuch znaków zapytania gotowości: %s"
+
+#: replication/walsender.c:518
+#, c-format
+msgid "invalid standby message type \"%c\""
+msgstr "nieprawidłowy typ komunikatu gotowości \"%c\""
+
+#: replication/walsender.c:569
+#, c-format
+msgid "unexpected message type \"%c\""
+msgstr "nieoczekiwany typ komunikatu \"%c\""
+
+#: replication/walsender.c:822
+msgid "terminating walsender process due to replication timeout"
+msgstr "przerwano proces walsender na skutek limitu czasu replikacji"
+
+#: replication/walsender.c:838
+#, c-format
+msgid "standby \"%s\" has now caught up with primary"
+msgstr "gotowość \"%s\" dogonił obecnie podstawowy"
+
+#: replication/walsender.c:907
+#, c-format
+msgid ""
+"number of requested standby connections exceeds max_wal_senders (currently "
+"%d)"
+msgstr ""
+"liczba żądanych połączeń gotowości przekracza max_wal_senders (obecnie %d)"
+
+#: replication/walsender.c:985 replication/walsender.c:1047
+#, c-format
+msgid "requested WAL segment %s has already been removed"
+msgstr "żądany segment WAL %s został już usunięty"
+
+#: replication/walsender.c:1018
+#, c-format
+msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
+msgstr ""
+"nie można czytać z pliku dziennika %u, segment %u, przesunięcie %u, długość "
+"%lu: %m"
+
+#: replication/basebackup.c:122 replication/basebackup.c:631
+#, c-format
+msgid "could not read symbolic link \"%s\": %m"
+msgstr "nie można odczytać linku symbolicznego \"%s\": %m"
+
+#: replication/basebackup.c:231 replication/basebackup.c:743
+msgid "base backup could not send data, aborting backup"
+msgstr ""
+"podstawowa kopia zapasowa nie mogła wysłać danych, przerwanie tworzenia "
+"kopii zapasowej"
+
+#: replication/basebackup.c:278 replication/basebackup.c:287
+#: replication/basebackup.c:296 replication/basebackup.c:305
+#: replication/basebackup.c:314
+#, c-format
+msgid "duplicate option \"%s\""
+msgstr "powtórzona opcja \"%s\""
+
+#: replication/basebackup.c:366
+#, c-format
+msgid "could not open directory \"pg_tblspc\": %m"
+msgstr "nie udało się otworzyć folderu \"pg_tblspc\": %m"
+
+#: replication/basebackup.c:576
+msgid "shutdown requested, aborting active base backup"
+msgstr ""
+"zażądano wyłączenia, przerwanie aktywnego tworzenia podstawowej kopii "
+"zapasowej"
+
+#: replication/basebackup.c:589
+#, c-format
+msgid "could not stat file or directory \"%s\": %m"
+msgstr "nie można wykonać stat na pliku lub katalogu \"%s\": %m"
+
+#: replication/basebackup.c:660
+#, c-format
+msgid "skipping special file \"%s\""
+msgstr "pominięto plik specjalny \"%s\""
+
+#: replication/basebackup.c:733
+#, c-format
+msgid "archive member \"%s\" too large for tar format"
+msgstr "składnik archiwum \"%s\" za duży dla formatu tar"
+
+#: replication/syncrep.c:210
+msgid ""
+"canceling the wait for synchronous replication and terminating connection "
+"due to administrator command"
+msgstr ""
+"anulowanie oczekiwania na replikację synchroniczną i zakończenie połączenia "
+"na skutek polecenia administratora"
+
+#: replication/syncrep.c:211 replication/syncrep.c:228
+msgid ""
+"The transaction has already committed locally, but might not have been "
+"replicated to the standby."
+msgstr ""
+"Transakcja została już zatwierdzona lokalnie, ale mogła nie zostać "
+"zreplikowana do gotowości."
+
+#: replication/syncrep.c:227
+msgid "canceling wait for synchronous replication due to user request"
+msgstr ""
+"anulowanie oczekiwania na replikacjÄ™ synchronicznÄ… na skutek polecenia "
+"użytkownika"
+
+#: replication/syncrep.c:358
+#, c-format
+msgid "standby \"%s\" now has synchronous standby priority %u"
+msgstr "gotowość \"%s\" posiada teraz priorytet gotowości synchronicznej %u"
+
+#: replication/syncrep.c:451
+#, c-format
+msgid "standby \"%s\" is now the synchronous standby with priority %u"
+msgstr "gotowość \"%s\" jest teraz gotowością synchroniczną o priorytecie %u"
+
+#: repl_scanner.l:76
+msgid "invalid streaming start location"
+msgstr "nieprawidłowe położenie początku przesyłania strumieniowego"
+
+#: repl_scanner.l:107
+#, c-format
+msgid "syntax error: unexpected character \"%s\""
+msgstr "błąd składni, nieoczekiwany znak \"%s\""
+
+#: rewrite/rewriteDefine.c:109 rewrite/rewriteDefine.c:769
+#, c-format
+msgid "rule \"%s\" for relation \"%s\" already exists"
+msgstr "reguła \"%s\" dla relacji \"%s\" już istnieje"
+
+#: rewrite/rewriteDefine.c:287
+msgid "rule actions on OLD are not implemented"
+msgstr "akcje reguły na OLD nie zostały zaimplementowane"
+
+#: rewrite/rewriteDefine.c:288
+msgid "Use views or triggers instead."
+msgstr "Użyj widoków lub wyzwalaczy w zamian."
+
+#: rewrite/rewriteDefine.c:292
+msgid "rule actions on NEW are not implemented"
+msgstr "akcje reguły na NEW nie zostały zaimplementowane"
+
+#: rewrite/rewriteDefine.c:293
+msgid "Use triggers instead."
+msgstr "Użyj wyzwalaczy w zamian."
+
+#: rewrite/rewriteDefine.c:306
+msgid "INSTEAD NOTHING rules on SELECT are not implemented"
+msgstr "reguły INSTEAD NOTHING na SELECT nie zostały zrealizowane"
+
+#: rewrite/rewriteDefine.c:307
+msgid "Use views instead."
+msgstr "Użyj widoków w zamian."
+
+#: rewrite/rewriteDefine.c:315
+msgid "multiple actions for rules on SELECT are not implemented"
+msgstr "wielokrotne akcje dla reguł na SELECT nie zostały zrealizowane"
+
+#: rewrite/rewriteDefine.c:327
+msgid "rules on SELECT must have action INSTEAD SELECT"
+msgstr "reguły na SELECT muszą posiadać akcję INSTEAD SELECT"
+
+#: rewrite/rewriteDefine.c:335
+msgid "rules on SELECT must not contain data-modifying statements in WITH"
+msgstr "reguły na SELECT nie mogą zawierać wyrażeń zmieniających dane w WITH"
+
+#: rewrite/rewriteDefine.c:343
+msgid "event qualifications are not implemented for rules on SELECT"
+msgstr "kwalifikacje zdarzeń nie są zaimplementowane dla reguł SELECT"
+
+#: rewrite/rewriteDefine.c:368
+#, c-format
+msgid "\"%s\" is already a view"
+msgstr "\"%s\" jest już widokiem"
+
+#: rewrite/rewriteDefine.c:392
+#, c-format
+msgid "view rule for \"%s\" must be named \"%s\""
+msgstr "reguła widoku dla \"%s\" musi być nazwana \"%s\""
+
+#: rewrite/rewriteDefine.c:417
+#, c-format
+msgid "could not convert table \"%s\" to a view because it is not empty"
+msgstr ""
+"nie udało się przekształcić tabeli \"%s\" do widoku ponieważ nie jest ona "
+"pusta"
+
+#: rewrite/rewriteDefine.c:424
+#, c-format
+msgid "could not convert table \"%s\" to a view because it has triggers"
+msgstr ""
+"nie udało się przekształcić tabeli \"%s\" do widoku ponieważ posiada ona "
+"wyzwalacze"
+
+#: rewrite/rewriteDefine.c:426
+msgid ""
+"In particular, the table cannot be involved in any foreign key relationships."
+msgstr ""
+"W szczególności, w tabeli nie może być w jakiegokolwiek powiązania kluczem "
+"obcym."
+
+#: rewrite/rewriteDefine.c:431
+#, c-format
+msgid "could not convert table \"%s\" to a view because it has indexes"
+msgstr ""
+"nie udało się przekształcić tabeli \"%s\" do widoku ponieważ posiada ona "
+"indeksy"
+
+#: rewrite/rewriteDefine.c:437
+#, c-format
+msgid "could not convert table \"%s\" to a view because it has child tables"
+msgstr ""
+"nie udało się przekształcić tabeli \"%s\" do widoku ponieważ posiada ona "
+"tabele potomne"
+
+#: rewrite/rewriteDefine.c:464
+msgid "cannot have multiple RETURNING lists in a rule"
+msgstr "nie może być wielokrotnych list RETURNING w regule"
+
+#: rewrite/rewriteDefine.c:469
+msgid "RETURNING lists are not supported in conditional rules"
+msgstr "listy RETURNING nie są obsługiwane w regułach warunkowych"
+
+#: rewrite/rewriteDefine.c:473
+msgid "RETURNING lists are not supported in non-INSTEAD rules"
+msgstr "listy RETURNING nie są obsługiwane w regułach nie-INSTEAD"
+
+#: rewrite/rewriteDefine.c:552
+msgid "SELECT rule's target list has too many entries"
+msgstr "lista docelowa reguły SELECT posiada zbyt wiele wpisów"
+
+#: rewrite/rewriteDefine.c:553
+msgid "RETURNING list has too many entries"
+msgstr "lista RETURNING posiada zbyt dużo wpisów"
+
+#: rewrite/rewriteDefine.c:569
+msgid "cannot convert relation containing dropped columns to view"
+msgstr ""
+"nie można przekształcić relacji zawierającej skasowane kolumny do widoku"
+
+#: rewrite/rewriteDefine.c:574
+#, c-format
+msgid "SELECT rule's target entry %d has different column name from \"%s\""
+msgstr "lista docelowa reguły SELECT %d posiada inną nazwę kolumny z \"%s\""
+
+#: rewrite/rewriteDefine.c:580
+#, c-format
+msgid "SELECT rule's target entry %d has different type from column \"%s\""
+msgstr "lista docelowa reguły SELECT %d posiada inny typ z kolumny \"%s\""
+
+#: rewrite/rewriteDefine.c:582
+#, c-format
+msgid "RETURNING list's entry %d has different type from column \"%s\""
+msgstr "wpis docelowy reguły RETURNING %d posiada inny typ z kolumny \"%s\""
+
+#: rewrite/rewriteDefine.c:597
+#, c-format
+msgid "SELECT rule's target entry %d has different size from column \"%s\""
+msgstr "lista docelowa reguły SELECT %d posiada inny rozmiar z kolumny \"%s\""
+
+#: rewrite/rewriteDefine.c:599
+#, c-format
+msgid "RETURNING list's entry %d has different size from column \"%s\""
+msgstr ""
+"wpis docelowy reguły RETURNING %d posiada inny rozmiar z kolumny \"%s\""
+
+#: rewrite/rewriteDefine.c:607
+msgid "SELECT rule's target list has too few entries"
+msgstr "lista docelowa reguły SELECT posiada za mało wpisów"
+
+#: rewrite/rewriteDefine.c:608
+msgid "RETURNING list has too few entries"
+msgstr "lista RETURNING posiada za mało wpisów"
+
+#: rewrite/rewriteDefine.c:700 rewrite/rewriteDefine.c:762
+#: rewrite/rewriteRemove.c:62 rewrite/rewriteSupport.c:117
+#, c-format
+msgid "rule \"%s\" for relation \"%s\" does not exist"
+msgstr "reguła \"%s\" dla relacji \"%s\" nie istnieje"
+
+#: rewrite/rewriteHandler.c:485
+#, c-format
+msgid ""
+"WITH query name \"%s\" appears in both a rule action and the query being "
+"rewritten"
+msgstr ""
+"nazwa zapytania WITH \"%s\" pojawia się zarówno w akcji reguły jak i "
+"przepisywanej właśnie kwerendy"
+
+#: rewrite/rewriteHandler.c:543
+msgid "cannot have RETURNING lists in multiple rules"
+msgstr "nie można mieć list RETURNING w wielu regułach"
+
+#: rewrite/rewriteHandler.c:874 rewrite/rewriteHandler.c:892
+#, c-format
+msgid "multiple assignments to same column \"%s\""
+msgstr "wiele przypisań do tej samej kolumny \"%s\""
+
+#: rewrite/rewriteHandler.c:1626 rewrite/rewriteHandler.c:2021
+#, c-format
+msgid "infinite recursion detected in rules for relation \"%s\""
+msgstr "wykryto nieskończoną rekurencję w regułach dla relacji \"%s\""
+
+#: rewrite/rewriteHandler.c:1882
+msgid ""
+"DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
+"WITH"
+msgstr ""
+"reguły DO INSTEAD NOTHING nie są obsługiwane dla wyrażeń modyfikujących dane "
+"w WITH"
+
+#: rewrite/rewriteHandler.c:1896
+msgid ""
+"conditional DO INSTEAD rules are not supported for data-modifying statements "
+"in WITH"
+msgstr ""
+"reguły warunkowe DO INSTEAD nie są obsługiwane dla wyrażeń modyfikujących "
+"dane w WITH"
+
+#: rewrite/rewriteHandler.c:1900
+msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"reguły DO ALSO nie są obsługiwane dla wyrażeń modyfikujących dane w WITH"
+
+#: rewrite/rewriteHandler.c:1905
+msgid ""
+"multi-statement DO INSTEAD rules are not supported for data-modifying "
+"statements in WITH"
+msgstr ""
+"reguły wielowyrażeniowe DO INSTEAD nie są obsługiwane dla wyrażeń "
+"modyfikujÄ…cych dane w WITH"
+
+#: rewrite/rewriteHandler.c:2059
+#, c-format
+msgid "cannot perform INSERT RETURNING on relation \"%s\""
+msgstr "nie można wykonać INSERT RETURNING na relacji \"%s\""
+
+#: rewrite/rewriteHandler.c:2061
+msgid ""
+"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
+msgstr ""
+"Potrzebujesz bezwarunkowej reguły ON INSERT DO INSTEAD z klauzulą RETURNING."
+
+#: rewrite/rewriteHandler.c:2066
+#, c-format
+msgid "cannot perform UPDATE RETURNING on relation \"%s\""
+msgstr "nie można wykonać UPDATE RETURNING na relacji \"%s\""
+
+#: rewrite/rewriteHandler.c:2068
+msgid ""
+"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
+msgstr ""
+"Potrzebujesz bezwarunkowej reguły ON UPDATE DO INSTEAD z klauzulą RETURNING."
+
+#: rewrite/rewriteHandler.c:2073
+#, c-format
+msgid "cannot perform DELETE RETURNING on relation \"%s\""
+msgstr "nie można wykonać DELETE RETURNING na relacji \"%s\""
+
+#: rewrite/rewriteHandler.c:2075
+msgid ""
+"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
+msgstr ""
+"Potrzebujesz bezwarunkowej reguły ON DELETE DO INSTEAD z klauzulą RETURNING."
+
+#: rewrite/rewriteHandler.c:2139
+msgid ""
+"WITH cannot be used in a query that is rewritten by rules into multiple "
+"queries"
+msgstr ""
+"WITH nie może być użyte w zapytaniu które zostało rozpisane przez reguły na "
+"wiele zapytań"
+
+#: rewrite/rewriteManip.c:1012
+msgid "conditional utility statements are not implemented"
+msgstr "instrukcje warunkowe narzędzia nie są realizowane"
+
+#: rewrite/rewriteManip.c:1177
+msgid "WHERE CURRENT OF on a view is not implemented"
+msgstr "WHERE CURRENT OF na widoku nie jest realizowane"
+
+#: rewrite/rewriteRemove.c:66
+#, c-format
+msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
+msgstr "reguła \"%s\" relacji \"%s\" nie istnieje, pominięto"
+
+#: rewrite/rewriteSupport.c:156
+#, c-format
+msgid "rule \"%s\" does not exist"
+msgstr "reguła \"%s\" nie istnieje"
+
+#: rewrite/rewriteSupport.c:165
+#, c-format
+msgid "there are multiple rules named \"%s\""
+msgstr "istnieje wiele reguł o nazwie \"%s\""
+
+#: rewrite/rewriteSupport.c:166
+msgid "Specify a relation name as well as a rule name."
+msgstr "Wskaż nazwę relacji oraz nazwę reguły."
+
+#: utils/init/miscinit.c:115
+#, c-format
+msgid "could not change directory to \"%s\": %m"
+msgstr "nie można zmienić katalogu na \"%s\": %m"
+
+#: utils/init/miscinit.c:381 utils/misc/guc.c:5259
+#, c-format
+msgid "cannot set parameter \"%s\" within security-restricted operation"
+msgstr ""
+"nie można ustawić parametru \"%s\" w operacji ograniczonej przez "
+"bezpieczeństwo"
+
+#: utils/init/miscinit.c:460
+#, c-format
+msgid "role \"%s\" is not permitted to log in"
+msgstr "rola \"%s\" nie zezwala na logowanie"
+
+#: utils/init/miscinit.c:478
+#, c-format
+msgid "too many connections for role \"%s\""
+msgstr "zbyt wiele połączeń dla roli \"%s\""
+
+#: utils/init/miscinit.c:538
+msgid "permission denied to set session authorization"
+msgstr "odmowa dostępu do ustalenia autoryzacji sesji"
+
+#: utils/init/miscinit.c:618
+#, c-format
+msgid "invalid role OID: %u"
+msgstr "nieprawidłowy OID roli: %u"
+
+#: utils/init/miscinit.c:750
+#, c-format
+msgid "could not create lock file \"%s\": %m"
+msgstr "nie można utworzyć pliku blokady \"%s\": %m"
+
+#: utils/init/miscinit.c:764
+#, c-format
+msgid "could not open lock file \"%s\": %m"
+msgstr "nie można otworzyć pliku blokady \"%s\": %m"
+
+#: utils/init/miscinit.c:770
+#, c-format
+msgid "could not read lock file \"%s\": %m"
+msgstr "nie można odczytać pliku blokady \"%s\": %m"
+
+#: utils/init/miscinit.c:818
+#, c-format
+msgid "lock file \"%s\" already exists"
+msgstr "plik blokady \"%s\" już istnieje"
+
+#: utils/init/miscinit.c:822
+#, c-format
+msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+msgstr "Czy inny postgres (PID %d) jest uruchomiony na folderze danych \"%s\"?"
+
+#: utils/init/miscinit.c:824
+#, c-format
+msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Czy inny postmaster (PID %d) jest uruchomiony na folderze danych \"%s\"?"
+
+#: utils/init/miscinit.c:827
+#, c-format
+msgid "Is another postgres (PID %d) using socket file \"%s\"?"
+msgstr "Czy inny postgres (PID %d) używa pliku gniazda \"%s\"?"
+
+#: utils/init/miscinit.c:829
+#, c-format
+msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
+msgstr "Czy inny postmaster (PID %d) używa pliku gniazda \"%s\"?"
+
+#: utils/init/miscinit.c:865
+#, c-format
+msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgstr ""
+"istniejący już blok pamięci współdzielonej (key %lu, ID %lu) jest ciągle "
+"używany"
+
+#: utils/init/miscinit.c:868
+#, c-format
+msgid ""
+"If you're sure there are no old server processes still running, remove the "
+"shared memory block or just delete the file \"%s\"."
+msgstr ""
+"Jeśli masz pewność, że nie ma nadal działającego starego procesu serwera, "
+"usuń blok pamięci współdzielonej lub po prostu usuń plik \"%s\"."
+
+#: utils/init/miscinit.c:884
+#, c-format
+msgid "could not remove old lock file \"%s\": %m"
+msgstr "nie można usunąć starego pliku blokady \"%s\": %m"
+
+#: utils/init/miscinit.c:886
+msgid ""
+"The file seems accidentally left over, but it could not be removed. Please "
+"remove the file by hand and try again."
+msgstr ""
+"Plik wydaje się pozostawiony przypadkowo, ale nie mógł zostać usunięty. "
+"Proszę usunąć plik ręcznie i spróbować ponownie."
+
+#: utils/init/miscinit.c:920 utils/init/miscinit.c:931
+#: utils/init/miscinit.c:941
+#, c-format
+msgid "could not write lock file \"%s\": %m"
+msgstr "nie można zapisać pliku blokady \"%s\": %m"
+
+#: utils/init/miscinit.c:1048 utils/misc/guc.c:7527
+#, c-format
+msgid "could not read from file \"%s\": %m"
+msgstr "nie można czytać z pliku \"%s\": %m"
+
+#: utils/init/miscinit.c:1147 utils/init/miscinit.c:1160
+#, c-format
+msgid "\"%s\" is not a valid data directory"
+msgstr "\"%s\" nie jest prawidłowym folderem danych"
+
+#: utils/init/miscinit.c:1149
+#, c-format
+msgid "File \"%s\" is missing."
+msgstr "Brak pliku \"%s\"."
+
+#: utils/init/miscinit.c:1162
+#, c-format
+msgid "File \"%s\" does not contain valid data."
+msgstr "Plik \"%s\" nie zawiera poprawnych danych."
+
+#: utils/init/miscinit.c:1164
+msgid "You might need to initdb."
+msgstr "Być może trzeba initdb."
+
+#: utils/init/miscinit.c:1172
+#, c-format
+msgid ""
+"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
+"not compatible with this version %s."
+msgstr ""
+"Katalog danych został zainicjowany przez PostgreSQL w wersji %ld.%ld, który "
+"nie jest zgodny z obecnÄ… wersjÄ… %s."
+
+#: utils/init/miscinit.c:1220
+#, c-format
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "niepoprawna składnia listy w parametrze \"%s\""
+
+#: utils/init/miscinit.c:1257
+#, c-format
+msgid "loaded library \"%s\""
+msgstr "wczytano bibliotekÄ™ \"%s\""
+
+#: utils/init/postinit.c:225
+#, c-format
+msgid "replication connection authorized: user=%s"
+msgstr "zautoryzowano połączenie replikacji: użytkownik=%s"
+
+#: utils/init/postinit.c:229
+#, c-format
+msgid "connection authorized: user=%s database=%s"
+msgstr "zautoryzowano połączenie: użytkownik=%s baza danych=%s"
+
+#: utils/init/postinit.c:260
+#, c-format
+msgid "database \"%s\" has disappeared from pg_database"
+msgstr "baza danych \"%s\" zniknęła z pg_database"
+
+#: utils/init/postinit.c:262
+#, c-format
+msgid "Database OID %u now seems to belong to \"%s\"."
+msgstr "OID %u bazy danych wydaje się teraz należeć do \"%s\"."
+
+#: utils/init/postinit.c:282
+#, c-format
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "baza danych \"%s\" nie akceptuje obecnie połączeń"
+
+#: utils/init/postinit.c:295
+#, c-format
+msgid "permission denied for database \"%s\""
+msgstr "odmowa dostępu do bazy \"%s\""
+
+#: utils/init/postinit.c:296
+msgid "User does not have CONNECT privilege."
+msgstr "Użytkownik nie posiada uprawnienia CONNECT."
+
+#: utils/init/postinit.c:313
+#, c-format
+msgid "too many connections for database \"%s\""
+msgstr "zbyt wiele połączeń do bazy \"%s\""
+
+#: utils/init/postinit.c:335 utils/init/postinit.c:342
+msgid "database locale is incompatible with operating system"
+msgstr "lokalizacje bazy danych sÄ… niedopasowane do systemu operacyjnego"
+
+#: utils/init/postinit.c:336
+#, c-format
+msgid ""
+"The database was initialized with LC_COLLATE \"%s\",  which is not "
+"recognized by setlocale()."
+msgstr ""
+"Baza danych bazy została zainicjowana z LC_COLLATE \"%s\",  które nie jest "
+"rozpoznawane przez setlocale()."
+
+#: utils/init/postinit.c:338 utils/init/postinit.c:345
+msgid ""
+"Recreate the database with another locale or install the missing locale."
+msgstr ""
+"Utwórz ponownie bazę danych z inną lokalizacją lub zainstaluj brakującą "
+"lokalizacjÄ™."
+
+#: utils/init/postinit.c:343
+#, c-format
+msgid ""
+"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
+"by setlocale()."
+msgstr ""
+"Baza danych została zainicjowana z LC_CTYPE \"%s\",  co nie jest "
+"rozpoznawane przez setlocale()."
+
+#: utils/init/postinit.c:599
+msgid "no roles are defined in this database system"
+msgstr "brak zdefiniowanych ról w tym systemie bazodanowym"
+
+#: utils/init/postinit.c:600
+#, c-format
+msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
+msgstr "Należy natychmiast wykonać CREATE USER \"%s\" SUPERUSER;."
+
+#: utils/init/postinit.c:623
+msgid "new replication connections are not allowed during database shutdown"
+msgstr ""
+"nowe połączenia replikacji są niedozwolone podczas wyłączenia bazy danych"
+
+#: utils/init/postinit.c:627
+msgid "must be superuser to connect during database shutdown"
+msgstr ""
+"musisz być superużytkownikiem aby łączyć się w czasie zamykania bazy danych"
+
+#: utils/init/postinit.c:637
+msgid "must be superuser to connect in binary upgrade mode"
+msgstr ""
+"musisz być superużytkownikiem aby łączyć się w binarnym trybie aktualizacji"
+
+#: utils/init/postinit.c:651
+msgid ""
+"remaining connection slots are reserved for non-replication superuser "
+"connections"
+msgstr ""
+"pozostałe gniazda połączeń są zarezerwowane dla niereplikacyjnych połączeń "
+"superużytkowników"
+
+#: utils/init/postinit.c:666
+msgid "must be replication role to start walsender"
+msgstr "musisz mieć rolę replikacji by uruchomić walsender"
+
+#: utils/init/postinit.c:726
+#, c-format
+msgid "database %u does not exist"
+msgstr "baza danych %u nie istnieje"
+
+#: utils/init/postinit.c:778
+msgid "It seems to have just been dropped or renamed."
+msgstr "Wydaje się, że właśnie została skasowana lub przemianowana."
+
+#: utils/init/postinit.c:796
+#, c-format
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "Brakuje podfolderu \"%s\" bazy danych."
+
+#: utils/init/postinit.c:801
+#, c-format
+msgid "could not access directory \"%s\": %m"
+msgstr "nie można uzyskać dostępu do folderu \"%s\": %m"
+
+#: utils/adt/acl.c:166 utils/adt/name.c:87
+msgid "identifier too long"
+msgstr "identyfikator zbyt długi"
+
+#: utils/adt/acl.c:167 utils/adt/name.c:88
+#, c-format
+msgid "Identifier must be less than %d characters."
+msgstr "Identyfikator musi być krótszy niż %d znaków."
+
+#: utils/adt/acl.c:253
+#, c-format
+msgid "unrecognized key word: \"%s\""
+msgstr "nierozpoznane słowo kluczowe: \"%s\""
+
+#: utils/adt/acl.c:254
+msgid "ACL key word must be \"group\" or \"user\"."
+msgstr "Słowem kluczowym ACL musi być \"group\" lub \"user\"."
+
+#: utils/adt/acl.c:259
+msgid "missing name"
+msgstr "brakujÄ…ca nazwa"
+
+#: utils/adt/acl.c:260
+msgid "A name must follow the \"group\" or \"user\" key word."
+msgstr "Po nazwie musi wystąpić słowo kluczowe \"group\" lub \"user\"."
+
+#: utils/adt/acl.c:266
+msgid "missing \"=\" sign"
+msgstr "brakuje znaku \"=\""
+
+#: utils/adt/acl.c:319
+#, c-format
+msgid "invalid mode character: must be one of \"%s\""
+msgstr "niepoprawny znak trybu: musi być jednym z \"%s\""
+
+#: utils/adt/acl.c:341
+msgid "a name must follow the \"/\" sign"
+msgstr "nazwa musi wystąpić po znaku \"/\""
+
+#: utils/adt/acl.c:349
+#, c-format
+msgid "defaulting grantor to user ID %u"
+msgstr "ustawienie domyślności nadawania uprawnień dla ID %u użytkownika"
+
+#: utils/adt/acl.c:540
+msgid "ACL array contains wrong data type"
+msgstr "tablica ACL zawiera niepoprawny typ danych"
+
+#: utils/adt/acl.c:544
+msgid "ACL arrays must be one-dimensional"
+msgstr "tablice ACL muszą być jednowymiarowe"
+
+#: utils/adt/acl.c:548
+msgid "ACL arrays must not contain null values"
+msgstr "tablice ACL nie mogą zawierać pustych wartości"
+
+#: utils/adt/acl.c:572
+msgid "extra garbage at the end of the ACL specification"
+msgstr "dodatkowe zbędne dane na końcu specyfikacji ACL"
+
+#: utils/adt/acl.c:1129
+msgid "grant options cannot be granted back to your own grantor"
+msgstr ""
+"opcje przyznawania uprawnień nie mogą być przyznane temu, kto przyznał ci "
+"uprawnienia"
+
+#: utils/adt/acl.c:1190
+msgid "dependent privileges exist"
+msgstr "istnieją uprawnienia zależne"
+
+#: utils/adt/acl.c:1191
+msgid "Use CASCADE to revoke them too."
+msgstr "Użyj CASCADE by je również odebrać."
+
+#: utils/adt/acl.c:1470
+msgid "aclinsert is no longer supported"
+msgstr "aclinsert nie jest już wspierany"
+
+#: utils/adt/acl.c:1480
+msgid "aclremove is no longer supported"
+msgstr "aclremove nie jest już wspierany"
+
+#: utils/adt/acl.c:1566 utils/adt/acl.c:1620
+#, c-format
+msgid "unrecognized privilege type: \"%s\""
+msgstr "nierozpoznany typ uprawnienia: \"%s\""
+
+#: utils/adt/acl.c:3359 utils/adt/regproc.c:118 utils/adt/regproc.c:139
+#: utils/adt/regproc.c:289
+#, c-format
+msgid "function \"%s\" does not exist"
+msgstr "funkcja \"%s\" nie istnieje"
+
+#: utils/adt/acl.c:4608
+#, c-format
+msgid "must be member of role \"%s\""
+msgstr "musisz być składnikiem roli \"%s\""
+
+#: utils/adt/array_userfuncs.c:48
+msgid "could not determine input data types"
+msgstr "nie można określić typów danych wejściowych"
+
+#: utils/adt/array_userfuncs.c:82
+msgid "neither input type is an array"
+msgstr "żaden typ wejściowy nie jest tablicą"
+
+#: utils/adt/array_userfuncs.c:103 utils/adt/array_userfuncs.c:113
+#: utils/adt/arrayfuncs.c:1276 utils/adt/float.c:1101 utils/adt/float.c:1160
+#: utils/adt/float.c:2711 utils/adt/float.c:2727 utils/adt/int.c:623
+#: utils/adt/int.c:652 utils/adt/int.c:673 utils/adt/int.c:693
+#: utils/adt/int.c:715 utils/adt/int.c:744 utils/adt/int.c:758
+#: utils/adt/int.c:773 utils/adt/int.c:912 utils/adt/int.c:933
+#: utils/adt/int.c:960 utils/adt/int.c:1000 utils/adt/int.c:1021
+#: utils/adt/int.c:1048 utils/adt/int.c:1079 utils/adt/int.c:1142
+#: utils/adt/int8.c:1211 utils/adt/numeric.c:2253 utils/adt/numeric.c:2262
+#: utils/adt/varbit.c:1111 utils/adt/varbit.c:1503 utils/adt/varlena.c:950
+#: utils/adt/varlena.c:1968
+msgid "integer out of range"
+msgstr "liczba całkowita poza zakresem"
+
+#: utils/adt/array_userfuncs.c:121
+msgid "argument must be empty or one-dimensional array"
+msgstr "argument musi być pusty lub jednowymiarową tablicą"
+
+#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
+#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
+#: utils/adt/array_userfuncs.c:357
+msgid "cannot concatenate incompatible arrays"
+msgstr "nie można powiązać niekompatybilnych tablic"
+
+#: utils/adt/array_userfuncs.c:225
+#, c-format
+msgid ""
+"Arrays with element types %s and %s are not compatible for concatenation."
+msgstr "Tablice z typami elementów %s i %s nie są zgodne dla konkatenacji."
+
+#: utils/adt/array_userfuncs.c:264
+#, c-format
+msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
+msgstr "Tablice o %d i %d wymiarach nie sÄ… zgodne dla konkatenacji."
+
+#: utils/adt/array_userfuncs.c:301
+msgid ""
+"Arrays with differing element dimensions are not compatible for "
+"concatenation."
+msgstr "Tablice o różnych wymiarach elementów nie są zgodne dla konkatenacji."
+
+#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
+msgid "Arrays with differing dimensions are not compatible for concatenation."
+msgstr "Tablice o różnych wymiarach nie są zgodne dla konkatenacji."
+
+#: utils/adt/array_userfuncs.c:426 utils/adt/arrayfuncs.c:1238
+#: utils/adt/arrayfuncs.c:2911 utils/adt/arrayfuncs.c:4936
+#, c-format
+msgid "invalid number of dimensions: %d"
+msgstr "niewłaściwa liczba wymiarów: %d"
+
+#: utils/adt/array_userfuncs.c:487
+msgid "could not determine input data type"
+msgstr "nie można określić typu danych wejściowych"
+
+#: utils/adt/arrayfuncs.c:235 utils/adt/arrayfuncs.c:247
+msgid "missing dimension value"
+msgstr "brak wartości wymiaru"
+
+#: utils/adt/arrayfuncs.c:257
+msgid "missing \"]\" in array dimensions"
+msgstr "brak \"]\" w wymiarach tablicy"
+
+#: utils/adt/arrayfuncs.c:265 utils/adt/arrayfuncs.c:2436
+#: utils/adt/arrayfuncs.c:2464 utils/adt/arrayfuncs.c:2479
+msgid "upper bound cannot be less than lower bound"
+msgstr "górna granica nie może być mniejsza niż dolna granica"
+
+#: utils/adt/arrayfuncs.c:277 utils/adt/arrayfuncs.c:303
+msgid "array value must start with \"{\" or dimension information"
+msgstr "wartość tablicy musi zaczynać się od \"{\" lub informacji o wymiarze"
+
+#: utils/adt/arrayfuncs.c:291
+msgid "missing assignment operator"
+msgstr "brakujÄ…cy operator przypisania"
+
+#: utils/adt/arrayfuncs.c:308 utils/adt/arrayfuncs.c:314
+msgid "array dimensions incompatible with array literal"
+msgstr "wymiary tablicy są niezgodne z literałem tablicy"
+
+#: utils/adt/arrayfuncs.c:444 utils/adt/arrayfuncs.c:459
+#: utils/adt/arrayfuncs.c:468 utils/adt/arrayfuncs.c:482
+#: utils/adt/arrayfuncs.c:502 utils/adt/arrayfuncs.c:530
+#: utils/adt/arrayfuncs.c:535 utils/adt/arrayfuncs.c:575
+#: utils/adt/arrayfuncs.c:596 utils/adt/arrayfuncs.c:615
+#: utils/adt/arrayfuncs.c:725 utils/adt/arrayfuncs.c:734
+#: utils/adt/arrayfuncs.c:764 utils/adt/arrayfuncs.c:779
+#: utils/adt/arrayfuncs.c:832
+#, c-format
+msgid "malformed array literal: \"%s\""
+msgstr "nieprawidłowy literał tablicy: \"%s\""
+
+#: utils/adt/arrayfuncs.c:871 utils/adt/arrayfuncs.c:1473
+#: utils/adt/arrayfuncs.c:2795 utils/adt/arrayfuncs.c:2943
+#: utils/adt/arrayfuncs.c:5036 utils/adt/arrayutils.c:93
+#: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
+#, c-format
+msgid "array size exceeds the maximum allowed (%d)"
+msgstr "rozmiar tablicy przekracza dozwolone maksimum (%d)"
+
+#: utils/adt/arrayfuncs.c:1249
+msgid "invalid array flags"
+msgstr "niepoprawne flagi tablicy"
+
+#: utils/adt/arrayfuncs.c:1257
+msgid "wrong element type"
+msgstr "nieprawidłowy typ elementu"
+
+#: utils/adt/arrayfuncs.c:1307 utils/cache/lsyscache.c:2485
+#, c-format
+msgid "no binary input function available for type %s"
+msgstr "brak funkcji wejścia binarnego dostępnej dla typu %s"
+
+#: utils/adt/arrayfuncs.c:1447
+#, c-format
+msgid "improper binary format in array element %d"
+msgstr "niewłaściwy format binarny w elemencie %d tablicy"
+
+#: utils/adt/arrayfuncs.c:1529 utils/cache/lsyscache.c:2518
+#, c-format
+msgid "no binary output function available for type %s"
+msgstr "brak funkcji wyjścia binarnego dostępnej dla typu %s"
+
+#: utils/adt/arrayfuncs.c:1903
+msgid "slices of fixed-length arrays not implemented"
+msgstr "wycinki tablic o stałej długości nie są realizowane"
+
+#: utils/adt/arrayfuncs.c:2076 utils/adt/arrayfuncs.c:2098
+#: utils/adt/arrayfuncs.c:2132 utils/adt/arrayfuncs.c:2418
+#: utils/adt/arrayfuncs.c:4916 utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4965
+msgid "wrong number of array subscripts"
+msgstr "nieprawidłowa liczba indeksów tablicy"
+
+#: utils/adt/arrayfuncs.c:2081 utils/adt/arrayfuncs.c:2174
+#: utils/adt/arrayfuncs.c:2469
+msgid "array subscript out of range"
+msgstr "indeks tablicy poza zakresem"
+
+#: utils/adt/arrayfuncs.c:2086
+msgid "cannot assign null value to an element of a fixed-length array"
+msgstr ""
+"nie można przypisać wartości null do elementu tablicy o stałej długości"
+
+#: utils/adt/arrayfuncs.c:2372
+msgid "updates on slices of fixed-length arrays not implemented"
+msgstr "modyfikacje wycinków tablic o stałej długości nie są realizowane"
+
+#: utils/adt/arrayfuncs.c:2408 utils/adt/arrayfuncs.c:2495
+msgid "source array too small"
+msgstr "tablica źródłowa zbyt mała"
+
+#: utils/adt/arrayfuncs.c:3050
+msgid "null array element not allowed in this context"
+msgstr "puste elementy tablicy nie są dozwolone w tym kontekście"
+
+#: utils/adt/arrayfuncs.c:3153 utils/adt/arrayfuncs.c:3361
+#: utils/adt/arrayfuncs.c:3678
+msgid "cannot compare arrays of different element types"
+msgstr "nie można porównywać tablic z elementami różnego typu"
+
+#: utils/adt/arrayfuncs.c:3563
+#, c-format
+msgid "could not identify a hash function for type %s"
+msgstr "nie można określić funkcji skrótu dla typu %s"
+
+#: utils/adt/arrayfuncs.c:4814 utils/adt/arrayfuncs.c:4854
+msgid "dimension array or low bound array cannot be null"
+msgstr "tablica wymiarów ani tablica dolnych granic nie mogą być puste"
+
+#: utils/adt/arrayfuncs.c:4917 utils/adt/arrayfuncs.c:4949
+msgid "Dimension array must be one dimensional."
+msgstr "tablica wymiarów musi być jednowymiarowa."
+
+#: utils/adt/arrayfuncs.c:4922 utils/adt/arrayfuncs.c:4954
+msgid "wrong range of array subscripts"
+msgstr "nieprawidłowy zakres indeksów tablicy"
+
+#: utils/adt/arrayfuncs.c:4923 utils/adt/arrayfuncs.c:4955
+msgid "Lower bound of dimension array must be one."
+msgstr "Dolna granica tablicy wymiarów musi być równa jeden."
+
+#: utils/adt/arrayfuncs.c:4928 utils/adt/arrayfuncs.c:4960
+msgid "dimension values cannot be null"
+msgstr "wartości wymiarów nie mogą być puste"
+
+#: utils/adt/arrayfuncs.c:4966
+msgid "Low bound array has different size than dimensions array."
+msgstr "Tablica dolnych granic ma inny rozmiar niż tablica wymiarów."
+
+#: utils/adt/arrayutils.c:209
+msgid "typmod array must be type cstring[]"
+msgstr "tablica typmod musi być typu cstring[]"
+
+#: utils/adt/arrayutils.c:214
+msgid "typmod array must be one-dimensional"
+msgstr "tablica typmod musi być jednowymiarowa"
+
+#: utils/adt/arrayutils.c:219
+msgid "typmod array must not contain nulls"
+msgstr "tablica typmod nie może zawierać wartości pustych"
+
+#: utils/adt/ascii.c:75
+#, c-format
+msgid "encoding conversion from %s to ASCII not supported"
+msgstr "przekształcenie kodowania z %s do ASCII nie jest obsługiwane"
+
+#: utils/adt/bool.c:153
+#, c-format
+msgid "invalid input syntax for type boolean: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu logicznego: \"%s\""
+
+#: utils/adt/cash.c:232
+#, c-format
+msgid "invalid input syntax for type money: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu pieniądze: \"%s\""
+
+#: utils/adt/cash.c:493 utils/adt/cash.c:543 utils/adt/cash.c:594
+#: utils/adt/cash.c:643 utils/adt/cash.c:695 utils/adt/cash.c:745
+#: utils/adt/float.c:764 utils/adt/float.c:828 utils/adt/float.c:2470
+#: utils/adt/float.c:2533 utils/adt/geo_ops.c:4130 utils/adt/int.c:730
+#: utils/adt/int.c:875 utils/adt/int.c:974 utils/adt/int.c:1063
+#: utils/adt/int.c:1093 utils/adt/int.c:1117 utils/adt/int8.c:596
+#: utils/adt/int8.c:647 utils/adt/int8.c:828 utils/adt/int8.c:927
+#: utils/adt/int8.c:1016 utils/adt/int8.c:1115 utils/adt/numeric.c:4507
+#: utils/adt/numeric.c:4790 utils/adt/timestamp.c:2876
+msgid "division by zero"
+msgstr "dzielenie przez zero"
+
+#: utils/adt/char.c:169
+msgid "\"char\" out of range"
+msgstr "\"char\" poza zakresem"
+
+#: utils/adt/date.c:66 utils/adt/timestamp.c:92 utils/adt/varbit.c:51
+#: utils/adt/varchar.c:43
+msgid "invalid type modifier"
+msgstr "nieprawidłowy modyfikator typu"
+
+#: utils/adt/date.c:71
+#, c-format
+msgid "TIME(%d)%s precision must not be negative"
+msgstr "precyzja TIME(%d)%s nie może być ujemna"
+
+#: utils/adt/date.c:77
+#, c-format
+msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
+msgstr "precyzja TIME(%d)%s zredukowana do maksymalnej dopuszczalnej, %d"
+
+#: utils/adt/date.c:142 utils/adt/datetime.c:1186 utils/adt/datetime.c:1934
+msgid "date/time value \"current\" is no longer supported"
+msgstr "wartość data/czas \"current\" nie jest już wspierana"
+
+#: utils/adt/date.c:167
+#, c-format
+msgid "date out of range: \"%s\""
+msgstr "data poza zakresem: \"%s\""
+
+#: utils/adt/date.c:217 utils/adt/xml.c:1689
+msgid "date out of range"
+msgstr "data poza zakresem"
+
+#: utils/adt/date.c:359
+msgid "cannot subtract infinite dates"
+msgstr "nie można odejmować nieskończonych dat"
+
+#: utils/adt/date.c:416 utils/adt/date.c:453
+msgid "date out of range for timestamp"
+msgstr "data poza zakresem dla znacznika czasu"
+
+#: utils/adt/date.c:913 utils/adt/date.c:960 utils/adt/date.c:1516
+#: utils/adt/date.c:1553 utils/adt/date.c:2427 utils/adt/formatting.c:3185
+#: utils/adt/formatting.c:3217 utils/adt/formatting.c:3285
+#: utils/adt/nabstime.c:480 utils/adt/nabstime.c:523 utils/adt/nabstime.c:553
+#: utils/adt/nabstime.c:596 utils/adt/timestamp.c:226
+#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
+#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
+#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
+#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
+#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
+#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
+#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
+#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
+#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
+#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
+#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
+#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
+#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
+#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
+#: utils/adt/timestamp.c:4614 utils/adt/xml.c:1712 utils/adt/xml.c:1719
+#: utils/adt/xml.c:1739 utils/adt/xml.c:1746
+msgid "timestamp out of range"
+msgstr "znacznik czasu poza zakresem"
+
+#: utils/adt/date.c:986
+msgid "cannot convert reserved abstime value to date"
+msgstr "nie można przekształcić zarezerwowanej wartości abstime do daty"
+
+#: utils/adt/date.c:1140 utils/adt/date.c:1147 utils/adt/date.c:1915
+#: utils/adt/date.c:1922
+msgid "time out of range"
+msgstr "czas poza zakresem"
+
+#: utils/adt/date.c:1793 utils/adt/date.c:1810
+#, c-format
+msgid "\"time\" units \"%s\" not recognized"
+msgstr "jednostki \"%s\" typu \"time\" nierozpoznane"
+
+#: utils/adt/date.c:1932
+msgid "time zone displacement out of range"
+msgstr "przesunięcie strefy czasowej poza zakresem"
+
+#: utils/adt/date.c:2557 utils/adt/date.c:2574
+#, c-format
+msgid "\"time with time zone\" units \"%s\" not recognized"
+msgstr "jednostki \"%s\" typu \"time with time zone\" nierozpoznane"
+
+#: utils/adt/date.c:2632 utils/adt/datetime.c:928 utils/adt/datetime.c:1663
+#: utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
+#, c-format
+msgid "time zone \"%s\" not recognized"
+msgstr "strefa czasowa \"%s\" nie rozpoznana"
+
+#: utils/adt/date.c:2672
+#, c-format
+msgid "\"interval\" time zone \"%s\" not valid"
+msgstr "\"interval\" strefy czasowej \"%s\" jest niepoprawny"
+
+#: utils/adt/datetime.c:3532 utils/adt/datetime.c:3539
+#, c-format
+msgid "date/time field value out of range: \"%s\""
+msgstr "wartość pola daty/czasu poza zakresem: \"%s\""
+
+#: utils/adt/datetime.c:3541
+msgid "Perhaps you need a different \"datestyle\" setting."
+msgstr "Być może potrzebujesz innego ustawienia \"datestyle\"."
+
+#: utils/adt/datetime.c:3546
+#, c-format
+msgid "interval field value out of range: \"%s\""
+msgstr "wartość pola interwału poza zakresem: \"%s\""
+
+#: utils/adt/datetime.c:3552
+#, c-format
+msgid "time zone displacement out of range: \"%s\""
+msgstr "przesunięcie strefy czasowej poza zakresem: \"%s\""
+
+#. translator: first %s is inet or cidr
+#: utils/adt/datetime.c:3559 utils/adt/network.c:107
+#, c-format
+msgid "invalid input syntax for type %s: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu %s: \"%s\""
+
+#: utils/adt/datum.c:80 utils/adt/datum.c:92
+msgid "invalid Datum pointer"
+msgstr "nieprawidłowy wskaźnik punktu wyjściowego"
+
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:189
+#, c-format
+msgid "could not open tablespace directory \"%s\": %m"
+msgstr "nie można otworzyć folderu przestrzeni danych \"%s\": %m"
+
+#: utils/adt/domains.c:80
+#, c-format
+msgid "type %s is not a domain"
+msgstr "typ %s nie jest domenÄ…"
+
+#: utils/adt/encode.c:55 utils/adt/encode.c:91
+#, c-format
+msgid "unrecognized encoding: \"%s\""
+msgstr "niezrozumiałe kodowanie: \"%s\""
+
+#: utils/adt/encode.c:150
+#, c-format
+msgid "invalid hexadecimal digit: \"%c\""
+msgstr "niepoprawna cyfra szesnastkowa: \"%c\""
+
+#: utils/adt/encode.c:178
+msgid "invalid hexadecimal data: odd number of digits"
+msgstr "niepoprawne dane szesnastkowe: nieparzysta liczba cyfr"
+
+#: utils/adt/encode.c:295
+msgid "unexpected \"=\""
+msgstr "nieoczekiwane \"=\""
+
+#: utils/adt/encode.c:307
+msgid "invalid symbol"
+msgstr "nieprawidłowy symbol"
+
+#: utils/adt/encode.c:327
+msgid "invalid end sequence"
+msgstr "niepoprawny koniec sekwencji"
+
+#: utils/adt/encode.c:441 utils/adt/encode.c:506 utils/adt/varlena.c:246
+#: utils/adt/varlena.c:287
+msgid "invalid input syntax for type bytea"
+msgstr "nieprawidłowa składnia wejścia dla typu bytea"
+
+#: utils/adt/enum.c:48 utils/adt/enum.c:58 utils/adt/enum.c:113
+#: utils/adt/enum.c:123
+#, c-format
+msgid "invalid input value for enum %s: \"%s\""
+msgstr "nieprawidłowa wartość wejścia dla enumeracji %s: \"%s\""
+
+#: utils/adt/enum.c:85 utils/adt/enum.c:148 utils/adt/enum.c:198
+#, c-format
+msgid "invalid internal value for enum: %u"
+msgstr "nieprawidłowa wartość wewnętrzna dla enumeracji: %u"
+
+#: utils/adt/enum.c:357 utils/adt/enum.c:386 utils/adt/enum.c:426
+#: utils/adt/enum.c:446
+msgid "could not determine actual enum type"
+msgstr "nie można określić bieżącego typu enumeracyjnego"
+
+#: utils/adt/enum.c:365 utils/adt/enum.c:394
+#, c-format
+msgid "enum %s contains no values"
+msgstr "enumeracja %s nie zawiera wartości"
+
+#: utils/adt/float.c:54
+msgid "value out of range: overflow"
+msgstr "wartość nie z zakresu: poza zakresem"
+
+#: utils/adt/float.c:59
+msgid "value out of range: underflow"
+msgstr "wartość nie z zakresu: przed zakresem"
+
+#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
+#, c-format
+msgid "invalid input syntax for type real: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla liczb rzeczywistych: \"%s\""
+
+#: utils/adt/float.c:242
+#, c-format
+msgid "\"%s\" is out of range for type real"
+msgstr "\"%s\" jest poza zakresem dla typu liczb rzeczywistych"
+
+#: utils/adt/float.c:399 utils/adt/float.c:440 utils/adt/float.c:491
+#: utils/adt/numeric.c:3969 utils/adt/numeric.c:3995
+#, c-format
+msgid "invalid input syntax for type double precision: \"%s\""
+msgstr ""
+"nieprawidłowa składnia wejścia dla typu liczb podwójnej precyzji: \"%s\""
+
+#: utils/adt/float.c:435
+#, c-format
+msgid "\"%s\" is out of range for type double precision"
+msgstr "\"%s\" jest poza zakresem dla typu liczb podwójnej precyzji"
+
+#: utils/adt/float.c:1119 utils/adt/float.c:1177 utils/adt/int.c:349
+#: utils/adt/int.c:789 utils/adt/int.c:818 utils/adt/int.c:839
+#: utils/adt/int.c:859 utils/adt/int.c:891 utils/adt/int.c:1157
+#: utils/adt/int8.c:1236 utils/adt/numeric.c:2354 utils/adt/numeric.c:2365
+msgid "smallint out of range"
+msgstr "poza zakresem smallint"
+
+#: utils/adt/float.c:1303 utils/adt/numeric.c:5183
+msgid "cannot take square root of a negative number"
+msgstr "nie można obliczyć pierwiastka kwadratowego z liczby ujemnej"
+
+#: utils/adt/float.c:1345 utils/adt/numeric.c:2166
+msgid "zero raised to a negative power is undefined"
+msgstr "zero podniesione do potęgi ujemnej jest niezdefiniowane"
+
+#: utils/adt/float.c:1349 utils/adt/numeric.c:2172
+msgid "a negative number raised to a non-integer power yields a complex result"
+msgstr ""
+"liczba ujemna podniesiona do potęgi niecałkowitej zwraca liczbę zespoloną"
+
+#: utils/adt/float.c:1415 utils/adt/float.c:1445 utils/adt/numeric.c:5401
+msgid "cannot take logarithm of zero"
+msgstr "nie można obliczyć logarytmu z zera"
+
+#: utils/adt/float.c:1419 utils/adt/float.c:1449 utils/adt/numeric.c:5405
+msgid "cannot take logarithm of a negative number"
+msgstr "nie można obliczyć logarytmu z liczby ujemnej"
+
+#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
+#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
+#: utils/adt/float.c:1604 utils/adt/float.c:1625
+msgid "input is out of range"
+msgstr "wejście jest poza zakresem"
+
+#: utils/adt/float.c:2687 utils/adt/numeric.c:1171
+msgid "count must be greater than zero"
+msgstr "ilość musi być większa niż zero"
+
+#: utils/adt/float.c:2692 utils/adt/numeric.c:1178
+msgid "operand, lower bound and upper bound cannot be NaN"
+msgstr "operand, dolna granica i górna granica nie może być NaN"
+
+#: utils/adt/float.c:2698
+msgid "lower and upper bounds must be finite"
+msgstr "dolna i górna granica nie musi być skończona"
+
+#: utils/adt/float.c:2736 utils/adt/numeric.c:1191
+msgid "lower bound cannot equal upper bound"
+msgstr "dolna granica nie może być równa górnej granicy"
+
+#: utils/adt/formatting.c:492
+msgid "invalid format specification for an interval value"
+msgstr "nieprawidłowe określenie formatu dla wartości interwału"
+
+#: utils/adt/formatting.c:493
+msgid "Intervals are not tied to specific calendar dates."
+msgstr "Interwały nie są związane z określonymi datami kalendarzowymi."
+
+#: utils/adt/formatting.c:1060
+msgid "\"EEEE\" must be the last pattern used"
+msgstr "\"EEEE\" musi być ostatnim użytym wzorcem"
+
+#: utils/adt/formatting.c:1068
+msgid "\"9\" must be ahead of \"PR\""
+msgstr "\"9\" musi być przed \"PR\""
+
+#: utils/adt/formatting.c:1084
+msgid "\"0\" must be ahead of \"PR\""
+msgstr "\"0\" musi być przed \"PR\""
+
+#: utils/adt/formatting.c:1110
+msgid "multiple decimal points"
+msgstr "wiele przecinków rozdzielających liczby całkowite i dziesiętne"
+
+#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+msgid "cannot use \"V\" and decimal point together"
+msgstr "nie można użyć \"V\" i przecinków rozdzielających część ułamkową razem"
+
+#: utils/adt/formatting.c:1126
+msgid "cannot use \"S\" twice"
+msgstr "nie można użyć \"S\" dwukrotnie"
+
+#: utils/adt/formatting.c:1130
+msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
+msgstr "nie można użyć \"S\" i \"PL\"/\"MI\"/\"SG\"/\"PR\" jednocześnie"
+
+#: utils/adt/formatting.c:1150
+msgid "cannot use \"S\" and \"MI\" together"
+msgstr "nie można użyć \"S\" i \"MI\" jednocześnie"
+
+#: utils/adt/formatting.c:1160
+msgid "cannot use \"S\" and \"PL\" together"
+msgstr "nie można użyć \"S\" i \"PL\" jednocześnie"
+
+#: utils/adt/formatting.c:1170
+msgid "cannot use \"S\" and \"SG\" together"
+msgstr "nie można użyć \"S\" i \"SG\" jednocześnie"
+
+#: utils/adt/formatting.c:1179
+msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
+msgstr "nie można użyć \"PR\" i \"S\"/\"PL\"/\"MI\"/\"SG\" jednocześnie"
+
+#: utils/adt/formatting.c:1205
+msgid "cannot use \"EEEE\" twice"
+msgstr "nie można użyć \"EEEE\" dwukrotnie"
+
+#: utils/adt/formatting.c:1211
+msgid "\"EEEE\" is incompatible with other formats"
+msgstr "\"EEEE\" jest niezgodne z innymi formatami"
+
+#: utils/adt/formatting.c:1212
+msgid ""
+"\"EEEE\" may only be used together with digit and decimal point patterns."
+msgstr ""
+"\"EEEE\" może być używane tylko razem z cyframi i wzorcem znaku "
+"oddzielającego część ułamkową."
+
+#: utils/adt/formatting.c:1412
+#, c-format
+msgid "\"%s\" is not a number"
+msgstr "\"%s\" nie jest liczbÄ…"
+
+#: utils/adt/formatting.c:1519 utils/adt/formatting.c:1569
+msgid "could not determine which collation to use for lower() function"
+msgstr "nie można określić, jakiego porównania użyć do funkcji lower()"
+
+#: utils/adt/formatting.c:1640 utils/adt/formatting.c:1690
+msgid "could not determine which collation to use for upper() function"
+msgstr "nie można określić, jakiego porównania użyć do funkcji upper()"
+
+#: utils/adt/formatting.c:1773 utils/adt/formatting.c:1835
+msgid "could not determine which collation to use for initcap() function"
+msgstr "nie można określić, jakiego porównania użyć do funkcji initcap()"
+
+#: utils/adt/formatting.c:2017
+msgid "invalid combination of date conventions"
+msgstr "nieprawidłowe połączenie konwencji daty"
+
+#: utils/adt/formatting.c:2018
+msgid ""
+"Do not mix Gregorian and ISO week date conventions in a formatting template."
+msgstr ""
+"Nie mieszaj konwencji dnia tygodnia gregoriańskiej i ISO w szablonie "
+"formatowania."
+
+#: utils/adt/formatting.c:2035
+#, c-format
+msgid "conflicting values for \"%s\" field in formatting string"
+msgstr "sprzeczne wartości dla pola \"%s\" s ciągu formatowania"
+
+#: utils/adt/formatting.c:2037
+msgid "This value contradicts a previous setting for the same field type."
+msgstr "Ta wartość przeczy poprzednim ustawieniom dla tego samego typu pola."
+
+#: utils/adt/formatting.c:2098
+#, c-format
+msgid "source string too short for \"%s\" formatting field"
+msgstr "źródłowy ciąg znaków jest zbyt krótki dla pola formatu \"%s\""
+
+#: utils/adt/formatting.c:2100
+#, c-format
+msgid "Field requires %d characters, but only %d remain."
+msgstr "Pole wymaga %d znaków, ale wprowadzono tylko %d."
+
+#: utils/adt/formatting.c:2103 utils/adt/formatting.c:2117
+msgid ""
+"If your source string is not fixed-width, try using the \"FM\" modifier."
+msgstr ""
+"Jeśli źródłowy ciąg znaków nie ma stałej długości, spróbuj użyć modyfikatora "
+"\"FM\"."
+
+#: utils/adt/formatting.c:2113 utils/adt/formatting.c:2126
+#: utils/adt/formatting.c:2256
+#, c-format
+msgid "invalid value \"%s\" for \"%s\""
+msgstr "nieprawidłowa wartość \"%s\" dla \"%s\""
+
+#: utils/adt/formatting.c:2115
+#, c-format
+msgid "Field requires %d characters, but only %d could be parsed."
+msgstr "Pole wymaga %d znaków, ale tylko %d może być sparsowane."
+
+#: utils/adt/formatting.c:2128
+msgid "Value must be an integer."
+msgstr "Wartość musi być liczbą całkowitą."
+
+#: utils/adt/formatting.c:2133
+#, c-format
+msgid "value for \"%s\" in source string is out of range"
+msgstr "wartość dla \"%s\" w źródłowym ciągu znaków jest poza zakresem"
+
+#: utils/adt/formatting.c:2135
+#, c-format
+msgid "Value must be in the range %d to %d."
+msgstr "Wartość musi być w zakresie %d do %d."
+
+#: utils/adt/formatting.c:2258
+msgid "The given value did not match any of the allowed values for this field."
+msgstr ""
+"Podana wartość nie pasuje do żadnej z dozwolonych wartości dla tego pola."
+
+#: utils/adt/formatting.c:2814
+msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
+msgstr "wzorce formatów \"TZ\"/\"tz\" nie są obsługiwane przez to_date"
+
+#: utils/adt/formatting.c:2918
+msgid "invalid input string for \"Y,YYY\""
+msgstr "nieprawidłowy wejściowy ciąg znaków dla \"Y,YYY\""
+
+#: utils/adt/formatting.c:3435
+#, c-format
+msgid "hour \"%d\" is invalid for the 12-hour clock"
+msgstr "godzina \"%d\" jest niepoprawna dla 12-godzinnego zegara"
+
+#: utils/adt/formatting.c:3437
+msgid "Use the 24-hour clock, or give an hour between 1 and 12."
+msgstr "Użyj 24-godzinnego zegara lub podaj godzinę pomiędzy 1 a 12."
+
+#: utils/adt/formatting.c:3475
+#, c-format
+msgid "inconsistent use of year %04d and \"BC\""
+msgstr "niespójne użycie roku %04d i \"BC\""
+
+#: utils/adt/formatting.c:3522
+msgid "cannot calculate day of year without year information"
+msgstr "nie można wyznaczyć dnia roku bez informacji o roku"
+
+#: utils/adt/formatting.c:4384
+msgid "\"EEEE\" not supported for input"
+msgstr "\"EEEE\" nie jest wspierane dla wejścia"
+
+#: utils/adt/formatting.c:4396
+msgid "\"RN\" not supported for input"
+msgstr "\"RN\" nie jest wspierane dla wejścia"
+
+#: utils/adt/genfile.c:60
+msgid "reference to parent directory (\"..\") not allowed"
+msgstr "wskazanie na folder nadrzędny (\"..\") niedozwolone"
+
+#: utils/adt/genfile.c:71
+msgid "absolute path not allowed"
+msgstr "ścieżka bezwzględna niedozwolona"
+
+#: utils/adt/genfile.c:76
+msgid "path must be in or below the current directory"
+msgstr "ścieżka musi wskazywać na lub poniżej bieżącego folderu"
+
+#: utils/adt/genfile.c:117 utils/adt/oracle_compat.c:184
+#: utils/adt/oracle_compat.c:282 utils/adt/oracle_compat.c:758
+#: utils/adt/oracle_compat.c:1048
+msgid "requested length too large"
+msgstr "żądana długość jest za duża"
+
+#: utils/adt/genfile.c:129
+#, c-format
+msgid "could not seek in file \"%s\": %m"
+msgstr "nie można pozycjonować w pliku \"%s\": %m"
+
+#: utils/adt/genfile.c:179 utils/adt/genfile.c:203 utils/adt/genfile.c:224
+#: utils/adt/genfile.c:248
+msgid "must be superuser to read files"
+msgstr "musisz być super użytkownikiem aby czytać pliki"
+
+#: utils/adt/genfile.c:186 utils/adt/genfile.c:231
+msgid "requested length cannot be negative"
+msgstr "żądana długość nie może być ujemna"
+
+#: utils/adt/genfile.c:272
+msgid "must be superuser to get file information"
+msgstr "musisz być superużytkownikiem by pobrać informacje o pliku"
+
+#: utils/adt/genfile.c:336
+msgid "must be superuser to get directory listings"
+msgstr "musisz być superużytkownikiem by pobrać listy katalogu"
+
+#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4251 utils/adt/geo_ops.c:5172
+msgid "too many points requested"
+msgstr "żądano zbyt wielu punktów"
+
+#: utils/adt/geo_ops.c:317
+msgid "could not format \"path\" value"
+msgstr "nie można sformatować wartości \"ścieżka\""
+
+#: utils/adt/geo_ops.c:392
+#, c-format
+msgid "invalid input syntax for type box: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu prostokąt: \"%s\""
+
+#: utils/adt/geo_ops.c:956
+#, c-format
+msgid "invalid input syntax for type line: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu linia: \"%s\""
+
+#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
+#: utils/adt/geo_ops.c:1057
+msgid "type \"line\" not yet implemented"
+msgstr "typ \"linia\" nie został jeszcze zaimplementowany"
+
+#: utils/adt/geo_ops.c:1411 utils/adt/geo_ops.c:1434
+#, c-format
+msgid "invalid input syntax for type path: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu ścieżka: \"%s\""
+
+#: utils/adt/geo_ops.c:1473
+msgid "invalid number of points in external \"path\" value"
+msgstr "niepoprawna liczba punktów w zewnętrznej wartości \"ścieżka\""
+
+#: utils/adt/geo_ops.c:1816
+#, c-format
+msgid "invalid input syntax for type point: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu punkt: \"%s\""
+
+#: utils/adt/geo_ops.c:2044
+#, c-format
+msgid "invalid input syntax for type lseg: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu lseg: \"%s\""
+
+#: utils/adt/geo_ops.c:2648
+msgid "function \"dist_lb\" not implemented"
+msgstr "funkcja \"dist_lb\" nie została jeszcze zaimplementowana"
+
+#: utils/adt/geo_ops.c:3161
+msgid "function \"close_lb\" not implemented"
+msgstr "funkcja \"close_lb\" nie została jeszcze zaimplementowana"
+
+#: utils/adt/geo_ops.c:3450
+msgid "cannot create bounding box for empty polygon"
+msgstr "nie można utworzyć otaczającego prostokąta dla pustego wielokąta"
+
+#: utils/adt/geo_ops.c:3474 utils/adt/geo_ops.c:3486
+#, c-format
+msgid "invalid input syntax for type polygon: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu wielokąt: \"%s\""
+
+#: utils/adt/geo_ops.c:3526
+msgid "invalid number of points in external \"polygon\" value"
+msgstr "niepoprawna liczba punktów w zewnętrznej wartości \"wielokąt\""
+
+#: utils/adt/geo_ops.c:4049
+msgid "function \"poly_distance\" not implemented"
+msgstr "funkcja \"poly_distance\" nie została jeszcze zaimplementowana"
+
+#: utils/adt/geo_ops.c:4363
+msgid "function \"path_center\" not implemented"
+msgstr "funkcja \"path_center\" nie została jeszcze zaimplementowana"
+
+#: utils/adt/geo_ops.c:4380
+msgid "open path cannot be converted to polygon"
+msgstr "otwarta ścieżka nie może być zmieniona w wielokąt"
+
+#: utils/adt/geo_ops.c:4549 utils/adt/geo_ops.c:4559 utils/adt/geo_ops.c:4574
+#: utils/adt/geo_ops.c:4580
+#, c-format
+msgid "invalid input syntax for type circle: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu okrąg: \"%s\""
+
+#: utils/adt/geo_ops.c:4602 utils/adt/geo_ops.c:4610
+msgid "could not format \"circle\" value"
+msgstr "nie można sformatować wartości \"okrąg\""
+
+#: utils/adt/geo_ops.c:4637
+msgid "invalid radius in external \"circle\" value"
+msgstr "niepoprawny status w zewnętrznej wartości \"okrąg\""
+
+#: utils/adt/geo_ops.c:5158
+msgid "cannot convert circle with radius zero to polygon"
+msgstr "nie można zmienić okręgu o promieniu zero w wielokąt"
+
+#: utils/adt/geo_ops.c:5163
+msgid "must request at least 2 points"
+msgstr "musi zwrócić co najmniej 2 punkty"
+
+#: utils/adt/geo_ops.c:5207 utils/adt/geo_ops.c:5230
+msgid "cannot convert empty polygon to circle"
+msgstr "nie można zmienić pustego wielokąta w okrąg"
+
+#: utils/adt/int.c:162
+msgid "int2vector has too many elements"
+msgstr "int2vector ma za dużo elementów"
+
+#: utils/adt/int.c:237
+msgid "invalid int2vector data"
+msgstr "niepoprawne dane int2vector"
+
+#: utils/adt/int.c:243 utils/adt/oid.c:212 utils/adt/oid.c:293
+msgid "oidvector has too many elements"
+msgstr "oidvector ma za dużo elementów"
+
+#: utils/adt/int.c:1345 utils/adt/int8.c:1373 utils/adt/timestamp.c:4712
+#: utils/adt/timestamp.c:4793
+msgid "step size cannot equal zero"
+msgstr "rozmiar kroku nie może być równy zero"
+
+#: utils/adt/int8.c:98 utils/adt/int8.c:133 utils/adt/numutils.c:51
+#: utils/adt/numutils.c:61 utils/adt/numutils.c:103
+#, c-format
+msgid "invalid input syntax for integer: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla integer: \"%s\""
+
+#: utils/adt/int8.c:114
+#, c-format
+msgid "value \"%s\" is out of range for type bigint"
+msgstr "wartość \"%s\" jest poza zakresem dla typu bigint"
+
+#: utils/adt/int8.c:500 utils/adt/int8.c:529 utils/adt/int8.c:550
+#: utils/adt/int8.c:580 utils/adt/int8.c:612 utils/adt/int8.c:630
+#: utils/adt/int8.c:679 utils/adt/int8.c:696 utils/adt/int8.c:765
+#: utils/adt/int8.c:786 utils/adt/int8.c:813 utils/adt/int8.c:844
+#: utils/adt/int8.c:865 utils/adt/int8.c:886 utils/adt/int8.c:913
+#: utils/adt/int8.c:953 utils/adt/int8.c:974 utils/adt/int8.c:1001
+#: utils/adt/int8.c:1032 utils/adt/int8.c:1053 utils/adt/int8.c:1074
+#: utils/adt/int8.c:1101 utils/adt/int8.c:1274 utils/adt/int8.c:1313
+#: utils/adt/numeric.c:2306 utils/adt/varbit.c:1583
+msgid "bigint out of range"
+msgstr "bigint poza zakresem"
+
+#: utils/adt/int8.c:1330
+msgid "OID out of range"
+msgstr "OID poza zakresem"
+
+#: utils/adt/like.c:211 utils/adt/selfuncs.c:4911
+msgid "could not determine which collation to use for ILIKE"
+msgstr "nie można określić jakiego porównania użyć do ILIKE"
+
+#: utils/adt/like_match.c:104 utils/adt/like_match.c:164
+msgid "LIKE pattern must not end with escape character"
+msgstr "wzorzec LIKE nie może kończyć się znakiem ucieczki"
+
+#: utils/adt/like_match.c:289 utils/adt/regexp.c:684
+msgid "invalid escape string"
+msgstr "niepoprawny ciąg znaków ucieczki"
+
+#: utils/adt/like_match.c:290 utils/adt/regexp.c:685
+msgid "Escape string must be empty or one character."
+msgstr "Ciąg znaków ucieczki musi być pusty lub jednoznakowy."
+
+#: utils/adt/mac.c:65
+#, c-format
+msgid "invalid input syntax for type macaddr: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu macaddr: \"%s\""
+
+#: utils/adt/mac.c:72
+#, c-format
+msgid "invalid octet value in \"macaddr\" value: \"%s\""
+msgstr "nieprawidłowa wartość oktetu w wartości \"macaddr\": \"%s\""
+
+#: utils/adt/misc.c:80
+msgid "must be superuser to signal other server processes"
+msgstr "musisz być superużytkownikiem by sygnalizować inne procesy serwera"
+
+#: utils/adt/misc.c:89
+#, c-format
+msgid "PID %d is not a PostgreSQL server process"
+msgstr "PID %d nie jest procesem serwera PostgreSQL"
+
+#: utils/adt/misc.c:126
+msgid "must be superuser to signal the postmaster"
+msgstr "musisz być superużytkownikiem by sygnalizować postmaster"
+
+#: utils/adt/misc.c:131
+#, c-format
+msgid "failed to send signal to postmaster: %m"
+msgstr "nie powiodło się wysyłanie sygnału do postmastera: %m"
+
+#: utils/adt/misc.c:148
+msgid "must be superuser to rotate log files"
+msgstr "musisz być super użytkownikiem aby obrócić pliki dziennika"
+
+#: utils/adt/misc.c:153
+msgid "rotation not possible because log collection not active"
+msgstr "obrót jest niemożliwy ponieważ zbieranie logów nie jest aktywne"
+
+#: utils/adt/misc.c:195
+msgid "global tablespace never has databases"
+msgstr "globalna przestrzeń danych nie zawiera nigdy baz danych"
+
+#: utils/adt/misc.c:216
+#, c-format
+msgid "%u is not a tablespace OID"
+msgstr "%u nie jest OID przestrzeni danych"
+
+#: utils/adt/misc.c:352
+msgid "unreserved"
+msgstr "niezarezerwowany"
+
+#: utils/adt/misc.c:356
+msgid "unreserved (cannot be function or type name)"
+msgstr "niezarezerwowany (nie może być nazwą funkcji ani typu)"
+
+#: utils/adt/misc.c:360
+msgid "reserved (can be function or type name)"
+msgstr "zarezerwowany (może być nazwą funkcji ani typu)"
+
+#: utils/adt/misc.c:364
+msgid "reserved"
+msgstr "zarezerwowany"
+
+#: utils/adt/nabstime.c:160
+#, c-format
+msgid "invalid time zone name: \"%s\""
+msgstr "nieprawidłowa nazwa strefy czasowej: \"%s\""
+
+#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
+msgid "cannot convert abstime \"invalid\" to timestamp"
+msgstr "nie można przekształcić abstime \"invalid\" do znacznika czasu"
+
+#: utils/adt/nabstime.c:806
+msgid "invalid status in external \"tinterval\" value"
+msgstr "niepoprawny status w zewnętrznej wartości \"tinterval\""
+
+#: utils/adt/nabstime.c:880
+msgid "cannot convert reltime \"invalid\" to interval"
+msgstr "nie można przekształcić reltime \"invalid\" do interwału"
+
+#: utils/adt/nabstime.c:1575
+#, c-format
+msgid "invalid input syntax for type tinterval: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu tinterval: \"%s\""
+
+#: utils/adt/network.c:118
+#, c-format
+msgid "invalid cidr value: \"%s\""
+msgstr "niepoprawna wartość cdir: \"%s\""
+
+#: utils/adt/network.c:119 utils/adt/network.c:249
+msgid "Value has bits set to right of mask."
+msgstr "Wartość ma bity ustawione do prawej strony maski."
+
+#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
+#: utils/adt/network.c:664
+#, c-format
+msgid "could not format inet value: %m"
+msgstr "nie można sformatować wartości inet: %m"
+
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:217
+#, c-format
+msgid "invalid address family in external \"%s\" value"
+msgstr "nieprawidłowa rodzina adresów w zewnętrznej wartości \"%s\""
+
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:224
+#, c-format
+msgid "invalid bits in external \"%s\" value"
+msgstr "niepoprawny status w zewnętrznej wartości \"%s\""
+
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:233
+#, c-format
+msgid "invalid length in external \"%s\" value"
+msgstr "niepoprawne bity w zewnętrznej wartości \"%s\""
+
+#: utils/adt/network.c:248
+msgid "invalid external \"cidr\" value"
+msgstr "niepoprawna wartość zewnętrzna \"cdir\""
+
+#: utils/adt/network.c:370 utils/adt/network.c:397
+#, c-format
+msgid "invalid mask length: %d"
+msgstr "niepoprawna długość maski: %d"
+
+#: utils/adt/network.c:682
+#, c-format
+msgid "could not format cidr value: %m"
+msgstr "nie można sformatować wartości cidr: %m"
+
+#: utils/adt/network.c:1255
+msgid "cannot AND inet values of different sizes"
+msgstr "nie można zastosować AND do wartości inet o różnych rozmiarach"
+
+#: utils/adt/network.c:1287
+msgid "cannot OR inet values of different sizes"
+msgstr "nie można zastosować OR do wartości inet o różnych rozmiarach"
+
+#: utils/adt/network.c:1348 utils/adt/network.c:1424
+msgid "result is out of range"
+msgstr "wynik jest poza zakresem"
+
+#: utils/adt/network.c:1389
+msgid "cannot subtract inet values of different sizes"
+msgstr "nie można odejmować wartości inet o różnych rozmiarach"
+
+#: utils/adt/numeric.c:473 utils/adt/numeric.c:500 utils/adt/numeric.c:3275
+#: utils/adt/numeric.c:3298 utils/adt/numeric.c:3322 utils/adt/numeric.c:3329
+#, c-format
+msgid "invalid input syntax for type numeric: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu numerycznego: \"%s\""
+
+#: utils/adt/numeric.c:653
+msgid "invalid length in external \"numeric\" value"
+msgstr "niepoprawna długość w zewnętrznej wartości \"numeric\""
+
+#: utils/adt/numeric.c:664
+msgid "invalid sign in external \"numeric\" value"
+msgstr "niepoprawny znak w zewnętrznej wartości \"numeric\""
+
+#: utils/adt/numeric.c:674
+msgid "invalid digit in external \"numeric\" value"
+msgstr "niepoprawna cyfra w zewnętrznej wartości \"numeric\""
+
+#: utils/adt/numeric.c:814 utils/adt/numeric.c:828
+#, c-format
+msgid "NUMERIC precision %d must be between 1 and %d"
+msgstr "precyzja NUMERIC %d musi być pomiędzy 1 a %d"
+
+#: utils/adt/numeric.c:819
+#, c-format
+msgid "NUMERIC scale %d must be between 0 and precision %d"
+msgstr "skala NUMERIC %d musi być pomiędzy 0 a precyzją %d"
+
+#: utils/adt/numeric.c:837
+msgid "invalid NUMERIC type modifier"
+msgstr "nieprawidłowy modyfikator typu NUMERIC"
+
+#: utils/adt/numeric.c:1881 utils/adt/numeric.c:3754
+msgid "value overflows numeric format"
+msgstr "wartość przekracza format numeryczny"
+
+#: utils/adt/numeric.c:2229
+msgid "cannot convert NaN to integer"
+msgstr "nie można przekształcić NaN do integer"
+
+#: utils/adt/numeric.c:2297
+msgid "cannot convert NaN to bigint"
+msgstr "nie można przekształcić NaN do bigint"
+
+#: utils/adt/numeric.c:2345
+msgid "cannot convert NaN to smallint"
+msgstr "nie można przekształcić NaN do smallint"
+
+#: utils/adt/numeric.c:3824
+msgid "numeric field overflow"
+msgstr "przepełnienie pola liczbowego"
+
+#: utils/adt/numeric.c:3825
+#, c-format
+msgid ""
+"A field with precision %d, scale %d must round to an absolute value less "
+"than %s%d."
+msgstr ""
+"Pole z precyzją %d, skalą %d można zaokrąglić do wartości bezwzględnej mniej "
+"niż %s%d."
+
+#: utils/adt/numeric.c:5273
+msgid "argument for function \"exp\" too big"
+msgstr "argument dla funkcji \"exp\" zbyt duży"
+
+#: utils/adt/numutils.c:75
+#, c-format
+msgid "value \"%s\" is out of range for type integer"
+msgstr "wartość \"%s\" jest poza zakresem dla typu integer"
+
+#: utils/adt/numutils.c:81
+#, c-format
+msgid "value \"%s\" is out of range for type smallint"
+msgstr "wartość \"%s\" jest poza zakresem dla typu smallint"
+
+#: utils/adt/numutils.c:87
+#, c-format
+msgid "value \"%s\" is out of range for 8-bit integer"
+msgstr "wartość \"%s\" jest poza zakresem dla typu 8 bitowy integer"
+
+#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
+#, c-format
+msgid "invalid input syntax for type oid: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu oid: \"%s\""
+
+#: utils/adt/oid.c:69 utils/adt/oid.c:107
+#, c-format
+msgid "value \"%s\" is out of range for type oid"
+msgstr "wartość \"%s\" jest poza zakresem dla typu oid"
+
+#: utils/adt/oid.c:287
+msgid "invalid oidvector data"
+msgstr "niepoprawne dane oidvector"
+
+#: utils/adt/oracle_compat.c:895
+msgid "requested character too large"
+msgstr "żądany znak jest za duży"
+
+#: utils/adt/oracle_compat.c:941 utils/adt/oracle_compat.c:995
+#, c-format
+msgid "requested character too large for encoding: %d"
+msgstr "żądany znak jest zbyt długi dla kodowania: %d"
+
+#: utils/adt/oracle_compat.c:988
+msgid "null character not permitted"
+msgstr "pusty znak niedozwolony"
+
+#: utils/adt/pg_locale.c:953
+#, c-format
+msgid "could not create locale \"%s\": %m"
+msgstr "nie można utworzyć lokalizacji \"%s\": %m"
+
+#: utils/adt/pg_locale.c:956
+#, c-format
+msgid ""
+"The operating system could not find any locale data for the locale name \"%s"
+"\"."
+msgstr ""
+"System operacyjny nie mógł odnaleźć danych lokalizacji dla nazwy lokalizacji "
+"\"%s\"."
+
+#: utils/adt/pg_locale.c:1043
+msgid ""
+"collations with different collate and ctype values are not supported on this "
+"platform"
+msgstr ""
+"porównania z różnymi wartościami collate i ctype nie są obsługiwane na tej "
+"platformie"
+
+#: utils/adt/pg_locale.c:1058
+msgid "nondefault collations are not supported on this platform"
+msgstr "niedomyślne porównania nie są obsługiwane na tej platformie"
+
+#: utils/adt/pg_locale.c:1229
+msgid "invalid multibyte character for locale"
+msgstr "niepoprawny wielobajtowy znak dla lokalizacji"
+
+#: utils/adt/pg_locale.c:1230
+msgid ""
+"The server's LC_CTYPE locale is probably incompatible with the database "
+"encoding."
+msgstr ""
+"LC_CTYPE lokalizacji serwera jest prawdopodobnie niekompatybilne z "
+"kodowaniem bazy danych."
+
+#: utils/adt/pseudotypes.c:94
+msgid "cannot accept a value of type any"
+msgstr "nie można przyjąć wartości typu any"
+
+#: utils/adt/pseudotypes.c:107
+msgid "cannot display a value of type any"
+msgstr "nie można wyświetlić wartości typu any"
+
+#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
+msgid "cannot accept a value of type anyarray"
+msgstr "nie można przyjąć wartości typu anyarray"
+
+#: utils/adt/pseudotypes.c:174
+msgid "cannot accept a value of type anyenum"
+msgstr "nie można przyjąć wartości typu anyenum"
+
+#: utils/adt/pseudotypes.c:252
+msgid "cannot accept a value of type trigger"
+msgstr "nie można przyjąć wartości typu trigger"
+
+#: utils/adt/pseudotypes.c:265
+msgid "cannot display a value of type trigger"
+msgstr "nie można wyświetlić wartości typu trigger"
+
+#: utils/adt/pseudotypes.c:279
+msgid "cannot accept a value of type language_handler"
+msgstr "nie można przyjąć wartości typu language_handler"
+
+#: utils/adt/pseudotypes.c:292
+msgid "cannot display a value of type language_handler"
+msgstr "nie można wyświetlić wartości typu language_handler"
+
+#: utils/adt/pseudotypes.c:306
+msgid "cannot accept a value of type fdw_handler"
+msgstr "nie można przyjąć wartości typu fdw_handler"
+
+#: utils/adt/pseudotypes.c:319
+msgid "cannot display a value of type fdw_handler"
+msgstr "nie można wyświetlić wartości typu fdw_handler"
+
+#: utils/adt/pseudotypes.c:333
+msgid "cannot accept a value of type internal"
+msgstr "nie można przyjąć wartości typu internal"
+
+#: utils/adt/pseudotypes.c:346
+msgid "cannot display a value of type internal"
+msgstr "nie można wyświetlić wartości typu internal"
+
+#: utils/adt/pseudotypes.c:360
+msgid "cannot accept a value of type opaque"
+msgstr "nie można przyjąć wartości typu opaque"
+
+#: utils/adt/pseudotypes.c:373
+msgid "cannot display a value of type opaque"
+msgstr "nie można wyświetlić wartości typu opaque"
+
+#: utils/adt/pseudotypes.c:387
+msgid "cannot accept a value of type anyelement"
+msgstr "nie można przyjąć wartości typu anyelement"
+
+#: utils/adt/pseudotypes.c:400
+msgid "cannot display a value of type anyelement"
+msgstr "nie można wyświetlić wartości typu anyelement"
+
+#: utils/adt/pseudotypes.c:413
+msgid "cannot accept a value of type anynonarray"
+msgstr "nie można przyjąć wartości typu anynonarray"
+
+#: utils/adt/pseudotypes.c:426
+msgid "cannot display a value of type anynonarray"
+msgstr "nie można wyświetlić wartości typu anynonarray"
+
+#: utils/adt/pseudotypes.c:439
+msgid "cannot accept a value of a shell type"
+msgstr "nie można przyjąć wartości typu powłoki"
+
+#: utils/adt/pseudotypes.c:452
+msgid "cannot display a value of a shell type"
+msgstr "nie można wyświetlić wartości typu powłoki"
+
+#: utils/adt/pseudotypes.c:474 utils/adt/pseudotypes.c:498
+msgid "cannot accept a value of type pg_node_tree"
+msgstr "nie można przyjąć wartości typu pg_node_tree"
+
+#: utils/adt/regexp.c:275 utils/adt/varlena.c:2866
+#, c-format
+msgid "regular expression failed: %s"
+msgstr "nie udało się wyrażenie regularne: %s"
+
+#: utils/adt/regexp.c:412
+#, c-format
+msgid "invalid regexp option: \"%c\""
+msgstr "niepoprawna opcja regexp: \"%c\""
+
+#: utils/adt/regexp.c:884
+msgid "regexp_split does not support the global option"
+msgstr "regexp_split nie obsługuje opcji globalnej"
+
+#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
+#, c-format
+msgid "more than one function named \"%s\""
+msgstr "więcej niż jedna funkcja o nazwie \"%s\""
+
+#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
+#, c-format
+msgid "more than one operator named %s"
+msgstr "więcej niż jeden operator o nazwie %s"
+
+#: utils/adt/regproc.c:635 utils/adt/regproc.c:1485 utils/adt/ruleutils.c:5858
+#: utils/adt/ruleutils.c:5913 utils/adt/ruleutils.c:5950
+msgid "too many arguments"
+msgstr "zbyt wiele argumentów"
+
+#: utils/adt/regproc.c:636
+msgid "Provide two argument types for operator."
+msgstr "Podaj dwa typy argumentów dla operatora."
+
+#: utils/adt/regproc.c:1320 utils/adt/regproc.c:1325 utils/adt/varlena.c:2251
+#: utils/adt/varlena.c:2256
+msgid "invalid name syntax"
+msgstr "niepoprawna składnia nazwy"
+
+#: utils/adt/regproc.c:1383
+msgid "expected a left parenthesis"
+msgstr "oczekiwano lewego nawiasu"
+
+#: utils/adt/regproc.c:1399
+msgid "expected a right parenthesis"
+msgstr "oczekiwano prawego nawiasu"
+
+#: utils/adt/regproc.c:1418
+msgid "expected a type name"
+msgstr "oczekiwano nazwy typu"
+
+#: utils/adt/regproc.c:1450
+msgid "improper type name"
+msgstr "niepoprawna nazwa typu"
+
+#: utils/adt/ri_triggers.c:409 utils/adt/ri_triggers.c:2841
+#: utils/adt/ri_triggers.c:3535 utils/adt/ri_triggers.c:3567
+#, c-format
+msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
+msgstr "wstawianie lub modyfikacja na tabeli \"%s\" narusza klucz obcy \"%s\""
+
+#: utils/adt/ri_triggers.c:412 utils/adt/ri_triggers.c:2844
+msgid "MATCH FULL does not allow mixing of null and nonnull key values."
+msgstr ""
+"MATCH FULL nie zezwala na mieszanie pustych i niepustych wartości klucza."
+
+#: utils/adt/ri_triggers.c:3097
+#, c-format
+msgid "function \"%s\" must be fired for INSERT"
+msgstr "funkcja \"%s\" musi być odpalona dla INSERT"
+
+#: utils/adt/ri_triggers.c:3103
+#, c-format
+msgid "function \"%s\" must be fired for UPDATE"
+msgstr "funkcja \"%s\" musi być odpalona dla UPDATE"
+
+#: utils/adt/ri_triggers.c:3117
+#, c-format
+msgid "function \"%s\" must be fired for DELETE"
+msgstr "funkcja \"%s\" musi być odpalona dla DELETE"
+
+#: utils/adt/ri_triggers.c:3146
+#, c-format
+msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
+msgstr "brak pozycji pg_constraint dla wyzwalacza \"%s\" dla tabeli \"%s\""
+
+#: utils/adt/ri_triggers.c:3148
+msgid ""
+"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
+"ADD CONSTRAINT."
+msgstr ""
+"Usuń wyzwalacz więzów integralności i związane z nim elementy, a następnie "
+"wykonaj ALTER TABLE ADD CONSTRAINT."
+
+#: utils/adt/ri_triggers.c:3502
+#, c-format
+msgid ""
+"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
+"unexpected result"
+msgstr ""
+"zapytanie więzów integralności na \"%s\" z ograniczenia \"%s\" na \"%s\" "
+"zwróciła nieoczekiwany wynik"
+
+#: utils/adt/ri_triggers.c:3506
+msgid "This is most likely due to a rule having rewritten the query."
+msgstr "Wynika to najprawdopodobniej z przepisania zapytania w regule."
+
+#: utils/adt/ri_triggers.c:3537
+#, c-format
+msgid "No rows were found in \"%s\"."
+msgstr "Nie odnaleziono wierszy w \"%s\"."
+
+#: utils/adt/ri_triggers.c:3569
+#, c-format
+msgid "Key (%s)=(%s) is not present in table \"%s\"."
+msgstr "Klucz (%s)=(%s) nie występuje w tabeli \"%s\"."
+
+#: utils/adt/ri_triggers.c:3575
+#, c-format
+msgid ""
+"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
+"table \"%s\""
+msgstr ""
+"modyfikacja lub usunięcie na tabeli \"%s\" narusza klucz obcy \"%s\" tabeli "
+"\"%s\""
+
+#: utils/adt/ri_triggers.c:3578
+#, c-format
+msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
+msgstr "Klucz (%s)=(%s) ma wciąż odwołanie w tabeli \"%s\"."
+
+#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
+msgid "input of anonymous composite types is not implemented"
+msgstr "wejście dla anonimowych typów złożonych nie jest realizowane"
+
+#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
+#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
+#, c-format
+msgid "malformed record literal: \"%s\""
+msgstr "nieprawidłowy literał rekordu: \"%s\""
+
+#: utils/adt/rowtypes.c:152
+msgid "Missing left parenthesis."
+msgstr "Brak lewego nawiasu."
+
+#: utils/adt/rowtypes.c:180
+msgid "Too few columns."
+msgstr "Zbyt mało kolumn."
+
+#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
+msgid "Unexpected end of input."
+msgstr "Niespodziewany koniec wejścia."
+
+#: utils/adt/rowtypes.c:263
+msgid "Too many columns."
+msgstr "Zbyt dużo kolumn."
+
+#: utils/adt/rowtypes.c:271
+msgid "Junk after right parenthesis."
+msgstr "Åšmieci za prawym nawiasem."
+
+#: utils/adt/rowtypes.c:522
+#, c-format
+msgid "wrong number of columns: %d, expected %d"
+msgstr "niepoprawna liczba kolumn: %d, oczekiwano %d"
+
+#: utils/adt/rowtypes.c:549
+#, c-format
+msgid "wrong data type: %u, expected %u"
+msgstr "niepoprawny typ danych: %u, oczekiwano %u"
+
+#: utils/adt/rowtypes.c:610
+#, c-format
+msgid "improper binary format in record column %d"
+msgstr "niewłaściwy format binarny w polu %d rekordu"
+
+#: utils/adt/rowtypes.c:897 utils/adt/rowtypes.c:1132
+#, c-format
+msgid "cannot compare dissimilar column types %s and %s at record column %d"
+msgstr ""
+"nie można porównywać niepodobnych typów kolumn %s i %s w kolumnie rekordu %d"
+
+#: utils/adt/rowtypes.c:983 utils/adt/rowtypes.c:1203
+#, fuzzy
+msgid "cannot compare record types with different numbers of columns"
+msgstr "nie można porównywać typów złożonych z różną liczbą kolumn"
+
+#: utils/adt/ruleutils.c:2429
+#, c-format
+msgid "rule \"%s\" has unsupported event type %d"
+msgstr "reguła \"%s\" ma nieobsługiwany typ zdarzenia %d"
+
+#: utils/adt/selfuncs.c:4896 utils/adt/selfuncs.c:5350
+msgid "case insensitive matching not supported on type bytea"
+msgstr ""
+"dopasowanie niezależne od wielkości liter nieobsługiwane dla typu bytea"
+
+#: utils/adt/selfuncs.c:5011 utils/adt/selfuncs.c:5510
+msgid "regular-expression matching not supported on type bytea"
+msgstr "dopasowanie wyrażeniami regularnymi nieobsługiwane dla typu bytea"
+
+#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
+#, c-format
+msgid "invalid input syntax for type tid: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla typu tid: \"%s\""
+
+#: utils/adt/timestamp.c:97
+#, c-format
+msgid "TIMESTAMP(%d)%s precision must not be negative"
+msgstr "precyzja TIMESTAMP(%d)%s nie może być ujemna"
+
+#: utils/adt/timestamp.c:103
+#, c-format
+msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
+msgstr "precyzja TIMESTAMP(%d)%s zredukowana do maksymalnej dopuszczalnej, %d"
+
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
+#, c-format
+msgid "timestamp out of range: \"%s\""
+msgstr "znacznik czasu poza zakresem: \"%s\""
+
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
+#: utils/adt/timestamp.c:664
+#, c-format
+msgid "date/time value \"%s\" is no longer supported"
+msgstr "wartość data/czas \"%s\" nie jest już obsługiwana"
+
+#: utils/adt/timestamp.c:260
+msgid "timestamp cannot be NaN"
+msgstr "znacznik czasu nie może być NaN"
+
+#: utils/adt/timestamp.c:370
+#, c-format
+msgid "timestamp(%d) precision must be between %d and %d"
+msgstr "precyzja timestamp(%d) musi być pomiędzy %d i %d"
+
+#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
+#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
+msgid "interval out of range"
+msgstr "interwał poza zakresem"
+
+#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
+msgid "invalid INTERVAL type modifier"
+msgstr "nieprawidłowy modyfikator typu INTERVAL"
+
+#: utils/adt/timestamp.c:803
+#, c-format
+msgid "INTERVAL(%d) precision must not be negative"
+msgstr "precyzja INTERVAL(%d) nie może być ujemna"
+
+#: utils/adt/timestamp.c:809
+#, c-format
+msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
+msgstr "precyzja INTERVAL(%d) zredukowana do maksymalnej dopuszczalnej, %d"
+
+#: utils/adt/timestamp.c:1101
+#, c-format
+msgid "interval(%d) precision must be between %d and %d"
+msgstr "precyzja interval(%d) musi być pomiędzy %d i %d"
+
+#: utils/adt/timestamp.c:2306
+msgid "cannot subtract infinite timestamps"
+msgstr "nie można odejmować nieskończonych znaczników czasu"
+
+#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
+#: utils/adt/timestamp.c:4020
+#, c-format
+msgid "timestamp units \"%s\" not supported"
+msgstr "jednostki \"%s\" znacznika czasu nie są obsługiwane"
+
+#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
+#, c-format
+msgid "timestamp units \"%s\" not recognized"
+msgstr "jednostki \"%s\" znacznika czasu nierozpoznane"
+
+#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
+#: utils/adt/timestamp.c:4233
+#, c-format
+msgid "timestamp with time zone units \"%s\" not supported"
+msgstr "jednostki \"%s\" znacznika czasu ze strefą czasową nie są obsługiwane"
+
+#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
+#, c-format
+msgid "timestamp with time zone units \"%s\" not recognized"
+msgstr "jednostki \"%s\" znacznika czasu ze strefÄ… czasowÄ… nierozpoznane"
+
+#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
+#, c-format
+msgid "interval units \"%s\" not supported"
+msgstr "jednostki \"%s\" interwału nie są obsługiwane"
+
+#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
+#, c-format
+msgid "interval units \"%s\" not recognized"
+msgstr "jednostki \"%s\" interwału nierozpoznane"
+
+#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
+#, c-format
+msgid "could not convert to time zone \"%s\""
+msgstr "nie można przekształcić do strefy czasowej \"%s\""
+
+#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
+#, c-format
+msgid "interval time zone \"%s\" must not specify month"
+msgstr "interwał strefy czasowej \"%s\" nie może określać miesiąca"
+
+#: utils/adt/trigfuncs.c:41
+msgid "suppress_redundant_updates_trigger: must be called as trigger"
+msgstr "suppress_redundant_updates_trigger: musi być wywoływany jako wyzwalacz"
+
+#: utils/adt/trigfuncs.c:47
+msgid "suppress_redundant_updates_trigger: must be called on update"
+msgstr ""
+"suppress_redundant_updates_trigger: musi być wywoływany podczas modyfikacji"
+
+#: utils/adt/trigfuncs.c:53
+msgid "suppress_redundant_updates_trigger: must be called before update"
+msgstr ""
+"suppress_redundant_updates_trigger: musi być wywoływany przed modyfikacją"
+
+#: utils/adt/trigfuncs.c:59
+msgid "suppress_redundant_updates_trigger: must be called for each row"
+msgstr ""
+"suppress_redundant_updates_trigger: musi być wywoływany dla każdego wiersza"
+
+#: utils/adt/tsgistidx.c:100
+msgid "gtsvector_in not implemented"
+msgstr "gtsvector_in niezaimplementowane"
+
+#: utils/adt/tsquery.c:156 utils/adt/tsquery.c:392
+#: utils/adt/tsvector_parser.c:136
+#, c-format
+msgid "syntax error in tsquery: \"%s\""
+msgstr "błąd składni w tsquery: \"%s\""
+
+#: utils/adt/tsquery.c:177
+#, c-format
+msgid "no operand in tsquery: \"%s\""
+msgstr "brak argumentów w tsquery: \"%s\""
+
+#: utils/adt/tsquery.c:250
+#, c-format
+msgid "value is too big in tsquery: \"%s\""
+msgstr "zbyt duża wartość w tsquery: \"%s\""
+
+#: utils/adt/tsquery.c:255
+#, c-format
+msgid "operand is too long in tsquery: \"%s\""
+msgstr "zbyt długa wartość w tsquery: \"%s\""
+
+#: utils/adt/tsquery.c:283
+#, c-format
+msgid "word is too long in tsquery: \"%s\""
+msgstr "słowo jest zbyt długie w tsquery: \"%s\""
+
+#: utils/adt/tsquery.c:512
+#, c-format
+msgid "text-search query doesn't contain lexemes: \"%s\""
+msgstr "zapytanie wyszukiwania tekstowego nie zawiera leksemów: \"%s\""
+
+#: utils/adt/tsquery_cleanup.c:285
+msgid ""
+"text-search query contains only stop words or doesn't contain lexemes, "
+"ignored"
+msgstr ""
+"zapytanie wyszukiwania tekstowego zawiera tylko słowa pomijane lub nie "
+"zawiera leksemów, pominięto"
+
+#: utils/adt/tsquery_rewrite.c:296
+msgid "ts_rewrite query must return two tsquery columns"
+msgstr "zapytanie ts_rewrite musi zwrócić dwie kolumny tsquery"
+
+#: utils/adt/tsrank.c:404
+msgid "array of weight must be one-dimensional"
+msgstr "tablica wag musi być jednowymiarowa"
+
+#: utils/adt/tsrank.c:409
+msgid "array of weight is too short"
+msgstr "tablica wag jest za krótka"
+
+#: utils/adt/tsrank.c:414
+msgid "array of weight must not contain nulls"
+msgstr "tablica wag nie może zawierać nulli"
+
+#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
+msgid "weight out of range"
+msgstr "waga poza zakresem"
+
+#: utils/adt/tsvector.c:215
+#, c-format
+msgid "word is too long (%ld bytes, max %ld bytes)"
+msgstr "słowo jest za długie (%ld bajtów, maksymalnie %ld bajtów)"
+
+#: utils/adt/tsvector.c:222
+#, c-format
+msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
+msgstr ""
+"ciąg znaków jest za długi dla tsvector (%ld bajtów, maksymalnie %ld bajtów)"
+
+#: utils/adt/tsvector_op.c:1173
+msgid "ts_stat query must return one tsvector column"
+msgstr "zapytanie ts_stat musi zwrócić jedną kolumnę tsvector"
+
+#: utils/adt/tsvector_op.c:1353
+#, c-format
+msgid "tsvector column \"%s\" does not exist"
+msgstr "kolumna tsvector \"%s\" nie istnieje"
+
+#: utils/adt/tsvector_op.c:1359
+#, c-format
+msgid "column \"%s\" is not of tsvector type"
+msgstr "kolumna \"%s\" nie jest typu tsvector"
+
+#: utils/adt/tsvector_op.c:1371
+#, c-format
+msgid "configuration column \"%s\" does not exist"
+msgstr "kolumna konfiguracji \"%s\" nie istnieje"
+
+#: utils/adt/tsvector_op.c:1377
+#, c-format
+msgid "column \"%s\" is not of regconfig type"
+msgstr "kolumna \"%s\" nie jest typu regconfig"
+
+#: utils/adt/tsvector_op.c:1384
+#, c-format
+msgid "configuration column \"%s\" must not be null"
+msgstr "kolumna konfiguracji \"%s\" nie może być pusta"
+
+#: utils/adt/tsvector_op.c:1397
+#, c-format
+msgid "text search configuration name \"%s\" must be schema-qualified"
+msgstr ""
+"nazwa konfiguracji wyszukiwania tekstowego \"%s\" musi być kwalifikowana "
+"według schematu"
+
+#: utils/adt/tsvector_op.c:1422
+#, c-format
+msgid "column \"%s\" is not of a character type"
+msgstr "kolumna \"%s\" nie jest typu znakowego"
+
+#: utils/adt/tsvector_parser.c:137
+#, c-format
+msgid "syntax error in tsvector: \"%s\""
+msgstr "błąd składni w tsvector: \"%s\""
+
+#: utils/adt/tsvector_parser.c:202
+#, c-format
+msgid "there is no escaped character: \"%s\""
+msgstr "nie ma znaków z ucieczką: \"%s\""
+
+#: utils/adt/tsvector_parser.c:319
+#, c-format
+msgid "wrong position info in tsvector: \"%s\""
+msgstr "niepoprawna pozycja w tsvector: \"%s\""
+
+#: utils/adt/uuid.c:128
+#, c-format
+msgid "invalid input syntax for uuid: \"%s\""
+msgstr "nieprawidłowa składnia wejścia dla uuid: \"%s\""
+
+#: utils/adt/varbit.c:56 utils/adt/varchar.c:48
+#, c-format
+msgid "length for type %s must be at least 1"
+msgstr "długość dla typu %s musi być co najmniej 1"
+
+#: utils/adt/varbit.c:61 utils/adt/varchar.c:52
+#, c-format
+msgid "length for type %s cannot exceed %d"
+msgstr "długość dla typu %s nie może przekraczać %d"
+
+#: utils/adt/varbit.c:166 utils/adt/varbit.c:309 utils/adt/varbit.c:366
+#, c-format
+msgid "bit string length %d does not match type bit(%d)"
+msgstr "długość ciągu bitowego %d nie pasuje do typu bit(%d)"
+
+#: utils/adt/varbit.c:188 utils/adt/varbit.c:490
+#, c-format
+msgid "\"%c\" is not a valid binary digit"
+msgstr "\"%c\" nie jest poprawnÄ… cyfrÄ… binarnÄ…"
+
+#: utils/adt/varbit.c:213 utils/adt/varbit.c:515
+#, c-format
+msgid "\"%c\" is not a valid hexadecimal digit"
+msgstr "\"%c\" nie jest poprawnÄ… cyfrÄ… szesnastkowÄ…"
+
+#: utils/adt/varbit.c:300 utils/adt/varbit.c:603
+msgid "invalid length in external bit string"
+msgstr "niepoprawna długość w zewnętrznym ciągu bitów"
+
+#: utils/adt/varbit.c:468 utils/adt/varbit.c:612 utils/adt/varbit.c:674
+#, c-format
+msgid "bit string too long for type bit varying(%d)"
+msgstr "ciąg bitów za długi dla typu bit varying(%d)"
+
+#: utils/adt/varbit.c:1004 utils/adt/varbit.c:1106 utils/adt/varlena.c:737
+#: utils/adt/varlena.c:801 utils/adt/varlena.c:945 utils/adt/varlena.c:1896
+#: utils/adt/varlena.c:1963
+msgid "negative substring length not allowed"
+msgstr "niedopuszczalna ujemna długość podciągu"
+
+#: utils/adt/varbit.c:1164
+msgid "cannot AND bit strings of different sizes"
+msgstr "nie można zastosować AND do wartości ciągów bitów o różnych rozmiarach"
+
+#: utils/adt/varbit.c:1206
+msgid "cannot OR bit strings of different sizes"
+msgstr "nie można zastosować OR do wartości ciągów bitów o różnych rozmiarach"
+
+#: utils/adt/varbit.c:1253
+msgid "cannot XOR bit strings of different sizes"
+msgstr "nie można zastosować XOR do wartości ciągów bitów o różnych rozmiarach"
+
+#: utils/adt/varbit.c:1731 utils/adt/varbit.c:1789
+#, c-format
+msgid "bit index %d out of valid range (0..%d)"
+msgstr "indeks bitu %d przekracza dopuszczalny zakres (0..%d)"
+
+#: utils/adt/varbit.c:1740 utils/adt/varlena.c:2163
+msgid "new bit must be 0 or 1"
+msgstr "nowy bit musi być 0 lub 1"
+
+#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
+#, c-format
+msgid "value too long for type character(%d)"
+msgstr "wartość zbyt długa dla typu znakowego (%d)"
+
+#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#, c-format
+msgid "value too long for type character varying(%d)"
+msgstr "wartość zbyt długa dla typu znakowego zmiennego (%d)"
+
+#: utils/adt/varlena.c:1314
+msgid "could not determine which collation to use for string comparison"
+msgstr ""
+"nie można określić, jakiego porównania użyć dla porównania ciągów znaków"
+
+#: utils/adt/varlena.c:1358 utils/adt/varlena.c:1371
+#, c-format
+msgid "could not convert string to UTF-16: error %lu"
+msgstr "nie można przekształcić ciągu do UTF-16: błąd %lu"
+
+#: utils/adt/varlena.c:1386
+#, c-format
+msgid "could not compare Unicode strings: %m"
+msgstr "nie można porównać ciągów Unikodu: %m"
+
+#: utils/adt/varlena.c:2041 utils/adt/varlena.c:2072 utils/adt/varlena.c:2108
+#: utils/adt/varlena.c:2151
+#, c-format
+msgid "index %d out of valid range, 0..%d"
+msgstr "indeks %d przekracza dopuszczalny zakres 0..%d"
+
+#: utils/adt/varlena.c:2959
+msgid "field position must be greater than zero"
+msgstr "pozycja pola musi być większa niż zero"
+
+#: utils/adt/varlena.c:3828 utils/adt/varlena.c:3889
+msgid "unterminated conversion specifier"
+msgstr "nierozpoznany specyfikator konwersji"
+
+#: utils/adt/varlena.c:3852 utils/adt/varlena.c:3868
+msgid "argument number is out of range"
+msgstr "numer argumentu wykracza poza zakres"
+
+#: utils/adt/varlena.c:3895
+msgid "conversion specifies argument 0, but arguments are numbered from 1"
+msgstr ""
+"przekształcenie specyfikuje argument 0, ale argumenty są numerowane od 1"
+
+#: utils/adt/varlena.c:3902
+#, fuzzy
+msgid "too few arguments for format"
+msgstr "za mało argumentów do formatowania"
+
+#: utils/adt/varlena.c:3923
+#, c-format
+msgid "unrecognized conversion specifier \"%c\""
+msgstr "nierozpoznany specyfikator konwersji \"%c\""
+
+#: utils/adt/varlena.c:3952
+msgid "null values cannot be formatted as an SQL identifier"
+msgstr "wartości puste nie mogą być formatowane jako identyfikatory SQL"
+
+#: utils/adt/windowfuncs.c:243
+msgid "argument of ntile must be greater than zero"
+msgstr "argument ntile musi być większy od zera"
+
+#: utils/adt/windowfuncs.c:465
+msgid "argument of nth_value must be greater than zero"
+msgstr "argument nth_value musi być większy od zera"
+
+#: utils/adt/xml.c:135
+msgid "unsupported XML feature"
+msgstr "nieobsługiwana cecha XML"
+
+#: utils/adt/xml.c:136
+msgid "This functionality requires the server to be built with libxml support."
+msgstr "Ta funkcjonalność wymaga kompilacji serwera z obsługą libxml."
+
+#: utils/adt/xml.c:137
+msgid "You need to rebuild PostgreSQL using --with-libxml."
+msgstr "Powinieneś zrekompilować PostgreSQL z użyciem --with-libxml."
+
+#: utils/adt/xml.c:156 utils/mb/mbutils.c:515
+#, c-format
+msgid "invalid encoding name \"%s\""
+msgstr "nieprawidłowa nazwa kodowania: \"%s\""
+
+#: utils/adt/xml.c:402 utils/adt/xml.c:407
+msgid "invalid XML comment"
+msgstr "niepoprawny komentarz XML"
+
+#: utils/adt/xml.c:536
+msgid "not an XML document"
+msgstr "to nie dokument XML"
+
+#: utils/adt/xml.c:689 utils/adt/xml.c:712
+msgid "invalid XML processing instruction"
+msgstr "niepoprawna instrukcja przetwarzania XML"
+
+#: utils/adt/xml.c:690
+#, c-format
+msgid "XML processing instruction target name cannot be \"%s\"."
+msgstr "cel instrukcji przetwarzania XML nie może być \"%s\"."
+
+#: utils/adt/xml.c:713
+msgid "XML processing instruction cannot contain \"?>\"."
+msgstr "instrukcja przetwarzania XML nie może zawierać \"?>\"."
+
+#: utils/adt/xml.c:792
+msgid "xmlvalidate is not implemented"
+msgstr "xmlvalidate nie jest zrealizowana"
+
+#: utils/adt/xml.c:877
+msgid "could not initialize XML library"
+msgstr "nie udało się zainicjować biblioteki XML"
+
+#: utils/adt/xml.c:878
+#, c-format
+msgid ""
+"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
+msgstr ""
+"libxml2 posiada niezgodny typ znakowy: sizeof(char)=%u, sizeof(xmlChar)=%u."
+
+#: utils/adt/xml.c:1420
+msgid "Invalid character value."
+msgstr "Niepoprawna wartość znaku."
+
+#: utils/adt/xml.c:1423
+msgid "Space required."
+msgstr "Wymagane wolne miejsce."
+
+#: utils/adt/xml.c:1426
+msgid "standalone accepts only 'yes' or 'no'."
+msgstr "autonomiczny akceptuje tylko 'tak' lub 'nie'."
+
+#: utils/adt/xml.c:1429
+msgid "Malformed declaration: missing version."
+msgstr "Nieprawidłowo utworzona deklaracja: brakuje wersji."
+
+#: utils/adt/xml.c:1432
+msgid "Missing encoding in text declaration."
+msgstr "BrakujÄ…ce kodowanie w deklaracji tekstu."
+
+#: utils/adt/xml.c:1435
+msgid "Parsing XML declaration: '?>' expected."
+msgstr "Parsowanie deklaracji XML: oczekiwano '?>'."
+
+#: utils/adt/xml.c:1438
+#, c-format
+msgid "Unrecognized libxml error code: %d."
+msgstr "Nieznany kod błędu libxml: %d."
+
+#: utils/adt/xml.c:1690
+msgid "XML does not support infinite date values."
+msgstr "XML nie obsługuje nieskończonych wartości daty."
+
+#: utils/adt/xml.c:1713 utils/adt/xml.c:1740
+msgid "XML does not support infinite timestamp values."
+msgstr "XML nie obsługuje nieskończonych wartości znaczników czasu."
+
+#: utils/adt/xml.c:2125
+msgid "invalid query"
+msgstr "nieprawidłowe zapytanie"
+
+#: utils/adt/xml.c:3349
+msgid "invalid array for XML namespace mapping"
+msgstr "niepoprawna tablica dla mapowania przestrzeni nazw XML"
+
+#: utils/adt/xml.c:3350
+msgid ""
+"The array must be two-dimensional with length of the second axis equal to 2."
+msgstr "Tablica musi być dwuwymiarowa z długością drugiego wymiaru równą 2."
+
+#: utils/adt/xml.c:3374
+msgid "empty XPath expression"
+msgstr "puste wyrażenie XPath"
+
+#: utils/adt/xml.c:3422
+msgid "neither namespace name nor URI may be null"
+msgstr "ani nazwa przestrzeni nazw ani URI nie mogą być puste"
+
+#: utils/adt/xml.c:3429
+#, c-format
+msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
+msgstr ""
+"nie udało się zarejestrować przestrzeni nazw o nazwie \"%s\" i URI \"%s\""
+
+#: utils/sort/logtape.c:213
+#, c-format
+msgid "could not write block %ld of temporary file: %m"
+msgstr "nie można zapisać bloku %ld pliku tymczasowego: %m"
+
+#: utils/sort/logtape.c:215
+msgid "Perhaps out of disk space?"
+msgstr "Być może brak przestrzeni dyskowej?"
+
+#: utils/sort/logtape.c:232
+#, c-format
+msgid "could not read block %ld of temporary file: %m"
+msgstr "nie można odczytać bloku %ld pliku tymczasowego: %m"
+
+#: utils/sort/tuplesort.c:3131
+#, c-format
+msgid "could not create unique index \"%s\""
+msgstr "nie można utworzyć unikalnego indeksu \"%s\""
+
+#: utils/sort/tuplesort.c:3133
+#, c-format
+msgid "Key %s is duplicated."
+msgstr "Klucz %s jest zdublowany."
+
+#: utils/cache/lsyscache.c:2414 utils/cache/lsyscache.c:2447
+#: utils/cache/lsyscache.c:2480 utils/cache/lsyscache.c:2513
+#, c-format
+msgid "type %s is only a shell"
+msgstr "typ %s jest jedynie powłoką"
+
+#: utils/cache/lsyscache.c:2419
+#, c-format
+msgid "no input function available for type %s"
+msgstr "brak funkcji wejścia dostępnej dla typu %s"
+
+#: utils/cache/lsyscache.c:2452
+#, c-format
+msgid "no output function available for type %s"
+msgstr "brak funkcji wyjścia dostępnej dla typu %s"
+
+#: utils/cache/plancache.c:589
+msgid "cached plan must not change result type"
+msgstr "plan w pamięci podręcznej nie może zmienić typ wyniku"
+
+#: utils/cache/relcache.c:4285
+#, c-format
+msgid "could not create relation-cache initialization file \"%s\": %m"
+msgstr ""
+"nie udało się utworzyć pliku \"%s\" inicjującego pamięć podręczną relacji: %m"
+
+#: utils/cache/relcache.c:4287
+msgid "Continuing anyway, but there's something wrong."
+msgstr "Kontynuujemy mimo wszystko tak, ale coÅ› jest nie tak."
+
+#: utils/cache/relcache.c:4501
+#, c-format
+msgid "could not remove cache file \"%s\": %m"
+msgstr "nie udało się usunąć pliku pamięci podręcznej \"%s\": %m"
+
+#: utils/cache/relmapper.c:454
+msgid "cannot PREPARE a transaction that modified relation mapping"
+msgstr "nie można wykonać PREPARE transakcji, która zmieniła mapowanie relacji"
+
+#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
+#, c-format
+msgid "could not open relation mapping file \"%s\": %m"
+msgstr "nie można otworzyć pliku mapowania relacji \"%s\": %m"
+
+#: utils/cache/relmapper.c:609
+#, c-format
+msgid "could not read relation mapping file \"%s\": %m"
+msgstr "nie można czytać pliku mapowania relacji \"%s\": %m"
+
+#: utils/cache/relmapper.c:619
+#, c-format
+msgid "relation mapping file \"%s\" contains invalid data"
+msgstr "plik mapowania relacji \"%s\" zawiera niepoprawne dane"
+
+#: utils/cache/relmapper.c:629
+#, c-format
+msgid "relation mapping file \"%s\" contains incorrect checksum"
+msgstr "plik mapowania relacji \"%s\" zawiera niepoprawnÄ… sumÄ™ kontrolnÄ…"
+
+#: utils/cache/relmapper.c:741
+#, c-format
+msgid "could not write to relation mapping file \"%s\": %m"
+msgstr "nie można zapisać pliku mapowania relacji \"%s\": %m"
+
+#: utils/cache/relmapper.c:754
+#, c-format
+msgid "could not fsync relation mapping file \"%s\": %m"
+msgstr "nie można wykonać fsync na pliku mapowania relacji \"%s\": %m"
+
+#: utils/cache/relmapper.c:760
+#, c-format
+msgid "could not close relation mapping file \"%s\": %m"
+msgstr "nie można zamknąć pliku mapowania relacji \"%s\": %m"
+
+#: utils/cache/typcache.c:629
+#, c-format
+msgid "type %s is not composite"
+msgstr "typ %s nie jest złożony"
+
+#: utils/cache/typcache.c:643
+msgid "record type has not been registered"
+msgstr "typ rekordu nie został zarejestrowany"
+
+#: utils/mmgr/aset.c:417
+#, c-format
+msgid "Failed while creating memory context \"%s\"."
+msgstr "Niepowodzenie podczas tworzenia kontekstu pamięci \"%s\"."
+
+#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:766 utils/mmgr/aset.c:967
+#, c-format
+msgid "Failed on request of size %lu."
+msgstr "Niepowodzenie żądania o rozmiarze %lu."
+
+#: utils/mmgr/portalmem.c:207
+#, c-format
+msgid "cursor \"%s\" already exists"
+msgstr "kursor \"%s\" już istnieje"
+
+#: utils/mmgr/portalmem.c:211
+#, c-format
+msgid "closing existing cursor \"%s\""
+msgstr "zamykanie istniejÄ…cego kursora \"%s\""
+
+#: utils/mmgr/portalmem.c:448
+#, c-format
+msgid "cannot drop active portal \"%s\""
+msgstr "nie można usunąć aktywnego portalu \"%s\""
+
+#: utils/mmgr/portalmem.c:635
+msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
+msgstr "nie można wykonać PREPARE transakcji która utworzyła kursor WITH HOLD"
+
+#: utils/fmgr/dfmgr.c:125
+#, c-format
+msgid "could not find function \"%s\" in file \"%s\""
+msgstr "nie można odnaleźć funkcji \"%s\" w pliku \"%s\""
+
+#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
+#, c-format
+msgid "could not access file \"%s\": %m"
+msgstr "nie można uzyskać dostępu do pliku \"%s\": %m"
+
+#: utils/fmgr/dfmgr.c:242
+#, c-format
+msgid "could not load library \"%s\": %s"
+msgstr "nie można załadować biblioteki \"%s\": %s"
+
+#: utils/fmgr/dfmgr.c:274
+#, c-format
+msgid "incompatible library \"%s\": missing magic block"
+msgstr "niezgodna biblioteka \"%s\": brak magicznego bloku"
+
+#: utils/fmgr/dfmgr.c:276
+msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
+msgstr "Biblioteki rozszerzenia są wymagane by użyć makra PG_MODULE_MAGIC."
+
+#: utils/fmgr/dfmgr.c:312
+#, c-format
+msgid "incompatible library \"%s\": version mismatch"
+msgstr "niezgodna biblioteka \"%s\": niezgodność wersji"
+
+#: utils/fmgr/dfmgr.c:314
+#, c-format
+msgid "Server is version %d.%d, library is version %d.%d."
+msgstr "Serwer jest w wersji %d.%d, biblioteka jest w wersji %d.%d."
+
+#: utils/fmgr/dfmgr.c:333
+#, c-format
+msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+msgstr "Serwer posiada FUNC_MAX_ARGS = %d, biblioteka ma %d."
+
+#: utils/fmgr/dfmgr.c:342
+#, c-format
+msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+msgstr "Serwer posiada INDEX_MAX_KEYS = %d, biblioteka ma %d."
+
+#: utils/fmgr/dfmgr.c:351
+#, c-format
+msgid "Server has NAMEDATALEN = %d, library has %d."
+msgstr "Serwer posiada NAMEDATALEN = %d, biblioteka ma %d."
+
+#: utils/fmgr/dfmgr.c:360
+#, c-format
+msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
+msgstr "Serwer posiada FLOAT4PASSBYVAL = %s, biblioteka ma %s."
+
+#: utils/fmgr/dfmgr.c:369
+#, c-format
+msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+msgstr "Serwer posiada FLOAT8PASSBYVAL = %s, biblioteka ma %s."
+
+#: utils/fmgr/dfmgr.c:376
+msgid "Magic block has unexpected length or padding difference."
+msgstr "Magiczny blok ma nieoczekiwaną długość lub różnicę dopełnienia."
+
+#: utils/fmgr/dfmgr.c:379
+#, c-format
+msgid "incompatible library \"%s\": magic block mismatch"
+msgstr "niezgodna biblioteka \"%s\": niezgodność magicznego bloku"
+
+#: utils/fmgr/dfmgr.c:545
+#, c-format
+msgid "access to library \"%s\" is not allowed"
+msgstr "dostęp do biblioteki \"%s\" jest niedozwolony"
+
+#: utils/fmgr/dfmgr.c:572
+#, c-format
+msgid "invalid macro name in dynamic library path: %s"
+msgstr "niepoprawna nazwa makra w dynamicznej ścieżce biblioteki: %s"
+
+#: utils/fmgr/dfmgr.c:617
+msgid "zero-length component in parameter \"dynamic_library_path\""
+msgstr "komponent o zerowej długości w parametrze \"dynamic_library_path\""
+
+#: utils/fmgr/dfmgr.c:636
+msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+msgstr ""
+"komponent w parametrze \"dynamic_library_path\" nie jest ścieżką absolutną"
+
+#: utils/fmgr/fmgr.c:270
+#, c-format
+msgid "internal function \"%s\" is not in internal lookup table"
+msgstr "funkcji wewnętrznej \"%s\" nie ma w wewnętrznej tabeli wyszukiwania"
+
+#: utils/fmgr/fmgr.c:474
+#, c-format
+msgid "unrecognized API version %d reported by info function \"%s\""
+msgstr ""
+"nierozpoznana wersja API %d zgłoszona przez funkcję informacyjną \"%s\""
+
+#: utils/fmgr/fmgr.c:845 utils/fmgr/fmgr.c:2106
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr "funkcja %u posiada zbyt wiele argumentów (%d, maksimum to %d)"
+
+#: utils/fmgr/funcapi.c:354
+#, c-format
+msgid ""
+"could not determine actual result type for function \"%s\" declared to "
+"return type %s"
+msgstr ""
+"nie można określić aktualnego typu wyniku dla funkcji \"%s\" zadeklarowanej "
+"jako zwracajÄ…ca typ %s"
+
+#: utils/fmgr/funcapi.c:1208 utils/fmgr/funcapi.c:1239
+msgid "number of aliases does not match number of columns"
+msgstr "liczba aliasów nie zgadza się z liczbą kolumn"
+
+#: utils/fmgr/funcapi.c:1233
+msgid "no column alias was provided"
+msgstr "nie wskazano aliasu kolumny"
+
+#: utils/fmgr/funcapi.c:1257
+msgid "could not determine row description for function returning record"
+msgstr "nie udało się określić opisu wiersza dla funkcji zwracającej rekord"
+
+#: utils/error/assert.c:37
+msgid "TRAP: ExceptionalCondition: bad arguments\n"
+msgstr "PU�APKA: ExceptionalCondition: niepoprawne argumenty\n"
+
+#: utils/error/assert.c:40
+#, c-format
+msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
+msgstr "PU�APKA: %s(\"%s\", Plik: \"%s\", Linia: %d)\n"
+
+#: utils/error/elog.c:1507
+#, c-format
+msgid "could not reopen file \"%s\" as stderr: %m"
+msgstr ""
+"nie można otworzyć ponownie pliku \"%s\" do jako standardowe wyjście błędów: "
+"%m"
+
+#: utils/error/elog.c:1520
+#, c-format
+msgid "could not reopen file \"%s\" as stdout: %m"
+msgstr ""
+"nie można otworzyć ponownie pliku \"%s\" do jako standardowe wyjście: %m"
+
+#: utils/error/elog.c:1910 utils/error/elog.c:1920 utils/error/elog.c:1930
+msgid "[unknown]"
+msgstr "[nieznany]"
+
+#: utils/error/elog.c:2281 utils/error/elog.c:2561 utils/error/elog.c:2639
+msgid "missing error text"
+msgstr "brakujący tekst błędu"
+
+#: utils/error/elog.c:2284 utils/error/elog.c:2287 utils/error/elog.c:2642
+#: utils/error/elog.c:2645
+#, c-format
+msgid " at character %d"
+msgstr " przy znaku %d"
+
+#: utils/error/elog.c:2297 utils/error/elog.c:2304
+msgid "DETAIL:  "
+msgstr "SZCZEGÓ�Y:  "
+
+#: utils/error/elog.c:2311
+msgid "HINT:  "
+msgstr "PODPOWIEDŹ:  "
+
+#: utils/error/elog.c:2318
+msgid "QUERY:  "
+msgstr "ZAPYTANIE:  "
+
+#: utils/error/elog.c:2325
+msgid "CONTEXT:  "
+msgstr "KONTEKST:  "
+
+#: utils/error/elog.c:2335
+#, c-format
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "POZYCJA:  %s, %s:%d\n"
+
+#: utils/error/elog.c:2342
+#, c-format
+msgid "LOCATION:  %s:%d\n"
+msgstr "POZYCJA:  %s:%d\n"
+
+#: utils/error/elog.c:2356
+msgid "STATEMENT:  "
+msgstr "WYRAŻENIE:  "
+
+#. translator: This string will be truncated at 47
+#. characters expanded.
+#: utils/error/elog.c:2754
+#, c-format
+msgid "operating system error %d"
+msgstr "błąd systemu operacyjnego %d"
+
+#: utils/error/elog.c:2777
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: utils/error/elog.c:2781
+msgid "LOG"
+msgstr "DZIENNIK"
+
+#: utils/error/elog.c:2784
+msgid "INFO"
+msgstr "INFORMACJA"
+
+#: utils/error/elog.c:2787
+msgid "NOTICE"
+msgstr "UWAGA"
+
+#: utils/error/elog.c:2790
+msgid "WARNING"
+msgstr "OSTRZEŻENIE"
+
+#: utils/error/elog.c:2793
+msgid "ERROR"
+msgstr "B�ĄD"
+
+#: utils/error/elog.c:2796
+msgid "FATAL"
+msgstr "KATASTROFALNY"
+
+#: utils/error/elog.c:2799
+msgid "PANIC"
+msgstr "PANIKA"
+
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
+#, c-format
+msgid "unexpected encoding ID %d for ISO 8859 character sets"
+msgstr "nieoczekiwane kodowanie ID %d dla zestawów znaków ISO 8859"
+
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#, c-format
+msgid "unexpected encoding ID %d for WIN character sets"
+msgstr "nieoczekiwane kodowanie ID %d dla zestawów znaków WIN"
+
+#: utils/mb/encnames.c:485
+msgid "encoding name too long"
+msgstr "nazwa kodowania zbyt długa"
+
+#: utils/mb/mbutils.c:281
+#, c-format
+msgid "conversion between %s and %s is not supported"
+msgstr "konwersja pomiędzy %s i %s nie jest obsługiwana"
+
+#: utils/mb/mbutils.c:351
+#, c-format
+msgid ""
+"default conversion function for encoding \"%s\" to \"%s\" does not exist"
+msgstr "domyślna funkcja konwersji z kodowania \"%s\" na \"%s\"nie istnieje"
+
+#: utils/mb/mbutils.c:375 utils/mb/mbutils.c:676
+#, c-format
+msgid "String of %d bytes is too long for encoding conversion."
+msgstr "Ciąg znaków długości %d bajtów jest za długi do konwersji kodowania."
+
+#: utils/mb/mbutils.c:462
+#, c-format
+msgid "invalid source encoding name \"%s\""
+msgstr "nieprawidłowa nazwa kodowania źródła: \"%s\""
+
+#: utils/mb/mbutils.c:467
+#, c-format
+msgid "invalid destination encoding name \"%s\""
+msgstr "nieprawidłowa nazwa kodowania celu: \"%s\""
+
+#: utils/mb/mbutils.c:589
+#, c-format
+msgid "invalid byte value for encoding \"%s\": 0x%02x"
+msgstr "niepoprawna wartość bajtu dla kodowania \"%s\": 0x%02x"
+
+#: utils/mb/wchar.c:1611
+#, c-format
+msgid "invalid byte sequence for encoding \"%s\": 0x%s"
+msgstr "niepoprawna sekwencja bajtów dla kodowania \"%s\": 0x%s"
+
+#: utils/mb/wchar.c:1640
+#, c-format
+msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
+msgstr "znak 0x%s kodowania \"%s\" nie ma równoważnego w \"%s\""
+
+#: utils/mb/conv.c:509
+#, c-format
+msgid "invalid encoding number: %d"
+msgstr "nieprawidłowy numer kodowania: %d"
+
+#: utils/misc/guc.c:525
+msgid "Ungrouped"
+msgstr "Nie grupowane"
+
+#: utils/misc/guc.c:527
+msgid "File Locations"
+msgstr "Położenie plików"
+
+#: utils/misc/guc.c:529
+msgid "Connections and Authentication"
+msgstr "Połączenia i Autoryzacja"
+
+#: utils/misc/guc.c:531
+msgid "Connections and Authentication / Connection Settings"
+msgstr "Połączenia i Autoryzacja / Ustawienia Połączenia"
+
+#: utils/misc/guc.c:533
+msgid "Connections and Authentication / Security and Authentication"
+msgstr "Połączenia i Autoryzacja / Bezpieczeństwo i Autoryzacja"
+
+#: utils/misc/guc.c:535
+msgid "Resource Usage"
+msgstr "Użycie Zasobów"
+
+#: utils/misc/guc.c:537
+msgid "Resource Usage / Memory"
+msgstr "Użycie Zasobów / Pamięć"
+
+#: utils/misc/guc.c:539
+msgid "Resource Usage / Kernel Resources"
+msgstr "Użycie Zasobów / Zasoby Jądra"
+
+#: utils/misc/guc.c:541
+msgid "Resource Usage / Cost-Based Vacuum Delay"
+msgstr "Użycie Zasobów / Opóźnienie Odkurzania na Podstawie Kosztów"
+
+#: utils/misc/guc.c:543
+msgid "Resource Usage / Background Writer"
+msgstr "Użycie Zasobów / Pisarz w Tle"
+
+#: utils/misc/guc.c:545
+msgid "Resource Usage / Asynchronous Behavior"
+msgstr "Użycie Zasobów / Zachowanie Asynchroniczne"
+
+#: utils/misc/guc.c:547
+msgid "Write-Ahead Log"
+msgstr "Dziennik Zapisu z Wyprzedzeniem"
+
+#: utils/misc/guc.c:549
+msgid "Write-Ahead Log / Settings"
+msgstr "Dziennik Zapisu z Wyprzedzeniem / Ustawienia"
+
+#: utils/misc/guc.c:551
+msgid "Write-Ahead Log / Checkpoints"
+msgstr "Dziennik Zapisu z Wyprzedzeniem / Punkty Kontrolne"
+
+#: utils/misc/guc.c:553
+msgid "Write-Ahead Log / Archiving"
+msgstr "Dziennik Zapisu z Wyprzedzeniem / Archiwizacja"
+
+#: utils/misc/guc.c:555
+msgid "Replication"
+msgstr "Replikacja"
+
+#: utils/misc/guc.c:557
+msgid "Replication / Master Server"
+msgstr "Replikacja / Serwer Podstawowy"
+
+#: utils/misc/guc.c:559
+msgid "Replication / Standby Servers"
+msgstr "Replikacja / Serwery Gotowości"
+
+#: utils/misc/guc.c:561
+msgid "Query Tuning"
+msgstr "Dostrajanie Zapytań"
+
+#: utils/misc/guc.c:563
+msgid "Query Tuning / Planner Method Configuration"
+msgstr "Dostrajanie Zapytań / Konfiguracja Metody Planisty"
+
+#: utils/misc/guc.c:565
+msgid "Query Tuning / Planner Cost Constants"
+msgstr "Dostrajanie Zapytań / Stałe Kosztów Planisty"
+
+#: utils/misc/guc.c:567
+msgid "Query Tuning / Genetic Query Optimizer"
+msgstr "Dostrajanie Zapytań / Genetyczny Optymalizator Zapytania"
+
+#: utils/misc/guc.c:569
+msgid "Query Tuning / Other Planner Options"
+msgstr "Dostrajanie Zapytań / Inne opcje Planisty"
+
+#: utils/misc/guc.c:571
+msgid "Reporting and Logging"
+msgstr "Raportowanie i Rejestrowanie"
+
+#: utils/misc/guc.c:573
+msgid "Reporting and Logging / Where to Log"
+msgstr "Raportowanie i Rejestrowanie / Gdzie Logować"
+
+#: utils/misc/guc.c:575
+msgid "Reporting and Logging / When to Log"
+msgstr "Raportowanie i Rejestrowanie / Kiedy Logować"
+
+#: utils/misc/guc.c:577
+msgid "Reporting and Logging / What to Log"
+msgstr "Raportowanie i Rejestrowanie / Co Logować"
+
+#: utils/misc/guc.c:579
+msgid "Statistics"
+msgstr "Statystyki"
+
+#: utils/misc/guc.c:581
+msgid "Statistics / Monitoring"
+msgstr "Statystyki / Monitorowanie"
+
+#: utils/misc/guc.c:583
+msgid "Statistics / Query and Index Statistics Collector"
+msgstr "Statystyki / Kolektor Statystyk Zapytań i Indeksów"
+
+#: utils/misc/guc.c:585
+msgid "Autovacuum"
+msgstr "Autoodkurzanie"
+
+#: utils/misc/guc.c:587
+msgid "Client Connection Defaults"
+msgstr "Ustawienia Domyślne Połączenia Klienta"
+
+#: utils/misc/guc.c:589
+msgid "Client Connection Defaults / Statement Behavior"
+msgstr "Ustawienia Domyślne Połączenia Klienta / Zachowanie Wyrażeń"
+
+#: utils/misc/guc.c:591
+msgid "Client Connection Defaults / Locale and Formatting"
+msgstr "Ustawienia Domyślne Połączenia Klienta / Lokalizacja i Formatowanie"
+
+#: utils/misc/guc.c:593
+msgid "Client Connection Defaults / Other Defaults"
+msgstr "Ustawienia Domyślne Połączenia Klienta / Inne Wartości Domyślne"
+
+#: utils/misc/guc.c:595
+msgid "Lock Management"
+msgstr "ZarzÄ…dzanie Blokadami"
+
+#: utils/misc/guc.c:597
+msgid "Version and Platform Compatibility"
+msgstr "Zgodność Wersji i Platformy"
+
+#: utils/misc/guc.c:599
+msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
+msgstr "Zgodność Wersji i Platformy / Poprzednie Wersje PostgreSQL"
+
+#: utils/misc/guc.c:601
+msgid "Version and Platform Compatibility / Other Platforms and Clients"
+msgstr "Zgodność Wersji i Platformy / Inne Platformy i Klienty"
+
+#: utils/misc/guc.c:603
+msgid "Error Handling"
+msgstr "Obsługa Błędów"
+
+#: utils/misc/guc.c:605
+msgid "Preset Options"
+msgstr "Zaprogramowane Opcje"
+
+#: utils/misc/guc.c:607
+msgid "Customized Options"
+msgstr "Opcje Niestandardowe"
+
+#: utils/misc/guc.c:609
+msgid "Developer Options"
+msgstr "Opcje Deweloperskie"
+
+#: utils/misc/guc.c:663
+msgid "Enables the planner's use of sequential-scan plans."
+msgstr "Włącza użycie przez planistę planów skanu sekwencyjnego."
+
+#: utils/misc/guc.c:672
+msgid "Enables the planner's use of index-scan plans."
+msgstr "Włącza użycie przez planistę planów skanu indeksowego."
+
+#: utils/misc/guc.c:681
+msgid "Enables the planner's use of bitmap-scan plans."
+msgstr "Włącza użycie przez planistę planów skanu bitmapowego."
+
+#: utils/misc/guc.c:690
+msgid "Enables the planner's use of TID scan plans."
+msgstr "Włącza użycie przez planistę planów skanu TID."
+
+#: utils/misc/guc.c:699
+msgid "Enables the planner's use of explicit sort steps."
+msgstr "Włącza użycie przez planistę jawnych kroków sortowania."
+
+#: utils/misc/guc.c:708
+msgid "Enables the planner's use of hashed aggregation plans."
+msgstr "Włącza użycie przez planistę planów agregacji haszowanej."
+
+#: utils/misc/guc.c:717
+msgid "Enables the planner's use of materialization."
+msgstr "Włącza użycie przez planistę materializacji."
+
+#: utils/misc/guc.c:726
+msgid "Enables the planner's use of nested-loop join plans."
+msgstr "Włącza użycie przez planistę planów dołączeń zagnieżdżonych pętli."
+
+#: utils/misc/guc.c:735
+msgid "Enables the planner's use of merge join plans."
+msgstr "Włącza użycie przez planistę planów dołączeń przez scalenie."
+
+#: utils/misc/guc.c:744
+msgid "Enables the planner's use of hash join plans."
+msgstr "Włącza użycie przez planistę planów dołączeń przez mieszanie."
+
+#: utils/misc/guc.c:753
+msgid "Enables genetic query optimization."
+msgstr "Włącza genetyczny optymalizator zapytań."
+
+#: utils/misc/guc.c:754
+msgid "This algorithm attempts to do planning without exhaustive searching."
+msgstr ""
+"Ten algorytm próbuje wykonać planowanie bez wyczerpującego przeszukiwania."
+
+#: utils/misc/guc.c:764
+msgid "Shows whether the current user is a superuser."
+msgstr "Pokazuje, czy aktualny użytkownik jest superużytkownikiem."
+
+#: utils/misc/guc.c:774
+msgid "Enables advertising the server via Bonjour."
+msgstr "Zezwala na reklamy serwera poprzez Bonjour."
+
+#: utils/misc/guc.c:783
+msgid "Enables SSL connections."
+msgstr "Włącza połączenia SSL."
+
+#: utils/misc/guc.c:792
+msgid "Forces synchronization of updates to disk."
+msgstr "Wymusza synchronizacje modyfikacji na dysk."
+
+#: utils/misc/guc.c:793
+msgid ""
+"The server will use the fsync() system call in several places to make sure "
+"that updates are physically written to disk. This insures that a database "
+"cluster will recover to a consistent state after an operating system or "
+"hardware crash."
+msgstr ""
+"Serwer będzie wykonywał wywołania systemowe fsync() w pewnych miejscach by "
+"upewnić się, że modyfikacje są fizycznie zapisane na dysku. Zapewnia to, że "
+"klaster bazy danych powróci do spójnego stanu po awarii systemu operacyjnego "
+"lub sprzętu."
+
+#: utils/misc/guc.c:804
+msgid "Continues processing past damaged page headers."
+msgstr "Kontynuuje przetwarzanie nagłówków stron sprzed uszkodzonych."
+
+#: utils/misc/guc.c:805
+msgid ""
+"Detection of a damaged page header normally causes PostgreSQL to report an "
+"error, aborting the current transaction. Setting zero_damaged_pages to true "
+"causes the system to instead report a warning, zero out the damaged page, "
+"and continue processing. This behavior will destroy data, namely all the "
+"rows on the damaged page."
+msgstr ""
+"Wykrycie uszkodzonych nagłówków stron powoduje zwykle zgłoszenie błędu przez "
+"PostgreSQL i przerwanie bieżącej transakcji. Ustawienie zero_damaged_pages "
+"na prawdę powoduje, że system zamiast zgłosić ostrzeżenie, zeruje uszkodzone "
+"strony i kontynuuje przetwarzanie. Takie zachowanie niszczy dane, a "
+"mianowicie wszystkie wiersze na uszkodzonej stronie."
+
+#: utils/misc/guc.c:818
+msgid "Writes full pages to WAL when first modified after a checkpoint."
+msgstr ""
+"Zapisuje pełne strony do WAL podczas pierwszej modyfikacji po punkcie "
+"kontrolnym."
+
+#: utils/misc/guc.c:819
+msgid ""
+"A page write in process during an operating system crash might be only "
+"partially written to disk.  During recovery, the row changes stored in WAL "
+"are not enough to recover.  This option writes pages when first modified "
+"after a checkpoint to WAL so full recovery is possible."
+msgstr ""
+"Zapis strony w procesie podczas awarii systemu operacyjnego może być tylko "
+"częściowo przeniesiony na dysk.  Podczas odzyskiwania, zmiany wiersza "
+"przechowywane w WAL nie sÄ… wystarczajÄ…ce do odzyskania.  Opcja ta zapisuje "
+"strony kiedy po pierwszej modyfikacji po punkcie kontrolnym do WAL więc jest "
+"możliwe całkowite odtworzenie."
+
+#: utils/misc/guc.c:831
+msgid "Runs the server silently."
+msgstr "Uruchamia serwer w trybie cichym."
+
+#: utils/misc/guc.c:832
+msgid ""
+"If this parameter is set, the server will automatically run in the "
+"background and any controlling terminals are dissociated."
+msgstr ""
+"Jeśli ten parametr jest ustawiony, serwer będzie automatycznie uruchamiany w "
+"tle i wszelkie terminale sterowania sÄ… oddzielone."
+
+#: utils/misc/guc.c:841
+msgid "Logs each checkpoint."
+msgstr "Rejestruje każdy punkt kontrolny."
+
+#: utils/misc/guc.c:850
+msgid "Logs each successful connection."
+msgstr "Rejestruje każde udane połączenie."
+
+#: utils/misc/guc.c:859
+msgid "Logs end of a session, including duration."
+msgstr "Rejestruje koniec sesji, w tym jej czas trwania."
+
+#: utils/misc/guc.c:868
+msgid "Turns on various assertion checks."
+msgstr "Włącza różne sprawdzenie asercji."
+
+#: utils/misc/guc.c:869
+msgid "This is a debugging aid."
+msgstr "Jest to pomoc debugowania."
+
+#: utils/misc/guc.c:883
+msgid "Terminate session on any error."
+msgstr "Zakończ sesję w przypadku jakiegokolwiek błędu."
+
+#: utils/misc/guc.c:892
+msgid "Reinitialize server after backend crash."
+msgstr "Zainicjować ponownie serwer po awarii backendu."
+
+#: utils/misc/guc.c:902
+msgid "Logs the duration of each completed SQL statement."
+msgstr "Rejestruje czas trwania każdego zakończonego wyrażenia SQL."
+
+#: utils/misc/guc.c:911
+msgid "Logs each query's parse tree."
+msgstr "Rejestruje drzewo parsowania każdego zapytania."
+
+#: utils/misc/guc.c:920
+msgid "Logs each query's rewritten parse tree."
+msgstr "Rejestruje drzewo parsowania przepisanego każdego zapytania."
+
+#: utils/misc/guc.c:929
+msgid "Logs each query's execution plan."
+msgstr "Rejestruje plan wykonania każdego zapytania."
+
+#: utils/misc/guc.c:938
+msgid "Indents parse and plan tree displays."
+msgstr "Używa wcięć przy wyświetlaniu drzewa parsowania i planu."
+
+#: utils/misc/guc.c:947
+msgid "Writes parser performance statistics to the server log."
+msgstr "Zapisuje statystyki wydajności parsera do dziennika serwera."
+
+#: utils/misc/guc.c:956
+msgid "Writes planner performance statistics to the server log."
+msgstr "Zapisuje statystyki wydajności planisty do dziennika serwera."
+
+#: utils/misc/guc.c:965
+msgid "Writes executor performance statistics to the server log."
+msgstr "Zapisuje statystyki wydajności wykonawcy do dziennika serwera."
+
+#: utils/misc/guc.c:974
+msgid "Writes cumulative performance statistics to the server log."
+msgstr "Zapisuje łączne statystyki wydajności do dziennika serwera."
+
+#: utils/misc/guc.c:984 utils/misc/guc.c:1049 utils/misc/guc.c:1059
+#: utils/misc/guc.c:1069 utils/misc/guc.c:1079 utils/misc/guc.c:1804
+#: utils/misc/guc.c:1814
+msgid "No description available."
+msgstr "Opis niedostępny."
+
+#: utils/misc/guc.c:996
+msgid "Collects information about executing commands."
+msgstr "Zbiera informacje o wykonywanych poleceniach."
+
+#: utils/misc/guc.c:997
+msgid ""
+"Enables the collection of information on the currently executing command of "
+"each session, along with the time at which that command began execution."
+msgstr ""
+"Włącza gromadzenie informacji na temat aktualnie wykonywanych poleceń każdej "
+"sesji, wraz z czasem początku wykonywania tych poleceń."
+
+#: utils/misc/guc.c:1007
+msgid "Collects statistics on database activity."
+msgstr "Gromadzi statystyki dotyczące aktywności bazy danych."
+
+#: utils/misc/guc.c:1017
+msgid "Updates the process title to show the active SQL command."
+msgstr "Zmienia tytuł procesu by pokazać aktywne polecenie SQL."
+
+#: utils/misc/guc.c:1018
+msgid ""
+"Enables updating of the process title every time a new SQL command is "
+"received by the server."
+msgstr ""
+"Włącza zmianę tytułu procesu za każdym razem, gdy nowe polecenie SQL zostaje "
+"odebrane przez serwer."
+
+#: utils/misc/guc.c:1027
+msgid "Starts the autovacuum subprocess."
+msgstr "Uruchamia proces autoodkurzania."
+
+#: utils/misc/guc.c:1037
+msgid "Generates debugging output for LISTEN and NOTIFY."
+msgstr "Generuje wyjście debugowania dla LISTEN oraz NOTIFY."
+
+#: utils/misc/guc.c:1091
+msgid "Logs long lock waits."
+msgstr "Rejestruje długie oczekiwanie na blokady."
+
+#: utils/misc/guc.c:1101
+msgid "Logs the host name in the connection logs."
+msgstr "Rejestruje nazwę hosta w logach połączenia."
+
+#: utils/misc/guc.c:1102
+msgid ""
+"By default, connection logs only show the IP address of the connecting host. "
+"If you want them to show the host name you can turn this on, but depending "
+"on your host name resolution setup it might impose a non-negligible "
+"performance penalty."
+msgstr ""
+"Domyślnie dzienniki połączenia pokazują tylko adres IP komputera "
+"nawiązującego połączenie. Jeśli chcesz by pokazywały nazwę hosta można "
+"włączyć tę funkcję, ale w zależności od konfiguracji rozwiązywania nazwy "
+"hosta może się to przyczynić do niepomijalnego spadku wydajności."
+
+#: utils/misc/guc.c:1113
+msgid "Causes subtables to be included by default in various commands."
+msgstr ""
+"Powoduje, że tabele podrzędne zostają włączone domyślnie do różnych poleceń."
+
+#: utils/misc/guc.c:1122
+msgid "Encrypt passwords."
+msgstr "Szyfruje hasła."
+
+#: utils/misc/guc.c:1123
+msgid ""
+"When a password is specified in CREATE USER or ALTER USER without writing "
+"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
+"password is to be encrypted."
+msgstr ""
+"Kiedy hasło zostało określone w CREATE USER lub ALTER USER bez zapisu "
+"ENCRYPTED lub UNENCRYPTED, ten parametr określa, czy hasło ma być szyfrowane."
+
+#: utils/misc/guc.c:1133
+msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
+msgstr "Traktuje \"expr=NULL\" jako \"expr IS NULL\"."
+
+#: utils/misc/guc.c:1134
+msgid ""
+"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
+"treated as expr IS NULL, that is, they return true if expr evaluates to the "
+"null value, and false otherwise. The correct behavior of expr = NULL is to "
+"always return null (unknown)."
+msgstr ""
+"Po włączeniu wyrażenia postaci expr = NULL (lub NULL = wyrażenie) są "
+"traktowane jako expr IS NULL, to znaczy, że zwróci wartość prawdy, jeśli "
+"expr zostanie oszacowana na wartość null, w przeciwnym razie false. "
+"Poprawnym zachowaniem dla expr = NULL jest zawsze zwrócenie null (nieznana)."
+
+#: utils/misc/guc.c:1146
+msgid "Enables per-database user names."
+msgstr "Włącza nazwy użytkowników osobno dla bazy danych."
+
+#: utils/misc/guc.c:1156
+msgid "This parameter doesn't do anything."
+msgstr "Ten parametr nic nie robi."
+
+#: utils/misc/guc.c:1157
+msgid ""
+"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
+"vintage clients."
+msgstr ""
+"Znajduje się to tylko tutaj, abyśmy się nie zadławili poleceniem A SET "
+"AUTOCOMMIT TO ON od klientów 7.3-vintage."
+
+#: utils/misc/guc.c:1166
+msgid "Sets the default read-only status of new transactions."
+msgstr "Ustawia domyślny stan tylko do odczytu dla nowych transakcji."
+
+#: utils/misc/guc.c:1175
+msgid "Sets the current transaction's read-only status."
+msgstr "Ustawia stan tylko do odczytu dla bieżącej transakcji."
+
+#: utils/misc/guc.c:1185
+msgid "Sets the default deferrable status of new transactions."
+msgstr "Ustawia domyślny stan odraczalna nowych transakcji."
+
+#: utils/misc/guc.c:1194
+msgid ""
+"Whether to defer a read-only serializable transaction until it can be "
+"executed with no possible serialization failures."
+msgstr ""
+"Czy odroczyć serializowaną transakcję tylko do odczytu, dopóki nie zostanie "
+"ona wykonana bez ewentualnych awarii serializacji."
+
+#: utils/misc/guc.c:1204
+msgid "Check function bodies during CREATE FUNCTION."
+msgstr "Sprawdzenie ciała funkcji podczas CREATE FUNCTION."
+
+#: utils/misc/guc.c:1213
+msgid "Enable input of NULL elements in arrays."
+msgstr "Zezwolenie na wprowadzanie elementów NULL do tablic."
+
+#: utils/misc/guc.c:1214
+msgid ""
+"When turned on, unquoted NULL in an array input value means a null value; "
+"otherwise it is taken literally."
+msgstr ""
+"Gdy włączone, niecytowane NULL w wartościach wejściowych tablicy oznaczają "
+"wartości puste; w przeciwnym przypadku brane jest dosłownie."
+
+#: utils/misc/guc.c:1224
+msgid "Create new tables with OIDs by default."
+msgstr "Tworzenie nowych tabel domyślnie z OID."
+
+#: utils/misc/guc.c:1233
+msgid ""
+"Start a subprocess to capture stderr output and/or csvlogs into log files."
+msgstr ""
+"Uruchomienie podprocesu do przechwytywania wyjścia stderr i/lub csvlogs do "
+"plików dziennika."
+
+#: utils/misc/guc.c:1242
+msgid "Truncate existing log files of same name during log rotation."
+msgstr ""
+"Obcięcie istniejących plików dziennika o tej samej nazwie podczas obrotu "
+"dziennika."
+
+#: utils/misc/guc.c:1253
+msgid "Emit information about resource usage in sorting."
+msgstr "Tworzenie informacji dotyczących użycia zasobów w sortowaniu."
+
+#: utils/misc/guc.c:1267
+msgid "Generate debugging output for synchronized scanning."
+msgstr "Generowanie wyjścia debugowania dla skanowania synchronicznego."
+
+#: utils/misc/guc.c:1282
+#, fuzzy
+msgid "Enable bounded sorting using heap sort."
+msgstr "WÅ‚Ä…cz ograniczone sortowanie za pomocÄ… sortowania sterty."
+
+#: utils/misc/guc.c:1295
+msgid "Emit WAL-related debugging output."
+msgstr "Tworzy wyjście debugu związanego z WAL."
+
+#: utils/misc/guc.c:1307
+msgid "Datetimes are integer based."
+msgstr "Podstawą znaczników czasu są liczby całkowite."
+
+#: utils/misc/guc.c:1322
+msgid ""
+"Sets whether Kerberos and GSSAPI user names should be treated as case-"
+"insensitive."
+msgstr ""
+"Określa, czy nazwy użytkowników Kerberos i GSSAPI należy rozróżniać ze "
+"względu na wielkości liter."
+
+#: utils/misc/guc.c:1332
+msgid "Warn about backslash escapes in ordinary string literals."
+msgstr ""
+"Ostrzega przed ucieczkami za pomocą bakslaszy w zwykłych stałych znakowych."
+
+#: utils/misc/guc.c:1342
+msgid "Causes '...' strings to treat backslashes literally."
+msgstr "Powoduje że w ciągach znaków '...' bakslasze traktowane są dosłownie."
+
+#: utils/misc/guc.c:1353
+msgid "Enable synchronized sequential scans."
+msgstr "Zezwala na synchroniczne skany sekwencyjne."
+
+#: utils/misc/guc.c:1363
+msgid "Allows archiving of WAL files using archive_command."
+msgstr "Zezwala na archiwizację plików WAL przy użyciu archive_command."
+
+#: utils/misc/guc.c:1373
+msgid "Allows connections and queries during recovery."
+msgstr "Zezwala na połączenia i zapytania podczas odzyskiwania."
+
+#: utils/misc/guc.c:1383
+msgid ""
+"Allows feedback from a hot standby to the primary that will avoid query "
+"conflicts."
+msgstr ""
+"Pozwala na informacje zwrotną z gorącej rezerwy do podstawowego aby uniknąć "
+"konfliktu zapytań."
+
+#: utils/misc/guc.c:1393
+msgid "Allows modifications of the structure of system tables."
+msgstr "Pozwala na modyfikacje struktury tabel systemowych."
+
+#: utils/misc/guc.c:1404
+msgid "Disables reading from system indexes."
+msgstr "Zabrania odczytu indeksów systemowych."
+
+#: utils/misc/guc.c:1405
+msgid ""
+"It does not prevent updating the indexes, so it is safe to use.  The worst "
+"consequence is slowness."
+msgstr ""
+"Nie zapobiega to aktualizacji indeksów, zatem jest bezpieczne w użyciu.  "
+"NajgorszÄ… konsekwencja jest spowolnienie."
+
+#: utils/misc/guc.c:1416
+msgid ""
+"Enables backward compatibility mode for privilege checks on large objects."
+msgstr ""
+"Pozwala na tryb zgodności wstecznej przy sprawdzaniu uprawnień do dużych "
+"obiektów."
+
+#: utils/misc/guc.c:1417
+msgid ""
+"Skips privilege checks when reading or modifying large objects, for "
+"compatibility with PostgreSQL releases prior to 9.0."
+msgstr ""
+"Pomija sprawdzanie uprawnień podczas odczytu i modyfikacji dużych obiektów, "
+"dla zgodności z wydaniami PostgreSQL przed 9.0."
+
+#: utils/misc/guc.c:1427
+msgid "When generating SQL fragments, quote all identifiers."
+msgstr "Podczas generowania fragmentów SQL, cytuje wszystkie identyfikatory."
+
+#: utils/misc/guc.c:1446
+msgid ""
+"Forces a switch to the next xlog file if a new file has not been started "
+"within N seconds."
+msgstr ""
+"Wymusza przełączenie na następny plik xlog jeśli nowy plik nie był "
+"rozpoczęty w czasie N sekund."
+
+#: utils/misc/guc.c:1457
+msgid "Waits N seconds on connection startup after authentication."
+msgstr "Oczekuje N sekund podczas uruchomienia połączenia po uwierzytelnieniu."
+
+#: utils/misc/guc.c:1458 utils/misc/guc.c:1907
+msgid "This allows attaching a debugger to the process."
+msgstr "To pozwala dołączyć debugger do procesu."
+
+#: utils/misc/guc.c:1467
+msgid "Sets the default statistics target."
+msgstr "Ustawia domyślną próbkę statystyczną."
+
+#: utils/misc/guc.c:1468
+msgid ""
+"This applies to table columns that have not had a column-specific target set "
+"via ALTER TABLE SET STATISTICS."
+msgstr ""
+"Odnosi się to do kolumn w tabeli, które nie miały ustawionego celu "
+"bespośrednio dla kolumny przez STATYSTYKI ALTER TABLE SET."
+
+#: utils/misc/guc.c:1477
+msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
+msgstr ""
+"Ustawia długość FROM-listy, powyżej której podzapytania nie są zwijane."
+
+#: utils/misc/guc.c:1479
+msgid ""
+"The planner will merge subqueries into upper queries if the resulting FROM "
+"list would have no more than this many items."
+msgstr ""
+"Planista połączy podzapytania do górnych zapytań, jeżeli wynikowa lista FROM "
+"miałaby więcej niż tyle pozycji."
+
+#: utils/misc/guc.c:1489
+msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
+msgstr ""
+"Ustawia długość FROM-listy, powyżej której podzapytania nie są spłaszczane."
+
+#: utils/misc/guc.c:1491
+msgid ""
+"The planner will flatten explicit JOIN constructs into lists of FROM items "
+"whenever a list of no more than this many items would result."
+msgstr ""
+"Planista będzie spłaszczyć formalne konstrukcje JOIN do listy pozycji FROM, "
+"gdy lista nie będzie miała więcej niż tyle pozycji w wyniku."
+
+#: utils/misc/guc.c:1501
+msgid "Sets the threshold of FROM items beyond which GEQO is used."
+msgstr "Ustawia próg pozycji FROM, po przekroczeniu którego jest używany GEQO."
+
+#: utils/misc/guc.c:1510
+msgid "GEQO: effort is used to set the default for other GEQO parameters."
+msgstr ""
+"GEQO: włożono wysiłek by ustawić wartości domyślne dal innych parametrów "
+"GEQO."
+
+#: utils/misc/guc.c:1519
+msgid "GEQO: number of individuals in the population."
+msgstr "GEQO: liczba jednostek w populacji."
+
+#: utils/misc/guc.c:1520 utils/misc/guc.c:1529
+msgid "Zero selects a suitable default value."
+msgstr "Zero wybiera odpowiednią wartość domyślną."
+
+#: utils/misc/guc.c:1528
+msgid "GEQO: number of iterations of the algorithm."
+msgstr "GEQO: liczba iteracji algorytmu."
+
+#: utils/misc/guc.c:1539
+msgid "Sets the time to wait on a lock before checking for deadlock."
+msgstr "Ustawia czas oczekiwania na blokadę przed sprawdzeniem zakleszczeń."
+
+#: utils/misc/guc.c:1550
+msgid ""
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing archived WAL data."
+msgstr ""
+"Ustawia maksymalne opóźnienie przed anulowaniem zapytań gdy serwer gotowości "
+"przetwarza archiwizowane dane WAL."
+
+#: utils/misc/guc.c:1561
+msgid ""
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing streamed WAL data."
+msgstr ""
+"Ustawia maksymalne opóźnienie przed anulowaniem zapytań gdy serwer gotowości "
+"przetwarza strumieniowane dane WAL."
+
+#: utils/misc/guc.c:1572
+msgid ""
+"Sets the maximum interval between WAL receiver status reports to the primary."
+msgstr ""
+"Ustawia największy interwał pomiędzy wysłaniami raportu statusu odbiornika "
+"WAL do głównego."
+
+#: utils/misc/guc.c:1583
+msgid "Sets the maximum number of concurrent connections."
+msgstr "Ustawia maksymalną liczbę jednoczesnych połączeń."
+
+#: utils/misc/guc.c:1593
+msgid "Sets the number of connection slots reserved for superusers."
+msgstr "Ustawia liczbę slotów połączeń zarezerwowanych dla superużytkowników."
+
+#: utils/misc/guc.c:1607
+msgid "Sets the number of shared memory buffers used by the server."
+msgstr "Ustawia liczbę buforów pamięci współdzielonej używanych przez serwer."
+
+#: utils/misc/guc.c:1618
+msgid "Sets the maximum number of temporary buffers used by each session."
+msgstr ""
+"Ustawia maksymalną liczbę buforów tymczasowych używanych przez każdą sesję."
+
+#: utils/misc/guc.c:1629
+msgid "Sets the TCP port the server listens on."
+msgstr "Ustawia port TCP, na którym nasłuchuje serwer."
+
+#: utils/misc/guc.c:1639
+msgid "Sets the access permissions of the Unix-domain socket."
+msgstr "Ustawia uprawnienia dostępu gniazda domeny Uniksa."
+
+#: utils/misc/guc.c:1640
+msgid ""
+"Unix-domain sockets use the usual Unix file system permission set. The "
+"parameter value is expected to be a numeric mode specification in the form "
+"accepted by the chmod and umask system calls. (To use the customary octal "
+"format the number must start with a 0 (zero).)"
+msgstr ""
+"Gniazda domeny Uniks używają zestawu uprawnień zwykłych systemowych plików "
+"Uniks. Wartość parametru jest oczekiwaną specyfikacją w trybie numerycznym w "
+"formie akceptowanej przez polecenia systemowe chmod i umask. (Aby skorzystać "
+"z powszechnie przyjętego formatu ósemkowego numer musi zaczynać się od 0 "
+"(zero).)"
+
+#: utils/misc/guc.c:1654
+msgid "Sets the file permissions for log files."
+msgstr "Ustawia uprawnienia plikowe do plików dziennika."
+
+#: utils/misc/guc.c:1655
+msgid ""
+"The parameter value is expected to be a numeric mode specification in the "
+"form accepted by the chmod and umask system calls. (To use the customary "
+"octal format the number must start with a 0 (zero).)"
+msgstr ""
+"Wartość parametru jest oczekiwaną specyfikacją w trybie numerycznym w formie "
+"akceptowanej przez polecenia systemowe chmod i umask. (Aby skorzystać z "
+"powszechnie przyjętego formatu ósemkowego numer musi zaczynać się od 0 "
+"(zero).)"
+
+#: utils/misc/guc.c:1668
+msgid "Sets the maximum memory to be used for query workspaces."
+msgstr ""
+"Ustawia maksymalną wielkość pamięci do użycia jako przestrzeń robocza "
+"kwerend."
+
+#: utils/misc/guc.c:1669
+msgid ""
+"This much memory can be used by each internal sort operation and hash table "
+"before switching to temporary disk files."
+msgstr ""
+"Jest to wskazanie jaka ilość pamięci może być używana przez każdą z "
+"wewnętrznych operacji sortowania i tabelę mieszania przed przełączeniem do "
+"plików tymczasowych na dysku."
+
+#: utils/misc/guc.c:1681
+msgid "Sets the maximum memory to be used for maintenance operations."
+msgstr "Ustawia maksymalną wielkość pamięci dla operacji utrzymania."
+
+#: utils/misc/guc.c:1682
+msgid "This includes operations such as VACUUM and CREATE INDEX."
+msgstr "Zawarte tu sÄ… operacje takie jak VACUUM i CREATE INDEX."
+
+#: utils/misc/guc.c:1697
+msgid "Sets the maximum stack depth, in kilobytes."
+msgstr "Ustawia maksymalną głębokość stosu, w kilobajtach."
+
+#: utils/misc/guc.c:1708
+msgid "Vacuum cost for a page found in the buffer cache."
+msgstr "Koszt odkurzania dla strony znalezionej w pamięci podręcznej bufora."
+
+#: utils/misc/guc.c:1718
+msgid "Vacuum cost for a page not found in the buffer cache."
+msgstr ""
+"Koszt odkurzania dla strony nieodnalezionej w pamięci podręcznej bufora."
+
+#: utils/misc/guc.c:1728
+msgid "Vacuum cost for a page dirtied by vacuum."
+msgstr "Koszt odkurzania dla strony zabrudzonej przez porzÄ…dkowanie."
+
+#: utils/misc/guc.c:1738
+msgid "Vacuum cost amount available before napping."
+msgstr "Kwota kosztów odkurzania dostępna przed drzemką."
+
+#: utils/misc/guc.c:1748
+msgid "Vacuum cost delay in milliseconds."
+msgstr "Koszt opóźnienia odkurzania w milisekundach."
+
+#: utils/misc/guc.c:1759
+msgid "Vacuum cost delay in milliseconds, for autovacuum."
+msgstr "Koszt opóźnienia odkurzania w milisekundach, dla autoodkurzania."
+
+#: utils/misc/guc.c:1770
+msgid "Vacuum cost amount available before napping, for autovacuum."
+msgstr "Kwota kosztów odkurzania dostępna przed drzemką, dla autoodkurzania."
+
+#: utils/misc/guc.c:1780
+msgid ""
+"Sets the maximum number of simultaneously open files for each server process."
+msgstr ""
+"Ustawia minimalną liczbę jednocześnie otwartych plików dla każdego procesu "
+"serwera."
+
+#: utils/misc/guc.c:1793
+msgid "Sets the maximum number of simultaneously prepared transactions."
+msgstr "Ustawia maksymalnÄ… liczbÄ™ jednoczesnych przygotowanych transakcji."
+
+#: utils/misc/guc.c:1826
+msgid "Sets the maximum allowed duration of any statement."
+msgstr "Ustawia maksymalny dozwolony czas trwania dowolnego wyrażenia."
+
+#: utils/misc/guc.c:1827
+msgid "A value of 0 turns off the timeout."
+msgstr "Wartość 0 wyłącza wyłączy limit czasu."
+
+#: utils/misc/guc.c:1837
+msgid "Minimum age at which VACUUM should freeze a table row."
+msgstr "Minimalny wiek, w którym VACUUM powinno zamrozić wiersz tabeli."
+
+#: utils/misc/guc.c:1847
+msgid "Age at which VACUUM should scan whole table to freeze tuples."
+msgstr ""
+"Wiek, w którym VACUUM powinno przeskanować całą tabelę w celu zamrożenia "
+"krotek."
+
+#: utils/misc/guc.c:1857
+msgid ""
+"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
+"if any."
+msgstr ""
+"Liczba transakcji, przez które VACUUM i HOT czyszczenie powinny być "
+"odroczone, jeśli w ogóle."
+
+#: utils/misc/guc.c:1870
+msgid "Sets the maximum number of locks per transaction."
+msgstr "Ustawia maksymalnÄ… liczbÄ™ blokad pojedynczej transakcji."
+
+#: utils/misc/guc.c:1871
+msgid ""
+"The shared lock table is sized on the assumption that at most "
+"max_locks_per_transaction * max_connections distinct objects will need to be "
+"locked at any one time."
+msgstr ""
+"Współdzielona tabela blokad posiada wielkość opartą na założeniu, że co "
+"najwyżej max_locks_per_transaction * max_connections odrębnych obiektów "
+"będzie musiało być zablokowane w jednym czasie."
+
+#: utils/misc/guc.c:1882
+msgid "Sets the maximum number of predicate locks per transaction."
+msgstr "Ustawia maksymalnÄ… liczbÄ™ blokad predykatu dla pojedynczej transakcji."
+
+#: utils/misc/guc.c:1883
+msgid ""
+"The shared predicate lock table is sized on the assumption that at most "
+"max_pred_locks_per_transaction * max_connections distinct objects will need "
+"to be locked at any one time."
+msgstr ""
+"Współdzielona tabela blokad predykatów posiada wielkość opartą na założeniu, "
+"że co najwyżej max_pred_locks_per_transaction * max_connections odrębnych "
+"obiektów będzie musiało być zablokowane w jednym czasie."
+
+#: utils/misc/guc.c:1894
+msgid "Sets the maximum allowed time to complete client authentication."
+msgstr "Ustawia maksymalny dozwolony czas dla zakończenia autoryzacji klienta."
+
+#: utils/misc/guc.c:1906
+msgid "Waits N seconds on connection startup before authentication."
+msgstr ""
+"Oczekuje N sekund podczas uruchomienia połączenia przed uwierzytelnieniem."
+
+#: utils/misc/guc.c:1917
+msgid "Sets the number of WAL files held for standby servers."
+msgstr "Ustawia liczbę plików WAL przeznaczonych dla serwerów rezerwowych."
+
+#: utils/misc/guc.c:1927
+msgid ""
+"Sets the maximum distance in log segments between automatic WAL checkpoints."
+msgstr ""
+"Ustawia maksymalną odległość w segmentach logów pomiędzy automatycznymi "
+"punktami kontrolnymi WAL."
+
+#: utils/misc/guc.c:1937
+msgid "Sets the maximum time between automatic WAL checkpoints."
+msgstr ""
+"Ustawia maksymalny czas pomiędzy automatycznymi punktami kontrolnymi WAL."
+
+#: utils/misc/guc.c:1948
+msgid ""
+"Enables warnings if checkpoint segments are filled more frequently than this."
+msgstr ""
+"Włącza ostrzeżenia jeśli segmenty punktu kontrolnego zostaną zapisane "
+"częściej niż ta wartość."
+
+#: utils/misc/guc.c:1950
+msgid ""
+"Write a message to the server log if checkpoints caused by the filling of "
+"checkpoint segment files happens more frequently than this number of "
+"seconds. Zero turns off the warning."
+msgstr ""
+"Pisze komunikat do dziennika serwera jeśli punkty kontrolne spowodowane "
+"przez wypełnienie segmentu pliku punktu kontrolnego wykonują się częściej "
+"niż wskazana liczba sekund. Zero wyłącza ostrzeżenie."
+
+#: utils/misc/guc.c:1962
+msgid "Sets the number of disk-page buffers in shared memory for WAL."
+msgstr "Ustawia liczbę buforów strony dysku w pamięci współdzielonej dla WAL."
+
+#: utils/misc/guc.c:1973
+msgid "WAL writer sleep time between WAL flushes."
+msgstr "Czas uśpienia procesu zapisu WAL pomiędzy opróżnieniami WAL."
+
+#: utils/misc/guc.c:1985
+msgid "Sets the maximum number of simultaneously running WAL sender processes."
+msgstr ""
+"Ustawia minimalną liczbę jednocześnie uruchomionych procesów wysyłających "
+"WAL."
+
+#: utils/misc/guc.c:1995
+msgid "WAL sender sleep time between WAL replications."
+msgstr "Czas uśpienia procesu wysyłającego WAL pomiędzy replikacjami WAL."
+
+#: utils/misc/guc.c:2006
+msgid "Sets the maximum time to wait for WAL replication."
+msgstr "Ustawia maksymalny czas oczekiwania na replikacjÄ™ WAL."
+
+#: utils/misc/guc.c:2017
+msgid ""
+"Sets the delay in microseconds between transaction commit and flushing WAL "
+"to disk."
+msgstr ""
+"Ustawia opóźnienie w mikrosekundach pomiędzy zatwierdzeniem transakcji i "
+"opróżnieniem WAL na dysk."
+
+#: utils/misc/guc.c:2028
+msgid ""
+"Sets the minimum concurrent open transactions before performing commit_delay."
+msgstr ""
+"Ustawia minimalną liczbę jednocześnie otwartych transakcji przed wykonaniem "
+"commit_delay."
+
+#: utils/misc/guc.c:2039
+msgid "Sets the number of digits displayed for floating-point values."
+msgstr "Ustawia liczbę cyfr wyświetlanych dla wartości zmiennoprzecinkowych."
+
+#: utils/misc/guc.c:2040
+msgid ""
+"This affects real, double precision, and geometric data types. The parameter "
+"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
+"appropriate)."
+msgstr ""
+"Dotyczy to liczb rzeczywistych, podwójnej precyzji i geometrycznych typów "
+"danych. Wartość parametru jest dodawana do zwykłej ilości cyfr (odpowiednio "
+"FLT_DIG lub DBL_DIG)."
+
+#: utils/misc/guc.c:2051
+msgid "Sets the minimum execution time above which statements will be logged."
+msgstr ""
+"Ustawia minimalny czas wykonania powyżej którego wyrażenia będą rejestrowane."
+
+#: utils/misc/guc.c:2053
+msgid "Zero prints all queries. -1 turns this feature off."
+msgstr "Zero drukuje wszystkie zapytania. -1 wyłącza funkcję."
+
+#: utils/misc/guc.c:2063
+msgid ""
+"Sets the minimum execution time above which autovacuum actions will be "
+"logged."
+msgstr ""
+"Ustawia minimalny czas wykonania powyżej którego akcje autoodkurzania będą "
+"rejestrowane."
+
+#: utils/misc/guc.c:2065
+msgid "Zero prints all actions. -1 turns autovacuum logging off."
+msgstr "Zero drukuje wszystkie akcje. -1 wyłącza rejestrowanie autoodkurzania."
+
+#: utils/misc/guc.c:2075
+msgid "Background writer sleep time between rounds."
+msgstr "Czas uśpienia pomiędzy rundami procesu zapisu w tle."
+
+#: utils/misc/guc.c:2086
+msgid "Background writer maximum number of LRU pages to flush per round."
+msgstr ""
+"Maksymalna liczba stron LRU jakie proces zapisu w tle opróżnia na rundę."
+
+#: utils/misc/guc.c:2102
+msgid ""
+"Number of simultaneous requests that can be handled efficiently by the disk "
+"subsystem."
+msgstr ""
+"Liczba jednoczesnych żądań. które mogą być dobrze obsługiwane przez "
+"podsystem dyskowy."
+
+#: utils/misc/guc.c:2103
+msgid ""
+"For RAID arrays, this should be approximately the number of drive spindles "
+"in the array."
+msgstr ""
+"Dla macierzy RAID, powinna to być w przybliżeniu liczba wrzecion napędowych "
+"w macierzy."
+
+#: utils/misc/guc.c:2116
+msgid "Automatic log file rotation will occur after N minutes."
+msgstr "Automatyczna rotacja plików dziennika powinna nastąpić po N minutach."
+
+#: utils/misc/guc.c:2127
+msgid "Automatic log file rotation will occur after N kilobytes."
+msgstr ""
+"Automatyczna rotacja plików dziennika powinna nastąpić po N kilobajtach."
+
+#: utils/misc/guc.c:2138
+msgid "Shows the maximum number of function arguments."
+msgstr "Pokazuje maksymalną liczbę argumentów funkcji."
+
+#: utils/misc/guc.c:2149
+msgid "Shows the maximum number of index keys."
+msgstr "Pokazuje maksymalnÄ… liczbÄ™ kluczy indeksu."
+
+#: utils/misc/guc.c:2160
+msgid "Shows the maximum identifier length."
+msgstr "Pokazuje maksymalną długość identyfikatora."
+
+#: utils/misc/guc.c:2171
+msgid "Shows the size of a disk block."
+msgstr "Pokazuje rozmiar bloku dyskowego."
+
+#: utils/misc/guc.c:2182
+msgid "Shows the number of pages per disk file."
+msgstr "Pokazuje liczbÄ™ stron na plik dysku."
+
+#: utils/misc/guc.c:2193
+msgid "Shows the block size in the write ahead log."
+msgstr "Pokazuje rozmiar bloku w dzienniku zapisu z wyprzedzeniem."
+
+#: utils/misc/guc.c:2204
+msgid "Shows the number of pages per write ahead log segment."
+msgstr "Pokazuje liczbÄ™ stron na segment dziennika zapisu z wyprzedzeniem."
+
+#: utils/misc/guc.c:2217
+msgid "Time to sleep between autovacuum runs."
+msgstr "Czas uśpienia pomiędzy uruchomieniami autoodkurzania."
+
+#: utils/misc/guc.c:2227
+msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgstr "Minimalna liczba modyfikacji lub usunięć krotek przed odkurzeniem."
+
+#: utils/misc/guc.c:2236
+msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
+msgstr ""
+"Minimalna liczba wstawień, modyfikacji lub usunięć krotek przed analizą."
+
+#: utils/misc/guc.c:2246
+msgid ""
+"Age at which to autovacuum a table to prevent transaction ID wraparound."
+msgstr ""
+"Wiek w jakim autoodkurzać tabelę by przeciwdziałać zawijaniu IDów transakcji."
+
+#: utils/misc/guc.c:2257
+msgid ""
+"Sets the maximum number of simultaneously running autovacuum worker "
+"processes."
+msgstr ""
+"Ustawia minimalną liczbę jednocześnie uruchomionych procesów roboczych "
+"autoodkurzania."
+
+#: utils/misc/guc.c:2267
+msgid "Time between issuing TCP keepalives."
+msgstr "Czas pomiędzy wydaniami sygnalizowania aktywności TCP."
+
+#: utils/misc/guc.c:2268 utils/misc/guc.c:2279
+msgid "A value of 0 uses the system default."
+msgstr "Wartość 0 używa wartości domyślnej dla systemu."
+
+#: utils/misc/guc.c:2278
+msgid "Time between TCP keepalive retransmits."
+msgstr "Czas pomiędzy retransmisjami sygnalizowania aktywności TCP."
+
+#: utils/misc/guc.c:2289
+msgid ""
+"Set the amount of traffic to send and receive before renegotiating the "
+"encryption keys."
+msgstr ""
+"Ustawia ilości ruchu do wysyłania i odbierania przed renegocjacją kluczy "
+"szyfrowania."
+
+#: utils/misc/guc.c:2300
+msgid "Maximum number of TCP keepalive retransmits."
+msgstr "Maksymalna liczba retransmisji sygnalizowania aktywności TCP."
+
+#: utils/misc/guc.c:2301
+msgid ""
+"This controls the number of consecutive keepalive retransmits that can be "
+"lost before a connection is considered dead. A value of 0 uses the system "
+"default."
+msgstr ""
+"Kontroluje liczbę następujących po sobie retransmisji które mogą zostać "
+"zagubione zanim połączenie będzie uznane za martwe. Wartość 0 oznacza użycie "
+"domyślnej wartości systemowej."
+
+#: utils/misc/guc.c:2312
+msgid "Sets the maximum allowed result for exact search by GIN."
+msgstr ""
+"Ustawia maksymalny dopuszczalny wynik dokładnego wyszukiwania przez GIN."
+
+#: utils/misc/guc.c:2323
+msgid "Sets the planner's assumption about the size of the disk cache."
+msgstr ""
+"Ustawia założenia planisty dotyczące rozmiaru pamięci podręcznej dysku."
+
+#: utils/misc/guc.c:2324
+msgid ""
+"That is, the portion of the kernel's disk cache that will be used for "
+"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
+"kB each."
+msgstr ""
+"Oznacza to część jądra pamięci podręcznej na dysku, która będzie używana do "
+"plików danych PostgreSQL. Jest ona mierzona w stronach dysku, które zwykle "
+"zajmują 8 kB każda."
+
+#: utils/misc/guc.c:2337
+msgid "Shows the server version as an integer."
+msgstr "Pokazuje wersję serwera jako liczbę całkowitą."
+
+#: utils/misc/guc.c:2348
+msgid "Log the use of temporary files larger than this number of kilobytes."
+msgstr ""
+"Rejestruje użycie plików tymczasowych większych niż ta liczba kilobajtów."
+
+#: utils/misc/guc.c:2349
+msgid "Zero logs all files. The default is -1 (turning this feature off)."
+msgstr ""
+"Zero rejestruje wszystkie pliki. Wartością domyślną jest -1 (wyłączająca "
+"funkcjÄ™)."
+
+#: utils/misc/guc.c:2359
+msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
+msgstr ""
+"Ustawia rozmiar zarezerwowany dla pg_stat_activity.current_query, w bajtach."
+
+#: utils/misc/guc.c:2378
+msgid ""
+"Sets the planner's estimate of the cost of a sequentially fetched disk page."
+msgstr ""
+"Ustawia oszacowanie planisty dla kosztów strony dysku pobieranej "
+"sekwencyjnie."
+
+#: utils/misc/guc.c:2388
+msgid ""
+"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
+"page."
+msgstr ""
+"Ustawia oszacowanie planisty dla kosztów strony dysku pobieranej "
+"niesekwencyjnie."
+
+#: utils/misc/guc.c:2398
+msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
+msgstr ""
+"Ustawia szacunkowy koszt planisty dla przetwarzania każdej krotki (wiersza)."
+
+#: utils/misc/guc.c:2408
+msgid ""
+"Sets the planner's estimate of the cost of processing each index entry "
+"during an index scan."
+msgstr ""
+"Ustawia oszacowanie kosztów planisty dla przetwarzania każdego wpisu indeksu "
+"podczas skanowania indeksu."
+
+#: utils/misc/guc.c:2418
+msgid ""
+"Sets the planner's estimate of the cost of processing each operator or "
+"function call."
+msgstr ""
+"Ustawia szacunkowy koszt planisty dla przetwarzania każdego operatora lub "
+"funkcji."
+
+#: utils/misc/guc.c:2429
+msgid ""
+"Sets the planner's estimate of the fraction of a cursor's rows that will be "
+"retrieved."
+msgstr ""
+"Ustawia oszacowania planisty, jaka część wierszy kursora ma być pobierana."
+
+#: utils/misc/guc.c:2440
+#, fuzzy
+msgid "GEQO: selective pressure within the population."
+msgstr "GEQO: selektywne ciśnienie wewnątrz populacji."
+
+#: utils/misc/guc.c:2450
+#, fuzzy
+msgid "GEQO: seed for random path selection."
+msgstr "GEQO: nasiona dla wyboru ścieżek losowych."
+
+#: utils/misc/guc.c:2460
+msgid "Multiple of the average buffer usage to free per round."
+msgstr "Wielokrotne średniego użycia bufora do uwolnienia na rundę."
+
+#: utils/misc/guc.c:2470
+msgid "Sets the seed for random-number generation."
+msgstr "Ustawia nasiona dla generatora liczb losowych."
+
+#: utils/misc/guc.c:2481
+msgid ""
+"Number of tuple updates or deletes prior to vacuum as a fraction of "
+"reltuples."
+msgstr ""
+"Liczba krotek zmienionych lub usuniętych przed odkurzeniem jako część "
+"relkrotek."
+
+#: utils/misc/guc.c:2490
+msgid ""
+"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
+"of reltuples."
+msgstr ""
+"Liczba krotek wstawionych, zmienionych lub usuniętych przed analizą jako "
+"część relkrotek."
+
+#: utils/misc/guc.c:2500
+msgid ""
+"Time spent flushing dirty buffers during checkpoint, as fraction of "
+"checkpoint interval."
+msgstr ""
+"Czas przeznaczony na opróżnianie brudnych buforów w czasie punktu "
+"kontrolnego, jako funkcja interwału punktu kontrolnego."
+
+#: utils/misc/guc.c:2519
+msgid "Sets the shell command that will be called to archive a WAL file."
+msgstr ""
+"Ustawia polecenie powłoki, które będzie wywoływane do archiwizacji pliku WAL."
+
+#: utils/misc/guc.c:2529
+msgid "Sets the client's character set encoding."
+msgstr "Ustawia zestaw znaków kodowania klienta."
+
+#: utils/misc/guc.c:2540
+msgid "Controls information prefixed to each log line."
+msgstr ""
+"Kontroluje informację znajdującą się na początku każdej linii dziennika."
+
+#: utils/misc/guc.c:2541
+msgid "If blank, no prefix is used."
+msgstr "Jeśli pusta, przedrostek nie jest używany."
+
+#: utils/misc/guc.c:2550
+msgid "Sets the time zone to use in log messages."
+msgstr "Ustawia strefę czasową używaną w komunikatach dziennika."
+
+#: utils/misc/guc.c:2560
+msgid "Sets the display format for date and time values."
+msgstr "Ustawia format wyświetlania dla wartości daty i czasu."
+
+#: utils/misc/guc.c:2561
+msgid "Also controls interpretation of ambiguous date inputs."
+msgstr "Kontroluje również interpretację niejasnych wprowadzeń daty."
+
+#: utils/misc/guc.c:2572
+msgid "Sets the default tablespace to create tables and indexes in."
+msgstr ""
+"Ustawia domyślną przestrzeń tabel w której tworzy się nowe tabele i indeksy."
+
+#: utils/misc/guc.c:2573
+msgid "An empty string selects the database's default tablespace."
+msgstr "Pusty ciąg znaków wybiera domyślną przestrzeń tabel bazy danych."
+
+#: utils/misc/guc.c:2583
+msgid "Sets the tablespace(s) to use for temporary tables and sort files."
+msgstr ""
+"Ustawia przestrzeń(nie) tabel dla tabel tymczasowych i plików sortowań."
+
+#: utils/misc/guc.c:2594
+msgid "Sets the path for dynamically loadable modules."
+msgstr "Ustawia ścieżkę dla modułów wczytywanych dynamicznie."
+
+#: utils/misc/guc.c:2595
+msgid ""
+"If a dynamically loadable module needs to be opened and the specified name "
+"does not have a directory component (i.e., the name does not contain a "
+"slash), the system will search this path for the specified file."
+msgstr ""
+"Jeśli dynamicznie wczytywany moduł powinien być otwarty a wskazana nazwa nie "
+"posiada składowej folderu (tj. nazwa nie zawiera ukośnika), system będzie "
+"przeszukiwał tą ścieżkę pod kątem wskazanego pliku."
+
+#: utils/misc/guc.c:2608
+msgid "Sets the location of the Kerberos server key file."
+msgstr "Ustawia położenie pliku klucza serwera Kerberos."
+
+#: utils/misc/guc.c:2619
+msgid "Sets the name of the Kerberos service."
+msgstr "Ustawia nazwę usługi Kerberos."
+
+#: utils/misc/guc.c:2629
+msgid "Sets the Bonjour service name."
+msgstr "Ustawia nazwę usługi Bonjour."
+
+#: utils/misc/guc.c:2641
+#, fuzzy
+msgid "Shows the collation order locale."
+msgstr ""
+"Pokazuje klasyfikację znaków i przekształcenia wielkości znaków lokalizacji."
+
+#: utils/misc/guc.c:2652
+msgid "Shows the character classification and case conversion locale."
+msgstr ""
+"Pokazuje klasyfikację znaków i przekształcenia wielkości znaków lokalizacji."
+
+#: utils/misc/guc.c:2663
+msgid "Sets the language in which messages are displayed."
+msgstr "Ustawia język, w jakim komunikaty będą wyświetlane."
+
+#: utils/misc/guc.c:2673
+msgid "Sets the locale for formatting monetary amounts."
+msgstr "Ustawia lokalizację dla formatowania kwot pieniędzy."
+
+#: utils/misc/guc.c:2683
+msgid "Sets the locale for formatting numbers."
+msgstr "Ustawia lokalizacjÄ™ dla formatowania liczb."
+
+#: utils/misc/guc.c:2693
+msgid "Sets the locale for formatting date and time values."
+msgstr "Ustawia lokalizację dla wartości daty i czasu."
+
+#: utils/misc/guc.c:2703
+msgid "Lists shared libraries to preload into server."
+msgstr ""
+"Listuje współdzielone biblioteki do uprzedniego wczytania przez serwer."
+
+#: utils/misc/guc.c:2714
+msgid "Lists shared libraries to preload into each backend."
+msgstr ""
+"Listuje współdzielone biblioteki do uprzedniego wczytania przez każdy "
+"backend."
+
+#: utils/misc/guc.c:2725
+msgid "Sets the schema search order for names that are not schema-qualified."
+msgstr "Ustawia porzÄ…dek wyszukiwania w schematach nazw niekwalifikowanych."
+
+#: utils/misc/guc.c:2737
+msgid "Sets the server (database) character set encoding."
+msgstr "Ustawia zestaw znaków kodowania serwera (bazy danych)."
+
+#: utils/misc/guc.c:2749
+msgid "Shows the server version."
+msgstr "Pokazuje wersjÄ™ serwera."
+
+#: utils/misc/guc.c:2761
+msgid "Sets the current role."
+msgstr "Ustawia bieżącą rolę."
+
+#: utils/misc/guc.c:2773
+msgid "Sets the session user name."
+msgstr "Ustawia nazwę użytkownika sesji."
+
+#: utils/misc/guc.c:2784
+msgid "Sets the destination for server log output."
+msgstr "Ustawia cel dla wyjścia dziennika serwera."
+
+#: utils/misc/guc.c:2785
+msgid ""
+"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
+"\"eventlog\", depending on the platform."
+msgstr ""
+"Poprawnymi wartościami są \"stderr\", \"syslog\", \"csvlog\", i \"eventlog"
+"\", w zależności od platformy."
+
+#: utils/misc/guc.c:2796
+msgid "Sets the destination directory for log files."
+msgstr "Ustawia folder docelowy dla plików dziennika."
+
+#: utils/misc/guc.c:2797
+msgid "Can be specified as relative to the data directory or as absolute path."
+msgstr ""
+"Może być wskazany jako względny do folderu danych lun jako ścieżka "
+"bezwzględna."
+
+#: utils/misc/guc.c:2807
+msgid "Sets the file name pattern for log files."
+msgstr "Ustawia wzorzec nazwy pliku dla plików dziennika."
+
+#: utils/misc/guc.c:2818
+msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+msgstr ""
+"Ustawia nazwę programu używanego do identyfikacji komunikatów PostgreSQL w "
+"syslogu."
+
+#: utils/misc/guc.c:2829
+msgid "Sets the time zone for displaying and interpreting time stamps."
+msgstr ""
+"Ustawia strefę czasową do wyświetlania i interpretacji znaczników czasu."
+
+#: utils/misc/guc.c:2839
+msgid "Selects a file of time zone abbreviations."
+msgstr "Wybiera plik dla skrótów strefy czasowej."
+
+#: utils/misc/guc.c:2849
+msgid "Sets the current transaction's isolation level."
+msgstr "Ustawia poziom izolacji dla bieżącej transakcji."
+
+#: utils/misc/guc.c:2860
+msgid "Sets the owning group of the Unix-domain socket."
+msgstr "Ustawia grupę będącą właścicielem gniazda domeny Uniksa."
+
+#: utils/misc/guc.c:2861
+msgid ""
+"The owning user of the socket is always the user that starts the server."
+msgstr ""
+"Użytkownik będący właścicielem gniazda jest zawsze użytkownikiem "
+"uruchamiajÄ…cym serwer."
+
+#: utils/misc/guc.c:2871
+msgid "Sets the directory where the Unix-domain socket will be created."
+msgstr "Ustawia folder, w którym będzie utworzone gniazdo domeny Uniksa."
+
+#: utils/misc/guc.c:2882
+msgid "Sets the host name or IP address(es) to listen to."
+msgstr "Ustawia nazwę hosta lub adres(y) IP do słuchania."
+
+#: utils/misc/guc.c:2893
+msgid "Sets the list of known custom variable classes."
+msgstr "Ustawia listÄ™ kolumn klas zmiennych niestandardowych."
+
+#: utils/misc/guc.c:2904
+msgid "Sets the server's data directory."
+msgstr "Ustawia folder danych serwera."
+
+#: utils/misc/guc.c:2915
+msgid "Sets the server's main configuration file."
+msgstr "Ustawia podstawowy plik konfiguracyjny serwera."
+
+#: utils/misc/guc.c:2926
+msgid "Sets the server's \"hba\" configuration file."
+msgstr "Ustawia podstawowy plik \"hba\" serwera."
+
+#: utils/misc/guc.c:2937
+msgid "Sets the server's \"ident\" configuration file."
+msgstr "Ustawia podstawowy plik konfiguracyjny \"ident\" serwera."
+
+#: utils/misc/guc.c:2948
+msgid "Writes the postmaster PID to the specified file."
+msgstr "Zapisuje PID postmastera do wskazanego pliku."
+
+#: utils/misc/guc.c:2959
+msgid "Writes temporary statistics files to the specified directory."
+msgstr "Zapisuje tymczasowe pliki statystyk do wskazanego katalogu."
+
+#: utils/misc/guc.c:2970
+msgid "List of names of potential synchronous standbys."
+msgstr "Lista nazw potencjalnych synchronicznych gotowości."
+
+#: utils/misc/guc.c:2981
+msgid "Sets default text search configuration."
+msgstr "Ustawia domyślną konfigurację wyszukiwania tekstowego."
+
+#: utils/misc/guc.c:2991
+msgid "Sets the list of allowed SSL ciphers."
+msgstr "Ustawia listę dopuszczalnych szyfrów SSL."
+
+#: utils/misc/guc.c:3006
+msgid "Sets the application name to be reported in statistics and logs."
+msgstr ""
+"Ustawia nazwę aplikacji jaką należy podać w statystykach i dziennikach."
+
+#: utils/misc/guc.c:3026
+msgid "Sets whether \"\\'\" is allowed in string literals."
+msgstr "Ustawia czy \"\\'\" jest dozwolone w literałach znakowych."
+
+#: utils/misc/guc.c:3036
+msgid "Sets the output format for bytea."
+msgstr "Ustawia format wyjścia dla bytea."
+
+#: utils/misc/guc.c:3046
+msgid "Sets the message levels that are sent to the client."
+msgstr "Ustawia poziomy komunikatu, które należy wysłać do klienta."
+
+#: utils/misc/guc.c:3047 utils/misc/guc.c:3100 utils/misc/guc.c:3111
+#: utils/misc/guc.c:3167
+msgid ""
+"Each level includes all the levels that follow it. The later the level, the "
+"fewer messages are sent."
+msgstr ""
+"Każdy poziom zawiera wszystkie kolejne poziomy za nim. Im dalszy poziom, tym "
+"mniej komunikatów będzie wysyłanych."
+
+#: utils/misc/guc.c:3057
+msgid "Enables the planner to use constraints to optimize queries."
+msgstr "Włącza użycie przez planistę ograniczeń dla optymalizacji zapytań."
+
+#: utils/misc/guc.c:3058
+msgid ""
+"Table scans will be skipped if their constraints guarantee that no rows "
+"match the query."
+msgstr ""
+"Skany tabel będą pomijane jeśli ich ograniczenia gwarantują, że żaden wiersz "
+"nie pasuje do zapytania."
+
+#: utils/misc/guc.c:3068
+msgid "Sets the transaction isolation level of each new transaction."
+msgstr "Ustawia poziom izolacji transakcji każdej nowej transakcji."
+
+#: utils/misc/guc.c:3078
+msgid "Sets the display format for interval values."
+msgstr "Ustawia format wyświetlania dla wartości interwału."
+
+#: utils/misc/guc.c:3089
+msgid "Sets the verbosity of logged messages."
+msgstr "Ustawia rozwlekłość rejestrowanych komunikatów."
+
+#: utils/misc/guc.c:3099
+msgid "Sets the message levels that are logged."
+msgstr "Ustawia poziomy komunikatów które są rejestrowane."
+
+#: utils/misc/guc.c:3110
+msgid ""
+"Causes all statements generating error at or above this level to be logged."
+msgstr ""
+"Powoduje, że wszystkie wyrażenia generujące błąd na tym poziomie lub powyżej "
+"tego poziomu, muszą być rejestrowane."
+
+#: utils/misc/guc.c:3121
+msgid "Sets the type of statements logged."
+msgstr "Ustawia typ rejestrowanych wyrażeń."
+
+#: utils/misc/guc.c:3131
+msgid "Sets the syslog \"facility\" to be used when syslog enabled."
+msgstr ""
+"Ustawia \"ustępliwość\" syslogu, której należy użyć przy włączonym syslogu."
+
+#: utils/misc/guc.c:3146
+msgid "Sets the session's behavior for triggers and rewrite rules."
+msgstr "Ustawia zachowanie sesji dla wyzwalaczy i reguł przepisywania."
+
+#: utils/misc/guc.c:3156
+msgid "Sets the current transaction's synchronization level."
+msgstr "Ustawia poziom synchronizacji dla bieżącej transakcji."
+
+#: utils/misc/guc.c:3166
+msgid "Enables logging of recovery-related debugging information."
+msgstr ""
+"WÅ‚Ä…cza rejestracjÄ™ informacji diagnostycznych zwiÄ…zanych z odzyskiwaniem."
+
+#: utils/misc/guc.c:3182
+msgid "Collects function-level statistics on database activity."
+msgstr ""
+"Gromadzi statystyki dotyczące aktywności bazy danych na poziomie funkcji."
+
+#: utils/misc/guc.c:3192
+msgid "Set the level of information written to the WAL."
+msgstr "Ustawia poziom informacji zapisany do WAL."
+
+#: utils/misc/guc.c:3202
+msgid "Selects the method used for forcing WAL updates to disk."
+msgstr "Wybiera metodę użytą do wymuszenia modyfikacji WAL na dysk."
+
+#: utils/misc/guc.c:3212
+msgid "Sets how binary values are to be encoded in XML."
+msgstr "Ustawia wartości binarne do zakodowania w XML."
+
+#: utils/misc/guc.c:3222
+msgid ""
+"Sets whether XML data in implicit parsing and serialization operations is to "
+"be considered as documents or content fragments."
+msgstr ""
+"Ustawia, kiedy dane XML w bezwarunkowych operacjach parsowania i "
+"serializacji mają być traktowane jako dokumenty lub fragmenty zawartości."
+
+#: utils/misc/guc.c:4064
+#, c-format
+msgid ""
+"%s does not know where to find the server configuration file.\n"
+"You must specify the --config-file or -D invocation option or set the PGDATA "
+"environment variable.\n"
+msgstr ""
+"%s nie wie gdzie znaleźć plik konfiguracji serwera.\n"
+"Musisz wskazać --config-file lub opcję uruchomienia -D lub ustawić zmienną "
+"środowiskową PGDATA.\n"
+
+#: utils/misc/guc.c:4083
+#, c-format
+msgid "%s cannot access the server configuration file \"%s\": %s\n"
+msgstr "%s nie może uzyskać dostępu do pliku konfiguracyjnego \"%s\": %s\n"
+
+#: utils/misc/guc.c:4103
+#, c-format
+msgid ""
+"%s does not know where to find the database system data.\n"
+"This can be specified as \"data_directory\" in \"%s\", or by the -D "
+"invocation option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s nie wie gdzie znaleźć dane systemu bazy danych.\n"
+"Może on zostać wskazany jako \"data_directory\" w \"%s\" lub przez opcję "
+"wywołania -D albo przez zmienną środowiskową PGDATA.\n"
+
+#: utils/misc/guc.c:4134
+#, c-format
+msgid ""
+"%s does not know where to find the \"hba\" configuration file.\n"
+"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s nie wie gdzie znaleźć plik konfiguracyjny \"hba\".\n"
+"Może on zostać wskazany jako \"hba_file\" w \"%s\" lub przez opcję wywołania "
+"-D albo przez zmienną środowiskową PGDATA.\n"
+
+#: utils/misc/guc.c:4157
+#, c-format
+msgid ""
+"%s does not know where to find the \"ident\" configuration file.\n"
+"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s nie wie gdzie znaleźć plik konfiguracyjny \"ident\".\n"
+"Może on zostać wskazany jako \"ident_file\" w \"%s\" lub przez opcję "
+"wywołania -D albo przez zmienną środowiskową PGDATA.\n"
+
+#: utils/misc/guc.c:4739 utils/misc/guc.c:4903
+msgid "Value exceeds integer range."
+msgstr "Wartość przekracza zakres wartości całkowitych."
+
+#: utils/misc/guc.c:4758
+msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
+msgstr ""
+"Prawidłowymi jednostkami dla tego parametru są \"kB\", \"MB\", and \"GB\"."
+
+#: utils/misc/guc.c:4817
+msgid ""
+"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
+msgstr ""
+"Prawidłowymi jednostkami dla tego parametru są \"ms\", \"s\", \"min\", \"h"
+"\", i \"d\"."
+
+#: utils/misc/guc.c:5100 utils/misc/guc.c:5869 utils/misc/guc.c:5921
+#: utils/misc/guc.c:6594 utils/misc/guc.c:6753 utils/misc/guc.c:7932
+#: guc-file.l:203
+#, c-format
+msgid "unrecognized configuration parameter \"%s\""
+msgstr "nierozpoznany parametr konfiguracyjny \"%s\""
+
+#: utils/misc/guc.c:5133
+#, c-format
+msgid "parameter \"%s\" cannot be changed"
+msgstr "parametr \"%s\" nie może być zmieniony"
+
+#: utils/misc/guc.c:5162 utils/misc/guc.c:5336 utils/misc/guc.c:5433
+#: utils/misc/guc.c:5527 utils/misc/guc.c:5641 utils/misc/guc.c:5742
+#: guc-file.l:250
+#, c-format
+msgid "parameter \"%s\" cannot be changed without restarting the server"
+msgstr "parametr \"%s\" nie może być zmieniony bez restartu serwera"
+
+#: utils/misc/guc.c:5172
+#, c-format
+msgid "parameter \"%s\" cannot be changed now"
+msgstr "parametr \"%s\" nie może być teraz zmieniony"
+
+#: utils/misc/guc.c:5203
+#, c-format
+msgid "parameter \"%s\" cannot be set after connection start"
+msgstr "parametr \"%s\" nie może być ustawiony po rozpoczęciu połączenia"
+
+#: utils/misc/guc.c:5213 utils/misc/guc.c:7947
+#, c-format
+msgid "permission denied to set parameter \"%s\""
+msgstr "odmowa dostępu do ustawienia parametru \"%s\""
+
+#: utils/misc/guc.c:5251
+#, c-format
+msgid "cannot set parameter \"%s\" within security-definer function"
+msgstr ""
+"nie można ustawić parametru \"%s\" w funkcji definiującej bezpieczeństwo"
+
+#: utils/misc/guc.c:5397 utils/misc/guc.c:5711 utils/misc/guc.c:8111
+#: utils/misc/guc.c:8145
+#, c-format
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "nieprawidłowa wartość dla parametru \"%s\": \"%s\""
+
+#: utils/misc/guc.c:5406
+#, c-format
+msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
+msgstr ""
+"%d jest poza prawidłowym zakresem wartości dla parametru \"%s\" (%d .. %d)"
+
+#: utils/misc/guc.c:5492
+#, c-format
+msgid "parameter \"%s\" requires a numeric value"
+msgstr "parametr \"%s\" wymaga wartości numerycznej"
+
+#: utils/misc/guc.c:5500
+#, c-format
+msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
+msgstr ""
+"%g jest poza prawidłowym zakresem wartości dla parametru \"%s\" (%g .. %g)"
+
+#: utils/misc/guc.c:5877 utils/misc/guc.c:5925 utils/misc/guc.c:6757
+#, c-format
+msgid "must be superuser to examine \"%s\""
+msgstr "musisz być superużytkownikiem by skontrolować \"%s\""
+
+#: utils/misc/guc.c:5991
+#, c-format
+msgid "SET %s takes only one argument"
+msgstr "SET %s przyjmuje jedynie jeden argument"
+
+#: utils/misc/guc.c:6224
+msgid "SET requires parameter name"
+msgstr "SET wymaga nazwy parametru"
+
+#: utils/misc/guc.c:6339
+#, c-format
+msgid "attempt to redefine parameter \"%s\""
+msgstr "próba przedefiniowania parametru \"%s\""
+
+#: utils/misc/guc.c:7648
+#, c-format
+msgid "could not parse setting for parameter \"%s\""
+msgstr "nie można zanalizować ustawienia parametru \"%s\""
+
+#: utils/misc/guc.c:8009 utils/misc/guc.c:8043
+#, c-format
+msgid "invalid value for parameter \"%s\": %d"
+msgstr "nieprawidłowa wartość dla parametru \"%s\": %d"
+
+#: utils/misc/guc.c:8077
+#, c-format
+msgid "invalid value for parameter \"%s\": %g"
+msgstr "nieprawidłowa wartość dla parametru \"%s\": %g"
+
+#: utils/misc/guc.c:8267
+msgid ""
+"\"temp_buffers\" cannot be changed after any temporary tables have been "
+"accessed in the session."
+msgstr ""
+"\"temp_buffers\" nie mogą być zmienione po uzyskaniu dostępu do tabel "
+"tymczasowych w sesji."
+
+#: utils/misc/guc.c:8279
+msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+msgstr "SET AUTOCOMMIT TO OFF nie jest już obsługiwany"
+
+#: utils/misc/guc.c:8354
+msgid "assertion checking is not supported by this build"
+msgstr "sprawdzanie asercji nie jest obsługiwane przez tą kompilację"
+
+#: utils/misc/guc.c:8367
+msgid "Bonjour is not supported by this build"
+msgstr "Bonjour nie jest obsługiwany przez tą kompilację"
+
+#: utils/misc/guc.c:8380
+msgid "SSL is not supported by this build"
+msgstr "SSL nie jest obsługiwany przez tą kompilację"
+
+#: utils/misc/guc.c:8392
+msgid "Cannot enable parameter when \"log_statement_stats\" is true."
+msgstr "Nie można włączyć parametru gdy \"log_statement_stats\" jest prawdą."
+
+#: utils/misc/guc.c:8404
+msgid ""
+"Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
+"\"log_planner_stats\", or \"log_executor_stats\" is true."
+msgstr ""
+"Nie można włączyć \"log_statement_stats\" gdy \"log_parser_stats\", "
+"\"log_planner_stats\", lub \"log_executor_stats\" jest prawdÄ…."
+
+#: utils/misc/help_config.c:131
+msgid "internal error: unrecognized run-time parameter type\n"
+msgstr "błąd wewnętrzny: nierozpoznany typ parametru czasu wykonania\n"
+
+#: utils/misc/tzparser.c:61
+#, c-format
+msgid ""
+"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
+"zone file \"%s\", line %d"
+msgstr ""
+"skrót nazwy strefy czasowej \"%s\" jest zbyt długi (maksymalnie %d znaków) w "
+"pliku strefy czasowej \"%s\", linia %d"
+
+#: utils/misc/tzparser.c:68
+#, c-format
+msgid ""
+"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
+"\"%s\", line %d"
+msgstr ""
+"przesunięcie strefy czasowej %d nie jest wielokrotnością 900 sek (15 min) w "
+"pliku strefy czasowej \"%s\", linia %d"
+
+#: utils/misc/tzparser.c:80
+#, c-format
+msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
+msgstr ""
+"przesunięcie strefy czasowej %d jest poza zakresem w pliku strefy czasowej "
+"\"%s\", linia %d"
+
+#: utils/misc/tzparser.c:115
+#, c-format
+msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
+msgstr ""
+"brak skrótu nazwy strefy czasowej w pliku strefy czasowej \"%s\", linia %d"
+
+#: utils/misc/tzparser.c:124
+#, c-format
+msgid "missing time zone offset in time zone file \"%s\", line %d"
+msgstr ""
+"brak przesunięcia strefy czasowej w pliku strefy czasowej \"%s\", linia %d"
+
+#: utils/misc/tzparser.c:131
+#, c-format
+msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
+msgstr ""
+"niepoprawna liczba dla przesunięcia strefy czasowej w pliku strefy czasowej "
+"\"%s\", linia %d"
+
+#: utils/misc/tzparser.c:154
+#, c-format
+msgid "invalid syntax in time zone file \"%s\", line %d"
+msgstr "nieprawidłowa składnia w pliku strefy czasowej \"%s\", linia %d"
+
+#: utils/misc/tzparser.c:218
+#, c-format
+msgid "time zone abbreviation \"%s\" is multiply defined"
+msgstr "skrót dla strefy czasowej \"%s\" jest wielokrotnie zdefiniowany"
+
+#: utils/misc/tzparser.c:220
+#, c-format
+msgid ""
+"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
+"\", line %d."
+msgstr ""
+"Wpis w pliku strefy czasowej \"%s\", linia %d jest sprzeczny z wpisem w "
+"pliku \"%s\", linia %d."
+
+#: utils/misc/tzparser.c:285
+#, c-format
+msgid "invalid time zone file name \"%s\""
+msgstr "nieprawidłowa nazwa pliku strefy czasowej \"%s\""
+
+#: utils/misc/tzparser.c:298
+#, c-format
+msgid "time zone file recursion limit exceeded in file \"%s\""
+msgstr "limit rekursji pliku strefy czasowej przekroczony w pliku \"%s\""
+
+#: utils/misc/tzparser.c:337 utils/misc/tzparser.c:350
+#, c-format
+msgid "could not read time zone file \"%s\": %m"
+msgstr "nie można odczytać pliku strefy czasowej \"%s\": %m"
+
+#: utils/misc/tzparser.c:360
+#, c-format
+msgid "line is too long in time zone file \"%s\", line %d"
+msgstr "zbyt długa linia w pliku strefy czasowej \"%s\", linia %d"
+
+#: utils/misc/tzparser.c:383
+#, c-format
+msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
+msgstr "@INCLUDE bez nazwy pliku w pliku strefy czasowej \"%s\", linia %d"
+
+#: guc-file.l:274
+#, c-format
+msgid "parameter \"%s\" removed from configuration file, reset to default"
+msgstr ""
+"parametr \"%s\" usunięty z pliku konfiguracyjnego, ustawienie na wartość "
+"domyślną"
+
+#: guc-file.l:333
+#, c-format
+msgid "parameter \"%s\" changed to \"%s\""
+msgstr "parametr \"%s\" zmieniony na \"%s\""
+
+#: guc-file.l:374
+#, c-format
+msgid ""
+"could not open configuration file \"%s\": maximum nesting depth exceeded"
+msgstr ""
+"nie można otworzyć pliku konfiguracyjnego \"%s\": przekroczona maksymalna "
+"głębokość kaskadowania"
+
+#: guc-file.l:589
+#, c-format
+msgid "syntax error in file \"%s\" line %u, near end of line"
+msgstr "błąd składni w pliku \"%s\" linia %u, blisko końca linii"
+
+#: guc-file.l:594
+#, c-format
+msgid "syntax error in file \"%s\" line %u, near token \"%s\""
+msgstr "błąd składni w pliku \"%s\" linia %u, blisko tokena \"%s\""
+
+#: ../port/chklocale.c:328 ../port/chklocale.c:334
+#, c-format
+msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
+msgstr ""
+"nie udało się określić kodowania dla lokalizacji \"%s\": zestaw znaków to "
+"\"%s\""
+
+#: ../port/chklocale.c:336
+msgid "Please report this to <pgsql-bugs@postgresql.org>."
+msgstr "Proszę zgłosić to na adres <pgsql-bugs@postgresql.org>."
+
+#: ../port/dirmod.c:75 ../port/dirmod.c:88 ../port/dirmod.c:101
+#, c-format
+msgid "out of memory\n"
+msgstr "brak pamięci\n"
+
+#: ../port/dirmod.c:283
+#, c-format
+msgid "could not set junction for \"%s\": %s"
+msgstr "nie można ustanowić złączenia dla \"%s\": %s"
+
+#: ../port/dirmod.c:286
+#, 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:358
+#, c-format
+msgid "could not get junction for \"%s\": %s"
+msgstr "nie można ustanowić złączenia dla \"%s\": %s"
+
+#: ../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "nie można pobrać złączenia dla \"%s\": %s\n"
+
+#: ../port/dirmod.c:443
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "nie można otworzyć katalogu \"%s\": %s\n"
+
+#: ../port/dirmod.c:480
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "nie można czytać katalogu \"%s\": %s\n"
+
+#: ../port/dirmod.c:563
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr "nie można wykonać polecenia stat na pliku lub katalogu \"%s\": %s\n"
+
+#: ../port/dirmod.c:590 ../port/dirmod.c:607
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "nie można usunąć pliku lub katalogu \"%s\": %s\n"
+
+#: ../port/exec.c:125 ../port/exec.c:239 ../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nie można zidentyfikować aktualnego katalogu: %s"
+
+#: ../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "niepoprawny binarny \"%s\""
+
+#: ../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nie można odczytać binarnego \"%s\""
+
+#: ../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nie znaleziono \"%s\" do wykonania"
+
+#: ../port/exec.c:255 ../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: ../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nie można odczytać linku symbolicznego \"%s\""
+
+#: ../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "proces potomny zakończył działanie z kodem %d"
+
+#: ../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "proces potomny został zatrzymany przez wyjątek 0x%X"
+
+#: ../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "proces potomny został zatrzymany przez sygnał %s"
+
+#: ../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "proces potomny został zakończony przez sygnał %d"
+
+#: ../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
+
+#: ../port/open.c:113
+msgid "sharing violation"
+msgstr "naruszenie współdzielenia"
+
+#: ../port/open.c:113
+msgid "lock violation"
+msgstr "naruszenie blokady"
+
+#: ../port/open.c:112
+#, c-format
+msgid "could not open file \"%s\": %s"
+msgstr "nie można otworzyć pliku \"%s\": %s"
+
+#: ../port/open.c:114
+msgid "Continuing to retry for 30 seconds."
+msgstr "Kontynuacja ponownej próby za 30 sekund."
+
+#: ../port/open.c:115
+msgid ""
+"You might have antivirus, backup, or similar software interfering with the "
+"database system."
+msgstr ""
+"Prawdopodobnie twój program antywirusowy, kopii zapasowej lub podobny "
+"ingeruje w system bazy danych."
+
+#: ../port/strerror.c:25
+#, c-format
+msgid "unrecognized error %d"
+msgstr "nierozpoznany błąd %d"
+
+#: ../port/win32error.c:188
+#, c-format
+msgid "mapped win32 error code %lu to %d"
+msgstr "zmapowano kod błędu win32 %lu do %d"
+
+#: ../port/win32error.c:199
+#, c-format
+msgid "unrecognized win32 error code: %lu"
+msgstr "nierozpoznany kod błędu win32: %lu"
+
+#~ msgid "restore_command = '%s'"
+#~ msgstr "polecenie_odtworzenia = '%s'"
+
+#~ msgid "recovery_end_command = '%s'"
+#~ msgstr "polecenie_końca_odzyskiwania = '%s'"
+
+#~ msgid "archive_cleanup_command = '%s'"
+#~ msgstr "polecenie_czyszczenia_archiwum = '%s'"
+
+#~ msgid "pause_at_recovery_target = '%s'"
+#~ msgstr "pauza_w_celu_odzyskiwania = '%s'"
+
+#~ msgid "recovery_target_timeline = %u"
+#~ msgstr "linia_czasu_celu_odzyskiwania = %u"
+
+#~ msgid "recovery_target_timeline = latest"
+#~ msgstr "linia_czasu_celu_odzyskiwania = najpóźniejsza"
+
+#~ msgid "recovery_target_xid = %u"
+#~ msgstr "xid_celu_odzyskiwania = %u"
+
+#~ msgid "recovery_target_time = '%s'"
+#~ msgstr "recovery_target_time = '%s'"
+
+#~ msgid "recovery_target_name = '%s'"
+#~ msgstr "nazwa_celu_odzyskiwania = '%s'"
+
+#~ msgid "recovery_target_inclusive = %s"
+#~ msgstr "zawieranie_celu_odzyskiwania = %s"
+
+#~ msgid "standby_mode = '%s'"
+#~ msgstr "standby_mode = '%s'"
+
+#~ msgid "primary_conninfo = '%s'"
+#~ msgstr "infopołącz_pierwotnego = '%s'"
+
+#~ msgid "trigger_file = '%s'"
+#~ msgstr "plik_wyzwalacza = '%s'"
+
+#~ msgid "parameter \"lc_collate\" parameter must be specified"
+#~ msgstr "parametr \"lc_collate\" musi być określony"
+
+#~ msgid "array must not contain null values"
+#~ msgstr "tablica nie moze zawierac pustych wartosci"
+
+#~ msgid ""
+#~ "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the "
+#~ "server was compiled with LOCALE_NAME_BUFLEN %d."
+#~ msgstr ""
+#~ "Klaster bazy zostal zainicjalizowany z LOCALE_NAME_BUFLEN %d, ale serwer "
+#~ "zostal skompilowany z LOCALE_NAME_BUFLEN %d."
+
+#~ msgid "parser stack overflow"
+#~ msgstr "przepelnienie stosu parsera"
+
+#~ msgid "there are objects dependent on %s"
+#~ msgstr "istnieja obiekty zalezne od %s"
+
+#~ msgid "\"%s\" is a system catalog"
+#~ msgstr "\"%s\" jest katalogiem systemowym"
+
+#~ msgid "could not remove database directory \"%s\""
+#~ msgstr "nie mozna usunac katalogu bazy \"%s\""
+
+#~ msgid "transaction is read-only"
+#~ msgstr "transakcja jest transakcja tylko do odczytu"
+
+#~ msgid "function \"%s\" is already in schema \"%s\""
+#~ msgstr "funkcja \"%s\" jest juz w schemacie \"%s\""
+
+#~ msgid "multiple DELETE events specified"
+#~ msgstr "wystapilo wielokrotnie zdarzenie DELETE"
+
+#~ msgid "cannot change number of columns in view"
+#~ msgstr "nie mozna zmieniac liczby kolumn w widoku"
+
+#~ msgid "missing field in file \"%s\" at end of line %d"
+#~ msgstr "brakujace pole w pliku \"%s\" na koncu linii %d"
+
+#~ msgid "SELECT FOR UPDATE/SHARE is not supported for inheritance queries"
+#~ msgstr ""
+#~ "SELECT FOR UPDATE/SHARE nie jest wspierane w zapytaniach dziedziczacych"
+
+#~ msgid "SELECT FOR UPDATE/SHARE is not allowed in subqueries"
+#~ msgstr "SELECT FOR UPDATE/SHARE nie jest dopuszczalne w podzapytaniach"
+
+#~ msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
+#~ msgstr "SELECT FOR UPDATE/SHARE nie moze byc zastosowane do NEW lub OLD"
+
+#~ msgid "missing FROM-clause entry in subquery for table \"%s\""
+#~ msgstr "brakujaca klauzula FROM w podzapytaniu dla tabeli \"%s\""
+
+#~ msgid "adding missing FROM-clause entry in subquery for table \"%s\""
+#~ msgstr ""
+#~ "dodawanie brakujacej pozycji w klauzuli FROM w podzapytaniu dla tabeli "
+#~ "\"%s\""
+
+#~ msgid "adding missing FROM-clause entry for table \"%s\""
+#~ msgstr "dodawanie brakujacej pozycji w klauzuli FROM dla tabeli \"%s\""
+
+#~ msgid "not unique \"S\""
+#~ msgstr "nie unikalne \"S\""
+
+#~ msgid "invalid AM/PM string"
+#~ msgstr "nieprawidlowy lancuch tekstowy AM/PM"
+
+#~ msgid "\"TZ\"/\"tz\" not supported"
+#~ msgstr "\"TZ\"/\"tz\" niewspierany"
+
+#~ msgid "January"
+#~ msgstr "Styczen"
+
+#~ msgid "February"
+#~ msgstr "Luty"
+
+#~ msgid "March"
+#~ msgstr "Marzec"
+
+#~ msgid "April"
+#~ msgstr "Kwiecien"
+
+#~ msgid "May"
+#~ msgstr "Maj"
+
+#~ msgid "June"
+#~ msgstr "Czerwiec"
+
+#~ msgid "July"
+#~ msgstr "Lipiec"
+
+#~ msgid "August"
+#~ msgstr "Sierpien"
+
+#~ msgid "September"
+#~ msgstr "Wrzesien"
+
+#~ msgid "October"
+#~ msgstr "Październik"
+
+#~ msgid "November"
+#~ msgstr "Listopad"
+
+#~ msgid "December"
+#~ msgstr "Grudzien"
+
+#~ msgid "Jan"
+#~ msgstr "Sty"
+
+#~ msgid "Feb"
+#~ msgstr "Lut"
+
+#~ msgid "Mar"
+#~ msgstr "Mar"
+
+#~ msgid "Apr"
+#~ msgstr "Kwi"
+
+#~ msgid "S:May"
+#~ msgstr "S:Maj"
+
+#~ msgid "Jun"
+#~ msgstr "Cze"
+
+#~ msgid "Jul"
+#~ msgstr "Lip"
+
+#~ msgid "Aug"
+#~ msgstr "Lip"
+
+#~ msgid "Sep"
+#~ msgstr "Wrz"
+
+#~ msgid "Oct"
+#~ msgstr "Paź"
+
+#~ msgid "Nov"
+#~ msgstr "Lis"
+
+#~ msgid "Dec"
+#~ msgstr "Gru"
+
+#~ msgid "Sunday"
+#~ msgstr "Niedziela"
+
+#~ msgid "Monday"
+#~ msgstr "Poniedzialek"
+
+#~ msgid "Tuesday"
+#~ msgstr "Wtorek"
+
+#~ msgid "Wednesday"
+#~ msgstr "Åšroda"
+
+#~ msgid "Thursday"
+#~ msgstr "Czwartek"
+
+#~ msgid "Friday"
+#~ msgstr "Piatek"
+
+#~ msgid "Saturday"
+#~ msgstr "Sobota"
+
+#~ msgid "Sun"
+#~ msgstr "Nie"
+
+#~ msgid "Mon"
+#~ msgstr "Pon"
+
+#~ msgid "Tue"
+#~ msgstr "Wto"
+
+#~ msgid "Wed"
+#~ msgstr "Åšro"
+
+#~ msgid "Thu"
+#~ msgstr "Czw"
+
+#~ msgid "Fri"
+#~ msgstr "Pia"
+
+#~ msgid "Sat"
+#~ msgstr "Sob"
+
+#~ msgid "AM/PM hour must be between 1 and 12"
+#~ msgstr "godziny AM/PM musza byc pomiedzy 1 i 12"
+
+#~ msgid "cannot calculate week number without year information"
+#~ msgstr "nie mozna wyznaczyc numeru tygodnia bez informacji o roku"
+
+#~ msgid "Use the @@@ operator instead."
+#~ msgstr "Uzyj operatora @@@ w zamian."
+
+#~ msgid "Valid values are ON, OFF, and SAFE_ENCODING."
+#~ msgstr "Prawidlowymi wartosciami sa ON, OFF i SAFE_ENCODING."
+
+#~ msgid ""
+#~ "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, "
+#~ "LOCAL7."
+#~ msgstr ""
+#~ "Prawidlowymi wartosciami sa LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, "
+#~ "LOCAL5, LOCAL6, LOCAL7."
+
+#~ msgid "Valid values are BASE64 and HEX."
+#~ msgstr "Prawidlowymi wartosciami sa BASE64 i HEX."
+
+#~ msgid "Table contains duplicated values."
+#~ msgstr "Tabela zawiera powielone wartosci."
diff --git a/src/backend/po/pt_BR.po b/src/backend/po/pt_BR.po
index 5fac3e25b0be5..23af715081761 100644
--- a/src/backend/po/pt_BR.po
+++ b/src/backend/po/pt_BR.po
@@ -1,11 +1,13 @@
-# "postgres" translation to Brazilian Portuguese Language.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2010.
+# Brazilian Portuguese message translation file for postgres
+# 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-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-16 11:46-0300\n"
+"POT-Creation-Date: 2011-12-01 17:48-0300\n"
 "PO-Revision-Date: 2010-05-11 08:53-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -15,8593 +17,8646 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: executor/execCurrent.c:66 utils/adt/xml.c:2044 utils/adt/xml.c:2208
-#: commands/portalcmds.c:168 commands/portalcmds.c:222
+#: bootstrap/bootstrap.c:277 tcop/postgres.c:3388 postmaster/postmaster.c:682
 #, c-format
-msgid "cursor \"%s\" does not exist"
-msgstr "cursor \"%s\" não existe"
+msgid "--%s requires a value"
+msgstr "--%s requer um valor"
 
-#: executor/execCurrent.c:75
+#: bootstrap/bootstrap.c:282 tcop/postgres.c:3393 postmaster/postmaster.c:687
 #, c-format
-msgid "cursor \"%s\" is not a SELECT query"
-msgstr "cursor \"%s\" não é uma consulta SELECT"
+msgid "-c %s requires a value"
+msgstr "-c %s requer um valor"
 
-#: executor/execCurrent.c:81
+#: bootstrap/bootstrap.c:293 postmaster/postmaster.c:699
+#: postmaster/postmaster.c:712
 #, c-format
-msgid "cursor \"%s\" is held from a previous transaction"
-msgstr "cursor \"%s\" está aberto de uma transação anterior"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: executor/execCurrent.c:113
+#: bootstrap/bootstrap.c:302
 #, c-format
-msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
-msgstr ""
-"cursor \"%s\" têm múltiplas referências FOR UPDATE/SHARE para tabela \"%s\""
+msgid "%s: invalid command-line arguments\n"
+msgstr "%s: argumentos de linha de comando inválidos\n"
 
-#: executor/execCurrent.c:122
+#: tcop/postgres.c:349 tcop/postgres.c:372 tcop/fastpath.c:290
+#: commands/copy.c:542 commands/copy.c:561 commands/copy.c:565
+msgid "unexpected EOF on client connection"
+msgstr "EOF inesperado durante conexão do cliente"
+
+#: tcop/postgres.c:399 tcop/postgres.c:411 tcop/postgres.c:422
+#: tcop/postgres.c:434 tcop/postgres.c:4152
+#, c-format
+msgid "invalid frontend message type %d"
+msgstr "tipo de mensagem do cliente %d é inválido"
+
+#: tcop/postgres.c:858
 #, c-format
+msgid "statement: %s"
+msgstr "comando: %s"
+
+#: tcop/postgres.c:917 tcop/postgres.c:1227 tcop/postgres.c:1508
+#: tcop/postgres.c:1950 tcop/postgres.c:2318 tcop/postgres.c:2399
+#: tcop/fastpath.c:303
 msgid ""
-"cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
+"current transaction is aborted, commands ignored until end of transaction "
+"block"
 msgstr ""
-"cursor \"%s\" não tem uma referência FOR UPDATE/SHARE para tabela \"%s\""
+"transação atual foi interrompida, comandos ignorados até o fim do bloco de "
+"transação"
 
-#: executor/execCurrent.c:132 executor/execCurrent.c:178
+#: tcop/postgres.c:1087 tcop/postgres.c:1374 tcop/postgres.c:1791
+#: tcop/postgres.c:2008 tcop/fastpath.c:411
 #, c-format
-msgid "cursor \"%s\" is not positioned on a row"
-msgstr "cursor \"%s\" não está posicionado em um registro"
+msgid "duration: %s ms"
+msgstr "duração: %s ms"
 
-#: executor/execCurrent.c:165
+#: tcop/postgres.c:1092
 #, c-format
-msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
-msgstr ""
-"cursor \"%s\" não é simplesmente uma busca atualizável da tabela \"%s\""
+msgid "duration: %s ms  statement: %s"
+msgstr "duração: %s ms  comando: %s"
 
-#: executor/execCurrent.c:230 executor/execQual.c:1024
+#: tcop/postgres.c:1142
 #, c-format
-msgid ""
-"type of parameter %d (%s) does not match that when preparing the plan (%s)"
-msgstr "tipo de parâmetro %d (%s) não corresponde aquele ao preparar o plano (%s)"
+msgid "parse %s: %s"
+msgstr "análise de %s: %s"
 
-#: executor/execCurrent.c:242 executor/execQual.c:1035
-#, c-format
-msgid "no value found for parameter %d"
-msgstr "nenhum valor encontrado para parâmetro %d"
+#: tcop/postgres.c:1200
+msgid "cannot insert multiple commands into a prepared statement"
+msgstr "não pode inserir múltiplos comandos no comando preparado"
 
-#: executor/spi.c:210
-msgid "transaction left non-empty SPI stack"
-msgstr "transação não deixou pilha SPI vazia"
+#: tcop/postgres.c:1267 commands/prepare.c:122 parser/parse_param.c:303
+#, c-format
+msgid "could not determine data type of parameter $%d"
+msgstr "não pôde determinar o tipo de dado do parâmetro $%d"
 
-#: executor/spi.c:211 executor/spi.c:275
-msgid "Check for missing \"SPI_finish\" calls."
-msgstr "Verifique a falta de chamadas \"SPI_finish\"."
+#: tcop/postgres.c:1379
+#, c-format
+msgid "duration: %s ms  parse %s: %s"
+msgstr "duração: %s ms  análise de %s: %s"
 
-#: executor/spi.c:274
-msgid "subtransaction left non-empty SPI stack"
-msgstr "subtransação não deixou pilha SPI vazia"
+#: tcop/postgres.c:1425
+#, c-format
+msgid "bind %s to %s"
+msgstr "ligação de %s para %s"
 
-#: executor/spi.c:1137
-msgid "cannot open multi-query plan as cursor"
-msgstr "não pode abrir plano de múltiplas consultas como cursor"
+#: tcop/postgres.c:1444 tcop/postgres.c:2298
+msgid "unnamed prepared statement does not exist"
+msgstr "comando preparado sem nome não existe"
 
-#. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1142
+#: tcop/postgres.c:1486
 #, c-format
-msgid "cannot open %s query as cursor"
-msgstr "não pode abrir consulta %s como cursor"
+msgid "bind message has %d parameter formats but %d parameters"
+msgstr ""
+"mensagem de ligação tem %d formatos de parâmetro mas só tem %d parâmetros"
 
-#: executor/spi.c:1233 parser/analyze.c:1969
-msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE não é suportado"
+#: tcop/postgres.c:1492
+#, c-format
+msgid ""
+"bind message supplies %d parameters, but prepared statement \"%s\" requires "
+"%d"
+msgstr ""
+"mensagem de ligação forneceu %d parâmetros, mas comando preparado \"%s\" "
+"requer %d"
 
-#: executor/spi.c:1234 parser/analyze.c:1970
-msgid "Scrollable cursors must be READ ONLY."
-msgstr "Cursores roláveis devem ser READ ONLY."
+#: tcop/postgres.c:1657
+#, c-format
+msgid "incorrect binary data format in bind parameter %d"
+msgstr "formato de dado binário incorreto no parâmetro de ligação %d"
 
-#. translator: %s is a SQL statement name
-#: executor/spi.c:1256 executor/spi.c:1846 executor/functions.c:161
+#: tcop/postgres.c:1664 tcop/fastpath.c:180 tcop/fastpath.c:554
+#: access/common/printtup.c:278
 #, c-format
-msgid "%s is not allowed in a non-volatile function"
-msgstr "%s não é permitido em uma função não-volátil"
+msgid "unsupported format code: %d"
+msgstr "código do formato não é suportado: %d"
 
-#: executor/spi.c:2142
+#: tcop/postgres.c:1796
 #, c-format
-msgid "SQL statement \"%s\""
-msgstr "comando SQL \"%s\""
+msgid "duration: %s ms  bind %s%s%s: %s"
+msgstr "duração: %s ms  ligação %s%s%s: %s"
 
-#: executor/nodeAgg.c:1717 executor/nodeWindowAgg.c:1842
+#: tcop/postgres.c:1844 tcop/postgres.c:2385
 #, c-format
-msgid "aggregate %u needs to have compatible input type and transition type"
-msgstr ""
-"agregação %u precisa ter tipo de entrada e tipo transitório compatíveis"
+msgid "portal \"%s\" does not exist"
+msgstr "portal \"%s\" não existe"
+
+#: tcop/postgres.c:1931 tcop/postgres.c:2016
+msgid "execute fetch from"
+msgstr "executar busca de"
 
-#: executor/execUtils.c:1296
+#: tcop/postgres.c:1932 tcop/postgres.c:2017
+msgid "execute"
+msgstr "executar"
+
+#: tcop/postgres.c:1929
 #, c-format
-msgid "could not create exclusion constraint \"%s\""
-msgstr "não pôde criar restrição de exclusão \"%s\""
+msgid "%s %s%s%s: %s"
+msgstr "%s %s%s%s: %s"
 
-#: executor/execUtils.c:1298
+#: tcop/postgres.c:2013
 #, c-format
-msgid "Key %s conflicts with key %s."
-msgstr "Chave %s conflita com chave %s."
+msgid "duration: %s ms  %s %s%s%s: %s"
+msgstr "duração: %s ms  %s %s%s%s: %s"
 
-#: executor/execUtils.c:1303
+#: tcop/postgres.c:2139
 #, c-format
-msgid "conflicting key value violates exclusion constraint \"%s\""
-msgstr "conflitar valor da chave viola a restrição de exclusão \"%s\""
+msgid "prepare: %s"
+msgstr "preparado: %s"
 
-#: executor/execUtils.c:1305
+#: tcop/postgres.c:2202
 #, c-format
-msgid "Key %s conflicts with existing key %s."
-msgstr "Chave %s conflita com chave existente %s."
+msgid "parameters: %s"
+msgstr "parâmetros: %s"
 
-#: executor/execUtils.c:1319 access/nbtree/nbtinsert.c:448
-#, fuzzy, c-format
-msgid "failed to re-find tuple within index \"%s\""
-msgstr "falhou ao reencontrar tupla no índice \"%s\""
+#: tcop/postgres.c:2221
+msgid "abort reason: recovery conflict"
+msgstr "razão da interrupção: conflito de recuperação"
 
-#: executor/execUtils.c:1321 access/nbtree/nbtinsert.c:450
+#: tcop/postgres.c:2237
 #, fuzzy
-msgid "This may be because of a non-immutable index expression."
-msgstr "Isso pode ser por causa de uma expressão não imutável de índice."
+msgid "User was holding shared buffer pin for too long."
+msgstr "Usuário estava mantendo um buffer compartilhado por muito tempo."
 
-#: executor/nodeWindowAgg.c:1233
+#: tcop/postgres.c:2240
 #, fuzzy
-msgid "frame starting offset must not be null"
-msgstr "deslocamento inicial de quadro não deve ser nulo"
+msgid "User was holding a relation lock for too long."
+msgstr "Usuário estava mantendo um travamento de relação por muito tempo."
 
-#: executor/nodeWindowAgg.c:1246
+#: tcop/postgres.c:2243
 #, fuzzy
-msgid "frame starting offset must not be negative"
-msgstr "deslocamento inicial de quadro não deve ser negativo"
+msgid "User was or might have been using tablespace that must be dropped."
+msgstr "Usuário estava ou pode estar usando tablespace que dev ser removida."
 
-#: executor/nodeWindowAgg.c:1259
+#: tcop/postgres.c:2246
 #, fuzzy
-msgid "frame ending offset must not be null"
-msgstr "deslocamento final de quadro não deve ser nulo"
+msgid "User query might have needed to see row versions that must be removed."
+msgstr ""
+"Consulta do usuário pode ter precisado acessar versões de registros que "
+"devem ser removidas."
 
-#: executor/nodeWindowAgg.c:1272
+#: tcop/postgres.c:2249 storage/ipc/standby.c:491
 #, fuzzy
-msgid "frame ending offset must not be negative"
-msgstr "deslocamento final de quadro não deve ser negativo"
-
-#: executor/nodeLockRows.c:136 executor/nodeModifyTable.c:334
-#: executor/nodeModifyTable.c:522 executor/execMain.c:1544
-#: commands/trigger.c:2366
-msgid "could not serialize access due to concurrent update"
-msgstr "não pôde serializar acesso devido a uma atualização concorrente"
-
-#: executor/execQual.c:296 executor/execQual.c:324 executor/execQual.c:2988
-#: utils/adt/array_userfuncs.c:428 utils/adt/arrayfuncs.c:204
-#: utils/adt/arrayfuncs.c:483 utils/adt/arrayfuncs.c:1218
-#: utils/adt/arrayfuncs.c:2886 utils/adt/arrayfuncs.c:4566
-#, c-format
-msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
-msgstr "número de dimensões da matriz (%d) excede o máximo permitido (%d)"
-
-#: executor/execQual.c:309 executor/execQual.c:337
-msgid "array subscript in assignment must not be null"
-msgstr "índice da matriz em atribuição não deve ser nulo"
-
-#: executor/execQual.c:633 executor/execQual.c:3906
-#, c-format
-msgid "attribute %d has wrong type"
-msgstr "atributo %d tem tipo incorreto"
+msgid "User transaction caused buffer deadlock with recovery."
+msgstr "Transação do usuário causou impasse de buffer com recuperação."
 
-#: executor/execQual.c:634 executor/execQual.c:3907
-#, c-format
-msgid "Table has type %s, but query expects %s."
-msgstr "Tabela tem tipo %s, mas consulta espera %s."
+#: tcop/postgres.c:2252
+msgid "User was connected to a database that must be dropped."
+msgstr "Usuário estava conectado ao banco de dados que deve ser removido."
 
-#: executor/execQual.c:698 executor/execQual.c:717 executor/execQual.c:916
-#: executor/nodeModifyTable.c:82 executor/nodeModifyTable.c:92
-#: executor/nodeModifyTable.c:109 executor/nodeModifyTable.c:117
-msgid "table row type and query-specified row type do not match"
+#: tcop/postgres.c:2586
+msgid "terminating connection because of crash of another server process"
 msgstr ""
-"tipo de registro da tabela e tipo de registro especificado na consulta não "
-"correspondem"
-
-#: executor/execQual.c:699
-#, c-format
-msgid "Table row contains %d attribute, but query expects %d."
-msgid_plural "Table row contains %d attributes, but query expects %d."
-msgstr[0] "Registro da tabela contém %d atributo, mas consulta espera %d."
-msgstr[1] "Registro da tabela contém %d atributos, mas consulta espera %d."
-
-#: executor/execQual.c:718 executor/nodeModifyTable.c:93
-#, c-format
-msgid "Table has type %s at ordinal position %d, but query expects %s."
-msgstr "Tabela tem tipo %s na posição ordinal %d, mas consulta espera %s."
+"finalizando conexão por causa de uma queda de um outro processo servidor"
 
-#: executor/execQual.c:917 executor/execQual.c:1505
-#, c-format
-msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
+#: tcop/postgres.c:2587
+msgid ""
+"The postmaster has commanded this server process to roll back the current "
+"transaction and exit, because another server process exited abnormally and "
+"possibly corrupted shared memory."
 msgstr ""
-"Armazenamento físico não combina com atributo removido na posição ordinal %d."
-
-#: executor/execQual.c:1189 parser/parse_func.c:95 parser/parse_func.c:327
-#: parser/parse_func.c:643
-#, c-format
-msgid "cannot pass more than %d argument to a function"
-msgid_plural "cannot pass more than %d arguments to a function"
-msgstr[0] "não pode passar mais do que %d argumento para uma função"
-msgstr[1] "não pode passar mais do que %d argumentos para uma função"
+"O postmaster ordenou a esse processo servidor para cancelar a transação "
+"atual e sair, porque outro processo servidor saiu anormalmente e "
+"possivelmente corrompeu memória compartilhada."
 
-#: executor/execQual.c:1373
-msgid "functions and operators can take at most one set argument"
+#: tcop/postgres.c:2591 tcop/postgres.c:2941
+msgid ""
+"In a moment you should be able to reconnect to the database and repeat your "
+"command."
 msgstr ""
-"funções e operadores podem receber no máximo um argumento do tipo conjunto"
+"Dentro de instantes você poderá conectar novamente ao banco de dados e "
+"repetir seu commando."
+
+#: tcop/postgres.c:2703
+msgid "floating-point exception"
+msgstr "exceção de ponto flutuante"
 
-#: executor/execQual.c:1423
+#: tcop/postgres.c:2704
 msgid ""
-"function returning setof record called in context that cannot accept type "
-"record"
+"An invalid floating-point operation was signaled. This probably means an out-"
+"of-range result or an invalid operation, such as division by zero."
 msgstr ""
-"função que retorna setof record foi chamada em um contexto que não pode "
-"aceitar tipo record"
+"Uma operação de ponto flutuante inválida foi sinalizada. Isto provavelmente "
+"indica um resultado fora do intervalo ou uma operação inválida, tal como "
+"divisão por zero."
 
-#: executor/execQual.c:1478 executor/execQual.c:1494 executor/execQual.c:1504
-msgid "function return row and query-specified return row do not match"
+#: tcop/postgres.c:2872
+msgid "terminating autovacuum process due to administrator command"
 msgstr ""
-"registro de retorno da função e registro de retorno especificado na consulta "
-"não correspondem"
+"terminando processo de limpeza automática por causa de um comando do "
+"administrador"
 
-#: executor/execQual.c:1479
-#, c-format
-msgid "Returned row contains %d attribute, but query expects %d."
-msgid_plural "Returned row contains %d attributes, but query expects %d."
-msgstr[0] "Registro retornado contém %d atributo, mas consulta espera %d."
-msgstr[1] "Registro retornado contém %d atributos, mas consulta espera %d."
+#: tcop/postgres.c:2878 tcop/postgres.c:2888 tcop/postgres.c:2939
+msgid "terminating connection due to conflict with recovery"
+msgstr "terminando conexão por causa de um conflito com recuperação"
 
-#: executor/execQual.c:1495
-#, c-format
-msgid "Returned type %s at ordinal position %d, but query expects %s."
-msgstr "Tipo retornado %s na posição ordinal %d, mas consulta espera %s."
+#: tcop/postgres.c:2894
+msgid "terminating connection due to administrator command"
+msgstr "terminando conexão por causa de um comando do administrador"
 
-#: executor/execQual.c:1615 executor/execQual.c:1640 executor/execQual.c:2001
-#: executor/execQual.c:5100 executor/functions.c:652 foreign/foreign.c:271
-#: utils/fmgr/funcapi.c:60 utils/mmgr/portalmem.c:937 commands/prepare.c:747
-msgid "set-valued function called in context that cannot accept a set"
-msgstr ""
-"função que tem argumento do tipo conjunto foi chamada em um contexto que não "
-"pode aceitar um conjunto"
-
-#: executor/execQual.c:1748 executor/execQual.c:2171
-msgid "table-function protocol for materialize mode was not followed"
-msgstr "protocolo de função tabular para modo materializado não foi seguido"
-
-#: executor/execQual.c:1768 executor/execQual.c:2178
-#, c-format
-msgid "unrecognized table-function returnMode: %d"
-msgstr "modo de retorno (returnMode) da função tabular desconhecido: %d"
-
-#: executor/execQual.c:2088
-msgid "function returning set of rows cannot return null value"
-msgstr "função que retorna conjunto de registros não pode retornar valor nulo"
+#: tcop/postgres.c:2909
+msgid "canceling authentication due to timeout"
+msgstr "cancelando autenticação por causa do tempo de espera (timeout)"
 
-#: executor/execQual.c:2145
-msgid "rows returned by function are not all of the same row type"
-msgstr ""
-"registros retornados pela função não são todos do mesmo tipo de registro"
+#: tcop/postgres.c:2918
+msgid "canceling statement due to statement timeout"
+msgstr "cancelando comando por causa do tempo de espera (timeout) do comando"
 
-#: executor/execQual.c:2338
-msgid "IS DISTINCT FROM does not support set arguments"
-msgstr "IS DISTINCT FROM não suporta conjunto de argumentos"
+#: tcop/postgres.c:2927
+msgid "canceling autovacuum task"
+msgstr "cancelando tarefa de limpeza automática"
 
-#: executor/execQual.c:2413
-msgid "op ANY/ALL (array) does not support set arguments"
-msgstr "op ANY/ALL (array) não suporta conjunto de argumentos"
+#: tcop/postgres.c:2946 storage/ipc/standby.c:490
+msgid "canceling statement due to conflict with recovery"
+msgstr "cancelando comando por causa de um conflito com recuperação"
 
-#: executor/execQual.c:2735 commands/analyze.c:1493
-#, fuzzy
-msgid "could not convert row type"
-msgstr "não pôde converter tipo row"
+#: tcop/postgres.c:2962
+msgid "canceling statement due to user request"
+msgstr "cancelando comando por causa de um pedido do usuário"
 
-#: executor/execQual.c:2966
-msgid "cannot merge incompatible arrays"
-msgstr "não pode mesclar matrizes incompatíveis"
+#: tcop/postgres.c:3043 tcop/postgres.c:3065
+msgid "stack depth limit exceeded"
+msgstr "limite da profundidade da pilha foi excedido"
 
-#: executor/execQual.c:2967
-#, c-format
+#: tcop/postgres.c:3044 tcop/postgres.c:3066
+#, fuzzy, c-format
 msgid ""
-"Array with element type %s cannot be included in ARRAY construct with "
-"element type %s."
+"Increase the configuration parameter \"max_stack_depth\" (currently %dkB), "
+"after ensuring the platform's stack depth limit is adequate."
 msgstr ""
-"Matriz com tipo de elemento %s não pode ser incluído em uma construção ARRAY "
-"com tipo de elemento %s."
+"Aumente o parâmetro de configuração \"max_stack_depth\", após certificar-se "
+"que o limite de profundidade da pilha para a plataforma é adequado."
 
-#: executor/execQual.c:3008 executor/execQual.c:3035
-#: utils/adt/arrayfuncs.c:518
+#: tcop/postgres.c:3082
+#, fuzzy, c-format
+msgid "\"max_stack_depth\" must not exceed %ldkB."
+msgstr "\"max_stack_depth\" não deve exceder %ldkB"
+
+#: tcop/postgres.c:3084
 msgid ""
-"multidimensional arrays must have array expressions with matching dimensions"
+"Increase the platform's stack depth limit via \"ulimit -s\" or local "
+"equivalent."
 msgstr ""
-"matrizes multidimensionais devem ter expressões de matriz com dimensões "
-"correspondentes"
+"Aumente o limite de profundidade da pilha da plataforma utilizando \"ulimit -"
+"s\" ou equivalente."
 
-#: executor/execQual.c:3550
-msgid "NULLIF does not support set arguments"
-msgstr "NULLIF não suporta conjunto de argumentos"
+#: tcop/postgres.c:3419
+msgid "invalid command-line arguments for server process"
+msgstr "argumentos de linha de comando são inválidos para processo servidor"
 
-#: executor/execQual.c:3780 utils/adt/domains.c:128
+#: tcop/postgres.c:3420 tcop/postgres.c:3426
 #, c-format
-msgid "domain %s does not allow null values"
-msgstr "domínio %s não permite valores nulos"
+msgid "Try \"%s --help\" for more information."
+msgstr "Tente \"%s --help\" para obter informações adicionais."
 
-#: executor/execQual.c:3809 utils/adt/domains.c:164
+#: tcop/postgres.c:3424
 #, c-format
-msgid "value for domain %s violates check constraint \"%s\""
-msgstr "valor para domínio %s viola restrição de verificação \"%s\""
-
-#: executor/execQual.c:4277 parser/parse_agg.c:160
-#: optimizer/util/clauses.c:572
-msgid "aggregate function calls cannot be nested"
-msgstr "chamadas de função de agregação não podem ser aninhadas"
-
-#: executor/execQual.c:4315 parser/parse_agg.c:207
-#: optimizer/util/clauses.c:646
-msgid "window function calls cannot be nested"
-msgstr "chamadas de função deslizante não podem ser aninhadas"
-
-#: executor/execQual.c:4515
-msgid "target type is not an array"
-msgstr "tipo alvo não é uma matriz"
+msgid "%s: invalid command-line arguments"
+msgstr "%s: argumentos de linha de comando são inválidos"
 
-#: executor/execQual.c:4628
+#: tcop/postgres.c:3523
 #, c-format
-msgid "ROW() column has type %s instead of type %s"
-msgstr "coluna ROW() tem tipo %s ao invés do tipo %s"
+msgid "%s: no database nor user name specified"
+msgstr "%s: banco de dados ou nome de usuário não foi especificado"
 
-#: executor/execQual.c:4759 utils/adt/rowtypes.c:913
-#: utils/adt/arrayfuncs.c:3306
+#: tcop/postgres.c:4062
 #, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "não pôde identificar uma função de comparação para tipo %s"
+msgid "invalid CLOSE message subtype %d"
+msgstr "subtipo %d de mensagem CLOSE é inválido"
 
-#: executor/nodeModifyTable.c:83
-msgid "Query has too many columns."
-msgstr "Consulta tem muitas colunas."
+#: tcop/postgres.c:4095
+#, c-format
+msgid "invalid DESCRIBE message subtype %d"
+msgstr "subtipo %d de mensagem DESCRIBE é inválido"
 
-#: executor/nodeModifyTable.c:110
+#: tcop/postgres.c:4329
 #, c-format
-msgid "Query provides a value for a dropped column at ordinal position %d."
+msgid ""
+"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
+"%s"
 msgstr ""
-"Consulta fornece um valor para uma coluna removida na posição ordinal %d."
-
-#: executor/nodeModifyTable.c:118
-msgid "Query has too few columns."
-msgstr "Consulta tem poucas colunas."
+"desconexão: tempo da sessão: %d:%02d:%02d.%02d usuário=%s banco de dados=%s "
+"máquina=%s%s%s"
 
-#: executor/nodeHashjoin.c:721 executor/nodeHashjoin.c:755
+#: tcop/utility.c:95 commands/trigger.c:192 commands/trigger.c:1098
+#: commands/tablecmds.c:813 commands/tablecmds.c:1142
+#: commands/tablecmds.c:2070 commands/tablecmds.c:3807
+#: commands/tablecmds.c:5531 rewrite/rewriteDefine.c:263
 #, c-format
-msgid "could not rewind hash-join temporary file: %m"
-msgstr "não pôde voltar ao início do arquivo temporário de junção hash: %m"
+msgid "permission denied: \"%s\" is a system catalog"
+msgstr "permissão negada: \"%s\" é um catálogo do sistema"
 
-#: executor/nodeHashjoin.c:789 executor/nodeHashjoin.c:795
+#. translator: %s is name of a SQL command, eg CREATE
+#: tcop/utility.c:253
 #, c-format
-msgid "could not write to hash-join temporary file: %m"
-msgstr "não pôde escrever em arquivo temporário de junção hash: %m"
+msgid "cannot execute %s in a read-only transaction"
+msgstr "não pode executar %s em uma transação somente leitura"
 
-#: executor/nodeHashjoin.c:829 executor/nodeHashjoin.c:839
+#. translator: %s is name of a SQL command, eg CREATE
+#: tcop/utility.c:272
 #, c-format
-msgid "could not read from hash-join temporary file: %m"
-msgstr "não pôde ler do arquivo temporário de junção hash: %m"
-
-#: executor/nodeSubplan.c:301 executor/nodeSubplan.c:340
-#: executor/nodeSubplan.c:962
-msgid "more than one row returned by a subquery used as an expression"
-msgstr ""
-"mais de um registro foi retornado por uma subconsulta utilizada como uma "
-"expressão"
-
-#: executor/nodeLimit.c:251
-msgid "OFFSET must not be negative"
-msgstr "OFFSET não deve ser negativo"
-
-#: executor/nodeLimit.c:278
-msgid "LIMIT must not be negative"
-msgstr "LIMIT não deve ser negativo"
+msgid "cannot execute %s during recovery"
+msgstr "não pode executar %s durante recuperação"
 
-#: executor/execMain.c:876
+#. translator: %s is name of a SQL command, eg PREPARE
+#: tcop/utility.c:290
 #, c-format
-msgid "cannot change sequence \"%s\""
-msgstr "não pode mudar sequência \"%s\""
+msgid "cannot execute %s within security-restricted operation"
+msgstr "não pode executar %s em operação com restrição de segurança"
 
-#: executor/execMain.c:882
-#, c-format
-msgid "cannot change TOAST relation \"%s\""
-msgstr "não pode mudar relação TOAST \"%s\""
+#: tcop/utility.c:1194
+msgid "must be superuser to do CHECKPOINT"
+msgstr "deve ser super-usuário para fazer CHECKPOINT"
 
-#: executor/execMain.c:888
+#: tcop/fastpath.c:109 tcop/fastpath.c:485 tcop/fastpath.c:615
 #, c-format
-msgid "cannot change view \"%s\""
-msgstr "não pode mudar visão \"%s\""
+msgid "invalid argument size %d in function call message"
+msgstr "tamanho de argumento %d é inválido na mensagem de chamada da função"
 
-#: executor/execMain.c:894
+#: tcop/fastpath.c:221 catalog/aclchk.c:3547 catalog/aclchk.c:4297
 #, c-format
-msgid "cannot change relation \"%s\""
-msgstr "não pode mudar relação \"%s\""
+msgid "function with OID %u does not exist"
+msgstr "função com OID %u não existe"
 
-#: executor/execMain.c:1319
+#: tcop/fastpath.c:331
 #, c-format
-msgid "null value in column \"%s\" violates not-null constraint"
-msgstr "valor nulo na coluna \"%s\" viola a restrição não-nula"
+msgid "fastpath function call: \"%s\" (OID %u)"
+msgstr "chamada de função fastpath: \"%s\" (OID %u)"
 
-#: executor/execMain.c:1331
+#: tcop/fastpath.c:415
 #, c-format
-msgid "new row for relation \"%s\" violates check constraint \"%s\""
-msgstr "novo registro da relação \"%s\" viola restrição de verificação \"%s\""
-
-#: executor/execMain.c:2091 commands/tablecmds.c:390
-msgid "ON COMMIT can only be used on temporary tables"
-msgstr "ON COMMIT só pode ser utilizado em tabelas temporárias"
+msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
+msgstr "duração: %s ms  chamada de função fastpath: \"%s\" (OID %u)"
 
-#: executor/execMain.c:2101 commands/tablecmds.c:400
-msgid "cannot create temporary table within security-restricted operation"
+#: tcop/fastpath.c:453 tcop/fastpath.c:580
+#, c-format
+msgid "function call message contains %d arguments but function requires %d"
 msgstr ""
-"não pode criar tabela temporária em operação com restrição de segurança"
+"mensagem de chamada da função contém %d argumentos mas função requer %d"
 
-#: executor/execMain.c:2125 utils/adt/dbsize.c:248 utils/adt/acl.c:4134
-#: commands/dbcommands.c:436 commands/dbcommands.c:1037
-#: commands/indexcmds.c:225 commands/tablecmds.c:430 commands/tablecmds.c:6787
-#: commands/comment.c:737 commands/tablespace.c:410 commands/tablespace.c:808
-#: commands/tablespace.c:875 commands/tablespace.c:980
-#: commands/tablespace.c:1036 commands/tablespace.c:1160 catalog/aclchk.c:702
+#: tcop/fastpath.c:461
 #, c-format
-msgid "tablespace \"%s\" does not exist"
-msgstr "tablespace \"%s\" não existe"
+msgid "function call message contains %d argument formats but %d arguments"
+msgstr ""
+"mensagem de chamada da função contém %d formatos de argumento mas só tem %d "
+"argumentos"
 
-#. translator: %s is a SQL statement name
-#: executor/functions.c:154
+#: tcop/fastpath.c:548 tcop/fastpath.c:631
 #, c-format
-msgid "%s is not allowed in a SQL function"
-msgstr "%s não é permitido em uma função SQL"
+msgid "incorrect binary data format in function argument %d"
+msgstr "formato de dado binário incorreto no argumento %d da função"
 
-#: executor/functions.c:259
+#: tcop/pquery.c:660
 #, c-format
-msgid ""
-"could not determine actual result type for function declared to return type "
-"%s"
+msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
-"não pôde determinar tipo de resultado para função declarada que retorna tipo "
-"%s"
+"mensagem de ligação tem %d formatos de resultados mas consulta tem %d colunas"
 
-#: executor/functions.c:298
+#: tcop/pquery.c:738 tcop/pquery.c:1401 commands/portalcmds.c:336
 #, c-format
-msgid "could not determine actual type of argument declared %s"
-msgstr "não pôde determinar tipo de argumento declarado %s"
+msgid "portal \"%s\" cannot be run"
+msgstr "portal \"%s\" não pode ser executado"
 
-#: executor/functions.c:923
-#, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "função SQL \"%s\" comando %d"
+#: tcop/pquery.c:969
+msgid "cursor can only scan forward"
+msgstr "cursor só pode buscar para frente"
 
-#: executor/functions.c:936 catalog/pg_proc.c:861
-#, c-format
-msgid "SQL function \"%s\""
-msgstr "função SQL \"%s\""
+#: tcop/pquery.c:970
+msgid "Declare it with SCROLL option to enable backward scan."
+msgstr "Declare-o com a opção SCROLL para habilitar a busca para trás."
 
-#: executor/functions.c:946
+#: commands/trigger.c:159
 #, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "função SQL \"%s\" durante inicialização"
+msgid "\"%s\" is a table"
+msgstr "\"%s\" é uma tabela"
+
+#: commands/trigger.c:161
+msgid "Tables cannot have INSTEAD OF triggers."
+msgstr "Tabelas não podem ter gatilhos INSTEAD OF."
 
-#: executor/functions.c:1091 executor/functions.c:1127
-#: executor/functions.c:1139 executor/functions.c:1245
-#: executor/functions.c:1277 executor/functions.c:1306
+#: commands/trigger.c:172 commands/trigger.c:179
 #, c-format
-msgid "return type mismatch in function declared to return %s"
-msgstr "tipo de retorno não corresponde com o que foi declarado %s na função"
+msgid "\"%s\" is a view"
+msgstr "\"%s\" é uma visão"
 
-#: executor/functions.c:1093
-msgid ""
-"Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
-msgstr ""
-"Último comando da função deve ser um SELECT ou INSERT/UPDATE/DELETE "
-"RETURNING."
+#: commands/trigger.c:174
+msgid "Views cannot have row-level BEFORE or AFTER triggers."
+msgstr "Visões não podem ter gatilhos BEFORE ou AFTER a nível de registro."
 
-#: executor/functions.c:1129
-msgid "Final statement must return exactly one column."
-msgstr "Último comando deve retornar exatamente uma coluna."
+#: commands/trigger.c:181
+msgid "Views cannot have TRUNCATE triggers."
+msgstr "Visões não podem ter gatilhos TRUNCATE."
 
-#: executor/functions.c:1141
+#: commands/trigger.c:186 commands/trigger.c:1092 commands/tablecmds.c:3831
+#: rewrite/rewriteDefine.c:257
 #, c-format
-msgid "Actual return type is %s."
-msgstr "Tipo atual de retorno é %s."
+msgid "\"%s\" is not a table or view"
+msgstr "\"%s\" não é uma tabela ou visão"
 
-#: executor/functions.c:1247
-msgid "Final statement returns too many columns."
-msgstr "Último comando retornou muitas colunas."
+#: commands/trigger.c:228
+msgid "TRUNCATE FOR EACH ROW triggers are not supported"
+msgstr "gatilhos TRUNCATE FOR EACH ROW não são suportados"
 
-#: executor/functions.c:1279
-#, c-format
-msgid "Final statement returns %s instead of %s at column %d."
-msgstr "Último comando retornou %s ao invés de %s na coluna %d."
+#: commands/trigger.c:236
+msgid "INSTEAD OF triggers must be FOR EACH ROW"
+msgstr "gatilhos INSTEAD OF devem ser FOR EACH ROW"
 
-#: executor/functions.c:1308
-msgid "Final statement returns too few columns."
-msgstr "Último comando retornou poucas colunas."
+#: commands/trigger.c:240
+msgid "INSTEAD OF triggers cannot have WHEN conditions"
+msgstr "gatilhos INSTEAD OF não podem ter condições WHEN"
 
-#: executor/functions.c:1356
-#, c-format
-msgid "return type %s is not supported for SQL functions"
-msgstr "tipo de retorno %s não é suportado pelas funções SQL"
+#: commands/trigger.c:244
+#, fuzzy
+msgid "INSTEAD OF triggers cannot have column lists"
+msgstr "gatilhos INSTEAD OF não podem ter listas de colunas"
 
-#: executor/nodeMergejoin.c:1586
-msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
+#: commands/trigger.c:288
+msgid "cannot use subquery in trigger WHEN condition"
+msgstr "não pode utilizar subconsulta em condição WHEN de gatilho"
+
+#: commands/trigger.c:292
+msgid "cannot use aggregate function in trigger WHEN condition"
+msgstr "não pode utilizar função de agregação em condição WHEN de gatilho"
+
+#: commands/trigger.c:296
+msgid "cannot use window function in trigger WHEN condition"
+msgstr "não pode utilizar função deslizante em condição WHEN de gatilho"
+
+#: commands/trigger.c:318 commands/trigger.c:331
+msgid "statement trigger's WHEN condition cannot reference column values"
 msgstr ""
-"RIGHT JOIN só é suportado com condições de junção que podem ser utilizadas "
-"com junção por mesclagem"
+"condição WHEN de gatilho de comando não pode referenciar valores de coluna"
 
-#: executor/nodeMergejoin.c:1606 optimizer/path/joinpath.c:1072
-msgid "FULL JOIN is only supported with merge-joinable join conditions"
+#: commands/trigger.c:323
+msgid "INSERT trigger's WHEN condition cannot reference OLD values"
+msgstr "condição WHEN de gatilho INSERT não pode referenciar valores OLD"
+
+#: commands/trigger.c:336
+msgid "DELETE trigger's WHEN condition cannot reference NEW values"
+msgstr "condição WHEN de gatilho DELETE não pode referenciar valores NEW"
+
+#: commands/trigger.c:341
+msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
 msgstr ""
-"FULL JOIN só é suportado com condições de junção que podem ser utilizadas "
-"com junção por mesclagem"
+"condição WHEN de gatilho BEFORE não pode referenciar colunas de sistema NEW"
 
-#: nodes/nodeFuncs.c:110 nodes/nodeFuncs.c:136 parser/parse_expr.c:1606
-#: parser/parse_oper.c:983 parser/parse_coerce.c:1568
-#: parser/parse_coerce.c:1585 parser/parse_coerce.c:1643
-#: parser/parse_func.c:371
+#: commands/trigger.c:379
 #, c-format
-msgid "could not find array type for data type %s"
-msgstr "não pôde encontrar tipo array para tipo de dado %s"
+msgid "changing return type of function %s from \"opaque\" to \"trigger\""
+msgstr "alterando tipo retornado pela função %s de \"opaque\" para \"trigger\""
 
-#: nodes/print.c:85 utils/adt/xml.c:1363 utils/adt/xml.c:1364
-#: utils/adt/xml.c:1370 utils/adt/xml.c:1441 utils/fmgr/dfmgr.c:381
-#: utils/misc/guc.c:4963 utils/misc/guc.c:5231 tcop/postgres.c:4238
-#: commands/trigger.c:832 commands/trigger.c:848 commands/trigger.c:860
-#: commands/tablecmds.c:658 commands/user.c:902 commands/user.c:903
-#: storage/lmgr/deadlock.c:942 storage/lmgr/deadlock.c:943
-#: catalog/dependency.c:912 catalog/dependency.c:913 catalog/dependency.c:919
-#: catalog/dependency.c:920 catalog/dependency.c:931 catalog/dependency.c:932
+#: commands/trigger.c:386
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "function %s must return type \"trigger\""
+msgstr "função %s deve retornar tipo \"trigger\""
 
-#: snowball/dict_snowball.c:183
+#: commands/trigger.c:496 commands/trigger.c:1234
 #, c-format
-msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
-msgstr ""
-"nenhum analisador Snowball disponível para idioma \"%s\" e codificação \"%s\""
-
-#: snowball/dict_snowball.c:206 tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:50
-msgid "multiple StopWords parameters"
-msgstr "múltiplos parâmetros StopWords"
+msgid "trigger \"%s\" for relation \"%s\" already exists"
+msgstr "gatilho \"%s\" para relação \"%s\" já existe"
 
-#: snowball/dict_snowball.c:215
-msgid "multiple Language parameters"
-msgstr "múltiplos parâmetros Language"
+#: commands/trigger.c:585 commands/sequence.c:1419 commands/copy.c:3774
+#: commands/analyze.c:343 commands/tablecmds.c:4591 commands/tablecmds.c:4681
+#: commands/tablecmds.c:4728 commands/tablecmds.c:4824
+#: commands/tablecmds.c:4868 commands/tablecmds.c:4947
+#: commands/tablecmds.c:5031 commands/tablecmds.c:6661
+#: commands/tablecmds.c:6870 catalog/aclchk.c:1428 catalog/objectaddress.c:541
+#: parser/parse_relation.c:2043 parser/parse_relation.c:2100
+#: parser/parse_target.c:895 parser/analyze.c:2039 parser/parse_type.c:117
+#: utils/adt/ruleutils.c:1580 utils/adt/acl.c:2772
+#, c-format
+msgid "column \"%s\" of relation \"%s\" does not exist"
+msgstr "coluna \"%s\" da relação \"%s\" não existe"
 
-#: snowball/dict_snowball.c:222
+#: commands/trigger.c:594 commands/copy.c:3786 commands/tablecmds.c:1319
+#: parser/parse_target.c:911 parser/parse_target.c:922
 #, c-format
-msgid "unrecognized Snowball parameter: \"%s\""
-msgstr "parâmetro desconhecido do Snowball: \"%s\""
+msgid "column \"%s\" specified more than once"
+msgstr "coluna \"%s\" especificada mais de uma vez"
 
-#: snowball/dict_snowball.c:230
-msgid "missing Language parameter"
-msgstr "faltando parâmetro Language"
+#: commands/trigger.c:781
+msgid "Found referenced table's UPDATE trigger."
+msgstr "Encontrado gatilho de UPDATE na tabela referenciada."
 
-#: lib/stringinfo.c:266 utils/adt/varlena.c:3246 utils/adt/varlena.c:3267
-#: utils/adt/regexp.c:205 utils/adt/formatting.c:1491
-#: utils/adt/formatting.c:1547 utils/adt/formatting.c:1604
-#: utils/fmgr/dfmgr.c:224 utils/init/miscinit.c:149 utils/init/miscinit.c:170
-#: utils/init/miscinit.c:180 utils/mb/mbutils.c:334 utils/mb/mbutils.c:606
-#: utils/mmgr/aset.c:408 utils/mmgr/aset.c:587 utils/mmgr/aset.c:770
-#: utils/mmgr/aset.c:976 utils/misc/guc.c:2915 utils/misc/guc.c:2928
-#: utils/misc/guc.c:2941 utils/hash/dynahash.c:363 utils/hash/dynahash.c:435
-#: utils/hash/dynahash.c:929 postmaster/postmaster.c:1968
-#: postmaster/postmaster.c:2001 postmaster/postmaster.c:3170
-#: postmaster/postmaster.c:3848 postmaster/postmaster.c:3929
-#: postmaster/postmaster.c:4517 commands/sequence.c:936
-#: storage/ipc/procarray.c:841 storage/ipc/procarray.c:1219
-#: storage/ipc/procarray.c:1226 storage/ipc/procarray.c:1457
-#: storage/ipc/procarray.c:1851 storage/file/fd.c:355 storage/file/fd.c:738
-#: storage/file/fd.c:856 storage/buffer/localbuf.c:348
-#: storage/buffer/buf_init.c:154 libpq/auth.c:1020 libpq/auth.c:1374
-#: libpq/auth.c:1442 libpq/auth.c:2016
-msgid "out of memory"
-msgstr "sem memória"
+#: commands/trigger.c:782
+msgid "Found referenced table's DELETE trigger."
+msgstr "Encontrado gatilho de DELETE na tabela referenciada."
 
-#: lib/stringinfo.c:267
-#, c-format
-msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
-msgstr ""
-"Não pode aumentar o buffer de cadeia de caracteres contendo %d bytes para "
-"mais %d bytes."
+#: commands/trigger.c:783
+msgid "Found referencing table's trigger."
+msgstr "Encontrado gatilho na tabela referenciada."
 
-#: foreign/foreign.c:90 commands/foreigncmds.c:228 commands/foreigncmds.c:452
-#: commands/foreigncmds.c:553
+#: commands/trigger.c:892 commands/trigger.c:908
 #, c-format
-msgid "foreign-data wrapper \"%s\" does not exist"
-msgstr "adaptador de dados externos \"%s\" não existe"
+msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
+msgstr "ignorando grupo de gatilhos incompletos para restrição \"%s\" %s"
 
-#: foreign/foreign.c:179 commands/foreigncmds.c:270 commands/foreigncmds.c:723
-#: commands/foreigncmds.c:813 commands/foreigncmds.c:1089
+#: commands/trigger.c:920
 #, c-format
-msgid "server \"%s\" does not exist"
-msgstr "servidor \"%s\" não existe"
+msgid "converting trigger group into constraint \"%s\" %s"
+msgstr "convertendo grupo de gatilhos na restrição \"%s\" %s"
 
-#: foreign/foreign.c:230
+#: commands/trigger.c:1036
 #, c-format
-msgid "user mapping not found for \"%s\""
-msgstr "mapeamento de usuários não foi encontrado para \"%s\""
-
-#: foreign/foreign.c:276 utils/mmgr/portalmem.c:941 commands/prepare.c:751
-msgid "materialize mode required, but it is not allowed in this context"
-msgstr ""
-"modo de materialização é requerido, mas ele não é permitido neste contexto"
+msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
+msgstr "gatilho \"%s\" para tabela \"%s\" não existe, ignorando"
 
-#: foreign/foreign.c:408
+#: commands/trigger.c:1163 commands/trigger.c:1276 commands/trigger.c:1387
 #, c-format
-msgid "invalid option \"%s\""
-msgstr "opção \"%s\" é inválida"
+msgid "trigger \"%s\" for table \"%s\" does not exist"
+msgstr "gatilho \"%s\" na tabela \"%s\" não existe"
 
-#: foreign/foreign.c:409
+#: commands/trigger.c:1355
 #, c-format
-msgid "Valid options in this context are: %s"
-msgstr "Opções válidas nesse contexto são: %s"
-
-#: utils/adt/tsrank.c:404
-msgid "array of weight must be one-dimensional"
-msgstr "matriz de pesos devem ser de uma dimensão"
-
-#: utils/adt/tsrank.c:409
-msgid "array of weight is too short"
-msgstr "matriz de pesos é muito pequena"
+msgid "permission denied: \"%s\" is a system trigger"
+msgstr "permissão negada: \"%s\" é um gatilho do sistema"
 
-#: utils/adt/tsrank.c:414
-msgid "array of weight must not contain nulls"
-msgstr "matriz de pesos não deve conter valores nulos"
+#: commands/trigger.c:1837
+#, c-format
+msgid "trigger function %u returned null value"
+msgstr "função de gatilho %u retornou valor nulo"
 
-#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
-msgid "weight out of range"
-msgstr "peso fora do intervalo"
+#: commands/trigger.c:1896 commands/trigger.c:2095 commands/trigger.c:2279
+#: commands/trigger.c:2521
+msgid "BEFORE STATEMENT trigger cannot return a value"
+msgstr "gatilho BEFORE STATEMENT não pode retornar um valor"
 
-#: utils/adt/date.c:66 utils/adt/timestamp.c:92 utils/adt/varchar.c:43
-#: utils/adt/varbit.c:49
-msgid "invalid type modifier"
-msgstr "modificador de tipo é inválido"
+#: commands/trigger.c:2583 executor/nodeLockRows.c:137
+#: executor/nodeModifyTable.c:366 executor/nodeModifyTable.c:582
+#: executor/execMain.c:1864
+msgid "could not serialize access due to concurrent update"
+msgstr "não pôde serializar acesso devido a uma atualização concorrente"
 
-#: utils/adt/date.c:71
+#: commands/trigger.c:4147 catalog/namespace.c:234 catalog/namespace.c:318
 #, c-format
-msgid "TIME(%d)%s precision must not be negative"
-msgstr "precisão do TIME(%d)%s não deve ser negativa"
+msgid "cross-database references are not implemented: \"%s.%s.%s\""
+msgstr ""
+"referências cruzadas entre bancos de dados não estão implementadas: \"%s.%s."
+"%s\""
 
-#: utils/adt/date.c:77
+#: commands/trigger.c:4198
 #, c-format
-msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
-msgstr "precisão do TIME(%d)%s reduzida ao máximo permitido, %d"
-
-#: utils/adt/date.c:142 utils/adt/datetime.c:1181 utils/adt/datetime.c:1926
-msgid "date/time value \"current\" is no longer supported"
-msgstr "valor de data/hora \"current\" não é mais suportado"
+msgid "constraint \"%s\" is not deferrable"
+msgstr "restrição \"%s\" não é postergável"
 
-#: utils/adt/date.c:167
+#: commands/trigger.c:4221
 #, c-format
-msgid "date out of range: \"%s\""
-msgstr "date fora do intervalo: \"%s\""
-
-#: utils/adt/date.c:217 utils/adt/xml.c:1688
-msgid "date out of range"
-msgstr "data fora do intervalo"
-
-#: utils/adt/date.c:359
-msgid "cannot subtract infinite dates"
-msgstr "não pode subtrair valores date infinitos"
-
-#: utils/adt/date.c:416 utils/adt/date.c:453
-msgid "date out of range for timestamp"
-msgstr "date fora do intervalo para timestamp"
-
-#: utils/adt/date.c:880 utils/adt/date.c:927 utils/adt/date.c:1483
-#: utils/adt/date.c:1520 utils/adt/date.c:2394 utils/adt/timestamp.c:226
-#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
-#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
-#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
-#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
-#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
-#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
-#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
-#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
-#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
-#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
-#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
-#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
-#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
-#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
-#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
-#: utils/adt/timestamp.c:4614 utils/adt/formatting.c:2956
-#: utils/adt/formatting.c:2988 utils/adt/formatting.c:3056
-#: utils/adt/xml.c:1711 utils/adt/xml.c:1718 utils/adt/xml.c:1738
-#: utils/adt/xml.c:1745 utils/adt/nabstime.c:480 utils/adt/nabstime.c:523
-#: utils/adt/nabstime.c:553 utils/adt/nabstime.c:596
-msgid "timestamp out of range"
-msgstr "timestamp fora do intervalo"
-
-#: utils/adt/date.c:953
-msgid "cannot convert reserved abstime value to date"
-msgstr "não pode converter valor de abstime reservado para date"
-
-#: utils/adt/date.c:1107 utils/adt/date.c:1114 utils/adt/date.c:1882
-#: utils/adt/date.c:1889
-msgid "time out of range"
-msgstr "time fora do intervalo"
+msgid "constraint \"%s\" does not exist"
+msgstr "restrição \"%s\" não existe"
 
-#: utils/adt/date.c:1760 utils/adt/date.c:1777
+#: commands/opclasscmds.c:136 commands/opclasscmds.c:1838
+#: commands/opclasscmds.c:1849 commands/opclasscmds.c:2083
+#: commands/opclasscmds.c:2094
 #, c-format
-msgid "\"time\" units \"%s\" not recognized"
-msgstr "unidades de \"time\" \"%s\" são desconhecidas"
-
-#: utils/adt/date.c:1899
-msgid "time zone displacement out of range"
-msgstr "deslocamento de zona horária fora do intervalo"
+msgid "operator family \"%s\" does not exist for access method \"%s\""
+msgstr "família de operadores \"%s\" não existe para método de acesso \"%s\""
 
-#: utils/adt/date.c:2524 utils/adt/date.c:2541
+#: commands/opclasscmds.c:212 commands/opclasscmds.c:1568
+#: commands/indexcmds.c:1134 commands/indexcmds.c:1142
 #, c-format
-msgid "\"time with time zone\" units \"%s\" not recognized"
-msgstr "unidades de \"time with time zone\" \"%s\" são desconhecidas"
+msgid "operator class \"%s\" does not exist for access method \"%s\""
+msgstr "classe de operadores \"%s\" não existe para método de acesso \"%s\""
 
-#: utils/adt/date.c:2599 utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
-#: utils/adt/datetime.c:925 utils/adt/datetime.c:1657
+#: commands/opclasscmds.c:271
 #, c-format
-msgid "time zone \"%s\" not recognized"
-msgstr "zona horária \"%s\" é desconhecida"
+msgid "operator family \"%s\" for access method \"%s\" already exists"
+msgstr "família de operadores \"%s\" para método de acesso \"%s\" já existe"
 
-#: utils/adt/date.c:2639
+#: commands/opclasscmds.c:369 commands/opclasscmds.c:790
+#: commands/opclasscmds.c:2202 commands/indexcmds.c:304
 #, c-format
-msgid "\"interval\" time zone \"%s\" not valid"
-msgstr "zona horária de \"interval\" \"%s\" não é válida"
-
-#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4242 utils/adt/geo_ops.c:5159
-msgid "too many points requested"
-msgstr "muitos pontos solicitados"
+msgid "access method \"%s\" does not exist"
+msgstr "método de acesso \"%s\" não existe"
 
-#: utils/adt/geo_ops.c:317
-msgid "could not format \"path\" value"
-msgstr "não pôde formatar valor de \"path\""
+#: commands/opclasscmds.c:408
+msgid "must be superuser to create an operator class"
+msgstr "deve ser super-usuário para criar uma classe de operadores"
 
-#: utils/adt/geo_ops.c:392
+#: commands/opclasscmds.c:480 commands/opclasscmds.c:864
+#: commands/opclasscmds.c:994
 #, c-format
-msgid "invalid input syntax for type box: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo box: \"%s\""
+msgid "invalid operator number %d, must be between 1 and %d"
+msgstr "número de operadores %d é inválido, deve ser entre 1 e %d"
 
-#: utils/adt/geo_ops.c:956
+#: commands/opclasscmds.c:531 commands/opclasscmds.c:915
+#: commands/opclasscmds.c:1009
 #, c-format
-msgid "invalid input syntax for type line: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo line: \"%s\""
+msgid "invalid procedure number %d, must be between 1 and %d"
+msgstr "número de procedimentos %d é inválido, deve ser entre 1 e %d"
 
-#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
-#: utils/adt/geo_ops.c:1057
-msgid "type \"line\" not yet implemented"
-msgstr "tipo \"line\" não está implementado"
+#: commands/opclasscmds.c:561
+msgid "storage type specified more than once"
+msgstr "tipo de armazenamento especificado mais de uma vez"
 
-#: utils/adt/geo_ops.c:1404 utils/adt/geo_ops.c:1427
+#: commands/opclasscmds.c:589
 #, c-format
-msgid "invalid input syntax for type path: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo path: \"%s\""
-
-#: utils/adt/geo_ops.c:1466
-msgid "invalid number of points in external \"path\" value"
-msgstr "número de pontos é inválido no valor de \"path\" externo"
+msgid ""
+"storage type cannot be different from data type for access method \"%s\""
+msgstr ""
+"tipo de armazenamento não pode ser diferente do tipo de dado para método de "
+"acesso \"%s\""
 
-#: utils/adt/geo_ops.c:1807
+#: commands/opclasscmds.c:605
 #, c-format
-msgid "invalid input syntax for type point: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo point: \"%s\""
+msgid "operator class \"%s\" for access method \"%s\" already exists"
+msgstr "classe de operadores \"%s\" para método de acesso \"%s\" já existe"
 
-#: utils/adt/geo_ops.c:2035
+#: commands/opclasscmds.c:633
 #, c-format
-msgid "invalid input syntax for type lseg: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo lseg: \"%s\""
+msgid "could not make operator class \"%s\" be default for type %s"
+msgstr "não pôde fazer classe de operadores \"%s\" ser a padrão para tipo %s"
 
-#: utils/adt/geo_ops.c:2639
-msgid "function \"dist_lb\" not implemented"
-msgstr "função \"dist_lb\" não está implementada"
+#: commands/opclasscmds.c:636
+#, c-format
+msgid "Operator class \"%s\" already is the default."
+msgstr "Classe de operadores \"%s\" já é a padrão."
 
-#: utils/adt/geo_ops.c:3152
-msgid "function \"close_lb\" not implemented"
-msgstr "função \"close_lb\" não está implementada"
+#: commands/opclasscmds.c:760
+msgid "must be superuser to create an operator family"
+msgstr "deve ser super-usuário para criar uma família de operadores"
 
-#: utils/adt/geo_ops.c:3441
-msgid "cannot create bounding box for empty polygon"
-msgstr "não pode criar um caixa circunscrita para um polígono vazio"
+#: commands/opclasscmds.c:816
+msgid "must be superuser to alter an operator family"
+msgstr "deve ser super-usuário para alterar uma família de operadores"
 
-#: utils/adt/geo_ops.c:3465 utils/adt/geo_ops.c:3477
-#, c-format
-msgid "invalid input syntax for type polygon: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo polygon: \"%s\""
+#: commands/opclasscmds.c:880
+msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
+msgstr ""
+"tipos dos argumentos do operador devem ser especificados em ALTER OPERATOR "
+"FAMILY"
 
-#: utils/adt/geo_ops.c:3517
-msgid "invalid number of points in external \"polygon\" value"
-msgstr "número de pontos é inválido no valor de \"polygon\" externo"
+#: commands/opclasscmds.c:944
+msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
+msgstr "STORAGE não pode ser especificado em ALTER OPERATOR FAMILY"
 
-#: utils/adt/geo_ops.c:4040
-msgid "function \"poly_distance\" not implemented"
-msgstr "função \"poly_distance\" não está implementada"
+#: commands/opclasscmds.c:1060
+msgid "one or two argument types must be specified"
+msgstr "um ou dois tipos de argumento devem ser especificados"
 
-#: utils/adt/geo_ops.c:4121 utils/adt/timestamp.c:2876 utils/adt/float.c:764
-#: utils/adt/float.c:828 utils/adt/float.c:2470 utils/adt/float.c:2533
-#: utils/adt/cash.c:524 utils/adt/cash.c:575 utils/adt/cash.c:624
-#: utils/adt/cash.c:676 utils/adt/cash.c:726 utils/adt/int.c:728
-#: utils/adt/int.c:869 utils/adt/int.c:965 utils/adt/int.c:1053
-#: utils/adt/int.c:1079 utils/adt/int.c:1099 utils/adt/int8.c:597
-#: utils/adt/int8.c:644 utils/adt/int8.c:820 utils/adt/int8.c:916
-#: utils/adt/int8.c:1004 utils/adt/int8.c:1100 utils/adt/numeric.c:4298
-#: utils/adt/numeric.c:4581
-msgid "division by zero"
-msgstr "divisão por zero"
+#: commands/opclasscmds.c:1086
+msgid "index operators must be binary"
+msgstr "operadores de índice devem ser binários"
 
-#: utils/adt/geo_ops.c:4352
-msgid "function \"path_center\" not implemented"
-msgstr "função \"path_center\" não está implementada"
+#: commands/opclasscmds.c:1111
+#, fuzzy, c-format
+msgid "access method \"%s\" does not support ordering operators"
+msgstr "método de acesso \"%s\" não suporta restrições de exclusão"
 
-#: utils/adt/geo_ops.c:4369
-msgid "open path cannot be converted to polygon"
-msgstr "caminho aberto não pode ser convertido em polígono"
+#: commands/opclasscmds.c:1124
+#, fuzzy
+msgid "index search operators must return boolean"
+msgstr "operadores de índice devem retornar booleano"
 
-#: utils/adt/geo_ops.c:4536 utils/adt/geo_ops.c:4546 utils/adt/geo_ops.c:4561
-#: utils/adt/geo_ops.c:4567
-#, c-format
-msgid "invalid input syntax for type circle: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo circle: \"%s\""
+#: commands/opclasscmds.c:1163
+msgid "btree procedures must have two arguments"
+msgstr "procedimentos de árvore B devem ter dois argumentos"
 
-#: utils/adt/geo_ops.c:4589 utils/adt/geo_ops.c:4597
-msgid "could not format \"circle\" value"
-msgstr "não pôde formatar valor de \"circle\""
+#: commands/opclasscmds.c:1167
+msgid "btree procedures must return integer"
+msgstr "procedimentos de árvore B devem retornar inteiro"
 
-#: utils/adt/geo_ops.c:4624
-msgid "invalid radius in external \"circle\" value"
-msgstr "raio é inválido no valor de \"circle\" externo"
+#: commands/opclasscmds.c:1182
+msgid "hash procedures must have one argument"
+msgstr "procedimentos hash devem ter um argumento"
 
-#: utils/adt/geo_ops.c:5145
-msgid "cannot convert circle with radius zero to polygon"
-msgstr "não pode converter círculo com raio zero para polígono"
+#: commands/opclasscmds.c:1186
+msgid "hash procedures must return integer"
+msgstr "procedimentos hash devem retornar inteiro"
 
-#: utils/adt/geo_ops.c:5150
-msgid "must request at least 2 points"
-msgstr "deve informar pelo menos 2 pontos"
-
-#: utils/adt/geo_ops.c:5194 utils/adt/geo_ops.c:5217
-msgid "cannot convert empty polygon to circle"
-msgstr "não pode converter polígono vazio para círculo"
+#: commands/opclasscmds.c:1211
+msgid "associated data types must be specified for index support procedure"
+msgstr ""
+"tipos de dados associados devem ser especificados para procedimento de "
+"suporte ao índice"
 
-#. translator: first %s is inet or cidr
-#: utils/adt/network.c:107 utils/adt/datetime.c:3543
+#: commands/opclasscmds.c:1237
 #, c-format
-msgid "invalid input syntax for type %s: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo %s: \"%s\""
+msgid "procedure number %d for (%s,%s) appears more than once"
+msgstr "procedimento número %d para (%s,%s) aparece mais de uma vez"
 
-#: utils/adt/network.c:118
+#: commands/opclasscmds.c:1244
 #, c-format
-msgid "invalid cidr value: \"%s\""
-msgstr "valor de cidr é inválido: \"%s\""
-
-#: utils/adt/network.c:119 utils/adt/network.c:249
-msgid "Value has bits set to right of mask."
-msgstr "Valor tem bits definidos a direita da máscara."
+msgid "operator number %d for (%s,%s) appears more than once"
+msgstr "operador número %d  para (%s,%s) aparece mais de uma vez"
 
-#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
-#: utils/adt/network.c:664
+#: commands/opclasscmds.c:1293
 #, c-format
-msgid "could not format inet value: %m"
-msgstr "não pôde formatar valor de inet: %m"
+msgid "operator %d(%s,%s) already exists in operator family \"%s\""
+msgstr "operador %d(%s,%s) já existe na família de operadores \"%s\""
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:217
+#: commands/opclasscmds.c:1406
 #, c-format
-msgid "invalid address family in external \"%s\" value"
-msgstr "família de endereços inválida no valor de \"%s\" externo"
+msgid "function %d(%s,%s) already exists in operator family \"%s\""
+msgstr "função %d(%s,%s) já existe na família de operadores \"%s\""
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:224
+#: commands/opclasscmds.c:1493
 #, c-format
-msgid "invalid bits in external \"%s\" value"
-msgstr "bits inválidos no valor de \"%s\" externo"
+msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
+msgstr "operador %d(%s,%s) não existe na família de operadores \"%s\""
 
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:233
+#: commands/opclasscmds.c:1533
 #, c-format
-msgid "invalid length in external \"%s\" value"
-msgstr "tamanho inválido no valor de \"%s\" externo"
+msgid "function %d(%s,%s) does not exist in operator family \"%s\""
+msgstr "função %d(%s,%s) não existe na família de operadores \"%s\""
 
-#: utils/adt/network.c:248
-msgid "invalid external \"cidr\" value"
-msgstr "valor de \"cidr\" externo é inválido"
+#: commands/opclasscmds.c:1618
+#, fuzzy, c-format
+msgid ""
+"operator family \"%s\" does not exist for access method \"%s\", skipping"
+msgstr "família de operadores \"%s\" não existe para método de acesso \"%s\""
 
-#: utils/adt/network.c:370 utils/adt/network.c:397
+#: commands/opclasscmds.c:1778
 #, c-format
-msgid "invalid mask length: %d"
-msgstr "tamanho de máscara é inválido: %d"
+msgid ""
+"operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
+msgstr ""
+"classe de operadores \"%s\" para método de acesso \"%s\" já existe no "
+"esquema \"%s\""
 
-#: utils/adt/network.c:682
+#: commands/opclasscmds.c:1867
 #, c-format
-msgid "could not format cidr value: %m"
-msgstr "não pôde formatar valor de cidr: %m"
-
-#: utils/adt/network.c:1255
-msgid "cannot AND inet values of different sizes"
-msgstr "não pode executar E em valores inet de tamanhos diferentes"
+msgid ""
+"operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
+"\""
+msgstr ""
+"família de operadores \"%s\" para método de acesso \"%s\" já existe no "
+"esquema \"%s\""
 
-#: utils/adt/network.c:1287
-msgid "cannot OR inet values of different sizes"
-msgstr "não pode executar OU em valores inet de tamanhos diferentes"
+#: commands/operatorcmds.c:100
+msgid "=> is deprecated as an operator name"
+msgstr "=> está obsoleto como um nome de operador"
 
-#: utils/adt/network.c:1348 utils/adt/network.c:1424
-msgid "result is out of range"
-msgstr "resultado está fora do intervalo"
+#: commands/operatorcmds.c:101
+msgid ""
+"This name may be disallowed altogether in future versions of PostgreSQL."
+msgstr ""
+"Este nome pode ser proibido completamente em versões futuras do PostgreSQL."
 
-#: utils/adt/network.c:1389
-msgid "cannot subtract inet values of different sizes"
-msgstr "não pode subtrair valores inet de tamanhos diferentes"
+#: commands/operatorcmds.c:122 commands/operatorcmds.c:130
+msgid "SETOF type not allowed for operator argument"
+msgstr "tipo SETOF não é permitido como argumento de operador"
 
-#: utils/adt/timestamp.c:97
+#: commands/operatorcmds.c:158
 #, c-format
-msgid "TIMESTAMP(%d)%s precision must not be negative"
-msgstr "precisão do TIMESTAMP(%d)%s não deve ser negativa"
+msgid "operator attribute \"%s\" not recognized"
+msgstr "atributo de operador \"%s\" desconhecido"
 
-#: utils/adt/timestamp.c:103
+#: commands/operatorcmds.c:168
+msgid "operator procedure must be specified"
+msgstr "procedimento de operador deve ser especificado"
+
+#: commands/operatorcmds.c:179
+msgid "at least one of leftarg or rightarg must be specified"
+msgstr "pelo menos um dos argumentos esquerdo ou direito deve ser especificado"
+
+#: commands/operatorcmds.c:228
 #, c-format
-msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
-msgstr "precisão do TIMESTAMP(%d)%s reduzida ao máximo permitido, %d"
+msgid "restriction estimator function %s must return type \"float8\""
+msgstr "função de estimação de restrição %s deve retornar tipo \"float8\""
 
-#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
+#: commands/operatorcmds.c:267
 #, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp fora do intervalo: \"%s\""
+msgid "join estimator function %s must return type \"float8\""
+msgstr "função de estimação de junção %s deve retornar tipo \"float8\""
 
-#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
-#: utils/adt/timestamp.c:664
+#: commands/operatorcmds.c:318
 #, c-format
-msgid "date/time value \"%s\" is no longer supported"
-msgstr "valor de data/hora \"%s\" não é mais suportado"
+msgid "operator %s does not exist, skipping"
+msgstr "operador %s não existe, ignorando"
 
-#: utils/adt/timestamp.c:260
-msgid "timestamp cannot be NaN"
-msgstr "timestamp não pode ser NaN"
+#: commands/sequence.c:126
+msgid "unlogged sequences are not supported"
+msgstr "sequências unlogged não são suportadas"
 
-#: utils/adt/timestamp.c:370
+#: commands/sequence.c:550 commands/sequence.c:749 commands/sequence.c:791
+#: commands/sequence.c:827 commands/sequence.c:1470 catalog/aclchk.c:3072
 #, c-format
-msgid "timestamp(%d) precision must be between %d and %d"
-msgstr "precisão do timestamp(%d) deve ser entre %d e %d"
-
-#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
-#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
-msgid "interval out of range"
-msgstr "interval fora do intervalo"
+msgid "permission denied for sequence %s"
+msgstr "permissão negada para sequência %s"
 
-#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
-msgid "invalid INTERVAL type modifier"
-msgstr "modificador do tipo INTERVAL é inválido"
+#: commands/sequence.c:634
+#, c-format
+msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
+msgstr "nextval: valor máximo da sequência \"%s\" foi alcançado (%s)"
 
-#: utils/adt/timestamp.c:803
+#: commands/sequence.c:657
 #, c-format
-msgid "INTERVAL(%d) precision must not be negative"
-msgstr "precisão de INTERVAL(%d) não deve ser negativa"
+msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
+msgstr "nextval: valor mínimo da sequência \"%s\" foi alcançado (%s)"
 
-#: utils/adt/timestamp.c:809
+#: commands/sequence.c:755
 #, c-format
-msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
-msgstr "precisão de INTERVAL(%d) reduzida ao máximo permitido, %d"
+msgid "currval of sequence \"%s\" is not yet defined in this session"
+msgstr "valor atual da sequência \"%s\" ainda não foi definido nesta sessão"
 
-#: utils/adt/timestamp.c:1101
+#: commands/sequence.c:774 commands/sequence.c:780
+msgid "lastval is not yet defined in this session"
+msgstr "lastval ainda não foi definido nesta sessão"
+
+#: commands/sequence.c:848
 #, c-format
-msgid "interval(%d) precision must be between %d and %d"
-msgstr "precisão de interval(%d) deve ser entre %d e %d"
+msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
+msgstr "setval: valor %s está fora do intervalo da sequência \"%s\" (%s..%s)"
 
-#: utils/adt/timestamp.c:2306
-msgid "cannot subtract infinite timestamps"
-msgstr "não pode subtrair timestamps infinitos"
+#: commands/sequence.c:1017 postmaster/postmaster.c:2004
+#: postmaster/postmaster.c:2035 postmaster/postmaster.c:3232
+#: postmaster/postmaster.c:3916 postmaster/postmaster.c:3997
+#: postmaster/postmaster.c:4611 lib/stringinfo.c:266 libpq/auth.c:1022
+#: libpq/auth.c:1382 libpq/auth.c:1450 libpq/auth.c:1852 storage/file/fd.c:358
+#: storage/file/fd.c:742 storage/file/fd.c:860 storage/ipc/procarray.c:796
+#: storage/ipc/procarray.c:1207 storage/ipc/procarray.c:1214
+#: storage/ipc/procarray.c:1449 storage/ipc/procarray.c:1900
+#: storage/buffer/localbuf.c:350 storage/buffer/buf_init.c:154
+#: utils/mmgr/aset.c:416 utils/mmgr/aset.c:587 utils/mmgr/aset.c:765
+#: utils/mmgr/aset.c:966 utils/misc/tzparser.c:455 utils/misc/guc.c:3298
+#: utils/misc/guc.c:3311 utils/misc/guc.c:3324 utils/adt/formatting.c:1529
+#: utils/adt/formatting.c:1650 utils/adt/formatting.c:1783
+#: utils/adt/varlena.c:3474 utils/adt/varlena.c:3495 utils/adt/regexp.c:210
+#: utils/fmgr/dfmgr.c:224 utils/mb/mbutils.c:374 utils/mb/mbutils.c:675
+#: utils/hash/dynahash.c:364 utils/hash/dynahash.c:436
+#: utils/hash/dynahash.c:932 utils/init/miscinit.c:150
+#: utils/init/miscinit.c:171 utils/init/miscinit.c:181
+msgid "out of memory"
+msgstr "sem memória"
 
-#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
-#: utils/adt/timestamp.c:4020
+#: commands/sequence.c:1035 commands/tablecmds.c:208 commands/tablecmds.c:2247
+#: commands/tablecmds.c:2494 commands/tablecmds.c:8982 catalog/aclchk.c:1693
+#: catalog/objectaddress.c:398 utils/adt/acl.c:2008 utils/adt/acl.c:2038
+#: utils/adt/acl.c:2070 utils/adt/acl.c:2102 utils/adt/acl.c:2130
+#: utils/adt/acl.c:2160
 #, c-format
-msgid "timestamp units \"%s\" not supported"
-msgstr "unidades do timestamp \"%s\" não são suportadas"
+msgid "\"%s\" is not a sequence"
+msgstr "\"%s\" não é uma sequência"
 
-#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
+#: commands/sequence.c:1135 commands/sequence.c:1143 commands/sequence.c:1151
+#: commands/sequence.c:1159 commands/sequence.c:1167 commands/sequence.c:1175
+#: commands/sequence.c:1183 commands/sequence.c:1191 commands/typecmds.c:282
+#: commands/user.c:133 commands/user.c:150 commands/user.c:158
+#: commands/user.c:166 commands/user.c:174 commands/user.c:182
+#: commands/user.c:190 commands/user.c:198 commands/user.c:206
+#: commands/user.c:214 commands/user.c:222 commands/user.c:230
+#: commands/user.c:501 commands/user.c:513 commands/user.c:521
+#: commands/user.c:529 commands/user.c:537 commands/user.c:545
+#: commands/user.c:553 commands/user.c:561 commands/user.c:570
+#: commands/user.c:578 commands/dbcommands.c:146 commands/dbcommands.c:154
+#: commands/dbcommands.c:162 commands/dbcommands.c:170
+#: commands/dbcommands.c:178 commands/dbcommands.c:186
+#: commands/dbcommands.c:194 commands/dbcommands.c:1315
+#: commands/dbcommands.c:1323 commands/functioncmds.c:488
+#: commands/functioncmds.c:578 commands/functioncmds.c:586
+#: commands/functioncmds.c:594 commands/functioncmds.c:1982
+#: commands/functioncmds.c:1990 commands/copy.c:863 commands/copy.c:881
+#: commands/copy.c:889 commands/copy.c:897 commands/copy.c:905
+#: commands/copy.c:913 commands/copy.c:921 commands/copy.c:929
+#: commands/copy.c:945 commands/copy.c:959 commands/extension.c:1250
+#: commands/extension.c:1258 commands/extension.c:1266
+#: commands/extension.c:2501 commands/foreigncmds.c:396
+#: commands/foreigncmds.c:405 commands/collationcmds.c:93 catalog/aclchk.c:833
+#: catalog/aclchk.c:841
+msgid "conflicting or redundant options"
+msgstr "opções conflitantes ou redundantes"
+
+#: commands/sequence.c:1206
+msgid "INCREMENT must not be zero"
+msgstr "INCREMENT não deve ser zero"
+
+#: commands/sequence.c:1252
 #, c-format
-msgid "timestamp units \"%s\" not recognized"
-msgstr "unidades do timestamp \"%s\" são desconhecidas"
+msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
+msgstr "MINVALUE (%s) deve ser menor do que MAXVALUE (%s)"
 
-#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
-#: utils/adt/timestamp.c:4233
+#: commands/sequence.c:1277
 #, c-format
-msgid "timestamp with time zone units \"%s\" not supported"
-msgstr "unidades de timestamp with time zone \"%s\" não são suportadas"
+msgid "START value (%s) cannot be less than MINVALUE (%s)"
+msgstr "valor de START (%s) não pode ser menor do que MINVALUE (%s)"
 
-#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
+#: commands/sequence.c:1289
 #, c-format
-msgid "timestamp with time zone units \"%s\" not recognized"
-msgstr "unidades de timestamp with time zone \"%s\" são desconhecidas"
+msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
+msgstr "valor de START (%s) não pode ser maior do que MAXVALUE (%s)"
 
-#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
+#: commands/sequence.c:1320
 #, c-format
-msgid "interval units \"%s\" not supported"
-msgstr "unidades de interval \"%s\" não são suportadas"
+msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
+msgstr "valor de RESTART (%s) não pode ser menor do que MINVALUE (%s)"
 
-#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
+#: commands/sequence.c:1332
 #, c-format
-msgid "interval units \"%s\" not recognized"
-msgstr "unidades de interval \"%s\" são desconhecidas"
+msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
+msgstr "valor de RESTART (%s) não pode ser maior do que MAXVALUE (%s)"
 
-#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
+#: commands/sequence.c:1347
 #, c-format
-msgid "could not convert to time zone \"%s\""
-msgstr "não pôde converter para zona horária \"%s\""
+msgid "CACHE (%s) must be greater than zero"
+msgstr "CACHE (%s) deve ser maior do que zero"
 
-#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
+#: commands/sequence.c:1378
+msgid "invalid OWNED BY option"
+msgstr "opção de OWNED BY é inválida"
+
+#: commands/sequence.c:1379
+msgid "Specify OWNED BY table.column or OWNED BY NONE."
+msgstr "Especifique OWNED BY tabela.coluna ou OWNED BY NONE."
+
+#: commands/sequence.c:1401 commands/tablecmds.c:5525
 #, c-format
-msgid "interval time zone \"%s\" must not specify month"
-msgstr "zona horária de interval \"%s\" não deve especificar o mês"
+msgid "referenced relation \"%s\" is not a table"
+msgstr "relação referenciada \"%s\" não é uma tabela"
 
-#: utils/adt/timestamp.c:4712 utils/adt/timestamp.c:4793 utils/adt/int.c:1323
-#: utils/adt/int8.c:1358
-msgid "step size cannot equal zero"
-msgstr "tamanho do passo não pode ser zero"
+#: commands/sequence.c:1408
+msgid "sequence must have same owner as table it is linked to"
+msgstr "sequência deve ter mesmo dono da tabela que ela está ligada"
 
-#: utils/adt/oracle_compat.c:181 utils/adt/oracle_compat.c:279
-#: utils/adt/oracle_compat.c:755 utils/adt/oracle_compat.c:1045
-#: utils/adt/genfile.c:124
-msgid "requested length too large"
-msgstr "tamanho solicitado é muito grande"
+#: commands/sequence.c:1412
+msgid "sequence must be in same schema as table it is linked to"
+msgstr "sequência deve estar no mesmo esquema da tabela que ela está ligada"
 
-#: utils/adt/oracle_compat.c:892
-msgid "requested character too large"
-msgstr "tamanho solicitado é muito grande"
+#: commands/conversioncmds.c:71
+#, c-format
+msgid "source encoding \"%s\" does not exist"
+msgstr "codificação de origem \"%s\" não existe"
 
-#: utils/adt/oracle_compat.c:938 utils/adt/oracle_compat.c:992
+#: commands/conversioncmds.c:78
 #, c-format
-msgid "requested character too large for encoding: %d"
-msgstr "caracter solicitado é muito grande para codificação: %d"
+msgid "destination encoding \"%s\" does not exist"
+msgstr "codificação de destino \"%s\" não existe"
 
-#: utils/adt/oracle_compat.c:985
-msgid "null character not permitted"
-msgstr "caracter nulo não é permitido"
+#: commands/conversioncmds.c:92
+#, c-format
+msgid "encoding conversion function %s must return type \"void\""
+msgstr "função de conversão de codificação %s deve retornar tipo \"void\""
 
-#: utils/adt/uuid.c:128
+#: commands/conversioncmds.c:152
 #, c-format
-msgid "invalid input syntax for uuid: \"%s\""
-msgstr "sintaxe de entrada é inválida para uuid: \"%s\""
+msgid "conversion \"%s\" does not exist, skipping"
+msgstr "conversão \"%s\" não existe, ignorando"
 
-#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
+#: commands/conversioncmds.c:211
 #, c-format
-msgid "invalid input syntax for type tid: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo tid: \"%s\""
+msgid "conversion \"%s\" already exists in schema \"%s\""
+msgstr "conversão \"%s\" já existe no esquema \"%s\""
 
-#: utils/adt/array_userfuncs.c:48
-msgid "could not determine input data types"
-msgstr "não pôde determinar tipos de dado de entrada"
+#: commands/prepare.c:71
+msgid "invalid statement name: must not be empty"
+msgstr "nome de comando é inválido: não deve ser vazio"
 
-#: utils/adt/array_userfuncs.c:82
-msgid "neither input type is an array"
-msgstr "tipo de entrada não é uma matriz"
-
-#: utils/adt/array_userfuncs.c:103 utils/adt/array_userfuncs.c:113
-#: utils/adt/varlena.c:942 utils/adt/varlena.c:1915 utils/adt/float.c:1101
-#: utils/adt/float.c:1160 utils/adt/float.c:2711 utils/adt/float.c:2727
-#: utils/adt/varbit.c:1098 utils/adt/varbit.c:1483 utils/adt/arrayfuncs.c:1251
-#: utils/adt/int.c:622 utils/adt/int.c:651 utils/adt/int.c:672
-#: utils/adt/int.c:692 utils/adt/int.c:714 utils/adt/int.c:739
-#: utils/adt/int.c:753 utils/adt/int.c:768 utils/adt/int.c:903
-#: utils/adt/int.c:924 utils/adt/int.c:951 utils/adt/int.c:991
-#: utils/adt/int.c:1012 utils/adt/int.c:1039 utils/adt/int.c:1066
-#: utils/adt/int.c:1120 utils/adt/int8.c:1196 utils/adt/numeric.c:2062
-#: utils/adt/numeric.c:2071
-msgid "integer out of range"
-msgstr "inteiro fora do intervalo"
-
-#: utils/adt/array_userfuncs.c:121
-msgid "argument must be empty or one-dimensional array"
-msgstr "argumento deve ser vazio ou matriz de uma dimensão"
+#: commands/prepare.c:140
+msgid "utility statements cannot be prepared"
+msgstr "comandos utilitários não podem ser preparados"
 
-#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
-#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
-#: utils/adt/array_userfuncs.c:357
-msgid "cannot concatenate incompatible arrays"
-msgstr "não pode concatenar matrizes incompatíveis"
+#: commands/prepare.c:240 commands/prepare.c:247 commands/prepare.c:706
+msgid "prepared statement is not a SELECT"
+msgstr "comando preparado não é um SELECT"
 
-#: utils/adt/array_userfuncs.c:225
+#: commands/prepare.c:314
 #, c-format
-msgid ""
-"Arrays with element types %s and %s are not compatible for concatenation."
-msgstr ""
-"Matrizes com tipos de elemento %s e %s não são compatíveis para concatenação."
+msgid "wrong number of parameters for prepared statement \"%s\""
+msgstr "número incorreto de parâmetros para comando preparado \"%s\""
 
-#: utils/adt/array_userfuncs.c:264
+#: commands/prepare.c:316
 #, c-format
-msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
-msgstr "Matrizes de dimensões %d e %d não são compatíveis para concatenação."
+msgid "Expected %d parameters but got %d."
+msgstr "Esperado %d parâmetros mas recebeu %d."
 
-#: utils/adt/array_userfuncs.c:301
-msgid ""
-"Arrays with differing element dimensions are not compatible for "
-"concatenation."
-msgstr ""
-"Matrizes com dimensões de elementos diferentes não são compatíveis para "
-"concatenação."
+#: commands/prepare.c:345
+msgid "cannot use subquery in EXECUTE parameter"
+msgstr "não pode utilizar subconsulta no parâmetro EXECUTE"
 
-#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
-msgid "Arrays with differing dimensions are not compatible for concatenation."
-msgstr ""
-"Matrizes com dimensões diferentes não são compatíveis para concatenação."
+#: commands/prepare.c:349
+msgid "cannot use aggregate function in EXECUTE parameter"
+msgstr "não pode utilizar função de agregação no parâmetro EXECUTE"
 
-#: utils/adt/array_userfuncs.c:424 utils/adt/arrayfuncs.c:1214
-#: utils/adt/arrayfuncs.c:2882 utils/adt/arrayfuncs.c:4562
+#: commands/prepare.c:353
+msgid "cannot use window function in EXECUTE parameter"
+msgstr "não pode utilizar função deslizante no parâmetro EXECUTE"
+
+#: commands/prepare.c:366
 #, c-format
-msgid "invalid number of dimensions: %d"
-msgstr "número de dimensões é inválido: %d"
+msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
+msgstr "parâmetro $%d do tipo %s não pode ser convertido para tipo esperado %s"
 
-#: utils/adt/array_userfuncs.c:484
-msgid "could not determine input data type"
-msgstr "não pôde determinar tipo de dado de entrada"
+#: commands/prepare.c:370 catalog/heap.c:2437 rewrite/rewriteHandler.c:1035
+#: parser/parse_node.c:397 parser/parse_target.c:489 parser/parse_target.c:735
+#: parser/parse_target.c:745
+msgid "You will need to rewrite or cast the expression."
+msgstr "Você precisará reescrever ou converter a expressão."
 
-#: utils/adt/varchar.c:48 utils/adt/varbit.c:54
+#: commands/prepare.c:467
 #, c-format
-msgid "length for type %s must be at least 1"
-msgstr "tamanho para tipo %s deve ser pelo menos 1"
+msgid "prepared statement \"%s\" already exists"
+msgstr "comando preparado \"%s\" já existe"
 
-#: utils/adt/varchar.c:52 utils/adt/varbit.c:59
+#: commands/prepare.c:525
 #, c-format
-msgid "length for type %s cannot exceed %d"
-msgstr "tamanho para tipo %s não pode exceder %d"
+msgid "prepared statement \"%s\" does not exist"
+msgstr "comando preparado \"%s\" não existe"
 
-#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
-#, c-format
-msgid "value too long for type character(%d)"
-msgstr "valor é muito longo para tipo character(%d)"
+#: commands/prepare.c:751 commands/extension.c:1707 commands/extension.c:1816
+#: commands/extension.c:2009 foreign/foreign.c:350
+#: replication/walsender.c:1401 executor/execQual.c:1613
+#: executor/execQual.c:1638 executor/execQual.c:1999 executor/execQual.c:5115
+#: executor/functions.c:785 utils/mmgr/portalmem.c:946 utils/fmgr/funcapi.c:60
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"função que tem argumento do tipo conjunto foi chamada em um contexto que não "
+"pode aceitar um conjunto"
 
-#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#: commands/prepare.c:755 commands/extension.c:1711 commands/extension.c:1820
+#: commands/extension.c:2013 foreign/foreign.c:355
+#: replication/walsender.c:1405 utils/mmgr/portalmem.c:950
+msgid "materialize mode required, but it is not allowed in this context"
+msgstr ""
+"modo de materialização é requerido, mas ele não é permitido neste contexto"
+
+#: commands/tsearchcmds.c:117 commands/tsearchcmds.c:1044
 #, c-format
-msgid "value too long for type character varying(%d)"
-msgstr "valor é muito longo para tipo character varying(%d)"
+msgid "function %s should return type %s"
+msgstr "função %s deve retornar tipo %s"
 
-#: utils/adt/ri_triggers.c:373 utils/adt/ri_triggers.c:433
-#: utils/adt/ri_triggers.c:596 utils/adt/ri_triggers.c:836
-#: utils/adt/ri_triggers.c:1024 utils/adt/ri_triggers.c:1186
-#: utils/adt/ri_triggers.c:1374 utils/adt/ri_triggers.c:1545
-#: utils/adt/ri_triggers.c:1728 utils/adt/ri_triggers.c:1899
-#: utils/adt/ri_triggers.c:2115 utils/adt/ri_triggers.c:2297
-#: utils/adt/ri_triggers.c:2500 utils/adt/ri_triggers.c:2548
-#: utils/adt/ri_triggers.c:2593 utils/adt/ri_triggers.c:2721 gram.y:2610
-msgid "MATCH PARTIAL not yet implemented"
-msgstr "MATCH PARTIAL ainda não foi implementado"
+#: commands/tsearchcmds.c:189
+msgid "must be superuser to create text search parsers"
+msgstr "deve ser super-usuário para criar analisadores de busca textual"
 
-#: utils/adt/ri_triggers.c:407 utils/adt/ri_triggers.c:2803
-#: utils/adt/ri_triggers.c:3454 utils/adt/ri_triggers.c:3486
+#: commands/tsearchcmds.c:237
 #, c-format
-msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
-msgstr ""
-"inserção ou atualização em tabela \"%s\" viola restrição de chave "
-"estrangeira \"%s\""
+msgid "text search parser parameter \"%s\" not recognized"
+msgstr "parâmetro do analisador de busca textual \"%s\" é desconhecido"
 
-#: utils/adt/ri_triggers.c:410 utils/adt/ri_triggers.c:2806
-msgid "MATCH FULL does not allow mixing of null and nonnull key values."
-msgstr "MATCH FULL não permite mistura de valores de chaves nulas e não-nulas."
+#: commands/tsearchcmds.c:247
+msgid "text search parser start method is required"
+msgstr "método start do analisador de busca textual é requerido"
+
+#: commands/tsearchcmds.c:252
+msgid "text search parser gettoken method is required"
+msgstr "método gettoken do analisador de busca textual é requerido"
+
+#: commands/tsearchcmds.c:257
+msgid "text search parser end method is required"
+msgstr "método end do analisador de busca textual é requerido"
+
+#: commands/tsearchcmds.c:262
+msgid "text search parser lextypes method is required"
+msgstr "método lextypes do analisador de busca textual é requerido"
+
+#: commands/tsearchcmds.c:297
+msgid "must be superuser to drop text search parsers"
+msgstr "deve ser super-usuário para remover analisadores de busca textual"
 
-#: utils/adt/ri_triggers.c:2999 commands/constraint.c:59
+#: commands/tsearchcmds.c:320 catalog/namespace.c:1906
 #, c-format
-msgid "function \"%s\" was not called by trigger manager"
-msgstr "função \"%s\" não foi chamada pelo gerenciador de gatilhos"
+msgid "text search parser \"%s\" does not exist"
+msgstr "analisador de busca textual \"%s\" não existe"
 
-#: utils/adt/ri_triggers.c:3008 commands/constraint.c:66
+#: commands/tsearchcmds.c:326
 #, c-format
-msgid "function \"%s\" must be fired AFTER ROW"
-msgstr "função \"%s\" deve ser disparada no AFTER ROW"
+msgid "text search parser \"%s\" does not exist, skipping"
+msgstr "analisador de busca textual \"%s\" não existe, ignorando"
+
+#: commands/tsearchcmds.c:381
+msgid "must be superuser to rename text search parsers"
+msgstr "deve ser super-usuário para renomear analisadores de busca textual"
 
-#: utils/adt/ri_triggers.c:3016
+#: commands/tsearchcmds.c:399
 #, c-format
-msgid "function \"%s\" must be fired for INSERT"
-msgstr "função \"%s\" deve ser disparada pelo INSERT"
+msgid "text search parser \"%s\" already exists"
+msgstr "analisador de busca textual \"%s\" já existe"
 
-#: utils/adt/ri_triggers.c:3022
+#: commands/tsearchcmds.c:525
 #, c-format
-msgid "function \"%s\" must be fired for UPDATE"
-msgstr "função \"%s\" deve ser disparada pelo UPDATE"
+msgid "text search template \"%s\" does not accept options"
+msgstr "modelo de busca textual \"%s\" não aceita opções"
+
+#: commands/tsearchcmds.c:598
+msgid "text search template is required"
+msgstr "modelo de busca textual é requerido"
 
-#: utils/adt/ri_triggers.c:3029 commands/constraint.c:80
+#: commands/tsearchcmds.c:667
 #, c-format
-msgid "function \"%s\" must be fired for INSERT or UPDATE"
-msgstr "função \"%s\" deve ser disparada pelo INSERT ou UPDATE"
+msgid "text search dictionary \"%s\" already exists"
+msgstr "dicionário de busca textual \"%s\" já existe"
 
-#: utils/adt/ri_triggers.c:3036
+#: commands/tsearchcmds.c:769 catalog/namespace.c:2029
 #, c-format
-msgid "function \"%s\" must be fired for DELETE"
-msgstr "função \"%s\" deve ser disparada pelo DELETE"
+msgid "text search dictionary \"%s\" does not exist"
+msgstr "dicionário de busca textual \"%s\" não existe"
 
-#: utils/adt/ri_triggers.c:3065
+#: commands/tsearchcmds.c:775
 #, c-format
-msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
-msgstr "nenhuma entrada em pg_constraint para gatilho \"%s\" na tabela \"%s\""
+msgid "text search dictionary \"%s\" does not exist, skipping"
+msgstr "dicionário de busca textual \"%s\" não existe, ignorando"
 
-#: utils/adt/ri_triggers.c:3067
-msgid ""
-"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
-"ADD CONSTRAINT."
-msgstr ""
-"Remova este gatilho de integridade referencial e seus pares, então faça "
-"ALTER TABLE ADD CONSTRAINT."
+#: commands/tsearchcmds.c:1108
+msgid "must be superuser to create text search templates"
+msgstr "deve ser super-usuário para criar modelos de busca textual"
 
-#: utils/adt/ri_triggers.c:3421
+#: commands/tsearchcmds.c:1145
 #, c-format
-msgid ""
-"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
-"unexpected result"
-msgstr ""
-"consulta de integridade referencial em \"%s\" da retrição \"%s\" em \"%s\" "
-"retornou resultado inesperado"
+msgid "text search template parameter \"%s\" not recognized"
+msgstr "parâmetro do modelo de busca textual \"%s\" é desconhecido"
 
-#: utils/adt/ri_triggers.c:3425
-msgid "This is most likely due to a rule having rewritten the query."
-msgstr ""
-"Isso provavelmente foi causado por uma regra que reescreveu a consulta."
+#: commands/tsearchcmds.c:1155
+msgid "text search template lexize method is required"
+msgstr "método lexize do modelo de busca textual é requerido"
 
-#: utils/adt/ri_triggers.c:3456
-#, c-format
-msgid "No rows were found in \"%s\"."
-msgstr "Nenhum registro foi encontrado em \"%s\"."
+#: commands/tsearchcmds.c:1193
+msgid "must be superuser to rename text search templates"
+msgstr "deve ser super-usuário para renomear modelos de busca textual"
 
-#: utils/adt/ri_triggers.c:3488
+#: commands/tsearchcmds.c:1212
 #, c-format
-msgid "Key (%s)=(%s) is not present in table \"%s\"."
-msgstr "Chave (%s)=(%s) não está presente na tabela \"%s\"."
+msgid "text search template \"%s\" already exists"
+msgstr "modelo de busca textual \"%s\" já existe"
 
-#: utils/adt/ri_triggers.c:3494
-#, c-format
-msgid ""
-"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
-"table \"%s\""
-msgstr ""
-"atualização ou exclusão em tabela \"%s\" viola restrição de chave "
-"estrangeira \"%s\" em \"%s\""
+#: commands/tsearchcmds.c:1281
+msgid "must be superuser to drop text search templates"
+msgstr "deve ser super-usuário para remover modelos de busca textual"
 
-#: utils/adt/ri_triggers.c:3497
+#: commands/tsearchcmds.c:1304 catalog/namespace.c:2153
 #, c-format
-msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
-msgstr "Chave (%s)=(%s) ainda é referenciada pela tabela \"%s\"."
+msgid "text search template \"%s\" does not exist"
+msgstr "modelo de busca textual \"%s\" não existe"
 
-#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
+#: commands/tsearchcmds.c:1310
 #, c-format
-msgid "invalid input syntax for type oid: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo oid: \"%s\""
+msgid "text search template \"%s\" does not exist, skipping"
+msgstr "modelo de busca textual \"%s\" não existe, ignorando"
 
-#: utils/adt/oid.c:69 utils/adt/oid.c:107
+#: commands/tsearchcmds.c:1508
 #, c-format
-msgid "value \"%s\" is out of range for type oid"
-msgstr "valor \"%s\" está fora do intervalo para tipo oid"
+msgid "text search configuration parameter \"%s\" not recognized"
+msgstr "parâmetro de configuração de busca textual \"%s\" é desconhecido"
 
-#: utils/adt/oid.c:212 utils/adt/oid.c:292 utils/adt/int.c:242
-msgid "oidvector has too many elements"
-msgstr "oidvector tem muitos elementos"
+#: commands/tsearchcmds.c:1515
+msgid "cannot specify both PARSER and COPY options"
+msgstr "não pode especificar ambas opções PARSER e COPY"
 
-#: utils/adt/oid.c:286
-msgid "invalid oidvector data"
-msgstr "dado oidvector inválido"
+#: commands/tsearchcmds.c:1543
+msgid "text search parser is required"
+msgstr "analisador de busca textual é requerido"
 
-#: utils/adt/tsquery_cleanup.c:285
-msgid ""
-"text-search query contains only stop words or doesn't contain lexemes, "
-"ignored"
-msgstr ""
-"consulta de busca textual contém somente palavras ignoradas ou não contém "
-"lexemas, ignorada"
+#: commands/tsearchcmds.c:1652
+#, c-format
+msgid "text search configuration \"%s\" already exists"
+msgstr "configuração de busca textual \"%s\" já existe"
 
-#: utils/adt/domains.c:80
+#: commands/tsearchcmds.c:1753 commands/tsearchcmds.c:1909
+#: catalog/namespace.c:2276
 #, c-format
-msgid "type %s is not a domain"
-msgstr "tipo %s não é um domínio"
+msgid "text search configuration \"%s\" does not exist"
+msgstr "configuração de busca textual \"%s\" não existe"
 
-#: utils/adt/varlena.c:238 utils/adt/varlena.c:279 utils/adt/encode.c:441
-#: utils/adt/encode.c:506
-msgid "invalid input syntax for type bytea"
-msgstr "sintaxe de entrada é inválida para tipo bytea"
+#: commands/tsearchcmds.c:1759
+#, c-format
+msgid "text search configuration \"%s\" does not exist, skipping"
+msgstr "configuração de busca textual \"%s\" não existe, ignorando"
 
-#: utils/adt/varlena.c:729 utils/adt/varlena.c:793 utils/adt/varlena.c:937
-#: utils/adt/varlena.c:1843 utils/adt/varlena.c:1910 utils/adt/varbit.c:991
-#: utils/adt/varbit.c:1093
-msgid "negative substring length not allowed"
-msgstr "tamanho negativo de índice não é permitido"
+#: commands/tsearchcmds.c:1981
+#, c-format
+msgid "token type \"%s\" does not exist"
+msgstr "tipo de elemento \"%s\" não existe"
 
-#: utils/adt/varlena.c:1333 utils/adt/varlena.c:1346
+#: commands/tsearchcmds.c:2203
 #, c-format
-msgid "could not convert string to UTF-16: error %lu"
-msgstr "não pôde converter cadeia de caracteres para UTF-16: erro %lu"
+msgid "mapping for token type \"%s\" does not exist"
+msgstr "mapeamento para tipo de elemento \"%s\" não existe"
 
-#: utils/adt/varlena.c:1356
+#: commands/tsearchcmds.c:2209
 #, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "não pôde comparar cadeias de caracteres Unicode: %m"
+msgid "mapping for token type \"%s\" does not exist, skipping"
+msgstr "mapeamento para tipo de elemento \"%s\" não existe, ignorando"
 
-#: utils/adt/varlena.c:1988 utils/adt/varlena.c:2019 utils/adt/varlena.c:2055
-#: utils/adt/varlena.c:2098
+#: commands/tsearchcmds.c:2362 commands/tsearchcmds.c:2473
 #, c-format
-msgid "index %d out of valid range, 0..%d"
-msgstr "índice %d fora do intervalo válido, 0..%d"
+msgid "invalid parameter list format: \"%s\""
+msgstr "formato de lista de parâmetros é inválido: \"%s\""
 
-#: utils/adt/varlena.c:2110 utils/adt/varbit.c:1719
-msgid "new bit must be 0 or 1"
-msgstr "novo bit deve ser 0 ou 1"
+#: commands/alter.c:423
+#, c-format
+msgid "must be superuser to set schema of %s"
+msgstr "deve ser super-usuário para definir esquema de %s"
 
-#: utils/adt/varlena.c:2198 utils/adt/varlena.c:2203 utils/adt/regproc.c:1320
-#: utils/adt/regproc.c:1325
-msgid "invalid name syntax"
-msgstr "sintaxe de nome inválida"
+#: commands/alter.c:451
+#, c-format
+msgid "%s already exists in schema \"%s\""
+msgstr "%s já existe no esquema \"%s\""
 
-#: utils/adt/varlena.c:2797 utils/adt/regexp.c:269
+#: commands/lockcmds.c:93
 #, c-format
-msgid "regular expression failed: %s"
-msgstr "expressão regular falhou: %s"
+msgid "could not obtain lock on relation \"%s\""
+msgstr "não pôde obter bloqueio na relação \"%s\""
 
-#: utils/adt/varlena.c:2890
-msgid "field position must be greater than zero"
-msgstr "posição do campo deve ser maior que zero"
+#: commands/lockcmds.c:98
+#, c-format
+msgid "could not obtain lock on relation with OID %u"
+msgstr "não pôde obter bloqueio na relação com OID %u"
 
-#: utils/adt/genfile.c:58
-msgid "reference to parent directory (\"..\") not allowed"
-msgstr "referência ao diretório ancestral (\"..\") não é permitida"
-
-#: utils/adt/genfile.c:72
-msgid "absolute path not allowed"
-msgstr "caminho absoluto não é permitido"
-
-#: utils/adt/genfile.c:99
-msgid "must be superuser to read files"
-msgstr "deve ser super-usuário para ler arquivos"
-
-#: utils/adt/genfile.c:106 commands/copy.c:1774
+#: commands/lockcmds.c:122 catalog/namespace.c:285 parser/parse_relation.c:835
 #, c-format
-msgid "could not open file \"%s\" for reading: %m"
-msgstr "não pôde abrir arquivo \"%s\" para leitura: %m"
+msgid "relation \"%s.%s\" does not exist"
+msgstr "relação \"%s.%s\" não existe"
 
-#: utils/adt/genfile.c:113
+#: commands/lockcmds.c:127 catalog/namespace.c:290 parser/parse_relation.c:848
+#: parser/parse_relation.c:856 utils/adt/regproc.c:810
 #, c-format
-msgid "could not seek in file \"%s\": %m"
-msgstr "não pôde buscar em arquivo \"%s\": %m"
-
-#: utils/adt/genfile.c:118
-msgid "requested length cannot be negative"
-msgstr "tamanho solicitado não pode ser negativo"
+msgid "relation \"%s\" does not exist"
+msgstr "relação \"%s\" não existe"
 
-#: utils/adt/genfile.c:133 access/transam/xlog.c:2469
-#: access/transam/xlog.c:4317 access/transam/xlog.c:8546
-#: access/transam/xlog.c:8620 access/transam/xlog.c:9003
-#: access/transam/xlog.c:9028 storage/file/copydir.c:186
+#: commands/lockcmds.c:149 commands/indexcmds.c:200 commands/indexcmds.c:1574
+#: commands/tablecmds.c:202 commands/tablecmds.c:1129
+#: commands/tablecmds.c:2478 commands/tablecmds.c:3825
+#: commands/tablecmds.c:6773 catalog/toasting.c:93 catalog/objectaddress.c:405
 #, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "não pôde ler arquivo \"%s\": %m"
+msgid "\"%s\" is not a table"
+msgstr "\"%s\" não é uma tabela"
 
-#: utils/adt/genfile.c:163
-msgid "must be superuser to get file information"
-msgstr "deve ser super-usuário para obter informação sobre arquivo"
+#: commands/vacuum.c:419
+msgid "oldest xmin is far in the past"
+msgstr "xmin mais velho é muito antigo"
 
-#: utils/adt/genfile.c:170 utils/adt/dbsize.c:65 utils/adt/dbsize.c:217
-#: utils/adt/dbsize.c:288 access/transam/xlog.c:2858
-#: access/transam/xlog.c:3023 access/transam/xlog.c:8426
-#: storage/file/copydir.c:86 storage/file/copydir.c:125
-#, c-format
-msgid "could not stat file \"%s\": %m"
-msgstr "não pôde executar stat no arquivo \"%s\": %m"
+#: commands/vacuum.c:420
+msgid "Close open transactions soon to avoid wraparound problems."
+msgstr ""
+"Feche transações abertas imediatamente para evitar problemas de reinício."
 
-#: utils/adt/genfile.c:227
-msgid "must be superuser to get directory listings"
-msgstr "deve ser super-usuário para obter listagem de diretórios"
+#: commands/vacuum.c:811
+msgid "some databases have not been vacuumed in over 2 billion transactions"
+msgstr ""
+"alguns bancos de dados não foram limpados a mais de 2 bilhões de transações"
+
+#: commands/vacuum.c:812
+msgid "You might have already suffered transaction-wraparound data loss."
+msgstr ""
+"Você já pode ter sofrido problemas de perda de dados devido a reciclagem de "
+"transações."
 
-#: utils/adt/genfile.c:244 utils/adt/misc.c:213 utils/misc/tzparser.c:345
-#: postmaster/postmaster.c:1142 commands/tablespace.c:679
-#: storage/file/fd.c:1572 storage/file/copydir.c:67 storage/file/copydir.c:106
+#: commands/vacuum.c:919
 #, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "não pôde abrir diretório \"%s\": %m"
+msgid "skipping vacuum of \"%s\" --- lock not available"
+msgstr "ignorando limpeza de \"%s\" --- bloqueio não está disponível"
 
-#: utils/adt/pseudotypes.c:94
-msgid "cannot accept a value of type any"
-msgstr "não pode aceitar um valor do tipo any"
+#: commands/vacuum.c:945
+#, c-format
+msgid "skipping \"%s\" --- only superuser can vacuum it"
+msgstr "ignorando \"%s\" --- somente super-usuário pode limpá-la(o)"
 
-#: utils/adt/pseudotypes.c:107
-msgid "cannot display a value of type any"
-msgstr "não pode mostrar um valor do tipo any"
+#: commands/vacuum.c:949
+#, c-format
+msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
+msgstr ""
+"ignorando \"%s\" --- somente super-usuário ou dono de banco de dados pode "
+"limpá-la(o)"
 
-#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
-msgid "cannot accept a value of type anyarray"
-msgstr "não pode aceitar um valor do tipo anyarray"
+#: commands/vacuum.c:953
+#, c-format
+msgid "skipping \"%s\" --- only table or database owner can vacuum it"
+msgstr ""
+"ignorando \"%s\" --- somente dono de tabela ou de banco de dados pode limpá-"
+"la(o)"
 
-#: utils/adt/pseudotypes.c:174
-msgid "cannot accept a value of type anyenum"
-msgstr "não pode aceitar um valor do tipo anyenum"
+#: commands/vacuum.c:970
+#, fuzzy, c-format
+msgid "skipping \"%s\" --- cannot vacuum non-tables or special system tables"
+msgstr ""
+"ignorando \"%s\" --- não pode limpar índices, visões ou tabelas especiais do "
+"sistema"
 
-#: utils/adt/pseudotypes.c:224
-msgid "cannot accept a value of type trigger"
-msgstr "não pode aceitar um valor do tipo trigger"
+#: commands/schemacmds.c:82 commands/schemacmds.c:275
+#, c-format
+msgid "unacceptable schema name \"%s\""
+msgstr "nome de esquema \"%s\" é inaceitável"
 
-#: utils/adt/pseudotypes.c:237
-msgid "cannot display a value of type trigger"
-msgstr "não pode mostrar um valor do tipo trigger"
+#: commands/schemacmds.c:83 commands/schemacmds.c:276
+msgid "The prefix \"pg_\" is reserved for system schemas."
+msgstr "O prefixo \"pg_\" é reservado para esquemas do sistema."
 
-#: utils/adt/pseudotypes.c:251
-msgid "cannot accept a value of type language_handler"
-msgstr "não pode aceitar um valor do tipo language_handler"
+#: commands/schemacmds.c:178 catalog/objectaddress.c:298
+msgid "schema name cannot be qualified"
+msgstr "nome do esquema não pode ser qualificado"
 
-#: utils/adt/pseudotypes.c:264
-msgid "cannot display a value of type language_handler"
-msgstr "não pode mostrar um valor do tipo language_handler"
+#: commands/schemacmds.c:186
+#, c-format
+msgid "schema \"%s\" does not exist, skipping"
+msgstr "esquema \"%s\" não existe, ignorando"
 
-#: utils/adt/pseudotypes.c:278
-msgid "cannot accept a value of type internal"
-msgstr "não pode aceitar um valor do tipo interval"
+#: commands/schemacmds.c:253 commands/schemacmds.c:322
+#: catalog/namespace.c:2610 catalog/namespace.c:3595 catalog/namespace.c:3598
+#, c-format
+msgid "schema \"%s\" does not exist"
+msgstr "esquema \"%s\" não existe"
 
-#: utils/adt/pseudotypes.c:291
-msgid "cannot display a value of type internal"
-msgstr "não pode mostrar um valor do tipo interval"
+#: commands/schemacmds.c:259 catalog/pg_namespace.c:52
+#, c-format
+msgid "schema \"%s\" already exists"
+msgstr "esquema \"%s\" já existe"
 
-#: utils/adt/pseudotypes.c:305
-msgid "cannot accept a value of type opaque"
-msgstr "não pode aceitar um valor do tipo opaque"
+#: commands/seclabel.c:58
+msgid "no security label providers have been loaded"
+msgstr "nenhum fornecedor de rótulo de segurança foi carregado"
 
-#: utils/adt/pseudotypes.c:318
-msgid "cannot display a value of type opaque"
-msgstr "não pode mostrar um valor do tipo opaque"
+#: commands/seclabel.c:62
+msgid ""
+"must specify provider when multiple security label providers have been loaded"
+msgstr ""
+"deve especificar fornecedor quando múltiplos fornecedores de rótulo de "
+"segurança forem carregados"
 
-#: utils/adt/pseudotypes.c:332
-msgid "cannot accept a value of type anyelement"
-msgstr "não pode aceitar um valor do tipo anyelement"
+#: commands/seclabel.c:80
+#, c-format
+msgid "security label provider \"%s\" is not loaded"
+msgstr "fornecedor de rótulo de segurança \"%s\" não foi carregado"
 
-#: utils/adt/pseudotypes.c:345
-msgid "cannot display a value of type anyelement"
-msgstr "não pode mostrar um valor do tipo anyelement"
+#: commands/seclabel.c:113 commands/comment.c:97
+#, c-format
+msgid "\"%s\" is not a table, view, composite type, or foreign table"
+msgstr "\"%s\" não é uma tabela, visão, tipo composto ou tabela externa"
 
-#: utils/adt/pseudotypes.c:358
-msgid "cannot accept a value of type anynonarray"
-msgstr "não pode aceitar um valor do tipo anynonarray"
+#: commands/typecmds.c:169
+msgid "must be superuser to create a base type"
+msgstr "deve ser super-usuário para criar um tipo base"
 
-#: utils/adt/pseudotypes.c:371
-msgid "cannot display a value of type anynonarray"
-msgstr "não pode mostrar um valor do tipo anynonarray"
+#: commands/typecmds.c:224 commands/typecmds.c:806 commands/typecmds.c:1145
+#: commands/typecmds.c:1622 catalog/heap.c:1027 catalog/pg_type.c:396
+#: catalog/pg_type.c:699
+#, c-format
+msgid "type \"%s\" already exists"
+msgstr "tipo \"%s\" já existe"
 
-#: utils/adt/pseudotypes.c:384
-msgid "cannot accept a value of a shell type"
-msgstr "não pode aceitar um valor do tipo shell"
+#: commands/typecmds.c:275
+#, c-format
+msgid "type attribute \"%s\" not recognized"
+msgstr "atributo do tipo \"%s\" desconhecido"
 
-#: utils/adt/pseudotypes.c:397
-msgid "cannot display a value of a shell type"
-msgstr "não pode mostrar um valor do tipo shell"
+#: commands/typecmds.c:329
+#, c-format
+msgid "invalid type category \"%s\": must be simple ASCII"
+msgstr "categoria de tipo \"%s\" é inválida: deve ser ASCII simples"
 
-#: utils/adt/numutils.c:53 utils/adt/numutils.c:63 utils/adt/numutils.c:105
-#: utils/adt/int8.c:97 utils/adt/int8.c:132
+#: commands/typecmds.c:348
 #, c-format
-msgid "invalid input syntax for integer: \"%s\""
-msgstr "sintaxe de entrada é inválida para integer: \"%s\""
+msgid "array element type cannot be %s"
+msgstr "tipo do elemento da matriz não pode ser %s"
 
-#: utils/adt/numutils.c:77
+#: commands/typecmds.c:380
 #, c-format
-msgid "value \"%s\" is out of range for type integer"
-msgstr "valor \"%s\" está fora do intervalo para tipo integer"
+msgid "alignment \"%s\" not recognized"
+msgstr "alinhamento \"%s\" desconhecido"
 
-#: utils/adt/numutils.c:83
+#: commands/typecmds.c:397
 #, c-format
-msgid "value \"%s\" is out of range for type smallint"
-msgstr "valor \"%s\" está fora do intervalo para tipo smallint"
+msgid "storage \"%s\" not recognized"
+msgstr "armazenamento \"%s\" desconhecido"
+
+#: commands/typecmds.c:408
+msgid "type input function must be specified"
+msgstr "função de entrada do tipo deve ser especificada"
+
+#: commands/typecmds.c:412
+msgid "type output function must be specified"
+msgstr "função de saída do tipo deve ser especificada"
 
-#: utils/adt/numutils.c:89
+#: commands/typecmds.c:417
+msgid ""
+"type modifier output function is useless without a type modifier input "
+"function"
+msgstr ""
+"função de saída do modificador de tipo é inútil sem uma função de entrada do "
+"modificador de tipo"
+
+#: commands/typecmds.c:440
 #, c-format
-msgid "value \"%s\" is out of range for 8-bit integer"
-msgstr "valor \"%s\" está fora do intervalo para inteiro de 8 bits"
+msgid "changing return type of function %s from \"opaque\" to %s"
+msgstr "alterando tipo retornado pela função %s de \"opaque\" para %s"
 
-#: utils/adt/tsvector.c:215
+#: commands/typecmds.c:447
 #, c-format
-msgid "word is too long (%ld bytes, max %ld bytes)"
-msgstr "palavra é muito longa (%ld bytes, máximo de %ld bytes)"
+msgid "type input function %s must return type %s"
+msgstr "função de entrada do tipo %s deve retornar tipo %s"
 
-#: utils/adt/tsvector.c:222
+#: commands/typecmds.c:457
 #, c-format
-msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
-msgstr ""
-"cadeia de caracteres é muito longa para tsvector (%ld bytes, máximo de %ld "
-"bytes)"
+msgid "changing return type of function %s from \"opaque\" to \"cstring\""
+msgstr "alterando tipo retornado pela função %s de \"opaque\" para \"cstring\""
 
-#: utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:514 tsearch/to_tsany.c:165
+#: commands/typecmds.c:464
 #, c-format
-msgid "string is too long for tsvector (%d bytes, max %d bytes)"
-msgstr ""
-"cadeia de caracteres é muito longa para tsvector (%d bytes, máximo de %d "
-"bytes)"
+msgid "type output function %s must return type \"cstring\""
+msgstr "função de saída do tipo %s deve retornar tipo \"cstring\""
 
-#: utils/adt/float.c:54
-msgid "value out of range: overflow"
-msgstr "valor fora do intervalo: estouro (overflow)"
+#: commands/typecmds.c:473
+#, c-format
+msgid "type receive function %s must return type %s"
+msgstr "função de recepção do tipo %s deve retornar tipo %s"
 
-#: utils/adt/float.c:59
-msgid "value out of range: underflow"
-msgstr "valor fora do intervalo: estouro (underflow)"
+#: commands/typecmds.c:482
+#, c-format
+msgid "type send function %s must return type \"bytea\""
+msgstr "função de envio do tipo %s deve retornar tipo \"bytea\""
 
-#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
+#: commands/typecmds.c:660 commands/typecmds.c:2661
+#: commands/functioncmds.c:128 commands/tablecmds.c:224
+#: parser/parse_func.c:1502 parser/parse_type.c:196 utils/adt/regproc.c:973
 #, c-format
-msgid "invalid input syntax for type real: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo real: \"%s\""
+msgid "type \"%s\" does not exist"
+msgstr "tipo \"%s\" não existe"
 
-#: utils/adt/float.c:242
+#: commands/typecmds.c:666 commands/tablecmds.c:225
 #, c-format
-msgid "\"%s\" is out of range for type real"
-msgstr "\"%s\" está fora do intervalo para tipo real"
+msgid "type \"%s\" does not exist, skipping"
+msgstr "tipo \"%s\" não existe, ignorando"
 
-#: utils/adt/float.c:399 utils/adt/float.c:440 utils/adt/float.c:491
-#: utils/adt/numeric.c:3760 utils/adt/numeric.c:3786
+#: commands/typecmds.c:687
 #, c-format
-msgid "invalid input syntax for type double precision: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo double precision: \"%s\""
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" não é um domínio"
 
-#: utils/adt/float.c:435
+#: commands/typecmds.c:827
 #, c-format
-msgid "\"%s\" is out of range for type double precision"
-msgstr "\"%s\" está fora do intervalo para tipo double precision"
+msgid "\"%s\" is not a valid base type for a domain"
+msgstr "\"%s\" não é um tipo base válido para um domínio"
 
-#: utils/adt/float.c:1119 utils/adt/float.c:1177 utils/adt/int.c:348
-#: utils/adt/int.c:784 utils/adt/int.c:813 utils/adt/int.c:834
-#: utils/adt/int.c:854 utils/adt/int.c:882 utils/adt/int.c:1135
-#: utils/adt/int8.c:1221 utils/adt/numeric.c:2163 utils/adt/numeric.c:2174
-msgid "smallint out of range"
-msgstr "smallint fora do intervalo"
+#: commands/typecmds.c:843 commands/indexcmds.c:938
+#: parser/parse_utilcmd.c:2556 parser/parse_expr.c:2150
+#: parser/parse_type.c:492
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "ordenações não são suportadas pelo tipo %s"
 
-#: utils/adt/float.c:1303 utils/adt/numeric.c:4974
-msgid "cannot take square root of a negative number"
-msgstr "não pode calcular raiz quadrada de um número negativo"
+#: commands/typecmds.c:909
+msgid "multiple default expressions"
+msgstr "múltiplas expressões padrão"
 
-#: utils/adt/float.c:1345 utils/adt/numeric.c:1975
-msgid "zero raised to a negative power is undefined"
-msgstr "zero elevado a um número negativo é indefinido"
+#: commands/typecmds.c:973 commands/typecmds.c:982
+msgid "conflicting NULL/NOT NULL constraints"
+msgstr "restrições NULL/NOT NULL conflitantes"
 
-#: utils/adt/float.c:1349 utils/adt/numeric.c:1981
-msgid "a negative number raised to a non-integer power yields a complex result"
-msgstr ""
-"um número negativo elevado a um número que não é inteiro retorna um "
-"resultado complexo"
+#: commands/typecmds.c:1001 commands/typecmds.c:1984
+msgid "unique constraints not possible for domains"
+msgstr "restrições de unicidade não são possíveis para domínios"
 
-#: utils/adt/float.c:1415 utils/adt/float.c:1445 utils/adt/numeric.c:5192
-msgid "cannot take logarithm of zero"
-msgstr "não pode calcular logaritmo de zero"
+#: commands/typecmds.c:1007 commands/typecmds.c:1990
+msgid "primary key constraints not possible for domains"
+msgstr "restrições de chave primária não são possíveis para domínios"
 
-#: utils/adt/float.c:1419 utils/adt/float.c:1449 utils/adt/numeric.c:5196
-msgid "cannot take logarithm of a negative number"
-msgstr "não pode calcular logaritmo de número negativo"
+#: commands/typecmds.c:1013 commands/typecmds.c:1996
+msgid "exclusion constraints not possible for domains"
+msgstr "restrições de exclusão não são possíveis para domínios"
 
-#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
-#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
-#: utils/adt/float.c:1604 utils/adt/float.c:1625
-msgid "input is out of range"
-msgstr "entrada está fora do intervalo"
+#: commands/typecmds.c:1019 commands/typecmds.c:2002
+msgid "foreign key constraints not possible for domains"
+msgstr "restrições de chave estrangeira não são possíveis para domínios"
 
-#: utils/adt/float.c:2687 utils/adt/numeric.c:982
-msgid "count must be greater than zero"
-msgstr "contador deve ser maior do que zero"
+#: commands/typecmds.c:1028 commands/typecmds.c:2011
+msgid "specifying constraint deferrability not supported for domains"
+msgstr ""
+"especificação de postergação de restrição não é suportada para domínios"
 
-#: utils/adt/float.c:2692 utils/adt/numeric.c:989
-msgid "operand, lower bound and upper bound cannot be NaN"
-msgstr "operando, limite inferior e limite superior não podem ser infinitos"
+#: commands/typecmds.c:1272 utils/cache/typcache.c:996
+#, c-format
+msgid "%s is not an enum"
+msgstr "%s não é um enum"
 
-#: utils/adt/float.c:2698
-msgid "lower and upper bounds must be finite"
-msgstr "limites inferior e superior devem ser finitos"
+#: commands/typecmds.c:1332
+#, c-format
+msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
+msgstr ""
+"alterando tipo de argumento da função %s de \"opaque\" para \"cstring\""
 
-#: utils/adt/float.c:2736 utils/adt/numeric.c:1002
-msgid "lower bound cannot equal upper bound"
-msgstr "limite inferior não pode ser igual a limite superior"
+#: commands/typecmds.c:1350 commands/typecmds.c:1401 commands/typecmds.c:1432
+#: commands/typecmds.c:1455 commands/typecmds.c:1476 commands/typecmds.c:1503
+#: commands/typecmds.c:1530 catalog/pg_aggregate.c:331 parser/parse_func.c:288
+#: parser/parse_func.c:299 parser/parse_func.c:1481
+#, c-format
+msgid "function %s does not exist"
+msgstr "função %s não existe"
 
-#: utils/adt/bool.c:153
+#: commands/typecmds.c:1383
 #, c-format
-msgid "invalid input syntax for type boolean: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo boolean: \"%s\""
+msgid "changing argument type of function %s from \"opaque\" to %s"
+msgstr "alterando tipo de argumento da função %s de \"opaque\" para %s"
 
-#: utils/adt/varbit.c:162 utils/adt/varbit.c:302 utils/adt/varbit.c:358
+#: commands/typecmds.c:1482
 #, c-format
-msgid "bit string length %d does not match type bit(%d)"
-msgstr "tamanho da cadeia de bits %d não corresponde ao tipo bit(%d)"
+msgid "typmod_in function %s must return type \"integer\""
+msgstr "função typmod_in %s deve retornar tipo \"integer\""
 
-#: utils/adt/varbit.c:184 utils/adt/varbit.c:482
+#: commands/typecmds.c:1509
 #, c-format
-msgid "\"%c\" is not a valid binary digit"
-msgstr "\"%c\" não é um dígito binário válido"
+msgid "typmod_out function %s must return type \"cstring\""
+msgstr "função typmod_out %s deve retornar tipo \"cstring\""
 
-#: utils/adt/varbit.c:209 utils/adt/varbit.c:507
+#: commands/typecmds.c:1536
 #, c-format
-msgid "\"%c\" is not a valid hexadecimal digit"
-msgstr "\"%c\" não é um dígito hexadecimal válido"
+msgid "type analyze function %s must return type \"boolean\""
+msgstr "função de análise do tipo %s deve retornar tipo \"boolean\""
 
-#: utils/adt/varbit.c:293 utils/adt/varbit.c:594
-msgid "invalid length in external bit string"
-msgstr "tamanho inválido na cadeia de bits externa"
+#: commands/typecmds.c:1836
+#, c-format
+msgid "column \"%s\" of table \"%s\" contains null values"
+msgstr "coluna \"%s\" da tabela \"%s\" contém valores nulos"
 
-#: utils/adt/varbit.c:460 utils/adt/varbit.c:603 utils/adt/varbit.c:664
+#: commands/typecmds.c:2082
 #, c-format
-msgid "bit string too long for type bit varying(%d)"
-msgstr "cadeia de bits muito longa para tipo bit varying(%d)"
+msgid ""
+"column \"%s\" of table \"%s\" contains values that violate the new constraint"
+msgstr ""
+"coluna \"%s\" da tabela \"%s\" contém valores que violam a nova restrição"
 
-#: utils/adt/varbit.c:1149
-msgid "cannot AND bit strings of different sizes"
-msgstr "não pode executar E em cadeias de bits de tamanhos diferentes"
+#: commands/typecmds.c:2287
+#, fuzzy, c-format
+msgid "%s is not a domain"
+msgstr "\"%s\" não é um domínio"
 
-#: utils/adt/varbit.c:1190
-msgid "cannot OR bit strings of different sizes"
-msgstr "não pode executar OU em cadeias de bits de tamanhos diferentes"
+#: commands/typecmds.c:2321 catalog/pg_constraint.c:654
+#, c-format
+msgid "constraint \"%s\" for domain \"%s\" already exists"
+msgstr "restrição \"%s\" para domínio \"%s\" já existe"
 
-#: utils/adt/varbit.c:1236
-msgid "cannot XOR bit strings of different sizes"
-msgstr "não pode executar XOR em cadeias de bits de tamanhos diferentes"
+#: commands/typecmds.c:2369 commands/typecmds.c:2378
+msgid "cannot use table references in domain check constraint"
+msgstr ""
+"não pode utilizar referências a tabela em restrição de verificação do domínio"
 
-#: utils/adt/varbit.c:1563 utils/adt/int8.c:502 utils/adt/int8.c:531
-#: utils/adt/int8.c:552 utils/adt/int8.c:582 utils/adt/int8.c:610
-#: utils/adt/int8.c:628 utils/adt/int8.c:672 utils/adt/int8.c:689
-#: utils/adt/int8.c:758 utils/adt/int8.c:779 utils/adt/int8.c:806
-#: utils/adt/int8.c:833 utils/adt/int8.c:854 utils/adt/int8.c:875
-#: utils/adt/int8.c:902 utils/adt/int8.c:942 utils/adt/int8.c:963
-#: utils/adt/int8.c:990 utils/adt/int8.c:1017 utils/adt/int8.c:1038
-#: utils/adt/int8.c:1059 utils/adt/int8.c:1086 utils/adt/int8.c:1259
-#: utils/adt/int8.c:1298 utils/adt/numeric.c:2115
-msgid "bigint out of range"
-msgstr "bigint fora do intervalo"
+#: commands/typecmds.c:2386 catalog/heap.c:2492
+msgid "cannot use subquery in check constraint"
+msgstr "não pode utilizar subconsulta na restrição de verificação"
 
-#: utils/adt/varbit.c:1710 utils/adt/varbit.c:1768
+#: commands/typecmds.c:2390 catalog/heap.c:2496
+msgid "cannot use aggregate function in check constraint"
+msgstr "não pode utilizar função de agregação na restrição de verificação"
+
+#: commands/typecmds.c:2394 catalog/heap.c:2500
+msgid "cannot use window function in check constraint"
+msgstr "não pode utilizar função deslizante na restrição de verificação"
+
+#: commands/typecmds.c:2608 commands/typecmds.c:2680 commands/typecmds.c:2904
 #, c-format
-msgid "bit index %d out of valid range (0..%d)"
-msgstr "índice do bit %d fora do intervalo válido (0..%d)"
+msgid "%s is a table's row type"
+msgstr "%s é um tipo de registro de tabela"
 
-#: utils/adt/name.c:87 utils/adt/acl.c:164
-msgid "identifier too long"
-msgstr "identificador muito longo"
+#: commands/typecmds.c:2610 commands/typecmds.c:2682 commands/typecmds.c:2906
+msgid "Use ALTER TABLE instead."
+msgstr "Ao invés disso utilize ALTER TABLE."
 
-#: utils/adt/name.c:88 utils/adt/acl.c:165
+#: commands/typecmds.c:2617 commands/typecmds.c:2689 commands/typecmds.c:2835
 #, c-format
-msgid "Identifier must be less than %d characters."
-msgstr "Identificador deve ter pelo menos %d caracteres."
+msgid "cannot alter array type %s"
+msgstr "não pode alterar tipo array %s"
 
-#: utils/adt/ascii.c:75
+#: commands/typecmds.c:2619 commands/typecmds.c:2691 commands/typecmds.c:2837
 #, c-format
-msgid "encoding conversion from %s to ASCII not supported"
-msgstr "conversão de codificação de %s para ASCII não é suportada"
+msgid "You can alter type %s, which will alter the array type as well."
+msgstr "Você pode alterar tipo %s, que alterará o tipo array também."
 
-#: utils/adt/ascii.c:126 commands/dbcommands.c:235
+#: commands/typecmds.c:2890
 #, c-format
-msgid "%s is not a valid encoding name"
-msgstr "%s não é um nome de codificação válido"
+msgid "type \"%s\" already exists in schema \"%s\""
+msgstr "tipo \"%s\" já existe no esquema \"%s\""
+
+#: commands/async.c:567
+msgid "channel name cannot be empty"
+msgstr "nome do canal não pode ser vazio"
+
+#: commands/async.c:572
+msgid "channel name too long"
+msgstr "nome do canal é muito longo"
+
+#: commands/async.c:579
+msgid "payload string too long"
+msgstr "cadeia da carga é muito longa"
+
+#: commands/async.c:763
+msgid ""
+"cannot PREPARE a transaction that has executed LISTEN, UNLISTEN or NOTIFY"
+msgstr ""
+"não pode executar PREPARE em uma transação que executou LISTEN, UNLISTEN ou "
+"NOTIFY"
+
+#: commands/async.c:868
+msgid "too many notifications in the NOTIFY queue"
+msgstr "muitas notificações na fila do NOTIFY"
 
-#: utils/adt/ascii.c:144 commands/dbcommands.c:225
+#: commands/async.c:1430
 #, c-format
-msgid "%d is not a valid encoding code"
-msgstr "%d não é um código de codificação válido"
+msgid "NOTIFY queue is %.0f%% full"
+msgstr "fila do NOTIFY está %.0f%% cheia"
 
-#: utils/adt/tsquery.c:156 utils/adt/tsquery.c:392
-#: utils/adt/tsvector_parser.c:136
+#: commands/async.c:1432
 #, c-format
-msgid "syntax error in tsquery: \"%s\""
-msgstr "erro de sintaxe em tsquery: \"%s\""
+msgid ""
+"The server process with PID %d is among those with the oldest transactions."
+msgstr ""
+"O processo servidor com PID %d está entre aqueles com transações mais "
+"antigas."
 
-#: utils/adt/tsquery.c:177
+#: commands/async.c:1435
+msgid ""
+"The NOTIFY queue cannot be emptied until that process ends its current "
+"transaction."
+msgstr ""
+"A fila do NOTIFY não pode ser esvaziada até que o processo termine a "
+"transação atual."
+
+#: commands/define.c:67 commands/define.c:222 commands/define.c:254
+#: commands/define.c:282
 #, c-format
-msgid "no operand in tsquery: \"%s\""
-msgstr "nenhum operando em tsquery: \"%s\""
+msgid "%s requires a parameter"
+msgstr "%s requer um parâmetro"
 
-#: utils/adt/tsquery.c:250
+#: commands/define.c:108 commands/define.c:119 commands/define.c:189
+#: commands/define.c:207
 #, c-format
-msgid "value is too big in tsquery: \"%s\""
-msgstr "valor é muito grande em tsquery: \"%s\""
+msgid "%s requires a numeric value"
+msgstr "%s requer um valor numérico"
 
-#: utils/adt/tsquery.c:255
+#: commands/define.c:175
 #, c-format
-msgid "operand is too long in tsquery: \"%s\""
-msgstr "operando é muito longo em tsquery: \"%s\""
+msgid "%s requires a Boolean value"
+msgstr "%s requer um valor Booleano"
 
-#: utils/adt/tsquery.c:283
+#: commands/define.c:236
 #, c-format
-msgid "word is too long in tsquery: \"%s\""
-msgstr "palavra é muito longa em tsquery: \"%s\""
+msgid "argument of %s must be a name"
+msgstr "argumento de %s deve ser um nome"
 
-#: utils/adt/tsquery.c:512
+#: commands/define.c:266
 #, c-format
-msgid "text-search query doesn't contain lexemes: \"%s\""
-msgstr "consulta de busca textual não contém lexemas: \"%s\""
+msgid "argument of %s must be a type name"
+msgstr "argumento de %s deve ser um nome de um tipo"
 
-#: utils/adt/cash.c:232
+#: commands/define.c:291
 #, c-format
-msgid "invalid input syntax for type money: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo money: \"%s\""
+msgid "%s requires an integer value"
+msgstr "%s requer um valor inteiro"
 
-#: utils/adt/regexp.c:190 tsearch/spell.c:365
+#: commands/define.c:312
 #, c-format
-msgid "invalid regular expression: %s"
-msgstr "expressão regular inválida: %s"
+msgid "invalid argument for %s: \"%s\""
+msgstr "argumento inválido para %s: \"%s\""
+
+#: commands/user.c:143
+msgid "SYSID can no longer be specified"
+msgstr "SYSID não pode mais ser especificado"
 
-#: utils/adt/regexp.c:404
+#: commands/user.c:267 commands/user.c:606 commands/dbcommands.c:253
+#: commands/dbcommands.c:1347
 #, c-format
-msgid "invalid regexp option: \"%c\""
-msgstr "opção da expressão regular é inválida: \"%c\""
+msgid "invalid connection limit: %d"
+msgstr "limite de conexão inválido: %d"
 
-#: utils/adt/regexp.c:668 utils/adt/like_match.c:287
-msgid "invalid escape string"
-msgstr "cadeia de caracteres de escape inválida"
+#: commands/user.c:284
+msgid "must be superuser to create superusers"
+msgstr "deve ser super-usuário para criar super-usuários"
 
-#: utils/adt/regexp.c:669 utils/adt/like_match.c:288
-msgid "Escape string must be empty or one character."
-msgstr "Cadeia de caracteres de escape deve ser vazia ou ter um caracter."
+#: commands/user.c:291
+#, fuzzy
+msgid "must be superuser to create replication users"
+msgstr "deve ser super-usuário para criar super-usuários"
 
-#: utils/adt/regexp.c:865
-msgid "regexp_split does not support the global option"
-msgstr "regexp_split não suporta a opção global"
+#: commands/user.c:298
+msgid "permission denied to create role"
+msgstr "permissão negada ao criar role"
 
-#: utils/adt/encode.c:55 utils/adt/encode.c:91
+#: commands/user.c:305 commands/user.c:1087
 #, c-format
-msgid "unrecognized encoding: \"%s\""
-msgstr "codificação desconhecida: \"%s\""
+msgid "role name \"%s\" is reserved"
+msgstr "nome de role \"%s\" é reservado"
 
-#: utils/adt/encode.c:150
+#: commands/user.c:318 commands/user.c:1081
 #, c-format
-msgid "invalid hexadecimal digit: \"%c\""
-msgstr "dígito hexadecimal inválido: \"%c\""
+msgid "role \"%s\" already exists"
+msgstr "role \"%s\" já existe"
 
-#: utils/adt/encode.c:178
-msgid "invalid hexadecimal data: odd number of digits"
-msgstr "dado hexadecimal inválido: número de dígitos estranho"
+#: commands/user.c:623 commands/user.c:825 commands/user.c:905
+#: commands/user.c:1056 commands/variable.c:882 commands/variable.c:954
+#: utils/adt/acl.c:4822 utils/init/miscinit.c:432
+#, c-format
+msgid "role \"%s\" does not exist"
+msgstr "role \"%s\" não existe"
 
-#: utils/adt/encode.c:295
-msgid "unexpected \"=\""
-msgstr "\"=\" inesperado"
+#: commands/user.c:636 commands/user.c:842 commands/user.c:1321
+#: commands/user.c:1458
+msgid "must be superuser to alter superusers"
+msgstr "deve ser super-usuário para alterar super-usuários"
 
-#: utils/adt/encode.c:307
-msgid "invalid symbol"
-msgstr "símbolo inválido"
+#: commands/user.c:643
+#, fuzzy
+msgid "must be superuser to alter replication users"
+msgstr "deve ser super-usuário para alterar super-usuários"
 
-#: utils/adt/encode.c:327
-msgid "invalid end sequence"
-msgstr "fim de sequência inválido"
+#: commands/user.c:659 commands/user.c:850
+msgid "permission denied"
+msgstr "permissão negada"
+
+#: commands/user.c:878
+msgid "permission denied to drop role"
+msgstr "permissão negada ao remover role"
 
-#: utils/adt/arrayutils.c:93 utils/adt/arrayutils.c:102
-#: utils/adt/arrayutils.c:109 utils/adt/arrayfuncs.c:847
-#: utils/adt/arrayfuncs.c:1448 utils/adt/arrayfuncs.c:2766
-#: utils/adt/arrayfuncs.c:2914 utils/adt/arrayfuncs.c:4662
+#: commands/user.c:910
 #, c-format
-msgid "array size exceeds the maximum allowed (%d)"
-msgstr "tamanho da matriz excede o máximo permitido (%d)"
+msgid "role \"%s\" does not exist, skipping"
+msgstr "role \"%s\" não existe, ignorando"
 
-#: utils/adt/arrayutils.c:209
-msgid "typmod array must be type cstring[]"
-msgstr "matriz typmod deve ser do tipo cstring[]"
+#: commands/user.c:922 commands/user.c:926
+msgid "current user cannot be dropped"
+msgstr "usuário atual não pode ser removido"
 
-#: utils/adt/arrayutils.c:214
-msgid "typmod array must be one-dimensional"
-msgstr "matriz typmod deve ser de uma dimensão"
+#: commands/user.c:930
+msgid "session user cannot be dropped"
+msgstr "usuário de sessão não pode ser removido"
 
-#: utils/adt/arrayutils.c:219
-msgid "typmod array must not contain nulls"
-msgstr "matriz typmod não deve conter valores nulos"
+#: commands/user.c:941
+msgid "must be superuser to drop superusers"
+msgstr "deve ser super-usuário para remover super-usuários"
 
-#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
-msgid "input of anonymous composite types is not implemented"
-msgstr "entrada de tipos compostos anônimos não está implementada"
+#: commands/user.c:954
+#, c-format
+msgid "role \"%s\" cannot be dropped because some objects depend on it"
+msgstr "role \"%s\" não pode ser removida porque alguns objetos dependem dela"
 
-#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
-#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
+#: commands/user.c:957 commands/tablecmds.c:689 catalog/dependency.c:918
+#: catalog/dependency.c:919 catalog/dependency.c:925 catalog/dependency.c:926
+#: catalog/dependency.c:937 catalog/dependency.c:938
+#: catalog/objectaddress.c:315 port/win32/security.c:51
+#: storage/lmgr/deadlock.c:943 utils/misc/guc.c:5399 utils/misc/guc.c:5713
+#: utils/misc/guc.c:8014 utils/misc/guc.c:8048 utils/misc/guc.c:8082
+#: utils/misc/guc.c:8116 utils/misc/guc.c:8151
 #, c-format
-msgid "malformed record literal: \"%s\""
-msgstr "matriz mal formada: \"%s\""
+msgid "%s"
+msgstr "%s"
 
-#: utils/adt/rowtypes.c:152
-msgid "Missing left parenthesis."
-msgstr "Faltando parêntese esquerdo."
+#: commands/user.c:1071
+msgid "session user cannot be renamed"
+msgstr "usuário de sessão não pode ser renomeado"
 
-#: utils/adt/rowtypes.c:180
-msgid "Too few columns."
-msgstr "Poucas colunas."
+#: commands/user.c:1075
+msgid "current user cannot be renamed"
+msgstr "usuário atual não pode ser renomeado"
 
-#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
-msgid "Unexpected end of input."
-msgstr "Fim da entrada inesperado."
+#: commands/user.c:1098
+msgid "must be superuser to rename superusers"
+msgstr "deve ser super-usuário para renomear super-usuários"
 
-#: utils/adt/rowtypes.c:263
-msgid "Too many columns."
-msgstr "Muitas colunas."
+#: commands/user.c:1105
+msgid "permission denied to rename role"
+msgstr "permissão negada ao renomear role"
 
-#: utils/adt/rowtypes.c:271
-msgid "Junk after right parenthesis."
-msgstr "Lixo após parêntese direito."
+#: commands/user.c:1126
+msgid "MD5 password cleared because of role rename"
+msgstr "senha MD5 foi limpada porque role foi renomeada"
 
-#: utils/adt/rowtypes.c:522
+#: commands/user.c:1182
+msgid "column names cannot be included in GRANT/REVOKE ROLE"
+msgstr "nomes de coluna não podem ser incluídos em GRANT/REVOKE ROLE"
+
+#: commands/user.c:1220
+msgid "permission denied to drop objects"
+msgstr "permissão negada ao remover objetos"
+
+#: commands/user.c:1247 commands/user.c:1256
+msgid "permission denied to reassign objects"
+msgstr "permissão negada ao reatribuir objetos"
+
+#: commands/user.c:1329 commands/user.c:1466
 #, c-format
-msgid "wrong number of columns: %d, expected %d"
-msgstr "número de colunas incorreto: %d, esperado %d"
+msgid "must have admin option on role \"%s\""
+msgstr "deve ter opção admin na role \"%s\""
 
-#: utils/adt/rowtypes.c:549
+#: commands/user.c:1337
+msgid "must be superuser to set grantor"
+msgstr "deve ser super-usuário para definir concedente"
+
+#: commands/user.c:1362
 #, c-format
-msgid "wrong data type: %u, expected %u"
-msgstr "tipo de dado incorreto: %u, esperado %u"
+msgid "role \"%s\" is a member of role \"%s\""
+msgstr "role \"%s\" é um membro da role \"%s\""
 
-#: utils/adt/rowtypes.c:557 utils/adt/arrayfuncs.c:1386 libpq/pqformat.c:556
-#: libpq/pqformat.c:574 libpq/pqformat.c:595
-msgid "insufficient data left in message"
-msgstr "dados insuficientes na mensagem"
+#: commands/user.c:1377
+#, c-format
+msgid "role \"%s\" is already a member of role \"%s\""
+msgstr "role \"%s\" já é um membro da role \"%s\""
 
-#: utils/adt/rowtypes.c:610
+#: commands/user.c:1488
 #, c-format
-msgid "improper binary format in record column %d"
-msgstr "formato binário inválido na coluna %d do registro"
+msgid "role \"%s\" is not a member of role \"%s\""
+msgstr "role \"%s\" não é um membro da role \"%s\""
 
-#: utils/adt/rowtypes.c:896 utils/adt/rowtypes.c:1122
+#: commands/vacuumlazy.c:254
 #, c-format
-msgid "cannot compare dissimilar column types %s and %s at record column %d"
+msgid ""
+"automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
+"pages: %d removed, %d remain\n"
+"tuples: %.0f removed, %.0f remain\n"
+"system usage: %s"
 msgstr ""
-"não pode comparar tipos de colunas diferentes %s e %s em coluna %d de "
-"registro"
+"limpeza automática da tabela \"%s.%s.%s\": buscas por índice: %d\n"
+"páginas: %d removidas, %d remanescentes\n"
+"tuplas: %.0f removidas, %.0f remanescentes\n"
+"uso do sistema: %s"
 
-#: utils/adt/rowtypes.c:974 utils/adt/rowtypes.c:1185
-msgid "cannot compare record types with different numbers of columns"
-msgstr "não pode comparar tipos record com quantidade diferente de colunas"
+#: commands/vacuumlazy.c:339 commands/cluster.c:894
+#, c-format
+msgid "vacuuming \"%s.%s\""
+msgstr "limpando \"%s.%s\""
 
-#: utils/adt/rowtypes.c:1139 utils/adt/arrayfuncs.c:3105
-#: utils/adt/arrayfuncs.c:3506 parser/parse_oper.c:260
+#: commands/vacuumlazy.c:508
 #, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "não pôde identificar um operador de igualdade para tipo %s"
+msgid "relation \"%s\" page %u is uninitialized --- fixing"
+msgstr "página %2$u da relação \"%1$s\" não foi inicializada --- consertando"
 
-#: utils/adt/ruleutils.c:1523 utils/adt/acl.c:2770
-#: parser/parse_relation.c:1996 parser/parse_relation.c:2051
-#: parser/parse_target.c:808 parser/analyze.c:1814 parser/parse_type.c:117
-#: commands/trigger.c:527 commands/copy.c:3441 commands/tablecmds.c:3949
-#: commands/tablecmds.c:4039 commands/tablecmds.c:4086
-#: commands/tablecmds.c:4182 commands/tablecmds.c:4226
-#: commands/tablecmds.c:4305 commands/tablecmds.c:4386
-#: commands/tablecmds.c:5837 commands/tablecmds.c:5975 commands/comment.c:651
-#: commands/analyze.c:341 commands/sequence.c:1309 catalog/aclchk.c:1464
+#: commands/vacuumlazy.c:865
 #, c-format
-msgid "column \"%s\" of relation \"%s\" does not exist"
-msgstr "coluna \"%s\" da relação \"%s\" não existe"
+msgid "\"%s\": removed %.0f row versions in %u pages"
+msgstr "\"%s\": removidas %.0f versões de registro em %u páginas"
 
-#: utils/adt/ruleutils.c:1634 commands/functioncmds.c:1005
-#: commands/functioncmds.c:1105 commands/functioncmds.c:1168
-#: commands/functioncmds.c:1319
+#: commands/vacuumlazy.c:870
 #, c-format
-msgid "\"%s\" is an aggregate function"
-msgstr "\"%s\" é uma função de agregação"
+msgid ""
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
+"pages"
+msgstr ""
+"\"%s\": encontrados %.0f versões de registros removíveis e %.0f não-"
+"removíveis em %u de %u páginas"
 
-#: utils/adt/ruleutils.c:2236
+#: commands/vacuumlazy.c:874
 #, c-format
-msgid "rule \"%s\" has unsupported event type %d"
-msgstr "regra \"%s\" tem tipo de evento %d que não é suportado"
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"There were %.0f unused item pointers.\n"
+"%u pages are entirely empty.\n"
+"%s."
+msgstr ""
+"%.0f versões de registros não vigentes não podem ser removidas ainda.\n"
+"Havia %.0f ponteiros de itens não utilizados.\n"
+"%u páginas estão completamente vazias.\n"
+"%s."
 
-#: utils/adt/ruleutils.c:5516 utils/adt/ruleutils.c:5571
-#: utils/adt/ruleutils.c:5608 utils/adt/regproc.c:635 utils/adt/regproc.c:1485
-msgid "too many arguments"
-msgstr "muitos argumentos"
+#: commands/vacuumlazy.c:932
+#, c-format
+msgid "\"%s\": removed %d row versions in %d pages"
+msgstr "\"%s\": removidas %d versões de registro em %d páginas"
 
-#: utils/adt/formatting.c:491
-msgid "invalid format specification for an interval value"
-msgstr "especificação do formato é inválida para um valor interval"
+#: commands/vacuumlazy.c:935 commands/vacuumlazy.c:1027
+#: commands/vacuumlazy.c:1160
+#, c-format
+msgid "%s."
+msgstr "%s."
 
-#: utils/adt/formatting.c:492
-msgid "Intervals are not tied to specific calendar dates."
-msgstr "Intervalos não estão presos a datas específicas do calendário."
+#: commands/vacuumlazy.c:1024
+#, c-format
+msgid "scanned index \"%s\" to remove %d row versions"
+msgstr "índice \"%s\" percorrido para remover %d versões de registro"
 
-#: utils/adt/formatting.c:1059
-#, fuzzy
-msgid "\"EEEE\" must be the last pattern used"
-msgstr "\"EEEE\" deve ser o último padrão utilizado"
+#: commands/vacuumlazy.c:1065
+#, c-format
+msgid "index \"%s\" now contains %.0f row versions in %u pages"
+msgstr "índice \"%s\" agora contém %.0f versões de registros em %u páginas"
 
-#: utils/adt/formatting.c:1067
-msgid "\"9\" must be ahead of \"PR\""
-msgstr "\"9\" deve estar a frente de \"PR\""
+#: commands/vacuumlazy.c:1069
+#, c-format
+msgid ""
+"%.0f index row versions were removed.\n"
+"%u index pages have been deleted, %u are currently reusable.\n"
+"%s."
+msgstr ""
+"%.0f versões de registros de índices foram apagadas.\n"
+"%u páginas de índice foram removidas, %u são reutilizáveis.\n"
+"%s."
 
-#: utils/adt/formatting.c:1083
-msgid "\"0\" must be ahead of \"PR\""
-msgstr "\"0\" deve estar a frente de \"PR\""
+#: commands/vacuumlazy.c:1157
+#, c-format
+msgid "\"%s\": truncated %u to %u pages"
+msgstr "\"%s\": truncadas %u em %u páginas"
 
-#: utils/adt/formatting.c:1109
-msgid "multiple decimal points"
-msgstr "múltiplos separadores decimais"
+#: commands/dbcommands.c:201
+msgid "LOCATION is not supported anymore"
+msgstr "LOCATION não é mais suportado"
 
-#: utils/adt/formatting.c:1113 utils/adt/formatting.c:1196
-msgid "cannot use \"V\" and decimal point together"
-msgstr "não pode utilizar \"V\" e separador decimal juntos"
+#: commands/dbcommands.c:202
+msgid "Consider using tablespaces instead."
+msgstr "Considere utilizar tablespaces."
 
-#: utils/adt/formatting.c:1125
-msgid "cannot use \"S\" twice"
-msgstr "não pode utilizar \"S\" duas vezes"
+#: commands/dbcommands.c:225 utils/adt/ascii.c:144
+#, c-format
+msgid "%d is not a valid encoding code"
+msgstr "%d não é um código de codificação válido"
 
-#: utils/adt/formatting.c:1129
-msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
-msgstr "não pode utilizar \"S\" e \"PL\"/\"MI\"/\"SG\"/\"PR\" juntos"
+#: commands/dbcommands.c:235 utils/adt/ascii.c:126
+#, c-format
+msgid "%s is not a valid encoding name"
+msgstr "%s não é um nome de codificação válido"
 
-#: utils/adt/formatting.c:1149
-msgid "cannot use \"S\" and \"MI\" together"
-msgstr "não pode utilizar \"S\" e \"MI\" juntos"
+#: commands/dbcommands.c:272
+msgid "permission denied to create database"
+msgstr "permissão negada ao criar banco de dados"
 
-#: utils/adt/formatting.c:1159
-msgid "cannot use \"S\" and \"PL\" together"
-msgstr "não pode utilizar \"S\" e \"PL\" juntos"
+#: commands/dbcommands.c:295
+#, c-format
+msgid "template database \"%s\" does not exist"
+msgstr "banco de dados modelo \"%s\" não existe"
 
-#: utils/adt/formatting.c:1169
-msgid "cannot use \"S\" and \"SG\" together"
-msgstr "não pode utilizar \"S\" e \"SG\" juntos"
+#: commands/dbcommands.c:307
+#, c-format
+msgid "permission denied to copy database \"%s\""
+msgstr "permissão negada ao copiar banco de dados \"%s\""
 
-#: utils/adt/formatting.c:1178
-msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
-msgstr "não pode utilizar \"PR\" e \"S\"/\"PL\"/\"MI\"/\"SG\" juntos"
+#: commands/dbcommands.c:323
+#, c-format
+msgid "invalid server encoding %d"
+msgstr "codificação do servidor %d é inválida"
 
-#: utils/adt/formatting.c:1204
-msgid "cannot use \"EEEE\" twice"
-msgstr "não pode utilizar \"EEEE\" duas vezes"
+#: commands/dbcommands.c:329 commands/dbcommands.c:333
+#, c-format
+msgid "invalid locale name %s"
+msgstr "nome de configuração regional %s é inválido"
 
-#: utils/adt/formatting.c:1210
-msgid "\"EEEE\" is incompatible with other formats"
-msgstr "\"EEEE\" é imcompatível com outros formatos"
+#: commands/dbcommands.c:352
+#, c-format
+msgid ""
+"new encoding (%s) is incompatible with the encoding of the template database "
+"(%s)"
+msgstr ""
+"nova codificação (%s) é imcompatível com a codificação do banco de dados "
+"modelo (%s)"
 
-#: utils/adt/formatting.c:1211
-#, fuzzy
+#: commands/dbcommands.c:355
 msgid ""
-"\"EEEE\" may only be used together with digit and decimal point patterns."
+"Use the same encoding as in the template database, or use template0 as "
+"template."
 msgstr ""
-"\"EEEE\" só pode ser utilizado em conjunto com modelos de dígitos e decimais."
+"Utilize a mesma codificação do banco de dados modelo ou utilize template0 "
+"como modelo."
 
-#: utils/adt/formatting.c:1411
+#: commands/dbcommands.c:360
 #, c-format
-msgid "\"%s\" is not a number"
-msgstr "\"%s\" não é um número"
-
-#: utils/adt/formatting.c:1788
-msgid "invalid combination of date conventions"
-msgstr "combinação inválida de convenções do tipo date"
+msgid ""
+"new collation (%s) is incompatible with the collation of the template "
+"database (%s)"
+msgstr ""
+"nova ordenação (%s) é incompatível com a ordenação do banco de dados modelo "
+"(%s)"
 
-#: utils/adt/formatting.c:1789
+#: commands/dbcommands.c:362
 msgid ""
-"Do not mix Gregorian and ISO week date conventions in a formatting template."
+"Use the same collation as in the template database, or use template0 as "
+"template."
 msgstr ""
-"Não misture convenções de data Gregoriana e ISO em um modelo de formatação."
+"Utilize a mesma ordenação do banco de dados modelo ou utilize template0 como "
+"modelo."
 
-#: utils/adt/formatting.c:1806
+#: commands/dbcommands.c:367
 #, c-format
-msgid "conflicting values for \"%s\" field in formatting string"
+msgid ""
+"new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
+"(%s)"
 msgstr ""
-"valores conflitantes para campo \"%s\" na cadeia de caracteres de formatação"
+"novo LC_CTYPE (%s) é incompatível com o LC_CTYPE do banco de dados modelo "
+"(%s)"
 
-#: utils/adt/formatting.c:1808
-msgid "This value contradicts a previous setting for the same field type."
+#: commands/dbcommands.c:369
+msgid ""
+"Use the same LC_CTYPE as in the template database, or use template0 as "
+"template."
 msgstr ""
-"Este valor contradiz a configuração anterior para o mesmo tipo de campo."
+"Utilize o mesmo LC_CTYPE do banco de dados modelo ou utilize template0 como "
+"modelo."
 
-#: utils/adt/formatting.c:1869
-#, c-format
-msgid "source string too short for \"%s\" formatting field"
-msgstr ""
-"cadeia de carateres fonte é muito curta para campo de formatação \"%s\""
+#: commands/dbcommands.c:391 commands/dbcommands.c:1054
+msgid "pg_global cannot be used as default tablespace"
+msgstr "pg_global não pode ser utilizado como tablespace padrão"
 
-#: utils/adt/formatting.c:1871
+#: commands/dbcommands.c:417
 #, c-format
-msgid "Field requires %d characters, but only %d remain."
-msgstr "Campo requer %d caracteres, mas só restam %d."
+msgid "cannot assign new default tablespace \"%s\""
+msgstr "não pode atribuir nova tablespace padrão \"%s\""
 
-#: utils/adt/formatting.c:1874 utils/adt/formatting.c:1888
+#: commands/dbcommands.c:419
+#, c-format
 msgid ""
-"If your source string is not fixed-width, try using the \"FM\" modifier."
+"There is a conflict because database \"%s\" already has some tables in this "
+"tablespace."
 msgstr ""
-"Se sua cadeia de carateres fonte não tem tamanho fixo, tente utilizar o "
-"modificador \"FM\"."
+"Há um conflito porque o banco de dados \"%s\" já tem algumas tabelas nesta "
+"tablespace."
 
-#: utils/adt/formatting.c:1884 utils/adt/formatting.c:1897
-#: utils/adt/formatting.c:2027
+#: commands/dbcommands.c:439 commands/dbcommands.c:929
 #, c-format
-msgid "invalid value \"%s\" for \"%s\""
-msgstr "valor \"%s\" inválido para \"%s\""
+msgid "database \"%s\" already exists"
+msgstr "banco de dados \"%s\" já existe"
 
-#: utils/adt/formatting.c:1886
+#: commands/dbcommands.c:453
 #, c-format
-msgid "Field requires %d characters, but only %d could be parsed."
-msgstr "Campo requer %d caracteres, mas somente %d puderam ser analisados."
+msgid "source database \"%s\" is being accessed by other users"
+msgstr "banco de dados fonte \"%s\" está sendo acessado por outros usuários"
 
-#: utils/adt/formatting.c:1899
-msgid "Value must be an integer."
-msgstr "Valor deve ser um inteiro."
-
-#: utils/adt/formatting.c:1904
+#: commands/dbcommands.c:695 commands/dbcommands.c:710
 #, c-format
-msgid "value for \"%s\" in source string is out of range"
-msgstr "valor para \"%s\" na cadeia de caracteres fonte está fora do intervalo"
+msgid "encoding %s does not match locale %s"
+msgstr "codificação %s não corresponde a configuração regional %s"
 
-#: utils/adt/formatting.c:1906
+#: commands/dbcommands.c:698
 #, c-format
-msgid "Value must be in the range %d to %d."
-msgstr "Valor deve estar no intervalo de %d a %d."
-
-#: utils/adt/formatting.c:2029
-msgid "The given value did not match any of the allowed values for this field."
-msgstr ""
-"O valor informado não corresponde a nenhum dos valores permitidos para este "
-"campo."
+msgid "The chosen LC_CTYPE setting requires encoding %s."
+msgstr "A definição de LC_TYPE escolhida requer codificação %s."
 
-#: utils/adt/formatting.c:2585
-msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
-msgstr "formatos \"TZ\"/\"tz\" não são suportadas em to_date"
+#: commands/dbcommands.c:713
+#, c-format
+msgid "The chosen LC_COLLATE setting requires encoding %s."
+msgstr "A definição de LC_COLLATE escolhida requer codificação %s."
 
-#: utils/adt/formatting.c:2689
-msgid "invalid input string for \"Y,YYY\""
-msgstr "cadeia de caracteres de entrada é inválida para \"Y,YYY\""
+#: commands/dbcommands.c:764 commands/dbcommands.c:909
+#: commands/dbcommands.c:1008 commands/dbcommands.c:1181
+#: commands/dbcommands.c:1366 commands/dbcommands.c:1451
+#: commands/dbcommands.c:1854 commands/comment.c:60 utils/init/postinit.c:709
+#: utils/init/postinit.c:777 utils/init/postinit.c:794
+#, c-format
+msgid "database \"%s\" does not exist"
+msgstr "banco de dados \"%s\" não existe"
 
-#: utils/adt/formatting.c:3206
+#: commands/dbcommands.c:771
 #, c-format
-msgid "hour \"%d\" is invalid for the 12-hour clock"
-msgstr "hora \"%d\" é inválido para relógio de 12 horas"
+msgid "database \"%s\" does not exist, skipping"
+msgstr "banco de dados \"%s\" não existe, ignorando"
 
-#: utils/adt/formatting.c:3208
-msgid "Use the 24-hour clock, or give an hour between 1 and 12."
-msgstr "Utilize um relógio de 24 horas ou informe uma hora entre 1 e 12."
+#: commands/dbcommands.c:792
+msgid "cannot drop a template database"
+msgstr "não pode remover banco de dados modelo"
 
-#: utils/adt/formatting.c:3246
-#, c-format
-msgid "inconsistent use of year %04d and \"BC\""
-msgstr "uso inconsistente do ano %04d e \"BC\""
+#: commands/dbcommands.c:798
+msgid "cannot drop the currently open database"
+msgstr "não pode remover banco de dados que se encontra aberto"
 
-#: utils/adt/formatting.c:3293
-msgid "cannot calculate day of year without year information"
-msgstr "não pode calcular dia do ano sem a informação do ano"
+#: commands/dbcommands.c:809 commands/dbcommands.c:951
+#: commands/dbcommands.c:1076
+#, c-format
+msgid "database \"%s\" is being accessed by other users"
+msgstr "banco de dados \"%s\" está sendo acessado por outros usuários"
 
-#: utils/adt/formatting.c:4151
-msgid "\"EEEE\" not supported for input"
-msgstr "\"EEEE\" não é suportado na entrada"
+#: commands/dbcommands.c:920
+msgid "permission denied to rename database"
+msgstr "permissão negada ao renomear banco de dados"
 
-#: utils/adt/formatting.c:4163
-msgid "\"RN\" not supported for input"
-msgstr "\"RN\" não é suportado na entrada"
+#: commands/dbcommands.c:940
+msgid "current database cannot be renamed"
+msgstr "banco de dados atual não pode ser renomeado"
 
-#: utils/adt/tsgistidx.c:100
-msgid "gtsvector_in not implemented"
-msgstr "gtsvector_in não está implementado"
+#: commands/dbcommands.c:1032
+msgid "cannot change the tablespace of the currently open database"
+msgstr ""
+"não pode mudar a tablespace de um banco de dados que se encontra aberto"
 
-#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:195
+#: commands/dbcommands.c:1116
 #, c-format
-msgid "could not open tablespace directory \"%s\": %m"
-msgstr "não pôde abrir diretório da tablespace \"%s\": %m"
+msgid "some relations of database \"%s\" are already in tablespace \"%s\""
+msgstr ""
+"algumas relações do banco de dados \"%s\" já estão na tablespace \"%s\""
 
-#: utils/adt/dbsize.c:127 catalog/aclchk.c:3500 catalog/aclchk.c:4590
-#, c-format
-msgid "database with OID %u does not exist"
-msgstr "banco de dados com OID %u não existe"
+#: commands/dbcommands.c:1118
+msgid ""
+"You must move them back to the database's default tablespace before using "
+"this command."
+msgstr ""
+"Você deve movê-las de volta para a tablespace padrão do banco de dados antes "
+"de utilizar este comando."
 
-#: utils/adt/dbsize.c:149 utils/adt/acl.c:2975 utils/init/postinit.c:708
-#: utils/init/postinit.c:776 utils/init/postinit.c:793
-#: commands/dbcommands.c:760 commands/dbcommands.c:905
-#: commands/dbcommands.c:1004 commands/dbcommands.c:1181
-#: commands/dbcommands.c:1366 commands/dbcommands.c:1410
-#: commands/dbcommands.c:1456 commands/comment.c:698 catalog/aclchk.c:614
+#: commands/dbcommands.c:1246 commands/dbcommands.c:1714
+#: commands/dbcommands.c:1915 commands/dbcommands.c:1963
+#: commands/tablespace.c:584
 #, c-format
-msgid "database \"%s\" does not exist"
-msgstr "banco de dados \"%s\" não existe"
+msgid "some useless files may be left behind in old database directory \"%s\""
+msgstr ""
+"alguns arquivos inúteis podem ser deixados no diretório de banco de dados "
+"antigo \"%s\""
 
-#: utils/adt/datetime.c:3516 utils/adt/datetime.c:3523
+#: commands/dbcommands.c:1490
+msgid "permission denied to change owner of database"
+msgstr "permissão negada ao mudar dono do banco de dados"
+
+#: commands/dbcommands.c:1802
 #, c-format
-msgid "date/time field value out of range: \"%s\""
-msgstr "valor do campo date/time está fora do intervalo: \"%s\""
+msgid ""
+"There are %d other session(s) and %d prepared transaction(s) using the "
+"database."
+msgstr ""
+"Há %d outra(s) sessão(ões) e %d transação(ões) preparada(s) utilizando o "
+"banco de dados."
 
-#: utils/adt/datetime.c:3525
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Talvez você necessite de uma definição diferente para \"datestyle\"."
+#: commands/dbcommands.c:1805
+#, c-format
+msgid "There are %d other session(s) using the database."
+msgstr "Há %d outra(s) sessão(ões) utilizando o banco de dados."
 
-#: utils/adt/datetime.c:3530
+#: commands/dbcommands.c:1808
 #, c-format
-msgid "interval field value out of range: \"%s\""
-msgstr "valor do campo interval fora do intervalo: \"%s\""
+msgid "There are %d prepared transaction(s) using the database."
+msgstr "Há %d transação(ões) preparada(s) utilizando o banco de dados."
 
-#: utils/adt/datetime.c:3536
+#: commands/functioncmds.c:100
 #, c-format
-msgid "time zone displacement out of range: \"%s\""
-msgstr "deslocamento de zona horária fora do intervalo: \"%s\""
+msgid "SQL function cannot return shell type %s"
+msgstr "função SQL não pode retornar tipo indefinido %s"
 
-#: utils/adt/arrayfuncs.c:211 utils/adt/arrayfuncs.c:223
-msgid "missing dimension value"
-msgstr "faltando valor da dimensão"
+#: commands/functioncmds.c:105
+#, c-format
+msgid "return type %s is only a shell"
+msgstr "tipo retornado %s é indefinido"
 
-#: utils/adt/arrayfuncs.c:233
-msgid "missing \"]\" in array dimensions"
-msgstr "faltando \"]\" nas dimensões da matriz"
+#: commands/functioncmds.c:134 parser/parse_type.c:278
+#, c-format
+msgid "type modifier cannot be specified for shell type \"%s\""
+msgstr ""
+"modificador de tipo não pode ser especificado para tipo indefinido \"%s\""
 
-#: utils/adt/arrayfuncs.c:241 utils/adt/arrayfuncs.c:2411
-#: utils/adt/arrayfuncs.c:2439 utils/adt/arrayfuncs.c:2454
-msgid "upper bound cannot be less than lower bound"
-msgstr "limite superior não pode ser menor do que limite inferior"
+#: commands/functioncmds.c:140
+#, c-format
+msgid "type \"%s\" is not yet defined"
+msgstr "tipo \"%s\" ainda não foi definido"
 
-#: utils/adt/arrayfuncs.c:253 utils/adt/arrayfuncs.c:279
-msgid "array value must start with \"{\" or dimension information"
-msgstr "valor da matriz deve iniciar com \"{\" ou dimensão"
+#: commands/functioncmds.c:141
+msgid "Creating a shell type definition."
+msgstr "Criando uma definição de tipo indefinido."
 
-#: utils/adt/arrayfuncs.c:267
-msgid "missing assignment operator"
-msgstr "faltando operador de atribuição"
+#: commands/functioncmds.c:220
+#, c-format
+msgid "SQL function cannot accept shell type %s"
+msgstr "função SQL não pode aceitar tipo indefinido %s"
 
-#: utils/adt/arrayfuncs.c:284 utils/adt/arrayfuncs.c:290
-msgid "array dimensions incompatible with array literal"
-msgstr "dimensões da matriz são incompatíveis com matriz"
+#: commands/functioncmds.c:225
+#, c-format
+msgid "argument type %s is only a shell"
+msgstr "tipo de argumento %s é indefinido"
 
-#: utils/adt/arrayfuncs.c:420 utils/adt/arrayfuncs.c:435
-#: utils/adt/arrayfuncs.c:444 utils/adt/arrayfuncs.c:458
-#: utils/adt/arrayfuncs.c:478 utils/adt/arrayfuncs.c:506
-#: utils/adt/arrayfuncs.c:511 utils/adt/arrayfuncs.c:551
-#: utils/adt/arrayfuncs.c:572 utils/adt/arrayfuncs.c:591
-#: utils/adt/arrayfuncs.c:701 utils/adt/arrayfuncs.c:710
-#: utils/adt/arrayfuncs.c:740 utils/adt/arrayfuncs.c:755
-#: utils/adt/arrayfuncs.c:808
+#: commands/functioncmds.c:235
 #, c-format
-msgid "malformed array literal: \"%s\""
-msgstr "matriz mal formada: \"%s\""
+msgid "type %s does not exist"
+msgstr "tipo %s não existe"
 
-#: utils/adt/arrayfuncs.c:1225
-msgid "invalid array flags"
-msgstr "marcações de matriz são inválidas"
+#: commands/functioncmds.c:243
+msgid "functions cannot accept set arguments"
+msgstr "funções não podem aceitar conjunto de argumentos"
 
-#: utils/adt/arrayfuncs.c:1233
-msgid "wrong element type"
-msgstr "tipo de elemento incorreto"
+#: commands/functioncmds.c:252
+msgid "VARIADIC parameter must be the last input parameter"
+msgstr "parâmetro VARIADIC deve ser o último parâmetro de entrada"
 
-#: utils/adt/arrayfuncs.c:1282 utils/cache/lsyscache.c:2305
-#, c-format
-msgid "no binary input function available for type %s"
-msgstr "nenhuma função de entrada disponível para tipo %s"
+#: commands/functioncmds.c:279
+msgid "VARIADIC parameter must be an array"
+msgstr "parâmetro VARIADIC deve ser uma matriz"
 
-#: utils/adt/arrayfuncs.c:1422
+#: commands/functioncmds.c:319
 #, c-format
-msgid "improper binary format in array element %d"
-msgstr "formato binário é inválido no elemento %d da matriz"
+msgid "parameter name \"%s\" used more than once"
+msgstr "nome de parâmetro \"%s\" foi especificado mais de uma vez"
 
-#: utils/adt/arrayfuncs.c:1504 utils/cache/lsyscache.c:2338
-#, c-format
-msgid "no binary output function available for type %s"
-msgstr "nenhuma função de saída disponível para tipo %s"
+#: commands/functioncmds.c:334
+msgid "only input parameters can have default values"
+msgstr "somente parâmetros de entrada podem ter valores padrão"
 
-#: utils/adt/arrayfuncs.c:1878
-msgid "slices of fixed-length arrays not implemented"
-msgstr "segmentos de matrizes de tamanho fixo não está implementado"
+#: commands/functioncmds.c:347
+msgid "cannot use table references in parameter default value"
+msgstr "não pode utilizar referência a tabela no valor padrão do parâmetro"
 
-#: utils/adt/arrayfuncs.c:2051 utils/adt/arrayfuncs.c:2073
-#: utils/adt/arrayfuncs.c:2107 utils/adt/arrayfuncs.c:2393
-#: utils/adt/arrayfuncs.c:4542 utils/adt/arrayfuncs.c:4574
-#: utils/adt/arrayfuncs.c:4591
-msgid "wrong number of array subscripts"
-msgstr "número de índices da matriz incorreto"
+#: commands/functioncmds.c:363
+msgid "cannot use subquery in parameter default value"
+msgstr "não pode utilizar subconsulta no valor padrão do parâmetro"
 
-#: utils/adt/arrayfuncs.c:2056 utils/adt/arrayfuncs.c:2149
-#: utils/adt/arrayfuncs.c:2444
-msgid "array subscript out of range"
-msgstr "índice da matriz está fora do intervalo"
+#: commands/functioncmds.c:367
+msgid "cannot use aggregate function in parameter default value"
+msgstr "não pode utilizar função de agregação no valor padrão do parâmetro"
 
-#: utils/adt/arrayfuncs.c:2061
-msgid "cannot assign null value to an element of a fixed-length array"
-msgstr ""
-"não pode atribuir valor nulo para um elemento de matriz de tamanho fixo"
+#: commands/functioncmds.c:371
+msgid "cannot use window function in parameter default value"
+msgstr "não pode utilizar função deslizante no valor padrão do parâmetro"
 
-#: utils/adt/arrayfuncs.c:2347
-msgid "updates on slices of fixed-length arrays not implemented"
+#: commands/functioncmds.c:381
+msgid "input parameters after one with a default value must also have defaults"
 msgstr ""
-"atualização em segmentos de matrizes de tamanho fixo não está implementada"
+"parâmetros de entrada após um parâmetro com valor padrão também devem ter "
+"valores padrão"
 
-#: utils/adt/arrayfuncs.c:2383 utils/adt/arrayfuncs.c:2470
-msgid "source array too small"
-msgstr "matriz de origem muito pequena"
+#: commands/functioncmds.c:620
+msgid "no function body specified"
+msgstr "corpo da função não foi especificado"
 
-#: utils/adt/arrayfuncs.c:3021
-msgid "null array element not allowed in this context"
-msgstr "elemento nulo da matriz não é permitido neste contexto"
+#: commands/functioncmds.c:630
+msgid "no language specified"
+msgstr "nenhuma linguagem foi especificada"
 
-#: utils/adt/arrayfuncs.c:3082 utils/adt/arrayfuncs.c:3289
-#: utils/adt/arrayfuncs.c:3489
-msgid "cannot compare arrays of different element types"
-msgstr "não pode comparar matrizes de tipos de elementos diferentes"
+#: commands/functioncmds.c:651 commands/functioncmds.c:1352
+msgid "COST must be positive"
+msgstr "COST deve ser positivo"
 
-#: utils/adt/arrayfuncs.c:4440 utils/adt/arrayfuncs.c:4480
-msgid "dimension array or low bound array cannot be NULL"
-msgstr "matriz de dimensões ou matriz de limites inferiores não pode ser NULL"
+#: commands/functioncmds.c:659 commands/functioncmds.c:1360
+msgid "ROWS must be positive"
+msgstr "ROWS deve ser positivo"
 
-#: utils/adt/arrayfuncs.c:4543 utils/adt/arrayfuncs.c:4575
-msgid "Dimension array must be one dimensional."
-msgstr "Matriz de dimensões deve ser de uma dimensão."
+#: commands/functioncmds.c:698
+#, c-format
+msgid "unrecognized function attribute \"%s\" ignored"
+msgstr "atributo de função desconhecido \"%s\" foi ignorado"
 
-#: utils/adt/arrayfuncs.c:4548 utils/adt/arrayfuncs.c:4580
-msgid "wrong range of array subscripts"
-msgstr "intervalo incorreto de índices da matriz"
+#: commands/functioncmds.c:749
+#, c-format
+msgid "only one AS item needed for language \"%s\""
+msgstr "somente um item AS é necessário para linguagem \"%s\""
 
-#: utils/adt/arrayfuncs.c:4549 utils/adt/arrayfuncs.c:4581
-msgid "Lower bound of dimension array must be one."
-msgstr "Limite inferior da matriz de dimensões deve ser um."
+#: commands/functioncmds.c:839 commands/functioncmds.c:2019
+#: commands/proclang.c:600 commands/proclang.c:640 commands/proclang.c:754
+#, c-format
+msgid "language \"%s\" does not exist"
+msgstr "linguagem \"%s\" não existe"
 
-#: utils/adt/arrayfuncs.c:4554 utils/adt/arrayfuncs.c:4586
-msgid "dimension values cannot be null"
-msgstr "valores de dimensão não podem ser nulos"
+#: commands/functioncmds.c:841 commands/functioncmds.c:2021
+msgid "Use CREATE LANGUAGE to load the language into the database."
+msgstr "Utilize CREATE LANGUAGE para carregar uma linguagem no banco de dados."
 
-#: utils/adt/arrayfuncs.c:4592
-msgid "Low bound array has different size than dimensions array."
-msgstr ""
-"Matriz de limites inferiores tem tamanho diferente que a matriz de dimensões."
+#: commands/functioncmds.c:888
+#, c-format
+msgid "function result type must be %s because of OUT parameters"
+msgstr "tipo do resultado da função deve ser %s por causa dos parâmetros OUT"
 
-#: utils/adt/selfuncs.c:4762 utils/adt/selfuncs.c:5191
-msgid "case insensitive matching not supported on type bytea"
-msgstr ""
-"correspondência não sensível a maiúsculas/minúsculas não é suportada pelo "
-"tipo bytea"
+#: commands/functioncmds.c:901
+msgid "function result type must be specified"
+msgstr "tipo do resultado da função deve ser especificado"
 
-#: utils/adt/selfuncs.c:4867 utils/adt/selfuncs.c:5351
-msgid "regular-expression matching not supported on type bytea"
-msgstr "correspondência de expressão regular não é suportada pelo tipo bytea"
+#: commands/functioncmds.c:936 commands/functioncmds.c:1364
+msgid "ROWS is not applicable when function does not return a set"
+msgstr "ROWS não é aplicável quando função não retorna um conjunto"
 
-#: utils/adt/int.c:162
-msgid "int2vector has too many elements"
-msgstr "int2vector tem muitos elementos"
+#: commands/functioncmds.c:988
+#, c-format
+msgid "function %s(%s) does not exist, skipping"
+msgstr "função %s(%s) não existe, ignorando"
 
-#: utils/adt/int.c:236
-msgid "invalid int2vector data"
-msgstr "dado int2vector inválido"
+#: commands/functioncmds.c:1008 commands/functioncmds.c:1108
+#: commands/functioncmds.c:1171 commands/functioncmds.c:1322
+#: utils/adt/ruleutils.c:1696
+#, c-format
+msgid "\"%s\" is an aggregate function"
+msgstr "\"%s\" é uma função de agregação"
 
-#: utils/adt/datum.c:80 utils/adt/datum.c:92
-msgid "invalid Datum pointer"
-msgstr "ponteiro Datum é inválido"
+#: commands/functioncmds.c:1010
+msgid "Use DROP AGGREGATE to drop aggregate functions."
+msgstr "Utilize DROP AGGREGATE para remover funções de agregação."
 
-#: utils/adt/xml.c:135
-msgid "unsupported XML feature"
-msgstr "funcionalidade XML não é suportado"
+#: commands/functioncmds.c:1017
+#, c-format
+msgid "removing built-in function \"%s\""
+msgstr "removendo função embutida \"%s\""
 
-#: utils/adt/xml.c:136
-msgid "This functionality requires the server to be built with libxml support."
-msgstr ""
-"Esta funcionalidade requer que o servidor seja construído com suporte a "
-"libxml."
-
-#: utils/adt/xml.c:137
-msgid "You need to rebuild PostgreSQL using --with-libxml."
-msgstr "Você precisa reconstruir o PostgreSQL utilizando --with-libxml."
+#: commands/functioncmds.c:1110
+msgid "Use ALTER AGGREGATE to rename aggregate functions."
+msgstr "Utilize ALTER AGGREGATE para renomear funções de agregação."
 
-#: utils/adt/xml.c:156 utils/mb/mbutils.c:476
+#: commands/functioncmds.c:1122 commands/aggregatecmds.c:292
 #, c-format
-msgid "invalid encoding name \"%s\""
-msgstr "nome da codificação \"%s\" é inválido"
-
-#: utils/adt/xml.c:402 utils/adt/xml.c:407
-msgid "invalid XML comment"
-msgstr "comentário XML inválido"
-
-#: utils/adt/xml.c:536
-msgid "not an XML document"
-msgstr "não é um documento XML"
+msgid "function %s already exists in schema \"%s\""
+msgstr "função %s já existe no esquema \"%s\""
 
-#: utils/adt/xml.c:689 utils/adt/xml.c:712
-msgid "invalid XML processing instruction"
-msgstr "instrução de processamento XML é inválida"
+#: commands/functioncmds.c:1173
+msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
+msgstr "Utilize ALTER AGGREGATE para mudar o dono das funções de agregação."
 
-#: utils/adt/xml.c:690
+#: commands/functioncmds.c:1512
 #, c-format
-msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr "nome alvo da instrução de processamento XML não pode ser \"%s\"."
+msgid "source data type %s is a pseudo-type"
+msgstr "tipo de dado fonte %s é um pseudo-tipo"
 
-#: utils/adt/xml.c:713
-msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "instrução de processamento XML não pode conter \"?>\"."
+#: commands/functioncmds.c:1518
+#, c-format
+msgid "target data type %s is a pseudo-type"
+msgstr "tipo de dado alvo %s é um pseudo-tipo"
 
-#: utils/adt/xml.c:792
-msgid "xmlvalidate is not implemented"
-msgstr "xmlvalidate não foi implementado"
+#: commands/functioncmds.c:1526 commands/functioncmds.c:1814
+#: catalog/objectaddress.c:839
+#, c-format
+msgid "must be owner of type %s or type %s"
+msgstr "deve ser dono do tipo %s ou tipo %s"
 
-#: utils/adt/xml.c:877
-msgid "could not initialize XML library"
-msgstr "não pôde inicializar biblioteca XML"
+#: commands/functioncmds.c:1555
+msgid "cast function must take one to three arguments"
+msgstr "função de conversão deve ter de um a três argumentos"
 
-#: utils/adt/xml.c:878
-#, c-format
+#: commands/functioncmds.c:1559
 msgid ""
-"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
+"argument of cast function must match or be binary-coercible from source data "
+"type"
 msgstr ""
-"libxml2 tem tipo char incompatível: sizeof(char)=%u, sizeof(xmlChar)=%u."
+"argumento da função de conversão deve corresponder ou ser convertido no tipo "
+"de dado fonte"
 
-#: utils/adt/xml.c:1417
-msgid "Invalid character value."
-msgstr "Valor de caracter é inválido."
+#: commands/functioncmds.c:1563
+msgid "second argument of cast function must be type integer"
+msgstr "segundo argumento da função de conversão deve ter tipo integer"
 
-#: utils/adt/xml.c:1420
-msgid "Space required."
-msgstr "Espaço requerido."
+#: commands/functioncmds.c:1567
+msgid "third argument of cast function must be type boolean"
+msgstr "terceiro argumento da função de conversão deve ter tipo boolean"
 
-#: utils/adt/xml.c:1423
-msgid "standalone accepts only 'yes' or 'no'."
-msgstr "standalone aceita somente 'yes' ou 'no'."
+#: commands/functioncmds.c:1571
+msgid ""
+"return data type of cast function must match or be binary-coercible to "
+"target data type"
+msgstr ""
+"tipo de dado de retorno da função de conversão deve corresponder ou ser "
+"convertido no tipo de dado alvo"
 
-#: utils/adt/xml.c:1426
-msgid "Malformed declaration: missing version."
-msgstr "Declaração mal formada: faltando versão."
+#: commands/functioncmds.c:1582
+msgid "cast function must not be volatile"
+msgstr "função de conversão não deve ser volátil"
 
-#: utils/adt/xml.c:1429
-msgid "Missing encoding in text declaration."
-msgstr "Faltando codificação em declaração."
+#: commands/functioncmds.c:1587
+msgid "cast function must not be an aggregate function"
+msgstr "função de conversão não deve ser uma função de agregação"
 
-#: utils/adt/xml.c:1432
-msgid "Parsing XML declaration: '?>' expected."
-msgstr "Analisando declaração XML: '?>' esperado."
+#: commands/functioncmds.c:1591
+msgid "cast function must not be a window function"
+msgstr "função de conversão não deve ser uma função deslizante"
 
-#: utils/adt/xml.c:1435
-#, c-format
-msgid "Unrecognized libxml error code: %d."
-msgstr "código de erro libxml desconhecido: %d."
+#: commands/functioncmds.c:1595
+msgid "cast function must not return a set"
+msgstr "função de conversão não deve retornar um conjunto"
 
-#: utils/adt/xml.c:1689
-msgid "XML does not support infinite date values."
-msgstr "XML não suporta valores infinitos de date."
+#: commands/functioncmds.c:1621
+msgid "must be superuser to create a cast WITHOUT FUNCTION"
+msgstr "deve ser super-usuário para criar uma conversão WITHOUT FUNCTION"
 
-#: utils/adt/xml.c:1712 utils/adt/xml.c:1739
-msgid "XML does not support infinite timestamp values."
-msgstr "XML não suporta valores infinitos de timestamp."
+#: commands/functioncmds.c:1636
+msgid "source and target data types are not physically compatible"
+msgstr "tipos de dado fonte e alvo não são fisicamente compatíveis"
 
-#: utils/adt/xml.c:2123
-msgid "invalid query"
-msgstr "consulta inválida"
+#: commands/functioncmds.c:1651
+msgid "composite data types are not binary-compatible"
+msgstr "tipos de dado compostos não são compatíveis no formato binário"
 
-#: utils/adt/xml.c:3352
-msgid "invalid array for XML namespace mapping"
-msgstr "matriz inválida para mapeamento de namespace XML"
+#: commands/functioncmds.c:1657
+msgid "enum data types are not binary-compatible"
+msgstr "tipos de dado enum não são compatíveis no formato binário"
 
-#: utils/adt/xml.c:3353
-msgid ""
-"The array must be two-dimensional with length of the second axis equal to 2."
-msgstr ""
-"A matriz deve ter duas dimensões com comprimento do segundo eixo igual a 2."
+#: commands/functioncmds.c:1663
+msgid "array data types are not binary-compatible"
+msgstr "tipos de dado matriz não são compatíveis no formato binário"
 
-#: utils/adt/xml.c:3377
-msgid "empty XPath expression"
-msgstr "expressão XPath vazia"
+#: commands/functioncmds.c:1680
+#, fuzzy
+msgid "domain data types must not be marked binary-compatible"
+msgstr "tipos de dado compostos não são compatíveis no formato binário"
 
-#: utils/adt/xml.c:3425
-msgid "neither namespace name nor URI may be null"
-msgstr "namespace ou URI não podem ser nulo"
+#: commands/functioncmds.c:1690
+msgid "source data type and target data type are the same"
+msgstr "tipo de dado fonte e tipo de dado alvo são o mesmo"
 
-#: utils/adt/xml.c:3432
+#: commands/functioncmds.c:1723
 #, c-format
-msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
-msgstr "não pôde registrar namespace XML com nome \"%s\" e URI \"%s\""
+msgid "cast from type %s to type %s already exists"
+msgstr "conversão do tipo %s para tipo %s já existe"
 
-#: utils/adt/like_match.c:103 utils/adt/like_match.c:163
-msgid "LIKE pattern must not end with escape character"
-msgstr "padrão de LIKE não deve terminar com caracter escape"
+#: commands/functioncmds.c:1803
+#, c-format
+msgid "cast from type %s to type %s does not exist, skipping"
+msgstr "conversão do tipo %s para tipo %s não existe, ignorando"
 
-#: utils/adt/mac.c:65
+#: commands/functioncmds.c:1841
 #, c-format
-msgid "invalid input syntax for type macaddr: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo macaddr: \"%s\""
+msgid "cast from type %s to type %s does not exist"
+msgstr "conversão do tipo %s para tipo %s não existe"
 
-#: utils/adt/mac.c:72
+#: commands/functioncmds.c:1929
 #, c-format
-msgid "invalid octet value in \"macaddr\" value: \"%s\""
-msgstr "valor de octeto é inválido no valor de \"macaddr\": \"%s\""
+msgid "function \"%s\" already exists in schema \"%s\""
+msgstr "função \"%s\" já existe no esquema \"%s\""
 
-#: utils/adt/tsvector_op.c:1103
-msgid "ts_stat query must return one tsvector column"
-msgstr "consulta ts_stat deve retornar uma coluna tsvector"
+#: commands/functioncmds.c:2003
+#, fuzzy
+msgid "no inline code specified"
+msgstr "código inline não foi especificado"
 
-#: utils/adt/tsvector_op.c:1283
-#, c-format
-msgid "tsvector column \"%s\" does not exist"
-msgstr "coluna tsvector \"%s\" não existe"
+#: commands/functioncmds.c:2051
+#, fuzzy, c-format
+msgid "language \"%s\" does not support inline code execution"
+msgstr "linguagem \"%s\" não suporta execução de código inline"
 
-#: utils/adt/tsvector_op.c:1289
-#, c-format
-msgid "column \"%s\" is not of tsvector type"
-msgstr "coluna \"%s\" não é do tipo tsvector"
+#: commands/copy.c:339 commands/copy.c:351 commands/copy.c:385
+#: commands/copy.c:395
+msgid "COPY BINARY is not supported to stdout or from stdin"
+msgstr "COPY BINARY não é suportado para saída stdout ou da entrada padrão"
 
-#: utils/adt/tsvector_op.c:1301
+#: commands/copy.c:473
 #, c-format
-msgid "configuration column \"%s\" does not exist"
-msgstr "coluna de configuração \"%s\" não existe"
+msgid "could not write to COPY file: %m"
+msgstr "não pôde escrever em arquivo COPY: %m"
 
-#: utils/adt/tsvector_op.c:1307
-#, c-format
-msgid "column \"%s\" is not of regconfig type"
-msgstr "coluna \"%s\" não é do tipo regconfig"
+#: commands/copy.c:485
+msgid "connection lost during COPY to stdout"
+msgstr "conexão perdida durante COPY para saída stdout"
 
-#: utils/adt/tsvector_op.c:1314
+#: commands/copy.c:526
 #, c-format
-msgid "configuration column \"%s\" must not be null"
-msgstr "coluna de configuração \"%s\" não deve ser nulo"
+msgid "could not read from COPY file: %m"
+msgstr "não pôde ler de arquivo COPY: %m"
 
-#: utils/adt/tsvector_op.c:1327
+#: commands/copy.c:577
 #, c-format
-msgid "text search configuration name \"%s\" must be schema-qualified"
-msgstr ""
-"nome da configuração de busca textual \"%s\" deve ser qualificada pelo "
-"esquema"
+msgid "COPY from stdin failed: %s"
+msgstr "COPY da entrada padrão falhou: %s"
 
-#: utils/adt/tsvector_op.c:1347 parser/parse_expr.c:758 commands/copy.c:3446
-#: commands/indexcmds.c:908 commands/tablecmds.c:1260
-#: commands/tablecmds.c:2065
+#: commands/copy.c:593
 #, c-format
-msgid "column \"%s\" does not exist"
-msgstr "coluna \"%s\" não existe"
+msgid "unexpected message type 0x%02X during COPY from stdin"
+msgstr "tipo de mensagem inesperada 0x%02X durante COPY da entrada padrão"
 
-#: utils/adt/tsvector_op.c:1352
-#, c-format
-msgid "column \"%s\" is not of a character type"
-msgstr "coluna \"%s\" não é do tipo caracter"
+#: commands/copy.c:745
+msgid "must be superuser to COPY to or from a file"
+msgstr "deve ser super-usuário para utilizar COPY para ou de um arquivo"
+
+#: commands/copy.c:746
+msgid ""
+"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
+"for anyone."
+msgstr ""
+"Qualquer um pode utilizar COPY para saída stdout ou da entrada padrão. "
+"comando \\copy do psql também funciona para qualquer um."
 
-#: utils/adt/enum.c:44 utils/adt/enum.c:54 utils/adt/enum.c:109
-#: utils/adt/enum.c:119
+#: commands/copy.c:874
 #, c-format
-msgid "invalid input value for enum %s: \"%s\""
-msgstr "valor de entrada é inválido para enum %s: \"%s\""
+msgid "COPY format \"%s\" not recognized"
+msgstr "formato COPY \"%s\" desconhecido"
 
-#: utils/adt/enum.c:81 utils/adt/enum.c:144
+#: commands/copy.c:937 commands/copy.c:951
 #, c-format
-msgid "invalid internal value for enum: %u"
-msgstr "valor interno é inválido para enum: %u"
+msgid "argument to option \"%s\" must be a list of column names"
+msgstr "argumento para opção \"%s\" deve ser uma lista de nomes de colunas"
 
-#: utils/adt/enum.c:264 utils/adt/enum.c:303 utils/adt/enum.c:350
-#: utils/adt/enum.c:370
-msgid "could not determine actual enum type"
-msgstr "não pôde determinar tipo enum atual"
+#: commands/copy.c:964
+#, fuzzy, c-format
+msgid "argument to option \"%s\" must be a valid encoding name"
+msgstr "argumento para opção \"%s\" deve ser uma lista de nomes de colunas"
 
-#: utils/adt/int8.c:113
+#: commands/copy.c:970
 #, c-format
-msgid "value \"%s\" is out of range for type bigint"
-msgstr "valor \"%s\" está fora do intervalo para tipo bigint"
+msgid "option \"%s\" not recognized"
+msgstr "opção \"%s\" desconhecida"
 
-#: utils/adt/int8.c:1315
-msgid "OID out of range"
-msgstr "OID fora do intervalo"
+#: commands/copy.c:981
+msgid "cannot specify DELIMITER in BINARY mode"
+msgstr "não pode especificar DELIMITER no modo BINARY"
 
-#: utils/adt/tsquery_rewrite.c:296
-msgid "ts_rewrite query must return two tsquery columns"
-msgstr "consulta ts_rewrite deve retornar duas colunas tsquery"
+#: commands/copy.c:986
+msgid "cannot specify NULL in BINARY mode"
+msgstr "não pode especificar NULL no modo BINARY"
 
-#: utils/adt/regproc.c:118 utils/adt/regproc.c:139 utils/adt/regproc.c:289
-#: utils/adt/acl.c:3364
-#, c-format
-msgid "function \"%s\" does not exist"
-msgstr "função \"%s\" não existe"
+#: commands/copy.c:1008
+msgid "COPY delimiter must be a single one-byte character"
+msgstr "delimitador do COPY deve ter um único caracter de um byte"
 
-#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
-#, c-format
-msgid "more than one function named \"%s\""
-msgstr "mais de uma função com nome \"%s\""
+#: commands/copy.c:1015
+msgid "COPY delimiter cannot be newline or carriage return"
+msgstr "delimitador do COPY não pode ser nova linha ou retorno de carro"
 
-#: utils/adt/regproc.c:464 utils/adt/regproc.c:484 utils/adt/regproc.c:643
-#: parser/parse_oper.c:124 parser/parse_oper.c:751
-#, c-format
-msgid "operator does not exist: %s"
-msgstr "operador não existe: %s"
+#: commands/copy.c:1021
+msgid "COPY null representation cannot use newline or carriage return"
+msgstr ""
+"representação do nulo do COPY não pode ser nova linha ou retorno de carro"
 
-#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
+#: commands/copy.c:1038
 #, c-format
-msgid "more than one operator named %s"
-msgstr "mais de um operador com nome %s"
-
-#: utils/adt/regproc.c:630 gram.y:5421
-msgid "missing argument"
-msgstr "faltando argumento"
+msgid "COPY delimiter cannot be \"%s\""
+msgstr "delimitador do COPY não pode ser \"%s\""
 
-#: utils/adt/regproc.c:631 gram.y:5422
-msgid "Use NONE to denote the missing argument of a unary operator."
-msgstr "Utilize NONE para denotar argumento em falta de um operador unário."
+#: commands/copy.c:1044
+msgid "COPY HEADER available only in CSV mode"
+msgstr "COPY HEADER só está disponível no modo CSV"
 
-#: utils/adt/regproc.c:636
-msgid "Provide two argument types for operator."
-msgstr "Forneça dois tipos de argumento para operador."
-
-#: utils/adt/regproc.c:810 parser/parse_relation.c:848
-#: parser/parse_relation.c:856 commands/lockcmds.c:127 catalog/namespace.c:278
-#, c-format
-msgid "relation \"%s\" does not exist"
-msgstr "relação \"%s\" não existe"
+#: commands/copy.c:1050
+msgid "COPY quote available only in CSV mode"
+msgstr "delimitador de dados do COPY só está disponível no modo CSV"
 
-#: utils/adt/regproc.c:973 parser/parse_func.c:1483 parser/parse_type.c:196
-#: commands/tablecmds.c:216 commands/typecmds.c:650 commands/typecmds.c:2572
-#: commands/functioncmds.c:126
-#, c-format
-msgid "type \"%s\" does not exist"
-msgstr "tipo \"%s\" não existe"
+#: commands/copy.c:1055
+msgid "COPY quote must be a single one-byte character"
+msgstr "delimitador de dados do COPY deve ter um único caracter de um byte"
 
-#: utils/adt/regproc.c:1383
-msgid "expected a left parenthesis"
-msgstr "parêntese esquerdo esperado"
+#: commands/copy.c:1060
+msgid "COPY delimiter and quote must be different"
+msgstr "delimitador e delimitador de dados do COPY devem ser diferentes"
 
-#: utils/adt/regproc.c:1399
-msgid "expected a right parenthesis"
-msgstr "parêntese direito esperado"
+#: commands/copy.c:1066
+msgid "COPY escape available only in CSV mode"
+msgstr "escape do COPY só está disponível no modo CSV"
 
-#: utils/adt/regproc.c:1418
-msgid "expected a type name"
-msgstr "nome de tipo esperado"
+#: commands/copy.c:1071
+msgid "COPY escape must be a single one-byte character"
+msgstr "escape do COPY deve ter um único caracter de um byte"
 
-#: utils/adt/regproc.c:1450
-msgid "improper type name"
-msgstr "nome de tipo inválido"
+#: commands/copy.c:1077
+msgid "COPY force quote available only in CSV mode"
+msgstr "opção force quote do COPY somente está disponível no modo CSV"
 
-#: utils/adt/acl.c:251
-#, c-format
-msgid "unrecognized key word: \"%s\""
-msgstr "palavra chave desconhecida: \"%s\""
+#: commands/copy.c:1081
+msgid "COPY force quote only available using COPY TO"
+msgstr "opção force quote do COPY somente está disponível ao utilizar COPY TO"
 
-#: utils/adt/acl.c:252
-msgid "ACL key word must be \"group\" or \"user\"."
-msgstr "palavra chave ACL deve ser \"group\" ou \"user\"."
+#: commands/copy.c:1087
+msgid "COPY force not null available only in CSV mode"
+msgstr "opção force not null do COPY somente está disponível no modo CSV"
 
-#: utils/adt/acl.c:257
-msgid "missing name"
-msgstr "faltando nome"
+#: commands/copy.c:1091
+msgid "COPY force not null only available using COPY FROM"
+msgstr ""
+"opção force not null do COPY somente está disponível ao utilizar COPY FROM"
 
-#: utils/adt/acl.c:258
-msgid "A name must follow the \"group\" or \"user\" key word."
-msgstr "Um nome deve seguir a palavra chave \"group\" ou \"user\"."
+#: commands/copy.c:1097
+msgid "COPY delimiter must not appear in the NULL specification"
+msgstr "delimitador do COPY não deve aparecer em uma especificação NULL"
 
-#: utils/adt/acl.c:264
-msgid "missing \"=\" sign"
-msgstr "faltando sinal \"=\""
+#: commands/copy.c:1104
+msgid "CSV quote character must not appear in the NULL specification"
+msgstr ""
+"caracter delimitador de dados do CSV não deve aparecer na especificação NULL"
 
-#: utils/adt/acl.c:317
+#: commands/copy.c:1166
 #, c-format
-msgid "invalid mode character: must be one of \"%s\""
-msgstr "caracter de modo é inválido: deve ser um dos \"%s\""
+msgid "table \"%s\" does not have OIDs"
+msgstr "tabela \"%s\" não tem OIDs"
 
-#: utils/adt/acl.c:339
-msgid "a name must follow the \"/\" sign"
-msgstr "um nome deve seguir o sinal \"/\""
+#: commands/copy.c:1183
+msgid "COPY (SELECT) WITH OIDS is not supported"
+msgstr "COPY (SELECT) WITH OIDS não é mais suportado"
+
+#: commands/copy.c:1210
+msgid "COPY (SELECT INTO) is not supported"
+msgstr "COPY (SELECT INTO) não é suportado"
 
-#: utils/adt/acl.c:347
+#: commands/copy.c:1270
 #, c-format
-msgid "defaulting grantor to user ID %u"
-msgstr "utilizando ID de usuário %u como concedente"
+msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
+msgstr "coluna do tipo FORCE QUOTE \"%s\" não é referenciada pelo COPY"
 
-#: utils/adt/acl.c:538
-msgid "ACL array contains wrong data type"
-msgstr "matriz ACL contém tipo de dado incorreto"
+#: commands/copy.c:1292
+#, c-format
+msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
+msgstr "coluna do tipo FORCE NOT NULL \"%s\" não é referenciada pelo COPY"
 
-#: utils/adt/acl.c:542
-msgid "ACL arrays must be one-dimensional"
-msgstr "matrizes ACL devem ser de uma dimensão"
+#: commands/copy.c:1329 access/transam/xlog.c:2422 access/transam/xlog.c:2554
+#: access/transam/xlog.c:4534 storage/file/copydir.c:211
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "não pôde fechar arquivo \"%s\": %m"
 
-#: utils/adt/acl.c:546
-msgid "ACL arrays must not contain null values"
-msgstr "matrizes ACL não devem conter valores nulos"
+#: commands/copy.c:1356
+#, c-format
+msgid "cannot copy from view \"%s\""
+msgstr "não pode copiar visão \"%s\""
 
-#: utils/adt/acl.c:570
-msgid "extra garbage at the end of the ACL specification"
-msgstr "lixo extra ao final da especificação de uma ACL"
+#: commands/copy.c:1358 commands/copy.c:1364
+msgid "Try the COPY (SELECT ...) TO variant."
+msgstr "Tente a variante COPY (SELECT ...) TO."
 
-#: utils/adt/acl.c:1127
-msgid "grant options cannot be granted back to your own grantor"
-msgstr "opções de concessão não podem ser concedidos ao próprio concedente"
+#: commands/copy.c:1362
+#, c-format
+msgid "cannot copy from foreign table \"%s\""
+msgstr "não pode copiar tabela externa \"%s\""
 
-#: utils/adt/acl.c:1188
-msgid "dependent privileges exist"
-msgstr "privilégios dependentes existem"
+#: commands/copy.c:1368
+#, c-format
+msgid "cannot copy from sequence \"%s\""
+msgstr "não pode copiar sequência \"%s\""
 
-#: utils/adt/acl.c:1189
-msgid "Use CASCADE to revoke them too."
-msgstr "Utilize CASCADE para revogá-los também."
+#: commands/copy.c:1373
+#, c-format
+msgid "cannot copy from non-table relation \"%s\""
+msgstr "não pode copiar relação \"%s\" que não é uma tabela"
 
-#: utils/adt/acl.c:1468
-msgid "aclinsert is no longer supported"
-msgstr "aclinsert não é mais suportado"
+#: commands/copy.c:1397
+msgid "relative path not allowed for COPY to file"
+msgstr "caminho relativo não é permitido pelo COPY para arquivo"
 
-#: utils/adt/acl.c:1478
-msgid "aclremove is no longer supported"
-msgstr "aclremove não é mais suportado"
+#: commands/copy.c:1407
+#, c-format
+msgid "could not open file \"%s\" for writing: %m"
+msgstr "não pôde abrir arquivo \"%s\" para escrita: %m"
 
-#: utils/adt/acl.c:1564 utils/adt/acl.c:1618
+#: commands/copy.c:1414 commands/copy.c:2200
 #, c-format
-msgid "unrecognized privilege type: \"%s\""
-msgstr "tipo de privilégio desconhecido: \"%s\""
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" é um diretório"
 
-#: utils/adt/acl.c:2006 utils/adt/acl.c:2036 utils/adt/acl.c:2068
-#: utils/adt/acl.c:2100 utils/adt/acl.c:2128 utils/adt/acl.c:2158
-#: commands/tablecmds.c:200 commands/tablecmds.c:2146
-#: commands/tablecmds.c:2365 commands/tablecmds.c:7793 commands/comment.c:566
-#: commands/sequence.c:953 catalog/aclchk.c:1729
+#: commands/copy.c:1738
 #, c-format
-msgid "\"%s\" is not a sequence"
-msgstr "\"%s\" não é uma sequência"
+msgid "COPY %s, line %d, column %s"
+msgstr "COPY %s, linha %d, coluna %s"
 
-#: utils/adt/acl.c:3562 commands/proclang.c:531 commands/proclang.c:600
-#: commands/proclang.c:640 commands/comment.c:1220 commands/functioncmds.c:836
-#: commands/functioncmds.c:1990 catalog/aclchk.c:640
+#: commands/copy.c:1742 commands/copy.c:1787
 #, c-format
-msgid "language \"%s\" does not exist"
-msgstr "linguagem \"%s\" não existe"
+msgid "COPY %s, line %d"
+msgstr "COPY %s, linha %d"
 
-#: utils/adt/acl.c:3760 commands/comment.c:806 commands/schemacmds.c:190
-#: commands/schemacmds.c:264 commands/schemacmds.c:335 catalog/aclchk.c:673
-#: catalog/aclchk.c:1051 catalog/namespace.c:340 catalog/namespace.c:2307
-#: catalog/namespace.c:2346 catalog/namespace.c:2393 catalog/namespace.c:3320
+#: commands/copy.c:1753
 #, c-format
-msgid "schema \"%s\" does not exist"
-msgstr "esquema \"%s\" não existe"
+msgid "COPY %s, line %d, column %s: \"%s\""
+msgstr "COPY %s, linha %d, coluna %s: \"%s\""
 
-#: utils/adt/acl.c:4635
+#: commands/copy.c:1761
 #, c-format
-msgid "must be member of role \"%s\""
-msgstr "deve ser membro da role \"%s\""
+msgid "COPY %s, line %d, column %s: null input"
+msgstr "COPY %s, linha %d, coluna %s: entrada nula"
 
-#: utils/adt/misc.c:80
-msgid "must be superuser to signal other server processes"
-msgstr "deve ser super-usuário para sinalizar outros processos servidor"
+#: commands/copy.c:1773
+#, c-format
+msgid "COPY %s, line %d: \"%s\""
+msgstr "COPY %s, linha %d: \"%s\""
 
-#: utils/adt/misc.c:89
+#: commands/copy.c:1857
 #, c-format
-msgid "PID %d is not a PostgreSQL server process"
-msgstr "PID %d não é um processo servidor do PostgreSQL"
+msgid "cannot copy to view \"%s\""
+msgstr "não pode copiar para visão \"%s\""
 
-#: utils/adt/misc.c:102 storage/lmgr/proc.c:1006
+#: commands/copy.c:1862
 #, c-format
-msgid "could not send signal to process %d: %m"
-msgstr "não pôde enviar sinal para processo %d: %m"
+msgid "cannot copy to foreign table \"%s\""
+msgstr "não pode copiar para tabela externa \"%s\""
 
-#: utils/adt/misc.c:126
-msgid "must be superuser to signal the postmaster"
-msgstr "deve ser super-usuário para sinalizar o postmaster"
+#: commands/copy.c:1867
+#, c-format
+msgid "cannot copy to sequence \"%s\""
+msgstr "não pode copiar para sequência \"%s\""
 
-#: utils/adt/misc.c:131
+#: commands/copy.c:1872
 #, c-format
-msgid "failed to send signal to postmaster: %m"
-msgstr "falhou ao enviar sinal para postmaster: %m"
+msgid "cannot copy to non-table relation \"%s\""
+msgstr "não pode copiar para relação \"%s\" que não é uma tabela"
 
-#: utils/adt/misc.c:148
-msgid "must be superuser to rotate log files"
-msgstr "deve ser super-usuário para rotacionar arquivos de log"
+#: commands/copy.c:2193 utils/adt/genfile.c:122
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "não pôde abrir arquivo \"%s\" para leitura: %m"
 
-#: utils/adt/misc.c:153
-msgid "rotation not possible because log collection not active"
-msgstr "rotação não é possível porque coleta de log não está ativa"
+#: commands/copy.c:2219
+msgid "COPY file signature not recognized"
+msgstr "assinatura de arquivo COPY é desconhecida"
 
-#: utils/adt/misc.c:195
-msgid "global tablespace never has databases"
-msgstr "tablespace global nunca teve bancos de dados"
+#: commands/copy.c:2224
+msgid "invalid COPY file header (missing flags)"
+msgstr "cabeçalho de arquivo COPY é inválido (faltando marcações)"
 
-#: utils/adt/misc.c:216
-#, c-format
-msgid "%u is not a tablespace OID"
-msgstr "%u não é um OID de tablespace"
+#: commands/copy.c:2230
+msgid "unrecognized critical flags in COPY file header"
+msgstr "marcações críticas desconhecidas no cabeçalho do arquivo COPY"
 
-#: utils/adt/misc.c:352
-msgid "unreserved"
-msgstr "sem reserva"
+#: commands/copy.c:2236
+msgid "invalid COPY file header (missing length)"
+msgstr "cabeçalho de arquivo COPY é inválido (faltando tamanho)"
 
-#: utils/adt/misc.c:356
-msgid "unreserved (cannot be function or type name)"
-msgstr "sem reserva (não pode ser nome de função ou tipo)"
+#: commands/copy.c:2243
+msgid "invalid COPY file header (wrong length)"
+msgstr "cabeçalho de arquivo COPY é inválido (tamanho incorreto)"
 
-#: utils/adt/misc.c:360
-msgid "reserved (can be function or type name)"
-msgstr "reservado (pode ser nome de função ou tipo)"
+#: commands/copy.c:2376 commands/copy.c:3058 commands/copy.c:3275
+msgid "extra data after last expected column"
+msgstr "dado extra após última coluna esperada"
 
-#: utils/adt/misc.c:364
-msgid "reserved"
-msgstr "reservado"
+#: commands/copy.c:2386
+msgid "missing data for OID column"
+msgstr "faltando dados da coluna OID"
 
-#: utils/adt/nabstime.c:160
-#, c-format
-msgid "invalid time zone name: \"%s\""
-msgstr "nome de zona horária é inválido: \"%s\""
+#: commands/copy.c:2392
+msgid "null OID in COPY data"
+msgstr "OID nulo em dados do COPY"
 
-#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
-msgid "cannot convert abstime \"invalid\" to timestamp"
-msgstr "não pode converter abstime \"invalid\" para timestamp"
+#: commands/copy.c:2402 commands/copy.c:2501
+msgid "invalid OID in COPY data"
+msgstr "OID inválido em dados do COPY"
 
-#: utils/adt/nabstime.c:806
-msgid "invalid status in external \"tinterval\" value"
-msgstr "status inválido no valor de \"tinterval\" externo"
+#: commands/copy.c:2417
+#, c-format
+msgid "missing data for column \"%s\""
+msgstr "faltando dados da coluna \"%s\""
 
-#: utils/adt/nabstime.c:880
-msgid "cannot convert reltime \"invalid\" to interval"
-msgstr "não pode converter reltime \"invalid\" em interval"
+#: commands/copy.c:2476
+msgid "received copy data after EOF marker"
+msgstr "dados do COPY recebidos após marcador EOF"
 
-#: utils/adt/nabstime.c:1562
+#: commands/copy.c:2483
 #, c-format
-msgid "invalid input syntax for type tinterval: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo tinterval: \"%s\""
+msgid "row field count is %d, expected %d"
+msgstr "quantidade de campos do registro é %d, esperado %d"
 
-#: utils/adt/numeric.c:352 utils/adt/numeric.c:379 utils/adt/numeric.c:3083
-#: utils/adt/numeric.c:3106 utils/adt/numeric.c:3130 utils/adt/numeric.c:3137
-#, c-format
-msgid "invalid input syntax for type numeric: \"%s\""
-msgstr "sintaxe de entrada é inválida para tipo numeric: \"%s\""
+#: commands/copy.c:2822 commands/copy.c:2839
+msgid "literal carriage return found in data"
+msgstr "retorno de carro foi encontrado em dados"
 
-#: utils/adt/numeric.c:482
-msgid "invalid length in external \"numeric\" value"
-msgstr "tamanho inválido no valor de \"numeric\" externo"
+#: commands/copy.c:2823 commands/copy.c:2840
+msgid "unquoted carriage return found in data"
+msgstr "retorno de carros sem aspas foi encontrado em dados"
 
-#: utils/adt/numeric.c:493
-msgid "invalid sign in external \"numeric\" value"
-msgstr "sinal inválido no valor de \"numeric\" externo"
+#: commands/copy.c:2825 commands/copy.c:2842
+msgid "Use \"\\r\" to represent carriage return."
+msgstr "Utilize \"\\r\" para representar retorno de carro."
 
-#: utils/adt/numeric.c:503
-msgid "invalid digit in external \"numeric\" value"
-msgstr "dígito inválido no valor de \"numeric\" externo"
+#: commands/copy.c:2826 commands/copy.c:2843
+msgid "Use quoted CSV field to represent carriage return."
+msgstr "Utilize campo entre aspas do CSV para representar retorno de carro."
 
-#: utils/adt/numeric.c:634 utils/adt/numeric.c:648
-#, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
-msgstr "precisão do NUMERIC %d deve ser entre 1 e %d"
+#: commands/copy.c:2855
+msgid "literal newline found in data"
+msgstr "nova linha foi encontrada em dados"
 
-#: utils/adt/numeric.c:639
-#, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
-msgstr "escala do NUMERIC %d deve ser entre 0 e precisão %d"
+#: commands/copy.c:2856
+msgid "unquoted newline found in data"
+msgstr "nova linha sem aspas foi encontrada em dados"
 
-#: utils/adt/numeric.c:657
-msgid "invalid NUMERIC type modifier"
-msgstr "modificador de tipo NUMERIC é inválido"
+#: commands/copy.c:2858
+msgid "Use \"\\n\" to represent newline."
+msgstr "Utilize \"\\n\" para representar nova linha."
 
-#: utils/adt/numeric.c:1690 utils/adt/numeric.c:3545
-msgid "value overflows numeric format"
-msgstr "valor excede formato numeric"
+#: commands/copy.c:2859
+msgid "Use quoted CSV field to represent newline."
+msgstr "Utilize campo entre aspas do CSV para representar nova linha."
 
-#: utils/adt/numeric.c:2038
-msgid "cannot convert NaN to integer"
-msgstr "não pode converter NaN para inteiro"
+#: commands/copy.c:2905 commands/copy.c:2941
+msgid "end-of-copy marker does not match previous newline style"
+msgstr ""
+"marcador de fim-de-cópia não corresponde com estilo de nova linha anterior"
 
-#: utils/adt/numeric.c:2106
-msgid "cannot convert NaN to bigint"
-msgstr "não pode converter NaN para bigint"
+#: commands/copy.c:2914 commands/copy.c:2930
+msgid "end-of-copy marker corrupt"
+msgstr "marcador de fim-de-cópia corrompido"
 
-#: utils/adt/numeric.c:2154
-msgid "cannot convert NaN to smallint"
-msgstr "não pode converter NaN para smallint"
+#: commands/copy.c:3359
+msgid "unterminated CSV quoted field"
+msgstr "campo entre aspas do CSV não foi terminado"
 
-#: utils/adt/numeric.c:3615
-msgid "numeric field overflow"
-msgstr "estouro de campo numeric"
+#: commands/copy.c:3436 commands/copy.c:3455
+msgid "unexpected EOF in COPY data"
+msgstr "EOF inesperado em dados do COPY"
 
-#: utils/adt/numeric.c:3616
-#, c-format
-msgid ""
-"A field with precision %d, scale %d must round to an absolute value less "
-"than %s%d."
-msgstr ""
-"Um campo com precisão %d, escala %d deve arredondar para um valor absoluto "
-"menor do que %s%d."
+#: commands/copy.c:3445
+msgid "invalid field size"
+msgstr "tamanho de campo inválido"
 
-#: utils/adt/numeric.c:5064
-msgid "argument for function \"exp\" too big"
-msgstr "argumento para função \"exp\" é muito grande"
+#: commands/copy.c:3468
+msgid "incorrect binary data format"
+msgstr "formato de dado binário incorreto"
 
-#: utils/adt/tsvector_parser.c:137
+#: commands/copy.c:3779 commands/indexcmds.c:846 commands/tablecmds.c:1293
+#: commands/tablecmds.c:2148 parser/parse_expr.c:764
+#: utils/adt/tsvector_op.c:1417
 #, c-format
-msgid "syntax error in tsvector: \"%s\""
-msgstr "erro de sintaxe em tsvector: \"%s\""
+msgid "column \"%s\" does not exist"
+msgstr "coluna \"%s\" não existe"
 
-#: utils/adt/tsvector_parser.c:202
+#: commands/view.c:143
+#, fuzzy, c-format
+msgid "could not determine which collation to use for view column \"%s\""
+msgstr "não pôde determinar qual ordenação utilizar em coluna \"%s\" de visão"
+
+#: commands/view.c:145 commands/indexcmds.c:931 catalog/heap.c:560
+#: regex/regc_pg_locale.c:259 utils/adt/formatting.c:1520
+#: utils/adt/formatting.c:1570 utils/adt/formatting.c:1641
+#: utils/adt/formatting.c:1691 utils/adt/formatting.c:1774
+#: utils/adt/formatting.c:1836 utils/adt/varlena.c:1315 utils/adt/like.c:212
+#: utils/adt/selfuncs.c:4914 utils/adt/selfuncs.c:5031
+msgid "Use the COLLATE clause to set the collation explicitly."
+msgstr "Utilize a cláusula COLLATE para definir a ordenação explicitamente."
+
+#: commands/view.c:158
+msgid "view must have at least one column"
+msgstr "visão deve ter pelo menos uma coluna"
+
+#: commands/view.c:181 commands/tablecmds.c:214 commands/tablecmds.c:2253
+#: commands/tablecmds.c:2510 commands/tablecmds.c:3840
+#: commands/tablecmds.c:8990 catalog/objectaddress.c:412
 #, c-format
-msgid "there is no escaped character: \"%s\""
-msgstr "não há caracter com escape: \"%s\""
+msgid "\"%s\" is not a view"
+msgstr "\"%s\" não é uma visão"
 
-#: utils/adt/tsvector_parser.c:319
+#: commands/view.c:283 commands/view.c:295
+msgid "cannot drop columns from view"
+msgstr "não pode apagar colunas da visão"
+
+#: commands/view.c:300
 #, c-format
-msgid "wrong position info in tsvector: \"%s\""
-msgstr "informação incorreta sobre posição no tsvector: \"%s\""
+msgid "cannot change name of view column \"%s\" to \"%s\""
+msgstr "não pode mudar nome de coluna da visão \"%s\" para \"%s\""
 
-#: utils/adt/windowfuncs.c:243
-msgid "argument of ntile must be greater than zero"
-msgstr "argumento de ntile deve ser maior do que zero"
+#: commands/view.c:308
+#, c-format
+msgid "cannot change data type of view column \"%s\" from %s to %s"
+msgstr "não pode mudar tipo de dado de coluna da visão \"%s\" de %s para %s"
 
-#: utils/adt/windowfuncs.c:465
-msgid "argument of nth_value must be greater than zero"
-msgstr "argumento de nth_value deve ser maior do que zero"
+#: commands/view.c:447
+msgid "views must not contain SELECT INTO"
+msgstr "visões não devem conter SELECT INTO"
 
-#: utils/adt/trigfuncs.c:41
-msgid "suppress_redundant_updates_trigger: must be called as trigger"
-msgstr "suppress_redundant_updates_trigger: deve ser chamado com gatilho"
+#: commands/view.c:451
+msgid "views must not contain data-modifying statements in WITH"
+msgstr "visões não devem conter comandos que modificam dados no WITH"
 
-#: utils/adt/trigfuncs.c:47
-msgid "suppress_redundant_updates_trigger: must be called on update"
-msgstr ""
-"suppress_redundant_updates_trigger: deve ser chamado durante atualização"
+#: commands/view.c:479
+msgid "CREATE VIEW specifies more column names than columns"
+msgstr "CREATE VIEW especificou mais nomes de colunas do que colunas"
 
-#: utils/adt/trigfuncs.c:53
-msgid "suppress_redundant_updates_trigger: must be called before update"
-msgstr ""
-"suppress_redundant_updates_trigger: deve ser chamado antes da atualização"
+#: commands/view.c:487
+#, fuzzy
+msgid "views cannot be unlogged because they do not have storage"
+msgstr "visões não podem ser unlogged porque elas não tem armazenamento"
 
-#: utils/adt/trigfuncs.c:59
-msgid "suppress_redundant_updates_trigger: must be called for each row"
-msgstr ""
-"suppress_redundant_updates_trigger: deve ser chamado para cada registro"
+#: commands/view.c:501
+#, c-format
+msgid "view \"%s\" will be a temporary view"
+msgstr "visão \"%s\" será uma visão temporária"
 
-#: utils/adt/char.c:169
-msgid "\"char\" out of range"
-msgstr "\"char\" fora do intervalo"
+#: commands/constraint.c:59 utils/adt/ri_triggers.c:3080
+#, c-format
+msgid "function \"%s\" was not called by trigger manager"
+msgstr "função \"%s\" não foi chamada pelo gerenciador de gatilhos"
 
-#: utils/fmgr/dfmgr.c:125
+#: commands/constraint.c:66 utils/adt/ri_triggers.c:3089
 #, c-format
-msgid "could not find function \"%s\" in file \"%s\""
-msgstr "não pôde encontrar função \"%s\" no arquivo \"%s\""
+msgid "function \"%s\" must be fired AFTER ROW"
+msgstr "função \"%s\" deve ser disparada no AFTER ROW"
 
-#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
+#: commands/constraint.c:80 utils/adt/ri_triggers.c:3110
 #, c-format
-msgid "could not access file \"%s\": %m"
-msgstr "não pôde acessar arquivo \"%s\": %m"
+msgid "function \"%s\" must be fired for INSERT or UPDATE"
+msgstr "função \"%s\" deve ser disparada pelo INSERT ou UPDATE"
 
-#: utils/fmgr/dfmgr.c:242
+#: commands/extension.c:149 commands/extension.c:2459
 #, c-format
-msgid "could not load library \"%s\": %s"
-msgstr "não pôde carregar biblioteca \"%s\": %s"
+msgid "extension \"%s\" does not exist"
+msgstr "extensão \"%s\" não existe"
 
-#: utils/fmgr/dfmgr.c:274
+#: commands/extension.c:248 commands/extension.c:257 commands/extension.c:269
+#: commands/extension.c:279
 #, c-format
-msgid "incompatible library \"%s\": missing magic block"
-msgstr "biblioteca \"%s\" é incompatível: faltando bloco mágico"
+msgid "invalid extension name: \"%s\""
+msgstr "nome de extensão é inválido: \"%s\""
 
-#: utils/fmgr/dfmgr.c:276
-msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
+#: commands/extension.c:249
+msgid "Extension names must not be empty."
+msgstr "Nomes de extensão não devem ser vazios."
+
+#: commands/extension.c:258
+msgid "Extension names must not contain \"--\"."
+msgstr "Nomes de extensão não devem conter \"--\"."
+
+#: commands/extension.c:270
+msgid "Extension names must not begin or end with \"-\"."
+msgstr "Nomes de extensão não devem começar ou terminar com \"-\"."
+
+#: commands/extension.c:280
+msgid "Extension names must not contain directory separator characters."
 msgstr ""
-"Bibliotecas de extensões são obrigadas a utilizar o macro PG_MODULE_MAGIC."
+"Nomes de extensões não devem conter caracteres separadores de diretórios."
 
-#: utils/fmgr/dfmgr.c:312
+#: commands/extension.c:295 commands/extension.c:304 commands/extension.c:313
+#: commands/extension.c:323
 #, c-format
-msgid "incompatible library \"%s\": version mismatch"
-msgstr "biblioteca \"%s\" é incompatível: versão não corresponde"
+msgid "invalid extension version name: \"%s\""
+msgstr "nome de versão da extensão é inválido: \"%s\""
 
-#: utils/fmgr/dfmgr.c:314
-#, c-format
-msgid "Server is version %d.%d, library is version %d.%d."
-msgstr "Servidor tem versão %d,%d, biblioteca tem versão %d.%d."
+#: commands/extension.c:296
+msgid "Version names must not be empty."
+msgstr "Nomes de versão não devem ser vazios."
 
-#: utils/fmgr/dfmgr.c:333
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr "Servidor tem FUNC_MAX_ARGS = %d, biblioteca tem %d."
+#: commands/extension.c:305
+msgid "Version names must not contain \"--\"."
+msgstr "Nomes de versão não devem conter \"--\"."
 
-#: utils/fmgr/dfmgr.c:342
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr "Servidor tem INDEX_MAX_KEYS = %d, biblioteca tem %d."
+#: commands/extension.c:314
+msgid "Version names must not begin or end with \"-\"."
+msgstr "Nomes de versão não devem começar ou terminar com \"-\"."
 
-#: utils/fmgr/dfmgr.c:351
-#, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr "Servidor tem NAMEDATALEN = %d, biblioteca tem %d."
+#: commands/extension.c:324
+msgid "Version names must not contain directory separator characters."
+msgstr "Nomes de versão não devem conter caracteres separadores de diretórios."
 
-#: utils/fmgr/dfmgr.c:360
+#: commands/extension.c:474
 #, c-format
-msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
-msgstr "Servidor tem FLOAT4PASSBYVAL = %s, biblioteca tem %s."
+msgid "could not open extension control file \"%s\": %m"
+msgstr "não pôde abrir arquivo de controle da extensão \"%s\": %m"
 
-#: utils/fmgr/dfmgr.c:369
+#: commands/extension.c:495 commands/extension.c:505
 #, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr "Servidor tem FLOAT8PASSBYVAL = %s, biblioteca tem %s."
+msgid "parameter \"%s\" cannot be set in a secondary extension control file"
+msgstr ""
+"parâmetro \"%s\" não pode ser definido em um segundo arquivo de controle da "
+"extensão"
 
-#: utils/fmgr/dfmgr.c:376
-msgid "Magic block has unexpected length or padding difference."
-msgstr "Bloco mágico tem tamanho inesperado ou diferença no enchimento."
+#: commands/extension.c:527 commands/extension.c:535
+#: access/transam/xlog.c:5283 access/transam/xlog.c:5374
+#: access/transam/xlog.c:5385 utils/misc/guc.c:5309
+#, c-format
+msgid "parameter \"%s\" requires a Boolean value"
+msgstr "parâmetro \"%s\" requer um valor booleano"
 
-#: utils/fmgr/dfmgr.c:379
+#: commands/extension.c:544
 #, c-format
-msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "biblioteca \"%s\" é incompatível: bloco mágico não corresponde"
+msgid "\"%s\" is not a valid encoding name"
+msgstr "\"%s\" não é um nome de codificação válido"
 
-#: utils/fmgr/dfmgr.c:545
+#: commands/extension.c:558
 #, c-format
-msgid "access to library \"%s\" is not allowed"
-msgstr "acesso a biblioteca \"%s\" não é permitido"
+msgid "parameter \"%s\" must be a list of extension names"
+msgstr "parâmetro \"%s\" deve ser uma lista de nomes de extensões"
 
-#: utils/fmgr/dfmgr.c:572
+#: commands/extension.c:565
 #, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "nome de macro é inválido no caminho de biblioteca dinâmica: %s"
+msgid "unrecognized parameter \"%s\" in file \"%s\""
+msgstr "parâmetro \"%s\" desconhecido em arquivo \"%s\""
 
-#: utils/fmgr/dfmgr.c:617
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "componente de tamanho zero no parâmetro \"dynamic_library_path\""
+#: commands/extension.c:574
+msgid "parameter \"schema\" cannot be specified when \"relocatable\" is true"
+msgstr ""
+"parâmetro \"schema\" não pode ser especificado quando \"relocatable\" é "
+"verdadeiro"
 
-#: utils/fmgr/dfmgr.c:636
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+#: commands/extension.c:726
+msgid ""
+"transaction control statements are not allowed within an extension script"
 msgstr ""
-"componente no parâmetro \"dynamic_library_path\" não é um caminho absoluto"
+"comandos de controle de transação não são permitidos dentro do script da "
+"extensão"
 
-#: utils/fmgr/fmgr.c:264
+#: commands/extension.c:794
 #, c-format
-msgid "internal function \"%s\" is not in internal lookup table"
-msgstr "função interna \"%s\" não está na tabela de busca interna"
+msgid "permission denied to create extension \"%s\""
+msgstr "permissão negada ao criar extensão \"%s\""
 
-#: utils/fmgr/fmgr.c:468
-#, c-format
-msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "versão %d de API informada pela função \"%s\" é desconhecida"
+#: commands/extension.c:796
+msgid "Must be superuser to create this extension."
+msgstr "Deve ser super-usuário para criar uma extensão."
 
-#: utils/fmgr/fmgr.c:839 utils/fmgr/fmgr.c:2071
+#: commands/extension.c:800
 #, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr "função %u tem muitos argumentos (%d, máximo é %d)"
+msgid "permission denied to update extension \"%s\""
+msgstr "permissão negada ao atualizar extensão \"%s\""
 
-#: utils/fmgr/funcapi.c:354
+#: commands/extension.c:802
+msgid "Must be superuser to update this extension."
+msgstr "Deve ser super-usuário para atualizar esta extensão."
+
+#: commands/extension.c:1084
 #, c-format
 msgid ""
-"could not determine actual result type for function \"%s\" declared to "
-"return type %s"
+"extension \"%s\" has no update path from version \"%s\" to version \"%s\""
 msgstr ""
-"não pôde determinar tipo de resultado para função \"%s\" declarada para "
-"retornar tipo %s"
+"extensão \"%s\" não possui caminho de atualização da versão \"%s\" para "
+"versão \"%s\""
 
-#: utils/fmgr/funcapi.c:1187 utils/fmgr/funcapi.c:1218
-msgid "number of aliases does not match number of columns"
-msgstr "número de aliases não corresponde ao número de colunas"
+#: commands/extension.c:1211
+#, c-format
+msgid "extension \"%s\" already exists, skipping"
+msgstr "extensão \"%s\" já existe, ignorando"
 
-#: utils/fmgr/funcapi.c:1212
-msgid "no column alias was provided"
-msgstr "nenhum aliás de coluna foi fornecido"
+#: commands/extension.c:1218
+#, c-format
+msgid "extension \"%s\" already exists"
+msgstr "extensão \"%s\" já existe"
 
-#: utils/fmgr/funcapi.c:1236
-msgid "could not determine row description for function returning record"
-msgstr ""
-"não pôde determinar descrição de registro para função que retorna record"
+#: commands/extension.c:1229
+msgid "nested CREATE EXTENSION is not supported"
+msgstr "CREATE EXTENSION aninhado não é suportado"
 
-#: utils/init/postinit.c:197 postmaster/postmaster.c:1074
-msgid "could not load pg_hba.conf"
-msgstr "não pôde carregar pg_hba.conf"
+#: commands/extension.c:1284 commands/extension.c:2519
+msgid "version to install must be specified"
+msgstr "versão a ser instalada deve ser especificada"
 
-#: utils/init/postinit.c:229
+#: commands/extension.c:1301
 #, c-format
-msgid "replication connection authorized: user=%s host=%s port=%s"
-msgstr "conexão para replicação autorizada: usuário=%s máquina=%s porta=%s"
+msgid "FROM version must be different from installation target version \"%s\""
+msgstr "versão do FROM deve ser diferente da versão da instalação \"%s\""
 
-#: utils/init/postinit.c:235
+#: commands/extension.c:1356
 #, c-format
-msgid "replication connection authorized: user=%s host=%s"
-msgstr "conexão para replicação autorizada: usuário=%s máquina=%s"
+msgid "extension \"%s\" must be installed in schema \"%s\""
+msgstr "extensão \"%s\" deve ser instalada no esquema \"%s\""
 
-#: utils/init/postinit.c:241
+#: commands/extension.c:1435 commands/extension.c:2660
 #, c-format
-msgid "connection authorized: user=%s database=%s"
-msgstr "conexão autorizada: usuário=%s banco de dados=%s"
+msgid "required extension \"%s\" is not installed"
+msgstr "extensão requerida \"%s\" não está instalada"
+
+#: commands/extension.c:1596 commands/extension.c:2273
+#: catalog/objectaddress.c:289
+msgid "extension name cannot be qualified"
+msgstr "nome da extensão não pode ser qualificado"
 
-#: utils/init/postinit.c:271
+#: commands/extension.c:1604
 #, c-format
-msgid "database \"%s\" has disappeared from pg_database"
-msgstr "banco de dados \"%s\" desapareceu de pg_database"
+msgid "extension \"%s\" does not exist, skipping"
+msgstr "extensão \"%s\" não existe, ignorando"
 
-#: utils/init/postinit.c:273
+#: commands/extension.c:1659
 #, c-format
-msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "Banco de dados com OID %u parece pertencer a \"%s\"."
+msgid "cannot drop extension \"%s\" because it is being modified"
+msgstr "não pode remover extensão \"%s\" porque ela está sendo modificada"
+
+#: commands/extension.c:2129
+msgid ""
+"pg_extension_config_dump() can only be called from an SQL script executed by "
+"CREATE EXTENSION"
+msgstr ""
+"pg_extension_config_dump() só pode ser chamada de um script SQL executado "
+"por CREATE EXTENSION"
 
-#: utils/init/postinit.c:293
+#: commands/extension.c:2141
 #, c-format
-msgid "database \"%s\" is not currently accepting connections"
-msgstr "banco de dados \"%s\" não está aceitando conexões"
+msgid "OID %u does not refer to a table"
+msgstr "OID %u não se refere a uma tabela"
 
-#: utils/init/postinit.c:306
+#: commands/extension.c:2146
 #, c-format
-msgid "permission denied for database \"%s\""
-msgstr "permissão negada para banco de dados \"%s\""
+msgid "table \"%s\" is not a member of the extension being created"
+msgstr "tabela \"%s\" não é um membro da extensão que está sendo criada"
 
-#: utils/init/postinit.c:307
-msgid "User does not have CONNECT privilege."
-msgstr "Usuário não tem privilégio CONNECT."
+#: commands/extension.c:2329 commands/extension.c:2388
+#, c-format
+msgid "extension \"%s\" does not support SET SCHEMA"
+msgstr "extensão \"%s\" não suporta SET SCHEMA"
 
-#: utils/init/postinit.c:324
+#: commands/extension.c:2390
 #, c-format
-msgid "too many connections for database \"%s\""
-msgstr "muitas conexões para banco de dados \"%s\""
+msgid "%s is not in the extension's schema \"%s\""
+msgstr "%s não está no esquema da extensão \"%s\""
 
-#: utils/init/postinit.c:346 utils/init/postinit.c:353
-msgid "database locale is incompatible with operating system"
-msgstr ""
-"configuração regional do banco de dados é incompatível com o sistema "
-"operacional"
+#: commands/extension.c:2439
+msgid "nested ALTER EXTENSION is not supported"
+msgstr "ALTER EXTENSION aninhado não é suportado"
 
-#: utils/init/postinit.c:347
+#: commands/extension.c:2530
 #, c-format
-msgid ""
-"The database was initialized with LC_COLLATE \"%s\",  which is not "
-"recognized by setlocale()."
-msgstr ""
-"O banco de dados foi inicializado com LC_COLLATE \"%s\", que não é "
-"reconhecido pelo setlocale()."
+msgid "version \"%s\" of extension \"%s\" is already installed"
+msgstr "versao \"%s\" da extensão \"%s\" já está instalada"
 
-#: utils/init/postinit.c:349 utils/init/postinit.c:356
-msgid ""
-"Recreate the database with another locale or install the missing locale."
-msgstr ""
-"Recrie o banco de dados com outra configuração regional ou instale a "
-"configuração regional que falta."
-
-#: utils/init/postinit.c:354
+#: commands/extension.c:2753 catalog/pg_depend.c:164
 #, c-format
-msgid ""
-"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
-"by setlocale()."
-msgstr ""
-"O banco de dados foi inicializado com LC_CTYPE \"%s\", que não é reconhecido "
-"pelo setlocale()."
+msgid "%s is already a member of extension \"%s\""
+msgstr "role \"%s\" já é um membro da extensão \"%s\""
 
-#: utils/init/postinit.c:608
-msgid "no roles are defined in this database system"
-msgstr "nenhuma role está definida nesse sistema de banco de dados"
+#: commands/extension.c:2770
+#, c-format
+msgid "%s is not a member of extension \"%s\""
+msgstr "%s não é um membro da extensão \"%s\""
 
-#: utils/init/postinit.c:609
+#: commands/foreigncmds.c:135 commands/foreigncmds.c:144
 #, c-format
-msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
-msgstr "Você deve executar imediatamente CREATE USER \"%s\" SUPERUSER;."
+msgid "option \"%s\" not found"
+msgstr "opção \"%s\" não foi encontrada"
 
-#: utils/init/postinit.c:632
-msgid "new replication connections are not allowed during database shutdown"
-msgstr ""
-"novas conexões para replicaão não são permitidas durante desligamento de "
-"banco de dados"
+#: commands/foreigncmds.c:154
+#, c-format
+msgid "option \"%s\" provided more than once"
+msgstr "opção \"%s\" especificada mais de uma vez"
 
-#: utils/init/postinit.c:636
-msgid "must be superuser to connect during database shutdown"
-msgstr ""
-"deve ser super-usuário para se conectar durante desligamento de banco de "
-"dados"
+#: commands/foreigncmds.c:224 commands/foreigncmds.c:232
+#, c-format
+msgid "permission denied to change owner of foreign-data wrapper \"%s\""
+msgstr "permissão negada ao mudar dono do adaptador de dados externos \"%s\""
 
-#: utils/init/postinit.c:650
-#, fuzzy
-msgid ""
-"remaining connection slots are reserved for non-replication superuser "
-"connections"
+#: commands/foreigncmds.c:226
+msgid "Must be superuser to change owner of a foreign-data wrapper."
 msgstr ""
-"lacunas de conexão remanescentes são reservadas para conexões de super-"
-"usuário que não sejam usadas para replicação"
+"Deve ser super-usuário para mudar dono de um adaptador de dados externos."
 
-#: utils/init/postinit.c:665
-msgid "must be superuser to start walsender"
-msgstr "deve ser super-usuário para iniciar walsender"
+#: commands/foreigncmds.c:234
+msgid "The owner of a foreign-data wrapper must be a superuser."
+msgstr "O dono de um adaptador de dados externos deve ser um super-usuário."
 
-#: utils/init/postinit.c:725
+#: commands/foreigncmds.c:241 commands/foreigncmds.c:564
+#: commands/foreigncmds.c:712 foreign/foreign.c:524
 #, c-format
-msgid "database %u does not exist"
-msgstr "banco de dados %u não existe"
+msgid "foreign-data wrapper \"%s\" does not exist"
+msgstr "adaptador de dados externos \"%s\" não existe"
 
-#: utils/init/postinit.c:777
-msgid "It seems to have just been dropped or renamed."
-msgstr "Parece ter sido removido ou renomeado."
+#: commands/foreigncmds.c:284 commands/foreigncmds.c:890
+#: commands/foreigncmds.c:978 commands/foreigncmds.c:1262
+#: foreign/foreign.c:544
+#, c-format
+msgid "server \"%s\" does not exist"
+msgstr "servidor \"%s\" não existe"
 
-#: utils/init/postinit.c:795
+#: commands/foreigncmds.c:346
 #, c-format
-msgid "The database subdirectory \"%s\" is missing."
-msgstr "O subdiretório do banco de dados \"%s\" não foi encontrado."
+msgid "function %s must return type \"fdw_handler\""
+msgstr "função %s deve retornar tipo \"fdw_handler\""
 
-#: utils/init/postinit.c:800
+#: commands/foreigncmds.c:441
 #, c-format
-msgid "could not access directory \"%s\": %m"
-msgstr "não pôde acessar diretório \"%s\": %m"
+msgid "permission denied to create foreign-data wrapper \"%s\""
+msgstr "permissão negada ao criar adaptador de dados externos \"%s\""
+
+#: commands/foreigncmds.c:443
+msgid "Must be superuser to create a foreign-data wrapper."
+msgstr "Deve ser super-usuário para criar uma adaptador de dados externos."
 
-#: utils/init/miscinit.c:114
+#: commands/foreigncmds.c:454
 #, c-format
-msgid "could not change directory to \"%s\": %m"
-msgstr "não pôde mudar diretório para \"%s\": %m"
+msgid "foreign-data wrapper \"%s\" already exists"
+msgstr "adaptador de dados externos \"%s\" já existe"
 
-#: utils/init/miscinit.c:380 utils/misc/guc.c:4846
+#: commands/foreigncmds.c:554
 #, c-format
-msgid "cannot set parameter \"%s\" within security-restricted operation"
+msgid "permission denied to alter foreign-data wrapper \"%s\""
+msgstr "permissão negada ao alterar adaptador de dados externos \"%s\""
+
+#: commands/foreigncmds.c:556
+msgid "Must be superuser to alter a foreign-data wrapper."
+msgstr "Deve ser super-usuário para alterar um adaptador de dados externos."
+
+#: commands/foreigncmds.c:587
+msgid ""
+"changing the foreign-data wrapper handler can change behavior of existing "
+"foreign tables"
 msgstr ""
-"não pode definir parâmetro \"%s\" em operação com restrição de segurança"
+"mudar o manipulador do adaptador de dados externos pode mudar o "
+"comportamento de tabelas externas existentes"
 
-#: utils/init/miscinit.c:413 utils/cache/lsyscache.c:2669 commands/user.c:579
-#: commands/user.c:767 commands/user.c:851 commands/user.c:1002
-#: commands/variable.c:735 commands/variable.c:845
-#, c-format
-msgid "role \"%s\" does not exist"
-msgstr "role \"%s\" não existe"
+#: commands/foreigncmds.c:601
+msgid ""
+"changing the foreign-data wrapper validator can cause the options for "
+"dependent objects to become invalid"
+msgstr ""
+"mudar o validador do adaptador de dados externos pode tornar inválidas as "
+"opções para objetos dependentes"
 
-#: utils/init/miscinit.c:441
+#: commands/foreigncmds.c:703
 #, c-format
-msgid "role \"%s\" is not permitted to log in"
-msgstr "role \"%s\" não tem permissão para entrar"
+msgid "permission denied to drop foreign-data wrapper \"%s\""
+msgstr "permissão negada ao remover adaptador de dados externos \"%s\""
 
-#: utils/init/miscinit.c:459
-#, c-format
-msgid "too many connections for role \"%s\""
-msgstr "muitas conexões para role \"%s\""
+#: commands/foreigncmds.c:705
+msgid "Must be superuser to drop a foreign-data wrapper."
+msgstr "Deve ser super-usuário para remover um adaptador de dados externos."
 
-#: utils/init/miscinit.c:519
-msgid "permission denied to set session authorization"
-msgstr "permissão negada ao definir autorização de sessão"
+#: commands/foreigncmds.c:717
+#, c-format
+msgid "foreign-data wrapper \"%s\" does not exist, skipping"
+msgstr "adaptador de dados externos \"%s\" não existe, ignorando"
 
-#: utils/init/miscinit.c:599
+#: commands/foreigncmds.c:786
 #, c-format
-msgid "invalid role OID: %u"
-msgstr "OID de role é inválido: %u"
+msgid "server \"%s\" already exists"
+msgstr "servidor \"%s\" já existe"
 
-#: utils/init/miscinit.c:731
+#: commands/foreigncmds.c:982
 #, c-format
-msgid "could not create lock file \"%s\": %m"
-msgstr "não pôde criar arquivo de bloqueio \"%s\": %m"
+msgid "server \"%s\" does not exist, skipping"
+msgstr "servidor \"%s\" não existe, ignorando"
 
-#: utils/init/miscinit.c:745
+#: commands/foreigncmds.c:1087
 #, c-format
-msgid "could not open lock file \"%s\": %m"
-msgstr "não pôde abrir arquivo de bloqueio \"%s\": %m"
+msgid "user mapping \"%s\" already exists for server %s"
+msgstr "mapeamento de usuários \"%s\" já existe para servidor %s"
 
-#: utils/init/miscinit.c:751
+#: commands/foreigncmds.c:1173 commands/foreigncmds.c:1278
 #, c-format
-msgid "could not read lock file \"%s\": %m"
-msgstr "não pôde ler arquivo de bloqueio \"%s\": %m"
+msgid "user mapping \"%s\" does not exist for the server"
+msgstr "mapeamento de usuários \"%s\" não existe para o servidor"
 
-#: utils/init/miscinit.c:799
+#: commands/foreigncmds.c:1265
+msgid "server does not exist, skipping"
+msgstr "servidor não existe, ignorando"
+
+#: commands/foreigncmds.c:1283
 #, c-format
-msgid "lock file \"%s\" already exists"
-msgstr "arquivo de bloqueio \"%s\" já existe"
+msgid "user mapping \"%s\" does not exist for the server, skipping"
+msgstr "mapeamento de usuários \"%s\" não existe para o servidor, ignorando"
+
+#: commands/variable.c:59 commands/tablespace.c:1121 catalog/namespace.c:3557
+#: replication/syncrep.c:656 utils/misc/guc.c:8181
+msgid "List syntax is invalid."
+msgstr "Sintaxe de lista é inválida."
 
-#: utils/init/miscinit.c:803
+#: commands/variable.c:160 utils/misc/guc.c:8205
 #, c-format
-msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
-msgstr ""
-"Outro postgres (PID %d) está executando sob o diretório de dados \"%s\"?"
+msgid "Unrecognized key word: \"%s\"."
+msgstr "Palavra chave desconhecida: \"%s\"."
+
+#: commands/variable.c:172
+msgid "Conflicting \"datestyle\" specifications."
+msgstr "Especificações conflitantes de \"datestyle\""
 
-#: utils/init/miscinit.c:805
+#: commands/variable.c:328
+msgid "Cannot specify months in time zone interval."
+msgstr "Não pode especificar meses em intervalo de zona horária."
+
+#: commands/variable.c:334
+msgid "Cannot specify days in time zone interval."
+msgstr "Não pode especificar dias em intervalo de zona horária."
+
+#: commands/variable.c:378 commands/variable.c:517
 #, c-format
-msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgid "time zone \"%s\" appears to use leap seconds"
+msgstr "zona horária \"%s\" parece utilizar segundos intercalados"
+
+#: commands/variable.c:380 commands/variable.c:519
+msgid "PostgreSQL does not support leap seconds."
+msgstr "PostgreSQL não suporta segundos intercalados."
+
+#: commands/variable.c:582
+msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr ""
-"Outro postmaster (PID %d) está executando sob o diretório de dados \"%s\"?"
+"não pode definir modo leitura-escrita da transação dentro de uma transação "
+"somente leitura"
 
-#: utils/init/miscinit.c:808
-#, c-format
-msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr "Outro postgres (PID %d) está utilizando arquivo de soquete \"%s\"?"
+#: commands/variable.c:589
+msgid "transaction read-write mode must be set before any query"
+msgstr ""
+"modo leitura-escrita de transação deve ser definido antes de qualquer "
+"consulta"
 
-#: utils/init/miscinit.c:810
-#, c-format
-msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr "Outro postmaster (PID %d) está utilizando arquivo de soquete \"%s\"?"
+#: commands/variable.c:595
+msgid "cannot set transaction read-write mode during recovery"
+msgstr "não pode definir modo leitura-escrita de transação durante recuperação"
 
-#: utils/init/miscinit.c:841
-#, c-format
-msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+#: commands/variable.c:642
+msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr ""
-"bloco de memória compartilhada existente (chave %lu, ID %lu) ainda está em "
-"uso"
+"SET TRANSACTION ISOLATION LEVEL deve ser chamado antes de qualquer consulta"
 
-#: utils/init/miscinit.c:844
-#, c-format
-msgid ""
-"If you're sure there are no old server processes still running, remove the "
-"shared memory block or just delete the file \"%s\"."
+#: commands/variable.c:649
+msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
 msgstr ""
-"Se você tem certeza que não há processos servidor antigos sendo executados, "
-"remova o bloco de memória compartilhada ou apague o arquivo \"%s\"."
+"SET TRANSACTION ISOLATION LEVEL não deve ser chamado em uma subtransação"
 
-#: utils/init/miscinit.c:861
-#, c-format
-msgid "could not remove old lock file \"%s\": %m"
-msgstr "não pôde remover arquivo de bloqueio antigo \"%s\": %m"
+#: commands/variable.c:655
+msgid "cannot use serializable mode in a hot standby"
+msgstr "não pode utilizar modo serializável em um servidor em espera ativo"
 
-#: utils/init/miscinit.c:863
+#: commands/variable.c:656
+msgid "You can use REPEATABLE READ instead."
+msgstr "Você pode utilizar REPEATABLE READ ao invés disso."
+
+#: commands/variable.c:704
 msgid ""
-"The file seems accidentally left over, but it could not be removed. Please "
-"remove the file by hand and try again."
+"SET TRANSACTION [NOT] DEFERRABLE cannot be called within a subtransaction"
 msgstr ""
-"O arquivo parece ter sido deixado acidentalmente, mas ele não pôde ser "
-"removido. Por favor remova o arquivo manualmente e tente novamente."
+"SET TRANSACTION [NOT] DEFERRABLE não pode ser chamado em uma subtransação"
 
-#: utils/init/miscinit.c:885 utils/init/miscinit.c:896
-#: utils/init/miscinit.c:906
-#, c-format
-msgid "could not write lock file \"%s\": %m"
-msgstr "não pôde escrever no arquivo de bloqueio \"%s\": %m"
+#: commands/variable.c:710
+msgid "SET TRANSACTION [NOT] DEFERRABLE must be called before any query"
+msgstr ""
+"SET TRANSACTION [NOT] DEFERRABLE deve ser chamado antes de qualquer consulta"
 
-#: utils/init/miscinit.c:1005 utils/init/miscinit.c:1118
-#: utils/error/elog.c:1403 access/transam/xlog.c:2441
-#: access/transam/xlog.c:4113 access/transam/xlog.c:4207
-#: access/transam/xlog.c:4305 storage/file/copydir.c:165
-#: storage/file/copydir.c:255 storage/smgr/md.c:532 storage/smgr/md.c:785
+#: commands/variable.c:792
 #, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "não pôde abrir arquivo \"%s\": %m"
+msgid "Conversion between %s and %s is not supported."
+msgstr "conversão entre %s e %s não é suportada."
 
-#: utils/init/miscinit.c:1014 utils/misc/guc.c:7101 commands/copy.c:2217
-#, c-format
-msgid "could not read from file \"%s\": %m"
-msgstr "não pôde ler do arquivo \"%s\": %m"
+#: commands/variable.c:799
+msgid "Cannot change \"client_encoding\" now."
+msgstr "Não pode mudar \"client_encoding\" agora."
 
-#: utils/init/miscinit.c:1054 utils/init/miscinit.c:1063
-#: utils/init/miscinit.c:1070 utils/misc/guc.c:7008 utils/misc/guc.c:7033
-#: postmaster/postmaster.c:3637 postmaster/postmaster.c:3647
-#: access/transam/xlog.c:2355 access/transam/xlog.c:2488
-#: access/transam/xlog.c:4338 access/transam/xlog.c:4394 commands/copy.c:1316
-#: storage/file/copydir.c:197
+#: commands/variable.c:969
 #, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "não pôde escrever no arquivo \"%s\": %m"
+msgid "permission denied to set role \"%s\""
+msgstr "permissão negada ao definir role \"%s\""
 
-#: utils/init/miscinit.c:1112 utils/init/miscinit.c:1125
+#: commands/explain.c:153
 #, c-format
-msgid "\"%s\" is not a valid data directory"
-msgstr "\"%s\" não é um diretório de dados válido"
+msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
+msgstr "valor desconhecido para opção EXPLAIN \"%s\": \"%s\""
 
-#: utils/init/miscinit.c:1114
+#: commands/explain.c:159
 #, c-format
-msgid "File \"%s\" is missing."
-msgstr "Arquivo \"%s\" não foi encontrado."
+msgid "unrecognized EXPLAIN option \"%s\""
+msgstr "opção EXPLAIN desconhecida \"%s\""
 
-#: utils/init/miscinit.c:1127
-#, c-format
-msgid "File \"%s\" does not contain valid data."
-msgstr "Arquivo \"%s\" não contém dados válidos."
+#: commands/explain.c:166
+msgid "EXPLAIN option BUFFERS requires ANALYZE"
+msgstr "opção BUFFERS do EXPLAIN requer ANALYZE"
 
-#: utils/init/miscinit.c:1129
-msgid "You might need to initdb."
-msgstr "Você precisa executar o initdb."
+#: commands/analyze.c:153
+#, c-format
+msgid "skipping analyze of \"%s\" --- lock not available"
+msgstr "ignorando análise de \"%s\" --- bloqueio não está disponível"
 
-#: utils/init/miscinit.c:1136 access/transam/xlog.c:4570
-#: access/transam/xlog.c:4579 access/transam/xlog.c:4603
-#: access/transam/xlog.c:4610 access/transam/xlog.c:4617
-#: access/transam/xlog.c:4622 access/transam/xlog.c:4629
-#: access/transam/xlog.c:4636 access/transam/xlog.c:4643
-#: access/transam/xlog.c:4650 access/transam/xlog.c:4657
-#: access/transam/xlog.c:4664 access/transam/xlog.c:4673
-#: access/transam/xlog.c:4680 access/transam/xlog.c:4689
-#: access/transam/xlog.c:4696 access/transam/xlog.c:4705
-#: access/transam/xlog.c:4712
-msgid "database files are incompatible with server"
-msgstr "arquivos do banco de dados são incompatíveis com o servidor"
+#: commands/analyze.c:170
+#, c-format
+msgid "skipping \"%s\" --- only superuser can analyze it"
+msgstr "ignorando \"%s\" --- somente super-usuário pode analisá-la(o)"
 
-#: utils/init/miscinit.c:1137
+#: commands/analyze.c:174
 #, c-format
-msgid ""
-"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
-"not compatible with this version %s."
+msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
 msgstr ""
-"O diretório de dados foi inicializado pelo PostgreSQL versão %ld.%ld, que "
-"não é compatível com essa versão %s."
+"ignorando \"%s\" --- somente super-usuário ou dono de banco de dados pode "
+"analisá-la(o)"
 
-#: utils/init/miscinit.c:1185
+#: commands/analyze.c:178
 #, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "sintaxe de lista é inválida para parâmetro \"%s\""
+msgid "skipping \"%s\" --- only table or database owner can analyze it"
+msgstr ""
+"ignorando \"%s\" --- somente dono de tabela ou de banco de dados pode "
+"analisá-la(o)"
 
-#: utils/init/miscinit.c:1222
+#: commands/analyze.c:194
 #, c-format
-msgid "loaded library \"%s\""
-msgstr "biblioteca \"%s\" foi carregada"
+msgid "skipping \"%s\" --- cannot analyze non-tables or special system tables"
+msgstr ""
+"ignorando \"%s\" --- não pode analisar relações que não são tabelas ou "
+"tabelas especiais do sistema"
 
-#: utils/mb/wchar.c:1609
+#: commands/analyze.c:285
 #, c-format
-msgid "invalid byte sequence for encoding \"%s\": 0x%s"
-msgstr "sequência de bytes é inválida para codificação \"%s\": 0x%s"
+msgid "analyzing \"%s.%s\" inheritance tree"
+msgstr "analisando árvore da herança de \"%s.%s\""
 
-#: utils/mb/wchar.c:1638
+#: commands/analyze.c:290
 #, c-format
-msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
-msgstr "caracter 0x%s da codificação \"%s\" não tem equivalente em \"%s\""
+msgid "analyzing \"%s.%s\""
+msgstr "analisando \"%s.%s\""
 
-#: utils/mb/mbutils.c:241 commands/variable.c:665
+#: commands/analyze.c:598
 #, c-format
-msgid "conversion between %s and %s is not supported"
-msgstr "conversão entre %s e %s não é suportada"
+msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
+msgstr "análise automática da tabela \"%s.%s.%s\" uso do sistema: %s"
 
-#: utils/mb/mbutils.c:311
+#: commands/analyze.c:1238
 #, c-format
 msgid ""
-"default conversion function for encoding \"%s\" to \"%s\" does not exist"
+"\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
+"rows; %d rows in sample, %.0f estimated total rows"
 msgstr ""
-"função padrão de conversão da codificação \"%s\" para \"%s\" não existe"
+"\"%s\": processados %d de %u páginas, contendo %.0f registros vigentes e "
+"%.0f registros não vigentes; %d registros amostrados, %.0f registros totais "
+"estimados"
+
+#: commands/analyze.c:1499 executor/execQual.c:2734
+#, fuzzy
+msgid "could not convert row type"
+msgstr "não pôde converter tipo row"
 
-#: utils/mb/mbutils.c:335 utils/mb/mbutils.c:607
+#: commands/tablespace.c:158 commands/tablespace.c:175
+#: commands/tablespace.c:186 commands/tablespace.c:194
+#: commands/tablespace.c:603 storage/file/copydir.c:61
 #, c-format
-msgid "String of %d bytes is too long for encoding conversion."
-msgstr ""
-"Cadeia de caracteres de %d bytes é muito longa para conversão entre "
-"codificações."
+msgid "could not create directory \"%s\": %m"
+msgstr "não pôde criar diretório \"%s\": %m"
 
-#: utils/mb/mbutils.c:422
+#: commands/tablespace.c:205
 #, c-format
-msgid "invalid source encoding name \"%s\""
-msgstr "nome da codificação de origem \"%s\" é inválido"
+msgid "could not stat directory \"%s\": %m"
+msgstr "não pôde executar stat no diretório \"%s\": %m"
 
-#: utils/mb/mbutils.c:427
+#: commands/tablespace.c:214
 #, c-format
-msgid "invalid destination encoding name \"%s\""
-msgstr "nome da codificação de destino \"%s\" é inválido"
+msgid "\"%s\" exists but is not a directory"
+msgstr "\"%s\" existe mas não é um diretório"
 
-#: utils/mb/mbutils.c:539
+#: commands/tablespace.c:244
 #, c-format
-msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "valor de byte é inválido para codificação \"%s\": 0x%02x"
+msgid "permission denied to create tablespace \"%s\""
+msgstr "permissão negada ao criar tablespace \"%s\""
 
-#: utils/mb/mbutils.c:734
-msgid "invalid multibyte character for locale"
-msgstr "caracter multibyte é inválido para configuração regional"
+#: commands/tablespace.c:246
+msgid "Must be superuser to create a tablespace."
+msgstr "Deve ser super-usuário para criar uma tablespace."
 
-#: utils/mb/mbutils.c:735
-msgid ""
-"The server's LC_CTYPE locale is probably incompatible with the database "
-"encoding."
-msgstr ""
-"A configuração regional LC_TYPE do servidor é provavelmente incompatível com "
-"a codificação de banco de dados."
+#: commands/tablespace.c:262
+msgid "tablespace location cannot contain single quotes"
+msgstr "local da tablespace não pode conter aspas simples"
 
-#: utils/mb/encnames.c:485
-msgid "encoding name too long"
-msgstr "nome da codificação é muito longo"
+#: commands/tablespace.c:272
+msgid "tablespace location must be an absolute path"
+msgstr "local da tablespace deve ser um caminho absoluto"
 
-#: utils/mb/conv.c:509
+#: commands/tablespace.c:283
 #, c-format
-msgid "invalid encoding number: %d"
-msgstr "número de codificação é inválido: %d"
+msgid "tablespace location \"%s\" is too long"
+msgstr "local da tablespace \"%s\" é muito longo"
 
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#: commands/tablespace.c:293 commands/tablespace.c:829
 #, c-format
-msgid "unexpected encoding ID %d for WIN character sets"
-msgstr "ID de codificação %d é inesperado para conjuntos de caracteres WIN"
+msgid "unacceptable tablespace name \"%s\""
+msgstr "nome da tablespace \"%s\" é inaceitável"
 
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
-#, c-format
-msgid "unexpected encoding ID %d for ISO 8859 character sets"
-msgstr ""
-"ID de codificação %d é inesperado para conjuntos de caracteres ISO 8859"
+#: commands/tablespace.c:295 commands/tablespace.c:830
+msgid "The prefix \"pg_\" is reserved for system tablespaces."
+msgstr "O prefixo \"pg_\" é reservado para tablespaces do sistema."
 
-#: utils/mmgr/portalmem.c:207
+#: commands/tablespace.c:305 commands/tablespace.c:842
 #, c-format
-msgid "cursor \"%s\" already exists"
-msgstr "cursor \"%s\" já existe"
+msgid "tablespace \"%s\" already exists"
+msgstr "tablespace \"%s\" já existe"
 
-#: utils/mmgr/portalmem.c:211
+#: commands/tablespace.c:377 commands/tablespace.c:529
+msgid "tablespaces are not supported on this platform"
+msgstr "tablespaces não são suportadas nessa plataforma"
+
+#: commands/tablespace.c:415 commands/tablespace.c:813
+#: commands/tablespace.c:880 commands/tablespace.c:985
+#: commands/tablespace.c:1358
 #, c-format
-msgid "closing existing cursor \"%s\""
-msgstr "fechando cursor existente \"%s\""
+msgid "tablespace \"%s\" does not exist"
+msgstr "tablespace \"%s\" não existe"
 
-#: utils/mmgr/portalmem.c:422
+#: commands/tablespace.c:421
 #, c-format
-msgid "cannot drop active portal \"%s\""
-msgstr "não pode remover portal ativo \"%s\""
-
-#: utils/mmgr/portalmem.c:627
-msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
-msgstr ""
-"não pode executar PREPARE em uma transação que criou um cursor WITH HOLD"
+msgid "tablespace \"%s\" does not exist, skipping"
+msgstr "tablespace \"%s\" não existe, ignorando"
 
-#: utils/mmgr/aset.c:409
+#: commands/tablespace.c:486
 #, c-format
-msgid "Failed while creating memory context \"%s\"."
-msgstr "Falhou ao criar contexto de memória \"%s\"."
+msgid "tablespace \"%s\" is not empty"
+msgstr "tablespace \"%s\" não está vazia"
 
-#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:771 utils/mmgr/aset.c:977
+#: commands/tablespace.c:560
 #, c-format
-msgid "Failed on request of size %lu."
-msgstr "Falhou ao requisitar o tamanho %lu."
+msgid "directory \"%s\" does not exist"
+msgstr "diretório \"%s\" não existe"
 
-#: utils/misc/guc.c:476
-msgid "Ungrouped"
-msgstr "Desagrupado"
+#: commands/tablespace.c:561
+msgid "Create this directory for the tablespace before restarting the server."
+msgstr "Crie este diretório para a tablespace antes de reiniciar o servidor."
 
-#: utils/misc/guc.c:478
-msgid "File Locations"
-msgstr "Locais de Arquivos"
+#: commands/tablespace.c:566
+#, c-format
+msgid "could not set permissions on directory \"%s\": %m"
+msgstr "não pôde definir permissões do diretório \"%s\": %m"
 
-#: utils/misc/guc.c:480
-msgid "Connections and Authentication"
-msgstr "Conexões e Autenticação"
+#: commands/tablespace.c:598
+#, c-format
+msgid "directory \"%s\" already in use as a tablespace"
+msgstr "diretório \"%s\" já está em uso como uma tablespace"
 
-#: utils/misc/guc.c:482
-msgid "Connections and Authentication / Connection Settings"
-msgstr "Conexões e Autenticação / Configurações sobre Conexão"
+#: commands/tablespace.c:613 commands/tablespace.c:750
+#, c-format
+msgid "could not remove symbolic link \"%s\": %m"
+msgstr "não pôde remover link simbólico \"%s\": %m"
 
-#: utils/misc/guc.c:484
-msgid "Connections and Authentication / Security and Authentication"
-msgstr "Conexões e Autenticação / Segurança e Autenticação"
+#: commands/tablespace.c:623
+#, c-format
+msgid "could not create symbolic link \"%s\": %m"
+msgstr "não pôde criar link simbólico \"%s\": %m"
 
-#: utils/misc/guc.c:486
-msgid "Resource Usage"
-msgstr "Uso de Recursos"
+#: commands/tablespace.c:684 postmaster/postmaster.c:1166
+#: storage/file/copydir.c:67 storage/file/copydir.c:106 storage/file/fd.c:1624
+#: utils/misc/tzparser.c:323 utils/adt/misc.c:213 utils/adt/genfile.c:353
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "não pôde abrir diretório \"%s\": %m"
 
-#: utils/misc/guc.c:488
-msgid "Resource Usage / Memory"
-msgstr "Uso de Recursos / Memória"
+#: commands/tablespace.c:714 commands/tablespace.c:726
+#: commands/tablespace.c:742
+#, c-format
+msgid "could not remove directory \"%s\": %m"
+msgstr "não pôde remover diretório \"%s\": %m"
 
-#: utils/misc/guc.c:490
-msgid "Resource Usage / Kernel Resources"
-msgstr "Uso de Recursos / Recursos do Kernel"
+#: commands/tablespace.c:1039
+#, c-format
+msgid "Tablespace \"%s\" does not exist."
+msgstr "Tablespace \"%s\" não existe."
 
-#: utils/misc/guc.c:492
-msgid "Resource Usage / Cost-Based Vacuum Delay"
-msgstr "Uso de Recursos / Atraso de Limpeza Baseado em Custo"
+#: commands/tablespace.c:1450
+#, c-format
+msgid "tablespace %u is not empty"
+msgstr "tablespace %u não está vazia"
 
-#: utils/misc/guc.c:494
-msgid "Resource Usage / Background Writer"
-msgstr "Uso de Recursos / Escritor de Segundo Plano"
+#: commands/collationcmds.c:81
+#, c-format
+msgid "collation attribute \"%s\" not recognized"
+msgstr "atributo de ordenação \"%s\" desconhecido"
 
-#: utils/misc/guc.c:496
-msgid "Resource Usage / Asynchronous Behavior"
-msgstr "Uso de Recursos / Comportamento Assíncrono"
+#: commands/collationcmds.c:126
+msgid "parameter \"lc_collate\" must be specified"
+msgstr "parâmetro \"lc_collate\" deve ser especificado"
 
-#: utils/misc/guc.c:498
-msgid "Write-Ahead Log"
-msgstr "Log de Escrita Prévia"
+#: commands/collationcmds.c:131
+msgid "parameter \"lc_ctype\" must be specified"
+msgstr "parâmetro \"lc_type\" deve ser especificado"
 
-#: utils/misc/guc.c:500
-msgid "Write-Ahead Log / Settings"
-msgstr "Log de Escrita Prévia / Configurações"
+#: commands/collationcmds.c:177
+#, c-format
+msgid "collation \"%s\" does not exist, skipping"
+msgstr "ordenação \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:502
-msgid "Write-Ahead Log / Checkpoints"
-msgstr "Log de Escrita Prévia / Pontos de Controle"
+#: commands/collationcmds.c:237 commands/collationcmds.c:416
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" already exists in schema \"%s\""
+msgstr "ordenação \"%s\" para codificação \"%s\" já existe no esquema \"%s\""
 
-#: utils/misc/guc.c:504
-msgid "Write-Ahead Log / Archiving"
-msgstr "Log de Escrita Prévia / Arquivamento"
+#: commands/collationcmds.c:249 commands/collationcmds.c:428
+#, c-format
+msgid "collation \"%s\" already exists in schema \"%s\""
+msgstr "ordenação \"%s\" já existe no esquema \"%s\""
 
-#: utils/misc/guc.c:506
-#, fuzzy
-msgid "Write-Ahead Log / Streaming Replication"
-msgstr "Log de Escrita Prévia / Replicação"
+#: commands/proclang.c:93
+msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
+msgstr ""
+"utilizando informação de pg_pltemplate ao invés dos parâmetros de CREATE "
+"LANGUAGE"
 
-#: utils/misc/guc.c:508
-#, fuzzy
-msgid "Write-Ahead Log / Standby Servers"
-msgstr "Log de Escrita Prévia / Servidores de Espera"
+#: commands/proclang.c:103
+#, c-format
+msgid "must be superuser to create procedural language \"%s\""
+msgstr "deve ser super-usuário para criar linguagem procedural \"%s\""
 
-#: utils/misc/guc.c:510
-msgid "Query Tuning"
-msgstr "Ajuste de Consultas"
+#: commands/proclang.c:123 commands/proclang.c:279
+#, c-format
+msgid "function %s must return type \"language_handler\""
+msgstr "função %s deve retornar tipo \"language_handler\""
 
-#: utils/misc/guc.c:512
-msgid "Query Tuning / Planner Method Configuration"
-msgstr "Ajuste de Consultas / Configuração dos Métodos do Planejador"
+#: commands/proclang.c:243
+#, c-format
+msgid "unsupported language \"%s\""
+msgstr "linguagem \"%s\" não é suportada"
 
-#: utils/misc/guc.c:514
-msgid "Query Tuning / Planner Cost Constants"
-msgstr "Ajuste de Consultas / Constantes de Custo do Planejador"
+#: commands/proclang.c:245
+msgid "The supported languages are listed in the pg_pltemplate system catalog."
+msgstr ""
+"As linguagens suportadas estão listadas no catálogo do sistema pg_pltemplate."
 
-#: utils/misc/guc.c:516
-msgid "Query Tuning / Genetic Query Optimizer"
-msgstr "Ajuste de Consultas / Otimizador de Consultas Genéticas"
+#: commands/proclang.c:253
+msgid "must be superuser to create custom procedural language"
+msgstr "deve ser super-usuário para criar linguagem procedural personalizada"
 
-#: utils/misc/guc.c:518
-msgid "Query Tuning / Other Planner Options"
-msgstr "Ajuste de Consultas / Outras Opções do Planejador"
+#: commands/proclang.c:272
+#, c-format
+msgid ""
+"changing return type of function %s from \"opaque\" to \"language_handler\""
+msgstr ""
+"alterando tipo de retorno da função %s de \"opaque\" para \"language_handler"
+"\""
 
-#: utils/misc/guc.c:520
-msgid "Reporting and Logging"
-msgstr "Relatório e Registro"
+#: commands/proclang.c:357 commands/proclang.c:606
+#, c-format
+msgid "language \"%s\" already exists"
+msgstr "linguagem \"%s\" já existe"
 
-#: utils/misc/guc.c:522
-msgid "Reporting and Logging / Where to Log"
-msgstr "Relatório e Registro / Onde Registrar"
+#: commands/proclang.c:537
+#, c-format
+msgid "language \"%s\" does not exist, skipping"
+msgstr "linguagem \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:524
-msgid "Reporting and Logging / When to Log"
-msgstr "Relatório e Registro / Quando Registrar"
+#: commands/cluster.c:134 commands/cluster.c:372
+msgid "cannot cluster temporary tables of other sessions"
+msgstr "não pode agrupar tabelas temporárias de outras sessões"
 
-#: utils/misc/guc.c:526
-msgid "Reporting and Logging / What to Log"
-msgstr "Relatório e Registro / O que Registrar"
+#: commands/cluster.c:164
+#, c-format
+msgid "there is no previously clustered index for table \"%s\""
+msgstr "não há nenhum índice previamente agrupado na tabela \"%s\""
 
-#: utils/misc/guc.c:528
-msgid "Statistics"
-msgstr "Estatísticas"
+#: commands/cluster.c:178 commands/tablecmds.c:7673
+#, c-format
+msgid "index \"%s\" for table \"%s\" does not exist"
+msgstr "índice \"%s\" na tabela \"%s\" não existe"
 
-#: utils/misc/guc.c:530
-msgid "Statistics / Monitoring"
-msgstr "Estatísticas / Monitoramento"
+#: commands/cluster.c:361
+msgid "cannot cluster a shared catalog"
+msgstr "não pode agrupar um catálogo compartilhado"
 
-#: utils/misc/guc.c:532
-msgid "Statistics / Query and Index Statistics Collector"
-msgstr "Estatísticas / Coletor de Estatísticas de Consultas e �ndices"
+#: commands/cluster.c:376
+msgid "cannot vacuum temporary tables of other sessions"
+msgstr "não pode limpar tabelas temporárias de outras sessões"
 
-#: utils/misc/guc.c:534
-msgid "Autovacuum"
-msgstr "Limpeza Automática"
+#: commands/cluster.c:426
+#, c-format
+msgid "\"%s\" is not an index for table \"%s\""
+msgstr "\"%s\" não é um índice na tabela \"%s\""
 
-#: utils/misc/guc.c:536
-msgid "Client Connection Defaults"
-msgstr "Valores Padrão de Conexão"
+#: commands/cluster.c:434
+#, c-format
+msgid ""
+"cannot cluster on index \"%s\" because access method does not support "
+"clustering"
+msgstr ""
+"não pode agrupar índice \"%s\" porque o método de acesso não suporta "
+"agrupamento"
 
-#: utils/misc/guc.c:538
-msgid "Client Connection Defaults / Statement Behavior"
-msgstr "Valores Padrão de Conexão / Comportamento do Comando"
+#: commands/cluster.c:446
+#, c-format
+msgid "cannot cluster on partial index \"%s\""
+msgstr "não pode agrupar índice parcial \"%s\""
 
-#: utils/misc/guc.c:540
-msgid "Client Connection Defaults / Locale and Formatting"
-msgstr "Valores Padrão de Conexão / Configuração Regional e Formatação"
+#: commands/cluster.c:460
+#, c-format
+msgid "cannot cluster on invalid index \"%s\""
+msgstr "não pode agrupar por índice inválido \"%s\""
 
-#: utils/misc/guc.c:542
-msgid "Client Connection Defaults / Other Defaults"
-msgstr "Valores Padrão de Conexão / Outros Valores"
+#: commands/cluster.c:883
+#, c-format
+msgid "clustering \"%s.%s\" using index scan on \"%s\""
+msgstr "agrupando \"%s.%s\" utilizando busca por índice em \"%s\""
 
-#: utils/misc/guc.c:544
-msgid "Lock Management"
-msgstr "Gerência de Bloqueio"
+#: commands/cluster.c:889
+#, c-format
+msgid "clustering \"%s.%s\" using sequential scan and sort"
+msgstr "agrupando \"%s.%s\" utilizando busca sequencial e ordenação"
 
-#: utils/misc/guc.c:546
-msgid "Version and Platform Compatibility"
-msgstr "Compatibilidade de Versão e Plataforma"
+#: commands/cluster.c:1054
+#, c-format
+msgid ""
+"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
+msgstr ""
+"\"%s\": encontrados %.0f versões de registros removíveis e %.0f não-"
+"removíveis em %u páginas"
 
-#: utils/misc/guc.c:548
-msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
+#: commands/cluster.c:1058
+#, c-format
+msgid ""
+"%.0f dead row versions cannot be removed yet.\n"
+"%s."
 msgstr ""
-"Compatibilidade de Versão e Plataforma / Versões Anteriores do PostgreSQL"
+"%.0f versões de registros não vigentes não podem ser removidas ainda.\n"
+"%s."
 
-#: utils/misc/guc.c:550
-msgid "Version and Platform Compatibility / Other Platforms and Clients"
-msgstr "Compatibilidade de Versão e Plataforma / Outras Plataformas e Clientes"
+#: commands/indexcmds.c:163
+msgid "must specify at least one column"
+msgstr "deve especificar pelo menos uma coluna"
 
-#: utils/misc/guc.c:552
-msgid "Preset Options"
-msgstr "Opções Pré-Definidas"
+#: commands/indexcmds.c:167
+#, c-format
+msgid "cannot use more than %d columns in an index"
+msgstr "não pode utilizar mais do que %d colunas em um índice"
 
-#: utils/misc/guc.c:554
-msgid "Customized Options"
-msgstr "Opções Customizadas"
+#: commands/indexcmds.c:195
+#, c-format
+msgid "cannot create index on foreign table \"%s\""
+msgstr "não pode criar índice na tabela externa \"%s\""
 
-#: utils/misc/guc.c:556
-msgid "Developer Options"
-msgstr "Opções para Desenvolvedores"
+#: commands/indexcmds.c:210
+msgid "cannot create indexes on temporary tables of other sessions"
+msgstr "não pode criar índices em tabelas temporárias de outras sessões"
 
-#: utils/misc/guc.c:610
-msgid "Enables the planner's use of sequential-scan plans."
-msgstr "Habilita o uso de planos de busca sequencial pelo planejador."
+#: commands/indexcmds.c:265 commands/tablecmds.c:479 commands/tablecmds.c:7896
+msgid "only shared relations can be placed in pg_global tablespace"
+msgstr ""
+"somente relações compartilhadas podem ser armazenadas na tablespace pg_global"
 
-#: utils/misc/guc.c:618
-msgid "Enables the planner's use of index-scan plans."
-msgstr "Habilita o uso de planos de buscas por índices pelo planejador."
+#: commands/indexcmds.c:296
+msgid "substituting access method \"gist\" for obsolete method \"rtree\""
+msgstr "substituindo método de acesso \"gist\" pelo método obsoleto \"rtree\""
 
-#: utils/misc/guc.c:626
-msgid "Enables the planner's use of bitmap-scan plans."
-msgstr "Habilita o uso de planos de buscas por bitmaps pelo planejador."
+#: commands/indexcmds.c:313
+#, c-format
+msgid "access method \"%s\" does not support unique indexes"
+msgstr "método de acesso \"%s\" não suporta índices únicos"
 
-#: utils/misc/guc.c:634
-msgid "Enables the planner's use of TID scan plans."
-msgstr "Habilita o uso de planos de buscas por TID pelo planejador."
+#: commands/indexcmds.c:318
+#, c-format
+msgid "access method \"%s\" does not support multicolumn indexes"
+msgstr "método de acesso \"%s\" não suporta índices de múltiplas colunas"
 
-#: utils/misc/guc.c:642
-msgid "Enables the planner's use of explicit sort steps."
-msgstr "Habilita o uso de passos para ordenação explícita pelo planejador."
+#: commands/indexcmds.c:323
+#, c-format
+msgid "access method \"%s\" does not support exclusion constraints"
+msgstr "método de acesso \"%s\" não suporta restrições de exclusão"
 
-#: utils/misc/guc.c:650
-msgid "Enables the planner's use of hashed aggregation plans."
-msgstr "Habilita o uso de planos de agregação do tipo hash pelo planejador."
+#: commands/indexcmds.c:399
+#, c-format
+msgid "%s %s will create implicit index \"%s\" for table \"%s\""
+msgstr "%s %s criará índice implícito \"%s\" na tabela \"%s\""
 
-#: utils/misc/guc.c:658
-msgid "Enables the planner's use of materialization."
-msgstr "Habilita o uso de materialização pelo planejador."
+#: commands/indexcmds.c:763
+msgid "cannot use subquery in index predicate"
+msgstr "não pode utilizar subconsulta em predicado de índice"
 
-#: utils/misc/guc.c:666
-msgid "Enables the planner's use of nested-loop join plans."
-msgstr "Habilita o uso de planos de junção de laço aninhado pelo planejador."
+#: commands/indexcmds.c:767
+msgid "cannot use aggregate in index predicate"
+msgstr "não pode utilizar agregação em predicado de índice"
 
-#: utils/misc/guc.c:674
-msgid "Enables the planner's use of merge join plans."
-msgstr "Habilita o uso de planos de junção por mesclagem pelo planejador."
+#: commands/indexcmds.c:776
+msgid "functions in index predicate must be marked IMMUTABLE"
+msgstr "funções em predicado de índice devem ser IMMUTABLE"
 
-#: utils/misc/guc.c:682
-msgid "Enables the planner's use of hash join plans."
-msgstr "Habilita o uso de planos de junção hash pelo planejador."
+#: commands/indexcmds.c:841 parser/parse_utilcmd.c:1704
+#, c-format
+msgid "column \"%s\" named in key does not exist"
+msgstr "coluna \"%s\" indicada na chave não existe"
 
-#: utils/misc/guc.c:690
-msgid "Enables genetic query optimization."
-msgstr "Habilita a otimização de consultas genéticas."
+#: commands/indexcmds.c:894
+msgid "cannot use subquery in index expression"
+msgstr "não pode utilizar subconsulta em expressão de índice"
 
-#: utils/misc/guc.c:691
-msgid "This algorithm attempts to do planning without exhaustive searching."
-msgstr "Esse algoritmo tenta fazer o planejamento sem busca exaustiva."
-
-#: utils/misc/guc.c:700
-msgid "Shows whether the current user is a superuser."
-msgstr "Mostra se o usuário atual é um super-usuário."
+#: commands/indexcmds.c:898
+msgid "cannot use aggregate function in index expression"
+msgstr "não pode utilizar função de agregação em expressão de índice"
 
-#: utils/misc/guc.c:709
-msgid "Enables advertising the server via Bonjour."
-msgstr "Habilita anunciar o servidor via Bonjour."
+#: commands/indexcmds.c:909
+msgid "functions in index expression must be marked IMMUTABLE"
+msgstr "funções em expressão de índice devem ser IMMUTABLE"
 
-#: utils/misc/guc.c:717
-msgid "Enables SSL connections."
-msgstr "Habilita conexões SSL."
+#: commands/indexcmds.c:930
+msgid "could not determine which collation to use for index expression"
+msgstr "não pôde determinar qual ordenação utilizar para expressão do índice"
 
-#: utils/misc/guc.c:725
-msgid "Forces synchronization of updates to disk."
-msgstr "Força sincronização de atualizações com o disco."
+#: commands/indexcmds.c:976
+#, c-format
+msgid "operator %s is not commutative"
+msgstr "operador %s não é comutativo"
 
-#: utils/misc/guc.c:726
-msgid ""
-"The server will use the fsync() system call in several places to make sure "
-"that updates are physically written to disk. This insures that a database "
-"cluster will recover to a consistent state after an operating system or "
-"hardware crash."
+#: commands/indexcmds.c:978
+msgid "Only commutative operators can be used in exclusion constraints."
 msgstr ""
-"O servidor utilizará a chamada do sistema fsync() em vários lugares para ter "
-"certeza que as atualizações estão gravadas fisicamente no disco. Isso "
-"assegura que o agrupamento de bancos de dados recuperará ao seu estado "
-"consistente após uma queda do sistema operacional ou de hardware."
-
-#: utils/misc/guc.c:736
-msgid "Sets immediate fsync at commit."
-msgstr "Define execução imediata do fsync ao efetivar."
+"Somente operadores comutativos pode ser utilizados em restrições de exclusão."
 
-#: utils/misc/guc.c:744
-msgid "Continues processing past damaged page headers."
-msgstr "Continua processando cabeçalhos antigos de páginas danificadas."
+#: commands/indexcmds.c:1004
+#, c-format
+msgid "operator %s is not a member of operator family \"%s\""
+msgstr "operador %s não é um membro da família de operadores \"%s\""
 
-#: utils/misc/guc.c:745
+#: commands/indexcmds.c:1007
 msgid ""
-"Detection of a damaged page header normally causes PostgreSQL to report an "
-"error, aborting the current transaction. Setting zero_damaged_pages to true "
-"causes the system to instead report a warning, zero out the damaged page, "
-"and continue processing. This behavior will destroy data, namely all the "
-"rows on the damaged page."
+"The exclusion operator must be related to the index operator class for the "
+"constraint."
 msgstr ""
-"Detecção de cabeçalhos de páginas danificadas normalmente faz com que o "
-"PostgreSQL produza um erro, interrompendo a transação atual. Definindo "
-"zero_damaged_page para true faz com que o sistema ao invés de produzir um "
-"aviso, escreva zero em todas as páginas danificadas e continue o "
-"processamento. Esse comportamento destrói dados, especificadamente todos os "
-"registros da página danificada."
+"O operador de exclusão deve estar relacionado à classe de operadores do "
+"índice para a restrição."
 
-#: utils/misc/guc.c:757
-msgid "Writes full pages to WAL when first modified after a checkpoint."
+#: commands/indexcmds.c:1042
+#, c-format
+msgid "access method \"%s\" does not support ASC/DESC options"
+msgstr "método de acesso \"%s\" não suporta opções ASC/DESC"
+
+#: commands/indexcmds.c:1047
+#, c-format
+msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
+msgstr "método de acesso \"%s\" não suporta opções NULLS FIRST/LAST"
+
+#: commands/indexcmds.c:1103
+#, c-format
+msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
-"Escreve páginas completas no WAL quando modificadas após um ponto de "
-"controle."
+"tipo de dado %s não tem classe de operadores padrão para método de acesso "
+"\"%s\""
 
-#: utils/misc/guc.c:758
+#: commands/indexcmds.c:1105
 msgid ""
-"A page write in process during an operating system crash might be only "
-"partially written to disk.  During recovery, the row changes stored in WAL "
-"are not enough to recover.  This option writes pages when first modified "
-"after a checkpoint to WAL so full recovery is possible."
+"You must specify an operator class for the index or define a default "
+"operator class for the data type."
 msgstr ""
-"Uma escrita de página em progresso durante uma queda do sistema operacional "
-"pode ser parcialmente escrita no disco.  Durante a recuperação, as mudanças "
-"de registro armazenadas no WAL não são suficientes para recuperação.  Esta "
-"opção escreve páginas quando modificadas após um ponto de controle no WAL "
-"possibilitando uma recuperação completa."
+"Você deve especificar uma classe de operadores para o índice ou definir uma "
+"classe de operadores padrão para o tipo de dado."
 
-#: utils/misc/guc.c:769
-msgid "Runs the server silently."
-msgstr "Executa o servidor silenciosamente."
+#: commands/indexcmds.c:1155
+#, c-format
+msgid "operator class \"%s\" does not accept data type %s"
+msgstr "classe de operadores \"%s\" não aceita tipo de dado %s"
 
-#: utils/misc/guc.c:770
-msgid ""
-"If this parameter is set, the server will automatically run in the "
-"background and any controlling terminals are dissociated."
-msgstr ""
-"Se esse parâmetro está definido, o servidor executará automaticamente em "
-"segundo plano e qualquer terminal de controle é dissociado."
+#: commands/indexcmds.c:1245
+#, c-format
+msgid "there are multiple default operator classes for data type %s"
+msgstr "há múltiplas classes de operadores padrão para tipo de dado %s"
 
-#: utils/misc/guc.c:778
-msgid "Logs each checkpoint."
-msgstr "Registra cada ponto de controle."
+#: commands/indexcmds.c:1542 commands/tablecmds.c:220
+#: commands/tablecmds.c:2486 catalog/objectaddress.c:391
+#: access/index/indexam.c:161
+#, c-format
+msgid "\"%s\" is not an index"
+msgstr "\"%s\" não é um índice"
 
-#: utils/misc/guc.c:786
-msgid "Logs each successful connection."
-msgstr "Registra cada conexão bem sucedida."
+#: commands/indexcmds.c:1586
+#, c-format
+msgid "table \"%s\" has no indexes"
+msgstr "tabela \"%s\" não tem índices"
 
-#: utils/misc/guc.c:794
-msgid "Logs end of a session, including duration."
-msgstr "Registra o fim da sessão, incluindo a duração."
+#: commands/indexcmds.c:1614
+msgid "can only reindex the currently open database"
+msgstr "só pode reindexar o banco de dados atualmente aberto"
 
-#: utils/misc/guc.c:802
-msgid "Turns on various assertion checks."
-msgstr "Ativa várias verificações de asserção."
+#: commands/indexcmds.c:1699
+#, c-format
+msgid "table \"%s.%s\" was reindexed"
+msgstr "tabela \"%s.%s\" foi reindexada"
 
-#: utils/misc/guc.c:803
-msgid "This is a debugging aid."
-msgstr "Esse é um auxílio na depuração."
+#: commands/portalcmds.c:61 commands/portalcmds.c:160
+#: commands/portalcmds.c:212
+msgid "invalid cursor name: must not be empty"
+msgstr "nome do cursor é inválido: não deve ser vazio"
 
-#: utils/misc/guc.c:817 utils/misc/guc.c:899 utils/misc/guc.c:958
-#: utils/misc/guc.c:967 utils/misc/guc.c:976 utils/misc/guc.c:985
-#: utils/misc/guc.c:1587 utils/misc/guc.c:1596
-msgid "No description available."
-msgstr "Nenhuma descrição disponível."
+#: commands/portalcmds.c:168 commands/portalcmds.c:222
+#: executor/execCurrent.c:66 utils/adt/xml.c:2046 utils/adt/xml.c:2210
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "cursor \"%s\" não existe"
 
-#: utils/misc/guc.c:826
-msgid "Logs the duration of each completed SQL statement."
-msgstr "Registra a duração de cada sentença SQL completa."
+#: commands/portalcmds.c:409
+msgid "could not reposition held cursor"
+msgstr "não pôde reposicionar cursor aberto"
 
-#: utils/misc/guc.c:834
-msgid "Logs each query's parse tree."
-msgstr "Registra cada árvore de análise de consulta."
+#: commands/aggregatecmds.c:103
+#, c-format
+msgid "aggregate attribute \"%s\" not recognized"
+msgstr "atributo da agregação \"%s\" é desconhecido"
 
-#: utils/misc/guc.c:842
-msgid "Logs each query's rewritten parse tree."
-msgstr "Registra cada árvore de análise reescrita de consulta."
+#: commands/aggregatecmds.c:113
+msgid "aggregate stype must be specified"
+msgstr "tipo de transição (stype) da agregação deve ser especificado"
 
-#: utils/misc/guc.c:850
-msgid "Logs each query's execution plan."
-msgstr "Registra cada plano de execução de consulta."
+#: commands/aggregatecmds.c:117
+msgid "aggregate sfunc must be specified"
+msgstr "função de transição (sfunc) da agregação deve ser especificado"
 
-#: utils/misc/guc.c:858
-msgid "Indents parse and plan tree displays."
-msgstr "Identa exibição da árvore de análise e plano."
+#: commands/aggregatecmds.c:134
+msgid "aggregate input type must be specified"
+msgstr "tipo de entrada da agregação deve ser especificado"
 
-#: utils/misc/guc.c:866
-msgid "Writes parser performance statistics to the server log."
-msgstr "Escreve estatísticas de performance do analisador no log do servidor."
+#: commands/aggregatecmds.c:159
+msgid "basetype is redundant with aggregate input type specification"
+msgstr ""
+"tipo base é redundante com especificação de tipo de entrada da agregação"
 
-#: utils/misc/guc.c:874
-msgid "Writes planner performance statistics to the server log."
-msgstr "Escreve estatísticas de performance do planejador no log do servidor."
+#: commands/aggregatecmds.c:191
+#, c-format
+msgid "aggregate transition data type cannot be %s"
+msgstr "tipo de dado de transição da agregação não pode ser %s"
 
-#: utils/misc/guc.c:882
-msgid "Writes executor performance statistics to the server log."
-msgstr "Escreve estatísticas de performance do executor no log do servidor."
+#: commands/aggregatecmds.c:230
+#, c-format
+msgid "aggregate %s(%s) does not exist, skipping"
+msgstr "agregação %s(%s) não existe, ignorando"
 
-#: utils/misc/guc.c:890
-msgid "Writes cumulative performance statistics to the server log."
-msgstr "Escreve estatísticas de performance acumulativas no log do servidor."
+#: commands/tablecmds.c:200
+#, c-format
+msgid "table \"%s\" does not exist"
+msgstr "tabela \"%s\" não existe"
 
-#: utils/misc/guc.c:910
-msgid "Collects information about executing commands."
-msgstr "Coleta informação sobre execução de comandos."
+#: commands/tablecmds.c:201
+#, c-format
+msgid "table \"%s\" does not exist, skipping"
+msgstr "tabela \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:911
-msgid ""
-"Enables the collection of information on the currently executing command of "
-"each session, along with the time at which that command began execution."
-msgstr ""
-"Habilita a coleta de informação do comando em execução de cada sessão, ao "
-"mesmo tempo que o comando inicia a execução."
+#: commands/tablecmds.c:203
+msgid "Use DROP TABLE to remove a table."
+msgstr "Use DROP TABLE para remover uma tabela."
 
-#: utils/misc/guc.c:920
-msgid "Collects statistics on database activity."
-msgstr "Coleta estatísticas sobre a atividade do banco de dados."
+#: commands/tablecmds.c:206
+#, c-format
+msgid "sequence \"%s\" does not exist"
+msgstr "sequência \"%s\" não existe"
 
-#: utils/misc/guc.c:929
-msgid "Updates the process title to show the active SQL command."
-msgstr "Atualiza o título do processo para mostrar o comando SQL ativo."
+#: commands/tablecmds.c:207
+#, c-format
+msgid "sequence \"%s\" does not exist, skipping"
+msgstr "sequência \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:930
-msgid ""
-"Enables updating of the process title every time a new SQL command is "
-"received by the server."
-msgstr ""
-"Habilita a atualização do título do processo toda vez que um comando SQL "
-"novo é recebido pelo servidor."
+#: commands/tablecmds.c:209
+msgid "Use DROP SEQUENCE to remove a sequence."
+msgstr "Use DROP SEQUENCE para remover uma sequência."
 
-#: utils/misc/guc.c:938
-msgid "Starts the autovacuum subprocess."
-msgstr "Inicia o subprocesso de limpeza automática."
+#: commands/tablecmds.c:212
+#, c-format
+msgid "view \"%s\" does not exist"
+msgstr "visão \"%s\" não existe"
 
-#: utils/misc/guc.c:947
-msgid "Generates debugging output for LISTEN and NOTIFY."
-msgstr "Gera saída de depuração para LISTEN e NOTIFY."
+#: commands/tablecmds.c:213
+#, c-format
+msgid "view \"%s\" does not exist, skipping"
+msgstr "visão \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:996
-msgid "Logs long lock waits."
-msgstr "Registra esperas devido a bloqueios longos."
+#: commands/tablecmds.c:215
+msgid "Use DROP VIEW to remove a view."
+msgstr "Use DROP VIEW para remover uma visão."
 
-#: utils/misc/guc.c:1005
-msgid "Logs the host name in the connection logs."
-msgstr "Registra o nome da máquina nos logs de conexão."
+#: commands/tablecmds.c:218 parser/parse_utilcmd.c:1449
+#, c-format
+msgid "index \"%s\" does not exist"
+msgstr "índice \"%s\" não existe"
 
-#: utils/misc/guc.c:1006
-msgid ""
-"By default, connection logs only show the IP address of the connecting host. "
-"If you want them to show the host name you can turn this on, but depending "
-"on your host name resolution setup it might impose a non-negligible "
-"performance penalty."
-msgstr ""
-"Por padrão, logs de conexão só mostram o endereço IP da máquina que "
-"conectou. Se você quer que seja mostrado o nome da máquina você pode "
-"habilitá-lo, mas dependendo da configuração de resolução do nome da máquina "
-"isso pode impor uma penalização de performance."
+#: commands/tablecmds.c:219
+#, c-format
+msgid "index \"%s\" does not exist, skipping"
+msgstr "índice \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:1016
-msgid "Causes subtables to be included by default in various commands."
-msgstr "Causa subtabelas serem incluídas por padrão em vários comandos."
+#: commands/tablecmds.c:221
+msgid "Use DROP INDEX to remove an index."
+msgstr "Use DROP INDEX para remover um índice."
 
-#: utils/misc/guc.c:1024
-msgid "Encrypt passwords."
-msgstr "Criptografa senhas."
+#: commands/tablecmds.c:226
+#, c-format
+msgid "\"%s\" is not a type"
+msgstr "\"%s\" não é um tipo"
 
-#: utils/misc/guc.c:1025
-msgid ""
-"When a password is specified in CREATE USER or ALTER USER without writing "
-"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
-"password is to be encrypted."
-msgstr ""
-"Quando a senha for especificada em CREATE USER ou ALTER USER sem escrever "
-"ENCRYPTED ou UNENCRYPTED, esse parâmetro determina se a senha será "
-"criptografada."
+#: commands/tablecmds.c:227
+msgid "Use DROP TYPE to remove a type."
+msgstr "use DROP TYPE para remover um tipo."
 
-#: utils/misc/guc.c:1034
-msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
-msgstr "Trata \"expr=NULL\" como \"expr IS NULL\"."
+#: commands/tablecmds.c:230 commands/tablecmds.c:8902
+#, c-format
+msgid "foreign table \"%s\" does not exist"
+msgstr "tabela externa \"%s\" não existe"
 
-#: utils/misc/guc.c:1035
-msgid ""
-"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
-"treated as expr IS NULL, that is, they return true if expr evaluates to the "
-"null value, and false otherwise. The correct behavior of expr = NULL is to "
-"always return null (unknown)."
-msgstr ""
-"Quando está habilitado, expressões da forma expr = NULL (ou NULL = expr) são "
-"tratadas com expr IS NULL, isto é, elas retornam verdadeiro se expr é "
-"avaliada como nula, e falso caso contrário. O comportamento correto de expr "
-"= NULL é retornar sempre nulo (desconhecido)."
+#: commands/tablecmds.c:231
+#, c-format
+msgid "foreign table \"%s\" does not exist, skipping"
+msgstr "tabela externa \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:1046
-msgid "Enables per-database user names."
-msgstr "Habilita uso de nomes de usuário por banco de dados."
+#: commands/tablecmds.c:232 commands/tablecmds.c:2259
+#: commands/tablecmds.c:2518 commands/tablecmds.c:3843
+#: commands/tablecmds.c:8998 catalog/objectaddress.c:419
+#, c-format
+msgid "\"%s\" is not a foreign table"
+msgstr "\"%s\" não é uma tabela externa"
 
-#: utils/misc/guc.c:1055
-msgid "This parameter doesn't do anything."
-msgstr "Esse parâmetro não faz nada."
+#: commands/tablecmds.c:233
+msgid "Use DROP FOREIGN TABLE to remove a foreign table."
+msgstr "Use DROP FOREIGN TABLE para remover uma tabela externa."
 
-#: utils/misc/guc.c:1056
-msgid ""
-"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
-"vintage clients."
-msgstr ""
-"Isso está aqui para que não seja necessário SET AUTOCOMMIT TO ON em clientes "
-"7.3 e anteriores."
+#: commands/tablecmds.c:425 executor/execMain.c:2416
+msgid "ON COMMIT can only be used on temporary tables"
+msgstr "ON COMMIT só pode ser utilizado em tabelas temporárias"
 
-#: utils/misc/guc.c:1064
-msgid "Sets the default read-only status of new transactions."
-msgstr "Define o status padrão como somente leitura para novas transações."
+#: commands/tablecmds.c:429
+msgid "constraints on foreign tables are not supported"
+msgstr "restrições em tabelas externas não são suportadas"
 
-#: utils/misc/guc.c:1072
-msgid "Sets the current transaction's read-only status."
-msgstr "Define o status da transação atual como somente leitura."
+#: commands/tablecmds.c:447 executor/execMain.c:2434
+msgid "cannot create temporary table within security-restricted operation"
+msgstr ""
+"não pode criar tabela temporária em operação com restrição de segurança"
 
-#: utils/misc/guc.c:1081
-msgid "Check function bodies during CREATE FUNCTION."
-msgstr "Verifica corpo da função durante CREATE FUNCTION."
+#: commands/tablecmds.c:545 commands/tablecmds.c:4351
+msgid "default values on foreign tables are not supported"
+msgstr "valores padrão em tabelas externas não são suportados"
 
-#: utils/misc/guc.c:1089
-msgid "Enable input of NULL elements in arrays."
-msgstr "Habilita entrada de elementos NULL em matrizes."
+#: commands/tablecmds.c:925
+#, c-format
+msgid "truncate cascades to table \"%s\""
+msgstr "truncando em cascata tabela \"%s\""
 
-#: utils/misc/guc.c:1090
-msgid ""
-"When turned on, unquoted NULL in an array input value means a null value; "
-"otherwise it is taken literally."
-msgstr ""
-"Quando habilitado, NULL sem aspas em um valor de entrada de uma matriz "
-"significa o valor nulo; caso contrário ele é utilizado literalmente."
+#: commands/tablecmds.c:1152
+msgid "cannot truncate temporary tables of other sessions"
+msgstr "não pode truncar tabelas temporárias de outras sessões"
 
-#: utils/misc/guc.c:1099
-msgid "Create new tables with OIDs by default."
-msgstr "Cria novas tabelas com OIDs por padrão."
+#: commands/tablecmds.c:1268 commands/tablecmds.c:1685
+#: commands/tablecmds.c:4276 catalog/heap.c:389
+#, c-format
+msgid "tables can have at most %d columns"
+msgstr "tabelas podem ter no máximo %d colunas"
 
-#: utils/misc/guc.c:1107
-msgid ""
-"Start a subprocess to capture stderr output and/or csvlogs into log files."
-msgstr ""
-"Inicia um subprocesso para capturar saída stderr e/ou csvlogs em arquivos de "
-"log."
+#: commands/tablecmds.c:1354 parser/parse_utilcmd.c:621
+#: parser/parse_utilcmd.c:1667
+#, c-format
+msgid "inherited relation \"%s\" is not a table"
+msgstr "relação herdada \"%s\" não é uma tabela"
 
-#: utils/misc/guc.c:1115
-msgid "Truncate existing log files of same name during log rotation."
-msgstr ""
-"Trunca arquivos de log existentes com mesmo nome durante rotação de log."
+#: commands/tablecmds.c:1361 commands/tablecmds.c:8128
+#, c-format
+msgid "cannot inherit from temporary relation \"%s\""
+msgstr "não pode herdar de uma tabela temporária \"%s\""
 
-#: utils/misc/guc.c:1125
-msgid "Emit information about resource usage in sorting."
-msgstr "Produz informação sobre uso de recurso ao ordenar."
+#: commands/tablecmds.c:1378 commands/tablecmds.c:8156
+#, c-format
+msgid "relation \"%s\" would be inherited from more than once"
+msgstr "relação \"%s\" seria herdada de mais de uma vez"
 
-#: utils/misc/guc.c:1138
-msgid "Generate debugging output for synchronized scanning."
-msgstr "Gera saída de depuração para busca sincronizada."
+#: commands/tablecmds.c:1434
+#, c-format
+msgid "merging multiple inherited definitions of column \"%s\""
+msgstr "juntando múltiplas definições herdadas da coluna \"%s\""
 
-#: utils/misc/guc.c:1152
-msgid "Enable bounded sorting using heap sort."
-msgstr "Habilita ordenação limitada utilizando ordenção de pilha."
+#: commands/tablecmds.c:1442
+#, c-format
+msgid "inherited column \"%s\" has a type conflict"
+msgstr "coluna herdada \"%s\" tem um conflito de tipo"
 
-#: utils/misc/guc.c:1164
-msgid "Emit WAL-related debugging output."
-msgstr "Emite saída de depuração relacionada ao WAL."
+#: commands/tablecmds.c:1444 commands/tablecmds.c:1465
+#: commands/tablecmds.c:1630 commands/tablecmds.c:1652
+#: parser/parse_coerce.c:1514 parser/parse_coerce.c:1534
+#: parser/parse_coerce.c:1579 parser/parse_param.c:217
+#, c-format
+msgid "%s versus %s"
+msgstr "%s versus %s"
 
-#: utils/misc/guc.c:1175
-msgid "Datetimes are integer based."
-msgstr "Datetimes são baseados em inteiros."
+#: commands/tablecmds.c:1451
+#, c-format
+msgid "inherited column \"%s\" has a collation conflict"
+msgstr "coluna herdada \"%s\" tem um conflito de ordenação"
 
-#: utils/misc/guc.c:1189
-msgid ""
-"Sets whether Kerberos and GSSAPI user names should be treated as case-"
-"insensitive."
-msgstr ""
-"Define se nomes de usuário do Kerberos e do GSSAPI devem ser tratados como "
-"não sensíveis a minúsculas/maiúsculas."
+#: commands/tablecmds.c:1453 commands/tablecmds.c:1640
+#: commands/tablecmds.c:4220
+#, c-format
+msgid "\"%s\" versus \"%s\""
+msgstr "\"%s\" versus \"%s\""
 
-#: utils/misc/guc.c:1198
-msgid "Warn about backslash escapes in ordinary string literals."
-msgstr ""
-"Avisa sobre escapes de barra invertida em cadeias de caracteres ordinárias."
+#: commands/tablecmds.c:1463
+#, c-format
+msgid "inherited column \"%s\" has a storage parameter conflict"
+msgstr "coluna herdada \"%s\" tem um conflito de parâmetro de armazenamento"
 
-#: utils/misc/guc.c:1207
-msgid "Causes '...' strings to treat backslashes literally."
-msgstr ""
-"Faz com que cadeias de caracteres '...' tratem barras invertidas "
-"literalmente."
+#: commands/tablecmds.c:1620
+#, c-format
+msgid "merging column \"%s\" with inherited definition"
+msgstr "juntando coluna \"%s\" com definição herdada"
 
-#: utils/misc/guc.c:1217
-msgid "Enable synchronized sequential scans."
-msgstr "Habilita buscas sequenciais sincronizadas."
+#: commands/tablecmds.c:1628
+#, c-format
+msgid "column \"%s\" has a type conflict"
+msgstr "coluna \"%s\" tem um conflito de tipo"
 
-#: utils/misc/guc.c:1226
-msgid "Allows archiving of WAL files using archive_command."
-msgstr "Permite arquivamento de arquivos do WAL utilizando archive_command."
+#: commands/tablecmds.c:1638
+#, c-format
+msgid "column \"%s\" has a collation conflict"
+msgstr "coluna \"%s\" tem um conflito de ordenação"
 
-#: utils/misc/guc.c:1235
-msgid "Allows connections and queries during recovery."
-msgstr "Permite conexões e consultas durante recuperação."
+#: commands/tablecmds.c:1650
+#, c-format
+msgid "column \"%s\" has a storage parameter conflict"
+msgstr "coluna \"%s\" tem um conflito de parâmetro de armazenamento"
 
-#: utils/misc/guc.c:1244
-msgid "Allows modifications of the structure of system tables."
-msgstr "Permite modificações da estrutura de tabelas do sistema."
+#: commands/tablecmds.c:1702
+#, c-format
+msgid "column \"%s\" inherits conflicting default values"
+msgstr "coluna \"%s\" herdou valores padrão conflitantes"
 
-#: utils/misc/guc.c:1254
-msgid "Disables reading from system indexes."
-msgstr "Desabilita leitura dos índices do sistema."
+#: commands/tablecmds.c:1704
+msgid "To resolve the conflict, specify a default explicitly."
+msgstr "Para resolver o conflito, especifique um padrão explicitamente."
 
-#: utils/misc/guc.c:1255
+#: commands/tablecmds.c:1751
+#, c-format
 msgid ""
-"It does not prevent updating the indexes, so it is safe to use.  The worst "
-"consequence is slowness."
+"check constraint name \"%s\" appears multiple times but with different "
+"expressions"
 msgstr ""
-"Ele não impede a atualização dos índices, então é seguro utilizá-lo. A pior "
-"consequência é lentidão."
+"nome da restrição de verificação \"%s\" aparece múltiplas vezes mas com "
+"diferentes expressões"
 
-#: utils/misc/guc.c:1265
-msgid ""
-"Enables backward compatibility mode for privilege checks on large objects."
-msgstr "Habilita modo de compatibilidade com versões anteriores para verificação de privilégios em objetos grandes."
+#: commands/tablecmds.c:2041
+msgid "cannot rename column of typed table"
+msgstr "não pode renomear coluna de tabela tipada"
 
-#: utils/misc/guc.c:1266
-msgid ""
-"Skips privilege checks when reading or modifying large objects, for "
-"compatibility with PostgreSQL releases prior to 9.0."
-msgstr "Não verifica privilégios ao ler ou modificar objetos grandes, para compatibilidade com versões do PostgreSQL anteriores a 9.0."
+#: commands/tablecmds.c:2058
+#, c-format
+msgid "\"%s\" is not a table, view, composite type, index or foreign table"
+msgstr ""
+"\"%s\" não é uma tabela, visão, tipo composto, índice ou tabela externa"
 
-#: utils/misc/guc.c:1284
-msgid ""
-"Forces a switch to the next xlog file if a new file has not been started "
-"within N seconds."
+#: commands/tablecmds.c:2124
+#, c-format
+msgid "inherited column \"%s\" must be renamed in child tables too"
 msgstr ""
-"Força a rotação para o próximo arquivo de xlog se um novo arquivo não foi "
-"iniciado em N segundos."
+"coluna herdada \"%s\" deve ser renomeada nas tabelas descendentes também"
 
-#: utils/misc/guc.c:1294
-msgid "Waits N seconds on connection startup after authentication."
-msgstr "Espera N segundos após autenticação durante inicialização da conexão."
+#: commands/tablecmds.c:2156
+#, c-format
+msgid "cannot rename system column \"%s\""
+msgstr "não pode renomear coluna do sistema \"%s\""
 
-#: utils/misc/guc.c:1295 utils/misc/guc.c:1670
-msgid "This allows attaching a debugger to the process."
-msgstr "Isso permite anexar um depurador ao processo."
+#: commands/tablecmds.c:2171
+#, c-format
+msgid "cannot rename inherited column \"%s\""
+msgstr "não pode renomear coluna herdada \"%s\""
 
-#: utils/misc/guc.c:1303
-msgid "Sets the default statistics target."
-msgstr "Define o alvo padrão de estatísticas."
+#: commands/tablecmds.c:2182 commands/tablecmds.c:4264
+#, c-format
+msgid "column \"%s\" of relation \"%s\" already exists"
+msgstr "coluna \"%s\" da relação \"%s\" já existe"
 
-#: utils/misc/guc.c:1304
-msgid ""
-"This applies to table columns that have not had a column-specific target set "
-"via ALTER TABLE SET STATISTICS."
-msgstr ""
-"Isso se aplica a colunas de tabelas que não têm um alvo de colunas "
-"específico definido através de ALTER TABLE SET STATISTICS."
+#: commands/tablecmds.c:2269 commands/tablecmds.c:7450
+#: commands/tablecmds.c:9032 catalog/aclchk.c:1685 access/heap/heapam.c:1087
+#: access/heap/heapam.c:1115 access/heap/heapam.c:1145
+#, c-format
+msgid "\"%s\" is a composite type"
+msgstr "\"%s\" é um tipo composto"
 
-#: utils/misc/guc.c:1312
-msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
-msgstr ""
-"Define o tamanho da lista do FROM a partir do qual as subconsultas não "
-"entrarão em colapso."
+#: commands/tablecmds.c:2271 commands/tablecmds.c:7452
+#: commands/tablecmds.c:9034
+msgid "Use ALTER TYPE instead."
+msgstr "Ao invés disso utilize ALTER TYPE."
+
+#: commands/tablecmds.c:2318 catalog/heap.c:1011 catalog/index.c:769
+#, c-format
+msgid "relation \"%s\" already exists"
+msgstr "relação \"%s\" já existe"
 
-#: utils/misc/guc.c:1314
+#. translator: first %s is a SQL command, eg ALTER TABLE
+#: commands/tablecmds.c:2394
+#, c-format
 msgid ""
-"The planner will merge subqueries into upper queries if the resulting FROM "
-"list would have no more than this many items."
+"cannot %s \"%s\" because it is being used by active queries in this session"
 msgstr ""
-"O planejador mesclará subconsultas em consultas de nível superior se a lista "
-"resultante do FROM for menor que essa quantidade de itens."
+"não pode executar %s \"%s\" porque ela está sendo utilizada por consultas "
+"ativas nessa sessão"
 
-#: utils/misc/guc.c:1323
-msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
+#. translator: first %s is a SQL command, eg ALTER TABLE
+#: commands/tablecmds.c:2403
+#, c-format
+msgid "cannot %s \"%s\" because it has pending trigger events"
 msgstr ""
-"Define o tamanho da lista do FROM a partir do qual as construções JOIN não "
-"serão nivelados."
+"não pode executar %s \"%s\" porque ela tem eventos de gatilho pendentes"
 
-#: utils/misc/guc.c:1325
-msgid ""
-"The planner will flatten explicit JOIN constructs into lists of FROM items "
-"whenever a list of no more than this many items would result."
-msgstr ""
-"O planejador nivelará construções JOIN explícitas em listas de itens FROM "
-"sempre que a lista não tenha mais do que essa quantidade de itens."
+#: commands/tablecmds.c:2502
+#, c-format
+msgid "\"%s\" is not a composite type"
+msgstr "\"%s\" não é um tipo composto"
 
-#: utils/misc/guc.c:1334
-msgid "Sets the threshold of FROM items beyond which GEQO is used."
-msgstr "Define o limite de itens do FROM a partir do qual o GEQO é utilizado."
+#: commands/tablecmds.c:3327
+#, c-format
+msgid "cannot rewrite system relation \"%s\""
+msgstr "não pode reescrever relação do sistema \"%s\""
 
-#: utils/misc/guc.c:1342
-msgid "GEQO: effort is used to set the default for other GEQO parameters."
-msgstr ""
-"GEQO: esforço é utilizado para definir o padrão para outros parâmetros GEQO."
+#: commands/tablecmds.c:3337
+msgid "cannot rewrite temporary tables of other sessions"
+msgstr "não pode reescrever tabelas temporárias de outras sessões"
 
-#: utils/misc/guc.c:1350
-msgid "GEQO: number of individuals in the population."
-msgstr "GEQO: número de indivíduos em uma população."
+#: commands/tablecmds.c:3562
+#, c-format
+msgid "rewriting table \"%s\""
+msgstr "reescrevendo tabela \"%s\""
 
-#: utils/misc/guc.c:1351 utils/misc/guc.c:1359
-msgid "Zero selects a suitable default value."
-msgstr "Zero seleciona um valor padrão ideal."
+#: commands/tablecmds.c:3566
+#, c-format
+msgid "verifying table \"%s\""
+msgstr "verificando tabela \"%s\""
 
-#: utils/misc/guc.c:1358
-msgid "GEQO: number of iterations of the algorithm."
-msgstr "GEQO: número de iterações do algoritmo."
+#: commands/tablecmds.c:3673
+#, c-format
+msgid "column \"%s\" contains null values"
+msgstr "coluna \"%s\" contém valores nulos"
 
-#: utils/misc/guc.c:1368
-msgid "Sets the time to wait on a lock before checking for deadlock."
-msgstr "Define o tempo para esperar um bloqueio antes de verificar um impasse."
+#: commands/tablecmds.c:3687
+#, c-format
+msgid "check constraint \"%s\" is violated by some row"
+msgstr "restrição de verificação \"%s\" foi violada por algum registro"
 
-#: utils/misc/guc.c:1378
-msgid ""
-"Sets the maximum delay before canceling queries when a hot standby server is "
-"processing archived WAL data."
-msgstr ""
+#: commands/tablecmds.c:3828 commands/tablecmds.c:4778
+#, c-format
+msgid "\"%s\" is not a table or index"
+msgstr "\"%s\" não é uma tabela ou índice"
 
-#: utils/misc/guc.c:1388
-msgid ""
-"Sets the maximum delay before canceling queries when a hot standby server is "
-"processing streamed WAL data."
-msgstr ""
+#: commands/tablecmds.c:3834
+#, c-format
+msgid "\"%s\" is not a table or foreign table"
+msgstr "\"%s\" não é uma tabela ou tabela externa"
 
-#: utils/misc/guc.c:1408
-msgid "Sets the maximum number of concurrent connections."
-msgstr "Define o número máximo de conexões concorrentes."
+#: commands/tablecmds.c:3837
+#, c-format
+msgid "\"%s\" is not a table, composite type, or foreign table"
+msgstr "\"%s\" não é uma tabela, tipo composto ou tabela externa"
 
-#: utils/misc/guc.c:1417
-msgid "Sets the number of connection slots reserved for superusers."
-msgstr "Define o número de conexões reservadas para super-usuários."
+#: commands/tablecmds.c:3847
+#, c-format
+msgid "\"%s\" is of the wrong type"
+msgstr "\"%s\" é de um tipo incorreto"
 
-#: utils/misc/guc.c:1426
-msgid "Sets the number of shared memory buffers used by the server."
+#: commands/tablecmds.c:3996 commands/tablecmds.c:4003
+#, c-format
+msgid "cannot alter type \"%s\" because column \"%s.%s\" uses it"
+msgstr "não pode alterar tipo \"%s\" porque coluna \"%s.%s\" utiliza-o"
+
+#: commands/tablecmds.c:4010
+#, c-format
+msgid ""
+"cannot alter foreign table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
-"Define o número de buffers de memória compartilhada utilizados pelo servidor."
+"não pode alterar tabela externa \"%s\" porque coluna \"%s.%s\" utiliza seu "
+"tipo"
 
-#: utils/misc/guc.c:1436
-msgid "Sets the maximum number of temporary buffers used by each session."
+#: commands/tablecmds.c:4017
+#, c-format
+msgid "cannot alter table \"%s\" because column \"%s.%s\" uses its row type"
 msgstr ""
-"Define o número máximo de buffers temporários utilizados por cada sessão."
+"não pode alterar tabela \"%s\" porque coluna \"%s.%s\" utiliza seu tipo"
 
-#: utils/misc/guc.c:1446
-msgid "Sets the TCP port the server listens on."
-msgstr "Define a porta TCP que o servidor escutará."
+#: commands/tablecmds.c:4079
+#, c-format
+msgid "cannot alter type \"%s\" because it is the type of a typed table"
+msgstr "não pode alterar tipo \"%s\" porque ele é um tipo de uma tabela tipada"
 
-#: utils/misc/guc.c:1455
-msgid "Sets the access permissions of the Unix-domain socket."
-msgstr "Define as permissões de acesso do soquete de domínio Unix."
+#: commands/tablecmds.c:4081
+msgid "Use ALTER ... CASCADE to alter the typed tables too."
+msgstr "Utilize ALTER ... CASCADE para alterar as tabelas tipadas também."
 
-#: utils/misc/guc.c:1456
-msgid ""
-"Unix-domain sockets use the usual Unix file system permission set. The "
-"parameter value is expected to be a numeric mode specification in the form "
-"accepted by the chmod and umask system calls. (To use the customary octal "
-"format the number must start with a 0 (zero).)"
-msgstr ""
-"Soquetes de domínio Unix utilizam permissões de arquivos Unix usuais. O "
-"valor do parâmetro esperado é uma especificação numérica na forma aceita "
-"pelas chamadas de sistema chmod e umask. (Para utilizar formato octal "
-"habitual, o número deve começar com um 0 (zero).)"
+#: commands/tablecmds.c:4125
+#, c-format
+msgid "type %s is not a composite type"
+msgstr "tipo %s não é um tipo composto"
 
-#: utils/misc/guc.c:1468
-msgid "Sets the maximum memory to be used for query workspaces."
-msgstr "Define o máximo de memória utilizada para operações da consulta."
+#: commands/tablecmds.c:4151
+msgid "cannot add column to typed table"
+msgstr "não pode adicionar coluna a tabela tipada"
 
-#: utils/misc/guc.c:1469
-msgid ""
-"This much memory can be used by each internal sort operation and hash table "
-"before switching to temporary disk files."
-msgstr ""
-"Esta quantidade de memória pode ser utilizada por operação de ordenação "
-"interna e tabela hash antes de alternar para arquivos temporários no disco."
+#: commands/tablecmds.c:4212 commands/tablecmds.c:8310
+#, c-format
+msgid "child table \"%s\" has different type for column \"%s\""
+msgstr "tabela descendente \"%s\" tem tipo diferente da coluna \"%s\""
 
-#: utils/misc/guc.c:1480
-msgid "Sets the maximum memory to be used for maintenance operations."
-msgstr "Define o máximo de memória utilizada para operações de manutenção."
+#: commands/tablecmds.c:4218 commands/tablecmds.c:8317
+#, c-format
+msgid "child table \"%s\" has different collation for column \"%s\""
+msgstr "tabela descendente \"%s\" tem ordenação diferente da coluna \"%s\""
 
-#: utils/misc/guc.c:1481
-msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr "Isso inclue operações tais como VACUUM e CREATE INDEX."
+#: commands/tablecmds.c:4228
+#, c-format
+msgid "child table \"%s\" has a conflicting \"%s\" column"
+msgstr "tabela descendente \"%s\" tem uma coluna conflitante \"%s\""
 
-#: utils/misc/guc.c:1490
-msgid "Sets the maximum stack depth, in kilobytes."
-msgstr "Define a profundidade máxima da pilha, em kilobytes."
+#: commands/tablecmds.c:4240
+#, c-format
+msgid "merging definition of column \"%s\" for child \"%s\""
+msgstr "juntando definição da coluna \"%s\" para tabela descendente \"%s\""
 
-#: utils/misc/guc.c:1500
-msgid "Vacuum cost for a page found in the buffer cache."
-msgstr "Custo da limpeza por página encontrada na cache do buffer."
+#: commands/tablecmds.c:4470
+msgid "column must be added to child tables too"
+msgstr "coluna deve ser adicionada as tabelas descendentes também"
 
-#: utils/misc/guc.c:1509
-msgid "Vacuum cost for a page not found in the buffer cache."
-msgstr "Custo da limpeza por página não encontrada na cache do buffer."
+#: commands/tablecmds.c:4600 commands/tablecmds.c:4690
+#: commands/tablecmds.c:4735 commands/tablecmds.c:4831
+#: commands/tablecmds.c:4875 commands/tablecmds.c:4954
+#: commands/tablecmds.c:6670
+#, c-format
+msgid "cannot alter system column \"%s\""
+msgstr "não pode alterar coluna do sistema \"%s\""
 
-#: utils/misc/guc.c:1518
-msgid "Vacuum cost for a page dirtied by vacuum."
-msgstr "Custo da limpeza por página sujada pela limpeza."
+#: commands/tablecmds.c:4634
+#, c-format
+msgid "column \"%s\" is in a primary key"
+msgstr "coluna \"%s\" está em uma chave primária"
 
-#: utils/misc/guc.c:1527
-msgid "Vacuum cost amount available before napping."
-msgstr "Quantidade de custo da limpeza disponível antes de adormecer."
+#: commands/tablecmds.c:4805
+#, c-format
+msgid "statistics target %d is too low"
+msgstr "valor da estatística %d é muito pequeno"
 
-#: utils/misc/guc.c:1536
-msgid "Vacuum cost delay in milliseconds."
-msgstr "Atraso do custo da limpeza em milisegundos."
+#: commands/tablecmds.c:4813
+#, c-format
+msgid "lowering statistics target to %d"
+msgstr "diminuindo valor da estatística para %d"
 
-#: utils/misc/guc.c:1546
-msgid "Vacuum cost delay in milliseconds, for autovacuum."
-msgstr "Atraso do custo da limpeza em milisegundos, para autovacuum."
+#: commands/tablecmds.c:4935
+#, c-format
+msgid "invalid storage type \"%s\""
+msgstr "tipo de armazenamento \"%s\" é inválido"
 
-#: utils/misc/guc.c:1556
-msgid "Vacuum cost amount available before napping, for autovacuum."
-msgstr ""
-"Quantidade de custo da limpeza disponível antes de adormecer, para "
-"autovacuum."
+#: commands/tablecmds.c:4966
+#, c-format
+msgid "column data type %s can only have storage PLAIN"
+msgstr "tipo de dado da coluna %s só pode ter armazenamento PLAIN"
 
-#: utils/misc/guc.c:1565
-msgid ""
-"Sets the maximum number of simultaneously open files for each server process."
-msgstr ""
-"Define o número máximo de arquivos abertos simultaneamente por cada processo "
-"servidor."
+#: commands/tablecmds.c:4996
+msgid "cannot drop column from typed table"
+msgstr "não pode apagar coluna de tabela tipada"
 
-#: utils/misc/guc.c:1577
-msgid "Sets the maximum number of simultaneously prepared transactions."
-msgstr "Define o número máximo de transações preparadas simultâneas."
+#: commands/tablecmds.c:5037
+#, c-format
+msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "coluna \"%s\" da relação \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:1607
-msgid "Sets the maximum allowed duration of any statement."
-msgstr "Define a duração máxima permitida de cada comando."
+#: commands/tablecmds.c:5050
+#, c-format
+msgid "cannot drop system column \"%s\""
+msgstr "não pode remover coluna do sistema \"%s\""
 
-#: utils/misc/guc.c:1608
-msgid "A value of 0 turns off the timeout."
-msgstr "Um valor 0 desabilita o tempo de espera."
+#: commands/tablecmds.c:5057
+#, c-format
+msgid "cannot drop inherited column \"%s\""
+msgstr "não pode remover coluna herdada \"%s\""
 
-#: utils/misc/guc.c:1617
-msgid "Minimum age at which VACUUM should freeze a table row."
+#: commands/tablecmds.c:5283
+#, c-format
+msgid ""
+"ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index \"%s\" to \"%s\""
 msgstr ""
-"Identificador mínimo no qual o VACUUM deve congelar um registro da tabela."
+"ALTER TABLE / ADD CONSTRAINT USING INDEX renomeará índice \"%s\" para \"%s\""
 
-#: utils/misc/guc.c:1626
-msgid "Age at which VACUUM should scan whole table to freeze tuples."
-msgstr ""
-"Identificador no qual o VACUUM deve percorrer toda tabela para congelar "
-"tuplas."
+#: commands/tablecmds.c:5350 catalog/heap.c:2287 catalog/pg_constraint.c:645
+#, c-format
+msgid "constraint \"%s\" for relation \"%s\" already exists"
+msgstr "restrição \"%s\" para relação \"%s\" já existe"
 
-#: utils/misc/guc.c:1635
-msgid ""
-"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
-"if any."
-msgstr ""
+#: commands/tablecmds.c:5460
+msgid "constraint must be added to child tables too"
+msgstr "restrição deve ser adicionada as tabelas descendentes também"
 
-#: utils/misc/guc.c:1647
-msgid "Sets the maximum number of locks per transaction."
-msgstr "Define o número máximo de bloqueios por transação."
+#: commands/tablecmds.c:5548
+msgid "constraints on permanent tables may reference only permanent tables"
+msgstr ""
+"restrições em tabelas permanentes só podem referenciar tabelas permanentes"
 
-#: utils/misc/guc.c:1648
+#: commands/tablecmds.c:5555
 msgid ""
-"The shared lock table is sized on the assumption that at most "
-"max_locks_per_transaction * max_connections distinct objects will need to be "
-"locked at any one time."
+"constraints on unlogged tables may reference only permanent or unlogged "
+"tables"
 msgstr ""
-"A tabela compartilhada de bloqueios é dimensionada utilizando a suposição de "
-"que max_locks_per_transaction * max_connections objetos distintos necessitam "
-"ser bloqueados simultaneamente."
+"restrições em tabelas unlogged só podem referenciar tabelas permanentes ou "
+"unlogged"
 
-#: utils/misc/guc.c:1658
-msgid "Sets the maximum allowed time to complete client authentication."
+#: commands/tablecmds.c:5561
+msgid "constraints on temporary tables may reference only temporary tables"
 msgstr ""
-"Define o tempo máximo permitido para completar uma autenticação do cliente."
-
-#: utils/misc/guc.c:1669
-msgid "Waits N seconds on connection startup before authentication."
-msgstr "Espera N segundos após autenticação durante inicialização da conexão."
-
-#: utils/misc/guc.c:1679
-msgid "Sets the number of WAL files held for standby servers."
-msgstr "Define o número de arquivos WAL mantidos para servidores de espera."
+"restrições em tabelas temporárias só podem referenciar tabelas temporárias"
 
-#: utils/misc/guc.c:1688
-msgid ""
-"Sets the maximum distance in log segments between automatic WAL checkpoints."
+#: commands/tablecmds.c:5622
+msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr ""
-"Define a distância máxima em segmentos de log entre pontos de controle WAL "
-"automáticos."
+"número de colunas que referenciam e são referenciadas em um chave "
+"estrangeira não correspondem"
 
-#: utils/misc/guc.c:1697
-msgid "Sets the maximum time between automatic WAL checkpoints."
-msgstr "Define o tempo máximo entre pontos de controle WAL automáticos."
+#: commands/tablecmds.c:5711
+#, c-format
+msgid "foreign key constraint \"%s\" cannot be implemented"
+msgstr "restrição de chave estrangeira \"%s\" não pode ser implementada"
 
-#: utils/misc/guc.c:1707
-msgid ""
-"Enables warnings if checkpoint segments are filled more frequently than this."
-msgstr ""
-"Habilita avisos caso segmentos dos pontos de controle estejam sendo "
-"preenchidos mais frequentemente do que esse."
+#: commands/tablecmds.c:5714
+#, c-format
+msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
+msgstr "Colunas chave \"%s\" e \"%s\" são de tipos incompatíveis: %s e %s."
 
-#: utils/misc/guc.c:1709
-msgid ""
-"Write a message to the server log if checkpoints caused by the filling of "
-"checkpoint segment files happens more frequently than this number of "
-"seconds. Zero turns off the warning."
-msgstr ""
-"Escreve uma mensagem no log do servidor se pontos de controle causados pelo "
-"preenchimento de arquivos de segmento dos pontos de controle acontece mais "
-"frequentemente do que esse número de segundos. Zero desabilita esse aviso."
+#: commands/tablecmds.c:5827
+#, c-format
+msgid "foreign key constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "restrição de chave estrangeira \"%s\" da relação \"%s\" não existe"
 
-#: utils/misc/guc.c:1720
-msgid "Sets the number of disk-page buffers in shared memory for WAL."
+#: commands/tablecmds.c:5890
+#, c-format
+msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr ""
-"Define o número de buffers de páginas do disco para WAL na memória "
-"compartilhada."
+"coluna \"%s\" referenciada na restrição de chave estrangeira não existe"
 
-#: utils/misc/guc.c:1730
-msgid "WAL writer sleep time between WAL flushes."
-msgstr "Tempo de adormecimento do escritor do WAL entre ciclos do WAL."
+#: commands/tablecmds.c:5895
+#, c-format
+msgid "cannot have more than %d keys in a foreign key"
+msgstr "não pode ter mais do que %d chaves em uma chave estrangeira"
 
-#: utils/misc/guc.c:1741
-msgid "Sets the maximum number of simultaneously running WAL sender processes."
+#: commands/tablecmds.c:5960
+#, c-format
+msgid "cannot use a deferrable primary key for referenced table \"%s\""
 msgstr ""
-"Define o número máximo de processos de limpeza automática executados "
-"simultaneamente."
+"não pode utilizar uma chave primária postergável na tabela referenciada \"%s"
+"\""
 
-#: utils/misc/guc.c:1750
-msgid "WAL sender sleep time between WAL replications."
-msgstr ""
-"Tempo de adormecimento do transmissor de WAL entre ciclos de replicação do "
-"WAL."
+#: commands/tablecmds.c:5977
+#, c-format
+msgid "there is no primary key for referenced table \"%s\""
+msgstr "não há chave primária na tabela referenciada \"%s\""
 
-#: utils/misc/guc.c:1760
-msgid ""
-"Sets the delay in microseconds between transaction commit and flushing WAL "
-"to disk."
+#: commands/tablecmds.c:6127
+#, c-format
+msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
 msgstr ""
-"Define o atraso em microsegundos entre efetivar uma transação e escrever WAL "
-"no disco."
+"não pode utilizar uma restrição de unicidade postergável na tabela "
+"referenciada \"%s\""
 
-#: utils/misc/guc.c:1770
+#: commands/tablecmds.c:6132
+#, c-format
 msgid ""
-"Sets the minimum concurrent open transactions before performing commit_delay."
+"there is no unique constraint matching given keys for referenced table \"%s\""
 msgstr ""
-"Define o número mínimo de transações concorrentes abertas antes de esperar "
-"commit_delay."
+"não há restrição de unicidade que corresponde com as colunas informadas na "
+"tabela referenciada \"%s\""
 
-#: utils/misc/guc.c:1780
-msgid "Sets the number of digits displayed for floating-point values."
-msgstr "Define o número de dígitos mostrados para valores de ponto flutuante."
+#: commands/tablecmds.c:6183
+#, c-format
+msgid "validating foreign key constraint \"%s\""
+msgstr "validando restrição de chave estrangeira \"%s\""
 
-#: utils/misc/guc.c:1781
-msgid ""
-"This affects real, double precision, and geometric data types. The parameter "
-"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
-"appropriate)."
-msgstr ""
-"Isso afeta os tipos de dado real, double precision e geometric. O valor do "
-"parâmetro é formatado segundo padrão de dígitos (FLT_DIG ou DBL_DIG conforme "
-"adequado)."
+#: commands/tablecmds.c:6479
+#, c-format
+msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
+msgstr "não pode remover restrição herdada \"%s\" da relação \"%s\""
 
-#: utils/misc/guc.c:1791
-msgid "Sets the minimum execution time above which statements will be logged."
-msgstr ""
-"Define o tempo mínimo de execução no qual os comandos serão registrados."
+#: commands/tablecmds.c:6506 commands/tablecmds.c:6619
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist"
+msgstr "restrição \"%s\" da relação \"%s\" não existe"
 
-#: utils/misc/guc.c:1793
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Zero registra todas as consultas. -1 desabilita essa funcionalidade."
+#: commands/tablecmds.c:6512
+#, c-format
+msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
+msgstr "restrição \"%s\" da relação \"%s\" não existe, ignorando"
 
-#: utils/misc/guc.c:1802
-msgid ""
-"Sets the minimum execution time above which autovacuum actions will be "
-"logged."
-msgstr ""
-"Define o tempo mínimo de execução no qual as ações de limpeza automática "
-"serão registradas."
+#: commands/tablecmds.c:6654
+msgid "cannot alter column type of typed table"
+msgstr "não pode alterar tipo de coluna de tabela tipada"
 
-#: utils/misc/guc.c:1804
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr "Zero registra todas as ações. -1 desabilita essa funcionalidade."
+#: commands/tablecmds.c:6677
+#, c-format
+msgid "cannot alter inherited column \"%s\""
+msgstr "não pode alterar coluna herdada \"%s\""
 
-#: utils/misc/guc.c:1813
-msgid "Background writer sleep time between rounds."
-msgstr "Tempo de adormecimento do escritor em segundo plano entre ciclos."
+#: commands/tablecmds.c:6719
+msgid "transform expression must not return a set"
+msgstr "expressão de transformação não deve retornar um conjunto"
 
-#: utils/misc/guc.c:1823
-msgid "Background writer maximum number of LRU pages to flush per round."
-msgstr ""
-"Número máximo de páginas do LRU do escritor em segundo plano a serem "
-"escritas por ciclo."
+#: commands/tablecmds.c:6725
+msgid "cannot use subquery in transform expression"
+msgstr "não pode utilizar subconsulta em expressão de transformação"
 
-#: utils/misc/guc.c:1838
-msgid ""
-"Number of simultaneous requests that can be handled efficiently by the disk "
-"subsystem."
-msgstr ""
-"Número de requisições simultâneas que podem ser manipuladas eficientemente "
-"pelo subsistema de disco."
+#: commands/tablecmds.c:6729
+msgid "cannot use aggregate function in transform expression"
+msgstr "não pode utilizar função de agregação em expressão de transformação"
 
-#: utils/misc/guc.c:1839
-msgid ""
-"For RAID arrays, this should be approximately the number of drive spindles "
-"in the array."
-msgstr ""
-"Para arranjos RAID, este deveria ser aproximadamente o número de discos em "
-"um arranjo."
+#: commands/tablecmds.c:6733
+msgid "cannot use window function in transform expression"
+msgstr "não pode utilizar função deslizante em expressão de transformação"
 
-#: utils/misc/guc.c:1852
-msgid "Automatic log file rotation will occur after N minutes."
-msgstr "Rotação de arquivo de log automática ocorrerá após N minutos."
+#: commands/tablecmds.c:6752
+#, c-format
+msgid "column \"%s\" cannot be cast to type %s"
+msgstr "coluna \"%s\" não pode ser convertida para tipo %s"
 
-#: utils/misc/guc.c:1862
-msgid "Automatic log file rotation will occur after N kilobytes."
-msgstr "Rotação de arquivo de log automática ocorrerá após N kilobytes."
+#: commands/tablecmds.c:6799
+#, c-format
+msgid "type of inherited column \"%s\" must be changed in child tables too"
+msgstr ""
+"tipo de coluna herdada \"%s\" deve ser alterado nas tabelas descendentes "
+"também"
 
-#: utils/misc/guc.c:1872
-msgid "Shows the maximum number of function arguments."
-msgstr "Mostra o número máximo de argumentos da função."
+#: commands/tablecmds.c:6880
+#, c-format
+msgid "cannot alter type of column \"%s\" twice"
+msgstr "não pode alterar tipo de coluna \"%s\" duas vezes"
 
-#: utils/misc/guc.c:1882
-msgid "Shows the maximum number of index keys."
-msgstr "Mostra o número máximo de chaves do índice."
+#: commands/tablecmds.c:6916
+#, c-format
+msgid "default for column \"%s\" cannot be cast to type %s"
+msgstr "valor padrão para coluna \"%s\" não pode ser convertido para tipo %s"
 
-#: utils/misc/guc.c:1892
-msgid "Shows the maximum identifier length."
-msgstr "Mostra o tamanho máximo de identificador."
+#: commands/tablecmds.c:7042
+msgid "cannot alter type of a column used by a view or rule"
+msgstr "não pode alterar tipo de uma coluna utilizada por uma visão ou regra"
 
-#: utils/misc/guc.c:1902
-msgid "Shows the size of a disk block."
-msgstr "Mostra o tamanho de um bloco do disco."
+#: commands/tablecmds.c:7043 commands/tablecmds.c:7062
+#, c-format
+msgid "%s depends on column \"%s\""
+msgstr "%s depende da coluna \"%s\""
 
-#: utils/misc/guc.c:1912
-msgid "Shows the number of pages per disk file."
-msgstr "Mostra o número de páginas por arquivo do disco."
+#: commands/tablecmds.c:7061
+msgid "cannot alter type of a column used in a trigger definition"
+msgstr ""
+"não pode alterar tipo de uma coluna utilizada em uma definição de gatilho"
 
-#: utils/misc/guc.c:1922
-msgid "Shows the block size in the write ahead log."
-msgstr "Mostra o tamanho do bloco no log de transação."
+#: commands/tablecmds.c:7420
+#, c-format
+msgid "cannot change owner of index \"%s\""
+msgstr "não pode mudar dono do índice \"%s\""
 
-#: utils/misc/guc.c:1932
-msgid "Shows the number of pages per write ahead log segment."
-msgstr "Mostra o número de páginas por segmento de log de transação."
+#: commands/tablecmds.c:7422
+msgid "Change the ownership of the index's table, instead."
+msgstr "Ao invés disso, mude o dono da tabela do índice."
 
-#: utils/misc/guc.c:1945
-msgid "Time to sleep between autovacuum runs."
-msgstr "Tempo de adormecimento entre execuções do autovacuum."
+#: commands/tablecmds.c:7438
+#, c-format
+msgid "cannot change owner of sequence \"%s\""
+msgstr "não pode mudar dono da sequência \"%s\""
 
-#: utils/misc/guc.c:1954
-msgid "Minimum number of tuple updates or deletes prior to vacuum."
-msgstr "Número mínimo de atualizações ou exclusões de tuplas antes de limpar."
+#: commands/tablecmds.c:7440 commands/tablecmds.c:9024
+#, c-format
+msgid "Sequence \"%s\" is linked to table \"%s\"."
+msgstr "Sequência \"%s\" está ligada a tabela \"%s\"."
 
-#: utils/misc/guc.c:1962
-msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
-msgstr ""
-"Número mínimo de inserções, atualizações ou exclusões antes de analisar."
+#: commands/tablecmds.c:7461 commands/tablecmds.c:9042
+#, c-format
+msgid "\"%s\" is not a table, view, sequence, or foreign table"
+msgstr "\"%s\" não é uma tabela, visão, sequência ou tabela externa"
 
-#: utils/misc/guc.c:1971
-msgid ""
-"Age at which to autovacuum a table to prevent transaction ID wraparound."
-msgstr ""
-"Identificador para limpar automaticamente uma tabela para previnir "
-"reciclagem do ID de transação."
+#: commands/tablecmds.c:7716
+msgid "cannot have multiple SET TABLESPACE subcommands"
+msgstr "não pode ter múltiplos subcomandos SET TABLESPACE"
 
-#: utils/misc/guc.c:1981
-msgid ""
-"Sets the maximum number of simultaneously running autovacuum worker "
-"processes."
-msgstr ""
-"Define o número máximo de processos de limpeza automática executados "
-"simultaneamente."
+#: commands/tablecmds.c:7768
+#, c-format
+msgid "\"%s\" is not a table, index, or TOAST table"
+msgstr "\"%s\" não é uma tabela, índice ou tabela TOAST"
 
-#: utils/misc/guc.c:1990
-msgid "Time between issuing TCP keepalives."
-msgstr "Tempo entre envios de mantenha-se vivo (keepalive) do TCP."
+#: commands/tablecmds.c:7889
+#, c-format
+msgid "cannot move system relation \"%s\""
+msgstr "não pode mover relação do sistema \"%s\""
 
-#: utils/misc/guc.c:1991 utils/misc/guc.c:2001
-msgid "A value of 0 uses the system default."
-msgstr "Um valor 0 utiliza o padrão do sistema."
+#: commands/tablecmds.c:7905
+msgid "cannot move temporary tables of other sessions"
+msgstr "não pode mover tabelas temporárias de outras sessões"
 
-#: utils/misc/guc.c:2000
-msgid "Time between TCP keepalive retransmits."
-msgstr "Tempo entre retransmissões de mantenha-se vivo (keepalive) do TCP."
+#: commands/tablecmds.c:8097
+msgid "cannot change inheritance of typed table"
+msgstr "não pode mudar herança de tabela tipada"
 
-#: utils/misc/guc.c:2010
-msgid ""
-"Set the amount of traffic to send and receive before renegotiating the "
-"encryption keys."
-msgstr ""
-"Define a quantidade de tráfego enviado e recebido antes de renegociar as "
-"chaves de criptografia."
+#: commands/tablecmds.c:8183
+msgid "circular inheritance not allowed"
+msgstr "herança circular não é permitida"
 
-#: utils/misc/guc.c:2020
-msgid "Maximum number of TCP keepalive retransmits."
-msgstr ""
-"Número máximo de retransmissões de mantenha-se vivo (keepalive) do TCP."
+#: commands/tablecmds.c:8184
+#, c-format
+msgid "\"%s\" is already a child of \"%s\"."
+msgstr "\"%s\" já é um descendente de \"%s\"."
 
-#: utils/misc/guc.c:2021
-msgid ""
-"This controls the number of consecutive keepalive retransmits that can be "
-"lost before a connection is considered dead. A value of 0 uses the system "
-"default."
-msgstr ""
-"Isso controla o número de retransmissões consecutivas de mantenha-se vivo "
-"(keepalive) que podem ser perdidas antes que uma conexão seja considerada "
-"fechada. Um valor de 0 utiliza o padrão do sistema."
+#: commands/tablecmds.c:8192
+#, c-format
+msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
+msgstr "tabela \"%s\" sem OIDs não pode herdar de tabela \"%s\" com OIDs"
 
-#: utils/misc/guc.c:2031
-msgid "Sets the maximum allowed result for exact search by GIN."
-msgstr ""
-"Define o resultado máximo permitido por uma busca exata utilizando GIN."
+#: commands/tablecmds.c:8328
+#, c-format
+msgid "column \"%s\" in child table must be marked NOT NULL"
+msgstr "coluna \"%s\" na tabela descendente deve ser definida como NOT NULL"
 
-#: utils/misc/guc.c:2041
-msgid "Sets the planner's assumption about the size of the disk cache."
-msgstr "Define a suposição do planejador sobre o tamanho da cache do disco."
+#: commands/tablecmds.c:8344
+#, c-format
+msgid "child table is missing column \"%s\""
+msgstr "tabela descendente está faltando coluna \"%s\""
 
-#: utils/misc/guc.c:2042
-msgid ""
-"That is, the portion of the kernel's disk cache that will be used for "
-"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
-"kB each."
+#: commands/tablecmds.c:8423
+#, c-format
+msgid "child table \"%s\" has different definition for check constraint \"%s\""
 msgstr ""
-"Isto é, a porção da cache do disco que será utilizada pelo arquivos de dados "
-"do PostgreSQL. Isto é medido em páginas do disco, que são normalmente 8 kB "
-"cada."
+"tabela descendente \"%s\" tem definição diferente para restrição de "
+"verificação \"%s\""
 
-#: utils/misc/guc.c:2054
-msgid "Shows the server version as an integer."
-msgstr "Mostra a versão do servidor como um inteiro."
+#: commands/tablecmds.c:8447
+#, c-format
+msgid "child table is missing constraint \"%s\""
+msgstr "tabela descendente está faltando restrição \"%s\""
 
-#: utils/misc/guc.c:2064
-msgid "Log the use of temporary files larger than this number of kilobytes."
-msgstr ""
-"Registra o uso de arquivos temporários maiores do que este número de "
-"kilobytes."
+#: commands/tablecmds.c:8527
+#, c-format
+msgid "relation \"%s\" is not a parent of relation \"%s\""
+msgstr "relação \"%s\" não é um ancestral da relação \"%s\""
 
-#: utils/misc/guc.c:2065
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
-msgstr ""
-"Zero registra todos os arquivos. O padrão é -1 (desabilita essa "
-"funcionalidade)."
+#: commands/tablecmds.c:8744
+msgid "typed tables cannot inherit"
+msgstr "tabelas tipadas não podem herdar"
 
-#: utils/misc/guc.c:2074
-msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
-msgstr ""
-"Define o tamanho reservado para pg_stat_activity.current_query, em bytes."
+#: commands/tablecmds.c:8775
+#, c-format
+msgid "table is missing column \"%s\""
+msgstr "tabela está faltando coluna \"%s\""
 
-#: utils/misc/guc.c:2092
-msgid ""
-"Sets the planner's estimate of the cost of a sequentially fetched disk page."
-msgstr ""
-"Define a estimativa do planejador do custo de busca sequencial de uma página "
-"no disco."
+#: commands/tablecmds.c:8785
+#, c-format
+msgid "table has column \"%s\" where type requires \"%s\""
+msgstr "tabela tem coluna \"%s\" onde tipo requer \"%s\""
 
-#: utils/misc/guc.c:2101
-msgid ""
-"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
-"page."
-msgstr ""
-"Define a estimativa do planejador do custo de busca não sequencial de uma "
-"página no disco."
+#: commands/tablecmds.c:8794
+#, c-format
+msgid "table \"%s\" has different type for column \"%s\""
+msgstr "tabela \"%s\" tem tipo diferente para coluna \"%s\""
 
-#: utils/misc/guc.c:2110
-msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
-msgstr ""
-"Define a estimativa do planejador do custo de processamento de cada tupla "
-"(registro)."
+#: commands/tablecmds.c:8807
+#, c-format
+msgid "table has extra column \"%s\""
+msgstr "tabela tem coluna extra \"%s\""
 
-#: utils/misc/guc.c:2119
-msgid ""
-"Sets the planner's estimate of the cost of processing each index entry "
-"during an index scan."
-msgstr ""
-"Define a estimativa do planejador do custo de processamento de cada índice "
-"durante uma busca indexada."
+#: commands/tablecmds.c:8854
+#, c-format
+msgid "\"%s\" is not a typed table"
+msgstr "\"%s\" não é uma tabela tipada"
 
-#: utils/misc/guc.c:2128
-msgid ""
-"Sets the planner's estimate of the cost of processing each operator or "
-"function call."
-msgstr ""
-"Define a estimativa do planejador do custo de processamento de cada operador "
-"ou chamada de função."
+#: commands/tablecmds.c:9023
+msgid "cannot move an owned sequence into another schema"
+msgstr "não pode mover uma sequência ligada para outro esquema"
 
-#: utils/misc/guc.c:2138
-msgid ""
-"Sets the planner's estimate of the fraction of a cursor's rows that will be "
-"retrieved."
-msgstr ""
-"Define a estimativa do planejador da fração de registros do cursor que será "
-"recuperada."
+#: commands/tablecmds.c:9099
+#, c-format
+msgid "relation \"%s\" already exists in schema \"%s\""
+msgstr "relação \"%s\" já existe no esquema \"%s\""
 
-#: utils/misc/guc.c:2148
-msgid "GEQO: selective pressure within the population."
-msgstr "GEQO: pressão seletiva na população."
+#: nodes/nodeFuncs.c:114 nodes/nodeFuncs.c:140 parser/parse_coerce.c:1645
+#: parser/parse_coerce.c:1662 parser/parse_coerce.c:1724
+#: parser/parse_expr.c:1636 parser/parse_func.c:367 parser/parse_oper.c:948
+#, c-format
+msgid "could not find array type for data type %s"
+msgstr "não pôde encontrar tipo array para tipo de dado %s"
 
-#: utils/misc/guc.c:2157
-msgid "GEQO: seed for random path selection."
-msgstr "GEQO: semente para seleção de caminhos randômicos."
+#: catalog/pg_largeobject.c:116 catalog/pg_largeobject.c:176
+#: catalog/aclchk.c:647 catalog/aclchk.c:3677 catalog/aclchk.c:4368
+#: catalog/objectaddress.c:199 storage/large_object/inv_api.c:277
+#, c-format
+msgid "large object %u does not exist"
+msgstr "objeto grande %u não existe"
 
-#: utils/misc/guc.c:2166
-msgid "Multiple of the average buffer usage to free per round."
-msgstr "Múltiplo da média de uso dos buffers a serem liberados por ciclo."
+#: catalog/pg_largeobject.c:200 catalog/objectaddress.c:824
+#: libpq/be-fsstubs.c:287
+#, c-format
+msgid "must be owner of large object %u"
+msgstr "deve ser dono do objeto grande %u"
 
-#: utils/misc/guc.c:2175
-msgid "Sets the seed for random-number generation."
-msgstr "Define a semente para geração de números randômicos."
+#: catalog/heap.c:264
+#, c-format
+msgid "permission denied to create \"%s.%s\""
+msgstr "permissão negada ao criar \"%s.%s\""
 
-#: utils/misc/guc.c:2185
-msgid ""
-"Number of tuple updates or deletes prior to vacuum as a fraction of "
-"reltuples."
-msgstr ""
-"Número de atualizações ou exclusões de tupla antes de limpar como uma fração "
-"de reltuples."
+#: catalog/heap.c:266
+msgid "System catalog modifications are currently disallowed."
+msgstr "Modificações no catálogo do sistema estão atualmente desabilitadas."
 
-#: utils/misc/guc.c:2193
-msgid ""
-"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
-"of reltuples."
-msgstr ""
-"Número de inserções, atualizações ou exclusões de tupla antes de analisar "
-"como uma fração de reltuples."
+#: catalog/heap.c:406
+#, c-format
+msgid "column name \"%s\" conflicts with a system column name"
+msgstr "nome de coluna \"%s\" conflita com um nome de coluna do sistema"
 
-#: utils/misc/guc.c:2202
-msgid ""
-"Time spent flushing dirty buffers during checkpoint, as fraction of "
-"checkpoint interval."
+#: catalog/heap.c:422
+#, c-format
+msgid "column name \"%s\" specified more than once"
+msgstr "nome da coluna \"%s\" especificado mais de uma vez"
+
+#: catalog/heap.c:472
+#, c-format
+msgid "column \"%s\" has type \"unknown\""
+msgstr "coluna \"%s\" tem tipo \"unknown\""
+
+#: catalog/heap.c:473
+msgid "Proceeding with relation creation anyway."
+msgstr "Prosseguindo com a criação da relação mesmo assim."
+
+#: catalog/heap.c:486
+#, c-format
+msgid "column \"%s\" has pseudo-type %s"
+msgstr "coluna \"%s\" tem pseudo-tipo %s"
+
+#: catalog/heap.c:516
+#, c-format
+msgid "composite type %s cannot be made a member of itself"
+msgstr "tipo composto %s não pode se tornar membro de si próprio"
+
+#: catalog/heap.c:558
+#, fuzzy, c-format
+msgid "no collation was derived for column \"%s\" with collatable type %s"
 msgstr ""
-"Tempo gasto escrevendo buffers sujos durante o ponto de controle, como "
-"fração do intervalo de ponto de controle."
+"nenhuma ordenação foi derivada para coluna \"%s\" com tipo %s ordenável"
 
-#: utils/misc/guc.c:2220
-msgid "Sets the shell command that will be called to archive a WAL file."
+#: catalog/heap.c:1028
+msgid ""
+"A relation has an associated type of the same name, so you must use a name "
+"that doesn't conflict with any existing type."
 msgstr ""
-"Define um comando do interpretador de comandos (shell) que será chamado para "
-"arquivar um arquivo do WAL."
+"A relação tem um tipo associado com o mesmo nome, então você deve utilizar "
+"um nome que não conflite com outro tipo existente."
 
-#: utils/misc/guc.c:2229
-msgid "Sets the client's character set encoding."
-msgstr "Define a codificação do conjunto de caracteres do cliente."
+#: catalog/heap.c:2141
+#, c-format
+msgid "check constraint \"%s\" already exists"
+msgstr "restrição de verificação \"%s\" já existe"
 
-#: utils/misc/guc.c:2239
-msgid "Controls information prefixed to each log line."
-msgstr "Controla informação prefixada em cada linha do log."
+#: catalog/heap.c:2291
+#, c-format
+msgid "merging constraint \"%s\" with inherited definition"
+msgstr "juntando restrição \"%s\" com definição herdada"
 
-#: utils/misc/guc.c:2240
-msgid "If blank, no prefix is used."
-msgstr "Se estiver em branco, nenhum prefixo é utilizado."
+#: catalog/heap.c:2389
+msgid "cannot use column references in default expression"
+msgstr "não pode utilizar referência à coluna na expressão padrão"
 
-#: utils/misc/guc.c:2248
-msgid "Sets the time zone to use in log messages."
-msgstr "Define a zona horária a ser utilizada em mensagens de log."
+#: catalog/heap.c:2397
+msgid "default expression must not return a set"
+msgstr "expressão padrão não deve retornar um conjunto"
 
-#: utils/misc/guc.c:2257
-msgid "Sets the display format for date and time values."
-msgstr "Define o formato de exibição para valores de data e hora."
+#: catalog/heap.c:2405
+msgid "cannot use subquery in default expression"
+msgstr "não pode utilizar subconsulta na expressão padrão"
 
-#: utils/misc/guc.c:2258
-msgid "Also controls interpretation of ambiguous date inputs."
-msgstr "Também controla interpretação de entrada de datas ambíguas."
+#: catalog/heap.c:2409
+msgid "cannot use aggregate function in default expression"
+msgstr "não pode utilizar função de agregação na expressão padrão"
 
-#: utils/misc/guc.c:2268
-msgid "Sets the default tablespace to create tables and indexes in."
-msgstr "Define a tablespace padrão para criação de tabelas e índices."
+#: catalog/heap.c:2413
+msgid "cannot use window function in default expression"
+msgstr "não pode utilizar função deslizante na expressão padrão"
 
-#: utils/misc/guc.c:2269
-msgid "An empty string selects the database's default tablespace."
-msgstr ""
-"Uma cadeia de caracteres vazia seleciona a tablespace padrão do banco de "
-"dados."
+#: catalog/heap.c:2432 rewrite/rewriteHandler.c:1030
+#, c-format
+msgid "column \"%s\" is of type %s but default expression is of type %s"
+msgstr "coluna \"%s\" é do tipo %s mas expressão padrão é do tipo %s"
 
-#: utils/misc/guc.c:2278
-msgid "Sets the tablespace(s) to use for temporary tables and sort files."
+#: catalog/heap.c:2483
+#, c-format
+msgid "only table \"%s\" can be referenced in check constraint"
 msgstr ""
-"Define a(s) tablespace(s) a ser(em) utilizada(s) para tabelas temporárias e "
-"arquivos de ordenação."
+"somente a tabela \"%s\" pode ser referenciada na restrição de verificação"
 
-#: utils/misc/guc.c:2288
-msgid "Sets the path for dynamically loadable modules."
-msgstr "Define o caminho para módulos carregáveis dinamicamente."
+#: catalog/heap.c:2739
+msgid "unsupported ON COMMIT and foreign key combination"
+msgstr "combinação ON COMMIT e chave estrangeira não é suportada"
 
-#: utils/misc/guc.c:2289
+#: catalog/heap.c:2740
+#, c-format
 msgid ""
-"If a dynamically loadable module needs to be opened and the specified name "
-"does not have a directory component (i.e., the name does not contain a "
-"slash), the system will search this path for the specified file."
+"Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
+"setting."
 msgstr ""
-"Se o módulo carregável dinamicamente necessita ser aberto e o nome "
-"especificado não tem um componente de diretório (i.e., o nome não contém uma "
-"barra), o sistema irá procurar o caminho para o arquivo especificado."
+"Tabela \"%s\" referencia \"%s\", mas elas não têm a mesma definição de ON "
+"COMMIT."
 
-#: utils/misc/guc.c:2301
-msgid "Sets the location of the Kerberos server key file."
-msgstr "Define o local do arquivo da chave do servidor Kerberos."
+#: catalog/heap.c:2745
+msgid "cannot truncate a table referenced in a foreign key constraint"
+msgstr ""
+"não pode truncar uma tabela referenciada em uma restrição de chave "
+"estrangeira"
 
-#: utils/misc/guc.c:2311
-msgid "Sets the name of the Kerberos service."
-msgstr "Define o nome do serviço Kerberos."
+#: catalog/heap.c:2746
+#, c-format
+msgid "Table \"%s\" references \"%s\"."
+msgstr "Tabela \"%s\" referencia \"%s\"."
 
-#: utils/misc/guc.c:2320
-msgid "Sets the Bonjour service name."
-msgstr "Define o nome do serviço Bonjour."
+#: catalog/heap.c:2748
+#, c-format
+msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
+msgstr ""
+"Trunque a tabela \"%s\" ao mesmo tempo, ou utilize TRUNCATE ... CASCADE."
 
-#: utils/misc/guc.c:2331
-msgid "Shows the collation order locale."
-msgstr "Mostra a configuração regional utilizada na comparação ao ordenar."
+#: catalog/pg_aggregate.c:100
+msgid "cannot determine transition data type"
+msgstr "não pode determinar tipo de dado transitório"
 
-#: utils/misc/guc.c:2341
-msgid "Shows the character classification and case conversion locale."
+#: catalog/pg_aggregate.c:101
+msgid ""
+"An aggregate using a polymorphic transition type must have at least one "
+"polymorphic argument."
 msgstr ""
-"Mostra a configuração regional de classificação de caracteres e conversão "
-"entre maiúsculas/minúsculas."
+"Uma agregação utilizando um tipo transitório polimórfico deve ter pelo menos "
+"um argumento polimórfico."
 
-#: utils/misc/guc.c:2351
-msgid "Sets the language in which messages are displayed."
-msgstr "Define a língua na qual as mensagens são mostradas."
+#: catalog/pg_aggregate.c:124
+#, c-format
+msgid "return type of transition function %s is not %s"
+msgstr "tipo retornado da função de transição %s não é %s"
 
-#: utils/misc/guc.c:2360
-msgid "Sets the locale for formatting monetary amounts."
-msgstr "Define a configuração regional para formato de moeda."
+#: catalog/pg_aggregate.c:144
+msgid ""
+"must not omit initial value when transition function is strict and "
+"transition type is not compatible with input type"
+msgstr ""
+"não deve omitir valor inicial quando a função de transição é estrita e o "
+"tipo de transição não é compatível com tipo de entrada"
 
-#: utils/misc/guc.c:2369
-msgid "Sets the locale for formatting numbers."
-msgstr "Define a configuração regional para formato de número."
+#: catalog/pg_aggregate.c:175 catalog/pg_proc.c:205
+msgid "cannot determine result data type"
+msgstr "não pode determinar tipo de dado do resultado"
 
-#: utils/misc/guc.c:2378
-msgid "Sets the locale for formatting date and time values."
-msgstr "Define a configuração regional para formato de data e hora."
+#: catalog/pg_aggregate.c:176
+msgid ""
+"An aggregate returning a polymorphic type must have at least one polymorphic "
+"argument."
+msgstr ""
+"Uma agregação retornando um tipo polimórfico deve ter pelo menos um "
+"argumento polimórfico."
 
-#: utils/misc/guc.c:2387
-msgid "Lists shared libraries to preload into server."
-msgstr "Mostra bibliotecas compartilhadas a serem carregadas no servidor."
+#: catalog/pg_aggregate.c:188 catalog/pg_proc.c:211
+msgid "unsafe use of pseudo-type \"internal\""
+msgstr "uso inseguro do pseudo-tipo \"internal\""
 
-#: utils/misc/guc.c:2397
-msgid "Lists shared libraries to preload into each backend."
+#: catalog/pg_aggregate.c:189 catalog/pg_proc.c:212
+msgid ""
+"A function returning \"internal\" must have at least one \"internal\" "
+"argument."
 msgstr ""
-"Mostra bibliotecas compartilhadas a serem carregadas em cdas processo "
-"servidor."
+"Uma função retornando \"internal\" deve ter pelo menos um argumento "
+"\"internal\"."
 
-#: utils/misc/guc.c:2407
-msgid "Sets the schema search order for names that are not schema-qualified."
+#: catalog/pg_aggregate.c:197
+msgid "sort operator can only be specified for single-argument aggregates"
 msgstr ""
-"Define a ordem de busca em esquemas para nomes que não especificam um "
-"esquema."
+"operador de ordenação só pode ser especificado por agregações de argumento "
+"único"
 
-#: utils/misc/guc.c:2418
-msgid "Sets the server (database) character set encoding."
-msgstr ""
-"Define a codificação do conjunto de caracteres do servidor (banco de dados)."
+#: catalog/pg_aggregate.c:337
+#, c-format
+msgid "function %s returns a set"
+msgstr "função %s retorna um conjunto"
 
-#: utils/misc/guc.c:2429
-msgid "Shows the server version."
-msgstr "Mostra a versão do servidor."
+#: catalog/pg_aggregate.c:362
+#, c-format
+msgid "function %s requires run-time type coercion"
+msgstr "função %s requer conversão de tipo em tempo de execução"
 
-#: utils/misc/guc.c:2440
-msgid "Sets the current role."
-msgstr "Define a role atual."
+#: catalog/aclchk.c:200
+msgid "grant options can only be granted to roles"
+msgstr "opções de concessão só podem ser concedidas a roles"
 
-#: utils/misc/guc.c:2451
-msgid "Sets the session user name."
-msgstr "Define o nome de usuário da sessão."
+#: catalog/aclchk.c:316
+#, c-format
+msgid "no privileges were granted for column \"%s\" of relation \"%s\""
+msgstr "nenhum privilégio foi concedido a coluna \"%s\" da relação \"%s\""
 
-#: utils/misc/guc.c:2461
-msgid "Sets the destination for server log output."
-msgstr "Define o destino do log do servidor."
+#: catalog/aclchk.c:321
+#, c-format
+msgid "no privileges were granted for \"%s\""
+msgstr "nenhum privilégio foi concedido a \"%s\""
 
-#: utils/misc/guc.c:2462
-msgid ""
-"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
-"\"eventlog\", depending on the platform."
+#: catalog/aclchk.c:329
+#, c-format
+msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
 msgstr ""
-"Valores válidos são combinações de \"stderr\", \"syslog\", \"csvlog\" e "
-"\"eventlog\", dependendo da plataforma."
+"nem todos privilégios foram concedidos a coluna \"%s\" da relação \"%s\""
 
-#: utils/misc/guc.c:2472
-msgid "Sets the destination directory for log files."
-msgstr "Define o diretório de destino dos arquivos de log."
+#: catalog/aclchk.c:334
+#, c-format
+msgid "not all privileges were granted for \"%s\""
+msgstr "nem todos privilégios foram concedidos a \"%s\""
 
-#: utils/misc/guc.c:2473
-msgid "Can be specified as relative to the data directory or as absolute path."
-msgstr ""
-"Pode ser especificado como caminho relativo ao diretório de dados ou como "
-"caminho absoluto."
+#: catalog/aclchk.c:345
+#, c-format
+msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
+msgstr "nenhum privilégio pôde ser revogado da coluna \"%s\" da relação \"%s\""
 
-#: utils/misc/guc.c:2482
-msgid "Sets the file name pattern for log files."
-msgstr "Define o padrão de nome de arquivo para arquivos de log."
+#: catalog/aclchk.c:350
+#, c-format
+msgid "no privileges could be revoked for \"%s\""
+msgstr "nenhum privilégio pôde ser revogado de \"%s\""
 
-#: utils/misc/guc.c:2493
-msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+#: catalog/aclchk.c:358
+#, c-format
+msgid ""
+"not all privileges could be revoked for column \"%s\" of relation \"%s\""
 msgstr ""
-"Define o nome do programa utilizado para identificar mensagens do PostgreSQL "
-"no syslog."
+"nem todos privilégios podem ser revogados da coluna \"%s\" da relação \"%s\""
 
-#: utils/misc/guc.c:2504
-msgid "Sets the time zone for displaying and interpreting time stamps."
-msgstr "Define a zona horária para exibição e interpretação de timestamps."
-
-#: utils/misc/guc.c:2513
-msgid "Selects a file of time zone abbreviations."
-msgstr "Seleciona um arquivo de abreviações de zonas horárias."
-
-#: utils/misc/guc.c:2522
-msgid "Sets the current transaction's isolation level."
-msgstr "Define o nível de isolamento da transação atual."
-
-#: utils/misc/guc.c:2532
-msgid "Sets the owning group of the Unix-domain socket."
-msgstr "Define o grupo dono do soquete de domínio Unix."
-
-#: utils/misc/guc.c:2533
-msgid ""
-"The owning user of the socket is always the user that starts the server."
-msgstr "O usuário dono do soquete é sempre o usuário que inicia o servidor."
-
-#: utils/misc/guc.c:2542
-msgid "Sets the directory where the Unix-domain socket will be created."
-msgstr "Define o diretório onde o soquete de domínio Unix será criado."
-
-#: utils/misc/guc.c:2552
-msgid "Sets the host name or IP address(es) to listen to."
-msgstr "Define o nome da máquina ou endereço(s) IP para escutar."
-
-#: utils/misc/guc.c:2562
-msgid "Sets the list of known custom variable classes."
-msgstr "Define a lista de classes de variáveis personalizadas conhecidas."
-
-#: utils/misc/guc.c:2572
-msgid "Sets the server's data directory."
-msgstr "Define o diretório de dados do servidor."
-
-#: utils/misc/guc.c:2582
-msgid "Sets the server's main configuration file."
-msgstr "Define o arquivo de configuração principal do servidor."
+#: catalog/aclchk.c:363
+#, c-format
+msgid "not all privileges could be revoked for \"%s\""
+msgstr "nem todos privilégios podem ser revogados de \"%s\""
 
-#: utils/misc/guc.c:2592
-msgid "Sets the server's \"hba\" configuration file."
-msgstr "Define o arquivo de configuração \"hba\" do servidor."
+#: catalog/aclchk.c:442 catalog/aclchk.c:891
+#, c-format
+msgid "invalid privilege type %s for relation"
+msgstr "tipo de privilégio %s é inválido para relação"
 
-#: utils/misc/guc.c:2602
-msgid "Sets the server's \"ident\" configuration file."
-msgstr "Define o arquivo de configuração \"ident\" do servidor."
+#: catalog/aclchk.c:446 catalog/aclchk.c:895
+#, c-format
+msgid "invalid privilege type %s for sequence"
+msgstr "tipo de privilégio %s é inválido para sequência"
 
-#: utils/misc/guc.c:2612
-msgid "Writes the postmaster PID to the specified file."
-msgstr "Escreve o PID do postmaster no arquivo especificado."
+#: catalog/aclchk.c:450
+#, c-format
+msgid "invalid privilege type %s for database"
+msgstr "tipo de privilégio %s é inválido para banco de dados"
 
-#: utils/misc/guc.c:2622
-msgid "Writes temporary statistics files to the specified directory."
-msgstr ""
-"Escreve arquivos temporários de estatísticas em um diretório especificado."
+#: catalog/aclchk.c:454 catalog/aclchk.c:899
+#, c-format
+msgid "invalid privilege type %s for function"
+msgstr "tipo de privilégio %s é inválido para função"
 
-#: utils/misc/guc.c:2632
-msgid "Sets default text search configuration."
-msgstr "Define a configuração de busca textual padrão."
+#: catalog/aclchk.c:458
+#, c-format
+msgid "invalid privilege type %s for language"
+msgstr "tipo de privilégio %s é inválido para linguagem"
 
-#: utils/misc/guc.c:2642
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "Define a lista de cifras SSL permitidas."
+#: catalog/aclchk.c:462
+#, c-format
+msgid "invalid privilege type %s for large object"
+msgstr "tipo de privilégio %s é inválido para objeto grande"
 
-#: utils/misc/guc.c:2653
-msgid "Sets the application name to be reported in statistics and logs."
-msgstr "Define o nome da aplicação a ser informado em estatísticas e logs."
+#: catalog/aclchk.c:466
+#, c-format
+msgid "invalid privilege type %s for schema"
+msgstr "tipo de privilégio %s é inválido para esquema"
 
-#: utils/misc/guc.c:2672
-msgid "Sets whether \"\\'\" is allowed in string literals."
-msgstr "Define se \"\\'\" é permitido em cadeias de caracteres literais."
+#: catalog/aclchk.c:470
+#, c-format
+msgid "invalid privilege type %s for tablespace"
+msgstr "tipo de privilégio %s é inválido para tablespace"
 
-#: utils/misc/guc.c:2681
-msgid "Sets the output format for bytea."
-msgstr "Define o formato de saída para bytea."
+#: catalog/aclchk.c:474
+#, c-format
+msgid "invalid privilege type %s for foreign-data wrapper"
+msgstr "tipo de privilégio %s é inválido para adaptador de dados externos"
 
-#: utils/misc/guc.c:2690
-msgid "Sets the message levels that are sent to the client."
-msgstr "Define os níveis de mensagem que são enviadas ao cliente."
+#: catalog/aclchk.c:478
+#, c-format
+msgid "invalid privilege type %s for foreign server"
+msgstr "tipo de privilégio %s é inválido para servidor externo"
 
-#: utils/misc/guc.c:2691 utils/misc/guc.c:2740 utils/misc/guc.c:2750
-#: utils/misc/guc.c:2790
-msgid ""
-"Each level includes all the levels that follow it. The later the level, the "
-"fewer messages are sent."
-msgstr ""
-"Cada nível inclui todos os níveis que o seguem. Quanto mais superior for o "
-"nível, menos mensagens são enviadas."
+#: catalog/aclchk.c:517
+msgid "column privileges are only valid for relations"
+msgstr "privilégios de coluna só são válidos para relações"
 
-#: utils/misc/guc.c:2700
-msgid "Enables the planner to use constraints to optimize queries."
-msgstr "Habilita o planejador a usar retrições para otimizar consultas."
+#: catalog/aclchk.c:932
+msgid "default privileges cannot be set for columns"
+msgstr "privilégios padrão não podem ser definidos para colunas"
 
-#: utils/misc/guc.c:2701
-msgid ""
-"Table scans will be skipped if their constraints guarantee that no rows "
-"match the query."
-msgstr ""
-"Buscas em tabelas serão ignoradas se suas restrições garantirem que nenhum "
-"registro corresponde a consulta."
+#: catalog/aclchk.c:1678 access/heap/heapam.c:1082 access/heap/heapam.c:1110
+#: access/heap/heapam.c:1140
+#, c-format
+msgid "\"%s\" is an index"
+msgstr "\"%s\" é um índice"
 
-#: utils/misc/guc.c:2711
-msgid "Sets the transaction isolation level of each new transaction."
-msgstr "Define nível de isolamento de transação de cada nova transação."
+#: catalog/aclchk.c:1731
+#, c-format
+msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
+msgstr "sequência \"%s\" só suporta privilégios USAGE, SELECT e UPDATE"
 
-#: utils/misc/guc.c:2720
-msgid "Sets the display format for interval values."
-msgstr "Define o formato de exibição para valores interval."
+#: catalog/aclchk.c:1748
+msgid "invalid privilege type USAGE for table"
+msgstr "tipo de privilégio USAGE é inválido para tabela"
 
-#: utils/misc/guc.c:2730
-msgid "Sets the verbosity of logged messages."
-msgstr "Define o detalhamento das mensagens registradas."
+#: catalog/aclchk.c:1913
+#, c-format
+msgid "invalid privilege type %s for column"
+msgstr "tipo de privilégio %s é inválido para coluna"
 
-#: utils/misc/guc.c:2739
-msgid "Sets the message levels that are logged."
-msgstr "Define os níveis de mensagem que serão registrados."
+#: catalog/aclchk.c:1926
+#, c-format
+msgid "sequence \"%s\" only supports SELECT column privileges"
+msgstr "sequência \"%s\" só suporta privilégios SELECT"
 
-#: utils/misc/guc.c:2749
-msgid ""
-"Causes all statements generating error at or above this level to be logged."
-msgstr "Registra todos os comandos que geram erro neste nível ou acima."
+#: catalog/aclchk.c:2510
+#, c-format
+msgid "language \"%s\" is not trusted"
+msgstr "linguagem \"%s\" não é confiável"
 
-#: utils/misc/guc.c:2759
-msgid "Sets the type of statements logged."
-msgstr "Define os tipos de comandos registrados."
+#: catalog/aclchk.c:2512
+msgid "Only superusers can use untrusted languages."
+msgstr "Somente super-usuários podem utilizar linguagens não-confiáveis."
 
-#: utils/misc/guc.c:2769
-msgid "Sets the syslog \"facility\" to be used when syslog enabled."
-msgstr ""
-"Define o syslog \"facility\" a ser utilizado quando syslog estiver "
-"habilitado."
+#: catalog/aclchk.c:3019
+#, c-format
+msgid "unrecognized privilege type \"%s\""
+msgstr "tipo de privilégio \"%s\" desconhecido"
 
-#: utils/misc/guc.c:2779
-msgid "Sets the session's behavior for triggers and rewrite rules."
-msgstr "Define o comportamento de sessões para gatilhos e regras de reescrita."
+#: catalog/aclchk.c:3068
+#, c-format
+msgid "permission denied for column %s"
+msgstr "permissão negada para coluna %s"
 
-#: utils/misc/guc.c:2789
-msgid "Enables logging of recovery-related debugging information."
-msgstr "Habilita o registro de informação de depuração relacionada a recuperação."
+#: catalog/aclchk.c:3070
+#, c-format
+msgid "permission denied for relation %s"
+msgstr "permissão negada para relação %s"
 
-#: utils/misc/guc.c:2803
-msgid "Collects function-level statistics on database activity."
-msgstr "Coleta estatísticas de funções sobre a atividade do banco de dados."
+#: catalog/aclchk.c:3074
+#, c-format
+msgid "permission denied for database %s"
+msgstr "permissão negada para banco de dados %s"
 
-#: utils/misc/guc.c:2812
-msgid "Set the level of information written to the WAL."
-msgstr "Define o nível de informação escrito no WAL."
+#: catalog/aclchk.c:3076
+#, c-format
+msgid "permission denied for function %s"
+msgstr "permissão negada para função %s"
 
-#: utils/misc/guc.c:2821
-msgid "Selects the method used for forcing WAL updates to disk."
-msgstr "Seleciona o método utilizado para forçar atualizações do WAL no disco."
+#: catalog/aclchk.c:3078
+#, c-format
+msgid "permission denied for operator %s"
+msgstr "permissão negada para operador %s"
 
-#: utils/misc/guc.c:2831
-msgid "Sets how binary values are to be encoded in XML."
-msgstr "Define como valores binários serão codificados em XML."
+#: catalog/aclchk.c:3080
+#, c-format
+msgid "permission denied for type %s"
+msgstr "permissão negada para tipo %s"
 
-#: utils/misc/guc.c:2840
-msgid ""
-"Sets whether XML data in implicit parsing and serialization operations is to "
-"be considered as documents or content fragments."
-msgstr ""
-"Define se dados XML em operações de análise ou serialização implícita serão "
-"considerados como documentos ou como fragmentos de conteúdo."
+#: catalog/aclchk.c:3082
+#, c-format
+msgid "permission denied for language %s"
+msgstr "permissão negada para linguagem %s"
 
-#: utils/misc/guc.c:3612
+#: catalog/aclchk.c:3084
 #, c-format
-msgid ""
-"%s does not know where to find the server configuration file.\n"
-"You must specify the --config-file or -D invocation option or set the PGDATA "
-"environment variable.\n"
-msgstr ""
-"%s não sabe onde encontrar o arquivo de configuração do servidor.\n"
-"Você deve especificar a opção --config-file ou -D ou definir uma variável de "
-"ambiente PGDATA.\n"
+msgid "permission denied for large object %s"
+msgstr "permissão negada para objeto grande %s"
 
-#: utils/misc/guc.c:3631
+#: catalog/aclchk.c:3086
 #, c-format
-msgid "%s cannot access the server configuration file \"%s\": %s\n"
-msgstr "%s não pode acessar o arquivo de configuração do servidor \"%s\": %s\n"
+msgid "permission denied for schema %s"
+msgstr "permissão negada para esquema %s"
 
-#: utils/misc/guc.c:3651
+#: catalog/aclchk.c:3088
 #, c-format
-msgid ""
-"%s does not know where to find the database system data.\n"
-"This can be specified as \"data_directory\" in \"%s\", or by the -D "
-"invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s não sabe onde encontrar os dados do sistema de banco de dados.\n"
-"Isto pode ser especificado como \"data_directory\" no \"%s\", pela opção -D "
-"ou definindo uma variável de ambiente PGDATA.\n"
+msgid "permission denied for operator class %s"
+msgstr "permissão negada para classe de operadores %s"
 
-#: utils/misc/guc.c:3682
+#: catalog/aclchk.c:3090
 #, c-format
-msgid ""
-"%s does not know where to find the \"hba\" configuration file.\n"
-"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
-"option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s não sabe onde encontrar o arquivo de configuração \"hba\".\n"
-"Isto pode ser especificado como \"hba_file\" no \"%s\", pela opção -D ou "
-"definindo uma variável de ambiente PGDATA.\n"
+msgid "permission denied for operator family %s"
+msgstr "permissão negada para família de operadores %s"
 
-#: utils/misc/guc.c:3705
+#: catalog/aclchk.c:3092
 #, c-format
-msgid ""
-"%s does not know where to find the \"ident\" configuration file.\n"
-"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
-"option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s não sabe onde encontrar o arquivo de configuração \"ident\".\n"
-"Isto pode ser especificado como \"ident_file\" no \"%s\", pela opção -D ou "
-"definindo uma variável de ambiente PGDATA.\n"
+msgid "permission denied for collation %s"
+msgstr "permissão negada para ordenação %s"
 
-#: utils/misc/guc.c:4310 utils/misc/guc.c:4474
-msgid "Value exceeds integer range."
-msgstr "Valor excede intervalo de inteiros."
+#: catalog/aclchk.c:3094
+#, c-format
+msgid "permission denied for conversion %s"
+msgstr "permissão negada para conversão %s"
 
-#: utils/misc/guc.c:4329
-msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
-msgstr "Unidades válidas para este parâmetro são \"kB\", \"MB\" e \"GB\"."
+#: catalog/aclchk.c:3096
+#, c-format
+msgid "permission denied for tablespace %s"
+msgstr "permissão negada para tablespace %s"
 
-#: utils/misc/guc.c:4388
-msgid ""
-"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
-msgstr ""
-"Unidades válidas para este parâmetro são \"ms\", \"s\", \"min\", \"h\" e \"d"
-"\"."
+#: catalog/aclchk.c:3098
+#, c-format
+msgid "permission denied for text search dictionary %s"
+msgstr "permissão negada para dicionário de busca textual %s"
 
-#: utils/misc/guc.c:4697 utils/misc/guc.c:5361 utils/misc/guc.c:5411
-#: utils/misc/guc.c:6115 utils/misc/guc.c:6274 utils/misc/guc.c:7496
-#: guc-file.l:217
+#: catalog/aclchk.c:3100
 #, c-format
-msgid "unrecognized configuration parameter \"%s\""
-msgstr "parâmetro de configuração \"%s\" desconhecido"
+msgid "permission denied for text search configuration %s"
+msgstr "permissão negada para configuração de busca textual %s"
 
-#: utils/misc/guc.c:4724
+#: catalog/aclchk.c:3102
 #, c-format
-msgid "parameter \"%s\" cannot be changed"
-msgstr "parâmetro \"%s\" não pode ser mudado"
+msgid "permission denied for foreign-data wrapper %s"
+msgstr "permissão negada para adaptador de dados externos %s"
 
-#: utils/misc/guc.c:4741 utils/misc/guc.c:4749 guc-file.l:264
+#: catalog/aclchk.c:3104
 #, c-format
-msgid "parameter \"%s\" cannot be changed without restarting the server"
-msgstr "parâmetro \"%s\" não pode ser mudado sem reiniciar o servidor"
+msgid "permission denied for foreign server %s"
+msgstr "permissão negada para servidor externo %s"
 
-#: utils/misc/guc.c:4759
+#: catalog/aclchk.c:3106
 #, c-format
-msgid "parameter \"%s\" cannot be changed now"
-msgstr "parâmetro \"%s\" não pode ser mudado agora"
+msgid "permission denied for extension %s"
+msgstr "permissão negada para extensão %s"
 
-#: utils/misc/guc.c:4790
+#: catalog/aclchk.c:3112 catalog/aclchk.c:3114
 #, c-format
-msgid "parameter \"%s\" cannot be set after connection start"
-msgstr ""
-"parâmetro \"%s\" não pode ser definido depois que a conexão foi iniciada"
+msgid "must be owner of relation %s"
+msgstr "deve ser o dono da relação %s"
 
-#: utils/misc/guc.c:4800 utils/misc/guc.c:7511
+#: catalog/aclchk.c:3116
 #, c-format
-msgid "permission denied to set parameter \"%s\""
-msgstr "permissão negada ao definir parâmetro \"%s\""
+msgid "must be owner of sequence %s"
+msgstr "deve ser o dono da sequência %s"
 
-#: utils/misc/guc.c:4838
+#: catalog/aclchk.c:3118
 #, c-format
-msgid "cannot set parameter \"%s\" within security-definer function"
-msgstr "não pode definir parâmetro \"%s\" em função com privilégios do dono"
+msgid "must be owner of database %s"
+msgstr "deve ser o dono do banco de dados %s"
 
-#: utils/misc/guc.c:4895 access/transam/xlog.c:5234 access/transam/xlog.c:5243
+#: catalog/aclchk.c:3120
 #, c-format
-msgid "parameter \"%s\" requires a Boolean value"
-msgstr "parâmetro \"%s\" requer um valor booleano"
+msgid "must be owner of function %s"
+msgstr "deve ser o dono da função %s"
 
-#: utils/misc/guc.c:4917 utils/misc/guc.c:4992
+#: catalog/aclchk.c:3122
 #, c-format
-msgid "invalid value for parameter \"%s\": %d"
-msgstr "valor é inválido para parâmetro \"%s\": %d"
+msgid "must be owner of operator %s"
+msgstr "deve ser o dono do operador %s"
 
-#: utils/misc/guc.c:4961 utils/misc/guc.c:5163 utils/misc/guc.c:5229
-#: utils/misc/guc.c:5255 guc-file.l:178
+#: catalog/aclchk.c:3124
 #, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "valor é inválido para parâmetro \"%s\": \"%s\""
+msgid "must be owner of type %s"
+msgstr "deve ser o dono do tipo %s"
 
-#: utils/misc/guc.c:4970
+#: catalog/aclchk.c:3126
 #, c-format
-msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
-msgstr "%d está fora do intervalo válido para parâmetro \"%s\" (%d .. %d)"
+msgid "must be owner of language %s"
+msgstr "deve ser o dono da linguagem %s"
 
-#: utils/misc/guc.c:5034
+#: catalog/aclchk.c:3128
 #, c-format
-msgid "parameter \"%s\" requires a numeric value"
-msgstr "parâmetro \"%s\" requer um valor numérico"
+msgid "must be owner of large object %s"
+msgstr "deve ser o dono do objeto grande %s"
 
-#: utils/misc/guc.c:5042
+#: catalog/aclchk.c:3130
 #, c-format
-msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
-msgstr "%g está fora do intervalo válido para parâmetro \"%s\" (%g .. %g)"
+msgid "must be owner of schema %s"
+msgstr "deve ser o dono do esquema %s"
 
-#: utils/misc/guc.c:5064
+#: catalog/aclchk.c:3132
 #, c-format
-msgid "invalid value for parameter \"%s\": %g"
-msgstr "valor é inválido para parâmetro \"%s\": %g"
+msgid "must be owner of operator class %s"
+msgstr "deve ser o dono da classe de operadores %s"
 
-#: utils/misc/guc.c:5367 utils/misc/guc.c:5415 utils/misc/guc.c:6278
+#: catalog/aclchk.c:3134
 #, c-format
-msgid "must be superuser to examine \"%s\""
-msgstr "deve ser super-usuário para examinar \"%s\""
+msgid "must be owner of operator family %s"
+msgstr "deve ser o dono da família de operadores %s"
 
-#: utils/misc/guc.c:5526
+#: catalog/aclchk.c:3136
 #, c-format
-msgid "SET %s takes only one argument"
-msgstr "SET %s só tem um argumento"
-
-#: utils/misc/guc.c:5753
-msgid "SET requires parameter name"
-msgstr "SET requer nome do parâmetro"
+msgid "must be owner of collation %s"
+msgstr "deve ser o dono da ordenação %s"
 
-#: utils/misc/guc.c:5868
+#: catalog/aclchk.c:3138
 #, c-format
-msgid "attempt to redefine parameter \"%s\""
-msgstr "tentativa de redefinir parâmetro \"%s\""
+msgid "must be owner of conversion %s"
+msgstr "deve ser o dono da conversão %s"
 
-#: utils/misc/guc.c:7212
+#: catalog/aclchk.c:3140
 #, c-format
-msgid "could not parse setting for parameter \"%s\""
-msgstr "não pôde analisar definição para parâmetro \"%s\""
-
-#: utils/misc/guc.c:7555
-msgid "invalid list syntax for parameter \"log_destination\""
-msgstr "sintaxe de lista é inválida para parâmetro \"log_destination\""
+msgid "must be owner of tablespace %s"
+msgstr "deve ser o dono da tablespace %s"
 
-#: utils/misc/guc.c:7579
+#: catalog/aclchk.c:3142
 #, c-format
-msgid "unrecognized \"log_destination\" key word: \"%s\""
-msgstr "palavra chave de \"log_destination\" desconhecida: \"%s\""
-
-#: utils/misc/guc.c:7654
-msgid "SET AUTOCOMMIT TO OFF is no longer supported"
-msgstr "SET AUTOCOMMIT TO OFF não é mais suportado"
-
-#: utils/misc/guc.c:7726
-msgid "assertion checking is not supported by this build"
-msgstr "verificação de asserção não é suportada por essa construção"
-
-#: utils/misc/guc.c:7741
-msgid "Bonjour is not supported by this build"
-msgstr "Bonjour não é suportado por essa construção"
-
-#: utils/misc/guc.c:7756
-msgid "SSL is not supported by this build"
-msgstr "SSL não é suportado por essa construção"
-
-#: utils/misc/guc.c:7770
-msgid "cannot enable parameter when \"log_statement_stats\" is true"
-msgstr "não pode habilitar parâmetro quando \"log_statement_stats\" é true"
-
-#: utils/misc/guc.c:7786
-msgid ""
-"cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
-"\"log_planner_stats\", or \"log_executor_stats\" is true"
-msgstr ""
-"não pode habilitar \"log_statement_stats\" quando \"log_parser_stats\", "
-"\"log_planner_stats\" ou \"log_executor_stats\" é true"
+msgid "must be owner of text search dictionary %s"
+msgstr "deve ser o dono do dicionário de busca textual %s"
 
-#: utils/misc/guc.c:7804
-msgid "cannot set transaction read-write mode inside a read-only transaction"
-msgstr ""
-"não pode definir modo leitura-escrita da transação dentro de uma transação "
-"somente leitura"
+#: catalog/aclchk.c:3144
+#, c-format
+msgid "must be owner of text search configuration %s"
+msgstr "deve ser o dono da configuração de busca textual %s"
 
-#: utils/misc/guc.c:7815
-msgid "cannot set transaction read-write mode during recovery"
-msgstr "não pode definir modo leitura-escrita de transação durante recuperação"
+#: catalog/aclchk.c:3146
+#, c-format
+msgid "must be owner of foreign-data wrapper %s"
+msgstr "deve ser dono de adaptador de dados externos %s"
 
-#: utils/misc/tzparser.c:63
+#: catalog/aclchk.c:3148
 #, c-format
-msgid ""
-"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
-"zone file \"%s\", line %d"
-msgstr ""
-"abreviação de zona horária \"%s\" é muito longa (máximo de %d caracteres) no "
-"arquivo de zona horária \"%s\", linha %d"
+msgid "must be owner of foreign server %s"
+msgstr "deve ser o dono de servidor externo %s"
 
-#: utils/misc/tzparser.c:72
+#: catalog/aclchk.c:3150
 #, c-format
-msgid ""
-"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
-"\"%s\", line %d"
-msgstr ""
-"deslocamento %d de zona horária não é múltiplo de 900 seg (15 min) no "
-"arquivo de zona horária \"%s\", linha %d"
+msgid "must be owner of extension %s"
+msgstr "deve ser o dono da extensão %s"
 
-#: utils/misc/tzparser.c:86
+#: catalog/aclchk.c:3192
 #, c-format
-msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
-msgstr ""
-"deslocamento %d de zona horária está fora do intervalo no arquivo de zona "
-"horária \"%s\", linha %d"
+msgid "permission denied for column \"%s\" of relation \"%s\""
+msgstr "permissão negada para coluna \"%s\" da relação \"%s\""
 
-#: utils/misc/tzparser.c:123
+#: catalog/aclchk.c:3219
 #, c-format
-msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr ""
-"faltando abreviação de zona horária no arquivo de zona horária \"%s\", linha "
-"%d"
+msgid "role with OID %u does not exist"
+msgstr "role com OID %u não existe"
 
-#: utils/misc/tzparser.c:134
+#: catalog/aclchk.c:3312 catalog/aclchk.c:3320
 #, c-format
-msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr ""
-"faltando deslocamento de zona horária no arquivo de zona horária \"%s\", "
-"linha %d"
+msgid "attribute %d of relation with OID %u does not exist"
+msgstr "atributo %d da relação com OID %u não existe"
 
-#: utils/misc/tzparser.c:143
+#: catalog/aclchk.c:3393 catalog/aclchk.c:4219
 #, c-format
-msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
-msgstr ""
-"número é inválido para deslocamento de zona horária no arquivo de zona "
-"horária \"%s\", linha %d"
+msgid "relation with OID %u does not exist"
+msgstr "relação com OID %u não existe"
 
-#: utils/misc/tzparser.c:168
+#: catalog/aclchk.c:3493 catalog/aclchk.c:4610 utils/adt/dbsize.c:127
 #, c-format
-msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "sintaxe é inválida no arquivo de zona horária \"%s\", linha %d"
+msgid "database with OID %u does not exist"
+msgstr "banco de dados com OID %u não existe"
 
-#: utils/misc/tzparser.c:234
+#: catalog/aclchk.c:3601 catalog/aclchk.c:4323
 #, c-format
-msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "abreviação de zona horária \"%s\" foi definida mais de uma vez"
+msgid "language with OID %u does not exist"
+msgstr "linguagem com OID %u não existe"
 
-#: utils/misc/tzparser.c:236
+#: catalog/aclchk.c:3762 catalog/aclchk.c:4395
 #, c-format
-msgid ""
-"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
-"\", line %d."
-msgstr ""
-"Arquivo de zona horária \"%s\", linha %d, conflita com entrada no arquivo "
-"\"%s\", linha %d."
+msgid "schema with OID %u does not exist"
+msgstr "esquema com OID %u não existe"
 
-#: utils/misc/tzparser.c:303
+#: catalog/aclchk.c:3816 catalog/aclchk.c:4422
 #, c-format
-msgid "invalid time zone file name \"%s\""
-msgstr "nome de arquivo de zona horária \"%s\" é inválido"
+msgid "tablespace with OID %u does not exist"
+msgstr "tablespace com OID %u não existe"
 
-#: utils/misc/tzparser.c:318
+#: catalog/aclchk.c:3874 catalog/aclchk.c:4556
 #, c-format
-msgid "time zone file recursion limit exceeded in file \"%s\""
-msgstr ""
-"limite de recursão do arquivo de zona horária foi excedido no arquivo \"%s\""
+msgid "foreign-data wrapper with OID %u does not exist"
+msgstr "adaptador de dados externos com OID %u não existe"
 
-#: utils/misc/tzparser.c:347 postmaster/postmaster.c:1144
+#: catalog/aclchk.c:3935 catalog/aclchk.c:4583
 #, c-format
-msgid ""
-"This may indicate an incomplete PostgreSQL installation, or that the file "
-"\"%s\" has been moved away from its proper location."
-msgstr ""
-"Isto pode indicar uma instalação incompleta do PostgreSQL ou que o arquivo "
-"\"%s\" foi movido do local apropriado."
+msgid "foreign server with OID %u does not exist"
+msgstr "servidor externo com OID %u não existe"
 
-#: utils/misc/tzparser.c:361 utils/misc/tzparser.c:376
+#: catalog/aclchk.c:4245
 #, c-format
-msgid "could not read time zone file \"%s\": %m"
-msgstr "não pôde ler arquivo de zona horária \"%s\": %m"
+msgid "type with OID %u does not exist"
+msgstr "tipo com OID %u não existe"
 
-#: utils/misc/tzparser.c:388
+#: catalog/aclchk.c:4271
 #, c-format
-msgid "line is too long in time zone file \"%s\", line %d"
-msgstr "linha é muito longa no arquivo de zona horária \"%s\", linha %d"
+msgid "operator with OID %u does not exist"
+msgstr "operador com OID %u não existe"
 
-#: utils/misc/tzparser.c:413
+#: catalog/aclchk.c:4448
 #, c-format
-msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr ""
-"@INCLUDE sem nome de arquivo no arquivo de zona horária \"%s\", linha %d"
+msgid "operator class with OID %u does not exist"
+msgstr "classe de operadores com OID %u não existe"
 
-#: guc-file.l:288
+#: catalog/aclchk.c:4475
 #, c-format
-msgid "parameter \"%s\" removed from configuration file, reset to default"
-msgstr "parâmetro \"%s\" foi removido do arquivo de configuração, reiniciar para padrão"
+msgid "operator family with OID %u does not exist"
+msgstr "família de operadores com OID %u não existe"
 
-#: guc-file.l:344
+#: catalog/aclchk.c:4502
 #, c-format
-msgid "parameter \"%s\" changed to \"%s\""
-msgstr "parâmetro \"%s\" mudou para \"%s\""
+msgid "text search dictionary with OID %u does not exist"
+msgstr "dicionário de busca textual com OID %u não existe"
 
-#: guc-file.l:412
+#: catalog/aclchk.c:4529
 #, c-format
-msgid ""
-"could not open configuration file \"%s\": maximum nesting depth exceeded"
-msgstr ""
-"não pôde abrir arquivo de configuração \"%s\": profundidade aninhada máxima "
-"excedida"
+msgid "text search configuration with OID %u does not exist"
+msgstr "configuração de busca textual com OID %u não existe"
 
-#: guc-file.l:436 libpq/hba.c:1482
+#: catalog/aclchk.c:4636
 #, c-format
-msgid "could not open configuration file \"%s\": %m"
-msgstr "não pôde abrir arquivo de configuração \"%s\": %m"
+msgid "collation with OID %u does not exist"
+msgstr "ordenação com OID %u não existe"
 
-#: guc-file.l:575
+#: catalog/aclchk.c:4662
 #, c-format
-msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "erro de sintaxe no arquivo \"%s\" linha %u, próximo ao fim da linha"
+msgid "conversion with OID %u does not exist"
+msgstr "conversão com OID %u não existe"
 
-#: guc-file.l:580
+#: catalog/aclchk.c:4703
 #, c-format
-msgid "syntax error in file \"%s\" line %u, near token \"%s\""
-msgstr ""
-"erro de sintaxe no arquivo \"%s\" linha %u, próximo a informação \"%s\""
+msgid "extension with OID %u does not exist"
+msgstr "extensão com OID %u não existe"
 
-#: utils/misc/help_config.c:131
-msgid "internal error: unrecognized run-time parameter type\n"
-msgstr "erro interno: tipo de parâmetro em tempo de execução desconhecido\n"
+#: catalog/namespace.c:260
+msgid "temporary tables cannot specify a schema name"
+msgstr "tabelas temporárias não podem especificar um nome de esquema"
 
-#: utils/error/assert.c:37
-msgid "TRAP: ExceptionalCondition: bad arguments\n"
-msgstr "TRAP: ExceptionalCondition: argumentos inválidos\n"
+#: catalog/namespace.c:358 catalog/namespace.c:2589
+msgid "no schema has been selected to create in"
+msgstr "nenhum esquema foi selecionado para criá-lo(a)"
 
-#: utils/error/assert.c:40
+#: catalog/namespace.c:410 catalog/namespace.c:423
+msgid "cannot create relations in temporary schemas of other sessions"
+msgstr "não pode criar relações em esquemas temporárias de outras sessões"
+
+#: catalog/namespace.c:414
+msgid "cannot create temporary relation in non-temporary schema"
+msgstr "não pode criar relação temporária em esquema que não é temporário"
+
+#: catalog/namespace.c:429
+msgid "only temporary relations may be created in temporary schemas"
+msgstr "somente relações temporárias podem ser criadas em esquemas temporários"
+
+#: catalog/namespace.c:2389 parser/parse_expr.c:775 parser/parse_target.c:1085
 #, c-format
-msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP: %s(\"%s\", Arquivo: \"%s\", Linha: %d)\n"
+msgid "cross-database references are not implemented: %s"
+msgstr "referências cruzadas entre bancos de dados não estão implementadas: %s"
 
-#: utils/error/elog.c:1413
+#: catalog/namespace.c:2395 parser/parse_expr.c:782 parser/parse_target.c:1092
+#: gram.y:11611 gram.y:12810
 #, c-format
-msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "não pôde reabrir arquivo \"%s\" como saída stderr: %m"
+msgid "improper qualified name (too many dotted names): %s"
+msgstr "nome qualificado é inválido (nomes com muitos pontos): %s"
 
-#: utils/error/elog.c:1426
+#: catalog/namespace.c:2523
 #, c-format
-msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "não pôde reabrir arquivo \"%s\" como saida stdout: %m"
+msgid "%s is already in schema \"%s\""
+msgstr "%s já está no esquema \"%s\""
 
-#: utils/error/elog.c:1811 utils/error/elog.c:1821 utils/error/elog.c:1831
-msgid "[unknown]"
-msgstr "[desconhecido]"
+#: catalog/namespace.c:2531
+msgid "cannot move objects into or out of temporary schemas"
+msgstr "não pode mover objetos para ou de esquemas temporários"
 
-#: utils/error/elog.c:2179 utils/error/elog.c:2459 utils/error/elog.c:2537
-msgid "missing error text"
-msgstr "faltando mensagem de erro"
+#: catalog/namespace.c:2537
+msgid "cannot move objects into or out of TOAST schema"
+msgstr "não pode mover objetos para ou de esquema TOAST"
 
-#: utils/error/elog.c:2182 utils/error/elog.c:2185 utils/error/elog.c:2540
-#: utils/error/elog.c:2543
+#: catalog/namespace.c:2641
 #, c-format
-msgid " at character %d"
-msgstr " no caracter %d"
+msgid "improper relation name (too many dotted names): %s"
+msgstr "nome de relação é inválido (nomes com muitos pontos): %s"
 
-#: utils/error/elog.c:2195 utils/error/elog.c:2202
-msgid "DETAIL:  "
-msgstr "DETALHE:  "
+#: catalog/namespace.c:3040
+#, c-format
+msgid "collation \"%s\" for encoding \"%s\" does not exist"
+msgstr "ordenação \"%s\" para codificação \"%s\" não existe"
 
-#: utils/error/elog.c:2209
-msgid "HINT:  "
-msgstr "DICA:  "
+#: catalog/namespace.c:3092
+#, c-format
+msgid "conversion \"%s\" does not exist"
+msgstr "conversão \"%s\" não existe"
 
-#: utils/error/elog.c:2216
-msgid "QUERY:  "
-msgstr "CONSULTA:  "
+#: catalog/namespace.c:3297
+#, c-format
+msgid "permission denied to create temporary tables in database \"%s\""
+msgstr "permissão negada ao criar tabelas temporárias no banco de dados \"%s\""
 
-#: utils/error/elog.c:2223
-msgid "CONTEXT:  "
-msgstr "CONTEXTO:  "
+#: catalog/namespace.c:3313
+msgid "cannot create temporary tables during recovery"
+msgstr "não pode criar tabelas temporárias durante recuperação"
 
-#: utils/error/elog.c:2233
+#: catalog/pg_depend.c:323
 #, c-format
-msgid "LOCATION:  %s, %s:%d\n"
-msgstr "LOCAL:  %s, %s:%d\n"
+msgid "cannot remove dependency on %s because it is a system object"
+msgstr "não pode remover dependência em %s porque ele é um objeto do sistema"
 
-#: utils/error/elog.c:2240
+#: catalog/index.c:202 parser/parse_utilcmd.c:1296 parser/parse_utilcmd.c:1382
 #, c-format
-msgid "LOCATION:  %s:%d\n"
-msgstr "LOCAL:  %s:%d\n"
-
-#: utils/error/elog.c:2254
-msgid "STATEMENT:  "
-msgstr "COMANDO:  "
+msgid "multiple primary keys for table \"%s\" are not allowed"
+msgstr "chaves primárias múltiplas na tabela \"%s\" não são permitidas"
 
-#. translator: This string will be truncated at 47
-#. characters expanded.
-#: utils/error/elog.c:2652
-#, c-format
-msgid "operating system error %d"
-msgstr "erro do sistema operacional %d"
+#: catalog/index.c:220
+msgid "primary keys cannot be expressions"
+msgstr "chaves primárias não podem ser expressões"
 
-#: utils/error/elog.c:2675
-msgid "DEBUG"
-msgstr "DEPURAÇÃO"
+#: catalog/index.c:730 catalog/index.c:1124
+msgid "user-defined indexes on system catalog tables are not supported"
+msgstr ""
+"índices definidos pelo usuário nas tabelas de catálogo do sistema não são "
+"suportados"
 
-#: utils/error/elog.c:2679
-msgid "LOG"
-msgstr "LOG"
+#: catalog/index.c:740
+msgid "concurrent index creation on system catalog tables is not supported"
+msgstr ""
+"criação de índices concorrentes nas tabelas de catálogo do sistema não são "
+"suportados"
 
-#: utils/error/elog.c:2682
-msgid "INFO"
-msgstr "INFO"
+#: catalog/index.c:758
+msgid "shared indexes cannot be created after initdb"
+msgstr "índices compartilhados não podem ser criados depois do initdb"
 
-#: utils/error/elog.c:2685
-msgid "NOTICE"
-msgstr "NOTA"
+#: catalog/index.c:1727
+#, c-format
+msgid "building index \"%s\" on table \"%s\""
+msgstr "construindo índice \"%s\" na tabela \"%s\""
 
-#: utils/error/elog.c:2688
-msgid "WARNING"
-msgstr "AVISO"
+#: catalog/index.c:2800
+msgid "cannot reindex temporary tables of other sessions"
+msgstr "não pode reindexar tabelas temporárias de outras sessões"
 
-#: utils/error/elog.c:2691
-msgid "ERROR"
-msgstr "ERRO"
+#: catalog/catalog.c:76
+msgid "invalid fork name"
+msgstr "nome de fork inválido"
 
-#: utils/error/elog.c:2694
-msgid "FATAL"
-msgstr "FATAL"
+#: catalog/catalog.c:77
+msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
+msgstr "Nomes válidos são \"main\", \"fsm\" e \"vm\"."
 
-#: utils/error/elog.c:2697
-msgid "PANIC"
-msgstr "PÂNICO"
+#: catalog/toasting.c:144
+msgid "shared tables cannot be toasted after initdb"
+msgstr "tabelas compartilhadas não podem ser fatiadas após o initdb"
 
-#: utils/sort/tuplesort.c:2806
+#: catalog/pg_conversion.c:67
 #, c-format
-msgid "could not create unique index \"%s\""
-msgstr "não pôde criar índice único \"%s\""
+msgid "conversion \"%s\" already exists"
+msgstr "conversão \"%s\" já existe"
 
-#: utils/sort/tuplesort.c:2808
+#: catalog/pg_conversion.c:80
 #, c-format
-msgid "Key %s is duplicated."
-msgstr "Chave %s está duplicada."
+msgid "default conversion for %s to %s already exists"
+msgstr "conversão padrão de %s para %s já existe"
 
-#: utils/sort/logtape.c:213
+#: catalog/pg_collation.c:75
 #, c-format
-msgid "could not write block %ld of temporary file: %m"
-msgstr "não pôde escrever bloco %ld do arquivo temporário: %m"
-
-#: utils/sort/logtape.c:215
-msgid "Perhaps out of disk space?"
-msgstr "Talvez esteja faltando espaço em disco?"
+msgid "collation \"%s\" for encoding \"%s\" already exists"
+msgstr "ordenação \"%s\" para codificação \"%s\" já existe"
 
-#: utils/sort/logtape.c:232
+#: catalog/pg_collation.c:89
 #, c-format
-msgid "could not read block %ld of temporary file: %m"
-msgstr "não pôde ler bloco %ld do arquivo temporário: %m"
+msgid "collation \"%s\" already exists"
+msgstr "ordenação \"%s\" já existe"
 
-#: utils/cache/lsyscache.c:2234 utils/cache/lsyscache.c:2267
-#: utils/cache/lsyscache.c:2300 utils/cache/lsyscache.c:2333
+#: catalog/pg_constraint.c:773
 #, c-format
-msgid "type %s is only a shell"
-msgstr "tipo %s é indefinido"
+msgid "table \"%s\" has multiple constraints named \"%s\""
+msgstr "tabela \"%s\" tem múltiplas restrições com nome \"%s\""
 
-#: utils/cache/lsyscache.c:2239
+#: catalog/pg_constraint.c:785
 #, c-format
-msgid "no input function available for type %s"
-msgstr "nenhuma função de entrada disponível para tipo %s"
+msgid "constraint \"%s\" for table \"%s\" does not exist"
+msgstr "restrição \"%s\" na tabela \"%s\" não existe"
 
-#: utils/cache/lsyscache.c:2272
+#: catalog/pg_enum.c:113 catalog/pg_enum.c:199
 #, c-format
-msgid "no output function available for type %s"
-msgstr "nenhuma função de saída disponível para tipo %s"
+msgid "invalid enum label \"%s\""
+msgstr "rótulo do enum \"%s\" é inválido"
 
-#: utils/cache/relcache.c:4289
+#: catalog/pg_enum.c:114 catalog/pg_enum.c:200
 #, c-format
-msgid "could not create relation-cache initialization file \"%s\": %m"
-msgstr ""
-"não pôde criar arquivo de inicialização de cache de relações \"%s\": %m"
-
-#: utils/cache/relcache.c:4291
-msgid "Continuing anyway, but there's something wrong."
-msgstr "Continuando mesmo assim, mas há algo errado."
+msgid "Labels must be %d characters or less."
+msgstr "Rótulos devem conter %d caracteres ou menos."
 
-#: utils/cache/typcache.c:151 parser/parse_type.c:202
+#: catalog/pg_enum.c:264
 #, c-format
-msgid "type \"%s\" is only a shell"
-msgstr "tipo \"%s\" é indefinido"
+msgid "\"%s\" is not an existing enum label"
+msgstr "\"%s\" não é um rótulo do enum existente"
+
+#: catalog/pg_enum.c:325
+msgid "ALTER TYPE ADD BEFORE/AFTER is incompatible with binary upgrade"
+msgstr "ALTER TYPE ADD BEFORE/AFTER é incompatível com atualização binária"
 
-#: utils/cache/typcache.c:331
+#: catalog/pg_operator.c:221 catalog/pg_operator.c:363
 #, c-format
-msgid "type %s is not composite"
-msgstr "tipo %s não é composto"
+msgid "\"%s\" is not a valid operator name"
+msgstr "\"%s\" não é um nome de operador válido"
 
-#: utils/cache/typcache.c:345
-msgid "record type has not been registered"
-msgstr "tipo record não foi registrado"
+#: catalog/pg_operator.c:372
+msgid "only binary operators can have commutators"
+msgstr "somente operadores binários podem ter comutadores"
 
-#: utils/cache/plancache.c:589
-msgid "cached plan must not change result type"
-msgstr "plano em cache não deve mudar tipo resultante"
+#: catalog/pg_operator.c:376
+msgid "only binary operators can have join selectivity"
+msgstr "somente operadores binários podem ter seletividade de junção"
 
-#: utils/cache/relmapper.c:454
-msgid "cannot PREPARE a transaction that modified relation mapping"
+#: catalog/pg_operator.c:380
+msgid "only binary operators can merge join"
 msgstr ""
-"não pode executar PREPARE em uma transação que modificou mapeamento de "
-"relação"
+"somente operadores binários podem ser utilizados em junção por mesclagem"
 
-#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
-#, c-format
-msgid "could not open relation mapping file \"%s\": %m"
-msgstr "não pôde abrir arquivo de mapeamento de relação \"%s\": %m"
+#: catalog/pg_operator.c:384
+msgid "only binary operators can hash"
+msgstr "somente operadores binários podem ser utilizados no hash"
 
-#: utils/cache/relmapper.c:609
-#, c-format
-msgid "could not read relation mapping file \"%s\": %m"
-msgstr "não pôde ler do arquivo de mapeamento de relação \"%s\": %m"
+#: catalog/pg_operator.c:395
+msgid "only boolean operators can have negators"
+msgstr "somente operadores booleanos podem ter negadores"
 
-#: utils/cache/relmapper.c:619
-#, c-format
-msgid "relation mapping file \"%s\" contains invalid data"
-msgstr "arquivo de mapeamento de relação \"%s\" contém dados inválidos"
+#: catalog/pg_operator.c:399
+msgid "only boolean operators can have restriction selectivity"
+msgstr "somente operadores booleanos podem ter seletividade de restrição"
 
-#: utils/cache/relmapper.c:629
-#, c-format
-msgid "relation mapping file \"%s\" contains incorrect checksum"
-msgstr ""
-"arquivo de mapeamento de relação \"%s\" contém soma de verificação incorreta"
+#: catalog/pg_operator.c:403
+msgid "only boolean operators can have join selectivity"
+msgstr "somente operadores booleanos podem ter seletividade de junção"
 
-#: utils/cache/relmapper.c:741
-#, c-format
-msgid "could not write to relation mapping file \"%s\": %m"
-msgstr "não pôde escrever no arquivo de mapeamento de relação \"%s\": %m"
+#: catalog/pg_operator.c:407
+msgid "only boolean operators can merge join"
+msgstr ""
+"somente operadores booleanos podem ser utilizados em junção por mesclagem"
 
-#: utils/cache/relmapper.c:754
-#, c-format
-msgid "could not fsync relation mapping file \"%s\": %m"
-msgstr "não pôde executar fsync no arquivo de mapeamento de relação \"%s\": %m"
+#: catalog/pg_operator.c:411
+msgid "only boolean operators can hash"
+msgstr "somente operadores booleanos podem ser utilizados no hash"
 
-#: utils/cache/relmapper.c:760
+#: catalog/pg_operator.c:423
 #, c-format
-msgid "could not close relation mapping file \"%s\": %m"
-msgstr "não pôde fechar arquivo de mapeamento de relação \"%s\": %m"
+msgid "operator %s already exists"
+msgstr "operador %s já existe"
 
-#: utils/hash/dynahash.c:925 storage/ipc/shmem.c:190 storage/lmgr/lock.c:610
-#: storage/lmgr/lock.c:679 storage/lmgr/lock.c:2119 storage/lmgr/lock.c:2498
-#: storage/lmgr/lock.c:2563 storage/lmgr/proc.c:192 storage/lmgr/proc.c:210
-msgid "out of shared memory"
-msgstr "sem memória compartilhada"
+#: catalog/pg_operator.c:616
+msgid "operator cannot be its own negator or sort operator"
+msgstr "operador não pode ser seu próprio operador de negação ou de ordenação"
 
-#: parser/parse_relation.c:147
+#: catalog/dependency.c:574
 #, c-format
-msgid "table reference \"%s\" is ambiguous"
-msgstr "referência a tabela \"%s\" é ambígua"
+msgid "cannot drop %s because %s requires it"
+msgstr "não pode remover %s porque %s o requer"
 
-#: parser/parse_relation.c:183
+#: catalog/dependency.c:577
 #, c-format
-msgid "table reference %u is ambiguous"
-msgstr "referência a tabela %u é ambígua"
+msgid "You can drop %s instead."
+msgstr "Você pode remover %s ao invés dele."
 
-#: parser/parse_relation.c:343
+#: catalog/dependency.c:738 catalog/pg_shdepend.c:562
 #, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "nome da tabela \"%s\" foi especificado mais de uma vez"
+msgid "cannot drop %s because it is required by the database system"
+msgstr ""
+"não pode remover %s porque ele é requerido pelo sistema de banco de dados"
 
-#: parser/parse_relation.c:478 parser/parse_relation.c:551
-#: parser/parse_expr.c:735 parser/parse_target.c:977
+#: catalog/dependency.c:854
 #, c-format
-msgid "column reference \"%s\" is ambiguous"
-msgstr "referência à coluna \"%s\" é ambígua"
+msgid "drop auto-cascades to %s"
+msgstr "removendo automaticamente %s"
 
-#: parser/parse_relation.c:754 parser/parse_relation.c:1043
-#: parser/parse_relation.c:1403
+#: catalog/dependency.c:866 catalog/dependency.c:875
 #, c-format
-msgid "table \"%s\" has %d columns available but %d columns specified"
-msgstr ""
-"tabela \"%s\" tem %d colunas disponíveis mas %d colunas foram especificadas"
+msgid "%s depends on %s"
+msgstr "%s depende de %s"
 
-#: parser/parse_relation.c:784
+#: catalog/dependency.c:887 catalog/dependency.c:896
 #, c-format
-msgid "too many column aliases specified for function %s"
-msgstr "muitos aliases de coluna especificados para função %s"
+msgid "drop cascades to %s"
+msgstr "removendo em cascata %s"
 
-#: parser/parse_relation.c:835 commands/lockcmds.c:122 catalog/namespace.c:273
+#: catalog/dependency.c:904 catalog/pg_shdepend.c:673
 #, c-format
-msgid "relation \"%s.%s\" does not exist"
-msgstr "relação \"%s.%s\" não existe"
+msgid ""
+"\n"
+"and %d other object (see server log for list)"
+msgid_plural ""
+"\n"
+"and %d other objects (see server log for list)"
+msgstr[0] ""
+"\n"
+"e %d outro objeto (veja lista no log do servidor)"
+msgstr[1] ""
+"\n"
+"e %d outros objetos (veja lista no log do servidor)"
 
-#: parser/parse_relation.c:850
+#: catalog/dependency.c:916
 #, c-format
-msgid ""
-"There is a WITH item named \"%s\", but it cannot be referenced from this "
-"part of the query."
-msgstr ""
-"Há um item WITH nomeado \"%s\", mas ele não pode ser referenciado desta "
-"parte da consulta."
+msgid "cannot drop %s because other objects depend on it"
+msgstr "não pode remover %s porque outros objetos dependem dele"
 
-#: parser/parse_relation.c:852
-msgid ""
-"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
-msgstr ""
-"Utilize WITH RECURSIVE ou reordene os itens WITH para remover referências "
-"posteriores."
+#: catalog/dependency.c:920 catalog/dependency.c:927
+msgid "Use DROP ... CASCADE to drop the dependent objects too."
+msgstr "Utilize DROP ... CASCADE para remover os objetos dependentes também."
 
-#: parser/parse_relation.c:1122
-msgid ""
-"a column definition list is only allowed for functions returning \"record\""
+#: catalog/dependency.c:924
+msgid "cannot drop desired object(s) because other objects depend on them"
 msgstr ""
-"uma lista de definição de colunas somente é permitida para funções que "
-"retornam \"record\""
+"não pode remover objeto(s) desejado(s) porque outros objetos dependem dele"
 
-#: parser/parse_relation.c:1130
-msgid "a column definition list is required for functions returning \"record\""
-msgstr ""
-"uma lista de definição de colunas é requerida para funções que retornam "
-"\"record\""
+#. translator: %d always has a value larger than 1
+#: catalog/dependency.c:933
+#, c-format
+msgid "drop cascades to %d other object"
+msgid_plural "drop cascades to %d other objects"
+msgstr[0] "removendo em cascata %d outro objeto"
+msgstr[1] "removendo em cascata outros %d objetos"
 
-#: parser/parse_relation.c:1165 access/common/tupdesc.c:545
+#: catalog/dependency.c:2204
 #, c-format
-msgid "column \"%s\" cannot be declared SETOF"
-msgstr "coluna \"%s\" não pode ser declarada SETOF"
+msgid " column %s"
+msgstr "coluna %s"
 
-#: parser/parse_relation.c:1177
+#: catalog/dependency.c:2210
 #, c-format
-msgid "function \"%s\" in FROM has unsupported return type %s"
-msgstr "função \"%s\" no FROM tem tipo de retorno %s que não é suportado"
+msgid "function %s"
+msgstr "função %s"
 
-#: parser/parse_relation.c:1249
+#: catalog/dependency.c:2215
 #, c-format
-msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
-msgstr ""
-"listas de VALUES \"%s\" tem %d colunas disponíveis mas %d colunas foram "
-"especificadas"
+msgid "type %s"
+msgstr "tipo %s"
 
-#: parser/parse_relation.c:1305
+#: catalog/dependency.c:2245
 #, c-format
-msgid "joins can have at most %d columns"
-msgstr "junções podem ter no máximo %d colunas"
+msgid "cast from %s to %s"
+msgstr "converte de %s para %s"
 
-#: parser/parse_relation.c:2038
+#: catalog/dependency.c:2265
 #, c-format
-msgid "column %d of relation \"%s\" does not exist"
-msgstr "coluna %d da relação \"%s\" não existe"
+msgid "collation %s"
+msgstr "ordenação %s"
 
-#: parser/parse_relation.c:2397
+#: catalog/dependency.c:2289
 #, c-format
-msgid "invalid reference to FROM-clause entry for table \"%s\""
-msgstr "referência inválida para tabela \"%s\" na cláusula FROM"
+msgid "constraint %s on %s"
+msgstr "restrição %s em %s"
 
-#: parser/parse_relation.c:2400
+#: catalog/dependency.c:2295
 #, c-format
-msgid "Perhaps you meant to reference the table alias \"%s\"."
-msgstr "Talvez você quisesse referenciar o aliás de tabela \"%s\"."
+msgid "constraint %s"
+msgstr "restrição %s"
 
-#: parser/parse_relation.c:2402
+#: catalog/dependency.c:2312
 #, c-format
-msgid ""
-"There is an entry for table \"%s\", but it cannot be referenced from this "
-"part of the query."
-msgstr ""
-"Há uma entrada para tabela \"%s\", mas ela não pode ser referenciada desta "
-"parta da consulta."
+msgid "conversion %s"
+msgstr "conversão %s"
 
-#: parser/parse_relation.c:2408
+#: catalog/dependency.c:2349
 #, c-format
-msgid "missing FROM-clause entry for table \"%s\""
-msgstr "faltando entrada para tabela \"%s\" na cláusula FROM"
+msgid "default for %s"
+msgstr "valor padrão para %s"
 
-#: parser/parse_expr.c:358 parser/parse_expr.c:751
+#: catalog/dependency.c:2366
 #, c-format
-msgid "column %s.%s does not exist"
-msgstr "coluna %s.%s não existe"
+msgid "language %s"
+msgstr "linguagem %s"
 
-#: parser/parse_expr.c:370
+#: catalog/dependency.c:2372
 #, c-format
-msgid "column \"%s\" not found in data type %s"
-msgstr "coluna \"%s\" não foi encontrada no tipo de dado %s"
+msgid "large object %u"
+msgstr "objeto grande %u"
 
-#: parser/parse_expr.c:376
+#: catalog/dependency.c:2377
 #, c-format
-msgid "could not identify column \"%s\" in record data type"
-msgstr "não pôde identificar coluna \"%s\" no tipo de dado record"
+msgid "operator %s"
+msgstr "operador %s"
 
-#: parser/parse_expr.c:382
+#: catalog/dependency.c:2409
 #, c-format
-msgid "column notation .%s applied to type %s, which is not a composite type"
-msgstr "notação de coluna .%s aplicada ao tipo %s, que não é um tipo composto"
+msgid "operator class %s for access method %s"
+msgstr "classe de operadores %s para método de acesso %s"
 
-#: parser/parse_expr.c:412 parser/parse_target.c:600
-msgid "row expansion via \"*\" is not supported here"
-msgstr "expansão de registro utilizando \"*\" não é suportada aqui"
+#. translator: %d is the operator strategy (a number), the
+#. first two %s's are data type names, the third %s is the
+#. description of the operator family, and the last %s is the
+#. textual form of the operator with arguments.
+#: catalog/dependency.c:2459
+#, c-format
+msgid "operator %d (%s, %s) of %s: %s"
+msgstr "operador %d (%s, %s) de %s: %s"
 
-#: parser/parse_expr.c:769 parser/parse_target.c:998 catalog/namespace.c:2231
+#. translator: %d is the function number, the first two %s's
+#. are data type names, the third %s is the description of the
+#. operator family, and the last %s is the textual form of the
+#. function with arguments.
+#: catalog/dependency.c:2509
 #, c-format
-msgid "cross-database references are not implemented: %s"
-msgstr "referências cruzadas entre bancos de dados não estão implementadas: %s"
+msgid "function %d (%s, %s) of %s: %s"
+msgstr "função %d (%s, %s) de %s: %s"
 
-#: parser/parse_expr.c:776 parser/parse_target.c:1005 gram.y:3672 gram.y:10605
-#: catalog/namespace.c:2237
+#: catalog/dependency.c:2549
 #, c-format
-msgid "improper qualified name (too many dotted names): %s"
-msgstr "nome qualificado é inválido (nomes com muitos pontos): %s"
+msgid "rule %s on "
+msgstr "regra %s em "
 
-#: parser/parse_expr.c:803 parser/parse_param.c:108 parser/parse_param.c:139
-#: parser/parse_param.c:195 parser/parse_param.c:287
+#: catalog/dependency.c:2584
 #, c-format
-msgid "there is no parameter $%d"
-msgstr "não há parâmetro $%d"
+msgid "trigger %s on "
+msgstr "gatilho %s em "
 
-#: parser/parse_expr.c:1008
-msgid "NULLIF requires = operator to yield boolean"
-msgstr "NULLIF requer que operador = retorne booleano"
+#: catalog/dependency.c:2601
+#, c-format
+msgid "schema %s"
+msgstr "esquema %s"
 
-#: parser/parse_expr.c:1181
-msgid "arguments of row IN must all be row expressions"
-msgstr "argumentos de registro IN devem ser todos expressões de registro"
+#: catalog/dependency.c:2614
+#, c-format
+msgid "text search parser %s"
+msgstr "analisador de busca textual %s"
 
-#: parser/parse_expr.c:1385
-msgid "subquery cannot have SELECT INTO"
-msgstr "subconsulta não pode ter SELECT INTO"
+#: catalog/dependency.c:2629
+#, c-format
+msgid "text search dictionary %s"
+msgstr "dicionário de busca textual %s"
 
-#: parser/parse_expr.c:1413
-msgid "subquery must return a column"
-msgstr "subconsulta deve retornar uma coluna"
+#: catalog/dependency.c:2644
+#, c-format
+msgid "text search template %s"
+msgstr "modelo de busca textual %s"
 
-#: parser/parse_expr.c:1420
-msgid "subquery must return only one column"
-msgstr "subconsulta deve retornar somente uma coluna"
+#: catalog/dependency.c:2659
+#, c-format
+msgid "text search configuration %s"
+msgstr "configuração de busca textual %s"
 
-#: parser/parse_expr.c:1479
-msgid "subquery has too many columns"
-msgstr "subconsulta tem muitas colunas"
+#: catalog/dependency.c:2667
+#, c-format
+msgid "role %s"
+msgstr "role %s"
 
-#: parser/parse_expr.c:1484
-msgid "subquery has too few columns"
-msgstr "subconsulta tem poucas colunas"
+#: catalog/dependency.c:2680
+#, c-format
+msgid "database %s"
+msgstr "banco de dados %s"
 
-#: parser/parse_expr.c:1580
-msgid "cannot determine type of empty array"
-msgstr "não pode determinar tipo de matriz vazia"
+#: catalog/dependency.c:2692
+#, c-format
+msgid "tablespace %s"
+msgstr "tablespace %s"
 
-#: parser/parse_expr.c:1581
-msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
-msgstr ""
-"Converta explicitamente para o tipo desejado, por exemplo ARRAY[]::integer[]."
+#: catalog/dependency.c:2701
+#, c-format
+msgid "foreign-data wrapper %s"
+msgstr "adaptador de dados externos %s"
 
-#: parser/parse_expr.c:1595
+#: catalog/dependency.c:2710
 #, c-format
-msgid "could not find element type for data type %s"
-msgstr "não pôde encontrar tipo de dado de elemento para tipo de dado %s"
+msgid "server %s"
+msgstr "servidor %s"
 
-#: parser/parse_expr.c:1640 parser/parse_expr.c:2151 parser/parse_coerce.c:841
-#: parser/parse_coerce.c:870 parser/parse_coerce.c:888
-#: parser/parse_coerce.c:903
+#: catalog/dependency.c:2735
 #, c-format
-msgid "cannot cast type %s to %s"
-msgstr "não pode converter tipo %s para %s"
+msgid "user mapping for %s"
+msgstr "mapeamento de usuários para %s"
 
-#: parser/parse_expr.c:1793
-msgid "unnamed XML attribute value must be a column reference"
-msgstr "valor do atributo XML sem nome deve ser uma referência a coluna"
+#: catalog/dependency.c:2769
+#, c-format
+msgid "default privileges on new relations belonging to role %s"
+msgstr "privilégios padrão em novas relações pertencem a role %s"
 
-#: parser/parse_expr.c:1794
-msgid "unnamed XML element value must be a column reference"
-msgstr "valor do elemento XML sem nome deve ser uma referência a coluna"
+#: catalog/dependency.c:2774
+#, c-format
+msgid "default privileges on new sequences belonging to role %s"
+msgstr "privilégios padrão em novas sequências pertencem a role %s"
 
-#: parser/parse_expr.c:1809
+#: catalog/dependency.c:2779
 #, c-format
-msgid "XML attribute name \"%s\" appears more than once"
-msgstr "nome de atributo XML \"%s\" aparece mais do que uma vez"
+msgid "default privileges on new functions belonging to role %s"
+msgstr "privilégios padrão em novas funções pertencem a role %s"
 
-#: parser/parse_expr.c:1916
+#: catalog/dependency.c:2785
 #, c-format
-msgid "cannot cast XMLSERIALIZE result to %s"
-msgstr "não pode converter resultado de XMLSERIALIZE para %s"
+msgid "default privileges belonging to role %s"
+msgstr "privilégios padrão pertencem a role %s"
 
-#: parser/parse_expr.c:2192 parser/parse_expr.c:2390
-msgid "unequal number of entries in row expressions"
-msgstr "número desigual de entradas em expressões de registro"
+#: catalog/dependency.c:2793
+#, c-format
+msgid " in schema %s"
+msgstr " no esquema %s"
 
-#: parser/parse_expr.c:2202
-msgid "cannot compare rows of zero length"
-msgstr "não pode comparar registros de tamanho zero"
+#: catalog/dependency.c:2810
+#, c-format
+msgid "extension %s"
+msgstr "extensão %s"
 
-#: parser/parse_expr.c:2227
+#: catalog/dependency.c:2868
 #, c-format
-msgid "row comparison operator must yield type boolean, not type %s"
-msgstr ""
-"operador de comparação de registro deve retornar tipo boolean, e não tipo %s"
+msgid "table %s"
+msgstr "tabela %s"
 
-#: parser/parse_expr.c:2234
-msgid "row comparison operator must not return a set"
-msgstr "operador de comparação de registro não deve retornar um conjunto"
+#: catalog/dependency.c:2872
+#, c-format
+msgid "index %s"
+msgstr "índice %s"
 
-#: parser/parse_expr.c:2293 parser/parse_expr.c:2337
+#: catalog/dependency.c:2876
 #, c-format
-msgid "could not determine interpretation of row comparison operator %s"
-msgstr ""
-"não pôde determinar interpretação do operador de comparação de registro %s"
+msgid "sequence %s"
+msgstr "sequência %s"
 
-#: parser/parse_expr.c:2295
-msgid ""
-"Row comparison operators must be associated with btree operator families."
-msgstr ""
-"Operadores de comparação de registro devem ser associados com famílias de "
-"operadores de árvore B."
+#: catalog/dependency.c:2880
+#, c-format
+msgid "uncataloged table %s"
+msgstr "tabela temporária %s"
 
-#: parser/parse_expr.c:2339
-msgid "There are multiple equally-plausible candidates."
-msgstr "Há múltiplos candidatos igualmente plausíveis."
+#: catalog/dependency.c:2884
+#, c-format
+msgid "toast table %s"
+msgstr "tabela toast %s"
 
-#: parser/parse_expr.c:2430
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr "IS DISTINCT FROM requer que operador = retorne booleano"
+#: catalog/dependency.c:2888
+#, c-format
+msgid "view %s"
+msgstr "visão %s"
 
-#: parser/parse_agg.c:127 parser/parse_oper.c:254
+#: catalog/dependency.c:2892
 #, c-format
-msgid "could not identify an ordering operator for type %s"
-msgstr "não pôde identificar um operador de ordenação para tipo %s"
+msgid "composite type %s"
+msgstr "tipo composto %s"
 
-#: parser/parse_agg.c:129
-msgid "Aggregates with DISTINCT must be able to sort their inputs."
-msgstr "Agregações com DISTINCT devem ser capazes de ordenar suas entradas."
+#: catalog/dependency.c:2896
+#, c-format
+msgid "foreign table %s"
+msgstr "tabela externa %s"
 
-#: parser/parse_agg.c:170
-msgid "aggregate function calls cannot contain window function calls"
-msgstr ""
-"chamadas de função de agregação não podem conter chamadas de função "
-"deslizante"
+#: catalog/dependency.c:2901
+#, c-format
+msgid "relation %s"
+msgstr "relação %s"
 
-#: parser/parse_agg.c:241 parser/parse_clause.c:1620
+#: catalog/dependency.c:2938
 #, c-format
-msgid "window \"%s\" does not exist"
-msgstr "deslizante \"%s\" não existe"
+msgid "operator family %s for access method %s"
+msgstr "família de operadores %s para método de acesso %s"
 
-#: parser/parse_agg.c:331
-msgid "aggregates not allowed in WHERE clause"
-msgstr "agregação não é permitida na cláusula WHERE"
+#: catalog/pg_proc.c:124 parser/parse_func.c:1526 parser/parse_func.c:1566
+#, c-format
+msgid "functions cannot have more than %d argument"
+msgid_plural "functions cannot have more than %d arguments"
+msgstr[0] "funções não podem ter mais do que %d argumento"
+msgstr[1] "funções não podem ter mais do que %d argumentos"
 
-#: parser/parse_agg.c:337
-msgid "aggregates not allowed in JOIN conditions"
-msgstr "agregação não é permitida nas condições JOIN"
+#: catalog/pg_proc.c:206
+msgid ""
+"A function returning a polymorphic type must have at least one polymorphic "
+"argument."
+msgstr ""
+"Uma função retornando um tipo polimórfico deve ter pelo menos um argumento "
+"polimórfico."
 
-#: parser/parse_agg.c:358
-msgid "aggregates not allowed in GROUP BY clause"
-msgstr "agregação não é permitida na cláusula GROUP BY"
+#: catalog/pg_proc.c:224
+#, c-format
+msgid "\"%s\" is already an attribute of type %s"
+msgstr "\"%s\" já é um atributo do tipo %s"
 
-#: parser/parse_agg.c:426
-msgid "aggregate functions not allowed in a recursive query's recursive term"
-msgstr ""
-"funções de agregação não são permitidas em termo recursivo de uma consulta "
-"recursiva"
+#: catalog/pg_proc.c:363
+#, c-format
+msgid "function \"%s\" already exists with same argument types"
+msgstr "função \"%s\" já existe com os mesmos tipos de argumento"
 
-#: parser/parse_agg.c:451
-msgid "window functions not allowed in WHERE clause"
-msgstr "funções deslizantes não são permitidas na cláusula WHERE"
+#: catalog/pg_proc.c:377 catalog/pg_proc.c:399
+msgid "cannot change return type of existing function"
+msgstr "não pode mudar o tipo de retorno da função existente"
 
-#: parser/parse_agg.c:457
-msgid "window functions not allowed in JOIN conditions"
-msgstr "funções deslizantes não são permitidas nas condições JOIN"
+#: catalog/pg_proc.c:378 catalog/pg_proc.c:401 catalog/pg_proc.c:443
+#: catalog/pg_proc.c:466 catalog/pg_proc.c:492
+msgid "Use DROP FUNCTION first."
+msgstr "Primeiro utilize DROP FUNCTION."
 
-#: parser/parse_agg.c:463
-msgid "window functions not allowed in HAVING clause"
-msgstr "funções deslizantes não são permitidas na cláusula WHERE"
+#: catalog/pg_proc.c:400
+msgid "Row type defined by OUT parameters is different."
+msgstr "Tipo de registro definido pelos parâmetros OUT é diferente."
 
-#: parser/parse_agg.c:476
-msgid "window functions not allowed in GROUP BY clause"
-msgstr "funções deslizantes não são permitidas na cláusula GROUP BY"
+#: catalog/pg_proc.c:441
+#, c-format
+msgid "cannot change name of input parameter \"%s\""
+msgstr "não pode mudar nome de parâmetro de entrada \"%s\""
 
-#: parser/parse_agg.c:495 parser/parse_agg.c:508
-msgid "window functions not allowed in window definition"
-msgstr ""
-"funções deslizantes não são permitidas na definição de função deslizante"
+#: catalog/pg_proc.c:465
+msgid "cannot remove parameter defaults from existing function"
+msgstr "não pode remover valores padrão de parâmetros da função existente"
 
-#: parser/parse_agg.c:630
+#: catalog/pg_proc.c:491
+msgid "cannot change data type of existing parameter default value"
+msgstr "não pode mudar o tipo de dado do valor padrão do parâmetro existente"
+
+#: catalog/pg_proc.c:503
 #, c-format
-msgid ""
-"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
-"aggregate function"
-msgstr ""
-"coluna \"%s.%s\" deve aparecer na cláusula GROUP BY ou ser utilizada em uma "
-"função de agregação"
+msgid "function \"%s\" is an aggregate function"
+msgstr "função \"%s\" é uma função de agregação"
 
-#: parser/parse_agg.c:636
+#: catalog/pg_proc.c:508
 #, c-format
-msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
-msgstr "subconsulta utiliza coluna desagrupada \"%s.%s\" na consulta externa"
+msgid "function \"%s\" is not an aggregate function"
+msgstr "função \"%s\" não é uma função de agregação"
 
-#: parser/parse_node.c:82
+#: catalog/pg_proc.c:516
 #, c-format
-msgid "target lists can have at most %d entries"
-msgstr "listas de alvo podem ter no máximo %d entradas"
+msgid "function \"%s\" is a window function"
+msgstr "função \"%s\" é uma função deslizante"
 
-#: parser/parse_node.c:222
+#: catalog/pg_proc.c:521
 #, c-format
-msgid "cannot subscript type %s because it is not an array"
-msgstr ""
-"tipo do índice de uma matriz não pode ser %s porque ele não é uma matriz"
+msgid "function \"%s\" is not a window function"
+msgstr "função \"%s\" não é uma função deslizante"
 
-#: parser/parse_node.c:316 parser/parse_node.c:342
-msgid "array subscript must have type integer"
-msgstr "índice da matriz deve ser do tipo integer"
-
-#: parser/parse_node.c:366
+#: catalog/pg_proc.c:698
 #, c-format
-msgid "array assignment requires type %s but expression is of type %s"
-msgstr "atribuição da matriz requer tipo %s mas expressão é do tipo %s"
-
-#: parser/parse_node.c:370 parser/parse_target.c:475 parser/parse_target.c:734
-#: parser/parse_target.c:744 rewrite/rewriteHandler.c:957
-#: commands/prepare.c:369 catalog/heap.c:2285
-msgid "You will need to rewrite or cast the expression."
-msgstr "Você precisará reescrever ou converter a expressão."
+msgid "there is no built-in function named \"%s\""
+msgstr "não há nenhuma função embutida com nome \"%s\""
 
-#: parser/parse_target.c:373 parser/parse_target.c:661
+#: catalog/pg_proc.c:790
 #, c-format
-msgid "cannot assign to system column \"%s\""
-msgstr "não pode atribuir a coluna do sistema \"%s\""
-
-#: parser/parse_target.c:398
-msgid "cannot set an array element to DEFAULT"
-msgstr "não pode definir um elemento de matriz como sendo o valor DEFAULT"
-
-#: parser/parse_target.c:403
-msgid "cannot set a subfield to DEFAULT"
-msgstr "não pode definir um subcampo como sendo o valor DEFAULT"
+msgid "SQL functions cannot return type %s"
+msgstr "funções SQL não podem retornar tipo %s"
 
-#: parser/parse_target.c:470
+#: catalog/pg_proc.c:805
 #, c-format
-msgid "column \"%s\" is of type %s but expression is of type %s"
-msgstr "coluna \"%s\" é do tipo %s mas expressão é do tipo %s"
+msgid "SQL functions cannot have arguments of type %s"
+msgstr "funções SQL não podem ter argumentos do tipo %s"
 
-#: parser/parse_target.c:645
+#: catalog/pg_proc.c:891 executor/functions.c:1162
 #, c-format
-msgid ""
-"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
-"composite type"
-msgstr ""
-"não pode atribuir ao campo \"%s\" da coluna \"%s\" porque seu tipo %s não é "
-"um tipo composto"
+msgid "SQL function \"%s\""
+msgstr "função SQL \"%s\""
 
-#: parser/parse_target.c:654
+#: catalog/pg_shdepend.c:680
 #, c-format
 msgid ""
-"cannot assign to field \"%s\" of column \"%s\" because there is no such "
-"column in data type %s"
-msgstr ""
-"não pode atribuir ao campo \"%s\" da coluna \"%s\" porque não há tal coluna "
-"no tipo de dado %s"
+"\n"
+"and objects in %d other database (see server log for list)"
+msgid_plural ""
+"\n"
+"and objects in %d other databases (see server log for list)"
+msgstr[0] ""
+"\n"
+"e objetos em %d outro banco de dados (veja lista no log do servidor)"
+msgstr[1] ""
+"\n"
+"e objetos em %d outros bancos de dados (veja lista no log do servidor)"
 
-#: parser/parse_target.c:729
+#: catalog/pg_shdepend.c:992
 #, c-format
-msgid ""
-"array assignment to \"%s\" requires type %s but expression is of type %s"
-msgstr ""
-"atribuição de matriz para \"%s\" requer tipo %s mas expressão é do tipo %s"
+msgid "role %u was concurrently dropped"
+msgstr "role %u foi removida simultaneamente"
 
-#: parser/parse_target.c:739
+#: catalog/pg_shdepend.c:1011
 #, c-format
-msgid "subfield \"%s\" is of type %s but expression is of type %s"
-msgstr "subcampo \"%s\" é do tipo %s mas expressão é do tipo %s"
+msgid "tablespace %u was concurrently dropped"
+msgstr "tablespace %u foi removida simultaneamente"
 
-#: parser/parse_target.c:824 parser/parse_target.c:835 commands/trigger.c:536
-#: commands/copy.c:3453 commands/tablecmds.c:1286
+#: catalog/pg_shdepend.c:1026
 #, c-format
-msgid "column \"%s\" specified more than once"
-msgstr "coluna \"%s\" especificada mais de uma vez"
-
-#: parser/parse_target.c:1039
-msgid "SELECT * with no tables specified is not valid"
-msgstr "SELECT * sem tabelas especificadas não é válido"
+msgid "database %u was concurrently dropped"
+msgstr "banco de dados %u foi removido simultaneamente"
 
-#: parser/parse_oper.c:256
-msgid "Use an explicit ordering operator or modify the query."
-msgstr "Utilize um operador de ordenação explícito ou modifique a consulta."
+#: catalog/pg_shdepend.c:1070
+#, c-format
+msgid "owner of %s"
+msgstr "dono de %s"
 
-#: parser/parse_oper.c:509
+#: catalog/pg_shdepend.c:1072
 #, c-format
-msgid "operator requires run-time type coercion: %s"
-msgstr "operador requer conversão de tipo em tempo de execução: %s"
+msgid "privileges for %s"
+msgstr "privilégios para %s"
 
-#: parser/parse_oper.c:743
+#. translator: %s will always be "database %s"
+#: catalog/pg_shdepend.c:1080
 #, c-format
-msgid "operator is not unique: %s"
-msgstr "operador não é único: %s"
+msgid "%d object in %s"
+msgid_plural "%d objects in %s"
+msgstr[0] "%d objeto no %s"
+msgstr[1] "%d objetos no %s"
 
-#: parser/parse_oper.c:745
+#: catalog/pg_shdepend.c:1191
+#, c-format
 msgid ""
-"Could not choose a best candidate operator. You might need to add explicit "
-"type casts."
+"cannot drop objects owned by %s because they are required by the database "
+"system"
 msgstr ""
-"Não pôde escolher um operador que se enquadra melhor. Você precisa adicionar "
-"conversões de tipo explícitas."
+"não pode remover objetos que pertencem a %s porque eles são requeridos pelo "
+"sistema de banco de dados"
 
-#: parser/parse_oper.c:753
+#: catalog/pg_shdepend.c:1287
+#, c-format
 msgid ""
-"No operator matches the given name and argument type(s). You might need to "
-"add explicit type casts."
+"cannot reassign ownership of objects owned by %s because they are required "
+"by the database system"
 msgstr ""
-"Nenhum operador corresponde com o nome e o(s) tipo(s) de argumento(s) "
-"informados. Você precisa adicionar conversões de tipo explícitas."
-
-#: parser/parse_oper.c:812 parser/parse_oper.c:928
-#, c-format
-msgid "operator is only a shell: %s"
-msgstr "operador é indefinido: %s"
-
-#: parser/parse_oper.c:916
-msgid "op ANY/ALL (array) requires array on right side"
-msgstr "op ANY/ALL (array) requer matriz no lado direito"
+"não pode transferir objetos que pertencem a %s porque eles são requeridos "
+"pelo sistema de banco de dados"
 
-#: parser/parse_oper.c:958
-msgid "op ANY/ALL (array) requires operator to yield boolean"
-msgstr "op ANY/ALL (array) requer operador que retorna booleano"
+#: catalog/objectaddress.c:286
+msgid "database name cannot be qualified"
+msgstr "nome do banco de dados não pode ser qualificado"
 
-#: parser/parse_oper.c:963
-msgid "op ANY/ALL (array) requires operator not to return a set"
-msgstr "op ANY/ALL (array) requer operador que não retorne um conjunto"
+#: catalog/objectaddress.c:292
+msgid "tablespace name cannot be qualified"
+msgstr "nome da tablespace não pode ser qualificado"
 
-#: parser/parse_clause.c:420
-#, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
-msgstr "cláusula JOIN/ON referencia \"%s\", que não faz parte do JOIN"
+#: catalog/objectaddress.c:295
+msgid "role name cannot be qualified"
+msgstr "nome da role não pode ser qualificado"
 
-#: parser/parse_clause.c:501
-msgid "subquery in FROM cannot have SELECT INTO"
-msgstr "subconsulta no FROM não pode ter SELECT INTO"
+#: catalog/objectaddress.c:301
+msgid "language name cannot be qualified"
+msgstr "nome da linguagem não pode ser qualificado"
 
-#: parser/parse_clause.c:523
-msgid "subquery in FROM cannot refer to other relations of same query level"
-msgstr ""
-"subconsulta no FROM não pode referenciar outras relações do mesmo nível da "
-"consulta"
+#: catalog/objectaddress.c:304
+msgid "foreign-data wrapper name cannot be qualified"
+msgstr "nome do adaptador de dados externos não pode ser qualificado"
 
-#: parser/parse_clause.c:574
-msgid ""
-"function expression in FROM cannot refer to other relations of same query "
-"level"
-msgstr ""
-"expressão da função no FROM não pode referenciar outras relações do mesmo "
-"nível da consulta"
+#: catalog/objectaddress.c:307
+msgid "server name cannot be qualified"
+msgstr "nome do servidor não pode ser qualificado"
 
-#: parser/parse_clause.c:587
-msgid "cannot use aggregate function in function expression in FROM"
-msgstr "não pode utilizar função de agregação na expressão da função no FROM"
+#: catalog/objectaddress.c:870 catalog/objectaddress.c:886
+msgid "must be superuser"
+msgstr "deve ser super-usuário"
 
-#: parser/parse_clause.c:594
-msgid "cannot use window function in function expression in FROM"
-msgstr "não pode utilizar função deslizante na expressão da função no FROM"
+#: catalog/objectaddress.c:877
+msgid "must have CREATEROLE privilege"
+msgstr "deve ter privilégio CREATEROLE"
 
-#: parser/parse_clause.c:870
+#: catalog/pg_type.c:241
 #, c-format
-msgid "column name \"%s\" appears more than once in USING clause"
-msgstr "nome da coluna \"%s\" aparece mais de uma vez na cláusula USING"
+msgid "invalid type internal size %d"
+msgstr "tamanho interno de tipo %d é inválido"
 
-#: parser/parse_clause.c:885
+#: catalog/pg_type.c:257 catalog/pg_type.c:265 catalog/pg_type.c:273
+#: catalog/pg_type.c:282
 #, c-format
-msgid "common column name \"%s\" appears more than once in left table"
+msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
 msgstr ""
-"nome de coluna comum \"%s\" aparece mais de uma vez na tabela à esquerda"
+"alinhamento \"%c\" é inválido para tipo passado por valor de tamanho %d"
 
-#: parser/parse_clause.c:894
+#: catalog/pg_type.c:289
 #, c-format
-msgid "column \"%s\" specified in USING clause does not exist in left table"
-msgstr ""
-"coluna \"%s\" especificada na cláusula USING não existe na tabela à esquerda"
+msgid "internal size %d is invalid for passed-by-value type"
+msgstr "tamanho interno %d é inválido para tipo passado por valor"
 
-#: parser/parse_clause.c:908
+#: catalog/pg_type.c:298 catalog/pg_type.c:304
 #, c-format
-msgid "common column name \"%s\" appears more than once in right table"
-msgstr ""
-"nome de coluna comum \"%s\" aparece mais de uma vez na tabela à direita"
+msgid "alignment \"%c\" is invalid for variable-length type"
+msgstr "alinhamento \"%c\" é inválido para tipo de tamanho variável"
 
-#: parser/parse_clause.c:917
-#, c-format
-msgid "column \"%s\" specified in USING clause does not exist in right table"
-msgstr ""
-"coluna \"%s\" especificada na cláusula USING não existe na tabela à direita"
+#: catalog/pg_type.c:312
+msgid "fixed-size types must have storage PLAIN"
+msgstr "tipos de tamanho fixo devem ter armazenamento PLAIN"
 
-#: parser/parse_clause.c:974
+#: catalog/pg_type.c:764
 #, c-format
-msgid "column alias list for \"%s\" has too many entries"
-msgstr "lista de aliases de coluna para \"%s\" tem muitas entradas"
+msgid "could not form array type name for type \"%s\""
+msgstr "não pôde construir nome de tipo array para tipo \"%s\""
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1211
+#: postmaster/pgstat.c:330
 #, c-format
-msgid "argument of %s must not contain variables"
-msgstr "argumento do %s não deve conter variáveis"
+msgid "could not resolve \"localhost\": %s"
+msgstr "não pôde resolver \"localhost\": %s"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1222
-#, c-format
-msgid "argument of %s must not contain aggregate functions"
-msgstr "argumento do %s não deve conter funções de agregação"
+#: postmaster/pgstat.c:353
+msgid "trying another address for the statistics collector"
+msgstr "tentando outro endereço para coletor de estatísticas"
 
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1233
+#: postmaster/pgstat.c:362
 #, c-format
-msgid "argument of %s must not contain window functions"
-msgstr "argumento do %s não deve conter funções deslizantes"
+msgid "could not create socket for statistics collector: %m"
+msgstr "não pôde criar soquete para coletor de estatísticas: %m"
 
-#. translator: first %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1350
+#: postmaster/pgstat.c:374
 #, c-format
-msgid "%s \"%s\" is ambiguous"
-msgstr "%s \"%s\" é ambíguo"
+msgid "could not bind socket for statistics collector: %m"
+msgstr "não pôde se ligar ao soquete do coletor de estatísticas: %m"
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1374
+#: postmaster/pgstat.c:385
 #, c-format
-msgid "non-integer constant in %s"
-msgstr "constante não-inteira em %s"
+msgid "could not get address of socket for statistics collector: %m"
+msgstr "não pôde pegar endereço do soquete do coletor de estatísticas: %m"
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1392
+#: postmaster/pgstat.c:401
 #, c-format
-msgid "%s position %d is not in select list"
-msgstr "posição %2$d do %1$s não está na lista de seleção"
+msgid "could not connect socket for statistics collector: %m"
+msgstr "não pôde se conectar ao soquete do coletor de estatísticas: %m"
 
-#: parser/parse_clause.c:1608
+#: postmaster/pgstat.c:422
 #, c-format
-msgid "window \"%s\" is already defined"
-msgstr "deslizante \"%s\" já está definido"
+msgid "could not send test message on socket for statistics collector: %m"
+msgstr ""
+"não pôde enviar mensagem de teste ao soquete do coletor de estatísticas: %m"
 
-#: parser/parse_clause.c:1662
+#: postmaster/pgstat.c:448 postmaster/pgstat.c:2996
 #, c-format
-msgid "cannot override PARTITION BY clause of window \"%s\""
-msgstr "não pode substituir cláusula PARTITION BY do deslizante \"%s\""
+msgid "select() failed in statistics collector: %m"
+msgstr "select() falhou no coletor de estatísticas: %m"
 
-#: parser/parse_clause.c:1674
-#, c-format
-msgid "cannot override ORDER BY clause of window \"%s\""
-msgstr "não pode substituir cláusula ORDER BY do deslizante \"%s\""
+#: postmaster/pgstat.c:463
+msgid "test message did not get through on socket for statistics collector"
+msgstr ""
+"mensagem teste não foi recebida pelo soquete do coletor de estatísticas"
 
-#: parser/parse_clause.c:1696
+#: postmaster/pgstat.c:478
 #, c-format
-msgid "cannot override frame clause of window \"%s\""
-msgstr "não pode substituir cláusula frame do deslizante \"%s\""
+msgid "could not receive test message on socket for statistics collector: %m"
+msgstr ""
+"não pôde receber mensagem teste no soquete do coletor de estatísticas: %m"
 
-#: parser/parse_clause.c:1762
-msgid ""
-"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
-"list"
+#: postmaster/pgstat.c:488
+msgid "incorrect test message transmission on socket for statistics collector"
 msgstr ""
-"em uma agregação com DISTINCT, expressões ORDER BY devem aparecer na lista "
-"de argumentos"
+"transmissão de mensagem teste incorreta no soquete do coletor de estatísticas"
 
-#: parser/parse_clause.c:1763
-msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
+#: postmaster/pgstat.c:511
+#, c-format
+msgid "could not set statistics collector socket to nonblocking mode: %m"
 msgstr ""
-"para SELECT DISTINCT, expressões ORDER BY devem aparecer na lista de seleção"
+"não pôde definir soquete do coletor de estatísticas para modo não-bloqueado: "
+"%m"
 
-#: parser/parse_clause.c:1849 parser/parse_clause.c:1881
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+#: postmaster/pgstat.c:521
+msgid "disabling statistics collector for lack of working socket"
 msgstr ""
-"expressões SELECT DISTINCT ON devem corresponder com expressões iniciais do "
-"ORDER BY"
+"desabilitando coletor de estatísticas por falta de um soquete que funcione"
 
-#: parser/parse_clause.c:2000
+#: postmaster/pgstat.c:623
 #, c-format
-msgid "operator %s is not a valid ordering operator"
-msgstr "operador %s não é um operador de ordenação válido"
-
-#: parser/parse_clause.c:2002
-msgid ""
-"Ordering operators must be \"<\" or \">\" members of btree operator families."
-msgstr ""
-"Operadores de ordenação devem ser membros \"<\" ou \">\" das famílias de "
-"operadores de árvore B."
+msgid "could not fork statistics collector: %m"
+msgstr "não pôde criar processo para coletor de estatísticas: %m"
 
-#: parser/parse_coerce.c:873
-msgid "Input has too few columns."
-msgstr "Entrada tem poucas colunas."
+#: postmaster/pgstat.c:1153 postmaster/pgstat.c:1177 postmaster/pgstat.c:1208
+msgid "must be superuser to reset statistics counters"
+msgstr "deve ser super-usuário para reiniciar contadores de estatísticas"
 
-#: parser/parse_coerce.c:891
+#: postmaster/pgstat.c:1184 utils/adt/pgstatfuncs.c:1547
 #, c-format
-msgid "Cannot cast type %s to %s in column %d."
-msgstr "Não pode converter tipo %s para %s na coluna %d."
+msgid "unrecognized reset target: \"%s\""
+msgstr "alvo de reinício desconhecido: \"%s\""
 
-#: parser/parse_coerce.c:906
-msgid "Input has too many columns."
-msgstr "Entrada tem muitas colunas."
+#: postmaster/pgstat.c:1185 utils/adt/pgstatfuncs.c:1548
+msgid "Target must be \"bgwriter\"."
+msgstr "Alvo deve ser \"bgwriter\"."
 
-#. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:949
+#: postmaster/pgstat.c:2975
 #, c-format
-msgid "argument of %s must be type boolean, not type %s"
-msgstr "argumento do %s deve ser do tipo boolean, e não do tipo %s"
+msgid "poll() failed in statistics collector: %m"
+msgstr "poll() falhou no coletor de estatísticas: %m"
 
-#. translator: %s is name of a SQL construct, eg WHERE
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:959 parser/parse_coerce.c:1008
+#: postmaster/pgstat.c:3020
 #, c-format
-msgid "argument of %s must not return a set"
-msgstr "argumento do %s não deve retornar um conjunto"
+msgid "could not read statistics message: %m"
+msgstr "não pôde ler mensagem de estatística: %m"
 
-#. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:996
+#: postmaster/pgstat.c:3291
 #, c-format
-msgid "argument of %s must be type %s, not type %s"
-msgstr "argumento do %s deve ser do tipo %s, e não do tipo %s"
+msgid "could not open temporary statistics file \"%s\": %m"
+msgstr "não pôde abrir arquivo de estatísticas temporário \"%s\": %m"
 
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1129
+#: postmaster/pgstat.c:3363
 #, c-format
-msgid "%s types %s and %s cannot be matched"
-msgstr "tipos no %s %s e %s não podem corresponder"
+msgid "could not write temporary statistics file \"%s\": %m"
+msgstr "não pôde escrever no arquivo de estatísticas temporário \"%s\": %m"
 
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1196
+#: postmaster/pgstat.c:3372
 #, c-format
-msgid "%s could not convert type %s to %s"
-msgstr "%s não pôde converter tipo %s para %s"
+msgid "could not close temporary statistics file \"%s\": %m"
+msgstr "não pôde fechar arquivo de estatísticas temporário \"%s\": %m"
 
-#: parser/parse_coerce.c:1437
-msgid "arguments declared \"anyelement\" are not all alike"
-msgstr "argumentos declarados \"anyelement\" não são de tipos compatíveis"
+#: postmaster/pgstat.c:3380
+#, c-format
+msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+msgstr ""
+"não pôde renomear arquivo de estatísticas temporário \"%s\" para \"%s\": %m"
 
-#: parser/parse_coerce.c:1438 parser/parse_coerce.c:1457
-#: parser/parse_coerce.c:1502 parser/parse_param.c:214
-#: commands/tablecmds.c:1402 commands/tablecmds.c:1414
-#: commands/tablecmds.c:1574 commands/tablecmds.c:1586
+#: postmaster/pgstat.c:3486 postmaster/pgstat.c:3715
 #, c-format
-msgid "%s versus %s"
-msgstr "%s versus %s"
+msgid "could not open statistics file \"%s\": %m"
+msgstr "não pôde abrir arquivo de estatísticas \"%s\": %m"
 
-#: parser/parse_coerce.c:1456
-msgid "arguments declared \"anyarray\" are not all alike"
-msgstr "argumentos declarados \"anyarray\" não são de tipos compatíveis"
+#: postmaster/pgstat.c:3498 postmaster/pgstat.c:3508 postmaster/pgstat.c:3530
+#: postmaster/pgstat.c:3545 postmaster/pgstat.c:3608 postmaster/pgstat.c:3626
+#: postmaster/pgstat.c:3642 postmaster/pgstat.c:3660 postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3727 postmaster/pgstat.c:3738
+#, c-format
+msgid "corrupted statistics file \"%s\""
+msgstr "arquivo de estatísticas \"%s\" corrompido"
+
+#: postmaster/pgstat.c:4036
+msgid "database hash table corrupted during cleanup --- abort"
+msgstr ""
+"tabela hash do banco de dados foi corrompida durante desligamento --- "
+"interrompendo"
 
-#: parser/parse_coerce.c:1485 parser/parse_coerce.c:1629
-#: parser/parse_coerce.c:1660
+#: postmaster/bgwriter.c:482
 #, c-format
-msgid "argument declared \"anyarray\" is not an array but type %s"
-msgstr "argumento declarado \"anyarray\" não é uma matriz mas do tipo %s"
+msgid "checkpoints are occurring too frequently (%d second apart)"
+msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
+msgstr[0] "pontos de controle estão ocorrendo frequentemente (%d segundo)"
+msgstr[1] "pontos de controle estão ocorrendo frequentemente (%d segundos)"
 
-#: parser/parse_coerce.c:1501
+#: postmaster/bgwriter.c:486
 msgid ""
-"argument declared \"anyarray\" is not consistent with argument declared "
-"\"anyelement\""
+"Consider increasing the configuration parameter \"checkpoint_segments\"."
 msgstr ""
-"argumento declarado \"anyarray\" não está consistente com argumento "
-"declarado \"anyelement\""
+"Considere aumentar o parâmetro de configuração \"checkpoint_segments\"."
 
-#: parser/parse_coerce.c:1519
-msgid "could not determine polymorphic type because input has type \"unknown\""
-msgstr ""
-"não pôde determinar tipo polimórfico porque entrada tem tipo \"unknown\""
+#: postmaster/bgwriter.c:598
+#, c-format
+msgid "transaction log switch forced (archive_timeout=%d)"
+msgstr "rotação de log de transação foi forçada (archive_timeout=%d)"
+
+#: postmaster/bgwriter.c:1056
+msgid "checkpoint request failed"
+msgstr "pedido de ponto de controle falhou"
+
+#: postmaster/bgwriter.c:1057
+msgid "Consult recent messages in the server log for details."
+msgstr "Consulte mensagens recentes no log do servidor para obter detalhes."
 
-#: parser/parse_coerce.c:1529
+#: postmaster/bgwriter.c:1223
 #, c-format
-msgid "type matched to anynonarray is an array type: %s"
-msgstr "tipo que corresponde a anynonarray é um tipo array: %s"
+msgid "compacted fsync request queue from %d entries to %d entries"
+msgstr "fila de pedidos de fsync compactada de %d entradas para %d entradas"
 
-#: parser/parse_coerce.c:1539
+#: postmaster/pgarch.c:158
 #, c-format
-msgid "type matched to anyenum is not an enum type: %s"
-msgstr "tipo que corresponde a anyenum não é um tipo enum: %s"
+msgid "could not fork archiver: %m"
+msgstr "não pôde criar processo arquivador: %m"
 
-#: parser/parse_utilcmd.c:306
-msgid "array of serial is not implemented"
-msgstr "matriz de serial não está implementada"
+#: postmaster/pgarch.c:450
+msgid "archive_mode enabled, yet archive_command is not set"
+msgstr "archive_mode habilitado, mas archive_command não está definido"
 
-#: parser/parse_utilcmd.c:350
+#: postmaster/pgarch.c:465
 #, c-format
-msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
-msgstr "%s criará sequência implícita \"%s\" para coluna serial \"%s.%s\""
+msgid "transaction log file \"%s\" could not be archived: too many failures"
+msgstr ""
+"arquivo do log de transação \"%s\" não pôde ser arquivado: muitas falhas"
+
+#: postmaster/pgarch.c:568
+#, c-format
+msgid "archive command failed with exit code %d"
+msgstr "comando de arquivamento falhou com código de retorno %d"
+
+#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
+#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
+#, c-format
+msgid "The failed archive command was: %s"
+msgstr "O comando de arquivamento que falhou foi: %s"
 
-#: parser/parse_utilcmd.c:451 parser/parse_utilcmd.c:463
+#: postmaster/pgarch.c:577
 #, c-format
+msgid "archive command was terminated by exception 0x%X"
+msgstr "comando de arquivamento foi terminado pela exceção 0x%X"
+
+#: postmaster/pgarch.c:579 postmaster/postmaster.c:2872
 msgid ""
-"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
+"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
 msgstr ""
-"declarações NULL/NOT NULL conflitantes para coluna \"%s\" da tabela \"%s\""
+"Veja o arquivo de cabeçalho C \"ntstatus.h\" para obter uma descrição do "
+"valor hexadecimal."
 
-#: parser/parse_utilcmd.c:475
+#: postmaster/pgarch.c:584
 #, c-format
-msgid "multiple default values specified for column \"%s\" of table \"%s\""
-msgstr ""
-"valores padrão múltiplos especificados para coluna \"%s\" da tabela \"%s\""
+msgid "archive command was terminated by signal %d: %s"
+msgstr "comando de arquivamento foi terminado pelo sinal %d: %s"
 
-#: parser/parse_utilcmd.c:590 parser/parse_utilcmd.c:1408
-#: commands/tablecmds.c:1314
+#: postmaster/pgarch.c:591
 #, c-format
-msgid "inherited relation \"%s\" is not a table"
-msgstr "relação herdada \"%s\" não é uma tabela"
+msgid "archive command was terminated by signal %d"
+msgstr "comando de arquivamento foi terminado pelo sinal %d"
 
-#: parser/parse_utilcmd.c:832
+#: postmaster/pgarch.c:600
 #, c-format
-msgid "type %s is not a composite type"
-msgstr "tipo %s não é um tipo composto"
+msgid "archive command exited with unrecognized status %d"
+msgstr "comando de arquivamento terminou com status desconhecido %d"
 
-#: parser/parse_utilcmd.c:1212 parser/parse_utilcmd.c:1298
-#: commands/indexcmds.c:347
+#: postmaster/pgarch.c:612
 #, c-format
-msgid "multiple primary keys for table \"%s\" are not allowed"
-msgstr "chaves primárias múltiplas na tabela \"%s\" não são permitidas"
+msgid "archived transaction log file \"%s\""
+msgstr "arquivo do log de transação \"%s\" foi arquivado"
 
-#: parser/parse_utilcmd.c:1445 commands/indexcmds.c:394
-#: commands/indexcmds.c:903
+#: postmaster/pgarch.c:661
 #, c-format
-msgid "column \"%s\" named in key does not exist"
-msgstr "coluna \"%s\" indicada na chave não existe"
+msgid "could not open archive status directory \"%s\": %m"
+msgstr "não pôde abrir diretório de status de arquivamento \"%s\": %m"
 
-#: parser/parse_utilcmd.c:1457
+#: postmaster/pgarch.c:715 access/transam/xlog.c:4558
+#: access/transam/xlog.c:5518 access/transam/xlog.c:5571
+#: access/transam/xlog.c:6350
 #, c-format
-msgid "column \"%s\" appears twice in primary key constraint"
-msgstr "coluna \"%s\" aparece duas vezes na restrição de chave primária"
+msgid "could not rename file \"%s\" to \"%s\": %m"
+msgstr "não pôde renomear arquivo \"%s\" para \"%s\": %m"
 
-#: parser/parse_utilcmd.c:1462
+#: postmaster/autovacuum.c:359
 #, c-format
-msgid "column \"%s\" appears twice in unique constraint"
-msgstr "coluna \"%s\" aparece duas vezes na restrição de unicidade"
+msgid "could not fork autovacuum launcher process: %m"
+msgstr "não pôde criar processo inicializador do autovacuum: %m"
 
-#: parser/parse_utilcmd.c:1615
-msgid "index expression cannot return a set"
-msgstr "expressão de índice não pode retornar um conjunto"
+#: postmaster/autovacuum.c:404
+msgid "autovacuum launcher started"
+msgstr "inicializador do autovacuum foi iniciado"
 
-#: parser/parse_utilcmd.c:1625
-msgid ""
-"index expressions and predicates can refer only to the table being indexed"
-msgstr ""
-"expressões e predicados de índice só podem referenciar a tabela que está "
-"sendo indexada"
+#: postmaster/autovacuum.c:781
+msgid "autovacuum launcher shutting down"
+msgstr "inicializador do autovacuum está sendo desligado"
 
-#: parser/parse_utilcmd.c:1720
-msgid "rule WHERE condition cannot contain references to other relations"
-msgstr "condição WHERE de regra não pode conter referências a outras relações"
+#: postmaster/autovacuum.c:1416
+#, c-format
+msgid "could not fork autovacuum worker process: %m"
+msgstr "não pôde criar processo de limpeza automática: %m"
 
-#: parser/parse_utilcmd.c:1726
-msgid "cannot use aggregate function in rule WHERE condition"
-msgstr "não pode utilizar função de agregação em condição WHERE de regra"
+#: postmaster/autovacuum.c:1634
+#, c-format
+msgid "autovacuum: processing database \"%s\""
+msgstr "autovacuum: processando banco de dados \"%s\""
 
-#: parser/parse_utilcmd.c:1730
-msgid "cannot use window function in rule WHERE condition"
-msgstr "não pode utilizar função deslizante em condição WHERE de regra"
+#: postmaster/autovacuum.c:2037
+#, c-format
+msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
+msgstr ""
+"autovacuum: removendo tabela temporária órfã \"%s\".\"%s\" no banco de dados "
+"\"%s\""
 
-#: parser/parse_utilcmd.c:1802
-msgid ""
-"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
-"actions"
+#: postmaster/autovacuum.c:2049
+#, c-format
+msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
 msgstr ""
-"regras com condições WHERE só podem ter ações SELECT, INSERT, UPDATE ou "
-"DELETE"
+"autovacuum: encontrada tabela temporária órfã \"%s\".\"%s\" no banco de "
+"dados \"%s\""
 
-#: parser/parse_utilcmd.c:1820 parser/parse_utilcmd.c:1890
-#: rewrite/rewriteHandler.c:432 rewrite/rewriteManip.c:1021
-msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
-msgstr "comandos condicionais UNION/INTERSECT/EXCEPT não estão implementados"
+#: postmaster/autovacuum.c:2319
+#, c-format
+msgid "automatic vacuum of table \"%s.%s.%s\""
+msgstr "limpeza automática da tabela \"%s.%s.%s\""
 
-#: parser/parse_utilcmd.c:1838
-msgid "ON SELECT rule cannot use OLD"
-msgstr "regra ON SELECT não pode utilizar OLD"
+#: postmaster/autovacuum.c:2322
+#, c-format
+msgid "automatic analyze of table \"%s.%s.%s\""
+msgstr "análise automática da tabela \"%s.%s.%s\""
 
-#: parser/parse_utilcmd.c:1842
-msgid "ON SELECT rule cannot use NEW"
-msgstr "regra ON SELECT não pode utilizar NEW"
+#: postmaster/autovacuum.c:2808
+msgid "autovacuum not started because of misconfiguration"
+msgstr "autovacuum não foi iniciado por causa de configuração errada"
 
-#: parser/parse_utilcmd.c:1851
-msgid "ON INSERT rule cannot use OLD"
-msgstr "regra ON INSERT não pode utilizar OLD"
+#: postmaster/autovacuum.c:2809
+msgid "Enable the \"track_counts\" option."
+msgstr "Habilite a opção \"track_counts\"."
 
-#: parser/parse_utilcmd.c:1857
-msgid "ON DELETE rule cannot use NEW"
-msgstr "regra ON DELETE não pode utilizar NEW"
+#: postmaster/syslogger.c:390
+#, c-format
+msgid "select() failed in logger process: %m"
+msgstr "select() falhou no processo logger: %m"
 
-#: parser/parse_utilcmd.c:2138
-msgid "misplaced DEFERRABLE clause"
-msgstr "cláusula DEFERRABLE no lugar errado"
+#: postmaster/syslogger.c:402 postmaster/syslogger.c:968
+#, c-format
+msgid "could not read from logger pipe: %m"
+msgstr "não pôde ler do pipe do logger: %m"
 
-#: parser/parse_utilcmd.c:2143 parser/parse_utilcmd.c:2158
-msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
-msgstr "múltiplas cláusulas DEFERRABLE/NOT DEFERRABLE não são permitidas"
+#: postmaster/syslogger.c:449
+msgid "logger shutting down"
+msgstr "desligando logger"
 
-#: parser/parse_utilcmd.c:2153
-msgid "misplaced NOT DEFERRABLE clause"
-msgstr "cláusula NOT DEFERRABLE no lugar errado"
+#: postmaster/syslogger.c:493 postmaster/syslogger.c:507
+#, c-format
+msgid "could not create pipe for syslog: %m"
+msgstr "não pôde criar pipe para syslog: %m"
 
-#: parser/parse_utilcmd.c:2166 parser/parse_utilcmd.c:2192 gram.y:3484
-#: gram.y:3500
-msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
-msgstr "restrição declarada INITIALLY DEFERRED deve ser DEFERRABLE"
+#: postmaster/syslogger.c:534
+#, c-format
+msgid "could not fork system logger: %m"
+msgstr "não pôde criar processo system logger: %m"
 
-#: parser/parse_utilcmd.c:2174
-msgid "misplaced INITIALLY DEFERRED clause"
-msgstr "cláusula INITIALLY DEFERRED no lugar errado"
+#: postmaster/syslogger.c:565
+#, c-format
+msgid "could not redirect stdout: %m"
+msgstr "não pôde redirecionar saída stdout: %m"
 
-#: parser/parse_utilcmd.c:2179 parser/parse_utilcmd.c:2205
-msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
-msgstr "múltiplas cláusulas INITTIALLY IMMEDIATE/DEFERRED não são permitidas"
+#: postmaster/syslogger.c:570 postmaster/syslogger.c:588
+#, c-format
+msgid "could not redirect stderr: %m"
+msgstr "não pôde redirecionar saída stderr: %m"
 
-#: parser/parse_utilcmd.c:2200
-msgid "misplaced INITIALLY IMMEDIATE clause"
-msgstr "cláusula INITIALLY IMMEDIATE no lugar errado"
+#: postmaster/syslogger.c:923
+#, c-format
+msgid "could not write to log file: %s\n"
+msgstr "não pôde escrever em arquivo de log: %s\n"
 
-#: parser/parse_utilcmd.c:2373
+#: postmaster/syslogger.c:1042
 #, c-format
-msgid ""
-"CREATE specifies a schema (%s) different from the one being created (%s)"
+msgid "could not open log file \"%s\": %m"
+msgstr "não pôde abrir arquivo de log \"%s\": %m"
+
+#: postmaster/syslogger.c:1111 postmaster/syslogger.c:1156
+msgid "disabling automatic rotation (use SIGHUP to re-enable)"
 msgstr ""
-"CREATE especificou um esquema (%s) diferente daquele que foi criado (%s)"
+"desabilitando rotação automática (utilize SIGHUP para habilitá-la novamente)"
 
-#: parser/parse_param.c:212
+#: postmaster/postmaster.c:573
 #, c-format
-msgid "inconsistent types deduced for parameter $%d"
-msgstr "tipos inconsitentes deduzidos do parâmetro $%d"
+msgid "%s: invalid argument for option -f: \"%s\"\n"
+msgstr "%s: argumento inválido para opção -f: \"%s\"\n"
 
-#: parser/parse_param.c:293 tcop/postgres.c:1301 commands/prepare.c:121
+#: postmaster/postmaster.c:659
 #, c-format
-msgid "could not determine data type of parameter $%d"
-msgstr "não pôde determinar o tipo de dado do parâmetro $%d"
+msgid "%s: invalid argument for option -t: \"%s\"\n"
+msgstr "%s: argumento inválido para opção -t: \"%s\"\n"
 
-#: parser/parse_cte.c:40
+#: postmaster/postmaster.c:710
 #, c-format
-msgid ""
-"recursive reference to query \"%s\" must not appear within its non-recursive "
-"term"
-msgstr ""
-"referência recursiva para consulta \"%s\" não deve aparecer no seu termo não "
-"recursivo"
+msgid "%s: invalid argument: \"%s\"\n"
+msgstr "%s: argumento inválido: \"%s\"\n"
 
-#: parser/parse_cte.c:42
+#: postmaster/postmaster.c:735
 #, c-format
-msgid "recursive reference to query \"%s\" must not appear within a subquery"
+msgid "%s: superuser_reserved_connections must be less than max_connections\n"
 msgstr ""
-"referência recursiva para consulta \"%s\" não deve aparecer em uma "
-"subconsulta"
+"%s: superuser_reserved_connections deve ser menor do que max_connections\n"
 
-#: parser/parse_cte.c:44
-#, c-format
+#: postmaster/postmaster.c:740
 msgid ""
-"recursive reference to query \"%s\" must not appear within an outer join"
+"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
+"\"hot_standby\""
 msgstr ""
-"referência recursiva para consulta \"%s\" não deve aparecer em uma junção "
-"externa"
+"arquivamento do WAL (archive_mode=on) requer wal_level \"archive\" ou "
+"\"hot_standby\""
 
-#: parser/parse_cte.c:46
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
+#: postmaster/postmaster.c:743
+msgid ""
+"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
+"\"hot_standby\""
 msgstr ""
-"referência recursiva para consulta \"%s\" não deve aparecer em um INTERSECT"
+"envio do WAL (max_wal_senders > 0) requer wal_level \"archive\" ou "
+"\"hot_standby\""
 
-#: parser/parse_cte.c:48
+#: postmaster/postmaster.c:751
 #, c-format
-msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
+msgid "%s: invalid datetoken tables, please fix\n"
 msgstr ""
-"referência recursiva para consulta \"%s\" não deve aparecer em um EXCEPT"
+"%s: tabelas de palavras chave de datas são inválidas, por favor conserte\n"
+
+#: postmaster/postmaster.c:857
+msgid "invalid list syntax for \"listen_addresses\""
+msgstr "sintaxe de lista é inválida para \"listen_addresses\""
 
-#: parser/parse_cte.c:130
+#: postmaster/postmaster.c:887
 #, c-format
-msgid "WITH query name \"%s\" specified more than once"
-msgstr "nome da consulta WITH \"%s\" foi especificado mais de uma vez"
+msgid "could not create listen socket for \"%s\""
+msgstr "não pôde criar soquete de escuta para \"%s\""
 
-#: parser/parse_cte.c:247
-msgid "subquery in WITH cannot have SELECT INTO"
-msgstr "subconsulta no WITH não pode ter SELECT INTO"
+#: postmaster/postmaster.c:893
+msgid "could not create any TCP/IP sockets"
+msgstr "não pôde criar nenhum soquete TCP/IP"
 
-#: parser/parse_cte.c:288
-#, c-format
-msgid ""
-"recursive query \"%s\" column %d has type %s in non-recursive term but type "
-"%s overall"
-msgstr ""
-"coluna %2$d da consulta recursiva \"%1$s\" tem tipo %3$s no termo não "
-"recursivo mas o tipo %4$s no restante"
+#: postmaster/postmaster.c:944
+msgid "could not create Unix-domain socket"
+msgstr "não pôde criar soquete de domínio Unix"
 
-#: parser/parse_cte.c:294
-msgid "Cast the output of the non-recursive term to the correct type."
-msgstr "Converta a saída do termo não recursivo para o tipo correto."
+#: postmaster/postmaster.c:952
+msgid "no socket created for listening"
+msgstr "nenhum soquete criado para escutar"
+
+#: postmaster/postmaster.c:986
+msgid "could not create I/O completion port for child queue"
+msgstr "não pôde criar porta de conclusão de I/O para fila de filhos"
 
-#: parser/parse_cte.c:376
+#: postmaster/postmaster.c:1030
 #, c-format
-msgid "WITH query \"%s\" has %d columns available but %d columns specified"
-msgstr ""
-"consulta WITH \"%s\" tem %d colunas disponíveis mas %d colunas foram "
-"especificadas"
+msgid "%s: could not write external PID file \"%s\": %s\n"
+msgstr "%s: não pôde escrever em arquivo externo do PID \"%s\": %s\n"
 
-#: parser/parse_cte.c:556
-msgid "mutual recursion between WITH items is not implemented"
-msgstr "recursão mútua entre itens WITH não está implementada"
+#: postmaster/postmaster.c:1098 utils/init/postinit.c:197
+msgid "could not load pg_hba.conf"
+msgstr "não pôde carregar pg_hba.conf"
+
+#: postmaster/postmaster.c:1145
+#, c-format
+msgid "%s: could not locate matching postgres executable"
+msgstr "%s: não pôde localizar executável do postgres correspondente"
 
-#: parser/parse_cte.c:608
+#: postmaster/postmaster.c:1168 utils/misc/tzparser.c:325
 #, c-format
 msgid ""
-"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
-"recursive-term"
+"This may indicate an incomplete PostgreSQL installation, or that the file "
+"\"%s\" has been moved away from its proper location."
 msgstr ""
-"consulta recursiva \"%s\" não tem a forma termo-não-recursivo UNION [ALL] "
-"termo-recursivo"
-
-#: parser/parse_cte.c:640
-msgid "ORDER BY in a recursive query is not implemented"
-msgstr "ORDER BY em uma consulta recursiva não está implementado"
+"Isto pode indicar uma instalação incompleta do PostgreSQL ou que o arquivo "
+"\"%s\" foi movido do local apropriado."
 
-#: parser/parse_cte.c:646
-msgid "OFFSET in a recursive query is not implemented"
-msgstr "OFFSET em uma consulta recursiva não está implementado"
+#: postmaster/postmaster.c:1196
+#, c-format
+msgid "data directory \"%s\" does not exist"
+msgstr "diretório de dados \"%s\" não existe"
 
-#: parser/parse_cte.c:652
-msgid "LIMIT in a recursive query is not implemented"
-msgstr "LIMIT em uma consulta recursiva não está implementado"
+#: postmaster/postmaster.c:1201
+#, c-format
+msgid "could not read permissions of directory \"%s\": %m"
+msgstr "não pôde ler permissões do diretório \"%s\": %m"
 
-#: parser/parse_cte.c:658
-msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
-msgstr "FOR UPDATE/SHARE em uma consulta recursiva não está implementado"
+#: postmaster/postmaster.c:1209
+#, c-format
+msgid "specified data directory \"%s\" is not a directory"
+msgstr "diretório de dados especificado \"%s\" não é um diretório"
 
-#: parser/parse_cte.c:715
+#: postmaster/postmaster.c:1225
 #, c-format
-msgid "recursive reference to query \"%s\" must not appear more than once"
+msgid "data directory \"%s\" has wrong ownership"
+msgstr "diretório de dados \"%s\" tem dono incorreto"
+
+#: postmaster/postmaster.c:1227
+msgid "The server must be started by the user that owns the data directory."
 msgstr ""
-"referência recursiva para consulta \"%s\" não deve aparecer mais de uma vez"
+"O servidor deve ser iniciado pelo usuário que é o dono do diretório de dados."
 
-#: parser/analyze.c:441
-msgid "INSERT ... SELECT cannot specify INTO"
-msgstr "INSERT ... SELECT não pode especificar INTO"
+#: postmaster/postmaster.c:1247
+#, c-format
+msgid "data directory \"%s\" has group or world access"
+msgstr "diretório de dados \"%s\" tem acesso para grupo ou outros"
 
-#: parser/analyze.c:543 parser/analyze.c:968
-msgid "VALUES lists must all be the same length"
-msgstr "listas de VALUES devem ser todas do mesmo tamanho"
+#: postmaster/postmaster.c:1249
+msgid "Permissions should be u=rwx (0700)."
+msgstr "Permissões devem ser u=rwx (0700)."
 
-#: parser/analyze.c:564 parser/analyze.c:1073
-msgid "VALUES must not contain table references"
-msgstr "VALUES não devem conter referências a tabelas"
+#: postmaster/postmaster.c:1260
+#, c-format
+msgid ""
+"%s: could not find the database system\n"
+"Expected to find it in the directory \"%s\",\n"
+"but could not open file \"%s\": %s\n"
+msgstr ""
+"%s: não pôde encontrar o sistema de banco de dados\n"
+"Era esperado encontrá-lo no diretório \"%s\",\n"
+"mas não pôde abrir arquivo \"%s\": %s\n"
 
-#: parser/analyze.c:578 parser/analyze.c:1087
-msgid "VALUES must not contain OLD or NEW references"
-msgstr "VALUES não devem conter referências a OLD ou NEW"
+#: postmaster/postmaster.c:1296
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: não pôde abrir arquivo \"%s\": %s\n"
 
-#: parser/analyze.c:579 parser/analyze.c:1088
-msgid "Use SELECT ... UNION ALL ... instead."
-msgstr "Ao invés disso utilize SELECT ... UNION ALL ... ."
+#: postmaster/postmaster.c:1303
+#, c-format
+msgid "%s: could not open log file \"%s/%s\": %s\n"
+msgstr "%s: não pôde abrir arquivo de log \"%s/%s\": %s\n"
 
-#: parser/analyze.c:689 parser/analyze.c:1100
-msgid "cannot use aggregate function in VALUES"
-msgstr "não pode utilizar função de agregação em VALUES"
+#: postmaster/postmaster.c:1314
+#, c-format
+msgid "%s: could not fork background process: %s\n"
+msgstr "%s: não pôde criar processo em segundo plano: %s\n"
 
-#: parser/analyze.c:695 parser/analyze.c:1106
-msgid "cannot use window function in VALUES"
-msgstr "não pode utilizar função deslizante em VALUES"
+#: postmaster/postmaster.c:1336
+#, c-format
+msgid "%s: could not dissociate from controlling TTY: %s\n"
+msgstr "%s: não pôde dissociar da TTY de controle: %s\n"
 
-#: parser/analyze.c:727
-msgid "INSERT has more expressions than target columns"
-msgstr "INSERT tem mais expressões do que colunas alvo"
+#: postmaster/postmaster.c:1431
+#, c-format
+msgid "select() failed in postmaster: %m"
+msgstr "select() falhou no postmaster: %m"
 
-#: parser/analyze.c:735
-msgid "INSERT has more target columns than expressions"
-msgstr "INSERT tem mais colunas alvo do que expressões"
+#: postmaster/postmaster.c:1593 postmaster/postmaster.c:1624
+msgid "incomplete startup packet"
+msgstr "pacote de inicialização incompleto"
 
-#: parser/analyze.c:984
-msgid "DEFAULT can only appear in a VALUES list within INSERT"
-msgstr "DEFAULT só pode aparecer em uma lista de VALUES com INSERT"
+#: postmaster/postmaster.c:1605
+msgid "invalid length of startup packet"
+msgstr " tamanho do pacote de inicialização é inválido"
 
-#: parser/analyze.c:1054 parser/analyze.c:2174
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
-msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado a VALUES"
+#: postmaster/postmaster.c:1662
+#, c-format
+msgid "failed to send SSL negotiation response: %m"
+msgstr "falhou ao enviar resposta de negociação SSL: %m"
 
-#: parser/analyze.c:1196 parser/analyze.c:1384 parser/analyze.c:2026
-#: optimizer/plan/planner.c:946
-msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido com UNION/INTERSECT/EXCEPT"
+#: postmaster/postmaster.c:1691
+#, c-format
+msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
+msgstr ""
+"protocolo do cliente %u.%u não é suportado: servidor suporta %u.0 a %u.%u"
 
-#: parser/analyze.c:1307
-msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
-msgstr "cláusula UNION/INTERSECT/EXCEPT ORDER BY é inválida"
+#: postmaster/postmaster.c:1742
+msgid "invalid value for boolean option \"replication\""
+msgstr "valor é inválido para opção booleana \"replication\""
 
-#: parser/analyze.c:1308
-msgid "Only result column names can be used, not expressions or functions."
+#: postmaster/postmaster.c:1762
+msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr ""
-"Somente nomes de colunas resultantes podem ser utilizadas, e não expressões "
-"ou funções."
+"formato de pacote de inicialização é inválido: terminador esperado como "
+"último byte"
 
-#: parser/analyze.c:1309
-msgid ""
-"Add the expression/function to every SELECT, or move the UNION into a FROM "
-"clause."
+#: postmaster/postmaster.c:1790
+msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
-"Adicione a expressão/função a todos SELECTs ou mova o UNION para uma "
-"cláusula FROM."
+"nenhum nome de usuário PostgreSQL especificado no pacote de inicialização"
 
-#: parser/analyze.c:1376
-msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
-msgstr "INTO só é permitido no primeiro SELECT do UNION/INTERSECT/EXCEPT"
+#: postmaster/postmaster.c:1847
+msgid "the database system is starting up"
+msgstr "o sistema de banco de dados está iniciando"
 
-#: parser/analyze.c:1436
-msgid ""
-"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
-"same query level"
-msgstr ""
-"comando membro do UNION/INTERSECT/EXCEPT não pode referenciar outras "
-"relações do mesmo nível da consulta"
+#: postmaster/postmaster.c:1852
+msgid "the database system is shutting down"
+msgstr "o sistema de banco de dados está desligando"
 
-#: parser/analyze.c:1521
-#, c-format
-msgid "each %s query must have the same number of columns"
-msgstr "cada consulta %s deve ter o mesmo número de colunas"
+#: postmaster/postmaster.c:1857
+msgid "the database system is in recovery mode"
+msgstr "o sistema de banco de dados está em modo de recuperação"
 
-#: parser/analyze.c:1713
-msgid "CREATE TABLE AS specifies too many column names"
-msgstr "CREATE TABLE AS especificou muitos nomes de colunas"
+#: postmaster/postmaster.c:1862 storage/lmgr/proc.c:297
+#: storage/ipc/procarray.c:270 storage/ipc/sinvaladt.c:302
+msgid "sorry, too many clients already"
+msgstr "desculpe, muitos clientes conectados"
 
-#: parser/analyze.c:1763
-msgid "cannot use aggregate function in UPDATE"
-msgstr "não pode utilizar função de agregação em UPDATE"
+#: postmaster/postmaster.c:1924
+#, c-format
+msgid "wrong key in cancel request for process %d"
+msgstr "chave incorreta no pedido de cancelamento do processo %d"
 
-#: parser/analyze.c:1769
-msgid "cannot use window function in UPDATE"
-msgstr "não pode utilizar função deslizante em UPDATE"
+#: postmaster/postmaster.c:1932
+#, c-format
+msgid "PID %d in cancel request did not match any process"
+msgstr "PID %d no pedido de cancelamento não combina com nenhum processo"
 
-#: parser/analyze.c:1876
-msgid "cannot use aggregate function in RETURNING"
-msgstr "não pode utilizar função de agregação em RETURNING"
+#: postmaster/postmaster.c:2138
+msgid "received SIGHUP, reloading configuration files"
+msgstr "SIGHUP recebido, recarregando arquivos de configuração"
 
-#: parser/analyze.c:1882
-msgid "cannot use window function in RETURNING"
-msgstr "não pode utilizar função deslizante em RETURNING"
+#: postmaster/postmaster.c:2161
+msgid "pg_hba.conf not reloaded"
+msgstr "pg_hba.conf não foi recarregado"
 
-#: parser/analyze.c:1901
-msgid "RETURNING cannot contain references to other relations"
-msgstr "RETURNING não pode conter referências a outras relações"
+#: postmaster/postmaster.c:2204
+msgid "received smart shutdown request"
+msgstr "pedido de desligamento inteligente foi recebido"
 
-#: parser/analyze.c:1940
-msgid "cannot specify both SCROLL and NO SCROLL"
-msgstr "não pode especificar SCROLL e NO SCROLL"
+#: postmaster/postmaster.c:2251
+msgid "received fast shutdown request"
+msgstr "pedido de desligamento rápido foi recebido"
 
-#: parser/analyze.c:1954
-msgid "DECLARE CURSOR cannot specify INTO"
-msgstr "DECLARE CURSOR não pode especificar INTO"
+#: postmaster/postmaster.c:2269
+msgid "aborting any active transactions"
+msgstr "interrompendo quaisquer transações ativas"
 
-#: parser/analyze.c:1962
-msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE não é suportado"
+#: postmaster/postmaster.c:2298
+msgid "received immediate shutdown request"
+msgstr "pedido de desligamento imediato foi recebido"
 
-#: parser/analyze.c:1963
-msgid "Holdable cursors must be READ ONLY."
-msgstr "Cursores duráveis devem ser READ ONLY."
+#: postmaster/postmaster.c:2374 postmaster/postmaster.c:2402
+msgid "startup process"
+msgstr "processo de inicialização"
 
-#: parser/analyze.c:1976
-msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE não é suportado"
+#: postmaster/postmaster.c:2377
+msgid "aborting startup due to startup process failure"
+msgstr "interrompendo inicialização porque o processo de inicialização falhou"
 
-#: parser/analyze.c:1977
-msgid "Insensitive cursors must be READ ONLY."
-msgstr "Cursores insensíveis devem ser READ ONLY."
+#: postmaster/postmaster.c:2436
+msgid "database system is ready to accept connections"
+msgstr "sistema de banco de dados está pronto para aceitar conexões"
 
-#: parser/analyze.c:2030
-msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido com cláusula DISTINCT"
+#: postmaster/postmaster.c:2491
+msgid "background writer process"
+msgstr "processo escritor em segundo plano"
 
-#: parser/analyze.c:2034
-msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido com cláusula GROUP BY"
-
-#: parser/analyze.c:2038
-msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido com cláusula HAVING"
-
-#: parser/analyze.c:2042
-msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido com funções de agregação"
+#: postmaster/postmaster.c:2507
+msgid "WAL writer process"
+msgstr "processo escritor do WAL"
 
-#: parser/analyze.c:2046
-msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido com funções deslizantes"
+#: postmaster/postmaster.c:2521
+msgid "WAL receiver process"
+msgstr "processo receptor do WAL"
 
-#: parser/analyze.c:2050
-#, fuzzy
-msgid ""
-"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
-"target list"
-msgstr "SELECT FOR UPDATE/SHARE não é permitido em funções que retornam conjunto na lista alvo"
+#: postmaster/postmaster.c:2536
+msgid "autovacuum launcher process"
+msgstr "processo inicializador do autovacuum"
 
-#: parser/analyze.c:2126
-msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
-msgstr ""
-"SELECT FOR UPDATE/SHARE deve especificar nomes de relação não qualificados"
+#: postmaster/postmaster.c:2551
+msgid "archiver process"
+msgstr "processo arquivador"
 
-#: parser/analyze.c:2156
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
-msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado em uma junção"
+#: postmaster/postmaster.c:2567
+msgid "statistics collector process"
+msgstr "processo coletor de estatísticas"
 
-#: parser/analyze.c:2162
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
-msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado a NEW ou OLD"
+#: postmaster/postmaster.c:2581
+msgid "system logger process"
+msgstr "processo de relato do sistema (system logger)"
 
-#: parser/analyze.c:2168
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
-msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado a uma função"
+#: postmaster/postmaster.c:2616 postmaster/postmaster.c:2635
+#: postmaster/postmaster.c:2642 postmaster/postmaster.c:2660
+msgid "server process"
+msgstr "processo servidor"
 
-#: parser/analyze.c:2180
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
-msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado em uma consulta WITH"
+#: postmaster/postmaster.c:2696
+msgid "terminating any other active server processes"
+msgstr "terminando quaisquer outros processos servidor ativos"
 
-#: parser/analyze.c:2194
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2861
 #, c-format
-msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
-msgstr ""
-"relação \"%s\" na cláusula FOR UPDATE/SHARE não foi encontrada na cláusula "
-"FROM"
+msgid "%s (PID %d) exited with exit code %d"
+msgstr "%s (PID %d) terminou com código de retorno %d"
 
-#: gram.y:1255
-msgid "current database cannot be changed"
-msgstr "banco de dados atual não pode ser mudado"
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2870
+#, c-format
+msgid "%s (PID %d) was terminated by exception 0x%X"
+msgstr "%s (PID %d) foi terminado pela exceção 0x%X"
 
-#: gram.y:1370 gram.y:1385
-msgid "time zone interval must be HOUR or HOUR TO MINUTE"
-msgstr "intervalo de zona horária deve ser HOUR ou HOUR TO MINUTE"
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2879
+#, c-format
+msgid "%s (PID %d) was terminated by signal %d: %s"
+msgstr "%s (PID %d) foi terminado pelo sinal %d: %s"
 
-#: gram.y:1390 gram.y:8280 gram.y:10731
-msgid "interval precision specified twice"
-msgstr "precisão de interval foi especificada duas vezes"
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2889
+#, c-format
+msgid "%s (PID %d) was terminated by signal %d"
+msgstr "%s (PID %d) foi terminado pelo sinal %d"
 
-#: gram.y:2521
-msgid "CHECK constraints cannot be deferred"
-msgstr "restrições CHECK não são postergáveis"
+#. translator: %s is a noun phrase describing a child process, such as
+#. "server process"
+#: postmaster/postmaster.c:2898
+#, c-format
+msgid "%s (PID %d) exited with unrecognized status %d"
+msgstr "%s (PID %d) terminou com status desconhecido %d"
 
-#: gram.y:2725
-msgid "CREATE TABLE AS cannot specify INTO"
-msgstr "CREATE TABLE AS não pode especificar INTO"
+#: postmaster/postmaster.c:3078
+msgid "abnormal database system shutdown"
+msgstr "desligamento anormal do sistema de banco de dados"
 
-#: gram.y:3395
-msgid "duplicate trigger events specified"
-msgstr "eventos de gatilho duplicados especificados"
+#: postmaster/postmaster.c:3117
+msgid "all server processes terminated; reinitializing"
+msgstr "todos os processos servidor foram terminados; reinicializando"
 
-#: gram.y:3564
-msgid "CREATE ASSERTION is not yet implemented"
-msgstr "CREATE ASSERTION ainda não foi implementado"
+#: postmaster/postmaster.c:3300
+#, c-format
+msgid "could not fork new process for connection: %m"
+msgstr "não pôde criar novo processo para conexão: %m"
 
-#: gram.y:3580
-msgid "DROP ASSERTION is not yet implemented"
-msgstr "DROP ASSERTION ainda não foi implementado"
+#: postmaster/postmaster.c:3342
+msgid "could not fork new process for connection: "
+msgstr "não pôde criar novo processo para conexão: "
 
-#: gram.y:3881
-msgid "RECHECK is no longer required"
-msgstr "RECHECK não é mais requerido"
+#: postmaster/postmaster.c:3456
+#, c-format
+msgid "connection received: host=%s port=%s"
+msgstr "conexão recebida: host=%s porta=%s"
 
-#: gram.y:3882
-msgid "Update your data type."
-msgstr "Atualize seu tipo de dado."
+#: postmaster/postmaster.c:3461
+#, c-format
+msgid "connection received: host=%s"
+msgstr "conexão recebida: host=%s"
 
-#: gram.y:6357 gram.y:6363 gram.y:6369
-msgid "WITH CHECK OPTION is not implemented"
-msgstr "WITH CHECK OPTION não está implementado"
+#: postmaster/postmaster.c:3691 access/transam/xlog.c:2377
+#: access/transam/xlog.c:2510 access/transam/xlog.c:4408
+#: access/transam/xlog.c:9049 access/transam/xlog.c:9289
+#: storage/file/copydir.c:172 storage/smgr/md.c:285
+#, c-format
+msgid "could not create file \"%s\": %m"
+msgstr "não pôde criar arquivo \"%s\": %m"
 
-#: gram.y:7046
-msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
-msgstr "lista de colunas não é permitida em CREATE TABLE / AS EXECUTE"
+#: postmaster/postmaster.c:3701 postmaster/postmaster.c:3711
+#: access/transam/xlog.c:2409 access/transam/xlog.c:2542
+#: access/transam/xlog.c:4460 access/transam/xlog.c:4523
+#: storage/file/copydir.c:197 utils/misc/guc.c:7432 utils/misc/guc.c:7457
+#: utils/init/miscinit.c:1089 utils/init/miscinit.c:1098
+#: utils/init/miscinit.c:1105
+#, c-format
+msgid "could not write to file \"%s\": %m"
+msgstr "não pôde escrever no arquivo \"%s\": %m"
 
-#: gram.y:7267
-msgid "number of columns does not match number of values"
-msgstr "número de colunas não corresponde ao número de valores"
+#: postmaster/postmaster.c:3730
+#, c-format
+msgid "could not execute server process \"%s\": %m"
+msgstr "não pôde executar processo servidor \"%s\": %m"
 
-#: gram.y:7707
-msgid "LIMIT #,# syntax is not supported"
-msgstr "sintaxe LIMIT #,# não é suportada"
+#: postmaster/postmaster.c:4247
+msgid "database system is ready to accept read only connections"
+msgstr ""
+"sistema de banco de dados está pronto para aceitar conexões somente leitura"
 
-#: gram.y:7708
-msgid "Use separate LIMIT and OFFSET clauses."
-msgstr "Utilize cláusulas LIMIT e OFFSET separadas."
+#: postmaster/postmaster.c:4514
+#, c-format
+msgid "could not fork startup process: %m"
+msgstr "não pôde criar processo de inicialização: %m"
 
-#: gram.y:7926
-msgid "VALUES in FROM must have an alias"
-msgstr "VALUES no FROM deve ter um aliás"
+#: postmaster/postmaster.c:4518
+#, c-format
+msgid "could not fork background writer process: %m"
+msgstr "não pôde criar processo escritor em segundo plano: %m"
 
-#: gram.y:7927
-msgid "For example, FROM (VALUES ...) [AS] foo."
-msgstr "Por exemplo, FROM (VALUES ...) [AS] foo."
+#: postmaster/postmaster.c:4522
+#, c-format
+msgid "could not fork WAL writer process: %m"
+msgstr "não pôde criar processo escritor do WAL: %m"
 
-#: gram.y:7932
-msgid "subquery in FROM must have an alias"
-msgstr "subconsulta no FROM deve ter um aliás"
+#: postmaster/postmaster.c:4526
+#, c-format
+msgid "could not fork WAL receiver process: %m"
+msgstr "não pôde criar processo receptor do WAL: %m"
 
-#: gram.y:7933
-msgid "For example, FROM (SELECT ...) [AS] foo."
-msgstr "Por exemplo, FROM (SELECT ...) [AS] foo."
+#: postmaster/postmaster.c:4530
+#, c-format
+msgid "could not fork process: %m"
+msgstr "não pôde criar processo: %m"
 
-#: gram.y:8406
-msgid "precision for type float must be at least 1 bit"
-msgstr "precisão para tipo float deve ser pelo menos 1 bit"
+#: postmaster/postmaster.c:4813
+#, c-format
+msgid "could not duplicate socket %d for use in backend: error code %d"
+msgstr "não pôde duplicar soquete %d para uso pelo servidor: código de erro %d"
 
-#: gram.y:8415
-msgid "precision for type float must be less than 54 bits"
-msgstr "precisão para tipo float deve ser menor do que 54 bits"
+#: postmaster/postmaster.c:4845
+#, c-format
+msgid "could not create inherited socket: error code %d\n"
+msgstr "não pôde criar soquete herdado: código de erro %d\n"
 
-#: gram.y:9121
-msgid "UNIQUE predicate is not yet implemented"
-msgstr "predicado UNIQUE ainda não foi implementado"
+#: postmaster/postmaster.c:4874 postmaster/postmaster.c:4881
+#, c-format
+msgid "could not read from backend variables file \"%s\": %s\n"
+msgstr "não pôde ler do arquivo de variáveis do servidor \"%s\": %s\n"
 
-#: gram.y:9993
-msgid "RANGE PRECEDING is only supported with UNBOUNDED"
-msgstr "RANGE PRECEDING só é suportado com UNBOUNDED"
+#: postmaster/postmaster.c:4890
+#, c-format
+msgid "could not remove file \"%s\": %s\n"
+msgstr "não pôde remover arquivo \"%s\": %s\n"
 
-#: gram.y:9999
-msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
-msgstr "RANGE FOLLOWING só é suportado com UNBOUNDED"
+#: postmaster/postmaster.c:4907
+#, c-format
+msgid "could not map view of backend variables: error code %d\n"
+msgstr "não pôde mapear visão de variáveis do servidor: código de erro %d\n"
 
-#: gram.y:10026 gram.y:10049
-msgid "frame start cannot be UNBOUNDED FOLLOWING"
-msgstr "início de quadro não pode ser UNBOUNDED FOLLOWING"
+#: postmaster/postmaster.c:4916
+#, c-format
+msgid "could not unmap view of backend variables: error code %d\n"
+msgstr "não pôde liberar visão de variáveis do servidor: código de erro %d\n"
 
-#: gram.y:10031
-#, fuzzy
-msgid "frame starting from following row cannot end with current row"
-msgstr "quadro iniciando do próximo registro não pode terminar com registro atual"
+#: postmaster/postmaster.c:4923
+#, c-format
+msgid "could not close handle to backend parameter variables: error code %d\n"
+msgstr ""
+"não pôde fechar manipulador das variáveis do servidor: código de erro %d\n"
 
-#: gram.y:10054
-msgid "frame end cannot be UNBOUNDED PRECEDING"
-msgstr "fim de quadro não pode ser UNBOUNDED PRECEDING"
+#: postmaster/postmaster.c:5067
+msgid "could not read exit code for process\n"
+msgstr "não pôde ler código de retorno para processo\n"
 
-#: gram.y:10060
-#, fuzzy
-msgid "frame starting from current row cannot have preceding rows"
-msgstr "quadro iniciando do registro atual não pode ter registros anteriores"
+#: postmaster/postmaster.c:5072
+msgid "could not post child completion status\n"
+msgstr "não pôde publicar status de conclusão do processo filho\n"
 
-#: gram.y:10067
-#, fuzzy
-msgid "frame starting from following row cannot have preceding rows"
-msgstr "quadro iniciando do próximo registro não pode ter registro anteriores"
+#: foreign/foreign.c:198
+#, c-format
+msgid "user mapping not found for \"%s\""
+msgstr "mapeamento de usuários não foi encontrado para \"%s\""
 
-#: gram.y:10706
-#, fuzzy
-msgid "type modifier cannot have parameter name"
-msgstr "modificador de tipo não pode ter nome de parâmetro"
+#: foreign/foreign.c:321
+#, c-format
+msgid "foreign-data wrapper \"%s\" has no handler"
+msgstr "adaptador de dados externos \"%s\" não possui manipulador"
 
-#: gram.y:11303 gram.y:11511
-msgid "improper use of \"*\""
-msgstr "uso inválido de \"*\""
+#: foreign/foreign.c:498
+#, c-format
+msgid "invalid option \"%s\""
+msgstr "opção \"%s\" é inválida"
 
-#: gram.y:11442
-msgid "wrong number of parameters on left side of OVERLAPS expression"
-msgstr "número incorreto de parâmetros no lado esquerdo da expressão OVERLAPS"
+#: foreign/foreign.c:499
+#, c-format
+msgid "Valid options in this context are: %s"
+msgstr "Opções válidas nesse contexto são: %s"
 
-#: gram.y:11449
-msgid "wrong number of parameters on right side of OVERLAPS expression"
-msgstr "número incorreto de parâmetros no lado direito da expressão OVERLAPS"
+#: replication/syncrep.c:210
+msgid ""
+"canceling the wait for synchronous replication and terminating connection "
+"due to administrator command"
+msgstr ""
+"cancelando espera por replicação síncrona e terminando conexão por causa de "
+"um comando do administrador"
 
-#: gram.y:11474 gram.y:11491 tsearch/spell.c:444 tsearch/spell.c:461
-#: tsearch/spell.c:478 tsearch/spell.c:495 tsearch/spell.c:517
-msgid "syntax error"
-msgstr "erro de sintaxe"
+#: replication/syncrep.c:211 replication/syncrep.c:228
+msgid ""
+"The transaction has already committed locally, but might not have been "
+"replicated to the standby."
+msgstr ""
+"A transação foi efetivada localmente, mas pode não ter sido replicado para o "
+"servidor em espera."
 
-#: gram.y:11574
-msgid "multiple ORDER BY clauses not allowed"
-msgstr "múltiplas cláusulas ORDER BY não são permitidas"
+#: replication/syncrep.c:227
+msgid "canceling wait for synchronous replication due to user request"
+msgstr ""
+"cancelando espera por replicação síncrona por causa de um pedido do usuário"
 
-#: gram.y:11585
-msgid "multiple OFFSET clauses not allowed"
-msgstr "múltiplas cláusulas OFFSET não são permitidas"
+#: replication/syncrep.c:358
+#, c-format
+msgid "standby \"%s\" now has synchronous standby priority %u"
+msgstr ""
+"servidor em espera \"%s\" agora tem prioridade %u como servidor em espera "
+"síncrono"
 
-#: gram.y:11594
-msgid "multiple LIMIT clauses not allowed"
-msgstr "múltiplas cláusulas LIMIT não são permitidas"
+#: replication/syncrep.c:451
+#, c-format
+msgid "standby \"%s\" is now the synchronous standby with priority %u"
+msgstr ""
+"servidor em espera \"%s\" agora é um servidor em espera síncrono com "
+"prioridade %u"
 
-#: gram.y:11603
-msgid "multiple WITH clauses not allowed"
-msgstr "múltiplas cláusulas WITH não são permitidas"
+#: replication/walreceiver.c:150
+msgid "terminating walreceiver process due to administrator command"
+msgstr ""
+"terminando processo walreceiver por causa de um comando do administrador"
 
-#: gram.y:11757
-msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
-msgstr "argumentos OUT e INOUT não são permitidos em funções TABLE"
+#: replication/walreceiver.c:299
+msgid "cannot continue WAL streaming, recovery has already ended"
+msgstr "não pode continuar envio do WAL, recuperação já terminou"
 
-#: parser/scansup.c:190
+#: replication/walreceiver.c:484 access/transam/xlog.c:2840
 #, c-format
-msgid "identifier \"%s\" will be truncated to \"%s\""
-msgstr "identificador \"%s\" será truncado para \"%s\""
+msgid "could not close log file %u, segment %u: %m"
+msgstr "não pôde fechar arquivo de log %u, segmento %u: %m"
 
-#: parser/parse_func.c:151
+#: replication/walreceiver.c:510 replication/walsender.c:994
+#: access/transam/xlog.c:1792 access/transam/xlog.c:10401
 #, c-format
-msgid "argument name \"%s\" used more than once"
-msgstr "nome de argumento \"%s\" utilizado mais de uma vez"
-
-#: parser/parse_func.c:162
-msgid "positional argument cannot follow named argument"
-msgstr "argumento posicional não pode seguir argumento nomeado"
+msgid "could not seek in log file %u, segment %u to offset %u: %m"
+msgstr "não pôde buscar no arquivo de log %u, segmento %u deslocado de %u: %m"
 
-#: parser/parse_func.c:240
+#: replication/walreceiver.c:527 access/transam/xlog.c:1809
 #, c-format
-msgid "%s(*) specified, but %s is not an aggregate function"
-msgstr "%s(*) especificado, mas %s não é uma função de agregação"
+msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
+msgstr ""
+"não pôde escrever no arquivo de log %u, segmento %u deslocado de %u, tamanho "
+"%lu: %m"
 
-#: parser/parse_func.c:247
+#: replication/libpqwalreceiver/libpqwalreceiver.c:101
 #, c-format
-msgid "DISTINCT specified, but %s is not an aggregate function"
-msgstr "DISTINCT especificado, mas %s não é uma função de agregação"
-
-#: parser/parse_func.c:253
-#, c-format
-msgid "ORDER BY specified, but %s is not an aggregate function"
-msgstr "ORDER BY especificado, mas %s não é uma função de agregação"
+msgid "could not connect to the primary server: %s"
+msgstr "não pôde conectar ao servidor principal: %s"
 
-#: parser/parse_func.c:259
+#: replication/libpqwalreceiver/libpqwalreceiver.c:113
 #, c-format
 msgid ""
-"OVER specified, but %s is not a window function nor an aggregate function"
+"could not receive database system identifier and timeline ID from the "
+"primary server: %s"
 msgstr ""
-"OVER especificado, mas %s não é uma função deslizante ou função de agregação"
+"não pôde receber identificador do sistema de banco de dados e o ID de linha "
+"do tempo do servidor principal: %s"
+
+#: replication/libpqwalreceiver/libpqwalreceiver.c:124
+msgid "invalid response from primary server"
+msgstr "resposta inválida do servidor principal"
 
-#: parser/parse_func.c:281
+#: replication/libpqwalreceiver/libpqwalreceiver.c:125
 #, c-format
-msgid "function %s is not unique"
-msgstr "função %s não é única"
+msgid "Expected 1 tuple with 3 fields, got %d tuples with %d fields."
+msgstr "Esperada 1 tupla com 3 campos, recebeu %d tuplas com %d campos."
 
-#: parser/parse_func.c:284
-msgid ""
-"Could not choose a best candidate function. You might need to add explicit "
-"type casts."
+#: replication/libpqwalreceiver/libpqwalreceiver.c:140
+msgid "database system identifier differs between the primary and standby"
 msgstr ""
-"Não pôde escolher uma função que se enquadra melhor. Você precisa adicionar "
-"conversões de tipo explícitas."
+"identificador do sistema de banco de dados difere entre o servidor principal "
+"e o servidor em espera"
 
-#: parser/parse_func.c:292 parser/parse_func.c:303 parser/parse_func.c:1462
-#: commands/typecmds.c:1269 commands/typecmds.c:1320 commands/typecmds.c:1351
-#: commands/typecmds.c:1374 commands/typecmds.c:1395 commands/typecmds.c:1422
-#: commands/typecmds.c:1449 catalog/pg_aggregate.c:331
+#: replication/libpqwalreceiver/libpqwalreceiver.c:141
 #, c-format
-msgid "function %s does not exist"
-msgstr "função %s não existe"
-
-#: parser/parse_func.c:295
-msgid ""
-"No aggregate function matches the given name and argument types. Perhaps you "
-"misplaced ORDER BY; ORDER BY must appear after all regular arguments of the "
-"aggregate."
+msgid "The primary's identifier is %s, the standby's identifier is %s."
 msgstr ""
-"Nenhuma função de agregação corresponde com o nome e os tipos de argumentos "
-"informados. Talvez você colocou ORDER BY no lugar errado; ORDER BY deve aparecer depois de todos os argumentos regulares da agregação."
+"O identificador do servidor principal é %s, o identificador do servidor em "
+"espera é %s."
 
-#: parser/parse_func.c:306
-msgid ""
-"No function matches the given name and argument types. You might need to add "
-"explicit type casts."
+#: replication/libpqwalreceiver/libpqwalreceiver.c:153
+#, c-format
+msgid "timeline %u of the primary does not match recovery target timeline %u"
 msgstr ""
-"Nenhuma função corresponde com o nome e os tipos de argumentos informados. "
-"Você precisa adicionar conversões de tipo explícitas."
+"linha do tempo %u do servidor principal não combina com linha do tempo %u da "
+"recuperação"
 
-#: parser/parse_func.c:413 parser/parse_func.c:478
+#: replication/libpqwalreceiver/libpqwalreceiver.c:165
 #, c-format
-msgid "%s(*) must be used to call a parameterless aggregate function"
-msgstr ""
-"%s(*) deve ser utilizado para chamar uma função de agregação sem parâmetros"
+msgid "could not start WAL streaming: %s"
+msgstr "não pôde iniciar envio do WAL: %s"
 
-#: parser/parse_func.c:420
-msgid "aggregates cannot return sets"
-msgstr "agregações não podem retornar conjuntos"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:171
+msgid "streaming replication successfully connected to primary"
+msgstr "replicação em fluxo conectou-se com sucesso ao servidor principal"
 
-#: parser/parse_func.c:432
-msgid "aggregates cannot use named arguments"
-msgstr "agregações não podem utilizar argumentos nomeados"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:193
+msgid "socket not open"
+msgstr "soquete não está aberto"
 
-#: parser/parse_func.c:451
-msgid "window function call requires an OVER clause"
-msgstr "chamada de função deslizante requer uma cláusula OVER"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:233 port/unix_latch.c:237
+#: port/pg_latch.c:237
+#, c-format
+msgid "select() failed: %m"
+msgstr "select() falhou: %m"
 
-#: parser/parse_func.c:468
-msgid "DISTINCT is not implemented for window functions"
-msgstr "DISTINCT não está implementado para funções deslizantes"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:367
+#: replication/libpqwalreceiver/libpqwalreceiver.c:388
+#: replication/libpqwalreceiver/libpqwalreceiver.c:393
+#, fuzzy, c-format
+msgid "could not receive data from WAL stream: %s"
+msgstr "não pôde receber dados do stream do WAL: %s\n"
 
-#: parser/parse_func.c:488
-msgid "aggregate ORDER BY is not implemented for window functions"
-msgstr "agregação ORDER BY não está implementado para funções deslizantes"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:384
+msgid "replication terminated by primary server"
+msgstr "replicação terminada pelo servidor principal"
 
-#: parser/parse_func.c:494
-msgid "window functions cannot return sets"
-msgstr "funções deslizantes não podem retornar conjuntos"
+#: replication/libpqwalreceiver/libpqwalreceiver.c:415
+#, fuzzy, c-format
+msgid "could not send data to WAL stream: %s"
+msgstr "não pôde enviar dados ao stream do WAL: %s"
 
-#: parser/parse_func.c:505
-msgid "window functions cannot use named arguments"
-msgstr "funções deslizantes não podem utilizar argumentos nomeados"
+#: repl_scanner.l:76
+#, fuzzy
+msgid "invalid streaming start location"
+msgstr "local de início do fluxo é inválido"
 
-#: parser/parse_func.c:1507 parser/parse_func.c:1547 catalog/pg_proc.c:123
+#: repl_scanner.l:97 scan.l:629
+msgid "unterminated quoted string"
+msgstr "cadeia de caracteres entre aspas não foi terminada"
+
+#: repl_scanner.l:107
 #, c-format
-msgid "functions cannot have more than %d argument"
-msgid_plural "functions cannot have more than %d arguments"
-msgstr[0] "funções não podem ter mais do que %d argumento"
-msgstr[1] "funções não podem ter mais do que %d argumentos"
+msgid "syntax error: unexpected character \"%s\""
+msgstr "erro de sintaxe: caracter inesperado \"%s\""
+
+#: replication/walsender.c:141
+msgid "recovery is still in progress, can't accept WAL streaming connections"
+msgstr ""
+"recuperação ainda está em progresso, não pode aceitar conexões de envio do "
+"WAL"
+
+#: replication/walsender.c:261 replication/walsender.c:489
+#: replication/walsender.c:547
+msgid "unexpected EOF on standby connection"
+msgstr "EOF inesperado na conexão do servidor em espera"
+
+#: replication/walsender.c:267
+#, fuzzy, c-format
+msgid "invalid standby handshake message type %d"
+msgstr "tipo de mensagem do servidor em espera %d é inválido"
+
+#: replication/walsender.c:379
+msgid "standby connections not allowed because wal_level=minimal"
+msgstr ""
+"conexões de servidores em espera não são permitidas porque wal_level=minimal"
 
-#: parser/parse_func.c:1570
+#: replication/walsender.c:461
 #, c-format
-msgid "aggregate %s(*) does not exist"
-msgstr "agregação %s(*) não existe"
+msgid "invalid standby query string: %s"
+msgstr "consulta do servidor em espera inválida: %s"
 
-#: parser/parse_func.c:1575
+#: replication/walsender.c:518
 #, c-format
-msgid "aggregate %s does not exist"
-msgstr "agregação %s não existe"
+msgid "invalid standby message type \"%c\""
+msgstr "tipo de mensagem do servidor em espera \"%c\" é inválido"
 
-#: parser/parse_func.c:1594
+#: replication/walsender.c:569
 #, c-format
-msgid "function %s is not an aggregate"
-msgstr "função %s não é uma agregação"
+msgid "unexpected message type \"%c\""
+msgstr "tipo de mensagem \"%c\" inesperado"
 
-#: parser/parse_func.c:1705 tcop/fastpath.c:359
-msgid "argument to pg_get_expr() must come from system catalogs"
-msgstr "argumento para pg_get_expr() deve vir dos catálogos do sistema"
+#: replication/walsender.c:813
+msgid "terminating walsender process due to replication timeout"
+msgstr ""
+"terminando processo walsender por causa do tempo de espera da replicação"
 
-#: parser/parse_type.c:83
+#: replication/walsender.c:829
 #, c-format
-msgid "improper %%TYPE reference (too few dotted names): %s"
-msgstr "referência a %%TYPE é inválida (nomes com poucos pontos): %s"
+msgid "standby \"%s\" has now caught up with primary"
+msgstr "servidor em espera \"%s\" agora alcançou o servidor principal"
 
-#: parser/parse_type.c:105
+#: replication/walsender.c:898
 #, c-format
-msgid "improper %%TYPE reference (too many dotted names): %s"
-msgstr "referência a %%TYPE é inválida (nomes com muitos pontos): %s"
+msgid ""
+"number of requested standby connections exceeds max_wal_senders (currently "
+"%d)"
+msgstr ""
+"número de conexões dos servidores em espera solicitadas excedeu "
+"max_wal_senders (atualmente %d)"
 
-#: parser/parse_type.c:127
+#: replication/walsender.c:976 replication/walsender.c:1038
 #, c-format
-msgid "type reference %s converted to %s"
-msgstr "referência a tipo %s convertido para %s"
+msgid "requested WAL segment %s has already been removed"
+msgstr "segmento do WAL solicitado %s já foi removido"
 
-#: parser/parse_type.c:261 commands/functioncmds.c:132
+#: replication/walsender.c:982 access/transam/xlog.c:2352
+#: access/transam/xlog.c:2456 access/transam/xlog.c:2685
+#: access/transam/xlog.c:2756 access/transam/xlog.c:2813
 #, c-format
-msgid "type modifier cannot be specified for shell type \"%s\""
+msgid "could not open file \"%s\" (log file %u, segment %u): %m"
+msgstr "não pôde abrir arquivo \"%s\" (arquivo de log %u, segmento %u): %m"
+
+#: replication/walsender.c:1009
+#, c-format
+msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
 msgstr ""
-"modificador de tipo não pode ser especificado para tipo indefinido \"%s\""
+"não pôde ler do arquivo de log %u, segmento %u, deslocado de %u, tamanho "
+"%lu: %m"
 
-#: parser/parse_type.c:270
+#: replication/basebackup.c:122 replication/basebackup.c:632
 #, c-format
-msgid "type modifier is not allowed for type \"%s\""
-msgstr "modificador de tipo não é permitido para tipo \"%s\""
+msgid "could not read symbolic link \"%s\": %m"
+msgstr "não pôde ler link simbólico \"%s\": %m"
 
-#: parser/parse_type.c:313
-msgid "type modifiers must be simple constants or identifiers"
-msgstr "modificadores de tipo devem ser constantes ou identificadores"
+#: replication/basebackup.c:231 replication/basebackup.c:744
+msgid "base backup could not send data, aborting backup"
+msgstr ""
+"cópia de segurança base não pôde enviar dados, interrompendo cópia de "
+"segurança"
 
-#: parser/parse_type.c:548 parser/parse_type.c:647
+#: replication/basebackup.c:278 replication/basebackup.c:287
+#: replication/basebackup.c:296 replication/basebackup.c:305
+#: replication/basebackup.c:314
 #, c-format
-msgid "invalid type name \"%s\""
-msgstr "nome de tipo \"%s\" é inválido"
+msgid "duplicate option \"%s\""
+msgstr "opção \"%s\" duplicada"
 
-#: scan.l:411
-msgid "unterminated /* comment"
-msgstr "comentário /* não foi terminado"
+#: replication/basebackup.c:366
+#, c-format
+msgid "could not open directory \"pg_tblspc\": %m"
+msgstr "não pôde abrir diretório \"pg_tblspc\": %m"
 
-#: scan.l:440
-msgid "unterminated bit string literal"
-msgstr "cadeia de bits não foi terminada"
+#: replication/basebackup.c:576
+msgid "shutdown requested, aborting active base backup"
+msgstr "desligamento solicitado, interrompendo cópia de segurança base"
 
-#: scan.l:461
-msgid "unterminated hexadecimal string literal"
-msgstr "cadeia de caracteres hexadecimal não foi terminada"
+#: replication/basebackup.c:590
+#, c-format
+msgid "could not stat file or directory \"%s\": %m"
+msgstr "não pôde executar stat no arquivo ou  diretório \"%s\": %m"
 
-#: scan.l:511
-msgid "unsafe use of string constant with Unicode escapes"
-msgstr "uso inseguro de cadeia de caracteres com escapes Unicode"
+#: replication/basebackup.c:661
+#, c-format
+msgid "skipping special file \"%s\""
+msgstr "ignorando arquivo especial \"%s\""
 
-#: scan.l:512
+#: replication/basebackup.c:726 access/transam/xlog.c:2495
+#: access/transam/xlog.c:4177 access/transam/xlog.c:4271
+#: access/transam/xlog.c:4427 storage/file/copydir.c:165
+#: storage/file/copydir.c:255 storage/smgr/md.c:542 storage/smgr/md.c:802
+#: utils/error/elog.c:1515 utils/init/miscinit.c:1039
+#: utils/init/miscinit.c:1153
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "não pôde abrir arquivo \"%s\": %m"
+
+#: replication/basebackup.c:734
+#, c-format
+msgid "archive member \"%s\" too large for tar format"
+msgstr "membro de archive \"%s\" muito grande para o formato tar"
+
+#: access/transam/varsup.c:114
+#, c-format
 msgid ""
-"String constants with Unicode escapes cannot be used when "
-"standard_conforming_strings is off."
+"database is not accepting commands to avoid wraparound data loss in database "
+"\"%s\""
 msgstr ""
-"Cadeias de caracteres com escapes Unicode não podem ser utilizadas quando "
-"standard_conforming_strings está off."
-
-#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
-#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
-#, fuzzy
-msgid "invalid Unicode surrogate pair"
-msgstr "par substituto Unicode inválido"
+"banco de dados não está aceitando comandos para evitar perda de dados por "
+"reinício no banco de dados \"%s\""
 
-#: scan.l:586
-msgid "invalid Unicode escape"
-msgstr "escape Unicode inválido"
+#: access/transam/varsup.c:116 access/transam/varsup.c:123
+msgid ""
+"Stop the postmaster and use a standalone backend to vacuum that database.\n"
+"You might also need to commit or roll back old prepared transactions."
+msgstr ""
+"Pare o postmaster e use um servidor autônomo para limpar aquele banco de "
+"dados.\n"
+"Você também pode precisar efetivar ou desfazer transações preparadas antigas."
 
-#: scan.l:587
-msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
-msgstr "Escapes Unicode devem ser \\uXXXX ou \\UXXXXXXXX."
+#: access/transam/varsup.c:121
+#, c-format
+msgid ""
+"database is not accepting commands to avoid wraparound data loss in database "
+"with OID %u"
+msgstr ""
+"banco de dados não está aceitando comandos para evitar perda de dados por "
+"reinício no banco de dados com OID %u"
 
-#: scan.l:598
-msgid "unsafe use of \\' in a string literal"
-msgstr "uso inseguro de \\' em cadeia de caracteres"
+#: access/transam/varsup.c:133 access/transam/varsup.c:368
+#, c-format
+msgid "database \"%s\" must be vacuumed within %u transactions"
+msgstr "banco de dados \"%s\" deve ser limpado em %u transações"
 
-#: scan.l:599
+#: access/transam/varsup.c:136 access/transam/varsup.c:143
+#: access/transam/varsup.c:371 access/transam/varsup.c:378
 msgid ""
-"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
+"To avoid a database shutdown, execute a database-wide VACUUM in that "
+"database.\n"
+"You might also need to commit or roll back old prepared transactions."
 msgstr ""
-"Utilize '' para escrever aspóstrofos em cadias de caracteres. \\' é inseguro "
-"em codificações de cliente."
+"Para evitar um desligamento do banco de dados, execute um VACUUM completo "
+"naquele banco de dados.\n"
+"Você também pode precisar efetivar ou desfazer transações preparadas antigas."
 
-#: scan.l:629
-msgid "unterminated quoted string"
-msgstr "cadeia de caracteres entre aspas não foi terminada"
+#: access/transam/varsup.c:140 access/transam/varsup.c:375
+#, c-format
+msgid "database with OID %u must be vacuumed within %u transactions"
+msgstr "banco de dados com OID %u deve ser limpado em %u transações"
 
-#: scan.l:674
-msgid "unterminated dollar-quoted string"
-msgstr "cadeia de caracteres entre dólares não foi terminada"
+#: access/transam/varsup.c:333
+#, c-format
+msgid "transaction ID wrap limit is %u, limited by database with OID %u"
+msgstr ""
+"limite de reinício do ID de transação é %u, limitado pelo banco de dados com "
+"OID %u"
 
-#: scan.l:691 scan.l:703 scan.l:717
-msgid "zero-length delimited identifier"
-msgstr "identificador delimitado tem tamanho zero"
+#: access/transam/xlog.c:1329
+#, c-format
+msgid "could not create archive status file \"%s\": %m"
+msgstr "não pôde criar arquivo de status do arquivador \"%s\": %m"
 
-#: scan.l:730
-msgid "unterminated quoted identifier"
-msgstr "identificador entre aspas não foi terminado"
+#: access/transam/xlog.c:1337
+#, c-format
+msgid "could not write archive status file \"%s\": %m"
+msgstr "não pôde escrever no arquivo de status do arquivador \"%s\": %m"
 
-#: scan.l:834
-msgid "operator too long"
-msgstr "operador muito longo"
+#: access/transam/xlog.c:2011
+#, c-format
+msgid "updated min recovery point to %X/%X"
+msgstr "ponto mínimo de recuperação atualizado para %X/%X"
 
-#. translator: %s is typically the translation of "syntax error"
-#: scan.l:992
+#: access/transam/xlog.c:2417 access/transam/xlog.c:2549
+#: access/transam/xlog.c:4529 storage/file/copydir.c:269 storage/smgr/md.c:924
+#: storage/smgr/md.c:1130 storage/smgr/md.c:1281
 #, c-format
-msgid "%s at end of input"
-msgstr "%s no fim da entrada"
+msgid "could not fsync file \"%s\": %m"
+msgstr "não pôde executar fsync no arquivo \"%s\": %m"
 
-#. translator: first %s is typically the translation of "syntax error"
-#: scan.l:1000
+#: access/transam/xlog.c:2523 access/transam/xlog.c:4439
+#: access/transam/xlog.c:9221 access/transam/xlog.c:9234
+#: access/transam/xlog.c:9768 access/transam/xlog.c:9803
+#: storage/file/copydir.c:186 utils/adt/genfile.c:138
 #, c-format
-msgid "%s at or near \"%s\""
-msgstr "%s em ou próximo a \"%s\""
+msgid "could not read file \"%s\": %m"
+msgstr "não pôde ler arquivo \"%s\": %m"
 
-#: scan.l:1161 scan.l:1193
-msgid ""
-"Unicode escape values cannot be used for code point values above 007F when "
-"the server encoding is not UTF8"
-msgstr ""
-"Valores de escape Unicode não podem ser utilizados para valores de ponto de "
-"código acima de 007F quando a codificação do servidor não for UTF8"
-
-#: scan.l:1189 scan.l:1325
-msgid "invalid Unicode escape value"
-msgstr "valor de escape Unicode inválido"
-
-#: scan.l:1214
-msgid "invalid Unicode escape character"
-msgstr "caracter de escape Unicode inválido"
-
-#: scan.l:1381
-msgid "nonstandard use of \\' in a string literal"
-msgstr "uso de \\' fora do padrão em cadeia de caracteres"
+#: access/transam/xlog.c:2526
+#, c-format
+msgid "not enough data in file \"%s\""
+msgstr "dados insuficientes no arquivo \"%s\""
 
-#: scan.l:1382
+#: access/transam/xlog.c:2645
+#, c-format
 msgid ""
-"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
-msgstr ""
-"Utilize '' para escrever cadeias de carateres entre apóstofros, ou utilize a "
-"sintaxe de escape de cadeia de caracteres (E'...')."
-
-#: scan.l:1391
-msgid "nonstandard use of \\\\ in a string literal"
-msgstr "uso de \\\\ fora do padrão em cadeia de caracteres"
-
-#: scan.l:1392
-msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
+"could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
+"%u): %m"
 msgstr ""
-"Utilize a sintaxe de escape de cadeia de caracteres para barras invertidas, "
-"i.e., E'\\\\'."
-
-#: scan.l:1406
-msgid "nonstandard use of escape in a string literal"
-msgstr "uso de escape fora do padrão em cadeia de caracteres"
+"não pôde vincular arquivo \"%s\" aa \"%s\" (inicialização do arquivo de log "
+"%u, segmento %u): %m"
 
-#: scan.l:1407
-msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
+#: access/transam/xlog.c:2657
+#, c-format
+msgid ""
+"could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
+"segment %u): %m"
 msgstr ""
-"Utilize a sintaxe de escape de cadeia de caracteres para escapes, i.e., E'\\r"
-"\\n'."
+"não pôde renomear arquivo \"%s\" para \"%s\" (inicialização do arquivo de "
+"log %u, segmento %u): %m"
 
-#: rewrite/rewriteRemove.c:62 rewrite/rewriteDefine.c:687
-#: rewrite/rewriteDefine.c:749 commands/comment.c:910
+#: access/transam/xlog.c:2912 access/transam/xlog.c:3077
+#: access/transam/xlog.c:9034 access/transam/xlog.c:9209
+#: storage/file/copydir.c:86 storage/file/copydir.c:125
+#: utils/adt/genfile.c:107 utils/adt/genfile.c:279 utils/adt/dbsize.c:65
+#: utils/adt/dbsize.c:211 utils/adt/dbsize.c:276
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist"
-msgstr "regra \"%s\" para relação \"%s\" não existe"
+msgid "could not stat file \"%s\": %m"
+msgstr "não pôde executar stat no arquivo \"%s\": %m"
 
-#: rewrite/rewriteRemove.c:66
+#: access/transam/xlog.c:2920 access/transam/xlog.c:9239 storage/smgr/md.c:358
+#: storage/smgr/md.c:405 storage/smgr/md.c:1244
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "regra \"%s\" para relação \"%s\" não existe, ignorando"
-
-#: rewrite/rewriteHandler.c:495
-msgid "cannot have RETURNING lists in multiple rules"
-msgstr "não pode ter listas RETURNING em múltiplas regras"
+msgid "could not remove file \"%s\": %m"
+msgstr "não pôde remover arquivo \"%s\": %m"
 
-#: rewrite/rewriteHandler.c:796 rewrite/rewriteHandler.c:814
+#: access/transam/xlog.c:3056
 #, c-format
-msgid "multiple assignments to same column \"%s\""
-msgstr "atribuições múltiplas para mesma coluna \"%s\""
+msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
+msgstr ""
+"arquivo do arquivador \"%s\" tem tamanho incorreto: %lu ao invés de %lu"
 
-#: rewrite/rewriteHandler.c:952 catalog/heap.c:2280
+#: access/transam/xlog.c:3065
 #, c-format
-msgid "column \"%s\" is of type %s but default expression is of type %s"
-msgstr "coluna \"%s\" é do tipo %s mas expressão padrão é do tipo %s"
+msgid "restored log file \"%s\" from archive"
+msgstr "arquivo de log restaurado \"%s\" do arquivador"
 
-#: rewrite/rewriteHandler.c:1417 rewrite/rewriteHandler.c:1740
+#: access/transam/xlog.c:3115
 #, c-format
-msgid "infinite recursion detected in rules for relation \"%s\""
-msgstr "recursão infinita detectada em regras para relação \"%s\""
+msgid "could not restore file \"%s\" from archive: return code %d"
+msgstr "não pôde restaurar arquivo \"%s\" do arquivador: código retornado %d"
 
-#: rewrite/rewriteHandler.c:1778
+#. translator: First %s represents a recovery.conf parameter name like
+#. "recovery_end_command", and the 2nd is the value of that parameter.
+#: access/transam/xlog.c:3229
 #, c-format
-msgid "cannot perform INSERT RETURNING on relation \"%s\""
-msgstr "não pode executar INSERT RETURNING na relação \"%s\""
-
-#: rewrite/rewriteHandler.c:1780
-msgid ""
-"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
-msgstr ""
-"Você precisa de uma regra incondicional ON INSERT DO INSTEAD com uma "
-"cláusula RETURNING."
+msgid "%s \"%s\": return code %d"
+msgstr "%s \"%s\": código retornado %d"
 
-#: rewrite/rewriteHandler.c:1785
+#: access/transam/xlog.c:3339 access/transam/xlog.c:3522
 #, c-format
-msgid "cannot perform UPDATE RETURNING on relation \"%s\""
-msgstr "não pode executar UPDATE RETURNING na relação \"%s\""
-
-#: rewrite/rewriteHandler.c:1787
-msgid ""
-"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
-msgstr ""
-"Você precisa de uma regra incondicional ON UPDATE DO INSTEAD com uma "
-"cláusula RETURNING."
+msgid "could not open transaction log directory \"%s\": %m"
+msgstr "não pôde abrir diretório do log de transação \"%s\": %m"
 
-#: rewrite/rewriteHandler.c:1792
+#: access/transam/xlog.c:3393
 #, c-format
-msgid "cannot perform DELETE RETURNING on relation \"%s\""
-msgstr "não pode executar DELETE RETURNING na relação \"%s\""
-
-#: rewrite/rewriteHandler.c:1794
-msgid ""
-"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
-msgstr ""
-"Você precisa de uma regra incondicional ON DELETE DO INSTEAD com uma "
-"cláusula RETURNING."
-
-#: rewrite/rewriteHandler.c:1892
-msgid "cannot insert into a view"
-msgstr "não pode inserir em uma visão"
-
-#: rewrite/rewriteHandler.c:1893
-msgid "You need an unconditional ON INSERT DO INSTEAD rule."
-msgstr "Você precisa de uma regra incondicional ON INSERT DO INSTEAD."
-
-#: rewrite/rewriteHandler.c:1898
-msgid "cannot update a view"
-msgstr "não pode atualizar uma visão"
-
-#: rewrite/rewriteHandler.c:1899
-msgid "You need an unconditional ON UPDATE DO INSTEAD rule."
-msgstr "Você precisa de uma regra incondicional ON UPDATE DO INSTEAD."
+msgid "recycled transaction log file \"%s\""
+msgstr "arquivo do log de transação \"%s\" foi reciclado"
 
-#: rewrite/rewriteHandler.c:1904
-msgid "cannot delete from a view"
-msgstr "não pode apagar de uma visão"
+#: access/transam/xlog.c:3409
+#, c-format
+msgid "removing transaction log file \"%s\""
+msgstr "removendo arquivo do log de transação \"%s\""
 
-#: rewrite/rewriteHandler.c:1905
-msgid "You need an unconditional ON DELETE DO INSTEAD rule."
-msgstr "Você precisa de uma regra incondicional ON DELETE DO INSTEAD."
+#: access/transam/xlog.c:3432
+#, c-format
+msgid "could not rename old transaction log file \"%s\": %m"
+msgstr "não pôde renomear arquivo de log de transação antigo \"%s\": %m"
 
-#: rewrite/rewriteDefine.c:108 rewrite/rewriteDefine.c:756
+#: access/transam/xlog.c:3444
 #, c-format
-msgid "rule \"%s\" for relation \"%s\" already exists"
-msgstr "regra \"%s\" para relação \"%s\" já existe"
+msgid "could not remove old transaction log file \"%s\": %m"
+msgstr "não pôde remover arquivo de log de transação antigo \"%s\": %m"
 
-#: rewrite/rewriteDefine.c:252 commands/tablecmds.c:3348
+#: access/transam/xlog.c:3482 access/transam/xlog.c:3492
 #, c-format
-msgid "\"%s\" is not a table or view"
-msgstr "\"%s\" não é uma tabela ou visão"
+msgid "required WAL directory \"%s\" does not exist"
+msgstr "diretório WAL requerido \"%s\" não existe"
 
-#: rewrite/rewriteDefine.c:258 tcop/utility.c:92 commands/trigger.c:155
-#: commands/trigger.c:1069 commands/tablecmds.c:777 commands/tablecmds.c:1109
-#: commands/tablecmds.c:2001 commands/tablecmds.c:3366
-#: commands/tablecmds.c:3395 commands/tablecmds.c:4814
+#: access/transam/xlog.c:3498
 #, c-format
-msgid "permission denied: \"%s\" is a system catalog"
-msgstr "permissão negada: \"%s\" é um catálogo do sistema"
+msgid "creating missing WAL directory \"%s\""
+msgstr "criando diretório WAL ausente \"%s\""
 
-#: rewrite/rewriteDefine.c:282
-msgid "rule actions on OLD are not implemented"
-msgstr "ações da regra em OLD não estão implementadas"
+#: access/transam/xlog.c:3501
+#, c-format
+msgid "could not create missing directory \"%s\": %m"
+msgstr "não pôde criar diretório ausente \"%s\": %m"
 
-#: rewrite/rewriteDefine.c:283
-msgid "Use views or triggers instead."
-msgstr "Ao invés disso utilize visões ou gatilhos."
+#: access/transam/xlog.c:3535
+#, c-format
+msgid "removing transaction log backup history file \"%s\""
+msgstr "removendo arquivo de histórico do log de transação \"%s\""
 
-#: rewrite/rewriteDefine.c:287
-msgid "rule actions on NEW are not implemented"
-msgstr "ações da regra em NEW não estão implementadas"
+#: access/transam/xlog.c:3655
+#, c-format
+msgid "incorrect hole size in record at %X/%X"
+msgstr "tamanho de espaço livre incorreto no registro em %X/%X"
 
-#: rewrite/rewriteDefine.c:288
-msgid "Use triggers instead."
-msgstr "Ao invés disso utilize gatilhos."
+#: access/transam/xlog.c:3668
+#, c-format
+msgid "incorrect total length in record at %X/%X"
+msgstr "tamanho total incorreto no registro em %X/%X"
 
-#: rewrite/rewriteDefine.c:301
-msgid "INSTEAD NOTHING rules on SELECT are not implemented"
-msgstr "regras INSTEAD NOTHING no SELECT não estão implementadas"
+#: access/transam/xlog.c:3681
+#, c-format
+msgid "incorrect resource manager data checksum in record at %X/%X"
+msgstr ""
+"soma de verificação de dados do gerenciador de recursos incorreta no "
+"registro %X/%X"
 
-#: rewrite/rewriteDefine.c:302
-msgid "Use views instead."
-msgstr "Ao invés disso utilize visões."
+#: access/transam/xlog.c:3759 access/transam/xlog.c:3797
+#, c-format
+msgid "invalid record offset at %X/%X"
+msgstr "deslocamento de registro inválido em %X/%X"
 
-#: rewrite/rewriteDefine.c:310
-msgid "multiple actions for rules on SELECT are not implemented"
-msgstr "ações múltiplas para regras no SELECT não estão implementadas"
+#: access/transam/xlog.c:3805
+#, c-format
+msgid "contrecord is requested by %X/%X"
+msgstr "contrecord é solicitado por %X/%X"
 
-#: rewrite/rewriteDefine.c:322
-msgid "rules on SELECT must have action INSTEAD SELECT"
-msgstr "regras no SELECT devem ter ação INSTEAD SELECT"
+#: access/transam/xlog.c:3820
+#, c-format
+msgid "invalid xlog switch record at %X/%X"
+msgstr "registro de rotação do xlog é inválido em %X/%X"
 
-#: rewrite/rewriteDefine.c:330
-msgid "event qualifications are not implemented for rules on SELECT"
-msgstr "qualificações de eventos não estão implementadas para regras no SELECT"
+#: access/transam/xlog.c:3828
+#, c-format
+msgid "record with zero length at %X/%X"
+msgstr "registro com tamanho zero em %X/%X"
 
-#: rewrite/rewriteDefine.c:355
+#: access/transam/xlog.c:3837
 #, c-format
-msgid "\"%s\" is already a view"
-msgstr "\"%s\" já é uma visão"
+msgid "invalid record length at %X/%X"
+msgstr "tamanho de registro é inválido em %X/%X"
 
-#: rewrite/rewriteDefine.c:379
+#: access/transam/xlog.c:3844
 #, c-format
-msgid "view rule for \"%s\" must be named \"%s\""
-msgstr "regra para visão em \"%s\" deve ter nome \"%s\""
+msgid "invalid resource manager ID %u at %X/%X"
+msgstr "ID do gerenciador de recursos %u é inválido em %X/%X"
 
-#: rewrite/rewriteDefine.c:404
+#: access/transam/xlog.c:3857 access/transam/xlog.c:3873
 #, c-format
-msgid "could not convert table \"%s\" to a view because it is not empty"
-msgstr "não pôde converter tabela \"%s\" em visão porque ela não está vazia"
+msgid "record with incorrect prev-link %X/%X at %X/%X"
+msgstr "registro com prev-link %X/%X incorreto em %X/%X"
 
-#: rewrite/rewriteDefine.c:411
+#: access/transam/xlog.c:3902
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has triggers"
-msgstr "não pôde converter tabela \"%s\" em visão porque ela tem gatilhos"
+msgid "record length %u at %X/%X too long"
+msgstr "tamanho do registro %u em %X/%X é muito longo"
 
-#: rewrite/rewriteDefine.c:413
-msgid ""
-"In particular, the table cannot be involved in any foreign key relationships."
+#: access/transam/xlog.c:3942
+#, c-format
+msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr ""
-"Em particular, a tabela não pode estar envolvida em relacionamentos de chave "
-"estrangeira."
+"não há marcação em contrecord no arquivo de log %u, segmento %u, "
+"deslocamento %u"
 
-#: rewrite/rewriteDefine.c:418
+#: access/transam/xlog.c:3952
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has indexes"
-msgstr "não pôde converter tabela \"%s\" em visão porque ela tem índices"
+msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
+msgstr ""
+"tamanho de contrecord %u é inválido no arquivo de log %u, segmento %u, "
+"deslocamento %u"
 
-#: rewrite/rewriteDefine.c:424
+#: access/transam/xlog.c:4042
 #, c-format
-msgid "could not convert table \"%s\" to a view because it has child tables"
+msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
-"não pôde converter tabela \"%s\" em visão porque ela tem tabelas descendentes"
-
-#: rewrite/rewriteDefine.c:451
-msgid "cannot have multiple RETURNING lists in a rule"
-msgstr "não pode ter múltiplas listas RETURNING em uma regra"
+"número mágico %04X é invalido no arquivo de log %u, segmento %u, "
+"deslocamento %u"
 
-#: rewrite/rewriteDefine.c:456
-msgid "RETURNING lists are not supported in conditional rules"
-msgstr "listas RETURNING não são suportadas em regras condicionais"
+#: access/transam/xlog.c:4049 access/transam/xlog.c:4095
+#, c-format
+msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
+msgstr ""
+"bits de informação %04X são inválidos no arquivo de log %u, segmento %u, "
+"deslocamento %u"
 
-#: rewrite/rewriteDefine.c:460
-msgid "RETURNING lists are not supported in non-INSTEAD rules"
-msgstr "listas RETURNING não são suportadas em regras que não utilizam INSTEAD"
+#: access/transam/xlog.c:4071 access/transam/xlog.c:4079
+#: access/transam/xlog.c:4086
+msgid "WAL file is from different database system"
+msgstr "arquivo do WAL é de um sistema de banco de dados diferente"
 
-#: rewrite/rewriteDefine.c:539
-msgid "SELECT rule's target list has too many entries"
-msgstr "lista de alvos de uma regra SELECT tem muitas entradas"
+#: access/transam/xlog.c:4072
+#, c-format
+msgid ""
+"WAL file database system identifier is %s, pg_control database system "
+"identifier is %s."
+msgstr ""
+"identificador do sistema de banco de dados no arquivo do WAL é %s, "
+"identificador do sistema de banco de dados no pg_control é %s."
 
-#: rewrite/rewriteDefine.c:540
-msgid "RETURNING list has too many entries"
-msgstr "lista RETURNING tem muitas entradas"
+#: access/transam/xlog.c:4080
+msgid "Incorrect XLOG_SEG_SIZE in page header."
+msgstr "XLOG_SEG_SIZE está incorreto no cabeçalho da página."
 
-#: rewrite/rewriteDefine.c:556
-msgid "cannot convert relation containing dropped columns to view"
-msgstr "não pode converter relação contendo colunas removidas em visão"
+#: access/transam/xlog.c:4087
+msgid "Incorrect XLOG_BLCKSZ in page header."
+msgstr "XLOG_BLCKSZ está incorreto no cabeçalho da página."
 
-#: rewrite/rewriteDefine.c:561
+#: access/transam/xlog.c:4103
 #, c-format
-msgid "SELECT rule's target entry %d has different column name from \"%s\""
+msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
-"entrada alvo %d de uma regra SELECT tem nome de coluna diferente de \"%s\""
+"pageaddr %X/%X inesperado no arquivo de log %u, segmento %u, deslocalemto %u"
 
-#: rewrite/rewriteDefine.c:567
+#: access/transam/xlog.c:4115
 #, c-format
-msgid "SELECT rule's target entry %d has different type from column \"%s\""
+msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
 msgstr ""
-"entrada alvo %d de uma regra SELECT tem tipo diferente da coluna \"%s\""
+"ID de linha do tempo %u inesperado no arquivo de log %u, segmento %u, "
+"deslocalemto %u"
 
-#: rewrite/rewriteDefine.c:569
+#: access/transam/xlog.c:4133
 #, c-format
-msgid "RETURNING list's entry %d has different type from column \"%s\""
-msgstr "entrada %d de uma lista RETURNING tem tipo diferente da coluna \"%s\""
-
-#: rewrite/rewriteDefine.c:584
-#, c-format
-msgid "SELECT rule's target entry %d has different size from column \"%s\""
+msgid ""
+"out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
+"%u"
 msgstr ""
-"entrada alvo %d de uma regra SELECT tem tamanho diferente da coluna \"%s\""
+"ID de linha do tempo %u fora de sequência (depois %u) no arquivo de log %u, "
+"segmento %u, deslocamento %u"
 
-#: rewrite/rewriteDefine.c:586
+#: access/transam/xlog.c:4206
 #, c-format
-msgid "RETURNING list's entry %d has different size from column \"%s\""
-msgstr ""
-"entrada %d de uma lista RETURNING tem tamanho diferente da coluna \"%s\""
-
-#: rewrite/rewriteDefine.c:594
-msgid "SELECT rule's target list has too few entries"
-msgstr "lista de alvos de uma regra SELECT tem poucas entradas"
-
-#: rewrite/rewriteDefine.c:595
-msgid "RETURNING list has too few entries"
-msgstr "lista RETURNING tem poucas entradas"
-
-#: rewrite/rewriteManip.c:1009
-msgid "conditional utility statements are not implemented"
-msgstr "comandos utilitários condicionais não estão implementados"
+msgid "syntax error in history file: %s"
+msgstr "erro de sintaxe no arquivo de histórico: %s"
 
-#: rewrite/rewriteManip.c:1174
-msgid "WHERE CURRENT OF on a view is not implemented"
-msgstr "WHERE CURRENT OF em uma visão não está implementado"
+#: access/transam/xlog.c:4207
+msgid "Expected a numeric timeline ID."
+msgstr "Esperado um ID de linha do tempo numérico."
 
-#: optimizer/util/clauses.c:4002
+#: access/transam/xlog.c:4212
 #, c-format
-msgid "SQL function \"%s\" during inlining"
-msgstr "função SQL \"%s\" durante expansão em linha"
-
-#: optimizer/prep/prepunion.c:374
-msgid "could not implement recursive UNION"
-msgstr "não pôde implementar UNION recursivo"
+msgid "invalid data in history file: %s"
+msgstr "dado inválido no arquivo de histórico: %s"
 
-#: optimizer/prep/prepunion.c:375
-msgid "All column datatypes must be hashable."
-msgstr "Todos os tipos de dados de colunas devem suportar utilização de hash."
+#: access/transam/xlog.c:4213
+msgid "Timeline IDs must be in increasing sequence."
+msgstr "IDs de linha do tempo devem ser uma sequência crescente."
 
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:768
+#: access/transam/xlog.c:4226
 #, c-format
-msgid "could not implement %s"
-msgstr "não pôde implementar %s"
-
-#: optimizer/prep/prepunion.c:769 optimizer/plan/planner.c:2221
-#: optimizer/plan/planner.c:2390
-msgid ""
-"Some of the datatypes only support hashing, while others only support "
-"sorting."
-msgstr ""
-"Alguns dos tipos de dados só suportam utilização de hash, enquanto outros só "
-"suportam utilização de ordenação."
-
-#: optimizer/plan/planner.c:2220
-msgid "could not implement GROUP BY"
-msgstr "não pôde implementar GROUP BY"
-
-#: optimizer/plan/planner.c:2389
-msgid "could not implement DISTINCT"
-msgstr "não pôde implementar DISTINCT"
-
-#: optimizer/plan/planner.c:2833
-msgid "could not implement window PARTITION BY"
-msgstr "não pôde implementar deslizante PARTITION BY"
-
-#: optimizer/plan/planner.c:2834
-msgid "Window partitioning columns must be of sortable datatypes."
-msgstr ""
-"Colunas de particionamento de deslizante devem ser de tipos de dados que "
-"suportam ordenação."
-
-#: optimizer/plan/planner.c:2838
-msgid "could not implement window ORDER BY"
-msgstr "não pôde implementar deslizante ORDER BY"
+msgid "invalid data in history file \"%s\""
+msgstr "dado inválido no arquivo de histórico \"%s\""
 
-#: optimizer/plan/planner.c:2839
-msgid "Window ordering columns must be of sortable datatypes."
+#: access/transam/xlog.c:4227
+msgid "Timeline IDs must be less than child timeline's ID."
 msgstr ""
-"Colunas de ordenação de deslizante devem ser de tipos de dados que suportam "
-"ordenação."
+"IDs de linha do tempo devem ser menores do que ID de linha do tempo "
+"descendente."
 
-#: optimizer/plan/initsplan.c:574
-msgid ""
-"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
-"join"
+#: access/transam/xlog.c:4313
+#, c-format
+msgid "new timeline %u is not a child of database system timeline %u"
 msgstr ""
-"SELECT FOR UPDATE/SHARE não pode ser aplicado ao lado com valores nulos de "
-"um junção externa"
+"nova linha do tempo %u não é descendente da linha do tempo %u do sistema de "
+"banco de dados"
 
-#: tcop/fastpath.c:110 tcop/fastpath.c:492 tcop/fastpath.c:622
+#: access/transam/xlog.c:4326
 #, c-format
-msgid "invalid argument size %d in function call message"
-msgstr "tamanho de argumento %d é inválido na mensagem de chamada da função"
+msgid "new target timeline is %u"
+msgstr "nova linha do tempo é %u"
 
-#: tcop/fastpath.c:181 tcop/fastpath.c:561 tcop/postgres.c:1698
-#: access/common/printtup.c:278
+#: access/transam/xlog.c:4551
 #, c-format
-msgid "unsupported format code: %d"
-msgstr "código do formato não é suportado: %d"
+msgid "could not link file \"%s\" to \"%s\": %m"
+msgstr "não pôde vincular arquivo \"%s\" a \"%s\": %m"
 
-#: tcop/fastpath.c:222 catalog/aclchk.c:3554 catalog/aclchk.c:4304
+#: access/transam/xlog.c:4640
 #, c-format
-msgid "function with OID %u does not exist"
-msgstr "função com OID %u não existe"
-
-#: tcop/fastpath.c:291 tcop/postgres.c:342 tcop/postgres.c:365
-#: commands/copy.c:515 commands/copy.c:534 commands/copy.c:538
-msgid "unexpected EOF on client connection"
-msgstr "EOF inesperado durante conexão do cliente"
-
-#: tcop/fastpath.c:304 tcop/postgres.c:951 tcop/postgres.c:1261
-#: tcop/postgres.c:1542 tcop/postgres.c:1984 tcop/postgres.c:2352
-#: tcop/postgres.c:2433
-msgid ""
-"current transaction is aborted, commands ignored until end of transaction "
-"block"
-msgstr ""
-"transação atual foi interrompida, comandos ignorados até o fim do bloco de "
-"transação"
+msgid "could not create control file \"%s\": %m"
+msgstr "não pôde criar arquivo de controle \"%s\": %m"
 
-#: tcop/fastpath.c:332
+#: access/transam/xlog.c:4651 access/transam/xlog.c:4876
 #, c-format
-msgid "fastpath function call: \"%s\" (OID %u)"
-msgstr "chamada de função fastpath: \"%s\" (OID %u)"
+msgid "could not write to control file: %m"
+msgstr "não pôde escrever em arquivo de controle: %m"
 
-#: tcop/fastpath.c:418 tcop/postgres.c:1121 tcop/postgres.c:1408
-#: tcop/postgres.c:1825 tcop/postgres.c:2042
+#: access/transam/xlog.c:4657 access/transam/xlog.c:4882
 #, c-format
-msgid "duration: %s ms"
-msgstr "duração: %s ms"
+msgid "could not fsync control file: %m"
+msgstr "não pôde executar fsync no arquivo de controle: %m"
 
-#: tcop/fastpath.c:422
+#: access/transam/xlog.c:4662 access/transam/xlog.c:4887
 #, c-format
-msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
-msgstr "duração: %s ms  chamada de função fastpath: \"%s\" (OID %u)"
+msgid "could not close control file: %m"
+msgstr "não pôde fechar arquivo de controle: %m"
 
-#: tcop/fastpath.c:460 tcop/fastpath.c:587
+#: access/transam/xlog.c:4680 access/transam/xlog.c:4865
 #, c-format
-msgid "function call message contains %d arguments but function requires %d"
-msgstr ""
-"mensagem de chamada da função contém %d argumentos mas função requer %d"
+msgid "could not open control file \"%s\": %m"
+msgstr "não pôde abrir arquivo de controle \"%s\": %m"
 
-#: tcop/fastpath.c:468
+#: access/transam/xlog.c:4686
 #, c-format
-msgid "function call message contains %d argument formats but %d arguments"
-msgstr ""
-"mensagem de chamada da função contém %d formatos de argumento mas só tem %d "
-"argumentos"
+msgid "could not read from control file: %m"
+msgstr "não pôde ler do arquivo de controle: %m"
 
-#: tcop/fastpath.c:555 tcop/fastpath.c:638
-#, c-format
-msgid "incorrect binary data format in function argument %d"
-msgstr "formato de dado binário incorreto no argumento %d da função"
+#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
+#: access/transam/xlog.c:4732 access/transam/xlog.c:4739
+#: access/transam/xlog.c:4746 access/transam/xlog.c:4751
+#: access/transam/xlog.c:4758 access/transam/xlog.c:4765
+#: access/transam/xlog.c:4772 access/transam/xlog.c:4779
+#: access/transam/xlog.c:4786 access/transam/xlog.c:4793
+#: access/transam/xlog.c:4802 access/transam/xlog.c:4809
+#: access/transam/xlog.c:4818 access/transam/xlog.c:4825
+#: access/transam/xlog.c:4834 access/transam/xlog.c:4841
+#: utils/init/miscinit.c:1171
+msgid "database files are incompatible with server"
+msgstr "arquivos do banco de dados são incompatíveis com o servidor"
 
-#: tcop/pquery.c:670
+#: access/transam/xlog.c:4700
 #, c-format
-msgid "bind message has %d result formats but query has %d columns"
+msgid ""
+"The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
+"but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
 msgstr ""
-"mensagem de ligação tem %d formatos de resultados mas consulta tem %d colunas"
+"O agrupamento de banco de dados foi inicializado com PG_CONTROL_VERSION %d "
+"(0x%08x), mas o servidor foi compilado com PG_CONTROL_VERSION %d (0x%08x)."
+
+#: access/transam/xlog.c:4704
+msgid ""
+"This could be a problem of mismatched byte ordering.  It looks like you need "
+"to initdb."
+msgstr ""
+"Isto pode ser um problema com ordenação dos bits. Parece que você precisa "
+"executar o initdb."
 
-#: tcop/pquery.c:748 tcop/pquery.c:1371 commands/portalcmds.c:329
+#: access/transam/xlog.c:4709
 #, c-format
-msgid "portal \"%s\" cannot be run"
-msgstr "portal \"%s\" não pode ser executado"
+msgid ""
+"The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
+"server was compiled with PG_CONTROL_VERSION %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com PG_CONTROL_VERSION %d, "
+"mas o servidor foi compilado com PG_CONTROL_VERSION %d."
 
-#: tcop/pquery.c:978
-msgid "cursor can only scan forward"
-msgstr "cursor só pode buscar para frente"
+#: access/transam/xlog.c:4712 access/transam/xlog.c:4736
+#: access/transam/xlog.c:4743 access/transam/xlog.c:4748
+msgid "It looks like you need to initdb."
+msgstr "Parece que você precisa executar o initdb."
 
-#: tcop/pquery.c:979
-msgid "Declare it with SCROLL option to enable backward scan."
-msgstr "Declare-o com a opção SCROLL para habilitar a busca para trás."
+#: access/transam/xlog.c:4723
+msgid "incorrect checksum in control file"
+msgstr "soma de verificação está incorreta em arquivo de controle"
 
-#: tcop/postgres.c:392 tcop/postgres.c:404 tcop/postgres.c:415
-#: tcop/postgres.c:427 tcop/postgres.c:4094
+#: access/transam/xlog.c:4733
 #, c-format
-msgid "invalid frontend message type %d"
-msgstr "tipo de mensagem do cliente %d é inválido"
+msgid ""
+"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
+"server was compiled with CATALOG_VERSION_NO %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com CATALOG_VERSION_NO %d, "
+"mas o servidor foi compilado com CATALOG_VERSION_NO %d."
 
-#: tcop/postgres.c:892
+#: access/transam/xlog.c:4740
 #, c-format
-msgid "statement: %s"
-msgstr "comando: %s"
+msgid ""
+"The database cluster was initialized with MAXALIGN %d, but the server was "
+"compiled with MAXALIGN %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com MAXALIGN %d, mas o "
+"servidor foi compilado com MAXALIGN %d."
 
-#: tcop/postgres.c:1126
-#, c-format
-msgid "duration: %s ms  statement: %s"
-msgstr "duração: %s ms  comando: %s"
+#: access/transam/xlog.c:4747
+msgid ""
+"The database cluster appears to use a different floating-point number format "
+"than the server executable."
+msgstr ""
+"O agrupamento de banco de dados parece utilizar um formato de número de "
+"ponto flutuante diferente do executável do servidor."
 
-#: tcop/postgres.c:1176
+#: access/transam/xlog.c:4752
 #, c-format
-msgid "parse %s: %s"
-msgstr "análise de %s: %s"
+msgid ""
+"The database cluster was initialized with BLCKSZ %d, but the server was "
+"compiled with BLCKSZ %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com BLCSZ %d, mas o "
+"servidor foi compilado com BLCSZ %d."
 
-#: tcop/postgres.c:1234
-msgid "cannot insert multiple commands into a prepared statement"
-msgstr "não pode inserir múltiplos comandos no comando preparado"
+#: access/transam/xlog.c:4755 access/transam/xlog.c:4762
+#: access/transam/xlog.c:4769 access/transam/xlog.c:4776
+#: access/transam/xlog.c:4783 access/transam/xlog.c:4790
+#: access/transam/xlog.c:4797 access/transam/xlog.c:4805
+#: access/transam/xlog.c:4812 access/transam/xlog.c:4821
+#: access/transam/xlog.c:4828 access/transam/xlog.c:4837
+#: access/transam/xlog.c:4844
+msgid "It looks like you need to recompile or initdb."
+msgstr "Parece que você precisa recompilar ou executar o initdb."
 
-#: tcop/postgres.c:1413
+#: access/transam/xlog.c:4759
 #, c-format
-msgid "duration: %s ms  parse %s: %s"
-msgstr "duração: %s ms  análise de %s: %s"
+msgid ""
+"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
+"compiled with RELSEG_SIZE %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com RELSEG_SIZE %d, mas o "
+"servidor foi compilado com RELSEG_SIZE %d."
 
-#: tcop/postgres.c:1459
+#: access/transam/xlog.c:4766
 #, c-format
-msgid "bind %s to %s"
-msgstr "ligação de %s para %s"
-
-#: tcop/postgres.c:1478 tcop/postgres.c:2332
-msgid "unnamed prepared statement does not exist"
-msgstr "comando preparado sem nome não existe"
+msgid ""
+"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
+"compiled with XLOG_BLCKSZ %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com XLOG_BLCSZ %d, mas o "
+"servidor foi compilado com XLOG_BLCSZ %d."
 
-#: tcop/postgres.c:1520
+#: access/transam/xlog.c:4773
 #, c-format
-msgid "bind message has %d parameter formats but %d parameters"
+msgid ""
+"The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
+"was compiled with XLOG_SEG_SIZE %d."
 msgstr ""
-"mensagem de ligação tem %d formatos de parâmetro mas só tem %d parâmetros"
+"O agrupamento de banco de dados foi inicializado com XLOG_SEG_SIZE %d, mas o "
+"servidor foi compilado com XLOG_SEG_SIZE %d."
 
-#: tcop/postgres.c:1526
+#: access/transam/xlog.c:4780
 #, c-format
 msgid ""
-"bind message supplies %d parameters, but prepared statement \"%s\" requires "
-"%d"
+"The database cluster was initialized with NAMEDATALEN %d, but the server was "
+"compiled with NAMEDATALEN %d."
 msgstr ""
-"mensagem de ligação forneceu %d parâmetros, mas comando preparado \"%s\" "
-"requer %d"
+"O agrupamento de banco de dados foi inicializado com NAMEDATALEN %d, mas o "
+"servidor foi compilado com NAMEDATALEN %d."
 
-#: tcop/postgres.c:1691
+#: access/transam/xlog.c:4787
 #, c-format
-msgid "incorrect binary data format in bind parameter %d"
-msgstr "formato de dado binário incorreto no parâmetro de ligação %d"
+msgid ""
+"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
+"was compiled with INDEX_MAX_KEYS %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com INDEX_MAX_KEYS %d, mas "
+"o servidor foi compilado com INDEX_MAX_KEYS %d."
 
-#: tcop/postgres.c:1830
+#: access/transam/xlog.c:4794
 #, c-format
-msgid "duration: %s ms  bind %s%s%s: %s"
-msgstr "duração: %s ms  ligação %s%s%s: %s"
+msgid ""
+"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
+"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado com TOAST_MAX_CHUNK_SIZE "
+"%d, mas o servidor foi compilado com TOAST_MAX_CHUNK_SIZE %d."
 
-#: tcop/postgres.c:1878 tcop/postgres.c:2419
-#, c-format
-msgid "portal \"%s\" does not exist"
-msgstr "portal \"%s\" não existe"
+#: access/transam/xlog.c:4803
+msgid ""
+"The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
+"server was compiled with HAVE_INT64_TIMESTAMP."
+msgstr ""
+"O agrupamento de banco de dados foi inicializado sem HAVE_INT64_TIMESTAMP "
+"mas o servidor foi compilado com HAVE_INT64_TIMESTAMP."
 
-#: tcop/postgres.c:1965 tcop/postgres.c:2050
-msgid "execute fetch from"
-msgstr "executar busca de"
-
-#: tcop/postgres.c:1966 tcop/postgres.c:2051
-msgid "execute"
-msgstr "executar"
-
-#: tcop/postgres.c:1963
-#, c-format
-msgid "%s %s%s%s: %s"
-msgstr "%s %s%s%s: %s"
-
-#: tcop/postgres.c:2047
-#, c-format
-msgid "duration: %s ms  %s %s%s%s: %s"
-msgstr "duração: %s ms  %s %s%s%s: %s"
-
-#: tcop/postgres.c:2173
-#, c-format
-msgid "prepare: %s"
-msgstr "preparado: %s"
-
-#: tcop/postgres.c:2236
-#, c-format
-msgid "parameters: %s"
-msgstr "parâmetros: %s"
-
-#: tcop/postgres.c:2255
-msgid "abort reason: recovery conflict"
-msgstr "razão da interrupção: conflito de recuperação"
-
-#: tcop/postgres.c:2271
-#, fuzzy
-msgid "User was holding shared buffer pin for too long."
-msgstr "Usuário estava mantendo um buffer compartilhado por muito tempo."
-
-#: tcop/postgres.c:2274
-#, fuzzy
-msgid "User was holding a relation lock for too long."
-msgstr "Usuário estava mantendo um travamento de relação por muito tempo."
-
-#: tcop/postgres.c:2277
-#, fuzzy
-msgid "User was or might have been using tablespace that must be dropped."
-msgstr "Usuário estava ou pode estar usando tablespace que dev ser removida."
-
-#: tcop/postgres.c:2280
-#, fuzzy
-msgid "User query might have needed to see row versions that must be removed."
-msgstr "Consulta do usuário pode ter precisado acessar versões de registros que devem ser removidas."
-
-#: tcop/postgres.c:2283 storage/ipc/standby.c:507
-#, fuzzy
-msgid "User transaction caused buffer deadlock with recovery."
-msgstr "Transação do usuário causou impasse de buffer com recuperação."
-
-#: tcop/postgres.c:2286
-msgid "User was connected to a database that must be dropped."
-msgstr "Usuário estava conectado ao banco de dados que deve ser removido."
-
-#: tcop/postgres.c:2620
-msgid "terminating connection because of crash of another server process"
-msgstr ""
-"finalizando conexão por causa de uma queda de um outro processo servidor"
-
-#: tcop/postgres.c:2621
+#: access/transam/xlog.c:4810
 msgid ""
-"The postmaster has commanded this server process to roll back the current "
-"transaction and exit, because another server process exited abnormally and "
-"possibly corrupted shared memory."
+"The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
+"server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr ""
-"O postmaster ordenou a esse processo servidor para cancelar a transação "
-"atual e sair, porque outro processo servidor saiu anormalmente e "
-"possivelmente corrompeu memória compartilhada."
+"O agrupamento de banco de dados foi inicializado com HAVE_INT64_TIMESTAMP "
+"mas o servidor foi compilado sem HAVE_INT64_TIMESTAMP."
 
-#: tcop/postgres.c:2625 tcop/postgres.c:2957
+#: access/transam/xlog.c:4819
 msgid ""
-"In a moment you should be able to reconnect to the database and repeat your "
-"command."
+"The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
+"was compiled with USE_FLOAT4_BYVAL."
 msgstr ""
-"Dentro de instantes você poderá conectar novamente ao banco de dados e "
-"repetir seu commando."
-
-#: tcop/postgres.c:2729
-msgid "floating-point exception"
-msgstr "exceção de ponto flutuante"
+"O agrupamento de banco de dados foi inicializado sem USE_FLOAT4_BYVAL, mas o "
+"servidor foi compilado com USE_FLOAT4_BYVAL."
 
-#: tcop/postgres.c:2730
+#: access/transam/xlog.c:4826
 msgid ""
-"An invalid floating-point operation was signaled. This probably means an out-"
-"of-range result or an invalid operation, such as division by zero."
-msgstr ""
-"Uma operação de ponto flutuante inválida foi sinalizada. Isto provavelmente "
-"indica um resultado fora do intervalo ou uma operação inválida, tal como "
-"divisão por zero."
-
-#: tcop/postgres.c:2897
-msgid "terminating autovacuum process due to administrator command"
+"The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
+"was compiled without USE_FLOAT4_BYVAL."
 msgstr ""
-"terminando processo de limpeza automática por causa de um comando do "
-"administrador"
-
-#: tcop/postgres.c:2901 tcop/postgres.c:2906 tcop/postgres.c:2955
-msgid "terminating connection due to conflict with recovery"
-msgstr "terminando conexão por causa de um conflito com recuperação"
-
-#: tcop/postgres.c:2911
-msgid "terminating connection due to administrator command"
-msgstr "terminando conexão por causa de um comando do administrador"
-
-#: tcop/postgres.c:2926
-msgid "canceling authentication due to timeout"
-msgstr "cancelando autenticação por causa do tempo de espera (timeout)"
-
-#: tcop/postgres.c:2935
-msgid "canceling statement due to statement timeout"
-msgstr "cancelando comando por causa do tempo de espera (timeout) do comando"
-
-#: tcop/postgres.c:2944
-msgid "canceling autovacuum task"
-msgstr "cancelando tarefa de limpeza automática"
-
-#: tcop/postgres.c:2962 storage/ipc/standby.c:506
-msgid "canceling statement due to conflict with recovery"
-msgstr "cancelando comando por causa de um conflito com recuperação"
-
-#: tcop/postgres.c:2978
-msgid "canceling statement due to user request"
-msgstr "cancelando comando por causa de um pedido do usuário"
-
-#: tcop/postgres.c:3023
-msgid "stack depth limit exceeded"
-msgstr "limite da profundidade da pilha foi excedido"
+"O agrupamento de banco de dados foi inicializado com USE_FLOAT4_BYVAL, mas o "
+"servidor foi compilado sem USE_FLOAT4_BYVAL."
 
-#: tcop/postgres.c:3024
+#: access/transam/xlog.c:4835
 msgid ""
-"Increase the configuration parameter \"max_stack_depth\", after ensuring the "
-"platform's stack depth limit is adequate."
+"The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
+"was compiled with USE_FLOAT8_BYVAL."
 msgstr ""
-"Aumente o parâmetro de configuração \"max_stack_depth\", após certificar-se "
-"que o limite de profundidade da pilha para a plataforma é adequado."
-
-#: tcop/postgres.c:3040
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB"
-msgstr "\"max_stack_depth\" não deve exceder %ldkB"
+"O agrupamento de banco de dados foi inicializado sem USE_FLOAT8_BYVAL, mas o "
+"servidor foi compilado com USE_FLOAT8_BYVAL."
 
-#: tcop/postgres.c:3042
+#: access/transam/xlog.c:4842
 msgid ""
-"Increase the platform's stack depth limit via \"ulimit -s\" or local "
-"equivalent."
+"The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
+"was compiled without USE_FLOAT8_BYVAL."
 msgstr ""
-"Aumente o limite de profundidade da pilha da plataforma utilizando \"ulimit -"
-"s\" ou equivalente."
+"O agrupamento de banco de dados foi inicializado com USE_FLOAT8_BYVAL, mas o "
+"servidor foi compilado sem USE_FLOAT8_BYVAL."
 
-#: tcop/postgres.c:3334 postmaster/postmaster.c:675 bootstrap/bootstrap.c:272
+#: access/transam/xlog.c:5167
 #, c-format
-msgid "--%s requires a value"
-msgstr "--%s requer um valor"
+msgid "could not write bootstrap transaction log file: %m"
+msgstr "não pôde escrever no arquivo inicial de log de transação: %m"
 
-#: tcop/postgres.c:3339 postmaster/postmaster.c:680 bootstrap/bootstrap.c:277
+#: access/transam/xlog.c:5173
 #, c-format
-msgid "-c %s requires a value"
-msgstr "-c %s requer um valor"
+msgid "could not fsync bootstrap transaction log file: %m"
+msgstr "não pôde executar fsync no arquivo inicial de log de transação: %m"
 
-#: tcop/postgres.c:3365
-msgid "invalid command-line arguments for server process"
-msgstr "argumentos de linha de comando são inválidos para processo servidor"
+#: access/transam/xlog.c:5178
+#, c-format
+msgid "could not close bootstrap transaction log file: %m"
+msgstr "não pôde fechar arquivo inicial de log de transação: %m"
 
-#: tcop/postgres.c:3366 tcop/postgres.c:3372
+#: access/transam/xlog.c:5245
 #, c-format
-msgid "Try \"%s --help\" for more information."
-msgstr "Tente \"%s --help\" para obter informações adicionais."
+msgid "could not open recovery command file \"%s\": %m"
+msgstr "não pôde abrir arquivo de comando de recuperação \"%s\": %m"
 
-#: tcop/postgres.c:3370
+#: access/transam/xlog.c:5299
 #, c-format
-msgid "%s: invalid command-line arguments"
-msgstr "%s: argumentos de linha de comando são inválidos"
+msgid "recovery_target_timeline is not a valid number: \"%s\""
+msgstr "recovery_target_timeline não é um número válido: \"%s\""
 
-#: tcop/postgres.c:3466
+#: access/transam/xlog.c:5315
 #, c-format
-msgid "%s: no database nor user name specified"
-msgstr "%s: banco de dados ou nome de usuário não foi especificado"
+msgid "recovery_target_xid is not a valid number: \"%s\""
+msgstr "recovery_target_xid não é um número válido: \"%s\""
 
-#: tcop/postgres.c:4004
+#: access/transam/xlog.c:5359
 #, c-format
-msgid "invalid CLOSE message subtype %d"
-msgstr "subtipo %d de mensagem CLOSE é inválido"
+msgid "recovery_target_name is too long (maximum %d characters)"
+msgstr "recovery_target_name é muito longo (no máximo %d caracteres)"
 
-#: tcop/postgres.c:4037
+#: access/transam/xlog.c:5406
 #, c-format
-msgid "invalid DESCRIBE message subtype %d"
-msgstr "subtipo %d de mensagem DESCRIBE é inválido"
+msgid "unrecognized recovery parameter \"%s\""
+msgstr "parâmetro de recuperação \"%s\" desconhecido"
 
-#: tcop/postgres.c:4268
+#: access/transam/xlog.c:5417
 #, c-format
 msgid ""
-"disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s"
-"%s"
+"recovery command file \"%s\" specified neither primary_conninfo nor "
+"restore_command"
 msgstr ""
-"desconexão: tempo da sessão: %d:%02d:%02d.%02d usuário=%s banco de dados=%s "
-"máquina=%s%s%s"
+"arquivo de comando de recuperação \"%s\" não especificou primary_conninfo ou "
+"restore_command"
 
-#. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:242
-#, c-format
-msgid "cannot execute %s in a read-only transaction"
-msgstr "não pode executar %s em uma transação somente leitura"
+#: access/transam/xlog.c:5419
+msgid ""
+"The database server will regularly poll the pg_xlog subdirectory to check "
+"for files placed there."
+msgstr ""
+"O servidor de banco de dados acessará regularmente o subdiretório pg_xlog "
+"para verificar por arquivos ali presentes."
 
-#. translator: %s is name of a SQL command, eg CREATE
-#: tcop/utility.c:261
+#: access/transam/xlog.c:5425
 #, c-format
-msgid "cannot execute %s during recovery"
-msgstr "não pode executar %s durante recuperação"
+msgid ""
+"recovery command file \"%s\" must specify restore_command when standby mode "
+"is not enabled"
+msgstr ""
+"arquivo do comando de recuperação \"%s\" deve especificar restore_command "
+"quando modo em espera não estiver habilitado"
 
-#. translator: %s is name of a SQL command, eg PREPARE
-#: tcop/utility.c:279
+#: access/transam/xlog.c:5445
 #, c-format
-msgid "cannot execute %s within security-restricted operation"
-msgstr "não pode executar %s em operação com restrição de segurança"
+msgid "recovery target timeline %u does not exist"
+msgstr "linha do tempo para recuperação %u não existe"
 
-#: tcop/utility.c:1129
-msgid "must be superuser to do CHECKPOINT"
-msgstr "deve ser super-usuário para fazer CHECKPOINT"
+#: access/transam/xlog.c:5575
+msgid "archive recovery complete"
+msgstr "recuperação do archive está completa"
 
-#: postmaster/syslogger.c:387
+#: access/transam/xlog.c:5693
 #, c-format
-msgid "select() failed in logger process: %m"
-msgstr "select() falhou no processo logger: %m"
+msgid "recovery stopping after commit of transaction %u, time %s"
+msgstr "recuperação parada após efetivação da transação %u, tempo %s"
 
-#: postmaster/syslogger.c:399 postmaster/syslogger.c:973
+#: access/transam/xlog.c:5698
 #, c-format
-msgid "could not read from logger pipe: %m"
-msgstr "não pôde ler do pipe do logger: %m"
-
-#: postmaster/syslogger.c:446
-msgid "logger shutting down"
-msgstr "desligando logger"
+msgid "recovery stopping before commit of transaction %u, time %s"
+msgstr "recuperação parada antes da efetivação da transação %u, tempo %s"
 
-#: postmaster/syslogger.c:490 postmaster/syslogger.c:504
+#: access/transam/xlog.c:5706
 #, c-format
-msgid "could not create pipe for syslog: %m"
-msgstr "não pôde criar pipe para syslog: %m"
+msgid "recovery stopping after abort of transaction %u, time %s"
+msgstr "recuperação parada após interrupção da transação %u, tempo %s"
 
-#: postmaster/syslogger.c:524 postmaster/syslogger.c:1012
+#: access/transam/xlog.c:5711
 #, c-format
-msgid "could not create log file \"%s\": %m"
-msgstr "não pôde criar arquivo de log \"%s\": %m"
+msgid "recovery stopping before abort of transaction %u, time %s"
+msgstr "recuperação parada antes interrupção da transação %u, tempo %s"
 
-#: postmaster/syslogger.c:539
+#: access/transam/xlog.c:5720
 #, c-format
-msgid "could not fork system logger: %m"
-msgstr "não pôde criar processo system logger: %m"
+msgid "recovery stopping at restore point \"%s\", time %s"
+msgstr "recuperação parada no ponto de restauração \"%s\", tempo %s"
 
-#: postmaster/syslogger.c:570
-#, c-format
-msgid "could not redirect stdout: %m"
-msgstr "não pôde redirecionar saída stdout: %m"
+#: access/transam/xlog.c:5748
+msgid "recovery has paused"
+msgstr "recuperação está em pausa"
 
-#: postmaster/syslogger.c:575 postmaster/syslogger.c:593
-#, c-format
-msgid "could not redirect stderr: %m"
-msgstr "não pôde redirecionar saída stderr: %m"
+#: access/transam/xlog.c:5749
+msgid "Execute pg_xlog_replay_resume() to continue."
+msgstr "Execute pg_xlog_replay_resume() para continuar."
 
-#: postmaster/syslogger.c:928
-#, c-format
-msgid "could not write to log file: %s\n"
-msgstr "não pôde escrever em arquivo de log: %s\n"
+#: access/transam/xlog.c:5792 access/transam/xlog.c:5814
+#: access/transam/xlog.c:5836
+msgid "must be superuser to control recovery"
+msgstr "deve ser super-usuário para controlar recuperação"
 
-#: postmaster/syslogger.c:1083 postmaster/syslogger.c:1141
-#, c-format
-msgid "could not open new log file \"%s\": %m"
-msgstr "não pôde abrir novo arquivo de log \"%s\": %m"
+#: access/transam/xlog.c:5797 access/transam/xlog.c:5819
+#: access/transam/xlog.c:5841
+msgid "recovery is not in progress"
+msgstr "recuperação não está em andamento"
 
-#: postmaster/syslogger.c:1095 postmaster/syslogger.c:1153
-msgid "disabling automatic rotation (use SIGHUP to re-enable)"
+#: access/transam/xlog.c:5798 access/transam/xlog.c:5820
+#: access/transam/xlog.c:5842
+msgid "Recovery control functions can only be executed during recovery."
 msgstr ""
-"desabilitando rotação automática (utilize SIGHUP para habilitá-la novamente)"
+"Funções de controle de recuperação só podem ser executadas durante "
+"recuperação."
 
-#: postmaster/pgstat.c:328
+#: access/transam/xlog.c:5934
 #, c-format
-msgid "could not resolve \"localhost\": %s"
-msgstr "não pôde resolver \"localhost\": %s"
-
-#: postmaster/pgstat.c:351
-msgid "trying another address for the statistics collector"
-msgstr "tentando outro endereço para coletor de estatísticas"
+msgid ""
+"hot standby is not possible because %s = %d is a lower setting than on the "
+"master server (its value was %d)"
+msgstr ""
+"servidor em espera ativo não é possível porque %s = %d é uma configuração "
+"mais baixa do que no servidor principal (seu valor era %d)"
 
-#: postmaster/pgstat.c:360
-#, c-format
-msgid "could not create socket for statistics collector: %m"
-msgstr "não pôde criar soquete para coletor de estatísticas: %m"
+#: access/transam/xlog.c:5956
+msgid "WAL was generated with wal_level=minimal, data may be missing"
+msgstr "WAL foi gerado com wal_level=minimal, dados podem estar faltando"
 
-#: postmaster/pgstat.c:372
-#, c-format
-msgid "could not bind socket for statistics collector: %m"
-msgstr "não pôde se ligar ao soquete do coletor de estatísticas: %m"
+#: access/transam/xlog.c:5957
+msgid ""
+"This happens if you temporarily set wal_level=minimal without taking a new "
+"base backup."
+msgstr ""
+"Isso acontece se você temporariamente definir wal_level=minimal sem realizar "
+"uma nova cópia de segurança base."
 
-#: postmaster/pgstat.c:383
-#, c-format
-msgid "could not get address of socket for statistics collector: %m"
-msgstr "não pôde pegar endereço do soquete do coletor de estatísticas: %m"
+#: access/transam/xlog.c:5968
+msgid ""
+"hot standby is not possible because wal_level was not set to \"hot_standby\" "
+"on the master server"
+msgstr ""
+"servidor em espera ativo não é possível porque wal_level não foi definido "
+"para \"hot_standby\" no servidor principal"
 
-#: postmaster/pgstat.c:399
-#, c-format
-msgid "could not connect socket for statistics collector: %m"
-msgstr "não pôde se conectar ao soquete do coletor de estatísticas: %m"
+#: access/transam/xlog.c:5969
+msgid ""
+"Either set wal_level to \"hot_standby\" on the master, or turn off "
+"hot_standby here."
+msgstr ""
+"Defina wal_level para \"hot_standby\" no primário ou desabilite hot_standby "
+"aqui."
 
-#: postmaster/pgstat.c:420
+#: access/transam/xlog.c:6017
+msgid "control file contains invalid data"
+msgstr "arquivo de controle contém dados inválidos"
+
+#: access/transam/xlog.c:6021
 #, c-format
-msgid "could not send test message on socket for statistics collector: %m"
-msgstr ""
-"não pôde enviar mensagem de teste ao soquete do coletor de estatísticas: %m"
+msgid "database system was shut down at %s"
+msgstr "sistema de banco de dados foi desligado em %s"
 
-#: postmaster/pgstat.c:446 postmaster/pgstat.c:2909
+#: access/transam/xlog.c:6025
 #, c-format
-msgid "select() failed in statistics collector: %m"
-msgstr "select() falhou no coletor de estatísticas: %m"
+msgid "database system was shut down in recovery at %s"
+msgstr "sistema de banco de dados foi desligado durante recuperação em %s"
 
-#: postmaster/pgstat.c:461
-msgid "test message did not get through on socket for statistics collector"
+#: access/transam/xlog.c:6029
+#, c-format
+msgid "database system shutdown was interrupted; last known up at %s"
 msgstr ""
-"mensagem teste não foi recebida pelo soquete do coletor de estatísticas"
+"desligamento do sistema de banco de dados foi interrompido; última execução "
+"em %s"
 
-#: postmaster/pgstat.c:476
+#: access/transam/xlog.c:6033
 #, c-format
-msgid "could not receive test message on socket for statistics collector: %m"
+msgid "database system was interrupted while in recovery at %s"
 msgstr ""
-"não pôde receber mensagem teste no soquete do coletor de estatísticas: %m"
+"sistema de banco de dados foi interrompido enquanto estava sendo recuperado "
+"em %s"
 
-#: postmaster/pgstat.c:486
-msgid "incorrect test message transmission on socket for statistics collector"
+#: access/transam/xlog.c:6035
+msgid ""
+"This probably means that some data is corrupted and you will have to use the "
+"last backup for recovery."
 msgstr ""
-"transmissão de mensagem teste incorreta no soquete do coletor de estatísticas"
+"Isso provavelmente significa que algum dado foi corrompido e você terá que "
+"utilizar o último backup para recuperação."
 
-#: postmaster/pgstat.c:509
+#: access/transam/xlog.c:6039
 #, c-format
-msgid "could not set statistics collector socket to nonblocking mode: %m"
+msgid "database system was interrupted while in recovery at log time %s"
 msgstr ""
-"não pôde definir soquete do coletor de estatísticas para modo não-bloqueado: "
-"%m"
+"sistema de banco de dados foi interrompido enquanto estava sendo recuperado "
+"em %s"
 
-#: postmaster/pgstat.c:519
-msgid "disabling statistics collector for lack of working socket"
+#: access/transam/xlog.c:6041
+msgid ""
+"If this has occurred more than once some data might be corrupted and you "
+"might need to choose an earlier recovery target."
 msgstr ""
-"desabilitando coletor de estatísticas por falta de um soquete que funcione"
+"Se isto ocorreu mais de uma vez algum dado pode ter sido corrompido e você "
+"pode precisar escolher um ponto de recuperação anterior ao especificado."
 
-#: postmaster/pgstat.c:621
+#: access/transam/xlog.c:6045
 #, c-format
-msgid "could not fork statistics collector: %m"
-msgstr "não pôde criar processo para coletor de estatísticas: %m"
-
-#: postmaster/pgstat.c:1151 postmaster/pgstat.c:1175 postmaster/pgstat.c:1206
-msgid "must be superuser to reset statistics counters"
-msgstr "deve ser super-usuário para reiniciar contadores de estatísticas"
+msgid "database system was interrupted; last known up at %s"
+msgstr "sistema de banco de dados foi interrompido; última execução em %s"
 
-#: postmaster/pgstat.c:1182
+#: access/transam/xlog.c:6094
 #, c-format
-msgid "unrecognized reset target: \"%s\""
-msgstr "alvo de reinício desconhecido: \"%s\""
+msgid "requested timeline %u is not a child of database system timeline %u"
+msgstr ""
+"linha do tempo solicitada %u não é descendente da linha do tempo %u do "
+"sistema de banco de dados"
 
-#: postmaster/pgstat.c:1183
-msgid "Target must be \"bgwriter\"."
-msgstr "Alvo deve ser \"bgwriter\"."
+#: access/transam/xlog.c:6112
+msgid "entering standby mode"
+msgstr "entrando no modo em espera"
 
-#: postmaster/pgstat.c:2888
-#, c-format
-msgid "poll() failed in statistics collector: %m"
-msgstr "poll() falhou no coletor de estatísticas: %m"
+#: access/transam/xlog.c:6115
+#, fuzzy, c-format
+msgid "starting point-in-time recovery to XID %u"
+msgstr "iniciando recuperação do arquivador"
 
-#: postmaster/pgstat.c:2933
-#, c-format
-msgid "could not read statistics message: %m"
-msgstr "não pôde ler mensagem de estatística: %m"
+#: access/transam/xlog.c:6119
+#, fuzzy, c-format
+msgid "starting point-in-time recovery to %s"
+msgstr "iniciando recuperação do arquivador"
 
-#: postmaster/pgstat.c:3190
-#, c-format
-msgid "could not open temporary statistics file \"%s\": %m"
-msgstr "não pôde abrir arquivo de estatísticas temporário \"%s\": %m"
+#: access/transam/xlog.c:6123
+#, fuzzy, c-format
+msgid "starting point-in-time recovery to \"%s\""
+msgstr "iniciando recuperação do arquivador"
 
-#: postmaster/pgstat.c:3262
-#, c-format
-msgid "could not write temporary statistics file \"%s\": %m"
-msgstr "não pôde escrever no arquivo de estatísticas temporário \"%s\": %m"
+#: access/transam/xlog.c:6127
+msgid "starting archive recovery"
+msgstr "iniciando recuperação do arquivador"
 
-#: postmaster/pgstat.c:3271
+#: access/transam/xlog.c:6149 access/transam/xlog.c:6189
 #, c-format
-msgid "could not close temporary statistics file \"%s\": %m"
-msgstr "não pôde fechar arquivo de estatísticas temporário \"%s\": %m"
+msgid "checkpoint record is at %X/%X"
+msgstr "registro do ponto de controle está em %X/%X"
 
-#: postmaster/pgstat.c:3279
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+#: access/transam/xlog.c:6163
+#, fuzzy
+msgid "could not find redo location referenced by checkpoint record"
 msgstr ""
-"não pôde renomear arquivo de estatísticas temporário \"%s\" para \"%s\": %m"
-
-#: postmaster/pgstat.c:3379 postmaster/pgstat.c:3608
-#, c-format
-msgid "could not open statistics file \"%s\": %m"
-msgstr "não pôde abrir arquivo de estatísticas \"%s\": %m"
+"não pôde encontrar local de redo referenciado pelo registro do ponto de "
+"controle"
 
-#: postmaster/pgstat.c:3391 postmaster/pgstat.c:3401 postmaster/pgstat.c:3423
-#: postmaster/pgstat.c:3438 postmaster/pgstat.c:3501 postmaster/pgstat.c:3519
-#: postmaster/pgstat.c:3535 postmaster/pgstat.c:3553 postmaster/pgstat.c:3569
-#: postmaster/pgstat.c:3620 postmaster/pgstat.c:3631
+#: access/transam/xlog.c:6164 access/transam/xlog.c:6171
 #, c-format
-msgid "corrupted statistics file \"%s\""
-msgstr "arquivo de estatísticas \"%s\" corrompido"
-
-#: postmaster/pgstat.c:3925
-msgid "database hash table corrupted during cleanup --- abort"
+msgid ""
+"If you are not restoring from a backup, try removing the file \"%s/"
+"backup_label\"."
 msgstr ""
-"tabela hash do banco de dados foi corrompida durante desligamento --- "
-"interrompendo"
-
-#: postmaster/autovacuum.c:359
-#, c-format
-msgid "could not fork autovacuum launcher process: %m"
-msgstr "não pôde criar processo inicializador do autovacuum: %m"
-
-#: postmaster/autovacuum.c:404
-msgid "autovacuum launcher started"
-msgstr "inicializador do autovacuum foi iniciado"
+"Se você não está restaurando uma cópia de segurança, tente remover o arquivo "
+"\"%s/backup_label\"."
 
-#: postmaster/autovacuum.c:760
-msgid "autovacuum launcher shutting down"
-msgstr "inicializador do autovacuum está sendo desligado"
+#: access/transam/xlog.c:6170
+msgid "could not locate required checkpoint record"
+msgstr "não pôde localizar registro do ponto de controle requerido"
 
-#: postmaster/autovacuum.c:1394
-#, c-format
-msgid "could not fork autovacuum worker process: %m"
-msgstr "não pôde criar processo de limpeza automática: %m"
+#: access/transam/xlog.c:6199 access/transam/xlog.c:6214
+msgid "could not locate a valid checkpoint record"
+msgstr "não pôde localizar registro do ponto de controle válido"
 
-#: postmaster/autovacuum.c:1595
+#: access/transam/xlog.c:6208
 #, c-format
-msgid "autovacuum: processing database \"%s\""
-msgstr "autovacuum: processando banco de dados \"%s\""
+msgid "using previous checkpoint record at %X/%X"
+msgstr "utilizando registro do ponto de controle anterior em %X/%X"
 
-#: postmaster/autovacuum.c:1976
+#: access/transam/xlog.c:6223
 #, c-format
-msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
-msgstr ""
-"autovacuum: removendo tabela temporária órfã \"%s\".\"%s\" no banco de dados "
-"\"%s\""
+msgid "redo record is at %X/%X; shutdown %s"
+msgstr "registro de redo está em %X/%X; desligamento %s"
 
-#: postmaster/autovacuum.c:1988
+#: access/transam/xlog.c:6227
 #, c-format
-msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
-msgstr ""
-"autovacuum: encontrada tabela temporária órfã \"%s\".\"%s\" no banco de "
-"dados \"%s\""
+msgid "next transaction ID: %u/%u; next OID: %u"
+msgstr "próximo ID de transação: %u/%u; próximo OID: %u"
 
-#: postmaster/autovacuum.c:2249
+#: access/transam/xlog.c:6231
 #, c-format
-msgid "automatic vacuum of table \"%s.%s.%s\""
-msgstr "limpeza automática da tabela \"%s.%s.%s\""
+msgid "next MultiXactId: %u; next MultiXactOffset: %u"
+msgstr "próximo MultiXactId: %u; próximo MultiXactOffset: %u"
 
-#: postmaster/autovacuum.c:2252
-#, c-format
-msgid "automatic analyze of table \"%s.%s.%s\""
-msgstr "análise automática da tabela \"%s.%s.%s\""
+#: access/transam/xlog.c:6234
+#, fuzzy, c-format
+msgid "oldest unfrozen transaction ID: %u, in database %u"
+msgstr "ID de transação não congelado mais antigo: %u, no banco de dados %u"
 
-#: postmaster/autovacuum.c:2720
-msgid "autovacuum not started because of misconfiguration"
-msgstr "autovacuum não foi iniciado por causa de configuração errada"
+#: access/transam/xlog.c:6238
+msgid "invalid next transaction ID"
+msgstr "próximo ID de transação é inválido"
 
-#: postmaster/autovacuum.c:2721
-msgid "Enable the \"track_counts\" option."
-msgstr "Habilite a opção \"track_counts\"."
+#: access/transam/xlog.c:6257
+msgid "invalid redo in checkpoint record"
+msgstr "redo é inválido no registro do ponto de controle"
 
-#: postmaster/bgwriter.c:472
-#, c-format
-msgid "checkpoints are occurring too frequently (%d second apart)"
-msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
-msgstr[0] "pontos de controle estão ocorrendo frequentemente (%d segundo)"
-msgstr[1] "pontos de controle estão ocorrendo frequentemente (%d segundos)"
+#: access/transam/xlog.c:6268
+msgid "invalid redo record in shutdown checkpoint"
+msgstr "registro de redo é inválido no ponto de controle de desligamento"
 
-#: postmaster/bgwriter.c:476
+#: access/transam/xlog.c:6298
 msgid ""
-"Consider increasing the configuration parameter \"checkpoint_segments\"."
+"database system was not properly shut down; automatic recovery in progress"
 msgstr ""
-"Considere aumentar o parâmetro de configuração \"checkpoint_segments\"."
-
-#: postmaster/bgwriter.c:588
-#, c-format
-msgid "transaction log switch forced (archive_timeout=%d)"
-msgstr "rotação de log de transação foi forçada (archive_timeout=%d)"
-
-#: postmaster/bgwriter.c:1044
-msgid "checkpoint request failed"
-msgstr "pedido de ponto de controle falhou"
+"sistema de banco de dados não foi desligado corretamente; recuperação "
+"automática está em andamento"
 
-#: postmaster/bgwriter.c:1045
-msgid "Consult recent messages in the server log for details."
-msgstr "Consulte mensagens recentes no log do servidor para obter detalhes."
+#: access/transam/xlog.c:6377
+msgid "initializing for hot standby"
+msgstr "inicialização para servidor em espera ativo"
 
-#: postmaster/postmaster.c:566
+#: access/transam/xlog.c:6507
 #, c-format
-msgid "%s: invalid argument for option -f: \"%s\"\n"
-msgstr "%s: argumento inválido para opção -f: \"%s\"\n"
+msgid "redo starts at %X/%X"
+msgstr "redo inicia em %X/%X"
 
-#: postmaster/postmaster.c:652
+#: access/transam/xlog.c:6622
 #, c-format
-msgid "%s: invalid argument for option -t: \"%s\"\n"
-msgstr "%s: argumento inválido para opção -t: \"%s\"\n"
+msgid "redo done at %X/%X"
+msgstr "redo pronto em %X/%X"
 
-#: postmaster/postmaster.c:692 postmaster/postmaster.c:705
-#: bootstrap/bootstrap.c:288
+#: access/transam/xlog.c:6627 access/transam/xlog.c:8210
 #, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
+msgid "last completed transaction was at log time %s"
+msgstr "última transação efetivada foi em %s"
 
-#: postmaster/postmaster.c:703
-#, c-format
-msgid "%s: invalid argument: \"%s\"\n"
-msgstr "%s: argumento inválido: \"%s\"\n"
+#: access/transam/xlog.c:6635
+msgid "redo is not required"
+msgstr "redo não é requerido"
 
-#: postmaster/postmaster.c:728
-#, c-format
-msgid "%s: superuser_reserved_connections must be less than max_connections\n"
+#: access/transam/xlog.c:6683
+msgid "requested recovery stop point is before consistent recovery point"
 msgstr ""
-"%s: superuser_reserved_connections deve ser menor do que max_connections\n"
+"ponto de parada de recuperação solicitado está antes do ponto de recuperação "
+"consistente"
 
-#: postmaster/postmaster.c:733
-msgid ""
-"WAL archival (archive_mode=on) requires wal_level \"archive\" or "
-"\"hot_standby\""
-msgstr ""
-"arquivamento do WAL (archive_mode=on) requer wal_level \"archive\" ou "
-"\"hot_standby\""
+#: access/transam/xlog.c:6692
+msgid "WAL ends before end of online backup"
+msgstr "WAL terminou antes do fim da cópia de segurança online"
 
-#: postmaster/postmaster.c:736
-#, fuzzy
+#: access/transam/xlog.c:6693
 msgid ""
-"WAL streaming (max_wal_senders > 0) requires wal_level \"archive\" or "
-"\"hot_standby\""
+"Online backup started with pg_start_backup() must be ended with "
+"pg_stop_backup(), and all WAL up to that point must be available at recovery."
 msgstr ""
-"envio do WAL (max_wal_senders > 0) requer wal_level \"archive\" ou \"hot_standby\""
+"Cópia de segurança online que iniciou com pg_start_backup() deve ser "
+"terminada com pg_stop_backup(), e todo WAL até aquele ponto deve estar "
+"disponível para recuperação."
 
-#: postmaster/postmaster.c:744
-#, c-format
-msgid "%s: invalid datetoken tables, please fix\n"
-msgstr ""
-"%s: tabelas de palavras chave de datas são inválidas, por favor conserte\n"
+#: access/transam/xlog.c:6696
+msgid "WAL ends before consistent recovery point"
+msgstr "Log de transação termina antes de ponto de recuperação consistente"
 
-#: postmaster/postmaster.c:850
-msgid "invalid list syntax for \"listen_addresses\""
-msgstr "sintaxe de lista é inválida para \"listen_addresses\""
+#: access/transam/xlog.c:6717
+#, c-format
+msgid "selected new timeline ID: %u"
+msgstr "novo ID de linha do tempo selecionado: %u"
 
-#: postmaster/postmaster.c:871
+#: access/transam/xlog.c:6964
 #, c-format
-msgid "could not create listen socket for \"%s\""
-msgstr "não pôde criar soquete de escuta para \"%s\""
+msgid "consistent recovery state reached at %X/%X"
+msgstr "estado de recuperação consistente atingido em %X/%X"
 
-#: postmaster/postmaster.c:877
-msgid "could not create any TCP/IP sockets"
-msgstr "não pôde criar nenhum soquete TCP/IP"
+#: access/transam/xlog.c:7130
+msgid "invalid primary checkpoint link in control file"
+msgstr ""
+"vínculo de ponto de controle primário é inválido no arquivo de controle"
 
-#: postmaster/postmaster.c:928
-msgid "could not create Unix-domain socket"
-msgstr "não pôde criar soquete de domínio Unix"
+#: access/transam/xlog.c:7134
+msgid "invalid secondary checkpoint link in control file"
+msgstr ""
+"vínculo de ponto de controle secundário é inválido no arquivo de controle"
 
-#: postmaster/postmaster.c:936
-msgid "no socket created for listening"
-msgstr "nenhum soquete criado para escutar"
+#: access/transam/xlog.c:7138
+msgid "invalid checkpoint link in backup_label file"
+msgstr "vínculo de ponto de controle é inválido no arquivo backup_label"
 
-#: postmaster/postmaster.c:962
-msgid "could not create I/O completion port for child queue"
-msgstr "não pôde criar porta de conclusão de I/O para fila de filhos"
+#: access/transam/xlog.c:7152
+msgid "invalid primary checkpoint record"
+msgstr "registro do ponto de controle primário é inválido"
 
-#: postmaster/postmaster.c:1006
-#, c-format
-msgid "%s: could not write external PID file \"%s\": %s\n"
-msgstr "%s: não pôde escrever em arquivo externo do PID \"%s\": %s\n"
+#: access/transam/xlog.c:7156
+msgid "invalid secondary checkpoint record"
+msgstr "registro do ponto de controle secundário é inválido"
 
-#: postmaster/postmaster.c:1121
-#, c-format
-msgid "%s: could not locate matching postgres executable"
-msgstr "%s: não pôde localizar executável do postgres correspondente"
+#: access/transam/xlog.c:7160
+msgid "invalid checkpoint record"
+msgstr "registro do ponto de controle é inválido"
 
-#: postmaster/postmaster.c:1172
-#, c-format
-msgid "data directory \"%s\" does not exist"
-msgstr "diretório de dados \"%s\" não existe"
+#: access/transam/xlog.c:7171
+msgid "invalid resource manager ID in primary checkpoint record"
+msgstr ""
+"ID do gerenciador de recursos é inválido no registro do ponto de controle "
+"primário"
 
-#: postmaster/postmaster.c:1177
-#, c-format
-msgid "could not read permissions of directory \"%s\": %m"
-msgstr "não pôde ler permissões do diretório \"%s\": %m"
+#: access/transam/xlog.c:7175
+msgid "invalid resource manager ID in secondary checkpoint record"
+msgstr ""
+"ID do gerenciador de recursos é inválido no registro do ponto de controle "
+"secundário"
 
-#: postmaster/postmaster.c:1185
-#, c-format
-msgid "specified data directory \"%s\" is not a directory"
-msgstr "diretório de dados especificado \"%s\" não é um diretório"
+#: access/transam/xlog.c:7179
+msgid "invalid resource manager ID in checkpoint record"
+msgstr ""
+"ID do gerenciador de recursos é inválido no registro do ponto de controle"
 
-#: postmaster/postmaster.c:1201
-#, c-format
-msgid "data directory \"%s\" has wrong ownership"
-msgstr "diretório de dados \"%s\" tem dono incorreto"
+#: access/transam/xlog.c:7191
+msgid "invalid xl_info in primary checkpoint record"
+msgstr "xl_info é inválido no registro do ponto de controle primário"
 
-#: postmaster/postmaster.c:1203
-msgid "The server must be started by the user that owns the data directory."
-msgstr ""
-"O servidor deve ser iniciado pelo usuário que é o dono do diretório de dados."
+#: access/transam/xlog.c:7195
+msgid "invalid xl_info in secondary checkpoint record"
+msgstr "xl_info é inválido no registro do ponto de controle secundário"
 
-#: postmaster/postmaster.c:1223
-#, c-format
-msgid "data directory \"%s\" has group or world access"
-msgstr "diretório de dados \"%s\" tem acesso para grupo ou outros"
+#: access/transam/xlog.c:7199
+msgid "invalid xl_info in checkpoint record"
+msgstr "xl_info é inválido no registro do ponto de contrle"
 
-#: postmaster/postmaster.c:1225
-msgid "Permissions should be u=rwx (0700)."
-msgstr "Permissões devem ser u=rwx (0700)."
+#: access/transam/xlog.c:7211
+msgid "invalid length of primary checkpoint record"
+msgstr "tamanho do registro do ponto de controle primário é inválido"
 
-#: postmaster/postmaster.c:1236
-#, c-format
+#: access/transam/xlog.c:7215
+msgid "invalid length of secondary checkpoint record"
+msgstr "tamanho do registro do ponto de controle secundário é inválido"
+
+#: access/transam/xlog.c:7219
+msgid "invalid length of checkpoint record"
+msgstr "tamanho do registro do ponto de controle é inválido"
+
+#: access/transam/xlog.c:7381
+msgid "shutting down"
+msgstr "desligando"
+
+#: access/transam/xlog.c:7403
+msgid "database system is shut down"
+msgstr "sistema de banco de dados está desligado"
+
+#: access/transam/xlog.c:7837
 msgid ""
-"%s: could not find the database system\n"
-"Expected to find it in the directory \"%s\",\n"
-"but could not open file \"%s\": %s\n"
+"concurrent transaction log activity while database system is shutting down"
 msgstr ""
-"%s: não pôde encontrar o sistema de banco de dados\n"
-"Era esperado encontrá-lo no diretório \"%s\",\n"
-"mas não pôde abrir arquivo \"%s\": %s\n"
+"atividade concorrente no log de transação enquanto o sistema de banco de "
+"dados está sendo desligado"
 
-#: postmaster/postmaster.c:1272
-#, c-format
-msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: não pôde abrir arquivo \"%s\": %s\n"
+#: access/transam/xlog.c:8071
+msgid "skipping restartpoint, recovery has already ended"
+msgstr "ignorando ponto de reinício, recuperação já terminou"
 
-#: postmaster/postmaster.c:1279
+#: access/transam/xlog.c:8096
 #, c-format
-msgid "%s: could not open log file \"%s/%s\": %s\n"
-msgstr "%s: não pôde abrir arquivo de log \"%s/%s\": %s\n"
+msgid "skipping restartpoint, already performed at %X/%X"
+msgstr "ignorando ponto de reinício, já foi executado em %X/%X"
 
-#: postmaster/postmaster.c:1290
+#: access/transam/xlog.c:8208
 #, c-format
-msgid "%s: could not fork background process: %s\n"
-msgstr "%s: não pôde criar processo em segundo plano: %s\n"
+msgid "recovery restart point at %X/%X"
+msgstr "ponto de reinício de recuperação em %X/%X"
 
-#: postmaster/postmaster.c:1312
+#: access/transam/xlog.c:8308
 #, c-format
-msgid "%s: could not dissociate from controlling TTY: %s\n"
-msgstr "%s: não pôde dissociar da TTY de controle: %s\n"
+msgid "restore point \"%s\" created at %X/%X"
+msgstr "ponto de restauração \"%s\" criado em %X/%X"
 
-#: postmaster/postmaster.c:1407
-#, c-format
-msgid "select() failed in postmaster: %m"
-msgstr "select() falhou no postmaster: %m"
+#: access/transam/xlog.c:8405
+msgid "online backup was canceled, recovery cannot continue"
+msgstr ""
+"cópia de segurança online foi cancelada, recuperação não pode continuar"
 
-#: postmaster/postmaster.c:1564 postmaster/postmaster.c:1595
-msgid "incomplete startup packet"
-msgstr "pacote de inicialização incompleto"
+#: access/transam/xlog.c:8457
+#, c-format
+msgid "unexpected timeline ID %u (after %u) in checkpoint record"
+msgstr ""
+"ID de linha do tempo %u inesperado (depois %u) no registro do ponto de "
+"controle"
 
-#: postmaster/postmaster.c:1576
-msgid "invalid length of startup packet"
-msgstr " tamanho do pacote de inicialização é inválido"
+#: access/transam/xlog.c:8493
+#, c-format
+msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
+msgstr ""
+"ID de linha do tempo %u inesperado (deve ser %u) no registro do ponto de "
+"controle"
 
-#: postmaster/postmaster.c:1633
+#: access/transam/xlog.c:8757 access/transam/xlog.c:8781
 #, c-format
-msgid "failed to send SSL negotiation response: %m"
-msgstr "falhou ao enviar resposta de negociação SSL: %m"
+msgid "could not fsync log file %u, segment %u: %m"
+msgstr "não pôde executar fsync no arquivo de log %u, segmento %u: %m"
 
-#: postmaster/postmaster.c:1662
+#: access/transam/xlog.c:8789
 #, c-format
-msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
+msgid "could not fsync write-through log file %u, segment %u: %m"
 msgstr ""
-"protocolo do cliente %u.%u não é suportado: servidor suporta %u.0 a %u.%u"
+"não pôde executar fsync write-through no arquivo de log %u, segmento %u: %m"
 
-#: postmaster/postmaster.c:1713
-msgid "invalid value for boolean option \"replication\""
-msgstr "valor é inválido para opção booleana \"replication\""
+#: access/transam/xlog.c:8798
+#, c-format
+msgid "could not fdatasync log file %u, segment %u: %m"
+msgstr "não pôde executar fdatasync no arquivo de log %u, segmento %u: %m"
 
-#: postmaster/postmaster.c:1733
-msgid "invalid startup packet layout: expected terminator as last byte"
+#: access/transam/xlog.c:8879 access/transam/xlog.c:9157
+msgid "must be superuser or replication role to run a backup"
 msgstr ""
-"formato de pacote de inicialização é inválido: terminador esperado como "
-"último byte"
+"deve ser super-usuário ou role de replicação para fazer uma cópia de "
+"segurança"
 
-#: postmaster/postmaster.c:1761
-msgid "no PostgreSQL user name specified in startup packet"
+#: access/transam/xlog.c:8884 access/transam/xlog.c:9162
+#: access/transam/xlog.c:9425 access/transam/xlog.c:9457
+#: access/transam/xlog.c:9498 access/transam/xlog.c:9531
+#: access/transam/xlog.c:9638 access/transam/xlog.c:9713
+msgid "recovery is in progress"
+msgstr "recuperação está em andamento"
+
+#: access/transam/xlog.c:8885 access/transam/xlog.c:9163
+#: access/transam/xlog.c:9426 access/transam/xlog.c:9458
+#: access/transam/xlog.c:9499 access/transam/xlog.c:9532
+msgid "WAL control functions cannot be executed during recovery."
 msgstr ""
-"nenhum nome de usuário PostgreSQL especificado no pacote de inicialização"
+"funções de controle do WAL não podem ser executadas durante recuperação."
 
-#: postmaster/postmaster.c:1818
-msgid "the database system is starting up"
-msgstr "o sistema de banco de dados está iniciando"
+#: access/transam/xlog.c:8890 access/transam/xlog.c:9168
+msgid "WAL level not sufficient for making an online backup"
+msgstr "nível do WAL não é suficiente para fazer uma cópia de segurança online"
 
-#: postmaster/postmaster.c:1823
-msgid "the database system is shutting down"
-msgstr "o sistema de banco de dados está desligando"
+#: access/transam/xlog.c:8891 access/transam/xlog.c:9169
+#: access/transam/xlog.c:9464
+msgid ""
+"wal_level must be set to \"archive\" or \"hot_standby\" at server start."
+msgstr ""
+"wal_level deve ser definido com \"archive\" ou \"hot_standby\" ao iniciar o "
+"servidor."
 
-#: postmaster/postmaster.c:1828
-msgid "the database system is in recovery mode"
-msgstr "o sistema de banco de dados está em modo de recuperação"
+#: access/transam/xlog.c:8896
+#, c-format
+msgid "backup label too long (max %d bytes)"
+msgstr "rótulo de cópia de segurança é muito longo (máximo de %d bytes)"
 
-#: postmaster/postmaster.c:1833 storage/ipc/sinvaladt.c:302
-#: storage/ipc/procarray.c:270 storage/lmgr/proc.c:289
-msgid "sorry, too many clients already"
-msgstr "desculpe, muitos clientes conectados"
+#: access/transam/xlog.c:8937 access/transam/xlog.c:9040
+msgid "a backup is already in progress"
+msgstr "uma cópia de segurança está em andamento"
+
+#: access/transam/xlog.c:8938
+msgid "Run pg_stop_backup() and try again."
+msgstr "Execute pg_stop_backup() e tente novamente."
 
-#: postmaster/postmaster.c:1895
+#: access/transam/xlog.c:9041
 #, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "chave incorreta no pedido de cancelamento do processo %d"
+msgid ""
+"If you're sure there is no backup in progress, remove file \"%s\" and try "
+"again."
+msgstr ""
+"Se você tem certeza que não há cópia de segurança em andamento, remova o "
+"arquivo \"%s\" e tente novamente."
 
-#: postmaster/postmaster.c:1903
+#: access/transam/xlog.c:9055 access/transam/xlog.c:9301
 #, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "PID %d no pedido de cancelamento não combina com nenhum processo"
+msgid "could not write file \"%s\": %m"
+msgstr "não pôde escrever no arquivo \"%s\": %m"
 
-#: postmaster/postmaster.c:2104
-msgid "received SIGHUP, reloading configuration files"
-msgstr "SIGHUP recebido, recarregando arquivos de configuração"
+#: access/transam/xlog.c:9213
+msgid "a backup is not in progress"
+msgstr "não há uma cópia de segurança em andamento"
 
-#: postmaster/postmaster.c:2127
-msgid "pg_hba.conf not reloaded"
-msgstr "pg_hba.conf não foi recarregado"
+#: access/transam/xlog.c:9252 access/transam/xlog.c:9783
+#: access/transam/xlog.c:9789
+#, c-format
+msgid "invalid data in file \"%s\""
+msgstr "dado inválido no arquivo \"%s\""
 
-#: postmaster/postmaster.c:2170
-msgid "received smart shutdown request"
-msgstr "pedido de desligamento inteligente foi recebido"
+#: access/transam/xlog.c:9350
+msgid ""
+"pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
+msgstr ""
+"pg_stop_backup concluído, esperando os segmentos do WAL requeridos serem "
+"arquivados"
 
-#: postmaster/postmaster.c:2217
-msgid "received fast shutdown request"
-msgstr "pedido de desligamento rápido foi recebido"
+#: access/transam/xlog.c:9360
+#, c-format
+msgid ""
+"pg_stop_backup still waiting for all required WAL segments to be archived "
+"(%d seconds elapsed)"
+msgstr ""
+"pg_stop_backup ainda está esperando o arquivamento de todos os segmentos do "
+"WAL necessários (%d segundos passados)"
 
-#: postmaster/postmaster.c:2235
-msgid "aborting any active transactions"
-msgstr "interrompendo quaisquer transações ativas"
+#: access/transam/xlog.c:9362
+msgid ""
+"Check that your archive_command is executing properly.  pg_stop_backup can "
+"be canceled safely, but the database backup will not be usable without all "
+"the WAL segments."
+msgstr ""
+"Verifique se o archive_command está sendo executado normalmente. "
+"pg_stop_backup pode ser cancelado com segurança, mas a cópia de segurança do "
+"banco de dados não será útil sem todos os segmentos do WAL."
 
-#: postmaster/postmaster.c:2264
-msgid "received immediate shutdown request"
-msgstr "pedido de desligamento imediato foi recebido"
+#: access/transam/xlog.c:9369
+msgid "pg_stop_backup complete, all required WAL segments have been archived"
+msgstr "pg_stop_backup concluído, todos os segmentos do WAL foram arquivados"
 
-#: postmaster/postmaster.c:2340 postmaster/postmaster.c:2368
-msgid "startup process"
-msgstr "processo de inicialização"
+#: access/transam/xlog.c:9373
+msgid ""
+"WAL archiving is not enabled; you must ensure that all required WAL segments "
+"are copied through other means to complete the backup"
+msgstr ""
+"arquivamento do WAL não está habilitado; você deve garantir que todos os "
+"segmentos do WAL necessários foram copiados por outros meios para completar "
+"a cópia de segurança"
 
-#: postmaster/postmaster.c:2343
-msgid "aborting startup due to startup process failure"
-msgstr "interrompendo inicialização porque o processo de inicialização falhou"
+#: access/transam/xlog.c:9420
+msgid "must be superuser to switch transaction log files"
+msgstr "deve ser super-usuário para rotacionar arquivos do log de transação"
 
-#: postmaster/postmaster.c:2402
-msgid "database system is ready to accept connections"
-msgstr "sistema de banco de dados está pronto para aceitar conexões"
+#: access/transam/xlog.c:9452
+msgid "must be superuser to create a restore point"
+msgstr "deve ser super-usuário para criar um ponto de restauração"
 
-#: postmaster/postmaster.c:2457
-msgid "background writer process"
-msgstr "processo escritor em segundo plano"
+#: access/transam/xlog.c:9463
+msgid "WAL level not sufficient for creating a restore point"
+msgstr "nível do WAL não é suficiente para criar um ponto de restauração"
 
-#: postmaster/postmaster.c:2473
-msgid "WAL writer process"
-msgstr "processo escritor do WAL"
+#: access/transam/xlog.c:9471
+#, c-format
+msgid "value too long for restore point (maximum %d characters)"
+msgstr ""
+"valor é muito longo para ponto de restauração (máximo de %d caracteres)"
 
-#: postmaster/postmaster.c:2487
-#, fuzzy
-msgid "WAL receiver process"
-msgstr "processo receptor do WAL"
+#: access/transam/xlog.c:9639
+msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
+msgstr "pg_xlogfile_name_offset() não pode ser executado durante recuperação."
 
-#: postmaster/postmaster.c:2502
-msgid "autovacuum launcher process"
-msgstr "processo inicializador do autovacuum"
+#: access/transam/xlog.c:9649 access/transam/xlog.c:9721
+#, c-format
+msgid "could not parse transaction log location \"%s\""
+msgstr "não pôde validar local do log de transação \"%s\""
 
-#: postmaster/postmaster.c:2517
-msgid "archiver process"
-msgstr "processo arquivador"
+#: access/transam/xlog.c:9714
+msgid "pg_xlogfile_name() cannot be executed during recovery."
+msgstr "pg_xlogfile_name() não pode ser executado durante recuperação."
 
-#: postmaster/postmaster.c:2533
-msgid "statistics collector process"
-msgstr "processo coletor de estatísticas"
+#: access/transam/xlog.c:9825
+#, c-format
+msgid "xlog redo %s"
+msgstr "redo do xlog %s"
 
-#: postmaster/postmaster.c:2547
-msgid "system logger process"
-msgstr "processo de relato do sistema (system logger)"
+#: access/transam/xlog.c:9865
+msgid "online backup mode canceled"
+msgstr "modo de cópia de segurança online foi cancelado"
 
-#: postmaster/postmaster.c:2582 postmaster/postmaster.c:2592
-#: postmaster/postmaster.c:2610
-msgid "server process"
-msgstr "processo servidor"
+#: access/transam/xlog.c:9866
+#, c-format
+msgid "\"%s\" was renamed to \"%s\"."
+msgstr "\"%s\" foi renomeado para \"%s\"."
 
-#: postmaster/postmaster.c:2646
-msgid "terminating any other active server processes"
-msgstr "terminando quaisquer outros processos servidor ativos"
+#: access/transam/xlog.c:9873
+msgid "online backup mode was not canceled"
+msgstr "modo de cópia de segurança online não foi cancelado"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2811
+#: access/transam/xlog.c:9874
 #, c-format
-msgid "%s (PID %d) exited with exit code %d"
-msgstr "%s (PID %d) terminou com código de retorno %d"
+msgid "Could not rename \"%s\" to \"%s\": %m."
+msgstr "não pôde renomear \"%s\" para \"%s\": %m"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2820
+#: access/transam/xlog.c:10387 access/transam/xlog.c:10409
 #, c-format
-msgid "%s (PID %d) was terminated by exception 0x%X"
-msgstr "%s (PID %d) foi terminado pela exceção 0x%X"
+msgid "could not read from log file %u, segment %u, offset %u: %m"
+msgstr "não pôde ler do arquivo de log %u, segmento %u, deslocamento %u: %m"
 
-#: postmaster/postmaster.c:2822 postmaster/pgarch.c:579
-msgid ""
-"See C include file \"ntstatus.h\" for a description of the hexadecimal value."
-msgstr ""
-"Veja o arquivo de cabeçalho C \"ntstatus.h\" para obter uma descrição do "
-"valor hexadecimal."
+#: access/transam/xlog.c:10498
+msgid "received promote request"
+msgstr "pedido de promoção foi recebido"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2829
+#: access/transam/xlog.c:10511
 #, c-format
-msgid "%s (PID %d) was terminated by signal %d: %s"
-msgstr "%s (PID %d) foi terminado pelo sinal %d: %s"
+msgid "trigger file found: %s"
+msgstr "arquivo de gatilho encontrado: %s"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2839
-#, c-format
-msgid "%s (PID %d) was terminated by signal %d"
-msgstr "%s (PID %d) foi terminado pelo sinal %d"
+#: access/transam/xact.c:729
+msgid "cannot have more than 2^32-1 commands in a transaction"
+msgstr "não pode ter mais do que 2^32-1 comandos em uma transação"
 
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2848
+#: access/transam/xact.c:1268
 #, c-format
-msgid "%s (PID %d) exited with unrecognized status %d"
-msgstr "%s (PID %d) terminou com status desconhecido %d"
-
-#: postmaster/postmaster.c:3028
-msgid "abnormal database system shutdown"
-msgstr "desligamento anormal do sistema de banco de dados"
+msgid "maximum number of committed subtransactions (%d) exceeded"
+msgstr "número máximo de subtransações efetivadas (%d) foi alcançado"
 
-#: postmaster/postmaster.c:3066
-msgid "all server processes terminated; reinitializing"
-msgstr "todos os processos servidor foram terminados; reinicializando"
+#: access/transam/xact.c:2044
+msgid "cannot PREPARE a transaction that has operated on temporary tables"
+msgstr ""
+"não pode executar PREPARE em uma transação que utilizou tabelas temporárias"
 
-#: postmaster/postmaster.c:3238
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2835
 #, c-format
-msgid "could not fork new process for connection: %m"
-msgstr "não pôde criar novo processo para conexão: %m"
-
-#: postmaster/postmaster.c:3280
-msgid "could not fork new process for connection: "
-msgstr "não pôde criar novo processo para conexão: "
+msgid "%s cannot run inside a transaction block"
+msgstr "%s não pode executar dentro de um bloco de transação"
 
-#: postmaster/postmaster.c:3394
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2845
 #, c-format
-msgid "connection received: host=%s port=%s"
-msgstr "conexão recebida: host=%s porta=%s"
+msgid "%s cannot run inside a subtransaction"
+msgstr "%s não pode executar dentro de uma subtransação"
 
-#: postmaster/postmaster.c:3399
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2855
 #, c-format
-msgid "connection received: host=%s"
-msgstr "conexão recebida: host=%s"
+msgid "%s cannot be executed from a function or multi-command string"
+msgstr ""
+"%s não pode ser executada a partir de uma função ou cadeia de caracteres com "
+"múltiplos comandos"
 
-#: postmaster/postmaster.c:3627 access/transam/xlog.c:2323
-#: access/transam/xlog.c:2456 access/transam/xlog.c:4286
-#: access/transam/xlog.c:8443 access/transam/xlog.c:8598
-#: storage/file/copydir.c:172 storage/smgr/md.c:278
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2906
 #, c-format
-msgid "could not create file \"%s\": %m"
-msgstr "não pôde criar arquivo \"%s\": %m"
+msgid "%s can only be used in transaction blocks"
+msgstr "%s só pode ser utilizado em blocos de transação"
 
-#: postmaster/postmaster.c:3666
-#, c-format
-msgid "could not execute server process \"%s\": %m"
-msgstr "não pôde executar processo servidor \"%s\": %m"
+#: access/transam/xact.c:3088
+msgid "there is already a transaction in progress"
+msgstr "há uma transação em execução"
 
-#: postmaster/postmaster.c:4179
-msgid "database system is ready to accept read only connections"
-msgstr ""
-"sistema de banco de dados está pronto para aceitar conexões somente leitura"
+#: access/transam/xact.c:3255 access/transam/xact.c:3347
+msgid "there is no transaction in progress"
+msgstr "não há uma transação em execução"
 
-#: postmaster/postmaster.c:4420
-#, c-format
-msgid "could not fork startup process: %m"
-msgstr "não pôde criar processo de inicialização: %m"
+#: access/transam/xact.c:3441 access/transam/xact.c:3491
+#: access/transam/xact.c:3497 access/transam/xact.c:3541
+#: access/transam/xact.c:3589 access/transam/xact.c:3595
+msgid "no such savepoint"
+msgstr "ponto de salvamento inexistente"
 
-#: postmaster/postmaster.c:4424
+#: access/transam/xact.c:4225
+msgid "cannot have more than 2^32-1 subtransactions in a transaction"
+msgstr "não pode ter mais do que 2^32-1 subtransações em uma transação"
+
+#: access/transam/slru.c:609
 #, c-format
-msgid "could not fork background writer process: %m"
-msgstr "não pôde criar processo escritor em segundo plano: %m"
+msgid "file \"%s\" doesn't exist, reading as zeroes"
+msgstr "arquivo \"%s\" não existe, lendo como zeros"
 
-#: postmaster/postmaster.c:4428
+#: access/transam/slru.c:839 access/transam/slru.c:845
+#: access/transam/slru.c:852 access/transam/slru.c:859
+#: access/transam/slru.c:866 access/transam/slru.c:873
 #, c-format
-msgid "could not fork WAL writer process: %m"
-msgstr "não pôde criar processo escritor do WAL: %m"
+msgid "could not access status of transaction %u"
+msgstr "não pôde acessar status da transação %u"
 
-#: postmaster/postmaster.c:4432
-#, fuzzy, c-format
-msgid "could not fork WAL receiver process: %m"
-msgstr "não pôde criar processo receptor do WAL: %m"
+#: access/transam/slru.c:840
+#, c-format
+msgid "Could not open file \"%s\": %m."
+msgstr "não pôde abrir arquivo \"%s\": %m."
 
-#: postmaster/postmaster.c:4436
+#: access/transam/slru.c:846
 #, c-format
-msgid "could not fork process: %m"
-msgstr "não pôde criar processo: %m"
+msgid "Could not seek in file \"%s\" to offset %u: %m."
+msgstr "não pôde buscar no arquivo \"%s\" deslocado de %u: %m."
 
-#: postmaster/postmaster.c:4718
+#: access/transam/slru.c:853
 #, c-format
-msgid "could not duplicate socket %d for use in backend: error code %d"
-msgstr "não pôde duplicar soquete %d para uso pelo servidor: código de erro %d"
+msgid "Could not read from file \"%s\" at offset %u: %m."
+msgstr "não pôde ler do arquivo \"%s\" deslocado de %u: %m."
 
-#: postmaster/postmaster.c:4750
+#: access/transam/slru.c:860
 #, c-format
-msgid "could not create inherited socket: error code %d\n"
-msgstr "não pôde criar soquete herdado: código de erro %d\n"
+msgid "Could not write to file \"%s\" at offset %u: %m."
+msgstr "não pôde escrever no arquivo \"%s\" deslocado de %u: %m."
 
-#: postmaster/postmaster.c:4779 postmaster/postmaster.c:4786
+#: access/transam/slru.c:867
 #, c-format
-msgid "could not read from backend variables file \"%s\": %s\n"
-msgstr "não pôde ler do arquivo de variáveis do servidor \"%s\": %s\n"
+msgid "Could not fsync file \"%s\": %m."
+msgstr "não pôde executar fsync no arquivo \"%s\": %m."
 
-#: postmaster/postmaster.c:4795
+#: access/transam/slru.c:874
 #, c-format
-msgid "could not remove file \"%s\": %s\n"
-msgstr "não pôde remover arquivo \"%s\": %s\n"
+msgid "Could not close file \"%s\": %m."
+msgstr "não pôde fechar arquivo \"%s\": %m."
 
-#: postmaster/postmaster.c:4808
+#: access/transam/slru.c:1101
 #, c-format
-msgid "could not map view of backend variables: error code %d\n"
-msgstr "não pôde mapear visão de variáveis do servidor: código de erro %d\n"
+msgid "could not truncate directory \"%s\": apparent wraparound"
+msgstr "não pôde truncar diretório \"%s\": reinício aparente"
 
-#: postmaster/postmaster.c:4817
+#: access/transam/slru.c:1182
 #, c-format
-msgid "could not unmap view of backend variables: error code %d\n"
-msgstr "não pôde liberar visão de variáveis do servidor: código de erro %d\n"
+msgid "removing file \"%s\""
+msgstr "removendo arquivo \"%s\""
 
-#: postmaster/postmaster.c:4824
+#: access/transam/twophase.c:250
 #, c-format
-msgid "could not close handle to backend parameter variables: error code %d\n"
-msgstr ""
-"não pôde fechar manipulador das variáveis do servidor: código de erro %d\n"
+msgid "transaction identifier \"%s\" is too long"
+msgstr "identificador de transação \"%s\" é muito longo"
 
-#: postmaster/postmaster.c:4967
-msgid "could not read exit code for process\n"
-msgstr "não pôde ler código de retorno para processo\n"
+#: access/transam/twophase.c:257
+msgid "prepared transactions are disabled"
+msgstr "transações preparadas estão desabilitadas"
 
-#: postmaster/postmaster.c:4972
-msgid "could not post child completion status\n"
-msgstr "não pôde publicar status de conclusão do processo filho\n"
+#: access/transam/twophase.c:258
+msgid "Set max_prepared_transactions to a nonzero value."
+msgstr "Defina max_prepared_transactions para um valor diferente de zero."
 
-#: postmaster/pgarch.c:158
+#: access/transam/twophase.c:291
 #, c-format
-msgid "could not fork archiver: %m"
-msgstr "não pôde criar processo arquivador: %m"
+msgid "transaction identifier \"%s\" is already in use"
+msgstr "identificador de transação \"%s\" já está em uso"
 
-#: postmaster/pgarch.c:450
-msgid "archive_mode enabled, yet archive_command is not set"
-msgstr "archive_mode habilitado, mas archive_command não está definido"
+#: access/transam/twophase.c:300
+msgid "maximum number of prepared transactions reached"
+msgstr "número máximo de transações preparadas foi alcançado"
 
-#: postmaster/pgarch.c:465
+#: access/transam/twophase.c:301
 #, c-format
-msgid "transaction log file \"%s\" could not be archived: too many failures"
-msgstr ""
-"arquivo do log de transação \"%s\" não pôde ser arquivado: muitas falhas"
+msgid "Increase max_prepared_transactions (currently %d)."
+msgstr "Aumente max_prepared_transactions (atualmente %d)."
 
-#: postmaster/pgarch.c:568
+#: access/transam/twophase.c:421
 #, c-format
-msgid "archive command failed with exit code %d"
-msgstr "comando de arquivamento falhou com código de retorno %d"
+msgid "prepared transaction with identifier \"%s\" is busy"
+msgstr "transação preparada com identificador \"%s\" está sendo utilizada"
 
-#: postmaster/pgarch.c:570 postmaster/pgarch.c:580 postmaster/pgarch.c:587
-#: postmaster/pgarch.c:593 postmaster/pgarch.c:602
-#, c-format
-msgid "The failed archive command was: %s"
-msgstr "O comando de arquivamento que falhou foi: %s"
+#: access/transam/twophase.c:429
+msgid "permission denied to finish prepared transaction"
+msgstr "permissão negada ao finalizar transação preparada"
 
-#: postmaster/pgarch.c:577
-#, c-format
-msgid "archive command was terminated by exception 0x%X"
-msgstr "comando de arquivamento foi terminado pela exceção 0x%X"
+#: access/transam/twophase.c:430
+msgid "Must be superuser or the user that prepared the transaction."
+msgstr "Deve ser super-usuário ou usuário que preparou a transação."
 
-#: postmaster/pgarch.c:584
-#, c-format
-msgid "archive command was terminated by signal %d: %s"
-msgstr "comando de arquivamento foi terminado pelo sinal %d: %s"
+#: access/transam/twophase.c:441
+msgid "prepared transaction belongs to another database"
+msgstr "transação preparada pertence a outro banco de dados"
 
-#: postmaster/pgarch.c:591
-#, c-format
-msgid "archive command was terminated by signal %d"
-msgstr "comando de arquivamento foi terminado pelo sinal %d"
+#: access/transam/twophase.c:442
+msgid ""
+"Connect to the database where the transaction was prepared to finish it."
+msgstr ""
+"Conecte-se ao banco de dados onde a transação foi preparada para terminá-la."
 
-#: postmaster/pgarch.c:600
+#: access/transam/twophase.c:456
 #, c-format
-msgid "archive command exited with unrecognized status %d"
-msgstr "comando de arquivamento terminou com status desconhecido %d"
+msgid "prepared transaction with identifier \"%s\" does not exist"
+msgstr "transação preparada com identificador \"%s\" não existe"
 
-#: postmaster/pgarch.c:612
+#: access/transam/twophase.c:939
+msgid "two-phase state file maximum length exceeded"
+msgstr ""
+"tamanho máximo do arquivo de status de efetivação em duas fases foi alcançado"
+
+#: access/transam/twophase.c:957
 #, c-format
-msgid "archived transaction log file \"%s\""
-msgstr "arquivo do log de transação \"%s\" foi arquivado"
+msgid "could not create two-phase state file \"%s\": %m"
+msgstr ""
+"não pôde criar arquivo de status de efetivação em duas fases \"%s\": %m"
 
-#: postmaster/pgarch.c:661
+#: access/transam/twophase.c:971 access/transam/twophase.c:988
+#: access/transam/twophase.c:1044 access/transam/twophase.c:1465
+#: access/transam/twophase.c:1472
 #, c-format
-msgid "could not open archive status directory \"%s\": %m"
-msgstr "não pôde abrir diretório de status de arquivamento \"%s\": %m"
+msgid "could not write two-phase state file: %m"
+msgstr "não pôde escrever em arquivo de status de efetivação em duas fases: %m"
 
-#: postmaster/pgarch.c:715 access/transam/xlog.c:4429
-#: access/transam/xlog.c:5378 access/transam/xlog.c:5431
-#: access/transam/xlog.c:6007
+#: access/transam/twophase.c:997
 #, c-format
-msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "não pôde renomear arquivo \"%s\" para \"%s\": %m"
+msgid "could not seek in two-phase state file: %m"
+msgstr "não pôde buscar no arquivo de status de efetivação em duas fases: %m"
 
-#: access/heap/heapam.c:1076 access/heap/heapam.c:1104
-#: access/heap/heapam.c:1134 catalog/aclchk.c:1714
+#: access/transam/twophase.c:1050 access/transam/twophase.c:1490
 #, c-format
-msgid "\"%s\" is an index"
-msgstr "\"%s\" é um índice"
+msgid "could not close two-phase state file: %m"
+msgstr "não pôde fechar arquivo de status de efetivação em duas fases: %m"
 
-#: access/heap/heapam.c:1081 access/heap/heapam.c:1109
-#: access/heap/heapam.c:1139 commands/tablecmds.c:2162
-#: commands/tablecmds.c:6528 commands/tablecmds.c:7834 catalog/aclchk.c:1721
+#: access/transam/twophase.c:1130 access/transam/twophase.c:1570
 #, c-format
-msgid "\"%s\" is a composite type"
-msgstr "\"%s\" é um tipo composto"
+msgid "could not open two-phase state file \"%s\": %m"
+msgstr ""
+"não pôde abrir arquivo de status de efetivação em duas fases \"%s\": %m"
 
-#: access/heap/heapam.c:3149 access/heap/heapam.c:3180
-#: access/heap/heapam.c:3215
+#: access/transam/twophase.c:1147
 #, c-format
-msgid "could not obtain lock on row in relation \"%s\""
-msgstr "não pôde obter bloqueio no registro da relação \"%s\""
+msgid "could not stat two-phase state file \"%s\": %m"
+msgstr ""
+"não pôde executar stat no arquivo de status de efetivação em duas fases \"%s"
+"\": %m"
 
-#: access/heap/rewriteheap.c:592 access/heap/hio.c:175
+#: access/transam/twophase.c:1179
 #, c-format
-msgid "row is too big: size %lu, maximum size %lu"
-msgstr "registro é muito grande: tamanho %lu, tamanho máximo %lu"
+msgid "could not read two-phase state file \"%s\": %m"
+msgstr "não pôde ler arquivo de status de efetivação em duas fases \"%s\": %m"
 
-#: access/gist/gistutil.c:407
+#: access/transam/twophase.c:1271
 #, c-format
-msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
+msgid "two-phase state file for transaction %u is corrupt"
 msgstr ""
-"índice \"%s\" precisa de um VACUUM ou REINDEX para terminar recuperação de "
-"uma queda"
+"arquivo de status de efetivação em duas fases para transação %u está "
+"corrompido"
 
-#: access/gist/gistutil.c:588 access/nbtree/nbtpage.c:432
-#: access/hash/hashutil.c:165
+#: access/transam/twophase.c:1427
 #, c-format
-msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "índice \"%s\" contém página de tamanho zero inesperada no bloco %u"
-
-#: access/gist/gistutil.c:591 access/gist/gistutil.c:602
-#: access/nbtree/nbtpage.c:435 access/nbtree/nbtpage.c:446
-#: access/hash/hashutil.c:168 access/hash/hashutil.c:179
-#: access/hash/hashutil.c:191 access/hash/hashutil.c:212
-msgid "Please REINDEX it."
-msgstr "Por favor execute REINDEX."
+msgid "could not remove two-phase state file \"%s\": %m"
+msgstr ""
+"não pôde remover arquivo de status de efetivação em duas fases \"%s\": %m"
 
-#: access/gist/gistutil.c:599 access/nbtree/nbtpage.c:443
-#: access/hash/hashutil.c:176 access/hash/hashutil.c:188
+#: access/transam/twophase.c:1456
 #, c-format
-msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "índice \"%s\" contém página corrompida no bloco %u"
+msgid "could not recreate two-phase state file \"%s\": %m"
+msgstr ""
+"não pôde recriar arquivo de status de efetivação em duas fases \"%s\": %m"
 
-#: access/gist/gistsplit.c:372
+#: access/transam/twophase.c:1484
 #, c-format
-msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr "método picksplit para coluna %d do índice \"%s\" falhou"
-
-#: access/gist/gistsplit.c:374
-msgid ""
-"The index is not optimal. To optimize it, contact a developer, or try to use "
-"the column as the second one in the CREATE INDEX command."
+msgid "could not fsync two-phase state file: %m"
 msgstr ""
-"O índice não é ótimo. Para otimizá-lo, entre em contato com um desenvolvedor "
-"ou tente utilizar a coluna como a segunda no comando CREATE INDEX."
+"não pôde executar fsync no arquivo de status de efetivação em duas fases: %m"
 
-#: access/gist/gistvacuum.c:72
+#: access/transam/twophase.c:1579
 #, c-format
-msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
+msgid "could not fsync two-phase state file \"%s\": %m"
 msgstr ""
-"índice \"%s\" precisa de um VACUUM FULL ou REINDEX para terminar recuperação "
-"de uma queda"
+"não pôde executar fsync no arquivo de status de efetivação em duas fases \"%s"
+"\": %m"
 
-#: access/gist/gistxlog.c:803
+#: access/transam/twophase.c:1586
 #, c-format
-msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
+msgid "could not close two-phase state file \"%s\": %m"
 msgstr ""
-"índice %u/%u/%u precisa de um VACUUM FULL OU REINDEX para terminar "
-"recuperação de uma queda"
+"não pôde fechar arquivo de status de efetivação em duas fases \"%s\": %m"
 
-#: access/gist/gistxlog.c:805
-msgid "Incomplete insertion detected during crash replay."
-msgstr "Inserção incompleta detectada durante recuperação de uma queda."
+#: access/transam/twophase.c:1651
+#, c-format
+msgid "removing future two-phase state file \"%s\""
+msgstr "removendo arquivo futuro de status de efetivação em duas fases \"%s\""
 
-#: access/index/indexam.c:149 commands/indexcmds.c:1595
-#: commands/tablecmds.c:212 commands/tablecmds.c:2357 commands/comment.c:559
+#: access/transam/twophase.c:1667 access/transam/twophase.c:1678
+#: access/transam/twophase.c:1791 access/transam/twophase.c:1802
+#: access/transam/twophase.c:1875
 #, c-format
-msgid "\"%s\" is not an index"
-msgstr "\"%s\" não é um índice"
+msgid "removing corrupt two-phase state file \"%s\""
+msgstr ""
+"removendo arquivo corrompido de status de efetivação em duas fases \"%s\""
+
+#: access/transam/twophase.c:1780 access/transam/twophase.c:1864
+#, c-format
+msgid "removing stale two-phase state file \"%s\""
+msgstr "removendo arquivo antigo de status de efetivação em duas fases \"%s\""
+
+#: access/transam/twophase.c:1882
+#, c-format
+msgid "recovering prepared transaction %u"
+msgstr "recuperação transação preparada %u"
 
 #: access/common/heaptuple.c:646 access/common/heaptuple.c:1398
 #, c-format
 msgid "number of columns (%d) exceeds limit (%d)"
 msgstr "número de colunas (%d) excede limite (%d)"
 
+#: access/common/tupdesc.c:575 parser/parse_relation.c:1169
+#, c-format
+msgid "column \"%s\" cannot be declared SETOF"
+msgstr "coluna \"%s\" não pode ser declarada SETOF"
+
+#: access/common/tupconvert.c:107
+#, c-format
+msgid "Returned type %s does not match expected type %s in column %d."
+msgstr "Tipo %s retornado não corresponde ao tipo %s esperado na coluna %d."
+
+#: access/common/tupconvert.c:135
+#, c-format
+msgid ""
+"Number of returned columns (%d) does not match expected column count (%d)."
+msgstr ""
+"Número de colunas retornadas (%d) não corresponde a contagem de colunas "
+"esperada (%d)"
+
+#: access/common/tupconvert.c:240
+#, c-format
+msgid ""
+"Attribute \"%s\" of type %s does not match corresponding attribute of type "
+"%s."
+msgstr "Atributo \"%s\" do tipo %s não corresponde ao atributo do tipo %s."
+
+#: access/common/tupconvert.c:252
+#, c-format
+msgid "Attribute \"%s\" of type %s does not exist in type %s."
+msgstr "Atributo \"%s\" do tipo %s não existe no tipo %s."
+
 #: access/common/reloptions.c:323
 msgid "user-defined relation parameter types limit exceeded"
 msgstr ""
@@ -8616,42 +8671,42 @@ msgstr "RESET não deve incluir valores para parâmetros"
 msgid "unrecognized parameter namespace \"%s\""
 msgstr "namespace do parâmetro \"%s\" desconhecido"
 
-#: access/common/reloptions.c:895
+#: access/common/reloptions.c:898
 #, c-format
 msgid "unrecognized parameter \"%s\""
 msgstr "parâmetro \"%s\" desconhecido"
 
-#: access/common/reloptions.c:920
+#: access/common/reloptions.c:923
 #, c-format
 msgid "parameter \"%s\" specified more than once"
 msgstr "parâmetro \"%s\" foi especificado mais de uma vez"
 
-#: access/common/reloptions.c:935
+#: access/common/reloptions.c:938
 #, c-format
 msgid "invalid value for boolean option \"%s\": %s"
 msgstr "valor é inválido para opção booleano \"%s\": %s"
 
-#: access/common/reloptions.c:946
+#: access/common/reloptions.c:949
 #, c-format
 msgid "invalid value for integer option \"%s\": %s"
 msgstr "valor é inválido para opção inteiro \"%s\": %s"
 
-#: access/common/reloptions.c:951 access/common/reloptions.c:969
+#: access/common/reloptions.c:954 access/common/reloptions.c:972
 #, c-format
 msgid "value %s out of bounds for option \"%s\""
 msgstr "valor %s está fora do intervalo para opção \"%s\""
 
-#: access/common/reloptions.c:953
+#: access/common/reloptions.c:956
 #, c-format
 msgid "Valid values are between \"%d\" and \"%d\"."
 msgstr "Valores válidos estão entre \"%d\" e \"%d\"."
 
-#: access/common/reloptions.c:964
+#: access/common/reloptions.c:967
 #, c-format
 msgid "invalid value for floating point option \"%s\": %s"
 msgstr "valor é inválido para opção ponto flutuante \"%s\": %s"
 
-#: access/common/reloptions.c:971
+#: access/common/reloptions.c:974
 #, c-format
 msgid "Valid values are between \"%f\" and \"%f\"."
 msgstr "Valores válidos estão entre \"%f\" e \"%f\"."
@@ -8666,47 +8721,14 @@ msgstr "número de colunas indexadas (%d) excede limite (%d)"
 msgid "index row requires %lu bytes, maximum size is %lu"
 msgstr "registro do índice requer %lu bytes, tamanho máximo é %lu"
 
-#: access/common/tupconvert.c:107
-#, c-format
-msgid "Returned type %s does not match expected type %s in column %d."
-msgstr "Tipo %s retornado não corresponde ao tipo %s esperado na coluna %d."
-
-#: access/common/tupconvert.c:135
-#, c-format
-msgid ""
-"Number of returned columns (%d) does not match expected column count (%d)."
-msgstr ""
-"Número de colunas retornadas (%d) não corresponde a contagem de colunas "
-"esperada (%d)"
-
-#: access/common/tupconvert.c:240
-#, c-format
-msgid ""
-"Attribute \"%s\" of type %s does not match corresponding attribute of type "
-"%s."
-msgstr "Atributo \"%s\" do tipo %s não corresponde ao atributo do tipo %s."
-
-#: access/common/tupconvert.c:252
-#, c-format
-msgid "Attribute \"%s\" of type %s does not exist in type %s."
-msgstr "Atributo \"%s\" do tipo %s não existe no tipo %s."
-
-#: access/gin/ginscan.c:168 access/gin/ginscan.c:231
-msgid "GIN indexes do not support whole-index scans"
-msgstr "índices GIN não suportam buscas em todo índice"
-
-#: access/gin/ginentrypage.c:83 access/gin/ginentrypage.c:118
-#: access/nbtree/nbtsort.c:483 access/nbtree/nbtinsert.c:522
+#: access/nbtree/nbtsort.c:483 access/nbtree/nbtinsert.c:531
+#: access/gin/ginentrypage.c:101
 #, c-format
 msgid "index row size %lu exceeds maximum %lu for index \"%s\""
 msgstr ""
 "tamanho de registro do índice %lu excede o máximo %lu para índice \"%s\""
 
-#: access/gin/ginarrayproc.c:30
-msgid "array must not contain null values"
-msgstr "matriz não deve conter valores nulos"
-
-#: access/nbtree/nbtsort.c:487 access/nbtree/nbtinsert.c:526
+#: access/nbtree/nbtsort.c:487 access/nbtree/nbtinsert.c:535
 msgid ""
 "Values larger than 1/3 of a buffer page cannot be indexed.\n"
 "Consider a function index of an MD5 hash of the value, or use full text "
@@ -8716,8380 +8738,9761 @@ msgstr ""
 "Considere um índice de uma função de um hash MD5 de um valor ou utilize uma "
 "indexação de texto completa."
 
-#: access/nbtree/nbtinsert.c:384
+#: access/nbtree/nbtinsert.c:393
 #, c-format
 msgid "duplicate key value violates unique constraint \"%s\""
 msgstr "duplicar valor da chave viola a restrição de unicidade \"%s\""
 
-#: access/nbtree/nbtinsert.c:386
+#: access/nbtree/nbtinsert.c:395
 #, c-format
 msgid "Key %s already exists."
 msgstr "Chave %s já existe."
 
-#: access/nbtree/nbtpage.c:160 access/nbtree/nbtpage.c:364
+#: access/nbtree/nbtinsert.c:457
+#, c-format
+msgid "failed to re-find tuple within index \"%s\""
+msgstr "falhou ao reencontrar tupla no índice \"%s\""
+
+#: access/nbtree/nbtinsert.c:459
+msgid "This may be because of a non-immutable index expression."
+msgstr "Isso pode ser por causa de uma expressão não imutável do índice."
+
+#: access/nbtree/nbtpage.c:161 access/nbtree/nbtpage.c:365
+#: parser/parse_utilcmd.c:1527
 #, c-format
 msgid "index \"%s\" is not a btree"
 msgstr "índice \"%s\" não é uma árvore B"
 
-#: access/nbtree/nbtpage.c:166 access/nbtree/nbtpage.c:370
+#: access/nbtree/nbtpage.c:167 access/nbtree/nbtpage.c:371
 #, c-format
 msgid "version mismatch in index \"%s\": file version %d, code version %d"
 msgstr ""
 "versão não corresponde no índice \"%s\": versão do arquivo %d, versão do "
 "código %d"
 
-#: access/transam/xact.c:716
-msgid "cannot have more than 2^32-1 commands in a transaction"
-msgstr "não pode ter mais do que 2^32-1 comandos em uma transação"
-
-#: access/transam/xact.c:1236
+#: access/nbtree/nbtpage.c:433 access/gist/gistutil.c:589
+#: access/hash/hashutil.c:170
 #, c-format
-msgid "maximum number of committed subtransactions (%d) exceeded"
-msgstr "número máximo de subtransações efetivadas (%d) foi alcançado"
-
-#: access/transam/xact.c:1993
-msgid "cannot PREPARE a transaction that has operated on temporary tables"
-msgstr ""
-"não pode executar PREPARE em uma transação que utilizou tabelas temporárias"
+msgid "index \"%s\" contains unexpected zero page at block %u"
+msgstr "índice \"%s\" contém página de tamanho zero inesperada no bloco %u"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2782
-#, c-format
-msgid "%s cannot run inside a transaction block"
-msgstr "%s não pode executar dentro de um bloco de transação"
+#: access/nbtree/nbtpage.c:436 access/nbtree/nbtpage.c:447
+#: access/gist/gist.c:718 access/gist/gistvacuum.c:274
+#: access/gist/gistutil.c:592 access/gist/gistutil.c:603
+#: access/hash/hashutil.c:173 access/hash/hashutil.c:184
+#: access/hash/hashutil.c:196 access/hash/hashutil.c:217
+msgid "Please REINDEX it."
+msgstr "Por favor execute REINDEX."
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2792
+#: access/nbtree/nbtpage.c:444 access/gist/gistutil.c:600
+#: access/hash/hashutil.c:181 access/hash/hashutil.c:193
 #, c-format
-msgid "%s cannot run inside a subtransaction"
-msgstr "%s não pode executar dentro de uma subtransação"
+msgid "index \"%s\" contains corrupted page at block %u"
+msgstr "índice \"%s\" contém página corrompida no bloco %u"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2802
-#, c-format
-msgid "%s cannot be executed from a function or multi-command string"
+#: access/gin/ginscan.c:401
+msgid "old GIN indexes do not support whole-index scans nor searches for nulls"
 msgstr ""
-"%s não pode ser executada a partir de uma função ou cadeia de caracteres com "
-"múltiplos comandos"
+"índices GIN antigos não suportam buscas em todo índice e nem buscas por nulos"
 
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2853
+#: access/gin/ginscan.c:402
 #, c-format
-msgid "%s can only be used in transaction blocks"
-msgstr "%s só pode ser utilizado em blocos de transação"
-
-#: access/transam/xact.c:3035
-msgid "there is already a transaction in progress"
-msgstr "há uma transação em execução"
-
-#: access/transam/xact.c:3202 access/transam/xact.c:3294
-msgid "there is no transaction in progress"
-msgstr "não há uma transação em execução"
-
-#: access/transam/xact.c:3388 access/transam/xact.c:3438
-#: access/transam/xact.c:3444 access/transam/xact.c:3488
-#: access/transam/xact.c:3536 access/transam/xact.c:3542
-msgid "no such savepoint"
-msgstr "ponto de salvamento inexistente"
-
-#: access/transam/xact.c:4172
-msgid "cannot have more than 2^32-1 subtransactions in a transaction"
-msgstr "não pode ter mais do que 2^32-1 subtransações em uma transação"
+msgid "To fix this, do REINDEX INDEX \"%s\"."
+msgstr "Para corrigir isto, faça REINDEX INDEX \"%s\"."
 
-#: access/transam/twophase.c:247
+#: access/gist/gistsplit.c:375
 #, c-format
-msgid "transaction identifier \"%s\" is too long"
-msgstr "identificador de transação \"%s\" é muito longo"
+msgid "picksplit method for column %d of index \"%s\" failed"
+msgstr "método picksplit para coluna %d do índice \"%s\" falhou"
 
-#: access/transam/twophase.c:254
-msgid "prepared transactions are disabled"
-msgstr "transações preparadas estão desabilitadas"
+#: access/gist/gistsplit.c:377
+msgid ""
+"The index is not optimal. To optimize it, contact a developer, or try to use "
+"the column as the second one in the CREATE INDEX command."
+msgstr ""
+"O índice não é ótimo. Para otimizá-lo, entre em contato com um desenvolvedor "
+"ou tente utilizar a coluna como a segunda no comando CREATE INDEX."
 
-#: access/transam/twophase.c:255
-msgid "Set max_prepared_transactions to a nonzero value."
-msgstr "Defina max_prepared_transactions para um valor diferente de zero."
+#: access/gist/gist.c:230
+msgid "unlogged GiST indexes are not supported"
+msgstr "índices GiST unlogged não são suportados"
 
-#: access/transam/twophase.c:288
+#: access/gist/gist.c:715 access/gist/gistvacuum.c:271
 #, c-format
-msgid "transaction identifier \"%s\" is already in use"
-msgstr "identificador de transação \"%s\" já está em uso"
+msgid "index \"%s\" contains an inner tuple marked as invalid"
+msgstr "índice \"%s\" contém uma tupla interna marcada como inválida"
 
-#: access/transam/twophase.c:297
-msgid "maximum number of prepared transactions reached"
-msgstr "número máximo de transações preparadas foi alcançado"
+#: access/gist/gist.c:717 access/gist/gistvacuum.c:273
+msgid ""
+"This is caused by an incomplete page split at crash recovery before "
+"upgrading to PostgreSQL 9.1."
+msgstr ""
+"Isso é causado por uma divisão de página incompleta durante recuperação de "
+"desastre antes da atualização para PostgreSQL 9.1."
 
-#: access/transam/twophase.c:298
+#: access/hash/hashutil.c:209
 #, c-format
-msgid "Increase max_prepared_transactions (currently %d)."
-msgstr "Aumente max_prepared_transactions (atualmente %d)."
+msgid "index \"%s\" is not a hash index"
+msgstr "índice \"%s\" não é um índice hash"
 
-#: access/transam/twophase.c:418
+#: access/hash/hashutil.c:215
 #, c-format
-msgid "prepared transaction with identifier \"%s\" is busy"
-msgstr "transação preparada com identificador \"%s\" está sendo utilizada"
-
-#: access/transam/twophase.c:426
-msgid "permission denied to finish prepared transaction"
-msgstr "permissão negada ao finalizar transação preparada"
-
-#: access/transam/twophase.c:427
-msgid "Must be superuser or the user that prepared the transaction."
-msgstr "Deve ser super-usuário ou usuário que preparou a transação."
-
-#: access/transam/twophase.c:438
-msgid "prepared transaction belongs to another database"
-msgstr "transação preparada pertence a outro banco de dados"
+msgid "index \"%s\" has wrong hash version"
+msgstr "índice \"%s\" tem versão incorreta do hash"
 
-#: access/transam/twophase.c:439
-msgid ""
-"Connect to the database where the transaction was prepared to finish it."
-msgstr ""
-"Conecte-se ao banco de dados onde a transação foi preparada para terminá-la."
+#: access/hash/hashsearch.c:152
+msgid "hash indexes do not support whole-index scans"
+msgstr "índices hash não suportam buscas em todo índice"
 
-#: access/transam/twophase.c:453
+#: access/hash/hashinsert.c:73
 #, c-format
-msgid "prepared transaction with identifier \"%s\" does not exist"
-msgstr "transação preparada com identificador \"%s\" não existe"
-
-#: access/transam/twophase.c:936
-msgid "two-phase state file maximum length exceeded"
-msgstr ""
-"tamanho máximo do arquivo de status de efetivação em duas fases foi alcançado"
+msgid "index row size %lu exceeds hash maximum %lu"
+msgstr "tamanho de registro do índice %lu excede tamanho máximo do hash %lu"
 
-#: access/transam/twophase.c:954
-#, c-format
-msgid "could not create two-phase state file \"%s\": %m"
-msgstr ""
-"não pôde criar arquivo de status de efetivação em duas fases \"%s\": %m"
+#: access/hash/hashinsert.c:76
+msgid "Values larger than a buffer page cannot be indexed."
+msgstr "Valores maiores do que uma página do buffer não podem ser indexados."
 
-#: access/transam/twophase.c:968 access/transam/twophase.c:985
-#: access/transam/twophase.c:1034 access/transam/twophase.c:1445
-#: access/transam/twophase.c:1452
+#: access/hash/hashovfl.c:547
 #, c-format
-msgid "could not write two-phase state file: %m"
-msgstr "não pôde escrever em arquivo de status de efetivação em duas fases: %m"
+msgid "out of overflow pages in hash index \"%s\""
+msgstr "acabaram as páginas de transbordamento no índice hash \"%s\""
 
-#: access/transam/twophase.c:994
+#: access/heap/rewriteheap.c:597 access/heap/hio.c:175
 #, c-format
-msgid "could not seek in two-phase state file: %m"
-msgstr "não pôde buscar no arquivo de status de efetivação em duas fases: %m"
+msgid "row is too big: size %lu, maximum size %lu"
+msgstr "registro é muito grande: tamanho %lu, tamanho máximo %lu"
 
-#: access/transam/twophase.c:1040 access/transam/twophase.c:1470
+#: access/heap/heapam.c:3216 access/heap/heapam.c:3247
+#: access/heap/heapam.c:3282
 #, c-format
-msgid "could not close two-phase state file: %m"
-msgstr "não pôde fechar arquivo de status de efetivação em duas fases: %m"
+msgid "could not obtain lock on row in relation \"%s\""
+msgstr "não pôde obter bloqueio no registro da relação \"%s\""
 
-#: access/transam/twophase.c:1112 access/transam/twophase.c:1550
+#: lib/stringinfo.c:267
 #, c-format
-msgid "could not open two-phase state file \"%s\": %m"
+msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
 msgstr ""
-"não pôde abrir arquivo de status de efetivação em duas fases \"%s\": %m"
+"Não pode aumentar o buffer de cadeia de caracteres contendo %d bytes para "
+"mais %d bytes."
 
-#: access/transam/twophase.c:1129
+#: main/main.c:237
 #, c-format
-msgid "could not stat two-phase state file \"%s\": %m"
-msgstr ""
-"não pôde executar stat no arquivo de status de efetivação em duas fases \"%s"
-"\": %m"
+msgid "%s: setsysinfo failed: %s\n"
+msgstr "%s: setsysinfo falhou: %s\n"
 
-#: access/transam/twophase.c:1161
+#: main/main.c:259
 #, c-format
-msgid "could not read two-phase state file \"%s\": %m"
-msgstr "não pôde ler arquivo de status de efetivação em duas fases \"%s\": %m"
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: WSAStartup falhou: %d\n"
 
-#: access/transam/twophase.c:1253
+#: main/main.c:278
 #, c-format
-msgid "two-phase state file for transaction %u is corrupt"
+msgid ""
+"%s is the PostgreSQL server.\n"
+"\n"
 msgstr ""
-"arquivo de status de efetivação em duas fases para transação %u está "
-"corrompido"
+"%s é o servidor PostgreSQL.\n"
+"\n"
 
-#: access/transam/twophase.c:1407
+#: main/main.c:279
 #, c-format
-msgid "could not remove two-phase state file \"%s\": %m"
+msgid ""
+"Usage:\n"
+"  %s [OPTION]...\n"
+"\n"
 msgstr ""
-"não pôde remover arquivo de status de efetivação em duas fases \"%s\": %m"
+"Uso:\n"
+"  %s [OPÇÃO]...\n"
+"\n"
 
-#: access/transam/twophase.c:1436
+#: main/main.c:280
 #, c-format
-msgid "could not recreate two-phase state file \"%s\": %m"
-msgstr ""
-"não pôde recriar arquivo de status de efetivação em duas fases \"%s\": %m"
+msgid "Options:\n"
+msgstr "Opções:\n"
 
-#: access/transam/twophase.c:1464
+#: main/main.c:282
 #, c-format
-msgid "could not fsync two-phase state file: %m"
+msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr ""
-"não pôde executar fsync no arquivo de status de efetivação em duas fases: %m"
+"  -A 1|0          habilita/desabilita verificação de asserção em tempo de "
+"execução\n"
 
-#: access/transam/twophase.c:1559
+#: main/main.c:284
 #, c-format
-msgid "could not fsync two-phase state file \"%s\": %m"
-msgstr ""
-"não pôde executar fsync no arquivo de status de efetivação em duas fases \"%s"
-"\": %m"
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B NBUFFERS     número de buffers compartilhados\n"
 
-#: access/transam/twophase.c:1566
+#: main/main.c:285
 #, c-format
-msgid "could not close two-phase state file \"%s\": %m"
-msgstr ""
-"não pôde fechar arquivo de status de efetivação em duas fases \"%s\": %m"
+msgid "  -c NAME=VALUE   set run-time parameter\n"
+msgstr "  -c NOME=VALOR   define o parâmetro em tempo de execução\n"
 
-#: access/transam/twophase.c:1631
+#: main/main.c:286
 #, c-format
-msgid "removing future two-phase state file \"%s\""
-msgstr "removendo arquivo futuro de status de efetivação em duas fases \"%s\""
+msgid "  -d 1-5          debugging level\n"
+msgstr "   -d 1-5         nível de depuração\n"
 
-#: access/transam/twophase.c:1647 access/transam/twophase.c:1658
-#: access/transam/twophase.c:1771 access/transam/twophase.c:1782
-#: access/transam/twophase.c:1855
-#, c-format
-msgid "removing corrupt two-phase state file \"%s\""
-msgstr ""
-"removendo arquivo corrompido de status de efetivação em duas fases \"%s\""
-
-#: access/transam/twophase.c:1760 access/transam/twophase.c:1844
-#, c-format
-msgid "removing stale two-phase state file \"%s\""
-msgstr "removendo arquivo antigo de status de efetivação em duas fases \"%s\""
-
-#: access/transam/twophase.c:1862
-#, c-format
-msgid "recovering prepared transaction %u"
-msgstr "recuperação transação preparada %u"
-
-#: access/transam/xlog.c:1275
-#, c-format
-msgid "could not create archive status file \"%s\": %m"
-msgstr "não pôde criar arquivo de status do arquivador \"%s\": %m"
-
-#: access/transam/xlog.c:1283
-#, c-format
-msgid "could not write archive status file \"%s\": %m"
-msgstr "não pôde escrever no arquivo de status do arquivador \"%s\": %m"
-
-#: access/transam/xlog.c:1738 access/transam/xlog.c:9581
-#: replication/walsender.c:596 replication/walreceiver.c:479
+#: main/main.c:287
 #, c-format
-msgid "could not seek in log file %u, segment %u to offset %u: %m"
-msgstr "não pôde buscar no arquivo de log %u, segmento %u deslocado de %u: %m"
+msgid "  -D DATADIR      database directory\n"
+msgstr "  -D DIRDADOS     diretório do banco de dados\n"
 
-#: access/transam/xlog.c:1755 replication/walreceiver.c:496
+#: main/main.c:288
 #, c-format
-msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
-msgstr ""
-"não pôde escrever no arquivo de log %u, segmento %u deslocado de %u, tamanho "
-"%lu: %m"
+msgid "  -e              use European date input format (DMY)\n"
+msgstr "  -e              usa formato de entrada de data europeu (DMY)\n"
 
-#: access/transam/xlog.c:1957
+#: main/main.c:289
 #, c-format
-msgid "updated min recovery point to %X/%X"
-msgstr "ponto mínimo de recuperação atualizado para %X/%X"
+msgid "  -F              turn fsync off\n"
+msgstr "  -F              desabilita o fsync\n"
 
-#: access/transam/xlog.c:2298 access/transam/xlog.c:2402
-#: access/transam/xlog.c:2631 access/transam/xlog.c:2702
-#: access/transam/xlog.c:2759 replication/walsender.c:584
+#: main/main.c:290
 #, c-format
-msgid "could not open file \"%s\" (log file %u, segment %u): %m"
-msgstr "não pôde abrir arquivo \"%s\" (arquivo de log %u, segmento %u): %m"
+msgid "  -h HOSTNAME     host name or IP address to listen on\n"
+msgstr "  -h M�QUINA      nome da máquina ou endereço IP para escutar\n"
 
-#: access/transam/xlog.c:2363 access/transam/xlog.c:2495
-#: access/transam/xlog.c:4400 storage/file/copydir.c:269 storage/smgr/md.c:909
-#: storage/smgr/md.c:1083 storage/smgr/md.c:1226
+#: main/main.c:291
 #, c-format
-msgid "could not fsync file \"%s\": %m"
-msgstr "não pôde executar fsync no arquivo \"%s\": %m"
+msgid "  -i              enable TCP/IP connections\n"
+msgstr "  -i              habilita conexões TCP/IP\n"
 
-#: access/transam/xlog.c:2368 access/transam/xlog.c:2500
-#: access/transam/xlog.c:4405 storage/file/copydir.c:211
+#: main/main.c:292
 #, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "não pôde fechar arquivo \"%s\": %m"
+msgid "  -k DIRECTORY    Unix-domain socket location\n"
+msgstr "  -k DIRETÓRIO    local do soquete de domínio Unix\n"
 
-#: access/transam/xlog.c:2472
+#: main/main.c:294
 #, c-format
-msgid "not enough data in file \"%s\""
-msgstr "dados insuficientes no arquivo \"%s\""
+msgid "  -l              enable SSL connections\n"
+msgstr "  -l              habilita conexões SSL\n"
 
-#: access/transam/xlog.c:2591
+#: main/main.c:296
 #, c-format
-msgid ""
-"could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
-"%u): %m"
-msgstr ""
-"não pôde vincular arquivo \"%s\" aa \"%s\" (inicialização do arquivo de log "
-"%u, segmento %u): %m"
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N MAX-CONEXÃO  número máximo de conexões permitidas\n"
 
-#: access/transam/xlog.c:2603
+#: main/main.c:297
 #, c-format
-msgid ""
-"could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
-"segment %u): %m"
+msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
 msgstr ""
-"não pôde renomear arquivo \"%s\" para \"%s\" (inicialização do arquivo de "
-"log %u, segmento %u): %m"
+"  -o OPÇÕES       passa \"OPÇÕES\" para cada processo servidor (obsoleto)\n"
 
-#: access/transam/xlog.c:2786 replication/walreceiver.c:453
+#: main/main.c:298
 #, c-format
-msgid "could not close log file %u, segment %u: %m"
-msgstr "não pôde fechar arquivo de log %u, segmento %u: %m"
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p PORTA        número da porta para escutar\n"
 
-#: access/transam/xlog.c:2866 access/transam/xlog.c:8625 storage/smgr/md.c:348
-#: storage/smgr/md.c:395 storage/smgr/md.c:1192
+#: main/main.c:299
 #, c-format
-msgid "could not remove file \"%s\": %m"
-msgstr "não pôde remover arquivo \"%s\": %m"
+msgid "  -s              show statistics after each query\n"
+msgstr "  -s              mostra estatísticas após cada consulta\n"
 
-#: access/transam/xlog.c:3002
+#: main/main.c:300
 #, c-format
-msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
+msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
 msgstr ""
-"arquivo do arquivador \"%s\" tem tamanho incorreto: %lu ao invés de %lu"
-
-#: access/transam/xlog.c:3011
-#, c-format
-msgid "restored log file \"%s\" from archive"
-msgstr "arquivo de log restaurado \"%s\" do arquivador"
-
-#: access/transam/xlog.c:3061
-#, c-format
-msgid "could not restore file \"%s\" from archive: return code %d"
-msgstr "não pôde restaurar arquivo \"%s\" do arquivador: código retornado %d"
-
-#: access/transam/xlog.c:3176
-#, c-format
-msgid "%s \"%s\": return code %d"
-msgstr "%s \"%s\": código retornado %d"
-
-#: access/transam/xlog.c:3286 access/transam/xlog.c:3469
-#, c-format
-msgid "could not open transaction log directory \"%s\": %m"
-msgstr "não pôde abrir diretório do log de transação \"%s\": %m"
+"  -S MEM-ORD      define a quantidade de memória para ordenações (em kB)\n"
 
-#: access/transam/xlog.c:3340
+#: main/main.c:301
 #, c-format
-msgid "recycled transaction log file \"%s\""
-msgstr "arquivo do log de transação \"%s\" foi reciclado"
+msgid "  --NAME=VALUE    set run-time parameter\n"
+msgstr "  --NOME=VALOR    define o parâmetro em tempo de execução\n"
 
-#: access/transam/xlog.c:3356
+#: main/main.c:302
 #, c-format
-msgid "removing transaction log file \"%s\""
-msgstr "removendo arquivo do log de transação \"%s\""
+msgid "  --describe-config  describe configuration parameters, then exit\n"
+msgstr "  --describe-config  descreve parâmetros de configuração e termina\n"
 
-#: access/transam/xlog.c:3379
+#: main/main.c:303
 #, c-format
-msgid "could not rename old transaction log file \"%s\": %m"
-msgstr "não pôde renomear arquivo de log de transação antigo \"%s\": %m"
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          mostra esta ajuda e termina\n"
 
-#: access/transam/xlog.c:3391
+#: main/main.c:304
 #, c-format
-msgid "could not remove old transaction log file \"%s\": %m"
-msgstr "não pôde remover arquivo de log de transação antigo \"%s\": %m"
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       mostra informação sobre a versão e termina\n"
 
-#: access/transam/xlog.c:3429 access/transam/xlog.c:3439
+#: main/main.c:306
 #, c-format
-msgid "required WAL directory \"%s\" does not exist"
-msgstr "diretório WAL requerido \"%s\" não existe"
+msgid ""
+"\n"
+"Developer options:\n"
+msgstr ""
+"\n"
+"Opções para desenvolvedor:\n"
 
-#: access/transam/xlog.c:3445
+#: main/main.c:307
 #, c-format
-msgid "creating missing WAL directory \"%s\""
-msgstr "criando diretório WAL ausente \"%s\""
+msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
+msgstr "  -f s|i|n|m|h    impede uso de alguns tipos de planos\n"
 
-#: access/transam/xlog.c:3448
+#: main/main.c:308
 #, c-format
-msgid "could not create missing directory \"%s\": %m"
-msgstr "não pôde criar diretório ausente \"%s\": %m"
+msgid ""
+"  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr ""
+"  -n              não reinicializa memória compartilhada depois de término "
+"anormal\n"
 
-#: access/transam/xlog.c:3482
+#: main/main.c:309
 #, c-format
-msgid "removing transaction log backup history file \"%s\""
-msgstr "removendo arquivo de histórico do log de transação \"%s\""
+msgid "  -O              allow system table structure changes\n"
+msgstr ""
+"  -O              permite mudanças na estrutura de tabelas do sistema\n"
 
-#: access/transam/xlog.c:3602
+#: main/main.c:310
 #, c-format
-msgid "incorrect hole size in record at %X/%X"
-msgstr "tamanho de espaço livre incorreto no registro em %X/%X"
+msgid "  -P              disable system indexes\n"
+msgstr "  -P              desabilita índices do sistema\n"
 
-#: access/transam/xlog.c:3615
+#: main/main.c:311
 #, c-format
-msgid "incorrect total length in record at %X/%X"
-msgstr "tamanho total incorreto no registro em %X/%X"
+msgid "  -t pa|pl|ex     show timings after each query\n"
+msgstr "  -t pa|pl|ex     mostra duração depois de cada consulta\n"
 
-#: access/transam/xlog.c:3628
+#: main/main.c:312
 #, c-format
-msgid "incorrect resource manager data checksum in record at %X/%X"
+msgid "  -T              send SIGSTOP to all backend processes if one dies\n"
 msgstr ""
-"soma de verificação de dados do gerenciador de recursos incorreta no "
-"registro %X/%X"
-
-#: access/transam/xlog.c:3697 access/transam/xlog.c:3733
-#, c-format
-msgid "invalid record offset at %X/%X"
-msgstr "deslocamento de registro inválido em %X/%X"
-
-#: access/transam/xlog.c:3741
-#, c-format
-msgid "contrecord is requested by %X/%X"
-msgstr "contrecord é solicitado por %X/%X"
+"  -T              envia SIGSTOP para todos os servidores se um deles morrer\n"
 
-#: access/transam/xlog.c:3756
+#: main/main.c:313
 #, c-format
-msgid "invalid xlog switch record at %X/%X"
-msgstr "registro de rotação do xlog é inválido em %X/%X"
+msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
+msgstr ""
+"  -W NUM          espera NUM segundos para permitir que o depurador seja "
+"anexado\n"
 
-#: access/transam/xlog.c:3764
+#: main/main.c:315
 #, c-format
-msgid "record with zero length at %X/%X"
-msgstr "registro com tamanho zero em %X/%X"
+msgid ""
+"\n"
+"Options for single-user mode:\n"
+msgstr ""
+"\n"
+"Opções para modo monousuário:\n"
 
-#: access/transam/xlog.c:3773
+#: main/main.c:316
 #, c-format
-msgid "invalid record length at %X/%X"
-msgstr "tamanho de registro é inválido em %X/%X"
+msgid "  --single        selects single-user mode (must be first argument)\n"
+msgstr ""
+"  --single        seleciona modo monousuário (deve ser o primeiro "
+"argumento)\n"
 
-#: access/transam/xlog.c:3780
+#: main/main.c:317
 #, c-format
-msgid "invalid resource manager ID %u at %X/%X"
-msgstr "ID do gerenciador de recursos %u é inválido em %X/%X"
+msgid "  DBNAME          database name (defaults to user name)\n"
+msgstr ""
+"  NOMEBD          nome do banco de dados (padrão é o nome do usuário)\n"
 
-#: access/transam/xlog.c:3793 access/transam/xlog.c:3809
+#: main/main.c:318
 #, c-format
-msgid "record with incorrect prev-link %X/%X at %X/%X"
-msgstr "registro com prev-link %X/%X incorreto em %X/%X"
+msgid "  -d 0-5          override debugging level\n"
+msgstr "  -d 0-5          muda o nível de depuração\n"
 
-#: access/transam/xlog.c:3838
+#: main/main.c:319
 #, c-format
-msgid "record length %u at %X/%X too long"
-msgstr "tamanho do registro %u em %X/%X é muito longo"
+msgid "  -E              echo statement before execution\n"
+msgstr "  -E              mostra consulta antes da execução\n"
 
-#: access/transam/xlog.c:3878
+#: main/main.c:320
 #, c-format
-msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
+msgid "  -j              do not use newline as interactive query delimiter\n"
 msgstr ""
-"não há marcação em contrecord no arquivo de log %u, segmento %u, "
-"deslocamento %u"
+"  -j              não usa nova linha como delimitador de consulta iterativa\n"
 
-#: access/transam/xlog.c:3888
+#: main/main.c:321 main/main.c:326
 #, c-format
-msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
+msgid "  -r FILENAME     send stdout and stderr to given file\n"
 msgstr ""
-"tamanho de contrecord %u é inválido no arquivo de log %u, segmento %u, "
-"deslocamento %u"
+"  -r ARQUIVO      envia saída stdout e stderr para o arquivo designado\n"
 
-#: access/transam/xlog.c:3978
+#: main/main.c:323
 #, c-format
-msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
+msgid ""
+"\n"
+"Options for bootstrapping mode:\n"
 msgstr ""
-"número mágico %04X é invalido no arquivo de log %u, segmento %u, "
-"deslocamento %u"
+"\n"
+"Opções para modo de ativação:\n"
 
-#: access/transam/xlog.c:3985 access/transam/xlog.c:4031
+#: main/main.c:324
 #, c-format
-msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
+msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
 msgstr ""
-"bits de informação %04X são inválidos no arquivo de log %u, segmento %u, "
-"deslocamento %u"
-
-#: access/transam/xlog.c:4007 access/transam/xlog.c:4015
-#: access/transam/xlog.c:4022
-msgid "WAL file is from different database system"
-msgstr "arquivo do WAL é de um sistema de banco de dados diferente"
+"  --boot          seleciona modo de ativação (deve ser o primeiro "
+"argumento)\n"
 
-#: access/transam/xlog.c:4008
+#: main/main.c:325
 #, c-format
 msgid ""
-"WAL file database system identifier is %s, pg_control database system "
-"identifier is %s."
-msgstr "identificador do sistema de banco de dados no arquivo do WAL é %s, identificador do sistema de banco de dados no pg_control é %s."
-
-#: access/transam/xlog.c:4016
-msgid "Incorrect XLOG_SEG_SIZE in page header."
-msgstr "XLOG_SEG_SIZE está incorreto no cabeçalho da página."
-
-#: access/transam/xlog.c:4023
-msgid "Incorrect XLOG_BLCKSZ in page header."
-msgstr "XLOG_BLCKSZ está incorreto no cabeçalho da página."
+"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
+msgstr ""
+"  NOMEBD          nome do banco de dados (argumento obrigatório no modo de "
+"ativação)\n"
 
-#: access/transam/xlog.c:4039
+#: main/main.c:327
 #, c-format
-msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
-msgstr ""
-"pageaddr %X/%X inesperado no arquivo de log %u, segmento %u, deslocalemto %u"
+msgid "  -x NUM          internal use\n"
+msgstr "  -x NUM          uso interno\n"
 
-#: access/transam/xlog.c:4051
+#: main/main.c:329
 #, c-format
-msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
+msgid ""
+"\n"
+"Please read the documentation for the complete list of run-time\n"
+"configuration settings and how to set them on the command line or in\n"
+"the configuration file.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
-"ID de linha do tempo %u inesperado no arquivo de log %u, segmento %u, "
-"deslocalemto %u"
+"\n"
+"Por favor leia a documentação para verificar a lista completa de parâmetros\n"
+"de configuração em tempo de execução e como definí-los pela linha de "
+"comando\n"
+"ou no arquivo de configuração.\n"
+"\n"
+"Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: access/transam/xlog.c:4069
-#, c-format
+#: main/main.c:343
 msgid ""
-"out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
-"%u"
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
 msgstr ""
-"ID de linha do tempo %u fora de sequência (depois %u) no arquivo de log %u, "
-"segmento %u, deslocamento %u"
+"execução do servidor PostgreSQL pelo \"root\" não é permitida.\n"
+"O servidor deve ser iniciado por um usuário sem privilégios para previnir\n"
+"possíveis comprometimentos de segurança no sistema. Veja a documentação "
+"para\n"
+"obter informações adicionais sobre como iniciar o servidor corretamente.\n"
 
-#: access/transam/xlog.c:4142
+#: main/main.c:360
 #, c-format
-msgid "syntax error in history file: %s"
-msgstr "erro de sintaxe no arquivo de histórico: %s"
+msgid "%s: real and effective user IDs must match\n"
+msgstr "%s: IDs do usuário real e efetivo devem corresponder\n"
 
-#: access/transam/xlog.c:4143
-msgid "Expected a numeric timeline ID."
-msgstr "Esperado um ID de linha do tempo numérico."
+#: main/main.c:367
+msgid ""
+"Execution of PostgreSQL by a user with administrative permissions is not\n"
+"permitted.\n"
+"The server must be started under an unprivileged user ID to prevent\n"
+"possible system security compromises.  See the documentation for\n"
+"more information on how to properly start the server.\n"
+msgstr ""
+"Execução do servidor PostgreSQL por um usuário com permissões "
+"administrativas não é\n"
+"permitida.\n"
+"O servidor deve ser iniciado por um usuário sem privilégios para previnir\n"
+"possíveis comprometimentos de segurança no sistema. Veja a documentação "
+"para\n"
+"obter informações adicionais sobre como iniciar o servidor corretamente.\n"
 
-#: access/transam/xlog.c:4148
+#: main/main.c:388
 #, c-format
-msgid "invalid data in history file: %s"
-msgstr "dado inválido no arquivo de histórico: %s"
-
-#: access/transam/xlog.c:4149
-msgid "Timeline IDs must be in increasing sequence."
-msgstr "IDs de linha do tempo devem ser uma sequência crescente."
+msgid "%s: invalid effective UID: %d\n"
+msgstr "%s: UID efetivo é inválido: %d\n"
 
-#: access/transam/xlog.c:4162
+#: main/main.c:401
 #, c-format
-msgid "invalid data in history file \"%s\""
-msgstr "dado inválido no arquivo de histórico \"%s\""
+msgid "%s: could not determine user name (GetUserName failed)\n"
+msgstr "%s: não pôde determinar nome de usuário (GetUserName falhou)\n"
 
-#: access/transam/xlog.c:4163
-msgid "Timeline IDs must be less than child timeline's ID."
-msgstr ""
-"IDs de linha do tempo devem ser menores do que ID de linha do tempo "
-"descendente."
+#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
+#: tsearch/ts_parse.c:568
+msgid "word is too long to be indexed"
+msgstr "palavra é muito longa para ser indexada"
 
-#: access/transam/xlog.c:4422
+#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
+#: tsearch/ts_parse.c:569
 #, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "não pôde vincular arquivo \"%s\" a \"%s\": %m"
+msgid "Words longer than %d characters are ignored."
+msgstr "Palavras maiores do que %d caracteres são ignoradas."
 
-#: access/transam/xlog.c:4511
+#: tsearch/to_tsany.c:165 utils/adt/tsvector.c:272 utils/adt/tsvector_op.c:530
 #, c-format
-msgid "could not create control file \"%s\": %m"
-msgstr "não pôde criar arquivo de controle \"%s\": %m"
+msgid "string is too long for tsvector (%d bytes, max %d bytes)"
+msgstr ""
+"cadeia de caracteres é muito longa para tsvector (%d bytes, máximo de %d "
+"bytes)"
+
+#: tsearch/dict_simple.c:50 tsearch/dict_ispell.c:75
+#: snowball/dict_snowball.c:206
+msgid "multiple StopWords parameters"
+msgstr "múltiplos parâmetros StopWords"
+
+#: tsearch/dict_simple.c:59
+msgid "multiple Accept parameters"
+msgstr "múltiplos parâmetros Accept"
 
-#: access/transam/xlog.c:4522 access/transam/xlog.c:4747
+#: tsearch/dict_simple.c:67
 #, c-format
-msgid "could not write to control file: %m"
-msgstr "não pôde escrever em arquivo de controle: %m"
+msgid "unrecognized simple dictionary parameter: \"%s\""
+msgstr "parâmetro desconhecido do dicionário simples: \"%s\""
 
-#: access/transam/xlog.c:4528 access/transam/xlog.c:4753
+#: tsearch/ts_utils.c:53
 #, c-format
-msgid "could not fsync control file: %m"
-msgstr "não pôde executar fsync no arquivo de controle: %m"
+msgid "invalid text search configuration file name \"%s\""
+msgstr "nome de arquivo de configuração de busca textual \"%s\" é inválido"
 
-#: access/transam/xlog.c:4533 access/transam/xlog.c:4758
+#: tsearch/ts_utils.c:91
 #, c-format
-msgid "could not close control file: %m"
-msgstr "não pôde fechar arquivo de controle: %m"
+msgid "could not open stop-word file \"%s\": %m"
+msgstr "não pôde abrir arquivo de palavras ignoradas \"%s\": %m"
 
-#: access/transam/xlog.c:4551 access/transam/xlog.c:4736
+#: tsearch/dict_synonym.c:119
 #, c-format
-msgid "could not open control file \"%s\": %m"
-msgstr "não pôde abrir arquivo de controle \"%s\": %m"
+msgid "unrecognized synonym parameter: \"%s\""
+msgstr "parâmetro desconhecido do dicionário de sinônimos: \"%s\""
+
+#: tsearch/dict_synonym.c:126
+msgid "missing Synonyms parameter"
+msgstr "faltando parâmetro Synonyms"
 
-#: access/transam/xlog.c:4557
+#: tsearch/dict_synonym.c:133
 #, c-format
-msgid "could not read from control file: %m"
-msgstr "não pôde ler do arquivo de controle: %m"
+msgid "could not open synonym file \"%s\": %m"
+msgstr "não pôde abrir arquivo de sinônimos \"%s\": %m"
+
+#: tsearch/dict_ispell.c:53 tsearch/dict_thesaurus.c:615
+msgid "multiple DictFile parameters"
+msgstr "múltiplos parâmetros DictFile"
 
-#: access/transam/xlog.c:4571
+#: tsearch/dict_ispell.c:64
+msgid "multiple AffFile parameters"
+msgstr "múltiplos parâmetros AffFile"
+
+#: tsearch/dict_ispell.c:83
 #, c-format
-msgid ""
-"The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), "
-"but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com PG_CONTROL_VERSION %d "
-"(0x%08x), mas o servidor foi compilado com PG_CONTROL_VERSION %d (0x%08x)."
+msgid "unrecognized Ispell parameter: \"%s\""
+msgstr "parâmetro desconhecido do Ispell: \"%s\""
 
-#: access/transam/xlog.c:4575
-msgid ""
-"This could be a problem of mismatched byte ordering.  It looks like you need "
-"to initdb."
-msgstr ""
-"Isto pode ser um problema com ordenação dos bits. Parece que você precisa "
-"executar o initdb."
+#: tsearch/dict_ispell.c:97
+msgid "missing AffFile parameter"
+msgstr "faltando parâmetro AffFile"
+
+#: tsearch/dict_ispell.c:103 tsearch/dict_thesaurus.c:639
+msgid "missing DictFile parameter"
+msgstr "faltando parâmetro DictFile"
 
-#: access/transam/xlog.c:4580
+#: tsearch/wparser_def.c:2551
 #, c-format
-msgid ""
-"The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
-"server was compiled with PG_CONTROL_VERSION %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com PG_CONTROL_VERSION %d, "
-"mas o servidor foi compilado com PG_CONTROL_VERSION %d."
+msgid "unrecognized headline parameter: \"%s\""
+msgstr "parâmetro de destaque desconhecido: \"%s\""
 
-#: access/transam/xlog.c:4583 access/transam/xlog.c:4607
-#: access/transam/xlog.c:4614 access/transam/xlog.c:4619
-msgid "It looks like you need to initdb."
-msgstr "Parece que você precisa executar o initdb."
+#: tsearch/wparser_def.c:2560
+msgid "MinWords should be less than MaxWords"
+msgstr "MinWords deve ser menor do que MaxWords"
 
-#: access/transam/xlog.c:4594
-msgid "incorrect checksum in control file"
-msgstr "soma de verificação está incorreta em arquivo de controle"
+#: tsearch/wparser_def.c:2564
+msgid "MinWords should be positive"
+msgstr "MinWords deve ser positivo"
+
+#: tsearch/wparser_def.c:2568
+msgid "ShortWord should be >= 0"
+msgstr "ShortWord deve ser >= 0"
+
+#: tsearch/wparser_def.c:2572
+msgid "MaxFragments should be >= 0"
+msgstr "MaxFragments deve ser >= 0"
 
-#: access/transam/xlog.c:4604
+#: tsearch/spell.c:276
 #, c-format
-msgid ""
-"The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
-"server was compiled with CATALOG_VERSION_NO %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com CATALOG_VERSION_NO %d, "
-"mas o servidor foi compilado com CATALOG_VERSION_NO %d."
+msgid "could not open dictionary file \"%s\": %m"
+msgstr "não pôde abrir arquivo de dicionário \"%s\": %m"
 
-#: access/transam/xlog.c:4611
+#: tsearch/spell.c:439 utils/adt/regexp.c:195
 #, c-format
-msgid ""
-"The database cluster was initialized with MAXALIGN %d, but the server was "
-"compiled with MAXALIGN %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com MAXALIGN %d, mas o "
-"servidor foi compilado com MAXALIGN %d."
+msgid "invalid regular expression: %s"
+msgstr "expressão regular inválida: %s"
 
-#: access/transam/xlog.c:4618
-msgid ""
-"The database cluster appears to use a different floating-point number format "
-"than the server executable."
-msgstr ""
-"O agrupamento de banco de dados parece utilizar um formato de número de "
-"ponto flutuante diferente do executável do servidor."
+#: tsearch/spell.c:518 tsearch/spell.c:535 tsearch/spell.c:552
+#: tsearch/spell.c:569 tsearch/spell.c:591 gram.y:12477 gram.y:12494
+msgid "syntax error"
+msgstr "erro de sintaxe"
 
-#: access/transam/xlog.c:4623
+#: tsearch/spell.c:596 tsearch/spell.c:842 tsearch/spell.c:862
+msgid "multibyte flag character is not allowed"
+msgstr "caractere marcador multibyte não é permitido"
+
+#: tsearch/spell.c:629 tsearch/spell.c:687 tsearch/spell.c:780
 #, c-format
-msgid ""
-"The database cluster was initialized with BLCKSZ %d, but the server was "
-"compiled with BLCKSZ %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com BLCSZ %d, mas o "
-"servidor foi compilado com BLCSZ %d."
+msgid "could not open affix file \"%s\": %m"
+msgstr "não pôde abrir arquivo de afixos \"%s\": %m"
 
-#: access/transam/xlog.c:4626 access/transam/xlog.c:4633
-#: access/transam/xlog.c:4640 access/transam/xlog.c:4647
-#: access/transam/xlog.c:4654 access/transam/xlog.c:4661
-#: access/transam/xlog.c:4668 access/transam/xlog.c:4676
-#: access/transam/xlog.c:4683 access/transam/xlog.c:4692
-#: access/transam/xlog.c:4699 access/transam/xlog.c:4708
-#: access/transam/xlog.c:4715
-msgid "It looks like you need to recompile or initdb."
-msgstr "Parece que você precisa recompilar ou executar o initdb."
+#: tsearch/spell.c:675
+msgid "Ispell dictionary supports only default flag value"
+msgstr "dicionário Ispell suporta somente valor de marcador padrão"
 
-#: access/transam/xlog.c:4630
-#, c-format
-msgid ""
-"The database cluster was initialized with RELSEG_SIZE %d, but the server was "
-"compiled with RELSEG_SIZE %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com RELSEG_SIZE %d, mas o "
-"servidor foi compilado com RELSEG_SIZE %d."
+#: tsearch/spell.c:873
+msgid "wrong affix file format for flag"
+msgstr "formato de arquivo de afixos incorreto para marcador"
 
-#: access/transam/xlog.c:4637
-#, c-format
-msgid ""
-"The database cluster was initialized with XLOG_BLCKSZ %d, but the server was "
-"compiled with XLOG_BLCKSZ %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com XLOG_BLCSZ %d, mas o "
-"servidor foi compilado com XLOG_BLCSZ %d."
+#: tsearch/wparser.c:314
+msgid "text search parser does not support headline creation"
+msgstr "analisador de busca textual não suporta a criação de destaques"
 
-#: access/transam/xlog.c:4644
+#: tsearch/ts_locale.c:177
 #, c-format
-msgid ""
-"The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
-"was compiled with XLOG_SEG_SIZE %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com XLOG_SEG_SIZE %d, mas o "
-"servidor foi compilado com XLOG_SEG_SIZE %d."
+msgid "line %d of configuration file \"%s\": \"%s\""
+msgstr "linha %d do arquivo de configuração \"%s\": \"%s\""
 
-#: access/transam/xlog.c:4651
+#: tsearch/ts_locale.c:182 libpq/hba.c:781 libpq/hba.c:797 libpq/hba.c:833
+#: libpq/hba.c:855 libpq/hba.c:864 libpq/hba.c:887 libpq/hba.c:899
+#: libpq/hba.c:912 libpq/hba.c:927 libpq/hba.c:982 libpq/hba.c:1002
+#: libpq/hba.c:1016 libpq/hba.c:1033 libpq/hba.c:1046 libpq/hba.c:1062
+#: libpq/hba.c:1077 libpq/hba.c:1119 libpq/hba.c:1151 libpq/hba.c:1162
+#: libpq/hba.c:1182 libpq/hba.c:1193 libpq/hba.c:1204 libpq/hba.c:1221
+#: libpq/hba.c:1242 libpq/hba.c:1272 libpq/hba.c:1284 libpq/hba.c:1297
+#: libpq/hba.c:1331 libpq/hba.c:1405 libpq/hba.c:1423 libpq/hba.c:1444
+#: libpq/hba.c:1475 libpq/hba.c:1485
 #, c-format
-msgid ""
-"The database cluster was initialized with NAMEDATALEN %d, but the server was "
-"compiled with NAMEDATALEN %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com NAMEDATALEN %d, mas o "
-"servidor foi compilado com NAMEDATALEN %d."
+msgid "line %d of configuration file \"%s\""
+msgstr "linha %d do arquivo de configuração \"%s\""
 
-#: access/transam/xlog.c:4658
+#: tsearch/ts_locale.c:302
 #, c-format
-msgid ""
-"The database cluster was initialized with INDEX_MAX_KEYS %d, but the server "
-"was compiled with INDEX_MAX_KEYS %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com INDEX_MAX_KEYS %d, mas "
-"o servidor foi compilado com INDEX_MAX_KEYS %d."
+msgid "conversion from wchar_t to server encoding failed: %m"
+msgstr "conversão do wchar_t para codificação do servidor falhou: %m"
 
-#: access/transam/xlog.c:4665
+#: tsearch/dict_thesaurus.c:180
 #, c-format
-msgid ""
-"The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the "
-"server was compiled with TOAST_MAX_CHUNK_SIZE %d."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com TOAST_MAX_CHUNK_SIZE "
-"%d, mas o servidor foi compilado com TOAST_MAX_CHUNK_SIZE %d."
+msgid "could not open thesaurus file \"%s\": %m"
+msgstr "não pôde abrir arquivo de tesauros \"%s\": %m"
 
-#: access/transam/xlog.c:4674
-msgid ""
-"The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
-"server was compiled with HAVE_INT64_TIMESTAMP."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado sem HAVE_INT64_TIMESTAMP "
-"mas o servidor foi compilado com HAVE_INT64_TIMESTAMP."
+#: tsearch/dict_thesaurus.c:213
+msgid "unexpected delimiter"
+msgstr "delimitador inesperado"
 
-#: access/transam/xlog.c:4681
-msgid ""
-"The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
-"server was compiled without HAVE_INT64_TIMESTAMP."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado com HAVE_INT64_TIMESTAMP "
-"mas o servidor foi compilado sem HAVE_INT64_TIMESTAMP."
+#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
+msgid "unexpected end of line or lexeme"
+msgstr "fim de linha ou lexema inesperado"
 
-#: access/transam/xlog.c:4690
-msgid ""
-"The database cluster was initialized without USE_FLOAT4_BYVAL but the server "
-"was compiled with USE_FLOAT4_BYVAL."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado sem USE_FLOAT4_BYVAL, mas o "
-"servidor foi compilado com USE_FLOAT4_BYVAL."
+#: tsearch/dict_thesaurus.c:288
+msgid "unexpected end of line"
+msgstr "fim de linha inesperado"
 
-#: access/transam/xlog.c:4697
+#: tsearch/dict_thesaurus.c:412
+#, c-format
 msgid ""
-"The database cluster was initialized with USE_FLOAT4_BYVAL but the server "
-"was compiled without USE_FLOAT4_BYVAL."
+"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
 msgstr ""
-"O agrupamento de banco de dados foi inicializado com USE_FLOAT4_BYVAL, mas o "
-"servidor foi compilado sem USE_FLOAT4_BYVAL."
+"palavra amostrada do tesauro \"%s\" não é reconhecida pelo sub-dicionário "
+"(regra %d)"
 
-#: access/transam/xlog.c:4706
-msgid ""
-"The database cluster was initialized without USE_FLOAT8_BYVAL but the server "
-"was compiled with USE_FLOAT8_BYVAL."
-msgstr ""
-"O agrupamento de banco de dados foi inicializado sem USE_FLOAT8_BYVAL, mas o "
-"servidor foi compilado com USE_FLOAT8_BYVAL."
+#: tsearch/dict_thesaurus.c:418
+#, c-format
+msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
+msgstr "palavra amostrada do tesauro \"%s\" é uma palavra ignorada (regra %d)"
 
-#: access/transam/xlog.c:4713
-msgid ""
-"The database cluster was initialized with USE_FLOAT8_BYVAL but the server "
-"was compiled without USE_FLOAT8_BYVAL."
+#: tsearch/dict_thesaurus.c:421
+msgid "Use \"?\" to represent a stop word within a sample phrase."
 msgstr ""
-"O agrupamento de banco de dados foi inicializado com USE_FLOAT8_BYVAL, mas o "
-"servidor foi compilado sem USE_FLOAT8_BYVAL."
-
-#: access/transam/xlog.c:4956
-#, c-format
-msgid "could not write bootstrap transaction log file: %m"
-msgstr "não pôde escrever no arquivo inicial de log de transação: %m"
+"Utilize \"?\" para representar uma palavra ignorada dentro de uma frase "
+"amostrada."
 
-#: access/transam/xlog.c:4962
+#: tsearch/dict_thesaurus.c:567
 #, c-format
-msgid "could not fsync bootstrap transaction log file: %m"
-msgstr "não pôde executar fsync no arquivo inicial de log de transação: %m"
+msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
+msgstr "palavra substituta do tesauro \"%s\" é uma palavra ignorada (regra %d)"
 
-#: access/transam/xlog.c:4967
+#: tsearch/dict_thesaurus.c:574
 #, c-format
-msgid "could not close bootstrap transaction log file: %m"
-msgstr "não pôde fechar arquivo inicial de log de transação: %m"
+msgid ""
+"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
+msgstr ""
+"palavra substituta do tesauro \"%s\" não é reconhecida pelo sub-dicionário "
+"(regra %d)"
 
-#: access/transam/xlog.c:5129
+#: tsearch/dict_thesaurus.c:586
 #, c-format
-msgid "could not open recovery command file \"%s\": %m"
-msgstr "não pôde abrir arquivo de comando de recuperação \"%s\": %m"
+msgid "thesaurus substitute phrase is empty (rule %d)"
+msgstr "frase substituta do tesauro está vazia (regra %d)"
 
-#: access/transam/xlog.c:5153
-#, c-format
-msgid "restore_command = '%s'"
-msgstr "restore_command = '%s'"
+#: tsearch/dict_thesaurus.c:624
+msgid "multiple Dictionary parameters"
+msgstr "múltiplos parâmetros Dictionary"
 
-#: access/transam/xlog.c:5160
+#: tsearch/dict_thesaurus.c:631
 #, c-format
-msgid "recovery_end_command = '%s'"
-msgstr "recovery_end_command = '%s'"
+msgid "unrecognized Thesaurus parameter: \"%s\""
+msgstr "parâmetro desconhecido do dicionário de tesauros: \"%s\""
 
-#: access/transam/xlog.c:5167
-#, c-format
-msgid "archive_cleanup_command = '%s'"
-msgstr "archive_cleanup_command = '%s'"
+#: tsearch/dict_thesaurus.c:643
+msgid "missing Dictionary parameter"
+msgstr "faltando parâmetro Dictionary"
 
-#: access/transam/xlog.c:5181
+#: port/pg_sema.c:114 port/sysv_sema.c:114
 #, c-format
-msgid "recovery_target_timeline is not a valid number: \"%s\""
-msgstr "recovery_target_timeline não é um número válido: \"%s\""
+msgid "could not create semaphores: %m"
+msgstr "não pôde criar semáforos: %m"
 
-#: access/transam/xlog.c:5186
+#: port/pg_sema.c:115 port/sysv_sema.c:115
 #, c-format
-msgid "recovery_target_timeline = %u"
-msgstr "recovery_target_timeline = %u"
-
-#: access/transam/xlog.c:5189
-msgid "recovery_target_timeline = latest"
-msgstr "recovery_target_timeline = latest"
+msgid "Failed system call was semget(%lu, %d, 0%o)."
+msgstr "Falhou ao executar chamada de sistema semget(%lu, %d, 0%o)."
 
-#: access/transam/xlog.c:5197
-#, c-format
-msgid "recovery_target_xid is not a valid number: \"%s\""
-msgstr "recovery_target_xid não é um número válido: \"%s\""
+#: port/pg_sema.c:119 port/sysv_sema.c:119
+msgid ""
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"when either the system limit for the maximum number of semaphore sets "
+"(SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be "
+"exceeded.  You need to raise the respective kernel parameter.  "
+"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
+"max_connections parameter.\n"
+"The PostgreSQL documentation contains more information about configuring "
+"your system for PostgreSQL."
+msgstr ""
+"Esse erro *não* significa que você está sem espaço no disco. Isso ocorre "
+"quando o número máximo de conjuntos de semáforos (SEMMNI) atinge o limite do "
+"sistema ou o sistema atinge o número máximo de semáforos (SEMMNS). Você "
+"precisa aumentar o parâmetro do kernel que trata disso. Alternativamente, "
+"reduza o consumo de semáforos do PostgreSQL reduzindo o parâmetro "
+"max_connections.\n"
+"A documentação do PostgreSQL contém informações adicionais sobre como "
+"configurar seu sistema para PostgreSQL."
 
-#: access/transam/xlog.c:5200
+#: port/pg_sema.c:146 port/sysv_sema.c:146
 #, c-format
-msgid "recovery_target_xid = %u"
-msgstr "recovery_target_xid = %u"
+msgid ""
+"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
+"Look into the PostgreSQL documentation for details."
+msgstr ""
+"Você possivelmente precisa aumentar o valor SEMVMX do kernel para pelo menos "
+"%d.  Veja na documentação do PostgreSQL para obter detalhes."
 
-#: access/transam/xlog.c:5223
+#: port/pg_shmem.c:147 port/sysv_shmem.c:147
 #, c-format
-msgid "recovery_target_time = '%s'"
-msgstr "recovery_target_time = '%s'"
+msgid "could not create shared memory segment: %m"
+msgstr "não pôde criar segmento de memória compartilhada: %m"
 
-#: access/transam/xlog.c:5236
+#: port/pg_shmem.c:148 port/sysv_shmem.c:148
 #, c-format
-msgid "recovery_target_inclusive = %s"
-msgstr "recovery_target_inclusive = %s"
+msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
+msgstr "Falhou ao executar chamada de sistema shmget(key=%lu, size=%lu, 0%o)."
 
-#: access/transam/xlog.c:5245
+#: port/pg_shmem.c:152 port/sysv_shmem.c:152
 #, c-format
-msgid "standby_mode = '%s'"
-msgstr "standby_mode = '%s'"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
+"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
+"request size (currently %lu bytes), reduce PostgreSQL's shared memory usage, "
+"perhaps by reducing shared_buffers or max_connections.\n"
+"If the request size is already small, it's possible that it is less than "
+"your kernel's SHMMIN parameter, in which case raising the request size or "
+"reconfiguring SHMMIN is called for.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Esse erro usualmente significa que a requisição do PostgreSQL por segmento "
+"de memória compartilhada excedeu o parâmetro do kernel SHMMAX. Você pode "
+"reduzir o tamanho requisitado ou configurar o kernel novamente com um valor "
+"maior de SHMMAX. Para reduzir o tamanho requisitado (atualmente %lu bytes), "
+"reduza o uso de memória compartilhada pelo PostgreSQL, talvez reduzindo "
+"shared_buffers ou max_connections.\n"
+"Se o tamanho requisitado já está pequeno, é possível que ele seja menor do "
+"que o parâmetro SHMMIN do kernel, nesse caso aumente o tamanho da requisição "
+"ou configure SHMMIN novamente.\n"
+"A documentação do PostgreSQL contém informações adicionais sobre "
+"configuração de memória compartilhada."
 
-#: access/transam/xlog.c:5251
+#: port/pg_shmem.c:165 port/sysv_shmem.c:165
 #, c-format
-msgid "primary_conninfo = '%s'"
-msgstr "primary_conninfo = '%s'"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory "
+"segment exceeded available memory or swap space, or exceeded your kernel's "
+"SHMALL parameter.  You can either reduce the request size or reconfigure the "
+"kernel with larger SHMALL.  To reduce the request size (currently %lu "
+"bytes), reduce PostgreSQL's shared memory usage, perhaps by reducing "
+"shared_buffers or max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Esse erro usualmente significa que a requisição do PostgreSQL por segmento "
+"de memória compartilhada excedeu a memória ou espaço de swap disponível, ou "
+"excedeu o parâmetro SHMALL do kernel. Para reduzir o tamanho requisitado "
+"(atualmente %lu bytes), reduza o uso de memória compartilhada pelo "
+"PostgreSQL, talvez reduzindo shared_buffers ou max_connections.\n"
+"A documentação do PostgreSQL contém informações adicionais sobre "
+"configuração de memória compartilhada."
 
-#: access/transam/xlog.c:5258
+#: port/pg_shmem.c:176 port/sysv_shmem.c:176
 #, c-format
-msgid "trigger_file = '%s'"
-msgstr "trigger_file = '%s'"
+msgid ""
+"This error does *not* mean that you have run out of disk space.  It occurs "
+"either if all available shared memory IDs have been taken, in which case you "
+"need to raise the SHMMNI parameter in your kernel, or because the system's "
+"overall limit for shared memory has been reached.  If you cannot increase "
+"the shared memory limit, reduce PostgreSQL's shared memory request "
+"(currently %lu bytes), perhaps by reducing shared_buffers or "
+"max_connections.\n"
+"The PostgreSQL documentation contains more information about shared memory "
+"configuration."
+msgstr ""
+"Esse erro *não* significa que você está sem espaço em disco. Isso ocorre se "
+"todos os IDs de memória compartilhadas estão sendo usados, neste caso você "
+"precisa aumentar o parâmetro SHMMNI do seu kernel, ou porque o limite do "
+"sistema para memória compartilhada foi alcançado. Se você não pode aumentar "
+"o limite de memória compartilhada, reduza o tamanho de memória compartilhada "
+"requisitada pelo PostgreSQL (atualmente %lu bytes), talvez reduzindo "
+"shared_buffers ou max_connections.\n"
+"A documentação do PostgreSQL contém informações adicionais sobre "
+"configuração de memória compartilhada."
 
-#: access/transam/xlog.c:5263
+#: port/pg_shmem.c:439 port/sysv_shmem.c:439
 #, c-format
-msgid "unrecognized recovery parameter \"%s\""
-msgstr "parâmetro de recuperação \"%s\" desconhecido"
+msgid "could not stat data directory \"%s\": %m"
+msgstr "não pôde executar stat no diretório de dados \"%s\": %m"
 
-#: access/transam/xlog.c:5271
+#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
 #, c-format
-msgid "syntax error in recovery command file: %s"
-msgstr "erro de sintaxe no arquivo de comando de recuperação: %s"
-
-#: access/transam/xlog.c:5273
-msgid "Lines should have the format parameter = 'value'."
-msgstr "Linhas devem ter o formato parâmetro = 'valor'."
+msgid "could not create shared memory segment: %lu"
+msgstr "não pôde criar segmento de memória compartilhada: %lu"
 
-#: access/transam/xlog.c:5282
+#: port/win32_shmem.c:169
 #, c-format
-msgid ""
-"recovery command file \"%s\" specified neither primary_conninfo nor "
-"restore_command"
+msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
 msgstr ""
-"arquivo de comando de recuperação \"%s\" não especificou primary_conninfo ou "
-"restore_command"
+"Falhou ao executar chamada de sistema CreateFileMapping(size=%lu, name=%s)."
 
-#: access/transam/xlog.c:5284
-#, fuzzy
-msgid ""
-"The database server will regularly poll the pg_xlog subdirectory to check "
-"for files placed there."
-msgstr ""
-"O servidor de banco de dados acessará regularmente o subdiretório pg_xlog para verificar por arquivos ali presentes."
+#: port/win32_shmem.c:193
+msgid "pre-existing shared memory block is still in use"
+msgstr "bloco de memória compartilhada pré-existente ainda está em uso"
 
-#: access/transam/xlog.c:5290
-#, fuzzy, c-format
+#: port/win32_shmem.c:194
 msgid ""
-"recovery command file \"%s\" must specify restore_command when standby mode "
-"is not enabled"
+"Check if there are any old server processes still running, and terminate "
+"them."
 msgstr ""
-"arquivo do comando de recuperação \"%s\" deve especificar restore_command "
-"quando modo em espera não estiver habilitado"
+"Verifique se ainda há processos servidor antigos sendo executados, e termine-"
+"os."
 
-#: access/transam/xlog.c:5310
-#, c-format
-msgid "recovery target timeline %u does not exist"
-msgstr "linha do tempo para recuperação %u não existe"
+#: port/win32_shmem.c:204
+msgid "Failed system call was DuplicateHandle."
+msgstr "Falhou ao executar chamada de sistema DuplicateHandle."
 
-#: access/transam/xlog.c:5435
-msgid "archive recovery complete"
-msgstr "recuperação do archive está completa"
+#: port/win32_shmem.c:225
+msgid "Failed system call was MapViewOfFileEx."
+msgstr "Falhou ao executar chamada de sistema MapViewOfFileEx."
 
-#: access/transam/xlog.c:5525
+#: port/win32_sema.c:94
 #, c-format
-msgid "recovery stopping after commit of transaction %u, time %s"
-msgstr "recuperação parada após efetivação da transação %u, tempo %s"
+msgid "could not create semaphore: error code %d"
+msgstr "não pôde criar semáforo: código de erro %d"
 
-#: access/transam/xlog.c:5530
+#: port/win32_sema.c:161
 #, c-format
-msgid "recovery stopping before commit of transaction %u, time %s"
-msgstr "recuperação parada antes da efetivação da transação %u, tempo %s"
+msgid "could not lock semaphore: error code %d"
+msgstr "não pôde bloquear semáforo: código de erro %d"
 
-#: access/transam/xlog.c:5538
+#: port/win32_sema.c:174
 #, c-format
-msgid "recovery stopping after abort of transaction %u, time %s"
-msgstr "recuperação parada após interrupção da transação %u, tempo %s"
+msgid "could not unlock semaphore: error code %d"
+msgstr "não pôde desbloquear semáforo: código de erro %d"
 
-#: access/transam/xlog.c:5543
+#: port/win32_sema.c:203
 #, c-format
-msgid "recovery stopping before abort of transaction %u, time %s"
-msgstr "recuperação parada antes interrupção da transação %u, tempo %s"
+msgid "could not try-lock semaphore: error code %d"
+msgstr "não pôde tentar bloquear semáforo: código de erro %d"
 
-#: access/transam/xlog.c:5626
-#, fuzzy, c-format
-msgid ""
-"hot standby is not possible because %s = %d is a lower setting than on the "
-"master server (its value was %d)"
+#: port/win32/crashdump.c:108
+msgid "could not load dbghelp.dll, cannot write crash dump\n"
 msgstr ""
-"servidor em espera não é possível porque %s = %d é uma configuração mais baixa do que no servidor principal (seu valor era %d)"
-
-#: access/transam/xlog.c:5648
-msgid "WAL was generated with wal_level=minimal, data may be missing"
-msgstr "WAL foi gerado com wal_level=minimal, dados podem estar faltando"
 
-#: access/transam/xlog.c:5649
-#, fuzzy
+#: port/win32/crashdump.c:116
 msgid ""
-"This happens if you temporarily set wal_level=minimal without taking a new "
-"base backup."
+"could not load required functions in dbghelp.dll, cannot write crash dump\n"
 msgstr ""
-"Isso acontece se você temporariamente definir wal_level=minimal sem realizar "
-"uma nova cópia de segurança física."
 
-#: access/transam/xlog.c:5660
-#, fuzzy
-msgid ""
-"hot standby is not possible because wal_level was not set to \"hot_standby\" "
-"on the master server"
-msgstr "servidor em espera não é possível porque wal_level não foi definido para \"hot_standby\" no servidor principal"
+#: port/win32/crashdump.c:147
+#, fuzzy, c-format
+msgid "could not open crash dump file \"%s\" for writing: error code %u\n"
+msgstr "não pôde abrir arquivo \"%s\" para escrita: %m"
 
-#: access/transam/xlog.c:5661
-msgid ""
-"Either set wal_level to \"hot_standby\" on the master, or turn off "
-"hot_standby here."
-msgstr ""
-"Defina wal_level para \"hot_standby\" no primário ou desabilite hot_standby "
-"aqui."
+#: port/win32/crashdump.c:154
+#, fuzzy, c-format
+msgid "wrote crash dump to file \"%s\"\n"
+msgstr "Histórico escrito para arquivo \"%s/%s\".\n"
 
-#: access/transam/xlog.c:5708
-msgid "control file contains invalid data"
-msgstr "arquivo de controle contém dados inválidos"
+#: port/win32/crashdump.c:156
+#, fuzzy, c-format
+msgid "could not write crash dump to file \"%s\": error code %08x\n"
+msgstr "não pôde escrever no arquivo \"%s\": %s\n"
 
-#: access/transam/xlog.c:5712
+#: port/win32/security.c:43
 #, c-format
-msgid "database system was shut down at %s"
-msgstr "sistema de banco de dados foi desligado em %s"
+msgid "could not open process token: error code %d\n"
+msgstr "não pôde abrir informação sobre processo: código de erro %d\n"
 
-#: access/transam/xlog.c:5716
+#: port/win32/security.c:63
 #, c-format
-msgid "database system was shut down in recovery at %s"
-msgstr "sistema de banco de dados foi desligado durante recuperação em %s"
+msgid "could not get SID for Administrators group: error code %d\n"
+msgstr "não pôde obter SID do grupo Administrators: código de erro %d\n"
 
-#: access/transam/xlog.c:5720
+#: port/win32/security.c:72
 #, c-format
-msgid "database system shutdown was interrupted; last known up at %s"
-msgstr ""
-"desligamento do sistema de banco de dados foi interrompido; última execução "
-"em %s"
+msgid "could not get SID for PowerUsers group: error code %d\n"
+msgstr "não pôde obter SID do grupo PowerUsers: código de erro %d\n"
 
-#: access/transam/xlog.c:5724
+#: port/win32/signal.c:189
 #, c-format
-msgid "database system was interrupted while in recovery at %s"
+msgid "could not create signal listener pipe for PID %d: error code %d"
 msgstr ""
-"sistema de banco de dados foi interrompido enquanto estava sendo recuperado "
-"em %s"
+"não pôde criar pipe que espera por sinal para PID %d: código de erro %d"
 
-#: access/transam/xlog.c:5726
-msgid ""
-"This probably means that some data is corrupted and you will have to use the "
-"last backup for recovery."
+#: port/win32/signal.c:269 port/win32/signal.c:301
+#, c-format
+msgid "could not create signal listener pipe: error code %d; retrying\n"
 msgstr ""
-"Isso provavelmente significa que algum dado foi corrompido e você terá que "
-"utilizar o último backup para recuperação."
+"não pôde criar pipe que espera por sinal: código de erro %d; tentando "
+"novamente\n"
 
-#: access/transam/xlog.c:5730
+#: port/win32/signal.c:312
 #, c-format
-msgid "database system was interrupted while in recovery at log time %s"
-msgstr ""
-"sistema de banco de dados foi interrompido enquanto estava sendo recuperado "
-"em %s"
+msgid "could not create signal dispatch thread: error code %d\n"
+msgstr "não pôde criar thread emissor de sinal: código de erro %d\n"
 
-#: access/transam/xlog.c:5732
-msgid ""
-"If this has occurred more than once some data might be corrupted and you "
-"might need to choose an earlier recovery target."
-msgstr ""
-"Se isto ocorreu mais de uma vez algum dado pode ter sido corrompido e você "
-"pode precisar escolher um ponto de recuperação anterior ao especificado."
+#: executor/execQual.c:298 executor/execQual.c:326 executor/execQual.c:2987
+#: utils/adt/array_userfuncs.c:430 utils/adt/arrayfuncs.c:228
+#: utils/adt/arrayfuncs.c:507 utils/adt/arrayfuncs.c:1242
+#: utils/adt/arrayfuncs.c:2915 utils/adt/arrayfuncs.c:4940
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "número de dimensões da matriz (%d) excede o máximo permitido (%d)"
+
+#: executor/execQual.c:311 executor/execQual.c:339
+msgid "array subscript in assignment must not be null"
+msgstr "índice da matriz em atribuição não deve ser nulo"
 
-#: access/transam/xlog.c:5736
+#: executor/execQual.c:635 executor/execQual.c:3905
 #, c-format
-msgid "database system was interrupted; last known up at %s"
-msgstr "sistema de banco de dados foi interrompido; última execução em %s"
+msgid "attribute %d has wrong type"
+msgstr "atributo %d tem tipo incorreto"
 
-#: access/transam/xlog.c:5785
+#: executor/execQual.c:636 executor/execQual.c:3906
 #, c-format
-msgid "requested timeline %u is not a child of database system timeline %u"
-msgstr ""
-"linha do tempo solicitada %u não é descendente da linha do tempo %u do "
-"sistema de banco de dados"
+msgid "Table has type %s, but query expects %s."
+msgstr "Tabela tem tipo %s, mas consulta espera %s."
 
-#: access/transam/xlog.c:5803
-#, fuzzy
-msgid "entering standby mode"
-msgstr "entrando no modo em espera"
+#: executor/execQual.c:700 executor/execQual.c:719 executor/execQual.c:918
+#: executor/nodeModifyTable.c:82 executor/nodeModifyTable.c:92
+#: executor/nodeModifyTable.c:109 executor/nodeModifyTable.c:117
+msgid "table row type and query-specified row type do not match"
+msgstr ""
+"tipo de registro da tabela e tipo de registro especificado na consulta não "
+"correspondem"
 
-#: access/transam/xlog.c:5806
-#, fuzzy, c-format
-msgid "starting point-in-time recovery to XID %u"
-msgstr "iniciando recuperação do arquivador"
+#: executor/execQual.c:701
+#, c-format
+msgid "Table row contains %d attribute, but query expects %d."
+msgid_plural "Table row contains %d attributes, but query expects %d."
+msgstr[0] "Registro da tabela contém %d atributo, mas consulta espera %d."
+msgstr[1] "Registro da tabela contém %d atributos, mas consulta espera %d."
 
-#: access/transam/xlog.c:5810
-#, fuzzy, c-format
-msgid "starting point-in-time recovery to %s"
-msgstr "iniciando recuperação do arquivador"
+#: executor/execQual.c:720 executor/nodeModifyTable.c:93
+#, c-format
+msgid "Table has type %s at ordinal position %d, but query expects %s."
+msgstr "Tabela tem tipo %s na posição ordinal %d, mas consulta espera %s."
 
-#: access/transam/xlog.c:5814
-msgid "starting archive recovery"
-msgstr "iniciando recuperação do arquivador"
+#: executor/execQual.c:919 executor/execQual.c:1519
+#, c-format
+msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
+msgstr ""
+"Armazenamento físico não combina com atributo removido na posição ordinal %d."
 
-#: access/transam/xlog.c:5827 access/transam/xlog.c:5852
+#: executor/execQual.c:1033 executor/execCurrent.c:230
 #, c-format
-msgid "checkpoint record is at %X/%X"
-msgstr "registro do ponto de controle está em %X/%X"
+msgid ""
+"type of parameter %d (%s) does not match that when preparing the plan (%s)"
+msgstr ""
+"tipo de parâmetro %d (%s) não corresponde aquele ao preparar o plano (%s)"
 
-#: access/transam/xlog.c:5834
-msgid "could not locate required checkpoint record"
-msgstr "não pôde localizar registro do ponto de controle requerido"
+#: executor/execQual.c:1045 executor/execCurrent.c:242
+#, c-format
+msgid "no value found for parameter %d"
+msgstr "nenhum valor encontrado para parâmetro %d"
 
-#: access/transam/xlog.c:5835
+#: executor/execQual.c:1198 parser/parse_func.c:91 parser/parse_func.c:323
+#: parser/parse_func.c:640
 #, c-format
+msgid "cannot pass more than %d argument to a function"
+msgid_plural "cannot pass more than %d arguments to a function"
+msgstr[0] "não pode passar mais do que %d argumento para uma função"
+msgstr[1] "não pode passar mais do que %d argumentos para uma função"
+
+#: executor/execQual.c:1387
+msgid "functions and operators can take at most one set argument"
+msgstr ""
+"funções e operadores podem receber no máximo um argumento do tipo conjunto"
+
+#: executor/execQual.c:1437
 msgid ""
-"If you are not restoring from a backup, try removing the file \"%s/"
-"backup_label\"."
+"function returning setof record called in context that cannot accept type "
+"record"
 msgstr ""
-"Se você não está restaurando uma cópia de segurança, tente remover o arquivo "
-"\"%s/backup_label\"."
+"função que retorna setof record foi chamada em um contexto que não pode "
+"aceitar tipo record"
 
-#: access/transam/xlog.c:5862 access/transam/xlog.c:5877
-msgid "could not locate a valid checkpoint record"
-msgstr "não pôde localizar registro do ponto de controle válido"
+#: executor/execQual.c:1492 executor/execQual.c:1508 executor/execQual.c:1518
+msgid "function return row and query-specified return row do not match"
+msgstr ""
+"registro de retorno da função e registro de retorno especificado na consulta "
+"não correspondem"
 
-#: access/transam/xlog.c:5871
+#: executor/execQual.c:1493
 #, c-format
-msgid "using previous checkpoint record at %X/%X"
-msgstr "utilizando registro do ponto de controle anterior em %X/%X"
+msgid "Returned row contains %d attribute, but query expects %d."
+msgid_plural "Returned row contains %d attributes, but query expects %d."
+msgstr[0] "Registro retornado contém %d atributo, mas consulta espera %d."
+msgstr[1] "Registro retornado contém %d atributos, mas consulta espera %d."
 
-#: access/transam/xlog.c:5886
+#: executor/execQual.c:1509
 #, c-format
-msgid "redo record is at %X/%X; shutdown %s"
-msgstr "registro de redo está em %X/%X; desligamento %s"
+msgid "Returned type %s at ordinal position %d, but query expects %s."
+msgstr "Tipo retornado %s na posição ordinal %d, mas consulta espera %s."
 
-#: access/transam/xlog.c:5890
-#, c-format
-msgid "next transaction ID: %u/%u; next OID: %u"
-msgstr "próximo ID de transação: %u/%u; próximo OID: %u"
+#: executor/execQual.c:1745 executor/execQual.c:2170
+msgid "table-function protocol for materialize mode was not followed"
+msgstr "protocolo de função tabular para modo materializado não foi seguido"
 
-#: access/transam/xlog.c:5894
+#: executor/execQual.c:1765 executor/execQual.c:2177
 #, c-format
-msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-msgstr "próximo MultiXactId: %u; próximo MultiXactOffset: %u"
+msgid "unrecognized table-function returnMode: %d"
+msgstr "modo de retorno (returnMode) da função tabular desconhecido: %d"
 
-#: access/transam/xlog.c:5897
-#, fuzzy, c-format
-msgid "oldest unfrozen transaction ID: %u, in database %u"
-msgstr "extensão da relação %u do banco de dados %u"
+#: executor/execQual.c:2087
+msgid "function returning set of rows cannot return null value"
+msgstr "função que retorna conjunto de registros não pode retornar valor nulo"
 
-#: access/transam/xlog.c:5901
-msgid "invalid next transaction ID"
-msgstr "próximo ID de transação é inválido"
+#: executor/execQual.c:2144
+msgid "rows returned by function are not all of the same row type"
+msgstr ""
+"registros retornados pela função não são todos do mesmo tipo de registro"
 
-#: access/transam/xlog.c:5920
-msgid "invalid redo in checkpoint record"
-msgstr "redo é inválido no registro do ponto de controle"
+#: executor/execQual.c:2335
+msgid "IS DISTINCT FROM does not support set arguments"
+msgstr "IS DISTINCT FROM não suporta conjunto de argumentos"
 
-#: access/transam/xlog.c:5931
-msgid "invalid redo record in shutdown checkpoint"
-msgstr "registro de redo é inválido no ponto de controle de desligamento"
+#: executor/execQual.c:2412
+msgid "op ANY/ALL (array) does not support set arguments"
+msgstr "op ANY/ALL (array) não suporta conjunto de argumentos"
+
+#: executor/execQual.c:2965
+msgid "cannot merge incompatible arrays"
+msgstr "não pode mesclar matrizes incompatíveis"
 
-#: access/transam/xlog.c:5961
+#: executor/execQual.c:2966
+#, c-format
 msgid ""
-"database system was not properly shut down; automatic recovery in progress"
+"Array with element type %s cannot be included in ARRAY construct with "
+"element type %s."
 msgstr ""
-"sistema de banco de dados não foi desligado corretamente; recuperação "
-"automática está em andamento"
+"Matriz com tipo de elemento %s não pode ser incluído em uma construção ARRAY "
+"com tipo de elemento %s."
 
-#: access/transam/xlog.c:6026
-#, fuzzy
-msgid "initializing for hot standby"
-msgstr "inicialização para servidor em espera"
+#: executor/execQual.c:3007 executor/execQual.c:3034
+#: utils/adt/arrayfuncs.c:542
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"matrizes multidimensionais devem ter expressões de matriz com dimensões "
+"correspondentes"
 
-#: access/transam/xlog.c:6153
-#, c-format
-msgid "redo starts at %X/%X"
-msgstr "redo inicia em %X/%X"
+#: executor/execQual.c:3549
+msgid "NULLIF does not support set arguments"
+msgstr "NULLIF não suporta conjunto de argumentos"
 
-#: access/transam/xlog.c:6252
+#: executor/execQual.c:3779 utils/adt/domains.c:128
 #, c-format
-msgid "redo done at %X/%X"
-msgstr "redo pronto em %X/%X"
+msgid "domain %s does not allow null values"
+msgstr "domínio %s não permite valores nulos"
 
-#: access/transam/xlog.c:6257 access/transam/xlog.c:7726
+#: executor/execQual.c:3808 utils/adt/domains.c:164
 #, c-format
-msgid "last completed transaction was at log time %s"
-msgstr "última transação efetivada foi em %s"
+msgid "value for domain %s violates check constraint \"%s\""
+msgstr "valor para domínio %s viola restrição de verificação \"%s\""
 
-#: access/transam/xlog.c:6265
-msgid "redo is not required"
-msgstr "redo não é requerido"
+#: executor/execQual.c:4288 parser/parse_agg.c:164
+#: optimizer/util/clauses.c:573
+msgid "aggregate function calls cannot be nested"
+msgstr "chamadas de função de agregação não podem ser aninhadas"
 
-#: access/transam/xlog.c:6305
-msgid "requested recovery stop point is before consistent recovery point"
-msgstr ""
-"ponto de parada de recuperação solicitado está antes do ponto de recuperação "
-"consistente"
+#: executor/execQual.c:4326 parser/parse_agg.c:211
+#: optimizer/util/clauses.c:647
+msgid "window function calls cannot be nested"
+msgstr "chamadas de função deslizante não podem ser aninhadas"
 
-#: access/transam/xlog.c:6308
-msgid "WAL ends before consistent recovery point"
-msgstr "Log de transação termina antes de ponto de recuperação consistente"
+#: executor/execQual.c:4538
+msgid "target type is not an array"
+msgstr "tipo alvo não é uma matriz"
 
-#: access/transam/xlog.c:6329
+#: executor/execQual.c:4651
 #, c-format
-msgid "selected new timeline ID: %u"
-msgstr "novo ID de linha do tempo selecionado: %u"
+msgid "ROW() column has type %s instead of type %s"
+msgstr "coluna ROW() tem tipo %s ao invés do tipo %s"
 
-#: access/transam/xlog.c:6565
+#: executor/execQual.c:4786 utils/adt/rowtypes.c:922
+#: utils/adt/arrayfuncs.c:3378
 #, c-format
-msgid "consistent recovery state reached at %X/%X"
-msgstr "estado de recuperação consistente atingido em %X/%X"
-
-#: access/transam/xlog.c:6691
-msgid "invalid primary checkpoint link in control file"
-msgstr ""
-"vínculo de ponto de controle primário é inválido no arquivo de controle"
+msgid "could not identify a comparison function for type %s"
+msgstr "não pôde identificar uma função de comparação para tipo %s"
 
-#: access/transam/xlog.c:6695
-msgid "invalid secondary checkpoint link in control file"
-msgstr ""
-"vínculo de ponto de controle secundário é inválido no arquivo de controle"
+#: executor/nodeHashjoin.c:814 executor/nodeHashjoin.c:844
+#, c-format
+msgid "could not rewind hash-join temporary file: %m"
+msgstr "não pôde voltar ao início do arquivo temporário de junção por hash: %m"
 
-#: access/transam/xlog.c:6699
-msgid "invalid checkpoint link in backup_label file"
-msgstr "vínculo de ponto de controle é inválido no arquivo backup_label"
+#: executor/nodeHashjoin.c:879 executor/nodeHashjoin.c:885
+#, c-format
+msgid "could not write to hash-join temporary file: %m"
+msgstr "não pôde escrever em arquivo temporário de junção por hash: %m"
 
-#: access/transam/xlog.c:6713
-msgid "invalid primary checkpoint record"
-msgstr "registro do ponto de controle primário é inválido"
+#: executor/nodeHashjoin.c:919 executor/nodeHashjoin.c:929
+#, c-format
+msgid "could not read from hash-join temporary file: %m"
+msgstr "não pôde ler do arquivo temporário de junção por hash: %m"
 
-#: access/transam/xlog.c:6717
-msgid "invalid secondary checkpoint record"
-msgstr "registro do ponto de controle secundário é inválido"
+#: executor/execUtils.c:1305
+#, c-format
+msgid "could not create exclusion constraint \"%s\""
+msgstr "não pôde criar restrição de exclusão \"%s\""
 
-#: access/transam/xlog.c:6721
-msgid "invalid checkpoint record"
-msgstr "registro do ponto de controle é inválido"
+#: executor/execUtils.c:1307
+#, c-format
+msgid "Key %s conflicts with key %s."
+msgstr "Chave %s conflita com chave %s."
 
-#: access/transam/xlog.c:6732
-msgid "invalid resource manager ID in primary checkpoint record"
-msgstr ""
-"ID do gerenciador de recursos é inválido no registro do ponto de controle "
-"primário"
+#: executor/execUtils.c:1312
+#, c-format
+msgid "conflicting key value violates exclusion constraint \"%s\""
+msgstr "conflitar valor da chave viola a restrição de exclusão \"%s\""
 
-#: access/transam/xlog.c:6736
-msgid "invalid resource manager ID in secondary checkpoint record"
-msgstr ""
-"ID do gerenciador de recursos é inválido no registro do ponto de controle "
-"secundário"
+#: executor/execUtils.c:1314
+#, c-format
+msgid "Key %s conflicts with existing key %s."
+msgstr "Chave %s conflita com chave existente %s."
 
-#: access/transam/xlog.c:6740
-msgid "invalid resource manager ID in checkpoint record"
-msgstr ""
-"ID do gerenciador de recursos é inválido no registro do ponto de controle"
+#: executor/spi.c:210
+msgid "transaction left non-empty SPI stack"
+msgstr "transação não deixou pilha SPI vazia"
 
-#: access/transam/xlog.c:6752
-msgid "invalid xl_info in primary checkpoint record"
-msgstr "xl_info é inválido no registro do ponto de controle primário"
+#: executor/spi.c:211 executor/spi.c:275
+msgid "Check for missing \"SPI_finish\" calls."
+msgstr "Verifique a falta de chamadas \"SPI_finish\"."
 
-#: access/transam/xlog.c:6756
-msgid "invalid xl_info in secondary checkpoint record"
-msgstr "xl_info é inválido no registro do ponto de controle secundário"
+#: executor/spi.c:274
+msgid "subtransaction left non-empty SPI stack"
+msgstr "subtransação não deixou pilha SPI vazia"
 
-#: access/transam/xlog.c:6760
-msgid "invalid xl_info in checkpoint record"
-msgstr "xl_info é inválido no registro do ponto de contrle"
+#: executor/spi.c:1137
+msgid "cannot open multi-query plan as cursor"
+msgstr "não pode abrir plano de múltiplas consultas como cursor"
 
-#: access/transam/xlog.c:6772
-msgid "invalid length of primary checkpoint record"
-msgstr "tamanho do registro do ponto de controle primário é inválido"
+#. translator: %s is name of a SQL command, eg INSERT
+#: executor/spi.c:1142
+#, c-format
+msgid "cannot open %s query as cursor"
+msgstr "não pode abrir consulta %s como cursor"
 
-#: access/transam/xlog.c:6776
-msgid "invalid length of secondary checkpoint record"
-msgstr "tamanho do registro do ponto de controle secundário é inválido"
+#: executor/spi.c:1233 parser/analyze.c:2206
+msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE não é suportado"
 
-#: access/transam/xlog.c:6780
-msgid "invalid length of checkpoint record"
-msgstr "tamanho do registro do ponto de controle é inválido"
+#: executor/spi.c:1234 parser/analyze.c:2207
+msgid "Scrollable cursors must be READ ONLY."
+msgstr "Cursores roláveis devem ser READ ONLY."
 
-#: access/transam/xlog.c:6942
-msgid "shutting down"
-msgstr "desligando"
+#. translator: %s is a SQL statement name
+#: executor/spi.c:1256 executor/spi.c:1891 executor/functions.c:302
+#, c-format
+msgid "%s is not allowed in a non-volatile function"
+msgstr "%s não é permitido em uma função não-volátil"
 
-#: access/transam/xlog.c:6964
-msgid "database system is shut down"
-msgstr "sistema de banco de dados está desligado"
+#: executor/spi.c:2157
+#, c-format
+msgid "SQL statement \"%s\""
+msgstr "comando SQL \"%s\""
 
-#: access/transam/xlog.c:7357
-msgid ""
-"concurrent transaction log activity while database system is shutting down"
+#: executor/nodeSubplan.c:301 executor/nodeSubplan.c:340
+#: executor/nodeSubplan.c:962
+msgid "more than one row returned by a subquery used as an expression"
 msgstr ""
-"atividade concorrente no log de transação enquanto o sistema de banco de "
-"dados está sendo desligado"
+"mais de um registro foi retornado por uma subconsulta utilizada como uma "
+"expressão"
 
-#: access/transam/xlog.c:7589
-msgid "skipping restartpoint, recovery has already ended"
-msgstr "ignorando ponto de reinício, recuperação já terminou"
+#: executor/nodeLimit.c:253
+msgid "OFFSET must not be negative"
+msgstr "OFFSET não deve ser negativo"
+
+#: executor/nodeLimit.c:280
+msgid "LIMIT must not be negative"
+msgstr "LIMIT não deve ser negativo"
+
+#: executor/nodeModifyTable.c:83
+msgid "Query has too many columns."
+msgstr "Consulta tem muitas colunas."
 
-#: access/transam/xlog.c:7614
+#: executor/nodeModifyTable.c:110
 #, c-format
-msgid "skipping restartpoint, already performed at %X/%X"
-msgstr "ignorando ponto de reinício, já foi executado em %X/%X"
+msgid "Query provides a value for a dropped column at ordinal position %d."
+msgstr ""
+"Consulta fornece um valor para uma coluna removida na posição ordinal %d."
+
+#: executor/nodeModifyTable.c:118
+msgid "Query has too few columns."
+msgstr "Consulta tem poucas colunas."
 
-#: access/transam/xlog.c:7724
+#: executor/functions.c:195
 #, c-format
-msgid "recovery restart point at %X/%X"
-msgstr "ponto de reinício de recuperação em %X/%X"
+msgid "could not determine actual type of argument declared %s"
+msgstr "não pôde determinar tipo de argumento declarado %s"
 
-#: access/transam/xlog.c:7894
-msgid "online backup was cancelled, recovery cannot continue"
-msgstr ""
-"cópia de segurança online não foi cancelada, recuperação não pode continuar"
+#. translator: %s is a SQL statement name
+#: executor/functions.c:295
+#, c-format
+msgid "%s is not allowed in a SQL function"
+msgstr "%s não é permitido em uma função SQL"
 
-#: access/transam/xlog.c:7946
+#: executor/functions.c:408
 #, c-format
-msgid "unexpected timeline ID %u (after %u) in checkpoint record"
+msgid ""
+"could not determine actual result type for function declared to return type "
+"%s"
 msgstr ""
-"ID de linha do tempo %u inesperado (depois %u) no registro do ponto de "
-"controle"
+"não pôde determinar tipo de resultado para função declarada que retorna tipo "
+"%s"
 
-#: access/transam/xlog.c:7982
+#: executor/functions.c:1146
 #, c-format
-msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
-msgstr ""
-"ID de linha do tempo %u inesperado (deve ser %u) no registro do ponto de "
-"controle"
+msgid "SQL function \"%s\" statement %d"
+msgstr "função SQL \"%s\" comando %d"
 
-#: access/transam/xlog.c:8238 access/transam/xlog.c:8264
+#: executor/functions.c:1172
 #, c-format
-msgid "could not fsync log file %u, segment %u: %m"
-msgstr "não pôde executar fsync no arquivo de log %u, segmento %u: %m"
+msgid "SQL function \"%s\" during startup"
+msgstr "função SQL \"%s\" durante inicialização"
 
-#: access/transam/xlog.c:8272
+#: executor/functions.c:1332 executor/functions.c:1368
+#: executor/functions.c:1380 executor/functions.c:1493
+#: executor/functions.c:1526 executor/functions.c:1556
 #, c-format
-msgid "could not fsync write-through log file %u, segment %u: %m"
+msgid "return type mismatch in function declared to return %s"
+msgstr "tipo de retorno não corresponde com o que foi declarado %s na função"
+
+#: executor/functions.c:1334
+msgid ""
+"Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
 msgstr ""
-"não pôde executar fsync write-through no arquivo de log %u, segmento %u: %m"
+"Último comando da função deve ser um SELECT ou INSERT/UPDATE/DELETE "
+"RETURNING."
+
+#: executor/functions.c:1370
+msgid "Final statement must return exactly one column."
+msgstr "Último comando deve retornar exatamente uma coluna."
 
-#: access/transam/xlog.c:8281
+#: executor/functions.c:1382
 #, c-format
-msgid "could not fdatasync log file %u, segment %u: %m"
-msgstr "não pôde executar fdatasync no arquivo de log %u, segmento %u: %m"
+msgid "Actual return type is %s."
+msgstr "Tipo atual de retorno é %s."
 
-#: access/transam/xlog.c:8324 access/transam/xlog.c:8516
-msgid "must be superuser to run a backup"
-msgstr "deve ser super-usuário para fazer uma cópia de segurança"
+#: executor/functions.c:1495
+msgid "Final statement returns too many columns."
+msgstr "Último comando retornou muitas colunas."
 
-#: access/transam/xlog.c:8329 access/transam/xlog.c:8521
-#: access/transam/xlog.c:8724 access/transam/xlog.c:8752
-#: access/transam/xlog.c:8785 access/transam/xlog.c:8877
-#: access/transam/xlog.c:8952
-msgid "recovery is in progress"
-msgstr "recuperação está em andamento"
+#: executor/functions.c:1528
+#, c-format
+msgid "Final statement returns %s instead of %s at column %d."
+msgstr "Último comando retornou %s ao invés de %s na coluna %d."
 
-#: access/transam/xlog.c:8330 access/transam/xlog.c:8522
-#: access/transam/xlog.c:8725 access/transam/xlog.c:8753
-#: access/transam/xlog.c:8786
-msgid "WAL control functions cannot be executed during recovery."
-msgstr ""
-"funções de controle do WAL não podem ser executadas durante recuperação."
+#: executor/functions.c:1558
+msgid "Final statement returns too few columns."
+msgstr "Último comando retornou poucas colunas."
 
-#: access/transam/xlog.c:8335 access/transam/xlog.c:8527
-msgid "WAL level not sufficient for making an online backup"
-msgstr "nível do WAL não é suficiente para fazer uma cópia de segurança online"
+#: executor/functions.c:1607
+#, c-format
+msgid "return type %s is not supported for SQL functions"
+msgstr "tipo de retorno %s não é suportado pelas funções SQL"
+
+#: executor/execCurrent.c:75
+#, c-format
+msgid "cursor \"%s\" is not a SELECT query"
+msgstr "cursor \"%s\" não é uma consulta SELECT"
+
+#: executor/execCurrent.c:81
+#, c-format
+msgid "cursor \"%s\" is held from a previous transaction"
+msgstr "cursor \"%s\" está aberto de uma transação anterior"
+
+#: executor/execCurrent.c:113
+#, c-format
+msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
+msgstr ""
+"cursor \"%s\" têm múltiplas referências FOR UPDATE/SHARE para tabela \"%s\""
 
-#: access/transam/xlog.c:8336 access/transam/xlog.c:8528
+#: executor/execCurrent.c:122
+#, c-format
 msgid ""
-"wal_level must be set to \"archive\" or \"hot_standby\" at server start."
+"cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
 msgstr ""
-"wal_level deve ser definido com \"archive\" ou \"hot_standby\" ao iniciar o "
-"servidor."
+"cursor \"%s\" não tem uma referência FOR UPDATE/SHARE para tabela \"%s\""
 
-#: access/transam/xlog.c:8363 access/transam/xlog.c:8432
-msgid "a backup is already in progress"
-msgstr "uma cópia de segurança está em andamento"
+#: executor/execCurrent.c:132 executor/execCurrent.c:178
+#, c-format
+msgid "cursor \"%s\" is not positioned on a row"
+msgstr "cursor \"%s\" não está posicionado em um registro"
 
-#: access/transam/xlog.c:8364
-msgid "Run pg_stop_backup() and try again."
-msgstr "Execute pg_stop_backup() e tente novamente."
+#: executor/execCurrent.c:165
+#, c-format
+msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
+msgstr ""
+"cursor \"%s\" não é simplesmente uma busca atualizável da tabela \"%s\""
+
+#: executor/nodeWindowAgg.c:1238
+msgid "frame starting offset must not be null"
+msgstr "deslocamento inicial de quadro não deve ser nulo"
+
+#: executor/nodeWindowAgg.c:1251
+msgid "frame starting offset must not be negative"
+msgstr "deslocamento inicial de quadro não deve ser negativo"
+
+#: executor/nodeWindowAgg.c:1264
+msgid "frame ending offset must not be null"
+msgstr "deslocamento final de quadro não deve ser nulo"
+
+#: executor/nodeWindowAgg.c:1277
+msgid "frame ending offset must not be negative"
+msgstr "deslocamento final de quadro não deve ser negativo"
 
-#: access/transam/xlog.c:8433
+#: executor/nodeWindowAgg.c:1851 executor/nodeAgg.c:1730
 #, c-format
-msgid ""
-"If you're sure there is no backup in progress, remove file \"%s\" and try "
-"again."
+msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
-"Se você tem certeza que não há cópia de segurança em andamento, remova o "
-"arquivo \"%s\" e tente novamente."
+"agregação %u precisa ter tipo de entrada e tipo transitório compatíveis"
 
-#: access/transam/xlog.c:8454 access/transam/xlog.c:8611
+#: executor/execMain.c:996
 #, c-format
-msgid "could not write file \"%s\": %m"
-msgstr "não pôde escrever no arquivo \"%s\": %m"
+msgid "cannot change sequence \"%s\""
+msgstr "não pode mudar sequência \"%s\""
 
-#: access/transam/xlog.c:8550
-msgid "a backup is not in progress"
-msgstr "não há uma cópia de segurança em andamento"
+#: executor/execMain.c:1002
+#, c-format
+msgid "cannot change TOAST relation \"%s\""
+msgstr "não pode mudar relação TOAST \"%s\""
 
-#: access/transam/xlog.c:8562 access/transam/xlog.c:9018
-#: access/transam/xlog.c:9024
+#: executor/execMain.c:1012
 #, c-format
-msgid "invalid data in file \"%s\""
-msgstr "dado inválido no arquivo \"%s\""
+msgid "cannot insert into view \"%s\""
+msgstr "não pode inserir na visão \"%s\""
 
-#: access/transam/xlog.c:8674
+#: executor/execMain.c:1014
 msgid ""
-"pg_stop_backup cleanup done, waiting for required WAL segments to be archived"
+"You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT "
+"trigger."
 msgstr ""
+"Você precisa de uma regra incondicional ON INSERT DO INSTEAD ou um gatilho "
+"INSTEAD OF INSERT."
 
-#: access/transam/xlog.c:8684
+#: executor/execMain.c:1020
 #, c-format
-msgid ""
-"pg_stop_backup still waiting for all required WAL segments to be archived "
-"(%d seconds elapsed)"
-msgstr ""
-"pg_stop_backup ainda está esperando o arquivamento de todos os segmentos do "
-"WAL necessários (%d segundos passados)"
+msgid "cannot update view \"%s\""
+msgstr "não pode atualizar visão \"%s\""
 
-#: access/transam/xlog.c:8686
+#: executor/execMain.c:1022
 msgid ""
-"Check that your archive_command is executing properly.  pg_stop_backup can "
-"be cancelled safely, but the database backup will not be usable without all "
-"the WAL segments."
+"You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE "
+"trigger."
 msgstr ""
-"Verifique se o archive_command está sendo executado normalmente. "
-"pg_stop_backup pode ser cancelado com segurança, mas a cópia de segurança do "
-"banco de dados não será útil sem todos os segmentos do WAL."
+"Você precisa de uma regra incondicional ON UPDATE DO INSTEAD ou um gatilho "
+"INSTEAD OF UPDATE."
 
-#: access/transam/xlog.c:8693
-msgid "pg_stop_backup complete, all required WAL segments have been archived"
-msgstr "pg_stop_backup concluído, todos os segmentos do WAL foram arquivados"
+#: executor/execMain.c:1028
+#, c-format
+msgid "cannot delete from view \"%s\""
+msgstr "não pode excluir da visão \"%s\""
 
-#: access/transam/xlog.c:8697
-#, fuzzy
+#: executor/execMain.c:1030
 msgid ""
-"WAL archiving is not enabled; you must ensure that all required WAL segments "
-"are copied through other means to complete the backup"
-msgstr "arquivamento do WAL não está habilitado; você deve garantir que todos os segmentos do WAL necessários foram copiados por outros meios para completar a cópia de segurança"
-
-#: access/transam/xlog.c:8719
-msgid "must be superuser to switch transaction log files"
-msgstr "deve ser super-usuário para rotacionar arquivos do log de transação"
-
-#: access/transam/xlog.c:8878
-msgid "pg_xlogfile_name_offset() cannot be executed during recovery."
-msgstr "pg_xlogfile_name_offset() não pode ser executado durante recuperação."
+"You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE "
+"trigger."
+msgstr ""
+"Você precisa de uma regra incondicional ON DELETE DO INSTEAD ou um gatilho "
+"INSTEAD OF DELETE."
 
-#: access/transam/xlog.c:8888 access/transam/xlog.c:8960
+#: executor/execMain.c:1040
 #, c-format
-msgid "could not parse transaction log location \"%s\""
-msgstr "não pôde validar local do log de transação \"%s\""
+msgid "cannot change foreign table \"%s\""
+msgstr "não pode mudar tabela externa \"%s\""
 
-#: access/transam/xlog.c:8953
-msgid "pg_xlogfile_name() cannot be executed during recovery."
-msgstr "pg_xlogfile_name() não pode ser executado durante recuperação."
+#: executor/execMain.c:1046
+#, c-format
+msgid "cannot change relation \"%s\""
+msgstr "não pode mudar relação \"%s\""
 
-#: access/transam/xlog.c:9050
+#: executor/execMain.c:1070
 #, c-format
-msgid "xlog redo %s"
-msgstr "redo do xlog %s"
+msgid "cannot lock rows in sequence \"%s\""
+msgstr "não pode bloquear registros na sequência \"%s\""
 
-#: access/transam/xlog.c:9090
-msgid "online backup mode cancelled"
-msgstr "modo de cópia de segurança online foi cancelado"
+#: executor/execMain.c:1077
+#, c-format
+msgid "cannot lock rows in TOAST relation \"%s\""
+msgstr "não pode bloquear registros na relação TOAST \"%s\""
 
-#: access/transam/xlog.c:9091
+#: executor/execMain.c:1084
 #, c-format
-msgid "\"%s\" was renamed to \"%s\"."
-msgstr "\"%s\" foi renomeado para \"%s\"."
+msgid "cannot lock rows in view \"%s\""
+msgstr "não pode bloquear registros na visão \"%s\""
 
-#: access/transam/xlog.c:9098
-msgid "online backup mode was not cancelled"
-msgstr "mode de cópia de segurança online não foi cancelado"
+#: executor/execMain.c:1091
+#, c-format
+msgid "cannot lock rows in foreign table \"%s\""
+msgstr "não pode bloquear registros na tabela externa \"%s\""
 
-#: access/transam/xlog.c:9099
+#: executor/execMain.c:1097
 #, c-format
-msgid "Could not rename \"%s\" to \"%s\": %m."
-msgstr "não pôde renomear \"%s\" para \"%s\": %m"
+msgid "cannot lock rows in relation \"%s\""
+msgstr "não pôde bloquear registros na relação \"%s\""
 
-#: access/transam/xlog.c:9567 access/transam/xlog.c:9589
+#: executor/execMain.c:1568
 #, c-format
-msgid "could not read from log file %u, segment %u, offset %u: %m"
-msgstr "não pôde ler do arquivo de log %u, segmento %u, deslocamento %u: %m"
+msgid "null value in column \"%s\" violates not-null constraint"
+msgstr "valor nulo na coluna \"%s\" viola a restrição não-nula"
 
-#: access/transam/xlog.c:9677
-#, fuzzy, c-format
-msgid "trigger file found: %s"
-msgstr "arquivo de gatilho encontrado: %s"
-
-#: access/transam/slru.c:595
-#, c-format
-msgid "file \"%s\" doesn't exist, reading as zeroes"
-msgstr "arquivo \"%s\" não existe, lendo como zeros"
-
-#: access/transam/slru.c:825 access/transam/slru.c:831
-#: access/transam/slru.c:838 access/transam/slru.c:845
-#: access/transam/slru.c:852 access/transam/slru.c:859
+#: executor/execMain.c:1580
 #, c-format
-msgid "could not access status of transaction %u"
-msgstr "não pôde acessar status da transação %u"
+msgid "new row for relation \"%s\" violates check constraint \"%s\""
+msgstr "novo registro da relação \"%s\" viola restrição de verificação \"%s\""
 
-#: access/transam/slru.c:826
-#, c-format
-msgid "Could not open file \"%s\": %m."
-msgstr "não pôde abrir arquivo \"%s\": %m."
+#: executor/nodeMergejoin.c:1604
+msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
+msgstr ""
+"RIGHT JOIN só é suportado com condições de junção que podem ser utilizadas "
+"com junção por mesclagem"
 
-#: access/transam/slru.c:832
-#, c-format
-msgid "Could not seek in file \"%s\" to offset %u: %m."
-msgstr "não pôde buscar no arquivo \"%s\" deslocado de %u: %m."
+#: executor/nodeMergejoin.c:1624
+msgid "FULL JOIN is only supported with merge-joinable join conditions"
+msgstr ""
+"FULL JOIN só é suportado com condições de junção que podem ser utilizadas "
+"com junção por mesclagem"
 
-#: access/transam/slru.c:839
-#, c-format
-msgid "Could not read from file \"%s\" at offset %u: %m."
-msgstr "não pôde ler do arquivo \"%s\" deslocado de %u: %m."
+#: rewrite/rewriteHandler.c:442 rewrite/rewriteManip.c:1024
+#: parser/parse_utilcmd.c:2094 parser/parse_utilcmd.c:2193
+msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
+msgstr "comandos condicionais UNION/INTERSECT/EXCEPT não estão implementados"
 
-#: access/transam/slru.c:846
+#: rewrite/rewriteHandler.c:485
 #, c-format
-msgid "Could not write to file \"%s\" at offset %u: %m."
-msgstr "não pôde escrever no arquivo \"%s\" deslocado de %u: %m."
+msgid ""
+"WITH query name \"%s\" appears in both a rule action and the query being "
+"rewritten"
+msgstr ""
+"nome de consulta WITH \"%s\" aparece em ação da regra e na consulta a ser "
+"reescrita"
 
-#: access/transam/slru.c:853
-#, c-format
-msgid "Could not fsync file \"%s\": %m."
-msgstr "não pôde executar fsync no arquivo \"%s\": %m."
+#: rewrite/rewriteHandler.c:543
+msgid "cannot have RETURNING lists in multiple rules"
+msgstr "não pode ter listas RETURNING em múltiplas regras"
 
-#: access/transam/slru.c:860
+#: rewrite/rewriteHandler.c:874 rewrite/rewriteHandler.c:892
 #, c-format
-msgid "Could not close file \"%s\": %m."
-msgstr "não pôde fechar arquivo \"%s\": %m."
+msgid "multiple assignments to same column \"%s\""
+msgstr "atribuições múltiplas para mesma coluna \"%s\""
 
-#: access/transam/slru.c:1087
+#: rewrite/rewriteHandler.c:1627 rewrite/rewriteHandler.c:2022
 #, c-format
-msgid "could not truncate directory \"%s\": apparent wraparound"
-msgstr "não pôde truncar diretório \"%s\": reinício aparente"
+msgid "infinite recursion detected in rules for relation \"%s\""
+msgstr "recursão infinita detectada em regras para relação \"%s\""
 
-#: access/transam/slru.c:1168
-#, c-format
-msgid "removing file \"%s\""
-msgstr "removendo arquivo \"%s\""
+#: rewrite/rewriteHandler.c:1883
+msgid ""
+"DO INSTEAD NOTHING rules are not supported for data-modifying statements in "
+"WITH"
+msgstr ""
+"regras DO INSTEAD NOTHING não são suportadas em comandos que modificam dados "
+"no WITH"
 
-#: access/transam/varsup.c:113
-#, c-format
+#: rewrite/rewriteHandler.c:1897
 msgid ""
-"database is not accepting commands to avoid wraparound data loss in database "
-"\"%s\""
+"conditional DO INSTEAD rules are not supported for data-modifying statements "
+"in WITH"
 msgstr ""
-"banco de dados não está aceitando comandos para evitar perda de dados por "
-"reinício no banco de dados \"%s\""
+"regras DO INSTEAD condicionais não são suportadas em comandos que modificam "
+"dados no WITH"
+
+#: rewrite/rewriteHandler.c:1901
+msgid "DO ALSO rules are not supported for data-modifying statements in WITH"
+msgstr ""
+"regras DO ALSO não são suportadas em comandos que modificam dados no WITH"
 
-#: access/transam/varsup.c:115 access/transam/varsup.c:122
+#: rewrite/rewriteHandler.c:1906
 msgid ""
-"Stop the postmaster and use a standalone backend to vacuum that database.\n"
-"You might also need to commit or roll back old prepared transactions."
+"multi-statement DO INSTEAD rules are not supported for data-modifying "
+"statements in WITH"
 msgstr ""
-"Pare o postmaster e use um servidor autônomo para limpar aquele banco de "
-"dados.\n"
-"Você também pode precisar efetivar ou desfazer transações preparadas antigas."
+"regras DO INSTEAD com múltiplos comandos não são suportadas em comandos que "
+"modificam dados no WITH"
 
-#: access/transam/varsup.c:120
+#: rewrite/rewriteHandler.c:2060
 #, c-format
+msgid "cannot perform INSERT RETURNING on relation \"%s\""
+msgstr "não pode executar INSERT RETURNING na relação \"%s\""
+
+#: rewrite/rewriteHandler.c:2062
 msgid ""
-"database is not accepting commands to avoid wraparound data loss in database "
-"with OID %u"
+"You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
 msgstr ""
-"banco de dados não está aceitando comandos para evitar perda de dados por "
-"reinício no banco de dados com OID %u"
+"Você precisa de uma regra incondicional ON INSERT DO INSTEAD com uma "
+"cláusula RETURNING."
 
-#: access/transam/varsup.c:132 access/transam/varsup.c:358
+#: rewrite/rewriteHandler.c:2067
 #, c-format
-msgid "database \"%s\" must be vacuumed within %u transactions"
-msgstr "banco de dados \"%s\" deve ser limpado em %u transações"
+msgid "cannot perform UPDATE RETURNING on relation \"%s\""
+msgstr "não pode executar UPDATE RETURNING na relação \"%s\""
 
-#: access/transam/varsup.c:135 access/transam/varsup.c:142
-#: access/transam/varsup.c:361 access/transam/varsup.c:368
+#: rewrite/rewriteHandler.c:2069
 msgid ""
-"To avoid a database shutdown, execute a database-wide VACUUM in that "
-"database.\n"
-"You might also need to commit or roll back old prepared transactions."
+"You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
-"Para evitar um desligamento do banco de dados, execute um VACUUM completo "
-"naquele banco de dados.\n"
-"Você também pode precisar efetivar ou desfazer transações preparadas antigas."
+"Você precisa de uma regra incondicional ON UPDATE DO INSTEAD com uma "
+"cláusula RETURNING."
 
-#: access/transam/varsup.c:139 access/transam/varsup.c:365
+#: rewrite/rewriteHandler.c:2074
 #, c-format
-msgid "database with OID %u must be vacuumed within %u transactions"
-msgstr "banco de dados com OID %u deve ser limpado em %u transações"
+msgid "cannot perform DELETE RETURNING on relation \"%s\""
+msgstr "não pode executar DELETE RETURNING na relação \"%s\""
 
-#: access/transam/varsup.c:332
-#, c-format
-msgid "transaction ID wrap limit is %u, limited by database with OID %u"
+#: rewrite/rewriteHandler.c:2076
+msgid ""
+"You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
 msgstr ""
-"limite de reinício do ID de transação é %u, limitado pelo banco de dados com "
-"OID %u"
+"Você precisa de uma regra incondicional ON DELETE DO INSTEAD com uma "
+"cláusula RETURNING."
 
-#: access/hash/hashovfl.c:546
-#, c-format
-msgid "out of overflow pages in hash index \"%s\""
-msgstr "acabaram as páginas de transbordamento no índice hash \"%s\""
+#: rewrite/rewriteHandler.c:2140
+msgid ""
+"WITH cannot be used in a query that is rewritten by rules into multiple "
+"queries"
+msgstr ""
+"WITH não pode ser utilizado em uma consulta que reescrita por regras em "
+"múltiplas consultas"
+
+#: rewrite/rewriteManip.c:1012
+msgid "conditional utility statements are not implemented"
+msgstr "comandos utilitários condicionais não estão implementados"
 
-#: access/hash/hashutil.c:204
+#: rewrite/rewriteManip.c:1177
+msgid "WHERE CURRENT OF on a view is not implemented"
+msgstr "WHERE CURRENT OF em uma visão não está implementado"
+
+#: rewrite/rewriteRemove.c:62 rewrite/rewriteDefine.c:700
+#: rewrite/rewriteDefine.c:762 rewrite/rewriteSupport.c:117
 #, c-format
-msgid "index \"%s\" is not a hash index"
-msgstr "índice \"%s\" não é um índice hash"
+msgid "rule \"%s\" for relation \"%s\" does not exist"
+msgstr "regra \"%s\" para relação \"%s\" não existe"
 
-#: access/hash/hashutil.c:210
+#: rewrite/rewriteRemove.c:66
 #, c-format
-msgid "index \"%s\" has wrong hash version"
-msgstr "índice \"%s\" tem versão incorreta do hash"
+msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
+msgstr "regra \"%s\" para relação \"%s\" não existe, ignorando"
 
-#: access/hash/hashinsert.c:73
+#: rewrite/rewriteDefine.c:109 rewrite/rewriteDefine.c:769
 #, c-format
-msgid "index row size %lu exceeds hash maximum %lu"
-msgstr "tamanho de registro do índice %lu excede tamanho máximo do hash %lu"
+msgid "rule \"%s\" for relation \"%s\" already exists"
+msgstr "regra \"%s\" para relação \"%s\" já existe"
 
-#: access/hash/hashinsert.c:76
-msgid "Values larger than a buffer page cannot be indexed."
-msgstr "Valores maiores do que uma página do buffer não podem ser indexados."
+#: rewrite/rewriteDefine.c:287
+msgid "rule actions on OLD are not implemented"
+msgstr "ações da regra em OLD não estão implementadas"
 
-#: access/hash/hashsearch.c:152
-msgid "hash indexes do not support whole-index scans"
-msgstr "índices hash não suportam buscas em todo índice"
+#: rewrite/rewriteDefine.c:288
+msgid "Use views or triggers instead."
+msgstr "Ao invés disso utilize visões ou gatilhos."
+
+#: rewrite/rewriteDefine.c:292
+msgid "rule actions on NEW are not implemented"
+msgstr "ações da regra em NEW não estão implementadas"
+
+#: rewrite/rewriteDefine.c:293
+msgid "Use triggers instead."
+msgstr "Ao invés disso utilize gatilhos."
+
+#: rewrite/rewriteDefine.c:306
+msgid "INSTEAD NOTHING rules on SELECT are not implemented"
+msgstr "regras INSTEAD NOTHING no SELECT não estão implementadas"
+
+#: rewrite/rewriteDefine.c:307
+msgid "Use views instead."
+msgstr "Ao invés disso utilize visões."
+
+#: rewrite/rewriteDefine.c:315
+msgid "multiple actions for rules on SELECT are not implemented"
+msgstr "ações múltiplas para regras no SELECT não estão implementadas"
+
+#: rewrite/rewriteDefine.c:327
+msgid "rules on SELECT must have action INSTEAD SELECT"
+msgstr "regras no SELECT devem ter ação INSTEAD SELECT"
+
+#: rewrite/rewriteDefine.c:335
+msgid "rules on SELECT must not contain data-modifying statements in WITH"
+msgstr "regras no SELECT não devem conter comandos que modificam dados no WITH"
 
-#: main/main.c:230
+#: rewrite/rewriteDefine.c:343
+msgid "event qualifications are not implemented for rules on SELECT"
+msgstr "qualificações de eventos não estão implementadas para regras no SELECT"
+
+#: rewrite/rewriteDefine.c:368
 #, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr "%s: setsysinfo falhou: %s\n"
+msgid "\"%s\" is already a view"
+msgstr "\"%s\" já é uma visão"
 
-#: main/main.c:249
+#: rewrite/rewriteDefine.c:392
 #, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s: WSAStartup falhou: %d\n"
+msgid "view rule for \"%s\" must be named \"%s\""
+msgstr "regra para visão em \"%s\" deve ter nome \"%s\""
 
-#: main/main.c:268
+#: rewrite/rewriteDefine.c:417
 #, c-format
-msgid ""
-"%s is the PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s é o servidor PostgreSQL.\n"
-"\n"
+msgid "could not convert table \"%s\" to a view because it is not empty"
+msgstr "não pôde converter tabela \"%s\" em visão porque ela não está vazia"
 
-#: main/main.c:269
+#: rewrite/rewriteDefine.c:424
 #, c-format
+msgid "could not convert table \"%s\" to a view because it has triggers"
+msgstr "não pôde converter tabela \"%s\" em visão porque ela tem gatilhos"
+
+#: rewrite/rewriteDefine.c:426
 msgid ""
-"Usage:\n"
-"  %s [OPTION]...\n"
-"\n"
+"In particular, the table cannot be involved in any foreign key relationships."
 msgstr ""
-"Uso:\n"
-"  %s [OPÇÃO]...\n"
-"\n"
+"Em particular, a tabela não pode estar envolvida em relacionamentos de chave "
+"estrangeira."
 
-#: main/main.c:270
+#: rewrite/rewriteDefine.c:431
 #, c-format
-msgid "Options:\n"
-msgstr "Opções:\n"
+msgid "could not convert table \"%s\" to a view because it has indexes"
+msgstr "não pôde converter tabela \"%s\" em visão porque ela tem índices"
 
-#: main/main.c:272
+#: rewrite/rewriteDefine.c:437
 #, c-format
-msgid "  -A 1|0          enable/disable run-time assert checking\n"
+msgid "could not convert table \"%s\" to a view because it has child tables"
 msgstr ""
-"  -A 1|0          habilita/desabilita verificação de asserção em tempo de "
-"execução\n"
+"não pôde converter tabela \"%s\" em visão porque ela tem tabelas descendentes"
 
-#: main/main.c:274
-#, c-format
-msgid "  -B NBUFFERS     number of shared buffers\n"
-msgstr "  -B NBUFFERS     número de buffers compartilhados\n"
+#: rewrite/rewriteDefine.c:464
+msgid "cannot have multiple RETURNING lists in a rule"
+msgstr "não pode ter múltiplas listas RETURNING em uma regra"
 
-#: main/main.c:275
-#, c-format
-msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr "  -c NOME=VALOR   define o parâmetro em tempo de execução\n"
+#: rewrite/rewriteDefine.c:469
+msgid "RETURNING lists are not supported in conditional rules"
+msgstr "listas RETURNING não são suportadas em regras condicionais"
 
-#: main/main.c:276
-#, c-format
-msgid "  -d 1-5          debugging level\n"
-msgstr "   -d 1-5         nível de depuração\n"
+#: rewrite/rewriteDefine.c:473
+msgid "RETURNING lists are not supported in non-INSTEAD rules"
+msgstr "listas RETURNING não são suportadas em regras que não utilizam INSTEAD"
 
-#: main/main.c:277
-#, c-format
-msgid "  -D DATADIR      database directory\n"
-msgstr "  -D DIRDADOS     diretório do banco de dados\n"
+#: rewrite/rewriteDefine.c:552
+msgid "SELECT rule's target list has too many entries"
+msgstr "lista de alvos de uma regra SELECT tem muitas entradas"
 
-#: main/main.c:278
-#, c-format
-msgid "  -e              use European date input format (DMY)\n"
-msgstr "  -e              usa formato de entrada de data europeu (DMY)\n"
+#: rewrite/rewriteDefine.c:553
+msgid "RETURNING list has too many entries"
+msgstr "lista RETURNING tem muitas entradas"
 
-#: main/main.c:279
-#, c-format
-msgid "  -F              turn fsync off\n"
-msgstr "  -F              desabilita o fsync\n"
+#: rewrite/rewriteDefine.c:569
+msgid "cannot convert relation containing dropped columns to view"
+msgstr "não pode converter relação contendo colunas removidas em visão"
 
-#: main/main.c:280
+#: rewrite/rewriteDefine.c:574
 #, c-format
-msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr "  -h M�QUINA      nome da máquina ou endereço IP para escutar\n"
+msgid "SELECT rule's target entry %d has different column name from \"%s\""
+msgstr ""
+"entrada alvo %d de uma regra SELECT tem nome de coluna diferente de \"%s\""
 
-#: main/main.c:281
+#: rewrite/rewriteDefine.c:580
 #, c-format
-msgid "  -i              enable TCP/IP connections\n"
-msgstr "  -i              habilita conexões TCP/IP\n"
+msgid "SELECT rule's target entry %d has different type from column \"%s\""
+msgstr ""
+"entrada alvo %d de uma regra SELECT tem tipo diferente da coluna \"%s\""
 
-#: main/main.c:282
+#: rewrite/rewriteDefine.c:582
 #, c-format
-msgid "  -k DIRECTORY    Unix-domain socket location\n"
-msgstr "  -k DIRETÓRIO    local do soquete de domínio Unix\n"
+msgid "RETURNING list's entry %d has different type from column \"%s\""
+msgstr "entrada %d de uma lista RETURNING tem tipo diferente da coluna \"%s\""
 
-#: main/main.c:284
+#: rewrite/rewriteDefine.c:597
 #, c-format
-msgid "  -l              enable SSL connections\n"
-msgstr "  -l              habilita conexões SSL\n"
+msgid "SELECT rule's target entry %d has different size from column \"%s\""
+msgstr ""
+"entrada alvo %d de uma regra SELECT tem tamanho diferente da coluna \"%s\""
 
-#: main/main.c:286
-#, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
-msgstr "  -N MAX-CONEXÃO  número máximo de conexões permitidas\n"
-
-#: main/main.c:287
+#: rewrite/rewriteDefine.c:599
 #, c-format
-msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
+msgid "RETURNING list's entry %d has different size from column \"%s\""
 msgstr ""
-"  -o OPÇÕES       passa \"OPÇÕES\" para cada processo servidor (obsoleto)\n"
+"entrada %d de uma lista RETURNING tem tamanho diferente da coluna \"%s\""
 
-#: main/main.c:288
-#, c-format
-msgid "  -p PORT         port number to listen on\n"
-msgstr "  -p PORTA        número da porta para escutar\n"
+#: rewrite/rewriteDefine.c:607
+msgid "SELECT rule's target list has too few entries"
+msgstr "lista de alvos de uma regra SELECT tem poucas entradas"
 
-#: main/main.c:289
-#, c-format
-msgid "  -s              show statistics after each query\n"
-msgstr "  -s              mostra estatísticas após cada consulta\n"
+#: rewrite/rewriteDefine.c:608
+msgid "RETURNING list has too few entries"
+msgstr "lista RETURNING tem poucas entradas"
 
-#: main/main.c:290
+#: rewrite/rewriteSupport.c:156
 #, c-format
-msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
-msgstr ""
-"  -S MEM-ORD      define a quantidade de memória para ordenações (em kB)\n"
+msgid "rule \"%s\" does not exist"
+msgstr "regra \"%s\" não existe"
 
-#: main/main.c:291
+#: rewrite/rewriteSupport.c:165
 #, c-format
-msgid "  --NAME=VALUE    set run-time parameter\n"
-msgstr "  --NOME=VALOR    define o parâmetro em tempo de execução\n"
+msgid "there are multiple rules named \"%s\""
+msgstr "há múltiplas regras com nome \"%s\""
 
-#: main/main.c:292
-#, c-format
-msgid "  --describe-config  describe configuration parameters, then exit\n"
-msgstr "  --describe-config  descreve parâmetros de configuração e termina\n"
+#: rewrite/rewriteSupport.c:166
+msgid "Specify a relation name as well as a rule name."
+msgstr "Especifique um nome de relação bem como um nome de regra."
 
-#: main/main.c:293
-#, c-format
-msgid "  --help          show this help, then exit\n"
-msgstr "  --help          mostra esta ajuda e termina\n"
+#: regex/regc_pg_locale.c:258 utils/adt/selfuncs.c:5030
+msgid "could not determine which collation to use for regular expression"
+msgstr "não pôde determinar qual ordenação utilizar na expressão regular"
 
-#: main/main.c:294
+#: parser/parse_coerce.c:906 parser/parse_coerce.c:936
+#: parser/parse_coerce.c:954 parser/parse_coerce.c:969
+#: parser/parse_expr.c:1670 parser/parse_expr.c:2119 parser/parse_target.c:829
 #, c-format
-msgid "  --version       output version information, then exit\n"
-msgstr "  --version       mostra informação sobre a versão e termina\n"
+msgid "cannot cast type %s to %s"
+msgstr "não pode converter tipo %s para %s"
 
-#: main/main.c:296
-#, c-format
-msgid ""
-"\n"
-"Developer options:\n"
-msgstr ""
-"\n"
-"Opções para desenvolvedor:\n"
+#: parser/parse_coerce.c:939
+msgid "Input has too few columns."
+msgstr "Entrada tem poucas colunas."
 
-#: main/main.c:297
+#: parser/parse_coerce.c:957
 #, c-format
-msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
-msgstr "  -f s|i|n|m|h    impede uso de alguns tipos de planos\n"
+msgid "Cannot cast type %s to %s in column %d."
+msgstr "Não pode converter tipo %s para %s na coluna %d."
 
-#: main/main.c:298
-#, c-format
-msgid ""
-"  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
-"  -n              não reinicializa memória compartilhada depois de término "
-"anormal\n"
+#: parser/parse_coerce.c:972
+msgid "Input has too many columns."
+msgstr "Entrada tem muitas colunas."
 
-#: main/main.c:299
+#. translator: first %s is name of a SQL construct, eg WHERE
+#: parser/parse_coerce.c:1015
 #, c-format
-msgid "  -O              allow system table structure changes\n"
-msgstr ""
-"  -O              permite mudanças na estrutura de tabelas do sistema\n"
+msgid "argument of %s must be type boolean, not type %s"
+msgstr "argumento do %s deve ser do tipo boolean, e não do tipo %s"
 
-#: main/main.c:300
+#. translator: %s is name of a SQL construct, eg WHERE
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1025 parser/parse_coerce.c:1074
 #, c-format
-msgid "  -P              disable system indexes\n"
-msgstr "  -P              desabilita índices do sistema\n"
+msgid "argument of %s must not return a set"
+msgstr "argumento do %s não deve retornar um conjunto"
 
-#: main/main.c:301
+#. translator: first %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:1062
 #, c-format
-msgid "  -t pa|pl|ex     show timings after each query\n"
-msgstr "  -t pa|pl|ex     mostra duração depois de cada consulta\n"
+msgid "argument of %s must be type %s, not type %s"
+msgstr "argumento do %s deve ser do tipo %s, e não do tipo %s"
 
-#: main/main.c:302
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1195
 #, c-format
-msgid "  -T              send SIGSTOP to all backend servers if one dies\n"
-msgstr ""
-"  -T              envia SIGSTOP para todos os servidores se um deles morrer\n"
+msgid "%s types %s and %s cannot be matched"
+msgstr "tipos no %s %s e %s não podem corresponder"
 
-#: main/main.c:303
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:1262
 #, c-format
-msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
-msgstr ""
-"  -W NUM          espera NUM segundos para permitir que o depurador seja "
-"anexado\n"
+msgid "%s could not convert type %s to %s"
+msgstr "%s não pôde converter tipo %s para %s"
+
+#: parser/parse_coerce.c:1513
+msgid "arguments declared \"anyelement\" are not all alike"
+msgstr "argumentos declarados \"anyelement\" não são de tipos compatíveis"
 
-#: main/main.c:305
+#: parser/parse_coerce.c:1533
+msgid "arguments declared \"anyarray\" are not all alike"
+msgstr "argumentos declarados \"anyarray\" não são de tipos compatíveis"
+
+#: parser/parse_coerce.c:1562 parser/parse_coerce.c:1710
+#: parser/parse_coerce.c:1742
 #, c-format
+msgid "argument declared \"anyarray\" is not an array but type %s"
+msgstr "argumento declarado \"anyarray\" não é uma matriz mas do tipo %s"
+
+#: parser/parse_coerce.c:1578
 msgid ""
-"\n"
-"Options for single-user mode:\n"
+"argument declared \"anyarray\" is not consistent with argument declared "
+"\"anyelement\""
 msgstr ""
-"\n"
-"Opções para modo monousuário:\n"
+"argumento declarado \"anyarray\" não está consistente com argumento "
+"declarado \"anyelement\""
 
-#: main/main.c:306
-#, c-format
-msgid "  --single        selects single-user mode (must be first argument)\n"
+#: parser/parse_coerce.c:1596
+msgid "could not determine polymorphic type because input has type \"unknown\""
 msgstr ""
-"  --single        seleciona modo monousuário (deve ser o primeiro "
-"argumento)\n"
+"não pôde determinar tipo polimórfico porque entrada tem tipo \"unknown\""
 
-#: main/main.c:307
+#: parser/parse_coerce.c:1606
 #, c-format
-msgid "  DBNAME          database name (defaults to user name)\n"
-msgstr ""
-"  NOMEBD          nome do banco de dados (padrão é o nome do usuário)\n"
+msgid "type matched to anynonarray is an array type: %s"
+msgstr "tipo que corresponde a anynonarray é um tipo array: %s"
 
-#: main/main.c:308
+#: parser/parse_coerce.c:1616
 #, c-format
-msgid "  -d 0-5          override debugging level\n"
-msgstr "  -d 0-5          muda o nível de depuração\n"
+msgid "type matched to anyenum is not an enum type: %s"
+msgstr "tipo que corresponde a anyenum não é um tipo enum: %s"
 
-#: main/main.c:309
+#: parser/parse_relation.c:147
 #, c-format
-msgid "  -E              echo statement before execution\n"
-msgstr "  -E              mostra consulta antes da execução\n"
+msgid "table reference \"%s\" is ambiguous"
+msgstr "referência a tabela \"%s\" é ambígua"
 
-#: main/main.c:310
+#: parser/parse_relation.c:183
 #, c-format
-msgid "  -j              do not use newline as interactive query delimiter\n"
-msgstr ""
-"  -j              não usa nova linha como delimitador de consulta iterativa\n"
+msgid "table reference %u is ambiguous"
+msgstr "referência a tabela %u é ambígua"
 
-#: main/main.c:311 main/main.c:316
+#: parser/parse_relation.c:343
 #, c-format
-msgid "  -r FILENAME     send stdout and stderr to given file\n"
-msgstr ""
-"  -r ARQUIVO      envia saída stdout e stderr para o arquivo designado\n"
+msgid "table name \"%s\" specified more than once"
+msgstr "nome da tabela \"%s\" foi especificado mais de uma vez"
 
-#: main/main.c:313
+#: parser/parse_relation.c:478 parser/parse_relation.c:551
+#: parser/parse_expr.c:741 parser/parse_target.c:1064
 #, c-format
-msgid ""
-"\n"
-"Options for bootstrapping mode:\n"
-msgstr ""
-"\n"
-"Opções para modo de ativação:\n"
+msgid "column reference \"%s\" is ambiguous"
+msgstr "referência à coluna \"%s\" é ambígua"
 
-#: main/main.c:314
+#: parser/parse_relation.c:754 parser/parse_relation.c:1045
+#: parser/parse_relation.c:1432
 #, c-format
-msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
+msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr ""
-"  --boot          seleciona modo de ativação (deve ser o primeiro "
-"argumento)\n"
+"tabela \"%s\" tem %d colunas disponíveis mas %d colunas foram especificadas"
 
-#: main/main.c:315
+#: parser/parse_relation.c:784
 #, c-format
-msgid ""
-"  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
-msgstr ""
-"  NOMEBD          nome do banco de dados (argumento obrigatório no modo de "
-"ativação)\n"
+msgid "too many column aliases specified for function %s"
+msgstr "muitos aliases de coluna especificados para função %s"
 
-#: main/main.c:317
+#: parser/parse_relation.c:850
 #, c-format
-msgid "  -x NUM          internal use\n"
-msgstr "  -x NUM          uso interno\n"
+msgid ""
+"There is a WITH item named \"%s\", but it cannot be referenced from this "
+"part of the query."
+msgstr ""
+"Há um item WITH nomeado \"%s\", mas ele não pode ser referenciado desta "
+"parte da consulta."
 
-#: main/main.c:319
-#, c-format
+#: parser/parse_relation.c:852
 msgid ""
-"\n"
-"Please read the documentation for the complete list of run-time\n"
-"configuration settings and how to set them on the command line or in\n"
-"the configuration file.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+"Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
 msgstr ""
-"\n"
-"Por favor leia a documentação para verificar a lista completa de parâmetros\n"
-"de configuração em tempo de execução e como definí-los pela linha de "
-"comando\n"
-"ou no arquivo de configuração.\n"
-"\n"
-"Relate erros a <pgsql-bugs@postgresql.org>.\n"
+"Utilize WITH RECURSIVE ou reordene os itens WITH para remover referências "
+"posteriores."
 
-#: main/main.c:333
+#: parser/parse_relation.c:1125
 msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
+"a column definition list is only allowed for functions returning \"record\""
 msgstr ""
-"execução do servidor PostgreSQL pelo \"root\" não é permitida.\n"
-"O servidor deve ser iniciado por um usuário sem privilégios para previnir\n"
-"possíveis comprometimentos de segurança no sistema. Veja a documentação "
-"para\n"
-"obter informações adicionais sobre como iniciar o servidor corretamente.\n"
+"uma lista de definição de colunas somente é permitida para funções que "
+"retornam \"record\""
 
-#: main/main.c:350
+#: parser/parse_relation.c:1133
+msgid "a column definition list is required for functions returning \"record\""
+msgstr ""
+"uma lista de definição de colunas é requerida para funções que retornam "
+"\"record\""
+
+#: parser/parse_relation.c:1184
 #, c-format
-msgid "%s: real and effective user IDs must match\n"
-msgstr "%s: IDs do usuário real e efetivo devem corresponder\n"
+msgid "function \"%s\" in FROM has unsupported return type %s"
+msgstr "função \"%s\" no FROM tem tipo de retorno %s que não é suportado"
 
-#: main/main.c:357
-msgid ""
-"Execution of PostgreSQL by a user with administrative permissions is not\n"
-"permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromises.  See the documentation for\n"
-"more information on how to properly start the server.\n"
+#: parser/parse_relation.c:1258
+#, c-format
+msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
 msgstr ""
-"Execução do servidor PostgreSQL por um usuário com permissões "
-"administrativas não é\n"
-"permitida.\n"
-"O servidor deve ser iniciado por um usuário sem privilégios para previnir\n"
-"possíveis comprometimentos de segurança no sistema. Veja a documentação "
-"para\n"
-"obter informações adicionais sobre como iniciar o servidor corretamente.\n"
+"listas de VALUES \"%s\" tem %d colunas disponíveis mas %d colunas foram "
+"especificadas"
 
-#: main/main.c:378
+#: parser/parse_relation.c:1314
 #, c-format
-msgid "%s: invalid effective UID: %d\n"
-msgstr "%s: UID efetivo é inválido: %d\n"
+msgid "joins can have at most %d columns"
+msgstr "junções podem ter no máximo %d colunas"
 
-#: main/main.c:391
+#: parser/parse_relation.c:1405
 #, c-format
-msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr "%s: não pôde determinar nome de usuário (GetUserName falhou)\n"
+msgid "WITH query \"%s\" does not have a RETURNING clause"
+msgstr "consulta WITH \"%s\" não tem uma cláusula RETURNING"
 
-#: commands/tsearchcmds.c:109 commands/tsearchcmds.c:929
+#: parser/parse_relation.c:2087
 #, c-format
-msgid "function %s should return type %s"
-msgstr "função %s deve retornar tipo %s"
+msgid "column %d of relation \"%s\" does not exist"
+msgstr "coluna %d da relação \"%s\" não existe"
+
+#: parser/parse_relation.c:2471
+#, c-format
+msgid "invalid reference to FROM-clause entry for table \"%s\""
+msgstr "referência inválida para tabela \"%s\" na cláusula FROM"
+
+#: parser/parse_relation.c:2474
+#, c-format
+msgid "Perhaps you meant to reference the table alias \"%s\"."
+msgstr "Talvez você quisesse referenciar o aliás de tabela \"%s\"."
+
+#: parser/parse_relation.c:2476
+#, c-format
+msgid ""
+"There is an entry for table \"%s\", but it cannot be referenced from this "
+"part of the query."
+msgstr ""
+"Há uma entrada para tabela \"%s\", mas ela não pode ser referenciada desta "
+"parta da consulta."
+
+#: parser/parse_relation.c:2482
+#, c-format
+msgid "missing FROM-clause entry for table \"%s\""
+msgstr "faltando entrada para tabela \"%s\" na cláusula FROM"
+
+#: parser/parse_node.c:83
+#, c-format
+msgid "target lists can have at most %d entries"
+msgstr "listas de alvo podem ter no máximo %d entradas"
+
+#: parser/parse_node.c:240
+#, c-format
+msgid "cannot subscript type %s because it is not an array"
+msgstr ""
+"tipo do índice de uma matriz não pode ser %s porque ele não é uma matriz"
+
+#: parser/parse_node.c:342 parser/parse_node.c:369
+msgid "array subscript must have type integer"
+msgstr "índice da matriz deve ser do tipo integer"
+
+#: parser/parse_node.c:393
+#, c-format
+msgid "array assignment requires type %s but expression is of type %s"
+msgstr "atribuição da matriz requer tipo %s mas expressão é do tipo %s"
+
+#: parser/parse_clause.c:421
+#, c-format
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgstr "cláusula JOIN/ON referencia \"%s\", que não faz parte do JOIN"
+
+#: parser/parse_clause.c:502
+msgid "subquery in FROM cannot have SELECT INTO"
+msgstr "subconsulta no FROM não pode ter SELECT INTO"
+
+#: parser/parse_clause.c:524
+msgid "subquery in FROM cannot refer to other relations of same query level"
+msgstr ""
+"subconsulta no FROM não pode referenciar outras relações do mesmo nível da "
+"consulta"
+
+#: parser/parse_clause.c:580
+msgid ""
+"function expression in FROM cannot refer to other relations of same query "
+"level"
+msgstr ""
+"expressão da função no FROM não pode referenciar outras relações do mesmo "
+"nível da consulta"
+
+#: parser/parse_clause.c:593
+msgid "cannot use aggregate function in function expression in FROM"
+msgstr "não pode utilizar função de agregação na expressão da função no FROM"
+
+#: parser/parse_clause.c:600
+msgid "cannot use window function in function expression in FROM"
+msgstr "não pode utilizar função deslizante na expressão da função no FROM"
+
+#: parser/parse_clause.c:877
+#, c-format
+msgid "column name \"%s\" appears more than once in USING clause"
+msgstr "nome da coluna \"%s\" aparece mais de uma vez na cláusula USING"
+
+#: parser/parse_clause.c:892
+#, c-format
+msgid "common column name \"%s\" appears more than once in left table"
+msgstr ""
+"nome de coluna comum \"%s\" aparece mais de uma vez na tabela à esquerda"
+
+#: parser/parse_clause.c:901
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in left table"
+msgstr ""
+"coluna \"%s\" especificada na cláusula USING não existe na tabela à esquerda"
+
+#: parser/parse_clause.c:915
+#, c-format
+msgid "common column name \"%s\" appears more than once in right table"
+msgstr ""
+"nome de coluna comum \"%s\" aparece mais de uma vez na tabela à direita"
+
+#: parser/parse_clause.c:924
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in right table"
+msgstr ""
+"coluna \"%s\" especificada na cláusula USING não existe na tabela à direita"
+
+#: parser/parse_clause.c:981
+#, c-format
+msgid "column alias list for \"%s\" has too many entries"
+msgstr "lista de aliases de coluna para \"%s\" tem muitas entradas"
+
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1228
+#, c-format
+msgid "argument of %s must not contain variables"
+msgstr "argumento do %s não deve conter variáveis"
+
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1239
+#, c-format
+msgid "argument of %s must not contain aggregate functions"
+msgstr "argumento do %s não deve conter funções de agregação"
+
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1250
+#, c-format
+msgid "argument of %s must not contain window functions"
+msgstr "argumento do %s não deve conter funções deslizantes"
+
+#. translator: first %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1367
+#, c-format
+msgid "%s \"%s\" is ambiguous"
+msgstr "%s \"%s\" é ambíguo"
+
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1391
+#, c-format
+msgid "non-integer constant in %s"
+msgstr "constante não-inteira em %s"
+
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1409
+#, c-format
+msgid "%s position %d is not in select list"
+msgstr "posição %2$d do %1$s não está na lista de seleção"
+
+#: parser/parse_clause.c:1625
+#, c-format
+msgid "window \"%s\" is already defined"
+msgstr "deslizante \"%s\" já está definido"
+
+#: parser/parse_clause.c:1637 parser/parse_agg.c:245
+#, c-format
+msgid "window \"%s\" does not exist"
+msgstr "deslizante \"%s\" não existe"
+
+#: parser/parse_clause.c:1679
+#, c-format
+msgid "cannot override PARTITION BY clause of window \"%s\""
+msgstr "não pode substituir cláusula PARTITION BY do deslizante \"%s\""
+
+#: parser/parse_clause.c:1691
+#, c-format
+msgid "cannot override ORDER BY clause of window \"%s\""
+msgstr "não pode substituir cláusula ORDER BY do deslizante \"%s\""
+
+#: parser/parse_clause.c:1713
+#, c-format
+msgid "cannot override frame clause of window \"%s\""
+msgstr "não pode substituir cláusula frame do deslizante \"%s\""
+
+#: parser/parse_clause.c:1779
+msgid ""
+"in an aggregate with DISTINCT, ORDER BY expressions must appear in argument "
+"list"
+msgstr ""
+"em uma agregação com DISTINCT, expressões ORDER BY devem aparecer na lista "
+"de argumentos"
+
+#: parser/parse_clause.c:1780
+msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
+msgstr ""
+"para SELECT DISTINCT, expressões ORDER BY devem aparecer na lista de seleção"
+
+#: parser/parse_clause.c:1866 parser/parse_clause.c:1898
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr ""
+"expressões SELECT DISTINCT ON devem corresponder com expressões iniciais do "
+"ORDER BY"
+
+#: parser/parse_clause.c:2020
+#, c-format
+msgid "operator %s is not a valid ordering operator"
+msgstr "operador %s não é um operador de ordenação válido"
+
+#: parser/parse_clause.c:2022
+msgid ""
+"Ordering operators must be \"<\" or \">\" members of btree operator families."
+msgstr ""
+"Operadores de ordenação devem ser membros \"<\" ou \">\" das famílias de "
+"operadores de árvore B."
+
+#: parser/parse_utilcmd.c:181
+#, c-format
+msgid "relation \"%s\" already exists, skipping"
+msgstr "relação \"%s\" já existe, ignorando"
+
+#: parser/parse_utilcmd.c:334
+msgid "array of serial is not implemented"
+msgstr "matriz de serial não está implementada"
+
+#: parser/parse_utilcmd.c:382
+#, c-format
+msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
+msgstr "%s criará sequência implícita \"%s\" para coluna serial \"%s.%s\""
+
+#: parser/parse_utilcmd.c:483 parser/parse_utilcmd.c:495
+#, c-format
+msgid ""
+"conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
+msgstr ""
+"declarações NULL/NOT NULL conflitantes para coluna \"%s\" da tabela \"%s\""
+
+#: parser/parse_utilcmd.c:507
+#, c-format
+msgid "multiple default values specified for column \"%s\" of table \"%s\""
+msgstr ""
+"valores padrão múltiplos especificados para coluna \"%s\" da tabela \"%s\""
+
+#: parser/parse_utilcmd.c:1440
+msgid "cannot use an existing index in CREATE TABLE"
+msgstr "não pode utilizar um índice existente em CREATE TABLE"
+
+#: parser/parse_utilcmd.c:1460
+#, c-format
+msgid "index \"%s\" is already associated with a constraint"
+msgstr "índice \"%s\" já está associado com a restrição"
+
+#: parser/parse_utilcmd.c:1468
+#, c-format
+msgid "index \"%s\" does not belong to table \"%s\""
+msgstr "índice \"%s\" não pertence a tabela \"%s\""
+
+#: parser/parse_utilcmd.c:1475
+#, c-format
+msgid "index \"%s\" is not valid"
+msgstr "índice \"%s\" não é válido"
+
+#: parser/parse_utilcmd.c:1481
+#, c-format
+msgid "index \"%s\" is not ready"
+msgstr "índice \"%s\" não está pronto"
+
+#: parser/parse_utilcmd.c:1487
+#, c-format
+msgid "\"%s\" is not a unique index"
+msgstr "\"%s\" não é um índice único"
+
+#: parser/parse_utilcmd.c:1488 parser/parse_utilcmd.c:1495
+#: parser/parse_utilcmd.c:1502 parser/parse_utilcmd.c:1572
+msgid "Cannot create a primary key or unique constraint using such an index."
+msgstr ""
+"Não pode criar uma chave primária ou restrição de unicidade utilizando esse "
+"índice."
+
+#: parser/parse_utilcmd.c:1494
+#, c-format
+msgid "index \"%s\" contains expressions"
+msgstr "índice \"%s\" contém expressões"
+
+#: parser/parse_utilcmd.c:1501
+#, c-format
+msgid "\"%s\" is a partial index"
+msgstr "\"%s\" é um índice parcial"
+
+#: parser/parse_utilcmd.c:1513
+#, c-format
+msgid "\"%s\" is a deferrable index"
+msgstr "\"%s\" não é um índice postergável"
+
+#: parser/parse_utilcmd.c:1514
+msgid "Cannot create a non-deferrable constraint using a deferrable index."
+msgstr ""
+"Não pode criar uma restrição de unicidade não-postergável utilizando um "
+"índice postergável."
+
+#: parser/parse_utilcmd.c:1571
+#, c-format
+msgid "index \"%s\" does not have default sorting behavior"
+msgstr "índice \"%s\" não tem comportamento de ordenação padrão"
+
+#: parser/parse_utilcmd.c:1716
+#, c-format
+msgid "column \"%s\" appears twice in primary key constraint"
+msgstr "coluna \"%s\" aparece duas vezes na restrição de chave primária"
+
+#: parser/parse_utilcmd.c:1722
+#, c-format
+msgid "column \"%s\" appears twice in unique constraint"
+msgstr "coluna \"%s\" aparece duas vezes na restrição de unicidade"
+
+#: parser/parse_utilcmd.c:1887
+msgid "index expression cannot return a set"
+msgstr "expressão de índice não pode retornar um conjunto"
+
+#: parser/parse_utilcmd.c:1897
+msgid ""
+"index expressions and predicates can refer only to the table being indexed"
+msgstr ""
+"expressões e predicados de índice só podem referenciar a tabela que está "
+"sendo indexada"
+
+#: parser/parse_utilcmd.c:1994
+msgid "rule WHERE condition cannot contain references to other relations"
+msgstr "condição WHERE de regra não pode conter referências a outras relações"
+
+#: parser/parse_utilcmd.c:2000
+msgid "cannot use aggregate function in rule WHERE condition"
+msgstr "não pode utilizar função de agregação em condição WHERE de regra"
+
+#: parser/parse_utilcmd.c:2004
+msgid "cannot use window function in rule WHERE condition"
+msgstr "não pode utilizar função deslizante em condição WHERE de regra"
+
+#: parser/parse_utilcmd.c:2076
+msgid ""
+"rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE "
+"actions"
+msgstr ""
+"regras com condições WHERE só podem ter ações SELECT, INSERT, UPDATE ou "
+"DELETE"
+
+#: parser/parse_utilcmd.c:2112
+msgid "ON SELECT rule cannot use OLD"
+msgstr "regra ON SELECT não pode utilizar OLD"
+
+#: parser/parse_utilcmd.c:2116
+msgid "ON SELECT rule cannot use NEW"
+msgstr "regra ON SELECT não pode utilizar NEW"
+
+#: parser/parse_utilcmd.c:2125
+msgid "ON INSERT rule cannot use OLD"
+msgstr "regra ON INSERT não pode utilizar OLD"
+
+#: parser/parse_utilcmd.c:2131
+msgid "ON DELETE rule cannot use NEW"
+msgstr "regra ON DELETE não pode utilizar NEW"
+
+#: parser/parse_utilcmd.c:2159
+msgid "cannot refer to OLD within WITH query"
+msgstr "não pode referenciar OLD em uma consulta WITH"
+
+#: parser/parse_utilcmd.c:2166
+msgid "cannot refer to NEW within WITH query"
+msgstr "não pode referenciar NEW em uma consulta WITH"
+
+#: parser/parse_utilcmd.c:2449
+msgid "misplaced DEFERRABLE clause"
+msgstr "cláusula DEFERRABLE no lugar errado"
+
+#: parser/parse_utilcmd.c:2454 parser/parse_utilcmd.c:2469
+msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
+msgstr "múltiplas cláusulas DEFERRABLE/NOT DEFERRABLE não são permitidas"
+
+#: parser/parse_utilcmd.c:2464
+msgid "misplaced NOT DEFERRABLE clause"
+msgstr "cláusula NOT DEFERRABLE no lugar errado"
+
+#: parser/parse_utilcmd.c:2477 parser/parse_utilcmd.c:2503 gram.y:4153
+msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+msgstr "restrição declarada INITIALLY DEFERRED deve ser DEFERRABLE"
+
+#: parser/parse_utilcmd.c:2485
+msgid "misplaced INITIALLY DEFERRED clause"
+msgstr "cláusula INITIALLY DEFERRED no lugar errado"
+
+#: parser/parse_utilcmd.c:2490 parser/parse_utilcmd.c:2516
+msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
+msgstr "múltiplas cláusulas INITTIALLY IMMEDIATE/DEFERRED não são permitidas"
+
+#: parser/parse_utilcmd.c:2511
+msgid "misplaced INITIALLY IMMEDIATE clause"
+msgstr "cláusula INITIALLY IMMEDIATE no lugar errado"
+
+#: parser/parse_utilcmd.c:2702
+#, c-format
+msgid ""
+"CREATE specifies a schema (%s) different from the one being created (%s)"
+msgstr ""
+"CREATE especificou um esquema (%s) diferente daquele que foi criado (%s)"
+
+#: parser/parse_agg.c:131 parser/parse_oper.c:219
+#, c-format
+msgid "could not identify an ordering operator for type %s"
+msgstr "não pôde identificar um operador de ordenação para tipo %s"
+
+#: parser/parse_agg.c:133
+msgid "Aggregates with DISTINCT must be able to sort their inputs."
+msgstr "Agregações com DISTINCT devem ser capazes de ordenar suas entradas."
+
+#: parser/parse_agg.c:174
+msgid "aggregate function calls cannot contain window function calls"
+msgstr ""
+"chamadas de função de agregação não podem conter chamadas de função "
+"deslizante"
+
+#: parser/parse_agg.c:336
+msgid "aggregates not allowed in WHERE clause"
+msgstr "agregação não é permitida na cláusula WHERE"
+
+#: parser/parse_agg.c:342
+msgid "aggregates not allowed in JOIN conditions"
+msgstr "agregação não é permitida nas condições JOIN"
+
+#: parser/parse_agg.c:363
+msgid "aggregates not allowed in GROUP BY clause"
+msgstr "agregação não é permitida na cláusula GROUP BY"
+
+#: parser/parse_agg.c:433
+msgid "aggregate functions not allowed in a recursive query's recursive term"
+msgstr ""
+"funções de agregação não são permitidas em termo recursivo de uma consulta "
+"recursiva"
+
+#: parser/parse_agg.c:458
+msgid "window functions not allowed in WHERE clause"
+msgstr "funções deslizantes não são permitidas na cláusula WHERE"
+
+#: parser/parse_agg.c:464
+msgid "window functions not allowed in JOIN conditions"
+msgstr "funções deslizantes não são permitidas nas condições JOIN"
+
+#: parser/parse_agg.c:470
+msgid "window functions not allowed in HAVING clause"
+msgstr "funções deslizantes não são permitidas na cláusula WHERE"
+
+#: parser/parse_agg.c:483
+msgid "window functions not allowed in GROUP BY clause"
+msgstr "funções deslizantes não são permitidas na cláusula GROUP BY"
+
+#: parser/parse_agg.c:502 parser/parse_agg.c:515
+msgid "window functions not allowed in window definition"
+msgstr ""
+"funções deslizantes não são permitidas na definição de função deslizante"
+
+#: parser/parse_agg.c:673
+#, c-format
+msgid ""
+"column \"%s.%s\" must appear in the GROUP BY clause or be used in an "
+"aggregate function"
+msgstr ""
+"coluna \"%s.%s\" deve aparecer na cláusula GROUP BY ou ser utilizada em uma "
+"função de agregação"
+
+#: parser/parse_agg.c:679
+#, c-format
+msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
+msgstr "subconsulta utiliza coluna desagrupada \"%s.%s\" na consulta externa"
+
+#: parser/parse_collate.c:214 parser/parse_collate.c:538
+#, c-format
+msgid "collation mismatch between implicit collations \"%s\" and \"%s\""
+msgstr ""
+
+#: parser/parse_collate.c:217 parser/parse_collate.c:541
+msgid ""
+"You can choose the collation by applying the COLLATE clause to one or both "
+"expressions."
+msgstr ""
+
+#: parser/parse_collate.c:763
+#, c-format
+msgid "collation mismatch between explicit collations \"%s\" and \"%s\""
+msgstr ""
+
+#: scan.l:411
+msgid "unterminated /* comment"
+msgstr "comentário /* não foi terminado"
+
+#: scan.l:440
+msgid "unterminated bit string literal"
+msgstr "cadeia de bits não foi terminada"
+
+#: scan.l:461
+msgid "unterminated hexadecimal string literal"
+msgstr "cadeia de caracteres hexadecimal não foi terminada"
+
+#: scan.l:511
+msgid "unsafe use of string constant with Unicode escapes"
+msgstr "uso inseguro de cadeia de caracteres com escapes Unicode"
+
+#: scan.l:512
+msgid ""
+"String constants with Unicode escapes cannot be used when "
+"standard_conforming_strings is off."
+msgstr ""
+"Cadeias de caracteres com escapes Unicode não podem ser utilizadas quando "
+"standard_conforming_strings está off."
+
+#: scan.l:564 scan.l:572 scan.l:580 scan.l:581 scan.l:582 scan.l:1238
+#: scan.l:1265 scan.l:1269 scan.l:1307 scan.l:1311 scan.l:1333
+#, fuzzy
+msgid "invalid Unicode surrogate pair"
+msgstr "par substituto Unicode inválido"
+
+#: scan.l:586
+msgid "invalid Unicode escape"
+msgstr "escape Unicode inválido"
+
+#: scan.l:587
+msgid "Unicode escapes must be \\uXXXX or \\UXXXXXXXX."
+msgstr "Escapes Unicode devem ser \\uXXXX ou \\UXXXXXXXX."
+
+#: scan.l:598
+msgid "unsafe use of \\' in a string literal"
+msgstr "uso inseguro de \\' em cadeia de caracteres"
+
+#: scan.l:599
+msgid ""
+"Use '' to write quotes in strings. \\' is insecure in client-only encodings."
+msgstr ""
+"Utilize '' para escrever aspóstrofos em cadias de caracteres. \\' é inseguro "
+"em codificações de cliente."
+
+#: scan.l:674
+msgid "unterminated dollar-quoted string"
+msgstr "cadeia de caracteres entre dólares não foi terminada"
+
+#: scan.l:691 scan.l:703 scan.l:717
+msgid "zero-length delimited identifier"
+msgstr "identificador delimitado tem tamanho zero"
+
+#: scan.l:730
+msgid "unterminated quoted identifier"
+msgstr "identificador entre aspas não foi terminado"
+
+#: scan.l:834
+msgid "operator too long"
+msgstr "operador muito longo"
+
+#. translator: %s is typically the translation of "syntax error"
+#: scan.l:992
+#, c-format
+msgid "%s at end of input"
+msgstr "%s no fim da entrada"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: scan.l:1000
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s em ou próximo a \"%s\""
+
+#: scan.l:1161 scan.l:1193
+msgid ""
+"Unicode escape values cannot be used for code point values above 007F when "
+"the server encoding is not UTF8"
+msgstr ""
+"Valores de escape Unicode não podem ser utilizados para valores de ponto de "
+"código acima de 007F quando a codificação do servidor não for UTF8"
+
+#: scan.l:1189 scan.l:1325
+msgid "invalid Unicode escape value"
+msgstr "valor de escape Unicode inválido"
+
+#: scan.l:1214
+msgid "invalid Unicode escape character"
+msgstr "caracter de escape Unicode inválido"
+
+#: scan.l:1381
+msgid "nonstandard use of \\' in a string literal"
+msgstr "uso de \\' fora do padrão em cadeia de caracteres"
+
+#: scan.l:1382
+msgid ""
+"Use '' to write quotes in strings, or use the escape string syntax (E'...')."
+msgstr ""
+"Utilize '' para escrever cadeias de carateres entre apóstofros, ou utilize a "
+"sintaxe de escape de cadeia de caracteres (E'...')."
+
+#: scan.l:1391
+msgid "nonstandard use of \\\\ in a string literal"
+msgstr "uso de \\\\ fora do padrão em cadeia de caracteres"
+
+#: scan.l:1392
+msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
+msgstr ""
+"Utilize a sintaxe de escape de cadeia de caracteres para barras invertidas, "
+"i.e., E'\\\\'."
+
+#: scan.l:1406
+msgid "nonstandard use of escape in a string literal"
+msgstr "uso de escape fora do padrão em cadeia de caracteres"
+
+#: scan.l:1407
+msgid "Use the escape string syntax for escapes, e.g., E'\\r\\n'."
+msgstr ""
+"Utilize a sintaxe de escape de cadeia de caracteres para escapes, i.e., E'\\r"
+"\\n'."
+
+#: parser/parse_cte.c:42
+#, c-format
+msgid ""
+"recursive reference to query \"%s\" must not appear within its non-recursive "
+"term"
+msgstr ""
+"referência recursiva para consulta \"%s\" não deve aparecer no seu termo não "
+"recursivo"
+
+#: parser/parse_cte.c:44
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within a subquery"
+msgstr ""
+"referência recursiva para consulta \"%s\" não deve aparecer em uma "
+"subconsulta"
+
+#: parser/parse_cte.c:46
+#, c-format
+msgid ""
+"recursive reference to query \"%s\" must not appear within an outer join"
+msgstr ""
+"referência recursiva para consulta \"%s\" não deve aparecer em uma junção "
+"externa"
+
+#: parser/parse_cte.c:48
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
+msgstr ""
+"referência recursiva para consulta \"%s\" não deve aparecer em um INTERSECT"
+
+#: parser/parse_cte.c:50
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
+msgstr ""
+"referência recursiva para consulta \"%s\" não deve aparecer em um EXCEPT"
+
+#: parser/parse_cte.c:132
+#, c-format
+msgid "WITH query name \"%s\" specified more than once"
+msgstr "nome da consulta WITH \"%s\" foi especificado mais de uma vez"
+
+#: parser/parse_cte.c:259
+msgid "subquery in WITH cannot have SELECT INTO"
+msgstr "subconsulta no WITH não pode ter SELECT INTO"
+
+#: parser/parse_cte.c:271
+msgid ""
+"WITH clause containing a data-modifying statement must be at the top level"
+msgstr ""
+"cláusula WITH contendo um comando que modifica dados deve estar no nível "
+"superior"
+
+#: parser/parse_cte.c:320
+#, c-format
+msgid ""
+"recursive query \"%s\" column %d has type %s in non-recursive term but type "
+"%s overall"
+msgstr ""
+"coluna %2$d da consulta recursiva \"%1$s\" tem tipo %3$s no termo não "
+"recursivo mas o tipo %4$s no restante"
+
+#: parser/parse_cte.c:326
+msgid "Cast the output of the non-recursive term to the correct type."
+msgstr "Converta a saída do termo não recursivo para o tipo correto."
+
+#: parser/parse_cte.c:331
+#, c-format
+msgid ""
+"recursive query \"%s\" column %d has collation \"%s\" in non-recursive term "
+"but collation \"%s\" overall"
+msgstr ""
+"coluna %2$d da consulta recursiva \"%1$s\" tem ordenação %3$s no termo não "
+"recursivo mas a ordenação %4$s no restante"
+
+#: parser/parse_cte.c:335
+msgid "Use the COLLATE clause to set the collation of the non-recursive term."
+msgstr ""
+"Utilize a cláusula COLLATE para definir a ordenação do termo não recursivo."
+
+#: parser/parse_cte.c:426
+#, c-format
+msgid "WITH query \"%s\" has %d columns available but %d columns specified"
+msgstr ""
+"consulta WITH \"%s\" tem %d colunas disponíveis mas %d colunas foram "
+"especificadas"
+
+#: parser/parse_cte.c:606
+msgid "mutual recursion between WITH items is not implemented"
+msgstr "recursão mútua entre itens WITH não está implementada"
+
+#: parser/parse_cte.c:658
+#, c-format
+msgid "recursive query \"%s\" must not contain data-modifying statements"
+msgstr "consulta recursiva \"%s\" não deve conter comandos que modificam dados"
+
+#: parser/parse_cte.c:666
+#, c-format
+msgid ""
+"recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] "
+"recursive-term"
+msgstr ""
+"consulta recursiva \"%s\" não tem a forma termo-não-recursivo UNION [ALL] "
+"termo-recursivo"
+
+#: parser/parse_cte.c:698
+msgid "ORDER BY in a recursive query is not implemented"
+msgstr "ORDER BY em uma consulta recursiva não está implementado"
+
+#: parser/parse_cte.c:704
+msgid "OFFSET in a recursive query is not implemented"
+msgstr "OFFSET em uma consulta recursiva não está implementado"
+
+#: parser/parse_cte.c:710
+msgid "LIMIT in a recursive query is not implemented"
+msgstr "LIMIT em uma consulta recursiva não está implementado"
+
+#: parser/parse_cte.c:716
+msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
+msgstr "FOR UPDATE/SHARE em uma consulta recursiva não está implementado"
+
+#: parser/parse_cte.c:773
+#, c-format
+msgid "recursive reference to query \"%s\" must not appear more than once"
+msgstr ""
+"referência recursiva para consulta \"%s\" não deve aparecer mais de uma vez"
+
+#: parser/parse_expr.c:364 parser/parse_expr.c:757
+#, c-format
+msgid "column %s.%s does not exist"
+msgstr "coluna %s.%s não existe"
+
+#: parser/parse_expr.c:376
+#, c-format
+msgid "column \"%s\" not found in data type %s"
+msgstr "coluna \"%s\" não foi encontrada no tipo de dado %s"
+
+#: parser/parse_expr.c:382
+#, c-format
+msgid "could not identify column \"%s\" in record data type"
+msgstr "não pôde identificar coluna \"%s\" no tipo de dado record"
+
+#: parser/parse_expr.c:388
+#, c-format
+msgid "column notation .%s applied to type %s, which is not a composite type"
+msgstr "notação de coluna .%s aplicada ao tipo %s, que não é um tipo composto"
+
+#: parser/parse_expr.c:418 parser/parse_target.c:617
+msgid "row expansion via \"*\" is not supported here"
+msgstr "expansão de registro utilizando \"*\" não é suportada aqui"
+
+#: parser/parse_expr.c:809 parser/parse_param.c:109 parser/parse_param.c:141
+#: parser/parse_param.c:198 parser/parse_param.c:297
+#, c-format
+msgid "there is no parameter $%d"
+msgstr "não há parâmetro $%d"
+
+#: parser/parse_expr.c:1021
+msgid "NULLIF requires = operator to yield boolean"
+msgstr "NULLIF requer que operador = retorne booleano"
+
+#: parser/parse_expr.c:1200
+msgid "arguments of row IN must all be row expressions"
+msgstr "argumentos de registro IN devem ser todos expressões de registro"
+
+#: parser/parse_expr.c:1414
+msgid "subquery cannot have SELECT INTO"
+msgstr "subconsulta não pode ter SELECT INTO"
+
+#: parser/parse_expr.c:1442
+msgid "subquery must return a column"
+msgstr "subconsulta deve retornar uma coluna"
+
+#: parser/parse_expr.c:1449
+msgid "subquery must return only one column"
+msgstr "subconsulta deve retornar somente uma coluna"
+
+#: parser/parse_expr.c:1509
+msgid "subquery has too many columns"
+msgstr "subconsulta tem muitas colunas"
+
+#: parser/parse_expr.c:1514
+msgid "subquery has too few columns"
+msgstr "subconsulta tem poucas colunas"
+
+#: parser/parse_expr.c:1610
+msgid "cannot determine type of empty array"
+msgstr "não pode determinar tipo de matriz vazia"
+
+#: parser/parse_expr.c:1611
+msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
+msgstr ""
+"Converta explicitamente para o tipo desejado, por exemplo ARRAY[]::integer[]."
+
+#: parser/parse_expr.c:1625
+#, c-format
+msgid "could not find element type for data type %s"
+msgstr "não pôde encontrar tipo de dado de elemento para tipo de dado %s"
+
+#: parser/parse_expr.c:1826
+msgid "unnamed XML attribute value must be a column reference"
+msgstr "valor do atributo XML sem nome deve ser uma referência a coluna"
+
+#: parser/parse_expr.c:1827
+msgid "unnamed XML element value must be a column reference"
+msgstr "valor do elemento XML sem nome deve ser uma referência a coluna"
+
+#: parser/parse_expr.c:1842
+#, c-format
+msgid "XML attribute name \"%s\" appears more than once"
+msgstr "nome de atributo XML \"%s\" aparece mais do que uma vez"
+
+#: parser/parse_expr.c:1949
+#, c-format
+msgid "cannot cast XMLSERIALIZE result to %s"
+msgstr "não pode converter resultado de XMLSERIALIZE para %s"
+
+#: parser/parse_expr.c:2192 parser/parse_expr.c:2392
+msgid "unequal number of entries in row expressions"
+msgstr "número desigual de entradas em expressões de registro"
+
+#: parser/parse_expr.c:2202
+msgid "cannot compare rows of zero length"
+msgstr "não pode comparar registros de tamanho zero"
+
+#: parser/parse_expr.c:2227
+#, c-format
+msgid "row comparison operator must yield type boolean, not type %s"
+msgstr ""
+"operador de comparação de registro deve retornar tipo boolean, e não tipo %s"
+
+#: parser/parse_expr.c:2234
+msgid "row comparison operator must not return a set"
+msgstr "operador de comparação de registro não deve retornar um conjunto"
+
+#: parser/parse_expr.c:2293 parser/parse_expr.c:2338
+#, c-format
+msgid "could not determine interpretation of row comparison operator %s"
+msgstr ""
+"não pôde determinar interpretação do operador de comparação de registro %s"
+
+#: parser/parse_expr.c:2295
+msgid ""
+"Row comparison operators must be associated with btree operator families."
+msgstr ""
+"Operadores de comparação de registro devem ser associados com famílias de "
+"operadores de árvore B."
+
+#: parser/parse_expr.c:2340
+msgid "There are multiple equally-plausible candidates."
+msgstr "Há múltiplos candidatos igualmente plausíveis."
+
+#: parser/parse_expr.c:2432
+msgid "IS DISTINCT FROM requires = operator to yield boolean"
+msgstr "IS DISTINCT FROM requer que operador = retorne booleano"
+
+#: parser/parse_target.c:382 parser/parse_target.c:670
+#, c-format
+msgid "cannot assign to system column \"%s\""
+msgstr "não pode atribuir a coluna do sistema \"%s\""
+
+#: parser/parse_target.c:410
+msgid "cannot set an array element to DEFAULT"
+msgstr "não pode definir um elemento de matriz como sendo o valor DEFAULT"
+
+#: parser/parse_target.c:415
+msgid "cannot set a subfield to DEFAULT"
+msgstr "não pode definir um subcampo como sendo o valor DEFAULT"
+
+#: parser/parse_target.c:484
+#, c-format
+msgid "column \"%s\" is of type %s but expression is of type %s"
+msgstr "coluna \"%s\" é do tipo %s mas expressão é do tipo %s"
+
+#: parser/parse_target.c:654
+#, c-format
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
+"composite type"
+msgstr ""
+"não pode atribuir ao campo \"%s\" da coluna \"%s\" porque seu tipo %s não é "
+"um tipo composto"
+
+#: parser/parse_target.c:663
+#, c-format
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because there is no such "
+"column in data type %s"
+msgstr ""
+"não pode atribuir ao campo \"%s\" da coluna \"%s\" porque não há tal coluna "
+"no tipo de dado %s"
+
+#: parser/parse_target.c:730
+#, c-format
+msgid ""
+"array assignment to \"%s\" requires type %s but expression is of type %s"
+msgstr ""
+"atribuição de matriz para \"%s\" requer tipo %s mas expressão é do tipo %s"
+
+#: parser/parse_target.c:740
+#, c-format
+msgid "subfield \"%s\" is of type %s but expression is of type %s"
+msgstr "subcampo \"%s\" é do tipo %s mas expressão é do tipo %s"
 
-#: commands/tsearchcmds.c:178
-msgid "must be superuser to create text search parsers"
-msgstr "deve ser super-usuário para criar analisadores de busca textual"
+#: parser/parse_target.c:1126
+msgid "SELECT * with no tables specified is not valid"
+msgstr "SELECT * sem tabelas especificadas não é válido"
 
-#: commands/tsearchcmds.c:226
+#: parser/parse_func.c:147
 #, c-format
-msgid "text search parser parameter \"%s\" not recognized"
-msgstr "parâmetro do analisador de busca textual \"%s\" é desconhecido"
+msgid "argument name \"%s\" used more than once"
+msgstr "nome de argumento \"%s\" utilizado mais de uma vez"
 
-#: commands/tsearchcmds.c:236
-msgid "text search parser start method is required"
-msgstr "método start do analisador de busca textual é requerido"
+#: parser/parse_func.c:158
+msgid "positional argument cannot follow named argument"
+msgstr "argumento posicional não pode seguir argumento nomeado"
 
-#: commands/tsearchcmds.c:241
-msgid "text search parser gettoken method is required"
-msgstr "método gettoken do analisador de busca textual é requerido"
+#: parser/parse_func.c:236
+#, c-format
+msgid "%s(*) specified, but %s is not an aggregate function"
+msgstr "%s(*) especificado, mas %s não é uma função de agregação"
 
-#: commands/tsearchcmds.c:246
-msgid "text search parser end method is required"
-msgstr "método end do analisador de busca textual é requerido"
+#: parser/parse_func.c:243
+#, c-format
+msgid "DISTINCT specified, but %s is not an aggregate function"
+msgstr "DISTINCT especificado, mas %s não é uma função de agregação"
 
-#: commands/tsearchcmds.c:251
-msgid "text search parser lextypes method is required"
-msgstr "método lextypes do analisador de busca textual é requerido"
+#: parser/parse_func.c:249
+#, c-format
+msgid "ORDER BY specified, but %s is not an aggregate function"
+msgstr "ORDER BY especificado, mas %s não é uma função de agregação"
 
-#: commands/tsearchcmds.c:283
-msgid "must be superuser to drop text search parsers"
-msgstr "deve ser super-usuário para remover analisadores de busca textual"
+#: parser/parse_func.c:255
+#, c-format
+msgid ""
+"OVER specified, but %s is not a window function nor an aggregate function"
+msgstr ""
+"OVER especificado, mas %s não é uma função deslizante ou função de agregação"
 
-#: commands/tsearchcmds.c:306 catalog/namespace.c:1748
+#: parser/parse_func.c:277
 #, c-format
-msgid "text search parser \"%s\" does not exist"
-msgstr "analisador de busca textual \"%s\" não existe"
+msgid "function %s is not unique"
+msgstr "função %s não é única"
+
+#: parser/parse_func.c:280
+msgid ""
+"Could not choose a best candidate function. You might need to add explicit "
+"type casts."
+msgstr ""
+"Não pôde escolher uma função que se enquadra melhor. Você precisa adicionar "
+"conversões de tipo explícitas."
+
+#: parser/parse_func.c:291
+msgid ""
+"No aggregate function matches the given name and argument types. Perhaps you "
+"misplaced ORDER BY; ORDER BY must appear after all regular arguments of the "
+"aggregate."
+msgstr ""
+"Nenhuma função de agregação corresponde com o nome e os tipos de argumentos "
+"informados. Talvez você colocou ORDER BY no lugar errado; ORDER BY deve "
+"aparecer depois de todos os argumentos regulares da agregação."
+
+#: parser/parse_func.c:302
+msgid ""
+"No function matches the given name and argument types. You might need to add "
+"explicit type casts."
+msgstr ""
+"Nenhuma função corresponde com o nome e os tipos de argumentos informados. "
+"Você precisa adicionar conversões de tipo explícitas."
+
+#: parser/parse_func.c:412 parser/parse_func.c:478
+#, c-format
+msgid "%s(*) must be used to call a parameterless aggregate function"
+msgstr ""
+"%s(*) deve ser utilizado para chamar uma função de agregação sem parâmetros"
+
+#: parser/parse_func.c:419
+msgid "aggregates cannot return sets"
+msgstr "agregações não podem retornar conjuntos"
+
+#: parser/parse_func.c:431
+msgid "aggregates cannot use named arguments"
+msgstr "agregações não podem utilizar argumentos nomeados"
+
+#: parser/parse_func.c:450
+msgid "window function call requires an OVER clause"
+msgstr "chamada de função deslizante requer uma cláusula OVER"
+
+#: parser/parse_func.c:468
+msgid "DISTINCT is not implemented for window functions"
+msgstr "DISTINCT não está implementado para funções deslizantes"
+
+#: parser/parse_func.c:488
+msgid "aggregate ORDER BY is not implemented for window functions"
+msgstr "agregação ORDER BY não está implementado para funções deslizantes"
+
+#: parser/parse_func.c:494
+msgid "window functions cannot return sets"
+msgstr "funções deslizantes não podem retornar conjuntos"
+
+#: parser/parse_func.c:505
+msgid "window functions cannot use named arguments"
+msgstr "funções deslizantes não podem utilizar argumentos nomeados"
+
+#: parser/parse_func.c:1589
+#, c-format
+msgid "aggregate %s(*) does not exist"
+msgstr "agregação %s(*) não existe"
+
+#: parser/parse_func.c:1594
+#, c-format
+msgid "aggregate %s does not exist"
+msgstr "agregação %s não existe"
+
+#: parser/parse_func.c:1613
+#, c-format
+msgid "function %s is not an aggregate"
+msgstr "função %s não é uma agregação"
+
+#: parser/scansup.c:190
+#, c-format
+msgid "identifier \"%s\" will be truncated to \"%s\""
+msgstr "identificador \"%s\" será truncado para \"%s\""
+
+#: parser/parse_param.c:215
+#, c-format
+msgid "inconsistent types deduced for parameter $%d"
+msgstr "tipos inconsitentes deduzidos do parâmetro $%d"
+
+#: gram.y:915
+#, c-format
+msgid "unrecognized role option \"%s\""
+msgstr "opção de role desconhecida \"%s\""
+
+#: gram.y:1301
+msgid "current database cannot be changed"
+msgstr "banco de dados atual não pode ser mudado"
+
+#: gram.y:1419 gram.y:1434
+msgid "time zone interval must be HOUR or HOUR TO MINUTE"
+msgstr "intervalo de zona horária deve ser HOUR ou HOUR TO MINUTE"
+
+#: gram.y:1439 gram.y:9246 gram.y:11736
+msgid "interval precision specified twice"
+msgstr "precisão de interval foi especificada duas vezes"
+
+#: gram.y:2887 utils/adt/ri_triggers.c:375 utils/adt/ri_triggers.c:435
+#: utils/adt/ri_triggers.c:598 utils/adt/ri_triggers.c:838
+#: utils/adt/ri_triggers.c:1026 utils/adt/ri_triggers.c:1188
+#: utils/adt/ri_triggers.c:1376 utils/adt/ri_triggers.c:1547
+#: utils/adt/ri_triggers.c:1730 utils/adt/ri_triggers.c:1901
+#: utils/adt/ri_triggers.c:2117 utils/adt/ri_triggers.c:2299
+#: utils/adt/ri_triggers.c:2502 utils/adt/ri_triggers.c:2550
+#: utils/adt/ri_triggers.c:2595 utils/adt/ri_triggers.c:2757
+msgid "MATCH PARTIAL not yet implemented"
+msgstr "MATCH PARTIAL ainda não foi implementado"
+
+#: gram.y:3005
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS não pode especificar INTO"
+
+#: gram.y:4058
+msgid "duplicate trigger events specified"
+msgstr "eventos de gatilho duplicados especificados"
+
+#: gram.y:4160
+msgid "conflicting constraint properties"
+msgstr "propriedades de restrições conflitantes"
+
+#: gram.y:4221
+msgid "CREATE ASSERTION is not yet implemented"
+msgstr "CREATE ASSERTION ainda não foi implementado"
+
+#: gram.y:4237
+msgid "DROP ASSERTION is not yet implemented"
+msgstr "DROP ASSERTION ainda não foi implementado"
+
+#: gram.y:4573
+msgid "RECHECK is no longer required"
+msgstr "RECHECK não é mais requerido"
+
+#: gram.y:4574
+msgid "Update your data type."
+msgstr "Atualize seu tipo de dado."
+
+#: gram.y:6217 utils/adt/regproc.c:630
+msgid "missing argument"
+msgstr "faltando argumento"
+
+#: gram.y:6218 utils/adt/regproc.c:631
+msgid "Use NONE to denote the missing argument of a unary operator."
+msgstr "Utilize NONE para denotar argumento em falta de um operador unário."
+
+#: gram.y:7297 gram.y:7303 gram.y:7309
+msgid "WITH CHECK OPTION is not implemented"
+msgstr "WITH CHECK OPTION não está implementado"
+
+#: gram.y:7986
+msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
+msgstr "lista de colunas não é permitida em CREATE TABLE / AS EXECUTE"
+
+#: gram.y:8210
+msgid "number of columns does not match number of values"
+msgstr "número de colunas não corresponde ao número de valores"
+
+#: gram.y:8660
+msgid "LIMIT #,# syntax is not supported"
+msgstr "sintaxe LIMIT #,# não é suportada"
+
+#: gram.y:8661
+msgid "Use separate LIMIT and OFFSET clauses."
+msgstr "Utilize cláusulas LIMIT e OFFSET separadas."
+
+#: gram.y:8879
+msgid "VALUES in FROM must have an alias"
+msgstr "VALUES no FROM deve ter um aliás"
+
+#: gram.y:8880
+msgid "For example, FROM (VALUES ...) [AS] foo."
+msgstr "Por exemplo, FROM (VALUES ...) [AS] foo."
+
+#: gram.y:8885
+msgid "subquery in FROM must have an alias"
+msgstr "subconsulta no FROM deve ter um aliás"
+
+#: gram.y:8886
+msgid "For example, FROM (SELECT ...) [AS] foo."
+msgstr "Por exemplo, FROM (SELECT ...) [AS] foo."
+
+#: gram.y:9372
+msgid "precision for type float must be at least 1 bit"
+msgstr "precisão para tipo float deve ser pelo menos 1 bit"
+
+#: gram.y:9381
+msgid "precision for type float must be less than 54 bits"
+msgstr "precisão para tipo float deve ser menor do que 54 bits"
+
+#: gram.y:10095
+msgid "UNIQUE predicate is not yet implemented"
+msgstr "predicado UNIQUE ainda não foi implementado"
+
+#: gram.y:11003
+msgid "RANGE PRECEDING is only supported with UNBOUNDED"
+msgstr "RANGE PRECEDING só é suportado com UNBOUNDED"
+
+#: gram.y:11009
+msgid "RANGE FOLLOWING is only supported with UNBOUNDED"
+msgstr "RANGE FOLLOWING só é suportado com UNBOUNDED"
+
+#: gram.y:11036 gram.y:11059
+msgid "frame start cannot be UNBOUNDED FOLLOWING"
+msgstr "início de quadro não pode ser UNBOUNDED FOLLOWING"
+
+#: gram.y:11041
+msgid "frame starting from following row cannot end with current row"
+msgstr ""
+"quadro iniciando do próximo registro não pode terminar com registro atual"
+
+#: gram.y:11064
+msgid "frame end cannot be UNBOUNDED PRECEDING"
+msgstr "fim de quadro não pode ser UNBOUNDED PRECEDING"
+
+#: gram.y:11070
+msgid "frame starting from current row cannot have preceding rows"
+msgstr "quadro iniciando do registro atual não pode ter registros anteriores"
+
+#: gram.y:11077
+msgid "frame starting from following row cannot have preceding rows"
+msgstr "quadro iniciando do próximo registro não pode ter registro anteriores"
+
+#: gram.y:11711
+msgid "type modifier cannot have parameter name"
+msgstr "modificador de tipo não pode ter nome de parâmetro"
+
+#: gram.y:12306 gram.y:12514
+msgid "improper use of \"*\""
+msgstr "uso inválido de \"*\""
+
+#: gram.y:12445
+msgid "wrong number of parameters on left side of OVERLAPS expression"
+msgstr "número incorreto de parâmetros no lado esquerdo da expressão OVERLAPS"
+
+#: gram.y:12452
+msgid "wrong number of parameters on right side of OVERLAPS expression"
+msgstr "número incorreto de parâmetros no lado direito da expressão OVERLAPS"
+
+#: gram.y:12577
+msgid "multiple ORDER BY clauses not allowed"
+msgstr "múltiplas cláusulas ORDER BY não são permitidas"
+
+#: gram.y:12588
+msgid "multiple OFFSET clauses not allowed"
+msgstr "múltiplas cláusulas OFFSET não são permitidas"
+
+#: gram.y:12597
+msgid "multiple LIMIT clauses not allowed"
+msgstr "múltiplas cláusulas LIMIT não são permitidas"
+
+#: gram.y:12606
+msgid "multiple WITH clauses not allowed"
+msgstr "múltiplas cláusulas WITH não são permitidas"
+
+#: gram.y:12751
+msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
+msgstr "argumentos OUT e INOUT não são permitidos em funções TABLE"
+
+#: gram.y:12852
+msgid "multiple COLLATE clauses not allowed"
+msgstr "múltiplas cláusulas COLLATE não são permitidas"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12890 gram.y:12903
+#, c-format
+msgid "%s constraints cannot be marked DEFERRABLE"
+msgstr "restrições %s não podem ser marcadas DEFERRABLE"
+
+#. translator: %s is CHECK, UNIQUE, or similar
+#: gram.y:12916
+#, c-format
+msgid "%s constraints cannot be marked NOT VALID"
+msgstr "restrições %s não podem ser marcadas NOT VALID"
+
+#: parser/parse_oper.c:124 parser/parse_oper.c:718 utils/adt/regproc.c:464
+#: utils/adt/regproc.c:484 utils/adt/regproc.c:643
+#, c-format
+msgid "operator does not exist: %s"
+msgstr "operador não existe: %s"
+
+#: parser/parse_oper.c:221
+msgid "Use an explicit ordering operator or modify the query."
+msgstr "Utilize um operador de ordenação explícito ou modifique a consulta."
+
+#: parser/parse_oper.c:225 utils/adt/rowtypes.c:1157
+#: utils/adt/arrayfuncs.c:3176 utils/adt/arrayfuncs.c:3695
+#, c-format
+msgid "could not identify an equality operator for type %s"
+msgstr "não pôde identificar um operador de igualdade para tipo %s"
+
+#: parser/parse_oper.c:476
+#, c-format
+msgid "operator requires run-time type coercion: %s"
+msgstr "operador requer conversão de tipo em tempo de execução: %s"
 
-#: commands/tsearchcmds.c:312
+#: parser/parse_oper.c:710
 #, c-format
-msgid "text search parser \"%s\" does not exist, skipping"
-msgstr "analisador de busca textual \"%s\" não existe, ignorando"
+msgid "operator is not unique: %s"
+msgstr "operador não é único: %s"
 
-#: commands/tsearchcmds.c:367
-msgid "must be superuser to rename text search parsers"
-msgstr "deve ser super-usuário para renomear analisadores de busca textual"
+#: parser/parse_oper.c:712
+msgid ""
+"Could not choose a best candidate operator. You might need to add explicit "
+"type casts."
+msgstr ""
+"Não pôde escolher um operador que se enquadra melhor. Você precisa adicionar "
+"conversões de tipo explícitas."
 
-#: commands/tsearchcmds.c:385
-#, c-format
-msgid "text search parser \"%s\" already exists"
-msgstr "analisador de busca textual \"%s\" já existe"
+#: parser/parse_oper.c:720
+msgid ""
+"No operator matches the given name and argument type(s). You might need to "
+"add explicit type casts."
+msgstr ""
+"Nenhum operador corresponde com o nome e o(s) tipo(s) de argumento(s) "
+"informados. Você precisa adicionar conversões de tipo explícitas."
 
-#: commands/tsearchcmds.c:462
+#: parser/parse_oper.c:779 parser/parse_oper.c:893
 #, c-format
-msgid "text search template \"%s\" does not accept options"
-msgstr "modelo de busca textual \"%s\" não aceita opções"
+msgid "operator is only a shell: %s"
+msgstr "operador é indefinido: %s"
 
-#: commands/tsearchcmds.c:535
-msgid "text search template is required"
-msgstr "modelo de busca textual é requerido"
+#: parser/parse_oper.c:881
+msgid "op ANY/ALL (array) requires array on right side"
+msgstr "op ANY/ALL (array) requer matriz no lado direito"
 
-#: commands/tsearchcmds.c:600
-#, c-format
-msgid "text search dictionary \"%s\" already exists"
-msgstr "dicionário de busca textual \"%s\" já existe"
+#: parser/parse_oper.c:923
+msgid "op ANY/ALL (array) requires operator to yield boolean"
+msgstr "op ANY/ALL (array) requer operador que retorna booleano"
 
-#: commands/tsearchcmds.c:654 catalog/namespace.c:1871
-#, c-format
-msgid "text search dictionary \"%s\" does not exist"
-msgstr "dicionário de busca textual \"%s\" não existe"
+#: parser/parse_oper.c:928
+msgid "op ANY/ALL (array) requires operator not to return a set"
+msgstr "op ANY/ALL (array) requer operador que não retorne um conjunto"
 
-#: commands/tsearchcmds.c:660
-#, c-format
-msgid "text search dictionary \"%s\" does not exist, skipping"
-msgstr "dicionário de busca textual \"%s\" não existe, ignorando"
+#: parser/analyze.c:471
+msgid "INSERT ... SELECT cannot specify INTO"
+msgstr "INSERT ... SELECT não pode especificar INTO"
 
-#: commands/tsearchcmds.c:990
-msgid "must be superuser to create text search templates"
-msgstr "deve ser super-usuário para criar modelos de busca textual"
+#: parser/analyze.c:564 parser/analyze.c:1070
+msgid "VALUES lists must all be the same length"
+msgstr "listas de VALUES devem ser todas do mesmo tamanho"
 
-#: commands/tsearchcmds.c:1027
-#, c-format
-msgid "text search template parameter \"%s\" not recognized"
-msgstr "parâmetro do modelo de busca textual \"%s\" é desconhecido"
+#: parser/analyze.c:606 parser/analyze.c:1211
+msgid "VALUES must not contain table references"
+msgstr "VALUES não devem conter referências a tabelas"
 
-#: commands/tsearchcmds.c:1037
-msgid "text search template lexize method is required"
-msgstr "método lexize do modelo de busca textual é requerido"
+#: parser/analyze.c:620 parser/analyze.c:1225
+msgid "VALUES must not contain OLD or NEW references"
+msgstr "VALUES não devem conter referências a OLD ou NEW"
 
-#: commands/tsearchcmds.c:1072
-msgid "must be superuser to rename text search templates"
-msgstr "deve ser super-usuário para renomear modelos de busca textual"
+#: parser/analyze.c:621 parser/analyze.c:1226
+msgid "Use SELECT ... UNION ALL ... instead."
+msgstr "Ao invés disso utilize SELECT ... UNION ALL ... ."
 
-#: commands/tsearchcmds.c:1091
-#, c-format
-msgid "text search template \"%s\" already exists"
-msgstr "modelo de busca textual \"%s\" já existe"
+#: parser/analyze.c:725 parser/analyze.c:1238
+msgid "cannot use aggregate function in VALUES"
+msgstr "não pode utilizar função de agregação em VALUES"
 
-#: commands/tsearchcmds.c:1114
-msgid "must be superuser to drop text search templates"
-msgstr "deve ser super-usuário para remover modelos de busca textual"
+#: parser/analyze.c:731 parser/analyze.c:1244
+msgid "cannot use window function in VALUES"
+msgstr "não pode utilizar função deslizante em VALUES"
 
-#: commands/tsearchcmds.c:1137 catalog/namespace.c:1995
-#, c-format
-msgid "text search template \"%s\" does not exist"
-msgstr "modelo de busca textual \"%s\" não existe"
+#: parser/analyze.c:765
+msgid "INSERT has more expressions than target columns"
+msgstr "INSERT tem mais expressões do que colunas alvo"
 
-#: commands/tsearchcmds.c:1143
-#, c-format
-msgid "text search template \"%s\" does not exist, skipping"
-msgstr "modelo de busca textual \"%s\" não existe, ignorando"
+#: parser/analyze.c:783
+msgid "INSERT has more target columns than expressions"
+msgstr "INSERT tem mais colunas alvo do que expressões"
 
-#: commands/tsearchcmds.c:1338
-#, c-format
-msgid "text search configuration parameter \"%s\" not recognized"
-msgstr "parâmetro de configuração de busca textual \"%s\" é desconhecido"
+#: parser/analyze.c:787
+msgid ""
+"The insertion source is a row expression containing the same number of "
+"columns expected by the INSERT. Did you accidentally use extra parentheses?"
+msgstr ""
 
-#: commands/tsearchcmds.c:1345
-msgid "cannot specify both PARSER and COPY options"
-msgstr "não pode especificar ambas opções PARSER e COPY"
+#: parser/analyze.c:1084
+msgid "DEFAULT can only appear in a VALUES list within INSERT"
+msgstr "DEFAULT só pode aparecer em uma lista de VALUES com INSERT"
 
-#: commands/tsearchcmds.c:1373
-msgid "text search parser is required"
-msgstr "analisador de busca textual é requerido"
+#: parser/analyze.c:1192 parser/analyze.c:2414
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
+msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado a VALUES"
 
-#: commands/tsearchcmds.c:1479
-#, c-format
-msgid "text search configuration \"%s\" already exists"
-msgstr "configuração de busca textual \"%s\" já existe"
+#: parser/analyze.c:1337 parser/analyze.c:1534 parser/analyze.c:2263
+#: optimizer/plan/planner.c:959
+msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
+msgstr "SELECT FOR UPDATE/SHARE não é permitido com UNION/INTERSECT/EXCEPT"
 
-#: commands/tsearchcmds.c:1532 commands/tsearchcmds.c:1688
-#: catalog/namespace.c:2118
-#, c-format
-msgid "text search configuration \"%s\" does not exist"
-msgstr "configuração de busca textual \"%s\" não existe"
+#: parser/analyze.c:1452
+msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
+msgstr "cláusula UNION/INTERSECT/EXCEPT ORDER BY é inválida"
 
-#: commands/tsearchcmds.c:1538
-#, c-format
-msgid "text search configuration \"%s\" does not exist, skipping"
-msgstr "configuração de busca textual \"%s\" não existe, ignorando"
+#: parser/analyze.c:1453
+msgid "Only result column names can be used, not expressions or functions."
+msgstr ""
+"Somente nomes de colunas resultantes podem ser utilizadas, e não expressões "
+"ou funções."
 
-#: commands/tsearchcmds.c:1760
-#, c-format
-msgid "token type \"%s\" does not exist"
-msgstr "tipo de elemento \"%s\" não existe"
+#: parser/analyze.c:1454
+msgid ""
+"Add the expression/function to every SELECT, or move the UNION into a FROM "
+"clause."
+msgstr ""
+"Adicione a expressão/função a todos SELECTs ou mova o UNION para uma "
+"cláusula FROM."
 
-#: commands/tsearchcmds.c:1984
-#, c-format
-msgid "mapping for token type \"%s\" does not exist"
-msgstr "mapeamento para tipo de elemento \"%s\" não existe"
+#: parser/analyze.c:1526
+msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
+msgstr "INTO só é permitido no primeiro SELECT do UNION/INTERSECT/EXCEPT"
 
-#: commands/tsearchcmds.c:1990
-#, c-format
-msgid "mapping for token type \"%s\" does not exist, skipping"
-msgstr "mapeamento para tipo de elemento \"%s\" não existe, ignorando"
+#: parser/analyze.c:1586
+msgid ""
+"UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of "
+"same query level"
+msgstr ""
+"comando membro do UNION/INTERSECT/EXCEPT não pode referenciar outras "
+"relações do mesmo nível da consulta"
 
-#: commands/tsearchcmds.c:2143 commands/tsearchcmds.c:2254
+#: parser/analyze.c:1674
 #, c-format
-msgid "invalid parameter list format: \"%s\""
-msgstr "formato de lista de parâmetros é inválido: \"%s\""
+msgid "each %s query must have the same number of columns"
+msgstr "cada consulta %s deve ter o mesmo número de colunas"
 
-#: commands/aggregatecmds.c:103
-#, c-format
-msgid "aggregate attribute \"%s\" not recognized"
-msgstr "atributo da agregação \"%s\" é desconhecido"
+#: parser/analyze.c:1930
+msgid "CREATE TABLE AS specifies too many column names"
+msgstr "CREATE TABLE AS especificou muitos nomes de colunas"
 
-#: commands/aggregatecmds.c:113
-msgid "aggregate stype must be specified"
-msgstr "tipo de transição (stype) da agregação deve ser especificado"
+#: parser/analyze.c:1988
+msgid "cannot use aggregate function in UPDATE"
+msgstr "não pode utilizar função de agregação em UPDATE"
 
-#: commands/aggregatecmds.c:117
-msgid "aggregate sfunc must be specified"
-msgstr "função de transição (sfunc) da agregação deve ser especificado"
+#: parser/analyze.c:1994
+msgid "cannot use window function in UPDATE"
+msgstr "não pode utilizar função deslizante em UPDATE"
 
-#: commands/aggregatecmds.c:134
-msgid "aggregate input type must be specified"
-msgstr "tipo de entrada da agregação deve ser especificado"
+#: parser/analyze.c:2103
+msgid "cannot use aggregate function in RETURNING"
+msgstr "não pode utilizar função de agregação em RETURNING"
 
-#: commands/aggregatecmds.c:159
-msgid "basetype is redundant with aggregate input type specification"
-msgstr ""
-"tipo base é redundante com especificação de tipo de entrada da agregação"
+#: parser/analyze.c:2109
+msgid "cannot use window function in RETURNING"
+msgstr "não pode utilizar função deslizante em RETURNING"
 
-#: commands/aggregatecmds.c:191
-#, c-format
-msgid "aggregate transition data type cannot be %s"
-msgstr "tipo de dado de transição da agregação não pode ser %s"
+#: parser/analyze.c:2128
+msgid "RETURNING cannot contain references to other relations"
+msgstr "RETURNING não pode conter referências a outras relações"
 
-#: commands/aggregatecmds.c:230
-#, c-format
-msgid "aggregate %s(%s) does not exist, skipping"
-msgstr "agregação %s(%s) não existe, ignorando"
+#: parser/analyze.c:2167
+msgid "cannot specify both SCROLL and NO SCROLL"
+msgstr "não pode especificar SCROLL e NO SCROLL"
 
-#: commands/aggregatecmds.c:292 commands/functioncmds.c:1119
-#, c-format
-msgid "function %s already exists in schema \"%s\""
-msgstr "função %s já existe no esquema \"%s\""
+#: parser/analyze.c:2181
+msgid "DECLARE CURSOR cannot specify INTO"
+msgstr "DECLARE CURSOR não pode especificar INTO"
 
-#: commands/trigger.c:149 commands/trigger.c:1063 commands/lockcmds.c:149
-#: commands/indexcmds.c:187 commands/indexcmds.c:1627 commands/tablecmds.c:194
-#: commands/tablecmds.c:1096 commands/tablecmds.c:3354 commands/comment.c:573
-#: catalog/toasting.c:91
-#, c-format
-msgid "\"%s\" is not a table"
-msgstr "\"%s\" não é uma tabela"
+#: parser/analyze.c:2193
+msgid "DECLARE CURSOR must not contain data-modifying statements in WITH"
+msgstr "DECLARE CURSOR não deve conter comandos que modificam dados no WITH"
 
-#: commands/trigger.c:192
-msgid "TRUNCATE FOR EACH ROW triggers are not supported"
-msgstr "gatilhos TRUNCATE FOR EACH ROW não são suportados"
+#: parser/analyze.c:2199
+msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE não é suportado"
 
-#: commands/trigger.c:233
-msgid "cannot use subquery in trigger WHEN condition"
-msgstr "não pode utilizar subconsulta em condição WHEN de gatilho"
+#: parser/analyze.c:2200
+msgid "Holdable cursors must be READ ONLY."
+msgstr "Cursores duráveis devem ser READ ONLY."
 
-#: commands/trigger.c:237
-msgid "cannot use aggregate function in trigger WHEN condition"
-msgstr "não pode utilizar função de agregação em condição WHEN de gatilho"
+#: parser/analyze.c:2213
+msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
+msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE não é suportado"
 
-#: commands/trigger.c:241
-msgid "cannot use window function in trigger WHEN condition"
-msgstr "não pode utilizar função deslizante em condição WHEN de gatilho"
+#: parser/analyze.c:2214
+msgid "Insensitive cursors must be READ ONLY."
+msgstr "Cursores insensíveis devem ser READ ONLY."
 
-#: commands/trigger.c:261 commands/trigger.c:274
-msgid "statement trigger's WHEN condition cannot reference column values"
-msgstr ""
-"condição WHEN de gatilho de comando não pode referenciar valores de coluna"
+#: parser/analyze.c:2267
+msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
+msgstr "SELECT FOR UPDATE/SHARE não é permitido com cláusula DISTINCT"
 
-#: commands/trigger.c:266
-msgid "INSERT trigger's WHEN condition cannot reference OLD values"
-msgstr "condição WHEN de gatilho INSERT não pode referenciar valores OLD"
+#: parser/analyze.c:2271
+msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
+msgstr "SELECT FOR UPDATE/SHARE não é permitido com cláusula GROUP BY"
 
-#: commands/trigger.c:279
-msgid "DELETE trigger's WHEN condition cannot reference NEW values"
-msgstr "condição WHEN de gatilho DELETE não pode referenciar valores NEW"
+#: parser/analyze.c:2275
+msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
+msgstr "SELECT FOR UPDATE/SHARE não é permitido com cláusula HAVING"
 
-#: commands/trigger.c:284
-msgid "BEFORE trigger's WHEN condition cannot reference NEW system columns"
-msgstr ""
-"condição WHEN de gatilho BEFORE não pode referenciar colunas de sistema NEW"
+#: parser/analyze.c:2279
+msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
+msgstr "SELECT FOR UPDATE/SHARE não é permitido com funções de agregação"
 
-#: commands/trigger.c:322
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"trigger\""
-msgstr "alterando tipo retornado pela função %s de \"opaque\" para \"trigger\""
+#: parser/analyze.c:2283
+msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
+msgstr "SELECT FOR UPDATE/SHARE não é permitido com funções deslizantes"
 
-#: commands/trigger.c:329
-#, c-format
-msgid "function %s must return type \"trigger\""
-msgstr "função %s deve retornar tipo \"trigger\""
+#: parser/analyze.c:2287
+#, fuzzy
+msgid ""
+"SELECT FOR UPDATE/SHARE is not allowed with set-returning functions in the "
+"target list"
+msgstr ""
+"SELECT FOR UPDATE/SHARE não é permitido em funções que retornam conjunto na "
+"lista alvo"
 
-#: commands/trigger.c:438 commands/trigger.c:1152
+#: parser/analyze.c:2366
+msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
+msgstr ""
+"SELECT FOR UPDATE/SHARE deve especificar nomes de relação não qualificados"
+
+#: parser/analyze.c:2383
 #, c-format
-msgid "trigger \"%s\" for relation \"%s\" already exists"
-msgstr "gatilho \"%s\" para relação \"%s\" já existe"
+msgid "SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\""
+msgstr ""
+"SELECT FOR UPDATE/SHARE não pode ser utilizado com tabela externa \"%s\""
 
-#: commands/trigger.c:719
-msgid "Found referenced table's UPDATE trigger."
-msgstr "Encontrado gatilho de UPDATE na tabela referenciada."
+#: parser/analyze.c:2402
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
+msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado em uma junção"
 
-#: commands/trigger.c:720
-msgid "Found referenced table's DELETE trigger."
-msgstr "Encontrado gatilho de DELETE na tabela referenciada."
+#: parser/analyze.c:2408
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
+msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado a uma função"
 
-#: commands/trigger.c:721
-msgid "Found referencing table's trigger."
-msgstr "Encontrado gatilho na tabela referenciada."
+#: parser/analyze.c:2420
+msgid "SELECT FOR UPDATE/SHARE cannot be applied to a WITH query"
+msgstr "SELECT FOR UPDATE/SHARE não pode ser aplicado em uma consulta WITH"
 
-#: commands/trigger.c:830 commands/trigger.c:846
+#: parser/analyze.c:2434
 #, c-format
-msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
-msgstr "ignorando grupo de gatilhos incompletos para restrição \"%s\" %s"
+msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
+msgstr ""
+"relação \"%s\" na cláusula FOR UPDATE/SHARE não foi encontrada na cláusula "
+"FROM"
 
-#: commands/trigger.c:858
+#: parser/parse_type.c:83
 #, c-format
-msgid "converting trigger group into constraint \"%s\" %s"
-msgstr "convertendo grupo de gatilhos na restrição \"%s\" %s"
+msgid "improper %%TYPE reference (too few dotted names): %s"
+msgstr "referência a %%TYPE é inválida (nomes com poucos pontos): %s"
 
-#: commands/trigger.c:994 commands/trigger.c:1194 commands/trigger.c:1305
-#: commands/comment.c:1105
+#: parser/parse_type.c:105
 #, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist"
-msgstr "gatilho \"%s\" na tabela \"%s\" não existe"
+msgid "improper %%TYPE reference (too many dotted names): %s"
+msgstr "referência a %%TYPE é inválida (nomes com muitos pontos): %s"
 
-#: commands/trigger.c:998
+#: parser/parse_type.c:127
 #, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
-msgstr "gatilho \"%s\" para tabela \"%s\" não existe, ignorando"
+msgid "type reference %s converted to %s"
+msgstr "referência a tipo %s convertido para %s"
 
-#: commands/trigger.c:1273
+#: parser/parse_type.c:202 utils/cache/typcache.c:195
 #, c-format
-msgid "permission denied: \"%s\" is a system trigger"
-msgstr "permissão negada: \"%s\" é um gatilho do sistema"
+msgid "type \"%s\" is only a shell"
+msgstr "tipo \"%s\" é indefinido"
 
-#: commands/trigger.c:1848
+#: parser/parse_type.c:287
 #, c-format
-msgid "trigger function %u returned null value"
-msgstr "função de gatilho %u retornou valor nulo"
+msgid "type modifier is not allowed for type \"%s\""
+msgstr "modificador de tipo não é permitido para tipo \"%s\""
 
-#: commands/trigger.c:1908 commands/trigger.c:2023 commands/trigger.c:2160
-#: commands/trigger.c:2304
-msgid "BEFORE STATEMENT trigger cannot return a value"
-msgstr "gatilho BEFORE STATEMENT não pode retornar um valor"
+#: parser/parse_type.c:330
+msgid "type modifiers must be simple constants or identifiers"
+msgstr "modificadores de tipo devem ser constantes ou identificadores"
 
-#: commands/trigger.c:3930 catalog/namespace.c:232 catalog/namespace.c:306
+#: parser/parse_type.c:641 parser/parse_type.c:740
 #, c-format
-msgid "cross-database references are not implemented: \"%s.%s.%s\""
-msgstr ""
-"referências cruzadas entre bancos de dados não estão implementadas: \"%s.%s."
-"%s\""
+msgid "invalid type name \"%s\""
+msgstr "nome de tipo \"%s\" é inválido"
 
-#: commands/trigger.c:3981
+#: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:163 libpq/be-fsstubs.c:189
+#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:519
 #, c-format
-msgid "constraint \"%s\" is not deferrable"
-msgstr "restrição \"%s\" não é postergável"
+msgid "invalid large-object descriptor: %d"
+msgstr "descritor de objeto grande é inválido: %d"
 
-#: commands/trigger.c:4004
+#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:529
 #, c-format
-msgid "constraint \"%s\" does not exist"
-msgstr "restrição \"%s\" não existe"
-
-#: commands/proclang.c:92
-msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
-msgstr ""
-"utilizando informação de pg_pltemplate ao invés dos parâmetros de CREATE "
-"LANGUAGE"
+msgid "permission denied for large object %u"
+msgstr "permissão negada para objeto grande %u"
 
-#: commands/proclang.c:102
+#: libpq/be-fsstubs.c:194
 #, c-format
-msgid "must be superuser to create procedural language \"%s\""
-msgstr "deve ser super-usuário para criar linguagem procedural \"%s\""
+msgid "large object descriptor %d was not opened for writing"
+msgstr "descritor de objeto grande %d não foi aberto para escrita"
+
+#: libpq/be-fsstubs.c:392
+msgid "must be superuser to use server-side lo_import()"
+msgstr "deve ser super-usuário para utilizar lo_import() do servidor"
+
+#: libpq/be-fsstubs.c:393
+msgid "Anyone can use the client-side lo_import() provided by libpq."
+msgstr "Qualquer um pode utilizar lo_import() do cliente fornecido pela libpq."
 
-#: commands/proclang.c:122 commands/proclang.c:278
+#: libpq/be-fsstubs.c:406
 #, c-format
-msgid "function %s must return type \"language_handler\""
-msgstr "função %s deve retornar tipo \"language_handler\""
+msgid "could not open server file \"%s\": %m"
+msgstr "não pôde abrir arquivo \"%s\" no servidor: %m"
 
-#: commands/proclang.c:242
+#: libpq/be-fsstubs.c:428
 #, c-format
-msgid "unsupported language \"%s\""
-msgstr "linguagem \"%s\" não é suportada"
+msgid "could not read server file \"%s\": %m"
+msgstr "não pôde ler arquivo \"%s\" no servidor: %m"
 
-#: commands/proclang.c:244
-msgid "The supported languages are listed in the pg_pltemplate system catalog."
-msgstr ""
-"As linguagens suportadas estão listadas no catálogo do sistema pg_pltemplate."
+#: libpq/be-fsstubs.c:458
+msgid "must be superuser to use server-side lo_export()"
+msgstr "deve ser super-usuário para utilizar lo_export() do servidor"
 
-#: commands/proclang.c:252
-msgid "must be superuser to create custom procedural language"
-msgstr "deve ser super-usuário para criar linguagem procedural personalizada"
+#: libpq/be-fsstubs.c:459
+msgid "Anyone can use the client-side lo_export() provided by libpq."
+msgstr "Qualquer um pode utilizar lo_export() do cliente fornecido pela libpq."
 
-#: commands/proclang.c:271
+#: libpq/be-fsstubs.c:484
 #, c-format
-msgid ""
-"changing return type of function %s from \"opaque\" to \"language_handler\""
-msgstr ""
-"alterando tipo de retorno da função %s de \"opaque\" para \"language_handler"
-"\""
+msgid "could not create server file \"%s\": %m"
+msgstr "não pôde criar arquivo \"%s\" no servidor: %m"
 
-#: commands/proclang.c:356 commands/proclang.c:606
+#: libpq/be-fsstubs.c:496
 #, c-format
-msgid "language \"%s\" already exists"
-msgstr "linguagem \"%s\" já existe"
+msgid "could not write server file \"%s\": %m"
+msgstr "não pôde escrever no arquivo \"%s\" no servidor: %m"
 
-#: commands/proclang.c:534
-#, c-format
-msgid "language \"%s\" does not exist, skipping"
-msgstr "linguagem \"%s\" não existe, ignorando"
+#: libpq/pqformat.c:436
+msgid "no data left in message"
+msgstr "nenhum dado na mensagem"
 
-#: commands/conversioncmds.c:69
-#, c-format
-msgid "source encoding \"%s\" does not exist"
-msgstr "codificação de origem \"%s\" não existe"
+#: libpq/pqformat.c:556 libpq/pqformat.c:574 libpq/pqformat.c:595
+#: utils/adt/rowtypes.c:557 utils/adt/arrayfuncs.c:1411
+msgid "insufficient data left in message"
+msgstr "dados insuficientes na mensagem"
 
-#: commands/conversioncmds.c:76
-#, c-format
-msgid "destination encoding \"%s\" does not exist"
-msgstr "codificação de destino \"%s\" não existe"
+#: libpq/pqformat.c:636
+msgid "invalid string in message"
+msgstr "cadeia de caracteres é inválida na mensagem"
 
-#: commands/conversioncmds.c:90
-#, c-format
-msgid "encoding conversion function %s must return type \"void\""
-msgstr "função de conversão de codificação %s deve retornar tipo \"void\""
+#: libpq/pqformat.c:652
+msgid "invalid message format"
+msgstr "formato de mensagem é inválido"
 
-#: commands/conversioncmds.c:153 commands/conversioncmds.c:209
-#: commands/conversioncmds.c:262 commands/comment.c:1183
+#: libpq/pqcomm.c:306
 #, c-format
-msgid "conversion \"%s\" does not exist"
-msgstr "conversão \"%s\" não existe"
+msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
+msgstr ""
+"não pôde traduzir nome da máquina \"%s\", serviço \"%s\" para endereço: %s"
 
-#: commands/conversioncmds.c:159
+#: libpq/pqcomm.c:310
 #, c-format
-msgid "conversion \"%s\" does not exist, skipping"
-msgstr "conversão \"%s\" não existe, ignorando"
+msgid "could not translate service \"%s\" to address: %s"
+msgstr "não pôde traduzir serviço \"%s\" para endereço: %s"
 
-#: commands/conversioncmds.c:224
+#: libpq/pqcomm.c:337
 #, c-format
-msgid "conversion \"%s\" already exists in schema \"%s\""
-msgstr "conversão \"%s\" já existe no esquema \"%s\""
+msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
+msgstr ""
+"não pôde se ligar a todos os endereços informados: MAXLISTEN (%d) excedeu"
 
-#: commands/lockcmds.c:93
-#, c-format
-msgid "could not obtain lock on relation \"%s\""
-msgstr "não pôde obter bloqueio na relação \"%s\""
+#: libpq/pqcomm.c:346
+msgid "IPv4"
+msgstr "IPv4"
 
-#: commands/lockcmds.c:98
-#, c-format
-msgid "could not obtain lock on relation with OID %u"
-msgstr "não pôde obter bloqueio na relação com OID %u"
+#: libpq/pqcomm.c:350
+msgid "IPv6"
+msgstr "IPv6"
 
-#: commands/copy.c:312 commands/copy.c:324 commands/copy.c:358
-#: commands/copy.c:368
-msgid "COPY BINARY is not supported to stdout or from stdin"
-msgstr "COPY BINARY não é suportado para saída stdout ou da entrada padrão"
+#: libpq/pqcomm.c:355
+msgid "Unix"
+msgstr "Unix"
 
-#: commands/copy.c:446
+#: libpq/pqcomm.c:360
 #, c-format
-msgid "could not write to COPY file: %m"
-msgstr "não pôde escrever em arquivo COPY: %m"
-
-#: commands/copy.c:458
-msgid "connection lost during COPY to stdout"
-msgstr "conexão perdida durante COPY para saída stdout"
+msgid "unrecognized address family %d"
+msgstr "família de endereços %d desconhecida"
 
-#: commands/copy.c:499
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:371
 #, c-format
-msgid "could not read from COPY file: %m"
-msgstr "não pôde ler de arquivo COPY: %m"
+msgid "could not create %s socket: %m"
+msgstr "não pôde criar soquete %s: %m"
 
-#: commands/copy.c:550
+#: libpq/pqcomm.c:396
 #, c-format
-msgid "COPY from stdin failed: %s"
-msgstr "COPY da entrada padrão falhou: %s"
+msgid "setsockopt(SO_REUSEADDR) failed: %m"
+msgstr "setsockopt(SO_REUSEADDR) falhou: %m"
 
-#: commands/copy.c:566
+#: libpq/pqcomm.c:411
 #, c-format
-msgid "unexpected message type 0x%02X during COPY from stdin"
-msgstr "tipo de mensagem inesperada 0x%02X durante COPY da entrada padrão"
-
-#: commands/copy.c:751 commands/copy.c:769 commands/copy.c:777
-#: commands/copy.c:785 commands/copy.c:793 commands/copy.c:801
-#: commands/copy.c:809 commands/copy.c:817 commands/copy.c:833
-#: commands/dbcommands.c:146 commands/dbcommands.c:154
-#: commands/dbcommands.c:162 commands/dbcommands.c:170
-#: commands/dbcommands.c:178 commands/dbcommands.c:186
-#: commands/dbcommands.c:194 commands/dbcommands.c:1315
-#: commands/dbcommands.c:1323 commands/typecmds.c:274 commands/user.c:140
-#: commands/user.c:157 commands/user.c:165 commands/user.c:173
-#: commands/user.c:181 commands/user.c:189 commands/user.c:197
-#: commands/user.c:205 commands/user.c:213 commands/user.c:221
-#: commands/user.c:229 commands/user.c:467 commands/user.c:479
-#: commands/user.c:487 commands/user.c:495 commands/user.c:503
-#: commands/user.c:511 commands/user.c:519 commands/user.c:528
-#: commands/user.c:536 commands/functioncmds.c:485 commands/functioncmds.c:575
-#: commands/functioncmds.c:583 commands/functioncmds.c:591
-#: commands/functioncmds.c:1953 commands/functioncmds.c:1961
-#: commands/sequence.c:1025 commands/sequence.c:1033 commands/sequence.c:1041
-#: commands/sequence.c:1049 commands/sequence.c:1057 commands/sequence.c:1065
-#: commands/sequence.c:1073 commands/sequence.c:1081 catalog/aclchk.c:869
-#: catalog/aclchk.c:877
-msgid "conflicting or redundant options"
-msgstr "opções conflitantes ou redundantes"
+msgid "setsockopt(IPV6_V6ONLY) failed: %m"
+msgstr "setsockopt(IPV6_V6ONLY) falhou: %m"
 
-#: commands/copy.c:762
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:430
 #, c-format
-msgid "COPY format \"%s\" not recognized"
-msgstr "formato COPY \"%s\" desconhecido"
+msgid "could not bind %s socket: %m"
+msgstr "não pôde se ligar ao soquete %s: %m"
 
-#: commands/copy.c:825 commands/copy.c:839
+#: libpq/pqcomm.c:433
 #, c-format
-msgid "argument to option \"%s\" must be a list of column names"
-msgstr "argumento para opção \"%s\" deve ser uma lista de nomes de colunas"
+msgid ""
+"Is another postmaster already running on port %d? If not, remove socket file "
+"\"%s\" and retry."
+msgstr ""
+"Outro postmaster já está executando na porta %d? Se não, remova o arquivo de "
+"soquete \"%s\" e tente novamente."
 
-#: commands/copy.c:845
+#: libpq/pqcomm.c:436
 #, c-format
-msgid "option \"%s\" not recognized"
-msgstr "opção \"%s\" desconhecida"
-
-#: commands/copy.c:856
-msgid "cannot specify DELIMITER in BINARY mode"
-msgstr "não pode especificar DELIMITER no modo BINARY"
-
-#: commands/copy.c:861
-msgid "cannot specify NULL in BINARY mode"
-msgstr "não pode especificar NULL no modo BINARY"
+msgid ""
+"Is another postmaster already running on port %d? If not, wait a few seconds "
+"and retry."
+msgstr ""
+"Outro postmaster já está executando na porta %d? Se não, espere alguns "
+"segundos e tente novamente."
 
-#: commands/copy.c:883
-msgid "COPY delimiter must be a single one-byte character"
-msgstr "delimitador do COPY deve ter um único caracter de um byte"
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:469
+#, c-format
+msgid "could not listen on %s socket: %m"
+msgstr "não pôde escutar no soquete %s: %m"
 
-#: commands/copy.c:890
-msgid "COPY delimiter cannot be newline or carriage return"
-msgstr "delimitador do COPY não pode ser nova linha ou retorno de carro"
+#: libpq/pqcomm.c:554
+#, c-format
+msgid "group \"%s\" does not exist"
+msgstr "grupo \"%s\" não existe"
 
-#: commands/copy.c:896
-msgid "COPY null representation cannot use newline or carriage return"
-msgstr ""
-"representação do nulo do COPY não pode ser nova linha ou retorno de carro"
+#: libpq/pqcomm.c:564
+#, c-format
+msgid "could not set group of file \"%s\": %m"
+msgstr "não pôde definir grupo do arquivo \"%s\": %m"
 
-#: commands/copy.c:913
+#: libpq/pqcomm.c:575
 #, c-format
-msgid "COPY delimiter cannot be \"%s\""
-msgstr "delimitador do COPY não pode ser \"%s\""
+msgid "could not set permissions of file \"%s\": %m"
+msgstr "não pôde definir permissões do arquivo \"%s\": %m"
 
-#: commands/copy.c:919
-msgid "COPY HEADER available only in CSV mode"
-msgstr "COPY HEADER só está disponível no modo CSV"
+#: libpq/pqcomm.c:605
+#, c-format
+msgid "could not accept new connection: %m"
+msgstr "não pôde aceitar nova conexão: %m"
 
-#: commands/copy.c:925
-msgid "COPY quote available only in CSV mode"
-msgstr "delimitador de dados do COPY só está disponível no modo CSV"
+#: libpq/pqcomm.c:773
+#, c-format
+msgid "could not set socket to non-blocking mode: %m"
+msgstr "não pôde configurar o soquete para modo não-bloqueado: %m"
 
-#: commands/copy.c:930
-msgid "COPY quote must be a single one-byte character"
-msgstr "delimitador de dados do COPY deve ter um único caracter de um byte"
+#: libpq/pqcomm.c:779
+#, c-format
+msgid "could not set socket to blocking mode: %m"
+msgstr "não pôde configurar o soquete para modo bloqueado: %m"
 
-#: commands/copy.c:935
-msgid "COPY delimiter and quote must be different"
-msgstr "delimitador e delimitador de dados do COPY devem ser diferentes"
+#: libpq/pqcomm.c:831 libpq/pqcomm.c:921
+#, c-format
+msgid "could not receive data from client: %m"
+msgstr "não pôde receber dados do cliente: %m"
 
-#: commands/copy.c:941
-msgid "COPY escape available only in CSV mode"
-msgstr "escape do COPY só está disponível no modo CSV"
+#: libpq/pqcomm.c:1072
+msgid "unexpected EOF within message length word"
+msgstr "EOF inesperado dentro da palavra de tamanho de mensagem"
 
-#: commands/copy.c:946
-msgid "COPY escape must be a single one-byte character"
-msgstr "escape do COPY deve ter um único caracter de um byte"
+#: libpq/pqcomm.c:1083
+msgid "invalid message length"
+msgstr "tamanho de mensagem é inválido"
 
-#: commands/copy.c:952
-msgid "COPY force quote available only in CSV mode"
-msgstr "opção force quote do COPY somente está disponível no modo CSV"
+#: libpq/pqcomm.c:1105 libpq/pqcomm.c:1115
+msgid "incomplete message from client"
+msgstr "mensagem incompleta do cliente"
 
-#: commands/copy.c:956
-msgid "COPY force quote only available using COPY TO"
-msgstr "opção force quote do COPY somente está disponível ao utilizar COPY TO"
+#: libpq/pqcomm.c:1245
+#, c-format
+msgid "could not send data to client: %m"
+msgstr "não pôde enviar dados para cliente: %m"
 
-#: commands/copy.c:962
-msgid "COPY force not null available only in CSV mode"
-msgstr "opção force not null do COPY somente está disponível no modo CSV"
+#: libpq/be-secure.c:283 libpq/be-secure.c:378
+#, c-format
+msgid "SSL error: %s"
+msgstr "erro de SSL: %s"
 
-#: commands/copy.c:966
-msgid "COPY force not null only available using COPY FROM"
-msgstr ""
-"opção force not null do COPY somente está disponível ao utilizar COPY FROM"
+#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:957
+#, c-format
+msgid "unrecognized SSL error code: %d"
+msgstr "código de erro SSL desconhecido: %d"
 
-#: commands/copy.c:972
-msgid "COPY delimiter must not appear in the NULL specification"
-msgstr "delimitador do COPY não deve aparecer em uma especificação NULL"
+#: libpq/be-secure.c:331 libpq/be-secure.c:335 libpq/be-secure.c:345
+msgid "SSL renegotiation failure"
+msgstr "renegociação SSL falhou"
 
-#: commands/copy.c:979
-msgid "CSV quote character must not appear in the NULL specification"
-msgstr ""
-"caracter delimitador de dados do CSV não deve aparecer na especificação NULL"
+#: libpq/be-secure.c:339
+msgid "SSL failed to send renegotiation request"
+msgstr "SSL falhou ao enviar pedido de renegociação"
 
-#: commands/copy.c:985
-msgid "must be superuser to COPY to or from a file"
-msgstr "deve ser super-usuário para utilizar COPY para ou de um arquivo"
+#: libpq/be-secure.c:736
+#, c-format
+msgid "could not create SSL context: %s"
+msgstr "não pôde criar contexto SSL: %s"
 
-#: commands/copy.c:986
-msgid ""
-"Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
-"for anyone."
-msgstr ""
-"Qualquer um pode utilizar COPY para saída stdout ou da entrada padrão. "
-"comando \\copy do psql também funciona para qualquer um."
+#: libpq/be-secure.c:752
+#, c-format
+msgid "could not load server certificate file \"%s\": %s"
+msgstr "não pôde carregar arquivo de certificado do servidor \"%s\": %s"
 
-#: commands/copy.c:1032
+#: libpq/be-secure.c:758
 #, c-format
-msgid "table \"%s\" does not have OIDs"
-msgstr "tabela \"%s\" não tem OIDs"
+msgid "could not access private key file \"%s\": %m"
+msgstr "não pôde acessar arquivo da chave privada \"%s\": %m"
 
-#: commands/copy.c:1049
-msgid "COPY (SELECT) WITH OIDS is not supported"
-msgstr "COPY (SELECT) WITH OIDS não é mais suportado"
+#: libpq/be-secure.c:773
+#, c-format
+msgid "private key file \"%s\" has group or world access"
+msgstr "arquivo da chave privada \"%s\" tem acesso para grupo ou outros"
 
-#: commands/copy.c:1076
-msgid "COPY (SELECT INTO) is not supported"
-msgstr "COPY (SELECT INTO) não é suportado"
+#: libpq/be-secure.c:775
+msgid "Permissions should be u=rw (0600) or less."
+msgstr "Permissões devem ser u=rwx (0600) ou menos."
 
-#: commands/copy.c:1135
+#: libpq/be-secure.c:782
 #, c-format
-msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
-msgstr "coluna do tipo FORCE QUOTE \"%s\" não é referenciada pelo COPY"
+msgid "could not load private key file \"%s\": %s"
+msgstr "não pôde carregar arquivo da chave privada \"%s\": %s"
 
-#: commands/copy.c:1157
+#: libpq/be-secure.c:787
 #, c-format
-msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
-msgstr "coluna do tipo FORCE NOT NULL \"%s\" não é referenciada pelo COPY"
+msgid "check of private key failed: %s"
+msgstr "verificação de chave privada falhou: %s"
 
-#: commands/copy.c:1235
+#: libpq/be-secure.c:815
 #, c-format
-msgid "cannot copy from view \"%s\""
-msgstr "não pode copiar visão \"%s\""
+msgid "could not access root certificate file \"%s\": %m"
+msgstr "não pôde acessar arquivo do certificado raiz \"%s\": %m"
 
-#: commands/copy.c:1237
-msgid "Try the COPY (SELECT ...) TO variant."
-msgstr "Tente a variante COPY (SELECT ...) TO."
+#: libpq/be-secure.c:826
+#, c-format
+msgid "could not load root certificate file \"%s\": %s"
+msgstr "não pôde carregar arquivo do certificado raiz \"%s\": %s"
 
-#: commands/copy.c:1241
+#: libpq/be-secure.c:849
 #, c-format
-msgid "cannot copy from sequence \"%s\""
-msgstr "não pode copiar sequência \"%s\""
+msgid "SSL certificate revocation list file \"%s\" ignored"
+msgstr "arquivo da lista de revogação de certificados SSL \"%s\" ignorado"
+
+#: libpq/be-secure.c:851
+msgid "SSL library does not support certificate revocation lists."
+msgstr ""
+"biblioteca SSL instalada não suporta listas de revogação de certificados."
 
-#: commands/copy.c:1246
+#: libpq/be-secure.c:858
 #, c-format
-msgid "cannot copy from non-table relation \"%s\""
-msgstr "não pode copiar relação \"%s\" que não é uma tabela"
+msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
+msgstr ""
+"arquivo da lista de revogação de certificados SSL (CRL) \"%s\" não foi "
+"encontrado, ignorando: %s"
 
-#: commands/copy.c:1270
-msgid "relative path not allowed for COPY to file"
-msgstr "caminho relativo não é permitido pelo COPY para arquivo"
+#: libpq/be-secure.c:860
+msgid "Certificates will not be checked against revocation list."
+msgstr "Certificados não serão verificados na lista de revogação."
 
-#: commands/copy.c:1279
+#: libpq/be-secure.c:902
 #, c-format
-msgid "could not open file \"%s\" for writing: %m"
-msgstr "não pôde abrir arquivo \"%s\" para escrita: %m"
+msgid "could not initialize SSL connection: %s"
+msgstr "não pôde inicializar conexão SSL: %s"
 
-#: commands/copy.c:1286 commands/copy.c:1781
+#: libpq/be-secure.c:911
 #, c-format
-msgid "\"%s\" is a directory"
-msgstr "\"%s\" é um diretório"
+msgid "could not set SSL socket: %s"
+msgstr "não pôde criar soquete SSL: %s"
 
-#: commands/copy.c:1572
+#: libpq/be-secure.c:937
 #, c-format
-msgid "COPY %s, line %d, column %s"
-msgstr "COPY %s, linha %d, coluna %s"
+msgid "could not accept SSL connection: %m"
+msgstr "não pôde aceitar conexão SSL: %m"
+
+#: libpq/be-secure.c:941 libpq/be-secure.c:952
+msgid "could not accept SSL connection: EOF detected"
+msgstr "não pôde aceitar conexão SSL: EOF detectado"
 
-#: commands/copy.c:1576 commands/copy.c:1621
+#: libpq/be-secure.c:946
 #, c-format
-msgid "COPY %s, line %d"
-msgstr "COPY %s, linha %d"
+msgid "could not accept SSL connection: %s"
+msgstr "não pôde aceitar conexão SSL: %s"
+
+#: libpq/be-secure.c:997
+msgid "SSL certificate's common name contains embedded null"
+msgstr "nome do certificado SSL contém nulo embutido"
 
-#: commands/copy.c:1587
+#: libpq/be-secure.c:1004
 #, c-format
-msgid "COPY %s, line %d, column %s: \"%s\""
-msgstr "COPY %s, linha %d, coluna %s: \"%s\""
+msgid "SSL connection from \"%s\""
+msgstr "conexão SSL de \"%s\""
 
-#: commands/copy.c:1595
+#: libpq/be-secure.c:1048
+msgid "no SSL error reported"
+msgstr "nenhum erro SSL relatado"
+
+#: libpq/be-secure.c:1052
 #, c-format
-msgid "COPY %s, line %d, column %s: null input"
-msgstr "COPY %s, linha %d, coluna %s: entrada nula"
+msgid "SSL error code %lu"
+msgstr "código de erro SSL %lu"
 
-#: commands/copy.c:1607
+#: libpq/hba.c:160
 #, c-format
-msgid "COPY %s, line %d: \"%s\""
-msgstr "COPY %s, linha %d: \"%s\""
+msgid "authentication file token too long, skipping: \"%s\""
+msgstr "informação no arquivo de autenticação é muito longa, ignorando: \"%s\""
 
-#: commands/copy.c:1709
+#: libpq/hba.c:355
 #, c-format
-msgid "cannot copy to view \"%s\""
-msgstr "não pode copiar para visão \"%s\""
+msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
+msgstr ""
+"não pôde abrir arquivo de autenticação secundário \"@%s\" como \"%s\": %m"
 
-#: commands/copy.c:1714
+#: libpq/hba.c:628
 #, c-format
-msgid "cannot copy to sequence \"%s\""
-msgstr "não pode copiar para sequência \"%s\""
+msgid "could not translate host name \"%s\" to address: %s"
+msgstr "não pôde traduzir nome da máquina \"%s\" para endereço: %s"
 
-#: commands/copy.c:1719
+#. translator: the second %s is a list of auth methods
+#: libpq/hba.c:779
 #, c-format
-msgid "cannot copy to non-table relation \"%s\""
-msgstr "não pode copiar para relação \"%s\" que não é uma tabela"
+msgid ""
+"authentication option \"%s\" is only valid for authentication methods %s"
+msgstr ""
+"opção de autenticação \"%s\" só é válida para métodos de autenticação %s"
 
-#: commands/copy.c:1887
-msgid "COPY file signature not recognized"
-msgstr "assinatura de arquivo COPY é desconhecida"
+#: libpq/hba.c:795
+#, c-format
+msgid "authentication method \"%s\" requires argument \"%s\" to be set"
+msgstr ""
+"método de autenticação \"%s\" requer que argumento \"%s\" seja definido"
 
-#: commands/copy.c:1892
-msgid "invalid COPY file header (missing flags)"
-msgstr "cabeçalho de arquivo COPY é inválido (faltando marcações)"
+#: libpq/hba.c:832
+msgid "local connections are not supported by this build"
+msgstr "conexões locais não são suportadas por essa construção"
 
-#: commands/copy.c:1898
-msgid "unrecognized critical flags in COPY file header"
-msgstr "marcações críticas desconhecidas no cabeçalho do arquivo COPY"
+#: libpq/hba.c:853
+msgid "hostssl requires SSL to be turned on"
+msgstr "hostssl requer que SSL esteja habilitado"
 
-#: commands/copy.c:1904
-msgid "invalid COPY file header (missing length)"
-msgstr "cabeçalho de arquivo COPY é inválido (faltando tamanho)"
+#: libpq/hba.c:854
+msgid "Set ssl = on in postgresql.conf."
+msgstr "Defina ssl = on no postgresql.conf."
 
-#: commands/copy.c:1911
-msgid "invalid COPY file header (wrong length)"
-msgstr "cabeçalho de arquivo COPY é inválido (tamanho incorreto)"
+#: libpq/hba.c:862
+msgid "hostssl is not supported by this build"
+msgstr "hostssl não é suportado por essa construção"
 
-#: commands/copy.c:2002
-msgid "missing data for OID column"
-msgstr "faltando dados da coluna OID"
+#: libpq/hba.c:863
+msgid "Compile with --with-openssl to use SSL connections."
+msgstr "Compile com --with-openssl para utilizar conexões SSL."
 
-#: commands/copy.c:2008
-msgid "null OID in COPY data"
-msgstr "OID nulo em dados do COPY"
+#: libpq/hba.c:885
+#, c-format
+msgid "invalid connection type \"%s\""
+msgstr "tipo de conexão \"%s\" inválido"
 
-#: commands/copy.c:2018 commands/copy.c:2090
-msgid "invalid OID in COPY data"
-msgstr "OID inválido em dados do COPY"
+#: libpq/hba.c:898
+msgid "end-of-line before database specification"
+msgstr "fim de linha antes da especificação de banco de dados"
 
-#: commands/copy.c:2033
-#, c-format
-msgid "missing data for column \"%s\""
-msgstr "faltando dados da coluna \"%s\""
+#: libpq/hba.c:911
+msgid "end-of-line before role specification"
+msgstr "fim de linha antes da especificação de role"
+
+#: libpq/hba.c:926
+msgid "end-of-line before IP address specification"
+msgstr "fim de linha antes da especificação de endereço IP"
 
-#: commands/copy.c:2074
+#: libpq/hba.c:980
 #, c-format
-msgid "row field count is %d, expected %d"
-msgstr "quantidade de campos do registro é %d, esperado %d"
+msgid "invalid IP address \"%s\": %s"
+msgstr "endereço IP \"%s\" inválido: %s"
 
-#: commands/copy.c:2494 commands/copy.c:2511
-msgid "literal carriage return found in data"
-msgstr "retorno de carro foi encontrado em dados"
+#: libpq/hba.c:1000
+#, c-format
+msgid "specifying both host name and CIDR mask is invalid: \"%s\""
+msgstr "especificar nome da máquina e máscara CIDR é inválido: \"%s\""
 
-#: commands/copy.c:2495 commands/copy.c:2512
-msgid "unquoted carriage return found in data"
-msgstr "retorno de carros sem aspas foi encontrado em dados"
+#: libpq/hba.c:1014
+#, c-format
+msgid "invalid CIDR mask in address \"%s\""
+msgstr "máscara CIDR inválida no endereço \"%s\""
 
-#: commands/copy.c:2497 commands/copy.c:2514
-msgid "Use \"\\r\" to represent carriage return."
-msgstr "Utilize \"\\r\" para representar retorno de carro."
+#: libpq/hba.c:1032
+msgid "end-of-line before netmask specification"
+msgstr "fim de linha antes da especificação de máscara de rede"
 
-#: commands/copy.c:2498 commands/copy.c:2515
-msgid "Use quoted CSV field to represent carriage return."
-msgstr "Utilize campo entre aspas do CSV para representar retorno de carro."
+#: libpq/hba.c:1044
+#, c-format
+msgid "invalid IP mask \"%s\": %s"
+msgstr "máscara de endereço IP \"%s\" inválida: %s"
 
-#: commands/copy.c:2527
-msgid "literal newline found in data"
-msgstr "nova linha foi encontrada em dados"
+#: libpq/hba.c:1061
+msgid "IP address and mask do not match"
+msgstr "endereço IP e máscara não correspodem"
 
-#: commands/copy.c:2528
-msgid "unquoted newline found in data"
-msgstr "nova linha sem aspas foi encontrada em dados"
+#: libpq/hba.c:1076
+msgid "end-of-line before authentication method"
+msgstr "fim de linha antes do método de autenticação"
 
-#: commands/copy.c:2530
-msgid "Use \"\\n\" to represent newline."
-msgstr "Utilize \"\\n\" para representar nova linha."
+#: libpq/hba.c:1118 libpq/auth.c:539
+msgid ""
+"MD5 authentication is not supported when \"db_user_namespace\" is enabled"
+msgstr ""
+"autenticação MD5 não é suportada quando \"db_user_namespace\" está habilitado"
 
-#: commands/copy.c:2531
-msgid "Use quoted CSV field to represent newline."
-msgstr "Utilize campo entre aspas do CSV para representar nova linha."
+#: libpq/hba.c:1149
+#, c-format
+msgid "invalid authentication method \"%s\""
+msgstr "método de autenticação \"%s\" inválido"
 
-#: commands/copy.c:2577 commands/copy.c:2613
-msgid "end-of-copy marker does not match previous newline style"
+#: libpq/hba.c:1160
+#, c-format
+msgid "invalid authentication method \"%s\": not supported by this build"
 msgstr ""
-"marcador de fim-de-cópia não corresponde com estilo de nova linha anterior"
+"método de autenticação \"%s\" inválido: não é suportado por essa construção"
 
-#: commands/copy.c:2586 commands/copy.c:2602
-msgid "end-of-copy marker corrupt"
-msgstr "marcador de fim-de-cópia corrompido"
+#: libpq/hba.c:1181
+msgid "krb5 authentication is not supported on local sockets"
+msgstr "autenticação krb5 não é suportada em soquetes locais"
 
-#: commands/copy.c:2729 commands/copy.c:2764 commands/copy.c:2944
-#: commands/copy.c:2979
-msgid "extra data after last expected column"
-msgstr "dado extra após última coluna esperada"
+#: libpq/hba.c:1192
+msgid "gssapi authentication is not supported on local sockets"
+msgstr "autenticação do tipo gssapi não é suportada em soquetes locais"
 
-#: commands/copy.c:3026
-msgid "unterminated CSV quoted field"
-msgstr "campo entre aspas do CSV não foi terminado"
+#: libpq/hba.c:1203
+msgid "peer authentication is only supported on local sockets"
+msgstr "autenticação do tipo peer só é suportada em soquetes locais"
 
-#: commands/copy.c:3103 commands/copy.c:3122
-msgid "unexpected EOF in COPY data"
-msgstr "EOF inesperado em dados do COPY"
+#: libpq/hba.c:1220
+msgid "cert authentication is only supported on hostssl connections"
+msgstr "autenticação do tipo cert só é suportada em conexões hostssl"
 
-#: commands/copy.c:3112
-msgid "invalid field size"
-msgstr "tamanho de campo inválido"
+#: libpq/hba.c:1241
+#, c-format
+msgid "authentication option not in name=value format: %s"
+msgstr "opção de autenticação não está  no formato nome=valor: %s"
 
-#: commands/copy.c:3135
-msgid "incorrect binary data format"
-msgstr "formato de dado binário incorreto"
+#: libpq/hba.c:1257
+msgid "ident, peer, krb5, gssapi, sspi and cert"
+msgstr "ident, peer, krb5, gssapi, sspi e cert"
 
-#: commands/dbcommands.c:201
-msgid "LOCATION is not supported anymore"
-msgstr "LOCATION não é mais suportado"
+#: libpq/hba.c:1271
+msgid "clientcert can only be configured for \"hostssl\" rows"
+msgstr "clientcert só pode ser configurado para registros \"hostssl\""
+
+#: libpq/hba.c:1282
+msgid ""
+"client certificates can only be checked if a root certificate store is "
+"available"
+msgstr ""
+"certificados cliente só podem ser verificados se um certificado raiz estiver "
+"disponível"
+
+#: libpq/hba.c:1283
+msgid "Make sure the root.crt file is present and readable."
+msgstr "Tenha certeza que o arquivo root.crt está presente e pode ser lido"
 
-#: commands/dbcommands.c:202
-msgid "Consider using tablespaces instead."
-msgstr "Considere utilizar tablespaces."
+#: libpq/hba.c:1296
+msgid "clientcert can not be set to 0 when using \"cert\" authentication"
+msgstr ""
+"clientcert não pode ser definido com 0 ao utilizar autenticação \"cert\""
 
-#: commands/dbcommands.c:253 commands/dbcommands.c:1347 commands/user.c:255
-#: commands/user.c:562
+#: libpq/hba.c:1330
 #, c-format
-msgid "invalid connection limit: %d"
-msgstr "limite de conexão inválido: %d"
+msgid "invalid LDAP port number: \"%s\""
+msgstr "número de porta LDAP é inválido: \"%s\""
 
-#: commands/dbcommands.c:272
-msgid "permission denied to create database"
-msgstr "permissão negada ao criar banco de dados"
+#: libpq/hba.c:1376 libpq/hba.c:1384
+msgid "krb5, gssapi and sspi"
+msgstr "krb5, gssapi e sspi"
 
-#: commands/dbcommands.c:295
+#: libpq/hba.c:1403 libpq/auth.c:2492
 #, c-format
-msgid "template database \"%s\" does not exist"
-msgstr "banco de dados modelo \"%s\" não existe"
+msgid "could not translate RADIUS server name \"%s\" to address: %s"
+msgstr "não pôde traduzir nome de servidor RADIUS \"%s\" para endereço: %s"
 
-#: commands/dbcommands.c:307
+#: libpq/hba.c:1422
 #, c-format
-msgid "permission denied to copy database \"%s\""
-msgstr "permissão negada ao copiar banco de dados \"%s\""
+msgid "invalid RADIUS port number: \"%s\""
+msgstr "número de porta RADIUS é inválido: \"%s\""
 
-#: commands/dbcommands.c:323
+#: libpq/hba.c:1442
 #, c-format
-msgid "invalid server encoding %d"
-msgstr "codificação do servidor %d é inválida"
+msgid "unrecognized authentication option name: \"%s\""
+msgstr "nome de opção de autenticação desconhecido: \"%s\""
 
-#: commands/dbcommands.c:329 commands/dbcommands.c:333
-#, c-format
-msgid "invalid locale name %s"
-msgstr "nome de configuração regional %s é inválido"
+#: libpq/hba.c:1474
+msgid ""
+"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
+"together with ldapprefix"
+msgstr ""
+"não pode utilizar ldapbasedn, ldapbinddn, ldapbindpasswd ou "
+"ldapsearchattribute junto com ldapprefix"
 
-#: commands/dbcommands.c:369 commands/dbcommands.c:384
+#: libpq/hba.c:1484
+msgid ""
+"authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
+"\", or \"ldapsuffix\" to be set"
+msgstr ""
+"método de autenticação \"ldap\" requer que argumento \"ldapbasedn\", "
+"\"ldapprefix\" ou \"ldapsuffix\" seja definido"
+
+#: libpq/hba.c:1683 guc-file.l:409
 #, c-format
-msgid "encoding %s does not match locale %s"
-msgstr "codificação %s não corresponde a configuração regional %s"
+msgid "could not open configuration file \"%s\": %m"
+msgstr "não pôde abrir arquivo de configuração \"%s\": %m"
 
-#: commands/dbcommands.c:372
+#: libpq/hba.c:1815
 #, c-format
-msgid "The chosen LC_CTYPE setting requires encoding %s."
-msgstr "A definição de LC_TYPE escolhida requer codificação %s."
+msgid "invalid regular expression \"%s\": %s"
+msgstr "expressão regular \"%s\" é inválida: %s"
 
-#: commands/dbcommands.c:387
+#: libpq/hba.c:1838
 #, c-format
-msgid "The chosen LC_COLLATE setting requires encoding %s."
-msgstr "A definição de LC_COLLATE escolhida requer codificação %s."
+msgid "regular expression match for \"%s\" failed: %s"
+msgstr "correspondência de expressão regular \"%s\" falhou: %s"
 
-#: commands/dbcommands.c:405
+#: libpq/hba.c:1856
 #, c-format
 msgid ""
-"new encoding (%s) is incompatible with the encoding of the template database "
-"(%s)"
+"regular expression \"%s\" has no subexpressions as requested by "
+"backreference in \"%s\""
 msgstr ""
-"nova codificação (%s) é imcompatível com a codificação do banco de dados "
-"modelo (%s)"
+"expressão regular \"%s\" não tem subexpressões como informado na referência "
+"anterior em \"%s\""
 
-#: commands/dbcommands.c:408
-msgid ""
-"Use the same encoding as in the template database, or use template0 as "
-"template."
-msgstr ""
-"Utilize a mesma codificação do banco de dados modelo ou utilize template0 "
-"como modelo."
+#: libpq/hba.c:1922
+#, c-format
+msgid "missing entry in file \"%s\" at end of line %d"
+msgstr "faltando entrada no arquivo \"%s\" no fim da linha %d"
 
-#: commands/dbcommands.c:413
+#: libpq/hba.c:1963
 #, c-format
-msgid ""
-"new collation (%s) is incompatible with the collation of the template "
-"database (%s)"
+msgid "provided user name (%s) and authenticated user name (%s) do not match"
 msgstr ""
-"novo conjunto de regras de comparação (%s) é incompatível com o conjunto de "
-"regras de comparação do banco de dados modelo (%s)"
+"nome de usuário fornecido (%s) e nome de usuário autenticado (%s) não "
+"correspondem"
 
-#: commands/dbcommands.c:415
-msgid ""
-"Use the same collation as in the template database, or use template0 as "
-"template."
+#: libpq/hba.c:1984
+#, c-format
+msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
 msgstr ""
-"Utilize o mesmo conjunto de regras de comparação do banco de dados modelo ou "
-"utilize template0 como modelo."
+"não há correspondência em mapa de usuários \"%s\" para usuário \"%s\" "
+"autenticado como \"%s\""
 
-#: commands/dbcommands.c:420
+#: libpq/hba.c:2008
 #, c-format
-msgid ""
-"new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database "
-"(%s)"
-msgstr ""
-"novo LC_CTYPE (%s) é incompatível com o LC_CTYPE do banco de dados modelo "
-"(%s)"
+msgid "could not open usermap file \"%s\": %m"
+msgstr "não pôde abrir arquivo com mapa de usuários \"%s\": %m"
 
-#: commands/dbcommands.c:422
-msgid ""
-"Use the same LC_CTYPE as in the template database, or use template0 as "
-"template."
-msgstr ""
-"Utilize o mesmo LC_CTYPE do banco de dados modelo ou utilize template0 como "
-"modelo."
+#: libpq/auth.c:257
+#, c-format
+msgid "authentication failed for user \"%s\": host rejected"
+msgstr "autenticação de usuário \"%s\" falhou: máquina rejeitada"
 
-#: commands/dbcommands.c:449 commands/dbcommands.c:1054
-msgid "pg_global cannot be used as default tablespace"
-msgstr "pg_global não pode ser utilizado como tablespace padrão"
+#: libpq/auth.c:260
+#, c-format
+msgid "Kerberos 5 authentication failed for user \"%s\""
+msgstr "autenticação do tipo Kerberos 5 falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:475
+#: libpq/auth.c:263
 #, c-format
-msgid "cannot assign new default tablespace \"%s\""
-msgstr "não pode atribuir nova tablespace padrão \"%s\""
+msgid "\"trust\" authentication failed for user \"%s\""
+msgstr "autenticação do tipo \"trust\" falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:477
+#: libpq/auth.c:266
 #, c-format
-msgid ""
-"There is a conflict because database \"%s\" already has some tables in this "
-"tablespace."
-msgstr ""
-"Há um conflito porque o banco de dados \"%s\" já tem algumas tabelas nesta "
-"tablespace."
+msgid "Ident authentication failed for user \"%s\""
+msgstr "autenticação do tipo Ident falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:497 commands/dbcommands.c:925
+#: libpq/auth.c:269
 #, c-format
-msgid "database \"%s\" already exists"
-msgstr "banco de dados \"%s\" já existe"
+msgid "Peer authentication failed for user \"%s\""
+msgstr "autenticação do tipo peer falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:511
+#: libpq/auth.c:273
 #, c-format
-msgid "source database \"%s\" is being accessed by other users"
-msgstr "banco de dados fonte \"%s\" está sendo acessado por outros usuários"
+msgid "password authentication failed for user \"%s\""
+msgstr "autenticação do tipo password falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:767
+#: libpq/auth.c:278
 #, c-format
-msgid "database \"%s\" does not exist, skipping"
-msgstr "banco de dados \"%s\" não existe, ignorando"
+msgid "GSSAPI authentication failed for user \"%s\""
+msgstr "autenticação do tipo GSSAPI falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:788
-msgid "cannot drop a template database"
-msgstr "não pode remover banco de dados modelo"
+#: libpq/auth.c:281
+#, c-format
+msgid "SSPI authentication failed for user \"%s\""
+msgstr "autenticação do tipo SSPI falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:794
-msgid "cannot drop the currently open database"
-msgstr "não pode remover banco de dados que se encontra aberto"
+#: libpq/auth.c:284
+#, c-format
+msgid "PAM authentication failed for user \"%s\""
+msgstr "autenticação do tipo PAM falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:805 commands/dbcommands.c:947
-#: commands/dbcommands.c:1076
+#: libpq/auth.c:287
 #, c-format
-msgid "database \"%s\" is being accessed by other users"
-msgstr "banco de dados \"%s\" está sendo acessado por outros usuários"
+msgid "LDAP authentication failed for user \"%s\""
+msgstr "autenticação do tipo LDAP falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:916
-msgid "permission denied to rename database"
-msgstr "permissão negada ao renomear banco de dados"
+#: libpq/auth.c:290
+#, c-format
+msgid "certificate authentication failed for user \"%s\""
+msgstr "autenticação do tipo certificate falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:936
-msgid "current database cannot be renamed"
-msgstr "banco de dados atual não pode ser renomeado"
+#: libpq/auth.c:293
+#, c-format
+msgid "RADIUS authentication failed for user \"%s\""
+msgstr "autenticação do tipo RADIUS falhou para usuário \"%s\""
 
-#: commands/dbcommands.c:1028
-msgid "cannot change the tablespace of the currently open database"
+#: libpq/auth.c:296
+#, c-format
+msgid "authentication failed for user \"%s\": invalid authentication method"
 msgstr ""
-"não pode mudar a tablespace de um banco de dados que se encontra aberto"
+"autenticação falhou para usuário \"%s\": método de autenticação é inválido"
 
-#: commands/dbcommands.c:1116
+#: libpq/auth.c:325
+msgid "missing or erroneous pg_hba.conf file"
+msgstr "arquivo pg_hba.conf não foi encontrado ou está errado"
+
+#: libpq/auth.c:326
+msgid "See server log for details."
+msgstr "Veja log do servidor para obter detalhes."
+
+#: libpq/auth.c:356
+msgid "connection requires a valid client certificate"
+msgstr "conexão requer um certificado cliente válido"
+
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
+msgid "SSL on"
+msgstr "SSL habilitado"
+
+#: libpq/auth.c:400 libpq/auth.c:416 libpq/auth.c:464 libpq/auth.c:482
+msgid "SSL off"
+msgstr "SSL desabilitado"
+
+#: libpq/auth.c:398
 #, c-format
-msgid "some relations of database \"%s\" are already in tablespace \"%s\""
+msgid ""
+"pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
 msgstr ""
-"algumas relações do banco de dados \"%s\" já estão na tablespace \"%s\""
+"pg_hba.conf rejeitou conexão de replicação para máquina \"%s\", usuário \"%s"
+"\", %s"
 
-#: commands/dbcommands.c:1118
+#: libpq/auth.c:404
+#, c-format
+msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
+msgstr ""
+"pg_hba.conf rejeitou conexão de replicação para máquina \"%s\", usuário \"%s"
+"\""
+
+#: libpq/auth.c:413
+#, c-format
 msgid ""
-"You must move them back to the database's default tablespace before using "
-"this command."
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
+"\", %s"
 msgstr ""
-"Você deve movê-las de volta para a tablespace padrão do banco de dados antes "
-"de utilizar este comando."
+"pg_hba.conf rejeitou conexão para máquina \"%s\", usuário \"%s\", banco de "
+"dados \"%s\", %s"
 
-#: commands/dbcommands.c:1246 commands/dbcommands.c:1719
-#: commands/dbcommands.c:1913 commands/dbcommands.c:1961
-#: commands/tablespace.c:579
+#: libpq/auth.c:420
 #, c-format
-msgid "some useless files may be left behind in old database directory \"%s\""
+msgid ""
+"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
-"alguns arquivos inúteis podem ser deixados no diretório de banco de dados "
-"antigo \"%s\""
+"pg_hba.conf rejeitou conexão para máquina \"%s\", usuário \"%s\", banco de "
+"dados \"%s\""
 
-#: commands/dbcommands.c:1495
-msgid "permission denied to change owner of database"
-msgstr "permissão negada ao mudar dono do banco de dados"
+#: libpq/auth.c:449
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup matches."
+msgstr "Endereço IP do cliente resolveu para \"%s\", pesquisa direta combina."
+
+#: libpq/auth.c:451
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup not checked."
+msgstr ""
+"Endereço IP do cliente resolveu para \"%s\", pesquisa direta não foi feita."
 
-#: commands/dbcommands.c:1807
+#: libpq/auth.c:453
+#, c-format
+msgid "Client IP address resolved to \"%s\", forward lookup does not match."
+msgstr ""
+"Endereço IP do cliente resolveu para \"%s\", pesquisa direta não combina."
+
+#: libpq/auth.c:462
 #, c-format
 msgid ""
-"There are %d other session(s) and %d prepared transaction(s) using the "
-"database."
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
+"\", %s"
 msgstr ""
-"Há %d outra(s) sessão(ões) e %d transação(ões) preparada(s) utilizando o "
-"banco de dados."
+"nenhuma entrada no pg_hba.conf para conexão de replicação da máquina \"%s\", "
+"usuário \"%s\", %s"
 
-#: commands/dbcommands.c:1810
+#: libpq/auth.c:469
 #, c-format
-msgid "There are %d other session(s) using the database."
-msgstr "Há %d outra(s) sessão(ões) utilizando o banco de dados."
+msgid ""
+"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
+msgstr ""
+"nenhuma entrada no pg_hba.conf para conexão de replicação da máquina \"%s\", "
+"usuário \"%s\""
 
-#: commands/dbcommands.c:1813
+#: libpq/auth.c:479
 #, c-format
-msgid "There are %d prepared transaction(s) using the database."
-msgstr "Há %d transação(ões) preparada(s) utilizando o banco de dados."
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
+msgstr ""
+"nenhuma entrada no pg_hba.conf para máquina \"%s\", usuário \"%s\", banco de "
+"dados \"%s\", %s"
 
-#: commands/indexcmds.c:162
-msgid "must specify at least one column"
-msgstr "deve especificar pelo menos uma coluna"
+#: libpq/auth.c:487
+#, c-format
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
+msgstr ""
+"nenhuma entrada no pg_hba.conf para máquina \"%s\", usuário \"%s\", banco de "
+"dados \"%s\""
 
-#: commands/indexcmds.c:166
+#: libpq/auth.c:663
 #, c-format
-msgid "cannot use more than %d columns in an index"
-msgstr "não pode utilizar mais do que %d colunas em um índice"
+msgid "expected password response, got message type %d"
+msgstr "resposta da senha esperada, recebeu tipo de mensagem %d"
 
-#: commands/indexcmds.c:196
-msgid "cannot create indexes on temporary tables of other sessions"
-msgstr "não pode criar índices em tabelas temporárias de outras sessões"
+#: libpq/auth.c:691
+msgid "invalid password packet size"
+msgstr "tamanho do pacote de senha é inválido"
 
-#: commands/indexcmds.c:256 commands/tablecmds.c:455 commands/tablecmds.c:6978
-msgid "only shared relations can be placed in pg_global tablespace"
-msgstr ""
-"somente relações compartilhadas podem ser armazenadas na tablespace pg_global"
+#: libpq/auth.c:695
+msgid "received password packet"
+msgstr "pacote de senha recebido"
 
-#: commands/indexcmds.c:287
-msgid "substituting access method \"gist\" for obsolete method \"rtree\""
-msgstr "substituindo método de acesso \"gist\" pelo método obsoleto \"rtree\""
+#: libpq/auth.c:753
+#, c-format
+msgid "Kerberos initialization returned error %d"
+msgstr "inicialização do Kerberos retornou erro %d"
 
-#: commands/indexcmds.c:295 commands/comment.c:1261 commands/comment.c:1342
-#: commands/opclasscmds.c:281 commands/opclasscmds.c:669
-#: commands/opclasscmds.c:769 commands/opclasscmds.c:1495
-#: commands/opclasscmds.c:1556 commands/opclasscmds.c:1718
-#: commands/opclasscmds.c:1812 commands/opclasscmds.c:1903
-#: commands/opclasscmds.c:2046
+#: libpq/auth.c:763
 #, c-format
-msgid "access method \"%s\" does not exist"
-msgstr "método de acesso \"%s\" não existe"
+msgid "Kerberos keytab resolving returned error %d"
+msgstr "resolução do keytab do Kerberos retornou erro %d"
 
-#: commands/indexcmds.c:304
+#: libpq/auth.c:787
 #, c-format
-msgid "access method \"%s\" does not support unique indexes"
-msgstr "método de acesso \"%s\" não suporta índices únicos"
+msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
+msgstr "Kerberos sname_to_principal(\"%s\", \"%s\") retornou erro %d"
 
-#: commands/indexcmds.c:309
+#: libpq/auth.c:832
 #, c-format
-msgid "access method \"%s\" does not support multicolumn indexes"
-msgstr "método de acesso \"%s\" não suporta índices de múltiplas colunas"
+msgid "Kerberos recvauth returned error %d"
+msgstr "Kerberos recvauth retornou erro %d"
 
-#: commands/indexcmds.c:314
+#: libpq/auth.c:855
 #, c-format
-msgid "access method \"%s\" does not support exclusion constraints"
-msgstr "método de acesso \"%s\" não suporta restrições de exclusão"
+msgid "Kerberos unparse_name returned error %d"
+msgstr "Kerberos unparse_name retornou erro %d"
 
-#: commands/indexcmds.c:364
-msgid "primary keys cannot be expressions"
-msgstr "chaves primárias não podem ser expressões"
+#: libpq/auth.c:1003
+msgid "GSSAPI is not supported in protocol version 2"
+msgstr "GSSAPI não é suportado no protocolo versão 2"
 
-#: commands/indexcmds.c:468
+#: libpq/auth.c:1058
 #, c-format
-msgid "%s %s will create implicit index \"%s\" for table \"%s\""
-msgstr "%s %s criará índice implícito \"%s\" na tabela \"%s\""
+msgid "expected GSS response, got message type %d"
+msgstr "resposta do GSS esperada, recebeu tipo de mensagem %d"
 
-#: commands/indexcmds.c:827
-msgid "cannot use subquery in index predicate"
-msgstr "não pode utilizar subconsulta em predicado de índice"
+#: libpq/auth.c:1121
+msgid "accepting GSS security context failed"
+msgstr "aceitação do contexto de segurança do GSS falhou"
 
-#: commands/indexcmds.c:831
-msgid "cannot use aggregate in index predicate"
-msgstr "não pode utilizar agregação em predicado de índice"
+#: libpq/auth.c:1147
+msgid "retrieving GSS user name failed"
+msgstr "recuperação do nome de usuário do GSS falhou"
 
-#: commands/indexcmds.c:840
-msgid "functions in index predicate must be marked IMMUTABLE"
-msgstr "funções em predicado de índice devem ser IMMUTABLE"
+#: libpq/auth.c:1264
+msgid "SSPI is not supported in protocol version 2"
+msgstr "SSPI não é suportado no protocolo versão 2"
 
-#: commands/indexcmds.c:942
-msgid "cannot use subquery in index expression"
-msgstr "não pode utilizar subconsulta em expressão de índice"
+#: libpq/auth.c:1279
+msgid "could not acquire SSPI credentials"
+msgstr "não pôde obter credenciais SSPI"
 
-#: commands/indexcmds.c:946
-msgid "cannot use aggregate function in index expression"
-msgstr "não pode utilizar função de agregação em expressão de índice"
+#: libpq/auth.c:1296
+#, c-format
+msgid "expected SSPI response, got message type %d"
+msgstr "resposta do SSPI esperada, recebeu tipo de mensagem %d"
 
-#: commands/indexcmds.c:956
-msgid "functions in index expression must be marked IMMUTABLE"
-msgstr "funções em expressão de índice devem ser IMMUTABLE"
+#: libpq/auth.c:1368
+msgid "could not accept SSPI security context"
+msgstr "não pôde aceitar contexto de segurança do SSPI"
+
+#: libpq/auth.c:1430
+msgid "could not get token from SSPI security context"
+msgstr "não pôde obter token do contexto de segurança do SSPI"
 
-#: commands/indexcmds.c:991
+#: libpq/auth.c:1674
 #, c-format
-msgid "operator %s is not commutative"
-msgstr "operador %s não é comutativo"
+msgid "could not create socket for Ident connection: %m"
+msgstr "não pôde criar soquete para conexão com Ident: %m"
 
-#: commands/indexcmds.c:993
-msgid "Only commutative operators can be used in exclusion constraints."
-msgstr ""
-"Somente operadores comutativos pode ser utilizados em restrições de exclusão."
+#: libpq/auth.c:1689
+#, c-format
+msgid "could not bind to local address \"%s\": %m"
+msgstr "não pôde se ligar ao endereço local \"%s\": %m"
 
-#: commands/indexcmds.c:1019
+#: libpq/auth.c:1701
 #, c-format
-msgid "operator %s is not a member of operator family \"%s\""
-msgstr "operador %s não é um membro da família de operadores \"%s\""
+msgid "could not connect to Ident server at address \"%s\", port %s: %m"
+msgstr "não pôde conectar ao servidor Ident no endereço \"%s\", porta %s: %m"
 
-#: commands/indexcmds.c:1022
-#, fuzzy
+#: libpq/auth.c:1721
+#, c-format
+msgid "could not send query to Ident server at address \"%s\", port %s: %m"
+msgstr ""
+"não pôde enviar consulta ao servidor Ident no endereço \"%s\", porta %s: %m"
+
+#: libpq/auth.c:1736
+#, c-format
 msgid ""
-"The exclusion operator must be related to the index operator class for the "
-"constraint."
+"could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
-"Você deve especificar uma classe de operadores para o índice ou definir uma "
-"classe de operadores padrão para o tipo de dado."
+"não pôde receber resposta do servidor Ident no endereço \"%s\", porta %s: %m"
 
-#: commands/indexcmds.c:1057
+#: libpq/auth.c:1746
 #, c-format
-msgid "access method \"%s\" does not support ASC/DESC options"
-msgstr "método de acesso \"%s\" não suporta opções ASC/DESC"
+msgid "invalidly formatted response from Ident server: \"%s\""
+msgstr "resposta invalidamente formatada pelo servidor Ident: \"%s\""
 
-#: commands/indexcmds.c:1062
+#: libpq/auth.c:1785
+msgid "peer authentication is not supported on this platform"
+msgstr "autenticação do tipo peer não é suportada nesta plataforma"
+
+#: libpq/auth.c:1789
 #, c-format
-msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
-msgstr "método de acesso \"%s\" não suporta opções NULLS FIRST/LAST"
+msgid "could not get peer credentials: %m"
+msgstr "não pôde receber credenciais: %m"
 
-#: commands/indexcmds.c:1118
+#: libpq/auth.c:1798
 #, c-format
-msgid "data type %s has no default operator class for access method \"%s\""
-msgstr ""
-"tipo de dado %s não tem classe de operadores padrão para método de acesso "
-"\"%s\""
+msgid "local user with ID %d does not exist"
+msgstr "usuário local com ID %d não existe"
 
-#: commands/indexcmds.c:1120
-msgid ""
-"You must specify an operator class for the index or define a default "
-"operator class for the data type."
-msgstr ""
-"Você deve especificar uma classe de operadores para o índice ou definir uma "
-"classe de operadores padrão para o tipo de dado."
+#: libpq/auth.c:1881 libpq/auth.c:2153 libpq/auth.c:2513
+msgid "empty password returned by client"
+msgstr "senha vazia retornada pelo cliente"
 
-#: commands/indexcmds.c:1149 commands/indexcmds.c:1157 commands/comment.c:1289
-#: commands/comment.c:1297 commands/opclasscmds.c:1507
-#: commands/opclasscmds.c:1511 commands/opclasscmds.c:1739
-#: commands/opclasscmds.c:1750 commands/opclasscmds.c:1926
-#: commands/opclasscmds.c:1937
+#: libpq/auth.c:1891
 #, c-format
-msgid "operator class \"%s\" does not exist for access method \"%s\""
-msgstr "classe de operadores \"%s\" não existe para método de acesso \"%s\""
+msgid "error from underlying PAM layer: %s"
+msgstr "erro da biblioteca PAM: %s"
 
-#: commands/indexcmds.c:1170
+#: libpq/auth.c:1960
 #, c-format
-msgid "operator class \"%s\" does not accept data type %s"
-msgstr "classe de operadores \"%s\" não aceita tipo de dado %s"
+msgid "could not create PAM authenticator: %s"
+msgstr "não pôde criar autenticador PAM: %s"
 
-#: commands/indexcmds.c:1260
+#: libpq/auth.c:1971
 #, c-format
-msgid "there are multiple default operator classes for data type %s"
-msgstr "há múltiplas classes de operadores padrão para tipo de dado %s"
+msgid "pam_set_item(PAM_USER) failed: %s"
+msgstr "pam_set_item(PAM_USER) falhou: %s"
 
-#: commands/indexcmds.c:1639
+#: libpq/auth.c:1982
 #, c-format
-msgid "table \"%s\" has no indexes"
-msgstr "tabela \"%s\" não tem índices"
-
-#: commands/indexcmds.c:1667
-msgid "can only reindex the currently open database"
-msgstr "só pode reindexar o banco de dados atualmente aberto"
+msgid "pam_set_item(PAM_CONV) failed: %s"
+msgstr "pam_set_item(PAM_CONV) falhou: %s"
 
-#: commands/indexcmds.c:1752
+#: libpq/auth.c:1993
 #, c-format
-msgid "table \"%s.%s\" was reindexed"
-msgstr "tabela \"%s.%s\" foi reindexada"
+msgid "pam_authenticate failed: %s"
+msgstr "pam_authenticate falhou: %s"
 
-#: commands/tablecmds.c:192
+#: libpq/auth.c:2004
 #, c-format
-msgid "table \"%s\" does not exist"
-msgstr "tabela \"%s\" não existe"
+msgid "pam_acct_mgmt failed: %s"
+msgstr "pam_acct_mgmt falhou: %s"
 
-#: commands/tablecmds.c:193
+#: libpq/auth.c:2015
 #, c-format
-msgid "table \"%s\" does not exist, skipping"
-msgstr "tabela \"%s\" não existe, ignorando"
+msgid "could not release PAM authenticator: %s"
+msgstr "não pôde liberar autenticador PAM: %s"
 
-#: commands/tablecmds.c:195
-msgid "Use DROP TABLE to remove a table."
-msgstr "Use DROP TABLE para remover uma tabela."
+#: libpq/auth.c:2048 libpq/auth.c:2052
+#, c-format
+msgid "could not initialize LDAP: error code %d"
+msgstr "não pôde inicializar LDAP: código de erro %d"
 
-#: commands/tablecmds.c:198
+#: libpq/auth.c:2062
 #, c-format
-msgid "sequence \"%s\" does not exist"
-msgstr "sequência \"%s\" não existe"
+msgid "could not set LDAP protocol version: error code %d"
+msgstr "não pôde definir versão do protocolo LDAP: código de erro %d"
+
+#: libpq/auth.c:2091
+msgid "could not load wldap32.dll"
+msgstr "não pôde carregar wldap32.dll"
+
+#: libpq/auth.c:2099
+msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
+msgstr "não pôde carregar função _ldap_start_tls_sA em wldap32.dll"
+
+#: libpq/auth.c:2100
+msgid "LDAP over SSL is not supported on this platform."
+msgstr "LDAP sobre SSL não é suportado nesta plataforma."
 
-#: commands/tablecmds.c:199
+#: libpq/auth.c:2115
 #, c-format
-msgid "sequence \"%s\" does not exist, skipping"
-msgstr "sequência \"%s\" não existe, ignorando"
+msgid "could not start LDAP TLS session: error code %d"
+msgstr "não pôde iniciar sessão LDAP TLS: código de erro %d"
 
-#: commands/tablecmds.c:201
-msgid "Use DROP SEQUENCE to remove a sequence."
-msgstr "Use DROP SEQUENCE para remover uma sequência."
+#: libpq/auth.c:2137
+msgid "LDAP server not specified"
+msgstr "servidor LDAP não foi especificado"
+
+#: libpq/auth.c:2189
+msgid "invalid character in user name for LDAP authentication"
+msgstr "caracter inválido em nome de usuário para autenticação LDAP"
 
-#: commands/tablecmds.c:204
+#: libpq/auth.c:2204
 #, c-format
-msgid "view \"%s\" does not exist"
-msgstr "visão \"%s\" não existe"
+msgid ""
+"could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
+"error code %d"
+msgstr ""
+"não pôde realizar ligação inicial LDAP para ldapbinddn \"%s\" no servidor "
+"\"%s\": código de erro %d"
 
-#: commands/tablecmds.c:205
+#: libpq/auth.c:2229
 #, c-format
-msgid "view \"%s\" does not exist, skipping"
-msgstr "visão \"%s\" não existe, ignorando"
+msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
+msgstr ""
+"não pôde buscar no LDAP por filtro \"%s\" no servidor \"%s\": código de erro "
+"%d"
 
-#: commands/tablecmds.c:206 commands/tablecmds.c:2152
-#: commands/tablecmds.c:2373 commands/tablecmds.c:7801 commands/comment.c:580
-#: commands/view.c:163
+#: libpq/auth.c:2239
 #, c-format
-msgid "\"%s\" is not a view"
-msgstr "\"%s\" não é uma visão"
+msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
+msgstr ""
+"busca LDAP falhou para filtro \"%s\" no servidor \"%s\": usuário não existe"
 
-#: commands/tablecmds.c:207
-msgid "Use DROP VIEW to remove a view."
-msgstr "Use DROP VIEW para remover uma visão."
+#: libpq/auth.c:2243
+#, fuzzy, c-format
+msgid ""
+"LDAP search failed for filter \"%s\" on server \"%s\": user is not unique "
+"(%ld matches)"
+msgstr ""
+"busca LDAP falhou para filtro \"%s\" no servidor \"%s\": usuário não é único "
+"(%ld usuários)"
 
-#: commands/tablecmds.c:210
+#: libpq/auth.c:2260
 #, c-format
-msgid "index \"%s\" does not exist"
-msgstr "índice \"%s\" não existe"
+msgid ""
+"could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
+msgstr ""
+"não pôde obter dn para a primeira entrada que corresponde a \"%s\" no "
+"servidor \"%s\": %s"
 
-#: commands/tablecmds.c:211
+#: libpq/auth.c:2280
 #, c-format
-msgid "index \"%s\" does not exist, skipping"
-msgstr "índice \"%s\" não existe, ignorando"
-
-#: commands/tablecmds.c:213
-msgid "Use DROP INDEX to remove an index."
-msgstr "Use DROP INDEX para remover um índice."
+msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
+msgstr ""
+"não pôde desligar-se após buscar pelo usuário \"%s\" no servidor \"%s\": %s"
 
-#: commands/tablecmds.c:217 commands/typecmds.c:656
+#: libpq/auth.c:2317
 #, c-format
-msgid "type \"%s\" does not exist, skipping"
-msgstr "tipo \"%s\" não existe, ignorando"
+msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
+msgstr ""
+"autenticação LDAP falhou para usuário \"%s\" no servidor \"%s\": código de "
+"erro %d"
 
-#: commands/tablecmds.c:218
+#: libpq/auth.c:2345
 #, c-format
-msgid "\"%s\" is not a type"
-msgstr "\"%s\" não é um tipo"
+msgid ""
+"certificate authentication failed for user \"%s\": client certificate "
+"contains no user name"
+msgstr ""
+"autenticação com certificado falhou para usuário \"%s\": certificado cliente "
+"não contém usuário"
 
-#: commands/tablecmds.c:219
-msgid "Use DROP TYPE to remove a type."
-msgstr "use DROP TYPE para remover um tipo."
+#: libpq/auth.c:2469
+msgid "RADIUS server not specified"
+msgstr "servidor RADIUS não foi especificado"
+
+#: libpq/auth.c:2476
+#, fuzzy
+msgid "RADIUS secret not specified"
+msgstr "segredo RADIUS não foi especificado"
+
+#: libpq/auth.c:2520
+msgid ""
+"RADIUS authentication does not support passwords longer than 16 characters"
+msgstr ""
+"autenticação RADIUS não suporta senhas mais longas do que 16 caracteres"
+
+#: libpq/auth.c:2531
+#, fuzzy
+msgid "could not generate random encryption vector"
+msgstr "não pôde gerar vetor de encriptação randômico"
+
+#: libpq/auth.c:2554
+#, fuzzy
+msgid "could not perform MD5 encryption of password"
+msgstr "não pôde realizar encriptação MD5 da senha"
 
-#: commands/tablecmds.c:889
+#: libpq/auth.c:2576
 #, c-format
-msgid "truncate cascades to table \"%s\""
-msgstr "truncando em cascata tabela \"%s\""
+msgid "could not create RADIUS socket: %m"
+msgstr "não pôde criar soquete RADIUS: %m"
 
-#: commands/tablecmds.c:1119
-msgid "cannot truncate temporary tables of other sessions"
-msgstr "não pode truncar tabelas temporárias de outras sessões"
+#: libpq/auth.c:2597
+#, c-format
+msgid "could not bind local RADIUS socket: %m"
+msgstr "não pôde se ligar ao soquete RADIUS: %m"
 
-#: commands/tablecmds.c:1235 commands/tablecmds.c:1619
-#: commands/tablecmds.c:3722 catalog/heap.c:380
+#: libpq/auth.c:2607
 #, c-format
-msgid "tables can have at most %d columns"
-msgstr "tabelas podem ter no máximo %d colunas"
+msgid "could not send RADIUS packet: %m"
+msgstr "não pôde enviar pacote RADIUS: %m"
+
+#: libpq/auth.c:2636 libpq/auth.c:2661
+#, fuzzy
+msgid "timeout waiting for RADIUS response"
+msgstr "tempo de espera esgotado para resposta do RADIUS"
+
+#: libpq/auth.c:2654
+#, fuzzy, c-format
+msgid "could not check status on RADIUS socket: %m"
+msgstr "não pôde verificar estado no soquete RADIUS: %m"
+
+#: libpq/auth.c:2683
+#, fuzzy, c-format
+msgid "could not read RADIUS response: %m"
+msgstr "não pôde ler resposta RADIUS: %m"
 
-#: commands/tablecmds.c:1320 commands/tablecmds.c:7206
+#: libpq/auth.c:2695 libpq/auth.c:2699
 #, c-format
-msgid "cannot inherit from temporary relation \"%s\""
-msgstr "não pode herdar de uma tabela temporária \"%s\""
+msgid "RADIUS response was sent from incorrect port: %i"
+msgstr "resposta RADIUS foi enviada de porta incorreta: %i"
 
-#: commands/tablecmds.c:1337 commands/tablecmds.c:7234
+#: libpq/auth.c:2708
 #, c-format
-msgid "relation \"%s\" would be inherited from more than once"
-msgstr "relação \"%s\" seria herdada de mais de uma vez"
+msgid "RADIUS response too short: %i"
+msgstr "resposta RADIUS muito curta: %i"
 
-#: commands/tablecmds.c:1392
+#: libpq/auth.c:2715
 #, c-format
-msgid "merging multiple inherited definitions of column \"%s\""
-msgstr "juntando múltiplas definições herdadas da coluna \"%s\""
+msgid "RADIUS response has corrupt length: %i (actual length %i)"
+msgstr "resposta RADIUS tem tamanho corrompido: %i (tamanho atual %i)"
 
-#: commands/tablecmds.c:1400
+#: libpq/auth.c:2723
 #, c-format
-msgid "inherited column \"%s\" has a type conflict"
-msgstr "coluna herdada \"%s\" tem um conflito de tipo"
+msgid "RADIUS response is to a different request: %i (should be %i)"
+msgstr "resposta RADIUS é para uma solicitação diferente: %i (deveria ser %i)"
 
-#: commands/tablecmds.c:1412
-#, c-format
-msgid "inherited column \"%s\" has a storage parameter conflict"
-msgstr "coluna herdada \"%s\" tem um conflito de parâmetro de armazenamento"
+#: libpq/auth.c:2748
+#, fuzzy
+msgid "could not perform MD5 encryption of received packet"
+msgstr "não pôde realizar encriptação MD5 do pacote recebido"
 
-#: commands/tablecmds.c:1564
-#, c-format
-msgid "merging column \"%s\" with inherited definition"
-msgstr "juntando coluna \"%s\" com definição herdada"
+#: libpq/auth.c:2757
+msgid "RADIUS response has incorrect MD5 signature"
+msgstr "resposta RADIUS tem assinatura MD5 incorreta"
 
-#: commands/tablecmds.c:1572
+#: libpq/auth.c:2774
 #, c-format
-msgid "column \"%s\" has a type conflict"
-msgstr "coluna \"%s\" tem um conflito de tipo"
+msgid "RADIUS response has invalid code (%i) for user \"%s\""
+msgstr "resposta RADIUS tem código inválido (%i) para usuário \"%s\""
 
-#: commands/tablecmds.c:1584
+#: optimizer/util/clauses.c:4166
 #, c-format
-msgid "column \"%s\" has a storage parameter conflict"
-msgstr "coluna \"%s\" tem um conflito de parâmetro de armazenamento"
+msgid "SQL function \"%s\" during inlining"
+msgstr "função SQL \"%s\" durante expansão em linha"
 
-#: commands/tablecmds.c:1636
-#, c-format
-msgid "column \"%s\" inherits conflicting default values"
-msgstr "coluna \"%s\" herdou valores padrão conflitantes"
+#: optimizer/util/plancat.c:97
+msgid "cannot access temporary or unlogged relations during recovery"
+msgstr "não pode criar tabelas temporárias ou unlogged durante recuperação"
 
-#: commands/tablecmds.c:1638
-msgid "To resolve the conflict, specify a default explicitly."
-msgstr "Para resolver o conflito, especifique um padrão explicitamente."
+#: optimizer/prep/prepunion.c:385
+msgid "could not implement recursive UNION"
+msgstr "não pôde implementar UNION recursivo"
+
+#: optimizer/prep/prepunion.c:386
+msgid "All column datatypes must be hashable."
+msgstr "Todos os tipos de dados de colunas devem suportar utilização de hash."
 
-#: commands/tablecmds.c:1685
+#. translator: %s is UNION, INTERSECT, or EXCEPT
+#: optimizer/prep/prepunion.c:790
 #, c-format
+msgid "could not implement %s"
+msgstr "não pôde implementar %s"
+
+#: optimizer/prep/prepunion.c:791 optimizer/plan/planner.c:2255
+#: optimizer/plan/planner.c:2427
 msgid ""
-"check constraint name \"%s\" appears multiple times but with different "
-"expressions"
+"Some of the datatypes only support hashing, while others only support "
+"sorting."
 msgstr ""
-"nome da restrição de verificação \"%s\" aparece múltiplas vezes mas com "
-"diferentes expressões"
-
-#: commands/tablecmds.c:1973
-#, fuzzy
-msgid "cannot rename column of typed table"
-msgstr "não pode renomear coluna de uma tabela tipada"
+"Alguns dos tipos de dados só suportam utilização de hash, enquanto outros só "
+"suportam utilização de ordenação."
 
-#: commands/tablecmds.c:1989
-#, c-format
-msgid "\"%s\" is not a table, view, composite type or index"
-msgstr "\"%s\" não é uma tabela, visão, tipo composto ou índice"
+#: optimizer/path/joinrels.c:673
+msgid ""
+"FULL JOIN is only supported with merge-joinable or hash-joinable join "
+"conditions"
+msgstr ""
+"FULL JOIN só é suportado com condições de junção que podem ser utilizadas "
+"com junção por mesclagem ou junção por hash"
 
-#: commands/tablecmds.c:2055
-#, c-format
-msgid "inherited column \"%s\" must be renamed in child tables too"
+#: optimizer/plan/initsplan.c:595
+msgid ""
+"SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer "
+"join"
 msgstr ""
-"coluna herdada \"%s\" deve ser renomeada nas tabelas descendentes também"
+"SELECT FOR UPDATE/SHARE não pode ser aplicado ao lado com valores nulos de "
+"um junção externa"
 
-#: commands/tablecmds.c:2073
-#, c-format
-msgid "cannot rename system column \"%s\""
-msgstr "não pode renomear coluna do sistema \"%s\""
+#: optimizer/plan/planner.c:2254
+msgid "could not implement GROUP BY"
+msgstr "não pôde implementar GROUP BY"
 
-#: commands/tablecmds.c:2088
-#, c-format
-msgid "cannot rename inherited column \"%s\""
-msgstr "não pode renomear coluna herdada \"%s\""
+#: optimizer/plan/planner.c:2426
+msgid "could not implement DISTINCT"
+msgstr "não pôde implementar DISTINCT"
 
-#: commands/tablecmds.c:2099 commands/tablecmds.c:3710
-#, c-format
-msgid "column \"%s\" of relation \"%s\" already exists"
-msgstr "coluna \"%s\" da relação \"%s\" já existe"
+#: optimizer/plan/planner.c:2877
+msgid "could not implement window PARTITION BY"
+msgstr "não pôde implementar deslizante PARTITION BY"
 
-#: commands/tablecmds.c:2164 commands/tablecmds.c:6530
-#: commands/tablecmds.c:7836
-msgid "Use ALTER TYPE instead."
-msgstr "Ao invés disso utilize ALTER TYPE."
+#: optimizer/plan/planner.c:2878
+msgid "Window partitioning columns must be of sortable datatypes."
+msgstr ""
+"Colunas de particionamento de deslizante devem ser de tipos de dados que "
+"suportam ordenação."
 
-#: commands/tablecmds.c:2211 catalog/index.c:621 catalog/heap.c:927
-#, c-format
-msgid "relation \"%s\" already exists"
-msgstr "relação \"%s\" já existe"
+#: optimizer/plan/planner.c:2882
+msgid "could not implement window ORDER BY"
+msgstr "não pôde implementar deslizante ORDER BY"
 
-#. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2287
-#, c-format
-msgid ""
-"cannot %s \"%s\" because it is being used by active queries in this session"
+#: optimizer/plan/planner.c:2883
+msgid "Window ordering columns must be of sortable datatypes."
 msgstr ""
-"não pode executar %s \"%s\" porque ela está sendo utilizada por consultas "
-"ativas nessa sessão"
+"Colunas de ordenação de deslizante devem ser de tipos de dados que suportam "
+"ordenação."
 
-#. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2296
+#: snowball/dict_snowball.c:183
 #, c-format
-msgid "cannot %s \"%s\" because it has pending trigger events"
+msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
 msgstr ""
-"não pode executar %s \"%s\" porque ela tem eventos de gatilho pendentes"
-
-#: commands/tablecmds.c:2909
-#, c-format
-msgid "cannot rewrite system relation \"%s\""
-msgstr "não pode reescrever relação do sistema \"%s\""
+"nenhum analisador Snowball disponível para idioma \"%s\" e codificação \"%s\""
 
-#: commands/tablecmds.c:2919
-msgid "cannot rewrite temporary tables of other sessions"
-msgstr "não pode reescrever tabelas temporárias de outras sessões"
+#: snowball/dict_snowball.c:215
+msgid "multiple Language parameters"
+msgstr "múltiplos parâmetros Language"
 
-#: commands/tablecmds.c:3243
+#: snowball/dict_snowball.c:222
 #, c-format
-msgid "column \"%s\" contains null values"
-msgstr "coluna \"%s\" contém valores nulos"
+msgid "unrecognized Snowball parameter: \"%s\""
+msgstr "parâmetro desconhecido do Snowball: \"%s\""
 
-#: commands/tablecmds.c:3257
-#, c-format
-msgid "check constraint \"%s\" is violated by some row"
-msgstr "restrição de verificação \"%s\" foi violada por algum registro"
+#: snowball/dict_snowball.c:230
+msgid "missing Language parameter"
+msgstr "faltando parâmetro Language"
 
-#: commands/tablecmds.c:3384 commands/tablecmds.c:4136
+#: storage/file/fd.c:405
 #, c-format
-msgid "\"%s\" is not a table or index"
-msgstr "\"%s\" não é uma tabela ou índice"
+msgid "getrlimit failed: %m"
+msgstr "getrlimit falhou: %m"
 
-#: commands/tablecmds.c:3539
-#, c-format
-msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
+#: storage/file/fd.c:495
+msgid "insufficient file descriptors available to start server process"
 msgstr ""
-"não pode alterar tabela \"%s\" porque coluna \"%s\".\"%s\" utiliza seu tipo"
+"descritores de arquivo disponíveis são insuficientes para iniciar o processo "
+"servidor"
 
-#: commands/tablecmds.c:3546
+#: storage/file/fd.c:496
 #, c-format
-msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
-msgstr "não pode alterar tipo \"%s\" porque coluna \"%s\".\"%s\" utiliza-o"
-
-#: commands/tablecmds.c:3593
-#, fuzzy
-msgid "cannot add column to typed table"
-msgstr "não pode adicionar coluna a uma tabela tipada"
-
-#: commands/tablecmds.c:3622
-msgid "column must be added to child tables too"
-msgstr "coluna deve ser adicionada as tabelas descendentes também"
+msgid "System allows %d, we need at least %d."
+msgstr "Sistema permite %d, nós precisamos pelo menos de %d."
 
-#: commands/tablecmds.c:3667 commands/tablecmds.c:7390
+#: storage/file/fd.c:537 storage/file/fd.c:1469 storage/file/fd.c:1585
 #, c-format
-msgid "child table \"%s\" has different type for column \"%s\""
-msgstr "tabela descendente \"%s\" tem tipo diferente da coluna \"%s\""
+msgid "out of file descriptors: %m; release and retry"
+msgstr "sem descritores de arquivo: %m; libere e tente novamente"
 
-#: commands/tablecmds.c:3674
+#: storage/file/fd.c:1110
 #, c-format
-msgid "child table \"%s\" has a conflicting \"%s\" column"
-msgstr "tabela descendente \"%s\" tem uma coluna conflitante \"%s\""
+msgid "temporary file: path \"%s\", size %lu"
+msgstr "arquivo temporário: caminho \"%s\", tamanho %lu"
 
-#: commands/tablecmds.c:3686
+#: storage/file/fd.c:1644
 #, c-format
-msgid "merging definition of column \"%s\" for child \"%s\""
-msgstr "juntando definição da coluna \"%s\" para tabela descendente \"%s\""
+msgid "could not read directory \"%s\": %m"
+msgstr "não pôde ler diretório \"%s\": %m"
 
-#: commands/tablecmds.c:3958 commands/tablecmds.c:4048
-#: commands/tablecmds.c:4093 commands/tablecmds.c:4189
-#: commands/tablecmds.c:4233 commands/tablecmds.c:4312
-#: commands/tablecmds.c:5846
+#: storage/smgr/md.c:381 storage/smgr/md.c:855
 #, c-format
-msgid "cannot alter system column \"%s\""
-msgstr "não pode alterar coluna do sistema \"%s\""
+msgid "could not truncate file \"%s\": %m"
+msgstr "não pôde truncar arquivo \"%s\": %m"
 
-#: commands/tablecmds.c:3992
+#: storage/smgr/md.c:449
 #, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "coluna \"%s\" está em uma chave primária"
+msgid "cannot extend file \"%s\" beyond %u blocks"
+msgstr "não pode estender arquivo \"%s\" além de %u blocos"
 
-#: commands/tablecmds.c:4163
+#: storage/smgr/md.c:471 storage/smgr/md.c:635 storage/smgr/md.c:710
 #, c-format
-msgid "statistics target %d is too low"
-msgstr "valor da estatística %d é muito pequeno"
+msgid "could not seek to block %u in file \"%s\": %m"
+msgstr "não pôde buscar bloco %u no arquivo \"%s\": %m"
 
-#: commands/tablecmds.c:4171
+#: storage/smgr/md.c:479
 #, c-format
-msgid "lowering statistics target to %d"
-msgstr "diminuindo valor da estatística para %d"
+msgid "could not extend file \"%s\": %m"
+msgstr "não pôde estender arquivo \"%s\": %m"
 
-#: commands/tablecmds.c:4293
-#, c-format
-msgid "invalid storage type \"%s\""
-msgstr "tipo de armazenamento \"%s\" é inválido"
+#: storage/smgr/md.c:481 storage/smgr/md.c:488 storage/smgr/md.c:737
+msgid "Check free disk space."
+msgstr "Verifique o espaço em disco livre."
 
-#: commands/tablecmds.c:4324
+#: storage/smgr/md.c:485
 #, c-format
-msgid "column data type %s can only have storage PLAIN"
-msgstr "tipo de dado da coluna %s só pode ter armazenamento PLAIN"
-
-#: commands/tablecmds.c:4353
-#, fuzzy
-msgid "cannot drop column from typed table"
-msgstr "não pode apagar coluna de uma tabela tipada"
+msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
+msgstr ""
+"não pôde estender arquivo \"%s\": escreveu somente %d de %d bytes no bloco %u"
 
-#: commands/tablecmds.c:4392
+#: storage/smgr/md.c:653
 #, c-format
-msgid "column \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "coluna \"%s\" da relação \"%s\" não existe, ignorando"
+msgid "could not read block %u in file \"%s\": %m"
+msgstr "não pôde ler bloco %u no arquivo \"%s\": %m"
 
-#: commands/tablecmds.c:4405
+#: storage/smgr/md.c:669
 #, c-format
-msgid "cannot drop system column \"%s\""
-msgstr "não pode remover coluna do sistema \"%s\""
+msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
+msgstr "não pôde ler bloco %u no arquivo \"%s\": leu somente %d de %d bytes"
 
-#: commands/tablecmds.c:4412
+#: storage/smgr/md.c:728
 #, c-format
-msgid "cannot drop inherited column \"%s\""
-msgstr "não pode remover coluna herdada \"%s\""
+msgid "could not write block %u in file \"%s\": %m"
+msgstr "não pôde escrever bloco %u no arquivo \"%s\": %m"
 
-#: commands/tablecmds.c:4633 catalog/pg_constraint.c:639 catalog/heap.c:2135
+#: storage/smgr/md.c:733
 #, c-format
-msgid "constraint \"%s\" for relation \"%s\" already exists"
-msgstr "restrição \"%s\" para relação \"%s\" já existe"
-
-#: commands/tablecmds.c:4743
-msgid "constraint must be added to child tables too"
-msgstr "restrição deve ser adicionada as tabelas descendentes também"
+msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
+msgstr ""
+"não pôde escrever bloco %u no arquivo \"%s\": escreveu somente %d de %d bytes"
 
-#: commands/tablecmds.c:4808 commands/sequence.c:1291
+#: storage/smgr/md.c:831
 #, c-format
-msgid "referenced relation \"%s\" is not a table"
-msgstr "relação referenciada \"%s\" não é uma tabela"
-
-#: commands/tablecmds.c:4830
-msgid "cannot reference temporary table from permanent table constraint"
+msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
 msgstr ""
-"não pode referenciar tabela temporária a partir de uma restrição em uma "
-"tabela permanente"
+"não pôde truncar arquivo \"%s\" para %u blocos: há somente %u blocos agora"
 
-#: commands/tablecmds.c:4837
-msgid "cannot reference permanent table from temporary table constraint"
-msgstr ""
-"não pode referenciar tabela permanente a partir de uma restrição em uma "
-"tabela temporária"
+#: storage/smgr/md.c:880
+#, c-format
+msgid "could not truncate file \"%s\" to %u blocks: %m"
+msgstr "não pôde truncar arquivo \"%s\" para %u blocos: %m"
 
-#: commands/tablecmds.c:4897
-msgid "number of referencing and referenced columns for foreign key disagree"
+#: storage/smgr/md.c:1134
+#, c-format
+msgid "could not fsync file \"%s\" but retrying: %m"
+msgstr "não pôde executar fsync no arquivo \"%s\" mas tentando novamente: %m"
+
+#: storage/smgr/md.c:1276
+msgid "could not forward fsync request because request queue is full"
 msgstr ""
-"número de colunas que referenciam e são referenciadas em um chave "
-"estrangeira não correspondem"
+"não pôde encaminhar pedido de fsync porque a fila de pedidos está cheia"
 
-#: commands/tablecmds.c:4986
+#: storage/smgr/md.c:1646
 #, c-format
-msgid "foreign key constraint \"%s\" cannot be implemented"
-msgstr "restrição de chave estrangeira \"%s\" não pode ser implementada"
+msgid "could not open file \"%s\" (target block %u): %m"
+msgstr "não pôde abrir arquivo \"%s\" (bloco alvo %u): %m"
 
-#: commands/tablecmds.c:4989
+#: storage/smgr/md.c:1668
 #, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
-msgstr "Colunas chave \"%s\" e \"%s\" são de tipos incompatíveis: %s e %s."
+msgid "could not seek to end of file \"%s\": %m"
+msgstr "não pôde buscar fim do arquivo \"%s\": %m"
 
-#: commands/tablecmds.c:5084
+#: storage/lmgr/lock.c:517
 #, c-format
-msgid "column \"%s\" referenced in foreign key constraint does not exist"
+msgid ""
+"cannot acquire lock mode %s on database objects while recovery is in progress"
 msgstr ""
-"coluna \"%s\" referenciada na restrição de chave estrangeira não existe"
+"não pode adquirir modo de bloqueio %s em objetos de banco de dados enquanto "
+"recuperação está em progresso"
 
-#: commands/tablecmds.c:5089
-#, c-format
-msgid "cannot have more than %d keys in a foreign key"
-msgstr "não pode ter mais do que %d chaves em uma chave estrangeira"
+#: storage/lmgr/lock.c:519
+msgid ""
+"Only RowExclusiveLock or less can be acquired on database objects during "
+"recovery."
+msgstr ""
+"Somente RowExclusiveLock ou menos pode ser adquirido em objetos de banco de "
+"dados durante recuperação."
 
-#: commands/tablecmds.c:5154
-#, c-format
-msgid "cannot use a deferrable primary key for referenced table \"%s\""
+#: storage/lmgr/lock.c:631 storage/lmgr/lock.c:700 storage/lmgr/lock.c:2163
+#: storage/lmgr/lock.c:2542 storage/lmgr/lock.c:2607 storage/lmgr/proc.c:197
+#: storage/lmgr/proc.c:216 storage/lmgr/predicate.c:2233
+#: storage/lmgr/predicate.c:2248 storage/lmgr/predicate.c:3623
+#: storage/lmgr/predicate.c:4770 storage/ipc/shmem.c:190
+#: utils/hash/dynahash.c:928
+msgid "out of shared memory"
+msgstr "sem memória compartilhada"
+
+#: storage/lmgr/lock.c:632 storage/lmgr/lock.c:701 storage/lmgr/lock.c:2543
+#: storage/lmgr/lock.c:2608
+msgid "You might need to increase max_locks_per_transaction."
+msgstr "Você pode precisar aumentar max_locks_per_transaction."
+
+#: storage/lmgr/lock.c:2164
+msgid "Not enough memory for reassigning the prepared transaction's locks."
 msgstr ""
-"não pode utilizar uma chave primária postergável na tabela referenciada \"%s"
-"\""
+"Memória insuficiente para atribuir os bloqueios de uma transação preparada."
 
-#: commands/tablecmds.c:5171
+#: storage/lmgr/proc.c:1046 utils/adt/misc.c:102
 #, c-format
-msgid "there is no primary key for referenced table \"%s\""
-msgstr "não há chave primária na tabela referenciada \"%s\""
+msgid "could not send signal to process %d: %m"
+msgstr "não pôde enviar sinal para processo %d: %m"
 
-#: commands/tablecmds.c:5321
+#: storage/lmgr/proc.c:1080
 #, c-format
-msgid "cannot use a deferrable unique constraint for referenced table \"%s\""
+msgid ""
+"process %d avoided deadlock for %s on %s by rearranging queue order after "
+"%ld.%03d ms"
 msgstr ""
-"não pode utilizar uma restrição de unicidade postergável na tabela "
-"referenciada \"%s\""
+"processo %d evitou impasse por %s em %s ao reorganizar a ordem da fila após "
+"%ld.%03d ms"
 
-#: commands/tablecmds.c:5326
+#: storage/lmgr/proc.c:1092
 #, c-format
 msgid ""
-"there is no unique constraint matching given keys for referenced table \"%s\""
+"process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
 msgstr ""
-"não há restrição de unicidade que corresponde com as colunas informadas na "
-"tabela referenciada \"%s\""
+"processo %d detectou impasse enquanto esperava por %s em %s após %ld.%03d ms"
 
-#: commands/tablecmds.c:5656
+#: storage/lmgr/proc.c:1098
 #, c-format
-msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
-msgstr "não pode remover restrição herdada \"%s\" da relação \"%s\""
+msgid "process %d still waiting for %s on %s after %ld.%03d ms"
+msgstr "processo %d ainda espera por %s em %s após %ld.%03d ms"
 
-#: commands/tablecmds.c:5683 commands/tablecmds.c:5797
+#: storage/lmgr/proc.c:1102
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist"
-msgstr "restrição \"%s\" da relação \"%s\" não existe"
+msgid "process %d acquired %s on %s after %ld.%03d ms"
+msgstr "processo %d obteve %s em %s após %ld.%03d ms"
 
-#: commands/tablecmds.c:5689
+#: storage/lmgr/proc.c:1118
 #, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist, skipping"
-msgstr "restrição \"%s\" da relação \"%s\" não existe, ignorando"
-
-#: commands/tablecmds.c:5830
-#, fuzzy
-msgid "cannot alter column type of typed table"
-msgstr "não pode alterar tipo de coluna de uma tabela tipada"
+msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
+msgstr "processo %d falhou ao obter %s em %s após %ld.%03d ms"
 
-#: commands/tablecmds.c:5853
-#, c-format
-msgid "cannot alter inherited column \"%s\""
-msgstr "não pode alterar coluna herdada \"%s\""
+#: storage/lmgr/predicate.c:665
+msgid "not enough elements in RWConflictPool to record a read/write conflict"
+msgstr ""
+"não há elementos suficientes em RWConflictPool para registrar um conflito de "
+"leitura/escrita"
 
-#: commands/tablecmds.c:5888
-msgid "transform expression must not return a set"
-msgstr "expressão de transformação não deve retornar um conjunto"
+#: storage/lmgr/predicate.c:666 storage/lmgr/predicate.c:694
+msgid ""
+"You might need to run fewer transactions at a time or increase "
+"max_connections."
+msgstr ""
+"Talvez seja necessário executar poucas transações ao mesmo tempo or aumentar "
+"max_connections."
 
-#: commands/tablecmds.c:5894
-msgid "cannot use subquery in transform expression"
-msgstr "não pode utilizar subconsulta em expressão de transformação"
+#: storage/lmgr/predicate.c:693
+msgid ""
+"not enough elements in RWConflictPool to record a potential read/write "
+"conflict"
+msgstr ""
+"não há elementos suficientes em RWConflictPool para registrar um conflito "
+"potencial de leitura/escrita"
 
-#: commands/tablecmds.c:5898
-msgid "cannot use aggregate function in transform expression"
-msgstr "não pode utilizar função de agregação em expressão de transformação"
+#: storage/lmgr/predicate.c:898
+msgid "memory for serializable conflict tracking is nearly exhausted"
+msgstr ""
+"memória para rastreamento de conflitos de serialização está quase esgotada"
 
-#: commands/tablecmds.c:5902
-msgid "cannot use window function in transform expression"
-msgstr "não pode utilizar função deslizante em expressão de transformação"
+#: storage/lmgr/predicate.c:899
+msgid ""
+"There might be an idle transaction or a forgotten prepared transaction "
+"causing this."
+msgstr ""
+"Pode haver uma transação ociosa ou uma transação preparada em aberto "
+"causando isso."
 
-#: commands/tablecmds.c:5920
+#: storage/lmgr/predicate.c:1181 storage/lmgr/predicate.c:1253
 #, c-format
-msgid "column \"%s\" cannot be cast to type %s"
-msgstr "coluna \"%s\" não pode ser convertida para tipo %s"
+msgid ""
+"not enough shared memory for elements of data structure \"%s\" (%lu bytes "
+"requested)"
+msgstr ""
+"não há memória compartilhada suficiente para elementos da estrutura de dados "
+"\"%s\" (%lu bytes solicitados)"
 
-#: commands/tablecmds.c:5946
-#, c-format
-msgid "type of inherited column \"%s\" must be changed in child tables too"
+#: storage/lmgr/predicate.c:1536
+msgid "deferrable snapshot was unsafe; trying a new one"
 msgstr ""
-"tipo de coluna herdada \"%s\" deve ser alterado nas tabelas descendentes "
-"também"
 
-#: commands/tablecmds.c:5985
-#, c-format
-msgid "cannot alter type of column \"%s\" twice"
-msgstr "não pode alterar tipo de coluna \"%s\" duas vezes"
+#: storage/lmgr/predicate.c:2234 storage/lmgr/predicate.c:2249
+#: storage/lmgr/predicate.c:3624
+msgid "You might need to increase max_pred_locks_per_transaction."
+msgstr "Você pode precisar aumentar max_pred_locks_per_transaction."
 
-#: commands/tablecmds.c:6019
-#, c-format
-msgid "default for column \"%s\" cannot be cast to type %s"
-msgstr "valor padrão para coluna \"%s\" não pode ser convertido para tipo %s"
+#: storage/lmgr/predicate.c:3778 storage/lmgr/predicate.c:3867
+#: storage/lmgr/predicate.c:3875 storage/lmgr/predicate.c:3914
+#: storage/lmgr/predicate.c:4153 storage/lmgr/predicate.c:4491
+#: storage/lmgr/predicate.c:4503 storage/lmgr/predicate.c:4545
+#: storage/lmgr/predicate.c:4583
+msgid ""
+"could not serialize access due to read/write dependencies among transactions"
+msgstr ""
+"não pôde serializar acesso devido a dependências de leitura/escrita entre "
+"transações"
 
-#: commands/tablecmds.c:6145
-msgid "cannot alter type of a column used by a view or rule"
-msgstr "não pode alterar tipo de uma coluna utilizada por uma visão ou regra"
+#: storage/lmgr/predicate.c:3780 storage/lmgr/predicate.c:3869
+#: storage/lmgr/predicate.c:3877 storage/lmgr/predicate.c:3916
+#: storage/lmgr/predicate.c:4155 storage/lmgr/predicate.c:4493
+#: storage/lmgr/predicate.c:4505 storage/lmgr/predicate.c:4547
+#: storage/lmgr/predicate.c:4585
+msgid "The transaction might succeed if retried."
+msgstr "A transação pode ter sucesso se repetida."
 
-#: commands/tablecmds.c:6146
+#: storage/lmgr/deadlock.c:915
 #, c-format
-msgid "%s depends on column \"%s\""
-msgstr "%s depende da coluna \"%s\""
+msgid "Process %d waits for %s on %s; blocked by process %d."
+msgstr "Processo %d espera por %s em %s; bloqueado pelo processo %d."
 
-#: commands/tablecmds.c:6498
+#: storage/lmgr/deadlock.c:934
 #, c-format
-msgid "cannot change owner of index \"%s\""
-msgstr "não pode mudar dono do índice \"%s\""
+msgid "Process %d: %s"
+msgstr "Processo %d: %s"
 
-#: commands/tablecmds.c:6500
-msgid "Change the ownership of the index's table, instead."
-msgstr "Ao invés disso, mude o dono da tabela do índice."
+#: storage/lmgr/deadlock.c:941
+msgid "deadlock detected"
+msgstr "impasse detectado"
 
-#: commands/tablecmds.c:6516
-#, c-format
-msgid "cannot change owner of sequence \"%s\""
-msgstr "não pode mudar dono da sequência \"%s\""
+#: storage/lmgr/deadlock.c:944
+msgid "See server log for query details."
+msgstr "Veja log do servidor para obter detalhes das consultas."
 
-#: commands/tablecmds.c:6518 commands/tablecmds.c:7826
+#: storage/lmgr/lmgr.c:720
 #, c-format
-msgid "Sequence \"%s\" is linked to table \"%s\"."
-msgstr "Sequência \"%s\" está ligada a tabela \"%s\"."
+msgid "relation %u of database %u"
+msgstr "relação %u do banco de dados %u"
 
-#: commands/tablecmds.c:6539 commands/tablecmds.c:7844
+#: storage/lmgr/lmgr.c:726
 #, c-format
-msgid "\"%s\" is not a table, view, or sequence"
-msgstr "\"%s\" não é uma tabela, visão ou sequência"
+msgid "extension of relation %u of database %u"
+msgstr "extensão da relação %u do banco de dados %u"
 
-#: commands/tablecmds.c:6751 commands/cluster.c:170
+#: storage/lmgr/lmgr.c:732
 #, c-format
-msgid "index \"%s\" for table \"%s\" does not exist"
-msgstr "índice \"%s\" na tabela \"%s\" não existe"
-
-#: commands/tablecmds.c:6798
-msgid "cannot have multiple SET TABLESPACE subcommands"
-msgstr "não pode ter múltiplos subcomandos SET TABLESPACE"
+msgid "page %u of relation %u of database %u"
+msgstr "página %u da relação %u do banco de dados %u"
 
-#: commands/tablecmds.c:6850
+#: storage/lmgr/lmgr.c:739
 #, c-format
-msgid "\"%s\" is not a table, index, or TOAST table"
-msgstr "\"%s\" não é uma tabela, índice ou tabela TOAST"
+msgid "tuple (%u,%u) of relation %u of database %u"
+msgstr "tupla (%u,%u) da relação %u do banco de dados %u"
 
-#: commands/tablecmds.c:6971
+#: storage/lmgr/lmgr.c:747
 #, c-format
-msgid "cannot move system relation \"%s\""
-msgstr "não pode mover relação do sistema \"%s\""
-
-#: commands/tablecmds.c:6987
-msgid "cannot move temporary tables of other sessions"
-msgstr "não pode mover tabelas temporárias de outras sessões"
-
-#: commands/tablecmds.c:7176
-#, fuzzy
-msgid "cannot change inheritance of typed table"
-msgstr "não pode mudar herança de uma tabela tipada"
+msgid "transaction %u"
+msgstr "transação %u"
 
-#: commands/tablecmds.c:7261
-msgid "circular inheritance not allowed"
-msgstr "herança circular não é permitida"
+#: storage/lmgr/lmgr.c:752
+#, c-format
+msgid "virtual transaction %d/%u"
+msgstr "transação virtual %d/%u"
 
-#: commands/tablecmds.c:7262
+#: storage/lmgr/lmgr.c:758
 #, c-format
-msgid "\"%s\" is already a child of \"%s\"."
-msgstr "\"%s\" já é um descendente de \"%s\"."
+msgid "object %u of class %u of database %u"
+msgstr "objeto %u da classe %u do banco de dados %u"
 
-#: commands/tablecmds.c:7270
+#: storage/lmgr/lmgr.c:766
 #, c-format
-msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
-msgstr "tabela \"%s\" sem OIDs não pode herdar de tabela \"%s\" com OIDs"
+msgid "user lock [%u,%u,%u]"
+msgstr "bloqueio do usuário [%u,%u,%u]"
 
-#: commands/tablecmds.c:7397
+#: storage/lmgr/lmgr.c:773
 #, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "coluna \"%s\" na tabela descendente deve ser definida como NOT NULL"
+msgid "advisory lock [%u,%u,%u,%u]"
+msgstr "bloqueio sob aviso [%u,%u,%u,%u]"
 
-#: commands/tablecmds.c:7413
+#: storage/lmgr/lmgr.c:781
 #, c-format
-msgid "child table is missing column \"%s\""
-msgstr "tabela descendente está faltando coluna \"%s\""
+msgid "unrecognized locktag type %d"
+msgstr "tipo de marcação de bloqueio %d desconhecido"
 
-#: commands/tablecmds.c:7492
+#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
 #, c-format
-msgid "child table \"%s\" has different definition for check constraint \"%s\""
+msgid ""
+"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
 msgstr ""
-"tabela descendente \"%s\" tem definição diferente para restrição de "
-"verificação \"%s\""
+"não há memória compartilhada suficiente para estrutura de dados \"%s\" (%lu "
+"bytes solicitados)"
 
-#: commands/tablecmds.c:7516
+#: storage/ipc/shmem.c:365
 #, c-format
-msgid "child table is missing constraint \"%s\""
-msgstr "tabela descendente está faltando restrição \"%s\""
+msgid "could not create ShmemIndex entry for data structure \"%s\""
+msgstr "não pôde criar entrada ShmemIndex para estrutura de dados \"%s\""
 
-#: commands/tablecmds.c:7597
+#: storage/ipc/shmem.c:380
 #, c-format
-msgid "relation \"%s\" is not a parent of relation \"%s\""
-msgstr "relação \"%s\" não é um ancestral da relação \"%s\""
+msgid ""
+"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
+"actual %lu"
+msgstr ""
+"tamanho da entrada de ShmemIndex está errado para estrutura de dados \"%s\": "
+"esperado %lu, atual %lu"
 
-#: commands/tablecmds.c:7825
-msgid "cannot move an owned sequence into another schema"
-msgstr "não pode mover uma sequência ligada para outro esquema"
+#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
+msgid "requested shared memory size overflows size_t"
+msgstr "tamanho de memória compartilhada requisitada ultrapassa size_t"
 
-#: commands/tablecmds.c:7854
+#: storage/page/bufpage.c:143 storage/page/bufpage.c:390
+#: storage/page/bufpage.c:623 storage/page/bufpage.c:753
 #, c-format
-msgid "relation \"%s\" is already in schema \"%s\""
-msgstr "relação \"%s\" já está no esquema \"%s\""
-
-#: commands/tablecmds.c:7862 commands/typecmds.c:2794
-#: commands/functioncmds.c:1887
-msgid "cannot move objects into or out of temporary schemas"
-msgstr "não pode mover objetos para ou de esquemas temporários"
-
-#: commands/tablecmds.c:7868 commands/typecmds.c:2800
-#: commands/functioncmds.c:1893
-msgid "cannot move objects into or out of TOAST schema"
-msgstr "não pode mover objetos para ou de esquema TOAST"
+msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
+msgstr ""
+"ponteiros de página corrompidos: inferior = %u, superior = %u, especial = %u"
 
-#: commands/tablecmds.c:7917
+#: storage/page/bufpage.c:433
 #, c-format
-msgid "relation \"%s\" already exists in schema \"%s\""
-msgstr "relação \"%s\" já existe no esquema \"%s\""
+msgid "corrupted item pointer: %u"
+msgstr "ponteiro de item corrompido: %u"
 
-#: commands/comment.c:642
+#: storage/page/bufpage.c:444 storage/page/bufpage.c:805
 #, c-format
-msgid "\"%s\" is not a table, view, or composite type"
-msgstr "\"%s\" não é uma tabela, visão ou tipo composto"
-
-#: commands/comment.c:681
-msgid "database name cannot be qualified"
-msgstr "nome de banco de dados não pode ser qualificado"
-
-#: commands/comment.c:729
-msgid "tablespace name cannot be qualified"
-msgstr "nome de tablespace não pode ser qualificado"
-
-#: commands/comment.c:766
-msgid "role name cannot be qualified"
-msgstr "nome de role não pode ser qualificado"
+msgid "corrupted item lengths: total %u, available space %u"
+msgstr "tamanhos de itens corrompidos: total %u, espaço livre %u"
 
-#: commands/comment.c:775
+#: storage/page/bufpage.c:642 storage/page/bufpage.c:778
 #, c-format
-msgid "must be member of role \"%s\" to comment upon it"
-msgstr "deve ser membro da role \"%s\" para adicionar comentário sobre ela"
+msgid "corrupted item pointer: offset = %u, size = %u"
+msgstr "ponteiro de item corrompido: deslocamento = %u, tamanho = %u"
 
-#: commands/comment.c:799 commands/schemacmds.c:178
-msgid "schema name cannot be qualified"
-msgstr "nome do esquema não pode ser qualificado"
+#: storage/buffer/localbuf.c:190
+msgid "no empty local buffer available"
+msgstr "nenhum buffer local vazio está disponível"
 
-#: commands/comment.c:874
-#, c-format
-msgid "rule \"%s\" does not exist"
-msgstr "regra \"%s\" não existe"
+#: storage/buffer/bufmgr.c:134 storage/buffer/bufmgr.c:239
+msgid "cannot access temporary tables of other sessions"
+msgstr "não pode acessar tabelas temporárias de outras sessões"
 
-#: commands/comment.c:882
+#: storage/buffer/bufmgr.c:373
 #, c-format
-msgid "there are multiple rules named \"%s\""
-msgstr "há múltiplas regras com nome \"%s\""
-
-#: commands/comment.c:883
-msgid "Specify a relation name as well as a rule name."
-msgstr "Especifique um nome de relação bem como um nome de regra."
-
-#: commands/comment.c:1213
-msgid "language name cannot be qualified"
-msgstr "nome de linguagem não pode ser qualificado"
+msgid "unexpected data beyond EOF in block %u of relation %s"
+msgstr "dado inesperado após EOF no bloco %u da relação %s"
 
-#: commands/comment.c:1226
-msgid "must be superuser to comment on procedural language"
+#: storage/buffer/bufmgr.c:375
+msgid ""
+"This has been seen to occur with buggy kernels; consider updating your "
+"system."
 msgstr ""
-"deve ser super-usuário para adicionar comentário sobre linguagem procedural"
+"Isso tem ocorrido com kernels contendo bugs; considere atualizar seu sistema."
 
-#: commands/comment.c:1370 commands/comment.c:1378 commands/opclasscmds.c:343
-#: commands/opclasscmds.c:789 commands/opclasscmds.c:1568
-#: commands/opclasscmds.c:1572 commands/opclasscmds.c:1833
-#: commands/opclasscmds.c:1844 commands/opclasscmds.c:2069
-#: commands/opclasscmds.c:2080
+#: storage/buffer/bufmgr.c:447
 #, c-format
-msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "família de operadores \"%s\" não existe para método de acesso \"%s\""
+msgid "invalid page header in block %u of relation %s; zeroing out page"
+msgstr ""
+"cabeçalho de página é inválido no bloco %u da relação %s; zerando página"
 
-#: commands/comment.c:1415 storage/large_object/inv_api.c:272
-#: catalog/aclchk.c:656 catalog/aclchk.c:3684 catalog/aclchk.c:4375
-#: catalog/pg_largeobject.c:116 catalog/pg_largeobject.c:176
+#: storage/buffer/bufmgr.c:455
 #, c-format
-msgid "large object %u does not exist"
-msgstr "objeto grande %u não existe"
+msgid "invalid page header in block %u of relation %s"
+msgstr "cabeçalho de página é inválido no bloco %u da relação %s"
 
-#: commands/comment.c:1422 catalog/pg_largeobject.c:200 libpq/be-fsstubs.c:287
+#: storage/buffer/bufmgr.c:2746
 #, c-format
-msgid "must be owner of large object %u"
-msgstr "deve ser dono do objeto grande %u"
+msgid "could not write block %u of %s"
+msgstr "não pôde escrever bloco %u de %s"
 
-#: commands/comment.c:1469 commands/functioncmds.c:1777
-#, c-format
-msgid "cast from type %s to type %s does not exist"
-msgstr "conversão do tipo %s para tipo %s não existe"
+#: storage/buffer/bufmgr.c:2748
+msgid "Multiple failures --- write error might be permanent."
+msgstr "Falhas múltiplas --- erro de escrita pode ser permanente."
 
-#: commands/comment.c:1481 commands/functioncmds.c:1522
-#: commands/functioncmds.c:1794
+#: storage/buffer/bufmgr.c:2769 storage/buffer/bufmgr.c:2788
 #, c-format
-msgid "must be owner of type %s or type %s"
-msgstr "deve ser dono do tipo %s ou tipo %s"
-
-#: commands/comment.c:1501
-msgid "must be superuser to comment on text search parser"
-msgstr ""
-"deve ser super-usuário para adicionar comentário sobre analisador de busca "
-"textual"
-
-#: commands/comment.c:1530
-msgid "must be superuser to comment on text search template"
-msgstr ""
-"deve ser super-usuário para adicionar comentário sobre modelo de busca "
-"textual"
+msgid "writing block %u of relation %s"
+msgstr "escrevendo bloco %u da relação %s"
 
-#: commands/typecmds.c:163
-msgid "must be superuser to create a base type"
-msgstr "deve ser super-usuário para criar um tipo base"
+#: storage/large_object/inv_api.c:555 storage/large_object/inv_api.c:752
+#, c-format
+msgid "large object %u was not opened for writing"
+msgstr "objeto grande %u não foi aberto para escrita"
 
-#: commands/typecmds.c:218 commands/typecmds.c:795 commands/typecmds.c:1120
-#: commands/typecmds.c:1543 catalog/pg_type.c:385 catalog/pg_type.c:665
-#: catalog/heap.c:943
+#: storage/large_object/inv_api.c:562 storage/large_object/inv_api.c:759
 #, c-format
-msgid "type \"%s\" already exists"
-msgstr "tipo \"%s\" já existe"
+msgid "large object %u was already dropped"
+msgstr "objeto grande %u já foi removido"
 
-#: commands/typecmds.c:267
+#: utils/mmgr/aset.c:417
 #, c-format
-msgid "type attribute \"%s\" not recognized"
-msgstr "atributo do tipo \"%s\" desconhecido"
+msgid "Failed while creating memory context \"%s\"."
+msgstr "Falhou ao criar contexto de memória \"%s\"."
 
-#: commands/typecmds.c:321
+#: utils/mmgr/aset.c:588 utils/mmgr/aset.c:766 utils/mmgr/aset.c:967
 #, c-format
-msgid "invalid type category \"%s\": must be simple ASCII"
-msgstr "categoria de tipo \"%s\" é inválida: deve ser ASCII simples"
+msgid "Failed on request of size %lu."
+msgstr "Falhou ao requisitar o tamanho %lu."
 
-#: commands/typecmds.c:340
+#: utils/mmgr/portalmem.c:207
 #, c-format
-msgid "array element type cannot be %s"
-msgstr "tipo do elemento da matriz não pode ser %s"
+msgid "cursor \"%s\" already exists"
+msgstr "cursor \"%s\" já existe"
 
-#: commands/typecmds.c:372
+#: utils/mmgr/portalmem.c:211
 #, c-format
-msgid "alignment \"%s\" not recognized"
-msgstr "alinhamento \"%s\" desconhecido"
+msgid "closing existing cursor \"%s\""
+msgstr "fechando cursor existente \"%s\""
 
-#: commands/typecmds.c:389
+#: utils/mmgr/portalmem.c:448
 #, c-format
-msgid "storage \"%s\" not recognized"
-msgstr "armazenamento \"%s\" desconhecido"
+msgid "cannot drop active portal \"%s\""
+msgstr "não pode remover portal ativo \"%s\""
 
-#: commands/typecmds.c:398
-msgid "type input function must be specified"
-msgstr "função de entrada do tipo deve ser especificada"
+#: utils/mmgr/portalmem.c:635
+msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
+msgstr ""
+"não pode executar PREPARE em uma transação que criou um cursor WITH HOLD"
 
-#: commands/typecmds.c:402
-msgid "type output function must be specified"
-msgstr "função de saída do tipo deve ser especificada"
+#: utils/misc/help_config.c:131
+msgid "internal error: unrecognized run-time parameter type\n"
+msgstr "erro interno: tipo de parâmetro em tempo de execução desconhecido\n"
 
-#: commands/typecmds.c:407
+#: utils/misc/tzparser.c:61
+#, c-format
 msgid ""
-"type modifier output function is useless without a type modifier input "
-"function"
+"time zone abbreviation \"%s\" is too long (maximum %d characters) in time "
+"zone file \"%s\", line %d"
 msgstr ""
-"função de saída do modificador de tipo é inútil sem uma função de entrada do "
-"modificador de tipo"
+"abreviação de zona horária \"%s\" é muito longa (máximo de %d caracteres) no "
+"arquivo de zona horária \"%s\", linha %d"
 
-#: commands/typecmds.c:430
+#: utils/misc/tzparser.c:68
 #, c-format
-msgid "changing return type of function %s from \"opaque\" to %s"
-msgstr "alterando tipo retornado pela função %s de \"opaque\" para %s"
+msgid ""
+"time zone offset %d is not a multiple of 900 sec (15 min) in time zone file "
+"\"%s\", line %d"
+msgstr ""
+"deslocamento %d de zona horária não é múltiplo de 900 seg (15 min) no "
+"arquivo de zona horária \"%s\", linha %d"
 
-#: commands/typecmds.c:437
+#: utils/misc/tzparser.c:80
 #, c-format
-msgid "type input function %s must return type %s"
-msgstr "função de entrada do tipo %s deve retornar tipo %s"
+msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
+msgstr ""
+"deslocamento %d de zona horária está fora do intervalo no arquivo de zona "
+"horária \"%s\", linha %d"
 
-#: commands/typecmds.c:447
+#: utils/misc/tzparser.c:115
 #, c-format
-msgid "changing return type of function %s from \"opaque\" to \"cstring\""
-msgstr "alterando tipo retornado pela função %s de \"opaque\" para \"cstring\""
+msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
+msgstr ""
+"faltando abreviação de zona horária no arquivo de zona horária \"%s\", linha "
+"%d"
 
-#: commands/typecmds.c:454
+#: utils/misc/tzparser.c:124
 #, c-format
-msgid "type output function %s must return type \"cstring\""
-msgstr "função de saída do tipo %s deve retornar tipo \"cstring\""
+msgid "missing time zone offset in time zone file \"%s\", line %d"
+msgstr ""
+"faltando deslocamento de zona horária no arquivo de zona horária \"%s\", "
+"linha %d"
 
-#: commands/typecmds.c:463
+#: utils/misc/tzparser.c:131
 #, c-format
-msgid "type receive function %s must return type %s"
-msgstr "função de recepção do tipo %s deve retornar tipo %s"
+msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
+msgstr ""
+"número é inválido para deslocamento de zona horária no arquivo de zona "
+"horária \"%s\", linha %d"
 
-#: commands/typecmds.c:472
+#: utils/misc/tzparser.c:154
 #, c-format
-msgid "type send function %s must return type \"bytea\""
-msgstr "função de envio do tipo %s deve retornar tipo \"bytea\""
+msgid "invalid syntax in time zone file \"%s\", line %d"
+msgstr "sintaxe é inválida no arquivo de zona horária \"%s\", linha %d"
 
-#: commands/typecmds.c:677 commands/typecmds.c:2205
+#: utils/misc/tzparser.c:218
 #, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\" não é um domínio"
+msgid "time zone abbreviation \"%s\" is multiply defined"
+msgstr "abreviação de zona horária \"%s\" foi definida mais de uma vez"
 
-#: commands/typecmds.c:816
+#: utils/misc/tzparser.c:220
 #, c-format
-msgid "\"%s\" is not a valid base type for a domain"
-msgstr "\"%s\" não é um tipo base válido para um domínio"
-
-#: commands/typecmds.c:885
-msgid "multiple default expressions"
-msgstr "múltiplas expressões padrão"
-
-#: commands/typecmds.c:949 commands/typecmds.c:958
-msgid "conflicting NULL/NOT NULL constraints"
-msgstr "restrições NULL/NOT NULL conflitantes"
-
-#: commands/typecmds.c:977 commands/typecmds.c:1902
-msgid "unique constraints not possible for domains"
-msgstr "restrições de unicidade não são possíveis para domínios"
-
-#: commands/typecmds.c:983 commands/typecmds.c:1908
-msgid "primary key constraints not possible for domains"
-msgstr "restrições de chave primária não são possíveis para domínios"
-
-#: commands/typecmds.c:989 commands/typecmds.c:1914
-msgid "exclusion constraints not possible for domains"
-msgstr "restrições de exclusão não são possíveis para domínios"
+msgid ""
+"Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s"
+"\", line %d."
+msgstr ""
+"Arquivo de zona horária \"%s\", linha %d, conflita com entrada no arquivo "
+"\"%s\", linha %d."
 
-#: commands/typecmds.c:995 commands/typecmds.c:1920
-msgid "foreign key constraints not possible for domains"
-msgstr "restrições de chave estrangeira não são possíveis para domínios"
+#: utils/misc/tzparser.c:285
+#, c-format
+msgid "invalid time zone file name \"%s\""
+msgstr "nome de arquivo de zona horária \"%s\" é inválido"
 
-#: commands/typecmds.c:1004 commands/typecmds.c:1929
-msgid "specifying constraint deferrability not supported for domains"
+#: utils/misc/tzparser.c:298
+#, c-format
+msgid "time zone file recursion limit exceeded in file \"%s\""
 msgstr ""
-"especificação de postergação de restrição não é suportada para domínios"
+"limite de recursão do arquivo de zona horária foi excedido no arquivo \"%s\""
 
-#: commands/typecmds.c:1251
+#: utils/misc/tzparser.c:337 utils/misc/tzparser.c:350
 #, c-format
-msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
-msgstr ""
-"alterando tipo de argumento da função %s de \"opaque\" para \"cstring\""
+msgid "could not read time zone file \"%s\": %m"
+msgstr "não pôde ler arquivo de zona horária \"%s\": %m"
 
-#: commands/typecmds.c:1302
+#: utils/misc/tzparser.c:360
 #, c-format
-msgid "changing argument type of function %s from \"opaque\" to %s"
-msgstr "alterando tipo de argumento da função %s de \"opaque\" para %s"
+msgid "line is too long in time zone file \"%s\", line %d"
+msgstr "linha é muito longa no arquivo de zona horária \"%s\", linha %d"
 
-#: commands/typecmds.c:1401
+#: utils/misc/tzparser.c:383
 #, c-format
-msgid "typmod_in function %s must return type \"integer\""
-msgstr "função typmod_in %s deve retornar tipo \"integer\""
+msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
+msgstr ""
+"@INCLUDE sem nome de arquivo no arquivo de zona horária \"%s\", linha %d"
 
-#: commands/typecmds.c:1428
+#: guc-file.l:203 utils/misc/guc.c:5100 utils/misc/guc.c:5869
+#: utils/misc/guc.c:5921 utils/misc/guc.c:6594 utils/misc/guc.c:6753
+#: utils/misc/guc.c:7932
 #, c-format
-msgid "typmod_out function %s must return type \"cstring\""
-msgstr "função typmod_out %s deve retornar tipo \"cstring\""
+msgid "unrecognized configuration parameter \"%s\""
+msgstr "parâmetro de configuração \"%s\" desconhecido"
 
-#: commands/typecmds.c:1455
+#: guc-file.l:250 utils/misc/guc.c:5162 utils/misc/guc.c:5336
+#: utils/misc/guc.c:5433 utils/misc/guc.c:5527 utils/misc/guc.c:5641
+#: utils/misc/guc.c:5742
 #, c-format
-msgid "type analyze function %s must return type \"boolean\""
-msgstr "função de análise do tipo %s deve retornar tipo \"boolean\""
+msgid "parameter \"%s\" cannot be changed without restarting the server"
+msgstr "parâmetro \"%s\" não pode ser mudado sem reiniciar o servidor"
 
-#: commands/typecmds.c:1513
-msgid "composite type must have at least one attribute"
-msgstr "tipo composto deve ter pelo menos um atributo"
+#: guc-file.l:274
+#, c-format
+msgid "parameter \"%s\" removed from configuration file, reset to default"
+msgstr ""
+"parâmetro \"%s\" foi removido do arquivo de configuração, reiniciar para "
+"padrão"
 
-#: commands/typecmds.c:1754
+#: guc-file.l:333
 #, c-format
-msgid "column \"%s\" of table \"%s\" contains null values"
-msgstr "coluna \"%s\" da tabela \"%s\" contém valores nulos"
+msgid "parameter \"%s\" changed to \"%s\""
+msgstr "parâmetro \"%s\" mudou para \"%s\""
 
-#: commands/typecmds.c:2000
+#: guc-file.l:374
 #, c-format
 msgid ""
-"column \"%s\" of table \"%s\" contains values that violate the new constraint"
+"could not open configuration file \"%s\": maximum nesting depth exceeded"
 msgstr ""
-"coluna \"%s\" da tabela \"%s\" contém valores que violam a nova restrição"
+"não pôde abrir arquivo de configuração \"%s\": profundidade aninhada máxima "
+"excedida"
 
-#: commands/typecmds.c:2239 catalog/pg_constraint.c:648
+#: guc-file.l:589
 #, c-format
-msgid "constraint \"%s\" for domain \"%s\" already exists"
-msgstr "restrição \"%s\" para domínio \"%s\" já existe"
+msgid "syntax error in file \"%s\" line %u, near end of line"
+msgstr "erro de sintaxe no arquivo \"%s\" linha %u, próximo ao fim da linha"
 
-#: commands/typecmds.c:2281 commands/typecmds.c:2290
-msgid "cannot use table references in domain check constraint"
+#: guc-file.l:594
+#, c-format
+msgid "syntax error in file \"%s\" line %u, near token \"%s\""
 msgstr ""
-"não pode utilizar referências a tabela em restrição de verificação do domínio"
-
-#: commands/typecmds.c:2298 catalog/heap.c:2330
-msgid "cannot use subquery in check constraint"
-msgstr "não pode utilizar subconsulta na restrição de verificação"
+"erro de sintaxe no arquivo \"%s\" linha %u, próximo a informação \"%s\""
 
-#: commands/typecmds.c:2302 catalog/heap.c:2334
-msgid "cannot use aggregate function in check constraint"
-msgstr "não pode utilizar função de agregação na restrição de verificação"
+#: utils/misc/guc.c:525
+msgid "Ungrouped"
+msgstr "Desagrupado"
 
-#: commands/typecmds.c:2306 catalog/heap.c:2338
-msgid "cannot use window function in check constraint"
-msgstr "não pode utilizar função deslizante na restrição de verificação"
+#: utils/misc/guc.c:527
+msgid "File Locations"
+msgstr "Locais de Arquivos"
 
-#: commands/typecmds.c:2519 commands/typecmds.c:2591 commands/typecmds.c:2822
-#, c-format
-msgid "%s is a table's row type"
-msgstr "%s é um tipo de registro de tabela"
+#: utils/misc/guc.c:529
+msgid "Connections and Authentication"
+msgstr "Conexões e Autenticação"
 
-#: commands/typecmds.c:2521 commands/typecmds.c:2593 commands/typecmds.c:2824
-msgid "Use ALTER TABLE instead."
-msgstr "Ao invés disso utilize ALTER TABLE."
+#: utils/misc/guc.c:531
+msgid "Connections and Authentication / Connection Settings"
+msgstr "Conexões e Autenticação / Configurações sobre Conexão"
 
-#: commands/typecmds.c:2528 commands/typecmds.c:2600 commands/typecmds.c:2739
-#, c-format
-msgid "cannot alter array type %s"
-msgstr "não pode alterar tipo array %s"
+#: utils/misc/guc.c:533
+msgid "Connections and Authentication / Security and Authentication"
+msgstr "Conexões e Autenticação / Segurança e Autenticação"
 
-#: commands/typecmds.c:2530 commands/typecmds.c:2602 commands/typecmds.c:2741
-#, c-format
-msgid "You can alter type %s, which will alter the array type as well."
-msgstr "Você pode alterar tipo %s, que alterará o tipo array também."
+#: utils/misc/guc.c:535
+msgid "Resource Usage"
+msgstr "Uso de Recursos"
 
-#: commands/typecmds.c:2786
-#, c-format
-msgid "type %s is already in schema \"%s\""
-msgstr "tipo %s já está no esquema \"%s\""
+#: utils/misc/guc.c:537
+msgid "Resource Usage / Memory"
+msgstr "Uso de Recursos / Memória"
 
-#: commands/typecmds.c:2808
-#, c-format
-msgid "type \"%s\" already exists in schema \"%s\""
-msgstr "tipo \"%s\" já existe no esquema \"%s\""
+#: utils/misc/guc.c:539
+msgid "Resource Usage / Kernel Resources"
+msgstr "Uso de Recursos / Recursos do Kernel"
 
-#: commands/foreigncmds.c:132 commands/foreigncmds.c:141
-#, c-format
-msgid "option \"%s\" not found"
-msgstr "opção \"%s\" não foi encontrada"
+#: utils/misc/guc.c:541
+msgid "Resource Usage / Cost-Based Vacuum Delay"
+msgstr "Uso de Recursos / Atraso de Limpeza Baseado em Custo"
 
-#: commands/foreigncmds.c:151
-#, c-format
-msgid "option \"%s\" provided more than once"
-msgstr "opção \"%s\" especificada mais de uma vez"
+#: utils/misc/guc.c:543
+msgid "Resource Usage / Background Writer"
+msgstr "Uso de Recursos / Escritor de Segundo Plano"
 
-#: commands/foreigncmds.c:209 commands/foreigncmds.c:217
-#, c-format
-msgid "permission denied to change owner of foreign-data wrapper \"%s\""
-msgstr "permissão negada ao mudar dono do adaptador de dados externo \"%s\""
+#: utils/misc/guc.c:545
+msgid "Resource Usage / Asynchronous Behavior"
+msgstr "Uso de Recursos / Comportamento Assíncrono"
 
-#: commands/foreigncmds.c:211
-msgid "Must be superuser to change owner of a foreign-data wrapper."
-msgstr ""
-"Deve ser super-usuário para mudar dono de um adaptador de dados externo."
+#: utils/misc/guc.c:547
+msgid "Write-Ahead Log"
+msgstr "Log de Escrita Prévia"
 
-#: commands/foreigncmds.c:219
-msgid "The owner of a foreign-data wrapper must be a superuser."
-msgstr "O dono de um adaptador de dados externo deve ser um super-usuário."
+#: utils/misc/guc.c:549
+msgid "Write-Ahead Log / Settings"
+msgstr "Log de Escrita Prévia / Configurações"
 
-#: commands/foreigncmds.c:347
-#, c-format
-msgid "permission denied to create foreign-data wrapper \"%s\""
-msgstr "permissão negada ao criar adaptador de dados externo \"%s\""
+#: utils/misc/guc.c:551
+msgid "Write-Ahead Log / Checkpoints"
+msgstr "Log de Escrita Prévia / Pontos de Controle"
 
-#: commands/foreigncmds.c:349
-msgid "Must be superuser to create a foreign-data wrapper."
-msgstr "Deve ser super-usuário para criar uma adaptador de dados externo."
+#: utils/misc/guc.c:553
+msgid "Write-Ahead Log / Archiving"
+msgstr "Log de Escrita Prévia / Arquivamento"
 
-#: commands/foreigncmds.c:360
-#, c-format
-msgid "foreign-data wrapper \"%s\" already exists"
-msgstr "adaptador de dados externo \"%s\" já existe"
+#: utils/misc/guc.c:555
+msgid "Replication"
+msgstr "Replicação"
 
-#: commands/foreigncmds.c:442
-#, c-format
-msgid "permission denied to alter foreign-data wrapper \"%s\""
-msgstr "permissão negada ao alterar adaptador de dados externo \"%s\""
+#: utils/misc/guc.c:557
+msgid "Replication / Master Server"
+msgstr "Replicação / Servidor Principal"
 
-#: commands/foreigncmds.c:444
-msgid "Must be superuser to alter a foreign-data wrapper."
-msgstr "Deve ser super-usuário para alterar um adaptador de dados externo."
+#: utils/misc/guc.c:559
+msgid "Replication / Standby Servers"
+msgstr "Replicação / Servidores em Espera"
 
-#: commands/foreigncmds.c:472
-msgid ""
-"changing the foreign-data wrapper validator can cause the options for "
-"dependent objects to become invalid"
-msgstr ""
-"mudar o validador do adaptador de dados externo pode tornar inválidas as "
-"opções para objetos dependentes"
+#: utils/misc/guc.c:561
+msgid "Query Tuning"
+msgstr "Ajuste de Consultas"
 
-#: commands/foreigncmds.c:544
-#, c-format
-msgid "permission denied to drop foreign-data wrapper \"%s\""
-msgstr "permissão negada ao remover adaptador de dados externo \"%s\""
+#: utils/misc/guc.c:563
+msgid "Query Tuning / Planner Method Configuration"
+msgstr "Ajuste de Consultas / Configuração dos Métodos do Planejador"
 
-#: commands/foreigncmds.c:546
-msgid "Must be superuser to drop a foreign-data wrapper."
-msgstr "Deve ser super-usuário para remover um adaptador de dados externo."
+#: utils/misc/guc.c:565
+msgid "Query Tuning / Planner Cost Constants"
+msgstr "Ajuste de Consultas / Constantes de Custo do Planejador"
 
-#: commands/foreigncmds.c:558
-#, c-format
-msgid "foreign-data wrapper \"%s\" does not exist, skipping"
-msgstr "adaptador de dados externo \"%s\" não existe, ignorando"
+#: utils/misc/guc.c:567
+msgid "Query Tuning / Genetic Query Optimizer"
+msgstr "Ajuste de Consultas / Otimizador de Consultas Genéticas"
 
-#: commands/foreigncmds.c:625
-#, c-format
-msgid "server \"%s\" already exists"
-msgstr "servidor \"%s\" já existe"
+#: utils/misc/guc.c:569
+msgid "Query Tuning / Other Planner Options"
+msgstr "Ajuste de Consultas / Outras Opções do Planejador"
 
-#: commands/foreigncmds.c:817
-#, c-format
-msgid "server \"%s\" does not exist, skipping"
-msgstr "servidor \"%s\" não existe, ignorando"
+#: utils/misc/guc.c:571
+msgid "Reporting and Logging"
+msgstr "Relatório e Registro"
 
-#: commands/foreigncmds.c:920
-#, c-format
-msgid "user mapping \"%s\" already exists for server %s"
-msgstr "mapeamento de usuários \"%s\" já existe para servidor %s"
+#: utils/misc/guc.c:573
+msgid "Reporting and Logging / Where to Log"
+msgstr "Relatório e Registro / Onde Registrar"
 
-#: commands/foreigncmds.c:998 commands/foreigncmds.c:1105
-#, c-format
-msgid "user mapping \"%s\" does not exist for the server"
-msgstr "mapeamento de usuários \"%s\" não existe para o servidor"
+#: utils/misc/guc.c:575
+msgid "Reporting and Logging / When to Log"
+msgstr "Relatório e Registro / Quando Registrar"
 
-#: commands/foreigncmds.c:1092
-msgid "server does not exist, skipping"
-msgstr "servidor não existe, ignorando"
+#: utils/misc/guc.c:577
+msgid "Reporting and Logging / What to Log"
+msgstr "Relatório e Registro / O que Registrar"
 
-#: commands/foreigncmds.c:1110
-#, c-format
-msgid "user mapping \"%s\" does not exist for the server, skipping"
-msgstr "mapeamento de usuários \"%s\" não existe para o servidor, ignorando"
+#: utils/misc/guc.c:579
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: commands/operatorcmds.c:98
-msgid "=> is deprecated as an operator name"
-msgstr "=> está obsoleto como um nome de operador"
+#: utils/misc/guc.c:581
+msgid "Statistics / Monitoring"
+msgstr "Estatísticas / Monitoramento"
 
-#: commands/operatorcmds.c:99
-msgid ""
-"This name may be disallowed altogether in future versions of PostgreSQL."
-msgstr ""
-"Este nome pode ser proibido completamente em versões futuras do PostgreSQL."
+#: utils/misc/guc.c:583
+msgid "Statistics / Query and Index Statistics Collector"
+msgstr "Estatísticas / Coletor de Estatísticas de Consultas e �ndices"
 
-#: commands/operatorcmds.c:120 commands/operatorcmds.c:128
-msgid "SETOF type not allowed for operator argument"
-msgstr "tipo SETOF não é permitido como argumento de operador"
+#: utils/misc/guc.c:585
+msgid "Autovacuum"
+msgstr "Limpeza Automática"
 
-#: commands/operatorcmds.c:156
-#, c-format
-msgid "operator attribute \"%s\" not recognized"
-msgstr "atributo de operador \"%s\" desconhecido"
+#: utils/misc/guc.c:587
+msgid "Client Connection Defaults"
+msgstr "Valores Padrão de Conexão"
 
-#: commands/operatorcmds.c:166
-msgid "operator procedure must be specified"
-msgstr "procedimento de operador deve ser especificado"
+#: utils/misc/guc.c:589
+msgid "Client Connection Defaults / Statement Behavior"
+msgstr "Valores Padrão de Conexão / Comportamento do Comando"
 
-#: commands/operatorcmds.c:177
-msgid "at least one of leftarg or rightarg must be specified"
-msgstr "pelo menos um dos argumentos esquerdo ou direito deve ser especificado"
+#: utils/misc/guc.c:591
+msgid "Client Connection Defaults / Locale and Formatting"
+msgstr "Valores Padrão de Conexão / Configuração Regional e Formatação"
 
-#: commands/operatorcmds.c:226
-#, c-format
-msgid "restriction estimator function %s must return type \"float8\""
-msgstr "função de estimação de restrição %s deve retornar tipo \"float8\""
+#: utils/misc/guc.c:593
+msgid "Client Connection Defaults / Other Defaults"
+msgstr "Valores Padrão de Conexão / Outros Valores"
 
-#: commands/operatorcmds.c:265
-#, c-format
-msgid "join estimator function %s must return type \"float8\""
-msgstr "função de estimação de junção %s deve retornar tipo \"float8\""
+#: utils/misc/guc.c:595
+msgid "Lock Management"
+msgstr "Gerência de Bloqueio"
 
-#: commands/operatorcmds.c:316
-#, c-format
-msgid "operator %s does not exist, skipping"
-msgstr "operador %s não existe, ignorando"
+#: utils/misc/guc.c:597
+msgid "Version and Platform Compatibility"
+msgstr "Compatibilidade de Versão e Plataforma"
 
-#: commands/define.c:67 commands/define.c:222 commands/define.c:254
-#: commands/define.c:282
-#, c-format
-msgid "%s requires a parameter"
-msgstr "%s requer um parâmetro"
+#: utils/misc/guc.c:599
+msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
+msgstr ""
+"Compatibilidade de Versão e Plataforma / Versões Anteriores do PostgreSQL"
 
-#: commands/define.c:108 commands/define.c:119 commands/define.c:189
-#: commands/define.c:207
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s requer um valor numérico"
+#: utils/misc/guc.c:601
+msgid "Version and Platform Compatibility / Other Platforms and Clients"
+msgstr "Compatibilidade de Versão e Plataforma / Outras Plataformas e Clientes"
 
-#: commands/define.c:175
-#, c-format
-msgid "%s requires a Boolean value"
-msgstr "%s requer um valor Booleano"
+#: utils/misc/guc.c:603
+msgid "Error Handling"
+msgstr "Manipulação de Erro"
 
-#: commands/define.c:236
-#, c-format
-msgid "argument of %s must be a name"
-msgstr "argumento de %s deve ser um nome"
+#: utils/misc/guc.c:605
+msgid "Preset Options"
+msgstr "Opções Pré-Definidas"
 
-#: commands/define.c:266
-#, c-format
-msgid "argument of %s must be a type name"
-msgstr "argumento de %s deve ser um nome de um tipo"
+#: utils/misc/guc.c:607
+msgid "Customized Options"
+msgstr "Opções Customizadas"
 
-#: commands/define.c:291
-#, c-format
-msgid "%s requires an integer value"
-msgstr "%s requer um valor inteiro"
+#: utils/misc/guc.c:609
+msgid "Developer Options"
+msgstr "Opções para Desenvolvedores"
 
-#: commands/define.c:312
-#, c-format
-msgid "invalid argument for %s: \"%s\""
-msgstr "argumento inválido para %s: \"%s\""
+#: utils/misc/guc.c:663
+msgid "Enables the planner's use of sequential-scan plans."
+msgstr "Habilita o uso de planos de busca sequencial pelo planejador."
 
-#: commands/view.c:139
-msgid "view must have at least one column"
-msgstr "visão deve ter pelo menos uma coluna"
+#: utils/misc/guc.c:672
+msgid "Enables the planner's use of index-scan plans."
+msgstr "Habilita o uso de planos de buscas por índices pelo planejador."
 
-#: commands/view.c:260 commands/view.c:272
-msgid "cannot drop columns from view"
-msgstr "não pode apagar colunas da visão"
+#: utils/misc/guc.c:681
+msgid "Enables the planner's use of bitmap-scan plans."
+msgstr "Habilita o uso de planos de buscas por bitmaps pelo planejador."
 
-#: commands/view.c:277
-#, c-format
-msgid "cannot change name of view column \"%s\" to \"%s\""
-msgstr "não pode mudar nome de coluna da visão \"%s\" para \"%s\""
+#: utils/misc/guc.c:690
+msgid "Enables the planner's use of TID scan plans."
+msgstr "Habilita o uso de planos de buscas por TID pelo planejador."
 
-#: commands/view.c:285
-#, c-format
-msgid "cannot change data type of view column \"%s\" from %s to %s"
-msgstr "não pode mudar tipo de dado de coluna da visão \"%s\" de %s para %s"
+#: utils/misc/guc.c:699
+msgid "Enables the planner's use of explicit sort steps."
+msgstr "Habilita o uso de passos para ordenação explícita pelo planejador."
 
-#: commands/view.c:441
-msgid "CREATE VIEW specifies more column names than columns"
-msgstr "CREATE VIEW especificou mais nomes de colunas do que colunas"
+#: utils/misc/guc.c:708
+msgid "Enables the planner's use of hashed aggregation plans."
+msgstr "Habilita o uso de planos de agregação do tipo hash pelo planejador."
 
-#: commands/view.c:457
-#, c-format
-msgid "view \"%s\" will be a temporary view"
-msgstr "visão \"%s\" será uma visão temporária"
+#: utils/misc/guc.c:717
+msgid "Enables the planner's use of materialization."
+msgstr "Habilita o uso de materialização pelo planejador."
 
-#: commands/schemacmds.c:82 commands/schemacmds.c:288
-#, c-format
-msgid "unacceptable schema name \"%s\""
-msgstr "nome de esquema \"%s\" é inaceitável"
+#: utils/misc/guc.c:726
+msgid "Enables the planner's use of nested-loop join plans."
+msgstr "Habilita o uso de planos de junção de laço aninhado pelo planejador."
 
-#: commands/schemacmds.c:83 commands/schemacmds.c:289
-msgid "The prefix \"pg_\" is reserved for system schemas."
-msgstr "O prefixo \"pg_\" é reservado para esquemas do sistema."
+#: utils/misc/guc.c:735
+msgid "Enables the planner's use of merge join plans."
+msgstr "Habilita o uso de planos de junção por mesclagem pelo planejador."
 
-#: commands/schemacmds.c:196
-#, c-format
-msgid "schema \"%s\" does not exist, skipping"
-msgstr "esquema \"%s\" não existe, ignorando"
+#: utils/misc/guc.c:744
+msgid "Enables the planner's use of hash join plans."
+msgstr "Habilita o uso de planos de junção por hash pelo planejador."
 
-#: commands/schemacmds.c:272 catalog/pg_namespace.c:50
-#, c-format
-msgid "schema \"%s\" already exists"
-msgstr "esquema \"%s\" já existe"
+#: utils/misc/guc.c:753
+msgid "Enables genetic query optimization."
+msgstr "Habilita a otimização de consultas genéticas."
 
-#: commands/vacuumlazy.c:234
-#, c-format
-msgid ""
-"automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
-"pages: %d removed, %d remain\n"
-"tuples: %.0f removed, %.0f remain\n"
-"system usage: %s"
-msgstr ""
-"limpeza automática da tabela \"%s.%s.%s\": buscas por índice: %d\n"
-"páginas: %d removidas, %d remanescentes\n"
-"tuplas: %.0f removidas, %.0f remanescentes\n"
-"uso do sistema: %s"
+#: utils/misc/guc.c:754
+msgid "This algorithm attempts to do planning without exhaustive searching."
+msgstr "Esse algoritmo tenta fazer o planejamento sem busca exaustiva."
 
-#: commands/vacuumlazy.c:320 commands/cluster.c:389
-#, c-format
-msgid "vacuuming \"%s.%s\""
-msgstr "limpando \"%s.%s\""
+#: utils/misc/guc.c:764
+msgid "Shows whether the current user is a superuser."
+msgstr "Mostra se o usuário atual é um super-usuário."
 
-#: commands/vacuumlazy.c:449
-#, c-format
-msgid "relation \"%s\" page %u is uninitialized --- fixing"
-msgstr "página %2$u da relação \"%1$s\" não foi inicializada --- consertando"
+#: utils/misc/guc.c:774
+msgid "Enables advertising the server via Bonjour."
+msgstr "Habilita anunciar o servidor via Bonjour."
 
-#: commands/vacuumlazy.c:785
-#, c-format
-msgid "\"%s\": removed %.0f row versions in %u pages"
-msgstr "\"%s\": removidas %.0f versões de registro em %u páginas"
+#: utils/misc/guc.c:783
+msgid "Enables SSL connections."
+msgstr "Habilita conexões SSL."
 
-#: commands/vacuumlazy.c:790
-#, c-format
-msgid ""
-"\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u "
-"pages"
-msgstr ""
-"\"%s\": encontrados %.0f versões de registros removíveis e %.0f não-"
-"removíveis em %u de %u páginas"
+#: utils/misc/guc.c:792
+msgid "Forces synchronization of updates to disk."
+msgstr "Força sincronização de atualizações com o disco."
 
-#: commands/vacuumlazy.c:793
-#, c-format
+#: utils/misc/guc.c:793
 msgid ""
-"%.0f dead row versions cannot be removed yet.\n"
-"There were %.0f unused item pointers.\n"
-"%u pages are entirely empty.\n"
-"%s."
+"The server will use the fsync() system call in several places to make sure "
+"that updates are physically written to disk. This insures that a database "
+"cluster will recover to a consistent state after an operating system or "
+"hardware crash."
 msgstr ""
-"%.0f versões de registros não vigentes não podem ser removidas ainda.\n"
-"Havia %.0f ponteiros de itens não utilizados.\n"
-"%u páginas estão completamente vazias.\n"
-"%s."
-
-#: commands/vacuumlazy.c:851
-#, c-format
-msgid "\"%s\": removed %d row versions in %d pages"
-msgstr "\"%s\": removidas %d versões de registro em %d páginas"
+"O servidor utilizará a chamada do sistema fsync() em vários lugares para ter "
+"certeza que as atualizações estão gravadas fisicamente no disco. Isso "
+"assegura que o agrupamento de bancos de dados recuperará ao seu estado "
+"consistente após uma queda do sistema operacional ou de hardware."
 
-#: commands/vacuumlazy.c:854 commands/vacuumlazy.c:946
-#: commands/vacuumlazy.c:1071
-#, c-format
-msgid "%s."
-msgstr "%s."
+#: utils/misc/guc.c:804
+msgid "Continues processing past damaged page headers."
+msgstr "Continua processando cabeçalhos antigos de páginas danificadas."
 
-#: commands/vacuumlazy.c:943
-#, c-format
-msgid "scanned index \"%s\" to remove %d row versions"
-msgstr "índice \"%s\" percorrido para remover %d versões de registro"
+#: utils/misc/guc.c:805
+msgid ""
+"Detection of a damaged page header normally causes PostgreSQL to report an "
+"error, aborting the current transaction. Setting zero_damaged_pages to true "
+"causes the system to instead report a warning, zero out the damaged page, "
+"and continue processing. This behavior will destroy data, namely all the "
+"rows on the damaged page."
+msgstr ""
+"Detecção de cabeçalhos de páginas danificadas normalmente faz com que o "
+"PostgreSQL produza um erro, interrompendo a transação atual. Definindo "
+"zero_damaged_page para true faz com que o sistema ao invés de produzir um "
+"aviso, escreva zero em todas as páginas danificadas e continue o "
+"processamento. Esse comportamento destrói dados, especificadamente todos os "
+"registros da página danificada."
 
-#: commands/vacuumlazy.c:985
-#, c-format
-msgid "index \"%s\" now contains %.0f row versions in %u pages"
-msgstr "índice \"%s\" agora contém %.0f versões de registros em %u páginas"
+#: utils/misc/guc.c:818
+msgid "Writes full pages to WAL when first modified after a checkpoint."
+msgstr ""
+"Escreve páginas completas no WAL quando modificadas após um ponto de "
+"controle."
 
-#: commands/vacuumlazy.c:989
-#, c-format
+#: utils/misc/guc.c:819
 msgid ""
-"%.0f index row versions were removed.\n"
-"%u index pages have been deleted, %u are currently reusable.\n"
-"%s."
+"A page write in process during an operating system crash might be only "
+"partially written to disk.  During recovery, the row changes stored in WAL "
+"are not enough to recover.  This option writes pages when first modified "
+"after a checkpoint to WAL so full recovery is possible."
 msgstr ""
-"%.0f versões de registros de índices foram apagadas.\n"
-"%u páginas de índice foram removidas, %u são reutilizáveis.\n"
-"%s."
+"Uma escrita de página em progresso durante uma queda do sistema operacional "
+"pode ser parcialmente escrita no disco.  Durante a recuperação, as mudanças "
+"de registro armazenadas no WAL não são suficientes para recuperação.  Esta "
+"opção escreve páginas quando modificadas após um ponto de controle no WAL "
+"possibilitando uma recuperação completa."
 
-#: commands/vacuumlazy.c:1068
-#, c-format
-msgid "\"%s\": truncated %u to %u pages"
-msgstr "\"%s\": truncadas %u em %u páginas"
+#: utils/misc/guc.c:831
+msgid "Runs the server silently."
+msgstr "Executa o servidor silenciosamente."
+
+#: utils/misc/guc.c:832
+msgid ""
+"If this parameter is set, the server will automatically run in the "
+"background and any controlling terminals are dissociated."
+msgstr ""
+"Se esse parâmetro está definido, o servidor executará automaticamente em "
+"segundo plano e qualquer terminal de controle é dissociado."
 
-#: commands/prepare.c:70
-msgid "invalid statement name: must not be empty"
-msgstr "nome de comando é inválido: não deve ser vazio"
+#: utils/misc/guc.c:841
+msgid "Logs each checkpoint."
+msgstr "Registra cada ponto de controle."
 
-#: commands/prepare.c:139
-msgid "utility statements cannot be prepared"
-msgstr "comandos utilitários não podem ser preparados"
+#: utils/misc/guc.c:850
+msgid "Logs each successful connection."
+msgstr "Registra cada conexão bem sucedida."
 
-#: commands/prepare.c:239 commands/prepare.c:246 commands/prepare.c:702
-msgid "prepared statement is not a SELECT"
-msgstr "comando preparado não é um SELECT"
+#: utils/misc/guc.c:859
+msgid "Logs end of a session, including duration."
+msgstr "Registra o fim da sessão, incluindo a duração."
 
-#: commands/prepare.c:313
-#, c-format
-msgid "wrong number of parameters for prepared statement \"%s\""
-msgstr "número incorreto de parâmetros para comando preparado \"%s\""
+#: utils/misc/guc.c:868
+msgid "Turns on various assertion checks."
+msgstr "Ativa várias verificações de asserção."
 
-#: commands/prepare.c:315
-#, c-format
-msgid "Expected %d parameters but got %d."
-msgstr "Esperado %d parâmetros mas recebeu %d."
+#: utils/misc/guc.c:869
+msgid "This is a debugging aid."
+msgstr "Esse é um auxílio na depuração."
 
-#: commands/prepare.c:344
-msgid "cannot use subquery in EXECUTE parameter"
-msgstr "não pode utilizar subconsulta no parâmetro EXECUTE"
+#: utils/misc/guc.c:883
+msgid "Terminate session on any error."
+msgstr "Terminar sessão após qualquer erro."
 
-#: commands/prepare.c:348
-msgid "cannot use aggregate function in EXECUTE parameter"
-msgstr "não pode utilizar função de agregação no parâmetro EXECUTE"
+#: utils/misc/guc.c:892
+msgid "Reinitialize server after backend crash."
+msgstr "Reinicializar servidor após queda do processo servidor."
 
-#: commands/prepare.c:352
-msgid "cannot use window function in EXECUTE parameter"
-msgstr "não pode utilizar função deslizante no parâmetro EXECUTE"
+#: utils/misc/guc.c:902
+msgid "Logs the duration of each completed SQL statement."
+msgstr "Registra a duração de cada sentença SQL completa."
 
-#: commands/prepare.c:365
-#, c-format
-msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
-msgstr "parâmetro $%d do tipo %s não pode ser convertido para tipo esperado %s"
+#: utils/misc/guc.c:911
+msgid "Logs each query's parse tree."
+msgstr "Registra cada árvore de análise de consulta."
 
-#: commands/prepare.c:463
-#, c-format
-msgid "prepared statement \"%s\" already exists"
-msgstr "comando preparado \"%s\" já existe"
+#: utils/misc/guc.c:920
+msgid "Logs each query's rewritten parse tree."
+msgstr "Registra cada árvore de análise reescrita de consulta."
 
-#: commands/prepare.c:521
-#, c-format
-msgid "prepared statement \"%s\" does not exist"
-msgstr "comando preparado \"%s\" não existe"
+#: utils/misc/guc.c:929
+msgid "Logs each query's execution plan."
+msgstr "Registra cada plano de execução de consulta."
 
-#: commands/user.c:150
-msgid "SYSID can no longer be specified"
-msgstr "SYSID não pode mais ser especificado"
+#: utils/misc/guc.c:938
+msgid "Indents parse and plan tree displays."
+msgstr "Identa exibição da árvore de análise e plano."
 
-#: commands/user.c:272
-msgid "must be superuser to create superusers"
-msgstr "deve ser super-usuário para criar super-usuários"
+#: utils/misc/guc.c:947
+msgid "Writes parser performance statistics to the server log."
+msgstr "Escreve estatísticas de performance do analisador no log do servidor."
 
-#: commands/user.c:279
-msgid "permission denied to create role"
-msgstr "permissão negada ao criar role"
+#: utils/misc/guc.c:956
+msgid "Writes planner performance statistics to the server log."
+msgstr "Escreve estatísticas de performance do planejador no log do servidor."
 
-#: commands/user.c:286 commands/user.c:1033
-#, c-format
-msgid "role name \"%s\" is reserved"
-msgstr "nome de role \"%s\" é reservado"
+#: utils/misc/guc.c:965
+msgid "Writes executor performance statistics to the server log."
+msgstr "Escreve estatísticas de performance do executor no log do servidor."
 
-#: commands/user.c:300 commands/user.c:1027
-#, c-format
-msgid "role \"%s\" already exists"
-msgstr "role \"%s\" já existe"
+#: utils/misc/guc.c:974
+msgid "Writes cumulative performance statistics to the server log."
+msgstr "Escreve estatísticas de performance acumulativas no log do servidor."
 
-#: commands/user.c:592 commands/user.c:784 commands/user.c:1267
-#: commands/user.c:1404
-msgid "must be superuser to alter superusers"
-msgstr "deve ser super-usuário para alterar super-usuários"
+#: utils/misc/guc.c:984 utils/misc/guc.c:1049 utils/misc/guc.c:1059
+#: utils/misc/guc.c:1069 utils/misc/guc.c:1079 utils/misc/guc.c:1804
+#: utils/misc/guc.c:1814
+msgid "No description available."
+msgstr "Nenhuma descrição disponível."
 
-#: commands/user.c:607 commands/user.c:792
-msgid "permission denied"
-msgstr "permissão negada"
+#: utils/misc/guc.c:996
+msgid "Collects information about executing commands."
+msgstr "Coleta informação sobre execução de comandos."
 
-#: commands/user.c:802
-#, c-format
-msgid "database \"%s\" not found"
-msgstr "banco de dados \"%s\" não foi encontrado"
+#: utils/misc/guc.c:997
+msgid ""
+"Enables the collection of information on the currently executing command of "
+"each session, along with the time at which that command began execution."
+msgstr ""
+"Habilita a coleta de informação do comando em execução de cada sessão, ao "
+"mesmo tempo que o comando inicia a execução."
 
-#: commands/user.c:824
-msgid "permission denied to drop role"
-msgstr "permissão negada ao remover role"
+#: utils/misc/guc.c:1007
+msgid "Collects statistics on database activity."
+msgstr "Coleta estatísticas sobre a atividade do banco de dados."
 
-#: commands/user.c:856
-#, c-format
-msgid "role \"%s\" does not exist, skipping"
-msgstr "role \"%s\" não existe, ignorando"
+#: utils/misc/guc.c:1017
+msgid "Updates the process title to show the active SQL command."
+msgstr "Atualiza o título do processo para mostrar o comando SQL ativo."
 
-#: commands/user.c:868 commands/user.c:872
-msgid "current user cannot be dropped"
-msgstr "usuário atual não pode ser removido"
+#: utils/misc/guc.c:1018
+msgid ""
+"Enables updating of the process title every time a new SQL command is "
+"received by the server."
+msgstr ""
+"Habilita a atualização do título do processo toda vez que um comando SQL "
+"novo é recebido pelo servidor."
 
-#: commands/user.c:876
-msgid "session user cannot be dropped"
-msgstr "usuário de sessão não pode ser removido"
+#: utils/misc/guc.c:1027
+msgid "Starts the autovacuum subprocess."
+msgstr "Inicia o subprocesso de limpeza automática."
 
-#: commands/user.c:887
-msgid "must be superuser to drop superusers"
-msgstr "deve ser super-usuário para remover super-usuários"
+#: utils/misc/guc.c:1037
+msgid "Generates debugging output for LISTEN and NOTIFY."
+msgstr "Gera saída de depuração para LISTEN e NOTIFY."
 
-#: commands/user.c:900
-#, c-format
-msgid "role \"%s\" cannot be dropped because some objects depend on it"
-msgstr "role \"%s\" não pode ser removida porque alguns objetos dependem dela"
+#: utils/misc/guc.c:1091
+msgid "Logs long lock waits."
+msgstr "Registra esperas devido a bloqueios longos."
 
-#: commands/user.c:1017
-msgid "session user cannot be renamed"
-msgstr "usuário de sessão não pode ser renomeado"
+#: utils/misc/guc.c:1101
+msgid "Logs the host name in the connection logs."
+msgstr "Registra o nome da máquina nos logs de conexão."
 
-#: commands/user.c:1021
-msgid "current user cannot be renamed"
-msgstr "usuário atual não pode ser renomeado"
+#: utils/misc/guc.c:1102
+msgid ""
+"By default, connection logs only show the IP address of the connecting host. "
+"If you want them to show the host name you can turn this on, but depending "
+"on your host name resolution setup it might impose a non-negligible "
+"performance penalty."
+msgstr ""
+"Por padrão, logs de conexão só mostram o endereço IP da máquina que "
+"conectou. Se você quer que seja mostrado o nome da máquina você pode "
+"habilitá-lo, mas dependendo da configuração de resolução do nome da máquina "
+"isso pode impor uma penalização de performance."
 
-#: commands/user.c:1044
-msgid "must be superuser to rename superusers"
-msgstr "deve ser super-usuário para renomear super-usuários"
+#: utils/misc/guc.c:1113
+msgid "Causes subtables to be included by default in various commands."
+msgstr "Causa subtabelas serem incluídas por padrão em vários comandos."
 
-#: commands/user.c:1051
-msgid "permission denied to rename role"
-msgstr "permissão negada ao renomear role"
+#: utils/misc/guc.c:1122
+msgid "Encrypt passwords."
+msgstr "Criptografa senhas."
 
-#: commands/user.c:1072
-msgid "MD5 password cleared because of role rename"
-msgstr "senha MD5 foi limpada porque role foi renomeada"
+#: utils/misc/guc.c:1123
+msgid ""
+"When a password is specified in CREATE USER or ALTER USER without writing "
+"either ENCRYPTED or UNENCRYPTED, this parameter determines whether the "
+"password is to be encrypted."
+msgstr ""
+"Quando a senha for especificada em CREATE USER ou ALTER USER sem escrever "
+"ENCRYPTED ou UNENCRYPTED, esse parâmetro determina se a senha será "
+"criptografada."
 
-#: commands/user.c:1128
-msgid "column names cannot be included in GRANT/REVOKE ROLE"
-msgstr "nomes de coluna não podem ser incluídos em GRANT/REVOKE ROLE"
+#: utils/misc/guc.c:1133
+msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
+msgstr "Trata \"expr=NULL\" como \"expr IS NULL\"."
 
-#: commands/user.c:1166
-msgid "permission denied to drop objects"
-msgstr "permissão negada ao remover objetos"
+#: utils/misc/guc.c:1134
+msgid ""
+"When turned on, expressions of the form expr = NULL (or NULL = expr) are "
+"treated as expr IS NULL, that is, they return true if expr evaluates to the "
+"null value, and false otherwise. The correct behavior of expr = NULL is to "
+"always return null (unknown)."
+msgstr ""
+"Quando está habilitado, expressões da forma expr = NULL (ou NULL = expr) são "
+"tratadas com expr IS NULL, isto é, elas retornam verdadeiro se expr é "
+"avaliada como nula, e falso caso contrário. O comportamento correto de expr "
+"= NULL é retornar sempre nulo (desconhecido)."
 
-#: commands/user.c:1193 commands/user.c:1202
-msgid "permission denied to reassign objects"
-msgstr "permissão negada ao reatribuir objetos"
+#: utils/misc/guc.c:1146
+msgid "Enables per-database user names."
+msgstr "Habilita uso de nomes de usuário por banco de dados."
 
-#: commands/user.c:1275 commands/user.c:1412
-#, c-format
-msgid "must have admin option on role \"%s\""
-msgstr "deve ter opção admin na role \"%s\""
+#: utils/misc/guc.c:1156
+msgid "This parameter doesn't do anything."
+msgstr "Esse parâmetro não faz nada."
 
-#: commands/user.c:1283
-msgid "must be superuser to set grantor"
-msgstr "deve ser super-usuário para definir concedente"
+#: utils/misc/guc.c:1157
+msgid ""
+"It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-"
+"vintage clients."
+msgstr ""
+"Isso está aqui para que não seja necessário SET AUTOCOMMIT TO ON em clientes "
+"7.3 e anteriores."
 
-#: commands/user.c:1308
-#, c-format
-msgid "role \"%s\" is a member of role \"%s\""
-msgstr "role \"%s\" é um membro da role \"%s\""
+#: utils/misc/guc.c:1166
+msgid "Sets the default read-only status of new transactions."
+msgstr "Define o status padrão como somente leitura para novas transações."
 
-#: commands/user.c:1323
-#, c-format
-msgid "role \"%s\" is already a member of role \"%s\""
-msgstr "role \"%s\" já é um membro da role \"%s\""
+#: utils/misc/guc.c:1175
+msgid "Sets the current transaction's read-only status."
+msgstr "Define o status da transação atual como somente leitura."
 
-#: commands/user.c:1434
-#, c-format
-msgid "role \"%s\" is not a member of role \"%s\""
-msgstr "role \"%s\" não é um membro da role \"%s\""
+#: utils/misc/guc.c:1185
+msgid "Sets the default deferrable status of new transactions."
+msgstr "Define o status de postergação padrão para novas transações."
 
-#: commands/opclasscmds.c:190 commands/opclasscmds.c:701
-#, c-format
-msgid "operator family \"%s\" for access method \"%s\" already exists"
-msgstr "família de operadores \"%s\" para método de acesso \"%s\" já existe"
+#: utils/misc/guc.c:1194
+msgid ""
+"Whether to defer a read-only serializable transaction until it can be "
+"executed with no possible serialization failures."
+msgstr ""
 
-#: commands/opclasscmds.c:320
-msgid "must be superuser to create an operator class"
-msgstr "deve ser super-usuário para criar uma classe de operadores"
+#: utils/misc/guc.c:1204
+msgid "Check function bodies during CREATE FUNCTION."
+msgstr "Verifica corpo da função durante CREATE FUNCTION."
 
-#: commands/opclasscmds.c:403 commands/opclasscmds.c:849
-#: commands/opclasscmds.c:971
-#, c-format
-msgid "invalid operator number %d, must be between 1 and %d"
-msgstr "número de operadores %d é inválido, deve ser entre 1 e %d"
+#: utils/misc/guc.c:1213
+msgid "Enable input of NULL elements in arrays."
+msgstr "Habilita entrada de elementos NULL em matrizes."
 
-#: commands/opclasscmds.c:446 commands/opclasscmds.c:892
-#: commands/opclasscmds.c:986
-#, c-format
-msgid "invalid procedure number %d, must be between 1 and %d"
-msgstr "número de procedimentos %d é inválido, deve ser entre 1 e %d"
+#: utils/misc/guc.c:1214
+msgid ""
+"When turned on, unquoted NULL in an array input value means a null value; "
+"otherwise it is taken literally."
+msgstr ""
+"Quando habilitado, NULL sem aspas em um valor de entrada de uma matriz "
+"significa o valor nulo; caso contrário ele é utilizado literalmente."
 
-#: commands/opclasscmds.c:476
-msgid "storage type specified more than once"
-msgstr "tipo de armazenamento especificado mais de uma vez"
+#: utils/misc/guc.c:1224
+msgid "Create new tables with OIDs by default."
+msgstr "Cria novas tabelas com OIDs por padrão."
 
-#: commands/opclasscmds.c:504
-#, c-format
+#: utils/misc/guc.c:1233
 msgid ""
-"storage type cannot be different from data type for access method \"%s\""
+"Start a subprocess to capture stderr output and/or csvlogs into log files."
 msgstr ""
-"tipo de armazenamento não pode ser diferente do tipo de dado para método de "
-"acesso \"%s\""
+"Inicia um subprocesso para capturar saída stderr e/ou csvlogs em arquivos de "
+"log."
 
-#: commands/opclasscmds.c:520
-#, c-format
-msgid "operator class \"%s\" for access method \"%s\" already exists"
-msgstr "classe de operadores \"%s\" para método de acesso \"%s\" já existe"
+#: utils/misc/guc.c:1242
+msgid "Truncate existing log files of same name during log rotation."
+msgstr ""
+"Trunca arquivos de log existentes com mesmo nome durante rotação de log."
 
-#: commands/opclasscmds.c:548
-#, c-format
-msgid "could not make operator class \"%s\" be default for type %s"
-msgstr "não pôde fazer classe de operadores \"%s\" ser a padrão para tipo %s"
+#: utils/misc/guc.c:1253
+msgid "Emit information about resource usage in sorting."
+msgstr "Produz informação sobre uso de recurso ao ordenar."
+
+#: utils/misc/guc.c:1267
+msgid "Generate debugging output for synchronized scanning."
+msgstr "Gera saída de depuração para busca sincronizada."
+
+#: utils/misc/guc.c:1282
+msgid "Enable bounded sorting using heap sort."
+msgstr "Habilita ordenação limitada utilizando ordenção de pilha."
 
-#: commands/opclasscmds.c:551
-#, c-format
-msgid "Operator class \"%s\" already is the default."
-msgstr "Classe de operadores \"%s\" já é a padrão."
+#: utils/misc/guc.c:1295
+msgid "Emit WAL-related debugging output."
+msgstr "Emite saída de depuração relacionada ao WAL."
 
-#: commands/opclasscmds.c:687
-msgid "must be superuser to create an operator family"
-msgstr "deve ser super-usuário para criar uma família de operadores"
+#: utils/misc/guc.c:1307
+msgid "Datetimes are integer based."
+msgstr "Datetimes são baseados em inteiros."
 
-#: commands/opclasscmds.c:802
-msgid "must be superuser to alter an operator family"
-msgstr "deve ser super-usuário para alterar uma família de operadores"
+#: utils/misc/guc.c:1322
+msgid ""
+"Sets whether Kerberos and GSSAPI user names should be treated as case-"
+"insensitive."
+msgstr ""
+"Define se nomes de usuário do Kerberos e do GSSAPI devem ser tratados como "
+"não sensíveis a minúsculas/maiúsculas."
 
-#: commands/opclasscmds.c:865
-msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
+#: utils/misc/guc.c:1332
+msgid "Warn about backslash escapes in ordinary string literals."
 msgstr ""
-"tipos dos argumentos do operador devem ser especificados em ALTER OPERATOR "
-"FAMILY"
+"Avisa sobre escapes de barra invertida em cadeias de caracteres ordinárias."
 
-#: commands/opclasscmds.c:921
-msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
-msgstr "STORAGE não pode ser especificado em ALTER OPERATOR FAMILY"
+#: utils/misc/guc.c:1342
+msgid "Causes '...' strings to treat backslashes literally."
+msgstr ""
+"Faz com que cadeias de caracteres '...' tratem barras invertidas "
+"literalmente."
 
-#: commands/opclasscmds.c:1037
-msgid "one or two argument types must be specified"
-msgstr "um ou dois tipos de argumento devem ser especificados"
+#: utils/misc/guc.c:1353
+msgid "Enable synchronized sequential scans."
+msgstr "Habilita buscas sequenciais sincronizadas."
 
-#: commands/opclasscmds.c:1063
-msgid "index operators must be binary"
-msgstr "operadores de índice devem ser binários"
+#: utils/misc/guc.c:1363
+msgid "Allows archiving of WAL files using archive_command."
+msgstr "Permite arquivamento de arquivos do WAL utilizando archive_command."
 
-#: commands/opclasscmds.c:1067
-msgid "index operators must return boolean"
-msgstr "operadores de índice devem retornar booleano"
+#: utils/misc/guc.c:1373
+msgid "Allows connections and queries during recovery."
+msgstr "Permite conexões e consultas durante recuperação."
 
-#: commands/opclasscmds.c:1105
-msgid "btree procedures must have two arguments"
-msgstr "procedimentos de árvore B devem ter dois argumentos"
+#: utils/misc/guc.c:1383
+msgid ""
+"Allows feedback from a hot standby to the primary that will avoid query "
+"conflicts."
+msgstr ""
+"Permite retorno do servidor em espera ativo ao servidor principal que "
+"evitará conflitos de consulta."
 
-#: commands/opclasscmds.c:1109
-msgid "btree procedures must return integer"
-msgstr "procedimentos de árvore B devem retornar inteiro"
+#: utils/misc/guc.c:1393
+msgid "Allows modifications of the structure of system tables."
+msgstr "Permite modificações da estrutura de tabelas do sistema."
 
-#: commands/opclasscmds.c:1124
-msgid "hash procedures must have one argument"
-msgstr "procedimentos hash devem ter um argumento"
+#: utils/misc/guc.c:1404
+msgid "Disables reading from system indexes."
+msgstr "Desabilita leitura dos índices do sistema."
 
-#: commands/opclasscmds.c:1128
-msgid "hash procedures must return integer"
-msgstr "procedimentos hash devem retornar inteiro"
+#: utils/misc/guc.c:1405
+msgid ""
+"It does not prevent updating the indexes, so it is safe to use.  The worst "
+"consequence is slowness."
+msgstr ""
+"Ele não impede a atualização dos índices, então é seguro utilizá-lo. A pior "
+"consequência é lentidão."
 
-#: commands/opclasscmds.c:1153
-msgid "associated data types must be specified for index support procedure"
+#: utils/misc/guc.c:1416
+msgid ""
+"Enables backward compatibility mode for privilege checks on large objects."
 msgstr ""
-"tipos de dados associados devem ser especificados para procedimento de "
-"suporte ao índice"
+"Habilita modo de compatibilidade com versões anteriores para verificação de "
+"privilégios em objetos grandes."
 
-#: commands/opclasscmds.c:1179
-#, c-format
-msgid "procedure number %d for (%s,%s) appears more than once"
-msgstr "procedimento número %d para (%s,%s) aparece mais de uma vez"
+#: utils/misc/guc.c:1417
+msgid ""
+"Skips privilege checks when reading or modifying large objects, for "
+"compatibility with PostgreSQL releases prior to 9.0."
+msgstr ""
+"Não verifica privilégios ao ler ou modificar objetos grandes, para "
+"compatibilidade com versões do PostgreSQL anteriores a 9.0."
 
-#: commands/opclasscmds.c:1186
-#, c-format
-msgid "operator number %d for (%s,%s) appears more than once"
-msgstr "operador número %d  para (%s,%s) aparece mais de uma vez"
+#: utils/misc/guc.c:1427
+msgid "When generating SQL fragments, quote all identifiers."
+msgstr "Ao gerar fragmentos SQL, colocar todos identificadores entre aspas."
 
-#: commands/opclasscmds.c:1234
-#, c-format
-msgid "operator %d(%s,%s) already exists in operator family \"%s\""
-msgstr "operador %d(%s,%s) já existe na família de operadores \"%s\""
+#: utils/misc/guc.c:1446
+msgid ""
+"Forces a switch to the next xlog file if a new file has not been started "
+"within N seconds."
+msgstr ""
+"Força a rotação para o próximo arquivo de xlog se um novo arquivo não foi "
+"iniciado em N segundos."
 
-#: commands/opclasscmds.c:1334
-#, c-format
-msgid "function %d(%s,%s) already exists in operator family \"%s\""
-msgstr "função %d(%s,%s) já existe na família de operadores \"%s\""
+#: utils/misc/guc.c:1457
+msgid "Waits N seconds on connection startup after authentication."
+msgstr "Espera N segundos após autenticação durante inicialização da conexão."
 
-#: commands/opclasscmds.c:1421
-#, c-format
-msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "operador %d(%s,%s) não existe na família de operadores \"%s\""
+#: utils/misc/guc.c:1458 utils/misc/guc.c:1907
+msgid "This allows attaching a debugger to the process."
+msgstr "Isso permite anexar um depurador ao processo."
 
-#: commands/opclasscmds.c:1461
-#, c-format
-msgid "function %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "função %d(%s,%s) não existe na família de operadores \"%s\""
+#: utils/misc/guc.c:1467
+msgid "Sets the default statistics target."
+msgstr "Define o alvo padrão de estatísticas."
 
-#: commands/opclasscmds.c:1768
-#, c-format
+#: utils/misc/guc.c:1468
 msgid ""
-"operator class \"%s\" for access method \"%s\" already exists in schema \"%s"
-"\""
+"This applies to table columns that have not had a column-specific target set "
+"via ALTER TABLE SET STATISTICS."
 msgstr ""
-"classe de operadores \"%s\" para método de acesso \"%s\" já existe no "
-"esquema \"%s\""
+"Isso se aplica a colunas de tabelas que não têm um alvo de colunas "
+"específico definido através de ALTER TABLE SET STATISTICS."
 
-#: commands/opclasscmds.c:1862
-#, c-format
-msgid ""
-"operator family \"%s\" for access method \"%s\" already exists in schema \"%s"
-"\""
+#: utils/misc/guc.c:1477
+msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
 msgstr ""
-"família de operadores \"%s\" para método de acesso \"%s\" já existe no "
-"esquema \"%s\""
-
-#: commands/vacuum.c:421
-msgid "oldest xmin is far in the past"
-msgstr "xmin mais velho é muito antigo"
+"Define o tamanho da lista do FROM a partir do qual as subconsultas não "
+"entrarão em colapso."
 
-#: commands/vacuum.c:422
-msgid "Close open transactions soon to avoid wraparound problems."
+#: utils/misc/guc.c:1479
+msgid ""
+"The planner will merge subqueries into upper queries if the resulting FROM "
+"list would have no more than this many items."
 msgstr ""
-"Feche transações abertas imediatamente para evitar problemas de reinício."
+"O planejador mesclará subconsultas em consultas de nível superior se a lista "
+"resultante do FROM for menor que essa quantidade de itens."
 
-#: commands/vacuum.c:747
-msgid "some databases have not been vacuumed in over 2 billion transactions"
+#: utils/misc/guc.c:1489
+msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
 msgstr ""
-"alguns bancos de dados não foram limpados a mais de 2 bilhões de transações"
+"Define o tamanho da lista do FROM a partir do qual as construções JOIN não "
+"serão nivelados."
 
-#: commands/vacuum.c:748
-msgid "You might have already suffered transaction-wraparound data loss."
+#: utils/misc/guc.c:1491
+msgid ""
+"The planner will flatten explicit JOIN constructs into lists of FROM items "
+"whenever a list of no more than this many items would result."
 msgstr ""
-"Você já pode ter sofrido problemas de perda de dados devido a reciclagem de "
-"transações."
+"O planejador nivelará construções JOIN explícitas em listas de itens FROM "
+"sempre que a lista não tenha mais do que essa quantidade de itens."
 
-#: commands/vacuum.c:873
-#, c-format
-msgid "skipping \"%s\" --- only superuser can vacuum it"
-msgstr "ignorando \"%s\" --- somente super-usuário pode limpá-la(o)"
+#: utils/misc/guc.c:1501
+msgid "Sets the threshold of FROM items beyond which GEQO is used."
+msgstr "Define o limite de itens do FROM a partir do qual o GEQO é utilizado."
 
-#: commands/vacuum.c:877
-#, c-format
-msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
+#: utils/misc/guc.c:1510
+msgid "GEQO: effort is used to set the default for other GEQO parameters."
 msgstr ""
-"ignorando \"%s\" --- somente super-usuário ou dono de banco de dados pode "
-"limpá-la(o)"
+"GEQO: esforço é utilizado para definir o padrão para outros parâmetros GEQO."
 
-#: commands/vacuum.c:881
-#, c-format
-msgid "skipping \"%s\" --- only table or database owner can vacuum it"
+#: utils/misc/guc.c:1519
+msgid "GEQO: number of individuals in the population."
+msgstr "GEQO: número de indivíduos em uma população."
+
+#: utils/misc/guc.c:1520 utils/misc/guc.c:1529
+msgid "Zero selects a suitable default value."
+msgstr "Zero seleciona um valor padrão ideal."
+
+#: utils/misc/guc.c:1528
+msgid "GEQO: number of iterations of the algorithm."
+msgstr "GEQO: número de iterações do algoritmo."
+
+#: utils/misc/guc.c:1539
+msgid "Sets the time to wait on a lock before checking for deadlock."
+msgstr "Define o tempo para esperar um bloqueio antes de verificar um impasse."
+
+#: utils/misc/guc.c:1550
+msgid ""
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing archived WAL data."
 msgstr ""
-"ignorando \"%s\" --- somente dono de tabela ou de banco de dados pode limpá-"
-"la(o)"
+"Define o tempo máximo antes de cancelar consultas quando um servidor em "
+"espera ativo está processando dados do WAL arquivados."
 
-#: commands/vacuum.c:898
-#, c-format
+#: utils/misc/guc.c:1561
 msgid ""
-"skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
+"Sets the maximum delay before canceling queries when a hot standby server is "
+"processing streamed WAL data."
 msgstr ""
-"ignorando \"%s\" --- não pode limpar índices, visões ou tabelas especiais do "
-"sistema"
+"Define o tempo máximo antes de cancelar consultas quando um servidor em "
+"espera ativo está processando dados do WAL enviados."
 
-#: commands/async.c:567
-msgid "channel name cannot be empty"
-msgstr "nome do canal não pode ser vazio"
+#: utils/misc/guc.c:1572
+msgid ""
+"Sets the maximum interval between WAL receiver status reports to the primary."
+msgstr ""
+"Define o intervalo máximo entre relatos de status do receptor do WAL ao "
+"servidor principal."
 
-#: commands/async.c:572
-msgid "channel name too long"
-msgstr "nome do canal é muito longo"
+#: utils/misc/guc.c:1583
+msgid "Sets the maximum number of concurrent connections."
+msgstr "Define o número máximo de conexões concorrentes."
 
-#: commands/async.c:579
-#, fuzzy
-msgid "payload string too long"
-msgstr "carga útil muito longa"
+#: utils/misc/guc.c:1593
+msgid "Sets the number of connection slots reserved for superusers."
+msgstr "Define o número de conexões reservadas para super-usuários."
 
-#: commands/async.c:763
-msgid ""
-"cannot PREPARE a transaction that has executed LISTEN, UNLISTEN or NOTIFY"
+#: utils/misc/guc.c:1607
+msgid "Sets the number of shared memory buffers used by the server."
 msgstr ""
-"não pode executar PREPARE em uma transação que executou LISTEN, UNLISTEN ou "
-"NOTIFY"
+"Define o número de buffers de memória compartilhada utilizados pelo servidor."
 
-#: commands/async.c:868
-msgid "too many notifications in the NOTIFY queue"
-msgstr "muitas notificações na fila do NOTIFY"
+#: utils/misc/guc.c:1618
+msgid "Sets the maximum number of temporary buffers used by each session."
+msgstr ""
+"Define o número máximo de buffers temporários utilizados por cada sessão."
 
-#: commands/async.c:1421
-#, c-format
-msgid "NOTIFY queue is %.0f%% full"
-msgstr "fila do NOTIFY está %.0f%% cheia"
+#: utils/misc/guc.c:1629
+msgid "Sets the TCP port the server listens on."
+msgstr "Define a porta TCP que o servidor escutará."
 
-#: commands/async.c:1423
-#, c-format
-msgid ""
-"The server process with PID %d is among those with the oldest transactions."
-msgstr ""
-"O processo servidor com PID %d está entre aqueles com transações mais "
-"antigas."
+#: utils/misc/guc.c:1639
+msgid "Sets the access permissions of the Unix-domain socket."
+msgstr "Define as permissões de acesso do soquete de domínio Unix."
 
-#: commands/async.c:1426
+#: utils/misc/guc.c:1640
 msgid ""
-"The NOTIFY queue cannot be emptied until that process ends its current "
-"transaction."
+"Unix-domain sockets use the usual Unix file system permission set. The "
+"parameter value is expected to be a numeric mode specification in the form "
+"accepted by the chmod and umask system calls. (To use the customary octal "
+"format the number must start with a 0 (zero).)"
 msgstr ""
-"A fila do NOTIFY não pode ser esvaziada até que o processo termine a "
-"transação atual."
+"Soquetes de domínio Unix utilizam permissões de arquivos Unix usuais. O "
+"valor do parâmetro esperado é uma especificação numérica na forma aceita "
+"pelas chamadas de sistema chmod e umask. (Para utilizar formato octal "
+"habitual, o número deve começar com um 0 (zero).)"
 
-#: commands/analyze.c:166
-#, c-format
-msgid "skipping \"%s\" --- only superuser can analyze it"
-msgstr "ignorando \"%s\" --- somente super-usuário pode analisá-la(o)"
+#: utils/misc/guc.c:1654
+msgid "Sets the file permissions for log files."
+msgstr "Define as permissões do arquivo para arquivos de log."
 
-#: commands/analyze.c:170
-#, c-format
-msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
+#: utils/misc/guc.c:1655
+msgid ""
+"The parameter value is expected to be a numeric mode specification in the "
+"form accepted by the chmod and umask system calls. (To use the customary "
+"octal format the number must start with a 0 (zero).)"
 msgstr ""
-"ignorando \"%s\" --- somente super-usuário ou dono de banco de dados pode "
-"analisá-la(o)"
+"O valor do parâmetro esperado é uma especificação numérica na forma aceita "
+"pelas chamadas de sistema chmod e umask. (Para utilizar formato octal "
+"habitual, o número deve começar com um 0 (zero).)"
 
-#: commands/analyze.c:174
-#, c-format
-msgid "skipping \"%s\" --- only table or database owner can analyze it"
-msgstr ""
-"ignorando \"%s\" --- somente dono de tabela ou de banco de dados pode "
-"analisá-la(o)"
+#: utils/misc/guc.c:1668
+msgid "Sets the maximum memory to be used for query workspaces."
+msgstr "Define o máximo de memória utilizada para operações da consulta."
 
-#: commands/analyze.c:190
-#, c-format
+#: utils/misc/guc.c:1669
 msgid ""
-"skipping \"%s\" --- cannot analyze indexes, views, or special system tables"
+"This much memory can be used by each internal sort operation and hash table "
+"before switching to temporary disk files."
 msgstr ""
-"ignorando \"%s\" --- não pode analisar índices, visões ou tabelas especiais "
-"do sistema"
+"Esta quantidade de memória pode ser utilizada por operação de ordenação "
+"interna e tabela hash antes de alternar para arquivos temporários no disco."
 
-#: commands/analyze.c:283
-#, fuzzy, c-format
-msgid "analyzing \"%s.%s\" inheritance tree"
-msgstr "analisando árvore da herança de \"%s.%s\""
+#: utils/misc/guc.c:1681
+msgid "Sets the maximum memory to be used for maintenance operations."
+msgstr "Define o máximo de memória utilizada para operações de manutenção."
 
-#: commands/analyze.c:288
-#, c-format
-msgid "analyzing \"%s.%s\""
-msgstr "analisando \"%s.%s\""
+#: utils/misc/guc.c:1682
+msgid "This includes operations such as VACUUM and CREATE INDEX."
+msgstr "Isso inclue operações tais como VACUUM e CREATE INDEX."
 
-#: commands/analyze.c:609
-#, c-format
-msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
-msgstr "análise automática da tabela \"%s.%s.%s\" uso do sistema: %s"
+#: utils/misc/guc.c:1697
+msgid "Sets the maximum stack depth, in kilobytes."
+msgstr "Define a profundidade máxima da pilha, em kilobytes."
 
-#: commands/analyze.c:1232
-#, c-format
-msgid ""
-"\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
-"rows; %d rows in sample, %.0f estimated total rows"
-msgstr ""
-"\"%s\": processados %d de %u páginas, contendo %.0f registros vigentes e "
-"%.0f registros não vigentes; %d registros amostrados, %.0f registros totais "
-"estimados"
+#: utils/misc/guc.c:1708
+msgid "Vacuum cost for a page found in the buffer cache."
+msgstr "Custo da limpeza por página encontrada na cache do buffer."
 
-#: commands/explain.c:149
-#, c-format
-msgid "unrecognized value for EXPLAIN option \"%s\": \"%s\""
-msgstr "valor desconhecido para opção EXPLAIN \"%s\": \"%s\""
+#: utils/misc/guc.c:1718
+msgid "Vacuum cost for a page not found in the buffer cache."
+msgstr "Custo da limpeza por página não encontrada na cache do buffer."
 
-#: commands/explain.c:155
-#, c-format
-msgid "unrecognized EXPLAIN option \"%s\""
-msgstr "opção EXPLAIN desconhecida \"%s\""
+#: utils/misc/guc.c:1728
+msgid "Vacuum cost for a page dirtied by vacuum."
+msgstr "Custo da limpeza por página sujada pela limpeza."
 
-#: commands/explain.c:162
-msgid "EXPLAIN option BUFFERS requires ANALYZE"
-msgstr "opção BUFFERS do EXPLAIN requer ANALYZE"
+#: utils/misc/guc.c:1738
+msgid "Vacuum cost amount available before napping."
+msgstr "Quantidade de custo da limpeza disponível antes de adormecer."
 
-#: commands/tablespace.c:157 commands/tablespace.c:174
-#: commands/tablespace.c:185 commands/tablespace.c:193
-#: commands/tablespace.c:598 storage/file/copydir.c:61
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "não pôde criar diretório \"%s\": %m"
+#: utils/misc/guc.c:1748
+msgid "Vacuum cost delay in milliseconds."
+msgstr "Atraso do custo da limpeza em milisegundos."
 
-#: commands/tablespace.c:204
-#, c-format
-msgid "could not stat directory \"%s\": %m"
-msgstr "não pôde executar stat no diretório \"%s\": %m"
+#: utils/misc/guc.c:1759
+msgid "Vacuum cost delay in milliseconds, for autovacuum."
+msgstr "Atraso do custo da limpeza em milisegundos, para autovacuum."
 
-#: commands/tablespace.c:213
-#, c-format
-msgid "\"%s\" exists but is not a directory"
-msgstr "\"%s\" existe mas não é um diretório"
+#: utils/misc/guc.c:1770
+msgid "Vacuum cost amount available before napping, for autovacuum."
+msgstr ""
+"Quantidade de custo da limpeza disponível antes de adormecer, para "
+"autovacuum."
 
-#: commands/tablespace.c:243
-#, c-format
-msgid "permission denied to create tablespace \"%s\""
-msgstr "permissão negada ao criar tablespace \"%s\""
+#: utils/misc/guc.c:1780
+msgid ""
+"Sets the maximum number of simultaneously open files for each server process."
+msgstr ""
+"Define o número máximo de arquivos abertos simultaneamente por cada processo "
+"servidor."
 
-#: commands/tablespace.c:245
-msgid "Must be superuser to create a tablespace."
-msgstr "Deve ser super-usuário para criar uma tablespace."
+#: utils/misc/guc.c:1793
+msgid "Sets the maximum number of simultaneously prepared transactions."
+msgstr "Define o número máximo de transações preparadas simultâneas."
 
-#: commands/tablespace.c:261
-msgid "tablespace location cannot contain single quotes"
-msgstr "local da tablespace não pode conter aspas simples"
+#: utils/misc/guc.c:1826
+msgid "Sets the maximum allowed duration of any statement."
+msgstr "Define a duração máxima permitida de cada comando."
 
-#: commands/tablespace.c:271
-msgid "tablespace location must be an absolute path"
-msgstr "local da tablespace deve ser um caminho absoluto"
+#: utils/misc/guc.c:1827
+msgid "A value of 0 turns off the timeout."
+msgstr "Um valor 0 desabilita o tempo de espera."
 
-#: commands/tablespace.c:282
-#, c-format
-msgid "tablespace location \"%s\" is too long"
-msgstr "local da tablespace \"%s\" é muito longo"
+#: utils/misc/guc.c:1837
+msgid "Minimum age at which VACUUM should freeze a table row."
+msgstr ""
+"Identificador mínimo no qual o VACUUM deve congelar um registro da tabela."
 
-#: commands/tablespace.c:292 commands/tablespace.c:824
-#, c-format
-msgid "unacceptable tablespace name \"%s\""
-msgstr "nome da tablespace \"%s\" é inaceitável"
+#: utils/misc/guc.c:1847
+msgid "Age at which VACUUM should scan whole table to freeze tuples."
+msgstr ""
+"Identificador no qual o VACUUM deve percorrer toda tabela para congelar "
+"tuplas."
 
-#: commands/tablespace.c:294 commands/tablespace.c:825
-msgid "The prefix \"pg_\" is reserved for system tablespaces."
-msgstr "O prefixo \"pg_\" é reservado para tablespaces do sistema."
+#: utils/misc/guc.c:1857
+msgid ""
+"Number of transactions by which VACUUM and HOT cleanup should be deferred, "
+"if any."
+msgstr ""
 
-#: commands/tablespace.c:304 commands/tablespace.c:837
-#, c-format
-msgid "tablespace \"%s\" already exists"
-msgstr "tablespace \"%s\" já existe"
+#: utils/misc/guc.c:1870
+msgid "Sets the maximum number of locks per transaction."
+msgstr "Define o número máximo de bloqueios por transação."
 
-#: commands/tablespace.c:372 commands/tablespace.c:524
-msgid "tablespaces are not supported on this platform"
-msgstr "tablespaces não são suportadas nessa plataforma"
+#: utils/misc/guc.c:1871
+msgid ""
+"The shared lock table is sized on the assumption that at most "
+"max_locks_per_transaction * max_connections distinct objects will need to be "
+"locked at any one time."
+msgstr ""
+"A tabela compartilhada de bloqueios é dimensionada utilizando a suposição de "
+"que max_locks_per_transaction * max_connections objetos distintos necessitam "
+"ser bloqueados simultaneamente."
 
-#: commands/tablespace.c:416
-#, c-format
-msgid "tablespace \"%s\" does not exist, skipping"
-msgstr "tablespace \"%s\" não existe, ignorando"
+#: utils/misc/guc.c:1882
+#, fuzzy
+msgid "Sets the maximum number of predicate locks per transaction."
+msgstr "Define o número máximo de bloqueios por transação."
 
-#: commands/tablespace.c:481
-#, c-format
-msgid "tablespace \"%s\" is not empty"
-msgstr "tablespace \"%s\" não está vazia"
+#: utils/misc/guc.c:1883
+#, fuzzy
+msgid ""
+"The shared predicate lock table is sized on the assumption that at most "
+"max_pred_locks_per_transaction * max_connections distinct objects will need "
+"to be locked at any one time."
+msgstr ""
+"A tabela compartilhada de bloqueios é dimensionada utilizando a suposição de "
+"que max_locks_per_transaction * max_connections objetos distintos necessitam "
+"ser bloqueados simultaneamente."
 
-#: commands/tablespace.c:555
-#, c-format
-msgid "directory \"%s\" does not exist"
-msgstr "diretório \"%s\" não existe"
+#: utils/misc/guc.c:1894
+msgid "Sets the maximum allowed time to complete client authentication."
+msgstr ""
+"Define o tempo máximo permitido para completar uma autenticação do cliente."
 
-#: commands/tablespace.c:556
-#, c-format
+#: utils/misc/guc.c:1906
+msgid "Waits N seconds on connection startup before authentication."
+msgstr "Espera N segundos após autenticação durante inicialização da conexão."
+
+#: utils/misc/guc.c:1917
+msgid "Sets the number of WAL files held for standby servers."
+msgstr "Define o número de arquivos WAL mantidos para servidores em espera."
+
+#: utils/misc/guc.c:1927
 msgid ""
-"Create directory \"%s\" for this tablespace before restarting the server."
+"Sets the maximum distance in log segments between automatic WAL checkpoints."
 msgstr ""
-"Crie o diretório \"%s\" para esta tablespace antes de reiniciar o servidor."
-
-#: commands/tablespace.c:561
-#, c-format
-msgid "could not set permissions on directory \"%s\": %m"
-msgstr "não pôde definir permissões do diretório \"%s\": %m"
+"Define a distância máxima em segmentos de log entre pontos de controle WAL "
+"automáticos."
 
-#: commands/tablespace.c:593
-#, c-format
-msgid "directory \"%s\" already in use as a tablespace"
-msgstr "diretório \"%s\" já está em uso como uma tablespace"
+#: utils/misc/guc.c:1937
+msgid "Sets the maximum time between automatic WAL checkpoints."
+msgstr "Define o tempo máximo entre pontos de controle WAL automáticos."
 
-#: commands/tablespace.c:608 commands/tablespace.c:745
-#, c-format
-msgid "could not remove symbolic link \"%s\": %m"
-msgstr "não pôde remover link simbólico \"%s\": %m"
+#: utils/misc/guc.c:1948
+msgid ""
+"Enables warnings if checkpoint segments are filled more frequently than this."
+msgstr ""
+"Habilita avisos caso segmentos dos pontos de controle estejam sendo "
+"preenchidos mais frequentemente do que esse."
 
-#: commands/tablespace.c:618
-#, c-format
-msgid "could not create symbolic link \"%s\": %m"
-msgstr "não pôde criar link simbólico \"%s\": %m"
+#: utils/misc/guc.c:1950
+msgid ""
+"Write a message to the server log if checkpoints caused by the filling of "
+"checkpoint segment files happens more frequently than this number of "
+"seconds. Zero turns off the warning."
+msgstr ""
+"Escreve uma mensagem no log do servidor se pontos de controle causados pelo "
+"preenchimento de arquivos de segmento dos pontos de controle acontece mais "
+"frequentemente do que esse número de segundos. Zero desabilita esse aviso."
 
-#: commands/tablespace.c:709 commands/tablespace.c:721
-#: commands/tablespace.c:737
-#, c-format
-msgid "could not remove directory \"%s\": %m"
-msgstr "não pôde remover diretório \"%s\": %m"
+#: utils/misc/guc.c:1962
+msgid "Sets the number of disk-page buffers in shared memory for WAL."
+msgstr ""
+"Define o número de buffers de páginas do disco para WAL na memória "
+"compartilhada."
 
-#: commands/tablespace.c:1421
-#, c-format
-msgid "tablespace %u is not empty"
-msgstr "tablespace %u não está vazia"
+#: utils/misc/guc.c:1973
+msgid "WAL writer sleep time between WAL flushes."
+msgstr "Tempo de adormecimento do escritor do WAL entre ciclos do WAL."
 
-#: commands/cluster.c:126 commands/cluster.c:364
-msgid "cannot cluster temporary tables of other sessions"
-msgstr "não pode agrupar tabelas temporárias de outras sessões"
+#: utils/misc/guc.c:1985
+msgid "Sets the maximum number of simultaneously running WAL sender processes."
+msgstr ""
+"Define o número máximo de processos de limpeza automática executados "
+"simultaneamente."
 
-#: commands/cluster.c:156
-#, c-format
-msgid "there is no previously clustered index for table \"%s\""
-msgstr "não há nenhum índice previamente agrupado na tabela \"%s\""
+#: utils/misc/guc.c:1995
+msgid "WAL sender sleep time between WAL replications."
+msgstr ""
+"Tempo de adormecimento do transmissor de WAL entre ciclos de replicação do "
+"WAL."
 
-#: commands/cluster.c:353
-msgid "cannot cluster a shared catalog"
-msgstr "não pode agrupar um catálogo compartilhado"
+#: utils/misc/guc.c:2006
+msgid "Sets the maximum time to wait for WAL replication."
+msgstr "Define o tempo máximo de espera pela replicação do WAL."
 
-#: commands/cluster.c:368
-msgid "cannot vacuum temporary tables of other sessions"
-msgstr "não pode limpar tabelas temporárias de outras sessões"
+#: utils/misc/guc.c:2017
+msgid ""
+"Sets the delay in microseconds between transaction commit and flushing WAL "
+"to disk."
+msgstr ""
+"Define o atraso em microsegundos entre efetivar uma transação e escrever WAL "
+"no disco."
 
-#: commands/cluster.c:384
-#, c-format
-msgid "clustering \"%s.%s\""
-msgstr "agrupando \"%s.%s\""
+#: utils/misc/guc.c:2028
+msgid ""
+"Sets the minimum concurrent open transactions before performing commit_delay."
+msgstr ""
+"Define o número mínimo de transações concorrentes abertas antes de esperar "
+"commit_delay."
 
-#: commands/cluster.c:421
-#, c-format
-msgid "\"%s\" is not an index for table \"%s\""
-msgstr "\"%s\" não é um índice na tabela \"%s\""
+#: utils/misc/guc.c:2039
+msgid "Sets the number of digits displayed for floating-point values."
+msgstr "Define o número de dígitos mostrados para valores de ponto flutuante."
 
-#: commands/cluster.c:429
-#, c-format
+#: utils/misc/guc.c:2040
 msgid ""
-"cannot cluster on index \"%s\" because access method does not support "
-"clustering"
+"This affects real, double precision, and geometric data types. The parameter "
+"value is added to the standard number of digits (FLT_DIG or DBL_DIG as "
+"appropriate)."
 msgstr ""
-"não pode agrupar índice \"%s\" porque o método de acesso não suporta "
-"agrupamento"
+"Isso afeta os tipos de dado real, double precision e geometric. O valor do "
+"parâmetro é formatado segundo padrão de dígitos (FLT_DIG ou DBL_DIG conforme "
+"adequado)."
 
-#: commands/cluster.c:441
-#, c-format
-msgid "cannot cluster on partial index \"%s\""
-msgstr "não pode agrupar índice parcial \"%s\""
+#: utils/misc/guc.c:2051
+msgid "Sets the minimum execution time above which statements will be logged."
+msgstr ""
+"Define o tempo mínimo de execução no qual os comandos serão registrados."
 
-#: commands/cluster.c:461
-#, c-format
+#: utils/misc/guc.c:2053
+msgid "Zero prints all queries. -1 turns this feature off."
+msgstr "Zero registra todas as consultas. -1 desabilita essa funcionalidade."
+
+#: utils/misc/guc.c:2063
 msgid ""
-"cannot cluster on index \"%s\" because access method does not handle null "
-"values"
+"Sets the minimum execution time above which autovacuum actions will be "
+"logged."
 msgstr ""
-"não pode agrupar índice \"%s\" porque o método de acesso não manipula "
-"valores nulos"
+"Define o tempo mínimo de execução no qual as ações de limpeza automática "
+"serão registradas."
+
+#: utils/misc/guc.c:2065
+msgid "Zero prints all actions. -1 turns autovacuum logging off."
+msgstr "Zero registra todas as ações. -1 desabilita essa funcionalidade."
+
+#: utils/misc/guc.c:2075
+msgid "Background writer sleep time between rounds."
+msgstr "Tempo de adormecimento do escritor em segundo plano entre ciclos."
 
-#: commands/cluster.c:464
-#, c-format
-msgid ""
-"You might be able to work around this by marking column \"%s\" NOT NULL, or "
-"use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification "
-"from the table."
+#: utils/misc/guc.c:2086
+msgid "Background writer maximum number of LRU pages to flush per round."
 msgstr ""
-"Você pode corrigir isso fazendo a coluna \"%s\" ser NOT NULL, ou utilizar "
-"ALTER TABLE ... SET WITHOUT CLUSTER para remover a especificação de "
-"agrupamento da tabela."
+"Número máximo de páginas do LRU do escritor em segundo plano a serem "
+"escritas por ciclo."
 
-#: commands/cluster.c:466
-#, c-format
+#: utils/misc/guc.c:2102
 msgid ""
-"You might be able to work around this by marking column \"%s\" NOT NULL."
-msgstr "Você pode corrigir isso fazendo a coluna \"%s\" ser NOT NULL."
+"Number of simultaneous requests that can be handled efficiently by the disk "
+"subsystem."
+msgstr ""
+"Número de requisições simultâneas que podem ser manipuladas eficientemente "
+"pelo subsistema de disco."
 
-#: commands/cluster.c:477
-#, c-format
+#: utils/misc/guc.c:2103
 msgid ""
-"cannot cluster on expressional index \"%s\" because its index access method "
-"does not handle null values"
+"For RAID arrays, this should be approximately the number of drive spindles "
+"in the array."
 msgstr ""
-"não pode agrupar índice de expressão \"%s\" porque seu método de acesso ao "
-"índice não manipula valores nulos"
+"Para arranjos RAID, este deveria ser aproximadamente o número de discos em "
+"um arranjo."
 
-#: commands/cluster.c:492
-#, c-format
-msgid "cannot cluster on invalid index \"%s\""
-msgstr "não pode agrupar por índice inválido \"%s\""
+#: utils/misc/guc.c:2116
+msgid "Automatic log file rotation will occur after N minutes."
+msgstr "Rotação de arquivo de log automática ocorrerá após N minutos."
 
-#: commands/portalcmds.c:61 commands/portalcmds.c:160
-#: commands/portalcmds.c:212
-msgid "invalid cursor name: must not be empty"
-msgstr "nome do cursor é inválido: não deve ser vazio"
+#: utils/misc/guc.c:2127
+msgid "Automatic log file rotation will occur after N kilobytes."
+msgstr "Rotação de arquivo de log automática ocorrerá após N kilobytes."
 
-#: commands/portalcmds.c:402
-msgid "could not reposition held cursor"
-msgstr "não pôde reposicionar cursor aberto"
+#: utils/misc/guc.c:2138
+msgid "Shows the maximum number of function arguments."
+msgstr "Mostra o número máximo de argumentos da função."
 
-#: commands/variable.c:62
-msgid "invalid list syntax for parameter \"datestyle\""
-msgstr "sintaxe de lista inválida para parâmetro \"datestyle\""
+#: utils/misc/guc.c:2149
+msgid "Shows the maximum number of index keys."
+msgstr "Mostra o número máximo de chaves do índice."
 
-#: commands/variable.c:161
-#, c-format
-msgid "unrecognized \"datestyle\" key word: \"%s\""
-msgstr "palavra chave de \"datestyle\" desconhecida: \"%s\""
+#: utils/misc/guc.c:2160
+msgid "Shows the maximum identifier length."
+msgstr "Mostra o tamanho máximo de identificador."
 
-#: commands/variable.c:175
-msgid "conflicting \"datestyle\" specifications"
-msgstr "especificações conflitantes de \"datestyle\""
+#: utils/misc/guc.c:2171
+msgid "Shows the size of a disk block."
+msgstr "Mostra o tamanho de um bloco do disco."
 
-#: commands/variable.c:285
-msgid "invalid interval value for time zone: month not allowed"
-msgstr "valor de intervalo é inválido para zona horária: mês não é permitido"
+#: utils/misc/guc.c:2182
+msgid "Shows the number of pages per disk file."
+msgstr "Mostra o número de páginas por arquivo do disco."
 
-#: commands/variable.c:293
-msgid "invalid interval value for time zone: day not allowed"
-msgstr "valor de intervalo é inválido para zona horária: dia não é permitido"
+#: utils/misc/guc.c:2193
+msgid "Shows the block size in the write ahead log."
+msgstr "Mostra o tamanho do bloco no log de transação."
 
-#: commands/variable.c:361 commands/variable.c:493
-#, c-format
-msgid "unrecognized time zone name: \"%s\""
-msgstr "nome da zona horária desconhecido: \"%s\""
+#: utils/misc/guc.c:2204
+msgid "Shows the number of pages per write ahead log segment."
+msgstr "Mostra o número de páginas por segmento de log de transação."
 
-#: commands/variable.c:370 commands/variable.c:502
-#, c-format
-msgid "time zone \"%s\" appears to use leap seconds"
-msgstr "zona horária \"%s\" parece utilizar segundos intercalados"
+#: utils/misc/guc.c:2217
+msgid "Time to sleep between autovacuum runs."
+msgstr "Tempo de adormecimento entre execuções do autovacuum."
 
-#: commands/variable.c:372 commands/variable.c:504
-msgid "PostgreSQL does not support leap seconds."
-msgstr "PostgreSQL não suporta segundos intercalados."
+#: utils/misc/guc.c:2227
+msgid "Minimum number of tuple updates or deletes prior to vacuum."
+msgstr "Número mínimo de atualizações ou exclusões de tuplas antes de limpar."
 
-#: commands/variable.c:557
-msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
+#: utils/misc/guc.c:2236
+msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
 msgstr ""
-"SET TRANSACTION ISOLATION LEVEL deve ser chamado antes de qualquer consulta"
+"Número mínimo de inserções, atualizações ou exclusões antes de analisar."
 
-#: commands/variable.c:566
-msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
+#: utils/misc/guc.c:2246
+msgid ""
+"Age at which to autovacuum a table to prevent transaction ID wraparound."
 msgstr ""
-"SET TRANSACTION ISOLATION LEVEL não deve ser chamado em uma subtransação"
-
-#: commands/variable.c:861
-#, c-format
-msgid "permission denied to set role \"%s\""
-msgstr "permissão negada ao definir role \"%s\""
+"Identificador para limpar automaticamente uma tabela para previnir "
+"reciclagem do ID de transação."
 
-#: commands/functioncmds.c:98
-#, c-format
-msgid "SQL function cannot return shell type %s"
-msgstr "função SQL não pode retornar tipo indefinido %s"
+#: utils/misc/guc.c:2257
+msgid ""
+"Sets the maximum number of simultaneously running autovacuum worker "
+"processes."
+msgstr ""
+"Define o número máximo de processos de limpeza automática executados "
+"simultaneamente."
 
-#: commands/functioncmds.c:103
-#, c-format
-msgid "return type %s is only a shell"
-msgstr "tipo retornado %s é indefinido"
+#: utils/misc/guc.c:2267
+msgid "Time between issuing TCP keepalives."
+msgstr "Tempo entre envios de mantenha-se vivo (keepalive) do TCP."
 
-#: commands/functioncmds.c:138
-#, c-format
-msgid "type \"%s\" is not yet defined"
-msgstr "tipo \"%s\" ainda não foi definido"
+#: utils/misc/guc.c:2268 utils/misc/guc.c:2279
+msgid "A value of 0 uses the system default."
+msgstr "Um valor 0 utiliza o padrão do sistema."
 
-#: commands/functioncmds.c:139
-msgid "Creating a shell type definition."
-msgstr "Criando uma definição de tipo indefinido."
+#: utils/misc/guc.c:2278
+msgid "Time between TCP keepalive retransmits."
+msgstr "Tempo entre retransmissões de mantenha-se vivo (keepalive) do TCP."
 
-#: commands/functioncmds.c:218
-#, c-format
-msgid "SQL function cannot accept shell type %s"
-msgstr "função SQL não pode aceitar tipo indefinido %s"
+#: utils/misc/guc.c:2289
+msgid ""
+"Set the amount of traffic to send and receive before renegotiating the "
+"encryption keys."
+msgstr ""
+"Define a quantidade de tráfego enviado e recebido antes de renegociar as "
+"chaves de criptografia."
 
-#: commands/functioncmds.c:223
-#, c-format
-msgid "argument type %s is only a shell"
-msgstr "tipo de argumento %s é indefinido"
+#: utils/misc/guc.c:2300
+msgid "Maximum number of TCP keepalive retransmits."
+msgstr ""
+"Número máximo de retransmissões de mantenha-se vivo (keepalive) do TCP."
 
-#: commands/functioncmds.c:233
-#, c-format
-msgid "type %s does not exist"
-msgstr "tipo %s não existe"
+#: utils/misc/guc.c:2301
+msgid ""
+"This controls the number of consecutive keepalive retransmits that can be "
+"lost before a connection is considered dead. A value of 0 uses the system "
+"default."
+msgstr ""
+"Isso controla o número de retransmissões consecutivas de mantenha-se vivo "
+"(keepalive) que podem ser perdidas antes que uma conexão seja considerada "
+"fechada. Um valor de 0 utiliza o padrão do sistema."
 
-#: commands/functioncmds.c:241
-msgid "functions cannot accept set arguments"
-msgstr "funções não podem aceitar conjunto de argumentos"
+#: utils/misc/guc.c:2312
+msgid "Sets the maximum allowed result for exact search by GIN."
+msgstr ""
+"Define o resultado máximo permitido por uma busca exata utilizando GIN."
 
-#: commands/functioncmds.c:250
-msgid "VARIADIC parameter must be the last input parameter"
-msgstr "parâmetro VARIADIC deve ser o último parâmetro de entrada"
+#: utils/misc/guc.c:2323
+msgid "Sets the planner's assumption about the size of the disk cache."
+msgstr "Define a suposição do planejador sobre o tamanho da cache do disco."
 
-#: commands/functioncmds.c:277
-msgid "VARIADIC parameter must be an array"
-msgstr "parâmetro VARIADIC deve ser uma matriz"
+#: utils/misc/guc.c:2324
+msgid ""
+"That is, the portion of the kernel's disk cache that will be used for "
+"PostgreSQL data files. This is measured in disk pages, which are normally 8 "
+"kB each."
+msgstr ""
+"Isto é, a porção da cache do disco que será utilizada pelo arquivos de dados "
+"do PostgreSQL. Isto é medido em páginas do disco, que são normalmente 8 kB "
+"cada."
 
-#: commands/functioncmds.c:317
-#, c-format
-msgid "parameter name \"%s\" used more than once"
-msgstr "nome de parâmetro \"%s\" foi especificado mais de uma vez"
+#: utils/misc/guc.c:2337
+msgid "Shows the server version as an integer."
+msgstr "Mostra a versão do servidor como um inteiro."
 
-#: commands/functioncmds.c:332
-msgid "only input parameters can have default values"
-msgstr "somente parâmetros de entrada podem ter valores padrão"
+#: utils/misc/guc.c:2348
+msgid "Log the use of temporary files larger than this number of kilobytes."
+msgstr ""
+"Registra o uso de arquivos temporários maiores do que este número de "
+"kilobytes."
 
-#: commands/functioncmds.c:344
-msgid "cannot use table references in parameter default value"
-msgstr "não pode utilizar referência a tabela no valor padrão do parâmetro"
+#: utils/misc/guc.c:2349
+msgid "Zero logs all files. The default is -1 (turning this feature off)."
+msgstr ""
+"Zero registra todos os arquivos. O padrão é -1 (desabilita essa "
+"funcionalidade)."
 
-#: commands/functioncmds.c:360
-msgid "cannot use subquery in parameter default value"
-msgstr "não pode utilizar subconsulta no valor padrão do parâmetro"
+#: utils/misc/guc.c:2359
+msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
+msgstr ""
+"Define o tamanho reservado para pg_stat_activity.current_query, em bytes."
 
-#: commands/functioncmds.c:364
-msgid "cannot use aggregate function in parameter default value"
-msgstr "não pode utilizar função de agregação no valor padrão do parâmetro"
+#: utils/misc/guc.c:2378
+msgid ""
+"Sets the planner's estimate of the cost of a sequentially fetched disk page."
+msgstr ""
+"Define a estimativa do planejador do custo de busca sequencial de uma página "
+"no disco."
 
-#: commands/functioncmds.c:368
-msgid "cannot use window function in parameter default value"
-msgstr "não pode utilizar função deslizante no valor padrão do parâmetro"
+#: utils/misc/guc.c:2388
+msgid ""
+"Sets the planner's estimate of the cost of a nonsequentially fetched disk "
+"page."
+msgstr ""
+"Define a estimativa do planejador do custo de busca não sequencial de uma "
+"página no disco."
 
-#: commands/functioncmds.c:378
-msgid "input parameters after one with a default value must also have defaults"
+#: utils/misc/guc.c:2398
+msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
 msgstr ""
-"parâmetros de entrada após um parâmetro com valor padrão também devem ter "
-"valores padrão"
+"Define a estimativa do planejador do custo de processamento de cada tupla "
+"(registro)."
 
-#: commands/functioncmds.c:617
-msgid "no function body specified"
-msgstr "corpo da função não foi especificado"
+#: utils/misc/guc.c:2408
+msgid ""
+"Sets the planner's estimate of the cost of processing each index entry "
+"during an index scan."
+msgstr ""
+"Define a estimativa do planejador do custo de processamento de cada índice "
+"durante uma busca indexada."
 
-#: commands/functioncmds.c:627
-msgid "no language specified"
-msgstr "nenhuma linguagem foi especificada"
+#: utils/misc/guc.c:2418
+msgid ""
+"Sets the planner's estimate of the cost of processing each operator or "
+"function call."
+msgstr ""
+"Define a estimativa do planejador do custo de processamento de cada operador "
+"ou chamada de função."
 
-#: commands/functioncmds.c:648 commands/functioncmds.c:1349
-msgid "COST must be positive"
-msgstr "COST deve ser positivo"
+#: utils/misc/guc.c:2429
+msgid ""
+"Sets the planner's estimate of the fraction of a cursor's rows that will be "
+"retrieved."
+msgstr ""
+"Define a estimativa do planejador da fração de registros do cursor que será "
+"recuperada."
 
-#: commands/functioncmds.c:656 commands/functioncmds.c:1357
-msgid "ROWS must be positive"
-msgstr "ROWS deve ser positivo"
+#: utils/misc/guc.c:2440
+msgid "GEQO: selective pressure within the population."
+msgstr "GEQO: pressão seletiva na população."
 
-#: commands/functioncmds.c:695
-#, c-format
-msgid "unrecognized function attribute \"%s\" ignored"
-msgstr "atributo de função desconhecido \"%s\" foi ignorado"
+#: utils/misc/guc.c:2450
+msgid "GEQO: seed for random path selection."
+msgstr "GEQO: semente para seleção de caminhos randômicos."
 
-#: commands/functioncmds.c:746
-#, c-format
-msgid "only one AS item needed for language \"%s\""
-msgstr "somente um item AS é necessário para linguagem \"%s\""
+#: utils/misc/guc.c:2460
+msgid "Multiple of the average buffer usage to free per round."
+msgstr "Múltiplo da média de uso dos buffers a serem liberados por ciclo."
 
-#: commands/functioncmds.c:838 commands/functioncmds.c:1992
-msgid "Use CREATE LANGUAGE to load the language into the database."
-msgstr "Utilize CREATE LANGUAGE para carregar uma linguagem no banco de dados."
+#: utils/misc/guc.c:2470
+msgid "Sets the seed for random-number generation."
+msgstr "Define a semente para geração de números randômicos."
 
-#: commands/functioncmds.c:885
-#, c-format
-msgid "function result type must be %s because of OUT parameters"
-msgstr "tipo do resultado da função deve ser %s por causa dos parâmetros OUT"
+#: utils/misc/guc.c:2481
+msgid ""
+"Number of tuple updates or deletes prior to vacuum as a fraction of "
+"reltuples."
+msgstr ""
+"Número de atualizações ou exclusões de tupla antes de limpar como uma fração "
+"de reltuples."
 
-#: commands/functioncmds.c:898
-msgid "function result type must be specified"
-msgstr "tipo do resultado da função deve ser especificado"
+#: utils/misc/guc.c:2490
+msgid ""
+"Number of tuple inserts, updates or deletes prior to analyze as a fraction "
+"of reltuples."
+msgstr ""
+"Número de inserções, atualizações ou exclusões de tupla antes de analisar "
+"como uma fração de reltuples."
 
-#: commands/functioncmds.c:933 commands/functioncmds.c:1361
-msgid "ROWS is not applicable when function does not return a set"
-msgstr "ROWS não é aplicável quando função não retorna um conjunto"
+#: utils/misc/guc.c:2500
+msgid ""
+"Time spent flushing dirty buffers during checkpoint, as fraction of "
+"checkpoint interval."
+msgstr ""
+"Tempo gasto escrevendo buffers sujos durante o ponto de controle, como "
+"fração do intervalo de ponto de controle."
 
-#: commands/functioncmds.c:985
-#, c-format
-msgid "function %s(%s) does not exist, skipping"
-msgstr "função %s(%s) não existe, ignorando"
+#: utils/misc/guc.c:2519
+msgid "Sets the shell command that will be called to archive a WAL file."
+msgstr ""
+"Define um comando do interpretador de comandos (shell) que será chamado para "
+"arquivar um arquivo do WAL."
 
-#: commands/functioncmds.c:1007
-msgid "Use DROP AGGREGATE to drop aggregate functions."
-msgstr "Utilize DROP AGGREGATE para remover funções de agregação."
+#: utils/misc/guc.c:2529
+msgid "Sets the client's character set encoding."
+msgstr "Define a codificação do conjunto de caracteres do cliente."
 
-#: commands/functioncmds.c:1014
-#, c-format
-msgid "removing built-in function \"%s\""
-msgstr "removendo função embutida \"%s\""
+#: utils/misc/guc.c:2540
+msgid "Controls information prefixed to each log line."
+msgstr "Controla informação prefixada em cada linha do log."
 
-#: commands/functioncmds.c:1107
-msgid "Use ALTER AGGREGATE to rename aggregate functions."
-msgstr "Utilize ALTER AGGREGATE para renomear funções de agregação."
+#: utils/misc/guc.c:2541
+msgid "If blank, no prefix is used."
+msgstr "Se estiver em branco, nenhum prefixo é utilizado."
 
-#: commands/functioncmds.c:1170
-msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
-msgstr "Utilize ALTER AGGREGATE para mudar o dono das funções de agregação."
+#: utils/misc/guc.c:2550
+msgid "Sets the time zone to use in log messages."
+msgstr "Define a zona horária a ser utilizada em mensagens de log."
 
-#: commands/functioncmds.c:1508
-#, c-format
-msgid "source data type %s is a pseudo-type"
-msgstr "tipo de dado fonte %s é um pseudo-tipo"
+#: utils/misc/guc.c:2560
+msgid "Sets the display format for date and time values."
+msgstr "Define o formato de exibição para valores de data e hora."
 
-#: commands/functioncmds.c:1514
-#, c-format
-msgid "target data type %s is a pseudo-type"
-msgstr "tipo de dado alvo %s é um pseudo-tipo"
+#: utils/misc/guc.c:2561
+msgid "Also controls interpretation of ambiguous date inputs."
+msgstr "Também controla interpretação de entrada de datas ambíguas."
 
-#: commands/functioncmds.c:1551
-msgid "cast function must take one to three arguments"
-msgstr "função de conversão deve ter de um a três argumentos"
+#: utils/misc/guc.c:2572
+msgid "Sets the default tablespace to create tables and indexes in."
+msgstr "Define a tablespace padrão para criação de tabelas e índices."
 
-#: commands/functioncmds.c:1555
-msgid ""
-"argument of cast function must match or be binary-coercible from source data "
-"type"
+#: utils/misc/guc.c:2573
+msgid "An empty string selects the database's default tablespace."
 msgstr ""
-"argumento da função de conversão deve corresponder ou ser convertido no tipo "
-"de dado fonte"
+"Uma cadeia de caracteres vazia seleciona a tablespace padrão do banco de "
+"dados."
 
-#: commands/functioncmds.c:1559
-msgid "second argument of cast function must be type integer"
-msgstr "segundo argumento da função de conversão deve ter tipo integer"
+#: utils/misc/guc.c:2583
+msgid "Sets the tablespace(s) to use for temporary tables and sort files."
+msgstr ""
+"Define a(s) tablespace(s) a ser(em) utilizada(s) para tabelas temporárias e "
+"arquivos de ordenação."
 
-#: commands/functioncmds.c:1563
-msgid "third argument of cast function must be type boolean"
-msgstr "terceiro argumento da função de conversão deve ter tipo boolean"
+#: utils/misc/guc.c:2594
+msgid "Sets the path for dynamically loadable modules."
+msgstr "Define o caminho para módulos carregáveis dinamicamente."
 
-#: commands/functioncmds.c:1567
+#: utils/misc/guc.c:2595
 msgid ""
-"return data type of cast function must match or be binary-coercible to "
-"target data type"
+"If a dynamically loadable module needs to be opened and the specified name "
+"does not have a directory component (i.e., the name does not contain a "
+"slash), the system will search this path for the specified file."
 msgstr ""
-"tipo de dado de retorno da função de conversão deve corresponder ou ser "
-"convertido no tipo de dado alvo"
+"Se o módulo carregável dinamicamente necessita ser aberto e o nome "
+"especificado não tem um componente de diretório (i.e., o nome não contém uma "
+"barra), o sistema irá procurar o caminho para o arquivo especificado."
 
-#: commands/functioncmds.c:1578
-msgid "cast function must not be volatile"
-msgstr "função de conversão não deve ser volátil"
+#: utils/misc/guc.c:2608
+msgid "Sets the location of the Kerberos server key file."
+msgstr "Define o local do arquivo da chave do servidor Kerberos."
 
-#: commands/functioncmds.c:1583
-msgid "cast function must not be an aggregate function"
-msgstr "função de conversão não deve ser uma função de agregação"
+#: utils/misc/guc.c:2619
+msgid "Sets the name of the Kerberos service."
+msgstr "Define o nome do serviço Kerberos."
 
-#: commands/functioncmds.c:1587
-msgid "cast function must not be a window function"
-msgstr "função de conversão não deve ser uma função deslizante"
+#: utils/misc/guc.c:2629
+msgid "Sets the Bonjour service name."
+msgstr "Define o nome do serviço Bonjour."
 
-#: commands/functioncmds.c:1591
-msgid "cast function must not return a set"
-msgstr "função de conversão não deve retornar um conjunto"
+#: utils/misc/guc.c:2641
+msgid "Shows the collation order locale."
+msgstr "Mostra a configuração regional utilizada na ordenação."
 
-#: commands/functioncmds.c:1617
-msgid "must be superuser to create a cast WITHOUT FUNCTION"
-msgstr "deve ser super-usuário para criar uma conversão WITHOUT FUNCTION"
+#: utils/misc/guc.c:2652
+msgid "Shows the character classification and case conversion locale."
+msgstr ""
+"Mostra a configuração regional utilizada na classificação de caracteres e na "
+"conversão entre maiúsculas/minúsculas."
 
-#: commands/functioncmds.c:1632
-msgid "source and target data types are not physically compatible"
-msgstr "tipos de dado fonte e alvo não são fisicamente compatíveis"
+#: utils/misc/guc.c:2663
+msgid "Sets the language in which messages are displayed."
+msgstr "Define a língua na qual as mensagens são mostradas."
 
-#: commands/functioncmds.c:1647
-msgid "composite data types are not binary-compatible"
-msgstr "tipos de dado compostos não são compatíveis no formato binário"
+#: utils/misc/guc.c:2673
+msgid "Sets the locale for formatting monetary amounts."
+msgstr "Define a configuração regional para formato de moeda."
 
-#: commands/functioncmds.c:1653
-msgid "enum data types are not binary-compatible"
-msgstr "tipos de dado enum não são compatíveis no formato binário"
+#: utils/misc/guc.c:2683
+msgid "Sets the locale for formatting numbers."
+msgstr "Define a configuração regional para formato de número."
 
-#: commands/functioncmds.c:1659
-msgid "array data types are not binary-compatible"
-msgstr "tipos de dado matriz não são compatíveis no formato binário"
+#: utils/misc/guc.c:2693
+msgid "Sets the locale for formatting date and time values."
+msgstr "Define a configuração regional para formato de data e hora."
 
-#: commands/functioncmds.c:1669
-msgid "source data type and target data type are the same"
-msgstr "tipo de dado fonte e tipo de dado alvo são o mesmo"
+#: utils/misc/guc.c:2703
+msgid "Lists shared libraries to preload into server."
+msgstr "Mostra bibliotecas compartilhadas a serem carregadas no servidor."
 
-#: commands/functioncmds.c:1702
-#, c-format
-msgid "cast from type %s to type %s already exists"
-msgstr "conversão do tipo %s para tipo %s já existe"
+#: utils/misc/guc.c:2714
+msgid "Lists shared libraries to preload into each backend."
+msgstr ""
+"Mostra bibliotecas compartilhadas a serem carregadas em cdas processo "
+"servidor."
 
-#: commands/functioncmds.c:1782
-#, c-format
-msgid "cast from type %s to type %s does not exist, skipping"
-msgstr "conversão do tipo %s para tipo %s não existe, ignorando"
+#: utils/misc/guc.c:2725
+msgid "Sets the schema search order for names that are not schema-qualified."
+msgstr ""
+"Define a ordem de busca em esquemas para nomes que não especificam um "
+"esquema."
 
-#: commands/functioncmds.c:1879
-#, c-format
-msgid "function \"%s\" is already in schema \"%s\""
-msgstr "função \"%s\" já está no esquema \"%s\""
+#: utils/misc/guc.c:2737
+msgid "Sets the server (database) character set encoding."
+msgstr ""
+"Define a codificação do conjunto de caracteres do servidor (banco de dados)."
 
-#: commands/functioncmds.c:1902
-#, c-format
-msgid "function \"%s\" already exists in schema \"%s\""
-msgstr "função \"%s\" já existe no esquema \"%s\""
+#: utils/misc/guc.c:2749
+msgid "Shows the server version."
+msgstr "Mostra a versão do servidor."
 
-#: commands/functioncmds.c:1974
-#, fuzzy
-msgid "no inline code specified"
-msgstr "código inline não foi especificado"
+#: utils/misc/guc.c:2761
+msgid "Sets the current role."
+msgstr "Define a role atual."
 
-#: commands/functioncmds.c:2022
-#, fuzzy, c-format
-msgid "language \"%s\" does not support inline code execution"
-msgstr "linguagem \"%s\" não suporta execução de código inline"
+#: utils/misc/guc.c:2773
+msgid "Sets the session user name."
+msgstr "Define o nome de usuário da sessão."
 
-#: commands/sequence.c:469 commands/sequence.c:668 commands/sequence.c:710
-#: commands/sequence.c:746 catalog/aclchk.c:3093
-#, c-format
-msgid "permission denied for sequence %s"
-msgstr "permissão negada para sequência %s"
+#: utils/misc/guc.c:2784
+msgid "Sets the destination for server log output."
+msgstr "Define o destino do log do servidor."
 
-#: commands/sequence.c:553
-#, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
-msgstr "nextval: valor máximo da sequência \"%s\" foi alcançado (%s)"
+#: utils/misc/guc.c:2785
+msgid ""
+"Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and "
+"\"eventlog\", depending on the platform."
+msgstr ""
+"Valores válidos são combinações de \"stderr\", \"syslog\", \"csvlog\" e "
+"\"eventlog\", dependendo da plataforma."
 
-#: commands/sequence.c:576
-#, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
-msgstr "nextval: valor mínimo da sequência \"%s\" foi alcançado (%s)"
+#: utils/misc/guc.c:2796
+msgid "Sets the destination directory for log files."
+msgstr "Define o diretório de destino dos arquivos de log."
 
-#: commands/sequence.c:674
-#, c-format
-msgid "currval of sequence \"%s\" is not yet defined in this session"
-msgstr "valor atual da sequência \"%s\" ainda não foi definido nesta sessão"
+#: utils/misc/guc.c:2797
+msgid "Can be specified as relative to the data directory or as absolute path."
+msgstr ""
+"Pode ser especificado como caminho relativo ao diretório de dados ou como "
+"caminho absoluto."
 
-#: commands/sequence.c:693 commands/sequence.c:699
-msgid "lastval is not yet defined in this session"
-msgstr "lastval ainda não foi definido nesta sessão"
+#: utils/misc/guc.c:2807
+msgid "Sets the file name pattern for log files."
+msgstr "Define o padrão de nome de arquivo para arquivos de log."
 
-#: commands/sequence.c:767
-#, c-format
-msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
-msgstr "setval: valor %s está fora do intervalo da sequência \"%s\" (%s..%s)"
+#: utils/misc/guc.c:2818
+msgid "Sets the program name used to identify PostgreSQL messages in syslog."
+msgstr ""
+"Define o nome do programa utilizado para identificar mensagens do PostgreSQL "
+"no syslog."
 
-#: commands/sequence.c:1096
-msgid "INCREMENT must not be zero"
-msgstr "INCREMENT não deve ser zero"
+#: utils/misc/guc.c:2829
+msgid "Sets the time zone for displaying and interpreting time stamps."
+msgstr "Define a zona horária para exibição e interpretação de timestamps."
 
-#: commands/sequence.c:1142
-#, c-format
-msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
-msgstr "MINVALUE (%s) deve ser menor do que MAXVALUE (%s)"
+#: utils/misc/guc.c:2839
+msgid "Selects a file of time zone abbreviations."
+msgstr "Seleciona um arquivo de abreviações de zonas horárias."
 
-#: commands/sequence.c:1167
-#, c-format
-msgid "START value (%s) cannot be less than MINVALUE (%s)"
-msgstr "valor de START (%s) não pode ser menor do que MINVALUE (%s)"
+#: utils/misc/guc.c:2849
+msgid "Sets the current transaction's isolation level."
+msgstr "Define o nível de isolamento da transação atual."
 
-#: commands/sequence.c:1179
-#, c-format
-msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
-msgstr "valor de START (%s) não pode ser maior do que MAXVALUE (%s)"
+#: utils/misc/guc.c:2860
+msgid "Sets the owning group of the Unix-domain socket."
+msgstr "Define o grupo dono do soquete de domínio Unix."
 
-#: commands/sequence.c:1210
-#, c-format
-msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
-msgstr "valor de RESTART (%s) não pode ser menor do que MINVALUE (%s)"
+#: utils/misc/guc.c:2861
+msgid ""
+"The owning user of the socket is always the user that starts the server."
+msgstr "O usuário dono do soquete é sempre o usuário que inicia o servidor."
 
-#: commands/sequence.c:1222
-#, c-format
-msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
-msgstr "valor de RESTART (%s) não pode ser maior do que MAXVALUE (%s)"
+#: utils/misc/guc.c:2871
+msgid "Sets the directory where the Unix-domain socket will be created."
+msgstr "Define o diretório onde o soquete de domínio Unix será criado."
 
-#: commands/sequence.c:1237
-#, c-format
-msgid "CACHE (%s) must be greater than zero"
-msgstr "CACHE (%s) deve ser maior do que zero"
+#: utils/misc/guc.c:2882
+msgid "Sets the host name or IP address(es) to listen to."
+msgstr "Define o nome da máquina ou endereço(s) IP para escutar."
 
-#: commands/sequence.c:1268
-msgid "invalid OWNED BY option"
-msgstr "opção de OWNED BY é inválida"
+#: utils/misc/guc.c:2893
+msgid "Sets the list of known custom variable classes."
+msgstr "Define a lista de classes de variáveis personalizadas conhecidas."
 
-#: commands/sequence.c:1269
-msgid "Specify OWNED BY table.column or OWNED BY NONE."
-msgstr "Especifique OWNED BY tabela.coluna ou OWNED BY NONE."
+#: utils/misc/guc.c:2904
+msgid "Sets the server's data directory."
+msgstr "Define o diretório de dados do servidor."
 
-#: commands/sequence.c:1298
-msgid "sequence must have same owner as table it is linked to"
-msgstr "sequência deve ter mesmo dono da tabela que ela está ligada"
+#: utils/misc/guc.c:2915
+msgid "Sets the server's main configuration file."
+msgstr "Define o arquivo de configuração principal do servidor."
 
-#: commands/sequence.c:1302
-msgid "sequence must be in same schema as table it is linked to"
-msgstr "sequência deve estar no mesmo esquema da tabela que ela está ligada"
+#: utils/misc/guc.c:2926
+msgid "Sets the server's \"hba\" configuration file."
+msgstr "Define o arquivo de configuração \"hba\" do servidor."
 
-#: replication/walsender.c:116
-#, fuzzy
-msgid "recovery is still in progress, can't accept WAL streaming connections"
+#: utils/misc/guc.c:2937
+msgid "Sets the server's \"ident\" configuration file."
+msgstr "Define o arquivo de configuração \"ident\" do servidor."
+
+#: utils/misc/guc.c:2948
+msgid "Writes the postmaster PID to the specified file."
+msgstr "Escreve o PID do postmaster no arquivo especificado."
+
+#: utils/misc/guc.c:2959
+msgid "Writes temporary statistics files to the specified directory."
 msgstr ""
-"recuperação ainda está em progresso, não pode aceitar conexões de streaming "
-"do WAL"
+"Escreve arquivos temporários de estatísticas em um diretório especificado."
 
-#: replication/walsender.c:278
-#, fuzzy
-msgid "standby connections not allowed because wal_level=minimal"
+#: utils/misc/guc.c:2970
+msgid "List of names of potential synchronous standbys."
 msgstr ""
-"conexões de servidores em espera não são permitidas porque wal_level=minimal"
 
-#: replication/walsender.c:300
-#, fuzzy, c-format
-msgid "invalid standby query string: %s"
-msgstr "consulta do servidor em espera inválida: %s"
+#: utils/misc/guc.c:2981
+msgid "Sets default text search configuration."
+msgstr "Define a configuração de busca textual padrão."
+
+#: utils/misc/guc.c:2991
+msgid "Sets the list of allowed SSL ciphers."
+msgstr "Define a lista de cifras SSL permitidas."
+
+#: utils/misc/guc.c:3006
+msgid "Sets the application name to be reported in statistics and logs."
+msgstr "Define o nome da aplicação a ser informado em estatísticas e logs."
 
-#: replication/walsender.c:313 replication/walsender.c:339
-#, fuzzy
-msgid "unexpected EOF on standby connection"
-msgstr "EOF inesperado durante conexão do servidor em espera"
+#: utils/misc/guc.c:3026
+msgid "Sets whether \"\\'\" is allowed in string literals."
+msgstr "Define se \"\\'\" é permitido em cadeias de caracteres literais."
 
-#: replication/walsender.c:319
-#, fuzzy, c-format
-msgid "invalid standby handshake message type %d"
-msgstr "tipo de mensagem do servidor em espera %d é inválido"
+#: utils/misc/guc.c:3036
+msgid "Sets the output format for bytea."
+msgstr "Define o formato de saída para bytea."
 
-#: replication/walsender.c:360
-#, fuzzy, c-format
-msgid "invalid standby closing message type %d"
-msgstr "tipo de mensagem do servidor em espera %d é inválido"
+#: utils/misc/guc.c:3046
+msgid "Sets the message levels that are sent to the client."
+msgstr "Define os níveis de mensagem que são enviadas ao cliente."
 
-#: replication/walsender.c:506
-#, fuzzy, c-format
+#: utils/misc/guc.c:3047 utils/misc/guc.c:3100 utils/misc/guc.c:3111
+#: utils/misc/guc.c:3167
 msgid ""
-"number of requested standby connections exceeds max_wal_senders (currently "
-"%d)"
+"Each level includes all the levels that follow it. The later the level, the "
+"fewer messages are sent."
 msgstr ""
-"número de conexões do servidores em espera solicitadas excedeu max_wal_senders (atualmente %d)"
+"Cada nível inclui todos os níveis que o seguem. Quanto mais superior for o "
+"nível, menos mensagens são enviadas."
 
-#: replication/walsender.c:578 replication/walsender.c:640
-#, c-format
-msgid "requested WAL segment %s has already been removed"
-msgstr "segmento do WAL solicitado %s já foi removido"
+#: utils/misc/guc.c:3057
+msgid "Enables the planner to use constraints to optimize queries."
+msgstr "Habilita o planejador a usar retrições para otimizar consultas."
 
-#: replication/walsender.c:611
-#, c-format
-msgid "could not read from log file %u, segment %u, offset %u, length %lu: %m"
+#: utils/misc/guc.c:3058
+msgid ""
+"Table scans will be skipped if their constraints guarantee that no rows "
+"match the query."
 msgstr ""
-"não pôde ler do arquivo de log %u, segmento %u, deslocado de %u, tamanho "
-"%lu: %m"
+"Buscas em tabelas serão ignoradas se suas restrições garantirem que nenhum "
+"registro corresponde a consulta."
 
-#: replication/walreceiver.c:138
-#, fuzzy
-msgid "terminating walreceiver process due to administrator command"
-msgstr ""
-"terminando processo walreceiver por causa de um comando do administrador"
+#: utils/misc/guc.c:3068
+msgid "Sets the transaction isolation level of each new transaction."
+msgstr "Define nível de isolamento de transação de cada nova transação."
 
-#: replication/walreceiver.c:287
-#, fuzzy
-msgid "cannot continue WAL streaming, recovery has already ended"
-msgstr "não pode continuar envio do WAL, recuperação já terminou"
+#: utils/misc/guc.c:3078
+msgid "Sets the display format for interval values."
+msgstr "Define o formato de exibição para valores interval."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:100
-#, c-format
-msgid "could not connect to the primary server: %s"
-msgstr "não pôde conectar ao servidor primário: %s"
+#: utils/misc/guc.c:3089
+msgid "Sets the verbosity of logged messages."
+msgstr "Define o detalhamento das mensagens registradas."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:112
-#, c-format
+#: utils/misc/guc.c:3099
+msgid "Sets the message levels that are logged."
+msgstr "Define os níveis de mensagem que serão registrados."
+
+#: utils/misc/guc.c:3110
 msgid ""
-"could not receive database system identifier and timeline ID from the "
-"primary server: %s"
-msgstr ""
-"não pôde receber identificador do sistema de banco de dados e o ID de linha do tempo do servidor primário: %s"
+"Causes all statements generating error at or above this level to be logged."
+msgstr "Registra todos os comandos que geram erro neste nível ou acima."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:123
-msgid "invalid response from primary server"
-msgstr "resposta inválida do servidor primário"
+#: utils/misc/guc.c:3121
+msgid "Sets the type of statements logged."
+msgstr "Define os tipos de comandos registrados."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:124
-#, c-format
-msgid "Expected 1 tuple with 2 fields, got %d tuples with %d fields."
-msgstr "Esperada 1 tupla com dois campos, recebeu %d tuplas com %d campos."
+#: utils/misc/guc.c:3131
+msgid "Sets the syslog \"facility\" to be used when syslog enabled."
+msgstr ""
+"Define o syslog \"facility\" a ser utilizado quando syslog estiver "
+"habilitado."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:139
-#, fuzzy
-msgid "database system identifier differs between the primary and standby"
-msgstr "identificador do sistema de banco de dados difere entre o primário e o secundário"
+#: utils/misc/guc.c:3146
+msgid "Sets the session's behavior for triggers and rewrite rules."
+msgstr "Define o comportamento de sessões para gatilhos e regras de reescrita."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:140
-#, fuzzy, c-format
-msgid "The primary's identifier is %s, the standby's identifier is %s."
-msgstr "O identificador do servidor primário é %s, o identificador do servidor secundário é %s."
+#: utils/misc/guc.c:3156
+msgid "Sets the current transaction's synchronization level."
+msgstr "Define o nível de sincronização da transação atual."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:152
-#, fuzzy, c-format
-msgid "timeline %u of the primary does not match recovery target timeline %u"
+#: utils/misc/guc.c:3166
+msgid "Enables logging of recovery-related debugging information."
 msgstr ""
-"linha do tempo solicitada %u do servidor primário não combina com linha do tempo %u alvo da recuperação"
-
-#: replication/libpqwalreceiver/libpqwalreceiver.c:164
-#, fuzzy, c-format
-msgid "could not start WAL streaming: %s"
-msgstr "não pôde iniciar envio do WAL: %s"
+"Habilita o registro de informação de depuração relacionada a recuperação."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:171
-#, fuzzy
-msgid "streaming replication successfully connected to primary"
-msgstr "replicação em fluxo conectou-se com sucesso ao servidor primário"
+#: utils/misc/guc.c:3182
+msgid "Collects function-level statistics on database activity."
+msgstr "Coleta estatísticas de funções sobre a atividade do banco de dados."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:193
-msgid "socket not open"
-msgstr "soquete não está aberto"
+#: utils/misc/guc.c:3192
+msgid "Set the level of information written to the WAL."
+msgstr "Define o nível de informação escrito no WAL."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:233
-#, c-format
-msgid "select() failed: %m"
-msgstr "select() falhou: %m"
+#: utils/misc/guc.c:3202
+msgid "Selects the method used for forcing WAL updates to disk."
+msgstr "Seleciona o método utilizado para forçar atualizações do WAL no disco."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:364
-#: replication/libpqwalreceiver/libpqwalreceiver.c:386
-#: replication/libpqwalreceiver/libpqwalreceiver.c:391
-#, fuzzy, c-format
-msgid "could not receive data from WAL stream: %s"
-msgstr "não pôde receber dados do stream do WAL: %s\n"
+#: utils/misc/guc.c:3212
+msgid "Sets how binary values are to be encoded in XML."
+msgstr "Define como valores binários serão codificados em XML."
 
-#: replication/libpqwalreceiver/libpqwalreceiver.c:382
-msgid "replication terminated by primary server"
-msgstr "replicação terminada pelo servidor primário"
+#: utils/misc/guc.c:3222
+msgid ""
+"Sets whether XML data in implicit parsing and serialization operations is to "
+"be considered as documents or content fragments."
+msgstr ""
+"Define se dados XML em operações de análise ou serialização implícita serão "
+"considerados como documentos ou como fragmentos de conteúdo."
 
-#: bootstrap/bootstrap.c:297
+#: utils/misc/guc.c:4064
 #, c-format
-msgid "%s: invalid command-line arguments\n"
-msgstr "%s: argumentos de linha de comando inválidos\n"
+msgid ""
+"%s does not know where to find the server configuration file.\n"
+"You must specify the --config-file or -D invocation option or set the PGDATA "
+"environment variable.\n"
+msgstr ""
+"%s não sabe onde encontrar o arquivo de configuração do servidor.\n"
+"Você deve especificar a opção --config-file ou -D ou definir uma variável de "
+"ambiente PGDATA.\n"
 
-#: port/pg_shmem.c:147 port/sysv_shmem.c:147
+#: utils/misc/guc.c:4083
 #, c-format
-msgid "could not create shared memory segment: %m"
-msgstr "não pôde criar segmento de memória compartilhada: %m"
+msgid "%s cannot access the server configuration file \"%s\": %s\n"
+msgstr "%s não pode acessar o arquivo de configuração do servidor \"%s\": %s\n"
 
-#: port/pg_shmem.c:148 port/sysv_shmem.c:148
+#: utils/misc/guc.c:4103
 #, c-format
-msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
-msgstr "Falhou ao executar chamada de sistema shmget(key=%lu, size=%lu, 0%o)."
+msgid ""
+"%s does not know where to find the database system data.\n"
+"This can be specified as \"data_directory\" in \"%s\", or by the -D "
+"invocation option, or by the PGDATA environment variable.\n"
+msgstr ""
+"%s não sabe onde encontrar os dados do sistema de banco de dados.\n"
+"Isto pode ser especificado como \"data_directory\" no \"%s\", pela opção -D "
+"ou definindo uma variável de ambiente PGDATA.\n"
 
-#: port/pg_shmem.c:152 port/sysv_shmem.c:152
+#: utils/misc/guc.c:4134
 #, c-format
 msgid ""
-"This error usually means that PostgreSQL's request for a shared memory "
-"segment exceeded your kernel's SHMMAX parameter.  You can either reduce the "
-"request size or reconfigure the kernel with larger SHMMAX.  To reduce the "
-"request size (currently %lu bytes), reduce PostgreSQL's shared_buffers "
-"parameter (currently %d) and/or its max_connections parameter (currently "
-"%d).\n"
-"If the request size is already small, it's possible that it is less than "
-"your kernel's SHMMIN parameter, in which case raising the request size or "
-"reconfiguring SHMMIN is called for.\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+"%s does not know where to find the \"hba\" configuration file.\n"
+"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
 msgstr ""
-"Esse erro usualmente significa que a requisição do PostgreSQL por segmento "
-"de memória compartilhada excedeu o parâmetro do kernel SHMMAX. Você pode "
-"reduzir o tamanho requisitado ou configurar o kernel novamente com um valor "
-"maior de SHMMAX. Para reduzir o tamanho requisitado (atualmente %lu bytes), "
-"reduza o parâmetro shared_buffers do PostgreSQL (atualmente %d) e/ou "
-"parâmetro max_connections (atualmente %d).\n"
-"Se o tamanho requisitado já está pequeno, é possível que ele seja menor do "
-"que o parâmetro SHMMIN do kernel, nesse caso aumente o tamanho da requisição "
-"ou configure SHMMIN novamente.\n"
-"A documentação do PostgreSQL contém informações adicionais sobre "
-"configuração de memória compartilhada."
+"%s não sabe onde encontrar o arquivo de configuração \"hba\".\n"
+"Isto pode ser especificado como \"hba_file\" no \"%s\", pela opção -D ou "
+"definindo uma variável de ambiente PGDATA.\n"
 
-#: port/pg_shmem.c:165 port/sysv_shmem.c:165
+#: utils/misc/guc.c:4157
 #, c-format
 msgid ""
-"This error usually means that PostgreSQL's request for a shared memory "
-"segment exceeded available memory or swap space, or exceeded your kernel's "
-"SHMALL parameter.  You can either reduce the request size or reconfigure the "
-"kernel with larger SHMALL.  To reduce the request size (currently %lu "
-"bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or "
-"its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+"%s does not know where to find the \"ident\" configuration file.\n"
+"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation "
+"option, or by the PGDATA environment variable.\n"
 msgstr ""
-"Esse erro usualmente significa que a requisição do PostgreSQL por segmento "
-"de memória compartilhada excedeu a memória ou espaço de swap disponível, ou excedeu o parâmetro SHMALL do kernel. Para reduzir o tamanho requisitado (atualmente %lu bytes), reduza o "
-"parâmetro shared_buffers do PostgreSQL (atualmente %d) e/ou parâmetro "
-"max_connections (atualmente %d).\n"
-"A documentação do PostgreSQL contém informações adicionais sobre "
-"configuração de memória compartilhada."
+"%s não sabe onde encontrar o arquivo de configuração \"ident\".\n"
+"Isto pode ser especificado como \"ident_file\" no \"%s\", pela opção -D ou "
+"definindo uma variável de ambiente PGDATA.\n"
 
-#: port/pg_shmem.c:176 port/sysv_shmem.c:176
-#, c-format
+#: utils/misc/guc.c:4739 utils/misc/guc.c:4903
+msgid "Value exceeds integer range."
+msgstr "Valor excede intervalo de inteiros."
+
+#: utils/misc/guc.c:4758
+msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
+msgstr "Unidades válidas para este parâmetro são \"kB\", \"MB\" e \"GB\"."
+
+#: utils/misc/guc.c:4817
 msgid ""
-"This error does *not* mean that you have run out of disk space. It occurs "
-"either if all available shared memory IDs have been taken, in which case you "
-"need to raise the SHMMNI parameter in your kernel, or because the system's "
-"overall limit for shared memory has been reached.  If you cannot increase "
-"the shared memory limit, reduce PostgreSQL's shared memory request "
-"(currently %lu bytes), by reducing its shared_buffers parameter (currently "
-"%d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory "
-"configuration."
+"Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
 msgstr ""
-"Esse erro *não* significa que você está sem espaço em disco. Isso ocorre se "
-"todos os IDs de memória compartilhadas estão sendo usados, neste caso você "
-"precisa aumentar o parâmetro SHMMNI do seu kernel, ou porque o limite do "
-"sistema para memória compartilhada foi alcançado. Se você não pode aumentar "
-"o limite de memória compartilhada, reduza o tamanho de memória compartilhada "
-"requisitada pelo PostgreSQL (atualmente %lu bytes), reduzindo o parâmetro "
-"shared_buffers (atualmente %d) e/ou parâmetro max_connections (atualmente "
-"%d).\n"
-"A documentação do PostgreSQL contém informações adicionais sobre "
-"configuração de memória compartilhada."
+"Unidades válidas para este parâmetro são \"ms\", \"s\", \"min\", \"h\" e \"d"
+"\"."
 
-#: port/pg_shmem.c:431 port/sysv_shmem.c:431
+#: utils/misc/guc.c:5133
 #, c-format
-msgid "could not stat data directory \"%s\": %m"
-msgstr "não pôde executar stat no diretório de dados \"%s\": %m"
+msgid "parameter \"%s\" cannot be changed"
+msgstr "parâmetro \"%s\" não pode ser mudado"
 
-#: port/pg_sema.c:114 port/sysv_sema.c:114
+#: utils/misc/guc.c:5172
 #, c-format
-msgid "could not create semaphores: %m"
-msgstr "não pôde criar semáforos: %m"
+msgid "parameter \"%s\" cannot be changed now"
+msgstr "parâmetro \"%s\" não pode ser mudado agora"
 
-#: port/pg_sema.c:115 port/sysv_sema.c:115
+#: utils/misc/guc.c:5203
 #, c-format
-msgid "Failed system call was semget(%lu, %d, 0%o)."
-msgstr "Falhou ao executar chamada de sistema semget(%lu, %d, 0%o)."
+msgid "parameter \"%s\" cannot be set after connection start"
+msgstr ""
+"parâmetro \"%s\" não pode ser definido depois que a conexão foi iniciada"
 
-#: port/pg_sema.c:119 port/sysv_sema.c:119
+#: utils/misc/guc.c:5213 utils/misc/guc.c:7947
 #, c-format
-msgid ""
-"This error does *not* mean that you have run out of disk space.\n"
-"It occurs when either the system limit for the maximum number of semaphore "
-"sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), "
-"would be exceeded.  You need to raise the respective kernel parameter.  "
-"Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its "
-"max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about configuring "
-"your system for PostgreSQL."
-msgstr ""
-"Esse erro *não* significa que você está sem espaço no disco.\n"
-"Isso ocorre quando o número máximo de conjuntos de semáforos (SEMMNI) atinge "
-"o limite do sistema ou o sistema atinge o número máximo de semáforos "
-"(SEMMNS). Você precisa aumentar o parâmetro do kernel que trata disso. "
-"Alternativamente, reduza o consumo de semáforos do PostgreSQL reduzindo o "
-"parâmetro max_connections (atualmente %d).\n"
-"A documentação do PostgreSQL contém informações adicionais sobre como "
-"configurar seu sistema para PostgreSQL."
+msgid "permission denied to set parameter \"%s\""
+msgstr "permissão negada ao definir parâmetro \"%s\""
 
-#: port/pg_sema.c:148 port/sysv_sema.c:148
+#: utils/misc/guc.c:5251
 #, c-format
-msgid ""
-"You possibly need to raise your kernel's SEMVMX value to be at least %d.  "
-"Look into the PostgreSQL documentation for details."
-msgstr ""
-"Você possivelmente precisa aumentar o valor SEMVMX do kernel para pelo menos "
-"%d.  Veja na documentação do PostgreSQL para obter detalhes."
+msgid "cannot set parameter \"%s\" within security-definer function"
+msgstr "não pode definir parâmetro \"%s\" em função com privilégios do dono"
 
-#: port/win32/signal.c:189
+#: utils/misc/guc.c:5259 utils/init/miscinit.c:381
 #, c-format
-msgid "could not create signal listener pipe for pid %d: error code %d"
+msgid "cannot set parameter \"%s\" within security-restricted operation"
 msgstr ""
-"não pôde criar pipe que espera por sinal para pid %d: código de erro %d"
+"não pode definir parâmetro \"%s\" em operação com restrição de segurança"
 
-#: port/win32/signal.c:269 port/win32/signal.c:301
+#: utils/misc/guc.c:5397 utils/misc/guc.c:5711 utils/misc/guc.c:8111
+#: utils/misc/guc.c:8145
 #, c-format
-msgid "could not create signal listener pipe: error code %d; retrying\n"
-msgstr ""
-"não pôde criar pipe que espera por sinal: código de erro %d; tentando "
-"novamente\n"
+msgid "invalid value for parameter \"%s\": \"%s\""
+msgstr "valor é inválido para parâmetro \"%s\": \"%s\""
 
-#: port/win32/signal.c:312
+#: utils/misc/guc.c:5406
 #, c-format
-msgid "could not create signal dispatch thread: error code %d\n"
-msgstr "não pôde criar thread emissor de sinal: código de erro %d\n"
+msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
+msgstr "%d está fora do intervalo válido para parâmetro \"%s\" (%d .. %d)"
 
-#: port/win32/security.c:43
+#: utils/misc/guc.c:5492
 #, c-format
-msgid "could not open process token: error code %d\n"
-msgstr "não pôde abrir informação sobre processo: código de erro %d\n"
+msgid "parameter \"%s\" requires a numeric value"
+msgstr "parâmetro \"%s\" requer um valor numérico"
 
-#: port/win32/security.c:63
+#: utils/misc/guc.c:5500
 #, c-format
-msgid "could not get SID for Administrators group: error code %d\n"
-msgstr "não pôde obter SID do grupo Administrators: código de erro %d\n"
+msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
+msgstr "%g está fora do intervalo válido para parâmetro \"%s\" (%g .. %g)"
 
-#: port/win32/security.c:72
+#: utils/misc/guc.c:5877 utils/misc/guc.c:5925 utils/misc/guc.c:6757
 #, c-format
-msgid "could not get SID for PowerUsers group: error code %d\n"
-msgstr "não pôde obter SID do grupo PowerUsers: código de erro %d\n"
+msgid "must be superuser to examine \"%s\""
+msgstr "deve ser super-usuário para examinar \"%s\""
 
-#: port/win32_sema.c:94
+#: utils/misc/guc.c:5991
 #, c-format
-msgid "could not create semaphore: error code %d"
-msgstr "não pôde criar semáforo: código de erro %d"
+msgid "SET %s takes only one argument"
+msgstr "SET %s só tem um argumento"
 
-#: port/win32_sema.c:161
+#: utils/misc/guc.c:6224
+msgid "SET requires parameter name"
+msgstr "SET requer nome do parâmetro"
+
+#: utils/misc/guc.c:6339
 #, c-format
-msgid "could not lock semaphore: error code %d"
-msgstr "não pôde bloquear semáforo: código de erro %d"
+msgid "attempt to redefine parameter \"%s\""
+msgstr "tentativa de redefinir parâmetro \"%s\""
 
-#: port/win32_sema.c:174
+#: utils/misc/guc.c:7527 utils/init/miscinit.c:1048
 #, c-format
-msgid "could not unlock semaphore: error code %d"
-msgstr "não pôde desbloquear semáforo: código de erro %d"
+msgid "could not read from file \"%s\": %m"
+msgstr "não pôde ler do arquivo \"%s\": %m"
 
-#: port/win32_sema.c:203
+#: utils/misc/guc.c:7648
 #, c-format
-msgid "could not try-lock semaphore: error code %d"
-msgstr "não pôde tentar bloquear semáforo: código de erro %d"
+msgid "could not parse setting for parameter \"%s\""
+msgstr "não pôde analisar definição para parâmetro \"%s\""
 
-#: port/win32_shmem.c:168 port/win32_shmem.c:203 port/win32_shmem.c:224
+#: utils/misc/guc.c:8009 utils/misc/guc.c:8043
 #, c-format
-msgid "could not create shared memory segment: %lu"
-msgstr "não pôde criar segmento de memória compartilhada: %lu"
+msgid "invalid value for parameter \"%s\": %d"
+msgstr "valor é inválido para parâmetro \"%s\": %d"
 
-#: port/win32_shmem.c:169
+#: utils/misc/guc.c:8077
 #, c-format
-msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
+msgid "invalid value for parameter \"%s\": %g"
+msgstr "valor é inválido para parâmetro \"%s\": %g"
+
+#: utils/misc/guc.c:8267
+msgid ""
+"\"temp_buffers\" cannot be changed after any temporary tables have been "
+"accessed in the session."
 msgstr ""
-"Falhou ao executar chamada de sistema CreateFileMapping(size=%lu, name=%s)."
+"\"temp_buffers\" não pode ser alterado após qualquer tabela temporária ter "
+"sido acessada na sessão."
 
-#: port/win32_shmem.c:193
-msgid "pre-existing shared memory block is still in use"
-msgstr "bloco de memória compartilhada pré-existente ainda está em uso"
+#: utils/misc/guc.c:8279
+msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+msgstr "SET AUTOCOMMIT TO OFF não é mais suportado"
 
-#: port/win32_shmem.c:194
+#: utils/misc/guc.c:8354
+msgid "assertion checking is not supported by this build"
+msgstr "verificação de asserção não é suportada por essa construção"
+
+#: utils/misc/guc.c:8367
+msgid "Bonjour is not supported by this build"
+msgstr "Bonjour não é suportado por essa construção"
+
+#: utils/misc/guc.c:8380
+msgid "SSL is not supported by this build"
+msgstr "SSL não é suportado por essa construção"
+
+#: utils/misc/guc.c:8392
+msgid "Cannot enable parameter when \"log_statement_stats\" is true."
+msgstr "não pode habilitar parâmetro quando \"log_statement_stats\" é true."
+
+#: utils/misc/guc.c:8404
 msgid ""
-"Check if there are any old server processes still running, and terminate "
-"them."
+"Cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
+"\"log_planner_stats\", or \"log_executor_stats\" is true."
 msgstr ""
-"Verifique se ainda há processos servidor antigos sendo executados, e termine-"
-"os."
+"não pode habilitar \"log_statement_stats\" quando \"log_parser_stats\", "
+"\"log_planner_stats\" ou \"log_executor_stats\" é true."
 
-#: port/win32_shmem.c:204
-msgid "Failed system call was DuplicateHandle."
-msgstr "Falhou ao executar chamada de sistema DuplicateHandle."
+#: utils/adt/windowfuncs.c:243
+msgid "argument of ntile must be greater than zero"
+msgstr "argumento de ntile deve ser maior do que zero"
 
-#: port/win32_shmem.c:225
-msgid "Failed system call was MapViewOfFileEx."
-msgstr "Falhou ao executar chamada de sistema MapViewOfFileEx."
+#: utils/adt/windowfuncs.c:465
+msgid "argument of nth_value must be greater than zero"
+msgstr "argumento de nth_value deve ser maior do que zero"
 
-#: tsearch/dict_synonym.c:119
-#, c-format
-msgid "unrecognized synonym parameter: \"%s\""
-msgstr "parâmetro desconhecido do dicionário de sinônimos: \"%s\""
+#: utils/adt/float.c:54
+msgid "value out of range: overflow"
+msgstr "valor fora do intervalo: estouro (overflow)"
 
-#: tsearch/dict_synonym.c:126
-msgid "missing Synonyms parameter"
-msgstr "faltando parâmetro Synonyms"
+#: utils/adt/float.c:59
+msgid "value out of range: underflow"
+msgstr "valor fora do intervalo: estouro (underflow)"
 
-#: tsearch/dict_synonym.c:133
+#: utils/adt/float.c:206 utils/adt/float.c:247 utils/adt/float.c:298
 #, c-format
-msgid "could not open synonym file \"%s\": %m"
-msgstr "não pôde abrir arquivo de sinônimos \"%s\": %m"
-
-#: tsearch/ts_parse.c:391 tsearch/ts_parse.c:398 tsearch/ts_parse.c:561
-#: tsearch/ts_parse.c:568
-msgid "word is too long to be indexed"
-msgstr "palavra é muito longa para ser indexada"
+msgid "invalid input syntax for type real: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo real: \"%s\""
 
-#: tsearch/ts_parse.c:392 tsearch/ts_parse.c:399 tsearch/ts_parse.c:562
-#: tsearch/ts_parse.c:569
+#: utils/adt/float.c:242
 #, c-format
-msgid "Words longer than %d characters are ignored."
-msgstr "Palavras maiores do que %d caracteres são ignoradas."
-
-#: tsearch/dict_ispell.c:52 tsearch/dict_thesaurus.c:615
-msgid "multiple DictFile parameters"
-msgstr "múltiplos parâmetros DictFile"
+msgid "\"%s\" is out of range for type real"
+msgstr "\"%s\" está fora do intervalo para tipo real"
 
-#: tsearch/dict_ispell.c:63
-msgid "multiple AffFile parameters"
-msgstr "múltiplos parâmetros AffFile"
+#: utils/adt/float.c:399 utils/adt/float.c:440 utils/adt/float.c:491
+#: utils/adt/numeric.c:3969 utils/adt/numeric.c:3995
+#, c-format
+msgid "invalid input syntax for type double precision: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo double precision: \"%s\""
 
-#: tsearch/dict_ispell.c:82
+#: utils/adt/float.c:435
 #, c-format
-msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "parâmetro desconhecido do Ispell: \"%s\""
+msgid "\"%s\" is out of range for type double precision"
+msgstr "\"%s\" está fora do intervalo para tipo double precision"
 
-#: tsearch/dict_ispell.c:96
-msgid "missing AffFile parameter"
-msgstr "faltando parâmetro AffFile"
+#: utils/adt/float.c:764 utils/adt/float.c:828 utils/adt/float.c:2470
+#: utils/adt/float.c:2533 utils/adt/timestamp.c:2876 utils/adt/cash.c:507
+#: utils/adt/cash.c:557 utils/adt/cash.c:608 utils/adt/cash.c:657
+#: utils/adt/cash.c:709 utils/adt/cash.c:759 utils/adt/numeric.c:4507
+#: utils/adt/numeric.c:4790 utils/adt/geo_ops.c:4130 utils/adt/int8.c:596
+#: utils/adt/int8.c:647 utils/adt/int8.c:828 utils/adt/int8.c:927
+#: utils/adt/int8.c:1016 utils/adt/int8.c:1115 utils/adt/int.c:730
+#: utils/adt/int.c:875 utils/adt/int.c:974 utils/adt/int.c:1063
+#: utils/adt/int.c:1093 utils/adt/int.c:1117
+msgid "division by zero"
+msgstr "divisão por zero"
 
-#: tsearch/dict_ispell.c:102 tsearch/dict_thesaurus.c:639
-msgid "missing DictFile parameter"
-msgstr "faltando parâmetro DictFile"
+#: utils/adt/float.c:1101 utils/adt/float.c:1160 utils/adt/float.c:2711
+#: utils/adt/float.c:2727 utils/adt/array_userfuncs.c:103
+#: utils/adt/array_userfuncs.c:113 utils/adt/numeric.c:2253
+#: utils/adt/numeric.c:2262 utils/adt/varlena.c:950 utils/adt/varlena.c:1968
+#: utils/adt/arrayfuncs.c:1276 utils/adt/varbit.c:1111 utils/adt/varbit.c:1503
+#: utils/adt/int8.c:1211 utils/adt/int.c:623 utils/adt/int.c:652
+#: utils/adt/int.c:673 utils/adt/int.c:693 utils/adt/int.c:715
+#: utils/adt/int.c:744 utils/adt/int.c:758 utils/adt/int.c:773
+#: utils/adt/int.c:912 utils/adt/int.c:933 utils/adt/int.c:960
+#: utils/adt/int.c:1000 utils/adt/int.c:1021 utils/adt/int.c:1048
+#: utils/adt/int.c:1079 utils/adt/int.c:1142
+msgid "integer out of range"
+msgstr "inteiro fora do intervalo"
 
-#: tsearch/ts_utils.c:53
-#, c-format
-msgid "invalid text search configuration file name \"%s\""
-msgstr "nome de arquivo de configuração de busca textual \"%s\" é inválido"
+#: utils/adt/float.c:1119 utils/adt/float.c:1177 utils/adt/numeric.c:2354
+#: utils/adt/numeric.c:2365 utils/adt/int8.c:1236 utils/adt/int.c:349
+#: utils/adt/int.c:789 utils/adt/int.c:818 utils/adt/int.c:839
+#: utils/adt/int.c:859 utils/adt/int.c:891 utils/adt/int.c:1157
+msgid "smallint out of range"
+msgstr "smallint fora do intervalo"
 
-#: tsearch/ts_utils.c:91
-#, c-format
-msgid "could not open stop-word file \"%s\": %m"
-msgstr "não pôde abrir arquivo de palavras ignoradas \"%s\": %m"
+#: utils/adt/float.c:1303 utils/adt/numeric.c:5183
+msgid "cannot take square root of a negative number"
+msgstr "não pode calcular raiz quadrada de um número negativo"
 
-#: tsearch/wparser_def.c:2533
-#, c-format
-msgid "unrecognized headline parameter: \"%s\""
-msgstr "parâmetro de destaque desconhecido: \"%s\""
+#: utils/adt/float.c:1345 utils/adt/numeric.c:2166
+msgid "zero raised to a negative power is undefined"
+msgstr "zero elevado a um número negativo é indefinido"
 
-#: tsearch/wparser_def.c:2542
-msgid "MinWords should be less than MaxWords"
-msgstr "MinWords deve ser menor do que MaxWords"
+#: utils/adt/float.c:1349 utils/adt/numeric.c:2172
+msgid "a negative number raised to a non-integer power yields a complex result"
+msgstr ""
+"um número negativo elevado a um número que não é inteiro retorna um "
+"resultado complexo"
 
-#: tsearch/wparser_def.c:2546
-msgid "MinWords should be positive"
-msgstr "MinWords deve ser positivo"
+#: utils/adt/float.c:1415 utils/adt/float.c:1445 utils/adt/numeric.c:5401
+msgid "cannot take logarithm of zero"
+msgstr "não pode calcular logaritmo de zero"
 
-#: tsearch/wparser_def.c:2550
-msgid "ShortWord should be >= 0"
-msgstr "ShortWord deve ser >= 0"
+#: utils/adt/float.c:1419 utils/adt/float.c:1449 utils/adt/numeric.c:5405
+msgid "cannot take logarithm of a negative number"
+msgstr "não pode calcular logaritmo de número negativo"
 
-#: tsearch/wparser_def.c:2554
-msgid "MaxFragments should be >= 0"
-msgstr "MaxFragments deve ser >= 0"
+#: utils/adt/float.c:1476 utils/adt/float.c:1497 utils/adt/float.c:1518
+#: utils/adt/float.c:1540 utils/adt/float.c:1561 utils/adt/float.c:1582
+#: utils/adt/float.c:1604 utils/adt/float.c:1625
+msgid "input is out of range"
+msgstr "entrada está fora do intervalo"
 
-#: tsearch/dict_thesaurus.c:180
-#, c-format
-msgid "could not open thesaurus file \"%s\": %m"
-msgstr "não pôde abrir arquivo de tesauros \"%s\": %m"
+#: utils/adt/float.c:2687 utils/adt/numeric.c:1171
+msgid "count must be greater than zero"
+msgstr "contador deve ser maior do que zero"
 
-#: tsearch/dict_thesaurus.c:213
-msgid "unexpected delimiter"
-msgstr "delimitador inesperado"
+#: utils/adt/float.c:2692 utils/adt/numeric.c:1178
+msgid "operand, lower bound and upper bound cannot be NaN"
+msgstr "operando, limite inferior e limite superior não podem ser infinitos"
 
-#: tsearch/dict_thesaurus.c:263 tsearch/dict_thesaurus.c:279
-msgid "unexpected end of line or lexeme"
-msgstr "fim de linha ou lexema inesperado"
+#: utils/adt/float.c:2698
+msgid "lower and upper bounds must be finite"
+msgstr "limites inferior e superior devem ser finitos"
 
-#: tsearch/dict_thesaurus.c:288
-msgid "unexpected end of line"
-msgstr "fim de linha inesperado"
+#: utils/adt/float.c:2736 utils/adt/numeric.c:1191
+msgid "lower bound cannot equal upper bound"
+msgstr "limite inferior não pode ser igual a limite superior"
 
-#: tsearch/dict_thesaurus.c:412
+#: utils/adt/mac.c:65
 #, c-format
-msgid ""
-"thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"palavra amostrada do tesauro \"%s\" não é reconhecida pelo sub-dicionário "
-"(regra %d)"
+msgid "invalid input syntax for type macaddr: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo macaddr: \"%s\""
 
-#: tsearch/dict_thesaurus.c:418
+#: utils/adt/mac.c:72
 #, c-format
-msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr "palavra amostrada do tesauro \"%s\" é uma palavra ignorada (regra %d)"
+msgid "invalid octet value in \"macaddr\" value: \"%s\""
+msgstr "valor de octeto é inválido no valor de \"macaddr\": \"%s\""
 
-#: tsearch/dict_thesaurus.c:421
-msgid "Use \"?\" to represent a stop word within a sample phrase."
-msgstr ""
-"Utilize \"?\" para representar uma palavra ignorada dentro de uma frase "
-"amostrada."
+#: utils/adt/tsquery_rewrite.c:296
+msgid "ts_rewrite query must return two tsquery columns"
+msgstr "consulta ts_rewrite deve retornar duas colunas tsquery"
 
-#: tsearch/dict_thesaurus.c:567
+#: utils/adt/enum.c:48 utils/adt/enum.c:58 utils/adt/enum.c:113
+#: utils/adt/enum.c:123
 #, c-format
-msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr "palavra substituta do tesauro \"%s\" é uma palavra ignorada (regra %d)"
+msgid "invalid input value for enum %s: \"%s\""
+msgstr "valor de entrada é inválido para enum %s: \"%s\""
 
-#: tsearch/dict_thesaurus.c:574
+#: utils/adt/enum.c:85 utils/adt/enum.c:148 utils/adt/enum.c:198
 #, c-format
-msgid ""
-"thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-"palavra substituta do tesauro \"%s\" não é reconhecida pelo sub-dicionário "
-"(regra %d)"
+msgid "invalid internal value for enum: %u"
+msgstr "valor interno é inválido para enum: %u"
 
-#: tsearch/dict_thesaurus.c:586
+#: utils/adt/enum.c:357 utils/adt/enum.c:386 utils/adt/enum.c:426
+#: utils/adt/enum.c:446
+msgid "could not determine actual enum type"
+msgstr "não pôde determinar tipo enum atual"
+
+#: utils/adt/enum.c:365 utils/adt/enum.c:394
 #, c-format
-msgid "thesaurus substitute phrase is empty (rule %d)"
-msgstr "frase substituta do tesauro está vazia (regra %d)"
+msgid "enum %s contains no values"
+msgstr "enum %s não contém valores"
 
-#: tsearch/dict_thesaurus.c:624
-msgid "multiple Dictionary parameters"
-msgstr "múltiplos parâmetros Dictionary"
+#: utils/adt/varchar.c:43 utils/adt/timestamp.c:92 utils/adt/varbit.c:51
+#: utils/adt/date.c:66
+msgid "invalid type modifier"
+msgstr "modificador de tipo é inválido"
 
-#: tsearch/dict_thesaurus.c:631
+#: utils/adt/varchar.c:48 utils/adt/varbit.c:56
 #, c-format
-msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "parâmetro desconhecido do dicionário de tesauros: \"%s\""
+msgid "length for type %s must be at least 1"
+msgstr "tamanho para tipo %s deve ser pelo menos 1"
 
-#: tsearch/dict_thesaurus.c:643
-msgid "missing Dictionary parameter"
-msgstr "faltando parâmetro Dictionary"
+#: utils/adt/varchar.c:52 utils/adt/varbit.c:61
+#, c-format
+msgid "length for type %s cannot exceed %d"
+msgstr "tamanho para tipo %s não pode exceder %d"
+
+#: utils/adt/varchar.c:152 utils/adt/varchar.c:305
+#, c-format
+msgid "value too long for type character(%d)"
+msgstr "valor é muito longo para tipo character(%d)"
+
+#: utils/adt/varchar.c:473 utils/adt/varchar.c:594
+#, c-format
+msgid "value too long for type character varying(%d)"
+msgstr "valor é muito longo para tipo character varying(%d)"
 
-#: tsearch/wparser.c:314
-msgid "text search parser does not support headline creation"
-msgstr "analisador de busca textual não suporta a criação de destaques"
+#: utils/adt/xml.c:135
+msgid "unsupported XML feature"
+msgstr "funcionalidade XML não é suportado"
 
-#: tsearch/spell.c:204
-#, c-format
-msgid "could not open dictionary file \"%s\": %m"
-msgstr "não pôde abrir arquivo de dicionário \"%s\": %m"
+#: utils/adt/xml.c:136
+msgid "This functionality requires the server to be built with libxml support."
+msgstr ""
+"Esta funcionalidade requer que o servidor seja construído com suporte a "
+"libxml."
 
-#: tsearch/spell.c:522 tsearch/spell.c:772 tsearch/spell.c:792
-msgid "multibyte flag character is not allowed"
-msgstr "caractere marcador multibyte não é permitido"
+#: utils/adt/xml.c:137
+msgid "You need to rebuild PostgreSQL using --with-libxml."
+msgstr "Você precisa reconstruir o PostgreSQL utilizando --with-libxml."
 
-#: tsearch/spell.c:557 tsearch/spell.c:615 tsearch/spell.c:710
+#: utils/adt/xml.c:156 utils/mb/mbutils.c:515
 #, c-format
-msgid "could not open affix file \"%s\": %m"
-msgstr "não pôde abrir arquivo de afixos \"%s\": %m"
+msgid "invalid encoding name \"%s\""
+msgstr "nome da codificação \"%s\" é inválido"
 
-#: tsearch/spell.c:603
-msgid "Ispell dictionary supports only default flag value"
-msgstr "dicionário Ispell suporta somente valor de marcador padrão"
+#: utils/adt/xml.c:402 utils/adt/xml.c:407
+msgid "invalid XML comment"
+msgstr "comentário XML inválido"
 
-#: tsearch/spell.c:803
-msgid "wrong affix file format for flag"
-msgstr "formato de arquivo de afixos incorreto para marcador"
+#: utils/adt/xml.c:536
+msgid "not an XML document"
+msgstr "não é um documento XML"
 
-#: tsearch/ts_locale.c:168
-#, c-format
-msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "linha %d do arquivo de configuração \"%s\": \"%s\""
+#: utils/adt/xml.c:689 utils/adt/xml.c:712
+msgid "invalid XML processing instruction"
+msgstr "instrução de processamento XML é inválida"
 
-#: tsearch/ts_locale.c:173 libpq/hba.c:653 libpq/hba.c:669 libpq/hba.c:715
-#: libpq/hba.c:738 libpq/hba.c:750 libpq/hba.c:763 libpq/hba.c:778
-#: libpq/hba.c:825 libpq/hba.c:848 libpq/hba.c:865 libpq/hba.c:878
-#: libpq/hba.c:894 libpq/hba.c:909 libpq/hba.c:949 libpq/hba.c:981
-#: libpq/hba.c:992 libpq/hba.c:1004 libpq/hba.c:1015 libpq/hba.c:1032
-#: libpq/hba.c:1053 libpq/hba.c:1082 libpq/hba.c:1094 libpq/hba.c:1107
-#: libpq/hba.c:1141 libpq/hba.c:1215 libpq/hba.c:1233 libpq/hba.c:1254
-#: libpq/hba.c:1285 libpq/hba.c:1295
+#: utils/adt/xml.c:690
 #, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "linha %d do arquivo de configuração \"%s\""
+msgid "XML processing instruction target name cannot be \"%s\"."
+msgstr "nome alvo da instrução de processamento XML não pode ser \"%s\"."
 
-#: tsearch/ts_locale.c:288
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "conversão do wchar_t para codificação do servidor falhou: %m"
+#: utils/adt/xml.c:713
+msgid "XML processing instruction cannot contain \"?>\"."
+msgstr "instrução de processamento XML não pode conter \"?>\"."
 
-#: tsearch/dict_simple.c:59
-msgid "multiple Accept parameters"
-msgstr "múltiplos parâmetros Accept"
+#: utils/adt/xml.c:792
+msgid "xmlvalidate is not implemented"
+msgstr "xmlvalidate não foi implementado"
 
-#: tsearch/dict_simple.c:67
-#, c-format
-msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "parâmetro desconhecido do dicionário simples: \"%s\""
+#: utils/adt/xml.c:877
+msgid "could not initialize XML library"
+msgstr "não pôde inicializar biblioteca XML"
 
-#: storage/ipc/shmem.c:346 storage/ipc/shmem.c:399
+#: utils/adt/xml.c:878
 #, c-format
 msgid ""
-"not enough shared memory for data structure \"%s\" (%lu bytes requested)"
+"libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
 msgstr ""
-"não há memória compartilhada suficiente para estrutura de dados \"%s\" (%lu "
-"bytes solicitados)"
+"libxml2 tem tipo char incompatível: sizeof(char)=%u, sizeof(xmlChar)=%u."
 
-#: storage/ipc/shmem.c:365
-#, c-format
-msgid "could not create ShmemIndex entry for data structure \"%s\""
-msgstr "não pôde criar entrada ShmemIndex para estrutura de dados \"%s\""
+#: utils/adt/xml.c:1420
+msgid "Invalid character value."
+msgstr "Valor de caracter é inválido."
 
-#: storage/ipc/shmem.c:380
-#, c-format
-msgid ""
-"ShmemIndex entry size is wrong for data structure \"%s\": expected %lu, "
-"actual %lu"
-msgstr "tamanho da entrada de ShmemIndex está errado para estrutura de dados \"%s\": esperado %lu, atual %lu"
+#: utils/adt/xml.c:1423
+msgid "Space required."
+msgstr "Espaço requerido."
 
-#: storage/ipc/shmem.c:427 storage/ipc/shmem.c:446
-msgid "requested shared memory size overflows size_t"
-msgstr "tamanho de memória compartilhada requisitada ultrapassa size_t"
+#: utils/adt/xml.c:1426
+msgid "standalone accepts only 'yes' or 'no'."
+msgstr "standalone aceita somente 'yes' ou 'no'."
 
-#: storage/ipc/procarray.c:694
-msgid "consistent state delayed because recovery snapshot incomplete"
-msgstr ""
+#: utils/adt/xml.c:1429
+msgid "Malformed declaration: missing version."
+msgstr "Declaração mal formada: faltando versão."
 
-#: storage/lmgr/lock.c:515
-#, c-format
-msgid ""
-"cannot acquire lock mode %s on database objects while recovery is in progress"
-msgstr ""
+#: utils/adt/xml.c:1432
+msgid "Missing encoding in text declaration."
+msgstr "Faltando codificação em declaração."
 
-#: storage/lmgr/lock.c:517
-msgid ""
-"Only RowExclusiveLock or less can be acquired on database objects during "
-"recovery."
-msgstr ""
+#: utils/adt/xml.c:1435
+msgid "Parsing XML declaration: '?>' expected."
+msgstr "Analisando declaração XML: '?>' esperado."
 
-#: storage/lmgr/lock.c:611 storage/lmgr/lock.c:680 storage/lmgr/lock.c:2499
-#: storage/lmgr/lock.c:2564
-msgid "You might need to increase max_locks_per_transaction."
-msgstr "Você pode precisar aumentar max_locks_per_transaction."
+#: utils/adt/xml.c:1438
+#, c-format
+msgid "Unrecognized libxml error code: %d."
+msgstr "código de erro libxml desconhecido: %d."
 
-#: storage/lmgr/lock.c:2120
-msgid "Not enough memory for reassigning the prepared transaction's locks."
-msgstr ""
-"Memória insuficiente para atribuir os bloqueios de uma transação preparada."
+#: utils/adt/xml.c:1689 utils/adt/date.c:217
+msgid "date out of range"
+msgstr "data fora do intervalo"
 
-#: storage/lmgr/proc.c:1040
-#, c-format
-msgid ""
-"process %d avoided deadlock for %s on %s by rearranging queue order after "
-"%ld.%03d ms"
-msgstr ""
-"processo %d evitou impasse por %s em %s ao reorganizar a ordem da fila após "
-"%ld.%03d ms"
+#: utils/adt/xml.c:1690
+msgid "XML does not support infinite date values."
+msgstr "XML não suporta valores infinitos de date."
 
-#: storage/lmgr/proc.c:1052
-#, c-format
-msgid ""
-"process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
-msgstr ""
-"processo %d detectou impasse enquanto esperava por %s em %s após %ld.%03d ms"
+#: utils/adt/xml.c:1712 utils/adt/xml.c:1719 utils/adt/xml.c:1739
+#: utils/adt/xml.c:1746 utils/adt/nabstime.c:480 utils/adt/nabstime.c:523
+#: utils/adt/nabstime.c:553 utils/adt/nabstime.c:596
+#: utils/adt/formatting.c:3185 utils/adt/formatting.c:3217
+#: utils/adt/formatting.c:3285 utils/adt/timestamp.c:226
+#: utils/adt/timestamp.c:269 utils/adt/timestamp.c:491
+#: utils/adt/timestamp.c:531 utils/adt/timestamp.c:2530
+#: utils/adt/timestamp.c:2551 utils/adt/timestamp.c:2564
+#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:2631
+#: utils/adt/timestamp.c:2654 utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2678 utils/adt/timestamp.c:3114
+#: utils/adt/timestamp.c:3244 utils/adt/timestamp.c:3285
+#: utils/adt/timestamp.c:3373 utils/adt/timestamp.c:3420
+#: utils/adt/timestamp.c:3531 utils/adt/timestamp.c:3844
+#: utils/adt/timestamp.c:3981 utils/adt/timestamp.c:3988
+#: utils/adt/timestamp.c:4002 utils/adt/timestamp.c:4012
+#: utils/adt/timestamp.c:4075 utils/adt/timestamp.c:4215
+#: utils/adt/timestamp.c:4225 utils/adt/timestamp.c:4440
+#: utils/adt/timestamp.c:4519 utils/adt/timestamp.c:4526
+#: utils/adt/timestamp.c:4553 utils/adt/timestamp.c:4557
+#: utils/adt/timestamp.c:4614 utils/adt/date.c:913 utils/adt/date.c:960
+#: utils/adt/date.c:1516 utils/adt/date.c:1553 utils/adt/date.c:2427
+msgid "timestamp out of range"
+msgstr "timestamp fora do intervalo"
 
-#: storage/lmgr/proc.c:1058
-#, c-format
-msgid "process %d still waiting for %s on %s after %ld.%03d ms"
-msgstr "processo %d ainda espera por %s em %s após %ld.%03d ms"
+#: utils/adt/xml.c:1713 utils/adt/xml.c:1740
+msgid "XML does not support infinite timestamp values."
+msgstr "XML não suporta valores infinitos de timestamp."
 
-#: storage/lmgr/proc.c:1062
-#, c-format
-msgid "process %d acquired %s on %s after %ld.%03d ms"
-msgstr "processo %d obteve %s em %s após %ld.%03d ms"
+#: utils/adt/xml.c:2125
+msgid "invalid query"
+msgstr "consulta inválida"
 
-#: storage/lmgr/proc.c:1078
-#, c-format
-msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
-msgstr "processo %d falhou ao obter %s em %s após %ld.%03d ms"
+#: utils/adt/xml.c:3349
+msgid "invalid array for XML namespace mapping"
+msgstr "matriz inválida para mapeamento de namespace XML"
 
-#: storage/lmgr/lmgr.c:717
-#, c-format
-msgid "relation %u of database %u"
-msgstr "relação %u do banco de dados %u"
+#: utils/adt/xml.c:3350
+msgid ""
+"The array must be two-dimensional with length of the second axis equal to 2."
+msgstr ""
+"A matriz deve ter duas dimensões com comprimento do segundo eixo igual a 2."
 
-#: storage/lmgr/lmgr.c:723
-#, c-format
-msgid "extension of relation %u of database %u"
-msgstr "extensão da relação %u do banco de dados %u"
+#: utils/adt/xml.c:3374
+msgid "empty XPath expression"
+msgstr "expressão XPath vazia"
+
+#: utils/adt/xml.c:3422
+msgid "neither namespace name nor URI may be null"
+msgstr "namespace ou URI não podem ser nulo"
 
-#: storage/lmgr/lmgr.c:729
+#: utils/adt/xml.c:3429
 #, c-format
-msgid "page %u of relation %u of database %u"
-msgstr "página %u da relação %u do banco de dados %u"
+msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
+msgstr "não pôde registrar namespace XML com nome \"%s\" e URI \"%s\""
 
-#: storage/lmgr/lmgr.c:736
+#: utils/adt/tsquery.c:156 utils/adt/tsquery.c:392
+#: utils/adt/tsvector_parser.c:136
 #, c-format
-msgid "tuple (%u,%u) of relation %u of database %u"
-msgstr "tupla (%u,%u) da relação %u do banco de dados %u"
+msgid "syntax error in tsquery: \"%s\""
+msgstr "erro de sintaxe em tsquery: \"%s\""
 
-#: storage/lmgr/lmgr.c:744
+#: utils/adt/tsquery.c:177
 #, c-format
-msgid "transaction %u"
-msgstr "transação %u"
+msgid "no operand in tsquery: \"%s\""
+msgstr "nenhum operando em tsquery: \"%s\""
 
-#: storage/lmgr/lmgr.c:749
+#: utils/adt/tsquery.c:250
 #, c-format
-msgid "virtual transaction %d/%u"
-msgstr "transação virtual %d/%u"
+msgid "value is too big in tsquery: \"%s\""
+msgstr "valor é muito grande em tsquery: \"%s\""
 
-#: storage/lmgr/lmgr.c:755
+#: utils/adt/tsquery.c:255
 #, c-format
-msgid "object %u of class %u of database %u"
-msgstr "objeto %u da classe %u do banco de dados %u"
+msgid "operand is too long in tsquery: \"%s\""
+msgstr "operando é muito longo em tsquery: \"%s\""
 
-#: storage/lmgr/lmgr.c:763
+#: utils/adt/tsquery.c:283
 #, c-format
-msgid "user lock [%u,%u,%u]"
-msgstr "bloqueio do usuário [%u,%u,%u]"
+msgid "word is too long in tsquery: \"%s\""
+msgstr "palavra é muito longa em tsquery: \"%s\""
 
-#: storage/lmgr/lmgr.c:770
+#: utils/adt/tsquery.c:512
 #, c-format
-msgid "advisory lock [%u,%u,%u,%u]"
-msgstr "bloqueio sob aviso [%u,%u,%u,%u]"
+msgid "text-search query doesn't contain lexemes: \"%s\""
+msgstr "consulta de busca textual não contém lexemas: \"%s\""
 
-#: storage/lmgr/lmgr.c:778
+#: utils/adt/tsvector.c:215
 #, c-format
-msgid "unrecognized locktag type %d"
-msgstr "tipo de marcação de bloqueio %d desconhecido"
+msgid "word is too long (%ld bytes, max %ld bytes)"
+msgstr "palavra é muito longa (%ld bytes, máximo de %ld bytes)"
 
-#: storage/lmgr/deadlock.c:915
+#: utils/adt/tsvector.c:222
 #, c-format
-msgid "Process %d waits for %s on %s; blocked by process %d."
-msgstr "Processo %d espera por %s em %s; bloqueado pelo processo %d."
+msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
+msgstr ""
+"cadeia de caracteres é muito longa para tsvector (%ld bytes, máximo de %ld "
+"bytes)"
 
-#: storage/lmgr/deadlock.c:934
+#: utils/adt/ascii.c:75
 #, c-format
-msgid "Process %d: %s"
-msgstr "Processo %d: %s"
+msgid "encoding conversion from %s to ASCII not supported"
+msgstr "conversão de codificação de %s para ASCII não é suportada"
 
-#: storage/lmgr/deadlock.c:941
-msgid "deadlock detected"
-msgstr "impasse detectado"
+#: utils/adt/trigfuncs.c:41
+msgid "suppress_redundant_updates_trigger: must be called as trigger"
+msgstr "suppress_redundant_updates_trigger: deve ser chamado com gatilho"
 
-#: storage/lmgr/deadlock.c:944
-msgid "See server log for query details."
-msgstr "Veja log do servidor para obter detalhes das consultas."
+#: utils/adt/trigfuncs.c:47
+msgid "suppress_redundant_updates_trigger: must be called on update"
+msgstr ""
+"suppress_redundant_updates_trigger: deve ser chamado durante atualização"
 
-#: storage/file/fd.c:402
-#, c-format
-msgid "getrlimit failed: %m"
-msgstr "getrlimit falhou: %m"
+#: utils/adt/trigfuncs.c:53
+msgid "suppress_redundant_updates_trigger: must be called before update"
+msgstr ""
+"suppress_redundant_updates_trigger: deve ser chamado antes da atualização"
 
-#: storage/file/fd.c:492
-msgid "insufficient file descriptors available to start server process"
+#: utils/adt/trigfuncs.c:59
+msgid "suppress_redundant_updates_trigger: must be called for each row"
 msgstr ""
-"descritores de arquivo disponíveis são insuficientes para iniciar o processo "
-"servidor"
+"suppress_redundant_updates_trigger: deve ser chamado para cada registro"
 
-#: storage/file/fd.c:493
+#: utils/adt/tid.c:70 utils/adt/tid.c:78 utils/adt/tid.c:86
 #, c-format
-msgid "System allows %d, we need at least %d."
-msgstr "Sistema permite %d, nós precisamos pelo menos de %d."
+msgid "invalid input syntax for type tid: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo tid: \"%s\""
 
-#: storage/file/fd.c:534 storage/file/fd.c:1418 storage/file/fd.c:1533
+#: utils/adt/encode.c:55 utils/adt/encode.c:91
 #, c-format
-msgid "out of file descriptors: %m; release and retry"
-msgstr "sem descritores de arquivo: %m; libere e tente novamente"
+msgid "unrecognized encoding: \"%s\""
+msgstr "codificação desconhecida: \"%s\""
 
-#: storage/file/fd.c:1067
+#: utils/adt/encode.c:150
 #, c-format
-msgid "temporary file: path \"%s\", size %lu"
-msgstr "arquivo temporário: caminho \"%s\", tamanho %lu"
+msgid "invalid hexadecimal digit: \"%c\""
+msgstr "dígito hexadecimal inválido: \"%c\""
 
-#: storage/file/fd.c:1592
-#, c-format
-msgid "could not read directory \"%s\": %m"
-msgstr "não pôde ler diretório \"%s\": %m"
+#: utils/adt/encode.c:178
+msgid "invalid hexadecimal data: odd number of digits"
+msgstr "dado hexadecimal inválido: número de dígitos estranho"
 
-#: storage/page/bufpage.c:143 storage/page/bufpage.c:390
-#: storage/page/bufpage.c:623 storage/page/bufpage.c:753
-#, c-format
-msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
-msgstr ""
-"ponteiros de página corrompidos: inferior = %u, superior = %u, especial = %u"
+#: utils/adt/encode.c:295
+msgid "unexpected \"=\""
+msgstr "\"=\" inesperado"
 
-#: storage/page/bufpage.c:433
-#, c-format
-msgid "corrupted item pointer: %u"
-msgstr "ponteiro de item corrompido: %u"
+#: utils/adt/encode.c:307
+msgid "invalid symbol"
+msgstr "símbolo inválido"
 
-#: storage/page/bufpage.c:444 storage/page/bufpage.c:805
-#, c-format
-msgid "corrupted item lengths: total %u, available space %u"
-msgstr "tamanhos de itens corrompidos: total %u, espaço livre %u"
+#: utils/adt/encode.c:327
+msgid "invalid end sequence"
+msgstr "fim de sequência inválido"
 
-#: storage/page/bufpage.c:642 storage/page/bufpage.c:778
-#, c-format
-msgid "corrupted item pointer: offset = %u, size = %u"
-msgstr "ponteiro de item corrompido: deslocamento = %u, tamanho = %u"
+#: utils/adt/encode.c:441 utils/adt/encode.c:506 utils/adt/varlena.c:246
+#: utils/adt/varlena.c:287
+msgid "invalid input syntax for type bytea"
+msgstr "sintaxe de entrada é inválida para tipo bytea"
 
-#: storage/large_object/inv_api.c:550 storage/large_object/inv_api.c:747
-#, c-format
-msgid "large object %u was not opened for writing"
-msgstr "objeto grande %u não foi aberto para escrita"
+#: utils/adt/tsgistidx.c:100
+msgid "gtsvector_in not implemented"
+msgstr "gtsvector_in não está implementado"
 
-#: storage/large_object/inv_api.c:557 storage/large_object/inv_api.c:754
-#, c-format
-msgid "large object %u was already dropped"
-msgstr "objeto grande %u já foi removido"
+#: utils/adt/rowtypes.c:98 utils/adt/rowtypes.c:473
+msgid "input of anonymous composite types is not implemented"
+msgstr "entrada de tipos compostos anônimos não está implementada"
 
-#: storage/smgr/md.c:371 storage/smgr/md.c:839
+#: utils/adt/rowtypes.c:151 utils/adt/rowtypes.c:179 utils/adt/rowtypes.c:202
+#: utils/adt/rowtypes.c:210 utils/adt/rowtypes.c:262 utils/adt/rowtypes.c:270
 #, c-format
-msgid "could not truncate file \"%s\": %m"
-msgstr "não pôde truncar arquivo \"%s\": %m"
+msgid "malformed record literal: \"%s\""
+msgstr "matriz mal formada: \"%s\""
 
-#: storage/smgr/md.c:439
-#, c-format
-msgid "cannot extend file \"%s\" beyond %u blocks"
-msgstr "não pode estender arquivo \"%s\" além de %u blocos"
+#: utils/adt/rowtypes.c:152
+msgid "Missing left parenthesis."
+msgstr "Faltando parêntese esquerdo."
 
-#: storage/smgr/md.c:461 storage/smgr/md.c:621 storage/smgr/md.c:694
-#, fuzzy, c-format
-msgid "could not seek to block %u in file \"%s\": %m"
-msgstr "não pôde buscar bloco %u no arquivo \"%s\": %m"
+#: utils/adt/rowtypes.c:180
+msgid "Too few columns."
+msgstr "Poucas colunas."
 
-#: storage/smgr/md.c:469
-#, c-format
-msgid "could not extend file \"%s\": %m"
-msgstr "não pôde estender arquivo \"%s\": %m"
+#: utils/adt/rowtypes.c:204 utils/adt/rowtypes.c:212
+msgid "Unexpected end of input."
+msgstr "Fim da entrada inesperado."
 
-#: storage/smgr/md.c:471 storage/smgr/md.c:478 storage/smgr/md.c:720
-msgid "Check free disk space."
-msgstr "Verifique o espaço em disco livre."
+#: utils/adt/rowtypes.c:263
+msgid "Too many columns."
+msgstr "Muitas colunas."
 
-#: storage/smgr/md.c:475
-#, c-format
-msgid "could not extend file \"%s\": wrote only %d of %d bytes at block %u"
-msgstr ""
-"não pôde estender arquivo \"%s\": escreveu somente %d de %d bytes no bloco %u"
+#: utils/adt/rowtypes.c:271
+msgid "Junk after right parenthesis."
+msgstr "Lixo após parêntese direito."
 
-#: storage/smgr/md.c:638
+#: utils/adt/rowtypes.c:522
 #, c-format
-msgid "could not read block %u in file \"%s\": %m"
-msgstr "não pôde ler bloco %u no arquivo \"%s\": %m"
+msgid "wrong number of columns: %d, expected %d"
+msgstr "número de colunas incorreto: %d, esperado %d"
 
-#: storage/smgr/md.c:654
+#: utils/adt/rowtypes.c:549
 #, c-format
-msgid "could not read block %u in file \"%s\": read only %d of %d bytes"
-msgstr "não pôde ler bloco %u no arquivo \"%s\": leu somente %d de %d bytes"
+msgid "wrong data type: %u, expected %u"
+msgstr "tipo de dado incorreto: %u, esperado %u"
 
-#: storage/smgr/md.c:711
+#: utils/adt/rowtypes.c:610
 #, c-format
-msgid "could not write block %u in file \"%s\": %m"
-msgstr "não pôde escrever bloco %u no arquivo \"%s\": %m"
+msgid "improper binary format in record column %d"
+msgstr "formato binário inválido na coluna %d do registro"
 
-#: storage/smgr/md.c:716
+#: utils/adt/rowtypes.c:897 utils/adt/rowtypes.c:1132
 #, c-format
-msgid "could not write block %u in file \"%s\": wrote only %d of %d bytes"
+msgid "cannot compare dissimilar column types %s and %s at record column %d"
 msgstr ""
-"não pôde escrever bloco %u no arquivo \"%s\": escreveu somente %d de %d bytes"
+"não pode comparar tipos de colunas diferentes %s e %s em coluna %d de "
+"registro"
 
-#: storage/smgr/md.c:815
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: it's only %u blocks now"
-msgstr ""
-"não pôde truncar arquivo \"%s\" para %u blocos: há somente %u blocos agora"
+#: utils/adt/rowtypes.c:983 utils/adt/rowtypes.c:1203
+msgid "cannot compare record types with different numbers of columns"
+msgstr "não pode comparar tipos record com quantidade diferente de colunas"
 
-#: storage/smgr/md.c:864
-#, c-format
-msgid "could not truncate file \"%s\" to %u blocks: %m"
-msgstr "não pôde truncar arquivo \"%s\" para %u blocos: %m"
+#: utils/adt/array_userfuncs.c:48
+msgid "could not determine input data types"
+msgstr "não pôde determinar tipos de dado de entrada"
 
-#: storage/smgr/md.c:1087
-#, fuzzy, c-format
-msgid "could not fsync file \"%s\" but retrying: %m"
-msgstr "não pôde executar fsync no arquivo \"%s\": %m"
+#: utils/adt/array_userfuncs.c:82
+msgid "neither input type is an array"
+msgstr "tipo de entrada não é uma matriz"
 
-#: storage/smgr/md.c:1586
-#, c-format
-msgid "could not open file \"%s\" (target block %u): %m"
-msgstr "não pôde abrir arquivo \"%s\" (bloco alvo %u): %m"
+#: utils/adt/array_userfuncs.c:121
+msgid "argument must be empty or one-dimensional array"
+msgstr "argumento deve ser vazio ou matriz de uma dimensão"
 
-#: storage/smgr/md.c:1608
-#, fuzzy, c-format
-msgid "could not seek to end of file \"%s\": %m"
-msgstr "não pôde buscar no fim do arquivo \"%s\": %m"
+#: utils/adt/array_userfuncs.c:224 utils/adt/array_userfuncs.c:263
+#: utils/adt/array_userfuncs.c:300 utils/adt/array_userfuncs.c:329
+#: utils/adt/array_userfuncs.c:357
+msgid "cannot concatenate incompatible arrays"
+msgstr "não pode concatenar matrizes incompatíveis"
 
-#: storage/buffer/bufmgr.c:131 storage/buffer/bufmgr.c:235
-msgid "cannot access temporary tables of other sessions"
-msgstr "não pode acessar tabelas temporárias de outras sessões"
+#: utils/adt/array_userfuncs.c:225
+#, c-format
+msgid ""
+"Arrays with element types %s and %s are not compatible for concatenation."
+msgstr ""
+"Matrizes com tipos de elemento %s e %s não são compatíveis para concatenação."
 
-#: storage/buffer/bufmgr.c:364
+#: utils/adt/array_userfuncs.c:264
 #, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "dado inesperado após EOF no bloco %u da relação %s"
+msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
+msgstr "Matrizes de dimensões %d e %d não são compatíveis para concatenação."
 
-#: storage/buffer/bufmgr.c:366
+#: utils/adt/array_userfuncs.c:301
 msgid ""
-"This has been seen to occur with buggy kernels; consider updating your "
-"system."
+"Arrays with differing element dimensions are not compatible for "
+"concatenation."
 msgstr ""
-"Isso tem ocorrido com kernels contendo bugs; considere atualizar seu sistema."
+"Matrizes com dimensões de elementos diferentes não são compatíveis para "
+"concatenação."
 
-#: storage/buffer/bufmgr.c:438
-#, c-format
-msgid "invalid page header in block %u of relation %s; zeroing out page"
+#: utils/adt/array_userfuncs.c:330 utils/adt/array_userfuncs.c:358
+msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr ""
-"cabeçalho de página é inválido no bloco %u da relação %s; zerando página"
+"Matrizes com dimensões diferentes não são compatíveis para concatenação."
 
-#: storage/buffer/bufmgr.c:446
+#: utils/adt/array_userfuncs.c:426 utils/adt/arrayfuncs.c:1238
+#: utils/adt/arrayfuncs.c:2911 utils/adt/arrayfuncs.c:4936
 #, c-format
-msgid "invalid page header in block %u of relation %s"
-msgstr "cabeçalho de página é inválido no bloco %u da relação %s"
+msgid "invalid number of dimensions: %d"
+msgstr "número de dimensões é inválido: %d"
+
+#: utils/adt/array_userfuncs.c:487
+msgid "could not determine input data type"
+msgstr "não pôde determinar tipo de dado de entrada"
 
-#: storage/buffer/bufmgr.c:2706
+#: utils/adt/nabstime.c:160
 #, c-format
-msgid "could not write block %u of %s"
-msgstr "não pôde escrever bloco %u de %s"
+msgid "invalid time zone name: \"%s\""
+msgstr "nome de zona horária é inválido: \"%s\""
 
-#: storage/buffer/bufmgr.c:2708
-msgid "Multiple failures --- write error might be permanent."
-msgstr "Falhas múltiplas --- erro de escrita pode ser permanente."
+#: utils/adt/nabstime.c:506 utils/adt/nabstime.c:579
+msgid "cannot convert abstime \"invalid\" to timestamp"
+msgstr "não pode converter abstime \"invalid\" para timestamp"
+
+#: utils/adt/nabstime.c:806
+msgid "invalid status in external \"tinterval\" value"
+msgstr "status inválido no valor de \"tinterval\" externo"
+
+#: utils/adt/nabstime.c:880
+msgid "cannot convert reltime \"invalid\" to interval"
+msgstr "não pode converter reltime \"invalid\" em interval"
 
-#: storage/buffer/bufmgr.c:2729
+#: utils/adt/nabstime.c:1575
 #, c-format
-msgid "writing block %u of relation %s"
-msgstr "escrevendo bloco %u da relação %s"
+msgid "invalid input syntax for type tinterval: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo tinterval: \"%s\""
 
-#: storage/buffer/localbuf.c:189
-msgid "no empty local buffer available"
-msgstr "nenhum buffer local vazio está disponível"
+#: utils/adt/formatting.c:492
+msgid "invalid format specification for an interval value"
+msgstr "especificação do formato é inválida para um valor interval"
 
-#: catalog/index.c:582
-msgid "user-defined indexes on system catalog tables are not supported"
-msgstr ""
-"índices definidos pelo usuário nas tabelas de catálogo do sistema não são "
-"suportados"
+#: utils/adt/formatting.c:493
+msgid "Intervals are not tied to specific calendar dates."
+msgstr "Intervalos não estão presos a datas específicas do calendário."
 
-#: catalog/index.c:592
-msgid "concurrent index creation on system catalog tables is not supported"
-msgstr ""
-"criação de índices concorrentes nas tabelas de catálogo do sistema não são "
-"suportados"
+#: utils/adt/formatting.c:1060
+msgid "\"EEEE\" must be the last pattern used"
+msgstr "\"EEEE\" deve ser o último padrão utilizado"
 
-#: catalog/index.c:610
-msgid "shared indexes cannot be created after initdb"
-msgstr "índices compartilhados não podem ser criados depois do initdb"
+#: utils/adt/formatting.c:1068
+msgid "\"9\" must be ahead of \"PR\""
+msgstr "\"9\" deve estar a frente de \"PR\""
 
-#: catalog/index.c:2430
-msgid "cannot reindex temporary tables of other sessions"
-msgstr "não pode reindexar tabelas temporárias de outras sessões"
+#: utils/adt/formatting.c:1084
+msgid "\"0\" must be ahead of \"PR\""
+msgstr "\"0\" deve estar a frente de \"PR\""
 
-#: catalog/aclchk.c:196
-msgid "grant options can only be granted to roles"
-msgstr "opções de concessão só podem ser concedidas a roles"
+#: utils/adt/formatting.c:1110
+msgid "multiple decimal points"
+msgstr "múltiplos separadores decimais"
 
-#: catalog/aclchk.c:312
-#, c-format
-msgid "no privileges were granted for column \"%s\" of relation \"%s\""
-msgstr "nenhum privilégio foi concedido a coluna \"%s\" da relação \"%s\""
+#: utils/adt/formatting.c:1114 utils/adt/formatting.c:1197
+msgid "cannot use \"V\" and decimal point together"
+msgstr "não pode utilizar \"V\" e separador decimal juntos"
 
-#: catalog/aclchk.c:317
-#, c-format
-msgid "no privileges were granted for \"%s\""
-msgstr "nenhum privilégio foi concedido a \"%s\""
+#: utils/adt/formatting.c:1126
+msgid "cannot use \"S\" twice"
+msgstr "não pode utilizar \"S\" duas vezes"
+
+#: utils/adt/formatting.c:1130
+msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
+msgstr "não pode utilizar \"S\" e \"PL\"/\"MI\"/\"SG\"/\"PR\" juntos"
+
+#: utils/adt/formatting.c:1150
+msgid "cannot use \"S\" and \"MI\" together"
+msgstr "não pode utilizar \"S\" e \"MI\" juntos"
 
-#: catalog/aclchk.c:325
-#, c-format
-msgid "not all privileges were granted for column \"%s\" of relation \"%s\""
-msgstr ""
-"nem todos privilégios foram concedidos a coluna \"%s\" da relação \"%s\""
+#: utils/adt/formatting.c:1160
+msgid "cannot use \"S\" and \"PL\" together"
+msgstr "não pode utilizar \"S\" e \"PL\" juntos"
 
-#: catalog/aclchk.c:330
-#, c-format
-msgid "not all privileges were granted for \"%s\""
-msgstr "nem todos privilégios foram concedidos a \"%s\""
+#: utils/adt/formatting.c:1170
+msgid "cannot use \"S\" and \"SG\" together"
+msgstr "não pode utilizar \"S\" e \"SG\" juntos"
 
-#: catalog/aclchk.c:341
-#, c-format
-msgid "no privileges could be revoked for column \"%s\" of relation \"%s\""
-msgstr "nenhum privilégio pôde ser revogado da coluna \"%s\" da relação \"%s\""
+#: utils/adt/formatting.c:1179
+msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
+msgstr "não pode utilizar \"PR\" e \"S\"/\"PL\"/\"MI\"/\"SG\" juntos"
 
-#: catalog/aclchk.c:346
-#, c-format
-msgid "no privileges could be revoked for \"%s\""
-msgstr "nenhum privilégio pôde ser revogado de \"%s\""
+#: utils/adt/formatting.c:1205
+msgid "cannot use \"EEEE\" twice"
+msgstr "não pode utilizar \"EEEE\" duas vezes"
 
-#: catalog/aclchk.c:354
-#, c-format
+#: utils/adt/formatting.c:1211
+msgid "\"EEEE\" is incompatible with other formats"
+msgstr "\"EEEE\" é imcompatível com outros formatos"
+
+#: utils/adt/formatting.c:1212
 msgid ""
-"not all privileges could be revoked for column \"%s\" of relation \"%s\""
+"\"EEEE\" may only be used together with digit and decimal point patterns."
 msgstr ""
-"nem todos privilégios podem ser revogados da coluna \"%s\" da relação \"%s\""
-
-#: catalog/aclchk.c:359
-#, c-format
-msgid "not all privileges could be revoked for \"%s\""
-msgstr "nem todos privilégios podem ser revogados de \"%s\""
+"\"EEEE\" só pode ser utilizado em conjunto com padrões de dígitos e decimais."
 
-#: catalog/aclchk.c:438 catalog/aclchk.c:927
+#: utils/adt/formatting.c:1412
 #, c-format
-msgid "invalid privilege type %s for relation"
-msgstr "tipo de privilégio %s é inválido para relação"
+msgid "\"%s\" is not a number"
+msgstr "\"%s\" não é um número"
 
-#: catalog/aclchk.c:442 catalog/aclchk.c:931
-#, c-format
-msgid "invalid privilege type %s for sequence"
-msgstr "tipo de privilégio %s é inválido para sequência"
+#: utils/adt/formatting.c:1519 utils/adt/formatting.c:1569
+msgid "could not determine which collation to use for lower() function"
+msgstr "não pôde determinar qual ordenação utilizar na função lower()"
 
-#: catalog/aclchk.c:446
-#, c-format
-msgid "invalid privilege type %s for database"
-msgstr "tipo de privilégio %s é inválido para banco de dados"
+#: utils/adt/formatting.c:1640 utils/adt/formatting.c:1690
+msgid "could not determine which collation to use for upper() function"
+msgstr "não pôde determinar qual ordenação utilizar na função upper()"
 
-#: catalog/aclchk.c:450 catalog/aclchk.c:935
-#, c-format
-msgid "invalid privilege type %s for function"
-msgstr "tipo de privilégio %s é inválido para função"
+#: utils/adt/formatting.c:1773 utils/adt/formatting.c:1835
+msgid "could not determine which collation to use for initcap() function"
+msgstr "não pôde determinar qual ordenação utilizar na função initcap()"
 
-#: catalog/aclchk.c:454
-#, c-format
-msgid "invalid privilege type %s for language"
-msgstr "tipo de privilégio %s é inválido para linguagem"
+#: utils/adt/formatting.c:2017
+msgid "invalid combination of date conventions"
+msgstr "combinação inválida de convenções do tipo date"
 
-#: catalog/aclchk.c:458
-#, c-format
-msgid "invalid privilege type %s for large object"
-msgstr "tipo de privilégio %s é inválido para objeto grande"
+#: utils/adt/formatting.c:2018
+msgid ""
+"Do not mix Gregorian and ISO week date conventions in a formatting template."
+msgstr ""
+"Não misture convenções de data Gregoriana e ISO em um modelo de formatação."
 
-#: catalog/aclchk.c:462
+#: utils/adt/formatting.c:2035
 #, c-format
-msgid "invalid privilege type %s for schema"
-msgstr "tipo de privilégio %s é inválido para esquema"
+msgid "conflicting values for \"%s\" field in formatting string"
+msgstr ""
+"valores conflitantes para campo \"%s\" na cadeia de caracteres de formatação"
 
-#: catalog/aclchk.c:466
-#, c-format
-msgid "invalid privilege type %s for tablespace"
-msgstr "tipo de privilégio %s é inválido para tablespace"
+#: utils/adt/formatting.c:2037
+msgid "This value contradicts a previous setting for the same field type."
+msgstr ""
+"Este valor contradiz a configuração anterior para o mesmo tipo de campo."
 
-#: catalog/aclchk.c:470
+#: utils/adt/formatting.c:2098
 #, c-format
-msgid "invalid privilege type %s for foreign-data wrapper"
-msgstr "tipo de privilégio %s é inválido para adaptador de dados externo"
+msgid "source string too short for \"%s\" formatting field"
+msgstr ""
+"cadeia de carateres fonte é muito curta para campo de formatação \"%s\""
 
-#: catalog/aclchk.c:474
+#: utils/adt/formatting.c:2100
 #, c-format
-msgid "invalid privilege type %s for foreign server"
-msgstr "tipo de privilégio %s é inválido para servidor externo"
-
-#: catalog/aclchk.c:513
-msgid "column privileges are only valid for relations"
-msgstr "privilégios de coluna só são válidos para relações"
+msgid "Field requires %d characters, but only %d remain."
+msgstr "Campo requer %d caracteres, mas só restam %d."
 
-#: catalog/aclchk.c:968
-msgid "default privileges cannot be set for columns"
-msgstr "privilégios padrão não podem ser definidos para colunas"
+#: utils/adt/formatting.c:2103 utils/adt/formatting.c:2117
+msgid ""
+"If your source string is not fixed-width, try using the \"FM\" modifier."
+msgstr ""
+"Se sua cadeia de carateres fonte não tem tamanho fixo, tente utilizar o "
+"modificador \"FM\"."
 
-#: catalog/aclchk.c:1767
+#: utils/adt/formatting.c:2113 utils/adt/formatting.c:2126
+#: utils/adt/formatting.c:2256
 #, c-format
-msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
-msgstr "sequência \"%s\" só suporta privilégios USAGE, SELECT e UPDATE"
-
-#: catalog/aclchk.c:1784
-msgid "invalid privilege type USAGE for table"
-msgstr "tipo de privilégio USAGE é inválido para tabela"
+msgid "invalid value \"%s\" for \"%s\""
+msgstr "valor \"%s\" inválido para \"%s\""
 
-#: catalog/aclchk.c:1934
+#: utils/adt/formatting.c:2115
 #, c-format
-msgid "invalid privilege type %s for column"
-msgstr "tipo de privilégio %s é inválido para coluna"
+msgid "Field requires %d characters, but only %d could be parsed."
+msgstr "Campo requer %d caracteres, mas somente %d puderam ser analisados."
 
-#: catalog/aclchk.c:1947
-#, c-format
-msgid "sequence \"%s\" only supports SELECT column privileges"
-msgstr "sequência \"%s\" só suporta privilégios SELECT"
+#: utils/adt/formatting.c:2128
+msgid "Value must be an integer."
+msgstr "Valor deve ser um inteiro."
 
-#: catalog/aclchk.c:2531
+#: utils/adt/formatting.c:2133
 #, c-format
-msgid "language \"%s\" is not trusted"
-msgstr "linguagem \"%s\" não é confiável"
-
-#: catalog/aclchk.c:2533
-msgid "Only superusers can use untrusted languages."
-msgstr "Somente super-usuários podem utilizar linguagens não-confiáveis."
+msgid "value for \"%s\" in source string is out of range"
+msgstr "valor para \"%s\" na cadeia de caracteres fonte está fora do intervalo"
 
-#: catalog/aclchk.c:3040
+#: utils/adt/formatting.c:2135
 #, c-format
-msgid "unrecognized privilege type \"%s\""
-msgstr "tipo de privilégio \"%s\" desconhecido"
+msgid "Value must be in the range %d to %d."
+msgstr "Valor deve estar no intervalo de %d a %d."
 
-#: catalog/aclchk.c:3089
-#, c-format
-msgid "permission denied for column %s"
-msgstr "permissão negada para coluna %s"
+#: utils/adt/formatting.c:2258
+msgid "The given value did not match any of the allowed values for this field."
+msgstr ""
+"O valor informado não corresponde a nenhum dos valores permitidos para este "
+"campo."
 
-#: catalog/aclchk.c:3091
-#, c-format
-msgid "permission denied for relation %s"
-msgstr "permissão negada para relação %s"
+#: utils/adt/formatting.c:2814
+msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
+msgstr "formatos \"TZ\"/\"tz\" não são suportadas em to_date"
 
-#: catalog/aclchk.c:3095
-#, c-format
-msgid "permission denied for database %s"
-msgstr "permissão negada para banco de dados %s"
+#: utils/adt/formatting.c:2918
+msgid "invalid input string for \"Y,YYY\""
+msgstr "cadeia de caracteres de entrada é inválida para \"Y,YYY\""
 
-#: catalog/aclchk.c:3097
+#: utils/adt/formatting.c:3435
 #, c-format
-msgid "permission denied for function %s"
-msgstr "permissão negada para função %s"
+msgid "hour \"%d\" is invalid for the 12-hour clock"
+msgstr "hora \"%d\" é inválido para relógio de 12 horas"
 
-#: catalog/aclchk.c:3099
-#, c-format
-msgid "permission denied for operator %s"
-msgstr "permissão negada para operador %s"
+#: utils/adt/formatting.c:3437
+msgid "Use the 24-hour clock, or give an hour between 1 and 12."
+msgstr "Utilize um relógio de 24 horas ou informe uma hora entre 1 e 12."
 
-#: catalog/aclchk.c:3101
+#: utils/adt/formatting.c:3475
 #, c-format
-msgid "permission denied for type %s"
-msgstr "permissão negada para tipo %s"
+msgid "inconsistent use of year %04d and \"BC\""
+msgstr "uso inconsistente do ano %04d e \"BC\""
 
-#: catalog/aclchk.c:3103
-#, c-format
-msgid "permission denied for language %s"
-msgstr "permissão negada para linguagem %s"
+#: utils/adt/formatting.c:3522
+msgid "cannot calculate day of year without year information"
+msgstr "não pode calcular dia do ano sem a informação do ano"
 
-#: catalog/aclchk.c:3105
-#, c-format
-msgid "permission denied for large object %s"
-msgstr "permissão negada para objeto grande %s"
+#: utils/adt/formatting.c:4384
+msgid "\"EEEE\" not supported for input"
+msgstr "\"EEEE\" não é suportado na entrada"
 
-#: catalog/aclchk.c:3107
-#, c-format
-msgid "permission denied for schema %s"
-msgstr "permissão negada para esquema %s"
+#: utils/adt/formatting.c:4396
+msgid "\"RN\" not supported for input"
+msgstr "\"RN\" não é suportado na entrada"
 
-#: catalog/aclchk.c:3109
-#, c-format
-msgid "permission denied for operator class %s"
-msgstr "permissão negada para classe de operadores %s"
+#: utils/adt/tsquery_cleanup.c:285
+msgid ""
+"text-search query contains only stop words or doesn't contain lexemes, "
+"ignored"
+msgstr ""
+"consulta de busca textual contém somente palavras ignoradas ou não contém "
+"lexemas, ignorada"
 
-#: catalog/aclchk.c:3111
+#: utils/adt/oid.c:43 utils/adt/oid.c:57 utils/adt/oid.c:63 utils/adt/oid.c:84
 #, c-format
-msgid "permission denied for operator family %s"
-msgstr "permissão negada para família de operadores %s"
+msgid "invalid input syntax for type oid: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo oid: \"%s\""
 
-#: catalog/aclchk.c:3113
+#: utils/adt/oid.c:69 utils/adt/oid.c:107
 #, c-format
-msgid "permission denied for conversion %s"
-msgstr "permissão negada para conversão %s"
+msgid "value \"%s\" is out of range for type oid"
+msgstr "valor \"%s\" está fora do intervalo para tipo oid"
 
-#: catalog/aclchk.c:3115
-#, c-format
-msgid "permission denied for tablespace %s"
-msgstr "permissão negada para tablespace %s"
+#: utils/adt/oid.c:212 utils/adt/oid.c:293 utils/adt/int.c:243
+msgid "oidvector has too many elements"
+msgstr "oidvector tem muitos elementos"
 
-#: catalog/aclchk.c:3117
-#, c-format
-msgid "permission denied for text search dictionary %s"
-msgstr "permissão negada para dicionário de busca textual %s"
+#: utils/adt/oid.c:287
+msgid "invalid oidvector data"
+msgstr "dado oidvector inválido"
 
-#: catalog/aclchk.c:3119
+#: utils/adt/timestamp.c:97
 #, c-format
-msgid "permission denied for text search configuration %s"
-msgstr "permissão negada para configuração de busca textual %s"
+msgid "TIMESTAMP(%d)%s precision must not be negative"
+msgstr "precisão do TIMESTAMP(%d)%s não deve ser negativa"
 
-#: catalog/aclchk.c:3121
+#: utils/adt/timestamp.c:103
 #, c-format
-msgid "permission denied for foreign-data wrapper %s"
-msgstr "permissão negada para adaptador de dados externo %s"
+msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
+msgstr "precisão do TIMESTAMP(%d)%s reduzida ao máximo permitido, %d"
 
-#: catalog/aclchk.c:3123
+#: utils/adt/timestamp.c:171 utils/adt/timestamp.c:435
 #, c-format
-msgid "permission denied for foreign server %s"
-msgstr "permissão negada para servidor externo %s"
+msgid "timestamp out of range: \"%s\""
+msgstr "timestamp fora do intervalo: \"%s\""
 
-#: catalog/aclchk.c:3129 catalog/aclchk.c:3131
+#: utils/adt/timestamp.c:189 utils/adt/timestamp.c:453
+#: utils/adt/timestamp.c:664
 #, c-format
-msgid "must be owner of relation %s"
-msgstr "deve ser o dono da relação %s"
+msgid "date/time value \"%s\" is no longer supported"
+msgstr "valor de data/hora \"%s\" não é mais suportado"
 
-#: catalog/aclchk.c:3133
-#, c-format
-msgid "must be owner of sequence %s"
-msgstr "deve ser o dono da sequência %s"
+#: utils/adt/timestamp.c:260
+msgid "timestamp cannot be NaN"
+msgstr "timestamp não pode ser NaN"
 
-#: catalog/aclchk.c:3135
+#: utils/adt/timestamp.c:370
 #, c-format
-msgid "must be owner of database %s"
-msgstr "deve ser o dono do banco de dados %s"
+msgid "timestamp(%d) precision must be between %d and %d"
+msgstr "precisão do timestamp(%d) deve ser entre %d e %d"
 
-#: catalog/aclchk.c:3137
-#, c-format
-msgid "must be owner of function %s"
-msgstr "deve ser o dono da função %s"
+#: utils/adt/timestamp.c:658 utils/adt/timestamp.c:3109
+#: utils/adt/timestamp.c:3239 utils/adt/timestamp.c:3624
+msgid "interval out of range"
+msgstr "interval fora do intervalo"
 
-#: catalog/aclchk.c:3139
-#, c-format
-msgid "must be owner of operator %s"
-msgstr "deve ser o dono do operador %s"
+#: utils/adt/timestamp.c:787 utils/adt/timestamp.c:820
+msgid "invalid INTERVAL type modifier"
+msgstr "modificador do tipo INTERVAL é inválido"
 
-#: catalog/aclchk.c:3141
+#: utils/adt/timestamp.c:803
 #, c-format
-msgid "must be owner of type %s"
-msgstr "deve ser o dono do tipo %s"
+msgid "INTERVAL(%d) precision must not be negative"
+msgstr "precisão de INTERVAL(%d) não deve ser negativa"
 
-#: catalog/aclchk.c:3143
+#: utils/adt/timestamp.c:809
 #, c-format
-msgid "must be owner of language %s"
-msgstr "deve ser o dono da linguagem %s"
+msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
+msgstr "precisão de INTERVAL(%d) reduzida ao máximo permitido, %d"
 
-#: catalog/aclchk.c:3145
+#: utils/adt/timestamp.c:1101
 #, c-format
-msgid "must be owner of large object %s"
-msgstr "deve ser o dono do objeto grande %s"
+msgid "interval(%d) precision must be between %d and %d"
+msgstr "precisão de interval(%d) deve ser entre %d e %d"
 
-#: catalog/aclchk.c:3147
-#, c-format
-msgid "must be owner of schema %s"
-msgstr "deve ser o dono do esquema %s"
+#: utils/adt/timestamp.c:2306
+msgid "cannot subtract infinite timestamps"
+msgstr "não pode subtrair timestamps infinitos"
 
-#: catalog/aclchk.c:3149
+#: utils/adt/timestamp.c:3365 utils/adt/timestamp.c:3961
+#: utils/adt/timestamp.c:4020
 #, c-format
-msgid "must be owner of operator class %s"
-msgstr "deve ser o dono da classe de operadores %s"
+msgid "timestamp units \"%s\" not supported"
+msgstr "unidades do timestamp \"%s\" não são suportadas"
 
-#: catalog/aclchk.c:3151
+#: utils/adt/timestamp.c:3379 utils/adt/timestamp.c:4030
 #, c-format
-msgid "must be owner of operator family %s"
-msgstr "deve ser o dono da família de operadores %s"
+msgid "timestamp units \"%s\" not recognized"
+msgstr "unidades do timestamp \"%s\" são desconhecidas"
 
-#: catalog/aclchk.c:3153
+#: utils/adt/timestamp.c:3520 utils/adt/timestamp.c:4192
+#: utils/adt/timestamp.c:4233
 #, c-format
-msgid "must be owner of conversion %s"
-msgstr "deve ser o dono da conversão %s"
+msgid "timestamp with time zone units \"%s\" not supported"
+msgstr "unidades de timestamp with time zone \"%s\" não são suportadas"
 
-#: catalog/aclchk.c:3155
+#: utils/adt/timestamp.c:3537 utils/adt/timestamp.c:4242
 #, c-format
-msgid "must be owner of tablespace %s"
-msgstr "deve ser o dono da tablespace %s"
+msgid "timestamp with time zone units \"%s\" not recognized"
+msgstr "unidades de timestamp with time zone \"%s\" são desconhecidas"
 
-#: catalog/aclchk.c:3157
+#: utils/adt/timestamp.c:3617 utils/adt/timestamp.c:4348
 #, c-format
-msgid "must be owner of text search dictionary %s"
-msgstr "deve ser o dono do dicionário de busca textual %s"
+msgid "interval units \"%s\" not supported"
+msgstr "unidades de interval \"%s\" não são suportadas"
 
-#: catalog/aclchk.c:3159
+#: utils/adt/timestamp.c:3633 utils/adt/timestamp.c:4375
 #, c-format
-msgid "must be owner of text search configuration %s"
-msgstr "deve ser o dono da configuração de busca textual %s"
+msgid "interval units \"%s\" not recognized"
+msgstr "unidades de interval \"%s\" são desconhecidas"
 
-#: catalog/aclchk.c:3161
+#: utils/adt/timestamp.c:4445 utils/adt/timestamp.c:4618
 #, c-format
-msgid "must be owner of foreign-data wrapper %s"
-msgstr "deve ser dono de adaptador de dados externo %s"
+msgid "could not convert to time zone \"%s\""
+msgstr "não pôde converter para zona horária \"%s\""
 
-#: catalog/aclchk.c:3163
+#: utils/adt/timestamp.c:4452 utils/adt/timestamp.c:4625
+#: utils/adt/datetime.c:928 utils/adt/datetime.c:1663 utils/adt/date.c:2632
 #, c-format
-msgid "must be owner of foreign server %s"
-msgstr "deve ser o dono de servidor externo %s"
+msgid "time zone \"%s\" not recognized"
+msgstr "zona horária \"%s\" é desconhecida"
 
-#: catalog/aclchk.c:3205
+#: utils/adt/timestamp.c:4477 utils/adt/timestamp.c:4651
 #, c-format
-msgid "permission denied for column \"%s\" of relation \"%s\""
-msgstr "permissão negada para coluna \"%s\" da relação \"%s\""
+msgid "interval time zone \"%s\" must not specify month"
+msgstr "zona horária de interval \"%s\" não deve especificar o mês"
 
-#: catalog/aclchk.c:3232
-#, c-format
-msgid "role with OID %u does not exist"
-msgstr "role com OID %u não existe"
+#: utils/adt/timestamp.c:4712 utils/adt/timestamp.c:4793 utils/adt/int8.c:1373
+#: utils/adt/int.c:1345
+msgid "step size cannot equal zero"
+msgstr "tamanho do passo não pode ser zero"
 
-#: catalog/aclchk.c:3325 catalog/aclchk.c:3333
-#, c-format
-msgid "attribute %d of relation with OID %u does not exist"
-msgstr "atributo %d da relação com OID %u não existe"
+#: utils/adt/tsvector_op.c:1173
+msgid "ts_stat query must return one tsvector column"
+msgstr "consulta ts_stat deve retornar uma coluna tsvector"
 
-#: catalog/aclchk.c:3406 catalog/aclchk.c:4226
+#: utils/adt/tsvector_op.c:1353
 #, c-format
-msgid "relation with OID %u does not exist"
-msgstr "relação com OID %u não existe"
+msgid "tsvector column \"%s\" does not exist"
+msgstr "coluna tsvector \"%s\" não existe"
 
-#: catalog/aclchk.c:3608 catalog/aclchk.c:4330
+#: utils/adt/tsvector_op.c:1359
 #, c-format
-msgid "language with OID %u does not exist"
-msgstr "linguagem com OID %u não existe"
+msgid "column \"%s\" is not of tsvector type"
+msgstr "coluna \"%s\" não é do tipo tsvector"
 
-#: catalog/aclchk.c:3769 catalog/aclchk.c:4402
+#: utils/adt/tsvector_op.c:1371
 #, c-format
-msgid "schema with OID %u does not exist"
-msgstr "esquema com OID %u não existe"
+msgid "configuration column \"%s\" does not exist"
+msgstr "coluna de configuração \"%s\" não existe"
 
-#: catalog/aclchk.c:3823 catalog/aclchk.c:4429
+#: utils/adt/tsvector_op.c:1377
 #, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "tablespace com OID %u não existe"
+msgid "column \"%s\" is not of regconfig type"
+msgstr "coluna \"%s\" não é do tipo regconfig"
 
-#: catalog/aclchk.c:3881
+#: utils/adt/tsvector_op.c:1384
 #, c-format
-msgid "foreign-data wrapper with OID %u does not exist"
-msgstr "adaptador de dados externo com OID %u não existe"
+msgid "configuration column \"%s\" must not be null"
+msgstr "coluna de configuração \"%s\" não deve ser nulo"
 
-#: catalog/aclchk.c:3942 catalog/aclchk.c:4563
+#: utils/adt/tsvector_op.c:1397
 #, c-format
-msgid "foreign server with OID %u does not exist"
-msgstr "servidor externo com OID %u não existe"
+msgid "text search configuration name \"%s\" must be schema-qualified"
+msgstr ""
+"nome da configuração de busca textual \"%s\" deve ser qualificada pelo "
+"esquema"
 
-#: catalog/aclchk.c:4252
+#: utils/adt/tsvector_op.c:1422
 #, c-format
-msgid "type with OID %u does not exist"
-msgstr "tipo com OID %u não existe"
+msgid "column \"%s\" is not of a character type"
+msgstr "coluna \"%s\" não é do tipo caracter"
 
-#: catalog/aclchk.c:4278
+#: utils/adt/cash.c:237
 #, c-format
-msgid "operator with OID %u does not exist"
-msgstr "operador com OID %u não existe"
+msgid "invalid input syntax for type money: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo money: \"%s\""
 
-#: catalog/aclchk.c:4455
+#: utils/adt/numeric.c:473 utils/adt/numeric.c:500 utils/adt/numeric.c:3275
+#: utils/adt/numeric.c:3298 utils/adt/numeric.c:3322 utils/adt/numeric.c:3329
 #, c-format
-msgid "operator class with OID %u does not exist"
-msgstr "classe de operadores com OID %u não existe"
+msgid "invalid input syntax for type numeric: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo numeric: \"%s\""
 
-#: catalog/aclchk.c:4482
-#, c-format
-msgid "operator family with OID %u does not exist"
-msgstr "família de operadores com OID %u não existe"
+#: utils/adt/numeric.c:653
+msgid "invalid length in external \"numeric\" value"
+msgstr "tamanho inválido no valor de \"numeric\" externo"
 
-#: catalog/aclchk.c:4509
-#, c-format
-msgid "text search dictionary with OID %u does not exist"
-msgstr "dicionário de busca textual com OID %u não existe"
+#: utils/adt/numeric.c:664
+msgid "invalid sign in external \"numeric\" value"
+msgstr "sinal inválido no valor de \"numeric\" externo"
 
-#: catalog/aclchk.c:4536
-#, c-format
-msgid "text search configuration with OID %u does not exist"
-msgstr "configuração de busca textual com OID %u não existe"
+#: utils/adt/numeric.c:674
+msgid "invalid digit in external \"numeric\" value"
+msgstr "dígito inválido no valor de \"numeric\" externo"
 
-#: catalog/aclchk.c:4616
+#: utils/adt/numeric.c:814 utils/adt/numeric.c:828
 #, c-format
-msgid "conversion with OID %u does not exist"
-msgstr "conversão com OID %u não existe"
+msgid "NUMERIC precision %d must be between 1 and %d"
+msgstr "precisão do NUMERIC %d deve ser entre 1 e %d"
 
-#: catalog/pg_operator.c:220 catalog/pg_operator.c:358
+#: utils/adt/numeric.c:819
 #, c-format
-msgid "\"%s\" is not a valid operator name"
-msgstr "\"%s\" não é um nome de operador válido"
+msgid "NUMERIC scale %d must be between 0 and precision %d"
+msgstr "escala do NUMERIC %d deve ser entre 0 e precisão %d"
 
-#: catalog/pg_operator.c:367
-msgid "only binary operators can have commutators"
-msgstr "somente operadores binários podem ter comutadores"
+#: utils/adt/numeric.c:837
+msgid "invalid NUMERIC type modifier"
+msgstr "modificador de tipo NUMERIC é inválido"
 
-#: catalog/pg_operator.c:371
-msgid "only binary operators can have join selectivity"
-msgstr "somente operadores binários podem ter seletividade de junção"
+#: utils/adt/numeric.c:1881 utils/adt/numeric.c:3754
+msgid "value overflows numeric format"
+msgstr "valor excede formato numeric"
 
-#: catalog/pg_operator.c:375
-msgid "only binary operators can merge join"
-msgstr ""
-"somente operadores binários podem ser utilizados em junção por mesclagem"
+#: utils/adt/numeric.c:2229
+msgid "cannot convert NaN to integer"
+msgstr "não pode converter NaN para inteiro"
 
-#: catalog/pg_operator.c:379
-msgid "only binary operators can hash"
-msgstr "somente operadores binários podem ser utilizados no hash"
+#: utils/adt/numeric.c:2297
+msgid "cannot convert NaN to bigint"
+msgstr "não pode converter NaN para bigint"
 
-#: catalog/pg_operator.c:390
-msgid "only boolean operators can have negators"
-msgstr "somente operadores booleanos podem ter negadores"
+#: utils/adt/numeric.c:2306 utils/adt/varbit.c:1583 utils/adt/int8.c:500
+#: utils/adt/int8.c:529 utils/adt/int8.c:550 utils/adt/int8.c:580
+#: utils/adt/int8.c:612 utils/adt/int8.c:630 utils/adt/int8.c:679
+#: utils/adt/int8.c:696 utils/adt/int8.c:765 utils/adt/int8.c:786
+#: utils/adt/int8.c:813 utils/adt/int8.c:844 utils/adt/int8.c:865
+#: utils/adt/int8.c:886 utils/adt/int8.c:913 utils/adt/int8.c:953
+#: utils/adt/int8.c:974 utils/adt/int8.c:1001 utils/adt/int8.c:1032
+#: utils/adt/int8.c:1053 utils/adt/int8.c:1074 utils/adt/int8.c:1101
+#: utils/adt/int8.c:1274 utils/adt/int8.c:1313
+msgid "bigint out of range"
+msgstr "bigint fora do intervalo"
 
-#: catalog/pg_operator.c:394
-msgid "only boolean operators can have restriction selectivity"
-msgstr "somente operadores booleanos podem ter seletividade de restrição"
+#: utils/adt/numeric.c:2345
+msgid "cannot convert NaN to smallint"
+msgstr "não pode converter NaN para smallint"
 
-#: catalog/pg_operator.c:398
-msgid "only boolean operators can have join selectivity"
-msgstr "somente operadores booleanos podem ter seletividade de junção"
+#: utils/adt/numeric.c:3824
+msgid "numeric field overflow"
+msgstr "estouro de campo numeric"
 
-#: catalog/pg_operator.c:402
-msgid "only boolean operators can merge join"
+#: utils/adt/numeric.c:3825
+#, c-format
+msgid ""
+"A field with precision %d, scale %d must round to an absolute value less "
+"than %s%d."
 msgstr ""
-"somente operadores booleanos podem ser utilizados em junção por mesclagem"
-
-#: catalog/pg_operator.c:406
-msgid "only boolean operators can hash"
-msgstr "somente operadores booleanos podem ser utilizados no hash"
+"Um campo com precisão %d, escala %d deve arredondar para um valor absoluto "
+"menor do que %s%d."
 
-#: catalog/pg_operator.c:418
-#, c-format
-msgid "operator %s already exists"
-msgstr "operador %s já existe"
+#: utils/adt/numeric.c:5273
+msgid "argument for function \"exp\" too big"
+msgstr "argumento para função \"exp\" é muito grande"
 
-#: catalog/pg_operator.c:607
-msgid "operator cannot be its own negator or sort operator"
-msgstr "operador não pode ser seu próprio operador de negação ou de ordenação"
+#: utils/adt/like_match.c:104 utils/adt/like_match.c:164
+msgid "LIKE pattern must not end with escape character"
+msgstr "padrão de LIKE não deve terminar com caracter escape"
 
-#: catalog/pg_enum.c:70
-msgid "EnumValuesCreate() can only set a single OID"
-msgstr "EnumValuesCreate() só pode definir um único OID"
+#: utils/adt/like_match.c:289 utils/adt/regexp.c:684
+msgid "invalid escape string"
+msgstr "cadeia de caracteres de escape inválida"
 
-#: catalog/pg_enum.c:110
-#, c-format
-msgid "invalid enum label \"%s\""
-msgstr "rótulo do enum \"%s\" é inválido"
+#: utils/adt/like_match.c:290 utils/adt/regexp.c:685
+msgid "Escape string must be empty or one character."
+msgstr "Cadeia de caracteres de escape deve ser vazia ou ter um caracter."
 
-#: catalog/pg_enum.c:111
-#, c-format
-msgid "Labels must be %d characters or less."
-msgstr "Rótulos devem conter %d caracteres ou menos."
+#: utils/adt/varlena.c:737 utils/adt/varlena.c:801 utils/adt/varlena.c:945
+#: utils/adt/varlena.c:1896 utils/adt/varlena.c:1963 utils/adt/varbit.c:1004
+#: utils/adt/varbit.c:1106
+msgid "negative substring length not allowed"
+msgstr "tamanho negativo de índice não é permitido"
 
-#: catalog/toasting.c:141
-msgid "shared tables cannot be toasted after initdb"
-msgstr "tabelas compartilhadas não podem ser fatiadas após o initdb"
+#: utils/adt/varlena.c:1314
+msgid "could not determine which collation to use for string comparison"
+msgstr ""
+"não pôde determinar qual ordenação utilizar para comparação de cadeia de "
+"caracteres"
 
-#: catalog/pg_type.c:231
+#: utils/adt/varlena.c:1358 utils/adt/varlena.c:1371
 #, c-format
-msgid "invalid type internal size %d"
-msgstr "tamanho interno de tipo %d é inválido"
+msgid "could not convert string to UTF-16: error %lu"
+msgstr "não pôde converter cadeia de caracteres para UTF-16: erro %lu"
 
-#: catalog/pg_type.c:247 catalog/pg_type.c:255 catalog/pg_type.c:263
-#: catalog/pg_type.c:272
+#: utils/adt/varlena.c:1386
 #, c-format
-msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
-msgstr ""
-"alinhamento \"%c\" é inválido para tipo passado por valor de tamanho %d"
+msgid "could not compare Unicode strings: %m"
+msgstr "não pôde comparar cadeias de caracteres Unicode: %m"
 
-#: catalog/pg_type.c:279
+#: utils/adt/varlena.c:2041 utils/adt/varlena.c:2072 utils/adt/varlena.c:2108
+#: utils/adt/varlena.c:2151
 #, c-format
-msgid "internal size %d is invalid for passed-by-value type"
-msgstr "tamanho interno %d é inválido para tipo passado por valor"
+msgid "index %d out of valid range, 0..%d"
+msgstr "índice %d fora do intervalo válido, 0..%d"
 
-#: catalog/pg_type.c:288 catalog/pg_type.c:294
-#, c-format
-msgid "alignment \"%c\" is invalid for variable-length type"
-msgstr "alinhamento \"%c\" é inválido para tipo de tamanho variável"
+#: utils/adt/varlena.c:2163 utils/adt/varbit.c:1740
+msgid "new bit must be 0 or 1"
+msgstr "novo bit deve ser 0 ou 1"
 
-#: catalog/pg_type.c:302
-msgid "fixed-size types must have storage PLAIN"
-msgstr "tipos de tamanho fixo devem ter armazenamento PLAIN"
+#: utils/adt/varlena.c:2251 utils/adt/varlena.c:2256 utils/adt/regproc.c:1320
+#: utils/adt/regproc.c:1325
+msgid "invalid name syntax"
+msgstr "sintaxe de nome inválida"
 
-#: catalog/pg_type.c:730
+#: utils/adt/varlena.c:2866 utils/adt/regexp.c:275
 #, c-format
-msgid "could not form array type name for type \"%s\""
-msgstr "não pôde construir nome de tipo array para tipo \"%s\""
-
-#: catalog/catalog.c:75
-msgid "invalid fork name"
-msgstr "nome de fork inválido"
+msgid "regular expression failed: %s"
+msgstr "expressão regular falhou: %s"
 
-#: catalog/catalog.c:76
-msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
-msgstr "Nomes válidos são \"main\", \"fsm\" e \"vm\"."
+#: utils/adt/varlena.c:2959
+msgid "field position must be greater than zero"
+msgstr "posição do campo deve ser maior que zero"
 
-#: catalog/pg_constraint.c:767
-#, c-format
-msgid "table \"%s\" has multiple constraints named \"%s\""
-msgstr "tabela \"%s\" tem múltiplas restrições com nome \"%s\""
+#: utils/adt/varlena.c:3828 utils/adt/varlena.c:3889
+msgid "unterminated conversion specifier"
+msgstr "especificador de conversão foi terminado"
 
-#: catalog/pg_constraint.c:779
-#, c-format
-msgid "constraint \"%s\" for table \"%s\" does not exist"
-msgstr "restrição \"%s\" na tabela \"%s\" não existe"
+#: utils/adt/varlena.c:3852 utils/adt/varlena.c:3868
+msgid "argument number is out of range"
+msgstr "número do argumento está fora do intervalo"
 
-#: catalog/pg_shdepend.c:560 catalog/dependency.c:734
-#, c-format
-msgid "cannot drop %s because it is required by the database system"
+#: utils/adt/varlena.c:3895
+msgid "conversion specifies argument 0, but arguments are numbered from 1"
 msgstr ""
-"não pode remover %s porque ele é requerido pelo sistema de banco de dados"
+"conversão especificou argumento 0, mas argumentos são numerados a partir de 1"
 
-#: catalog/pg_shdepend.c:671 catalog/dependency.c:898
+#: utils/adt/varlena.c:3902
+msgid "too few arguments for format"
+msgstr "poucos argumentos para formato"
+
+#: utils/adt/varlena.c:3923
 #, c-format
-msgid ""
-"\n"
-"and %d other object (see server log for list)"
-msgid_plural ""
-"\n"
-"and %d other objects (see server log for list)"
-msgstr[0] ""
-"\n"
-"e %d outro objeto (veja lista no log do servidor)"
-msgstr[1] ""
-"\n"
-"e %d outros objetos (veja lista no log do servidor)"
+msgid "unrecognized conversion specifier \"%c\""
+msgstr "especificador de conversão \"%c\" desconhecido"
+
+#: utils/adt/varlena.c:3952
+msgid "null values cannot be formatted as an SQL identifier"
+msgstr "valores nulos não podem ser formatados como um identificador SQL"
+
+#: utils/adt/datum.c:80 utils/adt/datum.c:92
+msgid "invalid Datum pointer"
+msgstr "ponteiro Datum é inválido"
+
+#: utils/adt/like.c:211 utils/adt/selfuncs.c:4913
+msgid "could not determine which collation to use for ILIKE"
+msgstr "não pôde determinar qual ordenação utilizar para ILIKE"
+
+#: utils/adt/tsrank.c:404
+msgid "array of weight must be one-dimensional"
+msgstr "matriz de pesos devem ser de uma dimensão"
+
+#: utils/adt/tsrank.c:409
+msgid "array of weight is too short"
+msgstr "matriz de pesos é muito pequena"
+
+#: utils/adt/tsrank.c:414
+msgid "array of weight must not contain nulls"
+msgstr "matriz de pesos não deve conter valores nulos"
 
-#: catalog/pg_shdepend.c:678
-#, c-format
-msgid ""
-"\n"
-"and objects in %d other database (see server log for list)"
-msgid_plural ""
-"\n"
-"and objects in %d other databases (see server log for list)"
-msgstr[0] ""
-"\n"
-"e objetos em %d outro banco de dados (veja lista no log do servidor)"
-msgstr[1] ""
-"\n"
-"e objetos em %d outros bancos de dados (veja lista no log do servidor)"
+#: utils/adt/tsrank.c:423 utils/adt/tsrank.c:749
+msgid "weight out of range"
+msgstr "peso fora do intervalo"
 
-#: catalog/pg_shdepend.c:990
+#: utils/adt/ri_triggers.c:409 utils/adt/ri_triggers.c:2841
+#: utils/adt/ri_triggers.c:3535 utils/adt/ri_triggers.c:3567
 #, c-format
-msgid "role %u was concurrently dropped"
-msgstr "role %u foi removida simultaneamente"
+msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
+msgstr ""
+"inserção ou atualização em tabela \"%s\" viola restrição de chave "
+"estrangeira \"%s\""
 
-#: catalog/pg_shdepend.c:1009
-#, c-format
-msgid "tablespace %u was concurrently dropped"
-msgstr "tablespace %u foi removida simultaneamente"
+#: utils/adt/ri_triggers.c:412 utils/adt/ri_triggers.c:2844
+msgid "MATCH FULL does not allow mixing of null and nonnull key values."
+msgstr "MATCH FULL não permite mistura de valores de chaves nulas e não-nulas."
 
-#: catalog/pg_shdepend.c:1024
+#: utils/adt/ri_triggers.c:3097
 #, c-format
-msgid "database %u was concurrently dropped"
-msgstr "banco de dados %u foi removido simultaneamente"
+msgid "function \"%s\" must be fired for INSERT"
+msgstr "função \"%s\" deve ser disparada pelo INSERT"
 
-#: catalog/pg_shdepend.c:1068
+#: utils/adt/ri_triggers.c:3103
 #, c-format
-msgid "owner of %s"
-msgstr "dono de %s"
+msgid "function \"%s\" must be fired for UPDATE"
+msgstr "função \"%s\" deve ser disparada pelo UPDATE"
 
-#: catalog/pg_shdepend.c:1070
+#: utils/adt/ri_triggers.c:3117
 #, c-format
-msgid "privileges for %s"
-msgstr "privilégios para %s"
+msgid "function \"%s\" must be fired for DELETE"
+msgstr "função \"%s\" deve ser disparada pelo DELETE"
 
-#. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1078
+#: utils/adt/ri_triggers.c:3146
 #, c-format
-msgid "%d object in %s"
-msgid_plural "%d objects in %s"
-msgstr[0] "%d objeto no %s"
-msgstr[1] "%d objetos no %s"
+msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
+msgstr "nenhuma entrada em pg_constraint para gatilho \"%s\" na tabela \"%s\""
 
-#: catalog/pg_shdepend.c:1189 catalog/pg_shdepend.c:1285
-#, c-format
+#: utils/adt/ri_triggers.c:3148
 msgid ""
-"cannot drop objects owned by %s because they are required by the database "
-"system"
+"Remove this referential integrity trigger and its mates, then do ALTER TABLE "
+"ADD CONSTRAINT."
 msgstr ""
-"não pode remover objetos que pertencem a %s porque eles são requeridos pelo "
-"sistema de banco de dados"
-
-#: catalog/pg_conversion.c:66
-#, c-format
-msgid "conversion \"%s\" already exists"
-msgstr "conversão \"%s\" já existe"
+"Remova este gatilho de integridade referencial e seus pares, então faça "
+"ALTER TABLE ADD CONSTRAINT."
 
-#: catalog/pg_conversion.c:79
+#: utils/adt/ri_triggers.c:3502
 #, c-format
-msgid "default conversion for %s to %s already exists"
-msgstr "conversão padrão de %s para %s já existe"
-
-#: catalog/pg_proc.c:204 catalog/pg_aggregate.c:175
-msgid "cannot determine result data type"
-msgstr "não pode determinar tipo de dado do resultado"
-
-#: catalog/pg_proc.c:205
 msgid ""
-"A function returning a polymorphic type must have at least one polymorphic "
-"argument."
+"referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave "
+"unexpected result"
 msgstr ""
-"Uma função retornando um tipo polimórfico deve ter pelo menos um argumento "
-"polimórfico."
-
-#: catalog/pg_proc.c:210 catalog/pg_aggregate.c:188
-msgid "unsafe use of pseudo-type \"internal\""
-msgstr "uso inseguro do pseudo-tipo \"internal\""
+"consulta de integridade referencial em \"%s\" da retrição \"%s\" em \"%s\" "
+"retornou resultado inesperado"
 
-#: catalog/pg_proc.c:211 catalog/pg_aggregate.c:189
-msgid ""
-"A function returning \"internal\" must have at least one \"internal\" "
-"argument."
+#: utils/adt/ri_triggers.c:3506
+msgid "This is most likely due to a rule having rewritten the query."
 msgstr ""
-"Uma função retornando \"internal\" deve ter pelo menos um argumento "
-"\"internal\"."
+"Isso provavelmente foi causado por uma regra que reescreveu a consulta."
 
-#: catalog/pg_proc.c:223
+#: utils/adt/ri_triggers.c:3537
 #, c-format
-msgid "\"%s\" is already an attribute of type %s"
-msgstr "\"%s\" já é um atributo do tipo %s"
+msgid "No rows were found in \"%s\"."
+msgstr "Nenhum registro foi encontrado em \"%s\"."
 
-#: catalog/pg_proc.c:362
+#: utils/adt/ri_triggers.c:3569
 #, c-format
-msgid "function \"%s\" already exists with same argument types"
-msgstr "função \"%s\" já existe com os mesmos tipos de argumento"
-
-#: catalog/pg_proc.c:376 catalog/pg_proc.c:398
-msgid "cannot change return type of existing function"
-msgstr "não pode mudar o tipo de retorno da função existente"
-
-#: catalog/pg_proc.c:377 catalog/pg_proc.c:400 catalog/pg_proc.c:442
-#: catalog/pg_proc.c:465 catalog/pg_proc.c:491
-msgid "Use DROP FUNCTION first."
-msgstr "Primeiro utilize DROP FUNCTION."
-
-#: catalog/pg_proc.c:399
-msgid "Row type defined by OUT parameters is different."
-msgstr "Tipo de registro definido pelos parâmetros OUT é diferente."
+msgid "Key (%s)=(%s) is not present in table \"%s\"."
+msgstr "Chave (%s)=(%s) não está presente na tabela \"%s\"."
 
-#: catalog/pg_proc.c:440
+#: utils/adt/ri_triggers.c:3575
 #, c-format
-msgid "cannot change name of input parameter \"%s\""
-msgstr "não pode mudar nome de parâmetro de entrada \"%s\""
+msgid ""
+"update or delete on table \"%s\" violates foreign key constraint \"%s\" on "
+"table \"%s\""
+msgstr ""
+"atualização ou exclusão em tabela \"%s\" viola restrição de chave "
+"estrangeira \"%s\" em \"%s\""
 
-#: catalog/pg_proc.c:464
-msgid "cannot remove parameter defaults from existing function"
-msgstr "não pode remover valores padrão de parâmetros da função existente"
+#: utils/adt/ri_triggers.c:3578
+#, c-format
+msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
+msgstr "Chave (%s)=(%s) ainda é referenciada pela tabela \"%s\"."
 
-#: catalog/pg_proc.c:490
-msgid "cannot change data type of existing parameter default value"
-msgstr "não pode mudar o tipo de dado do valor padrão do parâmetro existente"
+#: utils/adt/datetime.c:1186 utils/adt/datetime.c:1934 utils/adt/date.c:142
+msgid "date/time value \"current\" is no longer supported"
+msgstr "valor de data/hora \"current\" não é mais suportado"
 
-#: catalog/pg_proc.c:502
+#: utils/adt/datetime.c:3532 utils/adt/datetime.c:3539
 #, c-format
-msgid "function \"%s\" is an aggregate function"
-msgstr "função \"%s\" é uma função de agregação"
+msgid "date/time field value out of range: \"%s\""
+msgstr "valor do campo date/time está fora do intervalo: \"%s\""
 
-#: catalog/pg_proc.c:507
-#, c-format
-msgid "function \"%s\" is not an aggregate function"
-msgstr "função \"%s\" não é uma função de agregação"
+#: utils/adt/datetime.c:3541
+msgid "Perhaps you need a different \"datestyle\" setting."
+msgstr "Talvez você necessite de uma definição diferente para \"datestyle\"."
 
-#: catalog/pg_proc.c:515
+#: utils/adt/datetime.c:3546
 #, c-format
-msgid "function \"%s\" is a window function"
-msgstr "função \"%s\" é uma função deslizante"
+msgid "interval field value out of range: \"%s\""
+msgstr "valor do campo interval fora do intervalo: \"%s\""
 
-#: catalog/pg_proc.c:520
+#: utils/adt/datetime.c:3552
 #, c-format
-msgid "function \"%s\" is not a window function"
-msgstr "função \"%s\" não é uma função deslizante"
+msgid "time zone displacement out of range: \"%s\""
+msgstr "deslocamento de zona horária fora do intervalo: \"%s\""
 
-#: catalog/pg_proc.c:688
+#. translator: first %s is inet or cidr
+#: utils/adt/datetime.c:3559 utils/adt/network.c:107
 #, c-format
-msgid "there is no built-in function named \"%s\""
-msgstr "não há nenhuma função embutida com nome \"%s\""
+msgid "invalid input syntax for type %s: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo %s: \"%s\""
 
-#: catalog/pg_proc.c:780
-#, c-format
-msgid "SQL functions cannot return type %s"
-msgstr "funções SQL não podem retornar tipo %s"
+#: utils/adt/misc.c:80
+msgid "must be superuser to signal other server processes"
+msgstr "deve ser super-usuário para sinalizar outros processos servidor"
 
-#: catalog/pg_proc.c:795
+#: utils/adt/misc.c:89
 #, c-format
-msgid "SQL functions cannot have arguments of type %s"
-msgstr "funções SQL não podem ter argumentos do tipo %s"
+msgid "PID %d is not a PostgreSQL server process"
+msgstr "PID %d não é um processo servidor do PostgreSQL"
 
-#: catalog/pg_depend.c:209
-#, c-format
-msgid "cannot remove dependency on %s because it is a system object"
-msgstr "não pode remover dependência em %s porque ele é um objeto do sistema"
+#: utils/adt/misc.c:126
+msgid "must be superuser to signal the postmaster"
+msgstr "deve ser super-usuário para sinalizar o postmaster"
 
-#: catalog/dependency.c:578
+#: utils/adt/misc.c:131
 #, c-format
-msgid "cannot drop %s because %s requires it"
-msgstr "não pode remover %s porque %s o requer"
+msgid "failed to send signal to postmaster: %m"
+msgstr "falhou ao enviar sinal para postmaster: %m"
 
-#: catalog/dependency.c:581
-#, c-format
-msgid "You can drop %s instead."
-msgstr "Você pode remover %s ao invés dele."
+#: utils/adt/misc.c:148
+msgid "must be superuser to rotate log files"
+msgstr "deve ser super-usuário para rotacionar arquivos de log"
 
-#: catalog/dependency.c:848
-#, c-format
-msgid "drop auto-cascades to %s"
-msgstr "removendo automaticamente %s"
+#: utils/adt/misc.c:153
+msgid "rotation not possible because log collection not active"
+msgstr "rotação não é possível porque coleta de log não está ativa"
 
-#: catalog/dependency.c:860 catalog/dependency.c:869
-#, c-format
-msgid "%s depends on %s"
-msgstr "%s depende de %s"
+#: utils/adt/misc.c:195
+msgid "global tablespace never has databases"
+msgstr "tablespace global nunca teve bancos de dados"
 
-#: catalog/dependency.c:881 catalog/dependency.c:890
+#: utils/adt/misc.c:216
 #, c-format
-msgid "drop cascades to %s"
-msgstr "removendo em cascata %s"
+msgid "%u is not a tablespace OID"
+msgstr "%u não é um OID de tablespace"
 
-#: catalog/dependency.c:910
-#, c-format
-msgid "cannot drop %s because other objects depend on it"
-msgstr "não pode remover %s porque outros objetos dependem dele"
+#: utils/adt/misc.c:352
+msgid "unreserved"
+msgstr "sem reserva"
 
-#: catalog/dependency.c:914 catalog/dependency.c:921
-msgid "Use DROP ... CASCADE to drop the dependent objects too."
-msgstr "Utilize DROP ... CASCADE para remover os objetos dependentes também."
+#: utils/adt/misc.c:356
+msgid "unreserved (cannot be function or type name)"
+msgstr "sem reserva (não pode ser nome de função ou tipo)"
 
-#: catalog/dependency.c:918
-msgid "cannot drop desired object(s) because other objects depend on them"
-msgstr ""
-"não pode remover objeto(s) desejado(s) porque outros objetos dependem dele"
+#: utils/adt/misc.c:360
+msgid "reserved (can be function or type name)"
+msgstr "reservado (pode ser nome de função ou tipo)"
 
-#. translator: %d always has a value larger than 1
-#: catalog/dependency.c:927
-#, c-format
-msgid "drop cascades to %d other object"
-msgid_plural "drop cascades to %d other objects"
-msgstr[0] "removendo em cascata %d outro objeto"
-msgstr[1] "removendo em cascata outros %d objetos"
+#: utils/adt/misc.c:364
+msgid "reserved"
+msgstr "reservado"
 
-#: catalog/dependency.c:2097
+#: utils/adt/pg_locale.c:953
 #, c-format
-msgid " column %s"
-msgstr "coluna %s"
+msgid "could not create locale \"%s\": %m"
+msgstr "não pôde criar configuração regional \"%s\": %m"
 
-#: catalog/dependency.c:2103
+#: utils/adt/pg_locale.c:956
 #, c-format
-msgid "function %s"
-msgstr "função %s"
+msgid ""
+"The operating system could not find any locale data for the locale name \"%s"
+"\"."
+msgstr ""
+"O sistema operacional não encontrou nenhum dado sobre a configuração "
+"regional para nome de configuração regional \"%s\"."
 
-#: catalog/dependency.c:2108
-#, c-format
-msgid "type %s"
-msgstr "tipo %s"
+#: utils/adt/pg_locale.c:1043
+msgid ""
+"collations with different collate and ctype values are not supported on this "
+"platform"
+msgstr ""
+"ordenações com diferentes valores de collate e ctype não são suportadas "
+"nessa plataforma"
 
-#: catalog/dependency.c:2138
-#, c-format
-msgid "cast from %s to %s"
-msgstr "converte de %s para %s"
+#: utils/adt/pg_locale.c:1058
+msgid "nondefault collations are not supported on this platform"
+msgstr "ordenações não-padrão não são suportados nessa plataforma"
 
-#: catalog/dependency.c:2165
-#, c-format
-msgid "constraint %s on %s"
-msgstr "restrição %s em %s"
+#: utils/adt/pg_locale.c:1229
+msgid "invalid multibyte character for locale"
+msgstr "caracter multibyte é inválido para configuração regional"
 
-#: catalog/dependency.c:2171
-#, c-format
-msgid "constraint %s"
-msgstr "restrição %s"
+#: utils/adt/pg_locale.c:1230
+msgid ""
+"The server's LC_CTYPE locale is probably incompatible with the database "
+"encoding."
+msgstr ""
+"A configuração regional LC_TYPE do servidor é provavelmente incompatível com "
+"a codificação de banco de dados."
 
-#: catalog/dependency.c:2188
+#: utils/adt/regexp.c:412
 #, c-format
-msgid "conversion %s"
-msgstr "conversão %s"
+msgid "invalid regexp option: \"%c\""
+msgstr "opção da expressão regular é inválida: \"%c\""
 
-#: catalog/dependency.c:2225
-#, c-format
-msgid "default for %s"
-msgstr "valor padrão para %s"
+#: utils/adt/regexp.c:884
+msgid "regexp_split does not support the global option"
+msgstr "regexp_split não suporta a opção global"
+
+#: utils/adt/oracle_compat.c:184 utils/adt/oracle_compat.c:282
+#: utils/adt/oracle_compat.c:758 utils/adt/oracle_compat.c:1048
+#: utils/adt/genfile.c:117
+msgid "requested length too large"
+msgstr "tamanho solicitado é muito grande"
+
+#: utils/adt/oracle_compat.c:895
+msgid "requested character too large"
+msgstr "tamanho solicitado é muito grande"
 
-#: catalog/dependency.c:2242
+#: utils/adt/oracle_compat.c:941 utils/adt/oracle_compat.c:995
 #, c-format
-msgid "language %s"
-msgstr "linguagem %s"
+msgid "requested character too large for encoding: %d"
+msgstr "caracter solicitado é muito grande para codificação: %d"
 
-#: catalog/dependency.c:2248
-#, c-format
-msgid "large object %u"
-msgstr "objeto grande %u"
+#: utils/adt/oracle_compat.c:988
+msgid "null character not permitted"
+msgstr "caracter nulo não é permitido"
 
-#: catalog/dependency.c:2253
-#, c-format
-msgid "operator %s"
-msgstr "operador %s"
+#: utils/adt/arrayfuncs.c:235 utils/adt/arrayfuncs.c:247
+msgid "missing dimension value"
+msgstr "faltando valor da dimensão"
 
-#: catalog/dependency.c:2285
-#, c-format
-msgid "operator class %s for access method %s"
-msgstr "classe de operadores %s para método de acesso %s"
+#: utils/adt/arrayfuncs.c:257
+msgid "missing \"]\" in array dimensions"
+msgstr "faltando \"]\" nas dimensões da matriz"
 
-#: catalog/dependency.c:2335
-#, c-format
-msgid "operator %d %s of %s"
-msgstr "operador %d %s de %s"
+#: utils/adt/arrayfuncs.c:265 utils/adt/arrayfuncs.c:2436
+#: utils/adt/arrayfuncs.c:2464 utils/adt/arrayfuncs.c:2479
+msgid "upper bound cannot be less than lower bound"
+msgstr "limite superior não pode ser menor do que limite inferior"
 
-#: catalog/dependency.c:2382
-#, c-format
-msgid "function %d %s of %s"
-msgstr "função %d %s de %s"
+#: utils/adt/arrayfuncs.c:277 utils/adt/arrayfuncs.c:303
+msgid "array value must start with \"{\" or dimension information"
+msgstr "valor da matriz deve iniciar com \"{\" ou dimensão"
 
-#: catalog/dependency.c:2419
-#, c-format
-msgid "rule %s on "
-msgstr "regra %s em "
+#: utils/adt/arrayfuncs.c:291
+msgid "missing assignment operator"
+msgstr "faltando operador de atribuição"
 
-#: catalog/dependency.c:2454
-#, c-format
-msgid "trigger %s on "
-msgstr "gatilho %s em "
+#: utils/adt/arrayfuncs.c:308 utils/adt/arrayfuncs.c:314
+msgid "array dimensions incompatible with array literal"
+msgstr "dimensões da matriz são incompatíveis com matriz"
 
-#: catalog/dependency.c:2471
+#: utils/adt/arrayfuncs.c:444 utils/adt/arrayfuncs.c:459
+#: utils/adt/arrayfuncs.c:468 utils/adt/arrayfuncs.c:482
+#: utils/adt/arrayfuncs.c:502 utils/adt/arrayfuncs.c:530
+#: utils/adt/arrayfuncs.c:535 utils/adt/arrayfuncs.c:575
+#: utils/adt/arrayfuncs.c:596 utils/adt/arrayfuncs.c:615
+#: utils/adt/arrayfuncs.c:725 utils/adt/arrayfuncs.c:734
+#: utils/adt/arrayfuncs.c:764 utils/adt/arrayfuncs.c:779
+#: utils/adt/arrayfuncs.c:832
 #, c-format
-msgid "schema %s"
-msgstr "esquema %s"
+msgid "malformed array literal: \"%s\""
+msgstr "matriz mal formada: \"%s\""
 
-#: catalog/dependency.c:2484
+#: utils/adt/arrayfuncs.c:871 utils/adt/arrayfuncs.c:1473
+#: utils/adt/arrayfuncs.c:2795 utils/adt/arrayfuncs.c:2943
+#: utils/adt/arrayfuncs.c:5036 utils/adt/arrayutils.c:93
+#: utils/adt/arrayutils.c:102 utils/adt/arrayutils.c:109
 #, c-format
-msgid "text search parser %s"
-msgstr "analisador de busca textual %s"
+msgid "array size exceeds the maximum allowed (%d)"
+msgstr "tamanho da matriz excede o máximo permitido (%d)"
 
-#: catalog/dependency.c:2499
-#, c-format
-msgid "text search dictionary %s"
-msgstr "dicionário de busca textual %s"
+#: utils/adt/arrayfuncs.c:1249
+msgid "invalid array flags"
+msgstr "marcações de matriz são inválidas"
 
-#: catalog/dependency.c:2514
-#, c-format
-msgid "text search template %s"
-msgstr "modelo de busca textual %s"
+#: utils/adt/arrayfuncs.c:1257
+msgid "wrong element type"
+msgstr "tipo de elemento incorreto"
 
-#: catalog/dependency.c:2529
+#: utils/adt/arrayfuncs.c:1307 utils/cache/lsyscache.c:2485
 #, c-format
-msgid "text search configuration %s"
-msgstr "configuração de busca textual %s"
+msgid "no binary input function available for type %s"
+msgstr "nenhuma função de entrada disponível para tipo %s"
 
-#: catalog/dependency.c:2537
+#: utils/adt/arrayfuncs.c:1447
 #, c-format
-msgid "role %s"
-msgstr "role %s"
+msgid "improper binary format in array element %d"
+msgstr "formato binário é inválido no elemento %d da matriz"
 
-#: catalog/dependency.c:2550
+#: utils/adt/arrayfuncs.c:1529 utils/cache/lsyscache.c:2518
 #, c-format
-msgid "database %s"
-msgstr "banco de dados %s"
+msgid "no binary output function available for type %s"
+msgstr "nenhuma função de saída disponível para tipo %s"
 
-#: catalog/dependency.c:2562
-#, c-format
-msgid "tablespace %s"
-msgstr "tablespace %s"
+#: utils/adt/arrayfuncs.c:1903
+msgid "slices of fixed-length arrays not implemented"
+msgstr "segmentos de matrizes de tamanho fixo não está implementado"
 
-#: catalog/dependency.c:2571
-#, c-format
-msgid "foreign-data wrapper %s"
-msgstr "adaptador de dados externo %s"
+#: utils/adt/arrayfuncs.c:2076 utils/adt/arrayfuncs.c:2098
+#: utils/adt/arrayfuncs.c:2132 utils/adt/arrayfuncs.c:2418
+#: utils/adt/arrayfuncs.c:4916 utils/adt/arrayfuncs.c:4948
+#: utils/adt/arrayfuncs.c:4965
+msgid "wrong number of array subscripts"
+msgstr "número de índices da matriz incorreto"
 
-#: catalog/dependency.c:2580
-#, c-format
-msgid "server %s"
-msgstr "servidor %s"
+#: utils/adt/arrayfuncs.c:2081 utils/adt/arrayfuncs.c:2174
+#: utils/adt/arrayfuncs.c:2469
+msgid "array subscript out of range"
+msgstr "índice da matriz está fora do intervalo"
 
-#: catalog/dependency.c:2605
-#, c-format
-msgid "user mapping for %s"
-msgstr "mapeamento de usuários para %s"
+#: utils/adt/arrayfuncs.c:2086
+msgid "cannot assign null value to an element of a fixed-length array"
+msgstr ""
+"não pode atribuir valor nulo para um elemento de matriz de tamanho fixo"
 
-#: catalog/dependency.c:2639
-#, c-format
-msgid "default privileges on new relations belonging to role %s"
-msgstr "privilégios padrão em novas relações pertencem a role %s"
+#: utils/adt/arrayfuncs.c:2372
+msgid "updates on slices of fixed-length arrays not implemented"
+msgstr ""
+"atualização em segmentos de matrizes de tamanho fixo não está implementada"
 
-#: catalog/dependency.c:2644
-#, c-format
-msgid "default privileges on new sequences belonging to role %s"
-msgstr "privilégios padrão em novas sequências pertencem a role %s"
+#: utils/adt/arrayfuncs.c:2408 utils/adt/arrayfuncs.c:2495
+msgid "source array too small"
+msgstr "matriz de origem muito pequena"
 
-#: catalog/dependency.c:2649
-#, c-format
-msgid "default privileges on new functions belonging to role %s"
-msgstr "privilégios padrão em novas funções pertencem a role %s"
+#: utils/adt/arrayfuncs.c:3050
+msgid "null array element not allowed in this context"
+msgstr "elemento nulo da matriz não é permitido neste contexto"
 
-#: catalog/dependency.c:2655
-#, c-format
-msgid "default privileges belonging to role %s"
-msgstr "privilégios padrão pertencem a role %s"
+#: utils/adt/arrayfuncs.c:3153 utils/adt/arrayfuncs.c:3361
+#: utils/adt/arrayfuncs.c:3678
+msgid "cannot compare arrays of different element types"
+msgstr "não pode comparar matrizes de tipos de elementos diferentes"
 
-#: catalog/dependency.c:2663
+#: utils/adt/arrayfuncs.c:3563
 #, c-format
-msgid " in schema %s"
-msgstr " no esquema %s"
+msgid "could not identify a hash function for type %s"
+msgstr "não pôde identificar uma função hash para tipo %s"
 
-#: catalog/dependency.c:2711
-#, c-format
-msgid "table %s"
-msgstr "tabela %s"
+#: utils/adt/arrayfuncs.c:4814 utils/adt/arrayfuncs.c:4854
+msgid "dimension array or low bound array cannot be null"
+msgstr "matriz de dimensões ou matriz de limites inferiores não pode ser nula"
 
-#: catalog/dependency.c:2715
-#, c-format
-msgid "index %s"
-msgstr "índice %s"
+#: utils/adt/arrayfuncs.c:4917 utils/adt/arrayfuncs.c:4949
+msgid "Dimension array must be one dimensional."
+msgstr "Matriz de dimensões deve ser de uma dimensão."
 
-#: catalog/dependency.c:2719
-#, c-format
-msgid "sequence %s"
-msgstr "sequência %s"
+#: utils/adt/arrayfuncs.c:4922 utils/adt/arrayfuncs.c:4954
+msgid "wrong range of array subscripts"
+msgstr "intervalo incorreto de índices da matriz"
 
-#: catalog/dependency.c:2723
-#, c-format
-msgid "uncataloged table %s"
-msgstr "tabela temporária %s"
+#: utils/adt/arrayfuncs.c:4923 utils/adt/arrayfuncs.c:4955
+msgid "Lower bound of dimension array must be one."
+msgstr "Limite inferior da matriz de dimensões deve ser um."
 
-#: catalog/dependency.c:2727
-#, c-format
-msgid "toast table %s"
-msgstr "tabela toast %s"
+#: utils/adt/arrayfuncs.c:4928 utils/adt/arrayfuncs.c:4960
+msgid "dimension values cannot be null"
+msgstr "valores de dimensão não podem ser nulos"
 
-#: catalog/dependency.c:2731
-#, c-format
-msgid "view %s"
-msgstr "visão %s"
+#: utils/adt/arrayfuncs.c:4966
+msgid "Low bound array has different size than dimensions array."
+msgstr ""
+"Matriz de limites inferiores tem tamanho diferente que a matriz de dimensões."
 
-#: catalog/dependency.c:2735
+#: utils/adt/domains.c:80
 #, c-format
-msgid "composite type %s"
-msgstr "tipo composto %s"
+msgid "type %s is not a domain"
+msgstr "tipo %s não é um domínio"
 
-#: catalog/dependency.c:2740
-#, c-format
-msgid "relation %s"
-msgstr "relação %s"
+#: utils/adt/name.c:87 utils/adt/acl.c:166
+msgid "identifier too long"
+msgstr "identificador muito longo"
 
-#: catalog/dependency.c:2777
+#: utils/adt/name.c:88 utils/adt/acl.c:167
 #, c-format
-msgid "operator family %s for access method %s"
-msgstr "família de operadores %s para método de acesso %s"
+msgid "Identifier must be less than %d characters."
+msgstr "Identificador deve ter pelo menos %d caracteres."
 
-#: catalog/namespace.c:250 catalog/namespace.c:317
-msgid "temporary tables cannot specify a schema name"
-msgstr "tabelas temporárias não podem especificar um nome de esquema"
+#: utils/adt/geo_ops.c:294 utils/adt/geo_ops.c:4251 utils/adt/geo_ops.c:5172
+msgid "too many points requested"
+msgstr "muitos pontos solicitados"
 
-#: catalog/namespace.c:358 catalog/namespace.c:2410
-msgid "no schema has been selected to create in"
-msgstr "nenhum esquema foi selecionado para criá-lo(a)"
+#: utils/adt/geo_ops.c:317
+msgid "could not format \"path\" value"
+msgstr "não pôde formatar valor de \"path\""
 
-#: catalog/namespace.c:2442
+#: utils/adt/geo_ops.c:392
 #, c-format
-msgid "improper relation name (too many dotted names): %s"
-msgstr "nome de relação é inválido (nomes com muitos pontos): %s"
+msgid "invalid input syntax for type box: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo box: \"%s\""
 
-#: catalog/namespace.c:3024
+#: utils/adt/geo_ops.c:956
 #, c-format
-msgid "permission denied to create temporary tables in database \"%s\""
-msgstr "permissão negada ao criar tabelas temporárias no banco de dados \"%s\""
+msgid "invalid input syntax for type line: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo line: \"%s\""
 
-#: catalog/namespace.c:3040
-msgid "cannot create temporary tables during recovery"
-msgstr "não pode criar tabelas temporárias durante recuperação"
+#: utils/adt/geo_ops.c:963 utils/adt/geo_ops.c:1030 utils/adt/geo_ops.c:1045
+#: utils/adt/geo_ops.c:1057
+msgid "type \"line\" not yet implemented"
+msgstr "tipo \"line\" não está implementado"
 
-#: catalog/heap.c:257
+#: utils/adt/geo_ops.c:1411 utils/adt/geo_ops.c:1434
 #, c-format
-msgid "permission denied to create \"%s.%s\""
-msgstr "permissão negada ao criar \"%s.%s\""
-
-#: catalog/heap.c:259
-msgid "System catalog modifications are currently disallowed."
-msgstr "Modificações no catálogo do sistema estão atualmente desabilitadas."
+msgid "invalid input syntax for type path: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo path: \"%s\""
 
-#: catalog/heap.c:397
-#, c-format
-msgid "column name \"%s\" conflicts with a system column name"
-msgstr "nome de coluna \"%s\" conflita com um nome de coluna do sistema"
+#: utils/adt/geo_ops.c:1473
+msgid "invalid number of points in external \"path\" value"
+msgstr "número de pontos é inválido no valor de \"path\" externo"
 
-#: catalog/heap.c:413
+#: utils/adt/geo_ops.c:1816
 #, c-format
-msgid "column name \"%s\" specified more than once"
-msgstr "nome da coluna \"%s\" especificado mais de uma vez"
+msgid "invalid input syntax for type point: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo point: \"%s\""
 
-#: catalog/heap.c:451
+#: utils/adt/geo_ops.c:2044
 #, c-format
-msgid "column \"%s\" has type \"unknown\""
-msgstr "coluna \"%s\" tem tipo \"unknown\""
+msgid "invalid input syntax for type lseg: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo lseg: \"%s\""
 
-#: catalog/heap.c:452
-msgid "Proceeding with relation creation anyway."
-msgstr "Prosseguindo com a criação da relação mesmo assim."
+#: utils/adt/geo_ops.c:2648
+msgid "function \"dist_lb\" not implemented"
+msgstr "função \"dist_lb\" não está implementada"
 
-#: catalog/heap.c:465
-#, c-format
-msgid "column \"%s\" has pseudo-type %s"
-msgstr "coluna \"%s\" tem pseudo-tipo %s"
+#: utils/adt/geo_ops.c:3161
+msgid "function \"close_lb\" not implemented"
+msgstr "função \"close_lb\" não está implementada"
 
-#: catalog/heap.c:944
-msgid ""
-"A relation has an associated type of the same name, so you must use a name "
-"that doesn't conflict with any existing type."
-msgstr ""
-"A relação tem um tipo associado com o mesmo nome, então você deve utilizar "
-"um nome que não conflite com outro tipo existente."
+#: utils/adt/geo_ops.c:3450
+msgid "cannot create bounding box for empty polygon"
+msgstr "não pode criar um caixa circunscrita para um polígono vazio"
 
-#: catalog/heap.c:1540
+#: utils/adt/geo_ops.c:3474 utils/adt/geo_ops.c:3486
 #, c-format
-msgid ""
-"cannot drop \"%s\" because it is being used by active queries in this session"
-msgstr ""
-"não pode remover \"%s\" porque ela está sendo utilizada por consultas ativas "
-"nessa sessão"
+msgid "invalid input syntax for type polygon: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo polygon: \"%s\""
 
-#: catalog/heap.c:1991
-#, c-format
-msgid "check constraint \"%s\" already exists"
-msgstr "restrição de verificação \"%s\" já existe"
+#: utils/adt/geo_ops.c:3526
+msgid "invalid number of points in external \"polygon\" value"
+msgstr "número de pontos é inválido no valor de \"polygon\" externo"
 
-#: catalog/heap.c:2139
-#, c-format
-msgid "merging constraint \"%s\" with inherited definition"
-msgstr "juntando restrição \"%s\" com definição herdada"
+#: utils/adt/geo_ops.c:4049
+msgid "function \"poly_distance\" not implemented"
+msgstr "função \"poly_distance\" não está implementada"
 
-#: catalog/heap.c:2237
-msgid "cannot use column references in default expression"
-msgstr "não pode utilizar referência à coluna na expressão padrão"
+#: utils/adt/geo_ops.c:4363
+msgid "function \"path_center\" not implemented"
+msgstr "função \"path_center\" não está implementada"
 
-#: catalog/heap.c:2245
-msgid "default expression must not return a set"
-msgstr "expressão padrão não deve retornar um conjunto"
+#: utils/adt/geo_ops.c:4380
+msgid "open path cannot be converted to polygon"
+msgstr "caminho aberto não pode ser convertido em polígono"
 
-#: catalog/heap.c:2253
-msgid "cannot use subquery in default expression"
-msgstr "não pode utilizar subconsulta na expressão padrão"
+#: utils/adt/geo_ops.c:4549 utils/adt/geo_ops.c:4559 utils/adt/geo_ops.c:4574
+#: utils/adt/geo_ops.c:4580
+#, c-format
+msgid "invalid input syntax for type circle: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo circle: \"%s\""
 
-#: catalog/heap.c:2257
-msgid "cannot use aggregate function in default expression"
-msgstr "não pode utilizar função de agregação na expressão padrão"
+#: utils/adt/geo_ops.c:4602 utils/adt/geo_ops.c:4610
+msgid "could not format \"circle\" value"
+msgstr "não pôde formatar valor de \"circle\""
 
-#: catalog/heap.c:2261
-msgid "cannot use window function in default expression"
-msgstr "não pode utilizar função deslizante na expressão padrão"
+#: utils/adt/geo_ops.c:4637
+msgid "invalid radius in external \"circle\" value"
+msgstr "raio é inválido no valor de \"circle\" externo"
 
-#: catalog/heap.c:2321
-#, c-format
-msgid "only table \"%s\" can be referenced in check constraint"
-msgstr ""
-"somente a tabela \"%s\" pode ser referenciada na restrição de verificação"
+#: utils/adt/geo_ops.c:5158
+msgid "cannot convert circle with radius zero to polygon"
+msgstr "não pode converter círculo com raio zero para polígono"
 
-#: catalog/heap.c:2577
-msgid "unsupported ON COMMIT and foreign key combination"
-msgstr "combinação ON COMMIT e chave estrangeira não é suportada"
+#: utils/adt/geo_ops.c:5163
+msgid "must request at least 2 points"
+msgstr "deve informar pelo menos 2 pontos"
+
+#: utils/adt/geo_ops.c:5207 utils/adt/geo_ops.c:5230
+msgid "cannot convert empty polygon to circle"
+msgstr "não pode converter polígono vazio para círculo"
 
-#: catalog/heap.c:2578
+#: utils/adt/ruleutils.c:2429
 #, c-format
-msgid ""
-"Table \"%s\" references \"%s\", but they do not have the same ON COMMIT "
-"setting."
-msgstr ""
-"Tabela \"%s\" referencia \"%s\", mas elas não têm a mesma definição de ON "
-"COMMIT."
+msgid "rule \"%s\" has unsupported event type %d"
+msgstr "regra \"%s\" tem tipo de evento %d que não é suportado"
 
-#: catalog/heap.c:2583
-msgid "cannot truncate a table referenced in a foreign key constraint"
-msgstr ""
-"não pode truncar uma tabela referenciada em uma restrição de chave "
-"estrangeira"
+#: utils/adt/ruleutils.c:5858 utils/adt/ruleutils.c:5913
+#: utils/adt/ruleutils.c:5950 utils/adt/regproc.c:635 utils/adt/regproc.c:1485
+msgid "too many arguments"
+msgstr "muitos argumentos"
 
-#: catalog/heap.c:2584
+#: utils/adt/varbit.c:166 utils/adt/varbit.c:309 utils/adt/varbit.c:366
 #, c-format
-msgid "Table \"%s\" references \"%s\"."
-msgstr "Tabela \"%s\" referencia \"%s\"."
+msgid "bit string length %d does not match type bit(%d)"
+msgstr "tamanho da cadeia de bits %d não corresponde ao tipo bit(%d)"
 
-#: catalog/heap.c:2586
+#: utils/adt/varbit.c:188 utils/adt/varbit.c:490
 #, c-format
-msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
-msgstr ""
-"Trunque a tabela \"%s\" ao mesmo tempo, ou utilize TRUNCATE ... CASCADE."
+msgid "\"%c\" is not a valid binary digit"
+msgstr "\"%c\" não é um dígito binário válido"
 
-#: catalog/pg_aggregate.c:100
-msgid "cannot determine transition data type"
-msgstr "não pode determinar tipo de dado transitório"
+#: utils/adt/varbit.c:213 utils/adt/varbit.c:515
+#, c-format
+msgid "\"%c\" is not a valid hexadecimal digit"
+msgstr "\"%c\" não é um dígito hexadecimal válido"
 
-#: catalog/pg_aggregate.c:101
-msgid ""
-"An aggregate using a polymorphic transition type must have at least one "
-"polymorphic argument."
-msgstr ""
-"Uma agregação utilizando um tipo transitório polimórfico deve ter pelo menos "
-"um argumento polimórfico."
+#: utils/adt/varbit.c:300 utils/adt/varbit.c:603
+msgid "invalid length in external bit string"
+msgstr "tamanho inválido na cadeia de bits externa"
 
-#: catalog/pg_aggregate.c:124
+#: utils/adt/varbit.c:468 utils/adt/varbit.c:612 utils/adt/varbit.c:674
 #, c-format
-msgid "return type of transition function %s is not %s"
-msgstr "tipo retornado da função de transição %s não é %s"
+msgid "bit string too long for type bit varying(%d)"
+msgstr "cadeia de bits muito longa para tipo bit varying(%d)"
 
-#: catalog/pg_aggregate.c:144
-msgid ""
-"must not omit initial value when transition function is strict and "
-"transition type is not compatible with input type"
-msgstr ""
-"não deve omitir valor inicial quando a função de transição é estrita e o "
-"tipo de transição não é compatível com tipo de entrada"
+#: utils/adt/varbit.c:1164
+msgid "cannot AND bit strings of different sizes"
+msgstr "não pode executar E em cadeias de bits de tamanhos diferentes"
 
-#: catalog/pg_aggregate.c:176
-msgid ""
-"An aggregate returning a polymorphic type must have at least one polymorphic "
-"argument."
-msgstr ""
-"Uma agregação retornando um tipo polimórfico deve ter pelo menos um "
-"argumento polimórfico."
+#: utils/adt/varbit.c:1206
+msgid "cannot OR bit strings of different sizes"
+msgstr "não pode executar OU em cadeias de bits de tamanhos diferentes"
 
-#: catalog/pg_aggregate.c:197
-msgid "sort operator can only be specified for single-argument aggregates"
-msgstr ""
-"operador de ordenação só pode ser especificado por agregações de argumento "
-"único"
+#: utils/adt/varbit.c:1253
+msgid "cannot XOR bit strings of different sizes"
+msgstr "não pode executar XOR em cadeias de bits de tamanhos diferentes"
 
-#: catalog/pg_aggregate.c:337
+#: utils/adt/varbit.c:1731 utils/adt/varbit.c:1789
 #, c-format
-msgid "function %s returns a set"
-msgstr "função %s retorna um conjunto"
+msgid "bit index %d out of valid range (0..%d)"
+msgstr "índice do bit %d fora do intervalo válido (0..%d)"
 
-#: catalog/pg_aggregate.c:362
+#: utils/adt/uuid.c:128
 #, c-format
-msgid "function %s requires run-time type coercion"
-msgstr "função %s requer conversão de tipo em tempo de execução"
+msgid "invalid input syntax for uuid: \"%s\""
+msgstr "sintaxe de entrada é inválida para uuid: \"%s\""
 
-#: libpq/pqcomm.c:294
-#, c-format
-msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
-msgstr ""
-"não pôde traduzir nome da máquina \"%s\", serviço \"%s\" para endereço: %s"
+#: utils/adt/genfile.c:60
+msgid "reference to parent directory (\"..\") not allowed"
+msgstr "referência ao diretório pai (\"..\") não é permitida"
 
-#: libpq/pqcomm.c:298
-#, c-format
-msgid "could not translate service \"%s\" to address: %s"
-msgstr "não pôde traduzir serviço \"%s\" para endereço: %s"
+#: utils/adt/genfile.c:71
+msgid "absolute path not allowed"
+msgstr "caminho absoluto não é permitido"
+
+#: utils/adt/genfile.c:76
+msgid "path must be in or below the current directory"
+msgstr "caminho deve estar no ou abaixo do diretório atual"
 
-#: libpq/pqcomm.c:325
+#: utils/adt/genfile.c:129
 #, c-format
-msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
-msgstr ""
-"não pôde se ligar a todos os endereços informados: MAXLISTEN (%d) excedeu"
+msgid "could not seek in file \"%s\": %m"
+msgstr "não pôde buscar em arquivo \"%s\": %m"
 
-#: libpq/pqcomm.c:334
-msgid "IPv4"
-msgstr "IPv4"
+#: utils/adt/genfile.c:179 utils/adt/genfile.c:203 utils/adt/genfile.c:224
+#: utils/adt/genfile.c:248
+msgid "must be superuser to read files"
+msgstr "deve ser super-usuário para ler arquivos"
 
-#: libpq/pqcomm.c:338
-msgid "IPv6"
-msgstr "IPv6"
+#: utils/adt/genfile.c:186 utils/adt/genfile.c:231
+msgid "requested length cannot be negative"
+msgstr "tamanho solicitado não pode ser negativo"
 
-#: libpq/pqcomm.c:343
-msgid "Unix"
-msgstr "Unix"
+#: utils/adt/genfile.c:272
+msgid "must be superuser to get file information"
+msgstr "deve ser super-usuário para obter informação sobre arquivo"
 
-#: libpq/pqcomm.c:348
-#, c-format
-msgid "unrecognized address family %d"
-msgstr "família de endereços %d desconhecida"
+#: utils/adt/genfile.c:336
+msgid "must be superuser to get directory listings"
+msgstr "deve ser super-usuário para obter listagem de diretórios"
 
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:359
+#: utils/adt/numutils.c:51 utils/adt/numutils.c:61 utils/adt/numutils.c:103
+#: utils/adt/int8.c:98 utils/adt/int8.c:133
 #, c-format
-msgid "could not create %s socket: %m"
-msgstr "não pôde criar soquete %s: %m"
+msgid "invalid input syntax for integer: \"%s\""
+msgstr "sintaxe de entrada é inválida para integer: \"%s\""
 
-#: libpq/pqcomm.c:384
+#: utils/adt/numutils.c:75
 #, c-format
-msgid "setsockopt(SO_REUSEADDR) failed: %m"
-msgstr "setsockopt(SO_REUSEADDR) falhou: %m"
+msgid "value \"%s\" is out of range for type integer"
+msgstr "valor \"%s\" está fora do intervalo para tipo integer"
 
-#: libpq/pqcomm.c:399
+#: utils/adt/numutils.c:81
 #, c-format
-msgid "setsockopt(IPV6_V6ONLY) failed: %m"
-msgstr "setsockopt(IPV6_V6ONLY) falhou: %m"
+msgid "value \"%s\" is out of range for type smallint"
+msgstr "valor \"%s\" está fora do intervalo para tipo smallint"
 
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:418
+#: utils/adt/numutils.c:87
 #, c-format
-msgid "could not bind %s socket: %m"
-msgstr "não pôde se ligar ao soquete %s: %m"
+msgid "value \"%s\" is out of range for 8-bit integer"
+msgstr "valor \"%s\" está fora do intervalo para inteiro de 8 bits"
 
-#: libpq/pqcomm.c:421
-#, c-format
-msgid ""
-"Is another postmaster already running on port %d? If not, remove socket file "
-"\"%s\" and retry."
-msgstr ""
-"Outro postmaster já está executando na porta %d? Se não, remova o arquivo de "
-"soquete \"%s\" e tente novamente."
+#: utils/adt/arrayutils.c:209
+msgid "typmod array must be type cstring[]"
+msgstr "matriz typmod deve ser do tipo cstring[]"
 
-#: libpq/pqcomm.c:424
-#, c-format
-msgid ""
-"Is another postmaster already running on port %d? If not, wait a few seconds "
-"and retry."
+#: utils/adt/arrayutils.c:214
+msgid "typmod array must be one-dimensional"
+msgstr "matriz typmod deve ser de uma dimensão"
+
+#: utils/adt/arrayutils.c:219
+msgid "typmod array must not contain nulls"
+msgstr "matriz typmod não deve conter valores nulos"
+
+#: utils/adt/selfuncs.c:4898 utils/adt/selfuncs.c:5352
+msgid "case insensitive matching not supported on type bytea"
 msgstr ""
-"Outro postmaster já está executando na porta %d? Se não, espere alguns "
-"segundos e tente novamente."
+"correspondência não sensível a maiúsculas/minúsculas não é suportada pelo "
+"tipo bytea"
 
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:457
+#: utils/adt/selfuncs.c:5013 utils/adt/selfuncs.c:5512
+msgid "regular-expression matching not supported on type bytea"
+msgstr "correspondência de expressão regular não é suportada pelo tipo bytea"
+
+#: utils/adt/regproc.c:118 utils/adt/regproc.c:139 utils/adt/regproc.c:289
+#: utils/adt/acl.c:3359
 #, c-format
-msgid "could not listen on %s socket: %m"
-msgstr "não pôde escutar no soquete %s: %m"
+msgid "function \"%s\" does not exist"
+msgstr "função \"%s\" não existe"
 
-#: libpq/pqcomm.c:542
+#: utils/adt/regproc.c:123 utils/adt/regproc.c:143
 #, c-format
-msgid "group \"%s\" does not exist"
-msgstr "grupo \"%s\" não existe"
+msgid "more than one function named \"%s\""
+msgstr "mais de uma função com nome \"%s\""
 
-#: libpq/pqcomm.c:552
+#: utils/adt/regproc.c:468 utils/adt/regproc.c:488
 #, c-format
-msgid "could not set group of file \"%s\": %m"
-msgstr "não pôde definir grupo do arquivo \"%s\": %m"
+msgid "more than one operator named %s"
+msgstr "mais de um operador com nome %s"
+
+#: utils/adt/regproc.c:636
+msgid "Provide two argument types for operator."
+msgstr "Forneça dois tipos de argumento para operador."
+
+#: utils/adt/regproc.c:1383
+msgid "expected a left parenthesis"
+msgstr "parêntese esquerdo esperado"
 
-#: libpq/pqcomm.c:563
+#: utils/adt/regproc.c:1399
+msgid "expected a right parenthesis"
+msgstr "parêntese direito esperado"
+
+#: utils/adt/regproc.c:1418
+msgid "expected a type name"
+msgstr "nome de tipo esperado"
+
+#: utils/adt/regproc.c:1450
+msgid "improper type name"
+msgstr "nome de tipo inválido"
+
+#: utils/adt/tsvector_parser.c:137
 #, c-format
-msgid "could not set permissions of file \"%s\": %m"
-msgstr "não pôde definir permissões do arquivo \"%s\": %m"
+msgid "syntax error in tsvector: \"%s\""
+msgstr "erro de sintaxe em tsvector: \"%s\""
 
-#: libpq/pqcomm.c:593
+#: utils/adt/tsvector_parser.c:202
 #, c-format
-msgid "could not accept new connection: %m"
-msgstr "não pôde aceitar nova conexão: %m"
+msgid "there is no escaped character: \"%s\""
+msgstr "não há caracter com escape: \"%s\""
 
-#: libpq/pqcomm.c:779 libpq/pqcomm.c:879
+#: utils/adt/tsvector_parser.c:319
 #, c-format
-msgid "could not receive data from client: %m"
-msgstr "não pôde receber dados do cliente: %m"
+msgid "wrong position info in tsvector: \"%s\""
+msgstr "informação incorreta sobre posição no tsvector: \"%s\""
 
-#: libpq/pqcomm.c:854
+#: utils/adt/int8.c:114
 #, c-format
-msgid "could not set socket to non-blocking mode: %m"
-msgstr "não pôde configurar o soquete para modo não-bloqueado: %m"
+msgid "value \"%s\" is out of range for type bigint"
+msgstr "valor \"%s\" está fora do intervalo para tipo bigint"
+
+#: utils/adt/int8.c:1330
+msgid "OID out of range"
+msgstr "OID fora do intervalo"
+
+#: utils/adt/char.c:169
+msgid "\"char\" out of range"
+msgstr "\"char\" fora do intervalo"
 
-#: libpq/pqcomm.c:900 libpq/pqcomm.c:911
+#: utils/adt/network.c:118
 #, c-format
-msgid "could not set socket to blocking mode: %m"
-msgstr "não pôde configurar o soquete para modo bloqueado: %m"
+msgid "invalid cidr value: \"%s\""
+msgstr "valor de cidr é inválido: \"%s\""
 
-#: libpq/pqcomm.c:1056
-msgid "unexpected EOF within message length word"
-msgstr "EOF inesperado dentro da palavra de tamanho de mensagem"
+#: utils/adt/network.c:119 utils/adt/network.c:249
+msgid "Value has bits set to right of mask."
+msgstr "Valor tem bits definidos a direita da máscara."
 
-#: libpq/pqcomm.c:1067
-msgid "invalid message length"
-msgstr "tamanho de mensagem é inválido"
+#: utils/adt/network.c:160 utils/adt/network.c:614 utils/adt/network.c:639
+#: utils/adt/network.c:664
+#, c-format
+msgid "could not format inet value: %m"
+msgstr "não pôde formatar valor de inet: %m"
 
-#: libpq/pqcomm.c:1089 libpq/pqcomm.c:1099
-msgid "incomplete message from client"
-msgstr "mensagem incompleta do cliente"
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:217
+#, c-format
+msgid "invalid address family in external \"%s\" value"
+msgstr "família de endereços inválida no valor de \"%s\" externo"
 
-#: libpq/pqcomm.c:1208
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:224
 #, c-format
-msgid "could not send data to client: %m"
-msgstr "não pôde enviar dados para cliente: %m"
+msgid "invalid bits in external \"%s\" value"
+msgstr "bits inválidos no valor de \"%s\" externo"
 
-#: libpq/be-fsstubs.c:133 libpq/be-fsstubs.c:163 libpq/be-fsstubs.c:189
-#: libpq/be-fsstubs.c:225 libpq/be-fsstubs.c:272 libpq/be-fsstubs.c:518
+#. translator: %s is inet or cidr
+#: utils/adt/network.c:233
 #, c-format
-msgid "invalid large-object descriptor: %d"
-msgstr "descritor de objeto grande é inválido: %d"
+msgid "invalid length in external \"%s\" value"
+msgstr "tamanho inválido no valor de \"%s\" externo"
+
+#: utils/adt/network.c:248
+msgid "invalid external \"cidr\" value"
+msgstr "valor de \"cidr\" externo é inválido"
 
-#: libpq/be-fsstubs.c:173 libpq/be-fsstubs.c:205 libpq/be-fsstubs.c:528
+#: utils/adt/network.c:370 utils/adt/network.c:397
 #, c-format
-msgid "permission denied for large object %u"
-msgstr "permissão negada para objeto grande %u"
+msgid "invalid mask length: %d"
+msgstr "tamanho de máscara é inválido: %d"
 
-#: libpq/be-fsstubs.c:194
+#: utils/adt/network.c:682
 #, c-format
-msgid "large object descriptor %d was not opened for writing"
-msgstr "descritor de objeto grande %d não foi aberto para escrita"
+msgid "could not format cidr value: %m"
+msgstr "não pôde formatar valor de cidr: %m"
 
-#: libpq/be-fsstubs.c:392
-msgid "must be superuser to use server-side lo_import()"
-msgstr "deve ser super-usuário para utilizar lo_import() do servidor"
+#: utils/adt/network.c:1255
+msgid "cannot AND inet values of different sizes"
+msgstr "não pode executar E em valores inet de tamanhos diferentes"
 
-#: libpq/be-fsstubs.c:393
-msgid "Anyone can use the client-side lo_import() provided by libpq."
-msgstr "Qualquer um pode utilizar lo_import() do cliente fornecido pela libpq."
+#: utils/adt/network.c:1287
+msgid "cannot OR inet values of different sizes"
+msgstr "não pode executar OU em valores inet de tamanhos diferentes"
 
-#: libpq/be-fsstubs.c:406
-#, c-format
-msgid "could not open server file \"%s\": %m"
-msgstr "não pôde abrir arquivo \"%s\" no servidor: %m"
+#: utils/adt/network.c:1348 utils/adt/network.c:1424
+msgid "result is out of range"
+msgstr "resultado está fora do intervalo"
 
-#: libpq/be-fsstubs.c:428
-#, c-format
-msgid "could not read server file \"%s\": %m"
-msgstr "não pôde ler arquivo \"%s\" no servidor: %m"
+#: utils/adt/network.c:1389
+msgid "cannot subtract inet values of different sizes"
+msgstr "não pode subtrair valores inet de tamanhos diferentes"
 
-#: libpq/be-fsstubs.c:458
-msgid "must be superuser to use server-side lo_export()"
-msgstr "deve ser super-usuário para utilizar lo_export() do servidor"
+#: utils/adt/pseudotypes.c:94
+msgid "cannot accept a value of type any"
+msgstr "não pode aceitar um valor do tipo any"
 
-#: libpq/be-fsstubs.c:459
-msgid "Anyone can use the client-side lo_export() provided by libpq."
-msgstr "Qualquer um pode utilizar lo_export() do cliente fornecido pela libpq."
+#: utils/adt/pseudotypes.c:107
+msgid "cannot display a value of type any"
+msgstr "não pode mostrar um valor do tipo any"
 
-#: libpq/be-fsstubs.c:483
-#, c-format
-msgid "could not create server file \"%s\": %m"
-msgstr "não pôde criar arquivo \"%s\" no servidor: %m"
+#: utils/adt/pseudotypes.c:121 utils/adt/pseudotypes.c:149
+msgid "cannot accept a value of type anyarray"
+msgstr "não pode aceitar um valor do tipo anyarray"
 
-#: libpq/be-fsstubs.c:495
-#, c-format
-msgid "could not write server file \"%s\": %m"
-msgstr "não pôde escrever no arquivo \"%s\" no servidor: %m"
+#: utils/adt/pseudotypes.c:174
+msgid "cannot accept a value of type anyenum"
+msgstr "não pode aceitar um valor do tipo anyenum"
 
-#: libpq/pqformat.c:436
-msgid "no data left in message"
-msgstr "nenhum dado na mensagem"
+#: utils/adt/pseudotypes.c:252
+msgid "cannot accept a value of type trigger"
+msgstr "não pode aceitar um valor do tipo trigger"
 
-#: libpq/pqformat.c:636
-msgid "invalid string in message"
-msgstr "cadeia de caracteres é inválida na mensagem"
+#: utils/adt/pseudotypes.c:265
+msgid "cannot display a value of type trigger"
+msgstr "não pode mostrar um valor do tipo trigger"
 
-#: libpq/pqformat.c:652
-msgid "invalid message format"
-msgstr "formato de mensagem é inválido"
+#: utils/adt/pseudotypes.c:279
+msgid "cannot accept a value of type language_handler"
+msgstr "não pode aceitar um valor do tipo language_handler"
 
-#: libpq/auth.c:255
-#, c-format
-msgid "authentication failed for user \"%s\": host rejected"
-msgstr "autenticação de usuário \"%s\" falhou: máquina rejeitada"
+#: utils/adt/pseudotypes.c:292
+msgid "cannot display a value of type language_handler"
+msgstr "não pode mostrar um valor do tipo language_handler"
 
-#: libpq/auth.c:258
-#, c-format
-msgid "Kerberos 5 authentication failed for user \"%s\""
-msgstr "autenticação do tipo Kerberos 5 falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:306
+msgid "cannot accept a value of type fdw_handler"
+msgstr "não pode aceitar um valor do tipo fdw_handler"
 
-#: libpq/auth.c:261
-#, c-format
-msgid "\"trust\" authentication failed for user \"%s\""
-msgstr "autenticação do tipo \"trust\" falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:319
+msgid "cannot display a value of type fdw_handler"
+msgstr "não pode mostrar um valor do tipo fdw_handler"
 
-#: libpq/auth.c:264
-#, c-format
-msgid "Ident authentication failed for user \"%s\""
-msgstr "autenticação do tipo Ident falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:333
+msgid "cannot accept a value of type internal"
+msgstr "não pode aceitar um valor do tipo interval"
 
-#: libpq/auth.c:268
-#, c-format
-msgid "password authentication failed for user \"%s\""
-msgstr "autenticação do tipo password falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:346
+msgid "cannot display a value of type internal"
+msgstr "não pode mostrar um valor do tipo interval"
 
-#: libpq/auth.c:273
-#, c-format
-msgid "GSSAPI authentication failed for user \"%s\""
-msgstr "autenticação do tipo GSSAPI falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:360
+msgid "cannot accept a value of type opaque"
+msgstr "não pode aceitar um valor do tipo opaque"
 
-#: libpq/auth.c:276
-#, c-format
-msgid "SSPI authentication failed for user \"%s\""
-msgstr "autenticação do tipo SSPI falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:373
+msgid "cannot display a value of type opaque"
+msgstr "não pode mostrar um valor do tipo opaque"
 
-#: libpq/auth.c:279
-#, c-format
-msgid "PAM authentication failed for user \"%s\""
-msgstr "autenticação do tipo PAM falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:387
+msgid "cannot accept a value of type anyelement"
+msgstr "não pode aceitar um valor do tipo anyelement"
 
-#: libpq/auth.c:282
-#, c-format
-msgid "LDAP authentication failed for user \"%s\""
-msgstr "autenticação do tipo LDAP falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:400
+msgid "cannot display a value of type anyelement"
+msgstr "não pode mostrar um valor do tipo anyelement"
 
-#: libpq/auth.c:285
-#, c-format
-msgid "certificate authentication failed for user \"%s\""
-msgstr "autenticação do tipo certificate falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:413
+msgid "cannot accept a value of type anynonarray"
+msgstr "não pode aceitar um valor do tipo anynonarray"
 
-#: libpq/auth.c:288
-#, c-format
-msgid "RADIUS authentication failed for user \"%s\""
-msgstr "autenticação do tipo RADIUS falhou para usuário \"%s\""
+#: utils/adt/pseudotypes.c:426
+msgid "cannot display a value of type anynonarray"
+msgstr "não pode mostrar um valor do tipo anynonarray"
 
-#: libpq/auth.c:291
-#, c-format
-msgid "authentication failed for user \"%s\": invalid authentication method"
-msgstr ""
-"autenticação falhou para usuário \"%s\": método de autenticação é inválido"
+#: utils/adt/pseudotypes.c:439
+msgid "cannot accept a value of a shell type"
+msgstr "não pode aceitar um valor do tipo shell"
 
-#: libpq/auth.c:320
-msgid "missing or erroneous pg_hba.conf file"
-msgstr "arquivo pg_hba.conf não foi encontrado ou está errado"
+#: utils/adt/pseudotypes.c:452
+msgid "cannot display a value of a shell type"
+msgstr "não pode mostrar um valor do tipo shell"
 
-#: libpq/auth.c:321
-msgid "See server log for details."
-msgstr "Veja log do servidor para obter detalhes."
+#: utils/adt/pseudotypes.c:474 utils/adt/pseudotypes.c:498
+msgid "cannot accept a value of type pg_node_tree"
+msgstr "não pode aceitar um valor do tipo pg_node_tree"
 
-#: libpq/auth.c:351
-msgid "connection requires a valid client certificate"
-msgstr "conexão requer um certificado cliente válido"
+#: utils/adt/int.c:162
+msgid "int2vector has too many elements"
+msgstr "int2vector tem muitos elementos"
 
-#: libpq/auth.c:395 libpq/auth.c:411 libpq/auth.c:448 libpq/auth.c:464
-msgid "SSL on"
-msgstr "SSL habilitado"
+#: utils/adt/int.c:237
+msgid "invalid int2vector data"
+msgstr "dado int2vector inválido"
 
-#: libpq/auth.c:395 libpq/auth.c:411 libpq/auth.c:448 libpq/auth.c:464
-msgid "SSL off"
-msgstr "SSL desabilitado"
+#: utils/adt/acl.c:253
+#, c-format
+msgid "unrecognized key word: \"%s\""
+msgstr "palavra chave desconhecida: \"%s\""
 
-#: libpq/auth.c:393
-#, fuzzy, c-format
-msgid ""
-"pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s"
-msgstr ""
-"pg_hba.conf rejeita conexão de replicação para máquina \"%s\", usuário \"%s\", %s"
+#: utils/adt/acl.c:254
+msgid "ACL key word must be \"group\" or \"user\"."
+msgstr "palavra chave ACL deve ser \"group\" ou \"user\"."
 
-#: libpq/auth.c:399
-#, fuzzy, c-format
-msgid "pg_hba.conf rejects replication connection for host \"%s\", user \"%s\""
-msgstr ""
-"pg_hba.conf rejeita conexão de replicação para máquina \"%s\", usuário \"%s\""
+#: utils/adt/acl.c:259
+msgid "missing name"
+msgstr "faltando nome"
 
-#: libpq/auth.c:408
-#, fuzzy, c-format
-msgid ""
-"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s"
-"\", %s"
-msgstr ""
-"pg_hba.conf rejeita conexão para máquina \"%s\", usuário \"%s\", banco de dados \"%s\", %s"
+#: utils/adt/acl.c:260
+msgid "A name must follow the \"group\" or \"user\" key word."
+msgstr "Um nome deve seguir a palavra chave \"group\" ou \"user\"."
 
-#: libpq/auth.c:415
-#, fuzzy, c-format
-msgid ""
-"pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\""
-msgstr ""
-"pg_hba.conf rejeita conexão para máquina \"%s\", usuário \"%s\", banco de dados \"%s\""
+#: utils/adt/acl.c:266
+msgid "missing \"=\" sign"
+msgstr "faltando sinal \"=\""
 
-#: libpq/auth.c:446
-#, fuzzy, c-format
-msgid ""
-"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s"
-"\", %s"
-msgstr ""
-"nenhuma entrada no pg_hba.conf para conexão de replicação da máquina \"%s\", usuário \"%s\", %s"
+#: utils/adt/acl.c:319
+#, c-format
+msgid "invalid mode character: must be one of \"%s\""
+msgstr "caracter de modo é inválido: deve ser um dos \"%s\""
 
-#: libpq/auth.c:452
-#, fuzzy, c-format
-msgid ""
-"no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\""
-msgstr ""
-"nenhuma entrada no pg_hba.conf para conexão de replicação da máquina \"%s\", usuário \"%s\""
+#: utils/adt/acl.c:341
+msgid "a name must follow the \"/\" sign"
+msgstr "um nome deve seguir o sinal \"/\""
 
-#: libpq/auth.c:461
+#: utils/adt/acl.c:349
 #, c-format
-msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
-msgstr ""
-"nenhuma entrada no pg_hba.conf para máquina \"%s\", usuário \"%s\", banco de "
-"dados \"%s\", %s"
+msgid "defaulting grantor to user ID %u"
+msgstr "utilizando ID de usuário %u como concedente"
 
-#: libpq/auth.c:468
-#, c-format
-msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
-msgstr ""
-"nenhuma entrada no pg_hba.conf para máquina \"%s\", usuário \"%s\", banco de "
-"dados \"%s\""
+#: utils/adt/acl.c:540
+msgid "ACL array contains wrong data type"
+msgstr "matriz ACL contém tipo de dado incorreto"
 
-#: libpq/auth.c:526
-#, c-format
-msgid "could not enable credential reception: %m"
-msgstr "não pôde habilitar recepção de credenciais: %m"
+#: utils/adt/acl.c:544
+msgid "ACL arrays must be one-dimensional"
+msgstr "matrizes ACL devem ser de uma dimensão"
 
-#: libpq/auth.c:539 libpq/hba.c:948
-msgid ""
-"MD5 authentication is not supported when \"db_user_namespace\" is enabled"
-msgstr ""
-"autenticação MD5 não é suportada quando \"db_user_namespace\" está habilitado"
+#: utils/adt/acl.c:548
+msgid "ACL arrays must not contain null values"
+msgstr "matrizes ACL não devem conter valores nulos"
 
-#: libpq/auth.c:660
-#, c-format
-msgid "expected password response, got message type %d"
-msgstr "resposta da senha esperada, recebeu tipo de mensagem %d"
+#: utils/adt/acl.c:572
+msgid "extra garbage at the end of the ACL specification"
+msgstr "lixo extra ao final da especificação de uma ACL"
 
-#: libpq/auth.c:688
-msgid "invalid password packet size"
-msgstr "tamanho do pacote de senha é inválido"
+#: utils/adt/acl.c:1129
+msgid "grant options cannot be granted back to your own grantor"
+msgstr "opções de concessão não podem ser concedidos ao próprio concedente"
 
-#: libpq/auth.c:692
-msgid "received password packet"
-msgstr "pacote de senha recebido"
+#: utils/adt/acl.c:1190
+msgid "dependent privileges exist"
+msgstr "privilégios dependentes existem"
 
-#: libpq/auth.c:750
-#, c-format
-msgid "Kerberos initialization returned error %d"
-msgstr "inicialização do Kerberos retornou erro %d"
+#: utils/adt/acl.c:1191
+msgid "Use CASCADE to revoke them too."
+msgstr "Utilize CASCADE para revogá-los também."
 
-#: libpq/auth.c:760
-#, c-format
-msgid "Kerberos keytab resolving returned error %d"
-msgstr "resolução do keytab do Kerberos retornou erro %d"
+#: utils/adt/acl.c:1470
+msgid "aclinsert is no longer supported"
+msgstr "aclinsert não é mais suportado"
 
-#: libpq/auth.c:784
-#, c-format
-msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
-msgstr "Kerberos sname_to_principal(\"%s\", \"%s\") retornou erro %d"
+#: utils/adt/acl.c:1480
+msgid "aclremove is no longer supported"
+msgstr "aclremove não é mais suportado"
 
-#: libpq/auth.c:829
+#: utils/adt/acl.c:1566 utils/adt/acl.c:1620
 #, c-format
-msgid "Kerberos recvauth returned error %d"
-msgstr "Kerberos recvauth retornou erro %d"
+msgid "unrecognized privilege type: \"%s\""
+msgstr "tipo de privilégio desconhecido: \"%s\""
 
-#: libpq/auth.c:852
+#: utils/adt/acl.c:4608
 #, c-format
-msgid "Kerberos unparse_name returned error %d"
-msgstr "Kerberos unparse_name retornou erro %d"
+msgid "must be member of role \"%s\""
+msgstr "deve ser membro da role \"%s\""
 
-#: libpq/auth.c:975
+#: utils/adt/dbsize.c:105 utils/adt/dbsize.c:189
 #, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: libpq/auth.c:1001
-msgid "GSSAPI is not supported in protocol version 2"
-msgstr "GSSAPI não é suportado no protocolo versão 2"
+msgid "could not open tablespace directory \"%s\": %m"
+msgstr "não pôde abrir diretório da tablespace \"%s\": %m"
 
-#: libpq/auth.c:1056
+#: utils/adt/bool.c:153
 #, c-format
-msgid "expected GSS response, got message type %d"
-msgstr "resposta do GSS esperada, recebeu tipo de mensagem %d"
-
-#: libpq/auth.c:1119
-msgid "accepting GSS security context failed"
-msgstr "aceitação do contexto de segurança do GSS falhou"
+msgid "invalid input syntax for type boolean: \"%s\""
+msgstr "sintaxe de entrada é inválida para tipo boolean: \"%s\""
 
-#: libpq/auth.c:1145
-msgid "retrieving GSS user name failed"
-msgstr "recuperação do nome de usuário do GSS falhou"
+#: utils/adt/date.c:71
+#, c-format
+msgid "TIME(%d)%s precision must not be negative"
+msgstr "precisão do TIME(%d)%s não deve ser negativa"
 
-#: libpq/auth.c:1218
+#: utils/adt/date.c:77
 #, c-format
-msgid "SSPI error %x"
-msgstr "erro de SSPI %x"
+msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
+msgstr "precisão do TIME(%d)%s reduzida ao máximo permitido, %d"
 
-#: libpq/auth.c:1222
+#: utils/adt/date.c:167
 #, c-format
-msgid "%s (%x)"
-msgstr "%s (%x)"
+msgid "date out of range: \"%s\""
+msgstr "date fora do intervalo: \"%s\""
 
-#: libpq/auth.c:1262
-msgid "SSPI is not supported in protocol version 2"
-msgstr "SSPI não é suportado no protocolo versão 2"
+#: utils/adt/date.c:359
+msgid "cannot subtract infinite dates"
+msgstr "não pode subtrair valores date infinitos"
 
-#: libpq/auth.c:1277
-msgid "could not acquire SSPI credentials"
-msgstr "não pôde obter credenciais SSPI"
+#: utils/adt/date.c:416 utils/adt/date.c:453
+msgid "date out of range for timestamp"
+msgstr "date fora do intervalo para timestamp"
 
-#: libpq/auth.c:1294
-#, c-format
-msgid "expected SSPI response, got message type %d"
-msgstr "resposta do SSPI esperada, recebeu tipo de mensagem %d"
+#: utils/adt/date.c:986
+msgid "cannot convert reserved abstime value to date"
+msgstr "não pode converter valor de abstime reservado para date"
 
-#: libpq/auth.c:1366
-msgid "could not accept SSPI security context"
-msgstr "não pôde aceitar contexto de segurança do SSPI"
+#: utils/adt/date.c:1140 utils/adt/date.c:1147 utils/adt/date.c:1915
+#: utils/adt/date.c:1922
+msgid "time out of range"
+msgstr "time fora do intervalo"
 
-#: libpq/auth.c:1422
-msgid "could not get token from SSPI security context"
-msgstr "não pôde obter token do contexto de segurança do SSPI"
+#: utils/adt/date.c:1793 utils/adt/date.c:1810
+#, c-format
+msgid "\"time\" units \"%s\" not recognized"
+msgstr "unidades de \"time\" \"%s\" são desconhecidas"
+
+#: utils/adt/date.c:1932
+msgid "time zone displacement out of range"
+msgstr "deslocamento de zona horária fora do intervalo"
 
-#: libpq/auth.c:1665
+#: utils/adt/date.c:2557 utils/adt/date.c:2574
 #, c-format
-msgid "could not create socket for Ident connection: %m"
-msgstr "não pôde criar soquete para conexão com Ident: %m"
+msgid "\"time with time zone\" units \"%s\" not recognized"
+msgstr "unidades de \"time with time zone\" \"%s\" são desconhecidas"
 
-#: libpq/auth.c:1680
+#: utils/adt/date.c:2672
 #, c-format
-msgid "could not bind to local address \"%s\": %m"
-msgstr "não pôde se ligar ao endereço local \"%s\": %m"
+msgid "\"interval\" time zone \"%s\" not valid"
+msgstr "zona horária de \"interval\" \"%s\" não é válida"
 
-#: libpq/auth.c:1692
+#: utils/cache/lsyscache.c:2414 utils/cache/lsyscache.c:2447
+#: utils/cache/lsyscache.c:2480 utils/cache/lsyscache.c:2513
 #, c-format
-msgid "could not connect to Ident server at address \"%s\", port %s: %m"
-msgstr "não pôde conectar ao servidor Ident no endereço \"%s\", porta %s: %m"
+msgid "type %s is only a shell"
+msgstr "tipo %s é indefinido"
 
-#: libpq/auth.c:1712
+#: utils/cache/lsyscache.c:2419
 #, c-format
-msgid "could not send query to Ident server at address \"%s\", port %s: %m"
-msgstr ""
-"não pôde enviar consulta ao servidor Ident no endereço \"%s\", porta %s: %m"
+msgid "no input function available for type %s"
+msgstr "nenhuma função de entrada disponível para tipo %s"
 
-#: libpq/auth.c:1727
+#: utils/cache/lsyscache.c:2452
 #, c-format
-msgid ""
-"could not receive response from Ident server at address \"%s\", port %s: %m"
+msgid "no output function available for type %s"
+msgstr "nenhuma função de saída disponível para tipo %s"
+
+#: utils/cache/relmapper.c:454
+msgid "cannot PREPARE a transaction that modified relation mapping"
 msgstr ""
-"não pôde receber resposta do servidor Ident no endereço \"%s\", porta %s: %m"
+"não pode executar PREPARE em uma transação que modificou mapeamento de "
+"relação"
 
-#: libpq/auth.c:1737
+#: utils/cache/relmapper.c:596 utils/cache/relmapper.c:702
 #, c-format
-msgid "invalidly formatted response from Ident server: \"%s\""
-msgstr "resposta invalidamente formatada pelo servidor Ident: \"%s\""
+msgid "could not open relation mapping file \"%s\": %m"
+msgstr "não pôde abrir arquivo de mapeamento de relação \"%s\": %m"
 
-#: libpq/auth.c:1772 libpq/auth.c:1802 libpq/auth.c:1830 libpq/auth.c:1906
+#: utils/cache/relmapper.c:609
 #, c-format
-msgid "could not get peer credentials: %m"
-msgstr "não pôde receber credenciais: %m"
+msgid "could not read relation mapping file \"%s\": %m"
+msgstr "não pôde ler do arquivo de mapeamento de relação \"%s\": %m"
 
-#: libpq/auth.c:1781 libpq/auth.c:1811 libpq/auth.c:1848 libpq/auth.c:1917
+#: utils/cache/relmapper.c:619
 #, c-format
-msgid "local user with ID %d does not exist"
-msgstr "usuário local com ID %d não existe"
+msgid "relation mapping file \"%s\" contains invalid data"
+msgstr "arquivo de mapeamento de relação \"%s\" contém dados inválidos"
 
-#: libpq/auth.c:1838
+#: utils/cache/relmapper.c:629
 #, c-format
-msgid "could not get effective UID from peer credentials: %m"
-msgstr "não pôde obter UID efetivo das credenciais: %m"
-
-#: libpq/auth.c:1928
-msgid ""
-"Ident authentication is not supported on local connections on this platform"
+msgid "relation mapping file \"%s\" contains incorrect checksum"
 msgstr ""
-"autenticação do tipo Ident não é suportada em conexões locais nesta "
-"plataforma"
-
-#: libpq/auth.c:2045 libpq/auth.c:2317 libpq/auth.c:2677
-msgid "empty password returned by client"
-msgstr "senha vazia retornada pelo cliente"
+"arquivo de mapeamento de relação \"%s\" contém soma de verificação incorreta"
 
-#: libpq/auth.c:2055
+#: utils/cache/relmapper.c:741
 #, c-format
-msgid "error from underlying PAM layer: %s"
-msgstr "erro da biblioteca PAM: %s"
+msgid "could not write to relation mapping file \"%s\": %m"
+msgstr "não pôde escrever no arquivo de mapeamento de relação \"%s\": %m"
 
-#: libpq/auth.c:2124
+#: utils/cache/relmapper.c:754
 #, c-format
-msgid "could not create PAM authenticator: %s"
-msgstr "não pôde criar autenticador PAM: %s"
+msgid "could not fsync relation mapping file \"%s\": %m"
+msgstr "não pôde executar fsync no arquivo de mapeamento de relação \"%s\": %m"
 
-#: libpq/auth.c:2135
+#: utils/cache/relmapper.c:760
 #, c-format
-msgid "pam_set_item(PAM_USER) failed: %s"
-msgstr "pam_set_item(PAM_USER) falhou: %s"
+msgid "could not close relation mapping file \"%s\": %m"
+msgstr "não pôde fechar arquivo de mapeamento de relação \"%s\": %m"
 
-#: libpq/auth.c:2146
+#: utils/cache/typcache.c:629
 #, c-format
-msgid "pam_set_item(PAM_CONV) failed: %s"
-msgstr "pam_set_item(PAM_CONV) falhou: %s"
+msgid "type %s is not composite"
+msgstr "tipo %s não é composto"
 
-#: libpq/auth.c:2157
-#, c-format
-msgid "pam_authenticate failed: %s"
-msgstr "pam_authenticate falhou: %s"
+#: utils/cache/typcache.c:643
+msgid "record type has not been registered"
+msgstr "tipo record não foi registrado"
 
-#: libpq/auth.c:2168
+#: utils/cache/relcache.c:4285
 #, c-format
-msgid "pam_acct_mgmt failed: %s"
-msgstr "pam_acct_mgmt falhou: %s"
+msgid "could not create relation-cache initialization file \"%s\": %m"
+msgstr ""
+"não pôde criar arquivo de inicialização de cache de relações \"%s\": %m"
 
-#: libpq/auth.c:2179
-#, c-format
-msgid "could not release PAM authenticator: %s"
-msgstr "não pôde liberar autenticador PAM: %s"
+#: utils/cache/relcache.c:4287
+msgid "Continuing anyway, but there's something wrong."
+msgstr "Continuando mesmo assim, mas há algo errado."
 
-#: libpq/auth.c:2212 libpq/auth.c:2216
+#: utils/cache/relcache.c:4501
 #, c-format
-msgid "could not initialize LDAP: error code %d"
-msgstr "não pôde inicializar LDAP: código de erro %d"
+msgid "could not remove cache file \"%s\": %m"
+msgstr "não pôde remover arquivo de cache \"%s\": %m"
+
+#: utils/cache/plancache.c:589
+msgid "cached plan must not change result type"
+msgstr "plano em cache não deve mudar tipo resultante"
 
-#: libpq/auth.c:2226
+#: utils/fmgr/funcapi.c:354
 #, c-format
-msgid "could not set LDAP protocol version: error code %d"
-msgstr "não pôde definir versão do protocolo LDAP: código de erro %d"
+msgid ""
+"could not determine actual result type for function \"%s\" declared to "
+"return type %s"
+msgstr ""
+"não pôde determinar tipo de resultado para função \"%s\" declarada para "
+"retornar tipo %s"
 
-#: libpq/auth.c:2255
-msgid "could not load wldap32.dll"
-msgstr "não pôde carregar wldap32.dll"
+#: utils/fmgr/funcapi.c:1208 utils/fmgr/funcapi.c:1239
+msgid "number of aliases does not match number of columns"
+msgstr "número de aliases não corresponde ao número de colunas"
 
-#: libpq/auth.c:2263
-msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
-msgstr "não pôde carregar função _ldap_start_tls_sA em wldap32.dll"
+#: utils/fmgr/funcapi.c:1233
+msgid "no column alias was provided"
+msgstr "nenhum aliás de coluna foi fornecido"
 
-#: libpq/auth.c:2264
-msgid "LDAP over SSL is not supported on this platform."
-msgstr "LDAP sobre SSL não é suportado nesta plataforma."
+#: utils/fmgr/funcapi.c:1257
+msgid "could not determine row description for function returning record"
+msgstr ""
+"não pôde determinar descrição de registro para função que retorna record"
 
-#: libpq/auth.c:2279
+#: utils/fmgr/fmgr.c:270
 #, c-format
-msgid "could not start LDAP TLS session: error code %d"
-msgstr "não pôde iniciar sessão LDAP TLS: código de erro %d"
-
-#: libpq/auth.c:2301
-msgid "LDAP server not specified"
-msgstr "servidor LDAP não foi especificado"
+msgid "internal function \"%s\" is not in internal lookup table"
+msgstr "função interna \"%s\" não está na tabela de busca interna"
 
-#: libpq/auth.c:2353
-msgid "invalid character in user name for LDAP authentication"
-msgstr "caracter inválido em nome de usuário para autenticação LDAP"
+#: utils/fmgr/fmgr.c:474
+#, c-format
+msgid "unrecognized API version %d reported by info function \"%s\""
+msgstr "versão %d de API informada pela função \"%s\" é desconhecida"
 
-#: libpq/auth.c:2368
-#, fuzzy, c-format
-msgid ""
-"could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": "
-"error code %d"
-msgstr ""
-"não pôde realizar ligação inicial LDAP para ldapbinddn \"%s\" no servidor \"%s\": código de erro %d"
+#: utils/fmgr/fmgr.c:845 utils/fmgr/fmgr.c:2106
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr "função %u tem muitos argumentos (%d, máximo é %d)"
 
-#: libpq/auth.c:2393
-#, fuzzy, c-format
-msgid "could not search LDAP for filter \"%s\" on server \"%s\": error code %d"
-msgstr ""
-"não pôde buscar no LDAP por filtro \"%s\" no servidor \"%s\": código de erro %d"
+#: utils/fmgr/dfmgr.c:125
+#, c-format
+msgid "could not find function \"%s\" in file \"%s\""
+msgstr "não pôde encontrar função \"%s\" no arquivo \"%s\""
 
-#: libpq/auth.c:2403
-#, fuzzy, c-format
-msgid "LDAP search failed for filter \"%s\" on server \"%s\": no such user"
-msgstr ""
-"busca LDAP falhou para filtro \"%s\" no servidor \"%s\": usuário não existe"
+#: utils/fmgr/dfmgr.c:204 utils/fmgr/dfmgr.c:413 utils/fmgr/dfmgr.c:461
+#, c-format
+msgid "could not access file \"%s\": %m"
+msgstr "não pôde acessar arquivo \"%s\": %m"
 
-#: libpq/auth.c:2407
-#, fuzzy, c-format
-msgid ""
-"LDAP search failed for filter \"%s\" on server \"%s\": user is not unique "
-"(%ld matches)"
-msgstr ""
-"busca LDAP falhou para filtro \"%s\" no servidor \"%s\": usuário não é único (%ld usuários)"
-"erro %d"
+#: utils/fmgr/dfmgr.c:242
+#, c-format
+msgid "could not load library \"%s\": %s"
+msgstr "não pôde carregar biblioteca \"%s\": %s"
 
-#: libpq/auth.c:2424
-#, fuzzy, c-format
-msgid ""
-"could not get dn for the first entry matching \"%s\" on server \"%s\": %s"
-msgstr "não pôde obter dn para a primeira entrada que corresponde a \"%s\" no servidor \"%s\": %s"
+#: utils/fmgr/dfmgr.c:274
+#, c-format
+msgid "incompatible library \"%s\": missing magic block"
+msgstr "biblioteca \"%s\" é incompatível: faltando bloco mágico"
 
-#: libpq/auth.c:2444
-#, fuzzy, c-format
-msgid "could not unbind after searching for user \"%s\" on server \"%s\": %s"
+#: utils/fmgr/dfmgr.c:276
+msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
 msgstr ""
-"não pôde desligar após buscar pelo usuário \"%s\" no servidor \"%s\": %s"
+"Bibliotecas de extensões são obrigadas a utilizar o macro PG_MODULE_MAGIC."
 
-#: libpq/auth.c:2481
+#: utils/fmgr/dfmgr.c:312
 #, c-format
-msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
-msgstr ""
-"autenticação LDAP falhou para usuário \"%s\" no servidor \"%s\": código de "
-"erro %d"
+msgid "incompatible library \"%s\": version mismatch"
+msgstr "biblioteca \"%s\" é incompatível: versão não corresponde"
 
-#: libpq/auth.c:2509
-#, fuzzy, c-format
-msgid ""
-"certificate authentication failed for user \"%s\": client certificate "
-"contains no user name"
-msgstr ""
-"autenticação com certificado falhou para usuário \"%s\": certificado "
-"cliente não contém usuário"
+#: utils/fmgr/dfmgr.c:314
+#, c-format
+msgid "Server is version %d.%d, library is version %d.%d."
+msgstr "Servidor tem versão %d,%d, biblioteca tem versão %d.%d."
 
-#: libpq/auth.c:2633
-msgid "RADIUS server not specified"
-msgstr "servidor RADIUS não foi especificado"
+#: utils/fmgr/dfmgr.c:333
+#, c-format
+msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
+msgstr "Servidor tem FUNC_MAX_ARGS = %d, biblioteca tem %d."
 
-#: libpq/auth.c:2640
-#, fuzzy
-msgid "RADIUS secret not specified"
-msgstr "segredo RADIUS não foi especificado"
+#: utils/fmgr/dfmgr.c:342
+#, c-format
+msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
+msgstr "Servidor tem INDEX_MAX_KEYS = %d, biblioteca tem %d."
 
-#: libpq/auth.c:2656 libpq/hba.c:1213
+#: utils/fmgr/dfmgr.c:351
 #, c-format
-msgid "could not translate RADIUS server name \"%s\" to address: %s"
-msgstr "não pôde traduzir nome de servidor RADIUS \"%s\" para endereço: %s"
+msgid "Server has NAMEDATALEN = %d, library has %d."
+msgstr "Servidor tem NAMEDATALEN = %d, biblioteca tem %d."
 
-#: libpq/auth.c:2684
-msgid ""
-"RADIUS authentication does not support passwords longer than 16 characters"
-msgstr ""
-"autenticação RADIUS não suporta senhas mais longas do que 16 caracteres"
+#: utils/fmgr/dfmgr.c:360
+#, c-format
+msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
+msgstr "Servidor tem FLOAT4PASSBYVAL = %s, biblioteca tem %s."
 
-#: libpq/auth.c:2695
-#, fuzzy
-msgid "could not generate random encryption vector"
-msgstr "não pôde gerar vetor de encriptação randômico"
+#: utils/fmgr/dfmgr.c:369
+#, c-format
+msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
+msgstr "Servidor tem FLOAT8PASSBYVAL = %s, biblioteca tem %s."
 
-#: libpq/auth.c:2718
-#, fuzzy
-msgid "could not perform MD5 encryption of password"
-msgstr "não pôde realizar encriptação MD5 da senha"
+#: utils/fmgr/dfmgr.c:376
+msgid "Magic block has unexpected length or padding difference."
+msgstr "Bloco mágico tem tamanho inesperado ou diferença no enchimento."
 
-#: libpq/auth.c:2740
+#: utils/fmgr/dfmgr.c:379
 #, c-format
-msgid "could not create RADIUS socket: %m"
-msgstr "não pôde criar soquete RADIUS: %m"
+msgid "incompatible library \"%s\": magic block mismatch"
+msgstr "biblioteca \"%s\" é incompatível: bloco mágico não corresponde"
 
-#: libpq/auth.c:2761
+#: utils/fmgr/dfmgr.c:545
 #, c-format
-msgid "could not bind local RADIUS socket: %m"
-msgstr "não pôde se ligar ao soquete RADIUS: %m"
+msgid "access to library \"%s\" is not allowed"
+msgstr "acesso a biblioteca \"%s\" não é permitido"
 
-#: libpq/auth.c:2771
+#: utils/fmgr/dfmgr.c:572
 #, c-format
-msgid "could not send RADIUS packet: %m"
-msgstr "não pôde enviar pacote RADIUS: %m"
-
-#: libpq/auth.c:2796
-#, fuzzy, c-format
-msgid "could not check status on RADIUS socket: %m"
-msgstr "não pôde verificar estado no soquete RADIUS: %m"
+msgid "invalid macro name in dynamic library path: %s"
+msgstr "nome de macro é inválido no caminho de biblioteca dinâmica: %s"
 
-#: libpq/auth.c:2803
-#, fuzzy
-msgid "timeout waiting for RADIUS response"
-msgstr "tempo de espera esgotado para resposta do RADIUS"
+#: utils/fmgr/dfmgr.c:617
+msgid "zero-length component in parameter \"dynamic_library_path\""
+msgstr "componente de tamanho zero no parâmetro \"dynamic_library_path\""
 
-#: libpq/auth.c:2819
-#, fuzzy, c-format
-msgid "could not read RADIUS response: %m"
-msgstr "não pôde ler resposta RADIUS: %m"
+#: utils/fmgr/dfmgr.c:636
+msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
+msgstr ""
+"componente no parâmetro \"dynamic_library_path\" não é um caminho absoluto"
 
-#: libpq/auth.c:2834 libpq/auth.c:2838
+#: utils/sort/logtape.c:213
 #, c-format
-msgid "RADIUS response was sent from incorrect port: %i"
-msgstr "resposta RADIUS foi enviada de porta incorreta: %i"
+msgid "could not write block %ld of temporary file: %m"
+msgstr "não pôde escrever bloco %ld do arquivo temporário: %m"
+
+#: utils/sort/logtape.c:215
+msgid "Perhaps out of disk space?"
+msgstr "Talvez esteja faltando espaço em disco?"
 
-#: libpq/auth.c:2847
+#: utils/sort/logtape.c:232
 #, c-format
-msgid "RADIUS response too short: %i"
-msgstr "resposta RADIUS muito curta: %i"
+msgid "could not read block %ld of temporary file: %m"
+msgstr "não pôde ler bloco %ld do arquivo temporário: %m"
 
-#: libpq/auth.c:2854
+#: utils/sort/tuplesort.c:3131
 #, c-format
-msgid "RADIUS response has corrupt length: %i (actual length %i)"
-msgstr "resposta RADIUS tem tamanho corrompido: %i (tamanho atual %i)"
+msgid "could not create unique index \"%s\""
+msgstr "não pôde criar índice único \"%s\""
 
-#: libpq/auth.c:2862
+#: utils/sort/tuplesort.c:3133
 #, c-format
-msgid "RADIUS response is to a different request: %i (should be %i)"
-msgstr "resposta RADIUS é para uma solicitação diferente: %i (deveria ser %i)"
+msgid "Key %s is duplicated."
+msgstr "Chave %s está duplicada."
 
-#: libpq/auth.c:2887
-#, fuzzy
-msgid "could not perform MD5 encryption of received packet"
-msgstr "não pôde realizar encriptação MD5 do pacote recebido"
+#: utils/mb/encnames.c:485
+msgid "encoding name too long"
+msgstr "nome da codificação é muito longo"
 
-#: libpq/auth.c:2896
-msgid "RADIUS response has incorrect MD5 signature"
-msgstr "resposta RADIUS tem assinatura MD5 incorreta"
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
+#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
+#, c-format
+msgid "unexpected encoding ID %d for WIN character sets"
+msgstr "ID de codificação %d é inesperado para conjuntos de caracteres WIN"
 
-#: libpq/auth.c:2907
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
+#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
 #, c-format
-msgid "RADIUS response has invalid code (%i) for user \"%s\""
-msgstr "resposta RADIUS tem código inválido (%i) para usuário \"%s\""
+msgid "unexpected encoding ID %d for ISO 8859 character sets"
+msgstr ""
+"ID de codificação %d é inesperado para conjuntos de caracteres ISO 8859"
 
-#: libpq/hba.c:158
+#: utils/mb/wchar.c:1611
 #, c-format
-msgid "authentication file token too long, skipping: \"%s\""
-msgstr "informação no arquivo de autenticação é muito longa, ignorando: \"%s\""
+msgid "invalid byte sequence for encoding \"%s\": 0x%s"
+msgstr "sequência de bytes é inválida para codificação \"%s\": 0x%s"
 
-#: libpq/hba.c:351
+#: utils/mb/wchar.c:1640
 #, c-format
-msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
-msgstr ""
-"não pôde abrir arquivo de autenticação secundário \"@%s\" como \"%s\": %m"
+msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
+msgstr "caracter 0x%s da codificação \"%s\" não tem equivalente em \"%s\""
 
-#. translator: the second %s is a list of auth methods
-#: libpq/hba.c:651
+#: utils/mb/mbutils.c:281
+#, c-format
+msgid "conversion between %s and %s is not supported"
+msgstr "conversão entre %s e %s não é suportada"
+
+#: utils/mb/mbutils.c:351
 #, c-format
 msgid ""
-"authentication option \"%s\" is only valid for authentication methods %s"
+"default conversion function for encoding \"%s\" to \"%s\" does not exist"
 msgstr ""
-"opção de autenticação \"%s\" só é válida para métodos de autenticação %s"
+"função padrão de conversão da codificação \"%s\" para \"%s\" não existe"
 
-#: libpq/hba.c:667
+#: utils/mb/mbutils.c:375 utils/mb/mbutils.c:676
 #, c-format
-msgid "authentication method \"%s\" requires argument \"%s\" to be set"
+msgid "String of %d bytes is too long for encoding conversion."
 msgstr ""
-"método de autenticação \"%s\" requer que argumento \"%s\" seja definido"
+"Cadeia de caracteres de %d bytes é muito longa para conversão entre "
+"codificações."
 
-#: libpq/hba.c:713
-msgid "hostssl not supported on this platform"
-msgstr "hostssl não é suportado nessa plataforma"
+#: utils/mb/mbutils.c:462
+#, c-format
+msgid "invalid source encoding name \"%s\""
+msgstr "nome da codificação de origem \"%s\" é inválido"
 
-#: libpq/hba.c:714
-msgid "Compile with --with-openssl to use SSL connections."
-msgstr "Compile com --with-openssl para utilizar conexões SSL."
+#: utils/mb/mbutils.c:467
+#, c-format
+msgid "invalid destination encoding name \"%s\""
+msgstr "nome da codificação de destino \"%s\" é inválido"
 
-#: libpq/hba.c:736
+#: utils/mb/mbutils.c:589
 #, c-format
-msgid "invalid connection type \"%s\""
-msgstr "tipo de conexão \"%s\" inválido"
+msgid "invalid byte value for encoding \"%s\": 0x%02x"
+msgstr "valor de byte é inválido para codificação \"%s\": 0x%02x"
 
-#: libpq/hba.c:749
-msgid "end-of-line before database specification"
-msgstr "fim de linha antes da especificação de banco de dados"
+#: utils/mb/conv.c:509
+#, c-format
+msgid "invalid encoding number: %d"
+msgstr "número de codificação é inválido: %d"
 
-#: libpq/hba.c:762
-msgid "end-of-line before role specification"
-msgstr "fim de linha antes da especificação de role"
+#: utils/error/assert.c:37
+msgid "TRAP: ExceptionalCondition: bad arguments\n"
+msgstr "TRAP: ExceptionalCondition: argumentos inválidos\n"
 
-#: libpq/hba.c:777
-msgid "end-of-line before IP address specification"
-msgstr "fim de linha antes da especificação de endereço IP"
+#: utils/error/assert.c:40
+#, c-format
+msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
+msgstr "TRAP: %s(\"%s\", Arquivo: \"%s\", Linha: %d)\n"
 
-#: libpq/hba.c:823
+#: utils/error/elog.c:1525
 #, c-format
-msgid "invalid IP address \"%s\": %s"
-msgstr "endereço IP \"%s\" inválido: %s"
+msgid "could not reopen file \"%s\" as stderr: %m"
+msgstr "não pôde reabrir arquivo \"%s\" como saída stderr: %m"
 
-#: libpq/hba.c:846
+#: utils/error/elog.c:1538
 #, c-format
-msgid "invalid CIDR mask in address \"%s\""
-msgstr "máscara CIDR inválida no endereço \"%s\""
+msgid "could not reopen file \"%s\" as stdout: %m"
+msgstr "não pôde reabrir arquivo \"%s\" como saida stdout: %m"
 
-#: libpq/hba.c:864
-msgid "end-of-line before netmask specification"
-msgstr "fim de linha antes da especificação de máscara de rede"
+#: utils/error/elog.c:1928 utils/error/elog.c:1938 utils/error/elog.c:1948
+msgid "[unknown]"
+msgstr "[desconhecido]"
+
+#: utils/error/elog.c:2299 utils/error/elog.c:2579 utils/error/elog.c:2657
+msgid "missing error text"
+msgstr "faltando mensagem de erro"
 
-#: libpq/hba.c:876
+#: utils/error/elog.c:2302 utils/error/elog.c:2305 utils/error/elog.c:2660
+#: utils/error/elog.c:2663
 #, c-format
-msgid "invalid IP mask \"%s\": %s"
-msgstr "máscara de endereço IP \"%s\" inválida: %s"
+msgid " at character %d"
+msgstr " no caracter %d"
 
-#: libpq/hba.c:893
-msgid "IP address and mask do not match"
-msgstr "endereço IP e máscara não correspodem"
+#: utils/error/elog.c:2315 utils/error/elog.c:2322
+msgid "DETAIL:  "
+msgstr "DETALHE:  "
 
-#: libpq/hba.c:908
-msgid "end-of-line before authentication method"
-msgstr "fim de linha antes do método de autenticação"
+#: utils/error/elog.c:2329
+msgid "HINT:  "
+msgstr "DICA:  "
+
+#: utils/error/elog.c:2336
+msgid "QUERY:  "
+msgstr "CONSULTA:  "
+
+#: utils/error/elog.c:2343
+msgid "CONTEXT:  "
+msgstr "CONTEXTO:  "
 
-#: libpq/hba.c:979
+#: utils/error/elog.c:2353
 #, c-format
-msgid "invalid authentication method \"%s\""
-msgstr "método de autenticação \"%s\" inválido"
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "LOCAL:  %s, %s:%d\n"
 
-#: libpq/hba.c:990
+#: utils/error/elog.c:2360
 #, c-format
-msgid "invalid authentication method \"%s\": not supported on this platform"
-msgstr ""
-"método de autenticação \"%s\" inválido: não é suportado nesta plataforma"
+msgid "LOCATION:  %s:%d\n"
+msgstr "LOCAL:  %s:%d\n"
 
-#: libpq/hba.c:1003
-msgid "krb5 authentication is not supported on local sockets"
-msgstr "autenticação krb5 não é suportada em soquetes locais"
+#: utils/error/elog.c:2374
+msgid "STATEMENT:  "
+msgstr "COMANDO:  "
 
-#: libpq/hba.c:1014
-msgid "gssapi authentication is not supported on local sockets"
-msgstr "autenticação do tipo gssapi não é suportada em soquetes locais"
+#. translator: This string will be truncated at 47
+#. characters expanded.
+#: utils/error/elog.c:2772
+#, c-format
+msgid "operating system error %d"
+msgstr "erro do sistema operacional %d"
 
-#: libpq/hba.c:1031
-msgid "cert authentication is only supported on hostssl connections"
-msgstr "autenticação do tipo cert só é suportada em conexões hostssl"
+#: utils/error/elog.c:2795
+msgid "DEBUG"
+msgstr "DEPURAÇÃO"
 
-#: libpq/hba.c:1052
-#, c-format
-msgid "authentication option not in name=value format: %s"
-msgstr "opção de autenticação não está  no formato nome=valor: %s"
+#: utils/error/elog.c:2799
+msgid "LOG"
+msgstr "LOG"
 
-#: libpq/hba.c:1067
-msgid "ident, krb5, gssapi, sspi and cert"
-msgstr "ident, krb5, gssapi, sspi e cert"
+#: utils/error/elog.c:2802
+msgid "INFO"
+msgstr "INFO"
 
-#: libpq/hba.c:1081
-msgid "clientcert can only be configured for \"hostssl\" rows"
-msgstr "clientcert só pode ser configurado para registros \"hostssl\""
+#: utils/error/elog.c:2805
+msgid "NOTICE"
+msgstr "NOTA"
 
-#: libpq/hba.c:1092
-msgid ""
-"client certificates can only be checked if a root certificate store is "
-"available"
-msgstr ""
-"certificados cliente só podem ser verificados se um certificado raiz estiver "
-"disponível"
+#: utils/error/elog.c:2808
+msgid "WARNING"
+msgstr "AVISO"
 
-#: libpq/hba.c:1093
-msgid "Make sure the root.crt file is present and readable."
-msgstr "Tenha certeza que o arquivo root.crt está presente e pode ser lido"
+#: utils/error/elog.c:2811
+msgid "ERROR"
+msgstr "ERRO"
 
-#: libpq/hba.c:1106
-msgid "clientcert can not be set to 0 when using \"cert\" authentication"
-msgstr ""
-"clientcert não pode ser definido com 0 ao utilizar autenticação \"cert\""
+#: utils/error/elog.c:2814
+msgid "FATAL"
+msgstr "FATAL"
+
+#: utils/error/elog.c:2817
+msgid "PANIC"
+msgstr "PÂNICO"
+
+#: utils/init/postinit.c:225
+#, c-format
+msgid "replication connection authorized: user=%s"
+msgstr "conexão de replicação autorizada: usuário=%s"
+
+#: utils/init/postinit.c:229
+#, c-format
+msgid "connection authorized: user=%s database=%s"
+msgstr "conexão autorizada: usuário=%s banco de dados=%s"
+
+#: utils/init/postinit.c:260
+#, c-format
+msgid "database \"%s\" has disappeared from pg_database"
+msgstr "banco de dados \"%s\" desapareceu de pg_database"
+
+#: utils/init/postinit.c:262
+#, c-format
+msgid "Database OID %u now seems to belong to \"%s\"."
+msgstr "Banco de dados com OID %u parece pertencer a \"%s\"."
 
-#: libpq/hba.c:1140
+#: utils/init/postinit.c:282
 #, c-format
-msgid "invalid LDAP port number: \"%s\""
-msgstr "número de porta LDAP é inválido: \"%s\""
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "banco de dados \"%s\" não está aceitando conexões"
 
-#: libpq/hba.c:1186 libpq/hba.c:1194
-msgid "krb5, gssapi and sspi"
-msgstr "krb5, gssapi e sspi"
+#: utils/init/postinit.c:295
+#, c-format
+msgid "permission denied for database \"%s\""
+msgstr "permissão negada para banco de dados \"%s\""
+
+#: utils/init/postinit.c:296
+msgid "User does not have CONNECT privilege."
+msgstr "Usuário não tem privilégio CONNECT."
 
-#: libpq/hba.c:1232
+#: utils/init/postinit.c:313
 #, c-format
-msgid "invalid RADIUS port number: \"%s\""
-msgstr "número de porta RADIUS é inválido: \"%s\""
+msgid "too many connections for database \"%s\""
+msgstr "muitas conexões para banco de dados \"%s\""
 
-#: libpq/hba.c:1252
-#, fuzzy, c-format
-msgid "unrecognized authentication option name: \"%s\""
-msgstr "nome de opção de autenticação desconhecido: \"%s\""
+#: utils/init/postinit.c:335 utils/init/postinit.c:342
+msgid "database locale is incompatible with operating system"
+msgstr ""
+"configuração regional do banco de dados é incompatível com o sistema "
+"operacional"
 
-#: libpq/hba.c:1284
+#: utils/init/postinit.c:336
+#, c-format
 msgid ""
-"cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute "
-"together with ldapprefix"
+"The database was initialized with LC_COLLATE \"%s\",  which is not "
+"recognized by setlocale()."
 msgstr ""
-"não pode utilizar ldapbasedn, ldapbinddn, ldapbindpasswd ou "
-"ldapsearchattribute junto com ldapprefix"
+"O banco de dados foi inicializado com LC_COLLATE \"%s\", que não é "
+"reconhecido pelo setlocale()."
 
-#: libpq/hba.c:1294
+#: utils/init/postinit.c:338 utils/init/postinit.c:345
 msgid ""
-"authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix"
-"\", or \"ldapsuffix\" to be set"
+"Recreate the database with another locale or install the missing locale."
 msgstr ""
-"método de autenticação \"ldap\" requer que argumento \"ldapbasedn\", "
-"\"ldapprefix\" ou \"ldapsuffix\" seja definido"
+"Recrie o banco de dados com outra configuração regional ou instale a "
+"configuração regional que falta."
 
-#: libpq/hba.c:1614
+#: utils/init/postinit.c:343
 #, c-format
-msgid "invalid regular expression \"%s\": %s"
-msgstr "expressão regular \"%s\" é inválida: %s"
+msgid ""
+"The database was initialized with LC_CTYPE \"%s\",  which is not recognized "
+"by setlocale()."
+msgstr ""
+"O banco de dados foi inicializado com LC_CTYPE \"%s\", que não é reconhecido "
+"pelo setlocale()."
 
-#: libpq/hba.c:1637
-#, c-format
-msgid "regular expression match for \"%s\" failed: %s"
-msgstr "correspondência de expressão regular \"%s\" falhou: %s"
+#: utils/init/postinit.c:599
+msgid "no roles are defined in this database system"
+msgstr "nenhuma role está definida nesse sistema de banco de dados"
 
-#: libpq/hba.c:1655
+#: utils/init/postinit.c:600
 #, c-format
+msgid "You should immediately run CREATE USER \"%s\" SUPERUSER;."
+msgstr "Você deve executar imediatamente CREATE USER \"%s\" SUPERUSER;."
+
+#: utils/init/postinit.c:623
+msgid "new replication connections are not allowed during database shutdown"
+msgstr ""
+"novas conexões de replicação não são permitidas durante desligamento de "
+"banco de dados"
+
+#: utils/init/postinit.c:627
+msgid "must be superuser to connect during database shutdown"
+msgstr ""
+"deve ser super-usuário para se conectar durante desligamento de banco de "
+"dados"
+
+#: utils/init/postinit.c:637
+msgid "must be superuser to connect in binary upgrade mode"
+msgstr "deve ser super-usuário para se conectar no modo de atualização binária"
+
+#: utils/init/postinit.c:651
 msgid ""
-"regular expression \"%s\" has no subexpressions as requested by "
-"backreference in \"%s\""
+"remaining connection slots are reserved for non-replication superuser "
+"connections"
 msgstr ""
-"expressão regular \"%s\" não tem subexpressões como informado na referência "
-"anterior em \"%s\""
+"lacunas de conexão remanescentes são reservadas para conexões de super-"
+"usuário que não sejam usadas para replicação"
 
-#: libpq/hba.c:1721
+#: utils/init/postinit.c:666
+msgid "must be replication role to start walsender"
+msgstr "deve ser role de replicação para iniciar walsender"
+
+#: utils/init/postinit.c:726
 #, c-format
-msgid "missing entry in file \"%s\" at end of line %d"
-msgstr "faltando entrada no arquivo \"%s\" no fim da linha %d"
+msgid "database %u does not exist"
+msgstr "banco de dados %u não existe"
 
-#: libpq/hba.c:1762
-#, fuzzy, c-format
-msgid "provided user name (%s) and authenticated user name (%s) do not match"
-msgstr "usuário fornecido (%s) e usuário autenticado (%s) não correspondem"
+#: utils/init/postinit.c:778
+msgid "It seems to have just been dropped or renamed."
+msgstr "Parece ter sido removido ou renomeado."
 
-#: libpq/hba.c:1783
-#, fuzzy, c-format
-msgid "no match in usermap \"%s\" for user \"%s\" authenticated as \"%s\""
-msgstr ""
-"não há correspondência em mapa de usuários para usuário \"%s\" autenticado "
-"como \"%s\""
+#: utils/init/postinit.c:796
+#, c-format
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "O subdiretório do banco de dados \"%s\" não foi encontrado."
 
-#: libpq/hba.c:1807
+#: utils/init/postinit.c:801
 #, c-format
-msgid "could not open usermap file \"%s\": %m"
-msgstr "não pôde abrir arquivo com mapa de usuários \"%s\": %m"
+msgid "could not access directory \"%s\": %m"
+msgstr "não pôde acessar diretório \"%s\": %m"
 
-#: libpq/be-secure.c:283 libpq/be-secure.c:378
+#: utils/init/miscinit.c:115
 #, c-format
-msgid "SSL error: %s"
-msgstr "erro de SSL: %s"
+msgid "could not change directory to \"%s\": %m"
+msgstr "não pôde mudar diretório para \"%s\": %m"
 
-#: libpq/be-secure.c:292 libpq/be-secure.c:387 libpq/be-secure.c:951
+#: utils/init/miscinit.c:460
 #, c-format
-msgid "unrecognized SSL error code: %d"
-msgstr "código de erro SSL desconhecido: %d"
+msgid "role \"%s\" is not permitted to log in"
+msgstr "role \"%s\" não tem permissão para entrar"
 
-#: libpq/be-secure.c:331 libpq/be-secure.c:335 libpq/be-secure.c:345
-msgid "SSL renegotiation failure"
-msgstr "renegociação SSL falhou"
+#: utils/init/miscinit.c:478
+#, c-format
+msgid "too many connections for role \"%s\""
+msgstr "muitas conexões para role \"%s\""
 
-#: libpq/be-secure.c:339
-msgid "SSL failed to send renegotiation request"
-msgstr "SSL falhou ao enviar pedido de renegociação"
+#: utils/init/miscinit.c:538
+msgid "permission denied to set session authorization"
+msgstr "permissão negada ao definir autorização de sessão"
 
-#: libpq/be-secure.c:736
+#: utils/init/miscinit.c:618
 #, c-format
-msgid "could not create SSL context: %s"
-msgstr "não pôde criar contexto SSL: %s"
+msgid "invalid role OID: %u"
+msgstr "OID de role é inválido: %u"
 
-#: libpq/be-secure.c:746
+#: utils/init/miscinit.c:750
 #, c-format
-msgid "could not load server certificate file \"%s\": %s"
-msgstr "não pôde carregar arquivo de certificado do servidor \"%s\": %s"
+msgid "could not create lock file \"%s\": %m"
+msgstr "não pôde criar arquivo de bloqueio \"%s\": %m"
 
-#: libpq/be-secure.c:752
+#: utils/init/miscinit.c:764
 #, c-format
-msgid "could not access private key file \"%s\": %m"
-msgstr "não pôde acessar arquivo da chave privada \"%s\": %m"
+msgid "could not open lock file \"%s\": %m"
+msgstr "não pôde abrir arquivo de bloqueio \"%s\": %m"
 
-#: libpq/be-secure.c:767
+#: utils/init/miscinit.c:770
 #, c-format
-msgid "private key file \"%s\" has group or world access"
-msgstr "arquivo da chave privada \"%s\" tem acesso para grupo ou outros"
+msgid "could not read lock file \"%s\": %m"
+msgstr "não pôde ler arquivo de bloqueio \"%s\": %m"
 
-#: libpq/be-secure.c:769
-msgid "Permissions should be u=rw (0600) or less."
-msgstr "Permissões devem ser u=rwx (0600) ou menos."
+#: utils/init/miscinit.c:818
+#, c-format
+msgid "lock file \"%s\" already exists"
+msgstr "arquivo de bloqueio \"%s\" já existe"
 
-#: libpq/be-secure.c:776
+#: utils/init/miscinit.c:822
 #, c-format
-msgid "could not load private key file \"%s\": %s"
-msgstr "não pôde carregar arquivo da chave privada \"%s\": %s"
+msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Outro postgres (PID %d) está executando sob o diretório de dados \"%s\"?"
 
-#: libpq/be-secure.c:781
+#: utils/init/miscinit.c:824
 #, c-format
-msgid "check of private key failed: %s"
-msgstr "verificação de chave privada falhou: %s"
+msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
+msgstr ""
+"Outro postmaster (PID %d) está executando sob o diretório de dados \"%s\"?"
 
-#: libpq/be-secure.c:809
+#: utils/init/miscinit.c:827
 #, c-format
-msgid "could not access root certificate file \"%s\": %m"
-msgstr "não pôde acessar arquivo do certificado raiz \"%s\": %m"
+msgid "Is another postgres (PID %d) using socket file \"%s\"?"
+msgstr "Outro postgres (PID %d) está utilizando arquivo de soquete \"%s\"?"
 
-#: libpq/be-secure.c:820
+#: utils/init/miscinit.c:829
 #, c-format
-msgid "could not load root certificate file \"%s\": %s"
-msgstr "não pôde carregar arquivo do certificado raiz \"%s\": %s"
+msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
+msgstr "Outro postmaster (PID %d) está utilizando arquivo de soquete \"%s\"?"
 
-#: libpq/be-secure.c:843
+#: utils/init/miscinit.c:865
 #, c-format
-msgid "SSL certificate revocation list file \"%s\" ignored"
-msgstr "arquivo da lista de revogação de certificados SSL \"%s\" ignorado"
+msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
+msgstr ""
+"bloco de memória compartilhada existente (chave %lu, ID %lu) ainda está em "
+"uso"
 
-#: libpq/be-secure.c:845
-msgid "SSL library does not support certificate revocation lists."
+#: utils/init/miscinit.c:868
+#, c-format
+msgid ""
+"If you're sure there are no old server processes still running, remove the "
+"shared memory block or just delete the file \"%s\"."
 msgstr ""
-"biblioteca SSL instalada não suporta listas de revogação de certificados."
+"Se você tem certeza que não há processos servidor antigos sendo executados, "
+"remova o bloco de memória compartilhada ou apague o arquivo \"%s\"."
 
-#: libpq/be-secure.c:852
+#: utils/init/miscinit.c:884
 #, c-format
-msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
+msgid "could not remove old lock file \"%s\": %m"
+msgstr "não pôde remover arquivo de bloqueio antigo \"%s\": %m"
+
+#: utils/init/miscinit.c:886
+msgid ""
+"The file seems accidentally left over, but it could not be removed. Please "
+"remove the file by hand and try again."
 msgstr ""
-"arquivo da lista de revogação de certificados SSL (CRL) \"%s\" não foi "
-"encontrado, ignorando: %s"
+"O arquivo parece ter sido deixado acidentalmente, mas ele não pôde ser "
+"removido. Por favor remova o arquivo manualmente e tente novamente."
 
-#: libpq/be-secure.c:854
-msgid "Certificates will not be checked against revocation list."
-msgstr "Certificados não serão verificados na lista de revogação."
+#: utils/init/miscinit.c:920 utils/init/miscinit.c:931
+#: utils/init/miscinit.c:941
+#, c-format
+msgid "could not write lock file \"%s\": %m"
+msgstr "não pôde escrever no arquivo de bloqueio \"%s\": %m"
 
-#: libpq/be-secure.c:896
+#: utils/init/miscinit.c:1147 utils/init/miscinit.c:1160
 #, c-format
-msgid "could not initialize SSL connection: %s"
-msgstr "não pôde inicializar conexão SSL: %s"
+msgid "\"%s\" is not a valid data directory"
+msgstr "\"%s\" não é um diretório de dados válido"
 
-#: libpq/be-secure.c:905
+#: utils/init/miscinit.c:1149
 #, c-format
-msgid "could not set SSL socket: %s"
-msgstr "não pôde criar soquete SSL: %s"
+msgid "File \"%s\" is missing."
+msgstr "Arquivo \"%s\" não foi encontrado."
 
-#: libpq/be-secure.c:931
+#: utils/init/miscinit.c:1162
 #, c-format
-msgid "could not accept SSL connection: %m"
-msgstr "não pôde aceitar conexão SSL: %m"
+msgid "File \"%s\" does not contain valid data."
+msgstr "Arquivo \"%s\" não contém dados válidos."
 
-#: libpq/be-secure.c:935 libpq/be-secure.c:946
-msgid "could not accept SSL connection: EOF detected"
-msgstr "não pôde aceitar conexão SSL: EOF detectado"
+#: utils/init/miscinit.c:1164
+msgid "You might need to initdb."
+msgstr "Você precisa executar o initdb."
 
-#: libpq/be-secure.c:940
+#: utils/init/miscinit.c:1172
 #, c-format
-msgid "could not accept SSL connection: %s"
-msgstr "não pôde aceitar conexão SSL: %s"
+msgid ""
+"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
+"not compatible with this version %s."
+msgstr ""
+"O diretório de dados foi inicializado pelo PostgreSQL versão %ld.%ld, que "
+"não é compatível com essa versão %s."
 
-#: libpq/be-secure.c:991
-msgid "SSL certificate's common name contains embedded null"
-msgstr "nome do certificado SSL contém nulo embutido"
+#: utils/init/miscinit.c:1220
+#, c-format
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "sintaxe de lista é inválida para parâmetro \"%s\""
 
-#: libpq/be-secure.c:998
+#: utils/init/miscinit.c:1257
 #, c-format
-msgid "SSL connection from \"%s\""
-msgstr "conexão SSL de \"%s\""
+msgid "loaded library \"%s\""
+msgstr "biblioteca \"%s\" foi carregada"
 
-#: libpq/be-secure.c:1042
-msgid "no SSL error reported"
-msgstr "nenhum erro SSL relatado"
+#: ../port/win32error.c:188
+#, c-format
+msgid "mapped win32 error code %lu to %d"
+msgstr "código de erro win32 mapeado de %lu para %d"
 
-#: libpq/be-secure.c:1046
+#: ../port/win32error.c:199
 #, c-format
-msgid "SSL error code %lu"
-msgstr "código de erro SSL %lu"
+msgid "unrecognized win32 error code: %lu"
+msgstr "código de erro win32 desconhecido: %lu"
 
 #: ../port/strerror.c:25
 #, c-format
 msgid "unrecognized error %d"
 msgstr "erro desconhecido %d"
 
-#: ../port/chklocale.c:326 ../port/chklocale.c:332
-#, c-format
-msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
-msgstr ""
-"não pôde determinar codificação para configuração regional \"%s\": codeset é "
-"\"%s\""
-
-#: ../port/chklocale.c:334
-msgid "Please report this to <pgsql-bugs@postgresql.org>."
-msgstr "Por favor relate isto a <pgsql-bugs@postgresql.org>."
-
 #: ../port/open.c:113
 msgid "sharing violation"
 msgstr "violação de compartilhamento"
@@ -17115,6 +18518,17 @@ msgstr ""
 "Você pode ter programa de antivírus, cópia de segurança ou similares "
 "interferindo com o sistema de banco de dados."
 
+#: ../port/chklocale.c:328 ../port/chklocale.c:334
+#, c-format
+msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
+msgstr ""
+"não pôde determinar codificação para configuração regional \"%s\": codeset é "
+"\"%s\""
+
+#: ../port/chklocale.c:336
+msgid "Please report this to <pgsql-bugs@postgresql.org>."
+msgstr "Por favor relate isto a <pgsql-bugs@postgresql.org>."
+
 #: ../port/dirmod.c:75 ../port/dirmod.c:88 ../port/dirmod.c:101
 #, c-format
 msgid "out of memory\n"
@@ -17130,22 +18544,32 @@ msgstr "não pôde definir junção para \"%s\": %s"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "não pôde definir junção para \"%s\": %s\n"
 
-#: ../port/dirmod.c:325
+#: ../port/dirmod.c:358
+#, c-format
+msgid "could not get junction for \"%s\": %s"
+msgstr "não pôde obter junção para \"%s\": %s"
+
+#: ../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "não pôde obter junção para \"%s\": %s\n"
+
+#: ../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "não pôde abrir diretório \"%s\": %s\n"
 
-#: ../port/dirmod.c:362
+#: ../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "não pôde ler diretório \"%s\": %s\n"
 
-#: ../port/dirmod.c:445
+#: ../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "não pôde executar stat no arquivo ou  diretório \"%s\": %s\n"
 
-#: ../port/dirmod.c:472 ../port/dirmod.c:489
+#: ../port/dirmod.c:590 ../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "não pôde remover arquivo ou diretório \"%s\": %s\n"
@@ -17180,37 +18604,27 @@ msgstr "não pôde mudar diretório para \"%s\""
 msgid "could not read symbolic link \"%s\""
 msgstr "não pôde ler link simbólico \"%s\""
 
-#: ../port/exec.c:516
+#: ../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "processo filho terminou com código de saída %d"
 
-#: ../port/exec.c:520
+#: ../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "processo filho foi terminado pela exceção 0x%X"
 
-#: ../port/exec.c:529
+#: ../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "processo filho foi terminado pelo sinal %s"
 
-#: ../port/exec.c:532
+#: ../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "processo filho foi terminado pelo sinal %d"
 
-#: ../port/exec.c:536
+#: ../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
-
-#: ../port/win32error.c:184
-#, c-format
-msgid "mapped win32 error code %lu to %d"
-msgstr "código de erro win32 mapeado de %lu para %d"
-
-#: ../port/win32error.c:195
-#, c-format
-msgid "unrecognized win32 error code: %lu"
-msgstr "código de erro win32 desconhecido: %lu"
diff --git a/src/backend/po/tr.po b/src/backend/po/tr.po
deleted file mode 100644
index 2e650732966c0..0000000000000
--- a/src/backend/po/tr.po
+++ /dev/null
@@ -1,16230 +0,0 @@
-# translation of postgres-tr.po to Turkish
-# Nicolai Tufar <ntufar@gmail.com>, 2002-2006.
-# Devrim GUNDUZ <devrim@CommandPrompt.com>, 2003, 2004, 2005, 2006.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: postgres-tr\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-23 09:01+0000\n"
-"PO-Revision-Date: 2009-06-23 13:50+0200\n"
-"Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
-"Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
-"X-Poedit-Basepath: /home/ntufar/pg/pgsql/src/backend\n"
-"X-Poedit-SearchPath-0: /home/ntufar/pg/pgsql/src/backend\n"
-
-#: libpq/auth.c:224
-#, c-format
-msgid "authentication failed for user \"%s\": host rejected"
-msgstr "\"%s\" kullanıcısı için kimlik doğrulaması başarısız oldu: adres geçerli değil"
-
-#: libpq/auth.c:227
-#, c-format
-msgid "Kerberos 5 authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için Kerberos 5 kimlik doğrulaması başarısız oldu"
-
-#: libpq/auth.c:230
-#, c-format
-msgid "GSSAPI authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için GSSPI  kimlik doğrulaması başarısız"
-
-#: libpq/auth.c:233
-#, c-format
-msgid "SSPI authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için SSPI yetkilendirmesi başarısız oldu"
-
-#: libpq/auth.c:236
-#, c-format
-msgid "\"trust\" authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için \"trust\" kimlik doğrulaması başarısız oldu"
-
-#: libpq/auth.c:239
-#, c-format
-msgid "Ident authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için Ident kimlik doğrulaması başarısız oldu"
-
-#: libpq/auth.c:243
-#, c-format
-msgid "password authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için şifre doğrulaması başarısız oldu"
-
-#: libpq/auth.c:246
-#, c-format
-msgid "PAM authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için PAM kimlik doğrulaması başarısız oldu"
-
-#: libpq/auth.c:249
-#, c-format
-msgid "LDAP authentication failed for user \"%s\""
-msgstr "\"%s\" kullanıcısı için LDAP kimlik doğrulaması başarısız"
-
-#: libpq/auth.c:252
-#, c-format
-msgid "authentication failed for user \"%s\": invalid authentication method"
-msgstr "\"%s\" kullanıcısının kimlik doğrulaması başarısız: geçersiz kimlik doğrulama yöntemi"
-
-#: libpq/auth.c:281
-msgid "missing or erroneous pg_hba.conf file"
-msgstr "Eksik ya da hatalı pg_hba.conf dosyası"
-
-#: libpq/auth.c:282
-msgid "See server log for details."
-msgstr "Ayrıntılar için sunucu loguna bakın."
-
-#: libpq/auth.c:303
-msgid "connection requires a valid client certificate"
-msgstr "bağlantı, geçerli bir istemci sertifikasına gereksinim duyuyor."
-
-#: libpq/auth.c:344
-msgid "SSL on"
-msgstr "SSL etkin"
-
-#: libpq/auth.c:344
-msgid "SSL off"
-msgstr "SSL etkisiz"
-
-#: libpq/auth.c:342
-#, c-format
-msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
-msgstr "\"%s\" adresi, \"%s\" kullanıcısı, \"%s\" veritabanı için pg_hba.conf içinde bir tanım yok, %s"
-
-#: libpq/auth.c:348
-#, c-format
-msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
-msgstr "\"%s\" adresi, \"%s\" kullanıcısı, \"%s\" veritabanı için pg_hba.conf içinde bir tanım yok"
-
-#: libpq/auth.c:404
-#, c-format
-msgid "could not enable credential reception: %m"
-msgstr "kimlik doğrulama alımı etkinleştirmesi başarısız: %m"
-
-#: libpq/auth.c:417
-#: libpq/hba.c:856
-msgid "MD5 authentication is not supported when \"db_user_namespace\" is enabled"
-msgstr "\"db_user_namespace\" etkinken MD5 yetkilendirmesi desteklenmemektedir"
-
-#: libpq/auth.c:534
-#, c-format
-msgid "expected password response, got message type %d"
-msgstr "cevap olarak şifre beklenirken, %d mesaj tipi alındı"
-
-#: libpq/auth.c:562
-msgid "invalid password packet size"
-msgstr "geçersiz password paket boyutu"
-
-#: libpq/auth.c:566
-msgid "received password packet"
-msgstr "password paketi alınmıştır"
-
-#: libpq/auth.c:624
-#, c-format
-msgid "Kerberos initialization returned error %d"
-msgstr "Kerberos oluşturma hatası %d"
-
-#: libpq/auth.c:634
-#, c-format
-msgid "Kerberos keytab resolving returned error %d"
-msgstr "Kerberos keytab resolving hatası %d"
-
-#: libpq/auth.c:658
-#, c-format
-msgid "Kerberos sname_to_principal(\"%s\", \"%s\") returned error %d"
-msgstr "Kerberos sname_to_principal(\"%s\", \"%s\") hatası: %d"
-
-#: libpq/auth.c:706
-#, c-format
-msgid "Kerberos recvauth returned error %d"
-msgstr "Kerberos recvauth hatası %d"
-
-#: libpq/auth.c:729
-#, c-format
-msgid "Kerberos unparse_name returned error %d"
-msgstr "Kerberos unparse_name hatası %d"
-
-#: libpq/auth.c:852
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: libpq/auth.c:878
-msgid "GSSAPI is not supported in protocol version 2"
-msgstr "GSSAPI protokol 2'de desteklenmiyor"
-
-#: libpq/auth.c:897
-#: libpq/auth.c:1251
-#: libpq/auth.c:1319
-#: libpq/auth.c:1926
-#: utils/mmgr/aset.c:385
-#: utils/mmgr/aset.c:564
-#: utils/mmgr/aset.c:747
-#: utils/mmgr/aset.c:953
-#: utils/adt/formatting.c:1493
-#: utils/adt/formatting.c:1549
-#: utils/adt/formatting.c:1606
-#: utils/adt/regexp.c:209
-#: utils/adt/varlena.c:3037
-#: utils/adt/varlena.c:3058
-#: utils/mb/mbutils.c:335
-#: utils/mb/mbutils.c:596
-#: utils/hash/dynahash.c:363
-#: utils/hash/dynahash.c:435
-#: utils/hash/dynahash.c:929
-#: utils/misc/guc.c:2746
-#: utils/misc/guc.c:2759
-#: utils/misc/guc.c:2772
-#: utils/init/miscinit.c:212
-#: utils/init/miscinit.c:233
-#: utils/init/miscinit.c:243
-#: utils/fmgr/dfmgr.c:224
-#: commands/sequence.c:928
-#: lib/stringinfo.c:245
-#: storage/buffer/buf_init.c:164
-#: storage/buffer/localbuf.c:347
-#: storage/file/fd.c:336
-#: storage/file/fd.c:719
-#: storage/file/fd.c:837
-#: storage/ipc/procarray.c:392
-#: storage/ipc/procarray.c:708
-#: storage/ipc/procarray.c:715
-#: postmaster/postmaster.c:1857
-#: postmaster/postmaster.c:1890
-#: postmaster/postmaster.c:2954
-#: postmaster/postmaster.c:3683
-#: postmaster/postmaster.c:3764
-#: postmaster/postmaster.c:4332
-msgid "out of memory"
-msgstr "yetersiz bellek"
-
-#: libpq/auth.c:933
-#, c-format
-msgid "expected GSS response, got message type %d"
-msgstr "beklenen GSS yanıtı, %d mesaj tipi alındı"
-
-#: libpq/auth.c:996
-msgid "accepting GSS security context failed"
-msgstr "GSS security context kabul işlemi başarısızdır"
-
-#: libpq/auth.c:1022
-msgid "retrieving GSS user name failed"
-msgstr "GSS user name eğişimi başarısızdır"
-
-#: libpq/auth.c:1095
-#, c-format
-msgid "SSPI error %x"
-msgstr "SSPI hatası: %x"
-
-#: libpq/auth.c:1099
-#, c-format
-msgid "%s (%x)"
-msgstr "%s (%x)"
-
-#: libpq/auth.c:1139
-msgid "SSPI is not supported in protocol version 2"
-msgstr "SSPI protokol 2'de desteklenmiyor"
-
-#: libpq/auth.c:1154
-msgid "could not acquire SSPI credentials"
-msgstr "SSPI kimlik bilgileri alınamadı: %m"
-
-#: libpq/auth.c:1171
-#, c-format
-msgid "expected SSPI response, got message type %d"
-msgstr "SSPI yanıtı bekleniyordu, %d mesaj tipi alındı"
-
-#: libpq/auth.c:1243
-msgid "could not accept SSPI security context"
-msgstr "SSPI güvenlik içeriği kabul edilemedi"
-
-#: libpq/auth.c:1299
-#, fuzzy
-msgid "could not get token from SSPI security context"
-msgstr "SSL context oluşturma hatası: %s"
-
-#: libpq/auth.c:1542
-#, c-format
-msgid "could not create socket for Ident connection: %m"
-msgstr "Ident bağlantısı için socket oluşturma hatası: %m"
-
-#: libpq/auth.c:1557
-#, c-format
-msgid "could not bind to local address \"%s\": %m"
-msgstr "\"%s\" yerel adresine bind hatası: %m"
-
-#: libpq/auth.c:1569
-#, c-format
-msgid "could not connect to Ident server at address \"%s\", port %s: %m"
-msgstr "\"%s\" adresi %s portunda Ident sunucusuna bağlanma hatası: %m"
-
-#: libpq/auth.c:1589
-#, c-format
-msgid "could not send query to Ident server at address \"%s\", port %s: %m"
-msgstr "\"%s\" adresi %s portunda Ident sunucusuna istek gönderme hatası: %m"
-
-#: libpq/auth.c:1604
-#, c-format
-msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
-msgstr "\"%s\" adresi %s portunda Ident sunucusundan cevap alma hatası: %m"
-
-#: libpq/auth.c:1614
-#, c-format
-msgid "invalidly formatted response from Ident server: \"%s\""
-msgstr "Ident sunucusundan biçimlendirilmiş cevap bağlanma hatası:\"%s\""
-
-#: libpq/auth.c:1649
-#: libpq/auth.c:1679
-#: libpq/auth.c:1707
-#: libpq/auth.c:1783
-#, c-format
-msgid "could not get peer credentials: %m"
-msgstr "karşı tarafın kimlik bilgileri alınamadı: %m"
-
-#: libpq/auth.c:1658
-#: libpq/auth.c:1688
-#: libpq/auth.c:1725
-#: libpq/auth.c:1794
-#, c-format
-msgid "local user with ID %d does not exist"
-msgstr "yerel kullanıcı ID %d mevcut değildir"
-
-#: libpq/auth.c:1715
-#, fuzzy, c-format
-msgid "could not get effective UID from peer credentials: %m"
-msgstr "karşı tarafın kimlik bilgileri alınamadı: %m"
-
-#: libpq/auth.c:1805
-msgid "Ident authentication is not supported on local connections on this platform"
-msgstr "bu platformda yerel bağlantılarda Ident kimlik doğrulaması desteklenmemektedir"
-
-#: libpq/auth.c:1874
-#, c-format
-msgid "error from underlying PAM layer: %s"
-msgstr "PAM katmanında hata: %s"
-
-#: libpq/auth.c:1879
-#, c-format
-msgid "unsupported PAM conversation %d/%s"
-msgstr "desteklenmeyen PAM iletiÅŸimi %d/%s"
-
-#: libpq/auth.c:1911
-msgid "empty password returned by client"
-msgstr "istemci boş şifre gönderdi"
-
-#: libpq/auth.c:1971
-#, c-format
-msgid "could not create PAM authenticator: %s"
-msgstr "PAM authenticator oluşturulamıyor: %s"
-
-#: libpq/auth.c:1982
-#, c-format
-msgid "pam_set_item(PAM_USER) failed: %s"
-msgstr "pam_set_item(PAM_USER) başarısız: %s"
-
-#: libpq/auth.c:1993
-#, c-format
-msgid "pam_set_item(PAM_CONV) failed: %s"
-msgstr "pam_set_item(PAM_CONV) başarısız: %s"
-
-#: libpq/auth.c:2004
-#, c-format
-msgid "pam_authenticate failed: %s"
-msgstr "pam_authenticate başarısız: %s"
-
-#: libpq/auth.c:2015
-#, c-format
-msgid "pam_acct_mgmt failed: %s"
-msgstr "pam_acct_mgmt başarısız: %s"
-
-#: libpq/auth.c:2026
-#, c-format
-msgid "could not release PAM authenticator: %s"
-msgstr "PAM authenticator bırakma başarısız: %s"
-
-#: libpq/auth.c:2056
-msgid "LDAP server not specified"
-msgstr "LDAP sunucu belirtilmedi"
-
-#: libpq/auth.c:2074
-#: libpq/auth.c:2078
-#, c-format
-msgid "could not initialize LDAP: error code %d"
-msgstr "LDAP ilklendirilemiyor: hata kodu %d"
-
-#: libpq/auth.c:2088
-#, c-format
-msgid "could not set LDAP protocol version: error code %d"
-msgstr "LDAP protokol sürümünü ayarlanamadı: hata kodu %d"
-
-#: libpq/auth.c:2117
-msgid "could not load wldap32.dll"
-msgstr "wldap32.dll yüklenemedi"
-
-#: libpq/auth.c:2125
-msgid "could not load function _ldap_start_tls_sA in wldap32.dll"
-msgstr "wldap32.dll kütüphanesinden _ldap_start_tls_sA fonksiyonu yüklenemedi."
-
-#: libpq/auth.c:2126
-msgid "LDAP over SSL is not supported on this platform."
-msgstr "Bu platformda SSL üzerinde LDAP bu ortamda desteklenmemektedir."
-
-#: libpq/auth.c:2141
-#, c-format
-msgid "could not start LDAP TLS session: error code %d"
-msgstr "LDAP TLS oturumu başlatma bşarısız: hata kodu %d"
-
-#: libpq/auth.c:2158
-#, c-format
-msgid "LDAP login failed for user \"%s\" on server \"%s\": error code %d"
-msgstr "\"%s\" kullanıcısının \"%s\" sunucusunda LDAP oturumu açma başarısız: hata kodu %d"
-
-#: libpq/auth.c:2183
-#, fuzzy, c-format
-msgid "Certificate login failed for user \"%s\": client certificate contains no username"
-msgstr "\"%s\" kullanıcısının kimlik doğrulaması başarısız: geçersiz kimlik doğrulama yöntemi"
-
-#: libpq/be-fsstubs.c:127
-#: libpq/be-fsstubs.c:157
-#: libpq/be-fsstubs.c:172
-#: libpq/be-fsstubs.c:197
-#: libpq/be-fsstubs.c:244
-#: libpq/be-fsstubs.c:483
-#, c-format
-msgid "invalid large-object descriptor: %d"
-msgstr "geçersiz large-object descriptor: %d"
-
-#: libpq/be-fsstubs.c:177
-#, c-format
-msgid "large object descriptor %d was not opened for writing"
-msgstr "%d large object descriptor yazmak için açılmadı"
-
-#: libpq/be-fsstubs.c:357
-msgid "must be superuser to use server-side lo_import()"
-msgstr "sunucu tarafı lo_import() kullanmak için superuser olmalısınız"
-
-#: libpq/be-fsstubs.c:358
-msgid "Anyone can use the client-side lo_import() provided by libpq."
-msgstr "Libpq kütüphanesinin sağladığı istemci-tarafı lo_import() herkes kullanabilir."
-
-#: libpq/be-fsstubs.c:371
-#, c-format
-msgid "could not open server file \"%s\": %m"
-msgstr "\"%s\" sunucu dosyası açma hatası: %m"
-
-#: libpq/be-fsstubs.c:393
-#, c-format
-msgid "could not read server file \"%s\": %m"
-msgstr "\"%s\" sunucu dosyası okuma hatası: %m"
-
-#: libpq/be-fsstubs.c:423
-msgid "must be superuser to use server-side lo_export()"
-msgstr "sunucu tarafı lo_export() kullanmak için superuser olmalısınız"
-
-#: libpq/be-fsstubs.c:424
-msgid "Anyone can use the client-side lo_export() provided by libpq."
-msgstr "Libpq kütüphanesinin sağladığı istemci-tarafı lo_export() herkes kullanabilir."
-
-#: libpq/be-fsstubs.c:448
-#, c-format
-msgid "could not create server file \"%s\": %m"
-msgstr "\"%s\" sunucu dosyası oluşturma hatası: %m"
-
-#: libpq/be-fsstubs.c:460
-#, c-format
-msgid "could not write server file \"%s\": %m"
-msgstr "\"%s\" sunucu dosyası yazma hatası: %m"
-
-#: libpq/be-secure.c:275
-#: libpq/be-secure.c:369
-#, c-format
-msgid "SSL error: %s"
-msgstr "SSL hatası: %s"
-
-#: libpq/be-secure.c:284
-#: libpq/be-secure.c:378
-#: libpq/be-secure.c:934
-#, c-format
-msgid "unrecognized SSL error code: %d"
-msgstr "bilinmeyen SSL hata kodu: %d"
-
-#: libpq/be-secure.c:323
-#: libpq/be-secure.c:327
-#: libpq/be-secure.c:337
-msgid "SSL renegotiation failure"
-msgstr "SSL yeniden görüşme hatası"
-
-#: libpq/be-secure.c:331
-msgid "SSL failed to send renegotiation request"
-msgstr "SSL görüşme cevabı gönderme başarısız"
-
-#: libpq/be-secure.c:726
-#, c-format
-msgid "could not create SSL context: %s"
-msgstr "SSL context oluşturma hatası: %s"
-
-#: libpq/be-secure.c:736
-#, c-format
-msgid "could not load server certificate file \"%s\": %s"
-msgstr "sunucu srtifika dosyası \"%s\" yükleme başarısız: %s"
-
-#: libpq/be-secure.c:742
-#, c-format
-msgid "could not access private key file \"%s\": %m"
-msgstr "private key dosyası \"%s\" okunamıyor: %m"
-
-#: libpq/be-secure.c:757
-#, fuzzy, c-format
-msgid "private key file \"%s\" has group or world access"
-msgstr "veritabanı dizini \"%s\" gruba ve herkese erişime açıktır"
-
-#: libpq/be-secure.c:759
-msgid "Permissions should be u=rw (0600) or less."
-msgstr "İzinler u=rw (0600) ya da daha az olmalıdır."
-
-#: libpq/be-secure.c:766
-#, c-format
-msgid "could not load private key file \"%s\": %s"
-msgstr "private key dosyası \"%s\" okunamıyor: %s"
-
-#: libpq/be-secure.c:771
-#, c-format
-msgid "check of private key failed: %s"
-msgstr "private key denetlemesi başarısız: %s"
-
-#: libpq/be-secure.c:800
-#, fuzzy, c-format
-msgid "could not access root certificate file \"%s\": %m"
-msgstr "ana sertifika dosyası \"%s\" okunaıyor: %s"
-
-#: libpq/be-secure.c:813
-#, c-format
-msgid "could not load root certificate file \"%s\": %s"
-msgstr "ana sertifika dosyası \"%s\" okunaıyor: %s"
-
-#: libpq/be-secure.c:835
-#, c-format
-msgid "SSL certificate revocation list file \"%s\" ignored"
-msgstr "SSL feshedilmiş sertifika dosyası \"%s\" yoksayıldı"
-
-#: libpq/be-secure.c:837
-msgid "SSL library does not support certificate revocation lists."
-msgstr "SSL kütühanesi feshedilmiş sertifika listelerini desteklememektedir."
-
-#: libpq/be-secure.c:843
-#, c-format
-msgid "SSL certificate revocation list file \"%s\" not found, skipping: %s"
-msgstr "SSL feshedilmiş sertifika dosyası \"%s\" bulunmadı, atlanıyor: %s"
-
-#: libpq/be-secure.c:845
-msgid "Certificates will not be checked against revocation list."
-msgstr "Sertifikalar, feshedilmiş sertifika listeleri ile karşılaştırmayacaktır."
-
-#: libpq/be-secure.c:879
-#, c-format
-msgid "could not initialize SSL connection: %s"
-msgstr "SSL bağlantısı oluşturulamıyor: %s"
-
-#: libpq/be-secure.c:888
-#, c-format
-msgid "could not set SSL socket: %s"
-msgstr "SSL socket kurulamıyor: %s"
-
-#: libpq/be-secure.c:914
-#, c-format
-msgid "could not accept SSL connection: %m"
-msgstr "SSL bağlantı alınamıyor: %m"
-
-#: libpq/be-secure.c:918
-#: libpq/be-secure.c:929
-msgid "could not accept SSL connection: EOF detected"
-msgstr "SSL bağlantı alınamıyor: EOF algılandı"
-
-#: libpq/be-secure.c:923
-#, c-format
-msgid "could not accept SSL connection: %s"
-msgstr "SSL bağlantı alınamıyor: %s"
-
-#: libpq/be-secure.c:961
-#, c-format
-msgid "SSL connection from \"%s\""
-msgstr "\"%s\" adresinden SSL bağşantısı"
-
-#: libpq/be-secure.c:1005
-msgid "no SSL error reported"
-msgstr "SSL hata yok"
-
-#: libpq/be-secure.c:1009
-#, c-format
-msgid "SSL error code %lu"
-msgstr "SSL hata kodu: %lu"
-
-#: libpq/hba.c:152
-#, c-format
-msgid "authentication file token too long, skipping: \"%s\""
-msgstr "authentication file token uzunluğu sınırı aşmaktadır, esgeçiliyor: \"%s\""
-
-#: libpq/hba.c:341
-#, c-format
-msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
-msgstr "ikincil kimlik doğrulama dosyası \"@%s\", \"%s\" olarak açılamadı: %m"
-
-#. translator: the second %s is a list of auth methods
-#: libpq/hba.c:582
-#, fuzzy, c-format
-msgid "authentication option \"%s\" is only valid for authentication methods %s"
-msgstr "\"%s\" kullanıcısının kimlik doğrulaması başarısız: geçersiz kimlik doğrulama yöntemi"
-
-#: libpq/hba.c:584
-#: libpq/hba.c:600
-#: libpq/hba.c:646
-#: libpq/hba.c:669
-#: libpq/hba.c:681
-#: libpq/hba.c:694
-#: libpq/hba.c:709
-#: libpq/hba.c:737
-#: libpq/hba.c:762
-#: libpq/hba.c:776
-#: libpq/hba.c:789
-#: libpq/hba.c:817
-#: libpq/hba.c:885
-#: libpq/hba.c:896
-#: libpq/hba.c:908
-#: libpq/hba.c:919
-#: libpq/hba.c:942
-#: libpq/hba.c:971
-#: libpq/hba.c:983
-#: libpq/hba.c:996
-#: libpq/hba.c:1030
-#: libpq/hba.c:1074
-#: tsearch/ts_locale.c:173
-#, c-format
-msgid "line %d of configuration file \"%s\""
-msgstr "%d . satıri \"%s\" yapılandırma dosyasında"
-
-#: libpq/hba.c:598
-#, fuzzy, c-format
-msgid "authentication method \"%s\" requires argument \"%s\" to be set"
-msgstr "%u yetkilendirme sistemi desteklenmiyor\n"
-
-#: libpq/hba.c:644
-#, fuzzy
-msgid "hostssl not supported on this platform"
-msgstr "bu platformda tablespace desteklenmiyor"
-
-#: libpq/hba.c:645
-#, fuzzy
-msgid "compile with --enable-ssl to use SSL connections"
-msgstr "SSL bağlantısı sağlanamadı: %s\n"
-
-#: libpq/hba.c:667
-#, c-format
-msgid "invalid connection type \"%s\""
-msgstr "geçersiz bağlantı tipi \"%s\""
-
-#: libpq/hba.c:680
-#, fuzzy
-msgid "end-of-line before database specification"
-msgstr "çakışan \"datestyle\" tanımları"
-
-#: libpq/hba.c:693
-#, fuzzy
-msgid "end-of-line before role specification"
-msgstr "çakışan \"datestyle\" tanımları"
-
-#: libpq/hba.c:708
-#, fuzzy
-msgid "end-of-line before IP address specification"
-msgstr "çakışan \"datestyle\" tanımları"
-
-#: libpq/hba.c:735
-#, c-format
-msgid "invalid IP address \"%s\": %s"
-msgstr "geçersiz IP adresi \"%s\": %s"
-
-#: libpq/hba.c:760
-#, c-format
-msgid "invalid CIDR mask in address \"%s\""
-msgstr "\"%s\" adresinde geçersiz CIDR maskesi"
-
-#: libpq/hba.c:775
-msgid "end-of-line before netmask specification"
-msgstr ""
-
-#: libpq/hba.c:787
-#, c-format
-msgid "invalid IP mask \"%s\": %s"
-msgstr "geçersiz IP maskesi \"%s\" : %s"
-
-#: libpq/hba.c:803
-#, c-format
-msgid "IP address and mask do not match in file \"%s\" line %d"
-msgstr "\"%s\" dosyasında  %d satırında IP adresi ve maske uyuşmamaktadır"
-
-#: libpq/hba.c:816
-msgid "end-of-line before authentication method"
-msgstr "yetkilendirme yönteminden önce satır sonu"
-
-#: libpq/hba.c:883
-#, c-format
-msgid "invalid authentication method \"%s\""
-msgstr "geçersiz yetkilendirme yöntemi\"%s\""
-
-#: libpq/hba.c:894
-#, c-format
-msgid "invalid authentication method \"%s\": not supported on this platform"
-msgstr "\"%s*\" yetkilendirme sistemi bu platformda desteklenmiyor"
-
-#: libpq/hba.c:907
-msgid "krb5 authentication is not supported on local sockets"
-msgstr "yerel soketlerde krb5 yetkilendirmesi desteklenmemektedir"
-
-#: libpq/hba.c:918
-msgid "cert authentication is only supported on hostssl connections"
-msgstr "cert yetkilendirmesi sadece hostssl bağlantılarında desteklenmektedir"
-
-#: libpq/hba.c:941
-#, c-format
-msgid "authentication option not in name=value format: %s"
-msgstr ""
-
-#: libpq/hba.c:956
-msgid "ident, krb5, gssapi, sspi and cert"
-msgstr "ident, krb5, gssapi, sspi ve cert"
-
-#: libpq/hba.c:970
-msgid "clientcert can only be configured for \"hostssl\" rows"
-msgstr ""
-
-#: libpq/hba.c:981
-msgid "client certificates can only be checked if a root certificate store is available"
-msgstr ""
-
-#: libpq/hba.c:982
-msgid "make sure the root certificate store is present and readable"
-msgstr "kök sertifikasının mevcut ve okunabilir olduğundan emin olun"
-
-#: libpq/hba.c:995
-msgid "clientcert can not be set to 0 when using \"cert\" authentication"
-msgstr ""
-
-#: libpq/hba.c:1029
-#, c-format
-msgid "invalid LDAP port number: \"%s\""
-msgstr "Geçersiz LDAP port numarası: \"%s\""
-
-#: libpq/hba.c:1055
-#: libpq/hba.c:1063
-msgid "krb5, gssapi and sspi"
-msgstr "krb5, gssapi ve sspi"
-
-#: libpq/hba.c:1073
-#, fuzzy, c-format
-msgid "unknown authentication option name: \"%s\""
-msgstr "%s: bilinmeyen yetkilendirme yöntemi\"%s\".\n"
-
-#: libpq/hba.c:1231
-#: access/transam/xlog.c:2285
-#: access/transam/xlog.c:3851
-#: access/transam/xlog.c:3941
-#: access/transam/xlog.c:4039
-#: utils/init/miscinit.c:993
-#: utils/init/miscinit.c:1099
-#: utils/init/postinit.c:94
-#: utils/init/postinit.c:134
-#: utils/error/elog.c:1394
-#: postmaster/autovacuum.c:1808
-#: ../port/copydir.c:119
-#, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "\"%s\" dosyası açılamıyor: %m"
-
-#: libpq/hba.c:1320
-#: guc-file.l:403
-#, c-format
-msgid "could not open configuration file \"%s\": %m"
-msgstr "yapılandırma dosyası \"%s\" açılamadı: %m"
-
-#: libpq/hba.c:1498
-#, c-format
-msgid "invalid regular expression \"%s\": %s"
-msgstr "geçersiz düzensiz ifade \"%s\" : %s"
-
-#: libpq/hba.c:1520
-#, c-format
-msgid "regular expression match for \"%s\" failed: %s"
-msgstr "\"%s\" için düzenli ifade eşleşmesi başarısız: %s"
-
-#: libpq/hba.c:1536
-#, c-format
-msgid "regular expression \"%s\" has no subexpressions as requested by backreference in \"%s\""
-msgstr ""
-
-#: libpq/hba.c:1598
-#, c-format
-msgid "missing entry in file \"%s\" at end of line %d"
-msgstr "\"%s\" dosyasında %d satırın sonunda eksik giriş"
-
-#: libpq/hba.c:1639
-#, c-format
-msgid "provided username (%s) and authenticated username (%s) don't match"
-msgstr ""
-
-#: libpq/hba.c:1660
-#, c-format
-msgid "no match in usermap for user \"%s\" authenticated as \"%s\""
-msgstr ""
-
-#: libpq/hba.c:1662
-#, fuzzy, c-format
-msgid "usermap \"%s\""
-msgstr " \"%s\" kullanıcısı"
-
-#: libpq/hba.c:1685
-#, c-format
-msgid "could not open Ident usermap file \"%s\": %m"
-msgstr "Ident usermap dosyası \"%s\" açılamadı: %m"
-
-#: libpq/pqcomm.c:289
-#, c-format
-msgid "could not translate host name \"%s\", service \"%s\" to address: %s"
-msgstr "host adı \"%s\", hizmet \"%s\" adrese çevirilemedi: %s"
-
-#: libpq/pqcomm.c:293
-#, c-format
-msgid "could not translate service \"%s\" to address: %s"
-msgstr "\"%s\" servesi adrese çevirilemedi: %s"
-
-#: libpq/pqcomm.c:320
-#, c-format
-msgid "could not bind to all requested addresses: MAXLISTEN (%d) exceeded"
-msgstr "tüm istenilen adreslerine bind hatası: MAXLISTEN(%d) sınırı aşılmıştır"
-
-#: libpq/pqcomm.c:329
-msgid "IPv4"
-msgstr "IPv4"
-
-#: libpq/pqcomm.c:333
-msgid "IPv6"
-msgstr "IPv6"
-
-#: libpq/pqcomm.c:338
-msgid "Unix"
-msgstr "Unix"
-
-#: libpq/pqcomm.c:343
-#, c-format
-msgid "unrecognized address family %d"
-msgstr "bilinmeyen adres ailesi %d"
-
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:354
-#, c-format
-msgid "could not create %s socket: %m"
-msgstr "%s: socket oluşturma hatası: %m"
-
-#: libpq/pqcomm.c:379
-#, c-format
-msgid "setsockopt(SO_REUSEADDR) failed: %m"
-msgstr "setsockopt(SO_REUSEADDR) başarısız: %m"
-
-#: libpq/pqcomm.c:394
-#, c-format
-msgid "setsockopt(IPV6_V6ONLY) failed: %m"
-msgstr "setsockopt(IPV6_V6ONLY) başarısız: %m"
-
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:413
-#, c-format
-msgid "could not bind %s socket: %m"
-msgstr "%s socket bind hatası: %m"
-
-#: libpq/pqcomm.c:416
-#, c-format
-msgid "Is another postmaster already running on port %d? If not, remove socket file \"%s\" and retry."
-msgstr "Başka bir postmaster %d portunda çalışıyor mu? Değil ise \"%s\" socket dosyasını kaldırın ve yeniden deneyin."
-
-#: libpq/pqcomm.c:419
-#, c-format
-msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
-msgstr "Başka bir postmaster %d portunda çalışıyor mu? Değil ise birkaç saniye bekleyin ve yeniden deneyin."
-
-#. translator: %s is IPv4, IPv6, or Unix
-#: libpq/pqcomm.c:452
-#, c-format
-msgid "could not listen on %s socket: %m"
-msgstr "%s socket dinleme hatası: %m"
-
-#: libpq/pqcomm.c:532
-#, c-format
-msgid "group \"%s\" does not exist"
-msgstr "\"%s\" grubu mevcut deÄŸil"
-
-#: libpq/pqcomm.c:542
-#, c-format
-msgid "could not set group of file \"%s\": %m"
-msgstr "\"%s\" dosyasının grup atama hatası: %m"
-
-#: libpq/pqcomm.c:553
-#, c-format
-msgid "could not set permissions of file \"%s\": %m"
-msgstr "\"%s\" dosyasının erişim hakklarını atanamıyor: %m"
-
-#: libpq/pqcomm.c:583
-#, c-format
-msgid "could not accept new connection: %m"
-msgstr "yeni bağlantı alma hatası: %m"
-
-#: libpq/pqcomm.c:769
-#, c-format
-msgid "could not receive data from client: %m"
-msgstr "istemciden veri alınamamıştır: %m"
-
-#: libpq/pqcomm.c:956
-msgid "unexpected EOF within message length word"
-msgstr "mesaj uzunluk verisinde beklenmeyen EOF (dosya sonu)"
-
-#: libpq/pqcomm.c:967
-msgid "invalid message length"
-msgstr "mesaj uzunluğu yanlıştır"
-
-#: libpq/pqcomm.c:989
-#: libpq/pqcomm.c:999
-msgid "incomplete message from client"
-msgstr "istemciden alınan mesaj eksik"
-
-#: libpq/pqcomm.c:1108
-#, c-format
-msgid "could not send data to client: %m"
-msgstr "istemci sürecine sinyal gönderme başarısız: %m"
-
-#: libpq/pqformat.c:463
-msgid "no data left in message"
-msgstr "mesajda başka veri kalmadı"
-
-#: libpq/pqformat.c:529
-msgid "binary value is out of range for type bigint"
-msgstr "bigint tipi için değer kapsam dışındadır"
-
-#: libpq/pqformat.c:611
-#: libpq/pqformat.c:629
-#: libpq/pqformat.c:650
-#: utils/adt/arrayfuncs.c:1345
-#: utils/adt/rowtypes.c:551
-msgid "insufficient data left in message"
-msgstr "mesajda yetersiz veri kaldı"
-
-#: libpq/pqformat.c:691
-msgid "invalid string in message"
-msgstr "mesajda geçersiz satır"
-
-#: libpq/pqformat.c:707
-msgid "invalid message format"
-msgstr "geçersiz mesaj biçimi"
-
-#: access/gist/gistsplit.c:372
-#, c-format
-msgid "picksplit method for column %d of index \"%s\" failed"
-msgstr ""
-
-#: access/gist/gistsplit.c:374
-msgid "The index is not optimal. To optimize it, contact a developer, or try to use the column as the second one in the CREATE INDEX command."
-msgstr "İndex en uygun durumda değil. Optimize etmek için bir geliştiri ile bağlantı kurun, ya da kolonu CREATE INDEX komutunda ikinci olarak kullanmayı deneyin."
-
-#: access/gist/gistutil.c:407
-#, c-format
-msgid "index \"%s\" needs VACUUM or REINDEX to finish crash recovery"
-msgstr "crash recovery bitirmesi için  \"%s\" indeksin VACUUM veya REINDEX işleminden geçmesi gerekir"
-
-#: access/gist/gistutil.c:588
-#: access/nbtree/nbtpage.c:432
-#: access/hash/hashutil.c:169
-#, c-format
-msgid "index \"%s\" contains unexpected zero page at block %u"
-msgstr "\"%s\" indexnde %u bloÄŸunda beklenmeyen boÅŸ sayfa"
-
-#: access/gist/gistutil.c:591
-#: access/gist/gistutil.c:602
-#: access/nbtree/nbtpage.c:435
-#: access/nbtree/nbtpage.c:446
-#: access/hash/hashutil.c:172
-#: access/hash/hashutil.c:183
-#: access/hash/hashutil.c:195
-#: access/hash/hashutil.c:216
-msgid "Please REINDEX it."
-msgstr "Lütfen onu REINDEX'leyin."
-
-#: access/gist/gistutil.c:599
-#: access/nbtree/nbtpage.c:443
-#: access/hash/hashutil.c:180
-#: access/hash/hashutil.c:192
-#, c-format
-msgid "index \"%s\" contains corrupted page at block %u"
-msgstr "\"%s\" indexnde %u bloÄŸunda bozuk sayfa"
-
-#: access/gist/gistvacuum.c:566
-#, c-format
-msgid "index \"%s\" needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr "crash recovery bitirmesi için  \"%s\" indeksin VACUUM FULL veya REINDEX işleminden geçmesi gerekir"
-
-#: access/gist/gistxlog.c:794
-#, c-format
-msgid "index %u/%u/%u needs VACUUM FULL or REINDEX to finish crash recovery"
-msgstr "crash recovery bitirmesi için  %u/%u/%u indeksin VACUUM FULL veya REINDEX işleminden geçmesi gerekir"
-
-#: access/gist/gistxlog.c:796
-msgid "Incomplete insertion detected during crash replay."
-msgstr "Crash replay sırasında tamamlanmamış insert tespit edildi."
-
-#: access/common/heaptuple.c:686
-#: access/common/heaptuple.c:1438
-#, c-format
-msgid "number of columns (%d) exceeds limit (%d)"
-msgstr "kolonların sayısı (%d),  (%d) sınırını aşıyor"
-
-#: access/common/indextuple.c:57
-#, c-format
-msgid "number of index columns (%d) exceeds limit (%d)"
-msgstr "index kolonlarının sayısı (%d),  (%d) sınırını aşıyor"
-
-#: access/common/indextuple.c:168
-#, c-format
-msgid "index row requires %lu bytes, maximum size is %lu"
-msgstr "index satırının%lu byte'a gereksinmesi var, ancak en büyük byte büyüklüğü: %lu"
-
-#: access/common/printtup.c:278
-#: tcop/postgres.c:1630
-#: tcop/fastpath.c:180
-#: tcop/fastpath.c:552
-#, c-format
-msgid "unsupported format code: %d"
-msgstr "desteklenmeyen biçim kodu: %d"
-
-#: access/common/reloptions.c:285
-msgid "user-defined relation parameter types limit exceeded"
-msgstr ""
-
-#: access/common/reloptions.c:584
-msgid "RESET must not include values for parameters"
-msgstr "RESET, parametre için değer içermemeli"
-
-#: access/common/reloptions.c:617
-#, fuzzy, c-format
-msgid "unrecognized parameter namespace \"%s\""
-msgstr "\"%s\" tanınmayan parametre"
-
-#: access/common/reloptions.c:857
-#, c-format
-msgid "unrecognized parameter \"%s\""
-msgstr "\"%s\" tanınmayan parametre"
-
-#: access/common/reloptions.c:882
-#, c-format
-msgid "parameter \"%s\" specified more than once"
-msgstr "\"%s\" parametresi birden fazla kez belirtilmiÅŸtir"
-
-#: access/common/reloptions.c:897
-#, fuzzy, c-format
-msgid "invalid value for boolean option \"%s\": %s"
-msgstr "\"%s\" seçeneği için geçersiz değer: \"%s\""
-
-#: access/common/reloptions.c:908
-#, fuzzy, c-format
-msgid "invalid value for integer option \"%s\": %s"
-msgstr "\"%s\" seçeneği için geçersiz değer: \"%s\""
-
-#: access/common/reloptions.c:913
-#: access/common/reloptions.c:931
-#, fuzzy, c-format
-msgid "value %s out of bounds for option \"%s\""
-msgstr "setval: %s değeri kapsam dışıdır, sequence \"%s\" (%s..%s)"
-
-#: access/common/reloptions.c:915
-#, fuzzy, c-format
-msgid "Valid values are between \"%d\" and \"%d\"."
-msgstr "Geçerli değerler: \"terse\", \"default\", ve \"verbose\"."
-
-#: access/common/reloptions.c:926
-#, fuzzy, c-format
-msgid "invalid value for floating point option \"%s\": %s"
-msgstr "\"%s\" seçeneği için geçersiz değer: \"%s\""
-
-#: access/common/reloptions.c:933
-#, fuzzy, c-format
-msgid "Valid values are between \"%f\" and \"%f\"."
-msgstr "Geçerli değerler: \"terse\", \"default\", ve \"verbose\"."
-
-#: access/common/tupdesc.c:547
-#: parser/parse_relation.c:1194
-#, c-format
-msgid "column \"%s\" cannot be declared SETOF"
-msgstr "\"%s\" kolonu SETOF olarak bildirilemez"
-
-#: access/transam/slru.c:614
-#, c-format
-msgid "file \"%s\" doesn't exist, reading as zeroes"
-msgstr "\"%s\" dosyası mevcut değilr, sıfırlarla dolu dosya olarak okunuyor"
-
-#: access/transam/slru.c:844
-#: access/transam/slru.c:850
-#: access/transam/slru.c:857
-#: access/transam/slru.c:864
-#: access/transam/slru.c:871
-#: access/transam/slru.c:878
-#, c-format
-msgid "could not access status of transaction %u"
-msgstr "%u transactionunun durumuna eriÅŸilemiyor."
-
-#: access/transam/slru.c:845
-#, c-format
-msgid "Could not open file \"%s\": %m."
-msgstr "\"%s\" dosyası açılamıyor: %m"
-
-#: access/transam/slru.c:851
-#, c-format
-msgid "Could not seek in file \"%s\" to offset %u: %m."
-msgstr "\"%s\" dosyası, offset %u imleç değiştirme hatası: %m"
-
-#: access/transam/slru.c:858
-#, c-format
-msgid "Could not read from file \"%s\" at offset %u: %m."
-msgstr "\"%s\" dosyası, offset %u okuma hatası: %m"
-
-#: access/transam/slru.c:865
-#, c-format
-msgid "Could not write to file \"%s\" at offset %u: %m."
-msgstr "\"%s\" dosyası, offset %u yazma hatası: %m"
-
-#: access/transam/slru.c:872
-#, c-format
-msgid "Could not fsync file \"%s\": %m."
-msgstr "\"%s\" dosyası fsync hatası: %m"
-
-#: access/transam/slru.c:879
-#, c-format
-msgid "Could not close file \"%s\": %m."
-msgstr "\"%s\" dosyası kapatılamıyor: %m"
-
-#: access/transam/slru.c:1106
-#, c-format
-msgid "could not truncate directory \"%s\": apparent wraparound"
-msgstr "\"%s\" dizini küçültülemedi: başa sarma durumuna rastlandı"
-
-#: access/transam/slru.c:1187
-#, c-format
-msgid "removing file \"%s\""
-msgstr "\"%s\" dosyası siliniyor"
-
-#: access/transam/twophase.c:228
-#, c-format
-msgid "transaction identifier \"%s\" is too long"
-msgstr "transaction identifier \"%s\" çok uzun"
-
-#: access/transam/twophase.c:235
-#, fuzzy
-msgid "prepared transactions are disabled"
-msgstr "prepared transaction başka bir veritabanına aittir"
-
-#: access/transam/twophase.c:236
-#, fuzzy
-msgid "Set max_prepared_transactions to a nonzero value."
-msgstr "prepared transaction başka bir veritabanına aittir"
-
-#: access/transam/twophase.c:269
-#, c-format
-msgid "transaction identifier \"%s\" is already in use"
-msgstr "\"%s\" transaction identifier kullanılmaktadır"
-
-#: access/transam/twophase.c:278
-msgid "maximum number of prepared transactions reached"
-msgstr "En çok olabilecek prepared transaction sayısına ulaşılmıştır."
-
-#: access/transam/twophase.c:279
-#, c-format
-msgid "Increase max_prepared_transactions (currently %d)."
-msgstr "max_prepared_transactions parametresini artırın (şu an: %d)."
-
-#: access/transam/twophase.c:399
-#, c-format
-msgid "prepared transaction with identifier \"%s\" is busy"
-msgstr "identifier \"%s\" olan hazırlanmış transaction meşguldur"
-
-#: access/transam/twophase.c:407
-msgid "permission denied to finish prepared transaction"
-msgstr "prepared transaction bitirmede erişim hatası"
-
-#: access/transam/twophase.c:408
-msgid "Must be superuser or the user that prepared the transaction."
-msgstr "Superuser veya ğreparet transaction oluşturan kullanıcısı olmalısınız."
-
-#: access/transam/twophase.c:419
-msgid "prepared transaction belongs to another database"
-msgstr "prepared transaction başka bir veritabanına aittir"
-
-#: access/transam/twophase.c:420
-msgid "Connect to the database where the transaction was prepared to finish it."
-msgstr "İşlemini bitirmek için transaction prepare işlemi yapıldığı veritabanına bağlanın."
-
-#: access/transam/twophase.c:434
-#, c-format
-msgid "prepared transaction with identifier \"%s\" does not exist"
-msgstr "identifier \"%s\" olan hazırlanmış transaction mevcut değil"
-
-#: access/transam/twophase.c:886
-#, fuzzy
-msgid "two-phase state file maximum length exceeded"
-msgstr "yapılandırma dosyası \"%s\" açılamadı: en yüksek içiçe yuvalama derinliği aşılmıştır"
-
-#: access/transam/twophase.c:904
-#, c-format
-msgid "could not create two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası oluşturulamadı: %m"
-
-#: access/transam/twophase.c:918
-#: access/transam/twophase.c:935
-#: access/transam/twophase.c:984
-#: access/transam/twophase.c:1351
-#: access/transam/twophase.c:1358
-#, c-format
-msgid "could not write two-phase state file: %m"
-msgstr "two-phase state dosyası yazma hatası: %m"
-
-#: access/transam/twophase.c:944
-#, c-format
-msgid "could not seek in two-phase state file: %m"
-msgstr "two-phase state dosyası ilerleme hatası: %m"
-
-#: access/transam/twophase.c:990
-#: access/transam/twophase.c:1376
-#, c-format
-msgid "could not close two-phase state file: %m"
-msgstr "two-phase state dosyası kapatma hatası: %m"
-
-#: access/transam/twophase.c:1061
-#: access/transam/twophase.c:1456
-#, c-format
-msgid "could not open two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası açma hatası: %m"
-
-#: access/transam/twophase.c:1077
-#, c-format
-msgid "could not stat two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası stat hatası: %m"
-
-#: access/transam/twophase.c:1108
-#, c-format
-msgid "could not read two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası okuma hatası: %m"
-
-#: access/transam/twophase.c:1172
-#, c-format
-msgid "two-phase state file for transaction %u is corrupt"
-msgstr "%u transaction için two-phase state dosyası hasar görmüştür"
-
-#: access/transam/twophase.c:1313
-#, c-format
-msgid "could not remove two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası silinemedi: %m"
-
-#: access/transam/twophase.c:1342
-#, c-format
-msgid "could not recreate two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası yeniden oluşturulamadı: %m"
-
-#: access/transam/twophase.c:1370
-#, c-format
-msgid "could not fsync two-phase state file: %m"
-msgstr "two-phase state dosyası fsync hatası: %m"
-
-#: access/transam/twophase.c:1465
-#, c-format
-msgid "could not fsync two-phase state file \"%s\": %m"
-msgstr "\"%s\" two-phase state dosyası fsync hatası: %m"
-
-#: access/transam/twophase.c:1472
-#, c-format
-msgid "could not close two-phase state file \"%s\": %m"
-msgstr "two-phase state dosyası \"%s\" kapatılamıyor: %m"
-
-#: access/transam/twophase.c:1530
-#, c-format
-msgid "removing future two-phase state file \"%s\""
-msgstr "geleceğe dönük two-phase state dosyası \"%s\" kaldırılıyor"
-
-#: access/transam/twophase.c:1546
-#: access/transam/twophase.c:1557
-#: access/transam/twophase.c:1645
-#, c-format
-msgid "removing corrupt two-phase state file \"%s\""
-msgstr "hasar görmüş two-phase state dosyası \"%s\" kaldırılıyor"
-
-#: access/transam/twophase.c:1634
-#, c-format
-msgid "removing stale two-phase state file \"%s\""
-msgstr "eskimiş two-phase state dosyası \"%s\" kaldırılıyor"
-
-#: access/transam/twophase.c:1652
-#, c-format
-msgid "recovering prepared transaction %u"
-msgstr "%u prepared transaction kurtarılıyor"
-
-#: access/transam/varsup.c:87
-#, c-format
-msgid "database is not accepting commands to avoid wraparound data loss in database \"%s\""
-msgstr "\"%s\" veritabanı wraparound ve veri kaybı tehlikesini önlemek için bağlantıları kabul etmmemktedir"
-
-#: access/transam/varsup.c:89
-#, fuzzy, c-format
-msgid ""
-"Stop the postmaster and use a standalone backend to vacuum database \"%s\".\n"
-"You might also need to commit or roll back old prepared transactions."
-msgstr "postmaster sürecini kapatın ve \"%s\" veritabanına VACUUM uygulamak için bağımsız backend kullanın."
-
-#: access/transam/varsup.c:94
-#: access/transam/varsup.c:301
-#, c-format
-msgid "database \"%s\" must be vacuumed within %u transactions"
-msgstr "\"%s\" veritabanına transaction sayısı %u geçmeden vacuum işlemi uygulanmalıdır"
-
-#: access/transam/varsup.c:97
-#: access/transam/varsup.c:304
-#, fuzzy, c-format
-msgid ""
-"To avoid a database shutdown, execute a database-wide VACUUM in \"%s\".\n"
-"You might also need to commit or roll back old prepared transactions."
-msgstr "Veritabanı kapanmasını önlemek için \"%s\" veritabanında full-database VACUUM çalıştırın"
-
-#: access/transam/varsup.c:284
-#, c-format
-msgid "transaction ID wrap limit is %u, limited by database \"%s\""
-msgstr "\"%2$s\" veritabanın transaction ID warp limiti %1$u"
-
-#: access/transam/xact.c:621
-msgid "cannot have more than 2^32-1 commands in a transaction"
-msgstr "bir transaction içinde 2^32-1 komuttan fazla olamaz"
-
-#: access/transam/xact.c:1103
-#, fuzzy, c-format
-msgid "maximum number of committed subtransactions (%d) exceeded"
-msgstr "En çok olabilecek prepared transaction sayısına ulaşılmıştır."
-
-#: access/transam/xact.c:1820
-msgid "cannot PREPARE a transaction that has operated on temporary tables"
-msgstr "geçeci tablolarda işlem yapmış transaction'a PREPARE yapılamaz"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2606
-#, c-format
-msgid "%s cannot run inside a transaction block"
-msgstr "%s bir transaction bloğu içinde çalışamaz"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2616
-#, c-format
-msgid "%s cannot run inside a subtransaction"
-msgstr "%s bir subtransaction içinde çalışamaz"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2626
-#, c-format
-msgid "%s cannot be executed from a function or multi-command string"
-msgstr "%s bir fonksiyonun veya çoklu komut satırından içinden çalıştırılamaz"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2677
-#, c-format
-msgid "%s can only be used in transaction blocks"
-msgstr "%s sadece transaction bloğu içinde kullanılabilir"
-
-#: access/transam/xact.c:2859
-msgid "there is already a transaction in progress"
-msgstr "bir transaction zaten başlatılmıştır"
-
-#: access/transam/xact.c:3026
-#: access/transam/xact.c:3118
-msgid "there is no transaction in progress"
-msgstr "çalışan bir transaction yok"
-
-#: access/transam/xact.c:3212
-#: access/transam/xact.c:3262
-#: access/transam/xact.c:3268
-#: access/transam/xact.c:3312
-#: access/transam/xact.c:3360
-#: access/transam/xact.c:3366
-msgid "no such savepoint"
-msgstr "böyle bir savepoint bulunamadı"
-
-#: access/transam/xact.c:4000
-msgid "cannot have more than 2^32-1 subtransactions in a transaction"
-msgstr "bir transaction içinde 2^32-1 subtransactiondan fazla olamaz"
-
-#: access/transam/xlog.c:1159
-#, c-format
-msgid "could not create archive status file \"%s\": %m"
-msgstr "\"%s\" arşiv durum dosyası oluşturulamadı: %m"
-
-#: access/transam/xlog.c:1167
-#, c-format
-msgid "could not write archive status file \"%s\": %m"
-msgstr "\"%s\" arşiv durum dosyası yazılamadı: %m"
-
-#: access/transam/xlog.c:1622
-#: access/transam/xlog.c:3437
-#, c-format
-msgid "could not seek in log file %u, segment %u to offset %u: %m"
-msgstr "kayıt dosyası %u, segment %u, offset %u imleç ilerleme hatası: %m"
-
-#: access/transam/xlog.c:1639
-#, c-format
-msgid "could not write to log file %u, segment %u at offset %u, length %lu: %m"
-msgstr "kayıt dosyası %u, segment %u, offset %u, uzunluk %lu yazma hatası: %m"
-
-#: access/transam/xlog.c:1826
-#, fuzzy, c-format
-msgid "updated min recovery point to %X/%X"
-msgstr "recoveri yeniden başlangıç noktası: %X/%X"
-
-#: access/transam/xlog.c:2146
-#: access/transam/xlog.c:2248
-#: access/transam/xlog.c:2481
-#: access/transam/xlog.c:2548
-#: access/transam/xlog.c:2557
-#, c-format
-msgid "could not open file \"%s\" (log file %u, segment %u): %m"
-msgstr "\"%s\" dosyası (log dosyası %u, segment %u) açma hatası: %m"
-
-#: access/transam/xlog.c:2171
-#: access/transam/xlog.c:2300
-#: access/transam/xlog.c:4020
-#: access/transam/xlog.c:7206
-#: access/transam/xlog.c:7341
-#: postmaster/postmaster.c:3482
-#: ../port/copydir.c:126
-#, c-format
-msgid "could not create file \"%s\": %m"
-msgstr "\"%s\" dosyası oluşturulamıyor: %m"
-
-#: access/transam/xlog.c:2203
-#: access/transam/xlog.c:2332
-#: access/transam/xlog.c:4072
-#: access/transam/xlog.c:4110
-#: utils/misc/guc.c:6770
-#: utils/misc/guc.c:6795
-#: utils/init/miscinit.c:1042
-#: utils/init/miscinit.c:1051
-#: commands/copy.c:1290
-#: commands/tablespace.c:706
-#: commands/tablespace.c:712
-#: postmaster/postmaster.c:3492
-#: postmaster/postmaster.c:3502
-#: ../port/copydir.c:148
-#, c-format
-msgid "could not write to file \"%s\": %m"
-msgstr "\"%s\" dosyası yazma hatası: %m"
-
-#: access/transam/xlog.c:2211
-#: access/transam/xlog.c:2339
-#: access/transam/xlog.c:4116
-#: ../port/copydir.c:158
-#, c-format
-msgid "could not fsync file \"%s\": %m"
-msgstr "\"%s\" dosyası fsync hatası: %m"
-
-#: access/transam/xlog.c:2216
-#: access/transam/xlog.c:2344
-#: access/transam/xlog.c:4121
-#: ../port/copydir.c:163
-#, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "\"%s\" dosyası kapatılamıyor: %m"
-
-#: access/transam/xlog.c:2313
-#: access/transam/xlog.c:4051
-#: access/transam/xlog.c:7313
-#: access/transam/xlog.c:7363
-#: access/transam/xlog.c:7655
-#: access/transam/xlog.c:7680
-#: access/transam/xlog.c:7718
-#: utils/adt/genfile.c:132
-#: ../port/copydir.c:137
-#, c-format
-msgid "could not read file \"%s\": %m"
-msgstr "\"%s\" dosyası okuma hatası: %m"
-
-#: access/transam/xlog.c:2316
-#, c-format
-msgid "not enough data in file \"%s\""
-msgstr "\"%s\" dosyasında yetersiz veri"
-
-#: access/transam/xlog.c:2433
-#, c-format
-msgid "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m"
-msgstr "\"%s\" dosyası \"%s\" dosyasına bağlanamıyor (log dosyası %u, segment %u sıfırlama işlemi): %m"
-
-#: access/transam/xlog.c:2454
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m"
-msgstr "\"%s\" dosyası \"%s\" dosyasına taşınamıyor (log dosyası %u, segment %u ilklendirme işlemi): %m"
-
-#: access/transam/xlog.c:2586
-#, c-format
-msgid "could not close log file %u, segment %u: %m"
-msgstr "log dosyası %u kapatılamadı, segment %u : %m"
-
-#: access/transam/xlog.c:2654
-#: access/transam/xlog.c:2804
-#: access/transam/xlog.c:7189
-#: utils/adt/dbsize.c:62
-#: utils/adt/dbsize.c:209
-#: utils/adt/dbsize.c:278
-#: utils/adt/genfile.c:166
-#: ../port/copydir.c:81
-#, c-format
-msgid "could not stat file \"%s\": %m"
-msgstr "\"%s\" dosyası durumlanamadı: %m"
-
-#: access/transam/xlog.c:2662
-#: access/transam/xlog.c:7368
-#: commands/tablespace.c:631
-#, c-format
-msgid "could not remove file \"%s\": %m"
-msgstr "\"%s\" dosyası silinemedi: %m"
-
-#: access/transam/xlog.c:2785
-#, c-format
-msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
-msgstr "\"%s\" arşiv dosyası yanlış boyuta sahip: %lu yerine %lu olmalıydı."
-
-#: access/transam/xlog.c:2792
-#, c-format
-msgid "restored log file \"%s\" from archive"
-msgstr "\"%s\" log dosyası arşivden geri yüklendi"
-
-#: access/transam/xlog.c:2842
-#, c-format
-msgid "could not restore file \"%s\" from archive: return code %d"
-msgstr "\"%s\" dosyası arşivden geri yüklenemiyor: dönüş kodu %d"
-
-#: access/transam/xlog.c:2959
-#, c-format
-msgid "recovery_end_command \"%s\": return code %d"
-msgstr "recovery_end_command \"%s\": dönüş kodu %d"
-
-#: access/transam/xlog.c:3024
-#: access/transam/xlog.c:3152
-#, c-format
-msgid "could not open transaction log directory \"%s\": %m"
-msgstr "\"%s\" transaction kayıt dizini açılamıyor: %m"
-
-#: access/transam/xlog.c:3061
-#, c-format
-msgid "recycled transaction log file \"%s\""
-msgstr "\"%s\" transaction kayıt dosyası yeniden kullanımda"
-
-#: access/transam/xlog.c:3075
-#, c-format
-msgid "removing transaction log file \"%s\""
-msgstr "\"%s\" transaction kayıt dosyası kaldırılıyor"
-
-#: access/transam/xlog.c:3112
-#: access/transam/xlog.c:3122
-#, fuzzy, c-format
-msgid "required WAL directory \"%s\" does not exist"
-msgstr "veritabanı deizini \"%s\" mevcut değil"
-
-#: access/transam/xlog.c:3128
-#, fuzzy, c-format
-msgid "creating missing WAL directory \"%s\""
-msgstr "%s dizini yaratılıyor... "
-
-#: access/transam/xlog.c:3131
-#, fuzzy, c-format
-msgid "could not create missing directory \"%s\": %m"
-msgstr "\"%s\" dizini oluşturulamadı: %m"
-
-#: access/transam/xlog.c:3165
-#, c-format
-msgid "removing transaction log backup history file \"%s\""
-msgstr "\"%s\" transaction kayıt yedek dosyası kaldırılıyor"
-
-#: access/transam/xlog.c:3284
-#, c-format
-msgid "incorrect hole size in record at %X/%X"
-msgstr "%X/%X adresinde geçersiz boşluk boyutu"
-
-#: access/transam/xlog.c:3297
-#, c-format
-msgid "incorrect total length in record at %X/%X"
-msgstr "%X/%X adresinde geçersiz toplam uzunluk"
-
-#: access/transam/xlog.c:3310
-#, c-format
-msgid "incorrect resource manager data checksum in record at %X/%X"
-msgstr "resoource manager data checksum %X/%X kaydında geçersiz"
-
-#: access/transam/xlog.c:3379
-#: access/transam/xlog.c:3467
-#, c-format
-msgid "invalid record offset at %X/%X"
-msgstr "%X/%X adresinde geçersiz kayıt offseti"
-
-#: access/transam/xlog.c:3421
-#: access/transam/xlog.c:3445
-#: access/transam/xlog.c:3610
-#, c-format
-msgid "could not read from log file %u, segment %u, offset %u: %m"
-msgstr "log dosyası %u, segment %u, offset %u okuma başarısız: %m"
-
-#: access/transam/xlog.c:3475
-#, c-format
-msgid "contrecord is requested by %X/%X"
-msgstr "contrecord %X/%X tarafından talep edilmiştir"
-
-#: access/transam/xlog.c:3492
-#, c-format
-msgid "invalid xlog switch record at %X/%X"
-msgstr "%X/%X adresinde geçersiz xlog switch kaydı"
-
-#: access/transam/xlog.c:3500
-#, c-format
-msgid "record with zero length at %X/%X"
-msgstr "%X/%X adresinde sıfır uzunluklu kayıt"
-
-#: access/transam/xlog.c:3509
-#, c-format
-msgid "invalid record length at %X/%X"
-msgstr "%X/%X adresinde geçersiz kayıt uzunluk"
-
-#: access/transam/xlog.c:3516
-#, c-format
-msgid "invalid resource manager ID %u at %X/%X"
-msgstr "%2$X/%3$X adresinde geçersiz resource manager ID %1$u"
-
-#: access/transam/xlog.c:3529
-#: access/transam/xlog.c:3545
-#, c-format
-msgid "record with incorrect prev-link %X/%X at %X/%X"
-msgstr "geçersiz incorrect prev-link olan kayıt: %X/%X at %X/%X"
-
-#: access/transam/xlog.c:3574
-#, c-format
-msgid "record length %u at %X/%X too long"
-msgstr "%2$X/%3$X adresinde çok büyük kayıt uzunluğu: %1$u "
-
-#: access/transam/xlog.c:3619
-#, c-format
-msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
-msgstr "kayıt dosyası %u, segment %u, offset %u adresinde contrecord bulunamadı"
-
-#: access/transam/xlog.c:3629
-#, c-format
-msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
-msgstr "kayıt dosyası %2$u, segment %3$u, offset %4$u adresinde contrecord fazla uzun %1$u"
-
-#: access/transam/xlog.c:3718
-#, c-format
-msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
-msgstr "kayıt dosyası %2$u, segment %3$u, offset %4$u adresinde geçersiz tanıtım kodu %1$04X"
-
-#: access/transam/xlog.c:3725
-#: access/transam/xlog.c:3771
-#, c-format
-msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
-msgstr "kayıt dosyası %2$u, segment %3$u, offset %4$u adresinde geçersiz info bits %1$04X"
-
-#: access/transam/xlog.c:3747
-#: access/transam/xlog.c:3755
-#: access/transam/xlog.c:3762
-msgid "WAL file is from different system"
-msgstr "WAL dosyası farklı bir sistemden"
-
-#: access/transam/xlog.c:3748
-#, c-format
-msgid "WAL file SYSID is %s, pg_control SYSID is %s"
-msgstr "WAL dosyası SYSID %s, pg_control SYSID %s"
-
-#: access/transam/xlog.c:3756
-msgid "Incorrect XLOG_SEG_SIZE in page header."
-msgstr "Sayfa başlığında geçersiz XLOG_SEG_SIZE."
-
-#: access/transam/xlog.c:3763
-msgid "Incorrect XLOG_BLCKSZ in page header."
-msgstr "Sayfa başlığında geçersiz XLOG_BLCKSZ."
-
-#: access/transam/xlog.c:3781
-#, c-format
-msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
-msgstr "beklenmeyen pageaddr %X/%X: kayıt dosyası: %u, segment %u, offset %u"
-
-#: access/transam/xlog.c:3793
-#, c-format
-msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
-msgstr "beklenmeyen timeline ID %u: kayıt dosyası: %u, segment %u, offset %u"
-
-#: access/transam/xlog.c:3811
-#, c-format
-msgid "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset %u"
-msgstr "sıra dışı timeline ID %u (%u'dan sonra) log dosyası %u, segment %u, offset %u"
-
-#: access/transam/xlog.c:3880
-#, c-format
-msgid "syntax error in history file: %s"
-msgstr "%s geçmiş dosyasında sözdizimi hatası"
-
-#: access/transam/xlog.c:3881
-msgid "Expected a numeric timeline ID."
-msgstr "Sayısal timeline ID bekleniyordu."
-
-#: access/transam/xlog.c:3886
-#, c-format
-msgid "invalid data in history file: %s"
-msgstr "geçmiş dosyasında geçersiz veri: %s"
-
-#: access/transam/xlog.c:3887
-msgid "Timeline IDs must be in increasing sequence."
-msgstr "Timeline ID daima artan sırayla olmalıdır."
-
-#: access/transam/xlog.c:3900
-#, c-format
-msgid "invalid data in history file \"%s\""
-msgstr "\"%s\" geçmiş dosyasında geçersiz veri"
-
-#: access/transam/xlog.c:3901
-msgid "Timeline IDs must be less than child timeline's ID."
-msgstr "timeline ID, child timeline ID'sinden daha düşük olmalıdır."
-
-#: access/transam/xlog.c:4138
-#, c-format
-msgid "could not link file \"%s\" to \"%s\": %m"
-msgstr "\"%s\" dosyası \"%s\" dosyasına bağlanamadı: %m"
-
-#: access/transam/xlog.c:4145
-#: access/transam/xlog.c:4959
-#: access/transam/xlog.c:5012
-#: access/transam/xlog.c:5410
-#: utils/init/flatfiles.c:289
-#: utils/init/flatfiles.c:673
-#: postmaster/pgarch.c:704
-#, c-format
-msgid "could not rename file \"%s\" to \"%s\": %m"
-msgstr "\"%s\" -- \"%s\" ad değiştirme hatası: %m"
-
-#: access/transam/xlog.c:4227
-#, c-format
-msgid "could not create control file \"%s\": %m"
-msgstr "kontrol dosyası \"%s\" oluşturma hatası: %m"
-
-#: access/transam/xlog.c:4238
-#: access/transam/xlog.c:4463
-#, c-format
-msgid "could not write to control file: %m"
-msgstr "kontrol dosyası yazma hatası: %m"
-
-#: access/transam/xlog.c:4244
-#: access/transam/xlog.c:4469
-#, c-format
-msgid "could not fsync control file: %m"
-msgstr "kontrol dosyası fsync hatası: %m"
-
-#: access/transam/xlog.c:4249
-#: access/transam/xlog.c:4474
-#, c-format
-msgid "could not close control file: %m"
-msgstr "kontrol dosyası kapatma hatası: %m"
-
-#: access/transam/xlog.c:4267
-#: access/transam/xlog.c:4452
-#, c-format
-msgid "could not open control file \"%s\": %m"
-msgstr "kontrol dosyası \"%s\" açma hatası: %m"
-
-#: access/transam/xlog.c:4273
-#, c-format
-msgid "could not read from control file: %m"
-msgstr "kontrol dosyasından okuma hatası: %m"
-
-#: access/transam/xlog.c:4286
-#: access/transam/xlog.c:4295
-#: access/transam/xlog.c:4319
-#: access/transam/xlog.c:4326
-#: access/transam/xlog.c:4333
-#: access/transam/xlog.c:4338
-#: access/transam/xlog.c:4345
-#: access/transam/xlog.c:4352
-#: access/transam/xlog.c:4359
-#: access/transam/xlog.c:4366
-#: access/transam/xlog.c:4373
-#: access/transam/xlog.c:4380
-#: access/transam/xlog.c:4389
-#: access/transam/xlog.c:4396
-#: access/transam/xlog.c:4405
-#: access/transam/xlog.c:4412
-#: access/transam/xlog.c:4421
-#: access/transam/xlog.c:4428
-#: utils/init/miscinit.c:1117
-msgid "database files are incompatible with server"
-msgstr "veri dosyaları veritabanı sunucusu ile uyumlu değildir"
-
-#: access/transam/xlog.c:4287
-#, c-format
-msgid "The database cluster was initialized with PG_CONTROL_VERSION %d (0x%08x), but the server was compiled with PG_CONTROL_VERSION %d (0x%08x)."
-msgstr "Veritabanı clusteri PG_CONTROL_VERSION %d (0x%08x) ile ilklendirilmiştir, ancak sunucu  PG_CONTROL_VERSION %d (0x%08x) ile derlenmiştir. "
-
-#: access/transam/xlog.c:4291
-msgid "This could be a problem of mismatched byte ordering.  It looks like you need to initdb."
-msgstr "Bunun nedeni eşleşmeyen bayt sıralaması olabilir. initdb yapmanız gerekebilir."
-
-#: access/transam/xlog.c:4296
-#, c-format
-msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
-msgstr "Veritabanı clusteri PG_CONTROL_VERSION %d ile ilklendirilmiştir, ancak sunucu  PG_CONTROL_VERSION %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4299
-#: access/transam/xlog.c:4323
-#: access/transam/xlog.c:4330
-#: access/transam/xlog.c:4335
-msgid "It looks like you need to initdb."
-msgstr "Durumu düzeltmek için initdb çalıştırın."
-
-#: access/transam/xlog.c:4310
-msgid "incorrect checksum in control file"
-msgstr "kontrol dosyasında geçersiz checksum"
-
-#: access/transam/xlog.c:4320
-#, c-format
-msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
-msgstr "Veritabanı clusteri CATALOG_VERSION_NO %d ile ilklendirilmiştir, ancak sunucu  CATALOG_VERSION_NO %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4327
-#, c-format
-msgid "The database cluster was initialized with MAXALIGN %d, but the server was compiled with MAXALIGN %d."
-msgstr "Veritabanı clusteri MAXALIGN %d ile ilklendirilmiştir, ancak sunucu  MAXALIGN %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4334
-msgid "The database cluster appears to use a different floating-point number format than the server executable."
-msgstr "Veritabanı dosyaları, sunucu programından farklı ondalık sayı biçimini kullanıyor."
-
-#: access/transam/xlog.c:4339
-#, c-format
-msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
-msgstr "Veritabanı clusteri BLCKSZ %d ile ilklendirilmiştir, ancak sunucu  BLCKSZ %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4342
-#: access/transam/xlog.c:4349
-#: access/transam/xlog.c:4356
-#: access/transam/xlog.c:4363
-#: access/transam/xlog.c:4370
-#: access/transam/xlog.c:4377
-#: access/transam/xlog.c:4384
-#: access/transam/xlog.c:4392
-#: access/transam/xlog.c:4399
-#: access/transam/xlog.c:4408
-#: access/transam/xlog.c:4415
-#: access/transam/xlog.c:4424
-#: access/transam/xlog.c:4431
-msgid "It looks like you need to recompile or initdb."
-msgstr "Sistemi yeniden derlemeniz veya initdb çalıştırmanız gerekmetedir."
-
-#: access/transam/xlog.c:4346
-#, c-format
-msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
-msgstr "Veritabanı clusteri RELSEG_SIZE %d ile ilklendirilmiştir, ancak sunucu  RELSEG_SIZE %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4353
-#, c-format
-msgid "The database cluster was initialized with XLOG_BLCKSZ %d, but the server was compiled with XLOG_BLCKSZ %d."
-msgstr "Veritabanı clusteri XLOG_BLCKSZ %d ile ilklendirilmiştir, ancak sunucu  XLOG_BLCKSZ %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4360
-#, c-format
-msgid "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server was compiled with XLOG_SEG_SIZE %d."
-msgstr "Veritabanı clusteri XLOG_SEG_SIZE %d ile ilklendirilmiştir, ancak sunucu  XLOG_SEG_SIZE %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4367
-#, c-format
-msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
-msgstr "Veritabanı clusteri NAMEDATALEN %d ile ilklendirilmiştir, ancak sunucu  NAMEDATALEN %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4374
-#, c-format
-msgid "The database cluster was initialized with INDEX_MAX_KEYS %d, but the server was compiled with INDEX_MAX_KEYS %d."
-msgstr "Veritabanı clusteri INDEX_MAX_KEYS %d ile ilklendirilmiştir, ancak sunucu  INDEX_MAX_KEYS %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4381
-#, c-format
-msgid "The database cluster was initialized with TOAST_MAX_CHUNK_SIZE %d, but the server was compiled with TOAST_MAX_CHUNK_SIZE %d."
-msgstr "Veritabanı clusteri TOAST_MAX_CHUNK_SIZE %d ile ilklendirilmiştir, ancak sunucu  TOAST_MAX_CHUNK_SIZE %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4390
-msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
-msgstr "Veritabanı clusteri HAVE_INT64_TIMESTAMP olmadan ilklendirilmiştir, ancak sunucu HAVE_INT64_TIMESTAMP ile derlenmiştir."
-
-#: access/transam/xlog.c:4397
-msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
-msgstr "Veritabanı clusteri HAVE_INT64_TIMESTAMP ile ilklendirilmiştir,  ancak sunucu HAVE_INT64_TIMESTAMP olmadan derlenmiştir."
-
-#: access/transam/xlog.c:4406
-#, fuzzy
-msgid "The database cluster was initialized without USE_FLOAT4_BYVAL but the server was compiled with USE_FLOAT4_BYVAL."
-msgstr "Veritabanı clusteri XLOG_BLCKSZ %d ile ilklendirilmiştir, ancak sunucu  XLOG_BLCKSZ %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4413
-#, fuzzy
-msgid "The database cluster was initialized with USE_FLOAT4_BYVAL but the server was compiled without USE_FLOAT4_BYVAL."
-msgstr "Veritabanı clusteri XLOG_BLCKSZ %d ile ilklendirilmiştir, ancak sunucu  XLOG_BLCKSZ %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4422
-#, fuzzy
-msgid "The database cluster was initialized without USE_FLOAT8_BYVAL but the server was compiled with USE_FLOAT8_BYVAL."
-msgstr "Veritabanı clusteri XLOG_BLCKSZ %d ile ilklendirilmiştir, ancak sunucu  XLOG_BLCKSZ %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4429
-#, fuzzy
-msgid "The database cluster was initialized with USE_FLOAT8_BYVAL but the server was compiled without USE_FLOAT8_BYVAL."
-msgstr "Veritabanı clusteri XLOG_BLCKSZ %d ile ilklendirilmiştir, ancak sunucu  XLOG_BLCKSZ %d ile derlenmiştir."
-
-#: access/transam/xlog.c:4657
-#, c-format
-msgid "could not write bootstrap transaction log file: %m"
-msgstr "bootstrap transaction log dosyası kapatılamadı: %m"
-
-#: access/transam/xlog.c:4663
-#, c-format
-msgid "could not fsync bootstrap transaction log file: %m"
-msgstr "bootstrap transaction log dosyası fsync başarısız: %m"
-
-#: access/transam/xlog.c:4668
-#, c-format
-msgid "could not close bootstrap transaction log file: %m"
-msgstr "bootstrap transaction log dosyası kapatılamadı: %m"
-
-#: access/transam/xlog.c:4729
-#, c-format
-msgid "could not open recovery command file \"%s\": %m"
-msgstr "recovery command dosyası \"%s\" açılamıyor: %m"
-
-#: access/transam/xlog.c:4734
-msgid "starting archive recovery"
-msgstr "arşivden geri getirme başlatılıyor"
-
-#: access/transam/xlog.c:4779
-#, c-format
-msgid "restore_command = '%s'"
-msgstr "restore_command = '%s'"
-
-#: access/transam/xlog.c:4786
-#, fuzzy, c-format
-msgid "recovery_end_command = '%s'"
-msgstr "restore_command = '%s'"
-
-#: access/transam/xlog.c:4800
-#, c-format
-msgid "recovery_target_timeline is not a valid number: \"%s\""
-msgstr "recovery_target_timeline geçerli sayısal bir değer değildir: \"%s\""
-
-#: access/transam/xlog.c:4805
-#, c-format
-msgid "recovery_target_timeline = %u"
-msgstr "recovery_target_timeline = %u"
-
-#: access/transam/xlog.c:4808
-msgid "recovery_target_timeline = latest"
-msgstr "recovery_target_timeline = latest"
-
-#: access/transam/xlog.c:4816
-#, c-format
-msgid "recovery_target_xid is not a valid number: \"%s\""
-msgstr "recovery_target_xid geçerli sayısal bir değer değildir: \"%s\""
-
-#: access/transam/xlog.c:4819
-#, c-format
-msgid "recovery_target_xid = %u"
-msgstr "recovery_target_xid = %u"
-
-#: access/transam/xlog.c:4844
-#, c-format
-msgid "recovery_target_time = '%s'"
-msgstr "recovery_target_time = '%s'"
-
-#: access/transam/xlog.c:4855
-#, fuzzy
-msgid "parameter \"recovery_target_inclusive\" requires a Boolean value"
-msgstr "\"%s\" seçeneği boolean değerini alır"
-
-#: access/transam/xlog.c:4857
-#, c-format
-msgid "recovery_target_inclusive = %s"
-msgstr "recovery_target_inclusive = %s"
-
-#: access/transam/xlog.c:4861
-#, c-format
-msgid "unrecognized recovery parameter \"%s\""
-msgstr "\"%s\" tanınmayan recovery parametresi"
-
-#: access/transam/xlog.c:4869
-#, c-format
-msgid "syntax error in recovery command file: %s"
-msgstr "%s recovery komut dosyasında sözdizimi hatası "
-
-#: access/transam/xlog.c:4871
-msgid "Lines should have the format parameter = 'value'."
-msgstr "Satırların biçimi şöyle olmalıdır: parametre = 'değer'."
-
-#: access/transam/xlog.c:4876
-#, c-format
-msgid "recovery command file \"%s\" did not specify restore_command"
-msgstr "\"%s\"recovery komut dosyasında restore_command değeri belirtilmemiştir"
-
-#: access/transam/xlog.c:4895
-#, c-format
-msgid "recovery target timeline %u does not exist"
-msgstr "recovery_target_timeline %u mevcut deÄŸil"
-
-#: access/transam/xlog.c:5016
-msgid "archive recovery complete"
-msgstr "archive recovery tamamlandı"
-
-#: access/transam/xlog.c:5106
-#, c-format
-msgid "recovery stopping after commit of transaction %u, time %s"
-msgstr "kurtarma işlemi %u transactionunun, %s zamanında commit edilmesinden sonra durdu"
-
-#: access/transam/xlog.c:5111
-#, c-format
-msgid "recovery stopping before commit of transaction %u, time %s"
-msgstr "kurtarma işlemi %u transactionunun, %s zamanında commit edilmesinden önce durdu"
-
-#: access/transam/xlog.c:5119
-#, c-format
-msgid "recovery stopping after abort of transaction %u, time %s"
-msgstr "kurtarma iÅŸlemi %u transactionunun, %s zamanunda iptal edilmesinden sonra duruyor"
-
-#: access/transam/xlog.c:5124
-#, c-format
-msgid "recovery stopping before abort of transaction %u, time %s"
-msgstr "kurtarma işlemi %u transactionunun, %s zamanunda iptal edilmesinden önce duruyor"
-
-#: access/transam/xlog.c:5174
-msgid "control file contains invalid data"
-msgstr "kontrol dosyası geçersiz veri içeriyor"
-
-#: access/transam/xlog.c:5178
-#, c-format
-msgid "database system was shut down at %s"
-msgstr "veritabanı sunucusu %s tarihinde kapatıldı"
-
-#: access/transam/xlog.c:5182
-#, c-format
-msgid "database system shutdown was interrupted; last known up at %s"
-msgstr "veritabanı kapatma işlemi iptal edildi; bilinen en son çalışma zamanı %s"
-
-#: access/transam/xlog.c:5186
-#, c-format
-msgid "database system was interrupted while in recovery at %s"
-msgstr "%s'da recovery sırasında veritabanı sistemi durduruldu"
-
-#: access/transam/xlog.c:5188
-msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
-msgstr "Büyük ihtimalle veri bozulmuştur, kurtarmak için en son yedeğinizi kullanın."
-
-#: access/transam/xlog.c:5192
-#, c-format
-msgid "database system was interrupted while in recovery at log time %s"
-msgstr "log time %s'da recovery sırasında veritabanı sistemi kesildi"
-
-#: access/transam/xlog.c:5194
-msgid "If this has occurred more than once some data might be corrupted and you might need to choose an earlier recovery target."
-msgstr "Bu hata birden fazla kere meydana geldiyse, veri bozulmuÅŸ olabilir. Bu durumda daha erken tarihli kurtarma hedefinini belirtmelisiniz."
-
-#: access/transam/xlog.c:5198
-#, c-format
-msgid "database system was interrupted; last known up at %s"
-msgstr "veritabanı sunucusu durdurulmuştur; bilinen en son çalışma zamanı %s"
-
-#: access/transam/xlog.c:5237
-#, c-format
-msgid "requested timeline %u is not a child of database system timeline %u"
-msgstr "talep edilmiş timeline %u veritabanı sistem timeline %u için geçerli bir timeline değildir"
-
-#: access/transam/xlog.c:5251
-#: access/transam/xlog.c:5275
-#, c-format
-msgid "checkpoint record is at %X/%X"
-msgstr "checkpoint kaydı %X/%X noktasındadır"
-
-#: access/transam/xlog.c:5258
-msgid "could not locate required checkpoint record"
-msgstr "istenilen checkpoint kaydı bulunamadı"
-
-#: access/transam/xlog.c:5259
-#, c-format
-msgid "If you are not restoring from a backup, try removing the file \"%s/backup_label\"."
-msgstr "Yedekten geri almıyorsanız, \"%s/backup_label\" dosyasını silmeyi deneyin."
-
-#: access/transam/xlog.c:5285
-#, c-format
-msgid "using previous checkpoint record at %X/%X"
-msgstr "%X/%X adresindeki eski checkpoint kaydı kullanılıyor"
-
-#: access/transam/xlog.c:5291
-msgid "could not locate a valid checkpoint record"
-msgstr "geçerli checkpoint kaydı bulunamıyor"
-
-#: access/transam/xlog.c:5300
-#, c-format
-msgid "redo record is at %X/%X; shutdown %s"
-msgstr "redo kaydı %X/%X; kapatma %s"
-
-#: access/transam/xlog.c:5304
-#, c-format
-msgid "next transaction ID: %u/%u; next OID: %u"
-msgstr "sıradaki transaction ID: %u/%u; sıradaki OID: %u"
-
-#: access/transam/xlog.c:5308
-#, c-format
-msgid "next MultiXactId: %u; next MultiXactOffset: %u"
-msgstr "sıradaki MultiXactId: %u; sıradaki MultiXactOffset: %u"
-
-#: access/transam/xlog.c:5312
-msgid "invalid next transaction ID"
-msgstr "sıradaki transaction ID geçersiz"
-
-#: access/transam/xlog.c:5330
-msgid "invalid redo in checkpoint record"
-msgstr "checkpoint kaydındaki redo geçersizdir"
-
-#: access/transam/xlog.c:5341
-msgid "invalid redo record in shutdown checkpoint"
-msgstr "shutdown checkpointteki redo kaydı geçersizdir"
-
-#: access/transam/xlog.c:5366
-msgid "automatic recovery in progress"
-msgstr "otomatik kurtarma sürüyor"
-
-#: access/transam/xlog.c:5372
-msgid "database system was not properly shut down; automatic recovery in progress"
-msgstr "veritabanı düzgün kapatılmamış; otomatik kurtarma işlemi sürüyor"
-
-#: access/transam/xlog.c:5455
-#, c-format
-msgid "redo starts at %X/%X"
-msgstr "redo başlangıcı %X/%X"
-
-#: access/transam/xlog.c:5459
-#, c-format
-msgid "redo starts at %X/%X, consistency will be reached at %X/%X"
-msgstr ""
-
-#: access/transam/xlog.c:5528
-msgid "consistent recovery state reached"
-msgstr ""
-
-#: access/transam/xlog.c:5582
-#, c-format
-msgid "redo done at %X/%X"
-msgstr "redo bitiÅŸi %X/%X"
-
-#: access/transam/xlog.c:5586
-#: access/transam/xlog.c:6717
-#, c-format
-msgid "last completed transaction was at log time %s"
-msgstr "son tamamlanan transaction %s kayıt zamanındaydı"
-
-#: access/transam/xlog.c:5594
-msgid "redo is not required"
-msgstr "redo iÅŸlemi gerekmiyor"
-
-#: access/transam/xlog.c:5614
-#, fuzzy
-msgid "requested recovery stop point is before consistent recovery point"
-msgstr "talep edilen kurtarma durma noktası yedek dump'ının bitiş tarihinden öncedir"
-
-#: access/transam/xlog.c:5617
-msgid "WAL ends before consistent recovery point"
-msgstr ""
-
-#: access/transam/xlog.c:5638
-#, c-format
-msgid "selected new timeline ID: %u"
-msgstr "seçili yeni timeline ID: %u"
-
-#: access/transam/xlog.c:5865
-msgid "invalid primary checkpoint link in control file"
-msgstr "kontrol dosyasındaki ana checkpoint bağlantısı geçersiz"
-
-#: access/transam/xlog.c:5869
-msgid "invalid secondary checkpoint link in control file"
-msgstr "kontrol dosyasındaki ikincil checkpoint bağlantısı geçersiz"
-
-#: access/transam/xlog.c:5873
-msgid "invalid checkpoint link in backup_label file"
-msgstr "backup_label dosyasındaki checkpoint linki geçersiz"
-
-#: access/transam/xlog.c:5887
-msgid "invalid primary checkpoint record"
-msgstr "birincil checkpoint kaydı geçersiz"
-
-#: access/transam/xlog.c:5891
-msgid "invalid secondary checkpoint record"
-msgstr "ikincil checkpoint kaydı geçersiz"
-
-#: access/transam/xlog.c:5895
-msgid "invalid checkpoint record"
-msgstr "geçersiz checkpoint kaydı"
-
-#: access/transam/xlog.c:5906
-msgid "invalid resource manager ID in primary checkpoint record"
-msgstr "birincil checkpoint kaydındaki resource manager ID geçersiz"
-
-#: access/transam/xlog.c:5910
-msgid "invalid resource manager ID in secondary checkpoint record"
-msgstr "ikincil checkpoint kaydındaki resource manager ID geçersiz"
-
-#: access/transam/xlog.c:5914
-msgid "invalid resource manager ID in checkpoint record"
-msgstr "checkpoint kaydındaki resource manager ID geçersiz"
-
-#: access/transam/xlog.c:5926
-msgid "invalid xl_info in primary checkpoint record"
-msgstr "primary checkpoint kaydındaki xl_info geçersiz"
-
-#: access/transam/xlog.c:5930
-msgid "invalid xl_info in secondary checkpoint record"
-msgstr "ikincil checkpoint kaydındaki xl_info geçersiz"
-
-#: access/transam/xlog.c:5934
-msgid "invalid xl_info in checkpoint record"
-msgstr "checkpoint kaydındaki xl_info geçersiz"
-
-#: access/transam/xlog.c:5946
-msgid "invalid length of primary checkpoint record"
-msgstr "birincil checkpoint kaydının uzunluğu geçersiz"
-
-#: access/transam/xlog.c:5950
-msgid "invalid length of secondary checkpoint record"
-msgstr "ikincil checkpoint kaydının uzunluğu geçersiz"
-
-#: access/transam/xlog.c:5954
-msgid "invalid length of checkpoint record"
-msgstr "checkpoint kaydın uzunluğu geçersiz"
-
-#: access/transam/xlog.c:6088
-msgid "shutting down"
-msgstr "kapanıyor"
-
-#: access/transam/xlog.c:6110
-msgid "database system is shut down"
-msgstr "veritabanı sistemi kapandı"
-
-#: access/transam/xlog.c:6238
-msgid "hurrying in-progress restartpoint"
-msgstr ""
-
-#: access/transam/xlog.c:6464
-msgid "concurrent transaction log activity while database system is shutting down"
-msgstr "veritabanının kapanması sırasında eşzamanlı transaction log hareketi"
-
-#: access/transam/xlog.c:6644
-msgid "skipping restartpoint, recovery has already ended"
-msgstr "restartpoint (yeniden başlama noktası) atlanıyor, kurtarma zaten sona erdi"
-
-#: access/transam/xlog.c:6669
-#, fuzzy, c-format
-msgid "skipping restartpoint, already performed at %X/%X"
-msgstr "%X/%X adresindeki eski checkpoint kaydı kullanılıyor"
-
-#: access/transam/xlog.c:6712
-#, c-format
-msgid "recovery restart point at %X/%X"
-msgstr "recoveri yeniden başlangıç noktası: %X/%X"
-
-#: access/transam/xlog.c:6835
-#, c-format
-msgid "unexpected timeline ID %u (after %u) in checkpoint record"
-msgstr "checkpoint kaydındaki beklenmeyen timeline ID %u (%u'dan sonra)"
-
-#: access/transam/xlog.c:6867
-#, c-format
-msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
-msgstr "checkpoint kaydındaki beklenmeyen timeline ID %u (%u olmalıydı)"
-
-#: access/transam/xlog.c:7003
-#: access/transam/xlog.c:7026
-#, c-format
-msgid "could not fsync log file %u, segment %u: %m"
-msgstr "kayıt dosyası %u, segment %u fsync yapılamıyor: %m"
-
-#: access/transam/xlog.c:7034
-#, c-format
-msgid "could not fsync write-through log file %u, segment %u: %m"
-msgstr "write-through log dosyası %u, segment %u fsync yapılamıyor: %m"
-
-#: access/transam/xlog.c:7043
-#, c-format
-msgid "could not fdatasync log file %u, segment %u: %m"
-msgstr "kayıt dosyası %u, segment %u fdatasync yapılamıyor: %m"
-
-#: access/transam/xlog.c:7086
-#: access/transam/xlog.c:7273
-msgid "must be superuser to run a backup"
-msgstr "yedeklemeyi gerçekleştirmek için superuser haklarına sahip olmalısınız"
-
-#: access/transam/xlog.c:7091
-#: access/transam/xlog.c:7097
-#: access/transam/xlog.c:7278
-msgid "WAL archiving is not active"
-msgstr "WAL arÅŸivleme etkin deÄŸil"
-
-#: access/transam/xlog.c:7092
-#: access/transam/xlog.c:7279
-msgid "archive_mode must be enabled at server start."
-msgstr "archive_mode sunucu başlatıldığında etkinleştirilmedir."
-
-#: access/transam/xlog.c:7098
-msgid "archive_command must be defined before online backups can be made safely."
-msgstr "online yedekleme güvenilir bir biçimde çalışması için, önce archive_command tanımlayın."
-
-#: access/transam/xlog.c:7126
-#: access/transam/xlog.c:7195
-msgid "a backup is already in progress"
-msgstr "bir backup iÅŸlemi zaten aktif"
-
-#: access/transam/xlog.c:7127
-msgid "Run pg_stop_backup() and try again."
-msgstr "pg_stop_backup() çalıştırıp yeniden deneyin."
-
-#: access/transam/xlog.c:7196
-#, c-format
-msgid "If you're sure there is no backup in progress, remove file \"%s\" and try again."
-msgstr "Eğer bir backup sürecinin şu an çalışmadığından eminseniz, \"%s\" dosyasını kaldırın ve yeniden deneyin."
-
-#: access/transam/xlog.c:7217
-#: access/transam/xlog.c:7354
-#, c-format
-msgid "could not write file \"%s\": %m"
-msgstr "\"%s\" dosyasına yazma hatası: %m"
-
-#: access/transam/xlog.c:7317
-msgid "a backup is not in progress"
-msgstr "şu an backup süreci çalışmıyor"
-
-#: access/transam/xlog.c:7329
-#: access/transam/xlog.c:7670
-#: access/transam/xlog.c:7676
-#: access/transam/xlog.c:7707
-#: access/transam/xlog.c:7713
-#, c-format
-msgid "invalid data in file \"%s\""
-msgstr "\"%s\" dosyasında geçersiz veri"
-
-#: access/transam/xlog.c:7409
-#, c-format
-msgid "pg_stop_backup still waiting for archive to complete (%d seconds elapsed)"
-msgstr "pg_stop_backup hala arÅŸivin bitmesini bekliyor (%d saniyedir devam ediyor)"
-
-#: access/transam/xlog.c:7434
-msgid "must be superuser to switch transaction log files"
-msgstr "transaction log dosyaları değiştirmek için superuser olmalısınız"
-
-#: access/transam/xlog.c:7531
-#: access/transam/xlog.c:7597
-#, c-format
-msgid "could not parse transaction log location \"%s\""
-msgstr "\"%s\" transaction log konumu ayrıştıramadı"
-
-#: access/transam/xlog.c:7741
-#, c-format
-msgid "xlog redo %s"
-msgstr "xlog redo %s"
-
-#: access/transam/xlog.c:7781
-msgid "online backup mode cancelled"
-msgstr "çevrimiçi yedekleme modu iptal edildi"
-
-#: access/transam/xlog.c:7782
-#, fuzzy, c-format
-msgid "\"%s\" was renamed to \"%s\"."
-msgstr "\"%s\" zaten \"%s\" nesnesinin alt nesnesidir"
-
-#: access/transam/xlog.c:7789
-msgid "online backup mode was not cancelled"
-msgstr "çevrimiçi yedek modu iptal edilmedi"
-
-#: access/transam/xlog.c:7790
-#, fuzzy, c-format
-msgid "Could not rename \"%s\" to \"%s\": %m."
-msgstr "\"%s\" -- \"%s\" ad değiştirme hatası: %m"
-
-#: access/gin/ginarrayproc.c:30
-msgid "array must not contain null values"
-msgstr "array null kayıtları içeremez"
-
-#: access/gin/ginscan.c:164
-#: access/gin/ginscan.c:227
-msgid "GIN indexes do not support whole-index scans"
-msgstr "GIN dizinler tüm dizin taramasını desteklememektedir"
-
-#: access/nbtree/nbtinsert.c:300
-#, c-format
-msgid "duplicate key value violates unique constraint \"%s\""
-msgstr "tekrar eden kayıt, \"%s\" tekil kısıtlamasını ihlal etmektedir"
-
-#: access/nbtree/nbtinsert.c:421
-#: access/nbtree/nbtsort.c:483
-#, c-format
-msgid "index row size %lu exceeds btree maximum, %lu"
-msgstr "%lu index satır boyutu, btree indexi için %lu olan en büyük satır büyüklüğünü aşmaktadır"
-
-#: access/nbtree/nbtinsert.c:424
-#: access/nbtree/nbtsort.c:486
-msgid ""
-"Values larger than 1/3 of a buffer page cannot be indexed.\n"
-"Consider a function index of an MD5 hash of the value, or use full text indexing."
-msgstr ""
-"Bir buffer sayfasının boyutunun 1/3'ni geçen değerler indekslenemez.\n"
-"Yerine değerinin MD5 hash'ı değeri üzerinde function index ya da full text indexing kullanabilirisiniz."
-
-#: access/nbtree/nbtpage.c:160
-#: access/nbtree/nbtpage.c:364
-#, c-format
-msgid "index \"%s\" is not a btree"
-msgstr "\"%s\" indexi btree deÄŸildir."
-
-#: access/nbtree/nbtpage.c:166
-#: access/nbtree/nbtpage.c:370
-#, c-format
-msgid "version mismatch in index \"%s\": file version %d, code version %d"
-msgstr "\"%s\" indexinde sürüm uyuşmazlığı: dosya sürümü %d, kod sürümü ise %d"
-
-#: access/heap/heapam.c:1073
-#: access/heap/heapam.c:1101
-#: access/heap/heapam.c:1131
-#: catalog/aclchk.c:880
-#, c-format
-msgid "\"%s\" is an index"
-msgstr "\"%s\" bir indextir"
-
-#: access/heap/heapam.c:1078
-#: access/heap/heapam.c:1106
-#: access/heap/heapam.c:1136
-#: catalog/aclchk.c:887
-#: commands/tablecmds.c:2061
-#: commands/tablecmds.c:6250
-#: commands/tablecmds.c:7541
-#, c-format
-msgid "\"%s\" is a composite type"
-msgstr "\"%s\" bir birleÅŸik tiptir"
-
-#: access/heap/heapam.c:3150
-#: access/heap/heapam.c:3181
-#: access/heap/heapam.c:3216
-#, c-format
-msgid "could not obtain lock on row in relation \"%s\""
-msgstr "\"%s\" tablosundaki satır için lock alınamadı"
-
-#: access/heap/hio.c:174
-#: access/heap/rewriteheap.c:592
-#, c-format
-msgid "row is too big: size %lu, maximum size %lu"
-msgstr "satır çok büyük: boyutu %lu, olabileceği en fazla boyut %lu"
-
-#: access/index/indexam.c:149
-#: commands/comment.c:502
-#: commands/indexcmds.c:1324
-#: commands/tablecmds.c:211
-#: commands/tablecmds.c:2258
-#, c-format
-msgid "\"%s\" is not an index"
-msgstr "\"%s\" bir index deÄŸildir"
-
-#: access/hash/hashinsert.c:77
-#, c-format
-msgid "index row size %lu exceeds hash maximum %lu"
-msgstr "index satır boyutu %lu, %lu olan en yüksek hash boyutunu aşmaktadır"
-
-#: access/hash/hashinsert.c:80
-msgid "Values larger than a buffer page cannot be indexed."
-msgstr "Bir buffer sayfası boyutundan yüksek değerler indekslenemz."
-
-#: access/hash/hashovfl.c:546
-#, c-format
-msgid "out of overflow pages in hash index \"%s\""
-msgstr " \"%s\" hash indexi içinde sayfa taşması hatası"
-
-#: access/hash/hashsearch.c:152
-msgid "hash indexes do not support whole-index scans"
-msgstr "hash indexler tüm index taramasını desteklememektedir"
-
-#: access/hash/hashutil.c:208
-#, c-format
-msgid "index \"%s\" is not a hash index"
-msgstr "\"%s\" indexi bir hash indexi deÄŸildir"
-
-#: access/hash/hashutil.c:214
-#, c-format
-msgid "index \"%s\" has wrong hash version"
-msgstr "\"%s\" indexi yanlış hash sürümüne sahiptir"
-
-#: utils/mmgr/aset.c:386
-#, c-format
-msgid "Failed while creating memory context \"%s\"."
-msgstr "Memory content \"%s\" oluşturma başarısız."
-
-#: utils/mmgr/aset.c:565
-#: utils/mmgr/aset.c:748
-#: utils/mmgr/aset.c:954
-#, c-format
-msgid "Failed on request of size %lu."
-msgstr "%lu boyutu isteği başarısız"
-
-#: utils/mmgr/portalmem.c:207
-#, c-format
-msgid "cursor \"%s\" already exists"
-msgstr "cursor \"%s\" zaten mevcut"
-
-#: utils/mmgr/portalmem.c:211
-#, c-format
-msgid "closing existing cursor \"%s\""
-msgstr "var olan cursor \"%s\" kapatılıyor"
-
-#: utils/mmgr/portalmem.c:590
-msgid "cannot PREPARE a transaction that has created a cursor WITH HOLD"
-msgstr "WITH HOLD imleci oluÅŸturan transaction PREPARE edilemedi"
-
-#: utils/mmgr/portalmem.c:889
-#: utils/fmgr/funcapi.c:60
-#: commands/prepare.c:749
-#: executor/execQual.c:1473
-#: executor/execQual.c:1498
-#: executor/execQual.c:1859
-#: executor/execQual.c:5018
-#: executor/functions.c:644
-#: foreign/foreign.c:281
-msgid "set-valued function called in context that cannot accept a set"
-msgstr "set değerini kabul etmediği ortamda set değeri alan fonksiyon çağırılmış"
-
-#: utils/mmgr/portalmem.c:893
-#: commands/prepare.c:753
-#: foreign/foreign.c:286
-msgid "materialize mode required, but it is not allowed in this context"
-msgstr "materialize mode gerekir ancak bu bağlamda kullanılamaz"
-
-#: utils/adt/acl.c:160
-#: utils/adt/name.c:87
-msgid "identifier too long"
-msgstr "tanımlayıcı fazla uzun"
-
-#: utils/adt/acl.c:161
-#: utils/adt/name.c:88
-#, c-format
-msgid "Identifier must be less than %d characters."
-msgstr "Tamılayıcı %d karakterden daha küçük olmalı."
-
-#: utils/adt/acl.c:247
-#, c-format
-msgid "unrecognized key word: \"%s\""
-msgstr "anahtar kelimesi anlaşılamıyor: \"%s\""
-
-#: utils/adt/acl.c:248
-msgid "ACL key word must be \"group\" or \"user\"."
-msgstr "ACL anahtar kelimesi  \"group\" veya \"user\" olmalıdır."
-
-#: utils/adt/acl.c:253
-msgid "missing name"
-msgstr "isim eksik"
-
-#: utils/adt/acl.c:254
-msgid "A name must follow the \"group\" or \"user\" key word."
-msgstr "\"group\" veya \"user\" anahter kelimesini isim izlemelidir."
-
-#: utils/adt/acl.c:260
-msgid "missing \"=\" sign"
-msgstr "\"=\" iÅŸareti eksik"
-
-#: utils/adt/acl.c:313
-#, c-format
-msgid "invalid mode character: must be one of \"%s\""
-msgstr "geçersiz biçim karakteri: şunlardan biri olmalıdır: \"%s\""
-
-#: utils/adt/acl.c:335
-msgid "a name must follow the \"/\" sign"
-msgstr "\"/\" karakterini bir isim izlemelidir"
-
-#: utils/adt/acl.c:343
-#, c-format
-msgid "defaulting grantor to user ID %u"
-msgstr "varsayılan bağışlayıcı kullanıcı ID %u"
-
-#: utils/adt/acl.c:433
-msgid "ACL array contains wrong data type"
-msgstr "ACL array yanlış veri tipini içermektedir"
-
-#: utils/adt/acl.c:437
-msgid "ACL arrays must be one-dimensional"
-msgstr "ACL array tek boyutlu olmalıdır"
-
-#: utils/adt/acl.c:441
-msgid "ACL arrays must not contain null values"
-msgstr "ACL array null kayıtları içeremez"
-
-#: utils/adt/acl.c:465
-msgid "extra garbage at the end of the ACL specification"
-msgstr "ACL tanımının sonunda fuzuli karakterler"
-
-#: utils/adt/acl.c:994
-msgid "grant options cannot be granted back to your own grantor"
-msgstr "grant seçenekleri kendi kendine verilemez"
-
-#: utils/adt/acl.c:1055
-msgid "dependent privileges exist"
-msgstr "bağlı haklar mevcut"
-
-#: utils/adt/acl.c:1056
-msgid "Use CASCADE to revoke them too."
-msgstr "Onları da geri almak için CASCADE kullanın."
-
-#: utils/adt/acl.c:1335
-msgid "aclinsert is no longer supported"
-msgstr "aclinsert artık desteklenmemktedir"
-
-#: utils/adt/acl.c:1345
-msgid "aclremove is no longer supported"
-msgstr "aclremove artık desteklenmemktedir"
-
-#: utils/adt/acl.c:1431
-#: utils/adt/acl.c:1485
-#, c-format
-msgid "unrecognized privilege type: \"%s\""
-msgstr "bilinmeyen hak türü: \"%s\""
-
-#: utils/adt/acl.c:2303
-#: utils/adt/ruleutils.c:1358
-#: catalog/aclchk.c:636
-#: commands/analyze.c:276
-#: commands/comment.c:579
-#: commands/copy.c:3404
-#: commands/sequence.c:1301
-#: commands/tablecmds.c:3823
-#: commands/tablecmds.c:3915
-#: commands/tablecmds.c:3962
-#: commands/tablecmds.c:4058
-#: commands/tablecmds.c:4119
-#: commands/tablecmds.c:4183
-#: commands/tablecmds.c:5567
-#: commands/tablecmds.c:5705
-#: parser/analyze.c:1720
-#: parser/parse_relation.c:2056
-#: parser/parse_relation.c:2111
-#: parser/parse_target.c:804
-#: parser/parse_type.c:117
-#, c-format
-msgid "column \"%s\" of relation \"%s\" does not exist"
-msgstr "\"%s\" kolonu \"%s\" tablosunda mevcut deÄŸil"
-
-#: utils/adt/acl.c:2514
-#: utils/adt/dbsize.c:144
-#: utils/init/postinit.c:420
-#: utils/init/postinit.c:539
-#: utils/init/postinit.c:555
-#: catalog/aclchk.c:500
-#: commands/comment.c:626
-#: commands/dbcommands.c:759
-#: commands/dbcommands.c:903
-#: commands/dbcommands.c:1010
-#: commands/dbcommands.c:1187
-#: commands/dbcommands.c:1374
-#: commands/dbcommands.c:1446
-#: commands/dbcommands.c:1533
-#, c-format
-msgid "database \"%s\" does not exist"
-msgstr "\"%s\" veritabanı mevcut değil"
-
-#: utils/adt/acl.c:2909
-#: utils/adt/regproc.c:118
-#: utils/adt/regproc.c:139
-#: utils/adt/regproc.c:291
-#, c-format
-msgid "function \"%s\" does not exist"
-msgstr "\"%s\" fonksiyonu mevcut deÄŸil"
-
-#: utils/adt/acl.c:3115
-#: catalog/aclchk.c:528
-#: commands/comment.c:1195
-#: commands/functioncmds.c:805
-#: commands/proclang.c:433
-#: commands/proclang.c:506
-#: commands/proclang.c:550
-#, c-format
-msgid "language \"%s\" does not exist"
-msgstr "\"%s\" dili mevcut deÄŸil"
-
-#: utils/adt/acl.c:3321
-#: catalog/aclchk.c:548
-#: catalog/namespace.c:338
-#: catalog/namespace.c:2124
-#: catalog/namespace.c:2165
-#: catalog/namespace.c:2213
-#: catalog/namespace.c:3120
-#: commands/comment.c:736
-#: commands/schemacmds.c:190
-#: commands/schemacmds.c:267
-#: commands/schemacmds.c:343
-#, c-format
-msgid "schema \"%s\" does not exist"
-msgstr "\"%s\" şeması mevcut değil"
-
-#: utils/adt/acl.c:3695
-#: utils/adt/dbsize.c:240
-#: catalog/aclchk.c:577
-#: commands/comment.c:665
-#: commands/dbcommands.c:431
-#: commands/dbcommands.c:1043
-#: commands/indexcmds.c:212
-#: commands/tablecmds.c:400
-#: commands/tablecmds.c:6509
-#: commands/tablespace.c:415
-#: commands/tablespace.c:770
-#: commands/tablespace.c:837
-#: commands/tablespace.c:931
-#: commands/tablespace.c:1055
-#: executor/execMain.c:2884
-#, c-format
-msgid "tablespace \"%s\" does not exist"
-msgstr "\"%s\" tablespace'i mevcut deÄŸil"
-
-#: utils/adt/acl.c:4200
-#, c-format
-msgid "must be member of role \"%s\""
-msgstr "\"%s\" rolüne dahil olmalıdır"
-
-#: utils/adt/array_userfuncs.c:49
-msgid "could not determine input data types"
-msgstr "giriÅŸ veri tipleri belirlenemiyor"
-
-#: utils/adt/array_userfuncs.c:83
-msgid "neither input type is an array"
-msgstr "giriş tiplerinin hiçbiri array değildir"
-
-#: utils/adt/array_userfuncs.c:104
-#: utils/adt/array_userfuncs.c:114
-#: utils/adt/float.c:1100
-#: utils/adt/float.c:1159
-#: utils/adt/float.c:2716
-#: utils/adt/float.c:2732
-#: utils/adt/int.c:613
-#: utils/adt/int.c:642
-#: utils/adt/int.c:663
-#: utils/adt/int.c:683
-#: utils/adt/int.c:705
-#: utils/adt/int.c:730
-#: utils/adt/int.c:744
-#: utils/adt/int.c:759
-#: utils/adt/int.c:894
-#: utils/adt/int.c:915
-#: utils/adt/int.c:942
-#: utils/adt/int.c:977
-#: utils/adt/int.c:998
-#: utils/adt/int.c:1025
-#: utils/adt/int.c:1052
-#: utils/adt/int.c:1106
-#: utils/adt/int8.c:1195
-#: utils/adt/numeric.c:2035
-#: utils/adt/numeric.c:2044
-#: utils/adt/varbit.c:1377
-msgid "integer out of range"
-msgstr "integer sıra dışıdır"
-
-#: utils/adt/array_userfuncs.c:122
-msgid "argument must be empty or one-dimensional array"
-msgstr "argüman boş veya tek boyutlu dizi olmalıdır"
-
-#: utils/adt/array_userfuncs.c:225
-#: utils/adt/array_userfuncs.c:264
-#: utils/adt/array_userfuncs.c:301
-#: utils/adt/array_userfuncs.c:330
-#: utils/adt/array_userfuncs.c:358
-msgid "cannot concatenate incompatible arrays"
-msgstr "uyumsuz arrayları birleştirilemez"
-
-#: utils/adt/array_userfuncs.c:226
-#, c-format
-msgid "Arrays with element types %s and %s are not compatible for concatenation."
-msgstr "Öğe tipleri %s ve %s olan dizileri bitiştirmede kullanılamaz."
-
-#: utils/adt/array_userfuncs.c:265
-#, c-format
-msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
-msgstr "Bitiştirmede %d ve %d boyutlu dizileri kullanılamaz."
-
-#: utils/adt/array_userfuncs.c:302
-msgid "Arrays with differing element dimensions are not compatible for concatenation."
-msgstr "Bitiştirmede öğeleri farklı boyutlu olan dizileri kullanılamaz."
-
-#: utils/adt/array_userfuncs.c:331
-#: utils/adt/array_userfuncs.c:359
-msgid "Arrays with differing dimensions are not compatible for concatenation."
-msgstr "Bitiştirmede farklı boyutlu dizileri kullanılamaz."
-
-#: utils/adt/array_userfuncs.c:425
-#: utils/adt/arrayfuncs.c:1186
-#: utils/adt/arrayfuncs.c:2841
-#: utils/adt/arrayfuncs.c:4521
-#, c-format
-msgid "invalid number of dimensions: %d"
-msgstr "boyut sayısı geçersiz: %d"
-
-#: utils/adt/array_userfuncs.c:429
-#: utils/adt/arrayfuncs.c:203
-#: utils/adt/arrayfuncs.c:455
-#: utils/adt/arrayfuncs.c:1190
-#: utils/adt/arrayfuncs.c:2845
-#: utils/adt/arrayfuncs.c:4525
-#: executor/execQual.c:293
-#: executor/execQual.c:321
-#: executor/execQual.c:2907
-#, c-format
-msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
-msgstr "dizin boyut sayısı (%d), izin verilern en yüksek değerini (%d) aşmaktadır"
-
-#: utils/adt/array_userfuncs.c:485
-#, fuzzy
-msgid "could not determine input data type"
-msgstr "giriÅŸ veri tipleri belirlenemiyor"
-
-#: utils/adt/arrayfuncs.c:210
-#: utils/adt/arrayfuncs.c:222
-msgid "missing dimension value"
-msgstr "boyut deÄŸeri eksik"
-
-#: utils/adt/arrayfuncs.c:232
-msgid "missing \"]\" in array dimensions"
-msgstr "array tanımında \"]\" eksik"
-
-#: utils/adt/arrayfuncs.c:240
-#: utils/adt/arrayfuncs.c:2370
-#: utils/adt/arrayfuncs.c:2398
-#: utils/adt/arrayfuncs.c:2413
-msgid "upper bound cannot be less than lower bound"
-msgstr "üst sınır alt sınırından düşük olamaz"
-
-#: utils/adt/arrayfuncs.c:252
-#: utils/adt/arrayfuncs.c:278
-msgid "array value must start with \"{\" or dimension information"
-msgstr "array değeri ya \"{\" ile ya da boyut bilgisi ile başlamalıdır"
-
-#: utils/adt/arrayfuncs.c:266
-msgid "missing assignment operator"
-msgstr "atama iÅŸlemi eksik"
-
-#: utils/adt/arrayfuncs.c:283
-#: utils/adt/arrayfuncs.c:289
-msgid "array dimensions incompatible with array literal"
-msgstr "array boyutları array değişmezi ile uyumsuz"
-
-#: utils/adt/arrayfuncs.c:392
-#: utils/adt/arrayfuncs.c:407
-#: utils/adt/arrayfuncs.c:416
-#: utils/adt/arrayfuncs.c:430
-#: utils/adt/arrayfuncs.c:450
-#: utils/adt/arrayfuncs.c:478
-#: utils/adt/arrayfuncs.c:483
-#: utils/adt/arrayfuncs.c:523
-#: utils/adt/arrayfuncs.c:544
-#: utils/adt/arrayfuncs.c:563
-#: utils/adt/arrayfuncs.c:673
-#: utils/adt/arrayfuncs.c:682
-#: utils/adt/arrayfuncs.c:712
-#: utils/adt/arrayfuncs.c:727
-#: utils/adt/arrayfuncs.c:780
-#, c-format
-msgid "malformed array literal: \"%s\""
-msgstr "array literal bozuk: \"%s\""
-
-#: utils/adt/arrayfuncs.c:490
-#: executor/execQual.c:2927
-#: executor/execQual.c:2954
-msgid "multidimensional arrays must have array expressions with matching dimensions"
-msgstr "çok boyutlu dizinler boyut sayısı kadar dizin ifade sayısına sahip olmalıdırlar"
-
-#: utils/adt/arrayfuncs.c:819
-#: utils/adt/arrayfuncs.c:1407
-#: utils/adt/arrayfuncs.c:2725
-#: utils/adt/arrayfuncs.c:2873
-#: utils/adt/arrayfuncs.c:4621
-#: utils/adt/arrayutils.c:93
-#: utils/adt/arrayutils.c:102
-#: utils/adt/arrayutils.c:109
-#, c-format
-msgid "array size exceeds the maximum allowed (%d)"
-msgstr "dizin boyutu izin verilern en yüksek değerini (%d) aşmaktadır"
-
-#: utils/adt/arrayfuncs.c:1197
-msgid "invalid array flags"
-msgstr "array flags geçersiz"
-
-#: utils/adt/arrayfuncs.c:1205
-msgid "wrong element type"
-msgstr "element tipi yanlış"
-
-#: utils/adt/arrayfuncs.c:1241
-#: utils/cache/lsyscache.c:2394
-#, c-format
-msgid "no binary input function available for type %s"
-msgstr "%s tipi için ikili giriş fonksiyonu mevcut değil"
-
-#: utils/adt/arrayfuncs.c:1381
-#, c-format
-msgid "improper binary format in array element %d"
-msgstr "%d dizi öğesi için geçersiz ikili biçimi"
-
-#: utils/adt/arrayfuncs.c:1463
-#: utils/cache/lsyscache.c:2429
-#, c-format
-msgid "no binary output function available for type %s"
-msgstr "%s tipi için ikili çıkış fonksiyonu mevcut değil"
-
-#: utils/adt/arrayfuncs.c:1837
-msgid "slices of fixed-length arrays not implemented"
-msgstr "sabit-uzunluklu dizinlerin dilimleri implemente edilmemiÅŸ"
-
-#: utils/adt/arrayfuncs.c:2010
-#: utils/adt/arrayfuncs.c:2032
-#: utils/adt/arrayfuncs.c:2066
-#: utils/adt/arrayfuncs.c:2352
-#: utils/adt/arrayfuncs.c:4501
-#: utils/adt/arrayfuncs.c:4533
-#: utils/adt/arrayfuncs.c:4550
-msgid "wrong number of array subscripts"
-msgstr "array subscript sayısı yanlış"
-
-#: utils/adt/arrayfuncs.c:2015
-#: utils/adt/arrayfuncs.c:2108
-#: utils/adt/arrayfuncs.c:2403
-msgid "array subscript out of range"
-msgstr "array subscript kapsam dsışıdır"
-
-#: utils/adt/arrayfuncs.c:2020
-msgid "cannot assign null value to an element of a fixed-length array"
-msgstr "sabit uzunluklu array elementine null deÄŸeri atanamaz"
-
-#: utils/adt/arrayfuncs.c:2306
-msgid "updates on slices of fixed-length arrays not implemented"
-msgstr "sabit-uzunluklu dizinlerin dilimleri üzerinde update implemente edilmemiş"
-
-#: utils/adt/arrayfuncs.c:2342
-#: utils/adt/arrayfuncs.c:2429
-msgid "source array too small"
-msgstr "kaynak array küçük"
-
-#: utils/adt/arrayfuncs.c:2980
-msgid "null array element not allowed in this context"
-msgstr "bu ortamda null array elementi kabul edilmemektedir"
-
-#: utils/adt/arrayfuncs.c:3041
-#: utils/adt/arrayfuncs.c:3248
-#: utils/adt/arrayfuncs.c:3448
-msgid "cannot compare arrays of different element types"
-msgstr "farklı öğe tipli dizinleri karşılaştırılamaz"
-
-#: utils/adt/arrayfuncs.c:3064
-#: utils/adt/arrayfuncs.c:3465
-#: utils/adt/rowtypes.c:1133
-#: parser/parse_oper.c:259
-#, c-format
-msgid "could not identify an equality operator for type %s"
-msgstr "%s tipi için eşitleme işlemi bulunamadı "
-
-#: utils/adt/arrayfuncs.c:3265
-#: utils/adt/rowtypes.c:907
-#: executor/execQual.c:4674
-#, c-format
-msgid "could not identify a comparison function for type %s"
-msgstr "%s tipi için karşılaştırma fonksiyonu bulunamadı"
-
-#: utils/adt/arrayfuncs.c:4399
-#: utils/adt/arrayfuncs.c:4439
-msgid "dimension array or low bound array cannot be NULL"
-msgstr ""
-
-#: utils/adt/arrayfuncs.c:4502
-#: utils/adt/arrayfuncs.c:4534
-#, fuzzy
-msgid "Dimension array must be one dimensional."
-msgstr "typmod array tek boyutlu olmalıdır"
-
-#: utils/adt/arrayfuncs.c:4507
-#: utils/adt/arrayfuncs.c:4539
-#, fuzzy
-msgid "wrong range of array subscripts"
-msgstr "array subscript sayısı yanlış"
-
-#: utils/adt/arrayfuncs.c:4508
-#: utils/adt/arrayfuncs.c:4540
-msgid "Lower bound of dimension array must be one."
-msgstr ""
-
-#: utils/adt/arrayfuncs.c:4513
-#: utils/adt/arrayfuncs.c:4545
-#, fuzzy
-msgid "dimension values cannot be null"
-msgstr "oturum kullanıcısının adı değiştirilemez"
-
-#: utils/adt/arrayfuncs.c:4551
-msgid "Low bound array has different size than dimensions array."
-msgstr ""
-
-#: utils/adt/arrayutils.c:209
-#, fuzzy
-msgid "typmod array must be type cstring[]"
-msgstr "typmod array tamsyı tipinde olmalıdır"
-
-#: utils/adt/arrayutils.c:214
-msgid "typmod array must be one-dimensional"
-msgstr "typmod array tek boyutlu olmalıdır"
-
-#: utils/adt/arrayutils.c:219
-msgid "typmod array must not contain nulls"
-msgstr "typmod array null kayıtları içeremez"
-
-#: utils/adt/ascii.c:75
-#, c-format
-msgid "encoding conversion from %s to ASCII not supported"
-msgstr "%s karakter tipinden ASCII karakter tipine dönüştürme desteklenmiyor"
-
-#: utils/adt/ascii.c:126
-#: commands/dbcommands.c:234
-#, c-format
-msgid "%s is not a valid encoding name"
-msgstr "%s geçerli bir dil kodlaması adı değildir"
-
-#: utils/adt/ascii.c:144
-#: commands/dbcommands.c:224
-#, c-format
-msgid "%d is not a valid encoding code"
-msgstr "%d geçerli bir dil kodlaması değildir"
-
-#: utils/adt/bool.c:153
-#, c-format
-msgid "invalid input syntax for type boolean: \"%s\""
-msgstr "boolean tipi için geçersiz giriş siz dizimi: \"%s\""
-
-#: utils/adt/cash.c:232
-#, c-format
-msgid "invalid input syntax for type money: \"%s\""
-msgstr "money tipi için geçersiz giriş siz dizimi: \"%s\""
-
-#: utils/adt/cash.c:524
-#: utils/adt/cash.c:575
-#: utils/adt/cash.c:624
-#: utils/adt/cash.c:676
-#: utils/adt/cash.c:726
-#: utils/adt/float.c:763
-#: utils/adt/float.c:827
-#: utils/adt/float.c:2475
-#: utils/adt/float.c:2538
-#: utils/adt/geo_ops.c:3959
-#: utils/adt/int.c:719
-#: utils/adt/int.c:860
-#: utils/adt/int.c:955
-#: utils/adt/int.c:1039
-#: utils/adt/int.c:1065
-#: utils/adt/int.c:1085
-#: utils/adt/int8.c:604
-#: utils/adt/int8.c:651
-#: utils/adt/int8.c:829
-#: utils/adt/int8.c:924
-#: utils/adt/int8.c:1008
-#: utils/adt/int8.c:1103
-#: utils/adt/numeric.c:4183
-#: utils/adt/numeric.c:4466
-#: utils/adt/timestamp.c:2865
-msgid "division by zero"
-msgstr "sıfırla bölüm"
-
-#: utils/adt/char.c:169
-msgid "\"char\" out of range"
-msgstr "\"char\" sıra dışıdır"
-
-#: utils/adt/date.c:66
-#: utils/adt/timestamp.c:92
-#: utils/adt/varbit.c:44
-#: utils/adt/varchar.c:43
-msgid "invalid type modifier"
-msgstr "tip belirteci geçersiz"
-
-#: utils/adt/date.c:71
-#, c-format
-msgid "TIME(%d)%s precision must not be negative"
-msgstr "TIME(%d)%s kesinliği sıfırdan küçük olamaz"
-
-#: utils/adt/date.c:77
-#, c-format
-msgid "TIME(%d)%s precision reduced to maximum allowed, %d"
-msgstr "TIME(%d)%s kesinliği en yüksek değerine (%d) kadar düşürüldü"
-
-#: utils/adt/date.c:142
-#: utils/adt/datetime.c:1181
-#: utils/adt/datetime.c:1926
-msgid "date/time value \"current\" is no longer supported"
-msgstr "\"current\" tarih/saat değeri artık desteklenmiyor"
-
-#: utils/adt/date.c:167
-#, c-format
-msgid "date out of range: \"%s\""
-msgstr "date kapsam dışıdır: \"%s\""
-
-#: utils/adt/date.c:347
-#, fuzzy
-msgid "cannot subtract infinite dates"
-msgstr "sonsuz timestap veri tipi üzerinde çıkarma işlemi yapılamaz"
-
-#: utils/adt/date.c:404
-#: utils/adt/date.c:441
-msgid "date out of range for timestamp"
-msgstr "timestamp için tarih aralık dışıdır"
-
-#: utils/adt/date.c:868
-#: utils/adt/date.c:915
-#: utils/adt/date.c:1471
-#: utils/adt/date.c:1508
-#: utils/adt/date.c:2382
-#: utils/adt/formatting.c:2961
-#: utils/adt/formatting.c:2993
-#: utils/adt/formatting.c:3061
-#: utils/adt/nabstime.c:480
-#: utils/adt/nabstime.c:523
-#: utils/adt/nabstime.c:553
-#: utils/adt/nabstime.c:596
-#: utils/adt/timestamp.c:226
-#: utils/adt/timestamp.c:264
-#: utils/adt/timestamp.c:486
-#: utils/adt/timestamp.c:526
-#: utils/adt/timestamp.c:2525
-#: utils/adt/timestamp.c:2546
-#: utils/adt/timestamp.c:2559
-#: utils/adt/timestamp.c:2568
-#: utils/adt/timestamp.c:2626
-#: utils/adt/timestamp.c:2649
-#: utils/adt/timestamp.c:2662
-#: utils/adt/timestamp.c:2673
-#: utils/adt/timestamp.c:3103
-#: utils/adt/timestamp.c:3233
-#: utils/adt/timestamp.c:3274
-#: utils/adt/timestamp.c:3362
-#: utils/adt/timestamp.c:3409
-#: utils/adt/timestamp.c:3520
-#: utils/adt/timestamp.c:3833
-#: utils/adt/timestamp.c:3970
-#: utils/adt/timestamp.c:3977
-#: utils/adt/timestamp.c:3991
-#: utils/adt/timestamp.c:4001
-#: utils/adt/timestamp.c:4064
-#: utils/adt/timestamp.c:4204
-#: utils/adt/timestamp.c:4214
-#: utils/adt/timestamp.c:4429
-#: utils/adt/timestamp.c:4508
-#: utils/adt/timestamp.c:4515
-#: utils/adt/timestamp.c:4542
-#: utils/adt/timestamp.c:4546
-#: utils/adt/timestamp.c:4603
-#: utils/adt/xml.c:1689
-#: utils/adt/xml.c:1696
-#: utils/adt/xml.c:1716
-#: utils/adt/xml.c:1723
-msgid "timestamp out of range"
-msgstr "timestamp sıra dışıdır"
-
-#: utils/adt/date.c:941
-msgid "cannot convert reserved abstime value to date"
-msgstr "ayrılmış abstime değeri tarihe çevrilemez"
-
-#: utils/adt/date.c:1095
-#: utils/adt/date.c:1102
-#: utils/adt/date.c:1870
-#: utils/adt/date.c:1877
-#, fuzzy
-msgid "time out of range"
-msgstr "date kapsam dışıdır: \"%s\""
-
-#: utils/adt/date.c:1748
-#: utils/adt/date.c:1765
-#, c-format
-msgid "\"time\" units \"%s\" not recognized"
-msgstr "\"time\" birimi \"%s\" tanınmadı"
-
-#: utils/adt/date.c:1887
-#, fuzzy
-msgid "time zone displacement out of range"
-msgstr "yer değiştirme değeri kapsam dışında: \"%s\""
-
-#: utils/adt/date.c:2512
-#: utils/adt/date.c:2529
-#, c-format
-msgid "\"time with time zone\" units \"%s\" not recognized"
-msgstr "\"%s\" birimi \"time with time zone\" veri tipi için tanımlı değildir"
-
-#: utils/adt/date.c:2587
-#: utils/adt/datetime.c:925
-#: utils/adt/datetime.c:1657
-#: utils/adt/timestamp.c:4441
-#: utils/adt/timestamp.c:4614
-#, c-format
-msgid "time zone \"%s\" not recognized"
-msgstr "time zone \"%s\" tanınmadı"
-
-#: utils/adt/date.c:2627
-#, c-format
-msgid "\"interval\" time zone \"%s\" not valid"
-msgstr "\"%s\"  \"interval\" saat dilim geçersizdir"
-
-#: utils/adt/datetime.c:3513
-#: utils/adt/datetime.c:3520
-#, c-format
-msgid "date/time field value out of range: \"%s\""
-msgstr "date/time alan değieri kapsam dışıdır: \"%s\""
-
-#: utils/adt/datetime.c:3522
-msgid "Perhaps you need a different \"datestyle\" setting."
-msgstr "Mutemelen farklı \"datestyle\" ayarınıza gerek var."
-
-#: utils/adt/datetime.c:3527
-#, c-format
-msgid "interval field value out of range: \"%s\""
-msgstr "interval alan değeri kapsam dışında: \"%s\""
-
-#: utils/adt/datetime.c:3533
-#, c-format
-msgid "time zone displacement out of range: \"%s\""
-msgstr "yer değiştirme değeri kapsam dışında: \"%s\""
-
-#. translator: first %s is inet or cidr
-#: utils/adt/datetime.c:3540
-#: utils/adt/network.c:107
-#, c-format
-msgid "invalid input syntax for type %s: \"%s\""
-msgstr "%s tipi için geçersiz giriş sözdizimi: \"%s\""
-
-#: utils/adt/datum.c:80
-#: utils/adt/datum.c:92
-msgid "invalid Datum pointer"
-msgstr "geçersiz Datum pointer"
-
-#: utils/adt/dbsize.c:102
-#: utils/adt/dbsize.c:189
-#, c-format
-msgid "could not open tablespace directory \"%s\": %m"
-msgstr "\"%s\" tablespace dizini açılamıyor: %m"
-
-#: utils/adt/dbsize.c:122
-#: catalog/aclchk.c:2486
-#: catalog/aclchk.c:3499
-#, c-format
-msgid "database with OID %u does not exist"
-msgstr "%u OID'li veritabanı mevcut değil"
-
-#: utils/adt/domains.c:80
-#, c-format
-msgid "type %s is not a domain"
-msgstr "%s tipi bir domain deÄŸildir"
-
-#: utils/adt/domains.c:128
-#: executor/execQual.c:3699
-#, c-format
-msgid "domain %s does not allow null values"
-msgstr "%s domaini null değerleri almamaktadır"
-
-#: utils/adt/domains.c:164
-#: executor/execQual.c:3728
-#, c-format
-msgid "value for domain %s violates check constraint \"%s\""
-msgstr "%s domaine kaydedilecek değer \"%s\" check kısıtlamasını desteklememektedir"
-
-#: utils/adt/encode.c:55
-#: utils/adt/encode.c:91
-#, c-format
-msgid "unrecognized encoding: \"%s\""
-msgstr "tanınmayan kodlama adı \"%s\""
-
-#: utils/adt/encode.c:150
-#, c-format
-msgid "invalid hexadecimal digit: \"%c\""
-msgstr "onaltılık rakam \"%c\" geçersiz"
-
-#: utils/adt/encode.c:178
-msgid "invalid hexadecimal data: odd number of digits"
-msgstr "geçersiz hexadecimal veri: rakam sayısı tektir"
-
-#: utils/adt/encode.c:295
-msgid "unexpected \"=\""
-msgstr "beklenmeyen \"=\""
-
-#: utils/adt/encode.c:307
-msgid "invalid symbol"
-msgstr "geçersiz sembol"
-
-#: utils/adt/encode.c:327
-msgid "invalid end sequence"
-msgstr "geçersiz end sequence"
-
-#: utils/adt/encode.c:441
-#: utils/adt/encode.c:506
-#: utils/adt/varlena.c:211
-#: utils/adt/varlena.c:252
-msgid "invalid input syntax for type bytea"
-msgstr "bytea giriş tipi için geçersiz söz dizimi"
-
-#: utils/adt/enum.c:44
-#: utils/adt/enum.c:55
-#: utils/adt/enum.c:108
-#: utils/adt/enum.c:119
-#, c-format
-msgid "invalid input value for enum %s: \"%s\""
-msgstr "%s enum tipi için geçersiz değer: \"%s\""
-
-#: utils/adt/enum.c:80
-#: utils/adt/enum.c:146
-#, c-format
-msgid "invalid internal value for enum: %u"
-msgstr "enum için geçersiz iç değer: %u"
-
-#: utils/adt/enum.c:266
-#: utils/adt/enum.c:307
-#: utils/adt/enum.c:356
-#: utils/adt/enum.c:376
-msgid "could not determine actual enum type"
-msgstr "gerçek enum veri tipli belirlenemiyor"
-
-#: utils/adt/float.c:54
-msgid "value out of range: overflow"
-msgstr "değer kapsam dışıdır: overflow"
-
-#: utils/adt/float.c:59
-msgid "value out of range: underflow"
-msgstr "değer kapsam dışıdır: underflow"
-
-#: utils/adt/float.c:205
-#: utils/adt/float.c:246
-#: utils/adt/float.c:297
-#, c-format
-msgid "invalid input syntax for type real: \"%s\""
-msgstr "real tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/float.c:241
-#, c-format
-msgid "\"%s\" is out of range for type real"
-msgstr "real tipi için kapsam dışı bir değer \"%s\""
-
-#: utils/adt/float.c:398
-#: utils/adt/float.c:439
-#: utils/adt/float.c:490
-#: utils/adt/numeric.c:3645
-#: utils/adt/numeric.c:3671
-#, c-format
-msgid "invalid input syntax for type double precision: \"%s\""
-msgstr "double precision tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/float.c:434
-#, c-format
-msgid "\"%s\" is out of range for type double precision"
-msgstr "double precision tipi için kapsam dışı bir değer \"%s\""
-
-#: utils/adt/float.c:1118
-#: utils/adt/float.c:1176
-#: utils/adt/int.c:339
-#: utils/adt/int.c:775
-#: utils/adt/int.c:804
-#: utils/adt/int.c:825
-#: utils/adt/int.c:845
-#: utils/adt/int.c:873
-#: utils/adt/int.c:1121
-#: utils/adt/int8.c:1220
-#: utils/adt/numeric.c:2136
-#: utils/adt/numeric.c:2147
-msgid "smallint out of range"
-msgstr "smallint sıra dışıdır"
-
-#: utils/adt/float.c:1302
-#: utils/adt/numeric.c:4859
-msgid "cannot take square root of a negative number"
-msgstr "sıfırdan küçük sayıdan kare kökü alınamaz"
-
-#: utils/adt/float.c:1344
-#: utils/adt/numeric.c:1948
-#, fuzzy
-msgid "zero raised to a negative power is undefined"
-msgstr "sıfırın sıfır katı belirsiz"
-
-#: utils/adt/float.c:1348
-#: utils/adt/numeric.c:1954
-msgid "a negative number raised to a non-integer power yields a complex result"
-msgstr ""
-
-#: utils/adt/float.c:1414
-#: utils/adt/float.c:1444
-#: utils/adt/numeric.c:5077
-msgid "cannot take logarithm of zero"
-msgstr "sıfırın logaritması hesaplanamaz"
-
-#: utils/adt/float.c:1418
-#: utils/adt/float.c:1448
-#: utils/adt/numeric.c:5081
-msgid "cannot take logarithm of a negative number"
-msgstr "sıfırdan küçük sayıdan logaritması alınamaz"
-
-#: utils/adt/float.c:1475
-#: utils/adt/float.c:1496
-#: utils/adt/float.c:1517
-#: utils/adt/float.c:1539
-#: utils/adt/float.c:1560
-#: utils/adt/float.c:1581
-#: utils/adt/float.c:1603
-#: utils/adt/float.c:1624
-msgid "input is out of range"
-msgstr "giriş sıra dısışıdır"
-
-#: utils/adt/float.c:2692
-#: utils/adt/numeric.c:955
-msgid "count must be greater than zero"
-msgstr "sayısı sıfırdan büyük olmalı"
-
-#: utils/adt/float.c:2697
-#: utils/adt/numeric.c:962
-msgid "operand, lower bound and upper bound cannot be NaN"
-msgstr "işlenenin alt ve üst sınırı NaN olamaz"
-
-#: utils/adt/float.c:2703
-msgid "lower and upper bounds must be finite"
-msgstr "alt ve üst sınırları sonsuz olamaz"
-
-#: utils/adt/float.c:2741
-#: utils/adt/numeric.c:975
-msgid "lower bound cannot equal upper bound"
-msgstr "alt sınır üst sınırı ile eşit olamaz"
-
-#: utils/adt/formatting.c:489
-msgid "invalid format specification for an interval value"
-msgstr "interval değer biçimi yalnış"
-
-#: utils/adt/formatting.c:490
-msgid "Intervals are not tied to specific calendar dates."
-msgstr "interval belli takvim tarihlerine bağlı değildir."
-
-#: utils/adt/formatting.c:1055
-msgid "\"9\" must be ahead of \"PR\""
-msgstr "\"9\", \"PR\"'dan önce olmalıdır"
-
-#: utils/adt/formatting.c:1074
-msgid "\"0\" must be ahead of \"PR\""
-msgstr "\"0\", \"PR\"'dan önce olmalıdır"
-
-#: utils/adt/formatting.c:1103
-msgid "multiple decimal points"
-msgstr "birden fazla ondalık ayraç"
-
-#: utils/adt/formatting.c:1110
-#: utils/adt/formatting.c:1214
-msgid "cannot use \"V\" and decimal point together"
-msgstr "\"V\" ve ondalık virgül bir arada kullanılamaz"
-
-#: utils/adt/formatting.c:1125
-#, fuzzy
-msgid "cannot use \"S\" twice"
-msgstr "\"S\" ve \"MI\" birlikte kullanılamaz"
-
-#: utils/adt/formatting.c:1132
-msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
-msgstr "\"S\" ve \"PL\"/\"MI\"/\"SG\"/\"PR\" bir arada kullanılamaz"
-
-#: utils/adt/formatting.c:1155
-msgid "cannot use \"S\" and \"MI\" together"
-msgstr "\"S\" ve \"MI\" birlikte kullanılamaz"
-
-#: utils/adt/formatting.c:1168
-msgid "cannot use \"S\" and \"PL\" together"
-msgstr "\"S\" ve \"PL\" birlikte kullanılamaz"
-
-#: utils/adt/formatting.c:1181
-msgid "cannot use \"S\" and \"SG\" together"
-msgstr "\"S\" ve \"SG\" birlikte kullanılamaz"
-
-#: utils/adt/formatting.c:1193
-msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
-msgstr "\"PR\" ve \"S\"/\"PL\"/\"MI\"/\"SG\" bir arada kullanılamaz"
-
-#: utils/adt/formatting.c:1223
-msgid "\"E\" is not supported"
-msgstr "\"E\" desteklenmiyor"
-
-#: utils/adt/formatting.c:1413
-#, c-format
-msgid "\"%s\" is not a number"
-msgstr "\"%s\" bir sayı değildir"
-
-#: utils/adt/formatting.c:1790
-#, fuzzy
-msgid "invalid combination of date conventions"
-msgstr "geçersiz bağlantı seçeneği \"%s\"\n"
-
-#: utils/adt/formatting.c:1791
-msgid "Do not mix Gregorian and ISO week date conventions in a formatting template."
-msgstr ""
-
-#: utils/adt/formatting.c:1808
-#, c-format
-msgid "conflicting values for \"%s\" field in formatting string"
-msgstr ""
-
-#: utils/adt/formatting.c:1810
-msgid "This value contradicts a previous setting for the same field type."
-msgstr ""
-
-#: utils/adt/formatting.c:1871
-#, c-format
-msgid "source string too short for \"%s\" formatting field"
-msgstr ""
-
-#: utils/adt/formatting.c:1873
-#, c-format
-msgid "Field requires %d characters, but only %d remain."
-msgstr "Alan %d karakter gerektiriyor, ama %d kaldı."
-
-#: utils/adt/formatting.c:1876
-#: utils/adt/formatting.c:1890
-msgid "If your source string is not fixed-width, try using the \"FM\" modifier."
-msgstr ""
-
-#: utils/adt/formatting.c:1886
-#: utils/adt/formatting.c:1899
-#: utils/adt/formatting.c:2029
-#, fuzzy, c-format
-msgid "invalid value \"%s\" for \"%s\""
-msgstr "%s için geçersiz değer"
-
-#: utils/adt/formatting.c:1888
-#, c-format
-msgid "Field requires %d characters, but only %d could be parsed."
-msgstr ""
-
-#: utils/adt/formatting.c:1901
-msgid "Value must be an integer."
-msgstr "Değer tamsayı olmalıdır."
-
-#: utils/adt/formatting.c:1906
-#, fuzzy, c-format
-msgid "value for \"%s\" in source string is out of range"
-msgstr "oid tipi için \"%s\" değeri sıra dışıdır"
-
-#: utils/adt/formatting.c:1908
-#, c-format
-msgid "Value must be in the range %d to %d."
-msgstr ""
-
-#: utils/adt/formatting.c:2031
-msgid "The given value did not match any of the allowed values for this field."
-msgstr ""
-
-#: utils/adt/formatting.c:2593
-#, fuzzy
-msgid "\"TZ\"/\"tz\" format patterns are not supported in to_date"
-msgstr "bu platformda tablespace desteklenmiyor"
-
-#: utils/adt/formatting.c:2694
-#, fuzzy
-msgid "invalid input string for \"Y,YYY\""
-msgstr "uuid tipi için geçersiz söz dizimi: \"%s\""
-
-#: utils/adt/formatting.c:3208
-#, c-format
-msgid "hour \"%d\" is invalid for the 12-hour clock"
-msgstr ""
-
-#: utils/adt/formatting.c:3210
-msgid "Use the 24-hour clock, or give an hour between 1 and 12."
-msgstr ""
-
-#: utils/adt/formatting.c:3248
-#, c-format
-msgid "inconsistent use of year %04d and \"BC\""
-msgstr "tutarsız %04d tıl ve \"BC\" tanımının kullanımı"
-
-#: utils/adt/formatting.c:3295
-msgid "cannot calculate day of year without year information"
-msgstr "yıl bilgisi olmadan yılın günü hesaplanamaz"
-
-#: utils/adt/formatting.c:4156
-msgid "\"RN\" not supported"
-msgstr "\"RN\" desteklenmiyor"
-
-#: utils/adt/genfile.c:57
-msgid "reference to parent directory (\"..\") not allowed"
-msgstr "(\"..\") ile üst dizin referansı yapılamaz"
-
-#: utils/adt/genfile.c:71
-msgid "absolute path not allowed"
-msgstr "absolute path kullanılamaz"
-
-#: utils/adt/genfile.c:98
-msgid "must be superuser to read files"
-msgstr "dosyaları okumak için superuser olmalısınız"
-
-#: utils/adt/genfile.c:105
-#: commands/copy.c:1748
-#, c-format
-msgid "could not open file \"%s\" for reading: %m"
-msgstr "\"%s\" dosyası, okunmak için açılamadı: %m"
-
-#: utils/adt/genfile.c:112
-#, c-format
-msgid "could not seek in file \"%s\": %m"
-msgstr "\"%s\" dosyası ilerleme hatası: %m"
-
-#: utils/adt/genfile.c:117
-msgid "requested length cannot be negative"
-msgstr "istenilen uzunluk negatif olamaz"
-
-#: utils/adt/genfile.c:123
-#: utils/adt/oracle_compat.c:181
-#: utils/adt/oracle_compat.c:279
-#: utils/adt/oracle_compat.c:755
-#: utils/adt/oracle_compat.c:1045
-msgid "requested length too large"
-msgstr "istenen uzunluk çok büyük"
-
-#: utils/adt/genfile.c:159
-msgid "must be superuser to get file information"
-msgstr "dosya bilgisini almak için superuser olmalısınız"
-
-#: utils/adt/genfile.c:223
-msgid "must be superuser to get directory listings"
-msgstr "dizindeki dosya listesini görmek için superuser olmalısınız"
-
-#: utils/adt/genfile.c:240
-#: utils/adt/misc.c:210
-#: utils/misc/tzparser.c:345
-#: commands/tablespace.c:581
-#: storage/file/fd.c:1530
-#: postmaster/postmaster.c:1089
-#: ../port/copydir.c:65
-#, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "\"%s\" dizini açılamıyor: %m"
-
-#: utils/adt/geo_ops.c:292
-#: utils/adt/geo_ops.c:4080
-#: utils/adt/geo_ops.c:4997
-msgid "too many points requested"
-msgstr "sayı içindeki ondalık nokta sayısı çok fazla"
-
-#: utils/adt/geo_ops.c:315
-msgid "could not format \"path\" value"
-msgstr "\"path\" değeri biçimlendirilemiyor"
-
-#: utils/adt/geo_ops.c:390
-#, c-format
-msgid "invalid input syntax for type box: \"%s\""
-msgstr "box tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:954
-#, c-format
-msgid "invalid input syntax for type line: \"%s\""
-msgstr "line tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:961
-#: utils/adt/geo_ops.c:1028
-#: utils/adt/geo_ops.c:1043
-#: utils/adt/geo_ops.c:1055
-msgid "type \"line\" not yet implemented"
-msgstr "\"line\" veri tipi implemente edilmemiÅŸtir"
-
-#: utils/adt/geo_ops.c:1402
-#: utils/adt/geo_ops.c:1425
-#, c-format
-msgid "invalid input syntax for type path: \"%s\""
-msgstr "path tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:1464
-msgid "invalid number of points in external \"path\" value"
-msgstr "dış \"path\" değerinde geçersiz nokta sayısı"
-
-#: utils/adt/geo_ops.c:1805
-#, c-format
-msgid "invalid input syntax for type point: \"%s\""
-msgstr "point tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:2033
-#, c-format
-msgid "invalid input syntax for type lseg: \"%s\""
-msgstr "lseg tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:2624
-msgid "function \"dist_lb\" not implemented"
-msgstr "\"dist_lb\" fonksiyonu implemente edilmemiÅŸtir"
-
-#: utils/adt/geo_ops.c:3137
-msgid "function \"close_lb\" not implemented"
-msgstr "\"close_lb\" fonksiyonu implemente edilmemiÅŸtir"
-
-#: utils/adt/geo_ops.c:3416
-msgid "cannot create bounding box for empty polygon"
-msgstr "boş polygon için bounding box oluşturulamaz"
-
-#: utils/adt/geo_ops.c:3440
-#: utils/adt/geo_ops.c:3452
-#, c-format
-msgid "invalid input syntax for type polygon: \"%s\""
-msgstr "polygon tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:3492
-msgid "invalid number of points in external \"polygon\" value"
-msgstr "dış \"polygon\" değerinde geçersiz nokta sayısı"
-
-#: utils/adt/geo_ops.c:3878
-msgid "function \"poly_distance\" not implemented"
-msgstr "\"poly_distance\" fonksiyonu implement edilmemiÅŸ"
-
-#: utils/adt/geo_ops.c:4190
-msgid "function \"path_center\" not implemented"
-msgstr "\"path_center\" fonksiyonu implement edilmemiÅŸ"
-
-#: utils/adt/geo_ops.c:4207
-msgid "open path cannot be converted to polygon"
-msgstr "open path, polygon veri tipine dönüştürülemez"
-
-#: utils/adt/geo_ops.c:4374
-#: utils/adt/geo_ops.c:4384
-#: utils/adt/geo_ops.c:4399
-#: utils/adt/geo_ops.c:4405
-#, c-format
-msgid "invalid input syntax for type circle: \"%s\""
-msgstr "circle tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/geo_ops.c:4427
-#: utils/adt/geo_ops.c:4435
-msgid "could not format \"circle\" value"
-msgstr "\"circle\" değeri biçimlendirilemedi"
-
-#: utils/adt/geo_ops.c:4462
-msgid "invalid radius in external \"circle\" value"
-msgstr "\"circle\" değerin dış yarıçap değeri geçersiz"
-
-#: utils/adt/geo_ops.c:4983
-msgid "cannot convert circle with radius zero to polygon"
-msgstr "yarıçapı sıfır olan daire polygon'a çevrilemez"
-
-#: utils/adt/geo_ops.c:4988
-msgid "must request at least 2 points"
-msgstr "en az iki nokta istemelidir"
-
-#: utils/adt/geo_ops.c:5032
-#: utils/adt/geo_ops.c:5055
-msgid "cannot convert empty polygon to circle"
-msgstr "boş polygon daireye çevrilemez"
-
-#: utils/adt/int.c:161
-msgid "int2vector has too many elements"
-msgstr "int2vector çok fazla öğesine sahip"
-
-#: utils/adt/int.c:234
-msgid "invalid int2vector data"
-msgstr "geçersiz int2vector verisi"
-
-#: utils/adt/int.c:1309
-#: utils/adt/int8.c:1357
-#: utils/adt/timestamp.c:4701
-#: utils/adt/timestamp.c:4782
-msgid "step size cannot equal zero"
-msgstr "step boyutu sıfır olamaz"
-
-#: utils/adt/int8.c:101
-#: utils/adt/int8.c:136
-#: utils/adt/numutils.c:53
-#: utils/adt/numutils.c:63
-#: utils/adt/numutils.c:105
-#, c-format
-msgid "invalid input syntax for integer: \"%s\""
-msgstr "integer için geçersiz sözdizimi:\"%s\""
-
-#: utils/adt/int8.c:117
-#, c-format
-msgid "value \"%s\" is out of range for type bigint"
-msgstr "bigint tipi için \"%s\" değeri kapsam dışıdır"
-
-#: utils/adt/int8.c:506
-#: utils/adt/int8.c:535
-#: utils/adt/int8.c:556
-#: utils/adt/int8.c:589
-#: utils/adt/int8.c:617
-#: utils/adt/int8.c:635
-#: utils/adt/int8.c:681
-#: utils/adt/int8.c:698
-#: utils/adt/int8.c:767
-#: utils/adt/int8.c:788
-#: utils/adt/int8.c:815
-#: utils/adt/int8.c:842
-#: utils/adt/int8.c:863
-#: utils/adt/int8.c:884
-#: utils/adt/int8.c:911
-#: utils/adt/int8.c:946
-#: utils/adt/int8.c:967
-#: utils/adt/int8.c:994
-#: utils/adt/int8.c:1021
-#: utils/adt/int8.c:1042
-#: utils/adt/int8.c:1063
-#: utils/adt/int8.c:1090
-#: utils/adt/int8.c:1258
-#: utils/adt/int8.c:1297
-#: utils/adt/numeric.c:2088
-#: utils/adt/varbit.c:1456
-msgid "bigint out of range"
-msgstr "biginit değeri sıra dışıdır"
-
-#: utils/adt/int8.c:1314
-msgid "OID out of range"
-msgstr "OID kapsam dışıdır"
-
-#: utils/adt/like_match.c:103
-#, fuzzy
-msgid "LIKE pattern must not end with escape character"
-msgstr "$%d parametresi yoktur"
-
-#: utils/adt/like_match.c:289
-#: utils/adt/regexp.c:681
-msgid "invalid escape string"
-msgstr "escape satırı geçersiz"
-
-#: utils/adt/like_match.c:290
-#: utils/adt/regexp.c:682
-msgid "Escape string must be empty or one character."
-msgstr "Kaçış dizisi boş veya bir karakter olmalıdır."
-
-#: utils/adt/mac.c:65
-#, c-format
-msgid "invalid input syntax for type macaddr: \"%s\""
-msgstr "macaddr tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/mac.c:72
-#, c-format
-msgid "invalid octet value in \"macaddr\" value: \"%s\""
-msgstr "\"macaddr\" içinde geçersiz octet değeri: \"%s\""
-
-#: utils/adt/misc.c:79
-msgid "must be superuser to signal other server processes"
-msgstr "diğer aktif sunucu süreçlerine sinyal göndermek için superuser olmanız lazım"
-
-#: utils/adt/misc.c:88
-#, c-format
-msgid "PID %d is not a PostgreSQL server process"
-msgstr "PID %d bir PostgreSQL sunucu süreci değildir"
-
-#: utils/adt/misc.c:101
-#: storage/lmgr/proc.c:932
-#, c-format
-msgid "could not send signal to process %d: %m"
-msgstr "%d sürecine sinyal gönderme başarısız: %m"
-
-#: utils/adt/misc.c:125
-msgid "must be superuser to signal the postmaster"
-msgstr "postmaster süreçlerine sinyal göndermek için superuser olmanız lazım"
-
-#: utils/adt/misc.c:130
-#, c-format
-msgid "failed to send signal to postmaster: %m"
-msgstr "postmaster sürecine sinyal gönderme başarısız: %m"
-
-#: utils/adt/misc.c:147
-msgid "must be superuser to rotate log files"
-msgstr "log dosyaları göndürmek için superuser olmalısınız"
-
-#: utils/adt/misc.c:152
-#, fuzzy
-msgid "rotation not possible because log collection not active"
-msgstr "log direction etkin olmadıpından rotation yapılamaz"
-
-#: utils/adt/misc.c:193
-msgid "global tablespace never has databases"
-msgstr "global tablespace, database bulunduramaz"
-
-#: utils/adt/misc.c:213
-#, c-format
-msgid "%u is not a tablespace OID"
-msgstr "%u OID tablespace deÄŸildir"
-
-#: utils/adt/misc.c:349
-msgid "unreserved"
-msgstr ""
-
-#: utils/adt/misc.c:353
-#, fuzzy
-msgid "unreserved (cannot be function or type name)"
-msgstr "geçerli kullanıcının adı değiştirilemez"
-
-#: utils/adt/misc.c:357
-msgid "reserved (can be function or type name)"
-msgstr ""
-
-#: utils/adt/misc.c:361
-msgid "reserved"
-msgstr ""
-
-#: utils/adt/nabstime.c:160
-#, c-format
-msgid "invalid time zone name: \"%s\""
-msgstr "geçersiz zaman dilimi adı: \"%s\""
-
-#: utils/adt/nabstime.c:506
-#: utils/adt/nabstime.c:579
-msgid "cannot convert abstime \"invalid\" to timestamp"
-msgstr "abstime \"invalid\" interval tipine dönüştürülemiyor"
-
-#: utils/adt/nabstime.c:798
-msgid "invalid status in external \"tinterval\" value"
-msgstr "harici \"tinterval\" değerinin durumu geçirsiz"
-
-#: utils/adt/nabstime.c:875
-msgid "cannot convert reltime \"invalid\" to interval"
-msgstr "reltime \"invalid\" değeri interval'a dönüştürülemiyor"
-
-#: utils/adt/nabstime.c:1557
-#, c-format
-msgid "invalid input syntax for type tinterval: \"%s\""
-msgstr "interval tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/network.c:118
-#, c-format
-msgid "invalid cidr value: \"%s\""
-msgstr "cidr değeri geçersiz: \"%s\""
-
-#: utils/adt/network.c:119
-#: utils/adt/network.c:249
-msgid "Value has bits set to right of mask."
-msgstr "Değerin maskenin sğında fazladan bitler var."
-
-#: utils/adt/network.c:160
-#: utils/adt/network.c:614
-#: utils/adt/network.c:639
-#: utils/adt/network.c:664
-#, c-format
-msgid "could not format inet value: %m"
-msgstr "inet değeri biçimlendirilemiyor: %m"
-
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:217
-#, c-format
-msgid "invalid address family in external \"%s\" value"
-msgstr "dış \"%s\" değerinde geçersiz address family"
-
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:224
-#, c-format
-msgid "invalid bits in external \"%s\" value"
-msgstr "harici \"%s\" değerinin bitleri geçirsiz"
-
-#. translator: %s is inet or cidr
-#: utils/adt/network.c:233
-#, c-format
-msgid "invalid length in external \"%s\" value"
-msgstr "harici \"%s\" değerinin uzunluğu geçirsiz"
-
-#: utils/adt/network.c:248
-msgid "invalid external \"cidr\" value"
-msgstr "geçersiz harici \"cidr\" değeri"
-
-#: utils/adt/network.c:370
-#: utils/adt/network.c:397
-#, c-format
-msgid "invalid mask length: %d"
-msgstr "geçersiz mask uzunluğu: %d"
-
-#: utils/adt/network.c:682
-#, c-format
-msgid "could not format cidr value: %m"
-msgstr "cidr değeri biçimlendirilemiyor: %m"
-
-#: utils/adt/network.c:1255
-msgid "cannot AND inet values of different sizes"
-msgstr "farklı uzunluğa sahip inet değerleri üzerinde AND işlemi yapılamaz"
-
-#: utils/adt/network.c:1287
-msgid "cannot OR inet values of different sizes"
-msgstr "farklı uzunluğa sahip inet değerleri üzerinde OR işlemi yapılamaz"
-
-#: utils/adt/network.c:1348
-#: utils/adt/network.c:1424
-msgid "result is out of range"
-msgstr "sonuç sıra dsışıdır"
-
-#: utils/adt/network.c:1389
-msgid "cannot subtract inet values of different sizes"
-msgstr "farklı uzunluğa sahip inet değerleri üzerinde eksilme işlemi yapılamaz"
-
-#: utils/adt/numeric.c:351
-#: utils/adt/numeric.c:378
-#: utils/adt/numeric.c:3072
-#: utils/adt/numeric.c:3095
-#: utils/adt/numeric.c:3119
-#: utils/adt/numeric.c:3126
-#, c-format
-msgid "invalid input syntax for type numeric: \"%s\""
-msgstr "numeric tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/numeric.c:455
-msgid "invalid length in external \"numeric\" value"
-msgstr "harici \"numeric\" değerinin uzunluğu geçirsiz"
-
-#: utils/adt/numeric.c:466
-msgid "invalid sign in external \"numeric\" value"
-msgstr "harici \"numeric\" değerinin eksi işareti geçirsiz"
-
-#: utils/adt/numeric.c:476
-msgid "invalid digit in external \"numeric\" value"
-msgstr "harici \"numeric\" değerinin rakamı geçirsiz"
-
-#: utils/adt/numeric.c:607
-#: utils/adt/numeric.c:621
-#, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
-msgstr "NUMERIC precision %d, 1 ile %d arasında olmalıdır"
-
-#: utils/adt/numeric.c:612
-#, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
-msgstr "NUMERIC %d ölçüsü 0 ile %d kesinliği arasında olmalıdır"
-
-#: utils/adt/numeric.c:630
-msgid "invalid NUMERIC type modifier"
-msgstr "geçersiz NUMERIC tipi niteleyicisi"
-
-#: utils/adt/numeric.c:1663
-#: utils/adt/numeric.c:3430
-msgid "value overflows numeric format"
-msgstr "değer, numerik biçiminin kapsamını taşımaktadır"
-
-#: utils/adt/numeric.c:2011
-msgid "cannot convert NaN to integer"
-msgstr "NaN tipinden integer tipine dönüştürme hatası"
-
-#: utils/adt/numeric.c:2079
-msgid "cannot convert NaN to bigint"
-msgstr "NaN tipinden bigint tipine dönüştürme hatası"
-
-#: utils/adt/numeric.c:2127
-msgid "cannot convert NaN to smallint"
-msgstr "NaN tipinden smallint tipine dönüştürme hatası"
-
-#: utils/adt/numeric.c:3500
-msgid "numeric field overflow"
-msgstr "numerik alan kapsamını taşımaktadır"
-
-#: utils/adt/numeric.c:3501
-#, c-format
-msgid "A field with precision %d, scale %d must round to an absolute value less than %s%d."
-msgstr "%d duyarlı, %d ölçekli bir alan %s%d'den daha az mutlak değere yuvarlanabilmelidir."
-
-#: utils/adt/numeric.c:4949
-msgid "argument for function \"exp\" too big"
-msgstr "\"exp\" fonksiyonu için argüman fazla büyük"
-
-#: utils/adt/numutils.c:77
-#, c-format
-msgid "value \"%s\" is out of range for type integer"
-msgstr "integer tipi için \"%s\" değeri kapsam dışıdır"
-
-#: utils/adt/numutils.c:83
-#, c-format
-msgid "value \"%s\" is out of range for type smallint"
-msgstr "smallint tipi için \"%s\" değeri kapsam dışıdır"
-
-#: utils/adt/numutils.c:89
-#, c-format
-msgid "value \"%s\" is out of range for 8-bit integer"
-msgstr "8-bir integer tipi için \"%s\" değeri kapsam dışıdır"
-
-#: utils/adt/oid.c:43
-#: utils/adt/oid.c:57
-#: utils/adt/oid.c:63
-#: utils/adt/oid.c:84
-#, c-format
-msgid "invalid input syntax for type oid: \"%s\""
-msgstr "oid tipi için geçersiz biçim: \"%s\""
-
-#: utils/adt/oid.c:69
-#: utils/adt/oid.c:107
-#, c-format
-msgid "value \"%s\" is out of range for type oid"
-msgstr "oid tipi için \"%s\" değeri sıra dışıdır"
-
-#: utils/adt/oid.c:212
-msgid "oidvector has too many elements"
-msgstr "oidvector çok fazla öğesine sahiptir"
-
-#: utils/adt/oid.c:285
-msgid "invalid oidvector data"
-msgstr "geçersiz oidvector verisi"
-
-#: utils/adt/oracle_compat.c:892
-msgid "requested character too large"
-msgstr "istenen karakter çok büyük"
-
-#: utils/adt/oracle_compat.c:938
-#: utils/adt/oracle_compat.c:992
-#, c-format
-msgid "requested character too large for encoding: %d"
-msgstr "Belirtilen karakter dil kodlaması için çok büyük: %d"
-
-#: utils/adt/oracle_compat.c:985
-msgid "null character not permitted"
-msgstr "null karaktere izin verilmez"
-
-#: utils/adt/pseudotypes.c:94
-msgid "cannot accept a value of type any"
-msgstr "any tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:107
-msgid "cannot display a value of type any"
-msgstr "any tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:121
-#: utils/adt/pseudotypes.c:149
-msgid "cannot accept a value of type anyarray"
-msgstr "anyarray tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:174
-msgid "cannot accept a value of type anyenum"
-msgstr "anyenum tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:224
-msgid "cannot accept a value of type trigger"
-msgstr "trigger tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:237
-msgid "cannot display a value of type trigger"
-msgstr "trigger tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:251
-msgid "cannot accept a value of type language_handler"
-msgstr "language_handler tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:264
-msgid "cannot display a value of type language_handler"
-msgstr "language_handler tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:278
-msgid "cannot accept a value of type internal"
-msgstr "internal tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:291
-msgid "cannot display a value of type internal"
-msgstr "internal tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:305
-msgid "cannot accept a value of type opaque"
-msgstr "opaque tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:318
-msgid "cannot display a value of type opaque"
-msgstr "opaque tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:332
-msgid "cannot accept a value of type anyelement"
-msgstr "anyelement tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:345
-msgid "cannot display a value of type anyelement"
-msgstr "anyelement tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:358
-#, fuzzy
-msgid "cannot accept a value of type anynonarray"
-msgstr "anyarray tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:371
-#, fuzzy
-msgid "cannot display a value of type anynonarray"
-msgstr "any tipinde değer gösterilemez"
-
-#: utils/adt/pseudotypes.c:384
-msgid "cannot accept a value of a shell type"
-msgstr "shell tipinde değer alınamaz"
-
-#: utils/adt/pseudotypes.c:397
-msgid "cannot display a value of a shell type"
-msgstr "shell tipinde değer gösterilemez"
-
-#: utils/adt/regexp.c:194
-#: tsearch/spell.c:365
-#, c-format
-msgid "invalid regular expression: %s"
-msgstr "regular expression geçersiz: %s"
-
-#: utils/adt/regexp.c:273
-#: utils/adt/varlena.c:2588
-#, c-format
-msgid "regular expression failed: %s"
-msgstr "regular expression başarısız: %s"
-
-#: utils/adt/regexp.c:408
-#, fuzzy, c-format
-msgid "invalid regexp option: \"%c\""
-msgstr "geçersiz regexp seçeneği: %c"
-
-#: utils/adt/regexp.c:864
-msgid "regexp_split does not support the global option"
-msgstr "regexp_split, global seçeneği desteklemez"
-
-#: utils/adt/regproc.c:123
-#: utils/adt/regproc.c:143
-#, c-format
-msgid "more than one function named \"%s\""
-msgstr "birden fazla \"%s\" adlı fonksiyon var"
-
-#: utils/adt/regproc.c:468
-#: utils/adt/regproc.c:488
-#: utils/adt/regproc.c:649
-#: parser/parse_oper.c:124
-#: parser/parse_oper.c:762
-#, c-format
-msgid "operator does not exist: %s"
-msgstr "operator mevcut deÄŸil: %s"
-
-#: utils/adt/regproc.c:472
-#: utils/adt/regproc.c:492
-#, c-format
-msgid "more than one operator named %s"
-msgstr "birden fazla \"%s\" adlı operatör var"
-
-#: utils/adt/regproc.c:636
-#: gram.y:5043
-msgid "missing argument"
-msgstr "argüman eksik"
-
-#: utils/adt/regproc.c:637
-#: gram.y:5044
-msgid "Use NONE to denote the missing argument of a unary operator."
-msgstr "Unary operator'un bir argümanı eksik olduğunu göstermek için NONE kullanın"
-
-#: utils/adt/regproc.c:641
-#: utils/adt/regproc.c:1501
-#: utils/adt/ruleutils.c:5230
-#: utils/adt/ruleutils.c:5267
-#: utils/adt/ruleutils.c:5301
-msgid "too many arguments"
-msgstr "çok fazla argüman"
-
-#: utils/adt/regproc.c:642
-msgid "Provide two argument types for operator."
-msgstr "Operatör için iki argüman tipi sağlayın."
-
-#: utils/adt/regproc.c:818
-#: catalog/namespace.c:275
-#: commands/lockcmds.c:118
-#: parser/parse_relation.c:877
-#: parser/parse_relation.c:885
-#, c-format
-msgid "relation \"%s\" does not exist"
-msgstr "\"%s\" nesnesi mevcut deÄŸil"
-
-#: utils/adt/regproc.c:983
-#: commands/functioncmds.c:126
-#: commands/tablecmds.c:215
-#: commands/typecmds.c:648
-#: commands/typecmds.c:2535
-#: parser/parse_func.c:1311
-#: parser/parse_type.c:199
-#, c-format
-msgid "type \"%s\" does not exist"
-msgstr "\"%s\" tipi mevcut deÄŸil"
-
-#: utils/adt/regproc.c:1336
-#: utils/adt/regproc.c:1341
-#: utils/adt/varlena.c:1989
-#: utils/adt/varlena.c:1994
-msgid "invalid name syntax"
-msgstr "isim sözdizimi geçersiz"
-
-#: utils/adt/regproc.c:1399
-msgid "expected a left parenthesis"
-msgstr "sol parantez beklenir"
-
-#: utils/adt/regproc.c:1415
-msgid "expected a right parenthesis"
-msgstr "saÄŸ parantez beklenir"
-
-#: utils/adt/regproc.c:1434
-msgid "expected a type name"
-msgstr "tür ismi beklenir"
-
-#: utils/adt/regproc.c:1466
-msgid "improper type name"
-msgstr "tür ismi geçersiz"
-
-#: utils/adt/ri_triggers.c:373
-#: utils/adt/ri_triggers.c:433
-#: utils/adt/ri_triggers.c:596
-#: utils/adt/ri_triggers.c:836
-#: utils/adt/ri_triggers.c:1024
-#: utils/adt/ri_triggers.c:1186
-#: utils/adt/ri_triggers.c:1374
-#: utils/adt/ri_triggers.c:1545
-#: utils/adt/ri_triggers.c:1728
-#: utils/adt/ri_triggers.c:1899
-#: utils/adt/ri_triggers.c:2115
-#: utils/adt/ri_triggers.c:2297
-#: utils/adt/ri_triggers.c:2500
-#: utils/adt/ri_triggers.c:2548
-#: utils/adt/ri_triggers.c:2593
-#: utils/adt/ri_triggers.c:2721
-#: gram.y:2429
-msgid "MATCH PARTIAL not yet implemented"
-msgstr "MATCH PARTIAL implemente edilmemiÅŸtir"
-
-#: utils/adt/ri_triggers.c:407
-#: utils/adt/ri_triggers.c:2803
-#: utils/adt/ri_triggers.c:3461
-#: utils/adt/ri_triggers.c:3498
-#, c-format
-msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
-msgstr "\"%s\" tablosu üzende işlem \"%s\" foreign key constrainti ihlal ediyor"
-
-#: utils/adt/ri_triggers.c:410
-#: utils/adt/ri_triggers.c:2806
-msgid "MATCH FULL does not allow mixing of null and nonnull key values."
-msgstr "MATCH FULL, null ve nonnull anahtar değerlerinin bir arada kullanımına izin vermez."
-
-#: utils/adt/ri_triggers.c:3003
-#, c-format
-msgid "function \"%s\" was not called by trigger manager"
-msgstr "\"%s\" fonksiyonu trigger yöneticisi tarafından çağırılmamıştır"
-
-#: utils/adt/ri_triggers.c:3012
-#, c-format
-msgid "function \"%s\" must be fired AFTER ROW"
-msgstr "\"%s\" fonksiyonu AFTER ROW olarak çalıştırılmalıdır"
-
-#: utils/adt/ri_triggers.c:3020
-#, c-format
-msgid "function \"%s\" must be fired for INSERT"
-msgstr "\"%s\" fonksiyonu INSERT için çalıştırılmalıdır"
-
-#: utils/adt/ri_triggers.c:3026
-#, c-format
-msgid "function \"%s\" must be fired for UPDATE"
-msgstr "\"%s\" fonksiyonu UPDATE için çalıştırılmalıdır"
-
-#: utils/adt/ri_triggers.c:3033
-#, c-format
-msgid "function \"%s\" must be fired for INSERT or UPDATE"
-msgstr "\"%s\" fonksiyonu INSERT veya UPDATE için çalıştırılmalıdır"
-
-#: utils/adt/ri_triggers.c:3040
-#, c-format
-msgid "function \"%s\" must be fired for DELETE"
-msgstr "\"%s\" fonksiyonu DELETE için çalıştırılmalıdır"
-
-#: utils/adt/ri_triggers.c:3069
-#, c-format
-msgid "no pg_constraint entry for trigger \"%s\" on table \"%s\""
-msgstr "\"%2$s\" tablosunun \"%1$s\" triggeri için pg_constraint girişi yoktur"
-
-#: utils/adt/ri_triggers.c:3071
-msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
-msgstr "Bu ve diğer bütünlük kısıtlamaları ladırın, ardından ALTER TABLE ADD CONSTRAINT komutuyla yeni kısıtlama ekleyin."
-
-#: utils/adt/ri_triggers.c:3428
-#, c-format
-msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
-msgstr "\"%3$s\" tablosu üzerinde \"%2$s\" bütünük kısıtlamasından \"%1$s\" nesnesini sorgulayan sorgu beklenmeyen bir sonuç getirdi"
-
-#: utils/adt/ri_triggers.c:3432
-msgid "This is most likely due to a rule having rewritten the query."
-msgstr "Bu durum muhtemelen sorguyu değiştiren rule yüzünden meydana gelmiştir."
-
-#: utils/adt/ri_triggers.c:3463
-#, c-format
-msgid "No rows were found in \"%s\"."
-msgstr "\"%s\" içinde tahsis edilebilir bir girdi yok."
-
-#: utils/adt/ri_triggers.c:3500
-#, c-format
-msgid "Key (%s)=(%s) is not present in table \"%s\"."
-msgstr "\"%3$s\" tablosunda (%1$s)=(%2$s) anahtarı mevcut değildir."
-
-#: utils/adt/ri_triggers.c:3506
-#, c-format
-msgid "update or delete on table \"%s\" violates foreign key constraint \"%s\" on table \"%s\""
-msgstr "\"%1$s\" tablosu üzerinde yapılan update veya delete işlemi \"%3$s\" tablosunun \"%2$s\" bütünlük kısıtlamasını ihlal ediyor"
-
-#: utils/adt/ri_triggers.c:3509
-#, c-format
-msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
-msgstr "(%s)=(%s) anahtarı \"%s\" tablosundan hala referans edilmektedir."
-
-#: utils/adt/rowtypes.c:98
-#: utils/adt/rowtypes.c:467
-msgid "input of anonymous composite types is not implemented"
-msgstr "anonymous composite veri giriÅŸi implemente edilmemiÅŸ"
-
-#: utils/adt/rowtypes.c:145
-#: utils/adt/rowtypes.c:173
-#: utils/adt/rowtypes.c:196
-#: utils/adt/rowtypes.c:204
-#: utils/adt/rowtypes.c:256
-#: utils/adt/rowtypes.c:264
-#, c-format
-msgid "malformed record literal: \"%s\""
-msgstr "hatalı değer: \"%s\""
-
-#: utils/adt/rowtypes.c:146
-msgid "Missing left parenthesis."
-msgstr "Sol parantez eksik."
-
-#: utils/adt/rowtypes.c:174
-msgid "Too few columns."
-msgstr "Sütun sayısı yetersiz."
-
-#: utils/adt/rowtypes.c:198
-#: utils/adt/rowtypes.c:206
-msgid "Unexpected end of input."
-msgstr "Beklenmeyen girdi sonu."
-
-#: utils/adt/rowtypes.c:257
-msgid "Too many columns."
-msgstr "Çok fazla sütun."
-
-#: utils/adt/rowtypes.c:265
-msgid "Junk after right parenthesis."
-msgstr "Sağ parantezden sonra süprüntü."
-
-#: utils/adt/rowtypes.c:516
-#, c-format
-msgid "wrong number of columns: %d, expected %d"
-msgstr "geçersiz sütun sayısı: %2$d yerine %1$d"
-
-#: utils/adt/rowtypes.c:543
-#, c-format
-msgid "wrong data type: %u, expected %u"
-msgstr "yanlış veri tipi: %u beklenirken %u alındı"
-
-#: utils/adt/rowtypes.c:604
-#, c-format
-msgid "improper binary format in record column %d"
-msgstr "%d kayıt sütununda uygunsuz ikili biçimi"
-
-#: utils/adt/rowtypes.c:890
-#: utils/adt/rowtypes.c:1116
-#, c-format
-msgid "cannot compare dissimilar column types %s and %s at record column %d"
-msgstr ""
-
-#: utils/adt/rowtypes.c:968
-#: utils/adt/rowtypes.c:1179
-#, fuzzy
-msgid "cannot compare record types with different numbers of columns"
-msgstr "farklı öğe tipli dizinleri karşılaştırılamaz"
-
-#: utils/adt/ruleutils.c:1473
-#: commands/functioncmds.c:976
-#: commands/functioncmds.c:1082
-#: commands/functioncmds.c:1147
-#: commands/functioncmds.c:1302
-#, c-format
-msgid "\"%s\" is an aggregate function"
-msgstr "\"%s\" fonksiyonu bir aggregate fonksiyonudur"
-
-#: utils/adt/ruleutils.c:2083
-#, c-format
-msgid "rule \"%s\" has unsupported event type %d"
-msgstr "\"%s\" rule desteklenmeyen veri tipine sahip %d"
-
-#: utils/adt/selfuncs.c:4487
-#: utils/adt/selfuncs.c:4928
-msgid "case insensitive matching not supported on type bytea"
-msgstr "bytea veri tipi için büyük ve küçük harf duyarsız karşılaştırma desteklenmemektedir"
-
-#: utils/adt/selfuncs.c:4593
-#: utils/adt/selfuncs.c:5088
-msgid "regular-expression matching not supported on type bytea"
-msgstr "bytea tipi için regular-expression karşılaştırma desteklenmemektedir"
-
-#: utils/adt/tid.c:70
-#: utils/adt/tid.c:78
-#: utils/adt/tid.c:86
-#, c-format
-msgid "invalid input syntax for type tid: \"%s\""
-msgstr "tid veri tipi için geersiz söz dizimi: \"%s\""
-
-#: utils/adt/timestamp.c:97
-#, c-format
-msgid "TIMESTAMP(%d)%s precision must not be negative"
-msgstr "TIMESTAMP(%d)%s kesinliği sıfırdan küçük olamaz"
-
-#: utils/adt/timestamp.c:103
-#, c-format
-msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d"
-msgstr "TIMESTAMP(%d)%s kesinliği en yüksek değerine (%d) kadar düşürüldü"
-
-#: utils/adt/timestamp.c:171
-#: utils/adt/timestamp.c:430
-#, c-format
-msgid "timestamp out of range: \"%s\""
-msgstr "timestamp kapsam dışıdır: \"%s\""
-
-#: utils/adt/timestamp.c:189
-#: utils/adt/timestamp.c:448
-#: utils/adt/timestamp.c:659
-#, c-format
-msgid "date/time value \"%s\" is no longer supported"
-msgstr "\"%s\" tarih/saat değeri artık desteklenemektedir"
-
-#: utils/adt/timestamp.c:365
-#, c-format
-msgid "timestamp(%d) precision must be between %d and %d"
-msgstr "timestamp(%d) kesinliği %d ile %d arasında olmalıdır"
-
-#: utils/adt/timestamp.c:653
-#: utils/adt/timestamp.c:3098
-#: utils/adt/timestamp.c:3228
-#: utils/adt/timestamp.c:3613
-msgid "interval out of range"
-msgstr "interval sonuç sıra dışıdır"
-
-#: utils/adt/timestamp.c:782
-#: utils/adt/timestamp.c:815
-msgid "invalid INTERVAL type modifier"
-msgstr "geçersiz INTERVAL tipi niteleyicisi"
-
-#: utils/adt/timestamp.c:798
-#, c-format
-msgid "INTERVAL(%d) precision must not be negative"
-msgstr "INTEVRAL(%d) kesinliği sıfırdan küçük olamaz"
-
-#: utils/adt/timestamp.c:804
-#, c-format
-msgid "INTERVAL(%d) precision reduced to maximum allowed, %d"
-msgstr "INTEVRAL(%d) kesinliği izin verilen en yüksek değerine (%d) düşürülmüştür"
-
-#: utils/adt/timestamp.c:1096
-#, c-format
-msgid "interval(%d) precision must be between %d and %d"
-msgstr "interval(%d) kesinliği %d ile %d arasında olmalıdır"
-
-#: utils/adt/timestamp.c:2301
-msgid "cannot subtract infinite timestamps"
-msgstr "sonsuz timestap veri tipi üzerinde çıkarma işlemi yapılamaz"
-
-#: utils/adt/timestamp.c:3354
-#: utils/adt/timestamp.c:3950
-#: utils/adt/timestamp.c:4009
-#, c-format
-msgid "timestamp units \"%s\" not supported"
-msgstr "interval birimi \"%s\" desteklenmemektedir"
-
-#: utils/adt/timestamp.c:3368
-#: utils/adt/timestamp.c:4019
-#, c-format
-msgid "timestamp units \"%s\" not recognized"
-msgstr "\"%s\" timestamp birimleri geçersiz"
-
-#: utils/adt/timestamp.c:3509
-#: utils/adt/timestamp.c:4181
-#: utils/adt/timestamp.c:4222
-#, c-format
-msgid "timestamp with time zone units \"%s\" not supported"
-msgstr "\"%s\" timestamp with time zone deÄŸerleri desteklenmemektedir"
-
-#: utils/adt/timestamp.c:3526
-#: utils/adt/timestamp.c:4231
-#, c-format
-msgid "timestamp with time zone units \"%s\" not recognized"
-msgstr "\"%s\" timestamp with time zone değerleri tanınmamaktadır"
-
-#: utils/adt/timestamp.c:3606
-#: utils/adt/timestamp.c:4337
-#, c-format
-msgid "interval units \"%s\" not supported"
-msgstr "interval birimi \"%s\" desteklenmemektedir"
-
-#: utils/adt/timestamp.c:3622
-#: utils/adt/timestamp.c:4364
-#, c-format
-msgid "interval units \"%s\" not recognized"
-msgstr "\"%s\" interval birimleri geçersiz"
-
-#: utils/adt/timestamp.c:4434
-#: utils/adt/timestamp.c:4607
-#, c-format
-msgid "could not convert to time zone \"%s\""
-msgstr "\"%s\" zaman dilimine dönüştürülemedi"
-
-#: utils/adt/timestamp.c:4466
-#: utils/adt/timestamp.c:4640
-#, c-format
-msgid "interval time zone \"%s\" must not specify month"
-msgstr "\"%s\" interval time zone ayı belirtmemelidir"
-
-#: utils/adt/trigfuncs.c:41
-msgid "suppress_redundant_updates_trigger: must be called as trigger"
-msgstr ""
-
-#: utils/adt/trigfuncs.c:47
-msgid "suppress_redundant_updates_trigger: must be called on update"
-msgstr ""
-
-#: utils/adt/trigfuncs.c:53
-msgid "suppress_redundant_updates_trigger: must be called before update"
-msgstr ""
-
-#: utils/adt/trigfuncs.c:59
-msgid "suppress_redundant_updates_trigger: must be called for each row"
-msgstr ""
-
-#: utils/adt/tsgistidx.c:100
-msgid "gtsvector_in not implemented"
-msgstr " gtsvector_in henüz implemente edilmemiştir"
-
-#: utils/adt/tsquery.c:156
-#: utils/adt/tsquery.c:392
-#: utils/adt/tsvector_parser.c:136
-#, fuzzy, c-format
-msgid "syntax error in tsquery: \"%s\""
-msgstr "%s geçmiş dosyasında sözdizimi hatası"
-
-#: utils/adt/tsquery.c:177
-#, fuzzy, c-format
-msgid "no operand in tsquery: \"%s\""
-msgstr "operator eÅŸsiz deÄŸildir: %s"
-
-#: utils/adt/tsquery.c:250
-#, c-format
-msgid "value is too big in tsquery: \"%s\""
-msgstr "tsquery'deki değer çok büyük: \"%s\""
-
-#: utils/adt/tsquery.c:255
-#, fuzzy, c-format
-msgid "operand is too long in tsquery: \"%s\""
-msgstr "operator eÅŸsiz deÄŸildir: %s"
-
-#: utils/adt/tsquery.c:283
-#, c-format
-msgid "word is too long in tsquery: \"%s\""
-msgstr "tsquery'deki sözcük çok uzun: \"%s\""
-
-#: utils/adt/tsquery.c:512
-#, c-format
-msgid "text-search query doesn't contain lexemes: \"%s\""
-msgstr "metin arama sorgusu lexeme içermiyor: \"%s\""
-
-#: utils/adt/tsquery_cleanup.c:285
-msgid "text-search query contains only stop words or doesn't contain lexemes, ignored"
-msgstr ""
-
-#: utils/adt/tsquery_rewrite.c:296
-#, fuzzy
-msgid "ts_rewrite query must return two tsquery columns"
-msgstr "subquery, bir tane sütun getirmelidir"
-
-#: utils/adt/tsrank.c:404
-#, fuzzy
-msgid "array of weight must be one-dimensional"
-msgstr "ACL array tek boyutlu olmalıdır"
-
-#: utils/adt/tsrank.c:409
-msgid "array of weight is too short"
-msgstr ""
-
-#: utils/adt/tsrank.c:414
-#, fuzzy
-msgid "array of weight must not contain nulls"
-msgstr "array null kayıtları içeremez"
-
-#: utils/adt/tsrank.c:423
-#: utils/adt/tsrank.c:749
-msgid "weight out of range"
-msgstr "ağırlık değeri sıra dışıdır"
-
-#: utils/adt/tsvector.c:215
-#, c-format
-msgid "word is too long (%ld bytes, max %ld bytes)"
-msgstr "sözcük çok uzun (%ld byte, en fazla %ld byte)"
-
-#: utils/adt/tsvector.c:222
-#, fuzzy, c-format
-msgid "string is too long for tsvector (%ld bytes, max %ld bytes)"
-msgstr "dizgi tsvector için çok uzun"
-
-#: utils/adt/tsvector.c:272
-#: utils/adt/tsvector_op.c:514
-#: tsearch/to_tsany.c:165
-#, fuzzy, c-format
-msgid "string is too long for tsvector (%d bytes, max %d bytes)"
-msgstr "dizgi tsvector için çok uzun"
-
-#: utils/adt/tsvector_op.c:1098
-#, fuzzy
-msgid "ts_stat query must return one tsvector column"
-msgstr "subquery, bir tane sütun getirmelidir"
-
-#: utils/adt/tsvector_op.c:1278
-#, fuzzy, c-format
-msgid "tsvector column \"%s\" does not exist"
-msgstr "\"%s\" sütunu mevcut değil"
-
-#: utils/adt/tsvector_op.c:1284
-#, fuzzy, c-format
-msgid "column \"%s\" is not of tsvector type"
-msgstr "\"%s\" sütunu \"%s\" tipine dönüştürülemez"
-
-#: utils/adt/tsvector_op.c:1296
-#, c-format
-msgid "configuration column \"%s\" does not exist"
-msgstr "\"%s\" yapılandırma kolonu mevcut değil"
-
-#: utils/adt/tsvector_op.c:1302
-#, fuzzy, c-format
-msgid "column \"%s\" is not of regconfig type"
-msgstr "%2$s veri tipinde \"%1$s\" sütunu bulunamadı"
-
-#: utils/adt/tsvector_op.c:1309
-#, fuzzy, c-format
-msgid "configuration column \"%s\" must not be null"
-msgstr "\"%s\" sütunu mevcut değil"
-
-#: utils/adt/tsvector_op.c:1322
-#, fuzzy, c-format
-msgid "text search configuration name \"%s\" must be schema-qualified"
-msgstr "Şema belirtilmediği takdirde isimlerin hangi şemalarda aranacağını belirtir."
-
-#: utils/adt/tsvector_op.c:1342
-#: commands/copy.c:3409
-#: commands/indexcmds.c:835
-#: commands/tablecmds.c:1913
-#: parser/parse_expr.c:466
-#, c-format
-msgid "column \"%s\" does not exist"
-msgstr "\"%s\" sütunu mevcut değil"
-
-#: utils/adt/tsvector_op.c:1347
-#, fuzzy, c-format
-msgid "column \"%s\" is not of a character type"
-msgstr "oid tipi için \"%s\" değeri sıra dışıdır"
-
-#: utils/adt/tsvector_parser.c:137
-#, c-format
-msgid "syntax error in tsvector: \"%s\""
-msgstr "tsvector yazım hatası: \"%s\""
-
-#: utils/adt/tsvector_parser.c:202
-#, fuzzy, c-format
-msgid "there is no escaped character: \"%s\""
-msgstr "$%d parametresi yoktur"
-
-#: utils/adt/tsvector_parser.c:319
-#, fuzzy, c-format
-msgid "wrong position info in tsvector: \"%s\""
-msgstr "%s ifadesi, %d terinde select listesinde deÄŸildir"
-
-#: utils/adt/uuid.c:128
-#, c-format
-msgid "invalid input syntax for uuid: \"%s\""
-msgstr "uuid tipi için geçersiz söz dizimi: \"%s\""
-
-#: utils/adt/varbit.c:49
-#: utils/adt/varchar.c:48
-#, c-format
-msgid "length for type %s must be at least 1"
-msgstr "%s tipinin uzunluğu en az 1 olmalıdır"
-
-#: utils/adt/varbit.c:54
-#: utils/adt/varchar.c:52
-#, c-format
-msgid "length for type %s cannot exceed %d"
-msgstr "%s tipin uzunluÄŸu %d deÄŸerini aÅŸamaz"
-
-#: utils/adt/varbit.c:157
-#: utils/adt/varbit.c:297
-#: utils/adt/varbit.c:353
-#, c-format
-msgid "bit string length %d does not match type bit(%d)"
-msgstr "%d bit string uzunluğu bit tipi (%d) ile uyuşmamaktadır"
-
-#: utils/adt/varbit.c:179
-#: utils/adt/varbit.c:477
-#, c-format
-msgid "\"%c\" is not a valid binary digit"
-msgstr "\"%c\" geçerli bir ikili rakamı değildir"
-
-#: utils/adt/varbit.c:204
-#: utils/adt/varbit.c:502
-#, c-format
-msgid "\"%c\" is not a valid hexadecimal digit"
-msgstr "\"%c\" geçerli bir onaltılı rakamı değildir"
-
-#: utils/adt/varbit.c:288
-#: utils/adt/varbit.c:589
-msgid "invalid length in external bit string"
-msgstr "external bit string uzunuğu geçersiz"
-
-#: utils/adt/varbit.c:455
-#: utils/adt/varbit.c:598
-#: utils/adt/varbit.c:659
-#, c-format
-msgid "bit string too long for type bit varying(%d)"
-msgstr "bit varying(%d) tipi için bit string çok uzun"
-
-#: utils/adt/varbit.c:1048
-msgid "cannot AND bit strings of different sizes"
-msgstr "farklı uzunluğa sahip bit stringler üzerinde AND işlemi yapılamaz"
-
-#: utils/adt/varbit.c:1089
-msgid "cannot OR bit strings of different sizes"
-msgstr "farklı uzunluğa sahip bit stringler üzerinde OR işlemi yapılamaz"
-
-#: utils/adt/varbit.c:1135
-msgid "cannot XOR bit strings of different sizes"
-msgstr "farklı uzunluğa sahip bit stringler üzerinde XOR işlemi yapılamaz"
-
-#: utils/adt/varchar.c:152
-#: utils/adt/varchar.c:305
-#, c-format
-msgid "value too long for type character(%d)"
-msgstr "character(%d) veri tipi için değer çok uzun"
-
-#: utils/adt/varchar.c:473
-#: utils/adt/varchar.c:594
-#, c-format
-msgid "value too long for type character varying(%d)"
-msgstr "varying(%d)  veri tipi için çok uzun"
-
-#: utils/adt/varlena.c:670
-#: utils/adt/varlena.c:734
-#: utils/adt/varlena.c:1684
-msgid "negative substring length not allowed"
-msgstr "dıfırdan küçük altatır uzunluğuna izin verilmiyor"
-
-#: utils/adt/varlena.c:1213
-#: utils/adt/varlena.c:1226
-#, c-format
-msgid "could not convert string to UTF-16: error %lu"
-msgstr "satır, UTF-16 kodlamasanıa çevrilemedi: %lu"
-
-#: utils/adt/varlena.c:1236
-#, c-format
-msgid "could not compare Unicode strings: %m"
-msgstr "Unicode satırları karşılaştırılamadı: %m"
-
-#: utils/adt/varlena.c:1779
-#: utils/adt/varlena.c:1810
-#: utils/adt/varlena.c:1846
-#: utils/adt/varlena.c:1889
-#, c-format
-msgid "index %d out of valid range, 0..%d"
-msgstr "%d indexi  geçerli kapsamın dışındadır: 0..%d"
-
-#: utils/adt/varlena.c:1901
-msgid "new bit must be 0 or 1"
-msgstr "yeni bit 0 veya 1 olmalıdır"
-
-#: utils/adt/varlena.c:2681
-msgid "field position must be greater than zero"
-msgstr "alan yeri sıfırdan büyük olmalıdır"
-
-#: utils/adt/windowfuncs.c:243
-#, fuzzy
-msgid "argument of ntile must be greater than zero"
-msgstr "sayısı sıfırdan büyük olmalı"
-
-#: utils/adt/windowfuncs.c:465
-#, fuzzy
-msgid "argument of nth_value must be greater than zero"
-msgstr "sayısı sıfırdan büyük olmalı"
-
-#: utils/adt/xml.c:137
-msgid "unsupported XML feature"
-msgstr "desteklenmeyen XML özelliği"
-
-#: utils/adt/xml.c:138
-#, fuzzy
-msgid "This functionality requires the server to be built with libxml support."
-msgstr "Bu özellik libxml desteği gerektirmektedir."
-
-#: utils/adt/xml.c:139
-msgid "You need to rebuild PostgreSQL using --with-libxml."
-msgstr "PostgreSQL'i --with-libxml seçeneği ile yeniden derlemeniz gerekiyor."
-
-#: utils/adt/xml.c:158
-#: utils/mb/mbutils.c:477
-#, c-format
-msgid "invalid encoding name \"%s\""
-msgstr "geçersiz dil kodlaması adı \"%s\""
-
-#: utils/adt/xml.c:397
-#: utils/adt/xml.c:402
-msgid "invalid XML comment"
-msgstr "XML açıklaması geçersiz"
-
-#: utils/adt/xml.c:531
-msgid "not an XML document"
-msgstr "XML dokümanı değildir"
-
-#: utils/adt/xml.c:683
-#: utils/adt/xml.c:706
-msgid "invalid XML processing instruction"
-msgstr "geçersiz XML işleme komutu"
-
-#: utils/adt/xml.c:684
-#, fuzzy, c-format
-msgid "XML processing instruction target name cannot be \"%s\"."
-msgstr "XML iÅŸleme komut hedefi \"xml\" ile baÅŸlayamaz."
-
-#: utils/adt/xml.c:707
-msgid "XML processing instruction cannot contain \"?>\"."
-msgstr "XML işleme komutu \"?>\" içeremez."
-
-#: utils/adt/xml.c:786
-#, fuzzy
-msgid "xmlvalidate is not implemented"
-msgstr "UNIQUE predicate implemente edilmemiÅŸtir"
-
-#: utils/adt/xml.c:861
-msgid "could not initialize XML library"
-msgstr "XML kütühanesi ilklendirilemedi"
-
-#: utils/adt/xml.c:862
-#, c-format
-msgid "libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u."
-msgstr "libxml2 kütüphanesi uyumsuz karakter veri tipine sahiptir: sizeof(char)=%u, sizeof(xmlChar)=%u."
-
-#: utils/adt/xml.c:1339
-#: utils/adt/xml.c:1340
-#: utils/adt/xml.c:1346
-#: utils/adt/xml.c:1417
-#: utils/misc/guc.c:4749
-#: utils/misc/guc.c:5017
-#: utils/fmgr/dfmgr.c:381
-#: tcop/postgres.c:3990
-#: catalog/dependency.c:903
-#: catalog/dependency.c:904
-#: catalog/dependency.c:910
-#: catalog/dependency.c:911
-#: catalog/dependency.c:922
-#: catalog/dependency.c:923
-#: commands/tablecmds.c:609
-#: commands/trigger.c:574
-#: commands/trigger.c:590
-#: commands/trigger.c:602
-#: commands/user.c:909
-#: commands/user.c:910
-#: storage/lmgr/deadlock.c:942
-#: storage/lmgr/deadlock.c:943
-#: nodes/print.c:85
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: utils/adt/xml.c:1393
-#, fuzzy
-msgid "Invalid character value."
-msgstr "karakter kapsamı için geçersiz isimler"
-
-#: utils/adt/xml.c:1396
-msgid "Space required."
-msgstr ""
-
-#: utils/adt/xml.c:1399
-msgid "standalone accepts only 'yes' or 'no'."
-msgstr ""
-
-#: utils/adt/xml.c:1402
-msgid "Malformed declaration: missing version."
-msgstr ""
-
-#: utils/adt/xml.c:1405
-msgid "Missing encoding in text declaration."
-msgstr ""
-
-#: utils/adt/xml.c:1408
-msgid "Parsing XML declaration: '?>' expected."
-msgstr ""
-
-#: utils/adt/xml.c:1411
-#, fuzzy, c-format
-msgid "Unrecognized libxml error code: %d."
-msgstr "bilinmeyen SSL hata kodu: %d"
-
-#: utils/adt/xml.c:1666
-#, fuzzy
-msgid "date out of range"
-msgstr "date kapsam dışıdır: \"%s\""
-
-#: utils/adt/xml.c:1667
-#, fuzzy
-msgid "XML does not support infinite date values."
-msgstr "NULLIF, set argümanları desteklememektedir"
-
-#: utils/adt/xml.c:1690
-#: utils/adt/xml.c:1717
-#, fuzzy
-msgid "XML does not support infinite timestamp values."
-msgstr "sonsuz timestap veri tipi üzerinde çıkarma işlemi yapılamaz"
-
-#: utils/adt/xml.c:2007
-#: utils/adt/xml.c:2171
-#: commands/portalcmds.c:168
-#: commands/portalcmds.c:222
-#: executor/execCurrent.c:66
-#, c-format
-msgid "cursor \"%s\" does not exist"
-msgstr "\"%s\" imleci mevcut deÄŸil"
-
-#: utils/adt/xml.c:2086
-msgid "invalid query"
-msgstr "geçersiz sorgu"
-
-#: utils/adt/xml.c:3319
-#, fuzzy
-msgid "invalid array for XML namespace mapping"
-msgstr "namespace eşlemi için geçersiz dizi verilmiştir"
-
-#: utils/adt/xml.c:3320
-msgid "The array must be two-dimensional with length of the second axis equal to 2."
-msgstr ""
-
-#: utils/adt/xml.c:3344
-msgid "empty XPath expression"
-msgstr "boÅŸ XPath ifadesi"
-
-#: utils/adt/xml.c:3392
-#, fuzzy
-msgid "neither namespace name nor URI may be null"
-msgstr "ne isim ne de URI, NULL olamaz"
-
-#: utils/adt/xml.c:3399
-#, fuzzy, c-format
-msgid "could not register XML namespace with name \"%s\" and URI \"%s\""
-msgstr "prefix=\"%s\" ve href=\"%s\" olan ad XML namespace oluÅŸtutulamaz"
-
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:126
-#: utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c:153
-#, c-format
-msgid "unexpected encoding ID %d for WIN character sets"
-msgstr "WIN karakter kümeleri için beklemnmeyen kodlama ID %d"
-
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:136
-#: utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c:163
-#, c-format
-msgid "unexpected encoding ID %d for ISO 8859 character sets"
-msgstr "ISO-8859 karakter kümesi için beklemnmeyen kodlama ID %d"
-
-#: utils/mb/conv.c:509
-#, c-format
-msgid "invalid encoding number: %d"
-msgstr "kodlama numarası geçersiz: %d"
-
-#: utils/mb/encnames.c:564
-msgid "encoding name too long"
-msgstr "kodlama ismi çok uzun"
-
-#: utils/mb/mbutils.c:240
-#: commands/variable.c:665
-#, c-format
-msgid "conversion between %s and %s is not supported"
-msgstr "%s ile %s arasında conversion desteklenmemektedir"
-
-#: utils/mb/mbutils.c:310
-#, c-format
-msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
-msgstr "\"%s\" kodlamasından \"%s\" varsayılan kodlamasına dönüştürme fonksiyonu mevcut değildir"
-
-#: utils/mb/mbutils.c:336
-#: utils/mb/mbutils.c:597
-#, c-format
-msgid "String of %d bytes is too long for encoding conversion."
-msgstr ""
-
-#: utils/mb/mbutils.c:423
-#, c-format
-msgid "invalid source encoding name \"%s\""
-msgstr "geçersiz kaynak dil kodlaması adı \"%s\""
-
-#: utils/mb/mbutils.c:428
-#, c-format
-msgid "invalid destination encoding name \"%s\""
-msgstr "geçersiz hedef dil kodlaması adı \"%s\""
-
-#: utils/mb/mbutils.c:529
-#, c-format
-msgid "invalid byte value for encoding \"%s\": 0x%02x"
-msgstr "\"%s\" dil kodlaması için geçersiz bayt değeri: 0x%02x"
-
-#: utils/mb/mbutils.c:724
-msgid "invalid multibyte character for locale"
-msgstr "karakter kapsamı için geçersiz isimler"
-
-#: utils/mb/mbutils.c:725
-msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
-msgstr "Sunucunun LC_TYPE yerel ayarı  veritabanı kodlaması ile uyumsuz."
-
-#: utils/mb/wchar.c:1609
-#, c-format
-msgid "invalid byte sequence for encoding \"%s\": 0x%s"
-msgstr "\"%s\" dil kodlaması için geçersiz bayt dizisi: 0x%s"
-
-#: utils/mb/wchar.c:1612
-msgid "This error can also happen if the byte sequence does not match the encoding expected by the server, which is controlled by \"client_encoding\"."
-msgstr "Bu hata ayrıca bayt sırasının sunucunun beklediği kodlamada olmadığı zaman meydana gelmektedir. İstemci dil kodlaması \"client_encoding\" seçeneği ile ayarlanmaktadır."
-
-#: utils/mb/wchar.c:1641
-#, c-format
-msgid "character 0x%s of encoding \"%s\" has no equivalent in \"%s\""
-msgstr "\"%2$s\" kodlamasının 0x%1$s karakterinin \"%3$s\" kodlamasında karşılığı yoktur"
-
-#: utils/sort/logtape.c:213
-#, c-format
-msgid "could not write block %ld of temporary file: %m"
-msgstr "geçici dosyasının %ld bloku yazılamıyor: %m"
-
-#: utils/sort/logtape.c:215
-msgid "Perhaps out of disk space?"
-msgstr "Disk dolu mu?"
-
-#: utils/sort/logtape.c:232
-#, c-format
-msgid "could not read block %ld of temporary file: %m"
-msgstr "geçici dosyasının %ld bloku okunamıyor: %m"
-
-#: utils/sort/tuplesort.c:2806
-#, c-format
-msgid "could not create unique index \"%s\""
-msgstr "\"%s\" tekil indexi yaratılamadı"
-
-#: utils/sort/tuplesort.c:2808
-msgid "Table contains duplicated values."
-msgstr "Tabloda mukerrer deÄŸerler mevcut."
-
-#: utils/hash/dynahash.c:925
-#: storage/lmgr/lock.c:583
-#: storage/lmgr/lock.c:649
-#: storage/lmgr/lock.c:2051
-#: storage/lmgr/lock.c:2339
-#: storage/lmgr/lock.c:2404
-#: storage/lmgr/proc.c:186
-#: storage/lmgr/proc.c:199
-#: storage/ipc/shmem.c:190
-#: storage/ipc/shmem.c:359
-msgid "out of shared memory"
-msgstr "shared memory yetersiz"
-
-#: utils/misc/guc.c:466
-msgid "Ungrouped"
-msgstr "DiÄŸer"
-
-#: utils/misc/guc.c:468
-msgid "File Locations"
-msgstr "Dosya Konumları"
-
-#: utils/misc/guc.c:470
-msgid "Connections and Authentication"
-msgstr "Bağlantı ve Kimlik Doğrulamaları"
-
-#: utils/misc/guc.c:472
-msgid "Connections and Authentication / Connection Settings"
-msgstr "Bğlantılar ve Kimlik Doğrulaması/ Bağlantı Ayarları"
-
-#: utils/misc/guc.c:474
-msgid "Connections and Authentication / Security and Authentication"
-msgstr "Bağlantı ve Kimlik Doğrulamaısı / Güvenlik ve Kimlik Doğrulaması"
-
-#: utils/misc/guc.c:476
-msgid "Resource Usage"
-msgstr "Kaynak Kullanımı"
-
-#: utils/misc/guc.c:478
-msgid "Resource Usage / Memory"
-msgstr "Kaynak Kullanımı / Bellek"
-
-#: utils/misc/guc.c:480
-msgid "Resource Usage / Kernel Resources"
-msgstr "Kaynak Kullanımı / Kernel Kaynakları"
-
-#: utils/misc/guc.c:482
-msgid "Write-Ahead Log"
-msgstr "Write-Ahead Log"
-
-#: utils/misc/guc.c:484
-msgid "Write-Ahead Log / Settings"
-msgstr "Write-Ahead Log / Ayarlar"
-
-#: utils/misc/guc.c:486
-msgid "Write-Ahead Log / Checkpoints"
-msgstr "Write-Ahead Log / Checkpoints"
-
-#: utils/misc/guc.c:488
-msgid "Query Tuning"
-msgstr "Sorgu Performans Ayarları"
-
-#: utils/misc/guc.c:490
-msgid "Query Tuning / Planner Method Configuration"
-msgstr "Sorgu Ayarları / Planlayıcı Metot Yapılandırması"
-
-#: utils/misc/guc.c:492
-msgid "Query Tuning / Planner Cost Constants"
-msgstr "Sorgu Ayarları / Planlayıcı Cost Değişkenleri"
-
-#: utils/misc/guc.c:494
-msgid "Query Tuning / Genetic Query Optimizer"
-msgstr "Sorgu Ayarları / Genetik Sorgu Optimizatörü"
-
-#: utils/misc/guc.c:496
-msgid "Query Tuning / Other Planner Options"
-msgstr "Sorgu Ayarları / Planner'in Diğer Seçenekleri"
-
-#: utils/misc/guc.c:498
-msgid "Reporting and Logging"
-msgstr "Raporlama ve Loglama"
-
-#: utils/misc/guc.c:500
-msgid "Reporting and Logging / Where to Log"
-msgstr "Raporlama ve Günlük / Günlük Yeri"
-
-#: utils/misc/guc.c:502
-msgid "Reporting and Logging / When to Log"
-msgstr "Raporlama ve Günlük / Günlük Tutma Zamanı"
-
-#: utils/misc/guc.c:504
-msgid "Reporting and Logging / What to Log"
-msgstr "Reporting and Logging / Günlük İçeriği"
-
-#: utils/misc/guc.c:506
-msgid "Statistics"
-msgstr "Ä°statistikler"
-
-#: utils/misc/guc.c:508
-msgid "Statistics / Monitoring"
-msgstr "Ä°statistikler / Denetlemeler"
-
-#: utils/misc/guc.c:510
-msgid "Statistics / Query and Index Statistics Collector"
-msgstr "İstatistikler / Sorgu ve İndeks İstatistik Toplayıcı"
-
-#: utils/misc/guc.c:512
-msgid "Autovacuum"
-msgstr "Autovacuum"
-
-#: utils/misc/guc.c:514
-msgid "Client Connection Defaults"
-msgstr "İstemci Bağlantı Varsayılanları"
-
-#: utils/misc/guc.c:516
-msgid "Client Connection Defaults / Statement Behavior"
-msgstr "İstemci Bağlantı Varsayılan Seçenekleri / Deyim Davranışı"
-
-#: utils/misc/guc.c:518
-msgid "Client Connection Defaults / Locale and Formatting"
-msgstr "İstemci Bağlantı Varsayılan Seçenekleri / Yerelleştirme ve Biçimlendirme"
-
-#: utils/misc/guc.c:520
-msgid "Client Connection Defaults / Other Defaults"
-msgstr "İstemci Bağlantısı Varsayılan Değerler / Diğer Varsayılanlar"
-
-#: utils/misc/guc.c:522
-msgid "Lock Management"
-msgstr "Lock Yönetimi"
-
-#: utils/misc/guc.c:524
-msgid "Version and Platform Compatibility"
-msgstr "Sürüm ve Platform Uyumluluğu"
-
-#: utils/misc/guc.c:526
-msgid "Version and Platform Compatibility / Previous PostgreSQL Versions"
-msgstr "Sürüm ve Platform Uyumluluğu / Önceki PostgreSQL Sürümleri"
-
-#: utils/misc/guc.c:528
-msgid "Version and Platform Compatibility / Other Platforms and Clients"
-msgstr "Sürüm ve Platform Uyumluluğu / Diğer Platform ve İstemci"
-
-#: utils/misc/guc.c:530
-msgid "Preset Options"
-msgstr "Önceden Tanımlanmış Seçenekler"
-
-#: utils/misc/guc.c:532
-msgid "Customized Options"
-msgstr "Özel Ayarlar"
-
-#: utils/misc/guc.c:534
-msgid "Developer Options"
-msgstr "Program geliştirici Seçenekleri"
-
-#: utils/misc/guc.c:588
-msgid "Enables the planner's use of sequential-scan plans."
-msgstr "Planlayıcının sequential-scan planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:596
-msgid "Enables the planner's use of index-scan plans."
-msgstr "Planlayıcının index-scan planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:604
-msgid "Enables the planner's use of bitmap-scan plans."
-msgstr "Planlayıcının bitmap-scan planları kullanmaya izin veriyor."
-
-#: utils/misc/guc.c:612
-msgid "Enables the planner's use of TID scan plans."
-msgstr "Planlayıcının TID scan planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:620
-msgid "Enables the planner's use of explicit sort steps."
-msgstr "Planlayıcının açık sıralama adımlarını kullanmaya izin ver."
-
-#: utils/misc/guc.c:628
-msgid "Enables the planner's use of hashed aggregation plans."
-msgstr "Planlayıcının hashed aggregatin planlarını kullanmaya izin ver."
-
-#: utils/misc/guc.c:636
-msgid "Enables the planner's use of nested-loop join plans."
-msgstr "Planlayıcının nested-loop planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:644
-msgid "Enables the planner's use of merge join plans."
-msgstr "Planlayıcının merge join planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:652
-msgid "Enables the planner's use of hash join plans."
-msgstr "Planlayıcının hash join planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:660
-msgid "Enables genetic query optimization."
-msgstr "Genetic query optimization algoritmasını etkinleştiriyor."
-
-#: utils/misc/guc.c:661
-msgid "This algorithm attempts to do planning without exhaustive searching."
-msgstr "Bu algoritma planlamayı, tam bir arama yapılamadan yapmayı deniyor."
-
-#: utils/misc/guc.c:670
-msgid "Shows whether the current user is a superuser."
-msgstr "Geçerli kullanıcının superuser olup olmadığını gösterir"
-
-#: utils/misc/guc.c:679
-msgid "Enables SSL connections."
-msgstr "SSL bağlantıları etkinleştiriyor."
-
-#: utils/misc/guc.c:687
-msgid "Forces synchronization of updates to disk."
-msgstr "Disk göncellemelerin anuyumlu olmasını zorluyor"
-
-#: utils/misc/guc.c:688
-msgid "The server will use the fsync() system call in several places to make sure that updates are physically written to disk. This insures that a database cluster will recover to a consistent state after an operating system or hardware crash."
-msgstr "Sunucu, güncellemelerin fiziksel olarak diske yazılmasına emin olmak için fsync() sistem fonksiyonunu kullanıyor. Bu, işletim sistemi veya donanımın çöküşünden sonra veritabanı cluster'in tutarlı bir duruma kurtarılmasını garantiliyor."
-
-#: utils/misc/guc.c:698
-msgid "Sets immediate fsync at commit."
-msgstr "commit işleminde anlık fsync gönderimini ayarlar."
-
-#: utils/misc/guc.c:706
-msgid "Continues processing past damaged page headers."
-msgstr "Bozulmuş sayfa başlıkları atlayarak işlemeye devam ediyor."
-
-#: utils/misc/guc.c:707
-msgid "Detection of a damaged page header normally causes PostgreSQL to report an error, aborting the current transaction. Setting zero_damaged_pages to true causes the system to instead report a warning, zero out the damaged page, and continue processing. This behavior will destroy data, namely all the rows on the damaged page."
-msgstr "Bozuk bir sayfanın algılanması genellikle PostgreSQL'in hatanın raporlaması ve geçerli transactionun durdururlmasına yol açıyor. zero_damaged_pages parametresine true atayınca, sistem bir uyarı raporlayıp, hatalı sayfayı sıfırlayıp işlemeye devam etmesine sebep oluyor. Bu davranış, bozuk sayfadaki tüm satırları silecektir."
-
-#: utils/misc/guc.c:719
-msgid "Writes full pages to WAL when first modified after a checkpoint."
-msgstr "Checkpoint sonrasında ilk değiştirildiğinde sayfayı tamamiyle WAL loguna yazıyor."
-
-#: utils/misc/guc.c:720
-msgid "A page write in process during an operating system crash might be only partially written to disk.  During recovery, the row changes stored in WAL are not enough to recover.  This option writes pages when first modified after a checkpoint to WAL so full recovery is possible."
-msgstr "İşletim sistemi çöktüğü anda sayfa diske yazması işlemi gerçekleştiriyorsa, sayfa, sadece kısmen yazılmış olabilir. Dolayısıyla kurtarma sırasında WAL içinde kaydedilmiş satır değişiklikleri yetersiz olabilir. Bu seçenek, sayfaları, checkpoint işleminden sonra ilk değiştirildiğinde sadece değişikliği değil, tam sayfayı WAL loguna yazıyor böylece tam bir kurtarmaya olanak tanıyor."
-
-#: utils/misc/guc.c:731
-msgid "Runs the server silently."
-msgstr "Sunucusunu sessiz biçimde çalıştır."
-
-#: utils/misc/guc.c:732
-msgid "If this parameter is set, the server will automatically run in the background and any controlling terminals are dissociated."
-msgstr "Bu parametre ayarlı ise, sunucu süreci, arka planda çalışacak ve sürecine bağlı tüm uçbirimlerin ilişkileri kesilecektir."
-
-#: utils/misc/guc.c:740
-msgid "Logs each checkpoint."
-msgstr "Her checkpoint iÅŸlemini kaydeder"
-
-#: utils/misc/guc.c:748
-msgid "Logs each successful connection."
-msgstr "Her başarılı bağlantıyı günlüğüne kaydediyor."
-
-#: utils/misc/guc.c:756
-msgid "Logs end of a session, including duration."
-msgstr "Outum sonu ve toplam zamanı günlüğüne kaydediyor."
-
-#: utils/misc/guc.c:764
-msgid "Turns on various assertion checks."
-msgstr "Çeşitli ısrar hata kontrollerini açıyor."
-
-#: utils/misc/guc.c:765
-msgid "This is a debugging aid."
-msgstr "Bu bir debug yardımı."
-
-#: utils/misc/guc.c:779
-#: utils/misc/guc.c:861
-#: utils/misc/guc.c:920
-#: utils/misc/guc.c:929
-#: utils/misc/guc.c:938
-#: utils/misc/guc.c:947
-#: utils/misc/guc.c:1513
-#: utils/misc/guc.c:1522
-msgid "No description available."
-msgstr "Açıklama yok."
-
-#: utils/misc/guc.c:788
-msgid "Logs the duration of each completed SQL statement."
-msgstr "Tamamlanmış her SQL sorgusunun süresini günlüğüne kaydediyor."
-
-#: utils/misc/guc.c:796
-msgid "Logs each query's parse tree."
-msgstr ""
-
-#: utils/misc/guc.c:804
-msgid "Logs each query's rewritten parse tree."
-msgstr ""
-
-#: utils/misc/guc.c:812
-#, fuzzy
-msgid "Logs each query's execution plan."
-msgstr "Her başarılı bağlantıyı günlüğüne kaydediyor."
-
-#: utils/misc/guc.c:820
-msgid "Indents parse and plan tree displays."
-msgstr "Ayrıştırma ve plan ağaçları girintili yazıyor."
-
-#: utils/misc/guc.c:828
-msgid "Writes parser performance statistics to the server log."
-msgstr "Ayrıştırıcı perfomans istatistiklerinin sunucu günlüğüne yazıyor."
-
-#: utils/misc/guc.c:836
-msgid "Writes planner performance statistics to the server log."
-msgstr "Planlayıcı perfomans istatistiklerinin sunucu günlüğüne yazıyor."
-
-#: utils/misc/guc.c:844
-msgid "Writes executor performance statistics to the server log."
-msgstr "Yürütücü perfomans istatistiklerinin sunucu günlüğüne yazıyor."
-
-#: utils/misc/guc.c:852
-msgid "Writes cumulative performance statistics to the server log."
-msgstr "Birikimli perfomans istatistiklerinin sunucu günlüğüne yazıyor."
-
-#: utils/misc/guc.c:872
-msgid "Collects information about executing commands."
-msgstr "Yürütülen komutların istatistik bilgilerini topluyor."
-
-#: utils/misc/guc.c:873
-msgid "Enables the collection of information on the currently executing command of each session, along with the time at which that command began execution."
-msgstr "Her oturumunun şu anda yürütülen komutlarının bilgi ve komutun başlatma zamanı toplamayı etkinleştir."
-
-#: utils/misc/guc.c:882
-msgid "Collects statistics on database activity."
-msgstr "Veritabanı etkinliği sırasında istatistikleri toplar."
-
-#: utils/misc/guc.c:891
-msgid "Updates the process title to show the active SQL command."
-msgstr "Sürecin başlığında işlemede olan SQL komutu gösterilecek."
-
-#: utils/misc/guc.c:892
-msgid "Enables updating of the process title every time a new SQL command is received by the server."
-msgstr "Sunucu tarafından her yeni SQL komutu alındığında sürecin başlığı güncellenecektir."
-
-#: utils/misc/guc.c:900
-msgid "Starts the autovacuum subprocess."
-msgstr "Otomatik vacuum alt sürecini başlatıyor."
-
-#: utils/misc/guc.c:909
-msgid "Generates debugging output for LISTEN and NOTIFY."
-msgstr "LISTEN ve NOTIFY için hata ayıklama çıkışını üretiyor."
-
-#: utils/misc/guc.c:958
-msgid "Logs long lock waits."
-msgstr "Çok uzun sürek lock işlemlerini kaydeder."
-
-#: utils/misc/guc.c:967
-msgid "Logs the host name in the connection logs."
-msgstr "Bağlantı günlüğünde makine adını kaydediyor."
-
-#: utils/misc/guc.c:968
-msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty."
-msgstr "Vasayılan ayarında bağlantı günlüğünde sadece IP adresi yazılıyor. Eğer makine adının de kaydedilmesini istiyorsanız bu ayarı açın ancak bu durumda maine adı çözümlemesi küçük bir performans düşüşüne sebep olacaktır."
-
-#: utils/misc/guc.c:978
-msgid "Causes subtables to be included by default in various commands."
-msgstr "Çeşitli komutlara varsayılan olarak alt tabloların eklenmesine sebep olacak."
-
-#: utils/misc/guc.c:986
-msgid "Encrypt passwords."
-msgstr "Parolaları şifrele."
-
-#: utils/misc/guc.c:987
-msgid "When a password is specified in CREATE USER or ALTER USER without writing either ENCRYPTED or UNENCRYPTED, this parameter determines whether the password is to be encrypted."
-msgstr "CREATE USER veya ALTER USER komutunda şifre verilmiş ancak ENCRYPTED veya UNENCRYPTED verilmemiş ise bu parametre şifrenin şifrelenmiş olyp olmayacağını belirtiyor."
-
-#: utils/misc/guc.c:996
-msgid "Treats \"expr=NULL\" as \"expr IS NULL\"."
-msgstr "\"expr=NULL\"  ifadesini \"expr IS NULL\" olarak yorumlanıyor."
-
-#: utils/misc/guc.c:997
-msgid "When turned on, expressions of the form expr = NULL (or NULL = expr) are treated as expr IS NULL, that is, they return true if expr evaluates to the null value, and false otherwise. The correct behavior of expr = NULL is to always return null (unknown)."
-msgstr "Çık ise, expr = NULL (veya NULL = expr)  şeklindeki ifadeler xpr IS NULL olarak algılanıyor, yani expr eğer null sonuç veriyorsa true, aksi taktirde false sonuçu getiriyor. Doğru davranış ise exp = NULL ifadesinin her zamn null döndürmesidir."
-
-#: utils/misc/guc.c:1008
-msgid "Enables per-database user names."
-msgstr "Veritabanı bazlı kullanıcı isimlerini etkinleştiriyor."
-
-#: utils/misc/guc.c:1017
-msgid "This parameter doesn't do anything."
-msgstr "Bu parametre bir şey yapmıyor."
-
-#: utils/misc/guc.c:1018
-msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients."
-msgstr "Bu ayar 7.3 istemcilerin göndereceği SET AUTOCOMMIT TO ON komutunu doğru yorumlamak için konulmuştır."
-
-#: utils/misc/guc.c:1026
-msgid "Sets the default read-only status of new transactions."
-msgstr "Yeni transactionlar için salt okunur durumunu ayarlıyor."
-
-#: utils/misc/guc.c:1034
-msgid "Sets the current transaction's read-only status."
-msgstr "Geçerli transactionlar için salt okunur durumunu ayarlıyor."
-
-#: utils/misc/guc.c:1043
-msgid "Automatically adds missing table references to FROM clauses."
-msgstr "FROM tümcesine eksik tabloları ekliyor."
-
-#: utils/misc/guc.c:1051
-msgid "Check function bodies during CREATE FUNCTION."
-msgstr "CREATE FUNCTION sırasında fonksiyon gövdelerini kontrol ediyor."
-
-#: utils/misc/guc.c:1059
-msgid "Enable input of NULL elements in arrays."
-msgstr "Arrayların çıktılarında NULL elemntlerinin yansıtmasını etkinleştir."
-
-#: utils/misc/guc.c:1060
-msgid "When turned on, unquoted NULL in an array input value means a null value; otherwise it is taken literally."
-msgstr "Açık olduğunda, array girdisinde tırnak içinde alınmamış NULL değeri null anlamına gelir; aksi taktirde değer, olduğu gibi kabul edilir."
-
-#: utils/misc/guc.c:1069
-msgid "Create new tables with OIDs by default."
-msgstr "Varsayılan olarak yeni tabloları OID ile oluştur."
-
-#: utils/misc/guc.c:1077
-#, fuzzy
-msgid "Start a subprocess to capture stderr output and/or csvlogs into log files."
-msgstr "stderr çıktısını günlük dosyasın kaydetmek için bir alt sürecini çalıştırıyor"
-
-#: utils/misc/guc.c:1085
-msgid "Truncate existing log files of same name during log rotation."
-msgstr "Günlük dosyaları döndürme sırasında aynı isimle var olan günlük dosyaları kesiyor."
-
-#: utils/misc/guc.c:1095
-msgid "Emit information about resource usage in sorting."
-msgstr "Alfabetik sıralama sırasında kaynak kullanımı hakkında bilgi ver."
-
-#: utils/misc/guc.c:1108
-#, fuzzy
-msgid "Generate debugging output for synchronized scanning."
-msgstr "LISTEN ve NOTIFY için hata ayıklama çıkışını üretiyor."
-
-#: utils/misc/guc.c:1122
-msgid "Enable bounded sorting using heap sort."
-msgstr ""
-
-#: utils/misc/guc.c:1134
-msgid "Emit WAL-related debugging output."
-msgstr "WAL ile ilgili hata ayıklama çıktısını yayıyor."
-
-#: utils/misc/guc.c:1145
-msgid "Datetimes are integer based."
-msgstr "Datetime veri tipleri tam sayı bazlıdır"
-
-#: utils/misc/guc.c:1159
-#, fuzzy
-msgid "Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."
-msgstr "Kerberos kullanıcı adları büyük ve küçük harf duyarıl olup olmayacağını belirtiyor."
-
-#: utils/misc/guc.c:1168
-msgid "Warn about backslash escapes in ordinary string literals."
-msgstr "Standart satırlarındaters taksimler kullanıldığında uyar."
-
-#: utils/misc/guc.c:1177
-msgid "Causes '...' strings to treat backslashes literally."
-msgstr "'...' satırları ters taksimleri olduğu gibi algılmasını belirtiyor."
-
-#: utils/misc/guc.c:1187
-#, fuzzy
-msgid "Enable synchronized sequential scans."
-msgstr "Planlayıcının sequential-scan planları kullanmaya izin ver."
-
-#: utils/misc/guc.c:1196
-msgid "Allows archiving of WAL files using archive_command."
-msgstr "WAL dosyalarının archive_command kullanarak arşivlenmesine izin verir."
-
-#: utils/misc/guc.c:1205
-msgid "Allows modifications of the structure of system tables."
-msgstr "Sistem tablolarının yapısının değiştirilmesine izin veriyor"
-
-#: utils/misc/guc.c:1215
-msgid "Disables reading from system indexes."
-msgstr "Sistem indekslerinden okumayı engeller."
-
-#: utils/misc/guc.c:1216
-msgid "It does not prevent updating the indexes, so it is safe to use.  The worst consequence is slowness."
-msgstr "Indekslerinin değiştirmesini engellemediği için zarasızdır. En kötü sonuç yavaşlamadır."
-
-#: utils/misc/guc.c:1235
-msgid "Forces a switch to the next xlog file if a new file has not been started within N seconds."
-msgstr "yeni xlog dosyası N saniye olşmamışsa log switch yapılacaktır"
-
-#: utils/misc/guc.c:1245
-msgid "Waits N seconds on connection startup after authentication."
-msgstr "İstemci kimlik doğrulamasından sonra N saniye bekiyor."
-
-#: utils/misc/guc.c:1246
-#: utils/misc/guc.c:1584
-msgid "This allows attaching a debugger to the process."
-msgstr "Hata ayıklayıcının bağlanmasına izin veriyor."
-
-#: utils/misc/guc.c:1254
-msgid "Sets the default statistics target."
-msgstr "Varsayılan istatistik hedefi ayarlıyor."
-
-#: utils/misc/guc.c:1255
-msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS."
-msgstr "ALTER TABLE SET STATISTICS komutuyla sütun bazlı hedef ayarlanmamışsa bu seçenek uygulanır."
-
-#: utils/misc/guc.c:1263
-msgid "Sets the FROM-list size beyond which subqueries are not collapsed."
-msgstr "FROM listesi bu boyuttan büyükse alt sorguları araltılmayacaktır."
-
-#: utils/misc/guc.c:1265
-msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items."
-msgstr "FROM listesinde bu değerinden az öğe varse, planlayıcı alt sorgularını üst sorgu ile birleştirecek."
-
-#: utils/misc/guc.c:1274
-msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened."
-msgstr "FROM listesi uzunluğu bu değerden büyükse JOIN ifadeler düzleştirilmeyecektir."
-
-#: utils/misc/guc.c:1276
-msgid "The planner will flatten explicit JOIN constructs into lists of FROM items whenever a list of no more than this many items would result."
-msgstr "Listede bu değerden daha çok nesne olursa, planlayıcısı belirlenmiş JOIN ifadeleri FROM nesnelerin listesine çevirecektir."
-
-#: utils/misc/guc.c:1285
-msgid "Sets the threshold of FROM items beyond which GEQO is used."
-msgstr "FROM öğe sayısı bu eşiği geçince GEQO kullanılacaktır."
-
-#: utils/misc/guc.c:1293
-msgid "GEQO: effort is used to set the default for other GEQO parameters."
-msgstr "GEQO: diğer GEQO parametreleri ayarlam için effort kullanılıyor."
-
-#: utils/misc/guc.c:1301
-msgid "GEQO: number of individuals in the population."
-msgstr "GEQO: nüfusun içinde kişi sayısı."
-
-#: utils/misc/guc.c:1302
-#: utils/misc/guc.c:1310
-msgid "Zero selects a suitable default value."
-msgstr "Sıfır ise uygun bir varsayılan değer atanıyor."
-
-#: utils/misc/guc.c:1309
-msgid "GEQO: number of iterations of the algorithm."
-msgstr "GEQO: algoritm döngü sayısı."
-
-#: utils/misc/guc.c:1319
-msgid "Sets the time to wait on a lock before checking for deadlock."
-msgstr "Bir lock üzerinde deadlock kontrolü yapmadan geçmesi gereken süreyi bielirtiyor."
-
-#: utils/misc/guc.c:1337
-msgid "Sets the maximum number of concurrent connections."
-msgstr "Maksimum bağlantı sayısını ayarlıyor."
-
-#: utils/misc/guc.c:1346
-msgid "Sets the number of connection slots reserved for superusers."
-msgstr "Superuser için rezerve edilmiş bağlantı sayısını ayarlıyor."
-
-#: utils/misc/guc.c:1355
-msgid "Sets the number of shared memory buffers used by the server."
-msgstr "Sunucu tarafıundan kullanılacak shared memory arabellek sayısını ayarlıyor."
-
-#: utils/misc/guc.c:1365
-msgid "Sets the maximum number of temporary buffers used by each session."
-msgstr "Her oturumun kullanabileceği en yüksek geçici buffer sayısı"
-
-#: utils/misc/guc.c:1375
-msgid "Sets the TCP port the server listens on."
-msgstr "Sunucun dinleyeceği TCP port numarasını ayarlıyor."
-
-#: utils/misc/guc.c:1384
-msgid "Sets the access permissions of the Unix-domain socket."
-msgstr "Unix-domain socket erişim haklarını ayarlıyor."
-
-#: utils/misc/guc.c:1385
-#, fuzzy
-msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter value is expected to be a numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
-msgstr "Unix-domain yvaları, standart Unix dosya sistemi izin altyapısını kullanıyor. Parametresi chmod ve umask sistem çağırılarının kabul edeceği biçimde numerik bir değerdir. (Sekizli sayı sistemi ile bir değer girecekseniz onu 0 (sıfır) ile başlatmalısınız.)"
-
-#: utils/misc/guc.c:1397
-msgid "Sets the maximum memory to be used for query workspaces."
-msgstr "Sorgu çalışma alanları için kullanılacak en büyük bellek boyutu belirliyor."
-
-#: utils/misc/guc.c:1398
-msgid "This much memory can be used by each internal sort operation and hash table before switching to temporary disk files."
-msgstr "Geçici disk dosyalarına başvurmadan dahili sort ve hash tablo işlemleirinin kullanabileceği bellek boyutu ayarlar."
-
-#: utils/misc/guc.c:1409
-msgid "Sets the maximum memory to be used for maintenance operations."
-msgstr "Bakım işlemleri için kullanılacak en büyük bellek boyutu belirler."
-
-#: utils/misc/guc.c:1410
-msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr "Bu değer VACUUM ve CREATE INDEX gibi işlemleri için de geçerlidir."
-
-#: utils/misc/guc.c:1419
-msgid "Sets the maximum stack depth, in kilobytes."
-msgstr "Kilobay olarak en büyük yığın boyutu ayarlar."
-
-#: utils/misc/guc.c:1429
-msgid "Vacuum cost for a page found in the buffer cache."
-msgstr "Buffer cache içinde bulunan bir sayfanın vacuum işleme masrafı."
-
-#: utils/misc/guc.c:1438
-msgid "Vacuum cost for a page not found in the buffer cache."
-msgstr "Buffer cache içinde bulunamayan bir sayfanın vacuum işleme masrafı."
-
-#: utils/misc/guc.c:1447
-msgid "Vacuum cost for a page dirtied by vacuum."
-msgstr "Vacuum tarafında değiştirilecek sayfanın işleme masrafı."
-
-#: utils/misc/guc.c:1456
-msgid "Vacuum cost amount available before napping."
-msgstr "Vacuum işleminin uyku durumuna geçmeden önce ne kadar işlem yapması. Yani bir geçişte ne kadar işlem yapacağı."
-
-#: utils/misc/guc.c:1465
-msgid "Vacuum cost delay in milliseconds."
-msgstr "Vacuum iÅŸleminin milisaniye deÄŸeri."
-
-#: utils/misc/guc.c:1475
-msgid "Vacuum cost delay in milliseconds, for autovacuum."
-msgstr "Vacuum işleminin masrafının milisaniye değeri (autovacuum için)."
-
-#: utils/misc/guc.c:1485
-msgid "Vacuum cost amount available before napping, for autovacuum."
-msgstr "Vacuum işleminin uyku durumuna geçmeden önce ne kadar işlem yapması. Yani bir geçişte ne kadar işlem yapacağı."
-
-#: utils/misc/guc.c:1494
-msgid "Sets the maximum number of simultaneously open files for each server process."
-msgstr "Her sunucu sürecinin içi aynı anda olabilecek en büyük açık dosya sayısı."
-
-#: utils/misc/guc.c:1503
-msgid "Sets the maximum number of simultaneously prepared transactions."
-msgstr "Aynı zamanda olabilecek en çok prepared transaction sayısı."
-
-#: utils/misc/guc.c:1533
-msgid "Sets the maximum allowed duration of any statement."
-msgstr "Bir sorgunun en çok çalışma zamanı."
-
-#: utils/misc/guc.c:1534
-msgid "A value of 0 turns off the timeout."
-msgstr "0 (sıfır) değeri, zaman aşımını kapatıyor."
-
-#: utils/misc/guc.c:1543
-msgid "Minimum age at which VACUUM should freeze a table row."
-msgstr "VACUUM, satırın üzerinde freeze işlemi yapabilecek yaşlılık süresi."
-
-#: utils/misc/guc.c:1552
-#, fuzzy
-msgid "Age at which VACUUM should scan whole table to freeze tuples."
-msgstr "VACUUM, satırın üzerinde freeze işlemi yapabilecek yaşlılık süresi."
-
-#: utils/misc/guc.c:1561
-msgid "Sets the maximum number of locks per transaction."
-msgstr "Bir transaction içinde en yüksek olabilecek kilit sayısı."
-
-#: utils/misc/guc.c:1562
-msgid "The shared lock table is sized on the assumption that at most max_locks_per_transaction * max_connections distinct objects will need to be locked at any one time."
-msgstr "Bu tablonun boyutu, max_locks_per_transaction * max_connections kadar ayrı nesneye bir anda kilit uygulamaya gerektiğini göz önünde bulundurarak ayarlanır."
-
-#: utils/misc/guc.c:1572
-msgid "Sets the maximum allowed time to complete client authentication."
-msgstr "İstemci kimlik doğrulamasını yapmak için zaman sınırı ayarlar."
-
-#: utils/misc/guc.c:1583
-msgid "Waits N seconds on connection startup before authentication."
-msgstr "İstemci kimlik doğrulamasından önce N saniye bekiyor."
-
-#: utils/misc/guc.c:1593
-msgid "Sets the maximum distance in log segments between automatic WAL checkpoints."
-msgstr "Otomatic WAL denetim noktaları (checkpoint) arasında katedilecek log segment saytısı."
-
-#: utils/misc/guc.c:1602
-msgid "Sets the maximum time between automatic WAL checkpoints."
-msgstr "Otomatic WAL denetim noktaları (checkpoint) arasında geçecek zaman dilimi."
-
-#: utils/misc/guc.c:1612
-msgid "Enables warnings if checkpoint segments are filled more frequently than this."
-msgstr "Eğer log denetim noktası (checkpoint) bu değerden daha sık oluyorsa günlüğüne bir not düş."
-
-#: utils/misc/guc.c:1614
-msgid "Write a message to the server log if checkpoints caused by the filling of checkpoint segment files happens more frequently than this number of seconds. Zero turns off the warning."
-msgstr "Checkpoint segment dosyaların dolması nedeniyle denetim noktası (checkpoint) olayı bu değerdeki saniye sayısından daha sık oluyorsa sunucu günlük dosyasına not düş. Sıfır ise bu uyarıyı kapat."
-
-#: utils/misc/guc.c:1625
-msgid "Sets the number of disk-page buffers in shared memory for WAL."
-msgstr "WAL için shared memory arabellek disk-sayfa sayısı."
-
-#: utils/misc/guc.c:1635
-#, fuzzy
-msgid "WAL writer sleep time between WAL flushes."
-msgstr "Background writer'in seferleri arasında hareketsiz kalacağı zaman süresi."
-
-#: utils/misc/guc.c:1645
-msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk."
-msgstr "Transaction commit ile WAL dosyaların diske yazılması arasında milisaniye olarak gecikme süresi ayarlar."
-
-#: utils/misc/guc.c:1655
-msgid "Sets the minimum concurrent open transactions before performing commit_delay."
-msgstr "commit_delay uygulamadan önce en az bu değer koşutzamanlı transaction olacak."
-
-#: utils/misc/guc.c:1665
-msgid "Sets the number of digits displayed for floating-point values."
-msgstr "Floating-point değerlerinde gösterilecek rakam asyısı ayarlar."
-
-#: utils/misc/guc.c:1666
-msgid "This affects real, double precision, and geometric data types. The parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate)."
-msgstr "Bu ayar, real, double precision ve geometrik veri tiplerinde klullanılır. Bu değer, standart  rakam sayısına eklenmektedir (FLT_DIG veya DBL_DIG)."
-
-#: utils/misc/guc.c:1676
-msgid "Sets the minimum execution time above which statements will be logged."
-msgstr "Bu süreden uzun süre çalışacak sorgular log dosyasına yazılacaktır."
-
-#: utils/misc/guc.c:1678
-#, fuzzy
-msgid "Zero prints all queries. -1 turns this feature off."
-msgstr "Sifir ise tüm sorguları yazılacak. Varsayılan değer -1 (bu özellik kapalıdır)."
-
-#: utils/misc/guc.c:1687
-msgid "Sets the minimum execution time above which autovacuum actions will be logged."
-msgstr "Autovacuum bu süreden çok zaman alırsa, eylemleri ayda alınacaktır."
-
-#: utils/misc/guc.c:1689
-#, fuzzy
-msgid "Zero prints all actions. -1 turns autovacuum logging off."
-msgstr "Sifir ise tüm eylemleri yazılacak. Varsayılan değer -1 (bu özellik kapalıdır)."
-
-#: utils/misc/guc.c:1698
-msgid "Background writer sleep time between rounds."
-msgstr "Background writer'in seferleri arasında hareketsiz kalacağı zaman süresi."
-
-#: utils/misc/guc.c:1708
-msgid "Background writer maximum number of LRU pages to flush per round."
-msgstr "Her seferinde background writer'in diske yazaçağı LRU sayfaların maximum sayısı."
-
-#: utils/misc/guc.c:1723
-msgid "Number of simultaneous requests that can be handled efficiently by the disk subsystem."
-msgstr ""
-
-#: utils/misc/guc.c:1724
-msgid "For RAID arrays, this should be approximately the number of drive spindles in the array."
-msgstr ""
-
-#: utils/misc/guc.c:1737
-msgid "Automatic log file rotation will occur after N minutes."
-msgstr "Otomatik log dosya değişimi N dakikada bir gerçekleşecek."
-
-#: utils/misc/guc.c:1747
-msgid "Automatic log file rotation will occur after N kilobytes."
-msgstr "Otomatik olg dosya değişimi N kilobayttan sonra gerçekleşecek."
-
-#: utils/misc/guc.c:1757
-msgid "Shows the maximum number of function arguments."
-msgstr "Fonksiyon argünamlarının olabileceği en büyük sayısını gösteriyor."
-
-#: utils/misc/guc.c:1767
-msgid "Shows the maximum number of index keys."
-msgstr "İndeks değerlerinin olabileceği en büyük sayısını gösteriyor."
-
-#: utils/misc/guc.c:1777
-msgid "Shows the maximum identifier length."
-msgstr "Bır tanıtıcının en maximum uzunluğunu gösteriyor."
-
-#: utils/misc/guc.c:1787
-msgid "Shows the size of a disk block."
-msgstr "Bir disk blokunun boyutunu gösteriyor."
-
-#: utils/misc/guc.c:1797
-#, fuzzy
-msgid "Shows the number of pages per disk file."
-msgstr "Bir disk blokunun boyutunu gösteriyor."
-
-#: utils/misc/guc.c:1807
-msgid "Shows the block size in the write ahead log."
-msgstr ""
-
-#: utils/misc/guc.c:1817
-msgid "Shows the number of pages per write ahead log segment."
-msgstr ""
-
-#: utils/misc/guc.c:1830
-msgid "Time to sleep between autovacuum runs."
-msgstr "Autovacuum çalıştırmaları arasında bekleme zamanı."
-
-#: utils/misc/guc.c:1839
-msgid "Minimum number of tuple updates or deletes prior to vacuum."
-msgstr "Vacuum işleminin başlaması için gereken düşük tuple update veya deleta sayısı."
-
-#: utils/misc/guc.c:1847
-msgid "Minimum number of tuple inserts, updates or deletes prior to analyze."
-msgstr "Analyze işleminin başlaması için gereken düşük tuple insert, update veya deleta sayısı."
-
-#: utils/misc/guc.c:1856
-msgid "Age at which to autovacuum a table to prevent transaction ID wraparound."
-msgstr "ID sarımı önemek için autovacuum yapılacağı yaşlılık değeri."
-
-#: utils/misc/guc.c:1865
-msgid "Sets the maximum number of simultaneously running autovacuum worker processes."
-msgstr "Aynı anda çalışacak autovacuum süreç sayısını ayarlıyor."
-
-#: utils/misc/guc.c:1874
-msgid "Time between issuing TCP keepalives."
-msgstr "TCP keepalive göndermelerin arasında saniye sayısı."
-
-#: utils/misc/guc.c:1875
-#: utils/misc/guc.c:1885
-msgid "A value of 0 uses the system default."
-msgstr "0 (sıfır) değeri, sistem varsayılan değeri etkinleştirir."
-
-#: utils/misc/guc.c:1884
-msgid "Time between TCP keepalive retransmits."
-msgstr "TCP keepalive yeniden göndermelerin arasında saniye sayısı."
-
-#: utils/misc/guc.c:1894
-msgid "Maximum number of TCP keepalive retransmits."
-msgstr "En yüksek TCP keepalive gönderme sayısı."
-
-#: utils/misc/guc.c:1895
-msgid "This controls the number of consecutive keepalive retransmits that can be lost before a connection is considered dead. A value of 0 uses the system default."
-msgstr "Keepalive açıkken, bir bağlantının kopmuş olmasını sayılamadan gönderilecek mükerrer paket sayısı. 0 (sıfır) değeri sistemdeki varsayılan eğerini alıyor."
-
-#: utils/misc/guc.c:1905
-msgid "Sets the maximum allowed result for exact search by GIN."
-msgstr "GIN sorgulaması için izin verilen en yüksek sonuç sayısı."
-
-#: utils/misc/guc.c:1915
-msgid "Sets the planner's assumption about the size of the disk cache."
-msgstr "Disk cache boyutu hakkında planner'in tahmini değerini belirtiyor."
-
-#: utils/misc/guc.c:1916
-msgid "That is, the portion of the kernel's disk cache that will be used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
-msgstr "Yani kernel'in disk cache alanının PostgreSQL veri dosyaları için kullanılacak kısmının tahmini. Bu deşer, disk page birimleriyle giriliyor, bir disk page genellikle 8 kilobayttır."
-
-#: utils/misc/guc.c:1928
-msgid "Shows the server version as an integer."
-msgstr "Sunucunun sürümünü tamsayı olarak gösteriyor."
-
-#: utils/misc/guc.c:1938
-msgid "Log the use of temporary files larger than this number of kilobytes."
-msgstr "Bu kadar kilobayttan büyük geçici dosya kullanıldığında log tutuyor."
-
-#: utils/misc/guc.c:1939
-msgid "Zero logs all files. The default is -1 (turning this feature off)."
-msgstr "Sifir, tüm dosyaları logluyor. Varsayılan değer -1 (bu özellik kapalıdır)."
-
-#: utils/misc/guc.c:1948
-msgid "Sets the size reserved for pg_stat_activity.current_query, in bytes."
-msgstr ""
-
-#: utils/misc/guc.c:1966
-msgid "Sets the planner's estimate of the cost of a sequentially fetched disk page."
-msgstr "Dıskten sırayla sayfa okuması için harcanacak işlem zamanı tahminini belirtiyor."
-
-#: utils/misc/guc.c:1975
-msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page."
-msgstr "Nonsequential disk page getirme işlemlerin tahmini zamanı belirtiyor."
-
-#: utils/misc/guc.c:1984
-msgid "Sets the planner's estimate of the cost of processing each tuple (row)."
-msgstr "Bir satır işlemek için harcanacak işlem zamanı tahminini belirtiyor."
-
-#: utils/misc/guc.c:1993
-msgid "Sets the planner's estimate of the cost of processing each index entry during an index scan."
-msgstr "Bir index taraması sırasında indexin her satırının taramasını yapmak için harcanacak işlem zamanı tahminini belirtiyor."
-
-#: utils/misc/guc.c:2002
-msgid "Sets the planner's estimate of the cost of processing each operator or function call."
-msgstr "Bir operator veya fonksiyon çağırımı yapmak için harcanacak işlem zamanı tahminini belirtiyor."
-
-#: utils/misc/guc.c:2012
-#, fuzzy
-msgid "Sets the planner's estimate of the fraction of a cursor's rows that will be retrieved."
-msgstr "Bir satır işlemek için harcanacak işlem zamanı tahminini belirtiyor."
-
-#: utils/misc/guc.c:2022
-msgid "GEQO: selective pressure within the population."
-msgstr "GEQO: selective pressure within the population. Oha be, query'yi mi optimize ediyoruz, piliç mi yetiştiriyoruz, yuh."
-
-#: utils/misc/guc.c:2032
-#, fuzzy
-msgid "Multiple of the average buffer usage to free per round."
-msgstr "Her seferinde background writer'in diske yazaçağı LRU bufferlerin yüzdesi."
-
-#: utils/misc/guc.c:2041
-msgid "Sets the seed for random-number generation."
-msgstr "Random-number üretimi için seed değerini belirtiyor."
-
-#: utils/misc/guc.c:2051
-msgid "Number of tuple updates or deletes prior to vacuum as a fraction of reltuples."
-msgstr "Vacuum işleminin başlaması için en düşük tuple update ve delete sayısı (retuple bölümü olarak)."
-
-#: utils/misc/guc.c:2059
-msgid "Number of tuple inserts, updates or deletes prior to analyze as a fraction of reltuples."
-msgstr "Analyze işleminin başlaması için en düşük tuple insert, update ve delete sayısı (retuple bölümü olarak)."
-
-#: utils/misc/guc.c:2068
-msgid "Time spent flushing dirty buffers during checkpoint, as fraction of checkpoint interval."
-msgstr ""
-
-#: utils/misc/guc.c:2086
-msgid "Sets the shell command that will be called to archive a WAL file."
-msgstr "WAL dosyasını arşivlemek için çağırılacak kabuk komutunu ayarlıyor ."
-
-#: utils/misc/guc.c:2095
-msgid "Sets the client's character set encoding."
-msgstr "İstemci karakter kodlamasını belirtiyor."
-
-#: utils/misc/guc.c:2105
-msgid "Controls information prefixed to each log line."
-msgstr "Log satırlarının başlarına eklenecek bilgiyi ayarlıyor."
-
-#: utils/misc/guc.c:2106
-msgid "If blank, no prefix is used."
-msgstr "Boş ise ön ek kullanlmayacak."
-
-#: utils/misc/guc.c:2114
-#, fuzzy
-msgid "Sets the time zone to use in log messages."
-msgstr "Log mesajlarının ayrıntı düzei belirtiyor."
-
-#: utils/misc/guc.c:2123
-msgid "Sets the display format for date and time values."
-msgstr "Tarih ve zaman girişleri için biçim maskesini belirtiyor."
-
-#: utils/misc/guc.c:2124
-msgid "Also controls interpretation of ambiguous date inputs."
-msgstr "Ayrıca belirsiz tarih girişinin yorumlamasını belirtiyor."
-
-#: utils/misc/guc.c:2134
-msgid "Sets the default tablespace to create tables and indexes in."
-msgstr "İndeksleri oluşturma işemi için varsayılan tablespace ayarlıyor"
-
-#: utils/misc/guc.c:2135
-msgid "An empty string selects the database's default tablespace."
-msgstr "Boş değer, veritabanının varsayılan tablespace'ı seçmektedir."
-
-#: utils/misc/guc.c:2144
-#, fuzzy
-msgid "Sets the tablespace(s) to use for temporary tables and sort files."
-msgstr "İndeksleri oluşturma işemi için varsayılan tablespace ayarlıyor"
-
-#: utils/misc/guc.c:2154
-msgid "Sets the path for dynamically loadable modules."
-msgstr "Dinamik yüklenebilen modülleri arama dizinlerini belirtiyor."
-
-#: utils/misc/guc.c:2155
-msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e., the name does not contain a slash), the system will search this path for the specified file."
-msgstr "Bir dinamik kütüphane açmak gerektiğinde dosya adında dizin kısmı yoksa (dosya adın içinde taksim kararkteri yoksa), sistem, kütüphaneleri bulmak için bu dizinleri arayacak."
-
-#: utils/misc/guc.c:2167
-msgid "Sets the location of the Kerberos server key file."
-msgstr "Kerberos server key dosyasının yerini belirtiyor."
-
-#: utils/misc/guc.c:2177
-msgid "Sets the name of the Kerberos service."
-msgstr "Kerberos sevice adını belirtiyor."
-
-#: utils/misc/guc.c:2186
-msgid "Sets the Bonjour broadcast service name."
-msgstr "Bonjour broadcast service adını belirtiyor."
-
-#: utils/misc/guc.c:2197
-msgid "Shows the collation order locale."
-msgstr "Alfabetik sıralamasında kullanılacak locale ayarı gösteriyor."
-
-#: utils/misc/guc.c:2207
-msgid "Shows the character classification and case conversion locale."
-msgstr "Karakter sınıflandırılması ve büyük/küçük çevirme işlemlerinde kullanıcak locale ayarı gösteriyor."
-
-#: utils/misc/guc.c:2217
-msgid "Sets the language in which messages are displayed."
-msgstr "Mesajlarda kullanılacak dili belirtiyor."
-
-#: utils/misc/guc.c:2226
-msgid "Sets the locale for formatting monetary amounts."
-msgstr "Parasal değerlerinin biçimlendirilmesinde kullanılacak locale ayarını belirtiyor."
-
-#: utils/misc/guc.c:2235
-msgid "Sets the locale for formatting numbers."
-msgstr "Sayısal değerlerinin biçimlendirilmesinde kullanılacak locale ayarını belirtiyor."
-
-#: utils/misc/guc.c:2244
-msgid "Sets the locale for formatting date and time values."
-msgstr "Tarih ve zaman değerlerinin biçimlendirilmesinde kullanılacak locale ayarını belirtiyor."
-
-#: utils/misc/guc.c:2253
-msgid "Lists shared libraries to preload into server."
-msgstr "Sunucuya yüklenmiş ortak kütüphaneleri gösteriyor."
-
-#: utils/misc/guc.c:2263
-msgid "Lists shared libraries to preload into each backend."
-msgstr "Her sunucuya yüklenenecek ortak kütüphaneleri gösteriyor."
-
-#: utils/misc/guc.c:2273
-msgid "Sets the schema search order for names that are not schema-qualified."
-msgstr "Şema belirtilmediği takdirde isimlerin hangi şemalarda aranacağını belirtir."
-
-#: utils/misc/guc.c:2284
-msgid "Sets the server (database) character set encoding."
-msgstr "Sunucu (veritabanı) karakter seti kodlamasını belirtiyor."
-
-#: utils/misc/guc.c:2295
-msgid "Shows the server version."
-msgstr "Sunucunun sürümünü gösteriyor."
-
-#: utils/misc/guc.c:2306
-msgid "Sets the current role."
-msgstr "Geçerli rolü belirtiyor."
-
-#: utils/misc/guc.c:2317
-msgid "Sets the session user name."
-msgstr "Oturum açan kullanıcının ismini gösterir."
-
-#: utils/misc/guc.c:2327
-msgid "Sets the destination for server log output."
-msgstr "Log dosyaları için hedef dizini belirtiyor."
-
-#: utils/misc/guc.c:2328
-#, fuzzy
-msgid "Valid values are combinations of \"stderr\", \"syslog\", \"csvlog\", and \"eventlog\", depending on the platform."
-msgstr "Geçerli değerler, platforma bağlı olarak: \"stderr\", \"syslog\", and \"eventlog\"."
-
-#: utils/misc/guc.c:2338
-msgid "Sets the destination directory for log files."
-msgstr "Log dosyaları için hedef dizini belirtiyor."
-
-#: utils/misc/guc.c:2339
-msgid "Can be specified as relative to the data directory or as absolute path."
-msgstr "Bu değer hem veri dizininden göreceli hem de tam yol olabilir."
-
-#: utils/misc/guc.c:2348
-msgid "Sets the file name pattern for log files."
-msgstr "Log dosyaları için kulanılacak şablonu belirtiyor."
-
-#: utils/misc/guc.c:2359
-msgid "Sets the program name used to identify PostgreSQL messages in syslog."
-msgstr "Syslog içinde PostgreSQL mesajlarının kaynak olacağı program adını belirtiyor."
-
-#: utils/misc/guc.c:2370
-msgid "Sets the time zone for displaying and interpreting time stamps."
-msgstr "Time stamp veri tipini çıktısında kullanılacak zaman dilimi belirtiyor."
-
-#: utils/misc/guc.c:2379
-msgid "Selects a file of time zone abbreviations."
-msgstr "Timezone kısaltmaların olduğu dosyayı seçer."
-
-#: utils/misc/guc.c:2388
-msgid "Sets the current transaction's isolation level."
-msgstr "Transaction isolation level belirtiyor."
-
-#: utils/misc/guc.c:2398
-msgid "Sets the owning group of the Unix-domain socket."
-msgstr "Unix-domain socket grup sahipliÄŸini belirtiyor."
-
-#: utils/misc/guc.c:2399
-msgid "The owning user of the socket is always the user that starts the server."
-msgstr "Socket sahibi her zamn sunucu çalıştıran kullanıcıdır."
-
-#: utils/misc/guc.c:2408
-msgid "Sets the directory where the Unix-domain socket will be created."
-msgstr "Unix-domain socket yarıtılacak dizinini belirtiyor."
-
-#: utils/misc/guc.c:2418
-msgid "Sets the host name or IP address(es) to listen to."
-msgstr "Dinlenecek host adı veya IP adresleri belirtiyor."
-
-#: utils/misc/guc.c:2428
-msgid "Sets the list of known custom variable classes."
-msgstr "Bilinen custom variable classes listesini belirtiyor."
-
-#: utils/misc/guc.c:2438
-msgid "Sets the server's data directory."
-msgstr "Sunucusunun veri dizini belirtiyor."
-
-#: utils/misc/guc.c:2448
-msgid "Sets the server's main configuration file."
-msgstr "Sunucunun ana konfigorasyon dosyasının yerini belirtiyor."
-
-#: utils/misc/guc.c:2458
-msgid "Sets the server's \"hba\" configuration file."
-msgstr "Sunucusunun \"hba\" konfigurasyon dosyasını belirtiyor."
-
-#: utils/misc/guc.c:2468
-msgid "Sets the server's \"ident\" configuration file."
-msgstr "Sunucusunun \"ident\" konfigurasyon dosyasını belirtiyor."
-
-#: utils/misc/guc.c:2478
-msgid "Writes the postmaster PID to the specified file."
-msgstr "postmaster PID numarası belirtilen dosyaya yazar."
-
-#: utils/misc/guc.c:2488
-#, fuzzy
-msgid "Writes temporary statistics files to the specified directory."
-msgstr "postmaster PID numarası belirtilen dosyaya yazar."
-
-#: utils/misc/guc.c:2498
-msgid "Sets default text search configuration."
-msgstr "Öntanımlı metin arama yapıkandırmasını ayarlar. "
-
-#: utils/misc/guc.c:2508
-msgid "Sets the list of allowed SSL ciphers."
-msgstr "İzin verilen SSL şifreleme algoritmaların listesini ayarlıyor."
-
-#: utils/misc/guc.c:2528
-msgid "Sets whether \"\\'\" is allowed in string literals."
-msgstr "Satır değişmezlerde \"\\'\" ifadesine izin verilip verilmeyeceğini belirtiyor."
-
-#: utils/misc/guc.c:2537
-msgid "Sets the message levels that are sent to the client."
-msgstr "İstemciye yollancak mesaj düzeylerini belirtiyor."
-
-#: utils/misc/guc.c:2538
-#: utils/misc/guc.c:2587
-#: utils/misc/guc.c:2597
-#, fuzzy
-msgid "Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
-msgstr "Geçerli değerler: DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, LOG, NOTICE, WARNING, and ERROR. Her düzey kendisinden daha büyük düzeyleri de kapsıyor. Düzey ne kadar yüksek ise o kadar az mesaj yollanıyor."
-
-#: utils/misc/guc.c:2547
-msgid "Enables the planner to use constraints to optimize queries."
-msgstr "Planlayıcının sorgularını optimize etmek için constraints kullanmasına izin verir."
-
-#: utils/misc/guc.c:2548
-#, fuzzy
-msgid "Table scans will be skipped if their constraints guarantee that no rows match the query."
-msgstr "Constrainler tarafından sorguya uyan hiçbir satır uymayacağı garantilenirse child table scan yapılmayacaktır"
-
-#: utils/misc/guc.c:2558
-msgid "Sets the transaction isolation level of each new transaction."
-msgstr "Her yeni transaction için transaction isolation level belirtiypr."
-
-#: utils/misc/guc.c:2567
-#, fuzzy
-msgid "Sets the display format for interval values."
-msgstr "Tarih ve zaman girişleri için biçim maskesini belirtiyor."
-
-#: utils/misc/guc.c:2577
-msgid "Sets the verbosity of logged messages."
-msgstr "Log mesajlarının ayrıntı düzei belirtiyor."
-
-#: utils/misc/guc.c:2586
-msgid "Sets the message levels that are logged."
-msgstr "Log dosyasına yazılacak mesajlarının düzeylerini belirtiyor."
-
-#: utils/misc/guc.c:2596
-msgid "Causes all statements generating error at or above this level to be logged."
-msgstr "Belirtilen ya da daha üst düzeyde hata yaratan komutlarının gol dosyasına yazılacağına sebep olur."
-
-#: utils/misc/guc.c:2606
-msgid "Sets the type of statements logged."
-msgstr "Log dosyasına yazılacak komutların tipini belirtiyor."
-
-#: utils/misc/guc.c:2616
-msgid "Sets the syslog \"facility\" to be used when syslog enabled."
-msgstr "Syslog aktif durumunda kullanılacak syslog \"facility\" değerini belirtiyor."
-
-#: utils/misc/guc.c:2626
-msgid "Sets the regular expression \"flavor\"."
-msgstr "\"flavor\" regular expression belirtiyor."
-
-#: utils/misc/guc.c:2635
-#, fuzzy
-msgid "Sets the session's behavior for triggers and rewrite rules."
-msgstr "Oturumun trigger ve rewrite rule davranışını belirtityor."
-
-#: utils/misc/guc.c:2645
-#, fuzzy
-msgid "Collects function-level statistics on database activity."
-msgstr "Veritabanı etkinliği sırasında istatistikleri toplar."
-
-#: utils/misc/guc.c:2654
-msgid "Selects the method used for forcing WAL updates to disk."
-msgstr "WAL değikliklerinin diske yazılış yöntemini belirtiyor."
-
-#: utils/misc/guc.c:2664
-msgid "Sets how binary values are to be encoded in XML."
-msgstr "İkili değerlerin XML içinde nasıl kodlanacağını belirtiyor."
-
-#: utils/misc/guc.c:2673
-msgid "Sets whether XML data in implicit parsing and serialization operations is to be considered as documents or content fragments."
-msgstr "Ayrıştırma ve serialization işlemlerde XML veri birer document mi yoksa conten fragment olarak mı sayılacağını belirtiyor."
-
-#: utils/misc/guc.c:3443
-#, c-format
-msgid ""
-"%s does not know where to find the server configuration file.\n"
-"You must specify the --config-file or -D invocation option or set the PGDATA environment variable.\n"
-msgstr ""
-"%s, greken konfigurasyon dosyasını bulamamaktadır.\n"
-"Bu dosyanın --config-file veya -D başlatma parametresi veya PGDATA enviroment değişkeni ile belirtilebilir.\n"
-
-#: utils/misc/guc.c:3462
-#, c-format
-msgid "%s cannot access the server configuration file \"%s\": %s\n"
-msgstr "%s sunucu konfigurasyon dosyasına \"%s\" erişilemiyor: %s\n"
-
-#: utils/misc/guc.c:3482
-#, c-format
-msgid ""
-"%s does not know where to find the database system data.\n"
-"This can be specified as \"data_directory\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s, greken veritabanı dosyaları bulamamaktadır.\n"
-"Dizinin yeri \"%s\" dosyasında \"data_directory\" değişkeninde, -D başlatma parametresi veya PGDATA enviroment değişkeni ile belirtilebilir.\n"
-
-#: utils/misc/guc.c:3513
-#, c-format
-msgid ""
-"%s does not know where to find the \"hba\" configuration file.\n"
-"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s, greken \"hba\" konfigurasyon dosyasını bulamamaktadır.\n"
-"Bu dosyanın yeri \"%s\" dosyasında \"hba_file\" değişkeninde, -D başlatma parametresi veya PGDATA enviroment değişkeni ile belirtilebilir.\n"
-
-#: utils/misc/guc.c:3536
-#, c-format
-msgid ""
-"%s does not know where to find the \"ident\" configuration file.\n"
-"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation option, or by the PGDATA environment variable.\n"
-msgstr ""
-"%s, greken \"ident\" konfigurasyon dosyasını bulamamaktadır.\n"
-"Bu dosyanın yeri \"%s\" dosyasında \"ident_file\" değişkeninde, başlatma parametresi -D veya PGDATA enviroment değişkeni ile belirtilebilir.\n"
-
-#: utils/misc/guc.c:4134
-#: utils/misc/guc.c:4302
-msgid "Value exceeds integer range."
-msgstr "Değer tamsayı aralığını aşıyor."
-
-#: utils/misc/guc.c:4157
-msgid "Valid units for this parameter are \"kB\", \"MB\", and \"GB\"."
-msgstr "Bu parametre için geçerli birimler \"kB\", \"MB\" ve \"GB\" 'dır."
-
-#: utils/misc/guc.c:4216
-msgid "Valid units for this parameter are \"ms\", \"s\", \"min\", \"h\", and \"d\"."
-msgstr "Bu parametre için geçerli birimler: \"ms\", \"s\", \"min\", \"h\", ve \"d\"."
-
-#: utils/misc/guc.c:4524
-#: utils/misc/guc.c:5143
-#: utils/misc/guc.c:5191
-#: utils/misc/guc.c:5312
-#: utils/misc/guc.c:5892
-#: utils/misc/guc.c:6033
-#: guc-file.l:216
-#, c-format
-msgid "unrecognized configuration parameter \"%s\""
-msgstr "\"%s\" bilinmeyen konfigurasyon parametresi"
-
-#: utils/misc/guc.c:4551
-#, c-format
-msgid "parameter \"%s\" cannot be changed"
-msgstr "\"%s\" parametresi deÄŸiÅŸtirilemez"
-
-#: utils/misc/guc.c:4568
-#: utils/misc/guc.c:4577
-#: guc-file.l:263
-#, fuzzy, c-format
-msgid "attempted change of parameter \"%s\" ignored"
-msgstr "\"%s\" parametresinin yeniden tanımlanma denemesi"
-
-#: utils/misc/guc.c:4570
-#: utils/misc/guc.c:4579
-#: guc-file.l:265
-#, fuzzy
-msgid "This parameter cannot be changed after server start."
-msgstr "\"%s\" parametresi, sunucu başlatıldıktan sonra değiştirilemez"
-
-#: utils/misc/guc.c:4588
-#, c-format
-msgid "parameter \"%s\" cannot be changed now"
-msgstr "\"%s\" parametresi ÅŸu anda deÄŸiÅŸtirilemez"
-
-#: utils/misc/guc.c:4618
-#, c-format
-msgid "parameter \"%s\" cannot be set after connection start"
-msgstr "\"%s\" parametresi bağlantı başlatıldıktan sonra değiştirilemez"
-
-#: utils/misc/guc.c:4628
-#, c-format
-msgid "permission denied to set parameter \"%s\""
-msgstr "\"%s\" parametresi değiştirmek için erişim hatası"
-
-#: utils/misc/guc.c:4681
-#, c-format
-msgid "parameter \"%s\" requires a Boolean value"
-msgstr "\"%s\" seçeneği boolean değerini alır"
-
-#: utils/misc/guc.c:4703
-#: utils/misc/guc.c:4778
-#, c-format
-msgid "invalid value for parameter \"%s\": %d"
-msgstr "\"%s\" seçeneği için geçersiz değer: %d"
-
-#: utils/misc/guc.c:4747
-#: utils/misc/guc.c:4949
-#: utils/misc/guc.c:5015
-#: utils/misc/guc.c:5041
-#: guc-file.l:177
-#, c-format
-msgid "invalid value for parameter \"%s\": \"%s\""
-msgstr "\"%s\" seçeneği için geçersiz değer: \"%s\""
-
-#: utils/misc/guc.c:4756
-#, c-format
-msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
-msgstr "\"%2$s\" parametresi için %1$d değer sıra dışıdır (%3$d .. %4$d)"
-
-#: utils/misc/guc.c:4820
-#, c-format
-msgid "parameter \"%s\" requires a numeric value"
-msgstr "\"%s\" seçeneği sayısal değer gerektirir."
-
-#: utils/misc/guc.c:4828
-#, c-format
-msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
-msgstr "\"%2$s\" parametresi için %1$g değer sıra dışıdır (%3$g .. %4$g)"
-
-#: utils/misc/guc.c:4850
-#, c-format
-msgid "invalid value for parameter \"%s\": %g"
-msgstr "\"%s\" seçeneği için geçersiz değer: %g"
-
-#: utils/misc/guc.c:5147
-#: utils/misc/guc.c:5195
-#: utils/misc/guc.c:6037
-#, c-format
-msgid "must be superuser to examine \"%s\""
-msgstr "\"%s\" değişkeninin değerini sorgulamak için superuser haklarına sahip olmalısınız"
-
-#: utils/misc/guc.c:5321
-#, c-format
-msgid "SET %s takes only one argument"
-msgstr "SET %s tek bir argüman alır"
-
-#: utils/misc/guc.c:5548
-msgid "SET requires parameter name"
-msgstr "SET komutu patametre adını gerektirir"
-
-#: utils/misc/guc.c:5663
-#, c-format
-msgid "attempt to redefine parameter \"%s\""
-msgstr "\"%s\" parametresinin yeniden tanımlanma denemesi"
-
-#: utils/misc/guc.c:6863
-#: utils/init/miscinit.c:1002
-#: commands/copy.c:2180
-#, c-format
-msgid "could not read from file \"%s\": %m"
-msgstr "\"%s\" dosyasından okuma hatası: %m"
-
-#: utils/misc/guc.c:6974
-#, c-format
-msgid "could not parse setting for parameter \"%s\""
-msgstr "\"%s\" parametresi için verilen değer çözümlenemiyor"
-
-#: utils/misc/guc.c:7165
-msgid "invalid list syntax for parameter \"log_destination\""
-msgstr "\"log_destination\" parametresi için dözdizimi geçersiz"
-
-#: utils/misc/guc.c:7189
-#, c-format
-msgid "unrecognized \"log_destination\" key word: \"%s\""
-msgstr "\"log_destination\" anahtar kelimesi tanımlanamıyor: \"%s\""
-
-#: utils/misc/guc.c:7264
-msgid "SET AUTOCOMMIT TO OFF is no longer supported"
-msgstr "SET AUTOCOMMIT TO OFF artık desteklenmiyor"
-
-#: utils/misc/guc.c:7336
-msgid "assertion checking is not supported by this build"
-msgstr "assert checking desteÄŸi derlenmemiÅŸ"
-
-#: utils/misc/guc.c:7351
-msgid "SSL is not supported by this build"
-msgstr "SSL bu yapılandırma tarafından desteklenmiyor."
-
-#: utils/misc/guc.c:7365
-msgid "cannot enable parameter when \"log_statement_stats\" is true"
-msgstr "\"log_statement_stats\" tue iken deÄŸer aktif olamaz"
-
-#: utils/misc/guc.c:7381
-msgid "cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true"
-msgstr "\"log_parser_stats\", \"log_planner_stats\", veya \"log_executor_stats\" deÄŸerleri true iken  \"log_statement_stats\" aktif edilemiyor"
-
-#: utils/misc/guc.c:7399
-msgid "cannot set transaction read-write mode inside a read-only transaction"
-msgstr "salt okunur transaction içinde okuma-yazma moduna ayarlanamıyor"
-
-#: utils/misc/help_config.c:131
-msgid "internal error: unrecognized run-time parameter type\n"
-msgstr "dahili hata: tanınmayan çalıştırma zamanı parametre tipi\n"
-
-#: utils/misc/tzparser.c:63
-#, c-format
-msgid "time zone abbreviation \"%s\" is too long (maximum %d characters) in time zone file \"%s\", line %d"
-msgstr "\"%3$s\" timezone dosyasında, %4$d satırında, timezone kısaltması \"%1$s\" çok uzundur (en çok %2$d karakter olabilr) "
-
-#: utils/misc/tzparser.c:72
-#, c-format
-msgid "time zone offset %d is not a multiple of 900 sec (15 min) in time zone file \"%s\", line %d"
-msgstr "\"%2$s\" timezone dosyasında, %3$d satırında, %1$d timezone offset 900 san. (15 dk.) veya katları değildir"
-
-#: utils/misc/tzparser.c:86
-#, c-format
-msgid "time zone offset %d is out of range in time zone file \"%s\", line %d"
-msgstr "\"%2$s\" timezone dosyasında, %3$d satırında, %1$d timezone offset kapsam dışıdır"
-
-#: utils/misc/tzparser.c:123
-#, c-format
-msgid "missing time zone abbreviation in time zone file \"%s\", line %d"
-msgstr "\"%s\" time zone dosyasında, %d satırında time zone kısaltması eksik"
-
-#: utils/misc/tzparser.c:134
-#, c-format
-msgid "missing time zone offset in time zone file \"%s\", line %d"
-msgstr "\"%s\" time zone dosyasında, %d satırında time zone offset eksik"
-
-#: utils/misc/tzparser.c:143
-#, c-format
-msgid "invalid number for time zone offset in time zone file \"%s\", line %d"
-msgstr "\"%s\" timezone dosyasında, %d satırında, time zone offset için geçersiz numara"
-
-#: utils/misc/tzparser.c:168
-#, c-format
-msgid "invalid syntax in time zone file \"%s\", line %d"
-msgstr "\"%s\" time zone dosyasında, %d satırında söz dizimi hatası"
-
-#: utils/misc/tzparser.c:234
-#, c-format
-msgid "time zone abbreviation \"%s\" is multiply defined"
-msgstr "\"%s\" time zone kısaltması birden çok kez tanımlanmış"
-
-#: utils/misc/tzparser.c:236
-#, c-format
-msgid "Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d."
-msgstr "\"%s\" timezone dosyasının %d. satırı, \"%s\" timezone dosyasının %d. satırı ile çakışmaktadır."
-
-#: utils/misc/tzparser.c:303
-#, c-format
-msgid "invalid time zone file name \"%s\""
-msgstr "geçersiz zaman dilimi dosyası adı: \"%s\""
-
-#: utils/misc/tzparser.c:318
-#, c-format
-msgid "time zone file recursion limit exceeded in file \"%s\""
-msgstr "\"%s\" dosyasında derinlik sınırı aşılmıştır. (DİKKAT: Bu hatayı gördüyseniz pgsql-hackers@postgresql.org listesine rapor gönderin)"
-
-#: utils/misc/tzparser.c:347
-#: postmaster/postmaster.c:1091
-#, c-format
-msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
-msgstr ""
-
-#: utils/misc/tzparser.c:361
-#: utils/misc/tzparser.c:376
-#, c-format
-msgid "could not read time zone file \"%s\": %m"
-msgstr "\"%s\" time zone dosyası okuma hatası: %m"
-
-#: utils/misc/tzparser.c:388
-#, c-format
-msgid "line is too long in time zone file \"%s\", line %d"
-msgstr "\"%s\" timezone dosyası, %d satırında, satır çok uzundur"
-
-#: utils/misc/tzparser.c:413
-#, fuzzy, c-format
-msgid "@INCLUDE without file name in time zone file \"%s\", line %d"
-msgstr "\"%s\" timezone dosyası, %d satırında @INCLUDE komutu dosya adını içermemktedir"
-
-#: guc-file.l:379
-#, c-format
-msgid "could not open configuration file \"%s\": maximum nesting depth exceeded"
-msgstr "yapılandırma dosyası \"%s\" açılamadı: en yüksek içiçe yuvalama derinliği aşılmıştır"
-
-#: guc-file.l:542
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "\"%s\" dosyasının %u. satırında satır sonunda sözdizimi hatası"
-
-#: guc-file.l:547
-#, c-format
-msgid "syntax error in file \"%s\" line %u, near token \"%s\""
-msgstr "\"%s\" dosyasının %u. satırında, \"%s\" ifadesi yakınında sözdizimi hatası"
-
-#: utils/init/flatfiles.c:209
-#: utils/init/flatfiles.c:279
-#: utils/init/flatfiles.c:408
-#: utils/init/flatfiles.c:663
-#, c-format
-msgid "could not write to temporary file \"%s\": %m"
-msgstr "geçici dosyasına \"%s\" yazma başarısız: %m"
-
-#: utils/init/flatfiles.c:249
-#, c-format
-msgid "invalid database name \"%s\""
-msgstr "geçersiz veritabanı adı \"%s\""
-
-#: utils/init/flatfiles.c:505
-#, c-format
-msgid "invalid role name \"%s\""
-msgstr "geçirsiz rol adı \"%s\""
-
-#: utils/init/flatfiles.c:512
-#, c-format
-msgid "invalid role password \"%s\""
-msgstr "geçersiz rol şifresi \"%s\""
-
-#: utils/init/miscinit.c:177
-#, c-format
-msgid "could not change directory to \"%s\": %m"
-msgstr "çalışma dizini \"%s\" olarak değiştirilemedi: %m"
-
-#: utils/init/miscinit.c:421
-#: utils/cache/lsyscache.c:2750
-#: commands/user.c:566
-#: commands/user.c:748
-#: commands/user.c:858
-#: commands/user.c:1012
-#: commands/variable.c:752
-#: commands/variable.c:882
-#, c-format
-msgid "role \"%s\" does not exist"
-msgstr "\"%s\" rolü mevcut değil"
-
-#: utils/init/miscinit.c:451
-#, c-format
-msgid "role \"%s\" is not permitted to log in"
-msgstr " \"%s\" rolünun sisteme giriş hakkı yoktur"
-
-#: utils/init/miscinit.c:469
-#, c-format
-msgid "too many connections for role \"%s\""
-msgstr "\"%s\" rol bağlantı sayısı aşılmıştır"
-
-#: utils/init/miscinit.c:544
-msgid "permission denied to set session authorization"
-msgstr "oturum kimli doÄŸrulama iÅŸlemine izin verilmemiÅŸ"
-
-#: utils/init/miscinit.c:626
-#, c-format
-msgid "invalid role OID: %u"
-msgstr "geçersiz rol OID: %u"
-
-#: utils/init/miscinit.c:718
-#, c-format
-msgid "could not create lock file \"%s\": %m"
-msgstr "\"%s\" lock dosyası oluşturma hatası: %m"
-
-#: utils/init/miscinit.c:732
-#, c-format
-msgid "could not open lock file \"%s\": %m"
-msgstr "\"%s\" lock dosyası okuma hatası: %m"
-
-#: utils/init/miscinit.c:738
-#, c-format
-msgid "could not read lock file \"%s\": %m"
-msgstr "\"%s\" lock dosyası okuma hatası: %m"
-
-#: utils/init/miscinit.c:801
-#, c-format
-msgid "lock file \"%s\" already exists"
-msgstr "\"%s\" lock dosyası zaten mevcuttur"
-
-#: utils/init/miscinit.c:805
-#, c-format
-msgid "Is another postgres (PID %d) running in data directory \"%s\"?"
-msgstr "\"%2$s\" veritabanı dizini kullanarak PID %1$d olan başka bir istemci süreci çalışmakta mıdır?"
-
-#: utils/init/miscinit.c:807
-#, c-format
-msgid "Is another postmaster (PID %d) running in data directory \"%s\"?"
-msgstr "\"%2$s\" veritabanı dizini kullanarak PID %1$d olan başka bir sunucu çalışmakta mıdır?"
-
-#: utils/init/miscinit.c:810
-#, c-format
-msgid "Is another postgres (PID %d) using socket file \"%s\"?"
-msgstr "\"%2$s\" kullanarak kullanarak PID %1$d olan başka bir istemci süreci çalışmakta mıdır?"
-
-#: utils/init/miscinit.c:812
-#, c-format
-msgid "Is another postmaster (PID %d) using socket file \"%s\"?"
-msgstr "\"%2$s\" kullanarak kullanarak PID %1$d olan başka bir sunucu çalışmakta mıdır?"
-
-#: utils/init/miscinit.c:840
-#, c-format
-msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use"
-msgstr "daha önce tanımlanmış shared memory blok (key %lu, ID %lu) hala kullanılmaktadır"
-
-#: utils/init/miscinit.c:843
-#, fuzzy, c-format
-msgid "If you're sure there are no old server processes still running, remove the shared memory block or just delete the file \"%s\"."
-msgstr "Eğer eski sunucunun sürecicinin çalımadığından emin iseniz, shared memory bloku \"ipcclean\", \"ipcrm\" komutları ile kaldırın ya da \"%s\" dosyasını silin."
-
-#: utils/init/miscinit.c:860
-#, c-format
-msgid "could not remove old lock file \"%s\": %m"
-msgstr "\"%s\" lock dosyası silinemiyor: %m"
-
-#: utils/init/miscinit.c:862
-msgid "The file seems accidentally left over, but it could not be removed. Please remove the file by hand and try again."
-msgstr "Dosya yanlışlıkla eski süreç tarafından bırakılmış ve kaldırılamıyor. Lütfen onu elle silin ve tekrar deneyin."
-
-#: utils/init/miscinit.c:884
-#: utils/init/miscinit.c:894
-#, c-format
-msgid "could not write lock file \"%s\": %m"
-msgstr "\"%s\" lock dosyası yazma hatası: %m"
-
-#: utils/init/miscinit.c:1093
-#: utils/init/miscinit.c:1106
-#, c-format
-msgid "\"%s\" is not a valid data directory"
-msgstr "\"%s\" geçerli bir veritabanı dizini değildir"
-
-#: utils/init/miscinit.c:1095
-#, c-format
-msgid "File \"%s\" is missing."
-msgstr "\"%s\" dosyası eksik."
-
-#: utils/init/miscinit.c:1108
-#, c-format
-msgid "File \"%s\" does not contain valid data."
-msgstr "\"%s\" dosyası geçerli bilgi içermiyor."
-
-#: utils/init/miscinit.c:1110
-msgid "You might need to initdb."
-msgstr "initdb yapmanız gerekebilir."
-
-#: utils/init/miscinit.c:1118
-#, c-format
-msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s."
-msgstr "Veri dizini PostgreSQL %ld.%ld sürümü tarafından oluşturulmuştur ve kullandığınız %s sürümü ile uyumlu değildir."
-
-#: utils/init/miscinit.c:1166
-#, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "\"%s\" parametresinde geçersiz list söz dizimi"
-
-#: utils/init/miscinit.c:1203
-#, c-format
-msgid "loaded library \"%s\""
-msgstr "\"%s\" kütüphanesi yüklendi"
-
-#: utils/init/postinit.c:177
-#, c-format
-msgid "database \"%s\" has disappeared from pg_database"
-msgstr "\"%s\" veritabanı pg_database tablosundan yok olmuş"
-
-#: utils/init/postinit.c:179
-#, c-format
-msgid "Database OID %u now seems to belong to \"%s\"."
-msgstr "OID %u olan veritabanı \"%s\" kullanıcıya aittir."
-
-#: utils/init/postinit.c:199
-#, c-format
-msgid "database \"%s\" is not currently accepting connections"
-msgstr "\"%s\" veritabanı şu anda bağlatı kabul etmiyor"
-
-#: utils/init/postinit.c:212
-#, c-format
-msgid "permission denied for database \"%s\""
-msgstr "\"%s\" veritabanına erişim engellendi"
-
-#: utils/init/postinit.c:213
-msgid "User does not have CONNECT privilege."
-msgstr "Kullanicinin CONNECT yetkisi verilmemiÅŸtir."
-
-#: utils/init/postinit.c:230
-#, c-format
-msgid "too many connections for database \"%s\""
-msgstr "\"%s\" veritabanı bağlantı sayısı aşılmıştır"
-
-#: utils/init/postinit.c:252
-#: utils/init/postinit.c:259
-#, fuzzy
-msgid "database locale is incompatible with operating system"
-msgstr "veritabanı dosyaları işletim sistemi ile uyumlu değildir"
-
-#: utils/init/postinit.c:253
-#, fuzzy, c-format
-msgid "The database was initialized with LC_COLLATE \"%s\",  which is not recognized by setlocale()."
-msgstr "Veritabanı LC_COLLATE \"%s\", ile ilklendirilmiştir, ancak setlocale() bu yereli tanımamaktadır.."
-
-#: utils/init/postinit.c:255
-#: utils/init/postinit.c:262
-msgid "Recreate the database with another locale or install the missing locale."
-msgstr ""
-
-#: utils/init/postinit.c:260
-#, fuzzy, c-format
-msgid "The database was initialized with LC_CTYPE \"%s\",  which is not recognized by setlocale()."
-msgstr "Veritabanı LC_CTYPE \"%s\", ile ilklendirilmiştir, ancak setlocale() bunu tanımamaktadır.."
-
-#: utils/init/postinit.c:410
-#, c-format
-msgid "database %u does not exist"
-msgstr "%u veritabanı mevcut değil"
-
-#: utils/init/postinit.c:541
-msgid "It seems to have just been dropped or renamed."
-msgstr "Az önce kaldırılmış veya adını değiştirilmiştir."
-
-#: utils/init/postinit.c:557
-#, c-format
-msgid "The database subdirectory \"%s\" is missing."
-msgstr "Veritabanı alt dizini \"%s\" eksik."
-
-#: utils/init/postinit.c:562
-#, c-format
-msgid "could not access directory \"%s\": %m"
-msgstr "\"%s\" dizine erişim hatası: %m"
-
-#: utils/init/postinit.c:595
-msgid "no roles are defined in this database system"
-msgstr "bu veritabanı sisteminde tanımlanmış rol bulunamadı"
-
-#: utils/init/postinit.c:596
-#, c-format
-msgid "You should immediately run CREATE USER \"%s\" CREATEUSER;."
-msgstr "Hemen CREATE USER \"%s\" CREATEUSER; komutunu çalıştırmalısınız."
-
-#: utils/init/postinit.c:626
-#, fuzzy
-msgid "must be superuser to connect during database shutdown"
-msgstr "superuser kullanıcısını oluşturmak için superuser olmalısınız"
-
-#: utils/init/postinit.c:636
-msgid "connection limit exceeded for non-superusers"
-msgstr "superuser olmayan kullanıcı bağlantı sayısı sınırı aşıldı"
-
-#: utils/error/assert.c:37
-msgid "TRAP: ExceptionalCondition: bad arguments\n"
-msgstr "TRAP: ExceptionalCondition: hatalı argümanlar\n"
-
-#: utils/error/assert.c:40
-#, c-format
-msgid "TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n"
-msgstr "TRAP: %s(\"%s\", Dosya: \"%s\",  Satır: %d)\n"
-
-#: utils/error/elog.c:1404
-#, c-format
-msgid "could not reopen file \"%s\" as stderr: %m"
-msgstr "\"%s\" dosyası stderr olarak yeiden açılamadı: %m"
-
-#: utils/error/elog.c:1417
-#, c-format
-msgid "could not reopen file \"%s\" as stdout: %m"
-msgstr "\"%s\" dosyası stdout olarak yeiden açılamadı: %m"
-
-#: utils/error/elog.c:1727
-#: utils/error/elog.c:1737
-msgid "[unknown]"
-msgstr "[bilinmeyen]"
-
-#: utils/error/elog.c:2077
-#: utils/error/elog.c:2359
-#: utils/error/elog.c:2437
-msgid "missing error text"
-msgstr "hata mesajı eksik"
-
-#: utils/error/elog.c:2080
-#: utils/error/elog.c:2083
-#: utils/error/elog.c:2440
-#: utils/error/elog.c:2443
-#, c-format
-msgid " at character %d"
-msgstr " %d karakterinde "
-
-#: utils/error/elog.c:2093
-#: utils/error/elog.c:2100
-msgid "DETAIL:  "
-msgstr "AYRINTI:"
-
-#: utils/error/elog.c:2107
-msgid "HINT:  "
-msgstr "Ä°PUCU:"
-
-#: utils/error/elog.c:2114
-msgid "QUERY:  "
-msgstr "SORGU:"
-
-#: utils/error/elog.c:2121
-msgid "CONTEXT:  "
-msgstr "ORTAM:"
-
-#: utils/error/elog.c:2131
-#, c-format
-msgid "LOCATION:  %s, %s:%d\n"
-msgstr "YER: %s, %s:%d\n"
-
-#: utils/error/elog.c:2138
-#, c-format
-msgid "LOCATION:  %s:%d\n"
-msgstr "YER: %s:%d\n"
-
-#: utils/error/elog.c:2152
-msgid "STATEMENT:  "
-msgstr "KOMUT:  "
-
-#: utils/error/elog.c:2249
-msgid "Not safe to send CSV data\n"
-msgstr "CSV verisini göndermek güvenli değil\n"
-
-#. translator: This string will be truncated at 47
-#. characters expanded.
-#: utils/error/elog.c:2552
-#, c-format
-msgid "operating system error %d"
-msgstr "işletim sistemi hatası: %d"
-
-#: utils/error/elog.c:2575
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: utils/error/elog.c:2579
-msgid "LOG"
-msgstr "LOG"
-
-#: utils/error/elog.c:2582
-msgid "INFO"
-msgstr "BÄ°LGÄ°"
-
-#: utils/error/elog.c:2585
-msgid "NOTICE"
-msgstr "NOT"
-
-#: utils/error/elog.c:2588
-msgid "WARNING"
-msgstr "UYARI"
-
-#: utils/error/elog.c:2591
-msgid "ERROR"
-msgstr "HATA"
-
-#: utils/error/elog.c:2594
-msgid "FATAL"
-msgstr "ÖLÜMCÜL"
-
-#: utils/error/elog.c:2597
-msgid "PANIC"
-msgstr "KRÄ°TÄ°K"
-
-#: utils/fmgr/dfmgr.c:125
-#, c-format
-msgid "could not find function \"%s\" in file \"%s\""
-msgstr "\"%2$s\" dosyasında \"%1$s\" fonksiyonu bulunamadı"
-
-#: utils/fmgr/dfmgr.c:204
-#: utils/fmgr/dfmgr.c:406
-#: utils/fmgr/dfmgr.c:453
-#, c-format
-msgid "could not access file \"%s\": %m"
-msgstr "\"%s\" dosyası erişim hatası: %m"
-
-#: utils/fmgr/dfmgr.c:242
-#, c-format
-msgid "could not load library \"%s\": %s"
-msgstr "\"%s\" kütüphanesi yüklenemedi: %s"
-
-#: utils/fmgr/dfmgr.c:274
-#, c-format
-msgid "incompatible library \"%s\": missing magic block"
-msgstr "uyumsuz kütüphane \"%s\": magic block eksik"
-
-#: utils/fmgr/dfmgr.c:276
-msgid "Extension libraries are required to use the PG_MODULE_MAGIC macro."
-msgstr "extension kütüphaneleri PG_MODULE_MAGIC makrosunu kullanmak zorundadır."
-
-#: utils/fmgr/dfmgr.c:312
-#, c-format
-msgid "incompatible library \"%s\": version mismatch"
-msgstr "uyumsuz kütüphane \"%s\": sürüm uyuşmazlığı"
-
-#: utils/fmgr/dfmgr.c:314
-#, c-format
-msgid "Server is version %d.%d, library is version %d.%d."
-msgstr "Sunucu sürümü: %d.%d, kütüphane sürümü: %d.%d."
-
-#: utils/fmgr/dfmgr.c:333
-#, c-format
-msgid "Server has FUNC_MAX_ARGS = %d, library has %d."
-msgstr ""
-
-#: utils/fmgr/dfmgr.c:342
-#, c-format
-msgid "Server has INDEX_MAX_KEYS = %d, library has %d."
-msgstr ""
-
-#: utils/fmgr/dfmgr.c:351
-#, c-format
-msgid "Server has NAMEDATALEN = %d, library has %d."
-msgstr ""
-
-#: utils/fmgr/dfmgr.c:360
-#, c-format
-msgid "Server has FLOAT4PASSBYVAL = %s, library has %s."
-msgstr ""
-
-#: utils/fmgr/dfmgr.c:369
-#, c-format
-msgid "Server has FLOAT8PASSBYVAL = %s, library has %s."
-msgstr ""
-
-#: utils/fmgr/dfmgr.c:376
-msgid "Magic block has unexpected length or padding difference."
-msgstr ""
-
-#: utils/fmgr/dfmgr.c:379
-#, c-format
-msgid "incompatible library \"%s\": magic block mismatch"
-msgstr "uyumsuz kütüphane \"%s\": magic block uyumsuz"
-
-#: utils/fmgr/dfmgr.c:537
-#, c-format
-msgid "access to library \"%s\" is not allowed"
-msgstr "\"%s\" kütüphanesine erişim engellendi"
-
-#: utils/fmgr/dfmgr.c:564
-#, c-format
-msgid "invalid macro name in dynamic library path: %s"
-msgstr "dinamik kütüphane yolunda geçersiz makro adı: %s"
-
-#: utils/fmgr/dfmgr.c:609
-msgid "zero-length component in parameter \"dynamic_library_path\""
-msgstr "\"dynamic_library_path\" parametresinde sıfır uzunluklu bileşen"
-
-#: utils/fmgr/dfmgr.c:628
-msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
-msgstr "\"dynamic_library_path\" parametresine bileÅŸen kesin bir yol deÄŸildir"
-
-#: utils/fmgr/fmgr.c:266
-#, c-format
-msgid "internal function \"%s\" is not in internal lookup table"
-msgstr "\"%s\" dahili fonksiyonu, dahili referans tablosunda yer almamaktadır"
-
-#: utils/fmgr/fmgr.c:472
-#, c-format
-msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr "\"%2$s\" bilgi fonksiyonu tarafından bildirilen API versioynu %1$d tanımlı değildir"
-
-#: utils/fmgr/fmgr.c:843
-#: utils/fmgr/fmgr.c:2075
-#, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr "%u fonksiyonu çok fazla argümana sahip (%d, en yüksek ise %d)"
-
-#: utils/fmgr/funcapi.c:356
-#, c-format
-msgid "could not determine actual result type for function \"%s\" declared to return type %s"
-msgstr "geri döndürme tipi %2$s olarak tanımlanmış \"%1$s\" fonksiyonunun gerçek döndürme tipi belirlenememektedir"
-
-#: utils/fmgr/funcapi.c:1105
-#: utils/fmgr/funcapi.c:1136
-msgid "number of aliases does not match number of columns"
-msgstr "Takma adların sayısı ile kolon satısı eşleşmiyor"
-
-#: utils/fmgr/funcapi.c:1130
-msgid "no column alias was provided"
-msgstr "kolon takma adı verilmedi"
-
-#: utils/fmgr/funcapi.c:1154
-msgid "could not determine row description for function returning record"
-msgstr "veri satırı döndüren fonksiyon için satır açıklaması bulunamadı"
-
-#: utils/cache/lsyscache.c:2319
-#: utils/cache/lsyscache.c:2354
-#: utils/cache/lsyscache.c:2389
-#: utils/cache/lsyscache.c:2424
-#, c-format
-msgid "type %s is only a shell"
-msgstr "%s tipi sadece bir shell"
-
-#: utils/cache/lsyscache.c:2324
-#, c-format
-msgid "no input function available for type %s"
-msgstr "%s tipi için giriş fonksiyonu mevcut değil"
-
-#: utils/cache/lsyscache.c:2359
-#, c-format
-msgid "no output function available for type %s"
-msgstr "%s tipi için çıkış fonksiyonu mevcut değil"
-
-#: utils/cache/plancache.c:527
-msgid "cached plan must not change result type"
-msgstr "önbelleğe alınmış plan sonuç tipini değiştiremez"
-
-#: utils/cache/relcache.c:3707
-#, c-format
-msgid "could not create relation-cache initialization file \"%s\": %m"
-msgstr "relation-cache tanımlama dosyası \"%s\" açılamadı: %m"
-
-#: utils/cache/relcache.c:3709
-msgid "Continuing anyway, but there's something wrong."
-msgstr "Devam ediyorum, ama bu işlem yanlıştır."
-
-#: utils/cache/typcache.c:146
-#: parser/parse_type.c:205
-#, c-format
-msgid "type \"%s\" is only a shell"
-msgstr "\"%s\" tipi bir shelldir"
-
-#: utils/cache/typcache.c:326
-#, c-format
-msgid "type %s is not composite"
-msgstr "%s tipi composite deÄŸildir"
-
-#: utils/cache/typcache.c:340
-msgid "record type has not been registered"
-msgstr "kayıt tipi tecil edilmemiştir"
-
-#: tsearch/dict_ispell.c:52
-#: tsearch/dict_thesaurus.c:615
-msgid "multiple DictFile parameters"
-msgstr "mükerrer DictFile parametre"
-
-#: tsearch/dict_ispell.c:63
-msgid "multiple AffFile parameters"
-msgstr "çoklu AffFile parametresi"
-
-#: tsearch/dict_ispell.c:74
-#: tsearch/dict_simple.c:50
-#: snowball/dict_snowball.c:206
-msgid "multiple StopWords parameters"
-msgstr "birden fazla StopWords parametresi"
-
-#: tsearch/dict_ispell.c:82
-#, c-format
-msgid "unrecognized Ispell parameter: \"%s\""
-msgstr "tanımlanmayan ispell parametresi: \"%s\""
-
-#: tsearch/dict_ispell.c:96
-msgid "missing AffFile parameter"
-msgstr "ekisk AffFile parametresi"
-
-#: tsearch/dict_ispell.c:102
-#: tsearch/dict_thesaurus.c:639
-msgid "missing DictFile parameter"
-msgstr "eksik DictFile parametresi"
-
-#: tsearch/dict_simple.c:59
-msgid "multiple Accept parameters"
-msgstr "çoklu Accept parametreleri"
-
-#: tsearch/dict_simple.c:67
-#, fuzzy, c-format
-msgid "unrecognized simple dictionary parameter: \"%s\""
-msgstr "\"%s\" tanınmayan recovery parametresi"
-
-#: tsearch/dict_synonym.c:99
-#, c-format
-msgid "unrecognized synonym parameter: \"%s\""
-msgstr "tanımlanmamış eş anlamlılık parametresi: \"%s\""
-
-#: tsearch/dict_synonym.c:106
-msgid "missing Synonyms parameter"
-msgstr "eksik Synonyms parametresi"
-
-#: tsearch/dict_synonym.c:113
-#, c-format
-msgid "could not open synonym file \"%s\": %m"
-msgstr "\"%s\" eşanlamlılar dosyası açılamıyor: %m"
-
-#: tsearch/dict_thesaurus.c:180
-#, fuzzy, c-format
-msgid "could not open thesaurus file \"%s\": %m"
-msgstr "\"%s\" sunucu dosyası açma hatası: %m"
-
-#: tsearch/dict_thesaurus.c:213
-#, fuzzy
-msgid "unexpected delimiter"
-msgstr "beklenmeyen dosya sonu\n"
-
-#: tsearch/dict_thesaurus.c:263
-#: tsearch/dict_thesaurus.c:279
-#, fuzzy
-msgid "unexpected end of line or lexeme"
-msgstr "beklenmeyen dosya sonu\n"
-
-#: tsearch/dict_thesaurus.c:288
-#, fuzzy
-msgid "unexpected end of line"
-msgstr "beklenmeyen dosya sonu\n"
-
-#: tsearch/dict_thesaurus.c:413
-#, c-format
-msgid "thesaurus sample word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-
-#: tsearch/dict_thesaurus.c:419
-#, c-format
-msgid "thesaurus sample word \"%s\" is a stop word (rule %d)"
-msgstr ""
-
-#: tsearch/dict_thesaurus.c:422
-#, fuzzy
-msgid "Use \"?\" to represent a stop word within a sample phrase."
-msgstr "Satır sonu karakteri için \"\\r\" kullanın."
-
-#: tsearch/dict_thesaurus.c:567
-#, c-format
-msgid "thesaurus substitute word \"%s\" is a stop word (rule %d)"
-msgstr ""
-
-#: tsearch/dict_thesaurus.c:574
-#, c-format
-msgid "thesaurus substitute word \"%s\" isn't recognized by subdictionary (rule %d)"
-msgstr ""
-
-#: tsearch/dict_thesaurus.c:586
-#, c-format
-msgid "thesaurus substitute phrase is empty (rule %d)"
-msgstr ""
-
-#: tsearch/dict_thesaurus.c:624
-msgid "multiple Dictionary parameters"
-msgstr "çoklu Dil parametreleri"
-
-#: tsearch/dict_thesaurus.c:631
-#, fuzzy, c-format
-msgid "unrecognized Thesaurus parameter: \"%s\""
-msgstr "\"%s\" tanınmayan parametre"
-
-#: tsearch/dict_thesaurus.c:643
-msgid "missing Dictionary parameter"
-msgstr "eksik Sözlük parametresi"
-
-#: tsearch/spell.c:204
-#, c-format
-msgid "could not open dictionary file \"%s\": %m"
-msgstr "\"%s\" sözlük dosyası açılamadı: %m"
-
-#: tsearch/spell.c:444
-#: tsearch/spell.c:461
-#: tsearch/spell.c:478
-#: tsearch/spell.c:495
-#: tsearch/spell.c:517
-#: gram.y:10787
-#: gram.y:10804
-msgid "syntax error"
-msgstr "söz dizim hatası "
-
-#: tsearch/spell.c:522
-#: tsearch/spell.c:772
-#: tsearch/spell.c:792
-#, fuzzy
-msgid "multibyte flag character is not allowed"
-msgstr "birden çok LIMIT ifadesi kullanılamaz"
-
-#: tsearch/spell.c:557
-#: tsearch/spell.c:615
-#: tsearch/spell.c:710
-#, c-format
-msgid "could not open affix file \"%s\": %m"
-msgstr "\"%s\" affix dosyası açılamıyor: %m"
-
-#: tsearch/spell.c:603
-msgid "Ispell dictionary supports only default flag value"
-msgstr ""
-
-#: tsearch/spell.c:803
-msgid "wrong affix file format for flag"
-msgstr ""
-
-#: tsearch/ts_locale.c:168
-#, fuzzy, c-format
-msgid "line %d of configuration file \"%s\": \"%s\""
-msgstr "yapılandırma dosyası \"%s\" açılamadı: %m"
-
-#: tsearch/ts_locale.c:288
-#, c-format
-msgid "conversion from wchar_t to server encoding failed: %m"
-msgstr "wchar_t'den sunucu dil kodlamasına dönüşüm başarısız oldu: %m"
-
-#: tsearch/ts_parse.c:384
-#: tsearch/ts_parse.c:391
-#: tsearch/ts_parse.c:554
-#: tsearch/ts_parse.c:561
-msgid "word is too long to be indexed"
-msgstr "sözcük indexlenebilmek için çok uzun"
-
-#: tsearch/ts_parse.c:385
-#: tsearch/ts_parse.c:392
-#: tsearch/ts_parse.c:555
-#: tsearch/ts_parse.c:562
-#, c-format
-msgid "Words longer than %d characters are ignored."
-msgstr "%d harften fazla sözcükler gözardı ediliyor."
-
-#: tsearch/ts_utils.c:53
-#, c-format
-msgid "invalid text search configuration file name \"%s\""
-msgstr "geçersiz metin arama yapılandırma dosyası adı: \"%s\""
-
-#: tsearch/ts_utils.c:91
-#, fuzzy, c-format
-msgid "could not open stop-word file \"%s\": %m"
-msgstr "\"%s\" dosyası açılamıyor: %m"
-
-#: tsearch/wparser.c:314
-#, fuzzy
-msgid "text search parser does not support headline creation"
-msgstr "\"%s\" tablespace'i mevcut deÄŸil"
-
-#: tsearch/wparser_def.c:2435
-#, fuzzy, c-format
-msgid "unrecognized headline parameter: \"%s\""
-msgstr "\"%s\" tanınmayan parametre"
-
-#: tsearch/wparser_def.c:2444
-msgid "MinWords should be less than MaxWords"
-msgstr "MinWords değeri MaxWords değerinden az olmalı"
-
-#: tsearch/wparser_def.c:2448
-msgid "MinWords should be positive"
-msgstr "MinWords pozitif olmalıdır"
-
-#: tsearch/wparser_def.c:2452
-msgid "ShortWord should be >= 0"
-msgstr "ShortWord >=0 olmalı"
-
-#: tsearch/wparser_def.c:2456
-#, fuzzy
-msgid "MaxFragments should be >= 0"
-msgstr "ShortWord >=0 olmalı"
-
-#: tcop/postgres.c:326
-#: tcop/postgres.c:349
-#: tcop/fastpath.c:292
-#: commands/copy.c:514
-#: commands/copy.c:533
-#: commands/copy.c:537
-msgid "unexpected EOF on client connection"
-msgstr "istemci bağlantısında beklenmeyen EOF"
-
-#: tcop/postgres.c:376
-#: tcop/postgres.c:388
-#: tcop/postgres.c:399
-#: tcop/postgres.c:411
-#: tcop/postgres.c:3839
-#, c-format
-msgid "invalid frontend message type %d"
-msgstr "geçersiz frontend mesaj tipi %d"
-
-#: tcop/postgres.c:832
-#, c-format
-msgid "statement: %s"
-msgstr "komut: %s"
-
-#: tcop/postgres.c:891
-#: tcop/postgres.c:1200
-#: tcop/postgres.c:1480
-#: tcop/postgres.c:1916
-#: tcop/postgres.c:2233
-#: tcop/postgres.c:2313
-#: tcop/fastpath.c:305
-msgid "current transaction is aborted, commands ignored until end of transaction block"
-msgstr "geçerli transaction durduruldu, transaction blokunun sonuna kadar komutlar yok sayılacak"
-
-#: tcop/postgres.c:1060
-#: tcop/postgres.c:1346
-#: tcop/postgres.c:1757
-#: tcop/postgres.c:1973
-#: tcop/fastpath.c:409
-#, c-format
-msgid "duration: %s ms"
-msgstr "süre: %s milisaniye"
-
-#: tcop/postgres.c:1065
-#, c-format
-msgid "duration: %s ms  statement: %s"
-msgstr "süre: %s milisaniye  komut: %s"
-
-#: tcop/postgres.c:1115
-#, c-format
-msgid "parse %s: %s"
-msgstr "parse %s: %s"
-
-#: tcop/postgres.c:1173
-msgid "cannot insert multiple commands into a prepared statement"
-msgstr "önceden hazırlanmış komuta çoklu komut eklenemez"
-
-#: tcop/postgres.c:1239
-#: commands/prepare.c:122
-#: parser/analyze.c:2209
-#, c-format
-msgid "could not determine data type of parameter $%d"
-msgstr "$%d parametrenin veri tipini belirlenemiyor"
-
-#: tcop/postgres.c:1351
-#, c-format
-msgid "duration: %s ms  parse %s: %s"
-msgstr "süre: %s milisaniye  parse %s: %s"
-
-#: tcop/postgres.c:1397
-#, c-format
-msgid "bind %s to %s"
-msgstr "bind %s to %s"
-
-#: tcop/postgres.c:1416
-#: tcop/postgres.c:2213
-msgid "unnamed prepared statement does not exist"
-msgstr "ismi verilmemiş hazırlamış komut mevcut değil"
-
-#: tcop/postgres.c:1458
-#, c-format
-msgid "bind message has %d parameter formats but %d parameters"
-msgstr "bind mesajı %d argüman biçimi ve %d argüman içeriyor"
-
-#: tcop/postgres.c:1464
-#, c-format
-msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
-msgstr "bind mesajı   %d parametre veriyor ancak \"%s\" hazırlanmış deymi %d gerektirir"
-
-#: tcop/postgres.c:1623
-#, c-format
-msgid "incorrect binary data format in bind parameter %d"
-msgstr "bind parametresinde geçersiz ikili veri %d"
-
-#: tcop/postgres.c:1762
-#, c-format
-msgid "duration: %s ms  bind %s%s%s: %s"
-msgstr "süre: %s milisaniye  bind %s%s%s: %s"
-
-#: tcop/postgres.c:1810
-#: tcop/postgres.c:2299
-#, c-format
-msgid "portal \"%s\" does not exist"
-msgstr "portal \"%s\" mevcut deÄŸildir"
-
-#: tcop/postgres.c:1897
-#: tcop/postgres.c:1981
-msgid "execute fetch from"
-msgstr "execute fetch from"
-
-#: tcop/postgres.c:1898
-#: tcop/postgres.c:1982
-msgid "execute"
-msgstr "execute"
-
-#: tcop/postgres.c:1895
-#, fuzzy, c-format
-msgid "%s %s%s%s: %s"
-msgstr "%s %s%s%s%s%s"
-
-#: tcop/postgres.c:1978
-#, fuzzy, c-format
-msgid "duration: %s ms  %s %s%s%s: %s"
-msgstr "süre: %s milisaniye  %s %s%s%s%s%s"
-
-#: tcop/postgres.c:2104
-#, c-format
-msgid "prepare: %s"
-msgstr "prepare:  %s"
-
-#: tcop/postgres.c:2167
-#, c-format
-msgid "parameters: %s"
-msgstr "%s parametresi"
-
-#: tcop/postgres.c:2489
-msgid "terminating connection because of crash of another server process"
-msgstr "diğer aktif sunucu sürecinin durması nedeniyle bağlantı kapatılmıştır"
-
-#: tcop/postgres.c:2490
-msgid "The postmaster has commanded this server process to roll back the current transaction and exit, because another server process exited abnormally and possibly corrupted shared memory."
-msgstr "Başka bir sürecin olağan dışı çıkışı nedeniyle shared memory bozulmuş ihtimali var. Dolayısıyla tüm süreçlerine tüm aktif işlemlerini rollback edip çıkmak komutu verilmiş."
-
-#: tcop/postgres.c:2494
-msgid "In a moment you should be able to reconnect to the database and repeat your command."
-msgstr "Birkaç saniye sonra veritabana bağlanıp işlemlerinize devam edebilirsiniz."
-
-#: tcop/postgres.c:2613
-msgid "floating-point exception"
-msgstr "gerçel sayı istisnası"
-
-#: tcop/postgres.c:2614
-msgid "An invalid floating-point operation was signaled. This probably means an out-of-range result or an invalid operation, such as division by zero."
-msgstr "Geçersiz floating-point işlemi sinyali alındı. Bu, matematiksel sıfıra bölme gibi geçersiz işlem ya da kapsam dışı sonucun göstergesidir."
-
-#: tcop/postgres.c:2651
-msgid "terminating autovacuum process due to administrator command"
-msgstr "yönetici talimatı doğrultusunda autovacuum süreci sonlandırılıyor"
-
-#: tcop/postgres.c:2655
-msgid "terminating connection due to administrator command"
-msgstr "yönetici talimatı doğrultusunda bağlantı kesildi"
-
-#: tcop/postgres.c:2666
-msgid "canceling statement due to statement timeout"
-msgstr "sorgu zaman aşımına uğradı ve iptal edildi"
-
-#: tcop/postgres.c:2670
-msgid "canceling autovacuum task"
-msgstr "autovacuum görevi iptal ediliyor"
-
-#: tcop/postgres.c:2674
-msgid "canceling statement due to user request"
-msgstr "kullanıcı isteği ile sorgu iptal edildi"
-
-#: tcop/postgres.c:2718
-msgid "stack depth limit exceeded"
-msgstr "stack derinliği sınırı aşıldı"
-
-#: tcop/postgres.c:2719
-msgid "Increase the configuration parameter \"max_stack_depth\", after ensuring the platform's stack depth limit is adequate."
-msgstr "İşletim sisteminin stack derinliğinin yeterli olduğundan emin olarak \"max_stack_depth\" konfigurasyon parametresini artırın."
-
-#: tcop/postgres.c:2735
-#, c-format
-msgid "\"max_stack_depth\" must not exceed %ldkB"
-msgstr "\"max_stack_depth\" parametresi %ldkB açmamalıdır"
-
-#: tcop/postgres.c:2737
-msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
-msgstr "İşletim sisteminin stack derinliği \"ulimit -s\" veya benzeri komutu ile arttırın."
-
-#: tcop/postgres.c:3114
-#: bootstrap/bootstrap.c:294
-#: postmaster/postmaster.c:652
-#, c-format
-msgid "--%s requires a value"
-msgstr "--%s bir deÄŸer gerektirir"
-
-#: tcop/postgres.c:3119
-#: bootstrap/bootstrap.c:299
-#: postmaster/postmaster.c:657
-#, c-format
-msgid "-c %s requires a value"
-msgstr "-c %s bir deÄŸer gerektirir"
-
-#: tcop/postgres.c:3254
-msgid "invalid command-line arguments for server process"
-msgstr "sunucu süreci için geçersiz komut satırı parametreleri"
-
-#: tcop/postgres.c:3255
-#: tcop/postgres.c:3269
-#, c-format
-msgid "Try \"%s --help\" for more information."
-msgstr "Daha fazla bilgi için \"%s --help\" yazın."
-
-#: tcop/postgres.c:3267
-#, c-format
-msgid "%s: invalid command-line arguments"
-msgstr "%s: komut satırı parametresi yanlış"
-
-#: tcop/postgres.c:3277
-#, c-format
-msgid "%s: no database nor user name specified"
-msgstr ":%s: ne veritabanı ne de kullanıcı adı belirtilmemiştir"
-
-#: tcop/postgres.c:3749
-#, c-format
-msgid "invalid CLOSE message subtype %d"
-msgstr "geçersiz CLOSE mesaj alt tipi %d"
-
-#: tcop/postgres.c:3782
-#, c-format
-msgid "invalid DESCRIBE message subtype %d"
-msgstr "geçersiz DESCRIBE mesaj alt tipi %d"
-
-#: tcop/postgres.c:4020
-#, c-format
-msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
-msgstr "bağlantı bitti: oturum zamanı: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
-
-#: tcop/pquery.c:668
-#, c-format
-msgid "bind message has %d result formats but query has %d columns"
-msgstr "bind mesajı ında %d sonuç biçimi verilmişken sorguda %d sütun belirtilmiş"
-
-#: tcop/pquery.c:745
-#: tcop/pquery.c:1366
-#: commands/portalcmds.c:329
-#, c-format
-msgid "portal \"%s\" cannot be run"
-msgstr "\"%s\" portalı çalıştırılamıyor"
-
-#: tcop/pquery.c:979
-msgid "cursor can only scan forward"
-msgstr "cursor sadece ileri doÄŸru gidebilir"
-
-#: tcop/pquery.c:980
-msgid "Declare it with SCROLL option to enable backward scan."
-msgstr "Geriye gitmesini sağlamak için SCROLL seçeneği ile bildirin."
-
-#: tcop/utility.c:90
-#: commands/tablecmds.c:732
-#: commands/tablecmds.c:1042
-#: commands/tablecmds.c:1860
-#: commands/tablecmds.c:3243
-#: commands/tablecmds.c:3272
-#: commands/tablecmds.c:4603
-#: commands/trigger.c:121
-#: commands/trigger.c:809
-#: rewrite/rewriteDefine.c:259
-#, c-format
-msgid "permission denied: \"%s\" is a system catalog"
-msgstr "eriÅŸim engellendi: \"%s\" bir sistem kataloÄŸudur"
-
-#: tcop/utility.c:218
-#: commands/copy.c:1007
-#: executor/execMain.c:636
-msgid "transaction is read-only"
-msgstr "transaction salt okunurdur"
-
-#: tcop/utility.c:1021
-msgid "must be superuser to do CHECKPOINT"
-msgstr "CHECKPOINT yapmak için superuser olmalısınız"
-
-#: tcop/fastpath.c:109
-#: tcop/fastpath.c:483
-#: tcop/fastpath.c:613
-#, c-format
-msgid "invalid argument size %d in function call message"
-msgstr "fonksiyon çağırma mesajında geçersiz argüman boyutu %d"
-
-#: tcop/fastpath.c:223
-#: catalog/aclchk.c:2542
-#: catalog/aclchk.c:3230
-#, c-format
-msgid "function with OID %u does not exist"
-msgstr "%u OID'li fonksiyon mevcut deÄŸil"
-
-#: tcop/fastpath.c:333
-#, c-format
-msgid "fastpath function call: \"%s\" (OID %u)"
-msgstr "fastpath function çağırımı: \"%s\" OID %u"
-
-#: tcop/fastpath.c:413
-#, c-format
-msgid "duration: %s ms  fastpath function call: \"%s\" (OID %u)"
-msgstr "süre: %s milisaniye  fastpath function call: \"%s\" OID %u"
-
-#: tcop/fastpath.c:451
-#: tcop/fastpath.c:578
-#, c-format
-msgid "function call message contains %d arguments but function requires %d"
-msgstr "fonksiyon çağırısına %d argüman bulunmakta ancak fonkiyon %d argüman istemektedir"
-
-#: tcop/fastpath.c:459
-#, c-format
-msgid "function call message contains %d argument formats but %d arguments"
-msgstr "fonksiyon çağırma mesajı %d argüman biçimi ve %d argüman içeriyor"
-
-#: tcop/fastpath.c:546
-#: tcop/fastpath.c:629
-#, c-format
-msgid "incorrect binary data format in function argument %d"
-msgstr "%d fonksiyon argümanında geçersiz ikili veri"
-
-#: bootstrap/bootstrap.c:310
-#: postmaster/postmaster.c:669
-#: postmaster/postmaster.c:682
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Daha fazla bilgi için \"%s --help\" yazın\n"
-
-#: bootstrap/bootstrap.c:319
-#, c-format
-msgid "%s: invalid command-line arguments\n"
-msgstr "%s: geçersiz komut satırı parametresi\n"
-
-#: catalog/aclchk.c:141
-msgid "grant options can only be granted to roles"
-msgstr "grant opsiyonu, sadece rollere atanabilir"
-
-#: catalog/aclchk.c:252
-#, c-format
-msgid "no privileges were granted for \"%s\""
-msgstr "\"%s\" nesnesine hiçbir hak verilemedi"
-
-#: catalog/aclchk.c:256
-#, c-format
-msgid "not all privileges were granted for \"%s\""
-msgstr "\"%s\" nesnesine bazı hakları verilemedi"
-
-#: catalog/aclchk.c:263
-#, c-format
-msgid "no privileges could be revoked for \"%s\""
-msgstr "\"%s\" nesnesinin hiçbir hakkı geri alınamadı"
-
-#: catalog/aclchk.c:267
-#, c-format
-msgid "not all privileges could be revoked for \"%s\""
-msgstr "\"%s\" nesnesinin bazı hakları geri alınamadı"
-
-#: catalog/aclchk.c:329
-#, c-format
-msgid "invalid privilege type %s for relation"
-msgstr "nesne için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:333
-#, c-format
-msgid "invalid privilege type %s for sequence"
-msgstr "sequence için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:337
-#, c-format
-msgid "invalid privilege type %s for database"
-msgstr "veritabanı için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:341
-#, c-format
-msgid "invalid privilege type %s for function"
-msgstr "fonksiyon için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:345
-#, c-format
-msgid "invalid privilege type %s for language"
-msgstr "dil için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:349
-#, c-format
-msgid "invalid privilege type %s for schema"
-msgstr "şema için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:353
-#, c-format
-msgid "invalid privilege type %s for tablespace"
-msgstr "tablespace için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:357
-#, fuzzy, c-format
-msgid "invalid privilege type %s for foreign-data wrapper"
-msgstr "veritabanı için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:361
-#, fuzzy, c-format
-msgid "invalid privilege type %s for foreign server"
-msgstr "nesne için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:400
-#, fuzzy
-msgid "column privileges are only valid for relations"
-msgstr "nesne için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:895
-#: commands/comment.c:509
-#: commands/sequence.c:945
-#: commands/tablecmds.c:199
-#: commands/tablecmds.c:2045
-#: commands/tablecmds.c:2266
-#: commands/tablecmds.c:7500
-#, c-format
-msgid "\"%s\" is not a sequence"
-msgstr "\"%s\" bir sequence deÄŸildir"
-
-#: catalog/aclchk.c:933
-#, fuzzy, c-format
-msgid "sequence \"%s\" only supports USAGE, SELECT, and UPDATE privileges"
-msgstr "\"%s\" sequence nesnesi sadece USAGE, SELECT, ve UPDATE desteklemektedir"
-
-#: catalog/aclchk.c:950
-msgid "invalid privilege type USAGE for table"
-msgstr "tablo için geçersiz hak tipi kullanımı"
-
-#: catalog/aclchk.c:1094
-#, fuzzy, c-format
-msgid "invalid privilege type %s for column"
-msgstr "fonksiyon için geçersiz hak tipi %s"
-
-#: catalog/aclchk.c:1107
-#, fuzzy, c-format
-msgid "sequence \"%s\" only supports SELECT column privileges"
-msgstr "\"%s\" sequence nesnesi sadece USAGE, SELECT, ve UPDATE desteklemektedir"
-
-#: catalog/aclchk.c:1668
-#, c-format
-msgid "language \"%s\" is not trusted"
-msgstr "\"%s\" dili güvenilir bir dil değildir"
-
-#: catalog/aclchk.c:1670
-msgid "Only superusers can use untrusted languages."
-msgstr "Güvenilir olmayan dilleri sadece superuser kullanabilir."
-
-#: catalog/aclchk.c:2024
-#, c-format
-msgid "unrecognized privilege type \"%s\""
-msgstr "bilinmeyen hak türü \"%s\""
-
-#: catalog/aclchk.c:2073
-#, fuzzy, c-format
-msgid "permission denied for column %s"
-msgstr "%s fonksiyonuna eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2075
-#, c-format
-msgid "permission denied for relation %s"
-msgstr "%s nesnesine eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2077
-#: commands/sequence.c:467
-#: commands/sequence.c:662
-#: commands/sequence.c:706
-#: commands/sequence.c:742
-#, c-format
-msgid "permission denied for sequence %s"
-msgstr "%s sequence'ine eriÅŸim izni verilmedi"
-
-#: catalog/aclchk.c:2079
-#, c-format
-msgid "permission denied for database %s"
-msgstr "%s veritabanına erişim engellendi"
-
-#: catalog/aclchk.c:2081
-#, c-format
-msgid "permission denied for function %s"
-msgstr "%s fonksiyonuna eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2083
-#, c-format
-msgid "permission denied for operator %s"
-msgstr "%s operatorüne erişim engellendi"
-
-#: catalog/aclchk.c:2085
-#, c-format
-msgid "permission denied for type %s"
-msgstr "%s tipine eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2087
-#, c-format
-msgid "permission denied for language %s"
-msgstr "%s diline eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2089
-#, c-format
-msgid "permission denied for schema %s"
-msgstr "%s şemasına erişim engellendi"
-
-#: catalog/aclchk.c:2091
-#, c-format
-msgid "permission denied for operator class %s"
-msgstr "%s operatör sınıfına erişim engellendi"
-
-#: catalog/aclchk.c:2093
-#, c-format
-msgid "permission denied for operator family %s"
-msgstr "%s operator ailesine eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2095
-#, c-format
-msgid "permission denied for conversion %s"
-msgstr "%s dönüşümüne erişim engellendi"
-
-#: catalog/aclchk.c:2097
-#, c-format
-msgid "permission denied for tablespace %s"
-msgstr "%s tablespace'ine eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2099
-#, c-format
-msgid "permission denied for text search dictionary %s"
-msgstr "%s metin arama sözlüğüne erişim engellendi"
-
-#: catalog/aclchk.c:2101
-#, c-format
-msgid "permission denied for text search configuration %s"
-msgstr "%s metin arama yapılandırmasına erişim engellendi"
-
-#: catalog/aclchk.c:2103
-#, fuzzy, c-format
-msgid "permission denied for foreign-data wrapper %s"
-msgstr "%s veritabanına erişim engellendi"
-
-#: catalog/aclchk.c:2105
-#, fuzzy, c-format
-msgid "permission denied for foreign server %s"
-msgstr "%s dönüşümüne erişim engellendi"
-
-#: catalog/aclchk.c:2111
-#: catalog/aclchk.c:2113
-#, c-format
-msgid "must be owner of relation %s"
-msgstr "%s nesnesinin sahibi olmalısınız"
-
-#: catalog/aclchk.c:2115
-#, c-format
-msgid "must be owner of sequence %s"
-msgstr "%s sequence'ın sahibi olmalısınız"
-
-#: catalog/aclchk.c:2117
-#, c-format
-msgid "must be owner of database %s"
-msgstr "%s veritabanının sahibi olmalısınız"
-
-#: catalog/aclchk.c:2119
-#, c-format
-msgid "must be owner of function %s"
-msgstr "%s fonksiyonunun sahibi olmalısınız"
-
-#: catalog/aclchk.c:2121
-#, c-format
-msgid "must be owner of operator %s"
-msgstr "%s operatörünün sahibi olmalısınız"
-
-#: catalog/aclchk.c:2123
-#, c-format
-msgid "must be owner of type %s"
-msgstr "%s tipinin sahibi olmalısınız"
-
-#: catalog/aclchk.c:2125
-#, c-format
-msgid "must be owner of language %s"
-msgstr "%s dilinin sahibi olmalısınız"
-
-#: catalog/aclchk.c:2127
-#, c-format
-msgid "must be owner of schema %s"
-msgstr "%s şemasının sahibi olmalısınız"
-
-#: catalog/aclchk.c:2129
-#, c-format
-msgid "must be owner of operator class %s"
-msgstr "%s operatör sınıfının sahibi olmalısınız"
-
-#: catalog/aclchk.c:2131
-#, c-format
-msgid "must be owner of operator family %s"
-msgstr "%s operator ailesinin sahibi olmalısınız"
-
-#: catalog/aclchk.c:2133
-#, c-format
-msgid "must be owner of conversion %s"
-msgstr "%s dönüşümünün sahibi olmalısınız"
-
-#: catalog/aclchk.c:2135
-#, c-format
-msgid "must be owner of tablespace %s"
-msgstr "%s tablespace'inin sahibi olmalısınız"
-
-#: catalog/aclchk.c:2137
-#, c-format
-msgid "must be owner of text search dictionary %s"
-msgstr "%s metin arama sözlüğünün sahibi olmalısınız"
-
-#: catalog/aclchk.c:2139
-#, c-format
-msgid "must be owner of text search configuration %s"
-msgstr "%s metin arama sözlüğünün sahibi olmalısınız"
-
-#: catalog/aclchk.c:2141
-#, fuzzy, c-format
-msgid "must be owner of foreign-data wrapper %s"
-msgstr "%s veritabanının sahibi olmalısınız"
-
-#: catalog/aclchk.c:2143
-#, fuzzy, c-format
-msgid "must be owner of foreign server %s"
-msgstr "%s dönüşümünün sahibi olmalısınız"
-
-#: catalog/aclchk.c:2185
-#, fuzzy, c-format
-msgid "permission denied for column %s of relation %s"
-msgstr "%s nesnesine eriÅŸim engellendi"
-
-#: catalog/aclchk.c:2214
-#, c-format
-msgid "role with OID %u does not exist"
-msgstr "OID %u olan rol mevcut deÄŸil"
-
-#: catalog/aclchk.c:2305
-#: catalog/aclchk.c:2313
-#, fuzzy, c-format
-msgid "attribute %d of relation with OID %u does not exist"
-msgstr "%u OID'li nesne mevcut deÄŸil"
-
-#: catalog/aclchk.c:2390
-#: catalog/aclchk.c:3146
-#, c-format
-msgid "relation with OID %u does not exist"
-msgstr "%u OID'li nesne mevcut deÄŸil"
-
-#: catalog/aclchk.c:2598
-#: catalog/aclchk.c:3258
-#, c-format
-msgid "language with OID %u does not exist"
-msgstr "%u OID'li dil mevcut deÄŸil"
-
-#: catalog/aclchk.c:2682
-#: catalog/aclchk.c:3286
-#, c-format
-msgid "schema with OID %u does not exist"
-msgstr "%u OID'li ÅŸema mevcut deÄŸil"
-
-#: catalog/aclchk.c:2748
-#: catalog/aclchk.c:3325
-#, c-format
-msgid "tablespace with OID %u does not exist"
-msgstr "%u OID'li tablespace mevcut deÄŸil"
-
-#: catalog/aclchk.c:2808
-#, fuzzy, c-format
-msgid "foreign-data wrapper with OID %u does not exist"
-msgstr "%u OID'li veritabanı mevcut değil"
-
-#: catalog/aclchk.c:2871
-#: catalog/aclchk.c:3470
-#, fuzzy, c-format
-msgid "foreign server with OID %u does not exist"
-msgstr "%u OID'li dönüşüm mevcut değil"
-
-#: catalog/aclchk.c:3174
-#, c-format
-msgid "type with OID %u does not exist"
-msgstr "%u OID'li tip mevcut deÄŸil"
-
-#: catalog/aclchk.c:3202
-#, c-format
-msgid "operator with OID %u does not exist"
-msgstr "%u OID'li operatör mevcut değil"
-
-#: catalog/aclchk.c:3354
-#, c-format
-msgid "operator class with OID %u does not exist"
-msgstr "%u OID'li operatör sınıfı mevcut değil"
-
-#: catalog/aclchk.c:3383
-#, c-format
-msgid "operator family with OID %u does not exist"
-msgstr "OID'i %u olan operatör mevcut değil"
-
-#: catalog/aclchk.c:3412
-#, c-format
-msgid "text search dictionary with OID %u does not exist"
-msgstr "%u OID'li metin arama sözlüğü mevcut değil"
-
-#: catalog/aclchk.c:3441
-#, c-format
-msgid "text search configuration with OID %u does not exist"
-msgstr "%u OID'li metin arama sözlüğü mevcut değil"
-
-#: catalog/aclchk.c:3527
-#, c-format
-msgid "conversion with OID %u does not exist"
-msgstr "%u OID'li dönüşüm mevcut değil"
-
-#: catalog/catalog.c:75
-#, fuzzy
-msgid "invalid fork name"
-msgstr "geçirsiz rol adı \"%s\""
-
-#: catalog/catalog.c:76
-#, fuzzy
-msgid "Valid fork names are \"main\", \"fsm\", and \"vm\"."
-msgstr "Geçerli değerler: \"none\", \"mod\", \"ddl\", ve \"all\"."
-
-#: catalog/dependency.c:569
-#, c-format
-msgid "cannot drop %s because %s requires it"
-msgstr "%s tarafından kullanıldığı için %s kaldırılamıyor"
-
-#: catalog/dependency.c:572
-#, c-format
-msgid "You can drop %s instead."
-msgstr "Onun yerine %s nesnesini kaldırabilirsiniz."
-
-#: catalog/dependency.c:725
-#: catalog/pg_shdepend.c:547
-#, c-format
-msgid "cannot drop %s because it is required by the database system"
-msgstr "veritabanı sistemi tarafından kullanıldığı için %s kaldırılamıyor"
-
-#: catalog/dependency.c:839
-#, c-format
-msgid "drop auto-cascades to %s"
-msgstr "drop, auto-cascade neticesinde %s nesnesine varıyor"
-
-#: catalog/dependency.c:851
-#: catalog/dependency.c:860
-#, c-format
-msgid "%s depends on %s"
-msgstr "%s, %s nesnesine bağlıdır"
-
-#: catalog/dependency.c:872
-#: catalog/dependency.c:881
-#, c-format
-msgid "drop cascades to %s"
-msgstr "kaldırma işlemi , cascade neticesinde %s' nesnesine varıyor"
-
-#: catalog/dependency.c:889
-#: catalog/pg_shdepend.c:658
-#, fuzzy, c-format
-msgid ""
-"\n"
-"and %d other object (see server log for list)"
-msgid_plural ""
-"\n"
-"and %d other objects (see server log for list)"
-msgstr[0] ""
-"\n"
-"ve daha %d nesne (liste için sunucu log dosyasına bakın)"
-msgstr[1] ""
-"\n"
-"ve daha %d nesne (liste için sunucu log dosyasına bakın)"
-
-#: catalog/dependency.c:901
-#, c-format
-msgid "cannot drop %s because other objects depend on it"
-msgstr "diğer nesnelerin ona bağlı olması nedeniyle %s kaldırılamıyor"
-
-#: catalog/dependency.c:905
-#: catalog/dependency.c:912
-msgid "Use DROP ... CASCADE to drop the dependent objects too."
-msgstr "Bağlı nesneleri de kaldırmak için DROP ... CASCADE kullanın."
-
-#: catalog/dependency.c:909
-#, fuzzy
-msgid "cannot drop desired object(s) because other objects depend on them"
-msgstr "diğer nesnelerin ona bağlı olması nedeniyle %s kaldırılamıyor"
-
-#. translator: %d always has a value larger than 1
-#: catalog/dependency.c:918
-#, fuzzy, c-format
-msgid "drop cascades to %d other object"
-msgid_plural "drop cascades to %d other objects"
-msgstr[0] "kaldırma işlemi , cascade neticesinde %s' nesnesine varıyor"
-msgstr[1] "kaldırma işlemi , cascade neticesinde %s' nesnesine varıyor"
-
-#: catalog/dependency.c:2075
-#, c-format
-msgid " column %s"
-msgstr "%s sütunu"
-
-#: catalog/dependency.c:2081
-#, c-format
-msgid "function %s"
-msgstr "%s fonksiyonu"
-
-#: catalog/dependency.c:2086
-#, c-format
-msgid "type %s"
-msgstr "%s tipi"
-
-#: catalog/dependency.c:2116
-#, c-format
-msgid "cast from %s to %s"
-msgstr "%s tipi %s tipine cast"
-
-#: catalog/dependency.c:2144
-#, fuzzy, c-format
-msgid "constraint %s on %s"
-msgstr "%s constrainti etkin"
-
-#: catalog/dependency.c:2150
-#, c-format
-msgid "constraint %s"
-msgstr "%s constraint"
-
-#: catalog/dependency.c:2168
-#, c-format
-msgid "conversion %s"
-msgstr "%s dönüşümünü"
-
-#: catalog/dependency.c:2205
-#, c-format
-msgid "default for %s"
-msgstr "%s için varsayılan"
-
-#: catalog/dependency.c:2223
-#, c-format
-msgid "language %s"
-msgstr "%s dili"
-
-#: catalog/dependency.c:2230
-#, c-format
-msgid "operator %s"
-msgstr "%s operatoru"
-
-#: catalog/dependency.c:2264
-#, c-format
-msgid "operator class %s for access method %s"
-msgstr "%2$s erişim yöntemi için %1$s erişim metodu"
-
-#: catalog/dependency.c:2314
-#, fuzzy, c-format
-msgid "operator %d %s of %s"
-msgstr "%d %s operatoru "
-
-#: catalog/dependency.c:2361
-#, fuzzy, c-format
-msgid "function %d %s of %s"
-msgstr "%d %s fonksiyonu "
-
-#: catalog/dependency.c:2398
-#, c-format
-msgid "rule %s on "
-msgstr "%s rule etkin"
-
-#: catalog/dependency.c:2433
-#, c-format
-msgid "trigger %s on "
-msgstr "%s triggeri etkin"
-
-#: catalog/dependency.c:2450
-#, c-format
-msgid "schema %s"
-msgstr "%s şeması"
-
-#: catalog/dependency.c:2464
-#, c-format
-msgid "text search parser %s"
-msgstr "metin arama ayrıştırıcısı %s"
-
-#: catalog/dependency.c:2480
-#, c-format
-msgid "text search dictionary %s"
-msgstr "metin arama sözlüğü %s"
-
-#: catalog/dependency.c:2496
-#, c-format
-msgid "text search template %s"
-msgstr "metin arama ÅŸablonu %s"
-
-#: catalog/dependency.c:2512
-#, c-format
-msgid "text search configuration %s"
-msgstr "%s metin arama yapılandırması"
-
-#: catalog/dependency.c:2520
-#, c-format
-msgid "role %s"
-msgstr "%s rolü"
-
-#: catalog/dependency.c:2533
-#, c-format
-msgid "database %s"
-msgstr "%s veritabanı"
-
-#: catalog/dependency.c:2545
-#, c-format
-msgid "tablespace %s"
-msgstr "%s tablespace"
-
-#: catalog/dependency.c:2554
-#, fuzzy, c-format
-msgid "foreign-data wrapper %s"
-msgstr "kullanıcı tanımlı operatörler okunuyor\n"
-
-#: catalog/dependency.c:2563
-#, c-format
-msgid "server %s"
-msgstr "sunucu %s"
-
-#: catalog/dependency.c:2589
-#, c-format
-msgid "user mapping for %s"
-msgstr ""
-
-#: catalog/dependency.c:2633
-#, c-format
-msgid "table %s"
-msgstr "%s tablosu"
-
-#: catalog/dependency.c:2637
-#, c-format
-msgid "index %s"
-msgstr "%s indeksi"
-
-#: catalog/dependency.c:2641
-#, c-format
-msgid "sequence %s"
-msgstr "%s sequence"
-
-#: catalog/dependency.c:2645
-#, c-format
-msgid "uncataloged table %s"
-msgstr "%s katalog edilemeiÅŸ tablo"
-
-#: catalog/dependency.c:2649
-#, c-format
-msgid "toast table %s"
-msgstr "%s toast tablosu"
-
-#: catalog/dependency.c:2653
-#, c-format
-msgid "view %s"
-msgstr "%s view"
-
-#: catalog/dependency.c:2657
-#, c-format
-msgid "composite type %s"
-msgstr "%s composite type"
-
-#: catalog/dependency.c:2662
-#, c-format
-msgid "relation %s"
-msgstr "%s nesnesi"
-
-#: catalog/dependency.c:2703
-#, c-format
-msgid "operator family %s for access method %s"
-msgstr "%2$s erişim yöntemi için %1$s operatörü "
-
-#: catalog/heap.c:241
-#, c-format
-msgid "permission denied to create \"%s.%s\""
-msgstr "\"%s.%s\" oluşturulmasına izin verilmedi"
-
-#: catalog/heap.c:243
-msgid "System catalog modifications are currently disallowed."
-msgstr "System catalog deÄŸiÅŸikliklerine ÅŸu anda izin verilmiyor."
-
-#: catalog/heap.c:362
-#: commands/tablecmds.c:1156
-#: commands/tablecmds.c:1481
-#: commands/tablecmds.c:3597
-#, c-format
-msgid "tables can have at most %d columns"
-msgstr "bir tablo en fazla %d sütun içerebilir"
-
-#: catalog/heap.c:379
-#, c-format
-msgid "column name \"%s\" conflicts with a system column name"
-msgstr "\"%s\" kolon adı sistem kolonu ile çakışmaktadır"
-
-#: catalog/heap.c:395
-#, c-format
-msgid "column name \"%s\" specified more than once"
-msgstr "\"%s\" kolon adı birden fazla belirtilmiş"
-
-#: catalog/heap.c:431
-#, c-format
-msgid "column \"%s\" has type \"unknown\""
-msgstr "\"%s\" sütunu \"unknown\" tipine sahip"
-
-#: catalog/heap.c:432
-msgid "Proceeding with relation creation anyway."
-msgstr "Nesne oluşturmasına yine de devam edilmektedir."
-
-#: catalog/heap.c:443
-#, c-format
-msgid "column \"%s\" has pseudo-type %s"
-msgstr "\"%s\" sütunu %s pseudo-tipine sahip"
-
-#: catalog/heap.c:866
-#: catalog/index.c:595
-#: commands/tablecmds.c:2112
-#, c-format
-msgid "relation \"%s\" already exists"
-msgstr "\"%s\" nesnesi zaten mevcut"
-
-#: catalog/heap.c:883
-#: catalog/pg_type.c:379
-#: catalog/pg_type.c:656
-#: commands/typecmds.c:219
-#: commands/typecmds.c:796
-#: commands/typecmds.c:1122
-#, c-format
-msgid "type \"%s\" already exists"
-msgstr "\"%s\" tipi zaten mevcut"
-
-#: catalog/heap.c:884
-msgid "A relation has an associated type of the same name, so you must use a name that doesn't conflict with any existing type."
-msgstr "Aynı adı taşıyan bir nesneye ilişkili veri tipi mevcuttur, başka bir ad seçmelisiniz."
-
-#: catalog/heap.c:905
-#: catalog/index.c:589
-#: commands/tablecmds.c:6693
-msgid "only shared relations can be placed in pg_global tablespace"
-msgstr "pg_global tablo aralığına sadece paylaşımlı sensne konulabilir"
-
-#: catalog/heap.c:1434
-#, fuzzy, c-format
-msgid "cannot drop \"%s\" because it is being used by active queries in this session"
-msgstr "\"%s\" tablosu şu anda aktif sorgular tarafından kullanılmaktadır"
-
-#: catalog/heap.c:1885
-#, c-format
-msgid "check constraint \"%s\" already exists"
-msgstr "\"%s\"check constraint'i zaten mevcut"
-
-#: catalog/heap.c:2029
-#: catalog/pg_constraint.c:613
-#: commands/tablecmds.c:4430
-#, c-format
-msgid "constraint \"%s\" for relation \"%s\" already exists"
-msgstr "\"%s\" constraint 'i \"%s\" nesnesi için zaten mevcut"
-
-#: catalog/heap.c:2033
-#, fuzzy, c-format
-msgid "merging constraint \"%s\" with inherited definition"
-msgstr "\"%s\" sütunu miras alınan tanımı ile birleştiriliyor"
-
-#: catalog/heap.c:2132
-msgid "cannot use column references in default expression"
-msgstr "defaul ifadesinde sütun referansı kullanılamaz"
-
-#: catalog/heap.c:2140
-msgid "default expression must not return a set"
-msgstr "öntanımlı ifade küme döndürmelidir"
-
-#: catalog/heap.c:2148
-msgid "cannot use subquery in default expression"
-msgstr "öntanımlı ifadede subquery kullanılamaz"
-
-#: catalog/heap.c:2152
-msgid "cannot use aggregate function in default expression"
-msgstr "öntanımlı ifadede aggregate fonksiyonu kullanılamaz"
-
-#: catalog/heap.c:2156
-#, fuzzy
-msgid "cannot use window function in default expression"
-msgstr "öntanımlı ifadede aggregate fonksiyonu kullanılamaz"
-
-#: catalog/heap.c:2175
-#: rewrite/rewriteHandler.c:942
-#, c-format
-msgid "column \"%s\" is of type %s but default expression is of type %s"
-msgstr "\"%s\" kolonunun tipi %s'dır, ancak öntanımlı ifadenin tipi %s'dir."
-
-#: catalog/heap.c:2180
-#: commands/prepare.c:370
-#: parser/parse_node.c:367
-#: parser/parse_target.c:471
-#: parser/parse_target.c:730
-#: parser/parse_target.c:740
-#: rewrite/rewriteHandler.c:947
-msgid "You will need to rewrite or cast the expression."
-msgstr "Bu ifadeyi yinden yazmalı ya da sonucunu cast etmelisiniz."
-
-#: catalog/heap.c:2216
-#, c-format
-msgid "only table \"%s\" can be referenced in check constraint"
-msgstr "check constraint içerisinde sadece \"%s\" tablosu kullanılabilir"
-
-#: catalog/heap.c:2225
-#: commands/typecmds.c:2258
-msgid "cannot use subquery in check constraint"
-msgstr "check constraint içinde subquery kullanılamaz"
-
-#: catalog/heap.c:2229
-#: commands/typecmds.c:2262
-msgid "cannot use aggregate function in check constraint"
-msgstr "check constraint içinde aggregate function kullanılamaz"
-
-#: catalog/heap.c:2233
-#: commands/typecmds.c:2266
-#, fuzzy
-msgid "cannot use window function in check constraint"
-msgstr "check constraint içinde aggregate function kullanılamaz"
-
-#: catalog/heap.c:2452
-msgid "unsupported ON COMMIT and foreign key combination"
-msgstr "desteklenmeyen ON COMMIT ve foreign key birleÅŸtirmesi"
-
-#: catalog/heap.c:2453
-#, c-format
-msgid "Table \"%s\" references \"%s\", but they do not have the same ON COMMIT setting."
-msgstr "\"%s\" tablosu \"%s\" tablosuna başvuruyor ancak ikisi aynı ON COMMIT ayarına sahip değildir."
-
-#: catalog/heap.c:2458
-msgid "cannot truncate a table referenced in a foreign key constraint"
-msgstr "ikincil anahtar bütünlük kısıtlamasının refere ettiği tabloyu truncate edemezsiniz"
-
-#: catalog/heap.c:2459
-#, c-format
-msgid "Table \"%s\" references \"%s\"."
-msgstr "\"%s\" tablosu \"%s\" tablosuna baÅŸvuruyor."
-
-#: catalog/heap.c:2461
-#, c-format
-msgid "Truncate table \"%s\" at the same time, or use TRUNCATE ... CASCADE."
-msgstr "\"%s\" tablosuna da truncate işlemi uygulayın, veya TRUNCATE ... CASCADE işlemi kullanın."
-
-#: catalog/index.c:552
-msgid "user-defined indexes on system catalog tables are not supported"
-msgstr "sistem katalog tabloları üzerinde kullanıcı tanımlı index oluşturulamaz"
-
-#: catalog/index.c:562
-msgid "concurrent index creation on system catalog tables is not supported"
-msgstr "sistem katalog tabloları üzerinde koşutzamanlı index oluşturma işlemi yapılamaz"
-
-#: catalog/index.c:571
-msgid "shared indexes cannot be created after initdb"
-msgstr "initdb iÅŸleminden sonra shared indeks oluÅŸturulamaz"
-
-#: catalog/index.c:2270
-msgid "cannot reindex temporary tables of other sessions"
-msgstr "diğer oturumların geçici tabloları yeniden indexlenemez"
-
-#: catalog/index.c:2292
-#, c-format
-msgid "shared index \"%s\" can only be reindexed in stand-alone mode"
-msgstr "\"%s\" shared indexe sadece stand-alone modunda reindex iÅŸlemi uygulanabilir"
-
-#: catalog/namespace.c:229
-#: catalog/namespace.c:303
-#: commands/trigger.c:3514
-#, c-format
-msgid "cross-database references are not implemented: \"%s.%s.%s\""
-msgstr "veritabanı-arası referanslar oluşturulamaz: \"%s.%s.%s\""
-
-#: catalog/namespace.c:247
-#: catalog/namespace.c:314
-msgid "temporary tables cannot specify a schema name"
-msgstr "geçici tablolarda şema adı belirtilemez"
-
-#: catalog/namespace.c:270
-#: commands/lockcmds.c:113
-#: parser/parse_relation.c:864
-#, c-format
-msgid "relation \"%s.%s\" does not exist"
-msgstr "\"%s.%s\" nesnesi mevcut deÄŸil"
-
-#: catalog/namespace.c:356
-#: catalog/namespace.c:2230
-msgid "no schema has been selected to create in"
-msgstr "oluşturma işlemi için şema adı belirtimemiş"
-
-#: catalog/namespace.c:1575
-#: commands/tsearchcmds.c:306
-#, c-format
-msgid "text search parser \"%s\" does not exist"
-msgstr "\"%s\" metin arama ayrıştırıcısı mevcut değil"
-
-#: catalog/namespace.c:1703
-#: commands/tsearchcmds.c:664
-#, c-format
-msgid "text search dictionary \"%s\" does not exist"
-msgstr "\"%s\" metin arama sözlüğü mevcut değil"
-
-#: catalog/namespace.c:1832
-#: commands/tsearchcmds.c:1158
-#, c-format
-msgid "text search template \"%s\" does not exist"
-msgstr "\"%s\" metin arama ÅŸablonu mevcut deÄŸil"
-
-#: catalog/namespace.c:1960
-#: commands/tsearchcmds.c:1562
-#: commands/tsearchcmds.c:1722
-#, c-format
-msgid "text search configuration \"%s\" does not exist"
-msgstr "\"%s\" metin arama sözlüğü mevcut değil"
-
-#: catalog/namespace.c:2076
-#: parser/parse_expr.c:578
-#: parser/parse_target.c:909
-#, c-format
-msgid "cross-database references are not implemented: %s"
-msgstr "veritabanı-arası referanslar oluşturulamaz: %s"
-
-#: catalog/namespace.c:2082
-#: parser/parse_expr.c:612
-#: parser/parse_target.c:919
-#: gram.y:3434
-#: gram.y:9931
-#, c-format
-msgid "improper qualified name (too many dotted names): %s"
-msgstr "geçersiz qualified adı (çok fazla noktalı isim): %s"
-
-#: catalog/namespace.c:2262
-#, c-format
-msgid "improper relation name (too many dotted names): %s"
-msgstr "geçersiz nesne adı (çok fazla noktalı isim): %s"
-
-#: catalog/namespace.c:2836
-#, c-format
-msgid "permission denied to create temporary tables in database \"%s\""
-msgstr "\"%s\" veritabanında geçici veritabanı oluşturma izni yok"
-
-#: catalog/pg_aggregate.c:100
-msgid "cannot determine transition data type"
-msgstr "geçiş veri tipi belirlenemedi"
-
-#: catalog/pg_aggregate.c:101
-msgid "An aggregate using a polymorphic transition type must have at least one polymorphic argument."
-msgstr "Polymorphic kullanan aggregateler bu en az birer polymorphic argüman içermelidir."
-
-#: catalog/pg_aggregate.c:124
-#, c-format
-msgid "return type of transition function %s is not %s"
-msgstr "%s geçiş fonksiyonunun tipi %s değildir"
-
-#: catalog/pg_aggregate.c:146
-msgid "must not omit initial value when transition function is strict and transition type is not compatible with input type"
-msgstr "geçiş fonksiyonu strict olduğunda ve giriş parametresinin tipi uyumsuz olduğunda başlangıç değeri mutlaka verilmelidir"
-
-#: catalog/pg_aggregate.c:177
-#: catalog/pg_proc.c:196
-msgid "cannot determine result data type"
-msgstr "sonuç veri tipi belirlenemiyor"
-
-#: catalog/pg_aggregate.c:178
-msgid "An aggregate returning a polymorphic type must have at least one polymorphic argument."
-msgstr "Polymorphic döndüren aggregateler bu en az birer polymorphic argüman içermelidir."
-
-#: catalog/pg_aggregate.c:190
-#: catalog/pg_proc.c:202
-msgid "unsafe use of pseudo-type \"internal\""
-msgstr "\"internal\" pseudo-type'ın tehlikeli kullanışı"
-
-#: catalog/pg_aggregate.c:191
-#: catalog/pg_proc.c:203
-msgid "A function returning \"internal\" must have at least one \"internal\" argument."
-msgstr "\"internal\"  döndüren fonksiyonlar bu tiplerden en az bir argüman \"internal\" olmalıdır."
-
-#: catalog/pg_aggregate.c:199
-msgid "sort operator can only be specified for single-argument aggregates"
-msgstr "sort işletmeni sadece tek argümanlı aggregate işin belirtilebilir"
-
-#: catalog/pg_aggregate.c:332
-#: commands/typecmds.c:1274
-#: commands/typecmds.c:1325
-#: commands/typecmds.c:1356
-#: commands/typecmds.c:1379
-#: commands/typecmds.c:1400
-#: commands/typecmds.c:1427
-#: commands/typecmds.c:1454
-#: parser/parse_func.c:236
-#: parser/parse_func.c:1291
-#, c-format
-msgid "function %s does not exist"
-msgstr "%s fonksiyonu mevcut deÄŸildir"
-
-#: catalog/pg_aggregate.c:337
-#, c-format
-msgid "function %s returns a set"
-msgstr "%s fonksiyonu bir küme döndürüyor"
-
-#: catalog/pg_aggregate.c:361
-#, c-format
-msgid "function %s requires run-time type coercion"
-msgstr "%s fonksiyonu çalışma zamanı tipi zorlaması gerektirir"
-
-#: catalog/pg_constraint.c:622
-#: commands/typecmds.c:2199
-#, c-format
-msgid "constraint \"%s\" for domain \"%s\" already exists"
-msgstr "\"%2$s\" domain için \"%1$s\" constraint için zaten mevcut"
-
-#: catalog/pg_conversion.c:67
-#, c-format
-msgid "conversion \"%s\" already exists"
-msgstr "conversion \"%s\" zaten mevcut"
-
-#: catalog/pg_conversion.c:80
-#, c-format
-msgid "default conversion for %s to %s already exists"
-msgstr "%s'dan %s'a öntanımlı dönüşüm zaten mevcut"
-
-#: catalog/pg_depend.c:209
-#, c-format
-msgid "cannot remove dependency on %s because it is a system object"
-msgstr "sistem nesnesi tarafından kullanıldığı için %s kaldırılamıyor"
-
-#: catalog/pg_enum.c:91
-#, c-format
-msgid "invalid enum label \"%s\""
-msgstr "Geçersiz enum etiketi: \"%s\""
-
-#: catalog/pg_enum.c:92
-#, c-format
-msgid "Labels must be %d characters or less."
-msgstr "Etiketler %d karakter ya da daha az olmalıdır."
-
-#: catalog/pg_largeobject.c:107
-#: commands/comment.c:1423
-#: storage/large_object/inv_api.c:266
-#: storage/large_object/inv_api.c:371
-#, c-format
-msgid "large object %u does not exist"
-msgstr "large object %u mevcut deÄŸil"
-
-#: catalog/pg_namespace.c:52
-#: commands/schemacmds.c:276
-#, c-format
-msgid "schema \"%s\" already exists"
-msgstr "\"%s\" şeması zaten mevcut"
-
-#: catalog/pg_operator.c:220
-#: catalog/pg_operator.c:358
-#, c-format
-msgid "\"%s\" is not a valid operator name"
-msgstr "\"%s\" geçerli bir operatör adı değildir"
-
-#: catalog/pg_operator.c:367
-msgid "only binary operators can have commutators"
-msgstr "sadece ikili iÅŸlemler bir commutator'a sahip olabilirler"
-
-#: catalog/pg_operator.c:371
-msgid "only binary operators can have join selectivity"
-msgstr "sadece ikili operatörler join selectivity'sine sahip olabilirler"
-
-#: catalog/pg_operator.c:375
-msgid "only binary operators can merge join"
-msgstr "sadece ikili iÅŸlemler merge join edebilirler"
-
-#: catalog/pg_operator.c:379
-msgid "only binary operators can hash"
-msgstr "sadece ikili iÅŸlemler hash edebilirler"
-
-#: catalog/pg_operator.c:390
-#, fuzzy
-msgid "only boolean operators can have negators"
-msgstr "sadece ikili iÅŸlemler bir commutator'a sahip olabilirler"
-
-#: catalog/pg_operator.c:394
-#, fuzzy
-msgid "only boolean operators can have restriction selectivity"
-msgstr "sadece ikili operatörler join selectivity'sine sahip olabilirler"
-
-#: catalog/pg_operator.c:398
-#, fuzzy
-msgid "only boolean operators can have join selectivity"
-msgstr "sadece ikili operatörler join selectivity'sine sahip olabilirler"
-
-#: catalog/pg_operator.c:402
-#, fuzzy
-msgid "only boolean operators can merge join"
-msgstr "sadece ikili iÅŸlemler merge join edebilirler"
-
-#: catalog/pg_operator.c:406
-#, fuzzy
-msgid "only boolean operators can hash"
-msgstr "sadece ikili iÅŸlemler hash edebilirler"
-
-#: catalog/pg_operator.c:418
-#, c-format
-msgid "operator %s already exists"
-msgstr "%s operatörü zaten mevcut"
-
-#: catalog/pg_operator.c:608
-msgid "operator cannot be its own negator or sort operator"
-msgstr "bir işlem, kendisinin zıttı veya kendisinin sort operatörü olamaz"
-
-#: catalog/pg_proc.c:115
-#: parser/parse_func.c:1335
-#: parser/parse_func.c:1375
-#, fuzzy, c-format
-msgid "functions cannot have more than %d argument"
-msgid_plural "functions cannot have more than %d arguments"
-msgstr[0] "bir fonksiyonun arguman sayısı %d sayısından büyük olamaz"
-msgstr[1] "bir fonksiyonun arguman sayısı %d sayısından büyük olamaz"
-
-#: catalog/pg_proc.c:197
-msgid "A function returning a polymorphic type must have at least one polymorphic argument."
-msgstr "Polymorphic tipini döndüren fonksiyonlar en az bir polymorphic argüman içermelidir."
-
-#: catalog/pg_proc.c:215
-#, c-format
-msgid "\"%s\" is already an attribute of type %s"
-msgstr "\"%s\" zanten %s tipinin özelliğidir"
-
-#: catalog/pg_proc.c:354
-#, c-format
-msgid "function \"%s\" already exists with same argument types"
-msgstr "\"%s\" fonksiyonu aynı argüman veri tipleriyle zaten mevcut"
-
-#: catalog/pg_proc.c:368
-#: catalog/pg_proc.c:390
-msgid "cannot change return type of existing function"
-msgstr "var olan bir fonksiyonun döndürme tipi değiştirilemez"
-
-#: catalog/pg_proc.c:369
-#: catalog/pg_proc.c:392
-#: catalog/pg_proc.c:415
-#: catalog/pg_proc.c:441
-msgid "Use DROP FUNCTION first."
-msgstr "Önce DROP FUNCTION kullanın."
-
-#: catalog/pg_proc.c:391
-msgid "Row type defined by OUT parameters is different."
-msgstr "OUT parametresinde tanımlanmış Row veri tipi farklıdır."
-
-#: catalog/pg_proc.c:414
-#, fuzzy
-msgid "cannot remove parameter defaults from existing function"
-msgstr "var olan bir fonksiyonun döndürme tipi değiştirilemez"
-
-#: catalog/pg_proc.c:440
-#, fuzzy
-msgid "cannot change data type of existing parameter default value"
-msgstr "var olan bir fonksiyonun döndürme tipi değiştirilemez"
-
-#: catalog/pg_proc.c:452
-#, fuzzy, c-format
-msgid "function \"%s\" is an aggregate function"
-msgstr "\"%s\" fonksiyonu bir aggregate'tir"
-
-#: catalog/pg_proc.c:457
-#, fuzzy, c-format
-msgid "function \"%s\" is not an aggregate function"
-msgstr "\"%s\" fonksiyonu bir aggregate deÄŸildir"
-
-#: catalog/pg_proc.c:465
-#, fuzzy, c-format
-msgid "function \"%s\" is a window function"
-msgstr "%s fonksiyonu benzersiz deÄŸildir"
-
-#: catalog/pg_proc.c:470
-#, fuzzy, c-format
-msgid "function \"%s\" is not a window function"
-msgstr "\"%s\" fonksiyonu bir aggregate deÄŸildir"
-
-#: catalog/pg_proc.c:595
-#, c-format
-msgid "there is no built-in function named \"%s\""
-msgstr "\"%s\" adlı gömülü bir fonksiyon yok"
-
-#: catalog/pg_proc.c:690
-#, c-format
-msgid "SQL functions cannot return type %s"
-msgstr "SQL fonksiyonları %s tipini dündüremezler"
-
-#: catalog/pg_proc.c:705
-#, c-format
-msgid "SQL functions cannot have arguments of type %s"
-msgstr "SQL fonksiyonları %s tipinde argümana sahip olamaz"
-
-#: catalog/pg_proc.c:777
-#: executor/functions.c:943
-#, c-format
-msgid "SQL function \"%s\""
-msgstr " \"%s\" SQL fonksiyonu"
-
-#: catalog/pg_type.c:224
-#, c-format
-msgid "invalid type internal size %d"
-msgstr "tip dahili boyutu geçersiz :%d"
-
-#: catalog/pg_type.c:240
-#: catalog/pg_type.c:248
-#: catalog/pg_type.c:256
-#: catalog/pg_type.c:265
-#, fuzzy, c-format
-msgid "alignment \"%c\" is invalid for passed-by-value type of size %d"
-msgstr "passed-by-value tipler için %d dahili tip geçersizdir"
-
-#: catalog/pg_type.c:272
-#, c-format
-msgid "internal size %d is invalid for passed-by-value type"
-msgstr "passed-by-value tipler için %d dahili tip geçersizdir"
-
-#: catalog/pg_type.c:281
-#: catalog/pg_type.c:287
-#, fuzzy, c-format
-msgid "alignment \"%c\" is invalid for variable-length type"
-msgstr "passed-by-value tipler için %d dahili tip geçersizdir"
-
-#: catalog/pg_type.c:295
-msgid "fixed-size types must have storage PLAIN"
-msgstr "sabit-boyutlu tipler PLAIN storage özelliği ile tanımlanmalıdır"
-
-#: catalog/pg_type.c:718
-#, c-format
-msgid "could not form array type name for type \"%s\""
-msgstr "\"%s\" tipi için array tipi bulunamıyor"
-
-#: catalog/pg_shdepend.c:665
-#, fuzzy, c-format
-msgid ""
-"\n"
-"and objects in %d other database (see server log for list)"
-msgid_plural ""
-"\n"
-"and objects in %d other databases (see server log for list)"
-msgstr[0] ""
-"\n"
-"ve %d başka veritabanında nesneleri (liste için sunucu log dosyasına bakın)"
-msgstr[1] ""
-"\n"
-"ve %d başka veritabanında nesneleri (liste için sunucu log dosyasına bakın)"
-
-#: catalog/pg_shdepend.c:979
-#, c-format
-msgid "role %u was concurrently dropped"
-msgstr "%u rolü eşzamanlı kaldırıldı"
-
-#: catalog/pg_shdepend.c:998
-#, c-format
-msgid "tablespace %u was concurrently dropped"
-msgstr "%u tablespace eşzamanlı kaldırıldı"
-
-#: catalog/pg_shdepend.c:1042
-#, c-format
-msgid "owner of %s"
-msgstr "%s nesnesinin sahibi"
-
-#: catalog/pg_shdepend.c:1044
-#, c-format
-msgid "access to %s"
-msgstr "eriÅŸim: %s"
-
-#. translator: %s will always be "database %s"
-#: catalog/pg_shdepend.c:1052
-#, fuzzy, c-format
-msgid "%d object in %s"
-msgid_plural "%d objects in %s"
-msgstr[0] "%2$s veritabanında %1$d nesne"
-msgstr[1] "%2$s veritabanında %1$d nesne"
-
-#: catalog/pg_shdepend.c:1163
-#: catalog/pg_shdepend.c:1293
-#, c-format
-msgid "cannot drop objects owned by %s because they are required by the database system"
-msgstr "veritabanı sistemi tarafından ihtiyaç duyulduğu için %s kaldırılamıyor"
-
-#: catalog/toasting.c:94
-#: commands/comment.c:516
-#: commands/indexcmds.c:174
-#: commands/indexcmds.c:1358
-#: commands/lockcmds.c:140
-#: commands/tablecmds.c:193
-#: commands/tablecmds.c:1029
-#: commands/tablecmds.c:3231
-#: commands/trigger.c:115
-#: commands/trigger.c:803
-#, c-format
-msgid "\"%s\" is not a table"
-msgstr "\"%s\" bir tablo deÄŸildir"
-
-#: catalog/toasting.c:143
-msgid "shared tables cannot be toasted after initdb"
-msgstr "initdb işleminden sonra paylaşılmış tablolar toast edilemez"
-
-#: commands/aggregatecmds.c:103
-#, c-format
-msgid "aggregate attribute \"%s\" not recognized"
-msgstr "aggregate parametresi \"%s\" tanınmıyor"
-
-#: commands/aggregatecmds.c:113
-msgid "aggregate stype must be specified"
-msgstr "aggregate type belirtilmelidir"
-
-#: commands/aggregatecmds.c:117
-msgid "aggregate sfunc must be specified"
-msgstr "aggregate sync belirtilmelidir"
-
-#: commands/aggregatecmds.c:134
-msgid "aggregate input type must be specified"
-msgstr "aggregate girdi veri tipi belirtilmelidir"
-
-#: commands/aggregatecmds.c:159
-msgid "basetype is redundant with aggregate input type specification"
-msgstr "aggregate input type specification ile basetype gereksizdir"
-
-#: commands/aggregatecmds.c:191
-#, c-format
-msgid "aggregate transition data type cannot be %s"
-msgstr "aggregate transaction veri tipi %s olamaz"
-
-#: commands/aggregatecmds.c:230
-#, c-format
-msgid "aggregate %s(%s) does not exist, skipping"
-msgstr "aggregate %s(%s) mevcut değil, atlanıyor"
-
-#: commands/aggregatecmds.c:297
-#: commands/functioncmds.c:1097
-#, c-format
-msgid "function %s already exists in schema \"%s\""
-msgstr "%s fonksiyonu \"%s\" şemasında zaten mevcut"
-
-#: commands/analyze.c:180
-#, c-format
-msgid "skipping \"%s\" --- only superuser can analyze it"
-msgstr "\"%s\" atlanıyor --- sadece superuser onu analiz edebilir"
-
-#: commands/analyze.c:184
-#, fuzzy, c-format
-msgid "skipping \"%s\" --- only superuser or database owner can analyze it"
-msgstr "\"%s\" atlanıyor --- sadece tablo ve veritabanı sahibi onu analiz edebilir"
-
-#: commands/analyze.c:188
-#, c-format
-msgid "skipping \"%s\" --- only table or database owner can analyze it"
-msgstr "\"%s\" atlanıyor --- sadece tablo ve veritabanı sahibi onu analiz edebilir"
-
-#: commands/analyze.c:204
-#, c-format
-msgid "skipping \"%s\" --- cannot analyze indexes, views, or special system tables"
-msgstr "\"%s\" atlanıyor --- indexler, viewlar ya da özel sistem tabloları analiz edilemez"
-
-#: commands/analyze.c:232
-#, c-format
-msgid "analyzing \"%s.%s\""
-msgstr "\"%s.%s\" analiz ediliyor"
-
-#: commands/analyze.c:531
-#, c-format
-msgid "automatic analyze of table \"%s.%s.%s\" system usage: %s"
-msgstr "\"%s.%s.%s\" tablosunun automatic analyze; system kullanımı: %s"
-
-#: commands/analyze.c:1117
-#, c-format
-msgid "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead rows; %d rows in sample, %.0f estimated total rows"
-msgstr "\"%1$s\": %4$.0f canlı ve %5$.0f ölü satırı olan; örneklemede %6$d satır olan, %7$.0f tahmini toplam satır içeren %3$u sayfadan %2$d sayfa taranmıştır"
-
-#: commands/async.c:344
-#, fuzzy
-msgid "cannot PREPARE a transaction that has executed LISTEN or UNLISTEN"
-msgstr "WITH HOLD imleci oluÅŸturan transaction PREPARE edilemedi"
-
-#: commands/cluster.c:123
-#: commands/cluster.c:471
-msgid "cannot cluster temporary tables of other sessions"
-msgstr "diğer oturumların geçici tabloları üzerinde cluster yapılamaz"
-
-#: commands/cluster.c:154
-#, c-format
-msgid "there is no previously clustered index for table \"%s\""
-msgstr "\"%s\" tablosunda daha önce cluster edilmiş index yoktur"
-
-#: commands/cluster.c:168
-#: commands/tablecmds.c:6473
-#, c-format
-msgid "index \"%s\" for table \"%s\" does not exist"
-msgstr "\"%s\"indexi, \"%s\" tablosunda mevcut deÄŸil"
-
-#: commands/cluster.c:348
-#, fuzzy, c-format
-msgid "clustering \"%s.%s\""
-msgstr "\"%s.%s\" veritabanına vacuum yapılıyor"
-
-#: commands/cluster.c:378
-#, c-format
-msgid "\"%s\" is not an index for table \"%s\""
-msgstr "\"%s\", \"%s\" tablosunun indexi deÄŸildir"
-
-#: commands/cluster.c:391
-#, c-format
-msgid "cannot cluster on partial index \"%s\""
-msgstr "\"%s\" partial index üzerinde cluster yapılamaz"
-
-#: commands/cluster.c:397
-#, c-format
-msgid "cannot cluster on index \"%s\" because access method does not support clustering"
-msgstr "\"%s\" indexin erişim yöntemi clustering desteklemediği için cluster yapılamaz"
-
-#: commands/cluster.c:417
-#, c-format
-msgid "cannot cluster on index \"%s\" because access method does not handle null values"
-msgstr "\"%s\" indexin erişim yöntemi null değerleri desteklemediği için cluster yapılamaz"
-
-#: commands/cluster.c:420
-#, c-format
-msgid "You might be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table."
-msgstr "Bunu önlemek için \"%s\" sütunu NOT NULL yaparak ya da tablodan cluser tanımlarını kaldırmak için ALTER TABLE ... SET WITHOUT CLUSTER kullanabilirsiniz."
-
-#: commands/cluster.c:422
-#, c-format
-msgid "You might be able to work around this by marking column \"%s\" NOT NULL."
-msgstr "\"%s\" sütununu NOT NULL olarak tanımlamakla bu sorunu çözebilirsiniz"
-
-#: commands/cluster.c:433
-#, c-format
-msgid "cannot cluster on expressional index \"%s\" because its index access method does not handle null values"
-msgstr "\"%s\" ifadesel indexin erişim yöntemi null değerleri desteklemediği için cluster yapılamaz"
-
-#: commands/cluster.c:448
-#, c-format
-msgid "cannot cluster on invalid index \"%s\""
-msgstr "\"%s\" geçersiz indexi üzerinde cluster işlemi yapılamaz"
-
-#: commands/cluster.c:461
-#, c-format
-msgid "\"%s\" is a system catalog"
-msgstr "\"%s\" bir sistem kataloÄŸudur"
-
-#: commands/comment.c:523
-#: commands/tablecmds.c:205
-#: commands/tablecmds.c:2051
-#: commands/tablecmds.c:2274
-#: commands/tablecmds.c:7508
-#: commands/view.c:162
-#, c-format
-msgid "\"%s\" is not a view"
-msgstr "\"%s\" bir view deÄŸildir"
-
-#: commands/comment.c:609
-msgid "database name cannot be qualified"
-msgstr "veritabanı ismi geçerli değil"
-
-#: commands/comment.c:657
-msgid "tablespace name cannot be qualified"
-msgstr "tablespace adı geçerli değil"
-
-#: commands/comment.c:694
-msgid "role name cannot be qualified"
-msgstr "rol adı geçerli değil"
-
-#: commands/comment.c:703
-#, c-format
-msgid "must be member of role \"%s\" to comment upon it"
-msgstr "\"%s\" rolüne açıklama eklemek için bu role dahil olmalısınız"
-
-#: commands/comment.c:727
-#: commands/schemacmds.c:177
-msgid "schema name cannot be qualified"
-msgstr "şema ismi geçerli değil"
-
-#: commands/comment.c:804
-#, c-format
-msgid "rule \"%s\" does not exist"
-msgstr "\"%s\" rule'u mevcut deÄŸil"
-
-#: commands/comment.c:812
-#, c-format
-msgid "there are multiple rules named \"%s\""
-msgstr "\"%s\" adını taşıyan birden fazla rule mevcut"
-
-#: commands/comment.c:813
-msgid "Specify a relation name as well as a rule name."
-msgstr "Rule adının yanında nesne adını da belirtin."
-
-#: commands/comment.c:841
-#: rewrite/rewriteDefine.c:689
-#: rewrite/rewriteDefine.c:752
-#: rewrite/rewriteRemove.c:63
-#, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist"
-msgstr "\"%s\" rule'u \"%s\" tablosunda mevcut deÄŸil"
-
-#: commands/comment.c:1036
-#: commands/trigger.c:734
-#: commands/trigger.c:934
-#: commands/trigger.c:1045
-#, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist"
-msgstr "\"%s\" triggeri \"%s\" tablosunda mevcut deÄŸil"
-
-#: commands/comment.c:1115
-#, c-format
-msgid "table \"%s\" has multiple constraints named \"%s\""
-msgstr "\"%s\" tablosu birden fazla \"%s\" adlı constrainte sahip"
-
-#: commands/comment.c:1127
-#, c-format
-msgid "constraint \"%s\" for table \"%s\" does not exist"
-msgstr "\"%2$s\" tablosu için \"%1$s\" bütünlük kısıtlaması mevcut değil"
-
-#: commands/comment.c:1156
-#: commands/conversioncmds.c:153
-#: commands/conversioncmds.c:211
-#: commands/conversioncmds.c:267
-#, c-format
-msgid "conversion \"%s\" does not exist"
-msgstr "\"%s\" dönüşümü mevcut değil"
-
-#: commands/comment.c:1186
-msgid "language name cannot be qualified"
-msgstr "dil ismi geçerli değil"
-
-#: commands/comment.c:1201
-msgid "must be superuser to comment on procedural language"
-msgstr "bir yordamsal dile açıklama eklemek için superuser olmalısınız"
-
-#: commands/comment.c:1238
-#: commands/comment.c:1324
-#: commands/indexcmds.c:286
-#: commands/opclasscmds.c:290
-#: commands/opclasscmds.c:682
-#: commands/opclasscmds.c:785
-#: commands/opclasscmds.c:1517
-#: commands/opclasscmds.c:1580
-#: commands/opclasscmds.c:1748
-#: commands/opclasscmds.c:1848
-#: commands/opclasscmds.c:1945
-#: commands/opclasscmds.c:2072
-#, c-format
-msgid "access method \"%s\" does not exist"
-msgstr "\"%s\" eriÅŸim metodu mevcut deÄŸil"
-
-#: commands/comment.c:1267
-#: commands/comment.c:1277
-#: commands/indexcmds.c:1013
-#: commands/indexcmds.c:1023
-#: commands/opclasscmds.c:1529
-#: commands/opclasscmds.c:1533
-#: commands/opclasscmds.c:1770
-#: commands/opclasscmds.c:1781
-#: commands/opclasscmds.c:1969
-#: commands/opclasscmds.c:1980
-#, c-format
-msgid "operator class \"%s\" does not exist for access method \"%s\""
-msgstr "\"%s\" erişim yöntemi için \"%s\" operatör sınıfı mevcut değil"
-
-#: commands/comment.c:1353
-#: commands/comment.c:1363
-#: commands/opclasscmds.c:352
-#: commands/opclasscmds.c:805
-#: commands/opclasscmds.c:1592
-#: commands/opclasscmds.c:1596
-#: commands/opclasscmds.c:1870
-#: commands/opclasscmds.c:1881
-#: commands/opclasscmds.c:2096
-#: commands/opclasscmds.c:2107
-#, c-format
-msgid "operator family \"%s\" does not exist for access method \"%s\""
-msgstr "\"%s\" erişim yöntemi için \"%s\" operatör sınıfı mevcut değil"
-
-#: commands/comment.c:1466
-#: commands/functioncmds.c:1768
-#, c-format
-msgid "cast from type %s to type %s does not exist"
-msgstr "%s tipinden %s tipine cast mevcut deÄŸildir"
-
-#: commands/comment.c:1478
-#: commands/functioncmds.c:1509
-#: commands/functioncmds.c:1785
-#, c-format
-msgid "must be owner of type %s or type %s"
-msgstr "%s veya %s tiplerinin sahibi olmalısınız"
-
-#: commands/comment.c:1498
-msgid "must be superuser to comment on text search parser"
-msgstr "metin arama ayrıştırıcısına açıklama eklemek için superuser olmalısınız"
-
-#: commands/comment.c:1527
-msgid "must be superuser to comment on text search template"
-msgstr "bir metin arama şablonuna açıklama eklemek için superuser olmalısınız"
-
-#: commands/conversioncmds.c:69
-#, c-format
-msgid "source encoding \"%s\" does not exist"
-msgstr "\"%s\" kaynak dil kodlaması mevcut değil"
-
-#: commands/conversioncmds.c:76
-#, c-format
-msgid "destination encoding \"%s\" does not exist"
-msgstr "\"%s\" hedef dil kodlaması mevcut değil"
-
-#: commands/conversioncmds.c:90
-#, fuzzy, c-format
-msgid "encoding conversion function %s must return type \"void\""
-msgstr "%s typmod_in fonksiyonu \"trigger\" tipini döndürmelidir"
-
-#: commands/conversioncmds.c:159
-#, c-format
-msgid "conversion \"%s\" does not exist, skipping"
-msgstr "\"%s\" dönüşümü mevcut değil, atlanıyor"
-
-#: commands/conversioncmds.c:229
-#, c-format
-msgid "conversion \"%s\" already exists in schema \"%s\""
-msgstr "\"%s\" dönüşümü zaten \"%s\" şemasında mevcuttur"
-
-#: commands/copy.c:311
-#: commands/copy.c:323
-#: commands/copy.c:357
-#: commands/copy.c:367
-msgid "COPY BINARY is not supported to stdout or from stdin"
-msgstr "stdin'den stdout'e COPY BINARY desteklenmemektedir"
-
-#: commands/copy.c:445
-#, c-format
-msgid "could not write to COPY file: %m"
-msgstr "COPY dosyasına yazma hatası: %m"
-
-#: commands/copy.c:457
-msgid "connection lost during COPY to stdout"
-msgstr "stdout akımına COPY işlemi sırasında bağlantı kesildi"
-
-#: commands/copy.c:498
-#, c-format
-msgid "could not read from COPY file: %m"
-msgstr "COPY dosyasından okuma hatası: %m"
-
-#: commands/copy.c:549
-#, c-format
-msgid "COPY from stdin failed: %s"
-msgstr "stdin'den COPY başarısız: %s"
-
-#: commands/copy.c:565
-#, c-format
-msgid "unexpected message type 0x%02X during COPY from stdin"
-msgstr "stdin akımından COPY işlemi sırasında beklenmeyen mesaj tipi 0x%02X"
-
-#: commands/copy.c:746
-#: commands/copy.c:754
-#: commands/copy.c:762
-#: commands/copy.c:770
-#: commands/copy.c:778
-#: commands/copy.c:786
-#: commands/copy.c:794
-#: commands/copy.c:802
-#: commands/copy.c:810
-#: commands/copy.c:818
-#: commands/dbcommands.c:145
-#: commands/dbcommands.c:153
-#: commands/dbcommands.c:161
-#: commands/dbcommands.c:169
-#: commands/dbcommands.c:177
-#: commands/dbcommands.c:185
-#: commands/dbcommands.c:193
-#: commands/dbcommands.c:1323
-#: commands/dbcommands.c:1331
-#: commands/functioncmds.c:452
-#: commands/functioncmds.c:542
-#: commands/functioncmds.c:550
-#: commands/functioncmds.c:558
-#: commands/sequence.c:1017
-#: commands/sequence.c:1025
-#: commands/sequence.c:1033
-#: commands/sequence.c:1041
-#: commands/sequence.c:1049
-#: commands/sequence.c:1057
-#: commands/sequence.c:1065
-#: commands/sequence.c:1073
-#: commands/typecmds.c:275
-#: commands/user.c:135
-#: commands/user.c:152
-#: commands/user.c:160
-#: commands/user.c:168
-#: commands/user.c:176
-#: commands/user.c:184
-#: commands/user.c:192
-#: commands/user.c:200
-#: commands/user.c:208
-#: commands/user.c:216
-#: commands/user.c:224
-#: commands/user.c:452
-#: commands/user.c:464
-#: commands/user.c:472
-#: commands/user.c:480
-#: commands/user.c:488
-#: commands/user.c:496
-#: commands/user.c:504
-#: commands/user.c:513
-#: commands/user.c:521
-msgid "conflicting or redundant options"
-msgstr "çakışan veya artık opsiyon"
-
-#: commands/copy.c:830
-msgid "cannot specify DELIMITER in BINARY mode"
-msgstr "BINARY biçiminde DELIMITER belirtilemez"
-
-#: commands/copy.c:835
-msgid "cannot specify CSV in BINARY mode"
-msgstr "BINARY biçiminde CSV belirtilemez"
-
-#: commands/copy.c:840
-msgid "cannot specify NULL in BINARY mode"
-msgstr "BINARY biçiminde NULL belirtilemez"
-
-#: commands/copy.c:862
-#, fuzzy
-msgid "COPY delimiter must be a single one-byte character"
-msgstr "COPY ayıracı bir tek ASCII karakteri olmalıdır"
-
-#: commands/copy.c:869
-msgid "COPY delimiter cannot be newline or carriage return"
-msgstr "COPY ayıracı yeni satır ya da satırbaşı karakteri olamaz"
-
-#: commands/copy.c:875
-msgid "COPY null representation cannot use newline or carriage return"
-msgstr "COPY null betimlemesi yeni satır veya satırbaşı karakteri kullanamaz"
-
-#: commands/copy.c:892
-#, c-format
-msgid "COPY delimiter cannot be \"%s\""
-msgstr "COPY ayıracı \"%s\" olamaz"
-
-#: commands/copy.c:898
-msgid "COPY HEADER available only in CSV mode"
-msgstr "COPY HEADER sadece CSV modunda geçerli"
-
-#: commands/copy.c:904
-msgid "COPY quote available only in CSV mode"
-msgstr "COPY quote sadece CSV modunda etkin"
-
-#: commands/copy.c:909
-#, fuzzy
-msgid "COPY quote must be a single one-byte character"
-msgstr "COPY quote bir tek ASCII karakteri olmalıdır"
-
-#: commands/copy.c:914
-msgid "COPY delimiter and quote must be different"
-msgstr "COPY ayıracı ve alıntısı farklı olmalı"
-
-#: commands/copy.c:920
-msgid "COPY escape available only in CSV mode"
-msgstr "COPY escape sadece CSV modunda etkin"
-
-#: commands/copy.c:925
-#, fuzzy
-msgid "COPY escape must be a single one-byte character"
-msgstr "COPY escape bir tek ASCII karakteri olmalıdır"
-
-#: commands/copy.c:931
-msgid "COPY force quote available only in CSV mode"
-msgstr "COPY force quote sadece CSV modunda etkin"
-
-#: commands/copy.c:935
-msgid "COPY force quote only available using COPY TO"
-msgstr "COPY force quote sadece COPY TO içerisinde kullanılabilir"
-
-#: commands/copy.c:941
-msgid "COPY force not null available only in CSV mode"
-msgstr "COPY force not null sadece CSV modunda etkin"
-
-#: commands/copy.c:945
-msgid "COPY force not null only available using COPY FROM"
-msgstr "COPY force quote sadece COPY FROM içerisinde kullanılabilir"
-
-#: commands/copy.c:951
-msgid "COPY delimiter must not appear in the NULL specification"
-msgstr "NULL tanımında COPY ayracı belirtilmemelidir"
-
-#: commands/copy.c:958
-msgid "CSV quote character must not appear in the NULL specification"
-msgstr "NULL tanımında CVS quote ayracı belirtilmemelidir"
-
-#: commands/copy.c:964
-msgid "must be superuser to COPY to or from a file"
-msgstr "bir dosyadan veya bir dosyaya COPY işlemi yapmak için superuser haklarına sahip olmalısınız"
-
-#: commands/copy.c:965
-msgid "Anyone can COPY to stdout or from stdin. psql's \\copy command also works for anyone."
-msgstr "Stdout'e ve stdin'e her kullanıcı COPY işlemi yapabilir. Ayrıca her kullanıcı psql'in \\copy komutunu kullanabilir."
-
-#: commands/copy.c:1013
-#, c-format
-msgid "table \"%s\" does not have OIDs"
-msgstr "\"%s\" tablosunda OID yoktur"
-
-#: commands/copy.c:1030
-msgid "COPY (SELECT) WITH OIDS is not supported"
-msgstr "COPY (SELECT) WITH OIDS desteklenmemektedir"
-
-#: commands/copy.c:1057
-msgid "COPY (SELECT INTO) is not supported"
-msgstr "COPY (SELECT INTO) desteklenmemektedir"
-
-#: commands/copy.c:1109
-#, c-format
-msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
-msgstr "FORCE UNIQUE \"%s\" sütunu COPY tarafından referans edilmemiştir"
-
-#: commands/copy.c:1131
-#, c-format
-msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
-msgstr "FORCE NOT NULL \"%s\" sütunu COPY tarafından referans edilmemiştir"
-
-#: commands/copy.c:1209
-#, c-format
-msgid "cannot copy from view \"%s\""
-msgstr "\"%s\" view'undan kopyalanamıyor"
-
-#: commands/copy.c:1211
-msgid "Try the COPY (SELECT ...) TO variant."
-msgstr "COPY (SELECT ...) TO variant deyimini deneyin."
-
-#: commands/copy.c:1215
-#, c-format
-msgid "cannot copy from sequence \"%s\""
-msgstr "\"%s\" sequence'inden kopyalanamıyor"
-
-#: commands/copy.c:1220
-#, c-format
-msgid "cannot copy from non-table relation \"%s\""
-msgstr "\"%s\" tablo olmayan nesnesinden copy yapılamıyor"
-
-#: commands/copy.c:1244
-msgid "relative path not allowed for COPY to file"
-msgstr "COPY işlemi ile dosyaya yazarken dosyanın tam yolunu belirtmelisiniz"
-
-#: commands/copy.c:1253
-#, c-format
-msgid "could not open file \"%s\" for writing: %m"
-msgstr "\"%s\" dosyası, yazmak için açılamadı: %m"
-
-#: commands/copy.c:1260
-#: commands/copy.c:1755
-#, c-format
-msgid "\"%s\" is a directory"
-msgstr "\"%s\" bir dizindir"
-
-#: commands/copy.c:1546
-#, c-format
-msgid "COPY %s, line %d, column %s"
-msgstr "COPY %s, satır %d, sütun %s"
-
-#: commands/copy.c:1550
-#: commands/copy.c:1595
-#, c-format
-msgid "COPY %s, line %d"
-msgstr "COPY %s, satır %d"
-
-#: commands/copy.c:1561
-#, c-format
-msgid "COPY %s, line %d, column %s: \"%s\""
-msgstr "COPY %s, satır %d, sütun %s: \"%s\""
-
-#: commands/copy.c:1569
-#, c-format
-msgid "COPY %s, line %d, column %s: null input"
-msgstr "COPY %s, satır %d, sütun %s: null girişi"
-
-#: commands/copy.c:1581
-#, c-format
-msgid "COPY %s, line %d: \"%s\""
-msgstr "COPY %s, satır %d: \"%s\""
-
-#: commands/copy.c:1683
-#, c-format
-msgid "cannot copy to view \"%s\""
-msgstr "\"%s\" view'ina kopyalanamıyor"
-
-#: commands/copy.c:1688
-#, c-format
-msgid "cannot copy to sequence \"%s\""
-msgstr "\"%s\" sequence'ine kopyalanamıyor"
-
-#: commands/copy.c:1693
-#, c-format
-msgid "cannot copy to non-table relation \"%s\""
-msgstr "tablo olmayan \"%s\" nesnesi kopyalanamaz"
-
-#: commands/copy.c:1856
-msgid "COPY file signature not recognized"
-msgstr "COPY dosya imzası tanınmamaktadır"
-
-#: commands/copy.c:1861
-msgid "invalid COPY file header (missing flags)"
-msgstr "COPY dosya başlığı geçersiz (flagler eksik)"
-
-#: commands/copy.c:1867
-msgid "unrecognized critical flags in COPY file header"
-msgstr "COPY dosya başlığında tanınmayan flag"
-
-#: commands/copy.c:1873
-msgid "invalid COPY file header (missing length)"
-msgstr "COPY dosya başlığı geçersiz (uzunluklar eksik)"
-
-#: commands/copy.c:1880
-msgid "invalid COPY file header (wrong length)"
-msgstr "geçersiz COPY dosya başlığı (yanlış uzunluk)"
-
-#: commands/copy.c:1971
-msgid "missing data for OID column"
-msgstr "OID sütunu için veri eksik"
-
-#: commands/copy.c:1977
-msgid "null OID in COPY data"
-msgstr "COPY verisinde null OID"
-
-#: commands/copy.c:1987
-#: commands/copy.c:2059
-msgid "invalid OID in COPY data"
-msgstr "COPY verisinde geçersiz OID"
-
-#: commands/copy.c:2002
-#, c-format
-msgid "missing data for column \"%s\""
-msgstr "\"%s\" sütunu için veri eksik"
-
-#: commands/copy.c:2043
-#, c-format
-msgid "row field count is %d, expected %d"
-msgstr "satır alanı sayısı %d, beklenen %d"
-
-#: commands/copy.c:2457
-#: commands/copy.c:2474
-msgid "literal carriage return found in data"
-msgstr "veride satır sonu karakterine rastlanmıştır"
-
-#: commands/copy.c:2458
-#: commands/copy.c:2475
-#, fuzzy
-msgid "unquoted carriage return found in data"
-msgstr "veride satır sonu karakterine rastlanmıştır"
-
-#: commands/copy.c:2460
-#: commands/copy.c:2477
-msgid "Use \"\\r\" to represent carriage return."
-msgstr "Satır sonu karakteri için \"\\r\" kullanın."
-
-#: commands/copy.c:2461
-#: commands/copy.c:2478
-#, fuzzy
-msgid "Use quoted CSV field to represent carriage return."
-msgstr "Satır sonu karakteri için \"\\r\" kullanın."
-
-#: commands/copy.c:2490
-msgid "literal newline found in data"
-msgstr "veri içerisinde yeni satır karakteri bulundu"
-
-#: commands/copy.c:2491
-msgid "unquoted newline found in data"
-msgstr "veri içerisinde alıntılanmamış satırbaşı"
-
-#: commands/copy.c:2493
-msgid ""
-"Use \"\\n"
-"\" to represent newline."
-msgstr ""
-"Yeni satır karakteri için \"\\n"
-"\" kullanın."
-
-#: commands/copy.c:2494
-msgid "Use quoted CSV field to represent newline."
-msgstr "Yeni satır belirtmek için alıntılanmış CSV kullanın"
-
-#: commands/copy.c:2540
-#: commands/copy.c:2576
-msgid "end-of-copy marker does not match previous newline style"
-msgstr "end-of-copy göstergesi önceki yeni satır stiline uymuyor"
-
-#: commands/copy.c:2549
-#: commands/copy.c:2565
-msgid "end-of-copy marker corrupt"
-msgstr "end-of-copy göstergesi zarar görmüş"
-
-#: commands/copy.c:2692
-#: commands/copy.c:2727
-#: commands/copy.c:2907
-#: commands/copy.c:2942
-msgid "extra data after last expected column"
-msgstr "son beklenen sütundan sonra fazladan veri bulundu"
-
-#: commands/copy.c:2989
-msgid "unterminated CSV quoted field"
-msgstr "sonlandırılmamış CSV quoted alanı"
-
-#: commands/copy.c:3066
-#: commands/copy.c:3085
-msgid "unexpected EOF in COPY data"
-msgstr "COPY verisinde beklenmeyen dosya sonu"
-
-#: commands/copy.c:3075
-msgid "invalid field size"
-msgstr "geçersiz alan boyutu"
-
-#: commands/copy.c:3098
-msgid "incorrect binary data format"
-msgstr "ikili veri biçimi hatası"
-
-#: commands/copy.c:3416
-#: commands/tablecmds.c:1178
-#: parser/parse_target.c:820
-#: parser/parse_target.c:831
-#, c-format
-msgid "column \"%s\" specified more than once"
-msgstr "\"%s\" sütunu birden fazla belirtilmiş"
-
-#: commands/dbcommands.c:200
-msgid "LOCATION is not supported anymore"
-msgstr "LOCATION artık desteklenmiyor"
-
-#: commands/dbcommands.c:201
-msgid "Consider using tablespaces instead."
-msgstr "Onun yerine tablespace kullanabilirsiniz."
-
-#: commands/dbcommands.c:252
-#: commands/dbcommands.c:1355
-#: commands/user.c:250
-#: commands/user.c:547
-#, fuzzy, c-format
-msgid "invalid connection limit: %d"
-msgstr "geçersiz bağlantı seçeneği \"%s\"\n"
-
-#: commands/dbcommands.c:271
-msgid "permission denied to create database"
-msgstr "veritabanı oluşturma izin verilmedi."
-
-#: commands/dbcommands.c:294
-#, c-format
-msgid "template database \"%s\" does not exist"
-msgstr "\"%s\" şablon veritabanı mevcut değil"
-
-#: commands/dbcommands.c:306
-#, c-format
-msgid "permission denied to copy database \"%s\""
-msgstr "\"%s\" veritabanını kopyalama engellendi"
-
-#: commands/dbcommands.c:322
-#, c-format
-msgid "invalid server encoding %d"
-msgstr "%d sunucu dil kodlaması geçersiz"
-
-#: commands/dbcommands.c:328
-#: commands/dbcommands.c:332
-#, fuzzy, c-format
-msgid "invalid locale name %s"
-msgstr "geçirsiz rol adı \"%s\""
-
-#: commands/dbcommands.c:365
-#: commands/dbcommands.c:379
-#, fuzzy, c-format
-msgid "encoding %s does not match locale %s"
-msgstr "%s dil kodlaması, sunucu yereli ile (%s) eşleşmiyor"
-
-#: commands/dbcommands.c:368
-#, fuzzy, c-format
-msgid "The chosen LC_CTYPE setting requires encoding %s."
-msgstr "Sunucunun LC_TYPE yerel ayarı, %s dil kodlamasını gerektirir."
-
-#: commands/dbcommands.c:382
-#, fuzzy, c-format
-msgid "The chosen LC_COLLATE setting requires encoding %s."
-msgstr "Sunucunun LC_TYPE yerel ayarı, %s dil kodlamasını gerektirir."
-
-#: commands/dbcommands.c:400
-#, c-format
-msgid "new encoding (%s) is incompatible with the encoding of the template database (%s)"
-msgstr ""
-
-#: commands/dbcommands.c:403
-msgid "Use the same encoding as in the template database, or use template0 as template."
-msgstr ""
-
-#: commands/dbcommands.c:408
-#, c-format
-msgid "new collation (%s) is incompatible with the collation of the template database (%s)"
-msgstr ""
-
-#: commands/dbcommands.c:410
-msgid "Use the same collation as in the template database, or use template0 as template."
-msgstr ""
-
-#: commands/dbcommands.c:415
-#, c-format
-msgid "new LC_CTYPE (%s) is incompatible with the LC_CTYPE of the template database (%s)"
-msgstr ""
-
-#: commands/dbcommands.c:417
-msgid "Use the same LC_CTYPE as in the template database, or use template0 as template."
-msgstr ""
-
-#: commands/dbcommands.c:444
-#: commands/dbcommands.c:1060
-msgid "pg_global cannot be used as default tablespace"
-msgstr "pg_global öntanımlı tablespace olarak kullanılamaz"
-
-#: commands/dbcommands.c:470
-#, c-format
-msgid "cannot assign new default tablespace \"%s\""
-msgstr "yeni varsayılan tablespace \"%s\"  atanamıyor"
-
-#: commands/dbcommands.c:472
-#, c-format
-msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
-msgstr "Bir  çakışma var, çünkü \"%s\" veritabanının bulunduğu tablespace içinde başka tablolar var."
-
-#: commands/dbcommands.c:492
-#: commands/dbcommands.c:923
-#, c-format
-msgid "database \"%s\" already exists"
-msgstr "\"%s\" veritabanı zaten mevcut"
-
-#: commands/dbcommands.c:506
-#, c-format
-msgid "source database \"%s\" is being accessed by other users"
-msgstr "\"%s\" kaynak veritabanı başka bir kullanıcı tarafından kullanılmaktadır"
-
-#: commands/dbcommands.c:766
-#, c-format
-msgid "database \"%s\" does not exist, skipping"
-msgstr "\"%s\" veritabanı mevcut değil, atlanıyor"
-
-#: commands/dbcommands.c:787
-msgid "cannot drop a template database"
-msgstr "template veritabanı kaldırılamaz"
-
-#: commands/dbcommands.c:793
-msgid "cannot drop the currently open database"
-msgstr "şu anda açık olan veritabanı kaldırılamaz"
-
-#: commands/dbcommands.c:804
-#: commands/dbcommands.c:945
-#: commands/dbcommands.c:1082
-#, c-format
-msgid "database \"%s\" is being accessed by other users"
-msgstr "\"%s\" veritabanına başka kullanıcılar tarafından erişilmektedir"
-
-#: commands/dbcommands.c:914
-msgid "permission denied to rename database"
-msgstr "veritabanı adı değiştirilmesine izin verilmedi"
-
-#: commands/dbcommands.c:934
-msgid "current database cannot be renamed"
-msgstr "geçerli veritabanının adını değiştirilemez"
-
-#: commands/dbcommands.c:1034
-#, fuzzy
-msgid "cannot change the tablespace of the currently open database"
-msgstr "şu anda açık olan veritabanı kaldırılamaz"
-
-#: commands/dbcommands.c:1122
-#, fuzzy, c-format
-msgid "some relations of database \"%s\" are already in tablespace \"%s\""
-msgstr "\"%s\" nesnesi zaten \"%s\" şemasında mevcuttur"
-
-#: commands/dbcommands.c:1124
-#, fuzzy
-msgid "You must move them back to the database's default tablespace before using this command."
-msgstr "Boş değer, veritabanının varsayılan tablespace'ı seçmektedir."
-
-#: commands/dbcommands.c:1254
-#: commands/dbcommands.c:1805
-#: commands/dbcommands.c:2000
-#: commands/dbcommands.c:2036
-#, c-format
-msgid "some useless files may be left behind in old database directory \"%s\""
-msgstr ""
-
-#: commands/dbcommands.c:1572
-msgid "permission denied to change owner of database"
-msgstr "veritabanı sahipliğini değiştirilmesine izin verilmedi"
-
-#: commands/dbcommands.c:1893
-#, c-format
-msgid "There are %d other session(s) and %d prepared transaction(s) using the database."
-msgstr ""
-
-#: commands/dbcommands.c:1896
-#, c-format
-msgid "There are %d other session(s) using the database."
-msgstr ""
-
-#: commands/dbcommands.c:1899
-#, fuzzy, c-format
-msgid "There are %d prepared transaction(s) using the database."
-msgstr "prepared transaction başka bir veritabanına aittir"
-
-#: commands/define.c:67
-#: commands/define.c:213
-#: commands/define.c:245
-#: commands/define.c:273
-#, c-format
-msgid "%s requires a parameter"
-msgstr "%s bir parametre gerektirir"
-
-#: commands/define.c:106
-#: commands/define.c:117
-#: commands/define.c:180
-#: commands/define.c:198
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s seçeneği sayısal değer gerektirir"
-
-#: commands/define.c:166
-#, c-format
-msgid "%s requires a Boolean value"
-msgstr "%s, bir Boolean deÄŸeri gerektirir"
-
-#: commands/define.c:227
-#, c-format
-msgid "argument of %s must be a name"
-msgstr "%s için argüman bir ad olmalıdır"
-
-#: commands/define.c:257
-#, c-format
-msgid "argument of %s must be a type name"
-msgstr "%s argümanı tip adı olmalıdır"
-
-#: commands/define.c:282
-#, c-format
-msgid "%s requires an integer value"
-msgstr "%s bir tamsayı gerektirir"
-
-#: commands/define.c:303
-#, c-format
-msgid "invalid argument for %s: \"%s\""
-msgstr "%s için geçersiz argüman: \"%s\""
-
-#: commands/foreigncmds.c:131
-#: commands/foreigncmds.c:140
-#, fuzzy, c-format
-msgid "option \"%s\" not found"
-msgstr "time zone \"%s\" tanınmadı"
-
-#: commands/foreigncmds.c:150
-#, fuzzy, c-format
-msgid "option \"%s\" provided more than once"
-msgstr "\"%s\" sütunu birden fazla belirtilmiş"
-
-#: commands/foreigncmds.c:208
-#: commands/foreigncmds.c:216
-#, fuzzy, c-format
-msgid "permission denied to change owner of foreign-data wrapper \"%s\""
-msgstr "veritabanı sahipliğini değiştirilmesine izin verilmedi"
-
-#: commands/foreigncmds.c:210
-#, fuzzy
-msgid "Must be superuser to change owner of a foreign-data wrapper."
-msgstr "Tablespace oluşturmak için superuser haklarına sahip olmalısınız."
-
-#: commands/foreigncmds.c:218
-msgid "The owner of a foreign-data wrapper must be a superuser."
-msgstr ""
-
-#: commands/foreigncmds.c:229
-#: commands/foreigncmds.c:454
-#: commands/foreigncmds.c:552
-#: foreign/foreign.c:94
-#, fuzzy, c-format
-msgid "foreign-data wrapper \"%s\" does not exist"
-msgstr "\"%s\" veritabanı mevcut değil"
-
-#: commands/foreigncmds.c:273
-#: commands/foreigncmds.c:723
-#: commands/foreigncmds.c:811
-#: commands/foreigncmds.c:1089
-#: foreign/foreign.c:187
-#, fuzzy, c-format
-msgid "server \"%s\" does not exist"
-msgstr "\"%s\" rule'u mevcut deÄŸil"
-
-#: commands/foreigncmds.c:350
-#, fuzzy, c-format
-msgid "permission denied to create foreign-data wrapper \"%s\""
-msgstr "\"%s\" veritabanında geçici veritabanı oluşturma izni yok"
-
-#: commands/foreigncmds.c:352
-#, fuzzy
-msgid "Must be superuser to create a foreign-data wrapper."
-msgstr "Tablespace oluşturmak için superuser haklarına sahip olmalısınız."
-
-#: commands/foreigncmds.c:363
-#, fuzzy, c-format
-msgid "foreign-data wrapper \"%s\" already exists"
-msgstr "\"%s\" veritabanı zaten mevcut"
-
-#: commands/foreigncmds.c:443
-#, fuzzy, c-format
-msgid "permission denied to alter foreign-data wrapper \"%s\""
-msgstr "\"%s\" veritabanına erişim engellendi"
-
-#: commands/foreigncmds.c:445
-#, fuzzy
-msgid "Must be superuser to alter a foreign-data wrapper."
-msgstr "operator sınıfı değiştirmek için superuser olmalısınız"
-
-#: commands/foreigncmds.c:474
-msgid "changing the foreign-data wrapper validator can cause the options for dependent objects to become invalid"
-msgstr ""
-
-#: commands/foreigncmds.c:543
-#, fuzzy, c-format
-msgid "permission denied to drop foreign-data wrapper \"%s\""
-msgstr "\"%s\" veritabanını kopyalama engellendi"
-
-#: commands/foreigncmds.c:545
-#, fuzzy
-msgid "Must be superuser to drop a foreign-data wrapper."
-msgstr "Tablespace oluşturmak için superuser haklarına sahip olmalısınız."
-
-#: commands/foreigncmds.c:557
-#, fuzzy, c-format
-msgid "foreign-data wrapper \"%s\" does not exist, skipping"
-msgstr "\"%s\" veritabanı mevcut değil, atlanıyor"
-
-#: commands/foreigncmds.c:626
-#, fuzzy, c-format
-msgid "server \"%s\" already exists"
-msgstr "\"%s\" rolü zaten mevcut"
-
-#: commands/foreigncmds.c:815
-#, fuzzy, c-format
-msgid "server \"%s\" does not exist, skipping"
-msgstr "rol \"%s\" mevcut değil, atlanıyor"
-
-#: commands/foreigncmds.c:921
-#, fuzzy, c-format
-msgid "user mapping \"%s\" already exists for server %s"
-msgstr "\"%s\" nesnesi zaten \"%s\" şemasında mevcuttur"
-
-#: commands/foreigncmds.c:998
-#: commands/foreigncmds.c:1106
-#, fuzzy, c-format
-msgid "user mapping \"%s\" does not exist for the server"
-msgstr "\"%s\" şeması mevcut değil"
-
-#: commands/foreigncmds.c:1092
-#, fuzzy
-msgid "server does not exist, skipping"
-msgstr "%s operatorü mevcut değil, atlanıyor"
-
-#: commands/foreigncmds.c:1111
-#, fuzzy, c-format
-msgid "user mapping \"%s\" does not exist for the server, skipping"
-msgstr "\"%s\" şeması mevcut değil, atlanıyor"
-
-#: commands/functioncmds.c:98
-#, c-format
-msgid "SQL function cannot return shell type %s"
-msgstr "SQL fonksiyonu %s shell tipini döndüremiyor"
-
-#: commands/functioncmds.c:103
-#, c-format
-msgid "return type %s is only a shell"
-msgstr "return type %s is only a shell"
-
-#: commands/functioncmds.c:132
-#: parser/parse_type.c:264
-#, fuzzy, c-format
-msgid "type modifier cannot be specified for shell type \"%s\""
-msgstr "\"%s\" veri tipi için tip niteliyicisi kullanılamaz"
-
-#: commands/functioncmds.c:138
-#, c-format
-msgid "type \"%s\" is not yet defined"
-msgstr "\"%s\" tipi henüz tanımlanmamış"
-
-#: commands/functioncmds.c:139
-msgid "Creating a shell type definition."
-msgstr "Kabuk tip tanımı yaratılıyor."
-
-#: commands/functioncmds.c:218
-#, c-format
-msgid "SQL function cannot accept shell type %s"
-msgstr "SQL fonksiyonu %s shell tipini alamaz"
-
-#: commands/functioncmds.c:223
-#, c-format
-msgid "argument type %s is only a shell"
-msgstr "\"%s\" argümanı sadece bir kabuktur"
-
-#: commands/functioncmds.c:233
-#, c-format
-msgid "type %s does not exist"
-msgstr "%s tipi mevcut deÄŸil"
-
-#: commands/functioncmds.c:241
-msgid "functions cannot accept set arguments"
-msgstr "fonksiyonlar küme argümanlarını kabul etmez"
-
-#: commands/functioncmds.c:250
-msgid "VARIADIC parameter must be the last input parameter"
-msgstr ""
-
-#: commands/functioncmds.c:277
-msgid "VARIADIC parameter must be an array"
-msgstr ""
-
-#: commands/functioncmds.c:299
-#, fuzzy
-msgid "only input parameters can have default values"
-msgstr "sadece ikili iÅŸlemler bir commutator'a sahip olabilirler"
-
-#: commands/functioncmds.c:311
-#, fuzzy
-msgid "cannot use table references in parameter default value"
-msgstr "defaul ifadesinde sütun referansı kullanılamaz"
-
-#: commands/functioncmds.c:327
-#, fuzzy
-msgid "cannot use subquery in parameter default value"
-msgstr "EXECUTE parametresinde subquery kullanılamaz"
-
-#: commands/functioncmds.c:331
-#, fuzzy
-msgid "cannot use aggregate function in parameter default value"
-msgstr "EXECUTE parametresinde aggregate fonksiyon kullanılamaz"
-
-#: commands/functioncmds.c:335
-#, fuzzy
-msgid "cannot use window function in parameter default value"
-msgstr "EXECUTE parametresinde aggregate fonksiyon kullanılamaz"
-
-#: commands/functioncmds.c:345
-msgid "input parameters after one with a default value must also have defaults"
-msgstr ""
-
-#: commands/functioncmds.c:584
-msgid "no function body specified"
-msgstr "fonksiyon gövdesi yok"
-
-#: commands/functioncmds.c:594
-msgid "no language specified"
-msgstr "dil belirtilmemiÅŸ"
-
-#: commands/functioncmds.c:615
-#: commands/functioncmds.c:1332
-msgid "COST must be positive"
-msgstr "COST pozitif olmalıdır"
-
-#: commands/functioncmds.c:623
-#: commands/functioncmds.c:1340
-msgid "ROWS must be positive"
-msgstr "ROWS pozitif olmalıdır"
-
-#: commands/functioncmds.c:662
-#, c-format
-msgid "unrecognized function attribute \"%s\" ignored"
-msgstr "tanınmayan fonksiyon yarametresi \"%s\" yoksayıldı"
-
-#: commands/functioncmds.c:713
-#, c-format
-msgid "only one AS item needed for language \"%s\""
-msgstr "\"%s\" dili için sadece bir AS öğe lazım"
-
-#: commands/functioncmds.c:807
-msgid "Use CREATE LANGUAGE to load the language into the database."
-msgstr "Veritabana yeni bir dil eklemek için CREATE LANGUAGE kullanın."
-
-#: commands/functioncmds.c:854
-#, c-format
-msgid "function result type must be %s because of OUT parameters"
-msgstr "OUT parametresinde belirtildiği gibi fonksiyon sonuç tipi %s olmalıdır"
-
-#: commands/functioncmds.c:867
-msgid "function result type must be specified"
-msgstr "fonksiyonun döndürme tipi belirtilmelidir"
-
-#: commands/functioncmds.c:902
-#: commands/functioncmds.c:1344
-msgid "ROWS is not applicable when function does not return a set"
-msgstr "fonksiyonu bir set döndürmediğinde ROWS kullanılamaz"
-
-#: commands/functioncmds.c:954
-#, c-format
-msgid "function %s(%s) does not exist, skipping"
-msgstr "%s(%s) fonksiyonu mevcut değil, atlanıyor"
-
-#: commands/functioncmds.c:978
-msgid "Use DROP AGGREGATE to drop aggregate functions."
-msgstr "Aggregate fonksiyonunı kaldırmak içim DROP AGGREGATE kullanın."
-
-#: commands/functioncmds.c:985
-#, c-format
-msgid "removing built-in function \"%s\""
-msgstr "gömülü \"%s\" fonksiyonu kaldırılıyor"
-
-#: commands/functioncmds.c:1084
-msgid "Use ALTER AGGREGATE to rename aggregate functions."
-msgstr "Aggregate fonksiyonunun adını değiştirmek içim ALTER AGGREGATE kullanın."
-
-#: commands/functioncmds.c:1149
-msgid "Use ALTER AGGREGATE to change owner of aggregate functions."
-msgstr "Aggregate fonksiyonunun sahibini değiştirmek içim ALTER AGGREGATE kullanın."
-
-#: commands/functioncmds.c:1495
-#, c-format
-msgid "source data type %s is a pseudo-type"
-msgstr "kaynak veri tipi %s bir pseudo-type'dir"
-
-#: commands/functioncmds.c:1501
-#, c-format
-msgid "target data type %s is a pseudo-type"
-msgstr "hedef veri tipi %s bir pseudo-type'dir"
-
-#: commands/functioncmds.c:1540
-msgid "cast function must take one to three arguments"
-msgstr "cast fonksiyonu birden üçe kadar parametre alabilir"
-
-#: commands/functioncmds.c:1544
-#, fuzzy
-msgid "argument of cast function must match or be binary-coercible from source data type"
-msgstr "cast fonksiyonun argümanları kaynak veritipleri ile aynı olmalıdır"
-
-#: commands/functioncmds.c:1548
-msgid "second argument of cast function must be type integer"
-msgstr "cast fonksiyonunun ikinci parametresi tamsayı tipinde olmalıdır"
-
-#: commands/functioncmds.c:1552
-msgid "third argument of cast function must be type boolean"
-msgstr "cast fonksiyonunun üçüncü parametresi boolean tipinde olmalıdır"
-
-#: commands/functioncmds.c:1556
-#, fuzzy
-msgid "return data type of cast function must match or be binary-coercible to target data type"
-msgstr "cast fonksiyonun döndürme tipi hedef tipi ile uyuşmalıdır"
-
-#: commands/functioncmds.c:1567
-msgid "cast function must not be volatile"
-msgstr "cast fonksiyonu volatile olmamalıdır"
-
-#: commands/functioncmds.c:1572
-msgid "cast function must not be an aggregate function"
-msgstr "cast fonksiyonu aggregate olmamalıdır"
-
-#: commands/functioncmds.c:1576
-#, fuzzy
-msgid "cast function must not be a window function"
-msgstr "cast fonksiyonu aggregate olmamalıdır"
-
-#: commands/functioncmds.c:1580
-msgid "cast function must not return a set"
-msgstr "cast fonksiyonu bir set döndürmemelidir"
-
-#: commands/functioncmds.c:1606
-msgid "must be superuser to create a cast WITHOUT FUNCTION"
-msgstr "cast WITHOUT FUNCTION oluşturmak için superuser olmalısınız"
-
-#: commands/functioncmds.c:1621
-msgid "source and target data types are not physically compatible"
-msgstr "kaynak ve hedef veri tipleri fiziksel olarak uyumsuz"
-
-#: commands/functioncmds.c:1636
-#, fuzzy
-msgid "composite data types are not binary-compatible"
-msgstr "kaynak ve hedef veri tipleri fiziksel olarak uyumsuz"
-
-#: commands/functioncmds.c:1642
-#, fuzzy
-msgid "enum data types are not binary-compatible"
-msgstr "kaynak ve hedef veri tipleri fiziksel olarak uyumsuz"
-
-#: commands/functioncmds.c:1648
-#, fuzzy
-msgid "array data types are not binary-compatible"
-msgstr "kaynak ve hedef veri tipleri fiziksel olarak uyumsuz"
-
-#: commands/functioncmds.c:1658
-msgid "source data type and target data type are the same"
-msgstr "kaynak ve hedef veri tipleri aynı"
-
-#: commands/functioncmds.c:1692
-#, c-format
-msgid "cast from type %s to type %s already exists"
-msgstr "%s tipinden %s tipini cast etme zaten mevcut"
-
-#: commands/functioncmds.c:1773
-#, c-format
-msgid "cast from type %s to type %s does not exist, skipping"
-msgstr "%s tipinden %s tipine cast mevcut değildir, atlanıyor"
-
-#: commands/functioncmds.c:1872
-#, c-format
-msgid "function \"%s\" is already in schema \"%s\""
-msgstr "\"%s\" fonksiyonu \"%s\" şemasında zaten mevcut"
-
-#: commands/functioncmds.c:1880
-#: commands/tablecmds.c:7569
-#: commands/typecmds.c:2761
-msgid "cannot move objects into or out of temporary schemas"
-msgstr "geçici şemasına nesleri aktarılamaz ve içinden alınamaz"
-
-#: commands/functioncmds.c:1886
-#: commands/tablecmds.c:7575
-#: commands/typecmds.c:2767
-msgid "cannot move objects into or out of TOAST schema"
-msgstr "TOAST şemasına nesleri aktarılamaz ve içinden alınamaz"
-
-#: commands/functioncmds.c:1896
-#, c-format
-msgid "function \"%s\" already exists in schema \"%s\""
-msgstr "\"%s\" fonksiyonu \"%s\" şemasında zaten mevcut"
-
-#: commands/indexcmds.c:149
-msgid "must specify at least one column"
-msgstr "en az bir sütun belirtmelisiniz"
-
-#: commands/indexcmds.c:153
-#, c-format
-msgid "cannot use more than %d columns in an index"
-msgstr "bir index içinde %d sayısından fazla sütun kullanılamaz"
-
-#: commands/indexcmds.c:183
-msgid "cannot create indexes on temporary tables of other sessions"
-msgstr "başka oturumların geçici tablolarına bağlı dizin oluşturulamaz"
-
-#: commands/indexcmds.c:276
-msgid "substituting access method \"gist\" for obsolete method \"rtree\""
-msgstr "artık kullanılmayan \"rtree\" yöntemi yerine \"gist\" yöntemi kullanılacak"
-
-#: commands/indexcmds.c:295
-#, c-format
-msgid "access method \"%s\" does not support unique indexes"
-msgstr "\"%s\" erişim yöntemi tekil indexleri desteklemiyor"
-
-#: commands/indexcmds.c:300
-#, c-format
-msgid "access method \"%s\" does not support multicolumn indexes"
-msgstr "\"%s\" erişim yöntemi çoklu sütun indexleri desteklemiyor"
-
-#: commands/indexcmds.c:333
-#: parser/parse_utilcmd.c:1001
-#: parser/parse_utilcmd.c:1085
-#, c-format
-msgid "multiple primary keys for table \"%s\" are not allowed"
-msgstr "\"%s\" tablosunda birden çok birincil anahtara izin verilmez"
-
-#: commands/indexcmds.c:350
-msgid "primary keys cannot be expressions"
-msgstr "birincil anahtar bir ifade olamaz"
-
-#: commands/indexcmds.c:380
-#: commands/indexcmds.c:830
-#: parser/parse_utilcmd.c:1200
-#, c-format
-msgid "column \"%s\" named in key does not exist"
-msgstr "anahtar tanımında belirtilen \"%s\" sütunu mevcut değil"
-
-#: commands/indexcmds.c:435
-#, c-format
-msgid "%s %s will create implicit index \"%s\" for table \"%s\""
-msgstr "%1$s %2$s \"%4$s\" tablosu için \"%3$s\" indexi oluşturulacaktır"
-
-#: commands/indexcmds.c:771
-msgid "cannot use subquery in index predicate"
-msgstr "index tanımında subquery kullanılamaz"
-
-#: commands/indexcmds.c:775
-msgid "cannot use aggregate in index predicate"
-msgstr "index tanımında aggregate kullanılamaz"
-
-#: commands/indexcmds.c:784
-msgid "functions in index predicate must be marked IMMUTABLE"
-msgstr "index yüklemindeki kullanılacak fonksiyon IMMUTABLE olarak tanımlanmaıldır"
-
-#: commands/indexcmds.c:869
-msgid "cannot use subquery in index expression"
-msgstr "index ifadesinde subquery kullanılamaz"
-
-#: commands/indexcmds.c:873
-msgid "cannot use aggregate function in index expression"
-msgstr "index ifadesinde aggregate fonksiyonu kullanılamaz"
-
-#: commands/indexcmds.c:883
-msgid "functions in index expression must be marked IMMUTABLE"
-msgstr "index ifadesinde kullanılacak fonksiyon IMMUTABLE olarak tanımlanmaıldır"
-
-#: commands/indexcmds.c:920
-#, c-format
-msgid "access method \"%s\" does not support ASC/DESC options"
-msgstr "\"%s\" erişim yöntemi ASC/DESC desteklemiyor"
-
-#: commands/indexcmds.c:925
-#, c-format
-msgid "access method \"%s\" does not support NULLS FIRST/LAST options"
-msgstr "\"%s\" erişim yöntemi NULLS FIRST/LAST desteklemiyor"
-
-#: commands/indexcmds.c:981
-#, c-format
-msgid "data type %s has no default operator class for access method \"%s\""
-msgstr "%s veri tipinin \"%s\" erişim yöntemi için varsayılan operator sınıfı mevcut değil"
-
-#: commands/indexcmds.c:983
-msgid "You must specify an operator class for the index or define a default operator class for the data type."
-msgstr "Bu index için operator class belirtmeli veya bu veri tipi için varsayılan operator class tanımlamalısınız."
-
-#: commands/indexcmds.c:1036
-#, c-format
-msgid "operator class \"%s\" does not accept data type %s"
-msgstr "\"%s\" operator sınıfı, %s veri tipini kabul etmiyor"
-
-#: commands/indexcmds.c:1126
-#, c-format
-msgid "there are multiple default operator classes for data type %s"
-msgstr "%s veri tipi için birden fazla varsayılan operator sınıfı mevcuttur"
-
-#: commands/indexcmds.c:1370
-#, c-format
-msgid "shared table \"%s\" can only be reindexed in stand-alone mode"
-msgstr "\"%s\" ortak tablosuna sadece stand-alone modunda reindex iÅŸlemi uygulanabilir"
-
-#: commands/indexcmds.c:1377
-#, c-format
-msgid "table \"%s\" has no indexes"
-msgstr "\"%s\" tablosunda hiçbir index yok"
-
-#: commands/indexcmds.c:1405
-msgid "can only reindex the currently open database"
-msgstr "ancak açık olan veritabanı üzerinde reindex işlemi yapılabilir"
-
-#: commands/indexcmds.c:1496
-#, c-format
-msgid "table \"%s\" was reindexed"
-msgstr "\"%s\" tablosu yeniden indexlenmiÅŸtir"
-
-#: commands/lockcmds.c:84
-#, c-format
-msgid "could not obtain lock on relation \"%s\""
-msgstr "\"%s\" tablosu için lock alınamadı"
-
-#: commands/lockcmds.c:89
-#, c-format
-msgid "could not obtain lock on relation with OID %u"
-msgstr "OID %u olan tablosu için lock alınamadı"
-
-#: commands/opclasscmds.c:197
-#: commands/opclasscmds.c:715
-#, c-format
-msgid "operator family \"%s\" for access method \"%s\" already exists"
-msgstr "\"%2$s\" erişim metodu için \"%1$s\" operatör sınıfı zaten mevcut"
-
-#: commands/opclasscmds.c:329
-msgid "must be superuser to create an operator class"
-msgstr "operator sınıfı yaratmak için superuser olmalısınız"
-
-#: commands/opclasscmds.c:413
-#: commands/opclasscmds.c:865
-#: commands/opclasscmds.c:987
-#, c-format
-msgid "invalid operator number %d, must be between 1 and %d"
-msgstr "%d geçersiz operatör numarası, 0 ile %d arasında olmalıdır"
-
-#: commands/opclasscmds.c:456
-#: commands/opclasscmds.c:908
-#: commands/opclasscmds.c:1002
-#, c-format
-msgid "invalid procedure number %d, must be between 1 and %d"
-msgstr "%d geçersiz procedure numarası, 0 ile %d arasında olmalıdır"
-
-#: commands/opclasscmds.c:486
-msgid "storage type specified more than once"
-msgstr "depolama tipi birden fazla kez belirtilmiÅŸtir"
-
-#: commands/opclasscmds.c:514
-#, c-format
-msgid "storage type cannot be different from data type for access method \"%s\""
-msgstr "depolama yötemi  erişim metodu \"%s\" ile aynı olmalıdır"
-
-#: commands/opclasscmds.c:531
-#, c-format
-msgid "operator class \"%s\" for access method \"%s\" already exists"
-msgstr "\"%2$s\" erişim metodu için \"%1$s\" operator sınıfı zaten mevcut"
-
-#: commands/opclasscmds.c:559
-#, c-format
-msgid "could not make operator class \"%s\" be default for type %s"
-msgstr "%2$s veri tipinie \"%1$s\" operator sınıfı varsayılan olarak atanamıyor"
-
-#: commands/opclasscmds.c:562
-#, c-format
-msgid "Operator class \"%s\" already is the default."
-msgstr "\"%s\" operatör sınıfı zaten varsayılandır."
-
-#: commands/opclasscmds.c:700
-msgid "must be superuser to create an operator family"
-msgstr "operator sınıfı oluşturmak için superuser olmalısınız"
-
-#: commands/opclasscmds.c:818
-msgid "must be superuser to alter an operator family"
-msgstr "operator sınıfı değiştirmek için superuser olmalısınız"
-
-#: commands/opclasscmds.c:881
-msgid "operator argument types must be specified in ALTER OPERATOR FAMILY"
-msgstr "operator argument tipleri ALTER OPERATOR FAMILY iÅŸleminde belirtilmelidir"
-
-#: commands/opclasscmds.c:937
-msgid "STORAGE cannot be specified in ALTER OPERATOR FAMILY"
-msgstr "ALTER OPERATOR FAMILY işleminde STORAGE kullanılamaz"
-
-#: commands/opclasscmds.c:1053
-msgid "one or two argument types must be specified"
-msgstr "bir veya iki argüman türü belirtilmelidir"
-
-#: commands/opclasscmds.c:1081
-msgid "index operators must be binary"
-msgstr "index işletmenleri ikili olmalıdır"
-
-#: commands/opclasscmds.c:1085
-msgid "index operators must return boolean"
-msgstr "index işletmenleri boolean veri tipini döndürmeli"
-
-#: commands/opclasscmds.c:1125
-msgid "btree procedures must have two arguments"
-msgstr "btree kümesi iki argüman almalıdır"
-
-#: commands/opclasscmds.c:1129
-msgid "btree procedures must return integer"
-msgstr "btree yordamları tamsayı döndürmelidir"
-
-#: commands/opclasscmds.c:1144
-msgid "hash procedures must have one argument"
-msgstr "hash yordamı bir tek argüman almalıdır"
-
-#: commands/opclasscmds.c:1148
-msgid "hash procedures must return integer"
-msgstr "hash yordamı tamsayı dönmelidir"
-
-#: commands/opclasscmds.c:1173
-msgid "associated data types must be specified for index support procedure"
-msgstr "index destekleyen yordamlarının bağlı veri tiplerini belirtmelidir"
-
-#: commands/opclasscmds.c:1199
-#, c-format
-msgid "procedure number %d for (%s,%s) appears more than once"
-msgstr "%d (%s, %s) yordam numarasına birden fazla kez rastlanıyor"
-
-#: commands/opclasscmds.c:1206
-#, c-format
-msgid "operator number %d for (%s,%s) appears more than once"
-msgstr "%d (%s,%s) operator numarasına birden fazla kez rastlanıyor"
-
-#: commands/opclasscmds.c:1254
-#, c-format
-msgid "operator %d(%s,%s) already exists in operator family \"%s\""
-msgstr "\"%4$s\" operator ailesinde %1$d(%2$s,%3$s) operatoru zaten mevcuttur"
-
-#: commands/opclasscmds.c:1354
-#, c-format
-msgid "function %d(%s,%s) already exists in operator family \"%s\""
-msgstr "\"%4$s\" operator ailesinde %1$d(%2$s,%3$s) fonksiyonu zaten mevcuttur"
-
-#: commands/opclasscmds.c:1441
-#, c-format
-msgid "operator %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "\"%4$s\" operator ailesinde %1$d(%2$s,%3$s) operatoru mevcut deÄŸil"
-
-#: commands/opclasscmds.c:1481
-#, c-format
-msgid "function %d(%s,%s) does not exist in operator family \"%s\""
-msgstr "\"%4$s\" operator ailesinde %1$d(%2$s,%3$s) fonksiyonu mevcut deÄŸil"
-
-#: commands/opclasscmds.c:1802
-#, c-format
-msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
-msgstr "\"%2$s\" erişim yöntemi için kullanılacak \"%1$s\" operator classı zaten \"%3$s\" şemasında mevcuttur"
-
-#: commands/opclasscmds.c:1902
-#, c-format
-msgid "operator family \"%s\" for access method \"%s\" already exists in schema \"%s\""
-msgstr "\"%2$s\" erişim yöntemi için kullanılacak \"%1$s\" operator ailesi zaten \"%3$s\" şemasında mevcuttur"
-
-#: commands/operatorcmds.c:110
-#: commands/operatorcmds.c:118
-#, fuzzy
-msgid "SETOF type not allowed for operator argument"
-msgstr "operator argümanı setof tipinde olamaz"
-
-#: commands/operatorcmds.c:146
-#, c-format
-msgid "operator attribute \"%s\" not recognized"
-msgstr "\"%s\" operatör özniteliği tanınmamaktadır"
-
-#: commands/operatorcmds.c:156
-msgid "operator procedure must be specified"
-msgstr "operatör yordamı belirtilmelidir"
-
-#: commands/operatorcmds.c:167
-msgid "at least one of leftarg or rightarg must be specified"
-msgstr "en az bir tane leftarg veya rightarg belirtilmelidir"
-
-#: commands/operatorcmds.c:216
-#, fuzzy, c-format
-msgid "restriction estimator function %s must return type \"float8\""
-msgstr "%s type send fonksiyonu  \"cstring\" döndürmelidir"
-
-#: commands/operatorcmds.c:255
-#, fuzzy, c-format
-msgid "join estimator function %s must return type \"float8\""
-msgstr "%s typmod_in fonksiyonu \"trigger\" tipini döndürmelidir"
-
-#: commands/operatorcmds.c:306
-#, c-format
-msgid "operator %s does not exist, skipping"
-msgstr "%s operatorü mevcut değil, atlanıyor"
-
-#: commands/portalcmds.c:61
-#: commands/portalcmds.c:160
-#: commands/portalcmds.c:212
-msgid "invalid cursor name: must not be empty"
-msgstr "geçersiz imleç adı: boş olmamalıdır"
-
-#: commands/portalcmds.c:402
-msgid "could not reposition held cursor"
-msgstr "tutulan cursorun yerini deÄŸiÅŸtirilemez"
-
-#: commands/prepare.c:71
-msgid "invalid statement name: must not be empty"
-msgstr "geçersiz deyim adı: boş olmamalıdır"
-
-#: commands/prepare.c:140
-msgid "utility statements cannot be prepared"
-msgstr "yardımcı program statementları hazırlanamaz"
-
-#: commands/prepare.c:240
-#: commands/prepare.c:247
-#: commands/prepare.c:702
-msgid "prepared statement is not a SELECT"
-msgstr "hazırlanmış (prepared) sorgu SELECT değildir"
-
-#: commands/prepare.c:314
-#, c-format
-msgid "wrong number of parameters for prepared statement \"%s\""
-msgstr "\"%s\" hazırlanmış sorgusunda parametre sayısı fazla"
-
-#: commands/prepare.c:316
-#, c-format
-msgid "Expected %d parameters but got %d."
-msgstr "%d beklenirken %d alındı."
-
-#: commands/prepare.c:345
-msgid "cannot use subquery in EXECUTE parameter"
-msgstr "EXECUTE parametresinde subquery kullanılamaz"
-
-#: commands/prepare.c:349
-msgid "cannot use aggregate function in EXECUTE parameter"
-msgstr "EXECUTE parametresinde aggregate fonksiyon kullanılamaz"
-
-#: commands/prepare.c:353
-#, fuzzy
-msgid "cannot use window function in EXECUTE parameter"
-msgstr "EXECUTE parametresinde aggregate fonksiyon kullanılamaz"
-
-#: commands/prepare.c:366
-#, c-format
-msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
-msgstr "%2$s tipinde $%1$d parametresi %3$s beklenen tipine zorla dönüştürülemez"
-
-#: commands/prepare.c:459
-#, c-format
-msgid "prepared statement \"%s\" already exists"
-msgstr "\"%s\" hazırlanmış sorgusu zaten mevcut"
-
-#: commands/prepare.c:517
-#, c-format
-msgid "prepared statement \"%s\" does not exist"
-msgstr "hazırlanmış sorgu \"%s\" mevcut değil"
-
-#: commands/proclang.c:83
-#: commands/proclang.c:514
-#, c-format
-msgid "language \"%s\" already exists"
-msgstr "\"%s\" dili zaten mevcut"
-
-#: commands/proclang.c:98
-msgid "using pg_pltemplate information instead of CREATE LANGUAGE parameters"
-msgstr "CREATE LANGUAGE parametrelerin yerinde pg_pltemplate bilgisi kullanılacaktır"
-
-#: commands/proclang.c:108
-#, c-format
-msgid "must be superuser to create procedural language \"%s\""
-msgstr "\"%s\" yordamsal dilini oluşturmak için superuser olmalısınız"
-
-#: commands/proclang.c:128
-#: commands/proclang.c:245
-#, c-format
-msgid "function %s must return type \"language_handler\""
-msgstr "%s fonksiyonunun döndürme tipi \"language_handler\" olmalıdır"
-
-#: commands/proclang.c:209
-#, c-format
-msgid "unsupported language \"%s\""
-msgstr "\"%s\" dili desteklenmiyor"
-
-#: commands/proclang.c:211
-msgid "The supported languages are listed in the pg_pltemplate system catalog."
-msgstr "Testeklenen dillerin listesi pg_pltemplate sistem cataloğunda bulunmaktadır."
-
-#: commands/proclang.c:219
-msgid "must be superuser to create custom procedural language"
-msgstr "özel yordamsal dil oluşturmak için superuser olmalısınız"
-
-#: commands/proclang.c:238
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"language_handler\""
-msgstr "%s fonksiyonunun döndürme tipi \"opaque\"'dan \"language_handler\"'e değiştiriliyor"
-
-#: commands/proclang.c:436
-#, c-format
-msgid "language \"%s\" does not exist, skipping"
-msgstr "\"%s\" dili mevcut değil, atlanıyor"
-
-#: commands/schemacmds.c:82
-#: commands/schemacmds.c:292
-#, c-format
-msgid "unacceptable schema name \"%s\""
-msgstr "\"%s\" kabul edilemez şema adı"
-
-#: commands/schemacmds.c:83
-#: commands/schemacmds.c:293
-msgid "The prefix \"pg_\" is reserved for system schemas."
-msgstr "\"pg_\" ön eki, sistem şemaları için ayrılmıştır."
-
-#: commands/schemacmds.c:196
-#, c-format
-msgid "schema \"%s\" does not exist, skipping"
-msgstr "\"%s\" şeması mevcut değil, atlanıyor"
-
-#: commands/sequence.c:547
-#, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
-msgstr "nextval: sequence en yüksek değerine ulaşmıştır \"%s\" (%s)"
-
-#: commands/sequence.c:570
-#, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
-msgstr "nextval: sequence en düşük değerine ulaşmıştır \"%s\" (%s)"
-
-#: commands/sequence.c:668
-#, c-format
-msgid "currval of sequence \"%s\" is not yet defined in this session"
-msgstr "bu oturumda \"%s\" sequence'i için currval henüz tanımlanmamıştır"
-
-#: commands/sequence.c:687
-#: commands/sequence.c:695
-msgid "lastval is not yet defined in this session"
-msgstr "bu otumda lastval daha tanımlanmadı"
-
-#: commands/sequence.c:759
-#, c-format
-msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
-msgstr "setval: %s değeri kapsam dışıdır, sequence \"%s\" (%s..%s)"
-
-#: commands/sequence.c:1088
-msgid "INCREMENT must not be zero"
-msgstr "INCREMENT sıfır olamaz"
-
-#: commands/sequence.c:1134
-#, c-format
-msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
-msgstr "MINVALUE (%s), MAXVALUE (%s) değerinden küçük olmalıdır"
-
-#: commands/sequence.c:1159
-#, c-format
-msgid "START value (%s) cannot be less than MINVALUE (%s)"
-msgstr "START değeri (%s) MINVALUE değerinden (%s) küçük olamaz"
-
-#: commands/sequence.c:1171
-#, c-format
-msgid "START value (%s) cannot be greater than MAXVALUE (%s)"
-msgstr "START değeri (%s) MAXVALUE değerinden (%s) büyük olamaz"
-
-#: commands/sequence.c:1202
-#, fuzzy, c-format
-msgid "RESTART value (%s) cannot be less than MINVALUE (%s)"
-msgstr "START değeri (%s) MINVALUE değerinden (%s) küçük olamaz"
-
-#: commands/sequence.c:1214
-#, fuzzy, c-format
-msgid "RESTART value (%s) cannot be greater than MAXVALUE (%s)"
-msgstr "START değeri (%s) MAXVALUE değerinden (%s) büyük olamaz"
-
-#: commands/sequence.c:1229
-#, c-format
-msgid "CACHE (%s) must be greater than zero"
-msgstr "CACHE (%s) sıfırdan büyük olmalıdır"
-
-#: commands/sequence.c:1260
-msgid "invalid OWNED BY option"
-msgstr "geçersiz OWNED BY seçeneği"
-
-#: commands/sequence.c:1261
-msgid "Specify OWNED BY table.column or OWNED BY NONE."
-msgstr "OWNED BY table.column veya OWNED BY NONE belirtin."
-
-#: commands/sequence.c:1283
-#: commands/tablecmds.c:4597
-#, c-format
-msgid "referenced relation \"%s\" is not a table"
-msgstr " rerefans edilen \"%s\" nesnesi bir tablo deÄŸildir"
-
-#: commands/sequence.c:1290
-msgid "sequence must have same owner as table it is linked to"
-msgstr "sequence ait olduğu tablo ile aynı kullanıcıya sahip olmalıdır"
-
-#: commands/sequence.c:1294
-msgid "sequence must be in same schema as table it is linked to"
-msgstr "sequence ait olduğu tablonun bulunduğu şemada bulunmalıdır"
-
-#: commands/tablecmds.c:191
-#, c-format
-msgid "table \"%s\" does not exist"
-msgstr "tablo \"%s\" mevcut deÄŸil"
-
-#: commands/tablecmds.c:192
-#, c-format
-msgid "table \"%s\" does not exist, skipping"
-msgstr "tablo \"%s\" mevcut değil, atlanıyor"
-
-#: commands/tablecmds.c:194
-msgid "Use DROP TABLE to remove a table."
-msgstr "Bir tabloyu kaldırmak için DROP TABLE KULLANIN."
-
-#: commands/tablecmds.c:197
-#, c-format
-msgid "sequence \"%s\" does not exist"
-msgstr "sequence \"%s\" mevcut deÄŸil"
-
-#: commands/tablecmds.c:198
-#, c-format
-msgid "sequence \"%s\" does not exist, skipping"
-msgstr "sequence \"%s\" mevcut değil, atlanıyor"
-
-#: commands/tablecmds.c:200
-msgid "Use DROP SEQUENCE to remove a sequence."
-msgstr "Bir sequence kaldırmak için DROP SEQUENCE kullanın."
-
-#: commands/tablecmds.c:203
-#, c-format
-msgid "view \"%s\" does not exist"
-msgstr "view \"%s\" mevcut deÄŸil"
-
-#: commands/tablecmds.c:204
-#, c-format
-msgid "view \"%s\" does not exist, skipping"
-msgstr "view \"%s\" mevcut değil, atlanıyor"
-
-#: commands/tablecmds.c:206
-msgid "Use DROP VIEW to remove a view."
-msgstr "Bir view kaldırmak için DROP VIEW kullanın."
-
-#: commands/tablecmds.c:209
-#, c-format
-msgid "index \"%s\" does not exist"
-msgstr "\"%s\" indexi mevcut deÄŸil"
-
-#: commands/tablecmds.c:210
-#, c-format
-msgid "index \"%s\" does not exist, skipping"
-msgstr "\"%s\" indexi mevcut değil, atlanıyor"
-
-#: commands/tablecmds.c:212
-msgid "Use DROP INDEX to remove an index."
-msgstr "Bir index kaldırmak için DROP INDEX kullanın."
-
-#: commands/tablecmds.c:216
-#: commands/typecmds.c:654
-#, c-format
-msgid "type \"%s\" does not exist, skipping"
-msgstr "\"%s\" tipi mevcut değil, atlanıyor"
-
-#: commands/tablecmds.c:217
-#, c-format
-msgid "\"%s\" is not a type"
-msgstr "\"%s\" bir tip deÄŸildir"
-
-#: commands/tablecmds.c:218
-msgid "Use DROP TYPE to remove a type."
-msgstr "Bir tipi kaldırmak için DROP TYPE kullanın."
-
-#: commands/tablecmds.c:370
-#: executor/execMain.c:2860
-msgid "ON COMMIT can only be used on temporary tables"
-msgstr "ON COMMIT sadece geçici tablolarda kullanılabilir"
-
-#: commands/tablecmds.c:843
-#, c-format
-msgid "truncate cascades to table \"%s\""
-msgstr "truncate işlemi , cascade neticesinde %s' tablosuna varıyor"
-
-#: commands/tablecmds.c:1052
-#, c-format
-msgid "cannot truncate system relation \"%s\""
-msgstr "sistem tablosu \"%s\" truncate edilemez"
-
-#: commands/tablecmds.c:1062
-msgid "cannot truncate temporary tables of other sessions"
-msgstr "diğer oturumların geçici tablolarını truncate edemezsiniz"
-
-#: commands/tablecmds.c:1203
-#: parser/parse_utilcmd.c:557
-#: parser/parse_utilcmd.c:1163
-#, c-format
-msgid "inherited relation \"%s\" is not a table"
-msgstr "miras alınan \"%s\" nesnesi bir tablo değildir"
-
-#: commands/tablecmds.c:1209
-#: commands/tablecmds.c:6913
-#, c-format
-msgid "cannot inherit from temporary relation \"%s\""
-msgstr "\"%s\" geçici nesnesinden inherit yapılamaz"
-
-#: commands/tablecmds.c:1226
-#: commands/tablecmds.c:6941
-#, c-format
-msgid "relation \"%s\" would be inherited from more than once"
-msgstr "\"%s\" ilişkisi birden fazla miras alınmış"
-
-#: commands/tablecmds.c:1281
-#, c-format
-msgid "merging multiple inherited definitions of column \"%s\""
-msgstr "\"%s\" sütununun birden fazla miras alınmış tanımı birleştiriliyor"
-
-#: commands/tablecmds.c:1289
-#, c-format
-msgid "inherited column \"%s\" has a type conflict"
-msgstr "miras alınan \"%s\"  sütunu tip çakışması yaşıyor"
-
-#: commands/tablecmds.c:1291
-#: commands/tablecmds.c:1449
-#: parser/parse_coerce.c:302
-#: parser/parse_coerce.c:1488
-#: parser/parse_coerce.c:1507
-#: parser/parse_coerce.c:1552
-#: parser/parse_expr.c:1872
-#, c-format
-msgid "%s versus %s"
-msgstr "%s versus %s"
-
-#: commands/tablecmds.c:1439
-#, c-format
-msgid "merging column \"%s\" with inherited definition"
-msgstr "\"%s\" sütunu miras alınan tanımı ile birleştiriliyor"
-
-#: commands/tablecmds.c:1447
-#, c-format
-msgid "column \"%s\" has a type conflict"
-msgstr "\"%s\" sütununda tip çakışması"
-
-#: commands/tablecmds.c:1498
-#, c-format
-msgid "column \"%s\" inherits conflicting default values"
-msgstr "\"%s\" sütunu çakışan değerleri inherit ediyor"
-
-#: commands/tablecmds.c:1500
-msgid "To resolve the conflict, specify a default explicitly."
-msgstr "Çakışmayı çözmek için varsayılan değeri açıkca belirtin."
-
-#: commands/tablecmds.c:1547
-#, c-format
-msgid "check constraint name \"%s\" appears multiple times but with different expressions"
-msgstr "\"%s\" check kısıtlaması birçok kez ve farklı anlatımla mevcuttur"
-
-#: commands/tablecmds.c:1903
-#, c-format
-msgid "inherited column \"%s\" must be renamed in child tables too"
-msgstr "miras alınan \"%s\"  kolonunun adı alt tablolarda da değiştirilmelidir"
-
-#: commands/tablecmds.c:1921
-#, c-format
-msgid "cannot rename system column \"%s\""
-msgstr "\"%s\" sistem sütununun adı değiştirilemez"
-
-#: commands/tablecmds.c:1931
-#, c-format
-msgid "cannot rename inherited column \"%s\""
-msgstr "miras alınan \"%s\" sütununun adı değiştirilemez"
-
-#: commands/tablecmds.c:1942
-#: commands/tablecmds.c:3585
-#, c-format
-msgid "column \"%s\" of relation \"%s\" already exists"
-msgstr "\"%2$s\" nesnesinin \"%1$s\" sütunu zaten mevcut"
-
-#: commands/tablecmds.c:2063
-#: commands/tablecmds.c:6252
-#: commands/tablecmds.c:7543
-msgid "Use ALTER TYPE instead."
-msgstr "Yerine ALTER TYPE kullanın."
-
-#. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2188
-#, fuzzy, c-format
-msgid "cannot %s \"%s\" because it is being used by active queries in this session"
-msgstr "\"%s\" tablosu şu anda aktif sorgular tarafından kullanılmaktadır"
-
-#. translator: first %s is a SQL command, eg ALTER TABLE
-#: commands/tablecmds.c:2197
-#, fuzzy, c-format
-msgid "cannot %s \"%s\" because it has pending trigger events"
-msgstr "\"%s\" tablosuna bağlı trigger olayları bulunduğu için truncate işlemi yapılamadı"
-
-#: commands/tablecmds.c:2792
-#, c-format
-msgid "cannot rewrite system relation \"%s\""
-msgstr "\"%s\" sistem tablosu yeniden yazılamaz"
-
-#: commands/tablecmds.c:2802
-msgid "cannot rewrite temporary tables of other sessions"
-msgstr "diğer oturumların geçici tabloları yeniden yazılamaz"
-
-#: commands/tablecmds.c:3128
-#, c-format
-msgid "column \"%s\" contains null values"
-msgstr "\"%s\" sütunu null değerleri içermektedir"
-
-#: commands/tablecmds.c:3142
-#, c-format
-msgid "check constraint \"%s\" is violated by some row"
-msgstr "\"%s\" bütünlük kısıtlaması bir(kaç) satır tarafından ihlal edilmiş"
-
-#: commands/tablecmds.c:3225
-#: rewrite/rewriteDefine.c:253
-#, c-format
-msgid "\"%s\" is not a table or view"
-msgstr "\"%s\" bir tablo veya view deÄŸildir"
-
-#: commands/tablecmds.c:3261
-#: commands/tablecmds.c:4012
-#, c-format
-msgid "\"%s\" is not a table or index"
-msgstr "\"%s\" bir tablo veya index deÄŸil"
-
-#: commands/tablecmds.c:3416
-#, c-format
-msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype"
-msgstr "\"%2$s\".\"%3$s\" sütunu onun rowtype veri tipini kullandığı için \"%1$s\" tablosu değiştirilemez"
-
-#: commands/tablecmds.c:3423
-#, fuzzy, c-format
-msgid "cannot alter type \"%s\" because column \"%s\".\"%s\" uses it"
-msgstr "\"%2$s\".\"%3$s\" sütunu onun rowtype veri tipini kullandığı için \"%1$s\" tablosu değiştirilemez"
-
-#: commands/tablecmds.c:3494
-msgid "column must be added to child tables too"
-msgstr "sütun, alt tablolarana da eklenmelidir"
-
-#: commands/tablecmds.c:3539
-#: commands/tablecmds.c:7097
-#, c-format
-msgid "child table \"%s\" has different type for column \"%s\""
-msgstr "\"%s\" alt tablosundaki  \"%s\" sütununun tipi farklıdır"
-
-#: commands/tablecmds.c:3546
-#, fuzzy, c-format
-msgid "child table \"%s\" has a conflicting \"%s\" column"
-msgstr "alt tablosunda  \"%s\" kısıtlama eksiktir"
-
-#: commands/tablecmds.c:3558
-#, c-format
-msgid "merging definition of column \"%s\" for child \"%s\""
-msgstr "\"%s\" sütunun tanımı \"%s\" alt tablo için birleştiriliyor"
-
-#: commands/tablecmds.c:3832
-#: commands/tablecmds.c:3924
-#: commands/tablecmds.c:3969
-#: commands/tablecmds.c:4065
-#: commands/tablecmds.c:4126
-#: commands/tablecmds.c:5576
-#, c-format
-msgid "cannot alter system column \"%s\""
-msgstr "\"%s\" sistem sütunu değiştirilemez"
-
-#: commands/tablecmds.c:3868
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr "\"%s\" sütunu bir birincil anahtardır"
-
-#: commands/tablecmds.c:4039
-#, c-format
-msgid "statistics target %d is too low"
-msgstr "statistics target %d çok düşüktür"
-
-#: commands/tablecmds.c:4047
-#, c-format
-msgid "lowering statistics target to %d"
-msgstr "statistics target, %d değerine düşürülmektedir"
-
-#: commands/tablecmds.c:4107
-#, c-format
-msgid "invalid storage type \"%s\""
-msgstr "geçersiz saklama tipi \"%s\""
-
-#: commands/tablecmds.c:4138
-#, c-format
-msgid "column data type %s can only have storage PLAIN"
-msgstr "%s sütün veri tipleri sadece PLAIN depolama yöntemini kullanabilir"
-
-#: commands/tablecmds.c:4193
-#, c-format
-msgid "cannot drop system column \"%s\""
-msgstr "\"%s\" sistem sütunu kaldırılamaz"
-
-#: commands/tablecmds.c:4200
-#, c-format
-msgid "cannot drop inherited column \"%s\""
-msgstr "miras alınan \"%s\"  sütunu kaldırılamaz"
-
-#: commands/tablecmds.c:4532
-#, fuzzy
-msgid "constraint must be added to child tables too"
-msgstr "sütun, alt tablolarana da eklenmelidir"
-
-#: commands/tablecmds.c:4619
-msgid "cannot reference temporary table from permanent table constraint"
-msgstr "sürekli tablo kısıtlayıcısından geçici tablo referans edilemez"
-
-#: commands/tablecmds.c:4626
-msgid "cannot reference permanent table from temporary table constraint"
-msgstr "geçeci tablo kısıtlayıcısından sürekli  tablo referans edilemez"
-
-#: commands/tablecmds.c:4686
-msgid "number of referencing and referenced columns for foreign key disagree"
-msgstr "foreign key'in referans eden ve referans edilen sütun sayısı uyuşmuyor"
-
-#: commands/tablecmds.c:4777
-#, c-format
-msgid "foreign key constraint \"%s\" cannot be implemented"
-msgstr "\"%s\" foreign key constrain oluÅŸturulamaz"
-
-#: commands/tablecmds.c:4780
-#, c-format
-msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s."
-msgstr "\"%s\" ve \"%s\" anahtar sütunların tipi farklı: %s ve %s."
-
-#: commands/tablecmds.c:4873
-#, c-format
-msgid "column \"%s\" referenced in foreign key constraint does not exist"
-msgstr "foreign key kısıtlaması tarafından referans edilen sütun \"%s\" mevcut değil"
-
-#: commands/tablecmds.c:4878
-#, c-format
-msgid "cannot have more than %d keys in a foreign key"
-msgstr "foreign key kısıtlamasında %d'dan fazla anahtar olamaz"
-
-#: commands/tablecmds.c:4951
-#, c-format
-msgid "there is no primary key for referenced table \"%s\""
-msgstr "referans edilen \"%s\" tablosunda primary key mevcut deÄŸil"
-
-#: commands/tablecmds.c:5085
-#, c-format
-msgid "there is no unique constraint matching given keys for referenced table \"%s\""
-msgstr "\"%s\" referans edilen tablosunda belirtilen anahtarlara uyan bir unique constraint yok"
-
-#: commands/tablecmds.c:5405
-#, fuzzy, c-format
-msgid "cannot drop inherited constraint \"%s\" of relation \"%s\""
-msgstr "miras alınan \"%s\"  sütunu kaldırılamaz"
-
-#: commands/tablecmds.c:5429
-#: commands/tablecmds.c:5532
-#, fuzzy, c-format
-msgid "constraint \"%s\" of relation \"%s\" does not exist"
-msgstr "\"%s\" kolonu \"%s\" tablosunda mevcut deÄŸil"
-
-#: commands/tablecmds.c:5583
-#, c-format
-msgid "cannot alter inherited column \"%s\""
-msgstr "miras alınan \"%s\" kolonu değiştirilemez"
-
-#: commands/tablecmds.c:5618
-msgid "transform expression must not return a set"
-msgstr "transform ifadesi bir set döndürmemelidir"
-
-#: commands/tablecmds.c:5624
-msgid "cannot use subquery in transform expression"
-msgstr "transform ifadesinde set kullanılamaz"
-
-#: commands/tablecmds.c:5628
-msgid "cannot use aggregate function in transform expression"
-msgstr "transform ifadesinde aggregate function kullanılamaz"
-
-#: commands/tablecmds.c:5632
-#, fuzzy
-msgid "cannot use window function in transform expression"
-msgstr "transform ifadesinde aggregate function kullanılamaz"
-
-#: commands/tablecmds.c:5650
-#, fuzzy, c-format
-msgid "column \"%s\" cannot be cast to type %s"
-msgstr "\"%s\" sütunu \"%s\" tipine dönüştürülemez"
-
-#: commands/tablecmds.c:5676
-#, c-format
-msgid "type of inherited column \"%s\" must be changed in child tables too"
-msgstr "\"%s\" inherinted sütununların tipi çocuk tablolarında da değiştirilmelidir"
-
-#: commands/tablecmds.c:5715
-#, c-format
-msgid "cannot alter type of column \"%s\" twice"
-msgstr "\"%s\" sütununun tipini iki kez değiştirilemez"
-
-#: commands/tablecmds.c:5749
-#, fuzzy, c-format
-msgid "default for column \"%s\" cannot be cast to type %s"
-msgstr "\"%s\" sütunun varsayılan tipi \"%s\" tipine dönüştürülemez"
-
-#: commands/tablecmds.c:5875
-msgid "cannot alter type of a column used by a view or rule"
-msgstr "view veya rule tarafından kullanılan sütunun tipini değiştirilemedi"
-
-#: commands/tablecmds.c:5876
-#, c-format
-msgid "%s depends on column \"%s\""
-msgstr "%s sütunu \"%s\" sütununa bağlıdır"
-
-#: commands/tablecmds.c:6220
-#, c-format
-msgid "cannot change owner of index \"%s\""
-msgstr "\"%s\" indeksinin sahibi deÄŸiÅŸtirilemez"
-
-#: commands/tablecmds.c:6222
-msgid "Change the ownership of the index's table, instead."
-msgstr "Bunun yerine indeksin bağlı oldüğü tablonun sahipliğini değiştirin."
-
-#: commands/tablecmds.c:6238
-#, c-format
-msgid "cannot change owner of sequence \"%s\""
-msgstr "\"%s\" sequence'in sahibi deÄŸiÅŸtirilemez"
-
-#: commands/tablecmds.c:6240
-#: commands/tablecmds.c:7533
-#, c-format
-msgid "Sequence \"%s\" is linked to table \"%s\"."
-msgstr "\"%s\" sequence'i, \"%s\" tablosuna bağlıdır"
-
-#: commands/tablecmds.c:6261
-#: commands/tablecmds.c:7551
-#, c-format
-msgid "\"%s\" is not a table, view, or sequence"
-msgstr "\"%s\" bir tablo, view veya sequence deÄŸildir"
-
-#: commands/tablecmds.c:6520
-msgid "cannot have multiple SET TABLESPACE subcommands"
-msgstr "birden fazla SET TABLESPACE alt komutu veremezsiniz"
-
-#: commands/tablecmds.c:6574
-#, c-format
-msgid "\"%s\" is not a table, index, or TOAST table"
-msgstr "\"%s\" bir tablo, dizin, veya TOAST tablosu deÄŸildir"
-
-#: commands/tablecmds.c:6686
-#, c-format
-msgid "cannot move system relation \"%s\""
-msgstr "\"%s\" sistem nesnesi taşınamaz"
-
-#: commands/tablecmds.c:6702
-msgid "cannot move temporary tables of other sessions"
-msgstr "diğer oturumların geçici tabloları taşınamaz"
-
-#: commands/tablecmds.c:6968
-msgid "circular inheritance not allowed"
-msgstr "çevrimsel inheritance yapısına izin verilmemektedir"
-
-#: commands/tablecmds.c:6969
-#, c-format
-msgid "\"%s\" is already a child of \"%s\"."
-msgstr "\"%s\" zaten \"%s\" nesnesinin alt nesnesidir"
-
-#: commands/tablecmds.c:6977
-#, c-format
-msgid "table \"%s\" without OIDs cannot inherit from table \"%s\" with OIDs"
-msgstr "OID olmayan \"%s\" tablosu, OID olan \"%s\" tablosu inherit edemez"
-
-#: commands/tablecmds.c:7104
-#, c-format
-msgid "column \"%s\" in child table must be marked NOT NULL"
-msgstr "alt tablosundaki \"%s\" sütunu NOT NULL olmalıdır"
-
-#: commands/tablecmds.c:7120
-#, c-format
-msgid "child table is missing column \"%s\""
-msgstr "alt tablosunda  \"%s\" sütunu eksiktir"
-
-#: commands/tablecmds.c:7199
-#, fuzzy, c-format
-msgid "child table \"%s\" has different definition for check constraint \"%s\""
-msgstr "\"%s\" alt tablosundaki  \"%s\" sütununun tipi farklıdır"
-
-#: commands/tablecmds.c:7223
-#, c-format
-msgid "child table is missing constraint \"%s\""
-msgstr "alt tablosunda  \"%s\" kısıtlama eksiktir"
-
-#: commands/tablecmds.c:7304
-#, c-format
-msgid "relation \"%s\" is not a parent of relation \"%s\""
-msgstr "\"%s\" nesnesi \"%s\" nesnesinin üst nesnesi değildir"
-
-#: commands/tablecmds.c:7532
-msgid "cannot move an owned sequence into another schema"
-msgstr "sahipliği belli olan sequence başka bir şemaya taşınamaz"
-
-#: commands/tablecmds.c:7561
-#, c-format
-msgid "relation \"%s\" is already in schema \"%s\""
-msgstr "\"%s\" nesnesi zaten \"%s\" şemasında mevcuttur"
-
-#: commands/tablecmds.c:7626
-#, c-format
-msgid "relation \"%s\" already exists in schema \"%s\""
-msgstr "\"%s\" nesnesi zaten \"%s\" şemasında mevcuttur"
-
-#: commands/tablespace.c:146
-#: commands/tablespace.c:154
-#: commands/tablespace.c:160
-#: ../port/copydir.c:59
-#, c-format
-msgid "could not create directory \"%s\": %m"
-msgstr "\"%s\" dizini oluşturulamadı: %m"
-
-#: commands/tablespace.c:171
-#, c-format
-msgid "could not stat directory \"%s\": %m"
-msgstr "\"%s\" dizinine eriÅŸilemedi: %m"
-
-#: commands/tablespace.c:180
-#, c-format
-msgid "\"%s\" exists but is not a directory"
-msgstr "\"%s\" mevcuttur ancak bir dizin deÄŸildir"
-
-#: commands/tablespace.c:211
-#, c-format
-msgid "permission denied to create tablespace \"%s\""
-msgstr "tablespace \"%s\" oluşturma hatası"
-
-#: commands/tablespace.c:213
-msgid "Must be superuser to create a tablespace."
-msgstr "Tablespace oluşturmak için superuser haklarına sahip olmalısınız."
-
-#: commands/tablespace.c:229
-msgid "tablespace location cannot contain single quotes"
-msgstr "tablespace yeri adında tek tırnak bulunamaz"
-
-#: commands/tablespace.c:239
-msgid "tablespace location must be an absolute path"
-msgstr "tablespace yeri gosteren ifade tam bir mutlak yol olmalıdır"
-
-#: commands/tablespace.c:249
-#, c-format
-msgid "tablespace location \"%s\" is too long"
-msgstr "tablespace yeri \"%s\" çok uzun"
-
-#: commands/tablespace.c:259
-#: commands/tablespace.c:786
-#, c-format
-msgid "unacceptable tablespace name \"%s\""
-msgstr "\"%s\" tablespace adı kabul edilemez"
-
-#: commands/tablespace.c:261
-#: commands/tablespace.c:787
-msgid "The prefix \"pg_\" is reserved for system tablespaces."
-msgstr "\"pg_\" ön eki, sistem tablespaceler için ayrılmıştır."
-
-#: commands/tablespace.c:271
-#: commands/tablespace.c:799
-#, c-format
-msgid "tablespace \"%s\" already exists"
-msgstr "tablespace \"%s\" zaten mevcut"
-
-#: commands/tablespace.c:309
-#: commands/tablespace.c:1295
-#, c-format
-msgid "could not set permissions on directory \"%s\": %m"
-msgstr "dizin \"%s\" için erişim hakları ayarlanamadı: %m"
-
-#: commands/tablespace.c:318
-#, c-format
-msgid "directory \"%s\" is not empty"
-msgstr "\"%s\"dizini boÅŸ deÄŸildir"
-
-#: commands/tablespace.c:339
-#: commands/tablespace.c:1310
-#, c-format
-msgid "could not create symbolic link \"%s\": %m"
-msgstr "symbolic link \"%s\" oluşturma hatası: %m"
-
-#: commands/tablespace.c:377
-#: commands/tablespace.c:529
-msgid "tablespaces are not supported on this platform"
-msgstr "bu platformda tablespace desteklenmiyor"
-
-#: commands/tablespace.c:421
-#, c-format
-msgid "tablespace \"%s\" does not exist, skipping"
-msgstr "tabloaralığı \"%s\" mevcut değil, atlanıyor"
-
-#: commands/tablespace.c:486
-#, c-format
-msgid "tablespace \"%s\" is not empty"
-msgstr "\"%s\" tablespace boÅŸ deÄŸil"
-
-#: commands/tablespace.c:611
-#: commands/tablespace.c:648
-#, c-format
-msgid "could not remove directory \"%s\": %m"
-msgstr "\"%s\" dizini silme hatası: %m"
-
-#: commands/tablespace.c:656
-#, c-format
-msgid "could not remove symbolic link \"%s\": %m"
-msgstr "symbolic link \"%s\" kaldırma hatası: %m"
-
-#: commands/tablespace.c:1323
-#, c-format
-msgid "tablespace %u is not empty"
-msgstr "%u tablespace boÅŸ deÄŸil"
-
-#: commands/trigger.c:158
-msgid "TRUNCATE FOR EACH ROW triggers are not supported"
-msgstr ""
-
-#: commands/trigger.c:174
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"trigger\""
-msgstr "%s fonksiyonunun döndürme değeri \"opaque\"tan \"trigger\"e değiştiriliyor"
-
-#: commands/trigger.c:181
-#, c-format
-msgid "function %s must return type \"trigger\""
-msgstr "%s fonksiyonu \"trigger\" tipini döndürmelidir"
-
-#: commands/trigger.c:259
-#: commands/trigger.c:892
-#, c-format
-msgid "trigger \"%s\" for relation \"%s\" already exists"
-msgstr "\"%2$s\" nesnesi için \"%1$s\" tetikleyicisi (trigger) zaten mevcut"
-
-#: commands/trigger.c:461
-msgid "Found referenced table's UPDATE trigger."
-msgstr "BaÅŸvurulan tablonun UPDATE tetikleyicisi bulundu."
-
-#: commands/trigger.c:462
-msgid "Found referenced table's DELETE trigger."
-msgstr "BaÅŸvurulan tablonun DELETE tetikleyicisi bulundu."
-
-#: commands/trigger.c:463
-msgid "Found referencing table's trigger."
-msgstr "BaÅŸvurulan tablonun tetikleyicisi bulundu."
-
-#: commands/trigger.c:572
-#: commands/trigger.c:588
-#, c-format
-msgid "ignoring incomplete trigger group for constraint \"%s\" %s"
-msgstr "\"%s\" %s kısıtlamasına ait eksik tetikleyicisi yok sayılıyor"
-
-#: commands/trigger.c:600
-#, c-format
-msgid "converting trigger group into constraint \"%s\" %s"
-msgstr "tetikleyicisi grubu \"%s\" %s kısıtlamasına dönüştürülüyor"
-
-#: commands/trigger.c:738
-#, c-format
-msgid "trigger \"%s\" for table \"%s\" does not exist, skipping"
-msgstr "\"%s\" triggeri \"%s\" tablosunda mevcut değil, atlanıyor"
-
-#: commands/trigger.c:1013
-#, c-format
-msgid "permission denied: \"%s\" is a system trigger"
-msgstr "eriÅŸim engellendi: \"%s\" bir sistem tetikleyicisidir"
-
-#: commands/trigger.c:1563
-#, c-format
-msgid "trigger function %u returned null value"
-msgstr "%u trigger fonksiyonu null değerini döndürdü"
-
-#: commands/trigger.c:1631
-#: commands/trigger.c:1762
-#: commands/trigger.c:1910
-#: commands/trigger.c:2061
-msgid "BEFORE STATEMENT trigger cannot return a value"
-msgstr "BEFORE STATEMENT tetikleyicisi bir değer döndüremez"
-
-#: commands/trigger.c:2118
-#: executor/execMain.c:1600
-#: executor/execMain.c:1912
-#: executor/execMain.c:2090
-msgid "could not serialize access due to concurrent update"
-msgstr "eşzamanlı update nedeniyle erişim sıralanamıyor"
-
-#: commands/trigger.c:3608
-#, c-format
-msgid "constraint \"%s\" is not deferrable"
-msgstr "\"%s\" constrainti ertelenebilir constraint deÄŸildir"
-
-#: commands/trigger.c:3634
-#, c-format
-msgid "constraint \"%s\" does not exist"
-msgstr "constraint \"%s\" mevcut deÄŸil"
-
-#: commands/tsearchcmds.c:109
-#: commands/tsearchcmds.c:947
-#, c-format
-msgid "function %s should return type %s"
-msgstr "%s fonksiyonu %s tipini döndürmeli"
-
-#: commands/tsearchcmds.c:178
-msgid "must be superuser to create text search parsers"
-msgstr "metin arama ayrıştırıcısı yaratmak için superuser olmalısınız"
-
-#: commands/tsearchcmds.c:226
-#, c-format
-msgid "text search parser parameter \"%s\" not recognized"
-msgstr "\"%s\" metin arama ayrıştırıcısı tanımlanamadı"
-
-#: commands/tsearchcmds.c:236
-msgid "text search parser start method is required"
-msgstr "metin arama ayrışırıcısının start metodu eksiktir"
-
-#: commands/tsearchcmds.c:241
-msgid "text search parser gettoken method is required"
-msgstr "metin arama ayrışırıcısının gettoken metodu eksiktir"
-
-#: commands/tsearchcmds.c:246
-msgid "text search parser end method is required"
-msgstr "metin arama ayrışırıcısının end metodu eksiktir"
-
-#: commands/tsearchcmds.c:251
-msgid "text search parser lextypes method is required"
-msgstr "metin arama ayrışırıcısının lextypes metodu eksiktir"
-
-#: commands/tsearchcmds.c:283
-msgid "must be superuser to drop text search parsers"
-msgstr "metin arama ayrıştırıcısını kaldırmak için superuser olmalısınız"
-
-#: commands/tsearchcmds.c:312
-#, c-format
-msgid "text search parser \"%s\" does not exist, skipping"
-msgstr " \"%s\" metin arama ayrıştırıcısı mevcut değil, atlanıyor"
-
-#: commands/tsearchcmds.c:369
-msgid "must be superuser to rename text search parsers"
-msgstr "metin arama ayrıştırıcısını yeniden adlandırmak için superuser olmalısınız"
-
-#: commands/tsearchcmds.c:390
-#, c-format
-msgid "text search parser \"%s\" already exists"
-msgstr " \"%s\" metin arama ayrıştırıcısı zaten mevcut"
-
-#: commands/tsearchcmds.c:469
-#, c-format
-msgid "text search template \"%s\" does not accept options"
-msgstr "\"%s\" metin arama şeması seçenek kabul etmiyor"
-
-#: commands/tsearchcmds.c:542
-msgid "text search template is required"
-msgstr "metin arama ÅŸablonu eksiktir"
-
-#: commands/tsearchcmds.c:610
-#, c-format
-msgid "text search dictionary \"%s\" already exists"
-msgstr "\"%s\" metin arama sözlüğü zaten mevcut"
-
-#: commands/tsearchcmds.c:670
-#, c-format
-msgid "text search dictionary \"%s\" does not exist, skipping"
-msgstr "\"%s\" metin arama sözlüğü mevcut değil, atlanıyor"
-
-#: commands/tsearchcmds.c:1008
-msgid "must be superuser to create text search templates"
-msgstr "metin arama şablonu yaratmak için superuser olmalısınız"
-
-#: commands/tsearchcmds.c:1045
-#, c-format
-msgid "text search template parameter \"%s\" not recognized"
-msgstr "metin araama şablonu parametresi \"%s\" tanınmıyor"
-
-#: commands/tsearchcmds.c:1055
-msgid "text search template lexize method is required"
-msgstr "metin arama ÅŸablonun lexsize metodu eksiktir"
-
-#: commands/tsearchcmds.c:1090
-msgid "must be superuser to rename text search templates"
-msgstr "metin arama şablolarının adını değiştirmek için superuser olmalısınız"
-
-#: commands/tsearchcmds.c:1112
-#, c-format
-msgid "text search template \"%s\" already exists"
-msgstr "\"%s\" metin arama ÅŸablonu zaten mevcut"
-
-#: commands/tsearchcmds.c:1135
-msgid "must be superuser to drop text search templates"
-msgstr "metin arama şablonlarını kaldırmak için superuser olmalısınız"
-
-#: commands/tsearchcmds.c:1164
-#, c-format
-msgid "text search template \"%s\" does not exist, skipping"
-msgstr "\"%s\" metin arama şablonu mevcut değil, atlanıyor"
-
-#: commands/tsearchcmds.c:1363
-#, c-format
-msgid "text search configuration parameter \"%s\" not recognized"
-msgstr "\"%s\"metin arama yapılandırma parametresi bulunamadı"
-
-#: commands/tsearchcmds.c:1370
-msgid "cannot specify both PARSER and COPY options"
-msgstr "hem PARSER hem de COPY seçenekleri belirtilemez"
-
-#: commands/tsearchcmds.c:1400
-msgid "text search parser is required"
-msgstr "metin arama ayrıştırıcısı eksiktir"
-
-#: commands/tsearchcmds.c:1509
-#, c-format
-msgid "text search configuration \"%s\" already exists"
-msgstr "\"%s\" metin arama yapılandırması zaten mevcut"
-
-#: commands/tsearchcmds.c:1568
-#, c-format
-msgid "text search configuration \"%s\" does not exist, skipping"
-msgstr "\"%s\" metin arama yapılandırması mevcut değil, atlanıyor"
-
-#: commands/tsearchcmds.c:1794
-#, c-format
-msgid "token type \"%s\" does not exist"
-msgstr "\"%s\" token tipi mevcut deÄŸil"
-
-#: commands/tsearchcmds.c:2018
-#, fuzzy, c-format
-msgid "mapping for token type \"%s\" does not exist"
-msgstr "\"%s\" tipi mevcut deÄŸil"
-
-#: commands/tsearchcmds.c:2024
-#, fuzzy, c-format
-msgid "mapping for token type \"%s\" does not exist, skipping"
-msgstr "\"%s\" tipi mevcut değil, atlanıyor"
-
-#: commands/tsearchcmds.c:2177
-#: commands/tsearchcmds.c:2288
-#, c-format
-msgid "invalid parameter list format: \"%s\""
-msgstr "geçersiz parametre liste biçimi: \"%s\""
-
-#: commands/typecmds.c:163
-#, fuzzy
-msgid "must be superuser to create a base type"
-msgstr "Tablespace oluşturmak için superuser haklarına sahip olmalısınız."
-
-#: commands/typecmds.c:268
-#, c-format
-msgid "type attribute \"%s\" not recognized"
-msgstr "\"%s\" type attribute bulunamadı"
-
-#: commands/typecmds.c:322
-#, c-format
-msgid "invalid type category \"%s\": must be simple ASCII"
-msgstr ""
-
-#: commands/typecmds.c:341
-#, c-format
-msgid "array element type cannot be %s"
-msgstr "array element veri tipi %s olamaz"
-
-#: commands/typecmds.c:373
-#, c-format
-msgid "alignment \"%s\" not recognized"
-msgstr "alignment \"%s\" tanınmamaktadır"
-
-#: commands/typecmds.c:390
-#, c-format
-msgid "storage \"%s\" not recognized"
-msgstr "storage \"%s\" tanınmamaktadır"
-
-#: commands/typecmds.c:399
-msgid "type input function must be specified"
-msgstr "tipin giriÅŸ fonksiyonu belirtilmelidir"
-
-#: commands/typecmds.c:403
-msgid "type output function must be specified"
-msgstr "tipin çıkış fonksiyonu belirtilmelidir"
-
-#: commands/typecmds.c:408
-msgid "type modifier output function is useless without a type modifier input function"
-msgstr "type modifier input function olmadan type modifier output function kullanmak anlamsızdır"
-
-#: commands/typecmds.c:431
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to %s"
-msgstr "%s fonksiyonunun döndürme değeri \"opaque\"tan \"%s\"e değiştiriliyor"
-
-#: commands/typecmds.c:438
-#, c-format
-msgid "type input function %s must return type %s"
-msgstr " %s type input function %s tipini döndürmelidir"
-
-#: commands/typecmds.c:448
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"cstring\""
-msgstr "%s fonksiyonunun döndürme değeri \"opaque\"tan \"cstring\"e değiştiriliyor"
-
-#: commands/typecmds.c:455
-#, c-format
-msgid "type output function %s must return type \"cstring\""
-msgstr "%s type output fonksiyonu  \"cstring\" döndürmelidir"
-
-#: commands/typecmds.c:464
-#, c-format
-msgid "type receive function %s must return type %s"
-msgstr " %s type receive function %s tipini döndürmelidir"
-
-#: commands/typecmds.c:473
-#, c-format
-msgid "type send function %s must return type \"bytea\""
-msgstr "%s type send fonksiyonu  \"cstring\" döndürmelidir"
-
-#: commands/typecmds.c:675
-#: commands/typecmds.c:2165
-#, c-format
-msgid "\"%s\" is not a domain"
-msgstr "\"%s\" bir domain deÄŸildir"
-
-#: commands/typecmds.c:817
-#, c-format
-msgid "\"%s\" is not a valid base type for a domain"
-msgstr "\"%s\" tipi bir domain için geçerli bir tip değildir"
-
-#: commands/typecmds.c:877
-#: commands/typecmds.c:1856
-msgid "foreign key constraints not possible for domains"
-msgstr "domainlerde için foreign key constraint kullanılamaz"
-
-#: commands/typecmds.c:897
-msgid "multiple default expressions"
-msgstr "birden fazla varsayılan ifade"
-
-#: commands/typecmds.c:961
-#: commands/typecmds.c:970
-msgid "conflicting NULL/NOT NULL constraints"
-msgstr "çakışan NULL/NOT NULL constraint"
-
-#: commands/typecmds.c:989
-#: commands/typecmds.c:1874
-msgid "unique constraints not possible for domains"
-msgstr "domainlerde için unique constraint kullanılamaz"
-
-#: commands/typecmds.c:995
-#: commands/typecmds.c:1880
-msgid "primary key constraints not possible for domains"
-msgstr "domainlerde için primary key constraint kullanılamaz"
-
-#: commands/typecmds.c:1004
-#: commands/typecmds.c:1889
-msgid "specifying constraint deferrability not supported for domains"
-msgstr "constraint srtelenebirliÄŸi domainlerde belirtilemez"
-
-#: commands/typecmds.c:1256
-#, c-format
-msgid "changing argument type of function %s from \"opaque\" to \"cstring\""
-msgstr "%s fonksiyonunun argümanı \"opaque\"tan \"cstring\"e değiştiriliyor"
-
-#: commands/typecmds.c:1307
-#, c-format
-msgid "changing argument type of function %s from \"opaque\" to %s"
-msgstr "%s fonksiyonunun argümanı \"opaque\"tan \"%s\"e değiştiriliyor"
-
-#: commands/typecmds.c:1406
-#, c-format
-msgid "typmod_in function %s must return type \"integer\""
-msgstr "%s typmod_in fonksiyonu \"trigger\" tipini döndürmelidir"
-
-#: commands/typecmds.c:1433
-#, c-format
-msgid "typmod_out function %s must return type \"cstring\""
-msgstr "%s typmod_out fonksiyonu  \"cstring\" döndürmelidir"
-
-#: commands/typecmds.c:1460
-#, c-format
-msgid "type analyze function %s must return type \"boolean\""
-msgstr "%s tipi analiz fonksiyonu \"boolean\" tipini döndürmelidir"
-
-#: commands/typecmds.c:1489
-msgid "composite type must have at least one attribute"
-msgstr "compisite tipinde en az bir öğe olmalıdır"
-
-#: commands/typecmds.c:1715
-#, c-format
-msgid "column \"%s\" of table \"%s\" contains null values"
-msgstr "\"%2$s\" tablosunun \"%1$s\" sütununda null değerler mevcut"
-
-#: commands/typecmds.c:1960
-#, c-format
-msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint"
-msgstr "\"%2$s\" tablosunun \"%1$s\" sütununda yeni constrainti ihlal eden değerler mevcut"
-
-#: commands/typecmds.c:2241
-#: commands/typecmds.c:2250
-msgid "cannot use table references in domain check constraint"
-msgstr "domain check constraintte tablo referansları kullanılamaz"
-
-#: commands/typecmds.c:2482
-#: commands/typecmds.c:2554
-#: commands/typecmds.c:2790
-#, c-format
-msgid "%s is a table's row type"
-msgstr "%s bir tablo satır tipidir"
-
-#: commands/typecmds.c:2484
-#: commands/typecmds.c:2556
-#: commands/typecmds.c:2792
-msgid "Use ALTER TABLE instead."
-msgstr "Bunun yerine ALTER TABLE kullanın."
-
-#: commands/typecmds.c:2491
-#: commands/typecmds.c:2563
-#: commands/typecmds.c:2704
-#, c-format
-msgid "cannot alter array type %s"
-msgstr "%s array tipi deÄŸiÅŸtirilemez"
-
-#: commands/typecmds.c:2493
-#: commands/typecmds.c:2565
-#: commands/typecmds.c:2706
-#, c-format
-msgid "You can alter type %s, which will alter the array type as well."
-msgstr "%s tipini değiştirebilirsiniz, aynı zamanda array type de değiştirilecektir."
-
-#: commands/typecmds.c:2753
-#, c-format
-msgid "type %s is already in schema \"%s\""
-msgstr "%s tipi \"%s\" şemasında zaten mevcut"
-
-#: commands/typecmds.c:2776
-#, c-format
-msgid "type \"%s\" already exists in schema \"%s\""
-msgstr "\"%s\" tipi zaten \"%s\" şemasında mevcuttur"
-
-#: commands/user.c:145
-msgid "SYSID can no longer be specified"
-msgstr "SYSID artık belirtilemez"
-
-#: commands/user.c:267
-msgid "must be superuser to create superusers"
-msgstr "superuser kullanıcısını oluşturmak için superuser olmalısınız"
-
-#: commands/user.c:274
-msgid "permission denied to create role"
-msgstr "rol oluşturılmasına izin verilmedi."
-
-#: commands/user.c:281
-#: commands/user.c:1045
-#, c-format
-msgid "role name \"%s\" is reserved"
-msgstr "\"%s\" rol adı sistem tarafından kullanılmaktadır"
-
-#: commands/user.c:297
-#: commands/user.c:1039
-#, c-format
-msgid "role \"%s\" already exists"
-msgstr "\"%s\" rolü zaten mevcut"
-
-#: commands/user.c:579
-#: commands/user.c:759
-#: commands/user.c:1291
-#: commands/user.c:1430
-msgid "must be superuser to alter superusers"
-msgstr "superuserleri değiştirmek için superuser olmalısınız"
-
-#: commands/user.c:594
-#: commands/user.c:767
-msgid "permission denied"
-msgstr "eriÅŸim engellendi"
-
-#: commands/user.c:829
-msgid "permission denied to drop role"
-msgstr "rol kaldırılmasına izin verilmedi"
-
-#: commands/user.c:863
-#, c-format
-msgid "role \"%s\" does not exist, skipping"
-msgstr "rol \"%s\" mevcut değil, atlanıyor"
-
-#: commands/user.c:875
-#: commands/user.c:879
-msgid "current user cannot be dropped"
-msgstr "geçerli kullanıcı kaldıramaz"
-
-#: commands/user.c:883
-msgid "session user cannot be dropped"
-msgstr "oturum kullanıcısı kaldıramaz"
-
-#: commands/user.c:894
-msgid "must be superuser to drop superusers"
-msgstr "superuser kullanıcıları drop etmek için superuser olmalısınız"
-
-#: commands/user.c:907
-#, c-format
-msgid "role \"%s\" cannot be dropped because some objects depend on it"
-msgstr "diğer nesnelerin ona bağlı olması nedeniyle \"%s\" rolü kaldırılamıyor"
-
-#: commands/user.c:1027
-msgid "session user cannot be renamed"
-msgstr "oturum kullanıcısının adı değiştirilemez"
-
-#: commands/user.c:1031
-msgid "current user cannot be renamed"
-msgstr "geçerli kullanıcının adı değiştirilemez"
-
-#: commands/user.c:1056
-msgid "must be superuser to rename superusers"
-msgstr "superuser kullanıcıların adlarını değiştirmek için superuser olmalısınız"
-
-#: commands/user.c:1063
-msgid "permission denied to rename role"
-msgstr "rol adını değiştirilmesine izin verilmedi"
-
-#: commands/user.c:1084
-msgid "MD5 password cleared because of role rename"
-msgstr "rol adı değiştirildiği için MD5 şifresi sıfırlanmıştır"
-
-#: commands/user.c:1146
-msgid "column names cannot be included in GRANT/REVOKE ROLE"
-msgstr ""
-
-#: commands/user.c:1190
-msgid "permission denied to drop objects"
-msgstr "nesne düşürülmesine izin verilmedi"
-
-#: commands/user.c:1217
-#: commands/user.c:1226
-msgid "permission denied to reassign objects"
-msgstr "nesne sahipliÄŸini deÄŸiÅŸtirmeye izin verilmedi"
-
-#: commands/user.c:1299
-#: commands/user.c:1438
-#, c-format
-msgid "must have admin option on role \"%s\""
-msgstr "\"%s\" rolünde admin opsiyonuna sahip olmalıdır"
-
-#: commands/user.c:1307
-msgid "must be superuser to set grantor"
-msgstr "atama etkisine sahipliğini dağıtmak için superuser olmalısınız"
-
-#: commands/user.c:1332
-#, c-format
-msgid "role \"%s\" is a member of role \"%s\""
-msgstr "\"%s\" rolü, \"%s\" rolüne dahildir"
-
-#: commands/user.c:1348
-#, c-format
-msgid "role \"%s\" is already a member of role \"%s\""
-msgstr "\"%s\" rolü zaten \"%s\" rolüne dahildir"
-
-#: commands/user.c:1461
-#, c-format
-msgid "role \"%s\" is not a member of role \"%s\""
-msgstr "\"%s\" rolü, \"%s\" rolüne dahil değildir"
-
-#: commands/vacuum.c:649
-msgid "oldest xmin is far in the past"
-msgstr "en eski xmin uzun zaman önce yaratılmıştır"
-
-#: commands/vacuum.c:650
-msgid "Close open transactions soon to avoid wraparound problems."
-msgstr "Başa dönme sorununu yaşamamak için aktif transactionları kapatın."
-
-#: commands/vacuum.c:978
-msgid "some databases have not been vacuumed in over 2 billion transactions"
-msgstr "bazı veritabanlaı iki milyarı aşkın transaction vacuum işlemi yapılmadan işlemişler"
-
-#: commands/vacuum.c:979
-msgid "You might have already suffered transaction-wraparound data loss."
-msgstr "transaction-wraparound veri kaybını zaten yaşamış olabilirsiniz."
-
-#: commands/vacuum.c:1111
-#, fuzzy, c-format
-msgid "skipping \"%s\" --- only superuser can vacuum it"
-msgstr "\"%s\" atlanıyor --- sadece tablo veya veritabanı sahibi onu vacuum edebilir"
-
-#: commands/vacuum.c:1115
-#, fuzzy, c-format
-msgid "skipping \"%s\" --- only superuser or database owner can vacuum it"
-msgstr "\"%s\" atlanıyor --- sadece tablo veya veritabanı sahibi onu vacuum edebilir"
-
-#: commands/vacuum.c:1119
-#, c-format
-msgid "skipping \"%s\" --- only table or database owner can vacuum it"
-msgstr "\"%s\" atlanıyor --- sadece tablo veya veritabanı sahibi onu vacuum edebilir"
-
-#: commands/vacuum.c:1136
-#, c-format
-msgid "skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
-msgstr "\"%s\" atlanıyor --- indesk, view ve sistem tablolaları vacuum edilemez"
-
-#: commands/vacuum.c:1371
-#: commands/vacuumlazy.c:288
-#, c-format
-msgid "vacuuming \"%s.%s\""
-msgstr "\"%s.%s\" veritabanına vacuum yapılıyor"
-
-#: commands/vacuum.c:1430
-#: commands/vacuumlazy.c:408
-#, c-format
-msgid "relation \"%s\" page %u is uninitialized --- fixing"
-msgstr "\"%s\" nesnesi, %u, sayfası sıfırlanmamış --- düzeltiyorum"
-
-#: commands/vacuum.c:1542
-#: commands/vacuum.c:1607
-#, fuzzy, c-format
-msgid "relation \"%s\" TID %u/%u: XMIN_COMMITTED not set for transaction %u --- cannot shrink relation"
-msgstr "\"%s\" tablosu TID %u/%u: InsertTransactionInProgress %u --- nesne küçültülemiyor"
-
-#: commands/vacuum.c:1575
-#, fuzzy, c-format
-msgid "relation \"%s\" TID %u/%u: dead HOT-updated tuple --- cannot shrink relation"
-msgstr "\"%s\" tablosu TID %u/%u: InsertTransactionInProgress %u --- nesne küçültülemiyor"
-
-#: commands/vacuum.c:1646
-#, c-format
-msgid "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation"
-msgstr "\"%s\" tablosu TID %u/%u: InsertTransactionInProgress %u --- nesne küçültülemiyor"
-
-#: commands/vacuum.c:1663
-#, c-format
-msgid "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation"
-msgstr "\"%s\" tablosu TID %u/%u: DeleteTransactionInProgress %u --- nesne küçültülemiyor"
-
-#: commands/vacuum.c:1851
-#, c-format
-msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
-msgstr "\"%s\": bulunan %.0f kaldırılabilen, %.0f sabit satır sürümleri, toplam %u sayfa"
-
-#: commands/vacuum.c:1854
-#, c-format
-msgid ""
-"%.0f dead row versions cannot be removed yet.\n"
-"Nonremovable row versions range from %lu to %lu bytes long.\n"
-"There were %.0f unused item pointers.\n"
-"Total free space (including removable row versions) is %.0f bytes.\n"
-"%u pages are or will become empty, including %u at the end of the table.\n"
-"%u pages containing %.0f free bytes are potential move destinations.\n"
-"%s."
-msgstr ""
-"%.0f ölü satır şımdilik kaldırılamıyor.\n"
-"Kaldırılamayacak satır sürümleri %lu ile %lu bayt uzunukta.\n"
-"%.0f öğe göstergesi kullanılmadı.\n"
-"Topleam boş alan (kaldırılacak satır sürümleri dahil) %.0f bayttır.\n"
-"%u sayfa boş ya da boşaltılacak, tablonun sonunda %u tane buna dahildir.\n"
-"%u sayfa toplam %.0f boş bayt içeriği ile potansiyel taşıma hedefidir.\n"
-"%s."
-
-#: commands/vacuum.c:2762
-#, c-format
-msgid "\"%s\": moved %u row versions, truncated %u to %u pages"
-msgstr "\"%s\": %u satır sürümü taşınmış, %u sayfa sayısından %u sayfaya düşürülmüştür"
-
-#: commands/vacuum.c:2765
-#: commands/vacuumlazy.c:802
-#: commands/vacuumlazy.c:895
-#: commands/vacuumlazy.c:1022
-#, c-format
-msgid "%s."
-msgstr "%s."
-
-#: commands/vacuum.c:3319
-#: commands/vacuumlazy.c:1019
-#, c-format
-msgid "\"%s\": truncated %u to %u pages"
-msgstr "\"%s\":  %u sayfadan  %u sayfaya düşürülmüştür"
-
-#: commands/vacuum.c:3412
-#: commands/vacuum.c:3489
-#: commands/vacuumlazy.c:935
-#, c-format
-msgid "index \"%s\" now contains %.0f row versions in %u pages"
-msgstr "\"%s\" indexi %.0f satır sürümü, %u sayfa"
-
-#: commands/vacuum.c:3416
-#, c-format
-msgid ""
-"%u index pages have been deleted, %u are currently reusable.\n"
-"%s."
-msgstr ""
-"%u index sayfası silinmiş, %u kullanılabilir.\n"
-"%s."
-
-#: commands/vacuum.c:3431
-#: commands/vacuum.c:3510
-#, c-format
-msgid "index \"%s\" contains %.0f row versions, but table contains %.0f row versions"
-msgstr "\"%s\" indexi %.0f satır sürümü içeriyor, ancak tablo %.0f satır sürümü içeriyor"
-
-#: commands/vacuum.c:3434
-#: commands/vacuum.c:3513
-msgid "Rebuild the index with REINDEX."
-msgstr "REINDEX iÅŸlemiyle index yeniden oluÅŸturuluyor."
-
-#: commands/vacuum.c:3493
-#: commands/vacuumlazy.c:939
-#, c-format
-msgid ""
-"%.0f index row versions were removed.\n"
-"%u index pages have been deleted, %u are currently reusable.\n"
-"%s."
-msgstr ""
-"%.0f index sürüm satırı kaldırıldı.\n"
-"%u index sayfası silindi, %u şu an kullanılabilir.\n"
-"%s"
-
-#: commands/vacuumlazy.c:234
-#, c-format
-msgid ""
-"automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"
-"pages: %d removed, %d remain\n"
-"tuples: %.0f removed, %.0f remain\n"
-"system usage: %s"
-msgstr ""
-"\"%s.%s.%s\" tablosunun automatic vacuumu: index scans: %d\n"
-"pages: %d removed, %d remain\n"
-"tuples: %.0f removed, %.0f remain\n"
-"system kullanımı: %s"
-
-#: commands/vacuumlazy.c:733
-#, c-format
-msgid "\"%s\": removed %.0f row versions in %u pages"
-msgstr "\"%1$s\": %3$u sayfada %2$.0f satır sürümü kaldırılmış"
-
-#: commands/vacuumlazy.c:738
-#, fuzzy, c-format
-msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages"
-msgstr "\"%s\": bulunan %.0f kaldırılabilen, %.0f sabit satır sürümleri, toplam %u sayfa"
-
-#: commands/vacuumlazy.c:741
-#, c-format
-msgid ""
-"%.0f dead row versions cannot be removed yet.\n"
-"There were %.0f unused item pointers.\n"
-"%u pages are entirely empty.\n"
-"%s."
-msgstr ""
-"%.0f ölü satır sürümü şu an kaldırılamıyor.\n"
-"%.0f kullanılmamış öğe göstergesi vardı.\n"
-"%u sayfa ise tamamen boÅŸ.\n"
-"%s."
-
-#: commands/vacuumlazy.c:799
-#, c-format
-msgid "\"%s\": removed %d row versions in %d pages"
-msgstr "\"%1$s\": %3$d sayfada %2$d satır sürümü kaldırılmış"
-
-#: commands/vacuumlazy.c:892
-#, c-format
-msgid "scanned index \"%s\" to remove %d row versions"
-msgstr "\"%s\" indeksi tarandı, %d satır sürümü kaldırıldı"
-
-#: commands/variable.c:62
-msgid "invalid list syntax for parameter \"datestyle\""
-msgstr "\"datestyle\" parametresi için list sözdizimi geçersiz"
-
-#: commands/variable.c:161
-#, c-format
-msgid "unrecognized \"datestyle\" key word: \"%s\""
-msgstr "\"datestyle\" anahtar kelimesi bulunamadı: \"%s\""
-
-#: commands/variable.c:175
-msgid "conflicting \"datestyle\" specifications"
-msgstr "çakışan \"datestyle\" tanımları"
-
-#: commands/variable.c:285
-msgid "invalid interval value for time zone: month not allowed"
-msgstr "zaman dilimi için geçersiz aralık değeri: ay belirtilemez"
-
-#: commands/variable.c:293
-msgid "invalid interval value for time zone: day not allowed"
-msgstr "zaman dilimi için geçersiz aralık değeri: gün ayarlanamaz"
-
-#: commands/variable.c:361
-#: commands/variable.c:493
-#, c-format
-msgid "unrecognized time zone name: \"%s\""
-msgstr "bilinmeyen zaman dilimi adı: \"%s\""
-
-#: commands/variable.c:370
-#: commands/variable.c:502
-#, c-format
-msgid "time zone \"%s\" appears to use leap seconds"
-msgstr "\"%s\" zaman dilimi artış saniyeleri kullanmaktadır"
-
-#: commands/variable.c:372
-#: commands/variable.c:504
-msgid "PostgreSQL does not support leap seconds."
-msgstr "PostgreSQL, artış saniyeleri desteklememektedir."
-
-#: commands/variable.c:557
-msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
-msgstr "bir sorgudan önce SET TRANSACTION ISOLATION LEVEL çağırılmalıdır"
-
-#: commands/variable.c:566
-msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction"
-msgstr "subtransaction içinde SET TRANSACTION ISOLATION LEVEL çağırılmamalıdır"
-
-#: commands/variable.c:731
-msgid "cannot set session authorization within security-definer function"
-msgstr "security-definer fonksiyonlarında oturum yetkilendirilmesi yapılamıyor."
-
-#: commands/variable.c:855
-#, fuzzy
-msgid "cannot set role within security-definer function"
-msgstr "var olan bir fonksiyonun döndürme tipi değiştirilemez"
-
-#: commands/variable.c:898
-#, c-format
-msgid "permission denied to set role \"%s\""
-msgstr "\"%s\" rolü ayarlanması engellendi"
-
-#: commands/view.c:138
-msgid "view must have at least one column"
-msgstr "viewda en az bir sütun olmalıdır"
-
-#: commands/view.c:259
-#: commands/view.c:271
-#, fuzzy
-msgid "cannot drop columns from view"
-msgstr "view silme hatası"
-
-#: commands/view.c:276
-#, fuzzy, c-format
-msgid "cannot change name of view column \"%s\" to \"%s\""
-msgstr "view sütunu \"%s\" ad değiştirme hatası"
-
-#: commands/view.c:284
-#, fuzzy, c-format
-msgid "cannot change data type of view column \"%s\" from %s to %s"
-msgstr "\"%s\" view sütununun tipi değiştirilemiyor"
-
-#: commands/view.c:440
-msgid "CREATE VIEW specifies more column names than columns"
-msgstr "CREATE VIEW sütun sayısından çok sütün adı belirtmektedir"
-
-#: commands/view.c:456
-#, c-format
-msgid "view \"%s\" will be a temporary view"
-msgstr "\"%s\" view, bir geçeci view olacaktır"
-
-#: executor/execCurrent.c:75
-#, c-format
-msgid "cursor \"%s\" is not a SELECT query"
-msgstr "\"%s\" imleci SELECT sorgusu deÄŸil"
-
-#: executor/execCurrent.c:81
-#, c-format
-msgid "cursor \"%s\" is held from a previous transaction"
-msgstr "önceki işlemden \"%s\" cursoru tutulmaktadır"
-
-#: executor/execCurrent.c:110
-#, c-format
-msgid "cursor \"%s\" has multiple FOR UPDATE/SHARE references to table \"%s\""
-msgstr ""
-
-#: executor/execCurrent.c:119
-#, c-format
-msgid "cursor \"%s\" does not have a FOR UPDATE/SHARE reference to table \"%s\""
-msgstr ""
-
-#: executor/execCurrent.c:129
-#: executor/execCurrent.c:176
-#, fuzzy, c-format
-msgid "cursor \"%s\" is not positioned on a row"
-msgstr " \"%s\" rolünun sisteme giriş hakkı yoktur"
-
-#: executor/execCurrent.c:163
-#, fuzzy, c-format
-msgid "cursor \"%s\" is not a simply updatable scan of table \"%s\""
-msgstr "\"%s\" rolü, \"%s\" rolüne dahil değildir"
-
-#: executor/execCurrent.c:228
-#: executor/execQual.c:893
-#, c-format
-msgid "no value found for parameter %d"
-msgstr "%d parametresi içim değer bulunamadı"
-
-#: executor/execMain.c:943
-#, fuzzy
-msgid "SELECT FOR UPDATE/SHARE is not supported within a query with multiple result relations"
-msgstr "inheritance sorgulamalar için SELECT FOR UPDATE/SHARE desteklenmemektedir"
-
-#: executor/execMain.c:1089
-#, c-format
-msgid "cannot change sequence \"%s\""
-msgstr "\"%s\" sequence deÄŸiÅŸtirilemez"
-
-#: executor/execMain.c:1095
-#, c-format
-msgid "cannot change TOAST relation \"%s\""
-msgstr "\"%s\" TOAST objesi deÄŸiÅŸtirilemez"
-
-#: executor/execMain.c:1101
-#, c-format
-msgid "cannot change view \"%s\""
-msgstr "\"%s\" view deÄŸiÅŸtirilemiyor"
-
-#: executor/execMain.c:1107
-#, c-format
-msgid "cannot change relation \"%s\""
-msgstr "\"%s\" nesnesi deÄŸiÅŸtirilemiyor"
-
-#: executor/execMain.c:1183
-#: executor/execMain.c:1193
-#: executor/execMain.c:1210
-#: executor/execMain.c:1218
-#: executor/execQual.c:618
-#: executor/execQual.c:637
-#: executor/execQual.c:647
-msgid "table row type and query-specified row type do not match"
-msgstr "sorgu-tanımlı sonuç satırı ve tablonun sonuç satırı uyuşmamaktadır"
-
-#: executor/execMain.c:1184
-#, fuzzy
-msgid "Query has too many columns."
-msgstr "subquery çok fazla sütuna sahip"
-
-#: executor/execMain.c:1194
-#: executor/execQual.c:638
-#, c-format
-msgid "Table has type %s at ordinal position %d, but query expects %s."
-msgstr "Sorgu, %2$d adresine döndürme tipi %1$s iken,  %3$s bekliyor."
-
-#: executor/execMain.c:1211
-#, fuzzy, c-format
-msgid "Query provides a value for a dropped column at ordinal position %d."
-msgstr "%d adresinde düşürülmüş sütunda fiziksel saklam uyuşmazlığı."
-
-#: executor/execMain.c:1219
-#, fuzzy
-msgid "Query has too few columns."
-msgstr "subquery'de yetersiz sütun sayısı"
-
-#: executor/execMain.c:2228
-#, c-format
-msgid "null value in column \"%s\" violates not-null constraint"
-msgstr "\"%s\" sütununda null değeri not-null kısıtlamasını ihlal ediyor"
-
-#: executor/execMain.c:2240
-#, c-format
-msgid "new row for relation \"%s\" violates check constraint \"%s\""
-msgstr "\"%s\" tablosuna girilen yeni satır \"%s\" check kısıtlamasını ihlal ediyor"
-
-#: executor/execQual.c:306
-#: executor/execQual.c:334
-msgid "array subscript in assignment must not be null"
-msgstr "atamada array subscript null olamaz"
-
-#: executor/execQual.c:559
-#: executor/execQual.c:3817
-#, c-format
-msgid "attribute %d has wrong type"
-msgstr "attribute %d yalnış tipe sahiptir"
-
-#: executor/execQual.c:560
-#: executor/execQual.c:3818
-#, c-format
-msgid "Table has type %s, but query expects %s."
-msgstr "Tablonun tipi %s iken, sorgu %s beklemektedir."
-
-#: executor/execQual.c:619
-#, fuzzy, c-format
-msgid "Table row contains %d attribute, but query expects %d."
-msgid_plural "Table row contains %d attributes, but query expects %d."
-msgstr[0] "Sorgu, döndürülen satırın %2$d sütundan oluşmasını beklerken, %1$d sütun geldi."
-msgstr[1] "Sorgu, döndürülen satırın %2$d sütundan oluşmasını beklerken, %1$d sütun geldi."
-
-#: executor/execQual.c:648
-#: executor/execQual.c:1363
-#, c-format
-msgid "Physical storage mismatch on dropped attribute at ordinal position %d."
-msgstr "%d adresinde düşürülmüş sütunda fiziksel saklam uyuşmazlığı."
-
-#: executor/execQual.c:1047
-#: parser/parse_func.c:88
-#: parser/parse_func.c:260
-#: parser/parse_func.c:541
-#, fuzzy, c-format
-msgid "cannot pass more than %d argument to a function"
-msgid_plural "cannot pass more than %d arguments to a function"
-msgstr[0] "bit fonksiyona %d sayısından fazla argüman gönderilemez"
-msgstr[1] "bit fonksiyona %d sayısından fazla argüman gönderilemez"
-
-#: executor/execQual.c:1231
-msgid "functions and operators can take at most one set argument"
-msgstr "fonksiyon ve operator en çok bir tane set parametresi alabiliyorlar"
-
-#: executor/execQual.c:1281
-#, fuzzy
-msgid "function returning setof record called in context that cannot accept type record"
-msgstr "tip kaydı içermeyen alanda çağırılan ve kayıt döndüren fonksiyon"
-
-#: executor/execQual.c:1336
-#: executor/execQual.c:1352
-#: executor/execQual.c:1362
-msgid "function return row and query-specified return row do not match"
-msgstr "sorgu-tanımlı sonuç satırı ve gerçek sonuç satırı uyuşmamaktadır"
-
-#: executor/execQual.c:1337
-#, fuzzy, c-format
-msgid "Returned row contains %d attribute, but query expects %d."
-msgid_plural "Returned row contains %d attributes, but query expects %d."
-msgstr[0] "Sorgu, döndürülen satırın %2$d sütundan oluşmasını beklerken, %1$d sürun geldi."
-msgstr[1] "Sorgu, döndürülen satırın %2$d sütundan oluşmasını beklerken, %1$d sürun geldi."
-
-#: executor/execQual.c:1353
-#, c-format
-msgid "Returned type %s at ordinal position %d, but query expects %s."
-msgstr "Sorgu, %2$d adresine döndürme tipi %1$s iken,  %3$s bekliyor."
-
-#: executor/execQual.c:1606
-#: executor/execQual.c:2024
-msgid "table-function protocol for materialize mode was not followed"
-msgstr "materialize biçimi için table-function protokolü izlenmemiş"
-
-#: executor/execQual.c:1626
-#: executor/execQual.c:2031
-#, c-format
-msgid "unrecognized table-function returnMode: %d"
-msgstr "belinmeyen table-function returnMode: %d"
-
-#: executor/execQual.c:1946
-msgid "function returning set of rows cannot return null value"
-msgstr "satır seti döndüren fonksiyon null değerini döndüremez"
-
-#: executor/execQual.c:2191
-msgid "IS DISTINCT FROM does not support set arguments"
-msgstr "IS DISTINCT FROM ifadesi set parametreleri desteklememektedir"
-
-#: executor/execQual.c:2266
-msgid "op ANY/ALL (array) does not support set arguments"
-msgstr "op ANY/ALL (array) set parametreleri desteklememektedir"
-
-#: executor/execQual.c:2885
-msgid "cannot merge incompatible arrays"
-msgstr "uyumsuz dizinleri birleÅŸtirilemez"
-
-#: executor/execQual.c:2886
-#, c-format
-msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
-msgstr "%s öğe tipi olan dizin, %s öğe tipi olan dizin ile aynı ARRAY içine eklenemez"
-
-#: executor/execQual.c:3469
-msgid "NULLIF does not support set arguments"
-msgstr "NULLIF, set argümanları desteklememektedir"
-
-#: executor/execQual.c:4192
-#: optimizer/util/clauses.c:547
-#: parser/parse_agg.c:74
-msgid "aggregate function calls cannot be nested"
-msgstr "aggregate fonksiyon çağırmaları içiçe olamaz"
-
-#: executor/execQual.c:4230
-#: optimizer/util/clauses.c:621
-#: parser/parse_agg.c:121
-#, fuzzy
-msgid "window function calls cannot be nested"
-msgstr "aggregate fonksiyon çağırmaları içiçe olamaz"
-
-#: executor/execQual.c:4430
-msgid "target type is not an array"
-msgstr "hedef tipi array deÄŸildir"
-
-#: executor/execQual.c:4543
-#, c-format
-msgid "ROW() column has type %s instead of type %s"
-msgstr "ROW() sütünü %2$s yerine %1$s tipine sahip"
-
-#. translator: %s is a SQL statement name
-#: executor/functions.c:153
-#, c-format
-msgid "%s is not allowed in a SQL function"
-msgstr "%s, bir SQL fonksiyonunda yer alamaz"
-
-#. translator: %s is a SQL statement name
-#: executor/functions.c:160
-#: executor/spi.c:1209
-#: executor/spi.c:1771
-#, c-format
-msgid "%s is not allowed in a non-volatile function"
-msgstr "non-volatile fonksiyonda %s kullanılamaz"
-
-#: executor/functions.c:254
-#, c-format
-msgid "could not determine actual result type for function declared to return type %s"
-msgstr "geri döndürme tipi %s olarak tanımlanmış fonksiyonun gerçek döndürme tipi belirlenememektedir"
-
-#: executor/functions.c:293
-#, c-format
-msgid "could not determine actual type of argument declared %s"
-msgstr "tipi %s olarak tanımlanmış fonksiyonun parametresinin gerçek döndürme tipi belirlenememektedir"
-
-#: executor/functions.c:930
-#, c-format
-msgid "SQL function \"%s\" statement %d"
-msgstr "\"%s\" SQL fonksiyonu, %d komutu"
-
-#: executor/functions.c:949
-#, c-format
-msgid "SQL function \"%s\" during startup"
-msgstr "başlangıç sırasında \"%s\" SQL fonksiyonu"
-
-#: executor/functions.c:1078
-#: executor/functions.c:1114
-#: executor/functions.c:1126
-#: executor/functions.c:1213
-#: executor/functions.c:1225
-#: executor/functions.c:1250
-#, c-format
-msgid "return type mismatch in function declared to return %s"
-msgstr "%s dönüşlü bildirilmiş işlevde return deyimin tipi uyumsuz"
-
-#: executor/functions.c:1080
-#, fuzzy
-msgid "Function's final statement must be SELECT or INSERT/UPDATE/DELETE RETURNING."
-msgstr "Fonksiyonun son komutu SELECT olmalıdır."
-
-#: executor/functions.c:1116
-#, fuzzy
-msgid "Final statement must return exactly one column."
-msgstr "Son SELECT tam bir satır döndürmelidir."
-
-#: executor/functions.c:1128
-#, c-format
-msgid "Actual return type is %s."
-msgstr "Asıl döndürme tipi %s."
-
-#: executor/functions.c:1215
-#, fuzzy
-msgid "Final statement returns too many columns."
-msgstr "Son SELECT fazla satır döndürüyor."
-
-#: executor/functions.c:1227
-#, fuzzy, c-format
-msgid "Final statement returns %s instead of %s at column %d."
-msgstr "Son SELECT %3$d sütununda %2$s yerine %1$s döndürüyor."
-
-#: executor/functions.c:1252
-#, fuzzy
-msgid "Final statement returns too few columns."
-msgstr "Son SELECT az satır döndürüyor."
-
-#: executor/functions.c:1266
-#, c-format
-msgid "return type %s is not supported for SQL functions"
-msgstr "SQL fonksiyonların içinde %s dönüş tipi desteklenmemektedir"
-
-#: executor/nodeAgg.c:1543
-#: executor/nodeWindowAgg.c:1502
-#, c-format
-msgid "aggregate %u needs to have compatible input type and transition type"
-msgstr "%u aggregate fonksiyonu uyumlu giriş ve geçiş tiplerine sahip olmalıdır"
-
-#: executor/nodeAgg.c:1564
-msgid "DISTINCT is supported only for single-argument aggregates"
-msgstr "DISTINCT sace tek arümanlı aggregatelerde desteklenmektedir"
-
-#: executor/nodeHashjoin.c:731
-#: executor/nodeHashjoin.c:765
-#, c-format
-msgid "could not rewind hash-join temporary file: %m"
-msgstr "geçici hash-join dosyasına başa alma işlemi başarısız: %m"
-
-#: executor/nodeHashjoin.c:799
-#: executor/nodeHashjoin.c:805
-#, c-format
-msgid "could not write to hash-join temporary file: %m"
-msgstr "geçici hash-join dosyasına yazma başarısız: %m"
-
-#: executor/nodeHashjoin.c:839
-#: executor/nodeHashjoin.c:849
-#, c-format
-msgid "could not read from hash-join temporary file: %m"
-msgstr "geçici hash-join dosyasına okuma başarısız: %m"
-
-#: executor/nodeLimit.c:251
-#, fuzzy
-msgid "OFFSET must not be negative"
-msgstr "COST pozitif olmalıdır"
-
-#: executor/nodeLimit.c:278
-msgid "LIMIT must not be negative"
-msgstr "LIMIT negatif sayı olmamalı"
-
-#: executor/nodeMergejoin.c:1509
-msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
-msgstr "RIGHT JOIN ancak merge-join işlemine uygun şartlarında desteklenmektedir"
-
-#: executor/nodeMergejoin.c:1527
-#: optimizer/path/joinpath.c:1062
-msgid "FULL JOIN is only supported with merge-joinable join conditions"
-msgstr "FULL JOIN ancak merge-join işlemine uygun şartlarında desteklenmektedir"
-
-#: executor/nodeSubplan.c:308
-#: executor/nodeSubplan.c:347
-#: executor/nodeSubplan.c:972
-msgid "more than one row returned by a subquery used as an expression"
-msgstr "ifade içinde kullanılan alt sorgusu birden fazla satır döndürüldü"
-
-#: executor/spi.c:211
-msgid "transaction left non-empty SPI stack"
-msgstr "transaction boş olamayan SPI stack bıraktı"
-
-#: executor/spi.c:212
-#: executor/spi.c:276
-msgid "Check for missing \"SPI_finish\" calls."
-msgstr "Atlanan \"SPI_finish\" çağırılarına bakın."
-
-#: executor/spi.c:275
-msgid "subtransaction left non-empty SPI stack"
-msgstr "subtransaction left non-empty SPI stack"
-
-#: executor/spi.c:1051
-msgid "cannot open multi-query plan as cursor"
-msgstr "multi-query plan imleç olarak açılmıyor"
-
-#. translator: %s is name of a SQL command, eg INSERT
-#: executor/spi.c:1056
-#, c-format
-msgid "cannot open %s query as cursor"
-msgstr "%s sorgusu sorgusunu imleç olarak açılmıyor"
-
-#: executor/spi.c:1186
-#: parser/analyze.c:1875
-msgid "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE SCROLL CURSOR ... FOR UPDATE/SHARE desteklenmiyor"
-
-#: executor/spi.c:1187
-#: parser/analyze.c:1876
-msgid "Scrollable cursors must be READ ONLY."
-msgstr "Scrollable cursorkar READ ONLY olmalıdır."
-
-#: executor/spi.c:2062
-#, c-format
-msgid "SQL statement \"%s\""
-msgstr "SQL deyimi: \"%s\""
-
-#: foreign/foreign.c:240
-#, fuzzy, c-format
-msgid "user mapping not found for \"%s\""
-msgstr "\"%s\" rolünde admin opsiyonuna sahip olmalıdır"
-
-#: foreign/foreign.c:418
-#, fuzzy, c-format
-msgid "invalid option \"%s\""
-msgstr "\"%s\" ikili dosyası geçersiz"
-
-#: foreign/foreign.c:419
-#, c-format
-msgid "Valid options in this context are: %s"
-msgstr ""
-
-#: lib/stringinfo.c:246
-#, c-format
-msgid "Cannot enlarge string buffer containing %d bytes by %d more bytes."
-msgstr "%d bayt uzunluğunda olan satır arabelleği  %d bayt ile uzatılamıyor."
-
-#: storage/buffer/bufmgr.c:129
-#: storage/buffer/bufmgr.c:233
-#, fuzzy
-msgid "cannot access temporary tables of other sessions"
-msgstr "diğer oturumların geçici tabloları taşınamaz"
-
-#: storage/buffer/bufmgr.c:361
-#, fuzzy, c-format
-msgid "unexpected data beyond EOF in block %u of relation %s"
-msgstr "\"%2$s\" nesnesinin %1$u bloÄŸunda dosya sonundan sonra beklenmeyen veri"
-
-#: storage/buffer/bufmgr.c:363
-msgid "This has been seen to occur with buggy kernels; consider updating your system."
-msgstr "Bu durum bazı eski çekirdeklerde meydana gelebilir. Yeni kernellerde bu düzeltilmiştir."
-
-#: storage/buffer/bufmgr.c:435
-#, fuzzy, c-format
-msgid "invalid page header in block %u of relation %s; zeroing out page"
-msgstr "\"%2$s\" tablosunun %1$u bloğunda geçersiz sayfa başlığı; sayfa sıfırlanıyor"
-
-#: storage/buffer/bufmgr.c:443
-#, fuzzy, c-format
-msgid "invalid page header in block %u of relation %s"
-msgstr "\"%2$s\" tablosunun %1$u bloğunda geçersiz sayfa başlığı"
-
-#: storage/buffer/bufmgr.c:2716
-#, fuzzy, c-format
-msgid "could not write block %u of %s"
-msgstr "%2$u/%3$u/%4$u nesnesinin %1$u bloku yazılamıyor"
-
-#: storage/buffer/bufmgr.c:2718
-msgid "Multiple failures --- write error might be permanent."
-msgstr "Çoklu hata --- yazma hatası kalıcı olabilir."
-
-#: storage/buffer/bufmgr.c:2739
-#, fuzzy, c-format
-msgid "writing block %u of relation %s"
-msgstr "block: %u nesne %u/%u/%u yazılıyor"
-
-#: storage/buffer/localbuf.c:188
-msgid "no empty local buffer available"
-msgstr "boş yerel arabellek bulunamadı"
-
-#: storage/smgr/md.c:261
-#, fuzzy, c-format
-msgid "could not create relation %s: %m"
-msgstr "nesne %u/%u/%u oluşturma hatası: %m"
-
-#: storage/smgr/md.c:348
-#: storage/smgr/md.c:1173
-#, fuzzy, c-format
-msgid "could not remove relation %s: %m"
-msgstr "nesne %u/%u/%u kaldırma hatası: %m"
-
-#: storage/smgr/md.c:372
-#, fuzzy, c-format
-msgid "could not remove segment %u of relation %s: %m"
-msgstr "segment %u, nesne %u/%u/%u kaldırılamıyor: %m"
-
-#: storage/smgr/md.c:417
-#, fuzzy, c-format
-msgid "cannot extend relation %s beyond %u blocks"
-msgstr "%u/%u/%u nesnesi %u bloÄŸuna kadar geniÅŸletilemiyor"
-
-#: storage/smgr/md.c:439
-#: storage/smgr/md.c:600
-#: storage/smgr/md.c:673
-#, fuzzy, c-format
-msgid "could not seek to block %u of relation %s: %m"
-msgstr "%2$u/%3$u/%4$u nesnesinin %1$u bloğuna arama hatası: %5$m"
-
-#: storage/smgr/md.c:448
-#, fuzzy, c-format
-msgid "could not extend relation %s: %m"
-msgstr "nesne %u/%u/%u genişletme hatası: %m"
-
-#: storage/smgr/md.c:450
-#: storage/smgr/md.c:457
-#: storage/smgr/md.c:699
-msgid "Check free disk space."
-msgstr "Yeterli disk alanı kontrol edin"
-
-#: storage/smgr/md.c:454
-#, fuzzy, c-format
-msgid "could not extend relation %s: wrote only %d of %d bytes at block %u"
-msgstr "%1$u/%2$u/%3$u nesnesi büyütme hatası: %6$u bloğunda %4$d bayttan sadece %5$d bayt yazıldı"
-
-#: storage/smgr/md.c:511
-#, fuzzy, c-format
-msgid "could not open relation %s: %m"
-msgstr "nesne %u/%u/%u açma hatası: %m"
-
-#: storage/smgr/md.c:617
-#, fuzzy, c-format
-msgid "could not read block %u of relation %s: %m"
-msgstr "%2$u/%3$u/%4$u nesnesinin %1$u bloku okunamıyor: %5$m"
-
-#: storage/smgr/md.c:633
-#, fuzzy, c-format
-msgid "could not read block %u of relation %s: read only %d of %d bytes"
-msgstr "%2$u/%3$u/%4$u nesnesinin %1$u bloku okunamıyor: %6$d bayttan sadece %5$d bayt okundu"
-
-#: storage/smgr/md.c:690
-#, fuzzy, c-format
-msgid "could not write block %u of relation %s: %m"
-msgstr "%2$u/%3$u/%4$u nesnesinin %1$u bloku yazılamıyor: %5$m"
-
-#: storage/smgr/md.c:695
-#, fuzzy, c-format
-msgid "could not write block %u of relation %s: wrote only %d of %d bytes"
-msgstr "%2$u/%3$u/%4$u nesnesinin %1$u bloku yazılamıyor: %6$d bayttan sadece %5$d bayt yazıldı"
-
-#: storage/smgr/md.c:764
-#, fuzzy, c-format
-msgid "could not open segment %u of relation %s: %m"
-msgstr "segment %u, nesne %u/%u/%u açma yapılamıyor: %m"
-
-#: storage/smgr/md.c:795
-#, fuzzy, c-format
-msgid "could not truncate relation %s to %u blocks: it's only %u blocks now"
-msgstr "%u/%u/%u nesnesi %u blokuna kadar kesilemiyor: nesnenin boyutu %u blok olarak ayarlandı"
-
-#: storage/smgr/md.c:819
-#: storage/smgr/md.c:844
-#, c-format
-msgid "could not truncate relation %s to %u blocks: %m"
-msgstr "%s ilişkisi to %u bloğa küçültülemedi: %m"
-
-#: storage/smgr/md.c:889
-#: storage/smgr/md.c:1063
-#: storage/smgr/md.c:1207
-#, fuzzy, c-format
-msgid "could not fsync segment %u of relation %s: %m"
-msgstr "log dosyası segment %u, nesne %u/%u/%u fsync yapılamıyor: %m"
-
-#: storage/smgr/md.c:1068
-#, fuzzy, c-format
-msgid "could not fsync segment %u of relation %s but retrying: %m"
-msgstr "segment %u, nesne %u/%u/%u fsync yapılamıyor: %m"
-
-#: storage/smgr/md.c:1554
-#, fuzzy, c-format
-msgid "could not open segment %u of relation %s (target block %u): %m"
-msgstr "segment %u, nesne%u/%u/%u (hedef blok %u) açılamıyor: %m"
-
-#: storage/smgr/md.c:1577
-#, fuzzy, c-format
-msgid "could not seek to end of segment %u of relation %s: %m"
-msgstr "segment %u, nesne %u/%u/%u arama yapılamıyor: %m"
-
-#: storage/file/fd.c:383
-#, c-format
-msgid "getrlimit failed: %m"
-msgstr "getrlimit başarısız oldu: %m"
-
-#: storage/file/fd.c:473
-msgid "insufficient file descriptors available to start server process"
-msgstr "sunucu sürecini başlatmak için yetersiz dosya belirteçleri"
-
-#: storage/file/fd.c:474
-#, c-format
-msgid "System allows %d, we need at least %d."
-msgstr "Sistem %d dosya belirtecine izin veriyor, PostgreSQL en az %d istiyor."
-
-#: storage/file/fd.c:515
-#: storage/file/fd.c:1376
-#: storage/file/fd.c:1491
-#, c-format
-msgid "out of file descriptors: %m; release and retry"
-msgstr "dosya belirteçleri kullanımda: %m; serbest bırakın ve yeniden kullanın"
-
-#: storage/file/fd.c:1043
-#, c-format
-msgid "temporary file: path \"%s\", size %lu"
-msgstr "geçici dosya: yol \"%s\", boyut %lu"
-
-#: storage/file/fd.c:1550
-#, c-format
-msgid "could not read directory \"%s\": %m"
-msgstr "\"%s\" dizini okunamıyor: %m"
-
-#: storage/page/bufpage.c:143
-#: storage/page/bufpage.c:390
-#: storage/page/bufpage.c:623
-#: storage/page/bufpage.c:753
-#, c-format
-msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
-msgstr "bozuk sayfa göstergesi: lower = %u, upper = %u, special = %u"
-
-#: storage/page/bufpage.c:433
-#, c-format
-msgid "corrupted item pointer: %u"
-msgstr "nesne imleyici bozuk: %u"
-
-#: storage/page/bufpage.c:444
-#: storage/page/bufpage.c:805
-#, c-format
-msgid "corrupted item lengths: total %u, available space %u"
-msgstr "bozuk öğe uzunluğu: toplam %u, boş alan %u"
-
-#: storage/page/bufpage.c:642
-#: storage/page/bufpage.c:778
-#, c-format
-msgid "corrupted item pointer: offset = %u, size = %u"
-msgstr "bozuk öğe göstergisi: offset = %u, size = %u"
-
-#: storage/large_object/inv_api.c:545
-#: storage/large_object/inv_api.c:736
-#, c-format
-msgid "large object %u was not opened for writing"
-msgstr "large object %u yazmak için açılamadı"
-
-#: storage/lmgr/deadlock.c:915
-#, c-format
-msgid "Process %d waits for %s on %s; blocked by process %d."
-msgstr "Process %d waits for %s on %s; blocked by process %d."
-
-#: storage/lmgr/deadlock.c:934
-#, fuzzy, c-format
-msgid "Process %d: %s"
-msgstr "eriÅŸim: %s"
-
-#: storage/lmgr/deadlock.c:941
-msgid "deadlock detected"
-msgstr "ÖlüKilit konumu saptandı"
-
-#: storage/lmgr/deadlock.c:944
-msgid "See server log for query details."
-msgstr "Sorgu ayrıntıları için sunucu kayıt dosyasına bakın."
-
-#: storage/lmgr/lmgr.c:717
-#, c-format
-msgid "relation %u of database %u"
-msgstr "%2$u veritabanının %1$u nesnesi"
-
-#: storage/lmgr/lmgr.c:723
-#, c-format
-msgid "extension of relation %u of database %u"
-msgstr "%u nesnesinin uzantısı %u veritabanına aittir"
-
-#: storage/lmgr/lmgr.c:729
-#, c-format
-msgid "page %u of relation %u of database %u"
-msgstr "%u sayfası %u nesnesinindir ve %u veritabanındadır"
-
-#: storage/lmgr/lmgr.c:736
-#, c-format
-msgid "tuple (%u,%u) of relation %u of database %u"
-msgstr "(%u,%u) satırı %u nesnesinindir ve %u veritabanındadır"
-
-#: storage/lmgr/lmgr.c:744
-#, c-format
-msgid "transaction %u"
-msgstr "transaction %u"
-
-#: storage/lmgr/lmgr.c:749
-#, c-format
-msgid "virtual transaction %d/%u"
-msgstr "sanal transaction %d/%u"
-
-#: storage/lmgr/lmgr.c:755
-#, c-format
-msgid "object %u of class %u of database %u"
-msgstr "%u nesnesi %u sınıfındandır ve %u veritabanındadır"
-
-#: storage/lmgr/lmgr.c:763
-#, c-format
-msgid "user lock [%u,%u,%u]"
-msgstr "user lock [%u,%u,%u]"
-
-#: storage/lmgr/lmgr.c:770
-#, c-format
-msgid "advisory lock [%u,%u,%u,%u]"
-msgstr "advisory lock [%u,%u,%u,%u]"
-
-#: storage/lmgr/lmgr.c:778
-#, c-format
-msgid "unrecognized locktag type %d"
-msgstr "bilinmeyen locktag tipi %d"
-
-#: storage/lmgr/lock.c:584
-#: storage/lmgr/lock.c:650
-#: storage/lmgr/lock.c:2340
-#: storage/lmgr/lock.c:2405
-msgid "You might need to increase max_locks_per_transaction."
-msgstr "max_locks_per_transaction değerini artırmanız gerekebilir."
-
-#: storage/lmgr/lock.c:2052
-msgid "Not enough memory for reassigning the prepared transaction's locks."
-msgstr "Hazırlanmış transaction'un lock'ları yeniden atanması için yeterli bellek yok."
-
-#: storage/lmgr/proc.c:275
-#: storage/ipc/procarray.c:151
-#: storage/ipc/sinvaladt.c:293
-#: postmaster/postmaster.c:1725
-msgid "sorry, too many clients already"
-msgstr "üzgünüm, istemci sayısı çok fazla"
-
-#: storage/lmgr/proc.c:966
-#, c-format
-msgid "process %d avoided deadlock for %s on %s by rearranging queue order after %ld.%03d ms"
-msgstr "%d süreci %s işlemi %s nesnesi için kaynak kilitlenmesini önledi bunun için %ld.%03d milisaniye bekledikten sonra sırada bekleyen işlemler yeniden düzenlendi"
-
-#: storage/lmgr/proc.c:978
-#, c-format
-msgid "process %d detected deadlock while waiting for %s on %s after %ld.%03d ms"
-msgstr "%d süreci %s nesnesini %s  işlemi için beklerken %ld.%03d milisaniye sonra deadlock tespit etti"
-
-#: storage/lmgr/proc.c:984
-#, fuzzy, c-format
-msgid "process %d still waiting for %s on %s after %ld.%03d ms"
-msgstr "Process %d waits for %s on %s; blocked by process %d."
-
-#: storage/lmgr/proc.c:988
-#, c-format
-msgid "process %d acquired %s on %s after %ld.%03d ms"
-msgstr "process %d acquired %s on %s after %ld.%03d ms"
-
-#: storage/lmgr/proc.c:1004
-#, c-format
-msgid "process %d failed to acquire %s on %s after %ld.%03d ms"
-msgstr "process %d failed to acquire %s on %s after %ld.%03d ms"
-
-#: storage/ipc/shmem.c:392
-#, c-format
-msgid "could not allocate shared memory segment \"%s\""
-msgstr "shared memory segment oluşturulamıyor: \"%s\""
-
-#: storage/ipc/shmem.c:420
-#: storage/ipc/shmem.c:439
-msgid "requested shared memory size overflows size_t"
-msgstr "istenilen shared memory boyutu size_t tipini aşıyor"
-
-#: main/main.c:230
-#, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr "%s: setsysinfo başarısız: %s\n"
-
-#: main/main.c:249
-#, c-format
-msgid "%s: WSAStartup failed: %d\n"
-msgstr "%s: WSAStartup başarısız: %d\n"
-
-#: main/main.c:268
-#, c-format
-msgid ""
-"%s is the PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s bir PostgreSQL suncusudur.\n"
-"\n"
-
-#: main/main.c:269
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION]...\n"
-"\n"
-msgstr ""
-"kullanım:\n"
-"  %s [OPTION]...\n"
-"\n"
-
-#: main/main.c:270
-#, c-format
-msgid "Options:\n"
-msgstr "Seçenekler:\n"
-
-#: main/main.c:272
-#, c-format
-msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr "  -A 1|0          run-time assert kontrolü etkinleştir/etkisizleştir\n"
-
-#: main/main.c:274
-#, c-format
-msgid "  -B NBUFFERS     number of shared buffers\n"
-msgstr "  -B NBUFFERS     shared buffer sayısı\n"
-
-#: main/main.c:275
-#, c-format
-msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr "  -c NAME=VALUE   çalıştırma zamanı parametresini ayarla\n"
-
-#: main/main.c:276
-#, c-format
-msgid "  -d 1-5          debugging level\n"
-msgstr "  -d 1-5          debug düzeyi\n"
-
-#: main/main.c:277
-#, c-format
-msgid "  -D DATADIR      database directory\n"
-msgstr "  -D DATADIR      veritabanı dizini\n"
-
-#: main/main.c:278
-#, c-format
-msgid "  -e              use European date input format (DMY)\n"
-msgstr "  -e              tarih veri girişi için avrupa biçimini kullan (DMY)\n"
-
-#: main/main.c:279
-#, c-format
-msgid "  -F              turn fsync off\n"
-msgstr "  -F              fsync etkisizleÅŸtir\n"
-
-#: main/main.c:280
-#, c-format
-msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr "  -h HOSTNAME     sadece bu IP adresini dinle\n"
-
-#: main/main.c:281
-#, c-format
-msgid "  -i              enable TCP/IP connections\n"
-msgstr "  -i              TCP/IP bağlantılarına izin ver\n"
-
-#: main/main.c:282
-#, c-format
-msgid "  -k DIRECTORY    Unix-domain socket location\n"
-msgstr "  -k DIRECTORY    Unix-domain socket yeri\n"
-
-#: main/main.c:284
-#, c-format
-msgid "  -l              enable SSL connections\n"
-msgstr "  -l              SSL bağlantıları etkinleştir\n"
-
-#: main/main.c:286
-#, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
-msgstr "  -N MAX-CONNECT  izin verilen azami bağlantı sayısı\n"
-
-#: main/main.c:287
-#, c-format
-msgid "  -o OPTIONS      pass \"OPTIONS\" to each server process (obsolete)\n"
-msgstr "  -o OPTIONS      her sunucu sürecine \"OPTIONS\" parametresini ilet (artık kullanılmamaktadır)\n"
-
-#: main/main.c:288
-#, c-format
-msgid "  -p PORT         port number to listen on\n"
-msgstr "  -p PORT         dinlenecek port numarası\n"
-
-#: main/main.c:289
-#, c-format
-msgid "  -s              show statistics after each query\n"
-msgstr "  -s              her sorgudan sonra istatistikleri göster\n"
-
-#: main/main.c:290
-#, c-format
-msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
-msgstr "  -S WORK-MEM     alfabetik sıralama işlemi için kullanılacak bellek (kilobayt bazında)\n"
-
-#: main/main.c:291
-#, c-format
-msgid "  --NAME=VALUE    set run-time parameter\n"
-msgstr "  --NAME=VALUE    çalıştırma zamanı parametresini ayarla\n"
-
-#: main/main.c:292
-#, c-format
-msgid "  --describe-config  describe configuration parameters, then exit\n"
-msgstr "  --describe-config  ayar parametresini açıklama ve çık\n"
-
-#: main/main.c:293
-#, c-format
-msgid "  --help          show this help, then exit\n"
-msgstr "  --help          bu yardım ekranını yaz ve çık\n"
-
-#: main/main.c:294
-#, c-format
-msgid "  --version       output version information, then exit\n"
-msgstr "  --version       sürüm bilgisini yaz ve çık\n"
-
-#: main/main.c:296
-#, c-format
-msgid ""
-"\n"
-"Developer options:\n"
-msgstr ""
-"\n"
-"Program geliştirici Seçenekleri:\n"
-
-#: main/main.c:297
-#, c-format
-msgid "  -f s|i|n|m|h    forbid use of some plan types\n"
-msgstr "  -f s|i|n|m|h    bazı plan yöntemlerinin kullanımı yasakla\n"
-
-#: main/main.c:298
-#, c-format
-msgid "  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr "  -n              normal olmayan sonladırmadan sonra shared memory yeniden sıfırlamayı engelle\n"
-
-#: main/main.c:299
-#, c-format
-msgid "  -O              allow system table structure changes\n"
-msgstr "  -O              sistem tabloların yapı değişikliğine izin ver\n"
-
-#: main/main.c:300
-#, c-format
-msgid "  -P              disable system indexes\n"
-msgstr "  -P              sistem indeksleri etkisizleÅŸtir\n"
-
-#: main/main.c:301
-#, c-format
-msgid "  -t pa|pl|ex     show timings after each query\n"
-msgstr "  -t pa|pl|ex     her sorgudan sonra harcanan zamanı göster\n"
-
-#: main/main.c:302
-#, c-format
-msgid "  -T              send SIGSTOP to all backend servers if one dies\n"
-msgstr "  -T              biri sonlandırdığında ümü backend süreçlerine SIGSTOP mesajını gönder\n"
-
-#: main/main.c:303
-#, c-format
-msgid "  -W NUM          wait NUM seconds to allow attach from a debugger\n"
-msgstr "  -W NUM          debuggerin başlanması için NUM daniye bekle\n"
-
-#: main/main.c:305
-#, c-format
-msgid ""
-"\n"
-"Options for single-user mode:\n"
-msgstr ""
-"\n"
-"Tek kullanıcılı biçimi seçenekleri:\n"
-
-#: main/main.c:306
-#, c-format
-msgid "  --single        selects single-user mode (must be first argument)\n"
-msgstr "  --single        tek kullanıcılı biçini seçiyor (ilk argüman olmalı)\n"
-
-#: main/main.c:307
-#, c-format
-msgid "  DBNAME          database name (defaults to user name)\n"
-msgstr "  DBNAME          veritabanı adı (varsayılan, kullanıcı adı)\n"
-
-#: main/main.c:308
-#, c-format
-msgid "  -d 0-5          override debugging level\n"
-msgstr "  -d 0-5          debug düzeyi değiştir\n"
-
-#: main/main.c:309
-#, c-format
-msgid "  -E              echo statement before execution\n"
-msgstr "  -E              çalıştırmadan sorguyu ekrana yaz\n"
-
-#: main/main.c:310
-#, c-format
-msgid "  -j              do not use newline as interactive query delimiter\n"
-msgstr "  -j              yeni satı işareti sorgunun sonu olarak algılama\n"
-
-#: main/main.c:311
-#: main/main.c:316
-#, c-format
-msgid "  -r FILENAME     send stdout and stderr to given file\n"
-msgstr "  -r FILENAME     stdout ve stderr çıktılarını belirtilen dosyaya gönder\n"
-
-#: main/main.c:313
-#, c-format
-msgid ""
-"\n"
-"Options for bootstrapping mode:\n"
-msgstr ""
-"\n"
-"Bootstrapping biçimi seçenekleri:\n"
-
-#: main/main.c:314
-#, c-format
-msgid "  --boot          selects bootstrapping mode (must be first argument)\n"
-msgstr "  --boot          bootstrapping biçimini seçiyor (mutlaka ilk argüman olmalı)\n"
-
-#: main/main.c:315
-#, c-format
-msgid "  DBNAME          database name (mandatory argument in bootstrapping mode)\n"
-msgstr "  DBNAME          veritabanı adı (bootstrapping biçimi için zorunlu argüman)\n"
-
-#: main/main.c:317
-#, c-format
-msgid "  -x NUM          internal use\n"
-msgstr "  -x NUM          iç kullanım\n"
-
-#: main/main.c:319
-#, c-format
-msgid ""
-"\n"
-"Please read the documentation for the complete list of run-time\n"
-"configuration settings and how to set them on the command line or in\n"
-"the configuration file.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Çalıştırma zamanı parametrelerin tam listesi için ve onların komut \n"
-"satırı ve ayarlar dosyasında nasıl belirleyeceğinizi tam açıklaması için\n"
-"lütfen dokümanlara başvurun.\n"
-"\n"
-"Hata raporları <pgsql-bugs@postgresql.org> adresine iletin.\n"
-
-#: main/main.c:333
-msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"PostgreSQL'in, \"root\" kullanıcı olarak çalıştırılmasını tavsiye edilmememktedir.\n"
-"Olası güvenilik açığı önlemek için, sunucu, sistem yönetici olmayan\n"
-"bir kullanıcı ID ile çalıştırılmalıdır. Sunucunun doğru başlatılması\n"
-"konusunda daha fazla bilgi için PostgreSQL dökümanlara bakın.\n"
-
-#: main/main.c:350
-#, c-format
-msgid "%s: real and effective user IDs must match\n"
-msgstr "%s: gerçek ve etkin kullanıcı ID'leri birbirine uymalıdır\n"
-
-#: main/main.c:357
-msgid ""
-"Execution of PostgreSQL by a user with administrative permissions is not\n"
-"permitted.\n"
-"The server must be started under an unprivileged user ID to prevent\n"
-"possible system security compromises.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-msgstr ""
-"PostgreSQL, sistem yöneticisi haklarına sahip kullanıcısı tarafından çalıştırılamaz.\n"
-"Olası güvenilik açığı önlemek için, sunucu, sistem yönetici olmayan bir kullanıcı ID\n"
-"ile çalıştırılmalıdır. Sunucunun doğru başlatılması konusunda daha fazla bilgi\n"
-"için dökümanlara bakın.\n"
-
-#: main/main.c:378
-#, c-format
-msgid "%s: invalid effective UID: %d\n"
-msgstr "%s: aktif UID %d geçersizidir\n"
-
-#: main/main.c:391
-#, c-format
-msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr "%s: kullanıcı adı belirlenemedi (GetUserName başarısız)\n"
-
-#: optimizer/plan/initsplan.c:571
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to the nullable side of an outer join"
-msgstr "SELECT FOR UPDATE/SHARE outer join'in null olabilecek tarafına uygulanamaz"
-
-#: optimizer/plan/planner.c:843
-#: parser/analyze.c:1187
-#: parser/analyze.c:1379
-#: parser/analyze.c:1936
-msgid "SELECT FOR UPDATE/SHARE is not allowed with UNION/INTERSECT/EXCEPT"
-msgstr "UNION/INTERSECT/EXCEPT içeren sorguda SELECT FOR UPDATE/SHARE kullanılamaz"
-
-#: optimizer/plan/planner.c:1041
-msgid "could not implement GROUP BY"
-msgstr ""
-
-#: optimizer/plan/planner.c:1042
-#: optimizer/plan/planner.c:1473
-#: optimizer/prep/prepunion.c:768
-msgid "Some of the datatypes only support hashing, while others only support sorting."
-msgstr ""
-
-#: optimizer/plan/planner.c:1472
-msgid "could not implement DISTINCT"
-msgstr ""
-
-#: optimizer/plan/planner.c:2520
-msgid "could not implement window PARTITION BY"
-msgstr ""
-
-#: optimizer/plan/planner.c:2521
-msgid "Window partitioning columns must be of sortable datatypes."
-msgstr ""
-
-#: optimizer/plan/planner.c:2525
-msgid "could not implement window ORDER BY"
-msgstr ""
-
-#: optimizer/plan/planner.c:2526
-msgid "Window ordering columns must be of sortable datatypes."
-msgstr ""
-
-#: optimizer/util/clauses.c:3796
-#, c-format
-msgid "SQL function \"%s\" during inlining"
-msgstr "satır içine alınma işlemi sırasında \"%s\" SQL fonksiyonu"
-
-#: optimizer/prep/preptlist.c:132
-msgid "SELECT FOR UPDATE/SHARE is not allowed in subqueries"
-msgstr "subquery sorgusunda SELECT FOR UPDATE/SHARE kullanılamaz"
-
-#: optimizer/prep/prepunion.c:373
-msgid "could not implement recursive UNION"
-msgstr ""
-
-#: optimizer/prep/prepunion.c:374
-msgid "All column datatypes must be hashable."
-msgstr ""
-
-#. translator: %s is UNION, INTERSECT, or EXCEPT
-#: optimizer/prep/prepunion.c:767
-#, fuzzy, c-format
-msgid "could not implement %s"
-msgstr "\"%s\" dosyası açılamıyor: %m"
-
-#: parser/analyze.c:443
-msgid "INSERT ... SELECT cannot specify INTO"
-msgstr "INSERT ... SELECT ifadesinde INTO öğesi kullanılamaz"
-
-#: parser/analyze.c:545
-#: parser/analyze.c:967
-msgid "VALUES lists must all be the same length"
-msgstr "VALUES listesi eşit uzunlukta olmalıdır"
-
-#: parser/analyze.c:566
-#: parser/analyze.c:1071
-msgid "VALUES must not contain table references"
-msgstr "VALUES, tablo başvuruları içeremez"
-
-#: parser/analyze.c:580
-#: parser/analyze.c:1085
-msgid "VALUES must not contain OLD or NEW references"
-msgstr "VALUES kısmında OLD veya NEW başvurular bulunmamalıdır"
-
-#: parser/analyze.c:581
-#: parser/analyze.c:1086
-msgid "Use SELECT ... UNION ALL ... instead."
-msgstr "Onun yerine SELECT ... UNION ALL ... kullanın"
-
-#: parser/analyze.c:691
-#: parser/analyze.c:1098
-msgid "cannot use aggregate function in VALUES"
-msgstr "VALUES kısmında aggregate fonksiyonları kullanılamaz"
-
-#: parser/analyze.c:697
-#: parser/analyze.c:1104
-msgid "cannot use window function in VALUES"
-msgstr "VALUES işleminde window fonksiyonu kullanılamaz"
-
-#: parser/analyze.c:729
-msgid "INSERT has more expressions than target columns"
-msgstr "INSERT, hedef sütun sayısından çok ifade bulundurmaktadır"
-
-#: parser/analyze.c:737
-msgid "INSERT has more target columns than expressions"
-msgstr "INSERT, ifade sayısından çok hedef sütun bulundurmaktadır"
-
-#: parser/analyze.c:983
-msgid "DEFAULT can only appear in a VALUES list within INSERT"
-msgstr "DEFAUL sadece INSERT içinde yer alan VALUES listesinde yer alabilir"
-
-#: parser/analyze.c:1052
-#: parser/analyze.c:2095
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to VALUES"
-msgstr "SELECT FOR UPDATE/SHARE ifadesi VALUES kısmına uygulanamaz"
-
-#: parser/analyze.c:1303
-msgid "invalid UNION/INTERSECT/EXCEPT ORDER BY clause"
-msgstr "geçersiz UNION/INTERSECT/EXCEPT ORDER BY ifadesi"
-
-#: parser/analyze.c:1304
-msgid "Only result column names can be used, not expressions or functions."
-msgstr "Sadece sonuç sütun aldarı kullanılabilir, ifade veya fonksiyon kullanılamaz."
-
-#: parser/analyze.c:1305
-msgid "Add the expression/function to every SELECT, or move the UNION into a FROM clause."
-msgstr "Bu ifade/fonksiyonu ger SELECT içine yerleştirin ya da FROM ifadesine UNION ekleyin."
-
-#: parser/analyze.c:1371
-msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
-msgstr "INTO, sadece UNION/INTERSECT/EXCEPT işleminin ilk SELECT ifadesinde kullanılabilir"
-
-#: parser/analyze.c:1431
-msgid "UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"
-msgstr "UNION/INTERSECT/EXCEPT öğesinin üye somutu aynı seviyedeki diğer tabloya erişilemez"
-
-#: parser/analyze.c:1499
-#, c-format
-msgid "each %s query must have the same number of columns"
-msgstr "her %s sorgusu ayını sütun sayısına sahip olmalıdır"
-
-#: parser/analyze.c:1619
-msgid "CREATE TABLE AS specifies too many column names"
-msgstr "CREATE TABLE AS işleminde belirtilen sütun sayısı çok fazla"
-
-#: parser/analyze.c:1669
-msgid "cannot use aggregate function in UPDATE"
-msgstr "UPDATE parametresinde aggregate fonksiyon kullanılamaz"
-
-#: parser/analyze.c:1675
-msgid "cannot use window function in UPDATE"
-msgstr "UPDATE işleminde window fonksiyonu kullanılamaz"
-
-#: parser/analyze.c:1782
-msgid "cannot use aggregate function in RETURNING"
-msgstr "RETURNING parametresinde aggregate fonksiyon kullanılamaz"
-
-#: parser/analyze.c:1788
-#, fuzzy
-msgid "cannot use window function in RETURNING"
-msgstr "RETURNING parametresinde aggregate fonksiyon kullanılamaz"
-
-#: parser/analyze.c:1807
-msgid "RETURNING cannot contain references to other relations"
-msgstr "RETURNING, başka nesnelere başvuru içeremez"
-
-#: parser/analyze.c:1846
-msgid "cannot specify both SCROLL and NO SCROLL"
-msgstr "hem SCROLL hem de NO SCROLL aynı yerde kullanılamaz"
-
-#: parser/analyze.c:1860
-msgid "DECLARE CURSOR cannot specify INTO"
-msgstr "DECLARE CURSOR tanımında INTO kullanılamaz"
-
-#: parser/analyze.c:1868
-msgid "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE CURSOR WITH HOLD ... FOR UPDATE/SHARE desteklenmiyor"
-
-#: parser/analyze.c:1869
-msgid "Holdable cursors must be READ ONLY."
-msgstr "Holdable imleçler READ  ONLY olmalıdır."
-
-#: parser/analyze.c:1882
-msgid "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE is not supported"
-msgstr "DECLARE INSENSITIVE CURSOR ... FOR UPDATE/SHARE desteklenmiyor"
-
-#: parser/analyze.c:1883
-msgid "Insensitive cursors must be READ ONLY."
-msgstr "Insensitive cursorlar  READ ONLY olmalıdır."
-
-#: parser/analyze.c:1940
-msgid "SELECT FOR UPDATE/SHARE is not allowed with DISTINCT clause"
-msgstr "SELECT FOR UPDATE/SHARE ifadesinde DISTINCT kullanılamaz"
-
-#: parser/analyze.c:1944
-msgid "SELECT FOR UPDATE/SHARE is not allowed with GROUP BY clause"
-msgstr "SELECT FOR UPDATE/SHARE ifadesinde GROUP BY kullanılamaz"
-
-#: parser/analyze.c:1948
-msgid "SELECT FOR UPDATE/SHARE is not allowed with HAVING clause"
-msgstr "SELECT FOR UPDATE/SHARE ifadesinde HAVING kullanılamaz"
-
-#: parser/analyze.c:1952
-msgid "SELECT FOR UPDATE/SHARE is not allowed with aggregate functions"
-msgstr "aggregate fonskiyonlarinda SELECT FOR UPDATE/SHARE kullanılamaz"
-
-#: parser/analyze.c:1956
-#, fuzzy
-msgid "SELECT FOR UPDATE/SHARE is not allowed with window functions"
-msgstr "aggregate fonskiyonlarinda SELECT FOR UPDATE/SHARE kullanılamaz"
-
-#: parser/analyze.c:2022
-#: parser/analyze.c:2114
-#: rewrite/rewriteHandler.c:1257
-#, fuzzy
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to an outer-level WITH query"
-msgstr "SELECT FOR UPDATE/SHARE joine uygulanamaz"
-
-#: parser/analyze.c:2048
-#, fuzzy
-msgid "SELECT FOR UPDATE/SHARE must specify unqualified relation names"
-msgstr "SELECT FOR UPDATE/SHARE joine uygulanamaz"
-
-#: parser/analyze.c:2077
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a join"
-msgstr "SELECT FOR UPDATE/SHARE joine uygulanamaz"
-
-#: parser/analyze.c:2083
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"
-msgstr "SELECT FOR UPDATE/SHARE, NEW veya OLD tanımlarına uygulanamaz"
-
-#: parser/analyze.c:2089
-msgid "SELECT FOR UPDATE/SHARE cannot be applied to a function"
-msgstr "SELECT FOR UPDATE/SHARE, bir fonksiyonuna uygulanamaz"
-
-#: parser/analyze.c:2135
-#, c-format
-msgid "relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause"
-msgstr "FOR UPDATE/SHARE ifadesinde belirtilen \"%s\" tablosu FROM ifadesinde bulunamadı"
-
-#: parser/analyze.c:2203
-#: parser/parse_coerce.c:283
-#: parser/parse_expr.c:641
-#: parser/parse_expr.c:648
-#, c-format
-msgid "there is no parameter $%d"
-msgstr "$%d parametresi yoktur"
-
-#: parser/parse_agg.c:84
-#, fuzzy
-msgid "aggregate function calls cannot contain window function calls"
-msgstr "aggregate fonksiyon çağırmaları içiçe olamaz"
-
-#: parser/parse_agg.c:155
-#: parser/parse_clause.c:1546
-#, fuzzy, c-format
-msgid "window \"%s\" does not exist"
-msgstr "\"%s\" indexi mevcut deÄŸil"
-
-#: parser/parse_agg.c:243
-msgid "aggregates not allowed in WHERE clause"
-msgstr "WHERE ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:249
-msgid "aggregates not allowed in JOIN conditions"
-msgstr "JOIN ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:270
-msgid "aggregates not allowed in GROUP BY clause"
-msgstr "GROUP BY ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:338
-msgid "aggregate functions not allowed in a recursive query's recursive term"
-msgstr ""
-
-#: parser/parse_agg.c:363
-#, fuzzy
-msgid "window functions not allowed in WHERE clause"
-msgstr "WHERE ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:369
-#, fuzzy
-msgid "window functions not allowed in JOIN conditions"
-msgstr "JOIN ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:375
-#, fuzzy
-msgid "window functions not allowed in HAVING clause"
-msgstr "WHERE ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:388
-#, fuzzy
-msgid "window functions not allowed in GROUP BY clause"
-msgstr "GROUP BY ifadesinde aggregate kullanılamaz"
-
-#: parser/parse_agg.c:407
-#: parser/parse_agg.c:420
-#, fuzzy
-msgid "window functions not allowed in window definition"
-msgstr "%s, bir SQL fonksiyonunda yer alamaz"
-
-#: parser/parse_agg.c:541
-#, c-format
-msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function"
-msgstr "aggregate fonksiyonu kullanmak için \"%s.%s\" sütununu GROUP BY listesine eklemelisiniz"
-
-#: parser/parse_agg.c:547
-#, c-format
-msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
-msgstr "subquery, dış sorgusundan \"%s.%s\" gruplandırılanmamış sütunu kullanıyor"
-
-#: parser/parse_clause.c:414
-#, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
-msgstr "JOIN/ON ifadesi, JOIN parçası olmayan \"%s\" öğesine referans etmektedir"
-
-#: parser/parse_clause.c:494
-msgid "subquery in FROM cannot have SELECT INTO"
-msgstr "FROM ifadesindeki subquery içerisinde SELECT INTO kullanılamaz"
-
-#: parser/parse_clause.c:516
-msgid "subquery in FROM cannot refer to other relations of same query level"
-msgstr "FROM öğesinde subquery ifadesi aynı seviyedeki diğer tabloya erişemez"
-
-#: parser/parse_clause.c:567
-msgid "function expression in FROM cannot refer to other relations of same query level"
-msgstr "FROM öğesinde fonksiyon ifadesi aynı seviyedeki diğer tabloya erişemez"
-
-#: parser/parse_clause.c:580
-msgid "cannot use aggregate function in function expression in FROM"
-msgstr "FROM ifadesinin fonksiyon ifadesinde aggregate fonksiyonu kullanılamaz"
-
-#: parser/parse_clause.c:587
-#, fuzzy
-msgid "cannot use window function in function expression in FROM"
-msgstr "FROM ifadesinin fonksiyon ifadesinde aggregate fonksiyonu kullanılamaz"
-
-#: parser/parse_clause.c:863
-#, c-format
-msgid "column name \"%s\" appears more than once in USING clause"
-msgstr "USING ifadesinde \"%s\" sütun adı birden fazla kez rastlanıyor"
-
-#: parser/parse_clause.c:878
-#, c-format
-msgid "common column name \"%s\" appears more than once in left table"
-msgstr "sol tablosunda  \"%s\" sütun adı birden fazla kez rastlanıyor"
-
-#: parser/parse_clause.c:887
-#, c-format
-msgid "column \"%s\" specified in USING clause does not exist in left table"
-msgstr "USING ifadesinde belirtilen \"%s\" sütunu sol tablosunda bulunmamaktadır"
-
-#: parser/parse_clause.c:901
-#, c-format
-msgid "common column name \"%s\" appears more than once in right table"
-msgstr "\"%s\" sütun adı sağ tavblosunda birden fazla kez rastlanmaktadır"
-
-#: parser/parse_clause.c:910
-#, c-format
-msgid "column \"%s\" specified in USING clause does not exist in right table"
-msgstr "USING ifadesinde kullaınılan \"%s\" sütunu sağ tablosunda mevcut değildir"
-
-#: parser/parse_clause.c:967
-#, c-format
-msgid "column alias list for \"%s\" has too many entries"
-msgstr "\"%s\" için sütun alias listesinde gereğinden fazla öğe var"
-
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1186
-#, c-format
-msgid "argument of %s must not contain variables"
-msgstr "%s ifadesinin argüanı değişken bulundurmamalıdır"
-
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1197
-#, fuzzy, c-format
-msgid "argument of %s must not contain aggregate functions"
-msgstr "%s ifadesinin argüanı aggregate bulundurmamalıdır"
-
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1208
-#, fuzzy, c-format
-msgid "argument of %s must not contain window functions"
-msgstr "%s ifadesinin argüanı değişlen bulundurmamalıdır"
-
-#. translator: first %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1322
-#, c-format
-msgid "%s \"%s\" is ambiguous"
-msgstr "%s \"%s\" iki anlamlıdır"
-
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1346
-#, c-format
-msgid "non-integer constant in %s"
-msgstr "%s içinde tamsayı olamayan bir sabit"
-
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1364
-#, c-format
-msgid "%s position %d is not in select list"
-msgstr "%s ifadesi, %d terinde select listesinde deÄŸildir"
-
-#: parser/parse_clause.c:1534
-#, fuzzy, c-format
-msgid "window \"%s\" is already defined"
-msgstr "\"%s\" zanten bir view'dur"
-
-#: parser/parse_clause.c:1587
-#, c-format
-msgid "cannot override PARTITION BY clause of window \"%s\""
-msgstr ""
-
-#: parser/parse_clause.c:1599
-#, c-format
-msgid "cannot override ORDER BY clause of window \"%s\""
-msgstr ""
-
-#: parser/parse_clause.c:1621
-#, fuzzy, c-format
-msgid "cannot override frame clause of window \"%s\""
-msgstr "\"%s\" sistem sütununun adı değiştirilemez"
-
-#: parser/parse_clause.c:1677
-msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
-msgstr "SELECT DISTINCE sorgusunda ORDER BY select listesinde bulunmalıdır"
-
-#: parser/parse_clause.c:1763
-#: parser/parse_clause.c:1795
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
-msgstr "SELECT DISTINCT ON ifadesi, ORDER BY ifadelerine uymak zorundadır"
-
-#: parser/parse_clause.c:1914
-#, c-format
-msgid "operator %s is not a valid ordering operator"
-msgstr "%s geçerli bir sıralama operatör adı değildir"
-
-#: parser/parse_clause.c:1916
-msgid "Ordering operators must be \"<\" or \">\" members of btree operator families."
-msgstr "Ordering operators must be \"<\" or \">\" members of btree operator families."
-
-#: parser/parse_coerce.c:300
-#: parser/parse_expr.c:1870
-#, c-format
-msgid "inconsistent types deduced for parameter $%d"
-msgstr "$%d parametresi için geçersiz tip bulundu"
-
-#: parser/parse_coerce.c:891
-#: parser/parse_coerce.c:920
-#: parser/parse_coerce.c:938
-#: parser/parse_coerce.c:953
-#: parser/parse_expr.c:1522
-#: parser/parse_expr.c:2025
-#, c-format
-msgid "cannot cast type %s to %s"
-msgstr "%s tipi %s tipine dökülemiyor"
-
-#: parser/parse_coerce.c:923
-msgid "Input has too few columns."
-msgstr "Girişte sütun sayısı azdır."
-
-#: parser/parse_coerce.c:941
-#, c-format
-msgid "Cannot cast type %s to %s in column %d."
-msgstr "%3$d sütununda %1$s tipi %2$s tipine dökülemiyor."
-
-#: parser/parse_coerce.c:956
-msgid "Input has too many columns."
-msgstr "Giriş çok fazla sütun içeriyor."
-
-#. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:999
-#, c-format
-msgid "argument of %s must be type boolean, not type %s"
-msgstr "%s'ın argümanları %s değil, boolean tipinde olamalıdır"
-
-#. translator: %s is name of a SQL construct, eg WHERE
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1009
-#: parser/parse_coerce.c:1058
-#, c-format
-msgid "argument of %s must not return a set"
-msgstr "%s'ın argümanları set veri tipini döndüremez"
-
-#. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:1046
-#, c-format
-msgid "argument of %s must be type %s, not type %s"
-msgstr "%s'ın argümanı %s değil, %s tipinde olamalıdır"
-
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1179
-#, c-format
-msgid "%s types %s and %s cannot be matched"
-msgstr "%s tipleri %s ve %s bir araya gelemez"
-
-#. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:1246
-#, c-format
-msgid "%s could not convert type %s to %s"
-msgstr "%s %s tipi %s tipime dönüştürülemiyor"
-
-#: parser/parse_coerce.c:1487
-msgid "arguments declared \"anyelement\" are not all alike"
-msgstr "\"anyelement\" olarak tanımlanan argümanlar birbirine benzemiyor"
-
-#: parser/parse_coerce.c:1506
-msgid "arguments declared \"anyarray\" are not all alike"
-msgstr "\"anyarray\" olarak tanımlanan argümanlar birbirine benzemiyor"
-
-#: parser/parse_coerce.c:1535
-#: parser/parse_coerce.c:1679
-#: parser/parse_coerce.c:1710
-#, c-format
-msgid "argument declared \"anyarray\" is not an array but type %s"
-msgstr "\"anyarray\" olarak tanımlanmış argüman bir dizin değil, %s tipidir"
-
-#: parser/parse_coerce.c:1551
-msgid "argument declared \"anyarray\" is not consistent with argument declared \"anyelement\""
-msgstr "\"anyarray\" olarak tanımlanmış parametre \"anyelement\" olarak tanımlanmış parametresiyle tutarlı değildir"
-
-#: parser/parse_coerce.c:1569
-msgid "could not determine polymorphic type because input has type \"unknown\""
-msgstr "giriş, \"unknown\" tipinde olduğu için polymorphic tipi belirlenemedi"
-
-#: parser/parse_coerce.c:1579
-#, fuzzy, c-format
-msgid "type matched to anynonarray is an array type: %s"
-msgstr "enyenum ile eÅŸleÅŸtirilen tip bir enum tipi deÄŸildir: %s"
-
-#: parser/parse_coerce.c:1589
-#, c-format
-msgid "type matched to anyenum is not an enum type: %s"
-msgstr "enyenum ile eÅŸleÅŸtirilen tip bir enum tipi deÄŸildir: %s"
-
-#: parser/parse_coerce.c:1618
-#: parser/parse_coerce.c:1635
-#: parser/parse_coerce.c:1693
-#: parser/parse_expr.c:1488
-#: parser/parse_func.c:304
-#: parser/parse_oper.c:991
-#: nodes/nodeFuncs.c:107
-#: nodes/nodeFuncs.c:133
-#, c-format
-msgid "could not find array type for data type %s"
-msgstr "%s pipi için array tipi bulunamıyor"
-
-#: parser/parse_cte.c:40
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within its non-recursive term"
-msgstr ""
-
-#: parser/parse_cte.c:42
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within a subquery"
-msgstr ""
-
-#: parser/parse_cte.c:44
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within an outer join"
-msgstr ""
-
-#: parser/parse_cte.c:46
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within INTERSECT"
-msgstr ""
-
-#: parser/parse_cte.c:48
-#, c-format
-msgid "recursive reference to query \"%s\" must not appear within EXCEPT"
-msgstr ""
-
-#: parser/parse_cte.c:133
-#, fuzzy, c-format
-msgid "WITH query name \"%s\" specified more than once"
-msgstr "\"%s\" tablo adı birden fazla kez belirtilmiştir"
-
-#: parser/parse_cte.c:269
-#, fuzzy
-msgid "subquery in WITH cannot have SELECT INTO"
-msgstr "FROM ifadesindeki subquery içerisinde SELECT INTO kullanılamaz"
-
-#: parser/parse_cte.c:310
-#, c-format
-msgid "recursive query \"%s\" column %d has type %s in non-recursive term but type %s overall"
-msgstr ""
-
-#: parser/parse_cte.c:316
-msgid "Cast the output of the non-recursive term to the correct type."
-msgstr ""
-
-#: parser/parse_cte.c:386
-#, fuzzy, c-format
-msgid "WITH query \"%s\" has %d columns available but %d columns specified"
-msgstr "\"%s\" tablosuna %d sütun bulunmakta ancak sorguda %d sütun belirtilmiş"
-
-#: parser/parse_cte.c:566
-#, fuzzy
-msgid "mutual recursion between WITH items is not implemented"
-msgstr "NEW için rule eylemleri implement edilmemiş"
-
-#: parser/parse_cte.c:618
-#, c-format
-msgid "recursive query \"%s\" does not have the form non-recursive-term UNION [ALL] recursive-term"
-msgstr ""
-
-#: parser/parse_cte.c:650
-#, fuzzy
-msgid "ORDER BY in a recursive query is not implemented"
-msgstr "view üzerinde WHERE CURRENT OF implement edilmemiştir"
-
-#: parser/parse_cte.c:656
-#, fuzzy
-msgid "OFFSET in a recursive query is not implemented"
-msgstr "view üzerinde WHERE CURRENT OF implement edilmemiştir"
-
-#: parser/parse_cte.c:662
-#, fuzzy
-msgid "LIMIT in a recursive query is not implemented"
-msgstr "anonymous composite veri giriÅŸi implemente edilmemiÅŸ"
-
-#: parser/parse_cte.c:668
-#, fuzzy
-msgid "FOR UPDATE/SHARE in a recursive query is not implemented"
-msgstr "view üzerinde WHERE CURRENT OF implement edilmemiştir"
-
-#: parser/parse_cte.c:730
-#, fuzzy, c-format
-msgid "recursive reference to query \"%s\" must not appear more than once"
-msgstr "%d (%s, %s) yordam numarasına birden fazla kez rastlanıyor"
-
-#: parser/parse_expr.c:343
-#: parser/parse_target.c:596
-#, fuzzy
-msgid "row expansion via \"*\" is not supported here"
-msgstr "\"E\" desteklenmiyor"
-
-#: parser/parse_expr.c:891
-msgid "NULLIF requires = operator to yield boolean"
-msgstr "boolean değerini almak için NULLIF, = işlemini kullanmalıdır"
-
-#: parser/parse_expr.c:1064
-msgid "arguments of row IN must all be row expressions"
-msgstr "IN satırında argümanlar birer satır ifadesi olmalıdır"
-
-#: parser/parse_expr.c:1267
-#, fuzzy
-msgid "subquery cannot have SELECT INTO"
-msgstr "FROM ifadesindeki subquery içerisinde SELECT INTO kullanılamaz"
-
-#: parser/parse_expr.c:1295
-msgid "subquery must return a column"
-msgstr "subquery, sütün döndürmeli"
-
-#: parser/parse_expr.c:1302
-msgid "subquery must return only one column"
-msgstr "subquery, bir tane sütun getirmelidir"
-
-#: parser/parse_expr.c:1361
-msgid "subquery has too many columns"
-msgstr "subquery çok fazla sütuna sahip"
-
-#: parser/parse_expr.c:1366
-msgid "subquery has too few columns"
-msgstr "subquery'de yetersiz sütun sayısı"
-
-#: parser/parse_expr.c:1462
-#, fuzzy
-msgid "cannot determine type of empty array"
-msgstr "sonuç veri tipi belirlenemiyor"
-
-#: parser/parse_expr.c:1463
-msgid "Explicitly cast to the desired type, for example ARRAY[]::integer[]."
-msgstr ""
-
-#: parser/parse_expr.c:1477
-#, fuzzy, c-format
-msgid "could not find element type for data type %s"
-msgstr "%s pipi için array tipi bulunamıyor"
-
-#: parser/parse_expr.c:1675
-msgid "unnamed XML attribute value must be a column reference"
-msgstr "isimsiz XML attribute değeri bir sütun referansı olmalıdır"
-
-#: parser/parse_expr.c:1676
-msgid "unnamed XML element value must be a column reference"
-msgstr "isimsiz XML öğesi bir sütun referansı olmalıdır"
-
-#: parser/parse_expr.c:1691
-#, c-format
-msgid "XML attribute name \"%s\" appears more than once"
-msgstr "\"%s\" XML attrıbute adı birden fazla kez belirtilmiştir"
-
-#: parser/parse_expr.c:1798
-#, fuzzy, c-format
-msgid "cannot cast XMLSERIALIZE result to %s"
-msgstr "%s tipi %s tipine dökülemiyor"
-
-#: parser/parse_expr.c:2066
-#: parser/parse_expr.c:2264
-msgid "unequal number of entries in row expressions"
-msgstr "satır ifadelerınde farklı öğe sayısı"
-
-#: parser/parse_expr.c:2076
-msgid "cannot compare rows of zero length"
-msgstr "sıfır uzunluklu satırlar karşılaştırılamaz"
-
-#: parser/parse_expr.c:2101
-#, c-format
-msgid "row comparison operator must yield type boolean, not type %s"
-msgstr "satır karşılaştırma operatörü %s tipini değil, boolean tipini döndürmelidir"
-
-#: parser/parse_expr.c:2108
-msgid "row comparison operator must not return a set"
-msgstr "satır karşılaştırma operatörü set döndürmemelidir"
-
-#: parser/parse_expr.c:2167
-#: parser/parse_expr.c:2211
-#, c-format
-msgid "could not determine interpretation of row comparison operator %s"
-msgstr "%s satır karşılaştırma operatörünün youmlaması tespit edilemedi"
-
-#: parser/parse_expr.c:2169
-msgid "Row comparison operators must be associated with btree operator families."
-msgstr "Satır karşılaştırma operatörleri btree sınıf operatörleri ile ilişilmelidir"
-
-#: parser/parse_expr.c:2213
-msgid "There are multiple equally-plausible candidates."
-msgstr "Birden fazla uygun aday vardır."
-
-#: parser/parse_expr.c:2304
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr "boolean değerini almak için IS DISTINCT FROM, = işlemini kullanmalıdır"
-
-#: parser/parse_func.c:187
-#, c-format
-msgid "%s(*) specified, but %s is not an aggregate function"
-msgstr "%s(*) belirtilmiÅŸ, ancak %s bir aggregate fonksiyonu deÄŸildir"
-
-#: parser/parse_func.c:194
-#, c-format
-msgid "DISTINCT specified, but %s is not an aggregate function"
-msgstr "DISTINCT belirtilmiÅŸ, ancak %s bir aggregate fonksiyonu deÄŸildir"
-
-#: parser/parse_func.c:200
-#, fuzzy, c-format
-msgid "OVER specified, but %s is not a window function nor an aggregate function"
-msgstr "%s(*) belirtilmiÅŸ, ancak %s bir aggregate fonksiyonu deÄŸildir"
-
-#: parser/parse_func.c:227
-#, c-format
-msgid "function %s is not unique"
-msgstr "%s fonksiyonu benzersiz deÄŸildir"
-
-#: parser/parse_func.c:230
-msgid "Could not choose a best candidate function. You might need to add explicit type casts."
-msgstr "En iyi aday fonksiyon seçilememiş. Explicit type cast eklemeniz gerekebilir."
-
-#: parser/parse_func.c:239
-msgid "No function matches the given name and argument types. You might need to add explicit type casts."
-msgstr "Verilmiş ad ve argüman tiplerine uyan fonksiyon bulunamamış. Explicit type cast eklemeniz gerekebilir."
-
-#: parser/parse_func.c:346
-#: parser/parse_func.c:399
-#, c-format
-msgid "%s(*) must be used to call a parameterless aggregate function"
-msgstr "%s(*) olmadan parametre olmayan aggregate çağırılamaz"
-
-#: parser/parse_func.c:353
-msgid "aggregates cannot return sets"
-msgstr "aggregate set söndüremez"
-
-#: parser/parse_func.c:372
-msgid "window function call requires an OVER clause"
-msgstr ""
-
-#: parser/parse_func.c:389
-#, fuzzy
-msgid "DISTINCT is not implemented for window functions"
-msgstr "SSPI bu sunucuda desteklenmemektedir"
-
-#: parser/parse_func.c:406
-#, fuzzy
-msgid "window functions cannot return sets"
-msgstr "SQL fonksiyonları %s tipini dündüremezler"
-
-#: parser/parse_func.c:1190
-#, c-format
-msgid "column %s.%s does not exist"
-msgstr "%s.%s sütunu mevcut değil"
-
-#: parser/parse_func.c:1202
-#, c-format
-msgid "column \"%s\" not found in data type %s"
-msgstr "%2$s veri tipinde \"%1$s\" sütunu bulunamadı"
-
-#: parser/parse_func.c:1208
-#, c-format
-msgid "could not identify column \"%s\" in record data type"
-msgstr "record veri tipinde  \"%s\" sütunu bulunamamış"
-
-#: parser/parse_func.c:1214
-#, c-format
-msgid "column notation .%s applied to type %s, which is not a composite type"
-msgstr ".%s sütün tanım biçimi %s tipine uygulanmış; bu tip, bir composite tipi değildir"
-
-#: parser/parse_func.c:1398
-#, c-format
-msgid "aggregate %s(*) does not exist"
-msgstr "aggregate %s(*) mevcut deÄŸil"
-
-#: parser/parse_func.c:1403
-#, c-format
-msgid "aggregate %s does not exist"
-msgstr "aggregate %s mevcut deÄŸil"
-
-#: parser/parse_func.c:1424
-#, c-format
-msgid "function %s is not an aggregate"
-msgstr "%s fonksiyonu bir aggregate deÄŸildir"
-
-#: parser/parse_node.c:77
-#, c-format
-msgid "target lists can have at most %d entries"
-msgstr "hedef listesi en fazla %d kayıt içerebilir"
-
-#: parser/parse_node.c:219
-#, c-format
-msgid "cannot subscript type %s because it is not an array"
-msgstr "%s tipi bir array olmadığı için ona subscript yapılamaz "
-
-#: parser/parse_node.c:313
-#: parser/parse_node.c:339
-msgid "array subscript must have type integer"
-msgstr "array subscript tamsyı tipinde olmalıdır"
-
-#: parser/parse_node.c:363
-#, c-format
-msgid "array assignment requires type %s but expression is of type %s"
-msgstr "array ataması %s tipini gerektirmektedir ancak ifade %s tipindedir"
-
-#: parser/parse_oper.c:253
-#, c-format
-msgid "could not identify an ordering operator for type %s"
-msgstr "%s tipi için sırama işlemi bulunamadı"
-
-#: parser/parse_oper.c:255
-msgid "Use an explicit ordering operator or modify the query."
-msgstr "Sıralama işlemini açıkça belirtin veya sorguda değişiklik yapın"
-
-#: parser/parse_oper.c:512
-#, c-format
-msgid "operator requires run-time type coercion: %s"
-msgstr "işlem, çalışma zamanı tip zola değiştirmeyi gerektiriri: %s"
-
-#: parser/parse_oper.c:754
-#, c-format
-msgid "operator is not unique: %s"
-msgstr "operator eÅŸsiz deÄŸildir: %s"
-
-#: parser/parse_oper.c:756
-msgid "Could not choose a best candidate operator. You might need to add explicit type casts."
-msgstr "En iyi aday işlem seçilememiş. Explicit type cast eklemeniz gerekebilir."
-
-#: parser/parse_oper.c:764
-msgid "No operator matches the given name and argument type(s). You might need to add explicit type casts."
-msgstr "Verilen ad ve argüman tiplerine uyan işlem bulunamadı. Explicit type cast eklemeniz gerekebilir."
-
-#: parser/parse_oper.c:823
-#: parser/parse_oper.c:936
-#, fuzzy, c-format
-msgid "operator is only a shell: %s"
-msgstr "%s tipi sadece bir shell"
-
-#: parser/parse_oper.c:924
-msgid "op ANY/ALL (array) requires array on right side"
-msgstr "op ANY/ALL (array) saÄŸ tarafta bir array gerektiri"
-
-#: parser/parse_oper.c:966
-msgid "op ANY/ALL (array) requires operator to yield boolean"
-msgstr "op ANY/ALL (array) operatorun boolean tipinde deÄŸer getirilmesi gerekir"
-
-#: parser/parse_oper.c:971
-msgid "op ANY/ALL (array) requires operator not to return a set"
-msgstr "op ANY/ALL (array) operatorun set tipinde deÄŸer getirilmesi gerekir"
-
-#: parser/parse_relation.c:142
-#, c-format
-msgid "table reference \"%s\" is ambiguous"
-msgstr "\"%s\" tablo referanslı iki anlamlı"
-
-#: parser/parse_relation.c:178
-#, c-format
-msgid "table reference %u is ambiguous"
-msgstr "%u tablo referanslı iki anlamlı"
-
-#: parser/parse_relation.c:338
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr "\"%s\" tablo adı birden fazla kez belirtilmiştir"
-
-#: parser/parse_relation.c:473
-#: parser/parse_relation.c:547
-#, c-format
-msgid "column reference \"%s\" is ambiguous"
-msgstr "\"%s\" sütun referansı iki anlamlı"
-
-#: parser/parse_relation.c:783
-#: parser/parse_relation.c:1072
-#: parser/parse_relation.c:1432
-#, c-format
-msgid "table \"%s\" has %d columns available but %d columns specified"
-msgstr "\"%s\" tablosuna %d sütun bulunmakta ancak sorguda %d sütun belirtilmiş"
-
-#: parser/parse_relation.c:813
-#, c-format
-msgid "too many column aliases specified for function %s"
-msgstr "%s fonksiyonu için çok fazla sütun alias belirtilmiş"
-
-#: parser/parse_relation.c:879
-#, fuzzy, c-format
-msgid "There is a WITH item named \"%s\", but it cannot be referenced from this part of the query."
-msgstr "\"%s\" tablosu için kayıt var ama sorgunun bu kısmaından bu tablo erişilemez."
-
-#: parser/parse_relation.c:881
-msgid "Use WITH RECURSIVE, or re-order the WITH items to remove forward references."
-msgstr ""
-
-#: parser/parse_relation.c:1151
-msgid "a column definition list is only allowed for functions returning \"record\""
-msgstr "sütun tanım listesi, sadece \"record\" veri tipini döndüren fonksiyonlarda kullanılır"
-
-#: parser/parse_relation.c:1159
-msgid "a column definition list is required for functions returning \"record\""
-msgstr "sütun tanım listesi,\"record\" veri tipini döndüren fonksiyonlarda kullanılmalıdır"
-
-#: parser/parse_relation.c:1206
-#, c-format
-msgid "function \"%s\" in FROM has unsupported return type %s"
-msgstr "FROM ifadesinde kullanılan \"%s\" fonksiyonu %s desteklenmeyen döndürme tipini kullanıyor"
-
-#: parser/parse_relation.c:1278
-#, c-format
-msgid "VALUES lists \"%s\" have %d columns available but %d columns specified"
-msgstr "\"%s\" VALUES lıstesinde %d sütun varken %d sütun belirtilmiştir"
-
-#: parser/parse_relation.c:1334
-#, fuzzy, c-format
-msgid "joins can have at most %d columns"
-msgstr "bir tablo en fazla %d sütun içerebilir"
-
-#: parser/parse_relation.c:2098
-#, c-format
-msgid "column %d of relation \"%s\" does not exist"
-msgstr "\"%2$s\" tablosunun %1$d kolonu mevcut deÄŸil"
-
-#: parser/parse_relation.c:2460
-#, c-format
-msgid "invalid reference to FROM-clause entry for table \"%s\""
-msgstr "FROM öğesinde \"%s\" tablo öğesine geçersiz başvuru"
-
-#: parser/parse_relation.c:2463
-#: parser/parse_relation.c:2483
-#, c-format
-msgid "Perhaps you meant to reference the table alias \"%s\"."
-msgstr "Belki tablonun arma adını \"%s\" kullanmak istediniz"
-
-#: parser/parse_relation.c:2465
-#: parser/parse_relation.c:2486
-#, c-format
-msgid "There is an entry for table \"%s\", but it cannot be referenced from this part of the query."
-msgstr "\"%s\" tablosu için kayıt var ama sorgunun bu kısmaından bu tablo erişilemez."
-
-#: parser/parse_relation.c:2471
-#, c-format
-msgid "missing FROM-clause entry for table \"%s\""
-msgstr "\"%s\" tablo öğesinde FROM öğesi eksik"
-
-#: parser/parse_relation.c:2480
-#, c-format
-msgid "adding missing FROM-clause entry for table \"%s\""
-msgstr "\"%s\" tablo öğesinde eksik FROM öğesi ekleniyor"
-
-#: parser/parse_target.c:369
-#: parser/parse_target.c:657
-#, c-format
-msgid "cannot assign to system column \"%s\""
-msgstr "\"%s\" sistem sütununa veri atanamıyor"
-
-#: parser/parse_target.c:394
-msgid "cannot set an array element to DEFAULT"
-msgstr "array öğesine DEFAULT değeri atanamıyor"
-
-#: parser/parse_target.c:399
-msgid "cannot set a subfield to DEFAULT"
-msgstr "subfield, DEFAULT deÄŸeri alamaz"
-
-#: parser/parse_target.c:466
-#, c-format
-msgid "column \"%s\" is of type %s but expression is of type %s"
-msgstr "\"%s\" sütunu %s tipinde ancak ifade %s tipindedir"
-
-#: parser/parse_target.c:641
-#, c-format
-msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
-msgstr "%3$s composite tipi olmadığı için \"%2$s\" sütununun \"%1$s\" alanına atama başarısız"
-
-#: parser/parse_target.c:650
-#, c-format
-msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
-msgstr "%3$s veri tipi olmadığı için \"%2$s\" sütununun \"%1$s\" alanına atama başarısız"
-
-#: parser/parse_target.c:725
-#, c-format
-msgid "array assignment to \"%s\" requires type %s but expression is of type %s"
-msgstr "\"%s\" alanına atama işlemi %s veri tipini gerektirmektedir ancak %s veri tipi alınmış"
-
-#: parser/parse_target.c:735
-#, c-format
-msgid "subfield \"%s\" is of type %s but expression is of type %s"
-msgstr "\"%s\" subfield %s tipinde ancak ifade %s tipindedir"
-
-#: parser/parse_target.c:991
-msgid "SELECT * with no tables specified is not valid"
-msgstr "SELECT *, tablo tanımı olmadan geçersizdir"
-
-#: parser/parse_type.c:83
-#, c-format
-msgid "improper %%TYPE reference (too few dotted names): %s"
-msgstr "geçersiz %%TYPE başvurusu (çok az noktalı isim): %s"
-
-#: parser/parse_type.c:105
-#, c-format
-msgid "improper %%TYPE reference (too many dotted names): %s"
-msgstr "geçersiz %%TYPE başvurusu (çok fazla noktalı isim): %s"
-
-#: parser/parse_type.c:127
-#, c-format
-msgid "type reference %s converted to %s"
-msgstr "type reference %s'dan %s'a çevirilmiş"
-
-#: parser/parse_type.c:273
-#, c-format
-msgid "type modifier is not allowed for type \"%s\""
-msgstr "\"%s\" veri tipi için tip niteliyicisi kullanılamaz"
-
-#: parser/parse_type.c:316
-#, fuzzy
-msgid "type modifiers must be simple constants or identifiers"
-msgstr "tip belirteçleri birer tamsayı sabiti olmalıdır"
-
-#: parser/parse_type.c:555
-#: parser/parse_type.c:654
-#, c-format
-msgid "invalid type name \"%s\""
-msgstr "tip adı \"%s\" geçersiz"
-
-#: parser/parse_utilcmd.c:297
-#, fuzzy
-msgid "array of serial is not implemented"
-msgstr "UNIQUE predicate implemente edilmemiÅŸtir"
-
-#: parser/parse_utilcmd.c:339
-#, c-format
-msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\""
-msgstr "%s, \"%s.%s\" serial sütunu için \"%s\" örtülü sequence oluşturacaktır"
-
-#: parser/parse_utilcmd.c:441
-#: parser/parse_utilcmd.c:451
-#, c-format
-msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
-msgstr "\"%2$s\" tablosunda \"%1$s\" sütunu için çelişen NULL/NOT NULL tanımları"
-
-#: parser/parse_utilcmd.c:461
-#, c-format
-msgid "multiple default values specified for column \"%s\" of table \"%s\""
-msgstr "\"%2$s\" tablosunun \"%1$s\" sütunu için birden fazla varsayılan değer verilmiştir"
-
-#: parser/parse_utilcmd.c:1212
-#, c-format
-msgid "column \"%s\" appears twice in primary key constraint"
-msgstr "\"%s\" sütunu primary key kısıtlamasında iki rastlanıyor"
-
-#: parser/parse_utilcmd.c:1217
-#, c-format
-msgid "column \"%s\" appears twice in unique constraint"
-msgstr "\"%s\" sütunu unique kısıtlamasında iki kez rastlanıyor"
-
-#: parser/parse_utilcmd.c:1364
-msgid "index expression cannot return a set"
-msgstr "index ifadesi set tipi döndüremez"
-
-#: parser/parse_utilcmd.c:1374
-msgid "index expressions and predicates can refer only to the table being indexed"
-msgstr "index ifade ve yüklemler sadece indexlenen tabloyu referans edebilirler"
-
-#: parser/parse_utilcmd.c:1469
-msgid "rule WHERE condition cannot contain references to other relations"
-msgstr "rule tanımının WHERE öğesinde başka tablolara referans içermemelidir"
-
-#: parser/parse_utilcmd.c:1475
-msgid "cannot use aggregate function in rule WHERE condition"
-msgstr "WHERE şart ifadelerinde aggregate function kullanılamaz"
-
-#: parser/parse_utilcmd.c:1479
-#, fuzzy
-msgid "cannot use window function in rule WHERE condition"
-msgstr "WHERE şart ifadelerinde aggregate function kullanılamaz"
-
-#: parser/parse_utilcmd.c:1551
-msgid "rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"
-msgstr "rule tanımının WHERE öğesinde sadece SELECT, INSERT, UPDATE veya DELETE işlemi bulunabilir"
-
-#: parser/parse_utilcmd.c:1569
-#: parser/parse_utilcmd.c:1639
-#: rewrite/rewriteManip.c:1024
-#: rewrite/rewriteHandler.c:424
-msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
-msgstr "conditional UNION/INTERSECT/EXCEPT komutları empemente edilmemiş"
-
-#: parser/parse_utilcmd.c:1587
-msgid "ON SELECT rule cannot use OLD"
-msgstr "ON SELECT rule OLD tanımını kullanamaz"
-
-#: parser/parse_utilcmd.c:1591
-msgid "ON SELECT rule cannot use NEW"
-msgstr "ON SELECT rule NEW tanımını kullanamaz"
-
-#: parser/parse_utilcmd.c:1600
-msgid "ON INSERT rule cannot use OLD"
-msgstr "ON INSERT rule OLD tanımını kullanamaz"
-
-#: parser/parse_utilcmd.c:1606
-msgid "ON DELETE rule cannot use NEW"
-msgstr "ON DELETE rule NEW tanımını kullanamaz"
-
-#: parser/parse_utilcmd.c:1889
-msgid "misplaced DEFERRABLE clause"
-msgstr "DEFERRABLE ifadesi burada kullanılamaz"
-
-#: parser/parse_utilcmd.c:1893
-#: parser/parse_utilcmd.c:1906
-msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
-msgstr "birden fazla DEFERRABLE/NOT DEFERRABLE tanımına izin verilmez"
-
-#: parser/parse_utilcmd.c:1902
-msgid "misplaced NOT DEFERRABLE clause"
-msgstr "NOT DEFERRABLE yanlış yerde kullanılmış"
-
-#: parser/parse_utilcmd.c:1913
-#: parser/parse_utilcmd.c:1936
-#: gram.y:3246
-#: gram.y:3262
-msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
-msgstr "INITIALLY DEFERRED olarak tanımlanan kısıtlayıcı DEFERRABLE özelliğine sahip olmalıdır"
-
-#: parser/parse_utilcmd.c:1920
-msgid "misplaced INITIALLY DEFERRED clause"
-msgstr "INITIALLY DEFERRED yanlış yerde kullanılmış"
-
-#: parser/parse_utilcmd.c:1924
-#: parser/parse_utilcmd.c:1947
-msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
-msgstr "birden fazla INITIALLY IMMEDIATE/DEFERRED kullanılamaz"
-
-#: parser/parse_utilcmd.c:1943
-msgid "misplaced INITIALLY IMMEDIATE clause"
-msgstr "INITIALLY IMMEDIATE yanlış yerde kullanılmış"
-
-#: parser/parse_utilcmd.c:2114
-#, c-format
-msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
-msgstr "CREATE işleminin belirttiği şema (%s) yaratılacak (%s) olanından farklı"
-
-#: parser/scansup.c:181
-#, c-format
-msgid "identifier \"%s\" will be truncated to \"%.*s\""
-msgstr "\"%s\" adı  \"%.*s\" uzunluğuna budanacaktır"
-
-#: gram.y:1191
-#, fuzzy
-msgid "current database cannot be changed"
-msgstr "geçerli veritabanının adını değiştirilemez"
-
-#: gram.y:1306
-#: gram.y:1321
-msgid "time zone interval must be HOUR or HOUR TO MINUTE"
-msgstr "zaman dilimi aralığı  HOUR veya HOUR TO MINUTE olmalıdır"
-
-#: gram.y:1326
-#: gram.y:7744
-#: gram.y:10037
-#, fuzzy
-msgid "interval precision specified twice"
-msgstr "interval(%d) kesinliği %d ile %d arasında olmalıdır"
-
-#: gram.y:2522
-msgid "CREATE TABLE AS cannot specify INTO"
-msgstr "CREATE TABLE AS işleminde INTO kullanılamaz"
-
-#: gram.y:3176
-#, fuzzy
-msgid "duplicate trigger events specified"
-msgstr "birden fazla INSERT olayı belirtilmiştir"
-
-#: gram.y:3326
-msgid "CREATE ASSERTION is not yet implemented"
-msgstr "CREATE ASSERTION implemente edilmemiÅŸtir"
-
-#: gram.y:3342
-msgid "DROP ASSERTION is not yet implemented"
-msgstr "DROP ASSERTION implemente edilmemiÅŸtir"
-
-#: gram.y:3638
-#, fuzzy
-msgid "RECHECK is no longer required"
-msgstr "aclinsert artık desteklenmemktedir"
-
-#: gram.y:3639
-#, fuzzy
-msgid "Update your data type."
-msgstr "Veri tiplerinin listesi"
-
-#: gram.y:5917
-#: gram.y:5923
-#: gram.y:5929
-msgid "WITH CHECK OPTION is not implemented"
-msgstr "WITH CHECK OPTION gerçekleştirilmemiştir"
-
-#: gram.y:6515
-msgid "column name list not allowed in CREATE TABLE / AS EXECUTE"
-msgstr "CREATE TABLE / AS EXECUTE işleminde sütun isim listesi verilmez"
-
-#: gram.y:6736
-msgid "number of columns does not match number of values"
-msgstr "değer sayısı sayısı ile kolon satısı eşleşmiyor"
-
-#: gram.y:7160
-msgid "LIMIT #,# syntax is not supported"
-msgstr "LIMIT #,# sözdizimi desteklenmemektedir"
-
-#: gram.y:7161
-msgid "Use separate LIMIT and OFFSET clauses."
-msgstr "Ayrı LIMIT ve OFFSET ifadeleri kullanın."
-
-#: gram.y:7382
-msgid "VALUES in FROM must have an alias"
-msgstr "FROM öğesindeki VALUES'ler bir alias almalıdır"
-
-#: gram.y:7383
-msgid "For example, FROM (VALUES ...) [AS] foo."
-msgstr "Örneğin, FROM (VALUES ...) [AS] birşey."
-
-#: gram.y:7388
-msgid "subquery in FROM must have an alias"
-msgstr "FROM öğesindeki subquery bir aliası almalıdır"
-
-#: gram.y:7389
-msgid "For example, FROM (SELECT ...) [AS] foo."
-msgstr "Örneğin, FROM (SELECT ...) [AS] birşey."
-
-#: gram.y:7870
-msgid "precision for type float must be at least 1 bit"
-msgstr "float veri tipinin kesinliği en az 1 bit olmalıdır"
-
-#: gram.y:7879
-msgid "precision for type float must be less than 54 bits"
-msgstr "float veri tipinin kesinliği ne çok 54 bit olabilir"
-
-#: gram.y:8575
-msgid "UNIQUE predicate is not yet implemented"
-msgstr "UNIQUE predicate implemente edilmemiÅŸtir"
-
-#: gram.y:9414
-#: gram.y:9429
-msgid "frame start cannot be UNBOUNDED FOLLOWING"
-msgstr ""
-
-#: gram.y:9419
-#: gram.y:9434
-#, fuzzy
-msgid "frame start at CURRENT ROW is not implemented"
-msgstr "view üzerinde WHERE CURRENT OF implement edilmemiştir"
-
-#: gram.y:9439
-msgid "frame end cannot be UNBOUNDED PRECEDING"
-msgstr ""
-
-#: gram.y:10559
-msgid "OLD used in query that is not in a rule"
-msgstr "rule olmayan sorgusunda OLD kullanıldı"
-
-#: gram.y:10569
-msgid "NEW used in query that is not in a rule"
-msgstr "rule olmayan sorgusunda NEW kullanıldı"
-
-#: gram.y:10617
-#: gram.y:10824
-msgid "improper use of \"*\""
-msgstr "\"*\"'nin geçersiz kullanımı"
-
-#: gram.y:10756
-msgid "wrong number of parameters on left side of OVERLAPS expression"
-msgstr "OVERLAPS ifadesinin sol tarafında yanlış parametre sayısı kullanılmış"
-
-#: gram.y:10763
-msgid "wrong number of parameters on right side of OVERLAPS expression"
-msgstr "OVERLAPS ifadesinin sağ tarafında yanlış parametre sayısı kullanılmış"
-
-#: gram.y:10886
-msgid "multiple ORDER BY clauses not allowed"
-msgstr "birden çok ORDER BY ifadesi kullanılamaz"
-
-#: gram.y:10897
-msgid "multiple OFFSET clauses not allowed"
-msgstr "birden fazla OFFSET ifadesi desteklenmemektedir"
-
-#: gram.y:10906
-msgid "multiple LIMIT clauses not allowed"
-msgstr "birden çok LIMIT ifadesi kullanılamaz"
-
-#: gram.y:10915
-#, fuzzy
-msgid "multiple WITH clauses not allowed"
-msgstr "birden çok LIMIT ifadesi kullanılamaz"
-
-#: gram.y:11069
-msgid "OUT and INOUT arguments aren't allowed in TABLE functions"
-msgstr ""
-
-#: scan.l:386
-msgid "unterminated /* comment"
-msgstr "/* açıklama sonlandırılmamış"
-
-#: scan.l:415
-msgid "unterminated bit string literal"
-msgstr "sonuçlandırılmamış bit string literal"
-
-#: scan.l:436
-msgid "unterminated hexadecimal string literal"
-msgstr "sonuçlandırılmamış hexadecimal string literal"
-
-#: scan.l:476
-msgid "unsafe use of string constant with Unicode escapes"
-msgstr ""
-
-#: scan.l:477
-msgid "String constants with Unicode escapes cannot be used when standard_conforming_strings is off."
-msgstr ""
-
-#: scan.l:524
-msgid "unsafe use of \\' in a string literal"
-msgstr "string literal içinde güvenli olmayan \\' kullanımı"
-
-#: scan.l:525
-msgid "Use '' to write quotes in strings. \\' is insecure in client-only encodings."
-msgstr "Satır içinde tırnak yazmak için iki tek tırnak ('') kullanın. İstemci baslı kodlamalarda (\\') kullanımı güvendi değildir."
-
-#: scan.l:554
-msgid "unterminated quoted string"
-msgstr "sonuçlandırılmamış tırnakla sınırlandırılmış satır"
-
-#: scan.l:598
-msgid "unterminated dollar-quoted string"
-msgstr "sonuçlandırılmamış dolar işeretiyle sınırlandırılmış satır"
-
-#: scan.l:615
-#: scan.l:627
-#: scan.l:641
-msgid "zero-length delimited identifier"
-msgstr "sınırlandırılmış tanım sıfır uzunluklu"
-
-#: scan.l:654
-msgid "unterminated quoted identifier"
-msgstr "sonuçlandırılmamış tırnakla sınırlandırılmış tanım"
-
-#: scan.l:748
-msgid "operator too long"
-msgstr "operator fazla uzun"
-
-#. translator: %s is typically the translation of "syntax error"
-#: scan.l:897
-#, c-format
-msgid "%s at end of input"
-msgstr "giriÅŸ sonuna %s"
-
-#. translator: first %s is typically the translation of "syntax error"
-#: scan.l:905
-#, c-format
-msgid "%s at or near \"%s\""
-msgstr "\"%2$s\"  yerinde %1$s"
-
-#: scan.l:1025
-msgid "Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8"
-msgstr ""
-
-#: scan.l:1042
-#, fuzzy
-msgid "invalid Unicode escape character"
-msgstr "escape satırı geçersiz"
-
-#: scan.l:1085
-#, fuzzy
-msgid "invalid Unicode escape value"
-msgstr "geçersiz end sequence"
-
-#: scan.l:1134
-msgid "nonstandard use of \\' in a string literal"
-msgstr "string literal içinde standart olmayan \\' kullanımı"
-
-#: scan.l:1135
-msgid "Use '' to write quotes in strings, or use the escape string syntax (E'...')."
-msgstr "Satır içinde tırnak yazmak için ya iki tek tırnak ('') ya da escape kullanın (E'...')."
-
-#: scan.l:1144
-msgid "nonstandard use of \\\\ in a string literal"
-msgstr "string literal içinde standart olmayan \\\\ kullanımı"
-
-#: scan.l:1145
-msgid "Use the escape string syntax for backslashes, e.g., E'\\\\'."
-msgstr "Ters taksim için escape satır sözdizimini kullanın, örneğin, E'\\\\'."
-
-#: scan.l:1159
-msgid "nonstandard use of escape in a string literal"
-msgstr "string literal içinde standart olmayan escape kullanımı"
-
-#: scan.l:1160
-msgid ""
-"Use the escape string syntax for escapes, e.g., E'\\r\\n"
-"'."
-msgstr ""
-"Escape için standart sözdizimini kullanın, örneğin, E'\\r\\n"
-"'."
-
-#: port/win32/signal.c:189
-#, c-format
-msgid "could not create signal listener pipe for pid %d: error code %d"
-msgstr "signal listener pipe oluşturulamadı: %d: hata kodu %d"
-
-#: port/win32/signal.c:269
-#, c-format
-msgid "could not create signal listener pipe: error code %d; retrying\n"
-msgstr "signal listener pipe oluşturulamadı: %d; yeniden deneniyor\n"
-
-#: port/win32/signal.c:282
-#, c-format
-msgid "could not create signal dispatch thread: error code %d\n"
-msgstr "signal dispatch thread oluşturulamıyor: hata kodu %d\n"
-
-#: port/win32/security.c:43
-#, c-format
-msgid "could not open process token: error code %d\n"
-msgstr "open process token açma başarısız: hata kodu %d\n"
-
-#: port/win32/security.c:63
-#, c-format
-msgid "could not get SID for Administrators group: error code %d\n"
-msgstr "Administrators grubunun SID numarası alınamadı: hata kodu %d\n"
-
-#: port/win32/security.c:72
-#, c-format
-msgid "could not get SID for PowerUsers group: error code %d\n"
-msgstr "PowerUsers grubunun SID numarası alınamadı: %d\n"
-
-#: port/sysv_sema.c:114
-#: port/pg_sema.c:114
-#, c-format
-msgid "could not create semaphores: %m"
-msgstr "semaphores oluşturma hatası: %m"
-
-#: port/sysv_sema.c:115
-#: port/pg_sema.c:115
-#, c-format
-msgid "Failed system call was semget(%lu, %d, 0%o)."
-msgstr "Başarısız çağrı: semget(%lu, %d, 0%o)."
-
-#: port/sysv_sema.c:119
-#: port/pg_sema.c:119
-#, c-format
-msgid ""
-"This error does *not* mean that you have run out of disk space.\n"
-"It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about configuring your system for PostgreSQL."
-msgstr ""
-"Bu hata mesajı yeterli boş disk alanı kalmadığı anlamına gelmiyor .\n"
-"Bu durum, sistemin semaphore set (SEMMNI) veya semaphore (SEMMNS) sayı sınırlaması aşmasında meydana gelmektedir.  Belirtilen parametrelerin değerleri yükseltmelisiniz.  Başka seçeneğiniz ise PostgerSQL sisteminin semaphore tütekitimini max_connections parametresini şu an %d) düşürerek azaltabilirsiniz.\n"
-"PostgreSQL dokümanlarında bu konu ile ilgili daha ayrıntılı açıklama ve konfigurasyon hakkında bilgileri bulabilirsiniz."
-
-#: port/sysv_sema.c:148
-#: port/pg_sema.c:148
-#, c-format
-msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
-msgstr "Kernel SEMVMX değerini en az %d değerine kadar çıkartmalısınız.  Daha fazla bilgi için PostgreSQL dokümanlarına bakın."
-
-#: port/win32_sema.c:94
-#, c-format
-msgid "could not create semaphore: error code %d"
-msgstr "semaphore oluşturma hatası: hata kodu %d"
-
-#: port/win32_sema.c:161
-#, c-format
-msgid "could not lock semaphore: error code %d"
-msgstr "lock semaphore başarısız: hata kodu %d"
-
-#: port/win32_sema.c:174
-#, c-format
-msgid "could not unlock semaphore: error code %d"
-msgstr "unlock semaphore başarısız: hata kodu %d"
-
-#: port/win32_sema.c:203
-#, c-format
-msgid "could not try-lock semaphore: error code %d"
-msgstr "try-lock semaphore başarısız: hata kodu %d"
-
-#: port/sysv_shmem.c:99
-#: port/pg_shmem.c:99
-#, c-format
-msgid "could not create shared memory segment: %m"
-msgstr "shared memory segment oluşturulamıyor: %m"
-
-#: port/sysv_shmem.c:100
-#: port/pg_shmem.c:100
-#, c-format
-msgid "Failed system call was shmget(key=%lu, size=%lu, 0%o)."
-msgstr "Başarısız sistem çağrısı: shmget(key=%lu, size=%lu, 0%o)."
-
-#: port/sysv_shmem.c:104
-#: port/pg_shmem.c:104
-#, c-format
-msgid ""
-"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMMAX.  To reduce the request size (currently %lu bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
-"If the request size is already small, it's possible that it is less than your kernel's SHMMIN parameter, in which case raising the request size or reconfiguring SHMMIN is called for.\n"
-"The PostgreSQL documentation contains more information about shared memory configuration."
-msgstr ""
-"Bu hata, PostgreSQL'in shared memory isteğinin çekirdeğin SHMMAX parametresinde verilen değerinin aşıldığını gösteriyor. İstenilen bellek boyutunu düşürebilir ya da çekirdeği daha büyük bir SHMMAX parametresi ile yeniden yapılandırabilirsiniz. İstenilen bellek boyutunu (şu an %lu bayt) düşürmek için PostgreSQL'in shared_buffers parametresini (şu an %d) ve/veya max_connections (şu an %d) parametrelerini düşürebilirsiniz.\n"
-" Eğer istenilen bellek boyutu zaten küçük ise, çekirdeğin SHMMIN parametresinden düşük olabilir; bu durumda istenilen bellek boyutunu SHMMIN değerine kadar büyütmeniz ya da SHMMIN değerini düşürmeniz gerekli.PostgreSQL belgelerinde shared memory yapılandırılması hakkında daha fazla bilgi bulabilirsiniz."
-
-#: port/sysv_shmem.c:117
-#: port/pg_shmem.c:117
-#, c-format
-msgid ""
-"This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory or swap space. To reduce the request size (currently %lu bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory configuration."
-msgstr ""
-"Bu hata genellikle PostgreSQL'in shared kullanımı boş takas alanını aştığı zaman ortaya çıkıyor. İstenilen bellek bouytu (şu an %lu bayt) düşürmek için, PostgreSQL'in shared_buffers (şu an %d) ve/veya max_connections (şu an %d) parametrelerini düşürün.\n"
-"PostgreSQL dokümanlarında shared memory yapılandırması hakkında daha fazla bilgi bulabilirsiniz."
-
-#: port/sysv_shmem.c:126
-#: port/pg_shmem.c:126
-#, c-format
-msgid ""
-"This error does *not* mean that you have run out of disk space. It occurs either if all available shared memory IDs have been taken, in which case you need to raise the SHMMNI parameter in your kernel, or because the system's overall limit for shared memory has been reached.  If you cannot increase the shared memory limit, reduce PostgreSQL's shared memory request (currently %lu bytes), by reducing its shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory configuration."
-msgstr ""
-"Bu hata mesajı yeterli boş disk alanı kalmadığı anlamına gelmiyor . Bu durum, tüm shared memory ID alınmış olduğu zamanda -- ki bu durumda SHMMNI parametresinin değerleri yükseltmelisiniz; ya da sistemin shared memory sınırına ulaşıldığı zamanda oluşur. Shared memory sınırını yükseltemezseniz, PostgreSQL sisteminin shared memory tüketimini (şu an %lu bayt) shared_buffers (şu an %d) ve/veya max_connections parametresini (şu an %d) düşürerek azaltabilirsiniz.\n"
-"PostgreSQL belgelerinde bu konu ile ilgili daha ayrıntılı açıklama ve yapılandırma hakkında bilgileri bulabilirsiniz."
-
-#: port/sysv_shmem.c:381
-#: port/pg_shmem.c:381
-#, c-format
-msgid "could not stat data directory \"%s\": %m"
-msgstr "\"%s\" veri dizin hakkında bilgi alınamadı: %m"
-
-#: port/win32_shmem.c:158
-#: port/win32_shmem.c:193
-#: port/win32_shmem.c:214
-#, c-format
-msgid "could not create shared memory segment: %lu"
-msgstr "shared memory segment oluşturulamıyor: %lu"
-
-#: port/win32_shmem.c:159
-#, fuzzy, c-format
-msgid "Failed system call was CreateFileMapping(size=%lu, name=%s)."
-msgstr "Başarısız sistem çağrısı: CreateFileMapping(size=%lu, name=%s)"
-
-#: port/win32_shmem.c:183
-msgid "pre-existing shared memory block is still in use"
-msgstr "daha önce tanımlanmış shared memory bloğu hala kullanılmaktadır"
-
-#: port/win32_shmem.c:184
-msgid "Check if there are any old server processes still running, and terminate them."
-msgstr "Hala çalışan sunucu süreçleri bulun ve varsa sonlandırın."
-
-#: port/win32_shmem.c:194
-#, fuzzy
-msgid "Failed system call was DuplicateHandle."
-msgstr "Başarısız çağrı: DuplicateHandle"
-
-#: port/win32_shmem.c:215
-#, fuzzy
-msgid "Failed system call was MapViewOfFileEx."
-msgstr "Başarısız çağrı: MapViewOfFileEx"
-
-#: postmaster/autovacuum.c:365
-#, c-format
-msgid "could not fork autovacuum launcher process: %m"
-msgstr "vacuum süreci fork edilemedi: %m"
-
-#: postmaster/autovacuum.c:529
-msgid "autovacuum launcher started"
-msgstr "otomatik vacuum başlatma süreci çalıştırıldı"
-
-#: postmaster/autovacuum.c:760
-msgid "autovacuum launcher shutting down"
-msgstr "otomatik vacuum başlatma süreci kapatılıyor"
-
-#: postmaster/autovacuum.c:1426
-#, fuzzy, c-format
-msgid "could not fork autovacuum worker process: %m"
-msgstr "Otomatik vacuum süreci fork edilemedi: %m"
-
-#: postmaster/autovacuum.c:1628
-#, c-format
-msgid "autovacuum: processing database \"%s\""
-msgstr "autovacuum: \"%s\" veritabanı işleniyor"
-
-#: postmaster/autovacuum.c:2000
-#, fuzzy, c-format
-msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
-msgstr "autovacuum: \"%s\" veritabanı işleniyor"
-
-#: postmaster/autovacuum.c:2012
-#, fuzzy, c-format
-msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
-msgstr "autovacuum: \"%s\" veritabanı işleniyor"
-
-#: postmaster/autovacuum.c:2273
-#, c-format
-msgid "automatic vacuum of table \"%s.%s.%s\""
-msgstr "\"%s.%s.%s\" tablosunun otomatik vacuum'u"
-
-#: postmaster/autovacuum.c:2276
-#, c-format
-msgid "automatic analyze of table \"%s.%s.%s\""
-msgstr "\"%s.%s.%s\" tablosunun otomatik analizi"
-
-#: postmaster/autovacuum.c:2738
-msgid "autovacuum not started because of misconfiguration"
-msgstr "geçersiz ayarlarından dolayı autovacuum çalıştırılamadı"
-
-#: postmaster/autovacuum.c:2739
-msgid "Enable the \"track_counts\" option."
-msgstr "\"track_counts\" seçeneği etkinleştir."
-
-#: postmaster/autovacuum.c:2795
-msgid "not enough shared memory for autovacuum"
-msgstr "otomatik vacuum için shared memory yeterli değildir"
-
-#: postmaster/bgwriter.c:462
-#, fuzzy, c-format
-msgid "checkpoints are occurring too frequently (%d second apart)"
-msgid_plural "checkpoints are occurring too frequently (%d seconds apart)"
-msgstr[0] "checkpoint işlemi çok sık çağırılıyor (%d saniye aralıkla)"
-msgstr[1] "checkpoint işlemi çok sık çağırılıyor (%d saniye aralıkla)"
-
-#: postmaster/bgwriter.c:466
-msgid "Consider increasing the configuration parameter \"checkpoint_segments\"."
-msgstr "\"checkpoint_segments\" yapılandırma parametresi ile bu aralığı büyütebilirsiniz."
-
-#: postmaster/bgwriter.c:575
-#, c-format
-msgid "transaction log switch forced (archive_timeout=%d)"
-msgstr "transaction log switch forced (archive_timeout=%d)"
-
-#: postmaster/bgwriter.c:883
-msgid "not enough shared memory for background writer"
-msgstr "arka planı writer için shared memory yeterli değildir"
-
-#: postmaster/bgwriter.c:1031
-msgid "checkpoint request failed"
-msgstr "checkpoint isteği başarısız"
-
-#: postmaster/bgwriter.c:1032
-msgid "Consult recent messages in the server log for details."
-msgstr "Ayrıntılar için sunucu günlük dosyasına bakın."
-
-#: postmaster/pgarch.c:158
-#, c-format
-msgid "could not fork archiver: %m"
-msgstr "archiver başlatılamadı: %m"
-
-#: postmaster/pgarch.c:416
-msgid "archive_mode enabled, yet archive_command is not set"
-msgstr "archive_mode aktiftir, ancak archive_command ayarlanmadı"
-
-#: postmaster/pgarch.c:454
-#, c-format
-msgid "transaction log file \"%s\" could not be archived: too many failures"
-msgstr "transaction log dosyası \"%s\" arşivlenemedi: çok fazla başarısız işlem"
-
-#: postmaster/pgarch.c:557
-#, c-format
-msgid "archive command failed with exit code %d"
-msgstr "arşiv komutu başarısız. Döndürülen kod: %d"
-
-#: postmaster/pgarch.c:559
-#: postmaster/pgarch.c:569
-#: postmaster/pgarch.c:576
-#: postmaster/pgarch.c:582
-#: postmaster/pgarch.c:591
-#, c-format
-msgid "The failed archive command was: %s"
-msgstr "Başarısız arşiv komuyu: %s"
-
-#: postmaster/pgarch.c:566
-#, c-format
-msgid "archive command was terminated by exception 0x%X"
-msgstr "arşiv süreç 0x%X exception tarafından sonlandırıldı"
-
-#: postmaster/pgarch.c:568
-#: postmaster/postmaster.c:2662
-#, fuzzy
-msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
-msgstr "Bu hex değerin tanımlaması için \"ntstatus.h\" dosyasına bakın."
-
-#: postmaster/pgarch.c:573
-#, c-format
-msgid "archive command was terminated by signal %d: %s"
-msgstr "arşiv komutu %d sinyali tarafından sonlandırıldı: %s"
-
-#: postmaster/pgarch.c:580
-#, c-format
-msgid "archive command was terminated by signal %d"
-msgstr "arşiv komutu %d sinyali tarafından sonlandırıldı"
-
-#: postmaster/pgarch.c:589
-#, c-format
-msgid "archive command exited with unrecognized status %d"
-msgstr "arşiv komutu beklenmeyen durum ile sonlandırıldı %d"
-
-#: postmaster/pgarch.c:601
-#, c-format
-msgid "archived transaction log file \"%s\""
-msgstr "arşivlenen transaction kayıt dosyası \"%s\""
-
-#: postmaster/pgarch.c:650
-#, c-format
-msgid "could not open archive status directory \"%s\": %m"
-msgstr "arşiv durum dizini \"%s\" açılamıyor: %m"
-
-#: postmaster/pgstat.c:323
-#, c-format
-msgid "could not resolve \"localhost\": %s"
-msgstr "\"localhost\" adresi çözümlenemedi: %s"
-
-#: postmaster/pgstat.c:346
-msgid "trying another address for the statistics collector"
-msgstr "istatistik toplayıcı süreci için başka bir adres deneniyor"
-
-#: postmaster/pgstat.c:355
-#, c-format
-msgid "could not create socket for statistics collector: %m"
-msgstr "istatistik toplayıcı soket oluşturma hatası: %m"
-
-#: postmaster/pgstat.c:367
-#, c-format
-msgid "could not bind socket for statistics collector: %m"
-msgstr "istatistik toplayıcı soket bind hatası: %m"
-
-#: postmaster/pgstat.c:378
-#, c-format
-msgid "could not get address of socket for statistics collector: %m"
-msgstr "istatistik toplayıcı sürecinin soket adresi alınamadı: %m"
-
-#: postmaster/pgstat.c:394
-#, c-format
-msgid "could not connect socket for statistics collector: %m"
-msgstr "istatistik toplayıcı soket bağlama hatası: %m"
-
-#: postmaster/pgstat.c:415
-#, c-format
-msgid "could not send test message on socket for statistics collector: %m"
-msgstr "istatistik toplayıcı sürecine test mesajı gönderme hatası: %m"
-
-#: postmaster/pgstat.c:441
-#: postmaster/pgstat.c:2744
-#, c-format
-msgid "select() failed in statistics collector: %m"
-msgstr "istatistik toplayıcı sürecinde select() hatası: %m"
-
-#: postmaster/pgstat.c:456
-msgid "test message did not get through on socket for statistics collector"
-msgstr "istatistik toplayıcı sürecine test mesajı gönderilemedi"
-
-#: postmaster/pgstat.c:471
-#, c-format
-msgid "could not receive test message on socket for statistics collector: %m"
-msgstr "istatistik toplayıcı süreci deneme mesajı alma hatası: %m"
-
-#: postmaster/pgstat.c:481
-msgid "incorrect test message transmission on socket for statistics collector"
-msgstr "istatistik toplayıcı soket aracılığı ile mesaj gönderme hatası"
-
-#: postmaster/pgstat.c:504
-#, c-format
-msgid "could not set statistics collector socket to nonblocking mode: %m"
-msgstr "istatistik toplayıcı soketi nonblocking durumuna getirilemedi: %m"
-
-#: postmaster/pgstat.c:514
-msgid "disabling statistics collector for lack of working socket"
-msgstr "çalışan socket olmadığından istatistik toplayıcı iptal edildi"
-
-#: postmaster/pgstat.c:616
-#, c-format
-msgid "could not fork statistics collector: %m"
-msgstr "istatistik toplayıcı başlatılamıyor: %m"
-
-#: postmaster/pgstat.c:1144
-msgid "must be superuser to reset statistics counters"
-msgstr "istatistik sayaçlarını sadece veritabanı superuserı sıfırlayabilir"
-
-#: postmaster/pgstat.c:2723
-#, c-format
-msgid "poll() failed in statistics collector: %m"
-msgstr "istatistik toplayıcı sürecinde poll() hatası: %m"
-
-#: postmaster/pgstat.c:2768
-#, c-format
-msgid "could not read statistics message: %m"
-msgstr "istatistik mesajı okunamadı: %m"
-
-#: postmaster/pgstat.c:2967
-#, c-format
-msgid "could not open temporary statistics file \"%s\": %m"
-msgstr "geçici istatistik dosyası \"%s\" açılamıyor: %m"
-
-#: postmaster/pgstat.c:3039
-#, c-format
-msgid "could not write temporary statistics file \"%s\": %m"
-msgstr "geçici istatistik dosyasına \"%s\" yazılamıyor: %m"
-
-#: postmaster/pgstat.c:3048
-#, c-format
-msgid "could not close temporary statistics file \"%s\": %m"
-msgstr "geçici istatistik dosyası \"%s\" açılamıyor: %m"
-
-#: postmaster/pgstat.c:3056
-#, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "geçici istatistik dosyasının adı değiştirilemiyor eski: \"%s\" yeni: \"%s\": %m"
-
-#: postmaster/pgstat.c:3144
-#: postmaster/pgstat.c:3154
-#: postmaster/pgstat.c:3176
-#: postmaster/pgstat.c:3190
-#: postmaster/pgstat.c:3252
-#: postmaster/pgstat.c:3269
-#: postmaster/pgstat.c:3284
-#: postmaster/pgstat.c:3301
-#: postmaster/pgstat.c:3316
-msgid "corrupted pgstat.stat file"
-msgstr "bozuk pgstat.stat dosyası"
-
-#: postmaster/pgstat.c:3657
-msgid "database hash table corrupted during cleanup --- abort"
-msgstr "veritabanı %d için tablolar hash tablosu temizleme sırasında bozulmuştur --- iptal"
-
-#: postmaster/postmaster.c:543
-#, c-format
-msgid "%s: invalid argument for option -f: \"%s\"\n"
-msgstr "%s: -f seçeneği için geçersiz parametre: \"%s\"\n"
-
-#: postmaster/postmaster.c:629
-#, c-format
-msgid "%s: invalid argument for option -t: \"%s\"\n"
-msgstr "%s: -t seçeneği için geçersiz parametre: \"%s\"\n"
-
-#: postmaster/postmaster.c:680
-#, c-format
-msgid "%s: invalid argument: \"%s\"\n"
-msgstr "%s: geçersiz parametre: \"%s\"\n"
-
-#: postmaster/postmaster.c:705
-#, c-format
-msgid "%s: superuser_reserved_connections must be less than max_connections\n"
-msgstr "%s: superuser_reserved_connections parametresi, max_connections parametresinden küçük olmalıdır\n"
-
-#: postmaster/postmaster.c:715
-#, c-format
-msgid "%s: invalid datetoken tables, please fix\n"
-msgstr "%s: datetoken tabloları bozuk, lütfen düzeltin\n"
-
-#: postmaster/postmaster.c:821
-msgid "invalid list syntax for \"listen_addresses\""
-msgstr "\"listen_addresses\" için geçersiz sözdizimi"
-
-#: postmaster/postmaster.c:842
-#, c-format
-msgid "could not create listen socket for \"%s\""
-msgstr "\"%s\" için socket oluşturma hatası"
-
-#: postmaster/postmaster.c:848
-msgid "could not create any TCP/IP sockets"
-msgstr "TCP/IP socket oluşturma hatası"
-
-#: postmaster/postmaster.c:875
-msgid "could not create Unix-domain socket"
-msgstr "UNIX-domani socket oluşturma hatası"
-
-#: postmaster/postmaster.c:883
-msgid "no socket created for listening"
-msgstr "dinlemek için socket oluşturulmadı"
-
-#: postmaster/postmaster.c:906
-#: postmaster/postmaster.c:3236
-#, fuzzy
-msgid "could not load pg_hba.conf"
-msgstr "wldap32.dll yüklenemedi"
-
-#: postmaster/postmaster.c:923
-#, fuzzy
-msgid "could not create I/O completion port for child queue"
-msgstr "\"%s\" için socket oluşturma hatası"
-
-#: postmaster/postmaster.c:967
-#, c-format
-msgid "%s: could not write external PID file \"%s\": %s\n"
-msgstr "%s: harici PID dosyası \"%s\" yazılamadı: %s\n"
-
-#: postmaster/postmaster.c:1068
-#, c-format
-msgid "%s: could not locate matching postgres executable"
-msgstr "%s: uygun postgres çalıştırma dosysı bulunamadı"
-
-#: postmaster/postmaster.c:1119
-#, c-format
-msgid "data directory \"%s\" does not exist"
-msgstr "veritabanı deizini \"%s\" mevcut değil"
-
-#: postmaster/postmaster.c:1124
-#, c-format
-msgid "could not read permissions of directory \"%s\": %m"
-msgstr "\"%s\" dizininin erişim haklarını okunamıyor: %m"
-
-#: postmaster/postmaster.c:1132
-#, fuzzy, c-format
-msgid "specified data directory \"%s\" is not a directory"
-msgstr "veritabanı deizini \"%s\" mevcut değil"
-
-#: postmaster/postmaster.c:1148
-#, c-format
-msgid "data directory \"%s\" has wrong ownership"
-msgstr "\"%s\" veritabanı dizininin erişim hakları yalnıştır"
-
-#: postmaster/postmaster.c:1150
-msgid "The server must be started by the user that owns the data directory."
-msgstr "Sunucu, veri dizini sahip kullanıcı tarafından başlatılmalıdır."
-
-#: postmaster/postmaster.c:1170
-#, c-format
-msgid "data directory \"%s\" has group or world access"
-msgstr "veritabanı dizini \"%s\" gruba ve herkese erişime açıktır"
-
-#: postmaster/postmaster.c:1172
-msgid "Permissions should be u=rwx (0700)."
-msgstr "Erişim hakları u=rwx (0700) olmalıdır."
-
-#: postmaster/postmaster.c:1183
-#, c-format
-msgid ""
-"%s: could not find the database system\n"
-"Expected to find it in the directory \"%s\",\n"
-"but could not open file \"%s\": %s\n"
-msgstr ""
-"%s: veritabanı sistemi bulamamaktadır.\n"
-"\"%s\" klasöründe arama yapılmıştır,\n"
-"ancak \"%s\" dosyası bulunamamıştır: %s\n"
-
-#: postmaster/postmaster.c:1218
-#, c-format
-msgid "%s: could not fork background process: %s\n"
-msgstr "%s: artalan süreci başlatma hatası: %s\n"
-
-#: postmaster/postmaster.c:1239
-#, c-format
-msgid "%s: could not dissociate from controlling TTY: %s\n"
-msgstr "%s: control TTY ile bağlantı kesilemiyor: %s\n"
-
-#: postmaster/postmaster.c:1319
-#, c-format
-msgid "select() failed in postmaster: %m"
-msgstr "postmaster içinde select() başarısız: %m"
-
-#: postmaster/postmaster.c:1468
-#: postmaster/postmaster.c:1499
-msgid "incomplete startup packet"
-msgstr "baÅŸlatma paketi eksik"
-
-#: postmaster/postmaster.c:1480
-msgid "invalid length of startup packet"
-msgstr "başlatma paketinin uzunluğu geçirsiz"
-
-#: postmaster/postmaster.c:1536
-#, c-format
-msgid "failed to send SSL negotiation response: %m"
-msgstr "SSL görüşme cevabı gönderme başarısız: %m"
-
-#: postmaster/postmaster.c:1565
-#, c-format
-msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
-msgstr "frontend protokolü %u.%u desteklenememktedir: sunucunun desteklediği protokolleri %u.0 ila %u.%u arasında"
-
-#: postmaster/postmaster.c:1629
-msgid "invalid startup packet layout: expected terminator as last byte"
-msgstr "geçersiz sartup packet düzeni: son bayt bir sonlandırıcı olmalıdır"
-
-#: postmaster/postmaster.c:1657
-msgid "no PostgreSQL user name specified in startup packet"
-msgstr "başlatma paketinde PostgreSQL kullanıcı adı belirtilmemiştir"
-
-#: postmaster/postmaster.c:1710
-msgid "the database system is starting up"
-msgstr "veritabanı başlatılıyor"
-
-#: postmaster/postmaster.c:1715
-msgid "the database system is shutting down"
-msgstr "veritabanı kapatılıyor"
-
-#: postmaster/postmaster.c:1720
-msgid "the database system is in recovery mode"
-msgstr "veritabanı kurtarma modundadır"
-
-#: postmaster/postmaster.c:1787
-#, fuzzy, c-format
-msgid "wrong key in cancel request for process %d"
-msgstr "%d sürecinin iptal isteminde geçersiz anahtar"
-
-#: postmaster/postmaster.c:1795
-#, fuzzy, c-format
-msgid "PID %d in cancel request did not match any process"
-msgstr "%d sürecinin iptal isteminde geçersiz pid"
-
-#: postmaster/postmaster.c:1987
-msgid "received SIGHUP, reloading configuration files"
-msgstr "SIGHUP sinyali alınmıştır, yapılandırma dosyaları yeniden okunuyor"
-
-#: postmaster/postmaster.c:2008
-msgid "pg_hba.conf not reloaded"
-msgstr "pg_hba.conf yeniden yüklenmedi"
-
-#: postmaster/postmaster.c:2051
-msgid "received smart shutdown request"
-msgstr "akıllı kapatma isteği alındı"
-
-#: postmaster/postmaster.c:2087
-msgid "received fast shutdown request"
-msgstr "hızlı kapatma isteği alındı"
-
-#: postmaster/postmaster.c:2101
-msgid "aborting any active transactions"
-msgstr "aktif transactionlar iptal ediliyor"
-
-#: postmaster/postmaster.c:2129
-msgid "received immediate shutdown request"
-msgstr "immediate shutdown isteği alındı"
-
-#: postmaster/postmaster.c:2203
-#: postmaster/postmaster.c:2231
-msgid "startup process"
-msgstr "başlatma süreci"
-
-#: postmaster/postmaster.c:2206
-msgid "aborting startup due to startup process failure"
-msgstr "başlatma süreci hatası nedeniyle başlatma süreci durdurulmuştır"
-
-#: postmaster/postmaster.c:2271
-msgid "database system is ready to accept connections"
-msgstr "veritabanı sunucusu bağlantı kabul etmeye hazır"
-
-#: postmaster/postmaster.c:2323
-msgid "background writer process"
-msgstr "background writer süreci"
-
-#: postmaster/postmaster.c:2339
-msgid "WAL writer process"
-msgstr "WAL yazma süreci"
-
-#: postmaster/postmaster.c:2354
-msgid "autovacuum launcher process"
-msgstr "otomatik vacuum başlatma süreci"
-
-#: postmaster/postmaster.c:2368
-msgid "archiver process"
-msgstr "arşivleyici süreci"
-
-#: postmaster/postmaster.c:2386
-msgid "statistics collector process"
-msgstr "istatistik toplama süreci"
-
-#: postmaster/postmaster.c:2400
-msgid "system logger process"
-msgstr "logger süreci"
-
-#: postmaster/postmaster.c:2435
-#: postmaster/postmaster.c:2445
-#: postmaster/postmaster.c:2463
-msgid "server process"
-msgstr "sunucu süreci"
-
-#: postmaster/postmaster.c:2499
-msgid "terminating any other active server processes"
-msgstr "diğer aktif sunucu süreçleri durduruluyor"
-
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2651
-#, c-format
-msgid "%s (PID %d) exited with exit code %d"
-msgstr "%s (PID %d) exit code %d ile sonlandı"
-
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2660
-#, c-format
-msgid "%s (PID %d) was terminated by exception 0x%X"
-msgstr "%s (PID %d) 0x%X exception tarafından sonlandırıldı"
-
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2669
-#, c-format
-msgid "%s (PID %d) was terminated by signal %d: %s"
-msgstr "%s (PID %d) %d sinyali tarafından sonlandırıldı: %s"
-
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2679
-#, c-format
-msgid "%s (PID %d) was terminated by signal %d"
-msgstr "%s (PID %d) %d sinyali tarafından sonlandırıldı"
-
-#. translator: %s is a noun phrase describing a child process, such as
-#. "server process"
-#: postmaster/postmaster.c:2688
-#, c-format
-msgid "%s (PID %d) exited with unrecognized status %d"
-msgstr "%s (PID %d) tanınmayan status kodu ile sonlandırıldı %d"
-
-#: postmaster/postmaster.c:2825
-msgid "abnormal database system shutdown"
-msgstr "veritabanı sistemi olağandışı kapandı"
-
-#: postmaster/postmaster.c:2857
-msgid "all server processes terminated; reinitializing"
-msgstr "tüm sunucu süreçleri durduruldu; yeniden ilklendiriliyor"
-
-#: postmaster/postmaster.c:3020
-#, c-format
-msgid "could not fork new process for connection: %m"
-msgstr "bağlantı için yeni süreç başlatılamadı: %m"
-
-#: postmaster/postmaster.c:3062
-msgid "could not fork new process for connection: "
-msgstr "bağlantı için yeni süreç başlatılamadı:"
-
-#: postmaster/postmaster.c:3202
-#, c-format
-msgid "connection received: host=%s%s%s"
-msgstr "bağlantı alındı: istemci=%s%s%s"
-
-#: postmaster/postmaster.c:3281
-#, c-format
-msgid "connection authorized: user=%s database=%s"
-msgstr "bağlantı tanımı: kullanıcı=%s veritabanı=%s"
-
-#: postmaster/postmaster.c:3521
-#, c-format
-msgid "could not execute server process \"%s\": %m"
-msgstr "\"%s\" sunucu süreci başlatma hatası: %m"
-
-#: postmaster/postmaster.c:4023
-#, fuzzy
-msgid "database system is in consistent recovery mode"
-msgstr "veritabanı kurtarma modundadır"
-
-#: postmaster/postmaster.c:4240
-#, c-format
-msgid "could not fork startup process: %m"
-msgstr "başlatma süreci fork edilemedi: %m"
-
-#: postmaster/postmaster.c:4244
-#, c-format
-msgid "could not fork background writer process: %m"
-msgstr "background writer süreci başlatılamadı: %m"
-
-#: postmaster/postmaster.c:4248
-#, c-format
-msgid "could not fork WAL writer process: %m"
-msgstr "WAL yazıcı süreci başlatılamadı: %m"
-
-#: postmaster/postmaster.c:4252
-#, c-format
-msgid "could not fork process: %m"
-msgstr "süreç başlatma hatası: %m"
-
-#: postmaster/postmaster.c:4524
-#, c-format
-msgid "could not duplicate socket %d for use in backend: error code %d"
-msgstr "backend içinde kullanılacak duplicate socket %d oluşturulamadı: hata kodu %d"
-
-#: postmaster/postmaster.c:4553
-#, c-format
-msgid "could not create inherited socket: error code %d\n"
-msgstr "inherited socket oluşturulamıyor: hata kodu %d\n"
-
-#: postmaster/postmaster.c:4582
-#: postmaster/postmaster.c:4589
-#, c-format
-msgid "could not read from backend variables file \"%s\": %s\n"
-msgstr "\"%s\" backend parametreler dosyasından okunamıyor: %s\n"
-
-#: postmaster/postmaster.c:4598
-#, c-format
-msgid "could not remove file \"%s\": %s\n"
-msgstr "\"%s\" dosyası silinemedi: %s\n"
-
-#: postmaster/postmaster.c:4611
-#, c-format
-msgid "could not map view of backend variables: error code %d\n"
-msgstr "backend değişkenleri map view hatası: hata kodu: %d\n"
-
-#: postmaster/postmaster.c:4620
-#, c-format
-msgid "could not unmap view of backend variables: error code %d\n"
-msgstr "backend değişkenleri unmap view hatası: hata kodu: %d\n"
-
-#: postmaster/postmaster.c:4627
-#, c-format
-msgid "could not close handle to backend parameter variables: error code %d\n"
-msgstr "backend parameter değişkenler tanıtıcısı kapatılamadı: hata kodu %d\n"
-
-#: postmaster/postmaster.c:4773
-msgid "could not read exit code for process\n"
-msgstr "Sürecin çıkış kodu okunamadı\n"
-
-#: postmaster/postmaster.c:4778
-#, fuzzy
-msgid "could not post child completion status\n"
-msgstr "SSL bağlantı alınamıyor: %s"
-
-#: postmaster/syslogger.c:383
-#, c-format
-msgid "select() failed in logger process: %m"
-msgstr "logger süreci içerisinde select() hatası: %m"
-
-#: postmaster/syslogger.c:395
-#: postmaster/syslogger.c:959
-#, c-format
-msgid "could not read from logger pipe: %m"
-msgstr "syslog pipe okuma hatası: %m"
-
-#: postmaster/syslogger.c:434
-msgid "logger shutting down"
-msgstr "loglama süreci kapatılıyor"
-
-#: postmaster/syslogger.c:478
-#: postmaster/syslogger.c:492
-#, c-format
-msgid "could not create pipe for syslog: %m"
-msgstr "syslog için pipe oluşturulamadı: %m"
-
-#: postmaster/syslogger.c:512
-#: postmaster/syslogger.c:996
-#, c-format
-msgid "could not create log file \"%s\": %m"
-msgstr "\"%s\" günlük dosyası oluşturma hatası: %m"
-
-#: postmaster/syslogger.c:527
-#, c-format
-msgid "could not fork system logger: %m"
-msgstr "sistem loglayıcı başlatma hatası: %m"
-
-#: postmaster/syslogger.c:558
-#, c-format
-msgid "could not redirect stdout: %m"
-msgstr "stdout yönlendirilmesi yapılamadı: %m"
-
-#: postmaster/syslogger.c:563
-#: postmaster/syslogger.c:581
-#, c-format
-msgid "could not redirect stderr: %m"
-msgstr "stderr yönlendirilmesi yapılamadı: %m"
-
-#: postmaster/syslogger.c:924
-#, c-format
-msgid "could not write to log file: %s\n"
-msgstr "log dosyası yazma hatası: %s\n"
-
-#: postmaster/syslogger.c:1071
-#: postmaster/syslogger.c:1133
-#, c-format
-msgid "could not open new log file \"%s\": %m"
-msgstr "yeni kayıt dosyası \"%s\" açma hatası: %m"
-
-#: postmaster/syslogger.c:1083
-#: postmaster/syslogger.c:1145
-msgid "disabling automatic rotation (use SIGHUP to reenable)"
-msgstr "otomatik dönüşüm etkisiz (yeniden yetkilendirmek için SIGHUP kullanın)"
-
-#: rewrite/rewriteDefine.c:109
-#: rewrite/rewriteDefine.c:759
-#, c-format
-msgid "rule \"%s\" for relation \"%s\" already exists"
-msgstr "\"%s\" kuralı(rule), \"%s\" nesnesi için zaten mevcut"
-
-#: rewrite/rewriteDefine.c:283
-msgid "rule actions on OLD are not implemented"
-msgstr "OLD için rule eylemleri implement edilmemiş"
-
-#: rewrite/rewriteDefine.c:284
-msgid "Use views or triggers instead."
-msgstr "Bunun yerine view veya trigger kullanın."
-
-#: rewrite/rewriteDefine.c:288
-msgid "rule actions on NEW are not implemented"
-msgstr "NEW için rule eylemleri implement edilmemiş"
-
-#: rewrite/rewriteDefine.c:289
-msgid "Use triggers instead."
-msgstr "Bunun yerine lütfen triggerleri kullanın."
-
-#: rewrite/rewriteDefine.c:302
-msgid "INSTEAD NOTHING rules on SELECT are not implemented"
-msgstr "SELECT üzerinde INSTEAD NOTHING rule implement edilmemiştir"
-
-#: rewrite/rewriteDefine.c:303
-msgid "Use views instead."
-msgstr "Lütfen yerine viewları kullanın"
-
-#: rewrite/rewriteDefine.c:311
-msgid "multiple actions for rules on SELECT are not implemented"
-msgstr "SELECT rule'ler için birden fazla eylem tanımlanma implement edilmemiştir"
-
-#: rewrite/rewriteDefine.c:323
-msgid "rules on SELECT must have action INSTEAD SELECT"
-msgstr "SELECT rule tanımları INSTEAD SELECT öğesini taşımak zorundadır"
-
-#: rewrite/rewriteDefine.c:331
-msgid "event qualifications are not implemented for rules on SELECT"
-msgstr "SELECT rule'ler için olay tanımları implement edilmemiştir"
-
-#: rewrite/rewriteDefine.c:356
-#, c-format
-msgid "\"%s\" is already a view"
-msgstr "\"%s\" zanten bir view'dur"
-
-#: rewrite/rewriteDefine.c:380
-#, c-format
-msgid "view rule for \"%s\" must be named \"%s\""
-msgstr "rule \"%s\" için view'nun adını \"%s\" olarak değiştirilmelidir"
-
-#: rewrite/rewriteDefine.c:405
-#, c-format
-msgid "could not convert table \"%s\" to a view because it is not empty"
-msgstr "\"%s\" tablosu boş olmadığı için vew'a çevirilemedi"
-
-#: rewrite/rewriteDefine.c:412
-#, c-format
-msgid "could not convert table \"%s\" to a view because it has triggers"
-msgstr "\"%s\" tablosuna bağlı trigger bulunduğu için vew'a çevirilemedi"
-
-#: rewrite/rewriteDefine.c:414
-msgid "In particular, the table cannot be involved in any foreign key relationships."
-msgstr "Özellikle, tablo, foreign key ilişkilerinde kullanılamaz."
-
-#: rewrite/rewriteDefine.c:419
-#, c-format
-msgid "could not convert table \"%s\" to a view because it has indexes"
-msgstr "\"%s\" tablosuna bağlı index bulunduğu için vew'a çevirilemedi"
-
-#: rewrite/rewriteDefine.c:425
-#, c-format
-msgid "could not convert table \"%s\" to a view because it has child tables"
-msgstr "\"%s\" tablosuna bağlı çöcuk tabloları bulunduğu için vew'a çevirilemedi"
-
-#: rewrite/rewriteDefine.c:452
-msgid "cannot have multiple RETURNING lists in a rule"
-msgstr "bir rule içinde birden fazla RETURNING listesi olamaz"
-
-#: rewrite/rewriteDefine.c:457
-msgid "RETURNING lists are not supported in conditional rules"
-msgstr "şartlı rule içinde RETURNING listeleri kullanılamaz"
-
-#: rewrite/rewriteDefine.c:461
-msgid "RETURNING lists are not supported in non-INSTEAD rules"
-msgstr "non-INSTEAD rule içinde RETURNING listeleri kullanılamaz"
-
-#: rewrite/rewriteDefine.c:540
-msgid "SELECT rule's target list has too many entries"
-msgstr "SELECT rule'un hedef öğesi listesinin öğe sayısı fazladır"
-
-#: rewrite/rewriteDefine.c:541
-msgid "RETURNING list has too many entries"
-msgstr "RETURNING listesinde çok fazla öğe vardır"
-
-#: rewrite/rewriteDefine.c:557
-msgid "cannot convert relation containing dropped columns to view"
-msgstr "cannot convert relation containing dropped columns to view"
-
-#: rewrite/rewriteDefine.c:562
-#, c-format
-msgid "SELECT rule's target entry %d has different column name from \"%s\""
-msgstr "SELECT rule'un hedef öğesi %d sütun \"%s\"'dan farklı bir isme sahip"
-
-#: rewrite/rewriteDefine.c:568
-#, c-format
-msgid "SELECT rule's target entry %d has different type from column \"%s\""
-msgstr "SELECT rule'un hedef öğesi %d sütun \"%s\"'dan farklı bir tipe sahip"
-
-#: rewrite/rewriteDefine.c:570
-#, c-format
-msgid "RETURNING list's entry %d has different type from column \"%s\""
-msgstr "RETURNING listesinin %d öğesi \"%s\" sütunun tipinden farklı"
-
-#: rewrite/rewriteDefine.c:585
-#, c-format
-msgid "SELECT rule's target entry %d has different size from column \"%s\""
-msgstr "SELECT rule'un hedef öğesi %d sütun \"%s\"'dan farklı bir boyuta sahip"
-
-#: rewrite/rewriteDefine.c:587
-#, c-format
-msgid "RETURNING list's entry %d has different size from column \"%s\""
-msgstr "RETURNING listesinin %d öğesi \"%s\" sütunun boyutundan farklı"
-
-#: rewrite/rewriteDefine.c:595
-msgid "SELECT rule's target list has too few entries"
-msgstr "SELECT rule'un hedef listesi gereğinden az öğeye sahip"
-
-#: rewrite/rewriteDefine.c:596
-msgid "RETURNING list has too few entries"
-msgstr "RETURNING ifadesinde çok az öğe vardır"
-
-#: rewrite/rewriteManip.c:1012
-msgid "conditional utility statements are not implemented"
-msgstr "Conditional utility statements implement edilmemiÅŸ"
-
-#: rewrite/rewriteManip.c:1213
-msgid "WHERE CURRENT OF on a view is not implemented"
-msgstr "view üzerinde WHERE CURRENT OF implement edilmemiştir"
-
-#: rewrite/rewriteRemove.c:67
-#, c-format
-msgid "rule \"%s\" for relation \"%s\" does not exist, skipping"
-msgstr "\"%s\" rule'ü \"%s\" tablosunda mevcut değil ... atlanıyor"
-
-#: rewrite/rewriteHandler.c:486
-msgid "cannot have RETURNING lists in multiple rules"
-msgstr "RETURNING tümcesi, birden fazla rule içinde kullanılamaz"
-
-#: rewrite/rewriteHandler.c:786
-#: rewrite/rewriteHandler.c:804
-#, c-format
-msgid "multiple assignments to same column \"%s\""
-msgstr "aynı sütun \"%s\" için birden fazla değer atama"
-
-#: rewrite/rewriteHandler.c:1430
-#: rewrite/rewriteHandler.c:1751
-#, c-format
-msgid "infinite recursion detected in rules for relation \"%s\""
-msgstr "\"%s\" tablosuna bağlı rule'de sonsuz özyineleme bulundu"
-
-#: rewrite/rewriteHandler.c:1789
-#, c-format
-msgid "cannot perform INSERT RETURNING on relation \"%s\""
-msgstr "\"%s\" nesnesinde INSERT RETURNING yapılamaz"
-
-#: rewrite/rewriteHandler.c:1791
-msgid "You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."
-msgstr "RETURNING tümcesi olan ON INSERT DO INSTEAD rule gerekmektedir"
-
-#: rewrite/rewriteHandler.c:1796
-#, c-format
-msgid "cannot perform UPDATE RETURNING on relation \"%s\""
-msgstr "\"%s\" nesnesinde UPDATE RETURNING yapılamaz"
-
-#: rewrite/rewriteHandler.c:1798
-msgid "You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."
-msgstr "RETURNING tümcesi olan ON UPDATE DO INSTEAD rule gerekmektedir"
-
-#: rewrite/rewriteHandler.c:1803
-#, c-format
-msgid "cannot perform DELETE RETURNING on relation \"%s\""
-msgstr "\"%s\" nesnesi üzerinde DELETE RETURNING işlemi yapılamaz"
-
-#: rewrite/rewriteHandler.c:1805
-msgid "You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."
-msgstr "Bunu yapmak için şartsız RETURNING tümcesi olan ON DELETE DO INSTEAD rule gerekmetedir."
-
-#: rewrite/rewriteHandler.c:1903
-msgid "cannot insert into a view"
-msgstr "view yazma hatası"
-
-#: rewrite/rewriteHandler.c:1904
-msgid "You need an unconditional ON INSERT DO INSTEAD rule."
-msgstr "ON INSERT DO INSTEAD rule gerekmektedir."
-
-#: rewrite/rewriteHandler.c:1909
-msgid "cannot update a view"
-msgstr "view deÄŸiÅŸtirilemiyor"
-
-#: rewrite/rewriteHandler.c:1910
-msgid "You need an unconditional ON UPDATE DO INSTEAD rule."
-msgstr "ON UPDATE DO INSTEAD rule gerekmektedir."
-
-#: rewrite/rewriteHandler.c:1915
-msgid "cannot delete from a view"
-msgstr "view silme hatası"
-
-#: rewrite/rewriteHandler.c:1916
-msgid "You need an unconditional ON DELETE DO INSTEAD rule."
-msgstr "ON DELETE DO INSTEAD rule gerekmektedir."
-
-#: snowball/dict_snowball.c:183
-#, c-format
-msgid "no Snowball stemmer available for language \"%s\" and encoding \"%s\""
-msgstr "\"%s\" dili ve \"%s\" kodlaması için Snowball stemmer mevcut değildir"
-
-#: snowball/dict_snowball.c:215
-msgid "multiple Language parameters"
-msgstr "çoklu Language parametreleri"
-
-#: snowball/dict_snowball.c:222
-#, c-format
-msgid "unrecognized Snowball parameter: \"%s\""
-msgstr "tanımlanmamış Snowball parametresi: \"%s\"  "
-
-#: snowball/dict_snowball.c:230
-msgid "missing Language parameter"
-msgstr "eksik Language parametresi"
-
-#: ../port/chklocale.c:319
-#: ../port/chklocale.c:325
-#, fuzzy, c-format
-msgid "could not determine encoding for locale \"%s\": codeset is \"%s\""
-msgstr "\"%s\" için junction ayarlanamadı: %s"
-
-#: ../port/chklocale.c:327
-msgid "Please report this to <pgsql-bugs@postgresql.org>."
-msgstr "Bunu lütfen <pgsql-bugs@postgresql.org> adresine bildiriniz."
-
-#: ../port/dirmod.c:75
-#: ../port/dirmod.c:88
-#: ../port/dirmod.c:101
-#, c-format
-msgid "out of memory\n"
-msgstr "bellek yetersiz\n"
-
-#: ../port/dirmod.c:267
-#, c-format
-msgid "could not set junction for \"%s\": %s"
-msgstr "\"%s\" için junction ayarlanamadı: %s"
-
-#: ../port/dirmod.c:270
-#, c-format
-msgid "could not set junction for \"%s\": %s\n"
-msgstr "\"%s\" için junction ayarlanamadı: %s\n"
-
-#: ../port/dirmod.c:309
-#, c-format
-msgid "could not open directory \"%s\": %s\n"
-msgstr "\"%s\" dizini açılamıyor: %s\n"
-
-#: ../port/dirmod.c:346
-#, c-format
-msgid "could not read directory \"%s\": %s\n"
-msgstr "\"%s\" dizini okunamıyor: %s\n"
-
-#: ../port/dirmod.c:429
-#, c-format
-msgid "could not stat file or directory \"%s\": %s\n"
-msgstr "\"%s\" dosya ya da dizini bulunamadı: %s\n"
-
-#: ../port/dirmod.c:456
-#: ../port/dirmod.c:473
-#, c-format
-msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "\"%s\" dosya ya da dizin silme hatası: %s\n"
-
-#: ../port/exec.c:195
-#: ../port/exec.c:309
-#: ../port/exec.c:352
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "geçerli dizin belirlenemedi: %s"
-
-#: ../port/exec.c:214
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "\"%s\" ikili dosyası geçersiz"
-
-#: ../port/exec.c:263
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "\"%s\" ikili dosyası okunamıyor"
-
-#: ../port/exec.c:270
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "çalıştırılacak \"%s\" bulunamadı"
-
-#: ../port/exec.c:325
-#: ../port/exec.c:361
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
-
-#: ../port/exec.c:340
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "sembolik link \"%s\" okuma hatası"
-
-#: ../port/exec.c:586
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "alt süreç %d kodu ile sonlandı"
-
-#: ../port/exec.c:590
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "alt süreç 0x%X exception tarafından sonlandırıldı"
-
-#: ../port/exec.c:599
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "alt süreç %s sinyali tarafından sonlandırıldı"
-
-#: ../port/exec.c:602
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "alt süreç %d sinyali tarafından sonlandırıldı"
-
-#: ../port/exec.c:606
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "alt süreç beklenmeyen status kodu ile sonlandırıldı %d"
-
-#: ../port/open.c:113
-msgid "sharing violation"
-msgstr "paylaşım çakışması"
-
-#: ../port/open.c:113
-msgid "lock violation"
-msgstr "lock çakışması "
-
-#: ../port/open.c:112
-#, c-format
-msgid "could not open file \"%s\": %s"
-msgstr "\"%s\" dosyası açılamıyor: %s"
-
-#: ../port/open.c:114
-msgid "Continuing to retry for 30 seconds."
-msgstr "30 saniyede bir denemeye devam ediliyor."
-
-#: ../port/open.c:115
-msgid "You might have antivirus, backup, or similar software interfering with the database system."
-msgstr "Veritabanı sistemi ile etkileşen antivirüs, yedekleme yada benzeri yazılımlar olabilir."
-
-#: ../port/strerror.c:25
-#, c-format
-msgid "unrecognized error %d"
-msgstr "bilinmeyen hata %d"
-
-#: ../port/win32error.c:184
-#, c-format
-msgid "mapped win32 error code %lu to %d"
-msgstr "%lu win32 hata kodu %d koduna adreslendi"
-
-#: ../port/win32error.c:195
-#, c-format
-msgid "unrecognized win32 error code: %lu"
-msgstr "bilinmeyen win32 hata kodu: %lu"
-
-#~ msgid "multiple DELETE events specified"
-#~ msgstr "birden fazla DELETE olayı belirtilmiştir"
-#~ msgid "multiple UPDATE events specified"
-#~ msgstr "birden fazla UPDATE olayı belirtilmiştir"
-
-#, fuzzy
-#~ msgid "multiple TRUNCATE events specified"
-#~ msgstr "birden fazla UPDATE olayı belirtilmiştir"
-#~ msgid "could not create XPath object"
-#~ msgstr "XPath nesnesi oluşturulamadı"
-#~ msgid "fillfactor=%d is out of range (should be between %d and 100)"
-#~ msgstr "fillfactor=%d kapsam dışıdır (%d ile 100 arasında olmalıdır)"
-#~ msgid "GIN index does not support search with void query"
-#~ msgstr "GIN dizini boş bir sorguyla aramayı desteklemiyor"
-#~ msgid "invalid LC_COLLATE setting"
-#~ msgstr "geçersiz LC_COLLATE ayarı"
-#~ msgid "invalid LC_CTYPE setting"
-#~ msgstr "geçersiz LC_TYPE ayarı"
-#~ msgid ""
-#~ "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the "
-#~ "server was compiled with LOCALE_NAME_BUFLEN %d."
-#~ msgstr ""
-#~ "Veritabanı clusteri LOCALE_NAME_BUFLEN %d ile ilklendirilmiştir, ancak "
-#~ "sunucu  LOCALE_NAME_BUFLEN %d ile derlenmiÅŸtir."
-#~ msgid "It looks like you need to initdb or install locale support."
-#~ msgstr "Yerel desteğini kurmanız ya da initdb çalıştırmanız gerekmektedir."
-#~ msgid "log_restartpoints = %s"
-#~ msgstr "log_restartpoints = %s"
-#~ msgid "WAL ends before end time of backup dump"
-#~ msgstr "WAL, yedek dump'ının bitiş zamanından önce sona ermiştir"
-#~ msgid "syntax error: cannot back up"
-#~ msgstr "sözdizimi hatası: geri diilemiyor"
-#~ msgid "syntax error; also virtual memory exhausted"
-#~ msgstr "sözdizimi hatası; ayrıca sanal bellek de dolmuştur"
-#~ msgid "parser stack overflow"
-#~ msgstr "parser stack overflow"
-#~ msgid "failed to drop all objects depending on %s"
-#~ msgstr "%s nesnesine bağlı nesnelerinin kaldırma işlemi başarısız oldu"
-#~ msgid "there are objects dependent on %s"
-#~ msgstr "%s nesnesine bağlı nesneler var."
-#~ msgid "could not remove database directory \"%s\""
-#~ msgstr "\"%s\" veritabanı dizini kaldırılamıyor"
-#~ msgid "multiple constraints named \"%s\" were dropped"
-#~ msgstr "\"%s\" adlı birden fazla constraint drop edilmiş"
-#~ msgid "constraint definition for check constraint \"%s\" does not match"
-#~ msgstr "check kısıtlamasının \"%s\" kısıtlama tanımı uyuşmamaktadır"
-#~ msgid ""
-#~ "relation \"%s.%s\" contains more than \"max_fsm_pages\" pages with useful "
-#~ "free space"
-#~ msgstr ""
-#~ "\"%s.%s\" nesnesi \"max_fsm_pages\" paramteresinde belirtilmiş sayısının "
-#~ "üzerinde kullanılabilecek boş alan içeriyor"
-#~ msgid "cannot change number of columns in view"
-#~ msgstr "view içerisinde sütun sayısı değiştirilemez"
-#~ msgid ""
-#~ "unexpected Kerberos user name received from client (received \"%s\", "
-#~ "expected \"%s\")"
-#~ msgstr ""
-#~ "İstemciden beklenmeyen Kerberos kullanıcı adı alınmış (alınan \"%s\", "
-#~ "beklenen \"%s\")"
-#~ msgid "Kerberos 5 not implemented on this server"
-#~ msgstr "Kerberos 5 bu sunucuda desteklenmemektedir"
-#~ msgid "GSSAPI not implemented on this server"
-#~ msgstr "GSSAPI bu sunucuda desteklenmemektedir"
-
-#, fuzzy
-#~ msgid "could not acquire SSPI credentials handle"
-#~ msgstr "karşı tarafın kimlik bilgileri alınamadı: %m"
-
-#, fuzzy
-#~ msgid "could not get security token from context"
-#~ msgstr "SSL context oluşturma hatası: %s"
-#~ msgid "unsafe permissions on private key file \"%s\""
-#~ msgstr "private key dosyası \"%s\" sakıncalı erişim haklarına sahip"
-#~ msgid ""
-#~ "File must be owned by the database user and must have no permissions for "
-#~ "\"group\" or \"other\"."
-#~ msgstr ""
-#~ "Dosya, veritabanı sahibi kullanıcısına ait olmalı ve \"group\" ya da "
-#~ "\"other\" kullanıcılarına erişim hakları verilmemelidir."
-#~ msgid ""
-#~ "cannot use authentication method \"crypt\" because password is MD5-"
-#~ "encrypted"
-#~ msgstr ""
-#~ "şifreler MD5 algoritması ile şifrelenmiş olduğu için \"crypt\" kimlik "
-#~ "doğrulama yöntemi kullanılamıyor"
-#~ msgid "invalid entry in file \"%s\" at line %d, token \"%s\""
-#~ msgstr "\"%s\" dosyasında %d satırında, \"%s\" simgesinde geçersiz giriş"
-#~ msgid "missing field in file \"%s\" at end of line %d"
-#~ msgstr "\"%s\" dosyasında %d satırın sonunda eksik alan"
-#~ msgid "cannot use Ident authentication without usermap field"
-#~ msgstr "usermap fiels olmadan Ident kimlik doğrulaması kullanılamıyor"
-#~ msgid "Ident protocol identifies remote user as \"%s\""
-#~ msgstr "Ident protokolü uzak kullanıcısını \"%s\" olarak tanıtıyor"
-#~ msgid "missing FROM-clause entry in subquery for table \"%s\""
-#~ msgstr "\"%s\" tablosu için subquery tanımında FROM öğesi eksik"
-#~ msgid "adding missing FROM-clause entry in subquery for table \"%s\""
-#~ msgstr "\"%s\" tablosu için subquery tanımında eksik FROM öğesi ekleniyor"
-#~ msgid "could not set statistics collector timer: %m"
-#~ msgstr "statistics collector zamanlayıcısı ayarlama hatası: %m"
-#~ msgid "insufficient shared memory for free space map"
-#~ msgstr "free space map için yetersiz shared memory"
-#~ msgid "max_fsm_pages must exceed max_fsm_relations * %d"
-#~ msgstr ""
-#~ "max_fsm_pages değeri, max_fsm_relations * %d  değerinden büyük olmalıdır"
-#~ msgid "free space map contains %d pages in %d relations"
-#~ msgstr "free space map %2$d nesnede %1$d sayfa içermektedir"
-#~ msgid ""
-#~ "A total of %.0f page slots are in use (including overhead).\n"
-#~ "%.0f page slots are required to track all free space.\n"
-#~ "Current limits are:  %d page slots, %d relations, using %.0f kB."
-#~ msgstr ""
-#~ "Toplam %.0f sayfa slotu kullanılmıştır (overhead dahildir).\n"
-#~ "Boş alanı takip etmek için %.0f sayfa slotuna ihtiyaç duyulmaktadır.\n"
-#~ "Åžu anki kimitleri: %d sayfa slotu, %d nesne, toplam: %.0f kB."
-#~ msgid "max_fsm_relations(%d) equals the number of relations checked"
-#~ msgstr "max_fsm_relations(%d) equals the number of relations checked"
-#~ msgid ""
-#~ "You have at least %d relations.  Consider increasing the configuration "
-#~ "parameter \"max_fsm_relations\"."
-#~ msgstr ""
-#~ "Nesne sayısı: %d. \"max_fsm_relations\" yapılandırma parametresini "
-#~ "arttırmaya deneyebilirsiniz."
-#~ msgid "number of page slots needed (%.0f) exceeds max_fsm_pages (%d)"
-#~ msgstr ""
-#~ "ihtiyaç duyulan page slot sayısı (%.0f), max_fsm_pages (%d) parametresini "
-#~ "aşmaktadır"
-#~ msgid ""
-#~ "Consider increasing the configuration parameter \"max_fsm_pages\" to a "
-#~ "value over %.0f."
-#~ msgstr ""
-#~ "\"max_fsm_pages\" yapılandırma parametresini %.0f değerine kadar "
-#~ "yükseltmeyi deneyebilirsiniz."
-
-#, fuzzy
-#~ msgid "could not fsync relation %u/%u/%u: %m"
-#~ msgstr "nesne %u/%u/%u açma hatası: %m"
-#~ msgid "unexpected delimiter at line %d of thesaurus file \"%s\""
-#~ msgstr ""
-#~ "\"%2$s\" thesaurus dosyasında %1$d satırında beklenmeyen sınırlayıcı."
-#~ msgid "unexpected end of line or lexeme at line %d of thesaurus file \"%s\""
-#~ msgstr ""
-#~ "%d numaralı satırda, \"%s\" sözlük dosyasında, beklenmeyen satır sonu ya "
-#~ "da sözcükbirim"
-
-#, fuzzy
-#~ msgid "unexpected end of line at line %d of thesaurus file \"%s\""
-#~ msgstr ""
-#~ "\"%2$s\" nesnesinin %1$u bloÄŸunda dosya sonundan sonra beklenmeyen veri"
-
-#, fuzzy
-#~ msgid "syntax error at line %d of affix file \"%s\""
-#~ msgstr "%s geçmiş dosyasında sözdizimi hatası"
-#~ msgid "invalid argument for power function"
-#~ msgstr "power fonksiyonu için geçersin argüman"
-#~ msgid "not unique \"S\""
-#~ msgstr "\"S\" tek deÄŸildir"
-#~ msgid "invalid AM/PM string"
-#~ msgstr "geçersiz AM/PM satırı"
-#~ msgid "\"TZ\"/\"tz\" not supported"
-#~ msgstr "\"TZ\"/\"tz\" desteklenmiyor"
-#~ msgid "January"
-#~ msgstr "Ocak"
-#~ msgid "February"
-#~ msgstr "Åžubat"
-#~ msgid "March"
-#~ msgstr "Mart"
-#~ msgid "April"
-#~ msgstr "Nisan"
-#~ msgid "May"
-#~ msgstr "Mayıs"
-#~ msgid "June"
-#~ msgstr "Haziran"
-#~ msgid "July"
-#~ msgstr "Temmuz"
-#~ msgid "August"
-#~ msgstr "AÄŸustos"
-#~ msgid "September"
-#~ msgstr "Eylül"
-#~ msgid "October"
-#~ msgstr "Ekim"
-#~ msgid "November"
-#~ msgstr "Kasım"
-#~ msgid "December"
-#~ msgstr "Aralık"
-#~ msgid "Jan"
-#~ msgstr "Oca"
-#~ msgid "Feb"
-#~ msgstr "Åžub"
-#~ msgid "Mar"
-#~ msgstr "Mar"
-#~ msgid "Apr"
-#~ msgstr "Nis"
-#~ msgid "S:May"
-#~ msgstr "S:May"
-#~ msgid "Jun"
-#~ msgstr "Haz"
-#~ msgid "Jul"
-#~ msgstr "Tem"
-#~ msgid "Aug"
-#~ msgstr "AuÄŸ"
-#~ msgid "Sep"
-#~ msgstr "Eyl"
-#~ msgid "Oct"
-#~ msgstr "Eki"
-#~ msgid "Nov"
-#~ msgstr "Kas"
-#~ msgid "Dec"
-#~ msgstr "Ara"
-#~ msgid "Sunday"
-#~ msgstr "Pazar"
-#~ msgid "Monday"
-#~ msgstr "Pazartesi"
-#~ msgid "Tuesday"
-#~ msgstr "Salı"
-#~ msgid "Wednesday"
-#~ msgstr "Çarşamba"
-#~ msgid "Thursday"
-#~ msgstr "PerÅŸembe"
-#~ msgid "Friday"
-#~ msgstr "Cuma"
-#~ msgid "Saturday"
-#~ msgstr "Cumartesi"
-#~ msgid "Sun"
-#~ msgstr "Pz"
-#~ msgid "Mon"
-#~ msgstr "Pzt"
-#~ msgid "Tue"
-#~ msgstr "Sal"
-#~ msgid "Wed"
-#~ msgstr "Çar"
-#~ msgid "Thu"
-#~ msgstr "PrÅŸ"
-#~ msgid "Fri"
-#~ msgstr "Cum"
-#~ msgid "Sat"
-#~ msgstr "Cmt"
-#~ msgid "AM/PM hour must be between 1 and 12"
-#~ msgstr "AM/PM saati 1 ile 12 arasında olmalıdır"
-#~ msgid "UTF-16 to UTF-8 translation failed: %lu"
-#~ msgstr "UTF-16'dan UTF-8'e dönüştürme hatası: %lu"
-#~ msgid "cannot calculate week number without year information"
-#~ msgstr "yıl bilgisi olmadan haftanın günü hesaplanamaz"
-#~ msgid "query requires full scan, which is not supported by GIN indexes"
-#~ msgstr "sorgu tam tarama gerektiriyor; ancak GIN indexler bunu desteklemez"
-#~ msgid ""
-#~ "@@ operator does not support lexeme weight restrictions in GIN index "
-#~ "searches"
-#~ msgstr ""
-#~ "@@ operatörü GIN index aramalarında sözcükbirim ağırlık kısıtlamalarını "
-#~ "desteklemez"
-#~ msgid "Use the @@@ operator instead."
-#~ msgstr "Bunun yerine @@@ operatörünü kullanın."
-#~ msgid "Resource Usage / Free Space Map"
-#~ msgstr "Kaynak Kullanımı / Boş Alan Haritası"
-#~ msgid "Prints the parse tree to the server log."
-#~ msgstr "Ayrıştırma ağacını sunucu günlüğüne yazıyor."
-#~ msgid "Prints the parse tree after rewriting to server log."
-#~ msgstr ""
-#~ "Ayrıştırma ağacını rewrite ilmeinden sonra sunucu günlüğüne yazıyor."
-#~ msgid "Prints the execution plan to server log."
-#~ msgstr "Yürütme planını sunucu günlüğüne yazıyor."
-#~ msgid "Uses the indented output format for EXPLAIN VERBOSE."
-#~ msgstr "EXPLAIN VERBOSE için girintili çıktı biçimini kullanıyor."
-#~ msgid ""
-#~ "Sets the maximum number of tables and indexes for which free space is "
-#~ "tracked."
-#~ msgstr "Boş alanı takibi yapılacak tabloların en büyük sayısı."
-#~ msgid ""
-#~ "Sets the maximum number of disk pages for which free space is tracked."
-#~ msgstr "Boş alanı takibi yapılacak disk sayfaların en büyük sayısı."
-#~ msgid "Valid values are ON, OFF, and SAFE_ENCODING."
-#~ msgstr "Geçerli değerler: ON, OFF ve SAFE_ENCODING."
-#~ msgid ""
-#~ "Each SQL transaction has an isolation level, which can be either \"read "
-#~ "uncommitted\", \"read committed\", \"repeatable read\", or \"serializable"
-#~ "\"."
-#~ msgstr ""
-#~ "Her SQL transaction bir isolation level'e sahiptir, geçerli değerler: "
-#~ "\"read uncommitted\", \"read committed\", \"repeatable read\", "
-#~ "\"serializable\"."
-
-#, fuzzy
-#~ msgid "Each session can be either \"origin\", \"replica\", or \"local\"."
-#~ msgstr "Bir oturum \"origin\", \"replica\" veya \"local\" olabilir."
-
-#, fuzzy
-#~ msgid "Sets realm to match Kerberos and GSSAPI users against."
-#~ msgstr "Kerberos sevice adını belirtiyor."
-#~ msgid "Sets the hostname of the Kerberos server."
-#~ msgstr "Kerberos sunucusunun bilgisayar adını belirtiyor."
-#~ msgid "This can be set to advanced, extended, or basic."
-#~ msgstr "Bu deÄŸer ÅŸunlardan biri olabilir: advanced, extended, or basic."
-#~ msgid ""
-#~ "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, "
-#~ "LOCAL7."
-#~ msgstr ""
-#~ "Geçerli değerler: LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, "
-#~ "LOCAL7."
-#~ msgid "Valid values are BASE64 and HEX."
-#~ msgstr "Geçerli değerler: BASE64 ve HEX."
-#~ msgid "Valid values are DOCUMENT and CONTENT."
-#~ msgstr "Geçerli değerler: DOCUMENT ve CONTENT."
-#~ msgid ""
-#~ "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, "
-#~ "WARNING, ERROR, LOG, FATAL, and PANIC. Each level includes all the levels "
-#~ "that follow it."
-#~ msgstr ""
-#~ "Geçerli değerler: DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, "
-#~ "WARNING, ERROR, LOG, FATAL, and PANIC. Her düzey kendisinden daha büyük "
-#~ "düzeyleri de kapsıyor."
-#~ msgid ""
-#~ "All SQL statements that cause an error of the specified level or a higher "
-#~ "level are logged."
-#~ msgstr ""
-#~ "Belirtilen ya da daha üst düzeyde hata yaratan SQL sorguları "
-#~ "loglanacaktır."
-#~ msgid ""
-#~ "parameter \"%s\" cannot be changed after server start; configuration file "
-#~ "change ignored"
-#~ msgstr ""
-#~ "\"%s\" parametresi, sunucu başlatıldıktan sonra değiştirilemez; "
-#~ "yapılandırma dosyası yok sayıldı"
-
-#, fuzzy
-#~ msgid "invalid value for parameter \"%s\": \"%d\""
-#~ msgstr "\"%s\" seçeneği için geçersiz değer: \"%s\""
-#~ msgid "cannot truncate table \"%s\" because it has pending trigger events"
-#~ msgstr ""
-#~ "\"%s\" tablosuna bağlı trigger olayları bulunduğu için truncate işlemi "
-#~ "yapılamadı"
-
-#, fuzzy
-#~ msgid "cannot alter table \"%s\" because it has pending trigger events"
-#~ msgstr ""
-#~ "\"%s\" tablosuna bağlı trigger olayları bulunduğu için truncate işlemi "
-#~ "yapılamadı"
-#~ msgid ""
-#~ "%s: the number of buffers (-B) must be at least twice the number of "
-#~ "allowed connections (-N) and at least 16\n"
-#~ msgstr ""
-#~ "%s: buffer sayısı (-B), izin verilen bağlantı sayısından (-N) en az iki "
-#~ "kat daha büyük ve 16'dan daha küçük olmamalıdır\n"
-
-#, fuzzy
-#~ msgid "invalid regis pattern: \"%s\""
-#~ msgstr "geçirsiz rol adı \"%s\""
-
diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c
index b4bcf40a7aba6..88b1b57549a69 100644
--- a/src/backend/port/ipc_test.c
+++ b/src/backend/port/ipc_test.c
@@ -303,7 +303,7 @@ main(int argc, char **argv)
 		proc_exit(1);
 	}
 
-	printf("forked child pid %d OK\n", cpid);
+	printf("forked child PID %d OK\n", cpid);
 
 	if (storage->flag != 1234)
 		printf("Wrong value found in shared memory!\n");
diff --git a/src/backend/port/pipe.c b/src/backend/port/pipe.c
index b86a53ad34aa7..b249e959107d8 100644
--- a/src/backend/port/pipe.c
+++ b/src/backend/port/pipe.c
@@ -29,7 +29,7 @@ pgpipe(int handles[2])
 
 	if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to create socket: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not create socket: %ui", WSAGetLastError())));
 		return -1;
 	}
 
@@ -39,38 +39,38 @@ pgpipe(int handles[2])
 	serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 	if (bind(s, (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to bind: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not bind: %ui", WSAGetLastError())));
 		closesocket(s);
 		return -1;
 	}
 	if (listen(s, 1) == SOCKET_ERROR)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to listen: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not listen: %ui", WSAGetLastError())));
 		closesocket(s);
 		return -1;
 	}
 	if (getsockname(s, (SOCKADDR *) &serv_addr, &len) == SOCKET_ERROR)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to getsockname: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not getsockname: %ui", WSAGetLastError())));
 		closesocket(s);
 		return -1;
 	}
 	if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to create socket 2: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not create socket 2: %ui", WSAGetLastError())));
 		closesocket(s);
 		return -1;
 	}
 
 	if (connect(handles[1], (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to connect socket: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not connect socket: %ui", WSAGetLastError())));
 		closesocket(s);
 		return -1;
 	}
 	if ((handles[0] = accept(s, (SOCKADDR *) &serv_addr, &len)) == INVALID_SOCKET)
 	{
-		ereport(LOG, (errmsg_internal("pgpipe failed to accept socket: %ui", WSAGetLastError())));
+		ereport(LOG, (errmsg_internal("pgpipe could not accept socket: %ui", WSAGetLastError())));
 		closesocket(handles[1]);
 		handles[1] = INVALID_SOCKET;
 		closesocket(s);
diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c
index 6dae7c94c0353..19bb7def1f769 100644
--- a/src/backend/port/unix_latch.c
+++ b/src/backend/port/unix_latch.c
@@ -3,60 +3,6 @@
  * unix_latch.c
  *	  Routines for inter-process latches
  *
- * A latch is a boolean variable, with operations that let you to sleep
- * until it is set. A latch can be set from another process, or a signal
- * handler within the same process.
- *
- * The latch interface is a reliable replacement for the common pattern of
- * using pg_usleep() or select() to wait until a signal arrives, where the
- * signal handler sets a global variable. Because on some platforms, an
- * incoming signal doesn't interrupt sleep, and even on platforms where it
- * does there is a race condition if the signal arrives just before
- * entering the sleep, the common pattern must periodically wake up and
- * poll the global variable. pselect() system call was invented to solve
- * the problem, but it is not portable enough. Latches are designed to
- * overcome these limitations, allowing you to sleep without polling and
- * ensuring a quick response to signals from other processes.
- *
- * There are two kinds of latches: local and shared. A local latch is
- * initialized by InitLatch, and can only be set from the same process.
- * A local latch can be used to wait for a signal to arrive, by calling
- * SetLatch in the signal handler. A shared latch resides in shared memory,
- * and must be initialized at postmaster startup by InitSharedLatch. Before
- * a shared latch can be waited on, it must be associated with a process
- * with OwnLatch. Only the process owning the latch can wait on it, but any
- * process can set it.
- *
- * There are three basic operations on a latch:
- *
- * SetLatch		- Sets the latch
- * ResetLatch	- Clears the latch, allowing it to be set again
- * WaitLatch	- Waits for the latch to become set
- *
- * The correct pattern to wait for an event is:
- *
- * for (;;)
- * {
- *	   ResetLatch();
- *	   if (work to do)
- *		   Do Stuff();
- *
- *	   WaitLatch();
- * }
- *
- * It's important to reset the latch *before* checking if there's work to
- * do. Otherwise, if someone sets the latch between the check and the
- * ResetLatch call, you will miss it and Wait will block.
- *
- * To wake up the waiter, you must first set a global flag or something
- * else that the main loop tests in the "if (work to do)" part, and call
- * SetLatch *after* that. SetLatch is designed to return quickly if the
- * latch is already set.
- *
- *
- * Implementation
- * --------------
- *
  * The Unix implementation uses the so-called self-pipe trick to overcome
  * the race condition involved with select() and setting a global flag
  * in the signal handler. When a latch is set and the current process
@@ -65,8 +11,8 @@
  * interrupt select() on all platforms, and even on platforms where it
  * does, a signal that arrives just before the select() call does not
  * prevent the select() from entering sleep. An incoming byte on a pipe
- * however reliably interrupts the sleep, and makes select() to return
- * immediately if the signal arrives just before select() begins.
+ * however reliably interrupts the sleep, and causes select() to return
+ * immediately even if the signal arrives before select() begins.
  *
  * When SetLatch is called from the same process that owns the latch,
  * SetLatch writes the byte directly to the pipe. If it's owned by another
@@ -99,7 +45,7 @@
 /* Are we currently in WaitLatch? The signal handler would like to know. */
 static volatile sig_atomic_t waiting = false;
 
-/* Read and write end of the self-pipe */
+/* Read and write ends of the self-pipe */
 static int	selfpipe_readfd = -1;
 static int	selfpipe_writefd = -1;
 
@@ -115,7 +61,7 @@ static void sendSelfPipeByte(void);
 void
 InitLatch(volatile Latch *latch)
 {
-	/* Initialize the self pipe if this is our first latch in the process */
+	/* Initialize the self-pipe if this is our first latch in the process */
 	if (selfpipe_readfd == -1)
 		initSelfPipe();
 
@@ -126,13 +72,14 @@ InitLatch(volatile Latch *latch)
 
 /*
  * Initialize a shared latch that can be set from other processes. The latch
- * is initially owned by no-one, use OwnLatch to associate it with the
+ * is initially owned by no-one; use OwnLatch to associate it with the
  * current process.
  *
  * InitSharedLatch needs to be called in postmaster before forking child
  * processes, usually right after allocating the shared memory block
- * containing the latch with ShmemInitStruct. The Unix implementation
- * doesn't actually require that, but the Windows one does.
+ * containing the latch with ShmemInitStruct. (The Unix implementation
+ * doesn't actually require that, but the Windows one does.) Because of
+ * this restriction, we have no concurrency issues to worry about here.
  */
 void
 InitSharedLatch(volatile Latch *latch)
@@ -144,23 +91,30 @@ InitSharedLatch(volatile Latch *latch)
 
 /*
  * Associate a shared latch with the current process, allowing it to
- * wait on it.
+ * wait on the latch.
+ *
+ * Although there is a sanity check for latch-already-owned, we don't do
+ * any sort of locking here, meaning that we could fail to detect the error
+ * if two processes try to own the same latch at about the same time.  If
+ * there is any risk of that, caller must provide an interlock to prevent it.
  *
- * Make sure that latch_sigusr1_handler() is called from the SIGUSR1 signal
- * handler, as shared latches use SIGUSR1 to for inter-process communication.
+ * In any process that calls OwnLatch(), make sure that
+ * latch_sigusr1_handler() is called from the SIGUSR1 signal handler,
+ * as shared latches use SIGUSR1 for inter-process communication.
  */
 void
 OwnLatch(volatile Latch *latch)
 {
 	Assert(latch->is_shared);
 
-	/* Initialize the self pipe if this is our first latch in the process */
+	/* Initialize the self-pipe if this is our first latch in this process */
 	if (selfpipe_readfd == -1)
 		initSelfPipe();
 
 	/* sanity check */
 	if (latch->owner_pid != 0)
 		elog(ERROR, "latch already owned");
+
 	latch->owner_pid = MyProcPid;
 }
 
@@ -172,6 +126,7 @@ DisownLatch(volatile Latch *latch)
 {
 	Assert(latch->is_shared);
 	Assert(latch->owner_pid == MyProcPid);
+
 	latch->owner_pid = 0;
 }
 
@@ -179,10 +134,13 @@ DisownLatch(volatile Latch *latch)
  * Wait for given latch to be set or until timeout is exceeded.
  * If the latch is already set, the function returns immediately.
  *
- * The 'timeout' is given in microseconds, and -1 means wait forever.
- * On some platforms, signals cause the timeout to be restarted, so beware
- * that the function can sleep for several times longer than the specified
- * timeout.
+ * The 'timeout' is given in milliseconds, and -1 means wait forever.
+ * On some platforms, signals do not interrupt the wait, or even
+ * cause the timeout to be restarted, so beware that the function can sleep
+ * for several times longer than the requested timeout.  However, this
+ * difficulty is not so great as it seems, because the signal handlers for any
+ * signals that the caller should respond to ought to be programmed to end the
+ * wait by calling SetLatch.  Ideally, the timeout parameter is vestigial.
  *
  * The latch must be owned by the current process, ie. it must be a
  * backend-local latch initialized with InitLatch, or a shared latch
@@ -218,8 +176,8 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 	/* Initialize timeout */
 	if (timeout >= 0)
 	{
-		tv.tv_sec = timeout / 1000000L;
-		tv.tv_usec = timeout % 1000000L;
+		tv.tv_sec = timeout / 1000L;
+		tv.tv_usec = (timeout % 1000L) * 1000L;
 		tvp = &tv;
 	}
 
@@ -229,21 +187,31 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 		int			hifd;
 
 		/*
-		 * Clear the pipe, and check if the latch is set already. If someone
+		 * Clear the pipe, then check if the latch is set already. If someone
 		 * sets the latch between this and the select() below, the setter will
 		 * write a byte to the pipe (or signal us and the signal handler will
 		 * do that), and the select() will return immediately.
+		 *
+		 * Note: we assume that the kernel calls involved in drainSelfPipe()
+		 * and SetLatch() will provide adequate synchronization on machines
+		 * with weak memory ordering, so that we cannot miss seeing is_set
+		 * if the signal byte is already in the pipe when we drain it.
 		 */
 		drainSelfPipe();
+
 		if (latch->is_set)
 		{
 			result = 1;
 			break;
 		}
 
+		/* Must wait ... set up the event masks for select() */
 		FD_ZERO(&input_mask);
+		FD_ZERO(&output_mask);
+
 		FD_SET(selfpipe_readfd, &input_mask);
 		hifd = selfpipe_readfd;
+
 		if (sock != PGINVALID_SOCKET && forRead)
 		{
 			FD_SET(sock, &input_mask);
@@ -251,7 +219,6 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 				hifd = sock;
 		}
 
-		FD_ZERO(&output_mask);
 		if (sock != PGINVALID_SOCKET && forWrite)
 		{
 			FD_SET(sock, &output_mask);
@@ -264,6 +231,7 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 		{
 			if (errno == EINTR)
 				continue;
+			waiting = false;
 			ereport(ERROR,
 					(errcode_for_socket_access(),
 					 errmsg("select() failed: %m")));
@@ -288,14 +256,27 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 }
 
 /*
- * Sets a latch and wakes up anyone waiting on it. Returns quickly if the
- * latch is already set.
+ * Sets a latch and wakes up anyone waiting on it.
+ *
+ * This is cheap if the latch is already set, otherwise not so much.
+ *
+ * NB: when calling this in a signal handler, be sure to save and restore
+ * errno around it.  (That's standard practice in most signal handlers, of
+ * course, but we used to omit it in handlers that only set a flag.)
  */
 void
 SetLatch(volatile Latch *latch)
 {
 	pid_t		owner_pid;
 
+	/*
+	 * XXX there really ought to be a memory barrier operation right here,
+	 * to ensure that any flag variables we might have changed get flushed
+	 * to main memory before we check/set is_set.  Without that, we have to
+	 * require that callers provide their own synchronization for machines
+	 * with weak memory ordering (see latch.h).
+	 */
+
 	/* Quick exit if already set */
 	if (latch->is_set)
 		return;
@@ -307,19 +288,30 @@ SetLatch(volatile Latch *latch)
 	 * we're in a signal handler. We use the self-pipe to wake up the select()
 	 * in that case. If it's another process, send a signal.
 	 *
-	 * Fetch owner_pid only once, in case the owner simultaneously disowns the
-	 * latch and clears owner_pid. XXX: This assumes that pid_t is atomic,
-	 * which isn't guaranteed to be true! In practice, the effective range of
-	 * pid_t fits in a 32 bit integer, and so should be atomic. In the worst
-	 * case, we might end up signaling wrong process if the right one disowns
-	 * the latch just as we fetch owner_pid. Even then, you're very unlucky if
-	 * a process with that bogus pid exists.
+	 * Fetch owner_pid only once, in case the latch is concurrently getting
+	 * owned or disowned. XXX: This assumes that pid_t is atomic, which isn't
+	 * guaranteed to be true! In practice, the effective range of pid_t fits
+	 * in a 32 bit integer, and so should be atomic. In the worst case, we
+	 * might end up signaling the wrong process. Even then, you're very
+	 * unlucky if a process with that bogus pid exists and belongs to
+	 * Postgres; and PG database processes should handle excess SIGUSR1
+	 * interrupts without a problem anyhow.
+	 *
+	 * Another sort of race condition that's possible here is for a new process
+	 * to own the latch immediately after we look, so we don't signal it.
+	 * This is okay so long as all callers of ResetLatch/WaitLatch follow the
+	 * standard coding convention of waiting at the bottom of their loops,
+	 * not the top, so that they'll correctly process latch-setting events that
+	 * happen before they enter the loop.
 	 */
 	owner_pid = latch->owner_pid;
 	if (owner_pid == 0)
 		return;
 	else if (owner_pid == MyProcPid)
-		sendSelfPipeByte();
+	{
+		if (waiting)
+			sendSelfPipeByte();
+	}
 	else
 		kill(owner_pid, SIGUSR1);
 }
@@ -335,11 +327,27 @@ ResetLatch(volatile Latch *latch)
 	Assert(latch->owner_pid == MyProcPid);
 
 	latch->is_set = false;
+
+	/*
+	 * XXX there really ought to be a memory barrier operation right here, to
+	 * ensure that the write to is_set gets flushed to main memory before we
+	 * examine any flag variables.  Otherwise a concurrent SetLatch might
+	 * falsely conclude that it needn't signal us, even though we have missed
+	 * seeing some flag updates that SetLatch was supposed to inform us of.
+	 * For the moment, callers must supply their own synchronization of flag
+	 * variables (see latch.h).
+	 */
 }
 
 /*
- * SetLatch uses SIGUSR1 to wake up the process waiting on the latch. Wake
- * up WaitLatch.
+ * SetLatch uses SIGUSR1 to wake up the process waiting on the latch.
+ *
+ * Wake up WaitLatch, if we're waiting.  (We might not be, since SIGUSR1 is
+ * overloaded for multiple purposes; or we might not have reached WaitLatch
+ * yet, in which case we don't need to fill the pipe either.)
+ *
+ * NB: when calling this in a signal handler, be sure to save and restore
+ * errno around it.
  */
 void
 latch_sigusr1_handler(void)
@@ -403,13 +411,19 @@ sendSelfPipeByte(void)
 	}
 }
 
-/* Read all available data from the self-pipe */
+/*
+ * Read all available data from the self-pipe
+ *
+ * Note: this is only called when waiting = true.  If it fails and doesn't
+ * return, it must reset that flag first (though ideally, this will never
+ * happen).
+ */
 static void
 drainSelfPipe(void)
 {
 	/*
 	 * There shouldn't normally be more than one byte in the pipe, or maybe a
-	 * few more if multiple processes run SetLatch at the same instant.
+	 * few bytes if multiple processes run SetLatch at the same instant.
 	 */
 	char		buf[16];
 	int			rc;
@@ -424,9 +438,21 @@ drainSelfPipe(void)
 			else if (errno == EINTR)
 				continue;		/* retry */
 			else
+			{
+				waiting = false;
 				elog(ERROR, "read() on self-pipe failed: %m");
+			}
 		}
 		else if (rc == 0)
+		{
+			waiting = false;
 			elog(ERROR, "unexpected EOF on self-pipe");
+		}
+		else if (rc < sizeof(buf))
+		{
+			/* we successfully drained the pipe; no need to read() again */
+			break;
+		}
+		/* else buffer wasn't big enough, so read again */
 	}
 }
diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c
index 119dd076cae7a..b905206a29a71 100644
--- a/src/backend/port/win32/crashdump.c
+++ b/src/backend/port/win32/crashdump.c
@@ -105,7 +105,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
 		hDll = LoadLibrary("dbghelp.dll");
 		if (hDll == NULL)
 		{
-			write_stderr("could not load dbghelp.dll, cannot write crashdump\n");
+			write_stderr("could not load dbghelp.dll, cannot write crash dump\n");
 			return EXCEPTION_CONTINUE_SEARCH;
 		}
 
@@ -113,7 +113,7 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
 
 		if (pDump == NULL)
 		{
-			write_stderr("could not load required functions in dbghelp.dll, cannot write crashdump\n");
+			write_stderr("could not load required functions in dbghelp.dll, cannot write crash dump\n");
 			return EXCEPTION_CONTINUE_SEARCH;
 		}
 
@@ -144,16 +144,16 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
 							  NULL);
 		if (dumpFile == INVALID_HANDLE_VALUE)
 		{
-			write_stderr("could not open crash dump file %s for writing: error code %u\n",
+			write_stderr("could not open crash dump file \"%s\" for writing: error code %u\n",
 						 dumpPath, (unsigned int) GetLastError());
 			return EXCEPTION_CONTINUE_SEARCH;
 		}
 
 		if ((*pDump) (selfProcHandle, selfPid, dumpFile, dumpType, &ExInfo,
 					  NULL, NULL))
-			write_stderr("wrote crash dump to %s\n", dumpPath);
+			write_stderr("wrote crash dump to file \"%s\"\n", dumpPath);
 		else
-			write_stderr("could not write crash dump to %s: error code %08x\n",
+			write_stderr("could not write crash dump to file \"%s\": error code %08x\n",
 						 dumpPath, (unsigned int) GetLastError());
 
 		CloseHandle(dumpFile);
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index b5675ec76f48d..d2dfd01223c29 100644
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -83,18 +83,18 @@ pgwin32_signal_initialize(void)
 	pgwin32_signal_event = CreateEvent(NULL, TRUE, FALSE, NULL);
 	if (pgwin32_signal_event == NULL)
 		ereport(FATAL,
-				(errmsg_internal("failed to create signal event: %d", (int) GetLastError())));
+				(errmsg_internal("could not create signal event: %d", (int) GetLastError())));
 
 	/* Create thread for handling signals */
 	signal_thread_handle = CreateThread(NULL, 0, pg_signal_thread, NULL, 0, NULL);
 	if (signal_thread_handle == NULL)
 		ereport(FATAL,
-				(errmsg_internal("failed to create signal handler thread")));
+				(errmsg_internal("could not create signal handler thread")));
 
 	/* Create console control handle to pick up Ctrl-C etc */
 	if (!SetConsoleCtrlHandler(pg_console_handler, TRUE))
 		ereport(FATAL,
-				(errmsg_internal("failed to set console control handler")));
+				(errmsg_internal("could not set console control handler")));
 }
 
 /*
@@ -171,7 +171,7 @@ pqsignal(int signum, pqsigfunc handler)
 	return prevfunc;
 }
 
-/* Create the signal listener pipe for specified pid */
+/* Create the signal listener pipe for specified PID */
 HANDLE
 pgwin32_create_signal_listener(pid_t pid)
 {
@@ -186,7 +186,7 @@ pgwin32_create_signal_listener(pid_t pid)
 
 	if (pipe == INVALID_HANDLE_VALUE)
 		ereport(ERROR,
-				(errmsg("could not create signal listener pipe for pid %d: error code %d",
+				(errmsg("could not create signal listener pipe for PID %d: error code %d",
 						(int) pid, (int) GetLastError())));
 
 	return pipe;
diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c
index c918da981b283..b730f8eeda901 100644
--- a/src/backend/port/win32/socket.c
+++ b/src/backend/port/win32/socket.c
@@ -99,7 +99,7 @@ TranslateSocketError(void)
 			break;
 		default:
 			ereport(NOTICE,
-					(errmsg_internal("Unknown win32 socket error code: %i", WSAGetLastError())));
+					(errmsg_internal("unrecognized win32 socket error code: %i", WSAGetLastError())));
 			errno = EINVAL;
 	}
 }
@@ -143,11 +143,11 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
 
 		if (waitevent == INVALID_HANDLE_VALUE)
 			ereport(ERROR,
-					(errmsg_internal("Failed to create socket waiting event: %i", (int) GetLastError())));
+					(errmsg_internal("could not create socket waiting event: %i", (int) GetLastError())));
 	}
 	else if (!ResetEvent(waitevent))
 		ereport(ERROR,
-				(errmsg_internal("Failed to reset socket waiting event: %i", (int) GetLastError())));
+				(errmsg_internal("could not reset socket waiting event: %i", (int) GetLastError())));
 
 	/*
 	 * make sure we don't multiplex this kernel event object with a different
@@ -221,7 +221,7 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
 	if (r == WAIT_TIMEOUT)
 		return 0;
 	ereport(ERROR,
-			(errmsg_internal("Bad return from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError())));
+			(errmsg_internal("unrecognized return value from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError())));
 	return 0;
 }
 
@@ -364,7 +364,7 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
 		return b;
 	}
 	ereport(NOTICE,
-	  (errmsg_internal("Failed to read from ready socket (after retries)")));
+	  (errmsg_internal("could not read from ready socket (after retries)")));
 	errno = EWOULDBLOCK;
 	return -1;
 }
@@ -645,7 +645,7 @@ pgwin32_socket_strerror(int err)
 		handleDLL = LoadLibraryEx("netmsg.dll", NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
 		if (handleDLL == NULL)
 			ereport(FATAL,
-					(errmsg_internal("Failed to load netmsg.dll: %i", (int) GetLastError())));
+					(errmsg_internal("could not load netmsg.dll: %i", (int) GetLastError())));
 	}
 
 	ZeroMemory(&wserrbuf, sizeof(wserrbuf));
@@ -658,7 +658,7 @@ pgwin32_socket_strerror(int err)
 					  NULL) == 0)
 	{
 		/* Failed to get id */
-		sprintf(wserrbuf, "Unknown winsock error %i", err);
+		sprintf(wserrbuf, "unrecognized winsock error %i", err);
 	}
 	return wserrbuf;
 }
diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c
index e118d96a4bcff..97224df386b80 100644
--- a/src/backend/port/win32/timer.c
+++ b/src/backend/port/win32/timer.c
@@ -97,7 +97,7 @@ setitimer(int which, const struct itimerval * value, struct itimerval * ovalue)
 		timerCommArea.event = CreateEvent(NULL, TRUE, FALSE, NULL);
 		if (timerCommArea.event == NULL)
 			ereport(FATAL,
-					(errmsg_internal("failed to create timer event: %d",
+					(errmsg_internal("could not create timer event: %d",
 									 (int) GetLastError())));
 
 		MemSet(&timerCommArea.value, 0, sizeof(struct itimerval));
@@ -107,7 +107,7 @@ setitimer(int which, const struct itimerval * value, struct itimerval * ovalue)
 		timerThreadHandle = CreateThread(NULL, 0, pg_timer_thread, NULL, 0, NULL);
 		if (timerThreadHandle == INVALID_HANDLE_VALUE)
 			ereport(FATAL,
-					(errmsg_internal("failed to create timer thread: %d",
+					(errmsg_internal("could not create timer thread: %d",
 									 (int) GetLastError())));
 	}
 
diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c
index 4bcf7b7a8f34b..ccb5771b52bac 100644
--- a/src/backend/port/win32_latch.c
+++ b/src/backend/port/win32_latch.c
@@ -1,9 +1,10 @@
 /*-------------------------------------------------------------------------
  *
  * win32_latch.c
- *	  Windows implementation of latches.
+ *	  Routines for inter-process latches
  *
- * See unix_latch.c for information on usage.
+ * See unix_latch.c for header comments for the exported functions;
+ * the API presented here is supposed to be the same as there.
  *
  * The Windows implementation uses Windows events that are inherited by
  * all postmaster child processes.
@@ -23,7 +24,6 @@
 #include <unistd.h>
 
 #include "miscadmin.h"
-#include "replication/walsender.h"
 #include "storage/latch.h"
 #include "storage/shmem.h"
 
@@ -88,7 +88,7 @@ WaitLatch(volatile Latch *latch, long timeout)
 }
 
 int
-WaitLatchOrSocket(volatile Latch *latch, SOCKET sock, bool forRead,
+WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead,
 				  bool forWrite, long timeout)
 {
 	DWORD		rc;
@@ -98,6 +98,9 @@ WaitLatchOrSocket(volatile Latch *latch, SOCKET sock, bool forRead,
 	int			numevents;
 	int			result = 0;
 
+	if (latch->owner_pid != MyProcPid)
+		elog(ERROR, "cannot wait on a latch owned by another process");
+
 	latchevent = latch->event;
 
 	events[0] = latchevent;
@@ -134,7 +137,7 @@ WaitLatchOrSocket(volatile Latch *latch, SOCKET sock, bool forRead,
 		}
 
 		rc = WaitForMultipleObjects(numevents, events, FALSE,
-							   (timeout >= 0) ? (timeout / 1000) : INFINITE);
+							   (timeout >= 0) ? timeout : INFINITE);
 		if (rc == WAIT_FAILED)
 			elog(ERROR, "WaitForMultipleObjects() failed: error code %d", (int) GetLastError());
 		else if (rc == WAIT_TIMEOUT)
@@ -187,15 +190,10 @@ SetLatch(volatile Latch *latch)
 
 	/*
 	 * See if anyone's waiting for the latch. It can be the current process if
-	 * we're in a signal handler. Use a local variable here in case the latch
-	 * is just disowned between the test and the SetEvent call, and event
-	 * field set to NULL.
+	 * we're in a signal handler.
 	 *
-	 * Fetch handle field only once, in case the owner simultaneously disowns
-	 * the latch and clears handle. This assumes that HANDLE is atomic, which
-	 * isn't guaranteed to be true! In practice, it should be, and in the
-	 * worst case we end up calling SetEvent with a bogus handle, and SetEvent
-	 * will return an error with no harm done.
+	 * Use a local variable here just in case somebody changes the event field
+	 * concurrently (which really should not happen).
 	 */
 	handle = latch->event;
 	if (handle)
@@ -212,5 +210,8 @@ SetLatch(volatile Latch *latch)
 void
 ResetLatch(volatile Latch *latch)
 {
+	/* Only the owner should reset the latch */
+	Assert(latch->owner_pid == MyProcPid);
+
 	latch->is_set = false;
 }
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index fcc912f8e3f5e..3d57c45377235 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -526,6 +526,27 @@ AutoVacLauncherMain(int argc, char *argv[])
 	/* must unblock signals before calling rebuild_database_list */
 	PG_SETMASK(&UnBlockSig);
 
+	/*
+	 * Force zero_damaged_pages OFF in the autovac process, even if it is set
+	 * in postgresql.conf.	We don't really want such a dangerous option being
+	 * applied non-interactively.
+	 */
+	SetConfigOption("zero_damaged_pages", "false", PGC_SUSET, PGC_S_OVERRIDE);
+
+	/*
+	 * Force statement_timeout to zero to avoid a timeout setting from
+	 * preventing regular maintenance from being executed.
+	 */
+	SetConfigOption("statement_timeout", "0", PGC_SUSET, PGC_S_OVERRIDE);
+
+	/*
+	 * Force default_transaction_isolation to READ COMMITTED.  We don't
+	 * want to pay the overhead of serializable mode, nor add any risk
+	 * of causing deadlocks or delaying other transactions.
+	 */
+	SetConfigOption("default_transaction_isolation", "read committed",
+					PGC_SUSET, PGC_S_OVERRIDE);
+
 	/* in emergency mode, just start a worker and go away */
 	if (!AutoVacuumingActive())
 	{
@@ -714,7 +735,7 @@ AutoVacLauncherMain(int argc, char *argv[])
 					worker->wi_links.next = (SHM_QUEUE *) AutoVacuumShmem->av_freeWorkers;
 					AutoVacuumShmem->av_freeWorkers = worker;
 					AutoVacuumShmem->av_startingWorker = NULL;
-					elog(WARNING, "worker took too long to start; cancelled");
+					elog(WARNING, "worker took too long to start; canceled");
 				}
 			}
 			else
@@ -1461,7 +1482,7 @@ AutoVacWorkerMain(int argc, char *argv[])
 	pqsignal(SIGHUP, SIG_IGN);
 
 	/*
-	 * SIGINT is used to signal cancelling the current table's vacuum; SIGTERM
+	 * SIGINT is used to signal canceling the current table's vacuum; SIGTERM
 	 * means abort and exit cleanly, and SIGQUIT means abandon ship.
 	 */
 	pqsignal(SIGINT, StatementCancelHandler);
@@ -1527,13 +1548,22 @@ AutoVacWorkerMain(int argc, char *argv[])
 	 */
 	SetConfigOption("statement_timeout", "0", PGC_SUSET, PGC_S_OVERRIDE);
 
+	/*
+	 * Force default_transaction_isolation to READ COMMITTED.  We don't
+	 * want to pay the overhead of serializable mode, nor add any risk
+	 * of causing deadlocks or delaying other transactions.
+	 */
+	SetConfigOption("default_transaction_isolation", "read committed",
+					PGC_SUSET, PGC_S_OVERRIDE);
+
 	/*
 	 * Force synchronous replication off to allow regular maintenance even if
 	 * we are waiting for standbys to connect. This is important to ensure we
 	 * aren't blocked from performing anti-wraparound tasks.
 	 */
 	if (synchronous_commit > SYNCHRONOUS_COMMIT_LOCAL_FLUSH)
-		SetConfigOption("synchronous_commit", "local", PGC_SUSET, PGC_S_OVERRIDE);
+		SetConfigOption("synchronous_commit", "local",
+						PGC_SUSET, PGC_S_OVERRIDE);
 
 	/*
 	 * Get the info about the database we're going to work on.
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 1f4ac93d8d7b5..5643ec821af2d 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -1182,7 +1182,7 @@ CompactBgwriterRequestQueue()
 	 * intervening FORGET_RELATION_FSYNC or FORGET_DATABASE_FSYNC request, so
 	 * we do it this way.  It would be possible to be even smarter if we made
 	 * the code below understand the specific semantics of such requests (it
-	 * could blow away preceding entries that would end up being cancelled
+	 * could blow away preceding entries that would end up being canceled
 	 * anyhow), but it's not clear that the extra complexity would buy us
 	 * anything.
 	 */
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 1f0d4e63fb0ce..367aa0ca50649 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -437,6 +437,7 @@ typedef struct
 	TimestampTz PgStartTime;
 	TimestampTz PgReloadTime;
 	bool		redirection_done;
+	bool		IsBinaryUpgrade;
 #ifdef WIN32
 	HANDLE		PostmasterHandle;
 	HANDLE		initial_signal_pipe;
@@ -766,7 +767,7 @@ PostmasterMain(int argc, char *argv[])
 		char	  **p;
 
 		ereport(DEBUG3,
-				(errmsg_internal("%s: PostmasterMain: initial environ dump:",
+				(errmsg_internal("%s: PostmasterMain: initial environment dump:",
 								 progname)));
 		ereport(DEBUG3,
 			 (errmsg_internal("-----------------------------------------")));
@@ -4742,6 +4743,7 @@ save_backend_variables(BackendParameters *param, Port *port,
 	param->PgReloadTime = PgReloadTime;
 
 	param->redirection_done = redirection_done;
+	param->IsBinaryUpgrade = IsBinaryUpgrade;
 
 #ifdef WIN32
 	param->PostmasterHandle = PostmasterHandle;
@@ -4960,6 +4962,7 @@ restore_backend_variables(BackendParameters *param, Port *port)
 	PgReloadTime = param->PgReloadTime;
 
 	redirection_done = param->redirection_done;
+	IsBinaryUpgrade = param->IsBinaryUpgrade;
 
 #ifdef WIN32
 	PostmasterHandle = param->PostmasterHandle;
diff --git a/src/backend/replication/Makefile b/src/backend/replication/Makefile
index 3fe490e580f82..9d9ec87c9afca 100644
--- a/src/backend/replication/Makefile
+++ b/src/backend/replication/Makefile
@@ -12,6 +12,8 @@ subdir = src/backend/replication
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+
 OBJS = walsender.o walreceiverfuncs.o walreceiver.o basebackup.o \
 	repl_gram.o syncrep.o
 
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index 030a283e817a5..d6ed49a26faa3 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -119,7 +119,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			if (readlink(fullpath, linkpath, sizeof(linkpath) - 1) == -1)
 			{
 				ereport(WARNING,
-				  (errmsg("unable to read symbolic link %s: %m", fullpath)));
+				  (errmsg("could not read symbolic link \"%s\": %m", fullpath)));
 				continue;
 			}
 
@@ -363,7 +363,7 @@ SendBaseBackup(BaseBackupCmd *cmd)
 	dir = AllocateDir("pg_tblspc");
 	if (!dir)
 		ereport(ERROR,
-				(errmsg("unable to open directory pg_tblspc: %m")));
+				(errmsg("could not open directory \"pg_tblspc\": %m")));
 
 	perform_base_backup(&opt, dir);
 
@@ -577,15 +577,16 @@ sendDir(char *path, int basepathlen, bool sizeonly)
 
 		snprintf(pathbuf, MAXPGPATH, "%s/%s", path, de->d_name);
 
-		/* Skip postmaster.pid in the data directory */
-		if (strcmp(pathbuf, "./postmaster.pid") == 0)
+		/* Skip postmaster.pid and postmaster.opts in the data directory */
+		if (strcmp(pathbuf, "./postmaster.pid") == 0 ||
+			strcmp(pathbuf, "./postmaster.opts") == 0)
 			continue;
 
 		if (lstat(pathbuf, &statbuf) != 0)
 		{
 			if (errno != ENOENT)
 				ereport(ERROR,
-						(errcode(errcode_for_file_access()),
+						(errcode_for_file_access(),
 						 errmsg("could not stat file or directory \"%s\": %m",
 								pathbuf)));
 
@@ -627,7 +628,7 @@ sendDir(char *path, int basepathlen, bool sizeonly)
 			MemSet(linkpath, 0, sizeof(linkpath));
 			if (readlink(pathbuf, linkpath, sizeof(linkpath) - 1) == -1)
 				ereport(ERROR,
-						(errcode(errcode_for_file_access()),
+						(errcode_for_file_access(),
 						 errmsg("could not read symbolic link \"%s\": %m",
 								pathbuf)));
 			if (!sizeonly)
@@ -721,7 +722,7 @@ sendFile(char *readfilename, char *tarfilename, struct stat * statbuf)
 	fp = AllocateFile(readfilename, "rb");
 	if (fp == NULL)
 		ereport(ERROR,
-				(errcode(errcode_for_file_access()),
+				(errcode_for_file_access(),
 				 errmsg("could not open file \"%s\": %m", readfilename)));
 
 	/*
diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index 4930ad1d097c6..d99708ca8ebb3 100644
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -16,10 +16,10 @@
 #include "postgres.h"
 
 #include "nodes/makefuncs.h"
-#include "nodes/parsenodes.h"
-#include "replication/replnodes.h"
+#include "nodes/replnodes.h"
 #include "replication/walsender.h"
 
+
 /* Result of the parsing is returned here */
 Node *replication_parse_result;
 
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index 08a40866f074d..6463420cd85f4 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -111,9 +111,6 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 	Assert(SHMQueueIsDetached(&(MyProc->syncRepLinks)));
 	Assert(WalSndCtl != NULL);
 
-	/* Reset the latch before adding ourselves to the queue. */
-	ResetLatch(&MyProc->waitLatch);
-
 	LWLockAcquire(SyncRepLock, LW_EXCLUSIVE);
 	Assert(MyProc->syncRepState == SYNC_REP_NOT_WAITING);
 
@@ -166,15 +163,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 	{
 		int			syncRepState;
 
-		/*
-		 * Wait on latch for up to 60 seconds. This allows us to check for
-		 * postmaster death regularly while waiting. Note that timeout here
-		 * does not necessarily release from loop.
-		 */
-		WaitLatch(&MyProc->waitLatch, 60000000L);
-
 		/* Must reset the latch before testing state. */
-		ResetLatch(&MyProc->waitLatch);
+		ResetLatch(&MyProc->procLatch);
 
 		/*
 		 * Try checking the state without the lock first.  There's no
@@ -184,6 +174,12 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 		 * walsender changes the state to SYNC_REP_WAIT_COMPLETE, it will
 		 * never update it again, so we can't be seeing a stale value in that
 		 * case.
+		 *
+		 * Note: on machines with weak memory ordering, the acquisition of
+		 * the lock is essential to avoid race conditions: we cannot be sure
+		 * the sender's state update has reached main memory until we acquire
+		 * the lock.  We could get rid of this dance if SetLatch/ResetLatch
+		 * contained memory barriers.
 		 */
 		syncRepState = MyProc->syncRepState;
 		if (syncRepState == SYNC_REP_WAITING)
@@ -202,7 +198,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 		 * is not true: it's already committed locally. The former is no good
 		 * either: the client has requested synchronous replication, and is
 		 * entitled to assume that an acknowledged commit is also replicated,
-		 * which may not be true. So in this case we issue a WARNING (which
+		 * which might not be true. So in this case we issue a WARNING (which
 		 * some clients may be able to interpret) and shut off further output.
 		 * We do NOT reset ProcDiePending, so that the process will die after
 		 * the commit is cleaned up.
@@ -212,7 +208,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 			ereport(WARNING,
 					(errcode(ERRCODE_ADMIN_SHUTDOWN),
 					 errmsg("canceling the wait for synchronous replication and terminating connection due to administrator command"),
-					 errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
+					 errdetail("The transaction has already committed locally, but might not have been replicated to the standby.")));
 			whereToSendOutput = DestNone;
 			SyncRepCancelWait();
 			break;
@@ -229,7 +225,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 			QueryCancelPending = false;
 			ereport(WARNING,
 					(errmsg("canceling wait for synchronous replication due to user request"),
-					 errdetail("The transaction has already committed locally, but may not have been replicated to the standby.")));
+					 errdetail("The transaction has already committed locally, but might not have been replicated to the standby.")));
 			SyncRepCancelWait();
 			break;
 		}
@@ -246,6 +242,13 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN)
 			SyncRepCancelWait();
 			break;
 		}
+
+		/*
+		 * Wait on latch for up to 10 seconds. This allows us to check for
+		 * cancel/die signal or postmaster death regularly while waiting. Note
+		 * that timeout here does not necessarily release from loop.
+		 */
+		WaitLatch(&MyProc->procLatch, 10000L);
 	}
 
 	/*
@@ -316,7 +319,7 @@ SyncRepCancelWait(void)
 }
 
 void
-SyncRepCleanupAtProcExit(int code, Datum arg)
+SyncRepCleanupAtProcExit(void)
 {
 	if (!SHMQueueIsDetached(&(MyProc->syncRepLinks)))
 	{
@@ -324,8 +327,6 @@ SyncRepCleanupAtProcExit(int code, Datum arg)
 		SHMQueueDelete(&(MyProc->syncRepLinks));
 		LWLockRelease(SyncRepLock);
 	}
-
-	DisownLatch(&MyProc->waitLatch);
 }
 
 /*
@@ -554,9 +555,7 @@ SyncRepWakeQueue(bool all)
 		/*
 		 * Wake only when we have set state and removed from queue.
 		 */
-		Assert(SHMQueueIsDetached(&(thisproc->syncRepLinks)));
-		Assert(thisproc->syncRepState == SYNC_REP_WAIT_COMPLETE);
-		SetLatch(&(thisproc->waitLatch));
+		SetLatch(&(thisproc->procLatch));
 
 		numprocs++;
 	}
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
index 471c844ab2a7d..18b4727fa81fc 100644
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -373,11 +373,15 @@ WalRcvSigHupHandler(SIGNAL_ARGS)
 static void
 WalRcvShutdownHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	got_SIGTERM = true;
 
 	/* Don't joggle the elbow of proc_exit */
 	if (!proc_exit_inprogress && WalRcvImmediateInterruptOK)
 		ProcessWalRcvInterrupts();
+
+	errno = save_errno;
 }
 
 /*
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 470e6d170d49b..3497269850de5 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -37,16 +37,16 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "funcapi.h"
-#include "access/xlog_internal.h"
 #include "access/transam.h"
+#include "access/xlog_internal.h"
 #include "catalog/pg_type.h"
+#include "funcapi.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "nodes/replnodes.h"
 #include "replication/basebackup.h"
-#include "replication/replnodes.h"
 #include "replication/walprotocol.h"
 #include "replication/walsender.h"
 #include "storage/fd.h"
@@ -515,7 +515,7 @@ ProcessRepliesIfAny(void)
 			default:
 				ereport(FATAL,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
-						 errmsg("invalid standby message type %d",
+						 errmsg("invalid standby message type \"%c\"",
 								firstchar)));
 		}
 	}
@@ -566,7 +566,7 @@ ProcessStandbyMessage(void)
 		default:
 			ereport(COMMERROR,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
-					 errmsg("unexpected message type %c", msgtype)));
+					 errmsg("unexpected message type \"%c\"", msgtype)));
 			proc_exit(0);
 	}
 }
@@ -611,76 +611,67 @@ static void
 ProcessStandbyHSFeedbackMessage(void)
 {
 	StandbyHSFeedbackMessage reply;
-	TransactionId newxmin = InvalidTransactionId;
+	TransactionId nextXid;
+	uint32		nextEpoch;
 
-	pq_copymsgbytes(&reply_message, (char *) &reply, sizeof(StandbyHSFeedbackMessage));
+	/* Decipher the reply message */
+	pq_copymsgbytes(&reply_message, (char *) &reply,
+					sizeof(StandbyHSFeedbackMessage));
 
 	elog(DEBUG2, "hot standby feedback xmin %u epoch %u",
 		 reply.xmin,
 		 reply.epoch);
 
+	/* Ignore invalid xmin (can't actually happen with current walreceiver) */
+	if (!TransactionIdIsNormal(reply.xmin))
+		return;
+
 	/*
-	 * Update the WalSender's proc xmin to allow it to be visible to
-	 * snapshots. This will hold back the removal of dead rows and thereby
-	 * prevent the generation of cleanup conflicts on the standby server.
+	 * Check that the provided xmin/epoch are sane, that is, not in the future
+	 * and not so far back as to be already wrapped around.  Ignore if not.
+	 *
+	 * Epoch of nextXid should be same as standby, or if the counter has
+	 * wrapped, then one greater than standby.
 	 */
-	if (TransactionIdIsValid(reply.xmin))
-	{
-		TransactionId nextXid;
-		uint32		nextEpoch;
-		bool		epochOK = false;
-
-		GetNextXidAndEpoch(&nextXid, &nextEpoch);
+	GetNextXidAndEpoch(&nextXid, &nextEpoch);
 
-		/*
-		 * Epoch of oldestXmin should be same as standby or if the counter has
-		 * wrapped, then one less than reply.
-		 */
-		if (reply.xmin <= nextXid)
-		{
-			if (reply.epoch == nextEpoch)
-				epochOK = true;
-		}
-		else
-		{
-			if (nextEpoch > 0 && reply.epoch == nextEpoch - 1)
-				epochOK = true;
-		}
-
-		/*
-		 * Feedback from standby must not go backwards, nor should it go
-		 * forwards further than our most recent xid.
-		 */
-		if (epochOK && TransactionIdPrecedesOrEquals(reply.xmin, nextXid))
-		{
-			if (!TransactionIdIsValid(MyProc->xmin))
-			{
-				TransactionId oldestXmin = GetOldestXmin(true, true);
-
-				if (TransactionIdPrecedes(oldestXmin, reply.xmin))
-					newxmin = reply.xmin;
-				else
-					newxmin = oldestXmin;
-			}
-			else
-			{
-				if (TransactionIdPrecedes(MyProc->xmin, reply.xmin))
-					newxmin = reply.xmin;
-				else
-					newxmin = MyProc->xmin;		/* stay the same */
-			}
-		}
+	if (reply.xmin <= nextXid)
+	{
+		if (reply.epoch != nextEpoch)
+			return;
+	}
+	else
+	{
+		if (reply.epoch + 1 != nextEpoch)
+			return;
 	}
 
+	if (!TransactionIdPrecedesOrEquals(reply.xmin, nextXid))
+		return;					/* epoch OK, but it's wrapped around */
+
 	/*
-	 * Grab the ProcArrayLock to set xmin, or invalidate for bad reply
+	 * Set the WalSender's xmin equal to the standby's requested xmin, so that
+	 * the xmin will be taken into account by GetOldestXmin.  This will hold
+	 * back the removal of dead rows and thereby prevent the generation of
+	 * cleanup conflicts on the standby server.
+	 *
+	 * There is a small window for a race condition here: although we just
+	 * checked that reply.xmin precedes nextXid, the nextXid could have gotten
+	 * advanced between our fetching it and applying the xmin below, perhaps
+	 * far enough to make reply.xmin wrap around.  In that case the xmin we
+	 * set here would be "in the future" and have no effect.  No point in
+	 * worrying about this since it's too late to save the desired data
+	 * anyway.  Assuming that the standby sends us an increasing sequence of
+	 * xmins, this could only happen during the first reply cycle, else our
+	 * own xmin would prevent nextXid from advancing so far.
+	 *
+	 * We don't bother taking the ProcArrayLock here.  Setting the xmin field
+	 * is assumed atomic, and there's no real need to prevent a concurrent
+	 * GetOldestXmin.  (If we're moving our xmin forward, this is obviously
+	 * safe, and if we're moving it backwards, well, the data is at risk
+	 * already since a VACUUM could have just finished calling GetOldestXmin.)
 	 */
-	if (MyProc->xmin != newxmin)
-	{
-		LWLockAcquire(ProcArrayLock, LW_SHARED);
-		MyProc->xmin = newxmin;
-		LWLockRelease(ProcArrayLock);
-	}
+	MyProc->xmin = reply.xmin;
 }
 
 /* Main loop of walsender process */
@@ -807,7 +798,7 @@ WalSndLoop(void)
 			/* Sleep */
 			WaitLatchOrSocket(&MyWalSnd->latch, MyProcPort->sock,
 							  true, pq_is_send_pending(),
-							  sleeptime * 1000L);
+							  sleeptime);
 
 			/* Check for replication timeout */
 			if (replication_timeout > 0 &&
@@ -1188,18 +1179,33 @@ XLogSend(char *msgbuf, bool *caughtup)
 static void
 WalSndSigHupHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	got_SIGHUP = true;
 	if (MyWalSnd)
 		SetLatch(&MyWalSnd->latch);
+
+	errno = save_errno;
 }
 
 /* SIGTERM: set flag to shut down */
 static void
 WalSndShutdownHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	walsender_shutdown_requested = true;
 	if (MyWalSnd)
 		SetLatch(&MyWalSnd->latch);
+
+	/*
+	 * Set the standard (non-walsender) state as well, so that we can
+	 * abort things like do_pg_stop_backup().
+	 */
+	InterruptPending = true;
+	ProcDiePending = true;
+
+	errno = save_errno;
 }
 
 /*
@@ -1238,16 +1244,24 @@ WalSndQuickDieHandler(SIGNAL_ARGS)
 static void
 WalSndXLogSendHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	latch_sigusr1_handler();
+
+	errno = save_errno;
 }
 
 /* SIGUSR2: set flag to do a last cycle and shut down afterwards */
 static void
 WalSndLastCycleHandler(SIGNAL_ARGS)
 {
+	int			save_errno = errno;
+
 	walsender_ready_to_stop = true;
 	if (MyWalSnd)
 		SetLatch(&MyWalSnd->latch);
+
+	errno = save_errno;
 }
 
 /* Set up signal handlers */
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 52c55def155e5..7687bb1266bdb 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -240,23 +240,22 @@ DefineQueryRewrite(char *rulename,
 	/*
 	 * If we are installing an ON SELECT rule, we had better grab
 	 * AccessExclusiveLock to ensure no SELECTs are currently running on the
-	 * event relation.	For other types of rules, it is sufficient to grab
-	 * ShareRowExclusiveLock to lock out insert/update/delete actions and to
-	 * ensure that we lock out current CREATE RULE statements.
+	 * event relation. For other types of rules, it would be sufficient to
+	 * grab ShareRowExclusiveLock to lock out insert/update/delete actions and
+	 * to ensure that we lock out current CREATE RULE statements; but because
+	 * of race conditions in access to catalog entries, we can't do that yet.
 	 */
-	if (event_type == CMD_SELECT)
-		event_relation = heap_open(event_relid, AccessExclusiveLock);
-	else
-		event_relation = heap_open(event_relid, ShareRowExclusiveLock);
+	event_relation = heap_open(event_relid, AccessExclusiveLock);
 
 	/*
 	 * Verify relation is of a type that rules can sensibly be applied to.
 	 */
 	if (event_relation->rd_rel->relkind != RELKIND_RELATION &&
-		event_relation->rd_rel->relkind != RELKIND_VIEW)
+	    event_relation->rd_rel->relkind != RELKIND_VIEW &&
+	    event_relation->rd_rel->relkind != RELKIND_MAT_VIEW)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is not a table or view",
+				 errmsg("\"%s\" is not a table or view.",
 						RelationGetRelationName(event_relation))));
 
 	if (!allowSystemTableMods && IsSystemRelation(event_relation))
@@ -397,6 +396,11 @@ DefineQueryRewrite(char *rulename,
 			rulename = pstrdup(ViewSelectRuleName);
 		}
 
+		if (strcmp(rulename, MatViewSelectRuleName) != 0)
+		{
+		  rulename = pstrdup(MatViewSelectRuleName);
+		}
+		
 		/*
 		 * Are we converting a relation to a view?
 		 *
@@ -408,7 +412,8 @@ DefineQueryRewrite(char *rulename,
 		 * business of converting relations to views is just a kluge to allow
 		 * loading ancient pg_dump files.)
 		 */
-		if (event_relation->rd_rel->relkind != RELKIND_VIEW)
+		if (event_relation->rd_rel->relkind != RELKIND_VIEW &&
+		    event_relation->rd_rel->relkind != RELKIND_MAT_VIEW)
 		{
 			HeapScanDesc scanDesc;
 
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 6ef20a5bb537c..4afeda9873329 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -1188,7 +1188,8 @@ rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte,
 		 */
 		var = makeWholeRowVar(target_rte,
 							  parsetree->resultRelation,
-							  0);
+							  0,
+							  false);
 
 		attrname = "wholerow";
 	}
@@ -1389,6 +1390,8 @@ ApplyRetrieveRule(Query *parsetree,
 	 * checks will actually be done against the OLD entry therein.
 	 */
 	subrte = rt_fetch(PRS2_OLD_VARNO, rule_action->rtable);
+	printf("rewriteHandler.c:1393 Subrte->relid-> %d, Relation->\
+            rd_id->%d\n",subrte->relid,relation->rd_id);
 	Assert(subrte->relid == relation->rd_id);
 	subrte->requiredPerms = rte->requiredPerms;
 	subrte->checkAsUser = rte->checkAsUser;
@@ -1596,6 +1599,7 @@ fireRIRrules(Query *parsetree, List *activeRIRs, bool forUpdatePushedDown)
 			continue;
 		}
 		locks = NIL;
+		printf("rewriteHandler 1600: rules -> numLocks %d\n", rules -> numLocks);
 		for (i = 0; i < rules->numLocks; i++)
 		{
 			rule = rules->rules[i];
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index b12348b39dd4f..d07c997d47cdb 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -952,7 +952,7 @@ MarkBufferDirty(Buffer buffer)
 	volatile BufferDesc *bufHdr;
 
 	if (!BufferIsValid(buffer))
-		elog(ERROR, "bad buffer id: %d", buffer);
+		elog(ERROR, "bad buffer ID: %d", buffer);
 
 	if (BufferIsLocal(buffer))
 	{
@@ -1474,7 +1474,18 @@ BgBufferSync(void)
 			smoothing_samples;
 
 	/* Scale the estimate by a GUC to allow more aggressive tuning. */
-	upcoming_alloc_est = smoothed_alloc * bgwriter_lru_multiplier;
+	upcoming_alloc_est = (int) (smoothed_alloc * bgwriter_lru_multiplier);
+
+	/*
+	 * If recent_alloc remains at zero for many cycles, smoothed_alloc will
+	 * eventually underflow to zero, and the underflows produce annoying
+	 * kernel warnings on some platforms.  Once upcoming_alloc_est has gone
+	 * to zero, there's no point in tracking smaller and smaller values of
+	 * smoothed_alloc, so just reset it to exactly zero to avoid this
+	 * syndrome.  It will pop back up as soon as recent_alloc increases.
+	 */
+	if (upcoming_alloc_est == 0)
+		smoothed_alloc = 0;
 
 	/*
 	 * Even in cases where there's been little or no buffer allocation
@@ -2198,7 +2209,7 @@ ReleaseBuffer(Buffer buffer)
 	volatile BufferDesc *bufHdr;
 
 	if (!BufferIsValid(buffer))
-		elog(ERROR, "bad buffer id: %d", buffer);
+		elog(ERROR, "bad buffer ID: %d", buffer);
 
 	ResourceOwnerForgetBuffer(CurrentResourceOwner, buffer);
 
@@ -2270,7 +2281,7 @@ SetBufferCommitInfoNeedsSave(Buffer buffer)
 	volatile BufferDesc *bufHdr;
 
 	if (!BufferIsValid(buffer))
-		elog(ERROR, "bad buffer id: %d", buffer);
+		elog(ERROR, "bad buffer ID: %d", buffer);
 
 	if (BufferIsLocal(buffer))
 	{
@@ -2449,10 +2460,11 @@ LockBufferForCleanup(Buffer buffer)
 		/* Wait to be signaled by UnpinBuffer() */
 		if (InHotStandby)
 		{
-			/* Share the bufid that Startup process waits on */
+			/* Publish the bufid that Startup process waits on */
 			SetStartupBufferPinWaitBufId(buffer - 1);
 			/* Set alarm and then wait to be signaled by UnpinBuffer() */
 			ResolveRecoveryConflictWithBufferPin();
+			/* Reset the published bufid */
 			SetStartupBufferPinWaitBufId(-1);
 		}
 		else
@@ -2465,7 +2477,7 @@ LockBufferForCleanup(Buffer buffer)
 
 /*
  * Check called from RecoveryConflictInterrupt handler when Startup
- * process requests cancelation of all pin holders that are blocking it.
+ * process requests cancellation of all pin holders that are blocking it.
  */
 bool
 HoldingBufferPinThatDelaysRecovery(void)
diff --git a/src/backend/storage/file/reinit.c b/src/backend/storage/file/reinit.c
index 837ab90c8d8fb..79e2ea349a4e7 100644
--- a/src/backend/storage/file/reinit.c
+++ b/src/backend/storage/file/reinit.c
@@ -54,10 +54,9 @@ ResetUnloggedRelations(int op)
 				oldctx;
 
 	/* Log it. */
-	ereport(DEBUG1,
-			(errmsg("resetting unlogged relations: cleanup %d init %d",
-					(op & UNLOGGED_RELATION_CLEANUP) != 0,
-					(op & UNLOGGED_RELATION_INIT) != 0)));
+	elog(DEBUG1, "resetting unlogged relations: cleanup %d init %d",
+		 (op & UNLOGGED_RELATION_CLEANUP) != 0,
+		 (op & UNLOGGED_RELATION_INIT) != 0);
 
 	/*
 	 * Just to be sure we don't leak any memory, let's create a temporary
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index e7593fa2ebe05..00dc9c853c93d 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -476,8 +476,9 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 
 	/*
 	 * If our initial RunningTransactionsData had an overflowed snapshot then
-	 * we knew we were missing some subxids from our snapshot. We can use this
-	 * data as an initial snapshot, but we cannot yet mark it valid. We know
+	 * we knew we were missing some subxids from our snapshot. If we continue
+	 * to see overflowed snapshots then we might never be able to start up,
+	 * so we make another test to see if our snapshot is now valid. We know
 	 * that the missing subxids are equal to or earlier than nextXid. After we
 	 * initialise we continue to apply changes during recovery, so once the
 	 * oldestRunningXid is later than the nextXid from the initial snapshot we
@@ -486,21 +487,31 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 	 */
 	if (standbyState == STANDBY_SNAPSHOT_PENDING)
 	{
-		if (TransactionIdPrecedes(standbySnapshotPendingXmin,
-								  running->oldestRunningXid))
+		/*
+		 * If the snapshot isn't overflowed or if its empty we can
+		 * reset our pending state and use this snapshot instead.
+		 */
+		if (!running->subxid_overflow || running->xcnt == 0)
 		{
-			standbyState = STANDBY_SNAPSHOT_READY;
-			elog(trace_recovery(DEBUG2),
-				 "running xact data now proven complete");
-			elog(trace_recovery(DEBUG2),
-				 "recovery snapshots are now enabled");
+			standbyState = STANDBY_INITIALIZED;
 		}
 		else
-			elog(trace_recovery(DEBUG2),
-				 "recovery snapshot waiting for %u oldest active xid on standby is %u",
-				 standbySnapshotPendingXmin,
-				 running->oldestRunningXid);
-		return;
+		{
+			if (TransactionIdPrecedes(standbySnapshotPendingXmin,
+									  running->oldestRunningXid))
+			{
+				standbyState = STANDBY_SNAPSHOT_READY;
+				elog(trace_recovery(DEBUG1),
+					 "recovery snapshots are now enabled");
+			}
+			else
+				elog(trace_recovery(DEBUG1),
+					 "recovery snapshot waiting for non-overflowed snapshot or "
+					 "until oldest active xid on standby is at least %u (now %u)",
+					 standbySnapshotPendingXmin,
+					 running->oldestRunningXid);
+			return;
+		}
 	}
 
 	Assert(standbyState == STANDBY_INITIALIZED);
@@ -605,7 +616,6 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 		standbyState = STANDBY_SNAPSHOT_READY;
 
 		standbySnapshotPendingXmin = InvalidTransactionId;
-		procArray->lastOverflowedXid = InvalidTransactionId;
 	}
 
 	/*
@@ -628,13 +638,15 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 
 	LWLockRelease(ProcArrayLock);
 
-	elog(trace_recovery(DEBUG2), "running transaction data initialized");
 	KnownAssignedXidsDisplay(trace_recovery(DEBUG3));
 	if (standbyState == STANDBY_SNAPSHOT_READY)
-		elog(trace_recovery(DEBUG2), "recovery snapshots are now enabled");
+		elog(trace_recovery(DEBUG1), "recovery snapshots are now enabled");
 	else
-		ereport(LOG,
-				(errmsg("consistent state delayed because recovery snapshot incomplete")));
+		elog(trace_recovery(DEBUG1),
+			 "recovery snapshot waiting for non-overflowed snapshot or "
+			 "until oldest active xid on standby is at least %u (now %u)",
+			 standbySnapshotPendingXmin,
+			 running->oldestRunningXid);
 }
 
 /*
@@ -998,22 +1010,32 @@ TransactionIdIsActive(TransactionId xid)
  * This is also used to determine where to truncate pg_subtrans.  allDbs
  * must be TRUE for that case, and ignoreVacuum FALSE.
  *
- * Note: it's possible for the calculated value to move backwards on repeated
- * calls. The calculated value is conservative, so that anything older is
- * definitely not considered as running by anyone anymore, but the exact
- * value calculated depends on a number of things. For example, if allDbs is
- * TRUE and there are no transactions running in the current database,
- * GetOldestXmin() returns latestCompletedXid. If a transaction begins after
- * that, its xmin will include in-progress transactions in other databases
- * that started earlier, so another call will return an lower value. The
- * return value is also adjusted with vacuum_defer_cleanup_age, so increasing
- * that setting on the fly is an easy way to have GetOldestXmin() move
- * backwards.
- *
  * Note: we include all currently running xids in the set of considered xids.
  * This ensures that if a just-started xact has not yet set its snapshot,
  * when it does set the snapshot it cannot set xmin less than what we compute.
  * See notes in src/backend/access/transam/README.
+ *
+ * Note: despite the above, it's possible for the calculated value to move
+ * backwards on repeated calls. The calculated value is conservative, so that
+ * anything older is definitely not considered as running by anyone anymore,
+ * but the exact value calculated depends on a number of things. For example,
+ * if allDbs is FALSE and there are no transactions running in the current
+ * database, GetOldestXmin() returns latestCompletedXid. If a transaction
+ * begins after that, its xmin will include in-progress transactions in other
+ * databases that started earlier, so another call will return a lower value.
+ * Nonetheless it is safe to vacuum a table in the current database with the
+ * first result.  There are also replication-related effects: a walsender
+ * process can set its xmin based on transactions that are no longer running
+ * in the master but are still being replayed on the standby, thus possibly
+ * making the GetOldestXmin reading go backwards.  In this case there is a
+ * possibility that we lose data that the standby would like to have, but
+ * there is little we can do about that --- data is only protected if the
+ * walsender runs continuously while queries are executed on the standby.
+ * (The Hot Standby code deals with such cases by failing standby queries
+ * that needed to access already-removed data, so there's no integrity bug.)
+ * The return value is also adjusted with vacuum_defer_cleanup_age, so
+ * increasing that setting on the fly is another easy way to make
+ * GetOldestXmin() move backwards, with no consequences for data integrity.
  */
 TransactionId
 GetOldestXmin(bool allDbs, bool ignoreVacuum)
@@ -1046,7 +1068,7 @@ GetOldestXmin(bool allDbs, bool ignoreVacuum)
 
 		if (allDbs ||
 			proc->databaseId == MyDatabaseId ||
-			proc->databaseId == 0)		/* include WalSender */
+			proc->databaseId == 0)		/* always include WalSender */
 		{
 			/* Fetch xid just once - see GetNewTransactionId */
 			TransactionId xid = proc->xid;
@@ -1092,16 +1114,18 @@ GetOldestXmin(bool allDbs, bool ignoreVacuum)
 		LWLockRelease(ProcArrayLock);
 
 		/*
-		 * Compute the cutoff XID, being careful not to generate a "permanent"
-		 * XID. We need do this only on the primary, never on standby.
+		 * Compute the cutoff XID by subtracting vacuum_defer_cleanup_age,
+		 * being careful not to generate a "permanent" XID.
 		 *
 		 * vacuum_defer_cleanup_age provides some additional "slop" for the
 		 * benefit of hot standby queries on slave servers.  This is quick and
 		 * dirty, and perhaps not all that useful unless the master has a
-		 * predictable transaction rate, but it's what we've got.  Note that
-		 * we are assuming vacuum_defer_cleanup_age isn't large enough to
-		 * cause wraparound --- so guc.c should limit it to no more than the
-		 * xidStopLimit threshold in varsup.c.
+		 * predictable transaction rate, but it offers some protection when
+		 * there's no walsender connection.  Note that we are assuming
+		 * vacuum_defer_cleanup_age isn't large enough to cause wraparound ---
+		 * so guc.c should limit it to no more than the xidStopLimit threshold
+		 * in varsup.c.  Also note that we intentionally don't apply
+		 * vacuum_defer_cleanup_age on standby servers.
 		 */
 		result -= vacuum_defer_cleanup_age;
 		if (!TransactionIdIsNormal(result))
@@ -1504,6 +1528,63 @@ GetRunningTransactionData(void)
 	return CurrentRunningXacts;
 }
 
+/*
+ * GetOldestActiveTransactionId()
+ *
+ * Similar to GetSnapshotData but returns just oldestActiveXid. We include
+ * all PGPROCs with an assigned TransactionId, even VACUUM processes.
+ * We look at all databases, though there is no need to include WALSender
+ * since this has no effect on hot standby conflicts.
+ *
+ * This is never executed during recovery so there is no need to look at
+ * KnownAssignedXids.
+ *
+ * We don't worry about updating other counters, we want to keep this as
+ * simple as possible and leave GetSnapshotData() as the primary code for
+ * that bookkeeping.
+ */
+TransactionId
+GetOldestActiveTransactionId(void)
+{
+	ProcArrayStruct *arrayP = procArray;
+	TransactionId oldestRunningXid;
+	int			index;
+
+	Assert(!RecoveryInProgress());
+
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+
+	oldestRunningXid = ShmemVariableCache->nextXid;
+
+	/*
+	 * Spin over procArray collecting all xids and subxids.
+	 */
+	for (index = 0; index < arrayP->numProcs; index++)
+	{
+		volatile PGPROC *proc = arrayP->procs[index];
+		TransactionId xid;
+
+		/* Fetch xid just once - see GetNewTransactionId */
+		xid = proc->xid;
+
+		if (!TransactionIdIsNormal(xid))
+			continue;
+
+		if (TransactionIdPrecedes(xid, oldestRunningXid))
+			oldestRunningXid = xid;
+
+		/*
+		 * Top-level XID of a transaction is always less than any of its
+		 * subxids, so we don't need to check if any of the subxids are
+		 * smaller than oldestRunningXid
+		 */
+	}
+
+	LWLockRelease(ProcArrayLock);
+
+	return oldestRunningXid;
+}
+
 /*
  * GetTransactionsInCommit -- Get the XIDs of transactions that are committing
  *
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 1df20c4732064..4f446aab7a42e 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -323,7 +323,7 @@ SharedInvalBackendInit(bool sendOnly)
 	/* register exit routine to mark my entry inactive at exit */
 	on_shmem_exit(CleanupInvalidationState, PointerGetDatum(segP));
 
-	elog(DEBUG4, "my backend id is %d", MyBackendId);
+	elog(DEBUG4, "my backend ID is %d", MyBackendId);
 }
 
 /*
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 75b5ab458a861..f39062204c014 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -459,24 +459,25 @@ SendRecoveryConflictWithBufferPin(ProcSignalReason reason)
 
 /*
  * In Hot Standby perform early deadlock detection.  We abort the lock
- * wait if are about to sleep while holding the buffer pin that Startup
- * process is waiting for. The deadlock occurs because we can only be
- * waiting behind an AccessExclusiveLock, which can only clear when a
- * transaction completion record is replayed, which can only occur when
- * Startup process is not waiting. So if Startup process is waiting we
- * never will clear that lock, so if we wait we cause deadlock. If we
- * are the Startup process then no need to check for deadlocks.
+ * wait if we are about to sleep while holding the buffer pin that Startup
+ * process is waiting for.
+ *
+ * Note: this code is pessimistic, because there is no way for it to
+ * determine whether an actual deadlock condition is present: the lock we
+ * need to wait for might be unrelated to any held by the Startup process.
+ * Sooner or later, this mechanism should get ripped out in favor of somehow
+ * accounting for buffer locks in DeadLockCheck().  However, errors here
+ * seem to be very low-probability in practice, so for now it's not worth
+ * the trouble.
  */
 void
-CheckRecoveryConflictDeadlock(LWLockId partitionLock)
+CheckRecoveryConflictDeadlock(void)
 {
-	Assert(!InRecovery);
+	Assert(!InRecovery);		/* do not call in Startup process */
 
 	if (!HoldingBufferPinThatDelaysRecovery())
 		return;
 
-	LWLockRelease(partitionLock);
-
 	/*
 	 * Error message should match ProcessInterrupts() but we avoid calling
 	 * that because we aren't handling an interrupt at this point. Note that
@@ -813,7 +814,7 @@ standby_desc(StringInfo buf, uint8 xl_info, char *rec)
  * making WAL entries.
  */
 void
-LogStandbySnapshot(TransactionId *oldestActiveXid, TransactionId *nextXid)
+LogStandbySnapshot(TransactionId *nextXid)
 {
 	RunningTransactions running;
 	xl_standby_lock *locks;
@@ -843,7 +844,6 @@ LogStandbySnapshot(TransactionId *oldestActiveXid, TransactionId *nextXid)
 	/* GetRunningTransactionData() acquired XidGenLock, we must release it */
 	LWLockRelease(XidGenLock);
 
-	*oldestActiveXid = running->oldestRunningXid;
 	*nextXid = running->nextXid;
 }
 
diff --git a/src/backend/storage/lmgr/README-SSI b/src/backend/storage/lmgr/README-SSI
index c685beef4a416..a9dc01f237b83 100644
--- a/src/backend/storage/lmgr/README-SSI
+++ b/src/backend/storage/lmgr/README-SSI
@@ -3,11 +3,11 @@ src/backend/storage/lmgr/README-SSI
 Serializable Snapshot Isolation (SSI) and Predicate Locking
 ===========================================================
 
-This is currently sitting in the lmgr directory because about 90% of
-the code is an implementation of predicate locking, which is required
-for SSI, rather than being directly related to SSI itself.  When
-another use for predicate locking justifies the effort to tease these
-two things apart, this README file should probably be split.
+This code is in the lmgr directory because about 90% of it is an
+implementation of predicate locking, which is required for SSI,
+rather than being directly related to SSI itself.  When another use
+for predicate locking justifies the effort to tease these two things
+apart, this README file should probably be split.
 
 
 Credits
@@ -51,13 +51,13 @@ if a transaction can be shown to always do the right thing when it is
 run alone (before or after any other transaction), it will always do
 the right thing in any mix of concurrent serializable transactions.
 Where conflicts with other transactions would result in an
-inconsistent state within the database, or an inconsistent view of
+inconsistent state within the database or an inconsistent view of
 the data, a serializable transaction will block or roll back to
 prevent the anomaly. The SQL standard provides a specific SQLSTATE
 for errors generated when a transaction rolls back for this reason,
 so that transactions can be retried automatically.
 
-Before version 9.1 PostgreSQL did not support a full serializable
+Before version 9.1, PostgreSQL did not support a full serializable
 isolation level. A request for serializable transaction isolation
 actually provided snapshot isolation. This has well known anomalies
 which can allow data corruption or inconsistent views of the data
@@ -77,7 +77,7 @@ Serializable Isolation Implementation Strategies
 
 Techniques for implementing full serializable isolation have been
 published and in use in many database products for decades. The
-primary technique which has been used is Strict 2 Phase Locking
+primary technique which has been used is Strict Two-Phase Locking
 (S2PL), which operates by blocking writes against data which has been
 read by concurrent transactions and blocking any access (read or
 write) against data which has been written by concurrent
@@ -112,54 +112,93 @@ visualize the difference between the serializable implementations
 described above, is to consider that among transactions executing at
 the serializable transaction isolation level, the results are
 required to be consistent with some serial (one-at-a-time) execution
-of the transactions[1]. How is that order determined in each?
+of the transactions [1]. How is that order determined in each?
 
-S2PL locks rows used by the transaction in a way which blocks
-conflicting access, so that at the moment of a successful commit it
-is certain that no conflicting access has occurred. Some transactions
-may have blocked, essentially being partially serialized with the
-committing transaction, to allow this. Some transactions may have
-been rolled back, due to cycles in the blocking. But with S2PL,
-transactions can always be viewed as having occurred serially, in the
-order of successful commit.
+In S2PL, each transaction locks any data it accesses. It holds the
+locks until committing, preventing other transactions from making
+conflicting accesses to the same data in the interim. Some
+transactions may have to be rolled back to prevent deadlock. But
+successful transactions can always be viewed as having occurred
+sequentially, in the order they committed.
 
 With snapshot isolation, reads never block writes, nor vice versa, so
-there is much less actual serialization. The order in which
-transactions appear to have executed is determined by something more
-subtle than in S2PL: read/write dependencies. If a transaction
-attempts to read data which is not visible to it because the
-transaction which wrote it (or will later write it) is concurrent
-(one of them was running when the other acquired its snapshot), then
-the reading transaction appears to have executed first, regardless of
-the actual sequence of transaction starts or commits (since it sees a
-database state prior to that in which the other transaction leaves
-it). If one transaction has both rw-dependencies in (meaning that a
-concurrent transaction attempts to read data it writes) and out
-(meaning it attempts to read data a concurrent transaction writes),
-and a couple other conditions are met, there can appear to be a cycle
-in execution order of the transactions. This is when the anomalies
-occur.
-
-SSI works by watching for the conditions mentioned above, and rolling
-back a transaction when needed to prevent any anomaly. The apparent
-order of execution will always be consistent with any actual
-serialization (i.e., a transaction which run by itself can always be
-considered to have run after any transactions committed before it
-started and before any transacton which starts after it commits); but
-among concurrent transactions it will appear that the transaction on
-the read side of a rw-dependency executed before the transaction on
-the write side.
+more concurrency is possible. The order in which transactions appear
+to have executed is determined by something more subtle than in S2PL:
+read/write dependencies. If a transaction reads data, it appears to
+execute after the transaction that wrote the data it is reading.
+Similarly, if it updates data, it appears to execute after the
+transaction that wrote the previous version. These dependencies, which
+we call "wr-dependencies" and "ww-dependencies", are consistent with
+the commit order, because the first transaction must have committed
+before the second starts. However, there can also be dependencies
+between two *concurrent* transactions, i.e. where one was running when
+the other acquired its snapshot.  These "rw-conflicts" occur when one
+transaction attempts to read data which is not visible to it because
+the transaction which wrote it (or will later write it) is
+concurrent. The reading transaction appears to have executed first,
+regardless of the actual sequence of transaction starts or commits,
+because it sees a database state prior to that in which the other
+transaction leaves it.
+
+Anomalies occur when a cycle is created in the graph of dependencies:
+when a dependency or series of dependencies causes transaction A to
+appear to have executed before transaction B, but another series of
+dependencies causes B to appear before A. If that's the case, then
+the results can't be consistent with any serial execution of the
+transactions.
+
+
+SSI Algorithm
+-------------
+
+As of 9.1, serializable transactions in PostgreSQL are implemented using
+Serializable Snapshot Isolation (SSI), based on the work of Cahill
+et al. Fundamentally, this allows snapshot isolation to run as it
+previously did, while monitoring for conditions which could create a
+serialization anomaly.
+
+SSI is based on the observation [2] that each snapshot isolation
+anomaly corresponds to a cycle that contains a "dangerous structure"
+of two adjacent rw-conflict edges:
+
+      Tin ------> Tpivot ------> Tout
+            rw             rw
+
+SSI works by watching for this dangerous structure, and rolling
+back a transaction when needed to prevent any anomaly. This means it
+only needs to track rw-conflicts between concurrent transactions, not
+wr- and ww-dependencies. It also means there is a risk of false
+positives, because not every dangerous structure is embedded in an
+actual cycle.  The number of false positives is low in practice, so
+this represents an acceptable tradeoff for keeping the detection
+overhead low.
+
+The PostgreSQL implementation uses two additional optimizations:
+
+* Tout must commit before any other transaction in the cycle
+  (see proof of Theorem 2.1 of [2]). We only roll back a transaction
+  if Tout commits before Tpivot and Tin.
+
+* if Tin is read-only, there can only be an anomaly if Tout committed
+  before Tin takes its snapshot. This optimization is an original
+  one. Proof:
+
+  - Because there is a cycle, there must be some transaction T0 that
+    precedes Tin in the cycle. (T0 might be the same as Tout.)
+
+  - The edge between T0 and Tin can't be a rw-conflict or ww-dependency,
+    because Tin was read-only, so it must be a wr-dependency.
+    Those can only occur if T0 committed before Tin took its snapshot,
+    else Tin would have ignored T0's output.
+
+  - Because Tout must commit before any other transaction in the
+    cycle, it must commit before T0 commits -- and thus before Tin
+    starts.
 
 
 PostgreSQL Implementation
 -------------------------
 
-The implementation of serializable transactions for PostgreSQL is
-accomplished through Serializable Snapshot Isolation (SSI), based on
-the work of Cahill, et al.  Fundamentally, this allows snapshot
-isolation to run as it has, while monitoring for conditions which
-could create a serialization anomaly.
-
     * Since this technique is based on Snapshot Isolation (SI), those
 areas in PostgreSQL which don't use SI can't be brought under SSI.
 This includes system tables, temporary tables, sequences, hint bit
@@ -180,7 +219,7 @@ lock or to use SELECT FOR SHARE or SELECT FOR UPDATE.
     * Those who want to continue to use snapshot isolation without
 the additional protections of SSI (and the associated costs of
 enforcing those protections), can use the REPEATABLE READ transaction
-isolation level.  This level will retain its legacy behavior, which
+isolation level.  This level retains its legacy behavior, which
 is identical to the old SERIALIZABLE implementation and fully
 consistent with the standard's requirements for the REPEATABLE READ
 transaction isolation level.
@@ -200,9 +239,9 @@ serialization anomalies will fail with SQLSTATE 40001, which has a
 standard meaning of "serialization failure".
 
     * This SSI implementation makes an effort to choose the
-transaction to be cancelled such that an immediate retry of the
+transaction to be canceled such that an immediate retry of the
 transaction will not fail due to conflicts with exactly the same
-transactions.  Pursuant to this goal, no transaction is cancelled
+transactions.  Pursuant to this goal, no transaction is canceled
 until one of the other transactions in the set of conflicts which
 could generate an anomaly has successfully committed.  This is
 conceptually similar to how write conflicts are handled.  To fully
@@ -222,8 +261,8 @@ full serializable transactions under either strategy. Practical
 implementations of predicate locking generally involve acquiring
 locks against data as it is accessed, using multiple granularities
 (tuple, page, table, etc.) with escalation as needed to keep the lock
-count to a number which can be tracked within RAM structures, and
-this was used in PostgreSQL.  Coarse granularities can cause some
+count to a number which can be tracked within RAM structures.  This
+approach was used in PostgreSQL.  Coarse granularities can cause some
 false positive indications of conflict. The number of false positives
 can be influenced by plan choice.
 
@@ -236,11 +275,11 @@ in PostgreSQL, but tailored to the needs of SIREAD predicate locking,
 are used.  These refer to physical objects actually accessed in the
 course of executing the query, to model the predicates through
 inference.  Anyone interested in this subject should review the
-Hellerstein, Stonebraker and Hamilton paper[2], along with the
+Hellerstein, Stonebraker and Hamilton paper [3], along with the
 locking papers referenced from that and the Cahill papers.
 
 Because the SIREAD locks don't block, traditional locking techniques
-were be modified.  Intent locking (locking higher level objects
+have to be modified.  Intent locking (locking higher level objects
 before locking lower level objects) doesn't work with non-blocking
 "locks" (which are, in some respects, more like flags than locks).
 
@@ -248,10 +287,10 @@ A configurable amount of shared memory is reserved at postmaster
 start-up to track predicate locks. This size cannot be changed
 without a restart.
 
-    * To prevent resource exhaustion, multiple fine-grained locks may
+To prevent resource exhaustion, multiple fine-grained locks may
 be promoted to a single coarser-grained lock as needed.
 
-    * An attempt to acquire an SIREAD lock on a tuple when the same
+An attempt to acquire an SIREAD lock on a tuple when the same
 transaction already holds an SIREAD lock on the page or the relation
 will be ignored. Likewise, an attempt to lock a page when the
 relation is locked will be ignored, and the acquisition of a coarser
@@ -270,8 +309,17 @@ Predicate locks will be acquired for the heap based on the following:
 will be locked, whether or not it meets selection criteria; except
 that there is no need to acquire an SIREAD lock on a tuple when the
 transaction already holds a write lock on any tuple representing the
-row, since a rw-dependency would also create a ww-dependency which
-has more aggressive enforcement and will thus prevent any anomaly.
+row, since a rw-conflict would also create a ww-dependency which
+has more aggressive enforcement and thus will prevent any anomaly.
+
+    * Modifying a heap tuple creates a rw-conflict with any transaction
+that holds a SIREAD lock on that tuple, or on the page or relation
+that contains it.
+
+    * Inserting a new tuple creates a rw-conflict with any transaction
+holding a SIREAD lock on the entire relation. It doesn't conflict with
+page-level locks, because page-level locks are only used to aggregate
+tuple locks. Unlike index page locks, they don't lock "gaps" on the page.
 
 
 Index AM implementations
@@ -296,7 +344,7 @@ need not generate a conflict, although an update which "moves" a row
 into the scan must generate a conflict.  While correctness allows
 false positives, they should be minimized for performance reasons.
 
-Several optimizations are possible:
+Several optimizations are possible, though not all are implemented yet:
 
     * An index scan which is just finding the right position for an
 index insertion or deletion need not acquire a predicate lock.
@@ -317,10 +365,13 @@ x = 1 AND x = 2), then no predicate lock is needed.
 
 Other index AM implementation considerations:
 
-    * If a btree search discovers that no root page has yet been
-created, a predicate lock on the index relation is required;
-otherwise btree searches must get to the leaf level to determine
-which tuples match, so predicate locks go there.
+    * For an index AM that doesn't have support for predicate locking,
+we just acquire a predicate lock on the whole index for any search.
+
+    * B-tree index searches acquire predicate locks only on the
+index *leaf* pages needed to lock the appropriate index range. If,
+however, a search discovers that no root page has yet been created, a
+predicate lock on the index relation is required.
 
     * GiST searches can determine that there are no matches at any
 level of the index, so there must be a predicate lock at each index
@@ -346,17 +397,12 @@ to be added from scratch.
 
    2. The existing in-memory lock structures were not suitable for
 tracking SIREAD locks.
-          * The database products used for the prototype
-implementations for the papers used update-in-place with a rollback
-log for their MVCC implementations, while PostgreSQL leaves the old
-version of a row in place and adds a new tuple to represent the row
-at a new location.
           * In PostgreSQL, tuple level locks are not held in RAM for
 any length of time; lock information is written to the tuples
 involved in the transactions.
           * In PostgreSQL, existing lock structures have pointers to
-memory which is related to a connection. SIREAD locks need to persist
-past the end of the originating transaction and even the connection
+memory which is related to a session. SIREAD locks need to persist
+past the end of the originating transaction and even the session
 which ran it.
           * PostgreSQL needs to be able to tolerate a large number of
 transactions executing while one long-running transaction stays open
@@ -371,7 +417,8 @@ isolation level distinct from snapshot isolation.
 in the papers.
 
    5. PostgreSQL doesn't assign a transaction number to a database
-transaction until and unless necessary.
+transaction until and unless necessary (normally, when the transaction
+attempts to modify data).
 
    6. PostgreSQL has pluggable data types with user-definable
 operators, as well as pluggable index types, not all of which are
@@ -413,55 +460,60 @@ versions of the row, based on the following proof that any additional
 serialization failures we would get from that would be false
 positives:
 
-          o If transaction T1 reads a row (thus acquiring a predicate
-lock on it) and a second transaction T2 updates that row, must a
-third transaction T3 which updates the new version of the row have a
-rw-conflict in from T1 to prevent anomalies?  In other words, does it
-matter whether this edge T1 -> T3 is there?
+          o If transaction T1 reads a row version (thus acquiring a
+predicate lock on it) and a second transaction T2 updates that row
+version (thus creating a rw-conflict graph edge from T1 to T2), must a
+third transaction T3 which re-updates the new version of the row also
+have a rw-conflict in from T1 to prevent anomalies?  In other words,
+does it matter whether we recognize the edge T1 -> T3?
 
           o If T1 has a conflict in, it certainly doesn't. Adding the
 edge T1 -> T3 would create a dangerous structure, but we already had
-one from the edge T1 -> T2, so we would have aborted something
-anyway.
+one from the edge T1 -> T2, so we would have aborted something anyway.
+(T2 has already committed, else T3 could not have updated its output;
+but we would have aborted either T1 or T1's predecessor(s).  Hence
+no cycle involving T1 and T3 can survive.)
 
           o Now let's consider the case where T1 doesn't have a
-conflict in. If that's the case, for this edge T1 -> T3 to make a
-difference, T3 must have a rw-conflict out that induces a cycle in
-the dependency graph, i.e. a conflict out to some transaction
-preceding T1 in the serial order. (A conflict out to T1 would work
-too, but that would mean T1 has a conflict in and we would have
-rolled back.)
+rw-conflict in. If that's the case, for this edge T1 -> T3 to make a
+difference, T3 must have a rw-conflict out that induces a cycle in the
+dependency graph, i.e. a conflict out to some transaction preceding T1
+in the graph. (A conflict out to T1 itself would be problematic too,
+but that would mean T1 has a conflict in, the case we already
+eliminated.)
 
           o So now we're trying to figure out if there can be an
 rw-conflict edge T3 -> T0, where T0 is some transaction that precedes
-T1. For T0 to precede T1, there has to be has to be some edge, or
-sequence of edges, from T0 to T1. At least the last edge has to be a
-wr-dependency or ww-dependency rather than a rw-conflict, because T1
-doesn't have a rw-conflict in. And that gives us enough information
-about the order of transactions to see that T3 can't have a
-rw-dependency to T0:
+T1. For T0 to precede T1, there has to be some edge, or sequence of
+edges, from T0 to T1. At least the last edge has to be a wr-dependency
+or ww-dependency rather than a rw-conflict, because T1 doesn't have a
+rw-conflict in. And that gives us enough information about the order
+of transactions to see that T3 can't have a rw-conflict to T0:
  - T0 committed before T1 started (the wr/ww-dependency implies this)
  - T1 started before T2 committed (the T1->T2 rw-conflict implies this)
- - T2 committed before T3 started (otherwise, T3 would be aborted
+ - T2 committed before T3 started (otherwise, T3 would get aborted
                                    because of an update conflict)
 
           o That means T0 committed before T3 started, and therefore
 there can't be a rw-conflict from T3 to T0.
 
-          o In both cases, we didn't need the T1 -> T3 edge.
+          o So in all cases, we don't need the T1 -> T3 edge to
+recognize cycles.  Therefore it's not necessary for T1's SIREAD lock
+on the original tuple version to cover later versions as well.
 
-    * Predicate locking in PostgreSQL will start at the tuple level
-when possible, with automatic conversion of multiple fine-grained
-locks to coarser granularity as need to avoid resource exhaustion.
-The amount of memory used for these structures will be configurable,
-to balance RAM usage against SIREAD lock granularity.
+    * Predicate locking in PostgreSQL starts at the tuple level
+when possible. Multiple fine-grained locks are promoted to a single
+coarser-granularity lock as needed to avoid resource exhaustion.  The
+amount of memory used for these structures is configurable, to balance
+RAM usage against SIREAD lock granularity.
 
-    * A process-local copy of locks held by a process and the coarser
-covering locks with counts, are kept to support granularity promotion
-decisions with low CPU and locking overhead.
+    * Each backend keeps a process-local table of the locks it holds.
+To support granularity promotion decisions with low CPU and locking
+overhead, this table also includes the coarser covering locks and the
+number of finer-granularity locks they cover.
 
-    * Conflicts will be identified by looking for predicate locks
-when tuples are written and looking at the MVCC information when
+    * Conflicts are identified by looking for predicate locks
+when tuples are written, and by looking at the MVCC information when
 tuples are read. There is no matching between two RAM-based locks.
 
     * Because write locks are stored in the heap tuples rather than a
@@ -479,10 +531,12 @@ NULL to indicate no conflict and a self-reference to indicate
 multiple conflicts or conflicts with committed transactions, we use a
 list of rw-conflicts. With the more complete information, false
 positives are reduced and we have sufficient data for more aggressive
-clean-up and other optimizations.
+clean-up and other optimizations:
+
           o We can avoid ever rolling back a transaction until and
 unless there is a pivot where a transaction on the conflict *out*
 side of the pivot committed before either of the other transactions.
+
           o We can avoid ever rolling back a transaction when the
 transaction on the conflict *in* side of the pivot is explicitly or
 implicitly READ ONLY unless the transaction on the conflict *out*
@@ -490,19 +544,20 @@ side of the pivot committed before the READ ONLY transaction acquired
 its snapshot. (An implicit READ ONLY transaction is one which
 committed without writing, even though it was not explicitly declared
 to be READ ONLY.)
+
           o We can more aggressively clean up conflicts, predicate
 locks, and SSI transaction information.
 
-    * Allow a READ ONLY transaction to "opt out" of SSI if there are
+    * We allow a READ ONLY transaction to "opt out" of SSI if there are
 no READ WRITE transactions which could cause the READ ONLY
 transaction to ever become part of a "dangerous structure" of
 overlapping transaction dependencies.
 
-    * Allow the user to request that a READ ONLY transaction wait
+    * We allow the user to request that a READ ONLY transaction wait
 until the conditions are right for it to start in the "opt out" state
 described above. We add a DEFERRABLE state to transactions, which is
 specified and maintained in a way similar to READ ONLY. It is
-ignored for transactions which are not SERIALIZABLE and READ ONLY.
+ignored for transactions that are not SERIALIZABLE and READ ONLY.
 
     * When a transaction must be rolled back, we pick among the
 active transactions such that an immediate retry will not fail again
@@ -512,7 +567,7 @@ on conflicts with the same transactions.
 information about older committed transactions to put an upper bound
 on RAM used. Beyond that limit, information spills to disk.
 Performance can degrade in a pessimal situation, but it should be
-tolerable, and transactions won't need to be cancelled or blocked
+tolerable, and transactions won't need to be canceled or blocked
 from starting.
 
 
@@ -538,12 +593,6 @@ address it?
 replication solutions, like Postgres-R, Slony, pgpool, HS/SR, etc.
 This is related to the "WAL file replay" issue.
 
-    * Weak-memory-ordering machines. Make sure that shared memory
-access which involves visibility across multiple transactions uses
-locks as needed to avoid problems. On the other hand, ensure that we
-really need volatile where we're using it.
-http://archives.postgresql.org/pgsql-committers/2008-06/msg00228.php
-
     * UNIQUE btree search for equality on all columns. Since a search
 of a UNIQUE index using equality tests on all columns will lock the
 heap tuple if an entry is found, it appears that there is no need to
@@ -551,15 +600,6 @@ get a predicate lock on the index in that case. A predicate lock is
 still needed for such a search if a matching index entry which points
 to a visible tuple is not found.
 
-    * Planner index probes. To avoid problems with data skew at the
-ends of an index which have historically caused bad plans, the
-planner now probes the end of an index to see what the maximum or
-minimum value is when a query appears to be requesting a range of
-data outside what statistics shows is present. These planner checks
-don't require predicate locking, but there's currently no easy way to
-avoid it. What can we do to avoid predicate locking for such planner
-activity?
-
     * Minimize touching of shared memory. Should lists in shared
 memory push entries which have just been returned to the front of the
 available list, so they will be popped back off soon and some memory
@@ -567,19 +607,23 @@ might never be touched, or should we keep adding returned items to
 the end of the available list?
 
 
-Footnotes
----------
+References
+----------
 
 [1] http://www.contrib.andrew.cmu.edu/~shadow/sql/sql1992.txt
 Search for serial execution to find the relevant section.
 
-[2] http://db.cs.berkeley.edu/papers/fntdb07-architecture.pdf
-Joseph M. Hellerstein, Michael Stonebraker and James Hamilton. 2007.
+[2] A. Fekete et al. Making Snapshot Isolation Serializable. In ACM
+Transactions on Database Systems 30:2, Jun. 2005.
+http://dx.doi.org/10.1145/1071610.1071615
+
+[3] Joseph M. Hellerstein, Michael Stonebraker and James Hamilton. 2007.
 Architecture of a Database System. Foundations and Trends(R) in
 Databases Vol. 1, No. 2 (2007) 141-259.
+http://db.cs.berkeley.edu/papers/fntdb07-architecture.pdf
   Of particular interest:
     * 6.1 A Note on ACID
     * 6.2 A Brief Review of Serializability
     * 6.3 Locking and Latching
     * 6.3.1 Transaction Isolation Levels
-    * 6.5.3 Next-Key Locking: Physical Surrogates for Logical
+    * 6.5.3 Next-Key Locking: Physical Surrogates for Logical Properties
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c
index 980042b6af3a8..7e7f6af21b7e7 100644
--- a/src/backend/storage/lmgr/deadlock.c
+++ b/src/backend/storage/lmgr/deadlock.c
@@ -535,7 +535,7 @@ FindLockCycleRecurse(PGPROC *checkProc,
 					 * Note we read vacuumFlags without any locking.  This is
 					 * OK only for checking the PROC_IS_AUTOVACUUM flag,
 					 * because that flag is set at process start and never
-					 * reset; there is logic elsewhere to avoid cancelling an
+					 * reset; there is logic elsewhere to avoid canceling an
 					 * autovacuum that is working for preventing Xid
 					 * wraparound problems (which needs to read a different
 					 * vacuumFlag bit), but we don't do that here to avoid
@@ -939,7 +939,7 @@ DeadLockReport(void)
 	ereport(ERROR,
 			(errcode(ERRCODE_T_R_DEADLOCK_DETECTED),
 			 errmsg("deadlock detected"),
-			 errdetail("%s", clientbuf.data),
+			 errdetail_internal("%s", clientbuf.data),
 			 errdetail_log("%s", logbuf.data),
 			 errhint("See server log for query details.")));
 }
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index e3ad3199c4dd3..e3e1dd249f235 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -831,13 +831,6 @@ LockAcquireExtended(const LOCKTAG *locktag,
 			return LOCKACQUIRE_NOT_AVAIL;
 		}
 
-		/*
-		 * In Hot Standby perform early deadlock detection in normal backends.
-		 * If deadlock found we release partition lock but do not return.
-		 */
-		if (RecoveryInProgress() && !InRecovery)
-			CheckRecoveryConflictDeadlock(partitionLock);
-
 		/*
 		 * Set bitmask of locks this process already holds on this object.
 		 */
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index 9f79f54bf7c9f..1754180453daa 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -148,9 +148,11 @@
  * predicate lock maintenance
  *		RegisterSerializableTransaction(Snapshot snapshot)
  *		RegisterPredicateLockingXid(void)
- *		PredicateLockRelation(Relation relation)
- *		PredicateLockPage(Relation relation, BlockNumber blkno)
- *		PredicateLockTuple(Relation relation, HeapTuple tuple)
+ *		PredicateLockRelation(Relation relation, Snapshot snapshot)
+ *		PredicateLockPage(Relation relation, BlockNumber blkno,
+ *						Snapshot snapshot)
+ *		PredicateLockTuple(Relation relation, HeapTuple tuple,
+ *						Snapshot snapshot)
  *		PredicateLockPageSplit(Relation relation, BlockNumber oldblkno,
  *							   BlockNumber newblkno);
  *		PredicateLockPageCombine(Relation relation, BlockNumber oldblkno,
@@ -160,7 +162,8 @@
  *
  * conflict detection (may also trigger rollback)
  *		CheckForSerializableConflictOut(bool visible, Relation relation,
- *										HeapTupleData *tup, Buffer buffer)
+ *										HeapTupleData *tup, Buffer buffer,
+ *										Snapshot snapshot)
  *		CheckForSerializableConflictIn(Relation relation, HeapTupleData *tup,
  *									   Buffer buffer)
  *		CheckTableForSerializableConflictIn(Relation relation)
@@ -241,9 +244,18 @@
 
 #define SxactIsOnFinishedList(sxact) (!SHMQueueIsDetached(&((sxact)->finishedLink)))
 
-#define SxactIsPrepared(sxact) (((sxact)->flags & SXACT_FLAG_PREPARED) != 0)
+/*
+ * Note that a sxact is marked "prepared" once it has passed
+ * PreCommit_CheckForSerializationFailure, even if it isn't using
+ * 2PC. This is the point at which it can no longer be aborted.
+ *
+ * The PREPARED flag remains set after commit, so SxactIsCommitted
+ * implies SxactIsPrepared.
+ */
 #define SxactIsCommitted(sxact) (((sxact)->flags & SXACT_FLAG_COMMITTED) != 0)
+#define SxactIsPrepared(sxact) (((sxact)->flags & SXACT_FLAG_PREPARED) != 0)
 #define SxactIsRolledBack(sxact) (((sxact)->flags & SXACT_FLAG_ROLLED_BACK) != 0)
+#define SxactIsDoomed(sxact) (((sxact)->flags & SXACT_FLAG_DOOMED) != 0)
 #define SxactIsReadOnly(sxact) (((sxact)->flags & SXACT_FLAG_READ_ONLY) != 0)
 #define SxactHasSummaryConflictIn(sxact) (((sxact)->flags & SXACT_FLAG_SUMMARY_CONFLICT_IN) != 0)
 #define SxactHasSummaryConflictOut(sxact) (((sxact)->flags & SXACT_FLAG_SUMMARY_CONFLICT_OUT) != 0)
@@ -256,27 +268,6 @@
 #define SxactIsDeferrableWaiting(sxact) (((sxact)->flags & SXACT_FLAG_DEFERRABLE_WAITING) != 0)
 #define SxactIsROSafe(sxact) (((sxact)->flags & SXACT_FLAG_RO_SAFE) != 0)
 #define SxactIsROUnsafe(sxact) (((sxact)->flags & SXACT_FLAG_RO_UNSAFE) != 0)
-#define SxactIsMarkedForDeath(sxact) (((sxact)->flags & SXACT_FLAG_MARKED_FOR_DEATH) != 0)
-
-/*
- * Is this relation exempt from predicate locking? We don't do predicate
- * locking on system or temporary relations.
- */
-#define SkipPredicateLocksForRelation(relation) \
-	(((relation)->rd_id < FirstBootstrapObjectId) \
-	|| RelationUsesLocalBuffers(relation))
-
-/*
- * When a public interface method is called for serializing a relation within
- * the current transaction, this is the test to see if we should do a quick
- * return.
- */
-#define SkipSerialization(relation) \
-	((!IsolationIsSerializable()) \
-	|| ((MySerializableXact == InvalidSerializableXact)) \
-	|| ReleasePredicateLocksIfROSafe() \
-	|| SkipPredicateLocksForRelation(relation))
-
 
 /*
  * Compute the hash code associated with a PREDICATELOCKTARGETTAG.
@@ -314,7 +305,13 @@ static SlruCtlData OldSerXidSlruCtlData;
 #define OLDSERXID_PAGESIZE			BLCKSZ
 #define OLDSERXID_ENTRYSIZE			sizeof(SerCommitSeqNo)
 #define OLDSERXID_ENTRIESPERPAGE	(OLDSERXID_PAGESIZE / OLDSERXID_ENTRYSIZE)
-#define OLDSERXID_MAX_PAGE			(SLRU_PAGES_PER_SEGMENT * 0x10000 - 1)
+
+/*
+ * Set maximum pages based on the lesser of the number needed to track all
+ * transactions and the maximum that SLRU supports.
+ */
+#define OLDSERXID_MAX_PAGE			Min(SLRU_PAGES_PER_SEGMENT * 0x10000 - 1, \
+										(MaxTransactionId) / OLDSERXID_ENTRIESPERPAGE)
 
 #define OldSerXidNextPage(page) (((page) >= OLDSERXID_MAX_PAGE) ? 0 : (page) + 1)
 
@@ -437,14 +434,13 @@ static void CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,
 					uint32 targettaghash,
 					SERIALIZABLEXACT *sxact);
 static void DeleteLockTarget(PREDICATELOCKTARGET *target, uint32 targettaghash);
-static bool TransferPredicateLocksToNewTarget(const PREDICATELOCKTARGETTAG oldtargettag,
-								  const PREDICATELOCKTARGETTAG newtargettag,
+static bool TransferPredicateLocksToNewTarget(PREDICATELOCKTARGETTAG oldtargettag,
+								  PREDICATELOCKTARGETTAG newtargettag,
 								  bool removeOld);
 static void PredicateLockAcquire(const PREDICATELOCKTARGETTAG *targettag);
-static void DropAllPredicateLocksFromTable(const Relation relation,
+static void DropAllPredicateLocksFromTable(Relation relation,
 							   bool transfer);
 static void SetNewSxactGlobalXmin(void);
-static bool ReleasePredicateLocksIfROSafe(void);
 static void ClearOldPredicateLocks(void);
 static void ReleaseOneSerializableXact(SERIALIZABLEXACT *sxact, bool partial,
 						   bool summarize);
@@ -454,6 +450,90 @@ static void FlagRWConflict(SERIALIZABLEXACT *reader, SERIALIZABLEXACT *writer);
 static void OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 										SERIALIZABLEXACT *writer);
 
+
+/*------------------------------------------------------------------------*/
+
+/*
+ * Does this relation participate in predicate locking? Temporary and system
+ * relations are exempt.
+ */
+static inline bool
+PredicateLockingNeededForRelation(Relation relation)
+{
+	return !(relation->rd_id < FirstBootstrapObjectId ||
+			 RelationUsesLocalBuffers(relation));
+}
+
+/*
+ * When a public interface method is called for a read, this is the test to
+ * see if we should do a quick return.
+ *
+ * Note: this function has side-effects! If this transaction has been flagged
+ * as RO-safe since the last call, we release all predicate locks and reset
+ * MySerializableXact. That makes subsequent calls to return quickly.
+ *
+ * This is marked as 'inline' to make to eliminate the function call overhead
+ * in the common case that serialization is not needed.
+ */
+static inline bool
+SerializationNeededForRead(Relation relation, Snapshot snapshot)
+{
+	/* Nothing to do if this is not a serializable transaction */
+	if (MySerializableXact == InvalidSerializableXact)
+		return false;
+
+	/*
+	 * Don't acquire locks or conflict when scanning with a special snapshot.
+	 * This excludes things like CLUSTER and REINDEX. They use the wholesale
+	 * functions TransferPredicateLocksToHeapRelation() and
+	 * CheckTableForSerializableConflictIn() to participate serialization, but
+	 * the scans involved don't need serialization.
+	 */
+	if (!IsMVCCSnapshot(snapshot))
+		return false;
+
+	/*
+	 * Check if we have just become "RO-safe". If we have, immediately release
+	 * all locks as they're not needed anymore. This also resets
+	 * MySerializableXact, so that subsequent calls to this function can exit
+	 * quickly.
+	 *
+	 * A transaction is flagged as RO_SAFE if all concurrent R/W transactions
+	 * commit without having conflicts out to an earlier snapshot, thus
+	 * ensuring that no conflicts are possible for this transaction.
+	 */
+	if (SxactIsROSafe(MySerializableXact))
+	{
+		ReleasePredicateLocks(false);
+		return false;
+	}
+
+	/* Check if the relation doesn't participate in predicate locking */
+	if (!PredicateLockingNeededForRelation(relation))
+		return false;
+
+	return true;				/* no excuse to skip predicate locking */
+}
+
+/*
+ * Like SerializationNeededForRead(), but called on writes.
+ * The logic is the same, but there is no snapshot and we can't be RO-safe.
+ */
+static inline bool
+SerializationNeededForWrite(Relation relation)
+{
+	/* Nothing to do if this is not a serializable transaction */
+	if (MySerializableXact == InvalidSerializableXact)
+		return false;
+
+	/* Check if the relation doesn't participate in predicate locking */
+	if (!PredicateLockingNeededForRelation(relation))
+		return false;
+
+	return true;				/* no excuse to skip predicate locking */
+}
+
+
 /*------------------------------------------------------------------------*/
 
 /*
@@ -542,8 +622,8 @@ RWConflictExists(const SERIALIZABLEXACT *reader, const SERIALIZABLEXACT *writer)
 	Assert(reader != writer);
 
 	/* Check the ends of the purported conflict first. */
-	if (SxactIsRolledBack(reader)
-		|| SxactIsRolledBack(writer)
+	if (SxactIsDoomed(reader)
+		|| SxactIsDoomed(writer)
 		|| SHMQueueEmpty(&reader->outConflicts)
 		|| SHMQueueEmpty(&writer->inConflicts))
 		return false;
@@ -582,7 +662,7 @@ SetRWConflict(SERIALIZABLEXACT *reader, SERIALIZABLEXACT *writer)
 	if (!conflict)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("not enough elements in RWConflictPool to record a rw-conflict"),
+				 errmsg("not enough elements in RWConflictPool to record a read/write conflict"),
 				 errhint("You might need to run fewer transactions at a time or increase max_connections.")));
 
 	SHMQueueDelete(&conflict->outLink);
@@ -610,7 +690,7 @@ SetPossibleUnsafeConflict(SERIALIZABLEXACT *roXact,
 	if (!conflict)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("not enough elements in RWConflictPool to record a potential rw-conflict"),
+				 errmsg("not enough elements in RWConflictPool to record a potential read/write conflict"),
 				 errhint("You might need to run fewer transactions at a time or increase max_connections.")));
 
 	SHMQueueDelete(&conflict->outLink);
@@ -687,7 +767,7 @@ OldSerXidPagePrecedesLogically(int p, int q)
 	diff = p - q;
 	if (diff >= ((OLDSERXID_MAX_PAGE + 1) / 2))
 		diff -= OLDSERXID_MAX_PAGE + 1;
-	else if (diff < -((OLDSERXID_MAX_PAGE + 1) / 2))
+	else if (diff < -((int) (OLDSERXID_MAX_PAGE + 1) / 2))
 		diff += OLDSERXID_MAX_PAGE + 1;
 	return diff < 0;
 }
@@ -816,7 +896,7 @@ OldSerXidAdd(TransactionId xid, SerCommitSeqNo minConflictCommitSeqNo)
 			oldSerXidControl->warningIssued = true;
 			ereport(WARNING,
 					(errmsg("memory for serializable conflict tracking is nearly exhausted"),
-					 errhint("There may be an idle transaction or a forgotten prepared transaction causing this.")));
+					 errhint("There might be an idle transaction or a forgotten prepared transaction causing this.")));
 		}
 	}
 
@@ -1110,6 +1190,7 @@ InitPredicateLocks(void)
 		}
 		PredXact->OldCommittedSxact = CreatePredXact();
 		SetInvalidVirtualTransactionId(PredXact->OldCommittedSxact->vxid);
+		PredXact->OldCommittedSxact->prepareSeqNo = 0;
 		PredXact->OldCommittedSxact->commitSeqNo = 0;
 		PredXact->OldCommittedSxact->SeqNo.lastCommitBeforeSnapshot = 0;
 		SHMQueueInit(&PredXact->OldCommittedSxact->outConflicts);
@@ -1432,8 +1513,7 @@ GetSafeSnapshot(Snapshot origSnapshot)
 		 * them marked us as conflicted.
 		 */
 		MySerializableXact->flags |= SXACT_FLAG_DEFERRABLE_WAITING;
-		while (!(SHMQueueEmpty((SHM_QUEUE *)
-							 &MySerializableXact->possibleUnsafeConflicts) ||
+		while (!(SHMQueueEmpty(&MySerializableXact->possibleUnsafeConflicts) ||
 				 SxactIsROUnsafe(MySerializableXact)))
 		{
 			LWLockRelease(SerializableXactHashLock);
@@ -1571,6 +1651,7 @@ RegisterSerializableTransactionInt(Snapshot snapshot)
 	/* Initialize the structure. */
 	sxact->vxid = vxid;
 	sxact->SeqNo.lastCommitBeforeSnapshot = PredXact->LastSxactCommitSeqNo;
+	sxact->prepareSeqNo = InvalidSerCommitSeqNo;
 	sxact->commitSeqNo = InvalidSerCommitSeqNo;
 	SHMQueueInit(&(sxact->outConflicts));
 	SHMQueueInit(&(sxact->inConflicts));
@@ -1596,8 +1677,9 @@ RegisterSerializableTransactionInt(Snapshot snapshot)
 			 othersxact != NULL;
 			 othersxact = NextPredXact(othersxact))
 		{
-			if (!SxactIsOnFinishedList(othersxact) &&
-				!SxactIsReadOnly(othersxact))
+			if (!SxactIsCommitted(othersxact)
+				&& !SxactIsDoomed(othersxact)
+				&& !SxactIsReadOnly(othersxact))
 			{
 				SetPossibleUnsafeConflict(sxact, othersxact);
 			}
@@ -1634,7 +1716,7 @@ RegisterSerializableTransactionInt(Snapshot snapshot)
  * Also store it for easy reference in MySerializableXact.
  */
 void
-RegisterPredicateLockingXid(const TransactionId xid)
+RegisterPredicateLockingXid(TransactionId xid)
 {
 	SERIALIZABLEXIDTAG sxidtag;
 	SERIALIZABLEXID *sxid;
@@ -1683,7 +1765,7 @@ RegisterPredicateLockingXid(const TransactionId xid)
  * One use is to support proper behavior during GiST index vacuum.
  */
 bool
-PageIsPredicateLocked(const Relation relation, const BlockNumber blkno)
+PageIsPredicateLocked(Relation relation, BlockNumber blkno)
 {
 	PREDICATELOCKTARGETTAG targettag;
 	uint32		targettaghash;
@@ -2245,11 +2327,11 @@ PredicateLockAcquire(const PREDICATELOCKTARGETTAG *targettag)
  * Clear any finer-grained predicate locks this session has on the relation.
  */
 void
-PredicateLockRelation(const Relation relation)
+PredicateLockRelation(Relation relation, Snapshot snapshot)
 {
 	PREDICATELOCKTARGETTAG tag;
 
-	if (SkipSerialization(relation))
+	if (!SerializationNeededForRead(relation, snapshot))
 		return;
 
 	SET_PREDICATELOCKTARGETTAG_RELATION(tag,
@@ -2268,11 +2350,11 @@ PredicateLockRelation(const Relation relation)
  * Clear any finer-grained predicate locks this session has on the relation.
  */
 void
-PredicateLockPage(const Relation relation, const BlockNumber blkno)
+PredicateLockPage(Relation relation, BlockNumber blkno, Snapshot snapshot)
 {
 	PREDICATELOCKTARGETTAG tag;
 
-	if (SkipSerialization(relation))
+	if (!SerializationNeededForRead(relation, snapshot))
 		return;
 
 	SET_PREDICATELOCKTARGETTAG_PAGE(tag,
@@ -2290,13 +2372,13 @@ PredicateLockPage(const Relation relation, const BlockNumber blkno)
  * Skip if this is a temporary table.
  */
 void
-PredicateLockTuple(const Relation relation, const HeapTuple tuple)
+PredicateLockTuple(Relation relation, HeapTuple tuple, Snapshot snapshot)
 {
 	PREDICATELOCKTARGETTAG tag;
 	ItemPointer tid;
 	TransactionId targetxmin;
 
-	if (SkipSerialization(relation))
+	if (!SerializationNeededForRead(relation, snapshot))
 		return;
 
 	/*
@@ -2428,8 +2510,8 @@ DeleteLockTarget(PREDICATELOCKTARGET *target, uint32 targettaghash)
  * Caller must hold SerializablePredicateLockListLock.
  */
 static bool
-TransferPredicateLocksToNewTarget(const PREDICATELOCKTARGETTAG oldtargettag,
-								  const PREDICATELOCKTARGETTAG newtargettag,
+TransferPredicateLocksToNewTarget(PREDICATELOCKTARGETTAG oldtargettag,
+								  PREDICATELOCKTARGETTAG newtargettag,
 								  bool removeOld)
 {
 	uint32		oldtargettaghash;
@@ -2548,14 +2630,13 @@ TransferPredicateLocksToNewTarget(const PREDICATELOCKTARGETTAG oldtargettag,
 				Assert(found);
 			}
 
-
 			newpredlock = (PREDICATELOCK *)
-				hash_search_with_hash_value
-				(PredicateLockHash,
-				 &newpredlocktag,
-				 PredicateLockHashCodeFromTargetHashCode(&newpredlocktag,
-														 newtargettaghash),
-				 HASH_ENTER_NULL, &found);
+				hash_search_with_hash_value(PredicateLockHash,
+											&newpredlocktag,
+											PredicateLockHashCodeFromTargetHashCode(&newpredlocktag,
+																					newtargettaghash),
+											HASH_ENTER_NULL,
+											&found);
 			if (!newpredlock)
 			{
 				/* Out of shared memory. Undo what we've done so far. */
@@ -2645,7 +2726,7 @@ TransferPredicateLocksToNewTarget(const PREDICATELOCKTARGETTAG oldtargettag,
  * transaction which executed DROP TABLE, the false condition will be useful.
  */
 static void
-DropAllPredicateLocksFromTable(const Relation relation, bool transfer)
+DropAllPredicateLocksFromTable(Relation relation, bool transfer)
 {
 	HASH_SEQ_STATUS seqstat;
 	PREDICATELOCKTARGET *oldtarget;
@@ -2667,7 +2748,7 @@ DropAllPredicateLocksFromTable(const Relation relation, bool transfer)
 	if (!TransactionIdIsValid(PredXact->SxactGlobalXmin))
 		return;
 
-	if (SkipPredicateLocksForRelation(relation))
+	if (!PredicateLockingNeededForRelation(relation))
 		return;
 
 	dbId = relation->rd_node.dbNode;
@@ -2791,12 +2872,12 @@ DropAllPredicateLocksFromTable(const Relation relation, bool transfer)
 				newpredlocktag.myTarget = heaptarget;
 				newpredlocktag.myXact = oldXact;
 				newpredlock = (PREDICATELOCK *)
-					hash_search_with_hash_value
-					(PredicateLockHash,
-					 &newpredlocktag,
-					 PredicateLockHashCodeFromTargetHashCode(&newpredlocktag,
-														  heaptargettaghash),
-					 HASH_ENTER, &found);
+					hash_search_with_hash_value(PredicateLockHash,
+												&newpredlocktag,
+												PredicateLockHashCodeFromTargetHashCode(&newpredlocktag,
+																						heaptargettaghash),
+												HASH_ENTER,
+												&found);
 				if (!found)
 				{
 					SHMQueueInsertBefore(&(heaptarget->predicateLocks),
@@ -2841,7 +2922,7 @@ DropAllPredicateLocksFromTable(const Relation relation, bool transfer)
  *		relation to a single relation lock on the heap.
  */
 void
-TransferPredicateLocksToHeapRelation(const Relation relation)
+TransferPredicateLocksToHeapRelation(Relation relation)
 {
 	DropAllPredicateLocksFromTable(relation, true);
 }
@@ -2862,8 +2943,8 @@ TransferPredicateLocksToHeapRelation(const Relation relation)
  * which hold the locks getting in and noticing.
  */
 void
-PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno,
-					   const BlockNumber newblkno)
+PredicateLockPageSplit(Relation relation, BlockNumber oldblkno,
+					   BlockNumber newblkno)
 {
 	PREDICATELOCKTARGETTAG oldtargettag;
 	PREDICATELOCKTARGETTAG newtargettag;
@@ -2882,7 +2963,7 @@ PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno,
 	if (!TransactionIdIsValid(PredXact->SxactGlobalXmin))
 		return;
 
-	if (SkipPredicateLocksForRelation(relation))
+	if (!PredicateLockingNeededForRelation(relation))
 		return;
 
 	Assert(oldblkno != newblkno);
@@ -2947,8 +3028,8 @@ PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno,
  * occurs in the context of another transaction isolation level.
  */
 void
-PredicateLockPageCombine(const Relation relation, const BlockNumber oldblkno,
-						 const BlockNumber newblkno)
+PredicateLockPageCombine(Relation relation, BlockNumber oldblkno,
+						 BlockNumber newblkno)
 {
 	/*
 	 * Page combines differ from page splits in that we ought to be able to
@@ -3019,7 +3100,7 @@ SetNewSxactGlobalXmin(void)
  * holding locks.
  */
 void
-ReleasePredicateLocks(const bool isCommit)
+ReleasePredicateLocks(bool isCommit)
 {
 	bool		needToClear;
 	RWConflict	conflict,
@@ -3045,8 +3126,9 @@ ReleasePredicateLocks(const bool isCommit)
 	}
 
 	Assert(!isCommit || SxactIsPrepared(MySerializableXact));
-	Assert(!SxactIsRolledBack(MySerializableXact));
+	Assert(!isCommit || !SxactIsDoomed(MySerializableXact));
 	Assert(!SxactIsCommitted(MySerializableXact));
+	Assert(!SxactIsRolledBack(MySerializableXact));
 
 	/* may not be serializable during COMMIT/ROLLBACK PREPARED */
 	if (MySerializableXact->pid != 0)
@@ -3086,7 +3168,27 @@ ReleasePredicateLocks(const bool isCommit)
 	}
 	else
 	{
+		/*
+		 * The DOOMED flag indicates that we intend to roll back this
+		 * transaction and so it should not cause serialization failures for
+		 * other transactions that conflict with it. Note that this flag might
+		 * already be set, if another backend marked this transaction for
+		 * abort.
+		 *
+		 * The ROLLED_BACK flag further indicates that ReleasePredicateLocks
+		 * has been called, and so the SerializableXact is eligible for
+		 * cleanup. This means it should not be considered when calculating
+		 * SxactGlobalXmin.
+		 */
+		MySerializableXact->flags |= SXACT_FLAG_DOOMED;
 		MySerializableXact->flags |= SXACT_FLAG_ROLLED_BACK;
+		/*
+		 * If the transaction was previously prepared, but is now failing due
+		 * to a ROLLBACK PREPARED or (hopefully very rare) error after the
+		 * prepare, clear the prepared flag.  This simplifies conflict
+		 * checking.
+		 */
+		MySerializableXact->flags &= ~SXACT_FLAG_PREPARED;
 	}
 
 	if (!topLevelIsDeclaredReadOnly)
@@ -3114,13 +3216,13 @@ ReleasePredicateLocks(const bool isCommit)
 		 * opposed to 'outLink' for the r/w xacts.
 		 */
 		possibleUnsafeConflict = (RWConflict)
-			SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
-				  (SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
+			SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
+						 &MySerializableXact->possibleUnsafeConflicts,
 						 offsetof(RWConflictData, inLink));
 		while (possibleUnsafeConflict)
 		{
 			nextConflict = (RWConflict)
-				SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
+				SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
 							 &possibleUnsafeConflict->inLink,
 							 offsetof(RWConflictData, inLink));
 
@@ -3153,13 +3255,13 @@ ReleasePredicateLocks(const bool isCommit)
 	 * previously committed transactions.
 	 */
 	conflict = (RWConflict)
-		SHMQueueNext((SHM_QUEUE *) &MySerializableXact->outConflicts,
-					 (SHM_QUEUE *) &MySerializableXact->outConflicts,
+		SHMQueueNext(&MySerializableXact->outConflicts,
+					 &MySerializableXact->outConflicts,
 					 offsetof(RWConflictData, outLink));
 	while (conflict)
 	{
 		nextConflict = (RWConflict)
-			SHMQueueNext((SHM_QUEUE *) &MySerializableXact->outConflicts,
+			SHMQueueNext(&MySerializableXact->outConflicts,
 						 &conflict->outLink,
 						 offsetof(RWConflictData, outLink));
 
@@ -3168,8 +3270,8 @@ ReleasePredicateLocks(const bool isCommit)
 			&& SxactIsCommitted(conflict->sxactIn))
 		{
 			if ((MySerializableXact->flags & SXACT_FLAG_CONFLICT_OUT) == 0
-				|| conflict->sxactIn->commitSeqNo < MySerializableXact->SeqNo.earliestOutConflictCommit)
-				MySerializableXact->SeqNo.earliestOutConflictCommit = conflict->sxactIn->commitSeqNo;
+				|| conflict->sxactIn->prepareSeqNo < MySerializableXact->SeqNo.earliestOutConflictCommit)
+				MySerializableXact->SeqNo.earliestOutConflictCommit = conflict->sxactIn->prepareSeqNo;
 			MySerializableXact->flags |= SXACT_FLAG_CONFLICT_OUT;
 		}
 
@@ -3186,13 +3288,13 @@ ReleasePredicateLocks(const bool isCommit)
 	 * we're rolling back, clear them all.
 	 */
 	conflict = (RWConflict)
-		SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
-					 (SHM_QUEUE *) &MySerializableXact->inConflicts,
+		SHMQueueNext(&MySerializableXact->inConflicts,
+					 &MySerializableXact->inConflicts,
 					 offsetof(RWConflictData, inLink));
 	while (conflict)
 	{
 		nextConflict = (RWConflict)
-			SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
+			SHMQueueNext(&MySerializableXact->inConflicts,
 						 &conflict->inLink,
 						 offsetof(RWConflictData, inLink));
 
@@ -3213,13 +3315,13 @@ ReleasePredicateLocks(const bool isCommit)
 		 * up if they are known safe or known unsafe.
 		 */
 		possibleUnsafeConflict = (RWConflict)
-			SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
-				  (SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
+			SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
+						 &MySerializableXact->possibleUnsafeConflicts,
 						 offsetof(RWConflictData, outLink));
 		while (possibleUnsafeConflict)
 		{
 			nextConflict = (RWConflict)
-				SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
+				SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
 							 &possibleUnsafeConflict->outLink,
 							 offsetof(RWConflictData, outLink));
 
@@ -3290,7 +3392,7 @@ ReleasePredicateLocks(const bool isCommit)
 	/* Add this to the list of transactions to check for later cleanup. */
 	if (isCommit)
 		SHMQueueInsertBefore(FinishedSerializableTransactions,
-						  (SHM_QUEUE *) &(MySerializableXact->finishedLink));
+							 &MySerializableXact->finishedLink);
 
 	if (!isCommit)
 		ReleaseOneSerializableXact(MySerializableXact, false, false);
@@ -3311,30 +3413,6 @@ ReleasePredicateLocks(const bool isCommit)
 	}
 }
 
-/*
- * ReleasePredicateLocksIfROSafe
- *		Check if the current transaction is read only and operating on
- *		a safe snapshot. If so, release predicate locks and return
- *		true.
- *
- * A transaction is flagged as RO_SAFE if all concurrent R/W
- * transactions commit without having conflicts out to an earlier
- * snapshot, thus ensuring that no conflicts are possible for this
- * transaction. Thus, we call this function as part of the
- * SkipSerialization check on all public interface methods.
- */
-static bool
-ReleasePredicateLocksIfROSafe(void)
-{
-	if (SxactIsROSafe(MySerializableXact))
-	{
-		ReleasePredicateLocks(false);
-		return true;
-	}
-	else
-		return false;
-}
-
 /*
  * Clear old predicate locks, belonging to committed transactions that are no
  * longer interesting to any in-progress transaction.
@@ -3679,8 +3757,9 @@ XidIsConcurrent(TransactionId xid)
  * currently no known reason to call this function from an index AM.
  */
 void
-CheckForSerializableConflictOut(const bool visible, const Relation relation,
-								const HeapTuple tuple, const Buffer buffer)
+CheckForSerializableConflictOut(bool visible, Relation relation,
+								HeapTuple tuple, Buffer buffer,
+								Snapshot snapshot)
 {
 	TransactionId xid;
 	SERIALIZABLEXIDTAG sxidtag;
@@ -3688,15 +3767,16 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
 	SERIALIZABLEXACT *sxact;
 	HTSV_Result htsvResult;
 
-	if (SkipSerialization(relation))
+	if (!SerializationNeededForRead(relation, snapshot))
 		return;
 
-	if (SxactIsMarkedForDeath(MySerializableXact))
+	/* Check if someone else has already decided that we need to die */
+	if (SxactIsDoomed(MySerializableXact))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 				 errmsg("could not serialize access due to read/write dependencies among transactions"),
-				 errdetail("Cancelled on identification as a pivot, during conflict out checking."),
+				 errdetail_internal("Reason code: Canceled on identification as a pivot, during conflict out checking."),
 				 errhint("The transaction might succeed if retried.")));
 	}
 
@@ -3785,15 +3865,15 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
 				ereport(ERROR,
 						(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 						 errmsg("could not serialize access due to read/write dependencies among transactions"),
-				errdetail("Cancelled on conflict out to old pivot %u.", xid),
+						 errdetail_internal("Reason code: Canceled on conflict out to old pivot %u.", xid),
 					  errhint("The transaction might succeed if retried.")));
 
 			if (SxactHasSummaryConflictIn(MySerializableXact)
-			|| !SHMQueueEmpty((SHM_QUEUE *) &MySerializableXact->inConflicts))
+				|| !SHMQueueEmpty(&MySerializableXact->inConflicts))
 				ereport(ERROR,
 						(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 						 errmsg("could not serialize access due to read/write dependencies among transactions"),
-						 errdetail("Cancelled on identification as a pivot, with conflict out to old committed transaction %u.", xid),
+						 errdetail_internal("Reason code: Canceled on identification as a pivot, with conflict out to old committed transaction %u.", xid),
 					  errhint("The transaction might succeed if retried.")));
 
 			MySerializableXact->flags |= SXACT_FLAG_SUMMARY_CONFLICT_OUT;
@@ -3805,11 +3885,9 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
 	}
 	sxact = sxid->myXact;
 	Assert(TransactionIdEquals(sxact->topXid, xid));
-	if (sxact == MySerializableXact
-		|| SxactIsRolledBack(sxact)
-		|| SxactIsMarkedForDeath(sxact))
+	if (sxact == MySerializableXact || SxactIsDoomed(sxact))
 	{
-		/* We can't conflict with our own transaction or one rolled back. */
+		/* Can't conflict with ourself or a transaction that will roll back. */
 		LWLockRelease(SerializableXactHashLock);
 		return;
 	}
@@ -3818,13 +3896,13 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
 	 * We have a conflict out to a transaction which has a conflict out to a
 	 * summarized transaction.	That summarized transaction must have
 	 * committed first, and we can't tell when it committed in relation to our
-	 * snapshot acquisition, so something needs to be cancelled.
+	 * snapshot acquisition, so something needs to be canceled.
 	 */
 	if (SxactHasSummaryConflictOut(sxact))
 	{
 		if (!SxactIsPrepared(sxact))
 		{
-			sxact->flags |= SXACT_FLAG_MARKED_FOR_DEATH;
+			sxact->flags |= SXACT_FLAG_DOOMED;
 			LWLockRelease(SerializableXactHashLock);
 			return;
 		}
@@ -3834,7 +3912,7 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
 			ereport(ERROR,
 					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 					 errmsg("could not serialize access due to read/write dependencies among transactions"),
-					 errdetail("Cancelled on conflict out to old pivot."),
+				errdetail_internal("Reason code: Canceled on conflict out to old pivot."),
 					 errhint("The transaction might succeed if retried.")));
 		}
 	}
@@ -3951,7 +4029,7 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag)
 				mypredlocktag = predlock->tag;
 			}
 		}
-		else if (!SxactIsRolledBack(sxact)
+		else if (!SxactIsDoomed(sxact)
 				 && (!SxactIsCommitted(sxact)
 					 || TransactionIdPrecedes(GetTransactionSnapshot()->xmin,
 											  sxact->finishedBefore))
@@ -3964,7 +4042,7 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag)
 			 * Re-check after getting exclusive lock because the other
 			 * transaction may have flagged a conflict.
 			 */
-			if (!SxactIsRolledBack(sxact)
+			if (!SxactIsDoomed(sxact)
 				&& (!SxactIsCommitted(sxact)
 					|| TransactionIdPrecedes(GetTransactionSnapshot()->xmin,
 											 sxact->finishedBefore))
@@ -4060,19 +4138,20 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag)
  * tuple itself.
  */
 void
-CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple,
-							   const Buffer buffer)
+CheckForSerializableConflictIn(Relation relation, HeapTuple tuple,
+							   Buffer buffer)
 {
 	PREDICATELOCKTARGETTAG targettag;
 
-	if (SkipSerialization(relation))
+	if (!SerializationNeededForWrite(relation))
 		return;
 
-	if (SxactIsMarkedForDeath(MySerializableXact))
+	/* Check if someone else has already decided that we need to die */
+	if (SxactIsDoomed(MySerializableXact))
 		ereport(ERROR,
 				(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 				 errmsg("could not serialize access due to read/write dependencies among transactions"),
-				 errdetail("Cancelled on identification as a pivot, during conflict in checking."),
+				 errdetail_internal("Reason code: Canceled on identification as a pivot, during conflict in checking."),
 				 errhint("The transaction might succeed if retried.")));
 
 	/*
@@ -4144,7 +4223,7 @@ CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple,
  * lead to some false positives, but it doesn't seem worth the trouble.)
  */
 void
-CheckTableForSerializableConflictIn(const Relation relation)
+CheckTableForSerializableConflictIn(Relation relation)
 {
 	HASH_SEQ_STATUS seqstat;
 	PREDICATELOCKTARGET *target;
@@ -4161,7 +4240,7 @@ CheckTableForSerializableConflictIn(const Relation relation)
 	if (!TransactionIdIsValid(PredXact->SxactGlobalXmin))
 		return;
 
-	if (SkipSerialization(relation))
+	if (!SerializationNeededForWrite(relation))
 		return;
 
 	/*
@@ -4308,6 +4387,11 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 	 * - the writer committed before T2
 	 * - the reader is a READ ONLY transaction and the reader was concurrent
 	 *	 with T2 (= reader acquired its snapshot before T2 committed)
+	 *
+	 * We also handle the case that T2 is prepared but not yet committed
+	 * here. In that case T2 has already checked for conflicts, so if it
+	 * commits first, making the above conflict real, it's too late for it
+	 * to abort.
 	 *------------------------------------------------------------------------
 	 */
 	if (!failure)
@@ -4326,13 +4410,13 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 		{
 			SERIALIZABLEXACT *t2 = conflict->sxactIn;
 
-			if (SxactIsCommitted(t2)
+			if (SxactIsPrepared(t2)
 				&& (!SxactIsCommitted(reader)
-					|| t2->commitSeqNo <= reader->commitSeqNo)
+					|| t2->prepareSeqNo <= reader->commitSeqNo)
 				&& (!SxactIsCommitted(writer)
-					|| t2->commitSeqNo <= writer->commitSeqNo)
+					|| t2->prepareSeqNo <= writer->commitSeqNo)
 				&& (!SxactIsReadOnly(reader)
-			   || t2->commitSeqNo <= reader->SeqNo.lastCommitBeforeSnapshot))
+			   || t2->prepareSeqNo <= reader->SeqNo.lastCommitBeforeSnapshot))
 			{
 				failure = true;
 				break;
@@ -4345,7 +4429,8 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 	}
 
 	/*------------------------------------------------------------------------
-	 * Check whether the reader has become a pivot with a committed writer:
+	 * Check whether the reader has become a pivot with a writer
+	 * that's committed (or prepared):
 	 *
 	 *		T0 ------> R ------> W
 	 *			 rw		   rw
@@ -4356,7 +4441,7 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 	 * - T0 is READ ONLY, and overlaps the writer
 	 *------------------------------------------------------------------------
 	 */
-	if (!failure && SxactIsCommitted(writer) && !SxactIsReadOnly(reader))
+	if (!failure && SxactIsPrepared(writer) && !SxactIsReadOnly(reader))
 	{
 		if (SxactHasSummaryConflictIn(reader))
 		{
@@ -4372,11 +4457,11 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 		{
 			SERIALIZABLEXACT *t0 = conflict->sxactOut;
 
-			if (!SxactIsRolledBack(t0)
+			if (!SxactIsDoomed(t0)
 				&& (!SxactIsCommitted(t0)
-					|| t0->commitSeqNo >= writer->commitSeqNo)
+					|| t0->commitSeqNo >= writer->prepareSeqNo)
 				&& (!SxactIsReadOnly(t0)
-			   || t0->SeqNo.lastCommitBeforeSnapshot >= writer->commitSeqNo))
+			   || t0->SeqNo.lastCommitBeforeSnapshot >= writer->prepareSeqNo))
 			{
 				failure = true;
 				break;
@@ -4404,7 +4489,7 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 			ereport(ERROR,
 					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 					 errmsg("could not serialize access due to read/write dependencies among transactions"),
-					 errdetail("Cancelled on identification as a pivot, during write."),
+					 errdetail_internal("Reason code: Canceled on identification as a pivot, during write."),
 					 errhint("The transaction might succeed if retried.")));
 		}
 		else if (SxactIsPrepared(writer))
@@ -4416,10 +4501,10 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
 			ereport(ERROR,
 					(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 					 errmsg("could not serialize access due to read/write dependencies among transactions"),
-					 errdetail("Cancelled on conflict out to pivot %u, during read.", writer->topXid),
+					 errdetail_internal("Reason code: Canceled on conflict out to pivot %u, during read.", writer->topXid),
 					 errhint("The transaction might succeed if retried.")));
 		}
-		writer->flags |= SXACT_FLAG_MARKED_FOR_DEATH;
+		writer->flags |= SXACT_FLAG_DOOMED;
 	}
 }
 
@@ -4437,7 +4522,7 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
  * marked for death, because rolling back another transaction might mean
  * that we flail without ever making progress.	This transaction is
  * committing writes, so letting it commit ensures progress.  If we
- * cancelled the far conflict, it might immediately fail again on retry.
+ * canceled the far conflict, it might immediately fail again on retry.
  */
 void
 PreCommit_CheckForSerializationFailure(void)
@@ -4451,25 +4536,25 @@ PreCommit_CheckForSerializationFailure(void)
 
 	LWLockAcquire(SerializableXactHashLock, LW_EXCLUSIVE);
 
-	if (SxactIsMarkedForDeath(MySerializableXact))
+	/* Check if someone else has already decided that we need to die */
+	if (SxactIsDoomed(MySerializableXact))
 	{
 		LWLockRelease(SerializableXactHashLock);
 		ereport(ERROR,
 				(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
 				 errmsg("could not serialize access due to read/write dependencies among transactions"),
-				 errdetail("Cancelled on identification as a pivot, during commit attempt."),
+				 errdetail_internal("Reason code: Canceled on identification as a pivot, during commit attempt."),
 				 errhint("The transaction might succeed if retried.")));
 	}
 
 	nearConflict = (RWConflict)
-		SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
-					 (SHM_QUEUE *) &MySerializableXact->inConflicts,
+		SHMQueueNext(&MySerializableXact->inConflicts,
+					 &MySerializableXact->inConflicts,
 					 offsetof(RWConflictData, inLink));
 	while (nearConflict)
 	{
 		if (!SxactIsCommitted(nearConflict->sxactOut)
-			&& !SxactIsRolledBack(nearConflict->sxactOut)
-			&& !SxactIsMarkedForDeath(nearConflict->sxactOut))
+			&& !SxactIsDoomed(nearConflict->sxactOut))
 		{
 			RWConflict	farConflict;
 
@@ -4482,10 +4567,24 @@ PreCommit_CheckForSerializationFailure(void)
 				if (farConflict->sxactOut == MySerializableXact
 					|| (!SxactIsCommitted(farConflict->sxactOut)
 						&& !SxactIsReadOnly(farConflict->sxactOut)
-						&& !SxactIsRolledBack(farConflict->sxactOut)
-						&& !SxactIsMarkedForDeath(farConflict->sxactOut)))
+						&& !SxactIsDoomed(farConflict->sxactOut)))
 				{
-					nearConflict->sxactOut->flags |= SXACT_FLAG_MARKED_FOR_DEATH;
+					/*
+					 * Normally, we kill the pivot transaction to make sure we
+					 * make progress if the failing transaction is retried.
+					 * However, we can't kill it if it's already prepared, so
+					 * in that case we commit suicide instead.
+					 */
+					if (SxactIsPrepared(nearConflict->sxactOut))
+					{
+						LWLockRelease(SerializableXactHashLock);
+						ereport(ERROR,
+								(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
+								 errmsg("could not serialize access due to read/write dependencies among transactions"),
+								 errdetail_internal("Reason code: Canceled on commit attempt with conflict in from prepared pivot."),
+								 errhint("The transaction might succeed if retried.")));
+					}
+					nearConflict->sxactOut->flags |= SXACT_FLAG_DOOMED;
 					break;
 				}
 				farConflict = (RWConflict)
@@ -4496,11 +4595,12 @@ PreCommit_CheckForSerializationFailure(void)
 		}
 
 		nearConflict = (RWConflict)
-			SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
+			SHMQueueNext(&MySerializableXact->inConflicts,
 						 &nearConflict->inLink,
 						 offsetof(RWConflictData, inLink));
 	}
 
+	MySerializableXact->prepareSeqNo = ++(PredXact->LastSxactCommitSeqNo);
 	MySerializableXact->flags |= SXACT_FLAG_PREPARED;
 
 	LWLockRelease(SerializableXactHashLock);
@@ -4543,9 +4643,9 @@ AtPrepare_PredicateLocks(void)
 	 * outConflicts lists, if they're non-empty we'll represent that by
 	 * setting the appropriate summary conflict flags.
 	 */
-	if (!SHMQueueEmpty((SHM_QUEUE *) &MySerializableXact->inConflicts))
+	if (!SHMQueueEmpty(&MySerializableXact->inConflicts))
 		xactRecord->flags |= SXACT_FLAG_SUMMARY_CONFLICT_IN;
-	if (!SHMQueueEmpty((SHM_QUEUE *) &MySerializableXact->outConflicts))
+	if (!SHMQueueEmpty(&MySerializableXact->outConflicts))
 		xactRecord->flags |= SXACT_FLAG_SUMMARY_CONFLICT_OUT;
 
 	RegisterTwoPhaseRecord(TWOPHASE_RM_PREDICATELOCK_ID, 0,
@@ -4675,6 +4775,7 @@ predicatelock_twophase_recover(TransactionId xid, uint16 info,
 		sxact->pid = 0;
 
 		/* a prepared xact hasn't committed yet */
+		sxact->prepareSeqNo = RecoverySerCommitSeqNo;
 		sxact->commitSeqNo = InvalidSerCommitSeqNo;
 		sxact->finishedBefore = InvalidTransactionId;
 
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index ee0331605086a..58d95bc0d6b5c 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -180,11 +180,15 @@ InitProcGlobal(void)
 	 */
 	ProcGlobal->freeProcs = NULL;
 	ProcGlobal->autovacFreeProcs = NULL;
+	ProcGlobal->startupProc = NULL;
+	ProcGlobal->startupProcPid = 0;
+	ProcGlobal->startupBufferPinWaitBufId = -1;
 
 	ProcGlobal->spins_per_delay = DEFAULT_SPINS_PER_DELAY;
 
 	/*
-	 * Pre-create the PGPROC structures and create a semaphore for each.
+	 * Pre-create the PGPROC structures and create a semaphore and latch
+	 * for each.
 	 */
 	procs = (PGPROC *) ShmemAlloc((MaxConnections) * sizeof(PGPROC));
 	if (!procs)
@@ -195,9 +199,9 @@ InitProcGlobal(void)
 	for (i = 0; i < MaxConnections; i++)
 	{
 		PGSemaphoreCreate(&(procs[i].sem));
+		InitSharedLatch(&procs[i].procLatch);
 		procs[i].links.next = (SHM_QUEUE *) ProcGlobal->freeProcs;
 		ProcGlobal->freeProcs = &procs[i];
-		InitSharedLatch(&procs[i].waitLatch);
 	}
 
 	/*
@@ -214,9 +218,9 @@ InitProcGlobal(void)
 	for (i = 0; i < autovacuum_max_workers + 1; i++)
 	{
 		PGSemaphoreCreate(&(procs[i].sem));
+		InitSharedLatch(&procs[i].procLatch);
 		procs[i].links.next = (SHM_QUEUE *) ProcGlobal->autovacFreeProcs;
 		ProcGlobal->autovacFreeProcs = &procs[i];
-		InitSharedLatch(&procs[i].waitLatch);
 	}
 
 	/*
@@ -227,7 +231,7 @@ InitProcGlobal(void)
 	{
 		AuxiliaryProcs[i].pid = 0;		/* marks auxiliary proc as not in use */
 		PGSemaphoreCreate(&(AuxiliaryProcs[i].sem));
-		InitSharedLatch(&procs[i].waitLatch);
+		InitSharedLatch(&AuxiliaryProcs[i].procLatch);
 	}
 
 	/* Create ProcStructLock spinlock, too */
@@ -303,8 +307,8 @@ InitProcess(void)
 		MarkPostmasterChildActive();
 
 	/*
-	 * Initialize all fields of MyProc, except for the semaphore which was
-	 * prepared for us by InitProcGlobal.
+	 * Initialize all fields of MyProc, except for the semaphore and latch,
+	 * which were prepared for us by InitProcGlobal.
 	 */
 	SHMQueueElemInit(&(MyProc->links));
 	MyProc->waitStatus = STATUS_OK;
@@ -330,12 +334,17 @@ InitProcess(void)
 		SHMQueueInit(&(MyProc->myProcLocks[i]));
 	MyProc->recoveryConflictPending = false;
 
-	/* Initialise for sync rep */
+	/* Initialize fields for sync rep */
 	MyProc->waitLSN.xlogid = 0;
 	MyProc->waitLSN.xrecoff = 0;
 	MyProc->syncRepState = SYNC_REP_NOT_WAITING;
 	SHMQueueElemInit(&(MyProc->syncRepLinks));
-	OwnLatch((Latch *) &MyProc->waitLatch);
+
+	/*
+	 * Acquire ownership of the PGPROC's latch, so that we can use WaitLatch.
+	 * Note that there's no particular need to do ResetLatch here.
+	 */
+	OwnLatch(&MyProc->procLatch);
 
 	/*
 	 * We might be reusing a semaphore that belonged to a failed process. So
@@ -376,7 +385,6 @@ InitProcessPhase2(void)
 	/*
 	 * Arrange to clean that up at backend exit.
 	 */
-	on_shmem_exit(SyncRepCleanupAtProcExit, 0);
 	on_shmem_exit(RemoveProcFromArray, 0);
 }
 
@@ -451,8 +459,8 @@ InitAuxiliaryProcess(void)
 	SpinLockRelease(ProcStructLock);
 
 	/*
-	 * Initialize all fields of MyProc, except for the semaphore which was
-	 * prepared for us by InitProcGlobal.
+	 * Initialize all fields of MyProc, except for the semaphore and latch,
+	 * which were prepared for us by InitProcGlobal.
 	 */
 	SHMQueueElemInit(&(MyProc->links));
 	MyProc->waitStatus = STATUS_OK;
@@ -472,6 +480,12 @@ InitAuxiliaryProcess(void)
 	for (i = 0; i < NUM_LOCK_PARTITIONS; i++)
 		SHMQueueInit(&(MyProc->myProcLocks[i]));
 
+	/*
+	 * Acquire ownership of the PGPROC's latch, so that we can use WaitLatch.
+	 * Note that there's no particular need to do ResetLatch here.
+	 */
+	OwnLatch(&MyProc->procLatch);
+
 	/*
 	 * We might be reusing a semaphore that belonged to a failed process. So
 	 * be careful and reinitialize its value here.	(This is not strictly
@@ -499,7 +513,6 @@ PublishStartupProcessInformation(void)
 
 	procglobal->startupProc = MyProc;
 	procglobal->startupProcPid = MyProcPid;
-	procglobal->startupBufferPinWaitBufId = 0;
 
 	SpinLockRelease(ProcStructLock);
 }
@@ -526,14 +539,10 @@ SetStartupBufferPinWaitBufId(int bufid)
 int
 GetStartupBufferPinWaitBufId(void)
 {
-	int			bufid;
-
 	/* use volatile pointer to prevent code rearrangement */
 	volatile PROC_HDR *procglobal = ProcGlobal;
 
-	bufid = procglobal->startupBufferPinWaitBufId;
-
-	return bufid;
+	return procglobal->startupBufferPinWaitBufId;
 }
 
 /*
@@ -679,6 +688,9 @@ ProcKill(int code, Datum arg)
 
 	Assert(MyProc != NULL);
 
+	/* Make sure we're out of the sync rep lists */
+	SyncRepCleanupAtProcExit();
+
 	/*
 	 * Release any LW locks I am holding.  There really shouldn't be any, but
 	 * it's cheap to check again before we cut the knees off the LWLock
@@ -686,6 +698,9 @@ ProcKill(int code, Datum arg)
 	 */
 	LWLockReleaseAll();
 
+	/* Release ownership of the process's latch, too */
+	DisownLatch(&MyProc->procLatch);
+
 	SpinLockAcquire(ProcStructLock);
 
 	/* Return PGPROC structure (and semaphore) to appropriate freelist */
@@ -741,6 +756,9 @@ AuxiliaryProcKill(int code, Datum arg)
 	/* Release any LW locks I am holding (see notes above) */
 	LWLockReleaseAll();
 
+	/* Release ownership of the process's latch, too */
+	DisownLatch(&MyProc->procLatch);
+
 	SpinLockAcquire(ProcStructLock);
 
 	/* Mark auxiliary proc no longer in use */
@@ -942,6 +960,15 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
 	 */
 	LWLockRelease(partitionLock);
 
+	/*
+	 * Also, now that we will successfully clean up after an ereport, it's
+	 * safe to check to see if there's a buffer pin deadlock against the
+	 * Startup process.  Of course, that's only necessary if we're doing
+	 * Hot Standby and are not the Startup process ourselves.
+	 */
+	if (RecoveryInProgress() && !InRecovery)
+		CheckRecoveryConflictDeadlock();
+
 	/* Reset deadlock_state before enabling the signal handler */
 	deadlock_state = DS_NOT_YET_CHECKED;
 
@@ -1005,7 +1032,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
 			{
 				int			pid = autovac->pid;
 
-				elog(DEBUG2, "sending cancel to blocking autovacuum pid = %d",
+				elog(DEBUG2, "sending cancel to blocking autovacuum PID %d",
 					 pid);
 
 				/* don't hold the lock across the kill() syscall */
@@ -1333,7 +1360,7 @@ CheckDeadLock(void)
 		 * the lock.
 		 *
 		 * If blocked by autovacuum, this wakeup will enable ProcSleep to send
-		 * the cancelling signal to the autovacuum worker.
+		 * the canceling signal to the autovacuum worker.
 		 */
 		PGSemaphoreUnlock(&MyProc->sem);
 	}
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index ec3292afcd811..ea7bf496daf1a 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -54,7 +54,7 @@ smgrout(PG_FUNCTION_ARGS)
 	char	   *s;
 
 	if (i >= NStorageManagers || i < 0)
-		elog(ERROR, "invalid storage manager id: %d", i);
+		elog(ERROR, "invalid storage manager ID: %d", i);
 
 	s = pstrdup(StorageManager[i].smgr_name);
 	PG_RETURN_CSTRING(s);
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index a07661f02abdd..238d5eb74e87a 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -179,7 +179,7 @@ static int	UseNewLine = 1;		/* Use newlines query delimiters (the default) */
 static int	UseNewLine = 0;		/* Use EOF as query delimiters */
 #endif   /* TCOP_DONTUSENEWLINE */
 
-/* whether or not, and why, we were cancelled by conflict with recovery */
+/* whether or not, and why, we were canceled by conflict with recovery */
 static bool RecoveryConflictPending = false;
 static bool RecoveryConflictRetryable = true;
 static ProcSignalReason RecoveryConflictReason;
@@ -574,7 +574,7 @@ pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 {
 	Query	   *query;
 	List	   *querytree_list;
-
+	printf("postgres.c 577: pg_analyze_and_rewrite node type %d\n", parsetree -> type);
 	TRACE_POSTGRESQL_QUERY_REWRITE_START(query_string);
 
 	/*
@@ -584,7 +584,7 @@ pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 		ResetUsage();
 
 	query = parse_analyze(parsetree, query_string, paramTypes, numParams);
-
+	printf("postgres.c 587: pg_analyze_and_rewrite query command type returned by parse_analyze %d\n", query -> commandType);
 	if (log_parser_stats)
 		ShowUsage("PARSE ANALYSIS STATISTICS");
 
@@ -592,6 +592,7 @@ pg_analyze_and_rewrite(Node *parsetree, const char *query_string,
 	 * (2) Rewrite the queries, as necessary
 	 */
 	querytree_list = pg_rewrite_query(query);
+	printf("postgres.c 595: pg_analyze_and_rewrite size of query list returned by parse_analyze %d\n", length(querytree_list));
 
 	TRACE_POSTGRESQL_QUERY_REWRITE_DONE(query_string);
 
@@ -773,12 +774,15 @@ pg_plan_queries(List *querytrees, int cursorOptions, ParamListInfo boundParams)
 		Node	   *stmt;
 
 		if (query->commandType == CMD_UTILITY)
-		{
+		  {
+			printf("postgres.c 778: pg_plan_queries Utility Query, hence no plans\n");
 			/* Utility commands have no plans. */
 			stmt = query->utilityStmt;
 		}
 		else
-		{
+		  {
+			printf("postgres.c 778: pg_plan_queries Not Utility Query, planning\n");
+
 			stmt = (Node *) pg_plan_query(query, cursorOptions, boundParams);
 		}
 
@@ -966,6 +970,7 @@ exec_simple_query(const char *query_string)
 		 * we are passing here is in MessageContext, which will outlive the
 		 * portal anyway.
 		 */
+		printf("postgres.c 973: exec_simple_query Defining portal\n");
 		PortalDefineQuery(portal,
 						  NULL,
 						  query_string,
@@ -1004,8 +1009,10 @@ exec_simple_query(const char *query_string)
 		 * Now we can create the destination receiver object.
 		 */
 		receiver = CreateDestReceiver(dest);
-		if (dest == DestRemote)
-			SetRemoteDestReceiverParams(receiver, portal);
+		if (dest == DestRemote){
+		  printf("postgres.c 1013: Remote Destination\n");
+		  SetRemoteDestReceiverParams(receiver, portal);
+		}
 
 		/*
 		 * Switch back to transaction context for execution.
@@ -1021,11 +1028,11 @@ exec_simple_query(const char *query_string)
 						 receiver,
 						 receiver,
 						 completionTag);
-
+		printf("portal run finished\n");
 		(*receiver->rDestroy) (receiver);
 
 		PortalDrop(portal, false);
-
+		printf("portal dropped\n");
 		if (IsA(parsetree, TransactionStmt))
 		{
 			/*
@@ -2643,11 +2650,12 @@ die(SIGNAL_ARGS)
 			InterruptHoldoffCount--;
 			ProcessInterrupts();
 		}
-
-		/* Interrupt any sync rep wait which is currently in progress. */
-		SetLatch(&(MyProc->waitLatch));
 	}
 
+	/* If we're still here, waken anything waiting on the process latch */
+	if (MyProc)
+		SetLatch(&MyProc->procLatch);
+
 	errno = save_errno;
 }
 
@@ -2684,11 +2692,12 @@ StatementCancelHandler(SIGNAL_ARGS)
 			InterruptHoldoffCount--;
 			ProcessInterrupts();
 		}
-
-		/* Interrupt any sync rep wait which is currently in progress. */
-		SetLatch(&(MyProc->waitLatch));
 	}
 
+	/* If we're still here, waken anything waiting on the process latch */
+	if (MyProc)
+		SetLatch(&MyProc->procLatch);
+
 	errno = save_errno;
 }
 
@@ -4294,7 +4303,7 @@ ShowUsage(const char *title)
 
 	ereport(LOG,
 			(errmsg_internal("%s", title),
-			 errdetail("%s", str.data)));
+			 errdetail_internal("%s", str.data)));
 
 	pfree(str.data);
 }
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index b7649c68fcf26..38b74dea0d395 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -179,7 +179,7 @@ ProcessQuery(PlannedStmt *plan,
 	/*
 	 * Call ExecutorStart to prepare the plan for execution
 	 */
-	ExecutorStart(queryDesc, 0);
+	ExecutorStart(queryDesc, 0, 'r');
 
 	/*
 	 * Run the plan to completion.
@@ -272,7 +272,8 @@ ChoosePortalStrategy(List *stmts)
 				}
 				if (query->commandType == CMD_UTILITY &&
 					query->utilityStmt != NULL)
-				{
+				  {
+					printf("pquery.c 276: ChoosePortalStrategy CMD_UTILITY");
 					if (UtilityReturnsTuples(query->utilityStmt))
 						return PORTAL_UTIL_SELECT;
 					/* it can't be ONE_RETURNING, so give up */
@@ -490,14 +491,14 @@ PortalStart(Portal portal, ParamListInfo params, Snapshot snapshot)
 		 * Determine the portal execution strategy
 		 */
 		portal->strategy = ChoosePortalStrategy(portal->stmts);
-
+		printf("pquery.c 494: portal strategy chosen is %d\n", portal -> strategy);
 		/*
 		 * Fire her up according to the strategy
 		 */
 		switch (portal->strategy)
 		{
 			case PORTAL_ONE_SELECT:
-
+			  printf("pquery.c 500: portal_one_select case\n");
 				/* Must set snapshot before starting executor. */
 				if (snapshot)
 					PushActiveSnapshot(snapshot);
@@ -528,7 +529,7 @@ PortalStart(Portal portal, ParamListInfo params, Snapshot snapshot)
 				/*
 				 * Call ExecutorStart to prepare the plan for execution
 				 */
-				ExecutorStart(queryDesc, eflags);
+				ExecutorStart(queryDesc, eflags, 'r');
 
 				/*
 				 * This tells PortalCleanup to shut down the executor
@@ -752,6 +753,7 @@ PortalRun(Portal portal, long count, bool isTopLevel,
 	 * CurrentMemoryContext has a similar problem, but the other pointers we
 	 * save here will be NULL or pointing to longer-lived objects.
 	 */
+	printf("pquery.c 756: Running portal now\n");
 	saveTopTransactionResourceOwner = TopTransactionResourceOwner;
 	saveTopTransactionContext = TopTransactionContext;
 	saveActivePortal = ActivePortal;
@@ -809,7 +811,8 @@ PortalRun(Portal portal, long count, bool isTopLevel,
 				result = portal->atEnd;
 				break;
 
-			case PORTAL_MULTI_QUERY:
+		case PORTAL_MULTI_QUERY:
+		  printf("pquery.c 815: PortalRun PORTAL_MULTI_QUERY case Calling PortalRunMulti\n");
 				PortalRunMulti(portal, isTopLevel,
 							   dest, altdest, completionTag);
 
@@ -1151,7 +1154,6 @@ PortalRunUtility(Portal portal, Node *utilityStmt, bool isTopLevel,
 	bool		active_snapshot_set;
 
 	elog(DEBUG3, "ProcessUtility");
-
 	/*
 	 * Set snapshot if utility stmt needs one.	Most reliable way to do this
 	 * seems to be to enumerate those that do not need one; this is a short
@@ -1245,7 +1247,8 @@ PortalRunMulti(Portal portal, bool isTopLevel,
 
 		if (IsA(stmt, PlannedStmt) &&
 			((PlannedStmt *) stmt)->utilityStmt == NULL)
-		{
+		  {
+			printf("pquery.c 1249: PortalRunMulti Processing plannable query.\n");
 			/*
 			 * process a plannable query.
 			 */
@@ -1279,7 +1282,8 @@ PortalRunMulti(Portal portal, bool isTopLevel,
 							 dest, completionTag);
 			}
 			else
-			{
+			  {
+				printf("pquery.c 1284: PortalRunMulti callng ProcessQuery.\n");
 				/* stmt added by rewrite cannot set tag */
 				ProcessQuery(pstmt,
 							 portal->sourceText,
@@ -1312,8 +1316,10 @@ PortalRunMulti(Portal portal, bool isTopLevel,
 			{
 				Assert(!active_snapshot_set);
 				/* statement can set tag string */
+				printf("pquery.c 1249: PortalRunMulti calling PortalRunUtility.\n");
 				PortalRunUtility(portal, stmt, isTopLevel,
 								 dest, completionTag);
+				printf("pquery.c 1249: PortalRunMulti call of PortalRunUtility finished.\n");
 			}
 			else
 			{
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 0559998c71f78..b551d1dcab108 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -48,6 +48,7 @@
 #include "commands/user.h"
 #include "commands/vacuum.h"
 #include "commands/view.h"
+#include "commands/matview.h"
 #include "miscadmin.h"
 #include "parser/parse_utilcmd.h"
 #include "postmaster/bgwriter.h"
@@ -526,8 +527,8 @@ standard_ProcessUtility(Node *parsetree,
 
 						/* Create the table itself */
 						relOid = DefineRelation((CreateStmt *) stmt,
-												RELKIND_RELATION,
-												InvalidOid);
+									RELKIND_RELATION,
+									InvalidOid);
 
 						/*
 						 * Let AlterTableCreateToastTable decide if this one
@@ -644,6 +645,7 @@ standard_ProcessUtility(Node *parsetree,
 					case OBJECT_TABLE:
 					case OBJECT_SEQUENCE:
 					case OBJECT_VIEW:
+                    case OBJECT_MAT_VIEW:
 					case OBJECT_INDEX:
 					case OBJECT_FOREIGN_TABLE:
 						RemoveRelations(stmt);
@@ -915,11 +917,15 @@ standard_ProcessUtility(Node *parsetree,
 		case T_ViewStmt:		/* CREATE VIEW */
 			DefineView((ViewStmt *) parsetree, queryString);
 			break;
+			// Define "DefineMatView"
+	case T_MatViewStmt:		/* CREATE VIEW */
+	  DefineMatView((ViewStmt *) parsetree, queryString);
+	  // getRelationDescription()
+	  break;
 
 		case T_CreateFunctionStmt:		/* CREATE FUNCTION */
 			CreateFunction((CreateFunctionStmt *) parsetree, queryString);
 			break;
-
 		case T_AlterFunctionStmt:		/* ALTER FUNCTION */
 			AlterFunction((AlterFunctionStmt *) parsetree);
 			break;
@@ -1895,6 +1901,10 @@ CreateCommandTag(Node *parsetree)
 			tag = "CREATE VIEW";
 			break;
 
+	case T_MatViewStmt:
+	  tag = "CREATE MATVIEW";
+	  break;
+			
 		case T_CreateFunctionStmt:
 			tag = "CREATE FUNCTION";
 			break;
@@ -2442,6 +2452,10 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_DDL;
 			break;
 
+		case T_MatViewStmt:
+			lev = LOGSTMT_DDL;
+			break;
+			
 		case T_CreateFunctionStmt:
 			lev = LOGSTMT_DDL;
 			break;
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index faef6f8381378..fde02ab3177a3 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -30,12 +30,6 @@
 #include "utils/numeric.h"
 #include "utils/pg_locale.h"
 
-#define CASH_BUFSZ		36
-
-#define TERMINATOR		(CASH_BUFSZ - 1)
-#define LAST_PAREN		(TERMINATOR - 1)
-#define LAST_DIGIT		(LAST_PAREN - 1)
-
 
 /*************************************************************************
  * Private routines
@@ -107,13 +101,13 @@ cash_in(PG_FUNCTION_ARGS)
 	Cash		value = 0;
 	Cash		dec = 0;
 	Cash		sgn = 1;
-	int			seen_dot = 0;
+	bool		seen_dot = false;
 	const char *s = str;
 	int			fpoint;
-	char		dsymbol,
-				ssymbol,
-				psymbol;
-	const char *nsymbol,
+	char		dsymbol;
+	const char *ssymbol,
+			   *psymbol,
+			   *nsymbol,
 			   *csymbol;
 	struct lconv *lconvert = PGLC_localeconv();
 
@@ -131,18 +125,22 @@ cash_in(PG_FUNCTION_ARGS)
 	if (fpoint < 0 || fpoint > 10)
 		fpoint = 2;				/* best guess in this case, I think */
 
-	dsymbol = ((*lconvert->mon_decimal_point != '\0') ? *lconvert->mon_decimal_point : '.');
-	if (*lconvert->mon_thousands_sep != '\0')
-		ssymbol = *lconvert->mon_thousands_sep;
+	/* we restrict dsymbol to be a single byte, but not the other symbols */
+	if (*lconvert->mon_decimal_point != '\0' &&
+		lconvert->mon_decimal_point[1] == '\0')
+		dsymbol = *lconvert->mon_decimal_point;
 	else
-		/* ssymbol should not equal dsymbol */
-		ssymbol = (dsymbol != ',') ? ',' : '.';
-	csymbol = ((*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$");
-	psymbol = ((*lconvert->positive_sign != '\0') ? *lconvert->positive_sign : '+');
-	nsymbol = ((*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-");
+		dsymbol = '.';
+	if (*lconvert->mon_thousands_sep != '\0')
+		ssymbol = lconvert->mon_thousands_sep;
+	else						/* ssymbol should not equal dsymbol */
+		ssymbol = (dsymbol != ',') ? "," : ".";
+	csymbol = (*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$";
+	psymbol = (*lconvert->positive_sign != '\0') ? lconvert->positive_sign : "+";
+	nsymbol = (*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-";
 
 #ifdef CASHDEBUG
-	printf("cashin- precision '%d'; decimal '%c'; thousands '%c'; currency '%s'; positive '%c'; negative '%s'\n",
+	printf("cashin- precision '%d'; decimal '%c'; thousands '%s'; currency '%s'; positive '%s'; negative '%s'\n",
 		   fpoint, dsymbol, ssymbol, csymbol, psymbol, nsymbol);
 #endif
 
@@ -164,22 +162,20 @@ cash_in(PG_FUNCTION_ARGS)
 	{
 		sgn = -1;
 		s += strlen(nsymbol);
-#ifdef CASHDEBUG
-		printf("cashin- negative symbol; string is '%s'\n", s);
-#endif
 	}
 	else if (*s == '(')
 	{
 		sgn = -1;
 		s++;
 	}
-	else if (*s == psymbol)
-		s++;
+	else if (strncmp(s, psymbol, strlen(psymbol)) == 0)
+		s += strlen(psymbol);
 
 #ifdef CASHDEBUG
 	printf("cashin- string is '%s'\n", s);
 #endif
 
+	/* allow whitespace and currency symbol after the sign, too */
 	while (isspace((unsigned char) *s))
 		s++;
 	if (strncmp(s, csymbol, strlen(csymbol)) == 0)
@@ -189,7 +185,7 @@ cash_in(PG_FUNCTION_ARGS)
 	printf("cashin- string is '%s'\n", s);
 #endif
 
-	for (;; s++)
+	for (; *s; s++)
 	{
 		/* we look for digits as long as we have found less */
 		/* than the required number of decimal places */
@@ -203,33 +199,44 @@ cash_in(PG_FUNCTION_ARGS)
 		/* decimal point? then start counting fractions... */
 		else if (*s == dsymbol && !seen_dot)
 		{
-			seen_dot = 1;
+			seen_dot = true;
 		}
 		/* ignore if "thousands" separator, else we're done */
-		else if (*s != ssymbol)
-		{
-			/* round off */
-			if (isdigit((unsigned char) *s) && *s >= '5')
-				value++;
-
-			/* adjust for less than required decimal places */
-			for (; dec < fpoint; dec++)
-				value *= 10;
-
+		else if (strncmp(s, ssymbol, strlen(ssymbol)) == 0)
+			s += strlen(ssymbol) - 1;
+		else
 			break;
-		}
 	}
 
-	/* should only be trailing digits followed by whitespace or right paren */
+	/* round off if there's another digit */
+	if (isdigit((unsigned char) *s) && *s >= '5')
+		value++;
+
+	/* adjust for less than required decimal places */
+	for (; dec < fpoint; dec++)
+		value *= 10;
+
+	/*
+	 * should only be trailing digits followed by whitespace, right paren,
+	 * or possibly a trailing minus sign
+	 */
 	while (isdigit((unsigned char) *s))
 		s++;
-	while (isspace((unsigned char) *s) || *s == ')')
-		s++;
-
-	if (*s != '\0')
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for type money: \"%s\"", str)));
+	while (*s)
+	{
+		if (isspace((unsigned char) *s) || *s == ')')
+			s++;
+		else if (strncmp(s, nsymbol, strlen(nsymbol)) == 0)
+		{
+			sgn = -1;
+			s += strlen(nsymbol);
+		}
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+					 errmsg("invalid input syntax for type money: \"%s\"",
+							str)));
+	}
 
 	result = value * sgn;
 
@@ -242,26 +249,24 @@ cash_in(PG_FUNCTION_ARGS)
 
 
 /* cash_out()
- * Function to convert cash to a dollars and cents representation.
- * XXX HACK This code appears to assume US conventions for
- *	positive-valued amounts. - tgl 97/04/14
+ * Function to convert cash to a dollars and cents representation, using
+ * the lc_monetary locale's formatting.
  */
 Datum
 cash_out(PG_FUNCTION_ARGS)
 {
 	Cash		value = PG_GETARG_CASH(0);
 	char	   *result;
-	char		buf[CASH_BUFSZ];
-	int			minus = 0;
-	int			count = LAST_DIGIT;
-	int			point_pos;
-	int			ssymbol_position = 0;
+	char		buf[128];
+	char	   *bufptr;
+	bool		minus = false;
+	int			digit_pos;
 	int			points,
 				mon_group;
-	char		ssymbol;
-	const char *csymbol,
-			   *nsymbol;
 	char		dsymbol;
+	const char *ssymbol,
+			   *csymbol,
+			   *nsymbol;
 	char		convention;
 	struct lconv *lconvert = PGLC_localeconv();
 
@@ -279,69 +284,78 @@ cash_out(PG_FUNCTION_ARGS)
 		mon_group = 3;
 
 	convention = lconvert->n_sign_posn;
-	dsymbol = ((*lconvert->mon_decimal_point != '\0') ? *lconvert->mon_decimal_point : '.');
-	if (*lconvert->mon_thousands_sep != '\0')
-		ssymbol = *lconvert->mon_thousands_sep;
-	else
-		/* ssymbol should not equal dsymbol */
-		ssymbol = (dsymbol != ',') ? ',' : '.';
-	csymbol = ((*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$");
-	nsymbol = ((*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-");
-
-	point_pos = LAST_DIGIT - points;
 
-	point_pos -= (points - 1) / mon_group;
-	ssymbol_position = point_pos % (mon_group + 1);
+	/* we restrict dsymbol to be a single byte, but not the other symbols */
+	if (*lconvert->mon_decimal_point != '\0' &&
+		lconvert->mon_decimal_point[1] == '\0')
+		dsymbol = *lconvert->mon_decimal_point;
+	else
+		dsymbol = '.';
+	if (*lconvert->mon_thousands_sep != '\0')
+		ssymbol = lconvert->mon_thousands_sep;
+	else						/* ssymbol should not equal dsymbol */
+		ssymbol = (dsymbol != ',') ? "," : ".";
+	csymbol = (*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$";
+	nsymbol = (*lconvert->negative_sign != '\0') ? lconvert->negative_sign : "-";
 
 	/* we work with positive amounts and add the minus sign at the end */
 	if (value < 0)
 	{
-		minus = 1;
+		minus = true;
 		value = -value;
 	}
 
-	/* allow for trailing negative strings */
-	MemSet(buf, ' ', CASH_BUFSZ);
-	buf[TERMINATOR] = buf[LAST_PAREN] = '\0';
+	/* we build the result string right-to-left in buf[] */
+	bufptr = buf + sizeof(buf) - 1;
+	*bufptr = '\0';
 
-	while (value || count > (point_pos - 2))
+	/*
+	 * Generate digits till there are no non-zero digits left and we emitted
+	 * at least one to the left of the decimal point.  digit_pos is the
+	 * current digit position, with zero as the digit just left of the decimal
+	 * point, increasing to the right.
+	 */
+	digit_pos = points;
+	do
 	{
-		if (points && count == point_pos)
-			buf[count--] = dsymbol;
-		else if (ssymbol && count % (mon_group + 1) == ssymbol_position)
-			buf[count--] = ssymbol;
+		if (points && digit_pos == 0)
+		{
+			/* insert decimal point */
+			*(--bufptr) = dsymbol;
+		}
+		else if (digit_pos < points && (digit_pos % mon_group) == 0)
+		{
+			/* insert thousands sep */
+			bufptr -= strlen(ssymbol);
+			memcpy(bufptr, ssymbol, strlen(ssymbol));
+		}
 
-		buf[count--] = ((uint64) value % 10) + '0';
+		*(--bufptr) = ((uint64) value % 10) + '0';
 		value = ((uint64) value) / 10;
-	}
-
-	strncpy((buf + count - strlen(csymbol) + 1), csymbol, strlen(csymbol));
-	count -= strlen(csymbol) - 1;
+		digit_pos--;
+	} while (value || digit_pos >= 0);
 
-	/*
-	 * If points == 0 and the number of digits % mon_group == 0, the code
-	 * above adds a trailing ssymbol on the far right, so remove it.
-	 */
-	if (buf[LAST_DIGIT] == ssymbol)
-		buf[LAST_DIGIT] = '\0';
+	/* prepend csymbol */
+	bufptr -= strlen(csymbol);
+	memcpy(bufptr, csymbol, strlen(csymbol));
 
 	/* see if we need to signify negative amount */
 	if (minus)
 	{
-		result = palloc(CASH_BUFSZ + 2 - count + strlen(nsymbol));
+		result = palloc(strlen(bufptr) + strlen(nsymbol) + 3);
 
 		/* Position code of 0 means use parens */
 		if (convention == 0)
-			sprintf(result, "(%s)", buf + count);
+			sprintf(result, "(%s)", bufptr);
 		else if (convention == 2)
-			sprintf(result, "%s%s", buf + count, nsymbol);
+			sprintf(result, "%s%s", bufptr, nsymbol);
 		else
-			sprintf(result, "%s%s", nsymbol, buf + count);
+			sprintf(result, "%s%s", nsymbol, bufptr);
 	}
 	else
 	{
-		result = palloc(CASH_BUFSZ + 2 - count);
-		strcpy(result, buf + count);
+		/* just emit what we have */
+		result = pstrdup(bufptr);
 	}
 
 	PG_RETURN_CSTRING(result);
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 726a1f4552345..1a52429624481 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -3902,6 +3902,9 @@ NUM_prepare_locale(NUMProc *Np)
 /* ----------
  * Return pointer of last relevant number after decimal point
  *	12.0500 --> last relevant is '5'
+ *	12.0000 --> last relevant is '.'
+ * If there is no decimal point, return NULL (which will result in same
+ * behavior as if FM hadn't been specified).
  * ----------
  */
 static char *
@@ -3915,7 +3918,8 @@ get_last_relevant_decnum(char *num)
 #endif
 
 	if (!p)
-		p = num;
+		return NULL;
+
 	result = p;
 
 	while (*(++p))
@@ -4452,13 +4456,22 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
 	{
 		Np->num_pre = plen;
 
-		if (IS_FILLMODE(Np->Num))
+		if (IS_FILLMODE(Np->Num) && IS_DECIMAL(Np->Num))
 		{
-			if (IS_DECIMAL(Np->Num))
-				Np->last_relevant = get_last_relevant_decnum(
-															 Np->number +
-									 ((Np->Num->zero_end - Np->num_pre > 0) ?
-									  Np->Num->zero_end - Np->num_pre : 0));
+			Np->last_relevant = get_last_relevant_decnum(Np->number);
+
+			/*
+			 * If any '0' specifiers are present, make sure we don't strip
+			 * those digits.
+			 */
+			if (Np->last_relevant && Np->Num->zero_end > Np->num_pre)
+			{
+				char   *last_zero;
+
+				last_zero = Np->number + (Np->Num->zero_end - Np->num_pre);
+				if (Np->last_relevant < last_zero)
+					Np->last_relevant = last_zero;
+			}
 		}
 
 		if (Np->sign_wrote == FALSE && Np->num_pre == 0)
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 019fcaaa36f23..a367421f82b65 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -1382,6 +1382,10 @@ generate_series_step_int4(PG_FUNCTION_ARGS)
 		/* increment current in preparation for next iteration */
 		fctx->current += fctx->step;
 
+		/* if next-value computation overflows, this is the final result */
+		if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current))
+			fctx->step = 0;
+
 		/* do when there is more left to send */
 		SRF_RETURN_NEXT(funcctx, Int32GetDatum(result));
 	}
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 451916480cd2b..2e74482979eff 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -1410,6 +1410,10 @@ generate_series_step_int8(PG_FUNCTION_ARGS)
 		/* increment current in preparation for next iteration */
 		fctx->current += fctx->step;
 
+		/* if next-value computation overflows, this is the final result */
+		if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current))
+			fctx->step = 0;
+
 		/* do when there is more left to send */
 		SRF_RETURN_NEXT(funcctx, Int64GetDatum(result));
 	}
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 80e5915b3e54b..fcd1c680803b7 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -907,7 +907,7 @@ convert_network_to_scalar(Datum value, Oid typid)
 		case INETOID:
 		case CIDROID:
 			{
-				inet	   *ip = DatumGetInetP(value);
+				inet	   *ip = DatumGetInetPP(value);
 				int			len;
 				double		res;
 				int			i;
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index cf663466c354b..401440afae6f1 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -239,7 +239,9 @@ check_locale(int category, const char *value)
 	/* set the locale with setlocale, to see if it accepts it. */
 	ret = (setlocale(category, value) != NULL);
 
-	setlocale(category, save);	/* assume this won't fail */
+	/* restore old value. */
+	if (!setlocale(category, save))
+		elog(WARNING, "failed to restore old locale");
 	pfree(save);
 
 	return ret;
@@ -499,13 +501,15 @@ PGLC_localeconv(void)
 	/* Try to restore internal settings */
 	if (save_lc_monetary)
 	{
-		setlocale(LC_MONETARY, save_lc_monetary);
+		if (!setlocale(LC_MONETARY, save_lc_monetary))
+			elog(WARNING, "failed to restore old locale");
 		pfree(save_lc_monetary);
 	}
 
 	if (save_lc_numeric)
 	{
-		setlocale(LC_NUMERIC, save_lc_numeric);
+		if (!setlocale(LC_NUMERIC, save_lc_numeric))
+			elog(WARNING, "failed to restore old locale");
 		pfree(save_lc_numeric);
 	}
 
@@ -513,7 +517,8 @@ PGLC_localeconv(void)
 	/* Try to restore internal ctype settings */
 	if (save_lc_ctype)
 	{
-		setlocale(LC_CTYPE, save_lc_ctype);
+		if (!setlocale(LC_CTYPE, save_lc_ctype))
+			elog(WARNING, "failed to restore old locale");
 		pfree(save_lc_ctype);
 	}
 #endif
@@ -674,7 +679,8 @@ cache_locale_time(void)
 	/* try to restore internal settings */
 	if (save_lc_time)
 	{
-		setlocale(LC_TIME, save_lc_time);
+		if (!setlocale(LC_TIME, save_lc_time))
+			elog(WARNING, "failed to restore old locale");
 		pfree(save_lc_time);
 	}
 
@@ -682,7 +688,8 @@ cache_locale_time(void)
 	/* try to restore internal ctype settings */
 	if (save_lc_ctype)
 	{
-		setlocale(LC_CTYPE, save_lc_ctype);
+		if (!setlocale(LC_CTYPE, save_lc_ctype))
+			elog(WARNING, "failed to restore old locale");
 		pfree(save_lc_ctype);
 	}
 #endif
@@ -700,8 +707,7 @@ cache_locale_time(void)
  *	otherwise returns the pointer to a static area which
  *	contains the iso formatted locale name.
  */
-static
-char *
+static char *
 IsoLocaleName(const char *winlocname)
 {
 #if (_MSC_VER >= 1400)			/* VC8.0 or later */
@@ -930,6 +936,29 @@ lc_ctype_is_c(Oid collation)
 }
 
 
+/* simple subroutine for reporting errors from newlocale() */
+#ifdef HAVE_LOCALE_T
+static void
+report_newlocale_failure(const char *localename)
+{
+	/* copy errno in case one of the ereport auxiliary functions changes it */
+	int			save_errno = errno;
+
+	/*
+	 * ENOENT means "no such locale", not "no such file", so clarify that
+	 * errno with an errdetail message.
+	 */
+	ereport(ERROR,
+			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+			 errmsg("could not create locale \"%s\": %m",
+					localename),
+			 (save_errno == ENOENT ?
+			  errdetail("The operating system could not find any locale data for the locale name \"%s\".",
+						localename) : 0)));
+}
+#endif /* HAVE_LOCALE_T */
+
+
 /*
  * Create a locale_t from a collation OID.	Results are cached for the
  * lifetime of the backend.  Thus, do not free the result with freelocale().
@@ -988,10 +1017,7 @@ pg_newlocale_from_collation(Oid collid)
 			result = _create_locale(LC_ALL, collcollate);
 #endif
 			if (!result)
-				ereport(ERROR,
-						(errcode_for_file_access(),
-						 errmsg("could not create locale \"%s\": %m",
-								collcollate)));
+				report_newlocale_failure(collcollate);
 		}
 		else
 		{
@@ -1001,16 +1027,10 @@ pg_newlocale_from_collation(Oid collid)
 
 			loc1 = newlocale(LC_COLLATE_MASK, collcollate, NULL);
 			if (!loc1)
-				ereport(ERROR,
-						(errcode_for_file_access(),
-						 errmsg("could not create locale \"%s\": %m",
-								collcollate)));
+				report_newlocale_failure(collcollate);
 			result = newlocale(LC_CTYPE_MASK, collctype, loc1);
 			if (!result)
-				ereport(ERROR,
-						(errcode_for_file_access(),
-						 errmsg("could not create locale \"%s\": %m",
-								collctype)));
+				report_newlocale_failure(collctype);
 #else
 
 			/*
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 12dbff4c9a943..4d07bdd24bde7 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -1537,9 +1537,17 @@ pg_stat_reset(PG_FUNCTION_ARGS)
 Datum
 pg_stat_reset_shared(PG_FUNCTION_ARGS)
 {
-	char	   *target = text_to_cstring(PG_GETARG_TEXT_PP(0));
-
-	pgstat_reset_shared_counters(target);
+	if (PG_ARGISNULL(0))
+		/*
+		 * Same error message as in pgstat_reset_shared_counters(),
+		 * to keep translations the same.
+		 */
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("unrecognized reset target: \"%s\"", "null"),
+				 errhint("Target must be \"bgwriter\".")));
+
+	pgstat_reset_shared_counters(text_to_cstring(PG_GETARG_TEXT_PP(0)));
 
 	PG_RETURN_VOID();
 }
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index fa7b8e6e81a6d..f08af12a2bd5e 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -2633,7 +2633,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 	RangeTblEntry *fkrte;
 	const char *sep;
 	int			i;
-	int			old_work_mem;
+	int			save_nestlevel;
 	char		workmembuf[32];
 	int			spi_result;
 	SPIPlanPtr	qplan;
@@ -2772,14 +2772,16 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 	 * this seems to meet the criteria for being considered a "maintenance"
 	 * operation, and accordingly we use maintenance_work_mem.
 	 *
-	 * We do the equivalent of "SET LOCAL work_mem" so that transaction abort
-	 * will restore the old value if we lose control due to an error.
+	 * We use the equivalent of a function SET option to allow the setting to
+	 * persist for exactly the duration of the check query.  guc.c also takes
+	 * care of undoing the setting on error.
 	 */
-	old_work_mem = work_mem;
+	save_nestlevel = NewGUCNestLevel();
+
 	snprintf(workmembuf, sizeof(workmembuf), "%d", maintenance_work_mem);
 	(void) set_config_option("work_mem", workmembuf,
 							 PGC_USERSET, PGC_S_SESSION,
-							 GUC_ACTION_LOCAL, true);
+							 GUC_ACTION_SAVE, true);
 
 	if (SPI_connect() != SPI_OK_CONNECT)
 		elog(ERROR, "SPI_connect failed");
@@ -2862,13 +2864,9 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 		elog(ERROR, "SPI_finish failed");
 
 	/*
-	 * Restore work_mem for the remainder of the current transaction. This is
-	 * another SET LOCAL, so it won't affect the session value.
+	 * Restore work_mem.
 	 */
-	snprintf(workmembuf, sizeof(workmembuf), "%d", old_work_mem);
-	(void) set_config_option("work_mem", workmembuf,
-							 PGC_USERSET, PGC_S_SESSION,
-							 GUC_ACTION_LOCAL, true);
+	AtEOXact_GUC(true, save_nestlevel);
 
 	return true;
 }
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 06cf6fa4f7992..0f8ae051d7f1e 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -207,9 +207,9 @@ static char *get_variable(Var *var, int levelsup, bool showstar,
 			 deparse_context *context);
 static RangeTblEntry *find_rte_by_refname(const char *refname,
 					deparse_context *context);
+static Node *find_param_referent(Param *param, deparse_context *context,
+					deparse_namespace **dpns_p, ListCell **ancestor_cell_p);
 static void get_parameter(Param *param, deparse_context *context);
-static void print_parameter_expr(Node *expr, ListCell *ancestor_cell,
-					 deparse_namespace *dpns, deparse_context *context);
 static const char *get_simple_binary_op_name(OpExpr *expr);
 static bool isSimpleNode(Node *node, Node *parentNode, int prettyFlags);
 static void appendContextKeyword(deparse_context *context, const char *str,
@@ -453,6 +453,7 @@ pg_get_viewdef_worker(Oid viewoid, int prettyFlags)
 	/*
 	 * Get the pg_rewrite tuple for the view's SELECT rule
 	 */
+	printf("Say what?\n");
 	args[0] = ObjectIdGetDatum(viewoid);
 	args[1] = PointerGetDatum(ViewSelectRuleName);
 	nulls[0] = ' ';
@@ -1372,7 +1373,6 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand,
 		appendStringInfo(&buf, " DEFERRABLE");
 	if (conForm->condeferred)
 		appendStringInfo(&buf, " INITIALLY DEFERRED");
-
 	if (!conForm->convalidated)
 		appendStringInfoString(&buf, " NOT VALID");
 
@@ -3890,15 +3890,21 @@ get_variable(Var *var, int levelsup, bool showstar, deparse_context *context)
 
 
 /*
- * Get the name of a field of an expression of composite type.
- *
- * This is fairly straightforward except for the case of a Var of type RECORD.
- * Since no actual table or view column is allowed to have type RECORD, such
- * a Var must refer to a JOIN or FUNCTION RTE or to a subquery output.	We
- * drill down to find the ultimate defining expression and attempt to infer
- * the field name from it.	We ereport if we can't determine the name.
+ * Get the name of a field of an expression of composite type.  The
+ * expression is usually a Var, but we handle other cases too.
  *
  * levelsup is an extra offset to interpret the Var's varlevelsup correctly.
+ *
+ * This is fairly straightforward when the expression has a named composite
+ * type; we need only look up the type in the catalogs.  However, the type
+ * could also be RECORD.  Since no actual table or view column is allowed to
+ * have type RECORD, a Var of type RECORD must refer to a JOIN or FUNCTION RTE
+ * or to a subquery output.  We drill down to find the ultimate defining
+ * expression and attempt to infer the field name from it.  We ereport if we
+ * can't determine the name.
+ *
+ * Similarly, a PARAM of type RECORD has to refer to some expression of
+ * a determinable composite type.
  */
 static const char *
 get_name_for_var_field(Var *var, int fieldno,
@@ -3923,6 +3929,29 @@ get_name_for_var_field(Var *var, int fieldno,
 			return strVal(list_nth(r->colnames, fieldno - 1));
 	}
 
+	/*
+	 * If it's a Param of type RECORD, try to find what the Param refers to.
+	 */
+	if (IsA(var, Param))
+	{
+		Param	   *param = (Param *) var;
+		ListCell   *ancestor_cell;
+
+		expr = find_param_referent(param, context, &dpns, &ancestor_cell);
+		if (expr)
+		{
+			/* Found a match, so recurse to decipher the field name */
+			deparse_namespace save_dpns;
+			const char *result;
+
+			push_ancestor_plan(dpns, ancestor_cell, &save_dpns);
+			result = get_name_for_var_field((Var *) expr, fieldno,
+											0, context);
+			pop_ancestor_plan(dpns, &save_dpns);
+			return result;
+		}
+	}
+
 	/*
 	 * If it's a Var of type RECORD, we have to find what the Var refers to;
 	 * if not, we can use get_expr_result_type. If that fails, we try
@@ -4277,17 +4306,25 @@ find_rte_by_refname(const char *refname, deparse_context *context)
 }
 
 /*
- * Display a Param appropriately.
+ * Try to find the referenced expression for a PARAM_EXEC Param that might
+ * reference a parameter supplied by an upper NestLoop or SubPlan plan node.
+ *
+ * If successful, return the expression and set *dpns_p and *ancestor_cell_p
+ * appropriately for calling push_ancestor_plan().  If no referent can be
+ * found, return NULL.
  */
-static void
-get_parameter(Param *param, deparse_context *context)
+static Node *
+find_param_referent(Param *param, deparse_context *context,
+					deparse_namespace **dpns_p, ListCell **ancestor_cell_p)
 {
+	/* Initialize output parameters to prevent compiler warnings */
+	*dpns_p = NULL;
+	*ancestor_cell_p = NULL;
+
 	/*
-	 * If it's a PARAM_EXEC parameter, try to locate the expression from which
-	 * the parameter was computed.	This will necessarily be in some ancestor
-	 * of the current expression's PlanState.  Note that failing to find a
-	 * referent isn't an error, since the Param might well be a subplan output
-	 * rather than an input.
+	 * If it's a PARAM_EXEC parameter, look for a matching NestLoopParam or
+	 * SubPlan argument.  This will necessarily be in some ancestor of the
+	 * current expression's PlanState.
 	 */
 	if (param->paramkind == PARAM_EXEC)
 	{
@@ -4322,10 +4359,10 @@ get_parameter(Param *param, deparse_context *context)
 
 					if (nlp->paramno == param->paramid)
 					{
-						/* Found a match, so print it */
-						print_parameter_expr((Node *) nlp->paramval, lc,
-											 dpns, context);
-						return;
+						/* Found a match, so return it */
+						*dpns_p = dpns;
+						*ancestor_cell_p = lc;
+						return (Node *) nlp->paramval;
 					}
 				}
 			}
@@ -4351,9 +4388,10 @@ get_parameter(Param *param, deparse_context *context)
 
 					if (paramid == param->paramid)
 					{
-						/* Found a match, so print it */
-						print_parameter_expr(arg, lc, dpns, context);
-						return;
+						/* Found a match, so return it */
+						*dpns_p = dpns;
+						*ancestor_cell_p = lc;
+						return arg;
 					}
 				}
 
@@ -4388,50 +4426,71 @@ get_parameter(Param *param, deparse_context *context)
 		}
 	}
 
-	/*
-	 * Not PARAM_EXEC, or couldn't find referent: just print $N.
-	 */
-	appendStringInfo(context->buf, "$%d", param->paramid);
+	/* No referent found */
+	return NULL;
 }
 
-/* Print a parameter reference expression found by get_parameter */
+/*
+ * Display a Param appropriately.
+ */
 static void
-print_parameter_expr(Node *expr, ListCell *ancestor_cell,
-					 deparse_namespace *dpns, deparse_context *context)
+get_parameter(Param *param, deparse_context *context)
 {
-	deparse_namespace save_dpns;
-	bool		save_varprefix;
-	bool		need_paren;
-
-	/* Switch attention to the ancestor plan node */
-	push_ancestor_plan(dpns, ancestor_cell, &save_dpns);
+	Node	   *expr;
+	deparse_namespace *dpns;
+	ListCell   *ancestor_cell;
 
 	/*
-	 * Force prefixing of Vars, since they won't belong to the relation being
-	 * scanned in the original plan node.
+	 * If it's a PARAM_EXEC parameter, try to locate the expression from which
+	 * the parameter was computed.  Note that failing to find a referent isn't
+	 * an error, since the Param might well be a subplan output rather than an
+	 * input.
 	 */
-	save_varprefix = context->varprefix;
-	context->varprefix = true;
+	expr = find_param_referent(param, context, &dpns, &ancestor_cell);
+	if (expr)
+	{
+		/* Found a match, so print it */
+		deparse_namespace save_dpns;
+		bool		save_varprefix;
+		bool		need_paren;
 
-	/*
-	 * A Param's expansion is typically a Var, Aggref, or upper-level Param,
-	 * which wouldn't need extra parentheses.  Otherwise, insert parens to
-	 * ensure the expression looks atomic.
-	 */
-	need_paren = !(IsA(expr, Var) ||
-				   IsA(expr, Aggref) ||
-				   IsA(expr, Param));
-	if (need_paren)
-		appendStringInfoChar(context->buf, '(');
+		/* Switch attention to the ancestor plan node */
+		push_ancestor_plan(dpns, ancestor_cell, &save_dpns);
 
-	get_rule_expr(expr, context, false);
+		/*
+		 * Force prefixing of Vars, since they won't belong to the relation
+		 * being scanned in the original plan node.
+		 */
+		save_varprefix = context->varprefix;
+		context->varprefix = true;
 
-	if (need_paren)
-		appendStringInfoChar(context->buf, ')');
+		/*
+		 * A Param's expansion is typically a Var, Aggref, or upper-level
+		 * Param, which wouldn't need extra parentheses.  Otherwise, insert
+		 * parens to ensure the expression looks atomic.
+		 */
+		need_paren = !(IsA(expr, Var) ||
+					   IsA(expr, Aggref) ||
+					   IsA(expr, Param));
+		if (need_paren)
+			appendStringInfoChar(context->buf, '(');
+
+		get_rule_expr(expr, context, false);
+
+		if (need_paren)
+			appendStringInfoChar(context->buf, ')');
+
+		context->varprefix = save_varprefix;
 
-	context->varprefix = save_varprefix;
+		pop_ancestor_plan(dpns, &save_dpns);
 
-	pop_ancestor_plan(dpns, &save_dpns);
+		return;
+	}
+
+	/*
+	 * Not PARAM_EXEC, or couldn't find referent: just print $N.
+	 */
+	appendStringInfo(context->buf, "$%d", param->paramid);
 }
 
 /*
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 00ba19ec6c9d8..7a42ff03466a6 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -143,7 +143,8 @@ static double ineq_histogram_selectivity(PlannerInfo *root,
 static double eqjoinsel_inner(Oid operator,
 				VariableStatData *vardata1, VariableStatData *vardata2);
 static double eqjoinsel_semi(Oid operator,
-			   VariableStatData *vardata1, VariableStatData *vardata2);
+			   VariableStatData *vardata1, VariableStatData *vardata2,
+			   RelOptInfo *inner_rel);
 static bool convert_to_scalar(Datum value, Oid valuetypid, double *scaledvalue,
 				  Datum lobound, Datum hibound, Oid boundstypid,
 				  double *scaledlobound, double *scaledhibound);
@@ -172,6 +173,7 @@ static bool get_actual_variable_range(PlannerInfo *root,
 						  VariableStatData *vardata,
 						  Oid sortop,
 						  Datum *min, Datum *max);
+static RelOptInfo *find_join_input_rel(PlannerInfo *root, Relids relids);
 static Selectivity prefix_selectivity(PlannerInfo *root,
 				   VariableStatData *vardata,
 				   Oid vartype, Oid opfamily, Const *prefixcon);
@@ -2007,6 +2009,7 @@ eqjoinsel(PG_FUNCTION_ARGS)
 	VariableStatData vardata1;
 	VariableStatData vardata2;
 	bool		join_is_reversed;
+	RelOptInfo *inner_rel;
 
 	get_join_variables(root, args, sjinfo,
 					   &vardata1, &vardata2, &join_is_reversed);
@@ -2020,11 +2023,21 @@ eqjoinsel(PG_FUNCTION_ARGS)
 			break;
 		case JOIN_SEMI:
 		case JOIN_ANTI:
+			/*
+			 * Look up the join's inner relation.  min_righthand is sufficient
+			 * information because neither SEMI nor ANTI joins permit any
+			 * reassociation into or out of their RHS, so the righthand will
+			 * always be exactly that set of rels.
+			 */
+			inner_rel = find_join_input_rel(root, sjinfo->min_righthand);
+
 			if (!join_is_reversed)
-				selec = eqjoinsel_semi(operator, &vardata1, &vardata2);
+				selec = eqjoinsel_semi(operator, &vardata1, &vardata2,
+									   inner_rel);
 			else
 				selec = eqjoinsel_semi(get_commutator(operator),
-									   &vardata2, &vardata1);
+									   &vardata2, &vardata1,
+									   inner_rel);
 			break;
 		default:
 			/* other values not expected here */
@@ -2245,22 +2258,10 @@ eqjoinsel_inner(Oid operator,
 		 * XXX Can we be smarter if we have an MCV list for just one side? It
 		 * seems that if we assume equal distribution for the other side, we
 		 * end up with the same answer anyway.
-		 *
-		 * An additional hack we use here is to clamp the nd1 and nd2 values
-		 * to not more than what we are estimating the input relation sizes to
-		 * be, providing a crude correction for the selectivity of restriction
-		 * clauses on those relations.	(We don't do that in the other path
-		 * since there we are comparing the nd values to stats for the whole
-		 * relations.)
 		 */
 		double		nullfrac1 = stats1 ? stats1->stanullfrac : 0.0;
 		double		nullfrac2 = stats2 ? stats2->stanullfrac : 0.0;
 
-		if (vardata1->rel)
-			nd1 = Min(nd1, vardata1->rel->rows);
-		if (vardata2->rel)
-			nd2 = Min(nd2, vardata2->rel->rows);
-
 		selec = (1.0 - nullfrac1) * (1.0 - nullfrac2);
 		if (nd1 > nd2)
 			selec /= nd1;
@@ -2286,7 +2287,8 @@ eqjoinsel_inner(Oid operator,
  */
 static double
 eqjoinsel_semi(Oid operator,
-			   VariableStatData *vardata1, VariableStatData *vardata2)
+			   VariableStatData *vardata1, VariableStatData *vardata2,
+			   RelOptInfo *inner_rel)
 {
 	double		selec;
 	double		nd1;
@@ -2306,6 +2308,25 @@ eqjoinsel_semi(Oid operator,
 	nd1 = get_variable_numdistinct(vardata1);
 	nd2 = get_variable_numdistinct(vardata2);
 
+	/*
+	 * We clamp nd2 to be not more than what we estimate the inner relation's
+	 * size to be.  This is intuitively somewhat reasonable since obviously
+	 * there can't be more than that many distinct values coming from the
+	 * inner rel.  The reason for the asymmetry (ie, that we don't clamp nd1
+	 * likewise) is that this is the only pathway by which restriction clauses
+	 * applied to the inner rel will affect the join result size estimate,
+	 * since set_joinrel_size_estimates will multiply SEMI/ANTI selectivity by
+	 * only the outer rel's size.  If we clamped nd1 we'd be double-counting
+	 * the selectivity of outer-rel restrictions.
+	 *
+	 * We can apply this clamping both with respect to the base relation from
+	 * which the join variable comes (if there is just one), and to the
+	 * immediate inner input relation of the current join.
+	 */
+	if (vardata2->rel)
+		nd2 = Min(nd2, vardata2->rel->rows);
+	nd2 = Min(nd2, inner_rel->rows);
+
 	if (HeapTupleIsValid(vardata1->statsTuple))
 	{
 		stats1 = (Form_pg_statistic) GETSTRUCT(vardata1->statsTuple);
@@ -2349,11 +2370,21 @@ eqjoinsel_semi(Oid operator,
 					uncertainfrac,
 					uncertain;
 		int			i,
-					nmatches;
+					nmatches,
+					clamped_nvalues2;
+
+		/*
+		 * The clamping above could have resulted in nd2 being less than
+		 * nvalues2; in which case, we assume that precisely the nd2 most
+		 * common values in the relation will appear in the join input, and so
+		 * compare to only the first nd2 members of the MCV list.  Of course
+		 * this is frequently wrong, but it's the best bet we can make.
+		 */
+		clamped_nvalues2 = Min(nvalues2, nd2);
 
 		fmgr_info(get_opcode(operator), &eqproc);
 		hasmatch1 = (bool *) palloc0(nvalues1 * sizeof(bool));
-		hasmatch2 = (bool *) palloc0(nvalues2 * sizeof(bool));
+		hasmatch2 = (bool *) palloc0(clamped_nvalues2 * sizeof(bool));
 
 		/*
 		 * Note we assume that each MCV will match at most one member of the
@@ -2366,7 +2397,7 @@ eqjoinsel_semi(Oid operator,
 		{
 			int			j;
 
-			for (j = 0; j < nvalues2; j++)
+			for (j = 0; j < clamped_nvalues2; j++)
 			{
 				if (hasmatch2[j])
 					continue;
@@ -2411,7 +2442,7 @@ eqjoinsel_semi(Oid operator,
 		{
 			nd1 -= nmatches;
 			nd2 -= nmatches;
-			if (nd1 <= nd2 || nd2 <= 0)
+			if (nd1 <= nd2 || nd2 < 0)
 				uncertainfrac = 1.0;
 			else
 				uncertainfrac = nd2 / nd1;
@@ -2432,12 +2463,7 @@ eqjoinsel_semi(Oid operator,
 
 		if (nd1 != DEFAULT_NUM_DISTINCT && nd2 != DEFAULT_NUM_DISTINCT)
 		{
-			if (vardata1->rel)
-				nd1 = Min(nd1, vardata1->rel->rows);
-			if (vardata2->rel)
-				nd2 = Min(nd2, vardata2->rel->rows);
-
-			if (nd1 <= nd2 || nd2 <= 0)
+			if (nd1 <= nd2 || nd2 < 0)
 				selec = 1.0 - nullfrac1;
 			else
 				selec = (nd2 / nd1) * (1.0 - nullfrac1);
@@ -3089,7 +3115,9 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows)
 		 * PlaceHolderVar doesn't change the number of groups, which boils
 		 * down to ignoring the possible addition of nulls to the result set).
 		 */
-		varshere = pull_var_clause(groupexpr, PVC_RECURSE_PLACEHOLDERS);
+		varshere = pull_var_clause(groupexpr,
+								   PVC_RECURSE_AGGREGATES,
+								   PVC_RECURSE_PLACEHOLDERS);
 
 		/*
 		 * If we find any variable-free GROUP BY item, then either it is a
@@ -4093,7 +4121,9 @@ get_join_variables(PlannerInfo *root, List *args, SpecialJoinInfo *sjinfo,
  *		commonly the same as the exposed type of the variable argument,
  *		but can be different in binary-compatible-type cases.
  *	isunique: TRUE if we were able to match the var to a unique index,
- *		implying its values are unique for this query.
+ *		implying its values are unique for this query.  (Caution: this
+ *		should be trusted for statistical purposes only, since we do not
+ *		check indimmediate.)
  *
  * Caller is responsible for doing ReleaseVariableStats() before exiting.
  */
@@ -4756,6 +4786,37 @@ get_actual_variable_range(PlannerInfo *root, VariableStatData *vardata,
 	return have_data;
 }
 
+/*
+ * find_join_input_rel
+ *		Look up the input relation for a join.
+ *
+ * We assume that the input relation's RelOptInfo must have been constructed
+ * already.
+ */
+static RelOptInfo *
+find_join_input_rel(PlannerInfo *root, Relids relids)
+{
+	RelOptInfo *rel = NULL;
+
+	switch (bms_membership(relids))
+	{
+		case BMS_EMPTY_SET:
+			/* should not happen */
+			break;
+		case BMS_SINGLETON:
+			rel = find_base_rel(root, bms_singleton_member(relids));
+			break;
+		case BMS_MULTIPLE:
+			rel = find_join_rel(root, relids);
+			break;
+	}
+
+	if (rel == NULL)
+		elog(ERROR, "could not find RelOptInfo for given relids");
+
+	return rel;
+}
+
 
 /*-------------------------------------------------------------------------
  *
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 66674917f0dd6..55d7c8fe388eb 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -340,11 +340,14 @@ tsvector_concat(PG_FUNCTION_ARGS)
 				j,
 				i1,
 				i2,
-				dataoff;
+				dataoff,
+				output_bytes,
+				output_size;
 	char	   *data,
 			   *data1,
 			   *data2;
 
+	/* Get max position in in1; we'll need this to offset in2's positions */
 	ptr = ARRPTR(in1);
 	i = in1->size;
 	while (i--)
@@ -368,10 +371,23 @@ tsvector_concat(PG_FUNCTION_ARGS)
 	data2 = STRPTR(in2);
 	i1 = in1->size;
 	i2 = in2->size;
-	/* conservative estimate of space needed */
-	out = (TSVector) palloc0(VARSIZE(in1) + VARSIZE(in2));
-	SET_VARSIZE(out, VARSIZE(in1) + VARSIZE(in2));
+
+	/*
+	 * Conservative estimate of space needed.  We might need all the data
+	 * in both inputs, and conceivably add a pad byte before position data
+	 * for each item where there was none before.
+	 */
+	output_bytes = VARSIZE(in1) + VARSIZE(in2) + i1 + i2;
+
+	out = (TSVector) palloc0(output_bytes);
+	SET_VARSIZE(out, output_bytes);
+
+	/*
+	 * We must make out->size valid so that STRPTR(out) is sensible.  We'll
+	 * collapse out any unused space at the end.
+	 */
 	out->size = in1->size + in2->size;
+
 	ptr = ARRPTR(out);
 	data = STRPTR(out);
 	dataoff = 0;
@@ -513,10 +529,18 @@ tsvector_concat(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 				 errmsg("string is too long for tsvector (%d bytes, max %d bytes)", dataoff, MAXSTRPOS)));
 
-	out->size = ptr - ARRPTR(out);
-	SET_VARSIZE(out, CALCDATASIZE(out->size, dataoff));
+	/*
+	 * Adjust sizes (asserting that we didn't overrun the original estimates)
+	 * and collapse out any unused array entries.
+	 */
+	output_size = ptr - ARRPTR(out);
+	Assert(output_size <= out->size);
+	out->size = output_size;
 	if (data != STRPTR(out))
 		memmove(STRPTR(out), data, dataoff);
+	output_bytes = CALCDATASIZE(out->size, dataoff);
+	Assert(output_bytes <= VARSIZE(out));
+	SET_VARSIZE(out, output_bytes);
 
 	PG_FREE_IF_COPY(in1, 0);
 	PG_FREE_IF_COPY(in2, 1);
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 9acbc2d4e5148..124000fe7f400 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -3622,11 +3622,19 @@ string_agg_finalfn(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 }
 
+/*
+ * Implementation of both concat() and concat_ws().
+ *
+ * sepstr/seplen describe the separator.  argidx is the first argument
+ * to concatenate (counting from zero).
+ */
 static text *
-concat_internal(const char *sepstr, int seplen, int argidx, FunctionCallInfo fcinfo)
+concat_internal(const char *sepstr, int seplen, int argidx,
+				FunctionCallInfo fcinfo)
 {
-	StringInfoData str;
 	text	   *result;
+	StringInfoData str;
+	bool		first_arg = true;
 	int			i;
 
 	initStringInfo(&str);
@@ -3635,17 +3643,21 @@ concat_internal(const char *sepstr, int seplen, int argidx, FunctionCallInfo fci
 	{
 		if (!PG_ARGISNULL(i))
 		{
+			Datum		value = PG_GETARG_DATUM(i);
 			Oid			valtype;
-			Datum		value;
 			Oid			typOutput;
 			bool		typIsVarlena;
 
-			if (i > argidx)
+			/* add separator if appropriate */
+			if (first_arg)
+				first_arg = false;
+			else
 				appendBinaryStringInfo(&str, sepstr, seplen);
 
-			/* append n-th value */
-			value = PG_GETARG_DATUM(i);
+			/* call the appropriate type output function, append the result */
 			valtype = get_fn_expr_argtype(fcinfo->flinfo, i);
+			if (!OidIsValid(valtype))
+				elog(ERROR, "could not determine data type of concat() input");
 			getTypeOutputInfo(valtype, &typOutput, &typIsVarlena);
 			appendStringInfoString(&str,
 								   OidOutputFunctionCall(typOutput, value));
@@ -3664,12 +3676,12 @@ concat_internal(const char *sepstr, int seplen, int argidx, FunctionCallInfo fci
 Datum
 text_concat(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_TEXT_P(concat_internal(NULL, 0, 0, fcinfo));
+	PG_RETURN_TEXT_P(concat_internal("", 0, 0, fcinfo));
 }
 
 /*
- * Concatenate all but first argument values with separators. The first
- * parameter is used as a separator. NULL arguments are ignored.
+ * Concatenate all but first argument value with separators. The first
+ * parameter is used as the separator. NULL arguments are ignored.
  */
 Datum
 text_concat_ws(PG_FUNCTION_ARGS)
@@ -3682,8 +3694,8 @@ text_concat_ws(PG_FUNCTION_ARGS)
 
 	sep = PG_GETARG_TEXT_PP(0);
 
-	PG_RETURN_TEXT_P(concat_internal(
-					   VARDATA_ANY(sep), VARSIZE_ANY_EXHDR(sep), 1, fcinfo));
+	PG_RETURN_TEXT_P(concat_internal(VARDATA_ANY(sep), VARSIZE_ANY_EXHDR(sep),
+									 1, fcinfo));
 }
 
 /*
@@ -3887,7 +3899,7 @@ text_format(PG_FUNCTION_ARGS)
 		if (arg > PG_NARGS() - 1)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("too few arguments for format conversion")));
+					 errmsg("too few arguments for format")));
 
 		/*
 		 * At this point, we should see the main conversion specifier. Whether
@@ -3908,7 +3920,7 @@ text_format(PG_FUNCTION_ARGS)
 			default:
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("unrecognized conversion specifier: %c",
+						 errmsg("unrecognized conversion specifier \"%c\"",
 								*cp)));
 		}
 	}
@@ -3937,7 +3949,7 @@ text_format_string_conversion(StringInfo buf, char conversion,
 		else if (conversion == 'I')
 			ereport(ERROR,
 					(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-					 errmsg("NULL cannot be escaped as an SQL identifier")));
+					 errmsg("null values cannot be formatted as an SQL identifier")));
 		return;
 	}
 
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 702b9e3e9f489..99fdec34483e5 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -1363,14 +1363,14 @@ xml_ereport(int level, int sqlcode, const char *msg)
 
 		ereport(level,
 				(errcode(sqlcode),
-				 errmsg("%s", msg),
-				 errdetail("%s", detail)));
+				 errmsg_internal("%s", msg),
+				 errdetail_internal("%s", detail)));
 	}
 	else
 	{
 		ereport(level,
 				(errcode(sqlcode),
-				 errmsg("%s", msg)));
+				 errmsg_internal("%s", msg)));
 	}
 }
 
@@ -1441,7 +1441,7 @@ xml_ereport_by_code(int level, int sqlcode,
 
 	ereport(level,
 			(errcode(sqlcode),
-			 errmsg("%s", msg),
+			 errmsg_internal("%s", msg),
 			 errdetail(det, code)));
 }
 
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 350e040474b41..00f17d9edc6a6 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -19,6 +19,7 @@
 #include "access/heapam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
+#include "access/tuptoaster.h"
 #include "access/valid.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
@@ -423,18 +424,19 @@ CatCacheRemoveCList(CatCache *cache, CatCList *cl)
 /*
  *	CatalogCacheIdInvalidate
  *
- *	Invalidate entries in the specified cache, given a hash value and
- *	item pointer.  Positive entries are deleted if they match the item
- *	pointer.  Negative entries must be deleted if they match the hash
- *	value (since we do not have the exact key of the tuple that's being
- *	inserted).	But this should only rarely result in loss of a cache
- *	entry that could have been kept.
+ *	Invalidate entries in the specified cache, given a hash value.
  *
- *	Note that it's not very relevant whether the tuple identified by
- *	the item pointer is being inserted or deleted.	We don't expect to
- *	find matching positive entries in the one case, and we don't expect
- *	to find matching negative entries in the other; but we will do the
- *	right things in any case.
+ *	We delete cache entries that match the hash value, whether positive
+ *	or negative.  We don't care whether the invalidation is the result
+ *	of a tuple insertion or a deletion.
+ *
+ *	We used to try to match positive cache entries by TID, but that is
+ *	unsafe after a VACUUM FULL on a system catalog: an inval event could
+ *	be queued before VACUUM FULL, and then processed afterwards, when the
+ *	target tuple that has to be invalidated has a different TID than it
+ *	did when the event was created.  So now we just compare hash values and
+ *	accept the small risk of unnecessary invalidations due to false matches.
+ *	(The ItemPointer argument is therefore useless and should get removed.)
  *
  *	This routine is only quasi-public: it should only be used by inval.c.
  */
@@ -496,11 +498,7 @@ CatalogCacheIdInvalidate(int cacheId,
 
 			nextelt = DLGetSucc(elt);
 
-			if (hashValue != ct->hash_value)
-				continue;		/* ignore non-matching hash values */
-
-			if (ct->negative ||
-				ItemPointerEquals(pointer, &ct->tuple.t_self))
+			if (hashValue == ct->hash_value)
 			{
 				if (ct->refcount > 0 ||
 					(ct->c_list && ct->c_list->refcount > 0))
@@ -695,12 +693,8 @@ CatalogCacheFlushCatalog(Oid catId)
 
 	for (cache = CacheHdr->ch_caches; cache; cache = cache->cc_next)
 	{
-		/* We can ignore uninitialized caches, since they must be empty */
-		if (cache->cc_tupdesc == NULL)
-			continue;
-
 		/* Does this cache store tuples of the target catalog? */
-		if (cache->cc_tupdesc->attrs[0]->attrelid == catId)
+		if (cache->cc_reloid == catId)
 		{
 			/* Yes, so flush all its contents */
 			ResetCatalogCache(cache);
@@ -1605,16 +1599,32 @@ CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp,
 						uint32 hashValue, Index hashIndex, bool negative)
 {
 	CatCTup    *ct;
+	HeapTuple	dtp;
 	MemoryContext oldcxt;
 
+	/*
+	 * If there are any out-of-line toasted fields in the tuple, expand them
+	 * in-line.  This saves cycles during later use of the catcache entry,
+	 * and also protects us against the possibility of the toast tuples being
+	 * freed before we attempt to fetch them, in case of something using a
+	 * slightly stale catcache entry.
+	 */
+	if (HeapTupleHasExternal(ntp))
+		dtp = toast_flatten_tuple(ntp, cache->cc_tupdesc);
+	else
+		dtp = ntp;
+
 	/*
 	 * Allocate CatCTup header in cache memory, and copy the tuple there too.
 	 */
 	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
 	ct = (CatCTup *) palloc(sizeof(CatCTup));
-	heap_copytuple_with_tuple(ntp, &ct->tuple);
+	heap_copytuple_with_tuple(dtp, &ct->tuple);
 	MemoryContextSwitchTo(oldcxt);
 
+	if (dtp != ntp)
+		heap_freetuple(dtp);
+
 	/*
 	 * Finish initializing the CatCTup header, and add it to the cache's
 	 * linked list and counts.
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index ebc83440deac2..4249bd337654b 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -529,7 +529,7 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
 			RelationMapInvalidate(false);
 	}
 	else
-		elog(FATAL, "unrecognized SI message id: %d", msg->id);
+		elog(FATAL, "unrecognized SI message ID: %d", msg->id);
 }
 
 /*
@@ -854,24 +854,12 @@ xactGetCommittedInvalidationMessages(SharedInvalidationMessage **msgs,
 	return numSharedInvalidMessagesArray;
 }
 
-#define RecoveryRelationCacheInitFileInvalidate(dbo, tbo, tf) \
-{ \
-	DatabasePath = GetDatabasePath(dbo, tbo); \
-	elog(trace_recovery(DEBUG4), "removing relcache init file in %s", DatabasePath); \
-	RelationCacheInitFileInvalidate(tf); \
-	pfree(DatabasePath); \
-}
-
 /*
  * ProcessCommittedInvalidationMessages is executed by xact_redo_commit()
  * to process invalidation messages added to commit records.
  *
  * Relcache init file invalidation requires processing both
  * before and after we send the SI messages. See AtEOXact_Inval()
- *
- * We deliberately avoid SetDatabasePath() since it is intended to be used
- * only once by normal backends, so we set DatabasePath directly then
- * pfree after use. See RecoveryRelationCacheInitFileInvalidate() macro.
  */
 void
 ProcessCommittedInvalidationMessages(SharedInvalidationMessage *msgs,
@@ -885,12 +873,25 @@ ProcessCommittedInvalidationMessages(SharedInvalidationMessage *msgs,
 		 (RelcacheInitFileInval ? " and relcache file invalidation" : ""));
 
 	if (RelcacheInitFileInval)
-		RecoveryRelationCacheInitFileInvalidate(dbid, tsid, true);
+	{
+		/*
+		 * RelationCacheInitFilePreInvalidate requires DatabasePath to be set,
+		 * but we should not use SetDatabasePath during recovery, since it is
+		 * intended to be used only once by normal backends.  Hence, a quick
+		 * hack: set DatabasePath directly then unset after use.
+		 */
+		DatabasePath = GetDatabasePath(dbid, tsid);
+		elog(trace_recovery(DEBUG4), "removing relcache init file in \"%s\"",
+			 DatabasePath);
+		RelationCacheInitFilePreInvalidate();
+		pfree(DatabasePath);
+		DatabasePath = NULL;
+	}
 
 	SendSharedInvalidMessages(msgs, nmsgs);
 
 	if (RelcacheInitFileInval)
-		RecoveryRelationCacheInitFileInvalidate(dbid, tsid, false);
+		RelationCacheInitFilePostInvalidate();
 }
 
 /*
@@ -931,7 +932,7 @@ AtEOXact_Inval(bool isCommit)
 		 * unless we committed.
 		 */
 		if (transInvalInfo->RelcacheInitFileInval)
-			RelationCacheInitFileInvalidate(true);
+			RelationCacheInitFilePreInvalidate();
 
 		AppendInvalidationMessages(&transInvalInfo->PriorCmdInvalidMsgs,
 								   &transInvalInfo->CurrentCmdInvalidMsgs);
@@ -940,7 +941,7 @@ AtEOXact_Inval(bool isCommit)
 										 SendSharedInvalidMessages);
 
 		if (transInvalInfo->RelcacheInitFileInval)
-			RelationCacheInitFileInvalidate(false);
+			RelationCacheInitFilePostInvalidate();
 	}
 	else if (transInvalInfo != NULL)
 	{
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 28d18b0d32d95..6435541bb6351 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -622,52 +622,30 @@ get_op_hash_functions(Oid opno,
 /*
  * get_op_btree_interpretation
  *		Given an operator's OID, find out which btree opfamilies it belongs to,
- *		and what strategy number it has within each one.  The results are
- *		returned as an OID list and a parallel integer list.
+ *		and what properties it has within each one.  The results are returned
+ *		as a palloc'd list of OpBtreeInterpretation structs.
  *
  * In addition to the normal btree operators, we consider a <> operator to be
  * a "member" of an opfamily if its negator is an equality operator of the
  * opfamily.  ROWCOMPARE_NE is returned as the strategy number for this case.
  */
-void
-get_op_btree_interpretation(Oid opno, List **opfamilies, List **opstrats)
+List *
+get_op_btree_interpretation(Oid opno)
 {
+	List	   *result = NIL;
+	OpBtreeInterpretation *thisresult;
 	CatCList   *catlist;
-	bool		op_negated;
 	int			i;
 
-	*opfamilies = NIL;
-	*opstrats = NIL;
-
 	/*
 	 * Find all the pg_amop entries containing the operator.
 	 */
 	catlist = SearchSysCacheList1(AMOPOPID, ObjectIdGetDatum(opno));
 
-	/*
-	 * If we can't find any opfamily containing the op, perhaps it is a <>
-	 * operator.  See if it has a negator that is in an opfamily.
-	 */
-	op_negated = false;
-	if (catlist->n_members == 0)
-	{
-		Oid			op_negator = get_negator(opno);
-
-		if (OidIsValid(op_negator))
-		{
-			op_negated = true;
-			ReleaseSysCacheList(catlist);
-			catlist = SearchSysCacheList1(AMOPOPID,
-										  ObjectIdGetDatum(op_negator));
-		}
-	}
-
-	/* Now search the opfamilies */
 	for (i = 0; i < catlist->n_members; i++)
 	{
 		HeapTuple	op_tuple = &catlist->members[i]->tuple;
 		Form_pg_amop op_form = (Form_pg_amop) GETSTRUCT(op_tuple);
-		Oid			opfamily_id;
 		StrategyNumber op_strategy;
 
 		/* must be btree */
@@ -675,23 +653,66 @@ get_op_btree_interpretation(Oid opno, List **opfamilies, List **opstrats)
 			continue;
 
 		/* Get the operator's btree strategy number */
-		opfamily_id = op_form->amopfamily;
 		op_strategy = (StrategyNumber) op_form->amopstrategy;
 		Assert(op_strategy >= 1 && op_strategy <= 5);
 
-		if (op_negated)
+		thisresult = (OpBtreeInterpretation *)
+			palloc(sizeof(OpBtreeInterpretation));
+		thisresult->opfamily_id = op_form->amopfamily;
+		thisresult->strategy = op_strategy;
+		thisresult->oplefttype = op_form->amoplefttype;
+		thisresult->oprighttype = op_form->amoprighttype;
+		result = lappend(result, thisresult);
+	}
+
+	ReleaseSysCacheList(catlist);
+
+	/*
+	 * If we didn't find any btree opfamily containing the operator, perhaps
+	 * it is a <> operator.  See if it has a negator that is in an opfamily.
+	 */
+	if (result == NIL)
+	{
+		Oid			op_negator = get_negator(opno);
+
+		if (OidIsValid(op_negator))
 		{
-			/* Only consider negators that are = */
-			if (op_strategy != BTEqualStrategyNumber)
-				continue;
-			op_strategy = ROWCOMPARE_NE;
-		}
+			catlist = SearchSysCacheList1(AMOPOPID,
+										  ObjectIdGetDatum(op_negator));
 
-		*opfamilies = lappend_oid(*opfamilies, opfamily_id);
-		*opstrats = lappend_int(*opstrats, op_strategy);
+			for (i = 0; i < catlist->n_members; i++)
+			{
+				HeapTuple	op_tuple = &catlist->members[i]->tuple;
+				Form_pg_amop op_form = (Form_pg_amop) GETSTRUCT(op_tuple);
+				StrategyNumber op_strategy;
+
+				/* must be btree */
+				if (op_form->amopmethod != BTREE_AM_OID)
+					continue;
+
+				/* Get the operator's btree strategy number */
+				op_strategy = (StrategyNumber) op_form->amopstrategy;
+				Assert(op_strategy >= 1 && op_strategy <= 5);
+
+				/* Only consider negators that are = */
+				if (op_strategy != BTEqualStrategyNumber)
+					continue;
+
+				/* OK, report it with "strategy" ROWCOMPARE_NE */
+				thisresult = (OpBtreeInterpretation *)
+					palloc(sizeof(OpBtreeInterpretation));
+				thisresult->opfamily_id = op_form->amopfamily;
+				thisresult->strategy = ROWCOMPARE_NE;
+				thisresult->oplefttype = op_form->amoplefttype;
+				thisresult->oprighttype = op_form->amoprighttype;
+				result = lappend(result, thisresult);
+			}
+
+			ReleaseSysCacheList(catlist);
+		}
 	}
 
-	ReleaseSysCacheList(catlist);
+	return result;
 }
 
 /*
@@ -1867,10 +1888,9 @@ getTypeIOParam(HeapTuple typeTuple)
 
 	/*
 	 * Array types get their typelem as parameter; everybody else gets their
-	 * own type OID as parameter.  (As of 8.2, domains must get their own OID
-	 * even if their base type is an array.)
+	 * own type OID as parameter.
 	 */
-	if (typeStruct->typtype == TYPTYPE_BASE && OidIsValid(typeStruct->typelem))
+	if (OidIsValid(typeStruct->typelem))
 		return typeStruct->typelem;
 	else
 		return HeapTupleGetOid(typeTuple);
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index d7e94ffc125de..6026599a9bc5e 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -1415,8 +1415,8 @@ formrdesc(const char *relationName, Oid relationReltype,
 	/* formrdesc is used only for permanent relations */
 	relation->rd_rel->relpersistence = RELPERSISTENCE_PERMANENT;
 
-	relation->rd_rel->relpages = 1;
-	relation->rd_rel->reltuples = 1;
+	relation->rd_rel->relpages = 0;
+	relation->rd_rel->reltuples = 0;
 	relation->rd_rel->relkind = RELKIND_RELATION;
 	relation->rd_rel->relhasoids = hasoids;
 	relation->rd_rel->relnatts = (int16) natts;
@@ -1897,7 +1897,7 @@ RelationClearRelation(Relation relation, bool rebuild)
 		 * on next access.	Meanwhile it's not any less valid than it was
 		 * before, so any code that might expect to continue accessing it
 		 * isn't hurt by the rebuild failure.  (Consider for example a
-		 * subtransaction that ALTERs a table and then gets cancelled partway
+		 * subtransaction that ALTERs a table and then gets canceled partway
 		 * through the cache entry rebuild.  The outer transaction should
 		 * still see the not-modified cache entry as valid.)  The worst
 		 * consequence of an error is leaking the necessarily-unreferenced new
@@ -2104,11 +2104,11 @@ RelationCacheInvalidateEntry(Oid relationId)
  *	 so hash_seq_search will complete safely; (b) during the second pass we
  *	 only hold onto pointers to nondeletable entries.
  *
- *	 The two-phase approach also makes it easy to ensure that we process
- *	 nailed-in-cache indexes before other nondeletable items, and that we
- *	 process pg_class_oid_index first of all.  In scenarios where a nailed
- *	 index has been given a new relfilenode, we have to detect that update
- *	 before the nailed index is used in reloading any other relcache entry.
+ *	 The two-phase approach also makes it easy to update relfilenodes for
+ *	 mapped relations before we do anything else, and to ensure that the
+ *	 second pass processes nailed-in-cache items before other nondeletable
+ *	 items.  This should ensure that system catalogs are up to date before
+ *	 we attempt to use them to reload information about other open relations.
  */
 void
 RelationCacheInvalidate(void)
@@ -2120,6 +2120,11 @@ RelationCacheInvalidate(void)
 	List	   *rebuildList = NIL;
 	ListCell   *l;
 
+	/*
+	 * Reload relation mapping data before starting to reconstruct cache.
+	 */
+	RelationMapInvalidateAll();
+
 	/* Phase 1 */
 	hash_seq_init(&status, RelationIdCache);
 
@@ -2130,7 +2135,7 @@ RelationCacheInvalidate(void)
 		/* Must close all smgr references to avoid leaving dangling ptrs */
 		RelationCloseSmgr(relation);
 
-		/* Ignore new relations, since they are never SI targets */
+		/* Ignore new relations, since they are never cross-backend targets */
 		if (relation->rd_createSubid != InvalidSubTransactionId)
 			continue;
 
@@ -2144,22 +2149,33 @@ RelationCacheInvalidate(void)
 		}
 		else
 		{
+			/*
+			 * If it's a mapped relation, immediately update its rd_node in
+			 * case its relfilenode changed.  We must do this during phase 1
+			 * in case the relation is consulted during rebuild of other
+			 * relcache entries in phase 2.  It's safe since consulting the
+			 * map doesn't involve any access to relcache entries.
+			 */
+			if (RelationIsMapped(relation))
+				RelationInitPhysicalAddr(relation);
+
 			/*
 			 * Add this entry to list of stuff to rebuild in second pass.
-			 * pg_class_oid_index goes on the front of rebuildFirstList, other
-			 * nailed indexes on the back, and everything else into
-			 * rebuildList (in no particular order).
+			 * pg_class goes to the front of rebuildFirstList while
+			 * pg_class_oid_index goes to the back of rebuildFirstList, so
+			 * they are done first and second respectively.  Other nailed
+			 * relations go to the front of rebuildList, so they'll be done
+			 * next in no particular order; and everything else goes to the
+			 * back of rebuildList.
 			 */
-			if (relation->rd_isnailed &&
-				relation->rd_rel->relkind == RELKIND_INDEX)
-			{
-				if (RelationGetRelid(relation) == ClassOidIndexId)
-					rebuildFirstList = lcons(relation, rebuildFirstList);
-				else
-					rebuildFirstList = lappend(rebuildFirstList, relation);
-			}
-			else
+			if (RelationGetRelid(relation) == RelationRelationId)
+				rebuildFirstList = lcons(relation, rebuildFirstList);
+			else if (RelationGetRelid(relation) == ClassOidIndexId)
+				rebuildFirstList = lappend(rebuildFirstList, relation);
+			else if (relation->rd_isnailed)
 				rebuildList = lcons(relation, rebuildList);
+			else
+				rebuildList = lappend(rebuildList, relation);
 		}
 	}
 
@@ -2170,11 +2186,6 @@ RelationCacheInvalidate(void)
 	 */
 	smgrcloseall();
 
-	/*
-	 * Reload relation mapping data before starting to reconstruct cache.
-	 */
-	RelationMapInvalidateAll();
-
 	/* Phase 2: rebuild the items found to need rebuild in phase 1 */
 	foreach(l, rebuildFirstList)
 	{
@@ -4377,8 +4388,8 @@ write_relcache_init_file(bool shared)
 	 * updated by SI message processing, but we can't be sure whether what we
 	 * wrote out was up-to-date.)
 	 *
-	 * This mustn't run concurrently with RelationCacheInitFileInvalidate, so
-	 * grab a serialization lock for the duration.
+	 * This mustn't run concurrently with the code that unlinks an init file
+	 * and sends SI messages, so grab a serialization lock for the duration.
 	 */
 	LWLockAcquire(RelCacheInitLock, LW_EXCLUSIVE);
 
@@ -4442,19 +4453,22 @@ RelationIdIsInInitFile(Oid relationId)
  * changed one or more of the relation cache entries that are kept in the
  * local init file.
  *
- * We actually need to remove the init file twice: once just before sending
- * the SI messages that include relcache inval for such relations, and once
- * just after sending them.  The unlink before ensures that a backend that's
- * currently starting cannot read the now-obsolete init file and then miss
- * the SI messages that will force it to update its relcache entries.  (This
- * works because the backend startup sequence gets into the PGPROC array before
- * trying to load the init file.)  The unlink after is to synchronize with a
- * backend that may currently be trying to write an init file based on data
- * that we've just rendered invalid.  Such a backend will see the SI messages,
- * but we can't leave the init file sitting around to fool later backends.
+ * To be safe against concurrent inspection or rewriting of the init file,
+ * we must take RelCacheInitLock, then remove the old init file, then send
+ * the SI messages that include relcache inval for such relations, and then
+ * release RelCacheInitLock.  This serializes the whole affair against
+ * write_relcache_init_file, so that we can be sure that any other process
+ * that's concurrently trying to create a new init file won't move an
+ * already-stale version into place after we unlink.  Also, because we unlink
+ * before sending the SI messages, a backend that's currently starting cannot
+ * read the now-obsolete init file and then miss the SI messages that will
+ * force it to update its relcache entries.  (This works because the backend
+ * startup sequence gets into the sinval array before trying to load the init
+ * file.)
  *
- * Ignore any failure to unlink the file, since it might not be there if
- * no backend has been started since the last removal.
+ * We take the lock and do the unlink in RelationCacheInitFilePreInvalidate,
+ * then release the lock in RelationCacheInitFilePostInvalidate.  Caller must
+ * send any pending SI messages between those calls.
  *
  * Notice this deals only with the local init file, not the shared init file.
  * The reason is that there can never be a "significant" change to the
@@ -4464,34 +4478,37 @@ RelationIdIsInInitFile(Oid relationId)
  * be invalid enough to make it necessary to remove it.
  */
 void
-RelationCacheInitFileInvalidate(bool beforeSend)
+RelationCacheInitFilePreInvalidate(void)
 {
 	char		initfilename[MAXPGPATH];
 
 	snprintf(initfilename, sizeof(initfilename), "%s/%s",
 			 DatabasePath, RELCACHE_INIT_FILENAME);
 
-	if (beforeSend)
-	{
-		/* no interlock needed here */
-		unlink(initfilename);
-	}
-	else
+	LWLockAcquire(RelCacheInitLock, LW_EXCLUSIVE);
+
+	if (unlink(initfilename) < 0)
 	{
 		/*
-		 * We need to interlock this against write_relcache_init_file, to
-		 * guard against possibility that someone renames a new-but-
-		 * already-obsolete init file into place just after we unlink. With
-		 * the interlock, it's certain that write_relcache_init_file will
-		 * notice our SI inval message before renaming into place, or else
-		 * that we will execute second and successfully unlink the file.
+		 * The file might not be there if no backend has been started since
+		 * the last removal.  But complain about failures other than ENOENT.
+		 * Fortunately, it's not too late to abort the transaction if we
+		 * can't get rid of the would-be-obsolete init file.
 		 */
-		LWLockAcquire(RelCacheInitLock, LW_EXCLUSIVE);
-		unlink(initfilename);
-		LWLockRelease(RelCacheInitLock);
+		if (errno != ENOENT)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not remove cache file \"%s\": %m",
+							initfilename)));
 	}
 }
 
+void
+RelationCacheInitFilePostInvalidate(void)
+{
+	LWLockRelease(RelCacheInitLock);
+}
+
 /*
  * Remove the init files during postmaster startup.
  *
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 75f510c164343..99e5f1d9fe616 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -14,7 +14,7 @@
  *	  These routines allow the parser/planner/executor to perform
  *	  rapid lookups on the contents of the system catalogs.
  *
- *	  see utils/syscache.h for a list of the cache id's
+ *	  see utils/syscache.h for a list of the cache IDs
  *
  *-------------------------------------------------------------------------
  */
@@ -842,7 +842,7 @@ SearchSysCache(int cacheId,
 {
 	if (cacheId < 0 || cacheId >= SysCacheSize ||
 		!PointerIsValid(SysCache[cacheId]))
-		elog(ERROR, "invalid cache id: %d", cacheId);
+		elog(ERROR, "invalid cache ID: %d", cacheId);
 
 	return SearchCatCache(SysCache[cacheId], key1, key2, key3, key4);
 }
@@ -1026,7 +1026,7 @@ SysCacheGetAttr(int cacheId, HeapTuple tup,
 	 */
 	if (cacheId < 0 || cacheId >= SysCacheSize ||
 		!PointerIsValid(SysCache[cacheId]))
-		elog(ERROR, "invalid cache id: %d", cacheId);
+		elog(ERROR, "invalid cache ID: %d", cacheId);
 	if (!PointerIsValid(SysCache[cacheId]->cc_tupdesc))
 	{
 		InitCatCachePhase2(SysCache[cacheId], false);
@@ -1047,7 +1047,7 @@ SearchSysCacheList(int cacheId, int nkeys,
 {
 	if (cacheId < 0 || cacheId >= SysCacheSize ||
 		!PointerIsValid(SysCache[cacheId]))
-		elog(ERROR, "invalid cache id: %d", cacheId);
+		elog(ERROR, "invalid cache ID: %d", cacheId);
 
 	return SearchCatCacheList(SysCache[cacheId], nkeys,
 							  key1, key2, key3, key4);
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 337b875fe20ca..fee69dfc17225 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -105,11 +105,12 @@ int			Log_destination = LOG_DESTINATION_STDERR;
 /*
  * Max string length to send to syslog().  Note that this doesn't count the
  * sequence-number prefix we add, and of course it doesn't count the prefix
- * added by syslog itself.	On many implementations it seems that the hard
- * limit is approximately 2K bytes including both those prefixes.
+ * added by syslog itself.  Solaris and sysklogd truncate the final message
+ * at 1024 bytes, so this value leaves 124 bytes for those prefixes.  (Most
+ * other syslog implementations seem to have limits of 2KB or so.)
  */
 #ifndef PG_SYSLOG_LIMIT
-#define PG_SYSLOG_LIMIT 1024
+#define PG_SYSLOG_LIMIT 900
 #endif
 
 static bool openlog_done = false;
@@ -341,6 +342,15 @@ errstart(int elevel, const char *filename, int lineno,
 	edata->elevel = elevel;
 	edata->output_to_server = output_to_server;
 	edata->output_to_client = output_to_client;
+	if (filename)
+	{
+		const char *slash;
+
+		/* keep only base name, useful especially for vpath builds */
+		slash = strrchr(filename, '/');
+		if (slash)
+			filename = slash + 1;
+	}
 	edata->filename = filename;
 	edata->lineno = lineno;
 	edata->funcname = funcname;
@@ -842,6 +852,33 @@ errdetail(const char *fmt,...)
 }
 
 
+/*
+ * errdetail_internal --- add a detail error message text to the current error
+ *
+ * This is exactly like errdetail() except that strings passed to
+ * errdetail_internal are not translated, and are customarily left out of the
+ * internationalization message dictionary.  This should be used for detail
+ * messages that seem not worth translating for one reason or another
+ * (typically, that they don't seem to be useful to average users).
+ */
+int
+errdetail_internal(const char *fmt,...)
+{
+	ErrorData  *edata = &errordata[errordata_stack_depth];
+	MemoryContext oldcontext;
+
+	recursion_depth++;
+	CHECK_STACK_DEPTH();
+	oldcontext = MemoryContextSwitchTo(ErrorContext);
+
+	EVALUATE_MESSAGE(detail, false, false);
+
+	MemoryContextSwitchTo(oldcontext);
+	recursion_depth--;
+	return 0;					/* return value does not matter */
+}
+
+
 /*
  * errdetail_log --- add a detail_log error message text to the current error
  */
@@ -1113,6 +1150,15 @@ elog_start(const char *filename, int lineno, const char *funcname)
 	}
 
 	edata = &errordata[errordata_stack_depth];
+	if (filename)
+	{
+		const char *slash;
+
+		/* keep only base name, useful especially for vpath builds */
+		slash = strrchr(filename, '/');
+		if (slash)
+			filename = slash + 1;
+	}
 	edata->filename = filename;
 	edata->lineno = lineno;
 	edata->funcname = funcname;
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 97a3bd51e5d8d..734bd0568918d 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -378,7 +378,7 @@ incompatible_module_error(const char *libname,
 	ereport(ERROR,
 			(errmsg("incompatible library \"%s\": magic block mismatch",
 					libname),
-			 errdetail("%s", details.data)));
+			 errdetail_internal("%s", details.data)));
 }
 
 /*
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 8347f52ca8d5f..94f92dd7343af 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -489,7 +489,7 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
 	SharedInvalBackendInit(false);
 
 	if (MyBackendId > MaxBackends || MyBackendId <= 0)
-		elog(FATAL, "bad backend id: %d", MyBackendId);
+		elog(FATAL, "bad backend ID: %d", MyBackendId);
 
 	/* Now that we have a BackendId, we can participate in ProcSignal */
 	ProcSignalInit(MyBackendId);
@@ -571,6 +571,8 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
 	 */
 	if (!bootstrap)
 	{
+		/* statement_timestamp must be set for timeouts to work correctly */
+		SetCurrentStatementStartTimestamp();
 		StartTransactionCommand();
 		(void) GetTransactionSnapshot();
 	}
diff --git a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
index 3499f774b34de..868bdbcf69cfa 100644
--- a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
+++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
@@ -218,8 +218,7 @@ get_ten(int b, int *ku)
 static void
 shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len)
 {
-	int			c1,
-				c2;
+	int			c1;
 	int			ku,
 				ten,
 				kubun;
@@ -229,7 +228,6 @@ shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len
 	while (len > 0)
 	{
 		c1 = *sjis;
-		c2 = sjis[1];
 
 		if (!IS_HIGHBIT_SET(c1))
 		{
@@ -245,7 +243,7 @@ shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len
 
 		l = pg_encoding_verifymb(PG_SHIFT_JIS_2004, (const char *) sjis, len);
 
-		if (l < 0)
+		if (l < 0 || l > len)
 			report_invalid_encoding(PG_SHIFT_JIS_2004,
 									(const char *) sjis, len);
 
@@ -257,6 +255,8 @@ shift_jis_20042euc_jis_2004(const unsigned char *sjis, unsigned char *p, int len
 		}
 		else if (l == 2)
 		{
+			int			c2 = sjis[1];
+
 			plane = 1;
 			ku = 1;
 			ten = 1;
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 78907b939dee1..3e9b10328d480 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -306,9 +306,9 @@ ProcessConfigFile(GucContext context)
 		/* In SIGHUP cases in the postmaster, report changes */
 		if (context == PGC_SIGHUP && !IsUnderPostmaster)
 		{
-			const char *preval = GetConfigOption(item->name, false);
+			const char *preval = GetConfigOption(item->name, true, false);
 
-			/* string variables could be NULL; treat that as empty */
+			/* If option doesn't exist yet or is NULL, treat as empty string */
 			if (!preval)
 				preval = "";
 			/* must dup, else might have dangling pointer below */
@@ -323,7 +323,7 @@ ProcessConfigFile(GucContext context)
 
 			if (pre_value)
 			{
-				const char *post_value = GetConfigOption(item->name, false);
+				const char *post_value = GetConfigOption(item->name, true, false);
 
 				if (!post_value)
 					post_value = "";
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 92391eda2fd50..e9b665095dcd9 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -551,10 +551,12 @@ const char *const config_group_names[] =
 	gettext_noop("Write-Ahead Log / Checkpoints"),
 	/* WAL_ARCHIVING */
 	gettext_noop("Write-Ahead Log / Archiving"),
-	/* WAL_REPLICATION */
-	gettext_noop("Write-Ahead Log / Streaming Replication"),
-	/* WAL_STANDBY_SERVERS */
-	gettext_noop("Write-Ahead Log / Standby Servers"),
+	/* REPLICATION */
+	gettext_noop("Replication"),
+	/* REPLICATION_MASTER */
+	gettext_noop("Replication / Master Server"),
+	/* REPLICATION_STANDBY */
+	gettext_noop("Replication / Standby Servers"),
 	/* QUERY_TUNING */
 	gettext_noop("Query Tuning"),
 	/* QUERY_TUNING_METHOD */
@@ -887,7 +889,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 	{
 		{"restart_after_crash", PGC_SIGHUP, ERROR_HANDLING_OPTIONS,
-			gettext_noop("Reinitialize after backend crash."),
+			gettext_noop("Reinitialize server after backend crash."),
 			NULL
 		},
 		&restart_after_crash,
@@ -1367,7 +1369,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"hot_standby", PGC_POSTMASTER, WAL_STANDBY_SERVERS,
+		{"hot_standby", PGC_POSTMASTER, REPLICATION_STANDBY,
 			gettext_noop("Allows connections and queries during recovery."),
 			NULL
 		},
@@ -1377,8 +1379,8 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"hot_standby_feedback", PGC_SIGHUP, WAL_STANDBY_SERVERS,
-			gettext_noop("Allows feedback from a hot standby primary that will avoid query conflicts."),
+		{"hot_standby_feedback", PGC_SIGHUP, REPLICATION_STANDBY,
+			gettext_noop("Allows feedback from a hot standby to the primary that will avoid query conflicts."),
 			NULL
 		},
 		&hot_standby_feedback,
@@ -1544,7 +1546,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"max_standby_archive_delay", PGC_SIGHUP, WAL_STANDBY_SERVERS,
+		{"max_standby_archive_delay", PGC_SIGHUP, REPLICATION_STANDBY,
 			gettext_noop("Sets the maximum delay before canceling queries when a hot standby server is processing archived WAL data."),
 			NULL,
 			GUC_UNIT_MS
@@ -1555,7 +1557,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"max_standby_streaming_delay", PGC_SIGHUP, WAL_STANDBY_SERVERS,
+		{"max_standby_streaming_delay", PGC_SIGHUP, REPLICATION_STANDBY,
 			gettext_noop("Sets the maximum delay before canceling queries when a hot standby server is processing streamed WAL data."),
 			NULL,
 			GUC_UNIT_MS
@@ -1566,8 +1568,8 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"wal_receiver_status_interval", PGC_SIGHUP, WAL_STANDBY_SERVERS,
-			gettext_noop("Sets the maximum interval between WAL receiver status reports to the master."),
+		{"wal_receiver_status_interval", PGC_SIGHUP, REPLICATION_STANDBY,
+			gettext_noop("Sets the maximum interval between WAL receiver status reports to the primary."),
 			NULL,
 			GUC_UNIT_S
 		},
@@ -1851,7 +1853,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"vacuum_defer_cleanup_age", PGC_SIGHUP, WAL_REPLICATION,
+		{"vacuum_defer_cleanup_age", PGC_SIGHUP, REPLICATION_MASTER,
 			gettext_noop("Number of transactions by which VACUUM and HOT cleanup should be deferred, if any."),
 			NULL
 		},
@@ -1911,7 +1913,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"wal_keep_segments", PGC_SIGHUP, WAL_REPLICATION,
+		{"wal_keep_segments", PGC_SIGHUP, REPLICATION_MASTER,
 			gettext_noop("Sets the number of WAL files held for standby servers."),
 			NULL
 		},
@@ -1979,7 +1981,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		/* see max_connections */
-		{"max_wal_senders", PGC_POSTMASTER, WAL_REPLICATION,
+		{"max_wal_senders", PGC_POSTMASTER, REPLICATION_MASTER,
 			gettext_noop("Sets the maximum number of simultaneously running WAL sender processes."),
 			NULL
 		},
@@ -1989,7 +1991,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"wal_sender_delay", PGC_SIGHUP, WAL_REPLICATION,
+		{"wal_sender_delay", PGC_SIGHUP, REPLICATION_MASTER,
 			gettext_noop("WAL sender sleep time between WAL replications."),
 			NULL,
 			GUC_UNIT_MS
@@ -2000,7 +2002,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"replication_timeout", PGC_SIGHUP, WAL_REPLICATION,
+		{"replication_timeout", PGC_SIGHUP, REPLICATION_MASTER,
 			gettext_noop("Sets the maximum time to wait for WAL replication."),
 			NULL,
 			GUC_UNIT_MS
@@ -2964,8 +2966,8 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
-			gettext_noop("List of potential standby names to synchronise with."),
+		{"synchronous_standby_names", PGC_SIGHUP, REPLICATION_MASTER,
+			gettext_noop("List of names of potential synchronous standbys."),
 			NULL,
 			GUC_LIST_INPUT
 		},
@@ -4365,8 +4367,9 @@ AtStart_GUC(void)
 
 /*
  * Enter a new nesting level for GUC values.  This is called at subtransaction
- * start and when entering a function that has proconfig settings.	NOTE that
- * we must not risk error here, else subtransaction start will be unhappy.
+ * start, and when entering a function that has proconfig settings, and in
+ * some other places where we want to set GUC variables transiently.
+ * NOTE we must not risk error here, else subtransaction start will be unhappy.
  */
 int
 NewGUCNestLevel(void)
@@ -4376,8 +4379,9 @@ NewGUCNestLevel(void)
 
 /*
  * Do GUC processing at transaction or subtransaction commit or abort, or
- * when exiting a function that has proconfig settings.  (The name is thus
- * a bit of a misnomer; perhaps it should be ExitGUCNestLevel or some such.)
+ * when exiting a function that has proconfig settings, or when undoing a
+ * transient assignment to some GUC variables.  (The name is thus a bit of
+ * a misnomer; perhaps it should be ExitGUCNestLevel or some such.)
  * During abort, we discard all GUC settings that were applied at nesting
  * levels >= nestLevel.  nestLevel == 1 corresponds to the main transaction.
  */
@@ -4410,11 +4414,11 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 		GucStack   *stack;
 
 		/*
-		 * Process and pop each stack entry within the nest level.	To
-		 * simplify fmgr_security_definer(), we allow failure exit from a
-		 * function-with-SET-options to be recovered at the surrounding
-		 * transaction or subtransaction abort; so there could be more than
-		 * one stack entry to pop.
+		 * Process and pop each stack entry within the nest level. To simplify
+		 * fmgr_security_definer() and other places that use GUC_ACTION_SAVE,
+		 * we allow failure exit from code that uses a local nest level to be
+		 * recovered at the surrounding transaction or subtransaction abort;
+		 * so there could be more than one stack entry to pop.
 		 */
 		while ((stack = gconf->stack) != NULL &&
 			   stack->nest_level >= nestLevel)
@@ -5836,8 +5840,11 @@ SetConfigOption(const char *name, const char *value,
 
 
 /*
- * Fetch the current value of the option `name'. If the option doesn't exist,
- * throw an ereport and don't return.
+ * Fetch the current value of the option `name', as a string.
+ *
+ * If the option doesn't exist, return NULL if missing_ok is true (NOTE that
+ * this cannot be distinguished from a string variable with a NULL value!),
+ * otherwise throw an ereport and don't return.
  *
  * If restrict_superuser is true, we also enforce that only superusers can
  * see GUC_SUPERUSER_ONLY variables.  This should only be passed as true
@@ -5847,16 +5854,21 @@ SetConfigOption(const char *name, const char *value,
  * valid until the next call to configuration related functions.
  */
 const char *
-GetConfigOption(const char *name, bool restrict_superuser)
+GetConfigOption(const char *name, bool missing_ok, bool restrict_superuser)
 {
 	struct config_generic *record;
 	static char buffer[256];
 
 	record = find_option(name, false, ERROR);
 	if (record == NULL)
+	{
+		if (missing_ok)
+			return NULL;
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
-			   errmsg("unrecognized configuration parameter \"%s\"", name)));
+				 errmsg("unrecognized configuration parameter \"%s\"",
+						name)));
+	}
 	if (restrict_superuser &&
 		(record->flags & GUC_SUPERUSER_ONLY) &&
 		!superuser())
@@ -7327,6 +7339,8 @@ _ShowOption(struct config_generic * record, bool use_units)
  *
  *		variable name, string, null terminated
  *		variable value, string, null terminated
+ *		variable sourcefile, string, null terminated (empty if none)
+ *		variable sourceline, integer
  *		variable source, integer
  */
 static void
@@ -7363,8 +7377,7 @@ write_one_nondefault_variable(FILE *fp, struct config_generic * gconf)
 			{
 				struct config_real *conf = (struct config_real *) gconf;
 
-				/* Could lose precision here? */
-				fprintf(fp, "%f", *conf->variable);
+				fprintf(fp, "%.17g", *conf->variable);
 			}
 			break;
 
@@ -7388,7 +7401,12 @@ write_one_nondefault_variable(FILE *fp, struct config_generic * gconf)
 
 	fputc(0, fp);
 
-	fwrite(&gconf->source, sizeof(gconf->source), 1, fp);
+	if (gconf->sourcefile)
+		fprintf(fp, "%s", gconf->sourcefile);
+	fputc(0, fp);
+
+	fwrite(&gconf->sourceline, 1, sizeof(gconf->sourceline), fp);
+	fwrite(&gconf->source, 1, sizeof(gconf->source), fp);
 }
 
 void
@@ -7491,8 +7509,10 @@ read_nondefault_variables(void)
 {
 	FILE	   *fp;
 	char	   *varname,
-			   *varvalue;
-	int			varsource;
+			   *varvalue,
+			   *varsourcefile;
+	int			varsourceline;
+	GucSource	varsource;
 
 	/*
 	 * Open file
@@ -7517,16 +7537,26 @@ read_nondefault_variables(void)
 			break;
 
 		if ((record = find_option(varname, true, FATAL)) == NULL)
-			elog(FATAL, "failed to locate variable %s in exec config params file", varname);
+			elog(FATAL, "failed to locate variable \"%s\" in exec config params file", varname);
+
 		if ((varvalue = read_string_with_null(fp)) == NULL)
 			elog(FATAL, "invalid format of exec config params file");
-		if (fread(&varsource, sizeof(varsource), 1, fp) == 0)
+		if ((varsourcefile = read_string_with_null(fp)) == NULL)
+			elog(FATAL, "invalid format of exec config params file");
+		if (fread(&varsourceline, 1, sizeof(varsourceline), fp) != sizeof(varsourceline))
 			elog(FATAL, "invalid format of exec config params file");
+		if (fread(&varsource, 1, sizeof(varsource), fp) != sizeof(varsource))
+			elog(FATAL, "invalid format of exec config params file");
+
+		(void) set_config_option(varname, varvalue,
+								 record->context, varsource,
+								 GUC_ACTION_SET, true);
+		if (varsourcefile[0])
+			set_config_sourcefile(varname, varsourcefile, varsourceline);
 
-		(void) set_config_option(varname, varvalue, record->context,
-								 varsource, GUC_ACTION_SET, true);
 		free(varname);
 		free(varvalue);
+		free(varsourcefile);
 	}
 
 	FreeFile(fp);
@@ -7975,11 +8005,11 @@ call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra,
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
 				 GUC_check_errmsg_string ?
-				 errmsg("%s", GUC_check_errmsg_string) :
+				 errmsg_internal("%s", GUC_check_errmsg_string) :
 				 errmsg("invalid value for parameter \"%s\": %d",
 						conf->gen.name, (int) *newval),
 				 GUC_check_errdetail_string ?
-				 errdetail("%s", GUC_check_errdetail_string) : 0,
+				 errdetail_internal("%s", GUC_check_errdetail_string) : 0,
 				 GUC_check_errhint_string ?
 				 errhint("%s", GUC_check_errhint_string) : 0));
 		/* Flush any strings created in ErrorContext */
@@ -8009,11 +8039,11 @@ call_int_check_hook(struct config_int * conf, int *newval, void **extra,
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
 				 GUC_check_errmsg_string ?
-				 errmsg("%s", GUC_check_errmsg_string) :
+				 errmsg_internal("%s", GUC_check_errmsg_string) :
 				 errmsg("invalid value for parameter \"%s\": %d",
 						conf->gen.name, *newval),
 				 GUC_check_errdetail_string ?
-				 errdetail("%s", GUC_check_errdetail_string) : 0,
+				 errdetail_internal("%s", GUC_check_errdetail_string) : 0,
 				 GUC_check_errhint_string ?
 				 errhint("%s", GUC_check_errhint_string) : 0));
 		/* Flush any strings created in ErrorContext */
@@ -8043,11 +8073,11 @@ call_real_check_hook(struct config_real * conf, double *newval, void **extra,
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
 				 GUC_check_errmsg_string ?
-				 errmsg("%s", GUC_check_errmsg_string) :
+				 errmsg_internal("%s", GUC_check_errmsg_string) :
 				 errmsg("invalid value for parameter \"%s\": %g",
 						conf->gen.name, *newval),
 				 GUC_check_errdetail_string ?
-				 errdetail("%s", GUC_check_errdetail_string) : 0,
+				 errdetail_internal("%s", GUC_check_errdetail_string) : 0,
 				 GUC_check_errhint_string ?
 				 errhint("%s", GUC_check_errhint_string) : 0));
 		/* Flush any strings created in ErrorContext */
@@ -8077,11 +8107,11 @@ call_string_check_hook(struct config_string * conf, char **newval, void **extra,
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
 				 GUC_check_errmsg_string ?
-				 errmsg("%s", GUC_check_errmsg_string) :
+				 errmsg_internal("%s", GUC_check_errmsg_string) :
 				 errmsg("invalid value for parameter \"%s\": \"%s\"",
 						conf->gen.name, *newval ? *newval : ""),
 				 GUC_check_errdetail_string ?
-				 errdetail("%s", GUC_check_errdetail_string) : 0,
+				 errdetail_internal("%s", GUC_check_errdetail_string) : 0,
 				 GUC_check_errhint_string ?
 				 errhint("%s", GUC_check_errhint_string) : 0));
 		/* Flush any strings created in ErrorContext */
@@ -8111,12 +8141,12 @@ call_enum_check_hook(struct config_enum * conf, int *newval, void **extra,
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
 				 GUC_check_errmsg_string ?
-				 errmsg("%s", GUC_check_errmsg_string) :
+				 errmsg_internal("%s", GUC_check_errmsg_string) :
 				 errmsg("invalid value for parameter \"%s\": \"%s\"",
 						conf->gen.name,
 						config_enum_lookup_by_value(conf, *newval)),
 				 GUC_check_errdetail_string ?
-				 errdetail("%s", GUC_check_errdetail_string) : 0,
+				 errdetail_internal("%s", GUC_check_errdetail_string) : 0,
 				 GUC_check_errhint_string ?
 				 errhint("%s", GUC_check_errhint_string) : 0));
 		/* Flush any strings created in ErrorContext */
@@ -8234,7 +8264,7 @@ check_temp_buffers(int *newval, void **extra, GucSource source)
 	 */
 	if (NLocBuffer && NLocBuffer != *newval)
 	{
-		GUC_check_errdetail("\"temp_buffers\" cannot be changed after any temp tables have been accessed in the session.");
+		GUC_check_errdetail("\"temp_buffers\" cannot be changed after any temporary tables have been accessed in the session.");
 		return false;
 	}
 	return true;
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 655dad42c7111..e5e7c1a585096 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -184,32 +184,41 @@
 #archive_timeout = 0		# force a logfile segment switch after this
 				# number of seconds; 0 disables
 
-# - Streaming Replication - Server Settings
 
-#synchronous_standby_names = ''	# standby servers that provide sync rep
-				# comma-separated list of application_name from standby(s);
-				# '*' = all
+#------------------------------------------------------------------------------
+# REPLICATION
+#------------------------------------------------------------------------------
 
+# - Master Server -
+
+# These settings are ignored on a standby server
 
 #max_wal_senders = 0		# max number of walsender processes
 				# (change requires restart)
 #wal_sender_delay = 1s		# walsender cycle time, 1-10000 milliseconds
 #wal_keep_segments = 0		# in logfile segments, 16MB each; 0 disables
 #vacuum_defer_cleanup_age = 0	# number of xacts by which cleanup is delayed
-#replication_timeout = 60s # in milliseconds, 0 is disabled
+#replication_timeout = 60s	# in milliseconds; 0 disables
+#synchronous_standby_names = ''	# standby servers that provide sync rep
+				# comma-separated list of application_name
+				# from standby(s); '*' = all
 
 # - Standby Servers -
 
+# These settings are ignored on a master server
+
 #hot_standby = off			# "on" allows queries during recovery
 					# (change requires restart)
-#hot_standby_feedback = off	# info from standby to prevent query conflicts
 #max_standby_archive_delay = 30s	# max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 #max_standby_streaming_delay = 30s	# max delay before canceling queries
 					# when reading streaming WAL;
 					# -1 allows indefinite delay
-#wal_receiver_status_interval = 10s	# replies at least this often, 0 disables
+#wal_receiver_status_interval = 10s	# send replies at least this often
+					# 0 disables
+#hot_standby_feedback = off		# send info from standby to prevent
+					# query conflicts
 
 
 #------------------------------------------------------------------------------
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index b59587b73b351..4d6e3aa0e4bd0 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -570,7 +570,8 @@ tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple)
 	MemoryContext oldcxt = MemoryContextSwitchTo(state->context);
 
 	/*
-	 * Copy the tuple.	(Must do this even in WRITEFILE case.)
+	 * Copy the tuple.  (Must do this even in WRITEFILE case.  Note that
+	 * COPYTUP includes USEMEM, so we needn't do that here.)
 	 */
 	tuple = COPYTUP(state, tuple);
 
@@ -580,9 +581,8 @@ tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple)
 }
 
 /*
- * Similar to tuplestore_puttuple(), but start from the values + nulls
- * array. This avoids requiring that the caller construct a HeapTuple,
- * saving a copy.
+ * Similar to tuplestore_puttuple(), but work from values + nulls arrays.
+ * This avoids an extra tuple-construction operation.
  */
 void
 tuplestore_putvalues(Tuplestorestate *state, TupleDesc tdesc,
@@ -592,6 +592,7 @@ tuplestore_putvalues(Tuplestorestate *state, TupleDesc tdesc,
 	MemoryContext oldcxt = MemoryContextSwitchTo(state->context);
 
 	tuple = heap_form_minimal_tuple(tdesc, values, isnull);
+	USEMEM(state, GetMemoryChunkSpace(tuple));
 
 	tuplestore_puttuple_common(state, (void *) tuple);
 
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 3809412a2d088..c333a489f1a8a 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -15,8 +15,12 @@ include $(top_builddir)/src/Makefile.global
 
 SUBDIRS = initdb pg_ctl pg_dump \
 	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
+
 ifeq ($(PORTNAME), win32)
-SUBDIRS+=pgevent
+SUBDIRS += pgevent
+else
+ALWAYS_SUBDIRS += pgevent
 endif
 
 $(recurse)
+$(recurse_always)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 399c734bc955e..018cfdc1506d8 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -185,7 +185,6 @@ static int	locale_date_order(const char *locale);
 static bool check_locale_name(const char *locale);
 static bool check_locale_encoding(const char *locale, int encoding);
 static void setlocales(void);
-static char *localemap(char *locale);
 static void usage(const char *progname);
 
 #ifdef WIN32
@@ -2286,61 +2285,6 @@ strreplace(char *str, char *needle, char *replacement)
 }
 #endif   /* WIN32 */
 
-/*
- * Windows has a problem with locale names that have a dot in the country
- * name. For example:
- *
- * "Chinese (Traditional)_Hong Kong S.A.R..950"
- *
- * For some reason, setlocale() doesn't accept that. Fortunately, Windows'
- * setlocale() accepts various alternative names for such countries, so we
- * map the full country names to accepted aliases.
- *
- * The returned string is always malloc'd - if no mapping is done it is
- * just a malloc'd copy of the original.
- */
-static char *
-localemap(char *locale)
-{
-	locale = xstrdup(locale);
-
-#ifdef WIN32
-
-	/*
-	 * Map the full country name to an abbreviation that setlocale() accepts.
-	 *
-	 * "HKG" is listed here:
-	 * http://msdn.microsoft.com/en-us/library/cdax410z%28v=vs.71%29.aspx
-	 * (Country/Region Strings).
-	 *
-	 * "ARE" is the ISO-3166 three-letter code for U.A.E. It is not on the
-	 * above list, but seems to work anyway.
-	 */
-	strreplace(locale, "Hong Kong S.A.R.", "HKG");
-	strreplace(locale, "U.A.E.", "ARE");
-
-	/*
-	 * The ISO-3166 country code for Macau S.A.R. is MAC, but Windows doesn't
-	 * seem to recognize that. And Macau isn't listed in the table of accepted
-	 * abbreviations linked above.
-	 *
-	 * Fortunately, "ZHM" seems to be accepted as an alias for "Chinese
-	 * (Traditional)_Macau S.A.R..950", so we use that. Note that it's unlike
-	 * HKG and ARE, ZHM is an alias for the whole locale name, not just the
-	 * country part. I'm not sure where that "ZHM" comes from, must be some
-	 * legacy naming scheme. But hey, it works.
-	 *
-	 * Some versions of Windows spell it "Macau", others "Macao".
-	 */
-	strreplace(locale, "Chinese (Traditional)_Macau S.A.R..950", "ZHM");
-	strreplace(locale, "Chinese_Macau S.A.R..950", "ZHM");
-	strreplace(locale, "Chinese (Traditional)_Macao S.A.R..950", "ZHM");
-	strreplace(locale, "Chinese_Macao S.A.R..950", "ZHM");
-#endif   /* WIN32 */
-
-	return locale;
-}
-
 /*
  * set up the locale variables
  *
@@ -2372,25 +2316,25 @@ setlocales(void)
 	 */
 
 	if (strlen(lc_ctype) == 0 || !check_locale_name(lc_ctype))
-		lc_ctype = localemap(setlocale(LC_CTYPE, NULL));
+		lc_ctype = xstrdup(setlocale(LC_CTYPE, NULL));
 	if (strlen(lc_collate) == 0 || !check_locale_name(lc_collate))
-		lc_collate = localemap(setlocale(LC_COLLATE, NULL));
+		lc_collate = xstrdup(setlocale(LC_COLLATE, NULL));
 	if (strlen(lc_numeric) == 0 || !check_locale_name(lc_numeric))
-		lc_numeric = localemap(setlocale(LC_NUMERIC, NULL));
+		lc_numeric = xstrdup(setlocale(LC_NUMERIC, NULL));
 	if (strlen(lc_time) == 0 || !check_locale_name(lc_time))
-		lc_time = localemap(setlocale(LC_TIME, NULL));
+		lc_time = xstrdup(setlocale(LC_TIME, NULL));
 	if (strlen(lc_monetary) == 0 || !check_locale_name(lc_monetary))
-		lc_monetary = localemap(setlocale(LC_MONETARY, NULL));
+		lc_monetary = xstrdup(setlocale(LC_MONETARY, NULL));
 	if (strlen(lc_messages) == 0 || !check_locale_name(lc_messages))
 #if defined(LC_MESSAGES) && !defined(WIN32)
 	{
 		/* when available get the current locale setting */
-		lc_messages = localemap(setlocale(LC_MESSAGES, NULL));
+		lc_messages = xstrdup(setlocale(LC_MESSAGES, NULL));
 	}
 #else
 	{
 		/* when not available, get the CTYPE setting */
-		lc_messages = localemap(setlocale(LC_CTYPE, NULL));
+		lc_messages = xstrdup(setlocale(LC_CTYPE, NULL));
 	}
 #endif
 
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 0dc5107aa4863..45d540831d5df 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 ko pt_BR ro ru sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko pl pt_BR ro ru sv tr zh_CN zh_TW
 GETTEXT_FILES	:= initdb.c ../../port/dirmod.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/initdb/po/cs.po b/src/bin/initdb/po/cs.po
index 0372714dc7519..6820f2607ade2 100644
--- a/src/bin/initdb/po/cs.po
+++ b/src/bin/initdb/po/cs.po
@@ -1,37 +1,39 @@
-# translation of initdb-cs.po to 
+# translation of initdb-cs.po to
 # translation of initdb-cs.po to Czech
-# Karel  Žák, 2004.
-# Zdeněk Kotala, 2009.
 #
+# Karel  Žák, 2004.
+# Zdeněk Kotala, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: postgresql-8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-06 23:08+0000\n"
-"PO-Revision-Date: 2010-09-25 00:36+0300\n"
-"Last-Translator: Zdeněk Kotala\n"
-"Language-Team:  \n"
+"POT-Creation-Date: 2011-08-30 11:36+0200\n"
+"PO-Revision-Date: 2011-09-06 11:33+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
 
-#: initdb.c:254 initdb.c:268
+#: initdb.c:260 initdb.c:274
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: nedostatek paměti\n"
 
-#: initdb.c:377 initdb.c:1490
+#: initdb.c:383 initdb.c:1289
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: nelze otevřít soubor \"%s\" pro �tení: %s\n"
 
-#: initdb.c:439 initdb.c:998 initdb.c:1027
+#: initdb.c:439 initdb.c:805 initdb.c:834
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: nelze otevřít soubor \"%s\" pro zápis: %s\n"
 
-#: initdb.c:447 initdb.c:455 initdb.c:1005 initdb.c:1033
+#: initdb.c:447 initdb.c:455 initdb.c:812 initdb.c:840
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
@@ -41,57 +43,58 @@ msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: nelze vykonat příkaz \"%s\": %s\n"
 
-#: initdb.c:594
+#: initdb.c:490
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: odstraňuji datový adresář \"%s\"\n"
 
-#: initdb.c:597
+#: initdb.c:493
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: selhalo odstranění datového adresáře\n"
 
-#: initdb.c:603
+#: initdb.c:499
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: odstraňuji obsah datového adresáře \"%s\"\n"
 
-#: initdb.c:606
+#: initdb.c:502
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: selhalo odstranění obsahu datového adresáře\n"
 
-#: initdb.c:612
+#: initdb.c:508
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: odstraňuji adresář s transak�ním logem \"%s\"\n"
 
-#: initdb.c:615
+#: initdb.c:511
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: selhalo odstraňení adresáře s transak�ním logem\n"
 
-#: initdb.c:621
+#: initdb.c:517
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: odstraňuji obsah adresáře s transak�ním logem \"%s\"\n"
 
-#: initdb.c:624
+#: initdb.c:520
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: selhalo odstranění obsahu adresáře s transak�ním logem\n"
 
-#: initdb.c:633
+#: initdb.c:529
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: datový adresář \"%s\" nebyl na žádost uživatele odstraněn\n"
 
-#: initdb.c:638
+#: initdb.c:534
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
-msgstr "%s: adresář s transak�ním logem \"%s\" nebyl na žádost uživatele odstraněn\n"
+msgstr ""
+"%s: adresář s transak�ním logem \"%s\" nebyl na žádost uživatele odstraněn\n"
 
-#: initdb.c:660
+#: initdb.c:556
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -102,32 +105,32 @@ msgstr ""
 "Prosím přihlaste se jako (neprivilegovaný) uživatel, který bude vlastníkem\n"
 "serverového procesu (například pomocí příkazu \"su\").\n"
 
-#: initdb.c:672
+#: initdb.c:568
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: nelze získat informace o aktualním uživateli: %s\n"
 
-#: initdb.c:689
+#: initdb.c:585
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: nelze získat jméno aktuálního uživatele: %s\n"
 
-#: initdb.c:720
+#: initdb.c:616
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" není platný název kódování znaků\n"
 
-#: initdb.c:918 initdb.c:3058
+#: initdb.c:725 initdb.c:3173
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: nelze vytvořít adresář \"%s\": %s\n"
 
-#: initdb.c:948
+#: initdb.c:755
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: soubor \"%s\" neexistuje\n"
 
-#: initdb.c:950 initdb.c:959 initdb.c:969
+#: initdb.c:757 initdb.c:766 initdb.c:776
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -136,36 +139,36 @@ msgstr ""
 "To znamená, že vaše instalace je poškozena, nebo jste\n"
 "zadal chybný adresář v parametru -L při spuštění.\n"
 
-#: initdb.c:956
+#: initdb.c:763
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: nelze přistupit k souboru \"%s\": %s\n"
 
-#: initdb.c:967
+#: initdb.c:774
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: soubor \"%s\" není běžný soubor\n"
 
-#: initdb.c:1075
+#: initdb.c:882
 #, c-format
 msgid "selecting default max_connections ... "
-msgstr "vybírám základní nastavení max_connections ... "
+msgstr "vybírám implicitní nastavení max_connections ... "
 
-#: initdb.c:1104
+#: initdb.c:911
 #, c-format
 msgid "selecting default shared_buffers ... "
-msgstr "vybírám základní nastavení shared_buffers ... "
+msgstr "vybírám implicitní nastavení shared_buffers ... "
 
-#: initdb.c:1147
+#: initdb.c:954
 msgid "creating configuration files ... "
 msgstr "vytvářím konfigura�ní soubory ... "
 
-#: initdb.c:1314
+#: initdb.c:1129
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "vytvářím databázi template1 v %s/base/1 ... "
 
-#: initdb.c:1330
+#: initdb.c:1145
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -175,105 +178,135 @@ msgstr ""
 "Zkontrolujte si vaši instalaci nebo zadejte platnou cestu pomocí\n"
 "parametru -L.\n"
 
-#: initdb.c:1429
+#: initdb.c:1230
 msgid "initializing pg_authid ... "
 msgstr "inicializuji pg_authid ... "
 
-#: initdb.c:1465
+#: initdb.c:1264
 msgid "Enter new superuser password: "
 msgstr "Zadejte nové heslo pro superuživatele: "
 
-#: initdb.c:1466
+#: initdb.c:1265
 msgid "Enter it again: "
 msgstr "Zadejte ho znovu: "
 
-#: initdb.c:1469
+#: initdb.c:1268
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Hesla nesouhlasí.\n"
 
-#: initdb.c:1496
+#: initdb.c:1295
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: nemohu pře�íst heslo ze souboru \"%s\": %s\n"
 
-#: initdb.c:1509
+#: initdb.c:1308
 #, c-format
 msgid "setting password ... "
 msgstr "nastavuji heslo ... "
 
-#: initdb.c:1533
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr ""
-"%s: Soubor s hesly nebyl vytvořen. Prosíme oznamte tento problém tvůrcům.\n"
-
-#: initdb.c:1617
+#: initdb.c:1408
 msgid "initializing dependencies ... "
 msgstr "inicializuji závislosti ... "
 
-#: initdb.c:1645
+#: initdb.c:1436
 msgid "creating system views ... "
 msgstr "vytvářím systémové pohledy ... "
 
-#: initdb.c:1681
+#: initdb.c:1472
 msgid "loading system objects' descriptions ... "
 msgstr "nahrávám popisy systémových objektů ... "
 
-#: initdb.c:1733
+#: initdb.c:1578
+#| msgid "creating conversions ... "
+msgid "creating collations ... "
+msgstr "vytvářím collations ... "
+
+#: initdb.c:1611
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s: jméno locale je příliš dlouhé, přeskakuji: %s\n"
+
+#: initdb.c:1636
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s: jméno locale obsahuje ne-ASCII znaky, přeskakuji: %s\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr ""
+"Nebylo nalezené žádné použitelné systémové nárovní nastavení (locales).\n"
+
+#: initdb.c:1700
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Pro více detailů použijte volbu \"--debug\".\n"
+
+#: initdb.c:1703
+#, c-format
+#| msgid "%s: symlinks are not supported on this platform"
+msgid "not supported on this platform\n"
+msgstr "na této platformě není podporováno\n"
+
+#: initdb.c:1718
 msgid "creating conversions ... "
-msgstr "vytvářím konvertory ... "
+msgstr "vytvářím konverze ... "
 
-#: initdb.c:1768
+#: initdb.c:1753
 msgid "creating dictionaries ... "
 msgstr "vytvářím adresáře ... "
 
-#: initdb.c:1821
+#: initdb.c:1807
 msgid "setting privileges on built-in objects ... "
 msgstr "nastavuji oprávnění pro vestavěné objekty ... "
 
-#: initdb.c:1879
+#: initdb.c:1865
 msgid "creating information schema ... "
 msgstr "vytvářím informa�ní schéma ... "
 
-#: initdb.c:1935
+#: initdb.c:1921
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "na�ítám PL/pgSQL jazyk ... "
+
+#: initdb.c:1946
 msgid "vacuuming database template1 ... "
 msgstr "pouštím VACUUM na databázi template1 ... "
 
-#: initdb.c:1989
+#: initdb.c:2002
 msgid "copying template1 to template0 ... "
 msgstr "kopíruji template1 do template0 ... "
 
-#: initdb.c:2020
+#: initdb.c:2034
 msgid "copying template1 to postgres ... "
 msgstr "kopíruji template1 do postgres ... "
 
-#: initdb.c:2077
+#: initdb.c:2091
 #, c-format
 msgid "caught signal\n"
 msgstr "signál obdržen\n"
 
-#: initdb.c:2083
+#: initdb.c:2097
 #, c-format
 msgid "could not write to child process: %s\n"
-msgstr "nemohu zapsat do dětského procesu: %s\n"
+msgstr "nemohu zapsat do potomka: %s\n"
 
-#: initdb.c:2091
+#: initdb.c:2105
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2211
+#: initdb.c:2225
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: neplatný název národního nastavení (locale) \"%s\"\n"
 
-#: initdb.c:2244
+#: initdb.c:2251
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: nesouhlasí kódování znaků\n"
 
-#: initdb.c:2246
+#: initdb.c:2253
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -288,26 +321,26 @@ msgstr ""
 "spusťte znovu %s a bu� nespecifikujte kódování znaků explicitně, nebo\n"
 "vyberte takovou kombinaci, která si odpovídá.\n"
 
-#: initdb.c:2427
+#: initdb.c:2514
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
-"%s inicializuji prostor pro PostgreSQL.databáze\n"
+"%s inicializuji PostgreSQL klastr\n"
 "\n"
 
-#: initdb.c:2428
+#: initdb.c:2515
 #, c-format
 msgid "Usage:\n"
 msgstr "Použití:\n"
 
-#: initdb.c:2429
+#: initdb.c:2516
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [PŘEP�NAČ]... [DATAADR]\n"
 
-#: initdb.c:2430
+#: initdb.c:2517
 #, c-format
 msgid ""
 "\n"
@@ -316,31 +349,33 @@ msgstr ""
 "\n"
 "Přepína�e:\n"
 
-#: initdb.c:2431
+#: initdb.c:2518
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
 "connections\n"
 msgstr ""
-"  -A, --auth=METODA         výchozí autentiza�ní metoda pro lokálníspojení\n"
+"  -A, --auth=METODA         výchozí autentiza�ní metoda pro lokální spojení\n"
 
-#: initdb.c:2432
+#: initdb.c:2519
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATAADR     umístění tohoto databázového klastru\n"
 
-#: initdb.c:2433
+#: initdb.c:2520
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --encoding=KÓDOV�N�   nastavení výchozího kódování pro nové databáze\n"
 
-#: initdb.c:2434
+#: initdb.c:2521
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
-msgstr "      --locale=LOCALE       nastavení implicitního národního nastavení pro novou databázi\n"
+msgstr ""
+"      --locale=LOCALE       nastavení implicitního národního nastavení pro "
+"novou databázi\n"
 
-#: initdb.c:2435
+#: initdb.c:2522
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -355,47 +390,48 @@ msgstr ""
 "                            v příslušných kategoriích (výchozí hodnoty se \n"
 "                            vezmou z nastavení prostředí)\n"
 
-#: initdb.c:2439
+#: initdb.c:2526
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           ekvivalent --locale=C\n"
 
-#: initdb.c:2440
+#: initdb.c:2527
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
-"      --pwfile=SOUBOR       na�ti heslo pro nového superuživatele ze souboru\n"
+"      --pwfile=SOUBOR       na�ti heslo pro nového superuživatele ze "
+"souboru\n"
 
-#: initdb.c:2441
+#: initdb.c:2528
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
 "                            default text search configuration\n"
 msgstr ""
 "  -T, --text-search-config=CFG\n"
-"                            implicitní configurace fulltextového vyhledávání\n"
+"                            implicitní configurace fulltextového "
+"vyhledávání\n"
 
-#: initdb.c:2443
+#: initdb.c:2530
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=JMÉNO      jméno databázového superuživatele\n"
 
-#: initdb.c:2444
+#: initdb.c:2531
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr ""
 "  -W, --pwprompt            zeptej se na heslo pro nového superuživatele\n"
 
-#: initdb.c:2445
+#: initdb.c:2532
 #, c-format
 msgid ""
 "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
-msgstr ""
-"  -X, --xlogdir=XLOGDIR     umístění adresáře s transak�ním logem\n"
+msgstr "  -X, --xlogdir=XLOGDIR     umístění adresáře s transak�ním logem\n"
 
-#: initdb.c:2446
+#: initdb.c:2533
 #, c-format
 msgid ""
 "\n"
@@ -404,27 +440,27 @@ msgstr ""
 "\n"
 "Méně �asto používané přepína�e:\n"
 
-#: initdb.c:2447
+#: initdb.c:2534
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               generuj spoustu ladicích informací\n"
 
-#: initdb.c:2448
+#: initdb.c:2535
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              kde se nalézají vstupní soubory\n"
 
-#: initdb.c:2449
+#: initdb.c:2536
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             neuklízet po chybě\n"
 
-#: initdb.c:2450
+#: initdb.c:2537
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                ukaž interní nastavení\n"
 
-#: initdb.c:2451
+#: initdb.c:2538
 #, c-format
 msgid ""
 "\n"
@@ -433,17 +469,17 @@ msgstr ""
 "\n"
 "Ostatní přepína�e:\n"
 
-#: initdb.c:2452
+#: initdb.c:2539
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                ukaž tuto nápovědu, potom skon�i\n"
 
-#: initdb.c:2453
+#: initdb.c:2540
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             vypiš informace o verzi, potom skon�i\n"
 
-#: initdb.c:2454
+#: initdb.c:2541
 #, c-format
 msgid ""
 "\n"
@@ -454,7 +490,7 @@ msgstr ""
 "Pokud není specifikován datový adresář, použije se proměnná\n"
 "prostředí PGDATA.\n"
 
-#: initdb.c:2456
+#: initdb.c:2543
 #, c-format
 msgid ""
 "\n"
@@ -463,32 +499,32 @@ msgstr ""
 "\n"
 "Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2561
+#: initdb.c:2649
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Běžím v ladicím režimu.\n"
 
-#: initdb.c:2565
+#: initdb.c:2653
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Běžím v režimu \"noclean\".  Chybné kroky nebudou uklizeny.\n"
 
-#: initdb.c:2608 initdb.c:2626 initdb.c:2894
+#: initdb.c:2696 initdb.c:2714 initdb.c:2996
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Zkuste \"%s --help\" pro více informací.\n"
 
-#: initdb.c:2624
+#: initdb.c:2712
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
 
-#: initdb.c:2633
+#: initdb.c:2721
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: dotaz na heslo a soubor s heslem nemohou být vyžadovány najednou\n"
 
-#: initdb.c:2639
+#: initdb.c:2727
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -500,19 +536,19 @@ msgstr ""
 "Toto můžete změnit úpravou souboru pg_hba.conf nebo použitím\n"
 "parametru -A při příštím spuštění initdb.\n"
 
-#: initdb.c:2662
+#: initdb.c:2750
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: neznámá autentiza�ní metoda \"%s\".\n"
 
-#: initdb.c:2672
+#: initdb.c:2760
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr ""
 "%s: musíte zadat heslo superuživatele pro použití autentizace typu %s.\n"
 
-#: initdb.c:2687
+#: initdb.c:2789
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -525,7 +561,7 @@ msgstr ""
 "U�iňte tak bu� použitím přepína�e -D nebo nastavením proměnné\n"
 "prostředí PGDATA.\n"
 
-#: initdb.c:2763
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -536,7 +572,7 @@ msgstr ""
 "adresáři jako \"%s\".\n"
 "Zkontrolujte vaši instalaci.\n"
 
-#: initdb.c:2770
+#: initdb.c:2880
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -547,17 +583,12 @@ msgstr ""
 "ale nebyl ve stejné verzi jako %s.\n"
 "Zkontrolujte vaši instalaci.\n"
 
-#: initdb.c:2789
+#: initdb.c:2899
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: cesta k umístění vstupního souboru musí být absolutní\n"
 
-#: initdb.c:2797
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: nemohu zjistit platné krátké ozna�ení verze\n"
-
-#: initdb.c:2852
+#: initdb.c:2956
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -568,12 +599,12 @@ msgstr ""
 "Tento uživatel musí být také vlastníkem serverového procesu.\n"
 "\n"
 
-#: initdb.c:2862
+#: initdb.c:2966
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "Databázový klastr bude inicializován s národním nastavením %s.\n"
 
-#: initdb.c:2865
+#: initdb.c:2969
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -592,22 +623,34 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2891
+#: initdb.c:2993
 #, c-format
 msgid "%s: could not find suitable encoding for locale %s\n"
 msgstr "%s: nemohu najít vhodné kódování pro národní nastavení %s\n"
 
-#: initdb.c:2893
+#: initdb.c:2995
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Spusťte znovu %s s přepína�em -E.\n"
 
-#: initdb.c:2902
+#: initdb.c:3008
+#, c-format
+#| msgid ""
+#| "Encoding %s is not allowed as a server-side encoding.\n"
+#| "Rerun %s with a different locale selection.\n"
+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 ""
+"Kódování %s vyplývající z locale není povoleno jako kódování na serveru.\n"
+"Implicitní kódování databáze bude nastaveno na %s.\n"
+
+#: initdb.c:3016
 #, c-format
 msgid "%s: locale %s requires unsupported encoding %s\n"
 msgstr "%s: národní prostředí %s vyžaduje nepodporované kódování %s\n"
 
-#: initdb.c:2905
+#: initdb.c:3019
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -616,25 +659,26 @@ msgstr ""
 "Kódování %s není povoleno jako kódování na serveru.\n"
 "Pusťte znovu %s s jiným nastavením národního prostředí.\n"
 
-#: initdb.c:2913
+#: initdb.c:3028
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr ""
 "Výchozí kódování pro databáze bylo odpovídajícím způsobem nastaveno na %s.\n"
 
-#: initdb.c:2930
+#: initdb.c:3045
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale %s\n"
 msgstr "%s: nemohu najít vhodnou konfigurace fulltextového vyhledávání %s\n"
 
-#: initdb.c:2941
+#: initdb.c:3056
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale %s is unknown\n"
 msgstr ""
-"%s: varování: vhodná konfigurace fulltextového vyhledávání pro národní nastavení %s je neznámá\n"
+"%s: varování: vhodná konfigurace fulltextového vyhledávání pro národní "
+"nastavení %s je neznámá\n"
 
-#: initdb.c:2946
+#: initdb.c:3061
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
@@ -643,32 +687,33 @@ msgstr ""
 "%s: varování: zvolená konfigurace fulltextového vyhledávání \"%s\" nemusí "
 "souhlasit s národním prostředím %s\n"
 
-#: initdb.c:2951
+#: initdb.c:3066
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
-msgstr "Implicitní konfigurace fulltextového vyhledávání bude nastavena na \"%s\".\n"
+msgstr ""
+"Implicitní konfigurace fulltextového vyhledávání bude nastavena na \"%s\".\n"
 
-#: initdb.c:2985 initdb.c:3052
+#: initdb.c:3100 initdb.c:3167
 #, c-format
 msgid "creating directory %s ... "
 msgstr "vytvářím adresář %s ... "
 
-#: initdb.c:2999 initdb.c:3069
+#: initdb.c:3114 initdb.c:3185
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "opravuji oprávnění pro existující adresář %s ... "
 
-#: initdb.c:3005 initdb.c:3075
+#: initdb.c:3120 initdb.c:3191
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: nelze změnit práva adresáře \"%s\": %s\n"
 
-#: initdb.c:3018 initdb.c:3087
+#: initdb.c:3133 initdb.c:3204
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: adresář \"%s\" existuje, ale není prázdný\n"
 
-#: initdb.c:3021
+#: initdb.c:3136
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -679,17 +724,17 @@ msgstr ""
 "vyprázdněte adresář \"%s\" nebo spusťte %s\n"
 "s argumentem jiným než \"%s\".\n"
 
-#: initdb.c:3029 initdb.c:3097
+#: initdb.c:3144 initdb.c:3214
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: nelze přístoupit k adresáři \"%s\": %s\n"
 
-#: initdb.c:3043
+#: initdb.c:3158
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: cesta k umístění adresáře transak�ního logu musí být absolutní\n"
 
-#: initdb.c:3090
+#: initdb.c:3207
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -698,23 +743,22 @@ msgstr ""
 "Pokud chcete v tomto adresáři ukládat transak�ní log odstraňte nebo\n"
 "vyprázdněte adresář \"%s\".\n"
 
-
-#: initdb.c:3109
+#: initdb.c:3226
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: nelze vytvořit symbolický link \"%s\": %s\n"
 
-#: initdb.c:3114
+#: initdb.c:3231
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: na této platformě nejsou podporovány symbolické linky"
 
-#: initdb.c:3120
+#: initdb.c:3237
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "vytvářím adresáře ... "
 
-#: initdb.c:3182
+#: initdb.c:3303
 #, c-format
 msgid ""
 "\n"
@@ -736,85 +780,99 @@ msgstr ""
 #: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
 #, c-format
 msgid "out of memory\n"
-msgstr "paměť vy�erpána\n"
+msgstr "nedostatek paměti\n"
 
-#: ../../port/dirmod.c:270
+#: ../../port/dirmod.c:286
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "nelze nastavit propojení \"%s\": %s\n"
 
-#: ../../port/dirmod.c:309
+#: ../../port/dirmod.c:361
+#, c-format
+#| msgid "could not set junction for \"%s\": %s\n"
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "nelze najít funkci pro \"%s\": %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "nelze otevřít adresář \"%s\": %s\n"
 
-#: ../../port/dirmod.c:346
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "nelze �íst z adresáře \"%s\": %s\n"
 
-#: ../../port/dirmod.c:429
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "nelze získat informace o souboru nebo adresáři \"%s\": %s\n"
 
-#: ../../port/dirmod.c:456 ../../port/dirmod.c:473
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "nelze smazat soubor nebo adresář \"%s\": %s\n"
 
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
 #, c-format
 msgid "could not identify current directory: %s"
 msgstr "nelze získat aktuální adresář: %s"
 
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
 #, c-format
 msgid "invalid binary \"%s\""
 msgstr "neplatný binární soubor\"%s\""
 
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
 #, c-format
 msgid "could not read binary \"%s\""
 msgstr "nelze �íst binární soubor \"%s\""
 
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
 #, c-format
 msgid "could not find a \"%s\" to execute"
 msgstr "nelze najít spustitelný soubor \"%s\""
 
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
 #, c-format
 msgid "could not change directory to \"%s\""
 msgstr "nelze změnit adresář na \"%s\""
 
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
 #, c-format
 msgid "could not read symbolic link \"%s\""
 msgstr "nelze �íst symbolický link \"%s\""
 
-#: ../../port/exec.c:586
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "potomek skon�il s návratovým kódem %d"
 
-#: ../../port/exec.c:590
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "potomek byl ukon�en vyjímkou 0x%X"
 
-#: ../../port/exec.c:599
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "potomek byl ukon�en signálem %s"
 
-#: ../../port/exec.c:602
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "potomek byl ukon�en signálem %d"
 
-#: ../../port/exec.c:606
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "potomek skon�il s nerozponaným stavem %d"
 
+#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr ""
+#~ "%s: Soubor s hesly nebyl vytvořen. Prosíme oznamte tento problém "
+#~ "tvůrcům.\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: nemohu zjistit platné krátké ozna�ení verze\n"
diff --git a/src/bin/initdb/po/es.po b/src/bin/initdb/po/es.po
index 97475d8e110b5..b00a9cfe7ef9d 100644
--- a/src/bin/initdb/po/es.po
+++ b/src/bin/initdb/po/es.po
@@ -1,105 +1,107 @@
 # Spanish translation of initdb.
 #
-# Copyright (C) 2004-2010 PostgreSQL Global Development Group
+# Copyright (C) 2004-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
-# �lvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2010
+# �lvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2011
 #
-# pgtranslation Id: initdb.po,v 1.10 2010/09/24 21:58:59 petere Exp $
+# pgtranslation Id: initdb.po,v 1.11 2011/09/03 01:52:51 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: initdb (PostgreSQL 8.4)\n"
+"Project-Id-Version: initdb (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-30 20:02+0000\n"
-"PO-Revision-Date: 2010-09-25 00:37+0300\n"
+"POT-Creation-Date: 2011-09-02 10:53+0000\n"
+"PO-Revision-Date: 2011-09-02 22:52-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: initdb.c:254 initdb.c:268
+#: initdb.c:259 initdb.c:273
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: initdb.c:377 initdb.c:1432
+#: initdb.c:382 initdb.c:1288
 #, 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:433 initdb.c:956 initdb.c:985
+#: initdb.c:438 initdb.c:804 initdb.c:833
 #, 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:441 initdb.c:449 initdb.c:963 initdb.c:991
+#: initdb.c:446 initdb.c:454 initdb.c:811 initdb.c:839
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir el archivo «%s»: %s\n"
 
-#: initdb.c:468
+#: initdb.c:473
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: no se pudo ejecutar la orden «%s»: %s\n"
 
-#: initdb.c:588
+#: initdb.c:489
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: eliminando el directorio de datos «%s»\n"
 
-#: initdb.c:591
+#: initdb.c:492
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: no se pudo eliminar el directorio de datos\n"
 
-#: initdb.c:597
+#: initdb.c:498
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: eliminando el contenido del directorio «%s»\n"
 
-#: initdb.c:600
+#: initdb.c:501
 #, 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:606
+#: initdb.c:507
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: eliminando el directorio de registro de transacciones «%s»\n"
 
-#: initdb.c:609
+#: initdb.c:510
 #, 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:615
+#: initdb.c:516
 #, 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"
+"%s: eliminando el contenido del directorio de registro de transacciones "
+"«%s»\n"
 
-#: initdb.c:618
+#: initdb.c:519
 #, 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:627
+#: initdb.c:528
 #, 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:632
+#: initdb.c:533
 #, 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:654
+#: initdb.c:555
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -110,32 +112,32 @@ msgstr ""
 "Por favor conéctese (usando, por ejemplo, «su») como un usuario sin\n"
 "privilegios especiales, quien ejecutará el proceso servidor.\n"
 
-#: initdb.c:666
+#: initdb.c:567
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: no se pudo obtener información sobre el usuario actual: %s\n"
 
-#: initdb.c:683
+#: initdb.c:584
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: no se pudo obtener el nombre de usuario actual: %s\n"
 
-#: initdb.c:714
+#: initdb.c:615
 #, 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:876 initdb.c:3009
+#: initdb.c:724 initdb.c:3117
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
 
-#: initdb.c:906
+#: initdb.c:754
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: el archivo «%s» no existe\n"
 
-#: initdb.c:908 initdb.c:917 initdb.c:927
+#: initdb.c:756 initdb.c:765 initdb.c:775
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -144,36 +146,36 @@ msgstr ""
 "Esto puede significar que tiene una instalación corrupta o ha\n"
 "identificado el directorio equivocado con la opción -L.\n"
 
-#: initdb.c:914
+#: initdb.c:762
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al archivo «%s»: %s\n"
 
-#: initdb.c:925
+#: initdb.c:773
 #, 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:1033
+#: initdb.c:881
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "seleccionando el valor para max_connections ... "
 
-#: initdb.c:1062
+#: initdb.c:910
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "seleccionando el valor para shared_buffers ... "
 
-#: initdb.c:1105
+#: initdb.c:953
 msgid "creating configuration files ... "
 msgstr "creando archivos de configuración ... "
 
-#: initdb.c:1272
+#: initdb.c:1128
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "creando base de datos template1 en %s/base/1 ... "
 
-#: initdb.c:1288
+#: initdb.c:1144
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -183,103 +185,132 @@ msgstr ""
 "Verifique su instalación o especifique la ruta correcta usando la opción -"
 "L.\n"
 
-#: initdb.c:1373
+#: initdb.c:1229
 msgid "initializing pg_authid ... "
 msgstr "inicializando pg_authid ... "
 
-#: initdb.c:1407
+#: initdb.c:1263
 msgid "Enter new superuser password: "
 msgstr "Ingrese la nueva contraseña del superusuario: "
 
-#: initdb.c:1408
+#: initdb.c:1264
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: initdb.c:1411
+#: initdb.c:1267
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las constraseñas no coinciden.\n"
 
-#: initdb.c:1438
+#: initdb.c:1294
 #, 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:1451
+#: initdb.c:1307
 #, c-format
 msgid "setting password ... "
 msgstr "estableciendo contraseña ... "
 
-#: initdb.c:1549
+#: initdb.c:1407
 msgid "initializing dependencies ... "
 msgstr "inicializando dependencias ... "
 
-#: initdb.c:1577
+#: initdb.c:1435
 msgid "creating system views ... "
 msgstr "creando las vistas de sistema ... "
 
-#: initdb.c:1613
+#: initdb.c:1471
 msgid "loading system objects' descriptions ... "
 msgstr "cargando las descripciones de los objetos del sistema ... "
 
-#: initdb.c:1665
+#: initdb.c:1577
+msgid "creating collations ... "
+msgstr "creando algoritmos de ordenamiento ... "
+
+#: initdb.c:1610
+#, 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:1635
+#, 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:1698
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "No se encontraron configuraciones regionales usable.\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Use la opción «--debug» para ver detalles.\n"
+
+#: initdb.c:1702
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "no está soportado en esta plataforma\n"
+
+#: initdb.c:1717
 msgid "creating conversions ... "
 msgstr "creando conversiones ... "
 
-#: initdb.c:1700
+#: initdb.c:1752
 msgid "creating dictionaries ... "
-msgstr "creando directorios ... "
+msgstr "creando diccionarios ... "
 
-#: initdb.c:1754
+#: initdb.c:1806
 msgid "setting privileges on built-in objects ... "
 msgstr "estableciendo privilegios en objetos predefinidos ... "
 
-#: initdb.c:1812
+#: initdb.c:1864
 msgid "creating information schema ... "
 msgstr "creando el esquema de información ... "
 
-#: initdb.c:1868
+#: initdb.c:1920
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "instalando el lenguaje PL/pgSQL ... "
 
-#: initdb.c:1893
+#: initdb.c:1945
 msgid "vacuuming database template1 ... "
 msgstr "haciendo vacuum a la base de datos template1 ... "
 
-#: initdb.c:1947
+#: initdb.c:2001
 msgid "copying template1 to template0 ... "
 msgstr "copiando template1 a template0 ... "
 
-#: initdb.c:1978
+#: initdb.c:2033
 msgid "copying template1 to postgres ... "
 msgstr "copiando template1 a postgres ... "
 
-#: initdb.c:2035
+#: initdb.c:2090
 #, c-format
 msgid "caught signal\n"
 msgstr "se ha capturado una señal\n"
 
-#: initdb.c:2041
+#: initdb.c:2096
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "no se pudo escribir al proceso hijo: %s\n"
 
-#: initdb.c:2049
+#: initdb.c:2104
 #, c-format
 msgid "ok\n"
 msgstr "hecho\n"
 
-#: initdb.c:2169
+#: initdb.c:2224
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nombre de configuración local «%s» no es válido\n"
 
-#: initdb.c:2195
+#: initdb.c:2250
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: codificaciones no coinciden\n"
 
-#: initdb.c:2197
+#: initdb.c:2252
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -294,7 +325,7 @@ msgstr ""
 "Ejecute %s nuevamente y no especifique una codificación, o bien especifique\n"
 "una combinación adecuada.\n"
 
-#: initdb.c:2378
+#: initdb.c:2458
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -303,17 +334,17 @@ msgstr ""
 "%s inicializa un cluster de base de datos PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2379
+#: initdb.c:2459
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: initdb.c:2380
+#: initdb.c:2460
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPCIÓN]... [DATADIR]\n"
 
-#: initdb.c:2381
+#: initdb.c:2461
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +353,7 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: initdb.c:2382
+#: initdb.c:2462
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -331,27 +362,27 @@ msgstr ""
 "  -A, --auth=METODO         método de autentificación por omisión para\n"
 "                            conexiones locales\n"
 
-#: initdb.c:2383
+#: initdb.c:2463
 #, 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:2384
+#: initdb.c:2464
 #, 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:2385
+#: initdb.c:2465
 #, 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:2386
+#: initdb.c:2466
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -367,12 +398,12 @@ msgstr ""
 "omisión\n"
 "                            es tomado de variables de ambiente)\n"
 
-#: initdb.c:2390
+#: initdb.c:2470
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           equivalente a --locale=C\n"
 
-#: initdb.c:2391
+#: initdb.c:2471
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
@@ -380,7 +411,7 @@ msgstr ""
 "      --pwfile=ARCHIVO      leer contraseña del nuevo superusuario del "
 "archivo\n"
 
-#: initdb.c:2392
+#: initdb.c:2472
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -389,19 +420,19 @@ msgstr ""
 "  -T, --text-search-config=CONF\n"
 "                            configuración de búsqueda en texto por omisión\n"
 
-#: initdb.c:2394
+#: initdb.c:2474
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=USUARIO    nombre del superusuario del cluster\n"
 
-#: initdb.c:2395
+#: initdb.c:2475
 #, 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:2396
+#: initdb.c:2476
 #, c-format
 msgid ""
 "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
@@ -409,7 +440,7 @@ msgstr ""
 "  -X, --xlogdir=XLOGDIR     ubicación del directorio del registro de\n"
 "                            transacciones\n"
 
-#: initdb.c:2397
+#: initdb.c:2477
 #, c-format
 msgid ""
 "\n"
@@ -418,27 +449,27 @@ msgstr ""
 "\n"
 "Opciones menos usadas:\n"
 
-#: initdb.c:2398
+#: initdb.c:2478
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera mucha salida de depuración\n"
 
-#: initdb.c:2399
+#: initdb.c:2479
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORIO             donde encontrar los archivos de entrada\n"
 
-#: initdb.c:2400
+#: initdb.c:2480
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             no limpiar después de errores\n"
 
-#: initdb.c:2401
+#: initdb.c:2481
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                muestra variables internas\n"
 
-#: initdb.c:2402
+#: initdb.c:2482
 #, c-format
 msgid ""
 "\n"
@@ -447,17 +478,17 @@ msgstr ""
 "\n"
 "Otras opciones:\n"
 
-#: initdb.c:2403
+#: initdb.c:2483
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: initdb.c:2404
+#: initdb.c:2484
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de version y salir\n"
 
-#: initdb.c:2405
+#: initdb.c:2485
 #, c-format
 msgid ""
 "\n"
@@ -468,7 +499,7 @@ msgstr ""
 "Si el directorio de datos no es especificado, se usa la variable de\n"
 "ambiente PGDATA.\n"
 
-#: initdb.c:2407
+#: initdb.c:2487
 #, c-format
 msgid ""
 "\n"
@@ -477,34 +508,34 @@ msgstr ""
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2512
+#: initdb.c:2593
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Ejecutando en modo de depuración.\n"
 
-#: initdb.c:2516
+#: initdb.c:2597
 #, 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:2559 initdb.c:2577 initdb.c:2845
+#: initdb.c:2640 initdb.c:2658 initdb.c:2940
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener mayor información.\n"
 
-#: initdb.c:2575
+#: initdb.c:2656
 #, 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:2584
+#: initdb.c:2665
 #, 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:2590
+#: initdb.c:2671
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -516,12 +547,12 @@ msgstr ""
 "Puede cambiar esto editando pg_hba.conf o usando el parámetro -A\n"
 "la próxima vez que ejecute initdb.\n"
 
-#: initdb.c:2613
+#: initdb.c:2694
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: método de autentificación desconocido: «%s»\n"
 
-#: initdb.c:2623
+#: initdb.c:2704
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
@@ -529,7 +560,7 @@ msgstr ""
 "%s: debe especificar una contraseña al superusuario para activar\n"
 "autentificación %s\n"
 
-#: initdb.c:2638
+#: initdb.c:2733
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -541,7 +572,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:2722
+#: initdb.c:2817
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -552,7 +583,7 @@ msgstr ""
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: initdb.c:2729
+#: initdb.c:2824
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -563,12 +594,12 @@ msgstr ""
 "de la misma versión que «%s».\n"
 "Verifique su instalación.\n"
 
-#: initdb.c:2748
+#: initdb.c:2843
 #, 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:2805
+#: initdb.c:2900
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -578,12 +609,12 @@ msgstr ""
 "Los archivos de este cluster serán de propiedad del usuario «%s».\n"
 "Este usuario también debe ser quien ejecute el proceso servidor.\n"
 
-#: initdb.c:2815
+#: initdb.c:2910
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "El cluster será inicializado con configuración local %s.\n"
 
-#: initdb.c:2818
+#: initdb.c:2913
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -602,25 +633,35 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2842
+#: initdb.c:2937
 #, c-format
 msgid "%s: could not find suitable encoding for locale %s\n"
 msgstr ""
 "%s: no se pudo encontrar una codificación apropiada para\n"
 "la configuración local %s\n"
 
-#: initdb.c:2844
+#: initdb.c:2939
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Ejecute %s con la opción -E.\n"
 
-#: initdb.c:2853
+#: initdb.c:2952
+#, 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 ""
+"La codificación %s, implícita en la configuración regional,\n"
+"no puede ser usada como codificación del lado del servidor.\n"
+"La codificación por omisión será %s.\n"
+
+#: initdb.c:2960
 #, c-format
 msgid "%s: locale %s requires unsupported encoding %s\n"
 msgstr ""
 "%s: la configuración local %s requiere la codificación no soportada %s\n"
 
-#: initdb.c:2856
+#: initdb.c:2963
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -630,19 +671,19 @@ msgstr ""
 "del servidor.\n"
 "Ejecute %s nuevamente con una selección de configuración local diferente.\n"
 
-#: initdb.c:2864
+#: initdb.c:2972
 #, 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:2881
+#: initdb.c:2989
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale %s\n"
 msgstr ""
 "%s: no se pudo encontrar una configuración para búsqueda en texto apropiada\n"
 "para la configuración local %s\n"
 
-#: initdb.c:2892
+#: initdb.c:3000
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale %s is unknown\n"
@@ -650,7 +691,7 @@ msgstr ""
 "%s: atención: la configuración de búsqueda en texto apropiada para\n"
 "la configuración local %s es desconocida\n"
 
-#: initdb.c:2897
+#: initdb.c:3005
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
@@ -659,32 +700,32 @@ msgstr ""
 "%s: atención: la configuración de búsqueda en texto «%s» especificada\n"
 "podría no coincidir con la configuración local %s\n"
 
-#: initdb.c:2902
+#: initdb.c:3010
 #, 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:2936 initdb.c:3003
+#: initdb.c:3044 initdb.c:3111
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creando el directorio %s ... "
 
-#: initdb.c:2950 initdb.c:3020
+#: initdb.c:3058 initdb.c:3129
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "corrigiendo permisos en el directorio existente %s ... "
 
-#: initdb.c:2956 initdb.c:3026
+#: initdb.c:3064 initdb.c:3135
 #, 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:2969 initdb.c:3038
+#: initdb.c:3077 initdb.c:3148
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: el directorio «%s» no está vacío\n"
 
-#: initdb.c:2972
+#: initdb.c:3080
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -695,18 +736,18 @@ msgstr ""
 "el directorio «%s», o ejecute %s\n"
 "con un argumento distinto de «%s».\n"
 
-#: initdb.c:2980 initdb.c:3048
+#: initdb.c:3088 initdb.c:3158
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
 
-#: initdb.c:2994
+#: initdb.c:3102
 #, 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:3041
+#: initdb.c:3151
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -715,22 +756,22 @@ msgstr ""
 "Si quiere almacenar el directorio de registro de transacciones ahí,\n"
 "elimine o vacíe el directorio «%s».\n"
 
-#: initdb.c:3060
+#: initdb.c:3170
 #, 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:3065
+#: initdb.c:3175
 #, 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:3071
+#: initdb.c:3181
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creando subdirectorios ... "
 
-#: initdb.c:3135
+#: initdb.c:3247
 #, c-format
 msgid ""
 "\n"
@@ -759,22 +800,27 @@ msgstr "memoria agotada\n"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "no se pudo definir un junction para «%s»: %s\n"
 
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "no se pudo obtener junction para «%s»: %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "no se pudo abrir el directorio «%s»: %s\n"
 
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "no se pudo leer el directorio «%s»: %s\n"
 
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "no se pudo hacer stat al archivo o directorio «%s»: %s\n"
 
-#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "no se pudo borrar el archivo o el directorio «%s»: %s\n"
@@ -809,27 +855,27 @@ msgstr "no se pudo cambiar el directorio a «%s»"
 msgid "could not read symbolic link \"%s\""
 msgstr "no se pudo leer el enlace simbólico «%s»"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "el proceso hijo terminó con código de salida %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "el proceso hijo fue terminado por una excepción 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "el proceso hijo fue terminado por una señal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "el proceso hijo fue terminado por una señal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
diff --git a/src/bin/initdb/po/fr.po b/src/bin/initdb/po/fr.po
index 952cba4835109..8393e97171ebc 100644
--- a/src/bin/initdb/po/fr.po
+++ b/src/bin/initdb/po/fr.po
@@ -11,99 +11,100 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-12-19 01:11+0000\n"
-"PO-Revision-Date: 2010-09-25 00:38+0300\n"
+"POT-Creation-Date: 2011-06-13 14:53+0000\n"
+"PO-Revision-Date: 2011-06-13 17:45+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: initdb.c:255
-#: initdb.c:269
+#: initdb.c:260
+#: initdb.c:274
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s : mémoire épuisée\n"
 
-#: initdb.c:378
-#: initdb.c:1469
+#: initdb.c:383
+#: initdb.c:1289
 #, 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:434
-#: initdb.c:993
-#: initdb.c:1022
+#: initdb.c:439
+#: initdb.c:805
+#: initdb.c:834
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier « %s » en écriture : %s\n"
 
-#: initdb.c:442
-#: initdb.c:450
-#: initdb.c:1000
-#: initdb.c:1028
+#: initdb.c:447
+#: initdb.c:455
+#: initdb.c:812
+#: initdb.c:840
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s : n'a pas pu écrire le fichier « %s » : %s\n"
 
-#: initdb.c:469
+#: initdb.c:474
 #, 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:589
+#: initdb.c:490
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s : suppression du répertoire des données « %s »\n"
 
-#: initdb.c:592
+#: initdb.c:493
 #, 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:598
+#: initdb.c:499
 #, 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:601
+#: initdb.c:502
 #, 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:607
+#: initdb.c:508
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s : suppression du répertoire des journaux de transaction « %s »\n"
 
-#: initdb.c:610
+#: initdb.c:511
 #, 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:616
+#: initdb.c:517
 #, 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:619
+#: initdb.c:520
 #, 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:628
+#: initdb.c:529
 #, 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:633
+#: initdb.c:534
 #, 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:655
+#: initdb.c:556
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -114,35 +115,35 @@ 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:667
+#: initdb.c:568
 #, c-format
 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"
 
-#: initdb.c:684
+#: initdb.c:585
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s : n'a pas pu obtenir le nom de l'utilisateur courant : %s\n"
 
-#: initdb.c:715
+#: initdb.c:616
 #, 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:913
-#: initdb.c:3052
+#: initdb.c:725
+#: initdb.c:3173
 #, 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:943
+#: initdb.c:755
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s : le fichier « %s » n'existe pas\n"
 
-#: initdb.c:945
-#: initdb.c:954
-#: initdb.c:964
+#: initdb.c:757
+#: initdb.c:766
+#: initdb.c:776
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -151,36 +152,36 @@ 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:951
+#: initdb.c:763
 #, 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:962
+#: initdb.c:774
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s : « %s » n'est pas un fichier\n"
 
-#: initdb.c:1070
+#: initdb.c:882
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "sélection de la valeur par défaut de max_connections... "
 
-#: initdb.c:1099
+#: initdb.c:911
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "sélection de la valeur par défaut pour shared_buffers... "
 
-#: initdb.c:1142
+#: initdb.c:954
 msgid "creating configuration files ... "
 msgstr "création des fichiers de configuration... "
 
-#: initdb.c:1309
+#: initdb.c:1129
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "création de la base de données template1 dans %s/base/1... "
 
-#: initdb.c:1325
+#: initdb.c:1145
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -189,103 +190,132 @@ 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:1410
+#: initdb.c:1230
 msgid "initializing pg_authid ... "
 msgstr "initialisation de pg_authid... "
 
-#: initdb.c:1444
+#: initdb.c:1264
 msgid "Enter new superuser password: "
 msgstr "Saisissez le nouveau mot de passe du super-utilisateur : "
 
-#: initdb.c:1445
+#: initdb.c:1265
 msgid "Enter it again: "
 msgstr "Saisissez-le à nouveau : "
 
-#: initdb.c:1448
+#: initdb.c:1268
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Les mots de passe ne sont pas identiques.\n"
 
-#: initdb.c:1475
+#: initdb.c:1295
 #, 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:1488
+#: initdb.c:1308
 #, c-format
 msgid "setting password ... "
 msgstr "initialisation du mot de passe... "
 
-#: initdb.c:1586
+#: initdb.c:1408
 msgid "initializing dependencies ... "
 msgstr "initialisation des dépendances... "
 
-#: initdb.c:1614
+#: initdb.c:1436
 msgid "creating system views ... "
 msgstr "création des vues système... "
 
-#: initdb.c:1650
+#: initdb.c:1472
 msgid "loading system objects' descriptions ... "
 msgstr "chargement de la description des objets système... "
 
-#: initdb.c:1702
+#: initdb.c:1578
+msgid "creating collations ... "
+msgstr "création des collationnements... "
+
+#: initdb.c:1611
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s : nom de locale trop long, ignoré : %s\n"
+
+#: initdb.c:1636
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s : le nom de la locale contient des cartactères non ASCI, ignoré : %s\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "Aucune locale système utilisable n'a été trouvée.\n"
+
+#: initdb.c:1700
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Utilisez l'option « --debug » pour voir le détail.\n"
+
+#: initdb.c:1703
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "non supporté sur cette plateforme\n"
+
+#: initdb.c:1718
 msgid "creating conversions ... "
 msgstr "création des conversions... "
 
-#: initdb.c:1737
+#: initdb.c:1753
 msgid "creating dictionaries ... "
 msgstr "création des dictionnaires... "
 
-#: initdb.c:1791
+#: initdb.c:1807
 msgid "setting privileges on built-in objects ... "
 msgstr "initialisation des droits sur les objets internes... "
 
-#: initdb.c:1849
+#: initdb.c:1865
 msgid "creating information schema ... "
 msgstr "création du schéma d'informations... "
 
-#: initdb.c:1905
+#: initdb.c:1921
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "chargement du langage PL/pgSQL... "
 
-#: initdb.c:1930
+#: initdb.c:1946
 msgid "vacuuming database template1 ... "
 msgstr "lancement du vacuum sur la base de données template1... "
 
-#: initdb.c:1984
+#: initdb.c:2002
 msgid "copying template1 to template0 ... "
 msgstr "copie de template1 vers template0... "
 
-#: initdb.c:2015
+#: initdb.c:2034
 msgid "copying template1 to postgres ... "
 msgstr "copie de template1 vers postgres... "
 
-#: initdb.c:2072
+#: initdb.c:2091
 #, c-format
 msgid "caught signal\n"
 msgstr "signal reçu\n"
 
-#: initdb.c:2078
+#: initdb.c:2097
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "n'a pas pu écrire au processus fils : %s\n"
 
-#: initdb.c:2086
+#: initdb.c:2105
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2206
+#: initdb.c:2225
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s : nom de locale invalide (« %s »)\n"
 
-#: initdb.c:2232
+#: initdb.c:2251
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s : différence d'encodage\n"
 
-#: initdb.c:2234
+#: initdb.c:2253
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -300,7 +330,7 @@ msgstr ""
 "Ré-exécutez %s sans préciser d'encodage, ou en choisissant une combinaison\n"
 "compatible.\n"
 
-#: initdb.c:2415
+#: initdb.c:2514
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -309,17 +339,17 @@ msgstr ""
 "%s initialise un cluster PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2416
+#: initdb.c:2515
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: initdb.c:2417
+#: initdb.c:2516
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [RÉP_DONNÉES]\n"
 
-#: initdb.c:2418
+#: initdb.c:2517
 #, c-format
 msgid ""
 "\n"
@@ -328,33 +358,33 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: initdb.c:2419
+#: initdb.c:2518
 #, 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:2420
+#: initdb.c:2519
 #, 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:2421
+#: initdb.c:2520
 #, 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:2422
+#: initdb.c:2521
 #, 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:2423
+#: initdb.c:2522
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -369,19 +399,19 @@ msgstr ""
 "                             de données (les valeurs par défaut sont prises\n"
 "                             dans l'environnement)\n"
 
-#: initdb.c:2427
+#: initdb.c:2526
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale            équivalent à --locale=C\n"
 
-#: initdb.c:2428
+#: initdb.c:2527
 #, 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:2429
+#: initdb.c:2528
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -391,24 +421,24 @@ msgstr ""
 "                             configuration par défaut de la recherche plein\n"
 "                             texte\n"
 
-#: initdb.c:2431
+#: initdb.c:2530
 #, 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:2432
+#: initdb.c:2531
 #, 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:2433
+#: initdb.c:2532
 #, 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:2434
+#: initdb.c:2533
 #, c-format
 msgid ""
 "\n"
@@ -417,29 +447,29 @@ msgstr ""
 "\n"
 "Options moins utilisées :\n"
 
-#: initdb.c:2435
+#: initdb.c:2534
 #, 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:2436
+#: initdb.c:2535
 #, 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:2437
+#: initdb.c:2536
 #, 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:2438
+#: initdb.c:2537
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                 affiche la configuration interne\n"
 
-#: initdb.c:2439
+#: initdb.c:2538
 #, c-format
 msgid ""
 "\n"
@@ -448,17 +478,17 @@ msgstr ""
 "\n"
 "Autres options :\n"
 
-#: initdb.c:2440
+#: initdb.c:2539
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#: initdb.c:2441
+#: initdb.c:2540
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#: initdb.c:2442
+#: initdb.c:2541
 #, c-format
 msgid ""
 "\n"
@@ -469,7 +499,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:2444
+#: initdb.c:2543
 #, c-format
 msgid ""
 "\n"
@@ -478,36 +508,36 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2549
+#: initdb.c:2649
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Lancé en mode débogage.\n"
 
-#: initdb.c:2553
+#: initdb.c:2653
 #, 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:2596
-#: initdb.c:2614
-#: initdb.c:2888
+#: initdb.c:2696
+#: initdb.c:2714
+#: initdb.c:2996
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: initdb.c:2612
+#: initdb.c:2712
 #, 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:2621
+#: initdb.c:2721
 #, 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:2627
+#: initdb.c:2727
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -520,19 +550,19 @@ msgstr ""
 "Cela peut être modifié par l'édition de pg_hba.conf ou en utilisant l'option\n"
 "-A au prochain lancement d'initdb.\n"
 
-#: initdb.c:2650
+#: initdb.c:2750
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s : méthode d'authentification « %s » inconnue.\n"
 
-#: initdb.c:2660
+#: initdb.c:2760
 #, 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:2675
+#: initdb.c:2789
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -545,7 +575,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:2759
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -556,7 +586,7 @@ msgstr ""
 "le même répertoire que « %s ».\n"
 "Vérifiez votre installation.\n"
 
-#: initdb.c:2766
+#: initdb.c:2880
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -567,19 +597,14 @@ msgstr ""
 "version que « %s ».\n"
 "Vérifiez votre installation.\n"
 
-#: initdb.c:2785
+#: initdb.c:2899
 #, 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:2793
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s : n'a pas pu déterminer une chaîne de version courte valide\n"
-
-#: initdb.c:2848
+#: initdb.c:2956
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -590,12 +615,12 @@ msgstr ""
 "Le processus serveur doit également lui appartenir.\n"
 "\n"
 
-#: initdb.c:2858
+#: initdb.c:2966
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "Le cluster sera initialisé avec la locale %s.\n"
 
-#: initdb.c:2861
+#: initdb.c:2969
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -614,22 +639,31 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2885
+#: initdb.c:2993
 #, 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:2887
+#: initdb.c:2995
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Relancez %s avec l'option -E.\n"
 
-#: initdb.c:2896
+#: initdb.c:3008
+#, 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 ""
+"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:3016
 #, c-format
 msgid "%s: locale %s requires unsupported encoding %s\n"
 msgstr "%s : la locale %s nécessite l'encodage non supporté %s\n"
 
-#: initdb.c:2899
+#: initdb.c:3019
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -638,64 +672,64 @@ 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:2907
+#: initdb.c:3028
 #, 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:2924
+#: initdb.c:3045
 #, 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:2935
+#: initdb.c:3056
 #, 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:2940
+#: initdb.c:3061
 #, 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:2945
+#: initdb.c:3066
 #, 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:2979
-#: initdb.c:3046
+#: initdb.c:3100
+#: initdb.c:3167
 #, c-format
 msgid "creating directory %s ... "
 msgstr "création du répertoire %s... "
 
-#: initdb.c:2993
-#: initdb.c:3063
+#: initdb.c:3114
+#: initdb.c:3185
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "correction des droits sur le répertoire existant %s... "
 
-#: initdb.c:2999
-#: initdb.c:3069
+#: initdb.c:3120
+#: initdb.c:3191
 #, 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:3012
-#: initdb.c:3081
+#: initdb.c:3133
+#: initdb.c:3204
 #, 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:3015
+#: initdb.c:3136
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -706,20 +740,20 @@ msgstr ""
 "videz le répertoire « %s ».\n"
 "Vous pouvez aussi exécuter %s avec un argument autre que « %s ».\n"
 
-#: initdb.c:3023
-#: initdb.c:3091
+#: initdb.c:3144
+#: initdb.c:3214
 #, 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:3037
+#: initdb.c:3158
 #, 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:3084
+#: initdb.c:3207
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -728,22 +762,22 @@ msgstr ""
 "Si vous voulez enregistrer ici le journal des transactions, supprimez ou\n"
 "videz le répertoire « %s ».\n"
 
-#: initdb.c:3103
+#: initdb.c:3226
 #, 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:3108
+#: initdb.c:3231
 #, 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:3114
+#: initdb.c:3237
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "création des sous-répertoires... "
 
-#: initdb.c:3178
+#: initdb.c:3303
 #, c-format
 msgid ""
 "\n"
@@ -774,90 +808,97 @@ msgstr "m
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "n'a pas pu configurer la jonction pour « %s » : %s\n"
 
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "n'a pas pu obtenir la jonction pour « %s » : %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le répertoire « %s » : %s\n"
 
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "n'a pas pu lire le répertoire « %s » : %s\n"
 
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr ""
 "n'a pas pu récupérer les informations sur le fichier ou répertoire\n"
 "« %s » : %s\n"
 
-#: ../../port/dirmod.c:472
-#: ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590
+#: ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "n'a pas pu supprimer le fichier ou répertoire « %s » : %s\n"
 
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
 #, c-format
 msgid "could not identify current directory: %s"
 msgstr "n'a pas pu identifier le répertoire courant : %s"
 
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
 #, c-format
 msgid "invalid binary \"%s\""
 msgstr "binaire « %s » invalide"
 
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
 #, c-format
 msgid "could not read binary \"%s\""
 msgstr "n'a pas pu lire le binaire « %s »"
 
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
 #, c-format
 msgid "could not find a \"%s\" to execute"
 msgstr "n'a pas pu trouver un « %s » à exécuter"
 
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
 #, c-format
 msgid "could not change directory to \"%s\""
 msgstr "n'a pas pu accéder au répertoire « %s »"
 
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
 #, c-format
 msgid "could not read symbolic link \"%s\""
 msgstr "n'a pas pu lire le lien symbolique « %s »"
 
-#: ../../port/exec.c:586
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "le processus fils a quitté avec le code de sortie %d"
 
-#: ../../port/exec.c:590
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "le processus fils a été terminé par l'exception 0x%X"
 
-#: ../../port/exec.c:599
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "le processus fils a été terminé par le signal %s"
 
-#: ../../port/exec.c:602
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "le processus fils a été terminé par le signal %d"
 
-#: ../../port/exec.c:606
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s : n'a pas pu déterminer une chaîne de version courte valide\n"
+
 #~ msgid ""
 #~ "%s: The password file was not generated. Please report this problem.\n"
 #~ msgstr ""
 #~ "%s : le fichier de mots de passe n'a pas été créé.\n"
 #~ "Merci de rapporter ce problème.\n"
-
diff --git a/src/bin/initdb/po/ja.po b/src/bin/initdb/po/ja.po
index 708e1e0285590..317963d68bb85 100644
--- a/src/bin/initdb/po/ja.po
+++ b/src/bin/initdb/po/ja.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0.0rc1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-20 12:52+0900\n"
-"PO-Revision-Date: 2010-09-25 00:58+0300\n"
+"POT-Creation-Date: 2011-06-14 21:24+0900\n"
+"PO-Revision-Date: 2011-08-30 21:25+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -11,83 +11,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: initdb.c:254 initdb.c:268
+#: initdb.c:260 initdb.c:274
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: メモリ�足��\n"
 
-#: initdb.c:377 initdb.c:1432
+#: initdb.c:383 initdb.c:1289
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: 読��り用�ファイル\"%s\"をオープン����ん���:%s\n"
 
-#: initdb.c:433 initdb.c:956 initdb.c:985
+#: initdb.c:439 initdb.c:805 initdb.c:834
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s:書�込�用�ファイル\"%s\"をオープン����ん���: %s\n"
 
-#: initdb.c:441 initdb.c:449 initdb.c:963 initdb.c:991
+#: initdb.c:447 initdb.c:455 initdb.c:812 initdb.c:840
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s:ファイル\"%s\"�書�込��失敗����: %s\n"
 
-#: initdb.c:468
+#: initdb.c:474
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: コマンド\"%s\"�実効�失敗����: %s\n"
 
-#: initdb.c:588
+#: initdb.c:490
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s: データディレクトリ\"%s\"�削除を削除�����\n"
+msgstr "%s: データディレクトリ\"%s\"を削除�����\n"
 
-#: initdb.c:591
+#: initdb.c:493
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: データディレクトリ�削除�失敗����\n"
 
-#: initdb.c:597
+#: initdb.c:499
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: データディレクトリ\"%s\"�内容を削除�����\n"
 
-#: initdb.c:600
+#: initdb.c:502
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: データディレクトリ�内容�削除�失敗����\n"
 
-#: initdb.c:606
+#: initdb.c:508
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: トランザクションログディレクトリ\"%s\"を削除�����\n"
 
-#: initdb.c:609
+#: initdb.c:511
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: トランザクションログディレクトリ�削除�失敗����\n"
 
-#: initdb.c:615
+#: initdb.c:517
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: トランザクションログディレクトリ\"%s\"�内容を削除�����\n"
 
-#: initdb.c:618
+#: initdb.c:520
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: トランザクションログディレクトリ�内容�削除�失敗����\n"
 
-#: initdb.c:627
+#: initdb.c:529
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: ユーザ��求��データディレクトリ\"%s\"を削除���ん\n"
 
-#: initdb.c:632
+#: initdb.c:534
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr ""
 "%s: ユーザ��求��トランザクションログディレクトリ\"%s\"を削除���ん\n"
 
-#: initdb.c:654
+#: initdb.c:556
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -98,32 +98,32 @@ msgstr ""
 "サー�プロセス�所有者��る(�特権)ユーザ���(例��\"su\"を使用��)ログ"
 "イン������。\n"
 
-#: initdb.c:666
+#: initdb.c:568
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: �在�ユーザ�関�る情報を得る�������ん���: %s\n"
 
-#: initdb.c:683
+#: initdb.c:585
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: �在�ユーザ�を得る�������ん���: %s\n"
 
-#: initdb.c:714
+#: initdb.c:616
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" �無効�サー�符�化方����。\n"
 
-#: initdb.c:876 initdb.c:3009
+#: initdb.c:725 initdb.c:3173
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: ディレクトリ\"%s\"を作�����ん���。: %s\n"
 
-#: initdb.c:906
+#: initdb.c:755
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: ファイル\"%s\"��り��ん\n"
 
-#: initdb.c:908 initdb.c:917 initdb.c:927
+#: initdb.c:757 initdb.c:766 initdb.c:776
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -132,36 +132,36 @@ msgstr ""
 "インストレーション�破����る�-Lオプション�指定��ディ\n"
 "レクトリ�間����る�を�味�る�能性��り��。\n"
 
-#: initdb.c:914
+#: initdb.c:763
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: ファイル\"%s\"�アクセス����ん���: %s\n"
 
-#: initdb.c:925
+#: initdb.c:774
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: \"%s\" �通常�ファイル���り��ん\n"
 
-#: initdb.c:1033
+#: initdb.c:882
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "デフォルト�max_connectionsを�択����� ... "
 
-#: initdb.c:1062
+#: initdb.c:911
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "デフォルト� shared_buffers を�択����� ... "
 
-#: initdb.c:1105
+#: initdb.c:954
 msgid "creating configuration files ... "
 msgstr "設定ファイルを作������ ... "
 
-#: initdb.c:1272
+#: initdb.c:1129
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "%s/base/1�template1データベースを作������ ... "
 
-#: initdb.c:1288
+#: initdb.c:1145
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -171,104 +171,133 @@ msgstr ""
 "インストレーションを検査��-Lオプションを使用��正��パスを指定�����"
 "�。\n"
 
-#: initdb.c:1373
+#: initdb.c:1230
 msgid "initializing pg_authid ... "
 msgstr "pg_authidを�期化����� ... "
 
-#: initdb.c:1407
+#: initdb.c:1264
 msgid "Enter new superuser password: "
 msgstr "新��スーパーユーザ�パスワードを入力������:"
 
-#: initdb.c:1408
+#: initdb.c:1265
 msgid "Enter it again: "
 msgstr "�入力������:"
 
-#: initdb.c:1411
+#: initdb.c:1268
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "パスワード�一致���ん。\n"
 
-#: initdb.c:1438
+#: initdb.c:1295
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr ""
 "%s: ファイル\"%s\"�らパスワードを読��る�������ん���。: %s\n"
 
-#: initdb.c:1451
+#: initdb.c:1308
 #, c-format
 msgid "setting password ... "
 msgstr "パスワードを設定����� ... "
 
-#: initdb.c:1549
+#: initdb.c:1408
 msgid "initializing dependencies ... "
 msgstr "�存関係を�期化����� ... "
 
-#: initdb.c:1577
+#: initdb.c:1436
 msgid "creating system views ... "
 msgstr "システムビューを作������ ... "
 
-#: initdb.c:1613
+#: initdb.c:1472
 msgid "loading system objects' descriptions ... "
 msgstr "システムオブジェクト�定義をロード����� ... "
 
-#: initdb.c:1665
+#: initdb.c:1578
+msgid "creating collations ... "
+msgstr "照�順�を作������ ... "
+
+#: initdb.c:1611
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s: ロケール��長������飛����: %s\n"
+
+#: initdb.c:1636
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s: ロケール���ASCII文字��り����飛����: %s\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "使用��るシステムロケール�見��り��ん\n"
+
+#: initdb.c:1700
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "詳細を確��る����\"--debug\"オプションを使用������。\n"
+
+#: initdb.c:1703
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "��プラットフォーム��サ�ート�れ��ん\n"
+
+#: initdb.c:1718
 msgid "creating conversions ... "
 msgstr "変�を作������ ... "
 
-#: initdb.c:1700
+#: initdb.c:1753
 msgid "creating dictionaries ... "
 msgstr "ディレクトリを作������ ... "
 
-#: initdb.c:1754
+#: initdb.c:1807
 msgid "setting privileges on built-in objects ... "
 msgstr "組�込�オブジェクト�権�を設定����� ... "
 
-#: initdb.c:1812
+#: initdb.c:1865
 msgid "creating information schema ... "
 msgstr "情報スキーマを作������ ... "
 
-#: initdb.c:1868
+#: initdb.c:1921
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "PL/pgSQL サー�サイド言語をロード����� ... "
 
-#: initdb.c:1893
+#: initdb.c:1946
 msgid "vacuuming database template1 ... "
 msgstr "template1データベースを�キューム����� ... "
 
-#: initdb.c:1947
+#: initdb.c:2002
 msgid "copying template1 to template0 ... "
 msgstr "template1�らtemplate0�コピー����� ... "
 
-#: initdb.c:1978
+#: initdb.c:2034
 msgid "copying template1 to postgres ... "
 msgstr "template1�らpostgres�コピー����� ... "
 
-#: initdb.c:2035
+#: initdb.c:2091
 #, c-format
 msgid "caught signal\n"
 msgstr "シグナル�発生����\n"
 
-#: initdb.c:2041
+#: initdb.c:2097
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "�プロセス��書�込������ん���: %s\n"
 
-#: initdb.c:2049
+#: initdb.c:2105
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2169
+#: initdb.c:2225
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
-msgstr "\"%s: ロケール�\"%s\"�無効��。\n"
+msgstr "%s: ロケール�\"%s\"�無効��。\n"
 
-#: initdb.c:2195
+#: initdb.c:2251
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: 符�化方������ん\n"
 
-#: initdb.c:2197
+#: initdb.c:2253
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -278,28 +307,28 @@ msgid ""
 "or choose a matching combination.\n"
 msgstr ""
 "�択��符�化方�(%s)��択��ロケール�使用�る符�化方�(%s)�\n"
-"�����ん。�れ�より�種�文字列処�関数��正�動作を�る�能性�\n"
+"����ん。�れ�より�種�文字列処�関数��正�動作を�る�能性�\n"
 "�り��。明示的�符�化方��指定を止�る��致�る組����を\n"
 "�択��%sを�実行������\n"
 
-#: initdb.c:2378
+#: initdb.c:2514
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
 "\n"
 msgstr "%s�PostgreSQLデータベースクラスタを�期化���。\n"
 
-#: initdb.c:2379
+#: initdb.c:2515
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: initdb.c:2380
+#: initdb.c:2516
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [DATADIR]\n"
 
-#: initdb.c:2381
+#: initdb.c:2517
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +337,7 @@ msgstr ""
 "\n"
 "オプション:\n"
 
-#: initdb.c:2382
+#: initdb.c:2518
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -316,24 +345,24 @@ msgid ""
 msgstr ""
 "  -A, --auth=METHOD         ローカル�接続���デフォルト��証方���\n"
 
-#: initdb.c:2383
+#: initdb.c:2519
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATADIR     データベースクラスタ�場所��\n"
 
-#: initdb.c:2384
+#: initdb.c:2520
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --encoding=ENCODING   新�データベース用�デフォルト�符�化方���\n"
 
-#: initdb.c:2385
+#: initdb.c:2521
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr ""
 "      --locale=LOCALE        新��データベース�デフォルトロケールをセット\n"
 
-#: initdb.c:2386
+#: initdb.c:2522
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -348,12 +377,12 @@ msgstr ""
 "                            デフォルトロケールをセット(デフォルト値�\n"
 "                            環境変数�ら��れ��)\n"
 
-#: initdb.c:2390
+#: initdb.c:2526
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           --locale=C �����\n"
 
-#: initdb.c:2391
+#: initdb.c:2527
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
@@ -361,7 +390,7 @@ msgstr ""
 "      --pwfile=ファイル�   新��スーパーユーザ�パスワードをファイル�ら読"
 "�込む\n"
 
-#: initdb.c:2392
+#: initdb.c:2528
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -370,12 +399,12 @@ msgstr ""
 "  -T, --text-search-config=CFG\\\n"
 "                            デフォルト�テキスト検索設定��\n"
 
-#: initdb.c:2394
+#: initdb.c:2530
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       データベーススーパーユーザ�����\n"
 
-#: initdb.c:2395
+#: initdb.c:2531
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
@@ -383,14 +412,14 @@ msgstr ""
 "  -W, --pwprompt            新�スーパーユーザ�対��パスワード入力を促��"
 "�\n"
 
-#: initdb.c:2396
+#: initdb.c:2532
 #, c-format
 msgid ""
 "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr ""
 "  -X, --xlogdir=XLOGDIR     トランザクションログディレクトリ�場所��\n"
 
-#: initdb.c:2397
+#: initdb.c:2533
 #, c-format
 msgid ""
 "\n"
@@ -399,27 +428,27 @@ msgstr ""
 "\n"
 "使用頻度�低�オプション:\n"
 
-#: initdb.c:2398
+#: initdb.c:2534
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               多��デ�ッグ用�出力を生����\n"
 
-#: initdb.c:2399
+#: initdb.c:2535
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              入力ファイル�場所を指定���\n"
 
-#: initdb.c:2400
+#: initdb.c:2536
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             エラー発生後�削除を行���ん\n"
 
-#: initdb.c:2401
+#: initdb.c:2537
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                内部設定を表示���\n"
 
-#: initdb.c:2402
+#: initdb.c:2538
 #, c-format
 msgid ""
 "\n"
@@ -428,17 +457,17 @@ msgstr ""
 "\n"
 "��他�オプション:\n"
 
-#: initdb.c:2403
+#: initdb.c:2539
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                ��ヘルプを表示��終了���\n"
 
-#: initdb.c:2404
+#: initdb.c:2540
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             �ージョン情報を表示��終了���\n"
 
-#: initdb.c:2405
+#: initdb.c:2541
 #, c-format
 msgid ""
 "\n"
@@ -448,7 +477,7 @@ msgstr ""
 "\n"
 "データディレクトリ�指定�れ��場��PGDATA環境変数�使用�れ��。\n"
 
-#: initdb.c:2407
+#: initdb.c:2543
 #, c-format
 msgid ""
 "\n"
@@ -457,33 +486,33 @@ msgstr ""
 "\n"
 "�具��<pgsql-bugs@postgresql.org>��報告������。\n"
 
-#: initdb.c:2512
+#: initdb.c:2649
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "デ�ッグモード�実行�����。\n"
 
-#: initdb.c:2516
+#: initdb.c:2653
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr ""
 "削除を行���モード�実行�����。失敗��場��も削除�れ��ん。\n"
 
-#: initdb.c:2559 initdb.c:2577 initdb.c:2845
+#: initdb.c:2696 initdb.c:2714 initdb.c:2996
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "詳細�\"%s --help\"を行������。\n"
 
-#: initdb.c:2575
+#: initdb.c:2712
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: コマンドライン引数�多����。(始��\"%s\")\n"
 
-#: initdb.c:2584
+#: initdb.c:2721
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: パスワードプロンプト�パスワードファイル��時�指定����ん\n"
 
-#: initdb.c:2590
+#: initdb.c:2727
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -495,19 +524,18 @@ msgstr ""
 "pg_hba.confを編集�る�も����次回initdbを実行�る時�-Aオプショ\n"
 "ンを使用�る���変更�る�������。\n"
 
-#: initdb.c:2613
+#: initdb.c:2750
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: \"%s\"�未知��証方���\n"
 
-#: initdb.c:2623
+#: initdb.c:2760
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
-msgstr ""
-"\"%s: %s�証を有効��る���スーパーユーザ�パスワードを指定������\n"
+msgstr "%s: %s�証を有効��る���スーパーユーザ�パスワードを指定������\n"
 
-#: initdb.c:2638
+#: initdb.c:2789
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -520,7 +548,7 @@ msgstr ""
 "��ん。-Dオプションを付��呼�出���る���PGDATA環境変数を使用�る\n"
 "���指定�る�������。\n"
 
-#: initdb.c:2722
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -531,7 +559,7 @@ msgstr ""
 "��ん���。\n"
 "インストレーションを検査������。\n"
 
-#: initdb.c:2729
+#: initdb.c:2880
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -542,12 +570,12 @@ msgstr ""
 "��り��ん���。\n"
 "インストレーションを検査������。\n"
 
-#: initdb.c:2748
+#: initdb.c:2899
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: 入力ファイル�場所�絶対パス���れ��り��ん\n"
 
-#: initdb.c:2805
+#: initdb.c:2956
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -558,12 +586,12 @@ msgstr ""
 "��ユーザ�サー�プロセスを所有���れ��り��ん。\n"
 "\n"
 
-#: initdb.c:2815
+#: initdb.c:2966
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "データベースクラスタ�ロケール%s��期化�れ��。\n"
 
-#: initdb.c:2818
+#: initdb.c:2969
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -582,22 +610,31 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2842
+#: initdb.c:2993
 #, c-format
 msgid "%s: could not find suitable encoding for locale %s\n"
 msgstr "%s: ロケール%s用��切�符�化方���り��ん���\n"
 
-#: initdb.c:2844
+#: initdb.c:2995
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "-Eオプションを付��%sを�実行������。\n"
 
-#: initdb.c:2853
+#: initdb.c:3008
+#, 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:3016
 #, c-format
 msgid "%s: locale %s requires unsupported encoding %s\n"
 msgstr "%s: ロケール%s�サ�ート���符�化方�%sを必�����\n"
 
-#: initdb.c:2856
+#: initdb.c:3019
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -606,23 +643,23 @@ msgstr ""
 "符�化方�%s�サー���符�化方����使用����ん。\n"
 "別�ロケールを�択��%sを�実行������\n"
 
-#: initdb.c:2864
+#: initdb.c:3028
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "デフォルト�データベース符�化方��%s�設定�れ���。\n"
 
-#: initdb.c:2881
+#: initdb.c:3045
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale %s\n"
 msgstr "%s: ロケール\"%s\"用��切�テキスト検索設定�見��り��ん\n"
 
-#: initdb.c:2892
+#: initdb.c:3056
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale %s is unknown\n"
 msgstr "%s:警告:ロケール%s����テキスト検索設定��明��。\n"
 
-#: initdb.c:2897
+#: initdb.c:3061
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
@@ -631,32 +668,32 @@ msgstr ""
 "%s:警告:指定��テキスト検索設定\"%s\"�ロケール%s������能性\n"
 "��り��\n"
 
-#: initdb.c:2902
+#: initdb.c:3066
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "デフォルト�テキスト検索設定�%s�設定�れ���。\n"
 
-#: initdb.c:2936 initdb.c:3003
+#: initdb.c:3100 initdb.c:3167
 #, c-format
 msgid "creating directory %s ... "
 msgstr "ディレクトリ%sを作������ ... "
 
-#: initdb.c:2950 initdb.c:3020
+#: initdb.c:3114 initdb.c:3185
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "ディレクトリ%s�権�を設定����� ... "
 
-#: initdb.c:2956 initdb.c:3026
+#: initdb.c:3120 initdb.c:3191
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: ディレクトリ\"%s\"�権�を変更����ん���: %s\n"
 
-#: initdb.c:2969 initdb.c:3038
+#: initdb.c:3133 initdb.c:3204
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: ディレクトリ\"%s\"�存在�����空���り��ん\n"
 
-#: initdb.c:2972
+#: initdb.c:3136
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -667,19 +704,19 @@ msgstr ""
 "を削除�る�空�������。����%sを\"%s\"以外�引数�実行��\n"
 "����。\n"
 
-#: initdb.c:2980 initdb.c:3048
+#: initdb.c:3144 initdb.c:3214
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: ディレクトリ\"%s\"�アクセス����ん���: %s\n"
 
-#: initdb.c:2994
+#: initdb.c:3158
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr ""
 "%s: トランザクションログ�ディレクトリ��置��絶対パス���れ��り��"
 "ã‚“\n"
 
-#: initdb.c:3041
+#: initdb.c:3207
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -688,22 +725,22 @@ msgstr ""
 "���トランザクションログを格����場��ディレクトリ\"%s\"を削除�る�\n"
 "空�������\n"
 
-#: initdb.c:3060
+#: initdb.c:3226
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: シンボリックリンク\"%s\"を作�����ん���: %s\n"
 
-#: initdb.c:3065
+#: initdb.c:3231
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: ��プラットフォーム�シンボリックリンク�サ�ート�れ����ん"
 
-#: initdb.c:3071
+#: initdb.c:3237
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "サブディレクトリを作������ ... "
 
-#: initdb.c:3135
+#: initdb.c:3303
 #, c-format
 msgid ""
 "\n"
@@ -732,23 +769,28 @@ msgstr "メモリ�足��\n"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "\"%s\"�junctionを設定����ん���:  %s\n"
 
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "\"%s\"�junctionを入手����ん���:  %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "ディレクトリ\"%s\"をオープン����ん���。: %s\n"
 
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "ディレクトリ\"%s\"を読��れ��ん���。: %s\n"
 
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr ""
 "\"%s\"���ファイル���ディレクトリ�情報を�得����ん���。: %s\n"
 
-#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "\"%s\"���ファイル���ディレクトリを削除����ん���。: %s\n"
@@ -783,27 +825,27 @@ msgstr "ディレクトリを\"%s\"�変更����ん���"
 msgid "could not read symbolic link \"%s\""
 msgstr "シンボリックリンク\"%s\"を読��り����ん���"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "�プロセス�終了コード%d�終了����"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "�プロセス�例外0x%X�終了����"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "�プロセス�シグナル%s�終了����"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "�プロセス�シグナル%d�終了����"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "�プロセス�未知�ステータス%d�終了����"
diff --git a/src/bin/initdb/po/pl.po b/src/bin/initdb/po/pl.po
new file mode 100644
index 0000000000000..5fc8e36540102
--- /dev/null
+++ b/src/bin/initdb/po/pl.po
@@ -0,0 +1,887 @@
+# INITDB Translated Messages into the Polish Language
+# Copyright (c) 2005 toczek, xxxtoczekxxx@wp.pl
+# Distributed under the same licensing terms as PostgreSQL itself.
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: initdb (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:54+0000\n"
+"PO-Revision-Date: 2011-09-30 09:51-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: initdb.c:259 initdb.c:273
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: brak pamięci\n"
+
+#: initdb.c:382 initdb.c:1288
+#, 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:438 initdb.c:804 initdb.c:833
+#, 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:446 initdb.c:454 initdb.c:811 initdb.c:839
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: nie można zapisać pliku \"%s\": %s\n"
+
+#: initdb.c:473
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: nie można wykonać komendy \"%s\": %s\n"
+
+#: initdb.c:489
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: usuwanie katalogu danych \"%s\"\n"
+
+#: initdb.c:492
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: nie udało się usunięcie katalogu danych\n"
+
+#: initdb.c:498
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: usuwanie zawartości w katalogu danych \"%s\"\n"
+
+#: initdb.c:501
+#, 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:507
+#, c-format
+msgid "%s: removing transaction log directory \"%s\"\n"
+msgstr "%s: usuwanie katalogu dziennika transakcji \"%s\"\n"
+
+#: initdb.c:510
+#, 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:516
+#, c-format
+msgid "%s: removing contents of transaction log directory \"%s\"\n"
+msgstr "%s: usuwanie zawartości katalogu dziennika transakcji \"%s\"\n"
+
+#: initdb.c:519
+#, 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:528
+#, 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:533
+#, 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:555
+#, 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: nie można uruchomić jako root\n"
+"Proszę zalogować się (używając np: \"su\") na (nieuprzywilejowanego) "
+"użytkownika, który\n"
+"będzie właścicielem procesu.\n"
+
+#: initdb.c:567
+#, c-format
+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"
+
+#: initdb.c:584
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s: nie można otrzymać bieżącej nazwy użytkownika: %s\n"
+
+#: initdb.c:615
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" nie jest poprawnÄ… nazwÄ… kodowania\n"
+
+#: initdb.c:724 initdb.c:3117
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: nie można utworzyć katalogu \"%s\": %s\n"
+
+#: initdb.c:754
+#, c-format
+msgid "%s: file \"%s\" does not exist\n"
+msgstr "%s: plik \"%s\" nie istnieje\n"
+
+#: initdb.c:756 initdb.c:765 initdb.c:775
+#, c-format
+msgid ""
+"This might mean you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"Oznacza to iż posiadasz uszkodzoną instalację lub wskazałeś\n"
+"zły katalog przy użyciu opcji -L.\n"
+
+#: initdb.c:762
+#, 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:773
+#, c-format
+msgid "%s: file \"%s\" is not a regular file\n"
+msgstr "%s: plik \"%s\" nie jest zwykłym plikiem\n"
+
+#: initdb.c:881
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "wybieranie domyślnej wartości max_connections ... "
+
+#: initdb.c:910
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "wybieranie domyślnej wartości shared_buffers ... "
+
+#: initdb.c:953
+msgid "creating configuration files ... "
+msgstr "tworzenie plików konfiguracyjnych ... "
+
+#: initdb.c:1128
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "tworzenie bazy template1 w folderze %s/base/1 ... "
+
+#: initdb.c:1144
+#, 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: 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:1229
+msgid "initializing pg_authid ... "
+msgstr "inicjowanie pg_authid ... "
+
+#: initdb.c:1263
+msgid "Enter new superuser password: "
+msgstr "Podaj hasło superużytkownika: "
+
+#: initdb.c:1264
+msgid "Enter it again: "
+msgstr "Powtórz podane hasło: "
+
+#: initdb.c:1267
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "Podane hasła różnią się.\n"
+
+#: initdb.c:1294
+#, 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:1307
+#, c-format
+msgid "setting password ... "
+msgstr "ustawianie hasła ... "
+
+#: initdb.c:1407
+msgid "initializing dependencies ... "
+msgstr "inicjowanie powiązań ... "
+
+#: initdb.c:1435
+msgid "creating system views ... "
+msgstr "tworzenie widoków systemowych ... "
+
+#: initdb.c:1471
+msgid "loading system objects' descriptions ... "
+msgstr "wczytywanie opisów obiektów systemowych ... "
+
+#: initdb.c:1577
+msgid "creating collations ... "
+msgstr "tworzenie porównań ... "
+
+#: initdb.c:1610
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s: nazwa lokalizacji zbyt długa, pominięto: %s\n"
+
+#: initdb.c:1635
+#, 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:1698
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr ""
+"Nie znaleziono lokalizacji systemowej nadajÄ…cej siÄ™ do wykorzystania.\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Użyj opcji \"--debug\" by zobaczyć szczegóły.\n"
+
+#: initdb.c:1702
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "nieobsługiwane na tej platformie\n"
+
+#: initdb.c:1717
+msgid "creating conversions ... "
+msgstr "tworzenie konwersji ... "
+
+#: initdb.c:1752
+msgid "creating dictionaries ... "
+msgstr "tworzenie słowników ... "
+
+#: initdb.c:1806
+msgid "setting privileges on built-in objects ... "
+msgstr "ustawianie uprawnień dla wbudowanych obiektów ... "
+
+#: initdb.c:1864
+msgid "creating information schema ... "
+msgstr "tworzenie schematu informacyjnego ... "
+
+#: initdb.c:1920
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "pobieranie języka PL/pgSQL używanego po stronie serwera ... "
+
+#: initdb.c:1945
+msgid "vacuuming database template1 ... "
+msgstr "odkurzanie bazy template1 ... "
+
+#: initdb.c:2001
+msgid "copying template1 to template0 ... "
+msgstr "kopiowanie bazy template1 do bazy template0 ... "
+
+#: initdb.c:2033
+msgid "copying template1 to postgres ... "
+msgstr "kopiowanie bazy template1 do bazy postgres ... "
+
+#: initdb.c:2090
+#, c-format
+msgid "caught signal\n"
+msgstr "sygnał otrzymany\n"
+
+#: initdb.c:2096
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr "nie można zapisać do procesu potomnego: %s\n"
+
+#: initdb.c:2104
+#, c-format
+msgid "ok\n"
+msgstr "ok\n"
+
+#: initdb.c:2224
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: błędna nazwa lokalizacji \"%s\"\n"
+
+#: initdb.c:2250
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: niezgodność kodowania\n"
+
+#: initdb.c:2252
+#, 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 ""
+"Wybrane kodowanie (%s) i kodowanie używane przez\n"
+"lokalizację (%s) nie zgadzają się.  Może to prowadzić\n"
+"do błędów w wielu funkcjach przetwarzających ciągi znaków.\n"
+"Aby poprawić ten błąd uruchom ponownie %s i albo nie ustawiaj kodowania\n"
+"albo wybierz pasujÄ…cÄ… kombinacjÄ™.\n"
+
+#: initdb.c:2458
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s inicjuje klaster bazy danych PostgreSQL.\n"
+"\n"
+
+#: initdb.c:2459
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: initdb.c:2460
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [OPCJA]... [KATALOG-DOCELOWY]\n"
+
+#: initdb.c:2461
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opcje:\n"
+
+#: initdb.c:2462
+#, 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:2463
+#, c-format
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr " [-D, --pgdata=]KATALOG-DOCELOWY lokalizacja klastra bazy danych\n"
+
+#: initdb.c:2464
+#, 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:2465
+#, 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:2466
+#, 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"
+"                            ustawia domyślną lokalizację w odpowiedniej "
+"kategorii\n"
+"                            dla nowych baz danych (domyślnie pobierana ze "
+"środowiska)\n"
+
+#: initdb.c:2470
+#, c-format
+msgid "      --no-locale           equivalent to --locale=C\n"
+msgstr "      --no-locale           równoważna z opcją --locale=C\n"
+
+#: initdb.c:2471
+#, 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:2472
+#, c-format
+msgid ""
+"  -T, --text-search-config=CFG\n"
+"                            default text search configuration\n"
+msgstr ""
+"  -T, --text-search-config=CFG\n"
+"                            domyślna konfiguracja wyszukiwania tekstowego\n"
+
+#: initdb.c:2474
+#, c-format
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=NAZWA      superużytkownik bazy danych\n"
+
+#: initdb.c:2475
+#, 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:2476
+#, c-format
+msgid ""
+"  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
+msgstr ""
+"  -X, --xlogdir=XLOGDIR     umiejscowienie folderu dziennika transakcji\n"
+
+#: initdb.c:2477
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"Rzadziej używane opcje:\n"
+
+#: initdb.c:2478
+#, c-format
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               wyświetlanie informacji debugger'a\n"
+
+#: initdb.c:2479
+#, c-format
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L KATALOG                gdzie szukać plików wejściowych\n"
+
+#: initdb.c:2480
+#, 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:2481
+#, c-format
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                 pokaż wewnętrzne ustawienia\n"
+
+#: initdb.c:2482
+#, c-format
+msgid ""
+"\n"
+"Other options:\n"
+msgstr ""
+"\n"
+"Pozostałe opcje:\n"
+
+#: initdb.c:2483
+#, c-format
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                pokaż tą pomoc i zakończ działanie\n"
+
+#: initdb.c:2484
+#, c-format
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             pokaż informacje o wersji i zakończ\n"
+
+#: initdb.c:2485
+#, c-format
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Jeśli katalog nie jest wskazany wtedy używana jest zmienna PGDATA\n"
+"do określenia tegoż katalogu.\n"
+
+#: initdb.c:2487
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2593
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "Działanie w trybie debug.\n"
+
+#: initdb.c:2597
+#, 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:2640 initdb.c:2658 initdb.c:2940
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: initdb.c:2656
+#, 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:2665
+#, 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:2671
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
+"You can change this by editing pg_hba.conf or using the -A option the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"UWAGA: metoda autoryzacji ustawiona jako \"trust\" dla połączeń.\n"
+"Metodę autoryzacji możesz zmienić edytując plik pg_hba.conf\n"
+"lub używając opcji -A przy uruchomieniu initdb.\n"
+
+#: initdb.c:2694
+#, c-format
+msgid "%s: unrecognized authentication method \"%s\"\n"
+msgstr "%s: nierozpoznany sposób autoryzacji \"%s\"\n"
+
+#: initdb.c:2704
+#, 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:2733
+#, 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: 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"
+"zmiennej środowiskowej PGDATA.\n"
+
+#: initdb.c:2817
+#, 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 ""
+"Program \"postgres\" jest wymagany przez %s ale nie został znaleziony \n"
+"w tym samym folderze co \"%s\".\n"
+"Sprawdź instalację.\n"
+
+#: initdb.c:2824
+#, 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 ""
+"Program \"postgres\" został znaleziony przez \"%s\"\n"
+"ale nie jest w tej samej wersji co %s.\n"
+"Sprawdź instalację.\n"
+
+#: initdb.c:2843
+#, 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:2900
+#, 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 ""
+"Właścicielem plików należących do sytemu bazy danych będzie użytkownik \"%s"
+"\".\n"
+"Ten użytkownik musi jednocześnie być właścicielem procesu serwera.\n"
+"\n"
+
+#: initdb.c:2910
+#, 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:2913
+#, 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 ""
+"Klaster bazy danych zostanie utworzony z zestawem reguł językowych\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2937
+#, 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:2939
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "WÅ‚Ä…cz polecenie %s ponownie z opcjÄ… -E.\n"
+
+#: initdb.c:2952
+#, 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 ""
+"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:2960
+#, c-format
+msgid "%s: locale %s requires unsupported encoding %s\n"
+msgstr "%s: lokalizacja %s wymaga nie wspieranego kodowania %s\n"
+
+#: initdb.c:2963
+#, c-format
+msgid ""
+"Encoding %s is not allowed as a server-side encoding.\n"
+"Rerun %s with a different locale selection.\n"
+msgstr ""
+"Kodowanie %s jest niedozwolone jako kodowanie po stronie serwera.\n"
+"Uruchom ponownie %s z wybranÄ… innÄ… lokalizacjÄ….\n"
+
+#: initdb.c:2972
+#, 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:2989
+#, 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:3000
+#, 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:3005
+#, 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:3010
+#, 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:3044 initdb.c:3111
+#, c-format
+msgid "creating directory %s ... "
+msgstr "tworzenie katalogu %s ... "
+
+#: initdb.c:3058 initdb.c:3129
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "ustalanie uprawnień katalogu %s ... "
+
+#: initdb.c:3064 initdb.c:3135
+#, 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:3077 initdb.c:3148
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: folder \"%s\" nie jest pusty\n"
+
+#: initdb.c:3080
+#, 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"
+"katalog \"%s\" lub uruchom program %s\n"
+"z argumentem wskazującym katalog innym niż \"%s\".\n"
+
+#: initdb.c:3088 initdb.c:3158
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: brak dostępu do katalogu \"%s\": %s\n"
+
+#: initdb.c:3102
+#, 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:3151
+#, c-format
+msgid ""
+"If you want to store the transaction log there, either\n"
+"remove or empty the directory \"%s\".\n"
+msgstr ""
+"Jeśli chcesz tam przechowywać dziennik transakcji, albo\n"
+"usuń albo wyczyść zawartość folderu \"%s\".\n"
+
+#: initdb.c:3170
+#, 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:3175
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: linki symb. nie są obsługiwane na tej platformie"
+
+#: initdb.c:3181
+#, c-format
+msgid "creating subdirectories ... "
+msgstr "tworzenie podkatalogów ... "
+
+#: initdb.c:3247
+#, 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"
+
+#: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
+#, c-format
+msgid "out of memory\n"
+msgstr "brak pamięci\n"
+
+#: ../../port/dirmod.c:286
+#, 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:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "nie można pobrać złączenia dla \"%s\": %s\n"
+
+#: ../../port/dirmod.c:443
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "nie można otworzyć katalogu \"%s\": %s\n"
+
+#: ../../port/dirmod.c:480
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "nie można czytać katalogu \"%s\": %s\n"
+
+#: ../../port/dirmod.c:563
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr "nie można wykonać polecenia stat na pliku lub katalogu \"%s\": %s\n"
+
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "nie można usunąć pliku lub katalogu \"%s\": %s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nie można zidentyfikować aktualnego katalogu: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "niepoprawny binarny \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nie można odczytać binarnego \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nie znaleziono \"%s\" do wykonania"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nie można odczytać odwołania symbolicznego  \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "proces potomny zakończył działanie z kodem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "proces potomny został zatrzymany przez wyjątek 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "proces potomny został zatrzymany przez sygnał %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "proces potomny został zatrzymany przez sygnał %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
+
+#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr ""
+#~ "%s: Plik z hasłem nie został stworzony. Proszę zgłosić ten problem.\n"
+
+#~ msgid "enabling unlimited row size for system tables ... "
+#~ msgstr ""
+#~ "umożliwienie nieskończonego rozmiaru wiersza w tabeli systemowej ... "
+
+#~ msgid ""
+#~ "  --locale=LOCALE           initialize database cluster with given "
+#~ "locale\n"
+#~ msgstr ""
+#~ "  --locale=LOCALE\t\t\t przygotowanie klastra bazy danych z podanymi "
+#~ "regułami językowymi\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: nie można ustalić poprawnego skróconego opisu wersji\n"
+
+#~ msgid "creating directory %s/%s ... "
+#~ msgstr "tworzenie katalogu %s/%s ... "
diff --git a/src/bin/initdb/po/pt_BR.po b/src/bin/initdb/po/pt_BR.po
index e2bc1c49cc72e..ae32b970015ae 100644
--- a/src/bin/initdb/po/pt_BR.po
+++ b/src/bin/initdb/po/pt_BR.po
@@ -1,98 +1,99 @@
 # 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-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-05-08 21:46-0300\n"
+"POT-Creation-Date: 2011-09-06 04:53+0000\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"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: initdb.c:254 initdb.c:268
+#: initdb.c:259 initdb.c:273
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: initdb.c:377 initdb.c:1432
+#: initdb.c:382 initdb.c:1288
 #, 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:433 initdb.c:956 initdb.c:985
+#: initdb.c:438 initdb.c:804 initdb.c:833
 #, 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:441 initdb.c:449 initdb.c:963 initdb.c:991
+#: initdb.c:446 initdb.c:454 initdb.c:811 initdb.c:839
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: não pôde escrever arquivo \"%s\": %s\n"
 
-#: initdb.c:468
+#: initdb.c:473
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: não pôde executar comando \"%s\": %s\n"
 
-#: initdb.c:588
+#: initdb.c:489
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: removendo diretório de dados \"%s\"\n"
 
-#: initdb.c:591
+#: initdb.c:492
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: falhou ao remover diretório de dados\n"
 
-#: initdb.c:597
+#: initdb.c:498
 #, 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:600
+#: initdb.c:501
 #, 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:606
+#: initdb.c:507
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: removendo diretório do log de transação \"%s\"\n"
 
-#: initdb.c:609
+#: initdb.c:510
 #, 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:615
+#: initdb.c:516
 #, 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:618
+#: initdb.c:519
 #, 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:627
+#: initdb.c:528
 #, 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:632
+#: initdb.c:533
 #, 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:654
+#: initdb.c:555
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -104,32 +105,32 @@ msgstr ""
 "que será\n"
 "o dono do processo do servidor.\n"
 
-#: initdb.c:666
+#: initdb.c:567
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: não pôde obter informação sobre usuário atual: %s\n"
 
-#: initdb.c:683
+#: initdb.c:584
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: não pôde obter nome de usuário atual: %s\n"
 
-#: initdb.c:714
+#: initdb.c:615
 #, 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:876 initdb.c:3009
+#: initdb.c:724 initdb.c:3117
 #, 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:906
+#: initdb.c:754
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: arquivo \"%s\" não existe\n"
 
-#: initdb.c:908 initdb.c:917 initdb.c:927
+#: initdb.c:756 initdb.c:765 initdb.c:775
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -138,36 +139,36 @@ 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:914
+#: initdb.c:762
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: não pôde acessar arquivo \"%s\": %s\n"
 
-#: initdb.c:925
+#: initdb.c:773
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: arquivo \"%s\" não é um arquivo regular\n"
 
-#: initdb.c:1033
+#: initdb.c:881
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "selecionando max_connections padrão ... "
 
-#: initdb.c:1062
+#: initdb.c:910
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "selecionando shared_buffers padrão ... "
 
-#: initdb.c:1105
+#: initdb.c:953
 msgid "creating configuration files ... "
 msgstr "criando arquivos de configuração ... "
 
-#: initdb.c:1272
+#: initdb.c:1128
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "criando banco de dados template1 em %s/base/1 ... "
 
-#: initdb.c:1288
+#: initdb.c:1144
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -177,103 +178,133 @@ msgstr ""
 "Verifique sua instalação ou especifique o caminho correto utilizando a opção "
 "-L.\n"
 
-#: initdb.c:1373
+#: initdb.c:1229
 msgid "initializing pg_authid ... "
 msgstr "inicializando pg_authid ... "
 
-#: initdb.c:1407
+#: initdb.c:1263
 msgid "Enter new superuser password: "
 msgstr "Digite nova senha de super-usuário: "
 
-#: initdb.c:1408
+#: initdb.c:1264
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: initdb.c:1411
+#: initdb.c:1267
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Senhas não correspondem.\n"
 
-#: initdb.c:1438
+#: initdb.c:1294
 #, 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:1451
+#: initdb.c:1307
 #, c-format
 msgid "setting password ... "
 msgstr "definindo senha ... "
 
-#: initdb.c:1549
+#: initdb.c:1407
 msgid "initializing dependencies ... "
 msgstr "inicializando dependências ... "
 
-#: initdb.c:1577
+#: initdb.c:1435
 msgid "creating system views ... "
 msgstr "criando visões do sistema ... "
 
-#: initdb.c:1613
+#: initdb.c:1471
 msgid "loading system objects' descriptions ... "
 msgstr "carregando descrições de objetos do sistema ... "
 
-#: initdb.c:1665
+#: initdb.c:1577
+msgid "creating collations ... "
+msgstr "criando ordenações ... "
+
+#: initdb.c:1610
+#, 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:1635
+#, 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:1698
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "Nenhuma configuração regional do sistema utilizável foi encontrada.\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Utilize a opção \"--debug\" para obter detalhes.\n"
+
+#: initdb.c:1702
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "não é suportado nessa plataforma\n"
+
+#: initdb.c:1717
 msgid "creating conversions ... "
 msgstr "criando conversões ... "
 
-#: initdb.c:1700
+#: initdb.c:1752
 msgid "creating dictionaries ... "
 msgstr "criando dicionários ... "
 
-#: initdb.c:1754
+#: initdb.c:1806
 msgid "setting privileges on built-in objects ... "
 msgstr "definindo privilégios dos objetos embutidos ... "
 
-#: initdb.c:1812
+#: initdb.c:1864
 msgid "creating information schema ... "
 msgstr "criando esquema informação ... "
 
-#: initdb.c:1868
+#: initdb.c:1920
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "carregando linguagem PL/pgSQL ... "
 
-#: initdb.c:1893
+#: initdb.c:1945
 msgid "vacuuming database template1 ... "
 msgstr "limpando banco de dados template1 ... "
 
-#: initdb.c:1947
+#: initdb.c:2001
 msgid "copying template1 to template0 ... "
 msgstr "copiando template1 para template0 ... "
 
-#: initdb.c:1978
+#: initdb.c:2033
 msgid "copying template1 to postgres ... "
 msgstr "copiando template1 para postgres ... "
 
-#: initdb.c:2035
+#: initdb.c:2090
 #, c-format
 msgid "caught signal\n"
 msgstr "sinal foi recebido\n"
 
-#: initdb.c:2041
+#: initdb.c:2096
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "não pôde escrever em processo filho: %s\n"
 
-#: initdb.c:2049
+#: initdb.c:2104
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2169
+#: initdb.c:2224
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nome de configuração regional \"%s\" é inválido\n"
 
-#: initdb.c:2195
+#: initdb.c:2250
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: codificação não corresponde\n"
 
-#: initdb.c:2197
+#: initdb.c:2252
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -290,7 +321,7 @@ msgstr ""
 "Execute novamente o %s e não especifique uma codificação explicitamente\n"
 "ou escolha uma outra combinação.\n"
 
-#: initdb.c:2378
+#: initdb.c:2458
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -299,17 +330,17 @@ msgstr ""
 "%s inicializa um agrupamento de banco de dados PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2379
+#: initdb.c:2459
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: initdb.c:2380
+#: initdb.c:2460
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPÇÃO]... [DIRDADOS]\n"
 
-#: initdb.c:2381
+#: initdb.c:2461
 #, c-format
 msgid ""
 "\n"
@@ -318,7 +349,7 @@ msgstr ""
 "\n"
 "Opções:\n"
 
-#: initdb.c:2382
+#: initdb.c:2462
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -327,27 +358,27 @@ msgstr ""
 "  -A, --auth=MÉTODO            método de autenticação padrão para conexões "
 "locais\n"
 
-#: initdb.c:2383
+#: initdb.c:2463
 #, 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:2384
+#: initdb.c:2464
 #, 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:2385
+#: initdb.c:2465
 #, 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:2386
+#: initdb.c:2466
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -363,12 +394,12 @@ msgstr ""
 "                               para novos bancos de dados (o ambiente é "
 "assumido como padrão)\n"
 
-#: initdb.c:2390
+#: initdb.c:2470
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale              equivalente a --locale=C\n"
 
-#: initdb.c:2391
+#: initdb.c:2471
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
@@ -376,7 +407,7 @@ msgstr ""
 "      --pwfile=ARQUIVO         lê senha do novo super-usuário a partir do "
 "arquivo\n"
 
-#: initdb.c:2392
+#: initdb.c:2472
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -385,25 +416,25 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                               configuração de busca textual padrão\n"
 
-#: initdb.c:2394
+#: initdb.c:2474
 #, 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:2395
+#: initdb.c:2475
 #, 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:2396
+#: initdb.c:2476
 #, 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:2397
+#: initdb.c:2477
 #, c-format
 msgid ""
 "\n"
@@ -412,27 +443,27 @@ msgstr ""
 "\n"
 "Opções utilizadas com menos frequência:\n"
 
-#: initdb.c:2398
+#: initdb.c:2478
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug                  mostra saída da depuração\n"
 
-#: initdb.c:2399
+#: initdb.c:2479
 #, 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:2400
+#: initdb.c:2480
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean                não remove após erros\n"
 
-#: initdb.c:2401
+#: initdb.c:2481
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                   mostra definições internas\n"
 
-#: initdb.c:2402
+#: initdb.c:2482
 #, c-format
 msgid ""
 "\n"
@@ -441,18 +472,18 @@ msgstr ""
 "\n"
 "Outras opções:\n"
 
-#: initdb.c:2403
+#: initdb.c:2483
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                   mostra essa ajuda e termina\n"
 
-#: initdb.c:2404
+#: initdb.c:2484
 #, 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:2405
+#: initdb.c:2485
 #, c-format
 msgid ""
 "\n"
@@ -463,7 +494,7 @@ msgstr ""
 "Se o diretório de dados não for especificado, a variável de ambiente PGDATA\n"
 "é utilizada.\n"
 
-#: initdb.c:2407
+#: initdb.c:2487
 #, c-format
 msgid ""
 "\n"
@@ -472,34 +503,34 @@ msgstr ""
 "\n"
 "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2512
+#: initdb.c:2593
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Executando no modo de depuração.\n"
 
-#: initdb.c:2516
+#: initdb.c:2597
 #, 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:2559 initdb.c:2577 initdb.c:2845
+#: initdb.c:2640 initdb.c:2658 initdb.c:2940
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: initdb.c:2575
+#: initdb.c:2656
 #, 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:2584
+#: initdb.c:2665
 #, 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:2590
+#: initdb.c:2671
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -511,12 +542,12 @@ msgstr ""
 "Você pode mudá-lo editando o pg_hba.conf ou utilizando a opção -A na\n"
 "próxima vez que você executar o initdb.\n"
 
-#: initdb.c:2613
+#: initdb.c:2694
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: método de autenticação desconhecido \"%s\"\n"
 
-#: initdb.c:2623
+#: initdb.c:2704
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
@@ -524,7 +555,7 @@ msgstr ""
 "%s: você precisa especificar uma senha para o super-usuário para habilitar a "
 "autenticação %s\n"
 
-#: initdb.c:2638
+#: initdb.c:2733
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -538,7 +569,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:2722
+#: initdb.c:2817
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -549,7 +580,7 @@ msgstr ""
 "mesmo diretório que \"%s\".\n"
 "Verifique sua instalação.\n"
 
-#: initdb.c:2729
+#: initdb.c:2824
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -560,12 +591,12 @@ msgstr ""
 "mas não tem a mesma versão que %s.\n"
 "Verifique sua instalação.\n"
 
-#: initdb.c:2748
+#: initdb.c:2843
 #, 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:2805
+#: initdb.c:2900
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -576,14 +607,14 @@ msgstr ""
 "Esse usuário deve ser o dono do processo do servidor também.\n"
 "\n"
 
-#: initdb.c:2815
+#: initdb.c:2910
 #, 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"
+"O agrupamento de banco de dados será inicializado com configuração regional "
+"%s.\n"
 
-#: initdb.c:2818
+#: initdb.c:2913
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -603,24 +634,34 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2842
+#: initdb.c:2937
 #, 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:2844
+#: initdb.c:2939
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Execute novamente %s com a opção -E.\n"
 
-#: initdb.c:2853
+#: initdb.c:2952
+#, 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 ""
+"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:2960
 #, 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:2856
+#: initdb.c:2963
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -629,19 +670,19 @@ 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:2864
+#: initdb.c:2972
 #, 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:2881
+#: initdb.c:2989
 #, 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:2892
+#: initdb.c:3000
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale %s is unknown\n"
@@ -649,7 +690,7 @@ msgstr ""
 "%s: aviso: configuração de busca textual ideal para configuração regional %s "
 "é desconhecida\n"
 
-#: initdb.c:2897
+#: initdb.c:3005
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
@@ -658,32 +699,32 @@ msgstr ""
 "%s: aviso: configuração de busca textual especificada \"%s\" pode não "
 "corresponder a configuração regional %s\n"
 
-#: initdb.c:2902
+#: initdb.c:3010
 #, 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:2936 initdb.c:3003
+#: initdb.c:3044 initdb.c:3111
 #, c-format
 msgid "creating directory %s ... "
 msgstr "criando diretório %s ... "
 
-#: initdb.c:2950 initdb.c:3020
+#: initdb.c:3058 initdb.c:3129
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "alterando permissões no diretório existente %s ... "
 
-#: initdb.c:2956 initdb.c:3026
+#: initdb.c:3064 initdb.c:3135
 #, 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:2969 initdb.c:3038
+#: initdb.c:3077 initdb.c:3148
 #, 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:2972
+#: initdb.c:3080
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -694,17 +735,17 @@ msgstr ""
 "o diretório \"%s\" ou execute %s\n"
 "com um argumento ao invés de \"%s\".\n"
 
-#: initdb.c:2980 initdb.c:3048
+#: initdb.c:3088 initdb.c:3158
 #, 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:2994
+#: initdb.c:3102
 #, 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:3041
+#: initdb.c:3151
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -713,22 +754,22 @@ msgstr ""
 "Se você quer armazenar o log de transação no mesmo, \n"
 "remova ou esvazie o diretório \"%s\".\n"
 
-#: initdb.c:3060
+#: initdb.c:3170
 #, 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:3065
+#: initdb.c:3175
 #, 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:3071
+#: initdb.c:3181
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "criando subdiretórios ... "
 
-#: initdb.c:3135
+#: initdb.c:3247
 #, c-format
 msgid ""
 "\n"
@@ -757,22 +798,27 @@ msgstr "sem memória\n"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "não pôde definir junção para \"%s\": %s\n"
 
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "não pôde obter junção para \"%s\": %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "não pôde abrir diretório \"%s\": %s\n"
 
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "não pôde ler diretório \"%s\": %s\n"
 
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "não pôde executar stat no arquivo ou  diretório \"%s\": %s\n"
 
-#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "não pôde remover arquivo ou  diretório \"%s\": %s\n"
@@ -807,27 +853,27 @@ msgstr "não pôde mudar diretório para \"%s\""
 msgid "could not read symbolic link \"%s\""
 msgstr "não pôde ler link simbólico \"%s\""
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "processo filho terminou com código de saída %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "processo filho foi terminado pela exceção 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "processo filho foi terminado pelo sinal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "processo filho foi terminado pelo sinal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
diff --git a/src/bin/initdb/po/ro.po b/src/bin/initdb/po/ro.po
index 53fff76003aef..5230edf2a4da6 100644
--- a/src/bin/initdb/po/ro.po
+++ b/src/bin/initdb/po/ro.po
@@ -5,100 +5,102 @@ msgid ""
 msgstr ""
 "Project-Id-Version: initdb-ro\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-02 17:59+0000\n"
-"PO-Revision-Date: 2010-09-27 22:01-0000\n"
-"Last-Translator: Max <max@oceanline.co.uk>\n"
-"Language-Team: Română <max@oceanline.ro>\n"
+"POT-Creation-Date: 2011-11-09 20:41+0000\n"
+"PO-Revision-Date: 2011-11-22 11:44-0000\n"
+"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
+"Language-Team: Română <xsoftware.consultancy@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
 
-#: initdb.c:254
-#: initdb.c:268
+#: initdb.c:259
+#: initdb.c:273
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memorie insuficientă\n"
 
-#: initdb.c:377
-#: initdb.c:1432
+#: initdb.c:382
+#: initdb.c:1288
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: imposibil de deschis fiÅŸierul \"%s\" pentru citire: %s\n"
 
-#: initdb.c:433
-#: initdb.c:956
-#: initdb.c:985
+#: initdb.c:438
+#: initdb.c:804
+#: initdb.c:833
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: imposibil de deschis fiÅŸierul \"%s\" pentru scriere: %s\n"
 
-#: initdb.c:441
-#: initdb.c:449
-#: initdb.c:963
-#: initdb.c:991
+#: initdb.c:446
+#: initdb.c:454
+#: initdb.c:811
+#: initdb.c:839
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: imposibil de scris fiÅŸierul \"%s\": %s\n"
 
-#: initdb.c:468
+#: initdb.c:473
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: imposibil de executat comanda\"%s\": %s\n"
 
-#: initdb.c:588
+#: initdb.c:489
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: eliminare director de date \"%s\"\n"
 
-#: initdb.c:591
+#: initdb.c:492
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: eliminare director de date eşuată\n"
 
-#: initdb.c:597
+#: initdb.c:498
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: eliminare conţinut al directorului de date \"%s\"\n"
 
-#: initdb.c:600
+#: initdb.c:501
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: eliminare conţinut al directorului de date eşuată\n"
 
-#: initdb.c:606
+#: initdb.c:507
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: eliminare directorul jurnal de tranzacţii \"%s\"\n"
 
-#: initdb.c:609
+#: initdb.c:510
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: eliminarea directorului fișierului jurnal de tranzacții  a eșuat\n"
 
-#: initdb.c:615
+#: initdb.c:516
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: eliminare conţinut al directorului jurnal de tranzacții \"%s\"\n"
 
-#: initdb.c:618
+#: initdb.c:519
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: eliminarea conţinutului directorului jurnal de tranzacți a eşuat\n"
 
-#: initdb.c:627
+#: initdb.c:528
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: directorul de date \"%s\" nu a fost eliminat la solicitarea utilizatorului\n"
 
-#: initdb.c:632
+#: initdb.c:533
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: directorul jurnal de tranzacții \"%s\" nu a fost eliminat la solicitarea utilizatorului\n"
 
-#: initdb.c:654
+#: initdb.c:555
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -109,35 +111,35 @@ msgstr ""
 "Autentificaţi-vă (folosind, de exempu, \"su\") ca utilizatorul (neprivilegiat)\n"
 "care va deţine procesul server.\n"
 
-#: initdb.c:666
+#: initdb.c:567
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: imposibil de obţinut informaţii despre utilizatorul curent: %s\n"
 
-#: initdb.c:683
+#: initdb.c:584
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: imposibil de obţinut numele utilizatorului curent: %s\n"
 
-#: initdb.c:714
+#: initdb.c:615
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" nu este un nume valid de codificare pentru server\n"
 
-#: initdb.c:876
-#: initdb.c:3009
+#: initdb.c:724
+#: initdb.c:3117
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: imposibil de creat directorul \"%s\": %s\n"
 
-#: initdb.c:906
+#: initdb.c:754
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: fişierul \"%s\" nu există\n"
 
-#: initdb.c:908
-#: initdb.c:917
-#: initdb.c:927
+#: initdb.c:756
+#: initdb.c:765
+#: initdb.c:775
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -146,36 +148,36 @@ msgstr ""
 "Acest lucru înseamnă că aveţi o instalare coruptă sau că aţi specificat\n"
 "un director greşit pentru opţiunea -L.\n"
 
-#: initdb.c:914
+#: initdb.c:762
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: imposibil de accesat fiÅŸierul \"%s\": %s\n"
 
-#: initdb.c:925
+#: initdb.c:773
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: fişierul \"%s\" nu este un fișier obișnuit\n"
 
-#: initdb.c:1033
+#: initdb.c:881
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "selectare valoare implicită pentru max_connections ... "
 
-#: initdb.c:1062
+#: initdb.c:910
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "selectare valoare implicită pentru shared_buffers ... "
 
-#: initdb.c:1105
+#: initdb.c:953
 msgid "creating configuration files ... "
 msgstr "creare fiÅŸiere de configurare ... "
 
-#: initdb.c:1272
+#: initdb.c:1128
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "creare bază de date template1 în %s/base/1 ... "
 
-#: initdb.c:1288
+#: initdb.c:1144
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -184,103 +186,132 @@ msgstr ""
 "%s: fişierul de intrare \"%s\" nu aparţine de PostgreSQL %s\n"
 "Verificaţi instalarea sau specificaţi calea corectă folosind opţiunea -L.\n"
 
-#: initdb.c:1373
+#: initdb.c:1229
 msgid "initializing pg_authid ... "
 msgstr "iniţializare pg_authid ... "
 
-#: initdb.c:1407
+#: initdb.c:1263
 msgid "Enter new superuser password: "
 msgstr "Introduceţi noua parolă pentru utilizatorul privilegiat: "
 
-#: initdb.c:1408
+#: initdb.c:1264
 msgid "Enter it again: "
 msgstr "Introduceţi din nou: "
 
-#: initdb.c:1411
+#: initdb.c:1267
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Parola nu se verifică\n"
 
-#: initdb.c:1438
+#: initdb.c:1294
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: imposibil de citit parola din fiÅŸierul \"%s\": %s\n"
 
-#: initdb.c:1451
+#: initdb.c:1307
 #, c-format
 msgid "setting password ... "
 msgstr "setare parolă ... "
 
-#: initdb.c:1549
+#: initdb.c:1407
 msgid "initializing dependencies ... "
 msgstr "iniţializare dependinţe ... "
 
-#: initdb.c:1577
+#: initdb.c:1435
 msgid "creating system views ... "
 msgstr "creare vizualizări sistem ... "
 
-#: initdb.c:1613
+#: initdb.c:1471
 msgid "loading system objects' descriptions ... "
 msgstr "încărcare descrieri obiecte sistem ... "
 
-#: initdb.c:1665
+#: initdb.c:1577
+msgid "creating collations ... "
+msgstr "creare colaţionări ... "
+
+#: initdb.c:1610
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s: numele localizării e prea lung, omis: %s\n"
+
+#: initdb.c:1635
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s: numele localizării are caractere non-ASCII, sunt omise: %s\n"
+
+#: initdb.c:1698
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "Nu au fost găsite localizări sistem care să poată fi folosite.\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Folosiţi opţiunea  \"--debug\" pentru a vedea detalii.\n"
+
+#: initdb.c:1702
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "nu este suportat pe această platformă\n"
+
+#: initdb.c:1717
 msgid "creating conversions ... "
 msgstr "creare conversii ... "
 
-#: initdb.c:1700
+#: initdb.c:1752
 msgid "creating dictionaries ... "
 msgstr "creare dicționare ... "
 
-#: initdb.c:1754
+#: initdb.c:1806
 msgid "setting privileges on built-in objects ... "
 msgstr "setare privilegii pentru obiectele predefinite ... "
 
-#: initdb.c:1812
+#: initdb.c:1864
 msgid "creating information schema ... "
 msgstr "creare schemă de informaţii ... "
 
-#: initdb.c:1868
+#: initdb.c:1920
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "încărcând limbajul server PL/pgSQL ... "
 
-#: initdb.c:1893
+#: initdb.c:1945
 msgid "vacuuming database template1 ... "
 msgstr "vidare bază de date template1 ... "
 
-#: initdb.c:1947
+#: initdb.c:2001
 msgid "copying template1 to template0 ... "
 msgstr "copiere template1 în template0 ... "
 
-#: initdb.c:1978
+#: initdb.c:2033
 msgid "copying template1 to postgres ... "
 msgstr "copiere template1 în postgres ... "
 
-#: initdb.c:2035
+#: initdb.c:2090
 #, c-format
 msgid "caught signal\n"
 msgstr "interceptare semnal\n"
 
-#: initdb.c:2041
+#: initdb.c:2096
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "imposibil de scris în procesul fiu: %s\n"
 
-#: initdb.c:2049
+#: initdb.c:2104
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2169
+#: initdb.c:2224
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nume de localizare incorect \"%s\"\n"
 
-#: initdb.c:2195
+#: initdb.c:2250
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: nepotrivire de codificare\n"
 
-#: initdb.c:2197
+#: initdb.c:2252
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -295,7 +326,7 @@ msgstr ""
 "rulaţi %s din nou şi fie nu specificaţi nici o codificare, fie selectaţi\n"
 "o combinaţie potrivită.\n"
 
-#: initdb.c:2378
+#: initdb.c:2458
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -304,17 +335,17 @@ msgstr ""
 "%s iniţializează un grup de baze de date PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2379
+#: initdb.c:2459
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizare:\n"
 
-#: initdb.c:2380
+#: initdb.c:2460
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPÅ¢IUNE]... [DIRDATE]\n"
 
-#: initdb.c:2381
+#: initdb.c:2461
 #, c-format
 msgid ""
 "\n"
@@ -323,27 +354,27 @@ msgstr ""
 "\n"
 "Opţiuni:\n"
 
-#: initdb.c:2382
+#: initdb.c:2462
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=METODĂ         metoda de autentificare implicită pentru conexiunile locale\n"
 
-#: initdb.c:2383
+#: initdb.c:2463
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DIRDATE     locaţia pentru acest grup de baze de date\n"
 
-#: initdb.c:2384
+#: initdb.c:2464
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=CODIFICARE setează codificarea implicită pentru bazele de date noi\n"
 
-#: initdb.c:2385
+#: initdb.c:2465
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "    --locale=CODIFICARE setează codificarea implicită pentru bazele de date noi\n"
 
-#: initdb.c:2386
+#: initdb.c:2466
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -356,17 +387,17 @@ msgstr ""
 "                            setează localizarea pentru bazele de date noi\n"
 "                            în categoria predefinită (implicit, luată din mediu)\n"
 
-#: initdb.c:2390
+#: initdb.c:2470
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale          echivalent cu --locale=C\n"
 
-#: initdb.c:2391
+#: initdb.c:2471
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=FIȘIER         citire parolă pentru noul utilizator privilegiat din fişier\n"
 
-#: initdb.c:2392
+#: initdb.c:2472
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -375,22 +406,22 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                           configurarea prestabilită pentru căutare text\n"
 
-#: initdb.c:2394
+#: initdb.c:2474
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NUME       nume utilizator privilegiat pentru baza de date\n"
 
-#: initdb.c:2395
+#: initdb.c:2475
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            solicitare parolă pentru noul utilizator privilegiat\n"
 
-#: initdb.c:2396
+#: initdb.c:2476
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=XLOGDIR     locația directorului jurnal de tranzacții\n"
 
-#: initdb.c:2397
+#: initdb.c:2477
 #, c-format
 msgid ""
 "\n"
@@ -399,27 +430,27 @@ msgstr ""
 "\n"
 "Opţiuni mai puţin folosite:\n"
 
-#: initdb.c:2398
+#: initdb.c:2478
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               generează mesaje pentru depanare\n"
 
-#: initdb.c:2399
+#: initdb.c:2479
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTOR               locaţia fişierele de intrare\n"
 
-#: initdb.c:2400
+#: initdb.c:2480
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             nu se face curat după erori\n"
 
-#: initdb.c:2401
+#: initdb.c:2481
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                afişează setările interne\n"
 
-#: initdb.c:2402
+#: initdb.c:2482
 #, c-format
 msgid ""
 "\n"
@@ -428,17 +459,17 @@ msgstr ""
 "\n"
 "Alte opţiuni:\n"
 
-#: initdb.c:2403
+#: initdb.c:2483
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                afişează acest mesaj de ajutor, apoi iese\n"
 
-#: initdb.c:2404
+#: initdb.c:2484
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             afişează informaţiile despre versiune, apoi iese\n"
 
-#: initdb.c:2405
+#: initdb.c:2485
 #, c-format
 msgid ""
 "\n"
@@ -448,7 +479,7 @@ msgstr ""
 "\n"
 "Dacă nu este specificat directorul de date, este folosită variabila de mediu PGDATA.\n"
 
-#: initdb.c:2407
+#: initdb.c:2487
 #, c-format
 msgid ""
 "\n"
@@ -457,34 +488,34 @@ msgstr ""
 "\n"
 "Raportaţi erorile la <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2512
+#: initdb.c:2593
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Rulare în mod depanare.\n"
 
-#: initdb.c:2516
+#: initdb.c:2597
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Rulare în mod \"noclean\".  Greşelile nu vor fi corectate.\n"
 
-#: initdb.c:2559
-#: initdb.c:2577
-#: initdb.c:2845
+#: initdb.c:2640
+#: initdb.c:2658
+#: initdb.c:2940
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Încercaţi \"%s --help\" pentru mai multe informaţii.\n"
 
-#: initdb.c:2575
+#: initdb.c:2656
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: prea multe argumente în linia de comandă (primul este \"%s\")\n"
 
-#: initdb.c:2584
+#: initdb.c:2665
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: solicitarea parolei şi fişierul de parole nu pot fi specificate împreună\n"
 
-#: initdb.c:2590
+#: initdb.c:2671
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -496,17 +527,17 @@ msgstr ""
 "Puteţi modifica acest lucru editând pg_hba.conf sau folosind opţiunea -A\n"
 "la următoarea rulare a initdb.\n"
 
-#: initdb.c:2613
+#: initdb.c:2694
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: metodă de autentificare nerecunoscută \"%s\"\n"
 
-#: initdb.c:2623
+#: initdb.c:2704
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: trebuie să specificaţi o parolă pentru utilizatorul privilegiat pentru a activa autentificarea %s\n"
 
-#: initdb.c:2638
+#: initdb.c:2733
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -519,7 +550,7 @@ msgstr ""
 "de baze de date.  Puteţi face acest lucru folosind opţiunea -D sau\n"
 "variabila de mediu PGDATA.\n"
 
-#: initdb.c:2722
+#: initdb.c:2817
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -530,7 +561,7 @@ msgstr ""
 "în acelaşi director cu \"%s\".\n"
 "Verificaţi instalarea.\n"
 
-#: initdb.c:2729
+#: initdb.c:2824
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -541,12 +572,12 @@ msgstr ""
 "dar nu are aceeaÅŸi versiune ca %s.\n"
 "Verificaţi instalarea.\n"
 
-#: initdb.c:2748
+#: initdb.c:2843
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: locaţia fişierului de intrare trebuie să fie o cale absolută\n"
 
-#: initdb.c:2805
+#: initdb.c:2900
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -557,12 +588,12 @@ msgstr ""
 "Acest utilizator trebuie să deţină şi procesul serverului.\n"
 "\n"
 
-#: initdb.c:2815
+#: initdb.c:2910
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "Grupul de baze de date va fi iniţializat cu localizarea %s.\n"
 
-#: initdb.c:2818
+#: initdb.c:2913
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -581,22 +612,31 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2842
+#: initdb.c:2937
 #, c-format
 msgid "%s: could not find suitable encoding for locale %s\n"
 msgstr "%s: imposibil de găsit o codificare potrivită pentru localizarea %s\n"
 
-#: initdb.c:2844
+#: initdb.c:2939
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Re-rulaţi %s cu opţiunea -E.\n"
 
-#: initdb.c:2853
+#: initdb.c:2952
+#, 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 ""
+"Codificarea %s nu este permisă ca și codificare server.\n"
+"În locul acesteia baza de date va avea codificarea prestabilită %s.\n"
+
+#: initdb.c:2960
 #, c-format
 msgid "%s: locale %s requires unsupported encoding %s\n"
 msgstr "%s: localizarea %s necesită codificarea nesuportată %s\n"
 
-#: initdb.c:2856
+#: initdb.c:2963
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -605,56 +645,56 @@ msgstr ""
 "Codificarea %s nu este permisă ca și codificare server.\n"
 "Rulați din nou %s după ce selectați o localizare diferită.\n"
 
-#: initdb.c:2864
+#: initdb.c:2972
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "Codificarea implicită a bazei de date a fost setată în mod corespunzător la %s.\n"
 
-#: initdb.c:2881
+#: initdb.c:2989
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale %s\n"
 msgstr "%s: imposibil de găsit configurarea potrivită pentru căutare text pentru localizarea %s\n"
 
-#: initdb.c:2892
+#: initdb.c:3000
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale %s is unknown\n"
 msgstr "%s: atenție: configurarea potrivită pentru căutare text pentru localizarea %s nu este cunoscută\n"
 
-#: initdb.c:2897
+#: initdb.c:3005
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale %s\n"
 msgstr "%s: atenție: configurarea specificată pentru căutare text \"%s\" posibil să nu se potrivească cu localizarea %s\n"
 
-#: initdb.c:2902
+#: initdb.c:3010
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Configurarrea implicită pentru căutare text va fi stabilită la \"%s\".\n"
 
-#: initdb.c:2936
-#: initdb.c:3003
+#: initdb.c:3044
+#: initdb.c:3111
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creare director %s ... "
 
-#: initdb.c:2950
-#: initdb.c:3020
+#: initdb.c:3058
+#: initdb.c:3129
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "stabilire permisiuni pentru directorul existent %s ... "
 
-#: initdb.c:2956
-#: initdb.c:3026
+#: initdb.c:3064
+#: initdb.c:3135
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: imposibil de schimbat drepturile de acces pentru directorul \"%s\": %s\n"
 
-#: initdb.c:2969
-#: initdb.c:3038
+#: initdb.c:3077
+#: initdb.c:3148
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: directorul \"%s\" există dar nu este gol\n"
 
-#: initdb.c:2972
+#: initdb.c:3080
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -665,18 +705,18 @@ msgstr ""
 "directorul \"%s\" sau rulaţi %s\n"
 "cu alt argument decât \"%s\".\n"
 
-#: initdb.c:2980
-#: initdb.c:3048
+#: initdb.c:3088
+#: initdb.c:3158
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: imposibil de accesat directorul \"%s\": %s\n"
 
-#: initdb.c:2994
+#: initdb.c:3102
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: locaţia fişierului log de tranzacții trebuie să fie o cale absolută\n"
 
-#: initdb.c:3041
+#: initdb.c:3151
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -685,22 +725,22 @@ msgstr ""
 "Dacă doriți să stocați fișierul jurnal de tranzacții aici, fie\n"
 "ștergeți sau goliți directorul \"%s\".\n"
 
-#: initdb.c:3060
+#: initdb.c:3170
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: nu poate crea legătura simbolică \"%s\": %s\n"
 
-#: initdb.c:3065
+#: initdb.c:3175
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: symlink nu sunt suportate pe această platformă"
 
-#: initdb.c:3071
+#: initdb.c:3181
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creare subdirectoare ..."
 
-#: initdb.c:3135
+#: initdb.c:3247
 #, c-format
 msgid ""
 "\n"
@@ -731,23 +771,28 @@ msgstr "memorie insuficientă\n"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "imposibil de stabilit joncțiunea pentru \"%s\": %s\n"
 
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "imposibil de obţinut joncțiunea pentru \"%s\": %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "imposibil de deschis directorul \"%s\": %s\n"
 
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "imposibil de citit directorul \"%s\": %s\n"
 
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "imposibil de stabilit directorul \"%s\": %s\n"
 
-#: ../../port/dirmod.c:472
-#: ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590
+#: ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "imposibil de eliminat directorul \"%s\": %s\n"
@@ -785,27 +830,27 @@ msgstr "imposibil de schimbat directorul în \"%s\""
 msgid "could not read symbolic link \"%s\""
 msgstr "imposibil de citit legătura simbolică \"%s\""
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "procesul fiu a ieÅŸit cu codul %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "procesul fiu a fost terminat cu excepția 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "procesul fiu a fost terminat cu semnalul %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "procesul fiu a fost terminat cu semnalul %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "procesul fiu a ieşit cu starea nerecunoscută %d"
diff --git a/src/bin/initdb/po/ta.po b/src/bin/initdb/po/ta.po
deleted file mode 100644
index 5b4e50f1e8dce..0000000000000
--- a/src/bin/initdb/po/ta.po
+++ /dev/null
@@ -1,782 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Postgres Tamil Translation\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-21 09:15-0300\n"
-"PO-Revision-Date: 2007-09-25 20:54+0530\n"
-"Last-Translator: ஆமாச�ச� <amachu@ubuntu.com>\n"
-"Language-Team: Ubuntu Tamil Team <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Tamil\n"
-"X-Poedit-Country: INDIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: initdb.c:264
-#: initdb.c:278
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: நினைவில� இல�லை\n"
-
-#: initdb.c:387
-#: initdb.c:1666
-#, c-format
-msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: \"%s\" கோப�பினை வாசிக�க�ம� பொர�ட�ட�த� திறக�க இயலவில�லை: %s\n"
-
-#: initdb.c:449
-#: initdb.c:1184
-#: initdb.c:1213
-#, c-format
-msgid "%s: could not open file \"%s\" for writing: %s\n"
-msgstr "%s: \"%s\" கோப�பினை இயற�ற�ம� பொர�ட�ட� திறக�க இயலவில�லை: %s\n"
-
-#: initdb.c:457
-#: initdb.c:465
-#: initdb.c:1191
-#: initdb.c:1219
-#, c-format
-msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: கோப�பினை  இயற�ற இயலவில�லை \"%s\": %s\n"
-
-#: initdb.c:484
-#, c-format
-msgid "%s: could not execute command \"%s\": %s\n"
-msgstr "%s: ஆணையை நிறைவேற�ற இயலவில�லை \"%s\": %s\n"
-
-#: initdb.c:604
-#, c-format
-msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s: தரவின� அடைவ� அகற�றப� பட�கின�றத� \"%s\"\n"
-
-#: initdb.c:607
-#, c-format
-msgid "%s: failed to remove data directory\n"
-msgstr "%s: தரவின� அடைவினை அகற�ற இயவில�லை\n"
-
-#: initdb.c:613
-#, c-format
-msgid "%s: removing contents of data directory \"%s\"\n"
-msgstr "%s: தரவ� அடைவில� இர�ப�பவை அகற�றப�பட�கின�றன \"%s\"\n"
-
-#: initdb.c:616
-#, c-format
-msgid "%s: failed to remove contents of data directory\n"
-msgstr "%s: தரவ� அடைவில� இர�ப�பனவற�றை  அகற�ற இயலவில�லை\n"
-
-#: initdb.c:622
-#, c-format
-msgid "%s: removing transaction log directory \"%s\"\n"
-msgstr "%s: பரிமாற�றப� பதிவ� அடைவ� அகற�றப� பட�கின�றத� \"%s\"\n"
-
-#: initdb.c:625
-#, c-format
-msgid "%s: failed to remove transaction log directory\n"
-msgstr "%s: பரிமாற�றப� பதிவ� அடைவினை அகற�ற இயலவில�லை\n"
-
-#: initdb.c:631
-#, c-format
-msgid "%s: removing contents of transaction log directory \"%s\"\n"
-msgstr "%s: பரிமாற�றப� பதிவ� அடைவின� இர�ப�ப�க�கள� அகற�றப� பட�கின�றன \"%s\"\n"
-
-#: initdb.c:634
-#, c-format
-msgid "%s: failed to remove contents of transaction log directory\n"
-msgstr "%s: பரிமாற�றப� பதிவ� அடைவின� இர�ப�ப�க�களை அகற�ற இயலவில�லை\n"
-
-#: initdb.c:643
-#, c-format
-msgid "%s: data directory \"%s\" not removed at user's request\n"
-msgstr "%s: பயனரின� கோரிக�கைக�க� இணங�க தரவ� அடைவ� \"%s\" அகற�றப� படவில�லை\n"
-
-#: initdb.c:648
-#, c-format
-msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
-msgstr "%s: பயனரின� கோரிக�கைக�க� இணங�க பரிமாற�றப� பதிவ� அடைவ� \"%s\" அகற�றப� படவில�லை\n"
-
-#: initdb.c:672
-#, 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: மூலவராக இயக�க இயலாத�\n"
-" வழங�கியின� பணிகள�க�க� உரிமைய�ள�ள \n"
-" பயனராக (சல�கையற�ற) ந�ழையவ�ம� (உ.ம�., \"su\" பயன�பட�த�த�வத�).\n"
-
-#: initdb.c:718
-#, c-format
-msgid "%s: \"%s\" is not a valid server encoding name\n"
-msgstr "%s: \"%s:\" வழங�கியின� என�கோடிங� பெயர� செல�லாதத�\n"
-
-#: initdb.c:878
-#, c-format
-msgid "%s: warning: encoding mismatch\n"
-msgstr "%s: எச�சரிக�கை: என�கோடிங� ம�ரண�பட�கிறத�\n"
-
-#: initdb.c:880
-#, c-format
-msgid ""
-"The encoding you selected (%s) and the encoding that the selected\n"
-"locale uses (%s) are not known to match.  This might lead to\n"
-"misbehavior in various character string processing functions.  To fix\n"
-"this situation, rerun %s and either do not specify an encoding\n"
-"explicitly, or choose a matching combination.\n"
-msgstr ""
-"தாங�கள� தேர�வ� செய�த என�கோடிங� வகைய�ம� (%s) தேர�வ� செய�யப� பட�ட \n"
-"அகத�தின� என�கோடிங� வகைய�ம� (%s) பொர�ந�தவில�லை. இத�\n"
-" சரங�களின� மீத� பணிப�ரிய�ம� செயற�பாட�களை பாதிக�க�ம�. இதனைக�\n"
-" களைய, %sனை என�கோடிங�  வகையைக� கொட�க�காதவாறோ\n"
-"அல�லத� பொர�ந�தக� கூடிய ஒன�றைக� கொட�த�தோ  மீள இயக�கவ�ம�.\n"
-
-#: initdb.c:1109
-#: initdb.c:3144
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: அடைவினை உர�வாக�க இயலவில�லை \"%s\":%s\n"
-
-#: initdb.c:1138
-#, c-format
-msgid ""
-"%s: file \"%s\" does not exist\n"
-"This means you have a corrupted installation or identified\n"
-"the wrong directory with the invocation option -L.\n"
-msgstr ""
-"%s: \"%s\" கோப�ப� இல�லை\n"
-" அதாவத� தாங�கள� பழ�தடைந�த நிற�வலை கொண�டிர�க�கிறீர�கள� அல�லத�\n"
-" த�வக�கத� தேர�வ� -L ஆக உள�ள தவறான அடைவினை இனங�கண�ட�ள�ளீர�கள�. \n"
-
-#: initdb.c:1144
-#, c-format
-msgid ""
-"%s: could not access file \"%s\": %s\n"
-"This might mean you have a corrupted installation or identified\n"
-"the wrong directory with the invocation option -L.\n"
-msgstr ""
-"%s: \"%s\": %s கோப�பினை அண�க இயலவில�லை\n"
-" தாங�கள� பழ�தடைந�த நிற�வலை கொண�டிர�க�கவேண�ட�ம� அல�லத�\n"
-"  த�வக�கத� தேர�வ� -L ஆக உள�ள தவறான அடைவினை இனங�கண�டிர�க�க வேண�ட�ம�.\n"
-
-#: initdb.c:1153
-#, c-format
-msgid ""
-"%s: file \"%s\" is not a regular file\n"
-"This means you have a corrupted installation or identified\n"
-"the wrong directory with the invocation option -L.\n"
-msgstr ""
-"%s: \"%s\" கோப�ப� வழக�கதில� உள�ளத� அல�ல.  தாங�கள� பழ�தடைந�த நிற�வலை கொண�டிர�க�கவேண�ட�ம� அல�லத�\n"
-"  த�வக�கத� தேர�வ� -L ஆக உள�ள தவறான அடைவினை இனங�கண�டிர�க�க வேண�ட�ம�.\n"
-
-#: initdb.c:1265
-#, c-format
-msgid "selecting default max_connections ... "
-msgstr "இயல�பிர�ப�பாக இர�க�க வேண�டிய max_connections தேர�வ� செய�யப� பட�கின�றத� ..."
-
-#: initdb.c:1296
-#, c-format
-msgid "selecting default shared_buffers/max_fsm_pages ... "
-msgstr "இயல�பிர�ப�ப� shared_buffers/max_fsm_pages தேர�வ� செய�யப� பட�கின�றத� ..."
-
-#: initdb.c:1342
-msgid "creating configuration files ... "
-msgstr "வடிவமைப�ப�க� கோப�ப�கள� உர�வாக�கப� பட�கின�றன ..."
-
-#: initdb.c:1511
-#, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "%s/base/1 ல� வார�ப�ப�1  தரவ�க� களன� உர�வாக�கப� பட�கிறத� ..."
-
-#: initdb.c:1527
-#, 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\" உள�ளீட�ட�க� கோப�ப� போஸ�ட�கிரெஸ�க�க� சொந�தமானத� அல�ல %s\n"
-" தங�கள� நிற�வலை  சரி பார�க�கவ�ம� அல�லத� -L தேர�வினைப� பயன�பட�த�தி சரியானப� பாதையினைத� தரவ�ம�. \n"
-
-#: initdb.c:1605
-msgid "initializing pg_authid ... "
-msgstr "pg_authid த�வக�கப� பட�கின�றத� ..."
-
-#: initdb.c:1641
-msgid "Enter new superuser password: "
-msgstr "ப�திய ம�தன�மைப� பயனர� கடவ�ச� சொல�லை பதியவ�ம�:"
-
-#: initdb.c:1642
-msgid "Enter it again: "
-msgstr "மீண�ட�ம� பதியவ�ம�:"
-
-#: initdb.c:1645
-#, c-format
-msgid "Passwords didn't match.\n"
-msgstr "கடவ�ச� சொற�கள� பொர�ந�தவில�லை.\n"
-
-#: initdb.c:1672
-#, c-format
-msgid "%s: could not read password from file \"%s\": %s\n"
-msgstr "%s: கோப�பிலிர�ந�த� கடவ�ச� சொல�லினை  வாசிக�க இயலவில�லை \"%s\": %s\n"
-
-#: initdb.c:1685
-#, c-format
-msgid "setting password ... "
-msgstr "கடவ�ச� சொல� அமைக�கப�பட�கின�றத�..."
-
-#: initdb.c:1709
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr "%s: கடவ�ச� சொல�ல�க�கான கோப�பை உர�வாக�க இயலவில�லை. இவ�வழ�வினை தெரிவிக�கவ�ம�.\n"
-
-#: initdb.c:1793
-msgid "initializing dependencies ... "
-msgstr "சார�ப�டைமைகள� த�வக�கப�பட�கின�றன ..."
-
-#: initdb.c:1821
-msgid "creating system views ... "
-msgstr "அமைப�ப� பார�வைகள� உர�வாக�கப� பட�கின�றன ..."
-
-#: initdb.c:1857
-msgid "loading system objects' descriptions ... "
-msgstr "வன� பொர�ட�களின� விவரங�கள� �ற�றப�பட�கின�றன..."
-
-#: initdb.c:1909
-msgid "creating conversions ... "
-msgstr "மாற�றங�கள� உர�வாக�கப� பட�கின�றன..."
-
-#: initdb.c:1944
-msgid "creating dictionaries ... "
-msgstr "அகராதிகள� உர�வாக�கப� பட�கின�றன..."
-
-#: initdb.c:1997
-msgid "setting privileges on built-in objects ... "
-msgstr "உர�வாக�கப� பட�டிர�க�க�ம� பொர�ட�கள�க�க� சல�கைகள�  அமைக�கப� பட�கின�றன ..."
-
-#: initdb.c:2055
-msgid "creating information schema ... "
-msgstr "தகவல� ஸ�கீமா  உர�வாக�கப� பட�கின�றாத� ..."
-
-#: initdb.c:2111
-msgid "vacuuming database template1 ... "
-msgstr "தரவ�க� களத�தின� வார�ப�ப� காலியாக�கப� பட�கின�றத� ..."
-
-#: initdb.c:2165
-msgid "copying template1 to template0 ... "
-msgstr "வார�ப�ப�1  வார�ப�ப�0 க�க� நகலெட�க�கப� பட�கின�றத� ..."
-
-#: initdb.c:2196
-msgid "copying template1 to postgres ... "
-msgstr "வார�ப�ப�1  போஸ�ட�க�ரெஸ�க�க� நகலெட�க�கப� பட�கின�றத�"
-
-#: initdb.c:2253
-#, c-format
-msgid "caught signal\n"
-msgstr "சமிக�ஞை பெறப� பட�ட�ள�ளத�\n"
-
-#: initdb.c:2259
-#, c-format
-msgid "could not write to child process: %s\n"
-msgstr "த�ணைப� பணிக�க�ள� இயற�ற இயலவில�லை: %s\n"
-
-#: initdb.c:2267
-#, c-format
-msgid "ok\n"
-msgstr "சரி\n"
-
-#: initdb.c:2385
-#, c-format
-msgid "%s: invalid locale name \"%s\"\n"
-msgstr "%s: செல�லாத அகப� பெயர� \"%s\"\n"
-
-#: initdb.c:2536
-#, c-format
-msgid ""
-"%s initializes a PostgreSQL database cluster.\n"
-"\n"
-msgstr ""
-"%s போஸ�ட�க�ரெஸிச� தரவ� கள கூட�டத�தை த�வக�க�ம�. \n"
-" \n"
-
-#: initdb.c:2537
-#, c-format
-msgid "Usage:\n"
-msgstr "பயன�பாட�:\n"
-
-#: initdb.c:2538
-#, c-format
-msgid "  %s [OPTION]... [DATADIR]\n"
-msgstr "  %s [OPTION]... [DATADIR]\n"
-
-#: initdb.c:2539
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"தேர�வ�:\n"
-
-#: initdb.c:2540
-#, c-format
-msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
-msgstr " [-D, --pgdata=]DATADIR     தரவ�க� கள கூட�டமைப�பிற�கான இர�ப�ப�\n"
-
-#: initdb.c:2541
-#, c-format
-msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
-msgstr "  -E, --encoding=ENCODING   ப�திய தரவ�க� களன�கள�க�க� இயல�பான என�கோடிங�களை  அமைக�கவ�ம�\n"
-
-#: initdb.c:2542
-#, c-format
-msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
-msgstr "  --locale=LOCALE           கொட�க�கப� பட�ட அகத�தினைக� கொண�ட� தரவ�க� கள கூட�டமைப�பை த�வக�கவ�ம�\n"
-
-#: initdb.c:2543
-#, c-format
-msgid ""
-"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
-"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
-"                            initialize database cluster with given locale\n"
-"                            in the respective category (default taken from\n"
-"                            environment)\n"
-msgstr ""
-"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
-"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
-"                            கொட�க�கப� பட�ட அகத�தினைக� கொண�ட� தரவ�க� கள கூட�டமைப�பை அததற�கான வகையிலிர�ந�த� (இயல�பிர�ப�ப� \n"
-" பணிச�சூழலிலிர�ந�த� எட�க�கப�பட�ம�) த�வக�கவ�ம�\n"
-
-#: initdb.c:2548
-#, c-format
-msgid "  --no-locale               equivalent to --locale=C\n"
-msgstr "  --no-locale               equivalent to --locale=C\n"
-
-#: initdb.c:2549
-#, c-format
-msgid "  -T, --text-search-config=CFG\n"
-msgstr "  -T, --text-search-config=CFG\n"
-
-#: initdb.c:2550
-#, c-format
-msgid "                            set default text search configuration\n"
-msgstr "                             இயல�பிர�ப�ப� உரைத� தேடல� வடிவமைப�பினை அமைக�கவ�ம�.\n"
-
-#: initdb.c:2551
-#, c-format
-msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
-msgstr "  -X, --xlogdir=XLOGDIR     பரிமாற�றப� பதிவ�க�கான அடைவின� இர�ப�ப�\n"
-
-#: initdb.c:2552
-#, c-format
-msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
-msgstr "  -A, --auth=METHOD         உள�ளூர இணைப�ப�கள�க�கான அன�மதி ம�றை\n"
-
-#: initdb.c:2553
-#, c-format
-msgid "  -U, --username=NAME       database superuser name\n"
-msgstr "  -U, --username=NAME       தரவ�க� கள ம�தன�மைப� பயனரின� பெயர�\n"
-
-#: initdb.c:2554
-#, c-format
-msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
-msgstr "  -W, --pwprompt            ப�திய ம�தன�மைப� பயனர�க�கான கடவ�ச� சொல�லைக� கோரவ�ம�\n"
-
-#: initdb.c:2555
-#, c-format
-msgid "  --pwfile=FILE             read password for the new superuser from file\n"
-msgstr "  --pwfile=FILE             கோப�பிலிர�ந�த� ம�தன�மைப� பயனர�க�கான கடவ�ச� சொல�லை  வாசிக�கவ�ம�\n"
-
-#: initdb.c:2556
-#, c-format
-msgid "  -?, --help                show this help, then exit\n"
-msgstr "  -?, --help                இவ�வ�தவியைக� காட�டிய பின� வெளிவர�க\n"
-
-#: initdb.c:2557
-#, c-format
-msgid "  -V, --version             output version information, then exit\n"
-msgstr "  -V, --version             வெளியீட�ட�த� தகவலைக� காட�டியப� பின� வெளிவர�க\n"
-
-#: initdb.c:2558
-#, c-format
-msgid ""
-"\n"
-"Less commonly used options:\n"
-msgstr ""
-"\n"
-"அரிதாகப� பயன�பட�த�தப� பட�ம� தேர�வ�கள�:\n"
-
-#: initdb.c:2559
-#, c-format
-msgid "  -d, --debug               generate lots of debugging output\n"
-msgstr "  -d, --debug               வழ� ஆய�வறிக�கைகளை  அதிகமாக கொணரவ�ம�.\n"
-
-#: initdb.c:2560
-#, c-format
-msgid "  -s, --show                show internal settings\n"
-msgstr " -s, --show                 உள� அமைப�ப�களைக� காட�ட�க\n"
-
-#: initdb.c:2561
-#, c-format
-msgid "  -L DIRECTORY              where to find the input files\n"
-msgstr " -L DIRECTORY               உள�ளீட�ட� கோப�ப�களை எங�கே  கண�டெட�ப�பத�\n"
-
-#: initdb.c:2562
-#, c-format
-msgid "  -n, --noclean             do not clean up after errors\n"
-msgstr "  -n, --noclean             வழ�க�கள�க�க�ப� பிறக� த�டைக�க வேண�டாம�.\n"
-
-#: initdb.c:2563
-#, c-format
-msgid ""
-"\n"
-"If the data directory is not specified, the environment variable PGDATA\n"
-"is used.\n"
-msgstr ""
-"\n"
-" தரவின� அடைவ� கொட�க�கப� படவில�லையெனின�, பணிச�ச�ழல� மாறி PGDATA\n"
-" பயன� பட�த�தப� பட�ம�.\n"
-
-#: initdb.c:2565
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-" வழ�க�களை <pgsql-bugs@postgresql.org> ற�க�த� தெரியப� பட�த�தவ�ம�. \n"
-
-#: initdb.c:2668
-#, c-format
-msgid "Running in debug mode.\n"
-msgstr "வழ�ஆய�வ� ம�றையில� இயங�கிக� கொண�டிர�க�கின�றத�. \n"
-
-#: initdb.c:2672
-#, c-format
-msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
-msgstr "த�டை தவிர� ம�றையில� இயங�கிக� கொண�டிர�க�கின�றத�. வழ�க�கள� களையப� படாத�.\n"
-
-#: initdb.c:2715
-#: initdb.c:2733
-#: initdb.c:3003
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "மேல�ம� விவரங�கள�க�க� \"%s --help\" ம�யற�சிக�கவ�ம�\n"
-
-#: initdb.c:2731
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: ம�னைய-வரி மதிப�ப�கள� மிக அதிகமாக உள�ளன (ம�தலாவத� \"%s\")\n"
-
-#: initdb.c:2740
-#, c-format
-msgid "%s: password prompt and password file cannot be specified together\n"
-msgstr "%s: மேலெழ�ம�ப� கடவ�ச�சொல�ல�ம� கடவ�ச� சொல�ல�க�கான கோப�பைய�ம� ஒர� சேர வழங�க இயலாத�\n"
-
-#: initdb.c:2746
-msgid ""
-"\n"
-"WARNING: enabling \"trust\" authentication for local connections\n"
-"You can change this by editing pg_hba.conf or using the -A option the\n"
-"next time you run initdb.\n"
-msgstr ""
-"\n"
-"எச�சரிக�கை: உள� இணைப�ப�கள�க�க�\"trust\" அங�கீகாரம� வழங�கப�பட�கிறத�.\n"
-"இதனை அட�த�த ம�றை initidb இயக�க�ம� போத� \n"
-" pg_hba.conf கோப�பினை  தொக�ப�பதன� மூலமாகவோ அல�லத� -A தேர�வினை பயன�பட�த�தியோ மாற�றிக� கொள�ளலாம�.\n"
-
-#: initdb.c:2769
-#, c-format
-msgid "%s: unrecognized authentication method \"%s\"\n"
-msgstr "%s: இனங�காண இயலாத சோதனை ம�றை \"%s\"\n"
-
-#: initdb.c:2779
-#, c-format
-msgid "%s: must specify a password for the superuser to enable %s authentication\n"
-msgstr "%s அன�மதியினை செயல�பட�த�த ம�தன�மைப� பயனர�க�கானக� கடவ�ச� சொல�லொன�றை %s: தர�வத� அவசியம�.\n"
-
-#: initdb.c:2794
-#, 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 யின� த�ணைக� கொண�டோ அல�லத�\n"
-" பணிச�சூழலின� மாறி PGDATA வினைக� கொண�டோ இதனைச� செய�யவ�ம�.\n"
-
-#: initdb.c:2870
-#, 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:2877
-#, c-format
-msgid ""
-"The program \"postgres\" was found by \"%s\"\n"
-"but was not the same version as %s.\n"
-"Check your installation.\n"
-msgstr ""
-"\"postgres\" நிரல� \"%s\"\n"
-" ஆல� கண�ட�பிடிக�கப�பட�டத�.  ஆனால� %s னை  ஒத�த வெளியீட� அல�ல.\n"
-" தங�கள� நிற�வலைச� சரி பார�க�கவ�ம�. \n"
-
-#: initdb.c:2896
-#, c-format
-msgid "%s: input file location must be an absolute path\n"
-msgstr "%s: உள�ளீட�ட�க� கோப�பின� இர�ப�ப� ம�ழ�மையான பாதையினைக� கொண�டிர�த�தல� வேண�ட�ம�\n"
-
-#: initdb.c:2904
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: �ற�க உகந�த சிறிய வகை சரத�தை கண�டெட�க�க இயலவில�லை\n"
-
-#: initdb.c:2963
-#, c-format
-msgid ""
-"The files belonging to this database system will be owned by user \"%s\".\n"
-"This user must also own the server process.\n"
-"\n"
-msgstr ""
-"இத� தரவ�க� கள அமைப�பின� கோப�ப�களின� உரிமையாளர� \"%s\".\n"
-" வழங�கியின� பணிகள�க�க�ம� இவரே  உரிமையாளராக இர�த�தல� வேண�ட�ம�.\n"
-"\n"
-
-#: initdb.c:2973
-#, c-format
-msgid "The database cluster will be initialized with locale %s.\n"
-msgstr "தரவ�க� கள கூட�டம� %s அகத�த�டன� த�வக�கப� பட�ம�. \n"
-
-#: initdb.c:2976
-#, 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:3001
-#, c-format
-msgid "%s: could not find suitable encoding for locale \"%s\"\n"
-msgstr "%s: அகத�திற�க� தக�ந�த என�கோடிங� வகையை  கண�ட�பிடிக�க இயலவில�லை \"%s\"\n"
-
-#: initdb.c:3002
-#, c-format
-msgid "Rerun %s with the -E option.\n"
-msgstr "%s னை -E தேர�வ�டன� மீண�ட�ம� இயக�க�க\n"
-
-#: initdb.c:3009
-#, c-format
-msgid "The default database encoding has accordingly been set to %s.\n"
-msgstr "தரவ�க� களத�தின� இயல�பிர�ப�ப� என�கோடிங� %s ஆக அமைக�கப� பட�ட�ள�ளத�. \n"
-
-#: initdb.c:3023
-#, c-format
-msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
-msgstr "%s: தக�கதொர� உரை  தேடல� வடிவமைப�பினை அகத�திற�காக கண�டெட�க�க இயலவில�லை \"%s\"\n"
-
-#: initdb.c:3034
-#, c-format
-msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
-msgstr "%s: எச�சரிக�கை: அகத�தின� உரைத� தேடல�க�க�த� தக�ந�த வடிவமைப�ப� \"%s\" தெரியவில�லை\n"
-
-#: initdb.c:3039
-#, c-format
-msgid "%s: warning: specified text search configuration \"%s\" may not match locale \"%s\"\n"
-msgstr "%s: எச�சரிக�கை: கொட�க�கப� பட�ட உரைத� தேடல� வடிவமைப�ப� \"%s\" அகத�தோட� பொர�ந�தாத� போகலாம�\"%s\"\n"
-
-#: initdb.c:3044
-#, c-format
-msgid "The default text search configuration will be set to \"%s\".\n"
-msgstr "இயல�பாக அமைய�ம� உரைத� தேடல� வடிவமைப�ப� \"%s\" ஆக அமைக�கப� பட�ம�.\n"
-
-#: initdb.c:3078
-#: initdb.c:3138
-#, c-format
-msgid "creating directory %s ... "
-msgstr "%s அடைவ� உர�வாக�கப� பட�கிறத�..."
-
-#: initdb.c:3092
-#: initdb.c:3157
-#, c-format
-msgid "fixing permissions on existing directory %s ... "
-msgstr "இர�க�கக� கூடிய அடைவ�களில� உரிமங�கள� சரிசெய�யப� பட�கின�றன %s ..."
-
-#: initdb.c:3098
-#: initdb.c:3163
-#, c-format
-msgid "%s: could not change permissions of directory \"%s\": %s\n"
-msgstr "%s: \"%s\": %sஅடைவிற�கான அன�மதிகளை மாற�ற இயலவில�லை\n"
-
-#: initdb.c:3111
-#, c-format
-msgid ""
-"%s: directory \"%s\" exists but is not empty\n"
-"If you want to create a new database system, either remove or empty\n"
-"the directory \"%s\" or run %s\n"
-"with an argument other than \"%s\".\n"
-msgstr ""
-"%s: அடைவ� \"%s\" இர�ந�தால�ம�  காலியாக  இல�லை\n"
-" தாங�கள� ப�திய தரவ�க� கள அமைப�பினை  உர�வாக�க நினைத�தால�, ஒன�ற� அடைவினை அகற�றவோ அல�லத� காலியோ\n"
-" செய�யவ�ம� \"%s\" அல�லத� %s\n"
-" னை \"%s\" மதிப�பினைத� தவிர வேறேதாவத� கொட�த�த� இயக�கவ�ம�.\n"
-
-#: initdb.c:3120
-#: initdb.c:3183
-#, c-format
-msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: \"%s\": அடைவினை அண�க இயலவில�லை %s\n"
-
-#: initdb.c:3175
-#, c-format
-msgid ""
-"%s: directory \"%s\" exists but is not empty\n"
-"If you want to store the transaction log there, either\n"
-"remove or empty the directory \"%s\".\n"
-msgstr ""
-"%s: அடைவ� \"%s\" உள�ளத� ஆனால� காலியாக இல�லை\n"
-" பரிமாற�றப� பதிவினை  அவ�விடத�தே  காக�க விர�ம�பிடின� ஒன�ற�\n"
-" அடைவினை  அகற�றவ�ம� அல�லத� காலி செய�யவ�ம� \"%s\".\n"
-
-#: initdb.c:3191
-#, c-format
-msgid "%s: could not create symbolic link \"%s\": %s\n"
-msgstr "%s: இணைப�ப� மாதிரிகளை உர�வாக�க இயலவில�லை %s\": %s\n"
-
-#: initdb.c:3196
-#, c-format
-msgid "%s: symlinks are not supported on this platform"
-msgstr "இத� தளத�தில� இணைப�ப� மாதிரிகள� ஆதரிக�கப� பட�வதில�லை %s:"
-
-#: initdb.c:3202
-#, c-format
-msgid "creating subdirectories ... "
-msgstr "த�ணையடைவ�கள� உர�வாக�கப� பட�கின�றன ..."
-
-#: initdb.c:3264
-#, 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"
-"or\n"
-"    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
-"\n"
-
-#: ../../port/dirmod.c:75
-#: ../../port/dirmod.c:88
-#: ../../port/dirmod.c:101
-#, c-format
-msgid "out of memory\n"
-msgstr "நினைவை  மீறி\n"
-
-#: ../../port/dirmod.c:272
-#, c-format
-msgid "could not set junction for \"%s\": %s\n"
-msgstr "\"%s\": %s க�கான இணைப�பினை அமைக�க இயலவில�லை\n"
-
-#: ../../port/dirmod.c:312
-#, c-format
-msgid "could not open directory \"%s\": %s\n"
-msgstr "\"%s\": %s அடைவைத� திறக�க இயலவில�லை\n"
-
-#: ../../port/dirmod.c:349
-#, c-format
-msgid "could not read directory \"%s\": %s\n"
-msgstr "\"%s\": %s அடைவை வாசிக�க இயலவில�லை\n"
-
-#: ../../port/dirmod.c:447
-#, c-format
-msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "\"%s\": %s அடைவையோக� கோப�பினையோ அகற�ற இயலவில�லை\n"
-
-#: ../../port/exec.c:192
-#: ../../port/exec.c:306
-#: ../../port/exec.c:349
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "தற�போதைய அடைவினை இனங�காண இயலவில�லை: %s"
-
-#: ../../port/exec.c:211
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "செல�லாத இர�மம� \"%s\""
-
-#: ../../port/exec.c:260
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "\"%s\" இர�மத�தை  வாசிக�க இயலவில�லை"
-
-#: ../../port/exec.c:267
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "செயற�பட�த�த \"%s\" னை கண�ட�பிடிக�க இயலவில�லை"
-
-#: ../../port/exec.c:322
-#: ../../port/exec.c:358
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "அடைவை \"%s\" ஆக மாற�ற இயலவில�லை"
-
-#: ../../port/exec.c:337
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "\"%s\" இணைப�ப� மாதிரிகளை வாசிக�க இயலவில�லை"
-
-#: ../../port/exec.c:583
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "த�ணைப� பணி வெளியேற�றக� க�றியீட� %d ய�டன� வெளிவந�தத�"
-
-#: ../../port/exec.c:587
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "0x%X விதிவிலக�கால� த�ணைப� பணி தடைப� பட�டத�"
-
-#: ../../port/exec.c:596
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "சமிக�ஞை %s ஆல� த�ணைப� பணி தடைப� பட�டத�"
-
-#: ../../port/exec.c:599
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "சமிக�ஞை %d ஆல� த�ணைப� பணி தடைப�பட�டத�"
-
-#: ../../port/exec.c:603
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "அடையாளங�காண இயலாத நிலை %d யால� த�ணைப� பணி வெளிவந�தத�"
-
diff --git a/src/bin/initdb/po/tr.po b/src/bin/initdb/po/tr.po
index 3f162f28eb8e8..9aa20bdbe98b3 100644
--- a/src/bin/initdb/po/tr.po
+++ b/src/bin/initdb/po/tr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: initdb-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 20:02+0000\n"
-"PO-Revision-Date: 2010-09-25 00:54+0300\n"
+"POT-Creation-Date: 2011-08-29 20:39+0000\n"
+"PO-Revision-Date: 2011-08-30 01:22+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,89 +19,89 @@ msgstr ""
 "X-Poedit-Country: TURKEY\n"
 "X-Poedit-Basepath: ../postgresql-8.0.3/src\n"
 
-#: initdb.c:254
-#: initdb.c:268
+#: initdb.c:260
+#: initdb.c:274
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: yetersiz bellek\n"
 
-#: initdb.c:377
-#: initdb.c:1432
+#: initdb.c:383
+#: initdb.c:1289
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: \"%s\"  dosyası, okunmak için açılamadı: %s\n"
 
-#: initdb.c:433
-#: initdb.c:956
-#: initdb.c:985
+#: initdb.c:439
+#: initdb.c:805
+#: initdb.c:834
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: \"%s\" dosyası, yazılmak için açılamadı: %s\n"
 
-#: initdb.c:441
-#: initdb.c:449
-#: initdb.c:963
-#: initdb.c:991
+#: initdb.c:447
+#: initdb.c:455
+#: initdb.c:812
+#: initdb.c:840
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: \"%s\" dosyasına yazılamadı: %s\n"
 
-#: initdb.c:468
+#: initdb.c:474
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: \"%s\" komutu yürütme başlatma hatası: %s\n"
 
-#: initdb.c:588
+#: initdb.c:490
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: veri dizini siliniyor \"%s\"\n"
 
-#: initdb.c:591
+#: initdb.c:493
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: veri dizini silme başarısız\n"
 
-#: initdb.c:597
+#: initdb.c:499
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: veri dizininin içindekiler siliniyor \"%s\"\n"
 
-#: initdb.c:600
+#: initdb.c:502
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: veri dizininin içindekilerinin silme işlemini başarısız\n"
 
-#: initdb.c:606
+#: initdb.c:508
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: transaction log dizini siliniyor \"%s\"\n"
 
-#: initdb.c:609
+#: initdb.c:511
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: transaction log dizini silme başarısız\n"
 
-#: initdb.c:615
+#: initdb.c:517
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: transaction log dizininin içindekileri siliniyor \"%s\"\n"
 
-#: initdb.c:618
+#: initdb.c:520
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: transaction log dizininin içindekilerinin silme işlemini başarısız\n"
 
-#: initdb.c:627
+#: initdb.c:529
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: \"%s\" veri dizini kullanıcının isteği üzerine silinmedi\n"
 
-#: initdb.c:632
+#: initdb.c:534
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: \"%s\" transaction log dizini kullanıcının isteği üzerine silinmedi\n"
 
-#: initdb.c:654
+#: initdb.c:556
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -110,35 +111,35 @@ msgstr ""
 "%s: root olarak çalıştırılamaz.\n"
 "(Örneğin \"su\" kullanarak ) sunucu sürecinin sahibi olacak şekilde sisteme yetkisiz bir kullanıcı olarak giriş yapın.\n"
 
-#: initdb.c:666
+#: initdb.c:568
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: geçerli kullanıcı hakkında bilgi alınamadı: %s\n"
 
-#: initdb.c:683
+#: initdb.c:585
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: geçerli kullanıcı adı alınamadı: %s\n"
 
-#: initdb.c:714
+#: initdb.c:616
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" geçerli bir dil kodlaması adı değil\n"
 
-#: initdb.c:876
-#: initdb.c:3009
+#: initdb.c:725
+#: initdb.c:3173
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: \"%s\" dizini oluşturma başarısız: %s\n"
 
-#: initdb.c:906
+#: initdb.c:755
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: \"%s\" dosyası mevcut değil\n"
 
-#: initdb.c:908
-#: initdb.c:917
-#: initdb.c:927
+#: initdb.c:757
+#: initdb.c:766
+#: initdb.c:776
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -147,36 +148,36 @@ msgstr ""
 "Bu durum, bozulmus bir kurulumunuz olduÄŸu ya da\n"
 "-L parametresi ile yanlış dizin belirttiğiniz anlamına gelir.\n"
 
-#: initdb.c:914
+#: initdb.c:763
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: \"%s\" dosyasına erişim hatası: %s\n"
 
-#: initdb.c:925
+#: initdb.c:774
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: \"%s\" düzgün bir dosya değildir.\n"
 
-#: initdb.c:1033
+#: initdb.c:882
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "ön tanımlı max_connections seçiliyor ... "
 
-#: initdb.c:1062
+#: initdb.c:911
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "öntanımlı shared_buffers değeri seçiliyor ... "
 
-#: initdb.c:1105
+#: initdb.c:954
 msgid "creating configuration files ... "
 msgstr "yapılandırma dosyaları yaratılıyor ... "
 
-#: initdb.c:1272
+#: initdb.c:1129
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor."
 
-#: initdb.c:1288
+#: initdb.c:1145
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -185,103 +186,132 @@ msgstr ""
 "%s: \"%s\" girdi dosyası PostgreSQL'e ait değil %s\n"
 "Kurulumunuzu kontrol edin ya da -L seçeneği ile doğru dizini belirtin.\n"
 
-#: initdb.c:1373
+#: initdb.c:1230
 msgid "initializing pg_authid ... "
 msgstr "pg_authid ilklendiriliyor ... "
 
-#: initdb.c:1407
+#: initdb.c:1264
 msgid "Enter new superuser password: "
 msgstr "Yeni superuser ÅŸifresini giriniz: "
 
-#: initdb.c:1408
+#: initdb.c:1265
 msgid "Enter it again: "
 msgstr "Yeniden giriniz: "
 
-#: initdb.c:1411
+#: initdb.c:1268
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Şifreler uyuşmadı.\n"
 
-#: initdb.c:1438
+#: initdb.c:1295
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: \"%s\" dosyasından şifre okunamadı: %s\n"
 
-#: initdb.c:1451
+#: initdb.c:1308
 #, c-format
 msgid "setting password ... "
 msgstr "şifre ayarlanıyor ... "
 
-#: initdb.c:1549
+#: initdb.c:1408
 msgid "initializing dependencies ... "
 msgstr "bağlılıklar ilklendiriliyor ... "
 
-#: initdb.c:1577
+#: initdb.c:1436
 msgid "creating system views ... "
 msgstr "sistem viewları yaratılıyor ... "
 
-#: initdb.c:1613
+#: initdb.c:1472
 msgid "loading system objects' descriptions ... "
 msgstr "sistem nesnelerinin açıklamaları yükleniyor ... "
 
-#: initdb.c:1665
+#: initdb.c:1578
+msgid "creating collations ... "
+msgstr "dönüşümler yükleniyor ..."
+
+#: initdb.c:1611
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s:yerel adı çok uzun,: %s atlandı\n"
+
+#: initdb.c:1636
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s:yerel adı ASCII olmayan karakterler içeriyor, atlanan: %s\n"
+
+#: initdb.c:1699
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "Kullanılabilir sistem yerelleri bulunamadı. \n"
+
+#: initdb.c:1700
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Ayrıntıları görmek için \"--debug\" seçeneğini kullanınız. \n"
+
+#: initdb.c:1703
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "bu platformda desteklenmiyor\n"
+
+#: initdb.c:1718
 msgid "creating conversions ... "
 msgstr "dönüşümler yükleniyor ... "
 
-#: initdb.c:1700
+#: initdb.c:1753
 msgid "creating dictionaries ... "
 msgstr "sözlükler oluşturuluyor ... "
 
-#: initdb.c:1754
+#: initdb.c:1807
 msgid "setting privileges on built-in objects ... "
 msgstr "gömülü nesnelerdeki izinler ayarlanıyor ... "
 
-#: initdb.c:1812
+#: initdb.c:1865
 msgid "creating information schema ... "
 msgstr "information schema yaratılıyor ... "
 
-#: initdb.c:1868
+#: initdb.c:1921
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "PL/pgSQL sunucu tarafı dili yükleniyor ... "
 
-#: initdb.c:1893
+#: initdb.c:1946
 msgid "vacuuming database template1 ... "
 msgstr "template1 veritabanı vakumlanıyor ... "
 
-#: initdb.c:1947
+#: initdb.c:2002
 msgid "copying template1 to template0 ... "
 msgstr "template1 template0'a kopyalanıyor ... "
 
-#: initdb.c:1978
+#: initdb.c:2034
 msgid "copying template1 to postgres ... "
 msgstr "template1, postgres'e kopyalanıyor ... "
 
-#: initdb.c:2035
+#: initdb.c:2091
 #, c-format
 msgid "caught signal\n"
 msgstr "sinyal yakalandı\n"
 
-#: initdb.c:2041
+#: initdb.c:2097
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "çocuk sürece yazılamadı: %s\n"
 
-#: initdb.c:2049
+#: initdb.c:2105
 #, c-format
 msgid "ok\n"
 msgstr "tamam\n"
 
-#: initdb.c:2169
+#: initdb.c:2225
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: geçersiz yerel adı \"%s\"\n"
 
-#: initdb.c:2195
+#: initdb.c:2251
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: dil kodlaması uyuşmazlığı\n"
 
-#: initdb.c:2197
+#: initdb.c:2253
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -296,7 +326,7 @@ msgstr ""
 " düzeltebilmek için %s komutunu yeniden çalıştırın ve de ya kodlama \n"
 " belirtmeyin ya da eşleştirilebilir bir kodlama seçin.\n"
 
-#: initdb.c:2378
+#: initdb.c:2514
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -305,17 +335,17 @@ msgstr ""
 "%sbir PostgreSQL Veritabanı kümesini ilklendirir.\n"
 "\n"
 
-#: initdb.c:2379
+#: initdb.c:2515
 #, c-format
 msgid "Usage:\n"
 msgstr "Kullanımı:\n"
 
-#: initdb.c:2380
+#: initdb.c:2516
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [SEÇENEK]... [DATADIR]\n"
 
-#: initdb.c:2381
+#: initdb.c:2517
 #, c-format
 msgid ""
 "\n"
@@ -324,27 +354,27 @@ msgstr ""
 "\n"
 "Seçenekler:\n"
 
-#: initdb.c:2382
+#: initdb.c:2518
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=METHOD         yerel bağlantılar için ön tanımlı yetkilendirme yöntemi\n"
 
-#: initdb.c:2383
+#: initdb.c:2519
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr "[-D, --pgdata=]DATADIR     bu veritabanı kümesi için yer\n"
 
-#: initdb.c:2384
+#: initdb.c:2520
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   yeni veritabanları için öntanımlı dil kodlamasını ayarlar\n"
 
-#: initdb.c:2385
+#: initdb.c:2521
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOCALE       yeni veritabanı için öntanımlı yerel\n"
 
-#: initdb.c:2386
+#: initdb.c:2522
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -357,17 +387,17 @@ msgstr ""
 "                            yeni veritabanları için ilgili kategorideki öntanımlı yerel bilgisini\n"
 "                            çevrede değişkenlerinden al\n"
 
-#: initdb.c:2390
+#: initdb.c:2526
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           --locale=C'ye eÅŸdeÄŸer\n"
 
-#: initdb.c:2391
+#: initdb.c:2527
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=DOSYA         yeni superuser için parolayı dosyadan oku\n"
 
-#: initdb.c:2392
+#: initdb.c:2528
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -376,22 +406,22 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                            öntanımlı metin arama yapılandırması\n"
 
-#: initdb.c:2394
+#: initdb.c:2530
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       veritabanı superuser kullanıcısı adı\n"
 
-#: initdb.c:2395
+#: initdb.c:2531
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            yeni superuser için şifre sorar\n"
 
-#: initdb.c:2396
+#: initdb.c:2532
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=XLOGDIR     transaction log dizini\n"
 
-#: initdb.c:2397
+#: initdb.c:2533
 #, c-format
 msgid ""
 "\n"
@@ -400,27 +430,27 @@ msgstr ""
 "\n"
 "Daha az kullanılan seçenekler:\n"
 
-#: initdb.c:2398
+#: initdb.c:2534
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               bol miktarda debug çıktısı üretir\n"
 
-#: initdb.c:2399
+#: initdb.c:2535
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              girdi dosyalarının nerede bulunacağını belirtir\n"
 
-#: initdb.c:2400
+#: initdb.c:2536
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             hatalardan sonra temizlik yapma\n"
 
-#: initdb.c:2401
+#: initdb.c:2537
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                dahili ayarları gösterir\n"
 
-#: initdb.c:2402
+#: initdb.c:2538
 #, c-format
 msgid ""
 "\n"
@@ -429,17 +459,17 @@ msgstr ""
 "\n"
 "Diğer seçenekler:\n"
 
-#: initdb.c:2403
+#: initdb.c:2539
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                bu yardımı gösterir ve sonra çıkar\n"
 
-#: initdb.c:2404
+#: initdb.c:2540
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             sürüm bilgisini gösterir ve sonra çıkar\n"
 
-#: initdb.c:2405
+#: initdb.c:2541
 #, c-format
 msgid ""
 "\n"
@@ -449,7 +479,7 @@ msgstr ""
 "\n"
 "Eğer veri dizini belirtilmezse, PGDATA çevresel değişkeni kullanılacaktır\n"
 
-#: initdb.c:2407
+#: initdb.c:2543
 #, c-format
 msgid ""
 "\n"
@@ -458,34 +488,34 @@ msgstr ""
 "\n"
 "Hataları <pgsql-bugs@postgresql.org> adresine bildirebilirsiniz.\n"
 
-#: initdb.c:2512
+#: initdb.c:2649
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Debug modunda çalışıyor.\n"
 
-#: initdb.c:2516
+#: initdb.c:2653
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "noclean modunda çalışıyor.  Hatalar silinmeyecek.\n"
 
-#: initdb.c:2559
-#: initdb.c:2577
-#: initdb.c:2845
+#: initdb.c:2696
+#: initdb.c:2714
+#: initdb.c:2996
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Ayrıntılı bilgi için  \"%s --help\" komutunu deneyebilirsiniz.\n"
 
-#: initdb.c:2575
+#: initdb.c:2712
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: Çok fazla komut satırı girdisi var (ilki \"%s\")\n"
 
-#: initdb.c:2584
+#: initdb.c:2721
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: şifre promptu ve şifre dosyası birlikte belirtilemez\n"
 
-#: initdb.c:2590
+#: initdb.c:2727
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -497,17 +527,17 @@ msgstr ""
 "Bunu, pg_hba.conf dosyasını düzenleyerek ya da  initdb'yi yeniden \n"
 " çalıştırdığınızda -A parametresi ile değiştirebilirsiniz..\n"
 
-#: initdb.c:2613
+#: initdb.c:2750
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: bilinmeyen yetkilendirme yöntemi\"%s\".\n"
 
-#: initdb.c:2623
+#: initdb.c:2760
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: %s yetkilendirmesini etkinleştirmek için superuser'a şifre atamanız gerekmektedir.\n"
 
-#: initdb.c:2638
+#: initdb.c:2789
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -519,7 +549,7 @@ msgstr ""
 "Bu veritabanı sistemi için verinin hangi dizinde duracağını belirtmeniz gerekmektedir.\n"
 "Bunu ya -D seçeneği ile ya da PGDATA çevresel değişkeni ile yapabilirsiniz.\n"
 
-#: initdb.c:2722
+#: initdb.c:2873
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -530,7 +560,7 @@ msgstr ""
 "ile aynı dizinde bulunamadı.\n"
 "Kurulumunuzu kontrol ediniz.\n"
 
-#: initdb.c:2729
+#: initdb.c:2880
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -541,12 +571,12 @@ msgstr ""
 "ile aynı sürüm numarasına sahip değil.\n"
 "Kurulumunuzu kontrol ediniz.\n"
 
-#: initdb.c:2748
+#: initdb.c:2899
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: girdi dosyasının yeri mutlak bir yol olmalıdır\n"
 
-#: initdb.c:2805
+#: initdb.c:2956
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -557,12 +587,12 @@ msgstr ""
 "Bu kullanıcı aynı zamanda sunucu sürecinin de sahibi olmalıdır.\n"
 "\n"
 
-#: initdb.c:2815
+#: initdb.c:2966
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "Veritabanı kümesi %s yereli ile ilklendirilecek.\n"
 
-#: initdb.c:2818
+#: initdb.c:2969
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -581,22 +611,31 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2842
+#: initdb.c:2993
 #, c-format
 msgid "%s: could not find suitable encoding for locale %s\n"
 msgstr "%s: %s yereli için uygun dil kodlaması bulunamadı.\n"
 
-#: initdb.c:2844
+#: initdb.c:2995
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "%s komutunu -E seçeneği ile yeniden çalıştırın.\n"
 
-#: initdb.c:2853
+#: initdb.c:3008
+#, 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 dil kodlaması sunucu tarafında izin verilen bir dil kodlaması değildir\n"
+"Bunun yerine, öntanımlı veritabanı dil kodlaması %s olacaktır.\n"
+
+#: initdb.c:3016
 #, c-format
 msgid "%s: locale %s requires unsupported encoding %s\n"
 msgstr "%s: %s yereli desteklenmeyen %s dil kodlamasını gerektirir\n"
 
-#: initdb.c:2856
+#: initdb.c:3019
 #, c-format
 msgid ""
 "Encoding %s is not allowed as a server-side encoding.\n"
@@ -605,56 +644,56 @@ msgstr ""
 "%s dil kodlaması sunucu tarafında izin verilen bir dil kodlaması değildir\n"
 " %s'i değişik bir dil seçimi ile tekrar çalıştırın.\n"
 
-#: initdb.c:2864
+#: initdb.c:3028
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: initdb.c:2881
+#: initdb.c:3045
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale %s\n"
 msgstr "%s: \"%s\" yereli için uygun metin arama yapılandırması bulunamadı.\n"
 
-#: initdb.c:2892
+#: initdb.c:3056
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale %s is unknown\n"
 msgstr "%s: uyarı: %s yereli için uygun metin arama yapılandırması bilinmiyor.\n"
 
-#: initdb.c:2897
+#: initdb.c:3061
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale %s\n"
 msgstr "%s: uyarı: belirtilen metin arama yapılandırması  \"%s\", %s yereli ile eşleşmeyebilir\n"
 
-#: initdb.c:2902
+#: initdb.c:3066
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Öntanımlı metin arama yapılandırması \"%s\" olarak ayarlanacak.\n"
 
-#: initdb.c:2936
-#: initdb.c:3003
+#: initdb.c:3100
+#: initdb.c:3167
 #, c-format
 msgid "creating directory %s ... "
 msgstr "%s dizini yaratılıyor ... "
 
-#: initdb.c:2950
-#: initdb.c:3020
+#: initdb.c:3114
+#: initdb.c:3185
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "mevcut %s dizininin izinleri düzeltiliyor ... "
 
-#: initdb.c:2956
-#: initdb.c:3026
+#: initdb.c:3120
+#: initdb.c:3191
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: \"%s\" dizininin erişim haklarını değiştirilemiyor: %s\n"
 
-#: initdb.c:2969
-#: initdb.c:3038
+#: initdb.c:3133
+#: initdb.c:3204
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s:  \"%s\" dizini mevcut, ama boÅŸ deÄŸil\n"
 
-#: initdb.c:2972
+#: initdb.c:3136
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -665,18 +704,18 @@ msgstr ""
 "kaldırın, ya boşaltın ya da ya da %s 'i \n"
 "\"%s\" argümanından başka bir argüman ile çalıştırın.\n"
 
-#: initdb.c:2980
-#: initdb.c:3048
+#: initdb.c:3144
+#: initdb.c:3214
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: \"%s\" dizine erişim hatası: %s\n"
 
-#: initdb.c:2994
+#: initdb.c:3158
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: transaction log dizini mutlak bir yol olmalıdır\n"
 
-#: initdb.c:3041
+#: initdb.c:3207
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -685,22 +724,22 @@ msgstr ""
 "Eğer transaction kayıt dosyasını saklamak istiyorsanız, \n"
 "\"%s\" dizinini kaldırın ya da boşaltın\n"
 
-#: initdb.c:3060
+#: initdb.c:3226
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: symbolic link \"%s\" oluşturma hatası: %s\n"
 
-#: initdb.c:3065
+#: initdb.c:3231
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: bu platformda sembolik bağlantı desteklenmemektedir"
 
-#: initdb.c:3071
+#: initdb.c:3237
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "alt dizinler oluÅŸturuluyor ... "
 
-#: initdb.c:3135
+#: initdb.c:3303
 #, c-format
 msgid ""
 "\n"
@@ -732,23 +771,28 @@ msgstr "bellek yetersiz\n"
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "\"%s\" junction ayarlama hatası: %s\n"
 
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "\"%s\" için junction bulunamadıı: %s\n"
+
+#: ../../port/dirmod.c:443
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
 msgstr "\"%s\" dizini açma başarısız: %s\n"
 
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
 msgstr "\"%s\" dizini okuma başarısız: %s\n"
 
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
 msgstr "\"%s\" dosya ya da dizini bulunamadı: %s\n"
 
-#: ../../port/dirmod.c:472
-#: ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590
+#: ../../port/dirmod.c:607
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
 msgstr "\"%s\" dizini kaldırma başarısız: %s\n"
@@ -786,27 +830,28 @@ msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
 msgid "could not read symbolic link \"%s\""
 msgstr "symbolic link \"%s\" okuma hatası"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
+
diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
index 8a479d72cd1ac..f2fbbc00b3ecb 100644
--- a/src/bin/pg_basebackup/nls.mk
+++ b/src/bin/pg_basebackup/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_basebackup/nls.mk
 CATALOG_NAME	:= pg_basebackup
-AVAIL_LANGUAGES	:= de es
+AVAIL_LANGUAGES	:= cs de es fr ja pl pt_BR
 GETTEXT_FILES	:= pg_basebackup.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 9bf1fcdc4b5f6..25c0a7893ac6b 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -59,7 +59,7 @@ static char *xstrdup(const char *s);
 static void *xmalloc0(int size);
 static void usage(void);
 static void verify_dir_is_empty_or_create(char *dirname);
-static void progress_report(int tablespacenum, char *fn);
+static void progress_report(int tablespacenum, const char *filename);
 static PGconn *GetConnection(void);
 
 static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum);
@@ -201,37 +201,60 @@ verify_dir_is_empty_or_create(char *dirname)
  * is enabled, also print the current file name.
  */
 static void
-progress_report(int tablespacenum, char *fn)
+progress_report(int tablespacenum, const char *filename)
 {
 	int			percent = (int) ((totaldone / 1024) * 100 / totalsize);
+	char		totaldone_str[32];
+	char		totalsize_str[32];
 
+	/*
+	 * Avoid overflowing past 100% or the full size. This may make the
+	 * total size number change as we approach the end of the backup
+	 * (the estimate will always be wrong if WAL is included), but
+	 * that's better than having the done column be bigger than the
+	 * total.
+	 */
 	if (percent > 100)
 		percent = 100;
+	if (totaldone / 1024 > totalsize)
+		totalsize = totaldone / 1024;
+
+	/*
+	 * Separate step to keep platform-dependent format code out of translatable
+	 * strings.  And we only test for INT64_FORMAT availability in snprintf,
+	 * not fprintf.
+	 */
+	snprintf(totaldone_str, sizeof(totaldone_str), INT64_FORMAT, totaldone / 1024);
+	snprintf(totalsize_str, sizeof(totalsize_str), INT64_FORMAT, totalsize);
 
 	if (verbose)
 	{
-		if (!fn)
+		if (!filename)
 
 			/*
 			 * No filename given, so clear the status line (used for last
 			 * call)
 			 */
 			fprintf(stderr,
-					INT64_FORMAT "/" INT64_FORMAT " kB (100%%) %i/%i tablespaces %35s\r",
-					totaldone / 1024, totalsize,
-					tablespacenum, tablespacecount, "");
+					ngettext("%s/%s kB (100%%), %d/%d tablespace %35s",
+							 "%s/%s kB (100%%), %d/%d tablespaces %35s",
+							 tablespacecount),
+					totaldone_str, totalsize_str, tablespacenum, tablespacecount, "");
 		else
 			fprintf(stderr,
-					INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces (%-30.30s)\r",
-					totaldone / 1024, totalsize,
-					percent,
-					tablespacenum, tablespacecount, fn);
+					ngettext("%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)",
+							 "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)",
+							 tablespacecount),
+					totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount, filename);
 	}
 	else
-		fprintf(stderr, INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces\r",
-				totaldone / 1024, totalsize,
-				percent,
-				tablespacenum, tablespacecount);
+		fprintf(stderr,
+				ngettext("%s/%s kB (%d%%), %d/%d tablespace",
+						 "%s/%s kB (%d%%), %d/%d tablespaces",
+						 tablespacecount),
+				totaldone_str, totalsize_str, percent, tablespacenum, tablespacecount);
+
+	fprintf(stderr, "\r");
 }
 
 
@@ -248,7 +271,7 @@ progress_report(int tablespacenum, char *fn)
 static void
 ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 {
-	char		fn[MAXPGPATH];
+	char		filename[MAXPGPATH];
 	char	   *copybuf = NULL;
 	FILE	   *tarfile = NULL;
 
@@ -264,7 +287,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		if (strcmp(basedir, "-") == 0)
 		{
 #ifdef HAVE_LIBZ
-			if (compresslevel > 0)
+			if (compresslevel != 0)
 			{
 				ztarfile = gzdopen(dup(fileno(stdout)), "wb");
 				if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
@@ -281,10 +304,10 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		else
 		{
 #ifdef HAVE_LIBZ
-			if (compresslevel > 0)
+			if (compresslevel != 0)
 			{
-				snprintf(fn, sizeof(fn), "%s/base.tar.gz", basedir);
-				ztarfile = gzopen(fn, "wb");
+				snprintf(filename, sizeof(filename), "%s/base.tar.gz", basedir);
+				ztarfile = gzopen(filename, "wb");
 				if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
 				{
 					fprintf(stderr, _("%s: could not set compression level %i: %s\n"),
@@ -295,8 +318,8 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 			else
 #endif
 			{
-				snprintf(fn, sizeof(fn), "%s/base.tar", basedir);
-				tarfile = fopen(fn, "wb");
+				snprintf(filename, sizeof(filename), "%s/base.tar", basedir);
+				tarfile = fopen(filename, "wb");
 			}
 		}
 	else
@@ -305,10 +328,10 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		 * Specific tablespace
 		 */
 #ifdef HAVE_LIBZ
-		if (compresslevel > 0)
+		if (compresslevel != 0)
 		{
-			snprintf(fn, sizeof(fn), "%s/%s.tar.gz", basedir, PQgetvalue(res, rownum, 0));
-			ztarfile = gzopen(fn, "wb");
+			snprintf(filename, sizeof(filename), "%s/%s.tar.gz", basedir, PQgetvalue(res, rownum, 0));
+			ztarfile = gzopen(filename, "wb");
 			if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
 			{
 				fprintf(stderr, _("%s: could not set compression level %i: %s\n"),
@@ -319,19 +342,19 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		else
 #endif
 		{
-			snprintf(fn, sizeof(fn), "%s/%s.tar", basedir, PQgetvalue(res, rownum, 0));
-			tarfile = fopen(fn, "wb");
+			snprintf(filename, sizeof(filename), "%s/%s.tar", basedir, PQgetvalue(res, rownum, 0));
+			tarfile = fopen(filename, "wb");
 		}
 	}
 
 #ifdef HAVE_LIBZ
-	if (compresslevel > 0)
+	if (compresslevel != 0)
 	{
 		if (!ztarfile)
 		{
 			/* Compression is in use */
 			fprintf(stderr, _("%s: could not create compressed file \"%s\": %s\n"),
-					progname, fn, get_gz_error(ztarfile));
+					progname, filename, get_gz_error(ztarfile));
 			disconnect_and_exit(1);
 		}
 	}
@@ -342,7 +365,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 		if (!tarfile)
 		{
 			fprintf(stderr, _("%s: could not create file \"%s\": %s\n"),
-					progname, fn, strerror(errno));
+					progname, filename, strerror(errno));
 			disconnect_and_exit(1);
 		}
 	}
@@ -386,7 +409,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 				if (gzwrite(ztarfile, zerobuf, sizeof(zerobuf)) != sizeof(zerobuf))
 				{
 					fprintf(stderr, _("%s: could not write to compressed file \"%s\": %s\n"),
-							progname, fn, get_gz_error(ztarfile));
+							progname, filename, get_gz_error(ztarfile));
 				}
 			}
 			else
@@ -395,7 +418,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 				if (fwrite(zerobuf, sizeof(zerobuf), 1, tarfile) != 1)
 				{
 					fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"),
-							progname, fn, strerror(errno));
+							progname, filename, strerror(errno));
 					disconnect_and_exit(1);
 				}
 			}
@@ -432,7 +455,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 			if (gzwrite(ztarfile, copybuf, r) != r)
 			{
 				fprintf(stderr, _("%s: could not write to compressed file \"%s\": %s\n"),
-						progname, fn, get_gz_error(ztarfile));
+						progname, filename, get_gz_error(ztarfile));
 			}
 		}
 		else
@@ -441,13 +464,13 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
 			if (fwrite(copybuf, r, 1, tarfile) != 1)
 			{
 				fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"),
-						progname, fn, strerror(errno));
+						progname, filename, strerror(errno));
 				disconnect_and_exit(1);
 			}
 		}
 		totaldone += r;
 		if (showprogress)
-			progress_report(rownum, fn);
+			progress_report(rownum, filename);
 	}							/* while (1) */
 
 	if (copybuf != NULL)
@@ -468,7 +491,7 @@ static void
 ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 {
 	char		current_path[MAXPGPATH];
-	char		fn[MAXPGPATH];
+	char		filename[MAXPGPATH];
 	int			current_len_left;
 	int			current_padding = 0;
 	char	   *copybuf = NULL;
@@ -563,8 +586,8 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 			/*
 			 * First part of header is zero terminated filename
 			 */
-			snprintf(fn, sizeof(fn), "%s/%s", current_path, copybuf);
-			if (fn[strlen(fn) - 1] == '/')
+			snprintf(filename, sizeof(filename), "%s/%s", current_path, copybuf);
+			if (filename[strlen(filename) - 1] == '/')
 			{
 				/*
 				 * Ends in a slash means directory or symlink to directory
@@ -574,18 +597,18 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 					/*
 					 * Directory
 					 */
-					fn[strlen(fn) - 1] = '\0';	/* Remove trailing slash */
-					if (mkdir(fn, S_IRWXU) != 0)
+					filename[strlen(filename) - 1] = '\0';	/* Remove trailing slash */
+					if (mkdir(filename, S_IRWXU) != 0)
 					{
 						fprintf(stderr,
 							_("%s: could not create directory \"%s\": %s\n"),
-								progname, fn, strerror(errno));
+								progname, filename, strerror(errno));
 						disconnect_and_exit(1);
 					}
 #ifndef WIN32
-					if (chmod(fn, (mode_t) filemode))
+					if (chmod(filename, (mode_t) filemode))
 						fprintf(stderr, _("%s: could not set permissions on directory \"%s\": %s\n"),
-								progname, fn, strerror(errno));
+								progname, filename, strerror(errno));
 #endif
 				}
 				else if (copybuf[156] == '2')
@@ -593,12 +616,12 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 					/*
 					 * Symbolic link
 					 */
-					fn[strlen(fn) - 1] = '\0';	/* Remove trailing slash */
-					if (symlink(&copybuf[157], fn) != 0)
+					filename[strlen(filename) - 1] = '\0';	/* Remove trailing slash */
+					if (symlink(&copybuf[157], filename) != 0)
 					{
 						fprintf(stderr,
 								_("%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"),
-								progname, fn, &copybuf[157], strerror(errno));
+								progname, filename, &copybuf[157], strerror(errno));
 						disconnect_and_exit(1);
 					}
 				}
@@ -614,18 +637,18 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 			/*
 			 * regular file
 			 */
-			file = fopen(fn, "wb");
+			file = fopen(filename, "wb");
 			if (!file)
 			{
 				fprintf(stderr, _("%s: could not create file \"%s\": %s\n"),
-						progname, fn, strerror(errno));
+						progname, filename, strerror(errno));
 				disconnect_and_exit(1);
 			}
 
 #ifndef WIN32
-			if (chmod(fn, (mode_t) filemode))
+			if (chmod(filename, (mode_t) filemode))
 				fprintf(stderr, _("%s: could not set permissions on file \"%s\": %s\n"),
-						progname, fn, strerror(errno));
+						progname, filename, strerror(errno));
 #endif
 
 			if (current_len_left == 0)
@@ -658,12 +681,12 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 			if (fwrite(copybuf, r, 1, file) != 1)
 			{
 				fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"),
-						progname, fn, strerror(errno));
+						progname, filename, strerror(errno));
 				disconnect_and_exit(1);
 			}
 			totaldone += r;
 			if (showprogress)
-				progress_report(rownum, fn);
+				progress_report(rownum, filename);
 
 			current_len_left -= r;
 			if (current_len_left == 0 && current_padding == 0)
@@ -976,7 +999,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "D:F:l:Z:c:h:p:U:xwWvP",
+	while ((c = getopt_long(argc, argv, "D:F:xl:zZ:c:h:p:U:wWvP",
 							long_options, &option_index)) != -1)
 	{
 		switch (c)
@@ -1089,7 +1112,7 @@ main(int argc, char **argv)
 	/*
 	 * Mutually exclusive arguments
 	 */
-	if (format == 'p' && compresslevel > 0)
+	if (format == 'p' && compresslevel != 0)
 	{
 		fprintf(stderr,
 				_("%s: only tar mode backups can be compressed\n"),
@@ -1100,7 +1123,7 @@ main(int argc, char **argv)
 	}
 
 #ifndef HAVE_LIBZ
-	if (compresslevel > 0)
+	if (compresslevel != 0)
 	{
 		fprintf(stderr,
 				_("%s: this build does not support compression\n"),
diff --git a/src/bin/pg_basebackup/po/cs.po b/src/bin/pg_basebackup/po/cs.po
new file mode 100644
index 0000000000000..b1c9f181b9ff7
--- /dev/null
+++ b/src/bin/pg_basebackup/po/cs.po
@@ -0,0 +1,384 @@
+# LANGUAGE message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-30 15:04+0200\n"
+"PO-Revision-Date: 2011-09-06 11:42+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: pg_basebackup.c:96 pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek pamětí\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s vytvoří base backup běžícího PostgreSQL serveru.\n"
+"\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "Použití:\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [VOLBA]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"Volby ovlivňující výstup:\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid "  -D, --pgdata=DIRECTORY   receive base backup into directory\n"
+msgstr "  -D, --pgdata=ADRES�Ř   ulož base backup do adresáře\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid "  -F, --format=p|t         output format (plain, tar)\n"
+msgstr "  -F, --format=p|t         výstupní formát (plain, tar)\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid "  -x, --xlog               include required WAL files in backup\n"
+msgstr "  -x, --xlog               zahrň do zálohy potřebné WAL soubory\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid "  -z, --gzip               compress tar output\n"
+msgstr "  -z, --gzip               komprimuj výstup taru\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid ""
+"  -Z, --compress=0-9       compress tar output with given compression level\n"
+msgstr ""
+"  -Z, --compress=0-9       komprimuj výstup taru zvolenou úrovní komprese\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Obecné volby:\n"
+
+#: pg_basebackup.c:132
+#, c-format
+msgid ""
+"  -c, --checkpoint=fast|spread\n"
+"                           set fast or spread checkpointing\n"
+msgstr ""
+"  -c, --checkpoint=fast|spread\n"
+"                           nastavte fast nebo spread checkpointing\n"
+
+#: pg_basebackup.c:134
+#, c-format
+msgid "  -l, --label=LABEL        set backup label\n"
+msgstr "  -l, --label=N�ZEV        nastavte jmenovku zálohy\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid "  -P, --progress           show progress information\n"
+msgstr "  -P, --progress           zobrazuj informace o průběhu\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid "  -v, --verbose            output verbose messages\n"
+msgstr "  -v, --verbose            zobrazuj podrobnější zprávy\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   zobraz tuto nápovědu, poté skon�i\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                zobraz informaci o verzi, poté skon�i\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Volby spojení:\n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME      host databázového serveru nebo adresář se sockety\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          port databázového serveru\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr "  -U, --username=JMÉNO      připoj se jako uvedený uživatel\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nikdy se neptej na heslo\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           zeptej se na heslo (mělo by se dít automaticky)\n"
+
+#: pg_basebackup.c:145
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hlaste na <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:167 pg_basebackup.c:604
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: nelze vytvořit adresář \"%s\": %s\n"
+
+#: pg_basebackup.c:184
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: adresář \"%s\" existuje ale není prázdný\n"
+
+#: pg_basebackup.c:192
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: nelze přistoupit k adresáři \"%s\": %s\n"
+
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgstr[1] "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[2] "%s/%s kB (100%%), %d/%d tablespaces %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgstr[1] "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[2] "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s kB (%d%%), %d/%d tablespace"
+msgstr[1] "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[2] "%s/%s kB (%d%%), %d/%d tablespaces"
+
+#: pg_basebackup.c:295 pg_basebackup.c:313 pg_basebackup.c:337
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s: nelze nastavit úroveň komprese %i: %s\n"
+
+#: pg_basebackup.c:356
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: nelze vytvořit komprimovaný soubor \"%s\": %s\n"
+
+#: pg_basebackup.c:367 pg_basebackup.c:643
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: nelze vytvořit soubor \"%s\": %s\n"
+
+#: pg_basebackup.c:379 pg_basebackup.c:516
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: nelze získat COPY data stream: %s"
+
+#: pg_basebackup.c:411 pg_basebackup.c:457
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: nelze zapsat do komprimovaného souboru \"%s\": %s\n"
+
+#: pg_basebackup.c:420 pg_basebackup.c:466 pg_basebackup.c:683
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
+
+#: pg_basebackup.c:447 pg_basebackup.c:545
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: nelze �íst COPY data: %s"
+
+#: pg_basebackup.c:559
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s: neplatná velikost hlavi�ky tar bloku: %i\n"
+
+#: pg_basebackup.c:567
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: nelze na�íst velikost souboru\n"
+
+#: pg_basebackup.c:575
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: nelze na�íst mód souboru\n"
+
+#: pg_basebackup.c:610
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: nelze nastavit přístupová práva na adresáři \"%s\": %s\n"
+
+#: pg_basebackup.c:623
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s: nelze vytvořit symbolický odkaz z \"%s\" na \"%s\": %s\n"
+
+#: pg_basebackup.c:630
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr ""
+
+#: pg_basebackup.c:650
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: nelze nastavit přístupová práva na souboru \"%s\": %s\n"
+
+#: pg_basebackup.c:708
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s: COPY stream skon�il před dokon�ením posledního souboru\n"
+
+#: pg_basebackup.c:769
+msgid "Password: "
+msgstr "Heslo: "
+
+#: pg_basebackup.c:789
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s: nelze se připojit k serveru: %s"
+
+#: pg_basebackup.c:829
+#, c-format
+msgid "%s: could not send base backup command: %s"
+msgstr "%s: nelze poslat base backup příkaz: %s"
+
+#: pg_basebackup.c:840
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: nelze inicializovat base backup: %s"
+
+#: pg_basebackup.c:846
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s: server nevráti žádný po�áte�ní bod (start point)\n"
+
+#: pg_basebackup.c:862
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: nelze získat hlavi�ku zálohy: %s"
+
+#: pg_basebackup.c:868
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: ze serveru nebyla vrácena žádná data\n"
+
+#: pg_basebackup.c:896
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr ""
+"%s: na standardní výstup lze vypsat jen jeden tablespace, databáze jich má %"
+"i\n"
+
+#: pg_basebackup.c:925
+#, c-format
+msgid "%s: could not get WAL end position from server\n"
+msgstr "%s: ze serveru nelze získat koncovou WAL pozici\n"
+
+#: pg_basebackup.c:931
+#, c-format
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s: ze serveru nebyla vrácena žádná koncová WAL pozice\n"
+
+#: pg_basebackup.c:943
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr ""
+
+#: pg_basebackup.c:1017
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr "%s: chybný formát výstupu \"%s\", musí být \"plain\" nebo \"tar\"\n"
+
+#: pg_basebackup.c:1039
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: chybná úroveň komprese \"%s\"\n"
+
+#: pg_basebackup.c:1051
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr ""
+"%s: chybný checkpoint argument \"%s\", musí být \"fast\" nebo \"spread\"\n"
+
+#: pg_basebackup.c:1082 pg_basebackup.c:1096 pg_basebackup.c:1107
+#: pg_basebackup.c:1120
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zadejte \"%s --help\" pro více informací.\n"
+
+#: pg_basebackup.c:1094
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: příliš mnoho parametrů na příkazové řádce (první je \"%s\")\n"
+
+#: pg_basebackup.c:1106
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: nebyl zadán cílový adresář\n"
+
+#: pg_basebackup.c:1118
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: pouze tar zálohy mohou být komprimované\n"
+
+#: pg_basebackup.c:1129
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: tento build nepodporuje kompresi\n"
+
+
diff --git a/src/bin/pg_basebackup/po/de.po b/src/bin/pg_basebackup/po/de.po
index b375824008d72..a00af144ff4a5 100644
--- a/src/bin/pg_basebackup/po/de.po
+++ b/src/bin/pg_basebackup/po/de.po
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-31 18:39+0000\n"
-"PO-Revision-Date: 2011-05-31 23:12+0300\n"
+"POT-Creation-Date: 2011-08-17 11:15+0300\n"
+"PO-Revision-Date: 2011-08-17 11:17+0300\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: pg_basebackup.c:96 pg_basebackup.c:110
 #, c-format
@@ -174,7 +175,7 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:167 pg_basebackup.c:581
+#: pg_basebackup.c:167 pg_basebackup.c:604
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: konnte Verzeichnis »%s« nicht erzeugen: %s\n"
@@ -189,177 +190,198 @@ msgstr "%s: Verzeichnis »%s« existiert aber ist nicht leer\n"
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
 
-#: pg_basebackup.c:272 pg_basebackup.c:290 pg_basebackup.c:314
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s kB (100%%), %d/%d Tablespace %35s"
+msgstr[1] "%s/%s kB (100%%), %d/%d Tablespaces %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s kB (%d%%), %d/%d Tablespace (%-30.30s)"
+msgstr[1] "%s/%s kB (%d%%), %d/%d Tablespaces (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s kB (%d%%), %d/%d Tablespace"
+msgstr[1] "%s/%s kB (%d%%), %d/%d Tablespaces"
+
+#: pg_basebackup.c:295 pg_basebackup.c:313 pg_basebackup.c:337
 #, c-format
 msgid "%s: could not set compression level %i: %s\n"
 msgstr "%s: konnte Komprimierungsniveau %i nicht setzen: %s\n"
 
-#: pg_basebackup.c:333
+#: pg_basebackup.c:356
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s: konnte komprimierte Datei »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:344 pg_basebackup.c:620
+#: pg_basebackup.c:367 pg_basebackup.c:643
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s: konnte Datei »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:356 pg_basebackup.c:493
+#: pg_basebackup.c:379 pg_basebackup.c:516
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s: konnte COPY-Datenstrom nicht empfangen: %s"
 
-#: pg_basebackup.c:388 pg_basebackup.c:434
+#: pg_basebackup.c:411 pg_basebackup.c:457
 #, c-format
 msgid "%s: could not write to compressed file \"%s\": %s\n"
 msgstr "%s: konnte nicht in komprimierte Datei »%s« schreiben: %s\n"
 
-#: pg_basebackup.c:397 pg_basebackup.c:443 pg_basebackup.c:660
+#: pg_basebackup.c:420 pg_basebackup.c:466 pg_basebackup.c:683
 #, c-format
 msgid "%s: could not write to file \"%s\": %s\n"
 msgstr "%s: konnte nicht in Datei »%s« schreiben: %s\n"
 
-#: pg_basebackup.c:424 pg_basebackup.c:522
+#: pg_basebackup.c:447 pg_basebackup.c:545
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: konnte COPY-Daten nicht lesen: %s"
 
-#: pg_basebackup.c:536
+#: pg_basebackup.c:559
 #, c-format
 msgid "%s: invalid tar block header size: %i\n"
 msgstr "%s: ungültige Tar-Block-Kopf-Größe: %i\n"
 
-#: pg_basebackup.c:544
+#: pg_basebackup.c:567
 #, c-format
 msgid "%s: could not parse file size\n"
 msgstr "%s: konnte Dateigröße nicht entziffern\n"
 
-#: pg_basebackup.c:552
+#: pg_basebackup.c:575
 #, c-format
 msgid "%s: could not parse file mode\n"
 msgstr "%s: konnte Dateimodus nicht entziffern\n"
 
-#: pg_basebackup.c:587
+#: pg_basebackup.c:610
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
 msgstr "%s: konnte Zugriffsrechte des Verzeichnisses »%s« nicht setzen: %s\n"
 
-#: pg_basebackup.c:600
+#: pg_basebackup.c:623
 #, c-format
 msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
 msgstr ""
 "%s: konnte symbolische Verknüpfung von »%s« nach »%s« nicht erzeugen: %s\n"
 
-#: pg_basebackup.c:607
+#: pg_basebackup.c:630
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: unbekannter Verknüpfungsindikator »%c«\n"
 
-#: pg_basebackup.c:627
+#: pg_basebackup.c:650
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
 msgstr "%s: konnte Rechte der Datei »%s« nicht setzen: %s\n"
 
-#: pg_basebackup.c:685
+#: pg_basebackup.c:708
 #, c-format
 msgid "%s: COPY stream ended before last file was finished\n"
 msgstr "%s: COPY-Strom endete vor dem Ende der letzten Datei\n"
 
-#: pg_basebackup.c:746
+#: pg_basebackup.c:769
 msgid "Password: "
 msgstr "Passwort: "
 
-#: pg_basebackup.c:766
+#: pg_basebackup.c:789
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: konnte nicht mit Server verbinden: %s"
 
-#: pg_basebackup.c:806
+#: pg_basebackup.c:829
 #, c-format
 msgid "%s: could not send base backup command: %s"
 msgstr "%s: konnte Basissicherungsbefehl nicht senden: %s"
 
-#: pg_basebackup.c:817
+#: pg_basebackup.c:840
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s: konnte Basissicherung nicht starten: %s"
 
-#: pg_basebackup.c:823
+#: pg_basebackup.c:846
 #, c-format
 msgid "%s: no start point returned from server\n"
 msgstr "%s: kein Startpunkt vom Server zurückgegeben\n"
 
-#: pg_basebackup.c:839
+#: pg_basebackup.c:862
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: konnte Kopf der Sicherung nicht empfangen: %s"
 
-#: pg_basebackup.c:845
+#: pg_basebackup.c:868
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: keine Daten vom Server zurückgegeben\n"
 
-#: pg_basebackup.c:873
+#: pg_basebackup.c:896
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %i\n"
 msgstr ""
 "%s: kann nur einen einzelnen Tablespace auf die Standardausgabe schreiben, "
 "Datenbank hat %i\n"
 
-#: pg_basebackup.c:902
+#: pg_basebackup.c:925
 #, c-format
 msgid "%s: could not get WAL end position from server\n"
 msgstr "%s: konnte WAL-Endposition nicht vom Server empfangen\n"
 
-#: pg_basebackup.c:908
+#: pg_basebackup.c:931
 #, c-format
 msgid "%s: no WAL end position returned from server\n"
 msgstr "%s: kein WAL-Endpunkt vom Server zurückgegeben\n"
 
-#: pg_basebackup.c:920
+#: pg_basebackup.c:943
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: letztes Empfangen fehlgeschlagen: %s"
 
-#: pg_basebackup.c:994
+#: pg_basebackup.c:1017
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
 msgstr "%s: ungültiges Ausgabeformat »%s«, muss »plain« oder »tar« sein\n"
 
-#: pg_basebackup.c:1016
+#: pg_basebackup.c:1039
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: ungültiges Komprimierungsniveau »%s«\n"
 
-#: pg_basebackup.c:1028
+#: pg_basebackup.c:1051
 #, c-format
 msgid ""
 "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
 msgstr ""
 "%s: ungültiges Checkpoint-Argument »%s«, muss »fast« oder »spread« sein\n"
 
-#: pg_basebackup.c:1059 pg_basebackup.c:1073 pg_basebackup.c:1084
-#: pg_basebackup.c:1097
+#: pg_basebackup.c:1082 pg_basebackup.c:1096 pg_basebackup.c:1107
+#: pg_basebackup.c:1120
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: pg_basebackup.c:1071
+#: pg_basebackup.c:1094
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: pg_basebackup.c:1083
+#: pg_basebackup.c:1106
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: kein Zielverzeichnis angegeben\n"
 
-#: pg_basebackup.c:1095
+#: pg_basebackup.c:1118
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s: nur Sicherungen im Tar-Modus können komprimiert werden\n"
 
-#: pg_basebackup.c:1106
+#: pg_basebackup.c:1129
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: diese Installation unterstützt keine Komprimierung\n"
diff --git a/src/bin/pg_basebackup/po/es.po b/src/bin/pg_basebackup/po/es.po
index d27ce7ffa1ed3..3f9cef02455ef 100644
--- a/src/bin/pg_basebackup/po/es.po
+++ b/src/bin/pg_basebackup/po/es.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_basebackup (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-22 14:48-0400\n"
-"PO-Revision-Date: 2011-05-31 17:42-0400\n"
+"POT-Creation-Date: 2011-09-02 10:54+0000\n"
+"PO-Revision-Date: 2011-09-02 22:57-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: Spanish <pgsql-es-ayuda@postgresql.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: pg_basebackup.c:96 pg_basebackup.c:110
 #, c-format
@@ -27,7 +28,8 @@ msgid ""
 "%s takes a base backup of a running PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s obtiene un respaldo base a partir de un servidor PostgreSQL en ejecución.\n"
+"%s obtiene un respaldo base a partir de un servidor PostgreSQL en "
+"ejecución.\n"
 "\n"
 
 #: pg_basebackup.c:123
@@ -38,7 +40,7 @@ msgstr "Empleo:\n"
 #: pg_basebackup.c:124
 #, c-format
 msgid "  %s [OPTION]...\n"
-msgstr "  %s [OPCIÓN]...\n" 
+msgstr "  %s [OPCIÓN]...\n"
 
 #: pg_basebackup.c:125
 #, c-format
@@ -62,24 +64,34 @@ msgstr "  -F, --format=p|t         formato de salida (plano, tar)\n"
 #: pg_basebackup.c:128
 #, c-format
 msgid "  -x, --xlog               include required WAL files in backup\n"
-msgstr "  -x, --xlog               incluye los archivos WAL necesarios en el respaldo\n"
+msgstr ""
+"  -x, --xlog               incluye los archivos WAL necesarios en el "
+"respaldo\n"
 
 #: pg_basebackup.c:129
 #, c-format
-msgid "  -Z, --compress=0-9       compress tar output\n"
-msgstr "  -Z, --compress=0-9       comprimir la salida de tar\n"
+msgid "  -z, --gzip               compress tar output\n"
+msgstr "  -z, --gzip               comprimir la salida de tar\n"
 
 #: pg_basebackup.c:130
 #, c-format
 msgid ""
+"  -Z, --compress=0-9       compress tar output with given compression level\n"
+msgstr ""
+"  -Z, --compress=0-9       comprimir salida tar con el nivel de compresión "
+"dado\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
 "\n"
 "General options:\n"
 msgstr ""
 "\n"
 "Opciones generales:\n"
 
-#: pg_basebackup.c:131
-#, c-format, fuzzy
+#: pg_basebackup.c:132
+#, c-format
 msgid ""
 "  -c, --checkpoint=fast|spread\n"
 "                           set fast or spread checkpointing\n"
@@ -87,32 +99,33 @@ msgstr ""
 "  -c, --checkpoint=fast|spread\n"
 "                           utilizar checkpoint rápido o extendido\n"
 
-#: pg_basebackup.c:133
+#: pg_basebackup.c:134
 #, c-format
 msgid "  -l, --label=LABEL        set backup label\n"
 msgstr "  -l, --label=ETIQUETA     establecer etiqueta del respaldo\n"
 
-#: pg_basebackup.c:134
-#, c-format, fuzzy
+#: pg_basebackup.c:135
+#, c-format
 msgid "  -P, --progress           show progress information\n"
 msgstr "  -P, --progress           mostrar información de progreso\n"
 
-#: pg_basebackup.c:135
+#: pg_basebackup.c:136
 #, c-format
 msgid "  -v, --verbose            output verbose messages\n"
 msgstr "  -v, --verbose            desplegar mensajes verbosos\n"
 
-#: pg_basebackup.c:136
+#: pg_basebackup.c:137
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   mostrar esta ayuda, luego salir\n"
 
-#: pg_basebackup.c:137
+#: pg_basebackup.c:138
 #, c-format
 msgid "  --version                output version information, then exit\n"
-msgstr "  --version                desplegar información de versión, luego salir\n"
+msgstr ""
+"  --version                desplegar información de versión, luego salir\n"
 
-#: pg_basebackup.c:138
+#: pg_basebackup.c:139
 #, c-format
 msgid ""
 "\n"
@@ -121,27 +134,28 @@ msgstr ""
 "\n"
 "Opciones de conexión:\n"
 
-#: pg_basebackup.c:139
+#: pg_basebackup.c:140
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
-msgstr "  -h, --host=ANFITRIÓN     dirección del servidor o directorio del socket\n"
+msgstr ""
+"  -h, --host=ANFITRIÓN     dirección del servidor o directorio del socket\n"
 
-#: pg_basebackup.c:140
+#: pg_basebackup.c:141
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          número de port del servidor\n"
 
-#: pg_basebackup.c:141
+#: pg_basebackup.c:142
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NOMBRE    conectarse con el usuario especificado\n"
 
-#: pg_basebackup.c:142
+#: pg_basebackup.c:143
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        no pedir contraseña\n"
 
-#: pg_basebackup.c:143
+#: pg_basebackup.c:144
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -150,7 +164,7 @@ msgstr ""
 "  -W, --password           forzar un prompt para la contraseña\n"
 "                           (debería ser automático)\n"
 
-#: pg_basebackup.c:144
+#: pg_basebackup.c:145
 #, c-format
 msgid ""
 "\n"
@@ -159,195 +173,214 @@ msgstr ""
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_basebackup.c:166 pg_basebackup.c:558
+#: pg_basebackup.c:167 pg_basebackup.c:604
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
 
-#: pg_basebackup.c:183
+#: pg_basebackup.c:184
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: el directorio «%s» existe pero no está vacío\n"
 
-#: pg_basebackup.c:191
+#: pg_basebackup.c:192
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
 
-#: pg_basebackup.c:274 pg_basebackup.c:298
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgstr[1] "%s/%s kB (100%%), %d/%d tablespaces %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgstr[1] "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s kB (%d%%), %d/%d tablespace"
+msgstr[1] "%s/%s kB (%d%%), %d/%d tablespaces"
+
+#: pg_basebackup.c:295 pg_basebackup.c:313 pg_basebackup.c:337
 #, c-format
 msgid "%s: could not set compression level %i: %s\n"
 msgstr "%s: no se pudo definir el nivel de compresión %i: %s\n"
 
-#: pg_basebackup.c:317
+#: pg_basebackup.c:356
 #, c-format
 msgid "%s: could not create compressed file \"%s\": %s\n"
 msgstr "%s: no se pudo crear el archivo comprimido «%s»: %s\n"
 
-#: pg_basebackup.c:328 pg_basebackup.c:597
+#: pg_basebackup.c:367 pg_basebackup.c:643
 #, c-format
 msgid "%s: could not create file \"%s\": %s\n"
 msgstr "%s: no se pudo crear el archivo «%s»: %s\n"
 
-#: pg_basebackup.c:340 pg_basebackup.c:470
+#: pg_basebackup.c:379 pg_basebackup.c:516
 #, c-format
 msgid "%s: could not get COPY data stream: %s"
 msgstr "%s: no se pudo obtener un flujo de datos COPY: %s"
 
-#: pg_basebackup.c:372 pg_basebackup.c:411
+#: pg_basebackup.c:411 pg_basebackup.c:457
 #, c-format
 msgid "%s: could not write to compressed file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir al archivo comprimido «%s»: %s\n"
 
-#: pg_basebackup.c:381 pg_basebackup.c:420 pg_basebackup.c:637
+#: pg_basebackup.c:420 pg_basebackup.c:466 pg_basebackup.c:683
 #, c-format
 msgid "%s: could not write to file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir al archivo «%s»: %s\n"
 
-#: pg_basebackup.c:401 pg_basebackup.c:499
+#: pg_basebackup.c:447 pg_basebackup.c:545
 #, c-format
 msgid "%s: could not read COPY data: %s"
 msgstr "%s: no fue posible leer datos COPY: %s"
 
-#: pg_basebackup.c:513
+#: pg_basebackup.c:559
 #, c-format
 msgid "%s: invalid tar block header size: %i\n"
 msgstr "%s: tamaño de bloque de cabecera de tar no válido: %i\n"
 
-#: pg_basebackup.c:521
+#: pg_basebackup.c:567
 #, c-format
 msgid "%s: could not parse file size\n"
 msgstr "%s: no se pudo interpretar el tamaño del archivo\n"
 
-#: pg_basebackup.c:529
+#: pg_basebackup.c:575
 #, c-format
 msgid "%s: could not parse file mode\n"
 msgstr "%s: nose pudo interpretar el modo del archivo\n"
 
-#: pg_basebackup.c:564
+#: pg_basebackup.c:610
 #, c-format
 msgid "%s: could not set permissions on directory \"%s\": %s\n"
 msgstr "%s: no se pudo definir los permisos en el directorio «%s»: %s\n"
 
-#: pg_basebackup.c:577
-# FIXME: Why no quotes?
+#: pg_basebackup.c:623
 #, c-format
-msgid "%s: could not create symbolic link from %s to %s: %s\n"
-msgstr "%s: no se pudo crear un enlace simbólico desde %s a %s: %s\n"
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s: no se pudo crear un enlace simbólico desde «%s» a «%s»: %s\n"
 
-#: pg_basebackup.c:584
+#: pg_basebackup.c:630
 #, c-format
 msgid "%s: unrecognized link indicator \"%c\"\n"
 msgstr "%s: indicador de enlace «%c» no reconocido\n"
 
-#: pg_basebackup.c:604
+#: pg_basebackup.c:650
 #, c-format
 msgid "%s: could not set permissions on file \"%s\": %s\n"
 msgstr "%s: no se pudo definir los permisos al archivo «%s»: %s\n"
 
-#: pg_basebackup.c:662
+#: pg_basebackup.c:708
 #, c-format
-msgid "%s: last file was never finished\n"
-msgstr "%s: el último archivo nunca fue completado\n"
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr ""
+"%s: el flujo COPY terminó antes que el último archivo estuviera completo\n"
 
-#: pg_basebackup.c:723
+#: pg_basebackup.c:769
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: pg_basebackup.c:743
+#: pg_basebackup.c:789
 #, c-format
 msgid "%s: could not connect to server: %s"
 msgstr "%s: no se pudo conectar al servidor: %s"
 
-#: pg_basebackup.c:783
+#: pg_basebackup.c:829
 #, c-format
-msgid "%s: could not start base backup: %s"
-msgstr "%s: no se pudo comenzar el respaldo base: %s"
+msgid "%s: could not send base backup command: %s"
+msgstr "%s: no se pudo enviar la orden de respaldo base: %s"
 
-#: pg_basebackup.c:794
+#: pg_basebackup.c:840
 #, c-format
 msgid "%s: could not initiate base backup: %s"
 msgstr "%s: no se pudo iniciar el respaldo base: %s"
 
-#: pg_basebackup.c:800
+#: pg_basebackup.c:846
 #, c-format
 msgid "%s: no start point returned from server\n"
 msgstr "%s: el servidor no retornó un punto de inicio\n"
 
-#: pg_basebackup.c:816
+#: pg_basebackup.c:862
 #, c-format
 msgid "%s: could not get backup header: %s"
 msgstr "%s: no se pudo obtener la cabecera de respaldo: %s"
 
-#: pg_basebackup.c:822
+#: pg_basebackup.c:868
 #, c-format
 msgid "%s: no data returned from server\n"
 msgstr "%s: el servidor no retornó datos\n"
 
-#: pg_basebackup.c:850
+#: pg_basebackup.c:896
 #, c-format
 msgid "%s: can only write single tablespace to stdout, database has %i\n"
-msgstr "%s: sólo se puede escribir un tablespace a stdout, la base de datos tiene %i\n"
+msgstr ""
+"%s: sólo se puede escribir un tablespace a stdout, la base de datos tiene "
+"%i\n"
 
-#: pg_basebackup.c:879
+#: pg_basebackup.c:925
 #, c-format
-msgid "%s: could not get end xlog position from server\n"
-msgstr "%s: no se pudo obtener la posición de fin de xlog del servidor\n"
+msgid "%s: could not get WAL end position from server\n"
+msgstr "%s: no se pudo obtener la posición de fin de WAL del servidor\n"
 
-#: pg_basebackup.c:885
+#: pg_basebackup.c:931
 #, c-format
-msgid "%s: no end point returned from server\n"
-msgstr "%s: el servidor no retornó un punto de fin de xlog\n"
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s: el servidor no retornó un punto de fin de WAL\n"
 
-#: pg_basebackup.c:897
+#: pg_basebackup.c:943
 #, c-format
 msgid "%s: final receive failed: %s"
 msgstr "%s: la recepción final falló: %s"
 
-#: pg_basebackup.c:970
+#: pg_basebackup.c:1017
 #, c-format
 msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
 msgstr "%s: formato de salida «%s» no válido, debe ser «plain» o «tar»\n"
 
-#: pg_basebackup.c:985
+#: pg_basebackup.c:1039
 #, c-format
 msgid "%s: invalid compression level \"%s\"\n"
 msgstr "%s: valor de compresión «%s» no válido\n"
 
-#: pg_basebackup.c:997
+#: pg_basebackup.c:1051
 #, c-format
 msgid ""
 "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
 msgstr ""
 "%s: argumento de checkpoint «%s» no válido, debe ser «fast» o «spread»\n"
 
-#: pg_basebackup.c:1028 pg_basebackup.c:1042 pg_basebackup.c:1053
-#: pg_basebackup.c:1066
+#: pg_basebackup.c:1082 pg_basebackup.c:1096 pg_basebackup.c:1107
+#: pg_basebackup.c:1120
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: pg_basebackup.c:1040
+#: pg_basebackup.c:1094
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
+msgstr ""
+"%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
 
-#: pg_basebackup.c:1052
+#: pg_basebackup.c:1106
 #, c-format
 msgid "%s: no target directory specified\n"
 msgstr "%s: no se especificó un directorio de salida\n"
 
-#: pg_basebackup.c:1064
+#: pg_basebackup.c:1118
 #, c-format
 msgid "%s: only tar mode backups can be compressed\n"
 msgstr "%s: sólo los respaldos de modo tar pueden ser comprimidos\n"
 
-#: pg_basebackup.c:1075
+#: pg_basebackup.c:1129
 #, c-format
 msgid "%s: this build does not support compression\n"
 msgstr "%s: esta instalación no soporta compresión\n"
-
-#: pg_basebackup.c:1083
-#, c-format
-msgid "%s: compression is not supported on standard output\n"
-msgstr "%s: la compresión no está soportada en standard output\n"
diff --git a/src/bin/pg_basebackup/po/fr.po b/src/bin/pg_basebackup/po/fr.po
new file mode 100644
index 0000000000000..09592328dfd82
--- /dev/null
+++ b/src/bin/pg_basebackup/po/fr.po
@@ -0,0 +1,393 @@
+# LANGUAGE message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.2\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-05 18:55+0000\n"
+"PO-Revision-Date: 2011-09-05 22:25+0100\n"
+"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
+"Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: pg_basebackup.c:96
+#: pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s : mémoire épuisée\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s prend une sauvegarde binaire d'un serveur PostgreSQL en cours d'exécution.\n"
+"\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "Usage :\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [OPTION]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"Options contrôlant la sortie :\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid "  -D, --pgdata=DIRECTORY   receive base backup into directory\n"
+msgstr "  -D, --pgdata=RÉPERTOIRE      enregistre la sauvegarde dans ce répertoire\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid "  -F, --format=p|t         output format (plain, tar)\n"
+msgstr "  -F, --format=p|t             format en sortie (plusieurs fichiers, tar)\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid "  -x, --xlog               include required WAL files in backup\n"
+msgstr ""
+"  -x, --xlog                   inclut les journaux de transactions nécessaire\n"
+"                               à la restauration de la sauvegarde\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid "  -z, --gzip               compress tar output\n"
+msgstr "  -z, --gzip                   compresse la sortie tar\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid "  -Z, --compress=0-9       compress tar output with given compression level\n"
+msgstr ""
+"  -Z, --compress=0-9           compresse la sortie tar avec le niveau de\n"
+"                               compression indiquée\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Options générales :\n"
+
+#: pg_basebackup.c:132
+#, c-format
+msgid ""
+"  -c, --checkpoint=fast|spread\n"
+"                           set fast or spread checkpointing\n"
+msgstr "  -c, --checkpoint=fast|spread configure un CHECKPOINT rapide ou réparti\n"
+
+#: pg_basebackup.c:134
+#, c-format
+msgid "  -l, --label=LABEL        set backup label\n"
+msgstr "  -l, --label=LABEL            configure le label de sauvegarde\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid "  -P, --progress           show progress information\n"
+msgstr "  -P, --progress               affiche la progression de la sauvegarde\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid "  -v, --verbose            output verbose messages\n"
+msgstr "  -v, --verbose                affiche des messages verbeux\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                       affiche cette aide et quitte\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                    affiche la version et quitte\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Options de connexion :\n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=NOMHÔTE           hôte du serveur de bases de données ou\n"
+"                               répertoire des sockets\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr ""
+"  -p, --port=PORT              numéro de port du serveur de bases de\n"
+"                               données\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr "  -U, --username=NOM           se connecter avec cet utilisateur\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password            ne demande jamais le mot de passe\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid "  -W, --password           force password prompt (should happen automatically)\n"
+msgstr ""
+"  -W, --password               force la demande du mot de passe (par\n"
+"                               défaut)\n"
+
+#: pg_basebackup.c:145
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:167
+#: pg_basebackup.c:604
+#, 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"
+
+#: pg_basebackup.c:184
+#, 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"
+
+#: pg_basebackup.c:192
+#, 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"
+
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s Ko (100%%), %d/%d tablespace %35s"
+msgstr[1] "%s/%s Ko (100%%), %d/%d tablespaces %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s Ko (%d%%), %d/%d tablespace (%-30.30s)"
+msgstr[1] "%s/%s Ko (%d%%), %d/%d tablespaces (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s Ko (%d%%), %d/%d tablespace"
+msgstr[1] "%s/%s Ko (%d%%), %d/%d tablespaces"
+
+#: pg_basebackup.c:295
+#: pg_basebackup.c:313
+#: pg_basebackup.c:337
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s : n'a pas pu configurer le niveau de compression %i : %s\n"
+
+#: pg_basebackup.c:356
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s : n'a pas pu créer le fichier compressé « %s » : %s\n"
+
+#: pg_basebackup.c:367
+#: pg_basebackup.c:643
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s : n'a pas pu créer le fichier « %s » : %s\n"
+
+#: pg_basebackup.c:379
+#: pg_basebackup.c:516
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s : n'a pas pu obtenir le flux de données de COPY : %s"
+
+#: pg_basebackup.c:411
+#: pg_basebackup.c:457
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s : n'a pas pu écrire dans le fichier compressé « %s » : %s\n"
+
+#: pg_basebackup.c:420
+#: pg_basebackup.c:466
+#: pg_basebackup.c:683
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s : n'a pas pu écrire dans le fichier « %s » : %s\n"
+
+#: pg_basebackup.c:447
+#: pg_basebackup.c:545
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s : n'a pas pu lire les données du COPY : %s"
+
+#: pg_basebackup.c:559
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s : taille invalide de l'en-tête de bloc du fichier tar : %i\n"
+
+#: pg_basebackup.c:567
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s : n'a pas pu analyser la taille du fichier\n"
+
+#: pg_basebackup.c:575
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s : n'a pas pu analyser le mode du fichier\n"
+
+#: pg_basebackup.c:610
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s : n'a pas configurer les droits sur le répertoire « %s » : %s\n"
+
+#: pg_basebackup.c:623
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s : n'a pas pu créer le lien symbolique de « %s » vers « %s » : %s\n"
+
+#: pg_basebackup.c:630
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s : indicateur de lien « %c » non reconnu\n"
+
+#: pg_basebackup.c:650
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s : n'a pas pu configurer les droits sur le fichier « %s » : %s\n"
+
+#: pg_basebackup.c:708
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s : le flux COPY s'est terminé avant que le dernier fichier soit terminé\n"
+
+#: pg_basebackup.c:769
+msgid "Password: "
+msgstr "Mot de passe : "
+
+#: pg_basebackup.c:789
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s : n'a pas pu se connecter au serveur : %s"
+
+#: pg_basebackup.c:829
+#, c-format
+msgid "%s: could not send base backup command: %s"
+msgstr "%s : n'a pas pu envoyer la commande de sauvegarde de base : %s"
+
+#: pg_basebackup.c:840
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s : n'a pas pu initier la sauvegarde de base : %s"
+
+#: pg_basebackup.c:846
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s : aucun point de redémarrage renvoyé du serveur\n"
+
+#: pg_basebackup.c:862
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s : n'a pas pu obtenir l'en-tête du serveur : %s"
+
+#: pg_basebackup.c:868
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s : aucune donnée renvoyée du serveur\n"
+
+#: pg_basebackup.c:896
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr "%s : peut seulement écrire un tablespace sur la sortie standard, la base en a %i\n"
+
+#: pg_basebackup.c:925
+#, c-format
+msgid "%s: could not get WAL end position from server\n"
+msgstr ""
+"%s : n'a pas pu obtenir la position finale des journaux de transactions à\n"
+"partir du serveur\n"
+
+#: pg_basebackup.c:931
+#, c-format
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s : aucune position de fin du journal de transaction renvoyée par le serveur\n"
+
+#: pg_basebackup.c:943
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s : échec lors de la réception finale : %s"
+
+#: pg_basebackup.c:1017
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr "%s : format de sortie « %s » invalide, doit être soit « plain » soit « tar »\n"
+
+#: pg_basebackup.c:1039
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s : niveau de compression « %s » invalide\n"
+
+#: pg_basebackup.c:1051
+#, c-format
+msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr ""
+"%s : argument « %s » invalide pour le CHECKPOINT, doit être soit « fast »\n"
+"soit « spread »\n"
+
+#: pg_basebackup.c:1082
+#: pg_basebackup.c:1096
+#: pg_basebackup.c:1107
+#: pg_basebackup.c:1120
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Essayer « %s --help » pour plus d'informations.\n"
+
+#: pg_basebackup.c:1094
+#, 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"
+
+#: pg_basebackup.c:1106
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s : aucun répertoire cible indiqué\n"
+
+#: pg_basebackup.c:1118
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s : seules les sauvegardes en mode tar peuvent être compressées\n"
+
+#: pg_basebackup.c:1129
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s : cette construction ne supporte pas la compression\n"
+
diff --git a/src/bin/pg_basebackup/po/ja.po b/src/bin/pg_basebackup/po/ja.po
new file mode 100644
index 0000000000000..d055de32c6d68
--- /dev/null
+++ b/src/bin/pg_basebackup/po/ja.po
@@ -0,0 +1,380 @@
+# LANGUAGE message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-27 16:29+0900\n"
+"PO-Revision-Date: 2011-08-30 21:26+0900\n"
+"Last-Translator: honda@postgresql.jp\n"
+"Language-Team: Japan Postgresql User Group\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: pg_basebackup.c:96 pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: メモリ�足��\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr "%s�実行中�PostgreSQLサー��ベース�ックアップを�得���。\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "使用方法:\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [OPTION]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"出力を制御�るオプション:\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid "  -D, --pgdata=DIRECTORY   receive base backup into directory\n"
+msgstr ""
+"  -D, --pgdata=DIRECTORY   ディレクトリ内�ベース�ックアップを格����\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid "  -F, --format=p|t         output format (plain, tar)\n"
+msgstr "  -F, --format=p|t         出力フォーマット（プレイン���tar）\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid "  -x, --xlog               include required WAL files in backup\n"
+msgstr ""
+"  -x, --xlog               必��WALファイルを�ックアップ内�����\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid "  -z, --gzip               compress tar output\n"
+msgstr "  -z, --gzip               tar出力を圧縮���\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid ""
+"  -Z, --compress=0-9       compress tar output with given compression level\n"
+msgstr "  -Z, --compress=0-9       指定��圧縮レベル�tar出力を圧縮���\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"汎用�オプション:\n"
+
+#: pg_basebackup.c:132
+#, c-format
+msgid ""
+"  -c, --checkpoint=fast|spread\n"
+"                           set fast or spread checkpointing\n"
+msgstr ""
+"  -c, --checkpoint=fast|spread\n"
+"                           高速�ェック�イント処����分散�ェック�イント"
+"処�\n"
+
+#: pg_basebackup.c:134
+#, c-format
+msgid "  -l, --label=LABEL        set backup label\n"
+msgstr "  -l, --label=LABEL        �ックアップラベル�設定\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid "  -P, --progress           show progress information\n"
+msgstr "  -P, --progress           進行状��表示\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid "  -v, --verbose            output verbose messages\n"
+msgstr "  -v, --verbose            冗長メッセージ�出力\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   ��ヘルプを表示�終了���\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                �ージョン情報を出力�終了���\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"接続オプション:\n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME      データベースサー�ホスト���ソケットディレクト"
+"リ\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          データベースサー���ート番�\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr "  -U, --username=NAME      指定��データベースユーザ�接続\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        パスワード入力を促���\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+" -W, --password           強制的�パスワード入力を促�（自動的�行�れる��"
+"��）\n"
+
+#: pg_basebackup.c:145
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"�具��<pgsql-bugs@postgresql.org>��報告����\n"
+
+#: pg_basebackup.c:167 pg_basebackup.c:604
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: \"%s\"ディレクトリを作��る�������ん���: %s\n"
+
+#: pg_basebackup.c:184
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: \"%s\"ディレクトリ�存在����空���り��ん\n"
+
+#: pg_basebackup.c:192
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: \"%s\"ディレクトリ�アクセス����ん���: %s\n"
+
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s kB (100%%), %d/%d テーブル空間 %35s"
+msgstr[1] "%s/%s kB (100%%), %d/%d テーブル空間 %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s kB (%d%%), %d/%d テーブル空間 (%-30.30s)"
+msgstr[1] "%s/%s kB (%d%%), %d/%d テーブル空間 (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s kB (%d%%), %d/%d テーブル空間"
+msgstr[1] "%s/%s kB (%d%%), %d/%d テーブル空間"
+
+#: pg_basebackup.c:295 pg_basebackup.c:313 pg_basebackup.c:337
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s: 圧縮レベルを%i�設定�る�������ん���: %s\n"
+
+#: pg_basebackup.c:356
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: \"%s\"圧縮ファイルを作��る�������ん���: %s\n"
+
+#: pg_basebackup.c:367 pg_basebackup.c:643
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: \"%s\"ファイルを作��る�������ん���: %s\n"
+
+#: pg_basebackup.c:379 pg_basebackup.c:516
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: COPYデータストリームを入手����ん���: %s"
+
+#: pg_basebackup.c:411 pg_basebackup.c:457
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: \"%s\"圧縮ファイル�書�出��������ん���: %s\n"
+
+#: pg_basebackup.c:420 pg_basebackup.c:466 pg_basebackup.c:683
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: \"%s\"ファイル�書�出��������ん���: %s\n"
+
+#: pg_basebackup.c:447 pg_basebackup.c:545
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: COPYデータを読��る�������ん���: %s"
+
+#: pg_basebackup.c:559
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s: 無効�tarブロックヘッダサイズ: %i\n"
+
+#: pg_basebackup.c:567
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: ファイルサイズ�解������ん���\n"
+
+#: pg_basebackup.c:575
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: ファイルモード�解������ん���\n"
+
+#: pg_basebackup.c:610
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: \"%s\"ディレクトリ�権�を設定�る�������ん���: %s\n"
+
+#: pg_basebackup.c:623
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s: \"%s\"�ら\"%s\"��シンボリックリンクを作�����ん���: %s\n"
+
+#: pg_basebackup.c:630
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s: 未知�リンク指示�\"%c\"\n"
+
+#: pg_basebackup.c:650
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: \"%s\"ファイル�権�を設定����ん���: %s\n"
+
+#: pg_basebackup.c:708
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s: 最後�ファイル�終�る��COPYストリーム�完了����\n"
+
+#: pg_basebackup.c:769
+msgid "Password: "
+msgstr "パスワード: "
+
+#: pg_basebackup.c:789
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s: サー��接続����ん���: %s"
+
+#: pg_basebackup.c:829
+#, c-format
+msgid "%s: could not send base backup command: %s"
+msgstr "%s: ベース�ックアップコマンドを�信����ん���: %s"
+
+#: pg_basebackup.c:840
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: ベース�ックアップを�期化����ん���: %s"
+
+#: pg_basebackup.c:846
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s: サー��らスタート�イント�返り��ん���\n"
+
+#: pg_basebackup.c:862
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: �ックアップヘッダを入手����ん���: %s"
+
+#: pg_basebackup.c:868
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: サー��ら返�れるデータ��り��ん\n"
+
+#: pg_basebackup.c:896
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr ""
+"%s: データベース��%i�り�����１��テーブル空間��標準出力�書�出�"
+"れ���\n"
+
+#: pg_basebackup.c:925
+#, c-format
+msgid "%s: could not get WAL end position from server\n"
+msgstr "%s: サー��らWAL終了�置を入手����ん���\n"
+
+#: pg_basebackup.c:931
+#, c-format
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s: サー��らWAL終了�置�返�れ��ん���\n"
+
+#: pg_basebackup.c:943
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s: 最終�信�失敗����: %s"
+
+#: pg_basebackup.c:1017
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr ""
+"%s: \"%s\"出力フォーマット�無効��。\"plain\"�\"tar\"���れ��り��"
+"ã‚“\n"
+
+#: pg_basebackup.c:1039
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: \"%s\"圧縮レベル�無効��\n"
+
+#: pg_basebackup.c:1051
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr "%s: \"%s\"�ェック�イント引数�無効��。\"fast\"���\"spread\"���れ��り��ん\n"
+
+#: pg_basebackup.c:1082 pg_basebackup.c:1096 pg_basebackup.c:1107
+#: pg_basebackup.c:1120
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "詳細�����\"%s --help\"を実行������。\n"
+
+#: pg_basebackup.c:1094
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: コマンドライン引数�多����(最��\"%s\"��)\n"
+
+#: pg_basebackup.c:1106
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: 対象ディレクトリ�指定�れ����ん\n"
+
+#: pg_basebackup.c:1118
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: tarモード��ックアップ��圧縮�る�������\n"
+
+#: pg_basebackup.c:1129
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: ��構築��圧縮をサ�ート�����ん\n"
diff --git a/src/bin/pg_basebackup/po/pl.po b/src/bin/pg_basebackup/po/pl.po
new file mode 100644
index 0000000000000..5b30ac01b38fa
--- /dev/null
+++ b/src/bin/pg_basebackup/po/pl.po
@@ -0,0 +1,388 @@
+# Polish message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_basebackup (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:55+0000\n"
+"PO-Revision-Date: 2011-09-30 09:52-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Polish TotroiseSvn translation team\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pg_basebackup.c:96 pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: brak pamięci\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s bierze podstawową kopię zapasową działającego serwera PostgreSQL.\n"
+"\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [OPCJA]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"Opcje kontroli wyjścia:\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid "  -D, --pgdata=DIRECTORY   receive base backup into directory\n"
+msgstr "  -D, --pgdata=FOLDER      dostarcza kopiÄ™ zapasowÄ… bazy do katalogu\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid "  -F, --format=p|t         output format (plain, tar)\n"
+msgstr "  -F, --format=p|t         format wyjścia (plain, tar)\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid "  -x, --xlog               include required WAL files in backup\n"
+msgstr ""
+"  -x, --xlog               dołącza wymagane pliki WAL do kopii zapasowej\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid "  -z, --gzip               compress tar output\n"
+msgstr "  -z, --gzip               wyjście jako spakowany tar\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid ""
+"  -Z, --compress=0-9       compress tar output with given compression level\n"
+msgstr ""
+"  -Z, --compress=0-9       wyjście jako spakowany tar z określonym poziomem "
+"kompresji\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Opcje ogólne:\n"
+
+#: pg_basebackup.c:132
+#, c-format
+msgid ""
+"  -c, --checkpoint=fast|spread\n"
+"                           set fast or spread checkpointing\n"
+msgstr ""
+"  -c, --checkpoint=fast|spread\n"
+"                           ustawia szybkie lub rozszerzone sprawdzenia\n"
+
+#: pg_basebackup.c:134
+#, c-format
+msgid "  -l, --label=LABEL        set backup label\n"
+msgstr "  -l, --label=ETYKIETA     ustala etykietÄ™ kopii zapasowej\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid "  -P, --progress           show progress information\n"
+msgstr "  -P, --progress           pokazanie informacji o postępie\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid "  -v, --verbose            output verbose messages\n"
+msgstr "  -v, --verbose            szczegółowe komunikaty na wyjściu\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   pokazuje ten ekran pomocy i kończy\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                pokazuje informacje o wersji i kończy\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Opcje połączenia:\n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=NAZWAHOSTA    host serwera bazy danych lub katalog gniazda\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          numer portu na serwera bazy dnaych\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr "  -U, --username=NAZWA     połączenie jako wskazany użytkownik bazy\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nie pytaj nigdy o hasło\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           wymuś pytanie o hasło (powinno nastąpić "
+"automatycznie)\n"
+
+#: pg_basebackup.c:145
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:167 pg_basebackup.c:604
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: nie można utworzyć katalogu \"%s\": %s\n"
+
+#: pg_basebackup.c:184
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: folder \"%s\" nie jest pusty\n"
+
+#: pg_basebackup.c:192
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: brak dostępu do katalogu \"%s\": %s\n"
+
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s kB (100%%), %d/%d przestrzeń tabel %35s"
+msgstr[1] "%s/%s kB (100%%), %d/%d przestrzenie tabel %35s"
+msgstr[2] "%s/%s kB (100%%), %d/%d przestrzeni tabel %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s kB (%d%%), %d/%d przestrzeń tabel (%-30.30s)"
+msgstr[1] "%s/%s kB (%d%%), %d/%d przestrzenie tabel (%-30.30s)"
+msgstr[2] "%s/%s kB (%d%%), %d/%d przestrzeni tabel (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s kB (%d%%), %d/%d przestrzeń tabel"
+msgstr[1] "%s/%s kB (%d%%), %d/%d przestrzenie tabel"
+msgstr[2] "%s/%s kB (%d%%), %d/%d przestrzeni tabel"
+
+#: pg_basebackup.c:295 pg_basebackup.c:313 pg_basebackup.c:337
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s: nie można ustawić poziomu kompresji %i: %s\n"
+
+#: pg_basebackup.c:356
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: nie można utworzyć spakowanego pliku \"%s\": %s\n"
+
+#: pg_basebackup.c:367 pg_basebackup.c:643
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: nie można utworzyć pliku \"%s\": %s\n"
+
+#: pg_basebackup.c:379 pg_basebackup.c:516
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: nie można pobrać strumienia danych COPY: %s"
+
+#: pg_basebackup.c:411 pg_basebackup.c:457
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: nie można pisać do spakowanego pliku \"%s\": %s\n"
+
+#: pg_basebackup.c:420 pg_basebackup.c:466 pg_basebackup.c:683
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: nie można pisać do pliku \"%s\": %s\n"
+
+#: pg_basebackup.c:447 pg_basebackup.c:545
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: nie można odczytać danych COPY: %s"
+
+#: pg_basebackup.c:559
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s: nieprawidłowy rozmiar nagłówka bloku tar: %i\n"
+
+#: pg_basebackup.c:567
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: nie można odczytać rozmiaru pliku\n"
+
+#: pg_basebackup.c:575
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: nie można odczytać trybu pliku\n"
+
+#: pg_basebackup.c:610
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: nie można ustawić uprawnień do folderu \"%s\": %s\n"
+
+#: pg_basebackup.c:623
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s: nie można utworzyć linku symbolicznego dla \"%s\" na \"%s\": %s\n"
+
+#: pg_basebackup.c:630
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s: nierozpoznany wskaźnik linku \"%c\"\n"
+
+#: pg_basebackup.c:650
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: nie można ustawić uprawnień do pliku \"%s\": %s\n"
+
+#: pg_basebackup.c:708
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s: strumień COPY zakończony zanim skończył się ostatni plik\n"
+
+#: pg_basebackup.c:769
+msgid "Password: "
+msgstr "Hasło: "
+
+#: pg_basebackup.c:789
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s: nie można połączyć z serwerem: %s"
+
+#: pg_basebackup.c:829
+#, c-format
+msgid "%s: could not send base backup command: %s"
+msgstr "%s: nie można wysłać polecenia wykonania kopii zapasowej bazy: %s"
+
+#: pg_basebackup.c:840
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: nie można zainicjować kopii zapasowej bazy: %s"
+
+#: pg_basebackup.c:846
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s: nie zwrócono punktu startowego z serwera\n"
+
+#: pg_basebackup.c:862
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: nie można pobrać nagłówka kopii zapasowej: %s"
+
+#: pg_basebackup.c:868
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: nie zwrócono żadnych danych z serwera\n"
+
+#: pg_basebackup.c:896
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr ""
+"%s: można zapisać tylko pojedynczą przestrzeń tabel do stdout, baza danych "
+"ma %i\n"
+
+#: pg_basebackup.c:925
+#, c-format
+msgid "%s: could not get WAL end position from server\n"
+msgstr "%s: nie można pobrać pozycji końca WAL z serwera\n"
+
+#: pg_basebackup.c:931
+#, c-format
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s: nie zwrócono pozycji końca WAL z serwera\n"
+
+#: pg_basebackup.c:943
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s: ostateczne pobieranie nie powiodło się: %s"
+
+#: pg_basebackup.c:1017
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr ""
+"%s: niepoprawny format wyjścia \"%s\", musi być \"plain\" lub \"tar\"\n"
+
+#: pg_basebackup.c:1039
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: niepoprawny poziom kompresji \"%s\"\n"
+
+#: pg_basebackup.c:1051
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr ""
+"%s: niepoprawny argument checkpoint \"%s\", musi być \"fast\" lub \"spread"
+"\"\n"
+
+#: pg_basebackup.c:1082 pg_basebackup.c:1096 pg_basebackup.c:1107
+#: pg_basebackup.c:1120
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: pg_basebackup.c:1094
+#, 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"
+
+#: pg_basebackup.c:1106
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: nie wskazano folderu docelowego\n"
+
+#: pg_basebackup.c:1118
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: tylko kopie zapasowe w trybie tar mogą być spakowane\n"
+
+#: pg_basebackup.c:1129
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: ta kompilacja nie obsługuje kompresji\n"
diff --git a/src/bin/pg_basebackup/po/pt_BR.po b/src/bin/pg_basebackup/po/pt_BR.po
new file mode 100644
index 0000000000000..c9a48bd16f3ff
--- /dev/null
+++ b/src/bin/pg_basebackup/po/pt_BR.po
@@ -0,0 +1,381 @@
+# Brazilian Portuguese message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-20 23:32-0300\n"
+"PO-Revision-Date: 2011-08-20 23:33-0300\n"
+"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
+"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: pg_basebackup.c:96 pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: sem memória\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s faz uma cópia de segurança base de um servidor PostgreSQL em execução.\n"
+"\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "Uso:\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [OPÇÃO]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"Opções que controlam a saída:\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid "  -D, --pgdata=DIRECTORY   receive base backup into directory\n"
+msgstr "  -D, --pgdata=DIRETÓRIO   armazena a cópia de segurança base no diretório\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid "  -F, --format=p|t         output format (plain, tar)\n"
+msgstr "  -F, --format=p|t         formato de saída (texto, tar)\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid "  -x, --xlog               include required WAL files in backup\n"
+msgstr "  -x, --xlog               inclui os arquivos do WAL requeridos na cópia de segurança\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid "  -z, --gzip               compress tar output\n"
+msgstr "  -z, --gzip               comprime saída do tar\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid ""
+"  -Z, --compress=0-9       compress tar output with given compression level\n"
+msgstr ""
+"  -Z, --compress=0-9       comprime saída do tar com o nível de compressão informado\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Opções gerais:\n"
+
+#: pg_basebackup.c:132
+#, c-format
+msgid ""
+"  -c, --checkpoint=fast|spread\n"
+"                           set fast or spread checkpointing\n"
+msgstr ""
+"  -c, --checkpoint=fast|spread\n"
+"                           define ponto de controle rápido ou distribuído\n"
+
+#: pg_basebackup.c:134
+#, c-format
+msgid "  -l, --label=LABEL        set backup label\n"
+msgstr "  -l, --label=RÓTULO       define rótulo da cópia de segurança\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid "  -P, --progress           show progress information\n"
+msgstr "  -P, --progress           mostra informação de progresso\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid "  -v, --verbose            output verbose messages\n"
+msgstr "  -v, --verbose            mostra mensagens de detalhe\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   mostra esta ajuda e termina\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr ""
+"  --version                mostra informação sobre a versão e termina\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Opções de conexão: \n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=M�QUINA       máquina do servidor de banco de dados ou "
+"diretório do soquete\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr ""
+"  -p, --port=PORTA         número da porta do servidor de banco de dados\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr ""
+"  -U, --username=NOME      conecta como usuário do banco de dados "
+"especificado\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nunca pergunta senha\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           pergunta senha (pode ocorrer automaticamente)\n"
+
+#: pg_basebackup.c:145
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Relate erros a <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:167 pg_basebackup.c:604
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: não pôde criar diretório \"%s\": %s\n"
+
+#: pg_basebackup.c:184
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: diretório \"%s\" existe mas não está vazio\n"
+
+#: pg_basebackup.c:192
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: não pôde acessar diretório \"%s\": %s\n"
+
+#: pg_basebackup.c:239
+#, c-format
+msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgstr[0] "%s/%s kB (100%%), %d/%d tablespace %35s"
+msgstr[1] "%s/%s kB (100%%), %d/%d tablespaces %35s"
+
+#: pg_basebackup.c:245
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgstr[0] "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+msgstr[1] "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+
+#: pg_basebackup.c:252
+#, c-format
+msgid "%s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%s/%s kB (%d%%), %d/%d tablespace"
+msgstr[1] "%s/%s kB (%d%%), %d/%d tablespaces"
+
+#: pg_basebackup.c:295 pg_basebackup.c:313 pg_basebackup.c:337
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s: não pôde definir nível de compressão %i: %s\n"
+
+#: pg_basebackup.c:356
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: não pôde criar arquivo comprimido \"%s\": %s\n"
+
+#: pg_basebackup.c:367 pg_basebackup.c:643
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: não pôde criar arquivo \"%s\": %s\n"
+
+#: pg_basebackup.c:379 pg_basebackup.c:516
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: não pôde obter fluxo de dados do COPY: %s"
+
+#: pg_basebackup.c:411 pg_basebackup.c:457
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: não pôde escrever no arquivo comprimido \"%s\": %s\n"
+
+#: pg_basebackup.c:420 pg_basebackup.c:466 pg_basebackup.c:683
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: não pôde escrever no arquivo \"%s\": %s\n"
+
+#: pg_basebackup.c:447 pg_basebackup.c:545
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: não pôde ler dados do COPY: %s"
+
+#: pg_basebackup.c:559
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s: tamanho do cabeçalho do bloco tar é inválido: %i\n"
+
+#: pg_basebackup.c:567
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: não pôde obter tamanho do arquivo\n"
+
+#: pg_basebackup.c:575
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: não pôde obter modo do arquivo\n"
+
+#: pg_basebackup.c:610
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: não pôde definir permissões no diretório \"%s\": %s\n"
+
+#: pg_basebackup.c:623
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s: não pôde criar link simbólico de \"%s\" para \"%s\": %s\n"
+
+#: pg_basebackup.c:630
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s: indicador de link \"%c\" desconhecido\n"
+
+#: pg_basebackup.c:650
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: não pôde definir permissões no arquivo \"%s\": %s\n"
+
+#: pg_basebackup.c:708
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s: fluxo do COPY terminou antes que o último arquivo estivesse completo\n"
+
+#: pg_basebackup.c:769
+msgid "Password: "
+msgstr "Senha: "
+
+#: pg_basebackup.c:789
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s: não pôde se conectar ao servidor: %s"
+
+#: pg_basebackup.c:829
+#, c-format
+msgid "%s: could not send base backup command: %s"
+msgstr "%s: não pôde enviar comando de cópia de segurança base: %s"
+
+#: pg_basebackup.c:840
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: não pôde inicializar cópia de segurança base: %s"
+
+#: pg_basebackup.c:846
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s: nenhum ponto de início foi retornado do servidor\n"
+
+#: pg_basebackup.c:862
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: não pôde obter cabeçalho da cópia de segurança: %s"
+
+#: pg_basebackup.c:868
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: nenhum dado foi retornado do servidor\n"
+
+#: pg_basebackup.c:896
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr "%s: só pode escrever uma tablespace para saída padrão, banco de dados tem %i\n"
+
+#: pg_basebackup.c:925
+#, c-format
+msgid "%s: could not get WAL end position from server\n"
+msgstr "%s: não pôde obter posição final do WAL do servidor\n"
+
+#: pg_basebackup.c:931
+#, c-format
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s: nenhuma posição final do WAL foi retornada do servidor\n"
+
+#: pg_basebackup.c:943
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s: recepção final falhou: %s"
+
+#: pg_basebackup.c:1017
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr "%s: formato de saída \"%s\" é inválido, deve ser \"plain\" ou \"tar\"\n"
+
+#: pg_basebackup.c:1039
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: nível de compressão \"%s\" é inválido\n"
+
+#: pg_basebackup.c:1051
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr ""
+"%s: argumento de ponto de controle \"%s\" é inválido, deve ser \"fast\" ou \"spread\"\n"
+
+#: pg_basebackup.c:1082 pg_basebackup.c:1096 pg_basebackup.c:1107
+#: pg_basebackup.c:1120
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
+
+#: pg_basebackup.c:1094
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: muitos argumentos de linha de comando (primeiro é \"%s\")\n"
+
+#: pg_basebackup.c:1106
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: nenhum diretório de destino foi especificado\n"
+
+#: pg_basebackup.c:1118
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: somente cópias de segurança com modo tar podem ser comprimidas\n"
+
+#: pg_basebackup.c:1129
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: esse programa binário não suporta compressão\n"
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index 609c57f93e566..ea5586f3fa956 100644
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_config/nls.mk
 CATALOG_NAME	:= pg_config
-AVAIL_LANGUAGES	:= de es fr it ja ko nb pt_BR ro ru sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko nb pl pt_BR ro ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_config.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_config/po/cs.po b/src/bin/pg_config/po/cs.po
new file mode 100644
index 0000000000000..9e4355f43912a
--- /dev/null
+++ b/src/bin/pg_config/po/cs.po
@@ -0,0 +1,321 @@
+# translation of pg_config.po to
+# translation of pg_config.po to Czech
+#
+# Karel Zak <zakkr@zf.jcu.cz>, 2004, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_config\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-30 11:34+0200\n"
+"PO-Revision-Date: 2011-08-30 13:37+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
+#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
+#, c-format
+msgid "not recorded\n"
+msgstr "nezaznamenáno\n"
+
+#: pg_config.c:428
+#, c-format
+msgid ""
+"\n"
+"%s provides information about the installed version of PostgreSQL.\n"
+"\n"
+msgstr ""
+"\n"
+"%s poskytuje informace o nainstalované verzi PostgreSQL.\n"
+"\n"
+
+#: pg_config.c:429
+#, c-format
+msgid "Usage:\n"
+msgstr "Použití:\n"
+
+#: pg_config.c:430
+#, c-format
+msgid ""
+"  %s [OPTION]...\n"
+"\n"
+msgstr "  %s [PŘEP�NAČ]...\n"
+
+#: pg_config.c:431
+#, c-format
+msgid "Options:\n"
+msgstr "Přepína�e:\n"
+
+#: pg_config.c:432
+#, c-format
+msgid "  --bindir              show location of user executables\n"
+msgstr "  --bindir              ukáže umístění spustitelných souborů\n"
+
+#: pg_config.c:433
+#, c-format
+msgid "  --docdir              show location of documentation files\n"
+msgstr "  --docdir              ukáže umístění souborů s dokumentací\n"
+
+#: pg_config.c:434
+#, c-format
+msgid "  --htmldir             show location of HTML documentation files\n"
+msgstr "  --htmldir             ukáže umístění souborl s HTML dokumentací\n"
+
+#: pg_config.c:435
+#, c-format
+msgid ""
+"  --includedir          show location of C header files of the client\n"
+"                        interfaces\n"
+msgstr ""
+"  --includedir         ukáže umístění C hlavi�kových souborů klientských\n"
+"                        rozhraní\n"
+
+#: pg_config.c:437
+#, c-format
+msgid "  --pkgincludedir       show location of other C header files\n"
+msgstr ""
+"  --pkgincludedir       ukáže umístění dalších C hlavi�kových souborů\n"
+
+#: pg_config.c:438
+#, c-format
+msgid ""
+"  --includedir-server   show location of C header files for the server\n"
+msgstr ""
+"  --includedir-server   ukáže umístění C hlavi�kových souborů pro server\n"
+
+#: pg_config.c:439
+#, c-format
+msgid "  --libdir              show location of object code libraries\n"
+msgstr "  --libdir              ukáže umístění knihoven\n"
+
+#: pg_config.c:440
+#, c-format
+msgid "  --pkglibdir           show location of dynamically loadable modules\n"
+msgstr "  --pkglibdir           ukáže umístění dynamicky zaváděných modulů\n"
+
+#: pg_config.c:441
+#, c-format
+msgid "  --localedir           show location of locale support files\n"
+msgstr "  --localedir           ukáže umístění souborů pro podporu locale\n"
+
+#: pg_config.c:442
+#, c-format
+msgid "  --mandir              show location of manual pages\n"
+msgstr ""
+"  --mandir              ukáže umístění souborů s manuálovými stránkami\n"
+
+#: pg_config.c:443
+#, c-format
+msgid ""
+"  --sharedir            show location of architecture-independent support "
+"files\n"
+msgstr ""
+"  --sharedir            ukáže umístění podpůrných souborů nezávislých na "
+"architektuře\n"
+
+#: pg_config.c:444
+#, c-format
+msgid ""
+"  --sysconfdir          show location of system-wide configuration files\n"
+msgstr ""
+"  --sysconfdir          ukáže umístění konfigura�ních souborů platných pro "
+"celý systém\n"
+
+#: pg_config.c:445
+#, c-format
+msgid "  --pgxs                show location of extension makefile\n"
+msgstr ""
+"  --pgxs                ukáže umístění makefile souboru pro rozšíření\n"
+
+#: pg_config.c:446
+#, c-format
+msgid ""
+"  --configure           show options given to \"configure\" script when\n"
+"                        PostgreSQL was built\n"
+msgstr ""
+"  --configure           ukáže přepína�e použité pro \"configure\" skript ke\n"
+"                        kompilaci PostgreSQL\n"
+
+#: pg_config.c:448
+#, c-format
+msgid "  --cc                  show CC value used when PostgreSQL was built\n"
+msgstr ""
+"  --cc                  ukáže hodnotu CC použitou při buildu PostgreSQL\n"
+
+#: pg_config.c:449
+#, c-format
+msgid ""
+"  --cppflags            show CPPFLAGS value used when PostgreSQL was built\n"
+msgstr ""
+"  --cppflags            ukáže hodnotu CPPFLAGS použitou při buildu "
+"PostgreSQL\n"
+
+#: pg_config.c:450
+#, c-format
+msgid ""
+"  --cflags              show CFLAGS value used when PostgreSQL was built\n"
+msgstr ""
+"  --cflags              ukáže hodnotu CFLAGS použitou při buildu PostgreSQL\n"
+
+#: pg_config.c:451
+#, c-format
+msgid ""
+"  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built\n"
+msgstr ""
+"  --cflags_sl           ukáže hodnotu CFLAGS_SL použitou při buildu "
+"PostgreSQL\n"
+
+#: pg_config.c:452
+#, c-format
+msgid ""
+"  --ldflags             show LDFLAGS value used when PostgreSQL was built\n"
+msgstr ""
+"  --ldflags             ukáže hodnotu LDFLAGS použitou při buildu "
+"PostgreSQL\n"
+
+#: pg_config.c:453
+#, c-format
+msgid ""
+"  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr ""
+"  --ldflags_ex          ukáže hodnotu LDFLAGS_EX použitou při buildu "
+"PostgreSQL\n"
+
+#: pg_config.c:454
+#, c-format
+msgid ""
+"  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was "
+"built\n"
+msgstr ""
+"  --ldflags_sl          ukáže hodnotu LDFLAGS_SL použitou při buildu "
+"PostgreSQL\n"
+
+#: pg_config.c:455
+#, c-format
+msgid ""
+"  --libs                show LIBS value used when PostgreSQL was built\n"
+msgstr ""
+"  --libs                ukáže hodnotu LIBS použitou při buildu PostgreSQL\n"
+
+#: pg_config.c:456
+#, c-format
+msgid "  --version             show the PostgreSQL version\n"
+msgstr "  --version             ukáže verzi PostgreSQL\n"
+
+#: pg_config.c:457
+#, c-format
+msgid "  --help                show this help, then exit\n"
+msgstr "  --help                ukáže tuto nápovědu, a skon�í\n"
+
+#: pg_config.c:458
+#, c-format
+msgid ""
+"\n"
+"With no arguments, all known items are shown.\n"
+"\n"
+msgstr ""
+"\n"
+"Bez argumentů jsou vypsány všechny známé položky.\n"
+"\n"
+
+#: pg_config.c:459
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Oznámení o chybách zasílejte na <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_config.c:465
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Pro více informací zkuste \"%s --help\".\n"
+
+#: pg_config.c:504
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: nelze najít vlastní spustitelný soubor\n"
+
+#: pg_config.c:527
+#, c-format
+msgid "%s: invalid argument: %s\n"
+msgstr "%s: neplatný parametr: %s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nelze získat aktuální adresář: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "neplatný binární soubor\"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nelze �íst binární soubor \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nelze najít spustitelný soubor \"%s\""
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nelze změnit adresář na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nelze �íst symbolický link \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "potomek skon�il s návratovým kódem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "potomek byl ukon�en výjimkou 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "potomek byl ukon�en signálem %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "potomek byl ukon�en signálem %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "potomek skon�il s nerozponaným stavem %d"
+
+#~ msgid ""
+#~ "  %s OPTION...\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  %s PŘEP�NAČ...\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Try \"%s --help\" for more information\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Zkuste \"%s --help\" pro více informací\n"
+
+#~ msgid "%s: argument required\n"
+#~ msgstr "%s: vyžadován parametr\n"
+
+#~ msgid "%s: could not find own executable\n"
+#~ msgstr "%s: nelze najít spustitelné\n"
diff --git a/src/bin/pg_config/po/ja.po b/src/bin/pg_config/po/ja.po
index b85e72c4ddb1b..f41b78e8b953a 100644
--- a/src/bin/pg_config/po/ja.po
+++ b/src/bin/pg_config/po/ja.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-07-20 12:54+0900\n"
-"PO-Revision-Date: 2010-07-15 19:00+0900\n"
+"PO-Revision-Date: 2011-08-30 21:27+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "  --docdir              文書ファイル�場所を表示���\n"
 #: pg_config.c:434
 #, c-format
 msgid "  --htmldir             show location of HTML documentation files\n"
-msgstr "  --docdir              html文書ファイル�場所を表示���\n"
+msgstr "  --htmldir              html文書ファイル�場所を表示���\n"
 
 #: pg_config.c:435
 #, c-format
diff --git a/src/bin/pg_config/po/pl.po b/src/bin/pg_config/po/pl.po
new file mode 100644
index 0000000000000..6f37c42fc62cb
--- /dev/null
+++ b/src/bin/pg_config/po/pl.po
@@ -0,0 +1,312 @@
+# PG_CONFIG Translated Messages into the Polish Language
+# Copyright (c) 2005 toczek, xxxtoczekxxx@wp.pl
+# Distributed under the same licensing terms as PostgreSQL itself.
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_config (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:54+0000\n"
+"PO-Revision-Date: 2011-09-30 09:52-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Polish TotroiseSvn translation team\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
+#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
+#, c-format
+msgid "not recorded\n"
+msgstr "niezarejestrowane\n"
+
+#: pg_config.c:428
+#, c-format
+msgid ""
+"\n"
+"%s provides information about the installed version of PostgreSQL.\n"
+"\n"
+msgstr ""
+"\n"
+"%s dostarcza informacji na temat zainstalowanej wersji PostgreSQL.\n"
+"\n"
+
+#: pg_config.c:429
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: pg_config.c:430
+#, c-format
+msgid ""
+"  %s [OPTION]...\n"
+"\n"
+msgstr ""
+"  %s [OPCJA]...\n"
+"\n"
+
+#: pg_config.c:431
+#, c-format
+msgid "Options:\n"
+msgstr "Opcje:\n"
+
+#: pg_config.c:432
+#, c-format
+msgid "  --bindir              show location of user executables\n"
+msgstr "  --bindir              pokaż lokalizację plików użytkownika\n"
+
+#: pg_config.c:433
+#, c-format
+msgid "  --docdir              show location of documentation files\n"
+msgstr "  --docdir              pokaż położenie plików dokumentacji\n"
+
+#: pg_config.c:434
+#, c-format
+msgid "  --htmldir             show location of HTML documentation files\n"
+msgstr "  --htmldir             pokaż lokalizację plików HTML dokumentacji\n"
+
+#: pg_config.c:435
+#, c-format
+msgid ""
+"  --includedir          show location of C header files of the client\n"
+"                        interfaces\n"
+msgstr ""
+"  --includedir          pokaż lokalizację nagłówków C interfejsu \n"
+"                        użytkownika\n"
+
+#: pg_config.c:437
+#, c-format
+msgid "  --pkgincludedir       show location of other C header files\n"
+msgstr "  --pkgincludedir       pokaż położenie innych plików nagłówkowych C\n"
+
+#: pg_config.c:438
+#, c-format
+msgid ""
+"  --includedir-server   show location of C header files for the server\n"
+msgstr "  --includedir-server   pokaż lokalizację nagłówków C dla serwera\n"
+
+#: pg_config.c:439
+#, c-format
+msgid "  --libdir              show location of object code libraries\n"
+msgstr "  --libdir              pokaż lokalizację bibliotek obiektów\n"
+
+#: pg_config.c:440
+#, c-format
+msgid "  --pkglibdir           show location of dynamically loadable modules\n"
+msgstr "  --pkglibdir           pokaż lokalizację dynamicznych modułów\n"
+
+#: pg_config.c:441
+#, c-format
+msgid "  --localedir           show location of locale support files\n"
+msgstr "  --localedir           pokaż położenie plików obsługi lokalizacji\n"
+
+#: pg_config.c:442
+#, c-format
+msgid "  --mandir              show location of manual pages\n"
+msgstr "  --mandir              pokaż położenie plików podręcznika\n"
+
+#: pg_config.c:443
+#, c-format
+msgid ""
+"  --sharedir            show location of architecture-independent support "
+"files\n"
+msgstr ""
+"  --sharedir            pokaż położenie niezależnych od architektury\n"
+"                        plików obsługi\n"
+
+#: pg_config.c:444
+#, c-format
+msgid ""
+"  --sysconfdir          show location of system-wide configuration files\n"
+msgstr ""
+"  --sysconfdir          pokaż położenie ogólnosystemowych plików "
+"konfiguracyjnych\n"
+
+#: pg_config.c:445
+#, c-format
+msgid "  --pgxs                show location of extension makefile\n"
+msgstr "  --pgxs                pokaż lokalizację makefile rozszerzeń\n"
+
+#: pg_config.c:446
+#, c-format
+msgid ""
+"  --configure           show options given to \"configure\" script when\n"
+"                        PostgreSQL was built\n"
+msgstr ""
+"  --configure           pokaż opcje użyte przy skrypcie \"configure\" \n"
+"                        podczas budowania PostgreSQL\n"
+
+#: pg_config.c:448
+#, c-format
+msgid "  --cc                  show CC value used when PostgreSQL was built\n"
+msgstr ""
+"  --cc                  pokaż wartość CC użytą podczas budowania PostgreSQL\n"
+
+#: pg_config.c:449
+#, c-format
+msgid ""
+"  --cppflags            show CPPFLAGS value used when PostgreSQL was built\n"
+msgstr ""
+"  --cppflags            pokaż wartość CPPFLAGS użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:450
+#, c-format
+msgid ""
+"  --cflags              show CFLAGS value used when PostgreSQL was built\n"
+msgstr ""
+"  --cflags              pokaż wartość CFLAGS użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:451
+#, c-format
+msgid ""
+"  --cflags_sl           show CFLAGS_SL value used when PostgreSQL was built\n"
+msgstr ""
+"  --cflags_sl           pokaż wartość CFLAGS_SL użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:452
+#, c-format
+msgid ""
+"  --ldflags             show LDFLAGS value used when PostgreSQL was built\n"
+msgstr ""
+"  --ldflags             pokaż wartość LDFLAGS użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:453
+#, c-format
+msgid ""
+"  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr ""
+"  --ldflags_ex          pokaż wartość LDFLAGS_EX użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:454
+#, c-format
+msgid ""
+"  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was "
+"built\n"
+msgstr ""
+"  --ldflags_sl          pokaż wartość LDFLAGS_SL użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:455
+#, c-format
+msgid ""
+"  --libs                show LIBS value used when PostgreSQL was built\n"
+msgstr ""
+"  --libs                pokaż wartość LIBS użytą podczas budowania "
+"PostgreSQL\n"
+
+#: pg_config.c:456
+#, c-format
+msgid "  --version             show the PostgreSQL version\n"
+msgstr "  --version             pokaż wersję PostgreSQL\n"
+
+#: pg_config.c:457
+#, c-format
+msgid "  --help                show this help, then exit\n"
+msgstr "  --help                pokaż ten ekran pomocy i zakończ\n"
+
+#: pg_config.c:458
+#, c-format
+msgid ""
+"\n"
+"With no arguments, all known items are shown.\n"
+"\n"
+msgstr ""
+"\n"
+"Bez argumentów są pokazane wszystkie znane elementy.\n"
+"\n"
+
+#: pg_config.c:459
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_config.c:465
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: pg_config.c:504
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: nie można znaleźć programu wykonywalnego\n"
+
+#: pg_config.c:527
+#, c-format
+msgid "%s: invalid argument: %s\n"
+msgstr "%s: niepoprawny parametr: %s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nie można zidentyfikować bieżącego katalogu: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "niepoprawny binarny \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nie można odczytać binarnego \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nie znaleziono \"%s\" do wykonania"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nie można odczytać odwołania symbolicznego \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "proces potomny zakończył działanie z kodem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "proces potomny został zatrzymany przez wyjątek 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "proces potomny został zatrzymany przez sygnał %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "proces potomny został zatrzymany przez sygnał %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
+
+#~ msgid ""
+#~ "\n"
+#~ "Try \"%s --help\" for more information\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Spróbuj \"%s --help\" aby uzykać więcej informacji.\n"
+
+#~ msgid "%s: argument required\n"
+#~ msgstr "%s: parametr wymagany\n"
diff --git a/src/bin/pg_config/po/pt_BR.po b/src/bin/pg_config/po/pt_BR.po
index d852a2523cf95..2b46c64be9f7f 100644
--- a/src/bin/pg_config/po/pt_BR.po
+++ b/src/bin/pg_config/po/pt_BR.po
@@ -1,11 +1,11 @@
 # Brazilian Portuguese message translation file for pg_config
 # 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>, 2004-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2004-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-07-08 21:08-0300\n"
 "PO-Revision-Date: 2005-10-04 22:15-0300\n"
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index 7edaaff7f3f3f..bd5464c7d742b 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_controldata/nls.mk
 CATALOG_NAME	:= pg_controldata
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko pl pt_BR ro ru tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_controldata.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_controldata/po/cs.po b/src/bin/pg_controldata/po/cs.po
new file mode 100644
index 0000000000000..c651b06ba9334
--- /dev/null
+++ b/src/bin/pg_controldata/po/cs.po
@@ -0,0 +1,347 @@
+# translation of pg_controldata-cs.po to Czech
+# Czech translation of pg_controldata messages.
+#
+# pgtranslation Id: pg_controldata.po,v 1.4 2011/09/08 18:23:05 petere Exp $
+#
+# Karel Zak <zakkr@zf.jcu.cz>, 2003, 2004, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_controldata-cs\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-27 21:05+0000\n"
+"PO-Revision-Date: 2011-09-06 11:46+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pg_controldata.c:33
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s ukáže kontrolní informace o PostgreSQL databázi.\n"
+"\n"
+
+#: pg_controldata.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION] [DATADIR]\n"
+"\n"
+"Options:\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
+msgstr ""
+"Použití:\n"
+"  %s [PŘEP�NAČ] [ADRES�Ř]\n"
+"\n"
+"Přepína�e:\n"
+"  --help         ukáže tuto nápovědu a skon�í\n"
+"  --version      ukáže verzi tohoto programu a skon�í\n"
+
+#: pg_controldata.c:45
+#, c-format
+msgid ""
+"\n"
+"If no data directory (DATADIR) is specified, the environment variable "
+"PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Není-li specifikován datový adresář, je použita proměnná prostředí\n"
+"PGDATA.\n"
+"\n"
+
+#: pg_controldata.c:47
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby posílejte na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:57
+msgid "starting up"
+msgstr "startování"
+
+#: pg_controldata.c:59
+msgid "shut down"
+msgstr "ukon�ení"
+
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "ukon�ení (shut down) během obnovy"
+
+#: pg_controldata.c:63
+msgid "shutting down"
+msgstr "ukon�ování"
+
+#: pg_controldata.c:65
+msgid "in crash recovery"
+msgstr ""
+
+#: pg_controldata.c:67
+msgid "in archive recovery"
+msgstr ""
+
+#: pg_controldata.c:69
+msgid "in production"
+msgstr "v provozu"
+
+#: pg_controldata.c:71
+msgid "unrecognized status code"
+msgstr "neznámý stavový kód"
+
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "neznámý wal_level"
+
+#: pg_controldata.c:129
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: není specifikován datový adresář\n"
+
+#: pg_controldata.c:130
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: pg_controldata.c:138
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nelze otevřít soubor \"%s\" pro �tení: %s\n"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nelze �íst soubor \"%s\": %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"UPOZORNĚN�: Spo�ítaný CRC kontrolní sou�et nesouhlasí s hodnotou uloženou\n"
+"v souboru. Bu� je soubor poškozen nebo má jinou strukturu než tento program\n"
+"o�ekává.  Níže uvedené výsledky jsou nedůvěryhodné.\n"
+"\n"
+
+#: pg_controldata.c:186
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "�íslo verze pg_controlu:              %u\n"
+
+#: pg_controldata.c:189
+#, c-format
+msgid ""
+"WARNING: possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory.\n"
+msgstr ""
+"VAROV�N�: možný nesoulad v pořadí bytů\n"
+"Pořadí bytů používané pro uložení pg_control souboru nemusí odpovídat tomu\n"
+"používanému tímto programem. V tom případě by výsledky uvedené níže byly "
+"chybné, a\n"
+"PostgreSQL instalace by byla nekompatibilní s tímto datovým adresářem.\n"
+
+#: pg_controldata.c:193
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Číslo verze katalogu:               %u\n"
+
+#: pg_controldata.c:195
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identifikátor databázového systému:   %s\n"
+
+#: pg_controldata.c:197
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "Status databázového klastru:           %s\n"
+
+#: pg_controldata.c:199
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "poslední modifikace pg_control:      %s\n"
+
+#: pg_controldata.c:201
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "Poslední umístění checkpointu:           %X/%X\n"
+
+#: pg_controldata.c:204
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "Předešlé umístění checkpointu:            %X/%X\n"
+
+#: pg_controldata.c:207
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "Poslední umístění REDO checkpointu:    %X/%X\n"
+
+#: pg_controldata.c:210
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "TimeLineID posledního checkpointu:     %u\n"
+
+#: pg_controldata.c:212
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u/%u\n"
+msgstr "Poslední umístění NextXID checkpointu:          %u/%u\n"
+
+#: pg_controldata.c:215
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "Poslední umístění NextOID checkpointu:          %u\n"
+
+#: pg_controldata.c:217
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId:  %u\n"
+msgstr "NextMultiXactId posledního checkpointu:          %u\n"
+
+#: pg_controldata.c:219
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset:  %u\n"
+msgstr "NextMultiOffset posledního checkpointu:          %u\n"
+
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID:        %u\n"
+msgstr "oldestXID posledního checkpointu:          %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB:   %u\n"
+msgstr ""
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID:  %u\n"
+msgstr "oldestActiveXID posledního checkpointu:          %u\n"
+
+#: pg_controldata.c:227
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "Čas posledního checkpointu:       %s\n"
+
+#: pg_controldata.c:229
+#, c-format
+msgid "Minimum recovery ending location:     %X/%X\n"
+msgstr "Minimální pozice ukon�ení obnovy:     %X/%X\n"
+
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location:                %X/%X\n"
+msgstr "Pozice po�átku backupu:               %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting:            %s\n"
+msgstr "Aktuální nastavení wal_level:         %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting:      %d\n"
+msgstr "Aktuální nastavení max_connections:   %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting:   %d\n"
+msgstr "Aktuální nastavení max_prepared_xacts: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting:   %d\n"
+msgstr "Aktuální nastavení max_locks_per_xact:   %d\n"
+
+#: pg_controldata.c:243
+#, c-format
+msgid "Maximum data alignment:               %u\n"
+msgstr "Maximální zarovnání dat:              %u\n"
+
+#: pg_controldata.c:246
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Velikost databázového bloku:                  %u\n"
+
+#: pg_controldata.c:248
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Bloků v segmentu velké relace: %u\n"
+
+#: pg_controldata.c:250
+#, c-format
+msgid "WAL block size:                       %u\n"
+msgstr "Velikost WAL bloku:                   %u\n"
+
+#: pg_controldata.c:252
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Bytů ve WAL segmentu:                  %u\n"
+
+#: pg_controldata.c:254
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maximální délka identifikátorů:        %u\n"
+
+#: pg_controldata.c:256
+#, c-format
+msgid "Maximum columns in an index:          %u\n"
+msgstr "Maximální po�et sloupců v indexu:     %u\n"
+
+#: pg_controldata.c:258
+#, c-format
+msgid "Maximum size of a TOAST chunk:        %u\n"
+msgstr "Maximální velikost úseku TOAST:       %u\n"
+
+#: pg_controldata.c:260
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Způsob uložení typu date/time:               %s\n"
+
+#: pg_controldata.c:261
+msgid "64-bit integers"
+msgstr "64-bitová �ísla"
+
+#: pg_controldata.c:261
+msgid "floating-point numbers"
+msgstr "�ísla s plovoucí řádovou �árkou"
+
+#: pg_controldata.c:262
+#, c-format
+msgid "Float4 argument passing:              %s\n"
+msgstr "Způsob předávání float4 hodnot:        %s\n"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by value"
+msgstr "hodnotou"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by reference"
+msgstr "odkazem"
+
+#: pg_controldata.c:264
+#, c-format
+msgid "Float8 argument passing:              %s\n"
+msgstr "Způsob předávání float8 hodnot:        %s\n"
+
+#~ msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+#~ msgstr "Poslední umístění UNDO kontrolního bodu:    %X/%X\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "Maximální po�et argumentů funkcí: %u\n"
+
+#~ msgid "LC_COLLATE:                           %s\n"
+#~ msgstr "LC_COLLATE (porovnávání řetězců):                           %s\n"
+
+#~ msgid "LC_CTYPE:                             %s\n"
+#~ msgstr "LC_CTYPE (typy znaků):                             %s\n"
diff --git a/src/bin/pg_controldata/po/ja.po b/src/bin/pg_controldata/po/ja.po
index 410dfaa762c15..02b6787e68294 100644
--- a/src/bin/pg_controldata/po/ja.po
+++ b/src/bin/pg_controldata/po/ja.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-07-20 12:55+0900\n"
-"PO-Revision-Date: 2010-07-15 19:00+0900\n"
+"PO-Revision-Date: 2011-08-30 21:28+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +19,7 @@ msgstr ""
 msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
-msgstr ""
-"\"%s �PostgreSQLデータベースクラスタ�制御情報を表示���。\n"
-"\n"
+msgstr "%s �PostgreSQLデータベースクラスタ�制御情報を表示���。\n\n"
 
 #: pg_controldata.c:37
 #, c-format
diff --git a/src/bin/pg_controldata/po/pl.po b/src/bin/pg_controldata/po/pl.po
new file mode 100644
index 0000000000000..6ee53fe8f7f4a
--- /dev/null
+++ b/src/bin/pg_controldata/po/pl.po
@@ -0,0 +1,348 @@
+# PG_CONTROLDATA Translated Messages into the Polish Language
+# Copyright (c) 2005 toczek, xxxtoczekxxx@wp.pl
+# Distributed under the same licensing terms as PostgreSQL itself.
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_controldata (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-10-08 08:40+0000\n"
+"PO-Revision-Date: 2011-10-09 17:59+0200\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pg_controldata.c:33
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s wyświetla informacje kontrolne klastra bazy danych PostgreSQL.\n"
+"\n"
+
+#: pg_controldata.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION] [DATADIR]\n"
+"\n"
+"Options:\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
+msgstr ""
+"Składnia:\n"
+"  %s [OPCJA] [KATALOG]\n"
+"\n"
+"Opcje:\n"
+"  --help         pokaż ekran pomocy i zakończ\n"
+"  --version      wyświetl informacje o wersji i zakończ\n"
+
+#: pg_controldata.c:45
+#, c-format
+msgid ""
+"\n"
+"If no data directory (DATADIR) is specified, the environment variable "
+"PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"\n"
+"W przypadku gdy katalog danych nie jest podany (DATADIR), zmienna "
+"środowiskowa PGDATA\n"
+"jest używana.\n"
+"\n"
+
+#: pg_controldata.c:47
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:57
+msgid "starting up"
+msgstr "włączanie"
+
+#: pg_controldata.c:59
+msgid "shut down"
+msgstr "wyłącz bazę danych"
+
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "baza danych w trybie odzyskiwania"
+
+#: pg_controldata.c:63
+msgid "shutting down"
+msgstr "wyłączanie bazy danych"
+
+#: pg_controldata.c:65
+msgid "in crash recovery"
+msgstr "w trybie odzyskiwania po awarii programu"
+
+#: pg_controldata.c:67
+msgid "in archive recovery"
+msgstr "w trybie odzyskiwania z archiwum"
+
+#: pg_controldata.c:69
+msgid "in production"
+msgstr "baza danych w trybie produkcji"
+
+#: pg_controldata.c:71
+msgid "unrecognized status code"
+msgstr "nieznany kod statusu"
+
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "nierozpoznany wal_level"
+
+#: pg_controldata.c:129
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: katalog danych nie został ustawiony\n"
+
+#: pg_controldata.c:130
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: pg_controldata.c:138
+#, 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"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nie można czytać z pliku \"%s\": %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"UWAGA: obliczona suma kontrolna CRC pliku nie zgadza siÄ™.\n"
+"Albo plik jest uszkodzony albo posiada inny układ niż program się "
+"spodziewał.\n"
+"Rezultaty mogą być niepewne.\n"
+"\n"
+
+#: pg_controldata.c:186
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control w wersji numer:                       %u\n"
+
+#: pg_controldata.c:189
+#, c-format
+msgid ""
+"WARNING: possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program.  In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory.\n"
+msgstr ""
+"OSTRZEŻENIE: możliwe niepoprawna kolejność bajtów\n"
+"Kolejność bajtów używana do przechowywania plików pg_control może nie "
+"pasować\n"
+"do używanej przez ten program.  W tym przypadku wynik poniżej jest błędny,\n"
+"a instalacja PostgreSQL byłaby niezgodna z tym folderem danych.\n"
+
+#: pg_controldata.c:193
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Katalog w wersji numer:                          %u\n"
+
+#: pg_controldata.c:195
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identyfikator systemu bazy danych:               %s\n"
+
+#: pg_controldata.c:197
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "Stan klastra bazy danych:                        %s\n"
+
+#: pg_controldata.c:199
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "pg_control ostatnio modyfikowano:                %s\n"
+
+#: pg_controldata.c:201
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "Najnowsza lokalizacja punktu kontrolnego:        %X/%X\n"
+
+#: pg_controldata.c:204
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "Uprzednia lokalizacja punktu kontrolnego:        %X/%X\n"
+
+#: pg_controldata.c:207
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "Najnowsza lokalizacja punktu kontrolnego REDO:   %X/%X\n"
+
+#: pg_controldata.c:210
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "TimeLineID najnowszego punktu kontrolnego:       %u\n"
+
+#: pg_controldata.c:212
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u/%u\n"
+msgstr "NextXID najnowszego punktu kontrolnego:          %u/%u\n"
+
+#: pg_controldata.c:215
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "NextOID najnowszego punktu kontrolnego:          %u\n"
+
+#: pg_controldata.c:217
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId:  %u\n"
+msgstr "NextMultiXactId najnowszego punktu kontrolnego:  %u\n"
+
+#: pg_controldata.c:219
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset:  %u\n"
+msgstr "NextMultiOffset najnowszego punktu kontrolnego:  %u\n"
+
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID:        %u\n"
+msgstr "NextXID najnowszego punktu kontrolnego:          %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB:   %u\n"
+msgstr "DB oldestXID'u najnowszego punktu kontrolnego:   %u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID:  %u\n"
+msgstr "oldestActiveXID najnowszego punktu kontrolnego:  %u\n"
+
+#: pg_controldata.c:227
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "Czas najnowszego punktu kontrolnego:             %s\n"
+
+#: pg_controldata.c:229
+#, c-format
+msgid "Minimum recovery ending location:     %X/%X\n"
+msgstr "Położenie zakończenia odzyskiwania minimalnego:  %X/%X\n"
+
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location:                %X/%X\n"
+msgstr "Położenie początku kopii zapasowej:              %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting:            %s\n"
+msgstr "Aktualne ustawienie wal_level:                   %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting:      %d\n"
+msgstr "Aktualne ustawienie max_connections:             %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting:   %d\n"
+msgstr "Aktualne ustawienie max_prepared_xacts:          %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting:   %d\n"
+msgstr "Aktualne ustawienie max_locks_per_xact:          %d\n"
+
+#: pg_controldata.c:243
+#, c-format
+msgid "Maximum data alignment:               %u\n"
+msgstr "Maksymalne wyrównanie danych:                    %u\n"
+
+#: pg_controldata.c:246
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Wielkość bloku bazy danych:                      %u\n"
+
+#: pg_controldata.c:248
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Bloki na segment sÄ… w relacji:                   %u\n"
+
+#: pg_controldata.c:250
+#, c-format
+msgid "WAL block size:                       %u\n"
+msgstr "Wielkość bloku WAL:                              %u\n"
+
+#: pg_controldata.c:252
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Bajtów na segment WAL:                           %u\n"
+
+#: pg_controldata.c:254
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maksymalna długość identyfikatorów:              %u\n"
+
+#: pg_controldata.c:256
+#, c-format
+msgid "Maximum columns in an index:          %u\n"
+msgstr "Maksymalna liczba kolumn w indeksie:             %u\n"
+
+#: pg_controldata.c:258
+#, c-format
+msgid "Maximum size of a TOAST chunk:        %u\n"
+msgstr "Maksymalny rozmiar fragmentu TOAST:              %u\n"
+
+#: pg_controldata.c:260
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Typ przechowywania daty/czasu:                   %s\n"
+
+#: pg_controldata.c:261
+msgid "64-bit integers"
+msgstr "64-bitowe zmienne integer"
+
+#: pg_controldata.c:261
+msgid "floating-point numbers"
+msgstr "liczby zmiennoprzecinkowe"
+
+#: pg_controldata.c:262
+#, c-format
+msgid "Float4 argument passing:              %s\n"
+msgstr "Przekazywanie parametru float4:                  %s\n"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by value"
+msgstr "przez wartość"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by reference"
+msgstr "przez referencjÄ™"
+
+#: pg_controldata.c:264
+#, c-format
+msgid "Float8 argument passing:              %s\n"
+msgstr "Przekazywanie parametru float8:                  %s\n"
+
+#~ msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+#~ msgstr "Najnowsza lokalizacja punktu kontrolnego UNDO:    %X/%X\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "Maksymalna ilość argumentów funkcji: %u\n"
+
+#~ msgid "LC_COLLATE:                           %s\n"
+#~ msgstr "LC_COLLATE:                           %s\n"
+
+#~ msgid "LC_CTYPE:                             %s\n"
+#~ msgstr "LC_CTYPE:                             %s\n"
diff --git a/src/bin/pg_controldata/po/pt_BR.po b/src/bin/pg_controldata/po/pt_BR.po
index d54f4dd69c317..9354a311dd3d0 100644
--- a/src/bin/pg_controldata/po/pt_BR.po
+++ b/src/bin/pg_controldata/po/pt_BR.po
@@ -1,11 +1,13 @@
-# "pg_controldata" translation to Brazilian Portuguese Language.
+# Brazilian Portuguese message translation file for pg_controldata
+# Copyright (C) 2009 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
 # Cesar Suga <sartre@linuxbr.com>, 2002.
 # Roberto Mello <rmello@fslc.usu.edu>, 2002.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-07-26 15:07-0300\n"
 "PO-Revision-Date: 2005-10-04 23:00-0300\n"
diff --git a/src/bin/pg_controldata/po/sv.po b/src/bin/pg_controldata/po/sv.po
deleted file mode 100644
index 467033d1cd6af..0000000000000
--- a/src/bin/pg_controldata/po/sv.po
+++ /dev/null
@@ -1,279 +0,0 @@
-# Swedish message translation file for pg_controldata
-# This file is put in the public domain.
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-13 17:07+0000\n"
-"PO-Revision-Date: 2009-06-13 22:37+0300\n"
-"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: pg_controldata.c:24
-#, c-format
-msgid ""
-"%s displays control information of a PostgreSQL database cluster.\n"
-"\n"
-msgstr ""
-"%s visar kontrollinformation om ett PostgreSQL-databaskluster.\n"
-"\n"
-
-#: pg_controldata.c:28
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION] [DATADIR]\n"
-"\n"
-"Options:\n"
-"  --help         show this help, then exit\n"
-"  --version      output version information, then exit\n"
-msgstr ""
-"Användning:\n"
-"  %s [FLAGGA] [DATAKAT]\n"
-"\n"
-"Flaggor:\n"
-"  --help         visa denna hjälp, avsluta sedan\n"
-"  --version      visa versionsinformation, avsluta sedan\n"
-
-#: pg_controldata.c:36
-#, c-format
-msgid ""
-"\n"
-"If no data directory (DATADIR) is specified, the environment variable "
-"PGDATA\n"
-"is used.\n"
-"\n"
-msgstr ""
-"\n"
-"Om ingen datakatalog (DATAKAT) har angivits så används omgivningsvariabeln\n"
-"PGDATA för detta.\n"
-"\n"
-
-#: pg_controldata.c:38
-#, c-format
-msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_controldata.c:48
-msgid "starting up"
-msgstr "startar upp"
-
-#: pg_controldata.c:50
-msgid "shut down"
-msgstr "nedstängd"
-
-#: pg_controldata.c:52
-msgid "shutting down"
-msgstr "stänger ner"
-
-#: pg_controldata.c:54
-msgid "in crash recovery"
-msgstr "i återställande efter krash"
-
-#: pg_controldata.c:56
-msgid "in archive recovery"
-msgstr "i arkivåterställning"
-
-#: pg_controldata.c:58
-msgid "in production"
-msgstr "i produktion"
-
-#: pg_controldata.c:60
-msgid "unrecognized status code"
-msgstr "Ej igenkänd statuskod"
-
-#: pg_controldata.c:103
-#, c-format
-msgid "%s: no data directory specified\n"
-msgstr "%s: ingen datakatalog angiven\n"
-
-#: pg_controldata.c:104
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Försök med '%s --help' för mer information.\n"
-
-#: pg_controldata.c:112
-#, c-format
-msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: kunde inte öppna filen \"%s\" för läsning: %s\n"
-
-#: pg_controldata.c:119
-#, c-format
-msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: kunde inte läsa filen \"%s\": %s\n"
-
-#: pg_controldata.c:133
-#, c-format
-msgid ""
-"WARNING: Calculated CRC checksum does not match value stored in file.\n"
-"Either the file is corrupt, or it has a different layout than this program\n"
-"is expecting.  The results below are untrustworthy.\n"
-"\n"
-msgstr ""
-"VARNING: Beräknad CRC-kontrollsumma matchar inte värdet som sparats i "
-"filen.\n"
-"Antingen är filen trasig, eller så har den en annan uppbyggnad än vad detta\n"
-"program förväntade sig. Resultatet nedan är inte helt tillförlitligt.\n"
-"\n"
-
-#: pg_controldata.c:160
-#, c-format
-msgid "pg_control version number:            %u\n"
-msgstr "pg_control versionsnummer:            %u\n"
-
-#: pg_controldata.c:163
-#, c-format
-msgid ""
-"WARNING: possible byte ordering mismatch\n"
-"The byte ordering used to store the pg_control file might not match the one\n"
-"used by this program.  In that case the results below would be incorrect, "
-"and\n"
-"the PostgreSQL installation would be incompatible with this data directory.\n"
-msgstr ""
-
-#: pg_controldata.c:167
-#, c-format
-msgid "Catalog version number:               %u\n"
-msgstr "Katalogversionsnummer:                %u\n"
-
-#: pg_controldata.c:169
-#, c-format
-msgid "Database system identifier:           %s\n"
-msgstr "Databasens systemidentifierare:       %s\n"
-
-#: pg_controldata.c:171
-#, c-format
-msgid "Database cluster state:               %s\n"
-msgstr "Databasens klustertillstånd:          %s\n"
-
-#: pg_controldata.c:173
-#, c-format
-msgid "pg_control last modified:             %s\n"
-msgstr "pg_control ändrades senast:           %s\n"
-
-#: pg_controldata.c:175
-#, c-format
-msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "Senaste kontrollpunktsposition:       %X/%X\n"
-
-#: pg_controldata.c:178
-#, c-format
-msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "Tidigare kontrollpunktsposition:      %X/%X\n"
-
-#: pg_controldata.c:181
-#, c-format
-msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "Senaste kontrollpunktens REDO-pos:    %X/%X\n"
-
-#: pg_controldata.c:184
-#, c-format
-msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "Senaste kontrollpunktens TimeLineID:  %u\n"
-
-#: pg_controldata.c:186
-#, c-format
-msgid "Latest checkpoint's NextXID:          %u/%u\n"
-msgstr "Senaste kontrollpunktens NextXID:     %u/%u\n"
-
-#: pg_controldata.c:189
-#, c-format
-msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "Senaste kontrollpunktens NextOID:     %u\n"
-
-# FIXME: Wider then the rest of the items
-#: pg_controldata.c:191
-#, c-format
-msgid "Latest checkpoint's NextMultiXactId:  %u\n"
-msgstr "Senaste kontrollpunktens NextMultiXactId: %u\n"
-
-#: pg_controldata.c:193
-#, c-format
-msgid "Latest checkpoint's NextMultiOffset:  %u\n"
-msgstr "Senaste kontrollpunktens NextMultiOffse: %u\n"
-
-#: pg_controldata.c:195
-#, c-format
-msgid "Time of latest checkpoint:            %s\n"
-msgstr "Tidpunkt för senaste kontrollpunkt:   %s\n"
-
-#: pg_controldata.c:197
-#, c-format
-msgid "Minimum recovery ending location:     %X/%X\n"
-msgstr "Minsta återställningsslutposition:    %X/%X\n"
-
-#: pg_controldata.c:200
-#, c-format
-msgid "Maximum data alignment:               %u\n"
-msgstr "Maximal data-alignment:               %u\n"
-
-#: pg_controldata.c:203
-#, c-format
-msgid "Database block size:                  %u\n"
-msgstr "Databasens blockstorlek:              %u\n"
-
-#: pg_controldata.c:205
-#, c-format
-msgid "Blocks per segment of large relation: %u\n"
-msgstr "Block per segment i en stor relation: %u\n"
-
-#: pg_controldata.c:207
-#, c-format
-msgid "WAL block size:                       %u\n"
-msgstr "WAL-blockstorlek:                     %u\n"
-
-#: pg_controldata.c:209
-#, c-format
-msgid "Bytes per WAL segment:                %u\n"
-msgstr "Bytes per WAL-segment:                %u\n"
-
-#: pg_controldata.c:211
-#, c-format
-msgid "Maximum length of identifiers:        %u\n"
-msgstr "Maximal längd för identifierare:      %u\n"
-
-#: pg_controldata.c:213
-#, c-format
-msgid "Maximum columns in an index:          %u\n"
-msgstr "Maximalt antal kolumner i index:      %u\n"
-
-#: pg_controldata.c:215
-#, c-format
-msgid "Maximum size of a TOAST chunk:        %u\n"
-msgstr "Maximal storlek av TOAST-bit:          %u\n"
-
-#: pg_controldata.c:217
-#, c-format
-msgid "Date/time type storage:               %s\n"
-msgstr "Datum/tid-representation:             %s\n"
-
-#: pg_controldata.c:218
-msgid "64-bit integers"
-msgstr "64-bits heltal"
-
-#: pg_controldata.c:218
-msgid "floating-point numbers"
-msgstr "flyttalsnummer"
-
-#: pg_controldata.c:219
-#, fuzzy, c-format
-msgid "Float4 argument passing:              %s\n"
-msgstr "Maximal data-alignment:               %u\n"
-
-#: pg_controldata.c:220 pg_controldata.c:222
-msgid "by value"
-msgstr ""
-
-#: pg_controldata.c:220 pg_controldata.c:222
-msgid "by reference"
-msgstr ""
-
-#: pg_controldata.c:221
-#, fuzzy, c-format
-msgid "Float8 argument passing:              %s\n"
-msgstr "Maximal data-alignment:               %u\n"
diff --git a/src/bin/pg_controldata/po/ta.po b/src/bin/pg_controldata/po/ta.po
deleted file mode 100644
index 0b0914d78335c..0000000000000
--- a/src/bin/pg_controldata/po/ta.po
+++ /dev/null
@@ -1,267 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: போஸ�ட�கிரெஸ� தமிழாக�கக� க�ழ�\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-22 03:19-0300\n"
-"PO-Revision-Date: 2007-10-18 23:36+0530\n"
-"Last-Translator: ஆமாச�ச� <amachu@ubuntu.com>\n"
-"Language-Team: தமிழ� <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Tamil\n"
-"X-Poedit-Country: INDIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: pg_controldata.c:24
-#, c-format
-msgid ""
-"%s displays control information of a PostgreSQL database cluster.\n"
-"\n"
-msgstr ""
-"%s போஸ�டகிரெஸ� தரவ�க� கள க�ழ�மத�தின� நிர�வாகத� தகவலைக� காட�ட�ம�.\n"
-"\n"
-
-#: pg_controldata.c:28
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [OPTION] [DATADIR]\n"
-"\n"
-"Options:\n"
-"  --help         show this help, then exit\n"
-"  --version      output version information, then exit\n"
-msgstr ""
-"பயன�பாட�:\n"
-"  %s [OPTION] [DATADIR]\n"
-"\n"
-"தேர�வ�கள�:\n"
-"  --help         இவ�வ�தவியினைக� காட�டிவிட�ட� வெளிவரவ�ம�\n"
-"  --version      வெளியீட�ட� தகவலை வெளியிட�ட� விட�ட� வெளிவரவ�ம�\n"
-
-#: pg_controldata.c:36
-#, c-format
-msgid ""
-"\n"
-"If no data directory (DATADIR) is specified, the environment variable PGDATA\n"
-"is used.\n"
-"\n"
-msgstr ""
-"\n"
-" எந�த வொர� அடைவ�ம� (DATADIR) க�றிப�பிடாத� இர�ந�தால�, சூழல� மாறி PGDATA\n"
-" பயன� பட�த�தப� பட�ம�.\n"
-" \n"
-
-#: pg_controldata.c:38
-#, c-format
-msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "வழ�க�களை <pgsql-bugs@postgresql.org> க�க�த� தெரியப� பட�த�த�க.\n"
-
-#: pg_controldata.c:48
-msgid "starting up"
-msgstr "த�வக�கப� பட�கிறத�"
-
-#: pg_controldata.c:50
-msgid "shut down"
-msgstr "நிற�த�த�க"
-
-#: pg_controldata.c:52
-msgid "shutting down"
-msgstr "நிற�த�தப� பட�கிறத�"
-
-#: pg_controldata.c:54
-msgid "in crash recovery"
-msgstr "நிலைக�லைவிலிர�ந�த� மீட�கப� பட�கிறத�"
-
-#: pg_controldata.c:56
-msgid "in archive recovery"
-msgstr "பெட�டக மீட�பில�"
-
-#: pg_controldata.c:58
-msgid "in production"
-msgstr "நிகழ�வில�"
-
-#: pg_controldata.c:60
-msgid "unrecognized status code"
-msgstr "இனங�காண இயலாத நிலைக� க�றியீட�"
-
-#: pg_controldata.c:102
-#, c-format
-msgid "%s: no data directory specified\n"
-msgstr "%s: தரவ�க�கான அடைவ� எத�வ�ம� க�றிப�பிடப� படவில�லை\n"
-
-#: pg_controldata.c:103
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "மேல�ம� விவரங�கள�க�க� \"%s --help\" ம�யற�சி செய�யவ�ம�\n"
-
-#: pg_controldata.c:111
-#, c-format
-msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "\"%s\" கோப�பினை வாசிக�க�ம� %s பொர�ட�ட� திறக�க இயலவில�லை%s\n"
-
-#: pg_controldata.c:118
-#, c-format
-msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: \"%s\": %s கோப�பினை வாசிக�க இயலவில�லை\n"
-
-#: pg_controldata.c:132
-#, c-format
-msgid ""
-"WARNING: Calculated CRC checksum does not match value stored in file.\n"
-"Either the file is corrupt, or it has a different layout than this program\n"
-"is expecting.  The results below are untrustworthy.\n"
-"\n"
-msgstr ""
-"எச�சரிக�கை: CRC சோதனைக�கூட�டலின� மதிப�ப� கோப�பில� சேமிக�கப� பட�ட மதிப�ப�டன� பொர�ந�தவில�லை.\n"
-" ஒன�ற� கோப�ப� கெட�ட�ப� போயிர�க�க வேண�ட�ம�, அல�லத� இந�நிரல�\n"
-" எதிர�பார�ப�பதைக� காட�டில�ம� வேறொர� வரைம�றையைக� கொண�டிர�த�தல� வேண�ட�ம�. கீழ�காண�ம� ம�டிவ�களை நம�ப ம�டியவில�லை.\n"
-"\n"
-
-#: pg_controldata.c:152
-#, c-format
-msgid "pg_control version number:            %u\n"
-msgstr "pg_control வெளியீட�ட� எண�:            %u\n"
-
-#: pg_controldata.c:154
-#, c-format
-msgid "Catalog version number:               %u\n"
-msgstr "காடலாக� வெளியீட�ட� எண�:               %u\n"
-
-#: pg_controldata.c:156
-#, c-format
-msgid "Database system identifier:           %s\n"
-msgstr "தரவ�த� தள அமைப�பின� அடையாளங�காட�டி:           %s\n"
-
-#: pg_controldata.c:158
-#, c-format
-msgid "Database cluster state:               %s\n"
-msgstr "தரவ�க� கள கூட�டமைப�பின� நிலை:               %s\n"
-
-#: pg_controldata.c:160
-#, c-format
-msgid "pg_control last modified:             %s\n"
-msgstr "கடைசியாக மாற�றப� பட�ட pg_control:             %s\n"
-
-#: pg_controldata.c:162
-#, c-format
-msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "நவீன சோதனை மையத�தின� இர�ப�பிடம�:           %X/%X\n"
-
-#: pg_controldata.c:165
-#, c-format
-msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "ம�ந�தைய சோதனை மையத�தின� இர�ப�பிடம�:            %X/%X\n"
-
-#: pg_controldata.c:168
-#, c-format
-msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "நவீன மையத�தின� REDO இர�ப�பிடம�:    %X/%X\n"
-
-#: pg_controldata.c:171
-#, c-format
-msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "நவீன சோதனை மையத�தின� TimeLineID:       %u\n"
-
-#: pg_controldata.c:173
-#, c-format
-msgid "Latest checkpoint's NextXID:          %u/%u\n"
-msgstr "நவீன சோதனை மையத�தின� NextXID:          %u/%u\n"
-
-#: pg_controldata.c:176
-#, c-format
-msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "நவீன சோதனை மையத�தின� NextOID:          %u\n"
-
-#: pg_controldata.c:178
-#, c-format
-msgid "Latest checkpoint's NextMultiXactId:  %u\n"
-msgstr "நவீன சோதனை மையத�தின� NextMultiXactId:  %u\n"
-
-#: pg_controldata.c:180
-#, c-format
-msgid "Latest checkpoint's NextMultiOffset:  %u\n"
-msgstr "நவீன சோதனை மையத�தின� NextMultiOffset:  %u\n"
-
-#: pg_controldata.c:182
-#, c-format
-msgid "Time of latest checkpoint:            %s\n"
-msgstr "நவீன சோதனை மையத�தின� நேரம�:            %s\n"
-
-#: pg_controldata.c:184
-#, c-format
-msgid "Minimum recovery ending location:     %X/%X\n"
-msgstr "க�றைந�த பட�ச மீட�ப� ம�டிவின� இர�ப�பிடம�:     %X/%X\n"
-
-#: pg_controldata.c:187
-#, c-format
-msgid "Maximum data alignment:               %u\n"
-msgstr "அதிகபட�ச தரவ� ஒழ�ங�கமைப�ப�:               %u\n"
-
-#: pg_controldata.c:190
-#, c-format
-msgid "Database block size:                  %u\n"
-msgstr "தரவ�க� கள கட�ட� அளவ�:                %u\n"
-
-#: pg_controldata.c:192
-#, c-format
-msgid "Blocks per segment of large relation: %u\n"
-msgstr "பெரியத� தொடர�ப�டையக� கட�ட� ஒன�ற�க�கான கட�ட�: %u\n"
-
-#: pg_controldata.c:194
-#, c-format
-msgid "WAL block size:                       %u\n"
-msgstr "WAL கட�ட� அளவ�:                        %u\n"
-
-#: pg_controldata.c:196
-#, c-format
-msgid "Bytes per WAL segment:                %u\n"
-msgstr "WAL பக�தியொன�றிறகானப� பைட�:   %u\n"
-
-#: pg_controldata.c:198
-#, c-format
-msgid "Maximum length of identifiers:        %u\n"
-msgstr "அடையாளங� காட�டிக�கான அதிகபட�ச நீளம�:        %u\n"
-
-#: pg_controldata.c:200
-#, c-format
-msgid "Maximum columns in an index:          %u\n"
-msgstr "அட�டவணைக�கான அதிகபட�ச நெட�வரிசைகள�:          %u\n"
-
-#: pg_controldata.c:202
-#, c-format
-msgid "Maximum size of a TOAST chunk:        %u\n"
-msgstr "TOAST அடர�த�தியின� அதிக பட�ச அளவ�:         %u\n"
-
-#: pg_controldata.c:204
-#, c-format
-msgid "Date/time type storage:               %s\n"
-msgstr "தேதி/நேர வகை சேமிப�ப�:                 %s\n"
-
-#: pg_controldata.c:205
-msgid "64-bit integers"
-msgstr "64-இர�ம எண�கள�"
-
-#: pg_controldata.c:205
-msgid "floating-point numbers"
-msgstr "ப�ள�ளி எண�கள�"
-
-#: pg_controldata.c:206
-#, c-format
-msgid "Maximum length of locale name:        %u\n"
-msgstr "அகப� பெயரின� அதிகப� படச அளவ�:%u\n"
-
-#: pg_controldata.c:208
-#, c-format
-msgid "LC_COLLATE:                           %s\n"
-msgstr "LC_COLLATE:                           %s\n"
-
-#: pg_controldata.c:210
-#, c-format
-msgid "LC_CTYPE:                             %s\n"
-msgstr "LC_CTYPE:                             %s\n"
-
diff --git a/src/bin/pg_controldata/po/tr.po b/src/bin/pg_controldata/po/tr.po
index 8e40241a1d86f..8e32f6fe75e11 100644
--- a/src/bin/pg_controldata/po/tr.po
+++ b/src/bin/pg_controldata/po/tr.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_controldata-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 20:06+0000\n"
-"PO-Revision-Date: 2010-09-01 10:33+0200\n"
+"POT-Creation-Date: 2011-08-29 20:40+0000\n"
+"PO-Revision-Date: 2011-08-30 01:43+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -240,93 +241,106 @@ msgstr "Yedek baÅŸlama yeri:           %X/%X\n"
 
 #: pg_controldata.c:235
 #, c-format
+msgid "End-of-backup record required:        %s\n"
+msgstr "Yedek sonu kaydı gerekiyor:        %s\n"
+
+#: pg_controldata.c:236
+msgid "yes"
+msgstr "evet"
+
+#: pg_controldata.c:236
+msgid "no"
+msgstr "hayır"
+
+#: pg_controldata.c:237
+#, c-format
 msgid "Current wal_level setting:            %s\n"
 msgstr "Mevcut wal_level ayarı           %s\n"
 
-#: pg_controldata.c:237
+#: pg_controldata.c:239
 #, c-format
 msgid "Current max_connections setting:      %d\n"
 msgstr "Mevcut max_connections ayarı:      %d\n"
 
-#: pg_controldata.c:239
+#: pg_controldata.c:241
 #, c-format
 msgid "Current max_prepared_xacts setting:   %d\n"
 msgstr "Mevcut max_prepared_xacts ayarı:   %d\n"
 
-#: pg_controldata.c:241
+#: pg_controldata.c:243
 #, c-format
 msgid "Current max_locks_per_xact setting:   %d\n"
 msgstr "Mevcut max_locks_per_xact ayarı:   %d\n"
 
-#: pg_controldata.c:243
+#: pg_controldata.c:245
 #, c-format
 msgid "Maximum data alignment:               %u\n"
 msgstr "Azami veri hizalama:                %u\n"
 
-#: pg_controldata.c:246
+#: pg_controldata.c:248
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Veritabanı blok boyutu:                  %u\n"
 
-#: pg_controldata.c:248
+#: pg_controldata.c:250
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Büyük ilişkilerin parçası başına blok sayısı: %u\n"
 
-#: pg_controldata.c:250
+#: pg_controldata.c:252
 #, c-format
 msgid "WAL block size:                       %u\n"
 msgstr "WAL blok boyutu:                  %u\n"
 
-#: pg_controldata.c:252
+#: pg_controldata.c:254
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Her bir WAL parçası başına byte sayısı:                %u\n"
 
-#: pg_controldata.c:254
+#: pg_controldata.c:256
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Belirteçlerin en fazla uzunluğu:        %u\n"
 
-#: pg_controldata.c:256
+#: pg_controldata.c:258
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
 msgstr "İndekste en fazla kolon sayısı:        %u\n"
 
-#: pg_controldata.c:258
+#: pg_controldata.c:260
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
 msgstr "TOAST parçasının en yüksek boyutu:        %u\n"
 
-#: pg_controldata.c:260
+#: pg_controldata.c:262
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Tarih/zaman tipi saklanması:               %s\n"
 
-#: pg_controldata.c:261
+#: pg_controldata.c:263
 msgid "64-bit integers"
 msgstr "64-bit tamsayı"
 
-#: pg_controldata.c:261
+#: pg_controldata.c:263
 msgid "floating-point numbers"
 msgstr "kayan noktalı sayılar"
 
-#: pg_controldata.c:262
+#: pg_controldata.c:264
 #, c-format
 msgid "Float4 argument passing:              %s\n"
 msgstr "Float4 argument passing:              %s\n"
 
-#: pg_controldata.c:263
 #: pg_controldata.c:265
+#: pg_controldata.c:267
 msgid "by value"
 msgstr "deÄŸer ile"
 
-#: pg_controldata.c:263
 #: pg_controldata.c:265
+#: pg_controldata.c:267
 msgid "by reference"
 msgstr "referans ile"
 
-#: pg_controldata.c:264
+#: pg_controldata.c:266
 #, c-format
 msgid "Float8 argument passing:              %s\n"
 msgstr "Float8 argument passing:              %s\n"
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 29f8a59c60b4a..3e706db6bf1f3 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_ctl/nls.mk
 CATALOG_NAME	:= pg_ctl
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR ru sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr ja pl pt_BR ru tr zh_TW
 GETTEXT_FILES	:= pg_ctl.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index a3933abaa696a..2c78c087bbcfe 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1570,7 +1570,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 		 * NT4 doesn't have CreateRestrictedToken, so just call ordinary
 		 * CreateProcess
 		 */
-		write_stderr("WARNING: cannot create restricted tokens on this platform\n");
+		write_stderr(_("%s: WARNING: cannot create restricted tokens on this platform\n"), progname);
 		if (Advapi32Handle != NULL)
 			FreeLibrary(Advapi32Handle);
 		return CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, processInfo);
@@ -1579,7 +1579,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 	/* Open the current token to use as a base for the restricted one */
 	if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &origToken))
 	{
-		write_stderr("Failed to open process token: %lu\n", GetLastError());
+		write_stderr(_("%s: could not open process token: %lu\n"), progname, GetLastError());
 		return 0;
 	}
 
@@ -1592,7 +1592,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 	SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0,
 								  0, &dropSids[1].Sid))
 	{
-		write_stderr("Failed to allocate SIDs: %lu\n", GetLastError());
+		write_stderr(_("%s: could not allocate SIDs: %lu\n"), progname, GetLastError());
 		return 0;
 	}
 
@@ -1611,7 +1611,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 
 	if (!b)
 	{
-		write_stderr("Failed to create restricted token: %lu\n", GetLastError());
+		write_stderr(_("%s: could not create restricted token: %lu\n"), progname, GetLastError());
 		return 0;
 	}
 
@@ -1649,7 +1649,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 			 * Log error if we can't get version, or if we're on WinXP/2003 or
 			 * newer
 			 */
-			write_stderr("WARNING: could not locate all job object functions in system API\n");
+			write_stderr(_("%s: WARNING: could not locate all job object functions in system API\n"), progname);
 	}
 	else
 	{
diff --git a/src/bin/pg_ctl/po/cs.po b/src/bin/pg_ctl/po/cs.po
new file mode 100644
index 0000000000000..d43d90956a180
--- /dev/null
+++ b/src/bin/pg_ctl/po/cs.po
@@ -0,0 +1,836 @@
+# translation of pg_ctl-cs.po to
+# translation of pg_ctl-cs.po to Czech
+#
+# Karel Zak <zakkr@zf.jcu.cz>, 2004, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_ctl-cs\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-30 11:32+0200\n"
+"PO-Revision-Date: 2011-09-06 12:21+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pg_ctl.c:237 pg_ctl.c:252 pg_ctl.c:2035
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek paměti\n"
+
+#: pg_ctl.c:286
+#, c-format
+msgid "%s: could not open PID file \"%s\": %s\n"
+msgstr "%s: nelze otevřít PID soubor \"%s\": %s\n"
+
+#: pg_ctl.c:293
+#, c-format
+msgid "%s: invalid data in PID file \"%s\"\n"
+msgstr "%s: neplatná data v PID souboru \"%s\"\n"
+
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+"\n"
+"%s: -w volba není podporována při startu pre-9.1 serveru\n"
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+"\n"
+"%s: -w volba nemůže používat relativně zadaný adresář socketu\n"
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr ""
+"\n"
+"%s: zdá se že v tomto datovém adresáři již běží existující postmaster\n"
+
+#: pg_ctl.c:638
+#, c-format
+msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
+msgstr "%s: nelze nastavit limit pro core soubor; zakázáno hard limitem\n"
+
+#: pg_ctl.c:663
+#, c-format
+msgid "%s: could not read file \"%s\"\n"
+msgstr "%s: nelze �íst soubor \"%s\"\n"
+
+#: pg_ctl.c:668
+#, c-format
+msgid "%s: option file \"%s\" must have exactly one line\n"
+msgstr "%s: soubor s volbami \"%s\" musí mít přesně jednu řádku\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid ""
+"The program \"%s\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"%s\" je vyžadován aplikací %s, ale nebyl nalezen ve stejném\n"
+"adresáři jako \"%s\".\n"
+"Zkontrolujte vaši instalaci.\n"
+
+#: pg_ctl.c:722
+#, c-format
+msgid ""
+"The program \"%s\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"%s\" byl nalezen pomocí \"%s\",\n"
+"ale nebyl ve stejné verzi jako %s.\n"
+"Zkontrolujte vaši instalaci.\n"
+
+#: pg_ctl.c:755
+#, c-format
+msgid "%s: database system initialization failed\n"
+msgstr "%s: inicializace databáze selhala\n"
+
+#: pg_ctl.c:770
+#, c-format
+msgid "%s: another server might be running; trying to start server anyway\n"
+msgstr "%s: další server možná běží; i tak zkouším start\n"
+
+#: pg_ctl.c:807
+#, c-format
+msgid "%s: could not start server: exit code was %d\n"
+msgstr "%s: nelze nastartovat server: návratový kód byl %d\n"
+
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "�ekám na start serveru ..."
+
+#: pg_ctl.c:819 pg_ctl.c:920 pg_ctl.c:1011
+msgid " done\n"
+msgstr " hotovo\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "server spuštěn\n"
+
+#: pg_ctl.c:823 pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr " přestávám �ekat\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "server stále startuje\n"
+
+#: pg_ctl.c:828
+#, c-format
+msgid ""
+"%s: could not start server\n"
+"Examine the log output.\n"
+msgstr ""
+"%s: nelze spustit server\n"
+"Zkontrolujte záznam v logu.\n"
+
+#: pg_ctl.c:834 pg_ctl.c:912 pg_ctl.c:1002
+msgid " failed\n"
+msgstr " selhalo\n"
+
+#: pg_ctl.c:835
+#, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s: nelze �ekat na server kvůli chybné konfiguraci\n"
+
+#: pg_ctl.c:841
+msgid "server starting\n"
+msgstr "server startuje\n"
+
+#: pg_ctl.c:856 pg_ctl.c:942 pg_ctl.c:1032 pg_ctl.c:1072
+#, c-format
+msgid "%s: PID file \"%s\" does not exist\n"
+msgstr "%s: PID soubor \"%s\" neexistuje\n"
+
+#: pg_ctl.c:857 pg_ctl.c:944 pg_ctl.c:1033 pg_ctl.c:1073
+msgid "Is server running?\n"
+msgstr "Běží server?\n"
+
+#: pg_ctl.c:863
+#, c-format
+msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: nemohu zastavit server; postgres běží v single-user módu (PID: %ld)\n"
+
+#: pg_ctl.c:871 pg_ctl.c:966
+#, c-format
+msgid "%s: could not send stop signal (PID: %ld): %s\n"
+msgstr "%s: nelze poslat stop signál (PID: %ld): %s\n"
+
+#: pg_ctl.c:878
+msgid "server shutting down\n"
+msgstr "server se ukon�uje\n"
+
+#: pg_ctl.c:893 pg_ctl.c:981
+msgid ""
+"WARNING: online backup mode is active\n"
+"Shutdown will not complete until pg_stop_backup() is called.\n"
+"\n"
+msgstr ""
+"VAROV�N�: online backup mód je aktivní\n"
+"Shutdown nebude ukon�en dokud nebude zavolán pg_stop_backup().\n"
+"\n"
+
+#: pg_ctl.c:897 pg_ctl.c:985
+msgid "waiting for server to shut down..."
+msgstr "�ekám na ukon�ení serveru ..."
+
+#: pg_ctl.c:914 pg_ctl.c:1004
+#, c-format
+msgid "%s: server does not shut down\n"
+msgstr "%s: server se neukon�uje\n"
+
+#: pg_ctl.c:916 pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"TIP: Volba \"-m fast\" okamžitě ukon�í sezení namísto aby �ekala\n"
+"na odpojení iniciované přímo session.\n"
+
+#: pg_ctl.c:922 pg_ctl.c:1012
+msgid "server stopped\n"
+msgstr "server zastaven\n"
+
+#: pg_ctl.c:945 pg_ctl.c:1018
+msgid "starting server anyway\n"
+msgstr "přesto server spouštím\n"
+
+#: pg_ctl.c:954
+#, c-format
+msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: nemohu restartovat server; postgres běží v single-user módu (PID: %ld)\n"
+
+#: pg_ctl.c:957 pg_ctl.c:1042
+msgid "Please terminate the single-user server and try again.\n"
+msgstr "Prosím ukon�ete single-user postgres a zkuste to znovu.\n"
+
+#: pg_ctl.c:1016
+#, c-format
+msgid "%s: old server process (PID: %ld) seems to be gone\n"
+msgstr "%s: starý proces serveru (PID: %ld) zřejmě skon�il\n"
+
+#: pg_ctl.c:1039
+#, c-format
+msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: nemohu znovuna�íst server; server běží v single-user módu (PID: %ld)\n"
+
+#: pg_ctl.c:1048
+#, c-format
+msgid "%s: could not send reload signal (PID: %ld): %s\n"
+msgstr "%s: nelze poslat signál pro reload (PID: %ld): %s\n"
+
+#: pg_ctl.c:1053
+msgid "server signaled\n"
+msgstr "server obdržel signál\n"
+
+#: pg_ctl.c:1079
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: nelze povýšit (promote) server; server běží v single-user módu (PID: %"
+"ld)\n"
+
+#: pg_ctl.c:1088
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s: nelze povýšit (promote) server; server není ve standby módu\n"
+
+#: pg_ctl.c:1096
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: nelze vytvořit signální soubor pro povýšení (promote) \"%s\": %s\n"
+
+#: pg_ctl.c:1102
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr ""
+"%s: nelze zapsat do signálního souboru pro povýšení (promote) \"%s\": %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: nelze poslat signál pro povýšení (promote, PID: %ld): %s\n"
+
+#: pg_ctl.c:1113
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr ""
+"%s: nelze odstranit signální soubor pro povýšení (promote) \"%s\": %s\n"
+
+#: pg_ctl.c:1118
+msgid "server promoting\n"
+msgstr "server je povyšován (promote)\n"
+
+#: pg_ctl.c:1163
+#, c-format
+msgid "%s: single-user server is running (PID: %ld)\n"
+msgstr "%s: server běží v single-user módu (PID: %ld)\n"
+
+#: pg_ctl.c:1175
+#, c-format
+msgid "%s: server is running (PID: %ld)\n"
+msgstr "%s: server běží (PID: %ld)\n"
+
+#: pg_ctl.c:1186
+#, c-format
+msgid "%s: no server running\n"
+msgstr "%s: žádný server neběží\n"
+
+#: pg_ctl.c:1197
+#, c-format
+msgid "%s: could not send signal %d (PID: %ld): %s\n"
+msgstr "%s: nelze poslat signál pro reload %d (PID: %ld): %s\n"
+
+#: pg_ctl.c:1231
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: nemůže najít vlastní spustitelný soubor\n"
+
+#: pg_ctl.c:1241
+#, c-format
+msgid "%s: could not find postgres program executable\n"
+msgstr "%s: nelze najít spustitelný program postgres\n"
+
+#: pg_ctl.c:1306 pg_ctl.c:1338
+#, c-format
+msgid "%s: could not open service manager\n"
+msgstr "%s: nelze otevřít manažera služeb\n"
+
+#: pg_ctl.c:1312
+#, c-format
+msgid "%s: service \"%s\" already registered\n"
+msgstr "%s: služba \"%s\" je již registrována\n"
+
+#: pg_ctl.c:1323
+#, c-format
+msgid "%s: could not register service \"%s\": error code %d\n"
+msgstr "%s: nelze zaregistrovat službu \"%s\": chybový kód %d\n"
+
+#: pg_ctl.c:1344
+#, c-format
+msgid "%s: service \"%s\" not registered\n"
+msgstr "%s: služba \"%s\" není registrována\n"
+
+#: pg_ctl.c:1351
+#, c-format
+msgid "%s: could not open service \"%s\": error code %d\n"
+msgstr "%s: nelze otevřít službu \"%s\": chýbový kód %d\n"
+
+#: pg_ctl.c:1358
+#, c-format
+msgid "%s: could not unregister service \"%s\": error code %d\n"
+msgstr "%s: nelze odregistrovat službu \"%s\": chýbový kód %d\n"
+
+#: pg_ctl.c:1444
+msgid "Waiting for server startup...\n"
+msgstr "�ekám na start serveru ...\n"
+
+#: pg_ctl.c:1447
+msgid "Timed out waiting for server startup\n"
+msgstr "Časový limit pro �ekání na start serveru vypršel\n"
+
+#: pg_ctl.c:1451
+msgid "Server started and accepting connections\n"
+msgstr "Server nastartoval a přijímá spojení\n"
+
+#: pg_ctl.c:1501
+#, c-format
+msgid "%s: could not start service \"%s\": error code %d\n"
+msgstr "%s: nelze zaregistrovat službu \"%s\": chybový kód %d\n"
+
+#: pg_ctl.c:1573
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: VAROV�N�: na této platformě nelze vytvořit tajné tokeny\n"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s: nelze otevřít token procesu: %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s: nelze alokovat SIDs: %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s: nelze otevřít tajný token: %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr ""
+"%s: VAROV�N�: v systémovém API nelze najít všechny \"job object\" funkce\n"
+
+#: pg_ctl.c:1738
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: pg_ctl.c:1746
+#, c-format
+msgid ""
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s je nástroj pro inicializaci, spuštění, zastavení, nebo ovládání "
+"PostgreSQL serveru.\n"
+"\n"
+
+#: pg_ctl.c:1747
+#, c-format
+msgid "Usage:\n"
+msgstr "Použití:\n"
+
+#: pg_ctl.c:1748
+#, c-format
+msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr "  %s init[db]               [-D ADRES�Ř] [-s] [-o \"PŘEP�NAČE\"]\n"
+
+#: pg_ctl.c:1749
+#, c-format
+msgid ""
+"  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
+"\"]\n"
+msgstr ""
+"  %s start   [-w] [-t SECS] [-D ADRES�Ř] [-s] [-l SOUBOR] [-o \"PŘEP�NAČE"
+"\"]\n"
+
+#: pg_ctl.c:1750
+#, c-format
+msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-t SECS] [-D ADRES�Ř] [-s] [-m MÓD-UKONČEN�]\n"
+
+#: pg_ctl.c:1751
+#, c-format
+msgid ""
+"  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+"                 [-o \"OPTIONS\"]\n"
+msgstr ""
+"  %s restart [-w] [-t SECS] [-D ADRES�Ř] [-s] [-m MÓD-UKONČEN�]\n"
+"                 [-o \"PŘEP�NAČE\"]\n"
+
+#: pg_ctl.c:1753
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D ADRES�Ř] [-s]\n"
+
+#: pg_ctl.c:1754
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D ADRES�Ř]\n"
+
+#: pg_ctl.c:1755
+#, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s promote [-D ADRES�Ř] [-s]\n"
+
+#: pg_ctl.c:1756
+#, c-format
+msgid "  %s kill    SIGNALNAME PID\n"
+msgstr "  %s kill    SIGN�L  IDPROCESU\n"
+
+#: pg_ctl.c:1758
+#, c-format
+msgid ""
+"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+msgstr ""
+"  %s register   [-N N�ZEVSLUŽBY] [-U UŽIVATEL] [-P HESLO] [-D ADRES�Ř]\n"
+"                    [-w] [-o \"VOLBY\"]\n"
+
+#: pg_ctl.c:1760
+#, c-format
+msgid "  %s unregister [-N SERVICENAME]\n"
+msgstr "  %s unregister [-N SERVICENAME]\n"
+
+#: pg_ctl.c:1763
+#, c-format
+msgid ""
+"\n"
+"Common options:\n"
+msgstr ""
+"\n"
+"Spole�né přepína�e:\n"
+
+#: pg_ctl.c:1764
+#, c-format
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata ADRES�Ř   umístění úložiště databáze\n"
+
+#: pg_ctl.c:1765
+#, c-format
+msgid "  -s, --silent           only print errors, no informational messages\n"
+msgstr ""
+"  -s, --silent           vypisuj jen chyby, žádné informativní zprávy\n"
+
+#: pg_ctl.c:1766
+#, c-format
+msgid "  -t SECS                seconds to wait when using -w option\n"
+msgstr ""
+"  -t SECS                po�et vteřin pro �ekání při využití volby -w\n"
+
+#: pg_ctl.c:1767
+#, c-format
+msgid "  -w                     wait until operation completes\n"
+msgstr "  -w                     �ekat na dokon�ení operace\n"
+
+#: pg_ctl.c:1768
+#, c-format
+msgid "  -W                     do not wait until operation completes\n"
+msgstr "  -W                     ne�ekat na dokon�ení operace\n"
+
+#: pg_ctl.c:1769
+#, c-format
+msgid "  --help                 show this help, then exit\n"
+msgstr "  --help                 vypsat tuto nápovědu, potom skon�it\n"
+
+#: pg_ctl.c:1770
+#, c-format
+msgid "  --version              output version information, then exit\n"
+msgstr "  --version              vypsat informace o verzi, potom skon�it\n"
+
+#: pg_ctl.c:1771
+#, c-format
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(Implicitní chování je �ekat na ukon�ení, ale ne při startu nebo restartu.)\n"
+"\n"
+
+#: pg_ctl.c:1772
+#, c-format
+msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
+msgstr "Pokud je vynechán parametr -D, použije se proměnná prostředí PGDATA.\n"
+
+#: pg_ctl.c:1774
+#, c-format
+msgid ""
+"\n"
+"Options for start or restart:\n"
+msgstr ""
+"\n"
+"Přepína�e pro start nebo restart:\n"
+
+#: pg_ctl.c:1776
+#, c-format
+msgid "  -c, --core-files       allow postgres to produce core files\n"
+msgstr "  -c, --core-files       povolit postgresu vytvářet core soubory\n"
+
+#: pg_ctl.c:1778
+#, c-format
+msgid "  -c, --core-files       not applicable on this platform\n"
+msgstr "  -c, --core-files       nepoužitelné pro tuto platformu\n"
+
+#: pg_ctl.c:1780
+#, c-format
+msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
+msgstr ""
+"  -l, --log SOUBOR        zapisuj (nebo připoj na konec) log serveru do "
+"SOUBORU.\n"
+
+#: pg_ctl.c:1781
+#, c-format
+msgid ""
+"  -o OPTIONS             command line options to pass to postgres\n"
+"                         (PostgreSQL server executable) or initdb\n"
+msgstr ""
+"  -o PŘEP�NAČE            přepína�e, které budou předány postgresu\n"
+"                          (spustitelnému souboru PostgreSQL) �i initdb\n"
+
+#: pg_ctl.c:1783
+#, c-format
+msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
+msgstr "  -p CESTA-K-POSTGRESU  za normálních okolností není potřeba\n"
+
+#: pg_ctl.c:1784
+#, c-format
+msgid ""
+"\n"
+"Options for stop or restart:\n"
+msgstr ""
+"\n"
+"Přepína�e pro zastavení nebo restart:\n"
+
+#: pg_ctl.c:1785
+#, c-format
+msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
+msgstr "  -m SHUTDOWN-MODE   může být \"smart\", \"fast\", or \"immediate\"\n"
+
+#: pg_ctl.c:1787
+#, c-format
+msgid ""
+"\n"
+"Shutdown modes are:\n"
+msgstr ""
+"\n"
+"Módy ukon�ení jsou:\n"
+
+#: pg_ctl.c:1788
+#, c-format
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       skon�i potom, co se odpojí všichni klienti\n"
+
+#: pg_ctl.c:1789
+#, c-format
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        skon�i okamžitě, s korektním zastavením serveru\n"
+
+#: pg_ctl.c:1790
+#, c-format
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on "
+"restart\n"
+msgstr ""
+"  immediate   skon�i bez kompletního zastavení; další start provede "
+"                          obnovu po pádu (crash recovery)\n"
+
+#: pg_ctl.c:1792
+#, c-format
+msgid ""
+"\n"
+"Allowed signal names for kill:\n"
+msgstr ""
+"\n"
+"Povolené signály pro \"kill\":\n"
+
+#: pg_ctl.c:1796
+#, c-format
+msgid ""
+"\n"
+"Options for register and unregister:\n"
+msgstr ""
+"\n"
+"Přepína�e pro register nebo unregister:\n"
+
+#: pg_ctl.c:1797
+#, c-format
+msgid ""
+"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
+msgstr ""
+"  -N SERVICENAME  jméno služby, pod kterým registrovat PostgreSQL server\n"
+
+#: pg_ctl.c:1798
+#, c-format
+msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
+msgstr "  -P PASSWORD     heslo k ú�tu pro registraci PostgreSQL serveru\n"
+
+#: pg_ctl.c:1799
+#, c-format
+msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
+msgstr "  -U USERNAME     uživatelské jméno pro registraci PostgreSQL server\n"
+
+#: pg_ctl.c:1800
+#, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr ""
+"  -S TYP-STARTU   typ spuštění služby pro registraci PostgreSQL serveru\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Módy spuštění jsou:\n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid ""
+"  auto       start service automatically during system startup (default)\n"
+msgstr ""
+"  auto       spusť službu automaticky během startu systému (implicitní)\n"
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr "  demand     spusť službu na vyžádání\n"
+
+#: pg_ctl.c:1807
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1832
+#, c-format
+msgid "%s: unrecognized shutdown mode \"%s\"\n"
+msgstr "%s: neplatný mód ukon�ení mode \"%s\"\n"
+
+#: pg_ctl.c:1865
+#, c-format
+msgid "%s: unrecognized signal name \"%s\"\n"
+msgstr "%s: neplatné jméno signálu \"%s\"\n"
+
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: neplatný typ spuštění \"%s\"\n"
+
+#: pg_ctl.c:1947
+#, 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: nelze spustit jako root\n"
+"Prosím přihlaste se (například pomocí., \"su\") jako (neprivilegovaný) "
+"uživatel,\n"
+"který bude vlastníkem serverového procesu.\n"
+
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: -S nepoužitelné pro tuto platformu\n"
+
+#: pg_ctl.c:2065
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: příliš mnoho parametrů příkazové řádky (první je \"%s\")\n"
+
+#: pg_ctl.c:2089
+#, c-format
+msgid "%s: missing arguments for kill mode\n"
+msgstr "%s: chýbějící parametr pro \"kill\" mód\n"
+
+#: pg_ctl.c:2107
+#, c-format
+msgid "%s: unrecognized operation mode \"%s\"\n"
+msgstr "%s: neplatný mód operace \"%s\"\n"
+
+#: pg_ctl.c:2117
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: není specifikována operace\n"
+
+#: pg_ctl.c:2133
+#, c-format
+msgid ""
+"%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr ""
+"%s: není zadán datový adresář a ani není nastavena proměnná prostředí "
+"PGDATA\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nelze získat aktuální adresář: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "neplatný binární soubor\"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nelze �íst binární soubor \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nelze najít spustitelný soubor \"%s\""
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nelze změnit adresář na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nelze �íst symbolický link \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "potomek skon�il s návratovým kódem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "potomek byl ukon�en vyjímkou 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "potomek byl ukon�en signálem %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "potomek byl ukon�en signálem %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "potomek skon�il s nerozponaným stavem %d"
+
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s je pomůcka pro spuštění, zastavení, restart, znovuna�tení "
+#~ "konfigura�ních\n"
+#~ "souborů, nahlášení stavu PostgreSQL serveru nebo ukon�ení PostgreSQL "
+#~ "procesu.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
+#~ "same directory as \"%s\".\n"
+#~ "Check your installation.\n"
+#~ msgstr ""
+#~ "%s potřebuje program \"postmaster\", který ale nebyl  nalezen ve stejném\n"
+#~ "adresáři jako \"%s\".\n"
+#~ "Zkontrolujte vaši instalaci.\n"
+
+#~ msgid ""
+#~ "The program \"postmaster\" was found by \"%s\"\n"
+#~ "but was not the same version as %s.\n"
+#~ "Check your installation.\n"
+#~ msgstr ""
+#~ "\"%s\" nalezl program \"postmaster\",\n"
+#~ "ten je ale jiné verze než %s.\n"
+#~ "Zkontrolujte vaši instalaci.\n"
+
+#~ msgid "could not start postmaster\n"
+#~ msgstr "nebylo možno spustit postmaster\n"
+
+#~ msgid "%s: neither postmaster nor postgres running\n"
+#~ msgstr "%s: postmaster ani postgres neběží\n"
+
+#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+#~ msgstr "%s: samostatný \"postgres\" běží (PID: %ld)\n"
+
+#~ msgid "%s: invalid option %s\n"
+#~ msgstr "%s: neplatný přepína� %s\n"
diff --git a/src/bin/pg_ctl/po/de.po b/src/bin/pg_ctl/po/de.po
index 02e4ad6e78dc9..a2c6fb4a23c32 100644
--- a/src/bin/pg_ctl/po/de.po
+++ b/src/bin/pg_ctl/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for pg_ctl
 # Peter Eisentraut <peter_e@gmx.net>, 2004 - 2011.
 #
-# pgtranslation Id: pg_ctl.po,v 1.14 2011/06/08 21:26:42 petere Exp $
+# pgtranslation Id: pg_ctl.po,v 1.16 2011/07/15 19:32:37 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-06-08 18:40+0000\n"
-"PO-Revision-Date: 2011-06-09 00:24+0300\n"
+"POT-Creation-Date: 2011-07-15 08:55+0000\n"
+"PO-Revision-Date: 2011-07-15 21:35+0300\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -18,60 +18,65 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:234 pg_ctl.c:249 pg_ctl.c:2029
+#: pg_ctl.c:237 pg_ctl.c:252 pg_ctl.c:2035
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: Speicher aufgebraucht\n"
 
-#: pg_ctl.c:283
+#: pg_ctl.c:286
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: konnte PID-Datei »%s« nicht öffnen: %s\n"
 
-#: pg_ctl.c:290
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: ungültige Daten in PID-Datei »%s«\n"
 
-#: pg_ctl.c:467
+#: pg_ctl.c:470
 #, c-format
 msgid ""
 "\n"
 "%s: -w option is not supported when starting a pre-9.1 server\n"
-msgstr "\n%s: Option -w wird nicht unterstützt beim Starten eines Servers vor Version 9.1\n"
+msgstr "\n%s: Option -w wird beim Starten eines Servers vor Version 9.1 nicht unterstützt\n"
 
-#: pg_ctl.c:537
+#: pg_ctl.c:540
 #, c-format
 msgid ""
 "\n"
 "%s: -w option cannot use a relative socket directory specification\n"
-msgstr "\n%s: Option -w kann keine relative Angabe des Socket-Verzeichnisses verwenden\n"
+msgstr ""
+"\n"
+"%s: Option -w kann keine relative Angabe des Socket-Verzeichnisses "
+"verwenden\n"
 
-#: pg_ctl.c:585
+#: pg_ctl.c:588
 #, c-format
 msgid ""
 "\n"
 "%s: this data directory appears to be running a pre-existing postmaster\n"
-msgstr "\n%s: in diesem Datenverzeichnis läuft anscheinend bereits in Postmaster\n"
+msgstr ""
+"\n"
+"%s: in diesem Datenverzeichnis läuft anscheinend bereits in Postmaster\n"
 
-#: pg_ctl.c:635
+#: pg_ctl.c:638
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: kann Grenzwert für Core-Datei-Größe nicht setzen; durch harten Grenzwert "
 "verboten\n"
 
-#: pg_ctl.c:660
+#: pg_ctl.c:663
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: konnte Datei »%s« nicht lesen\n"
 
-#: pg_ctl.c:665
+#: pg_ctl.c:668
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: Optionsdatei »%s« muss genau eine Zeile haben\n"
 
-#: pg_ctl.c:713
+#: pg_ctl.c:716
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -82,7 +87,7 @@ msgstr ""
 "selben Verzeichnis wie »%s« gefunden.\n"
 "Prüfen Sie Ihre Installation.\n"
 
-#: pg_ctl.c:719
+#: pg_ctl.c:722
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -93,43 +98,43 @@ msgstr ""
 "aber es hatte nicht die gleiche Version wie %s.\n"
 "Prüfen Sie Ihre Installation.\n"
 
-#: pg_ctl.c:752
+#: pg_ctl.c:755
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: Initialisierung des Datenbanksystems fehlgeschlagen\n"
 
-#: pg_ctl.c:767
+#: pg_ctl.c:770
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s: ein anderer Server läuft möglicherweise; versuche trotzdem zu starten\n"
 
-#: pg_ctl.c:804
+#: pg_ctl.c:807
 #, c-format
 msgid "%s: could not start server: exit code was %d\n"
 msgstr "%s: konnte Server nicht starten: Exitcode war %d\n"
 
-#: pg_ctl.c:811
+#: pg_ctl.c:814
 msgid "waiting for server to start..."
 msgstr "warte auf Start des Servers..."
 
-#: pg_ctl.c:816 pg_ctl.c:917 pg_ctl.c:1008
+#: pg_ctl.c:819 pg_ctl.c:920 pg_ctl.c:1011
 msgid " done\n"
 msgstr " fertig\n"
 
-#: pg_ctl.c:817
+#: pg_ctl.c:820
 msgid "server started\n"
 msgstr "Server gestartet\n"
 
-#: pg_ctl.c:820 pg_ctl.c:824
+#: pg_ctl.c:823 pg_ctl.c:827
 msgid " stopped waiting\n"
 msgstr " Warten beendet\n"
 
-#: pg_ctl.c:821
+#: pg_ctl.c:824
 msgid "server is still starting up\n"
 msgstr "Server startet immer noch\n"
 
-#: pg_ctl.c:825
+#: pg_ctl.c:828
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -138,44 +143,44 @@ msgstr ""
 "%s: konnte Server nicht starten\n"
 "Prüfen Sie die Logausgabe.\n"
 
-#: pg_ctl.c:831 pg_ctl.c:909 pg_ctl.c:999
+#: pg_ctl.c:834 pg_ctl.c:912 pg_ctl.c:1002
 msgid " failed\n"
 msgstr " Fehler\n"
 
-#: pg_ctl.c:832
+#: pg_ctl.c:835
 #, c-format
 msgid "%s: could not wait for server because of misconfiguration\n"
 msgstr "%s: konnte wegen Fehlkonfiguration nicht auf Server warten\n"
 
-#: pg_ctl.c:838
+#: pg_ctl.c:841
 msgid "server starting\n"
 msgstr "Server startet\n"
 
-#: pg_ctl.c:853 pg_ctl.c:939 pg_ctl.c:1029 pg_ctl.c:1069
+#: pg_ctl.c:856 pg_ctl.c:942 pg_ctl.c:1032 pg_ctl.c:1072
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: PID-Datei »%s« existiert nicht\n"
 
-#: pg_ctl.c:854 pg_ctl.c:941 pg_ctl.c:1030 pg_ctl.c:1070
+#: pg_ctl.c:857 pg_ctl.c:944 pg_ctl.c:1033 pg_ctl.c:1073
 msgid "Is server running?\n"
 msgstr "Läuft der Server?\n"
 
-#: pg_ctl.c:860
+#: pg_ctl.c:863
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: kann Server nicht anhalten; Einzelbenutzerserver läuft (PID: %ld)\n"
 
-#: pg_ctl.c:868 pg_ctl.c:963
+#: pg_ctl.c:871 pg_ctl.c:966
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: konnte Stopp-Signal nicht senden (PID: %ld): %s\n"
 
-#: pg_ctl.c:875
+#: pg_ctl.c:878
 msgid "server shutting down\n"
 msgstr "Server fährt herunter\n"
 
-#: pg_ctl.c:890 pg_ctl.c:978
+#: pg_ctl.c:893 pg_ctl.c:981
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -186,16 +191,16 @@ msgstr ""
 "aufgerufen wird.\n"
 "\n"
 
-#: pg_ctl.c:894 pg_ctl.c:982
+#: pg_ctl.c:897 pg_ctl.c:985
 msgid "waiting for server to shut down..."
 msgstr "warte auf Herunterfahren des Servers..."
 
-#: pg_ctl.c:911 pg_ctl.c:1001
+#: pg_ctl.c:914 pg_ctl.c:1004
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: Server fährt nicht herunter\n"
 
-#: pg_ctl.c:913 pg_ctl.c:1003
+#: pg_ctl.c:916 pg_ctl.c:1006
 msgid ""
 "HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
 "waiting for session-initiated disconnection.\n"
@@ -203,163 +208,193 @@ msgstr ""
 "TIPP: Die Option »-m fast« beendet Sitzungen sofort, statt auf das Beenden\n"
 "durch die Sitzungen selbst zu warten.\n"
 
-#: pg_ctl.c:919 pg_ctl.c:1009
+#: pg_ctl.c:922 pg_ctl.c:1012
 msgid "server stopped\n"
 msgstr "Server angehalten\n"
 
-#: pg_ctl.c:942 pg_ctl.c:1015
+#: pg_ctl.c:945 pg_ctl.c:1018
 msgid "starting server anyway\n"
 msgstr "starte Server trotzdem\n"
 
-#: pg_ctl.c:951
+#: pg_ctl.c:954
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: kann Server nicht neu starten; Einzelbenutzerserver läuft (PID: %ld)\n"
 
-#: pg_ctl.c:954 pg_ctl.c:1039
+#: pg_ctl.c:957 pg_ctl.c:1042
 msgid "Please terminate the single-user server and try again.\n"
 msgstr ""
 "Bitte beenden Sie den Einzelbenutzerserver und versuchen Sie es noch "
 "einmal.\n"
 
-#: pg_ctl.c:1013
+#: pg_ctl.c:1016
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s: alter Serverprozess (PID: %ld) scheint verschwunden zu sein\n"
 
-#: pg_ctl.c:1036
+#: pg_ctl.c:1039
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: kann Server nicht neu laden; Einzelbenutzerserver läuft (PID: %ld)\n"
 
-#: pg_ctl.c:1045
+#: pg_ctl.c:1048
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: konnte Signal zum Neuladen nicht senden (PID: %ld): %s\n"
 
-#: pg_ctl.c:1050
+#: pg_ctl.c:1053
 msgid "server signaled\n"
 msgstr "Signal an Server gesendet\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1079
 #, c-format
 msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kann Server nicht befördern; Einzelbenutzerserver läuft (PID: %ld)\n"
+msgstr ""
+"%s: kann Server nicht befördern; Einzelbenutzerserver läuft (PID: %ld)\n"
 
-#: pg_ctl.c:1085
+#: pg_ctl.c:1088
 #, c-format
 msgid "%s: cannot promote server; server is not in standby mode\n"
 msgstr "%s: kann Server nicht befördern; Server ist nicht im Standby-Modus\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1096
 #, c-format
 msgid "%s: could not create promote signal file \"%s\": %s\n"
 msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht erzeugen: %s\n"
 
-#: pg_ctl.c:1099
+#: pg_ctl.c:1102
 #, c-format
 msgid "%s: could not write promote signal file \"%s\": %s\n"
 msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht schreiben: %s\n"
 
-#: pg_ctl.c:1107
+#: pg_ctl.c:1110
 #, c-format
 msgid "%s: could not send promote signal (PID: %ld): %s\n"
 msgstr "%s: konnte Signal zum Befördern nicht senden (PID: %ld): %s\n"
 
-#: pg_ctl.c:1110
+#: pg_ctl.c:1113
 #, c-format
 msgid "%s: could not remove promote signal file \"%s\": %s\n"
 msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht entfernen: %s\n"
 
-#: pg_ctl.c:1115
+#: pg_ctl.c:1118
 msgid "server promoting\n"
 msgstr "Server wird befördert\n"
 
-#: pg_ctl.c:1160
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s: Einzelbenutzerserver läuft (PID: %ld)\n"
 
-#: pg_ctl.c:1172
+#: pg_ctl.c:1175
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: Server läuft (PID: %ld)\n"
 
-#: pg_ctl.c:1183
+#: pg_ctl.c:1186
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: kein Server läuft\n"
 
-#: pg_ctl.c:1194
+#: pg_ctl.c:1197
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: konnte Signal %d nicht senden (PID: %ld): %s\n"
 
-#: pg_ctl.c:1228
+#: pg_ctl.c:1231
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: konnte eigene Programmdatei nicht finden\n"
 
-#: pg_ctl.c:1238
+#: pg_ctl.c:1241
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: konnte »postgres« Programmdatei nicht finden\n"
 
-#: pg_ctl.c:1300 pg_ctl.c:1332
+#: pg_ctl.c:1306 pg_ctl.c:1338
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: konnte Servicemanager nicht öffnen\n"
 
-#: pg_ctl.c:1306
+#: pg_ctl.c:1312
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: Systemdienst »%s« ist bereits registriert\n"
 
-#: pg_ctl.c:1317
+#: pg_ctl.c:1323
 #, c-format
 msgid "%s: could not register service \"%s\": error code %d\n"
 msgstr "%s: konnte Systemdienst »%s« nicht registrieren: Fehlercode %d\n"
 
-#: pg_ctl.c:1338
+#: pg_ctl.c:1344
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: Systemdienst »%s« ist nicht registriert\n"
 
-#: pg_ctl.c:1345
+#: pg_ctl.c:1351
 #, c-format
 msgid "%s: could not open service \"%s\": error code %d\n"
 msgstr "%s: konnte Systemdienst »%s« nicht öffnen: Fehlercode %d\n"
 
-#: pg_ctl.c:1352
+#: pg_ctl.c:1358
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %d\n"
 msgstr "%s: konnte Systemdienst »%s« nicht deregistrieren: Fehlercode %d\n"
 
-#: pg_ctl.c:1438
+#: pg_ctl.c:1444
 msgid "Waiting for server startup...\n"
 msgstr "Warte auf Start des Servers...\n"
 
-#: pg_ctl.c:1441
+#: pg_ctl.c:1447
 msgid "Timed out waiting for server startup\n"
 msgstr "Zeitüberschreitung beim Warten auf Start des Servers\n"
 
-#: pg_ctl.c:1445
+#: pg_ctl.c:1451
 msgid "Server started and accepting connections\n"
 msgstr "Server wurde gestartet und nimmt Verbindungen an\n"
 
-#: pg_ctl.c:1495
+#: pg_ctl.c:1501
 #, c-format
 msgid "%s: could not start service \"%s\": error code %d\n"
 msgstr "%s: konnte Systemdienst »%s« nicht starten: Fehlercode %d\n"
 
-#: pg_ctl.c:1732
+#: pg_ctl.c:1573
+#, 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"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s: konnte Prozess-Token nicht öffnen: %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s: konnte SIDs nicht erzeugen: %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s: konnte beschränktes Token nicht erzeugen: %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr ""
+"%s: WARNUNG: konnte nicht alle Job-Objekt-Funtionen in der System-API "
+"finden\n"
+
+#: pg_ctl.c:1738
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: pg_ctl.c:1740
+#: pg_ctl.c:1746
 #, c-format
 msgid ""
 "%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -369,17 +404,17 @@ msgstr ""
 "starten, anzuhalten oder zu steuern.\n"
 "\n"
 
-#: pg_ctl.c:1741
+#: pg_ctl.c:1747
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: pg_ctl.c:1742
+#: pg_ctl.c:1748
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]               [-D DATENVERZ] [-s] [-o \"OPTIONEN\"]\n"
 
-#: pg_ctl.c:1743
+#: pg_ctl.c:1749
 #, c-format
 msgid ""
 "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -388,12 +423,12 @@ msgstr ""
 "  %s start   [-w] [-t SEK] [-D DATENVERZ] [-s] [-l DATEINAME] [-o \"OPTIONEN"
 "\"]\n"
 
-#: pg_ctl.c:1744
+#: pg_ctl.c:1750
 #, c-format
 msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-t SEK] [-D DATENVERZ] [-s] [-m SHUTDOWN-MODUS]\n"
 
-#: pg_ctl.c:1745
+#: pg_ctl.c:1751
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -402,27 +437,27 @@ msgstr ""
 "  %s restart [-w] [-t SEK] [-D DATENVERZ] [-s] [-m SHUTDOWN-MODUS]\n"
 "                 [-o \"OPTIONEN\"]\n"
 
-#: pg_ctl.c:1747
+#: pg_ctl.c:1753
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DATENVERZ] [-s]\n"
 
-#: pg_ctl.c:1748
+#: pg_ctl.c:1754
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DATENVERZ]\n"
 
-#: pg_ctl.c:1749
+#: pg_ctl.c:1755
 #, c-format
 msgid "  %s promote [-D DATADIR] [-s]\n"
 msgstr "  %s promote [-D DATENVERZ] [-s]\n"
 
-#: pg_ctl.c:1750
+#: pg_ctl.c:1756
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    SIGNALNAME PID\n"
 
-#: pg_ctl.c:1752
+#: pg_ctl.c:1758
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -432,12 +467,12 @@ msgstr ""
 "DATENVERZ]\n"
 "                    [-S STARTTYP] [-w] [-t SEK] [-o \"OPTIONEN\"]\n"
 
-#: pg_ctl.c:1754
+#: pg_ctl.c:1760
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N DIENSTNAME]\n"
 
-#: pg_ctl.c:1757
+#: pg_ctl.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -446,44 +481,44 @@ msgstr ""
 "\n"
 "Optionen für alle Modi:\n"
 
-#: pg_ctl.c:1758
+#: pg_ctl.c:1764
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata DATENVERZ Datenbankverzeichnis\n"
 
-#: pg_ctl.c:1759
+#: pg_ctl.c:1765
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           zeige nur Fehler, keine Informationsmeldungen\n"
 
-#: pg_ctl.c:1760
+#: pg_ctl.c:1766
 #, c-format
 msgid "  -t SECS                seconds to wait when using -w option\n"
 msgstr "  -t SEK                 Sekunden zu warten bei Option -w\n"
 
-#: pg_ctl.c:1761
+#: pg_ctl.c:1767
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     warte bis Operation abgeschlossen ist\n"
 
-#: pg_ctl.c:1762
+#: pg_ctl.c:1768
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr "  -W                     warte nicht bis Operation abgeschlossen ist\n"
 
-#: pg_ctl.c:1763
+#: pg_ctl.c:1769
 #, c-format
 msgid "  --help                 show this help, then exit\n"
 msgstr "  --help                 diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_ctl.c:1764
+#: pg_ctl.c:1770
 #, c-format
 msgid "  --version              output version information, then exit\n"
 msgstr ""
 "  --version              Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_ctl.c:1765
+#: pg_ctl.c:1771
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -493,14 +528,14 @@ msgstr ""
 "Start oder Neustart.)\n"
 "\n"
 
-#: pg_ctl.c:1766
+#: pg_ctl.c:1772
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr ""
 "Wenn die Option -D weggelassen wird, dann wird die Umgebungsvariable\n"
 "PGDATA verwendet.\n"
 
-#: pg_ctl.c:1768
+#: pg_ctl.c:1774
 #, c-format
 msgid ""
 "\n"
@@ -509,24 +544,24 @@ msgstr ""
 "\n"
 "Optionen für Start oder Neustart:\n"
 
-#: pg_ctl.c:1770
+#: pg_ctl.c:1776
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       erlaubt postgres Core-Dateien zu erzeugen\n"
 
-#: pg_ctl.c:1772
+#: pg_ctl.c:1778
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       betrifft diese Plattform nicht\n"
 
-#: pg_ctl.c:1774
+#: pg_ctl.c:1780
 #, c-format
 msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log DATEINAME    schreibe Serverlog in DATEINAME (wird an\n"
 "                         bestehende Datei angehängt)\n"
 
-#: pg_ctl.c:1775
+#: pg_ctl.c:1781
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -535,12 +570,12 @@ msgstr ""
 "  -o OPTIONEN            Kommandozeilenoptionen für postgres (PostgreSQL-\n"
 "                         Serverprogramm) oder initdb\n"
 
-#: pg_ctl.c:1777
+#: pg_ctl.c:1783
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p PFAD-ZU-POSTGRES    normalerweise nicht notwendig\n"
 
-#: pg_ctl.c:1778
+#: pg_ctl.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -549,12 +584,12 @@ msgstr ""
 "\n"
 "Optionen für Anhalten oder Neustart:\n"
 
-#: pg_ctl.c:1779
+#: pg_ctl.c:1785
 #, c-format
 msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m SHUTDOWN-MODUS  kann »smart«, »fast« oder »immediate« sein\n"
 
-#: pg_ctl.c:1781
+#: pg_ctl.c:1787
 #, c-format
 msgid ""
 "\n"
@@ -563,18 +598,18 @@ msgstr ""
 "\n"
 "Shutdown-Modi sind:\n"
 
-#: pg_ctl.c:1782
+#: pg_ctl.c:1788
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr ""
 "  smart       beende nachdem alle Clientverbindungen geschlossen sind\n"
 
-#: pg_ctl.c:1783
+#: pg_ctl.c:1789
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        beende direkt, mit richtigem Shutdown\n"
 
-#: pg_ctl.c:1784
+#: pg_ctl.c:1790
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -583,7 +618,7 @@ msgstr ""
 "  immediate   beende ohne vollständigen Shutdown; führt zu Recovery-Lauf\n"
 "              beim Neustart\n"
 
-#: pg_ctl.c:1786
+#: pg_ctl.c:1792
 #, c-format
 msgid ""
 "\n"
@@ -592,7 +627,7 @@ msgstr ""
 "\n"
 "Erlaubte Signalnamen für »kill«:\n"
 
-#: pg_ctl.c:1790
+#: pg_ctl.c:1796
 #, c-format
 msgid ""
 "\n"
@@ -601,32 +636,32 @@ msgstr ""
 "\n"
 "Optionen für »register« und »unregister«:\n"
 
-#: pg_ctl.c:1791
+#: pg_ctl.c:1797
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr ""
 "  -N DIENSTNAME   Systemdienstname für Registrierung des PostgreSQL-Servers\n"
 
-#: pg_ctl.c:1792
+#: pg_ctl.c:1798
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P PASSWORD     Passwort des Benutzers für Registrierung des PostgreSQL-"
 "Servers\n"
 
-#: pg_ctl.c:1793
+#: pg_ctl.c:1799
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U USERNAME     Benutzername für Registrierung des PostgreSQL-Servers\n"
 
-#: pg_ctl.c:1794
+#: pg_ctl.c:1800
 #, c-format
 msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
 msgstr "  -S STARTTYP     Systemdienst-Starttyp für PostgreSQL-Server\n"
 
-#: pg_ctl.c:1796
+#: pg_ctl.c:1802
 #, c-format
 msgid ""
 "\n"
@@ -635,7 +670,7 @@ msgstr ""
 "\n"
 "Starttypen sind:\n"
 
-#: pg_ctl.c:1797
+#: pg_ctl.c:1803
 #, c-format
 msgid ""
 "  auto       start service automatically during system startup (default)\n"
@@ -643,12 +678,12 @@ msgstr ""
 "  auto       Dienst automatisch starten beim Start des Betriebssystems\n"
 "             (Voreinstellung)\n"
 
-#: pg_ctl.c:1798
+#: pg_ctl.c:1804
 #, c-format
 msgid "  demand     start service on demand\n"
 msgstr "  demand     Dienst bei Bedarf starten\n"
 
-#: pg_ctl.c:1801
+#: pg_ctl.c:1807
 #, c-format
 msgid ""
 "\n"
@@ -657,22 +692,22 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1826
+#: pg_ctl.c:1832
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: unbekannter Shutdown-Modus »%s«\n"
 
-#: pg_ctl.c:1859
+#: pg_ctl.c:1865
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: unbekannter Signalname »%s«\n"
 
-#: pg_ctl.c:1876
+#: pg_ctl.c:1882
 #, c-format
 msgid "%s: unrecognized start type \"%s\"\n"
 msgstr "%s: unbekannter Starttyp »%s«\n"
 
-#: pg_ctl.c:1941
+#: pg_ctl.c:1947
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -683,32 +718,32 @@ msgstr ""
 "Bitte loggen Sie sich (z.B. mit »su«) als der (unprivilegierte) Benutzer\n"
 "ein, der Eigentümer des Serverprozesses sein soll.\n"
 
-#: pg_ctl.c:2012
+#: pg_ctl.c:2018
 #, c-format
 msgid "%s: -S option not supported on this platform\n"
 msgstr "%s: Option -S wird auf dieser Plattform nicht unterstützt\n"
 
-#: pg_ctl.c:2059
+#: pg_ctl.c:2065
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: pg_ctl.c:2083
+#: pg_ctl.c:2089
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: fehlende Argumente für »kill«-Modus\n"
 
-#: pg_ctl.c:2101
+#: pg_ctl.c:2107
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: unbekannter Operationsmodus »%s«\n"
 
-#: pg_ctl.c:2111
+#: pg_ctl.c:2117
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: keine Operation angegeben\n"
 
-#: pg_ctl.c:2127
+#: pg_ctl.c:2133
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
diff --git a/src/bin/pg_ctl/po/es.po b/src/bin/pg_ctl/po/es.po
index c69a475834c99..426ef5122f4b7 100644
--- a/src/bin/pg_ctl/po/es.po
+++ b/src/bin/pg_ctl/po/es.po
@@ -1,57 +1,86 @@
 # Spanish translation of pg_ctl.
 #
-# Copyright (C) 2004-2010 PostgreSQL Global Development Group
+# Copyright (C) 2004-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
-# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2010
+# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2011
 #
-# pgtranslation Id: pg_ctl.po,v 1.8 2010/04/26 22:09:16 alvherre Exp $
+# pgtranslation Id: pg_ctl.po,v 1.10 2011/09/03 02:09:22 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_ctl (PostgreSQL 9.0)\n"
+"Project-Id-Version: pg_ctl (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-04-26 21:21+0000\n"
-"PO-Revision-Date: 2010-04-26 18:09-0400\n"
+"POT-Creation-Date: 2011-09-02 10:54+0000\n"
+"PO-Revision-Date: 2011-09-02 23:08-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:225 pg_ctl.c:240 pg_ctl.c:1834
+#: pg_ctl.c:237 pg_ctl.c:252 pg_ctl.c:2035
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:286
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo de PID «%s»: %s\n"
 
-#: pg_ctl.c:281
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: datos no válidos en archivo de PID «%s»\n"
 
-#: pg_ctl.c:557
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+"\n"
+"%s: la opción -w no está soportada cuando se inicia un servidor anterior a "
+"9.1\n"
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+"\n"
+"%s: la opción -w no puede usar una especificación relativa de directorio\n"
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr ""
+"\n"
+"%s: este directorio de datos parece estar ejecutando un postmaster pre-existente\n"
+
+#: pg_ctl.c:638
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: no se puede establecer el límite de archivos de volcado;\n"
 "impedido por un límite duro\n"
 
-#: pg_ctl.c:582
+#: pg_ctl.c:663
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: no se pudo leer el archivo «%s»\n"
 
-#: pg_ctl.c:587
+#: pg_ctl.c:668
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: archivo de opciones «%s» debe tener exactamente una línea\n"
 
-#: pg_ctl.c:635
+#: pg_ctl.c:716
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -62,7 +91,7 @@ msgstr ""
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: pg_ctl.c:641
+#: pg_ctl.c:722
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -73,24 +102,44 @@ msgstr ""
 "de la misma versión que «%s».\n"
 "Verifique su instalación.\n"
 
-#: pg_ctl.c:674
+#: pg_ctl.c:755
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: falló la creación de la base de datos\n"
 
-#: pg_ctl.c:690
+#: pg_ctl.c:770
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s: otro servidor puede estar en ejecución; tratando de iniciarlo de todas "
 "formas.\n"
 
-#: pg_ctl.c:727
+#: pg_ctl.c:807
 #, c-format
 msgid "%s: could not start server: exit code was %d\n"
 msgstr "%s: no se pudo iniciar el servidor: el código de retorno fue %d\n"
 
-#: pg_ctl.c:738 pg_ctl.c:751
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "esperando que el servidor se inicie..."
+
+#: pg_ctl.c:819 pg_ctl.c:920 pg_ctl.c:1011
+msgid " done\n"
+msgstr " listo\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "servidor iniciado\n"
+
+#: pg_ctl.c:823 pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr " abandonando la espera\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "servidor aún iniciándose\n"
+
+#: pg_ctl.c:828
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -99,48 +148,46 @@ msgstr ""
 "%s: no se pudo iniciar el servidor.\n"
 "Examine el registro del servidor.\n"
 
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "esperando que el servidor se inicie..."
-
-#: pg_ctl.c:758 pg_ctl.c:831 pg_ctl.c:911
-msgid " done\n"
-msgstr " listo\n"
+#: pg_ctl.c:834 pg_ctl.c:912 pg_ctl.c:1002
+msgid " failed\n"
+msgstr " falló\n"
 
-#: pg_ctl.c:759
-msgid "server started\n"
-msgstr "servidor iniciado\n"
+#: pg_ctl.c:835
+#, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr ""
+"%s: no se pudo esperar al servidor debido a un error de configuración\n"
 
-#: pg_ctl.c:763
+#: pg_ctl.c:841
 msgid "server starting\n"
 msgstr "servidor iniciándose\n"
 
-#: pg_ctl.c:778 pg_ctl.c:853 pg_ctl.c:933
+#: pg_ctl.c:856 pg_ctl.c:942 pg_ctl.c:1032 pg_ctl.c:1072
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: el archivo de PID «%s» no existe\n"
 
-#: pg_ctl.c:779 pg_ctl.c:855 pg_ctl.c:934
+#: pg_ctl.c:857 pg_ctl.c:944 pg_ctl.c:1033 pg_ctl.c:1073
 msgid "Is server running?\n"
 msgstr "¿Está el servidor en ejecución?\n"
 
-#: pg_ctl.c:785
+#: pg_ctl.c:863
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: no se puede detener el servidor;\n"
 "un servidor en modo mono-usuario está en ejecución (PID: %ld)\n"
 
-#: pg_ctl.c:793 pg_ctl.c:877
+#: pg_ctl.c:871 pg_ctl.c:966
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: falló la señal de detención (PID: %ld): %s\n"
 
-#: pg_ctl.c:800
+#: pg_ctl.c:878
 msgid "server shutting down\n"
 msgstr "servidor deteniéndose\n"
 
-#: pg_ctl.c:807 pg_ctl.c:884
+#: pg_ctl.c:893 pg_ctl.c:981
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -151,166 +198,227 @@ msgstr ""
 "().\n"
 "\n"
 
-#: pg_ctl.c:811 pg_ctl.c:888
+#: pg_ctl.c:897 pg_ctl.c:985
 msgid "waiting for server to shut down..."
 msgstr "esperando que el servidor se detenga..."
 
-#: pg_ctl.c:826 pg_ctl.c:905
-msgid " failed\n"
-msgstr " falló\n"
-
-#: pg_ctl.c:828 pg_ctl.c:907
+#: pg_ctl.c:914 pg_ctl.c:1004
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: el servidor no se detiene\n"
 
-#: pg_ctl.c:833 pg_ctl.c:912
+#: pg_ctl.c:916 pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"SUGERENCIA: La opción «-m fast» desconecta las sesiones inmediatamente\n"
+"en lugar de esperar que cada sesión finalice por sí misma.\n"
+
+#: pg_ctl.c:922 pg_ctl.c:1012
 msgid "server stopped\n"
 msgstr "servidor detenido\n"
 
-#: pg_ctl.c:856 pg_ctl.c:918
+#: pg_ctl.c:945 pg_ctl.c:1018
 msgid "starting server anyway\n"
 msgstr "iniciando el servidor de todas maneras\n"
 
-#: pg_ctl.c:865
+#: pg_ctl.c:954
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: no se puede reiniciar el servidor;\n"
 "un servidor en modo mono-usuario está en ejecución (PID: %ld)\n"
 
-#: pg_ctl.c:868 pg_ctl.c:943
+#: pg_ctl.c:957 pg_ctl.c:1042
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Por favor termine el servidor mono-usuario e intente nuevamente.\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:1016
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s: el proceso servidor antiguo (PID: %ld) parece no estar\n"
 
-#: pg_ctl.c:940
+#: pg_ctl.c:1039
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: no se puede recargar el servidor;\n"
 "un servidor en modo mono-usuario está en ejecución (PID: %ld)\n"
 
-#: pg_ctl.c:949
+#: pg_ctl.c:1048
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: la señal de recarga falló (PID: %ld): %s\n"
 
-#: pg_ctl.c:954
+#: pg_ctl.c:1053
 msgid "server signaled\n"
 msgstr "se ha enviado una señal al servidor\n"
 
-#: pg_ctl.c:998
+#: pg_ctl.c:1079
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: no se puede promover el servidor;\n"
+"un servidor en modo mono-usuario está en ejecución (PID: %ld)\n"
+
+#: pg_ctl.c:1088
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr ""
+"%s: no se puede promover el servidor;\n"
+"el servidor no está en modo «standby»\n"
+
+#: pg_ctl.c:1096
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: no se pudo crear el archivo de señal de promoción «%s»: %s\n"
+
+#: pg_ctl.c:1102
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s: no se pudo escribir al archivo de señal de promoción «%s»: %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: no se pudo enviar la señal de promoción (PID: %ld): %s\n"
+
+#: pg_ctl.c:1113
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s: no se pudo eliminar el archivo de señal de promoción «%s»: %s\n"
+
+#: pg_ctl.c:1118
+msgid "server promoting\n"
+msgstr "servidor promoviendo\n"
+
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s: un servidor en modo mono-usuario está en ejecución (PID: %ld)\n"
 
-#: pg_ctl.c:1010
+#: pg_ctl.c:1175
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: el servidor está en ejecución (PID: %ld)\n"
 
-#: pg_ctl.c:1021
+#: pg_ctl.c:1186
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: no hay servidor en ejecución\n"
 
-#: pg_ctl.c:1032
+#: pg_ctl.c:1197
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: no se pudo enviar la señal %d (PID: %ld): %s\n"
 
-#: pg_ctl.c:1066
+#: pg_ctl.c:1231
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: no se pudo encontrar el propio ejecutable\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1241
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: no se pudo encontrar el ejecutable postgres\n"
 
-#: pg_ctl.c:1138 pg_ctl.c:1170
+#: pg_ctl.c:1306 pg_ctl.c:1338
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: no se pudo abrir el gestor de servicios\n"
 
-#: pg_ctl.c:1144
+#: pg_ctl.c:1312
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: el servicio «%s» ya está registrado\n"
 
-#: pg_ctl.c:1155
+#: pg_ctl.c:1323
 #, c-format
 msgid "%s: could not register service \"%s\": error code %d\n"
 msgstr "%s: no se pudo registrar el servicio «%s»: código de error %d\n"
 
-#: pg_ctl.c:1176
+#: pg_ctl.c:1344
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: el servicio «%s» no ha sido registrado\n"
 
-#: pg_ctl.c:1183
+#: pg_ctl.c:1351
 #, c-format
 msgid "%s: could not open service \"%s\": error code %d\n"
 msgstr "%s: no se pudo abrir el servicio «%s»: código de error %d\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1358
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %d\n"
 msgstr "%s: no se pudo dar de baja el servicio «%s»: código de error %d\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1444
 msgid "Waiting for server startup...\n"
 msgstr "Esperando que el servidor se inicie...\n"
 
-#: pg_ctl.c:1279
+#: pg_ctl.c:1447
 msgid "Timed out waiting for server startup\n"
 msgstr "Se agotó el tiempo de espera al inicio del servidor\n"
 
-#: pg_ctl.c:1283
+#: pg_ctl.c:1451
 msgid "Server started and accepting connections\n"
 msgstr "Servidor iniciado y aceptando conexiones\n"
 
-#: pg_ctl.c:1333
+#: pg_ctl.c:1501
 #, c-format
 msgid "%s: could not start service \"%s\": error code %d\n"
 msgstr "%s: no se pudo iniciar el servicio «%s»: código de error %d\n"
 
-#: pg_ctl.c:1568
+#: pg_ctl.c:1573
+#, 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"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s: no se pudo abrir el token de proceso: %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s: no se pudo emplazar los SIDs: %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s: no se pudo crear el token restringido: %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr "%s: ATENCIÓN: no fue posible encontrar todas las funciones de gestión de tareas en la API del sistema\n"
+
+#: pg_ctl.c:1738
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: pg_ctl.c:1576
+#: pg_ctl.c:1746
 #, c-format
 msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s es un programa para iniciar, detener, reiniciar, recargar archivos de\n"
-"configuración, reportar el estado de un servidor PostgreSQL o enviar una\n"
-"señal a un proceso PostgreSQL.\n"
-"\n"
+"%s es un programa para inicializar, iniciar, detener o controlar un servidor PostgreSQL.\n"
 
-#: pg_ctl.c:1578
+#: pg_ctl.c:1747
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: pg_ctl.c:1579
+#: pg_ctl.c:1748
 #, c-format
-msgid ""
-"  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s init[db]               [-D DATADIR] [-s] [-o «OPCIONES»]\n"
+msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr "  %s init[db]               [-D DATADIR] [-s] [-o «OPCIONES»]\n"
 
-#: pg_ctl.c:1580
+#: pg_ctl.c:1749
 #, c-format
 msgid ""
 "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -318,12 +426,12 @@ msgid ""
 msgstr ""
 "  %s start   [-w] [-t SEGS] [-D DATADIR] [-s] [-l ARCHIVO] [-o «OPCIONES»]\n"
 
-#: pg_ctl.c:1581
+#: pg_ctl.c:1750
 #, c-format
 msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-t SEGS] [-D DATADIR] [-s] [-m MODO-DETENCIÓN]\n"
 
-#: pg_ctl.c:1582
+#: pg_ctl.c:1751
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -332,36 +440,41 @@ msgstr ""
 "  %s restart [-w] [-t SEGS] [-D DATADIR] [-s] [-m MODO-DETENCIÓN]\n"
 "                   [-o «OPCIONES»]\n"
 
-#: pg_ctl.c:1584
+#: pg_ctl.c:1753
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1585
+#: pg_ctl.c:1754
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DATADIR]\n"
 
-#: pg_ctl.c:1586
+#: pg_ctl.c:1755
+#, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s promote [-D DATADIR] [-s]\n"
+
+#: pg_ctl.c:1756
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    NOMBRE-SEÑAL ID-DE-PROCESO\n"
 
-#: pg_ctl.c:1588
+#: pg_ctl.c:1758
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s register   [-N SERVICIO] [-U USUARIO] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SEGS] [-o «OPCIONES»]\n"
+"                    [-S TIPO-INICIO] [-w] [-t SEGS] [-o «OPCIONES»]\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1760
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N SERVICIO]\n"
 
-#: pg_ctl.c:1593
+#: pg_ctl.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -370,48 +483,48 @@ msgstr ""
 "\n"
 "Opciones comunes:\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1764
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr ""
 "  -D, --pgdata DATADIR   ubicación del área de almacenamiento de datos\n"
 
-#: pg_ctl.c:1595
+#: pg_ctl.c:1765
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           mostrar sólo errores, no mensajes de información\n"
 
-#: pg_ctl.c:1596
+#: pg_ctl.c:1766
 #, c-format
 msgid "  -t SECS                seconds to wait when using -w option\n"
 msgstr ""
 "  -t SEGS                segundos a esperar cuando se use la opción -w\n"
 
-#: pg_ctl.c:1597
+#: pg_ctl.c:1767
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr ""
 "  -w                     esperar hasta que la operación se haya completado\n"
 
-#: pg_ctl.c:1598
+#: pg_ctl.c:1768
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr ""
 "  -W                     no esperar hasta que la operación se haya "
 "completado\n"
 
-#: pg_ctl.c:1599
+#: pg_ctl.c:1769
 #, c-format
 msgid "  --help                 show this help, then exit\n"
 msgstr "  --help                 mostrar este texto y salir\n"
 
-#: pg_ctl.c:1600
+#: pg_ctl.c:1770
 #, c-format
 msgid "  --version              output version information, then exit\n"
 msgstr "  --version              mostrar información sobre versión y salir\n"
 
-#: pg_ctl.c:1601
+#: pg_ctl.c:1771
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -421,12 +534,12 @@ msgstr ""
 "reinicios)\n"
 "\n"
 
-#: pg_ctl.c:1602
+#: pg_ctl.c:1772
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Si la opción -D es omitida, se usa la variable de ambiente PGDATA.\n"
 
-#: pg_ctl.c:1604
+#: pg_ctl.c:1774
 #, c-format
 msgid ""
 "\n"
@@ -435,25 +548,25 @@ msgstr ""
 "\n"
 "Opciones para inicio y reinicio:\n"
 
-#: pg_ctl.c:1606
+#: pg_ctl.c:1776
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr ""
 "  -c, --core-files       permite que postgres produzca archivos\n"
 "                         de volcado (core)\n"
 
-#: pg_ctl.c:1608
+#: pg_ctl.c:1778
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       no aplicable en esta plataforma\n"
 
-#: pg_ctl.c:1610
+#: pg_ctl.c:1780
 #, c-format
 msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l  --log ARCHIVO      guardar el registro del servidor en ARCHIVO.\n"
 
-#: pg_ctl.c:1611
+#: pg_ctl.c:1781
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -462,12 +575,12 @@ msgstr ""
 "  -o OPCIONES            parámetros de línea de órdenes a pasar a postgres\n"
 "                         (ejecutable del servidor de PostgreSQL) o initdb\n"
 
-#: pg_ctl.c:1613
+#: pg_ctl.c:1783
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p RUTA-A-POSTGRES     normalmente no es necesario\n"
 
-#: pg_ctl.c:1614
+#: pg_ctl.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -476,12 +589,12 @@ msgstr ""
 "\n"
 "Opciones para detención y reinicio:\n"
 
-#: pg_ctl.c:1615
+#: pg_ctl.c:1785
 #, c-format
 msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m MODO-DE-DETENCIÓN   puede ser «smart», «fast» o «immediate»\n"
 
-#: pg_ctl.c:1617
+#: pg_ctl.c:1787
 #, c-format
 msgid ""
 "\n"
@@ -490,18 +603,18 @@ msgstr ""
 "\n"
 "Modos de detención son:\n"
 
-#: pg_ctl.c:1618
+#: pg_ctl.c:1788
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr ""
 "  smart       salir después que todos los clientes se hayan desconectado\n"
 
-#: pg_ctl.c:1619
+#: pg_ctl.c:1789
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        salir directamente, con apagado apropiado\n"
 
-#: pg_ctl.c:1620
+#: pg_ctl.c:1790
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -511,7 +624,7 @@ msgstr ""
 "              en el próximo inicio\n"
 "\n"
 
-#: pg_ctl.c:1622
+#: pg_ctl.c:1792
 #, c-format
 msgid ""
 "\n"
@@ -520,7 +633,7 @@ msgstr ""
 "\n"
 "Nombres de señales permitidos para kill:\n"
 
-#: pg_ctl.c:1626
+#: pg_ctl.c:1796
 #, c-format
 msgid ""
 "\n"
@@ -529,7 +642,7 @@ msgstr ""
 "\n"
 "Opciones para registrar y dar de baja:\n"
 
-#: pg_ctl.c:1627
+#: pg_ctl.c:1797
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
@@ -537,21 +650,50 @@ msgstr ""
 "  -N SERVICIO            nombre de servicio con el cual registrar\n"
 "                         el servidor PostgreSQL\n"
 
-#: pg_ctl.c:1628
+#: pg_ctl.c:1798
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P CONTRASEÑA          contraseña de la cuenta con la cual registrar\n"
 "                         el servidor PostgreSQL\n"
 
-#: pg_ctl.c:1629
+#: pg_ctl.c:1799
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U USUARIO             nombre de usuario de la cuenta con la cual\n"
 "                         registrar el servidor PostgreSQL\n"
 
-#: pg_ctl.c:1632
+#: pg_ctl.c:1800
+#, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr ""
+"  -S TIPO-INICIO         tipo de inicio de servicio con que registrar\n"
+"                         el servidor PostgreSQL\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Tipos de inicio del servicio son:\n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid ""
+"  auto       start service automatically during system startup (default)\n"
+msgstr ""
+"  auto       iniciar automáticamente al inicio del sistema (por omisión)\n"
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr ""
+"  demand     iniciar el servicio en demanda\n"
+
+#: pg_ctl.c:1807
 #, c-format
 msgid ""
 "\n"
@@ -560,17 +702,22 @@ msgstr ""
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1657
+#: pg_ctl.c:1832
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: modo de apagado «%s» no reconocido\n"
 
-#: pg_ctl.c:1690
+#: pg_ctl.c:1865
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: nombre de señal «%s» no reconocido\n"
 
-#: pg_ctl.c:1755
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: tipo de inicio «%s» no reconocido\n"
+
+#: pg_ctl.c:1947
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -581,27 +728,32 @@ msgstr ""
 "Por favor conéctese (por ej. usando «su») con un usuario no privilegiado,\n"
 "quien ejecutará el proceso servidor.\n"
 
-#: pg_ctl.c:1864
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: la opción -S no está soportada en esta plataforma\n"
+
+#: pg_ctl.c:2065
 #, 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"
 
-#: pg_ctl.c:1886
+#: pg_ctl.c:2089
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: argumentos faltantes para envío de señal\n"
 
-#: pg_ctl.c:1904
+#: pg_ctl.c:2107
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: modo de operación «%s» no reconocido\n"
 
-#: pg_ctl.c:1914
+#: pg_ctl.c:2117
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: no se especificó operación\n"
 
-#: pg_ctl.c:1930
+#: pg_ctl.c:2133
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
@@ -639,27 +791,38 @@ msgstr "no se pudo cambiar el directorio a «%s»"
 msgid "could not read symbolic link \"%s\""
 msgstr "no se pudo leer el enlace simbólico «%s»"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "el proceso hijo terminó con código de salida %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "el proceso hijo fue terminado por una excepción 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "el proceso hijo fue terminado por una señal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "el proceso hijo fue terminado por una señal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
+
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s es un programa para iniciar, detener, reiniciar, recargar archivos de\n"
+#~ "configuración, reportar el estado de un servidor PostgreSQL o enviar una\n"
+#~ "señal a un proceso PostgreSQL.\n"
+#~ "\n"
diff --git a/src/bin/pg_ctl/po/fr.po b/src/bin/pg_ctl/po/fr.po
index 695ab5d67eaba..7db229043af1f 100644
--- a/src/bin/pg_ctl/po/fr.po
+++ b/src/bin/pg_ctl/po/fr.po
@@ -11,49 +11,78 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-12-15 21:17+0000\n"
-"PO-Revision-Date: 2009-12-15 22:45+0100\n"
+"POT-Creation-Date: 2011-07-08 06:55+0000\n"
+"PO-Revision-Date: 2011-07-08 15:18+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:225
-#: pg_ctl.c:240
-#: pg_ctl.c:1828
+#: pg_ctl.c:237
+#: pg_ctl.c:252
+#: pg_ctl.c:2035
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s : mémoire épuisée\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:286
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier de PID « %s » : %s\n"
 
-#: pg_ctl.c:281
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s : données invalides dans le fichier de PID « %s »\n"
 
-#: pg_ctl.c:557
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+"\n"
+"%s : l'option -w n'est pas supportée lors du démarrage d'un serveur pré-9.1\n"
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+"\n"
+"%s : l'option -w ne peut pas utiliser un chemin relatif vers le répertoire de\n"
+"la socket\n"
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr ""
+"\n"
+"%s : ce répertoire des données semble être utilisé par un postmaster déjà existant\n"
+
+#: pg_ctl.c:638
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s : n'a pas pu initialiser la taille des fichiers core, ceci est interdit\n"
 "par une limite dure\n"
 
-#: pg_ctl.c:582
+#: pg_ctl.c:663
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s : n'a pas pu lire le fichier « %s »\n"
 
-#: pg_ctl.c:587
+#: pg_ctl.c:668
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s : le fichier d'options « %s » ne doit comporter qu'une seule ligne\n"
 
-#: pg_ctl.c:635
+#: pg_ctl.c:716
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -64,7 +93,7 @@ msgstr ""
 "dans le même répertoire que « %s ».\n"
 "Vérifiez votre installation.\n"
 
-#: pg_ctl.c:641
+#: pg_ctl.c:722
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -75,24 +104,47 @@ msgstr ""
 "que %s.\n"
 "Vérifiez votre installation.\n"
 
-#: pg_ctl.c:674
+#: pg_ctl.c:755
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s : l'initialisation du système a échoué\n"
 
-#: pg_ctl.c:690
+#: pg_ctl.c:770
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s : un autre serveur semble en cours d'exécution ; le démarrage du serveur\n"
 "va toutefois être tenté\n"
 
-#: pg_ctl.c:727
+#: pg_ctl.c:807
 #, c-format
 msgid "%s: could not start server: exit code was %d\n"
 msgstr "%s : n'a pas pu démarrer le serveur : le code de sortie est %d\n"
 
-#: pg_ctl.c:738
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "en attente du démarrage du serveur..."
+
+#: pg_ctl.c:819
+#: pg_ctl.c:920
+#: pg_ctl.c:1011
+msgid " done\n"
+msgstr " effectué\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "serveur démarré\n"
+
+#: pg_ctl.c:823
+#: pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr " attente arrêtée\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "le serveur est toujours en cours de démarrage\n"
+
+#: pg_ctl.c:828
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -101,61 +153,55 @@ msgstr ""
 "%s : n'a pas pu démarrer le serveur\n"
 "Examinez le journal applicatif.\n"
 
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "en attente du démarrage du serveur..."
+#: pg_ctl.c:834
+#: pg_ctl.c:912
+#: pg_ctl.c:1002
+msgid " failed\n"
+msgstr " a échoué\n"
 
-#: pg_ctl.c:751
+#: pg_ctl.c:835
 #, c-format
-msgid "could not start server\n"
-msgstr "n'a pas pu démarrer le serveur\n"
-
-#: pg_ctl.c:756
-#: pg_ctl.c:829
-#: pg_ctl.c:909
-msgid " done\n"
-msgstr " effectué\n"
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s : n'a pas pu attendre le serveur à cause d'une mauvaise configuration\n"
 
-#: pg_ctl.c:757
-msgid "server started\n"
-msgstr "serveur démarré\n"
-
-#: pg_ctl.c:761
+#: pg_ctl.c:841
 msgid "server starting\n"
 msgstr "serveur en cours de démarrage\n"
 
-#: pg_ctl.c:776
-#: pg_ctl.c:851
-#: pg_ctl.c:931
+#: pg_ctl.c:856
+#: pg_ctl.c:942
+#: pg_ctl.c:1032
+#: pg_ctl.c:1072
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s : le fichier de PID « %s » n'existe pas\n"
 
-#: pg_ctl.c:777
-#: pg_ctl.c:853
-#: pg_ctl.c:932
+#: pg_ctl.c:857
+#: pg_ctl.c:944
+#: pg_ctl.c:1033
+#: pg_ctl.c:1073
 msgid "Is server running?\n"
 msgstr "Le serveur est-il en cours d'exécution ?\n"
 
-#: pg_ctl.c:783
+#: pg_ctl.c:863
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s : ne peut pas arrêter le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %ld)\n"
 
-#: pg_ctl.c:791
-#: pg_ctl.c:875
+#: pg_ctl.c:871
+#: pg_ctl.c:966
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s : n'a pas pu envoyer le signal d'arrêt (PID : %ld) : %s\n"
 
-#: pg_ctl.c:798
+#: pg_ctl.c:878
 msgid "server shutting down\n"
 msgstr "serveur en cours d'arrêt\n"
 
-#: pg_ctl.c:805
-#: pg_ctl.c:882
+#: pg_ctl.c:893
+#: pg_ctl.c:981
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -165,184 +211,246 @@ msgstr ""
 "L'arrêt ne surviendra qu'au moment où pg_stop_backup() sera appelé.\n"
 "\n"
 
-#: pg_ctl.c:809
-#: pg_ctl.c:886
+#: pg_ctl.c:897
+#: pg_ctl.c:985
 msgid "waiting for server to shut down..."
 msgstr "en attente de l'arrêt du serveur..."
 
-#: pg_ctl.c:824
-#: pg_ctl.c:903
-msgid " failed\n"
-msgstr " a échoué\n"
-
-#: pg_ctl.c:826
-#: pg_ctl.c:905
+#: pg_ctl.c:914
+#: pg_ctl.c:1004
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s : le serveur ne s'est pas arrêté\n"
 
-#: pg_ctl.c:831
-#: pg_ctl.c:910
-#, c-format
+#: pg_ctl.c:916
+#: pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"ASTUCE : l'option « -m fast » déconnecte immédiatement les sessions plutôt que\n"
+"d'attendre la déconnexion des sessions déjà présentes.\n"
+
+#: pg_ctl.c:922
+#: pg_ctl.c:1012
 msgid "server stopped\n"
 msgstr "serveur arrêté\n"
 
-#: pg_ctl.c:854
-#: pg_ctl.c:916
+#: pg_ctl.c:945
+#: pg_ctl.c:1018
 msgid "starting server anyway\n"
 msgstr "lancement du serveur malgré tout\n"
 
-#: pg_ctl.c:863
+#: pg_ctl.c:954
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s : ne peut pas relancer le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %ld)\n"
 
-#: pg_ctl.c:866
-#: pg_ctl.c:941
+#: pg_ctl.c:957
+#: pg_ctl.c:1042
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Merci d'arrêter le serveur mono-utilisateur et de réessayer.\n"
 
-#: pg_ctl.c:914
+#: pg_ctl.c:1016
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s : l'ancien processus serveur (PID : %ld) semble être parti\n"
 
-#: pg_ctl.c:938
+#: pg_ctl.c:1039
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s : ne peut pas recharger le serveur ; le serveur mono-utilisateur est en\n"
 "cours d'exécution (PID : %ld)\n"
 
-#: pg_ctl.c:947
+#: pg_ctl.c:1048
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s : n'a pas pu envoyer le signal de rechargement (PID : %ld) : %s\n"
 
-#: pg_ctl.c:952
+#: pg_ctl.c:1053
 msgid "server signaled\n"
 msgstr "envoi d'un signal au serveur\n"
 
-#: pg_ctl.c:996
+#: pg_ctl.c:1079
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s : ne peut pas promouvoir le serveur ; le serveur mono-utilisateur est en\n"
+"cours d'exécution (PID : %ld)\n"
+
+#: pg_ctl.c:1088
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s : ne peut pas promouvoir le serveur ; le serveur n'est pas en standby\n"
+
+#: pg_ctl.c:1096
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s : n'a pas pu créer le fichier « %s » signalant la promotion : %s\n"
+
+#: pg_ctl.c:1102
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s : n'a pas pu écrire le fichier « %s » signalant la promotion : %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s : n'a pas pu envoyer le signal de promotion (PID : %ld) : %s\n"
+
+#: pg_ctl.c:1113
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s : n'a pas pu supprimer le fichier « %s » signalant la promotion : %s\n"
+
+#: pg_ctl.c:1118
+msgid "server promoting\n"
+msgstr "serveur en cours de promotion\n"
+
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s : le serveur mono-utilisateur est en cours d'exécution (PID : %ld)\n"
 
-#: pg_ctl.c:1008
+#: pg_ctl.c:1175
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s : le serveur est en cours d'exécution (PID : %ld)\n"
 
-#: pg_ctl.c:1019
+#: pg_ctl.c:1186
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s : aucun serveur en cours d'exécution\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1197
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s : n'a pas pu envoyer le signal %d (PID : %ld) : %s\n"
 
-#: pg_ctl.c:1064
+#: pg_ctl.c:1231
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s : n'a pas pu trouver l'exécutable du programme\n"
 
-#: pg_ctl.c:1074
+#: pg_ctl.c:1241
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s : n'a pas pu trouver l'exécutable postgres\n"
 
-#: pg_ctl.c:1132
-#: pg_ctl.c:1164
+#: pg_ctl.c:1306
+#: pg_ctl.c:1338
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s : n'a pas pu ouvrir le gestionnaire de services\n"
 
-#: pg_ctl.c:1138
+#: pg_ctl.c:1312
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s : le service « %s » est déjà enregistré\n"
 
-#: pg_ctl.c:1149
+#: pg_ctl.c:1323
 #, c-format
 msgid "%s: could not register service \"%s\": error code %d\n"
 msgstr "%s : n'a pas pu enregistrer le service « %s » : code d'erreur %d\n"
 
-#: pg_ctl.c:1170
+#: pg_ctl.c:1344
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s : le service « %s » n'est pas enregistré\n"
 
-#: pg_ctl.c:1177
+#: pg_ctl.c:1351
 #, c-format
 msgid "%s: could not open service \"%s\": error code %d\n"
 msgstr "%s :  n'a pas pu ouvrir le service « %s » : code d'erreur %d\n"
 
-#: pg_ctl.c:1184
+#: pg_ctl.c:1358
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %d\n"
 msgstr "%s : n'a pas pu supprimer le service « %s » : code d'erreur %d\n"
 
-#: pg_ctl.c:1270
+#: pg_ctl.c:1444
 msgid "Waiting for server startup...\n"
 msgstr "En attente du démarrage du serveur...\n"
 
-#: pg_ctl.c:1273
+#: pg_ctl.c:1447
 msgid "Timed out waiting for server startup\n"
 msgstr "Dépassement du délai pour le démarrage du serveur\n"
 
-#: pg_ctl.c:1277
+#: pg_ctl.c:1451
 msgid "Server started and accepting connections\n"
 msgstr "Serveur lancé et acceptant les connexions\n"
 
-#: pg_ctl.c:1327
+#: pg_ctl.c:1501
 #, c-format
 msgid "%s: could not start service \"%s\": error code %d\n"
 msgstr "%s : n'a pas pu démarrer le service « %s » : code d'erreur %d\n"
 
-#: pg_ctl.c:1562
+#: pg_ctl.c:1573
+#, 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"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s : n'a pas pu ouvrir le jeton du processus : %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s : n'a pas pu allouer les SID : %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s : n'a pas pu créer le jeton restreint : %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr "%s : ATTENTION : n'a pas pu localiser toutes les fonctions objet de job dans l'API système\n"
+
+#: pg_ctl.c:1738
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: pg_ctl.c:1570
+#: pg_ctl.c:1746
 #, c-format
 msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s est un outil qui permet de démarrer, arrêter, redémarrer, recharger les\n"
-"les fichiers de configuration, rapporter le statut d'un serveur PostgreSQL\n"
-"ou d'envoyer un signal à un processus PostgreSQL\n"
+"%s est un outil pour initialiser, démarrer, arrêter et contrôler un serveur\n"
+"PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1572
+#: pg_ctl.c:1747
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_ctl.c:1573
+#: pg_ctl.c:1748
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]   [-D RÉP_DONNÉES] [-s] [-o \"OPTIONS\"]\n"
 
-#: pg_ctl.c:1574
+#: pg_ctl.c:1749
 #, c-format
 msgid "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s start      [-w] [-t SECS] [-D RÉP_DONNÉES] [-s] [-l NOM_FICHIER]\n"
 "                [-o \"OPTIONS\"]\n"
 
-#: pg_ctl.c:1575
+#: pg_ctl.c:1750
 #, c-format
 msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop       [-W] [-t SECS] [-D RÉP_DONNÉES] [-s] [-m MODE_ARRET]\n"
 
-#: pg_ctl.c:1576
+#: pg_ctl.c:1751
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -351,36 +459,41 @@ msgstr ""
 "  %s restart    [-w] [-t SECS] [-D RÉP_DONNÉES] [-s] [-m MODE_ARRET]\n"
 "                [-o \"OPTIONS\"]\n"
 
-#: pg_ctl.c:1578
+#: pg_ctl.c:1753
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload     [-D RÉP_DONNÉES] [-s]\n"
 
-#: pg_ctl.c:1579
+#: pg_ctl.c:1754
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status     [-D RÉP_DONNÉES]\n"
 
-#: pg_ctl.c:1580
+#: pg_ctl.c:1755
+#, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s promote    [-D RÉP_DONNÉES] [-s]\n"
+
+#: pg_ctl.c:1756
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill       SIGNAL ID_PROCESSUS\n"
 
-#: pg_ctl.c:1582
+#: pg_ctl.c:1758
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s register   [-N NOM_SERVICE] [-U NOM_UTILISATEUR] [-P MOTDEPASSE]\n"
-"                [-D RÉP_DONNÉES] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                [-D RÉP_DONNÉES] [-S TYPE_DÉMARRAGE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 
-#: pg_ctl.c:1584
+#: pg_ctl.c:1760
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N NOM_SERVICE]\n"
 
-#: pg_ctl.c:1587
+#: pg_ctl.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -389,46 +502,46 @@ msgstr ""
 "\n"
 "Options générales :\n"
 
-#: pg_ctl.c:1588
+#: pg_ctl.c:1764
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata RÉP_DONNÉES emplacement de stockage du cluster\n"
 
-#: pg_ctl.c:1589
+#: pg_ctl.c:1765
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent             affiche uniquement les erreurs, aucun message\n"
 "                           d'informations\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1766
 #, c-format
 msgid "  -t SECS                seconds to wait when using -w option\n"
 msgstr ""
 "  -t SECS                  durée en secondes à attendre lors de\n"
 "                           l'utilisation de l'option -w\n"
 
-#: pg_ctl.c:1591
+#: pg_ctl.c:1767
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                       attend la fin de l'opération\n"
 
-#: pg_ctl.c:1592
+#: pg_ctl.c:1768
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr "  -W                       n'attend pas la fin de l'opération\n"
 
-#: pg_ctl.c:1593
+#: pg_ctl.c:1769
 #, c-format
 msgid "  --help                 show this help, then exit\n"
 msgstr "  --help                   affiche cette aide et quitte\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1770
 #, c-format
 msgid "  --version              output version information, then exit\n"
 msgstr "  --version                affiche la version et quitte\n"
 
-#: pg_ctl.c:1595
+#: pg_ctl.c:1771
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -438,12 +551,12 @@ msgstr ""
 "redémarrage.)\n"
 "\n"
 
-#: pg_ctl.c:1596
+#: pg_ctl.c:1772
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Si l'option -D est omise, la variable d'environnement PGDATA est utilisée.\n"
 
-#: pg_ctl.c:1598
+#: pg_ctl.c:1774
 #, c-format
 msgid ""
 "\n"
@@ -452,24 +565,24 @@ msgstr ""
 "\n"
 "Options pour le démarrage ou le redémarrage :\n"
 
-#: pg_ctl.c:1600
+#: pg_ctl.c:1776
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files         autorise postgres à produire des fichiers core\n"
 
-#: pg_ctl.c:1602
+#: pg_ctl.c:1778
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files         non applicable à cette plateforme\n"
 
-#: pg_ctl.c:1604
+#: pg_ctl.c:1780
 #, c-format
 msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log NOM_FICHIER    écrit (ou ajoute) le journal du serveur dans\n"
 "                           NOM_FICHIER\n"
 
-#: pg_ctl.c:1605
+#: pg_ctl.c:1781
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -479,12 +592,12 @@ msgstr ""
 "                           postgres (exécutable du serveur PostgreSQL)\n"
 "                           ou à initdb\n"
 
-#: pg_ctl.c:1607
+#: pg_ctl.c:1783
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p CHEMIN_POSTGRES       normalement pas nécessaire\n"
 
-#: pg_ctl.c:1608
+#: pg_ctl.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -493,12 +606,12 @@ msgstr ""
 "\n"
 "Options pour l'arrêt ou le redémarrage :\n"
 
-#: pg_ctl.c:1609
+#: pg_ctl.c:1785
 #, c-format
 msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m MODE_ARRET            « smart », « fast » ou « immediate »\n"
 
-#: pg_ctl.c:1611
+#: pg_ctl.c:1787
 #, c-format
 msgid ""
 "\n"
@@ -507,24 +620,24 @@ msgstr ""
 "\n"
 "Les modes d'arrêt sont :\n"
 
-#: pg_ctl.c:1612
+#: pg_ctl.c:1788
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart                    quitte après déconnexion de tous les clients\n"
 
-#: pg_ctl.c:1613
+#: pg_ctl.c:1789
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast                     quitte directement, et arrête correctement\n"
 
-#: pg_ctl.c:1614
+#: pg_ctl.c:1790
 #, c-format
 msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 msgstr ""
 "  immediate                quitte sans arrêt complet ; entraîne une\n"
 "                           restauration au démarrage suivant\n"
 
-#: pg_ctl.c:1616
+#: pg_ctl.c:1792
 #, c-format
 msgid ""
 "\n"
@@ -533,7 +646,7 @@ msgstr ""
 "\n"
 "Signaux autorisés pour kill :\n"
 
-#: pg_ctl.c:1620
+#: pg_ctl.c:1796
 #, c-format
 msgid ""
 "\n"
@@ -542,28 +655,56 @@ msgstr ""
 "\n"
 "Options d'enregistrement ou de dés-enregistrement :\n"
 
-#: pg_ctl.c:1621
+#: pg_ctl.c:1797
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr ""
 "  -N NOM_SERVICE           nom du service utilisé pour l'enregistrement du\n"
 "                           serveur PostgreSQL\n"
 
-#: pg_ctl.c:1622
+#: pg_ctl.c:1798
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P MOT_DE_PASSE          mot de passe du compte utilisé pour\n"
 "                           l'enregistrement du serveur PostgreSQL\n"
 
-#: pg_ctl.c:1623
+#: pg_ctl.c:1799
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U NOM_UTILISATEUR       nom de l'utilisateur du compte utilisé pour\n"
 "                           l'enregistrement du serveur PostgreSQL\n"
 
-#: pg_ctl.c:1626
+#: pg_ctl.c:1800
+#, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr ""
+"  -S TYPE_DÉMARRAGE        type de démarrage du service pour enregistrer le\n"
+"                           serveur PostgreSQL\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Les types de démarrage sont :\n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid "  auto       start service automatically during system startup (default)\n"
+msgstr ""
+"  auto       démarre le service automatiquement lors du démarrage du système\n"
+"             (par défaut)\n"
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr "  demand     démarre le service à la demande\n"
+
+#: pg_ctl.c:1807
 #, c-format
 msgid ""
 "\n"
@@ -572,17 +713,22 @@ msgstr ""
 "\n"
 "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1651
+#: pg_ctl.c:1832
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s : mode d'arrêt non reconnu « %s »\n"
 
-#: pg_ctl.c:1684
+#: pg_ctl.c:1865
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s : signal non reconnu « %s »\n"
 
-#: pg_ctl.c:1749
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s : type de redémarrage « %s » non reconnu\n"
+
+#: pg_ctl.c:1947
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -593,88 +739,108 @@ msgstr ""
 "Connectez-vous (par exemple en utilisant « su ») sous l'utilisateur (non\n"
 " privilégié) qui sera propriétaire du processus serveur.\n"
 
-#: pg_ctl.c:1858
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s : option -S non supportée sur cette plateforme\n"
+
+#: pg_ctl.c:2065
 #, 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"
 
-#: pg_ctl.c:1880
+#: pg_ctl.c:2089
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s : arguments manquant pour le mode kill\n"
 
-#: pg_ctl.c:1898
+#: pg_ctl.c:2107
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s : mode d'opération « %s » non reconnu\n"
 
-#: pg_ctl.c:1908
+#: pg_ctl.c:2117
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s : aucune opération indiquée\n"
 
-#: pg_ctl.c:1924
+#: pg_ctl.c:2133
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr ""
 "%s : aucun répertoire de bases de données indiqué et variable\n"
 "d'environnement PGDATA non initialisée\n"
 
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
 #, c-format
 msgid "could not identify current directory: %s"
 msgstr "n'a pas pu identifier le répertoire courant : %s"
 
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
 #, c-format
 msgid "invalid binary \"%s\""
 msgstr "binaire « %s » invalide"
 
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
 #, c-format
 msgid "could not read binary \"%s\""
 msgstr "n'a pas pu lire le binaire « %s »"
 
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
 #, c-format
 msgid "could not find a \"%s\" to execute"
 msgstr "n'a pas pu trouver un « %s » à exécuter"
 
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
 #, c-format
 msgid "could not change directory to \"%s\""
 msgstr "n'a pas pu accéder au répertoire « %s »"
 
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
 #, c-format
 msgid "could not read symbolic link \"%s\""
 msgstr "n'a pas pu lire le lien symbolique « %s »"
 
-#: ../../port/exec.c:586
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "le processus fils a quitté avec le code de sortie %d"
 
-#: ../../port/exec.c:590
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "le processus fils a été terminé par l'exception 0x%X"
 
-#: ../../port/exec.c:599
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "le processus fils a été terminé par le signal %s"
 
-#: ../../port/exec.c:602
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "le processus fils a été terminé par le signal %d"
 
-#: ../../port/exec.c:606
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
+#~ msgid "could not start server\n"
+#~ msgstr "n'a pas pu démarrer le serveur\n"
+
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s est un outil qui permet de démarrer, arrêter, redémarrer, recharger "
+#~ "les\n"
+#~ "les fichiers de configuration, rapporter le statut d'un serveur "
+#~ "PostgreSQL\n"
+#~ "ou d'envoyer un signal à un processus PostgreSQL\n"
+#~ "\n"
diff --git a/src/bin/pg_ctl/po/it.po b/src/bin/pg_ctl/po/it.po
deleted file mode 100644
index 5520a7eb754c7..0000000000000
--- a/src/bin/pg_ctl/po/it.po
+++ /dev/null
@@ -1,661 +0,0 @@
-#
-# Translation of pg_ctl to Italian
-# PostgreSQL Project
-#
-# Associazione Culturale ITPUG - Italian PostgreSQL Users Group
-# http://www.itpug.org/ - info@itpug.org
-#
-# Traduttori:
-#  * Emanuele Zamprogno <emanuele.zamprogno@itpug.org>
-# 
-# Revisori:
-#  * Emanuele Zamprogno <emanuele.zamprogno@itpug.org>
-#
-# Copyright (c) 2010, Associazione Culturale ITPUG
-# Distributed under the same license of the PostgreSQL project
-#
-# LANGUAGE message translation file for pg_ctl
-# Copyright (C) 2009 PostgreSQL Global Development Group
-# This file is distributed under the same license as the PostgreSQL package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-03-26 13:22+0000\n"
-"PO-Revision-Date: 2010-03-27 12:44:19+0100\n"
-"Last-Translator: Gabriele Bartolini <gabriele.bartolini@2ndquadrant.it>\n"
-"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: pg_ctl.c:225
-#: pg_ctl.c:240
-#: pg_ctl.c:1830
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: memoria esaurita\n"
-
-#: pg_ctl.c:274
-#, c-format
-msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: non è possibile aprire il PID file \"%s\": %s\n"
-
-#: pg_ctl.c:281
-#, c-format
-msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: dati non validi nel PID file \"%s\"\n"
-
-#: pg_ctl.c:557
-#, c-format
-msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr "%s: non è possibile configurare il limite di grandezza del core file; impedito dall' hard limit\n"
-
-#: pg_ctl.c:582
-#, c-format
-msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: non è possibile leggere il file \"%s\"\n"
-
-#: pg_ctl.c:587
-#, c-format
-msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: il file opzionale file \"%s\" deve avere esattamente una linea\n"
-
-#: pg_ctl.c:635
-#, fuzzy, c-format
-msgid ""
-"The program \"%s\" is needed by %s but was not found in the\n"
-"same directory as \"%s\".\n"
-"Check your installation.\n"
-msgstr ""
-"Il programma \"postgres\" e' richiesto da %s ma non e' stato trovato\n"
-"nella stessa directory \"%s\".\n"
-"Verificate l'installazione.\n"
-
-#: pg_ctl.c:641
-#, fuzzy, c-format
-msgid ""
-"The program \"%s\" was found by \"%s\"\n"
-"but was not the same version as %s.\n"
-"Check your installation.\n"
-msgstr ""
-"Il programma \"postgres\" e' stato trovato da \"%s\" ma non ha\n"
-"la stessa versione \"%s\".\n"
-"Verificate l'installazione.\n"
-
-#: pg_ctl.c:674
-#, c-format
-msgid "%s: database system initialization failed\n"
-msgstr "%s: inizializzazione del sistema di database fallita\n"
-
-#: pg_ctl.c:690
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: un altro server potrebbe essere in esecuzione; si sta provando ad avviare il server ugualmente\n"
-
-#: pg_ctl.c:727
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: non è possibile avviare il server: il segnale d'uscita è %d\n"
-
-#: pg_ctl.c:738
-#: pg_ctl.c:751
-#, c-format
-msgid ""
-"%s: could not start server\n"
-"Examine the log output.\n"
-msgstr ""
-"%s: non è possibile avviareil serverr\n"
-"esaminare il log di output.\n"
-
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "attendere che il server si avvii..."
-
-#: pg_ctl.c:758
-#: pg_ctl.c:831
-#: pg_ctl.c:911
-msgid " done\n"
-msgstr " fatto\n"
-
-#: pg_ctl.c:759
-msgid "server started\n"
-msgstr "il server è avviato\n"
-
-#: pg_ctl.c:763
-msgid "server starting\n"
-msgstr "il server si sta avviando\n"
-
-#: pg_ctl.c:778
-#: pg_ctl.c:853
-#: pg_ctl.c:933
-#, c-format
-msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: il PID file \"%s\" non esiste\n"
-
-#: pg_ctl.c:779
-#: pg_ctl.c:855
-#: pg_ctl.c:934
-msgid "Is server running?\n"
-msgstr "il server è in esecuzione?\n"
-
-#: pg_ctl.c:785
-#, c-format
-msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: non è possibile fermare il server; il server è in esecuzione in modalità a singolo utente (PID: %ld)\n"
-
-#: pg_ctl.c:793
-#: pg_ctl.c:877
-#, c-format
-msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: non è possibile mandare il segnale di stop (PID: %ld): %s\n"
-
-#: pg_ctl.c:800
-msgid "server shutting down\n"
-msgstr "il server è in spegnimento\n"
-
-#: pg_ctl.c:807
-#: pg_ctl.c:884
-msgid ""
-"WARNING: online backup mode is active\n"
-"Shutdown will not complete until pg_stop_backup() is called.\n"
-"\n"
-msgstr ""
-"ATTENZIONE: è attivo l'online backup mode \n"
-"Lo spegnimento non sarà completato finchè non sarà chiamata pg_stop_backup().\n"
-"\n"
-
-#: pg_ctl.c:811
-#: pg_ctl.c:888
-msgid "waiting for server to shut down..."
-msgstr "attendere lo spegnimento del server...."
-
-#: pg_ctl.c:826
-#: pg_ctl.c:905
-msgid " failed\n"
-msgstr "fallito\n"
-
-#: pg_ctl.c:828
-#: pg_ctl.c:907
-#, c-format
-msgid "%s: server does not shut down\n"
-msgstr "%s: il server non si sta spegnendo\n"
-
-#: pg_ctl.c:833
-#: pg_ctl.c:912
-msgid "server stopped\n"
-msgstr "il server è stato terminato\n"
-
-#: pg_ctl.c:856
-#: pg_ctl.c:918
-msgid "starting server anyway\n"
-msgstr "il server si sta avviando comunque\n"
-
-#: pg_ctl.c:865
-#, c-format
-msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: non è possibile riavviare il server; il server è in esecuzione in modalità a singlolo utente (PID: %ld)\n"
-
-#: pg_ctl.c:868
-#: pg_ctl.c:943
-msgid "Please terminate the single-user server and try again.\n"
-msgstr "Si prega di terminare il server in modalità singolo utente e di riprovare\n"
-
-#: pg_ctl.c:916
-#, c-format
-msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: il vecchio processo del server (PID: %ld) sembra non essere più attivo\n"
-
-#: pg_ctl.c:940
-#, c-format
-msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: non è possibile eseguire il reload del server; il server è in esecuzione in modalità a singolo utente (PID: %ld)\n"
-
-#: pg_ctl.c:949
-#, c-format
-msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: non è  possibile mandare il segnale di reload(PID: %ld): %s\n"
-
-#: pg_ctl.c:954
-msgid "server signaled\n"
-msgstr "il server è segnalato\n"
-
-#: pg_ctl.c:998
-#, c-format
-msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: il server è in esecuzione in modalità a singolo utente (PID: %ld)\n"
-
-#: pg_ctl.c:1010
-#, c-format
-msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: il server è in esecuzione (PID: %ld)\n"
-
-#: pg_ctl.c:1021
-#, c-format
-msgid "%s: no server running\n"
-msgstr "%s: il server non è in esecuzione\n"
-
-#: pg_ctl.c:1032
-#, c-format
-msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: non è possibile mandare il segnale %d (PID: %ld): %s\n"
-
-#: pg_ctl.c:1066
-#, c-format
-msgid "%s: could not find own program executable\n"
-msgstr "%s: non si sta trovando il proprio programma eseguibile\n"
-
-#: pg_ctl.c:1076
-#, c-format
-msgid "%s: could not find postgres program executable\n"
-msgstr "%s: non è possibile trovare il programma eseguibile postgres\n"
-
-#: pg_ctl.c:1134
-#: pg_ctl.c:1166
-#, c-format
-msgid "%s: could not open service manager\n"
-msgstr "%s: non è possibile aprire il service manager\n"
-
-#: pg_ctl.c:1140
-#, c-format
-msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: il servizio \"%s\" è già registrato\n"
-
-#: pg_ctl.c:1151
-#, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: non è possibile registrare il servizio  \"%s\": codice errore %d\n"
-
-#: pg_ctl.c:1172
-#, c-format
-msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: il servizio \"%s\" non è  registrato\n"
-
-#: pg_ctl.c:1179
-#, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: non è possibile aprire il servizio \"%s\": codice errore %d\n"
-
-#: pg_ctl.c:1186
-#, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: non è possibile deregistrare il servizio \"%s\": codice errore %d\n"
-
-#: pg_ctl.c:1272
-msgid "Waiting for server startup...\n"
-msgstr "Attendere il server si sta avviando...\n"
-
-#: pg_ctl.c:1275
-msgid "Timed out waiting for server startup\n"
-msgstr "il tempo di attesa per l'avvio del server è scaduto\n"
-
-#: pg_ctl.c:1279
-msgid "Server started and accepting connections\n"
-msgstr "Il server è avviato e accetta connessioni\n"
-
-#: pg_ctl.c:1329
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: non è possibile avviare il servizio \"%s\": codice errore %d\n"
-
-#: pg_ctl.c:1564
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Prova \"%s --help\" per avere più informazioni.\n"
-
-#: pg_ctl.c:1572
-#, c-format
-msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
-"\n"
-msgstr ""
-"%s è un proramma di utilità per avviare, spegnere, riavviare, ricaricare file di configurazione,\n"
-"dare un rapporto sullo stato di PostgreSQL server, o segnalare un processo di PostgreSQL.\n"
-"\n"
-
-#: pg_ctl.c:1574
-#, c-format
-msgid "Usage:\n"
-msgstr "Utilizzo:\n"
-
-#: pg_ctl.c:1575
-#, fuzzy, c-format
-msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
-msgstr "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1576
-#, c-format
-msgid "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-msgstr "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1577
-#, c-format
-msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-
-#: pg_ctl.c:1578
-#, c-format
-msgid ""
-"  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-"                 [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-"                 [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1580
-#, c-format
-msgid "  %s reload  [-D DATADIR] [-s]\n"
-msgstr "  %s reload  [-D DATADIR] [-s]\n"
-
-#: pg_ctl.c:1581
-#, c-format
-msgid "  %s status  [-D DATADIR]\n"
-msgstr "  %s status  [-D DATADIR]\n"
-
-#: pg_ctl.c:1582
-#, c-format
-msgid "  %s kill    SIGNALNAME PID\n"
-msgstr "  %s kill    SIGNALNAME PID\n"
-
-#: pg_ctl.c:1584
-#, c-format
-msgid ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1586
-#, c-format
-msgid "  %s unregister [-N SERVICENAME]\n"
-msgstr "  %s unregister [-N SERVICENAME]\n"
-
-#: pg_ctl.c:1589
-#, c-format
-msgid ""
-"\n"
-"Common options:\n"
-msgstr ""
-"\n"
-"Opzioni comuni:\n"
-
-#: pg_ctl.c:1590
-#, c-format
-msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
-msgstr "  -D, --pgdata DATADIR   locazione dell' area di archiviazione del database \n"
-
-#: pg_ctl.c:1591
-#, c-format
-msgid "  -s, --silent           only print errors, no informational messages\n"
-msgstr "  -s, --silent           mostra solo gli errori, non i messaggi di informazione\n"
-
-#: pg_ctl.c:1592
-#, c-format
-msgid "  -t SECS                seconds to wait when using -w option\n"
-msgstr "  -t SECS                secondi da aspettare quando si usa l'opzione -w\n"
-
-#: pg_ctl.c:1593
-#, c-format
-msgid "  -w                     wait until operation completes\n"
-msgstr "  -w                     aspetta finchè l'opeazione non sia stata completata\n"
-
-#: pg_ctl.c:1594
-#, c-format
-msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -W                     non aspettare finchè l'operazione non è terminata\n"
-
-#: pg_ctl.c:1595
-#, c-format
-msgid "  --help                 show this help, then exit\n"
-msgstr "  --help                 mostra l'help e poi esci\n"
-
-#: pg_ctl.c:1596
-#, c-format
-msgid "  --version              output version information, then exit\n"
-msgstr "  --version              mostra le informazioni della versione, poi esci\n"
-
-#: pg_ctl.c:1597
-#, c-format
-msgid ""
-"(The default is to wait for shutdown, but not for start or restart.)\n"
-"\n"
-msgstr ""
-"(Il comportameeto di default è di aspettare lo spegnimento, ma non nel caso di avvio o riavvio.)\n"
-"\n"
-
-#: pg_ctl.c:1598
-#, c-format
-msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "se l'opzione -D è omessa, la variabile d'ambiente PGDATA viene usata.\n"
-
-#: pg_ctl.c:1600
-#, c-format
-msgid ""
-"\n"
-"Options for start or restart:\n"
-msgstr ""
-"\n"
-"Opzioni per l'avvio od il riavvio:\n"
-
-#: pg_ctl.c:1602
-#, c-format
-msgid "  -c, --core-files       allow postgres to produce core files\n"
-msgstr "  -c, --core-files       permette a postgres di produrre core files\n"
-
-#: pg_ctl.c:1604
-#, c-format
-msgid "  -c, --core-files       not applicable on this platform\n"
-msgstr "  -c, --core-files       non applicabile su questa piattaforma\n"
-
-#: pg_ctl.c:1606
-#, c-format
-msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
-msgstr "  -l, --log FILENAME     scrivi (o aggiungi) il log del server nel FILENAME\n"
-
-#: pg_ctl.c:1607
-#, fuzzy, c-format
-msgid ""
-"  -o OPTIONS             command line options to pass to postgres\n"
-"                         (PostgreSQL server executable) or initdb\n"
-msgstr ""
-"  -o OPTIONS             opzioni da linea di comando da passare a postgres\n"
-"                         (server PostgreSQL eseguibile)\n"
-
-#: pg_ctl.c:1609
-#, c-format
-msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
-msgstr "  -p PATH-TO-POSTGRES    normalmente non necessario\n"
-
-#: pg_ctl.c:1610
-#, c-format
-msgid ""
-"\n"
-"Options for stop or restart:\n"
-msgstr ""
-"\n"
-"Opzioni per lo spegnimento od il riavvio:\n"
-
-#: pg_ctl.c:1611
-#, c-format
-msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr "  -m SHUTDOWN-MODE   può essere \"smart\", \"fast\", o  \"immediate\"\n"
-
-#: pg_ctl.c:1613
-#, c-format
-msgid ""
-"\n"
-"Shutdown modes are:\n"
-msgstr ""
-"\n"
-"I modi di spegnimento sono:\n"
-
-#: pg_ctl.c:1614
-#, c-format
-msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  smart       chiudere dopo che tutti i clients si sono disconessi\n"
-
-#: pg_ctl.c:1615
-#, c-format
-msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  fast        spegni direttamente, con una corretta procedura di arresto\n"
-
-#: pg_ctl.c:1616
-#, c-format
-msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
-msgstr "  immediate   chiudere senza terminare il server: ciò porterà ad un recupero dei dati al riavvio\n"
-
-#: pg_ctl.c:1618
-#, c-format
-msgid ""
-"\n"
-"Allowed signal names for kill:\n"
-msgstr ""
-"\n"
-"Nomi permessi ai segnali per kill:\n"
-
-#: pg_ctl.c:1622
-#, c-format
-msgid ""
-"\n"
-"Options for register and unregister:\n"
-msgstr ""
-"\n"
-"Opzioni per register e unregister:\n"
-
-#: pg_ctl.c:1623
-#, c-format
-msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
-msgstr "  -N SERVICENAME  nome del servizio con cui ci si registra sul server PostgreSQL\n"
-
-#: pg_ctl.c:1624
-#, c-format
-msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
-msgstr "  -P PASSWORD     password per l'account con cui ci si registra sul server PostgreSQL\n"
-
-#: pg_ctl.c:1625
-#, c-format
-msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
-msgstr "  -U USERNAME     user name dell'account con cui ci si registra sul server PostgreSQL\n"
-
-#: pg_ctl.c:1628
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Segnalare bachi a <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_ctl.c:1653
-#, c-format
-msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: modalità di spegnimento non riconosciuta \"%s\"\n"
-
-#: pg_ctl.c:1686
-#, c-format
-msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: nome del segnale non riconosciuto \"%s\"\n"
-
-#: pg_ctl.c:1751
-#, 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: non puo' essere eseguito da root\n"
-"Effettuate il log in (usando per esempio \"su\") con l'utente\n"
-"(non privilegiato) che controllera' il processo server.\n"
-
-#: pg_ctl.c:1860
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: troppi parametri dalla riga di comando (il primo è \"%s\")\n"
-
-#: pg_ctl.c:1882
-#, c-format
-msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: mancano argomenti per la modalità di kill\n"
-
-#: pg_ctl.c:1900
-#, c-format
-msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: modalità di operazione sconosciuta \"%s\"\n"
-
-#: pg_ctl.c:1910
-#, c-format
-msgid "%s: no operation specified\n"
-msgstr "%s: nessuna operazione specificata\n"
-
-#: pg_ctl.c:1926
-#, c-format
-msgid "%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: nessuna directory del database è stata specificata e la variabile d'ambiente PGDATA non è configurata\n"
-
-#: ../../port/exec.c:125
-#: ../../port/exec.c:239
-#: ../../port/exec.c:282
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "impossibile identificare la directory corrente: %s"
-
-#: ../../port/exec.c:144
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "binario non valido \"%s\""
-
-#: ../../port/exec.c:193
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "impossibile leggere il binario \"%s\""
-
-#: ../../port/exec.c:200
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "impossibile trovare un \"%s\" da eseguire"
-
-#: ../../port/exec.c:255
-#: ../../port/exec.c:291
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "impossibile cambiare directory in \"%s\""
-
-#: ../../port/exec.c:270
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "impossibile leggere il link simbolico \"%s\""
-
-#: ../../port/exec.c:516
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "il processo figlio e' uscito con l'exit code %d"
-
-#: ../../port/exec.c:520
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "il processo figlio e' stato terminato dall'eccezione 0x%X"
-
-#: ../../port/exec.c:529
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "il processo figlio terminato dal segnale %s"
-
-#: ../../port/exec.c:532
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "il processo figlio e' stato terminato dal segnale %d"
-
-#: ../../port/exec.c:536
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "il processo figlio e' uscito con uno stato non riconosciuto %d"
-
-#~ msgid "could not start server\n"
-#~ msgstr "non è possibile avviare il server\n"
diff --git a/src/bin/pg_ctl/po/ja.po b/src/bin/pg_ctl/po/ja.po
index 0ed66da7aa9ca..9522f6e5ace84 100644
--- a/src/bin/pg_ctl/po/ja.po
+++ b/src/bin/pg_ctl/po/ja.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-20 12:55+0900\n"
-"PO-Revision-Date: 2010-07-15 19:26+0900\n"
+"POT-Creation-Date: 2011-07-12 20:26+0900\n"
+"PO-Revision-Date: 2011-08-30 21:28+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -14,39 +14,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: pg_ctl.c:225 pg_ctl.c:240 pg_ctl.c:1834
+#: pg_ctl.c:237 pg_ctl.c:252 pg_ctl.c:2035
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: メモリ�足��\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:286
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: PIDファイル\"%s\"をオープン����ん���: %s\n"
 
-#: pg_ctl.c:281
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: PIDファイル\"%s\"内�無効�データ��り��\n"
 
-#: pg_ctl.c:557
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+"\n"
+"%s: 9.1より��サー�を起動�る際�-wオプション�サ�ート�れ��ん\n"
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+"\n"
+"%s: -wオプション��相対ソケットディレクトリ指定を使用�る�������ん\n"
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr "\n%s: ��データディレクトリ��既存�postmaster�実行���るよ���。\n"
+
+#: pg_ctl.c:638
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: コアファイル�サイズ制�を設定����ん:固定�制��より許�れ����"
 "ã‚“\n"
 
-#: pg_ctl.c:582
+#: pg_ctl.c:663
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: ファイル\"%s\"を読��る���失敗����\n"
 
-#: pg_ctl.c:587
+#: pg_ctl.c:668
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: オプションファイル\"%s\"�1行�����れ��り��ん\n"
 
-#: pg_ctl.c:635
+#: pg_ctl.c:716
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -57,7 +82,7 @@ msgstr ""
 "��り��ん���。\n"
 "インストール状�を確�������。\n"
 
-#: pg_ctl.c:641
+#: pg_ctl.c:722
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -68,24 +93,44 @@ msgstr ""
 "�ージョン���り��ん���。\n"
 "インストレーションを検査������。\n"
 
-#: pg_ctl.c:674
+#: pg_ctl.c:755
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: データベースシステム��期化�失敗����\n"
 
-#: pg_ctl.c:690
+#: pg_ctl.c:770
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s: 他�サー��動作中��能性��り��������postmaster�起動を試��"
 "�。\n"
 
-#: pg_ctl.c:727
+#: pg_ctl.c:807
 #, c-format
 msgid "%s: could not start server: exit code was %d\n"
 msgstr "%s: サー�を起動����ん���。終了コード�%d���。\n"
 
-#: pg_ctl.c:738 pg_ctl.c:751
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "サー��起動完了を待�����..."
+
+#: pg_ctl.c:819 pg_ctl.c:920 pg_ctl.c:1011
+msgid " done\n"
+msgstr "完了\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "サー�起動完了\n"
+
+#: pg_ctl.c:823 pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr " 待機処���止�れ���\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "サー���然起動中��。\n"
+
+#: pg_ctl.c:828
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -94,48 +139,45 @@ msgstr ""
 "%s: サー�を起動����ん���。\n"
 "ログ出力を確�������。\n"
 
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "サー��起動完了を待�����..."
-
-#: pg_ctl.c:758 pg_ctl.c:831 pg_ctl.c:911
-msgid " done\n"
-msgstr "完了\n"
+#: pg_ctl.c:834 pg_ctl.c:912 pg_ctl.c:1002
+msgid " failed\n"
+msgstr "失敗����\n"
 
-#: pg_ctl.c:759
-msgid "server started\n"
-msgstr "サー�起動完了\n"
+#: pg_ctl.c:835
+#, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s: 誤設定���サー�を待機�る�������ん���\n"
 
-#: pg_ctl.c:763
+#: pg_ctl.c:841
 msgid "server starting\n"
 msgstr "サー��起動中��。\n"
 
-#: pg_ctl.c:778 pg_ctl.c:853 pg_ctl.c:933
+#: pg_ctl.c:856 pg_ctl.c:942 pg_ctl.c:1032 pg_ctl.c:1072
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: PIDファイル\"%s\"��り��ん\n"
 
-#: pg_ctl.c:779 pg_ctl.c:855 pg_ctl.c:934
+#: pg_ctl.c:857 pg_ctl.c:944 pg_ctl.c:1033 pg_ctl.c:1073
 msgid "Is server running?\n"
 msgstr "サー��動作������?\n"
 
-#: pg_ctl.c:785
+#: pg_ctl.c:863
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: サー�を�止����ん。シングルユーザサー�(PID: %ld)�動作����"
 "�。\n"
 
-#: pg_ctl.c:793 pg_ctl.c:877
+#: pg_ctl.c:871 pg_ctl.c:966
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: �止シグナルを�信����ん���。(PID: %ld): %s\n"
 
-#: pg_ctl.c:800
+#: pg_ctl.c:878
 msgid "server shutting down\n"
 msgstr "サー���止中��\n"
 
-#: pg_ctl.c:807 pg_ctl.c:884
+#: pg_ctl.c:893 pg_ctl.c:981
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -145,161 +187,223 @@ msgstr ""
 "pg_stop_backup()�呼�出�れる��シャットダウン�完了���ん\n"
 "\n"
 
-#: pg_ctl.c:811 pg_ctl.c:888
+#: pg_ctl.c:897 pg_ctl.c:985
 msgid "waiting for server to shut down..."
 msgstr "サー��止処��完了を待�����..."
 
-#: pg_ctl.c:826 pg_ctl.c:905
-msgid " failed\n"
-msgstr "失敗����\n"
-
-#: pg_ctl.c:828 pg_ctl.c:907
+#: pg_ctl.c:914 pg_ctl.c:1004
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: サー���止�����ん\n"
 
-#: pg_ctl.c:833 pg_ctl.c:912
+#: pg_ctl.c:916 pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"ヒント: \"-m fast\"オプション��セッション切断�始�る��待機�る����"
+"�\n"
+"�座�セッションを切断���。\n"
+
+#: pg_ctl.c:922 pg_ctl.c:1012
 msgid "server stopped\n"
 msgstr "サー���止����\n"
 
-#: pg_ctl.c:856 pg_ctl.c:918
+#: pg_ctl.c:945 pg_ctl.c:1018
 msgid "starting server anyway\n"
 msgstr "����サー�を起動�����\n"
 
-#: pg_ctl.c:865
+#: pg_ctl.c:954
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: サー�を�起動����ん。シングルユーザサー�(PID: %ld)�動作中��。\n"
 
-#: pg_ctl.c:868 pg_ctl.c:943
+#: pg_ctl.c:957 pg_ctl.c:1042
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "シングルユーザサー�を終了����ら��度実行������\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:1016
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s: ��サー�プロセス(PID: %ld)�動作�����よ���\n"
 
-#: pg_ctl.c:940
+#: pg_ctl.c:1039
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: サー�をリロード����ん。シングルユーザサー�(PID: %ld)�動作中��\n"
 
-#: pg_ctl.c:949
+#: pg_ctl.c:1048
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: リロードシグナルを�信����ん���。(PID: %ld): %s\n"
 
-#: pg_ctl.c:954
+#: pg_ctl.c:1053
 msgid "server signaled\n"
 msgstr "サー��シグナルを�信����\n"
 
-#: pg_ctl.c:998
+#: pg_ctl.c:1079
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: サー�を昇進����ん。シングルユーザサー�(PID: %ld)�動作中��\n"
+
+#: pg_ctl.c:1088
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s: サー�を昇進����ん。サー��スタン�イモード���り��ん。\n"
+
+#: pg_ctl.c:1096
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: \"%s\"昇進通知ファイルを作��る�������ん���: %s\n"
+
+#: pg_ctl.c:1102
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s: \"%s\"昇進通知ファイルを書�出��������ん���: %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: 昇進シグナルを�信����ん���。(PID: %ld): %s\n"
+
+#: pg_ctl.c:1113
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s: \"%s\"昇進通知ファイルを削除����ん���: %s\n"
+
+#: pg_ctl.c:1118
+msgid "server promoting\n"
+msgstr "サー�を昇進中��。\n"
+
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s: シングルユーザサー��動作中��(PID: %ld)\n"
 
-#: pg_ctl.c:1010
+#: pg_ctl.c:1175
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: サー��動作中��(PID: %ld)\n"
 
-#: pg_ctl.c:1021
+#: pg_ctl.c:1186
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: サー��動作�����ん\n"
 
-#: pg_ctl.c:1032
+#: pg_ctl.c:1197
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: シグナル%dを�信����ん���(PID: %ld): %s\n"
 
-#: pg_ctl.c:1066
+#: pg_ctl.c:1231
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: 本プログラム�実行ファイル�検索�失敗����\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1241
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: postgres �実行ファイル�見��り��ん\n"
 
-#: pg_ctl.c:1138 pg_ctl.c:1170
+#: pg_ctl.c:1306 pg_ctl.c:1338
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: サービスマ�ージャ�オープン�失敗����\n"
 
-#: pg_ctl.c:1144
+#: pg_ctl.c:1312
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: サービス\\\"%s\\\"�登録済���\n"
 
-#: pg_ctl.c:1155
+#: pg_ctl.c:1323
 #, c-format
 msgid "%s: could not register service \"%s\": error code %d\n"
 msgstr "%s: サービス\"%s\"�登録�失敗����: エラーコード %d\n"
 
-#: pg_ctl.c:1176
+#: pg_ctl.c:1344
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: サービス\"%s\"�登録�れ����ん\n"
 
-#: pg_ctl.c:1183
+#: pg_ctl.c:1351
 #, c-format
 msgid "%s: could not open service \"%s\": error code %d\n"
 msgstr "%s: サービス\"%s\"�オープン�失敗����: エラーコード %d\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1358
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %d\n"
 msgstr "%s: サービス\"%s\"�登録削除�失敗����: エラーコード %d\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1444
 msgid "Waiting for server startup...\n"
 msgstr "サー��起動完了を待�����...\n"
 
-#: pg_ctl.c:1279
+#: pg_ctl.c:1447
 msgid "Timed out waiting for server startup\n"
 msgstr "サー��起動待機�タイムアウト����\n"
 
-#: pg_ctl.c:1283
+#: pg_ctl.c:1451
 msgid "Server started and accepting connections\n"
 msgstr "サー��起動��接続を��付�����\n"
 
-#: pg_ctl.c:1333
+#: pg_ctl.c:1501
 #, c-format
 msgid "%s: could not start service \"%s\": error code %d\n"
 msgstr "%s: サービス\"%s\"�起動�失敗����: エラーコード %d\n"
 
-#: pg_ctl.c:1568
+#: pg_ctl.c:1573
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: 警告: ��プラットフォーム��制�付�トークンを作�����ん\n"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s: プロセストークンをオープン����ん���: %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s: SIDを割り当�られ��ん���: %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s: 制�付�トークンを作�����ん���: %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr "%s: 警告: システムAPI内�����ジョブオブジェクト関数を格�����ん���\n"
+
+#: pg_ctl.c:1738
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "詳細�\"%s --help\"を実行������。\n"
 
-#: pg_ctl.c:1576
+#: pg_ctl.c:1746
 #, c-format
 msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s�PostgreSQLサー��起動��止��起動�設定ファイル�リロード�状�報告\n"
-"を行�ユーティリティ��。���PostgreSQLプロセス�シグナルも�信���。\n"
-"\n"
+"%s�PostgreSQLサー���期化�起動��止�制御を行�ユーティリティ��。\n"
 
-#: pg_ctl.c:1578
+#: pg_ctl.c:1747
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_ctl.c:1579
+#: pg_ctl.c:1748
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]               [-D DATADIR] [-s] [-o \"オプション\"]\n"
 
-#: pg_ctl.c:1580
+#: pg_ctl.c:1749
 #, c-format
 msgid ""
 "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -308,12 +412,12 @@ msgstr ""
 "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
 "\"]\n"
 
-#: pg_ctl.c:1581
+#: pg_ctl.c:1750
 #, c-format
 msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 
-#: pg_ctl.c:1582
+#: pg_ctl.c:1751
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -322,36 +426,41 @@ msgstr ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 "                 [-o \"OPTIONS\"]\n"
 
-#: pg_ctl.c:1584
+#: pg_ctl.c:1753
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DATADIR] [-s]\n"
 
-#: pg_ctl.c:1585
+#: pg_ctl.c:1754
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DATADIR]\n"
 
-#: pg_ctl.c:1586
+#: pg_ctl.c:1755
+#, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s promote  [-D DATADIR] [-s]\n"
+
+#: pg_ctl.c:1756
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    SIGNALNAME PID\n"
 
-#: pg_ctl.c:1588
+#: pg_ctl.c:1758
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1760
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N SERVICENAME]\n"
 
-#: pg_ctl.c:1593
+#: pg_ctl.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -360,44 +469,44 @@ msgstr ""
 "\n"
 "一般的�オプション:\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1764
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata DATADIR   データベース格�領域�場所��\n"
 
-#: pg_ctl.c:1595
+#: pg_ctl.c:1765
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           エラーメッセージ��を表示��情報メッセージ�表示�"
 "��ん\n"
 
-#: pg_ctl.c:1596
+#: pg_ctl.c:1766
 #, c-format
 msgid "  -t SECS                seconds to wait when using -w option\n"
 msgstr "  -t SECS               -wオプションを使用�る時�待機秒数��。\n"
 
-#: pg_ctl.c:1597
+#: pg_ctl.c:1767
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     作業�完了�る��待機���\n"
 
-#: pg_ctl.c:1598
+#: pg_ctl.c:1768
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr "  -W                     作業�完了��待機���ん\n"
 
-#: pg_ctl.c:1599
+#: pg_ctl.c:1769
 #, c-format
 msgid "  --help                 show this help, then exit\n"
 msgstr "  --help                 ヘルプを表示��終了���\n"
 
-#: pg_ctl.c:1600
+#: pg_ctl.c:1770
 #, c-format
 msgid "  --version              output version information, then exit\n"
 msgstr "  --version              �ージョン情報を表示��終了���\n"
 
-#: pg_ctl.c:1601
+#: pg_ctl.c:1771
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -407,12 +516,12 @@ msgstr ""
 "��ん。)\n"
 "\n"
 
-#: pg_ctl.c:1602
+#: pg_ctl.c:1772
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "-Dオプション��略時�PGDATA環境変数�使用�れ��。\n"
 
-#: pg_ctl.c:1604
+#: pg_ctl.c:1774
 #, c-format
 msgid ""
 "\n"
@@ -421,24 +530,24 @@ msgstr ""
 "\n"
 "起動��起動用�オプション\n"
 
-#: pg_ctl.c:1606
+#: pg_ctl.c:1776
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr ""
 "  -c, --core-files       postgres�コアファイルを生��る�������。\n"
 
-#: pg_ctl.c:1608
+#: pg_ctl.c:1778
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       ��プラットフォーム��実行����ん\n"
 
-#: pg_ctl.c:1610
+#: pg_ctl.c:1780
 #, c-format
 msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log FILENAME     サー�ログをFILENAME�出力(�る��追加)���\n"
 
-#: pg_ctl.c:1611
+#: pg_ctl.c:1781
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -447,12 +556,12 @@ msgstr ""
 "  -o オプション          postgres(PostgreSQLサー�実行ファイル)���\n"
 "                         initdb �渡�コマンドラインオプション\n"
 
-#: pg_ctl.c:1613
+#: pg_ctl.c:1783
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p PATH-TO-POSTGRES    通常�����\n"
 
-#: pg_ctl.c:1614
+#: pg_ctl.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -461,13 +570,13 @@ msgstr ""
 "\n"
 "�止��起動用�オプション:\n"
 
-#: pg_ctl.c:1615
+#: pg_ctl.c:1785
 #, c-format
 msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
 "  -m SHUTDOWN-MODE   \"smart\"�\"fast\"�\"immediate\"���れ���\n"
 
-#: pg_ctl.c:1617
+#: pg_ctl.c:1787
 #, c-format
 msgid ""
 "\n"
@@ -476,17 +585,17 @@ msgstr ""
 "\n"
 "シャットダウンモード�以下�通り��:\n"
 
-#: pg_ctl.c:1618
+#: pg_ctl.c:1788
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       全クライアント�接続切断後��止���\n"
 
-#: pg_ctl.c:1619
+#: pg_ctl.c:1789
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        シャットダウン手続�後��止���\n"
 
-#: pg_ctl.c:1620
+#: pg_ctl.c:1790
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -495,7 +604,7 @@ msgstr ""
 "  immediate   シャットダウン手続�を行����止���。�起動時�リカ�リ状"
 "態��る�能性��り��\n"
 
-#: pg_ctl.c:1622
+#: pg_ctl.c:1792
 #, c-format
 msgid ""
 "\n"
@@ -504,7 +613,7 @@ msgstr ""
 "\n"
 "killモード�利用��るシグナル�:\n"
 
-#: pg_ctl.c:1626
+#: pg_ctl.c:1796
 #, c-format
 msgid ""
 "\n"
@@ -513,24 +622,51 @@ msgstr ""
 "\n"
 "登録�登録解除用�オプション:\n"
 
-#: pg_ctl.c:1627
+#: pg_ctl.c:1797
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N SERVICENAME  PostgreSQLサー�を登録�る���サービス���\n"
 
-#: pg_ctl.c:1628
+#: pg_ctl.c:1798
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr ""
 "  -P PASSWORD     PostgreSQLサー�を登録�るアカウント�パスワード��\n"
 
-#: pg_ctl.c:1629
+#: pg_ctl.c:1799
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr "  -U USERNAME     PostgreSQLサー�を登録�るアカウント�ユーザ���\n"
 
-#: pg_ctl.c:1632
+#: pg_ctl.c:1800
+#, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr ""
+"  -S START-TYPE   PostgreSQLサー�を登録�る���サービス起動種類��\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"起動種類�以下�通り��:\n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid ""
+"  auto       start service automatically during system startup (default)\n"
+msgstr ""
+"  auto       システム�起動時�サービスを自動的�開始���（デフォルト）\n"
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr "  demand     必��応��サービスを開始���\n"
+
+#: pg_ctl.c:1807
 #, c-format
 msgid ""
 "\n"
@@ -539,17 +675,22 @@ msgstr ""
 "\n"
 "�具��<pgsql-bugs@postgresql.org>��報告������。\n"
 
-#: pg_ctl.c:1657
+#: pg_ctl.c:1832
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: シャットダウンモード\"%s\"��明��\n"
 
-#: pg_ctl.c:1690
+#: pg_ctl.c:1865
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: シグナル�\"%s\"��明��\n"
 
-#: pg_ctl.c:1755
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: 起動種類\"%s\"��明��\n"
+
+#: pg_ctl.c:1947
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -560,27 +701,32 @@ msgstr ""
 "サー�プロセス�所有者��る(�特権)ユーザ���(例��\"su\"を使用��)\n"
 "ログイン������。\n"
 
-#: pg_ctl.c:1864
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: -Sオプション���プラットフォーム�サ�ート�れ����ん\n"
+
+#: pg_ctl.c:2065
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: コマンドライン引数�多����(先頭�\"%s\")\n"
 
-#: pg_ctl.c:1886
+#: pg_ctl.c:2089
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: killモード用�引数��り��ん\n"
 
-#: pg_ctl.c:1904
+#: pg_ctl.c:2107
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: �作モード\"%s\"��明��\n"
 
-#: pg_ctl.c:1914
+#: pg_ctl.c:2117
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: �作モード�指定�れ����ん\n"
 
-#: pg_ctl.c:1930
+#: pg_ctl.c:2133
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
@@ -616,27 +762,39 @@ msgstr "ディレクトリを\"%s\"�変更����ん���"
 msgid "could not read symbolic link \"%s\""
 msgstr "シンボリックリンク\"%s\"�読��り�失敗����"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "�プロセス�終了コード%d�終了����"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "�プロセス�例外0x%X�終了����"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "�プロセス�シグナル%s�終了����"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "�プロセス�シグナル%d�終了����"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "�プロセス�未知�ステータス%d�終了����"
+
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s�PostgreSQLサー��起動��止��起動�設定ファイル�リロード�状�報"
+#~ "å‘Š\n"
+#~ "を行�ユーティリティ��。���PostgreSQLプロセス�シグナルも�信��"
+#~ "�。\n"
+#~ "\n"
diff --git a/src/bin/pg_ctl/po/ko.po b/src/bin/pg_ctl/po/ko.po
deleted file mode 100644
index e303b8787516e..0000000000000
--- a/src/bin/pg_ctl/po/ko.po
+++ /dev/null
@@ -1,592 +0,0 @@
-# Korean message translation file for PostgreSQL pg_ctl
-# Ioseph Kim <ioseph@uri.sarang.net>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 8.3dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-09 01:13-0400\n"
-"PO-Revision-Date: 2007-02-10 01:13+0900\n"
-"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
-"Language-Team: KOREAN <pgsql-kr@postgresql.or.kr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: pg_ctl.c:220 pg_ctl.c:235 pg_ctl.c:1661
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: 메모리 부족\n"
-
-#: pg_ctl.c:269
-#, c-format
-msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: \"%s\" PID 파�� 열 수 없�: %s\n"
-
-#: pg_ctl.c:276
-#, c-format
-msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: \"%s\" PID 파�� 잘못� 값� 있�\n"
-
-#: pg_ctl.c:499
-#, c-format
-msgid "%s: cannot set core size, disallowed by hard limit.\n"
-msgstr ""
-"%s: 코어 �기를 지정할 수 없�, 하드디스� 용량 초과로 허용�지 않았�.\n"
-
-#: pg_ctl.c:525
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: 다른 서버가 가� 중� 것 같�; 어째든 서버 가�� 시�함\n"
-
-#: pg_ctl.c:543
-#, c-format
-msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: \"%s\" 파�� �� 수 없�\n"
-
-#: pg_ctl.c:549
-#, c-format
-msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: \"%s\" 환경설정파�� 반드시 한 줄� 가져야한다?\n"
-
-#: pg_ctl.c:600
-#, 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"
-
-#: pg_ctl.c:606
-#, 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"
-
-#: pg_ctl.c:623
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: 서버를 시작할 수 없�: 종료 코드 %d\n"
-
-#: pg_ctl.c:634
-#, c-format
-msgid ""
-"%s: could not start server\n"
-"Examine the log output.\n"
-msgstr ""
-"%s: 서버를 시작 할 수 없�\n"
-"로그 출력� 살펴보십시오.\n"
-
-#: pg_ctl.c:643
-msgid "waiting for server to start..."
-msgstr "서버를 시작하기 위해 기다리는 중..."
-
-#: pg_ctl.c:647
-#, c-format
-msgid "could not start server\n"
-msgstr "서버를 시작 할 수 없�\n"
-
-#: pg_ctl.c:652 pg_ctl.c:718 pg_ctl.c:791
-msgid " done\n"
-msgstr " 완료\n"
-
-#: pg_ctl.c:653
-msgid "server started\n"
-msgstr "서버 시작�\n"
-
-#: pg_ctl.c:657
-msgid "server starting\n"
-msgstr "서버를 시작합니다\n"
-
-#: pg_ctl.c:671 pg_ctl.c:739 pg_ctl.c:813
-#, c-format
-msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: \"%s\" PID 파�� 없습니다\n"
-
-#: pg_ctl.c:672 pg_ctl.c:741 pg_ctl.c:814
-msgid "Is server running?\n"
-msgstr "서버가 실행 중입니까?\n"
-
-#: pg_ctl.c:678
-#, c-format
-msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 서버 중지 실패; 단� 사용� 서버가 실행 중 (PID: %ld)\n"
-
-#: pg_ctl.c:686 pg_ctl.c:763
-#, c-format
-msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: stop 시그�� 보낼 수 없� (PID: %ld): %s\n"
-
-#: pg_ctl.c:693
-msgid "server shutting down\n"
-msgstr "서버를 멈춥니다\n"
-
-#: pg_ctl.c:698 pg_ctl.c:768
-msgid "waiting for server to shut down..."
-msgstr "서버를 멈추기 위해 기다리는 중..."
-
-#: pg_ctl.c:713 pg_ctl.c:785
-msgid " failed\n"
-msgstr " 실패\n"
-
-#: pg_ctl.c:715 pg_ctl.c:787
-#, c-format
-msgid "%s: server does not shut down\n"
-msgstr "%s: 서버를 멈추지 못했�\n"
-
-#: pg_ctl.c:720 pg_ctl.c:792
-#, c-format
-msgid "server stopped\n"
-msgstr "서버 멈추었�\n"
-
-#: pg_ctl.c:742 pg_ctl.c:798
-msgid "starting server anyway\n"
-msgstr "어째든 서버를 시작합니다\n"
-
-#: pg_ctl.c:751
-#, c-format
-msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr ""
-"%s: 서버를 다시 시작 할 수 없�; 단�사용� 서버가 실행 중임 (PID: %ld)\n"
-
-#: pg_ctl.c:754 pg_ctl.c:823
-msgid "Please terminate the single-user server and try again.\n"
-msgstr "단� 사용� 서버를 멈추고 다시 시�하십시오.\n"
-
-#: pg_ctl.c:796
-#, c-format
-msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: �전 서버 프로세스(PID: %ld)가 없어졌습니다\n"
-
-#: pg_ctl.c:820
-#, c-format
-msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr ""
-"%s: 서버 환경설정� 다시 불러올 수 없�; 단� 사용� 서버가 실행 중임 (PID: %"
-"ld)\n"
-
-#: pg_ctl.c:829
-#, c-format
-msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: reload 시그�� 보낼 수 없� (PID: %ld): %s\n"
-
-#: pg_ctl.c:834
-msgid "server signaled\n"
-msgstr "서버가 시스템 시그�� 받았�\n"
-
-#: pg_ctl.c:878
-#, c-format
-msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: 단� 사용� 서버가 실행 중임 (PID: %ld)\n"
-
-#: pg_ctl.c:890
-#, c-format
-msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: 서버가 실행 중임 (PID: %ld)\n"
-
-#: pg_ctl.c:901
-#, c-format
-msgid "%s: no server running\n"
-msgstr "%s: 가� 중� 서버가 없�\n"
-
-#: pg_ctl.c:912
-#, c-format
-msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: %d 시그�� 보낼 수 없� (PID: %ld): %s\n"
-
-#: pg_ctl.c:946
-#, c-format
-msgid "%s: could not find own program executable\n"
-msgstr "%s: 실행 가능한 프로그램� 찾� 수 없습니다\n"
-
-#: pg_ctl.c:955
-#, c-format
-msgid "%s: could not find postgres program executable\n"
-msgstr "%s: 실행 가능한 postgres 프로그램� 찾� 수 없�\n"
-
-#: pg_ctl.c:1009 pg_ctl.c:1041
-#, c-format
-msgid "%s: could not open service manager\n"
-msgstr "%s: 서비스 관리�를 열 수 없�\n"
-
-#: pg_ctl.c:1015
-#, c-format
-msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: \"%s\" 서비스가 �미 등� �어 있�\n"
-
-#: pg_ctl.c:1026
-#, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" 서비스를 등�할 수 없�: 오류 코드 %d\n"
-
-#: pg_ctl.c:1047
-#, c-format
-msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: \"%s\" 서비스가 등��어 있지 않�\n"
-
-#: pg_ctl.c:1054
-#, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" 서비스를 열 수 없�: 오류 코드 %d\n"
-
-#: pg_ctl.c:1061
-#, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" 서비스를 서비스 목��서 뺄 수 없�: 오류 코드 %d\n"
-
-#: pg_ctl.c:1190
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" 서비스를 시작할 수 없�: 오류 번호 %d\n"
-
-#: pg_ctl.c:1402
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "보다 �세한 사용법� \"%s --help\"\n"
-
-#: pg_ctl.c:1410
-#, c-format
-msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
-"\n"
-msgstr ""
-"%s 프로그램� PostgreSQL 서비스를 시작, 중지, 재시작, 환경설정 재�용,\n"
-"서버 �태 보기, �는 PostgreSQL 프로세스� 특정 시그�� 보낼 수 있는\n"
-"프로그램입니다.\n"
-"\n"
-
-#: pg_ctl.c:1412
-#, c-format
-msgid "Usage:\n"
-msgstr "사용법:\n"
-
-#: pg_ctl.c:1413
-#, c-format
-msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-msgstr "  %s start   [-w] [-D DATADIR] [-s] [-l 로그파�] [-o \"서버옵션\"]\n"
-
-#: pg_ctl.c:1414
-#, c-format
-msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr "  %s stop    [-W] [-D DATADIR] [-s] [-m 중지방법]\n"
-
-#: pg_ctl.c:1415
-#, c-format
-msgid ""
-"  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
-msgstr "  %s restart [-w] [-D DATADIR] [-s] [-m 중지방법] [-o \"서버옵션\"]\n"
-
-#: pg_ctl.c:1416
-#, c-format
-msgid "  %s reload  [-D DATADIR] [-s]\n"
-msgstr "  %s reload  [-D DATADIR] [-s]\n"
-
-#: pg_ctl.c:1417
-#, c-format
-msgid "  %s status  [-D DATADIR]\n"
-msgstr "  %s status  [-D DATADIR]\n"
-
-#: pg_ctl.c:1418
-#, c-format
-msgid "  %s kill    SIGNALNAME PID\n"
-msgstr "  %s kill    시그��름 PID\n"
-
-#: pg_ctl.c:1420
-#, c-format
-msgid ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s register   [-N 서비스�름] [-U 사용�] [-P 비밀번호] [-D DATADIR]\n"
-"                    [-w] [-o \"서버옵션\"]\n"
-
-#: pg_ctl.c:1422
-#, c-format
-msgid "  %s unregister [-N SERVICENAME]\n"
-msgstr "  %s unregister [-N 서비스�름]\n"
-
-#: pg_ctl.c:1425
-#, c-format
-msgid ""
-"\n"
-"Common options:\n"
-msgstr ""
-"\n"
-"�반 옵션들:\n"
-
-#: pg_ctl.c:1426
-#, c-format
-msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
-msgstr "  -D, --pgdata DATADIR   ��터베�스 �료가 저장�어있는 디렉토리\n"
-
-#: pg_ctl.c:1427
-#, c-format
-msgid "  -s, --silent           only print errors, no informational messages\n"
-msgstr ""
-"  -s, --silent           �반�� 메시지는 보�지 않고, 오류만 보여줌\n"
-
-#: pg_ctl.c:1428
-#, c-format
-msgid "  -w                     wait until operation completes\n"
-msgstr "  -w                     작업� �날 때까지 기다림\n"
-
-#: pg_ctl.c:1429
-#, c-format
-msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -W                     작업� �날 때까지 기다리지 않�\n"
-
-#: pg_ctl.c:1430
-#, c-format
-msgid "  --help                 show this help, then exit\n"
-msgstr "  --help                 �움�� 보여주고 마침\n"
-
-#: pg_ctl.c:1431
-#, c-format
-msgid "  --version              output version information, then exit\n"
-msgstr "  --version              버전 정보를 보여주고 마침\n"
-
-#: pg_ctl.c:1432
-#, c-format
-msgid ""
-"(The default is to wait for shutdown, but not for start or restart.)\n"
-"\n"
-msgstr ""
-"(기본 설정� 중지 할 때는 기다리고, 시작�나 재시작할 때는 안 기다림.)\n"
-
-#: pg_ctl.c:1433
-#, c-format
-msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "-D 옵션� 사용하지 않으며, PGDATA 환경변수값� 사용함.\n"
-
-#: pg_ctl.c:1435
-#, c-format
-msgid ""
-"\n"
-"Options for start or restart:\n"
-msgstr ""
-"\n"
-"start, restart 때 사용할 수 있는 옵션들:\n"
-
-#: pg_ctl.c:1436
-#, c-format
-msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
-msgstr "  -l, --log 파��름     서버 로그를 � 파�� 기�함\n"
-
-#: pg_ctl.c:1437
-#, c-format
-msgid ""
-"  -o OPTIONS             command line options to pass to postgres\n"
-"                         (PostgreSQL server executable)\n"
-msgstr ""
-"  -o 옵션들              PostgreSQL 서버프로그램� postgres 실행할 때\n"
-"                         사용할 명령행 옵션들\n"
-
-#: pg_ctl.c:1439
-#, c-format
-msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
-msgstr "  -p PATH-TO-POSTGRES    보통� 필요치 않�\n"
-
-#: pg_ctl.c:1441
-#, c-format
-msgid "  -c, --core-files       allow postgres to produce core files\n"
-msgstr "  -c, --core-files       코어 �프 파�� 만듬\n"
-
-#: pg_ctl.c:1443
-#, c-format
-msgid "  -c, --core-files       not applicable on this platform\n"
-msgstr "  -c, --core-files       � 플랫��서는 사용할 수 없�\n"
-
-#: pg_ctl.c:1445
-#, c-format
-msgid ""
-"\n"
-"Options for stop or restart:\n"
-msgstr ""
-"\n"
-"stop, restart 때 사용 할 수 있는 옵션들:\n"
-
-#: pg_ctl.c:1446
-#, c-format
-msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr "  -m 중지방법   \"smart\", \"fast\", \"immediate\" 중 하나\n"
-
-#: pg_ctl.c:1448
-#, c-format
-msgid ""
-"\n"
-"Shutdown modes are:\n"
-msgstr ""
-"\n"
-"중지방법 설명:\n"
-
-#: pg_ctl.c:1449
-#, c-format
-msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  smart       모든 ���언트� 연결� �기게 �면 중지 �\n"
-
-#: pg_ctl.c:1450
-#, c-format
-msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  fast        ���언트� 연결� 강제로 �고 정��으로 중지 �\n"
-
-#: pg_ctl.c:1451
-#, c-format
-msgid ""
-"  immediate   quit without complete shutdown; will lead to recovery on "
-"restart\n"
-msgstr ""
-"  immediate   그냥 무조건 중지함; 다시 시작할 때 복구 작업� 할 수� 있�\n"
-
-#: pg_ctl.c:1453
-#, c-format
-msgid ""
-"\n"
-"Allowed signal names for kill:\n"
-msgstr ""
-"\n"
-"사용할 수 있는 중지용(for kill) 시그� �름:\n"
-
-#: pg_ctl.c:1457
-#, c-format
-msgid ""
-"\n"
-"Options for register and unregister:\n"
-msgstr ""
-"\n"
-"서비스 등�/제거용 옵션들:\n"
-
-#: pg_ctl.c:1458
-#, c-format
-msgid ""
-"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
-msgstr "  -N SERVICENAME  서비스 목�� 등�� PostgreSQL 서비스 �름\n"
-
-#: pg_ctl.c:1459
-#, c-format
-msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
-msgstr "  -P PASSWORD     � 서비스를 실행할 사용�� 비밀번호\n"
-
-#: pg_ctl.c:1460
-#, c-format
-msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
-msgstr "  -U USERNAME     � 서비스를 실행할 사용� �름\n"
-
-#: pg_ctl.c:1463
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"오류보고: <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_ctl.c:1488
-#, c-format
-msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: 잘못� 중지 방법 \"%s\"\n"
-
-#: pg_ctl.c:1521
-#, c-format
-msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: 잘못� 시그� �름 \"%s\"\n"
-
-#: pg_ctl.c:1585
-#, 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"
-
-#: pg_ctl.c:1691
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: 너무 많� 명령행 ��들 (시작 \"%s\")\n"
-
-#: pg_ctl.c:1710
-#, c-format
-msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: kill 작업� 필요한 ��가 빠졌습니다\n"
-
-#: pg_ctl.c:1728
-#, c-format
-msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: 알 수 없는 작업 모드 \"%s\"\n"
-
-#: pg_ctl.c:1738
-#, c-format
-msgid "%s: no operation specified\n"
-msgstr "%s: 수행할 작업� 지정하지 않았습니다\n"
-
-#: pg_ctl.c:1754
-#, c-format
-msgid ""
-"%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: -D 옵션� 없고, PGDATA 환경변수값� 지정�어 있지 않습니다.\n"
-
-#: ../../port/exec.c:192 ../../port/exec.c:306 ../../port/exec.c:349
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "현재 디렉토리를 알 수 없�: %s"
-
-#: ../../port/exec.c:211
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "잘못� �진 파� \"%s\""
-
-#: ../../port/exec.c:260
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "\"%s\" �진 파�� �� 수 없�"
-
-#: ../../port/exec.c:267
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "실행할 \"%s\" 파�� 찾� 수 없�"
-
-#: ../../port/exec.c:322 ../../port/exec.c:358
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "\"%s\" 디렉토리로 �� 할 수 없�"
-
-#: ../../port/exec.c:337
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "\"%s\" 심벌릭 ��를 �� 수 없�"
-
-#: ../../port/exec.c:583
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "하위 프로세스가 종료�었�, 종료 코드 %d"
-
-#: ../../port/exec.c:587
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "0x%X 예외처리로 하위 프로세스가 종료�었�"
-
-#: ../../port/exec.c:596
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "%s 시그� �지로 하위 프로세스가 종료�었�"
-
-#: ../../port/exec.c:599
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "하위 프로세스가 종료�었�, 시그� %d"
-
-#: ../../port/exec.c:603
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "하위 프로세스가 종료�었�, 알수 없는 �태 %d"
diff --git a/src/bin/pg_ctl/po/pl.po b/src/bin/pg_ctl/po/pl.po
new file mode 100644
index 0000000000000..215966c6c3f88
--- /dev/null
+++ b/src/bin/pg_ctl/po/pl.po
@@ -0,0 +1,808 @@
+# Polish message translation file for pg_ctl
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_ctl (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-10-08 08:41+0000\n"
+"PO-Revision-Date: 2011-10-09 17:47+0200\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pg_ctl.c:237 pg_ctl.c:252 pg_ctl.c:2035
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: brak pamięci\n"
+
+#: pg_ctl.c:286
+#, c-format
+msgid "%s: could not open PID file \"%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku PID \"%s\": %s\n"
+
+#: pg_ctl.c:293
+#, c-format
+msgid "%s: invalid data in PID file \"%s\"\n"
+msgstr "%s: niepoprawne dane w pliku PID \"%s\"\n"
+
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+"\n"
+"%s: opcja -w nie jest wspierana przy uruchomieniu serwera pre-9.1\n"
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+"\n"
+"%s: opcja -w nie może używać względnego wskazania katalogu gniazd\n"
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr ""
+"\n"
+"%s: ten folder danych wydaje się być działać pod wcześniejszym postmasterem\n"
+
+#: pg_ctl.c:638
+#, c-format
+msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
+msgstr ""
+"%s: nie można ustawić ograniczenia rozmiaru pliku jądra; zablokowane przez "
+"twardy limit\n"
+
+#: pg_ctl.c:663
+#, c-format
+msgid "%s: could not read file \"%s\"\n"
+msgstr "%s: nie można czytać z pliku \"%s\"\n"
+
+#: pg_ctl.c:668
+#, c-format
+msgid "%s: option file \"%s\" must have exactly one line\n"
+msgstr "%s: plik opcji \"%s\" musi mieć dokładnie jedną linię\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid ""
+"The program \"%s\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"%s\" jest wymagany przez %s ale nie został znaleziony\n"
+"w tym samym folderze co \"%s\".\n"
+"Sprawdź instalację.\n"
+
+#: pg_ctl.c:722
+#, c-format
+msgid ""
+"The program \"%s\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"%s\" został znaleziony przez \"%s\"\n"
+"ale nie jest w tej samej wersji co %s.\n"
+"Sprawdź instalację.\n"
+
+#: pg_ctl.c:755
+#, c-format
+msgid "%s: database system initialization failed\n"
+msgstr "%s: inicjacja systemu bazy danych nie powiodła się\n"
+
+#: pg_ctl.c:770
+#, c-format
+msgid "%s: another server might be running; trying to start server anyway\n"
+msgstr ""
+"%s: inny serwer może być uruchomiony, próba uruchomienia serwera mimo to\n"
+
+#: pg_ctl.c:807
+#, c-format
+msgid "%s: could not start server: exit code was %d\n"
+msgstr "%s: nie można uruchomić serwera: wystąpił kod wyjścia %d\n"
+
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "oczekiwanie na uruchomienie serwera..."
+
+#: pg_ctl.c:819 pg_ctl.c:920 pg_ctl.c:1011
+msgid " done\n"
+msgstr " zakończono\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "uruchomiono serwer\n"
+
+#: pg_ctl.c:823 pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr " oczekiwanie zakończone\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "serwer ciÄ…gle siÄ™ uruchamia\n"
+
+#: pg_ctl.c:828
+#, c-format
+msgid ""
+"%s: could not start server\n"
+"Examine the log output.\n"
+msgstr ""
+"%s: Nie udało się uruchomić serwera\n"
+"Sprawdź logi wyjścia.\n"
+
+#: pg_ctl.c:834 pg_ctl.c:912 pg_ctl.c:1002
+msgid " failed\n"
+msgstr " niepowodzenie\n"
+
+#: pg_ctl.c:835
+#, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s: nie można czekać na serwer z powodu błędnej konfiguracji\n"
+
+#: pg_ctl.c:841
+msgid "server starting\n"
+msgstr "serwer w trakcie uruchamiania\n"
+
+#: pg_ctl.c:856 pg_ctl.c:942 pg_ctl.c:1032 pg_ctl.c:1072
+#, c-format
+msgid "%s: PID file \"%s\" does not exist\n"
+msgstr "%s: plik PID \"%s\" nie istnieje\n"
+
+#: pg_ctl.c:857 pg_ctl.c:944 pg_ctl.c:1033 pg_ctl.c:1073
+msgid "Is server running?\n"
+msgstr "Czy serwer działa?\n"
+
+#: pg_ctl.c:863
+#, c-format
+msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: Nie można zatrzymać serwera; jest uruchomiony serwer pojedynczego "
+"użytkownika (PID: %ld)\n"
+
+#: pg_ctl.c:871 pg_ctl.c:966
+#, c-format
+msgid "%s: could not send stop signal (PID: %ld): %s\n"
+msgstr "%s: nie udało się wysłać sygnału zatrzymującego (PID: %ld): %s\n"
+
+#: pg_ctl.c:878
+msgid "server shutting down\n"
+msgstr "zatrzymywanie serwera\n"
+
+#: pg_ctl.c:893 pg_ctl.c:981
+msgid ""
+"WARNING: online backup mode is active\n"
+"Shutdown will not complete until pg_stop_backup() is called.\n"
+"\n"
+msgstr ""
+"OSTRZEŻENIE: jest aktywny tryb robienia kopii roboczej online\n"
+"Zatrzymanie nie zakończy się póki wywoływana jest pg_stop_backup().\n"
+"\n"
+
+#: pg_ctl.c:897 pg_ctl.c:985
+msgid "waiting for server to shut down..."
+msgstr "oczekiwanie na zatrzymanie serwera..."
+
+#: pg_ctl.c:914 pg_ctl.c:1004
+#, c-format
+msgid "%s: server does not shut down\n"
+msgstr "%s: serwer nie zatrzymał się\n"
+
+#: pg_ctl.c:916 pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"PORADA: Opcja \"-m fast\" rozłącza natychmiast sesje zamiast\n"
+"czekać na odłączenie sesji przez użytkowników.\n"
+
+#: pg_ctl.c:922 pg_ctl.c:1012
+msgid "server stopped\n"
+msgstr "serwer zatrzymany\n"
+
+#: pg_ctl.c:945 pg_ctl.c:1018
+msgid "starting server anyway\n"
+msgstr "uruchomienie serwera mimo wszystko\n"
+
+#: pg_ctl.c:954
+#, c-format
+msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: Nie można zrestartować serwera; jest uruchomiony serwer pojedynczego "
+"użytkownika (PID: %ld)\n"
+
+#: pg_ctl.c:957 pg_ctl.c:1042
+msgid "Please terminate the single-user server and try again.\n"
+msgstr ""
+"Proszę zakończyć działanie serwera pojedynczego użytkownika i spróbować raz "
+"jeszcze.\n"
+
+#: pg_ctl.c:1016
+#, c-format
+msgid "%s: old server process (PID: %ld) seems to be gone\n"
+msgstr "%s: poprzedni proces serwera (PID: %ld) wydaje siÄ™ zginÄ…Å‚\n"
+
+#: pg_ctl.c:1039
+#, c-format
+msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: Nie można przeładować serwera; jest uruchomiony serwer pojedynczego "
+"użytkownika (PID: %ld)\n"
+
+#: pg_ctl.c:1048
+#, c-format
+msgid "%s: could not send reload signal (PID: %ld): %s\n"
+msgstr "%s: nie udało się wysłać sygnału przeładowującego (PID: %ld): %s\n"
+
+#: pg_ctl.c:1053
+#, fuzzy
+msgid "server signaled\n"
+msgstr "uruchomiono serwer\n"
+
+#: pg_ctl.c:1079
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: Nie można rozgłosić serwera; jest uruchomiony serwer pojedynczego "
+"użytkownika (PID: %ld)\n"
+
+#: pg_ctl.c:1088
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s: Nie można rozgłosić serwera; nie jest w trybie gotowości\n"
+
+#: pg_ctl.c:1096
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: nie można utworzyć pliku sygnału rozgłoszenia \"%s\": %s\n"
+
+#: pg_ctl.c:1102
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s: nie można zapisać pliku sygnału rozgłoszenia \"%s\": %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: nie udało się wysłać sygnału rozgłaszającego (PID: %ld): %s\n"
+
+#: pg_ctl.c:1113
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s: nie można usunąć pliku sygnału rozgłoszenia \"%s\": %s\n"
+
+#: pg_ctl.c:1118
+msgid "server promoting\n"
+msgstr "serwer w trakcie rozgłaszania\n"
+
+#: pg_ctl.c:1163
+#, c-format
+msgid "%s: single-user server is running (PID: %ld)\n"
+msgstr "%s: jest uruchomiony serwer pojedynczego użytkownika (PID: %ld)\n"
+
+#: pg_ctl.c:1175
+#, c-format
+msgid "%s: server is running (PID: %ld)\n"
+msgstr "%s: jest uruchomiony serwer (PID: %ld)\n"
+
+#: pg_ctl.c:1186
+#, c-format
+msgid "%s: no server running\n"
+msgstr "%s: brak uruchomionego serwera\n"
+
+#: pg_ctl.c:1197
+#, c-format
+msgid "%s: could not send signal %d (PID: %ld): %s\n"
+msgstr "%s: nie udało się wysłać sygnału %d (PID: %ld): %s\n"
+
+#: pg_ctl.c:1231
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: nie udało się znaleźć własnego programu wykonywalnego\n"
+
+#: pg_ctl.c:1241
+#, c-format
+msgid "%s: could not find postgres program executable\n"
+msgstr "%s: nie udało się znaleźć programu wykonywalnego postgresa\n"
+
+#: pg_ctl.c:1306 pg_ctl.c:1338
+#, c-format
+msgid "%s: could not open service manager\n"
+msgstr "%s: nie udało się otworzyć menadżera usług\n"
+
+#: pg_ctl.c:1312
+#, c-format
+msgid "%s: service \"%s\" already registered\n"
+msgstr "%s: usługa \"%s\" jest już zarejestrowana\n"
+
+#: pg_ctl.c:1323
+#, c-format
+msgid "%s: could not register service \"%s\": error code %d\n"
+msgstr "%s: nie udało się zarejestrować usługi \"%s\": kod błędu %d\n"
+
+#: pg_ctl.c:1344
+#, c-format
+msgid "%s: service \"%s\" not registered\n"
+msgstr "%s: usługa \"%s\" niezarejestrowana\n"
+
+#: pg_ctl.c:1351
+#, c-format
+msgid "%s: could not open service \"%s\": error code %d\n"
+msgstr "%s: nie udało się otworzyć usługi \"%s\": kod błędu %d\n"
+
+#: pg_ctl.c:1358
+#, c-format
+msgid "%s: could not unregister service \"%s\": error code %d\n"
+msgstr "%s: nie udało się wyrejestrować usługi \"%s\": kod błędu %d\n"
+
+#: pg_ctl.c:1444
+msgid "Waiting for server startup...\n"
+msgstr "Oczekiwanie na uruchomienie serwera...\n"
+
+#: pg_ctl.c:1447
+msgid "Timed out waiting for server startup\n"
+msgstr "MinÄ…Å‚ czas oczekiwania na uruchomienie serwera\n"
+
+#: pg_ctl.c:1451
+msgid "Server started and accepting connections\n"
+msgstr "Serwer uruchomiony i akceptuje połączenia\n"
+
+#: pg_ctl.c:1501
+#, c-format
+msgid "%s: could not start service \"%s\": error code %d\n"
+msgstr "%s: nie udało się uruchomić usługi \"%s\": kod błędu %d\n"
+
+#: pg_ctl.c:1573
+#, 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"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s: nie udało się otworzyć tokena procesu: %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s: nie udało się przydzielić SIDów: kod błędu %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s: nie udało się utworzyć ograniczonego tokena: %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr ""
+"%s: OSTRZEŻENIE: nie może zlokalizować wszystkich funkcji obiektów zadań w "
+"systemowym API\n"
+
+#: pg_ctl.c:1738
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: pg_ctl.c:1746
+#, c-format
+msgid ""
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s jest narzędziem do inicjacji, uruchamiania, zatrzymywania i kontroli "
+"serwera PostgreSQL.\n"
+"\n"
+
+#: pg_ctl.c:1747
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: pg_ctl.c:1748
+#, c-format
+msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr "  %s init[db]               [-D KATDANE] [-s] [-o \"OPCJE\"]\n"
+
+#: pg_ctl.c:1749
+#, c-format
+msgid ""
+"  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
+"\"]\n"
+msgstr ""
+"  %s start   [-w] [-t SEKUNDY] [-D KATDANE] [-s] [-l NAZWAPLIKU] [-o \"OPCJE"
+"\"]\n"
+
+#: pg_ctl.c:1750
+#, c-format
+msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr ""
+"  %s stop    [-W] [-t SEKUNDY] [-D KATDANE] [-s] [-m TRYB-ZAMKNIECIA]\n"
+
+#: pg_ctl.c:1751
+#, c-format
+msgid ""
+"  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+"                 [-o \"OPTIONS\"]\n"
+msgstr ""
+"  %s restart [-w] [-t SEKUNDY] [-D KATDANE] [-s] [-m TRYB-ZAMKNIECIA]\n"
+"                 [-o \"OPCJE\"]\n"
+
+#: pg_ctl.c:1753
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D KATDANE] [-s]\n"
+
+#: pg_ctl.c:1754
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D KATDANE]\n"
+
+#: pg_ctl.c:1755
+#, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s promote [-D KATDANE] [-s]\n"
+
+#: pg_ctl.c:1756
+#, c-format
+msgid "  %s kill    SIGNALNAME PID\n"
+msgstr "  %s kill    NAZWASYGNA�U PID\n"
+
+#: pg_ctl.c:1758
+#, c-format
+msgid ""
+"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+msgstr ""
+"  %s register   [-N NAZWAUSLUGI] [-U USERNAME] [-P PASSWORD] [-D KATDANE]\n"
+"                    [-S TYP-STARTU] [-w] [-t SEKUNDY] [-o \"OPCJE\"]\n"
+
+#: pg_ctl.c:1760
+#, c-format
+msgid "  %s unregister [-N SERVICENAME]\n"
+msgstr "  %s unregister [-N NAZWAUSLUGI]\n"
+
+#: pg_ctl.c:1763
+#, c-format
+msgid ""
+"\n"
+"Common options:\n"
+msgstr ""
+"\n"
+"Opcje ogólne:\n"
+
+#: pg_ctl.c:1764
+#, c-format
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr ""
+"  -D, --pgdata KATDANE   położenie miejsca przechowywania bazy danych\n"
+
+#: pg_ctl.c:1765
+#, c-format
+msgid "  -s, --silent           only print errors, no informational messages\n"
+msgstr ""
+"  -s, --silent           wypisz tylko błędy, bez komunikatów informacyjnych\n"
+
+#: pg_ctl.c:1766
+#, c-format
+msgid "  -t SECS                seconds to wait when using -w option\n"
+msgstr "  -t SEKUNDY             sekundy oczekiwania podczas użycia opcji -w\n"
+
+#: pg_ctl.c:1767
+#, c-format
+msgid "  -w                     wait until operation completes\n"
+msgstr "  -w                     czekaj na zakończenie operacji\n"
+
+#: pg_ctl.c:1768
+#, c-format
+msgid "  -W                     do not wait until operation completes\n"
+msgstr "  -W                     nie czekaj na zakończenie operacji\n"
+
+#: pg_ctl.c:1769
+#, c-format
+msgid "  --help                 show this help, then exit\n"
+msgstr "  --help                 pokazuje ten ekran pomocy i kończy\n"
+
+#: pg_ctl.c:1770
+#, c-format
+msgid "  --version              output version information, then exit\n"
+msgstr "  --version              pokazuje informacje o wersji i kończy\n"
+
+#: pg_ctl.c:1771
+#, c-format
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(Oczekiwanie jest domyślne dla zamknięcia, ale nie dla uruchomienia i "
+"restartu.)\n"
+"\n"
+
+#: pg_ctl.c:1772
+#, c-format
+msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
+msgstr "Jeśli nie jest podana -D, używana jest zmienna środowiskowa PGDATA.\n"
+
+#: pg_ctl.c:1774
+#, c-format
+msgid ""
+"\n"
+"Options for start or restart:\n"
+msgstr ""
+"\n"
+"Opcje uruchomienia lub restartu:\n"
+
+#: pg_ctl.c:1776
+#, c-format
+msgid "  -c, --core-files       allow postgres to produce core files\n"
+msgstr "  -c, --core-files       zezwól postgresowi utworzyć pliki jądra\n"
+
+#: pg_ctl.c:1778
+#, c-format
+msgid "  -c, --core-files       not applicable on this platform\n"
+msgstr "  -c, --core-files       niedostępne na tej platformie\n"
+
+#: pg_ctl.c:1780
+#, c-format
+msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
+msgstr ""
+"  -l, --log NAZWAPLIKU   zapisuje (lub dodaje) komunikaty serwera do "
+"NAZWAPLIKU\n"
+
+#: pg_ctl.c:1781
+#, c-format
+msgid ""
+"  -o OPTIONS             command line options to pass to postgres\n"
+"                         (PostgreSQL server executable) or initdb\n"
+msgstr ""
+"  -o OPCJE               opcje wiersza poleceń przekazywanych postgresowi\n"
+"                         (program wykonywalny PostgreSQL) lub initdb\n"
+
+#: pg_ctl.c:1783
+#, c-format
+msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
+msgstr "  -p ŚCIEŻKA-DO-POSTGRES    zwykle niekonieczna\n"
+
+#: pg_ctl.c:1784
+#, c-format
+msgid ""
+"\n"
+"Options for stop or restart:\n"
+msgstr ""
+"\n"
+"Opcje dla zatrzymania lub restartu:\n"
+
+#: pg_ctl.c:1785
+#, c-format
+msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
+msgstr ""
+"  -m TRYB-ZAMKNIECIA    \n"
+"                     może być \"smart\", \"fast\" lub \"immediate\"\n"
+
+#: pg_ctl.c:1787
+#, c-format
+msgid ""
+"\n"
+"Shutdown modes are:\n"
+msgstr ""
+"\n"
+"Tryby zamknięcia to:\n"
+
+#: pg_ctl.c:1788
+#, c-format
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       wyjście po rozłączeniu się wszystkich klientów\n"
+
+#: pg_ctl.c:1789
+#, c-format
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        bezpośrednie wyjście, z właściwym zamknięciem\n"
+
+#: pg_ctl.c:1790
+#, c-format
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on "
+"restart\n"
+msgstr ""
+"  immediate   wyjście bez pełnego zamknięcia; doprowadzi do odzyskiwania "
+"przy restarcie\n"
+
+#: pg_ctl.c:1792
+#, c-format
+msgid ""
+"\n"
+"Allowed signal names for kill:\n"
+msgstr ""
+"\n"
+"Dopuszczalne nazwy sygnałów dla zabicia:\n"
+
+#: pg_ctl.c:1796
+#, c-format
+msgid ""
+"\n"
+"Options for register and unregister:\n"
+msgstr ""
+"\n"
+"Opcje rejestracji i wyrejestrowania:\n"
+
+#: pg_ctl.c:1797
+#, c-format
+msgid ""
+"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
+msgstr ""
+"  -N SERVICENAME  nazwa usługi, na której rejestruje się serwer PostgreSQL\n"
+
+#: pg_ctl.c:1798
+#, c-format
+msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
+msgstr "  -P PASSWORD     hasło konta rejestracji serwera PostgreSQL\n"
+
+#: pg_ctl.c:1799
+#, c-format
+msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
+msgstr ""
+"  -U USERNAME     nazwa użytkownika konta rejestracji serwera PostgreSQL\n"
+
+#: pg_ctl.c:1800
+#, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr "  -S TYP-STARTU   typ startu usługi rejestracji serwera PostgreSQL\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Rodzaje startu to:\n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid ""
+"  auto       start service automatically during system startup (default)\n"
+msgstr ""
+"  auto       uruchamia usługę automatycznie w czasie startu systemu "
+"(domyślnie)\n"
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr "  demand     uruchamia usługę na żądanie\n"
+
+#: pg_ctl.c:1807
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1832
+#, c-format
+msgid "%s: unrecognized shutdown mode \"%s\"\n"
+msgstr "%s: nierozpoznany tryb wyłączenia \"%s\"\n"
+
+#: pg_ctl.c:1865
+#, c-format
+msgid "%s: unrecognized signal name \"%s\"\n"
+msgstr "%s: nierozpoznana nazwa sygnału \"%s\"\n"
+
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: nierozpoznany tryb uruchomienia \"%s\"\n"
+
+#: pg_ctl.c:1947
+#, 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: nie można uruchomić jako root\n"
+"Proszę zalogować się (używając np: \"su\") na (nieuprzywilejowanego) "
+"użytkownika który\n"
+"będzie właścicielem procesu.\n"
+
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: opcja -S nieobsługiwana na tej platformie\n"
+
+#: pg_ctl.c:2065
+#, 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"
+
+#: pg_ctl.c:2089
+#, c-format
+msgid "%s: missing arguments for kill mode\n"
+msgstr "%s: nie wskazano wszystkich argumentów trybu zabicia\n"
+
+#: pg_ctl.c:2107
+#, c-format
+msgid "%s: unrecognized operation mode \"%s\"\n"
+msgstr "%s: nierozpoznany tryb autoryzacji \"%s\"\n"
+
+#: pg_ctl.c:2117
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: nie podano operacji\n"
+
+#: pg_ctl.c:2133
+#, c-format
+msgid ""
+"%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr ""
+"%s: nie wskazano folderu bazy danych ani nie ustawiono zmiennej środowiska "
+"PGDATA\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nie można zidentyfikować aktualnego katalogu: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "niepoprawny binarny \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nie można odczytać binarnego \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nie znaleziono \"%s\" do wykonania"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nie można odczytać linku symbolicznego \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "proces potomny zakończył działanie z kodem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "proces potomny został zatrzymany przez wyjątek 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "proces potomny został zatrzymany przez sygnał %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "proces potomny został zakończony przez sygnał %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
diff --git a/src/bin/pg_ctl/po/pt_BR.po b/src/bin/pg_ctl/po/pt_BR.po
index b574964bef7bb..4e52d6ac2275d 100644
--- a/src/bin/pg_ctl/po/pt_BR.po
+++ b/src/bin/pg_ctl/po/pt_BR.po
@@ -1,53 +1,81 @@
 # Brazilian Portuguese message translation file for pg_ctl
 # 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>, 2004-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2004-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-05-08 21:45-0300\n"
+"POT-Creation-Date: 2011-09-06 04:54+0000\n"
 "PO-Revision-Date: 2005-10-04 22:15-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:225 pg_ctl.c:240 pg_ctl.c:1834
+#: pg_ctl.c:237 pg_ctl.c:252 pg_ctl.c:2035
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:286
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo do PID \"%s\": %s\n"
 
-#: pg_ctl.c:281
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: dado inválido no arquivo do PID \"%s\"\n"
 
-#: pg_ctl.c:557
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+"\n"
+"%s: opção -w não é suportada ao iniciar um servidor anterior a 9.1\n"
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+"\n"
+"%s: opção -w não pode utilizar uma especificação de diretório de soquete relativa\n"
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr ""
+"\n"
+"%s: este diretório de dados parece já estar executando um postmaster\n"
+
+#: pg_ctl.c:638
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr ""
 "%s: não pode definir tamanho limite do arquivo core; não é permitido pelo "
 "limite superior\n"
 
-#: pg_ctl.c:582
+#: pg_ctl.c:663
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: não pôde ler arquivo \"%s\"\n"
 
-#: pg_ctl.c:587
+#: pg_ctl.c:668
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: arquivo de opções \"%s\" deve ter exatamente uma linha\n"
 
-#: pg_ctl.c:635
+#: pg_ctl.c:716
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -58,7 +86,7 @@ msgstr ""
 "mesmo diretório que \"%s\".\n"
 "Verifique sua instalação.\n"
 
-#: pg_ctl.c:641
+#: pg_ctl.c:722
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -69,24 +97,44 @@ msgstr ""
 "mas não tem a mesma versão que %s.\n"
 "Verifique sua instalação.\n"
 
-#: pg_ctl.c:674
+#: pg_ctl.c:755
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: inicialização do sistema de banco de dados falhou\n"
 
-#: pg_ctl.c:690
+#: pg_ctl.c:770
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr ""
 "%s: outro servidor pode estar executando; tentando iniciar o servidor assim "
 "mesmo\n"
 
-#: pg_ctl.c:727
+#: pg_ctl.c:807
 #, c-format
 msgid "%s: could not start server: exit code was %d\n"
 msgstr "%s: não pôde iniciar o servidor: código de saída foi %d\n"
 
-#: pg_ctl.c:738 pg_ctl.c:751
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "esperando o servidor iniciar..."
+
+#: pg_ctl.c:819 pg_ctl.c:920 pg_ctl.c:1011
+msgid " done\n"
+msgstr "feito\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "servidor iniciado\n"
+
+#: pg_ctl.c:823 pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr "parou de esperar\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "servidor ainda está iniciando\n"
+
+#: pg_ctl.c:828
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -95,48 +143,45 @@ msgstr ""
 "%s: não pode iniciar o servidor\n"
 "Examine o arquivo de log.\n"
 
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "esperando o servidor iniciar..."
-
-#: pg_ctl.c:758 pg_ctl.c:831 pg_ctl.c:911
-msgid " done\n"
-msgstr "feito\n"
+#: pg_ctl.c:834 pg_ctl.c:912 pg_ctl.c:1002
+msgid " failed\n"
+msgstr "falhou\n"
 
-#: pg_ctl.c:759
-msgid "server started\n"
-msgstr "servidor iniciado\n"
+#: pg_ctl.c:835
+#, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s: não pôde esperar pelo servidor por causa de configuração errada\n"
 
-#: pg_ctl.c:763
+#: pg_ctl.c:841
 msgid "server starting\n"
 msgstr "servidor está iniciando\n"
 
-#: pg_ctl.c:778 pg_ctl.c:853 pg_ctl.c:933
+#: pg_ctl.c:856 pg_ctl.c:942 pg_ctl.c:1032 pg_ctl.c:1072
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: arquivo do PID \"%s\" não existe\n"
 
-#: pg_ctl.c:779 pg_ctl.c:855 pg_ctl.c:934
+#: pg_ctl.c:857 pg_ctl.c:944 pg_ctl.c:1033 pg_ctl.c:1073
 msgid "Is server running?\n"
 msgstr "O servidor está executando?\n"
 
-#: pg_ctl.c:785
+#: pg_ctl.c:863
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr ""
-"%s: não pode parar servidor; servidor monousuário está executando (PID: %"
-"ld)\n"
+"%s: não pode parar servidor; servidor monousuário está executando (PID: "
+"%ld)\n"
 
-#: pg_ctl.c:793 pg_ctl.c:877
+#: pg_ctl.c:871 pg_ctl.c:966
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: não pôde enviar sinal de parada (PID: %ld): %s\n"
 
-#: pg_ctl.c:800
+#: pg_ctl.c:878
 msgid "server shutting down\n"
 msgstr "servidor está desligando\n"
 
-#: pg_ctl.c:807 pg_ctl.c:884
+#: pg_ctl.c:893 pg_ctl.c:981
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -145,165 +190,226 @@ msgstr ""
 "AVISO: modo cópia de segurança online está ativo\n"
 "Desligamento não completará até que pg_stop_backup() seja chamado.\n"
 
-#: pg_ctl.c:811 pg_ctl.c:888
+#: pg_ctl.c:897 pg_ctl.c:985
 msgid "waiting for server to shut down..."
 msgstr "esperando o servidor desligar..."
 
-#: pg_ctl.c:826 pg_ctl.c:905
-msgid " failed\n"
-msgstr "falhou\n"
-
-#: pg_ctl.c:828 pg_ctl.c:907
+#: pg_ctl.c:914 pg_ctl.c:1004
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: servidor não desligou\n"
 
-#: pg_ctl.c:833 pg_ctl.c:912
+#: pg_ctl.c:916 pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"DICA: A opção \"-m fast\" desconecta imediatamente sessões ao invés de "
+"esperar pela desconexão das sessões iniciadas.\n"
+
+#: pg_ctl.c:922 pg_ctl.c:1012
 msgid "server stopped\n"
 msgstr "servidor está parado\n"
 
-#: pg_ctl.c:856 pg_ctl.c:918
+#: pg_ctl.c:945 pg_ctl.c:1018
 msgid "starting server anyway\n"
 msgstr "iniciando servidor mesmo assim\n"
 
-#: pg_ctl.c:865
+#: pg_ctl.c:954
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr ""
-"%s: não pode reiniciar servidor; servidor monousuário está executando (PID: %"
-"ld)\n"
+"%s: não pode reiniciar servidor; servidor monousuário está executando (PID: "
+"%ld)\n"
 
-#: pg_ctl.c:868 pg_ctl.c:943
+#: pg_ctl.c:957 pg_ctl.c:1042
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Por favor finalize o servidor monousuário e tente novamente.\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:1016
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s: processo servidor antigo (PID: %ld) parece estar terminado\n"
 
-#: pg_ctl.c:940
+#: pg_ctl.c:1039
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr ""
 "%s: não pode recarregar servidor; servidor monousuário está executando (PID: "
 "%ld)\n"
 
-#: pg_ctl.c:949
+#: pg_ctl.c:1048
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: não pôde enviar sinal de recarga (PID: %ld): %s\n"
 
-#: pg_ctl.c:954
+#: pg_ctl.c:1053
 msgid "server signaled\n"
 msgstr "servidor foi sinalizado\n"
 
-#: pg_ctl.c:998
+#: pg_ctl.c:1079
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr ""
+"%s: não pode promover servidor; servidor monousuário está executando (PID: "
+"%ld)\n"
+
+#: pg_ctl.c:1088
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s: não pode promover servidor; servidor não está no modo em espera\n"
+
+#: pg_ctl.c:1096
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: não pôde criar arquivo para sinal de promoção \"%s\": %s\n"
+
+#: pg_ctl.c:1102
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s: não pôde escrever no arquivo para sinal de promoção \"%s\": %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: não pôde enviar sinal de promoção (PID: %ld): %s\n"
+
+#: pg_ctl.c:1113
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s: não pôde remover arquivo para sinal de promoção \"%s\": %s\n"
+
+#: pg_ctl.c:1118
+msgid "server promoting\n"
+msgstr "servidor está sendo promovido\n"
+
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s: servidor monousuário está executando (PID: %ld)\n"
 
-#: pg_ctl.c:1010
+#: pg_ctl.c:1175
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: servidor está executando (PID: %ld)\n"
 
-#: pg_ctl.c:1021
+#: pg_ctl.c:1186
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: nenhum servidor está executando\n"
 
-#: pg_ctl.c:1032
+#: pg_ctl.c:1197
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: não pôde enviar sinal %d (PID: %ld): %s\n"
 
-#: pg_ctl.c:1066
+#: pg_ctl.c:1231
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s: não pôde encontrar executável\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1241
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: não pôde encontrar o programa executável do postgres\n"
 
-#: pg_ctl.c:1138 pg_ctl.c:1170
+#: pg_ctl.c:1306 pg_ctl.c:1338
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: não pôde abrir gerenciador de serviço\n"
 
-#: pg_ctl.c:1144
+#: pg_ctl.c:1312
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: serviço \"%s\" já está registrado\n"
 
-#: pg_ctl.c:1155
+#: pg_ctl.c:1323
 #, c-format
 msgid "%s: could not register service \"%s\": error code %d\n"
 msgstr "%s: não pôde registrar serviço \"%s\": código de erro %d\n"
 
-#: pg_ctl.c:1176
+#: pg_ctl.c:1344
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: serviço \"%s\" não está registrado\n"
 
-#: pg_ctl.c:1183
+#: pg_ctl.c:1351
 #, c-format
 msgid "%s: could not open service \"%s\": error code %d\n"
 msgstr "%s: não pôde abrir serviço \"%s\": código de erro %d\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1358
 #, c-format
 msgid "%s: could not unregister service \"%s\": error code %d\n"
 msgstr "%s: não pôde remover registro do serviço \"%s\": código de erro %d\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1444
 msgid "Waiting for server startup...\n"
 msgstr "Esperando o servidor iniciar...\n"
 
-#: pg_ctl.c:1279
+#: pg_ctl.c:1447
 msgid "Timed out waiting for server startup\n"
 msgstr "Tempo de espera esgotado para início do servidor\n"
 
-#: pg_ctl.c:1283
+#: pg_ctl.c:1451
 msgid "Server started and accepting connections\n"
 msgstr "Servidor foi iniciado e está aceitando conexões\n"
 
-#: pg_ctl.c:1333
+#: pg_ctl.c:1501
 #, c-format
 msgid "%s: could not start service \"%s\": error code %d\n"
 msgstr "%s: não pôde iniciar serviço \"%s\": código de erro %d\n"
 
-#: pg_ctl.c:1568
+#: pg_ctl.c:1573
+#, 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"
+
+#: pg_ctl.c:1582
+#, c-format
+msgid "%s: could not open process token: %lu\n"
+msgstr "%s: não pôde abrir informação sobre processo: %lu\n"
+
+#: pg_ctl.c:1595
+#, c-format
+msgid "%s: could not allocate SIDs: %lu\n"
+msgstr "%s: não pôde alocar SIDs: %lu\n"
+
+#: pg_ctl.c:1614
+#, c-format
+msgid "%s: could not create restricted token: %lu\n"
+msgstr "%s: não pôde criar informação restrita: %lu\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr "%s: AVISO: não pôde localizar todas funções job object na API do sistema\n"
+
+#: pg_ctl.c:1738
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: pg_ctl.c:1576
+#: pg_ctl.c:1746
 #, c-format
 msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s é um utilitário que inicia, para, reinicia, recarrega arquivos de "
-"configuração,\n"
-"relata o estado do servidor PostgreSQL ou envia um sinal a um processo do "
+"%s é um utilitário para inicializar, iniciar, parar e controlar um servidor "
 "PostgreSQL.\n"
-"\n"
 
-#: pg_ctl.c:1578
+#: pg_ctl.c:1747
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: pg_ctl.c:1579
+#: pg_ctl.c:1748
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]               [-D DIRDADOS] [-s] [-o \"OPÇÕES\"]\n"
 
-#: pg_ctl.c:1580
+#: pg_ctl.c:1749
 #, c-format
 msgid ""
 "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -311,13 +417,13 @@ msgid ""
 msgstr ""
 "  %s start   [-w] [-t SEGS] [-D DIRDADOS] [-s] [-l ARQUIVO] [-o \"OPÇÕES\"]\n"
 
-#: pg_ctl.c:1581
+#: pg_ctl.c:1750
 #, c-format
 msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr ""
 "  %s stop    [-W] [-t SEGS] [-D DIRDADOS] [-s] [-m MODO-DESLIGAMENTO]\n"
 
-#: pg_ctl.c:1582
+#: pg_ctl.c:1751
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -326,36 +432,41 @@ msgstr ""
 "  %s restart [-w] [-t SEGS] [-D DIRDADOS] [-s] [-m MODO-DESLIGAMENTO]\n"
 "                 [-o \"OPÇÕES\"]\n"
 
-#: pg_ctl.c:1584
+#: pg_ctl.c:1753
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DIRDADOS] [-s]\n"
 
-#: pg_ctl.c:1585
+#: pg_ctl.c:1754
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DIRDADOS]\n"
 
-#: pg_ctl.c:1586
+#: pg_ctl.c:1755
+#, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s promote  [-D DIRDADOS] [-s]\n"
+
+#: pg_ctl.c:1756
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    NOME_SINAL PID\n"
 
-#: pg_ctl.c:1588
+#: pg_ctl.c:1758
 #, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s register   [-N NOME_SERVIÇO] [-U USU�RIO] [-P SENHA] [-D DIRDADOS]\n"
-"                    [-w] [-t SEGS] [-o \"OPÇÕES\"]\n"
+"                    [-S TIPO-IN�CIO] [-w] [-t SEGS] [-o \"OPÇÕES\"]\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1760
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N NOME_SERVIÇO]\n"
 
-#: pg_ctl.c:1593
+#: pg_ctl.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -364,46 +475,46 @@ msgstr ""
 "\n"
 "Opções comuns:\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1764
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr ""
 "  -D, --pgdata DIRDADOS  local da área de armazenamento dos bancos de dados\n"
 
-#: pg_ctl.c:1595
+#: pg_ctl.c:1765
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
 "  -s, --silent           mostra somente erros, nenhuma mensagem informativa\n"
 
-#: pg_ctl.c:1596
+#: pg_ctl.c:1766
 #, c-format
 msgid "  -t SECS                seconds to wait when using -w option\n"
 msgstr ""
 "  -t SEGS                segundos a esperar quando a opção -w for utilizada\n"
 
-#: pg_ctl.c:1597
+#: pg_ctl.c:1767
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     espera até que a operação seja completada\n"
 
-#: pg_ctl.c:1598
+#: pg_ctl.c:1768
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr ""
 "  -W                     não espera até que a operação seja completada\n"
 
-#: pg_ctl.c:1599
+#: pg_ctl.c:1769
 #, c-format
 msgid "  --help                 show this help, then exit\n"
 msgstr "  --help                 mostra esta ajuda e termina\n"
 
-#: pg_ctl.c:1600
+#: pg_ctl.c:1770
 #, c-format
 msgid "  --version              output version information, then exit\n"
 msgstr "  --version              mostra informação sobre a versão e termina\n"
 
-#: pg_ctl.c:1601
+#: pg_ctl.c:1771
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -412,13 +523,13 @@ msgstr ""
 "(O padrão é esperar o desligamento, mas não para início ou reinício).\n"
 "\n"
 
-#: pg_ctl.c:1602
+#: pg_ctl.c:1772
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr ""
 "Se a opção -D for omitida, a variável de ambiente PGDATA é utilizada.\n"
 
-#: pg_ctl.c:1604
+#: pg_ctl.c:1774
 #, c-format
 msgid ""
 "\n"
@@ -427,24 +538,24 @@ msgstr ""
 "\n"
 "Opções para início ou reinício:\n"
 
-#: pg_ctl.c:1606
+#: pg_ctl.c:1776
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       permite o postgres produzir arquivos core\n"
 
-#: pg_ctl.c:1608
+#: pg_ctl.c:1778
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       não é aplicável a esta plataforma\n"
 
-#: pg_ctl.c:1610
+#: pg_ctl.c:1780
 #, c-format
 msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log ARQUIVO      escreve (ou concatena) log do servidor para "
 "ARQUIVO\n"
 
-#: pg_ctl.c:1611
+#: pg_ctl.c:1781
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -454,12 +565,12 @@ msgstr ""
 "postgres\n"
 "                         (executável do servidor PostgreSQL) ou initdb\n"
 
-#: pg_ctl.c:1613
+#: pg_ctl.c:1783
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p CAMINHO-DO-POSTGRES normalmente não é necessário\n"
 
-#: pg_ctl.c:1614
+#: pg_ctl.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -468,13 +579,13 @@ msgstr ""
 "\n"
 "Opções para desligar ou reiniciar:\n"
 
-#: pg_ctl.c:1615
+#: pg_ctl.c:1785
 #, c-format
 msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
 "  -m MODO-DESLIGAMENTO   pode ser \"smart\", \"fast\" ou \"immediate\"\n"
 
-#: pg_ctl.c:1617
+#: pg_ctl.c:1787
 #, c-format
 msgid ""
 "\n"
@@ -483,17 +594,17 @@ msgstr ""
 "\n"
 "Modos de desligamento são:\n"
 
-#: pg_ctl.c:1618
+#: pg_ctl.c:1788
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       termina depois que todos os clientes desconectarem\n"
 
-#: pg_ctl.c:1619
+#: pg_ctl.c:1789
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        termina diretamente, com desligamento apropriado\n"
 
-#: pg_ctl.c:1620
+#: pg_ctl.c:1790
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -502,7 +613,7 @@ msgstr ""
 "  immediate   termina sem desligamento completo; conduzirá a uma recuperação "
 "durante o reinício\n"
 
-#: pg_ctl.c:1622
+#: pg_ctl.c:1792
 #, c-format
 msgid ""
 "\n"
@@ -511,7 +622,7 @@ msgstr ""
 "\n"
 "Sinais permitidos para sinalização:\n"
 
-#: pg_ctl.c:1626
+#: pg_ctl.c:1796
 #, c-format
 msgid ""
 "\n"
@@ -520,7 +631,7 @@ msgstr ""
 "\n"
 "Opções para registrar ou remover registro:\n"
 
-#: pg_ctl.c:1627
+#: pg_ctl.c:1797
 #, c-format
 msgid ""
 "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
@@ -528,18 +639,47 @@ msgstr ""
 "  -N NOME_SERVIÇO nome do serviço no qual se registrou o servidor "
 "PostgreSQL\n"
 
-#: pg_ctl.c:1628
+#: pg_ctl.c:1798
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr "  -P SENHA        senha da conta que registrou o servidor PostgreSQL\n"
 
-#: pg_ctl.c:1629
+#: pg_ctl.c:1799
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr ""
 "  -U USU�RIO      nome do usuário que registrou o servidor PostgreSQL\n"
 
-#: pg_ctl.c:1632
+#: pg_ctl.c:1800
+#, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr ""
+"  -S TIPO-IN�CIO  tipo de início do serviço para registrar o servidor "
+"PostgreSQL\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Tipos de início são:\n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid ""
+"  auto       start service automatically during system startup (default)\n"
+msgstr ""
+"  auto       inicia serviço automaticamente durante a inicialização do "
+"sistema (padrão)\n"
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr "  demand     inicia serviço sob demanda\n"
+
+#: pg_ctl.c:1807
 #, c-format
 msgid ""
 "\n"
@@ -548,17 +688,22 @@ msgstr ""
 "\n"
 "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1657
+#: pg_ctl.c:1832
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: modo de desligamento \"%s\" desconhecido\n"
 
-#: pg_ctl.c:1690
+#: pg_ctl.c:1865
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: nome de sinal \"%s\" desconhecido\n"
 
-#: pg_ctl.c:1755
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: tipo de início \"%s\" desconhecido\n"
+
+#: pg_ctl.c:1947
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -569,27 +714,32 @@ msgstr ""
 "Por favor entre (utilizando \"su\") como um usuário (sem privilégios) que\n"
 "será o dono do processo do servidor.\n"
 
-#: pg_ctl.c:1864
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: opção -S não é suportada nessa plataforma\n"
+
+#: pg_ctl.c:2065
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: muitos argumentos de linha de comando (primeiro é \"%s\")\n"
 
-#: pg_ctl.c:1886
+#: pg_ctl.c:2089
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: faltando argumento para modo kill\n"
 
-#: pg_ctl.c:1904
+#: pg_ctl.c:2107
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: modo de operação \"%s\" é desconhecido\n"
 
-#: pg_ctl.c:1914
+#: pg_ctl.c:2117
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: nenhuma operação especificada\n"
 
-#: pg_ctl.c:1930
+#: pg_ctl.c:2133
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
@@ -627,27 +777,27 @@ msgstr "não pôde mudar diretório para \"%s\""
 msgid "could not read symbolic link \"%s\""
 msgstr "não pôde ler link simbólico \"%s\""
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "processo filho terminou com código de saída %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "processo filho foi terminado pela exceção 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "processo filho foi terminado pelo sinal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "processo filho foi terminado pelo sinal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
diff --git a/src/bin/pg_ctl/po/sv.po b/src/bin/pg_ctl/po/sv.po
deleted file mode 100644
index 496f142822b00..0000000000000
--- a/src/bin/pg_ctl/po/sv.po
+++ /dev/null
@@ -1,636 +0,0 @@
-# Swedish message translation file for pg_ctl
-# Dennis Björklund <db@zigo.dhs.org>, 2004, 2005, 2006.
-#
-# Use these quotes: "%s"
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-02 05:22+0000\n"
-"PO-Revision-Date: 2010-07-02 13:19-0400\n"
-"Last-Translator: Magnus Hagander <magnus@hagander.net>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: pg_ctl.c:225 pg_ctl.c:240 pg_ctl.c:1834
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: slut på minnet\n"
-
-#: pg_ctl.c:274
-#, c-format
-msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: kunde inte öppna PID-fil \"%s\": %s\n"
-
-#: pg_ctl.c:281
-#, c-format
-msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: ogiltig data i PID-fil \"%s\"\n"
-
-#: pg_ctl.c:557
-#, c-format
-msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr ""
-"%s: kan inte sätta storlek på core-fil; förbjudet av hård begränsning\n"
-
-#: pg_ctl.c:582
-#, c-format
-msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: kunde inte läsa filen \"%s\"\n"
-
-#: pg_ctl.c:587
-#, c-format
-msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: inställningsfilen \"%s\" måste ha precis en rad\n"
-
-#: pg_ctl.c:635
-#, c-format
-msgid ""
-"The program \"%s\" is needed by %s but was not found in the\n"
-"same directory as \"%s\".\n"
-"Check your installation.\n"
-msgstr ""
-"Programmet \"%s\" behövs av %s men hittades inte i samma\n"
-"katalog som \"%s\".\n"
-"Kontrollera din installation.\n"
-
-#: pg_ctl.c:641
-#, c-format
-msgid ""
-"The program \"%s\" was found by \"%s\"\n"
-"but was not the same version as %s.\n"
-"Check your installation.\n"
-msgstr ""
-"Programmet \"%s\" hittades av \"%s\"\n"
-"men är inte samma version som %s.\n"
-"Kontrollera din installation.\n"
-
-#: pg_ctl.c:674
-#, fuzzy, c-format
-msgid "%s: database system initialization failed\n"
-msgstr "%s: skapande av databas misslyckades: %s"
-
-#: pg_ctl.c:690
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: en annan server verkar köra; försöker starta servern ändå\n"
-
-#: pg_ctl.c:727
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: kunde inte starta servern: avslutningskoden var %d\n"
-
-#: pg_ctl.c:738 pg_ctl.c:751
-#, c-format
-msgid ""
-"%s: could not start server\n"
-"Examine the log output.\n"
-msgstr ""
-"%s: kunde inte starta servern\n"
-"Undersök log-utskriften.\n"
-
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "väntar på att servern skall starta..."
-
-#: pg_ctl.c:758 pg_ctl.c:831 pg_ctl.c:911
-msgid " done\n"
-msgstr "klar\n"
-
-#: pg_ctl.c:759
-msgid "server started\n"
-msgstr "servern startad\n"
-
-#: pg_ctl.c:763
-msgid "server starting\n"
-msgstr "servern startar\n"
-
-#: pg_ctl.c:778 pg_ctl.c:853 pg_ctl.c:933
-#, c-format
-msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID-fil \"%s\" finns inte\n"
-
-#: pg_ctl.c:779 pg_ctl.c:855 pg_ctl.c:934
-msgid "Is server running?\n"
-msgstr "Kör servern?\n"
-
-#: pg_ctl.c:785
-#, c-format
-msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte stoppa servern; en-användar-server kör (PID: %ld)\n"
-
-#: pg_ctl.c:793 pg_ctl.c:877
-#, c-format
-msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: kunde inte skicka stopp-singal (PID: %ld): %s\n"
-
-#: pg_ctl.c:800
-msgid "server shutting down\n"
-msgstr "servern stänger ner\n"
-
-#: pg_ctl.c:807 pg_ctl.c:884
-msgid ""
-"WARNING: online backup mode is active\n"
-"Shutdown will not complete until pg_stop_backup() is called.\n"
-"\n"
-msgstr ""
-
-#: pg_ctl.c:811 pg_ctl.c:888
-msgid "waiting for server to shut down..."
-msgstr "väntar på att servern skall stänga ner..."
-
-#: pg_ctl.c:826 pg_ctl.c:905
-msgid " failed\n"
-msgstr " misslyckades\n"
-
-#: pg_ctl.c:828 pg_ctl.c:907
-#, c-format
-msgid "%s: server does not shut down\n"
-msgstr "%s: servern stänger inte ner\n"
-
-#: pg_ctl.c:833 pg_ctl.c:912
-msgid "server stopped\n"
-msgstr "servern stoppad\n"
-
-#: pg_ctl.c:856 pg_ctl.c:918
-msgid "starting server anyway\n"
-msgstr "startar servern ändå\n"
-
-#: pg_ctl.c:865
-#, c-format
-msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte starta om servern; servern kör (PID: %ld)\n"
-
-#: pg_ctl.c:868 pg_ctl.c:943
-msgid "Please terminate the single-user server and try again.\n"
-msgstr "Var vänlig och stoppa en--användar-servern och försök igen.\n"
-
-#: pg_ctl.c:916
-#, c-format
-msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: gamla serverprocessen (PID: %ld) verkar vara borta\n"
-
-#: pg_ctl.c:940
-#, c-format
-msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte ladda om servern; en-användar-server kör (PID: %ld)\n"
-
-#: pg_ctl.c:949
-#, c-format
-msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: kunde inte skicka \"reload\"-signalen (PID: %ld): %s\n"
-
-#: pg_ctl.c:954
-msgid "server signaled\n"
-msgstr "servern signalerad\n"
-
-#: pg_ctl.c:998
-#, c-format
-msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: en-användar-server kör (PID: %ld)\n"
-
-#: pg_ctl.c:1010
-#, c-format
-msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: servern kör (PID: %ld)\n"
-
-#: pg_ctl.c:1021
-#, c-format
-msgid "%s: no server running\n"
-msgstr "%s: ingen server kör\n"
-
-#: pg_ctl.c:1032
-#, c-format
-msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: kunde inte skicka signal %d (PID: %ld): %s\n"
-
-#: pg_ctl.c:1066
-#, c-format
-msgid "%s: could not find own program executable\n"
-msgstr "%s: kunde inte hitta egna programmets körbara fil\n"
-
-#: pg_ctl.c:1076
-#, c-format
-msgid "%s: could not find postgres program executable\n"
-msgstr "%s: kunde inte hitta postgres körbara fil\n"
-
-#: pg_ctl.c:1138 pg_ctl.c:1170
-#, c-format
-msgid "%s: could not open service manager\n"
-msgstr "%s: kunde inte öppna tjänsthanteraren\n"
-
-#: pg_ctl.c:1144
-#, c-format
-msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: tjänsten \"%s\" är redan registrerad\n"
-
-#: pg_ctl.c:1155
-#, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: kunde inte registrera tjänsten \"%s\": felkod %d\n"
-
-#: pg_ctl.c:1176
-#, c-format
-msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: tjänsten \"%s\" är inte registrerad\n"
-
-#: pg_ctl.c:1183
-#, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: kunde inte öppna tjänsten \"%s\": felkod %d\n"
-
-#: pg_ctl.c:1190
-#, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: kunde inte avregistrera tjänsten \"%s\": felkod %d\n"
-
-#: pg_ctl.c:1276
-msgid "Waiting for server startup...\n"
-msgstr "Väntar på serverstart...\n"
-
-#: pg_ctl.c:1279
-msgid "Timed out waiting for server startup\n"
-msgstr "Timeout vid väntan på serverstart\n"
-
-#: pg_ctl.c:1283
-msgid "Server started and accepting connections\n"
-msgstr "Server startad och accepterar anslutningar\n"
-
-#: pg_ctl.c:1333
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: kunde inte starta tjänsten \"%s\": felkod %d\n"
-
-#: pg_ctl.c:1568
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Försök med \"%s --help\" för mer information.\n"
-
-#: pg_ctl.c:1576
-#, c-format
-msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
-"\n"
-msgstr ""
-"%s är ett verktyg för att starta, stoppa, starta om, ladda om\n"
-"konfigureringsfiler, raportera statusen för en PostgreSQL-server\n"
-"eller signalera en PostgreSQL-process.\n"
-"\n"
-
-#: pg_ctl.c:1578
-#, c-format
-msgid "Usage:\n"
-msgstr "Användning:\n"
-
-#: pg_ctl.c:1579
-#, c-format
-msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
-msgstr "  %s init[db]               [-D DATAKAT] [-s] [-o \"FLAGGOR\"]\n"
-
-#: pg_ctl.c:1580
-#, c-format
-msgid ""
-"  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
-"\"]\n"
-msgstr ""
-"  %s start   [-w] [-t SEK] [-D DATAKAT] [-s] [-l FILENAMN] [-o \"FLAGGOR\"]\n"
-
-#: pg_ctl.c:1581
-#, c-format
-msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr "  %s stop    [-W] [-t SEK] [-D DATAKAT] [-s] [-m STÄNGNINGSMETOD]\n"
-
-#: pg_ctl.c:1582
-#, c-format
-msgid ""
-"  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-"                 [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s restart [-w] [-t SEK] [-D DATAKAT] [-s] [-m STÄNGNINGSMETOD]\n"
-"                 [-o \"FLAGGOR\"]\n"
-
-#: pg_ctl.c:1584
-#, c-format
-msgid "  %s reload  [-D DATADIR] [-s]\n"
-msgstr "  %s reload  [-D DATAKAT] [-s]\n"
-
-#: pg_ctl.c:1585
-#, c-format
-msgid "  %s status  [-D DATADIR]\n"
-msgstr "  %s status  [-D DATAKAT]\n"
-
-#: pg_ctl.c:1586
-#, c-format
-msgid "  %s kill    SIGNALNAME PID\n"
-msgstr "  %s kill    SIGNALNAMN PID\n"
-
-#: pg_ctl.c:1588
-#, c-format
-msgid ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s register   [-N TJÄNSTNAMN] [-U ANVÄNDARNAMN] [-P LÖSENORD] [-D "
-"DATAKAT]\n"
-"                    [-w] [-t SEK] [-o \"FLAGGOR\"]\n"
-
-#: pg_ctl.c:1590
-#, c-format
-msgid "  %s unregister [-N SERVICENAME]\n"
-msgstr "  %s unregister [-N TJÄNSTNAMN]\n"
-
-#: pg_ctl.c:1593
-#, c-format
-msgid ""
-"\n"
-"Common options:\n"
-msgstr ""
-"\n"
-"Generella flaggor:\n"
-
-#: pg_ctl.c:1594
-#, c-format
-msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
-msgstr "  -D, --pgdata DATAKAT   plats för databasens lagringsarea\n"
-
-#: pg_ctl.c:1595
-#, c-format
-msgid "  -s, --silent           only print errors, no informational messages\n"
-msgstr ""
-"  -s, --silent           skriv bara ut fel, inga informationsmeddelanden\n"
-
-#: pg_ctl.c:1596
-#, c-format
-msgid "  -t SECS                seconds to wait when using -w option\n"
-msgstr "  -t SEK                 sekunder att vänta om flaggan -w används\n"
-
-#: pg_ctl.c:1597
-#, c-format
-msgid "  -w                     wait until operation completes\n"
-msgstr "  -w                     vänta på att operationen slutförs\n"
-
-#: pg_ctl.c:1598
-#, c-format
-msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -W                     vänta inte på att operationen slutförs\n"
-
-#: pg_ctl.c:1599
-#, c-format
-msgid "  --help                 show this help, then exit\n"
-msgstr "  --help                 visa denna hjälp, avsluta sedan\n"
-
-#: pg_ctl.c:1600
-#, c-format
-msgid "  --version              output version information, then exit\n"
-msgstr "  --version              visa versionsinformation, avsluta sedan\n"
-
-#: pg_ctl.c:1601
-#, c-format
-msgid ""
-"(The default is to wait for shutdown, but not for start or restart.)\n"
-"\n"
-msgstr ""
-"(Standard är att vänta på nedstängning men inte vänta på start eller "
-"omstart.)\n"
-"\n"
-
-#: pg_ctl.c:1602
-#, c-format
-msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "Om flaggan -D inte angivits så används omgivningsvariabeln PGDATA.\n"
-
-#: pg_ctl.c:1604
-#, c-format
-msgid ""
-"\n"
-"Options for start or restart:\n"
-msgstr ""
-"\n"
-"Flaggor för start eller omstart:\n"
-
-#: pg_ctl.c:1606
-#, c-format
-msgid "  -c, --core-files       allow postgres to produce core files\n"
-msgstr "  -c, --core-files       tillåt postgres att skapa core-filer\n"
-
-#: pg_ctl.c:1608
-#, c-format
-msgid "  -c, --core-files       not applicable on this platform\n"
-msgstr "  -c, --core-files       inte giltigt på denna plattform\n"
-
-#: pg_ctl.c:1610
-#, c-format
-msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
-msgstr ""
-"  -l, --log FILENAMN     skriv (eller addera) server-loggen till FILNAMN\n"
-
-#: pg_ctl.c:1611
-#, c-format
-msgid ""
-"  -o OPTIONS             command line options to pass to postgres\n"
-"                         (PostgreSQL server executable) or initdb\n"
-msgstr ""
-"  -o FLAGGOR             kommandoradsflaggor som skickas vidare till postgres\n"
-"                         (PostgreSQL-serverns körbara fil) eller initdb\n"
-
-#: pg_ctl.c:1613
-#, c-format
-msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
-msgstr ""
-"  -p SÖKVÄG-TILL-POSTGRES\n"
-"                         behövs normalt inte\n"
-
-#: pg_ctl.c:1614
-#, c-format
-msgid ""
-"\n"
-"Options for stop or restart:\n"
-msgstr ""
-"\n"
-"Flaggor för stopp eller omstart:\n"
-
-#: pg_ctl.c:1615
-#, c-format
-msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr ""
-"  -m STÄNGNINGSMETOD     kan vara \"smart\", \"fast\", eller \"immediate\"\n"
-
-#: pg_ctl.c:1617
-#, c-format
-msgid ""
-"\n"
-"Shutdown modes are:\n"
-msgstr ""
-"\n"
-"Stängningsmetoder är:\n"
-
-#: pg_ctl.c:1618
-#, c-format
-msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  smart       stäng när alla klienter kopplat ner\n"
-
-#: pg_ctl.c:1619
-#, c-format
-msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  fast        stäng direkt, en kontrollerad nedstängning\n"
-
-#: pg_ctl.c:1620
-#, c-format
-msgid ""
-"  immediate   quit without complete shutdown; will lead to recovery on "
-"restart\n"
-msgstr "  immediate   stäng direkt; vid omstart kommer återställning utföras\n"
-
-#: pg_ctl.c:1622
-#, c-format
-msgid ""
-"\n"
-"Allowed signal names for kill:\n"
-msgstr ""
-"\n"
-"Tillåtna signalnamn för \"kill\":\n"
-
-#: pg_ctl.c:1626
-#, c-format
-msgid ""
-"\n"
-"Options for register and unregister:\n"
-msgstr ""
-"\n"
-"Flaggor för registrering och avregistrering:\n"
-
-#: pg_ctl.c:1627
-#, c-format
-msgid ""
-"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
-msgstr "  -N TJÄNSTENAMN  tjänstnamn att registrera PostgreSQL-servern med\n"
-
-#: pg_ctl.c:1628
-#, c-format
-msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
-msgstr ""
-"  -P LÖSENORD     lösenord för kontot att registrera PostgreSQL-servern med\n"
-
-#: pg_ctl.c:1629
-#, c-format
-msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
-msgstr ""
-"  -U NAMN         användarnamn på kontot att registrera PostgreSQL-servern "
-"med\n"
-
-#: pg_ctl.c:1632
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_ctl.c:1657
-#, c-format
-msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: ogiltigt stängningsmetod \"%s\"\n"
-
-#: pg_ctl.c:1690
-#, c-format
-msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: ogiltigt signalnamn \"%s\"\n"
-
-#: pg_ctl.c:1755
-#, c-format
-msgid ""
-"%s: cannot be run as root\n"
-"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
-"own the server process.\n"
-msgstr ""
-"%s: kan inte köras som root\n"
-"Logga in (t.ex. med \"su\") som den ickepriviligerade användare som\n"
-"skall äga serverprocessen.\n"
-
-#: pg_ctl.c:1864
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: för många kommandoradsargument (första är \"%s\")\n"
-
-#: pg_ctl.c:1886
-#, c-format
-msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: saknar argumentet till \"kill\"-läget\n"
-
-#: pg_ctl.c:1904
-#, c-format
-msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: ogiltigt operationsläge \"%s\"\n"
-
-#: pg_ctl.c:1914
-#, c-format
-msgid "%s: no operation specified\n"
-msgstr "%s: ingen operation angiven\n"
-
-#: pg_ctl.c:1930
-#, c-format
-msgid ""
-"%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr ""
-"%s: ingen databaskatalog angiven och omgivningsvariabeln PGDATA är inte "
-"satt\n"
-
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "kunde inte identifiera aktuella katalogen: %s"
-
-#: ../../port/exec.c:144
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "ogiltig binär \"%s\""
-
-#: ../../port/exec.c:193
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "kunde inte läsa binär \"%s\""
-
-#: ../../port/exec.c:200
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "kunde inte hitta en \"%s\" att köra"
-
-#: ../../port/exec.c:255 ../../port/exec.c:291
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "kunde inte byta katalog till \"%s\""
-
-#: ../../port/exec.c:270
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "kunde inte läsa symbolisk länk \"%s\""
-
-#: ../../port/exec.c:516
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "barnprocess avslutade med kod %d"
-
-#: ../../port/exec.c:520
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "barnprocess terminerades av felkod 0x%X"
-
-#: ../../port/exec.c:529
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "barnprocess terminerades av signal %s"
-
-#: ../../port/exec.c:532
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "barnprocess terminerades av signal %d"
-
-#: ../../port/exec.c:536
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "barnprocess avslutade med okänd statuskod %d"
diff --git a/src/bin/pg_ctl/po/ta.po b/src/bin/pg_ctl/po/ta.po
deleted file mode 100644
index 9ed378ffa11f6..0000000000000
--- a/src/bin/pg_ctl/po/ta.po
+++ /dev/null
@@ -1,619 +0,0 @@
-# translation of pg_ctl.po to தமிழ�
-# This file is put in the public domain.
-#
-# ஆமாச�ச� <amachu@ubuntu.com>, 2007.
-# ஸ�ரீராமதாஸ� <shriramadhas@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: pg_ctl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-22 03:19-0300\n"
-"PO-Revision-Date: 2007-11-01 12:53+0530\n"
-"Last-Translator: ஸ�ரீராமதாஸ� <shriramadhas@gmail.com>\n"
-"Language-Team: தமிழ� <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Language: Tamil\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: pg_ctl.c:231
-#: pg_ctl.c:246
-#: pg_ctl.c:1716
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: நினைவ�க�க� அப�பால�\n"
-
-#: pg_ctl.c:280
-#, c-format
-msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: PID கோப�பினைத� திறக�க இயலவில�லை \"%s\": %s\n"
-
-#: pg_ctl.c:287
-#, c-format
-msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: PID கோப�பில�ள�ளத� தரவ� பொர�த�தமற�றத� \"%s\"\n"
-
-#: pg_ctl.c:538
-#, c-format
-msgid "%s: cannot set core size, disallowed by hard limit.\n"
-msgstr "%s: மைய அளவினை அமைக�க இயலவில�லை, வலிய வரையறையால� அன�மதிக�க ம�டியவில�லை.\n"
-
-#: pg_ctl.c:568
-#, c-format
-msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: கோப�பினை வாசிக�க இயலவில�லை \"%s\"\n"
-
-#: pg_ctl.c:574
-#, c-format
-msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: தேர�வ�கள� கோப�ப� \"%s\" கட�டாயம� ஒர� வரி மாத�திரமே கொண�டிர�க�க வேண�ட�ம�\n"
-
-#: pg_ctl.c:617
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: மற�றொர� வழங�கி இயங�கிக� கொண�டிர�க�கலாம�; ஆயின�ம� வழங�கியினைத� த�வக�க ம�யந�சி மேற�கொள�ளப� பட�கிறத�\n"
-
-#: pg_ctl.c:644
-#, c-format
-msgid ""
-"The program \"postgres\" is needed by %s but was not found in the\n"
-"same directory as \"%s\".\n"
-"Check your installation.\n"
-msgstr ""
-"%s க�க� \"postgres\" நிரல� அவசியம� தேவைப� பட�கிறத� ஆயின�ம� \"%s\" அடைவின�ள� \n"
-" அத� கிடைக�கவில�லை .\n"
-"தங�களின� நிற�வலைச� சரி பாார�க�கவ�ம�.\n"
-
-#: pg_ctl.c:650
-#, 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"
-
-#: pg_ctl.c:667
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: வழங�கியினைத� த�வக�க இயலவில�லை: வெளியேற�றக� க�றியீட� %d\n"
-
-#: pg_ctl.c:678
-#, c-format
-msgid ""
-"%s: could not start server\n"
-"Examine the log output.\n"
-msgstr ""
-"%s: வழங�கியினை த�வங�க இயலவில�லை\n"
-"பதிவின� வெளியீட�டை ஆராயவ�ம�.\n"
-
-#: pg_ctl.c:687
-msgid "waiting for server to start..."
-msgstr "வழங�கியின� த�வக�கத�திற�காகக� காத�திர�க�கப�பட�கிறத�..."
-
-#: pg_ctl.c:691
-#, c-format
-msgid "could not start server\n"
-msgstr "வழங�கியினைத� த�வங�க இயலவில�லை\n"
-
-#: pg_ctl.c:696
-#: pg_ctl.c:762
-#: pg_ctl.c:835
-msgid " done\n"
-msgstr " ம�டிந�தத�\n"
-
-#: pg_ctl.c:697
-msgid "server started\n"
-msgstr "வழங�கி த�வங�கியத�\n"
-
-#: pg_ctl.c:701
-msgid "server starting\n"
-msgstr "வழங�கி த�வங�கப� பட�கிறத�\n"
-
-#: pg_ctl.c:715
-#: pg_ctl.c:783
-#: pg_ctl.c:857
-#, c-format
-msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID கோப�ப� \"%s\" இல�லை\n"
-
-#: pg_ctl.c:716
-#: pg_ctl.c:785
-#: pg_ctl.c:858
-msgid "Is server running?\n"
-msgstr "வழங�கி பணி ப�ரிகிறதா?\n"
-
-#: pg_ctl.c:722
-#, c-format
-msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: வழங�கியினை நிற�த�த இயலவில�லை; தனிப� பயனர�க�கான வழங�கி இயங�க�கிறத� (PID: %ld)\n"
-
-#: pg_ctl.c:730
-#: pg_ctl.c:807
-#, c-format
-msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: நிற�த�த�வதற�கான சமிக�ஞையை அன�ப�ப இயலவில�லை (PID: %ld): %s\n"
-
-#: pg_ctl.c:737
-msgid "server shutting down\n"
-msgstr "வழங�கி நிற�த�தப� பட�கிறத�\n"
-
-#: pg_ctl.c:742
-#: pg_ctl.c:812
-msgid "waiting for server to shut down..."
-msgstr "வழங�கி நிற�க�ம� பொர�ட�ட� காத�திர�க�கப� பட�கிறத�..."
-
-#: pg_ctl.c:757
-#: pg_ctl.c:829
-msgid " failed\n"
-msgstr " தவறியத�\n"
-
-#: pg_ctl.c:759
-#: pg_ctl.c:831
-#, c-format
-msgid "%s: server does not shut down\n"
-msgstr "%s: வழங�கி நிற�க வில�லை\n"
-
-#: pg_ctl.c:764
-#: pg_ctl.c:836
-#, c-format
-msgid "server stopped\n"
-msgstr "வழங�கி நின�றத�\n"
-
-#: pg_ctl.c:786
-#: pg_ctl.c:842
-msgid "starting server anyway\n"
-msgstr "எவ�வழியான�ம� வழங�கித� த�வங�கப� பட�கிறத�\n"
-
-#: pg_ctl.c:795
-#, c-format
-msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: வழங�கியை மீளத� த�வங�க இயலவில�லை; தனிப� பயனர�க�கான வழங�கி இயங�க�கிறத� (PID: %ld)\n"
-
-#: pg_ctl.c:798
-#: pg_ctl.c:867
-msgid "Please terminate the single-user server and try again.\n"
-msgstr "தனிப� பயனர�க�கான வழங�கியினை நிற�த�திவிட�ட� மீண�ட�ம� ம�யற�சிக�கவ�ம�.\n"
-
-#: pg_ctl.c:840
-#, c-format
-msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: வழங�கியின� பழைய செயல� (PID: %ld) பூர�த�தியானத� போலத�தெரிகிறத�\n"
-
-#: pg_ctl.c:864
-#, c-format
-msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: வழங�கியை மீளத� த�வங�க இயலவில�லை; தனிப� பயனர�க�கான வழங�கி இயங�கிக� கொண�டிர�க�கிறத�(PID: %ld)\n"
-
-#: pg_ctl.c:873
-#, c-format
-msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: மீளேற�ற சமிக�ஞையைத� அன�ப�ப இயலவில�லை (PID: %ld): %s\n"
-
-#: pg_ctl.c:878
-msgid "server signaled\n"
-msgstr "வழங�கிக�க� சமிக�ஞைத� தரப� பட�டத�\n"
-
-#: pg_ctl.c:922
-#, c-format
-msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: தனிப�பயனர�க�கான வழங�கி இயங�கிக� கொண�டிர�க�கிறத� (PID: %ld)\n"
-
-#: pg_ctl.c:934
-#, c-format
-msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: வழங�கி இயங�கிக�கொண�டிர�க�கிறத� (PID: %ld)\n"
-
-#: pg_ctl.c:945
-#, c-format
-msgid "%s: no server running\n"
-msgstr "%s: எந�த வழங�கிய�ம� இயங�கவில�லை\n"
-
-#: pg_ctl.c:956
-#, c-format
-msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: சமிக�ஞையினை அன�ப�ப இயலவில�லை %d (PID: %ld): %s\n"
-
-#: pg_ctl.c:990
-#, c-format
-msgid "%s: could not find own program executable\n"
-msgstr "%s: could not find own program executable\n"
-
-#: pg_ctl.c:999
-#, c-format
-msgid "%s: could not find postgres program executable\n"
-msgstr "%s: இயக�க வல�ல போஸ�ட�கிரெஸ� நிரல� கிடைக�கவில�லை\n"
-
-#: pg_ctl.c:1053
-#: pg_ctl.c:1085
-#, c-format
-msgid "%s: could not open service manager\n"
-msgstr "%s: சேவை மேளாலரைத� திறக�க இயலவில�லை\n"
-
-#: pg_ctl.c:1059
-#, c-format
-msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: சேவை \"%s\" �றகனவே பதிவ�ச� செய�யப� பட�ட�ள�ளத�\n"
-
-#: pg_ctl.c:1070
-#, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" சேவையைப� பதிவ�ச� செய�ய இயலவில�லை. வழ�க� க�றி %d\n"
-
-#: pg_ctl.c:1091
-#, c-format
-msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: \"%s\" சேவைப� பதிவ�ச� செய�யப� படவில�லை\n"
-
-#: pg_ctl.c:1098
-#, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: \"%s\": சேவையைத� த�வக�க இயலவில�லை. வழ� க�றி %d\n"
-
-#: pg_ctl.c:1105
-#, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: சேவையைத� திர�ம�பப� பெற இயலவில�லை \"%s\": பிழை க�றி %d\n"
-
-#: pg_ctl.c:1191
-msgid "Waiting for server startup...\n"
-msgstr "வழங�கித� த�வங�க�வதற�காகக� காத�திர�க�கப� பட�கிறத�...\n"
-
-#: pg_ctl.c:1194
-msgid "Timed out waiting for server startup\n"
-msgstr "வழங�கி த�வங�கக� காத�திர�ந�த� காலாவதியானத�\n"
-
-#: pg_ctl.c:1198
-msgid "Server started and accepting connections\n"
-msgstr "வழங�கித� த�வங�கிற�ற� இணைப�ப�க�களைப� பெற�ற�க� கொண�டிர�க�கிறத�\n"
-
-#: pg_ctl.c:1245
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: \"%s\": சேவையைத� த�வக�க இயலவில�லை பிழை க�றி %d\n"
-
-#: pg_ctl.c:1457
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "மேல�ம� தகவலறிய \"%s --help\" ம�யற�சி செய�யவ�ம�.\n"
-
-#: pg_ctl.c:1465
-#, c-format
-msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
-"\n"
-msgstr ""
-"%s வடிவமைப�ப�க� கோப�ப�களை த�வக�க, நிற�த�த, மீளத�த�வங�க, மீளேற�ற�வதற�கானப� பயனபாட�\n"
-"போஸ�ட�கிரெஸ� வழங�கியொன�றின� நிலையினை அறியப� பட�த�தவ�ம� அல�லத� போஸ�டகிரெஸ� பணியொன�ற�க�க� சமிக�ஞைத� தரவ�ம�.\n"
-"\n"
-
-#: pg_ctl.c:1467
-#, c-format
-msgid "Usage:\n"
-msgstr "பயன�பாட�:\n"
-
-#: pg_ctl.c:1468
-#, c-format
-msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-msgstr "  %s த�வக�க�க   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1469
-#, c-format
-msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr "  %s நிற�த�த�க    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-
-#: pg_ctl.c:1470
-#, c-format
-msgid "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
-msgstr "  %s மீளத�த�வக�க� [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1471
-#, c-format
-msgid "  %s reload  [-D DATADIR] [-s]\n"
-msgstr "  %s மீளேற�ற�க  [-D DATADIR] [-s]\n"
-
-#: pg_ctl.c:1472
-#, c-format
-msgid "  %s status  [-D DATADIR]\n"
-msgstr "  %s மீளேற�ற�க  [-D DATADIR]\n"
-
-#: pg_ctl.c:1473
-#, c-format
-msgid "  %s kill    SIGNALNAME PID\n"
-msgstr "  %s கொல�க    SIGNALNAME PID\n"
-
-#: pg_ctl.c:1475
-#, c-format
-msgid ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s பதிவ�செய�க   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-o \"OPTIONS\"]\n"
-
-#: pg_ctl.c:1477
-#, c-format
-msgid "  %s unregister [-N SERVICENAME]\n"
-msgstr "  %s பதிவைத� திர�ம�பப� பெற�க [-N SERVICENAME]\n"
-
-#: pg_ctl.c:1480
-#, c-format
-msgid ""
-"\n"
-"Common options:\n"
-msgstr ""
-"\n"
-"பொத�வானத� தேர�வ�கள�:\n"
-
-#: pg_ctl.c:1481
-#, c-format
-msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
-msgstr "  -D, --pgdata DATADIR   தரவ�க� களன� காக�கப�பட�ம� இடம�\n"
-
-#: pg_ctl.c:1482
-#, c-format
-msgid "  -s, --silent           only print errors, no informational messages\n"
-msgstr "  -s, --silent           அச�ச�சார� பிழைகள� மாத�திரம�, தகவல� க�றிப�ப�கள� அல�ல\n"
-
-#: pg_ctl.c:1483
-#, c-format
-msgid "  -w                     wait until operation completes\n"
-msgstr "  -w                     செயல� பூரத�தியாக�ம� வரைக� காத�திர�\n"
-
-#: pg_ctl.c:1484
-#, c-format
-msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -w                     செயல� பூரத�தியாக�ம� வரைக� காத�திர�க�காதே\n"
-
-#: pg_ctl.c:1485
-#, c-format
-msgid "  --help                 show this help, then exit\n"
-msgstr "  --help                 இவ�வ�தவியினைக� காட�டிவிட�ட� வெளிவர�க\n"
-
-#: pg_ctl.c:1486
-#, c-format
-msgid "  --version              output version information, then exit\n"
-msgstr "  --version              வெளியீட�ட�த� தகவலை வெளியிட�ட�விட�ட� வெளிவர�க\n"
-
-#: pg_ctl.c:1487
-#, c-format
-msgid ""
-"(The default is to wait for shutdown, but not for start or restart.)\n"
-"\n"
-msgstr ""
-"(இயல�பிர�ப�ப� நிற�த�த�வதற�காகக� காத�திர�ப�பத�. த�வக�க அல�லத� மீளத�த�வங�க அல�ல)\n"
-"\n"
-
-#: pg_ctl.c:1488
-#, c-format
-msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "-D தேர�வினை விட�ட�விட�டால�, சூழல� மாறி PGDATA பயன�பட�த�தப�பட�ம�.\n"
-
-#: pg_ctl.c:1490
-#, c-format
-msgid ""
-"\n"
-"Options for start or restart:\n"
-msgstr ""
-"\n"
-"த�வங�க அல�லத� மீளத� த�வங�க�வதற�கான தேர�வ�கள�:\n"
-
-#: pg_ctl.c:1491
-#, c-format
-msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
-msgstr "  -l, --log FILENAME     FILENAME ற�க� வழங�கியின� பதிவினை இயற�றவ�ம� (அல�லத� சேர�க�கவ�ம�)\n"
-
-#: pg_ctl.c:1492
-#, c-format
-msgid ""
-"  -o OPTIONS             command line options to pass to postgres\n"
-"                         (PostgreSQL server executable)\n"
-msgstr ""
-"  -o OPTIONS             போஸ�டகிரெஸ�க�க� அன�ப�ப உகந�த ம�னைய தேர�வ�கள�\n"
-"                         (வழங�கியில� இயக�க வல�ல)\n"
-
-#: pg_ctl.c:1494
-#, c-format
-msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
-msgstr "  -p PATH-TO-POSTGRES    சாதாரணமாகத� தேவையில�லை\n"
-
-#: pg_ctl.c:1496
-#, c-format
-msgid "  -c, --core-files       allow postgres to produce core files\n"
-msgstr "  -c, --core-files       மூலக� கோப�ப�களை உர�வாக�க போஸ�டகிரெஸ�ஸினை அன�மதிக�கவ�ம�\n"
-
-#: pg_ctl.c:1498
-#, c-format
-msgid "  -c, --core-files       not applicable on this platform\n"
-msgstr "  -c, --core-files       இக�கட�டமைப�ப�க�க� ஒவ�வாத\n"
-
-#: pg_ctl.c:1500
-#, c-format
-msgid ""
-"\n"
-"Options for stop or restart:\n"
-msgstr ""
-"\n"
-"த�வக�க மீளத�த�வக�க�வதற�கான தேர�வ�கள�:\n"
-
-#: pg_ctl.c:1501
-#, c-format
-msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr "  -m SHUTDOWN-MODE   \"விவேகமாக\", \"வேகமாக\", அல�லத� \"உடனடியாக\" இர�க�கலாம�\n"
-
-#: pg_ctl.c:1503
-#, c-format
-msgid ""
-"\n"
-"Shutdown modes are:\n"
-msgstr ""
-"\n"
-"நிற�த�த�ம� ம�றைகளாவன:\n"
-
-#: pg_ctl.c:1504
-#, c-format
-msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  விவேக       வெளிவரவ�. அனைத�த� வாங�கிகள�ம� தொடர�பறிந�த பிறக�.\n"
-
-#: pg_ctl.c:1505
-#, c-format
-msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  வேக        வெளிவரவ�, ம�றையான நிற�த�தத� த�டன�\n"
-
-#: pg_ctl.c:1506
-#, c-format
-msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
-msgstr "  உடனடி   வெளிவரவ� ம�ழ�மையான நிற�த�தமில�லாத�; மீளத�த�வங�க�ம� போத� மீட�பதறகான ம�யற�சி மேற�கொள�ளப�பட�ம�\n"
-
-#: pg_ctl.c:1508
-#, c-format
-msgid ""
-"\n"
-"Allowed signal names for kill:\n"
-msgstr ""
-"\n"
-"ம�டிப�பதற�க� அன�மதிக�கப�பட�ம� சமிக�ஞை பெயர�கள�:\n"
-
-#: pg_ctl.c:1512
-#, c-format
-msgid ""
-"\n"
-"Options for register and unregister:\n"
-msgstr ""
-"\n"
-"பதிவ� செய�ய மற�ற�ம� விலக�வதற�கான தேர�வ�கள�:\n"
-
-#: pg_ctl.c:1513
-#, c-format
-msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
-msgstr "  -N SERVICENAME  போஸ�ட�கிரெஸ� வழங�கியினை பதிவ� செய�வதற�கானச� சேவைப� பெயர�\n"
-
-#: pg_ctl.c:1514
-#, c-format
-msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
-msgstr "  -P PASSWORD     போஸ�ட�கிரெஸ� வழங�கியினை பதிவ� செய�வதற�கான கணக�கின� கடவ�ச� சொல�\n"
-
-#: pg_ctl.c:1515
-#, c-format
-msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
-msgstr "  -U USERNAME     போஸ�ட�கிரெஸ� வழங�கியினை பதிவ� செய�வதற�கான கணக�கின� பயனர� பெயர�\n"
-
-#: pg_ctl.c:1518
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"வழ�க�களை <pgsql-bugs@postgresql.org> க�க�த� தெரியப� பட�த�தவ�ம�.\n"
-
-#: pg_ctl.c:1543
-#, c-format
-msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: இனங�கண�ட�கொள�ள இயலாத நிற�த�தற� ம�றை \"%s\"\n"
-
-#: pg_ctl.c:1576
-#, c-format
-msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: இனங�கண�ட�கொள�ள இயலாத சமிக�ஞை பெயர� \"%s\"\n"
-
-#: pg_ctl.c:1640
-#, 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: ம�தன�மைப� பயனராக இயக�க இயலாத�\n"
-" வழங�கியின� பணிகள�க�க� உரிமைய�ள�ள (சல�கையற�ற) பயனராக (உ.ம�., \"su\")\n"
-"ந�ழையவ�ம�.\n"
-
-#: pg_ctl.c:1746
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: �கப� பட�ட ம�னையத� த�ப�ப�கள� (ம�தலாவத� \"%s\")\n"
-
-#: pg_ctl.c:1765
-#, c-format
-msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: ம�டி ம�றைக�கானத� த�ப�ப�கள� இல�லை\n"
-
-#: pg_ctl.c:1783
-#, c-format
-msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: இனங�காண இயலாத செயல� ம�றை \"%s\"\n"
-
-#: pg_ctl.c:1793
-#, c-format
-msgid "%s: no operation specified\n"
-msgstr "%s: செயலெத�வ�ம� க�றிப�பிடப� படவில�லை\n"
-
-#: pg_ctl.c:1809
-#, c-format
-msgid "%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: அமைவகற�ற� PGDATA சூழல� மாறியில� தரவ�க� கள அடைவ�க� க�றிப�பிடப� படவில�லை\n"
-
-#: ../../port/exec.c:192
-#: ../../port/exec.c:306
-#: ../../port/exec.c:349
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "தற�போதைய அடைவினைக� இனங�கான இயலவில�லை: %s"
-
-#: ../../port/exec.c:211
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "செல�லாத இர�மம� \"%s\""
-
-#: ../../port/exec.c:260
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "இர�மத�தினை வாசிக�க இயலவில�லை \"%s\""
-
-#: ../../port/exec.c:267
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "இயக�க�ம�பொர�ட�ட� \"%s\" னைக� கண�டெட�க�க இயலவில�லை"
-
-#: ../../port/exec.c:322
-#: ../../port/exec.c:358
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "அடைவினை \"%s\" க�க� மாற�ற இயலவில�லை"
-
-#: ../../port/exec.c:337
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "மாதிரி இணைப�பினை வாசிக�க இயலவில�லை \"%s\""
-
-#: ../../port/exec.c:583
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "சேய� பணி வெளிவரவ�க� க�றி %d ய�டன� வெள�வந�தத�"
-
-#: ../../port/exec.c:587
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "சேய� பணி விதிவிவக�க� 0x%X ஆல� தடைப�பட�டத�"
-
-#: ../../port/exec.c:596
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "சேய� பணி %s சமிக�ஞையால� தடைப�பட�டத�"
-
-#: ../../port/exec.c:599
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "சேய� பணி %d சமிக�ஞையால� தடைப�பட�டத�"
-
-#: ../../port/exec.c:603
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "சேய� பணி இனந�தெரியா %d நிலையால� தடைப�பட�டத�"
-
diff --git a/src/bin/pg_ctl/po/tr.po b/src/bin/pg_ctl/po/tr.po
index 74343c37127f4..ba167e3925968 100644
--- a/src/bin/pg_ctl/po/tr.po
+++ b/src/bin/pg_ctl/po/tr.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_ctl-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 20:08+0000\n"
-"PO-Revision-Date: 2010-09-01 11:15+0200\n"
+"POT-Creation-Date: 2011-08-30 22:40+0000\n"
+"PO-Revision-Date: 2011-08-31 13:26+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -16,39 +17,60 @@ msgstr ""
 "X-Poedit-Language: Turkish\n"
 "X-Poedit-Country: TURKEY\n"
 
-#: pg_ctl.c:225
-#: pg_ctl.c:240
-#: pg_ctl.c:1834
+#: pg_ctl.c:237
+#: pg_ctl.c:252
+#: pg_ctl.c:2035
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: yetersiz bellek\n"
 
-#: pg_ctl.c:274
+#: pg_ctl.c:286
 #, c-format
 msgid "%s: could not open PID file \"%s\": %s\n"
 msgstr "%s: \"%s\" PID dosyası açılamadı: %s\n"
 
-#: pg_ctl.c:281
+#: pg_ctl.c:293
 #, c-format
 msgid "%s: invalid data in PID file \"%s\"\n"
 msgstr "%s: \"%s\" PID dosyasında geçersiz veri\n"
 
-#: pg_ctl.c:557
+#: pg_ctl.c:470
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr ""
+
+#: pg_ctl.c:540
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr ""
+
+#: pg_ctl.c:588
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr ""
+
+#: pg_ctl.c:638
 #, c-format
 msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
 msgstr "%s: core boyutu ayarlanamadı; hard limit tarafından sınırlanmış.\n"
 
-#: pg_ctl.c:582
+#: pg_ctl.c:663
 #, c-format
 msgid "%s: could not read file \"%s\"\n"
 msgstr "%s: \"%s\" dosyası okunamadı\n"
 
-#: pg_ctl.c:587
+#: pg_ctl.c:668
 #, c-format
 msgid "%s: option file \"%s\" must have exactly one line\n"
 msgstr "%s: \"%s\" seçenek dosyası sadece 1 satır olmalıdır\n"
 
-#: pg_ctl.c:635
+#: pg_ctl.c:716
 #, c-format
 msgid ""
 "The program \"%s\" is needed by %s but was not found in the\n"
@@ -59,7 +81,7 @@ msgstr ""
 "\"%s\" ile aynı dizinde bulunamadı.\n"
 "Kurulumunuzu kontrol ediniz.\n"
 
-#: pg_ctl.c:641
+#: pg_ctl.c:722
 #, c-format
 msgid ""
 "The program \"%s\" was found by \"%s\"\n"
@@ -70,23 +92,45 @@ msgstr ""
 "bulundu ancak %s ile aynı sürüm numarasına sahip değil.\n"
 "Kurulumunuzu kontrol ediniz.\n"
 
-#: pg_ctl.c:674
+#: pg_ctl.c:755
 #, c-format
 msgid "%s: database system initialization failed\n"
 msgstr "%s: veritabanı ilklendirme başarısız oldu\n"
 
-#: pg_ctl.c:690
+#: pg_ctl.c:770
 #, c-format
 msgid "%s: another server might be running; trying to start server anyway\n"
 msgstr "%s: başka bir sunucu çalışıyor olabilir; yine de başlatmaya çalışılıyor.\n"
 
-#: pg_ctl.c:727
+#: pg_ctl.c:807
 #, c-format
 msgid "%s: could not start server: exit code was %d\n"
 msgstr "%s: sunucu başlatılamadı: çıkış kodu: %d\n"
 
-#: pg_ctl.c:738
-#: pg_ctl.c:751
+#: pg_ctl.c:814
+msgid "waiting for server to start..."
+msgstr "sunucunun başlaması bekleniyor..."
+
+#: pg_ctl.c:819
+#: pg_ctl.c:920
+#: pg_ctl.c:1011
+msgid " done\n"
+msgstr " tamam\n"
+
+#: pg_ctl.c:820
+msgid "server started\n"
+msgstr "sunucu başlatıldı\n"
+
+#: pg_ctl.c:823
+#: pg_ctl.c:827
+msgid " stopped waiting\n"
+msgstr "bekleme durduruldu\n"
+
+#: pg_ctl.c:824
+msgid "server is still starting up\n"
+msgstr "sunucu hala başlıyor\n"
+
+#: pg_ctl.c:828
 #, c-format
 msgid ""
 "%s: could not start server\n"
@@ -95,54 +139,53 @@ msgstr ""
 "%s: sunucu başlatılamadı\n"
 "Kayıt dosyasını inceleyiniz\n"
 
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "sunucunun başlaması bekleniyor..."
-
-#: pg_ctl.c:758
-#: pg_ctl.c:831
-#: pg_ctl.c:911
-msgid " done\n"
-msgstr " tamam\n"
+#: pg_ctl.c:834
+#: pg_ctl.c:912
+#: pg_ctl.c:1002
+msgid " failed\n"
+msgstr " başarısız oldu\n"
 
-#: pg_ctl.c:759
-msgid "server started\n"
-msgstr "sunucu başlatıldı\n"
+#: pg_ctl.c:835
+#, fuzzy, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "geçersiz ayarlarından dolayı autovacuum çalıştırılamadı"
 
-#: pg_ctl.c:763
+#: pg_ctl.c:841
 msgid "server starting\n"
 msgstr "sunucu başlıyor\n"
 
-#: pg_ctl.c:778
-#: pg_ctl.c:853
-#: pg_ctl.c:933
+#: pg_ctl.c:856
+#: pg_ctl.c:942
+#: pg_ctl.c:1032
+#: pg_ctl.c:1072
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: \"%s\" PID dosyası bulunamadı\n"
 
-#: pg_ctl.c:779
-#: pg_ctl.c:855
-#: pg_ctl.c:934
+#: pg_ctl.c:857
+#: pg_ctl.c:944
+#: pg_ctl.c:1033
+#: pg_ctl.c:1073
 msgid "Is server running?\n"
 msgstr "sunucu çalışıyor mu?\n"
 
-#: pg_ctl.c:785
+#: pg_ctl.c:863
 #, c-format
 msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
 msgstr "%s: sunucu durdurulamadı; tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
 
-#: pg_ctl.c:793
-#: pg_ctl.c:877
+#: pg_ctl.c:871
+#: pg_ctl.c:966
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s:durdurma sinyali başarısız oldu (PID: %ld): %s\n"
 
-#: pg_ctl.c:800
+#: pg_ctl.c:878
 msgid "server shutting down\n"
 msgstr "sunucu kapatılıyor\n"
 
-#: pg_ctl.c:807
-#: pg_ctl.c:884
+#: pg_ctl.c:893
+#: pg_ctl.c:981
 msgid ""
 "WARNING: online backup mode is active\n"
 "Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -152,212 +195,277 @@ msgstr ""
 "pg_stop_backup() çalıştırılmadam sunucu kapatılmayacaktır.\n"
 "\n"
 
-#: pg_ctl.c:811
-#: pg_ctl.c:888
+#: pg_ctl.c:897
+#: pg_ctl.c:985
 msgid "waiting for server to shut down..."
 msgstr "sunucunun kapanması bekleniyor..."
 
-#: pg_ctl.c:826
-#: pg_ctl.c:905
-msgid " failed\n"
-msgstr " başarısız oldu\n"
-
-#: pg_ctl.c:828
-#: pg_ctl.c:907
+#: pg_ctl.c:914
+#: pg_ctl.c:1004
 #, c-format
 msgid "%s: server does not shut down\n"
 msgstr "%s: sunucu kapanmıyor\n"
 
-#: pg_ctl.c:833
-#: pg_ctl.c:912
+#: pg_ctl.c:916
+#: pg_ctl.c:1006
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"İPUCU: \"-m fast\" seçeneği oturumların kendilerinin bitmesini beklemektense\n"
+"oturumları aniden keser.\n"
+
+#: pg_ctl.c:922
+#: pg_ctl.c:1012
 msgid "server stopped\n"
 msgstr "sunucu durduruldu\n"
 
-#: pg_ctl.c:856
-#: pg_ctl.c:918
+#: pg_ctl.c:945
+#: pg_ctl.c:1018
 msgid "starting server anyway\n"
 msgstr "sunucu yine de başlatılıyor\n"
 
-#: pg_ctl.c:865
+#: pg_ctl.c:954
 #, c-format
 msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
 msgstr "%s: sunucu başlatılamadı; tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
 
-#: pg_ctl.c:868
-#: pg_ctl.c:943
+#: pg_ctl.c:957
+#: pg_ctl.c:1042
 msgid "Please terminate the single-user server and try again.\n"
 msgstr "Lütfen tek kullanıcılı sunucuyu durdurun ve yeniden deneyin.\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:1016
 #, c-format
 msgid "%s: old server process (PID: %ld) seems to be gone\n"
 msgstr "%s: eski sunucu süreci (PID: %ld) kaybolmuştur\n"
 
-#: pg_ctl.c:940
+#: pg_ctl.c:1039
 #, c-format
 msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
 msgstr "%s: sunucu yeniden yüklenemedi, tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
 
-#: pg_ctl.c:949
+#: pg_ctl.c:1048
 #, c-format
 msgid "%s: could not send reload signal (PID: %ld): %s\n"
 msgstr "%s: yeniden yükleme sinyali gönderilemedi (PID: %ld): %s\n"
 
-#: pg_ctl.c:954
+#: pg_ctl.c:1053
 msgid "server signaled\n"
 msgstr "sunucuya sinyal gönderildi\n"
 
-#: pg_ctl.c:998
+#: pg_ctl.c:1079
+#, fuzzy, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr "%s: sunucu yeniden yüklenemedi, tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
+
+#: pg_ctl.c:1088
+#, fuzzy, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s: sunucu yeniden yüklenemedi, tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
+
+#: pg_ctl.c:1096
+#, fuzzy, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: \"%s\" sıkıştırılmış dosyası yaratılamadı: %s\n"
+
+#: pg_ctl.c:1102
+#, fuzzy, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s: \"%s\":dosyasına yazılamadı:  %s\n"
+
+#: pg_ctl.c:1110
+#, fuzzy, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: yeniden yükleme sinyali gönderilemedi (PID: %ld): %s\n"
+
+#: pg_ctl.c:1113
+#, fuzzy, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s: \"%s\" dosyası açılamadı: %s\n"
+
+#: pg_ctl.c:1118
+#, fuzzy
+msgid "server promoting\n"
+msgstr "sunucu başlıyor\n"
+
+#: pg_ctl.c:1163
 #, c-format
 msgid "%s: single-user server is running (PID: %ld)\n"
 msgstr "%s: sunucu, tek kullanıcı biçiminde çalışıyor (PID: %ld)\n"
 
-#: pg_ctl.c:1010
+#: pg_ctl.c:1175
 #, c-format
 msgid "%s: server is running (PID: %ld)\n"
 msgstr "%s: sunucu çalışıyor (PID: %ld)\n"
 
-#: pg_ctl.c:1021
+#: pg_ctl.c:1186
 #, c-format
 msgid "%s: no server running\n"
 msgstr "%s: çalışan sunucu yok\n"
 
-#: pg_ctl.c:1032
+#: pg_ctl.c:1197
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: %d reload sinyali gönderilemedi (PID: %ld): %s\n"
 
-#: pg_ctl.c:1066
+#: pg_ctl.c:1231
 #, c-format
 msgid "%s: could not find own program executable\n"
 msgstr "%s:Çalıştırılabilir dosya bulunamadı\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1241
 #, c-format
 msgid "%s: could not find postgres program executable\n"
 msgstr "%s: çalıştırılabilir postgres programı bulunamadı\n"
 
-#: pg_ctl.c:1138
-#: pg_ctl.c:1170
+#: pg_ctl.c:1306
+#: pg_ctl.c:1338
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: servis yöneticisi açılamadı\n"
 
-#: pg_ctl.c:1144
+#: pg_ctl.c:1312
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: \"%s\" servisi daha önce kaydedilmiştir\n"
 
-#: pg_ctl.c:1155
+#: pg_ctl.c:1323
 #, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" servisi kaydedilemedi: Hata kodu %d\n"
+msgid "%s: could not register service \"%s\": error code %lu\n"
+msgstr "%s: \"%s\" servisi kayıt edilemedi: hata kodu %lu\n"
 
-#: pg_ctl.c:1176
+#: pg_ctl.c:1344
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: \"%s\" servisi kayıtlı değil\n"
 
-#: pg_ctl.c:1183
+#: pg_ctl.c:1351
 #, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: \"%s\" servisi açılamadı: Hata kodu %d\n"
+msgid "%s: could not open service \"%s\": error code %lu\n"
+msgstr "%s: \"%s\" servisi açılamadı: hata kodu %lu\n"
 
-#: pg_ctl.c:1190
+#: pg_ctl.c:1358
 #, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s:  \"%s\" servisi kaydedilemedi: Hata kodu %d\n"
+msgid "%s: could not unregister service \"%s\": error code %lu\n"
+msgstr "%s: \"%s\" servisinin kaydı silinemedi: hata kodu %lu\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1444
 msgid "Waiting for server startup...\n"
 msgstr "Sunucunun başlaması bekleniyor...\n"
 
-#: pg_ctl.c:1279
+#: pg_ctl.c:1447
 msgid "Timed out waiting for server startup\n"
 msgstr "Sunucu başlarken zaman aşımı oldu\n"
 
-#: pg_ctl.c:1283
+#: pg_ctl.c:1451
 msgid "Server started and accepting connections\n"
 msgstr "Sunucu başladı ve bağlantı kabul ediyor\n"
 
-#: pg_ctl.c:1333
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
+#: pg_ctl.c:1501
+#, fuzzy, c-format
+msgid "%s: could not start service \"%s\": error code %lu\n"
 msgstr "%s: \"%s\" servisi başlatılamadı: Hata kodu %d\n"
 
-#: pg_ctl.c:1568
+#: pg_ctl.c:1573
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr ""
+
+#: pg_ctl.c:1582
+#, fuzzy, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "open process token açma başarısız: hata kodu %d\n"
+
+#: pg_ctl.c:1595
+#, fuzzy, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: \"%s\" servisi açılamadı: Hata kodu %d\n"
+
+#: pg_ctl.c:1614
+#, fuzzy, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "inherited socket oluşturulamıyor: hata kodu %d\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid "%s: WARNING: could not locate all job object functions in system API\n"
+msgstr ""
+
+#: pg_ctl.c:1738
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Daha fazla bilgi için \"%s --help\" komutunu kullanabilirsiniz.\n"
 
-#: pg_ctl.c:1576
+#: pg_ctl.c:1746
 #, c-format
 msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s başlatmak, durdurmak, yeniden başlatmak, yapılandırma dosyalarını yeniden yüklemek\n"
-"PostgreSQL sunucusunun durumunu bildirmek, ya da PostgreSQL sürecini öldürmek için bir yardımcı programdır\n"
-"\n"
 
-#: pg_ctl.c:1578
+#: pg_ctl.c:1747
 #, c-format
 msgid "Usage:\n"
 msgstr "Kullanımı:\n"
 
-#: pg_ctl.c:1579
+#: pg_ctl.c:1748
 #, c-format
 msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
 msgstr "  %s init[db]              [-D VERİ_DİZİNİ] [-s] [-o \"SEÇENEKLER\"]\n"
 
-#: pg_ctl.c:1580
+#: pg_ctl.c:1749
 #, c-format
 msgid "  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-t saniye] [-D VERİ_DİZİNİ] [-s] [-l DOSYA_ADI] [-o \"SEÇENEKLER\"]\n"
 
-#: pg_ctl.c:1581
+#: pg_ctl.c:1750
 #, c-format
 msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-t saniye] [-D veri dizini] [-s] [-m kapatma modu]\n"
 
-#: pg_ctl.c:1582
+#: pg_ctl.c:1751
 #, c-format
 msgid ""
 "  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 "                 [-o \"OPTIONS\"]\n"
 msgstr "  %s restart [-w] [-t saniye] [-D veri dizini] [-s] [-m kapatma modu] [-o \"seçenekler\"]\n"
 
-#: pg_ctl.c:1584
+#: pg_ctl.c:1753
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D VERÄ°_DÄ°ZÄ°NÄ°] [-s]\n"
 
-#: pg_ctl.c:1585
+#: pg_ctl.c:1754
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D VERÄ°_DÄ°ZÄ°NÄ°]\n"
 
-#: pg_ctl.c:1586
+#: pg_ctl.c:1755
+#, fuzzy, c-format
+msgid "  %s promote [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D VERÄ°_DÄ°ZÄ°NÄ°] [-s]\n"
+
+#: pg_ctl.c:1756
 #, c-format
 msgid "  %s kill    SIGNALNAME PID\n"
 msgstr "  %s kill    SİNYAL_ADI SÜREÇ_NUMARASI\n"
 
-#: pg_ctl.c:1588
-#, c-format
+#: pg_ctl.c:1758
+#, fuzzy, c-format
 msgid ""
 "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+"                    [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s register   [-N servis adı] [-U kullanıcı adı] [-P şifre] [-D veri dizini]\n"
 "                    [-w] ]-t saniye] [-o \"seçenekler\"]\n"
 
-#: pg_ctl.c:1590
+#: pg_ctl.c:1760
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N SERVÄ°S_ADI]\n"
 
-#: pg_ctl.c:1593
+#: pg_ctl.c:1763
 #, c-format
 msgid ""
 "\n"
@@ -366,42 +474,42 @@ msgstr ""
 "\n"
 "Ortak seçenekler:\n"
 
-#: pg_ctl.c:1594
+#: pg_ctl.c:1764
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata VERİ_DİZİNİ   verinin tutulacağı alan\n"
 
-#: pg_ctl.c:1595
+#: pg_ctl.c:1765
 #, c-format
 msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr "  -s, --silent           sadece hataları yazar, hiç bir bilgi mesajı yazmaz\n"
 
-#: pg_ctl.c:1596
+#: pg_ctl.c:1766
 #, c-format
 msgid "  -t SECS                seconds to wait when using -w option\n"
 msgstr "  -t SECS                -w seçeneğini kullanırken beklenecek süre\n"
 
-#: pg_ctl.c:1597
+#: pg_ctl.c:1767
 #, c-format
 msgid "  -w                     wait until operation completes\n"
 msgstr "  -w                     iÅŸlem bitene kadar bekle\n"
 
-#: pg_ctl.c:1598
+#: pg_ctl.c:1768
 #, c-format
 msgid "  -W                     do not wait until operation completes\n"
 msgstr "  -W                     iÅŸlem bitene kadar bekleme\n"
 
-#: pg_ctl.c:1599
+#: pg_ctl.c:1769
 #, c-format
 msgid "  --help                 show this help, then exit\n"
 msgstr "  --help                 Bu yardımı göster ve çık\n"
 
-#: pg_ctl.c:1600
+#: pg_ctl.c:1770
 #, c-format
 msgid "  --version              output version information, then exit\n"
 msgstr "  --version             sürüm numarasını yazar ve çıkar\n"
 
-#: pg_ctl.c:1601
+#: pg_ctl.c:1771
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -410,12 +518,12 @@ msgstr ""
 "(Ön tanımlı işlem kapanmak için beklemektir;  başlamak ya da yeniden başlamak değildir.)\n"
 "\n"
 
-#: pg_ctl.c:1602
+#: pg_ctl.c:1772
 #, c-format
 msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
 msgstr "Eğer -D seçeneği gözardı edilirse, PGDATA çevresel değişkeni kullanılacaktır.\n"
 
-#: pg_ctl.c:1604
+#: pg_ctl.c:1774
 #, c-format
 msgid ""
 "\n"
@@ -424,22 +532,22 @@ msgstr ""
 "\n"
 "Başlamak ya da yeniden başlamak için seçenekler:\n"
 
-#: pg_ctl.c:1606
+#: pg_ctl.c:1776
 #, c-format
 msgid "  -c, --core-files       allow postgres to produce core files\n"
 msgstr "  -c, --core-files       postgres'in core dosyaları oluşturmasına izin ver\n"
 
-#: pg_ctl.c:1608
+#: pg_ctl.c:1778
 #, c-format
 msgid "  -c, --core-files       not applicable on this platform\n"
 msgstr "  -c, --core-files       bu platformda uygulanmaz\n"
 
-#: pg_ctl.c:1610
+#: pg_ctl.c:1780
 #, c-format
 msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr "  -l, --log DOSYA_ADI      Sunucu loglarını DOSYA_ADI dosyasına yaz (ya da dosyanın sonuna ekle).\n"
 
-#: pg_ctl.c:1611
+#: pg_ctl.c:1781
 #, c-format
 msgid ""
 "  -o OPTIONS             command line options to pass to postgres\n"
@@ -448,12 +556,12 @@ msgstr ""
 "  -o SEÇENEKLER             postgres'e (PostgreSQL sunucusu çalıştırılabilir dosyası)\n"
 "                         ya da initdb'ye geçilecek komut satırı seçenekleri\n"
 
-#: pg_ctl.c:1613
+#: pg_ctl.c:1783
 #, c-format
 msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
 msgstr "  -p PATH-TO-POSTGRES  normalde gerekli deÄŸildir\n"
 
-#: pg_ctl.c:1614
+#: pg_ctl.c:1784
 #, c-format
 msgid ""
 "\n"
@@ -462,12 +570,12 @@ msgstr ""
 "\n"
 "Başlatmak ya da yeniden başlatmak için seçenekler:\n"
 
-#: pg_ctl.c:1615
+#: pg_ctl.c:1785
 #, c-format
 msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr "  -m KAPANMA-MODU   \"smart\", \"fast\", veya \"immediate\" olabilir\n"
 
-#: pg_ctl.c:1617
+#: pg_ctl.c:1787
 #, c-format
 msgid ""
 "\n"
@@ -476,22 +584,22 @@ msgstr ""
 "\n"
 "Kapatma modları:\n"
 
-#: pg_ctl.c:1618
+#: pg_ctl.c:1788
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       tüm istemciler bağlantılarını kestikten sonra dur\n"
 
-#: pg_ctl.c:1619
+#: pg_ctl.c:1789
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        düzgünce kapanmadan direk olarak dur\n"
 
-#: pg_ctl.c:1620
+#: pg_ctl.c:1790
 #, c-format
 msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 msgstr "  immediate   tam bir kapanma gerçekleşmeden dur; yeniden başladığında kurtarma modunda açılır\n"
 
-#: pg_ctl.c:1622
+#: pg_ctl.c:1792
 #, c-format
 msgid ""
 "\n"
@@ -500,7 +608,7 @@ msgstr ""
 "\n"
 "kill için izin verilen sinyal adları:\n"
 
-#: pg_ctl.c:1626
+#: pg_ctl.c:1796
 #, c-format
 msgid ""
 "\n"
@@ -509,22 +617,46 @@ msgstr ""
 "\n"
 "Kaydetmek ya da kaydı silmek için seçenekler:\n"
 
-#: pg_ctl.c:1627
+#: pg_ctl.c:1797
 #, c-format
 msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
 msgstr "  -N SERVICENAME  PostgreSQL sunucusunu kaydedeceğiniz servis adı\n"
 
-#: pg_ctl.c:1628
+#: pg_ctl.c:1798
 #, c-format
 msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
 msgstr "  -P PASSWORD     PostgreSQL sunucusunu kaydetmek için hesabın şifresi\n"
 
-#: pg_ctl.c:1629
+#: pg_ctl.c:1799
 #, c-format
 msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
 msgstr "  -U USERNAME     PostgreSQL sunucusunu kaydetmek için gerekli kullanıcı adı\n"
 
-#: pg_ctl.c:1632
+#: pg_ctl.c:1800
+#, fuzzy, c-format
+msgid "  -S START-TYPE   service start type to register PostgreSQL server\n"
+msgstr "  -N SERVICENAME  PostgreSQL sunucusunu kaydedeceğiniz servis adı\n"
+
+#: pg_ctl.c:1802
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"BaÅŸlama tipleri: \n"
+
+#: pg_ctl.c:1803
+#, c-format
+msgid "  auto       start service automatically during system startup (default)\n"
+msgstr ""
+
+#: pg_ctl.c:1804
+#, c-format
+msgid "  demand     start service on demand\n"
+msgstr ""
+
+#: pg_ctl.c:1807
 #, c-format
 msgid ""
 "\n"
@@ -533,17 +665,22 @@ msgstr ""
 "\n"
 "Hataları <pgsql-bugs@postgresql.org> adresine bildiriniz.\n"
 
-#: pg_ctl.c:1657
+#: pg_ctl.c:1832
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: geçersiz kapanma modu \"%s\"\n"
 
-#: pg_ctl.c:1690
+#: pg_ctl.c:1865
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: geçersiz sinyal adı \"%s\"\n"
 
-#: pg_ctl.c:1755
+#: pg_ctl.c:1882
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: geçersiz başlama tipi \"%s\"\n"
+
+#: pg_ctl.c:1947
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -554,27 +691,32 @@ msgstr ""
 "Lütfen  (yani \"su\" kullanarak) sunucu sürecine sahip olacak (yetkisiz) kullanıcı\n"
 "ile sisteme giriş yapınız.\n"
 
-#: pg_ctl.c:1864
+#: pg_ctl.c:2018
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: -S seçeneği bu platformda desteklenmiyor.\n"
+
+#: pg_ctl.c:2065
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: çok fazla komut satırı argümanı (ilki : \"%s\")\n"
 
-#: pg_ctl.c:1886
+#: pg_ctl.c:2089
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: kill modu için eksik argümanlar\n"
 
-#: pg_ctl.c:1904
+#: pg_ctl.c:2107
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: geçersiz işlem modu \"%s\"\n"
 
-#: pg_ctl.c:1914
+#: pg_ctl.c:2117
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: hiçbir işlem belirtilmedi\n"
 
-#: pg_ctl.c:1930
+#: pg_ctl.c:2133
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%s: Hiçbir veritabanı dizini belirtilmemiş ve PGDATA çevresel değişkeni boş\n"
@@ -612,30 +754,42 @@ msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
 msgid "could not read symbolic link \"%s\""
 msgstr "symbolic link \"%s\" okuma hatası"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
 
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s başlatmak, durdurmak, yeniden başlatmak, yapılandırma dosyalarını "
+#~ "yeniden yüklemek\n"
+#~ "PostgreSQL sunucusunun durumunu bildirmek, ya da PostgreSQL sürecini "
+#~ "öldürmek için bir yardımcı programdır\n"
+#~ "\n"
+
 #~ msgid "could not start server\n"
 #~ msgstr "sunucu başlatılamadı\n"
diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
deleted file mode 100644
index 7cf6bff1aa37e..0000000000000
--- a/src/bin/pg_ctl/po/zh_CN.po
+++ /dev/null
@@ -1,656 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pg_ctl (PostgreSQL 9.0)\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-10-01 14:41+0000\n"
-"PO-Revision-Date: 2010-10-01 12:49+0800\n"
-"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Chinese (Simplified)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: pg_ctl.c:226 pg_ctl.c:241 pg_ctl.c:1851
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: 内存溢出\n"
-
-#: pg_ctl.c:275
-#, c-format
-msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: 无法打开 PID 文件 \"%s\": %s\n"
-
-#: pg_ctl.c:282
-#, c-format
-msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: PID文件 \"%s\" 中存在无效数�\n"
-
-#: pg_ctl.c:558
-#, c-format
-msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr "%s: �能设置核心文件大�的�制;�盘����许\n"
-
-#: pg_ctl.c:583
-#, c-format
-msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: 无法读�文件 \"%s\"\n"
-
-#: pg_ctl.c:588
-#, c-format
-msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: 选项文件 \"%s\" �能有一行\n"
-
-#: pg_ctl.c:636
-#, c-format
-msgid ""
-"The program \"%s\" is needed by %s but was not found in the\n"
-"same directory as \"%s\".\n"
-"Check your installation.\n"
-msgstr ""
-"%2$s需�程�\"%1$s\", 但是在�一个目录\"%3$s\"中没找到.\n"
-"\n"
-"请检查您的安装.\n"
-
-#: pg_ctl.c:642
-#, c-format
-msgid ""
-"The program \"%s\" was found by \"%s\"\n"
-"but was not the same version as %s.\n"
-"Check your installation.\n"
-msgstr ""
-"\"%2$s\"找到程� \"%1$s\", 但是和版本 \"%3$s\" �一致.\n"
-"\n"
-"检查您的安装.\n"
-
-#: pg_ctl.c:675
-#, c-format
-msgid "%s: database system initialization failed\n"
-msgstr "%s: 数�库系统�始化失败\n"
-
-#: pg_ctl.c:691
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: 其他�务器进程�能正在�行; �试�动�务器进程\n"
-
-#: pg_ctl.c:728
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: 无法�动�务器进程: 退出�为 %d\n"
-
-#: pg_ctl.c:739 pg_ctl.c:752
-#, c-format
-msgid ""
-"%s: could not start server\n"
-"Examine the log output.\n"
-msgstr ""
-"%s: 无法�动�务器进程\n"
-"检查日志输出.\n"
-
-#: pg_ctl.c:748
-msgid "waiting for server to start..."
-msgstr "等待�务器进程�动 ..."
-
-#: pg_ctl.c:759 pg_ctl.c:840 pg_ctl.c:928
-msgid " done\n"
-msgstr " 完�\n"
-
-#: pg_ctl.c:760
-msgid "server started\n"
-msgstr "�务器进程已��动\n"
-
-#: pg_ctl.c:764
-msgid "server starting\n"
-msgstr "正在�动�务器进程\n"
-
-#: pg_ctl.c:779 pg_ctl.c:862 pg_ctl.c:950
-#, c-format
-msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID 文件 \"%s\" �存在\n"
-
-#: pg_ctl.c:780 pg_ctl.c:864 pg_ctl.c:951
-msgid "Is server running?\n"
-msgstr "�务器进程是�正在�行?\n"
-
-#: pg_ctl.c:786
-#, c-format
-msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 无法�止�务器进程; 正在�行 �用户模��务器进程(PID: %ld)\n"
-
-#: pg_ctl.c:794 pg_ctl.c:886
-#, c-format
-msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: 无法���止信� (PID: %ld): %s\n"
-
-#: pg_ctl.c:801
-msgid "server shutting down\n"
-msgstr "正在关闭�务器进程\n"
-
-#: pg_ctl.c:816 pg_ctl.c:901
-msgid ""
-"WARNING: online backup mode is active\n"
-"Shutdown will not complete until pg_stop_backup() is called.\n"
-"\n"
-msgstr ""
-"警告: 在线备份模�处于激活状�\n"
-"关闭命令将�会完�，直到调用了pg_stop_backup().\n"
-
-#: pg_ctl.c:820 pg_ctl.c:905
-msgid "waiting for server to shut down..."
-msgstr "等待�务器进程关闭 ..."
-
-#: pg_ctl.c:835 pg_ctl.c:922
-msgid " failed\n"
-msgstr " 失败\n"
-
-#: pg_ctl.c:837 pg_ctl.c:924
-#, c-format
-msgid "%s: server does not shut down\n"
-msgstr "%s: server进程没有关闭\n"
-
-#: pg_ctl.c:842 pg_ctl.c:929
-msgid "server stopped\n"
-msgstr "�务器进程已�关闭\n"
-
-#: pg_ctl.c:865 pg_ctl.c:935
-msgid "starting server anyway\n"
-msgstr "正在�动�务器进程\n"
-
-#: pg_ctl.c:874
-#, c-format
-msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 无法���务器进程; �用户模��务器进程正在�行 (PID: %ld)\n"
-
-#: pg_ctl.c:877 pg_ctl.c:960
-msgid "Please terminate the single-user server and try again.\n"
-msgstr "请终止�用户模��务器进程，然���试.\n"
-
-#: pg_ctl.c:933
-#, c-format
-msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: 原有的进程(PID: %ld)�能已��存在了\n"
-
-#: pg_ctl.c:957
-#, c-format
-msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr ""
-"%s: 无法�新加载�务器进程；正在�行�用户模�的�务器进程 (PID: %ld)\n"
-
-#: pg_ctl.c:966
-#, c-format
-msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: 无法���载信� (PID: %ld): %s\n"
-
-#: pg_ctl.c:971
-msgid "server signaled\n"
-msgstr "�务器进程�出信�\n"
-
-#: pg_ctl.c:1015
-#, c-format
-msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: 正在�行�用户模��务器进程 (PID: %ld)\n"
-
-#: pg_ctl.c:1027
-#, c-format
-msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: 正在�行�务器进程(PID: %ld)\n"
-
-#: pg_ctl.c:1038
-#, c-format
-msgid "%s: no server running\n"
-msgstr "%s:没有�务器进程正在�行\n"
-
-#: pg_ctl.c:1049
-#, c-format
-msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: 无法��信� %d (PID: %ld): %s\n"
-
-#: pg_ctl.c:1083
-#, c-format
-msgid "%s: could not find own program executable\n"
-msgstr "%s: 无法找到执行文件\n"
-
-#: pg_ctl.c:1093
-#, c-format
-msgid "%s: could not find postgres program executable\n"
-msgstr "%s: 无法找到postgres程�的执行文件\n"
-
-#: pg_ctl.c:1155 pg_ctl.c:1187
-#, c-format
-msgid "%s: could not open service manager\n"
-msgstr "%s: 无法打开�务管�器\n"
-
-#: pg_ctl.c:1161
-#, c-format
-msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: �务 \"%s\" 已�注册了\n"
-
-#: pg_ctl.c:1172
-#, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: 无法注册�务 \"%s\": 错误� %d\n"
-
-#: pg_ctl.c:1193
-#, c-format
-msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: �务 \"%s\" 没有注册\n"
-
-#: pg_ctl.c:1200
-#, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: 无法打开�务 \"%s\": 错误� %d\n"
-
-#: pg_ctl.c:1207
-#, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: 无法注销�务 \"%s\": 错误� %d\n"
-
-#: pg_ctl.c:1293
-msgid "Waiting for server startup...\n"
-msgstr "等待�务器进程�动 ...\n"
-
-#: pg_ctl.c:1296
-msgid "Timed out waiting for server startup\n"
-msgstr "在等待�务器�动时超时\n"
-
-#: pg_ctl.c:1300
-msgid "Server started and accepting connections\n"
-msgstr "�务器进程已�动并且接�连接\n"
-
-#: pg_ctl.c:1350
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: 无法�动�务 \"%s\": 错误� %d\n"
-
-#: pg_ctl.c:1585
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "试用 \"%s --help\" 获�更多的信�.\n"
-
-#: pg_ctl.c:1593
-#, c-format
-msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
-"\n"
-msgstr ""
-"%s 是一个�动, �止, ��, �载�置文件, 报告 PostgreSQL �务器状�,\n"
-"或者�掉 PostgreSQL 进程的工具\n"
-"\n"
-
-#: pg_ctl.c:1595
-#, c-format
-msgid "Usage:\n"
-msgstr "使用方法:\n"
-
-#: pg_ctl.c:1596
-#, c-format
-msgid "  %s init[db]               [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
-msgstr "  %s init[db]               [-D 数�目录] [-s] [-o \"选项\"]\n"
-
-#: pg_ctl.c:1597
-#, c-format
-msgid ""
-"  %s start   [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
-"\"]\n"
-msgstr ""
-"  %s start   [-w]  [-t 秒数] [-D 数�目录] [-s] [-l 文件�] [-o \"选项\"]\n"
-
-#: pg_ctl.c:1598
-#, c-format
-msgid "  %s stop    [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr "  %s stop   [-w]  [-t 秒数] [-D 数�目录] [-s] [-m 关闭模�]\n"
-
-#: pg_ctl.c:1599
-#, c-format
-msgid ""
-"  %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-"                 [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s restart [-w] [-t 秒数] [-D 数�目录] [-s] [-m 关闭模�]\n"
-"                [-o \"选项\"]\n"
-
-#: pg_ctl.c:1601
-#, c-format
-msgid "  %s reload  [-D DATADIR] [-s]\n"
-msgstr "  %s reload  [-D 数�目录] [-s]\n"
-
-#: pg_ctl.c:1602
-#, c-format
-msgid "  %s status  [-D DATADIR]\n"
-msgstr "  %s status  [-D 数�目录]\n"
-
-#: pg_ctl.c:1603
-#, c-format
-msgid "  %s kill    SIGNALNAME PID\n"
-msgstr "  %s kill    信��称 进程�\n"
-
-#: pg_ctl.c:1605
-#, c-format
-msgid ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"                    [-w] [-t SECS] [-o \"OPTIONS\"]\n"
-msgstr ""
-"  %s register   [-N �务�称] [-U 用户�] [-P �令] [-D 数�目录]\n"
-"              [-w] [-t 秒数] [-o \"选项\"]\n"
-
-#: pg_ctl.c:1607
-#, c-format
-msgid "  %s unregister [-N SERVICENAME]\n"
-msgstr "  %s unregister [-N �务�称]\n"
-
-#: pg_ctl.c:1610
-#, c-format
-msgid ""
-"\n"
-"Common options:\n"
-msgstr ""
-"\n"
-"普通选项:\n"
-
-#: pg_ctl.c:1611
-#, c-format
-msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
-msgstr "  -D, --pgdata 数�目录  数�存储的�置\n"
-
-#: pg_ctl.c:1612
-#, c-format
-msgid "  -s, --silent           only print errors, no informational messages\n"
-msgstr "  -s, --silent           �打�错误信�, 没有其他信�\n"
-
-#: pg_ctl.c:1613
-#, c-format
-msgid "  -t SECS                seconds to wait when using -w option\n"
-msgstr "  -t SECS                当使用-w 选项时需�等待的秒数\n"
-
-#: pg_ctl.c:1614
-#, c-format
-msgid "  -w                     wait until operation completes\n"
-msgstr "  -w                     等待直到�作完�\n"
-
-#: pg_ctl.c:1615
-#, c-format
-msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -W                     �用等待�作完�\n"
-
-#: pg_ctl.c:1616
-#, c-format
-msgid "  --help                 show this help, then exit\n"
-msgstr "  --help                 显示此帮助信�, 然�退出\n"
-
-#: pg_ctl.c:1617
-#, c-format
-msgid "  --version              output version information, then exit\n"
-msgstr "  --version              显示版本信�, 然�退出\n"
-
-#: pg_ctl.c:1618
-#, c-format
-msgid ""
-"(The default is to wait for shutdown, but not for start or restart.)\n"
-"\n"
-msgstr ""
-"(默认为关闭等待, 但�是�动或��.)\n"
-"\n"
-
-#: pg_ctl.c:1619
-#, c-format
-msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "如果�略了 -D 选项, 将使用 PGDATA 环境��.\n"
-
-#: pg_ctl.c:1621
-#, c-format
-msgid ""
-"\n"
-"Options for start or restart:\n"
-msgstr ""
-"\n"
-"�动或��的选项:\n"
-
-#: pg_ctl.c:1623
-#, c-format
-msgid "  -c, --core-files       allow postgres to produce core files\n"
-msgstr "  -c, --core-files       �许postgres进程产生核心文件\n"
-
-#: pg_ctl.c:1625
-#, c-format
-msgid "  -c, --core-files       not applicable on this platform\n"
-msgstr "  -c, --core-files       在这�平�上��用\n"
-
-#: pg_ctl.c:1627
-#, c-format
-msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
-msgstr "  -l, --log FILENAME     写入 (或追加) �务器日志到文件 FILENAME\n"
-
-#: pg_ctl.c:1628
-#, c-format
-msgid ""
-"  -o OPTIONS             command line options to pass to postgres\n"
-"                         (PostgreSQL server executable) or initdb\n"
-msgstr ""
-"  -o OPTIONS             传递给postgres的命令行选项\n"
-"                      (PostgreSQL �务器执行文件)或initdb\n"
-
-#: pg_ctl.c:1630
-#, c-format
-msgid "  -p PATH-TO-POSTGRES    normally not necessary\n"
-msgstr "  -p PATH-TO-POSTMASTER  正常情况�必�\n"
-
-#: pg_ctl.c:1631
-#, c-format
-msgid ""
-"\n"
-"Options for stop or restart:\n"
-msgstr ""
-"\n"
-"�止或��的选项:\n"
-
-#: pg_ctl.c:1632
-#, c-format
-msgid "  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr "  -m SHUTDOWN-MODE   �以是 \"smart\", \"fast\", 或者 \"immediate\"\n"
-
-#: pg_ctl.c:1634
-#, c-format
-msgid ""
-"\n"
-"Shutdown modes are:\n"
-msgstr ""
-"\n"
-"关闭模�有如下几�:\n"
-
-#: pg_ctl.c:1635
-#, c-format
-msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  smart       所有客户端断开连接�退出\n"
-
-#: pg_ctl.c:1636
-#, c-format
-msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  fast        直接退出, 正确的关闭\n"
-
-#: pg_ctl.c:1637
-#, c-format
-msgid ""
-"  immediate   quit without complete shutdown; will lead to recovery on "
-"restart\n"
-msgstr "  immediate   �完全的关闭退出; �����\n"
-
-#: pg_ctl.c:1639
-#, c-format
-msgid ""
-"\n"
-"Allowed signal names for kill:\n"
-msgstr ""
-"\n"
-"�许关闭的信��称:\n"
-
-#: pg_ctl.c:1643
-#, c-format
-msgid ""
-"\n"
-"Options for register and unregister:\n"
-msgstr ""
-"\n"
-"注册或注销的选项:\n"
-
-#: pg_ctl.c:1644
-#, c-format
-msgid ""
-"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
-msgstr "  -N �务�称     注册到 PostgreSQL �务器的�务�称\n"
-
-#: pg_ctl.c:1645
-#, c-format
-msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
-msgstr "  -P �令         注册到 PostgreSQL �务器�户的�令\n"
-
-#: pg_ctl.c:1646
-#, c-format
-msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
-msgstr "  -U 用户�       注册到 PostgreSQL �务器�户的用户�\n"
-
-#: pg_ctl.c:1649
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_ctl.c:1674
-#, c-format
-msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: 无效的关闭模� \"%s\"\n"
-
-#: pg_ctl.c:1707
-#, c-format
-msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: 无效信��称 \"%s\"\n"
-
-#: pg_ctl.c:1772
-#, c-format
-msgid ""
-"%s: cannot be run as root\n"
-"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
-"own the server process.\n"
-msgstr ""
-"%s: 无法以 root 用户�行\n"
-"请以�务器进程所属用户 (�特�用户) 登录 (或使用 \"su\")\n"
-"\n"
-
-#: pg_ctl.c:1881
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: 命令行�数太多 (第一个是 \"%s\")\n"
-
-#: pg_ctl.c:1903
-#, c-format
-msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: 缺少 kill 模��数\n"
-
-#: pg_ctl.c:1921
-#, c-format
-msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: 无效的�作模� \"%s\"\n"
-
-#: pg_ctl.c:1931
-#, c-format
-msgid "%s: no operation specified\n"
-msgstr "%s: 没有指定�作\n"
-
-#: pg_ctl.c:1947
-#, c-format
-msgid ""
-"%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: 没有指定数�目录, 并且没有设置 PGDATA 环境��\n"
-
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "无法确认当�目录: %s"
-
-# command.c:122
-#: ../../port/exec.c:144
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "无效的二进制� \"%s\""
-
-# command.c:1103
-#: ../../port/exec.c:193
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "无法读�二进制� \"%s\""
-
-#: ../../port/exec.c:200
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "未能找到一个 \"%s\" �执行"
-
-#: ../../port/exec.c:255 ../../port/exec.c:291
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "无法进入目录 \"%s\""
-
-#: ../../port/exec.c:270
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "无法读�符�链结 \"%s\""
-
-#: ../../port/exec.c:516
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "�进程已退出, 退出�为 %d"
-
-#: ../../port/exec.c:520
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "�进程被例外(exception) 0x%X 终止"
-
-#: ../../port/exec.c:529
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "�进程被信� %s 终止"
-
-#: ../../port/exec.c:532
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "�进程被信� %d 终止"
-
-#: ../../port/exec.c:536
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "�进程已退出, 未知状� %d"
-
-#~ msgid "could not start server\n"
-#~ msgstr "无法�动�务器进程\n"
-
-#~ msgid ""
-#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
-#~ "same directory as \"%s\".\n"
-#~ "Check your installation.\n"
-#~ msgstr ""
-#~ "程� \"postmaster\" 是 %s 需�的, 但没有在�一个目录 \"%s\" �现.\n"
-#~ "\n"
-#~ "检查您的安装.\n"
-
-#~ msgid ""
-#~ "The program \"postmaster\" was found by \"%s\"\n"
-#~ "but was not the same version as %s.\n"
-#~ "Check your installation.\n"
-#~ msgstr ""
-#~ "%s 找到程� \"postmaster\", 但版本和 \"%s\" �一致.\n"
-#~ "\n"
-#~ "检查您的安装.\n"
-
-#~ msgid "%s: neither postmaster nor postgres running\n"
-#~ msgstr "%s: postmaster 或者 postgres 没有�行\n"
-
-#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-#~ msgstr "%s: 一个独立的�端 \"postgres\" 正在�行 (PID: %ld)\n"
-
-#~ msgid "%s: invalid option %s\n"
-#~ msgstr "%s: 无效选项 %s\n"
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index c419c2d18063a..aa9c606969e4a 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -105,6 +105,17 @@ getSchemaData(int *numTablesPtr)
 		write_msg(NULL, "reading schemas\n");
 	getNamespaces(&numNamespaces);
 
+	/*
+	 * getTables should be done as soon as possible, so as to minimize the
+	 * window between starting our transaction and acquiring per-table locks.
+	 * However, we have to do getNamespaces first because the tables get
+	 * linked to their containing namespaces during getTables.
+	 */
+	if (g_verbose)
+		write_msg(NULL, "reading user-defined tables\n");
+	tblinfo = getTables(&numTables);
+	tblinfoindex = buildIndexArray(tblinfo, numTables, sizeof(TableInfo));
+
 	if (g_verbose)
 		write_msg(NULL, "reading extensions\n");
 	extinfo = getExtensions(&numExtensions);
@@ -114,7 +125,7 @@ getSchemaData(int *numTablesPtr)
 	funinfo = getFuncs(&numFuncs);
 	funinfoindex = buildIndexArray(funinfo, numFuncs, sizeof(FuncInfo));
 
-	/* this must be after getFuncs */
+	/* this must be after getTables and getFuncs */
 	if (g_verbose)
 		write_msg(NULL, "reading user-defined types\n");
 	typinfo = getTypes(&numTypes);
@@ -183,11 +194,6 @@ getSchemaData(int *numTablesPtr)
 		write_msg(NULL, "reading type casts\n");
 	getCasts(&numCasts);
 
-	if (g_verbose)
-		write_msg(NULL, "reading user-defined tables\n");
-	tblinfo = getTables(&numTables);
-	tblinfoindex = buildIndexArray(tblinfo, numTables, sizeof(TableInfo));
-
 	if (g_verbose)
 		write_msg(NULL, "reading table inheritance information\n");
 	inhinfo = getInherits(&numInherits);
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 1049c6340ebf2..19848ccc417b3 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -1,6 +1,6 @@
 # src/bin/pg_dump/nls.mk
 CATALOG_NAME	:= pg_dump
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR sv tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko pl pt_BR sv tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_dump.c common.c pg_backup_archiver.c pg_backup_custom.c \
                    pg_backup_db.c pg_backup_files.c pg_backup_null.c \
                    pg_backup_tar.c pg_restore.c pg_dumpall.c \
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 0e1037cf00d56..62206ecda4d37 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -117,6 +117,7 @@ static TocEntry *getTocEntryByDumpId(ArchiveHandle *AH, DumpId id);
 static void _moveBefore(ArchiveHandle *AH, TocEntry *pos, TocEntry *te);
 static int	_discoverArchiveFormat(ArchiveHandle *AH);
 
+static int	RestoringToDB(ArchiveHandle *AH);
 static void dump_lo_buf(ArchiveHandle *AH);
 static void _write_msg(const char *modulename, const char *fmt, va_list ap);
 static void _die_horribly(ArchiveHandle *AH, const char *modulename, const char *fmt, va_list ap);
@@ -212,6 +213,7 @@ void
 RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 {
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
+	bool		parallel_mode;
 	TocEntry   *te;
 	teReqs		reqs;
 	OutputContext sav;
@@ -237,6 +239,27 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 	if (ropt->createDB && ropt->single_txn)
 		die_horribly(AH, modulename, "-C and -1 are incompatible options\n");
 
+	/*
+	 * If we're going to do parallel restore, there are some restrictions.
+	 */
+	parallel_mode = (ropt->number_of_jobs > 1 && ropt->useDB);
+	if (parallel_mode)
+	{
+		/* We haven't got round to making this work for all archive formats */
+		if (AH->ClonePtr == NULL || AH->ReopenPtr == NULL)
+			die_horribly(AH, modulename, "parallel restore is not supported with this archive file format\n");
+
+		/* Doesn't work if the archive represents dependencies as OIDs */
+		if (AH->version < K_VERS_1_8)
+			die_horribly(AH, modulename, "parallel restore is not supported with archives made by pre-8.0 pg_dump\n");
+
+		/*
+		 * It's also not gonna work if we can't reopen the input file, so
+		 * let's try that immediately.
+		 */
+		(AH->ReopenPtr) (AH);
+	}
+
 	/*
 	 * Make sure we won't need (de)compression we haven't got
 	 */
@@ -384,7 +407,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 	 *
 	 * In parallel mode, turn control over to the parallel-restore logic.
 	 */
-	if (ropt->number_of_jobs > 1 && ropt->useDB)
+	if (parallel_mode)
 		restore_toc_entries_parallel(AH);
 	else
 	{
@@ -589,13 +612,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
 					}
 
 					/*
-					 * If we have a copy statement, use it. As of V1.3, these
-					 * are separate to allow easy import from withing a
-					 * database connection. Pre 1.3 archives can not use DB
-					 * connections and are sent to output only.
-					 *
-					 * For V1.3+, the table data MUST have a copy statement so
-					 * that we can go into appropriate mode with libpq.
+					 * If we have a copy statement, use it.
 					 */
 					if (te->copyStmt && strlen(te->copyStmt) > 0)
 					{
@@ -605,7 +622,15 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
 
 					(*AH->PrintTocDataPtr) (AH, te, ropt);
 
-					AH->writingCopyData = false;
+					/*
+					 * Terminate COPY if needed.
+					 */
+					if (AH->writingCopyData)
+					{
+						if (RestoringToDB(AH))
+							EndDBCopyMode(AH, te);
+						AH->writingCopyData = false;
+					}
 
 					/* close out the transaction started above */
 					if (is_parallel && te->created)
@@ -1248,17 +1273,13 @@ ahprintf(ArchiveHandle *AH, const char *fmt,...)
 {
 	char	   *p = NULL;
 	va_list		ap;
-	int			bSize = strlen(fmt) + 256;		/* Should be enough */
+	int			bSize = strlen(fmt) + 256;		/* Usually enough */
 	int			cnt = -1;
 
 	/*
 	 * This is paranoid: deal with the possibility that vsnprintf is willing
-	 * to ignore trailing null
-	 */
-
-	/*
-	 * or returns > 0 even if string does not fit. It may be the case that it
-	 * returns cnt = bufsize
+	 * to ignore trailing null or returns > 0 even if string does not fit.
+	 * It may be the case that it returns cnt = bufsize.
 	 */
 	while (cnt < 0 || cnt >= (bSize - 1))
 	{
@@ -1340,7 +1361,7 @@ dump_lo_buf(ArchiveHandle *AH)
 
 
 /*
- *	Write buffer to the output file (usually stdout). This is user for
+ *	Write buffer to the output file (usually stdout). This is used for
  *	outputting 'restore' scripts etc. It is even possible for an archive
  *	format to create a custom output routine to 'fake' a restore if it
  *	wants to generate a script (see TAR output).
@@ -1392,7 +1413,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
 		 * connected then send it to the DB.
 		 */
 		if (RestoringToDB(AH))
-			return ExecuteSqlCommandBuf(AH, (void *) ptr, size * nmemb);		/* Always 1, currently */
+			return ExecuteSqlCommandBuf(AH, (const char *) ptr, size * nmemb);
 		else
 		{
 			res = fwrite((void *) ptr, size, nmemb, AH->OF);
@@ -1985,9 +2006,6 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
 	AH->mode = mode;
 	AH->compression = compression;
 
-	AH->pgCopyBuf = createPQExpBuffer();
-	AH->sqlBuf = createPQExpBuffer();
-
 	/* Open stdout with no compression for AH output handle */
 	AH->gzOut = 0;
 	AH->OF = stdout;
@@ -3261,14 +3279,6 @@ restore_toc_entries_parallel(ArchiveHandle *AH)
 
 	ahlog(AH, 2, "entering restore_toc_entries_parallel\n");
 
-	/* we haven't got round to making this work for all archive formats */
-	if (AH->ClonePtr == NULL || AH->ReopenPtr == NULL)
-		die_horribly(AH, modulename, "parallel restore is not supported with this archive file format\n");
-
-	/* doesn't work if the archive represents dependencies as OIDs, either */
-	if (AH->version < K_VERS_1_8)
-		die_horribly(AH, modulename, "parallel restore is not supported with archives made by pre-8.0 pg_dump\n");
-
 	slots = (ParallelSlot *) calloc(sizeof(ParallelSlot), n_slots);
 
 	/* Adjust dependency information */
@@ -4199,10 +4209,7 @@ CloneArchive(ArchiveHandle *AH)
 		die_horribly(AH, modulename, "out of memory\n");
 	memcpy(clone, AH, sizeof(ArchiveHandle));
 
-	/* Handle format-independent fields */
-	clone->pgCopyBuf = createPQExpBuffer();
-	clone->sqlBuf = createPQExpBuffer();
-	clone->sqlparse.tagBuf = NULL;
+	/* Handle format-independent fields ... none at the moment */
 
 	/* The clone will have its own connection, so disregard connection state */
 	clone->connection = NULL;
@@ -4235,11 +4242,7 @@ DeCloneArchive(ArchiveHandle *AH)
 	/* Clear format-specific state */
 	(AH->DeClonePtr) (AH);
 
-	/* Clear state allocated by CloneArchive */
-	destroyPQExpBuffer(AH->pgCopyBuf);
-	destroyPQExpBuffer(AH->sqlBuf);
-	if (AH->sqlparse.tagBuf)
-		destroyPQExpBuffer(AH->sqlparse.tagBuf);
+	/* Clear state allocated by CloneArchive ... none at the moment */
 
 	/* Clear any connection-local state */
 	if (AH->currUser)
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index f9af8742cc4dc..8a3a6f9e2221a 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -132,28 +132,6 @@ typedef void (*DeClonePtr) (struct _archiveHandle * AH);
 
 typedef size_t (*CustomOutPtr) (struct _archiveHandle * AH, const void *buf, size_t len);
 
-typedef enum
-{
-	SQL_SCAN = 0,				/* normal */
-	SQL_IN_SQL_COMMENT,			/* -- comment */
-	SQL_IN_EXT_COMMENT,			/* slash-star comment */
-	SQL_IN_SINGLE_QUOTE,		/* '...' literal */
-	SQL_IN_E_QUOTE,				/* E'...' literal */
-	SQL_IN_DOUBLE_QUOTE,		/* "..." identifier */
-	SQL_IN_DOLLAR_TAG,			/* possible dollar-quote starting tag */
-	SQL_IN_DOLLAR_QUOTE			/* body of dollar quote */
-} sqlparseState;
-
-typedef struct
-{
-	sqlparseState state;		/* see above */
-	char		lastChar;		/* preceding char, or '\0' initially */
-	bool		backSlash;		/* next char is backslash quoted? */
-	int			braceDepth;		/* parenthesis nesting depth */
-	PQExpBuffer tagBuf;			/* dollar quote tag (NULL if not created) */
-	int			minTagEndPos;	/* first possible end position of $-quote */
-} sqlparseInfo;
-
 typedef enum
 {
 	STAGE_NONE = 0,
@@ -189,9 +167,6 @@ typedef struct _archiveHandle
 								 * Added V1.7 */
 	ArchiveFormat format;		/* Archive format */
 
-	sqlparseInfo sqlparse;
-	PQExpBuffer sqlBuf;
-
 	time_t		createDate;		/* Date archive created */
 
 	/*
@@ -244,8 +219,6 @@ typedef struct _archiveHandle
 								 * required */
 	bool		writingCopyData;	/* True when we are sending COPY data */
 	bool		pgCopyIn;		/* Currently in libpq 'COPY IN' mode. */
-	PQExpBuffer pgCopyBuf;		/* Left-over data from incomplete lines in
-								 * COPY IN */
 
 	int			loFd;			/* BLOB fd */
 	int			writingBlob;	/* Flag */
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index 01d5e379999dd..9224d7bbe2e83 100644
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -735,10 +735,15 @@ _ReopenArchive(ArchiveHandle *AH)
 
 	if (AH->mode == archModeWrite)
 		die_horribly(AH, modulename, "can only reopen input archives\n");
+
+	/*
+	 * These two cases are user-facing errors since they represent unsupported
+	 * (but not invalid) use-cases.  Word the error messages appropriately.
+	 */
 	if (AH->fSpec == NULL || strcmp(AH->fSpec, "") == 0)
-		die_horribly(AH, modulename, "cannot reopen stdin\n");
+		die_horribly(AH, modulename, "parallel restore from stdin is not supported\n");
 	if (!ctx->hasSeek)
-		die_horribly(AH, modulename, "cannot reopen non-seekable file\n");
+		die_horribly(AH, modulename, "parallel restore from non-seekable file is not supported\n");
 
 	errno = 0;
 	tpos = ftello(AH->FH);
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index cc3882c46c875..600728d19856a 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -14,26 +14,19 @@
 #include "dumputils.h"
 
 #include <unistd.h>
-
 #include <ctype.h>
-
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
 
 
+#define DB_MAX_ERR_STMT 128
+
 static const char *modulename = gettext_noop("archiver (db)");
 
 static void _check_database_version(ArchiveHandle *AH);
 static PGconn *_connectDB(ArchiveHandle *AH, const char *newdbname, const char *newUser);
 static void notice_processor(void *arg, const char *message);
-static char *_sendSQLLine(ArchiveHandle *AH, char *qry, char *eos);
-static char *_sendCopyLine(ArchiveHandle *AH, char *qry, char *eos);
-
-static bool _isIdentChar(unsigned char c);
-static bool _isDQChar(unsigned char c, bool atStart);
-
-#define DB_MAX_ERR_STMT 128
 
 static int
 _parse_version(ArchiveHandle *AH, const char *versionString)
@@ -330,8 +323,10 @@ notice_processor(void *arg, const char *message)
 }
 
 
-/* Public interface */
-/* Convenience function to send a query. Monitors result to handle COPY statements */
+/*
+ * Convenience function to send a query.
+ * Monitors result to detect COPY statements
+ */
 static void
 ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
 {
@@ -348,6 +343,7 @@ ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
 	{
 		case PGRES_COMMAND_OK:
 		case PGRES_TUPLES_OK:
+		case PGRES_EMPTY_QUERY:
 			/* A-OK */
 			break;
 		case PGRES_COPY_IN:
@@ -372,78 +368,56 @@ ExecuteSqlCommand(ArchiveHandle *AH, const char *qry, const char *desc)
 	PQclear(res);
 }
 
+
 /*
- * Used by ExecuteSqlCommandBuf to send one buffered line when running a COPY command.
+ * Implement ahwrite() for direct-to-DB restore
  */
-static char *
-_sendCopyLine(ArchiveHandle *AH, char *qry, char *eos)
+int
+ExecuteSqlCommandBuf(ArchiveHandle *AH, const char *buf, size_t bufLen)
 {
-	size_t		loc;			/* Location of next newline */
-	int			pos = 0;		/* Current position */
-	int			sPos = 0;		/* Last pos of a slash char */
-	int			isEnd = 0;
-
-	/* loop to find unquoted newline ending the line of COPY data */
-	for (;;)
+	if (AH->writingCopyData)
 	{
-		loc = strcspn(&qry[pos], "\n") + pos;
-
-		/* If no match, then wait */
-		if (loc >= (eos - qry)) /* None found */
-		{
-			appendBinaryPQExpBuffer(AH->pgCopyBuf, qry, (eos - qry));
-			return eos;
-		}
-
 		/*
-		 * fprintf(stderr, "Found cr at %d, prev char was %c, next was %c\n",
-		 * loc, qry[loc-1], qry[loc+1]);
+		 * We drop the data on the floor if libpq has failed to enter COPY
+		 * mode; this allows us to behave reasonably when trying to continue
+		 * after an error in a COPY command.
 		 */
-
-		/* Count the number of preceding slashes */
-		sPos = loc;
-		while (sPos > 0 && qry[sPos - 1] == '\\')
-			sPos--;
-
-		sPos = loc - sPos;
-
+		if (AH->pgCopyIn &&
+			PQputCopyData(AH->connection, buf, bufLen) <= 0)
+			die_horribly(AH, modulename, "error returned by PQputCopyData: %s",
+						 PQerrorMessage(AH->connection));
+	}
+	else
+	{
 		/*
-		 * If an odd number of preceding slashes, then \n was escaped so set
-		 * the next search pos, and loop (if any left).
+		 * In most cases the data passed to us will be a null-terminated
+		 * string, but if it's not, we have to add a trailing null.
 		 */
-		if ((sPos & 1) == 1)
+		if (buf[bufLen] == '\0')
+			ExecuteSqlCommand(AH, buf, "could not execute query");
+		else
 		{
-			/* fprintf(stderr, "cr was escaped\n"); */
-			pos = loc + 1;
-			if (pos >= (eos - qry))
-			{
-				appendBinaryPQExpBuffer(AH->pgCopyBuf, qry, (eos - qry));
-				return eos;
-			}
+			char   *str = (char *) malloc(bufLen + 1);
+
+			if (!str)
+				die_horribly(AH, modulename, "out of memory\n");
+			memcpy(str, buf, bufLen);
+			str[bufLen] = '\0';
+			ExecuteSqlCommand(AH, str, "could not execute query");
+			free(str);
 		}
-		else
-			break;
 	}
 
-	/* We found an unquoted newline */
-	qry[loc] = '\0';
-	appendPQExpBuffer(AH->pgCopyBuf, "%s\n", qry);
-	isEnd = (strcmp(AH->pgCopyBuf->data, "\\.\n") == 0);
-
-	/*
-	 * Note that we drop the data on the floor if libpq has failed to enter
-	 * COPY mode; this allows us to behave reasonably when trying to continue
-	 * after an error in a COPY command.
-	 */
-	if (AH->pgCopyIn &&
-		PQputCopyData(AH->connection, AH->pgCopyBuf->data,
-					  AH->pgCopyBuf->len) <= 0)
-		die_horribly(AH, modulename, "error returned by PQputCopyData: %s",
-					 PQerrorMessage(AH->connection));
-
-	resetPQExpBuffer(AH->pgCopyBuf);
+	return 1;
+}
 
-	if (isEnd && AH->pgCopyIn)
+/*
+ * Terminate a COPY operation during direct-to-DB restore
+ */
+void
+EndDBCopyMode(ArchiveHandle *AH, TocEntry *te)
+{
+	if (AH->pgCopyIn)
 	{
 		PGresult   *res;
 
@@ -454,240 +428,12 @@ _sendCopyLine(ArchiveHandle *AH, char *qry, char *eos)
 		/* Check command status and return to normal libpq state */
 		res = PQgetResult(AH->connection);
 		if (PQresultStatus(res) != PGRES_COMMAND_OK)
-			warn_or_die_horribly(AH, modulename, "COPY failed: %s",
-								 PQerrorMessage(AH->connection));
+			warn_or_die_horribly(AH, modulename, "COPY failed for table \"%s\": %s",
+								 te->tag, PQerrorMessage(AH->connection));
 		PQclear(res);
 
 		AH->pgCopyIn = false;
 	}
-
-	return qry + loc + 1;
-}
-
-/*
- * Used by ExecuteSqlCommandBuf to send one buffered line of SQL
- * (not data for the copy command).
- */
-static char *
-_sendSQLLine(ArchiveHandle *AH, char *qry, char *eos)
-{
-	/*
-	 * The following is a mini state machine to assess the end of an SQL
-	 * statement. It really only needs to parse good SQL, or at least that's
-	 * the theory... End-of-statement is assumed to be an unquoted,
-	 * un-commented semi-colon that's not within any parentheses.
-	 *
-	 * Note: the input can be split into bufferloads at arbitrary boundaries.
-	 * Therefore all state must be kept in AH->sqlparse, not in local
-	 * variables of this routine.  We assume that AH->sqlparse was filled with
-	 * zeroes when created.
-	 */
-	for (; qry < eos; qry++)
-	{
-		switch (AH->sqlparse.state)
-		{
-			case SQL_SCAN:		/* Default state == 0, set in _allocAH */
-				if (*qry == ';' && AH->sqlparse.braceDepth == 0)
-				{
-					/*
-					 * We've found the end of a statement. Send it and reset
-					 * the buffer.
-					 */
-					appendPQExpBufferChar(AH->sqlBuf, ';');		/* inessential */
-					ExecuteSqlCommand(AH, AH->sqlBuf->data,
-									  "could not execute query");
-					resetPQExpBuffer(AH->sqlBuf);
-					AH->sqlparse.lastChar = '\0';
-
-					/*
-					 * Remove any following newlines - so that embedded COPY
-					 * commands don't get a starting newline.
-					 */
-					qry++;
-					while (qry < eos && *qry == '\n')
-						qry++;
-
-					/* We've finished one line, so exit */
-					return qry;
-				}
-				else if (*qry == '\'')
-				{
-					if (AH->sqlparse.lastChar == 'E')
-						AH->sqlparse.state = SQL_IN_E_QUOTE;
-					else
-						AH->sqlparse.state = SQL_IN_SINGLE_QUOTE;
-					AH->sqlparse.backSlash = false;
-				}
-				else if (*qry == '"')
-				{
-					AH->sqlparse.state = SQL_IN_DOUBLE_QUOTE;
-				}
-
-				/*
-				 * Look for dollar-quotes. We make the assumption that
-				 * $-quotes will not have an ident character just before them
-				 * in pg_dump output.  XXX is this good enough?
-				 */
-				else if (*qry == '$' && !_isIdentChar(AH->sqlparse.lastChar))
-				{
-					AH->sqlparse.state = SQL_IN_DOLLAR_TAG;
-					/* initialize separate buffer with possible tag */
-					if (AH->sqlparse.tagBuf == NULL)
-						AH->sqlparse.tagBuf = createPQExpBuffer();
-					else
-						resetPQExpBuffer(AH->sqlparse.tagBuf);
-					appendPQExpBufferChar(AH->sqlparse.tagBuf, *qry);
-				}
-				else if (*qry == '-' && AH->sqlparse.lastChar == '-')
-					AH->sqlparse.state = SQL_IN_SQL_COMMENT;
-				else if (*qry == '*' && AH->sqlparse.lastChar == '/')
-					AH->sqlparse.state = SQL_IN_EXT_COMMENT;
-				else if (*qry == '(')
-					AH->sqlparse.braceDepth++;
-				else if (*qry == ')')
-					AH->sqlparse.braceDepth--;
-				break;
-
-			case SQL_IN_SQL_COMMENT:
-				if (*qry == '\n')
-					AH->sqlparse.state = SQL_SCAN;
-				break;
-
-			case SQL_IN_EXT_COMMENT:
-
-				/*
-				 * This isn't fully correct, because we don't account for
-				 * nested slash-stars, but pg_dump never emits such.
-				 */
-				if (AH->sqlparse.lastChar == '*' && *qry == '/')
-					AH->sqlparse.state = SQL_SCAN;
-				break;
-
-			case SQL_IN_SINGLE_QUOTE:
-				/* We needn't handle '' specially */
-				if (*qry == '\'' && !AH->sqlparse.backSlash)
-					AH->sqlparse.state = SQL_SCAN;
-				else if (*qry == '\\')
-					AH->sqlparse.backSlash = !AH->sqlparse.backSlash;
-				else
-					AH->sqlparse.backSlash = false;
-				break;
-
-			case SQL_IN_E_QUOTE:
-
-				/*
-				 * Eventually we will need to handle '' specially, because
-				 * after E'...''... we should still be in E_QUOTE state.
-				 *
-				 * XXX problem: how do we tell whether the dump was made by a
-				 * version that thinks backslashes aren't special in non-E
-				 * literals??
-				 */
-				if (*qry == '\'' && !AH->sqlparse.backSlash)
-					AH->sqlparse.state = SQL_SCAN;
-				else if (*qry == '\\')
-					AH->sqlparse.backSlash = !AH->sqlparse.backSlash;
-				else
-					AH->sqlparse.backSlash = false;
-				break;
-
-			case SQL_IN_DOUBLE_QUOTE:
-				/* We needn't handle "" specially */
-				if (*qry == '"')
-					AH->sqlparse.state = SQL_SCAN;
-				break;
-
-			case SQL_IN_DOLLAR_TAG:
-				if (*qry == '$')
-				{
-					/* Do not add the closing $ to tagBuf */
-					AH->sqlparse.state = SQL_IN_DOLLAR_QUOTE;
-					AH->sqlparse.minTagEndPos = AH->sqlBuf->len + AH->sqlparse.tagBuf->len + 1;
-				}
-				else if (_isDQChar(*qry, (AH->sqlparse.tagBuf->len == 1)))
-				{
-					/* Valid, so add to tag */
-					appendPQExpBufferChar(AH->sqlparse.tagBuf, *qry);
-				}
-				else
-				{
-					/*
-					 * Ooops, we're not really in a dollar-tag.  Valid tag
-					 * chars do not include the various chars we look for in
-					 * this state machine, so it's safe to just jump from this
-					 * state back to SCAN.	We have to back up the qry pointer
-					 * so that the current character gets rescanned in SCAN
-					 * state; and then "continue" so that the bottom-of-loop
-					 * actions aren't done yet.
-					 */
-					AH->sqlparse.state = SQL_SCAN;
-					qry--;
-					continue;
-				}
-				break;
-
-			case SQL_IN_DOLLAR_QUOTE:
-
-				/*
-				 * If we are at a $, see whether what precedes it matches
-				 * tagBuf.	(Remember that the trailing $ of the tag was not
-				 * added to tagBuf.)  However, don't compare until we have
-				 * enough data to be a possible match --- this is needed to
-				 * avoid false match on '$a$a$...'
-				 */
-				if (*qry == '$' &&
-					AH->sqlBuf->len >= AH->sqlparse.minTagEndPos &&
-					strcmp(AH->sqlparse.tagBuf->data,
-						   AH->sqlBuf->data + AH->sqlBuf->len - AH->sqlparse.tagBuf->len) == 0)
-					AH->sqlparse.state = SQL_SCAN;
-				break;
-		}
-
-		appendPQExpBufferChar(AH->sqlBuf, *qry);
-		AH->sqlparse.lastChar = *qry;
-	}
-
-	/*
-	 * If we get here, we've processed entire bufferload with no complete SQL
-	 * stmt
-	 */
-	return eos;
-}
-
-
-/* Convenience function to send one or more queries. Monitors result to handle COPY statements */
-int
-ExecuteSqlCommandBuf(ArchiveHandle *AH, void *qryv, size_t bufLen)
-{
-	char	   *qry = (char *) qryv;
-	char	   *eos = qry + bufLen;
-
-	/*
-	 * fprintf(stderr, "\n\n*****\n Buffer:\n\n%s\n*******************\n\n",
-	 * qry);
-	 */
-
-	/* Could switch between command and COPY IN mode at each line */
-	while (qry < eos)
-	{
-		/*
-		 * If libpq is in CopyIn mode *or* if the archive structure shows we
-		 * are sending COPY data, treat the data as COPY data.	The pgCopyIn
-		 * check is only needed for backwards compatibility with ancient
-		 * archive files that might just issue a COPY command without marking
-		 * it properly.  Note that in an archive entry that has a copyStmt,
-		 * all data up to the end of the entry will go to _sendCopyLine, and
-		 * therefore will be dropped if libpq has failed to enter COPY mode.
-		 * Also, if a "\." data terminator is found, anything remaining in the
-		 * archive entry will be dropped.
-		 */
-		if (AH->pgCopyIn || AH->writingCopyData)
-			qry = _sendCopyLine(AH, qry, eos);
-		else
-			qry = _sendSQLLine(AH, qry, eos);
-	}
-
-	return 1;
 }
 
 void
@@ -728,32 +474,3 @@ DropBlobIfExists(ArchiveHandle *AH, Oid oid)
 				 oid, oid);
 	}
 }
-
-static bool
-_isIdentChar(unsigned char c)
-{
-	if ((c >= 'a' && c <= 'z')
-		|| (c >= 'A' && c <= 'Z')
-		|| (c >= '0' && c <= '9')
-		|| (c == '_')
-		|| (c == '$')
-		|| (c >= (unsigned char) '\200')		/* no need to check <= \377 */
-		)
-		return true;
-	else
-		return false;
-}
-
-static bool
-_isDQChar(unsigned char c, bool atStart)
-{
-	if ((c >= 'a' && c <= 'z')
-		|| (c >= 'A' && c <= 'Z')
-		|| (c == '_')
-		|| (!atStart && c >= '0' && c <= '9')
-		|| (c >= (unsigned char) '\200')		/* no need to check <= \377 */
-		)
-		return true;
-	else
-		return false;
-}
diff --git a/src/bin/pg_dump/pg_backup_db.h b/src/bin/pg_dump/pg_backup_db.h
index 93970b5a91817..a1a84825e4163 100644
--- a/src/bin/pg_dump/pg_backup_db.h
+++ b/src/bin/pg_dump/pg_backup_db.h
@@ -10,7 +10,9 @@
 
 #include "pg_backup_archiver.h"
 
-extern int	ExecuteSqlCommandBuf(ArchiveHandle *AH, void *qry, size_t bufLen);
+extern int	ExecuteSqlCommandBuf(ArchiveHandle *AH, const char *buf, size_t bufLen);
+
+extern void EndDBCopyMode(ArchiveHandle *AH, struct _tocEntry * te);
 
 extern void StartTransaction(ArchiveHandle *AH);
 extern void CommitTransaction(ArchiveHandle *AH);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 9e69b0fc5241e..57f2ed31ad084 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -528,20 +528,14 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+	/* Identify archive format to emit */
 	archiveFormat = parseArchiveFormat(format, &archiveMode);
 
 	/* archiveFormat specific setup */
 	if (archiveFormat == archNull)
 		plainText = 1;
 
-	/*
-	 * Ignore compression level for plain format. XXX: This is a bit
-	 * inconsistent, tar-format throws an error instead.
-	 */
-	if (archiveFormat == archNull)
-		compressLevel = 0;
-
-	/* Custom and directory formats are compressed by default */
+	/* Custom and directory formats are compressed by default, others not */
 	if (compressLevel == -1)
 	{
 		if (archiveFormat == archCustom || archiveFormat == archDirectory)
@@ -550,7 +544,7 @@ main(int argc, char **argv)
 			compressLevel = 0;
 	}
 
-	/* open the output file */
+	/* Open the output file */
 	g_fout = CreateArchive(filename, archiveFormat, compressLevel, archiveMode);
 
 	if (g_fout == NULL)
@@ -649,9 +643,10 @@ main(int argc, char **argv)
 		do_sql_command(g_conn, "SET quote_all_identifiers = true");
 
 	/*
-	 * Disables security label support if server version < v9.1.x
+	 * Disable security label support if server version < v9.1.x (prevents
+	 * access to nonexistent pg_seclabel catalog)
 	 */
-	if (!no_security_labels && g_fout->remoteVersion < 90100)
+	if (g_fout->remoteVersion < 90100)
 		no_security_labels = 1;
 
 	/*
@@ -1099,8 +1094,11 @@ selectDumpableTable(TableInfo *tbinfo)
  * If it's a table's rowtype or an autogenerated array type, we also apply a
  * special type code to facilitate sorting into the desired order.	(We don't
  * want to consider those to be ordinary types because that would bring tables
- * up into the datatype part of the dump order.)  Those tests should be made
- * first to ensure the objType change is applied regardless of namespace etc.
+ * up into the datatype part of the dump order.)  We still set the object's
+ * dump flag; that's not going to cause the dummy type to be dumped, but we
+ * need it so that casts involving such types will be dumped correctly -- see
+ * dumpCast.  This means the flag should be set the same as for the underlying
+ * object (the table or base type).
  */
 static void
 selectDumpableType(TypeInfo *tyinfo)
@@ -1109,19 +1107,30 @@ selectDumpableType(TypeInfo *tyinfo)
 	if (OidIsValid(tyinfo->typrelid) &&
 		tyinfo->typrelkind != RELKIND_COMPOSITE_TYPE)
 	{
-		tyinfo->dobj.dump = false;
+		TableInfo  *tytable = findTableByOid(tyinfo->typrelid);
+
 		tyinfo->dobj.objType = DO_DUMMY_TYPE;
+		if (tytable != NULL)
+			tyinfo->dobj.dump = tytable->dobj.dump;
+		else
+			tyinfo->dobj.dump = false;
+		return;
 	}
 
 	/* skip auto-generated array types */
-	else if (tyinfo->isArray)
+	if (tyinfo->isArray)
 	{
-		tyinfo->dobj.dump = false;
 		tyinfo->dobj.objType = DO_DUMMY_TYPE;
+		/*
+		 * Fall through to set the dump flag; we assume that the subsequent
+		 * rules will do the same thing as they would for the array's base
+		 * type.  (We cannot reliably look up the base type here, since
+		 * getTypes may not have processed it yet.)
+		 */
 	}
 
 	/* dump only types in dumpable namespaces */
-	else if (!tyinfo->dobj.namespace->dobj.dump)
+	if (!tyinfo->dobj.namespace->dobj.dump)
 		tyinfo->dobj.dump = false;
 
 	/* skip undefined placeholder types */
@@ -3960,14 +3969,13 @@ getTables(int *numTables)
 		 * owning column, if any (note this dependency is AUTO as of 8.2)
 		 */
 		appendPQExpBuffer(query,
-						  "SELECT c.tableoid, c.oid, relname, "
-						  "relacl, relkind, relnamespace, "
-						  "(%s relowner) AS rolname, "
-						  "relchecks, (reltriggers <> 0) AS relhastriggers, "
-						  "relhasindex, relhasrules, relhasoids, "
-						  "relfrozenxid, "
-						  "0 AS toid, "
-						  "0 AS tfrozenxid, "
+						  "SELECT c.tableoid, c.oid, c.relname, "
+						  "c.relacl, c.relkind, c.relnamespace, "
+						  "(%s c.relowner) AS rolname, "
+						  "c.relchecks, (c.reltriggers <> 0) AS relhastriggers, "
+						  "c.relhasindex, c.relhasrules, c.relhasoids, "
+						  "c.relfrozenxid, tc.oid AS toid, "
+						  "tc.relfrozenxid AS tfrozenxid, "
 						  "'p' AS relpersistence, "
 						  "NULL AS reloftype, "
 						  "d.refobjid AS owning_tab, "
@@ -3981,7 +3989,8 @@ getTables(int *numTables)
 						  "d.classid = c.tableoid AND d.objid = c.oid AND "
 						  "d.objsubid = 0 AND "
 						  "d.refclassid = c.tableoid AND d.deptype = 'a') "
-						  "WHERE relkind in ('%c', '%c', '%c', '%c') "
+					   "LEFT JOIN pg_class tc ON (c.reltoastrelid = tc.oid) "
+						  "WHERE c.relkind in ('%c', '%c', '%c', '%c') "
 						  "ORDER BY c.oid",
 						  username_subquery,
 						  RELKIND_SEQUENCE,
@@ -6369,8 +6378,10 @@ getForeignDataWrappers(int *numForeignDataWrappers)
 						  "fdwhandler::pg_catalog.regproc, "
 						  "fdwvalidator::pg_catalog.regproc, fdwacl, "
 						  "array_to_string(ARRAY("
-						  "		SELECT option_name || ' ' || quote_literal(option_value) "
-						  "		FROM pg_options_to_table(fdwoptions)), ', ') AS fdwoptions "
+						  "SELECT quote_ident(option_name) || ' ' || "
+						  "quote_literal(option_value) "
+						  "FROM pg_options_to_table(fdwoptions)"
+						  "), ', ') AS fdwoptions "
 						  "FROM pg_foreign_data_wrapper",
 						  username_subquery);
 	}
@@ -6381,8 +6392,10 @@ getForeignDataWrappers(int *numForeignDataWrappers)
 						  "'-' AS fdwhandler, "
 						  "fdwvalidator::pg_catalog.regproc, fdwacl, "
 						  "array_to_string(ARRAY("
-						  "		SELECT option_name || ' ' || quote_literal(option_value) "
-						  "		FROM pg_options_to_table(fdwoptions)), ', ') AS fdwoptions "
+						  "SELECT quote_ident(option_name) || ' ' || "
+						  "quote_literal(option_value) "
+						  "FROM pg_options_to_table(fdwoptions)"
+						  "), ', ') AS fdwoptions "
 						  "FROM pg_foreign_data_wrapper",
 						  username_subquery);
 	}
@@ -6468,8 +6481,10 @@ getForeignServers(int *numForeignServers)
 					  "(%s srvowner) AS rolname, "
 					  "srvfdw, srvtype, srvversion, srvacl,"
 					  "array_to_string(ARRAY("
-		 "		SELECT option_name || ' ' || quote_literal(option_value) "
-	   "		FROM pg_options_to_table(srvoptions)), ', ') AS srvoptions "
+					  "SELECT quote_ident(option_name) || ' ' || "
+					  "quote_literal(option_value) "
+					  "FROM pg_options_to_table(srvoptions)"
+					  "), ', ') AS srvoptions "
 					  "FROM pg_foreign_server",
 					  username_subquery);
 
@@ -11395,9 +11410,13 @@ dumpUserMappings(Archive *fout,
 
 	appendPQExpBuffer(query,
 					  "SELECT usename, "
-					  "array_to_string(ARRAY(SELECT option_name || ' ' || quote_literal(option_value) FROM pg_options_to_table(umoptions)), ', ') AS umoptions\n"
+					  "array_to_string(ARRAY("
+					  "SELECT quote_ident(option_name) || ' ' || "
+					  "quote_literal(option_value) "
+					  "FROM pg_options_to_table(umoptions)"
+					  "), ', ') AS umoptions "
 					  "FROM pg_user_mappings "
-					  "WHERE srvid = %u",
+					  "WHERE srvid = '%u'",
 					  catalogId.oid);
 
 	res = PQexec(g_conn, query->data);
@@ -11750,6 +11769,12 @@ findSecLabels(Archive *fout, Oid classoid, Oid objoid, SecLabelItem **items)
 	if (nlabels < 0)
 		nlabels = collectSecLabels(fout, &labels);
 
+	if (nlabels <= 0)			/* no labels, so no match is possible */
+	{
+		*items = NULL;
+		return 0;
+	}
+
 	/*
 	 * Do binary search to find some item matching the object.
 	 */
@@ -11951,12 +11976,12 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 	int			numParents;
 	TableInfo **parents;
 	int			actual_atts;	/* number of attrs in this CREATE statment */
-	char	   *reltypename;
+	const char *reltypename;
 	char	   *storage;
+	char	   *srvname;
+	char	   *ftoptions;
 	int			j,
 				k;
-	char	   *srvname;
-	char	   *ftoptions = NULL;
 
 	/* Make sure we are in proper schema */
 	selectSourceSchema(tbinfo->dobj.namespace->dobj.name);
@@ -12042,14 +12067,27 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 			/* retrieve name of foreign server and generic options */
 			appendPQExpBuffer(query,
-							  "SELECT fs.srvname, array_to_string(ARRAY("
-				"   SELECT option_name || ' ' || quote_literal(option_value)"
-			   "   FROM pg_options_to_table(ftoptions)), ', ') AS ftoptions "
-						"FROM pg_foreign_table ft JOIN pg_foreign_server fs "
-							  "	ON (fs.oid = ft.ftserver) "
-							"WHERE ft.ftrelid = %u", tbinfo->dobj.catId.oid);
+							  "SELECT fs.srvname, "
+							  "pg_catalog.array_to_string(ARRAY("
+							  "SELECT pg_catalog.quote_ident(option_name) || "
+							  "' ' || pg_catalog.quote_literal(option_value) "
+							  "FROM pg_catalog.pg_options_to_table(ftoptions)"
+							  "), ', ') AS ftoptions "
+							  "FROM pg_catalog.pg_foreign_table ft "
+							  "JOIN pg_catalog.pg_foreign_server fs "
+							  "ON (fs.oid = ft.ftserver) "
+							  "WHERE ft.ftrelid = '%u'",
+							  tbinfo->dobj.catId.oid);
 			res = PQexec(g_conn, query->data);
 			check_sql_result(res, g_conn, query->data, PGRES_TUPLES_OK);
+			if (PQntuples(res) != 1)
+			{
+				write_msg(NULL, ngettext("query returned %d foreign server entry for foreign table \"%s\"\n",
+										 "query returned %d foreign server entries for foreign table \"%s\"\n",
+										 PQntuples(res)),
+						  PQntuples(res), tbinfo->dobj.name);
+				exit_nicely();
+			}
 			i_srvname = PQfnumber(res, "srvname");
 			i_ftoptions = PQfnumber(res, "ftoptions");
 			srvname = strdup(PQgetvalue(res, 0, i_srvname));
@@ -12240,7 +12278,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		}
 
 		if (tbinfo->relkind == RELKIND_FOREIGN_TABLE)
-			appendPQExpBuffer(q, "\nSERVER %s", srvname);
+			appendPQExpBuffer(q, "\nSERVER %s", fmtId(srvname));
 
 		if ((tbinfo->reloptions && strlen(tbinfo->reloptions) > 0) ||
 		  (tbinfo->toast_reloptions && strlen(tbinfo->toast_reloptions) > 0))
@@ -12689,7 +12727,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 			exit_nicely();
 		}
 
-		if (binary_upgrade && !coninfo->condef)
+		if (binary_upgrade)
 			binary_upgrade_set_pg_class_oids(q, indxinfo->dobj.catId.oid, true);
 
 		appendPQExpBuffer(q, "ALTER TABLE ONLY %s\n",
diff --git a/src/bin/pg_dump/po/cs.po b/src/bin/pg_dump/po/cs.po
new file mode 100644
index 0000000000000..16e1251e6fb40
--- /dev/null
+++ b/src/bin/pg_dump/po/cs.po
@@ -0,0 +1,2521 @@
+# translation of pg_dump-cs.po to
+# translation of pg_dump-cs.po to Czech
+# Czech translation of pg_dump messages
+#
+# pgtranslation Id: pg_dump.po,v 1.4 2011/09/08 18:23:05 petere Exp $
+#
+# Karel Zak <zakkr@zf.jcu.cz>, 2001-2003, 2004, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_dump-cs\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-30 11:34+0200\n"
+"PO-Revision-Date: 2011-09-06 12:38+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pg_dump.c:489 pg_dump.c:503 pg_restore.c:274 pg_restore.c:290
+#: pg_restore.c:302 pg_dumpall.c:296 pg_dumpall.c:306 pg_dumpall.c:316
+#: pg_dumpall.c:325 pg_dumpall.c:334 pg_dumpall.c:392
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: pg_dump.c:501 pg_restore.c:288 pg_dumpall.c:304
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
+
+#: pg_dump.c:514
+msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
+msgstr "volby -s/--schema-only a -a/--data-only nelze používat spole�ně\n"
+
+#: pg_dump.c:520
+msgid "options -c/--clean and -a/--data-only cannot be used together\n"
+msgstr "volby -c/--clean a -a/--data-only nelze používat spole�ně\n"
+
+#: pg_dump.c:526
+msgid ""
+"options --inserts/--column-inserts and -o/--oids cannot be used together\n"
+msgstr "volby --inserts/--column-inserts a -o/--oids nelze používat spole�ně\n"
+
+#: pg_dump.c:527
+msgid "(The INSERT command cannot set OIDs.)\n"
+msgstr "(Příkaz INSERT nemůže nastavovat OID.)\n"
+
+#: pg_dump.c:558
+#, c-format
+msgid "could not open output file \"%s\" for writing\n"
+msgstr "nelze otevřít výstupní soubor \"%s\" pro zápis\n"
+
+#: pg_dump.c:568 pg_backup_db.c:38
+#, c-format
+msgid "could not parse version string \"%s\"\n"
+msgstr "neplatný formát řetězce s verzí \"%s\"\n"
+
+#: pg_dump.c:591
+#, c-format
+msgid "invalid client encoding \"%s\" specified\n"
+msgstr "specifikováno neplatné klientské kódování \"%s\"\n"
+
+#: pg_dump.c:690
+#, c-format
+msgid "last built-in OID is %u\n"
+msgstr "poslední vestavěné OID je %u\n"
+
+#: pg_dump.c:700
+msgid "No matching schemas were found\n"
+msgstr "Nebyla nalezena žádná odovídající schémata.\n"
+
+#: pg_dump.c:715
+msgid "No matching tables were found\n"
+msgstr "Nebyla nalezena žádná odpovídající tabulka.\n"
+
+#: pg_dump.c:827
+#, c-format
+msgid ""
+"%s dumps a database as a text file or to other formats.\n"
+"\n"
+msgstr ""
+"%s vytvoří dump databáze jako textový soubor nebo v jiném formátu.\n"
+"\n"
+
+#: pg_dump.c:828 pg_restore.c:397 pg_dumpall.c:529
+#, c-format
+msgid "Usage:\n"
+msgstr "Použití:\n"
+
+#: pg_dump.c:829
+#, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [PŘEP�NAČ]... [DATAB�ZE]\n"
+
+#: pg_dump.c:831 pg_restore.c:400 pg_dumpall.c:532
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Základní přepína�e:\n"
+
+#: pg_dump.c:832
+#, c-format
+#| msgid "  -f, --file=FILENAME         output file name\n"
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=SOUBOR        výstupní soubor nebo adresář\n"
+
+#: pg_dump.c:833
+#, c-format
+#| msgid ""
+#| "  -F, --format=c|t|p          output file format (custom, tar, plain "
+#| "text)\n"
+msgid ""
+"  -F, --format=c|d|t|p        output file format (custom, directory, tar, "
+"plain text)\n"
+msgstr ""
+"  -F, --format=c|d|t|p       formát výstupního souboru (custom, directory, "
+"tar, plain "
+"text)\n"
+
+#: pg_dump.c:834
+#, c-format
+msgid "  -v, --verbose               verbose mode\n"
+msgstr "  -v, --verbose            vypisovat více informací\n"
+
+#: pg_dump.c:835
+#, c-format
+msgid ""
+"  -Z, --compress=0-9          compression level for compressed formats\n"
+msgstr ""
+"  -Z, --compress=0-9       úroveň komprese při použití komprimovaného "
+"formátu\n"
+
+#: pg_dump.c:836 pg_dumpall.c:534
+#, c-format
+msgid ""
+"  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
+msgstr ""
+"  --lock-wait-timeout=TIMEOUT selže po uplynutí TIMEOUT �ekáním na zámek "
+"tabulky\n"
+
+#: pg_dump.c:837 pg_dumpall.c:535
+#, c-format
+msgid "  --help                      show this help, then exit\n"
+msgstr "  --help                       ukáže tento text a skon�í\n"
+
+#: pg_dump.c:838 pg_dumpall.c:536
+#, c-format
+msgid "  --version                   output version information, then exit\n"
+msgstr "  --version                    ukáže informace o verzi a skon�í\n"
+
+#: pg_dump.c:840 pg_dumpall.c:537
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output content:\n"
+msgstr ""
+"\n"
+"Přepína�e ovlivňující výstup:\n"
+
+#: pg_dump.c:841 pg_dumpall.c:538
+#, c-format
+msgid "  -a, --data-only             dump only the data, not the schema\n"
+msgstr ""
+"  -a, --data-only          dump pouze dat bez definic databázových objektů\n"
+
+#: pg_dump.c:842
+#, c-format
+msgid "  -b, --blobs                 include large objects in dump\n"
+msgstr "  -b, --blobs              zahrnout \"large objects\" do dumpu\n"
+
+#: pg_dump.c:843
+#, c-format
+msgid ""
+"  -c, --clean                 clean (drop) database objects before "
+"recreating\n"
+msgstr ""
+"  -c, --clean              odstranit (drop) databázi před jejím vytvořením\n"
+
+#: pg_dump.c:844
+#, c-format
+msgid ""
+"  -C, --create                include commands to create database in dump\n"
+msgstr ""
+"  -C, --create             zahrnout příkazy pro vytvoření databáze do dumpu\n"
+
+#: pg_dump.c:845
+#, c-format
+msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
+msgstr "  -E, --encoding=KÓDOV�N�      kódování znaků databáze\n"
+
+#: pg_dump.c:846
+#, c-format
+msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
+msgstr ""
+"  -n, --schema=SCHEMA      vytvořit dump pouze specifikovaného schématu\n"
+
+#: pg_dump.c:847
+#, c-format
+msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
+msgstr "  -N, --exclude-schema=SCHEMA nedumpuj uvedené schéma(ta)\n"
+
+#: pg_dump.c:848 pg_dumpall.c:541
+#, c-format
+msgid "  -o, --oids                  include OIDs in dump\n"
+msgstr "  -o, --oids               zahrnout OID do dumpu\n"
+
+#: pg_dump.c:849
+#, c-format
+msgid ""
+"  -O, --no-owner              skip restoration of object ownership in\n"
+"                              plain-text format\n"
+msgstr ""
+"  -O, --no-owner           nevypisovat příkazy pro nastavení vlastníka "
+"objektu\n"
+"                           v �istě textovém formátu\n"
+
+#: pg_dump.c:851 pg_dumpall.c:544
+#, c-format
+msgid "  -s, --schema-only           dump only the schema, no data\n"
+msgstr ""
+"  -s, --schema-only        dump pouze definic databázových objektů\n"
+"                           (tabulek apod.) bez dat\n"
+
+#: pg_dump.c:852
+#, c-format
+msgid ""
+"  -S, --superuser=NAME        superuser user name to use in plain-text "
+"format\n"
+msgstr ""
+"  -S, --superuser=JMÉNO    uživatelské jméno superuživatele použité při "
+"dumpu\n"
+
+#: pg_dump.c:853
+#, c-format
+msgid "  -t, --table=TABLE           dump the named table(s) only\n"
+msgstr "  -t, --table=TABULKA      provést dump pouze uvedené tabulky\n"
+
+#: pg_dump.c:854
+#, c-format
+msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
+msgstr "  -t, --exclude-table=TABLE   neprováděj dump uvedených tabulek\n"
+
+#: pg_dump.c:855 pg_dumpall.c:547
+#, c-format
+msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
+msgstr ""
+"  -x, --no-privileges      neprovádět dump přístupových práv (grant/revoke)\n"
+
+#: pg_dump.c:856 pg_dumpall.c:548
+#, c-format
+msgid "  --binary-upgrade            for use by upgrade utilities only\n"
+msgstr ""
+"  --binary-upgrade            pouze pro použití upgradovacími nástroji\n"
+
+#: pg_dump.c:857 pg_dumpall.c:549
+#, c-format
+msgid ""
+"  --column-inserts            dump data as INSERT commands with column "
+"names\n"
+msgstr ""
+"  --column-inserts            použije pro dump dat příkaz INSERT se jmény "
+"sloupců\n"
+
+#: pg_dump.c:858 pg_dumpall.c:550
+#, c-format
+msgid ""
+"  --disable-dollar-quoting    disable dollar quoting, use SQL standard "
+"quoting\n"
+msgstr ""
+"  --disable-dollar-quoting    nepoužívat znak dolaru místo uvozovek, "
+"používat\n"
+"                           standardní SQL uvozování\n"
+
+#: pg_dump.c:859 pg_dumpall.c:551
+#, c-format
+msgid ""
+"  --disable-triggers          disable triggers during data-only restore\n"
+msgstr ""
+"  --disable-triggers          zakázat volání triggerů během obnovy dat\n"
+
+#: pg_dump.c:860 pg_dumpall.c:552
+#, c-format
+msgid ""
+"  --inserts                   dump data as INSERT commands, rather than "
+"COPY\n"
+msgstr ""
+"  --inserts                   použít pro dump dat příkazy INSERT místo COPY\n"
+
+#: pg_dump.c:861 pg_dumpall.c:553
+#, c-format
+#| msgid "  --no-tablespaces            do not dump tablespace assignments\n"
+msgid "  --no-security-labels        do not dump security label assignments\n"
+msgstr "  --no-security-labels        neprovádět dump bezpe�nostních štítků\n"
+
+#: pg_dump.c:862 pg_dumpall.c:554
+#, c-format
+msgid "  --no-tablespaces            do not dump tablespace assignments\n"
+msgstr "  --no-tablespaces            neprovádět dump přiřazení tablespaces\n"
+
+#: pg_dump.c:863 pg_dumpall.c:555
+#, c-format
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr "  --no-unlogged-table-data    nedumpuj data unlogged tabulek\n"
+
+#: pg_dump.c:864 pg_dumpall.c:556
+#, c-format
+msgid ""
+"  --quote-all-identifiers     quote all identifiers, even if not key words\n"
+msgstr ""
+"  --quote-all-identifiers     všechny identifikátory uve� v uvozovkách, i "
+"když se nejedná o klí�ová slova\n"
+
+#: pg_dump.c:865
+#, c-format
+msgid ""
+"  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr ""
+"  --serializable-deferrable   po�kej než bude možné provést dump bez "
+"anomálií\n"
+
+#: pg_dump.c:866 pg_dumpall.c:557
+#, c-format
+msgid ""
+"  --use-set-session-authorization\n"
+"                              use SET SESSION AUTHORIZATION commands instead "
+"of\n"
+"                              ALTER OWNER commands to set ownership\n"
+msgstr ""
+"  -use-set-session-authorization\n"
+"                           používat příkaz SET SESSION AUTHORIZATION "
+"namísto\n"
+"                           příkazu ALTER OWNER pro nastavení vlastníka\n"
+
+#: pg_dump.c:870 pg_restore.c:439 pg_dumpall.c:561
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Volby spojení:\n"
+
+#: pg_dump.c:871 pg_restore.c:440 pg_dumpall.c:562
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME      jméno databázového serveru nebo soket adresáře\n"
+
+#: pg_dump.c:872 pg_restore.c:441 pg_dumpall.c:564
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          �íslo portu databázového serveru\n"
+
+#: pg_dump.c:873 pg_restore.c:442 pg_dumpall.c:565
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr ""
+"  -U, --username=JMÉNO     navázat spojení jako specifikovaný uživatel\n"
+
+#: pg_dump.c:874 pg_restore.c:443 pg_dumpall.c:566
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nikdy se neptej na heslo\n"
+
+#: pg_dump.c:875 pg_restore.c:444 pg_dumpall.c:567
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           vynucený dotaz na heslo (měl by být proveden "
+"automaticky)\n"
+
+#: pg_dump.c:876 pg_dumpall.c:568
+#, c-format
+#| msgid "  --role=ROLENAME             do SET ROLE before dump\n"
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr "  --role=ROLENAME             před dumpem prove� SET ROLE\n"
+
+#: pg_dump.c:878
+#, c-format
+msgid ""
+"\n"
+"If no database name is supplied, then the PGDATABASE environment\n"
+"variable value is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Není-li specifikováno jméno databáze, použije se proměnná prostředí\n"
+"PGDATABASE.\n"
+"\n"
+
+#: pg_dump.c:880 pg_restore.c:448 pg_dumpall.c:572
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_dump.c:888 pg_backup_archiver.c:1458
+msgid "*** aborted because of error\n"
+msgstr "*** přerušeno z důvodu chyby\n"
+
+#: pg_dump.c:930
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "specifikován neplatný formát \"%s\" výstupu\n"
+
+#: pg_dump.c:953
+msgid "server version must be at least 7.3 to use schema selection switches\n"
+msgstr ""
+"verze serveru musí být alespoň 7.3 pro použití přepína�ů prů výběr schématu\n"
+
+#: pg_dump.c:1211
+#, c-format
+msgid "dumping contents of table %s\n"
+msgstr "dumpuji obsah tabulky %s\n"
+
+#: pg_dump.c:1331
+#, c-format
+msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
+msgstr "Dumpování obsahu tabulky \"%s\" selhalo: PQgetCopyData() selhal.\n"
+
+#: pg_dump.c:1332 pg_dump.c:14139
+#, c-format
+msgid "Error message from server: %s"
+msgstr "Chybová zpráva ze serveru: %s"
+
+#: pg_dump.c:1333 pg_dump.c:14140
+#, c-format
+msgid "The command was: %s\n"
+msgstr "Příkaz byl: %s\n"
+
+#: pg_dump.c:1756
+msgid "saving database definition\n"
+msgstr "ukládám definice databáze\n"
+
+#: pg_dump.c:1838
+#, c-format
+msgid "missing pg_database entry for database \"%s\"\n"
+msgstr "pro databázi \"%s\" chybí záznam v katalogu pg_database\n"
+
+#: pg_dump.c:1845
+#, c-format
+msgid ""
+"query returned more than one (%d) pg_database entry for database \"%s\"\n"
+msgstr ""
+"dotaz vrátil více jak jeden (%d) záznam v pg_database pro databázi \"%s\"\n"
+
+#: pg_dump.c:1949
+msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
+msgstr "dumpDatabase(): nelze najít pg_largeobject.relfrozenxid\n"
+
+#: pg_dump.c:1988
+#| msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr "dumpDatabase(): nelze najít pg_largeobject_metadata.relfrozenxid\n"
+
+#: pg_dump.c:2067
+#, c-format
+msgid "saving encoding = %s\n"
+msgstr "ukládám kódování znaků = %s\n"
+
+#: pg_dump.c:2094
+#, c-format
+msgid "saving standard_conforming_strings = %s\n"
+msgstr "ukládám standard_conforming_strings = %s\n"
+
+#: pg_dump.c:2127
+msgid "reading large objects\n"
+msgstr "�tu \"large objects\"\n"
+
+#: pg_dump.c:2259
+msgid "saving large objects\n"
+msgstr "ukládám \"large objects\"\n"
+
+#: pg_dump.c:2301 pg_backup_archiver.c:984
+#, c-format
+msgid "could not open large object %u: %s"
+msgstr "nelze otevřít \"large object\" %u:%s"
+
+#: pg_dump.c:2314
+#, c-format
+msgid "error reading large object %u: %s"
+msgstr "chyba při �tení large objektu %u: %s"
+
+#: pg_dump.c:2361 pg_dump.c:2409 pg_dump.c:2464 pg_dump.c:7595 pg_dump.c:7826
+#: pg_dump.c:8792 pg_dump.c:9344 pg_dump.c:9598 pg_dump.c:9712 pg_dump.c:10168
+#: pg_dump.c:10354 pg_dump.c:10460 pg_dump.c:10660 pg_dump.c:10902
+#: pg_dump.c:11069 pg_dump.c:11290 pg_dump.c:13945
+#, c-format
+msgid "query returned %d row instead of one: %s\n"
+msgid_plural "query returned %d rows instead of one: %s\n"
+msgstr[0] "dotaz vrátil %d řádek místo jednoho: %s\n"
+msgstr[1] "dotaz vrátil %d řádky místo jednoho: %s\n"
+msgstr[2] "dotaz vrátil %d řádků místo jednoho: %s\n"
+
+#: pg_dump.c:2545
+#, c-format
+#| msgid "could not find entry for ID %d\n"
+msgid "could not find parent extension for %s"
+msgstr "nelze najít nadřízené rozšíření pro %s"
+
+#: pg_dump.c:2652
+#, c-format
+msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník schématu \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:2687
+#, c-format
+msgid "schema with OID %u does not exist\n"
+msgstr "schéma s OID %u neexistuje\n"
+
+#: pg_dump.c:3028
+#, c-format
+msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník datového typu \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:3132
+#, c-format
+msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník operátoru \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:3384
+#, c-format
+msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník třídy operátorů \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:3471
+#, c-format
+msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník rodiny operátorů \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:3608
+#, c-format
+msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník agrega�ní funkce \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:3778
+#, c-format
+msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník funkce \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:4278
+#, c-format
+msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
+msgstr "VAROV�N�: vlastník tabulky \"%s\" se zdá být neplatný\n"
+
+#: pg_dump.c:4421
+#, c-format
+msgid "reading indexes for table \"%s\"\n"
+msgstr "�tu indexy pro tabulku \"%s\"\n"
+
+#: pg_dump.c:4741
+#, c-format
+msgid "reading foreign key constraints for table \"%s\"\n"
+msgstr "�tu cizí klí�e pro tabulku \"%s\"\n"
+
+#: pg_dump.c:4973
+#, c-format
+msgid ""
+"failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
+"found\n"
+msgstr ""
+"selhala kontrola, OID %u rodi�ovské tabulky u pg_rewrite položky OID %u "
+"nelze najít\n"
+
+#: pg_dump.c:5057
+#, c-format
+msgid "reading triggers for table \"%s\"\n"
+msgstr "�tu triggery pro tabulku \"%s\"\n"
+
+#: pg_dump.c:5220
+#, c-format
+msgid ""
+"query produced null referenced table name for foreign key trigger \"%s\" on "
+"table \"%s\" (OID of table: %u)\n"
+msgstr ""
+"dotaz vrátil prázdné jméno referencované tabulky pro trigger \"%s\" "
+"cizího klí�e pro tabulku \"%s\" (OID tabulky: %u)\n"
+
+#: pg_dump.c:5591
+#, c-format
+msgid "finding the columns and types of table \"%s\"\n"
+msgstr "hledám sloupce a typy pro tabulku \"%s\"\n"
+
+#: pg_dump.c:5736
+#, c-format
+msgid "invalid column numbering in table \"%s\"\n"
+msgstr "neplatné �íslování sloupců v tabulce \"%s\"\n"
+
+#: pg_dump.c:5773
+#, c-format
+msgid "finding default expressions of table \"%s\"\n"
+msgstr "hledám DEFAULT výrazy pro tabulku \"%s\"\n"
+
+#: pg_dump.c:5858
+#, c-format
+msgid "invalid adnum value %d for table \"%s\"\n"
+msgstr "neplatná \"adnum\" hodnota %d pro tabulku \"%s\"\n"
+
+#: pg_dump.c:5876
+#, c-format
+msgid "finding check constraints for table \"%s\"\n"
+msgstr "hledám CHECK omezení pro tabulku \"%s\"\n"
+
+#: pg_dump.c:5956
+#, c-format
+msgid "expected %d check constraint on table \"%s\" but found %d\n"
+msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
+msgstr[0] "o�ekáváno %d CHECK omezení pro tabulku \"%s\", ale nalezeno %d\n"
+msgstr[1] "o�ekáváno %d CHECK omezení pro tabulku \"%s\", ale nalezeno %d\n"
+msgstr[2] "o�ekáváno %d CHECK omezení pro tabulku \"%s\", ale nalezeno %d\n"
+
+#: pg_dump.c:5960
+msgid "(The system catalogs might be corrupted.)\n"
+msgstr "(Systémové katalogy mohou být poškozeny.)\n"
+
+#: pg_dump.c:8558
+msgid "WARNING: bogus value in proargmodes array\n"
+msgstr "VAROV�N�: nesmyslná hodnota v \"proargmodes\" poli\n"
+
+#: pg_dump.c:8872
+msgid "WARNING: could not parse proallargtypes array\n"
+msgstr "VAROV�N�: nelze naparsovat pole \"proallargtypes\"\n"
+
+#: pg_dump.c:8888
+msgid "WARNING: could not parse proargmodes array\n"
+msgstr "VAROV�N�: nelze naparsovat pole \"proargmodes\"\n"
+
+#: pg_dump.c:8902
+msgid "WARNING: could not parse proargnames array\n"
+msgstr "VAROV�N�: nelze naparsovat pole \"proargnames\"\n"
+
+#: pg_dump.c:8913
+msgid "WARNING: could not parse proconfig array\n"
+msgstr "VAROV�N�: nelze naparsovat pole \"proconfig\"\n"
+
+#: pg_dump.c:8969
+#, c-format
+msgid "unrecognized provolatile value for function \"%s\"\n"
+msgstr "nerozpoznaná \"provolatile\" hodnota pro funkci \"%s\"\n"
+
+#: pg_dump.c:9185
+msgid "WARNING: bogus value in pg_cast.castmethod field\n"
+msgstr "VAROV�N�: nesmyslná hodnota v položce \"pg_cast.castmethod\"\n"
+
+#: pg_dump.c:9567
+#, c-format
+msgid "WARNING: could not find operator with OID %s\n"
+msgstr "VAROV�N�: nelze najít operátor s OID %s\n"
+
+#: pg_dump.c:10686
+#, c-format
+msgid ""
+"WARNING: aggregate function %s could not be dumped correctly for this "
+"database version; ignored\n"
+msgstr ""
+"VAROV�N�: agrega�ní funkce %s nelze dumpovat korektně pro tuto verzi "
+"databáze; ignorováno\n"
+
+#: pg_dump.c:11486
+#, c-format
+msgid "unknown object type (%d) in default privileges\n"
+msgstr "neznámý typ objektu (%d) ve výchozích privilegiích\n"
+
+#: pg_dump.c:11503
+#, c-format
+msgid "could not parse default ACL list (%s)\n"
+msgstr "nelze zpracovat seznam oprávnění ACL (%s)\n"
+
+#: pg_dump.c:11560
+#, c-format
+msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
+msgstr "nelze zpracovat seznam oprávnění ACL (%s) pro objekt \"%s\" (%s)\n"
+
+#: pg_dump.c:12000
+#, c-format
+msgid "query to obtain definition of view \"%s\" returned no data\n"
+msgstr "dotaz na získání definice view \"%s\" nevrátil žádná data\n"
+
+#: pg_dump.c:12003
+#, c-format
+msgid ""
+"query to obtain definition of view \"%s\" returned more than one definition\n"
+msgstr "dotaz na získání definice view \"%s\" vrátil více jak jednu definici\n"
+
+#: pg_dump.c:12012
+#, c-format
+msgid "definition of view \"%s\" appears to be empty (length zero)\n"
+msgstr "definice view \"%s\" se zdá být prázdná (nulová délka)\n"
+
+#: pg_dump.c:12580
+#, c-format
+msgid "invalid column number %d for table \"%s\"\n"
+msgstr "neplatné �íslo sloupce %d pro tabulku \"%s\"\n"
+
+#: pg_dump.c:12691
+#, c-format
+msgid "missing index for constraint \"%s\"\n"
+msgstr "chybí index pro omezení \"%s\"\n"
+
+#: pg_dump.c:12879
+#, c-format
+msgid "unrecognized constraint type: %c\n"
+msgstr "neo�ekávaný typ omezení: %c\n"
+
+#: pg_dump.c:12942
+msgid "missing pg_database entry for this database\n"
+msgstr "chybějící záznam v pg_database pro tuto databázi\n"
+
+#: pg_dump.c:12947
+msgid "found more than one pg_database entry for this database\n"
+msgstr "nalezen více jak jeden záznam v pg_database pro tuto databázi\n"
+
+#: pg_dump.c:12979
+msgid "could not find entry for pg_indexes in pg_class\n"
+msgstr "nemohu najít záznam pg_indexes v pg_class\n"
+
+#: pg_dump.c:12984
+msgid "found more than one entry for pg_indexes in pg_class\n"
+msgstr ""
+"nalezen více jak jeden záznam pg_indexes v systémové tabulce pg_class\n"
+
+#: pg_dump.c:13056
+#, c-format
+msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
+msgid_plural ""
+"query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
+msgstr[0] "dotaz na získání dat sekvence \"%s\" vrátil %d řádek (o�ekáván 1)\n"
+msgstr[1] "dotaz na získání dat sekvence \"%s\" vrátil %d řádky (o�ekáván 1)\n"
+msgstr[2] "dotaz na získání dat sekvence \"%s\" vrátil %d řádek (o�ekáván 1)\n"
+
+#: pg_dump.c:13067
+#, c-format
+msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
+msgstr "dotaz na získání dat sekvence \"%s\" vrátil jméno \"%s\"\n"
+
+#: pg_dump.c:13295
+#, c-format
+#| msgid "unexpected data offset flag %d\n"
+msgid "unexpected tgtype value: %d\n"
+msgstr "neo�ekávaná hodnota tgtype: %d\n"
+
+#: pg_dump.c:13377
+#, c-format
+msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
+msgstr "neplatný řetězec argumentů (%s) pro trigger \"%s\" tabulky \"%s\"\n"
+
+#: pg_dump.c:13495
+#, c-format
+msgid ""
+"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
+"returned\n"
+msgstr ""
+"dotaz k získání pravidla (RULE) \"%s\" pro tabulku \"%s\" selhal: vrácen "
+"chybný po�et řádků\n"
+
+#: pg_dump.c:13752
+msgid "reading dependency data\n"
+msgstr "�tu data o závislostech\n"
+
+#: pg_dump.c:14134
+msgid "SQL command failed\n"
+msgstr "SQL příkaz selhal\n"
+
+#: common.c:105
+msgid "reading schemas\n"
+msgstr "�tu schémata\n"
+
+#: common.c:115
+msgid "reading user-defined tables\n"
+msgstr "�tu uživatelem definované tabulky\n"
+
+#: common.c:120
+#| msgid "reading indexes\n"
+msgid "reading extensions\n"
+msgstr "�tu rozšíření\n"
+
+#: common.c:124
+msgid "reading user-defined functions\n"
+msgstr "�tu uživatelem definované funkce\n"
+
+#: common.c:130
+msgid "reading user-defined types\n"
+msgstr "�tu uživatelem definované typy\n"
+
+#: common.c:136
+msgid "reading procedural languages\n"
+msgstr "�tu procedurální jazyky\n"
+
+#: common.c:140
+msgid "reading user-defined aggregate functions\n"
+msgstr "�tu uživatelem definované agregátní funkce\n"
+
+#: common.c:144
+msgid "reading user-defined operators\n"
+msgstr "�tu uživatelem definované operátory\n"
+
+#: common.c:149
+msgid "reading user-defined operator classes\n"
+msgstr "�tu uživatelem definované třídy operátorů\n"
+
+#: common.c:153
+msgid "reading user-defined operator families\n"
+msgstr "�tu uživatelem definované rodiny operátorů\n"
+
+#: common.c:157
+msgid "reading user-defined text search parsers\n"
+msgstr "�tu uživatelem definované fulltextové parsery\n"
+
+#: common.c:161
+msgid "reading user-defined text search templates\n"
+msgstr "�tu uživatelem definované fulltextové šablony\n"
+
+#: common.c:165
+msgid "reading user-defined text search dictionaries\n"
+msgstr "�tu uživatelem definované fulltextové slovníky\n"
+
+#: common.c:169
+msgid "reading user-defined text search configurations\n"
+msgstr "�tu uživatelské fulltextového konfigurace\n"
+
+#: common.c:173
+msgid "reading user-defined foreign-data wrappers\n"
+msgstr "�tu uživatelem definované foreign-data wrappery\n"
+
+#: common.c:177
+msgid "reading user-defined foreign servers\n"
+msgstr "�tu uživatelem definované foreign servery\n"
+
+#: common.c:181
+msgid "reading default privileges\n"
+msgstr "�tu implicitní přístupová práva\n"
+
+#: common.c:185
+#| msgid "reading user-defined functions\n"
+msgid "reading user-defined collations\n"
+msgstr "�tu uživatelem definované collations\n"
+
+#: common.c:190
+msgid "reading user-defined conversions\n"
+msgstr "�tu uživatelem definované konverze\n"
+
+#: common.c:194
+msgid "reading type casts\n"
+msgstr "�tu přetypování\n"
+
+#: common.c:198
+msgid "reading table inheritance information\n"
+msgstr "�tu informace dědi�nosti tabulky\n"
+
+#: common.c:202
+msgid "reading rewrite rules\n"
+msgstr "�tu přepisovací pravidla\n"
+
+#: common.c:211
+#| msgid "skipping tar member %s\n"
+msgid "finding extension members\n"
+msgstr "hledám složky rozšíření\n"
+
+#: common.c:216
+msgid "finding inheritance relationships\n"
+msgstr "hledám informace o dědi�nosti\n"
+
+#: common.c:220
+msgid "reading column info for interesting tables\n"
+msgstr "�tu informace o sloupci pro tabulky\n"
+
+#: common.c:224
+msgid "flagging inherited columns in subtables\n"
+msgstr "ozna�uji zděděné sloupce v pod-tabulkách\n"
+
+#: common.c:228
+msgid "reading indexes\n"
+msgstr "�tu indexy\n"
+
+#: common.c:232
+msgid "reading constraints\n"
+msgstr "�tu omezení\n"
+
+#: common.c:236
+msgid "reading triggers\n"
+msgstr "�tu triggery\n"
+
+#: common.c:828
+#, c-format
+msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
+msgstr ""
+"selhala kontrola, rodi�ovské OID %u tabulky \"%s\" (OID %u) nelze najít\n"
+
+#: common.c:870
+#, c-format
+msgid "could not parse numeric array \"%s\": too many numbers\n"
+msgstr "nemohu zpracovat numerické pole \"%s\": příliš mnoho �ísel\n"
+
+#: common.c:885
+#, c-format
+msgid "could not parse numeric array \"%s\": invalid character in number\n"
+msgstr "nemohu zpracovat numerické pole \"%s\": neplatný znak v �ísle\n"
+
+#: common.c:998
+msgid "cannot duplicate null pointer\n"
+msgstr "nelze duplikovat nulový ukazatel\n"
+
+#: common.c:1001 common.c:1012 common.c:1023 common.c:1034
+#: pg_backup_archiver.c:764 pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291 pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955 pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209 pg_backup_custom.c:132 pg_backup_custom.c:139
+#: pg_backup_custom.c:780 pg_backup_custom.c:907 pg_backup_db.c:147
+#: pg_backup_db.c:157 pg_backup_db.c:205 pg_backup_db.c:249 pg_backup_db.c:264
+#: pg_backup_db.c:298 pg_backup_db.c:403 pg_backup_files.c:114
+#: pg_backup_null.c:72 pg_backup_tar.c:171 pg_backup_tar.c:1015
+msgid "out of memory\n"
+msgstr "nedostatek paměti\n"
+
+#: pg_backup_archiver.c:88
+msgid "archiver"
+msgstr "archivář"
+
+#: pg_backup_archiver.c:207 pg_backup_archiver.c:1259
+#, c-format
+msgid "could not close output file: %s\n"
+msgstr "nelze zavřít výstupní soubor: %s\n"
+
+#: pg_backup_archiver.c:233
+msgid "-C and -c are incompatible options\n"
+msgstr "-C a -c jsou nekompatibilní přepína�e\n"
+
+#: pg_backup_archiver.c:240
+msgid "-C and -1 are incompatible options\n"
+msgstr "-C a -1 jsou nekompatibilní přepína�e\n"
+
+#: pg_backup_archiver.c:250
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr "paralelní obnova není pro tento formát archivu podporována\n"
+
+#: pg_backup_archiver.c:254
+msgid ""
+"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr "paralelní obnova není podporována s archivy z pre-8.0 verzí pg_dump\n"
+
+#: pg_backup_archiver.c:273
+msgid ""
+"cannot restore from compressed archive (compression not supported in this "
+"installation)\n"
+msgstr ""
+"nelze obnovit z komprimovaného archivu (není nastavena podpora komprese)\n"
+
+#: pg_backup_archiver.c:283
+msgid "connecting to database for restore\n"
+msgstr "navazováno spojení s databází pro obnovu\n"
+
+#: pg_backup_archiver.c:285
+msgid "direct database connections are not supported in pre-1.3 archives\n"
+msgstr ""
+"přímé spojení s databází nejsou podporovány v archivech před verzí 1.3\n"
+
+#: pg_backup_archiver.c:327
+msgid "implied data-only restore\n"
+msgstr "předpokládána pouze obnova dat\n"
+
+#: pg_backup_archiver.c:379
+#, c-format
+msgid "dropping %s %s\n"
+msgstr "odstraňuji %s %s\n"
+
+#: pg_backup_archiver.c:431
+#, c-format
+msgid "setting owner and privileges for %s %s\n"
+msgstr "nastavuji vlastníka a přístupová práva pro %s %s\n"
+
+#: pg_backup_archiver.c:489 pg_backup_archiver.c:491
+#, c-format
+msgid "warning from original dump file: %s\n"
+msgstr "varování z originálního dump souboru: %s\n"
+
+#: pg_backup_archiver.c:498
+#, c-format
+msgid "creating %s %s\n"
+msgstr "vytvářím %s %s\n"
+
+#: pg_backup_archiver.c:542
+#, c-format
+msgid "connecting to new database \"%s\"\n"
+msgstr "připojuji se k nové databázi \"%s\"\n"
+
+#: pg_backup_archiver.c:570
+#, c-format
+msgid "restoring %s\n"
+msgstr "obnovuji %s\n"
+
+#: pg_backup_archiver.c:584
+#, c-format
+msgid "restoring data for table \"%s\"\n"
+msgstr "obnovuji data pro tabulku \"%s\"\n"
+
+#: pg_backup_archiver.c:646
+#, c-format
+msgid "executing %s %s\n"
+msgstr "vykonávám %s %s\n"
+
+#: pg_backup_archiver.c:679
+#, c-format
+msgid "disabling triggers for %s\n"
+msgstr "vypínám triggery pro %s\n"
+
+#: pg_backup_archiver.c:705
+#, c-format
+msgid "enabling triggers for %s\n"
+msgstr "zapínám triggery pro %s\n"
+
+#: pg_backup_archiver.c:735
+msgid ""
+"internal error -- WriteData cannot be called outside the context of a "
+"DataDumper routine\n"
+msgstr ""
+"interní chyba -- WriteData není možno volat mimo kontext rutiny DataDumper\n"
+
+#: pg_backup_archiver.c:892
+msgid "large-object output not supported in chosen format\n"
+msgstr "\"large object\" výstup není podporován ve vybraném formátu\n"
+
+#: pg_backup_archiver.c:946
+#, c-format
+msgid "restored %d large object\n"
+msgid_plural "restored %d large objects\n"
+msgstr[0] "obnoven %d \"large object\"\n"
+msgstr[1] "obnoveny %d \"large objecty\"\n"
+msgstr[2] "obnoveno %d \"large objectů\"\n"
+
+#: pg_backup_archiver.c:967
+#, c-format
+msgid "restoring large object with OID %u\n"
+msgstr "obnovován \"large object\" s OID %u\n"
+
+#: pg_backup_archiver.c:979
+#, c-format
+msgid "could not create large object %u: %s"
+msgstr "nelze vytvořit \"large object\" %u: %s"
+
+#: pg_backup_archiver.c:1041
+#, c-format
+msgid "could not open TOC file \"%s\": %s\n"
+msgstr "nelze otevřít TOC soubor \"%s\": %s\n"
+
+#: pg_backup_archiver.c:1082
+#, c-format
+msgid "WARNING: line ignored: %s\n"
+msgstr "VAROV�N�: řádka ignorována: %s\n"
+
+#: pg_backup_archiver.c:1089
+#, c-format
+msgid "could not find entry for ID %d\n"
+msgstr "nelze najít záznam ID %d\n"
+
+#: pg_backup_archiver.c:1110 pg_backup_files.c:172 pg_backup_files.c:457
+#, c-format
+msgid "could not close TOC file: %s\n"
+msgstr "nelze zavřít TOC soubor: %s\n"
+
+#: pg_backup_archiver.c:1229 pg_backup_custom.c:152 pg_backup_files.c:130
+#: pg_backup_files.c:262
+#, c-format
+msgid "could not open output file \"%s\": %s\n"
+msgstr "nelze otevřít výstupní soubor \"%s\": %s\n"
+
+#: pg_backup_archiver.c:1232 pg_backup_custom.c:159 pg_backup_files.c:137
+#, c-format
+msgid "could not open output file: %s\n"
+msgstr "nelze otevřít výstupní soubor: %s\n"
+
+#: pg_backup_archiver.c:1334
+#, c-format
+msgid "wrote %lu byte of large object data (result = %lu)\n"
+msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
+msgstr[0] "zapsán %lu byte dat \"large objektu\" (výsledek = %lu)\n"
+msgstr[1] "zapsáno %lu byty dat \"large objektu\" (výsledek = %lu)\n"
+msgstr[2] "zapsáno %lu bytů dat \"large objektu\" (výsledek = %lu)\n"
+
+#: pg_backup_archiver.c:1340
+#, c-format
+msgid "could not write to large object (result: %lu, expected: %lu)\n"
+msgstr "nelze zapsat \"large object\" (výsledek = %lu, o�ekáváno: %lu)\n"
+
+#: pg_backup_archiver.c:1398 pg_backup_archiver.c:1421 pg_backup_custom.c:652
+#: pg_backup_files.c:432 pg_backup_tar.c:590 pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
+#, c-format
+msgid "could not write to output file: %s\n"
+msgstr "nelze zapsat do výstupního souboru: %s\n"
+
+#: pg_backup_archiver.c:1406
+msgid "could not write to custom output routine\n"
+msgstr "nelze zapsat do vlastní výstupní rutiny\n"
+
+#: pg_backup_archiver.c:1504
+msgid "Error while INITIALIZING:\n"
+msgstr "Chyba během INICIALIZACE:\n"
+
+#: pg_backup_archiver.c:1509
+msgid "Error while PROCESSING TOC:\n"
+msgstr "Chyba během ZPRACOV�N� TOC:\n"
+
+#: pg_backup_archiver.c:1514
+msgid "Error while FINALIZING:\n"
+msgstr "Chyba během FINALIZACE:\n"
+
+#: pg_backup_archiver.c:1519
+#, c-format
+msgid "Error from TOC entry %d; %u %u %s %s %s\n"
+msgstr "Chyba v TOC záznamu %d; %u %u %s %s %s\n"
+
+#: pg_backup_archiver.c:1654
+#, c-format
+msgid "unexpected data offset flag %d\n"
+msgstr "Neo�ekávaný příznak datového offsetu %d\n"
+
+#: pg_backup_archiver.c:1667
+msgid "file offset in dump file is too large\n"
+msgstr "offset souboru v dumpu je příliš velký\n"
+
+#: pg_backup_archiver.c:1764 pg_backup_archiver.c:3113 pg_backup_custom.c:630
+#: pg_backup_files.c:419 pg_backup_tar.c:789
+msgid "unexpected end of file\n"
+msgstr "neo�ekávaný konec souboru\n"
+
+#: pg_backup_archiver.c:1781
+msgid "attempting to ascertain archive format\n"
+msgstr "pokouším se zjistit formát archivu\n"
+
+#: pg_backup_archiver.c:1807 pg_backup_archiver.c:1817
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "jméno adresáře je příliš dlouhé: \"%s\"\n"
+
+#: pg_backup_archiver.c:1825
+#, c-format
+#| msgid "input file does not appear to be a valid archive (too short?)\n"
+msgid ""
+"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
+"exist)\n"
+msgstr "adresář \"%s\" zřejmě není platným archivem (\"toc.dat\" neexistuje)\n"
+
+#: pg_backup_archiver.c:1833 pg_backup_custom.c:171 pg_backup_custom.c:762
+#: pg_backup_files.c:155 pg_backup_files.c:307
+#, c-format
+msgid "could not open input file \"%s\": %s\n"
+msgstr "nelze otevřít vstupní soubor \"%s\": %s\n"
+
+#: pg_backup_archiver.c:1841 pg_backup_custom.c:178 pg_backup_files.c:162
+#, c-format
+msgid "could not open input file: %s\n"
+msgstr "nelze otevřít vstupní soubor: %s\n"
+
+#: pg_backup_archiver.c:1850
+#, c-format
+msgid "could not read input file: %s\n"
+msgstr "nelze �íst vstupní soubor: %s\n"
+
+#: pg_backup_archiver.c:1852
+#, c-format
+msgid "input file is too short (read %lu, expected 5)\n"
+msgstr "vstupní soubor je příliš krátký (�teno %lu, o�ekáváno 5)\n"
+
+#: pg_backup_archiver.c:1910
+msgid "input file does not appear to be a valid archive (too short?)\n"
+msgstr "vstupní soubor se nezdá být korektním archivem (příliš krátký?)\n"
+
+#: pg_backup_archiver.c:1913
+msgid "input file does not appear to be a valid archive\n"
+msgstr "vstupní soubor se nezdá být korektním archivem\n"
+
+#: pg_backup_archiver.c:1933
+#, c-format
+msgid "could not close input file: %s\n"
+msgstr "nelze zavřít výstupní soubor: %s\n"
+
+#: pg_backup_archiver.c:1950
+#, c-format
+msgid "allocating AH for %s, format %d\n"
+msgstr "alokován AH pro %s, formát %d\n"
+
+#: pg_backup_archiver.c:2059
+#, c-format
+msgid "unrecognized file format \"%d\"\n"
+msgstr "neznámý formát souboru \"%d\"\n"
+
+#: pg_backup_archiver.c:2181
+#, c-format
+msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
+msgstr "ID záznamu %d je mimo rozsah -- možná je poškozena TOC\n"
+
+#: pg_backup_archiver.c:2297
+#, c-format
+msgid "read TOC entry %d (ID %d) for %s %s\n"
+msgstr "pře�etl jsem TOC záznam %d (ID %d) pro %s %s\n"
+
+#: pg_backup_archiver.c:2331
+#, c-format
+msgid "unrecognized encoding \"%s\"\n"
+msgstr "neplatné kódování \"%s\"\n"
+
+#: pg_backup_archiver.c:2336
+#, c-format
+msgid "invalid ENCODING item: %s\n"
+msgstr "chybná položka ENCODING: %s\n"
+
+#: pg_backup_archiver.c:2354
+#, c-format
+msgid "invalid STDSTRINGS item: %s\n"
+msgstr "chybná položka STDSTRINGS: %s\n"
+
+#: pg_backup_archiver.c:2552
+#, c-format
+msgid "could not set session user to \"%s\": %s"
+msgstr "nelze nastavit uživatele session na \"%s\": %s"
+
+#: pg_backup_archiver.c:2892 pg_backup_archiver.c:3044
+#, c-format
+msgid "WARNING: don't know how to set owner for object type %s\n"
+msgstr "VAROV�N�: nevím jak nastavit vlastníka pro typ %s\n"
+
+#: pg_backup_archiver.c:3076
+msgid ""
+"WARNING: requested compression not available in this installation -- archive "
+"will be uncompressed\n"
+msgstr ""
+"VAROV�N�: požadovaná komprese není v této instalaci dostupná -- archiv bude "
+"nekomprimovaný\n"
+
+#: pg_backup_archiver.c:3116
+msgid "did not find magic string in file header\n"
+msgstr "nelze najít identifika�ní řetězec v hlavi�ce souboru\n"
+
+#: pg_backup_archiver.c:3129
+#, c-format
+msgid "unsupported version (%d.%d) in file header\n"
+msgstr "nepodporovaná verze (%d.%d) v hlavi�ce souboru\n"
+
+#: pg_backup_archiver.c:3134
+#, c-format
+msgid "sanity check on integer size (%lu) failed\n"
+msgstr "selhala kontrola velikosti integeru (%lu)\n"
+
+#: pg_backup_archiver.c:3138
+msgid ""
+"WARNING: archive was made on a machine with larger integers, some operations "
+"might fail\n"
+msgstr ""
+"VAROV�N�: archiv byl vytvořen na stroji s většími celými �ísly (integer), "
+"některé operace mohou selhat\n"
+
+#: pg_backup_archiver.c:3148
+#, c-format
+msgid "expected format (%d) differs from format found in file (%d)\n"
+msgstr ""
+"o�ekávaný formát (%d) se liší se od formátu nalezeného v souboru (%d)\n"
+
+#: pg_backup_archiver.c:3164
+msgid ""
+"WARNING: archive is compressed, but this installation does not support "
+"compression -- no data will be available\n"
+msgstr ""
+"VAROV�N�: archiv je komprimován, ale tato instalace nepodporuje kompresi -- "
+"data nebudou dostupná\n"
+
+#: pg_backup_archiver.c:3182
+msgid "WARNING: invalid creation date in header\n"
+msgstr "VAROV�N�: v hlavi�ce je neplatné datum vytvoření\n"
+
+#: pg_backup_archiver.c:3280
+msgid "entering restore_toc_entries_parallel\n"
+msgstr "vstupuji do restore_toc_entries_parallel\n"
+
+#: pg_backup_archiver.c:3321
+#, c-format
+msgid "processing item %d %s %s\n"
+msgstr "zpracovávám položku %d %s %s\n"
+
+#: pg_backup_archiver.c:3397
+msgid "entering main parallel loop\n"
+msgstr "vstupuji do hlavní paralelní smy�ky\n"
+
+#: pg_backup_archiver.c:3411
+#, c-format
+msgid "skipping item %d %s %s\n"
+msgstr "přeskakuji položku %d %s %s\n"
+
+#: pg_backup_archiver.c:3427
+#, c-format
+msgid "launching item %d %s %s\n"
+msgstr "spouštím položku %d %s %s\n"
+
+#: pg_backup_archiver.c:3464
+#, c-format
+msgid "worker process crashed: status %d\n"
+msgstr "worker proces selhal: status %d\n"
+
+#: pg_backup_archiver.c:3469
+msgid "finished main parallel loop\n"
+msgstr "ukon�uji hlavní paralelní smy�ku\n"
+
+#: pg_backup_archiver.c:3487
+#, c-format
+msgid "processing missed item %d %s %s\n"
+msgstr "zpracování vynechalo položku %d %s %s\n"
+
+#: pg_backup_archiver.c:3513
+msgid "parallel_restore should not return\n"
+msgstr ""
+
+#: pg_backup_archiver.c:3519
+#, c-format
+msgid "could not create worker process: %s\n"
+msgstr "nelze vytvořit worker proces: %s\n"
+
+#: pg_backup_archiver.c:3527
+#, c-format
+msgid "could not create worker thread: %s\n"
+msgstr "nelze vytvořit worker thread: %s\n"
+
+#: pg_backup_archiver.c:3751
+msgid "no item ready\n"
+msgstr "žádná položka není připravena\n"
+
+#: pg_backup_archiver.c:3846
+msgid "could not find slot of finished worker\n"
+msgstr "nelze najít slot ukon�eného workera\n"
+
+#: pg_backup_archiver.c:3848
+#, c-format
+msgid "finished item %d %s %s\n"
+msgstr "dokon�ena položka %d %s %s\n"
+
+#: pg_backup_archiver.c:3861
+#, c-format
+msgid "worker process failed: exit code %d\n"
+msgstr "worker proces selhal: exit kód %d\n"
+
+#: pg_backup_archiver.c:4057
+#, c-format
+msgid "transferring dependency %d -> %d to %d\n"
+msgstr "přenáším závislost %d -> %d to %d\n"
+
+#: pg_backup_archiver.c:4126
+#, c-format
+msgid "reducing dependencies for %d\n"
+msgstr "redukuji závislosti pro %d\n"
+
+#: pg_backup_archiver.c:4175
+#, c-format
+msgid "table \"%s\" could not be created, will not restore its data\n"
+msgstr "tabulku \"%s\" nelze vytvořit, její data nebudou obnovena\n"
+
+#: pg_backup_custom.c:87
+msgid "custom archiver"
+msgstr "vlastní archivář"
+
+#: pg_backup_custom.c:373 pg_backup_null.c:153
+msgid "invalid OID for large object\n"
+msgstr "neplatné OID pro \"large object\"\n"
+
+#: pg_backup_custom.c:444
+#, c-format
+msgid "unrecognized data block type (%d) while searching archive\n"
+msgstr "nepřípustný typ datového bloku (%d) během prohledávání archivu\n"
+
+#: pg_backup_custom.c:455
+#, c-format
+msgid "error during file seek: %s\n"
+msgstr "chyba během posunu v souboru: %s\n"
+
+#: pg_backup_custom.c:465
+#, c-format
+msgid ""
+"could not find block ID %d in archive -- possibly due to out-of-order "
+"restore request, which cannot be handled due to lack of data offsets in "
+"archive\n"
+msgstr ""
+"v archivu nelze najít blok ID %d -- možná kvůli out-of-order restore "
+"požadavku, který nemohl být vyřízen kvůli chybějícím datovým offsetům v "
+"archivu\n"
+
+#: pg_backup_custom.c:470
+#, c-format
+msgid ""
+"could not find block ID %d in archive -- possibly due to out-of-order "
+"restore request, which cannot be handled due to non-seekable input file\n"
+msgstr ""
+"v archivu nelze najít blok ID %d -- možná kvůli out-of-order restore "
+"požadavku, který nemohl být vyřízen kvůli non-seekable vstupnímu souboru\n"
+
+#: pg_backup_custom.c:475
+#, c-format
+msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
+msgstr "v archivu nelze najít blok %d -- archiv může být poškozen\n"
+
+#: pg_backup_custom.c:482
+#, c-format
+msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
+msgstr "nalezeno neo�ekávané ID bloku (%d) při �tení dat - o�ekáváno %d\n"
+
+#: pg_backup_custom.c:496
+#, c-format
+msgid "unrecognized data block type %d while restoring archive\n"
+msgstr "nepřípustný typ datového bloku %d během obnovení archivu\n"
+
+#: pg_backup_custom.c:578 pg_backup_custom.c:916
+msgid "could not read from input file: end of file\n"
+msgstr "nelze �íst vstupní soubor: end of file\n"
+
+#: pg_backup_custom.c:581 pg_backup_custom.c:919
+#, c-format
+msgid "could not read from input file: %s\n"
+msgstr "nelze �íst vstupní soubor: %s\n"
+
+#: pg_backup_custom.c:610
+#, c-format
+msgid "could not write byte: %s\n"
+msgstr "nelze zapsat byte: %s\n"
+
+#: pg_backup_custom.c:718 pg_backup_custom.c:756
+#, c-format
+msgid "could not close archive file: %s\n"
+msgstr "nelze uzavřít archivní soubor: %s\n"
+
+#: pg_backup_custom.c:737
+msgid "can only reopen input archives\n"
+msgstr "nelze otevřít vstupní soubor: %s\n"
+
+#: pg_backup_custom.c:744
+#| msgid "parallel restore is not supported with this archive file format\n"
+msgid "parallel restore from stdin is not supported\n"
+msgstr "paralelní obnova ze standardního vstupu není podporována\n"
+
+#: pg_backup_custom.c:746
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr "paralelní obnova z neseekovatelného souboru není podporována\n"
+
+#: pg_backup_custom.c:751
+#, c-format
+msgid "could not determine seek position in archive file: %s\n"
+msgstr "nelze ur�it seek pozici v archivním souboru: %s\n"
+
+#: pg_backup_custom.c:766
+#, c-format
+msgid "could not set seek position in archive file: %s\n"
+msgstr "nelze nastavit seek pozici v archivním souboru: %s\n"
+
+#: pg_backup_custom.c:786
+msgid "compressor active\n"
+msgstr "compressor aktivní\n"
+
+#: pg_backup_custom.c:822
+msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
+msgstr "VAROV�N�: ftell neodpovídá o�ekávané pozici -- použit ftell\n"
+
+#: pg_backup_db.c:25
+msgid "archiver (db)"
+msgstr "archivář (db)"
+
+#: pg_backup_db.c:54
+msgid "could not get server_version from libpq\n"
+msgstr "nelze získat server_version z libpq\n"
+
+#: pg_backup_db.c:67 pg_dumpall.c:1741
+#, c-format
+msgid "server version: %s; %s version: %s\n"
+msgstr "verze serveru: %s; %s verze: %s\n"
+
+#: pg_backup_db.c:69 pg_dumpall.c:1743
+#, c-format
+msgid "aborting because of server version mismatch\n"
+msgstr "kon�ím kvůli rozdílnosti verzí serverů\n"
+
+#: pg_backup_db.c:140
+#, c-format
+msgid "connecting to database \"%s\" as user \"%s\"\n"
+msgstr "připojuji se k databázi \"%s\" jako uživatel \"%s\"\n"
+
+#: pg_backup_db.c:145 pg_backup_db.c:200 pg_backup_db.c:247 pg_backup_db.c:296
+#: pg_dumpall.c:1637 pg_dumpall.c:1689
+msgid "Password: "
+msgstr "Heslo: "
+
+#: pg_backup_db.c:181
+msgid "failed to reconnect to database\n"
+msgstr "selhalo znovunavázání spojení s databází\n"
+
+#: pg_backup_db.c:186
+#, c-format
+msgid "could not reconnect to database: %s"
+msgstr "nelze znovu navázat spojení s databází: %s"
+
+#: pg_backup_db.c:202
+msgid "connection needs password\n"
+msgstr "spojení vyžaduje heslo\n"
+
+#: pg_backup_db.c:243
+msgid "already connected to a database\n"
+msgstr "spojení s databází již existuje\n"
+
+#: pg_backup_db.c:288
+msgid "failed to connect to database\n"
+msgstr "selhalo spojení s databází\n"
+
+#: pg_backup_db.c:307
+#, c-format
+msgid "connection to database \"%s\" failed: %s"
+msgstr "spojení s databází \"%s\" selhalo: %s"
+
+#: pg_backup_db.c:322
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:387
+#, c-format
+msgid "error returned by PQputCopyData: %s"
+msgstr "PQputCopyData vrátilo chybu: %s"
+
+#: pg_backup_db.c:397 pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "nelze provést dotaz"
+
+#: pg_backup_db.c:425
+#, c-format
+msgid "error returned by PQputCopyEnd: %s"
+msgstr "PQputCopyEnd vrátilo chybu: %s"
+
+#: pg_backup_db.c:442
+msgid "could not start database transaction"
+msgstr "nelze spustit databázovou transakci"
+
+#: pg_backup_db.c:448
+msgid "could not commit database transaction"
+msgstr "nelze provést commit transakce"
+
+#: pg_backup_files.c:68
+msgid "file archiver"
+msgstr "archivář souborů"
+
+#: pg_backup_files.c:122
+msgid ""
+"WARNING:\n"
+"  This format is for demonstration purposes; it is not intended for\n"
+"  normal use. Files will be written in the current working directory.\n"
+msgstr ""
+"VAROV�N�:\n"
+"  Tento formát je pro demonstra�ní ú�ely a není ur�en k pro běžné\n"
+"  použití. Soubory budou zapsány do aktuálního adresáře.\n"
+
+#: pg_backup_files.c:283
+msgid "could not close data file\n"
+msgstr "nelze zavřít datový soubor\n"
+
+#: pg_backup_files.c:317
+msgid "could not close data file after reading\n"
+msgstr "nelze zavřít datový soubor po jeho �tení\n"
+
+#: pg_backup_files.c:379
+#, c-format
+msgid "could not open large object TOC for input: %s\n"
+msgstr "nelze otevřít \"large object\" TOC pro vstup: %s\n"
+
+#: pg_backup_files.c:392 pg_backup_files.c:561
+#, c-format
+msgid "could not close large object TOC file: %s\n"
+msgstr "nelze zavřít \"large object\" TOC soubor: %s\n"
+
+#: pg_backup_files.c:404
+msgid "could not write byte\n"
+msgstr "nelze zapsat byte\n"
+
+#: pg_backup_files.c:490
+#, c-format
+msgid "could not open large object TOC for output: %s\n"
+msgstr "nelze otevřít \"large object\" TOC pro výstup: %s\n"
+
+#: pg_backup_files.c:510 pg_backup_tar.c:939
+#, c-format
+msgid "invalid OID for large object (%u)\n"
+msgstr "neplatné OID pro \"large object\" (%u)\n"
+
+#: pg_backup_files.c:529
+#, c-format
+msgid "could not open large object file \"%s\" for input: %s\n"
+msgstr "nelze otevřít \"large object\" \"%s\" pro vstup: %s\n"
+
+#: pg_backup_files.c:544
+msgid "could not close large object file\n"
+msgstr "nelze zavřít \"large object\" soubor\n"
+
+#: pg_backup_null.c:78
+msgid "this format cannot be read\n"
+msgstr "tento formát nelze �íst\n"
+
+#: pg_backup_tar.c:105
+msgid "tar archiver"
+msgstr "tar archivář"
+
+#: pg_backup_tar.c:183
+#, c-format
+msgid "could not open TOC file \"%s\" for output: %s\n"
+msgstr "nelze otevřít TOC soubor \"%s\" pro výstup: %s\n"
+
+#: pg_backup_tar.c:191
+#, c-format
+msgid "could not open TOC file for output: %s\n"
+msgstr "nelze otevřít TOC soubor pro výstup: %s\n"
+
+#: pg_backup_tar.c:218 pg_backup_tar.c:374
+msgid "compression is not supported by tar archive format\n"
+msgstr "komprese není podporována v \"tar\" výstupním formátu\n"
+
+#: pg_backup_tar.c:226
+#, c-format
+msgid "could not open TOC file \"%s\" for input: %s\n"
+msgstr "nelze otevřít TOC soubor \"%s\" pro vstup: %s\n"
+
+#: pg_backup_tar.c:233
+#, c-format
+msgid "could not open TOC file for input: %s\n"
+msgstr "nelze otevřít TOC soubor pro vstup: %s\n"
+
+#: pg_backup_tar.c:360
+#, c-format
+msgid "could not find file \"%s\" in archive\n"
+msgstr "v archivu nelze najít soubor \"%s\"\n"
+
+#: pg_backup_tar.c:416
+#, c-format
+msgid "could not generate temporary file name: %s\n"
+msgstr "nelze vygenerovat jméno do�asného souboru: %s\n"
+
+#: pg_backup_tar.c:425
+msgid "could not open temporary file\n"
+msgstr "nelze otevřít do�asný soubor\n"
+
+#: pg_backup_tar.c:452
+msgid "could not close tar member\n"
+msgstr "nelze zavřít tar položku\n"
+
+#: pg_backup_tar.c:552
+msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
+msgstr "interní chyba -- ani th ani fh nespecifikován v tarReadRaw()\n"
+
+#: pg_backup_tar.c:678
+#, c-format
+msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
+msgstr "neplatný COPY příkaz -- nelze najít \"copy\" v řetězci \"%s\"\n"
+
+#: pg_backup_tar.c:696
+#, c-format
+msgid ""
+"invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
+"starting at position %lu\n"
+msgstr ""
+"neplatný COPY příkaz -- nelze najít \"from stdin\" v řetězci \"%s\" "
+"za�ínající na pozici %lu\n"
+
+#: pg_backup_tar.c:733
+#, c-format
+msgid "restoring large object OID %u\n"
+msgstr "obnovuji \"large object\" s OID %u\n"
+
+#: pg_backup_tar.c:884
+msgid "could not write null block at end of tar archive\n"
+msgstr "nelze zapsat null blok na konec tar archivu\n"
+
+#: pg_backup_tar.c:1084
+msgid "archive member too large for tar format\n"
+msgstr "položka archivu je příliš velká pro formát tar\n"
+
+#: pg_backup_tar.c:1099
+#, c-format
+msgid "could not close temporary file: %s\n"
+msgstr "nelze otevřít do�asný soubor: %s\n"
+
+#: pg_backup_tar.c:1109
+#, c-format
+msgid "actual file length (%s) does not match expected (%s)\n"
+msgstr "skute�ná délka souboru (%s) není stejná jako o�ekávaná (%s)\n"
+
+#: pg_backup_tar.c:1117
+msgid "could not output padding at end of tar member\n"
+msgstr "nelze zapsat vycpávku (padding) na konec položky taru\n"
+
+#: pg_backup_tar.c:1146
+#, c-format
+msgid "moving from position %s to next member at file position %s\n"
+msgstr "přecházím z pozice %s na následujícího položky na pozici souboru %s\n"
+
+#: pg_backup_tar.c:1157
+#, c-format
+msgid "now at file position %s\n"
+msgstr "nyní na pozici souboru %s\n"
+
+#: pg_backup_tar.c:1166 pg_backup_tar.c:1196
+#, c-format
+msgid "could not find header for file \"%s\" in tar archive\n"
+msgstr "nelze najít hlavi�ku pro soubor %s v tar archivu\n"
+
+#: pg_backup_tar.c:1180
+#, c-format
+msgid "skipping tar member %s\n"
+msgstr "přeskakován tar �len %s\n"
+
+#: pg_backup_tar.c:1184
+#, c-format
+msgid ""
+"restoring data out of order is not supported in this archive format: \"%s\" "
+"is required, but comes before \"%s\" in the archive file.\n"
+msgstr ""
+"dump dat mimo pořadí není podporováno v tomto formátu archivu: %s je "
+"vyžadován, ale předchází %s.\n"
+
+#: pg_backup_tar.c:1230
+#, c-format
+msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
+msgstr "aktuální a předpokládaná pozice souboru se neshodují (%s vs. %s)\n"
+
+#: pg_backup_tar.c:1245
+#, c-format
+msgid "incomplete tar header found (%lu byte)\n"
+msgid_plural "incomplete tar header found (%lu bytes)\n"
+msgstr[0] "nalezena nekompletní tar hlavi�ka (%lu byt)\n"
+msgstr[1] "nalezena nekompletní tar hlavi�ka (%lu byty)\n"
+msgstr[2] "nalezena nekompletní tar hlavi�ka (%lu bytů)\n"
+
+#: pg_backup_tar.c:1283
+#, c-format
+msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
+msgstr "TOC záznam %s na %s (délka %lu, kontrolní sou�et %d)\n"
+
+#: pg_backup_tar.c:1293
+#, c-format
+msgid ""
+"corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
+msgstr ""
+"nalezena poškozená tar hlavi�ka v %s (předpokládáno %d, vypo�teno %d) pozice "
+"souboru %s\n"
+
+#: pg_restore.c:300
+#, c-format
+msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
+msgstr "%s: volby -d/--dbname a -f/--file nelze používat spole�ně\n"
+
+#: pg_restore.c:312
+#, c-format
+msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
+msgstr "%s: nelze zadat --single-transaction a několik úloh\n"
+
+#: pg_restore.c:348
+#, c-format
+#| msgid "unrecognized archive format \"%s\"; please specify \"c\" or \"t\"\n"
+msgid ""
+"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
+msgstr ""
+"neznámý formát archivu \"%s\"; zadejte prosím \"c\", \"d\" nebo \"t\"\n"
+
+#: pg_restore.c:382
+#, c-format
+msgid "WARNING: errors ignored on restore: %d\n"
+msgstr "VAROV�N�: chyby ignorovány při obnovení: %d\n"
+
+#: pg_restore.c:396
+#, c-format
+msgid ""
+"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
+"\n"
+msgstr ""
+"%s obnovuje PostgreSQL databázi z archivu vytvořeného pomocí pg_dump.\n"
+"\n"
+
+#: pg_restore.c:398
+#, c-format
+msgid "  %s [OPTION]... [FILE]\n"
+msgstr "  %s [PŘEP�NAČ]... [SOUBOR]\n"
+
+#: pg_restore.c:401
+#, c-format
+msgid "  -d, --dbname=NAME        connect to database name\n"
+msgstr "  -d, --dbname=JMÉNO        jméno cílové databáze\n"
+
+#: pg_restore.c:402
+#, c-format
+msgid "  -f, --file=FILENAME      output file name\n"
+msgstr "  -f, --file=SOUBOR        výstupní soubor\n"
+
+#: pg_restore.c:403
+#, c-format
+#| msgid ""
+#| "  -F, --format=c|t         backup file format (should be automatic)\n"
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
+msgstr ""
+"  -F, --format=c|d|t         formát záložního souboru (měl by být "
+"automatický)\n"
+
+#: pg_restore.c:404
+#, c-format
+msgid "  -l, --list               print summarized TOC of the archive\n"
+msgstr "  -l, --list               zobrazit sumarizovaný obsah (TOC) archivu\n"
+
+#: pg_restore.c:405
+#, c-format
+msgid "  -v, --verbose            verbose mode\n"
+msgstr "  -v, --verbose            vypisovat více informací\n"
+
+#: pg_restore.c:406
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   ukáže tuto nápovědu a skon�í\n"
+
+#: pg_restore.c:407
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                ukáže informace o verzi a skon�í\n"
+
+#: pg_restore.c:409
+#, c-format
+msgid ""
+"\n"
+"Options controlling the restore:\n"
+msgstr ""
+"\n"
+"Přepína�e ovlivňující obnovu:\n"
+
+#: pg_restore.c:410
+#, c-format
+msgid "  -a, --data-only          restore only the data, no schema\n"
+msgstr ""
+"  -a, --data-only          obnovit pouze data, ne definice databázových "
+"objektů\n"
+
+#: pg_restore.c:411
+#, c-format
+msgid ""
+"  -c, --clean              clean (drop) database objects before recreating\n"
+msgstr ""
+"  -c, --clean              odstranit (drop) databázi před jejím vytvořením\n"
+
+#: pg_restore.c:412
+#, c-format
+msgid "  -C, --create             create the target database\n"
+msgstr "  -C, --create             vypíše příkazy pro vytvoření databáze\n"
+
+#: pg_restore.c:413
+#, c-format
+msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
+msgstr "  -e, --exit-on-error      ukon�it při chybě, implicitně pokra�uje\n"
+
+#: pg_restore.c:414
+#, c-format
+msgid "  -I, --index=NAME         restore named index\n"
+msgstr "  -I, --index=JMÉNO        obnovit jmenovaný index\n"
+
+#: pg_restore.c:415
+#, c-format
+msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
+msgstr ""
+"  -j, --jobs=NUM           použij pro obnovu daný po�et paralelních jobů\n"
+
+#: pg_restore.c:416
+#, c-format
+msgid ""
+"  -L, --use-list=FILENAME  use table of contents from this file for\n"
+"                           selecting/ordering output\n"
+msgstr ""
+"  -L, --use-list=SOUBOR    použít specifikovaný obsah (TOC) pro řazení\n"
+"                           výstupu z tohoto souboru\n"
+
+#: pg_restore.c:418
+#, c-format
+msgid "  -n, --schema=NAME        restore only objects in this schema\n"
+msgstr "  -n, --schema=NAME        obnovit pouze objekty v tomto schématu\n"
+
+#: pg_restore.c:419
+#, c-format
+msgid "  -O, --no-owner           skip restoration of object ownership\n"
+msgstr "  -O, --no-owner           přesko� nastavení vlastníka objektů\n"
+
+#: pg_restore.c:420
+#, c-format
+msgid ""
+"  -P, --function=NAME(args)\n"
+"                           restore named function\n"
+msgstr ""
+"  -P, --function=JMÉNO(args)\n"
+"                           obnovit funkci daného jména\n"
+
+#: pg_restore.c:422
+#, c-format
+msgid "  -s, --schema-only        restore only the schema, no data\n"
+msgstr "  -s, --schema-only        obnovit pouze definice objektů, bez dat\n"
+
+#: pg_restore.c:423
+#, c-format
+msgid ""
+"  -S, --superuser=NAME     superuser user name to use for disabling "
+"triggers\n"
+msgstr ""
+"  -S, --superuser=JMÉNO    jméno superuživatele použité pro\n"
+"                           zakázaní triggerů\n"
+
+#: pg_restore.c:424
+#, c-format
+msgid "  -t, --table=NAME         restore named table\n"
+msgstr "  -t, --table=JMÉNO        obnovit pouze jmenovanou tabulku\n"
+
+#: pg_restore.c:425
+#, c-format
+msgid "  -T, --trigger=NAME       restore named trigger\n"
+msgstr "  -T, --trigger=JMÉNO      obnovit pouze jmenovaný trigger\n"
+
+#: pg_restore.c:426
+#, c-format
+msgid ""
+"  -x, --no-privileges      skip restoration of access privileges (grant/"
+"revoke)\n"
+msgstr ""
+"  -x, --no-privileges      přesko�it obnovu přístupových práv (grant/"
+"revoke)\n"
+
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr ""
+"  -1, --single-transaction\n"
+"                           zpracuj soubor v rámci jedné transakce\n"
+
+#: pg_restore.c:429
+#, c-format
+msgid "  --disable-triggers       disable triggers during data-only restore\n"
+msgstr "  --disable-triggers       zakázat volání triggerů během obnovy dat\n"
+
+#: pg_restore.c:430
+#, c-format
+msgid ""
+"  --no-data-for-failed-tables\n"
+"                           do not restore data of tables that could not be\n"
+"                           created\n"
+msgstr ""
+"  --no-data-for-failed-tables\n"
+"                           neobnovuj data tabulek které nemohly být "
+"vytvořeny\n"
+
+#: pg_restore.c:433
+#, c-format
+#| msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgid "  --no-security-labels     do not restore security labels\n"
+msgstr "  --no-tablespaces         neobnovuj bezpe�nostní štítky\n"
+
+#: pg_restore.c:434
+#, c-format
+msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgstr "  --no-tablespaces         neobnovuj přiřazení tablespaces\n"
+
+#: pg_restore.c:435
+#, c-format
+msgid ""
+"  --use-set-session-authorization\n"
+"                           use SET SESSION AUTHORIZATION commands instead "
+"of\n"
+"                           ALTER OWNER commands to set ownership\n"
+msgstr ""
+"  --use-set-session-authorization\n"
+"                           používat příkaz SET SESSION AUTHORIZATION "
+"namísto\n"
+"                           příkazu ALTER OWNER pro nastavení vlastníka\n"
+
+#: pg_restore.c:445
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=ROLENAME          před obnovou prove� SET ROLE\n"
+
+#: pg_restore.c:447
+#, c-format
+msgid ""
+"\n"
+"If no input file name is supplied, then standard input is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Není-li definován vstupní soubor, je použit standardní vstup.\n"
+"\n"
+
+#: pg_dumpall.c:171
+#, c-format
+msgid ""
+"The program \"pg_dump\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"pg_dump\" je potřebný pro %s, ale nebyl nalezen ve stejném\n"
+"adresáři jako \"%s\".\n"
+"Zkontrolujte vaši instalaci.\n"
+
+#: pg_dumpall.c:178
+#, c-format
+msgid ""
+"The program \"pg_dump\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"\"%s\" našel program \"pg_dump\",\n"
+"který ale není stejné verze jako %s.\n"
+"Zkontrolujte vaši instalaci.\n"
+
+#: pg_dumpall.c:314
+#, c-format
+msgid ""
+"%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
+msgstr ""
+"%s: volby -g/--globals-only a -r/--roles-only nelze používat spole�ně\n"
+
+#: pg_dumpall.c:323
+#, c-format
+msgid ""
+"%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
+"together\n"
+msgstr ""
+"%s: volby -g/--globals-only a -t/--tablespaces-only nelze používat spole�ně\n"
+
+#: pg_dumpall.c:332
+#, c-format
+msgid ""
+"%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
+"together\n"
+msgstr ""
+"%s: volby -r/--roles-only a -t/--tablespaces-only nelze používat spole�ně\n"
+
+#: pg_dumpall.c:374 pg_dumpall.c:1678
+#, c-format
+msgid "%s: could not connect to database \"%s\"\n"
+msgstr "%s: nelze navázat spojení s databází \"%s\"\n"
+
+#: pg_dumpall.c:389
+#, c-format
+msgid ""
+"%s: could not connect to databases \"postgres\" or \"template1\"\n"
+"Please specify an alternative database.\n"
+msgstr ""
+"%s: nelze navázat spojení s databází \"postgres\" nebo \"template1\"\n"
+"Zadejte prosím alternativní databázi.\n"
+
+#: pg_dumpall.c:406
+#, c-format
+msgid "%s: could not open the output file \"%s\": %s\n"
+msgstr "%s: nelze otevřít výstupní soubor \"%s\": %s\n"
+
+#: pg_dumpall.c:528
+#, c-format
+msgid ""
+"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"\n"
+msgstr ""
+"%s extrahuje PostgreSQL databázi do souboru s SQL skriptem.\n"
+"\n"
+
+#: pg_dumpall.c:530
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [PŘEP�NAČ]...\n"
+
+#: pg_dumpall.c:533
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=SOUBOR        výstupní soubor\n"
+
+#: pg_dumpall.c:539
+#, c-format
+msgid ""
+"  -c, --clean                 clean (drop) databases before recreating\n"
+msgstr ""
+"  -c, --clean              odstranit (drop) databázi před jejím vytvořením\n"
+
+#: pg_dumpall.c:540
+#, c-format
+msgid "  -g, --globals-only          dump only global objects, no databases\n"
+msgstr ""
+"  -g, --globals-only       dump pouze globálních objektů, ne databáze\n"
+
+#: pg_dumpall.c:542
+#, c-format
+msgid "  -O, --no-owner              skip restoration of object ownership\n"
+msgstr ""
+"  -O, --no-owner           nevypisuje příkazy k nastavení vlastníka objektů\n"
+
+#: pg_dumpall.c:543
+#, c-format
+msgid ""
+"  -r, --roles-only            dump only roles, no databases or tablespaces\n"
+msgstr ""
+"  -r, --roles-only            dump pouze rolí, ne databází nebo tablespaců\n"
+
+#: pg_dumpall.c:545
+#, c-format
+msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
+msgstr ""
+"  -S, --superuser=JMÉNO    uživatelské jméno superuživatele použité při "
+"dumpu\n"
+
+#: pg_dumpall.c:546
+#, c-format
+msgid ""
+"  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
+msgstr ""
+"  -t, --tablespaces-only      dump pouze tablespaců, ne databází nebo rolí\n"
+
+#: pg_dumpall.c:563
+#, c-format
+msgid "  -l, --database=DBNAME    alternative default database\n"
+msgstr "  -l, --database=DBNAME    alternativní výchozí databáze\n"
+
+#: pg_dumpall.c:570
+#, c-format
+msgid ""
+"\n"
+"If -f/--file is not used, then the SQL script will be written to the "
+"standard\n"
+"output.\n"
+"\n"
+msgstr ""
+"\n"
+"Pokud není použito -f/--file, potom SQL skript bude vypsán přímo na "
+"standardní\n"
+"výstup.\n"
+"\n"
+
+#: pg_dumpall.c:1041
+#, c-format
+msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
+msgstr "%s: nelze zpracovat ACL seznam (%s) pro prostor tabulek \"%s\"\n"
+
+#: pg_dumpall.c:1341
+#, c-format
+msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
+msgstr "%s: nelze zpracovat ACL seznam (%s) pro databázi \"%s\"\n"
+
+#: pg_dumpall.c:1548
+#, c-format
+msgid "%s: dumping database \"%s\"...\n"
+msgstr "%s: dumpuji databázi \"%s\"...\n"
+
+#: pg_dumpall.c:1558
+#, c-format
+msgid "%s: pg_dump failed on database \"%s\", exiting\n"
+msgstr "%s: pg_dump selhal při zpracovávání databáze \"%s\", ukon�uji se\n"
+
+#: pg_dumpall.c:1567
+#, c-format
+msgid "%s: could not re-open the output file \"%s\": %s\n"
+msgstr "%s: nelze otevřít logovací soubor \"%s\": %s\n"
+
+#: pg_dumpall.c:1606
+#, c-format
+msgid "%s: running \"%s\"\n"
+msgstr "%s: běží \"%s\"\n"
+
+#: pg_dumpall.c:1651
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek paměti\n"
+
+#: pg_dumpall.c:1700
+#, c-format
+msgid "%s: could not connect to database \"%s\": %s\n"
+msgstr "%s: nelze navázat spojení s databází \"%s\": %s\n"
+
+#: pg_dumpall.c:1714
+#, c-format
+msgid "%s: could not get server version\n"
+msgstr "%s: nelze získat verzi serveru\n"
+
+#: pg_dumpall.c:1720
+#, c-format
+msgid "%s: could not parse server version \"%s\"\n"
+msgstr "%s: nelze zpracovat verzi serveru \"%s\"\n"
+
+#: pg_dumpall.c:1728
+#, c-format
+msgid "%s: could not parse version \"%s\"\n"
+msgstr "%s: nelze zpracovat verzi serveru \"%s\"\n"
+
+#: pg_dumpall.c:1767 pg_dumpall.c:1793
+#, c-format
+msgid "%s: executing %s\n"
+msgstr "%s: vykonávám %s\n"
+
+#: pg_dumpall.c:1773 pg_dumpall.c:1799
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s: dotaz selhal: %s"
+
+#: pg_dumpall.c:1775 pg_dumpall.c:1801
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s: dotaz byl: %s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nelze získat aktuální adresář: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "neplatný binární soubor\"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nelze �íst binární soubor \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nelze najít spustitelný soubor \"%s\""
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nelze změnit adresář na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nelze �íst symbolický link \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "potomek skon�il s návratovým kódem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "potomek byl ukon�en vyjímkou 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "potomek byl ukon�en signálem %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "potomek byl ukon�en signálem %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "potomek skon�il s nerozponaným stavem %d"
+
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s: neplatný přepína� -X -- %s\n"
+
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "dotaz nevrátil žádné řádky: %s\n"
+
+#~ msgid "could not initialize compression library: %s\n"
+#~ msgstr "nelze inicializovat kompresní knihovnu: %s\n"
+
+#~ msgid "could not uncompress data: %s\n"
+#~ msgstr "nelze dekomprimovat data: %s\n"
+
+#~ msgid "could not close compression library: %s\n"
+#~ msgstr "nelze uzavřít kompresní knihovnu: %s\n"
+
+#~ msgid "cannot reopen stdin\n"
+#~ msgstr "nelze znovu otevřít stdin\n"
+
+#~ msgid "cannot reopen non-seekable file\n"
+#~ msgstr "nelze znovu otevřít non-seekable soubor\n"
+
+#~ msgid "could not compress data: %s\n"
+#~ msgstr "nelze komprimovat data: %s\n"
+
+#~ msgid "could not close compression stream: %s\n"
+#~ msgstr "nelze uzavřít kompresní stream: %s\n"
+
+#~ msgid "User name: "
+#~ msgstr "Uživatelské jméno: "
+
+#~ msgid "large-object output not supported for a single table\n"
+#~ msgstr "výstup \"large object\" není podporován pro samotnou tabulku\n"
+
+#~ msgid "use a full dump instead\n"
+#~ msgstr "použijte úplný dump\n"
+
+#~ msgid "large-object output not supported for a single schema\n"
+#~ msgstr ""
+#~ "výstup z \"large object\" není podporován pro jedno samotné schéma\n"
+
+#~ msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
+#~ msgstr "přepína�e INSERT (-d, -D) a OID (-o) nelze použít dohromady\n"
+
+#~ msgid "large-object output is not supported for plain-text dump files\n"
+#~ msgstr ""
+#~ "výstup s \"large object\" není podporován pro textový formát dumpu\n"
+
+#~ msgid "(Use a different output format.)\n"
+#~ msgstr "(Použijte jiný formát dumpu.)\n"
+
+#~ msgid ""
+#~ "  -i, --ignore-version     proceed even when server version mismatches\n"
+#~ "                           pg_dump version\n"
+#~ msgstr ""
+#~ "  -i, --ignore-version     ignorovat rozdíl mezi verzí serveru a\n"
+#~ "                           verzí programu pg_dump\n"
+
+#~ msgid "  -c, --clean              clean (drop) schema prior to create\n"
+#~ msgstr ""
+#~ "  -c, --clean              odstranit (drop) definice databázových "
+#~ "objektů\n"
+#~ "                           před vytvořením\n"
+
+#~ msgid ""
+#~ "  -S, --superuser=NAME     specify the superuser user name to use in\n"
+#~ "                           plain text format\n"
+#~ msgstr ""
+#~ "  -S, --superuser=JMÉNO    jméno super-uživatele použité v\n"
+#~ "                           �istě textovém formátu\n"
+
+#~ msgid "specified schema \"%s\" does not exist\n"
+#~ msgstr "zadané schéma \"%s\" neexistuje\n"
+
+#~ msgid "specified table \"%s\" does not exist\n"
+#~ msgstr "zadaná tabulka \"%s\" neexistuje\n"
+
+#~ msgid "expected %d triggers on table \"%s\" but found %d\n"
+#~ msgstr "o�ekáváno %d triggerů pro tabulku \"%s\", ale nalezeno %d\n"
+
+#~ msgid "Got %d rows instead of one from: %s"
+#~ msgstr "Obdrženo %d řádek na místo jedné z: %s"
+
+#~ msgid "inserted invalid OID\n"
+#~ msgstr "vloženo neplatné OID\n"
+
+#~ msgid "maximum system OID is %u\n"
+#~ msgstr "nejvyšší systémové OID je %u\n"
+
+#~ msgid "could not close output archive file\n"
+#~ msgstr "nelze uzavřít výstupní archivní soubor\n"
+
+#~ msgid "WARNING: skipping large-object restoration\n"
+#~ msgstr "VAROV�N�: přeskakuji obnovu \"large object\"\n"
+
+#~ msgid "fixing up large-object cross-reference for \"%s\"\n"
+#~ msgstr "opravuji \"large object\" odkaz pro \"%s\"\n"
+
+#~ msgid "committing large-object transactions\n"
+#~ msgstr "provádím COMMIT \"large object\" transakcí\n"
+
+#~ msgid "cannot restore large objects without a database connection\n"
+#~ msgstr "nelze obnovit \"large object\" bez spojení s databází\n"
+
+#~ msgid "starting large-object transactions\n"
+#~ msgstr "zahajuji \"large object\" transakce\n"
+
+#~ msgid "restoring large object with OID %u as %u\n"
+#~ msgstr "obnovuji \"large object\" s OID %u jako %u\n"
+
+#~ msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
+#~ msgstr ""
+#~ "zapsáno zbývajících %lu bytů z \"large object\" dat (výsledek = %lu)\n"
+
+#~ msgid "could not open TOC file\n"
+#~ msgstr "nelze otevřít TOC soubor\n"
+
+#~ msgid "could not write to compressed archive\n"
+#~ msgstr "nelze zapsat do komprimovaného archivu\n"
+
+#~ msgid "could not write to output file (%lu != %lu)\n"
+#~ msgstr "nelze zapsat do výstupního souboru (%lu != %lu)\n"
+
+#~ msgid "read %lu bytes into lookahead buffer\n"
+#~ msgstr "na�teno %lu bytů do bufferu\n"
+
+#~ msgid "could not close the input file after reading header: %s\n"
+#~ msgstr "nelze zavřít vstupní soubor po pře�tení hlavi�ky: %s\n"
+
+#~ msgid "archive format is %d\n"
+#~ msgstr "formát archivu je %d\n"
+
+#~ msgid "could not open archive file \"%s\": %s\n"
+#~ msgstr "nelze otevřít archivní soubor \"%s\": %s\n"
+
+#~ msgid ""
+#~ "Dumping a specific TOC data block out of order is not supported without "
+#~ "ID on this input stream (fseek required)\n"
+#~ msgstr ""
+#~ "Dumpování specifického datového bloku TOC mimo pořadí není podporováno "
+#~ "bez ID na tomto vstupním proudu (vyžadován fseek)\n"
+
+#~ msgid "large objects cannot be loaded without a database connection\n"
+#~ msgstr "\"large objects\" nemohou být nataženy bez spojení s databází\n"
+
+#~ msgid "could not read data block -- expected %lu, got %lu\n"
+#~ msgstr "nelze �íst datový blok -- o�ekáváno %lu, obdrženo %lu\n"
+
+#~ msgid "write error in _WriteBuf (%lu != %lu)\n"
+#~ msgstr "chyba zápisu v _WriteBuf (%lu != %lu)\n"
+
+#~ msgid "could not write compressed chunk\n"
+#~ msgstr "nelze zapsat komprimovaný blok\n"
+
+#~ msgid "could not write uncompressed chunk\n"
+#~ msgstr "nelze zapsat nekomprimovaný blok\n"
+
+#~ msgid ""
+#~ "aborting because of version mismatch  (Use the -i option to proceed "
+#~ "anyway.)\n"
+#~ msgstr ""
+#~ "ukon�eno z důvodu rozdílnosti verzí (Použijte přepína� -i pro pokra�ování "
+#~ "a ignorování verzí.)\n"
+
+#~ msgid "%s: no result from server\n"
+#~ msgstr "%s: není odpově� ze serveru\n"
+
+#~ msgid "COPY command executed in non-primary connection\n"
+#~ msgstr "příkaz COPY prováděn na neprimárním spojení\n"
+
+#~ msgid "error returned by PQendcopy\n"
+#~ msgstr "PQendcopy vrátilo chybu\n"
+
+#~ msgid "could not find OID columns of table \"%s\": %s"
+#~ msgstr "nelze najít OID sloupce tabulky \"%s\": %s"
+
+#~ msgid "no OID type columns in table %s\n"
+#~ msgstr "sloupce typu OID v tabulce %s nejsou\n"
+
+#~ msgid "fixing large object cross-references for %s.%s\n"
+#~ msgstr "opravovány \"large object\" odkazy pro %s.%s\n"
+
+#~ msgid "SQL: %s\n"
+#~ msgstr "SQL: %s\n"
+
+#~ msgid "could not update column \"%s\" of table \"%s\": %s"
+#~ msgstr "nelze provést update sloupce \"%s\" tabulky \"%s\": %s"
+
+#~ msgid "error while updating column \"%s\" of table \"%s\": %s"
+#~ msgstr "chyba během update sloupce \"%s\" tabulky \"%s\": %s"
+
+#~ msgid "creating table for large object cross-references\n"
+#~ msgstr "vytvářena tabulka pro \"large object\" odkazy\n"
+
+#~ msgid "could not create large object cross-reference table"
+#~ msgstr "nelze vytvořit tabulka pro \"large object\" odkazy"
+
+#~ msgid "creating index for large object cross-references\n"
+#~ msgstr "vytvářím index pro křížové odkazy \"large object\"\n"
+
+#~ msgid "could not create index on large object cross-reference table"
+#~ msgstr "nelze vytvořit index pro tabulku s \"large object\" odkazy"
+
+#~ msgid "could not create large object cross-reference entry"
+#~ msgstr "nelze vytvořit záznam pro \"large object\" odkaz"
+
+#~ msgid "could not start transaction for large object cross-references"
+#~ msgstr "nelze nastartovat transakci pro \"large object\" odkazy"
+
+#~ msgid "could not commit transaction for large object cross-references"
+#~ msgstr "nelze provést commit transakce pro \"large object\" odkazy"
+
+#~ msgid "could not open data file for output\n"
+#~ msgstr "nelze otevřít datový soubor pro výstup\n"
+
+#~ msgid "could not open data file for input\n"
+#~ msgstr "nelze otevřít datový soubor pro vstup\n"
+
+#~ msgid "could not open large object file\n"
+#~ msgstr "nelze otevřít \"large object\" soubor\n"
+
+#~ msgid "compression support is disabled in this format\n"
+#~ msgstr "pro tento formát je podpora komprese zablokována\n"
+
+#~ msgid "requested %d bytes, got %d from lookahead and %d from file\n"
+#~ msgstr "požadováno %d bytů, obdrženo %d z \"lookahead\" a %d ze souboru\n"
+
+#~ msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
+#~ msgstr "nelze zapsat do tar položky (zapsáno %lu, požadováno %lu)\n"
+
+#~ msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
+#~ msgstr ""
+#~ "chyba zápisu při připojování do tar archivu (zapsáno %lu, požadováno "
+#~ "%lu)\n"
+
+#~ msgid "could not close tar member: %s\n"
+#~ msgstr "nelze uzavřít tar položku: %s\n"
+
+#~ msgid "could not write tar header\n"
+#~ msgstr "nelze zapsat hlavi�ku tar archivu\n"
+
+#~ msgid ""
+#~ "  -i, --ignore-version     proceed even when server version mismatches\n"
+#~ msgstr "  -i, --ignore-version     ignorovat rozdílnou verzi serveru\n"
+
+#~ msgid ""
+#~ "  -i, --ignore-version     proceed even when server version mismatches\n"
+#~ "                           pg_dumpall version\n"
+#~ msgstr ""
+#~ "  -i, --ignore-version     ignoruje rozdílnost verze serveru a\n"
+#~ "                           verzí pg_dumpall\n"
+
+#~ msgid ""
+#~ "  -O, --no-owner           do not output commands to set object "
+#~ "ownership\n"
+#~ msgstr ""
+#~ "  -O, --no-owner           nevypisuj příkazy k nastavení vlastníka "
+#~ "objektů\n"
diff --git a/src/bin/pg_dump/po/de.po b/src/bin/pg_dump/po/de.po
index e56c42ffacfb3..4023524e4d758 100644
--- a/src/bin/pg_dump/po/de.po
+++ b/src/bin/pg_dump/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for pg_dump and friends
 # Peter Eisentraut <peter_e@gmx.net>, 2001 - 2011.
 #
-# pgtranslation Id: pg_dump.po,v 1.30 2011/05/26 19:59:50 petere Exp $
+# pgtranslation Id: pg_dump.po,v 1.32 2011/11/30 19:30:21 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-25 20:40+0000\n"
-"PO-Revision-Date: 2011-05-26 22:50+0300\n"
+"POT-Creation-Date: 2011-11-30 18:39+0000\n"
+"PO-Revision-Date: 2011-11-30 21:26+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -54,35 +54,35 @@ msgstr ""
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Die INSERT-Anweisung kann OIDs nicht setzen.)\n"
 
-#: pg_dump.c:558
+#: pg_dump.c:552
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "konnte Ausgabedatei »%s« nicht zum Schreiben öffnen\n"
 
-#: pg_dump.c:568 pg_backup_db.c:45
+#: pg_dump.c:562 pg_backup_db.c:38
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "konnte Versionszeichenkette »%s« nicht entziffern\n"
 
-#: pg_dump.c:591
+#: pg_dump.c:585
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "ungültige Clientkodierung »%s« angegeben\n"
 
-#: pg_dump.c:690
+#: pg_dump.c:685
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "letzte eingebaute OID ist %u\n"
 
-#: pg_dump.c:700
+#: pg_dump.c:695
 msgid "No matching schemas were found\n"
 msgstr "Keine passenden Schemas gefunden\n"
 
-#: pg_dump.c:715
+#: pg_dump.c:710
 msgid "No matching tables were found\n"
 msgstr "Keine passenden Tabellen gefunden\n"
 
-#: pg_dump.c:827
+#: pg_dump.c:822
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -91,17 +91,17 @@ msgstr ""
 "%s gibt eine Datenbank als Textdatei oder in anderen Formaten aus.\n"
 "\n"
 
-#: pg_dump.c:828 pg_restore.c:397 pg_dumpall.c:529
+#: pg_dump.c:823 pg_restore.c:397 pg_dumpall.c:529
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: pg_dump.c:829
+#: pg_dump.c:824
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: pg_dump.c:831 pg_restore.c:400 pg_dumpall.c:532
+#: pg_dump.c:826 pg_restore.c:400 pg_dumpall.c:532
 #, c-format
 msgid ""
 "\n"
@@ -110,14 +110,14 @@ msgstr ""
 "\n"
 "Allgemeine Optionen:\n"
 
-#: pg_dump.c:832
+#: pg_dump.c:827
 #, c-format
 msgid "  -f, --file=FILENAME         output file or directory name\n"
 msgstr ""
 "  -f, --file=DATEINAME        Name der Ausgabedatei oder des -"
 "verzeichnisses\n"
 
-#: pg_dump.c:833
+#: pg_dump.c:828
 #, c-format
 msgid ""
 "  -F, --format=c|d|t|p        output file format (custom, directory, tar, "
@@ -126,37 +126,37 @@ msgstr ""
 "  -F, --format=c|d|t|p        Ausgabeformat (custom, d=Verzeichnis, tar,\n"
 "                              plain text)\n"
 
-#: pg_dump.c:834
+#: pg_dump.c:829
 #, c-format
 msgid "  -v, --verbose               verbose mode\n"
 msgstr "  -v, --verbose               »Verbose«-Modus\n"
 
-#: pg_dump.c:835
+#: pg_dump.c:830
 #, c-format
 msgid ""
 "  -Z, --compress=0-9          compression level for compressed formats\n"
 msgstr ""
 "  -Z, --compress=0-9          Komprimierungsniveau für komprimierte Formate\n"
 
-#: pg_dump.c:836 pg_dumpall.c:534
+#: pg_dump.c:831 pg_dumpall.c:534
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=ZEIT    Abbruch nach ZEIT Warten auf Tabellensperre\n"
 
-#: pg_dump.c:837 pg_dumpall.c:535
+#: pg_dump.c:832 pg_dumpall.c:535
 #, c-format
 msgid "  --help                      show this help, then exit\n"
 msgstr "  --help                      diese Hilfe anzeigen, dann beenden\n"
 
-#: pg_dump.c:838 pg_dumpall.c:536
+#: pg_dump.c:833 pg_dumpall.c:536
 #, c-format
 msgid "  --version                   output version information, then exit\n"
 msgstr ""
 "  --version                   Versionsinformationen anzeigen, dann beenden\n"
 
-#: pg_dump.c:840 pg_dumpall.c:537
+#: pg_dump.c:835 pg_dumpall.c:537
 #, c-format
 msgid ""
 "\n"
@@ -165,17 +165,17 @@ msgstr ""
 "\n"
 "Optionen die den Inhalt der Ausgabe kontrollieren:\n"
 
-#: pg_dump.c:841 pg_dumpall.c:538
+#: pg_dump.c:836 pg_dumpall.c:538
 #, c-format
 msgid "  -a, --data-only             dump only the data, not the schema\n"
 msgstr "  -a, --data-only             nur Daten ausgeben, nicht das Schema\n"
 
-#: pg_dump.c:842
+#: pg_dump.c:837
 #, c-format
 msgid "  -b, --blobs                 include large objects in dump\n"
 msgstr "  -b, --blobs                 Large Objects mit ausgeben\n"
 
-#: pg_dump.c:843
+#: pg_dump.c:838
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) database objects before "
@@ -184,7 +184,7 @@ msgstr ""
 "  -c, --clean                 Datenbankobjekte vor der Wiedererstellung "
 "löschen\n"
 
-#: pg_dump.c:844
+#: pg_dump.c:839
 #, c-format
 msgid ""
 "  -C, --create                include commands to create database in dump\n"
@@ -192,30 +192,30 @@ msgstr ""
 "  -C, --create                Anweisungen zum Erstellen der Datenbank in\n"
 "                              Ausgabe einfügen\n"
 
-#: pg_dump.c:845
+#: pg_dump.c:840
 #, c-format
 msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=KODIERUNG    Daten mit Kodierung KODIERUNG ausgeben\n"
 
-#: pg_dump.c:846
+#: pg_dump.c:841
 #, c-format
 msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
 msgstr ""
 "  -n, --schema=SCHEMA         nur das/die angegebene(n) Schema(s) ausgeben\n"
 
-#: pg_dump.c:847
+#: pg_dump.c:842
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
 msgstr ""
 "  -N, --exclude-schema=SCHEMA das/die angegebene(n) Schema(s) NICHT "
 "ausgeben\n"
 
-#: pg_dump.c:848 pg_dumpall.c:541
+#: pg_dump.c:843 pg_dumpall.c:541
 #, c-format
 msgid "  -o, --oids                  include OIDs in dump\n"
 msgstr "  -o, --oids                  OIDs mit ausgeben\n"
 
-#: pg_dump.c:849
+#: pg_dump.c:844
 #, c-format
 msgid ""
 "  -O, --no-owner              skip restoration of object ownership in\n"
@@ -225,45 +225,45 @@ msgstr ""
 "im\n"
 "                              »plain text«-Format auslassen\n"
 
-#: pg_dump.c:851 pg_dumpall.c:544
+#: pg_dump.c:846 pg_dumpall.c:544
 #, c-format
 msgid "  -s, --schema-only           dump only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only           nur das Schema, nicht die Daten, ausgeben\n"
 
-#: pg_dump.c:852
+#: pg_dump.c:847
 #, c-format
 msgid ""
 "  -S, --superuser=NAME        superuser user name to use in plain-text "
 "format\n"
 msgstr "  -S, --superuser=NAME        Superusername für »plain text«-Format\n"
 
-#: pg_dump.c:853
+#: pg_dump.c:848
 #, c-format
 msgid "  -t, --table=TABLE           dump the named table(s) only\n"
 msgstr ""
 "  -t, --table=TABELLE         nur die angegebene(n) Tabelle(n) ausgeben\n"
 
-#: pg_dump.c:854
+#: pg_dump.c:849
 #, c-format
 msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
 msgstr ""
 "  -T, --exclude-table=TABELLE die angegebene(n) Tabelle(n) NICHT ausgeben\n"
 
-#: pg_dump.c:855 pg_dumpall.c:547
+#: pg_dump.c:850 pg_dumpall.c:547
 #, c-format
 msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
 msgstr ""
 "  -x, --no-privileges         Zugriffsprivilegien (grant/revoke) nicht "
 "ausgeben\n"
 
-#: pg_dump.c:856 pg_dumpall.c:548
+#: pg_dump.c:851 pg_dumpall.c:548
 #, c-format
 msgid "  --binary-upgrade            for use by upgrade utilities only\n"
 msgstr ""
 "  --binary-upgrade            wird nur von Upgrade-Programmen verwendet\n"
 
-#: pg_dump.c:857 pg_dumpall.c:549
+#: pg_dump.c:852 pg_dumpall.c:549
 #, c-format
 msgid ""
 "  --column-inserts            dump data as INSERT commands with column "
@@ -272,7 +272,7 @@ msgstr ""
 "  --column-inserts            Daten als INSERT-Anweisungen mit Spaltennamen\n"
 "                              ausgeben\n"
 
-#: pg_dump.c:858 pg_dumpall.c:550
+#: pg_dump.c:853 pg_dumpall.c:550
 #, c-format
 msgid ""
 "  --disable-dollar-quoting    disable dollar quoting, use SQL standard "
@@ -282,7 +282,7 @@ msgstr ""
 "Quoting\n"
 "                              verwenden\n"
 
-#: pg_dump.c:859 pg_dumpall.c:551
+#: pg_dump.c:854 pg_dumpall.c:551
 #, c-format
 msgid ""
 "  --disable-triggers          disable triggers during data-only restore\n"
@@ -290,7 +290,7 @@ msgstr ""
 "  --disable-triggers          Trigger abschalten während der Datenwieder-\n"
 "                              herstellung\n"
 
-#: pg_dump.c:860 pg_dumpall.c:552
+#: pg_dump.c:855 pg_dumpall.c:552
 #, c-format
 msgid ""
 "  --inserts                   dump data as INSERT commands, rather than "
@@ -299,25 +299,25 @@ msgstr ""
 "  --inserts                   Daten als INSERT-Anweisungen statt COPY "
 "ausgeben\n"
 
-#: pg_dump.c:861 pg_dumpall.c:553
+#: pg_dump.c:856 pg_dumpall.c:553
 #, c-format
 msgid "  --no-security-labels        do not dump security label assignments\n"
 msgstr ""
 "  --no-security-labels        Security-Label-Zuweisungen nicht ausgeben\n"
 
-#: pg_dump.c:862 pg_dumpall.c:554
+#: pg_dump.c:857 pg_dumpall.c:554
 #, c-format
 msgid "  --no-tablespaces            do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces            Tablespace-Zuordnungen nicht ausgeben\n"
 
-#: pg_dump.c:863 pg_dumpall.c:555
+#: pg_dump.c:858 pg_dumpall.c:555
 #, c-format
 msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
 msgstr ""
 "  --no-unlogged-table-data    Daten in nicht geloggten Tabellen nicht "
 "ausgeben\n"
 
-#: pg_dump.c:864 pg_dumpall.c:556
+#: pg_dump.c:859 pg_dumpall.c:556
 #, c-format
 msgid ""
 "  --quote-all-identifiers     quote all identifiers, even if not key words\n"
@@ -326,7 +326,7 @@ msgstr ""
 "wenn\n"
 "                              kein Schlüsselwort\n"
 
-#: pg_dump.c:865
+#: pg_dump.c:860
 #, c-format
 msgid ""
 "  --serializable-deferrable   wait until the dump can run without anomalies\n"
@@ -334,7 +334,7 @@ msgstr ""
 "  --serializable-deferrable   warten bis der Dump ohne Anomalien laufen "
 "kann\n"
 
-#: pg_dump.c:866 pg_dumpall.c:557
+#: pg_dump.c:861 pg_dumpall.c:557
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -348,7 +348,7 @@ msgstr ""
 "zu\n"
 "                              setzen\n"
 
-#: pg_dump.c:870 pg_restore.c:439 pg_dumpall.c:561
+#: pg_dump.c:865 pg_restore.c:439 pg_dumpall.c:561
 #, c-format
 msgid ""
 "\n"
@@ -357,29 +357,29 @@ msgstr ""
 "\n"
 "Verbindungsoptionen:\n"
 
-#: pg_dump.c:871 pg_restore.c:440 pg_dumpall.c:562
+#: pg_dump.c:866 pg_restore.c:440 pg_dumpall.c:562
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME      Name des Datenbankservers oder Socket-"
 "Verzeichnis\n"
 
-#: pg_dump.c:872 pg_restore.c:441 pg_dumpall.c:564
+#: pg_dump.c:867 pg_restore.c:441 pg_dumpall.c:564
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          Portnummer des Datenbankservers\n"
 
-#: pg_dump.c:873 pg_restore.c:442 pg_dumpall.c:565
+#: pg_dump.c:868 pg_restore.c:442 pg_dumpall.c:565
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      Datenbankbenutzername\n"
 
-#: pg_dump.c:874 pg_restore.c:443 pg_dumpall.c:566
+#: pg_dump.c:869 pg_restore.c:443 pg_dumpall.c:566
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        niemals nach Passwort fragen\n"
 
-#: pg_dump.c:875 pg_restore.c:444 pg_dumpall.c:567
+#: pg_dump.c:870 pg_restore.c:444 pg_dumpall.c:567
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -388,12 +388,12 @@ msgstr ""
 "  -W, --password           nach Passwort fragen (sollte automatisch "
 "geschehen)\n"
 
-#: pg_dump.c:876 pg_dumpall.c:568
+#: pg_dump.c:871 pg_dumpall.c:568
 #, c-format
 msgid "  --role=ROLENAME          do SET ROLE before dump\n"
 msgstr "  --role=ROLLENNAME        vor der Ausgabe SET ROLE ausführen\n"
 
-#: pg_dump.c:878
+#: pg_dump.c:873
 #, c-format
 msgid ""
 "\n"
@@ -406,173 +406,173 @@ msgstr ""
 "PGDATABASE verwendet.\n"
 "\n"
 
-#: pg_dump.c:880 pg_restore.c:448 pg_dumpall.c:572
+#: pg_dump.c:875 pg_restore.c:448 pg_dumpall.c:572
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:888 pg_backup_archiver.c:1437
+#: pg_dump.c:883 pg_backup_archiver.c:1458
 msgid "*** aborted because of error\n"
 msgstr "*** abgebrochen wegen Fehler\n"
 
-#: pg_dump.c:930
+#: pg_dump.c:925
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "ungültiges Ausgabeformat »%s« angegeben\n"
 
-#: pg_dump.c:953
+#: pg_dump.c:948
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr ""
 "Serverversion muss mindestens 7.3 sein um Schemas auswählen zu können\n"
 
-#: pg_dump.c:1211
+#: pg_dump.c:1220
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "gebe Inhalt der Tabelle %s aus\n"
 
-#: pg_dump.c:1331
+#: pg_dump.c:1340
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr ""
 "Ausgabe des Inhalts der Tabelle »%s« fehlgeschlagen: PQendcopy() "
 "fehlgeschlagen.\n"
 
-#: pg_dump.c:1332 pg_dump.c:14126
+#: pg_dump.c:1341 pg_dump.c:14173
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Fehlermeldung vom Server: %s"
 
-#: pg_dump.c:1333 pg_dump.c:14127
+#: pg_dump.c:1342 pg_dump.c:14174
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Die Anweisung war: %s\n"
 
-#: pg_dump.c:1756
+#: pg_dump.c:1765
 msgid "saving database definition\n"
 msgstr "sichere Datenbankdefinition\n"
 
-#: pg_dump.c:1838
+#: pg_dump.c:1847
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "fehlender pg_database-Eintrag für Datenbank »%s«\n"
 
-#: pg_dump.c:1845
+#: pg_dump.c:1854
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr ""
 "Anfrage ergab mehr als einen (%d) pg_database-Eintrag für Datenbank »%s«\n"
 
-#: pg_dump.c:1949
+#: pg_dump.c:1958
 msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
 msgstr "dumpDatabase(): konnte pg_largeobject.relfrozenxid nicht finden\n"
 
-#: pg_dump.c:1988
+#: pg_dump.c:1997
 msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
 msgstr ""
 "dumpDatabase(): konnte pg_largeobject_metadata.relfrozenxid nicht finden\n"
 
-#: pg_dump.c:2067
+#: pg_dump.c:2076
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "sichere Kodierung = %s\n"
 
-#: pg_dump.c:2094
+#: pg_dump.c:2103
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "sichere standard_conforming_strings = %s\n"
 
-#: pg_dump.c:2127
+#: pg_dump.c:2136
 msgid "reading large objects\n"
 msgstr "lese Large Objects\n"
 
-#: pg_dump.c:2259
+#: pg_dump.c:2268
 msgid "saving large objects\n"
 msgstr "sichere Large Objects\n"
 
-#: pg_dump.c:2301 pg_backup_archiver.c:959
+#: pg_dump.c:2310 pg_backup_archiver.c:984
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "konnte Large Object %u nicht öffnen: %s"
 
-#: pg_dump.c:2314
+#: pg_dump.c:2323
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "Fehler beim Lesen von Large Object %u: %s"
 
-#: pg_dump.c:2361 pg_dump.c:2409 pg_dump.c:2464 pg_dump.c:7592 pg_dump.c:7823
-#: pg_dump.c:8789 pg_dump.c:9341 pg_dump.c:9595 pg_dump.c:9709 pg_dump.c:10165
-#: pg_dump.c:10351 pg_dump.c:10457 pg_dump.c:10657 pg_dump.c:10899
-#: pg_dump.c:11066 pg_dump.c:11279 pg_dump.c:13932
+#: pg_dump.c:2370 pg_dump.c:2418 pg_dump.c:2473 pg_dump.c:7607 pg_dump.c:7838
+#: pg_dump.c:8804 pg_dump.c:9356 pg_dump.c:9610 pg_dump.c:9724 pg_dump.c:10180
+#: pg_dump.c:10366 pg_dump.c:10472 pg_dump.c:10672 pg_dump.c:10914
+#: pg_dump.c:11081 pg_dump.c:11302 pg_dump.c:13979
 #, c-format
 msgid "query returned %d row instead of one: %s\n"
 msgid_plural "query returned %d rows instead of one: %s\n"
 msgstr[0] "Anfrage ergab %d Zeile anstatt einer: %s\n"
 msgstr[1] "Anfrage ergab %d Zeilen anstatt einer: %s\n"
 
-#: pg_dump.c:2545
+#: pg_dump.c:2554
 #, c-format
 msgid "could not find parent extension for %s"
 msgstr "konnte Erweiterung, zu der %s gehört, nicht finden"
 
-#: pg_dump.c:2652
+#: pg_dump.c:2661
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigentümer des Schemas »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:2687
+#: pg_dump.c:2696
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "Schema mit OID %u existiert nicht\n"
 
-#: pg_dump.c:3028
+#: pg_dump.c:3037
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigentümer des Datentypen »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3132
+#: pg_dump.c:3141
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigentümer des Operatoren »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3384
+#: pg_dump.c:3393
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigentümer der Operatorklasse »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3471
+#: pg_dump.c:3480
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr ""
 "WARNUNG: Eigentümer der Operatorfamilie »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3608
+#: pg_dump.c:3617
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr ""
 "WARNUNG: Eigentümer der Aggregatfunktion »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:3778
+#: pg_dump.c:3787
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigentümer der Funktion »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:4278
+#: pg_dump.c:4287
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigentümer der Tabelle »%s« scheint ungültig zu sein\n"
 
-#: pg_dump.c:4421
+#: pg_dump.c:4430
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "lese Indexe von Tabelle »%s«\n"
 
-#: pg_dump.c:4741
+#: pg_dump.c:4750
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "lese Fremdschlüssel-Constraints von Tabelle »%s«\n"
 
-#: pg_dump.c:4973
+#: pg_dump.c:4982
 #, c-format
 msgid ""
 "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
@@ -581,12 +581,12 @@ msgstr ""
 "Sanity-Check fehlgeschlagen, Elterntabelle %u von pg_rewrite-Eintrag OID %u "
 "nicht gefunden\n"
 
-#: pg_dump.c:5057
+#: pg_dump.c:5066
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "lese Trigger von Tabelle »%s«\n"
 
-#: pg_dump.c:5220
+#: pg_dump.c:5229
 #, c-format
 msgid ""
 "query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -595,77 +595,77 @@ msgstr ""
 "Anfrage ergab NULL als Name der Tabelle auf die sich Fremdschlüssel-Trigger "
 "»%s« von Tabelle »%s« bezieht (OID der Tabelle: %u)\n"
 
-#: pg_dump.c:5591
+#: pg_dump.c:5600
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "finde Spalten und Typen von Tabelle »%s«\n"
 
-#: pg_dump.c:5736
+#: pg_dump.c:5745
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "ungültige Spaltennummerierung in Tabelle »%s«\n"
 
-#: pg_dump.c:5773
+#: pg_dump.c:5782
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "finde DEFAULT-Ausdrucke von Tabelle »%s«\n"
 
-#: pg_dump.c:5858
+#: pg_dump.c:5867
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "ungültiger adnum-Wert %d für Tabelle »%s«\n"
 
-#: pg_dump.c:5876
+#: pg_dump.c:5885
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "finde Check-Constraints für Tabelle »%s«\n"
 
-#: pg_dump.c:5956
+#: pg_dump.c:5965
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d\n"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
 msgstr[0] "%d Check-Constraint für Tabelle %s erwartet, aber %d gefunden\n"
 msgstr[1] "%d Check-Constraints für Tabelle %s erwartet, aber %d gefunden\n"
 
-#: pg_dump.c:5960
+#: pg_dump.c:5969
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Die Systemkataloge sind wahrscheinlich verfälscht.)\n"
 
-#: pg_dump.c:8555
+#: pg_dump.c:8570
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "WARNUNG: unsinniger Wert in proargmodes-Array\n"
 
-#: pg_dump.c:8869
+#: pg_dump.c:8884
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "WARNUNG: konnte proallargtypes-Array nicht interpretieren\n"
 
-#: pg_dump.c:8885
+#: pg_dump.c:8900
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "WARNUNG: konnte proargmodes-Array nicht interpretieren\n"
 
-#: pg_dump.c:8899
+#: pg_dump.c:8914
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "WARNUNG: konnte proargnames-Array nicht interpretieren\n"
 
-#: pg_dump.c:8910
+#: pg_dump.c:8925
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "WARNUNG: konnte proconfig-Array nicht interpretieren\n"
 
-#: pg_dump.c:8966
+#: pg_dump.c:8981
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "ungültiger provolatile-Wert für Funktion »%s«\n"
 
-#: pg_dump.c:9182
+#: pg_dump.c:9197
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "WARNUNG: unsinniger Wert in Feld pg_cast.castmethod\n"
 
-#: pg_dump.c:9564
+#: pg_dump.c:9579
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "WARNUNG: konnte Operator mit OID %s nicht finden\n"
 
-#: pg_dump.c:10683
+#: pg_dump.c:10698
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
@@ -674,29 +674,29 @@ msgstr ""
 "WARNUNG: Aggregatfunktion %s konnte für diese Datenbankversion nicht korrekt "
 "ausgegeben werden - ignoriert\n"
 
-#: pg_dump.c:11475
+#: pg_dump.c:11502
 #, c-format
 msgid "unknown object type (%d) in default privileges\n"
 msgstr "unbekannter Objekttyp (%d) in Vorgabeprivilegien\n"
 
-#: pg_dump.c:11492
+#: pg_dump.c:11519
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "konnte Vorgabe-ACL-Liste (%s) nicht interpretieren\n"
 
-#: pg_dump.c:11549
+#: pg_dump.c:11576
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr ""
 "konnte ACL-Zeichenkette (%s) für Objekt »%s« (%s) nicht interpretieren\n"
 
-#: pg_dump.c:11989
+#: pg_dump.c:12022
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr ""
 "Anfrage um die Definition der Sicht »%s« zu ermitteln lieferte keine Daten\n"
 
-#: pg_dump.c:11992
+#: pg_dump.c:12025
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
@@ -704,43 +704,51 @@ msgstr ""
 "Anfrage um die Definition der Sicht »%s« zu ermitteln lieferte mehr als eine "
 "Definition\n"
 
-#: pg_dump.c:12001
+#: pg_dump.c:12034
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "Definition der Sicht »%s« scheint leer zu sein (Länge null)\n"
 
-#: pg_dump.c:12567
+#: pg_dump.c:12085
+#, c-format
+msgid "query returned %d foreign server entry for foreign table \"%s\"\n"
+msgid_plural ""
+"query returned %d foreign server entries for foreign table \"%s\"\n"
+msgstr[0] "Anfrage ergab %d Fremdservereintrag für Fremdtabelle »%s«\n"
+msgstr[1] "Anfrage ergab %d Fremdservereinträge für Fremdtabelle »%s«\n"
+
+#: pg_dump.c:12614
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "ungültige Spaltennummer %d in Tabelle »%s«\n"
 
-#: pg_dump.c:12678
+#: pg_dump.c:12725
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "fehlender Index für Constraint »%s«\n"
 
-#: pg_dump.c:12866
+#: pg_dump.c:12913
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "unbekannter Constraint-Typ: %c\n"
 
-#: pg_dump.c:12929
+#: pg_dump.c:12976
 msgid "missing pg_database entry for this database\n"
 msgstr "fehlender pg_database-Eintrag für diese Datenbank\n"
 
-#: pg_dump.c:12934
+#: pg_dump.c:12981
 msgid "found more than one pg_database entry for this database\n"
 msgstr "mehr als einen pg_database-Eintrag für diese Datenbank gefunden\n"
 
-#: pg_dump.c:12966
+#: pg_dump.c:13013
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "konnte Eintrag für pg_indexes in pg_class nicht finden\n"
 
-#: pg_dump.c:12971
+#: pg_dump.c:13018
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "mehr als ein Eintrag für pg_indexes in pg_class gefunden\n"
 
-#: pg_dump.c:13043
+#: pg_dump.c:13090
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural ""
@@ -748,23 +756,23 @@ msgid_plural ""
 msgstr[0] "Anfrage nach Daten der Sequenz %s ergab %d Zeile (erwartete 1)\n"
 msgstr[1] "Anfrage nach Daten der Sequenz %s ergab %d Zeilen (erwartete 1)\n"
 
-#: pg_dump.c:13054
+#: pg_dump.c:13101
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "Anfrage nach Daten der Sequenz %s ergab Name »%s«\n"
 
-#: pg_dump.c:13282
+#: pg_dump.c:13329
 #, c-format
 msgid "unexpected tgtype value: %d\n"
 msgstr "unerwarteter tgtype-Wert: %d\n"
 
-#: pg_dump.c:13364
+#: pg_dump.c:13411
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr ""
 "fehlerhafte Argumentzeichenkette (%s) für Trigger »%s« von Tabelle »%s«\n"
 
-#: pg_dump.c:13482
+#: pg_dump.c:13529
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -773,11 +781,11 @@ msgstr ""
 "Anfrage nach Regel »%s« der Tabelle »%s« fehlgeschlagen: falsche Anzahl "
 "Zeilen zurückgegeben\n"
 
-#: pg_dump.c:13739
+#: pg_dump.c:13786
 msgid "reading dependency data\n"
 msgstr "lese Abhängigkeitsdaten\n"
 
-#: pg_dump.c:14121
+#: pg_dump.c:14168
 msgid "SQL command failed\n"
 msgstr "SQL-Anweisung schlug fehl\n"
 
@@ -785,149 +793,149 @@ msgstr "SQL-Anweisung schlug fehl\n"
 msgid "reading schemas\n"
 msgstr "lese Schemas\n"
 
-#: common.c:109
+#: common.c:115
+msgid "reading user-defined tables\n"
+msgstr "lese benutzerdefinierte Tabellen\n"
+
+#: common.c:120
 msgid "reading extensions\n"
 msgstr "lese Erweiterungen\n"
 
-#: common.c:113
+#: common.c:124
 msgid "reading user-defined functions\n"
 msgstr "lese benutzerdefinierte Funktionen\n"
 
-#: common.c:119
+#: common.c:130
 msgid "reading user-defined types\n"
 msgstr "lese benutzerdefinierte Typen\n"
 
-#: common.c:125
+#: common.c:136
 msgid "reading procedural languages\n"
 msgstr "lese prozedurale Sprachen\n"
 
-#: common.c:129
+#: common.c:140
 msgid "reading user-defined aggregate functions\n"
 msgstr "lese benutzerdefinierte Aggregatfunktionen\n"
 
-#: common.c:133
+#: common.c:144
 msgid "reading user-defined operators\n"
 msgstr "lese benutzerdefinierte Operatoren\n"
 
-#: common.c:138
+#: common.c:149
 msgid "reading user-defined operator classes\n"
 msgstr "lese benutzerdefinierte Operatorklassen\n"
 
-#: common.c:142
+#: common.c:153
 msgid "reading user-defined operator families\n"
 msgstr "lese benutzerdefinierte Operatorfamilien\n"
 
-#: common.c:146
+#: common.c:157
 msgid "reading user-defined text search parsers\n"
 msgstr "lese benutzerdefinierte Textsuche-Parser\n"
 
-#: common.c:150
+#: common.c:161
 msgid "reading user-defined text search templates\n"
 msgstr "lese benutzerdefinierte Textsuche-Templates\n"
 
-#: common.c:154
+#: common.c:165
 msgid "reading user-defined text search dictionaries\n"
 msgstr "lese benutzerdefinierte Textsuchewörterbücher\n"
 
-#: common.c:158
+#: common.c:169
 msgid "reading user-defined text search configurations\n"
 msgstr "lese benutzerdefinierte Textsuchekonfigurationen\n"
 
-#: common.c:162
+#: common.c:173
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "lese benutzerdefinierte Fremddaten-Wrapper\n"
 
-#: common.c:166
+#: common.c:177
 msgid "reading user-defined foreign servers\n"
 msgstr "lese benutzerdefinierte Fremdserver\n"
 
-#: common.c:170
+#: common.c:181
 msgid "reading default privileges\n"
 msgstr "lese Vorgabeprivilegien\n"
 
-#: common.c:174
+#: common.c:185
 msgid "reading user-defined collations\n"
 msgstr "lese benutzerdefinierte Sortierfolgen\n"
 
-#: common.c:179
+#: common.c:190
 msgid "reading user-defined conversions\n"
 msgstr "lese benutzerdefinierte Konversionen\n"
 
-#: common.c:183
+#: common.c:194
 msgid "reading type casts\n"
 msgstr "lese Typumwandlungen\n"
 
-#: common.c:187
-msgid "reading user-defined tables\n"
-msgstr "lese benutzerdefinierte Tabellen\n"
-
-#: common.c:192
+#: common.c:198
 msgid "reading table inheritance information\n"
 msgstr "lese Tabellenvererbungsinformationen\n"
 
-#: common.c:196
+#: common.c:202
 msgid "reading rewrite rules\n"
 msgstr "lese Umschreiberegeln\n"
 
-#: common.c:205
+#: common.c:211
 msgid "finding extension members\n"
 msgstr "finde Erweiterungselemente\n"
 
-#: common.c:210
+#: common.c:216
 msgid "finding inheritance relationships\n"
 msgstr "lese Vererbungsbeziehungen\n"
 
-#: common.c:214
+#: common.c:220
 msgid "reading column info for interesting tables\n"
 msgstr "lese Spalteninfo für interessante Tabellen\n"
 
-#: common.c:218
+#: common.c:224
 msgid "flagging inherited columns in subtables\n"
 msgstr "markiere vererbte Spalten in abgeleiteten Tabellen\n"
 
-#: common.c:222
+#: common.c:228
 msgid "reading indexes\n"
 msgstr "lese Indexe\n"
 
-#: common.c:226
+#: common.c:232
 msgid "reading constraints\n"
 msgstr "lese Constraints\n"
 
-#: common.c:230
+#: common.c:236
 msgid "reading triggers\n"
 msgstr "lese Trigger\n"
 
-#: common.c:822
+#: common.c:828
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr ""
 "Sanity-Check fehlgeschlagen, Eltern-OID %u von Tabelle »%s« (OID %u) nicht "
 "gefunden\n"
 
-#: common.c:864
+#: common.c:870
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "konnte numerisches Array »%s« nicht parsen: zu viele Zahlen\n"
 
-#: common.c:879
+#: common.c:885
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr ""
 "konnte numerisches Array »%s« nicht parsen: ungültiges Zeichen in Zahl\n"
 
-#: common.c:992
+#: common.c:998
 msgid "cannot duplicate null pointer\n"
 msgstr "kann NULL-Zeiger nicht duplizieren\n"
 
-#: common.c:995 common.c:1006 common.c:1017 common.c:1028
-#: pg_backup_archiver.c:739 pg_backup_archiver.c:1135
-#: pg_backup_archiver.c:1270 pg_backup_archiver.c:1740
-#: pg_backup_archiver.c:1934 pg_backup_archiver.c:1980
-#: pg_backup_archiver.c:4199 pg_backup_custom.c:132 pg_backup_custom.c:139
-#: pg_backup_custom.c:775 pg_backup_custom.c:902 pg_backup_db.c:154
-#: pg_backup_db.c:164 pg_backup_db.c:212 pg_backup_db.c:256 pg_backup_db.c:271
-#: pg_backup_db.c:305 pg_backup_files.c:114 pg_backup_null.c:72
-#: pg_backup_tar.c:171 pg_backup_tar.c:1015
+#: common.c:1001 common.c:1012 common.c:1023 common.c:1034
+#: pg_backup_archiver.c:764 pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291 pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955 pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209 pg_backup_custom.c:132 pg_backup_custom.c:139
+#: pg_backup_custom.c:780 pg_backup_custom.c:907 pg_backup_db.c:147
+#: pg_backup_db.c:157 pg_backup_db.c:205 pg_backup_db.c:249 pg_backup_db.c:264
+#: pg_backup_db.c:298 pg_backup_db.c:403 pg_backup_files.c:114
+#: pg_backup_null.c:72 pg_backup_tar.c:171 pg_backup_tar.c:1015
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
@@ -935,20 +943,33 @@ msgstr "Speicher aufgebraucht\n"
 msgid "archiver"
 msgstr "Archivierer"
 
-#: pg_backup_archiver.c:206 pg_backup_archiver.c:1234
+#: pg_backup_archiver.c:207 pg_backup_archiver.c:1259
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "konnte Ausgabedatei nicht schließen: %s\n"
 
-#: pg_backup_archiver.c:231
+#: pg_backup_archiver.c:233
 msgid "-C and -c are incompatible options\n"
 msgstr "-C und -c sind inkompatible Optionen\n"
 
-#: pg_backup_archiver.c:238
+#: pg_backup_archiver.c:240
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C und -1 sind inkompatible Optionen\n"
 
 #: pg_backup_archiver.c:250
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr ""
+"parallele Wiederherstellung wird von diesem Archivdateiformat nicht "
+"unterstützt\n"
+
+#: pg_backup_archiver.c:254
+msgid ""
+"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr ""
+"parallele Wiederherstellung wird mit Archiven, die mit pg_dump vor 8.0 "
+"erstellt worden sind, nicht unterstützt\n"
+
+#: pg_backup_archiver.c:273
 msgid ""
 "cannot restore from compressed archive (compression not supported in this "
 "installation)\n"
@@ -956,71 +977,71 @@ msgstr ""
 "kann komprimiertes Archiv nicht wiederherstellen (Komprimierung in dieser "
 "Installation nicht unterstützt)\n"
 
-#: pg_backup_archiver.c:260
+#: pg_backup_archiver.c:283
 msgid "connecting to database for restore\n"
 msgstr "verbinde mit der Datenbank zur Wiederherstellung\n"
 
-#: pg_backup_archiver.c:262
+#: pg_backup_archiver.c:285
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr ""
 "direkte Datenbankverbindungen sind in Archiven vor Version 1.3 nicht "
 "unterstützt\n"
 
-#: pg_backup_archiver.c:304
+#: pg_backup_archiver.c:327
 msgid "implied data-only restore\n"
 msgstr "implizit werden nur Daten wiederhergestellt\n"
 
-#: pg_backup_archiver.c:356
+#: pg_backup_archiver.c:379
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "entferne %s %s\n"
 
-#: pg_backup_archiver.c:408
+#: pg_backup_archiver.c:431
 #, c-format
 msgid "setting owner and privileges for %s %s\n"
 msgstr "setze Eigentümer und Privilegien für %s %s\n"
 
-#: pg_backup_archiver.c:466 pg_backup_archiver.c:468
+#: pg_backup_archiver.c:489 pg_backup_archiver.c:491
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "Warnung aus der ursprünglichen Ausgabedatei: %s\n"
 
-#: pg_backup_archiver.c:475
+#: pg_backup_archiver.c:498
 #, c-format
 msgid "creating %s %s\n"
 msgstr "erstelle %s %s\n"
 
-#: pg_backup_archiver.c:519
+#: pg_backup_archiver.c:542
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "verbinde mit neuer Datenbank »%s«\n"
 
-#: pg_backup_archiver.c:547
+#: pg_backup_archiver.c:570
 #, c-format
 msgid "restoring %s\n"
 msgstr "Wiederherstellung von %s\n"
 
-#: pg_backup_archiver.c:561
+#: pg_backup_archiver.c:584
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "Wiederherstellung der Daten von Tabelle »%s«\n"
 
-#: pg_backup_archiver.c:621
+#: pg_backup_archiver.c:646
 #, c-format
 msgid "executing %s %s\n"
 msgstr "führe %s %s aus\n"
 
-#: pg_backup_archiver.c:654
+#: pg_backup_archiver.c:679
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "schalte Trigger für %s aus\n"
 
-#: pg_backup_archiver.c:680
+#: pg_backup_archiver.c:705
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "schalte Trigger für %s ein\n"
 
-#: pg_backup_archiver.c:710
+#: pg_backup_archiver.c:735
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine\n"
@@ -1028,122 +1049,122 @@ msgstr ""
 "interner Fehler -- WriteData kann nicht außerhalb des Kontexts einer "
 "DataDumper-Routine aufgerufen werden\n"
 
-#: pg_backup_archiver.c:867
+#: pg_backup_archiver.c:892
 msgid "large-object output not supported in chosen format\n"
 msgstr "Large-Object-Ausgabe im gewählten Format nicht unterstützt\n"
 
-#: pg_backup_archiver.c:921
+#: pg_backup_archiver.c:946
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "%d Large Object wiederhergestellt\n"
 msgstr[1] "%d Large Objects wiederhergestellt\n"
 
-#: pg_backup_archiver.c:942
+#: pg_backup_archiver.c:967
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "Wiederherstellung von Large Object mir OID %u\n"
 
-#: pg_backup_archiver.c:954
+#: pg_backup_archiver.c:979
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "konnte Large Object %u nicht erstellen: %s"
 
-#: pg_backup_archiver.c:1016
+#: pg_backup_archiver.c:1041
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei »%s« nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1057
+#: pg_backup_archiver.c:1082
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "WARNUNG: Zeile ignoriert: %s\n"
 
-#: pg_backup_archiver.c:1064
+#: pg_backup_archiver.c:1089
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "konnte Eintrag für ID %d nicht finden\n"
 
-#: pg_backup_archiver.c:1085 pg_backup_files.c:172 pg_backup_files.c:457
+#: pg_backup_archiver.c:1110 pg_backup_files.c:172 pg_backup_files.c:457
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht finden: %s\n"
 
-#: pg_backup_archiver.c:1204 pg_backup_custom.c:152 pg_backup_files.c:130
+#: pg_backup_archiver.c:1229 pg_backup_custom.c:152 pg_backup_files.c:130
 #: pg_backup_files.c:262
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "konnte Ausgabedatei »%s« nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1207 pg_backup_custom.c:159 pg_backup_files.c:137
+#: pg_backup_archiver.c:1232 pg_backup_custom.c:159 pg_backup_files.c:137
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "konnte Ausgabedatei nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1313
+#: pg_backup_archiver.c:1334
 #, c-format
 msgid "wrote %lu byte of large object data (result = %lu)\n"
 msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr[0] "%lu Byte Large-Object-Daten geschrieben (Ergebnis = %lu)\n"
 msgstr[1] "%lu Bytes Large-Object-Daten geschrieben (Ergebnis = %lu)\n"
 
-#: pg_backup_archiver.c:1319
+#: pg_backup_archiver.c:1340
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "konnte Large Object nicht schreiben (Ergebis: %lu, erwartet: %lu)\n"
 
-#: pg_backup_archiver.c:1377 pg_backup_archiver.c:1400 pg_backup_custom.c:652
+#: pg_backup_archiver.c:1398 pg_backup_archiver.c:1421 pg_backup_custom.c:652
 #: pg_backup_files.c:432 pg_backup_tar.c:590 pg_backup_tar.c:1093
 #: pg_backup_tar.c:1386
 #, c-format
 msgid "could not write to output file: %s\n"
 msgstr "konnte nicht in Ausgabedatei schreiben: %s\n"
 
-#: pg_backup_archiver.c:1385
+#: pg_backup_archiver.c:1406
 msgid "could not write to custom output routine\n"
 msgstr "konnte nicht zur Custom-Ausgaberoutine schreiben\n"
 
-#: pg_backup_archiver.c:1483
+#: pg_backup_archiver.c:1504
 msgid "Error while INITIALIZING:\n"
 msgstr "Fehler in Phase INITIALIZING:\n"
 
-#: pg_backup_archiver.c:1488
+#: pg_backup_archiver.c:1509
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Fehler in Phase PROCESSING TOC:\n"
 
-#: pg_backup_archiver.c:1493
+#: pg_backup_archiver.c:1514
 msgid "Error while FINALIZING:\n"
 msgstr "Fehler in Phase FINALIZING:\n"
 
-#: pg_backup_archiver.c:1498
+#: pg_backup_archiver.c:1519
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Fehler in Inhaltsverzeichniseintrag %d; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1633
+#: pg_backup_archiver.c:1654
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "unerwartete Datenoffsetmarkierung %d\n"
 
-#: pg_backup_archiver.c:1646
+#: pg_backup_archiver.c:1667
 msgid "file offset in dump file is too large\n"
 msgstr "Dateioffset in Dumpdatei ist zu groß\n"
 
-#: pg_backup_archiver.c:1743 pg_backup_archiver.c:3095 pg_backup_custom.c:630
+#: pg_backup_archiver.c:1764 pg_backup_archiver.c:3113 pg_backup_custom.c:630
 #: pg_backup_files.c:419 pg_backup_tar.c:789
 msgid "unexpected end of file\n"
 msgstr "unerwartetes Dateiende\n"
 
-#: pg_backup_archiver.c:1760
+#: pg_backup_archiver.c:1781
 msgid "attempting to ascertain archive format\n"
 msgstr "versuche Archivformat zu ermitteln\n"
 
-#: pg_backup_archiver.c:1786 pg_backup_archiver.c:1796
+#: pg_backup_archiver.c:1807 pg_backup_archiver.c:1817
 #, c-format
 msgid "directory name too long: \"%s\"\n"
 msgstr "Verzeichnisname zu lang: »%s«\n"
 
-#: pg_backup_archiver.c:1804
+#: pg_backup_archiver.c:1825
 #, c-format
 msgid ""
 "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
@@ -1152,88 +1173,88 @@ msgstr ""
 "Verzeichnis »%s« scheint kein gültiges Archiv zu sein (»toc.dat« existiert "
 "nicht)\n"
 
-#: pg_backup_archiver.c:1812 pg_backup_custom.c:171 pg_backup_custom.c:757
+#: pg_backup_archiver.c:1833 pg_backup_custom.c:171 pg_backup_custom.c:762
 #: pg_backup_files.c:155 pg_backup_files.c:307
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "konnte Eingabedatei »%s« nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1820 pg_backup_custom.c:178 pg_backup_files.c:162
+#: pg_backup_archiver.c:1841 pg_backup_custom.c:178 pg_backup_files.c:162
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "konnte Eingabedatei nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1829
+#: pg_backup_archiver.c:1850
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "konnte Eingabedatei nicht lesen: %s\n"
 
-#: pg_backup_archiver.c:1831
+#: pg_backup_archiver.c:1852
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "Eingabedatei ist zu kurz (gelesen: %lu, erwartet: 5)\n"
 
-#: pg_backup_archiver.c:1889
+#: pg_backup_archiver.c:1910
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "Eingabedatei scheint kein gültiges Archiv zu sein (zu kurz?)\n"
 
-#: pg_backup_archiver.c:1892
+#: pg_backup_archiver.c:1913
 msgid "input file does not appear to be a valid archive\n"
 msgstr "Eingabedatei scheint kein gültiges Archiv zu sein\n"
 
-#: pg_backup_archiver.c:1912
+#: pg_backup_archiver.c:1933
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "konnte Eingabedatei nicht schließen: %s\n"
 
-#: pg_backup_archiver.c:1929
+#: pg_backup_archiver.c:1950
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "erstelle AH für %s, Format %d\n"
 
-#: pg_backup_archiver.c:2041
+#: pg_backup_archiver.c:2059
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "nicht erkanntes Dateiformat »%d«\n"
 
-#: pg_backup_archiver.c:2163
+#: pg_backup_archiver.c:2181
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr ""
 "ID %d des Eintrags außerhalb des gültigen Bereichs -- vielleicht ein "
 "verfälschtes Inhaltsverzeichnis\n"
 
-#: pg_backup_archiver.c:2279
+#: pg_backup_archiver.c:2297
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "Inhaltsverzeichniseintrag %d (ID %d) von %s %s gelesen\n"
 
-#: pg_backup_archiver.c:2313
+#: pg_backup_archiver.c:2331
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "nicht erkannte Kodierung »%s«\n"
 
-#: pg_backup_archiver.c:2318
+#: pg_backup_archiver.c:2336
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "ungültiger ENCODING-Eintrag: %s\n"
 
-#: pg_backup_archiver.c:2336
+#: pg_backup_archiver.c:2354
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "ungültiger STDSTRINGS-Eintrag: %s\n"
 
-#: pg_backup_archiver.c:2534
+#: pg_backup_archiver.c:2552
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "konnte Sitzungsbenutzer nicht auf »%s« setzen: %s"
 
-#: pg_backup_archiver.c:2874 pg_backup_archiver.c:3026
+#: pg_backup_archiver.c:2892 pg_backup_archiver.c:3044
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr "WARNUNG: kann Eigentümer für Objekttyp %s nicht setzen\n"
 
-#: pg_backup_archiver.c:3058
+#: pg_backup_archiver.c:3076
 msgid ""
 "WARNING: requested compression not available in this installation -- archive "
 "will be uncompressed\n"
@@ -1241,21 +1262,21 @@ msgstr ""
 "WARNUNG: Komprimierung ist in dieser Installation nicht verfügbar -- Archiv "
 "wird nicht komprimiert\n"
 
-#: pg_backup_archiver.c:3098
+#: pg_backup_archiver.c:3116
 msgid "did not find magic string in file header\n"
 msgstr "magische Zeichenkette im Dateikopf nicht gefunden\n"
 
-#: pg_backup_archiver.c:3111
+#: pg_backup_archiver.c:3129
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "nicht unterstützte Version (%d.%d) im Dateikopf\n"
 
-#: pg_backup_archiver.c:3116
+#: pg_backup_archiver.c:3134
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "Prüfung der Integer-Größe (%lu) fehlgeschlagen\n"
 
-#: pg_backup_archiver.c:3120
+#: pg_backup_archiver.c:3138
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "might fail\n"
@@ -1263,14 +1284,14 @@ msgstr ""
 "WARNUNG: Archiv wurde auf einer Maschine mit größeren Integers erstellt; "
 "einige Operationen könnten fehlschlagen\n"
 
-#: pg_backup_archiver.c:3130
+#: pg_backup_archiver.c:3148
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr ""
 "erwartetes Format (%d) ist nicht das gleiche wie das in der Datei gefundene "
 "(%d)\n"
 
-#: pg_backup_archiver.c:3146
+#: pg_backup_archiver.c:3164
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression -- no data will be available\n"
@@ -1278,103 +1299,90 @@ msgstr ""
 "WARNUNG: Archiv ist komprimiert, aber diese Installation unterstützt keine "
 "Komprimierung -- keine Daten verfügbar\n"
 
-#: pg_backup_archiver.c:3164
+#: pg_backup_archiver.c:3182
 msgid "WARNING: invalid creation date in header\n"
 msgstr "WARNUNG: ungültiges Erstellungsdatum im Kopf\n"
 
-#: pg_backup_archiver.c:3262
+#: pg_backup_archiver.c:3280
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "Eintritt in restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3266
-msgid "parallel restore is not supported with this archive file format\n"
-msgstr ""
-"parallele Wiederherstellung wird von diesem Archivdateiformat nicht "
-"unterstützt\n"
-
-#: pg_backup_archiver.c:3270
-msgid ""
-"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
-msgstr ""
-"parallele Wiederherstellung wird mit Archiven, die mit pg_dump vor 8.0 "
-"erstellt worden sind, nicht unterstützt\n"
-
-#: pg_backup_archiver.c:3311
+#: pg_backup_archiver.c:3321
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "verarbeite Element %d %s %s\n"
 
-#: pg_backup_archiver.c:3387
+#: pg_backup_archiver.c:3397
 msgid "entering main parallel loop\n"
 msgstr "Eintritt in Hauptparallelschleife\n"
 
-#: pg_backup_archiver.c:3401
+#: pg_backup_archiver.c:3411
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "Element %d %s %s wird übersprungen\n"
 
-#: pg_backup_archiver.c:3417
+#: pg_backup_archiver.c:3427
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "starte Element %d %s %s\n"
 
-#: pg_backup_archiver.c:3454
+#: pg_backup_archiver.c:3464
 #, c-format
 msgid "worker process crashed: status %d\n"
 msgstr "Arbeitsprozess abgestürzt: Status %d\n"
 
-#: pg_backup_archiver.c:3459
+#: pg_backup_archiver.c:3469
 msgid "finished main parallel loop\n"
 msgstr "Hauptparallelschleife beendet\n"
 
-#: pg_backup_archiver.c:3477
+#: pg_backup_archiver.c:3487
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "verarbeite verpasstes Element %d %s %s\n"
 
-#: pg_backup_archiver.c:3503
+#: pg_backup_archiver.c:3513
 msgid "parallel_restore should not return\n"
 msgstr "parallel_restore sollte nicht zurückkehren\n"
 
-#: pg_backup_archiver.c:3509
+#: pg_backup_archiver.c:3519
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "konnte Arbeitsprozess nicht erzeugen: %s\n"
 
-#: pg_backup_archiver.c:3517
+#: pg_backup_archiver.c:3527
 #, c-format
 msgid "could not create worker thread: %s\n"
 msgstr "konnte Arbeitsthread nicht erzeugen: %s\n"
 
-#: pg_backup_archiver.c:3741
+#: pg_backup_archiver.c:3751
 msgid "no item ready\n"
 msgstr "kein Element bereit\n"
 
-#: pg_backup_archiver.c:3836
+#: pg_backup_archiver.c:3846
 msgid "could not find slot of finished worker\n"
 msgstr "konnte Slot des beendeten Arbeitsprozesses nicht finden\n"
 
-#: pg_backup_archiver.c:3838
+#: pg_backup_archiver.c:3848
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "Element %d %s %s abgeschlossen\n"
 
-#: pg_backup_archiver.c:3851
+#: pg_backup_archiver.c:3861
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "Arbeitsprozess fehlgeschlagen: Code %d\n"
 
-#: pg_backup_archiver.c:4047
+#: pg_backup_archiver.c:4057
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "übertrage Abhängigkeit %d -> %d an %d\n"
 
-#: pg_backup_archiver.c:4116
+#: pg_backup_archiver.c:4126
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "reduziere Abhängigkeiten für %d\n"
 
-#: pg_backup_archiver.c:4165
+#: pg_backup_archiver.c:4175
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr ""
@@ -1440,11 +1448,11 @@ msgid "unrecognized data block type %d while restoring archive\n"
 msgstr ""
 "unerkannter Datenblocktyp %d beim Wiederherstellen des Archivs gefunden\n"
 
-#: pg_backup_custom.c:578 pg_backup_custom.c:911
+#: pg_backup_custom.c:578 pg_backup_custom.c:916
 msgid "could not read from input file: end of file\n"
 msgstr "konnte nicht aus Eingabedatei lesen: Dateiende\n"
 
-#: pg_backup_custom.c:581 pg_backup_custom.c:914
+#: pg_backup_custom.c:581 pg_backup_custom.c:919
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "konnte nicht aus Eingabedatei lesen: %s\n"
@@ -1454,7 +1462,7 @@ msgstr "konnte nicht aus Eingabedatei lesen: %s\n"
 msgid "could not write byte: %s\n"
 msgstr "konnte Byte nicht schreiben: %s\n"
 
-#: pg_backup_custom.c:718 pg_backup_custom.c:751
+#: pg_backup_custom.c:718 pg_backup_custom.c:756
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "konnte Archivdatei nicht schließen: %s\n"
@@ -1463,29 +1471,32 @@ msgstr "konnte Archivdatei nicht schließen: %s\n"
 msgid "can only reopen input archives\n"
 msgstr "nur Eingabearchive können neu geöffnet werden\n"
 
-#: pg_backup_custom.c:739
-msgid "cannot reopen stdin\n"
-msgstr "kann stdin nicht neu öffnen\n"
-
-#: pg_backup_custom.c:741
-msgid "cannot reopen non-seekable file\n"
-msgstr "kann Datei nicht neu öffnen, weil sie nicht frei positionierbar ist\n"
+#: pg_backup_custom.c:744
+msgid "parallel restore from stdin is not supported\n"
+msgstr ""
+"parallele Wiederherstellung aus der Standardeingabe wird nicht unterstützt\n"
 
 #: pg_backup_custom.c:746
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr ""
+"parallele Wiederherstellung aus einer Datei, die kein Suchen ermöglicht, "
+"wird nicht unterstützt\n"
+
+#: pg_backup_custom.c:751
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr "konnte Positionszeiger in Archivdatei nicht ermitteln: %s\n"
 
-#: pg_backup_custom.c:761
+#: pg_backup_custom.c:766
 #, c-format
 msgid "could not set seek position in archive file: %s\n"
 msgstr "konnte Positionszeiger in Archivdatei nicht setzen: %s\n"
 
-#: pg_backup_custom.c:781
+#: pg_backup_custom.c:786
 msgid "compressor active\n"
 msgstr "Kompressor ist aktiv\n"
 
-#: pg_backup_custom.c:817
+#: pg_backup_custom.c:822
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr ""
 "WARNUNG: erwartete Dateiposition stimmt nicht mit ftell überein -- benutze "
@@ -1495,80 +1506,80 @@ msgstr ""
 msgid "archiver (db)"
 msgstr "Archivierer (DB)"
 
-#: pg_backup_db.c:61
+#: pg_backup_db.c:54
 msgid "could not get server_version from libpq\n"
 msgstr "konnte server_version nicht von libpq ermitteln\n"
 
-#: pg_backup_db.c:74 pg_dumpall.c:1741
+#: pg_backup_db.c:67 pg_dumpall.c:1741
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "Version des Servers: %s; Version von %s: %s\n"
 
-#: pg_backup_db.c:76 pg_dumpall.c:1743
+#: pg_backup_db.c:69 pg_dumpall.c:1743
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "Abbruch wegen unpassender Serverversion\n"
 
-#: pg_backup_db.c:147
+#: pg_backup_db.c:140
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "verbinde mit Datenbank »%s« als Benutzer »%s«\n"
 
-#: pg_backup_db.c:152 pg_backup_db.c:207 pg_backup_db.c:254 pg_backup_db.c:303
+#: pg_backup_db.c:145 pg_backup_db.c:200 pg_backup_db.c:247 pg_backup_db.c:296
 #: pg_dumpall.c:1637 pg_dumpall.c:1689
 msgid "Password: "
 msgstr "Passwort: "
 
-#: pg_backup_db.c:188
+#: pg_backup_db.c:181
 msgid "failed to reconnect to database\n"
 msgstr "konnte nicht wieder zur Datenbank verbinden\n"
 
-#: pg_backup_db.c:193
+#: pg_backup_db.c:186
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "konnte nicht wieder zur Datenbank verbinden: %s"
 
-#: pg_backup_db.c:209
+#: pg_backup_db.c:202
 msgid "connection needs password\n"
 msgstr "Verbindung benötigt Passwort\n"
 
-#: pg_backup_db.c:250
+#: pg_backup_db.c:243
 msgid "already connected to a database\n"
 msgstr "bereits mit einer Datenbank verbunden\n"
 
-#: pg_backup_db.c:295
+#: pg_backup_db.c:288
 msgid "failed to connect to database\n"
 msgstr "Verbinden zur Datenbank schlug fehl\n"
 
-#: pg_backup_db.c:314
+#: pg_backup_db.c:307
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "Verbindung zur Datenbank »%s« fehlgeschlagen: %s"
 
-#: pg_backup_db.c:329
+#: pg_backup_db.c:322
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:441
+#: pg_backup_db.c:387
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "Fehler in PQputCopyData: %s"
 
-#: pg_backup_db.c:451
+#: pg_backup_db.c:397 pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "konnte Anfrage nicht ausführen"
+
+#: pg_backup_db.c:425
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "Fehler in PQputCopyEnd: %s"
 
-#: pg_backup_db.c:498
-msgid "could not execute query"
-msgstr "konnte Anfrage nicht ausführen"
-
-#: pg_backup_db.c:696
+#: pg_backup_db.c:442
 msgid "could not start database transaction"
 msgstr "konnte Datenbanktransaktion nicht starten"
 
-#: pg_backup_db.c:702
+#: pg_backup_db.c:448
 msgid "could not commit database transaction"
 msgstr "konnte Datenbanktransaktion nicht beenden"
 
diff --git a/src/bin/pg_dump/po/es.po b/src/bin/pg_dump/po/es.po
index 7fb93d267db76..72c3cdd8af411 100644
--- a/src/bin/pg_dump/po/es.po
+++ b/src/bin/pg_dump/po/es.po
@@ -1,97 +1,88 @@
 # Spanish message translation file for pg_dump
 #
-# Copyright (C) 2003-2010 PostgreSQL Global Development Group
+# Copyright (C) 2003-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Manuel Sugawara <masm@fciencias.unam.mx>, 2003.
-# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2007, 2009-2010
+# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2007, 2009-2011
 #
-# pgtranslation Id: pg_dump.po,v 1.10 2010/08/31 17:33:46 alvherre Exp $
+# pgtranslation Id: pg_dump.po,v 1.11 2011/09/04 01:13:18 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_dump (PostgreSQL 9.0)\n"
+"Project-Id-Version: pg_dump (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 07:20+0000\n"
-"PO-Revision-Date: 2010-08-31 13:32-0400\n"
+"POT-Creation-Date: 2011-09-03 20:53+0000\n"
+"PO-Revision-Date: 2011-09-03 22:12-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pg_dump.c:454 pg_restore.c:268 pg_dumpall.c:292
-#, c-format
-msgid "%s: invalid -X option -- %s\n"
-msgstr "%s: opción -X no válida -- %s\n"
-
-#: pg_dump.c:456 pg_dump.c:478 pg_dump.c:492 pg_restore.c:270 pg_restore.c:293
-#: pg_restore.c:309 pg_restore.c:321 pg_dumpall.c:294 pg_dumpall.c:314
-#: pg_dumpall.c:324 pg_dumpall.c:334 pg_dumpall.c:343 pg_dumpall.c:352
-#: pg_dumpall.c:406
+#: pg_dump.c:489 pg_dump.c:503 pg_restore.c:274 pg_restore.c:290
+#: pg_restore.c:302 pg_dumpall.c:296 pg_dumpall.c:306 pg_dumpall.c:316
+#: pg_dumpall.c:325 pg_dumpall.c:334 pg_dumpall.c:392
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prueba «%s --help» para más información.\n"
 
-#: pg_dump.c:490 pg_restore.c:307 pg_dumpall.c:322
+#: pg_dump.c:501 pg_restore.c:288 pg_dumpall.c:304
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
+msgstr ""
+"%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
 
-#: pg_dump.c:503
+#: pg_dump.c:514
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr ""
 "las opciones -s/--schema-only y -a/--data-only no pueden usarse juntas\n"
 
-#: pg_dump.c:509
+#: pg_dump.c:520
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "las opciones -c/--clean y -a/--data-only no pueden usarse juntas\n"
 
-#: pg_dump.c:515
+#: pg_dump.c:526
 msgid ""
 "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr ""
 "las opciones --inserts/--column-inserts y -o/--oids no pueden usarse juntas\n"
 
-#: pg_dump.c:516
+#: pg_dump.c:527
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(La orden INSERT no puede establecer los OIDs).\n"
 
-#: pg_dump.c:546
-#, c-format
-msgid "invalid output format \"%s\" specified\n"
-msgstr "el formato de salida especificado «%s» no es válido\n"
-
-#: pg_dump.c:552
+#: pg_dump.c:558
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "no se pudo abrir el archivo de salida «%s» para escritura\n"
 
-#: pg_dump.c:562 pg_backup_db.c:45
+#: pg_dump.c:568 pg_backup_db.c:38
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "no se pudo interpretar la cadena de versión «%s»\n"
 
-#: pg_dump.c:585
+#: pg_dump.c:591
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "la codificación de cliente especificada «%s» no es válida\n"
 
-#: pg_dump.c:668
+#: pg_dump.c:690
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "el último OID interno es %u\n"
 
-#: pg_dump.c:678
+#: pg_dump.c:700
 msgid "No matching schemas were found\n"
 msgstr "No se encontraron esquemas coincidentes\n"
 
-#: pg_dump.c:693
+#: pg_dump.c:715
 msgid "No matching tables were found\n"
 msgstr "No se encontraron tablas coincidentes\n"
 
-#: pg_dump.c:805
+#: pg_dump.c:827
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -100,17 +91,17 @@ msgstr ""
 "%s extrae una base de datos en formato de texto o en otros formatos.\n"
 "\n"
 
-#: pg_dump.c:806 pg_restore.c:410 pg_dumpall.c:543
+#: pg_dump.c:828 pg_restore.c:397 pg_dumpall.c:529
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: pg_dump.c:807
+#: pg_dump.c:829
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPCIÓN]... [NOMBREDB]\n"
 
-#: pg_dump.c:809 pg_restore.c:413 pg_dumpall.c:546
+#: pg_dump.c:831 pg_restore.c:400 pg_dumpall.c:532
 #, c-format
 msgid ""
 "\n"
@@ -119,49 +110,50 @@ msgstr ""
 "\n"
 "Opciones generales:\n"
 
-#: pg_dump.c:810 pg_dumpall.c:547
+#: pg_dump.c:832
 #, c-format
-msgid "  -f, --file=FILENAME         output file name\n"
-msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida\n"
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=ARCHIVO       nombre del archivo o directorio de salida\n"
 
-#: pg_dump.c:811
+#: pg_dump.c:833
 #, c-format
 msgid ""
-"  -F, --format=c|t|p          output file format (custom, tar, plain text)\n"
+"  -F, --format=c|d|t|p        output file format (custom, directory, tar, "
+"plain text)\n"
 msgstr ""
-"  -F, --format=c|t|p       Formato del archivo de salida\n"
-"                           (c=personalizado, t=tar, p=texto)\n"
+"  -F, --format=c|d|t|p     Formato del archivo de salida\n"
+"                           (c=personalizado, d=directorio, t=tar, p=texto)\n"
 
-#: pg_dump.c:812
+#: pg_dump.c:834
 #, c-format
 msgid "  -v, --verbose               verbose mode\n"
 msgstr "  -v, --verbose            modo verboso\n"
 
-#: pg_dump.c:813
+#: pg_dump.c:835
 #, c-format
 msgid ""
 "  -Z, --compress=0-9          compression level for compressed formats\n"
 msgstr ""
 "  -Z, --compress=0-9       nivel de compresión para formatos comprimidos\n"
 
-#: pg_dump.c:814 pg_dumpall.c:548
+#: pg_dump.c:836 pg_dumpall.c:534
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=SEGS espera a lo más SEGS segundos obtener un lock\n"
 
-#: pg_dump.c:815 pg_dumpall.c:549
+#: pg_dump.c:837 pg_dumpall.c:535
 #, c-format
 msgid "  --help                      show this help, then exit\n"
 msgstr "  --help                   muestra esta ayuda y termina\n"
 
-#: pg_dump.c:816 pg_dumpall.c:550
+#: pg_dump.c:838 pg_dumpall.c:536
 #, c-format
 msgid "  --version                   output version information, then exit\n"
 msgstr "  --version                muestra el número de versión y termina\n"
 
-#: pg_dump.c:818 pg_dumpall.c:551
+#: pg_dump.c:840 pg_dumpall.c:537
 #, c-format
 msgid ""
 "\n"
@@ -170,17 +162,17 @@ msgstr ""
 "\n"
 "Opciones que controlan el contenido de la salida:\n"
 
-#: pg_dump.c:819 pg_dumpall.c:552
+#: pg_dump.c:841 pg_dumpall.c:538
 #, c-format
 msgid "  -a, --data-only             dump only the data, not the schema\n"
 msgstr "  -a, --data-only          extrae sólo los datos, no el esquema\n"
 
-#: pg_dump.c:820
+#: pg_dump.c:842
 #, c-format
 msgid "  -b, --blobs                 include large objects in dump\n"
 msgstr "  -b, --blobs              incluye objetos grandes en la extracción\n"
 
-#: pg_dump.c:821
+#: pg_dump.c:843
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) database objects before "
@@ -188,7 +180,7 @@ msgid ""
 msgstr ""
 "  -c, --clean              tira (drop) la base de datos antes de crearla\n"
 
-#: pg_dump.c:822
+#: pg_dump.c:844
 #, c-format
 msgid ""
 "  -C, --create                include commands to create database in dump\n"
@@ -196,30 +188,30 @@ msgstr ""
 "  -C, --create             incluye órdenes para crear la base de datos\n"
 "                           en la extracción\n"
 
-#: pg_dump.c:823
+#: pg_dump.c:845
 #, c-format
 msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
 msgstr ""
 "  -E, --encoding=CODIF     extrae los datos con la codificación CODIF\n"
 
-#: pg_dump.c:824
+#: pg_dump.c:846
 #, c-format
 msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
 msgstr "  -n, --schema=ESQUEMA     extrae sólo el esquema nombrado\n"
 
-#: pg_dump.c:825
+#: pg_dump.c:847
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
 msgstr ""
 "  -N, --exclude-schema=ESQUEMA\n"
 "                           NO extrae el o los esquemas listados\n"
 
-#: pg_dump.c:826 pg_dumpall.c:555
+#: pg_dump.c:848 pg_dumpall.c:541
 #, c-format
 msgid "  -o, --oids                  include OIDs in dump\n"
 msgstr "  -o, --oids               incluye OIDs en la extracción\n"
 
-#: pg_dump.c:827
+#: pg_dump.c:849
 #, c-format
 msgid ""
 "  -O, --no-owner              skip restoration of object ownership in\n"
@@ -228,12 +220,12 @@ msgstr ""
 "  -O, --no-owner           en formato de sólo texto, no reestablece\n"
 "                           los dueños de los objetos\n"
 
-#: pg_dump.c:829 pg_dumpall.c:558
+#: pg_dump.c:851 pg_dumpall.c:544
 #, c-format
 msgid "  -s, --schema-only           dump only the schema, no data\n"
 msgstr "  -s, --schema-only        extrae sólo el esquema, no los datos\n"
 
-#: pg_dump.c:830
+#: pg_dump.c:852
 #, c-format
 msgid ""
 "  -S, --superuser=NAME        superuser user name to use in plain-text "
@@ -241,37 +233,29 @@ msgid ""
 msgstr ""
 "  -S, --superuser=NAME     superusuario a utilizar en el volcado de texto\n"
 
-#: pg_dump.c:831
+#: pg_dump.c:853
 #, c-format
 msgid "  -t, --table=TABLE           dump the named table(s) only\n"
 msgstr "  -t, --table=TABLE        extrae sólo la tabla nombrada\n"
 
-#: pg_dump.c:832
+#: pg_dump.c:854
 #, c-format
 msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
 msgstr ""
 "  -T, --exclude-table=TABLA\n"
 "                           NO extrae la o las tablas nombradas\n"
 
-#: pg_dump.c:833 pg_dumpall.c:561
+#: pg_dump.c:855 pg_dumpall.c:547
 #, c-format
 msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      no extrae los privilegios (grant/revoke)\n"
 
-#: pg_dump.c:834 pg_dumpall.c:562
+#: pg_dump.c:856 pg_dumpall.c:548
 #, c-format
 msgid "  --binary-upgrade            for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade         sólo para uso de utilidades de upgrade\n"
 
-#: pg_dump.c:835 pg_dumpall.c:563
-#, c-format
-msgid ""
-"  --inserts                   dump data as INSERT commands, rather than "
-"COPY\n"
-msgstr ""
-"  --inserts                extrae los datos usando INSERT, en vez de COPY\n"
-
-#: pg_dump.c:836 pg_dumpall.c:564
+#: pg_dump.c:857 pg_dumpall.c:549
 #, c-format
 msgid ""
 "  --column-inserts            dump data as INSERT commands with column "
@@ -280,7 +264,7 @@ msgstr ""
 "  --column-inserts         extrae los datos usando INSERT con nombres\n"
 "                           de columnas\n"
 
-#: pg_dump.c:837 pg_dumpall.c:565
+#: pg_dump.c:858 pg_dumpall.c:550
 #, c-format
 msgid ""
 "  --disable-dollar-quoting    disable dollar quoting, use SQL standard "
@@ -289,7 +273,7 @@ msgstr ""
 "  --disable-dollar-quoting deshabilita el uso de «delimitadores de dólar»,\n"
 "                           usa delimitadores de cadena estándares\n"
 
-#: pg_dump.c:838 pg_dumpall.c:566
+#: pg_dump.c:859 pg_dumpall.c:551
 #, c-format
 msgid ""
 "  --disable-triggers          disable triggers during data-only restore\n"
@@ -298,26 +282,47 @@ msgstr ""
 "el\n"
 "                           restablecimiento de la extracción de sólo-datos\n"
 
-#: pg_dump.c:839 pg_dumpall.c:567
+#: pg_dump.c:860 pg_dumpall.c:552
 #, c-format
-msgid "  --no-tablespaces            do not dump tablespace assignments\n"
+msgid ""
+"  --inserts                   dump data as INSERT commands, rather than "
+"COPY\n"
+msgstr ""
+"  --inserts                extrae los datos usando INSERT, en vez de COPY\n"
+
+#: pg_dump.c:861 pg_dumpall.c:553
+#, c-format
+msgid "  --no-security-labels        do not dump security label assignments\n"
 msgstr ""
-"  -no-tablespaces          no volcar asignaciones de tablespace\n"
+"  -no-security-labels      no volcar asignaciones de etiquetas de seguridad\n"
+
+#: pg_dump.c:862 pg_dumpall.c:554
+#, c-format
+msgid "  --no-tablespaces            do not dump tablespace assignments\n"
+msgstr "  -no-tablespaces          no volcar asignaciones de tablespace\n"
+
+#: pg_dump.c:863 pg_dumpall.c:555
+#, c-format
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr "  --no-unlogged-table-data no volcar datos de tablas unlogged\n"
 
-#: pg_dump.c:840 pg_dumpall.c:568
+#: pg_dump.c:864 pg_dumpall.c:556
 #, c-format
 msgid ""
-"  --quote-all-identifiers     quote all identifiers, even if not keywords\n"
+"  --quote-all-identifiers     quote all identifiers, even if not key words\n"
 msgstr ""
 "  --quote-all-identifiers  entrecomilla todos los identificadores, incluso\n"
 "                           si no son palabras clave\n"
 
-#: pg_dump.c:841 pg_dumpall.c:569
+#: pg_dump.c:865
 #, c-format
-msgid "  --role=ROLENAME             do SET ROLE before dump\n"
-msgstr "  --role=ROL               ejecuta SET ROLE antes del volcado\n"
+msgid ""
+"  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr ""
+"  --serializable-deferrable espera hasta que el respaldo pueda completarse\n"
+"                           sin anomalías\n"
 
-#: pg_dump.c:842 pg_dumpall.c:570
+#: pg_dump.c:866 pg_dumpall.c:557
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -330,7 +335,7 @@ msgstr ""
 "                           ALTER OWNER para cambiar los dueño de los "
 "objetos\n"
 
-#: pg_dump.c:846 pg_restore.c:452 pg_dumpall.c:574
+#: pg_dump.c:870 pg_restore.c:439 pg_dumpall.c:561
 #, c-format
 msgid ""
 "\n"
@@ -339,29 +344,29 @@ msgstr ""
 "\n"
 "Opciones de la conexión:\n"
 
-#: pg_dump.c:847 pg_restore.c:453 pg_dumpall.c:575
+#: pg_dump.c:871 pg_restore.c:440 pg_dumpall.c:562
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=ANFITRIÓN     anfitrión de la base de datos o\n"
 "                           directorio del enchufe (socket)\n"
 
-#: pg_dump.c:848 pg_restore.c:454 pg_dumpall.c:577
+#: pg_dump.c:872 pg_restore.c:441 pg_dumpall.c:564
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PUERTO        número del puerto de la base de datos\n"
 
-#: pg_dump.c:849 pg_restore.c:455 pg_dumpall.c:578
+#: pg_dump.c:873 pg_restore.c:442 pg_dumpall.c:565
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=USUARIO   nombre de usuario con el cual conectarse\n"
 
-#: pg_dump.c:850 pg_restore.c:456 pg_dumpall.c:579
+#: pg_dump.c:874 pg_restore.c:443 pg_dumpall.c:566
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        nunca pedir una contraseña\n"
 
-#: pg_dump.c:851 pg_restore.c:457 pg_dumpall.c:580
+#: pg_dump.c:875 pg_restore.c:444 pg_dumpall.c:567
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -370,7 +375,12 @@ msgstr ""
 "  -W, --password           fuerza un prompt para la contraseña\n"
 "                           (debería ser automático)\n"
 
-#: pg_dump.c:853
+#: pg_dump.c:876 pg_dumpall.c:568
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr "  --role=ROL               ejecuta SET ROLE antes del volcado\n"
+
+#: pg_dump.c:878
 #, c-format
 msgid ""
 "\n"
@@ -383,52 +393,57 @@ msgstr ""
 "de la variable de ambiente PGDATABASE.\n"
 "\n"
 
-#: pg_dump.c:855 pg_restore.c:460 pg_dumpall.c:584
+#: pg_dump.c:880 pg_restore.c:448 pg_dumpall.c:572
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Reporta errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:863 pg_backup_archiver.c:1401
+#: pg_dump.c:888 pg_backup_archiver.c:1458
 msgid "*** aborted because of error\n"
 msgstr "*** se abortó a causa de un error\n"
 
-#: pg_dump.c:884
+#: pg_dump.c:930
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "el formato de salida especificado «%s» no es válido\n"
+
+#: pg_dump.c:953
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr ""
 "la versión del servidor debe ser al menos 7.3 para usar los parámetros de\n"
 "selección de esquema\n"
 
-#: pg_dump.c:1122
+#: pg_dump.c:1211
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "extrayendo el contenido de la tabla %s\n"
 
-#: pg_dump.c:1225
+#: pg_dump.c:1331
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr ""
 "Falló la extracción del contenido de la tabla «%s»: PQgetCopyData() falló.\n"
 
-#: pg_dump.c:1226 pg_dump.c:12421
+#: pg_dump.c:1332 pg_dump.c:14139
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Mensaje de error del servidor: %s"
 
-#: pg_dump.c:1227 pg_dump.c:12422
+#: pg_dump.c:1333 pg_dump.c:14140
 #, c-format
 msgid "The command was: %s\n"
 msgstr "La orden era: %s\n"
 
-#: pg_dump.c:1633
+#: pg_dump.c:1756
 msgid "saving database definition\n"
 msgstr "salvando las definiciones de la base de datos\n"
 
-#: pg_dump.c:1715
+#: pg_dump.c:1838
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "falta la entrada para la base de datos «%s» en pg_database\n"
 
-#: pg_dump.c:1722
+#: pg_dump.c:1845
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
@@ -436,107 +451,116 @@ msgstr ""
 "la consulta regresó más de un (%d) registro en pg_database\n"
 "para la base de datos «%s»\n"
 
-#: pg_dump.c:1823
+#: pg_dump.c:1949
 msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
 msgstr "dumpDatabase(): no se pudo encontrar pg_largeobject.relfrozenxid\n"
 
-#: pg_dump.c:1900
+#: pg_dump.c:1988
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr "dumpDatabase(): no se pudo encontrar pg_largeobject_metadata.relfrozenxid\n"
+
+#: pg_dump.c:2067
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "salvando codificaciones = %s\n"
 
-#: pg_dump.c:1927
+#: pg_dump.c:2094
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "salvando standard_conforming_strings = %s\n"
 
-#: pg_dump.c:1960
+#: pg_dump.c:2127
 msgid "reading large objects\n"
 msgstr "leyendo objetos grandes\n"
 
-#: pg_dump.c:2087
+#: pg_dump.c:2259
 msgid "saving large objects\n"
 msgstr "salvando objetos grandes\n"
 
-#: pg_dump.c:2129 pg_backup_archiver.c:946
+#: pg_dump.c:2301 pg_backup_archiver.c:984
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "no se pudo abrir el objeto grande %u: %s"
 
-#: pg_dump.c:2142
+#: pg_dump.c:2314
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "error al leer el objeto grande %u: %s"
 
-#: pg_dump.c:2189 pg_dump.c:2237 pg_dump.c:2299 pg_dump.c:6920 pg_dump.c:7123
-#: pg_dump.c:7939 pg_dump.c:8477 pg_dump.c:8727 pg_dump.c:8833 pg_dump.c:9218
-#: pg_dump.c:9394 pg_dump.c:9591 pg_dump.c:9818 pg_dump.c:9973 pg_dump.c:10160
-#: pg_dump.c:12227
+#: pg_dump.c:2361 pg_dump.c:2409 pg_dump.c:2464 pg_dump.c:7595 pg_dump.c:7826
+#: pg_dump.c:8792 pg_dump.c:9344 pg_dump.c:9598 pg_dump.c:9712 pg_dump.c:10168
+#: pg_dump.c:10354 pg_dump.c:10460 pg_dump.c:10660 pg_dump.c:10902
+#: pg_dump.c:11069 pg_dump.c:11290 pg_dump.c:13945
 #, c-format
 msgid "query returned %d row instead of one: %s\n"
 msgid_plural "query returned %d rows instead of one: %s\n"
 msgstr[0] "la consulta regresó %d fila en lugar de una: %s\n"
 msgstr[1] "la consulta regresó %d filas en lugar de una: %s\n"
 
-#: pg_dump.c:2444
+#: pg_dump.c:2545
+#, c-format
+msgid "could not find parent extension for %s"
+msgstr "no se pudo encontrar la extensión padre para %s"
+
+#: pg_dump.c:2652
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "PRECAUCIÓN: el dueño del esquema «%s» parece no ser válido\n"
 
-#: pg_dump.c:2479
+#: pg_dump.c:2687
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "el esquema con OID %u no existe\n"
 
-#: pg_dump.c:2736
+#: pg_dump.c:3028
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "PRECAUCIÓN: el dueño del tipo «%s» parece no ser válido\n"
 
-#: pg_dump.c:2840
+#: pg_dump.c:3132
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "PRECAUCIÓN: el dueño del operador «%s» parece no ser válido\n"
 
-#: pg_dump.c:3014
+#: pg_dump.c:3384
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr ""
 "PRECAUCIÓN: el dueño de la clase de operadores «%s» parece no ser válido\n"
 
-#: pg_dump.c:3101
+#: pg_dump.c:3471
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr ""
 "PRECAUCIÓN: el dueño de la familia de operadores «%s» parece no ser válido\n"
 
-#: pg_dump.c:3226
+#: pg_dump.c:3608
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr ""
 "PRECAUCIÓN: el dueño de la función de agregación «%s» parece no ser válido\n"
 
-#: pg_dump.c:3381
+#: pg_dump.c:3778
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "PRECAUCIÓN: el dueño de la función «%s» parece no ser válido\n"
 
-#: pg_dump.c:3814
+#: pg_dump.c:4278
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "PRECAUCIÓN: el dueño de la tabla «%s» parece no ser válido\n"
 
-#: pg_dump.c:3957
+#: pg_dump.c:4421
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "extrayendo los índices para la tabla «%s»\n"
 
-#: pg_dump.c:4277
+#: pg_dump.c:4741
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "extrayendo restricciones de llave foránea para la tabla «%s»\n"
 
-#: pg_dump.c:4509
+#: pg_dump.c:4973
 #, c-format
 msgid ""
 "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
@@ -545,12 +569,12 @@ msgstr ""
 "falló la revisión de integridad: no se encontró la tabla padre OID %u del "
 "elemento con OID %u de pg_rewrite\n"
 
-#: pg_dump.c:4593
+#: pg_dump.c:5057
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "extrayendo los disparadores (triggers) para la tabla «%s»\n"
 
-#: pg_dump.c:4756
+#: pg_dump.c:5220
 #, c-format
 msgid ""
 "query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -559,32 +583,32 @@ msgstr ""
 "la consulta produjo un nombre de tabla nulo para la llave foránea del \n"
 "disparador \"%s\" en la tabla «%s» (OID de la tabla: %u)\n"
 
-#: pg_dump.c:5126
+#: pg_dump.c:5591
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "buscando las columnas y tipos de la tabla «%s»\n"
 
-#: pg_dump.c:5245
+#: pg_dump.c:5736
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "numeración de columnas no válida en la tabla «%s»\n"
 
-#: pg_dump.c:5281
+#: pg_dump.c:5773
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "buscando expresiones por omisión de la tabla «%s»\n"
 
-#: pg_dump.c:5366
+#: pg_dump.c:5858
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "el valor de adnum %d para la tabla «%s» no es válido\n"
 
-#: pg_dump.c:5384
+#: pg_dump.c:5876
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "buscando restricciones de revisión (check) para la tabla «%s»\n"
 
-#: pg_dump.c:5464
+#: pg_dump.c:5956
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d\n"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
@@ -593,51 +617,46 @@ msgstr[0] ""
 msgstr[1] ""
 "se esperaban %d restricciones CHECK en la tabla «%s» pero se encontraron %d\n"
 
-#: pg_dump.c:5468
+#: pg_dump.c:5960
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Los catálogos del sistema podrían estar corruptos)\n"
 
-#: pg_dump.c:7250 pg_dump.c:7357
-#, c-format
-msgid "query returned no rows: %s\n"
-msgstr "la consulta no regresó renglones: %s\n"
-
-#: pg_dump.c:7707
+#: pg_dump.c:8558
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "PRECAUCIÓN: valor no válido en el arreglo proargmodes\n"
 
-#: pg_dump.c:8019
+#: pg_dump.c:8872
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proallargtypes\n"
 
-#: pg_dump.c:8035
+#: pg_dump.c:8888
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proargmodes\n"
 
-#: pg_dump.c:8049
+#: pg_dump.c:8902
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proargnames\n"
 
-#: pg_dump.c:8060
+#: pg_dump.c:8913
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "PRECAUCIÓN: no se pudo interpretar el arreglo proconfig\n"
 
-#: pg_dump.c:8116
+#: pg_dump.c:8969
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr ""
 "el valor del atributo «provolatile» para la función «%s» es desconocido\n"
 
-#: pg_dump.c:8319
+#: pg_dump.c:9185
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "PRECAUCIÓN: valor no válido en el campo pg_cast.castmethod\n"
 
-#: pg_dump.c:8696
+#: pg_dump.c:9567
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "PRECAUCIÓN: no se pudo encontrar el operador con OID %s\n"
 
-#: pg_dump.c:9617
+#: pg_dump.c:10686
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
@@ -646,28 +665,28 @@ msgstr ""
 "PRECAUCIÓN: la función de agregación «%s» no se pudo extraer correctamente\n"
 "para esta versión de la base de datos; ignorada\n"
 
-#: pg_dump.c:10345
+#: pg_dump.c:11486
 #, c-format
 msgid "unknown object type (%d) in default privileges\n"
 msgstr "tipo de objeto desconocido (%d) en privilegios por omisión\n"
 
-#: pg_dump.c:10362
+#: pg_dump.c:11503
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "no se pudo interpretar la lista de ACL (%s)\n"
 
-#: pg_dump.c:10419
+#: pg_dump.c:11560
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "no se pudo interpretar la lista de ACL (%s) para el objeto «%s» (%s)\n"
 
-#: pg_dump.c:10562
+#: pg_dump.c:12000
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr ""
 "la consulta para obtener la definición de la vista «%s» no regresó datos\n"
 
-#: pg_dump.c:10565
+#: pg_dump.c:12003
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
@@ -675,44 +694,44 @@ msgstr ""
 "la consulta para obtener la definición de la vista «%s» regresó más de una "
 "definición\n"
 
-#: pg_dump.c:10574
+#: pg_dump.c:12012
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "la definición de la vista «%s» parece estar vacía (tamaño cero)\n"
 
-#: pg_dump.c:11050
+#: pg_dump.c:12580
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "el número de columna %d no es válido para la tabla «%s»\n"
 
-#: pg_dump.c:11158
+#: pg_dump.c:12691
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "falta un índice para restricción «%s»\n"
 
-#: pg_dump.c:11346
+#: pg_dump.c:12879
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "tipo de restricción inesperado: %c\n"
 
-#: pg_dump.c:11409
+#: pg_dump.c:12942
 msgid "missing pg_database entry for this database\n"
 msgstr "falta la entrada en pg_database para esta base de datos\n"
 
-#: pg_dump.c:11414
+#: pg_dump.c:12947
 msgid "found more than one pg_database entry for this database\n"
 msgstr ""
 "se encontró más de una entrada en pg_database para esta base de datos\n"
 
-#: pg_dump.c:11446
+#: pg_dump.c:12979
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "no se pudo encontrar una entrada para pg_indexes en pg_class\n"
 
-#: pg_dump.c:11451
+#: pg_dump.c:12984
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "se encontro más de una entrada para pg_indexes en la tabla pg_class\n"
 
-#: pg_dump.c:11522
+#: pg_dump.c:13056
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural ""
@@ -724,21 +743,26 @@ msgstr[1] ""
 "la consulta para obtener los datos de la secuencia «%s» regresó %d entradas, "
 "pero se esperaba 1\n"
 
-#: pg_dump.c:11533
+#: pg_dump.c:13067
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr ""
-"la consulta para obtener los datos de la secuencia «%s» regresó el nombre «%"
-"s»\n"
+"la consulta para obtener los datos de la secuencia «%s» regresó el nombre "
+"«%s»\n"
 
-#: pg_dump.c:11827
+#: pg_dump.c:13295
+#, c-format
+msgid "unexpected tgtype value: %d\n"
+msgstr "tgtype no esperado: %d\n"
+
+#: pg_dump.c:13377
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr ""
 "argumento de cadena (%s) no válido para el disparador (trigger) «%s» en la "
 "tabla «%s»\n"
 
-#: pg_dump.c:11943
+#: pg_dump.c:13495
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -747,176 +771,199 @@ msgstr ""
 "la consulta para obtener la regla «%s» asociada con la tabla «%s» falló: "
 "retornó un número incorrecto de renglones\n"
 
-#: pg_dump.c:12038
+#: pg_dump.c:13752
 msgid "reading dependency data\n"
 msgstr "obteniendo datos de dependencias\n"
 
-#: pg_dump.c:12416
+#: pg_dump.c:14134
 msgid "SQL command failed\n"
 msgstr "la orden SQL falló\n"
 
-#: common.c:115
+#: common.c:105
 msgid "reading schemas\n"
 msgstr "leyendo esquemas\n"
 
-#: common.c:119
+#: common.c:115
+msgid "reading user-defined tables\n"
+msgstr "leyendo las tablas definidas por el usuario\n"
+
+#: common.c:120
+msgid "reading extensions\n"
+msgstr "leyendo las extensiones\n"
+
+#: common.c:124
 msgid "reading user-defined functions\n"
 msgstr "leyendo las funciones definidas por el usuario\n"
 
-#: common.c:125
+#: common.c:130
 msgid "reading user-defined types\n"
 msgstr "leyendo los tipos definidos por el usuario\n"
 
-#: common.c:131
+#: common.c:136
 msgid "reading procedural languages\n"
 msgstr "leyendo los lenguajes procedurales\n"
 
-#: common.c:135
+#: common.c:140
 msgid "reading user-defined aggregate functions\n"
 msgstr "leyendo las funciones de agregación definidas por el usuario\n"
 
-#: common.c:139
+#: common.c:144
 msgid "reading user-defined operators\n"
 msgstr "leyendo los operadores definidos por el usuario\n"
 
-#: common.c:144
+#: common.c:149
 msgid "reading user-defined operator classes\n"
 msgstr "leyendo las clases de operadores definidos por el usuario\n"
 
-#: common.c:148
+#: common.c:153
+msgid "reading user-defined operator families\n"
+msgstr "leyendo las familias de operadores definidas por el usuario\n"
+
+#: common.c:157
 msgid "reading user-defined text search parsers\n"
 msgstr ""
 "leyendo los procesadores (parsers) de búsqueda en texto definidos\n"
 "por el usuario\n"
 
-#: common.c:152
+#: common.c:161
 msgid "reading user-defined text search templates\n"
 msgstr "leyendo las plantillas de búsqueda en texto definidas por el usuario\n"
 
-#: common.c:156
+#: common.c:165
 msgid "reading user-defined text search dictionaries\n"
 msgstr ""
 "leyendo los diccionarios de búsqueda en texto definidos por el usuario\n"
 
-#: common.c:160
+#: common.c:169
 msgid "reading user-defined text search configurations\n"
 msgstr ""
 "leyendo las configuraciones de búsqueda en texto definidas por el usuario\n"
 
-#: common.c:164
+#: common.c:173
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "leyendo los conectores de datos externos definidos por el usuario\n"
 
-#: common.c:168
+#: common.c:177
 msgid "reading user-defined foreign servers\n"
 msgstr "leyendo los servidores foráneos definidas por el usuario\n"
 
-#: common.c:172
+#: common.c:181
 msgid "reading default privileges\n"
 msgstr "leyendo los privilegios por omisión\n"
 
-#: common.c:176
-msgid "reading user-defined operator families\n"
-msgstr "leyendo las familias de operadores definidas por el usuario\n"
+#: common.c:185
+msgid "reading user-defined collations\n"
+msgstr "leyendo los ordenamientos definidos por el usuario\n"
 
-#: common.c:180
+#: common.c:190
 msgid "reading user-defined conversions\n"
 msgstr "leyendo las conversiones definidas por el usuario\n"
 
-#: common.c:184
-msgid "reading user-defined tables\n"
-msgstr "leyendo las tablas definidas por el usuario\n"
+#: common.c:194
+msgid "reading type casts\n"
+msgstr "leyendo conversiones de tipo\n"
 
-#: common.c:189
+#: common.c:198
 msgid "reading table inheritance information\n"
 msgstr "leyendo la información de herencia de las tablas\n"
 
-#: common.c:193
+#: common.c:202
 msgid "reading rewrite rules\n"
 msgstr "leyendo las reglas de reescritura\n"
 
-#: common.c:197
-msgid "reading type casts\n"
-msgstr "leyendo conversiones de tipo\n"
+#: common.c:211
+msgid "finding extension members\n"
+msgstr "buscando miembros de extensión\n"
 
-#: common.c:202
+#: common.c:216
 msgid "finding inheritance relationships\n"
 msgstr "buscando relaciones de herencia\n"
 
-#: common.c:206
+#: common.c:220
 msgid "reading column info for interesting tables\n"
 msgstr "leyendo la información de columnas para las tablas interesantes\n"
 
-#: common.c:210
+#: common.c:224
 msgid "flagging inherited columns in subtables\n"
 msgstr "marcando las columnas heredadas en las subtablas\n"
 
-#: common.c:214
+#: common.c:228
 msgid "reading indexes\n"
 msgstr "leyendo los índices\n"
 
-#: common.c:218
+#: common.c:232
 msgid "reading constraints\n"
 msgstr "leyendo las restricciones\n"
 
-#: common.c:222
+#: common.c:236
 msgid "reading triggers\n"
 msgstr "leyendo los disparadores (triggers)\n"
 
-#: common.c:802
+#: common.c:828
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr ""
 "falló la revisión de integridad, el OID %u del padre de la tabla «%s»\n"
 "(OID %u) no se encontró\n"
 
-#: common.c:844
+#: common.c:870
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "no se pudo interpretar el arreglo numérico «%s»: demasiados números\n"
 
-#: common.c:859
+#: common.c:885
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr ""
 "no se pudo interpretar el arreglo numérico «%s»: carácter no válido en "
 "número\n"
 
-#: common.c:972
+#: common.c:998
 msgid "cannot duplicate null pointer\n"
 msgstr "no se puede duplicar un puntero nulo\n"
 
-#: common.c:975 common.c:986 common.c:997 common.c:1008
-#: pg_backup_archiver.c:727 pg_backup_archiver.c:1103
-#: pg_backup_archiver.c:1234 pg_backup_archiver.c:1705
-#: pg_backup_archiver.c:1862 pg_backup_archiver.c:1908
-#: pg_backup_archiver.c:4048 pg_backup_custom.c:144 pg_backup_custom.c:149
-#: pg_backup_custom.c:155 pg_backup_custom.c:170 pg_backup_custom.c:570
-#: pg_backup_custom.c:1113 pg_backup_custom.c:1122 pg_backup_db.c:154
-#: pg_backup_db.c:164 pg_backup_db.c:212 pg_backup_db.c:256 pg_backup_db.c:271
-#: pg_backup_db.c:305 pg_backup_files.c:114 pg_backup_null.c:72
-#: pg_backup_tar.c:167 pg_backup_tar.c:1011
+#: common.c:1001 common.c:1012 common.c:1023 common.c:1034
+#: pg_backup_archiver.c:764 pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291 pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955 pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209 pg_backup_custom.c:132 pg_backup_custom.c:139
+#: pg_backup_custom.c:780 pg_backup_custom.c:907 pg_backup_db.c:147
+#: pg_backup_db.c:157 pg_backup_db.c:205 pg_backup_db.c:249 pg_backup_db.c:264
+#: pg_backup_db.c:298 pg_backup_db.c:403 pg_backup_files.c:114
+#: pg_backup_null.c:72 pg_backup_tar.c:171 pg_backup_tar.c:1015
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
-#: pg_backup_archiver.c:80
+#: pg_backup_archiver.c:88
 msgid "archiver"
 msgstr "archivador"
 
-#: pg_backup_archiver.c:195 pg_backup_archiver.c:1198
+#: pg_backup_archiver.c:207 pg_backup_archiver.c:1259
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "no se pudo cerrar el archivo de salida: %s\n"
 
-#: pg_backup_archiver.c:220
+#: pg_backup_archiver.c:233
 msgid "-C and -c are incompatible options\n"
 msgstr "-C y -c son opciones incompatibles\n"
 
-#: pg_backup_archiver.c:227
+#: pg_backup_archiver.c:240
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C y -1 son opciones incompatibles\n"
 
-#: pg_backup_archiver.c:239
+#: pg_backup_archiver.c:250
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr ""
+"la restauración en paralelo no está soportada con este formato de archivo\n"
+
+#: pg_backup_archiver.c:254
+msgid ""
+"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr ""
+"la restauración en paralelo no está soportada con archivos construidos con "
+"pg_dump anterior a 8.0\n"
+
+#: pg_backup_archiver.c:273
 msgid ""
 "cannot restore from compressed archive (compression not supported in this "
 "installation)\n"
@@ -924,71 +971,71 @@ msgstr ""
 "no se puede reestablecer desde un archivo comprimido (la compresión no está "
 "soportada en esta instalación)\n"
 
-#: pg_backup_archiver.c:249
+#: pg_backup_archiver.c:283
 msgid "connecting to database for restore\n"
 msgstr "conectando a la base de datos para reestablecimiento\n"
 
-#: pg_backup_archiver.c:251
+#: pg_backup_archiver.c:285
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr ""
 "las conexiones directas a la base de datos no están soportadas en\n"
 "archivadores pre-1.3\n"
 
-#: pg_backup_archiver.c:293
+#: pg_backup_archiver.c:327
 msgid "implied data-only restore\n"
 msgstr "asumiendo reestablecimiento de sólo datos\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:379
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "eliminando %s %s\n"
 
-#: pg_backup_archiver.c:396
+#: pg_backup_archiver.c:431
 #, c-format
 msgid "setting owner and privileges for %s %s\n"
 msgstr "estableciendo dueño y privilegios para %s %s\n"
 
-#: pg_backup_archiver.c:454 pg_backup_archiver.c:456
+#: pg_backup_archiver.c:489 pg_backup_archiver.c:491
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "precaución desde el archivo original: %s\n"
 
-#: pg_backup_archiver.c:463
+#: pg_backup_archiver.c:498
 #, c-format
 msgid "creating %s %s\n"
 msgstr "creando %s %s\n"
 
-#: pg_backup_archiver.c:507
+#: pg_backup_archiver.c:542
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "conectando a nueva base de datos «%s»\n"
 
-#: pg_backup_archiver.c:535
+#: pg_backup_archiver.c:570
 #, c-format
 msgid "restoring %s\n"
 msgstr "reestableciendo %s\n"
 
-#: pg_backup_archiver.c:549
+#: pg_backup_archiver.c:584
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "reestableciendo datos de la tabla «%s»\n"
 
-#: pg_backup_archiver.c:609
+#: pg_backup_archiver.c:646
 #, c-format
 msgid "executing %s %s\n"
 msgstr "ejecutando %s %s\n"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:679
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "deshabilitando disparadores (triggers) para %s\n"
 
-#: pg_backup_archiver.c:668
+#: pg_backup_archiver.c:705
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "habilitando disparadores (triggers) para %s\n"
 
-#: pg_backup_archiver.c:698
+#: pg_backup_archiver.c:735
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine\n"
@@ -996,61 +1043,61 @@ msgstr ""
 "error interno -- WriteData no puede ser llamada fuera del contexto\n"
 "de una rutina DataDumper\n"
 
-#: pg_backup_archiver.c:854
+#: pg_backup_archiver.c:892
 msgid "large-object output not supported in chosen format\n"
 msgstr ""
 "la extracción de objetos grandes no está soportada en el formato\n"
 "seleccionado\n"
 
-#: pg_backup_archiver.c:908
+#: pg_backup_archiver.c:946
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "se reestableció %d objeto grande\n"
 msgstr[1] "se reestablecieron %d objetos grandes\n"
 
-#: pg_backup_archiver.c:929
+#: pg_backup_archiver.c:967
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "reestableciendo objeto grande con OID %u\n"
 
-#: pg_backup_archiver.c:941
+#: pg_backup_archiver.c:979
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "no se pudo crear el objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1006
+#: pg_backup_archiver.c:1041
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "no se pudo abrir el archivo TOC «%s»: %s\n"
 
-#: pg_backup_archiver.c:1025
+#: pg_backup_archiver.c:1082
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "PRECAUCIÓN: línea ignorada: %s\n"
 
-#: pg_backup_archiver.c:1032
+#: pg_backup_archiver.c:1089
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "no se pudo encontrar una entrada para el ID %d\n"
 
-#: pg_backup_archiver.c:1053 pg_backup_files.c:172 pg_backup_files.c:457
+#: pg_backup_archiver.c:1110 pg_backup_files.c:172 pg_backup_files.c:457
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "no se pudo cerrar el archivo TOC: %s\n"
 
-#: pg_backup_archiver.c:1177 pg_backup_custom.c:181 pg_backup_files.c:130
+#: pg_backup_archiver.c:1229 pg_backup_custom.c:152 pg_backup_files.c:130
 #: pg_backup_files.c:262
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "no se pudo abrir el archivo de salida «%s»: %s\n"
 
-#: pg_backup_archiver.c:1180 pg_backup_custom.c:188 pg_backup_files.c:137
+#: pg_backup_archiver.c:1232 pg_backup_custom.c:159 pg_backup_files.c:137
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "no se pudo abrir el archivo de salida: %s\n"
 
-#: pg_backup_archiver.c:1277
+#: pg_backup_archiver.c:1334
 #, c-format
 msgid "wrote %lu byte of large object data (result = %lu)\n"
 msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
@@ -1059,143 +1106,156 @@ msgstr[0] ""
 msgstr[1] ""
 "se escribieron %lu bytes de los datos del objeto grande (resultado = %lu)\n"
 
-#: pg_backup_archiver.c:1283
+#: pg_backup_archiver.c:1340
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr ""
 "no se pudo escribir al objecto grande (resultado: %lu, esperado: %lu)\n"
 
-#: pg_backup_archiver.c:1341 pg_backup_archiver.c:1364 pg_backup_custom.c:781
-#: pg_backup_custom.c:1035 pg_backup_custom.c:1049 pg_backup_files.c:432
-#: pg_backup_tar.c:586 pg_backup_tar.c:1089 pg_backup_tar.c:1382
+#: pg_backup_archiver.c:1398 pg_backup_archiver.c:1421 pg_backup_custom.c:652
+#: pg_backup_files.c:432 pg_backup_tar.c:590 pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
 #, c-format
 msgid "could not write to output file: %s\n"
 msgstr "no se pudo escribir al archivo de salida: %s\n"
 
-#: pg_backup_archiver.c:1349
+#: pg_backup_archiver.c:1406
 msgid "could not write to custom output routine\n"
 msgstr "no se pudo escribir a la rutina de salida personalizada\n"
 
-#: pg_backup_archiver.c:1447
+#: pg_backup_archiver.c:1504
 msgid "Error while INITIALIZING:\n"
 msgstr "Error durante INICIALIZACIÓN:\n"
 
-#: pg_backup_archiver.c:1452
+#: pg_backup_archiver.c:1509
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Error durante PROCESAMIENTO DE TABLA DE CONTENIDOS:\n"
 
-#: pg_backup_archiver.c:1457
+#: pg_backup_archiver.c:1514
 msgid "Error while FINALIZING:\n"
 msgstr "Error durante FINALIZACIÓN:\n"
 
-#: pg_backup_archiver.c:1462
+#: pg_backup_archiver.c:1519
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Error en entrada de la tabla de contenidos %d; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1598
+#: pg_backup_archiver.c:1654
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "bandera de posición inesperada %d\n"
 
-#: pg_backup_archiver.c:1611
+#: pg_backup_archiver.c:1667
 msgid "file offset in dump file is too large\n"
 msgstr "el posición en el archivo es demasiado grande\n"
 
-#: pg_backup_archiver.c:1708 pg_backup_archiver.c:3009 pg_backup_custom.c:757
-#: pg_backup_files.c:419 pg_backup_tar.c:785
+#: pg_backup_archiver.c:1764 pg_backup_archiver.c:3113 pg_backup_custom.c:630
+#: pg_backup_files.c:419 pg_backup_tar.c:789
 msgid "unexpected end of file\n"
 msgstr "fin inesperado de la entrada\n"
 
-#: pg_backup_archiver.c:1725
+#: pg_backup_archiver.c:1781
 msgid "attempting to ascertain archive format\n"
 msgstr "intentando comprobar el formato del archivador\n"
 
-#: pg_backup_archiver.c:1741 pg_backup_custom.c:200 pg_backup_custom.c:888
+#: pg_backup_archiver.c:1807 pg_backup_archiver.c:1817
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "nombre de directorio demasiado largo: «%s»\n"
+
+#: pg_backup_archiver.c:1825
+#, c-format
+msgid ""
+"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
+"exist)\n"
+msgstr ""
+"el directorio «%s» no parece ser un archivador válido (no existe «toc.dat»)\n"
+
+#: pg_backup_archiver.c:1833 pg_backup_custom.c:171 pg_backup_custom.c:762
 #: pg_backup_files.c:155 pg_backup_files.c:307
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "no se pudo abrir el archivo de entrada «%s»: %s\n"
 
-#: pg_backup_archiver.c:1748 pg_backup_custom.c:207 pg_backup_files.c:162
+#: pg_backup_archiver.c:1841 pg_backup_custom.c:178 pg_backup_files.c:162
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "no se pudo abrir el archivo de entrada: %s\n"
 
-#: pg_backup_archiver.c:1757
+#: pg_backup_archiver.c:1850
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "no se pudo leer el archivo de entrada: %s\n"
 
-#: pg_backup_archiver.c:1759
+#: pg_backup_archiver.c:1852
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "el archivo de entrada es demasiado corto (leidos %lu, esperados 5)\n"
 
-#: pg_backup_archiver.c:1817
+#: pg_backup_archiver.c:1910
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr ""
 "el archivo de entrada no parece ser un archivador válido (¿demasiado "
 "corto?)\n"
 
-#: pg_backup_archiver.c:1820
+#: pg_backup_archiver.c:1913
 msgid "input file does not appear to be a valid archive\n"
 msgstr "el archivo de entrada no parece ser un archivador válido\n"
 
-#: pg_backup_archiver.c:1840
+#: pg_backup_archiver.c:1933
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "no se pudo cerrar el archivo de entrada: %s\n"
 
-#: pg_backup_archiver.c:1857
+#: pg_backup_archiver.c:1950
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "reservando AH para %s, formato %d\n"
 
-#: pg_backup_archiver.c:1965
+#: pg_backup_archiver.c:2059
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "formato de archivo no reconocido «%d»\n"
 
-#: pg_backup_archiver.c:2087
+#: pg_backup_archiver.c:2181
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr ""
 "la entrada con ID %d está fuera de rango -- tal vez\n"
 "la tabla de contenido está corrupta\n"
 
-#: pg_backup_archiver.c:2203
+#: pg_backup_archiver.c:2297
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "leyendo entrada de la tabla de contenidos %d (ID %d) para %s %s\n"
 
-#: pg_backup_archiver.c:2237
+#: pg_backup_archiver.c:2331
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "no se reconoce la codificación: «%s»\n"
 
-#: pg_backup_archiver.c:2242
+#: pg_backup_archiver.c:2336
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "elemento ENCODING no válido: %s\n"
 
-#: pg_backup_archiver.c:2260
+#: pg_backup_archiver.c:2354
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "elemento STDSTRINGS no válido: %s\n"
 
-#: pg_backup_archiver.c:2452
+#: pg_backup_archiver.c:2552
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "no se pudo establecer el usuario de sesión a «%s»: %s"
 
-#: pg_backup_archiver.c:2790 pg_backup_archiver.c:2940
+#: pg_backup_archiver.c:2892 pg_backup_archiver.c:3044
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr ""
 "PRECAUCIÓN: no se sabe cómo establecer el dueño para el objeto de tipo %s\n"
 
-#: pg_backup_archiver.c:2972
+#: pg_backup_archiver.c:3076
 msgid ""
 "WARNING: requested compression not available in this installation -- archive "
 "will be uncompressed\n"
@@ -1203,21 +1263,21 @@ msgstr ""
 "PRECAUCIÓN: la compresión solicitada no está soportada en esta\n"
 "instalación -- el archivador no será comprimido\n"
 
-#: pg_backup_archiver.c:3012
+#: pg_backup_archiver.c:3116
 msgid "did not find magic string in file header\n"
 msgstr "no se encontró la cadena mágica en el encabezado del archivo\n"
 
-#: pg_backup_archiver.c:3025
+#: pg_backup_archiver.c:3129
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "versión no soportada (%d.%d) en el encabezado del archivo\n"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3134
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "revisión de integridad en el tamaño del entero (%lu) falló\n"
 
-#: pg_backup_archiver.c:3034
+#: pg_backup_archiver.c:3138
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "might fail\n"
@@ -1225,13 +1285,13 @@ msgstr ""
 "PRECAUCIÓN: el archivador fue hecho en una máquina con enteros más \n"
 "grandes, algunas operaciones podrían fallar\n"
 
-#: pg_backup_archiver.c:3044
+#: pg_backup_archiver.c:3148
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr ""
 "el formato esperado (%d) difiere del formato encontrado en el archivo (%d)\n"
 
-#: pg_backup_archiver.c:3060
+#: pg_backup_archiver.c:3164
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression -- no data will be available\n"
@@ -1239,125 +1299,113 @@ msgstr ""
 "PRECAUCIÓN: el archivador está comprimido, pero esta instalación no soporta\n"
 "compresión -- no habrá datos disponibles\n"
 
-#: pg_backup_archiver.c:3078
+#: pg_backup_archiver.c:3182
 msgid "WARNING: invalid creation date in header\n"
 msgstr "PRECAUCIÓN: la fecha de creación en el encabezado no es válida\n"
 
-#: pg_backup_archiver.c:3175
+#: pg_backup_archiver.c:3280
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "ingresando restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3179
-msgid "parallel restore is not supported with this archive file format\n"
-msgstr ""
-"la restauración en paralelo no está soportada con este formato de archivo\n"
-
-#: pg_backup_archiver.c:3183
-msgid ""
-"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
-msgstr ""
-"la restauración en paralelo no está soportada con archivos construidos con "
-"pg_dump anterior a 8.0\n"
-
-#: pg_backup_archiver.c:3205
+#: pg_backup_archiver.c:3321
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "procesando el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3266
+#: pg_backup_archiver.c:3397
 msgid "entering main parallel loop\n"
 msgstr "ingresando al bucle paralelo principal\n"
 
-#: pg_backup_archiver.c:3280
+#: pg_backup_archiver.c:3411
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "saltando el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3296
+#: pg_backup_archiver.c:3427
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "lanzando el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3333
+#: pg_backup_archiver.c:3464
 #, c-format
 msgid "worker process crashed: status %d\n"
 msgstr "un proceso hijo murió: estado %d\n"
 
-#: pg_backup_archiver.c:3338
+#: pg_backup_archiver.c:3469
 msgid "finished main parallel loop\n"
 msgstr "terminó el bucle paralelo principal\n"
 
-#: pg_backup_archiver.c:3356
+#: pg_backup_archiver.c:3487
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "procesando el elemento saltado %d %s %s\n"
 
-#: pg_backup_archiver.c:3382
+#: pg_backup_archiver.c:3513
 msgid "parallel_restore should not return\n"
-msgstr "parallel_restore should not return\n"
+msgstr "parallel_restore no debería retornar\n"
 
-#: pg_backup_archiver.c:3388
+#: pg_backup_archiver.c:3519
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "no se pudo crear el proceso hijo: %s\n"
 
-#: pg_backup_archiver.c:3396
+#: pg_backup_archiver.c:3527
 #, c-format
 msgid "could not create worker thread: %s\n"
 msgstr "no se pudo crear el hilo: %s\n"
 
-#: pg_backup_archiver.c:3620
+#: pg_backup_archiver.c:3751
 msgid "no item ready\n"
 msgstr "ningún elemento listo\n"
 
-#: pg_backup_archiver.c:3715
+#: pg_backup_archiver.c:3846
 msgid "could not find slot of finished worker\n"
 msgstr "no se pudo localizar la entrada del proceso o hilo que terminó\n"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3848
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "terminó el elemento %d %s %s\n"
 
-#: pg_backup_archiver.c:3730
+#: pg_backup_archiver.c:3861
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "el proceso hijo falló: código de salida %d\n"
 
-#: pg_backup_archiver.c:3882
+#: pg_backup_archiver.c:4057
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "transferiendo la dependencia %d -> %d a %d\n"
 
-#: pg_backup_archiver.c:3956
+#: pg_backup_archiver.c:4126
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "reduciendo las dependencias para %d\n"
 
-#: pg_backup_archiver.c:4014
+#: pg_backup_archiver.c:4175
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "la tabla «%s» no pudo ser creada, no se recuperarán sus datos\n"
 
-#: pg_backup_custom.c:97
+#: pg_backup_custom.c:87
 msgid "custom archiver"
 msgstr "archivador personalizado"
 
-#: pg_backup_custom.c:405 pg_backup_null.c:153
+#: pg_backup_custom.c:373 pg_backup_null.c:153
 msgid "invalid OID for large object\n"
 msgstr "OID no válido para objeto grande\n"
 
-#: pg_backup_custom.c:471
+#: pg_backup_custom.c:444
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "tipo de bloque de datos (%d) no conocido al buscar en el archivador\n"
 
-#: pg_backup_custom.c:482
+#: pg_backup_custom.c:455
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "error durante el posicionamiento (seek) en el archivo: %s\n"
 
-#: pg_backup_custom.c:492
+#: pg_backup_custom.c:465
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
@@ -1368,7 +1416,7 @@ msgstr ""
 "una petición de restauración fuera de orden, la que no puede ser satisfecha "
 "debido a la falta de información de posicionamiento en el archivo\n"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:470
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
@@ -1378,175 +1426,154 @@ msgstr ""
 "una petición de restauración fuera de orden, la que no puede ser completada "
 "debido a que en el archivo de entrada no es reposicionable (seekable)\n"
 
-#: pg_backup_custom.c:502
+#: pg_backup_custom.c:475
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
 msgstr ""
 "no se pudo encontrar el bloque con ID %d en archivo -- posiblemente el "
 "archivo está corrupto\n"
 
-#: pg_backup_custom.c:509
+#: pg_backup_custom.c:482
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
 msgstr ""
 "se encontró un bloque no esperado ID (%d) mientras se leían los\n"
 "datos -- se esperaba %d\n"
 
-#: pg_backup_custom.c:523
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr ""
 "se encontró un bloque tipo %d no reconocido al restablecer el archivador\n"
 
-#: pg_backup_custom.c:557 pg_backup_custom.c:985
-#, c-format
-msgid "could not initialize compression library: %s\n"
-msgstr "no se pudo inicializar la biblioteca de compresión: %s\n"
-
-#: pg_backup_custom.c:581 pg_backup_custom.c:705
+#: pg_backup_custom.c:578 pg_backup_custom.c:916
 msgid "could not read from input file: end of file\n"
 msgstr "no se pudo leer desde el archivo de entrada: fin de archivo\n"
 
-#: pg_backup_custom.c:584 pg_backup_custom.c:708
+#: pg_backup_custom.c:581 pg_backup_custom.c:919
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "no se pudo leer el archivo de entrada: %s\n"
 
-#: pg_backup_custom.c:601 pg_backup_custom.c:628
-#, c-format
-msgid "could not uncompress data: %s\n"
-msgstr "no se pudo descomprimir datos: %s\n"
-
-#: pg_backup_custom.c:634
-#, c-format
-msgid "could not close compression library: %s\n"
-msgstr "no se pudo cerrar la biblioteca de compresión: %s\n"
-
-#: pg_backup_custom.c:736
+#: pg_backup_custom.c:610
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "no se pudo escribir byte: %s\n"
 
-#: pg_backup_custom.c:849 pg_backup_custom.c:882
+#: pg_backup_custom.c:718 pg_backup_custom.c:756
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "no se pudo cerrar el archivo del archivador: %s\n"
 
-#: pg_backup_custom.c:868
+#: pg_backup_custom.c:737
 msgid "can only reopen input archives\n"
 msgstr "sólo se pueden reabrir archivos de entrada\n"
 
-#: pg_backup_custom.c:870
-msgid "cannot reopen stdin\n"
-msgstr "no se puede reabrir stdin\n"
+#: pg_backup_custom.c:744
+msgid "parallel restore from stdin is not supported\n"
+msgstr "la restauración en paralelo desde stdin no está soportada\n"
 
-#: pg_backup_custom.c:872
-msgid "cannot reopen non-seekable file\n"
-msgstr "no se puede reabrir un archivo no posicionable (seekable)\n"
+#: pg_backup_custom.c:746
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr "la restauración en paralelo desde un archivo no posicionable no está soportada\n"
 
-#: pg_backup_custom.c:877
+#: pg_backup_custom.c:751
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr ""
 "no se pudo determinar la posición (seek) en el archivo del archivador: %s\n"
 
-#: pg_backup_custom.c:892
+#: pg_backup_custom.c:766
 #, c-format
 msgid "could not set seek position in archive file: %s\n"
 msgstr "no se pudo posicionar (seek) en el archivo del archivador: %s\n"
 
-#: pg_backup_custom.c:914
+#: pg_backup_custom.c:786
+msgid "compressor active\n"
+msgstr "compresor activo\n"
+
+#: pg_backup_custom.c:822
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr "ATENCIÓN: ftell no coincide con la posición esperada -- se usó ftell\n"
 
-#: pg_backup_custom.c:1016
-#, c-format
-msgid "could not compress data: %s\n"
-msgstr "no se pudo comprimir los datos: %s\n"
-
-#: pg_backup_custom.c:1094
-#, c-format
-msgid "could not close compression stream: %s\n"
-msgstr "no se pudo cerrar el flujo de compresión: %s\n"
-
 #: pg_backup_db.c:25
 msgid "archiver (db)"
 msgstr "archivador (bd)"
 
-#: pg_backup_db.c:61
+#: pg_backup_db.c:54
 msgid "could not get server_version from libpq\n"
 msgstr "no se pudo obtener server_version desde libpq\n"
 
-#: pg_backup_db.c:74 pg_dumpall.c:1726
+#: pg_backup_db.c:67 pg_dumpall.c:1741
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "versión del servidor: %s; versión de %s: %s\n"
 
-#: pg_backup_db.c:76 pg_dumpall.c:1728
+#: pg_backup_db.c:69 pg_dumpall.c:1743
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "abortando debido a que no coincide la versión del servidor\n"
 
-#: pg_backup_db.c:147
+#: pg_backup_db.c:140
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "conectandose a la base de datos \"%s\" como el usuario «%s»\n"
 
-#: pg_backup_db.c:152 pg_backup_db.c:207 pg_backup_db.c:254 pg_backup_db.c:303
-#: pg_dumpall.c:1622 pg_dumpall.c:1674
+#: pg_backup_db.c:145 pg_backup_db.c:200 pg_backup_db.c:247 pg_backup_db.c:296
+#: pg_dumpall.c:1637 pg_dumpall.c:1689
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: pg_backup_db.c:188
+#: pg_backup_db.c:181
 msgid "failed to reconnect to database\n"
 msgstr "falló la reconexión a la base de datos\n"
 
-#: pg_backup_db.c:193
+#: pg_backup_db.c:186
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "no se pudo hacer la reconexión a la base de datos: %s"
 
-#: pg_backup_db.c:209
+#: pg_backup_db.c:202
 msgid "connection needs password\n"
 msgstr "la conexión necesita contraseña\n"
 
-#: pg_backup_db.c:250
+#: pg_backup_db.c:243
 msgid "already connected to a database\n"
 msgstr "ya está conectado a una base de datos\n"
 
-#: pg_backup_db.c:295
+#: pg_backup_db.c:288
 msgid "failed to connect to database\n"
 msgstr "falló la conexión a la base de datos\n"
 
-#: pg_backup_db.c:314
+#: pg_backup_db.c:307
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "falló la conexión a la base de datos «%s»: %s"
 
-#: pg_backup_db.c:329
+#: pg_backup_db.c:322
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:441
+#: pg_backup_db.c:387
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "PQputCopyData regresó un error: %s"
 
-#: pg_backup_db.c:451
+#: pg_backup_db.c:397 pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "no se pudo ejecutar la consulta"
+
+#: pg_backup_db.c:425
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "PQputCopyEnd regresó un error: %s"
 
-#: pg_backup_db.c:498
-msgid "could not execute query"
-msgstr "no se pudo ejecutar la consulta"
-
-#: pg_backup_db.c:696
+#: pg_backup_db.c:442
 msgid "could not start database transaction"
 msgstr "no se pudo iniciar la transacción en la base de datos"
 
-#: pg_backup_db.c:702
+#: pg_backup_db.c:448
 msgid "could not commit database transaction"
 msgstr "no se pudo terminar la transacción a la base de datos"
 
@@ -1596,7 +1623,7 @@ msgstr ""
 "no se pudo abrir la tabla de contenido de los objetos grandes\n"
 "para su escritura: %s\n"
 
-#: pg_backup_files.c:510 pg_backup_tar.c:935
+#: pg_backup_files.c:510 pg_backup_tar.c:939
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "el OID del objeto grande no es válido (%u)\n"
@@ -1615,121 +1642,121 @@ msgstr "no se pudo cerrar el archivo del objeto grande\n"
 msgid "this format cannot be read\n"
 msgstr "no se puede leer este formato\n"
 
-#: pg_backup_tar.c:101
+#: pg_backup_tar.c:105
 msgid "tar archiver"
 msgstr "archivador tar"
 
-#: pg_backup_tar.c:179
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
 msgstr ""
 "no se pudo abrir el archivo de tabla de contenido «%s» para escribir: %s\n"
 
-#: pg_backup_tar.c:187
+#: pg_backup_tar.c:191
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "no se pudo abrir la tabla de contenido para escribir: %s\n"
 
-#: pg_backup_tar.c:214 pg_backup_tar.c:370
+#: pg_backup_tar.c:218 pg_backup_tar.c:374
 msgid "compression is not supported by tar archive format\n"
 msgstr "la compresión no está soportada por el formato de salida tar\n"
 
-#: pg_backup_tar.c:222
+#: pg_backup_tar.c:226
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
 msgstr "no se pudo abrir el archivo de tabla de contenido «%s» para leer: %s\n"
 
-#: pg_backup_tar.c:229
+#: pg_backup_tar.c:233
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "no se pudo abrir la tabla de contenido para leer: %s\n"
 
-#: pg_backup_tar.c:356
+#: pg_backup_tar.c:360
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
 msgstr "no se pudo encontrar el archivo «%s» en el archivador\n"
 
-#: pg_backup_tar.c:412
+#: pg_backup_tar.c:416
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "no se pudo generar el nombre de archivo temporal: %s\n"
 
-#: pg_backup_tar.c:421
+#: pg_backup_tar.c:425
 msgid "could not open temporary file\n"
 msgstr "no se pudo abrir archivo temporal\n"
 
-#: pg_backup_tar.c:448
+#: pg_backup_tar.c:452
 msgid "could not close tar member\n"
 msgstr "no se pudo cerrar miembro del archivo tar\n"
 
-#: pg_backup_tar.c:548
+#: pg_backup_tar.c:552
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "error interno --- no se especificó th ni fh en tarReadRaw()\n"
 
-#: pg_backup_tar.c:674
+#: pg_backup_tar.c:678
 #, c-format
 msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
 msgstr ""
 "sentencia COPY no válida -- no se pudo encontrar «copy» en la cadena «%s»\n"
 
-#: pg_backup_tar.c:692
+#: pg_backup_tar.c:696
 #, c-format
 msgid ""
 "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
 "starting at position %lu\n"
 msgstr ""
-"sentencia COPY no válida -- no se pudo encontrar «from stdin» en la cadena «%"
-"s» empezando en la posición %lu\n"
+"sentencia COPY no válida -- no se pudo encontrar «from stdin» en la cadena "
+"«%s» empezando en la posición %lu\n"
 
-#: pg_backup_tar.c:729
+#: pg_backup_tar.c:733
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "reestableciendo objeto grande con OID %u\n"
 
-#: pg_backup_tar.c:880
+#: pg_backup_tar.c:884
 msgid "could not write null block at end of tar archive\n"
 msgstr "no se pudo escribir un bloque nulo al final del archivo tar\n"
 
-#: pg_backup_tar.c:1080
+#: pg_backup_tar.c:1084
 msgid "archive member too large for tar format\n"
 msgstr "el miembro de archivador es demasiado grande para el formato tar\n"
 
-#: pg_backup_tar.c:1095
+#: pg_backup_tar.c:1099
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "no se pudo abrir archivo temporal: %s\n"
 
-#: pg_backup_tar.c:1105
+#: pg_backup_tar.c:1109
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "el tamaño real del archivo (%s) no coincide con el esperado (%s)\n"
 
-#: pg_backup_tar.c:1113
+#: pg_backup_tar.c:1117
 msgid "could not output padding at end of tar member\n"
 msgstr "no se pudo rellenar la salida al final del miembro del archivo tar\n"
 
-#: pg_backup_tar.c:1142
+#: pg_backup_tar.c:1146
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "moviendo desde la posición %s a la posición del siguiente miembro %s\n"
 
-#: pg_backup_tar.c:1153
+#: pg_backup_tar.c:1157
 #, c-format
 msgid "now at file position %s\n"
 msgstr "ahora en la posición del archivo %s\n"
 
-#: pg_backup_tar.c:1162 pg_backup_tar.c:1192
+#: pg_backup_tar.c:1166 pg_backup_tar.c:1196
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
 msgstr ""
 "no se pudo encontrar el encabezado para el archivo «%s» en el archivo tar\n"
 
-#: pg_backup_tar.c:1176
+#: pg_backup_tar.c:1180
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "saltando miembro del archivo tar %s\n"
 
-#: pg_backup_tar.c:1180
+#: pg_backup_tar.c:1184
 #, c-format
 msgid ""
 "restoring data out of order is not supported in this archive format: \"%s\" "
@@ -1738,26 +1765,26 @@ msgstr ""
 "la extracción de datos fuera de orden no está soportada en este formato:\n"
 "se requiere «%s», pero viene antes de «%s» en el archivador.\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1230
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr ""
-"no hay coincidencia en la posición real del archivo con la que se predijo (%"
-"s vs %s)\n"
+"no hay coincidencia en la posición real del archivo con la que se predijo "
+"(%s vs %s)\n"
 
-#: pg_backup_tar.c:1241
+#: pg_backup_tar.c:1245
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "se encontró un encabezado incompleto (%lu byte)\n"
 msgstr[1] "se encontró un encabezado incompleto (%lu bytes)\n"
 
-#: pg_backup_tar.c:1279
+#: pg_backup_tar.c:1283
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "entrada TOC %s en %s (tamaño %lu, suma de integridad %d)\n"
 
-#: pg_backup_tar.c:1289
+#: pg_backup_tar.c:1293
 #, c-format
 msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
@@ -1765,28 +1792,30 @@ msgstr ""
 "se encontró un encabezado corrupto en %s (esperado %d, calculado %d)\n"
 "en la posición %s\n"
 
-#: pg_restore.c:319
+#: pg_restore.c:300
 #, c-format
 msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
 msgstr "%s: las opciones -d/--dbname y -f/--file no pueden usarse juntas\n"
 
-#: pg_restore.c:331
+#: pg_restore.c:312
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr ""
 "%s: no se puede especificar --single-transaction junto con múltiples tareas\n"
 
-#: pg_restore.c:361
+#: pg_restore.c:348
 #, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\" or \"t\"\n"
-msgstr "formato de archivo «%s» no reconocido; por favor especifique «c» o «t»\n"
+msgid ""
+"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
+msgstr ""
+"formato de archivo «%s» no reconocido; por favor especifique «c», «d» o «t»\n"
 
-#: pg_restore.c:395
+#: pg_restore.c:382
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "PRECAUCIÓN: errores ignorados durante la recuperación: %d\n"
 
-#: pg_restore.c:409
+#: pg_restore.c:396
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1795,52 +1824,52 @@ msgstr ""
 "%s reestablece una base de datos de PostgreSQL usando un archivo\n"
 "creado por pg_dump.\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:398
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPCIÓN]... [ARCHIVO]\n"
 
-#: pg_restore.c:414
+#: pg_restore.c:401
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr ""
 "  -d, --dbname=NOMBRE      nombre de la base de datos a la que conectarse\n"
 
-#: pg_restore.c:415
+#: pg_restore.c:402
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida\n"
 
-#: pg_restore.c:416
+#: pg_restore.c:403
 #, c-format
-msgid "  -F, --format=c|t         backup file format (should be automatic)\n"
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
-"  -F, --format=c|t         formato del volcado (debería ser automático)\n"
+"  -F, --format=c|d|t       formato del volcado (debería ser automático)\n"
 
-#: pg_restore.c:417
+#: pg_restore.c:404
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr ""
 "  -l, --list               imprime una tabla resumida de contenidos\n"
 "                           del archivador\n"
 
-#: pg_restore.c:418
+#: pg_restore.c:405
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            modo verboso\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:406
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   muestra esta ayuda y termina\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:407
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr ""
 "  --version                muestra información de la versión y termina\n"
 
-#: pg_restore.c:422
+#: pg_restore.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1849,42 +1878,42 @@ msgstr ""
 "\n"
 "Opciones que controlan la recuperación:\n"
 
-#: pg_restore.c:423
+#: pg_restore.c:410
 #, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -a, --data-only          reestablece sólo los datos, no el esquema\n"
 
-#: pg_restore.c:424
+#: pg_restore.c:411
 #, c-format
 msgid ""
 "  -c, --clean              clean (drop) database objects before recreating\n"
 msgstr ""
 "  -c, --clean              tira (drop) la base de datos antes de recrearla\n"
 
-#: pg_restore.c:425
+#: pg_restore.c:412
 #, c-format
 msgid "  -C, --create             create the target database\n"
 msgstr "  -C, --create             crea la base de datos de destino\n"
 
-#: pg_restore.c:426
+#: pg_restore.c:413
 #, c-format
 msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
 msgstr ""
 "  -e, --exit-on-error      abandonar al encontrar un error\n"
 "                           por omisión, se continúa la restauración\n"
 
-#: pg_restore.c:427
+#: pg_restore.c:414
 #, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=NOMBRE       reestablece el índice nombrado\n"
 
-#: pg_restore.c:428
+#: pg_restore.c:415
 #, c-format
 msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=NUM           máximo de procesos paralelos para restaurar\n"
 
-#: pg_restore.c:429
+#: pg_restore.c:416
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use table of contents from this file for\n"
@@ -1894,18 +1923,18 @@ msgstr ""
 "ordenar\n"
 "                           la salida de este archivo\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:418
 #, c-format
 msgid "  -n, --schema=NAME        restore only objects in this schema\n"
 msgstr ""
 "  -n, --schema=NAME        reestablece sólo los objetos en este esquema\n"
 
-#: pg_restore.c:432
+#: pg_restore.c:419
 #, c-format
 msgid "  -O, --no-owner           skip restoration of object ownership\n"
 msgstr "  -O, --no-owner           no reestablece los dueños de los objetos\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:420
 #, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
@@ -1914,13 +1943,13 @@ msgstr ""
 "  -P, --function=NOMBRE(args)\n"
 "                           reestablece la función nombrada\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:422
 #, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only        reestablece el esquema únicamente, no los datos\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:423
 #, c-format
 msgid ""
 "  -S, --superuser=NAME     superuser user name to use for disabling "
@@ -1929,18 +1958,18 @@ msgstr ""
 "  -S, --superuser=NOMBRE   especifica el nombre del superusuario que se usa\n"
 "                           para deshabilitar los disparadores (triggers)\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:424
 #, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NOMBRE       reestablece la tabla nombrada\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:425
 #, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr ""
 "  -T, --trigger=NOMBRE     reestablece el disparador (trigger) nombrado\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:426
 #, c-format
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
@@ -1948,7 +1977,14 @@ msgid ""
 msgstr ""
 "  -x, --no-privileges      no reestablece los privilegios (grant/revoke)\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr "  -1, --single-transaction reestablece en una única transacción\n"
+
+#: pg_restore.c:429
 #, c-format
 msgid "  --disable-triggers       disable triggers during data-only restore\n"
 msgstr ""
@@ -1956,7 +1992,7 @@ msgstr ""
 "el\n"
 "                           restablecimiento sólo de datos\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:430
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables\n"
@@ -1967,17 +2003,17 @@ msgstr ""
 "                           no reestablece datos de tablas que no pudieron\n"
 "                           ser creadas\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:433
 #, c-format
-msgid "  --no-tablespaces         do not restore tablespace assignments\n"
-msgstr "  --no-tablespaces         no vuelca asignaciones de tablespace\n"
+msgid "  --no-security-labels     do not restore security labels\n"
+msgstr "  --no-security-labels     no restaura etiquetas de seguridad\n"
 
-#: pg_restore.c:445
+#: pg_restore.c:434
 #, c-format
-msgid "  --role=ROLENAME          do SET ROLE before restore\n"
-msgstr "  --role=ROLENAME          hace SET ROLE antes de restaurar\n"
+msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgstr "  --no-tablespaces         no vuelca asignaciones de tablespace\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:435
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1990,14 +2026,12 @@ msgstr ""
 "de\n"
 "                           ALTER OWNER para reestablecer dueños\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:445
 #, c-format
-msgid ""
-"  -1, --single-transaction\n"
-"                           restore as a single transaction\n"
-msgstr "  -1, --single-transaction reestablece en una única transacción\n"
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=ROLENAME          hace SET ROLE antes de restaurar\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:447
 #, c-format
 msgid ""
 "\n"
@@ -2008,7 +2042,7 @@ msgstr ""
 "Si no se especifica un archivo de entrada, se usa la entrada estándar.\n"
 "\n"
 
-#: pg_dumpall.c:168
+#: pg_dumpall.c:171
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2019,7 +2053,7 @@ msgstr ""
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: pg_dumpall.c:175
+#: pg_dumpall.c:178
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2030,7 +2064,7 @@ msgstr ""
 "pero no es de la misma versión que %s.\n"
 "Verifique su instalación.\n"
 
-#: pg_dumpall.c:332
+#: pg_dumpall.c:314
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
@@ -2038,7 +2072,7 @@ msgstr ""
 "%s: las opciones -g/--globals-only y -r/--roles-only no pueden usarse "
 "juntas\n"
 
-#: pg_dumpall.c:341
+#: pg_dumpall.c:323
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
@@ -2047,7 +2081,7 @@ msgstr ""
 "%s: las opciones -g/--globals-only y -t/--tablespaces-only no pueden usarse "
 "juntas\n"
 
-#: pg_dumpall.c:350
+#: pg_dumpall.c:332
 #, c-format
 msgid ""
 "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
@@ -2056,12 +2090,12 @@ msgstr ""
 "%s: las opciones -r/--roles-only y -t/--tablespaces-only no pueden usarse "
 "juntas\n"
 
-#: pg_dumpall.c:388 pg_dumpall.c:1663
+#: pg_dumpall.c:374 pg_dumpall.c:1678
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: no se pudo establecer la conexión a la base de datos «%s»\n"
 
-#: pg_dumpall.c:403
+#: pg_dumpall.c:389
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2070,12 +2104,12 @@ msgstr ""
 "%s: no se pudo establecer la conexión a las bases de datos «postgres» o\n"
 "«template1».  Por favor especifique una base de datos para conectarse.\n"
 
-#: pg_dumpall.c:420
+#: pg_dumpall.c:406
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo de salida «%s»: %s\n"
 
-#: pg_dumpall.c:542
+#: pg_dumpall.c:528
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2084,31 +2118,36 @@ msgstr ""
 "%s extrae un cluster de bases de datos de PostgreSQL en un archivo\n"
 "guión (script) SQL.\n"
 
-#: pg_dumpall.c:544
+#: pg_dumpall.c:530
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPCIÓN]...\n"
 
-#: pg_dumpall.c:553
+#: pg_dumpall.c:533
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=ARCHIVO       nombre del archivo de salida\n"
+
+#: pg_dumpall.c:539
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) databases before recreating\n"
 msgstr ""
 "  -c, --clean              tira (drop) la base de datos antes de crearla\n"
 
-#: pg_dumpall.c:554
+#: pg_dumpall.c:540
 #, c-format
 msgid "  -g, --globals-only          dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only       extrae sólo los objetos globales, no bases de "
 "datos\n"
 
-#: pg_dumpall.c:556
+#: pg_dumpall.c:542
 #, c-format
 msgid "  -O, --no-owner              skip restoration of object ownership\n"
 msgstr "  -O, --no-owner           no reestablece los dueños de los objetos\n"
 
-#: pg_dumpall.c:557
+#: pg_dumpall.c:543
 #, c-format
 msgid ""
 "  -r, --roles-only            dump only roles, no databases or tablespaces\n"
@@ -2116,14 +2155,14 @@ msgstr ""
 "  -r, --roles-only         extrae sólo los roles, no bases de datos\n"
 "                           ni tablespaces\n"
 
-#: pg_dumpall.c:559
+#: pg_dumpall.c:545
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=NAME     especifica el nombre del superusuario a usar en\n"
 "                           el volcado\n"
 
-#: pg_dumpall.c:560
+#: pg_dumpall.c:546
 #, c-format
 msgid ""
 "  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
@@ -2131,13 +2170,13 @@ msgstr ""
 "  -t, --tablespaces-only   extrae sólo los tablespaces, no bases de datos\n"
 "                           ni roles\n"
 
-#: pg_dumpall.c:576
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr ""
 "  -l, --database=NOMBRE    especifica la base de datos a la cual conectarse\n"
 
-#: pg_dumpall.c:582
+#: pg_dumpall.c:570
 #, c-format
 msgid ""
 "\n"
@@ -2151,76 +2190,76 @@ msgstr ""
 "estándar.\n"
 "\n"
 
-#: pg_dumpall.c:1026
+#: pg_dumpall.c:1041
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr ""
 "%s: no se pudo interpretar la lista de control de acceso (%s) del tablespace "
 "«%s»\n"
 
-#: pg_dumpall.c:1326
+#: pg_dumpall.c:1341
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr ""
 "%s: no se pudo interpretar la lista de control de acceso (%s) de la base de "
 "datos «%s»\n"
 
-#: pg_dumpall.c:1533
+#: pg_dumpall.c:1548
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: extrayendo base de datos «%s»...\n"
 
-#: pg_dumpall.c:1543
+#: pg_dumpall.c:1558
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: pg_dump falló en la base de datos «%s», saliendo\n"
 
-#: pg_dumpall.c:1552
+#: pg_dumpall.c:1567
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s: no se pudo reabrir el archivo de salida «%s»: %s\n"
 
-#: pg_dumpall.c:1591
+#: pg_dumpall.c:1606
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: ejecutando «%s»\n"
 
-#: pg_dumpall.c:1636
+#: pg_dumpall.c:1651
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: pg_dumpall.c:1685
+#: pg_dumpall.c:1700
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: no se pudo establecer la conexión a la base de datos «%s»: %s\n"
 
-#: pg_dumpall.c:1699
+#: pg_dumpall.c:1714
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: no se pudo obtener la versión del servidor\n"
 
-#: pg_dumpall.c:1705
+#: pg_dumpall.c:1720
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: no se pudo interpretar la versión del servidor «%s»\n"
 
-#: pg_dumpall.c:1713
+#: pg_dumpall.c:1728
 #, c-format
 msgid "%s: could not parse version \"%s\"\n"
 msgstr "%s: no se pudo interpretar la versión «%s»\n"
 
-#: pg_dumpall.c:1752 pg_dumpall.c:1778
+#: pg_dumpall.c:1767 pg_dumpall.c:1793
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: ejecutando %s\n"
 
-#: pg_dumpall.c:1758 pg_dumpall.c:1784
+#: pg_dumpall.c:1773 pg_dumpall.c:1799
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: falló la consulta: %s"
 
-#: pg_dumpall.c:1760 pg_dumpall.c:1786
+#: pg_dumpall.c:1775 pg_dumpall.c:1801
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: la consulta fue: %s\n"
@@ -2255,48 +2294,27 @@ msgstr "no se pudo cambiar el directorio a «%s»"
 msgid "could not read symbolic link \"%s\""
 msgstr "no se pudo leer el enlace simbólico «%s»"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "el proceso hijo terminó con código de salida %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "el proceso hijo fue terminado por una excepción 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "el proceso hijo fue terminado por una señal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "el proceso hijo fue terminado por una señal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
-
-#~ msgid "dumpBlobs(): could not open large object: %s"
-#~ msgstr "dumpBlobs(): no se pudo abrir el objeto grande: %s"
-
-#~ msgid "saving large object comments\n"
-#~ msgstr "salvando comentarios de objetos grandes\n"
-
-#~ msgid "no label definitions found for enum ID %u\n"
-#~ msgstr ""
-#~ "no se encontraron definiciones de etiquetas para el enum con ID %u\n"
-
-#~ msgid ""
-#~ "dumping a specific TOC data block out of order is not supported without "
-#~ "ID on this input stream (fseek required)\n"
-#~ msgstr ""
-#~ "la extracción de un bloque específico de la tabla de contenido fuera de "
-#~ "orden no está soportado sin ID en este flujo de entrada (se requiere "
-#~ "fseek)\n"
-
-#~ msgid "compression support is disabled in this format\n"
-#~ msgstr "el soporte para compresión está deshabilitado en este formato\n"
diff --git a/src/bin/pg_dump/po/fr.po b/src/bin/pg_dump/po/fr.po
index 1c58a1c2d667e..94839af96a7d0 100644
--- a/src/bin/pg_dump/po/fr.po
+++ b/src/bin/pg_dump/po/fr.po
@@ -11,102 +11,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-06-29 21:21+0000\n"
-"PO-Revision-Date: 2010-06-29 23:36+0100\n"
+"POT-Creation-Date: 2011-09-05 18:53+0000\n"
+"PO-Revision-Date: 2011-09-05 22:27+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pg_dump.c:453
-#: pg_restore.c:268
-#: pg_dumpall.c:291
-#, c-format
-msgid "%s: invalid -X option -- %s\n"
-msgstr "%s : option -X invalide -- %s\n"
-
-#: pg_dump.c:455
-#: pg_dump.c:477
-#: pg_dump.c:486
-#: pg_restore.c:270
-#: pg_restore.c:293
-#: pg_restore.c:310
-#: pg_dumpall.c:293
-#: pg_dumpall.c:313
-#: pg_dumpall.c:338
-#: pg_dumpall.c:348
-#: pg_dumpall.c:357
-#: pg_dumpall.c:366
-#: pg_dumpall.c:402
+#: pg_dump.c:489
+#: pg_dump.c:503
+#: pg_restore.c:274
+#: pg_restore.c:290
+#: pg_restore.c:302
+#: pg_dumpall.c:296
+#: pg_dumpall.c:306
+#: pg_dumpall.c:316
+#: pg_dumpall.c:325
+#: pg_dumpall.c:334
+#: pg_dumpall.c:392
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayer « %s --help » pour plus d'informations.\n"
 
-#: pg_dump.c:484
-#: pg_dumpall.c:336
+#: pg_dump.c:501
+#: pg_restore.c:288
+#: pg_dumpall.c:304
 #, 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"
 
-#: pg_dump.c:501
+#: pg_dump.c:514
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr ""
 "les options « -s/--schema-only » et « -a/--data-only » ne peuvent pas être\n"
 "utilisées conjointement\n"
 
-#: pg_dump.c:507
+#: pg_dump.c:520
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr ""
 "les options « -c/--clean » et « -a/--data-only » ne peuvent pas être\n"
 "utilisées conjointement\n"
 
-#: pg_dump.c:513
+#: pg_dump.c:526
 msgid "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr ""
 "les options « --inserts/--column-inserts » et « -o/--oids » ne\n"
 "peuvent pas être utilisées conjointement\n"
 
-#: pg_dump.c:514
+#: pg_dump.c:527
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(La commande INSERT ne peut pas positionner les OID.)\n"
 
-#: pg_dump.c:544
-#, c-format
-msgid "invalid output format \"%s\" specified\n"
-msgstr "format de sortie « %s » invalide\n"
-
-#: pg_dump.c:550
+#: pg_dump.c:558
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » en écriture\n"
 
-#: pg_dump.c:560
-#: pg_backup_db.c:45
+#: pg_dump.c:568
+#: pg_backup_db.c:38
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "n'a pas pu analyser la chaîne de version « %s »\n"
 
-#: pg_dump.c:583
+#: pg_dump.c:591
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "encodage client indiqué (« %s ») invalide\n"
 
-#: pg_dump.c:660
+#: pg_dump.c:690
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "le dernier OID interne est %u\n"
 
-#: pg_dump.c:670
+#: pg_dump.c:700
 msgid "No matching schemas were found\n"
 msgstr "Aucun schéma correspondant n'a été trouvé\n"
 
-#: pg_dump.c:685
+#: pg_dump.c:715
 msgid "No matching tables were found\n"
 msgstr "Aucune table correspondante n'a été trouvée\n"
 
-#: pg_dump.c:797
+#: pg_dump.c:827
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -116,21 +104,21 @@ msgstr ""
 "formats.\n"
 "\n"
 
-#: pg_dump.c:798
-#: pg_restore.c:399
-#: pg_dumpall.c:535
+#: pg_dump.c:828
+#: pg_restore.c:397
+#: pg_dumpall.c:529
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: pg_dump.c:799
+#: pg_dump.c:829
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [NOMBASE]\n"
 
-#: pg_dump.c:801
-#: pg_restore.c:402
-#: pg_dumpall.c:538
+#: pg_dump.c:831
+#: pg_restore.c:400
+#: pg_dumpall.c:532
 #, c-format
 msgid ""
 "\n"
@@ -139,53 +127,52 @@ msgstr ""
 "\n"
 "Options générales :\n"
 
-#: pg_dump.c:802
-#: pg_dumpall.c:539
+#: pg_dump.c:832
 #, c-format
-msgid "  -f, --file=FILENAME         output file name\n"
-msgstr "  -f, --file=NOMFICHIER        nom du fichier de sortie\n"
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=NOMFICHIER        nom du fichier ou du répertoire en sortie\n"
 
-#: pg_dump.c:803
+#: pg_dump.c:833
 #, c-format
-msgid "  -F, --format=c|t|p          output file format (custom, tar, plain text)\n"
+msgid "  -F, --format=c|d|t|p        output file format (custom, directory, tar, plain text)\n"
 msgstr ""
-"  -F, --format=c|t|p           format du fichier de sortie (personnalisé,\n"
-"                               tar, texte)\n"
+"  -F, --format=c|d|t|p         format du fichier de sortie (personnalisé,\n"
+"                               répertoire, tar, texte)\n"
 
-#: pg_dump.c:804
+#: pg_dump.c:834
 #, c-format
 msgid "  -v, --verbose               verbose mode\n"
 msgstr "  -v, --verbose                mode verbeux\n"
 
-#: pg_dump.c:805
+#: pg_dump.c:835
 #, c-format
 msgid "  -Z, --compress=0-9          compression level for compressed formats\n"
 msgstr ""
 "  -Z, --compress=0-9           niveau de compression pour les formats\n"
 "                               compressés\n"
 
-#: pg_dump.c:806
-#: pg_dumpall.c:540
+#: pg_dump.c:836
+#: pg_dumpall.c:534
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=DÉLAI    échec après l'attente du DÉLAI pour un verrou\n"
 "                               de table\n"
 
-#: pg_dump.c:807
-#: pg_dumpall.c:541
+#: pg_dump.c:837
+#: pg_dumpall.c:535
 #, c-format
 msgid "  --help                      show this help, then exit\n"
 msgstr "  --help                       affiche cette aide puis quitte\n"
 
-#: pg_dump.c:808
-#: pg_dumpall.c:542
+#: pg_dump.c:838
+#: pg_dumpall.c:536
 #, c-format
 msgid "  --version                   output version information, then exit\n"
 msgstr "  --version                    affiche la version puis quitte\n"
 
-#: pg_dump.c:810
-#: pg_dumpall.c:543
+#: pg_dump.c:840
+#: pg_dumpall.c:537
 #, c-format
 msgid ""
 "\n"
@@ -194,59 +181,59 @@ msgstr ""
 "\n"
 "Options contrôlant le contenu en sortie :\n"
 
-#: pg_dump.c:811
-#: pg_dumpall.c:544
+#: pg_dump.c:841
+#: pg_dumpall.c:538
 #, c-format
 msgid "  -a, --data-only             dump only the data, not the schema\n"
 msgstr ""
 "  -a, --data-only              sauvegarde uniquement les données, pas le\n"
 "                               schéma\n"
 
-#: pg_dump.c:812
+#: pg_dump.c:842
 #, c-format
 msgid "  -b, --blobs                 include large objects in dump\n"
 msgstr ""
 "  -b, --blobs                  inclut les « Large Objects » dans la\n"
 "                               sauvegarde\n"
 
-#: pg_dump.c:813
+#: pg_dump.c:843
 #, c-format
 msgid "  -c, --clean                 clean (drop) database objects before recreating\n"
 msgstr ""
 "  -c, --clean                  nettoie/supprime les bases de données avant de\n"
 "                               les créer\n"
 
-#: pg_dump.c:814
+#: pg_dump.c:844
 #, c-format
 msgid "  -C, --create                include commands to create database in dump\n"
 msgstr ""
 "  -C, --create                 inclut les commandes de création de la base\n"
 "                               dans la sauvegarde\n"
 
-#: pg_dump.c:815
+#: pg_dump.c:845
 #, c-format
 msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
 msgstr ""
 "  -E, --encoding=ENCODAGE      sauvegarde les données dans l'encodage\n"
 "                               ENCODAGE\n"
 
-#: pg_dump.c:816
+#: pg_dump.c:846
 #, c-format
 msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
 msgstr "  -n, --schema=SCHÉMA          sauvegarde uniquement le schéma indiqué\n"
 
-#: pg_dump.c:817
+#: pg_dump.c:847
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
 msgstr "  -N, --exclude-schema=SCHÉMA  ne sauvegarde pas le schéma indiqué\n"
 
-#: pg_dump.c:818
-#: pg_dumpall.c:547
+#: pg_dump.c:848
+#: pg_dumpall.c:541
 #, c-format
 msgid "  -o, --oids                  include OIDs in dump\n"
 msgstr "  -o, --oids                   inclut les OID dans la sauvegarde\n"
 
-#: pg_dump.c:819
+#: pg_dump.c:849
 #, c-format
 msgid ""
 "  -O, --no-owner              skip restoration of object ownership in\n"
@@ -255,63 +242,55 @@ msgstr ""
 "  -O, --no-owner               ne sauvegarde pas les propriétaires des\n"
 "                               objets lors de l'utilisation du format texte\n"
 
-#: pg_dump.c:821
-#: pg_dumpall.c:550
+#: pg_dump.c:851
+#: pg_dumpall.c:544
 #, c-format
 msgid "  -s, --schema-only           dump only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only            sauvegarde uniquement la structure, pas les\n"
 "                               données\n"
 
-#: pg_dump.c:822
+#: pg_dump.c:852
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in plain-text format\n"
 msgstr ""
 "  -S, --superuser=NOM          indique le nom du super-utilisateur à\n"
 "                               utiliser avec le format texte\n"
 
-#: pg_dump.c:823
+#: pg_dump.c:853
 #, c-format
 msgid "  -t, --table=TABLE           dump the named table(s) only\n"
 msgstr "  -t, --table=TABLE            sauvegarde uniquement la table indiquée\n"
 
-#: pg_dump.c:824
+#: pg_dump.c:854
 #, c-format
 msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
 msgstr "  -T, --exclude-table=TABLE    ne sauvegarde pas la table indiquée\n"
 
-#: pg_dump.c:825
-#: pg_dumpall.c:553
+#: pg_dump.c:855
+#: pg_dumpall.c:547
 #, c-format
 msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges          ne sauvegarde pas les droits sur les objets\n"
 
-#: pg_dump.c:826
-#: pg_dumpall.c:554
+#: pg_dump.c:856
+#: pg_dumpall.c:548
 #, c-format
 msgid "  --binary-upgrade            for use by upgrade utilities only\n"
 msgstr ""
 "  --binary-upgrade             à n'utiliser que par les outils de mise à\n"
 "                               jour seulement\n"
 
-#: pg_dump.c:827
-#: pg_dumpall.c:555
-#, c-format
-msgid "  --inserts                   dump data as INSERT commands, rather than COPY\n"
-msgstr ""
-"  -d, --inserts                sauvegarde les données avec des instructions\n"
-"                               INSERT plutôt que COPY\n"
-
-#: pg_dump.c:828
-#: pg_dumpall.c:556
+#: pg_dump.c:857
+#: pg_dumpall.c:549
 #, c-format
 msgid "  --column-inserts            dump data as INSERT commands with column names\n"
 msgstr ""
 "  -D, --column-inserts         sauvegarde les données avec des commandes\n"
 "                               INSERT précisant les noms des colonnes\n"
 
-#: pg_dump.c:829
-#: pg_dumpall.c:557
+#: pg_dump.c:858
+#: pg_dumpall.c:550
 #, c-format
 msgid "  --disable-dollar-quoting    disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
@@ -319,28 +298,61 @@ msgstr ""
 "                               dollar dans le but de respecter le standard\n"
 "                               SQL en matière de guillemets\n"
 
-#: pg_dump.c:830
-#: pg_dumpall.c:558
+#: pg_dump.c:859
+#: pg_dumpall.c:551
 #, c-format
 msgid "  --disable-triggers          disable triggers during data-only restore\n"
 msgstr ""
 "  --disable-triggers           désactive les triggers en mode de\n"
 "                               restauration des données seulement\n"
 
-#: pg_dump.c:831
-#: pg_dumpall.c:559
+#: pg_dump.c:860
+#: pg_dumpall.c:552
+#, c-format
+msgid "  --inserts                   dump data as INSERT commands, rather than COPY\n"
+msgstr ""
+"  -d, --inserts                sauvegarde les données avec des instructions\n"
+"                               INSERT plutôt que COPY\n"
+
+#: pg_dump.c:861
+#: pg_dumpall.c:553
+#, c-format
+msgid "  --no-security-labels        do not dump security label assignments\n"
+msgstr ""
+"  --no-security-labels         ne sauvegarde pas les affectations de labels de\n"
+"                               sécurité\n"
+
+#: pg_dump.c:862
+#: pg_dumpall.c:554
 #, c-format
 msgid "  --no-tablespaces            do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             ne sauvegarde pas les affectations de tablespaces\n"
 
-#: pg_dump.c:832
-#: pg_dumpall.c:560
+#: pg_dump.c:863
+#: pg_dumpall.c:555
 #, c-format
-msgid "  --role=ROLENAME             do SET ROLE before dump\n"
-msgstr "  --role=NOMROLE               exécute SET ROLE avant la sauvegarde\n"
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr ""
+"  --no-unlogged-table-data     ne sauvegarde pas les données des tables non\n"
+"                               tracées\n"
 
-#: pg_dump.c:833
-#: pg_dumpall.c:561
+#: pg_dump.c:864
+#: pg_dumpall.c:556
+#, c-format
+msgid "  --quote-all-identifiers     quote all identifiers, even if not key words\n"
+msgstr ""
+"  --quote-all-identifiers      mettre entre guillemets tous les idendifiants\n"
+"                               même s'il ne s'agit pas de mots clés\n"
+
+#: pg_dump.c:865
+#, c-format
+msgid "  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr ""
+"  --serializable-deferrable    attendre jusqu'à ce que la sauvegarde puisse\n"
+"                               s'exécuter sans anomalies\n"
+
+#: pg_dump.c:866
+#: pg_dumpall.c:557
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -352,9 +364,9 @@ msgstr ""
 "                               au lieu des commandes ALTER OWNER pour les\n"
 "                               modifier les propriétaires\n"
 
-#: pg_dump.c:837
-#: pg_restore.c:441
-#: pg_dumpall.c:565
+#: pg_dump.c:870
+#: pg_restore.c:439
+#: pg_dumpall.c:561
 #, c-format
 msgid ""
 "\n"
@@ -363,48 +375,54 @@ msgstr ""
 "\n"
 "Options de connexion :\n"
 
-#: pg_dump.c:838
-#: pg_restore.c:442
-#: pg_dumpall.c:566
+#: pg_dump.c:871
+#: pg_restore.c:440
+#: pg_dumpall.c:562
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=NOMHÔTE           hôte du serveur de bases de données ou\n"
 "                               répertoire des sockets\n"
 
-#: pg_dump.c:839
-#: pg_restore.c:443
-#: pg_dumpall.c:568
+#: pg_dump.c:872
+#: pg_restore.c:441
+#: pg_dumpall.c:564
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr ""
 "  -p, --port=PORT              numéro de port du serveur de bases de\n"
 "                               données\n"
 
-#: pg_dump.c:840
-#: pg_restore.c:444
-#: pg_dumpall.c:569
+#: pg_dump.c:873
+#: pg_restore.c:442
+#: pg_dumpall.c:565
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NOM           se connecter avec cet utilisateur\n"
 
-#: pg_dump.c:841
-#: pg_restore.c:445
-#: pg_dumpall.c:570
+#: pg_dump.c:874
+#: pg_restore.c:443
+#: pg_dumpall.c:566
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password            ne demande jamais le mot de passe\n"
 
-#: pg_dump.c:842
-#: pg_restore.c:446
-#: pg_dumpall.c:571
+#: pg_dump.c:875
+#: pg_restore.c:444
+#: pg_dumpall.c:567
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password               force la demande du mot de passe (par\n"
 "                               défaut)\n"
 
-#: pg_dump.c:844
+#: pg_dump.c:876
+#: pg_dumpall.c:568
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr "  --role=NOMROLE               exécute SET ROLE avant la sauvegarde\n"
+
+#: pg_dump.c:878
 #, c-format
 msgid ""
 "\n"
@@ -417,225 +435,240 @@ msgstr ""
 "d'environnement PGDATABASE est alors utilisée.\n"
 "\n"
 
-#: pg_dump.c:846
-#: pg_restore.c:449
-#: pg_dumpall.c:575
+#: pg_dump.c:880
+#: pg_restore.c:448
+#: pg_dumpall.c:572
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Rapporter les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:854
-#: pg_backup_archiver.c:1394
+#: pg_dump.c:888
+#: pg_backup_archiver.c:1458
 msgid "*** aborted because of error\n"
 msgstr "*** interrompu du fait d'erreurs\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:930
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "format de sortie « %s » invalide\n"
+
+#: pg_dump.c:953
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr ""
 "le serveur doit être de version 7.3 ou supérieure pour utiliser les options\n"
 "de sélection du schéma\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1211
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "sauvegarde du contenu de la table %s\n"
 
-#: pg_dump.c:1216
+#: pg_dump.c:1331
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr ""
 "La sauvegarde du contenu de la table « %s » a échoué : échec de\n"
 "PQgetCopyData().\n"
 
-#: pg_dump.c:1217
-#: pg_dump.c:12402
+#: pg_dump.c:1332
+#: pg_dump.c:14139
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Message d'erreur du serveur : %s"
 
-#: pg_dump.c:1218
-#: pg_dump.c:12403
+#: pg_dump.c:1333
+#: pg_dump.c:14140
 #, c-format
 msgid "The command was: %s\n"
 msgstr "La commande était : %s\n"
 
-#: pg_dump.c:1624
+#: pg_dump.c:1756
 msgid "saving database definition\n"
 msgstr "sauvegarde de la définition de la base de données\n"
 
-#: pg_dump.c:1706
+#: pg_dump.c:1838
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "entrée manquante dans pg_database pour la base de données « %s »\n"
 
-#: pg_dump.c:1713
+#: pg_dump.c:1845
 #, c-format
 msgid "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr ""
 "la requête a renvoyé plusieurs (%d) entrées pg_database pour la base de\n"
 "données « %s »\n"
 
-#: pg_dump.c:1814
+#: pg_dump.c:1949
 msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
 msgstr "dumpDatabase() : n'a pas pu trouver pg_largeobject.relfrozenxid\n"
 
-#: pg_dump.c:1891
+#: pg_dump.c:1988
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr "dumpDatabase() : n'a pas pu trouver pg_largeobject_metadata.relfrozenxid\n"
+
+#: pg_dump.c:2067
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "encodage de la sauvegarde = %s\n"
 
-#: pg_dump.c:1918
+#: pg_dump.c:2094
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "standard_conforming_strings de la sauvegarde = %s\n"
 
-#: pg_dump.c:1951
+#: pg_dump.c:2127
 msgid "reading large objects\n"
 msgstr "lecture des « Large Objects »\n"
 
-#: pg_dump.c:2078
+#: pg_dump.c:2259
 msgid "saving large objects\n"
 msgstr "sauvegarde des « Large Objects »\n"
 
-#: pg_dump.c:2120
-#: pg_backup_archiver.c:946
+#: pg_dump.c:2301
+#: pg_backup_archiver.c:984
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "n'a pas pu ouvrir le « Large Object » %u : %s"
 
-#: pg_dump.c:2133
+#: pg_dump.c:2314
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "erreur lors de la lecture du « Large Object » %u : %s"
 
-#: pg_dump.c:2180
-#: pg_dump.c:2228
-#: pg_dump.c:2290
-#: pg_dump.c:6911
-#: pg_dump.c:7114
-#: pg_dump.c:7930
-#: pg_dump.c:8468
-#: pg_dump.c:8718
-#: pg_dump.c:8824
-#: pg_dump.c:9209
-#: pg_dump.c:9385
-#: pg_dump.c:9582
-#: pg_dump.c:9809
-#: pg_dump.c:9964
-#: pg_dump.c:10150
-#: pg_dump.c:12208
+#: pg_dump.c:2361
+#: pg_dump.c:2409
+#: pg_dump.c:2464
+#: pg_dump.c:7595
+#: pg_dump.c:7826
+#: pg_dump.c:8792
+#: pg_dump.c:9344
+#: pg_dump.c:9598
+#: pg_dump.c:9712
+#: pg_dump.c:10168
+#: pg_dump.c:10354
+#: pg_dump.c:10460
+#: pg_dump.c:10660
+#: pg_dump.c:10902
+#: pg_dump.c:11069
+#: pg_dump.c:11290
+#: pg_dump.c:13945
 #, c-format
 msgid "query returned %d row instead of one: %s\n"
 msgid_plural "query returned %d rows instead of one: %s\n"
 msgstr[0] "la requête a renvoyé %d ligne au lieu d'une seule : %s\n"
 msgstr[1] "la requête a renvoyé %d lignes au lieu d'une seule : %s\n"
 
-#: pg_dump.c:2435
+#: pg_dump.c:2545
+#, c-format
+msgid "could not find parent extension for %s"
+msgstr "n'a pas pu trouver l'extension parent pour %s"
+
+#: pg_dump.c:2652
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "ATTENTION : le propriétaire du schéma « %s » semble être invalide\n"
 
-#: pg_dump.c:2470
+#: pg_dump.c:2687
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "le schéma d'OID %u n'existe pas\n"
 
-#: pg_dump.c:2727
+#: pg_dump.c:3028
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "ATTENTION : le propriétaire du type de données « %s » semble être invalide\n"
 
-#: pg_dump.c:2831
+#: pg_dump.c:3132
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "ATTENTION : le propriétaire de l'opérateur « %s » semble être invalide\n"
 
-#: pg_dump.c:3005
+#: pg_dump.c:3384
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr ""
 "ATTENTION : le propriétaire de la classe d'opérateur « %s » semble être\n"
 "invalide\n"
 
-#: pg_dump.c:3092
+#: pg_dump.c:3471
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr ""
 "ATTENTION : le propriétaire de la famille d'opérateur « %s » semble être\n"
 "invalide\n"
 
-#: pg_dump.c:3217
+#: pg_dump.c:3608
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr ""
 "ATTENTION : le propriétaire de la fonction d'aggrégat « %s » semble être\n"
 "invalide\n"
 
-#: pg_dump.c:3372
+#: pg_dump.c:3778
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "ATTENTION : le propriétaire de la fonction « %s » semble être invalide\n"
 
-#: pg_dump.c:3805
+#: pg_dump.c:4278
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "ATTENTION : le propriétaire de la table « %s » semble être invalide\n"
 
-#: pg_dump.c:3948
+#: pg_dump.c:4421
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "lecture des index de la table « %s »\n"
 
-#: pg_dump.c:4268
+#: pg_dump.c:4741
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "lecture des contraintes de clés étrangères pour la table « %s »\n"
 
-#: pg_dump.c:4500
+#: pg_dump.c:4973
 #, c-format
 msgid "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not found\n"
 msgstr ""
 "vérification échouée, OID %u de la table parent de l'OID %u de l'entrée de\n"
 "pg_rewrite introuvable\n"
 
-#: pg_dump.c:4584
+#: pg_dump.c:5057
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "lecture des triggers pour la table « %s »\n"
 
-#: pg_dump.c:4747
+#: pg_dump.c:5220
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
 msgstr ""
 "la requête a produit une réference de nom de table null pour le trigger de\n"
 "clé étrangère « %s » sur la table « %s » (OID de la table : %u)\n"
 
-#: pg_dump.c:5117
+#: pg_dump.c:5591
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "recherche des colonnes et types de la table « %s »\n"
 
-#: pg_dump.c:5236
+#: pg_dump.c:5736
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "numérotation des colonnes invalide pour la table « %s »\n"
 
-#: pg_dump.c:5272
+#: pg_dump.c:5773
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "recherche des expressions par défaut de la table « %s »\n"
 
-#: pg_dump.c:5357
+#: pg_dump.c:5858
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "valeur adnum %d invalide pour la table « %s »\n"
 
-#: pg_dump.c:5375
+#: pg_dump.c:5876
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "recherche des contraintes de vérification pour la table « %s »\n"
 
-#: pg_dump.c:5455
+#: pg_dump.c:5956
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d\n"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
@@ -646,123 +679,117 @@ msgstr[1] ""
 "%d contraintes de vérification attendues pour la table « %s » mais %d\n"
 "trouvées\n"
 
-#: pg_dump.c:5459
+#: pg_dump.c:5960
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Les catalogues système sont peut-être corrompus.)\n"
 
-#: pg_dump.c:7241
-#: pg_dump.c:7348
-#, c-format
-msgid "query returned no rows: %s\n"
-msgstr "la requête n'a renvoyé aucune ligne : %s\n"
-
-#: pg_dump.c:7698
+#: pg_dump.c:8558
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "ATTENTION : valeur erronée dans le tableau proargmodes\n"
 
-#: pg_dump.c:8010
+#: pg_dump.c:8872
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proallargtypes\n"
 
-#: pg_dump.c:8026
+#: pg_dump.c:8888
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proargmodes\n"
 
-#: pg_dump.c:8040
+#: pg_dump.c:8902
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proargnames\n"
 
-#: pg_dump.c:8051
+#: pg_dump.c:8913
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "ATTENTION : n'a pas pu analyser le tableau proconfig\n"
 
-#: pg_dump.c:8107
+#: pg_dump.c:8969
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "valeur provolatile non reconnue pour la fonction « %s »\n"
 
-#: pg_dump.c:8310
+#: pg_dump.c:9185
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "ATTENTION : valeur erronée dans pg_cast.castmethod\n"
 
-#: pg_dump.c:8687
+#: pg_dump.c:9567
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "ATTENTION : n'a pas pu trouver l'opérateur d'OID %s\n"
 
-#: pg_dump.c:9608
+#: pg_dump.c:10686
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 msgstr ""
 "ATTENTION : la fonction d'aggrégat %s n'a pas pu être sauvegardée\n"
 " correctement avec cette version de la base de données ; ignorée\n"
 
-#: pg_dump.c:10326
+#: pg_dump.c:11486
 #, c-format
 msgid "unknown object type (%d) in default privileges\n"
 msgstr "type d'objet inconnu (%d) dans les droits par défaut\n"
 
-#: pg_dump.c:10343
+#: pg_dump.c:11503
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "n'a pas pu analyser la liste ACL par défaut (%s)\n"
 
-#: pg_dump.c:10400
+#: pg_dump.c:11560
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "n'a pas pu analyser la liste ACL (%s) de l'objet « %s » (%s)\n"
 
-#: pg_dump.c:10543
+#: pg_dump.c:12000
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr ""
 "la requête permettant d'obtenir la définition de la vue « %s » n'a renvoyé\n"
 "aucune donnée\n"
 
-#: pg_dump.c:10546
+#: pg_dump.c:12003
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr ""
 "la requête permettant d'obtenir la définition de la vue « %s » a renvoyé\n"
 " plusieurs définitions\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:12012
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "la définition de la vue « %s » semble être vide (longueur nulle)\n"
 
-#: pg_dump.c:11031
+#: pg_dump.c:12580
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "numéro de colonne %d invalide pour la table « %s »\n"
 
-#: pg_dump.c:11139
+#: pg_dump.c:12691
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "index manquant pour la contrainte « %s »\n"
 
-#: pg_dump.c:11327
+#: pg_dump.c:12879
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "type de contrainte inconnu : %c\n"
 
-#: pg_dump.c:11390
+#: pg_dump.c:12942
 msgid "missing pg_database entry for this database\n"
 msgstr "entrée pg_database manquante pour cette base de données\n"
 
-#: pg_dump.c:11395
+#: pg_dump.c:12947
 msgid "found more than one pg_database entry for this database\n"
 msgstr "a trouvé plusieurs entrées dans pg_database pour cette base de données\n"
 
-#: pg_dump.c:11427
+#: pg_dump.c:12979
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "n'a pas pu trouver l'entrée de pg_indexes dans pg_class\n"
 
-#: pg_dump.c:11432
+#: pg_dump.c:12984
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "a trouvé plusieurs entrées pour pg_indexes dans la table pg_class\n"
 
-#: pg_dump.c:11503
+#: pg_dump.c:13056
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
@@ -773,653 +800,677 @@ msgstr[1] ""
 "la requête permettant d'obtenir les données de la séquence « %s » a renvoyé\n"
 "%d lignes (une seule attendue)\n"
 
-#: pg_dump.c:11514
+#: pg_dump.c:13067
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr ""
 "la requête permettant d'obtenir les données de la séquence « %s » a renvoyé\n"
 "le nom « %s »\n"
 
-#: pg_dump.c:11808
+#: pg_dump.c:13295
+#, c-format
+msgid "unexpected tgtype value: %d\n"
+msgstr "valeur tgtype inattendue : %d\n"
+
+#: pg_dump.c:13377
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "chaîne argument invalide (%s) pour le trigger « %s » sur la table « %s »\n"
 
-#: pg_dump.c:11924
+#: pg_dump.c:13495
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n"
 msgstr ""
 "la requête permettant d'obtenir la règle « %s » associée à la table « %s »\n"
 "a échoué : mauvais nombre de lignes renvoyées\n"
 
-#: pg_dump.c:12019
+#: pg_dump.c:13752
 msgid "reading dependency data\n"
 msgstr "lecture des données de dépendance\n"
 
-#: pg_dump.c:12397
+#: pg_dump.c:14134
 msgid "SQL command failed\n"
 msgstr "la commande SQL a échoué\n"
 
-#: common.c:115
+#: common.c:105
 msgid "reading schemas\n"
 msgstr "lecture des schémas\n"
 
-#: common.c:119
+#: common.c:115
+msgid "reading user-defined tables\n"
+msgstr "lecture des tables utilisateur\n"
+
+#: common.c:120
+msgid "reading extensions\n"
+msgstr "lecture des extensions\n"
+
+#: common.c:124
 msgid "reading user-defined functions\n"
 msgstr "lecture des fonctions utilisateur\n"
 
-#: common.c:125
+#: common.c:130
 msgid "reading user-defined types\n"
 msgstr "lecture des types utilisateur\n"
 
-#: common.c:131
+#: common.c:136
 msgid "reading procedural languages\n"
 msgstr "lecture des langages procéduraux\n"
 
-#: common.c:135
+#: common.c:140
 msgid "reading user-defined aggregate functions\n"
 msgstr "lecture des fonctions d'aggrégats utilisateur\n"
 
-#: common.c:139
+#: common.c:144
 msgid "reading user-defined operators\n"
 msgstr "lecture des opérateurs utilisateur\n"
 
-#: common.c:144
+#: common.c:149
 msgid "reading user-defined operator classes\n"
 msgstr "lecture des classes d'opérateurs utilisateur\n"
 
-#: common.c:148
+#: common.c:153
+msgid "reading user-defined operator families\n"
+msgstr "lecture des familles d'opérateurs utilisateur\n"
+
+#: common.c:157
 msgid "reading user-defined text search parsers\n"
 msgstr "lecture des analyseurs utilisateur pour la recherche plein texte\n"
 
-#: common.c:152
+#: common.c:161
 msgid "reading user-defined text search templates\n"
 msgstr "lecture des modèles utilisateur pour la recherche plein texte\n"
 
-#: common.c:156
+#: common.c:165
 msgid "reading user-defined text search dictionaries\n"
 msgstr "lecture des dictionnaires utilisateur pour la recherche plein texte\n"
 
-#: common.c:160
+#: common.c:169
 msgid "reading user-defined text search configurations\n"
 msgstr "lecture des configurations utilisateur pour la recherche plein texte\n"
 
-#: common.c:164
+#: common.c:173
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "lecture des wrappers de données distantes utilisateur\n"
 
-#: common.c:168
+#: common.c:177
 msgid "reading user-defined foreign servers\n"
 msgstr "lecture des serveurs distants utilisateur\n"
 
-#: common.c:172
+#: common.c:181
 msgid "reading default privileges\n"
 msgstr "lecture des droits par défaut\n"
 
-#: common.c:176
-msgid "reading user-defined operator families\n"
-msgstr "lecture des familles d'opérateurs utilisateur\n"
+#: common.c:185
+msgid "reading user-defined collations\n"
+msgstr "lecture des collationnements utilisateurs\n"
 
-#: common.c:180
+#: common.c:190
 msgid "reading user-defined conversions\n"
 msgstr "lecture des conversions utilisateur\n"
 
-#: common.c:184
-msgid "reading user-defined tables\n"
-msgstr "lecture des tables utilisateur\n"
+#: common.c:194
+msgid "reading type casts\n"
+msgstr "lecture des transtypages\n"
 
-#: common.c:189
+#: common.c:198
 msgid "reading table inheritance information\n"
 msgstr "lecture des informations d'héritage des tables\n"
 
-#: common.c:193
+#: common.c:202
 msgid "reading rewrite rules\n"
 msgstr "lecture des règles de réécriture\n"
 
-#: common.c:197
-msgid "reading type casts\n"
-msgstr "lecture des transtypages\n"
+#: common.c:211
+msgid "finding extension members\n"
+msgstr "recherche des membres d'extension\n"
 
-#: common.c:202
+#: common.c:216
 msgid "finding inheritance relationships\n"
 msgstr "recherche des relations d'héritage\n"
 
-#: common.c:206
+#: common.c:220
 msgid "reading column info for interesting tables\n"
 msgstr "lecture des informations de colonnes des tables intéressantes\n"
 
-#: common.c:210
+#: common.c:224
 msgid "flagging inherited columns in subtables\n"
 msgstr "marquage des colonnes héritées dans les sous-tables\n"
 
-#: common.c:214
+#: common.c:228
 msgid "reading indexes\n"
 msgstr "lecture des index\n"
 
-#: common.c:218
+#: common.c:232
 msgid "reading constraints\n"
 msgstr "lecture des contraintes\n"
 
-#: common.c:222
+#: common.c:236
 msgid "reading triggers\n"
 msgstr "lecture des déclencheurs\n"
 
-#: common.c:802
+#: common.c:828
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr "vérification échouée, OID %u parent de la table « %s » (OID %u) introuvable\n"
 
-#: common.c:844
+#: common.c:870
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "n'a pas pu analyser le tableau numérique « %s » : trop de nombres\n"
 
-#: common.c:859
+#: common.c:885
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr ""
 "n'a pas pu analyser le tableau numérique « %s » : caractère invalide dans\n"
 "le nombre\n"
 
-#: common.c:972
+#: common.c:998
 msgid "cannot duplicate null pointer\n"
 msgstr "ne peut pas dupliquer un pointeur nul\n"
 
-#: common.c:975
-#: common.c:986
-#: common.c:997
-#: common.c:1008
-#: pg_backup_archiver.c:727
-#: pg_backup_archiver.c:1096
-#: pg_backup_archiver.c:1227
-#: pg_backup_archiver.c:1694
-#: pg_backup_archiver.c:1851
-#: pg_backup_archiver.c:1897
-#: pg_backup_archiver.c:4029
-#: pg_backup_custom.c:144
-#: pg_backup_custom.c:149
-#: pg_backup_custom.c:155
-#: pg_backup_custom.c:170
-#: pg_backup_custom.c:570
-#: pg_backup_custom.c:1113
-#: pg_backup_custom.c:1122
-#: pg_backup_db.c:154
-#: pg_backup_db.c:164
-#: pg_backup_db.c:212
-#: pg_backup_db.c:256
-#: pg_backup_db.c:271
-#: pg_backup_db.c:305
+#: common.c:1001
+#: common.c:1012
+#: common.c:1023
+#: common.c:1034
+#: pg_backup_archiver.c:764
+#: pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955
+#: pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209
+#: pg_backup_custom.c:132
+#: pg_backup_custom.c:139
+#: pg_backup_custom.c:780
+#: pg_backup_custom.c:907
+#: pg_backup_db.c:147
+#: pg_backup_db.c:157
+#: pg_backup_db.c:205
+#: pg_backup_db.c:249
+#: pg_backup_db.c:264
+#: pg_backup_db.c:298
+#: pg_backup_db.c:403
 #: pg_backup_files.c:114
 #: pg_backup_null.c:72
-#: pg_backup_tar.c:167
-#: pg_backup_tar.c:1011
+#: pg_backup_tar.c:171
+#: pg_backup_tar.c:1015
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
 
-#: pg_backup_archiver.c:80
+#: pg_backup_archiver.c:88
 msgid "archiver"
 msgstr "archiveur"
 
-#: pg_backup_archiver.c:195
-#: pg_backup_archiver.c:1191
+#: pg_backup_archiver.c:207
+#: pg_backup_archiver.c:1259
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "n'a pas pu fermer le fichier de sortie : %s\n"
 
-#: pg_backup_archiver.c:220
+#: pg_backup_archiver.c:233
 msgid "-C and -c are incompatible options\n"
 msgstr "-C et -c sont des options incompatibles\n"
 
-#: pg_backup_archiver.c:227
+#: pg_backup_archiver.c:240
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C et -1 sont des options incompatibles\n"
 
-#: pg_backup_archiver.c:239
+#: pg_backup_archiver.c:250
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr ""
+"la restauration parallèle n'est pas supportée avec ce format de fichier\n"
+"d'archive\n"
+
+#: pg_backup_archiver.c:254
+msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr ""
+"la restauration parallèle n'est pas supportée avec les archives réalisées\n"
+"par un pg_dump antérieur à la 8.0 d'archive\n"
+
+#: pg_backup_archiver.c:273
 msgid "cannot restore from compressed archive (compression not supported in this installation)\n"
 msgstr ""
 "ne peut pas restaurer à partir de l'archive compressée (compression non\n"
 "disponible dans cette installation)\n"
 
-#: pg_backup_archiver.c:249
+#: pg_backup_archiver.c:283
 msgid "connecting to database for restore\n"
 msgstr "connexion à la base de données pour la restauration\n"
 
-#: pg_backup_archiver.c:251
+#: pg_backup_archiver.c:285
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr ""
 "les connexions directes à la base de données ne sont pas supportées dans\n"
 "les archives pre-1.3\n"
 
-#: pg_backup_archiver.c:293
+#: pg_backup_archiver.c:327
 msgid "implied data-only restore\n"
 msgstr "a impliqué une restauration des données uniquement\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:379
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "suppression de %s %s\n"
 
-#: pg_backup_archiver.c:396
+#: pg_backup_archiver.c:431
 #, c-format
 msgid "setting owner and privileges for %s %s\n"
 msgstr "réglage du propriétaire et des droits pour %s %s\n"
 
-#: pg_backup_archiver.c:454
-#: pg_backup_archiver.c:456
+#: pg_backup_archiver.c:489
+#: pg_backup_archiver.c:491
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "message d'avertissement du fichier de sauvegarde original : %s\n"
 
-#: pg_backup_archiver.c:463
+#: pg_backup_archiver.c:498
 #, c-format
 msgid "creating %s %s\n"
 msgstr "création de %s %s\n"
 
-#: pg_backup_archiver.c:507
+#: pg_backup_archiver.c:542
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "connexion à la nouvelle base de données « %s »\n"
 
-#: pg_backup_archiver.c:535
+#: pg_backup_archiver.c:570
 #, c-format
 msgid "restoring %s\n"
 msgstr "restauration de %s\n"
 
-#: pg_backup_archiver.c:549
+#: pg_backup_archiver.c:584
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "restauration des données de la table « %s »\n"
 
-#: pg_backup_archiver.c:609
+#: pg_backup_archiver.c:646
 #, c-format
 msgid "executing %s %s\n"
 msgstr "exécution de %s %s\n"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:679
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "désactivation des déclencheurs pour %s\n"
 
-#: pg_backup_archiver.c:668
+#: pg_backup_archiver.c:705
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "activation des triggers pour %s\n"
 
-#: pg_backup_archiver.c:698
+#: pg_backup_archiver.c:735
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr ""
 "erreur interne -- WriteData ne peut pas être appelé en dehors du contexte\n"
 "de la routine DataDumper\n"
 
-#: pg_backup_archiver.c:854
+#: pg_backup_archiver.c:892
 msgid "large-object output not supported in chosen format\n"
 msgstr "la sauvegarde des « Large Objects » n'est pas supportée dans le format choisi\n"
 
-#: pg_backup_archiver.c:908
+#: pg_backup_archiver.c:946
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "restauration de %d « Large Object »\n"
 msgstr[1] "restauration de %d « Large Objects »\n"
 
-#: pg_backup_archiver.c:929
+#: pg_backup_archiver.c:967
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "restauration du « Large Object » d'OID %u\n"
 
-#: pg_backup_archiver.c:941
+#: pg_backup_archiver.c:979
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "n'a pas pu créer le « Large Object » %u : %s"
 
-#: pg_backup_archiver.c:1010
+#: pg_backup_archiver.c:1041
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le fichier TOC « %s » : %s\n"
 
-#: pg_backup_archiver.c:1029
+#: pg_backup_archiver.c:1082
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "ATTENTION : ligne ignorée : %s\n"
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1089
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "n'a pas pu trouver l'entrée pour l'ID %d\n"
 
-#: pg_backup_archiver.c:1046
+#: pg_backup_archiver.c:1110
 #: pg_backup_files.c:172
 #: pg_backup_files.c:457
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "n'a pas pu fermer le fichier TOC : %s\n"
 
-#: pg_backup_archiver.c:1170
-#: pg_backup_custom.c:181
+#: pg_backup_archiver.c:1229
+#: pg_backup_custom.c:152
 #: pg_backup_files.c:130
 #: pg_backup_files.c:262
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le fichier de sauvegarde « %s » : %s\n"
 
-#: pg_backup_archiver.c:1173
-#: pg_backup_custom.c:188
+#: pg_backup_archiver.c:1232
+#: pg_backup_custom.c:159
 #: pg_backup_files.c:137
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "n'a pas pu ouvrir le fichier de sauvegarde : %s\n"
 
-#: pg_backup_archiver.c:1270
+#: pg_backup_archiver.c:1334
 #, c-format
 msgid "wrote %lu byte of large object data (result = %lu)\n"
 msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr[0] "a écrit %lu octet de données d'un « Large Object » (résultat = %lu)\n"
 msgstr[1] "a écrit %lu octets de données d'un « Large Object » (résultat = %lu)\n"
 
-#: pg_backup_archiver.c:1276
+#: pg_backup_archiver.c:1340
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "n'a pas pu écrire le « Large Object » (résultat : %lu, attendu : %lu)\n"
 
-#: pg_backup_archiver.c:1334
-#: pg_backup_archiver.c:1357
-#: pg_backup_custom.c:781
-#: pg_backup_custom.c:1035
-#: pg_backup_custom.c:1049
+#: pg_backup_archiver.c:1398
+#: pg_backup_archiver.c:1421
+#: pg_backup_custom.c:652
 #: pg_backup_files.c:432
-#: pg_backup_tar.c:586
-#: pg_backup_tar.c:1089
-#: pg_backup_tar.c:1382
+#: pg_backup_tar.c:590
+#: pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
 #, c-format
 msgid "could not write to output file: %s\n"
 msgstr "n'a pas pu écrire dans le fichier de sauvegarde : %s\n"
 
-#: pg_backup_archiver.c:1342
+#: pg_backup_archiver.c:1406
 msgid "could not write to custom output routine\n"
 msgstr "n'a pas pu écrire vers la routine de sauvegarde personnalisée\n"
 
-#: pg_backup_archiver.c:1440
+#: pg_backup_archiver.c:1504
 msgid "Error while INITIALIZING:\n"
 msgstr "Erreur pendant l'initialisation (« INITIALIZING ») :\n"
 
-#: pg_backup_archiver.c:1445
+#: pg_backup_archiver.c:1509
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Erreur pendant le traitement de la TOC (« PROCESSING TOC ») :\n"
 
-#: pg_backup_archiver.c:1450
+#: pg_backup_archiver.c:1514
 msgid "Error while FINALIZING:\n"
 msgstr "Erreur pendant la finalisation (« FINALIZING ») :\n"
 
-#: pg_backup_archiver.c:1455
+#: pg_backup_archiver.c:1519
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Erreur à partir de l'entrée TOC %d ; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1587
+#: pg_backup_archiver.c:1654
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "drapeau de décalage de données inattendu %d\n"
 
-#: pg_backup_archiver.c:1600
+#: pg_backup_archiver.c:1667
 msgid "file offset in dump file is too large\n"
 msgstr "le décalage dans le fichier de sauvegarde est trop important\n"
 
-#: pg_backup_archiver.c:1697
-#: pg_backup_archiver.c:2998
-#: pg_backup_custom.c:757
+#: pg_backup_archiver.c:1764
+#: pg_backup_archiver.c:3113
+#: pg_backup_custom.c:630
 #: pg_backup_files.c:419
-#: pg_backup_tar.c:785
+#: pg_backup_tar.c:789
 msgid "unexpected end of file\n"
 msgstr "fin de fichier inattendu\n"
 
-#: pg_backup_archiver.c:1714
+#: pg_backup_archiver.c:1781
 msgid "attempting to ascertain archive format\n"
 msgstr "tentative d'identification du format de l'archive\n"
 
-#: pg_backup_archiver.c:1730
-#: pg_backup_custom.c:200
-#: pg_backup_custom.c:888
+#: pg_backup_archiver.c:1807
+#: pg_backup_archiver.c:1817
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "nom du répertoire trop long : « %s »\n"
+
+#: pg_backup_archiver.c:1825
+#, c-format
+msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)\n"
+msgstr "le répertoire « %s » ne semble pas être une archive valide (« toc.dat » n'existe pas)\n"
+
+#: pg_backup_archiver.c:1833
+#: pg_backup_custom.c:171
+#: pg_backup_custom.c:762
 #: pg_backup_files.c:155
 #: pg_backup_files.c:307
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le fichier en entrée « %s » : %s\n"
 
-#: pg_backup_archiver.c:1737
-#: pg_backup_custom.c:207
+#: pg_backup_archiver.c:1841
+#: pg_backup_custom.c:178
 #: pg_backup_files.c:162
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "n'a pas pu ouvrir le fichier en entrée : %s\n"
 
-#: pg_backup_archiver.c:1746
+#: pg_backup_archiver.c:1850
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "n'a pas pu lire le fichier en entrée : %s\n"
 
-#: pg_backup_archiver.c:1748
+#: pg_backup_archiver.c:1852
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "le fichier en entrée est trop petit (%lu lus, 5 attendus)\n"
 
-#: pg_backup_archiver.c:1806
+#: pg_backup_archiver.c:1910
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "le fichier en entrée ne semble pas être une archive valide (trop petit ?)\n"
 
-#: pg_backup_archiver.c:1809
+#: pg_backup_archiver.c:1913
 msgid "input file does not appear to be a valid archive\n"
 msgstr "le fichier en entrée ne semble pas être une archive valide\n"
 
-#: pg_backup_archiver.c:1829
+#: pg_backup_archiver.c:1933
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "n'a pas pu fermer le fichier en entrée : %s\n"
 
-#: pg_backup_archiver.c:1846
+#: pg_backup_archiver.c:1950
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "allocation d'AH pour %s, format %d\n"
 
-#: pg_backup_archiver.c:1954
+#: pg_backup_archiver.c:2059
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "format de fichier « %d » non reconnu\n"
 
-#: pg_backup_archiver.c:2076
+#: pg_backup_archiver.c:2181
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "ID %d de l'entrée en dehors de la plage -- peut-être un TOC corrompu\n"
 
-#: pg_backup_archiver.c:2192
+#: pg_backup_archiver.c:2297
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "lecture de l'entrée %d de la TOC (ID %d) pour %s %s\n"
 
-#: pg_backup_archiver.c:2226
+#: pg_backup_archiver.c:2331
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "encodage « %s » non reconnu\n"
 
-#: pg_backup_archiver.c:2231
+#: pg_backup_archiver.c:2336
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "élément ENCODING invalide : %s\n"
 
-#: pg_backup_archiver.c:2249
+#: pg_backup_archiver.c:2354
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "élément STDSTRINGS invalide : %s\n"
 
-#: pg_backup_archiver.c:2441
+#: pg_backup_archiver.c:2552
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "n'a pas pu initialiser la session utilisateur à « %s »: %s"
 
-#: pg_backup_archiver.c:2779
-#: pg_backup_archiver.c:2929
+#: pg_backup_archiver.c:2892
+#: pg_backup_archiver.c:3044
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr "ATTENTION : ne sait pas comment initialiser le propriétaire du type d'objet %s\n"
 
-#: pg_backup_archiver.c:2961
+#: pg_backup_archiver.c:3076
 msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
 msgstr ""
 "ATTENTION : la compression requise n'est pas disponible avec cette\n"
 "installation -- l'archive ne sera pas compressée\n"
 
-#: pg_backup_archiver.c:3001
+#: pg_backup_archiver.c:3116
 msgid "did not find magic string in file header\n"
 msgstr "n'a pas trouver la chaîne magique dans le fichier d'en-tête\n"
 
-#: pg_backup_archiver.c:3014
+#: pg_backup_archiver.c:3129
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "version non supportée (%d.%d) dans le fichier d'en-tête\n"
 
-#: pg_backup_archiver.c:3019
+#: pg_backup_archiver.c:3134
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "échec de la vérification sur la taille de l'entier (%lu)\n"
 
-#: pg_backup_archiver.c:3023
+#: pg_backup_archiver.c:3138
 msgid "WARNING: archive was made on a machine with larger integers, some operations might fail\n"
 msgstr ""
 "ATTENTION : l'archive a été créée sur une machine disposant d'entiers plus\n"
 "larges, certaines opérations peuvent échouer\n"
 
-#: pg_backup_archiver.c:3033
+#: pg_backup_archiver.c:3148
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "le format attendu (%d) diffère du format du fichier (%d)\n"
 
-#: pg_backup_archiver.c:3049
+#: pg_backup_archiver.c:3164
 msgid "WARNING: archive is compressed, but this installation does not support compression -- no data will be available\n"
 msgstr ""
 "ATTENTION : l'archive est compressée mais cette installation ne supporte\n"
 "pas la compression -- aucune donnée ne sera disponible\n"
 
-#: pg_backup_archiver.c:3067
+#: pg_backup_archiver.c:3182
 msgid "WARNING: invalid creation date in header\n"
 msgstr "ATTENTION : date de création invalide dans l'en-tête\n"
 
-#: pg_backup_archiver.c:3164
+#: pg_backup_archiver.c:3280
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "entrée dans restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3168
-msgid "parallel restore is not supported with this archive file format\n"
-msgstr ""
-"la restauration parallèle n'est pas supportée avec ce format de fichier\n"
-"d'archive\n"
-
-#: pg_backup_archiver.c:3172
-msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
-msgstr ""
-"la restauration parallèle n'est pas supportée avec les archives réalisées\n"
-"par un pg_dump antérieur à la 8.0 d'archive\n"
-
-#: pg_backup_archiver.c:3191
+#: pg_backup_archiver.c:3321
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "traitement de l'élément %d %s %s\n"
 
-#: pg_backup_archiver.c:3247
+#: pg_backup_archiver.c:3397
 msgid "entering main parallel loop\n"
 msgstr "entrée dans la boucle parallèle principale\n"
 
-#: pg_backup_archiver.c:3261
+#: pg_backup_archiver.c:3411
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "omission de l'élément %d %s %s\n"
 
-#: pg_backup_archiver.c:3277
+#: pg_backup_archiver.c:3427
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "élément de lancement %d %s %s\n"
 
-#: pg_backup_archiver.c:3314
+#: pg_backup_archiver.c:3464
 #, c-format
 msgid "worker process crashed: status %d\n"
 msgstr "crash du processus worker : statut %d\n"
 
-#: pg_backup_archiver.c:3319
+#: pg_backup_archiver.c:3469
 msgid "finished main parallel loop\n"
 msgstr "fin de la boucle parallèle principale\n"
 
-#: pg_backup_archiver.c:3337
+#: pg_backup_archiver.c:3487
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "traitement de l'élément manquant %d %s %s\n"
 
-#: pg_backup_archiver.c:3363
+#: pg_backup_archiver.c:3513
 msgid "parallel_restore should not return\n"
 msgstr "parallel_restore ne devrait pas retourner\n"
 
-#: pg_backup_archiver.c:3369
+#: pg_backup_archiver.c:3519
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "n'a pas pu créer le processus de travail : %s\n"
 
-#: pg_backup_archiver.c:3377
+#: pg_backup_archiver.c:3527
 #, c-format
 msgid "could not create worker thread: %s\n"
 msgstr "n'a pas pu créer le fil de travail: %s\n"
 
-#: pg_backup_archiver.c:3601
+#: pg_backup_archiver.c:3751
 msgid "no item ready\n"
 msgstr "aucun élément prêt\n"
 
-#: pg_backup_archiver.c:3696
+#: pg_backup_archiver.c:3846
 msgid "could not find slot of finished worker\n"
 msgstr "n'a pas pu trouver l'emplacement du worker qui vient de terminer\n"
 
-#: pg_backup_archiver.c:3698
+#: pg_backup_archiver.c:3848
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "élément terminé %d %s %s\n"
 
-#: pg_backup_archiver.c:3711
+#: pg_backup_archiver.c:3861
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "échec du processus de travail : code de sortie %d\n"
 
-#: pg_backup_archiver.c:3863
+#: pg_backup_archiver.c:4057
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "transfert de la dépendance %d -> %d vers %d\n"
 
-#: pg_backup_archiver.c:3937
+#: pg_backup_archiver.c:4126
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "réduction des dépendances pour %d\n"
 
-#: pg_backup_archiver.c:3995
+#: pg_backup_archiver.c:4175
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "la table « %s » n'a pas pu être créée, ses données ne seront pas restaurées\n"
 
-#: pg_backup_custom.c:97
+#: pg_backup_custom.c:87
 msgid "custom archiver"
 msgstr "programme d'archivage personnalisé"
 
-#: pg_backup_custom.c:405
+#: pg_backup_custom.c:373
 #: pg_backup_null.c:153
 msgid "invalid OID for large object\n"
 msgstr "OID invalide pour le « Large Object »\n"
 
-#: pg_backup_custom.c:471
+#: pg_backup_custom.c:444
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr ""
 "type de bloc de données non reconnu (%d) lors de la recherche dans\n"
 "l'archive\n"
 
-#: pg_backup_custom.c:482
+#: pg_backup_custom.c:455
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "erreur lors du parcours du fichier : %s\n"
 
-#: pg_backup_custom.c:492
+#: pg_backup_custom.c:465
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to lack of data offsets in archive\n"
 msgstr ""
@@ -1428,7 +1479,7 @@ msgstr ""
 "différent, qui n'a pas pu être géré à cause d'un manque d'information de\n"
 "position dans l'archive\n"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:470
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file\n"
 msgstr ""
@@ -1437,182 +1488,160 @@ msgstr ""
 "différent, ce qui ne peut pas être géré à cause d'un fichier non gérable en\n"
 "recherche\n"
 
-#: pg_backup_custom.c:502
+#: pg_backup_custom.c:475
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
 msgstr ""
 "n'a pas pu trouver l'identifiant de bloc %d dans l'archive -\n"
 "possible corruption de l'archive\n"
 
-#: pg_backup_custom.c:509
+#: pg_backup_custom.c:482
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
 msgstr "ID de bloc inattendu (%d) lors de la lecture des données -- %d attendu\n"
 
-#: pg_backup_custom.c:523
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr "type de bloc de données %d non reconnu lors de la restauration de l'archive\n"
 
-#: pg_backup_custom.c:557
-#: pg_backup_custom.c:985
-#, c-format
-msgid "could not initialize compression library: %s\n"
-msgstr "n'a pas pu initialiser la bibliothèque de compression : %s\n"
-
-#: pg_backup_custom.c:581
-#: pg_backup_custom.c:705
+#: pg_backup_custom.c:578
+#: pg_backup_custom.c:916
 msgid "could not read from input file: end of file\n"
 msgstr "n'a pas pu lire à partir du fichier en entrée : fin du fichier\n"
 
-#: pg_backup_custom.c:584
-#: pg_backup_custom.c:708
+#: pg_backup_custom.c:581
+#: pg_backup_custom.c:919
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "n'a pas pu lire à partir du fichier en entrée : %s\n"
 
-#: pg_backup_custom.c:601
-#: pg_backup_custom.c:628
-#, c-format
-msgid "could not uncompress data: %s\n"
-msgstr "n'a pas pu décompresser les données : %s\n"
-
-#: pg_backup_custom.c:634
-#, c-format
-msgid "could not close compression library: %s\n"
-msgstr "n'a pas pu fermer la bibliothèque de compression : %s\n"
-
-#: pg_backup_custom.c:736
+#: pg_backup_custom.c:610
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "n'a pas pu écrire un octet : %s\n"
 
-#: pg_backup_custom.c:849
-#: pg_backup_custom.c:882
+#: pg_backup_custom.c:718
+#: pg_backup_custom.c:756
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "n'a pas pu fermer le fichier d'archive : %s\n"
 
-#: pg_backup_custom.c:868
+#: pg_backup_custom.c:737
 msgid "can only reopen input archives\n"
 msgstr "peut seulement rouvrir l'archive en entrée\n"
 
-#: pg_backup_custom.c:870
-msgid "cannot reopen stdin\n"
-msgstr "ne peut pas rouvrir stdin\n"
+#: pg_backup_custom.c:744
+msgid "parallel restore from stdin is not supported\n"
+msgstr "la restauration parallélisée n'est pas supportée à partir de stdin\n"
 
-#: pg_backup_custom.c:872
-msgid "cannot reopen non-seekable file\n"
-msgstr "ne peut pas rouvrir le fichier non cherchable\n"
+#: pg_backup_custom.c:746
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr "la restauration parallélisée n'est pas supportée à partir de fichiers sans table de matière\n"
 
-#: pg_backup_custom.c:877
+#: pg_backup_custom.c:751
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr "n'a pas pu déterminer la position de recherche dans le fichier d'archive : %s\n"
 
-#: pg_backup_custom.c:892
+#: pg_backup_custom.c:766
 #, c-format
 msgid "could not set seek position in archive file: %s\n"
 msgstr "n'a pas pu initialiser la recherche de position dans le fichier d'archive : %s\n"
 
-#: pg_backup_custom.c:914
+#: pg_backup_custom.c:786
+msgid "compressor active\n"
+msgstr "compression activée\n"
+
+#: pg_backup_custom.c:822
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr "ATTENTION : ftell ne correspond pas à la position attendue -- ftell utilisé\n"
 
-#: pg_backup_custom.c:1016
-#, c-format
-msgid "could not compress data: %s\n"
-msgstr "n'a pas pu compresser les données : %s\n"
-
-#: pg_backup_custom.c:1094
-#, c-format
-msgid "could not close compression stream: %s\n"
-msgstr "n'a pas pu fermer le flux de compression : %s\n"
-
 #: pg_backup_db.c:25
 msgid "archiver (db)"
 msgstr "programme d'archivage (db)"
 
-#: pg_backup_db.c:61
+#: pg_backup_db.c:54
 msgid "could not get server_version from libpq\n"
 msgstr "n'a pas pu obtenir server_version de libpq\n"
 
-#: pg_backup_db.c:74
-#: pg_dumpall.c:1717
+#: pg_backup_db.c:67
+#: pg_dumpall.c:1741
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "version du serveur : %s ; %s version : %s\n"
 
-#: pg_backup_db.c:76
-#: pg_dumpall.c:1719
+#: pg_backup_db.c:69
+#: pg_dumpall.c:1743
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "annulation à cause de la différence des versions\n"
 
-#: pg_backup_db.c:147
+#: pg_backup_db.c:140
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "connexion à la base de données « %s » en tant qu'utilisateur « %s »\n"
 
-#: pg_backup_db.c:152
-#: pg_backup_db.c:207
-#: pg_backup_db.c:254
-#: pg_backup_db.c:303
-#: pg_dumpall.c:1613
-#: pg_dumpall.c:1665
+#: pg_backup_db.c:145
+#: pg_backup_db.c:200
+#: pg_backup_db.c:247
+#: pg_backup_db.c:296
+#: pg_dumpall.c:1637
+#: pg_dumpall.c:1689
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: pg_backup_db.c:188
+#: pg_backup_db.c:181
 msgid "failed to reconnect to database\n"
 msgstr "la reconnexion à la base de données a échoué\n"
 
-#: pg_backup_db.c:193
+#: pg_backup_db.c:186
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "n'a pas pu se reconnecter à la base de données : %s"
 
-#: pg_backup_db.c:209
+#: pg_backup_db.c:202
 msgid "connection needs password\n"
 msgstr "la connexion nécessite un mot de passe\n"
 
-#: pg_backup_db.c:250
+#: pg_backup_db.c:243
 msgid "already connected to a database\n"
 msgstr "déjà connecté à une base de données\n"
 
-#: pg_backup_db.c:295
+#: pg_backup_db.c:288
 msgid "failed to connect to database\n"
 msgstr "n'a pas pu se connecter à la base de données\n"
 
-#: pg_backup_db.c:314
+#: pg_backup_db.c:307
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "la connexion à la base de données « %s » a échoué : %s"
 
-#: pg_backup_db.c:329
+#: pg_backup_db.c:322
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:441
+#: pg_backup_db.c:387
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "erreur renvoyée par PQputCopyData : %s"
 
-#: pg_backup_db.c:451
+#: pg_backup_db.c:397
+#: pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "n'a pas pu exécuter la requête"
+
+#: pg_backup_db.c:425
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "erreur renvoyée par PQputCopyEnd : %s"
 
-#: pg_backup_db.c:498
-msgid "could not execute query"
-msgstr "n'a pas pu exécuter la requête"
-
-#: pg_backup_db.c:696
+#: pg_backup_db.c:442
 msgid "could not start database transaction"
 msgstr "n'a pas pu démarrer la transaction de la base de données"
 
-#: pg_backup_db.c:702
+#: pg_backup_db.c:448
 msgid "could not commit database transaction"
 msgstr "n'a pas pu valider la transaction de la base de données"
 
@@ -1660,7 +1689,7 @@ msgid "could not open large object TOC for output: %s\n"
 msgstr "n'a pas pu ouvrir la TOC du « Large Object » en sortie : %s\n"
 
 #: pg_backup_files.c:510
-#: pg_backup_tar.c:935
+#: pg_backup_tar.c:939
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "OID invalide pour le « Large Object » (%u)\n"
@@ -1678,120 +1707,120 @@ msgstr "n'a pas pu fermer le fichier du 
 msgid "this format cannot be read\n"
 msgstr "ce format ne peut pas être lu\n"
 
-#: pg_backup_tar.c:101
+#: pg_backup_tar.c:105
 msgid "tar archiver"
 msgstr "archiveur tar"
 
-#: pg_backup_tar.c:179
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
 msgstr "n'a pas pu ouvrir le fichier TOC « %s » en sortie : %s\n"
 
-#: pg_backup_tar.c:187
+#: pg_backup_tar.c:191
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "n'a pas pu ouvrir le fichier TOC en sortie : %s\n"
 
-#: pg_backup_tar.c:214
-#: pg_backup_tar.c:370
+#: pg_backup_tar.c:218
+#: pg_backup_tar.c:374
 msgid "compression is not supported by tar archive format\n"
 msgstr "compression non supportée par le format des archives tar\n"
 
-#: pg_backup_tar.c:222
+#: pg_backup_tar.c:226
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
 msgstr "n'a pas pu ouvrir le fichier TOC « %s » en entrée : %s\n"
 
-#: pg_backup_tar.c:229
+#: pg_backup_tar.c:233
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "n'a pas pu ouvrir le fichier TOC en entrée : %s\n"
 
-#: pg_backup_tar.c:356
+#: pg_backup_tar.c:360
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
 msgstr "n'a pas pu trouver le fichier « %s » dans l'archive\n"
 
-#: pg_backup_tar.c:412
+#: pg_backup_tar.c:416
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "impossible de créer le nom du fichier temporaire : %s\n"
 
-#: pg_backup_tar.c:421
+#: pg_backup_tar.c:425
 msgid "could not open temporary file\n"
 msgstr "n'a pas pu ouvrir le fichier temporaire\n"
 
-#: pg_backup_tar.c:448
+#: pg_backup_tar.c:452
 msgid "could not close tar member\n"
 msgstr "n'a pas pu fermer le membre de tar\n"
 
-#: pg_backup_tar.c:548
+#: pg_backup_tar.c:552
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "erreur interne -- ni th ni fh ne sont précisés dans tarReadRaw()\n"
 
-#: pg_backup_tar.c:674
+#: pg_backup_tar.c:678
 #, c-format
 msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
 msgstr "instruction COPY invalide -- n'a pas pu trouver « copy » dans la chaîne « %s »\n"
 
-#: pg_backup_tar.c:692
+#: pg_backup_tar.c:696
 #, c-format
 msgid "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" starting at position %lu\n"
 msgstr ""
 "instruction COPY invalide -- n'a pas pu trouver « from stdin » dans la\n"
 "chaîne « %s » à partir de la position %lu\n"
 
-#: pg_backup_tar.c:729
+#: pg_backup_tar.c:733
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "restauration du « Large Object » d'OID %u\n"
 
-#: pg_backup_tar.c:880
+#: pg_backup_tar.c:884
 msgid "could not write null block at end of tar archive\n"
 msgstr "n'a pas pu écrire le bloc nul à la fin de l'archive tar\n"
 
-#: pg_backup_tar.c:1080
+#: pg_backup_tar.c:1084
 msgid "archive member too large for tar format\n"
 msgstr "membre de l'archive trop volumineux pour le format tar\n"
 
-#: pg_backup_tar.c:1095
+#: pg_backup_tar.c:1099
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "n'a pas pu ouvrir le fichier temporaire : %s\n"
 
-#: pg_backup_tar.c:1105
+#: pg_backup_tar.c:1109
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr ""
 "la longueur réelle du fichier (%s) ne correspond pas à ce qui était attendu\n"
 "(%s)\n"
 
-#: pg_backup_tar.c:1113
+#: pg_backup_tar.c:1117
 msgid "could not output padding at end of tar member\n"
 msgstr "n'a pas pu remplir la fin du membre de tar\n"
 
-#: pg_backup_tar.c:1142
+#: pg_backup_tar.c:1146
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "déplacement de la position %s vers le prochain membre à la position %s du fichier\n"
 
-#: pg_backup_tar.c:1153
+#: pg_backup_tar.c:1157
 #, c-format
 msgid "now at file position %s\n"
 msgstr "maintenant en position %s du fichier\n"
 
-#: pg_backup_tar.c:1162
-#: pg_backup_tar.c:1192
+#: pg_backup_tar.c:1166
+#: pg_backup_tar.c:1196
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
 msgstr "n'a pas pu trouver l'en-tête du fichier « %s » dans l'archive tar\n"
 
-#: pg_backup_tar.c:1176
+#: pg_backup_tar.c:1180
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "omission du membre %s du tar\n"
 
-#: pg_backup_tar.c:1180
+#: pg_backup_tar.c:1184
 #, c-format
 msgid "restoring data out of order is not supported in this archive format: \"%s\" is required, but comes before \"%s\" in the archive file.\n"
 msgstr ""
@@ -1799,57 +1828,57 @@ msgstr ""
 "d'archive : « %s » est requis mais vient avant « %s » dans le fichier\n"
 "d'archive.\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1230
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr ""
 "pas de correspondance entre la position réelle et celle prévue du fichier\n"
 "(%s vs. %s)\n"
 
-#: pg_backup_tar.c:1241
+#: pg_backup_tar.c:1245
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "en-tête incomplet du fichier tar (%lu octet)\n"
 msgstr[1] "en-tête incomplet du fichier tar (%lu octets)\n"
 
-#: pg_backup_tar.c:1279
+#: pg_backup_tar.c:1283
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "entrée TOC %s à %s (longueur %lu, somme de contrôle %d)\n"
 
-#: pg_backup_tar.c:1289
+#: pg_backup_tar.c:1293
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr ""
 "en-tête tar corrompu trouvé dans %s (%d attendu, %d calculé ) à la\n"
 "position %s du fichier\n"
 
-#: pg_restore.c:308
+#: pg_restore.c:300
 #, c-format
 msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
 msgstr ""
 "%s : les options « -d/--dbname » et « -f/--file » ne peuvent pas être\n"
 "utilisées conjointement\n"
 
-#: pg_restore.c:320
+#: pg_restore.c:312
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr ""
 "%s : les options --single-transaction et -j ne peuvent pas être indiquées\n"
 "simultanément\n"
 
-#: pg_restore.c:350
+#: pg_restore.c:348
 #, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\" or \"t\"\n"
-msgstr "format d'archive « %s » non reconnu ; merci d'indiquer « c » ou « t »\n"
+msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
+msgstr "format d'archive « %s » non reconnu ; merci d'indiquer « c », « d » ou « t »\n"
 
-#: pg_restore.c:384
+#: pg_restore.c:382
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "ATTENTION : erreurs ignorées lors de la restauration : %d\n"
 
-#: pg_restore.c:398
+#: pg_restore.c:396
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1859,51 +1888,51 @@ msgstr ""
 "pg_dump.\n"
 "\n"
 
-#: pg_restore.c:400
+#: pg_restore.c:398
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [FICHIER]\n"
 
-#: pg_restore.c:403
+#: pg_restore.c:401
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr ""
 "  -d, --dbname=NOM             nom de la base de données utilisée pour la\n"
 "                               connexion\n"
 
-#: pg_restore.c:404
+#: pg_restore.c:402
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=NOMFICHIER        nom du fichier de sortie\n"
 
-#: pg_restore.c:405
+#: pg_restore.c:403
 #, c-format
-msgid "  -F, --format=c|t         backup file format (should be automatic)\n"
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
-"  -F, --format=c|t             format du fichier de sauvegarde (devrait être\n"
+"  -F, --format=c|d|t           format du fichier de sauvegarde (devrait être\n"
 "                               automatique)\n"
 
-#: pg_restore.c:406
+#: pg_restore.c:404
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list                   affiche la table des matières de l'archive (TOC)\n"
 
-#: pg_restore.c:407
+#: pg_restore.c:405
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose                mode verbeux\n"
 
-#: pg_restore.c:408
+#: pg_restore.c:406
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                       affiche cette aide et quitte\n"
 
-#: pg_restore.c:409
+#: pg_restore.c:407
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                    affiche la version et quitte\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1912,43 +1941,43 @@ msgstr ""
 "\n"
 "Options contrôlant la restauration :\n"
 
-#: pg_restore.c:412
+#: pg_restore.c:410
 #, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr ""
 "  -a, --data-only              restaurer uniquement les données, pas le\n"
 "                               schéma\n"
 
-#: pg_restore.c:413
+#: pg_restore.c:411
 #, c-format
 msgid "  -c, --clean              clean (drop) database objects before recreating\n"
 msgstr ""
 "  -c, --clean               nettoie/supprime les bases de données avant de\n"
 "                            les créer\n"
 
-#: pg_restore.c:414
+#: pg_restore.c:412
 #, c-format
 msgid "  -C, --create             create the target database\n"
 msgstr "  -C, --create                 créer la base de données cible\n"
 
-#: pg_restore.c:415
+#: pg_restore.c:413
 #, c-format
 msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error          quitter en cas d'erreur, continue par défaut\n"
 
-#: pg_restore.c:416
+#: pg_restore.c:414
 #, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=NOM              restaurer l'index indiqué\n"
 
-#: pg_restore.c:417
+#: pg_restore.c:415
 #, c-format
 msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=NUMERO            utilise ce nombre de jobs en parallèle pour\n"
 "                               la restauration\n"
 
-#: pg_restore.c:418
+#: pg_restore.c:416
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use table of contents from this file for\n"
@@ -1958,56 +1987,63 @@ msgstr ""
 "                               de ce fichier pour sélectionner/trier\n"
 "                               la sortie\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:418
 #, c-format
 msgid "  -n, --schema=NAME        restore only objects in this schema\n"
 msgstr "  -n, --schema=NOM             restaurer uniquement les objets de ce schéma\n"
 
-#: pg_restore.c:421
+#: pg_restore.c:419
 #, c-format
 msgid "  -O, --no-owner           skip restoration of object ownership\n"
 msgstr ""
 "  -O, --no-owner               omettre la restauration des possessions des\n"
 "                               objets\n"
 
-#: pg_restore.c:422
+#: pg_restore.c:420
 #, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
 "                           restore named function\n"
 msgstr "  -P, --function=NOM(args)     restaurer la fonction indiquée\n"
 
-#: pg_restore.c:424
+#: pg_restore.c:422
 #, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only            restaurer uniquement le schéma, pas les\n"
 "                               données\n"
 
-#: pg_restore.c:425
+#: pg_restore.c:423
 #, c-format
 msgid "  -S, --superuser=NAME     superuser user name to use for disabling triggers\n"
 msgstr ""
 "  -S, --superuser=NOM          indique le nom du super-utilisateur à\n"
 "                               utiliser pour désactiver les déclencheurs\n"
 
-#: pg_restore.c:426
+#: pg_restore.c:424
 #, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NOM              restaure la table indiquée\n"
 
-#: pg_restore.c:427
+#: pg_restore.c:425
 #, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NOM            restaure le déclencheur indiqué\n"
 
-#: pg_restore.c:428
+#: pg_restore.c:426
 #, c-format
 msgid "  -x, --no-privileges      skip restoration of access privileges (grant/revoke)\n"
 msgstr ""
 "  -x, --no-privileges          omettre la restauration des droits d'accès\n"
 "                               (grant/revoke)\n"
 
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr "  -1, --single-transaction     restaurer dans une seule transaction\n"
+
 #: pg_restore.c:429
 #, c-format
 msgid "  --disable-triggers       disable triggers during data-only restore\n"
@@ -2027,16 +2063,16 @@ msgstr ""
 
 #: pg_restore.c:433
 #, c-format
+msgid "  --no-security-labels     do not restore security labels\n"
+msgstr "  --no-tablespaces             ne restaure pas les labels de sécurité\n"
+
+#: pg_restore.c:434
+#, c-format
 msgid "  --no-tablespaces         do not restore tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces             ne restaure pas les définitions de\n"
 "                               tablespaces\n"
 
-#: pg_restore.c:434
-#, c-format
-msgid "  --role=ROLENAME          do SET ROLE before restore\n"
-msgstr "  --role=NOMROLE               exécute SET ROLE avant la restauration\n"
-
 #: pg_restore.c:435
 #, c-format
 msgid ""
@@ -2049,14 +2085,12 @@ msgstr ""
 "                               au lieu des commandes ALTER OWNER pour les\n"
 "                               modifier les propriétaires\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:445
 #, c-format
-msgid ""
-"  -1, --single-transaction\n"
-"                           restore as a single transaction\n"
-msgstr "  -1, --single-transaction     restaurer dans une seule transaction\n"
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=NOMROLE               exécute SET ROLE avant la restauration\n"
 
-#: pg_restore.c:448
+#: pg_restore.c:447
 #, c-format
 msgid ""
 "\n"
@@ -2068,7 +2102,7 @@ msgstr ""
 "utilisée.\n"
 "\n"
 
-#: pg_dumpall.c:167
+#: pg_dumpall.c:171
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2079,7 +2113,7 @@ msgstr ""
 "même répertoire que « %s ».\n"
 "Vérifiez votre installation.\n"
 
-#: pg_dumpall.c:174
+#: pg_dumpall.c:178
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -2090,34 +2124,34 @@ msgstr ""
 "version que %s.\n"
 "Vérifiez votre installation.\n"
 
-#: pg_dumpall.c:346
+#: pg_dumpall.c:314
 #, c-format
 msgid "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
 msgstr ""
 "%s : les options « -g/--globals-only » et « -r/--roles-only » ne peuvent pas\n"
 "être utilisées conjointement\n"
 
-#: pg_dumpall.c:355
+#: pg_dumpall.c:323
 #, c-format
 msgid "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"
 msgstr ""
 "%s : les options « -g/--globals-only » et « -t/--tablespaces-only » ne\n"
 "peuvent pas être utilisées conjointement\n"
 
-#: pg_dumpall.c:364
+#: pg_dumpall.c:332
 #, c-format
 msgid "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"
 msgstr ""
 "%s : les options « -r/--roles-only » et « -t/--tablespaces-only » ne peuvent\n"
 "pas être utilisées conjointement\n"
 
-#: pg_dumpall.c:384
-#: pg_dumpall.c:1654
+#: pg_dumpall.c:374
+#: pg_dumpall.c:1678
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s : n'a pas pu se connecter à la base de données « %s »\n"
 
-#: pg_dumpall.c:399
+#: pg_dumpall.c:389
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2126,12 +2160,12 @@ msgstr ""
 "%s : n'a pas pu se connecter aux bases « postgres » et « template1 ».\n"
 "Merci de préciser une autre base de données.\n"
 
-#: pg_dumpall.c:416
+#: pg_dumpall.c:406
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier de sauvegarde « %s » : %s\n"
 
-#: pg_dumpall.c:534
+#: pg_dumpall.c:528
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2141,59 +2175,64 @@ msgstr ""
 "commandes SQL.\n"
 "\n"
 
-#: pg_dumpall.c:536
+#: pg_dumpall.c:530
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:545
+#: pg_dumpall.c:533
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=NOMFICHIER        nom du fichier de sortie\n"
+
+#: pg_dumpall.c:539
 #, c-format
 msgid "  -c, --clean                 clean (drop) databases before recreating\n"
 msgstr ""
 "  -c, --clean                  nettoie (supprime) les bases de données avant de\n"
 "                               les créer\n"
 
-#: pg_dumpall.c:546
+#: pg_dumpall.c:540
 #, c-format
 msgid "  -g, --globals-only          dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           sauvegarde uniquement les objets système, pas\n"
 "                               les bases de données\n"
 
-#: pg_dumpall.c:548
+#: pg_dumpall.c:542
 #, c-format
 msgid "  -O, --no-owner              skip restoration of object ownership\n"
 msgstr ""
 "  -O, --no-owner               omettre la restauration des possessions des\n"
 "                               objets\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:543
 #, c-format
 msgid "  -r, --roles-only            dump only roles, no databases or tablespaces\n"
 msgstr ""
 "  -r, --roles-only             sauvegarde uniquement les rôles, pas les bases\n"
 "                               de données ni les tablespaces\n"
 
-#: pg_dumpall.c:551
+#: pg_dumpall.c:545
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=NOM          indique le nom du super-utilisateur à utiliser\n"
 "                               avec le format texte\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:546
 #, c-format
 msgid "  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
 msgstr ""
 "  -t, --tablespaces-only       sauvegarde uniquement les tablespaces, pas les\n"
 "                               bases de données ni les rôles\n"
 
-#: pg_dumpall.c:567
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=NOM_BASE      indique une autre base par défaut\n"
 
-#: pg_dumpall.c:573
+#: pg_dumpall.c:570
 #, c-format
 msgid ""
 "\n"
@@ -2206,75 +2245,75 @@ msgstr ""
 "standard.\n"
 "\n"
 
-#: pg_dumpall.c:1017
+#: pg_dumpall.c:1041
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr "%s : n'a pas pu analyser la liste d'ACL (%s) pour le tablespace « %s »\n"
 
-#: pg_dumpall.c:1317
+#: pg_dumpall.c:1341
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%s : n'a pas pu analyser la liste d'ACL (%s) pour la base de données « %s »\n"
 
-#: pg_dumpall.c:1524
+#: pg_dumpall.c:1548
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s : sauvegarde de la base de données « %s »...\n"
 
-#: pg_dumpall.c:1534
+#: pg_dumpall.c:1558
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s : échec de pg_dump sur la base de données « %s », quitte\n"
 
-#: pg_dumpall.c:1543
+#: pg_dumpall.c:1567
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s : n'a pas pu rouvrir le fichier de sortie « %s » : %s\n"
 
-#: pg_dumpall.c:1582
+#: pg_dumpall.c:1606
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s : exécute « %s »\n"
 
-#: pg_dumpall.c:1627
+#: pg_dumpall.c:1651
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s : mémoire épuisée\n"
 
-#: pg_dumpall.c:1676
+#: pg_dumpall.c:1700
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s : n'a pas pu se connecter à la base de données « %s » : %s\n"
 
-#: pg_dumpall.c:1690
+#: pg_dumpall.c:1714
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s : n'a pas pu obtenir la version du serveur\n"
 
-#: pg_dumpall.c:1696
+#: pg_dumpall.c:1720
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s : n'a pas pu analyser la version du serveur « %s »\n"
 
-#: pg_dumpall.c:1704
+#: pg_dumpall.c:1728
 #, c-format
 msgid "%s: could not parse version \"%s\"\n"
 msgstr "%s : n'a pas pu analyser la version « %s »\n"
 
-#: pg_dumpall.c:1743
-#: pg_dumpall.c:1769
+#: pg_dumpall.c:1767
+#: pg_dumpall.c:1793
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s : exécute %s\n"
 
-#: pg_dumpall.c:1749
-#: pg_dumpall.c:1775
+#: pg_dumpall.c:1773
+#: pg_dumpall.c:1799
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s : échec de la requête : %s"
 
-#: pg_dumpall.c:1751
-#: pg_dumpall.c:1777
+#: pg_dumpall.c:1775
+#: pg_dumpall.c:1801
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s : la requête était : %s\n"
@@ -2312,31 +2351,58 @@ msgstr "n'a pas pu acc
 msgid "could not read symbolic link \"%s\""
 msgstr "n'a pas pu lire le lien symbolique « %s »"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "le processus fils a quitté avec le code de sortie %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "le processus fils a été terminé par l'exception 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "le processus fils a été terminé par le signal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "le processus fils a été terminé par le signal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
+#~ msgid "cannot reopen stdin\n"
+#~ msgstr "ne peut pas rouvrir stdin\n"
+
+#~ msgid "cannot reopen non-seekable file\n"
+#~ msgstr "ne peut pas rouvrir le fichier non cherchable\n"
+
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s : option -X invalide -- %s\n"
+
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "la requête n'a renvoyé aucune ligne : %s\n"
+
+#~ msgid "could not initialize compression library: %s\n"
+#~ msgstr "n'a pas pu initialiser la bibliothèque de compression : %s\n"
+
+#~ msgid "could not uncompress data: %s\n"
+#~ msgstr "n'a pas pu décompresser les données : %s\n"
+
+#~ msgid "could not close compression library: %s\n"
+#~ msgstr "n'a pas pu fermer la bibliothèque de compression : %s\n"
+
+#~ msgid "could not compress data: %s\n"
+#~ msgstr "n'a pas pu compresser les données : %s\n"
+
+#~ msgid "could not close compression stream: %s\n"
+#~ msgstr "n'a pas pu fermer le flux de compression : %s\n"
+
 #~ msgid ""
 #~ "dumping a specific TOC data block out of order is not supported without "
 #~ "ID on this input stream (fseek required)\n"
@@ -2344,24 +2410,33 @@ msgstr "le processus fils a quitt
 #~ "la sauvegarde d'un bloc de données spécifique du TOC dans le désordre "
 #~ "n'est\n"
 #~ "pas supporté sans identifiant sur ce flux d'entrée (fseek requis)\n"
+
 #~ msgid "dumpBlobs(): could not open large object %u: %s"
 #~ msgstr "dumpBlobs() : n'a pas pu ouvrir le « Large Object » %u : %s"
+
 #~ msgid "saving large object properties\n"
 #~ msgstr "sauvegarde des propriétés des « Large Objects »\n"
+
 #~ msgid "could not parse ACL (%s) for large object %u"
 #~ msgstr "n'a pas pu analyser la liste ACL (%s) du « Large Object » %u"
+
 #~ msgid "compression support is disabled in this format\n"
 #~ msgstr "le support de la compression est désactivé avec ce format\n"
+
 #~ msgid "no label definitions found for enum ID %u\n"
 #~ msgstr "aucune définition de label trouvée pour l'ID enum %u\n"
+
 #~ msgid "query returned %d rows instead of one: %s\n"
 #~ msgstr "la requête a renvoyé %d lignes au lieu d'une seule : %s\n"
+
 #~ msgid "read %lu byte into lookahead buffer\n"
+
 #~ msgid_plural "read %lu bytes into lookahead buffer\n"
 #~ msgstr[0] "lecture de %lu octet dans le tampon prévisionnel\n"
 #~ msgstr[1] "lecture de %lu octets dans le tampon prévisionnel\n"
+
 #~ msgid "requested %d byte, got %d from lookahead and %d from file\n"
+
 #~ msgid_plural "requested %d bytes, got %d from lookahead and %d from file\n"
 #~ msgstr[0] "%d octet requis, %d obtenu de « lookahead » et %d du fichier\n"
 #~ msgstr[1] "%d octets requis, %d obtenus de « lookahead » et %d du fichier\n"
-
diff --git a/src/bin/pg_dump/po/ja.po b/src/bin/pg_dump/po/ja.po
index 230f09d38d706..e2d9320443096 100644
--- a/src/bin/pg_dump/po/ja.po
+++ b/src/bin/pg_dump/po/ja.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
+"Project-Id-Version: PostgreSQL 9.1 beta 2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-20 12:56+0900\n"
-"PO-Revision-Date: 2010-07-21 18:43+0900\n"
+"POT-Creation-Date: 2011-06-14 22:01+0900\n"
+"PO-Revision-Date: 2011-08-30 21:33+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -14,74 +14,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pg_dump.c:453 pg_restore.c:268 pg_dumpall.c:291
-#, c-format
-msgid "%s: invalid -X option -- %s\n"
-msgstr "%s: 無効� -X オプション -- %s\n"
-
-#: pg_dump.c:455 pg_dump.c:477 pg_dump.c:486 pg_restore.c:270 pg_restore.c:293
-#: pg_restore.c:310 pg_dumpall.c:293 pg_dumpall.c:313 pg_dumpall.c:338
-#: pg_dumpall.c:348 pg_dumpall.c:357 pg_dumpall.c:366 pg_dumpall.c:402
+#: pg_dump.c:489 pg_dump.c:503 pg_restore.c:274 pg_restore.c:290
+#: pg_restore.c:302 pg_dumpall.c:296 pg_dumpall.c:306 pg_dumpall.c:316
+#: pg_dumpall.c:325 pg_dumpall.c:334 pg_dumpall.c:392
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "詳細� \"%s --help\" を実行������\n"
 
-#: pg_dump.c:484 pg_dumpall.c:336
+#: pg_dump.c:501 pg_restore.c:288 pg_dumpall.c:304
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: コマンドライン引数�多����(先頭�\"%s\")\n"
 
-#: pg_dump.c:501
+#: pg_dump.c:514
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr "-s/--schema-only � -a/--data-only ��時��使用����ん\n"
 
-#: pg_dump.c:507
+#: pg_dump.c:520
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "-c/--clean � -a/--data-only ��時��使用����ん\n"
 
-#: pg_dump.c:513
+#: pg_dump.c:526
 msgid ""
 "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
-msgstr "\"--inserts/--column-inserts�-o/--oids��時��使用����ん\n"
+msgstr "--inserts/--column-inserts�-o/--oids��時��使用����ん\n"
 
-#: pg_dump.c:514
+#: pg_dump.c:527
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(INSERTコマンド��OIDを設定����ん。)\n"
 
-#: pg_dump.c:544
-#, c-format
-msgid "invalid output format \"%s\" specified\n"
-msgstr "�明�出力書�\"%s\"�指定�れ���\n"
-
-#: pg_dump.c:550
+#: pg_dump.c:558
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "出力ファイル\"%s\"を書�込�用�オープン����ん���\n"
 
-#: pg_dump.c:560 pg_backup_db.c:45
+#: pg_dump.c:568 pg_backup_db.c:45
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "�ージョン文字列\"%s\"を解�����ん���\n"
 
-#: pg_dump.c:583
+#: pg_dump.c:591
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "クライアントエンコーディング\"%s\"�無効��\n"
 
-#: pg_dump.c:660
+#: pg_dump.c:690
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "最終�組�込�OID�%u��\n"
 
-#: pg_dump.c:670
+#: pg_dump.c:700
 msgid "No matching schemas were found\n"
 msgstr "マッ��るスキーマ�見��り��ん\n"
 
-#: pg_dump.c:685
+#: pg_dump.c:715
 msgid "No matching tables were found\n"
 msgstr "マッ��るテーブル�見��り��ん\n"
 
-#: pg_dump.c:797
+#: pg_dump.c:827
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -90,17 +80,17 @@ msgstr ""
 "%s�データベースをテキストファイル�����他�書��ダンプ���。\n"
 "\n"
 
-#: pg_dump.c:798 pg_restore.c:399 pg_dumpall.c:535
+#: pg_dump.c:828 pg_restore.c:397 pg_dumpall.c:529
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_dump.c:799
+#: pg_dump.c:829
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPTION]... [DBNAME]\n"
 
-#: pg_dump.c:801 pg_restore.c:402 pg_dumpall.c:538
+#: pg_dump.c:831 pg_restore.c:400 pg_dumpall.c:532
 #, c-format
 msgid ""
 "\n"
@@ -109,47 +99,47 @@ msgstr ""
 "\n"
 "一般的�オプション;\n"
 
-#: pg_dump.c:802 pg_dumpall.c:539
+#: pg_dump.c:832
 #, c-format
-msgid "  -f, --file=FILENAME         output file name\n"
-msgstr "  -f, --file=ファイル�       出力ファイル�\n"
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=ファイル�       出力ファイル���ディレクトリ���\n"
 
-#: pg_dump.c:803
+#: pg_dump.c:833
 #, c-format
 msgid ""
-"  -F, --format=c|t|p          output file format (custom, tar, plain text)\n"
-msgstr ""
-"  -F, --format=c|t|p          出力ファイル�書�(custom, tar, plain text)\n"
+"  -F, --format=c|d|t|p        output file format (custom, directory, tar, "
+"plain text)\n"
+msgstr "  -F, --format=c|d|t|p          出力ファイル�書�(custom, directory, tar, plain text)\n"
 
-#: pg_dump.c:804
+#: pg_dump.c:834
 #, c-format
 msgid "  -v, --verbose               verbose mode\n"
 msgstr "  -v, --verbose               冗長モード\n"
 
-#: pg_dump.c:805
+#: pg_dump.c:835
 #, c-format
 msgid ""
 "  -Z, --compress=0-9          compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9          圧縮形����る圧縮レベル\n"
 
-#: pg_dump.c:806 pg_dumpall.c:540
+#: pg_dump.c:836 pg_dumpall.c:534
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
 msgstr ""
 "  --lock-wait-timeout=TIMEOUT テーブルロックを TIMEOUT 分待���ら失敗\n"
 
-#: pg_dump.c:807 pg_dumpall.c:541
+#: pg_dump.c:837 pg_dumpall.c:535
 #, c-format
 msgid "  --help                      show this help, then exit\n"
 msgstr "  --help                       ヘルプを表示��終了\n"
 
-#: pg_dump.c:808 pg_dumpall.c:542
+#: pg_dump.c:838 pg_dumpall.c:536
 #, c-format
 msgid "  --version                   output version information, then exit\n"
 msgstr "  --version                   �ージョン情報を表示��終了\n"
 
-#: pg_dump.c:810 pg_dumpall.c:543
+#: pg_dump.c:840 pg_dumpall.c:537
 #, c-format
 msgid ""
 "\n"
@@ -158,54 +148,54 @@ msgstr ""
 "\n"
 "出力内容を制御�る���オプション:\n"
 
-#: pg_dump.c:811 pg_dumpall.c:544
+#: pg_dump.c:841 pg_dumpall.c:538
 #, c-format
 msgid "  -a, --data-only             dump only the data, not the schema\n"
 msgstr ""
 "  -a, --data-only          データ��をダンプ��スキーマをダンプ���ん\n"
 
-#: pg_dump.c:812
+#: pg_dump.c:842
 #, c-format
 msgid "  -b, --blobs                 include large objects in dump\n"
 msgstr "  -b, --blobs              ラージオブジェクト�共�ダンプ���\n"
 
-#: pg_dump.c:813
+#: pg_dump.c:843
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) database objects before "
 "recreating\n"
 msgstr "  -c, --clean              �作���データベースを削除\n"
 
-#: pg_dump.c:814
+#: pg_dump.c:844
 #, c-format
 msgid ""
 "  -C, --create                include commands to create database in dump\n"
 msgstr ""
 "  -C, --create             ダンプ�データベース生�用コマンドを����\n"
 
-#: pg_dump.c:815
+#: pg_dump.c:845
 #, c-format
 msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
 msgstr ""
 "  -E, --encoding=ENCODING  ENCODING�指定�れ�エンコーディング�ダンプ��"
 "�\n"
 
-#: pg_dump.c:816
+#: pg_dump.c:846
 #, c-format
 msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
 msgstr "  -n, --schema=SCHEMA      指���スキーマ��をダンプ���\n"
 
-#: pg_dump.c:817
+#: pg_dump.c:847
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
 msgstr "  -N, --exclude-schema=SCHEMA ��付�スキーマをダンプ���ん\n"
 
-#: pg_dump.c:818 pg_dumpall.c:547
+#: pg_dump.c:848 pg_dumpall.c:541
 #, c-format
 msgid "  -o, --oids                  include OIDs in dump\n"
 msgstr "  -o, --oids               ダンプ�OIDを����\n"
 
-#: pg_dump.c:819
+#: pg_dump.c:849
 #, c-format
 msgid ""
 "  -O, --no-owner              skip restoration of object ownership in\n"
@@ -214,14 +204,14 @@ msgstr ""
 "  -O, --no-owner           プレインテキスト形���オブジェクト所有権�\n"
 "                           復元を行���ん\n"
 
-#: pg_dump.c:821 pg_dumpall.c:550
+#: pg_dump.c:851 pg_dumpall.c:544
 #, c-format
 msgid "  -s, --schema-only           dump only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only        スキーマ��をダンプ�����データ�ダンプ���"
 "ã‚“\n"
 
-#: pg_dump.c:822
+#: pg_dump.c:852
 #, c-format
 msgid ""
 "  -S, --superuser=NAME        superuser user name to use in plain-text "
@@ -230,35 +220,27 @@ msgstr ""
 "  -S, --superuser=NAME     プレインテキスト形��使用�るスーパーユーザ�\n"
 "                           ��を指定\n"
 
-#: pg_dump.c:823
+#: pg_dump.c:853
 #, c-format
 msgid "  -t, --table=TABLE           dump the named table(s) only\n"
 msgstr "  -t, --table=TABLE        指定��テーブル��をダンプ���\n"
 
-#: pg_dump.c:824
+#: pg_dump.c:854
 #, c-format
 msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
 msgstr "  -T, --exclude-table=TABLE        指定��テーブルをダンプ���ん\n"
 
-#: pg_dump.c:825 pg_dumpall.c:553
+#: pg_dump.c:855 pg_dumpall.c:547
 #, c-format
 msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      権�(grant/revoke)をダンプ���ん\n"
 
-#: pg_dump.c:826 pg_dumpall.c:554
+#: pg_dump.c:856 pg_dumpall.c:548
 #, c-format
 msgid "  --binary-upgrade            for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade            用途�アップグレードユーティリティ��\n"
 
-#: pg_dump.c:827 pg_dumpall.c:555
-#, c-format
-msgid ""
-"  --inserts                   dump data as INSERT commands, rather than "
-"COPY\n"
-msgstr ""
-" --inserts            COPY����INSERTコマンド�データをダンプ���\n"
-
-#: pg_dump.c:828 pg_dumpall.c:556
+#: pg_dump.c:857 pg_dumpall.c:549
 #, c-format
 msgid ""
 "  --column-inserts            dump data as INSERT commands with column "
@@ -266,7 +248,7 @@ msgid ""
 msgstr ""
 "--column-inserts     カラム�付��INSERTコマンド�データをダンプ���\n"
 
-#: pg_dump.c:829 pg_dumpall.c:557
+#: pg_dump.c:858 pg_dumpall.c:550
 #, c-format
 msgid ""
 "  --disable-dollar-quoting    disable dollar quoting, use SQL standard "
@@ -276,7 +258,7 @@ msgstr ""
 "�\n"
 "                           ��\n"
 
-#: pg_dump.c:830 pg_dumpall.c:558
+#: pg_dump.c:859 pg_dumpall.c:551
 #, c-format
 msgid ""
 "  --disable-triggers          disable triggers during data-only restore\n"
@@ -284,18 +266,43 @@ msgstr ""
 "  --disable-triggers       データ���リストアを�る際�トリガを無効���"
 "�\n"
 
-#: pg_dump.c:831 pg_dumpall.c:559
+#: pg_dump.c:860 pg_dumpall.c:552
+#, c-format
+msgid ""
+"  --inserts                   dump data as INSERT commands, rather than "
+"COPY\n"
+msgstr ""
+" --inserts            COPY����INSERTコマンド�データをダンプ���\n"
+
+#: pg_dump.c:861 pg_dumpall.c:553
+#, c-format
+msgid "  --no-security-labels        do not dump security label assignments\n"
+msgstr "  --no-security-labels        セキュリティラベル�割り当�をダンプ���ん\n"
+
+#: pg_dump.c:862 pg_dumpall.c:554
 #, c-format
 msgid "  --no-tablespaces            do not dump tablespace assignments\n"
 msgstr ""
 "  --no-tablespaces         テーブルスペース�割り当�をダンプ���ん\n"
 
-#: pg_dump.c:832 pg_dumpall.c:560
+#: pg_dump.c:863 pg_dumpall.c:555
 #, c-format
-msgid "  --role=ROLENAME             do SET ROLE before dump\n"
-msgstr "  --role=ROLENAME          ダンプ��� SET ROLE を行���\n"
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr "  --no-unlogged-table-data    ログを�ら��テーブル�データをダンプ���ん\n"
+
+#: pg_dump.c:864 pg_dumpall.c:556
+#, c-format
+msgid ""
+"  --quote-all-identifiers     quote all identifiers, even if not key words\n"
+msgstr "  --quote-all-identifiers     ����識別�をキーワード��������も引用符���り��\n"
+
+#: pg_dump.c:865
+#, c-format
+msgid ""
+"  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr "  --serializable-deferrable   ��的�ダンプを実行��るよ���る��待機���\n"
 
-#: pg_dump.c:833 pg_dumpall.c:561
+#: pg_dump.c:866 pg_dumpall.c:557
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -307,7 +314,7 @@ msgstr ""
 "                           所有者をセット�る際�ALTER OWNER コマンド�代り\n"
 "                           � SET SESSION AUTHORIZATION コマンドを使用�る\n"
 
-#: pg_dump.c:837 pg_restore.c:441 pg_dumpall.c:565
+#: pg_dump.c:870 pg_restore.c:439 pg_dumpall.c:561
 #, c-format
 msgid ""
 "\n"
@@ -316,29 +323,29 @@ msgstr ""
 "\n"
 "接続オプション:\n"
 
-#: pg_dump.c:838 pg_restore.c:442 pg_dumpall.c:566
+#: pg_dump.c:871 pg_restore.c:440 pg_dumpall.c:562
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME      データベースサー��ホスト���ソケットディレクト"
 "リ��\n"
 
-#: pg_dump.c:839 pg_restore.c:443 pg_dumpall.c:568
+#: pg_dump.c:872 pg_restore.c:441 pg_dumpall.c:564
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=PORT          データベースサー���ート番���\n"
 
-#: pg_dump.c:840 pg_restore.c:444 pg_dumpall.c:569
+#: pg_dump.c:873 pg_restore.c:442 pg_dumpall.c:565
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=NAME      指定��データベースユーザ�接続���\n"
 
-#: pg_dump.c:841 pg_restore.c:445 pg_dumpall.c:570
+#: pg_dump.c:874 pg_restore.c:443 pg_dumpall.c:566
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        パスワード入力を�求���\n"
 
-#: pg_dump.c:842 pg_restore.c:446 pg_dumpall.c:571
+#: pg_dump.c:875 pg_restore.c:444 pg_dumpall.c:567
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -347,7 +354,12 @@ msgstr ""
 "  -W, --password           パスワードプロンプトを強制表示���\n"
 "                           （自動的�表示�れる����）\n"
 
-#: pg_dump.c:844
+#: pg_dump.c:876 pg_dumpall.c:568
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr "  --role=ROLENAME          ダンプ��� SET ROLE を行���\n"
+
+#: pg_dump.c:878
 #, c-format
 msgid ""
 "\n"
@@ -359,51 +371,56 @@ msgstr ""
 "データベース��指定�れ����場��環境変数PGDATABASE�使用�れ��\n"
 "\n"
 
-#: pg_dump.c:846 pg_restore.c:449 pg_dumpall.c:575
+#: pg_dump.c:880 pg_restore.c:448 pg_dumpall.c:572
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "�具��<pgsql-bugs@postgresql.org>��報告������。\n"
 
-#: pg_dump.c:854 pg_backup_archiver.c:1394
+#: pg_dump.c:888 pg_backup_archiver.c:1437
 msgid "*** aborted because of error\n"
 msgstr "*** エラー���中断\n"
 
-#: pg_dump.c:875
+#: pg_dump.c:930
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "�明�出力書�\"%s\"�指定�れ���\n"
+
+#: pg_dump.c:953
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr ""
 "スキーマ�択スイッ�を使用�る���サー���ージョン�\n"
 "少���も 7.3 以���る必���り��。\n"
 
-#: pg_dump.c:1113
+#: pg_dump.c:1211
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "テーブル%s�内容をダンプ�����\n"
 
-#: pg_dump.c:1216
+#: pg_dump.c:1331
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr "テーブル\"%s\"�内容�ダンプ�失敗: PQgetCopyData()�失敗����。\n"
 
-#: pg_dump.c:1217 pg_dump.c:12402
+#: pg_dump.c:1332 pg_dump.c:14135
 #, c-format
 msgid "Error message from server: %s"
 msgstr "サー��エラーメッセージ: %s"
 
-#: pg_dump.c:1218 pg_dump.c:12403
+#: pg_dump.c:1333 pg_dump.c:14136
 #, c-format
 msgid "The command was: %s\n"
 msgstr "次�コマンド���: %s\n"
 
-#: pg_dump.c:1624
+#: pg_dump.c:1756
 msgid "saving database definition\n"
 msgstr "データベース定義を�存�����\n"
 
-#: pg_dump.c:1706
+#: pg_dump.c:1838
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "データベース\"%s\"用�エントリ�pg_database��り��ん\n"
 
-#: pg_dump.c:1713
+#: pg_dump.c:1845
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
@@ -411,104 +428,113 @@ msgstr ""
 "������より�データベース\"%2$s\"用�エントリ�pg_database�ら複数(%1$d)"
 "返�れ���\n"
 
-#: pg_dump.c:1814
+#: pg_dump.c:1949
 msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
 msgstr "dumpDatabase(): pg_largeobject.relfrozenxid �見��り��ん\n"
 
-#: pg_dump.c:1891
+#: pg_dump.c:1988
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr "dumpDatabase(): pg_largeobject_metadata.relfrozenxid�見��り��ん\n"
+
+#: pg_dump.c:2067
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "encoding = %s を�存�����\n"
 
-#: pg_dump.c:1918
+#: pg_dump.c:2094
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "standard_conforming_strings = %s を�存�����\n"
 
-#: pg_dump.c:1951
+#: pg_dump.c:2127
 msgid "reading large objects\n"
 msgstr "ラージオブジェクトを読�込ん����\n"
 
-#: pg_dump.c:2078
+#: pg_dump.c:2259
 msgid "saving large objects\n"
 msgstr "ラージオブジェクトを�存�����\n"
 
-#: pg_dump.c:2120 pg_backup_archiver.c:946
+#: pg_dump.c:2301 pg_backup_archiver.c:959
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "ラージオブジェクト %u をオープン����ん���: %s"
 
-#: pg_dump.c:2133
+#: pg_dump.c:2314
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "ラージオブジェクト %u を読��り中�エラー��り���: %s"
 
-#: pg_dump.c:2180 pg_dump.c:2228 pg_dump.c:2290 pg_dump.c:6911 pg_dump.c:7114
-#: pg_dump.c:7930 pg_dump.c:8468 pg_dump.c:8718 pg_dump.c:8824 pg_dump.c:9209
-#: pg_dump.c:9385 pg_dump.c:9582 pg_dump.c:9809 pg_dump.c:9964 pg_dump.c:10150
-#: pg_dump.c:12208
+#: pg_dump.c:2361 pg_dump.c:2409 pg_dump.c:2464 pg_dump.c:7592 pg_dump.c:7823
+#: pg_dump.c:8789 pg_dump.c:9341 pg_dump.c:9595 pg_dump.c:9709 pg_dump.c:10165
+#: pg_dump.c:10351 pg_dump.c:10457 pg_dump.c:10657 pg_dump.c:10899
+#: pg_dump.c:11066 pg_dump.c:11287 pg_dump.c:13941
 #, c-format
 msgid "query returned %d row instead of one: %s\n"
 msgid_plural "query returned %d rows instead of one: %s\n"
 msgstr[0] "������1行����%d行返����: %s\n"
 msgstr[1] "������1行����%d行返����: %s\n"
 
-#: pg_dump.c:2435
+#: pg_dump.c:2545
+#, c-format
+msgid "could not find parent extension for %s"
+msgstr "%s�親拡張��り��ん���"
+
+#: pg_dump.c:2652
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "警告: スキーマ\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:2470
+#: pg_dump.c:2687
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "OID %u�スキーマ�存在���ん\n"
 
-#: pg_dump.c:2727
+#: pg_dump.c:3028
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "警告: データ型\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:2831
+#: pg_dump.c:3132
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "警告: 演算�\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:3005
+#: pg_dump.c:3384
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "警告: 演算�クラス\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:3092
+#: pg_dump.c:3471
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr "警告: 演算��\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:3217
+#: pg_dump.c:3608
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "警告: 集約関数\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:3372
+#: pg_dump.c:3778
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "警告: 関数\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:3805
+#: pg_dump.c:4278
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "警告: テーブル\"%s\"�所有者�無効�よ���\n"
 
-#: pg_dump.c:3948
+#: pg_dump.c:4421
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "テーブル\"%s\"用�インデックスを読�込ん����\n"
 
-#: pg_dump.c:4268
+#: pg_dump.c:4741
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "テーブル\"%s\"用�外部キー制約を読�込ん����\n"
 
-#: pg_dump.c:4500
+#: pg_dump.c:4973
 #, c-format
 msgid ""
 "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
@@ -517,12 +543,12 @@ msgstr ""
 "�全性検査�失敗����。pg_rewrite項目OID %1$u �親テーブルOID %2$u ��り"
 "��ん\n"
 
-#: pg_dump.c:4584
+#: pg_dump.c:5057
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "テーブル\"%s\"用�トリガを読�込ん����\n"
 
-#: pg_dump.c:4747
+#: pg_dump.c:5220
 #, c-format
 msgid ""
 "query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -531,32 +557,32 @@ msgstr ""
 "テーブル\"%2$s\"上�外部キートリガ\"%1$s\"用���照テーブル��������"
 "NULLを返����(テーブル�OID: %3$u)\n"
 
-#: pg_dump.c:5117
+#: pg_dump.c:5591
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "テーブル\"%s\"�列�型を検索�����\n"
 
-#: pg_dump.c:5236
+#: pg_dump.c:5736
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "テーブル\"%s\"�列番��無効��\n"
 
-#: pg_dump.c:5272
+#: pg_dump.c:5773
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "テーブル\"%s\"�デフォルト�を検索�����\n"
 
-#: pg_dump.c:5357
+#: pg_dump.c:5858
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "テーブル\"%2$s\"用�adnum�値%1$d�無効��\n"
 
-#: pg_dump.c:5375
+#: pg_dump.c:5876
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "テーブル\"%s\"�検査制約を検索�����\n"
 
-#: pg_dump.c:5455
+#: pg_dump.c:5956
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d\n"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
@@ -565,50 +591,45 @@ msgstr[0] ""
 msgstr[1] ""
 "テーブル\"%2$s\"�検査制約�%1$d�期待����������%3$d�り���\n"
 
-#: pg_dump.c:5459
+#: pg_dump.c:5960
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(システムカタログ�破����る�能性��り��)\n"
 
-#: pg_dump.c:7241 pg_dump.c:7348
-#, c-format
-msgid "query returned no rows: %s\n"
-msgstr "�������果行��り��ん���: %s\n"
-
-#: pg_dump.c:7698
+#: pg_dump.c:8555
 msgid "WARNING: bogus value in proargmodes array\n"
-msgstr "警告: proargnames�列内�����値��り��\n"
+msgstr "警告: proargmodes�列内�����値��り��\n"
 
-#: pg_dump.c:8010
+#: pg_dump.c:8869
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "警告: proallargtypes�列�解������ん���\n"
 
-#: pg_dump.c:8026
+#: pg_dump.c:8885
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "警告: proargmodes�列�解������ん���\n"
 
-#: pg_dump.c:8040
+#: pg_dump.c:8899
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "警告: proargnames�列�解������ん���\n"
 
-#: pg_dump.c:8051
+#: pg_dump.c:8910
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "警告: proconfig�列�解������ん���\n"
 
-#: pg_dump.c:8107
+#: pg_dump.c:8966
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "関数\"%s\"�provolatile値��明��\n"
 
-#: pg_dump.c:8310
+#: pg_dump.c:9182
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "警告: pg_cast.castmethod フィールド�無効�値��り��\n"
 
-#: pg_dump.c:8687
+#: pg_dump.c:9564
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "警告: OID %s�演算���り��ん���\n"
 
-#: pg_dump.c:9608
+#: pg_dump.c:10683
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
@@ -617,70 +638,70 @@ msgstr ""
 "警告: ��データベース�ージョン�集約関数%sを正確�ダンプ����ん���。"
 "(無視���)\n"
 
-#: pg_dump.c:10326
+#: pg_dump.c:11483
 #, c-format
 msgid "unknown object type (%d) in default privileges\n"
 msgstr "デフォルト権��中�未知�オブジェクト型 (%d) ��り��\n"
 
-#: pg_dump.c:10343
+#: pg_dump.c:11500
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "デフォルト� ACL リスト(%s)を解�����ん���\n"
 
-#: pg_dump.c:10400
+#: pg_dump.c:11557
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "オブジェクト\"%2$s\"(%3$s)用�ACLリスト(%1$s)を解�����ん���\n"
 
-#: pg_dump.c:10543
+#: pg_dump.c:11997
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "ビュー\"%s\"�定義を�り出����������空を返����\n"
 
-#: pg_dump.c:10546
+#: pg_dump.c:12000
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr ""
 "ビュー\\\"%s\\\"�定義を�り出����������複数�定義を返����\n"
 
-#: pg_dump.c:10555
+#: pg_dump.c:12009
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "ビュー\\\"%s\\\"�定義�空(長��0)�よ���\n"
 
-#: pg_dump.c:11031
+#: pg_dump.c:12576
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "テーブル\"%2$s\"�列番�%1$d�無効��\n"
 
-#: pg_dump.c:11139
+#: pg_dump.c:12687
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "制約\"%s\"用�インデックス�見��り��ん\n"
 
-#: pg_dump.c:11327
+#: pg_dump.c:12875
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "制約種類��明��: %c\n"
 
-#: pg_dump.c:11390
+#: pg_dump.c:12938
 msgid "missing pg_database entry for this database\n"
 msgstr "��データベース用�pg_databaseエントリ�見��り��ん\n"
 
-#: pg_dump.c:11395
+#: pg_dump.c:12943
 msgid "found more than one pg_database entry for this database\n"
 msgstr "��データベース用�pg_databaseエントリ�複数�り���\n"
 
-#: pg_dump.c:11427
+#: pg_dump.c:12975
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "pg_class内�pg_indexes用�エントリ��り��ん���\n"
 
-#: pg_dump.c:11432
+#: pg_dump.c:12980
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "pg_class内�pg_indexes用�エントリ�複数�り���\n"
 
-#: pg_dump.c:11503
+#: pg_dump.c:13052
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural ""
@@ -690,18 +711,23 @@ msgstr[0] ""
 msgstr[1] ""
 "シーケンス\"%s\"�データを得る���������%d行返����(想定行数�1)\n"
 
-#: pg_dump.c:11514
+#: pg_dump.c:13063
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr ""
 "シーケンス \"%s\"�データを得る����������� \"%s\" を返����\n"
 
-#: pg_dump.c:11808
+#: pg_dump.c:13291
+#, c-format
+msgid "unexpected tgtype value: %d\n"
+msgstr "想定外�tgtype値: %d\n"
+
+#: pg_dump.c:13373
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "テーブル\"%3$s\"�トリガ\"%2$s\"用�引数文字列(%1$s)�無効��\n"
 
-#: pg_dump.c:11924
+#: pg_dump.c:13491
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -711,170 +737,181 @@ msgstr ""
 "�\n"
 "間������\n"
 
-#: pg_dump.c:12019
+#: pg_dump.c:13748
 msgid "reading dependency data\n"
 msgstr "データ��存性を読�込ん����\n"
 
-#: pg_dump.c:12397
+#: pg_dump.c:14130
 msgid "SQL command failed\n"
 msgstr "SQLコマンド�失敗����\n"
 
-#: common.c:115
+#: common.c:105
 msgid "reading schemas\n"
 msgstr "スキーマを読�込ん����\n"
 
-#: common.c:119
+#: common.c:109
+msgid "reading extensions\n"
+msgstr "拡張を読�込ん����\n"
+
+#: common.c:113
 msgid "reading user-defined functions\n"
 msgstr "ユーザ定義関数を読�込ん����\n"
 
-#: common.c:125
+#: common.c:119
 msgid "reading user-defined types\n"
 msgstr "ユーザ定義型を読�込ん����\n"
 
-#: common.c:131
+#: common.c:125
 msgid "reading procedural languages\n"
 msgstr "手続�言語を読�込ん����\n"
 
-#: common.c:135
+#: common.c:129
 msgid "reading user-defined aggregate functions\n"
 msgstr "ユーザ定義�集約関数を読�込ん����\n"
 
-#: common.c:139
+#: common.c:133
 msgid "reading user-defined operators\n"
 msgstr "ユーザ定義演算�を読�込ん����\n"
 
-#: common.c:144
+#: common.c:138
 msgid "reading user-defined operator classes\n"
 msgstr "ユーザ定義�演算�クラスを読�込ん����\n"
 
-#: common.c:148
+#: common.c:142
+msgid "reading user-defined operator families\n"
+msgstr "ユーザ定義�演算�群を読�込ん����\n"
+
+#: common.c:146
 msgid "reading user-defined text search parsers\n"
 msgstr "ユーザ定義テキスト検索パーサを読�込ん����\n"
 
-#: common.c:152
+#: common.c:150
 msgid "reading user-defined text search templates\n"
 msgstr "ユーザ定義�テキスト検索テンプレートを読�込ん����\n"
 
-#: common.c:156
+#: common.c:154
 msgid "reading user-defined text search dictionaries\n"
 msgstr "ユーザ定義�テキスト検索辞書を読�込ん����\n"
 
-#: common.c:160
+#: common.c:158
 msgid "reading user-defined text search configurations\n"
 msgstr "ユーザ定義�テキスト検索設定を読�込ん����\n"
 
-#: common.c:164
+#: common.c:162
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "ユーザ定義�外国語データラッパーを読�込ん����\n"
 
-#: common.c:168
+#: common.c:166
 msgid "reading user-defined foreign servers\n"
 msgstr "ユーザ定義�外国語サー�ーを読�込ん����\n"
 
-#: common.c:172
+#: common.c:170
 msgid "reading default privileges\n"
 msgstr "デフォルト�権�設定を読�込ん����\n"
 
-#: common.c:176
-msgid "reading user-defined operator families\n"
-msgstr "ユーザ定義�演算�群を読�込ん����\n"
+#: common.c:174
+msgid "reading user-defined collations\n"
+msgstr "ユーザ定義�照�順�を読�込ん����\n"
 
-#: common.c:180
+#: common.c:179
 msgid "reading user-defined conversions\n"
 msgstr "ユーザ定義�変�ルー�ンを読�込ん����\n"
 
-#: common.c:184
+#: common.c:183
+msgid "reading type casts\n"
+msgstr "型キャストを読�込ん����\n"
+
+#: common.c:187
 msgid "reading user-defined tables\n"
 msgstr "ユーザ定義�テーブルを読�込ん����\n"
 
-#: common.c:189
+#: common.c:192
 msgid "reading table inheritance information\n"
 msgstr "テーブル�継承情報を読�込ん����\n"
 
-#: common.c:193
+#: common.c:196
 msgid "reading rewrite rules\n"
 msgstr "書���ルールを読�込ん����\n"
 
-#: common.c:197
-msgid "reading type casts\n"
-msgstr "型キャストを読�込ん����\n"
+#: common.c:205
+msgid "finding extension members\n"
+msgstr "拡張�メン�を探�����\n"
 
-#: common.c:202
+#: common.c:210
 msgid "finding inheritance relationships\n"
 msgstr "継承関係を検索�����\n"
 
-#: common.c:206
+#: common.c:214
 msgid "reading column info for interesting tables\n"
 msgstr "継承テーブル用�列情報を読�込ん����\n"
 
-#: common.c:210
+#: common.c:218
 msgid "flagging inherited columns in subtables\n"
 msgstr "�テーブル�継承列�フラグを設定�����\n"
 
-#: common.c:214
+#: common.c:222
 msgid "reading indexes\n"
 msgstr "インデックスを読�込ん����\n"
 
-#: common.c:218
+#: common.c:226
 msgid "reading constraints\n"
 msgstr "制約を読�込ん����\n"
 
-#: common.c:222
+#: common.c:230
 msgid "reading triggers\n"
 msgstr "トリガを読�込ん����\n"
 
-#: common.c:802
+#: common.c:822
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr ""
 "�全性検査�失敗����。テーブル\"%2$s\"(OID %3$u)�親�OID %1$u��り��"
 "ん���\n"
 
-#: common.c:844
+#: common.c:864
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "数値�列 \"%s\" �解��失敗����:�数�大�����\n"
 
-#: common.c:859
+#: common.c:879
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr "数値�列 \"%s\" �解��失敗����:数�無効�文字��り��\n"
 
-#: common.c:972
+#: common.c:992
 msgid "cannot duplicate null pointer\n"
 msgstr "null �インタを複製����ん\n"
 
-#: common.c:975 common.c:986 common.c:997 common.c:1008
-#: pg_backup_archiver.c:727 pg_backup_archiver.c:1096
-#: pg_backup_archiver.c:1227 pg_backup_archiver.c:1694
-#: pg_backup_archiver.c:1851 pg_backup_archiver.c:1897
-#: pg_backup_archiver.c:4029 pg_backup_custom.c:144 pg_backup_custom.c:149
-#: pg_backup_custom.c:155 pg_backup_custom.c:170 pg_backup_custom.c:570
-#: pg_backup_custom.c:1113 pg_backup_custom.c:1122 pg_backup_db.c:154
+#: common.c:995 common.c:1006 common.c:1017 common.c:1028
+#: pg_backup_archiver.c:739 pg_backup_archiver.c:1135
+#: pg_backup_archiver.c:1270 pg_backup_archiver.c:1740
+#: pg_backup_archiver.c:1934 pg_backup_archiver.c:1980
+#: pg_backup_archiver.c:4199 pg_backup_custom.c:132 pg_backup_custom.c:139
+#: pg_backup_custom.c:775 pg_backup_custom.c:902 pg_backup_db.c:154
 #: pg_backup_db.c:164 pg_backup_db.c:212 pg_backup_db.c:256 pg_backup_db.c:271
 #: pg_backup_db.c:305 pg_backup_files.c:114 pg_backup_null.c:72
-#: pg_backup_tar.c:167 pg_backup_tar.c:1011
+#: pg_backup_tar.c:171 pg_backup_tar.c:1015
 msgid "out of memory\n"
 msgstr "メモリ�足��\n"
 
-#: pg_backup_archiver.c:80
+#: pg_backup_archiver.c:88
 msgid "archiver"
 msgstr "アーカイ�"
 
-#: pg_backup_archiver.c:195 pg_backup_archiver.c:1191
+#: pg_backup_archiver.c:206 pg_backup_archiver.c:1234
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "出力ファイルをクローズ����ん���: %s\n"
 
-#: pg_backup_archiver.c:220
+#: pg_backup_archiver.c:231
 msgid "-C and -c are incompatible options\n"
 msgstr "オプション-C�-c�互�性��り��ん\n"
 
-#: pg_backup_archiver.c:227
+#: pg_backup_archiver.c:238
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C � -1 �互�性��り��ん\n"
 
-#: pg_backup_archiver.c:239
+#: pg_backup_archiver.c:250
 msgid ""
 "cannot restore from compressed archive (compression not supported in this "
 "installation)\n"
@@ -882,70 +919,70 @@ msgstr ""
 "圧縮�れ�アーカイブ�らリストア����ん(導入�れ��イナリ��圧縮機能�サ"
 "�ート�組�込�れ����ん)\n"
 
-#: pg_backup_archiver.c:249
+#: pg_backup_archiver.c:260
 msgid "connecting to database for restore\n"
 msgstr "リストア����データベース�接続�����\n"
 
-#: pg_backup_archiver.c:251
+#: pg_backup_archiver.c:262
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr ""
 "1.3以��アーカイブ��データベース��直接接続�サ�ート�れ����ん\n"
 
-#: pg_backup_archiver.c:293
+#: pg_backup_archiver.c:304
 msgid "implied data-only restore\n"
 msgstr "データ���リストアを目的������\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:356
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "%s %sを削除�����\n"
 
-#: pg_backup_archiver.c:396
+#: pg_backup_archiver.c:408
 #, c-format
 msgid "setting owner and privileges for %s %s\n"
 msgstr "%s %s用�所有者�権�を設定�����\n"
 
-#: pg_backup_archiver.c:454 pg_backup_archiver.c:456
+#: pg_backup_archiver.c:466 pg_backup_archiver.c:468
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "オリジナル�ダンプファイル�警告: %s\n"
 
-#: pg_backup_archiver.c:463
+#: pg_backup_archiver.c:475
 #, c-format
 msgid "creating %s %s\n"
 msgstr "%s %sを作������\n"
 
-#: pg_backup_archiver.c:507
+#: pg_backup_archiver.c:519
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "新��データベース\"%s\"�接続�����\n"
 
-#: pg_backup_archiver.c:535
+#: pg_backup_archiver.c:547
 #, c-format
 msgid "restoring %s\n"
 msgstr "%sを復元�����\n"
 
-#: pg_backup_archiver.c:549
+#: pg_backup_archiver.c:561
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "テーブル\"%s\"�データをリストア�����\n"
 
-#: pg_backup_archiver.c:609
+#: pg_backup_archiver.c:621
 #, c-format
 msgid "executing %s %s\n"
 msgstr "%s %sを実行�����\n"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:654
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "%s�トリガを無効������\n"
 
-#: pg_backup_archiver.c:668
+#: pg_backup_archiver.c:680
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "%s�トリガを有効������\n"
 
-#: pg_backup_archiver.c:698
+#: pg_backup_archiver.c:710
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine\n"
@@ -953,197 +990,209 @@ msgstr ""
 "内部的エラー -- WriteData�DataDumper処��コンテキスト外部��呼�出����"
 "����ん\n"
 
-#: pg_backup_archiver.c:854
+#: pg_backup_archiver.c:867
 msgid "large-object output not supported in chosen format\n"
 msgstr "�択��書���ラージオブジェクト出力をサ�ート�����ん\n"
 
-#: pg_backup_archiver.c:908
+#: pg_backup_archiver.c:921
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "%d個�ラージオブジェクトをリストア����\n"
 msgstr[1] "%d個�ラージオブジェクトをリストア����\n"
 
-#: pg_backup_archiver.c:929
+#: pg_backup_archiver.c:942
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "OID %u�ラージオブジェクトをリストア�����\n"
 
-#: pg_backup_archiver.c:941
+#: pg_backup_archiver.c:954
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "ラージオブジェクト %u を作�����ん���: %s"
 
-#: pg_backup_archiver.c:1010
+#: pg_backup_archiver.c:1016
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "TOCファイル\"%s\"をオープン����ん���：%s\n"
 
-#: pg_backup_archiver.c:1029
+#: pg_backup_archiver.c:1057
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "警告: 行を無視����: %s\n"
 
-#: pg_backup_archiver.c:1036
+#: pg_backup_archiver.c:1064
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "ID %d�エントリ��り��ん���\n"
 
-#: pg_backup_archiver.c:1046 pg_backup_files.c:172 pg_backup_files.c:457
+#: pg_backup_archiver.c:1085 pg_backup_files.c:172 pg_backup_files.c:457
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "TOCファイルをクローズ����ん���: %s\n"
 
-#: pg_backup_archiver.c:1170 pg_backup_custom.c:181 pg_backup_files.c:130
+#: pg_backup_archiver.c:1204 pg_backup_custom.c:152 pg_backup_files.c:130
 #: pg_backup_files.c:262
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "出力ファイル \"%s\" をオープン����ん���: %s\n"
 
-#: pg_backup_archiver.c:1173 pg_backup_custom.c:188 pg_backup_files.c:137
+#: pg_backup_archiver.c:1207 pg_backup_custom.c:159 pg_backup_files.c:137
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "出力ファイルをオープン����ん���: %s\n"
 
-#: pg_backup_archiver.c:1270
+#: pg_backup_archiver.c:1313
 #, c-format
 msgid "wrote %lu byte of large object data (result = %lu)\n"
 msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr[0] "ラージオブジェクト�%lu�イトを書�出����(�果�%lu)\n"
 msgstr[1] "ラージオブジェクト�%lu�イトを書�出����(�果�%lu)\n"
 
-#: pg_backup_archiver.c:1276
+#: pg_backup_archiver.c:1319
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr ""
 "ラージオブジェクトを書�出��������ん���(�果�%lu�期待値�%lu)\n"
 
-#: pg_backup_archiver.c:1334 pg_backup_archiver.c:1357 pg_backup_custom.c:781
-#: pg_backup_custom.c:1035 pg_backup_custom.c:1049 pg_backup_files.c:432
-#: pg_backup_tar.c:586 pg_backup_tar.c:1089 pg_backup_tar.c:1382
+#: pg_backup_archiver.c:1377 pg_backup_archiver.c:1400 pg_backup_custom.c:652
+#: pg_backup_files.c:432 pg_backup_tar.c:590 pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
 #, c-format
 msgid "could not write to output file: %s\n"
 msgstr "出力ファイル�書�込���ん���: %s\n"
 
-#: pg_backup_archiver.c:1342
+#: pg_backup_archiver.c:1385
 msgid "could not write to custom output routine\n"
 msgstr "カスタム出力処��書�出���ん���\n"
 
-#: pg_backup_archiver.c:1440
+#: pg_backup_archiver.c:1483
 msgid "Error while INITIALIZING:\n"
 msgstr "�期処�中�エラー��り���:\n"
 
-#: pg_backup_archiver.c:1445
+#: pg_backup_archiver.c:1488
 msgid "Error while PROCESSING TOC:\n"
 msgstr "TOC処�中�エラー��り���:\n"
 
-#: pg_backup_archiver.c:1450
+#: pg_backup_archiver.c:1493
 msgid "Error while FINALIZING:\n"
 msgstr "後処�中�エラー��り���:\n"
 
-#: pg_backup_archiver.c:1455
+#: pg_backup_archiver.c:1498
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "TOCエントリ%d; %u %u %s %s %s�エラー��\n"
 
-#: pg_backup_archiver.c:1587
+#: pg_backup_archiver.c:1633
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "想定外�データオフセットフラグ %d ��\n"
 
-#: pg_backup_archiver.c:1600
+#: pg_backup_archiver.c:1646
 msgid "file offset in dump file is too large\n"
 msgstr "ダンプファイル�ファイルオフセット�大�����\n"
 
-#: pg_backup_archiver.c:1697 pg_backup_archiver.c:2998 pg_backup_custom.c:757
-#: pg_backup_files.c:419 pg_backup_tar.c:785
+#: pg_backup_archiver.c:1743 pg_backup_archiver.c:3095 pg_backup_custom.c:630
+#: pg_backup_files.c:419 pg_backup_tar.c:789
 msgid "unexpected end of file\n"
 msgstr "想定外�ファイル終端��\n"
 
-#: pg_backup_archiver.c:1714
+#: pg_backup_archiver.c:1760
 msgid "attempting to ascertain archive format\n"
 msgstr "アーカイブ書��確�を試ん����\n"
 
-#: pg_backup_archiver.c:1730 pg_backup_custom.c:200 pg_backup_custom.c:888
+#: pg_backup_archiver.c:1786 pg_backup_archiver.c:1796
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "ディレクトリ�称�長����: \"%s\"\n"
+
+#: pg_backup_archiver.c:1804
+#, c-format
+msgid ""
+"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
+"exist)\n"
+msgstr "\"%s\"ディレクトリ�有効�アーカイブ����よ���（\"toc.dat\"��り��ん）\n"
+
+#: pg_backup_archiver.c:1812 pg_backup_custom.c:171 pg_backup_custom.c:757
 #: pg_backup_files.c:155 pg_backup_files.c:307
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "入力ファイル \"%s\" をオープン����ん���: %s\n"
 
-#: pg_backup_archiver.c:1737 pg_backup_custom.c:207 pg_backup_files.c:162
+#: pg_backup_archiver.c:1820 pg_backup_custom.c:178 pg_backup_files.c:162
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "入力ファイルをオープン����ん���: %s\n"
 
-#: pg_backup_archiver.c:1746
+#: pg_backup_archiver.c:1829
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "入力ファイルを読�込���ん���: %s\n"
 
-#: pg_backup_archiver.c:1748
+#: pg_backup_archiver.c:1831
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "入力ファイル�������(読��り%lu�期待値 5)\n"
 
-#: pg_backup_archiver.c:1806
+#: pg_backup_archiver.c:1889
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "入力ファイル�有効�アーカイブ����よ���(����る?)\n"
 
-#: pg_backup_archiver.c:1809
+#: pg_backup_archiver.c:1892
 msgid "input file does not appear to be a valid archive\n"
 msgstr "入力ファイル�有効�アーカイブ����よ���\n"
 
-#: pg_backup_archiver.c:1829
+#: pg_backup_archiver.c:1912
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "入力ファイルをクローズ����ん���: %s\n"
 
-#: pg_backup_archiver.c:1846
+#: pg_backup_archiver.c:1929
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "%s�AHを割り当�����。書��%d��\n"
 
-#: pg_backup_archiver.c:1954
+#: pg_backup_archiver.c:2041
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "ファイル書�\"%d\"��明��\n"
 
-#: pg_backup_archiver.c:2076
+#: pg_backup_archiver.c:2163
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "エントリID %d�範囲外�� -- TOC�破���能性��り��\n"
 
-#: pg_backup_archiver.c:2192
+#: pg_backup_archiver.c:2279
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "%3$s %4$s用�TOCエントリ%1$d(ID %2$d)を読�込����\n"
 
-#: pg_backup_archiver.c:2226
+#: pg_backup_archiver.c:2313
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "エンコーディング \"%s\" を�識����ん\n"
 
-#: pg_backup_archiver.c:2231
+#: pg_backup_archiver.c:2318
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "無効� ENCODING 項目：%s\n"
 
-#: pg_backup_archiver.c:2249
+#: pg_backup_archiver.c:2336
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "無効�STDSTRINGS 項目：%s\n"
 
-#: pg_backup_archiver.c:2441
+#: pg_backup_archiver.c:2534
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "セッションユーザを\"%s\"�設定����ん���: %s"
 
-#: pg_backup_archiver.c:2779 pg_backup_archiver.c:2929
+#: pg_backup_archiver.c:2874 pg_backup_archiver.c:3026
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr "WARNING: オブジェクト種類%s�対�る所有者�設定方法��明��。\n"
 
-#: pg_backup_archiver.c:2961
+#: pg_backup_archiver.c:3058
 msgid ""
 "WARNING: requested compression not available in this installation -- archive "
 "will be uncompressed\n"
@@ -1151,21 +1200,21 @@ msgstr ""
 "警告: �求�れ�圧縮方法���インストレーション�利用����ん --アーカイブ"
 "を圧縮���ん\n"
 
-#: pg_backup_archiver.c:3001
+#: pg_backup_archiver.c:3098
 msgid "did not find magic string in file header\n"
 msgstr "ファイルヘッダ�マジック番���り��ん���\n"
 
-#: pg_backup_archiver.c:3014
+#: pg_backup_archiver.c:3111
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "ファイルヘッダ内��ージョン(%d.%d)�サ�ート�れ����ん\n"
 
-#: pg_backup_archiver.c:3019
+#: pg_backup_archiver.c:3116
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "整数�サイズ(%lu)�関�る�全性検査�失敗����\n"
 
-#: pg_backup_archiver.c:3023
+#: pg_backup_archiver.c:3120
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "might fail\n"
@@ -1173,12 +1222,12 @@ msgstr ""
 "警告: アーカイブ�より大��サイズ�整数を��マシン�作��れ���。一部�"
 "�作�失敗�る�能性��り��\n"
 
-#: pg_backup_archiver.c:3033
+#: pg_backup_archiver.c:3130
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "想定��書�(%d)�ファイル内�書�(%d)�異�り��\n"
 
-#: pg_backup_archiver.c:3049
+#: pg_backup_archiver.c:3146
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression -- no data will be available\n"
@@ -1186,125 +1235,125 @@ msgstr ""
 "警告: アーカイブ�圧縮�れ��������インストレーション��圧縮機能をサ"
 "�ート�����ん -- 利用��るデータ��り��ん\n"
 
-#: pg_backup_archiver.c:3067
+#: pg_backup_archiver.c:3164
 msgid "WARNING: invalid creation date in header\n"
 msgstr "警告: ヘッダ内�作�日付�無効��\n"
 
-#: pg_backup_archiver.c:3164
+#: pg_backup_archiver.c:3262
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "restore_toc_entries_parallel �入り��\n"
 
-#: pg_backup_archiver.c:3168
+#: pg_backup_archiver.c:3266
 msgid "parallel restore is not supported with this archive file format\n"
 msgstr ""
 "��アーカイブファイルフォーマット��並列リストアをサ�ート�����ん\n"
 
-#: pg_backup_archiver.c:3172
+#: pg_backup_archiver.c:3270
 msgid ""
 "parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
 msgstr ""
 "8.0 以�� pg_dump �作られ�アーカイブ��並列リストアをサ�ート�����"
 "ã‚“\n"
 
-#: pg_backup_archiver.c:3191
+#: pg_backup_archiver.c:3311
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "%d %s %s を処������\n"
 
-#: pg_backup_archiver.c:3247
+#: pg_backup_archiver.c:3387
 msgid "entering main parallel loop\n"
 msgstr "メイン�並列ループ�入り��\n"
 
-#: pg_backup_archiver.c:3261
+#: pg_backup_archiver.c:3401
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "項目 %d %s %s をスキップ�����\n"
 
-#: pg_backup_archiver.c:3277
+#: pg_backup_archiver.c:3417
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "項目 %d %s %s ��手���\n"
 
-#: pg_backup_archiver.c:3314
+#: pg_backup_archiver.c:3454
 #, c-format
 msgid "worker process crashed: status %d\n"
 msgstr "ワーカープロセス�クラッシュ����：ステータス %d\n"
 
-#: pg_backup_archiver.c:3319
+#: pg_backup_archiver.c:3459
 msgid "finished main parallel loop\n"
 msgstr "メイン�並列ループを終了���\n"
 
-#: pg_backup_archiver.c:3337
+#: pg_backup_archiver.c:3477
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "見��ら����項目 %d %s %s を処������\n"
 
-#: pg_backup_archiver.c:3363
+#: pg_backup_archiver.c:3503
 msgid "parallel_restore should not return\n"
 msgstr "parallel_restore � return ���ん\n"
 
-#: pg_backup_archiver.c:3369
+#: pg_backup_archiver.c:3509
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "ワーカープロセスを作�����ん���: %s\n"
 
-#: pg_backup_archiver.c:3377
+#: pg_backup_archiver.c:3517
 #, c-format
 msgid "could not create worker thread: %s\n"
 msgstr "ワーカースレッドを作�����ん���: %s\n"
 
-#: pg_backup_archiver.c:3601
+#: pg_backup_archiver.c:3741
 msgid "no item ready\n"
 msgstr "準備�����る項目��り��ん\n"
 
-#: pg_backup_archiver.c:3696
+#: pg_backup_archiver.c:3836
 msgid "could not find slot of finished worker\n"
 msgstr "終了��ワーカー�スロット�検索�失敗����\n"
 
-#: pg_backup_archiver.c:3698
+#: pg_backup_archiver.c:3838
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "項目 %d %s %s を完了����\n"
 
-#: pg_backup_archiver.c:3711
+#: pg_backup_archiver.c:3851
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "ワーカープロセス�終了コード %d �終了����\n"
 
-#: pg_backup_archiver.c:3863
+#: pg_backup_archiver.c:4047
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "%d -> %d �ら %d ���存関係を転������\n"
 
-#: pg_backup_archiver.c:3937
+#: pg_backup_archiver.c:4116
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "%d ��存関係を軽減�����\n"
 
-#: pg_backup_archiver.c:3995
+#: pg_backup_archiver.c:4165
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "テーブル \"%s\" を作�����ん���。��データ�復元�れ��ん\n"
 
-#: pg_backup_custom.c:97
+#: pg_backup_custom.c:87
 msgid "custom archiver"
 msgstr "カスタムアーカイ�"
 
-#: pg_backup_custom.c:405 pg_backup_null.c:153
+#: pg_backup_custom.c:373 pg_backup_null.c:153
 msgid "invalid OID for large object\n"
 msgstr "ラージオブジェクト�OID�無効��\n"
 
-#: pg_backup_custom.c:471
+#: pg_backup_custom.c:444
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "アーカイブ�検索中�未知�データブロック種類(%d)��り���\n"
 
-#: pg_backup_custom.c:482
+#: pg_backup_custom.c:455
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "ファイルシーク中�エラー��り���: %s\n"
 
-#: pg_backup_custom.c:492
+#: pg_backup_custom.c:465
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
@@ -1315,7 +1364,7 @@ msgstr ""
 "��る����。��場��アーカイブ中�オフセット�情報�����処����"
 "�ん\n"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:470
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
@@ -1324,93 +1373,72 @@ msgstr ""
 "アーカイブ中�ブロックID %d ��り��ん -- ��ら�リストア�求�順��誤�"
 "��る����。��場��入力ファイル�シーク�能��る��処�����ん\n"
 
-#: pg_backup_custom.c:502
+#: pg_backup_custom.c:475
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
 msgstr ""
 "アーカイブ内�ブロック ID %d ��り��ん��� -- ��ら�アーカイブ�壊れ�"
 "���\n"
 
-#: pg_backup_custom.c:509
+#: pg_backup_custom.c:482
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
 msgstr "データ読�込�時�想定外�ブロックID(%d)��り��� -- 期待値�%d\n"
 
-#: pg_backup_custom.c:523
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr "アーカイブ�りストア中�未知�データブロック種類%d��り���\n"
 
-#: pg_backup_custom.c:557 pg_backup_custom.c:985
-#, c-format
-msgid "could not initialize compression library: %s\n"
-msgstr "圧縮ライブラリを�期化����ん���: %s\n"
-
-#: pg_backup_custom.c:581 pg_backup_custom.c:705
+#: pg_backup_custom.c:578 pg_backup_custom.c:911
 msgid "could not read from input file: end of file\n"
 msgstr "入力ファイル�ら読�込���ん���: ファイル�終了��\n"
 
-#: pg_backup_custom.c:584 pg_backup_custom.c:708
+#: pg_backup_custom.c:581 pg_backup_custom.c:914
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "入力ファイル�ら読�込���ん���: %s\n"
 
-#: pg_backup_custom.c:601 pg_backup_custom.c:628
-#, c-format
-msgid "could not uncompress data: %s\n"
-msgstr "データを伸長����ん���: %s\n"
-
-#: pg_backup_custom.c:634
-#, c-format
-msgid "could not close compression library: %s\n"
-msgstr "圧縮ライブラリをクローズ����ん���: %s\n"
-
-#: pg_backup_custom.c:736
+#: pg_backup_custom.c:610
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "�イトを書�込���ん���: %s\n"
 
-#: pg_backup_custom.c:849 pg_backup_custom.c:882
+#: pg_backup_custom.c:718 pg_backup_custom.c:751
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "アーカイブファイルをクローズ����ん���: %s\n"
 
-#: pg_backup_custom.c:868
+#: pg_backup_custom.c:737
 msgid "can only reopen input archives\n"
 msgstr "入力アーカイブ��を�オープン����\n"
 
-#: pg_backup_custom.c:870
+#: pg_backup_custom.c:739
 msgid "cannot reopen stdin\n"
 msgstr "標準入力を�オープン����ん\n"
 
-#: pg_backup_custom.c:872
+#: pg_backup_custom.c:741
 msgid "cannot reopen non-seekable file\n"
 msgstr "シーク����ファイルを�オープン����ん\n"
 
-#: pg_backup_custom.c:877
+#: pg_backup_custom.c:746
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr "アーカイブファイル�シーク�置を決定����ん���: %s\n"
 
-#: pg_backup_custom.c:892
+#: pg_backup_custom.c:761
 #, c-format
 msgid "could not set seek position in archive file: %s\n"
 msgstr "アーカイブファイル�シーク�置をセット����ん���: %s\n"
 
-#: pg_backup_custom.c:914
+#: pg_backup_custom.c:781
+msgid "compressor active\n"
+msgstr "圧縮処��有効��\n"
+
+#: pg_backup_custom.c:817
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr "警告: ftell�想定�置���整���り��� -- ftell�使用�れ���\n"
 
-#: pg_backup_custom.c:1016
-#, c-format
-msgid "could not compress data: %s\n"
-msgstr "データを圧縮����ん���: %s\n"
-
-#: pg_backup_custom.c:1094
-#, c-format
-msgid "could not close compression stream: %s\n"
-msgstr "圧縮用ストリームをクローズ����ん���: %s\n"
-
 #: pg_backup_db.c:25
 msgid "archiver (db)"
 msgstr "アーカイ�(db)"
@@ -1419,12 +1447,12 @@ msgstr "アーカイ�(db)"
 msgid "could not get server_version from libpq\n"
 msgstr "libpq�らserver_versionを�り出���ん���\n"
 
-#: pg_backup_db.c:74 pg_dumpall.c:1717
+#: pg_backup_db.c:74 pg_dumpall.c:1741
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "サー��ージョン: %s�%s �ージョン: %s\n"
 
-#: pg_backup_db.c:76 pg_dumpall.c:1719
+#: pg_backup_db.c:76 pg_dumpall.c:1743
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "サー��ージョン��整����処�を中断�����\n"
@@ -1435,7 +1463,7 @@ msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "データベース\"%s\"�ユーザ\"%s\"�接続�����\n"
 
 #: pg_backup_db.c:152 pg_backup_db.c:207 pg_backup_db.c:254 pg_backup_db.c:303
-#: pg_dumpall.c:1613 pg_dumpall.c:1665
+#: pg_dumpall.c:1637 pg_dumpall.c:1689
 msgid "Password: "
 msgstr "パスワード: "
 
@@ -1533,7 +1561,7 @@ msgstr "�イトを書�込���ん���\n"
 msgid "could not open large object TOC for output: %s\n"
 msgstr "出力用�ラージオブジェクトTOCをオープン����ん���: %s\n"
 
-#: pg_backup_files.c:510 pg_backup_tar.c:935
+#: pg_backup_files.c:510 pg_backup_tar.c:939
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "ラージオブジェクト�OID�無効��(%u)\n"
@@ -1552,62 +1580,62 @@ msgstr "ラージオブジェクトファイルをクローズ����ん�
 msgid "this format cannot be read\n"
 msgstr "��書��読�込���ん\n"
 
-#: pg_backup_tar.c:101
+#: pg_backup_tar.c:105
 msgid "tar archiver"
 msgstr "tarアーカイ�"
 
-#: pg_backup_tar.c:179
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
 msgstr "出力用�TOCファイル\"%s\"をオープン����ん���: %s\n"
 
-#: pg_backup_tar.c:187
+#: pg_backup_tar.c:191
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "出力用�TOCファイルをオープン����ん���: %s\n"
 
-#: pg_backup_tar.c:214 pg_backup_tar.c:370
+#: pg_backup_tar.c:218 pg_backup_tar.c:374
 msgid "compression is not supported by tar archive format\n"
 msgstr "tar アーカイブフォーマット��圧縮をサ�ート�����ん\n"
 
-#: pg_backup_tar.c:222
+#: pg_backup_tar.c:226
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
 msgstr "入力用�TOCファイル\"%s\"をオープン����ん���: %s\n"
 
-#: pg_backup_tar.c:229
+#: pg_backup_tar.c:233
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "入力用�TOCファイルをオープン����ん���: %s\n"
 
-#: pg_backup_tar.c:356
+#: pg_backup_tar.c:360
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
 msgstr "アーカイブ内�ファイル\"%s\"��り��ん���\n"
 
-#: pg_backup_tar.c:412
+#: pg_backup_tar.c:416
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "一時ファイル�を生�����ん���: %s\n"
 
-#: pg_backup_tar.c:421
+#: pg_backup_tar.c:425
 msgid "could not open temporary file\n"
 msgstr "一時ファイルをオープン����ん���\n"
 
-#: pg_backup_tar.c:448
+#: pg_backup_tar.c:452
 msgid "could not close tar member\n"
 msgstr "tarメン�をクローズ����ん���\n"
 
-#: pg_backup_tar.c:548
+#: pg_backup_tar.c:552
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "内部エラー -- tarReadRaw()��thもfhも指定�れ����ん���\n"
 
-#: pg_backup_tar.c:674
+#: pg_backup_tar.c:678
 #, c-format
 msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
 msgstr "COPY文�無効�� -- 文字列\"%s\"�\"copy\"��り��ん���\n"
 
-#: pg_backup_tar.c:692
+#: pg_backup_tar.c:696
 #, c-format
 msgid ""
 "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
@@ -1616,54 +1644,54 @@ msgstr ""
 "COPY文�無効�� -- 文字列\"%s\"�%lu�置�ら\"from stdin\"��り��ん��"
 "�\n"
 
-#: pg_backup_tar.c:729
+#: pg_backup_tar.c:733
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "OID %u�ラージオブジェクトをリストア�����\n"
 
-#: pg_backup_tar.c:880
+#: pg_backup_tar.c:884
 msgid "could not write null block at end of tar archive\n"
 msgstr "tarアーカイブ�最後�ヌルブロックを書�出���ん���\n"
 
-#: pg_backup_tar.c:1080
+#: pg_backup_tar.c:1084
 msgid "archive member too large for tar format\n"
 msgstr "tar書��アーカイブメン��大�����\n"
 
-#: pg_backup_tar.c:1095
+#: pg_backup_tar.c:1099
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "一時ファイルを開���ん���：%s\n"
 
-#: pg_backup_tar.c:1105
+#: pg_backup_tar.c:1109
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "実際�ファイル長(%s)�期待値(%s)�一致���ん\n"
 
-#: pg_backup_tar.c:1113
+#: pg_backup_tar.c:1117
 msgid "could not output padding at end of tar member\n"
 msgstr "tarメン��最後�パディングを出力����ん���\n"
 
-#: pg_backup_tar.c:1142
+#: pg_backup_tar.c:1146
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "�置%s�らファイル�置%s�次�メン��移動�����\n"
 
-#: pg_backup_tar.c:1153
+#: pg_backup_tar.c:1157
 #, c-format
 msgid "now at file position %s\n"
 msgstr "�在�ファイル�置�%s��\n"
 
-#: pg_backup_tar.c:1162 pg_backup_tar.c:1192
+#: pg_backup_tar.c:1166 pg_backup_tar.c:1196
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
 msgstr "tar アーカイブ内�ファイル\"%s\"用�ファイルヘッダ��り��ん���\n"
 
-#: pg_backup_tar.c:1176
+#: pg_backup_tar.c:1180
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "tarメン�%sを飛������\n"
 
-#: pg_backup_tar.c:1180
+#: pg_backup_tar.c:1184
 #, c-format
 msgid ""
 "restoring data out of order is not supported in this archive format: \"%s\" "
@@ -1672,24 +1700,24 @@ msgstr ""
 "��アーカイブ書����順�外�データ�ダンプ�サ�ート�れ����ん:\"%s"
 "\"を想定��������アーカイブファイル内��\"%s\"����り���\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1230
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr "実際�ファイル�置�予測ファイル�置�一致���ん(%s vs. %s)\n"
 
-#: pg_backup_tar.c:1241
+#: pg_backup_tar.c:1245
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "�完全�tarヘッダ��り���(%lu�イト)\n"
 msgstr[1] "�完全�tarヘッダ��り���(%lu�イト)\n"
 
-#: pg_backup_tar.c:1279
+#: pg_backup_tar.c:1283
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "%2$s�TOCエントリ%1$s(長� %3$lu��ェックサム %4$d)\n"
 
-#: pg_backup_tar.c:1289
+#: pg_backup_tar.c:1293
 #, c-format
 msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
@@ -1697,29 +1725,28 @@ msgstr ""
 "破���tarヘッダ�ファイル�置%4$s�%1$s��り���(期待値 %2$d��果 %3"
 "$d)\n"
 
-#: pg_restore.c:308
+#: pg_restore.c:300
 #, c-format
 msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
-msgstr ""
-"\"%s: -d/--dbnameオプション�-f/--fileオプション��時�使用����ん\n"
+msgstr "%s: -d/--dbnameオプション�-f/--fileオプション��時�使用����ん\n"
 
-#: pg_restore.c:320
+#: pg_restore.c:312
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr "%s: --single-transaction �並列ジョブ��時��指定����ん\n"
 
-#: pg_restore.c:350
+#: pg_restore.c:348
 #, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\" or \"t\"\n"
-msgstr ""
-"未知�アーカイブフォーマット\"%s\"; \"c\" ���\"t\"を指定������\n"
+msgid ""
+"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
+msgstr "未知�アーカイブフォーマット\"%s\"; \"c\"�\"d\"���\"t\"を指定������\n"
 
-#: pg_restore.c:384
+#: pg_restore.c:382
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "警告: リストア��エラーを無視����: %d\n"
 
-#: pg_restore.c:398
+#: pg_restore.c:396
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1728,49 +1755,49 @@ msgstr ""
 "%s�pg_dump�作���アーカイブ�らPostgreSQLデータベースをリストア���。\n"
 "\n"
 
-#: pg_restore.c:400
+#: pg_restore.c:398
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPTION]... [FILE]\n"
 
-#: pg_restore.c:403
+#: pg_restore.c:401
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        接続�るデータベース�\n"
 
-#: pg_restore.c:404
+#: pg_restore.c:402
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=FILENAME      出力ファイル���\n"
 
-#: pg_restore.c:405
+#: pg_restore.c:403
 #, c-format
-msgid "  -F, --format=c|t         backup file format (should be automatic)\n"
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
-"  -F, --format=c|t         �ックアップファイル�書�\n"
+"  -F, --format=c|d|t         �ックアップファイル�書�\n"
 "                           （自動的�設定�れる����）\n"
 
-#: pg_restore.c:406
+#: pg_restore.c:404
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               アーカイブ�TOC��約を表示\n"
 
-#: pg_restore.c:407
+#: pg_restore.c:405
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            冗長モード��\n"
 
-#: pg_restore.c:408
+#: pg_restore.c:406
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   ヘルプを表示��終了���\n"
 
-#: pg_restore.c:409
+#: pg_restore.c:407
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                �ージョン情報を表示��終了���\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1779,40 +1806,40 @@ msgstr ""
 "\n"
 "リストア制御用�オプション:\n"
 
-#: pg_restore.c:412
+#: pg_restore.c:410
 #, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr ""
 "  -a, --data-only          データ��をリストア。スキーマをリストア���ん\n"
 
-#: pg_restore.c:413
+#: pg_restore.c:411
 #, c-format
 msgid ""
 "  -c, --clean              clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean              �作���データベースを削除���\n"
 
-#: pg_restore.c:414
+#: pg_restore.c:412
 #, c-format
 msgid "  -C, --create             create the target database\n"
 msgstr "  -C, --create             対象�データベースを作�\n"
 
-#: pg_restore.c:415
+#: pg_restore.c:413
 #, c-format
 msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error      エラー時�終了。デフォルト�継続\n"
 
-#: pg_restore.c:416
+#: pg_restore.c:414
 #, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=NAME         指���インデックスをリストア\n"
 
-#: pg_restore.c:417
+#: pg_restore.c:415
 #, c-format
 msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=NUM           リストア時�指定��数�並列ジョブを使���\n"
 
-#: pg_restore.c:418
+#: pg_restore.c:416
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use table of contents from this file for\n"
@@ -1821,34 +1848,34 @@ msgstr ""
 "  -L, --use-list=FILENAME  ��ファイル�内容�従�� SELECT や\n"
 "                           出力�ソートを行���\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:418
 #, c-format
 msgid "  -n, --schema=NAME        restore only objects in this schema\n"
 msgstr ""
 "  -n, --schema=NAME        指定��スキーマ�オブジェクト��をリストア��"
 "�\n"
 
-#: pg_restore.c:421
+#: pg_restore.c:419
 #, c-format
 msgid "  -O, --no-owner           skip restoration of object ownership\n"
 msgstr "  -O, --no-owner           オブジェクト�所有権�復元を�略\n"
 
-#: pg_restore.c:422
+#: pg_restore.c:420
 #, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
 "                           restore named function\n"
 msgstr ""
-"  -P, --function=NAME(args)\\n\"\n"
+"  -P, --function=NAME(args)\n"
 "                           指��れ�関数をリストア\n"
 
-#: pg_restore.c:424
+#: pg_restore.c:422
 #, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only        スキーマ��をリストア。データをリストア���ん\n"
 
-#: pg_restore.c:425
+#: pg_restore.c:423
 #, c-format
 msgid ""
 "  -S, --superuser=NAME     superuser user name to use for disabling "
@@ -1856,23 +1883,32 @@ msgid ""
 msgstr ""
 "  -S, --superuser=NAME     トリガを無効��る����スーパーユーザ���\n"
 
-#: pg_restore.c:426
+#: pg_restore.c:424
 #, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAME         指���テーブルをリストア\n"
 
-#: pg_restore.c:427
+#: pg_restore.c:425
 #, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAME       指���トリガをリストア\n"
 
-#: pg_restore.c:428
+#: pg_restore.c:426
 #, c-format
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr "  -x, --no-privileges      アクセス権�(grant/revoke)�復元を�略\n"
 
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr ""
+"  -1, --single-transaction\n"
+"                           �一�トランザクション���復元���\n"
+
 #: pg_restore.c:429
 #, c-format
 msgid "  --disable-triggers       disable triggers during data-only restore\n"
@@ -1893,14 +1929,14 @@ msgstr ""
 
 #: pg_restore.c:433
 #, c-format
-msgid "  --no-tablespaces         do not restore tablespace assignments\n"
-msgstr ""
-"  --no-tablespaces         テーブルスペース�割り当�情報をリストア���ん\n"
+msgid "  --no-security-labels     do not restore security labels\n"
+msgstr "  --no-security-labels     セキュリティラベルをリストア���ん\n"
 
 #: pg_restore.c:434
 #, c-format
-msgid "  --role=ROLENAME          do SET ROLE before restore\n"
-msgstr "  --role=ROLENAME          リストア�先立�� SET ROLE ���\n"
+msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgstr ""
+"  --no-tablespaces         テーブルスペース�割り当�情報をリストア���ん\n"
 
 #: pg_restore.c:435
 #, c-format
@@ -1914,16 +1950,12 @@ msgstr ""
 "                           所有者をセット�る際�ALTER OWNER コマンド�代り\n"
 "                           � SET SESSION AUTHORIZATION コマンドを使用�る\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:445
 #, c-format
-msgid ""
-"  -1, --single-transaction\n"
-"                           restore as a single transaction\n"
-msgstr ""
-"  -1, --single-transaction\n"
-"                           �一�トランザクション���復元���\n"
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=ROLENAME          リストア�先立�� SET ROLE ���\n"
 
-#: pg_restore.c:448
+#: pg_restore.c:447
 #, c-format
 msgid ""
 "\n"
@@ -1934,7 +1966,7 @@ msgstr ""
 "入力ファイル��指定�れ��場��標準入力�使用�れ��。\n"
 "\n"
 
-#: pg_dumpall.c:167
+#: pg_dumpall.c:171
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -1945,7 +1977,7 @@ msgstr ""
 "���。\n"
 "インストール�状�を確�������。\n"
 
-#: pg_dumpall.c:174
+#: pg_dumpall.c:178
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -1956,38 +1988,36 @@ msgstr ""
 "�ん���。\n"
 "インストール�状�を確�������。\n"
 
-#: pg_dumpall.c:346
+#: pg_dumpall.c:314
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
-msgstr ""
-"\"%s: -g/--globals-onlyオプション�-r/--roles-onlyオプション��時�使用��"
-"��ん\n"
+msgstr "%s: -g/--globals-onlyオプション�-r/--roles-onlyオプション��時�使用����ん\n"
 
-#: pg_dumpall.c:355
+#: pg_dumpall.c:323
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
 "together\n"
 msgstr ""
-"\"%s: -g/--globals-onlyオプション�-t/--tablespaces-onlyオプション��時\n"
+"%s: -g/--globals-onlyオプション�-t/--tablespaces-onlyオプション��時\n"
 "�使用����ん\n"
 
-#: pg_dumpall.c:364
+#: pg_dumpall.c:332
 #, c-format
 msgid ""
 "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
 "together\n"
 msgstr ""
-"\"%s: -r/--roles-onlyオプション�-t/--tablespaces-onlyオプション)��時\n"
+"%s: -r/--roles-onlyオプション�-t/--tablespaces-onlyオプション)��時\n"
 "�使用����ん\n"
 
-#: pg_dumpall.c:384 pg_dumpall.c:1654
+#: pg_dumpall.c:374 pg_dumpall.c:1678
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: データベース\"%s\"�接続����ん���\n"
 
-#: pg_dumpall.c:399
+#: pg_dumpall.c:389
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -1996,12 +2026,12 @@ msgstr ""
 "%s: \"postgres\"���\"template1\"データベース�接続����ん���\n"
 "他�データベースを指定������。\n"
 
-#: pg_dumpall.c:416
+#: pg_dumpall.c:406
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s: 出力ファイル \"%s\" をオープン����ん���: %s\n"
 
-#: pg_dumpall.c:534
+#: pg_dumpall.c:528
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2010,30 +2040,35 @@ msgstr ""
 "%s�PostgreSQLデータベースクラスタをSQLスクリプトファイル�展開���。\n"
 "\n"
 
-#: pg_dumpall.c:536
+#: pg_dumpall.c:530
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPTION]...\n"
 
-#: pg_dumpall.c:545
+#: pg_dumpall.c:533
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=ファイル�       出力ファイル�\n"
+
+#: pg_dumpall.c:539
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) databases before recreating\n"
 msgstr "  -c, --clean              �作���データベースを削除\n"
 
-#: pg_dumpall.c:546
+#: pg_dumpall.c:540
 #, c-format
 msgid "  -g, --globals-only          dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only       グロー�ルオブジェクト��をダンプ��\n"
 "                           データベースをダンプ���ん\n"
 
-#: pg_dumpall.c:548
+#: pg_dumpall.c:542
 #, c-format
 msgid "  -O, --no-owner              skip restoration of object ownership\n"
 msgstr "  -O, --no-owner           オブジェクト�所有権�復元を�略\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:543
 #, c-format
 msgid ""
 "  -r, --roles-only            dump only roles, no databases or tablespaces\n"
@@ -2041,13 +2076,13 @@ msgstr ""
 "  -r, --roles-only         ロール��をダンプ。\n"
 "                           データベース�テーブル空間をダンプ���ん\n"
 
-#: pg_dumpall.c:551
+#: pg_dumpall.c:545
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=NAME     ダンプ�使用�るスーパーユーザ�ユーザ�を指定\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:546
 #, c-format
 msgid ""
 "  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
@@ -2055,12 +2090,12 @@ msgstr ""
 "  -t, --tablespaces-only   テーブルスペース��をダンプ。\n"
 "                           データベース�ロールをダンプ���ん\n"
 
-#: pg_dumpall.c:567
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=DBNAME    代替�デフォルトデータベースを指定���\n"
 
-#: pg_dumpall.c:573
+#: pg_dumpall.c:570
 #, c-format
 msgid ""
 "\n"
@@ -2073,72 +2108,72 @@ msgstr ""
 "-f/--file �指定�れ��場��SQLスクリプト�標準出力�書�出�れ��。\n"
 "\n"
 
-#: pg_dumpall.c:1017
+#: pg_dumpall.c:1041
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr "%1$s: テーブル空間\"%3$s\"�ACLリスト(%2$s)を解�����ん���\n"
 
-#: pg_dumpall.c:1317
+#: pg_dumpall.c:1341
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%1$s: データベース\"%3$s\"�ACLリスト(%2$s)を解�����ん���\n"
 
-#: pg_dumpall.c:1524
+#: pg_dumpall.c:1548
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: データベース\"%s\"をダンプ�����...\n"
 
-#: pg_dumpall.c:1534
+#: pg_dumpall.c:1558
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: データベース\"%s\"�対�るpg_dump�失敗����。終了���\n"
 
-#: pg_dumpall.c:1543
+#: pg_dumpall.c:1567
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s: 出力ファイル \"%s\" を�オープン����ん���: %s\n"
 
-#: pg_dumpall.c:1582
+#: pg_dumpall.c:1606
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: \"%s\"を実行�����\n"
 
-#: pg_dumpall.c:1627
+#: pg_dumpall.c:1651
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: メモリ�足��\n"
 
-#: pg_dumpall.c:1676
+#: pg_dumpall.c:1700
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: データベース\"%s\"�接続����ん���: %s\n"
 
-#: pg_dumpall.c:1690
+#: pg_dumpall.c:1714
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: サー��ージョンを入手����ん���\n"
 
-#: pg_dumpall.c:1696
+#: pg_dumpall.c:1720
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: サー��ージョン\"%s\"を解�����ん���\n"
 
-#: pg_dumpall.c:1704
+#: pg_dumpall.c:1728
 #, c-format
 msgid "%s: could not parse version \"%s\"\n"
 msgstr "%s: �ージョン\"%s\"を解�����ん���\n"
 
-#: pg_dumpall.c:1743 pg_dumpall.c:1769
+#: pg_dumpall.c:1767 pg_dumpall.c:1793
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: %sを実行�����\n"
 
-#: pg_dumpall.c:1749 pg_dumpall.c:1775
+#: pg_dumpall.c:1773 pg_dumpall.c:1799
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ������失敗����: %s"
 
-#: pg_dumpall.c:1751 pg_dumpall.c:1777
+#: pg_dumpall.c:1775 pg_dumpall.c:1801
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: �����: %s\n"
@@ -2173,27 +2208,48 @@ msgstr "ディレクトリを\"%s\"�変更����ん���"
 msgid "could not read symbolic link \"%s\""
 msgstr "シンボリックリンク\"%s\"�読��り�失敗����"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "�プロセス�終了コード%d�終了����"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "�プロセス�例外0x%X�終了����"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "�プロセス�シグナル%s�終了����"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "�プロセス�シグナル%d�終了����"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "�プロセス�未知�ステータス%d�終了����"
+
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s: 無効� -X オプション -- %s\n"
+
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "�������果行��り��ん���: %s\n"
+
+#~ msgid "could not initialize compression library: %s\n"
+#~ msgstr "圧縮ライブラリを�期化����ん���: %s\n"
+
+#~ msgid "could not uncompress data: %s\n"
+#~ msgstr "データを伸長����ん���: %s\n"
+
+#~ msgid "could not close compression library: %s\n"
+#~ msgstr "圧縮ライブラリをクローズ����ん���: %s\n"
+
+#~ msgid "could not compress data: %s\n"
+#~ msgstr "データを圧縮����ん���: %s\n"
+
+#~ msgid "could not close compression stream: %s\n"
+#~ msgstr "圧縮用ストリームをクローズ����ん���: %s\n"
diff --git a/src/bin/pg_dump/po/pl.po b/src/bin/pg_dump/po/pl.po
new file mode 100644
index 0000000000000..37eb15c248b62
--- /dev/null
+++ b/src/bin/pg_dump/po/pl.po
@@ -0,0 +1,2292 @@
+# Polish message translation file for pg_dump
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_dump (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:54+0000\n"
+"PO-Revision-Date: 2011-09-30 09:48-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pg_dump.c:489 pg_dump.c:503 pg_restore.c:274 pg_restore.c:290
+#: pg_restore.c:302 pg_dumpall.c:296 pg_dumpall.c:306 pg_dumpall.c:316
+#: pg_dumpall.c:325 pg_dumpall.c:334 pg_dumpall.c:392
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: pg_dump.c:501 pg_restore.c:288 pg_dumpall.c:304
+#, 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"
+
+#: pg_dump.c:514
+msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
+msgstr "opcje -s/--schema-only i -a/--data-only nie mogą być używane razem\n"
+
+#: pg_dump.c:520
+msgid "options -c/--clean and -a/--data-only cannot be used together\n"
+msgstr "opcje -c/--clean i -a/--data-only nie mogą być używane razem\n"
+
+#: pg_dump.c:526
+msgid ""
+"options --inserts/--column-inserts and -o/--oids cannot be used together\n"
+msgstr ""
+"opcje --inserts/--column-inserts i -o/--oids nie mogą być używane razem\n"
+
+#: pg_dump.c:527
+msgid "(The INSERT command cannot set OIDs.)\n"
+msgstr "(Polecenie INSERT nie może ustawiać OIDów.)\n"
+
+#: pg_dump.c:552
+#, c-format
+msgid "could not open output file \"%s\" for writing\n"
+msgstr "nie można otworzyć pliku wyjścia \"%s\" do zapisu\n"
+
+#: pg_dump.c:562 pg_backup_db.c:38
+#, c-format
+msgid "could not parse version string \"%s\"\n"
+msgstr "nie można przetworzyć zapisu wersji \"%s\"\n"
+
+#: pg_dump.c:585
+#, c-format
+msgid "invalid client encoding \"%s\" specified\n"
+msgstr "wskazano niepoprawne kodowanie klienta \"%s\"\n"
+
+#: pg_dump.c:684
+#, c-format
+msgid "last built-in OID is %u\n"
+msgstr "ostatni wbudowany OID to %u\n"
+
+#: pg_dump.c:694
+msgid "No matching schemas were found\n"
+msgstr "Nie znaleziono pasujących schematów\n"
+
+#: pg_dump.c:709
+msgid "No matching tables were found\n"
+msgstr "Nie znaleziono pasujÄ…cych tabel\n"
+
+#: pg_dump.c:821
+#, c-format
+msgid ""
+"%s dumps a database as a text file or to other formats.\n"
+"\n"
+msgstr ""
+"%s zrzuca bazę danych jako plik tekstowy lub do innych formatów.\n"
+"\n"
+
+#: pg_dump.c:822 pg_restore.c:397 pg_dumpall.c:529
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: pg_dump.c:823
+#, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [OPCJA]... [NAZWADB]\n"
+
+#: pg_dump.c:825 pg_restore.c:400 pg_dumpall.c:532
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Opcje ogólne:\n"
+
+#: pg_dump.c:826
+#, c-format
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=NAZWAPLIKU       nazwa pliku wyjścia\n"
+
+#: pg_dump.c:827
+#, c-format
+msgid ""
+"  -F, --format=c|d|t|p        output file format (custom, directory, tar, "
+"plain text)\n"
+msgstr ""
+"  -F, --format=c|d|t|p        format pliku wyjścia (c-użytkownika, d-folder, "
+"t-tar, p-tekstowy)\n"
+
+#: pg_dump.c:828
+#, c-format
+msgid "  -v, --verbose               verbose mode\n"
+msgstr "  -v, --verbose               tryb informacji szczegółowych\n"
+
+#: pg_dump.c:829
+#, c-format
+msgid ""
+"  -Z, --compress=0-9          compression level for compressed formats\n"
+msgstr ""
+"  -Z, --compress=0-9          poziom kompresji dla formatów kompresujących\n"
+
+#: pg_dump.c:830 pg_dumpall.c:534
+#, c-format
+msgid ""
+"  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
+msgstr ""
+"  --lock-wait-timeout=LIMITCZASU\n"
+"                              niepowodzenie blokowania tabeli po LIMITCZASU\n"
+
+#: pg_dump.c:831 pg_dumpall.c:535
+#, c-format
+msgid "  --help                      show this help, then exit\n"
+msgstr "  --help                      pokazuje ten ekran pomocy i kończy\n"
+
+#: pg_dump.c:832 pg_dumpall.c:536
+#, c-format
+msgid "  --version                   output version information, then exit\n"
+msgstr "  --version                   pokazuje informacje o wersji i kończy\n"
+
+#: pg_dump.c:834 pg_dumpall.c:537
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output content:\n"
+msgstr ""
+"\n"
+"Opcje kontrolujące zawartość wyjścia:\n"
+
+#: pg_dump.c:835 pg_dumpall.c:538
+#, c-format
+msgid "  -a, --data-only             dump only the data, not the schema\n"
+msgstr "  -a, --data-only             zrzuca tylko dane, bez schematu\n"
+
+#: pg_dump.c:836
+#, c-format
+msgid "  -b, --blobs                 include large objects in dump\n"
+msgstr "  -b, --blobs                 dodaje duże obiekty do zrzutu\n"
+
+#: pg_dump.c:837
+#, c-format
+msgid ""
+"  -c, --clean                 clean (drop) database objects before "
+"recreating\n"
+msgstr ""
+"  -c, --clean                 czyszczenie (kasowanie) obiektów baz danych "
+"przed odtworzeniem\n"
+
+#: pg_dump.c:838
+#, c-format
+msgid ""
+"  -C, --create                include commands to create database in dump\n"
+msgstr ""
+"  -C, --create                dodaje polecenia tworzenia bazy danych w "
+"zrzucie\n"
+
+#: pg_dump.c:839
+#, c-format
+msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
+msgstr "  -E, --encoding=KODOWANIE    zrzuca dane w kodowaniu KODOWANIE\n"
+
+#: pg_dump.c:840
+#, c-format
+msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
+msgstr "  -n, --schema=SCHEMAT        zrzuca tylko nazwany schemat(y)\n"
+
+#: pg_dump.c:841
+#, c-format
+msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
+msgstr ""
+"  -N, --exclude-schema=SCHEMAT\n"
+"                              NIE zrzuca nazwanych schematów\n"
+
+#: pg_dump.c:842 pg_dumpall.c:541
+#, c-format
+msgid "  -o, --oids                  include OIDs in dump\n"
+msgstr "  -o, --oids                  dodaje OIDy do zrzutu\n"
+
+#: pg_dump.c:843
+#, c-format
+msgid ""
+"  -O, --no-owner              skip restoration of object ownership in\n"
+"                              plain-text format\n"
+msgstr ""
+"  -O, --no-owner              pomija odtworzenie wskazania właściciela "
+"obiektu\n"
+"                              w formacie tekstowym\n"
+
+#: pg_dump.c:845 pg_dumpall.c:544
+#, c-format
+msgid "  -s, --schema-only           dump only the schema, no data\n"
+msgstr "  -s, --schema-only           zrzuca tylko schemat, bez danych\n"
+
+#: pg_dump.c:846
+#, c-format
+msgid ""
+"  -S, --superuser=NAME        superuser user name to use in plain-text "
+"format\n"
+msgstr ""
+"  -S, --superuser=NAZWA       nazwa superużytkownika używana w formacie "
+"tekstowym\n"
+
+#: pg_dump.c:847
+#, c-format
+msgid "  -t, --table=TABLE           dump the named table(s) only\n"
+msgstr "  -t, --table=TABELA          zrzuca tylko tabelÄ™ wedle nazwy\n"
+
+#: pg_dump.c:848
+#, c-format
+msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
+msgstr "  -T, --exclude-table=TABELA  NIE zrzuca tabeli o tej nazwie\n"
+
+#: pg_dump.c:849 pg_dumpall.c:547
+#, c-format
+msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
+msgstr "  -x, --no-privileges         nie zrzuca przywilejów (grant/revoke)\n"
+
+#: pg_dump.c:850 pg_dumpall.c:548
+#, c-format
+msgid "  --binary-upgrade            for use by upgrade utilities only\n"
+msgstr ""
+"  --binary-upgrade            używane tylko przez narzędzia aktualizacji\n"
+
+#: pg_dump.c:851 pg_dumpall.c:549
+#, c-format
+msgid ""
+"  --column-inserts            dump data as INSERT commands with column "
+"names\n"
+msgstr ""
+"  --column-inserts            zrzuca dane jako polecenia INSERT z nazwami "
+"kolumn\n"
+
+#: pg_dump.c:852 pg_dumpall.c:550
+#, c-format
+msgid ""
+"  --disable-dollar-quoting    disable dollar quoting, use SQL standard "
+"quoting\n"
+msgstr ""
+"  --disable-dollar-quoting    blokuje cytowanie dolarem, używa standardowego "
+"cytowania SQL\n"
+
+#: pg_dump.c:853 pg_dumpall.c:551
+#, c-format
+msgid ""
+"  --disable-triggers          disable triggers during data-only restore\n"
+msgstr ""
+"  --disable-triggers          wyłącza wyzwalacze podczas odtwarzania\n"
+"                              wyłącznie danych\n"
+
+#: pg_dump.c:854 pg_dumpall.c:552
+#, c-format
+msgid ""
+"  --inserts                   dump data as INSERT commands, rather than "
+"COPY\n"
+msgstr ""
+"  --inserts                   zrzuca dane jako polecenia INSERT zamiast "
+"COPY\n"
+
+#: pg_dump.c:855 pg_dumpall.c:553
+#, c-format
+msgid "  --no-security-labels        do not dump security label assignments\n"
+msgstr ""
+"  --no-security-labels        nie zrzuca przypisań etykiet bezpieczeństwa\n"
+
+#: pg_dump.c:856 pg_dumpall.c:554
+#, c-format
+msgid "  --no-tablespaces            do not dump tablespace assignments\n"
+msgstr ""
+"  --no-tablespaces            nie zrzuca przypisań do przestrzeni tabel\n"
+
+#: pg_dump.c:857 pg_dumpall.c:555
+#, c-format
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr ""
+"  --no-unlogged-table-data    nie zrzuca niezalogowanych danych tabeli\n"
+
+#: pg_dump.c:858 pg_dumpall.c:556
+#, c-format
+msgid ""
+"  --quote-all-identifiers     quote all identifiers, even if not key words\n"
+msgstr ""
+"  --quote-all-identifiers     cytuje wszystkie identyfikatory, jeśli tylko\n"
+"                              nie są to słowa kluczowe\n"
+
+#: pg_dump.c:859
+#, c-format
+msgid ""
+"  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr ""
+"  --serializable-deferrable   czeka póki zrzut wykonuje się \n"
+"                              bez  nieprawidłowości\n"
+
+#: pg_dump.c:860 pg_dumpall.c:557
+#, c-format
+msgid ""
+"  --use-set-session-authorization\n"
+"                              use SET SESSION AUTHORIZATION commands instead "
+"of\n"
+"                              ALTER OWNER commands to set ownership\n"
+msgstr ""
+"  --use-set-session-authorization\n"
+"                              używa poleceń SET SESSION AUTHORIZATION "
+"zamiast\n"
+"                              poleceń ALTER OWNER by ustawić właściciela\n"
+
+#: pg_dump.c:864 pg_restore.c:439 pg_dumpall.c:561
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Opcje połączenia:\n"
+
+#: pg_dump.c:865 pg_restore.c:440 pg_dumpall.c:562
+#, c-format
+msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
+msgstr ""
+"  -h, --host=NAZWAHOSTA    host serwera bazy danych lub katalog gniazda\n"
+
+#: pg_dump.c:866 pg_restore.c:441 pg_dumpall.c:564
+#, c-format
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          numer portu na serwera bazy dnaych\n"
+
+#: pg_dump.c:867 pg_restore.c:442 pg_dumpall.c:565
+#, c-format
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr "  -U, --username=NAZWA     połączenie jako wskazany użytkownik bazy\n"
+
+#: pg_dump.c:868 pg_restore.c:443 pg_dumpall.c:566
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nie pytaj nigdy o hasło\n"
+
+#: pg_dump.c:869 pg_restore.c:444 pg_dumpall.c:567
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           wymuś pytanie o hasło (powinno nastąpić "
+"automatycznie)\n"
+
+#: pg_dump.c:870 pg_dumpall.c:568
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr "  --role=NAZWAROLI         wykonuje SET ROLE przed odtworzeniem\n"
+
+#: pg_dump.c:872
+#, c-format
+msgid ""
+"\n"
+"If no database name is supplied, then the PGDATABASE environment\n"
+"variable value is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Jeśli nie dostarczono nazwy bazy danych, używana jest zmienna\n"
+"środowiskowa PGDATABASE.\n"
+"\n"
+
+#: pg_dump.c:874 pg_restore.c:448 pg_dumpall.c:572
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_dump.c:882 pg_backup_archiver.c:1458
+msgid "*** aborted because of error\n"
+msgstr "*** przerwano z powodu błędu\n"
+
+#: pg_dump.c:924
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "wskazano niepoprawny format wyjścia \"%s\"\n"
+
+#: pg_dump.c:947
+msgid "server version must be at least 7.3 to use schema selection switches\n"
+msgstr ""
+"serwer musi być w wersji co najmniej 7.3 by użyć przełączników wyboru "
+"schematu\n"
+
+#: pg_dump.c:1205
+#, c-format
+msgid "dumping contents of table %s\n"
+msgstr "zrzut zawartości tabeli \"%s\"\n"
+
+#: pg_dump.c:1325
+#, c-format
+msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
+msgstr ""
+"Nie powiódł się zrzut zawartości tabeli \"%s\": niepowodzenie PQgetCopyData"
+"().\n"
+
+#: pg_dump.c:1326 pg_dump.c:14133
+#, c-format
+msgid "Error message from server: %s"
+msgstr "Komunikat błędu z serwera: %s"
+
+#: pg_dump.c:1327 pg_dump.c:14134
+#, c-format
+msgid "The command was: %s\n"
+msgstr "Treść polecenia: %s\n"
+
+#: pg_dump.c:1750
+msgid "saving database definition\n"
+msgstr "zapis definicji bazy danych\n"
+
+#: pg_dump.c:1832
+#, c-format
+msgid "missing pg_database entry for database \"%s\"\n"
+msgstr "brak wpisu pg_database dla bazy danych \"%s\"\n"
+
+#: pg_dump.c:1839
+#, c-format
+msgid ""
+"query returned more than one (%d) pg_database entry for database \"%s\"\n"
+msgstr "zapytanie zwróciło więcej niż jeden (%d) wpis dla bazy danych \"%s\"\n"
+
+#: pg_dump.c:1943
+msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
+msgstr "dumpDatabase(): nie odnaleziono pg_largeobject.relfrozenxid\n"
+
+#: pg_dump.c:1982
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr "dumpDatabase(): nie odnaleziono pg_largeobject_metadata.relfrozenxid\n"
+
+#: pg_dump.c:2061
+#, c-format
+msgid "saving encoding = %s\n"
+msgstr "zapis kodowania = %s\n"
+
+#: pg_dump.c:2088
+#, c-format
+msgid "saving standard_conforming_strings = %s\n"
+msgstr "zapis standard_conforming_strings = %s\n"
+
+#: pg_dump.c:2121
+msgid "reading large objects\n"
+msgstr "odczyt dużych obiektów\n"
+
+#: pg_dump.c:2253
+msgid "saving large objects\n"
+msgstr "zapis dużych obiektów\n"
+
+#: pg_dump.c:2295 pg_backup_archiver.c:984
+#, c-format
+msgid "could not open large object %u: %s"
+msgstr "nie można otworzyć dużego obiektu %u: %s"
+
+#: pg_dump.c:2308
+#, c-format
+msgid "error reading large object %u: %s"
+msgstr "błąd odczytu dużego obiektu %u: %s"
+
+#: pg_dump.c:2355 pg_dump.c:2403 pg_dump.c:2458 pg_dump.c:7589 pg_dump.c:7820
+#: pg_dump.c:8786 pg_dump.c:9338 pg_dump.c:9592 pg_dump.c:9706 pg_dump.c:10162
+#: pg_dump.c:10348 pg_dump.c:10454 pg_dump.c:10654 pg_dump.c:10896
+#: pg_dump.c:11063 pg_dump.c:11284 pg_dump.c:13939
+#, c-format
+msgid "query returned %d row instead of one: %s\n"
+msgid_plural "query returned %d rows instead of one: %s\n"
+msgstr[0] "zapytanie zwróciło %d wiersz zamiast: %s\n"
+msgstr[1] "zapytanie zwróciło %d wiersze zamiast: %s\n"
+msgstr[2] "zapytanie zwróciło %d wierszy zamiast: %s\n"
+
+#: pg_dump.c:2539
+#, c-format
+msgid "could not find parent extension for %s"
+msgstr "nie można odnaleźć rozszerzenia nadrzędnego dla %s"
+
+#: pg_dump.c:2646
+#, c-format
+msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
+msgstr "OSTRZEŻENIE: właściciel schematu \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:2681
+#, c-format
+msgid "schema with OID %u does not exist\n"
+msgstr "schemat z OID %u nie istnieje\n"
+
+#: pg_dump.c:3022
+#, c-format
+msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
+msgstr ""
+"OSTRZEŻENIE: właściciel typu danych \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:3126
+#, c-format
+msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
+msgstr "OSTRZEŻENIE: właściciel operatora \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:3378
+#, c-format
+msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
+msgstr ""
+"OSTRZEŻENIE: właściciel klasy operatora \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:3465
+#, c-format
+msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
+msgstr ""
+"OSTRZEŻENIE: właściciel rodziny operatora \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:3602
+#, c-format
+msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
+msgstr ""
+"OSTRZEŻENIE: właściciel funkcji agregującej \"%s\" wydaje się być "
+"niepoprawny\n"
+
+#: pg_dump.c:3772
+#, c-format
+msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
+msgstr "OSTRZEŻENIE: właściciel funkcji \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:4272
+#, c-format
+msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
+msgstr "OSTRZEŻENIE: właściciel tabeli \"%s\" wydaje się być niepoprawny\n"
+
+#: pg_dump.c:4415
+#, c-format
+msgid "reading indexes for table \"%s\"\n"
+msgstr "odczyt indeksów dla tabeli \"%s\"\n"
+
+#: pg_dump.c:4735
+#, c-format
+msgid "reading foreign key constraints for table \"%s\"\n"
+msgstr "odczyt ograniczeń kluczy obcych dla tabeli \"%s\"\n"
+
+#: pg_dump.c:4967
+#, c-format
+msgid ""
+"failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
+"found\n"
+msgstr ""
+"sprawdzenia nie powiodły się, nie odnaleziono tabeli nadrzędnej o OID %u dla "
+"wpisu pg_rewrite o OID %u\n"
+
+#: pg_dump.c:5051
+#, c-format
+msgid "reading triggers for table \"%s\"\n"
+msgstr "odczyt wyzwalaczy dla tabeli \"%s\"\n"
+
+#: pg_dump.c:5214
+#, c-format
+msgid ""
+"query produced null referenced table name for foreign key trigger \"%s\" on "
+"table \"%s\" (OID of table: %u)\n"
+msgstr ""
+"zapytanie dało w wyniku puste wskazanie nazwy tabeli dla wyzwalacza klucza "
+"obcego \"%s\" dla tabeli \"%s\" (UID tabeli: %u)\n"
+
+#: pg_dump.c:5585
+#, c-format
+msgid "finding the columns and types of table \"%s\"\n"
+msgstr "wyszukiwanie kolumn i typów dla tabeli \"%s\"\n"
+
+#: pg_dump.c:5730
+#, c-format
+msgid "invalid column numbering in table \"%s\"\n"
+msgstr "niepoprawna numeracja kolumn dla tabeli \"%s\"\n"
+
+#: pg_dump.c:5767
+#, c-format
+msgid "finding default expressions of table \"%s\"\n"
+msgstr "wyszukiwanie wyrażeń domyślnych dla tabeli \"%s\"\n"
+
+#: pg_dump.c:5852
+#, c-format
+msgid "invalid adnum value %d for table \"%s\"\n"
+msgstr "niepoprawna wartość adnum %d dla tabeli \"%s\"\n"
+
+#: pg_dump.c:5870
+#, c-format
+msgid "finding check constraints for table \"%s\"\n"
+msgstr "odczyt ograniczeń sprawdzających dla tabeli \"%s\"\n"
+
+#: pg_dump.c:5950
+#, c-format
+msgid "expected %d check constraint on table \"%s\" but found %d\n"
+msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
+msgstr[0] ""
+"oczekiwano %d-go ograniczenia sprawdzajÄ…ce na tabeli \"%s\" ale znaleziono "
+"%d\n"
+msgstr[1] ""
+"oczekiwano %d-ch ograniczeń sprawdzających na tabeli \"%s\" ale znaleziono "
+"%d\n"
+msgstr[2] ""
+"oczekiwano %d ograniczeń sprawdzających na tabeli \"%s\" ale znaleziono %d\n"
+
+#: pg_dump.c:5954
+msgid "(The system catalogs might be corrupted.)\n"
+msgstr "(Foldery systemowe mogą być uszkodzone.)\n"
+
+#: pg_dump.c:8552
+msgid "WARNING: bogus value in proargmodes array\n"
+msgstr "OSTRZEŻENIE: błędna wartość w tablicy proargmodes\n"
+
+#: pg_dump.c:8866
+msgid "WARNING: could not parse proallargtypes array\n"
+msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proallargtypes\n"
+
+#: pg_dump.c:8882
+msgid "WARNING: could not parse proargmodes array\n"
+msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proargmodes\n"
+
+#: pg_dump.c:8896
+msgid "WARNING: could not parse proargnames array\n"
+msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proargnames\n"
+
+#: pg_dump.c:8907
+msgid "WARNING: could not parse proconfig array\n"
+msgstr "OSTRZEŻENIE: nie można przeanalizować tablicy proconfig\n"
+
+#: pg_dump.c:8963
+#, c-format
+msgid "unrecognized provolatile value for function \"%s\"\n"
+msgstr "nierozpoznana wartość provolatile dla funkcji \"%s\"\n"
+
+#: pg_dump.c:9179
+msgid "WARNING: bogus value in pg_cast.castmethod field\n"
+msgstr "OSTRZEŻENIE: błędna wartość pola pg_cast.castmethod\n"
+
+#: pg_dump.c:9561
+#, c-format
+msgid "WARNING: could not find operator with OID %s\n"
+msgstr "OSTRZEŻENIE: nie udało się odnaleźć operatora o OID %s\n"
+
+#: pg_dump.c:10680
+#, c-format
+msgid ""
+"WARNING: aggregate function %s could not be dumped correctly for this "
+"database version; ignored\n"
+msgstr ""
+"OSTRZEŻENIE: funkcja agregująca %s nie może być poprawnie zrzucona dla tej "
+"wersji bazy danych; zignorowano\n"
+
+#: pg_dump.c:11480
+#, c-format
+msgid "unknown object type (%d) in default privileges\n"
+msgstr "nieznany typ obiektu (%d) w przywilejach domyślnych\n"
+
+#: pg_dump.c:11497
+#, c-format
+msgid "could not parse default ACL list (%s)\n"
+msgstr "nie można przetworzyć domyślnej listy ACL (%s)\n"
+
+#: pg_dump.c:11554
+#, c-format
+msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
+msgstr "nie udało się przetworzyć listy ACL (%s) dla obiektu \"%s\" (%s)\n"
+
+#: pg_dump.c:11994
+#, c-format
+msgid "query to obtain definition of view \"%s\" returned no data\n"
+msgstr "zapytanie o definicję widoku \"%s\" nie zwróciło danych\n"
+
+#: pg_dump.c:11997
+#, c-format
+msgid ""
+"query to obtain definition of view \"%s\" returned more than one definition\n"
+msgstr ""
+"zapytanie o definicję widoku \"%s\" nie zwróciło więcej niż jedna definicję\n"
+
+#: pg_dump.c:12006
+#, c-format
+msgid "definition of view \"%s\" appears to be empty (length zero)\n"
+msgstr "definicja widoku \"%s\" wydaje się pusta (długość zero)\n"
+
+#: pg_dump.c:12574
+#, c-format
+msgid "invalid column number %d for table \"%s\"\n"
+msgstr "niepoprawny numer kolumny %d dla tabeli \"%s\"\n"
+
+#: pg_dump.c:12685
+#, c-format
+msgid "missing index for constraint \"%s\"\n"
+msgstr "brak indeksu dla ograniczenia \"%s\"\n"
+
+#: pg_dump.c:12873
+#, c-format
+msgid "unrecognized constraint type: %c\n"
+msgstr "nierozpoznany typ ograniczenia: %c\n"
+
+#: pg_dump.c:12936
+msgid "missing pg_database entry for this database\n"
+msgstr "brak wejścia pg_database dla bieżącej bazy danych\n"
+
+#: pg_dump.c:12941
+msgid "found more than one pg_database entry for this database\n"
+msgstr "znaleziono ponad jeden wpis pg_database dla bieżącej bazy danych\n"
+
+#: pg_dump.c:12973
+msgid "could not find entry for pg_indexes in pg_class\n"
+msgstr "nie odnaleziono wpisu dla pg_indexes w pg_class\n"
+
+#: pg_dump.c:12978
+msgid "found more than one entry for pg_indexes in pg_class\n"
+msgstr "odnaleziono ponad jeden wpis dla pg_indexes w pg_class\n"
+
+#: pg_dump.c:13050
+#, c-format
+msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
+msgid_plural ""
+"query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
+msgstr[0] ""
+"zapytanie o dane sekwencji \"%s\" zwróciło %d wiersz (oczekiwano 1)\n"
+msgstr[1] ""
+"zapytanie o dane sekwencji \"%s\" zwróciło %d wiersze (oczekiwano 1)\n"
+msgstr[2] ""
+"zapytanie o dane sekwencji \"%s\" zwróciło %d wierszy (oczekiwano 1)\n"
+
+#: pg_dump.c:13061
+#, c-format
+msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
+msgstr "pytanie o dane sekwencji \"%s\" zwróciło nazwę \"%s\"\n"
+
+#: pg_dump.c:13289
+#, c-format
+msgid "unexpected tgtype value: %d\n"
+msgstr "nieoczekiwana wartość tgtype: %d\n"
+
+#: pg_dump.c:13371
+#, c-format
+msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
+msgstr "niepoprawny ciÄ…g argumentu (%s) dla wyzwalacza \"%s\" tabeli \"%s\"\n"
+
+#: pg_dump.c:13489
+#, c-format
+msgid ""
+"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
+"returned\n"
+msgstr ""
+"zapytanie o regułę \"%s\" dla tabeli \"%s\" nie powiodło się: zwróciło złą "
+"liczbÄ™ wierszy\n"
+
+#: pg_dump.c:13746
+msgid "reading dependency data\n"
+msgstr "odczyt informacji o zależnościach\n"
+
+#: pg_dump.c:14128
+msgid "SQL command failed\n"
+msgstr "polecenie SQL nie powiodło się\n"
+
+#: common.c:105
+msgid "reading schemas\n"
+msgstr "odczyt schematów\n"
+
+#: common.c:115
+msgid "reading user-defined tables\n"
+msgstr "odczyt tabel użytkownika\n"
+
+#: common.c:120
+msgid "reading extensions\n"
+msgstr "odczyt rozszerzeń\n"
+
+#: common.c:124
+msgid "reading user-defined functions\n"
+msgstr "odczyt funkcji użytkownika\n"
+
+#: common.c:130
+msgid "reading user-defined types\n"
+msgstr "odczyt typów użytkownika\n"
+
+#: common.c:136
+msgid "reading procedural languages\n"
+msgstr "odczyt języków proceduralnych\n"
+
+#: common.c:140
+msgid "reading user-defined aggregate functions\n"
+msgstr "odczyt funkcji agregujących użytkownika\n"
+
+#: common.c:144
+msgid "reading user-defined operators\n"
+msgstr "odczyt operatorów użytkownika\n"
+
+#: common.c:149
+msgid "reading user-defined operator classes\n"
+msgstr "odczyt klas operatorów użytkownika\n"
+
+#: common.c:153
+msgid "reading user-defined operator families\n"
+msgstr "odczyt rodzin operatorów użytkownika\n"
+
+#: common.c:157
+msgid "reading user-defined text search parsers\n"
+msgstr "odczyt analizatorów wyszukiwania tekstowego użytkownika\n"
+
+#: common.c:161
+msgid "reading user-defined text search templates\n"
+msgstr "odczyt szablonów wyszukiwania tekstowego użytkownika\n"
+
+#: common.c:165
+msgid "reading user-defined text search dictionaries\n"
+msgstr "odczyt słowników wyszukiwania tekstowego użytkownika\n"
+
+#: common.c:169
+msgid "reading user-defined text search configurations\n"
+msgstr "odczyt konfiguracji wyszukiwania tekstowego użytkownika\n"
+
+#: common.c:173
+msgid "reading user-defined foreign-data wrappers\n"
+msgstr "odczyt opakowań obcych danych użytkownika\n"
+
+#: common.c:177
+msgid "reading user-defined foreign servers\n"
+msgstr "odczyt serwerów obcych użytkownika\n"
+
+#: common.c:181
+msgid "reading default privileges\n"
+msgstr "odczyt uprawnień domyślnych\n"
+
+#: common.c:185
+msgid "reading user-defined collations\n"
+msgstr "odczyt porównań użytkownika\n"
+
+#: common.c:190
+msgid "reading user-defined conversions\n"
+msgstr "odczyt konwersji użytkownika\n"
+
+#: common.c:194
+msgid "reading type casts\n"
+msgstr "odczyt rzutowań typów\n"
+
+#: common.c:198
+msgid "reading table inheritance information\n"
+msgstr "odczyt informacji o dziedziczeniu tabel\n"
+
+#: common.c:202
+msgid "reading rewrite rules\n"
+msgstr "odczyt reguł przepisywania\n"
+
+#: common.c:211
+msgid "finding extension members\n"
+msgstr "odnajdywanie składników rozszerzeń\n"
+
+#: common.c:216
+msgid "finding inheritance relationships\n"
+msgstr "odnajdywanie relacji dziedziczenia\n"
+
+#: common.c:220
+msgid "reading column info for interesting tables\n"
+msgstr "odczyt notatek kolumn dla ciekawych tabel\n"
+
+#: common.c:224
+msgid "flagging inherited columns in subtables\n"
+msgstr "oznaczanie dziedziczonych kolumn w podtabelach\n"
+
+#: common.c:228
+msgid "reading indexes\n"
+msgstr "odczyt indeksów\n"
+
+#: common.c:232
+msgid "reading constraints\n"
+msgstr "odczyt ograniczeń\n"
+
+#: common.c:236
+msgid "reading triggers\n"
+msgstr "odczyt wyzwalaczy\n"
+
+#: common.c:828
+#, c-format
+msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
+msgstr ""
+"sprawdzenia nie powiodły się, nie odnaleziono nadrzędnego OID %u dla tabeli "
+"\"%s\" (OID %u)\n"
+
+#: common.c:870
+#, c-format
+msgid "could not parse numeric array \"%s\": too many numbers\n"
+msgstr "nie można przetworzyć tablicy numerycznej \"%s\": zbyt wiele liczb\n"
+
+#: common.c:885
+#, c-format
+msgid "could not parse numeric array \"%s\": invalid character in number\n"
+msgstr ""
+"nie można przetworzyć tablicy numerycznej \"%s\": niepoprawny znak w "
+"liczbie\n"
+
+#: common.c:998
+msgid "cannot duplicate null pointer\n"
+msgstr "nie można powielić pustego wskaźnika\n"
+
+#: common.c:1001 common.c:1012 common.c:1023 common.c:1034
+#: pg_backup_archiver.c:764 pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291 pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955 pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209 pg_backup_custom.c:132 pg_backup_custom.c:139
+#: pg_backup_custom.c:780 pg_backup_custom.c:907 pg_backup_db.c:147
+#: pg_backup_db.c:157 pg_backup_db.c:205 pg_backup_db.c:249 pg_backup_db.c:264
+#: pg_backup_db.c:298 pg_backup_db.c:403 pg_backup_files.c:114
+#: pg_backup_null.c:72 pg_backup_tar.c:171 pg_backup_tar.c:1015
+msgid "out of memory\n"
+msgstr "brak pamięci\n"
+
+#: pg_backup_archiver.c:88
+msgid "archiver"
+msgstr "archiwizator"
+
+#: pg_backup_archiver.c:207 pg_backup_archiver.c:1259
+#, c-format
+msgid "could not close output file: %s\n"
+msgstr "nie można zamknąć pliku wyjścia: %s\n"
+
+#: pg_backup_archiver.c:233
+msgid "-C and -c are incompatible options\n"
+msgstr "-C i -c sÄ… opcjami niekompatybilnymi\n"
+
+#: pg_backup_archiver.c:240
+msgid "-C and -1 are incompatible options\n"
+msgstr "-C i -1 sÄ… opcjami niekompatybilnymi\n"
+
+#: pg_backup_archiver.c:250
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr "odtwarzanie współbieżne nie jest obsługiwane w tym formacie archiwum\n"
+
+#: pg_backup_archiver.c:254
+msgid ""
+"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr ""
+"odtwarzanie współbieżne nie jest obsługiwane w archiwach utworzonych przez "
+"pg_dump sprzed 8.0\n"
+
+#: pg_backup_archiver.c:273
+msgid ""
+"cannot restore from compressed archive (compression not supported in this "
+"installation)\n"
+msgstr ""
+"nie można odtworzyć ze spakowanego archiwum (kompresja nie jest obsługiwana "
+"w tej instalacji)\n"
+
+#: pg_backup_archiver.c:283
+msgid "connecting to database for restore\n"
+msgstr "Å‚Ä…czenie z bazÄ… danych w celu odtworzenia\n"
+
+#: pg_backup_archiver.c:285
+msgid "direct database connections are not supported in pre-1.3 archives\n"
+msgstr ""
+"bezpośrednie połączenia bazy danych nie są obsługiwane w archiwach sprzed "
+"1.3\n"
+
+#: pg_backup_archiver.c:327
+msgid "implied data-only restore\n"
+msgstr "domniemane przywrócenie wyłącznie danych\n"
+
+#: pg_backup_archiver.c:379
+#, c-format
+msgid "dropping %s %s\n"
+msgstr "kasowanie %s %s\n"
+
+#: pg_backup_archiver.c:431
+#, c-format
+msgid "setting owner and privileges for %s %s\n"
+msgstr "ustawienie właściciela i uprawnień dla %s %s\n"
+
+#: pg_backup_archiver.c:489 pg_backup_archiver.c:491
+#, c-format
+msgid "warning from original dump file: %s\n"
+msgstr "ostrzeżenie z oryginalnego pliku zrzutu: %s\n"
+
+#: pg_backup_archiver.c:498
+#, c-format
+msgid "creating %s %s\n"
+msgstr "tworzenie %s %s\n"
+
+#: pg_backup_archiver.c:542
+#, c-format
+msgid "connecting to new database \"%s\"\n"
+msgstr "Å‚Ä…czenie do nowej bazy danych \"%s\"\n"
+
+#: pg_backup_archiver.c:570
+#, c-format
+msgid "restoring %s\n"
+msgstr "odtwarzanie %s\n"
+
+#: pg_backup_archiver.c:584
+#, c-format
+msgid "restoring data for table \"%s\"\n"
+msgstr "odtwarzanie danych tabeli \"%s\"\n"
+
+#: pg_backup_archiver.c:646
+#, c-format
+msgid "executing %s %s\n"
+msgstr "wykonywanie %s %s\n"
+
+#: pg_backup_archiver.c:679
+#, c-format
+msgid "disabling triggers for %s\n"
+msgstr "wyłączanie wyzwalaczy dla %s\n"
+
+#: pg_backup_archiver.c:705
+#, c-format
+msgid "enabling triggers for %s\n"
+msgstr "włączanie wyzwalaczy dla: %s\n"
+
+#: pg_backup_archiver.c:735
+msgid ""
+"internal error -- WriteData cannot be called outside the context of a "
+"DataDumper routine\n"
+msgstr ""
+"błąd wewnętrzny -- WriteData nie może być wywołana poza kontekstem procedury "
+"DataDumper\n"
+
+#: pg_backup_archiver.c:892
+msgid "large-object output not supported in chosen format\n"
+msgstr "wyjście dużych obiektów nie jest obsługiwane w wybranym formacie\n"
+
+#: pg_backup_archiver.c:946
+#, c-format
+msgid "restored %d large object\n"
+msgid_plural "restored %d large objects\n"
+msgstr[0] "odtworzono %d duży obiekt\n"
+msgstr[1] "odtworzono %d duże obiekty\n"
+msgstr[2] "odtworzono %d dużych obiektów\n"
+
+#: pg_backup_archiver.c:967
+#, c-format
+msgid "restoring large object with OID %u\n"
+msgstr "odtwarzanie dużego obiektu z OID %u\n"
+
+#: pg_backup_archiver.c:979
+#, c-format
+msgid "could not create large object %u: %s"
+msgstr "nie można utworzyć dużego obiektu %u: %s"
+
+#: pg_backup_archiver.c:1041
+#, c-format
+msgid "could not open TOC file \"%s\": %s\n"
+msgstr "nie można otworzyć pliku TOC \"%s\": %s\n"
+
+#: pg_backup_archiver.c:1082
+#, c-format
+msgid "WARNING: line ignored: %s\n"
+msgstr "OSTRZEŻENIE: zignorowano linię: %s\n"
+
+#: pg_backup_archiver.c:1089
+#, c-format
+msgid "could not find entry for ID %d\n"
+msgstr "nie znaleziono wpisu dla ID %d\n"
+
+#: pg_backup_archiver.c:1110 pg_backup_files.c:172 pg_backup_files.c:457
+#, c-format
+msgid "could not close TOC file: %s\n"
+msgstr "nie można zamknąć pliku TOC: %s\n"
+
+#: pg_backup_archiver.c:1229 pg_backup_custom.c:152 pg_backup_files.c:130
+#: pg_backup_files.c:262
+#, c-format
+msgid "could not open output file \"%s\": %s\n"
+msgstr "nie można otworzyć pliku wyjścia \"%s\": %s\n"
+
+#: pg_backup_archiver.c:1232 pg_backup_custom.c:159 pg_backup_files.c:137
+#, c-format
+msgid "could not open output file: %s\n"
+msgstr "nie można otworzyć pliku wyjścia %s\n"
+
+#: pg_backup_archiver.c:1334
+#, c-format
+msgid "wrote %lu byte of large object data (result = %lu)\n"
+msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
+msgstr[0] "zapisano %lu bajt danych dużego obiektu (wynik = %lu)\n"
+msgstr[1] "zapisano %lu bajty danych dużego obiektu (wynik = %lu)\n"
+msgstr[2] "zapisano %lu bajtów danych dużego obiektu (wynik = %lu)\n"
+
+#: pg_backup_archiver.c:1340
+#, c-format
+msgid "could not write to large object (result: %lu, expected: %lu)\n"
+msgstr "nie udało się zapisać dużego obiektu (wynik: %lu, oczekiwano: %lu)\n"
+
+#: pg_backup_archiver.c:1398 pg_backup_archiver.c:1421 pg_backup_custom.c:652
+#: pg_backup_files.c:432 pg_backup_tar.c:590 pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
+#, c-format
+msgid "could not write to output file: %s\n"
+msgstr "nie można pisać do pliku wyjścia: %s\n"
+
+#: pg_backup_archiver.c:1406
+msgid "could not write to custom output routine\n"
+msgstr "nie można pisać do procedury wyjścia użytkownika\n"
+
+#: pg_backup_archiver.c:1504
+msgid "Error while INITIALIZING:\n"
+msgstr "BÅ‚Ä…d podczas INICJACJI:\n"
+
+#: pg_backup_archiver.c:1509
+msgid "Error while PROCESSING TOC:\n"
+msgstr "BÅ‚Ä…d podczas PRZETWARZANIA TOC:\n"
+
+#: pg_backup_archiver.c:1514
+msgid "Error while FINALIZING:\n"
+msgstr "Błąd podczas ZAKAŃCZANIA:\n"
+
+#: pg_backup_archiver.c:1519
+#, c-format
+msgid "Error from TOC entry %d; %u %u %s %s %s\n"
+msgstr "BÅ‚Ä…d z wpisu %d TOC; %u %u %s %s %s\n"
+
+#: pg_backup_archiver.c:1654
+#, c-format
+msgid "unexpected data offset flag %d\n"
+msgstr "nieoczekiwana dana flagi przesunięcia %d\n"
+
+#: pg_backup_archiver.c:1667
+msgid "file offset in dump file is too large\n"
+msgstr "przesunięcie pliku w pliku zrzutu jest zbyt duże\n"
+
+#: pg_backup_archiver.c:1764 pg_backup_archiver.c:3113 pg_backup_custom.c:630
+#: pg_backup_files.c:419 pg_backup_tar.c:789
+msgid "unexpected end of file\n"
+msgstr "nieoczekiwany koniec pliku\n"
+
+#: pg_backup_archiver.c:1781
+msgid "attempting to ascertain archive format\n"
+msgstr "próba ustalenia formatu archiwum\n"
+
+#: pg_backup_archiver.c:1807 pg_backup_archiver.c:1817
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "zbyt długa nazwa pliku: \"%s\"\n"
+
+#: pg_backup_archiver.c:1825
+#, c-format
+msgid ""
+"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
+"exist)\n"
+msgstr ""
+"folder \"%s\" nie wydaje się być poprawnym archiwum (\"toc.dat\" nie "
+"istnieje)\n"
+
+#: pg_backup_archiver.c:1833 pg_backup_custom.c:171 pg_backup_custom.c:762
+#: pg_backup_files.c:155 pg_backup_files.c:307
+#, c-format
+msgid "could not open input file \"%s\": %s\n"
+msgstr "nie można otworzyć pliku wejścia \"%s\": %s\n"
+
+#: pg_backup_archiver.c:1841 pg_backup_custom.c:178 pg_backup_files.c:162
+#, c-format
+msgid "could not open input file: %s\n"
+msgstr "nie można otworzyć pliku wyjścia %s\n"
+
+#: pg_backup_archiver.c:1850
+#, c-format
+msgid "could not read input file: %s\n"
+msgstr "nie można odczytać pliku wejścia %s\n"
+
+#: pg_backup_archiver.c:1852
+#, c-format
+msgid "input file is too short (read %lu, expected 5)\n"
+msgstr "plik wejścia jest zbyt krótki (odczytano %lu, oczekiwano 5)\n"
+
+#: pg_backup_archiver.c:1910
+msgid "input file does not appear to be a valid archive (too short?)\n"
+msgstr "plik wejścia nie wydaje się być poprawnym archiwum (zbyt krótki?)\n"
+
+#: pg_backup_archiver.c:1913
+msgid "input file does not appear to be a valid archive\n"
+msgstr "plik wejścia nie wydaje się być poprawnym archiwum\n"
+
+#: pg_backup_archiver.c:1933
+#, c-format
+msgid "could not close input file: %s\n"
+msgstr "nie można zamknąć pliku wejścia: %s\n"
+
+#: pg_backup_archiver.c:1950
+#, c-format
+msgid "allocating AH for %s, format %d\n"
+msgstr "przydzielenie AH da %s, format %d\n"
+
+#: pg_backup_archiver.c:2059
+#, c-format
+msgid "unrecognized file format \"%d\"\n"
+msgstr "nierozpoznany format pliku \"%d\"\n"
+
+#: pg_backup_archiver.c:2181
+#, c-format
+msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
+msgstr "wpis ID %d poza zasięgiem -- być może uszkodzony TOC\n"
+
+#: pg_backup_archiver.c:2297
+#, c-format
+msgid "read TOC entry %d (ID %d) for %s %s\n"
+msgstr "odczyt wpisu TOC %d (ID %d) dla %s %s\n"
+
+#: pg_backup_archiver.c:2331
+#, c-format
+msgid "unrecognized encoding \"%s\"\n"
+msgstr "niezrozumiały kodowanie \"%s\"\n"
+
+#: pg_backup_archiver.c:2336
+#, c-format
+msgid "invalid ENCODING item: %s\n"
+msgstr "niepoprawny element ENCODING: %s\n"
+
+#: pg_backup_archiver.c:2354
+#, c-format
+msgid "invalid STDSTRINGS item: %s\n"
+msgstr "niepoprawny element STDSTRINGS: %s\n"
+
+#: pg_backup_archiver.c:2552
+#, c-format
+msgid "could not set session user to \"%s\": %s"
+msgstr "nie można ustalić użytkownika sesji na \"%s\": %s"
+
+#: pg_backup_archiver.c:2892 pg_backup_archiver.c:3044
+#, c-format
+msgid "WARNING: don't know how to set owner for object type %s\n"
+msgstr "OSTRZEŻENIE: nie wiadomo jak ustalić właściciela dla typu obiektu %s\n"
+
+#: pg_backup_archiver.c:3076
+msgid ""
+"WARNING: requested compression not available in this installation -- archive "
+"will be uncompressed\n"
+msgstr ""
+"OSTRZEŻENIE: żądana kompresja jest niedostępna w tej instalacji -- archiwum "
+"nie będzie spakowane\n"
+
+#: pg_backup_archiver.c:3116
+msgid "did not find magic string in file header\n"
+msgstr "nie znaleziono magicznego zdania w nagłówku pliku\n"
+
+#: pg_backup_archiver.c:3129
+#, c-format
+msgid "unsupported version (%d.%d) in file header\n"
+msgstr "nieobsługiwana wersja (%d.%d) w nagłówku pliku\n"
+
+#: pg_backup_archiver.c:3134
+#, c-format
+msgid "sanity check on integer size (%lu) failed\n"
+msgstr "nie powiodło się sprawdzenie na rozmiarze liczby całkowitej (%lu)\n"
+
+#: pg_backup_archiver.c:3138
+msgid ""
+"WARNING: archive was made on a machine with larger integers, some operations "
+"might fail\n"
+msgstr ""
+"OSTRZEŻENIE: archiwum zostało utworzone na komputerze o dłuższych liczbach "
+"całkowitych, niektóre operacje mogą się nie udać\n"
+
+#: pg_backup_archiver.c:3148
+#, c-format
+msgid "expected format (%d) differs from format found in file (%d)\n"
+msgstr ""
+"oczekiwany format (%d) różni się od formatu znalezionego w pliku (%d)\n"
+
+#: pg_backup_archiver.c:3164
+msgid ""
+"WARNING: archive is compressed, but this installation does not support "
+"compression -- no data will be available\n"
+msgstr ""
+"OSTRZEŻENIE: archiwum jest spakowane, ale ta instalacja nie obsługuje "
+"kompresji -- dane nie będą dostępne\n"
+
+#: pg_backup_archiver.c:3182
+msgid "WARNING: invalid creation date in header\n"
+msgstr "OSTRZEŻENIE: niepoprawna data utworzenia w nagłówku\n"
+
+#: pg_backup_archiver.c:3280
+msgid "entering restore_toc_entries_parallel\n"
+msgstr "wprowadzanie restore_toc_entries_parallel\n"
+
+#: pg_backup_archiver.c:3321
+#, c-format
+msgid "processing item %d %s %s\n"
+msgstr "przetwarzanie elementu %d %s %s\n"
+
+#: pg_backup_archiver.c:3397
+msgid "entering main parallel loop\n"
+msgstr "wejście w główną pętlę współbieżności\n"
+
+#: pg_backup_archiver.c:3411
+#, c-format
+msgid "skipping item %d %s %s\n"
+msgstr "pominięcie elementu %d %s %s\n"
+
+#: pg_backup_archiver.c:3427
+#, c-format
+msgid "launching item %d %s %s\n"
+msgstr "uruchomienie elementu %d %s %s\n"
+
+#: pg_backup_archiver.c:3464
+#, c-format
+msgid "worker process crashed: status %d\n"
+msgstr "proces roboczy uległ awarii: status %d\n"
+
+#: pg_backup_archiver.c:3469
+msgid "finished main parallel loop\n"
+msgstr "kończenie głównej pętli współbieżności\n"
+
+#: pg_backup_archiver.c:3487
+#, c-format
+msgid "processing missed item %d %s %s\n"
+msgstr "przetwarzanie brakujÄ…cego elementu %d %s %s\n"
+
+#: pg_backup_archiver.c:3513
+msgid "parallel_restore should not return\n"
+msgstr "parallel_restore nie może zwracać wartości\n"
+
+#: pg_backup_archiver.c:3519
+#, c-format
+msgid "could not create worker process: %s\n"
+msgstr "nie można utworzyć procesu roboczego: %s\n"
+
+#: pg_backup_archiver.c:3527
+#, c-format
+msgid "could not create worker thread: %s\n"
+msgstr "nie można utworzyć wątku roboczego: %s\n"
+
+#: pg_backup_archiver.c:3751
+msgid "no item ready\n"
+msgstr "brak gotowego elementu\n"
+
+#: pg_backup_archiver.c:3846
+msgid "could not find slot of finished worker\n"
+msgstr "nie można znaleźć gniazda zakończonego procesu roboczego\n"
+
+#: pg_backup_archiver.c:3848
+#, c-format
+msgid "finished item %d %s %s\n"
+msgstr "ukończono element %d %s %s\n"
+
+#: pg_backup_archiver.c:3861
+#, c-format
+msgid "worker process failed: exit code %d\n"
+msgstr "proces roboczy nie powiódł się: kod wyjścia %d\n"
+
+#: pg_backup_archiver.c:4057
+#, c-format
+msgid "transferring dependency %d -> %d to %d\n"
+msgstr "przenoszenie zależności %d -> %d do %d\n"
+
+#: pg_backup_archiver.c:4126
+#, c-format
+msgid "reducing dependencies for %d\n"
+msgstr "redukcja zależności dla %d\n"
+
+#: pg_backup_archiver.c:4175
+#, c-format
+msgid "table \"%s\" could not be created, will not restore its data\n"
+msgstr ""
+"tabela \"%s\" nie mogła zostać utworzona, jej dane nie zostaną odtworzone\n"
+
+#: pg_backup_custom.c:87
+msgid "custom archiver"
+msgstr "archiwizer użytkownika"
+
+#: pg_backup_custom.c:373 pg_backup_null.c:153
+msgid "invalid OID for large object\n"
+msgstr "niepoprawny OID dla dużego obiektu\n"
+
+#: pg_backup_custom.c:444
+#, c-format
+msgid "unrecognized data block type (%d) while searching archive\n"
+msgstr "nierozpoznany typ bloku danych (%d) podczas przeszukiwania archiwum\n"
+
+#: pg_backup_custom.c:455
+#, c-format
+msgid "error during file seek: %s\n"
+msgstr "błąd podczas przeglądania pliku: %s\n"
+
+#: pg_backup_custom.c:465
+#, c-format
+msgid ""
+"could not find block ID %d in archive -- possibly due to out-of-order "
+"restore request, which cannot be handled due to lack of data offsets in "
+"archive\n"
+msgstr ""
+"nie można znaleźć bloku o ID %d w archiwum -- być może ze względu na żądanie "
+"nieuporządkowanego odtwarzania, które nie może być obsłużone przez brak "
+"offsetów danych w archiwum\n"
+
+#: pg_backup_custom.c:470
+#, c-format
+msgid ""
+"could not find block ID %d in archive -- possibly due to out-of-order "
+"restore request, which cannot be handled due to non-seekable input file\n"
+msgstr ""
+"nie można znaleźć bloku o ID %d w archiwum -- być może ze względu na "
+"uszkodzone żądanie odtwarzania, które nie może być obsłużone przez "
+"niepozycjonowany plik wejścia\n"
+
+#: pg_backup_custom.c:475
+#, c-format
+msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
+msgstr ""
+"nie można znaleźć bloku o ID %d w archiwum -- archiwum jest być może "
+"uszkodzone\n"
+
+#: pg_backup_custom.c:482
+#, c-format
+msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
+msgstr ""
+"podczas odczytu danych znaleziono nieoczekiwany blok o ID (%d) -- oczekiwano "
+"%d\n"
+
+#: pg_backup_custom.c:496
+#, c-format
+msgid "unrecognized data block type %d while restoring archive\n"
+msgstr "nierozpoznany typ bloku danych %d podczas odtwarzania archiwum\n"
+
+#: pg_backup_custom.c:578 pg_backup_custom.c:916
+msgid "could not read from input file: end of file\n"
+msgstr "nie można czytać pliku wejścia: koniec pliku\n"
+
+#: pg_backup_custom.c:581 pg_backup_custom.c:919
+#, c-format
+msgid "could not read from input file: %s\n"
+msgstr "nie można czytać z pliku wejścia: %s\n"
+
+#: pg_backup_custom.c:610
+#, c-format
+msgid "could not write byte: %s\n"
+msgstr "nie można zapisać bajtu: %s\n"
+
+#: pg_backup_custom.c:718 pg_backup_custom.c:756
+#, c-format
+msgid "could not close archive file: %s\n"
+msgstr "nie można zamknąć pliku archiwum: %s\n"
+
+#: pg_backup_custom.c:737
+msgid "can only reopen input archives\n"
+msgstr "można tylko odtworzyć ponownie archiwa wejściowe\n"
+
+#: pg_backup_custom.c:744
+msgid "parallel restore from stdin is not supported\n"
+msgstr "współbieżne odtwarzanie z stdin nie jest obsługiwane\n"
+
+#: pg_backup_custom.c:746
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr ""
+"współbieżne odtwarzanie z nieprzeszukiwalnego pliku nie jest obsługiwane\n"
+
+#: pg_backup_custom.c:751
+#, c-format
+msgid "could not determine seek position in archive file: %s\n"
+msgstr "nie można określić pozycji przesunięcia w pliku archiwum: %s\n"
+
+#: pg_backup_custom.c:766
+#, c-format
+msgid "could not set seek position in archive file: %s\n"
+msgstr "nie można ustawić pozycji przeszukiwania w pliku archiwum: %s\n"
+
+#: pg_backup_custom.c:786
+msgid "compressor active\n"
+msgstr "aktywny kompresor\n"
+
+#: pg_backup_custom.c:822
+msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
+msgstr "OSTRZEŻENIE: niezgodność ftell z oczekiwaną pozycją -- użyto ftel\n"
+
+#: pg_backup_db.c:25
+msgid "archiver (db)"
+msgstr "archiwizator (db)"
+
+#: pg_backup_db.c:54
+msgid "could not get server_version from libpq\n"
+msgstr "nie można pobrać server_version z libpq\n"
+
+#: pg_backup_db.c:67 pg_dumpall.c:1741
+#, c-format
+msgid "server version: %s; %s version: %s\n"
+msgstr "wersja serwera: %s; %s w wersji: %s\n"
+
+#: pg_backup_db.c:69 pg_dumpall.c:1743
+#, c-format
+msgid "aborting because of server version mismatch\n"
+msgstr "przerwano z powodu niezgodności wersji serwera\n"
+
+#: pg_backup_db.c:140
+#, c-format
+msgid "connecting to database \"%s\" as user \"%s\"\n"
+msgstr "łączenie z bazą danych \"%s\" jako użytkownik \"%s\"\n"
+
+#: pg_backup_db.c:145 pg_backup_db.c:200 pg_backup_db.c:247 pg_backup_db.c:296
+#: pg_dumpall.c:1637 pg_dumpall.c:1689
+msgid "Password: "
+msgstr "Hasło: "
+
+#: pg_backup_db.c:181
+msgid "failed to reconnect to database\n"
+msgstr "nie udało się połączyć ponownie z bazą danych\n"
+
+#: pg_backup_db.c:186
+#, c-format
+msgid "could not reconnect to database: %s"
+msgstr "nie można połączyć się ponownie z bazą danych: %s"
+
+#: pg_backup_db.c:202
+msgid "connection needs password\n"
+msgstr "połączenie wymaga hasła\n"
+
+#: pg_backup_db.c:243
+msgid "already connected to a database\n"
+msgstr "już połączono z bazą danych\n"
+
+#: pg_backup_db.c:288
+msgid "failed to connect to database\n"
+msgstr "nie udało się połączyć z bazą danych\n"
+
+#: pg_backup_db.c:307
+#, c-format
+msgid "connection to database \"%s\" failed: %s"
+msgstr "połączenie z bazą danych \"%s\" nie powiodło się: %s"
+
+#: pg_backup_db.c:322
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pg_backup_db.c:387
+#, c-format
+msgid "error returned by PQputCopyData: %s"
+msgstr "błąd zwrócony przez PQputCopyData: %s"
+
+#: pg_backup_db.c:397 pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "nie można wykonać zapytania"
+
+#: pg_backup_db.c:425
+#, c-format
+msgid "error returned by PQputCopyEnd: %s"
+msgstr "błąd zwrócony przez PQputCopyEnd: %s"
+
+#: pg_backup_db.c:442
+msgid "could not start database transaction"
+msgstr "nie można uruchomić transakcji na bazie danych"
+
+#: pg_backup_db.c:448
+msgid "could not commit database transaction"
+msgstr "nie można zatwierdzić transakcji na bazie danych"
+
+#: pg_backup_files.c:68
+msgid "file archiver"
+msgstr "archiwizator plików"
+
+#: pg_backup_files.c:122
+msgid ""
+"WARNING:\n"
+"  This format is for demonstration purposes; it is not intended for\n"
+"  normal use. Files will be written in the current working directory.\n"
+msgstr ""
+"OSTRZEŻENIE:\n"
+"  Ten format służy do celów demonstracyjnych; nie jest przeznaczony do\n"
+"  zwykłego użytkowania. Pliki będą zapisane w bieżącym folderze roboczym.\n"
+
+#: pg_backup_files.c:283
+msgid "could not close data file\n"
+msgstr "nie można zamknąć pliku danych\n"
+
+#: pg_backup_files.c:317
+msgid "could not close data file after reading\n"
+msgstr "nie można zamknąć pliku danych po odczycie\n"
+
+#: pg_backup_files.c:379
+#, c-format
+msgid "could not open large object TOC for input: %s\n"
+msgstr "nie można otworzyć TOC dużych obiektów do odczytu: %s\n"
+
+#: pg_backup_files.c:392 pg_backup_files.c:561
+#, c-format
+msgid "could not close large object TOC file: %s\n"
+msgstr "nie można zamknąć TOC dużych obiektów: %s\n"
+
+#: pg_backup_files.c:404
+msgid "could not write byte\n"
+msgstr "nie można zapisać bajtu\n"
+
+#: pg_backup_files.c:490
+#, c-format
+msgid "could not open large object TOC for output: %s\n"
+msgstr "nie można otworzyć TOC dużych obiektów do zapisu: %s\n"
+
+#: pg_backup_files.c:510 pg_backup_tar.c:939
+#, c-format
+msgid "invalid OID for large object (%u)\n"
+msgstr "niepoprawny OID dla dużego obiektu (%u)\n"
+
+#: pg_backup_files.c:529
+#, c-format
+msgid "could not open large object file \"%s\" for input: %s\n"
+msgstr "nie można otworzyć pliku dużych obiektów \"%s\" do odczytu: %s\n"
+
+#: pg_backup_files.c:544
+msgid "could not close large object file\n"
+msgstr "nie można zamknąć pliku dużych obiektów\n"
+
+#: pg_backup_null.c:78
+msgid "this format cannot be read\n"
+msgstr "ten format nie mógł zostać odczytany\n"
+
+#: pg_backup_tar.c:105
+msgid "tar archiver"
+msgstr "archiwizator tar"
+
+#: pg_backup_tar.c:183
+#, c-format
+msgid "could not open TOC file \"%s\" for output: %s\n"
+msgstr "nie można otworzyć pliku TOC \"%s\" do zapisu: %s\n"
+
+#: pg_backup_tar.c:191
+#, c-format
+msgid "could not open TOC file for output: %s\n"
+msgstr "nie można otworzyć pliku TOC do zapisu: %s\n"
+
+#: pg_backup_tar.c:218 pg_backup_tar.c:374
+msgid "compression is not supported by tar archive format\n"
+msgstr "kompresja nie jest obsługiwana przez format archiwum tar\n"
+
+#: pg_backup_tar.c:226
+#, c-format
+msgid "could not open TOC file \"%s\" for input: %s\n"
+msgstr "nie można otworzyć pliku TOC \"%s\" do odczytu: %s\n"
+
+#: pg_backup_tar.c:233
+#, c-format
+msgid "could not open TOC file for input: %s\n"
+msgstr "nie można otworzyć pliku TOC do odczytu: %s\n"
+
+#: pg_backup_tar.c:360
+#, c-format
+msgid "could not find file \"%s\" in archive\n"
+msgstr "nie można znaleźć pliku \"%s\" w archiwum\n"
+
+#: pg_backup_tar.c:416
+#, c-format
+msgid "could not generate temporary file name: %s\n"
+msgstr "nie można utworzyć nazwy pliku tymczasowego: %s\n"
+
+#: pg_backup_tar.c:425
+msgid "could not open temporary file\n"
+msgstr "nie można otworzyć pliku tymczasowego\n"
+
+#: pg_backup_tar.c:452
+msgid "could not close tar member\n"
+msgstr "nie można zamknąć składnika tar\n"
+
+#: pg_backup_tar.c:552
+msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
+msgstr "błąd wewnętrzny -- nie wskazano ani th ani fh w tarReadRaw()\n"
+
+#: pg_backup_tar.c:678
+#, c-format
+msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
+msgstr ""
+"niepoprawne wyrażenie COPY -- nie można znaleźć \"copy\" w ciągu znaków \"%s"
+"\"\n"
+
+#: pg_backup_tar.c:696
+#, c-format
+msgid ""
+"invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
+"starting at position %lu\n"
+msgstr ""
+"niepoprawne wyrażenie COPY -- nie można znaleźć \"from stdin\" w ciągu "
+"znaków \"%s\" począwszy od pozycji %lu\n"
+
+#: pg_backup_tar.c:733
+#, c-format
+msgid "restoring large object OID %u\n"
+msgstr "odtwarzanie OID dużego obiektu %u\n"
+
+#: pg_backup_tar.c:884
+msgid "could not write null block at end of tar archive\n"
+msgstr "nie można zapisać pustego bloku na końcu archiwum tar\n"
+
+#: pg_backup_tar.c:1084
+msgid "archive member too large for tar format\n"
+msgstr "składnik archiwum za duży dla formatu tar\n"
+
+#: pg_backup_tar.c:1099
+#, c-format
+msgid "could not close temporary file: %s\n"
+msgstr "nie można zamknąć pliku tymczasowego: %s\n"
+
+#: pg_backup_tar.c:1109
+#, c-format
+msgid "actual file length (%s) does not match expected (%s)\n"
+msgstr "faktyczna długość pliku (%s) nie zgadza z oczekiwaną (%s)\n"
+
+#: pg_backup_tar.c:1117
+msgid "could not output padding at end of tar member\n"
+msgstr "nie udało się wypełnić wyjścia na końcu składnika tar\n"
+
+#: pg_backup_tar.c:1146
+#, c-format
+msgid "moving from position %s to next member at file position %s\n"
+msgstr ""
+"przeniesienie z pozycji %s do następnego składnika na pozycji pliku %s\n"
+
+#: pg_backup_tar.c:1157
+#, c-format
+msgid "now at file position %s\n"
+msgstr "obecnie na pozycji pliku %s\n"
+
+#: pg_backup_tar.c:1166 pg_backup_tar.c:1196
+#, c-format
+msgid "could not find header for file \"%s\" in tar archive\n"
+msgstr "nie można znaleźć nagłówka dla pliku \"%s\" w archiwum tar\n"
+
+#: pg_backup_tar.c:1180
+#, c-format
+msgid "skipping tar member %s\n"
+msgstr "pominięcie składnika tar %s\n"
+
+#: pg_backup_tar.c:1184
+#, c-format
+msgid ""
+"restoring data out of order is not supported in this archive format: \"%s\" "
+"is required, but comes before \"%s\" in the archive file.\n"
+msgstr ""
+"przywrócenie danych w niepoprawnej kolejności nie jest obsługiwane w tym "
+"formacie archiwum: wymagane jest \"%s\", ale występuje przed \"%s\" w pliku "
+"archiwum.\n"
+
+#: pg_backup_tar.c:1230
+#, c-format
+msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
+msgstr "niezgodność między rzeczywistą i wyliczoną pozycją pliku (%s i %s)\n"
+
+#: pg_backup_tar.c:1245
+#, c-format
+msgid "incomplete tar header found (%lu byte)\n"
+msgid_plural "incomplete tar header found (%lu bytes)\n"
+msgstr[0] "znaleziono niepełny nagłówek tar (%lu bajt)\n"
+msgstr[1] "znaleziono niepełny nagłówek tar (%lu bajty)\n"
+msgstr[2] "znaleziono niepełny nagłówek tar (%lu bajtów)\n"
+
+#: pg_backup_tar.c:1283
+#, c-format
+msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
+msgstr "Wpis TOC %s na %s (długość %lu, suma kontrolna %d)\n"
+
+#: pg_backup_tar.c:1293
+#, c-format
+msgid ""
+"corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
+msgstr ""
+"znaleziono uszkodzony nagłówek tar w %s (oczekiwano %d, wyliczono %d) "
+"pozycja pliku %s\n"
+
+#: pg_restore.c:300
+#, c-format
+msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
+msgstr "%s: opcje -d/--dbname i -f/--file nie mogą być użyte razem\n"
+
+#: pg_restore.c:312
+#, c-format
+msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
+msgstr ""
+"%s: nie można wskazać jednocześnie --single-transaction i wielu zadań\n"
+
+#: pg_restore.c:348
+#, c-format
+msgid ""
+"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
+msgstr ""
+"nierozpoznany format archiwum \"%s\"; proszę wskazać \"c\", \"d\", lub \"t"
+"\"\n"
+
+#: pg_restore.c:382
+#, c-format
+msgid "WARNING: errors ignored on restore: %d\n"
+msgstr "OSTRZEŻENIE: błędy ignorowane przy odtworzeniu: %d\n"
+
+#: pg_restore.c:396
+#, c-format
+msgid ""
+"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
+"\n"
+msgstr ""
+"%s odtwarza bazÄ™ danych PostgreSQL z archiwum utworzonego przez pg_dump.\n"
+"\n"
+
+#: pg_restore.c:398
+#, c-format
+msgid "  %s [OPTION]... [FILE]\n"
+msgstr "  %s [OPCJA]... [PLIK]\n"
+
+#: pg_restore.c:401
+#, c-format
+msgid "  -d, --dbname=NAME        connect to database name\n"
+msgstr "  -d, --dbname=NAZWA       połączenie do bazy danych o tej nazwie\n"
+
+#: pg_restore.c:402
+#, c-format
+msgid "  -f, --file=FILENAME      output file name\n"
+msgstr "  -f, --file=NAZWAPLIKU    nazwa pliku wyjścia\n"
+
+#: pg_restore.c:403
+#, c-format
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
+msgstr ""
+"  -F, --format=c|d|t       format pliku kopii zapasowej (powinien być "
+"automatyczny)\n"
+
+#: pg_restore.c:404
+#, c-format
+msgid "  -l, --list               print summarized TOC of the archive\n"
+msgstr "  -l, --list               drukuje skrótowy spis treści archiwum\n"
+
+#: pg_restore.c:405
+#, c-format
+msgid "  -v, --verbose            verbose mode\n"
+msgstr "  -v, --verbose            tryb informacji szczegółowych\n"
+
+#: pg_restore.c:406
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   pokazuje ten ekran pomocy i kończy\n"
+
+#: pg_restore.c:407
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                pokazuje informacje o wersji i kończy\n"
+
+#: pg_restore.c:409
+#, c-format
+msgid ""
+"\n"
+"Options controlling the restore:\n"
+msgstr ""
+"\n"
+"Opcje kontroli odtworzenia:\n"
+
+#: pg_restore.c:410
+#, c-format
+msgid "  -a, --data-only          restore only the data, no schema\n"
+msgstr "  -a, --data-only          odtwarza tylko dane, bez schematu\n"
+
+#: pg_restore.c:411
+#, c-format
+msgid ""
+"  -c, --clean              clean (drop) database objects before recreating\n"
+msgstr ""
+"  -c, --clean              czyści (kasuje) obiekty bazy danych przed "
+"odtworzeniem\n"
+
+#: pg_restore.c:412
+#, c-format
+msgid "  -C, --create             create the target database\n"
+msgstr "  -C, --create             utworzenie docelowej bazy danych\n"
+
+#: pg_restore.c:413
+#, c-format
+msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
+msgstr ""
+"  -e, --exit-on-error      wyjście w przypadku błędu, domyślna jest "
+"kontynuacja\n"
+
+#: pg_restore.c:414
+#, c-format
+msgid "  -I, --index=NAME         restore named index\n"
+msgstr "  -I, --index=NAZWA        odtwarza indeks wedle nazwy\n"
+
+#: pg_restore.c:415
+#, c-format
+msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
+msgstr ""
+"  -j, --jobs=NUM           użycie tylu równoległych zadań przy odtwarzaniu\n"
+
+#: pg_restore.c:416
+#, c-format
+msgid ""
+"  -L, --use-list=FILENAME  use table of contents from this file for\n"
+"                           selecting/ordering output\n"
+msgstr ""
+"  -L, --use-list=NAZWAPLIKU\n"
+"                           użycie spisu treści z tego pliku by\n"
+"                           wskazać/uporządkować wyjście\n"
+
+#: pg_restore.c:418
+#, c-format
+msgid "  -n, --schema=NAME        restore only objects in this schema\n"
+msgstr "  -n, --schema=NAZWA       odtwarza tylko obiekty z tego schematu\n"
+
+#: pg_restore.c:419
+#, c-format
+msgid "  -O, --no-owner           skip restoration of object ownership\n"
+msgstr ""
+"  -O, --no-owner           nie odtwarza ustalenia właściciela obiektu\n"
+
+#: pg_restore.c:420
+#, c-format
+msgid ""
+"  -P, --function=NAME(args)\n"
+"                           restore named function\n"
+msgstr ""
+"  -P, --function=NAZWA(args)\n"
+"                           odtwarza funkcjÄ™ wedle nazwy\n"
+
+#: pg_restore.c:422
+#, c-format
+msgid "  -s, --schema-only        restore only the schema, no data\n"
+msgstr "  -s, --schema-only        odtwarza tylko schemat, bez danych\n"
+
+#: pg_restore.c:423
+#, c-format
+msgid ""
+"  -S, --superuser=NAME     superuser user name to use for disabling "
+"triggers\n"
+msgstr ""
+"  -S, --superuser=NAZWA    nazwa superużytkownika by użyć lub wyłączyć\n"
+"                           wyzwalacze\n"
+
+#: pg_restore.c:424
+#, c-format
+msgid "  -t, --table=NAME         restore named table\n"
+msgstr "  -t, --table=NAZWA        odtwarza tabelÄ™ wedle nazwy\n"
+
+#: pg_restore.c:425
+#, c-format
+msgid "  -T, --trigger=NAME       restore named trigger\n"
+msgstr "  -T, --trigger=NAZWA      odtwarza wyzwalacz wedle nazwy\n"
+
+#: pg_restore.c:426
+#, c-format
+msgid ""
+"  -x, --no-privileges      skip restoration of access privileges (grant/"
+"revoke)\n"
+msgstr ""
+"  -x, --no-privileges      nie wykonuje odtwarzania przywilejów dostępu\n"
+"                           (grant/revoke)\n"
+
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr ""
+"  -1, --single-transaction\n"
+"                           odtworzenie jako pojedyncza transakcja\n"
+
+#: pg_restore.c:429
+#, c-format
+msgid "  --disable-triggers       disable triggers during data-only restore\n"
+msgstr ""
+"  --disable-triggers       wyłącza wyzwalacze podczas odtwarzania wyłącznie\n"
+"                           danych\n"
+
+#: pg_restore.c:430
+#, c-format
+msgid ""
+"  --no-data-for-failed-tables\n"
+"                           do not restore data of tables that could not be\n"
+"                           created\n"
+msgstr ""
+"  --no-data-for-failed-tables\n"
+"                           nie odtwarza danych z tabel, które nie mogły\n"
+"                           być odtworzone\n"
+
+#: pg_restore.c:433
+#, c-format
+msgid "  --no-security-labels     do not restore security labels\n"
+msgstr "  --no-security-labels     nie odtwarza etykiet bezpieczeństwa\n"
+
+#: pg_restore.c:434
+#, c-format
+msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgstr ""
+"  --no-tablespaces         nie odtwarza przypisań do przestrzeni tabel\n"
+
+#: pg_restore.c:435
+#, c-format
+msgid ""
+"  --use-set-session-authorization\n"
+"                           use SET SESSION AUTHORIZATION commands instead "
+"of\n"
+"                           ALTER OWNER commands to set ownership\n"
+msgstr ""
+"  --use-set-session-authorization\n"
+"                           używa poleceń SET SESSION AUTHORIZATION zamiast\n"
+"                           poleceń ALTER OWNER do ustalenia właściciela\n"
+
+#: pg_restore.c:445
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=NAZWAROLI         wykonuje SET ROLE przed odtworzeniem\n"
+
+#: pg_restore.c:447
+#, c-format
+msgid ""
+"\n"
+"If no input file name is supplied, then standard input is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Jeśli nie wskazano nazwy pliku, użyty zostanie wejście standardowe.\n"
+"\n"
+
+#: pg_dumpall.c:171
+#, c-format
+msgid ""
+"The program \"pg_dump\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"pg_dump\" jest wymagany przez %s ale nie został znaleziony\n"
+"w tym samym folderze co \"%s\".\n"
+"Sprawdź instalację.\n"
+
+#: pg_dumpall.c:178
+#, c-format
+msgid ""
+"The program \"pg_dump\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"pg_dump\" został znaleziony przez \"%s\"\n"
+"ale nie jest w tej samej wersji co %s.\n"
+"Sprawdź instalację.\n"
+
+#: pg_dumpall.c:314
+#, c-format
+msgid ""
+"%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
+msgstr ""
+"%s: opcje -g/--globals-only i -r/--roles-only nie mogą być używane razem\n"
+
+#: pg_dumpall.c:323
+#, c-format
+msgid ""
+"%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
+"together\n"
+msgstr ""
+"%s: opcje -g/--globals-only i -t/--tablespaces-only nie mogą być używane "
+"razem\n"
+
+#: pg_dumpall.c:332
+#, c-format
+msgid ""
+"%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
+"together\n"
+msgstr ""
+"%s: opcje -r/--roles-only i -t/--tablespaces-only nie mogą być używane "
+"razem\n"
+
+#: pg_dumpall.c:374 pg_dumpall.c:1678
+#, c-format
+msgid "%s: could not connect to database \"%s\"\n"
+msgstr "%s: nie można połączyć się do bazy danych \"%s\"\n"
+
+#: pg_dumpall.c:389
+#, c-format
+msgid ""
+"%s: could not connect to databases \"postgres\" or \"template1\"\n"
+"Please specify an alternative database.\n"
+msgstr ""
+"%s: n ie udało się połączyć do bazy danych \"postgres\" ani \"template1\"\n"
+"Proszę wskazać alternatywną bazę danych.\n"
+
+#: pg_dumpall.c:406
+#, c-format
+msgid "%s: could not open the output file \"%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku wyjścia \"%s\": %s\n"
+
+#: pg_dumpall.c:528
+#, c-format
+msgid ""
+"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"\n"
+msgstr ""
+"%s wyciÄ…ga klaster bazy danych PostgreSQL do pliku skryptowego SQL.\n"
+"\n"
+
+#: pg_dumpall.c:530
+#, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [OPCJA]...\n"
+
+#: pg_dumpall.c:533
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=NAZWAPLIKU       nazwa pliku wyjścia\n"
+
+#: pg_dumpall.c:539
+#, c-format
+msgid ""
+"  -c, --clean                 clean (drop) databases before recreating\n"
+msgstr ""
+"  -c, --clean                 czyszczenie (kasowanie) baz danych przed "
+"odtworzeniem\n"
+
+#: pg_dumpall.c:540
+#, c-format
+msgid "  -g, --globals-only          dump only global objects, no databases\n"
+msgstr ""
+"  -g, --globals-only          zrzuca tylko obiekty globalne, bez baz danych\n"
+
+#: pg_dumpall.c:542
+#, c-format
+msgid "  -O, --no-owner              skip restoration of object ownership\n"
+msgstr "  -O, --no-owner              bez odtwarzania posiadania obiektu\n"
+
+#: pg_dumpall.c:543
+#, c-format
+msgid ""
+"  -r, --roles-only            dump only roles, no databases or tablespaces\n"
+msgstr ""
+"  -r, --roles-only            zrzuca tylko role bez baz danych i przestrzeni "
+"tabel\n"
+
+#: pg_dumpall.c:545
+#, c-format
+msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
+msgstr ""
+"  -S, --superuser=NAZWA       nazwa superużytkownika używana w zrzucie\n"
+
+#: pg_dumpall.c:546
+#, c-format
+msgid ""
+"  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
+msgstr ""
+"  -t, --tablespaces-only      zrzuca tylko przestrzenie tabel, bez baz "
+"danych i ról\n"
+
+#: pg_dumpall.c:563
+#, c-format
+msgid "  -l, --database=DBNAME    alternative default database\n"
+msgstr "  -l, --database=NAZWADB   alternatywna domyślna baza danych\n"
+
+#: pg_dumpall.c:570
+#, c-format
+msgid ""
+"\n"
+"If -f/--file is not used, then the SQL script will be written to the "
+"standard\n"
+"output.\n"
+"\n"
+msgstr ""
+"\n"
+"Jeśli nie użyto -f/--file, skrypt SQL zostanie zapisany do standardowego\n"
+"wyjścia.\n"
+"\n"
+
+#: pg_dumpall.c:1041
+#, c-format
+msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
+msgstr ""
+"%s: nie udało się przeanalizować listy AC (%s) dla przestrzeni tabel \"%s\"\n"
+
+#: pg_dumpall.c:1341
+#, c-format
+msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
+msgstr ""
+"%s: nie udało się przeanalizować listy AC (%s) dla bazy danych \"%s\"\n"
+
+#: pg_dumpall.c:1548
+#, c-format
+msgid "%s: dumping database \"%s\"...\n"
+msgstr "%s: tworzenie kopii zapasowej bazy danych \"%s\"...\n"
+
+#: pg_dumpall.c:1558
+#, c-format
+msgid "%s: pg_dump failed on database \"%s\", exiting\n"
+msgstr "%s: pg_dump nie powiódł się na bazie danych \"%s\", wyjście\n"
+
+#: pg_dumpall.c:1567
+#, c-format
+msgid "%s: could not re-open the output file \"%s\": %s\n"
+msgstr "%s: nie można ponownie otworzyć pliku \"%s\": %s\n"
+
+#: pg_dumpall.c:1606
+#, c-format
+msgid "%s: running \"%s\"\n"
+msgstr "%s: uruchomiony \"%s\"\n"
+
+#: pg_dumpall.c:1651
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: brak pamięci\n"
+
+#: pg_dumpall.c:1700
+#, c-format
+msgid "%s: could not connect to database \"%s\": %s\n"
+msgstr "%s: nie można połączyć się do bazy danych \"%s\": %s\n"
+
+#: pg_dumpall.c:1714
+#, c-format
+msgid "%s: could not get server version\n"
+msgstr "%s: nie można pobrać wersji serwera\n"
+
+#: pg_dumpall.c:1720
+#, c-format
+msgid "%s: could not parse server version \"%s\"\n"
+msgstr "%s: nie można odczytać wersji serwera \"%s\"\n"
+
+#: pg_dumpall.c:1728
+#, c-format
+msgid "%s: could not parse version \"%s\"\n"
+msgstr "%s: nie można odczytać wersji \"%s\"\n"
+
+#: pg_dumpall.c:1767 pg_dumpall.c:1793
+#, c-format
+msgid "%s: executing %s\n"
+msgstr "%s: wykonanie %s\n"
+
+#: pg_dumpall.c:1773 pg_dumpall.c:1799
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s: zapytanie nie powiodło się: %s"
+
+#: pg_dumpall.c:1775 pg_dumpall.c:1801
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s: zapytanie brzmiało: %s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nie można zidentyfikować aktualnego katalogu: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "niepoprawny binarny \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nie można odczytać binarnego \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nie znaleziono \"%s\" do wykonania"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nie można odczytać odwołania symbolicznego \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "proces potomny zakończył działanie z kodem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "proces potomny został zatrzymany przez wyjątek 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "proces potomny został zatrzymany przez sygnał %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "proces potomny został zatrzymany przez sygnał %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
diff --git a/src/bin/pg_dump/po/pt_BR.po b/src/bin/pg_dump/po/pt_BR.po
index c48e349da1518..6b89e2d1fe5e7 100644
--- a/src/bin/pg_dump/po/pt_BR.po
+++ b/src/bin/pg_dump/po/pt_BR.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 # Roberto Mello <rmello@fslc.usu.edu>, 2002.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-16 11:49-0300\n"
+"POT-Creation-Date: 2011-11-30 16:10-0300\n"
 "PO-Revision-Date: 2005-10-04 23:16-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -18,78 +18,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: pg_dump.c:453 pg_restore.c:268 pg_dumpall.c:291
-#, c-format
-msgid "%s: invalid -X option -- %s\n"
-msgstr "%s: opção -X é inválida -- %s\n"
-
-#: pg_dump.c:455 pg_dump.c:477 pg_dump.c:491 pg_restore.c:270 pg_restore.c:293
-#: pg_restore.c:309 pg_restore.c:321 pg_dumpall.c:293 pg_dumpall.c:313
-#: pg_dumpall.c:323 pg_dumpall.c:333 pg_dumpall.c:342 pg_dumpall.c:351
-#: pg_dumpall.c:403
+#: pg_dump.c:489 pg_dump.c:503 pg_restore.c:274 pg_restore.c:290
+#: pg_restore.c:302 pg_dumpall.c:296 pg_dumpall.c:306 pg_dumpall.c:316
+#: pg_dumpall.c:325 pg_dumpall.c:334 pg_dumpall.c:392
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: pg_dump.c:489 pg_restore.c:307 pg_dumpall.c:321
+#: pg_dump.c:501 pg_restore.c:288 pg_dumpall.c:304
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: muitos argumentos de linha de comando (primeiro é \"%s\")\n"
 
-#: pg_dump.c:502
+#: pg_dump.c:514
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr ""
 "opções -s/--schema-only  e -a/--data-only não podem ser utilizadas juntas\n"
 
-#: pg_dump.c:508
+#: pg_dump.c:520
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "opções -c/--clean e -a/--data-only não podem ser utilizadas juntas\n"
 
-#: pg_dump.c:514
+#: pg_dump.c:526
 msgid ""
 "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr ""
 "opções --inserts/--column-inserts e -o/--oids não podem ser utilizadas "
 "juntas\n"
 
-#: pg_dump.c:515
+#: pg_dump.c:527
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(O comando INSERT não pode definir OIDs.)\n"
 
-#: pg_dump.c:545
-#, c-format
-msgid "invalid output format \"%s\" specified\n"
-msgstr "formato de saída especificado \"%s\" é inválido\n"
-
-#: pg_dump.c:551
+#: pg_dump.c:552
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "não pôde abrir arquivo de saída \"%s\" para escrita\n"
 
-#: pg_dump.c:561 pg_backup_db.c:45
+#: pg_dump.c:562 pg_backup_db.c:38
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "não pôde validar a versão \"%s\"\n"
 
-#: pg_dump.c:584
+#: pg_dump.c:585
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "codificação de cliente \"%s\" especificada é inválida\n"
 
-#: pg_dump.c:661
+#: pg_dump.c:685
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "último OID interno é %u\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:695
 msgid "No matching schemas were found\n"
 msgstr "Nenhum esquema correspondente foi encontrado\n"
 
-#: pg_dump.c:686
+#: pg_dump.c:710
 msgid "No matching tables were found\n"
 msgstr "Nenhuma tabela correspondente foi encontrada\n"
 
-#: pg_dump.c:798
+#: pg_dump.c:822
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -98,17 +87,17 @@ msgstr ""
 "%s salva um banco de dados em um arquivo texto ou em outros formatos.\n"
 "\n"
 
-#: pg_dump.c:799 pg_restore.c:410 pg_dumpall.c:536
+#: pg_dump.c:823 pg_restore.c:397 pg_dumpall.c:529
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: pg_dump.c:800
+#: pg_dump.c:824
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [OPÇÃO]... [NOMEBD]\n"
 
-#: pg_dump.c:802 pg_restore.c:413 pg_dumpall.c:539
+#: pg_dump.c:826 pg_restore.c:400 pg_dumpall.c:532
 #, c-format
 msgid ""
 "\n"
@@ -117,32 +106,33 @@ msgstr ""
 "\n"
 "Opções gerais:\n"
 
-#: pg_dump.c:803 pg_dumpall.c:540
+#: pg_dump.c:827
 #, c-format
-msgid "  -f, --file=FILENAME         output file name\n"
-msgstr "  -f, --file=ARQUIVO        nome do arquivo de saída\n"
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=ARQUIVO        nome do arquivo ou diretório de saída\n"
 
-#: pg_dump.c:804
+#: pg_dump.c:828
 #, c-format
 msgid ""
-"  -F, --format=c|t|p          output file format (custom, tar, plain text)\n"
+"  -F, --format=c|d|t|p        output file format (custom, directory, tar, "
+"plain text)\n"
 msgstr ""
-"  -F, --format=c|t|p        formato do arquivo de saída (personalizado, tar, "
-"texto)\n"
+"  -F, --format=c|d|t|p      formato do arquivo de saída (personalizado, "
+"diretório, tar, texto)\n"
 
-#: pg_dump.c:805
+#: pg_dump.c:829
 #, c-format
 msgid "  -v, --verbose               verbose mode\n"
 msgstr "  -v, --verbose             modo informações detalhadas\n"
 
-#: pg_dump.c:806
+#: pg_dump.c:830
 #, c-format
 msgid ""
 "  -Z, --compress=0-9          compression level for compressed formats\n"
 msgstr ""
 "  -Z, --compress=0-9        nível de compressão para formatos comprimidos\n"
 
-#: pg_dump.c:807 pg_dumpall.c:541
+#: pg_dump.c:831 pg_dumpall.c:534
 #, c-format
 msgid ""
 "  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
@@ -150,18 +140,18 @@ msgstr ""
 "  --lock-wait-timeout=TEMPO falha após esperar TEMPO por um travamento da "
 "tabela\n"
 
-#: pg_dump.c:808 pg_dumpall.c:542
+#: pg_dump.c:832 pg_dumpall.c:535
 #, c-format
 msgid "  --help                      show this help, then exit\n"
 msgstr "  --help                    mostra esta ajuda e termina\n"
 
-#: pg_dump.c:809 pg_dumpall.c:543
+#: pg_dump.c:833 pg_dumpall.c:536
 #, c-format
 msgid "  --version                   output version information, then exit\n"
 msgstr ""
 "  --version                 mostra informação sobre a versão e termina\n"
 
-#: pg_dump.c:811 pg_dumpall.c:544
+#: pg_dump.c:835 pg_dumpall.c:537
 #, c-format
 msgid ""
 "\n"
@@ -170,18 +160,18 @@ msgstr ""
 "\n"
 "Opções que controlam a saída do conteúdo:\n"
 
-#: pg_dump.c:812 pg_dumpall.c:545
+#: pg_dump.c:836 pg_dumpall.c:538
 #, c-format
 msgid "  -a, --data-only             dump only the data, not the schema\n"
 msgstr "  -a, --data-only              copia somente os dados, não o esquema\n"
 
-#: pg_dump.c:813
+#: pg_dump.c:837
 #, c-format
 msgid "  -b, --blobs                 include large objects in dump\n"
 msgstr ""
 "  -b, --blobs                  inclui objetos grandes na cópia de segurança\n"
 
-#: pg_dump.c:814
+#: pg_dump.c:838
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) database objects before "
@@ -190,7 +180,7 @@ msgstr ""
 "  -c, --clean                  exclui (remove) bancos de dados antes de criá-"
 "lo novamente\n"
 
-#: pg_dump.c:815
+#: pg_dump.c:839
 #, c-format
 msgid ""
 "  -C, --create                include commands to create database in dump\n"
@@ -198,31 +188,31 @@ msgstr ""
 "  -C, --create                 inclui comandos para criação dos bancos de "
 "dados na cópia de segurança\n"
 
-#: pg_dump.c:816
+#: pg_dump.c:840
 #, c-format
 msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
 msgstr ""
 "  -E, --encoding=CODIFICAÇÃO   copia dados na codificação CODIFICAÇÂO\n"
 
-#: pg_dump.c:817
+#: pg_dump.c:841
 #, c-format
 msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
 msgstr ""
 "  -n, --schema=ESQUEMA         copia somente o(s) esquema(s) especificado"
 "(s)\n"
 
-#: pg_dump.c:818
+#: pg_dump.c:842
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
 msgstr ""
 "  -N, --exclude-schema=ESQUEMA NÃO copia o(s) esquema(s) especificado(s)\n"
 
-#: pg_dump.c:819 pg_dumpall.c:548
+#: pg_dump.c:843 pg_dumpall.c:541
 #, c-format
 msgid "  -o, --oids                  include OIDs in dump\n"
 msgstr "  -o, --oids                   inclui OIDs na cópia de segurança\n"
 
-#: pg_dump.c:820
+#: pg_dump.c:844
 #, c-format
 msgid ""
 "  -O, --no-owner              skip restoration of object ownership in\n"
@@ -231,13 +221,13 @@ msgstr ""
 "  -O, --no-owner               ignora restauração do dono dos objetos\n"
 "                               no formato texto\n"
 
-#: pg_dump.c:822 pg_dumpall.c:551
+#: pg_dump.c:846 pg_dumpall.c:544
 #, c-format
 msgid "  -s, --schema-only           dump only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only            copia somente o esquema, e não os dados\n"
 
-#: pg_dump.c:823
+#: pg_dump.c:847
 #, c-format
 msgid ""
 "  -S, --superuser=NAME        superuser user name to use in plain-text "
@@ -246,40 +236,31 @@ msgstr ""
 "  -S, --superuser=NOME         nome de super-usuário a ser usado no formato "
 "texto\n"
 
-#: pg_dump.c:824
+#: pg_dump.c:848
 #, c-format
 msgid "  -t, --table=TABLE           dump the named table(s) only\n"
 msgstr ""
 "  -t, --table=TABELA           copia somente a(s) tabela(s) especificada(s)\n"
 
-#: pg_dump.c:825
+#: pg_dump.c:849
 #, c-format
 msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
 msgstr ""
 "  -T, --exclude-table=TABELA   NÃO copia a(s) tabela(s) especificada(s)\n"
 
-#: pg_dump.c:826 pg_dumpall.c:554
+#: pg_dump.c:850 pg_dumpall.c:547
 #, c-format
 msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
 msgstr ""
 "  -x, --no-privileges          não copia os privilégios (grant/revoke)\n"
 
-#: pg_dump.c:827 pg_dumpall.c:555
+#: pg_dump.c:851 pg_dumpall.c:548
 #, c-format
 msgid "  --binary-upgrade            for use by upgrade utilities only\n"
 msgstr ""
 "  --binary-upgrade             usado somente por utilitários de atualização\n"
 
-#: pg_dump.c:828 pg_dumpall.c:556
-#, c-format
-msgid ""
-"  --inserts                   dump data as INSERT commands, rather than "
-"COPY\n"
-msgstr ""
-"  --inserts                    copia dados utilizando comandos INSERT, ao "
-"invés de comandos COPY\n"
-
-#: pg_dump.c:829 pg_dumpall.c:557
+#: pg_dump.c:852 pg_dumpall.c:549
 #, c-format
 msgid ""
 "  --column-inserts            dump data as INSERT commands with column "
@@ -288,7 +269,7 @@ msgstr ""
 "  --column-inserts             copia dados utilizando comandos INSERT com "
 "nomes das colunas\n"
 
-#: pg_dump.c:830 pg_dumpall.c:558
+#: pg_dump.c:853 pg_dumpall.c:550
 #, c-format
 msgid ""
 "  --disable-dollar-quoting    disable dollar quoting, use SQL standard "
@@ -297,7 +278,7 @@ msgstr ""
 "  --disable-dollar-quoting     desabilita delimitação por cifrão, usa "
 "delimitadores do padrão SQL\n"
 
-#: pg_dump.c:831 pg_dumpall.c:559
+#: pg_dump.c:854 pg_dumpall.c:551
 #, c-format
 msgid ""
 "  --disable-triggers          disable triggers during data-only restore\n"
@@ -305,18 +286,49 @@ msgstr ""
 "  --disable-triggers           desabilita gatilhos durante a restauração do "
 "tipo somente dados\n"
 
-#: pg_dump.c:832 pg_dumpall.c:560
+#: pg_dump.c:855 pg_dumpall.c:552
+#, c-format
+msgid ""
+"  --inserts                   dump data as INSERT commands, rather than "
+"COPY\n"
+msgstr ""
+"  --inserts                    copia dados utilizando comandos INSERT, ao "
+"invés de comandos COPY\n"
+
+#: pg_dump.c:856 pg_dumpall.c:553
+#, c-format
+msgid "  --no-security-labels        do not dump security label assignments\n"
+msgstr ""
+"  --no-security-labels         não copia atribuições de rótulos de "
+"segurança\n"
+
+#: pg_dump.c:857 pg_dumpall.c:554
 #, c-format
 msgid "  --no-tablespaces            do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces             não copia atribuições a tablespaces\n"
 
-#: pg_dump.c:833 pg_dumpall.c:561
+#: pg_dump.c:858 pg_dumpall.c:555
+#, c-format
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr "  --no-unlogged-table-data     não copia dados de tabela unlogged\n"
+
+#: pg_dump.c:859 pg_dumpall.c:556
 #, c-format
-msgid "  --role=ROLENAME             do SET ROLE before dump\n"
+msgid ""
+"  --quote-all-identifiers     quote all identifiers, even if not key words\n"
 msgstr ""
-"  --role=NOMEROLE              executa SET ROLE antes da cópia de segurança\n"
+"  --quote-all-identifiers      todos os identificadores entre aspas, mesmo "
+"que não sejam palavras chave\n"
 
-#: pg_dump.c:834 pg_dumpall.c:562
+#: pg_dump.c:860
+#, c-format
+msgid ""
+"  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr ""
+"  --serializable-deferrable    espera até que a cópia seja executada sem "
+"anomalias\n"
+
+#: pg_dump.c:861 pg_dumpall.c:557
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -329,7 +341,7 @@ msgstr ""
 "invés de\n"
 "                               comandos ALTER OWNER para definir o dono\n"
 
-#: pg_dump.c:838 pg_restore.c:452 pg_dumpall.c:566
+#: pg_dump.c:865 pg_restore.c:439 pg_dumpall.c:561
 #, c-format
 msgid ""
 "\n"
@@ -338,32 +350,32 @@ msgstr ""
 "\n"
 "Opções de conexão: \n"
 
-#: pg_dump.c:839 pg_restore.c:453 pg_dumpall.c:567
+#: pg_dump.c:866 pg_restore.c:440 pg_dumpall.c:562
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr ""
 "  -h, --host=M�QUINA       máquina do servidor de banco de dados ou "
 "diretório do soquete\n"
 
-#: pg_dump.c:840 pg_restore.c:454 pg_dumpall.c:569
+#: pg_dump.c:867 pg_restore.c:441 pg_dumpall.c:564
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr ""
 "  -p, --port=PORTA         número da porta do servidor de banco de dados\n"
 
-#: pg_dump.c:841 pg_restore.c:455 pg_dumpall.c:570
+#: pg_dump.c:868 pg_restore.c:442 pg_dumpall.c:565
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr ""
 "  -U, --username=NOME      conecta como usuário do banco de dados "
 "especificado\n"
 
-#: pg_dump.c:842 pg_restore.c:456 pg_dumpall.c:571
+#: pg_dump.c:869 pg_restore.c:443 pg_dumpall.c:566
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        nunca pergunta senha\n"
 
-#: pg_dump.c:843 pg_restore.c:457 pg_dumpall.c:572
+#: pg_dump.c:870 pg_restore.c:444 pg_dumpall.c:567
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -371,7 +383,13 @@ msgid ""
 msgstr ""
 "  -W, --password           pergunta senha (pode ocorrer automaticamente)\n"
 
-#: pg_dump.c:845
+#: pg_dump.c:871 pg_dumpall.c:568
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr ""
+"  --role=NOMEROLE          executa SET ROLE antes da cópia de segurança\n"
+
+#: pg_dump.c:873
 #, c-format
 msgid ""
 "\n"
@@ -384,155 +402,170 @@ msgstr ""
 "PGDATABASE é utilizada.\n"
 "\n"
 
-#: pg_dump.c:847 pg_restore.c:460 pg_dumpall.c:576
+#: pg_dump.c:875 pg_restore.c:448 pg_dumpall.c:572
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:855 pg_backup_archiver.c:1401
+#: pg_dump.c:883 pg_backup_archiver.c:1458
 msgid "*** aborted because of error\n"
 msgstr "*** interrompido por causa de erro\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:925
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "formato de saída especificado \"%s\" é inválido\n"
+
+#: pg_dump.c:948
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr ""
 "versão do servidor deve ser pelo menos versão 7.3 para utilizar opções com "
 "esquemas\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1220
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "copiando conteúdo da tabela %s\n"
 
-#: pg_dump.c:1217
+#: pg_dump.c:1340
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr "Cópia do conteúdo da tabela \"%s\" falhou: PQgetCopyData() falhou.\n"
 
-#: pg_dump.c:1218 pg_dump.c:12413
+#: pg_dump.c:1341 pg_dump.c:14173
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Mensagem de erro do servidor: %s"
 
-#: pg_dump.c:1219 pg_dump.c:12414
+#: pg_dump.c:1342 pg_dump.c:14174
 #, c-format
 msgid "The command was: %s\n"
 msgstr "O comando foi: %s\n"
 
-#: pg_dump.c:1625
+#: pg_dump.c:1765
 msgid "saving database definition\n"
 msgstr "salvando definição do banco de dados\n"
 
-#: pg_dump.c:1707
+#: pg_dump.c:1847
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "faltando registro em pg_database para banco de dados \"%s\"\n"
 
-#: pg_dump.c:1714
+#: pg_dump.c:1854
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr ""
 "consulta retornou mais de um (%d) registro em pg_database para banco \"%s\"\n"
 
-#: pg_dump.c:1815
+#: pg_dump.c:1958
 msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
 msgstr "dumpDatabase(): não pôde encontrar pg_largeobject.relfrozenxid\n"
 
-#: pg_dump.c:1892
+#: pg_dump.c:1997
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr ""
+"dumpDatabase(): não pôde encontrar pg_largeobject_metadata.relfrozenxid\n"
+
+#: pg_dump.c:2076
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "salvando codificação = %s\n"
 
-#: pg_dump.c:1919
+#: pg_dump.c:2103
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "salvando padrão de escape de cadeia de caracteres = %s\n"
 
-#: pg_dump.c:1952
+#: pg_dump.c:2136
 msgid "reading large objects\n"
 msgstr "lendo objetos grandes\n"
 
-#: pg_dump.c:2079
+#: pg_dump.c:2268
 msgid "saving large objects\n"
 msgstr "salvando objetos grandes\n"
 
-#: pg_dump.c:2121 pg_backup_archiver.c:946
+#: pg_dump.c:2310 pg_backup_archiver.c:984
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr "não pôde abrir objeto grande %u: %s"
 
-#: pg_dump.c:2134
+#: pg_dump.c:2323
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "erro ao ler objeto grande %u: %s"
 
-#: pg_dump.c:2181 pg_dump.c:2229 pg_dump.c:2291 pg_dump.c:6912 pg_dump.c:7115
-#: pg_dump.c:7931 pg_dump.c:8469 pg_dump.c:8719 pg_dump.c:8825 pg_dump.c:9210
-#: pg_dump.c:9386 pg_dump.c:9583 pg_dump.c:9810 pg_dump.c:9965 pg_dump.c:10152
-#: pg_dump.c:12219
+#: pg_dump.c:2370 pg_dump.c:2418 pg_dump.c:2473 pg_dump.c:7607 pg_dump.c:7838
+#: pg_dump.c:8804 pg_dump.c:9356 pg_dump.c:9610 pg_dump.c:9724 pg_dump.c:10180
+#: pg_dump.c:10366 pg_dump.c:10472 pg_dump.c:10672 pg_dump.c:10914
+#: pg_dump.c:11081 pg_dump.c:11302 pg_dump.c:13979
 #, c-format
 msgid "query returned %d row instead of one: %s\n"
 msgid_plural "query returned %d rows instead of one: %s\n"
 msgstr[0] "consulta retornou %d registro ao invés de um: %s\n"
 msgstr[1] "consulta retornou %d registros ao invés de um: %s\n"
 
-#: pg_dump.c:2436
+#: pg_dump.c:2554
+#, c-format
+msgid "could not find parent extension for %s"
+msgstr "não pôde encontrar extensão pai para %s"
+
+#: pg_dump.c:2661
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono do esquema \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:2471
+#: pg_dump.c:2696
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "esquema com OID %u não existe\n"
 
-#: pg_dump.c:2728
+#: pg_dump.c:3037
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono do tipo de dado \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:2832
+#: pg_dump.c:3141
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono do operador \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:3006
+#: pg_dump.c:3393
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono da classe de operadores \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:3093
+#: pg_dump.c:3480
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono da família de operadores \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:3218
+#: pg_dump.c:3617
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono da função de agregação \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:3373
+#: pg_dump.c:3787
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono da função \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:3806
+#: pg_dump.c:4287
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "AVISO: dono da tabela \"%s\" parece ser inválido\n"
 
-#: pg_dump.c:3949
+#: pg_dump.c:4430
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "lendo índices da tabela \"%s\"\n"
 
-#: pg_dump.c:4269
+#: pg_dump.c:4750
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "lendo restrições de chave estrangeira da tabela \"%s\"\n"
 
-#: pg_dump.c:4501
+#: pg_dump.c:4982
 #, c-format
 msgid ""
 "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
@@ -541,12 +574,12 @@ msgstr ""
 "verificação de sanidade falhou, OID %u da tabela pai de pg_rewrite com OID "
 "%u não foi encontrado\n"
 
-#: pg_dump.c:4585
+#: pg_dump.c:5066
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "lendo gatilhos da tabela \"%s\"\n"
 
-#: pg_dump.c:4748
+#: pg_dump.c:5229
 #, c-format
 msgid ""
 "query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -555,32 +588,32 @@ msgstr ""
 "consulta produziu nome nulo da tabela referenciada pelo gatilho de chave "
 "estrangeira \"%s\" na tabela \"%s\" (OID da tabela: %u)\n"
 
-#: pg_dump.c:5118
+#: pg_dump.c:5600
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "encontrando as colunas e tipos da tabela \"%s\"\n"
 
-#: pg_dump.c:5237
+#: pg_dump.c:5745
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "númeração de coluna inválida para tabela \"%s\"\n"
 
-#: pg_dump.c:5273
+#: pg_dump.c:5782
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "encontrando expressões padrão da tabela \"%s\"\n"
 
-#: pg_dump.c:5358
+#: pg_dump.c:5867
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "valor %d do número da coluna é inválido para tabela \"%s\"\n"
 
-#: pg_dump.c:5376
+#: pg_dump.c:5885
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "encontrando restrições de verificação para tabela \"%s\"\n"
 
-#: pg_dump.c:5456
+#: pg_dump.c:5965
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d\n"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
@@ -590,50 +623,45 @@ msgstr[1] ""
 "esperado %d restrições de verificação na tabela \"%s\" mas foi encontrado "
 "%d\n"
 
-#: pg_dump.c:5460
+#: pg_dump.c:5969
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(O catálogo do sistema pode estar corrompido).\n"
 
-#: pg_dump.c:7242 pg_dump.c:7349
-#, c-format
-msgid "query returned no rows: %s\n"
-msgstr "consulta não retornou nenhum registro: %s\n"
-
-#: pg_dump.c:7699
+#: pg_dump.c:8570
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "AVISO: valor inválido na matriz proargmodes\n"
 
-#: pg_dump.c:8011
+#: pg_dump.c:8884
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "AVISO: não pôde validar matriz proallargtypes\n"
 
-#: pg_dump.c:8027
+#: pg_dump.c:8900
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "AVISO: não pôde validar matriz proargmodes\n"
 
-#: pg_dump.c:8041
+#: pg_dump.c:8914
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "AVISO: não pôde validar matriz proargnames\n"
 
-#: pg_dump.c:8052
+#: pg_dump.c:8925
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "AVISO: não pôde validar matriz proconfig\n"
 
-#: pg_dump.c:8108
+#: pg_dump.c:8981
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "valor de provolatile desconhecido para função \"%s\"\n"
 
-#: pg_dump.c:8311
+#: pg_dump.c:9197
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "AVISO: valor inválido no campo pg_cast.castmethod\n"
 
-#: pg_dump.c:8688
+#: pg_dump.c:9579
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "AVISO: não pôde encontrar operador com OID %s\n"
 
-#: pg_dump.c:9609
+#: pg_dump.c:10698
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
@@ -642,27 +670,27 @@ msgstr ""
 "AVISO: função de agregação %s não pôde ser copiada corretamente para esta "
 "versão do banco de dados; ignorado\n"
 
-#: pg_dump.c:10337
+#: pg_dump.c:11502
 #, c-format
 msgid "unknown object type (%d) in default privileges\n"
 msgstr "tipo de objeto desconhecido (%d) em privilégios padrão\n"
 
-#: pg_dump.c:10354
+#: pg_dump.c:11519
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "não pôde validar a lista ACL (%s)\n"
 
-#: pg_dump.c:10411
+#: pg_dump.c:11576
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "não pôde validar a lista ACL (%s) para objeto \"%s\" (%s)\n"
 
-#: pg_dump.c:10554
+#: pg_dump.c:12022
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "consulta para obter definição da visão \"%s\" não retornou dados\n"
 
-#: pg_dump.c:10557
+#: pg_dump.c:12025
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
@@ -670,44 +698,54 @@ msgstr ""
 "consulta para obter definição da visão \"%s\" retornou mais de uma "
 "definição\n"
 
-#: pg_dump.c:10566
+#: pg_dump.c:12034
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "definição da visão \"%s\" parece estar vazia (tamanho zero)\n"
 
-#: pg_dump.c:11042
+#: pg_dump.c:12085
+#, c-format
+msgid "query returned %d foreign server entry for foreign table \"%s\"\n"
+msgid_plural ""
+"query returned %d foreign server entries for foreign table \"%s\"\n"
+msgstr[0] ""
+"consulta retornou %d registro de servidor externo para tabela externa \"%s\"\n"
+msgstr[1] ""
+"consulta retornou %d registros de servidor externo para tabela externa \"%s\"\n"
+
+#: pg_dump.c:12614
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "número de colunas %d é inválido para tabela \"%s\"\n"
 
-#: pg_dump.c:11150
+#: pg_dump.c:12725
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "faltando índice para restrição \"%s\"\n"
 
-#: pg_dump.c:11338
+#: pg_dump.c:12913
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "tipo de restrição é desconhecido: %c\n"
 
-#: pg_dump.c:11401
+#: pg_dump.c:12976
 msgid "missing pg_database entry for this database\n"
 msgstr "faltando registro em pg_database para este banco de dados\n"
 
-#: pg_dump.c:11406
+#: pg_dump.c:12981
 msgid "found more than one pg_database entry for this database\n"
 msgstr ""
 "encontrado mais de um registro em pg_database para este banco de dados\n"
 
-#: pg_dump.c:11438
+#: pg_dump.c:13013
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "não pôde encontrar registro para pg_indexes em pg_class\n"
 
-#: pg_dump.c:11443
+#: pg_dump.c:13018
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "encontrado mais de um registro para pg_indexes em pg_class\n"
 
-#: pg_dump.c:11514
+#: pg_dump.c:13090
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural ""
@@ -719,18 +757,23 @@ msgstr[1] ""
 "consulta para obter dados sobre sequência \"%s\" retornou %d registros "
 "(esperado 1)\n"
 
-#: pg_dump.c:11525
+#: pg_dump.c:13101
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr ""
 "consulta para obter dados sobre sequência \"%s\" retornou nome \"%s\"\n"
 
-#: pg_dump.c:11819
+#: pg_dump.c:13329
+#, c-format
+msgid "unexpected tgtype value: %d\n"
+msgstr "valor de tgtype inesperado: %d\n"
+
+#: pg_dump.c:13411
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "argumento inválido (%s) para gatilho \"%s\" na tabela \"%s\"\n"
 
-#: pg_dump.c:11935
+#: pg_dump.c:13529
 #, c-format
 msgid ""
 "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -739,242 +782,264 @@ msgstr ""
 "consulta para obter regra \"%s\" para tabela \"%s\" falhou: número incorreto "
 "de registros foi retornado\n"
 
-#: pg_dump.c:12030
+#: pg_dump.c:13786
 msgid "reading dependency data\n"
 msgstr "lendo dados sobre dependência\n"
 
-#: pg_dump.c:12408
+#: pg_dump.c:14168
 msgid "SQL command failed\n"
 msgstr "comando SQL falhou\n"
 
-#: common.c:115
+#: common.c:105
 msgid "reading schemas\n"
 msgstr "lendo esquemas\n"
 
-#: common.c:119
+#: common.c:115
+msgid "reading user-defined tables\n"
+msgstr "lendo tabelas definidas pelo usuário\n"
+
+#: common.c:120
+msgid "reading extensions\n"
+msgstr "lendo extensões\n"
+
+#: common.c:124
 msgid "reading user-defined functions\n"
 msgstr "lendo funções definidas pelo usuário\n"
 
-#: common.c:125
+#: common.c:130
 msgid "reading user-defined types\n"
 msgstr "lendo tipos definidos pelo usuário\n"
 
-#: common.c:131
+#: common.c:136
 msgid "reading procedural languages\n"
 msgstr "lendo linguagens procedurais\n"
 
-#: common.c:135
+#: common.c:140
 msgid "reading user-defined aggregate functions\n"
 msgstr "lendo funções de agregação definidas pelo usuário\n"
 
-#: common.c:139
+#: common.c:144
 msgid "reading user-defined operators\n"
 msgstr "lendo operadores definidos pelo usuário\n"
 
-#: common.c:144
+#: common.c:149
 msgid "reading user-defined operator classes\n"
 msgstr "lendo classes de operadores definidas pelo usuário\n"
 
-#: common.c:148
+#: common.c:153
+msgid "reading user-defined operator families\n"
+msgstr "lendo famílias de operadores definidas pelo usuário\n"
+
+#: common.c:157
 msgid "reading user-defined text search parsers\n"
 msgstr "lendo analisadores de busca textual definidos pelo usuário\n"
 
-#: common.c:152
+#: common.c:161
 msgid "reading user-defined text search templates\n"
 msgstr "lendo modelos de busca textual definidos pelo usuário\n"
 
-#: common.c:156
+#: common.c:165
 msgid "reading user-defined text search dictionaries\n"
 msgstr "lendo dicionários de busca textual definidos pelo usuário\n"
 
-#: common.c:160
+#: common.c:169
 msgid "reading user-defined text search configurations\n"
 msgstr "lendo configurações de busca textual definidas pelo usuário\n"
 
-#: common.c:164
+#: common.c:173
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "lendo adaptadores de dados externos definidos pelo usuário\n"
 
-#: common.c:168
+#: common.c:177
 msgid "reading user-defined foreign servers\n"
 msgstr "lendo servidores externos definidos pelo usuário\n"
 
-#: common.c:172
+#: common.c:181
 msgid "reading default privileges\n"
 msgstr "lendo privilégios padrão\n"
 
-#: common.c:176
-msgid "reading user-defined operator families\n"
-msgstr "lendo famílias de operadores definidas pelo usuário\n"
+#: common.c:185
+msgid "reading user-defined collations\n"
+msgstr "lendo ordenações definidas pelo usuário\n"
 
-#: common.c:180
+#: common.c:190
 msgid "reading user-defined conversions\n"
 msgstr "lendo conversões definidas pelo usuário\n"
 
-#: common.c:184
-msgid "reading user-defined tables\n"
-msgstr "lendo tabelas definidas pelo usuário\n"
+#: common.c:194
+msgid "reading type casts\n"
+msgstr "lendo conversões de tipo\n"
 
-#: common.c:189
+#: common.c:198
 msgid "reading table inheritance information\n"
 msgstr "lendo informação de herança das tabelas\n"
 
-#: common.c:193
+#: common.c:202
 msgid "reading rewrite rules\n"
 msgstr "lendo regras de reescrita\n"
 
-#: common.c:197
-msgid "reading type casts\n"
-msgstr "lendo conversões de tipo\n"
+#: common.c:211
+msgid "finding extension members\n"
+msgstr "encontrando membros de extensões\n"
 
-#: common.c:202
+#: common.c:216
 msgid "finding inheritance relationships\n"
 msgstr "encontrando relacionamentos herdados\n"
 
-#: common.c:206
+#: common.c:220
 msgid "reading column info for interesting tables\n"
 msgstr "lendo informações das colunas em tabelas interessantes\n"
 
-#: common.c:210
+#: common.c:224
 msgid "flagging inherited columns in subtables\n"
 msgstr "marcando colunas herdadas nas subtabelas\n"
 
-#: common.c:214
+#: common.c:228
 msgid "reading indexes\n"
 msgstr "lendo índices\n"
 
-#: common.c:218
+#: common.c:232
 msgid "reading constraints\n"
 msgstr "lendo restrições\n"
 
-#: common.c:222
+#: common.c:236
 msgid "reading triggers\n"
 msgstr "lendo gatilhos\n"
 
-#: common.c:802
+#: common.c:828
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr ""
 "verificação de sanidade falhou, OID pai %u da tabela \"%s\" (OID %u) não foi "
 "encontrado\n"
 
-#: common.c:844
+#: common.c:870
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "não pôde validar matriz numérica \"%s\": muitos números\n"
 
-#: common.c:859
+#: common.c:885
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr "não pôde validar matriz numérica \"%s\": caracter inválido no número\n"
 
-#: common.c:972
+#: common.c:998
 msgid "cannot duplicate null pointer\n"
 msgstr "não pode duplicar ponteiro nulo\n"
 
-#: common.c:975 common.c:986 common.c:997 common.c:1008
-#: pg_backup_archiver.c:727 pg_backup_archiver.c:1103
-#: pg_backup_archiver.c:1234 pg_backup_archiver.c:1705
-#: pg_backup_archiver.c:1862 pg_backup_archiver.c:1908
-#: pg_backup_archiver.c:4048 pg_backup_custom.c:144 pg_backup_custom.c:149
-#: pg_backup_custom.c:155 pg_backup_custom.c:170 pg_backup_custom.c:570
-#: pg_backup_custom.c:1113 pg_backup_custom.c:1122 pg_backup_db.c:154
-#: pg_backup_db.c:164 pg_backup_db.c:212 pg_backup_db.c:256 pg_backup_db.c:271
-#: pg_backup_db.c:305 pg_backup_files.c:114 pg_backup_null.c:72
-#: pg_backup_tar.c:167 pg_backup_tar.c:1011
+#: common.c:1001 common.c:1012 common.c:1023 common.c:1034
+#: pg_backup_archiver.c:764 pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291 pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955 pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209 pg_backup_custom.c:132 pg_backup_custom.c:139
+#: pg_backup_custom.c:780 pg_backup_custom.c:907 pg_backup_db.c:147
+#: pg_backup_db.c:157 pg_backup_db.c:205 pg_backup_db.c:249 pg_backup_db.c:264
+#: pg_backup_db.c:298 pg_backup_db.c:403 pg_backup_files.c:114
+#: pg_backup_null.c:72 pg_backup_tar.c:171 pg_backup_tar.c:1015
 msgid "out of memory\n"
 msgstr "sem memória\n"
 
-#: pg_backup_archiver.c:80
+#: pg_backup_archiver.c:88
 msgid "archiver"
 msgstr "arquivador"
 
-#: pg_backup_archiver.c:195 pg_backup_archiver.c:1198
+#: pg_backup_archiver.c:207 pg_backup_archiver.c:1259
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "não pôde fechar arquivo de saída: %s\n"
 
-#: pg_backup_archiver.c:220
+#: pg_backup_archiver.c:233
 msgid "-C and -c are incompatible options\n"
 msgstr "-C e -c são opções incompatíveis\n"
 
-#: pg_backup_archiver.c:227
+#: pg_backup_archiver.c:240
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C e -1 são opções incompatíveis\n"
 
-#: pg_backup_archiver.c:239
+#: pg_backup_archiver.c:250
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr "restauração paralela não é suportada por este formato de archive\n"
+
+#: pg_backup_archiver.c:254
+msgid ""
+"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr ""
+"restauração paralela não é suportada por archives produzidos por pg_dump "
+"anterior a 8.0\n"
+
+#: pg_backup_archiver.c:273
 msgid ""
 "cannot restore from compressed archive (compression not supported in this "
 "installation)\n"
 msgstr ""
-"não pode recuperar arquivo comprimido (compressão não é suportada nesta "
+"não pode recuperar archive comprimido (compressão não é suportada nesta "
 "instalação)\n"
 
-#: pg_backup_archiver.c:249
+#: pg_backup_archiver.c:283
 msgid "connecting to database for restore\n"
 msgstr "conectando ao banco de dados para restauração\n"
 
-#: pg_backup_archiver.c:251
+#: pg_backup_archiver.c:285
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr ""
-"conexões diretas ao banco de dados não são suportadas em arquivos anteriores "
+"conexões diretas ao banco de dados não são suportadas em archives anteriores "
 "a versão 1.3\n"
 
-#: pg_backup_archiver.c:293
+#: pg_backup_archiver.c:327
 msgid "implied data-only restore\n"
 msgstr "restauração do tipo somente dados implícita\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:379
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "removendo %s %s\n"
 
-#: pg_backup_archiver.c:396
+#: pg_backup_archiver.c:431
 #, c-format
 msgid "setting owner and privileges for %s %s\n"
 msgstr "definindo dono e privilégios para %s %s\n"
 
-#: pg_backup_archiver.c:454 pg_backup_archiver.c:456
+#: pg_backup_archiver.c:489 pg_backup_archiver.c:491
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "aviso do arquivo de cópia de segurança: %s\n"
 
-#: pg_backup_archiver.c:463
+#: pg_backup_archiver.c:498
 #, c-format
 msgid "creating %s %s\n"
 msgstr "criando %s %s\n"
 
-#: pg_backup_archiver.c:507
+#: pg_backup_archiver.c:542
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "conectando ao novo banco de dados \"%s\"\n"
 
-#: pg_backup_archiver.c:535
+#: pg_backup_archiver.c:570
 #, c-format
 msgid "restoring %s\n"
 msgstr "restaurando %s\n"
 
-#: pg_backup_archiver.c:549
+#: pg_backup_archiver.c:584
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "restaurando dados da tabela \"%s\"\n"
 
-#: pg_backup_archiver.c:609
+#: pg_backup_archiver.c:646
 #, c-format
 msgid "executing %s %s\n"
 msgstr "executando %s %s\n"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:679
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "desabilitando gatilhos para %s\n"
 
-#: pg_backup_archiver.c:668
+#: pg_backup_archiver.c:705
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "habilitando gatilhos para %s\n"
 
-#: pg_backup_archiver.c:698
+#: pg_backup_archiver.c:735
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine\n"
@@ -982,546 +1047,527 @@ msgstr ""
 "erro interno -- WriteData não pode ser chamada fora do contexto de uma "
 "rotina DataDumper\n"
 
-#: pg_backup_archiver.c:854
+#: pg_backup_archiver.c:892
 msgid "large-object output not supported in chosen format\n"
 msgstr ""
 "cópia de segurança de objetos grandes não é suportada no formato escolhido\n"
 
-#: pg_backup_archiver.c:908
+#: pg_backup_archiver.c:946
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "%d objeto grande restaurado\n"
 msgstr[1] "%d objetos grandes restaurados\n"
 
-#: pg_backup_archiver.c:929
+#: pg_backup_archiver.c:967
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "restaurando objeto grande com OID %u\n"
 
-#: pg_backup_archiver.c:941
+#: pg_backup_archiver.c:979
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "não pôde criar objeto grande %u: %s"
 
-#: pg_backup_archiver.c:1006
+#: pg_backup_archiver.c:1041
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "não pôde abrir arquivo TOC \"%s\": %s\n"
 
-#: pg_backup_archiver.c:1025
+#: pg_backup_archiver.c:1082
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "AVISO: linha ignorada: %s\n"
 
-#: pg_backup_archiver.c:1032
+#: pg_backup_archiver.c:1089
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "não pôde encontrar registro para ID %d\n"
 
-#: pg_backup_archiver.c:1053 pg_backup_files.c:172 pg_backup_files.c:457
+#: pg_backup_archiver.c:1110 pg_backup_files.c:172 pg_backup_files.c:457
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "não pôde fechar arquivo TOC: %s\n"
 
-#: pg_backup_archiver.c:1177 pg_backup_custom.c:181 pg_backup_files.c:130
+#: pg_backup_archiver.c:1229 pg_backup_custom.c:152 pg_backup_files.c:130
 #: pg_backup_files.c:262
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "não pôde abrir arquivo de saída \"%s\": %s\n"
 
-#: pg_backup_archiver.c:1180 pg_backup_custom.c:188 pg_backup_files.c:137
+#: pg_backup_archiver.c:1232 pg_backup_custom.c:159 pg_backup_files.c:137
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "não pôde abrir arquivo de saída: %s\n"
 
-#: pg_backup_archiver.c:1277
+#: pg_backup_archiver.c:1334
 #, c-format
 msgid "wrote %lu byte of large object data (result = %lu)\n"
 msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr[0] "escreveu %lu byte de dados do objeto grande (resultado = %lu)\n"
 msgstr[1] "escreveu %lu bytes de dados do objeto grande (resultado = %lu)\n"
 
-#: pg_backup_archiver.c:1283
+#: pg_backup_archiver.c:1340
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "não pôde escrever objeto grande (resultado: %lu, esperado %lu)\n"
 
-#: pg_backup_archiver.c:1341 pg_backup_archiver.c:1364 pg_backup_custom.c:781
-#: pg_backup_custom.c:1035 pg_backup_custom.c:1049 pg_backup_files.c:432
-#: pg_backup_tar.c:586 pg_backup_tar.c:1089 pg_backup_tar.c:1382
+#: pg_backup_archiver.c:1398 pg_backup_archiver.c:1421 pg_backup_custom.c:652
+#: pg_backup_files.c:432 pg_backup_tar.c:590 pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
 #, c-format
 msgid "could not write to output file: %s\n"
 msgstr "não pôde escrever em arquivo de saída: %s\n"
 
-#: pg_backup_archiver.c:1349
+#: pg_backup_archiver.c:1406
 msgid "could not write to custom output routine\n"
 msgstr "não pôde escrever rotina de saída personalizada\n"
 
-#: pg_backup_archiver.c:1447
+#: pg_backup_archiver.c:1504
 msgid "Error while INITIALIZING:\n"
 msgstr "Erro ao INICIALIZAR:\n"
 
-#: pg_backup_archiver.c:1452
+#: pg_backup_archiver.c:1509
 msgid "Error while PROCESSING TOC:\n"
 msgstr "Erro ao PROCESSAR TOC:\n"
 
-#: pg_backup_archiver.c:1457
+#: pg_backup_archiver.c:1514
 msgid "Error while FINALIZING:\n"
 msgstr "Erro ao FINALIZAR:\n"
 
-#: pg_backup_archiver.c:1462
+#: pg_backup_archiver.c:1519
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Erro no registro do TOC %d; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1598
+#: pg_backup_archiver.c:1654
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "Marcador de deslocamento de dado %d é inesperado\n"
 
-#: pg_backup_archiver.c:1611
+#: pg_backup_archiver.c:1667
 msgid "file offset in dump file is too large\n"
 msgstr "deslocamento no arquivo de cópia de segurança é muito grande\n"
 
-#: pg_backup_archiver.c:1708 pg_backup_archiver.c:3009 pg_backup_custom.c:757
-#: pg_backup_files.c:419 pg_backup_tar.c:785
+#: pg_backup_archiver.c:1764 pg_backup_archiver.c:3113 pg_backup_custom.c:630
+#: pg_backup_files.c:419 pg_backup_tar.c:789
 msgid "unexpected end of file\n"
 msgstr "fim de arquivo inesperado\n"
 
-#: pg_backup_archiver.c:1725
+#: pg_backup_archiver.c:1781
 msgid "attempting to ascertain archive format\n"
-msgstr "tentando verificar formato de arquivo\n"
+msgstr "tentando verificar formato do archive\n"
+
+#: pg_backup_archiver.c:1807 pg_backup_archiver.c:1817
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "nome de diretório é muito longo: \"%s\"\n"
 
-#: pg_backup_archiver.c:1741 pg_backup_custom.c:200 pg_backup_custom.c:888
+#: pg_backup_archiver.c:1825
+#, c-format
+msgid ""
+"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
+"exist)\n"
+msgstr ""
+"diretório \"%s\" não parece ser um archive válido (\"toc.dat\" não existe)\n"
+
+#: pg_backup_archiver.c:1833 pg_backup_custom.c:171 pg_backup_custom.c:762
 #: pg_backup_files.c:155 pg_backup_files.c:307
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "não pôde abrir arquivo de entrada \"%s\": %s\n"
 
-#: pg_backup_archiver.c:1748 pg_backup_custom.c:207 pg_backup_files.c:162
+#: pg_backup_archiver.c:1841 pg_backup_custom.c:178 pg_backup_files.c:162
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "não pôde abrir arquivo de entrada: %s\n"
 
-#: pg_backup_archiver.c:1757
+#: pg_backup_archiver.c:1850
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "não pôde ler arquivo de entrada: %s\n"
 
-#: pg_backup_archiver.c:1759
+#: pg_backup_archiver.c:1852
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "arquivo de entrada é muito pequeno (lido %lu, esperado 5)\n"
 
-#: pg_backup_archiver.c:1817
+#: pg_backup_archiver.c:1910
 msgid "input file does not appear to be a valid archive (too short?)\n"
-msgstr "arquivo de entrada não parece ser um arquivo válido (muito pequeno?)\n"
+msgstr "arquivo de entrada não parece ser um archive válido (muito pequeno?)\n"
 
-#: pg_backup_archiver.c:1820
+#: pg_backup_archiver.c:1913
 msgid "input file does not appear to be a valid archive\n"
-msgstr "arquivo de entrada não parece ser um arquivo válido\n"
+msgstr "arquivo de entrada não parece ser um archive válido\n"
 
-#: pg_backup_archiver.c:1840
+#: pg_backup_archiver.c:1933
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "não pôde fechar arquivo de entrada: %s\n"
 
-#: pg_backup_archiver.c:1857
+#: pg_backup_archiver.c:1950
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "alocando AH para %s, formato %d\n"
 
-#: pg_backup_archiver.c:1965
+#: pg_backup_archiver.c:2059
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "formato de arquivo \"%d\" é desconhecido\n"
 
-#: pg_backup_archiver.c:2087
+#: pg_backup_archiver.c:2181
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr ""
 "ID do registro %d fora do intervalo -- talvez o TOC esteja corrompido\n"
 
-#: pg_backup_archiver.c:2203
+#: pg_backup_archiver.c:2297
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "lendo registro do TOC %d (ID %d) de %s %s\n"
 
-#: pg_backup_archiver.c:2237
+#: pg_backup_archiver.c:2331
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "codificação \"%s\" é desconhecida\n"
 
-#: pg_backup_archiver.c:2242
+#: pg_backup_archiver.c:2336
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "item ENCODING inválido: %s\n"
 
-#: pg_backup_archiver.c:2260
+#: pg_backup_archiver.c:2354
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "item STDSTRINGS inválido: %s\n"
 
-#: pg_backup_archiver.c:2452
+#: pg_backup_archiver.c:2552
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "não pôde definir \"%s\" como usuário da sessão: %s"
 
-#: pg_backup_archiver.c:2790 pg_backup_archiver.c:2940
+#: pg_backup_archiver.c:2892 pg_backup_archiver.c:3044
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr "AVISO: não se sabe como definir o dono para tipo de objeto %s\n"
 
-#: pg_backup_archiver.c:2972
+#: pg_backup_archiver.c:3076
 msgid ""
 "WARNING: requested compression not available in this installation -- archive "
 "will be uncompressed\n"
 msgstr ""
-"AVISO: compressão requerida não está disponível nesta instalação -- arquivo "
+"AVISO: compressão requerida não está disponível nesta instalação -- archive "
 "será descomprimido\n"
 
-#: pg_backup_archiver.c:3012
+#: pg_backup_archiver.c:3116
 msgid "did not find magic string in file header\n"
 msgstr "não encontrou cadeia de caracteres mágica no cabeçalho do arquivo\n"
 
-#: pg_backup_archiver.c:3025
+#: pg_backup_archiver.c:3129
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "versão não é suportada (%d.%d) no cabeçalho do arquivo\n"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3134
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "verificação de sanidade no tamanho do inteiro (%lu) falhou\n"
 
-#: pg_backup_archiver.c:3034
+#: pg_backup_archiver.c:3138
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "might fail\n"
 msgstr ""
-"AVISO: arquivo foi feito em uma máquina com inteiros longos, algumas "
+"AVISO: archive foi feito em uma máquina com inteiros longos, algumas "
 "operações podem falhar\n"
 
-#: pg_backup_archiver.c:3044
+#: pg_backup_archiver.c:3148
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "formato esperado (%d) difere do formato encontrado no arquivo (%d)\n"
 
-#: pg_backup_archiver.c:3060
+#: pg_backup_archiver.c:3164
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression -- no data will be available\n"
 msgstr ""
-"AVISO: arquivo está comprimido, mas esta instalação não suporta compressão "
+"AVISO: archive está comprimido, mas esta instalação não suporta compressão "
 "-- nenhum dado está disponível\n"
 
-#: pg_backup_archiver.c:3078
+#: pg_backup_archiver.c:3182
 msgid "WARNING: invalid creation date in header\n"
 msgstr "AVISO: data de criação inválida no cabeçalho\n"
 
-#: pg_backup_archiver.c:3175
+#: pg_backup_archiver.c:3280
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "executando restore_toc_entries_parallel\n"
 
-#: pg_backup_archiver.c:3179
-msgid "parallel restore is not supported with this archive file format\n"
-msgstr "restauração paralela não é suportada por este formato de arquivo\n"
-
-#: pg_backup_archiver.c:3183
-msgid ""
-"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
-msgstr ""
-"restauração paralela não é suportada por arquivos produzidos por pg_dum "
-"anterior a 8.0\n"
-
-#: pg_backup_archiver.c:3205
+#: pg_backup_archiver.c:3321
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "processando item %d %s %s\n"
 
-#: pg_backup_archiver.c:3266
+#: pg_backup_archiver.c:3397
 msgid "entering main parallel loop\n"
 msgstr "executando laço paralelo principal\n"
 
-#: pg_backup_archiver.c:3280
+#: pg_backup_archiver.c:3411
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "ignorando item %d %s %s\n"
 
-#: pg_backup_archiver.c:3296
+#: pg_backup_archiver.c:3427
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "iniciando item %d %s %s\n"
 
-#: pg_backup_archiver.c:3333
+#: pg_backup_archiver.c:3464
 #, c-format
 msgid "worker process crashed: status %d\n"
 msgstr "processo worker falhou: status %d\n"
 
-#: pg_backup_archiver.c:3338
+#: pg_backup_archiver.c:3469
 msgid "finished main parallel loop\n"
 msgstr "laço paralelo principal terminado\n"
 
-#: pg_backup_archiver.c:3356
+#: pg_backup_archiver.c:3487
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "iniciando item adiado %d %s %s\n"
 
-#: pg_backup_archiver.c:3382
+#: pg_backup_archiver.c:3513
 msgid "parallel_restore should not return\n"
 msgstr "parallel_restore não pode retornar\n"
 
-#: pg_backup_archiver.c:3388
+#: pg_backup_archiver.c:3519
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "não pôde criar processo filho: %s\n"
 
-#: pg_backup_archiver.c:3396
+#: pg_backup_archiver.c:3527
 #, c-format
 msgid "could not create worker thread: %s\n"
 msgstr "não pôde criar thread filho: %s\n"
 
-#: pg_backup_archiver.c:3620
+#: pg_backup_archiver.c:3751
 msgid "no item ready\n"
 msgstr "nenhum item está pronto\n"
 
-#: pg_backup_archiver.c:3715
+#: pg_backup_archiver.c:3846
 msgid "could not find slot of finished worker\n"
 msgstr "não pôde encontrar slot do processo filho terminado\n"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3848
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "item terminado %d %s %s\n"
 
-#: pg_backup_archiver.c:3730
+#: pg_backup_archiver.c:3861
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "processo filho falhou: código de saída %d\n"
 
-#: pg_backup_archiver.c:3882
+#: pg_backup_archiver.c:4057
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "tranferindo dependência %d -> %d para %d\n"
 
-#: pg_backup_archiver.c:3956
+#: pg_backup_archiver.c:4126
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr "reduzindo dependências para %d\n"
 
-#: pg_backup_archiver.c:4014
+#: pg_backup_archiver.c:4175
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "tabela \"%s\" não pôde ser criada, não restaurará os seus dados\n"
 
-#: pg_backup_custom.c:97
+#: pg_backup_custom.c:87
 msgid "custom archiver"
 msgstr "arquivador personalizado"
 
-#: pg_backup_custom.c:405 pg_backup_null.c:153
+#: pg_backup_custom.c:373 pg_backup_null.c:153
 msgid "invalid OID for large object\n"
 msgstr "OID inválido para objeto grande\n"
 
-#: pg_backup_custom.c:471
+#: pg_backup_custom.c:444
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
-msgstr "tipo de bloco de dados desconhecido (%d) durante busca no arquivo\n"
+msgstr "tipo de bloco de dados desconhecido (%d) durante busca no archive\n"
 
-#: pg_backup_custom.c:482
+#: pg_backup_custom.c:455
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "erro durante busca no arquivo: %s\n"
 
-#: pg_backup_custom.c:492
+#: pg_backup_custom.c:465
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
 "restore request, which cannot be handled due to lack of data offsets in "
 "archive\n"
 msgstr ""
-"não pôde encontrar bloco com ID %d no arquivo -- possivelmente por causa de "
+"não pôde encontrar bloco com ID %d no archive -- possivelmente por causa de "
 "pedido de restauração fora de ordem, que não pode ser manipulado pela falta "
 "de deslocamentos no arquivo\n"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:470
 #, c-format
 msgid ""
 "could not find block ID %d in archive -- possibly due to out-of-order "
 "restore request, which cannot be handled due to non-seekable input file\n"
 msgstr ""
-"não pôde encontrar bloco com ID %d no arquivo -- possivelmente por causa de "
-"pedido de restauração fora de ordem, que não pode ser manipulado por arquivo "
-"de entrada não posicionável\n"
+"não pôde encontrar bloco com ID %d no archive -- possivelmente por causa de "
+"pedido de restauração fora de ordem, que não pode ser manipulado porque "
+"arquivo de entrada é não posicionável\n"
 
-#: pg_backup_custom.c:502
+#: pg_backup_custom.c:475
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
 msgstr ""
-"não pôde encontrar bloco com ID %d em arquivo -- possivelmente arquivo "
+"não pôde encontrar bloco com ID %d em archive -- possivelmente archive "
 "corrompido\n"
 
-#: pg_backup_custom.c:509
+#: pg_backup_custom.c:482
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
 msgstr ""
 "encontrado bloco inesperado com ID (%d) durante leitura de dados -- esperado "
 "%d\n"
 
-#: pg_backup_custom.c:523
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr ""
-"tipo de bloco de dados desconhecido %d durante restauração do arquivo\n"
-
-#: pg_backup_custom.c:557 pg_backup_custom.c:985
-#, c-format
-msgid "could not initialize compression library: %s\n"
-msgstr "não pôde inicializar biblioteca de compressão: %s\n"
+"tipo de bloco de dados desconhecido %d durante restauração do archive\n"
 
-#: pg_backup_custom.c:581 pg_backup_custom.c:705
+#: pg_backup_custom.c:578 pg_backup_custom.c:916
 msgid "could not read from input file: end of file\n"
 msgstr "não pôde ler arquivo de entrada: fim do arquivo\n"
 
-#: pg_backup_custom.c:584 pg_backup_custom.c:708
+#: pg_backup_custom.c:581 pg_backup_custom.c:919
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "não pôde ler arquivo de entrada: %s\n"
 
-#: pg_backup_custom.c:601 pg_backup_custom.c:628
-#, c-format
-msgid "could not uncompress data: %s\n"
-msgstr "não pôde descomprimir dados: %s\n"
-
-#: pg_backup_custom.c:634
-#, c-format
-msgid "could not close compression library: %s\n"
-msgstr "não pôde fechar biblioteca de compressão: %s\n"
-
-#: pg_backup_custom.c:736
+#: pg_backup_custom.c:610
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "não pôde escrever byte: %s\n"
 
-#: pg_backup_custom.c:849 pg_backup_custom.c:882
+#: pg_backup_custom.c:718 pg_backup_custom.c:756
 #, c-format
 msgid "could not close archive file: %s\n"
-msgstr "não pôde fechar arquivo: %s\n"
+msgstr "não pôde fechar archive: %s\n"
 
-#: pg_backup_custom.c:868
+#: pg_backup_custom.c:737
 msgid "can only reopen input archives\n"
-msgstr "não pôde reabrir arquivos de entrada\n"
+msgstr "não pôde reabrir archives de entrada\n"
 
-#: pg_backup_custom.c:870
-msgid "cannot reopen stdin\n"
-msgstr "não pôde reabrir entrada padrão\n"
+#: pg_backup_custom.c:744
+msgid "parallel restore from stdin is not supported\n"
+msgstr "restauração paralela da entrada padrão não é suportada\n"
 
-#: pg_backup_custom.c:872
-msgid "cannot reopen non-seekable file\n"
-msgstr "não pode reabrir arquivo não posicionável\n"
+#: pg_backup_custom.c:746
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr "restauração paralela de arquivo não posicionável não é suportada\n"
 
-#: pg_backup_custom.c:877
+#: pg_backup_custom.c:751
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
-msgstr "não pôde determinar posição de busca no arquivo: %s\n"
+msgstr "não pôde determinar posição de busca no archive: %s\n"
 
-#: pg_backup_custom.c:892
+#: pg_backup_custom.c:766
 #, c-format
 msgid "could not set seek position in archive file: %s\n"
-msgstr "não pôde definir posição de busca no arquivo: %s\n"
+msgstr "não pôde definir posição de busca no archive: %s\n"
+
+#: pg_backup_custom.c:786
+msgid "compressor active\n"
+msgstr "compressor ativo\n"
 
-#: pg_backup_custom.c:914
+#: pg_backup_custom.c:822
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr "AVISO: ftell não corresponde com posição esperada -- ftell utilizado\n"
 
-#: pg_backup_custom.c:1016
-#, c-format
-msgid "could not compress data: %s\n"
-msgstr "não pôde comprimir dados: %s\n"
-
-#: pg_backup_custom.c:1094
-#, c-format
-msgid "could not close compression stream: %s\n"
-msgstr "não pôde fechar arquivo comprimido: %s\n"
-
 #: pg_backup_db.c:25
 msgid "archiver (db)"
 msgstr "arquivador (bd)"
 
-#: pg_backup_db.c:61
+#: pg_backup_db.c:54
 msgid "could not get server_version from libpq\n"
 msgstr "não pôde obter versão do servidor a partir da libpq\n"
 
-#: pg_backup_db.c:74 pg_dumpall.c:1718
+#: pg_backup_db.c:67 pg_dumpall.c:1741
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "versão do servidor: %s; versão do %s: %s\n"
 
-#: pg_backup_db.c:76 pg_dumpall.c:1720
+#: pg_backup_db.c:69 pg_dumpall.c:1743
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "interrompendo porque a versão do servidor não corresponde\n"
 
-#: pg_backup_db.c:147
+#: pg_backup_db.c:140
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "conectando ao banco de dados \"%s\" como usuário \"%s\"\n"
 
-#: pg_backup_db.c:152 pg_backup_db.c:207 pg_backup_db.c:254 pg_backup_db.c:303
-#: pg_dumpall.c:1614 pg_dumpall.c:1666
+#: pg_backup_db.c:145 pg_backup_db.c:200 pg_backup_db.c:247 pg_backup_db.c:296
+#: pg_dumpall.c:1637 pg_dumpall.c:1689
 msgid "Password: "
 msgstr "Senha: "
 
-#: pg_backup_db.c:188
+#: pg_backup_db.c:181
 msgid "failed to reconnect to database\n"
 msgstr "falhou ao reconectar ao banco de dados\n"
 
-#: pg_backup_db.c:193
+#: pg_backup_db.c:186
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "não pôde reconectar ao banco de dados: %s"
 
-#: pg_backup_db.c:209
+#: pg_backup_db.c:202
 msgid "connection needs password\n"
 msgstr "conexão precisa de senha\n"
 
-#: pg_backup_db.c:250
+#: pg_backup_db.c:243
 msgid "already connected to a database\n"
 msgstr "já está conectado ao banco de dados\n"
 
-#: pg_backup_db.c:295
+#: pg_backup_db.c:288
 msgid "failed to connect to database\n"
 msgstr "falhou ao conectar ao banco de dados\n"
 
-#: pg_backup_db.c:314
+#: pg_backup_db.c:307
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "conexão com banco de dados \"%s\" falhou: %s"
 
-#: pg_backup_db.c:329
+#: pg_backup_db.c:322
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:441
+#: pg_backup_db.c:387
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "erro retornado pelo PQputCopyData: %s"
 
-#: pg_backup_db.c:451
+#: pg_backup_db.c:397 pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "não pôde executar consulta"
+
+#: pg_backup_db.c:425
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "erro retornado pelo PQputCopyEnd: %s"
 
-#: pg_backup_db.c:498
-msgid "could not execute query"
-msgstr "não pôde executar consulta"
-
-#: pg_backup_db.c:696
+#: pg_backup_db.c:442
 msgid "could not start database transaction"
 msgstr "não pôde iniciar transação do banco de dados"
 
-#: pg_backup_db.c:702
+#: pg_backup_db.c:448
 msgid "could not commit database transaction"
 msgstr "não pôde efetivar transação do banco de dados"
 
@@ -1566,7 +1612,7 @@ msgstr "não pôde escrever byte\n"
 msgid "could not open large object TOC for output: %s\n"
 msgstr "não pôde abrir arquivo TOC de objeto grande para saída: %s\n"
 
-#: pg_backup_files.c:510 pg_backup_tar.c:935
+#: pg_backup_files.c:510 pg_backup_tar.c:939
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "OID inválido para objeto grande (%u)\n"
@@ -1584,62 +1630,62 @@ msgstr "não pôde fechar arquivo de objeto grande\n"
 msgid "this format cannot be read\n"
 msgstr "este formato não pode ser lido\n"
 
-#: pg_backup_tar.c:101
+#: pg_backup_tar.c:105
 msgid "tar archiver"
 msgstr "arquivador tar"
 
-#: pg_backup_tar.c:179
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
 msgstr "não pôde abrir arquivo TOC \"%s\" para saída: %s\n"
 
-#: pg_backup_tar.c:187
+#: pg_backup_tar.c:191
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "não pôde abrir arquivo TOC para saída: %s\n"
 
-#: pg_backup_tar.c:214 pg_backup_tar.c:370
+#: pg_backup_tar.c:218 pg_backup_tar.c:374
 msgid "compression is not supported by tar archive format\n"
-msgstr "compressão não é suportada pelo formato de saída tar\n"
+msgstr "compressão não é suportada pelo formato tar\n"
 
-#: pg_backup_tar.c:222
+#: pg_backup_tar.c:226
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
 msgstr "não pôde abrir arquivo TOC \"%s\" para entrada: %s\n"
 
-#: pg_backup_tar.c:229
+#: pg_backup_tar.c:233
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "não pôde abrir arquivo TOC para entrada: %s\n"
 
-#: pg_backup_tar.c:356
+#: pg_backup_tar.c:360
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
-msgstr "não pôde encontrar arquivo \"%s\" no arquivo de dados\n"
+msgstr "não pôde encontrar arquivo \"%s\" no archive\n"
 
-#: pg_backup_tar.c:412
+#: pg_backup_tar.c:416
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "não pôde gerar arquivo temporário: %s\n"
 
-#: pg_backup_tar.c:421
+#: pg_backup_tar.c:425
 msgid "could not open temporary file\n"
 msgstr "não pôde abrir arquivo temporário\n"
 
-#: pg_backup_tar.c:448
+#: pg_backup_tar.c:452
 msgid "could not close tar member\n"
 msgstr "não pôde fechar membro tar\n"
 
-#: pg_backup_tar.c:548
+#: pg_backup_tar.c:552
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "erro interno -- th e fh não foram especificados em tarReadRaw()\n"
 
-#: pg_backup_tar.c:674
+#: pg_backup_tar.c:678
 #, c-format
 msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
 msgstr "comando COPY inválido -- não pôde encontrar \"copy\" em \"%s\"\n"
 
-#: pg_backup_tar.c:692
+#: pg_backup_tar.c:696
 #, c-format
 msgid ""
 "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
@@ -1648,80 +1694,80 @@ msgstr ""
 "comando COPY inválido -- não pôde encontrar \"from stdin\" em \"%s\" "
 "iniciando da posição %lu\n"
 
-#: pg_backup_tar.c:729
+#: pg_backup_tar.c:733
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "restaurando OID do objeto grande %u\n"
 
-#: pg_backup_tar.c:880
+#: pg_backup_tar.c:884
 msgid "could not write null block at end of tar archive\n"
-msgstr "não pôde escrever bloco nulo no fim do arquivo tar\n"
+msgstr "não pôde escrever bloco nulo no fim do archive tar\n"
 
-#: pg_backup_tar.c:1080
+#: pg_backup_tar.c:1084
 msgid "archive member too large for tar format\n"
-msgstr "membro de arquivo muito grande para o formato tar\n"
+msgstr "membro de archive muito grande para o formato tar\n"
 
-#: pg_backup_tar.c:1095
+#: pg_backup_tar.c:1099
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "não pôde fechar arquivo temporário: %s\n"
 
-#: pg_backup_tar.c:1105
+#: pg_backup_tar.c:1109
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "tamanho do arquivo atual (%s) não corresponde ao esperado (%s)\n"
 
-#: pg_backup_tar.c:1113
+#: pg_backup_tar.c:1117
 msgid "could not output padding at end of tar member\n"
 msgstr "não pôde escrever preenchimento ao fim do membro tar\n"
 
-#: pg_backup_tar.c:1142
+#: pg_backup_tar.c:1146
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "movendo da posição %s para próximo membro na posição %s do arquivo\n"
 
-#: pg_backup_tar.c:1153
+#: pg_backup_tar.c:1157
 #, c-format
 msgid "now at file position %s\n"
 msgstr "agora na posição %s do arquivo\n"
 
-#: pg_backup_tar.c:1162 pg_backup_tar.c:1192
+#: pg_backup_tar.c:1166 pg_backup_tar.c:1196
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
-msgstr "não pôde encontrar cabeçalho do arquivo \"%s\" no arquivo tar\n"
+msgstr "não pôde encontrar cabeçalho do arquivo \"%s\" no archive tar\n"
 
-#: pg_backup_tar.c:1176
+#: pg_backup_tar.c:1180
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "ignorando membro tar %s\n"
 
-#: pg_backup_tar.c:1180
+#: pg_backup_tar.c:1184
 #, c-format
 msgid ""
 "restoring data out of order is not supported in this archive format: \"%s\" "
 "is required, but comes before \"%s\" in the archive file.\n"
 msgstr ""
-"restaurar dados fora da ordem não é suportado neste formato de arquivo: \"%s"
-"\" é requerido, mas vem antes de \"%s\" no arquivo.\n"
+"restaurar dados fora da ordem não é suportado neste formato de archive: \"%s"
+"\" é requerido, mas vem antes de \"%s\" no archive.\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1230
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr "posição atual no arquivo vs. previsão não correspondem (%s vs. %s)\n"
 
-#: pg_backup_tar.c:1241
+#: pg_backup_tar.c:1245
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "cabeçalho tar incompleto foi encontrado (%lu byte)\n"
 msgstr[1] "cabeçalho tar incompleto foi encontrado (%lu bytes)\n"
 
-#: pg_backup_tar.c:1279
+#: pg_backup_tar.c:1283
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "Registro TOC %s em %s (tamanho %lu, soma de verificação %d)\n"
 
-#: pg_backup_tar.c:1289
+#: pg_backup_tar.c:1293
 #, c-format
 msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
@@ -1729,84 +1775,85 @@ msgstr ""
 "cabeçalho tar corrompido foi encontrado em %s (esperado %d, computado %d) na "
 "posição %s do arquivo\n"
 
-#: pg_restore.c:319
+#: pg_restore.c:300
 #, c-format
 msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
 msgstr "%s: opções -d/--dbname e -f/--file não podem ser utilizadas juntas\n"
 
-#: pg_restore.c:331
+#: pg_restore.c:312
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr ""
 "%s: não pode especificar ambas opções --single-transaction e múltiplas "
 "tarefas\n"
 
-#: pg_restore.c:361
+#: pg_restore.c:348
 #, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\" or \"t\"\n"
+msgid ""
+"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
 msgstr ""
-"formato de arquivo desconhecido \"%s\"; por favor especifique \"c\" ou \"t"
-"\"\n"
+"formato de archive desconhecido \"%s\"; por favor especifique \"c\", \"d\" "
+"ou \"t\"\n"
 
-#: pg_restore.c:395
+#: pg_restore.c:382
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "AVISO: erros ignorados durante restauração: %d\n"
 
-#: pg_restore.c:409
+#: pg_restore.c:396
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
 "\n"
 msgstr ""
-"%s restaura um banco de dados PostgreSQL a partir de um arquivo criado pelo "
+"%s restaura um banco de dados PostgreSQL a partir de um archive criado pelo "
 "pg_dump.\n"
 "\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:398
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [OPÇÃO]... [ARQUIVO]\n"
 
-#: pg_restore.c:414
+#: pg_restore.c:401
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NOME        conecta ao banco de dados informado\n"
 
-#: pg_restore.c:415
+#: pg_restore.c:402
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ARQUIVO       nome do arquivo de saída\n"
 
-#: pg_restore.c:416
+#: pg_restore.c:403
 #, c-format
-msgid "  -F, --format=c|t         backup file format (should be automatic)\n"
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
 msgstr ""
-"  -F, --format=c|t         formato de arquivo de cópia de segurança (deve "
+"  -F, --format=c|d|t       formato de arquivo de cópia de segurança (deve "
 "ser automático)\n"
 
-#: pg_restore.c:417
+#: pg_restore.c:404
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
-msgstr "  -l, --list               mostra TOC resumido do arquivo\n"
+msgstr "  -l, --list               mostra TOC resumido do archive\n"
 
-#: pg_restore.c:418
+#: pg_restore.c:405
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            modo de detalhe\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:406
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   mostra esta ajuda e termina\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:407
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr ""
 "  --version                mostra informação sobre a versão e termina\n"
 
-#: pg_restore.c:422
+#: pg_restore.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1815,12 +1862,12 @@ msgstr ""
 "\n"
 "Opções que controlam a restauração:\n"
 
-#: pg_restore.c:423
+#: pg_restore.c:410
 #, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -a, --data-only          restaura somente os dados, não o esquema\n"
 
-#: pg_restore.c:424
+#: pg_restore.c:411
 #, c-format
 msgid ""
 "  -c, --clean              clean (drop) database objects before recreating\n"
@@ -1828,30 +1875,30 @@ msgstr ""
 "  -c, --clean              exclui (remove) bancos de dados antes de criá-los "
 "novamente\n"
 
-#: pg_restore.c:425
+#: pg_restore.c:412
 #, c-format
 msgid "  -C, --create             create the target database\n"
 msgstr "  -C, --create             cria o banco de dados informado\n"
 
-#: pg_restore.c:426
+#: pg_restore.c:413
 #, c-format
 msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
 msgstr ""
 "  -e, --exit-on-error      termina se houver erro, padrão é continuar\n"
 
-#: pg_restore.c:427
+#: pg_restore.c:414
 #, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=NOME         restaura o índice especificado\n"
 
-#: pg_restore.c:428
+#: pg_restore.c:415
 #, c-format
 msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
 msgstr ""
 "  -j, --jobs=NUM           use esse número de tarefas paralelas para "
 "restaurar\n"
 
-#: pg_restore.c:429
+#: pg_restore.c:416
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use table of contents from this file for\n"
@@ -1860,17 +1907,17 @@ msgstr ""
 "  -L, --user-list=ARQUIVO  usa tabela de conteúdo deste arquivo para\n"
 "                           selecionar/ordenar saída\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:418
 #, c-format
 msgid "  -n, --schema=NAME        restore only objects in this schema\n"
 msgstr "  -n, --schema=NOME        restaura somente objetos neste esquema\n"
 
-#: pg_restore.c:432
+#: pg_restore.c:419
 #, c-format
 msgid "  -O, --no-owner           skip restoration of object ownership\n"
 msgstr "  -O, --no-owner           ignora restauração do dono dos objetos\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:420
 #, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
@@ -1879,13 +1926,13 @@ msgstr ""
 "  -P, --function=NOME(args)\n"
 "                           restaura função especificada\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:422
 #, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only        restaura somente o esquema, e não os dados\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:423
 #, c-format
 msgid ""
 "  -S, --superuser=NAME     superuser user name to use for disabling "
@@ -1894,17 +1941,17 @@ msgstr ""
 "  -S, --superuser=NOME     nome do super-usuário usado para\n"
 "                           desabilitar os gatilhos\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:424
 #, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NOME         restaura a tabela especificada\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:425
 #, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NOME       restaura o gatilho especificado\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:426
 #, c-format
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
@@ -1913,14 +1960,23 @@ msgstr ""
 "  -x, --no-privileges      ignora restauração dos privilégios de acesso "
 "(grant/revoke)\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr ""
+"  -1, --single-transaction\n"
+"                           restaura como uma transação única\n"
+
+#: pg_restore.c:429
 #, c-format
 msgid "  --disable-triggers       disable triggers during data-only restore\n"
 msgstr ""
 "  --disable-triggers       desabilita gatilhos durante a restauração do tipo "
 "somente dados\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:430
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables\n"
@@ -1932,18 +1988,18 @@ msgstr ""
 "ser\n"
 "                           criadas\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:433
 #, c-format
-msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgid "  --no-security-labels     do not restore security labels\n"
 msgstr ""
-"  --no-tablespaces         não restaura as atribuições de tablespaces\n"
+"  --no-security-labels     não restaura atribuições de rótulos de segurança\n"
 
-#: pg_restore.c:445
+#: pg_restore.c:434
 #, c-format
-msgid "  --role=ROLENAME          do SET ROLE before restore\n"
-msgstr "  --role=NOMEROLE          executa SET ROLE antes da restauração\n"
+msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgstr "  --no-tablespaces         não restaura atribuições de tablespaces\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:435
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1956,16 +2012,12 @@ msgstr ""
 "de\n"
 "                           comandos ALTER OWNER para definir o dono\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:445
 #, c-format
-msgid ""
-"  -1, --single-transaction\n"
-"                           restore as a single transaction\n"
-msgstr ""
-"  -1, --single-transaction\n"
-"                           restaura como uma transação única\n"
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=NOMEROLE          executa SET ROLE antes da restauração\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:447
 #, c-format
 msgid ""
 "\n"
@@ -1976,7 +2028,7 @@ msgstr ""
 "Se nenhum arquivo de entrada é fornecido, a entrada padrão é utilizada.\n"
 "\n"
 
-#: pg_dumpall.c:167
+#: pg_dumpall.c:171
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -1987,7 +2039,7 @@ msgstr ""
 "mesmo diretório que \"%s\".\n"
 "Verifique sua instalação.\n"
 
-#: pg_dumpall.c:174
+#: pg_dumpall.c:178
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -1998,7 +2050,7 @@ msgstr ""
 "mas não tem a mesma versão que %s.\n"
 "Verifique sua instalação.\n"
 
-#: pg_dumpall.c:331
+#: pg_dumpall.c:314
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
@@ -2006,7 +2058,7 @@ msgstr ""
 "%s: opções -g/--globals-only e -r/--roles-only não podem ser utilizadas "
 "juntas\n"
 
-#: pg_dumpall.c:340
+#: pg_dumpall.c:323
 #, c-format
 msgid ""
 "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
@@ -2015,7 +2067,7 @@ msgstr ""
 "%s: opções -g/--globals-only e -t/--tablespaces-only não podem ser "
 "utilizadas juntas\n"
 
-#: pg_dumpall.c:349
+#: pg_dumpall.c:332
 #, c-format
 msgid ""
 "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
@@ -2024,12 +2076,12 @@ msgstr ""
 "%s: opções -r/--roles-only e -t/--tablespaces-only não podem ser utilizadas "
 "juntas\n"
 
-#: pg_dumpall.c:385 pg_dumpall.c:1655
+#: pg_dumpall.c:374 pg_dumpall.c:1678
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: não pôde conectar ao banco de dados \"%s\"\n"
 
-#: pg_dumpall.c:400
+#: pg_dumpall.c:389
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2038,12 +2090,12 @@ msgstr ""
 "%s: não pôde se conectar aos bancos de dados \"postgres\" ou \"template1\"\n"
 "Por favor especifique um banco de dados alternativo.\n"
 
-#: pg_dumpall.c:417
+#: pg_dumpall.c:406
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s: não pôde abrir o arquivo de saída \"%s\": %s\n"
 
-#: pg_dumpall.c:535
+#: pg_dumpall.c:528
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2053,12 +2105,17 @@ msgstr ""
 "script.\n"
 "\n"
 
-#: pg_dumpall.c:537
+#: pg_dumpall.c:530
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [OPÇÃO]...\n"
 
-#: pg_dumpall.c:546
+#: pg_dumpall.c:533
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=ARQUIVO        nome do arquivo de saída\n"
+
+#: pg_dumpall.c:539
 #, c-format
 msgid ""
 "  -c, --clean                 clean (drop) databases before recreating\n"
@@ -2066,20 +2123,20 @@ msgstr ""
 "  -c, --clean                  exclui (remove) bancos de dados antes de criá-"
 "los novamente\n"
 
-#: pg_dumpall.c:547
+#: pg_dumpall.c:540
 #, c-format
 msgid "  -g, --globals-only          dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only           copia somente objetos globais, e não bancos "
 "de dados\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:542
 #, c-format
 msgid "  -O, --no-owner              skip restoration of object ownership\n"
 msgstr ""
 "  -O, --no-owner               ignora restauração dos donos dos objetos\n"
 
-#: pg_dumpall.c:550
+#: pg_dumpall.c:543
 #, c-format
 msgid ""
 "  -r, --roles-only            dump only roles, no databases or tablespaces\n"
@@ -2087,14 +2144,14 @@ msgstr ""
 "  -r, --roles-only             copia somente roles, e não bancos de dados ou "
 "tablespaces\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:545
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
 msgstr ""
 "  -S, --superuser=NOME         especifica o nome do super-usuário a ser "
 "usado na cópia de segurança\n"
 
-#: pg_dumpall.c:553
+#: pg_dumpall.c:546
 #, c-format
 msgid ""
 "  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
@@ -2102,13 +2159,13 @@ msgstr ""
 "  -t, --tablespaces-only       copia somente tablespaces, e não bancos de "
 "dados ou roles\n"
 
-#: pg_dumpall.c:568
+#: pg_dumpall.c:563
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr ""
 "  -l, --database=NOMEBD    especifica um banco de dados padrão alternativo\n"
 
-#: pg_dumpall.c:574
+#: pg_dumpall.c:570
 #, c-format
 msgid ""
 "\n"
@@ -2122,72 +2179,72 @@ msgstr ""
 " padrão.\n"
 "\n"
 
-#: pg_dumpall.c:1018
+#: pg_dumpall.c:1041
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr "%s: não pôde validar lista ACL (%s) da tablespace \"%s\"\n"
 
-#: pg_dumpall.c:1318
+#: pg_dumpall.c:1341
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%s: não pôde validar lista ACL (%s) do banco de dados \"%s\"\n"
 
-#: pg_dumpall.c:1525
+#: pg_dumpall.c:1548
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: copiando banco de dados \"%s\"...\n"
 
-#: pg_dumpall.c:1535
+#: pg_dumpall.c:1558
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: pg_dump falhou no banco de dados \"%s\", terminando\n"
 
-#: pg_dumpall.c:1544
+#: pg_dumpall.c:1567
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s: não pôde abrir o arquivo de saída \"%s\" novamente: %s\n"
 
-#: pg_dumpall.c:1583
+#: pg_dumpall.c:1606
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: executando \"%s\"\n"
 
-#: pg_dumpall.c:1628
+#: pg_dumpall.c:1651
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: pg_dumpall.c:1677
+#: pg_dumpall.c:1700
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: não pôde conectar ao banco de dados \"%s\": %s\n"
 
-#: pg_dumpall.c:1691
+#: pg_dumpall.c:1714
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: não pôde obter a versão do servidor\n"
 
-#: pg_dumpall.c:1697
+#: pg_dumpall.c:1720
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: não pôde validar a versão do servidor \"%s\"\n"
 
-#: pg_dumpall.c:1705
+#: pg_dumpall.c:1728
 #, c-format
 msgid "%s: could not parse version \"%s\"\n"
 msgstr "%s: não pôde validar versão \"%s\"\n"
 
-#: pg_dumpall.c:1744 pg_dumpall.c:1770
+#: pg_dumpall.c:1767 pg_dumpall.c:1793
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: executando %s\n"
 
-#: pg_dumpall.c:1750 pg_dumpall.c:1776
+#: pg_dumpall.c:1773 pg_dumpall.c:1799
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: consulta falhou: %s"
 
-#: pg_dumpall.c:1752 pg_dumpall.c:1778
+#: pg_dumpall.c:1775 pg_dumpall.c:1801
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: consulta foi: %s\n"
@@ -2222,27 +2279,27 @@ msgstr "não pôde mudar diretório para \"%s\""
 msgid "could not read symbolic link \"%s\""
 msgstr "não pôde ler link simbólico \"%s\""
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "processo filho terminou com código de saída %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "processo filho foi terminado pela exceção 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "processo filho foi terminado pelo sinal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "processo filho foi terminado pelo sinal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
diff --git a/src/bin/pg_dump/po/tr.po b/src/bin/pg_dump/po/tr.po
index 3495c852557bf..9dbb2fb235fed 100644
--- a/src/bin/pg_dump/po/tr.po
+++ b/src/bin/pg_dump/po/tr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 20:06+0000\n"
-"PO-Revision-Date: 2010-09-01 10:50+0200\n"
+"POT-Creation-Date: 2011-08-30 22:41+0000\n"
+"PO-Revision-Date: 2011-08-31 15:46+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <devrim@gunduz.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,89 +23,80 @@ msgstr ""
 "X-Poedit-SearchPath-1: /home/ntufar/pg/pgsql/src/backend\n"
 "X-Poedit-SearchPath-2: c:\\pgsql\\src\\backend\n"
 
-#: pg_dump.c:453
-#: pg_restore.c:268
-#: pg_dumpall.c:291
-#, c-format
-msgid "%s: invalid -X option -- %s\n"
-msgstr "%s: geçersiz -X seçeneği -- %s\n"
-
-#: pg_dump.c:455
-#: pg_dump.c:477
-#: pg_dump.c:491
-#: pg_restore.c:270
-#: pg_restore.c:293
-#: pg_restore.c:309
-#: pg_restore.c:321
-#: pg_dumpall.c:293
-#: pg_dumpall.c:313
-#: pg_dumpall.c:323
-#: pg_dumpall.c:333
-#: pg_dumpall.c:342
-#: pg_dumpall.c:351
-#: pg_dumpall.c:403
+#: pg_dump.c:489
+#: pg_dump.c:503
+#: pg_restore.c:274
+#: pg_restore.c:290
+#: pg_restore.c:302
+#: pg_dumpall.c:299
+#: pg_dumpall.c:309
+#: pg_dumpall.c:319
+#: pg_dumpall.c:328
+#: pg_dumpall.c:337
+#: pg_dumpall.c:395
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Daha fazla bilgi için \"%s --help\" yazabilirsiniz.\n"
 
-#: pg_dump.c:489
-#: pg_restore.c:307
-#: pg_dumpall.c:321
+#: pg_dump.c:501
+#: pg_restore.c:288
+#: pg_dumpall.c:307
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: çok fazla komut satırı argümanı (ilki \"%s\" idi)\n"
 
-#: pg_dump.c:502
+#: pg_dump.c:514
+#, c-format
 msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
 msgstr "options -s/--schema-only ve -a/--data-only seçenekleri aynı anda kullanılamazlar\n"
 
-#: pg_dump.c:508
+#: pg_dump.c:520
+#, c-format
 msgid "options -c/--clean and -a/--data-only cannot be used together\n"
 msgstr "options -c/--clean ve -a/--data-only seçenekleri aynı anda kullanılamazlar\n"
 
-#: pg_dump.c:514
+#: pg_dump.c:526
+#, c-format
 msgid "options --inserts/--column-inserts and -o/--oids cannot be used together\n"
 msgstr "--inserts/--column-inserts ve -o/--oids beraber kullanılamazlar\n"
 
-#: pg_dump.c:515
+#: pg_dump.c:527
+#, c-format
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(INSERT komutu OIDleri ayarlayamaz.)\n"
 
-#: pg_dump.c:545
-#, c-format
-msgid "invalid output format \"%s\" specified\n"
-msgstr "Geçersiz çıktı biçimi belirtildi: \"%s\" \n"
-
-#: pg_dump.c:551
+#: pg_dump.c:558
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "\"%s\" çıktı dosyası yazmak için açılamadı\n"
 
-#: pg_dump.c:561
-#: pg_backup_db.c:45
+#: pg_dump.c:568
+#: pg_backup_db.c:38
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "\"%s\" sürüm bilgisi ayrıştırılamadı\n"
 
-#: pg_dump.c:584
+#: pg_dump.c:591
 #, c-format
 msgid "invalid client encoding \"%s\" specified\n"
 msgstr "belirtilen \"%s\" istemci dil kodlaması geçersiz\n"
 
-#: pg_dump.c:661
+#: pg_dump.c:690
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "Son gömülü OID : %u\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:700
+#, c-format
 msgid "No matching schemas were found\n"
 msgstr "Uygun şema bulunamadı\n"
 
-#: pg_dump.c:686
+#: pg_dump.c:715
+#, c-format
 msgid "No matching tables were found\n"
 msgstr "Uygun tablo bulunamadı\n"
 
-#: pg_dump.c:798
+#: pg_dump.c:827
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -113,21 +105,21 @@ msgstr ""
 "%s veritabanını metin dosyası ya da diğer biçimlerde dump eder.\n"
 "\n"
 
-#: pg_dump.c:799
-#: pg_restore.c:410
-#: pg_dumpall.c:536
+#: pg_dump.c:828
+#: pg_restore.c:397
+#: pg_dumpall.c:532
 #, c-format
 msgid "Usage:\n"
 msgstr "Kullanımı:\n"
 
-#: pg_dump.c:800
+#: pg_dump.c:829
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [SEÇENEK]... [VERİTABANI_ADI]\n"
 
-#: pg_dump.c:802
-#: pg_restore.c:413
-#: pg_dumpall.c:539
+#: pg_dump.c:831
+#: pg_restore.c:400
+#: pg_dumpall.c:535
 #, c-format
 msgid ""
 "\n"
@@ -136,47 +128,46 @@ msgstr ""
 "\n"
 "Genel seçenekler:\n"
 
-#: pg_dump.c:803
-#: pg_dumpall.c:540
+#: pg_dump.c:832
 #, c-format
-msgid "  -f, --file=FILENAME         output file name\n"
-msgstr "  -f, --file=DOSYA ADI         çıktı dosya adı\n"
+msgid "  -f, --file=FILENAME         output file or directory name\n"
+msgstr "  -f, --file=DOSYA ADI         çıktı dosya adı ya da dizin adı\n"
 
-#: pg_dump.c:804
+#: pg_dump.c:833
 #, c-format
-msgid "  -F, --format=c|t|p          output file format (custom, tar, plain text)\n"
-msgstr "  -F, --format=c|t|p          çıktı dosya biçimi (özel, tar, düz metin)\n"
+msgid "  -F, --format=c|d|t|p        output file format (custom, directory, tar, plain text)\n"
+msgstr "  -F, --format=c|d|t|p        çıktı dosya biçimi (c : özel, d: dizin, t: tar, p: düz metin)\n"
 
-#: pg_dump.c:805
+#: pg_dump.c:834
 #, c-format
 msgid "  -v, --verbose               verbose mode\n"
 msgstr "  -v, --verbose               açık mod\n"
 
-#: pg_dump.c:806
+#: pg_dump.c:835
 #, c-format
 msgid "  -Z, --compress=0-9          compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9          sıkıştırılmış biçimler için sıkıştırma seviyesi\n"
 
-#: pg_dump.c:807
-#: pg_dumpall.c:541
+#: pg_dump.c:836
+#: pg_dumpall.c:537
 #, c-format
 msgid "  --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
 msgstr "  --lock-wait-timeout=ZAMAN AŞIMI Tablo kilitlemesi için belirtilen süreden fazla beklendiğinde hata ver\n"
 
-#: pg_dump.c:808
-#: pg_dumpall.c:542
+#: pg_dump.c:837
+#: pg_dumpall.c:538
 #, c-format
 msgid "  --help                      show this help, then exit\n"
 msgstr "  --help                      bu yardımı göster ve sonra çık\n"
 
-#: pg_dump.c:809
-#: pg_dumpall.c:543
+#: pg_dump.c:838
+#: pg_dumpall.c:539
 #, c-format
 msgid "  --version                   output version information, then exit\n"
 msgstr "  --version                   sürüm bilgisini ver ve çık\n"
 
-#: pg_dump.c:811
-#: pg_dumpall.c:544
+#: pg_dump.c:840
+#: pg_dumpall.c:540
 #, c-format
 msgid ""
 "\n"
@@ -185,49 +176,49 @@ msgstr ""
 "\n"
 "Çıktı içeriğini kontrol eden seçenekler:\n"
 
-#: pg_dump.c:812
-#: pg_dumpall.c:545
+#: pg_dump.c:841
+#: pg_dumpall.c:541
 #, c-format
 msgid "  -a, --data-only             dump only the data, not the schema\n"
 msgstr "  -a, --data-only          sadece veriyi yedekler; şemayı yedeklemez\n"
 
-#: pg_dump.c:813
+#: pg_dump.c:842
 #, c-format
 msgid "  -b, --blobs                 include large objects in dump\n"
 msgstr "  -b, --blobs                 yedeğin içine large objectleri de ekle\n"
 
-#: pg_dump.c:814
+#: pg_dump.c:843
 #, c-format
 msgid "  -c, --clean                 clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean                 veritabanı nesnelerini yeniden yaratmadan önce temizle (kaldır\n"
 
-#: pg_dump.c:815
+#: pg_dump.c:844
 #, c-format
 msgid "  -C, --create                include commands to create database in dump\n"
 msgstr "  -C, --create             dump'ın içinde veritabanını oluşturacak komutları da ekle\n"
 
-#: pg_dump.c:816
+#: pg_dump.c:845
 #, c-format
 msgid "  -E, --encoding=ENCODING     dump the data in encoding ENCODING\n"
 msgstr "  -E, --encoding=ENCODING  veriyi ENCODING dil kodlamasıyla yedekle\n"
 
-#: pg_dump.c:817
+#: pg_dump.c:846
 #, c-format
 msgid "  -n, --schema=SCHEMA         dump the named schema(s) only\n"
 msgstr "  -n, --schema=SCHEMA         sadece belirtilen şema veya şemaları yedekle\n"
 
-#: pg_dump.c:818
+#: pg_dump.c:847
 #, c-format
 msgid "  -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
 msgstr "  -N, --exclude-schema=SCHEMA bu şema veya şemaları yedekten kaldır\n"
 
-#: pg_dump.c:819
-#: pg_dumpall.c:548
+#: pg_dump.c:848
+#: pg_dumpall.c:544
 #, c-format
 msgid "  -o, --oids                  include OIDs in dump\n"
 msgstr "  -o, --oids                  yedeğin içine OID'leri de ekle\n"
 
-#: pg_dump.c:820
+#: pg_dump.c:849
 #, c-format
 msgid ""
 "  -O, --no-owner              skip restoration of object ownership in\n"
@@ -236,77 +227,94 @@ msgstr ""
 "  -O, --no-owner              düz metin biçiminde nesne \n"
 "                              sahipliğinin yüklenmesini atla\n"
 
-#: pg_dump.c:822
-#: pg_dumpall.c:551
+#: pg_dump.c:851
+#: pg_dumpall.c:547
 #, c-format
 msgid "  -s, --schema-only           dump only the schema, no data\n"
 msgstr "  -s, --schema-only        sadece şemayı dump et, veriyi etme\n"
 
-#: pg_dump.c:823
+#: pg_dump.c:852
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in plain-text format\n"
 msgstr "  -S, --superuser=NAME        düz metin formatında kullanılacak superuser kullanıcı adı\n"
 
-#: pg_dump.c:824
+#: pg_dump.c:853
 #, c-format
 msgid "  -t, --table=TABLE           dump the named table(s) only\n"
 msgstr "  -t, --table=TABLE           sadece bu tablo veya tabloları yedekle\n"
 
-#: pg_dump.c:825
+#: pg_dump.c:854
 #, c-format
 msgid "  -T, --exclude-table=TABLE   do NOT dump the named table(s)\n"
 msgstr "  -T, --exclude-table=TABLE   bu tablo veya tabloları yedekten kaldır\n"
 
-#: pg_dump.c:826
-#: pg_dumpall.c:554
+#: pg_dump.c:855
+#: pg_dumpall.c:550
 #, c-format
 msgid "  -x, --no-privileges         do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      yetkileri yedekleme (grant/revoke)\n"
 
-#: pg_dump.c:827
-#: pg_dumpall.c:555
+#: pg_dump.c:856
+#: pg_dumpall.c:551
 #, c-format
 msgid "  --binary-upgrade            for use by upgrade utilities only\n"
 msgstr "  --binary-upgrade            sadece yükseltme araçlarının kullanımı için\n"
 
-#: pg_dump.c:828
-#: pg_dumpall.c:556
-#, c-format
-msgid "  --inserts                   dump data as INSERT commands, rather than COPY\n"
-msgstr "  --inserts                   verileri COPY yerine INSERT komutları olarak yedekle\n"
-
-#: pg_dump.c:829
-#: pg_dumpall.c:557
+#: pg_dump.c:857
+#: pg_dumpall.c:552
 #, c-format
 msgid "  --column-inserts            dump data as INSERT commands with column names\n"
 msgstr "  --column-inserts            veriyi kolon adları ile INSERT komutları olarak yedekle\n"
 
-#: pg_dump.c:830
-#: pg_dumpall.c:558
+#: pg_dump.c:858
+#: pg_dumpall.c:553
 #, c-format
 msgid "  --disable-dollar-quoting    disable dollar quoting, use SQL standard quoting\n"
 msgstr "  --disable-dollar-quoting    dollar quoting kullanmayı engelle, standart SQL quoting kullan\n"
 
-#: pg_dump.c:831
-#: pg_dumpall.c:559
+#: pg_dump.c:859
+#: pg_dumpall.c:554
 #, c-format
 msgid "  --disable-triggers          disable triggers during data-only restore\n"
 msgstr "  --disable-triggers          veri geri yükleme sırasında tetikleyicileri devre dışı bırak\n"
 
-#: pg_dump.c:832
-#: pg_dumpall.c:560
+#: pg_dump.c:860
+#: pg_dumpall.c:555
+#, c-format
+msgid "  --inserts                   dump data as INSERT commands, rather than COPY\n"
+msgstr "  --inserts                   verileri COPY yerine INSERT komutları olarak yedekle\n"
+
+#: pg_dump.c:861
+#: pg_dumpall.c:556
+#, c-format
+msgid "  --no-security-labels        do not dump security label assignments\n"
+msgstr "  --no-security-labels       güvenlik etiketi atamalarını yedekleme\n"
+
+#: pg_dump.c:862
+#: pg_dumpall.c:557
 #, c-format
 msgid "  --no-tablespaces            do not dump tablespace assignments\n"
 msgstr "  --no-tablespaces            tablespace atamalarını yedekleme\n"
 
-#: pg_dump.c:833
-#: pg_dumpall.c:561
+#: pg_dump.c:863
+#: pg_dumpall.c:558
 #, c-format
-msgid "  --role=ROLENAME             do SET ROLE before dump\n"
-msgstr "  --role=ROL ADI             dump'dan önce SET ROLE çalıştır\n"
+msgid "  --no-unlogged-table-data    do not dump unlogged table data\n"
+msgstr "  --no-unlogged-table-data    unlogged tablo verisini yedekleme\n"
 
-#: pg_dump.c:834
-#: pg_dumpall.c:562
+#: pg_dump.c:864
+#: pg_dumpall.c:559
+#, c-format
+msgid "  --quote-all-identifiers     quote all identifiers, even if not key words\n"
+msgstr "  --quote-all-identifiers    anahtar sözcükler olmasa bile tüm belirteçleri çift tırnak içine al\n"
+
+#: pg_dump.c:865
+#, c-format
+msgid "  --serializable-deferrable   wait until the dump can run without anomalies\n"
+msgstr "  --serializable-deferrable  yedeÄŸin bir anormallik olmadan biteceÄŸi ana kadar bekle\n"
+
+#: pg_dump.c:866
+#: pg_dumpall.c:560
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -317,9 +325,9 @@ msgstr ""
 "                              Sahipliği ayarlamak için ALTER OWNER komutları yerine\n"
 "                              SET SESSION AUTHORIZATION komutlarını kullan\n"
 
-#: pg_dump.c:838
-#: pg_restore.c:452
-#: pg_dumpall.c:566
+#: pg_dump.c:870
+#: pg_restore.c:439
+#: pg_dumpall.c:564
 #, c-format
 msgid ""
 "\n"
@@ -328,42 +336,48 @@ msgstr ""
 "\n"
 "Bağlantı Seçenekleri:\n"
 
-#: pg_dump.c:839
-#: pg_restore.c:453
-#: pg_dumpall.c:567
+#: pg_dump.c:871
+#: pg_restore.c:440
+#: pg_dumpall.c:565
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAME          veritabanı sunucusu adresi ya da soket dizini\n"
 
-#: pg_dump.c:840
-#: pg_restore.c:454
-#: pg_dumpall.c:569
+#: pg_dump.c:872
+#: pg_restore.c:441
+#: pg_dumpall.c:567
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p PORT         veritabanı sunucusunun port numarası\n"
 
-#: pg_dump.c:841
-#: pg_restore.c:455
-#: pg_dumpall.c:570
+#: pg_dump.c:873
+#: pg_restore.c:442
+#: pg_dumpall.c:568
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=KULLANICI_ADI   bağlanılacak kullanıcı adı\n"
 
-#: pg_dump.c:842
-#: pg_restore.c:456
-#: pg_dumpall.c:571
+#: pg_dump.c:874
+#: pg_restore.c:443
+#: pg_dumpall.c:569
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        bağlanmak için kesinlikle parola sorma\n"
 
-#: pg_dump.c:843
-#: pg_restore.c:457
-#: pg_dumpall.c:572
+#: pg_dump.c:875
+#: pg_restore.c:444
+#: pg_dumpall.c:570
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W              şifre sor (otomatik olarak her zaman açık)\n"
 
-#: pg_dump.c:845
+#: pg_dump.c:876
+#: pg_dumpall.c:571
+#, c-format
+msgid "  --role=ROLENAME          do SET ROLE before dump\n"
+msgstr "  --role=ROL ADI             yedek işleminden önce SET ROLE çalıştır\n"
+
+#: pg_dump.c:878
 #, c-format
 msgid ""
 "\n"
@@ -376,1138 +390,1242 @@ msgstr ""
 "kullanılacaktır.\n"
 "\n"
 
-#: pg_dump.c:847
-#: pg_restore.c:460
-#: pg_dumpall.c:576
+#: pg_dump.c:880
+#: pg_restore.c:448
+#: pg_dumpall.c:575
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Hataları <pgsql-bugs@postgresql.org> adresine bildirin.\n"
 
-#: pg_dump.c:855
-#: pg_backup_archiver.c:1401
+#: pg_dump.c:888
+#: pg_backup_archiver.c:1458
+#, c-format
 msgid "*** aborted because of error\n"
 msgstr "*** hata nedeniyle durduruldu\n"
 
-#: pg_dump.c:876
+#: pg_dump.c:930
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "Geçersiz çıktı biçimi belirtildi: \"%s\" \n"
+
+#: pg_dump.c:953
+#, c-format
 msgid "server version must be at least 7.3 to use schema selection switches\n"
 msgstr "şema seçim anahtarlarını kullanmak için sunucu sürümü 7.3 ya da daha yüksek olmalıdır\n"
 
-#: pg_dump.c:1114
+#: pg_dump.c:1211
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "%s tablosunun içeriği aktarılıyor\n"
 
-#: pg_dump.c:1217
+#: pg_dump.c:1331
 #, c-format
 msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
 msgstr "\"%s\" tablosunu içeriğinin aktarımı başarısız: PQgetCopyData() başarısız.\n"
 
-#: pg_dump.c:1218
-#: pg_dump.c:12413
+#: pg_dump.c:1332
+#: pg_dump.c:14206
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Sunucudan hata mesajı alındı: %s"
 
-#: pg_dump.c:1219
-#: pg_dump.c:12414
+#: pg_dump.c:1333
+#: pg_dump.c:14207
 #, c-format
 msgid "The command was: %s\n"
 msgstr "O sırada yürütülen komut: %s\n"
 
-#: pg_dump.c:1625
+#: pg_dump.c:1756
+#, c-format
 msgid "saving database definition\n"
 msgstr "veritabanın tanımı kaydediliyor\n"
 
-#: pg_dump.c:1707
+#: pg_dump.c:1838
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "\"%s\" veritabanı için pg_database kaydı bulunamadı\n"
 
-#: pg_dump.c:1714
+#: pg_dump.c:1845
 #, c-format
 msgid "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr "Sorgu, birden fazla (%d) sonucu \"%s\" veritabanının pg_database kaydı için döndürdü\n"
 
-#: pg_dump.c:1815
+#: pg_dump.c:1949
+#, c-format
 msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
 msgstr "dumpDatabase(): pg_largeobject.relfrozenxid bulunamadı\n"
 
-#: pg_dump.c:1892
+#: pg_dump.c:1988
+#, c-format
+msgid "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
+msgstr "dumpDatabase(): pg_largeobject_metadata.relfrozenxid bulunamadı\n"
+
+#: pg_dump.c:2085
 #, c-format
 msgid "saving encoding = %s\n"
 msgstr "dil kodlaması = %s\n"
 
-#: pg_dump.c:1919
+#: pg_dump.c:2112
 #, c-format
 msgid "saving standard_conforming_strings = %s\n"
 msgstr "kaydedilen: standard_conforming_strings = %s\n"
 
-#: pg_dump.c:1952
+#: pg_dump.c:2145
+#, c-format
 msgid "reading large objects\n"
 msgstr "large objectler okunuyor\n"
 
-#: pg_dump.c:2079
+#: pg_dump.c:2277
+#, c-format
 msgid "saving large objects\n"
 msgstr "large objectler kaydediliyor\n"
 
-#: pg_dump.c:2121
-#: pg_backup_archiver.c:946
+#: pg_dump.c:2319
+#: pg_backup_archiver.c:984
 #, c-format
 msgid "could not open large object %u: %s"
 msgstr " %u large object açılamadı: %s"
 
-#: pg_dump.c:2134
+#: pg_dump.c:2332
 #, c-format
 msgid "error reading large object %u: %s"
 msgstr "%u large object okurken hata oldu: %s"
 
-#: pg_dump.c:2181
-#: pg_dump.c:2229
-#: pg_dump.c:2291
-#: pg_dump.c:6912
-#: pg_dump.c:7115
-#: pg_dump.c:7931
-#: pg_dump.c:8469
-#: pg_dump.c:8719
-#: pg_dump.c:8825
-#: pg_dump.c:9210
-#: pg_dump.c:9386
-#: pg_dump.c:9583
-#: pg_dump.c:9810
-#: pg_dump.c:9965
-#: pg_dump.c:10152
-#: pg_dump.c:12219
+#: pg_dump.c:2379
+#: pg_dump.c:2427
+#: pg_dump.c:2482
+#: pg_dump.c:7647
+#: pg_dump.c:7878
+#: pg_dump.c:8844
+#: pg_dump.c:9396
+#: pg_dump.c:9650
+#: pg_dump.c:9764
+#: pg_dump.c:10220
+#: pg_dump.c:10406
+#: pg_dump.c:10512
+#: pg_dump.c:10712
+#: pg_dump.c:10954
+#: pg_dump.c:11121
+#: pg_dump.c:11342
+#: pg_dump.c:14012
 #, c-format
 msgid "query returned %d row instead of one: %s\n"
 msgid_plural "query returned %d rows instead of one: %s\n"
 msgstr[0] "sorgu 1 yerine %d satır döndürdü: %s\n"
 msgstr[1] "sorgu 1 yerine %d satır döndürdü: %s\n"
 
-#: pg_dump.c:2436
+#: pg_dump.c:2563
+#, c-format
+msgid "could not find parent extension for %s"
+msgstr "%s için üst uzantı bulunamadı"
+
+#: pg_dump.c:2670
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" şemasının sahibi geçersizdir\n"
 
-#: pg_dump.c:2471
+#: pg_dump.c:2705
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "OID %u olan ÅŸema mevcut deÄŸil\n"
 
-#: pg_dump.c:2728
+#: pg_dump.c:3046
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" veri tipinin sahibi geçersizdir\n"
 
-#: pg_dump.c:2832
+#: pg_dump.c:3150
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" operatörün  sahibi geçersizdir\n"
 
-#: pg_dump.c:3006
+#: pg_dump.c:3402
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" operator sınıfının sahibi geçersizdir\n"
 
-#: pg_dump.c:3093
+#: pg_dump.c:3489
 #, c-format
 msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" operatör ailesinin sahibi geçersizdir\n"
 
-#: pg_dump.c:3218
+#: pg_dump.c:3626
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" aggregate fonksiyonun sahibi geçersizdir\n"
 
-#: pg_dump.c:3373
+#: pg_dump.c:3796
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" fonksiyonunun sahibi geçersizdir\n"
 
-#: pg_dump.c:3806
+#: pg_dump.c:4296
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "UYARI: \"%s\" tablosunun sahibi geçersizdir\n"
 
-#: pg_dump.c:3949
+#: pg_dump.c:4439
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "\"%s\" tablosunun indexleri okunuyor\n"
 
-#: pg_dump.c:4269
+#: pg_dump.c:4759
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "\"%s\" tablosunun foreign key bütünlük kısıtlamaları okunuyor\n"
 
-#: pg_dump.c:4501
+#: pg_dump.c:4991
 #, c-format
 msgid "failed sanity check, parent table OID %u of pg_rewrite entry OID %u not found\n"
 msgstr "tutarlılık kontrolü başarısız, üst tablo OID'inin %u, pg_rewrite girdisi OID'i %u bulunamadı\n"
 
-#: pg_dump.c:4585
+#: pg_dump.c:5075
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "\"%s\" tablosunun tetikleyicileri okunuyor\n"
 
-#: pg_dump.c:4748
+#: pg_dump.c:5238
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
 msgstr "\"%2$s\" tablosu üzerindeki \"%1$s\" foreign key tetikleyici için sorgu, null referans edilen tablo sayısı getirdi (tablo OID: %3$u)\n"
 
-#: pg_dump.c:5118
+#: pg_dump.c:5610
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "\"%s\" tablosunun bütünlük kısıtlamaları ve tipleri bulunuyor\n"
 
-#: pg_dump.c:5237
+#: pg_dump.c:5787
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "\"%s\" tablosunda geçersiz kolon numaralandırlması\n"
 
-#: pg_dump.c:5273
+#: pg_dump.c:5825
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "\"%s\" tablosu için varsayılan ifadeler aranıyor\n"
 
-#: pg_dump.c:5358
+#: pg_dump.c:5910
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "\"%2$s\" tablosu için geçersiz adnum değeri %1$d\n"
 
-#: pg_dump.c:5376
+#: pg_dump.c:5928
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "\"%s\" tablosu için bütünlük kısıtlamaları bulunuyor\n"
 
-#: pg_dump.c:5456
+#: pg_dump.c:6008
 #, c-format
 msgid "expected %d check constraint on table \"%s\" but found %d\n"
 msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
 msgstr[0] "%d check kısıtlamasının \"%s\" tablosunda bulunması beklendi; ancak  %d bulundu\n"
 msgstr[1] "%d check kısıtlamasının \"%s\" tablosunda bulunması beklendi; ancak  %d bulundu\n"
 
-#: pg_dump.c:5460
+#: pg_dump.c:6012
+#, c-format
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Sistem kataloÄŸu bozulmuÅŸ olabilir.)\n"
 
-#: pg_dump.c:7242
-#: pg_dump.c:7349
+#: pg_dump.c:8610
 #, c-format
-msgid "query returned no rows: %s\n"
-msgstr "sorgu hiçbir satır döndürmedi: %s\n"
-
-#: pg_dump.c:7699
 msgid "WARNING: bogus value in proargmodes array\n"
 msgstr "UYARI: proargnames dizisi içinde beklenmeyen değer\n"
 
-#: pg_dump.c:8011
+#: pg_dump.c:8924
+#, c-format
 msgid "WARNING: could not parse proallargtypes array\n"
 msgstr "UYARI: proallargtypes dizisi ayrıştırılamadı\n"
 
-#: pg_dump.c:8027
+#: pg_dump.c:8940
+#, c-format
 msgid "WARNING: could not parse proargmodes array\n"
 msgstr "UYARI: proargmodes dizisi ayrıştırılamadı\n"
 
-#: pg_dump.c:8041
+#: pg_dump.c:8954
+#, c-format
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "UYARI: proargnames dizisi ayrıştırılamadı\n"
 
-#: pg_dump.c:8052
+#: pg_dump.c:8965
+#, c-format
 msgid "WARNING: could not parse proconfig array\n"
 msgstr "UYARI: proconfig dizisi ayrıştırılamadı\n"
 
-#: pg_dump.c:8108
+#: pg_dump.c:9021
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "\"%s\" fonksiyonu için bilinmeyen provolatile değeri\n"
 
-#: pg_dump.c:8311
+#: pg_dump.c:9237
+#, c-format
 msgid "WARNING: bogus value in pg_cast.castmethod field\n"
 msgstr "UYARI: pg_cast.castmethod field alanı içinde belirsiz değer\n"
 
-#: pg_dump.c:8688
+#: pg_dump.c:9619
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "UYARI: OID %s olan operatör bulunamadı\n"
 
-#: pg_dump.c:9609
+#: pg_dump.c:10738
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 msgstr "UYARI: %s aggregate fonksiyonu veritabanın bu sürümünde düzgün dump edilemiyor; atlanıyor\n"
 
-#: pg_dump.c:10337
+#: pg_dump.c:11538
 #, c-format
 msgid "unknown object type (%d) in default privileges\n"
 msgstr "öntanımlı yetkilerde bilinmeyen nesne tipi %d\n"
 
-#: pg_dump.c:10354
+#: pg_dump.c:11555
 #, c-format
 msgid "could not parse default ACL list (%s)\n"
 msgstr "öntanımlı ACL listesi ayrıştırılamıyor (%s)\n"
 
-#: pg_dump.c:10411
+#: pg_dump.c:11612
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "\"%2$s\" nesnesinin ACL listesi (%1$s) ayrıştırılamıyor (%3$s)\n"
 
-#: pg_dump.c:10554
+#: pg_dump.c:12052
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "\"%s\" vew tanımını getirecek sorgu hiçbir veri getirmedi\n"
 
-#: pg_dump.c:10557
+#: pg_dump.c:12055
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "\"%s\" vew tanımını getirecek sorgu birden çık tanımı getirdi\n"
 
-#: pg_dump.c:10566
+#: pg_dump.c:12064
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "\"%s\" vew tanımı boştur (uzunluk sıfır)\n"
 
-#: pg_dump.c:11042
+#: pg_dump.c:12647
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "\"%2$s\" tablosu için geçersiz sütun numarası %1$d\n"
 
-#: pg_dump.c:11150
+#: pg_dump.c:12758
 #, c-format
 msgid "missing index for constraint \"%s\"\n"
 msgstr "\"%s\" bütünlük kısıtlamasının indexi eksik\n"
 
-#: pg_dump.c:11338
+#: pg_dump.c:12946
 #, c-format
 msgid "unrecognized constraint type: %c\n"
 msgstr "bilinmeyen bütünlük kısıtlama türü: %c\n"
 
-#: pg_dump.c:11401
+#: pg_dump.c:13009
+#, c-format
 msgid "missing pg_database entry for this database\n"
 msgstr "bu veritabanı için pg_database kaydı bulunamadı\n"
 
-#: pg_dump.c:11406
+#: pg_dump.c:13014
+#, c-format
 msgid "found more than one pg_database entry for this database\n"
 msgstr "bu veritabanı için birden fazla pg_database kaydı bulundu\n"
 
-#: pg_dump.c:11438
+#: pg_dump.c:13046
+#, c-format
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "pg_class içinde pg_indexes için kayıt bulunamadı\n"
 
-#: pg_dump.c:11443
+#: pg_dump.c:13051
+#, c-format
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "pg_class içinde pg_indexes için birden çok kayıt bulundu\n"
 
-#: pg_dump.c:11514
+#: pg_dump.c:13123
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
 msgid_plural "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
 msgstr[0] "\"%s\" sequence verisini getirecek sorgu %d satır döndürdü (bir satır bekleniyordu)\n"
 msgstr[1] "\"%s\" sequence verisini getirecek sorgu %d satır döndürdü (bir satır bekleniyordu)\n"
 
-#: pg_dump.c:11525
+#: pg_dump.c:13134
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "\"%s\" sequence verisini getirecek sorgu \"%s\" adını getirdi\n"
 
-#: pg_dump.c:11819
+#: pg_dump.c:13362
+#, c-format
+msgid "unexpected tgtype value: %d\n"
+msgstr "beklenmeyen tgtype deÄŸeri: %d\n"
+
+#: pg_dump.c:13444
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "\"%3$s\" tablosunun \"%2$s\" tetikleyicisi için geçersiz satır argümanı (%1$s)\n"
 
-#: pg_dump.c:11935
+#: pg_dump.c:13562
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n"
 msgstr "\"%s\" tablosundan \"%s\" rule'unu getiren sorgu başarısız: yanlış satır sayısı döndürüldü\n"
 
-#: pg_dump.c:12030
+#: pg_dump.c:13819
+#, c-format
 msgid "reading dependency data\n"
 msgstr "bağımlılık verileri okunuyor\n"
 
-#: pg_dump.c:12408
+#: pg_dump.c:14201
+#, c-format
 msgid "SQL command failed\n"
 msgstr "SQL komutu başarısız\n"
 
-#: common.c:115
+#: common.c:105
+#, c-format
 msgid "reading schemas\n"
 msgstr "ÅŸemalar okunuyor\n"
 
-#: common.c:119
+#: common.c:115
+#, c-format
+msgid "reading user-defined tables\n"
+msgstr "kullanıcı tanımlı tablolar okunuyor\n"
+
+#: common.c:120
+#, c-format
+msgid "reading extensions\n"
+msgstr "uzantılar okunuyor\n"
+
+#: common.c:124
+#, c-format
 msgid "reading user-defined functions\n"
 msgstr "kullanıcı tanımlı fonksiyonlar okunuyor\n"
 
-#: common.c:125
+#: common.c:130
+#, c-format
 msgid "reading user-defined types\n"
 msgstr "kullanıcı tanımlı tipler okunuyor\n"
 
-#: common.c:131
+#: common.c:136
+#, c-format
 msgid "reading procedural languages\n"
 msgstr "yordamsal diller okunuyor\n"
 
-#: common.c:135
+#: common.c:140
+#, c-format
 msgid "reading user-defined aggregate functions\n"
 msgstr "kullanıcı-tanımlı aggregate fonksiyonlar okunuyor\n"
 
-#: common.c:139
+#: common.c:144
+#, c-format
 msgid "reading user-defined operators\n"
 msgstr "kullanıcı tanımlı operatörler okunuyor\n"
 
-#: common.c:144
+#: common.c:149
+#, c-format
 msgid "reading user-defined operator classes\n"
 msgstr "kullanıcı-tanımlı operatör sınıfları okunuyor\n"
 
-#: common.c:148
+#: common.c:153
+#, c-format
+msgid "reading user-defined operator families\n"
+msgstr "kullanıcı tanımlı operatör aileleri okunuyor\n"
+
+#: common.c:157
+#, c-format
 msgid "reading user-defined text search parsers\n"
 msgstr "kullanıcı tanımlı metin arama ayrıştırıcıları okunuyor\n"
 
-#: common.c:152
+#: common.c:161
+#, c-format
 msgid "reading user-defined text search templates\n"
 msgstr "kullanıcı tanımlı metin arama şablonları okunuyor\n"
 
-#: common.c:156
+#: common.c:165
+#, c-format
 msgid "reading user-defined text search dictionaries\n"
 msgstr "kullanıcı-tanımlı metin arama sözlükleri okunuyor\n"
 
-#: common.c:160
+#: common.c:169
+#, c-format
 msgid "reading user-defined text search configurations\n"
 msgstr "kullanıcı-tanımlı metin arama yapılandırmaları okunuyor\n"
 
-#: common.c:164
+#: common.c:173
+#, c-format
 msgid "reading user-defined foreign-data wrappers\n"
 msgstr "kullanıcı tanımlı foreign-data wrapperlar okunuyor\n"
 
-#: common.c:168
+#: common.c:177
+#, c-format
 msgid "reading user-defined foreign servers\n"
 msgstr "kullanıcı tanımlı foreign sunucular okunuyor\n"
 
-#: common.c:172
+#: common.c:181
+#, c-format
 msgid "reading default privileges\n"
 msgstr "öntanımlı yetkiler okunuyor\n"
 
-#: common.c:176
-msgid "reading user-defined operator families\n"
-msgstr "kullanıcı tanımlı operatör aileleri okunuyor\n"
+#: common.c:185
+#, c-format
+msgid "reading user-defined collations\n"
+msgstr "kullanıcı tanımlı collationlar okunuyor\n"
 
-#: common.c:180
+#: common.c:190
+#, c-format
 msgid "reading user-defined conversions\n"
 msgstr "kullanıcı tanımlı dönüşümler okunuyor\n"
 
-#: common.c:184
-msgid "reading user-defined tables\n"
-msgstr "kullanıcı tanımlı tablolar okunuyor\n"
+#: common.c:194
+#, c-format
+msgid "reading type casts\n"
+msgstr "type castlar okunuyor\n"
 
-#: common.c:189
+#: common.c:198
+#, c-format
 msgid "reading table inheritance information\n"
 msgstr "kullanıcı tanımlı inheritance bilgisi okunuyor\n"
 
-#: common.c:193
+#: common.c:202
+#, c-format
 msgid "reading rewrite rules\n"
 msgstr "rewrite ruleler okunuyor\n"
 
-#: common.c:197
-msgid "reading type casts\n"
-msgstr "type castlar okunuyor\n"
+#: common.c:211
+#, c-format
+msgid "finding extension members\n"
+msgstr "uzantı üyeleri bulunuyor\n"
 
-#: common.c:202
+#: common.c:216
+#, c-format
 msgid "finding inheritance relationships\n"
 msgstr "inheritance iliÅŸkiler bulunuyor\n"
 
-#: common.c:206
+#: common.c:220
+#, c-format
 msgid "reading column info for interesting tables\n"
 msgstr "ilgili tabloların sütun bilgisi okunuyor\n"
 
-#: common.c:210
+#: common.c:224
+#, c-format
 msgid "flagging inherited columns in subtables\n"
 msgstr "alt tablolarında inherited sütunlar işaretleniyor\n"
 
-#: common.c:214
+#: common.c:228
+#, c-format
 msgid "reading indexes\n"
 msgstr "indexler okunuyor\n"
 
-#: common.c:218
+#: common.c:232
+#, c-format
 msgid "reading constraints\n"
 msgstr "bütünlük kısıtlamaları okunuyor\n"
 
-#: common.c:222
+#: common.c:236
+#, c-format
 msgid "reading triggers\n"
 msgstr "tetikleyiciler okunuyor\n"
 
-#: common.c:802
+#: common.c:828
 #, c-format
 msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
 msgstr "tutarlılık kontrolü başarısız, \"%2$s\" tablosunun (OID %3$u) üst OID %1$u bulunamadı\n"
 
-#: common.c:844
+#: common.c:870
 #, c-format
 msgid "could not parse numeric array \"%s\": too many numbers\n"
 msgstr "\"%s\" numerik dizisi ayrıştırılamadı: çok fazla sayı\n"
 
-#: common.c:859
+#: common.c:885
 #, c-format
 msgid "could not parse numeric array \"%s\": invalid character in number\n"
 msgstr "\"%s\" numerik dizisi ayrıştırılamadı: sayıda geçersiz karakter\n"
 
-#: common.c:972
+#: common.c:998
+#, c-format
 msgid "cannot duplicate null pointer\n"
 msgstr "null pointer dump edilemez\n"
 
-#: common.c:975
-#: common.c:986
-#: common.c:997
-#: common.c:1008
-#: pg_backup_archiver.c:727
-#: pg_backup_archiver.c:1103
-#: pg_backup_archiver.c:1234
-#: pg_backup_archiver.c:1705
-#: pg_backup_archiver.c:1862
-#: pg_backup_archiver.c:1908
-#: pg_backup_archiver.c:4048
-#: pg_backup_custom.c:144
-#: pg_backup_custom.c:149
-#: pg_backup_custom.c:155
-#: pg_backup_custom.c:170
-#: pg_backup_custom.c:570
-#: pg_backup_custom.c:1113
-#: pg_backup_custom.c:1122
-#: pg_backup_db.c:154
-#: pg_backup_db.c:164
-#: pg_backup_db.c:212
-#: pg_backup_db.c:256
-#: pg_backup_db.c:271
-#: pg_backup_db.c:305
+#: common.c:1001
+#: common.c:1012
+#: common.c:1023
+#: common.c:1034
+#: pg_backup_archiver.c:764
+#: pg_backup_archiver.c:1160
+#: pg_backup_archiver.c:1291
+#: pg_backup_archiver.c:1761
+#: pg_backup_archiver.c:1955
+#: pg_backup_archiver.c:2001
+#: pg_backup_archiver.c:4209
+#: pg_backup_custom.c:132
+#: pg_backup_custom.c:139
+#: pg_backup_custom.c:780
+#: pg_backup_custom.c:907
+#: pg_backup_db.c:147
+#: pg_backup_db.c:157
+#: pg_backup_db.c:205
+#: pg_backup_db.c:249
+#: pg_backup_db.c:264
+#: pg_backup_db.c:298
+#: pg_backup_db.c:403
 #: pg_backup_files.c:114
 #: pg_backup_null.c:72
-#: pg_backup_tar.c:167
-#: pg_backup_tar.c:1011
+#: pg_backup_tar.c:171
+#: pg_backup_tar.c:1015
+#, c-format
 msgid "out of memory\n"
 msgstr "yetersiz bellek\n"
 
-#: pg_backup_archiver.c:80
+#: pg_backup_archiver.c:88
 msgid "archiver"
 msgstr "arÅŸivleyici"
 
-#: pg_backup_archiver.c:195
-#: pg_backup_archiver.c:1198
+#: pg_backup_archiver.c:207
+#: pg_backup_archiver.c:1259
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "çıktı dosyası kapatılamadı: %s\n"
 
-#: pg_backup_archiver.c:220
+#: pg_backup_archiver.c:233
+#, c-format
 msgid "-C and -c are incompatible options\n"
 msgstr "-C ve -c seçenekler bir arada kullanılamaz\n"
 
-#: pg_backup_archiver.c:227
+#: pg_backup_archiver.c:240
+#, c-format
 msgid "-C and -1 are incompatible options\n"
 msgstr "-C and -1 uyumsuz seçeneklerdir\n"
 
-#: pg_backup_archiver.c:239
+#: pg_backup_archiver.c:250
+#, c-format
+msgid "parallel restore is not supported with this archive file format\n"
+msgstr "paralel geri yükleme bu arşiv biçimini desteklemiyor\n"
+
+#: pg_backup_archiver.c:254
+#, c-format
+msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
+msgstr "paralel geri yükleme özelliği 8.0 öncesi pg_dump ile yapılan arşivleri desteklememektedir\n"
+
+#: pg_backup_archiver.c:273
+#, c-format
 msgid "cannot restore from compressed archive (compression not supported in this installation)\n"
 msgstr "sıkıştırılmış arşivden yükleme başarısız (bu kurulumda sıkıştırma desteklenmiyor)\n"
 
-#: pg_backup_archiver.c:249
+#: pg_backup_archiver.c:283
+#, c-format
 msgid "connecting to database for restore\n"
 msgstr "geri yüklemek için veritabana bağlanılıyor\n"
 
-#: pg_backup_archiver.c:251
+#: pg_backup_archiver.c:285
+#, c-format
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr "1.3 sürüm öncesi arşivlerinde doğrudan veritabanı bağlantıları desteklenmemektedir\n"
 
-#: pg_backup_archiver.c:293
+#: pg_backup_archiver.c:327
+#, c-format
 msgid "implied data-only restore\n"
 msgstr "örtük salt veri geri yükleme\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:379
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "%s %s kaldırılıyor\n"
 
-#: pg_backup_archiver.c:396
+#: pg_backup_archiver.c:431
 #, c-format
 msgid "setting owner and privileges for %s %s\n"
 msgstr "%s %s için sahiplik ve izinler ayarlanıyor\n"
 
-#: pg_backup_archiver.c:454
-#: pg_backup_archiver.c:456
+#: pg_backup_archiver.c:489
+#: pg_backup_archiver.c:491
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "asıl dump dosyasından uyarı: %s\n"
 
-#: pg_backup_archiver.c:463
+#: pg_backup_archiver.c:498
 #, c-format
 msgid "creating %s %s\n"
 msgstr "%s %s oluÅŸturuluyor\n"
 
-#: pg_backup_archiver.c:507
+#: pg_backup_archiver.c:542
 #, c-format
 msgid "connecting to new database \"%s\"\n"
 msgstr "\"%s\" veritabanına bağlanılıyor\n"
 
-#: pg_backup_archiver.c:535
+#: pg_backup_archiver.c:570
 #, c-format
 msgid "restoring %s\n"
 msgstr "%s geri yükleniyor\n"
 
-#: pg_backup_archiver.c:549
+#: pg_backup_archiver.c:584
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "\"%s\" tablosunun verileri geri yükleniyor\n"
 
-#: pg_backup_archiver.c:609
+#: pg_backup_archiver.c:646
 #, c-format
 msgid "executing %s %s\n"
 msgstr "%s %s yürütülüyor\n"
 
-#: pg_backup_archiver.c:642
+#: pg_backup_archiver.c:679
 #, c-format
 msgid "disabling triggers for %s\n"
 msgstr "%s nesnesinin tetikleyicileri etkisiz hale getiriliyor\n"
 
-#: pg_backup_archiver.c:668
+#: pg_backup_archiver.c:705
 #, c-format
 msgid "enabling triggers for %s\n"
 msgstr "%s nesnesinin tetikleyicileri etkineÅŸtiriliyor\n"
 
-#: pg_backup_archiver.c:698
+#: pg_backup_archiver.c:735
+#, c-format
 msgid "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr "İç hata - WriteData cannot be called outside the context of a DataDumper routine\n"
 
-#: pg_backup_archiver.c:854
+#: pg_backup_archiver.c:892
+#, c-format
 msgid "large-object output not supported in chosen format\n"
 msgstr "seçilen biçimde large-object çıktısı desteklenememektedir\n"
 
-#: pg_backup_archiver.c:908
+#: pg_backup_archiver.c:946
 #, c-format
 msgid "restored %d large object\n"
 msgid_plural "restored %d large objects\n"
 msgstr[0] "%d large object geri yüklendi\n"
 msgstr[1] "%d large object geri yüklendi\n"
 
-#: pg_backup_archiver.c:929
+#: pg_backup_archiver.c:967
 #, c-format
 msgid "restoring large object with OID %u\n"
 msgstr "large-object OID %u geri yükleniyor\n"
 
-#: pg_backup_archiver.c:941
+#: pg_backup_archiver.c:979
 #, c-format
 msgid "could not create large object %u: %s"
 msgstr "%u large object oluşturulamadı: %s"
 
-#: pg_backup_archiver.c:1006
+#: pg_backup_archiver.c:1041
 #, c-format
 msgid "could not open TOC file \"%s\": %s\n"
 msgstr "\"%s\" TOC dosyası açılamadı: %s\n"
 
-#: pg_backup_archiver.c:1025
+#: pg_backup_archiver.c:1082
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "UYARI: satır yoksayıldı: %s\n"
 
-#: pg_backup_archiver.c:1032
+#: pg_backup_archiver.c:1089
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "ID %d için bir alan girdisi bulunamıyor\n"
 
-#: pg_backup_archiver.c:1053
+#: pg_backup_archiver.c:1110
 #: pg_backup_files.c:172
 #: pg_backup_files.c:457
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "TOC dosyası kapatılamıyor: %s\n"
 
-#: pg_backup_archiver.c:1177
-#: pg_backup_custom.c:181
+#: pg_backup_archiver.c:1229
+#: pg_backup_custom.c:152
 #: pg_backup_files.c:130
 #: pg_backup_files.c:262
 #, c-format
 msgid "could not open output file \"%s\": %s\n"
 msgstr "\"%s\" çıktı dosyası açılamadı: %s\n"
 
-#: pg_backup_archiver.c:1180
-#: pg_backup_custom.c:188
+#: pg_backup_archiver.c:1232
+#: pg_backup_custom.c:159
 #: pg_backup_files.c:137
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "çıktı dosyası açılamadı: %s\n"
 
-#: pg_backup_archiver.c:1277
+#: pg_backup_archiver.c:1334
 #, c-format
 msgid "wrote %lu byte of large object data (result = %lu)\n"
 msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr[0] "large object verisinin %lu baytı yazıldı (sonuç = %lu)\n"
 msgstr[1] "large object verisinin %lu baytı yazıldı (sonuç = %lu)\n"
 
-#: pg_backup_archiver.c:1283
+#: pg_backup_archiver.c:1340
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "large-object yazılamıyor (sonuç: %lu, beklenen: %lu)\n"
 
-#: pg_backup_archiver.c:1341
-#: pg_backup_archiver.c:1364
-#: pg_backup_custom.c:781
-#: pg_backup_custom.c:1035
-#: pg_backup_custom.c:1049
+#: pg_backup_archiver.c:1398
+#: pg_backup_archiver.c:1421
+#: pg_backup_custom.c:652
 #: pg_backup_files.c:432
-#: pg_backup_tar.c:586
-#: pg_backup_tar.c:1089
-#: pg_backup_tar.c:1382
+#: pg_backup_tar.c:590
+#: pg_backup_tar.c:1093
+#: pg_backup_tar.c:1386
 #, c-format
 msgid "could not write to output file: %s\n"
 msgstr "çıktı dosyasına yazma başarısız: %s\n"
 
-#: pg_backup_archiver.c:1349
+#: pg_backup_archiver.c:1406
+#, c-format
 msgid "could not write to custom output routine\n"
 msgstr "kullanıcı tanımlı çıktı yordamına yazma hatası\n"
 
-#: pg_backup_archiver.c:1447
+#: pg_backup_archiver.c:1504
+#, c-format
 msgid "Error while INITIALIZING:\n"
 msgstr "INITIALIZING sırasında hata:\n"
 
-#: pg_backup_archiver.c:1452
+#: pg_backup_archiver.c:1509
+#, c-format
 msgid "Error while PROCESSING TOC:\n"
 msgstr "PROCESSING TOC sırasında hata:\n"
 
-#: pg_backup_archiver.c:1457
+#: pg_backup_archiver.c:1514
+#, c-format
 msgid "Error while FINALIZING:\n"
 msgstr "FINALIZING sırasında hata:\n"
 
-#: pg_backup_archiver.c:1462
+#: pg_backup_archiver.c:1519
 #, c-format
 msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "TOC giriÅŸte hata %d; %u %u %s %s %s\n"
 
-#: pg_backup_archiver.c:1598
+#: pg_backup_archiver.c:1654
 #, c-format
 msgid "unexpected data offset flag %d\n"
 msgstr "beklenmeyen veri konum bayrağı %d\n"
 
-#: pg_backup_archiver.c:1611
+#: pg_backup_archiver.c:1667
+#, c-format
 msgid "file offset in dump file is too large\n"
 msgstr "dump dosyasında dosya göstergesi çok büyük\n"
 
-#: pg_backup_archiver.c:1708
-#: pg_backup_archiver.c:3009
-#: pg_backup_custom.c:757
+#: pg_backup_archiver.c:1764
+#: pg_backup_archiver.c:3113
+#: pg_backup_custom.c:630
 #: pg_backup_files.c:419
-#: pg_backup_tar.c:785
+#: pg_backup_tar.c:789
+#, c-format
 msgid "unexpected end of file\n"
 msgstr "beklenmeyen dosya sonu\n"
 
-#: pg_backup_archiver.c:1725
+#: pg_backup_archiver.c:1781
+#, c-format
 msgid "attempting to ascertain archive format\n"
 msgstr "arşiv formatı doğrulanmaya çalışılıyor\n"
 
-#: pg_backup_archiver.c:1741
-#: pg_backup_custom.c:200
-#: pg_backup_custom.c:888
+#: pg_backup_archiver.c:1807
+#: pg_backup_archiver.c:1817
+#, c-format
+msgid "directory name too long: \"%s\"\n"
+msgstr "dizin adı çok uzun:: \"%s\"\n"
+
+#: pg_backup_archiver.c:1825
+#, c-format
+msgid "directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not exist)\n"
+msgstr "\"%s\" dizini geçerli bir arşiv olarak görünmüyor (\"toc.dat\" bulunamadı)\n"
+
+#: pg_backup_archiver.c:1833
+#: pg_backup_custom.c:171
+#: pg_backup_custom.c:762
 #: pg_backup_files.c:155
 #: pg_backup_files.c:307
 #, c-format
 msgid "could not open input file \"%s\": %s\n"
 msgstr "\"%s\" giriş dosyası açılamadı: %s\n"
 
-#: pg_backup_archiver.c:1748
-#: pg_backup_custom.c:207
+#: pg_backup_archiver.c:1841
+#: pg_backup_custom.c:178
 #: pg_backup_files.c:162
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "giriş dosyası açılamadı: %s\n"
 
-#: pg_backup_archiver.c:1757
+#: pg_backup_archiver.c:1850
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "giriş dosyası okuma hatası: %s\n"
 
-#: pg_backup_archiver.c:1759
+#: pg_backup_archiver.c:1852
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "giriş fazla kısa (okunan: %lu, beklenen: 5)\n"
 
-#: pg_backup_archiver.c:1817
+#: pg_backup_archiver.c:1910
+#, c-format
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "giriş, geçerli bir arşiv değildir (çok kısa?)\n"
 
-#: pg_backup_archiver.c:1820
+#: pg_backup_archiver.c:1913
+#, c-format
 msgid "input file does not appear to be a valid archive\n"
 msgstr "girdi geçerli bir arşiv değildir\n"
 
-#: pg_backup_archiver.c:1840
+#: pg_backup_archiver.c:1933
 #, c-format
 msgid "could not close input file: %s\n"
 msgstr "çıktı dosyası kapatılamadı: %s\n"
 
-#: pg_backup_archiver.c:1857
+#: pg_backup_archiver.c:1950
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "%s için AH ayırılıyor, biçim %d\n"
 
-#: pg_backup_archiver.c:1965
+#: pg_backup_archiver.c:2059
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "tanınmayan dosya biçimi: \"%d\"\n"
 
-#: pg_backup_archiver.c:2087
+#: pg_backup_archiver.c:2181
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "ID %d olan giriş kapsam dışıdır -- bozuk TOC olabilir\n"
 
-#: pg_backup_archiver.c:2203
+#: pg_backup_archiver.c:2297
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "%3$s %4$s için TOC öğe %1$d (ID %2$d) okunuyor\n"
 
-#: pg_backup_archiver.c:2237
+#: pg_backup_archiver.c:2331
 #, c-format
 msgid "unrecognized encoding \"%s\"\n"
 msgstr "tanınmayan dil kodlaması: \"%s\"\n"
 
-#: pg_backup_archiver.c:2242
+#: pg_backup_archiver.c:2336
 #, c-format
 msgid "invalid ENCODING item: %s\n"
 msgstr "geçersiz ENCODING öğesi: %s\n"
 
-#: pg_backup_archiver.c:2260
+#: pg_backup_archiver.c:2354
 #, c-format
 msgid "invalid STDSTRINGS item: %s\n"
 msgstr "geçersiz STDSTRINGS öğesi: %s\n"
 
-#: pg_backup_archiver.c:2452
+#: pg_backup_archiver.c:2552
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "oturum kullanıcısını \"%s\" olarak değiştirilemedi: %s"
 
-#: pg_backup_archiver.c:2790
-#: pg_backup_archiver.c:2940
+#: pg_backup_archiver.c:2892
+#: pg_backup_archiver.c:3044
 #, c-format
 msgid "WARNING: don't know how to set owner for object type %s\n"
 msgstr "UAYRI: %s tipinde nesnenin sahib bilgisi ayarlanamıyor\n"
 
-#: pg_backup_archiver.c:2972
+#: pg_backup_archiver.c:3076
+#, c-format
 msgid "WARNING: requested compression not available in this installation -- archive will be uncompressed\n"
 msgstr "UYARI: bu kurulumda sıkıştırma desteklenmemektedir -- arşiv sıkıştırılmayacak\n"
 
-#: pg_backup_archiver.c:3012
+#: pg_backup_archiver.c:3116
+#, c-format
 msgid "did not find magic string in file header\n"
 msgstr "dosya başlığında kod satırı blunamadı\n"
 
-#: pg_backup_archiver.c:3025
+#: pg_backup_archiver.c:3129
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "dosya başlığında desteklenmeyen sürüm (%d.%d)\n"
 
-#: pg_backup_archiver.c:3030
+#: pg_backup_archiver.c:3134
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "integer boyutu (%lu) turtarlılık kontrolü başarısız\n"
 
-#: pg_backup_archiver.c:3034
+#: pg_backup_archiver.c:3138
+#, c-format
 msgid "WARNING: archive was made on a machine with larger integers, some operations might fail\n"
 msgstr "UYARI: arşıv doyası daha büyük integer sayılarına sahip platformda yapılmış, bazı işlemler başarısız olabilir\n"
 
-#: pg_backup_archiver.c:3044
+#: pg_backup_archiver.c:3148
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "dosyada bulunan biçim (%2$d) beklenen biçimden (%1$d) farklıdır\n"
 
-#: pg_backup_archiver.c:3060
+#: pg_backup_archiver.c:3164
+#, c-format
 msgid "WARNING: archive is compressed, but this installation does not support compression -- no data will be available\n"
 msgstr "UYARI: arşiv sıkıştırılmıştır, ancak bu kurulum sıkıştırmayı desteklemiyor -- veri kaydedilmeyecek\n"
 
-#: pg_backup_archiver.c:3078
+#: pg_backup_archiver.c:3182
+#, c-format
 msgid "WARNING: invalid creation date in header\n"
 msgstr "UTAYI: veri başlığında geçersiz tarih\n"
 
-#: pg_backup_archiver.c:3175
+#: pg_backup_archiver.c:3280
+#, c-format
 msgid "entering restore_toc_entries_parallel\n"
 msgstr "restore_toc_entries_parallel'e giriliyor\n"
 
-#: pg_backup_archiver.c:3179
-msgid "parallel restore is not supported with this archive file format\n"
-msgstr "paralel geri yükleme bu arşiv biçimini desteklemiyor\n"
-
-#: pg_backup_archiver.c:3183
-msgid "parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
-msgstr "paralel geri yükleme özelliği 8.0 öncesi pg_dump ile yapılan arşivleri desteklememektedir\n"
-
-#: pg_backup_archiver.c:3205
+#: pg_backup_archiver.c:3321
 #, c-format
 msgid "processing item %d %s %s\n"
 msgstr "%d %s %s öğesi işleniyor\n"
 
-#: pg_backup_archiver.c:3266
+#: pg_backup_archiver.c:3397
+#, c-format
 msgid "entering main parallel loop\n"
 msgstr "ana paralel döngüye giriyor\n"
 
-#: pg_backup_archiver.c:3280
+#: pg_backup_archiver.c:3411
 #, c-format
 msgid "skipping item %d %s %s\n"
 msgstr "%d %s %s öğesi atlanıyor\n"
 
-#: pg_backup_archiver.c:3296
+#: pg_backup_archiver.c:3427
 #, c-format
 msgid "launching item %d %s %s\n"
 msgstr "%d %s %s öğesi başlatılıyor\n"
 
-#: pg_backup_archiver.c:3333
+#: pg_backup_archiver.c:3464
 #, c-format
 msgid "worker process crashed: status %d\n"
 msgstr "worker sürecii çöktü: Durum %d\n"
 
-#: pg_backup_archiver.c:3338
+#: pg_backup_archiver.c:3469
+#, c-format
 msgid "finished main parallel loop\n"
 msgstr "ana paralel döngü bitti\n"
 
-#: pg_backup_archiver.c:3356
+#: pg_backup_archiver.c:3487
 #, c-format
 msgid "processing missed item %d %s %s\n"
 msgstr "atlanan %d %s %s öğesi işleniyor\n"
 
-#: pg_backup_archiver.c:3382
+#: pg_backup_archiver.c:3513
+#, c-format
 msgid "parallel_restore should not return\n"
 msgstr "parallel_restore dönmemeli\n"
 
-#: pg_backup_archiver.c:3388
+#: pg_backup_archiver.c:3519
 #, c-format
 msgid "could not create worker process: %s\n"
 msgstr "işçi süreci yaratılamadı: %s\n"
 
-#: pg_backup_archiver.c:3396
+#: pg_backup_archiver.c:3527
 #, c-format
 msgid "could not create worker thread: %s\n"
 msgstr "işçi threadi yaratılamadı: %s\n"
 
-#: pg_backup_archiver.c:3620
+#: pg_backup_archiver.c:3751
+#, c-format
 msgid "no item ready\n"
 msgstr "hiç bir öğe hazır değil\n"
 
-#: pg_backup_archiver.c:3715
+#: pg_backup_archiver.c:3846
+#, c-format
 msgid "could not find slot of finished worker\n"
 msgstr "bitmiş sürecin yuvasu bulunamadı\n"
 
-#: pg_backup_archiver.c:3717
+#: pg_backup_archiver.c:3848
 #, c-format
 msgid "finished item %d %s %s\n"
 msgstr "%d %s %s öğesi bitirildi\n"
 
-#: pg_backup_archiver.c:3730
+#: pg_backup_archiver.c:3861
 #, c-format
 msgid "worker process failed: exit code %d\n"
 msgstr "alt süreç başarısız oldu: çıkış kodu %d\n"
 
-#: pg_backup_archiver.c:3882
+#: pg_backup_archiver.c:4057
 #, c-format
 msgid "transferring dependency %d -> %d to %d\n"
 msgstr "%d -> %d bağımlılığı %d olarak aktarılıyor\n"
 
-#: pg_backup_archiver.c:3956
+#: pg_backup_archiver.c:4126
 #, c-format
 msgid "reducing dependencies for %d\n"
 msgstr " %d için bağımlılıklar azaltılıyor\n"
 
-#: pg_backup_archiver.c:4014
+#: pg_backup_archiver.c:4175
 #, c-format
 msgid "table \"%s\" could not be created, will not restore its data\n"
 msgstr "\"%s\" tablosu oluşturulamadı, onun verileri yüklenmeyecektir\n"
 
-#: pg_backup_custom.c:97
+#: pg_backup_custom.c:87
 msgid "custom archiver"
 msgstr "özel arşiv uygulaması"
 
-#: pg_backup_custom.c:405
+#: pg_backup_custom.c:373
 #: pg_backup_null.c:153
+#, c-format
 msgid "invalid OID for large object\n"
 msgstr "large object için geçersiz OID\n"
 
-#: pg_backup_custom.c:471
+#: pg_backup_custom.c:444
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "arşivde ararken tanınmayan veri tipine (%d) rastlandı\n"
 
-#: pg_backup_custom.c:482
+#: pg_backup_custom.c:455
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "dosya içerisinde gösterge ilerleme hatası: %s\n"
 
-#: pg_backup_custom.c:492
+#: pg_backup_custom.c:465
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to lack of data offsets in archive\n"
 msgstr "arşivde %d block ID'si bulunamadı -- arşivdeki eksik veri konumu nedeniyle işlenemeyen geçersiz yükleme isteği nedeniyle olabilir\n"
 
-#: pg_backup_custom.c:497
+#: pg_backup_custom.c:470
 #, c-format
 msgid "could not find block ID %d in archive -- possibly due to out-of-order restore request, which cannot be handled due to non-seekable input file\n"
 msgstr "arşivde %d block ID'si bulunamadı -- aranamayan girdi dosyası nedeniyle işlenemeyen geçersiz yükleme isteği nedeniyle olabilir\n"
 
-#: pg_backup_custom.c:502
+#: pg_backup_custom.c:475
 #, c-format
 msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
 msgstr "%d blok ID'si arşivde bulunamadı -- arşiv bozulmuş olabilir\n"
 
-#: pg_backup_custom.c:509
+#: pg_backup_custom.c:482
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
 msgstr "veriyi okurken beklenmeyen blok ID (%d) bulundu -- beklenen: %d\n"
 
-#: pg_backup_custom.c:523
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr "arşivi yüklerken bilinmeyen veri blok tipi %d bulundu\n"
 
-#: pg_backup_custom.c:557
-#: pg_backup_custom.c:985
+#: pg_backup_custom.c:578
+#: pg_backup_custom.c:916
 #, c-format
-msgid "could not initialize compression library: %s\n"
-msgstr "sıkıştırma kütüphanesi ilklendirilemedi: %s\n"
-
-#: pg_backup_custom.c:581
-#: pg_backup_custom.c:705
 msgid "could not read from input file: end of file\n"
 msgstr "giriş dosyası okuma hatası: dosya sonu\n"
 
-#: pg_backup_custom.c:584
-#: pg_backup_custom.c:708
+#: pg_backup_custom.c:581
+#: pg_backup_custom.c:919
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "giriş dosyası okuma hatası: %s\n"
 
-#: pg_backup_custom.c:601
-#: pg_backup_custom.c:628
-#, c-format
-msgid "could not uncompress data: %s\n"
-msgstr "sıkıştırılmış veri açılamadı: %s\n"
-
-#: pg_backup_custom.c:634
-#, c-format
-msgid "could not close compression library: %s\n"
-msgstr "sıkıştırma kütüphanesi kapatılamadı: %s\n"
-
-#: pg_backup_custom.c:736
+#: pg_backup_custom.c:610
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "bayt yazılamadı: %s\n"
 
-#: pg_backup_custom.c:849
-#: pg_backup_custom.c:882
+#: pg_backup_custom.c:718
+#: pg_backup_custom.c:756
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "arşiv dosyası kapatma hatası: %s\n"
 
-#: pg_backup_custom.c:868
+#: pg_backup_custom.c:737
+#, c-format
 msgid "can only reopen input archives\n"
 msgstr "Sadece girdi arşivleri tekrar açılabilir\n"
 
-#: pg_backup_custom.c:870
-msgid "cannot reopen stdin\n"
-msgstr "stdin açılamıyor\n"
+#: pg_backup_custom.c:744
+#, c-format
+msgid "parallel restore from stdin is not supported\n"
+msgstr "Standart girdiden parallel_restore desteklenmiyor \n"
 
-#: pg_backup_custom.c:872
-msgid "cannot reopen non-seekable file\n"
-msgstr "aranamayan dosya yeniden açılamadı\n"
+#: pg_backup_custom.c:746
+#, c-format
+msgid "parallel restore from non-seekable file is not supported\n"
+msgstr "taranamayan dosyadan paralel geri yükleme desteklenmiyor\n"
 
-#: pg_backup_custom.c:877
+#: pg_backup_custom.c:751
 #, c-format
 msgid "could not determine seek position in archive file: %s\n"
 msgstr "arşiv dosyasınde arama pozisyonu belirlenemedi: %s\n"
 
-#: pg_backup_custom.c:892
+#: pg_backup_custom.c:766
 #, c-format
 msgid "could not set seek position in archive file: %s\n"
 msgstr "arşiv dosyasında arama pozisyonu ayarlanamadı: %s\n"
 
-#: pg_backup_custom.c:914
-msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
-msgstr "WARNING: ftell fonksiyonun bidirdiği pozisyonu ile beklenen pozisyon uyumsuz -- ftell kullanıldı\n"
-
-#: pg_backup_custom.c:1016
+#: pg_backup_custom.c:786
 #, c-format
-msgid "could not compress data: %s\n"
-msgstr "veri sıkıştırılamadı: %s\n"
+msgid "compressor active\n"
+msgstr "sıkıştırma etkin\n"
 
-#: pg_backup_custom.c:1094
+#: pg_backup_custom.c:822
 #, c-format
-msgid "could not close compression stream: %s\n"
-msgstr "sıkıştırma akımı kapatılamadı: %s\n"
+msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
+msgstr "WARNING: ftell fonksiyonun bidirdiği pozisyonu ile beklenen pozisyon uyumsuz -- ftell kullanıldı\n"
 
 #: pg_backup_db.c:25
 msgid "archiver (db)"
 msgstr "arÅŸivlendirici (db)"
 
-#: pg_backup_db.c:61
+#: pg_backup_db.c:54
+#, c-format
 msgid "could not get server_version from libpq\n"
 msgstr "libpq kütüphanesinden server_version alınamadı\n"
 
-#: pg_backup_db.c:74
-#: pg_dumpall.c:1718
+#: pg_backup_db.c:67
+#: pg_dumpall.c:1775
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "sunucu sürümü: %s; %s sürümü: %s\n"
 
-#: pg_backup_db.c:76
-#: pg_dumpall.c:1720
+#: pg_backup_db.c:69
+#: pg_dumpall.c:1777
 #, c-format
 msgid "aborting because of server version mismatch\n"
 msgstr "sunucu sürümü uyuşmazlığına rağmen devam ediliyor\n"
 
-#: pg_backup_db.c:147
+#: pg_backup_db.c:140
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "\"%2$s\" kullanıcısı olarak \"%1$s\" veritabanına bağlanıldı\n"
 
-#: pg_backup_db.c:152
-#: pg_backup_db.c:207
-#: pg_backup_db.c:254
-#: pg_backup_db.c:303
-#: pg_dumpall.c:1614
-#: pg_dumpall.c:1666
+#: pg_backup_db.c:145
+#: pg_backup_db.c:200
+#: pg_backup_db.c:247
+#: pg_backup_db.c:296
+#: pg_dumpall.c:1671
+#: pg_dumpall.c:1723
 msgid "Password: "
 msgstr "Åžifre: "
 
-#: pg_backup_db.c:188
+#: pg_backup_db.c:181
+#, c-format
 msgid "failed to reconnect to database\n"
 msgstr "veritabana yeniden bağlanma hatası\n"
 
-#: pg_backup_db.c:193
+#: pg_backup_db.c:186
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "%s veritabanına yeniden bağlanılamadı"
 
-#: pg_backup_db.c:209
+#: pg_backup_db.c:202
+#, c-format
 msgid "connection needs password\n"
 msgstr "bağlantı parola gerektiriyor \n"
 
-#: pg_backup_db.c:250
+#: pg_backup_db.c:243
+#, c-format
 msgid "already connected to a database\n"
 msgstr "bir veritabanına zaten bağlı\n"
 
-#: pg_backup_db.c:295
+#: pg_backup_db.c:288
+#, c-format
 msgid "failed to connect to database\n"
 msgstr "veritabanına bağlantı başarısız oldu\n"
 
-#: pg_backup_db.c:314
+#: pg_backup_db.c:307
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "\"%s\" veritabanına bağlantı başarısız oldu: %s"
 
-#: pg_backup_db.c:329
+#: pg_backup_db.c:322
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:441
+#: pg_backup_db.c:387
 #, c-format
 msgid "error returned by PQputCopyData: %s"
 msgstr "PQputCopyData'nın döndürdüğü hata: %s"
 
-#: pg_backup_db.c:451
+#: pg_backup_db.c:397
+#: pg_backup_db.c:406
+msgid "could not execute query"
+msgstr "sorgu çalıştırılamadı"
+
+#: pg_backup_db.c:425
 #, c-format
 msgid "error returned by PQputCopyEnd: %s"
 msgstr "PQputCopyEnd'in döndürdüğü hata: %s"
 
-#: pg_backup_db.c:498
-msgid "could not execute query"
-msgstr "sorgu çalıştırılamadı"
-
-#: pg_backup_db.c:696
+#: pg_backup_db.c:442
 msgid "could not start database transaction"
 msgstr ";veritabanı transaction'u başlatılamadı"
 
-#: pg_backup_db.c:702
+#: pg_backup_db.c:448
 msgid "could not commit database transaction"
 msgstr "Veritabanı transaction'u commit edilemedi"
 
@@ -1516,6 +1634,7 @@ msgid "file archiver"
 msgstr "dosya arÅŸivleyicisi"
 
 #: pg_backup_files.c:122
+#, c-format
 msgid ""
 "WARNING:\n"
 "  This format is for demonstration purposes; it is not intended for\n"
@@ -1526,10 +1645,12 @@ msgstr ""
 "  denenmemelidir. Dosyalar mecvut çalışma dizinine yazılacaktır.\n"
 
 #: pg_backup_files.c:283
+#, c-format
 msgid "could not close data file\n"
 msgstr "veri dosyası kapatılamadı\n"
 
 #: pg_backup_files.c:317
+#, c-format
 msgid "could not close data file after reading\n"
 msgstr "veri dosyası okunduktan sonra kapatılamadı\n"
 
@@ -1545,6 +1666,7 @@ msgid "could not close large object TOC file: %s\n"
 msgstr "large object TOC dosyası kapatılamadı: %s\n"
 
 #: pg_backup_files.c:404
+#, c-format
 msgid "could not write byte\n"
 msgstr "byte yazılamadı\n"
 
@@ -1554,7 +1676,7 @@ msgid "could not open large object TOC for output: %s\n"
 msgstr "çıktı için large object TOC açılamadı: %s\n"
 
 #: pg_backup_files.c:510
-#: pg_backup_tar.c:935
+#: pg_backup_tar.c:939
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "(%u) large objecti için geçersiz OID\n"
@@ -1565,170 +1687,179 @@ msgid "could not open large object file \"%s\" for input: %s\n"
 msgstr "girdi için \"%s\" large object dosyası açılamadı: %s\n"
 
 #: pg_backup_files.c:544
+#, c-format
 msgid "could not close large object file\n"
 msgstr "large object dosyası kapatılamadı\n"
 
 #: pg_backup_null.c:78
+#, c-format
 msgid "this format cannot be read\n"
 msgstr "bu biçim okunamıyor\n"
 
-#: pg_backup_tar.c:101
+#: pg_backup_tar.c:105
 msgid "tar archiver"
 msgstr "tar arÅŸivleyicisi"
 
-#: pg_backup_tar.c:179
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file \"%s\" for output: %s\n"
 msgstr "çıktı için \"%s\" TOC dosyası açılamadı: %s\n"
 
-#: pg_backup_tar.c:187
+#: pg_backup_tar.c:191
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "çıktı için TOC dosyası açılamadı: %s\n"
 
-#: pg_backup_tar.c:214
-#: pg_backup_tar.c:370
+#: pg_backup_tar.c:218
+#: pg_backup_tar.c:374
+#, c-format
 msgid "compression is not supported by tar archive format\n"
 msgstr "sıkıştırma, tar çıktı formatı tarafından desteklenmiyor\n"
 
-#: pg_backup_tar.c:222
+#: pg_backup_tar.c:226
 #, c-format
 msgid "could not open TOC file \"%s\" for input: %s\n"
 msgstr "\"%s\" TOC dosyası girdi için açılamadı: %s\n"
 
-#: pg_backup_tar.c:229
+#: pg_backup_tar.c:233
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "girdi için TOC dosyası açılamadı: %s\n"
 
-#: pg_backup_tar.c:356
+#: pg_backup_tar.c:360
 #, c-format
 msgid "could not find file \"%s\" in archive\n"
 msgstr "\"%s\" dosyası arşivde bulunamadı\n"
 
-#: pg_backup_tar.c:412
+#: pg_backup_tar.c:416
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "geçici dosya adı oluşturulamadı: %s\n"
 
-#: pg_backup_tar.c:421
+#: pg_backup_tar.c:425
+#, c-format
 msgid "could not open temporary file\n"
 msgstr "geçici dosya açılamadı \n"
 
-#: pg_backup_tar.c:448
+#: pg_backup_tar.c:452
+#, c-format
 msgid "could not close tar member\n"
 msgstr "tar öğesi kapatılamadı\n"
 
-#: pg_backup_tar.c:548
+#: pg_backup_tar.c:552
+#, c-format
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "iç hata - th ya da fh, tarReadRaw() içinde belirtilmedi\n"
 
-#: pg_backup_tar.c:674
+#: pg_backup_tar.c:678
 #, c-format
 msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
 msgstr "geçersiz COPY komutu -- \"%s\" satırında \"copy\" bulunamadı\n"
 
-#: pg_backup_tar.c:692
+#: pg_backup_tar.c:696
 #, c-format
 msgid "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" starting at position %lu\n"
 msgstr "geçersiz COPY komutu -- \"%s\" satırında %lu pozisyonunda \"from stdin\" bulunamadı\n"
 
-#: pg_backup_tar.c:729
+#: pg_backup_tar.c:733
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "large-object %u geri yükleniyor\n"
 
-#: pg_backup_tar.c:880
+#: pg_backup_tar.c:884
+#, c-format
 msgid "could not write null block at end of tar archive\n"
 msgstr "arşivin sonunda null blok yazılamadı\n"
 
-#: pg_backup_tar.c:1080
+#: pg_backup_tar.c:1084
+#, c-format
 msgid "archive member too large for tar format\n"
 msgstr "tar biçimi için arşiv öğesi çok büyük\n"
 
-#: pg_backup_tar.c:1095
+#: pg_backup_tar.c:1099
 #, c-format
 msgid "could not close temporary file: %s\n"
 msgstr "geçici dosya kapatma hatası: %s\n"
 
-#: pg_backup_tar.c:1105
+#: pg_backup_tar.c:1109
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "gerçek dosya uzunluğu (%s) beklenen uzunluğu (%s) ile uyuşmamaktadır\n"
 
-#: pg_backup_tar.c:1113
+#: pg_backup_tar.c:1117
+#, c-format
 msgid "could not output padding at end of tar member\n"
 msgstr "tar öğesinin arkasına doldurma alanı eklenemedi\n"
 
-#: pg_backup_tar.c:1142
+#: pg_backup_tar.c:1146
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "dosya içerisinde %s yerinden bir sonraki %s yerine geçiş yapılamıyor\n"
 
-#: pg_backup_tar.c:1153
+#: pg_backup_tar.c:1157
 #, c-format
 msgid "now at file position %s\n"
 msgstr "şu an dosyanın %s yerinde\n"
 
-#: pg_backup_tar.c:1162
-#: pg_backup_tar.c:1192
+#: pg_backup_tar.c:1166
+#: pg_backup_tar.c:1196
 #, c-format
 msgid "could not find header for file \"%s\" in tar archive\n"
 msgstr "tar arşivinde \"%s\" dosyası için başlık bulunamadı\n"
 
-#: pg_backup_tar.c:1176
+#: pg_backup_tar.c:1180
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "%s tar öğesi atlandı\n"
 
-#: pg_backup_tar.c:1180
+#: pg_backup_tar.c:1184
 #, c-format
 msgid "restoring data out of order is not supported in this archive format: \"%s\" is required, but comes before \"%s\" in the archive file.\n"
 msgstr "bu arşiv biçinide sıra dışı veri geri yüklemesi desteklenmemektedir: \"%s\" bekleniyor ancak arşiv dosyasında %s ondan önce gelmektedir.\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1230
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr "gerçek ile beklenilen dosya pozisyonunda uyumsuzluk (%s ile %s)\n"
 
-#: pg_backup_tar.c:1241
+#: pg_backup_tar.c:1245
 #, c-format
 msgid "incomplete tar header found (%lu byte)\n"
 msgid_plural "incomplete tar header found (%lu bytes)\n"
 msgstr[0] "Eksik tar başlığı bulundu (%lu byte)\n"
 msgstr[1] "Eksik tar başlığı bulundu (%lu byte)\n"
 
-#: pg_backup_tar.c:1279
+#: pg_backup_tar.c:1283
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "%2$s adresinde %1$s TOC GiriÅŸi (uzunluk %3$lu, checksum %4$d)\n"
 
-#: pg_backup_tar.c:1289
+#: pg_backup_tar.c:1293
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr "%s dosyasında bozuk tar başlığı (beklenen: %d, hesaplanan: %d) dosya pozisyonu %s\n"
 
-#: pg_restore.c:319
+#: pg_restore.c:300
 #, c-format
 msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
 msgstr "%s: -d/--dbname ve -f/--file seçenekleri birarada kullanılamazlar\n"
 
-#: pg_restore.c:331
+#: pg_restore.c:312
 #, c-format
 msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
 msgstr "%s: --single-transaction ve çoklu işi aynı anda belirtemezsiniz\n"
 
-#: pg_restore.c:361
+#: pg_restore.c:348
 #, c-format
-msgid "unrecognized archive format \"%s\"; please specify \"c\" or \"t\"\n"
-msgstr "'%s' arşiv biçimi tanınmadı; lütfen \"t\" veya \"c\" belirtin\n"
+msgid "unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
+msgstr "tanımlanamayan arşiv formatı \"%s\"; lütfen \"c\", \"d\", ya da \"t\" seçeneklerinden birisini belirtiniz.\n"
 
-#: pg_restore.c:395
+#: pg_restore.c:382
 #, c-format
 msgid "WARNING: errors ignored on restore: %d\n"
 msgstr "UYARI: yükleme sırasında hata es geçildi: %d\n"
 
-#: pg_restore.c:409
+#: pg_restore.c:396
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1737,47 +1868,47 @@ msgstr ""
 "%s, pg_dump tarafından oluşturulan PostgreSQL arşivinden veritabanı geri yükleniyor.\n"
 "\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:398
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [SEÇENEK]... [DOSYA]\n"
 
-#: pg_restore.c:414
+#: pg_restore.c:401
 #, c-format
 msgid "  -d, --dbname=NAME        connect to database name\n"
 msgstr "  -d, --dbname=NAME        bağlanacak veritabanının adı\n"
 
-#: pg_restore.c:415
+#: pg_restore.c:402
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=DOSYA_ADI      çıktı dosya adı\n"
 
-#: pg_restore.c:416
+#: pg_restore.c:403
 #, c-format
-msgid "  -F, --format=c|t         backup file format (should be automatic)\n"
-msgstr "  -F, --format=c|t         yedek dosya biçimi (otomatik olmalı)\n"
+msgid "  -F, --format=c|d|t       backup file format (should be automatic)\n"
+msgstr "  -F, --format=c|d|t       yedek dosya biçimi (otomatik olmalı)\n"
 
-#: pg_restore.c:417
+#: pg_restore.c:404
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               arşivin kısa içeriğini yaz\n"
 
-#: pg_restore.c:418
+#: pg_restore.c:405
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            verbose modu\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:406
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   bu yardımı gösterir ve çıkar\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:407
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                sürüm bilgisini gösterir ve çıkar\n"
 
-#: pg_restore.c:422
+#: pg_restore.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1786,37 +1917,37 @@ msgstr ""
 "\n"
 "Geri güklemeyi kontrol eden seçenekler:\n"
 
-#: pg_restore.c:423
+#: pg_restore.c:410
 #, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -s, --schema-only        sadece şemayı aktar, veriyi aktarma\n"
 
-#: pg_restore.c:424
+#: pg_restore.c:411
 #, c-format
 msgid "  -c, --clean              clean (drop) database objects before recreating\n"
 msgstr "  -c, --clean              veritabanı nesnelerini yeniden yaratmadan önce onları kaldır (sil)\n"
 
-#: pg_restore.c:425
+#: pg_restore.c:412
 #, c-format
 msgid "  -C, --create             create the target database\n"
 msgstr "  -C, --create             hedef veritabanını oluştur\n"
 
-#: pg_restore.c:426
+#: pg_restore.c:413
 #, c-format
 msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
 msgstr "  -e, --exit-on-error      hata durumunda çık, varsayılan seçenek ise devam et\n"
 
-#: pg_restore.c:427
+#: pg_restore.c:414
 #, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=NAME         adı geçen indexi de yükle\n"
 
-#: pg_restore.c:428
+#: pg_restore.c:415
 #, c-format
 msgid "  -j, --jobs=NUM           use this many parallel jobs to restore\n"
 msgstr "  -j, --jobs=SAYI           gerü yükleme için belirtilen sayı kadar paralel süreç kullan\n"
 
-#: pg_restore.c:429
+#: pg_restore.c:416
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use table of contents from this file for\n"
@@ -1825,17 +1956,17 @@ msgstr ""
 "  -L, --use-list=DOSYA ADI  çıktıyı seçmek/sıralamak için\n"
 "                           bu dosyadaki içindekiler tablosunu kullan\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:418
 #, c-format
 msgid "  -n, --schema=NAME        restore only objects in this schema\n"
 msgstr "  -s, --schema=NAME        sadece bu şemaya ait nesneleri yükle\n"
 
-#: pg_restore.c:432
+#: pg_restore.c:419
 #, c-format
 msgid "  -O, --no-owner           skip restoration of object ownership\n"
 msgstr "  -O, --no-owner           nesne sahipliğini ayarlayan komutlarının oluşturmasını engelle\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:420
 #, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
@@ -1844,37 +1975,46 @@ msgstr ""
 "  -P, --function=NAME(args)\n"
 "                           adı geçen fonksiyonu geri yükle\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:422
 #, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr "  -s, --schema-only        sadece şemayı yükle, veriyi yükleme\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:423
 #, c-format
 msgid "  -S, --superuser=NAME     superuser user name to use for disabling triggers\n"
 msgstr "  -S, --superuser=NAME     Triggerları devre dışı bırakmak için kullanılacak kullanıcı adı\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:424
 #, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAME         adı geçen tabloyu yükle\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:425
 #, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAME         adı geçen triggeri de yükle\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:426
 #, c-format
 msgid "  -x, --no-privileges      skip restoration of access privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      erişim haklarının yüklemesini engelle (grant/revoke)\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:427
+#, c-format
+msgid ""
+"  -1, --single-transaction\n"
+"                           restore as a single transaction\n"
+msgstr ""
+"  -1, --single-transaction\n"
+"                           tek bir transaction olarak geri yükle\n"
+
+#: pg_restore.c:429
 #, c-format
 msgid "  --disable-triggers       disable triggers during data-only restore\n"
 msgstr "  --disable-triggers       sadece veri geri yüklemede tetikleyicileri devre dışı bırak\n"
 
-#: pg_restore.c:441
+#: pg_restore.c:430
 #, c-format
 msgid ""
 "  --no-data-for-failed-tables\n"
@@ -1885,17 +2025,17 @@ msgstr ""
 "                           oluşturulamayan tabloların verilerileri yüklemeyi\n"
 "                           engelle\n"
 
-#: pg_restore.c:444
+#: pg_restore.c:433
 #, c-format
-msgid "  --no-tablespaces         do not restore tablespace assignments\n"
-msgstr "  --no-tablespaces         tablespace atamalarını geri yükleme\n"
+msgid "  --no-security-labels     do not restore security labels\n"
+msgstr "  --no-security-labels     güvenlik etiketleri geri yüklenmesin\n"
 
-#: pg_restore.c:445
+#: pg_restore.c:434
 #, c-format
-msgid "  --role=ROLENAME          do SET ROLE before restore\n"
-msgstr "  --role=ROL ADI          geri yüklemeden önce SET ROLE işlemini gerçekleştir\n"
+msgid "  --no-tablespaces         do not restore tablespace assignments\n"
+msgstr "  --no-tablespaces         tablespace atamalarını geri yükleme\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:435
 #, c-format
 msgid ""
 "  --use-set-session-authorization\n"
@@ -1906,16 +2046,12 @@ msgstr ""
 "                           Sahipliği ayarlamak için ALTER OWNER komutunun yerine\n"
 "                              SET SESSION AUTHORIZATION komutunu kullan\n"
 
-#: pg_restore.c:449
+#: pg_restore.c:445
 #, c-format
-msgid ""
-"  -1, --single-transaction\n"
-"                           restore as a single transaction\n"
-msgstr ""
-"  -1, --single-transaction\n"
-"                           tek bir transaction olarak geri yükle\n"
+msgid "  --role=ROLENAME          do SET ROLE before restore\n"
+msgstr "  --role=ROL ADI          geri yüklemeden önce SET ROLE işlemini gerçekleştir\n"
 
-#: pg_restore.c:459
+#: pg_restore.c:447
 #, c-format
 msgid ""
 "\n"
@@ -1926,7 +2062,7 @@ msgstr ""
 "Eğer giriş dosya adı verilmemişse, standart giriş akımı (stdin) kulanılacaktır.\n"
 "\n"
 
-#: pg_dumpall.c:167
+#: pg_dumpall.c:174
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -1937,7 +2073,7 @@ msgstr ""
 "\"%s\" ile aynı dizinde bulunamadı.\n"
 "Kurulumunuzu kontrol edin.\n"
 
-#: pg_dumpall.c:174
+#: pg_dumpall.c:181
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by \"%s\"\n"
@@ -1948,28 +2084,28 @@ msgstr ""
 "ancak %s ile aynı sürüm değildir.\n"
 "Kurulumunuzu kontrol edin.\n"
 
-#: pg_dumpall.c:331
+#: pg_dumpall.c:317
 #, c-format
 msgid "%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
 msgstr "%s: -g/--globals-only ve -r/--roles-only seçenekleri beraber kullanılamaz\n"
 
-#: pg_dumpall.c:340
+#: pg_dumpall.c:326
 #, c-format
 msgid "%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: -g/--globals-only ve -t/--tablespaces-only seçenejleri beraber kullanılamaz\n"
 
-#: pg_dumpall.c:349
+#: pg_dumpall.c:335
 #, c-format
 msgid "%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"
 msgstr "%s: -r/--roles-only ve -t/--tablespaces-only seçenekleri birlikte kullanılamaz\n"
 
-#: pg_dumpall.c:385
-#: pg_dumpall.c:1655
+#: pg_dumpall.c:377
+#: pg_dumpall.c:1712
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: \"%s\" veritabanına bağlanılamadı\n"
 
-#: pg_dumpall.c:400
+#: pg_dumpall.c:392
 #, c-format
 msgid ""
 "%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -1978,12 +2114,12 @@ msgstr ""
 "%s: \"postgres\" veya \"template1\" veritabanına bağlanılamadı\n"
 "Lütfen alternatif bir veritabanı belirtin\n"
 
-#: pg_dumpall.c:417
+#: pg_dumpall.c:409
 #, c-format
 msgid "%s: could not open the output file \"%s\": %s\n"
 msgstr "%s: \"%s\" çıktı dosyası açılamadı: %s\n"
 
-#: pg_dumpall.c:535
+#: pg_dumpall.c:531
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -1992,47 +2128,52 @@ msgstr ""
 "%s, PostgreSQL veritabanı clusteri SQL betik dosyasına aktarıyor.\n"
 "\n"
 
-#: pg_dumpall.c:537
+#: pg_dumpall.c:533
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [SEÇENEK]...\n"
 
-#: pg_dumpall.c:546
+#: pg_dumpall.c:536
+#, c-format
+msgid "  -f, --file=FILENAME         output file name\n"
+msgstr "  -f, --file=DOSYA ADI         çıktı dosya adı\n"
+
+#: pg_dumpall.c:542
 #, c-format
 msgid "  -c, --clean                 clean (drop) databases before recreating\n"
 msgstr "  -c, --clean                 yeniden yaratmadan  önce veritabanını temizle (kaldır)\n"
 
-#: pg_dumpall.c:547
+#: pg_dumpall.c:543
 #, c-format
 msgid "  -g, --globals-only          dump only global objects, no databases\n"
 msgstr "  -g, --globals-only          Sadece global nesneleri yedekle, veritabanlarını yedekleme\n"
 
-#: pg_dumpall.c:549
+#: pg_dumpall.c:545
 #, c-format
 msgid "  -O, --no-owner              skip restoration of object ownership\n"
 msgstr "  -O, --no-owner              veri sahipliği ile ilgili bilgileri yükleme\n"
 
-#: pg_dumpall.c:550
+#: pg_dumpall.c:546
 #, c-format
 msgid "  -r, --roles-only            dump only roles, no databases or tablespaces\n"
 msgstr "  -r, --roles-only            sadece rolleri yedekle, veritabanlarını ya da tablespaceleri yedekleme\n"
 
-#: pg_dumpall.c:552
+#: pg_dumpall.c:548
 #, c-format
 msgid "  -S, --superuser=NAME        superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=AD       yedeklerde kullanılacak superuser kullanıcı adı\n"
 
-#: pg_dumpall.c:553
+#: pg_dumpall.c:549
 #, c-format
 msgid "  -t, --tablespaces-only      dump only tablespaces, no databases or roles\n"
 msgstr "  -t, --tablespaces-only      sadece tablespaceleri yedekle, veritabanlarını ya da rolleri yedekleme\n"
 
-#: pg_dumpall.c:568
+#: pg_dumpall.c:566
 #, c-format
 msgid "  -l, --database=DBNAME    alternative default database\n"
 msgstr "  -l, --database=VERİTABANI ADI    varsayılan alternatif veritabanı\n"
 
-#: pg_dumpall.c:574
+#: pg_dumpall.c:573
 #, c-format
 msgid ""
 "\n"
@@ -2045,75 +2186,75 @@ msgstr ""
 "yazılacaktır.\n"
 "\n"
 
-#: pg_dumpall.c:1018
+#: pg_dumpall.c:1049
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr "%1$s: \"%3$s\" tablespace için ACL (%2$s) listesi ayrıştırılamadı\n"
 
-#: pg_dumpall.c:1318
+#: pg_dumpall.c:1353
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%1$s: \"%3$s\" veritabanı için ACL (%2$s) listesi ayrıştırılamadı\n"
 
-#: pg_dumpall.c:1525
+#: pg_dumpall.c:1560
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: \"%s\" veritabanı aktarılıyor...\n"
 
-#: pg_dumpall.c:1535
+#: pg_dumpall.c:1570
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: pg_dump \"%s\" veritabanında başarısız oldu, çıkılıyor\n"
 
-#: pg_dumpall.c:1544
+#: pg_dumpall.c:1579
 #, c-format
 msgid "%s: could not re-open the output file \"%s\": %s\n"
 msgstr "%s: \"%s\" çıktı dosyası yeniden açılamadı: %s\n"
 
-#: pg_dumpall.c:1583
+#: pg_dumpall.c:1618
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: \"%s\" yürütülüyor\n"
 
-#: pg_dumpall.c:1628
+#: pg_dumpall.c:1685
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: yetersiz bellek\n"
 
-#: pg_dumpall.c:1677
+#: pg_dumpall.c:1734
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: \"%s\" veritabanına bağlanılamadı: %s\n"
 
-#: pg_dumpall.c:1691
+#: pg_dumpall.c:1748
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: sunucu sürüm bilgisi alınamadı\n"
 
-#: pg_dumpall.c:1697
+#: pg_dumpall.c:1754
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: \"%s\" sürüm bilgisi ayrıştırılamadı\n"
 
-#: pg_dumpall.c:1705
+#: pg_dumpall.c:1762
 #, c-format
 msgid "%s: could not parse version \"%s\"\n"
 msgstr "%s: \"%s\" sürüm bilgisi ayrıştırılamadı\n"
 
-#: pg_dumpall.c:1744
-#: pg_dumpall.c:1770
+#: pg_dumpall.c:1801
+#: pg_dumpall.c:1827
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: %s yürütülüyor\n"
 
-#: pg_dumpall.c:1750
-#: pg_dumpall.c:1776
+#: pg_dumpall.c:1807
+#: pg_dumpall.c:1833
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: sorgu başarısız oldu: %s"
 
-#: pg_dumpall.c:1752
-#: pg_dumpall.c:1778
+#: pg_dumpall.c:1809
+#: pg_dumpall.c:1835
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: sorgu ÅŸu idi: %s\n"
@@ -2151,31 +2292,58 @@ msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
 msgid "could not read symbolic link \"%s\""
 msgstr "symbolic link \"%s\" okuma hatası"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
 
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s: geçersiz -X seçeneği -- %s\n"
+
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "sorgu hiçbir satır döndürmedi: %s\n"
+
+#~ msgid "could not initialize compression library: %s\n"
+#~ msgstr "sıkıştırma kütüphanesi ilklendirilemedi: %s\n"
+
+#~ msgid "could not uncompress data: %s\n"
+#~ msgstr "sıkıştırılmış veri açılamadı: %s\n"
+
+#~ msgid "could not close compression library: %s\n"
+#~ msgstr "sıkıştırma kütüphanesi kapatılamadı: %s\n"
+
+#~ msgid "cannot reopen stdin\n"
+#~ msgstr "stdin açılamıyor\n"
+
+#~ msgid "cannot reopen non-seekable file\n"
+#~ msgstr "aranamayan dosya yeniden açılamadı\n"
+
+#~ msgid "could not compress data: %s\n"
+#~ msgstr "veri sıkıştırılamadı: %s\n"
+
+#~ msgid "could not close compression stream: %s\n"
+#~ msgstr "sıkıştırma akımı kapatılamadı: %s\n"
+
 #~ msgid "dumpBlobs(): could not open large object: %s"
 #~ msgstr "dumpBlobs(): large object açılamadı: %s"
 
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index e4c44e1855f13..7f80e0be1cc95 100644
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_resetxlog/nls.mk
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko pl pt_BR ro ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_resetxlog/po/cs.po b/src/bin/pg_resetxlog/po/cs.po
new file mode 100644
index 0000000000000..6d11b92bf99a4
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/cs.po
@@ -0,0 +1,481 @@
+# translation of pg_resetxlog-cs.po to Czech
+# Czech translation of pg_resetxlog messages
+#
+# pgtranslation Id: pg_resetxlog.po,v 1.3 2011/09/03 14:06:12 petere Exp $
+#
+# Karel Zak <zakkr@zf.jcu.cz>, 2003, 2004, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_resetxlog-cs\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-27 21:06+0000\n"
+"PO-Revision-Date: 2011-08-30 12:37+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pg_resetxlog.c:135
+#, c-format
+msgid "%s: invalid argument for option -e\n"
+msgstr "%s: neplatný argument pro volbu -x\n"
+
+#: pg_resetxlog.c:136 pg_resetxlog.c:151 pg_resetxlog.c:166 pg_resetxlog.c:181
+#: pg_resetxlog.c:196 pg_resetxlog.c:211 pg_resetxlog.c:218 pg_resetxlog.c:225
+#: pg_resetxlog.c:231 pg_resetxlog.c:239
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID epoch (-e) must not be -1\n"
+msgstr "%s: ID transakce (-x) nesmí být 0\n"
+
+#: pg_resetxlog.c:150
+#, c-format
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: neplatný argument pro volbu -x\n"
+
+#: pg_resetxlog.c:156
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ID transakce (-x) nesmí být 0\n"
+
+#: pg_resetxlog.c:165
+#, c-format
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: neplatný argument pro volbu -o\n"
+
+#: pg_resetxlog.c:171
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) nesmí být 0\n"
+
+#: pg_resetxlog.c:180
+#, c-format
+msgid "%s: invalid argument for option -m\n"
+msgstr "%s: neplatný argument pro volbu -x\n"
+
+#: pg_resetxlog.c:186
+#, c-format
+msgid "%s: multitransaction ID (-m) must not be 0\n"
+msgstr "%s: ID transakce (-x) nesmí být 0\n"
+
+#: pg_resetxlog.c:195
+#, c-format
+msgid "%s: invalid argument for option -O\n"
+msgstr "%s: neplatný argument pro volbu -x\n"
+
+#: pg_resetxlog.c:201
+#, c-format
+msgid "%s: multitransaction offset (-O) must not be -1\n"
+msgstr "%s: ID transakce (-x) nesmí být 0\n"
+
+#: pg_resetxlog.c:210 pg_resetxlog.c:217 pg_resetxlog.c:224
+#, c-format
+msgid "%s: invalid argument for option -l\n"
+msgstr "%s: neplatný argument pro volbu -l\n"
+
+#: pg_resetxlog.c:238
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: není specifikován datový adresář\n"
+
+#: pg_resetxlog.c:252
+#, c-format
+msgid "%s: cannot be executed by \"root\"\n"
+msgstr "%s: nemůže být spuštěn uživatelem \"root\"\n"
+
+#: pg_resetxlog.c:254
+#, c-format
+msgid "You must run %s as the PostgreSQL superuser.\n"
+msgstr "Musíte spustit %s jako PostgreSQL superuživatel.\n"
+
+#: pg_resetxlog.c:264
+#, c-format
+msgid "%s: could not change directory to \"%s\": %s\n"
+msgstr "%s: nelze změnit adresář na \"%s\": %s\n"
+
+#: pg_resetxlog.c:279 pg_resetxlog.c:407
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nelze otevřít soubor \"%s\" pro �tení: %s\n"
+
+#: pg_resetxlog.c:285
+#, c-format
+msgid ""
+"%s: lock file \"%s\" exists\n"
+"Is a server running?  If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: soubor se zámkem \"%s\" existuje\n"
+"Neběží již server?  Jestliže ne, smažte soubor se zámkem a zkuste to znova.\n"
+
+#: pg_resetxlog.c:355
+#, c-format
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Jestliže tyto hodnoty vypadají akceptovatelně, použijte -f pro vynucený "
+"reset.\n"
+
+#: pg_resetxlog.c:367
+#, c-format
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log might cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"Databázový server nebyl ukon�en standardně.\n"
+"Resetování transak�ního logu může způsobit ztrátu dat.\n"
+"Jestliže i přesto chcete pokra�ovat, použijte -f pro vynucený reset.\n"
+
+#: pg_resetxlog.c:381
+#, c-format
+msgid "Transaction log reset\n"
+msgstr "Transak�ní log resetován\n"
+
+#: pg_resetxlog.c:410
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, execute\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Máte-li jistotu, že je cesta k datovému adresáři správná, prove�te\n"
+"  touch %s\n"
+"a zkuste to znovu.\n"
+
+#: pg_resetxlog.c:423
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nelze �íst soubor \"%s\": %s\n"
+
+#: pg_resetxlog.c:446
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr ""
+"%s: pg_control existuje, ale s neplatným kontrolním sou�tem CRC; postupujte "
+"opatrnÄ›\n"
+
+#: pg_resetxlog.c:455
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr ""
+"%s: pg_control existuje, ale je poškozen nebo neznámé verze; ignoruji to\n"
+
+#: pg_resetxlog.c:549
+#, c-format
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"Odhadnuté hodnoty pg_controlu:\n"
+"\n"
+
+#: pg_resetxlog.c:551
+#, c-format
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"Hodnoty pg_controlu:\n"
+"\n"
+
+#: pg_resetxlog.c:560
+#, c-format
+msgid "First log file ID after reset:        %u\n"
+msgstr "První ID log souboru po resetu:       %u\n"
+
+#: pg_resetxlog.c:562
+#, c-format
+msgid "First log file segment after reset:   %u\n"
+msgstr "První segment log souboru po resetu:  %u\n"
+
+#: pg_resetxlog.c:564
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "Číslo verze pg_controlu:              %u\n"
+
+#: pg_resetxlog.c:566
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Číslo verze katalogu:                 %u\n"
+
+#: pg_resetxlog.c:568
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identifikátor databázového systému:   %s\n"
+
+#: pg_resetxlog.c:570
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "TimeLineID posledního checkpointu: %u\n"
+
+#: pg_resetxlog.c:572
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u/%u\n"
+msgstr "NextXID posledního checkpointu:  %u/%u\n"
+
+#: pg_resetxlog.c:575
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "NextOID posledního checkpointu:  %u\n"
+
+#: pg_resetxlog.c:577
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId:  %u\n"
+msgstr "NextMultiXactId posledního checkpointu:  %u\n"
+
+#: pg_resetxlog.c:579
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset:  %u\n"
+msgstr "NextMultiOffset posledního checkpointu:  %u\n"
+
+#: pg_resetxlog.c:581
+#, c-format
+msgid "Latest checkpoint's oldestXID:        %u\n"
+msgstr "oldestXID posledního checkpointu:  %u\n"
+
+#: pg_resetxlog.c:583
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB:   %u\n"
+msgstr ""
+
+#: pg_resetxlog.c:585
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID:  %u\n"
+msgstr "oldestActiveXID posledního checkpointu:  %u\n"
+
+#: pg_resetxlog.c:587
+#, c-format
+msgid "Maximum data alignment:               %u\n"
+msgstr "Maximální zarovnání dat:               %u\n"
+
+#: pg_resetxlog.c:590
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Velikost databázového bloku:                  %u\n"
+
+#: pg_resetxlog.c:592
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Bloků v segmentu velké relace: %u\n"
+
+#: pg_resetxlog.c:594
+#, c-format
+msgid "WAL block size:                       %u\n"
+msgstr "Velikost WAL bloku:                   %u\n"
+
+#: pg_resetxlog.c:596
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Bytů ve WAL segmentu:                 %u\n"
+
+#: pg_resetxlog.c:598
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maximální délka identifikátorů:        %u\n"
+
+#: pg_resetxlog.c:600
+#, c-format
+msgid "Maximum columns in an index:          %u\n"
+msgstr "Maximální po�et sloupců v indexu:      %u\n"
+
+#: pg_resetxlog.c:602
+#, c-format
+msgid "Maximum size of a TOAST chunk:        %u\n"
+msgstr "Maximální velikost TOAST úseku:       %u\n"
+
+#: pg_resetxlog.c:604
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Způsob uložení typu date/time:               %s\n"
+
+#: pg_resetxlog.c:605
+msgid "64-bit integers"
+msgstr "64-bitová celá �ísla"
+
+#: pg_resetxlog.c:605
+msgid "floating-point numbers"
+msgstr "�ísla s plovoucí �árkou"
+
+#: pg_resetxlog.c:606
+#, c-format
+msgid "Float4 argument passing:              %s\n"
+msgstr "Způsob předávání float4 hodnot:        %s\n"
+
+#: pg_resetxlog.c:607 pg_resetxlog.c:609
+msgid "by value"
+msgstr "hodnotou"
+
+#: pg_resetxlog.c:607 pg_resetxlog.c:609
+msgid "by reference"
+msgstr "odkazem"
+
+#: pg_resetxlog.c:608
+#, c-format
+msgid "Float8 argument passing:              %s\n"
+msgstr "Způsob předávání float8 hodnot:        %s\n"
+
+#: pg_resetxlog.c:671
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
+"PG_CONTROL_SIZE\n"
+msgstr ""
+"%s: interní chyba -- sizeof(ControlFileData) je příliš velký ... opravte "
+"PG_CONTROL_SIZE\n"
+
+#: pg_resetxlog.c:686
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: nelze vytvořit pg_control soubor: %s\n"
+
+#: pg_resetxlog.c:697
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: nelze zapsat pg_control soubor: %s\n"
+
+#: pg_resetxlog.c:704 pg_resetxlog.c:1011
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync chyba: %s\n"
+
+#: pg_resetxlog.c:742 pg_resetxlog.c:817 pg_resetxlog.c:873
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: nelze otevřít adresář \"%s\": %s\n"
+
+#: pg_resetxlog.c:786 pg_resetxlog.c:850 pg_resetxlog.c:907
+#, c-format
+msgid "%s: could not read from directory \"%s\": %s\n"
+msgstr "%s: nelze �íst z adresáře \"%s\": %s\n"
+
+#: pg_resetxlog.c:831 pg_resetxlog.c:888
+#, c-format
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s: nelze smazat soubor \"%s\": %s\n"
+
+#: pg_resetxlog.c:978
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: nelze otevřít soubor \"%s\": %s\n"
+
+#: pg_resetxlog.c:989 pg_resetxlog.c:1003
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
+
+#: pg_resetxlog.c:1022
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s resetuje PostgreSQL transak�ní log.\n"
+"\n"
+
+#: pg_resetxlog.c:1023
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]... DATADIR\n"
+"\n"
+msgstr ""
+"Použití:\n"
+"  %s [VOLBA]... ADRES�Ř\n"
+"\n"
+
+#: pg_resetxlog.c:1024
+#, c-format
+msgid "Options:\n"
+msgstr "Volby:\n"
+
+#: pg_resetxlog.c:1025
+#, c-format
+msgid "  -e XIDEPOCH     set next transaction ID epoch\n"
+msgstr "  -x XID          nastaví následující ID transakce\n"
+
+#: pg_resetxlog.c:1026
+#, c-format
+msgid "  -f              force update to be done\n"
+msgstr "  -f              provede vynucený update\n"
+
+#: pg_resetxlog.c:1027
+#, c-format
+msgid ""
+"  -l TLI,FILE,SEG force minimum WAL starting location for new transaction "
+"log\n"
+msgstr ""
+"  -l FILEID,SEG   vynutí minimální po�áte�ní WAL pozici pro novou transak�ní "
+"log\n"
+
+#: pg_resetxlog.c:1028
+#, c-format
+msgid "  -m XID          set next multitransaction ID\n"
+msgstr "  -m XID          nastaví ID následující multitransakce\n"
+
+#: pg_resetxlog.c:1029
+#, c-format
+msgid ""
+"  -n              no update, just show extracted control values (for "
+"testing)\n"
+msgstr ""
+"  -n              bez změny, jen ukáže získané kontrolní hodnoty (pro "
+"testování)\n"
+
+#: pg_resetxlog.c:1030
+#, c-format
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID          nastaví následující OID\n"
+
+#: pg_resetxlog.c:1031
+#, c-format
+msgid "  -O OFFSET       set next multitransaction offset\n"
+msgstr "  -O OFFSET       nastaví offset následující multitransakce\n"
+
+#: pg_resetxlog.c:1032
+#, c-format
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          nastaví následující ID transakce\n"
+
+#: pg_resetxlog.c:1033
+#, c-format
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          ukáže tuto nápovědu a skon�í\n"
+
+#: pg_resetxlog.c:1034
+#, c-format
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       ukáže informace o verzi a skon�í\n"
+
+#: pg_resetxlog.c:1035
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#~ msgid "%s: invalid LC_COLLATE setting\n"
+#~ msgstr "%s: neplatné nastavení LC_COLLATE\n"
+
+#~ msgid "%s: invalid LC_CTYPE setting\n"
+#~ msgstr "%s: neplatné nastavení LC_CTYPE\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "Maximální po�et argumentů funkcí: %u\n"
+
+#~ msgid "LC_COLLATE:                           %s\n"
+#~ msgstr "LC_COLLATE (porovnávání řetězců):                           %s\n"
+
+#~ msgid "LC_CTYPE:                             %s\n"
+#~ msgstr "LC_CTYPE (typy znaků):                             %s\n"
diff --git a/src/bin/pg_resetxlog/po/ja.po b/src/bin/pg_resetxlog/po/ja.po
index 3b2e7e4fe53e8..96e821aebf3f5 100644
--- a/src/bin/pg_resetxlog/po/ja.po
+++ b/src/bin/pg_resetxlog/po/ja.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-07-20 12:56+0900\n"
-"PO-Revision-Date: 2010-07-17 18:07+0900\n"
+"PO-Revision-Date: 2011-08-30 21:34+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -295,7 +295,7 @@ msgstr "日付/時刻型�格�方�                     %s\n"
 
 #: pg_resetxlog.c:605
 msgid "64-bit integers"
-msgstr "64ビット整数\""
+msgstr "64ビット整数"
 
 #: pg_resetxlog.c:605
 msgid "floating-point numbers"
@@ -351,7 +351,7 @@ msgstr "%s: ディレクトリ\"%s\"をオープン����ん���: %s\
 #: pg_resetxlog.c:786 pg_resetxlog.c:850 pg_resetxlog.c:907
 #, c-format
 msgid "%s: could not read from directory \"%s\": %s\n"
-msgstr "%s: ディレクトリ%s\"�ら読�込���ん���: %s\n"
+msgstr "%s: ディレクトリ\"%s\"�ら読�込���ん���: %s\n"
 
 #: pg_resetxlog.c:831 pg_resetxlog.c:888
 #, c-format
diff --git a/src/bin/pg_resetxlog/po/pl.po b/src/bin/pg_resetxlog/po/pl.po
new file mode 100644
index 0000000000000..38f99c5697e66
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/pl.po
@@ -0,0 +1,464 @@
+# pg_resetxlog message translation file for pg_resetxlog
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_resetxlog (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:55+0000\n"
+"PO-Revision-Date: 2011-09-30 09:49-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pg_resetxlog.c:135
+#, c-format
+msgid "%s: invalid argument for option -e\n"
+msgstr "%s: niepoprawny argument dla opcji -e\n"
+
+#: pg_resetxlog.c:136 pg_resetxlog.c:151 pg_resetxlog.c:166 pg_resetxlog.c:181
+#: pg_resetxlog.c:196 pg_resetxlog.c:211 pg_resetxlog.c:218 pg_resetxlog.c:225
+#: pg_resetxlog.c:231 pg_resetxlog.c:239
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID epoch (-e) must not be -1\n"
+msgstr "%s: epoka ID transakcji (-e) nie może być -1\n"
+
+#: pg_resetxlog.c:150
+#, c-format
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: niepoprawny argument dla opcji -x\n"
+
+#: pg_resetxlog.c:156
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ID transakcji (-x) nie może być 0\n"
+
+#: pg_resetxlog.c:165
+#, c-format
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: niepoprawny argument dla opcji -o\n"
+
+#: pg_resetxlog.c:171
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) nie może być 0\n"
+
+#: pg_resetxlog.c:180
+#, c-format
+msgid "%s: invalid argument for option -m\n"
+msgstr "%s: niepoprawny argument dla opcji -m\n"
+
+#: pg_resetxlog.c:186
+#, c-format
+msgid "%s: multitransaction ID (-m) must not be 0\n"
+msgstr "%s: ID multitransakcji (-m) nie może być 0\n"
+
+#: pg_resetxlog.c:195
+#, c-format
+msgid "%s: invalid argument for option -O\n"
+msgstr "%s: niepoprawny argument dla opcji -O\n"
+
+#: pg_resetxlog.c:201
+#, c-format
+msgid "%s: multitransaction offset (-O) must not be -1\n"
+msgstr "%s: offset multitransakcji (-O) nie może być -1\n"
+
+#: pg_resetxlog.c:210 pg_resetxlog.c:217 pg_resetxlog.c:224
+#, c-format
+msgid "%s: invalid argument for option -l\n"
+msgstr "%s: niepoprawny argument dla opcji -l\n"
+
+#: pg_resetxlog.c:238
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: katalog danych nie został ustawiony\n"
+
+#: pg_resetxlog.c:252
+#, c-format
+msgid "%s: cannot be executed by \"root\"\n"
+msgstr "%s: nie może być wykonywane pod \"rootem\"\n"
+
+#: pg_resetxlog.c:254
+#, c-format
+msgid "You must run %s as the PostgreSQL superuser.\n"
+msgstr "Musisz uruchomić %s jako superużytkownik PostgreSQL.\n"
+
+#: pg_resetxlog.c:264
+#, c-format
+msgid "%s: could not change directory to \"%s\": %s\n"
+msgstr "%s: nie można zmienić katalogu na \"%s\": %s\n"
+
+#: pg_resetxlog.c:279 pg_resetxlog.c:407
+#, 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"
+
+#: pg_resetxlog.c:285
+#, c-format
+msgid ""
+"%s: lock file \"%s\" exists\n"
+"Is a server running?  If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: plik blokady \"%s\" istnieje\n"
+"Czy serwer działa? Jeśli nie, usuń plik blokady i spróbuj ponownie.\n"
+
+#: pg_resetxlog.c:355
+#, c-format
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Jeśli te wartości wydają się do przyjęcia, użyj -f by wymusić reset.\n"
+
+#: pg_resetxlog.c:367
+#, c-format
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log might cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"Serwer bazy danych nie został poprawnie zamknięty.\n"
+"Zresetowanie dziennika transakcji może spowodować utratę danych.\n"
+"Jeśli chcesz kontynuować, użyj -f, aby wymusić reset.\n"
+
+#: pg_resetxlog.c:381
+#, c-format
+msgid "Transaction log reset\n"
+msgstr "Reset dziennika transakcji\n"
+
+#: pg_resetxlog.c:410
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, execute\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Jeśli jesteś pewien, że ścieżka folder u jest poprawna, wykonaj\n"
+"  touch %s\n"
+"i spróbuj ponownie.\n"
+
+#: pg_resetxlog.c:423
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nie można odczytać z pliku \"%s\": %s\n"
+
+#: pg_resetxlog.c:446
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control istnieje ale ma niepoprawne CRC; postępuj ostrożnie\n"
+
+#: pg_resetxlog.c:455
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr ""
+"%s: pg_control istnieje ale jest uszkodzony lub ma nieznanÄ… wersjÄ™, "
+"zignorowano\n"
+
+#: pg_resetxlog.c:549
+#, c-format
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"Odgadnięte wartości pg_control:\n"
+"\n"
+
+#: pg_resetxlog.c:551
+#, c-format
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"wartości pg_control:\n"
+"\n"
+
+#: pg_resetxlog.c:560
+#, c-format
+msgid "First log file ID after reset:        %u\n"
+msgstr "Pierwszy plik dziennika po resecie:              %u\n"
+
+#: pg_resetxlog.c:562
+#, c-format
+msgid "First log file segment after reset:   %u\n"
+msgstr "Pierwszy segment pliku dziennika po resecie:     %u\n"
+
+#: pg_resetxlog.c:564
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control w wersji numer:                       %u\n"
+
+#: pg_resetxlog.c:566
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Katalog w wersji numer:                          %u\n"
+
+#: pg_resetxlog.c:568
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identyfikator systemu bazy danych:               %s\n"
+
+#: pg_resetxlog.c:570
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "TimeLineID najnowszego punktu kontrolnego:       %u\n"
+
+#: pg_resetxlog.c:572
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u/%u\n"
+msgstr "NextXID najnowszego punktu kontrolnego:          %u/%u\n"
+
+#: pg_resetxlog.c:575
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "NextOID najnowszego punktu kontrolnego:          %u\n"
+
+#: pg_resetxlog.c:577
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId:  %u\n"
+msgstr "NextMultiXactId najnowszego punktu kontrolnego:  %u\n"
+
+#: pg_resetxlog.c:579
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset:  %u\n"
+msgstr "NextMultiOffset najnowszego punktu kontrolnego:  %u\n"
+
+#: pg_resetxlog.c:581
+#, c-format
+msgid "Latest checkpoint's oldestXID:        %u\n"
+msgstr "oldestXID najnowszego punktu kontrolnego:        %u\n"
+
+#: pg_resetxlog.c:583
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB:   %u\n"
+msgstr "DB oldestXID'u najnowszego punktu kontrolnego:   %u\n"
+
+#: pg_resetxlog.c:585
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID:  %u\n"
+msgstr "NextXID najnowszego punktu kontrolnego:          %u\n"
+
+#: pg_resetxlog.c:587
+#, c-format
+msgid "Maximum data alignment:               %u\n"
+msgstr "Maksymalne wyrównanie danych:                    %u\n"
+
+#: pg_resetxlog.c:590
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Wielkość bloku bazy danych:                      %u\n"
+
+#: pg_resetxlog.c:592
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Bloki na segment sÄ… w relacji:                   %u\n"
+
+#: pg_resetxlog.c:594
+#, c-format
+msgid "WAL block size:                       %u\n"
+msgstr "Wielkość bloku WAL:                              %u\n"
+
+#: pg_resetxlog.c:596
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Bajtów na segment WAL:                           %u\n"
+
+#: pg_resetxlog.c:598
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maksymalna długość identyfikatorów:              %u\n"
+
+#: pg_resetxlog.c:600
+#, c-format
+msgid "Maximum columns in an index:          %u\n"
+msgstr "Maksymalna liczba kolumn w indeksie:             %u\n"
+
+#: pg_resetxlog.c:602
+#, c-format
+msgid "Maximum size of a TOAST chunk:        %u\n"
+msgstr "Maksymalny rozmiar fragmentu TOAST:              %u\n"
+
+#: pg_resetxlog.c:604
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Typ przechowywania daty/czasu:                   %s\n"
+
+#: pg_resetxlog.c:605
+msgid "64-bit integers"
+msgstr "64-bit'owe zmienne integer"
+
+#: pg_resetxlog.c:605
+msgid "floating-point numbers"
+msgstr "liczby zmiennoprzecinkowe"
+
+#: pg_resetxlog.c:606
+#, c-format
+msgid "Float4 argument passing:              %s\n"
+msgstr "Przekazywanie parametru float4:                  %s\n"
+
+#: pg_resetxlog.c:607 pg_resetxlog.c:609
+msgid "by value"
+msgstr "przez wartość"
+
+#: pg_resetxlog.c:607 pg_resetxlog.c:609
+msgid "by reference"
+msgstr "przez referencjÄ™"
+
+#: pg_resetxlog.c:608
+#, c-format
+msgid "Float8 argument passing:              %s\n"
+msgstr "Przekazywanie parametru float8:                  %s\n"
+
+#: pg_resetxlog.c:671
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
+"PG_CONTROL_SIZE\n"
+msgstr ""
+"%s: błąd wewnętrzny -- sizeof(ControlFileData) jest zbyt duża ... popraw "
+"PG_CONTROL_SIZE\n"
+
+#: pg_resetxlog.c:686
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: nie można utworzyć pliku pg_control: %s\n"
+
+#: pg_resetxlog.c:697
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: nie można pisać do pliku pg_control: %s\n"
+
+#: pg_resetxlog.c:704 pg_resetxlog.c:1011
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: błąd fsync: %s\n"
+
+#: pg_resetxlog.c:742 pg_resetxlog.c:817 pg_resetxlog.c:873
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: nie można otworzyć katalogu \"%s\": %s\n"
+
+#: pg_resetxlog.c:786 pg_resetxlog.c:850 pg_resetxlog.c:907
+#, c-format
+msgid "%s: could not read from directory \"%s\": %s\n"
+msgstr "%s: nie można odczytać katalogu \"%s\": %s\n"
+
+#: pg_resetxlog.c:831 pg_resetxlog.c:888
+#, c-format
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s: nie można usunąć pliku \"%s\": %s\n"
+
+#: pg_resetxlog.c:978
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku \"%s\": %s\n"
+
+#: pg_resetxlog.c:989 pg_resetxlog.c:1003
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: nie można zapisać pliku \"%s\": %s\n"
+
+#: pg_resetxlog.c:1022
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s resetuje log transakcji PostgreSQL.\n"
+"\n"
+
+#: pg_resetxlog.c:1023
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]... DATADIR\n"
+"\n"
+msgstr ""
+"Sposób użycia:\n"
+"  %s [OPCJA]... FOLDERDANYCH\n"
+"\n"
+
+#: pg_resetxlog.c:1024
+#, c-format
+msgid "Options:\n"
+msgstr "Opcje:\n"
+
+#: pg_resetxlog.c:1025
+#, c-format
+msgid "  -e XIDEPOCH     set next transaction ID epoch\n"
+msgstr "  -e XIDEPOCH     ustawia epokę ID następnej transakcji ID\n"
+
+#: pg_resetxlog.c:1026
+#, c-format
+msgid "  -f              force update to be done\n"
+msgstr "  -f              wymusza wykonanie modyfikacji\n"
+
+#: pg_resetxlog.c:1027
+#, c-format
+msgid ""
+"  -l TLI,FILE,SEG force minimum WAL starting location for new transaction "
+"log\n"
+msgstr ""
+"  -l TLI,FILE,SEG wymusza minimalne położenie początkowe WAL dla nowego "
+"komunikatu transakcji\n"
+
+#: pg_resetxlog.c:1028
+#, c-format
+msgid "  -m XID          set next multitransaction ID\n"
+msgstr "  -m XID          ustawia ID następnej multitransakcji\n"
+
+#: pg_resetxlog.c:1029
+#, c-format
+msgid ""
+"  -n              no update, just show extracted control values (for "
+"testing)\n"
+msgstr ""
+"  -n              bez modyfikacji, po prostu wyświetl wyodrębnione wartości "
+"kontrolne (do testowania)\n"
+
+#: pg_resetxlog.c:1030
+#, c-format
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID          ustawia następny OID\n"
+
+#: pg_resetxlog.c:1031
+#, c-format
+msgid "  -O OFFSET       set next multitransaction offset\n"
+msgstr "  -O OFFSET       ustawia następny offset multitransakcji\n"
+
+#: pg_resetxlog.c:1032
+#, c-format
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          ustawia ID następnej transakcji\n"
+
+#: pg_resetxlog.c:1033
+#, c-format
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          pokazuje ten ekran pomocy i kończy\n"
+
+#: pg_resetxlog.c:1034
+#, c-format
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       pokazuje informacje o wersji i kończy\n"
+
+#: pg_resetxlog.c:1035
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/pt_BR.po b/src/bin/pg_resetxlog/po/pt_BR.po
index 2c1122927f08e..556498191deb3 100644
--- a/src/bin/pg_resetxlog/po/pt_BR.po
+++ b/src/bin/pg_resetxlog/po/pt_BR.po
@@ -3,11 +3,11 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Cesar Suga <sartre@linuxbr.com>, 2002.
 # Roberto Mello <rmello@fslc.usu.edu>, 2002.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-07-08 21:12-0300\n"
 "PO-Revision-Date: 2005-10-04 22:55-0300\n"
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 378330b96aedc..6428698476afe 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -435,7 +435,8 @@ exec_command(const char *cmd,
 				success = describeTypes(pattern, show_verbose, show_system);
 				break;
 			case 't':
-			case 'v':
+		case 'v':
+		  case 'm':
 			case 'i':
 			case 's':
 			case 'E':
@@ -583,7 +584,13 @@ exec_command(const char *cmd,
 	{
 		int			lineno = -1;
 
-		if (!query_buf)
+		if (pset.sversion < 80400)
+		{
+			psql_error("The server (version %d.%d) does not support editing function source.\n",
+					   pset.sversion / 10000, (pset.sversion / 100) % 100);
+			status = PSQL_CMD_ERROR;
+		}
+		else if (!query_buf)
 		{
 			psql_error("no query buffer\n");
 			status = PSQL_CMD_ERROR;
@@ -1110,7 +1117,13 @@ exec_command(const char *cmd,
 		func_buf = createPQExpBuffer();
 		func = psql_scan_slash_option(scan_state,
 									  OT_WHOLE_LINE, NULL, true);
-		if (!func)
+		if (pset.sversion < 80400)
+		{
+			psql_error("The server (version %d.%d) does not support showing function source.\n",
+					   pset.sversion / 10000, (pset.sversion / 100) % 100);
+			status = PSQL_CMD_ERROR;
+		}
+		else if (!func)
 		{
 			psql_error("function name is required\n");
 			status = PSQL_CMD_ERROR;
@@ -1748,7 +1761,7 @@ static bool
 editFile(const char *fname, int lineno)
 {
 	const char *editorName;
-	const char *editor_lineno_switch = NULL;
+	const char *editor_lineno_arg = NULL;
 	char	   *sys;
 	int			result;
 
@@ -1763,14 +1776,17 @@ editFile(const char *fname, int lineno)
 	if (!editorName)
 		editorName = DEFAULT_EDITOR;
 
-	/* Get line number switch, if we need it. */
+	/* Get line number argument, if we need it. */
 	if (lineno > 0)
 	{
-		editor_lineno_switch = GetVariable(pset.vars,
-										   "EDITOR_LINENUMBER_SWITCH");
-		if (editor_lineno_switch == NULL)
+		editor_lineno_arg = getenv("PSQL_EDITOR_LINENUMBER_ARG");
+#ifdef DEFAULT_EDITOR_LINENUMBER_ARG
+		if (!editor_lineno_arg)
+			editor_lineno_arg = DEFAULT_EDITOR_LINENUMBER_ARG;
+#endif
+		if (!editor_lineno_arg)
 		{
-			psql_error("EDITOR_LINENUMBER_SWITCH variable must be set to specify a line number\n");
+			psql_error("environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number\n");
 			return false;
 		}
 	}
@@ -1778,7 +1794,7 @@ editFile(const char *fname, int lineno)
 	/* Allocate sufficient memory for command line. */
 	if (lineno > 0)
 		sys = pg_malloc(strlen(editorName)
-						+ strlen(editor_lineno_switch) + 10		/* for integer */
+						+ strlen(editor_lineno_arg) + 10		/* for integer */
 						+ 1 + strlen(fname) + 10 + 1);
 	else
 		sys = pg_malloc(strlen(editorName) + strlen(fname) + 10 + 1);
@@ -1793,14 +1809,14 @@ editFile(const char *fname, int lineno)
 #ifndef WIN32
 	if (lineno > 0)
 		sprintf(sys, "exec %s %s%d '%s'",
-				editorName, editor_lineno_switch, lineno, fname);
+				editorName, editor_lineno_arg, lineno, fname);
 	else
 		sprintf(sys, "exec %s '%s'",
 				editorName, fname);
 #else
 	if (lineno > 0)
 		sprintf(sys, SYSTEMQUOTE "\"%s\" %s%d \"%s\"" SYSTEMQUOTE,
-				editorName, editor_lineno_switch, lineno, fname);
+				editorName, editor_lineno_arg, lineno, fname);
 	else
 		sprintf(sys, SYSTEMQUOTE "\"%s\" \"%s\"" SYSTEMQUOTE,
 				editorName, fname);
@@ -1847,7 +1863,7 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf,
 		ret = GetTempPath(MAXPGPATH, tmpdir);
 		if (ret == 0 || ret > MAXPGPATH)
 		{
-			psql_error("cannot locate temporary directory: %s",
+			psql_error("could not locate temporary directory: %s\n",
 					   !ret ? strerror(errno) : "");
 			return false;
 		}
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index b57da05345fee..101544800d25a 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -87,7 +87,7 @@ pg_calloc(size_t nmemb, size_t size)
 	tmp = calloc(nmemb, size);
 	if (!tmp)
 	{
-		psql_error("out of memory");
+		psql_error("out of memory\n");
 		exit(EXIT_FAILURE);
 	}
 	return tmp;
@@ -194,7 +194,7 @@ NoticeProcessor(void *arg, const char *message)
  * so. We use write() to report to stderr because it's better to use simple
  * facilities in a signal handler.
  *
- * On win32, the signal cancelling happens on a separate thread, because
+ * On win32, the signal canceling happens on a separate thread, because
  * that's how SetConsoleCtrlHandler works. The PQcancel function is safe
  * for this (unlike PQrequestCancel). However, a CRITICAL_SECTION is required
  * to protect the PGcancel structure against being changed while the signal
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index 5e69d29b6cbea..ebe5ee9ea551b 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -586,7 +586,8 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
 				}
 			}
 
-			pset.lineno++;
+			if (copystream == pset.cur_cmd_source)
+				pset.lineno++;
 		}
 	}
 
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index b2c54b5f929c8..0fe05cb711c16 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -701,11 +701,11 @@ permissionsList(const char *pattern)
 	printfPQExpBuffer(&buf,
 					  "SELECT n.nspname as \"%s\",\n"
 					  "  c.relname as \"%s\",\n"
-					  "  CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'S' THEN '%s' WHEN 'f' THEN '%s' END as \"%s\",\n"
+					  "  CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'm' THEN '%s' WHEN 'S' THEN '%s' WHEN 'f' THEN '%s' END as \"%s\",\n"
 					  "  ",
 					  gettext_noop("Schema"),
 					  gettext_noop("Name"),
-	   gettext_noop("table"), gettext_noop("view"), gettext_noop("sequence"),
+	   gettext_noop("table"), gettext_noop("view"), gettext_noop("matview"), gettext_noop("sequence"),
 					  gettext_noop("foreign table"),
 					  gettext_noop("Type"));
 
@@ -2467,6 +2467,7 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
  * tabtypes is an array of characters, specifying what info is desired:
  * t - tables
  * i - indexes
+ * m - matviews
  * v - views
  * s - sequences
  * E - foreign table (Note: different from 'f', the relkind value)
@@ -2479,16 +2480,17 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 	bool		showTables = strchr(tabtypes, 't') != NULL;
 	bool		showIndexes = strchr(tabtypes, 'i') != NULL;
 	bool		showViews = strchr(tabtypes, 'v') != NULL;
+	bool		showMatViews = strchr(tabtypes, 'm') != NULL;
 	bool		showSeq = strchr(tabtypes, 's') != NULL;
 	bool		showForeign = strchr(tabtypes, 'E') != NULL;
 
 	PQExpBufferData buf;
 	PGresult   *res;
 	printQueryOpt myopt = pset.popt;
-	static const bool translate_columns[] = {false, false, true, false, false, false, false};
+	static const bool translate_columns[] = {false, false, true, true, false, false, false, false}; // 4th value added as true
 
-	if (!(showTables || showIndexes || showViews || showSeq || showForeign))
-		showTables = showViews = showSeq = showForeign = true;
+	if (!(showTables || showIndexes || showViews || showSeq || showForeign || showMatViews))
+		showTables = showViews = showMatViews = showSeq = showForeign = true;
 
 	initPQExpBuffer(&buf);
 
@@ -2499,12 +2501,13 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 	printfPQExpBuffer(&buf,
 					  "SELECT n.nspname as \"%s\",\n"
 					  "  c.relname as \"%s\",\n"
-					  "  CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'i' THEN '%s' WHEN 'S' THEN '%s' WHEN 's' THEN '%s' WHEN 'f' THEN '%s' END as \"%s\",\n"
+					  "  CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'm' THEN '%s' WHEN 'i' THEN '%s' WHEN 'S' THEN '%s' WHEN 's' THEN '%s' WHEN 'f' THEN '%s' END as \"%s\",\n"
 					  "  pg_catalog.pg_get_userbyid(c.relowner) as \"%s\"",
 					  gettext_noop("Schema"),
 					  gettext_noop("Name"),
 					  gettext_noop("table"),
-					  gettext_noop("view"),
+			  gettext_noop("view"),
+			  gettext_noop("matview"),
 					  gettext_noop("index"),
 					  gettext_noop("sequence"),
 					  gettext_noop("special"),
@@ -2549,7 +2552,9 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 	if (showTables)
 		appendPQExpBuffer(&buf, "'r',");
 	if (showViews)
-		appendPQExpBuffer(&buf, "'v',");
+	  appendPQExpBuffer(&buf, "'v',");
+	if (showMatViews)
+	  appendPQExpBuffer(&buf, "'m',");
 	if (showIndexes)
 		appendPQExpBuffer(&buf, "'i',");
 	if (showSeq)
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 6628c0c30cb69..ec0e6e1d49bc2 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -95,10 +95,10 @@ void
 pg_append_history(const char *s, PQExpBuffer history_buf)
 {
 #ifdef USE_READLINE
-	if (useHistory && s && s[0])
+	if (useHistory && s)
 	{
 		appendPQExpBufferStr(history_buf, s);
-		if (s[strlen(s) - 1] != '\n')
+		if (!s[0] || s[strlen(s) - 1] != '\n')
 			appendPQExpBufferChar(history_buf, '\n');
 	}
 #endif
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index d47c3b2ec7107..5a99799473f0c 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,6 +1,6 @@
 # src/bin/psql/nls.mk
 CATALOG_NAME	:= psql
-AVAIL_LANGUAGES	:= cs de es fr ja pt_BR sv tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr ja pl pt_BR tr zh_CN zh_TW
 GETTEXT_FILES	:= command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c startup.c describe.c sql_help.h sql_help.c \
                    ../../port/exec.c
diff --git a/src/bin/psql/po/cs.po b/src/bin/psql/po/cs.po
index 2b647e5378ff6..8cd0aa98178a4 100644
--- a/src/bin/psql/po/cs.po
+++ b/src/bin/psql/po/cs.po
@@ -1,179 +1,223 @@
 # translation of psql-cs.po to Czech
 # Czech message translation file for psql
 #
-# src/bin/psql/po/cs.po
+# pgtranslation Id: psql.po,v 1.6 2011/09/08 18:23:06 petere Exp $
 # Karel Žák, 2001-2003, 2004.
-# Zdeněk Kotala, 2009.
-
+# Zdeněk Kotala, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: postgresql 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-05-21 21:08+0000\n"
-"PO-Revision-Date: 2009-05-24 15:46+0200\n"
-"Last-Translator: Zdeněk Kotala\n"
-"Language-Team: Czech \n"
+"POT-Creation-Date: 2011-08-30 11:35+0200\n"
+"PO-Revision-Date: 2011-08-30 14:46+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
 
-#: command.c:112
+#: command.c:113
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Neplatný příkaz \\%s. Použijte \\? pro nápovědu.\n"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "neplatný příkaz \\%s\n"
 
-#: command.c:125
+#: command.c:126
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
-msgstr "\\%s: vedlejší argument \"%s\" ignorován\n"
+msgstr "\\%s: nadbyte�ný argument \"%s\" ignorován\n"
 
-#: command.c:267
+#: command.c:268
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "nelze získat domácí adresář: %s\n"
 
-#: command.c:283
+#: command.c:284
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: nelze změnit adresář na \"%s\": %s\n"
 
-#: command.c:316 common.c:935
+#: command.c:305 common.c:493 common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "Aktuálně nejste připojeni k databázi.\n"
+
+#: command.c:312
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Jste připojeni k databázi \"%s\" jako uživatel \"%s\" přes socket v \"%s\" na"
+"portu \"%s\".\n"
+
+#: command.c:315
+#, c-format
+#| msgid "You are now connected to database \"%s\""
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
+"\"%s\".\n"
+msgstr ""
+"Nyní jste připojeni k databázi \"%s\" jako uživatel \"%s\" na serveru \"%s\" "
+"na portu"
+"\"%s\".\n"
+
+#: command.c:339 common.c:940
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "ÄŒas: %.3f ms\n"
 
-#: command.c:468 command.c:496 command.c:1035
+#: command.c:524 command.c:588 command.c:1285
 msgid "no query buffer\n"
-msgstr "v paměti není žádný dotaz\n"
+msgstr "v historii není žádný dotaz\n"
 
-#: command.c:538
+#: command.c:557 command.c:2507
+#, c-format
+#| msgid "invalid binary \"%s\""
+msgid "invalid line number: %s\n"
+msgstr "neplatné �íslo řádky: %s\n"
+
+#: command.c:662
 msgid "No changes"
 msgstr "Žádné změny"
 
-#: command.c:592
+#: command.c:716
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s: neplatné jméno kódování nebo nenalezena konverzní funkce\n"
 
-#: command.c:660 command.c:694 command.c:708 command.c:725 command.c:829
-#: command.c:879 command.c:1015 command.c:1046
+#: command.c:795 command.c:829 command.c:843 command.c:860 command.c:964
+#: command.c:1014 command.c:1265 command.c:1296
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: chybí požadovaný argument\n"
 
-#: command.c:757
+#: command.c:892
 msgid "Query buffer is empty."
 msgstr "Buffer dotazů je prázdný."
 
-#: command.c:767
+#: command.c:902
 msgid "Enter new password: "
 msgstr "Zadejte nové heslo: "
 
-#: command.c:768
+#: command.c:903
 msgid "Enter it again: "
 msgstr "Zadejte znova: "
 
-#: command.c:772
+#: command.c:907
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Hesla se neshodují.\n"
 
-#: command.c:790
+#: command.c:925
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Zašifrování hesla selhalo.\n"
 
-#: command.c:858 command.c:959 command.c:1020
+#: command.c:993 command.c:1094 command.c:1270
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: chyba\n"
 
-#: command.c:899
+#: command.c:1034
 msgid "Query buffer reset (cleared)."
 msgstr "Buffer dotazů vyprázdněn."
 
-#: command.c:912
+#: command.c:1047
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
-msgstr "Historie zapsána do soubor: \"%s/%s\".\n"
+msgstr "Historie zapsána do souboru: \"%s/%s\".\n"
 
-#: command.c:950 common.c:52 common.c:66 input.c:198 mainloop.c:69
-#: mainloop.c:227 print.c:61 print.c:75
+#: command.c:1085 common.c:52 common.c:66 common.c:90 input.c:209
+#: mainloop.c:72 mainloop.c:234 print.c:137 print.c:151
 #, c-format
 msgid "out of memory\n"
-msgstr "paměť vy�erpána\n"
+msgstr "nedostatek paměti\n"
 
-#: command.c:1000
+#: command.c:1115
+#| msgid "\\copy: arguments required\n"
+msgid "function name is required\n"
+msgstr "je vyžadováno jméno funkce\n"
+
+#: command.c:1250
 msgid "Timing is on."
 msgstr "Sledování �asu je zapnuto."
 
-#: command.c:1002
+#: command.c:1252
 msgid "Timing is off."
 msgstr "Sledování �asu je vypnuto."
 
-#: command.c:1063 command.c:1083 command.c:1581 command.c:1588 command.c:1597
-#: command.c:1607 command.c:1616 command.c:1630 command.c:1647 command.c:1680
-#: common.c:137 copy.c:517 copy.c:581
+#: command.c:1313 command.c:1333 command.c:1895 command.c:1902 command.c:1911
+#: command.c:1921 command.c:1930 command.c:1944 command.c:1961 command.c:1999
+#: common.c:137 copy.c:283 copy.c:361
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1165 startup.c:159
+#: command.c:1415 startup.c:159
 msgid "Password: "
 msgstr "Heslo: "
 
-#: command.c:1172 startup.c:162 startup.c:164
+#: command.c:1422 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
-msgstr "Vložte heslo uživatele %s: "
+msgstr "Heslo pro uživatele %s: "
 
-#: command.c:1268 command.c:2110 common.c:183 common.c:460 common.c:525
-#: common.c:811 common.c:836 common.c:920 copy.c:652 copy.c:697 copy.c:826
+#: command.c:1541 command.c:2541 common.c:183 common.c:460 common.c:525
+#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1272
+#: command.c:1545
 msgid "Previous connection kept\n"
 msgstr "Předchozí spojení zachováno\n"
 
-#: command.c:1276
+#: command.c:1549
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1300
-#, c-format
-msgid "You are now connected to database \"%s\""
-msgstr "Nyní jste připojeni do databáze \"%s\""
-
-#: command.c:1303
+#: command.c:1582
 #, c-format
-msgid " on host \"%s\""
-msgstr " na po�íta� \"%s\""
+#| msgid "You are now connected to database \"%s\""
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+"at port \"%s\".\n"
+msgstr ""
+"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+"at port \"%s\".\n"
 
-#: command.c:1306
+#: command.c:1585
 #, c-format
-msgid " at port \"%s\""
-msgstr " na port \"%s\""
+#| msgid "You are now connected to database \"%s\""
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Nyní jste připojeni k databázi \"%s\" jako uživatel \"%s\" na serveru \"%s\" "
+"na portu"
+"\"%s\".\n"
 
-#: command.c:1309
+#: command.c:1589
 #, c-format
-msgid " as user \"%s\""
-msgstr " jako uživatel \"%s\""
+#| msgid "You are now connected to database \"%s\""
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr "Nyní jste připojeni k databázi \"%s\" jako uživatel \"%s\".\n"
 
-#: command.c:1344
+#: command.c:1623
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, server %s)\n"
 
-#: command.c:1351
+#: command.c:1631
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -182,158 +226,182 @@ msgstr ""
 "VAROV�N�: %s verze %d.%d, verze serveru %d.%d.\n"
 "          Některé vlastnosti psql nemusí fungovat.\n"
 
-#: command.c:1381
+#: command.c:1661
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "SSL spojení (šifra: %s, bitů: %i)\n"
 
-#: command.c:1390
+#: command.c:1671
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "SSL spojení (neznámá šifra)\n"
 
-#: command.c:1411
+#: command.c:1692
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
 "         8-bit characters might not work correctly. See psql reference\n"
 "         page \"Notes for Windows users\" for details.\n"
 msgstr ""
+"VAROV�N�: Kódová stránka konzole (%u) není shodná s kódovou stránkou\n"
+"         Windows (%u) 8-bitové znaky nemusí fungovat správně. Další\n"
+"         informace najdete v manuálu k psql na stránce \"Poznámky pro\n"
+"         uživatele Windows.\"\n"
+
+#: command.c:1776
+msgid ""
+"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
+"line number\n"
+msgstr ""
+"proměnná prostředí PSQL_EDITOR_LINENUMBER_ARG musí být nastavena pro zadání"
+"�ísla řádky\n"
 
-#: command.c:1500
+#: command.c:1813
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "nelze spustit editor \"%s\"\n"
 
-#: command.c:1502
+#: command.c:1815
 msgid "could not start /bin/sh\n"
 msgstr "nelze spustit /bin/sh\n"
 
-#: command.c:1539
+#: command.c:1853
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "nelze otevřít do�asný soubor: %s"
+#| msgid "cannot locate temporary directory: %s"
+msgid "could not locate temporary directory: %s\n"
+msgstr "nelze najít do�asný adresář: %s\n"
 
-#: command.c:1566
+#: command.c:1880
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "nelze otevřít do�asný soubor \"%s\": %s\n"
 
-#: command.c:1764
+#: command.c:2110
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
-msgstr "" 
-"\\pset: dovolené formáty jsou: unaligned, aligned, wrapped, html, latex, troff-"
-"ms\n"
+msgstr ""
+"\\pset: dovolené formáty jsou: unaligned, aligned, wrapped, html, latex, "
+"troff-ms\n"
 
-#: command.c:1769
+#: command.c:2115
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Výstupní formát je %s.\n"
 
-#: command.c:1779
+#: command.c:2131
+msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
+msgstr "\\pset: povolené styly řádek jsou ascii, old-ascii, unicode\n"
+
+#: command.c:2136
+#, c-format
+msgid "Line style is %s.\n"
+msgstr "Styl �ar je %s.\n"
+
+#: command.c:2147
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Styl ráme�ků je %d.\n"
 
-#: command.c:1791
+#: command.c:2159
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Rozšířené zobrazení zapnuto.\n"
 
-#: command.c:1792
+#: command.c:2160
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Rozšířené zobrazení vypnuto.\n"
 
-#: command.c:1805
+#: command.c:2173
+#, fuzzy
 msgid "Showing locale-adjusted numeric output."
 msgstr "Zobrazí �íselný výstup dle národního nastavení."
 
-#: command.c:1807
+#: command.c:2175
+#, fuzzy
 msgid "Locale-adjusted numeric output is off."
 msgstr "Zobrazení �íselného výstupu dle národního nastavení je vypnuto."
 
-#: command.c:1820
+#: command.c:2188
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null je zobrazován jako '\"%s\"'.\n"
 
-#: command.c:1832
+#: command.c:2200
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Oddělova� polí je '\"%s\"'.\n"
 
-#: command.c:1846
+#: command.c:2214
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "Oddělova� záznamů je <newline>."
 
-#: command.c:1848
+#: command.c:2216
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Oddělova� záznamů je '\"%s\"'.\n"
 
-#: command.c:1862
+#: command.c:2230
 msgid "Showing only tuples."
 msgstr "Zobrazovány jsou pouze záznamy."
 
-#: command.c:1864
+#: command.c:2232
 msgid "Tuples only is off."
 msgstr "Zobrazování pouze záznamů je vypnuto."
 
-#: command.c:1880
+#: command.c:2248
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Nadpis je \"%s\".\n"
 
-#: command.c:1882
+#: command.c:2250
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Nadpis není nastaven.\n"
 
-#: command.c:1898
+#: command.c:2266
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Atribut tabulky je \"%s\".\n"
 
-#: command.c:1900
+#: command.c:2268
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Atributy tabulky nejsou nastaveny.\n"
 
-#: command.c:1921
+#: command.c:2289
 msgid "Pager is used for long output."
 msgstr "Stránkování je zapnuto pro dlouhé výstupy."
 
-#: command.c:1923
+#: command.c:2291
 msgid "Pager is always used."
 msgstr "Stránkování je vždy použito."
 
-#: command.c:1925
+#: command.c:2293
 msgid "Pager usage is off."
 msgstr "Stránkování je vypnuto."
 
-#: command.c:1939
+#: command.c:2307
 msgid "Default footer is on."
-msgstr "Implicitní záhlaví je zapnuto."
+msgstr "Implicitní zápatí je zapnuto."
 
-#: command.c:1941
+#: command.c:2309
 msgid "Default footer is off."
-msgstr "Implicitní záhlaví je vypnuto."
+msgstr "Implicitní zápatí je vypnuto."
 
-#: command.c:1952
+#: command.c:2320
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
-msgstr ""
+msgstr "Cílová šířka pro \"wrapped\" formát je %d.\n"
 
-#: command.c:1957
+#: command.c:2325
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: neznámá volba: %s\n"
 
-#: command.c:2011
+#: command.c:2379
 msgid "\\!: failed\n"
 msgstr "\\!: selhal\n"
 
@@ -342,10 +410,6 @@ msgstr "\\!: selhal\n"
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: pg_strdup: nelze duplikovat nulový ukazatel (interní chyba)\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "paměť vy�erpána"
-
 #: common.c:343
 msgid "connection to server was lost\n"
 msgstr "spojení na server bylo ztraceno\n"
@@ -362,11 +426,7 @@ msgstr "Nepodařilo se.\n"
 msgid "Succeeded.\n"
 msgstr "Podařilo se.\n"
 
-#: common.c:493 common.c:768
-msgid "You are currently not connected to a database.\n"
-msgstr "Neexistuje spojeni s databází.\n"
-
-#: common.c:499 common.c:506 common.c:794
+#: common.c:499 common.c:506 common.c:799
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -379,13 +439,22 @@ msgstr ""
 "**************************\n"
 "\n"
 
-#: common.c:558
+#: common.c:560
+#, c-format
+msgid ""
+"Asynchronous notification \"%s\" with payload \"%s\" received from server "
+"process with PID %d.\n"
+msgstr ""
+"Asynchronní upozornění \"%s\" s obsahem \"%s\" obdrženo ze serverového "
+"procesu s PID %d.\n"
+
+#: common.c:563
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Asynchronní upozornění \"%s\" obdrženo z procesu serveru s PID %d.\n"
 
-#: common.c:776
+#: common.c:781
 #, c-format
 msgid ""
 "***(Single step mode: verify command)"
@@ -397,84 +466,89 @@ msgstr ""
 "***(Krokovací mód: potvr�te příkaz)"
 "*******************************************\n"
 "%s\n"
-"***(stiskněte return pro zpracování nebo x pro zrušení)********************\n"
+"***(stiskněte return pro zpracování nebo x a return pro zrušení)"
+"********************\n"
 
-#: common.c:827
+#: common.c:832
 #, c-format
 msgid ""
 "The server (version %d.%d) does not support savepoints for "
 "ON_ERROR_ROLLBACK.\n"
-msgstr "Serveru (verze %d.%d) nepodporuje savepoints pro ON_ERROR_ROLLBACK.\n"
+msgstr "Server (verze %d.%d) nepodporuje savepoints pro ON_ERROR_ROLLBACK.\n"
 
-#: copy.c:120
+#: copy.c:96
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: argumenty jsou povinné\n"
 
-#: copy.c:399
+#: copy.c:228
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: chyba na \"%s\"\n"
 
-#: copy.c:401
+#: copy.c:230
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: chyba na konci řádku\n"
 
-#: copy.c:528
+#: copy.c:294
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: nelze kopírovat z/do adresáře\n"
 
-#: copy.c:554
+#: copy.c:331
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:558 copy.c:572
+#: copy.c:335 copy.c:349
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: neo�ekávaná odezva (%d)\n"
 
-#: copy.c:627 copy.c:637
+#: copy.c:353
+msgid "trying to exit copy mode"
+msgstr "pokouším se opustit copy mód"
+
+#: copy.c:407 copy.c:417
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "nelze zapsat data příkazu COPY: %s\n"
 
-#: copy.c:644
+#: copy.c:424
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "přenos dat příkazem COPY selhal: %s"
 
-#: copy.c:692
+#: copy.c:472
 msgid "canceled by user"
 msgstr "zrušeno na žádost uživatele"
 
 # common.c:485
-#: copy.c:707
+#: copy.c:487
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
 msgstr ""
-"Vstupní data budu kopírována od následující řádky.\n"
-"Ukon�ení kopírování pomocí samostatné řádky s lomítkem (backslash) a te�kou."
+"Zadejte data pro kopírování následovaná novým řádkem.\n"
+"Ukon�ete zpětným lomítkem a te�kou na samostatném řádku."
 
-#: copy.c:819
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "přerušeno z důvodu chyby �tení"
 
-#: help.c:52
+#: help.c:48
 msgid "on"
 msgstr "zapnuto"
 
-#: help.c:52
+#: help.c:48
 msgid "off"
 msgstr "vypnuto"
 
-#: help.c:74
+#: help.c:70
 #, c-format
 msgid "could not get current user name: %s\n"
-msgstr "nelze získat uživatelské jméno: %s\n"
+msgstr "nelze získat aktuální uživatelské jméno: %s\n"
 
-#: help.c:86
+#: help.c:82
 #, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
@@ -483,12 +557,12 @@ msgstr ""
 "psql je PostgreSQL interaktivní terminál.\n"
 "\n"
 
-#: help.c:87
+#: help.c:83
 #, c-format
 msgid "Usage:\n"
 msgstr "Použití:\n"
 
-#: help.c:88
+#: help.c:84
 #, c-format
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
@@ -497,51 +571,53 @@ msgstr ""
 "  psql [PŘEP�NAČE]... [DATAB�ZE [UŽIVATEL]]\n"
 "\n"
 
-#: help.c:90
+#: help.c:86
 #, c-format
 msgid "General options:\n"
-msgstr "Základní přepína�e:\n"
+msgstr "Základní volby:\n"
 
-#: help.c:95
+#: help.c:91
 #, c-format
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
 "exit\n"
 msgstr ""
-"  -c, --command=PŘ�KAZ     provede pouze jeden příkaz (SQL nebo interní) a skon�í\n"
+"  -c, --command=PŘ�KAZ     provede pouze jeden příkaz (SQL nebo interní) a "
+"skon�í\n"
 
-#: help.c:96
+#: help.c:92
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
 "  -d, --dbname=DATAB�ZE    jméno databáze pro spojení (implicitně: \"%s\")\n"
 
-#: help.c:97
+#: help.c:93
 #, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=SOUBOR        provede příkazy ze souboru a skon�í\n"
 
-#: help.c:98
+#: help.c:94
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
-msgstr "  -l, --list               vypíše seznam dostupných databází a skon�í\n"
+msgstr ""
+"  -l, --list               vypíše seznam dostupných databází a skon�í\n"
 
-#: help.c:99
+#: help.c:95
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
 "                           set psql variable NAME to VALUE\n"
 msgstr ""
-"  -v, ..set=, --variable=JMÉNO=HODNOTA\n"
+"  -v, --set=, --variable=JMÉNO=HODNOTA\n"
 "                           nastaví psql proměnnou 'JMÉNO' na 'HODNOTA'\n"
 
-#: help.c:101
+#: help.c:97
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          ne�íst inicializa�ní soubor (~/.psqlrc)\n"
 
-#: help.c:102
+#: help.c:98
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -550,17 +626,17 @@ msgstr ""
 "  -1 (\"jedna\"), --single-transaction\n"
 "                           zpracuj soubor v rámci jedné transakce\n"
 
-#: help.c:104
+#: help.c:100
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   ukáže tuto nápovědu a skon�í\n"
 
-#: help.c:105
+#: help.c:101
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                ukáže informace o verzi a skon�í\n"
 
-#: help.c:107
+#: help.c:103
 #, c-format
 msgid ""
 "\n"
@@ -569,61 +645,64 @@ msgstr ""
 "\n"
 "Vstupní a výstupní přepína�e:\n"
 
-#: help.c:108
+#: help.c:104
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           ukáže všechny vstupy ze skriptu\n"
 
-#: help.c:109
+#: help.c:105
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e --echo-queries        ukáže všechny příkazy poslané na server\n"
 
-#: help.c:110
+#: help.c:106
 #, c-format
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
-msgstr "" 
-"  -E, --echo-hidden        ukáže dotazy, které generují interní příkazy\n"
+msgstr "  -E, --echo-hidden        ukáže dotazy generované interními příkazy\n"
 
-#: help.c:111
+#: help.c:107
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=FILENAME  uloží záznam sezení do souboru\n"
 
-#: help.c:112
+#: help.c:108
 #, c-format
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
-"  -n, --no-readline        vypne edita�ní možnosti příkazové řádky (podpora readline)\n"
+"  -n, --no-readline        vypne pokro�ilé edita�ní možnosti příkazové řádky "
+"(podpora readline)\n"
 
-#: help.c:113
+#: help.c:109
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
-msgstr "  -o,  --output=SOUBOR     zapíše výsledek dotazu do souboru (nebo |roury)\n"
+msgstr ""
+"  -o,  --output=SOUBOR     zapíše výsledek dotazu do souboru (nebo |roury)\n"
 
-#: help.c:114
+#: help.c:110
 #, c-format
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet              tichý chod (bez hlášek, pouze výstupy dotazů)\n"
 
-#: help.c:115
+#: help.c:111
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
-msgstr "  -s, --single-step        krokovací mód (nutné potvrzení každého dotazu)\n"
+msgstr ""
+"  -s, --single-step        krokovací mód (nutné potvrzení každého dotazu)\n"
 
-#: help.c:116
+#: help.c:112
 #, c-format
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
 "command)\n"
 msgstr ""
-"  -S, --single-line        jednořádkový mód (konec řádky ukon�uje SQL příkaz)\n"
+"  -S, --single-line        jednořádkový mód (konec řádky ukon�uje SQL "
+"příkaz)\n"
 
-#: help.c:118
+#: help.c:114
 #, c-format
 msgid ""
 "\n"
@@ -632,12 +711,12 @@ msgstr ""
 "\n"
 "Výstupní formát je:\n"
 
-#: help.c:119
+#: help.c:115
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           mód nezarovnaného formátu tabulky\n"
 
-#: help.c:120
+#: help.c:116
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -646,21 +725,21 @@ msgstr ""
 "  -F, --field-separator=ŘETĚZEC\n"
 "                           oddělova� polí (implicitně: \"%s\")\n"
 
-#: help.c:123
+#: help.c:119
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               Mód HTML formátu tabulky\n"
 
-#: help.c:124
+#: help.c:120
 #, c-format
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
 "command)\n"
 msgstr ""
-"  -P, --pset=VAR[=ARG]     nastaví zobrazovací parametr 'VAR' na hodnotu 'ARG' (viz. příkaz "
-"\\pset)\n"
+"  -P, --pset=VAR[=ARG]     nastaví zobrazovací parametr 'VAR' na hodnotu "
+"'ARG' (viz. příkaz \\pset)\n"
 
-#: help.c:125
+#: help.c:121
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -669,25 +748,26 @@ msgstr ""
 "  -R, --record-separator=ŘETĚZEC\n"
 "                           oddělova� záznamů (implicitně: newline)\n"
 
-#: help.c:127
+#: help.c:123
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        tiskne pouze řádky\n"
 
-#: help.c:128
+#: help.c:124
 #, c-format
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
 "border)\n"
 msgstr ""
-"  -T, --table-attr=TEXT    nastavení atributů HTML tabulky (např. width, border)\n"
+"  -T, --table-attr=TEXT    nastavení atributů HTML tabulky (např. width, "
+"border)\n"
 
-#: help.c:129
+#: help.c:125
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           výstupu v rozšířené tabulce\n"
 
-#: help.c:131
+#: help.c:127
 #, c-format
 msgid ""
 "\n"
@@ -696,41 +776,39 @@ msgstr ""
 "\n"
 "Parametry spojení:\n"
 
-#: help.c:134
+#: help.c:130
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME      database server host or socket directory "
 "(default: \"%s\")\n"
 msgstr ""
-"  -h, --host=HOSTNAME      jméno databázového serveru nebo adresář se soketem "
-"(implicitnÄ›: \"%s\")\n"
+"  -h, --host=HOSTNAME      jméno databázového serveru nebo adresář se "
+"soketem (implicitnÄ›: \"%s\")\n"
 
-#: help.c:135
+#: help.c:131
 msgid "local socket"
 msgstr "lokální soket"
 
-#: help.c:138
+#: help.c:134
 #, c-format
-msgid ""
-"  -p, --port=PORT          database server port (default: \"%s\")\n"
+msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr ""
-"  -p, --port=PORT          specifikuje port databázového serveru (implicitně: \"%s"
-"\")\n"
+"  -p, --port=PORT          specifikuje port databázového serveru "
+"(implicitnÄ›: \"%s\")\n"
 
-#: help.c:144
+#: help.c:140
 #, c-format
-msgid ""
-"  -U, --username=USERNAME  database user name (default: \"%s\")\n"
+msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
-"  -U, --username=JMÉNO     specifikuje jméno databázového uživatele (implicitně: \"%s"
-"\")\n"
+"  -U, --username=JMÉNO     specifikuje jméno databázového uživatele "
+"(implicitnÄ›: \"%s\")\n"
 
-#: help.c:145
-#, fu c-format
+#: help.c:141
+#, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        neptá se na heslo\n"
 
-#: help.c:146
+#: help.c:142
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -739,7 +817,7 @@ msgstr ""
 "  -W, --password           vynucený dotaz na heslo (měl by být proveden "
 "automaticky)\n"
 
-#: help.c:148
+#: help.c:144
 #, c-format
 msgid ""
 "\n"
@@ -755,315 +833,374 @@ msgstr ""
 "�ásti věnované psql.\n"
 "\n"
 
-#: help.c:151
+#: help.c:147
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Chyby posílejte na adresu <pgsql-bugs@postgresql.org>.\n"
 
-#: help.c:169
+#: help.c:165
 #, c-format
 msgid "General\n"
 msgstr "Hlavní\n"
 
-#: help.c:170
+#: help.c:166
 #, c-format
 msgid ""
 "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
 "  \\copyright             zobrazí podmínky použití a distribuce PostgreSQL\n"
 
-#: help.c:171
+#: help.c:167
 #, c-format
 msgid ""
 "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
 msgstr ""
-"  \\g [SOUBOR] nebo ;     pošle SQL dotaz na server (a zapíše výsledek do souboru"
-" nebo |roury)\n"
+"  \\g [SOUBOR] nebo ;     pošle SQL dotaz na server (a zapíše výsledek do "
+"souboru nebo |roury)\n"
 
-#: help.c:172
+#: help.c:168
 #, c-format
 msgid ""
 "  \\h [NAME]              help on syntax of SQL commands, * for all "
 "commands\n"
 msgstr ""
-"  \\h [JMÉNO]             nápověda syntaxe SQL příkazů, * pro všechny příkazy\n"
+"  \\h [JMÉNO]             nápověda syntaxe SQL příkazů, * pro všechny "
+"příkazy\n"
 
-#: help.c:173
+#: help.c:169
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     ukon�ení psql\n"
 
-#: help.c:176
+#: help.c:172
 #, c-format
 msgid "Query Buffer\n"
 msgstr "Paměť dotazu\n"
 
-#: help.c:177
+#: help.c:173
 #, c-format
+#| msgid ""
+#| "  \\e [FILE]              edit the query buffer (or file) with external "
+#| "editor\n"
 msgid ""
-"  \\e [FILE]              edit the query buffer (or file) with external "
+"  \\e [FILE] [LINE]       edit the query buffer (or file) with external "
 "editor\n"
 msgstr ""
-"  \\e [SOUBOR]            editace aktuálního dotazu (nebo souboru) v externím "
-"editoru\n"
+"  \\e [SOUBOR] [Ř�DEK]           editace aktuálního dotazu (nebo souboru) v "
+"externím editoru\n"
 
-#: help.c:178
+#: help.c:174
 #, c-format
+#| msgid ""
+#| "  \\ef [FUNCNAME]         edit function definition with external editor\n"
 msgid ""
-"  \\ef [FUNCNAME]         edit function definition with external editor\n"
+"  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr ""
-"  \\ef [JMENOFUNKCE]      editace definice funkce v externím editoru\n"
+"  \\ef [JMENOFUNKCE [Ř�DEK]]      editace definice funkce v externím editoru\n"
 
-#: help.c:179
+#: help.c:175
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                     ukázat sou�asný obsah paměti s dotazem\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                     vyprázdnění paměti s dotazy\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [SOUBOR]            vytiskne historii nebo ji uloží do souboru\n"
 
-#: help.c:184
+#: help.c:180
 #, c-format
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w SOUBOR              zapsání paměti s dotazem do souboru\n"
 
-#: help.c:187
+#: help.c:183
 #, c-format
 msgid "Input/Output\n"
 msgstr "Vstup/Výstup\n"
 
-#: help.c:188
+#: help.c:184
 #, c-format
 msgid ""
 "  \\copy ...              perform SQL COPY with data stream to the client "
 "host\n"
-msgstr ""
-"  \\copy ...              provede SQL COPY s tokem dat na klienta\n"
+msgstr "  \\copy ...              provede SQL COPY s tokem dat na klienta\n"
 
-#: help.c:189
+#: help.c:185
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr "  \\echo [TEXT]           vypsání textu na standardní výstup\n"
 
-#: help.c:190
+#: help.c:186
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i SOUBOR              provedení příkazů ze souboru\n"
 
-#: help.c:191
+#: help.c:187
 #, c-format
-msgid ""
-"  \\o [FILE]              send all query results to file or |pipe\n"
+msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr ""
-"  \\o [SOUBOR]            přesměrování výsledků dotazu do souboru nebo |roury\n"
+"  \\o [SOUBOR]            přesměrování výsledků dotazu do souboru nebo |"
+"roury\n"
 
-#: help.c:192
+#: help.c:188
 #, c-format
 msgid ""
 "  \\qecho [STRING]        write string to query output stream (see \\o)\n"
-msgstr ""
-"  \\qecho [ŘETĚZEC]       vypsání textu na výstup dotazů (viz. \\o)\n"
+msgstr "  \\qecho [ŘETĚZEC]       vypsání textu na výstup dotazů (viz. \\o)\n"
 
-#: help.c:195
+#: help.c:191
 #, c-format
 msgid "Informational\n"
 msgstr "Informa�ní\n"
 
-#: help.c:196
+#: help.c:192
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr "  (volby: S = zobraz systémové objekty, + = další detaily)\n"
 
-#: help.c:197
+#: help.c:193
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
 msgstr "  \\dp[S+]                seznam tabulek, pohledů a sekvencí\n"
 
-#: help.c:198
+#: help.c:194
 #, c-format
 msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
-msgstr "  \\d[S+]  JMÉNO          popis tabulky, pohledů, sekvence nebo indexu\n"
+msgstr ""
+"  \\d[S+]  JMÉNO          popis tabulky, pohledů, sekvence nebo indexu\n"
 
-#: help.c:199
+#: help.c:195
 #, c-format
-msgid "  \\da[+]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[+]  [VZOR]         seznam agregátních funkcí\n"
+msgid "  \\da[S]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[+]  [VZOR]         seznam agrega�ních funkcí\n"
 
-#: help.c:200
+#: help.c:196
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [VZOR]         seznam tablespaců\n"
+msgstr "  \\db[+]  [VZOR]         seznam tablespaces\n"
 
-#: help.c:201
+#: help.c:197
 #, c-format
 msgid "  \\dc[S]  [PATTERN]      list conversions\n"
 msgstr "  \\dc[S]  [VZOR]         seznam konverzí\n"
 
-#: help.c:202
+#: help.c:198
 #, c-format
 msgid "  \\dC     [PATTERN]      list casts\n"
 msgstr "  \\dC     [VZOR]         seznam přetypování\n"
 
-#: help.c:203
+#: help.c:199
 #, c-format
 msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
-msgstr "  \\dd[S]  [VZOR]         ukázat komentář k objektu\n"
+msgstr "  \\dd[S]  [VZOR]         ukázat komentáře k objektům\n"
 
-#: help.c:204
+#: help.c:200
+#, c-format
+msgid "  \\ddp    [PATTERN]      list default privileges\n"
+msgstr "  \\dC     [VZOR]         seznam implicitních výrazů\n"
+
+#: help.c:201
 #, c-format
 msgid "  \\dD[S]  [PATTERN]      list domains\n"
 msgstr "  \\dD[S]  [VZOR]         seznam domén (domain)\n"
 
-#: help.c:205
+#: help.c:202
+#, c-format
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [VZOR]         seznam foreign tabulek\n"
+
+#: help.c:203
 #, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
 msgstr "  \\des[+] [VZOR]         seznam foreign serverů\n"
 
-#: help.c:206
+#: help.c:204
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
 msgstr "  \\deu[+] [VZOR]         seznam mapování uživatelů\n"
 
-#: help.c:207
+#: help.c:205
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dew[+] [VZOR]         seznam foreign-data wrappers\n"
+msgstr "  \\dew[+] [VZOR]         seznam foreign-data wrapperů\n"
 
-#: help.c:208
+#: help.c:206
 #, c-format
 msgid ""
 "  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
 msgstr ""
 "  \\df[antw][S+] [VZOR]   seznam [pouze agg/normal/trigger/window] funkcí\n"
 
-#: help.c:209
+#: help.c:207
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]   [VZOR]        seznam konfigurací fulltextového vyhledávání\n"
+msgstr ""
+"  \\dF[+]   [VZOR]        seznam konfigurací fulltextového vyhledávání\n"
 
-#: help.c:210
+#: help.c:208
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr "  \\dFd[+] [VZOR]         seznam slovníků fulltextového vyhledávání\n"
 
-#: help.c:211
+#: help.c:209
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr "  \\dFp[+] [VZOR]         seznam parserů fulltextového vyhledávání\n"
 
-#: help.c:212
+#: help.c:210
 #, c-format
 msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
 msgstr "  \\dFt[+] [VZOR]         seznam šablon fulltextového vyhledávání\n"
 
-#: help.c:213
+#: help.c:211
 #, c-format
-msgid "  \\dg     [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg     [VZOR]         seznam rolí (skupin)\n"
+#| msgid "  \\dg[+]  [PATTERN]      list roles (groups)\n"
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]     [VZOR]         seznam rolí\n"
 
-#: help.c:214
+#: help.c:212
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [VZOR]         seznam indexů\n"
 
-#: help.c:215
+#: help.c:213
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
-msgstr "  \\dl                    seznam \"large object\" stejné jako \\lo_list\n"
+msgstr ""
+"  \\dl                    seznam \"large object\" stejné jako \\lo_list\n"
 
-#: help.c:216
+#: help.c:214
+#, c-format
+#| msgid "  \\dt[S+] [PATTERN]      list tables\n"
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [VZOR]         seznam procedurálních jazyků\n"
+
+#: help.c:215
 #, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
+#| msgid "  \\dn[+]  [PATTERN]      list schemas\n"
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
 msgstr "  \\dn[+]  [VZOR]         seznam schémat\n"
 
-#: help.c:217
+#: help.c:216
 #, c-format
 msgid "  \\do[S]  [PATTERN]      list operators\n"
 msgstr "  \\do[S]  [VZOR]         seznam operátorů\n"
 
+#: help.c:217
+#, c-format
+#| msgid "  \\dD[S]  [PATTERN]      list domains\n"
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dO[S+]  [VZOR]         seznam collations\n"
+
 #: help.c:218
 #, c-format
 msgid ""
 "  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
 msgstr ""
-"  \\dp     [VZOR]         seznam přístupových práv tabulek, pohledů a sekvencí\n"
+"  \\dp     [VZOR]         seznam přístupových práv tabulek, pohledů a "
+"sekvencí\n"
 
 #: help.c:219
 #, c-format
+msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
+msgstr ""
+"  \\drds [VZOR1 [VZOR2]] seznam nastavení rolí pro jednotlivé databáze\n"
+
+#: help.c:220
+#, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
 msgstr "  \\ds[S+] [VZOR]         seznam sekvencí\n"
 
-#: help.c:220
+#: help.c:221
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
 msgstr "  \\dt[S+] [VZOR]         seznam tabulek\n"
 
-#: help.c:221
+#: help.c:222
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
 msgstr "  \\dT[S+] [VZOR]         seznam datových typů\n"
 
-#: help.c:222
+#: help.c:223
 #, c-format
-msgid "  \\du     [PATTERN]      list roles (users)\n"
-msgstr "  \\du     [VZOR]         seznam rolí (uživatelů)\n"
+#| msgid "  \\du[+]  [PATTERN]      list roles (users)\n"
+msgid "  \\du[+]  [PATTERN]      list roles\n"
+msgstr "  \\du[+] [VZOR]         seznam rolí (uživatelů)\n"
 
-#: help.c:223
+#: help.c:224
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
 msgstr "  \\dv[S+] [VZOR]         seznam pohledů\n"
 
-#: help.c:224
+#: help.c:225
+#, c-format
+#| msgid "  \\dt[S+] [PATTERN]      list tables\n"
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dE[S+] [VZOR]         seznam foreign tabulek\n"
+
+#: help.c:226
+#, c-format
+#| msgid "  \\dc[S]  [PATTERN]      list conversions\n"
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[+]  [VZOR]         seznam rozšíření\n"
+
+#: help.c:227
 #, c-format
 msgid "  \\l[+]                  list all databases\n"
-msgstr "  \\l[+]                  seznam databázích \n"
+msgstr "  \\l[+]                  seznam databází\n"
 
-#: help.c:225
+#: help.c:228
+#, c-format
+#| msgid ""
+#| "  \\ef [FUNCNAME]         edit function definition with external editor\n"
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf[+] [JMENOFUNKCE]      zobrazí definici funkce\n"
+
+#: help.c:229
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [VZOR]         stejné jako \\dp\n"
 
-#: help.c:228
+#: help.c:232
 #, c-format
 msgid "Formatting\n"
 msgstr "Formátování\n"
 
-#: help.c:229
+#: help.c:233
 #, c-format
 msgid ""
 "  \\a                     toggle between unaligned and aligned output mode\n"
-msgstr "" 
-"  \\a                     přepíná mezi 'unaligned' a 'aligned' modem výstupu\n"
+msgstr ""
+"  \\a                     přepíná mezi 'unaligned' a 'aligned' modem "
+"výstupu\n"
 
-#: help.c:230
+#: help.c:234
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [ŘETĚZEC]           nastaví titulek tabulky nebo odnastaví pokud není "
 "definován řetězec\n"
 
-#: help.c:231
+#: help.c:235
 #, c-format
 msgid ""
 "  \\f [STRING]            show or set field separator for unaligned query "
 "output\n"
 msgstr ""
-"  \\f [ŘETĚZEC]           nastaví nebo zobrazí oddělova�e polí pro nezarovnaný "
-"výstup dotazů\n"
+"  \\f [ŘETĚZEC]           nastaví nebo zobrazí oddělova�e polí pro "
+"nezarovnaný výstup dotazů\n"
 
-#: help.c:232
+#: help.c:236
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     zapne HTML mód výstupu (nyní %s)\n"
 
-#: help.c:234
+#: help.c:238
 #, c-format
 msgid ""
 "  \\pset NAME [VALUE]     set table output option\n"
@@ -1073,32 +1210,32 @@ msgid ""
 "pager})\n"
 msgstr ""
 "  \\pset JMÉNO [HODNOTA]  nastaví parametry výstupní tabulky\n"
-"                         (JMÉNO := {format|border|expanded|fieldsep|footer|null|\n"
+"                         (JMÉNO := {format|border|expanded|fieldsep|footer|"
+"null|\n"
 "                         recordsep|tuples_only|title|tableattr|pager})\n"
 
-#: help.c:237
+#: help.c:241
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            ukazovat pouze řádky (nyní %s)\n"
 
-#: help.c:239
+#: help.c:243
 #, c-format
 msgid ""
 "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
-msgstr ""
-"  \\T [ŘETĚZEC]           nastavení atributů HTML tagu <table>\n"
+msgstr "  \\T [ŘETĚZEC]           nastavení atributů HTML tagu <table>\n"
 
-#: help.c:240
+#: help.c:244
 #, c-format
 msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off]            zapne rozšířený mód výstupu (nyní %s)\n"
 
-#: help.c:244
+#: help.c:248
 #, c-format
 msgid "Connection\n"
 msgstr "Spojení\n"
 
-#: help.c:245
+#: help.c:249
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -1107,71 +1244,79 @@ msgstr ""
 " \\c[onnect] [DATAB�ZE|- UŽIVATEL|- HOST|- PORT|-]]\n"
 "                         vytvoří spojení do nové databáze (sou�asná \"%s\")\n"
 
-#: help.c:248
+#: help.c:252
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [KÓDOV�N�]   zobrazení nebo nastavení kódování klienta\n"
 
-#: help.c:249
+#: help.c:253
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [UŽIVATEL]   bezpe�ná změna hesla uživatele\n"
 
-#: help.c:252
+#: help.c:254
+#, c-format
+msgid ""
+"  \\conninfo              display information about current connection\n"
+msgstr "  \\conninfo              zobrazí informace o aktuálním spojení\n"
+
+#: help.c:257
 #, c-format
 msgid "Operating System\n"
 msgstr "Opera�ní systém\n"
 
-#: help.c:253
+#: help.c:258
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [ADRES�Ř]          změna aktuálního pracovního adresář\n"
 
-#: help.c:254
+#: help.c:259
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       použít sledování �asu u příkazů (nyní %s)\n"
 
-#: help.c:256
+#: help.c:261
 #, c-format
 msgid ""
 "  \\! [COMMAND]           execute command in shell or start interactive "
 "shell\n"
 msgstr ""
-"  \\! [PŘ�KAZ]            provedení příkazu v shellu nebo nastartuje interaktivní "
-"shell\n"
+"  \\! [PŘ�KAZ]            provedení příkazu v shellu nebo nastartuje "
+"interaktivní shell\n"
 
-#: help.c:259
+#: help.c:264
 #, c-format
 msgid "Variables\n"
 msgstr "Proměnné\n"
 
-#: help.c:260
+#: help.c:265
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
-msgstr "  \\prompt [TEXT] PROMĚN� vyzve uživatele, aby zadal hodnotu proměnné\n"
+msgstr ""
+"  \\prompt [TEXT] PROMĚN� vyzve uživatele, aby zadal hodnotu proměnné\n"
 
-#: help.c:261
+#: help.c:266
 #, c-format
 msgid ""
 "  \\set [NAME [VALUE]]    set internal variable, or list all if no "
 "parameters\n"
 msgstr ""
 "  \\set [PROMĚN� [HODNOTA]]\n"
-"                         nastavení interní proměnné nebo bez parametrů zobrazí\n"
+"                         nastavení interní proměnné nebo bez parametrů "
+"zobrazí\n"
 "                         seznam všech proměnných\n"
 
-#: help.c:262
+#: help.c:267
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset JMÉNO           zrušení interní proměnné\n"
 
-#: help.c:265
+#: help.c:270
 #, c-format
 msgid "Large Objects\n"
-msgstr "Velké objekty\n"
+msgstr "Velké objekty (LO)\n"
 
-#: help.c:266
+#: help.c:271
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -1188,7 +1333,7 @@ msgstr ""
 msgid "Available help:\n"
 msgstr "Dostupná nápověda:\n"
 
-#: help.c:407
+#: help.c:402
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1203,26 +1348,26 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:423
+#: help.c:418
 #, c-format
 msgid ""
-"No help available for \"%-.*s\".\n"
+"No help available for \"%s\".\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
-"Nápověda pro \"%-.*s\" je nedostupná.\n"
+"Nápověda pro \"%s\" je nedostupná.\n"
 "Pomocí \\h bez parametrů lze získat seznam dostupných nápověd.\n"
 
-#: input.c:187
+#: input.c:198
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "nelze �íst vstupní soubor: %s\n"
 
-#: input.c:347
+#: input.c:406
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "nelze uložit historii do souboru \"%s\": %s\n"
 
-#: input.c:352
+#: input.c:411
 msgid "history is not supported by this installation\n"
 msgstr "historie není podporována pro tuto instalaci\n"
 
@@ -1234,39 +1379,45 @@ msgstr "%s: není spojení s databází\n"
 #: large_obj.c:85
 #, c-format
 msgid "%s: current transaction is aborted\n"
-msgstr "%s: sou�asná transakce je jen nestandardně ukon�ena (abort)\n"
+msgstr "%s: sou�asná transakce je nestandardně ukon�ena (abort)\n"
 
 #: large_obj.c:88
 #, c-format
 msgid "%s: unknown transaction status\n"
 msgstr "%s: neznámý status transakce\n"
 
-#: large_obj.c:286
+#: large_obj.c:289 large_obj.c:300
 msgid "ID"
-msgstr ""
+msgstr "ID"
+
+#: large_obj.c:290 describe.c:147 describe.c:335 describe.c:637 describe.c:787
+#: describe.c:2513 describe.c:2631 describe.c:2968 describe.c:3599
+#: describe.c:3664
+msgid "Owner"
+msgstr "Vlastník"
 
-#: large_obj.c:287 describe.c:95 describe.c:158 describe.c:337 describe.c:490
-#: describe.c:565 describe.c:636 describe.c:759 describe.c:1237
-#: describe.c:2008 describe.c:2136 describe.c:2428 describe.c:2490
-#: describe.c:2626 describe.c:2665 describe.c:2732 describe.c:2791
-#: describe.c:2800 describe.c:2859
+#: large_obj.c:291 large_obj.c:301 describe.c:96 describe.c:159 describe.c:338
+#: describe.c:501 describe.c:590 describe.c:661 describe.c:852 describe.c:1382
+#: describe.c:2330 describe.c:2537 describe.c:2911 describe.c:2976
+#: describe.c:3041 describe.c:3177 describe.c:3216 describe.c:3283
+#: describe.c:3342 describe.c:3351 describe.c:3410 describe.c:3849
 msgid "Description"
 msgstr "Popis"
 
-#: large_obj.c:295
+#: large_obj.c:310
 msgid "Large objects"
 msgstr "Velké objekty (LO)"
 
-#: mainloop.c:156
+#: mainloop.c:159
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "Použijte \"\\q\" pro odchod z %s.\n"
 
-#: mainloop.c:182
+#: mainloop.c:189
 msgid "You are using psql, the command-line interface to PostgreSQL."
 msgstr "Používáte psql, řádkový nástroj pro připojení k PostgreSQL."
 
-#: mainloop.c:183
+#: mainloop.c:190
 #, c-format
 msgid ""
 "Type:  \\copyright for distribution terms\n"
@@ -1277,49 +1428,50 @@ msgid ""
 msgstr ""
 "Pište: \\copyright pro podmínky distribuce\n"
 "       \\h pro nápovědu k SQL příkazům\n"
-"       \\? pro nápovědu k pgsql příkazům\n"
+"       \\? pro nápovědu k psql příkazům\n"
 "       \\g nebo středník pro ukon�ení SQL příkazů\n"
 "       \\q pro ukon�ení programu\n"
 
-#: print.c:973
+#: print.c:1138
 #, c-format
 msgid "(No rows)\n"
 msgstr "(Žádné řádky)\n"
 
-#: print.c:1960
+#: print.c:2028
 #, c-format
 msgid "Interrupted\n"
-msgstr ""
+msgstr "Přerušeno\n"
 
-#: print.c:2027
+#: print.c:2097
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
-msgstr ""
+msgstr "Nelze přidat hlavi�ku k obsahu tabulky: překro�en po�et sloupců %d.\n"
 
-#: print.c:2064
+#: print.c:2137
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr ""
+"Nelze přidat buňku do obsahu tabulky: překro�en celkový po�et buněk %d.\n"
 
-#: print.c:2263
+#: print.c:2358
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "specifikován neplatný formát výstupu (interní chyba): %d"
 
-#: print.c:2351
+#: print.c:2455
 #, c-format
-msgid "(1 row)"
+msgid "(%lu row)"
 msgid_plural "(%lu rows)"
 msgstr[0] "(%lu řádka)"
 msgstr[1] "(%lu řádky)"
 msgstr[2] "(%lu řádek)"
 
-#: startup.c:217
+#: startup.c:243
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: nelze otevřít logovací soubor \"%s\": %s\n"
 
-#: startup.c:279
+#: startup.c:305
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -1328,677 +1480,788 @@ msgstr ""
 "Pro získání nápovědy napište \"help\".\n"
 "\n"
 
-#: startup.c:425
+#: startup.c:451
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: nelze nastavit parametr zobrazení \"%s\"\n"
 
-#: startup.c:464
+#: startup.c:490
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
-msgstr "%s: nelze smazat proměnná \"%s\"\n"
+msgstr "%s: nelze smazat proměnnou \"%s\"\n"
 
-#: startup.c:474
+#: startup.c:500
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
-msgstr "%s: nelze nastavit proměnná \"%s\"\n"
+msgstr "%s: nelze nastavit proměnnou \"%s\"\n"
 
-#: startup.c:511 startup.c:517
+#: startup.c:537 startup.c:543
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Zkuste \"%s --help\" pro více informací.\n"
 
-#: startup.c:534
+#: startup.c:560
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
-msgstr "%s: varování: zvláštní parametr příkazové řádky \"%s\" ignorován\n"
+msgstr "%s: varování: nadbyte�ný parametr příkazové řádky \"%s\" ignorován\n"
 
-#: startup.c:599
+#: startup.c:625
 msgid "contains support for command-line editing"
-msgstr "obsahuje podporu editaci příkazové řádky "
+msgstr "obsahuje podporu pro editaci příkazové řádky "
 
-#: describe.c:68 describe.c:235 describe.c:462 describe.c:560 describe.c:681
-#: describe.c:756 describe.c:2114 describe.c:2234 describe.c:2289
-#: describe.c:2488 describe.c:2715 describe.c:2787 describe.c:2798
-#: describe.c:2857
+#: describe.c:69 describe.c:236 describe.c:463 describe.c:585 describe.c:706
+#: describe.c:788 describe.c:849 describe.c:2504 describe.c:2698
+#: describe.c:2768 describe.c:2903 describe.c:3039 describe.c:3266
+#: describe.c:3338 describe.c:3349 describe.c:3408 describe.c:3782
+#: describe.c:3848
 msgid "Schema"
 msgstr "Schéma"
 
-#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:561
-#: describe.c:611 describe.c:682 describe.c:757 describe.c:2115
-#: describe.c:2235 describe.c:2290 describe.c:2419 describe.c:2489
-#: describe.c:2716 describe.c:2788 describe.c:2799 describe.c:2858
-#: describe.c:3048 describe.c:3107
+#: describe.c:70 describe.c:146 describe.c:237 describe.c:464 describe.c:586
+#: describe.c:636 describe.c:707 describe.c:850 describe.c:2505
+#: describe.c:2627 describe.c:2699 describe.c:2769 describe.c:2904
+#: describe.c:2967 describe.c:3040 describe.c:3267 describe.c:3339
+#: describe.c:3350 describe.c:3409 describe.c:3598 describe.c:3663
+#: describe.c:3846
 msgid "Name"
 msgstr "Jméno"
 
-#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
+#: describe.c:71 describe.c:249 describe.c:295 describe.c:312
 msgid "Result data type"
 msgstr "Datový typ výsledku"
 
-#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
+#: describe.c:85 describe.c:89 describe.c:250 describe.c:296 describe.c:313
 msgid "Argument data types"
 msgstr "Datový typ parametru"
 
-#: describe.c:113
+#: describe.c:114
 msgid "List of aggregate functions"
-msgstr "Seznam agregátních funkcí"
+msgstr "Seznam agrega�ních funkcí"
 
-#: describe.c:134
+#: describe.c:135
 #, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
-msgstr "Server (verze %d.%d) nepodporuje tablespace.\n"
+msgstr "Server (verze %d.%d) nepodporuje tablespaces.\n"
 
-#: describe.c:146 describe.c:334 describe.c:612 describe.c:2122
-#: describe.c:2420 describe.c:3049 describe.c:3108
-msgid "Owner"
-msgstr "Vlastník"
-
-#: describe.c:147
+#: describe.c:148
 msgid "Location"
 msgstr "Umístění"
 
-#: describe.c:175
+#: describe.c:176
 msgid "List of tablespaces"
 msgstr "Seznam tablespaces"
 
-#: describe.c:212
+#: describe.c:213
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
-msgstr "pro \\df můžete použít pouze tyto přepína�e [antwS+]\n"
+msgstr "pro \\df můžete použít pouze přepína�e [antwS+]\n"
 
-#: describe.c:218
+#: describe.c:219
 #, c-format
-msgid "\\df does not take a \"w\" option in %d.%d.\n"
-msgstr "pro \\df nelze použít \"w\" ve verzi %d.%d.\n"
+msgid "\\df does not take a \"w\" option with server version %d.%d\n"
+msgstr "pro \\df nelze použít volbu \"w\" ve verzi serveru %d.%d.\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:251 describe.c:297 describe.c:314
+#: describe.c:252 describe.c:298 describe.c:315
 msgid "agg"
-msgstr ""
+msgstr "agg"
 
-#: describe.c:252
+#: describe.c:253
 msgid "window"
-msgstr ""
+msgstr "window"
 
-#: describe.c:253 describe.c:298 describe.c:315 describe.c:896
+#: describe.c:254 describe.c:299 describe.c:316 describe.c:990
 msgid "trigger"
 msgstr "trigger"
 
-#: describe.c:254 describe.c:299 describe.c:316
+#: describe.c:255 describe.c:300 describe.c:317
 msgid "normal"
-msgstr "normální"
+msgstr "normal"
 
-#: describe.c:255 describe.c:300 describe.c:317 describe.c:684 describe.c:1222
-#: describe.c:2121 describe.c:2236 describe.c:3120
+#: describe.c:256 describe.c:301 describe.c:318 describe.c:710 describe.c:792
+#: describe.c:1362 describe.c:2512 describe.c:2700 describe.c:3676
 msgid "Type"
 msgstr "Typ"
 
-#: describe.c:330
-#, fuzzy
+#: describe.c:331
 msgid "immutable"
-msgstr "tabulka"
+msgstr "immutable"
 
-#: describe.c:331
+#: describe.c:332
 msgid "stable"
-msgstr "stabilní"
+msgstr "stable"
 
-#: describe.c:332
+#: describe.c:333
 msgid "volatile"
-msgstr ""
+msgstr "volatile"
 
-#: describe.c:333
+#: describe.c:334
 msgid "Volatility"
-msgstr ""
+msgstr "Volatilita"
 
-#: describe.c:335
+#: describe.c:336
 msgid "Language"
 msgstr "Jazyk"
 
-#: describe.c:336
+#: describe.c:337
 msgid "Source code"
 msgstr "Zdrojový kód"
 
-#: describe.c:434
+#: describe.c:435
 msgid "List of functions"
 msgstr "Seznam funkcí"
 
-#: describe.c:473
+#: describe.c:474
 msgid "Internal name"
 msgstr "Interní jméno"
 
-#: describe.c:474 describe.c:628 describe.c:2132
+#: describe.c:475 describe.c:653 describe.c:2529 describe.c:2533
 msgid "Size"
 msgstr "Velikost"
 
-#: describe.c:486
+#: describe.c:496
 msgid "Elements"
-msgstr "Prvky"
+msgstr "Složky"
 
-#: describe.c:529
+#: describe.c:541
 msgid "List of data types"
 msgstr "Seznam datových typů"
 
-#: describe.c:562
+#: describe.c:587
 msgid "Left arg type"
 msgstr "Typ levého arg."
 
-#: describe.c:563
+#: describe.c:588
 msgid "Right arg type"
 msgstr "Typ pravého arg."
 
-#: describe.c:564
+#: describe.c:589
 msgid "Result type"
 msgstr "Typ výsledku"
 
-#: describe.c:583
+#: describe.c:608
 msgid "List of operators"
 msgstr "Seznam operátorů"
 
-#: describe.c:613
+#: describe.c:638
 msgid "Encoding"
 msgstr "Kódování"
 
-#: describe.c:618
-msgid "Collation"
-msgstr ""
+#: describe.c:643 describe.c:2905
+#| msgid "Collation"
+msgid "Collate"
+msgstr "Collation"
 
-#: describe.c:619
-#, fuzzy
+#: describe.c:644 describe.c:2906
 msgid "Ctype"
-msgstr "Typ"
+msgstr "CType"
 
-#: describe.c:632
+#: describe.c:657
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:649
+#: describe.c:674
 msgid "List of databases"
 msgstr "Seznam databází"
 
-#: describe.c:683 describe.c:851 describe.c:2116
+#: describe.c:708 describe.c:789 describe.c:944 describe.c:2506 sql_help.c:595
+#: sql_help.c:842 sql_help.c:969 sql_help.c:1432 sql_help.c:1562
+#: sql_help.c:1596 sql_help.c:1842 sql_help.c:2000 sql_help.c:2185
+#: sql_help.c:2266 sql_help.c:2472 sql_help.c:3103 sql_help.c:3123
+#: sql_help.c:3125 sql_help.c:3126
 msgid "table"
 msgstr "tabulka"
 
-#: describe.c:683 describe.c:852 describe.c:2117
+#: describe.c:708 describe.c:945 describe.c:2507
 msgid "view"
 msgstr "pohled"
 
-#: describe.c:683 describe.c:854 describe.c:2119
+#: describe.c:708 describe.c:790 describe.c:947 describe.c:2509
 msgid "sequence"
 msgstr "sekvence"
 
-#: describe.c:695
+#: describe.c:709 describe.c:948 describe.c:2511
+#| msgid "reftable"
+msgid "foreign table"
+msgstr "foreign_tabulka"
+
 #
+#: describe.c:721
 msgid "Column access privileges"
-msgstr "Přístupová práva k attributům"
+msgstr "Přístupová práva k atributům"
 
-#: describe.c:721 describe.c:3215 describe.c:3219
+#: describe.c:747 describe.c:3993 describe.c:3997
 msgid "Access privileges"
 msgstr "Přístupová práva"
 
-#: describe.c:758
+#: describe.c:775
+#, c-format
+msgid ""
+"The server (version %d.%d) does not support altering default privileges.\n"
+msgstr "Server (verze %d.%d) nepodporuje foreign servery.\n"
+
+#: describe.c:791 describe.c:883
+msgid "function"
+msgstr "funkce"
+
+#: describe.c:815
+msgid "Default access privileges"
+msgstr "Implicitní přístupová práva"
+
+#: describe.c:851
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:770
+#: describe.c:863
 msgid "aggregate"
-msgstr "agregát"
-
-#: describe.c:790
-msgid "function"
-msgstr "funkce"
+msgstr "agregace"
 
-#: describe.c:809
+#: describe.c:902 sql_help.c:1715 sql_help.c:2833 sql_help.c:2903
+#: sql_help.c:3036 sql_help.c:3141 sql_help.c:3192
 msgid "operator"
 msgstr "operátor"
 
-#: describe.c:828
+#: describe.c:921
 msgid "data type"
 msgstr "datový typ"
 
-#: describe.c:853 describe.c:2118
+#: describe.c:946 describe.c:2508
 msgid "index"
 msgstr "index"
 
-#: describe.c:875
+#: describe.c:969
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:919
+#: describe.c:1013
 msgid "Object descriptions"
 msgstr "Popis objektu"
 
-#: describe.c:972
+#: describe.c:1066
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Nelze nalézt relaci se jménem \"%s\".\n"
 
-#: describe.c:1109
+#: describe.c:1238
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Nelze nalézt relaci se OID \"%s\".\n"
 
-#: describe.c:1184
+#: describe.c:1314
+#, c-format
+#| msgid "for table \"%s.%s\""
+msgid "Unlogged table \"%s.%s\""
+msgstr "Unlogged tabulka \"%s.%s\""
+
+#: describe.c:1317
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabulka \"%s.%s\""
 
-#: describe.c:1188
+#: describe.c:1321
 #, c-format
 msgid "View \"%s.%s\""
-msgstr "Náhled \"%s.%s\""
+msgstr "Pohled \"%s.%s\""
 
-#: describe.c:1192
+#: describe.c:1325
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sekvence \"%s.%s\""
 
-#: describe.c:1196
+#: describe.c:1330
+#, c-format
+#| msgid "Index \"%s.%s\""
+msgid "Unlogged index \"%s.%s\""
+msgstr "Unlogged index \"%s.%s\""
+
+#: describe.c:1333
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index \"%s.%s\""
 
-#: describe.c:1201
+#: describe.c:1338
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Speciální relace \"%s.%s\""
 
-#: describe.c:1205
+#: describe.c:1342
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST tabulka \"%s.%s\""
 
-#: describe.c:1209
+#: describe.c:1346
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Složený typ \"%s.%s\""
 
-#: describe.c:1221
+#: describe.c:1350
+#, c-format
+#| msgid "for table \"%s.%s\""
+msgid "Foreign table \"%s.%s\""
+msgstr "Foreign tabulka \"%s.%s\""
+
+#: describe.c:1361
 msgid "Column"
 msgstr "Sloupec"
 
-#: describe.c:1227
+#: describe.c:1369
 msgid "Modifiers"
 msgstr "Modifikátory"
 
-#: describe.c:1232
+#: describe.c:1374
 msgid "Value"
 msgstr "Hodnota"
 
-#: describe.c:1236
+#: describe.c:1377
+msgid "Definition"
+msgstr "Definice"
+
+#: describe.c:1381
 msgid "Storage"
-msgstr "Úložiště"
+msgstr "Uložení"
 
-#: describe.c:1278
+#: describe.c:1427
+#, c-format
+#| msgid "lc_collate"
+msgid "collate %s"
+msgstr "collate %s"
+
+#: describe.c:1435
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1287
+#: describe.c:1445
 #, c-format
 msgid "default %s"
 msgstr "implicitnÄ› %s"
 
-#: describe.c:1353
+#: describe.c:1536
 msgid "primary key, "
 msgstr "primární klí�,"
 
-#: describe.c:1355
+#: describe.c:1538
 msgid "unique, "
 msgstr "unikátní,"
 
-#: describe.c:1361
+#: describe.c:1544
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "pro tabulku \"%s.%s\""
 
-#: describe.c:1365
+#: describe.c:1548
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predikát (%s)"
 
-#: describe.c:1368
+#: describe.c:1551
 msgid ", clustered"
-msgstr ", klastrován"
+msgstr ", clusterován"
 
-#: describe.c:1371
+#: describe.c:1554
 msgid ", invalid"
 msgstr ", neplatný"
 
-#: describe.c:1385
+#: describe.c:1557
+msgid ", deferrable"
+msgstr ", odložitelný"
+
+#: describe.c:1560
+msgid ", initially deferred"
+msgstr ", iniciálně odložený"
+
+#: describe.c:1574
 msgid "View definition:"
 msgstr "Definice pohledu:"
 
-#: describe.c:1402 describe.c:1655
+#: describe.c:1591 describe.c:1874
 msgid "Rules:"
-msgstr "Rule:"
+msgstr "Rules:"
 
-#: describe.c:1449
+#: describe.c:1650
 msgid "Indexes:"
 msgstr "Indexy:"
 
-#: describe.c:1509
+#: describe.c:1730
 msgid "Check constraints:"
 msgstr "Kontrolní pravidla:"
 
-#: describe.c:1540
+#: describe.c:1761
 msgid "Foreign-key constraints:"
 msgstr "Podmínky cizího klí�e:"
 
-#: describe.c:1571
+#: describe.c:1792
 msgid "Referenced by:"
-msgstr ""
-
-#. translator: the first %s is a FK name, the following are
-#. * a table name and the FK definition
-#: describe.c:1576
-#, c-format
-msgid "  \"%s\" IN %s %s"
-msgstr "  \"%s\" IN %s %s"
+msgstr "Odkazovaný:"
 
-#: describe.c:1658
+#: describe.c:1877
 msgid "Disabled rules:"
-msgstr "Vypnutá pravidla:"
+msgstr "Vypnutá pravidla (rules):"
 
-#: describe.c:1661
+#: describe.c:1880
 msgid "Rules firing always:"
-msgstr "Vždy vykonávaná pravidla:"
+msgstr "Vždy spouštěná pravidla:"
 
-#: describe.c:1664
+#: describe.c:1883
 msgid "Rules firing on replica only:"
-msgstr "Pravidla vykonaná jen na replice:"
+msgstr "Pravidla spouštěná jen na replice:"
 
-#: describe.c:1760
+#: describe.c:1991
 msgid "Triggers:"
 msgstr "Triggery:"
 
-#: describe.c:1763
+#: describe.c:1994
 msgid "Disabled triggers:"
 msgstr "Vypnuté triggery:"
 
-#: describe.c:1766
+#: describe.c:1997
 msgid "Triggers firing always:"
-msgstr "Vždy vykonávané triggery:"
+msgstr "Vždy spouštěné triggery:"
 
-#: describe.c:1769
+#: describe.c:2000
 msgid "Triggers firing on replica only:"
-msgstr "Triggery vykonávané jen na replice:"
+msgstr "Triggery spouštěné jen na replice:"
 
-#: describe.c:1802
+#: describe.c:2066
 msgid "Inherits"
 msgstr "Dědí"
 
-#: describe.c:1817
+#: describe.c:2096
+#, c-format
+msgid "Number of child tables: %d (Use \\d+ to list them.)"
+msgstr "Po�et podřízených tabulek: %d (Použijte \\d+ pro jejich seznam.)"
+
+#: describe.c:2103
+msgid "Child tables"
+msgstr "Podřízené tabulky"
+
+#: describe.c:2125
+#, c-format
+msgid "Typed table of type: %s"
+msgstr ""
+
+#: describe.c:2132
 msgid "Has OIDs"
 msgstr "Má OID"
 
-#: describe.c:1820 describe.c:2293 describe.c:2366
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "yes"
 msgstr "ano"
 
-#: describe.c:1820 describe.c:2293 describe.c:2366
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "no"
 msgstr "ne"
 
-#: describe.c:1828 describe.c:3058 describe.c:3122 describe.c:3178
+#: describe.c:2143 describe.c:3614 describe.c:3678 describe.c:3734
+#: describe.c:3789
 msgid "Options"
-msgstr "Přepína�e"
+msgstr "Volby"
 
-#: describe.c:1913
+#: describe.c:2228
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: \"%s\""
 
-#. translator: before this string there's an index
-#. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:1923
+#: describe.c:2241
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace: \"%s\""
 
-#: describe.c:2001
+#: describe.c:2323
 msgid "List of roles"
 msgstr "Seznam rolí"
 
-#: describe.c:2003
+#: describe.c:2325
 msgid "Role name"
 msgstr "Jméno role"
 
-#: describe.c:2004
+#: describe.c:2326
 msgid "Attributes"
 msgstr "Atributy"
 
-#: describe.c:2005
+#: describe.c:2327
 msgid "Member of"
-msgstr ""
+msgstr "Je �lenem"
 
-#: describe.c:2016
+#: describe.c:2338
 msgid "Superuser"
 msgstr "Super-uživatel"
 
-#: describe.c:2019
+#: describe.c:2341
 msgid "No inheritance"
-msgstr ""
+msgstr "Bez dědi�nosti"
 
-#: describe.c:2022
+#: describe.c:2344
 msgid "Create role"
-msgstr "VytvoÅ™ roly"
+msgstr "VytvoÅ™ roli"
 
-#: describe.c:2025
+#: describe.c:2347
 msgid "Create DB"
 msgstr "VytvoÅ™ DB"
 
-#: describe.c:2028
+#: describe.c:2350
 msgid "Cannot login"
 msgstr "Nemohu se přihlásit"
 
-#: describe.c:2037
+#: describe.c:2354
+#| msgid "Destination"
+msgid "Replication"
+msgstr "Replikace"
+
+#: describe.c:2363
 msgid "No connections"
 msgstr "Není spojení"
 
-#: describe.c:2039
+#: describe.c:2365
 #, c-format
-msgid "1 connection"
+msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d spojení"
 msgstr[1] "%d spojení"
 msgstr[2] "%d spojení"
 
-#: describe.c:2120
+#: describe.c:2432
+#, c-format
+msgid "No per-database role settings support in this server version.\n"
+msgstr "Tato verze serveru nepodporuje nastavení rolí dle databáze.\n"
+
+#: describe.c:2443
+#, c-format
+msgid "No matching settings found.\n"
+msgstr "Odpovídající relace nebyla nalezena.\n"
+
+#: describe.c:2445
+#, c-format
+msgid "No settings found.\n"
+msgstr "Žádné nastavení nenalezeno.\n"
+
+#: describe.c:2450
+msgid "List of settings"
+msgstr "Seznam nastavení"
+
+#: describe.c:2510
 msgid "special"
 msgstr "speciální"
 
-#: describe.c:2127
+#: describe.c:2518 describe.c:3783
 msgid "Table"
 msgstr "Tabulka"
 
-#: describe.c:2186
+#: describe.c:2592
 #, c-format
 msgid "No matching relations found.\n"
-msgstr "Srovnatelná relace nebyla nalezena.\n"
+msgstr "Odpovídající relace nebyla nalezena.\n"
 
-#: describe.c:2188
+#: describe.c:2594
 #, c-format
 msgid "No relations found.\n"
-msgstr "Relace nebyla nalezena.\n"
+msgstr "Žádné relace nenalezeny.\n"
 
-#: describe.c:2193
+#: describe.c:2599
 msgid "List of relations"
 msgstr "Seznam relací"
 
-#: describe.c:2237
+#: describe.c:2635
+msgid "Trusted"
+msgstr "Důvěryhodný"
+
+#: describe.c:2643
+#| msgid "Internal name"
+msgid "Internal Language"
+msgstr "Interní Jazyk"
+
+#: describe.c:2644
+msgid "Call Handler"
+msgstr ""
+
+#: describe.c:2645 describe.c:3606
+msgid "Validator"
+msgstr "Validátor"
+
+#: describe.c:2648
+msgid "Inline Handler"
+msgstr ""
+
+#: describe.c:2669
+#| msgid "List of roles"
+msgid "List of languages"
+msgstr "Seznam jazyků"
+
+#: describe.c:2709
 msgid "Modifier"
 msgstr "Modifikátor"
 
-#: describe.c:2238
+#: describe.c:2717
 msgid "Check"
-msgstr ""
+msgstr "Kontrola"
 
-#: describe.c:2256
+#: describe.c:2735
 msgid "List of domains"
 msgstr "Seznam domén"
 
-#: describe.c:2291
+#: describe.c:2770
 msgid "Source"
-msgstr "Zdrojový kód"
+msgstr "Zdroj"
 
-#: describe.c:2292
+#: describe.c:2771
 msgid "Destination"
 msgstr "Cíl"
 
-#: describe.c:2294
+#: describe.c:2773
 msgid "Default?"
 msgstr "ImplicitnÄ›?"
 
-#: describe.c:2312
+#: describe.c:2791
 msgid "List of conversions"
 msgstr "Seznam konverzí"
 
-#: describe.c:2363
+#: describe.c:2843
 msgid "Source type"
 msgstr "Zdrojový typ"
 
-#: describe.c:2364
+#: describe.c:2844
 msgid "Target type"
 msgstr "Cílový typ"
 
-#: describe.c:2365 describe.c:2625
+#: describe.c:2845 describe.c:3176
 msgid "Function"
 msgstr "Funkce"
 
-#: describe.c:2366
+#: describe.c:2846
 msgid "in assignment"
-msgstr "v zadání"
+msgstr "v přiřazení"
 
-#: describe.c:2367
+#: describe.c:2847
 msgid "Implicit?"
 msgstr "ImplicitnÄ›?"
 
-#: describe.c:2393
+#: describe.c:2873
 msgid "List of casts"
 msgstr "Seznam přetypování"
 
-#: describe.c:2448
+#: describe.c:2941
+#| msgid "List of relations"
+msgid "List of collations"
+msgstr "Seznam collations"
+
+#: describe.c:2999
 msgid "List of schemas"
 msgstr "Seznam schémat"
 
-#: describe.c:2471 describe.c:2704 describe.c:2772 describe.c:2840
+#: describe.c:3022 describe.c:3255 describe.c:3323 describe.c:3391
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "Server (verze %d.%d) nepodporuje fulltextové vyhledávání.\n"
 
-#: describe.c:2505
+#: describe.c:3056
 msgid "List of text search parsers"
 msgstr "Seznam fulltextových parserů"
 
-#: describe.c:2548
+#: describe.c:3099
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Nelze nalézt fulltextový parser se jménem \"%s\".\n"
 
-#: describe.c:2623
+#: describe.c:3174
 msgid "Start parse"
 msgstr "Za�átek parsování"
 
-#: describe.c:2624
+#: describe.c:3175
 msgid "Method"
 msgstr "Metoda"
 
-#: describe.c:2628
+#: describe.c:3179
 msgid "Get next token"
 msgstr "Získej další token"
 
-#: describe.c:2630
+#: describe.c:3181
 msgid "End parse"
 msgstr "Konec parsování"
 
-#: describe.c:2632
+#: describe.c:3183
 msgid "Get headline"
 msgstr "Získej záhlaví"
 
-#: describe.c:2634
+#: describe.c:3185
 msgid "Get token types"
-msgstr "Získej typ tokenu"
+msgstr "Získej typy tokenu"
 
-#: describe.c:2644
+#: describe.c:3195
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Fulltextový parser \"%s.%s\""
 
-#: describe.c:2646
+#: describe.c:3197
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Fulltextový parser \"%s\""
 
-#: describe.c:2664
+#: describe.c:3215
 msgid "Token name"
 msgstr "Jméno tokenu"
 
-#: describe.c:2675
+#: describe.c:3226
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Jméno tokenu pro parser \"%s.%s\""
 
-#: describe.c:2677
+#: describe.c:3228
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Typ tokenu pro parser \"%s\""
 
-#: describe.c:2726
+#: describe.c:3277
 msgid "Template"
 msgstr "Å ablona"
 
-#: describe.c:2727
+#: describe.c:3278
 msgid "Init options"
-msgstr "Po�áte�ní nastavení"
+msgstr ""
 
-#: describe.c:2749
+#: describe.c:3300
 msgid "List of text search dictionaries"
 msgstr "Seznam fulltextových slovníků"
 
-#: describe.c:2789
-#, fuzzy
+#: describe.c:3340
 msgid "Init"
-msgstr "???"
+msgstr ""
 
-#: describe.c:2790
-#, fuzzy
+#: describe.c:3341
 msgid "Lexize"
-msgstr "???"
+msgstr ""
 
-#: describe.c:2817
+#: describe.c:3368
 msgid "List of text search templates"
 msgstr "Seznam fulltextových šablon"
 
-#: describe.c:2874
+#: describe.c:3425
 msgid "List of text search configurations"
 msgstr "Seznam fulltextových konfigurací"
 
-#: describe.c:2918
+#: describe.c:3469
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Nelze nalézt fulltextovou konfiguraci se jménem \"%s\".\n"
 
-#: describe.c:2984
+#: describe.c:3535
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:2985
+#: describe.c:3536
 msgid "Dictionaries"
 msgstr "Slovníky"
 
-#: describe.c:2996
+#: describe.c:3547
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Fulltextová konfigurace \"%s.%s\""
 
-#: describe.c:2999
+#: describe.c:3550
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Fulltextová konfigurace \"%s\""
 
-#: describe.c:3003
+#: describe.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -2007,7 +2270,7 @@ msgstr ""
 "\n"
 "Parser: \"%s.%s\""
 
-#: describe.c:3006
+#: describe.c:3557
 #, c-format
 msgid ""
 "\n"
@@ -2016,1977 +2279,1889 @@ msgstr ""
 "\n"
 "Parser: \"%s\""
 
-#: describe.c:3038
+#: describe.c:3589
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "Server (verze %d.%d) nepodporuje foreign-data wrappery.\n"
 
-#: describe.c:3050
-msgid "Validator"
-msgstr "Validátor"
+#: describe.c:3603
+msgid "Handler"
+msgstr ""
 
-#: describe.c:3074
+#: describe.c:3630
 msgid "List of foreign-data wrappers"
 msgstr "Seznam foreign-data wrapperů"
 
-#: describe.c:3097
+#: describe.c:3653
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "Server (verze %d.%d) nepodporuje foreign servery.\n"
 
-#: describe.c:3109
+#: describe.c:3665
 msgid "Foreign-data wrapper"
 msgstr "Foreign-data wrapper"
 
-#: describe.c:3121
+#: describe.c:3677 describe.c:3847
 msgid "Version"
 msgstr "Verze"
 
-#: describe.c:3140
+#: describe.c:3696
 msgid "List of foreign servers"
 msgstr "Seznam foreign serverů"
 
-#: describe.c:3163
+#: describe.c:3719
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "Server (verze %d.%d) nepodporuje mapování uživatelů.\n"
 
-#: describe.c:3172
+#: describe.c:3728 describe.c:3784
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:3173
+#: describe.c:3729
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#: describe.c:3193
+#: describe.c:3749
 msgid "List of user mappings"
 msgstr "Seznam mapování uživatelů"
 
-#: sql_help.h:25 sql_help.h:505
+#: describe.c:3772
+#, c-format
+#| msgid "The server (version %d.%d) does not support foreign servers.\n"
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "Server (verze %d.%d) nepodporuje foreign tabulky.\n"
+
+#: describe.c:3810
+#| msgid "List of foreign servers"
+msgid "List of foreign tables"
+msgstr "Seznam foreign tabulek"
+
+#: describe.c:3833 describe.c:3887
+#, c-format
+#| msgid "The server (version %d.%d) does not support tablespaces.\n"
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "Server (verze %d.%d) nepodporuje extensions.\n"
+
+#: describe.c:3864
+#| msgid "List of conversions"
+msgid "List of installed extensions"
+msgstr "Seznam instalovaných extensions"
+
+#: describe.c:3914
+#, c-format
+#| msgid "Did not find any relation named \"%s\".\n"
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "Nelze nalézt extension se jménem \"%s\".\n"
+
+#: describe.c:3917
+#, c-format
+#| msgid "Did not find any relation named \"%s\".\n"
+msgid "Did not find any extensions.\n"
+msgstr "Nelze nalézt žádnou extension.\n"
+
+#: describe.c:3961
+#| msgid "Object descriptions"
+msgid "Object Description"
+msgstr "Popis objektu"
+
+#: describe.c:3970
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr "Objekty v rozšíření \"%s\""
+
+#: sql_help.h:182 sql_help.h:837
 msgid "abort the current transaction"
 msgstr "nestandardní ukon�ení (abort) sou�asné transakce"
 
-#: sql_help.h:26
-msgid "ABORT [ WORK | TRANSACTION ]"
-msgstr "ABORT [ WORK | TRANSACTION ]"
-
-#: sql_help.h:29
+#: sql_help.h:187
 msgid "change the definition of an aggregate function"
 msgstr "změna definice agregátní funkce"
 
-#: sql_help.h:30
-msgid ""
-"ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
-"ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
-"ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
-msgstr ""
+#: sql_help.h:192
+#| msgid "change the definition of a function"
+msgid "change the definition of a collation"
+msgstr "změní definici collation"
 
-#: sql_help.h:33
+#: sql_help.h:197
 msgid "change the definition of a conversion"
 msgstr "změna definice konverze"
 
-#: sql_help.h:34
-msgid ""
-"ALTER CONVERSION name RENAME TO newname\n"
-"ALTER CONVERSION name OWNER TO newowner"
-msgstr ""
-
-#: sql_help.h:37
+#: sql_help.h:202
 msgid "change a database"
 msgstr "změní databázi"
 
-#: sql_help.h:38
-msgid ""
-"ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"\n"
-"    CONNECTION LIMIT connlimit\n"
-"\n"
-"ALTER DATABASE name RENAME TO newname\n"
-"\n"
-"ALTER DATABASE name OWNER TO new_owner\n"
-"\n"
-"ALTER DATABASE name SET TABLESPACE new_tablespace\n"
-"\n"
-"ALTER DATABASE name SET configuration_parameter { TO | = } { value | "
-"DEFAULT }\n"
-"ALTER DATABASE name SET configuration_parameter FROM CURRENT\n"
-"ALTER DATABASE name RESET configuration_parameter\n"
-"ALTER DATABASE name RESET ALL"
-msgstr ""
+#: sql_help.h:207
+msgid "define default access privileges"
+msgstr "definuje výchozí přístupová práva"
 
-#: sql_help.h:41
+#: sql_help.h:212
 msgid "change the definition of a domain"
 msgstr "změní definici domény"
 
-#: sql_help.h:42
-msgid ""
-"ALTER DOMAIN name\n"
-"    { SET DEFAULT expression | DROP DEFAULT }\n"
-"ALTER DOMAIN name\n"
-"    { SET | DROP } NOT NULL\n"
-"ALTER DOMAIN name\n"
-"    ADD domain_constraint\n"
-"ALTER DOMAIN name\n"
-"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-"ALTER DOMAIN name\n"
-"    OWNER TO new_owner \n"
-"ALTER DOMAIN name\n"
-"    SET SCHEMA new_schema"
-msgstr ""
-
-#: sql_help.h:45
+#: sql_help.h:217
+#| msgid "change the definition of a conversion"
+msgid "change the definition of an extension"
+msgstr "změna definice extension"
+
+#: sql_help.h:222
 msgid "change the definition of a foreign-data wrapper"
 msgstr "změní definici foreign-data wrapperu"
 
-#: sql_help.h:46
-msgid ""
-"ALTER FOREIGN DATA WRAPPER name\n"
-"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
-"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ]) ]\n"
-"ALTER FOREIGN DATA WRAPPER name OWNER TO new_owner"
-msgstr ""
+#: sql_help.h:227
+#| msgid "change the definition of a foreign server"
+msgid "change the definition of a foreign table"
+msgstr "změní definici foreign tabulky"
 
-#: sql_help.h:49
+#: sql_help.h:232
 msgid "change the definition of a function"
 msgstr "změní definici funkce"
 
-#: sql_help.h:50
-msgid ""
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    action [ ... ] [ RESTRICT ]\n"
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    RENAME TO new_name\n"
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    OWNER TO new_owner\n"
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    SET SCHEMA new_schema\n"
-"\n"
-"where action is one of:\n"
-"\n"
-"    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-"    IMMUTABLE | STABLE | VOLATILE\n"
-"    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    COST execution_cost\n"
-"    ROWS result_rows\n"
-"    SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"    SET configuration_parameter FROM CURRENT\n"
-"    RESET configuration_parameter\n"
-"    RESET ALL"
-msgstr ""
-
-#: sql_help.h:53
+#: sql_help.h:237
 msgid "change role name or membership"
-msgstr ""
-
-#: sql_help.h:54
-msgid ""
-"ALTER GROUP groupname ADD USER username [, ... ]\n"
-"ALTER GROUP groupname DROP USER username [, ... ]\n"
-"\n"
-"ALTER GROUP groupname RENAME TO newname"
-msgstr ""
+msgstr "změní jméno role nebo �lenství"
 
-#: sql_help.h:57
+#: sql_help.h:242
 msgid "change the definition of an index"
 msgstr "změní definici indexu"
 
-#: sql_help.h:58
-msgid ""
-"ALTER INDEX name RENAME TO new_name\n"
-"ALTER INDEX name SET TABLESPACE tablespace_name\n"
-"ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
-"ALTER INDEX name RESET ( storage_parameter [, ... ] )"
-msgstr ""
-
-#: sql_help.h:61
+#: sql_help.h:247
 msgid "change the definition of a procedural language"
 msgstr "změní definici procedurálního jazyka"
 
-#: sql_help.h:62
-msgid ""
-"ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
-"ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
-msgstr ""
+#: sql_help.h:252
+msgid "change the definition of a large object"
+msgstr "změní definici large objektu"
 
-#: sql_help.h:65
+#: sql_help.h:257
 msgid "change the definition of an operator"
 msgstr "změní definici operátoru"
 
-#: sql_help.h:66
-msgid ""
-"ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER TO "
-"newowner"
-msgstr ""
-
-#: sql_help.h:69
+#: sql_help.h:262
 msgid "change the definition of an operator class"
-msgstr "změní definici třídy operátoru"
-
-#: sql_help.h:70
-msgid ""
-"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
-"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
-msgstr ""
+msgstr "změní definici třídy operátorů"
 
-#: sql_help.h:73
+#: sql_help.h:267
 msgid "change the definition of an operator family"
-msgstr "změní definici rodiny operátoru"
+msgstr "změní definici rodiny operátorů"
 
-#: sql_help.h:74
-msgid ""
-"ALTER OPERATOR FAMILY name USING index_method ADD\n"
-"  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
-"( argument_type [, ...] )\n"
-"  } [, ... ]\n"
-"ALTER OPERATOR FAMILY name USING index_method DROP\n"
-"  {  OPERATOR strategy_number ( op_type [ , op_type ] )\n"
-"   | FUNCTION support_number ( op_type [ , op_type ] )\n"
-"  } [, ... ]\n"
-"ALTER OPERATOR FAMILY name USING index_method RENAME TO newname\n"
-"ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner"
-msgstr ""
-
-#: sql_help.h:77 sql_help.h:125
+#: sql_help.h:272 sql_help.h:332
 msgid "change a database role"
-msgstr "změní roli databáze"
-
-#: sql_help.h:78
-msgid ""
-"ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"\n"
-"ALTER ROLE name RENAME TO newname\n"
-"\n"
-"ALTER ROLE name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"ALTER ROLE name SET configuration_parameter FROM CURRENT\n"
-"ALTER ROLE name RESET configuration_parameter\n"
-"ALTER ROLE name RESET ALL"
-msgstr ""
+msgstr "změní databázovou roli"
 
-#: sql_help.h:81
+#: sql_help.h:277
 msgid "change the definition of a schema"
 msgstr "změní definici schématu"
 
-#: sql_help.h:82
-msgid ""
-"ALTER SCHEMA name RENAME TO newname\n"
-"ALTER SCHEMA name OWNER TO newowner"
-msgstr ""
-
-#: sql_help.h:85
+#: sql_help.h:282
 msgid "change the definition of a sequence generator"
 msgstr "změní definici generátoru sekvencí"
 
-#: sql_help.h:86
-msgid ""
-"ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ START [ WITH ] start ]\n"
-"    [ RESTART [ [ WITH ] restart ] ]\n"
-"    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-"    [ OWNED BY { table.column | NONE } ]\n"
-"ALTER SEQUENCE name OWNER TO new_owner\n"
-"ALTER SEQUENCE name RENAME TO new_name\n"
-"ALTER SEQUENCE name SET SCHEMA new_schema"
-msgstr ""
-
-#: sql_help.h:89
+#: sql_help.h:287
 msgid "change the definition of a foreign server"
 msgstr "změní definici foreign serveru"
 
-#: sql_help.h:90
-msgid ""
-"ALTER SERVER servername [ VERSION 'newversion' ]\n"
-"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]\n"
-"ALTER SERVER servername OWNER TO new_owner"
-msgstr ""
-
-#: sql_help.h:93
+#: sql_help.h:292
 msgid "change the definition of a table"
 msgstr "změní definici tabulky"
 
-#: sql_help.h:94
-msgid ""
-"ALTER TABLE [ ONLY ] name [ * ]\n"
-"    action [, ... ]\n"
-"ALTER TABLE [ ONLY ] name [ * ]\n"
-"    RENAME [ COLUMN ] column TO new_column\n"
-"ALTER TABLE name\n"
-"    RENAME TO new_name\n"
-"ALTER TABLE name\n"
-"    SET SCHEMA new_schema\n"
-"\n"
-"where action is one of:\n"
-"\n"
-"    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"
-"    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] column [ SET DATA ] TYPE type [ USING expression ]\n"
-"    ALTER [ COLUMN ] column SET DEFAULT expression\n"
-"    ALTER [ COLUMN ] column DROP DEFAULT\n"
-"    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"
-"    ALTER [ COLUMN ] column SET STATISTICS integer\n"
-"    ALTER [ COLUMN ] column SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
-"MAIN }\n"
-"    ADD table_constraint\n"
-"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-"    DISABLE TRIGGER [ trigger_name | ALL | USER ]\n"
-"    ENABLE TRIGGER [ trigger_name | ALL | USER ]\n"
-"    ENABLE REPLICA TRIGGER trigger_name\n"
-"    ENABLE ALWAYS TRIGGER trigger_name\n"
-"    DISABLE RULE rewrite_rule_name\n"
-"    ENABLE RULE rewrite_rule_name\n"
-"    ENABLE REPLICA RULE rewrite_rule_name\n"
-"    ENABLE ALWAYS RULE rewrite_rule_name\n"
-"    CLUSTER ON index_name\n"
-"    SET WITHOUT CLUSTER\n"
-"    SET WITH OIDS\n"
-"    SET WITHOUT OIDS\n"
-"    SET ( storage_parameter = value [, ... ] )\n"
-"    RESET ( storage_parameter [, ... ] )\n"
-"    INHERIT parent_table\n"
-"    NO INHERIT parent_table\n"
-"    OWNER TO new_owner\n"
-"    SET TABLESPACE new_tablespace"
-msgstr ""
-
-#: sql_help.h:97
+#: sql_help.h:297
 msgid "change the definition of a tablespace"
 msgstr "změní definici tablespace"
 
-#: sql_help.h:98
-msgid ""
-"ALTER TABLESPACE name RENAME TO newname\n"
-"ALTER TABLESPACE name OWNER TO newowner"
-msgstr ""
-
-#: sql_help.h:101
+#: sql_help.h:302
 msgid "change the definition of a text search configuration"
 msgstr "změní definici konfigurace fulltextového vyhledávání"
 
-#: sql_help.h:102
-msgid ""
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING REPLACE old_dictionary WITH new_dictionary\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH "
-"new_dictionary\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname\n"
-"ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
-msgstr ""
-
-#: sql_help.h:105
+#: sql_help.h:307
 msgid "change the definition of a text search dictionary"
 msgstr "změní definici slovníku pro fulltextové vyhledávání"
 
-#: sql_help.h:106
-msgid ""
-"ALTER TEXT SEARCH DICTIONARY name (\n"
-"    option [ = value ] [, ... ]\n"
-")\n"
-"ALTER TEXT SEARCH DICTIONARY name RENAME TO newname\n"
-"ALTER TEXT SEARCH DICTIONARY name OWNER TO newowner"
-msgstr ""
-
-#: sql_help.h:109
+#: sql_help.h:312
 msgid "change the definition of a text search parser"
 msgstr "změní definici parseru pro fulltextové vyhledávání"
 
-#: sql_help.h:110
-msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
-msgstr ""
-
-#: sql_help.h:113
+#: sql_help.h:317
 msgid "change the definition of a text search template"
 msgstr "změní definici šablony pro fulltextové vyhledávání"
 
-#: sql_help.h:114
-msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
-msgstr ""
-
-#: sql_help.h:117
+#: sql_help.h:322
 msgid "change the definition of a trigger"
 msgstr "změní definici triggeru"
 
-#: sql_help.h:118
-msgid "ALTER TRIGGER name ON table RENAME TO newname"
-msgstr ""
-
-#: sql_help.h:121
+#: sql_help.h:327
 msgid "change the definition of a type"
 msgstr "změní definici datového typu"
 
-#: sql_help.h:122
-msgid ""
-"ALTER TYPE name RENAME TO new_name\n"
-"ALTER TYPE name OWNER TO new_owner \n"
-"ALTER TYPE name SET SCHEMA new_schema"
-msgstr ""
-
-#: sql_help.h:126
-msgid ""
-"ALTER USER name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"\n"
-"ALTER USER name RENAME TO newname\n"
-"\n"
-"ALTER USER name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"ALTER USER name SET configuration_parameter FROM CURRENT\n"
-"ALTER USER name RESET configuration_parameter\n"
-"ALTER USER name RESET ALL"
-msgstr ""
-
-#: sql_help.h:129
+#: sql_help.h:337
 msgid "change the definition of a user mapping"
 msgstr "změní definici mapování uživatelů"
 
-#: sql_help.h:130
-msgid ""
-"ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
-"    SERVER servername\n"
-"    OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] )"
-msgstr ""
-
-#: sql_help.h:133
+#: sql_help.h:342
 msgid "change the definition of a view"
 msgstr "změní definici pohledu"
 
-#: sql_help.h:134
-msgid ""
-"ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
-"ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
-"ALTER VIEW name OWNER TO new_owner\n"
-"ALTER VIEW name RENAME TO new_name\n"
-"ALTER VIEW name SET SCHEMA new_schema"
-msgstr ""
-
-#: sql_help.h:137
+#: sql_help.h:347
 msgid "collect statistics about a database"
 msgstr "shromáždí statistické informace o databázi"
 
-#: sql_help.h:138
-msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
-msgstr ""
-
-#: sql_help.h:141 sql_help.h:553
+#: sql_help.h:352 sql_help.h:902
 msgid "start a transaction block"
 msgstr "nastartuje nový transak�ní blok"
 
-#: sql_help.h:142
-msgid ""
-"BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
-"\n"
-"where transaction_mode is one of:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
-"UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
-msgstr ""
-
-#: sql_help.h:145
+#: sql_help.h:357
 msgid "force a transaction log checkpoint"
 msgstr "vynutí checkpoint transak�ního logu"
 
-#: sql_help.h:146
-msgid "CHECKPOINT"
-msgstr ""
-
-#: sql_help.h:149
+#: sql_help.h:362
 msgid "close a cursor"
 msgstr "uzavře kursor"
 
-#: sql_help.h:150
-msgid "CLOSE { name | ALL }"
-msgstr ""
-
-#: sql_help.h:153
+#: sql_help.h:367
 msgid "cluster a table according to an index"
 msgstr "přerovná obsah tabulky dle indexu"
 
-#: sql_help.h:154
-msgid ""
-"CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
-"CLUSTER [VERBOSE]"
-msgstr ""
-
-#: sql_help.h:157
+#: sql_help.h:372
 msgid "define or change the comment of an object"
 msgstr "definuje nebo změní komentář objektu"
 
-#: sql_help.h:158
-msgid ""
-"COMMENT ON\n"
-"{\n"
-"  TABLE object_name |\n"
-"  COLUMN table_name.column_name |\n"
-"  AGGREGATE agg_name (agg_type [, ...] ) |\n"
-"  CAST (sourcetype AS targettype) |\n"
-"  CONSTRAINT constraint_name ON table_name |\n"
-"  CONVERSION object_name |\n"
-"  DATABASE object_name |\n"
-"  DOMAIN object_name |\n"
-"  FUNCTION func_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) |\n"
-"  INDEX object_name |\n"
-"  LARGE OBJECT large_object_oid |\n"
-"  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
-"  OPERATOR CLASS object_name USING index_method |\n"
-"  OPERATOR FAMILY object_name USING index_method |\n"
-"  [ PROCEDURAL ] LANGUAGE object_name |\n"
-"  ROLE object_name |\n"
-"  RULE rule_name ON table_name |\n"
-"  SCHEMA object_name |\n"
-"  SEQUENCE object_name |\n"
-"  TABLESPACE object_name |\n"
-"  TEXT SEARCH CONFIGURATION object_name |\n"
-"  TEXT SEARCH DICTIONARY object_name |\n"
-"  TEXT SEARCH PARSER object_name |\n"
-"  TEXT SEARCH TEMPLATE object_name |\n"
-"  TRIGGER trigger_name ON table_name |\n"
-"  TYPE object_name |\n"
-"  VIEW object_name\n"
-"} IS 'text'"
-msgstr ""
-
-#: sql_help.h:161 sql_help.h:433
+#: sql_help.h:377 sql_help.h:747
 msgid "commit the current transaction"
 msgstr "potvrzení aktuální transakce"
 
-#: sql_help.h:162
-msgid "COMMIT [ WORK | TRANSACTION ]"
-msgstr ""
-
-#: sql_help.h:165
+#: sql_help.h:382
 msgid "commit a transaction that was earlier prepared for two-phase commit"
-msgstr "potvrzení aktuáln?i transakce, která byla již dříve připravena pro dvojfázový commit"
-
-#: sql_help.h:166
-msgid "COMMIT PREPARED transaction_id"
 msgstr ""
+"potvrzení aktuální transakce, která byla již dříve připravena pro dvoufázový "
+"commit"
 
-#: sql_help.h:169
+#: sql_help.h:387
 msgid "copy data between a file and a table"
 msgstr "kopíruje data mezi souborem a tabulkou"
 
-#: sql_help.h:170
-msgid ""
-"COPY tablename [ ( column [, ...] ) ]\n"
-"    FROM { 'filename' | STDIN }\n"
-"    [ [ WITH ] \n"
-"          [ BINARY ]\n"
-"          [ OIDS ]\n"
-"          [ DELIMITER [ AS ] 'delimiter' ]\n"
-"          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ HEADER ]\n"
-"                [ QUOTE [ AS ] 'quote' ] \n"
-"                [ ESCAPE [ AS ] 'escape' ]\n"
-"                [ FORCE NOT NULL column [, ...] ]\n"
-"\n"
-"COPY { tablename [ ( column [, ...] ) ] | ( query ) }\n"
-"    TO { 'filename' | STDOUT }\n"
-"    [ [ WITH ] \n"
-"          [ BINARY ]\n"
-"          [ OIDS ]\n"
-"          [ DELIMITER [ AS ] 'delimiter' ]\n"
-"          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ HEADER ]\n"
-"                [ QUOTE [ AS ] 'quote' ] \n"
-"                [ ESCAPE [ AS ] 'escape' ]\n"
-"                [ FORCE QUOTE column [, ...] ]"
-msgstr ""
-
-#: sql_help.h:173
+#: sql_help.h:392
 msgid "define a new aggregate function"
-msgstr "definuje novou agregátní funkci"
-
-#: sql_help.h:174
-msgid ""
-"CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
-"    SFUNC = sfunc,\n"
-"    STYPE = state_data_type\n"
-"    [ , FINALFUNC = ffunc ]\n"
-"    [ , INITCOND = initial_condition ]\n"
-"    [ , SORTOP = sort_operator ]\n"
-")\n"
-"\n"
-"or the old syntax\n"
-"\n"
-"CREATE AGGREGATE name (\n"
-"    BASETYPE = base_type,\n"
-"    SFUNC = sfunc,\n"
-"    STYPE = state_data_type\n"
-"    [ , FINALFUNC = ffunc ]\n"
-"    [ , INITCOND = initial_condition ]\n"
-"    [ , SORTOP = sort_operator ]\n"
-")"
-msgstr ""
+msgstr "definuje novou agrefunkci"
 
-#: sql_help.h:177
+#: sql_help.h:397
 msgid "define a new cast"
 msgstr "definuje nové přetypování"
 
-#: sql_help.h:178
-msgid ""
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITH FUNCTION funcname (argtypes)\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-"\n"
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITHOUT FUNCTION\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-"\n"
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITH INOUT\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]"
-msgstr ""
-
-#: sql_help.h:181
-msgid "define a new constraint trigger"
-msgstr "defunuje nový constraint trigger"
-
-#: sql_help.h:182
-msgid ""
-"CREATE CONSTRAINT TRIGGER name\n"
-"    AFTER event [ OR ... ]\n"
-"    ON table_name\n"
-"    [ FROM referenced_table_name ]\n"
-"    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
-"DEFERRED } }\n"
-"    FOR EACH ROW\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-msgstr ""
+#: sql_help.h:402
+#| msgid "define a new function"
+msgid "define a new collation"
+msgstr "definuje novou collation"
 
-#: sql_help.h:185
+#: sql_help.h:407
 msgid "define a new encoding conversion"
 msgstr "definuje novou konverzi kódování"
 
-#: sql_help.h:186
-msgid ""
-"CREATE [ DEFAULT ] CONVERSION name\n"
-"    FOR source_encoding TO dest_encoding FROM funcname"
-msgstr ""
-
-#: sql_help.h:189
+#: sql_help.h:412
 msgid "create a new database"
 msgstr "vytvoří novou databázi"
 
-#: sql_help.h:190
-msgid ""
-"CREATE DATABASE name\n"
-"    [ [ WITH ] [ OWNER [=] dbowner ]\n"
-"           [ TEMPLATE [=] template ]\n"
-"           [ ENCODING [=] encoding ]\n"
-"           [ LC_COLLATE [=] lc_collate ]\n"
-"           [ LC_CTYPE [=] lc_ctype ]\n"
-"           [ TABLESPACE [=] tablespace ]\n"
-"           [ CONNECTION LIMIT [=] connlimit ] ]"
-msgstr ""
-
-#: sql_help.h:193
+#: sql_help.h:417
 msgid "define a new domain"
 msgstr "definuje novou atributovou doménu"
 
-#: sql_help.h:194
-msgid ""
-"CREATE DOMAIN name [ AS ] data_type\n"
-"    [ DEFAULT expression ]\n"
-"    [ constraint [ ... ] ]\n"
-"\n"
-"where constraint is:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | NULL | CHECK (expression) }"
-msgstr ""
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "instaluje rozšíření"
 
-#: sql_help.h:197
+#: sql_help.h:427
 msgid "define a new foreign-data wrapper"
 msgstr "definuje nový foreign-data wrapper"
 
-#: sql_help.h:198
-msgid ""
-"CREATE FOREIGN DATA WRAPPER name\n"
-"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
-"    [ OPTIONS ( option 'value' [, ... ] ) ]"
-msgstr ""
+#: sql_help.h:432
+#| msgid "define a new foreign server"
+msgid "define a new foreign table"
+msgstr "definuje nový foreign tabulku"
 
-#: sql_help.h:201
+#: sql_help.h:437
 msgid "define a new function"
 msgstr "definuje novou funkci"
 
-#: sql_help.h:202
-msgid ""
-"CREATE [ OR REPLACE ] FUNCTION\n"
-"    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
-"[, ...] ] )\n"
-"    [ RETURNS rettype\n"
-"      | RETURNS TABLE ( colname coltype [, ...] ) ]\n"
-"  { LANGUAGE langname\n"
-"    | WINDOW\n"
-"    | IMMUTABLE | STABLE | VOLATILE\n"
-"    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-"    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    | COST execution_cost\n"
-"    | ROWS result_rows\n"
-"    | SET configuration_parameter { TO value | = value | FROM CURRENT }\n"
-"    | AS 'definition'\n"
-"    | AS 'obj_file', 'link_symbol'\n"
-"  } ...\n"
-"    [ WITH ( attribute [, ...] ) ]"
-msgstr ""
-
-#: sql_help.h:205 sql_help.h:229 sql_help.h:285
+#: sql_help.h:442 sql_help.h:472 sql_help.h:542
 msgid "define a new database role"
 msgstr "definuje novou databázovou roli"
 
-#: sql_help.h:206
-msgid ""
-"CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-msgstr ""
-
-#: sql_help.h:209
+#: sql_help.h:447
 msgid "define a new index"
 msgstr "definuje nový index"
 
-#: sql_help.h:210
-msgid ""
-"CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
-"    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST "
-"| LAST } ] [, ...] )\n"
-"    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
-"    [ TABLESPACE tablespace ]\n"
-"    [ WHERE predicate ]"
-msgstr ""
-
-#: sql_help.h:213
+#: sql_help.h:452
 msgid "define a new procedural language"
 msgstr "definuje nový procedurální jazyk"
 
-#: sql_help.h:214
-msgid ""
-"CREATE [ PROCEDURAL ] LANGUAGE name\n"
-"CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
-"    HANDLER call_handler [ VALIDATOR valfunction ]"
-msgstr ""
-
-#: sql_help.h:217
+#: sql_help.h:457
 msgid "define a new operator"
 msgstr "definuje nový operátor"
 
-#: sql_help.h:218
-msgid ""
-"CREATE OPERATOR name (\n"
-"    PROCEDURE = funcname\n"
-"    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"
-"    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
-"    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
-"    [, HASHES ] [, MERGES ]\n"
-")"
-msgstr ""
-
-#: sql_help.h:221
+#: sql_help.h:462
 msgid "define a new operator class"
-msgstr "definuje novou operátorovou třídu"
+msgstr "definuje novou třídu operátorů"
 
-#: sql_help.h:222
-msgid ""
-"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
-"  USING index_method [ FAMILY family_name ] AS\n"
-"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ]\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
-"( argument_type [, ...] )\n"
-"   | STORAGE storage_type\n"
-"  } [, ... ]"
-msgstr ""
-
-#: sql_help.h:225
+#: sql_help.h:467
 msgid "define a new operator family"
 msgstr "definuje novou rodinu operátorů"
 
-#: sql_help.h:226
-msgid "CREATE OPERATOR FAMILY name USING index_method"
-msgstr ""
-
-#: sql_help.h:230
-msgid ""
-"CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-msgstr ""
-
-#: sql_help.h:233
+#: sql_help.h:477
 msgid "define a new rewrite rule"
-msgstr "definuje nové pravidlo pro rewrite systém"
+msgstr "definuje nové přepisovací pravidlo (rule)"
 
-#: sql_help.h:234
-msgid ""
-"CREATE [ OR REPLACE ] RULE name AS ON event\n"
-"    TO table [ WHERE condition ]\n"
-"    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"
-msgstr ""
-
-#: sql_help.h:237
+#: sql_help.h:482
 msgid "define a new schema"
 msgstr "definuje nové schéma"
 
-#: sql_help.h:238
-msgid ""
-"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element "
-"[ ... ] ]\n"
-"CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ]"
-msgstr ""
-
-#: sql_help.h:241
+#: sql_help.h:487
 msgid "define a new sequence generator"
 msgstr "definuje nový generátor sekvencí"
 
-#: sql_help.h:242
-msgid ""
-"CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-"    [ OWNED BY { table.column | NONE } ]"
-msgstr ""
-
-#: sql_help.h:245
+#: sql_help.h:492
 msgid "define a new foreign server"
 msgstr "definuje nový foreign server"
 
-#: sql_help.h:246
-msgid ""
-"CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION 'serverversion' ]\n"
-"    FOREIGN DATA WRAPPER fdwname\n"
-"    [ OPTIONS ( option 'value' [, ... ] ) ]"
-msgstr ""
-
-#: sql_help.h:249
+#: sql_help.h:497
 msgid "define a new table"
 msgstr "definuje novou tabulku"
 
-#: sql_help.h:250
-msgid ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
-"  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
-"[ ... ] ]\n"
-"    | table_constraint\n"
-"    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS "
-"| INDEXES } ] ... }\n"
-"    [, ... ]\n"
-"] )\n"
-"[ INHERITS ( parent_table [, ... ] ) ]\n"
-"[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
-"OIDS ]\n"
-"[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-"[ TABLESPACE tablespace ]\n"
-"\n"
-"where column_constraint is:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | \n"
-"  NULL | \n"
-"  UNIQUE index_parameters |\n"
-"  PRIMARY KEY index_parameters |\n"
-"  CHECK ( expression ) |\n"
-"  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH "
-"SIMPLE ]\n"
-"    [ ON DELETE action ] [ ON UPDATE action ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
-"IMMEDIATE ]\n"
-"\n"
-"and table_constraint is:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
-"  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
-"  CHECK ( expression ) |\n"
-"  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "
-"[, ... ] ) ]\n"
-"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON "
-"UPDATE action ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
-"IMMEDIATE ]\n"
-"\n"
-"index_parameters in UNIQUE and PRIMARY KEY constraints are:\n"
-"\n"
-"[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
-"[ USING INDEX TABLESPACE tablespace ]"
-msgstr ""
-
-#: sql_help.h:253 sql_help.h:525
+#: sql_help.h:502 sql_help.h:867
 msgid "define a new table from the results of a query"
 msgstr "definuje novou tabulku dle výsledku dotazu"
 
-#: sql_help.h:254
-msgid ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
-"    [ (column_name [, ...] ) ]\n"
-"    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
-"OIDS ]\n"
-"    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-"    [ TABLESPACE tablespace ]\n"
-"    AS query\n"
-"    [ WITH [ NO ] DATA ]"
-msgstr ""
-
-#: sql_help.h:257
+#: sql_help.h:507
 msgid "define a new tablespace"
 msgstr "definuje nový tablespace"
 
-#: sql_help.h:258
-msgid ""
-"CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
-msgstr ""
-
-#: sql_help.h:261
+#: sql_help.h:512
 msgid "define a new text search configuration"
 msgstr "definuje novou konfiguraci fulltextového vyhledávání"
 
-#: sql_help.h:262
-msgid ""
-"CREATE TEXT SEARCH CONFIGURATION name (\n"
-"    PARSER = parser_name |\n"
-"    COPY = source_config\n"
-")"
-msgstr ""
-
-#: sql_help.h:265
+#: sql_help.h:517
 msgid "define a new text search dictionary"
 msgstr "definuje nový slovník pro fulltextové vyhledávání"
 
-#: sql_help.h:266
-msgid ""
-"CREATE TEXT SEARCH DICTIONARY name (\n"
-"    TEMPLATE = template\n"
-"    [, option = value [, ... ]]\n"
-")"
-msgstr ""
-
-#: sql_help.h:269
+#: sql_help.h:522
 msgid "define a new text search parser"
 msgstr "definuje nový parser pro fulltextové vyhledávání"
 
-#: sql_help.h:270
-msgid ""
-"CREATE TEXT SEARCH PARSER name (\n"
-"    START = start_function ,\n"
-"    GETTOKEN = gettoken_function ,\n"
-"    END = end_function ,\n"
-"    LEXTYPES = lextypes_function\n"
-"    [, HEADLINE = headline_function ]\n"
-")"
-msgstr ""
-
-#: sql_help.h:273
+#: sql_help.h:527
 msgid "define a new text search template"
 msgstr "definuje novou šablonu pro fulltextové vyhledávání"
 
-#: sql_help.h:274
-msgid ""
-"CREATE TEXT SEARCH TEMPLATE name (\n"
-"    [ INIT = init_function , ]\n"
-"    LEXIZE = lexize_function\n"
-")"
-msgstr ""
-
-#: sql_help.h:277
+#: sql_help.h:532
 msgid "define a new trigger"
 msgstr "definuje nový trigger"
 
-#: sql_help.h:278
-msgid ""
-"CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
-"    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-msgstr ""
-
-#: sql_help.h:281
+#: sql_help.h:537
 msgid "define a new data type"
 msgstr "definuje nový datový typ"
 
-#: sql_help.h:282
-msgid ""
-"CREATE TYPE name AS\n"
-"    ( attribute_name data_type [, ... ] )\n"
-"\n"
-"CREATE TYPE name AS ENUM\n"
-"    ( 'label' [, ... ] )\n"
-"\n"
-"CREATE TYPE name (\n"
-"    INPUT = input_function,\n"
-"    OUTPUT = output_function\n"
-"    [ , RECEIVE = receive_function ]\n"
-"    [ , SEND = send_function ]\n"
-"    [ , TYPMOD_IN = type_modifier_input_function ]\n"
-"    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
-"    [ , ANALYZE = analyze_function ]\n"
-"    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
-"    [ , PASSEDBYVALUE ]\n"
-"    [ , ALIGNMENT = alignment ]\n"
-"    [ , STORAGE = storage ]\n"
-"    [ , LIKE = like_type ]\n"
-"    [ , CATEGORY = category ]\n"
-"    [ , PREFERRED = preferred ]\n"
-"    [ , DEFAULT = default ]\n"
-"    [ , ELEMENT = element ]\n"
-"    [ , DELIMITER = delimiter ]\n"
-")\n"
-"\n"
-"CREATE TYPE name"
-msgstr ""
-
-#: sql_help.h:286
-msgid ""
-"CREATE USER name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-msgstr ""
-
-#: sql_help.h:289
+#: sql_help.h:547
 msgid "define a new mapping of a user to a foreign server"
-msgstr ""
-
-#: sql_help.h:290
-msgid ""
-"CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
-"    SERVER servername\n"
-"    [ OPTIONS ( option 'value' [ , ... ] ) ]"
-msgstr ""
+msgstr "definuje nové mapování uživatele na vzdálený server"
 
-#: sql_help.h:293
+#: sql_help.h:552
 msgid "define a new view"
-msgstr "definuje nový náhled"
+msgstr "definuje nový pohled"
 
-#: sql_help.h:294
-msgid ""
-"CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
-"[, ...] ) ]\n"
-"    AS query"
-msgstr ""
-
-#: sql_help.h:297
+#: sql_help.h:557
 msgid "deallocate a prepared statement"
-msgstr "dealokuje uložený příkaz"
+msgstr "dealokuje připravený dotaz (prepared statement)"
 
-#: sql_help.h:298
-msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
-msgstr ""
-
-#: sql_help.h:301
+#: sql_help.h:562
 msgid "define a cursor"
 msgstr "definuje kursor"
 
-#: sql_help.h:302
-msgid ""
-"DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
-msgstr ""
-
-#: sql_help.h:305
+#: sql_help.h:567
 msgid "delete rows of a table"
 msgstr "smaže řádky z takulky"
 
-#: sql_help.h:306
-msgid ""
-"DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
-"    [ USING usinglist ]\n"
-"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-msgstr ""
-
-#: sql_help.h:309
+#: sql_help.h:572
 msgid "discard session state"
-msgstr ""
+msgstr "zahodí stav session"
 
-#: sql_help.h:310
-msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
-msgstr ""
+#: sql_help.h:577
+msgid "execute an anonymous code block"
+msgstr "spustí anonymní blok kódu"
 
-#: sql_help.h:313
+#: sql_help.h:582
 msgid "remove an aggregate function"
-msgstr "odstraní agregátní funkci"
-
-#: sql_help.h:314
-msgid ""
-"DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "odstraní agrega�ní funkci"
 
-#: sql_help.h:317
+#: sql_help.h:587
 msgid "remove a cast"
 msgstr "odstraní definici přetypování"
 
-#: sql_help.h:318
-msgid ""
-"DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
-msgstr ""
+#: sql_help.h:592
+#| msgid "remove a function"
+msgid "remove a collation"
+msgstr "odstraní collation"
 
-#: sql_help.h:321
+#: sql_help.h:597
 msgid "remove a conversion"
 msgstr "odstraní konverzi"
 
-#: sql_help.h:322
-msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:325
+#: sql_help.h:602
 msgid "remove a database"
 msgstr "odstraní databázi"
 
-#: sql_help.h:326
-msgid "DROP DATABASE [ IF EXISTS ] name"
-msgstr ""
-
-#: sql_help.h:329
+#: sql_help.h:607
 msgid "remove a domain"
-msgstr "odstraní atributovou doménu"
+msgstr "odstraní doménu"
 
-#: sql_help.h:330
-msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+#: sql_help.h:612
+#| msgid "remove a conversion"
+msgid "remove an extension"
+msgstr "odstraní extension"
 
-#: sql_help.h:333
+#: sql_help.h:617
 msgid "remove a foreign-data wrapper"
 msgstr "odstraní foreign-data wrapper"
 
-#: sql_help.h:334
-msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
+#: sql_help.h:622
+#| msgid "remove a table"
+msgid "remove a foreign table"
+msgstr "odstraní foreign tabulku"
 
-#: sql_help.h:337
+#: sql_help.h:627
 msgid "remove a function"
 msgstr "odstraní funkci"
 
-#: sql_help.h:338
-msgid ""
-"DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype "
-"[, ...] ] )\n"
-"    [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:341 sql_help.h:369 sql_help.h:421
+#: sql_help.h:632 sql_help.h:667 sql_help.h:732
 msgid "remove a database role"
 msgstr "odstraní databázovou roli"
 
-#: sql_help.h:342
-msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
-msgstr ""
-
-#: sql_help.h:345
+#: sql_help.h:637
 msgid "remove an index"
 msgstr "odstraní index"
 
-#: sql_help.h:346
-msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:349
+#: sql_help.h:642
 msgid "remove a procedural language"
 msgstr "odstraní procedurální jazyk"
 
-#: sql_help.h:350
-msgid "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:353
+#: sql_help.h:647
 msgid "remove an operator"
 msgstr "odstraní operátor"
 
-#: sql_help.h:354
-msgid ""
-"DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
-"NONE } ) [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:357
+#: sql_help.h:652
 msgid "remove an operator class"
-msgstr "odstraní operátorovou třídu"
-
-#: sql_help.h:358
-msgid ""
-"DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
-"RESTRICT ]"
-msgstr ""
+msgstr "odstraní třídu operátorů"
 
-#: sql_help.h:361
+#: sql_help.h:657
 msgid "remove an operator family"
 msgstr "odstraní rodinu operátorů"
 
-#: sql_help.h:362
-msgid ""
-"DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
-"RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:365
+#: sql_help.h:662
 msgid "remove database objects owned by a database role"
 msgstr "odstraní objekty vlastněné databázovou rolí"
 
-#: sql_help.h:366
-msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:370
-msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
-msgstr ""
-
-#: sql_help.h:373
+#: sql_help.h:672
 msgid "remove a rewrite rule"
-msgstr "odstraní pravidlo pro rewrite systém"
-
-#: sql_help.h:374
-msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "odstraní přepisovací pravidlo (rule)"
 
-#: sql_help.h:377
+#: sql_help.h:677
 msgid "remove a schema"
 msgstr "odstraní schéma"
 
-#: sql_help.h:378
-msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:381
+#: sql_help.h:682
 msgid "remove a sequence"
-msgstr "odstraní sekvencí"
-
-#: sql_help.h:382
-msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "odstraní sekvenci"
 
-#: sql_help.h:385
+#: sql_help.h:687
 msgid "remove a foreign server descriptor"
 msgstr "odstraní deskriptor foreign serveru"
 
-#: sql_help.h:386
-msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:389
+#: sql_help.h:692
 msgid "remove a table"
 msgstr "odstraní tabulku"
 
-#: sql_help.h:390
-msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:393
+#: sql_help.h:697
 msgid "remove a tablespace"
 msgstr "odstraní tablespace"
 
-#: sql_help.h:394
-msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
-msgstr ""
-
-#: sql_help.h:397
+#: sql_help.h:702
 msgid "remove a text search configuration"
 msgstr "odstraní konfiguraci fulltextového vyhledávání"
 
-#: sql_help.h:398
-msgid ""
-"DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:401
+#: sql_help.h:707
 msgid "remove a text search dictionary"
 msgstr "odstraní slovn?ik pro fulltextové vyhledávání"
 
-#: sql_help.h:402
-msgid "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:405
+#: sql_help.h:712
 msgid "remove a text search parser"
 msgstr "odstraní parser pro fulltextové vyhledávání"
 
-#: sql_help.h:406
-msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:409
+#: sql_help.h:717
 msgid "remove a text search template"
 msgstr "odstraní Šablonu fulltextového vyhledávání"
 
-#: sql_help.h:410
-msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:413
+#: sql_help.h:722
 msgid "remove a trigger"
 msgstr "odstraní trigger"
 
-#: sql_help.h:414
-msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:417
+#: sql_help.h:727
 msgid "remove a data type"
 msgstr "odstraní datový typ"
 
-#: sql_help.h:418
-msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:422
-msgid "DROP USER [ IF EXISTS ] name [, ...]"
-msgstr ""
-
-#: sql_help.h:425
+#: sql_help.h:737
 msgid "remove a user mapping for a foreign server"
 msgstr "odstraní mapování uživatele z foreign serveru"
 
-#: sql_help.h:426
-msgid ""
-"DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | "
-"PUBLIC } SERVER servername"
-msgstr ""
-
-#: sql_help.h:429
+#: sql_help.h:742
 msgid "remove a view"
 msgstr "odstraní náhled"
 
-#: sql_help.h:430
-msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:434
-msgid "END [ WORK | TRANSACTION ]"
-msgstr ""
-
-#: sql_help.h:437
+#: sql_help.h:752
 msgid "execute a prepared statement"
-msgstr "provede uložený příkaz"
-
-#: sql_help.h:438
-msgid "EXECUTE name [ ( parameter [, ...] ) ]"
-msgstr ""
+msgstr "provede připravený dotaz (prepared statement)"
 
-#: sql_help.h:441
+#: sql_help.h:757
 msgid "show the execution plan of a statement"
 msgstr "ukáže prováděcí plán dotazu"
 
-#: sql_help.h:442
-msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
-msgstr ""
-
-#: sql_help.h:445
+#: sql_help.h:762
 msgid "retrieve rows from a query using a cursor"
-msgstr "zašle řádky výsledku z dotazu kursoru"
+msgstr "na�te řádky z výsledku dotazu pomocí kursoru"
 
-#: sql_help.h:446
-msgid ""
-"FETCH [ direction { FROM | IN } ] cursorname\n"
-"\n"
-"where direction can be empty or one of:\n"
-"\n"
-"    NEXT\n"
-"    PRIOR\n"
-"    FIRST\n"
-"    LAST\n"
-"    ABSOLUTE count\n"
-"    RELATIVE count\n"
-"    count\n"
-"    ALL\n"
-"    FORWARD\n"
-"    FORWARD count\n"
-"    FORWARD ALL\n"
-"    BACKWARD\n"
-"    BACKWARD count\n"
-"    BACKWARD ALL"
-msgstr ""
-
-#: sql_help.h:449
+#: sql_help.h:767
 msgid "define access privileges"
 msgstr "definuje přístupová práva"
 
-#: sql_help.h:450
-msgid ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
-"TRIGGER }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
-"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { USAGE | SELECT | UPDATE }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE sequencename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
-"[ PRIVILEGES ] }\n"
-"    ON DATABASE dbname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN SERVER servername [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
-"[, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON LANGUAGE langname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SCHEMA schemaname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
-msgstr ""
-
-#: sql_help.h:453
+#: sql_help.h:772
 msgid "create new rows in a table"
 msgstr "přidá nové řádky do tabulky"
 
-#: sql_help.h:454
-msgid ""
-"INSERT INTO table [ ( column [, ...] ) ]\n"
-"    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | "
-"query }\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-msgstr ""
-
-#: sql_help.h:457
+#: sql_help.h:777
 msgid "listen for a notification"
 msgstr "naslouchá upozorněním"
 
-#: sql_help.h:458
-msgid "LISTEN name"
-msgstr ""
-
-#: sql_help.h:461
-msgid "load or reload a shared library file"
-msgstr "na�te nebo opětovně na�te sdílenou knihovnu"
+#: sql_help.h:782
+msgid "load a shared library file"
+msgstr "na�te sdílenou knihovnu"
 
-#: sql_help.h:462
-msgid "LOAD 'filename'"
-msgstr ""
-
-#: sql_help.h:465
+#: sql_help.h:787
 msgid "lock a table"
 msgstr "uzamkne tabulku"
 
-#: sql_help.h:466
-msgid ""
-"LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
-"\n"
-"where lockmode is one of:\n"
-"\n"
-"    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
-"    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
-msgstr ""
-
-#: sql_help.h:469
+#: sql_help.h:792
+#, fuzzy
 msgid "position a cursor"
 msgstr "přemístí kursor"
 
-#: sql_help.h:470
-msgid "MOVE [ direction { FROM | IN } ] cursorname"
-msgstr ""
-
-#: sql_help.h:473
+#: sql_help.h:797
 msgid "generate a notification"
 msgstr "generuje upozornění"
 
-#: sql_help.h:474
-msgid "NOTIFY name"
-msgstr ""
-
-#: sql_help.h:477
+#: sql_help.h:802
 msgid "prepare a statement for execution"
-msgstr "připraví a uloží příkaz pro provedení"
-
-#: sql_help.h:478
-msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
-msgstr ""
+msgstr "připraví a uloží dotaz pro provedení"
 
-#: sql_help.h:481
+#: sql_help.h:807
 msgid "prepare the current transaction for two-phase commit"
 msgstr "přípraví aktuální transakci pro dvoufázoví commit"
 
-#: sql_help.h:482
-msgid "PREPARE TRANSACTION transaction_id"
-msgstr ""
-
-#: sql_help.h:485
+#: sql_help.h:812
 msgid "change the ownership of database objects owned by a database role"
 msgstr "změní vlastníka databázových objektů vlastněných databázovou rolí"
 
-#: sql_help.h:486
-msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
-msgstr ""
-
-#: sql_help.h:489
+#: sql_help.h:817
 msgid "rebuild indexes"
 msgstr "znovuvytvoří indexy"
 
-#: sql_help.h:490
-msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
-msgstr ""
-
-#: sql_help.h:493
+#: sql_help.h:822
 msgid "destroy a previously defined savepoint"
 msgstr "odstraní dříve vytvořený savepoint"
 
-#: sql_help.h:494
-msgid "RELEASE [ SAVEPOINT ] savepoint_name"
-msgstr ""
-
-#: sql_help.h:497
+#: sql_help.h:827
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "přenastaví parametr běhu na implicitní hodnotu"
 
-#: sql_help.h:498
-msgid ""
-"RESET configuration_parameter\n"
-"RESET ALL"
-msgstr ""
-
-#: sql_help.h:501
+#: sql_help.h:832
 msgid "remove access privileges"
 msgstr "odstraní přístupová práva"
 
-#: sql_help.h:502
-msgid ""
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
-"TRIGGER }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
-"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { USAGE | SELECT | UPDATE }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE sequencename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON DATABASE dbname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN SERVER servername [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
-"[, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON LANGUAGE langname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SCHEMA schemaname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ ADMIN OPTION FOR ]\n"
-"    role [, ...] FROM rolename [, ...]\n"
-"    [ CASCADE | RESTRICT ]"
-msgstr ""
-
-#: sql_help.h:506
-msgid "ROLLBACK [ WORK | TRANSACTION ]"
-msgstr ""
-
-#: sql_help.h:509
+#: sql_help.h:842
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "zruší transakci, která byla připravena pro dvoufázový commit"
 
-#: sql_help.h:510
-msgid "ROLLBACK PREPARED transaction_id"
-msgstr ""
-
-#: sql_help.h:513
+#: sql_help.h:847
 msgid "roll back to a savepoint"
 msgstr "vrátí se na savepoint"
 
-#: sql_help.h:514
-msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
-msgstr ""
-
-#: sql_help.h:517
+#: sql_help.h:852
 msgid "define a new savepoint within the current transaction"
 msgstr "definuje nový savepoint uvnitř aktuální transakce"
 
-#: sql_help.h:518
-msgid "SAVEPOINT savepoint_name"
-msgstr ""
+#: sql_help.h:857
+#| msgid "define or change the comment of an object"
+msgid "define or change a security label applied to an object"
+msgstr "definuje nebo změní bezpe�nostní štítek aplikovaný na objekt"
 
-#: sql_help.h:521 sql_help.h:557 sql_help.h:581
+#: sql_help.h:862 sql_help.h:907 sql_help.h:937
 msgid "retrieve rows from a table or view"
 msgstr "vybere řádky z tabulky nebo náhledu"
 
-#: sql_help.h:522 sql_help.h:558 sql_help.h:582
-msgid ""
-"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ [ AS ] output_name ] [, ...]\n"
-"    [ FROM from_item [, ...] ]\n"
-"    [ WHERE condition ]\n"
-"    [ GROUP BY expression [, ...] ]\n"
-"    [ HAVING condition [, ...] ]\n"
-"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
-"LAST } ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]\n"
-"\n"
-"where from_item can be one of:\n"
-"\n"
-"    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-"    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
-"    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-"    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
-"[, ...] | column_definition [, ...] ) ]\n"
-"    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"
-"    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
-"( join_column [, ...] ) ]\n"
-"\n"
-"and with_query is:\n"
-"\n"
-"    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
-"\n"
-"TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
-msgstr ""
-
-#: sql_help.h:526
-msgid ""
-"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ [ AS ] output_name ] [, ...]\n"
-"    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
-"    [ FROM from_item [, ...] ]\n"
-"    [ WHERE condition ]\n"
-"    [ GROUP BY expression [, ...] ]\n"
-"    [ HAVING condition [, ...] ]\n"
-"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | "
-"LAST } ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
-msgstr ""
-
-#: sql_help.h:529
+#: sql_help.h:872
 msgid "change a run-time parameter"
 msgstr "změní parametry běhu"
 
-#: sql_help.h:530
+#: sql_help.h:877
+msgid "set constraint check timing for the current transaction"
+msgstr "nastaví mód kontroly omezení (constraints) pro aktuální transakci"
+
+#: sql_help.h:882
+msgid "set the current user identifier of the current session"
+msgstr "nastaví uživatelský identifikátor aktuální session"
+
+#: sql_help.h:887
 msgid ""
-"SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | 'value' "
-"| DEFAULT }\n"
-"SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
+"set the session user identifier and the current user identifier of the "
+"current session"
 msgstr ""
+"nastaví uživatelský identifikátor session a identifikátor "
+"aktuálníhouživatele pro aktuální session"
+
+#: sql_help.h:892
+msgid "set the characteristics of the current transaction"
+msgstr "nastaví charakteristiku pro aktualní trasakci"
+
+#: sql_help.h:897
+msgid "show the value of a run-time parameter"
+msgstr "zobrazí hodnoty run-time parametrů"
 
-#: sql_help.h:533
-msgid "set constraint checking modes for the current transaction"
-msgstr "nastaví constraint checking mód pro aktuální transakci"
+#: sql_help.h:912
+msgid "empty a table or set of tables"
+msgstr "zruší obsah tabulky nebo skupiny tabulek"
+
+#: sql_help.h:917
+msgid "stop listening for a notification"
+msgstr "ukon�í naslouchání připomínkám"
+
+#: sql_help.h:922
+msgid "update rows of a table"
+msgstr "aktualizuje řádky tabulky"
+
+#: sql_help.h:927
+msgid "garbage-collect and optionally analyze a database"
+msgstr "provede úklid a případně analýzu databáze"
+
+#: sql_help.h:932
+msgid "compute a set of rows"
+msgstr "spo�ítá množinu řádek"
 
-#: sql_help.h:534
-msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
+#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:44 sql_help.c:46
+#: sql_help.c:48 sql_help.c:59 sql_help.c:61 sql_help.c:63 sql_help.c:87
+#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
+#: sql_help.c:102 sql_help.c:104 sql_help.c:179 sql_help.c:181 sql_help.c:182
+#: sql_help.c:184 sql_help.c:186 sql_help.c:188 sql_help.c:276 sql_help.c:281
+#: sql_help.c:306 sql_help.c:308 sql_help.c:311 sql_help.c:313 sql_help.c:351
+#: sql_help.c:356 sql_help.c:361 sql_help.c:366 sql_help.c:404 sql_help.c:406
+#: sql_help.c:408 sql_help.c:411 sql_help.c:421 sql_help.c:423 sql_help.c:442
+#: sql_help.c:446 sql_help.c:459 sql_help.c:462 sql_help.c:465 sql_help.c:485
+#: sql_help.c:497 sql_help.c:505 sql_help.c:508 sql_help.c:511 sql_help.c:541
+#: sql_help.c:547 sql_help.c:549 sql_help.c:553 sql_help.c:556 sql_help.c:559
+#: sql_help.c:569 sql_help.c:571 sql_help.c:588 sql_help.c:597 sql_help.c:599
+#: sql_help.c:601 sql_help.c:675 sql_help.c:677 sql_help.c:680 sql_help.c:682
+#: sql_help.c:740 sql_help.c:742 sql_help.c:744 sql_help.c:747 sql_help.c:768
+#: sql_help.c:771 sql_help.c:774 sql_help.c:777 sql_help.c:781 sql_help.c:783
+#: sql_help.c:785 sql_help.c:787 sql_help.c:801 sql_help.c:804 sql_help.c:806
+#: sql_help.c:808 sql_help.c:818 sql_help.c:820 sql_help.c:830 sql_help.c:832
+#: sql_help.c:841 sql_help.c:862 sql_help.c:864 sql_help.c:866 sql_help.c:869
+#: sql_help.c:871 sql_help.c:873 sql_help.c:911 sql_help.c:917 sql_help.c:919
+#: sql_help.c:922 sql_help.c:924 sql_help.c:926 sql_help.c:951 sql_help.c:954
+#: sql_help.c:956 sql_help.c:958 sql_help.c:960 sql_help.c:1000
+#: sql_help.c:1183 sql_help.c:1191 sql_help.c:1235 sql_help.c:1239
+#: sql_help.c:1249 sql_help.c:1267 sql_help.c:1290 sql_help.c:1322
+#: sql_help.c:1367 sql_help.c:1409 sql_help.c:1431 sql_help.c:1451
+#: sql_help.c:1452 sql_help.c:1469 sql_help.c:1489 sql_help.c:1511
+#: sql_help.c:1539 sql_help.c:1560 sql_help.c:1590 sql_help.c:1771
+#: sql_help.c:1784 sql_help.c:1801 sql_help.c:1817 sql_help.c:1840
+#: sql_help.c:1883 sql_help.c:1887 sql_help.c:1889 sql_help.c:1907
+#: sql_help.c:1934 sql_help.c:1967 sql_help.c:1977 sql_help.c:1986
+#: sql_help.c:2030 sql_help.c:2048 sql_help.c:2056 sql_help.c:2064
+#: sql_help.c:2072 sql_help.c:2088 sql_help.c:2096 sql_help.c:2105
+#: sql_help.c:2116 sql_help.c:2124 sql_help.c:2132 sql_help.c:2140
+#: sql_help.c:2150 sql_help.c:2159 sql_help.c:2168 sql_help.c:2176
+#: sql_help.c:2184 sql_help.c:2193 sql_help.c:2201 sql_help.c:2217
+#: sql_help.c:2233 sql_help.c:2241 sql_help.c:2249 sql_help.c:2257
+#: sql_help.c:2265 sql_help.c:2274 sql_help.c:2282 sql_help.c:2299
+#: sql_help.c:2314 sql_help.c:2506 sql_help.c:2557 sql_help.c:2584
+#: sql_help.c:2927 sql_help.c:2973 sql_help.c:3080
+msgid "name"
+msgstr "jméno"
+
+#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:317 sql_help.c:320
+#: sql_help.c:2031
+msgid "type"
+msgstr "typ"
+
+#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:312
+#: sql_help.c:360 sql_help.c:393 sql_help.c:405 sql_help.c:422 sql_help.c:461
+#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:681
+#: sql_help.c:741 sql_help.c:784 sql_help.c:805 sql_help.c:819 sql_help.c:831
+#: sql_help.c:843 sql_help.c:870 sql_help.c:918 sql_help.c:959
+msgid "new_name"
+msgstr "nové_jméno"
+
+#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:187
+#: sql_help.c:282 sql_help.c:322 sql_help.c:365 sql_help.c:424 sql_help.c:433
+#: sql_help.c:445 sql_help.c:464 sql_help.c:510 sql_help.c:572 sql_help.c:598
+#: sql_help.c:617 sql_help.c:725 sql_help.c:743 sql_help.c:786 sql_help.c:807
+#: sql_help.c:865 sql_help.c:957
+msgid "new_owner"
+msgstr "nový_vlastník"
+
+#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:189 sql_help.c:228
+#: sql_help.c:314 sql_help.c:370 sql_help.c:449 sql_help.c:467 sql_help.c:513
+#: sql_help.c:602 sql_help.c:683 sql_help.c:788 sql_help.c:809 sql_help.c:821
+#: sql_help.c:833 sql_help.c:872 sql_help.c:961
+msgid "new_schema"
+msgstr "nové_schéma"
+
+#: sql_help.c:88 sql_help.c:279 sql_help.c:323 sql_help.c:542 sql_help.c:614
+#: sql_help.c:802 sql_help.c:912 sql_help.c:938 sql_help.c:1142
+#: sql_help.c:1147 sql_help.c:1325 sql_help.c:1343 sql_help.c:1410
+#: sql_help.c:1540 sql_help.c:1611 sql_help.c:1786 sql_help.c:1935
+#: sql_help.c:1957 sql_help.c:2332
+msgid "option"
+msgstr "volba"
+
+#: sql_help.c:89 sql_help.c:543 sql_help.c:913 sql_help.c:1411 sql_help.c:1541
+#: sql_help.c:1936
+msgid "where option can be:"
+msgstr "kde volba může být:"
+
+#: sql_help.c:90 sql_help.c:544 sql_help.c:914 sql_help.c:1274 sql_help.c:1542
+#: sql_help.c:1937
+msgid "connlimit"
+msgstr "connlimit"
+
+#: sql_help.c:96 sql_help.c:726
+msgid "new_tablespace"
+msgstr "nový_tablespace"
+
+#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:374 sql_help.c:376
+#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:920
+#: sql_help.c:923 sql_help.c:925 sql_help.c:1378 sql_help.c:2601
+#: sql_help.c:2916
+msgid "configuration_parameter"
+msgstr "konfigura�ní_parametr"
+
+#: sql_help.c:99 sql_help.c:280 sql_help.c:324 sql_help.c:375 sql_help.c:410
+#: sql_help.c:552 sql_help.c:615 sql_help.c:702 sql_help.c:720 sql_help.c:746
+#: sql_help.c:803 sql_help.c:921 sql_help.c:939 sql_help.c:1326
+#: sql_help.c:1344 sql_help.c:1379 sql_help.c:1380 sql_help.c:1439
+#: sql_help.c:1612 sql_help.c:1686 sql_help.c:1694 sql_help.c:1726
+#: sql_help.c:1748 sql_help.c:1787 sql_help.c:1958 sql_help.c:2917
+#: sql_help.c:2918
+msgid "value"
+msgstr "hodnota"
+
+#: sql_help.c:151
+msgid "target_role"
+msgstr "cílová_role"
+
+#: sql_help.c:152 sql_help.c:1575 sql_help.c:2430 sql_help.c:2437
+#: sql_help.c:2449 sql_help.c:2455 sql_help.c:2684 sql_help.c:2691
+#: sql_help.c:2703 sql_help.c:2709
+msgid "schema_name"
+msgstr "jméno_schématu"
+
+#: sql_help.c:153
+msgid "abbreviated_grant_or_revoke"
+msgstr "zkrácený_grant_nebo_revoke"
+
+#: sql_help.c:154
+msgid "where abbreviated_grant_or_revoke is one of:"
+msgstr "kde zkrácený_grant_nebo_revoke je jedno z:"
+
+#: sql_help.c:155 sql_help.c:156 sql_help.c:157 sql_help.c:158 sql_help.c:159
+#: sql_help.c:160 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
+#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1545 sql_help.c:1546
+#: sql_help.c:1547 sql_help.c:1548 sql_help.c:1549 sql_help.c:1940
+#: sql_help.c:1941 sql_help.c:1942 sql_help.c:1943 sql_help.c:1944
+#: sql_help.c:2431 sql_help.c:2435 sql_help.c:2438 sql_help.c:2440
+#: sql_help.c:2442 sql_help.c:2444 sql_help.c:2450 sql_help.c:2452
+#: sql_help.c:2454 sql_help.c:2456 sql_help.c:2458 sql_help.c:2459
+#: sql_help.c:2460 sql_help.c:2685 sql_help.c:2689 sql_help.c:2692
+#: sql_help.c:2694 sql_help.c:2696 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2706 sql_help.c:2708 sql_help.c:2710 sql_help.c:2712
+#: sql_help.c:2713 sql_help.c:2714 sql_help.c:2937
+msgid "role_name"
+msgstr "jméno_role"
+
+#: sql_help.c:180 sql_help.c:693 sql_help.c:695 sql_help.c:953 sql_help.c:1293
+#: sql_help.c:1297 sql_help.c:1435 sql_help.c:1698 sql_help.c:1708
+#: sql_help.c:1730 sql_help.c:2474 sql_help.c:2822 sql_help.c:2823
+#: sql_help.c:2827 sql_help.c:2832 sql_help.c:2891 sql_help.c:2892
+#: sql_help.c:2897 sql_help.c:2902 sql_help.c:3025 sql_help.c:3026
+#: sql_help.c:3030 sql_help.c:3035 sql_help.c:3106 sql_help.c:3108
+#: sql_help.c:3139 sql_help.c:3181 sql_help.c:3182 sql_help.c:3186
+#: sql_help.c:3191
+msgid "expression"
+msgstr "výraz"
+
+#: sql_help.c:183
+msgid "domain_constraint"
+msgstr "omezení_domény"
+
+#: sql_help.c:185 sql_help.c:708 sql_help.c:709 sql_help.c:728 sql_help.c:1059
+#: sql_help.c:1296 sql_help.c:1697 sql_help.c:1707
+msgid "constraint_name"
+msgstr "jméno_omezení"
+
+#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1308
+#: sql_help.c:2080
+msgid "extension_name"
+msgstr "název_extension"
+
+#: sql_help.c:226 sql_help.c:613
+msgid "new_version"
+msgstr "nová_verze"
+
+#: sql_help.c:230 sql_help.c:232
+msgid "member_object"
+msgstr "�lenský_objekt"
+
+#: sql_help.c:233
+msgid "where member_object is:"
+msgstr "kde �lenský_objekt je:"
+
+#: sql_help.c:234 sql_help.c:1052 sql_help.c:2771
+msgid "agg_name"
+msgstr "jméno_agregace"
+
+#: sql_help.c:235 sql_help.c:1053 sql_help.c:2772
+msgid "agg_type"
+msgstr "typ_agregace"
+
+#: sql_help.c:236 sql_help.c:1054 sql_help.c:1215 sql_help.c:1219
+#: sql_help.c:1221 sql_help.c:2039
+msgid "source_type"
+msgstr "zdrojový_typ"
+
+#: sql_help.c:237 sql_help.c:1055 sql_help.c:1216 sql_help.c:1220
+#: sql_help.c:1222 sql_help.c:2040
+msgid "target_type"
+msgstr "cílový_typ"
+
+#: sql_help.c:238 sql_help.c:239 sql_help.c:240 sql_help.c:241 sql_help.c:242
+#: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:255 sql_help.c:256
+#: sql_help.c:257 sql_help.c:258 sql_help.c:259 sql_help.c:260 sql_help.c:261
+#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1056
+#: sql_help.c:1061 sql_help.c:1062 sql_help.c:1063 sql_help.c:1064
+#: sql_help.c:1065 sql_help.c:1066 sql_help.c:1071 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1080 sql_help.c:1081 sql_help.c:1084
+#: sql_help.c:1085 sql_help.c:1086 sql_help.c:1087 sql_help.c:1088
+#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1096 sql_help.c:2768 sql_help.c:2773
+#: sql_help.c:2774 sql_help.c:2780 sql_help.c:2781 sql_help.c:2782
+#: sql_help.c:2783 sql_help.c:2784
+msgid "object_name"
+msgstr "jméno_objektu"
+
+#: sql_help.c:243 sql_help.c:495 sql_help.c:1067 sql_help.c:1217
+#: sql_help.c:1252 sql_help.c:1470 sql_help.c:1501 sql_help.c:1845
+#: sql_help.c:2445 sql_help.c:2699 sql_help.c:2775 sql_help.c:2848
+#: sql_help.c:2853 sql_help.c:3051 sql_help.c:3056 sql_help.c:3207
+#: sql_help.c:3212
+msgid "function_name"
+msgstr "jméno_funkce"
+
+#: sql_help.c:244 sql_help.c:352 sql_help.c:357 sql_help.c:362 sql_help.c:367
+#: sql_help.c:1068 sql_help.c:1368 sql_help.c:2106 sql_help.c:2446
+#: sql_help.c:2700 sql_help.c:2776
+msgid "argmode"
+msgstr "mód_argumentu"
+
+#: sql_help.c:245 sql_help.c:353 sql_help.c:358 sql_help.c:363 sql_help.c:368
+#: sql_help.c:1069 sql_help.c:1369 sql_help.c:2107 sql_help.c:2777
+msgid "argname"
+msgstr "jméno_argumentu"
+
+#: sql_help.c:246 sql_help.c:354 sql_help.c:359 sql_help.c:364 sql_help.c:369
+#: sql_help.c:1070 sql_help.c:1370 sql_help.c:2108 sql_help.c:2778
+msgid "argtype"
+msgstr "typ_argumentu"
+
+#: sql_help.c:247 sql_help.c:488 sql_help.c:1073 sql_help.c:1494
+msgid "operator_name"
+msgstr "jméno_operátoru"
+
+#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1074
+#: sql_help.c:1471 sql_help.c:2141
+msgid "left_type"
+msgstr "levý_typ"
+
+#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1075
+#: sql_help.c:1472 sql_help.c:2142
+msgid "right_type"
+msgstr "pravý_typ"
+
+#: sql_help.c:251 sql_help.c:253 sql_help.c:460 sql_help.c:463 sql_help.c:466
+#: sql_help.c:486 sql_help.c:498 sql_help.c:506 sql_help.c:509 sql_help.c:512
+#: sql_help.c:1077 sql_help.c:1079 sql_help.c:1491 sql_help.c:1512
+#: sql_help.c:1713 sql_help.c:2151 sql_help.c:2160
+msgid "index_method"
+msgstr "metoda_indexování"
+
+#: sql_help.c:277 sql_help.c:1323
+#| msgid "headline_function"
+msgid "handler_function"
+msgstr ""
+
+#: sql_help.c:278 sql_help.c:1324
+#| msgid "init_function"
+msgid "validator_function"
+msgstr ""
+
+#: sql_help.c:307 sql_help.c:355 sql_help.c:676 sql_help.c:863 sql_help.c:1704
+#: sql_help.c:1705 sql_help.c:1721 sql_help.c:1722
+msgid "action"
+msgstr "akce"
+
+#: sql_help.c:309 sql_help.c:316 sql_help.c:318 sql_help.c:319 sql_help.c:321
+#: sql_help.c:596 sql_help.c:678 sql_help.c:685 sql_help.c:689 sql_help.c:690
+#: sql_help.c:694 sql_help.c:696 sql_help.c:697 sql_help.c:698 sql_help.c:700
+#: sql_help.c:703 sql_help.c:705 sql_help.c:952 sql_help.c:955 sql_help.c:970
+#: sql_help.c:1140 sql_help.c:1144 sql_help.c:1156 sql_help.c:1157
+#: sql_help.c:1434 sql_help.c:1597 sql_help.c:1729 sql_help.c:2432
+#: sql_help.c:2433 sql_help.c:2473 sql_help.c:2686 sql_help.c:2687
+#: sql_help.c:3105 sql_help.c:3107 sql_help.c:3124 sql_help.c:3127
+msgid "column"
+msgstr "sloupec"
+
+#: sql_help.c:310 sql_help.c:679
+msgid "new_column"
+msgstr "nový_sloupec"
+
+#: sql_help.c:315 sql_help.c:371 sql_help.c:684 sql_help.c:876
+msgid "where action is one of:"
+msgstr "kde akce je jedno z:"
+
+#: sql_help.c:372 sql_help.c:1376
+msgid "execution_cost"
+msgstr "execution_cost"
+
+#: sql_help.c:373 sql_help.c:1377
+msgid "result_rows"
+msgstr "výsledné_řádky"
+
+#: sql_help.c:388 sql_help.c:390 sql_help.c:392
+msgid "group_name"
+msgstr ""
+
+#: sql_help.c:389 sql_help.c:391 sql_help.c:936 sql_help.c:1268
+#: sql_help.c:1576 sql_help.c:1578 sql_help.c:1759 sql_help.c:1955
+#: sql_help.c:2290 sql_help.c:2947
+msgid "user_name"
+msgstr "uživatel"
+
+#: sql_help.c:407 sql_help.c:1758 sql_help.c:2225 sql_help.c:2457
+#: sql_help.c:2711
+msgid "tablespace_name"
+msgstr "jméno_tablespace"
+
+#: sql_help.c:409 sql_help.c:412 sql_help.c:719 sql_help.c:721 sql_help.c:1438
+#: sql_help.c:1685 sql_help.c:1693 sql_help.c:1725 sql_help.c:1747
+msgid "storage_parameter"
+msgstr "parametr_uložení"
+
+#: sql_help.c:432 sql_help.c:1072 sql_help.c:2779
+msgid "large_object_oid"
+msgstr "oid_large_objektu"
+
+#: sql_help.c:487 sql_help.c:499 sql_help.c:1493
+msgid "strategy_number"
+msgstr "�íslo_strategie"
+
+#: sql_help.c:489 sql_help.c:490 sql_help.c:493 sql_help.c:494 sql_help.c:500
+#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1495
+#: sql_help.c:1496 sql_help.c:1499 sql_help.c:1500
+msgid "op_type"
+msgstr "typ_operátoru"
+
+#: sql_help.c:491 sql_help.c:1497
+#| msgid "family_name"
+msgid "sort_family_name"
+msgstr ""
+
+#: sql_help.c:492 sql_help.c:502 sql_help.c:1498
+msgid "support_number"
+msgstr ""
+
+#: sql_help.c:496 sql_help.c:1218 sql_help.c:1502
+msgid "argument_type"
+msgstr "typ_argumentu"
+
+#: sql_help.c:545 sql_help.c:915 sql_help.c:1412 sql_help.c:1543
+#: sql_help.c:1938
+msgid "password"
+msgstr "heslo"
+
+#: sql_help.c:546 sql_help.c:916 sql_help.c:1413 sql_help.c:1544
+#: sql_help.c:1939
+msgid "timestamp"
+msgstr "timestamp"
+
+#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2439
+#: sql_help.c:2693
+msgid "database_name"
+msgstr "jméno_databáze"
+
+#: sql_help.c:589 sql_help.c:1591
+msgid "increment"
+msgstr "inkrement"
+
+#: sql_help.c:590 sql_help.c:1592
+msgid "minvalue"
+msgstr "min_hodnota"
+
+#: sql_help.c:591 sql_help.c:1593
+msgid "maxvalue"
+msgstr "max_hodnota"
+
+#: sql_help.c:592 sql_help.c:1594 sql_help.c:2835 sql_help.c:2905
+#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
+msgid "start"
+msgstr "start"
+
+#: sql_help.c:593
+msgid "restart"
+msgstr "restart"
+
+#: sql_help.c:594 sql_help.c:1595
+msgid "cache"
+msgstr "cache"
+
+#: sql_help.c:612 sql_help.c:616 sql_help.c:937 sql_help.c:1342
+#: sql_help.c:1607 sql_help.c:1956 sql_help.c:2209 sql_help.c:2291
+#: sql_help.c:2443 sql_help.c:2697
+msgid "server_name"
+msgstr "jméno_serveru"
+
+#: sql_help.c:686 sql_help.c:691 sql_help.c:878 sql_help.c:882 sql_help.c:1291
+#: sql_help.c:1341 sql_help.c:1490 sql_help.c:1678 sql_help.c:1885
+#: sql_help.c:2558
+msgid "data_type"
+msgstr "datový_typ"
+
+#: sql_help.c:687 sql_help.c:692 sql_help.c:879 sql_help.c:883 sql_help.c:1292
+#: sql_help.c:1436 sql_help.c:1679 sql_help.c:1886
+#| msgid "Collation"
+msgid "collation"
+msgstr "collation"
+
+#: sql_help.c:688 sql_help.c:1680 sql_help.c:1691
+msgid "column_constraint"
+msgstr "omezení_sloupce"
+
+#: sql_help.c:699
+msgid "integer"
+msgstr "integer"
+
+#: sql_help.c:701 sql_help.c:704
+msgid "attribute_option"
+msgstr "volba_atributu"
+
+#: sql_help.c:706 sql_help.c:1681 sql_help.c:1692
+msgid "table_constraint"
+msgstr "omezení_tabulky"
+
+#: sql_help.c:707
+#| msgid "table_constraint"
+msgid "table_constraint_using_index"
+msgstr "omezení_tabulky_s_využitím_indexu"
+
+#: sql_help.c:710 sql_help.c:711 sql_help.c:712 sql_help.c:713 sql_help.c:1093
+msgid "trigger_name"
+msgstr "jméno_triggeru"
+
+#: sql_help.c:714 sql_help.c:715 sql_help.c:716 sql_help.c:717
+msgid "rewrite_rule_name"
+msgstr "přepisovací_pravidlo"
+
+#: sql_help.c:718 sql_help.c:729 sql_help.c:1010
+msgid "index_name"
+msgstr "jméno_indexu"
+
+#: sql_help.c:722 sql_help.c:723 sql_help.c:1682 sql_help.c:1684
+msgid "parent_table"
+msgstr "nadřízená_tabulka"
+
+#: sql_help.c:724 sql_help.c:1689
+msgid "type_name"
+msgstr "jméno_typu"
+
+#: sql_help.c:727
+#| msgid "and table_constraint is:"
+msgid "and table_constraint_using_index is:"
+msgstr "a omezení_tabulky_s_využitím_indexu je:"
+
+#: sql_help.c:745 sql_help.c:748
+msgid "tablespace_option"
+msgstr "volba_tablespace"
+
+#: sql_help.c:769 sql_help.c:772 sql_help.c:778 sql_help.c:782
+msgid "token_type"
+msgstr "typ_tokenu"
+
+#: sql_help.c:770 sql_help.c:773
+msgid "dictionary_name"
+msgstr "jméno_slovníku"
+
+#: sql_help.c:775 sql_help.c:779
+msgid "old_dictionary"
+msgstr "starý_slovník"
+
+#: sql_help.c:776 sql_help.c:780
+msgid "new_dictionary"
+msgstr "nový_slovník"
+
+#: sql_help.c:867 sql_help.c:877 sql_help.c:880 sql_help.c:881 sql_help.c:1884
+msgid "attribute_name"
+msgstr "jméno_atributu"
+
+#: sql_help.c:868
+#| msgid "attribute_name"
+msgid "new_attribute_name"
+msgstr "nové_jméno_atributu"
+
+#: sql_help.c:874
+#| msgid "new_name"
+msgid "new_enum_value"
+msgstr "nová_enum_hodnota"
+
+#: sql_help.c:875
+msgid "existing_enum_value"
+msgstr ""
+
+#: sql_help.c:984 sql_help.c:2962 sql_help.c:2963 sql_help.c:2987
+msgid "transaction_mode"
+msgstr "transak�ní_mód"
+
+#: sql_help.c:985 sql_help.c:2964 sql_help.c:2988
+msgid "where transaction_mode is one of:"
+msgstr "kde transak�ní_mód je jedno z:"
+
+#: sql_help.c:1009 sql_help.c:1060 sql_help.c:1083 sql_help.c:1094
+#: sql_help.c:1139 sql_help.c:1143 sql_help.c:1339 sql_help.c:1676
+#: sql_help.c:1688 sql_help.c:1745 sql_help.c:2429 sql_help.c:2434
+#: sql_help.c:2683 sql_help.c:2688 sql_help.c:2769 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2868 sql_help.c:2907 sql_help.c:3040
+#: sql_help.c:3042 sql_help.c:3071 sql_help.c:3196 sql_help.c:3198
+#: sql_help.c:3227
+msgid "table_name"
+msgstr "jméno_tabulky"
+
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "název_relace"
+
+#: sql_help.c:1058 sql_help.c:1340 sql_help.c:1373 sql_help.c:1677
+#: sql_help.c:1690 sql_help.c:1709 sql_help.c:1711 sql_help.c:1718
+#: sql_help.c:1746 sql_help.c:1848 sql_help.c:1968 sql_help.c:2770
+#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
+msgid "column_name"
+msgstr "jméno_sloupce"
+
+#: sql_help.c:1082
+msgid "rule_name"
+msgstr "jméno_pravidla"
+
+#: sql_help.c:1097
+msgid "text"
+msgstr "text"
+
+#: sql_help.c:1112 sql_help.c:2567 sql_help.c:2729
+msgid "transaction_id"
+msgstr "id_transakce"
+
+#: sql_help.c:1141 sql_help.c:1146 sql_help.c:2493
+msgid "filename"
+msgstr "jméno_souboru"
+
+#: sql_help.c:1145 sql_help.c:1750 sql_help.c:1969 sql_help.c:1987
+#: sql_help.c:2475
+msgid "query"
+msgstr "dotaz"
+
+#: sql_help.c:1148 sql_help.c:2335
+msgid "where option can be one of:"
+msgstr "kde volba je jedno z:"
+
+#: sql_help.c:1149
+msgid "format_name"
+msgstr "jméno_formátu"
+
+#: sql_help.c:1150 sql_help.c:1153 sql_help.c:2336 sql_help.c:2337
+#: sql_help.c:2338 sql_help.c:2339
+msgid "boolean"
+msgstr "boolean"
+
+#: sql_help.c:1151
+msgid "delimiter_character"
+msgstr "oddělovací_znak"
+
+#: sql_help.c:1152
+msgid "null_string"
+msgstr "null_string"
+
+#: sql_help.c:1154
+msgid "quote_character"
 msgstr ""
 
-#: sql_help.h:537
-msgid "set the current user identifier of the current session"
+#: sql_help.c:1155
+msgid "escape_character"
 msgstr ""
 
-#: sql_help.h:538
-msgid ""
-"SET [ SESSION | LOCAL ] ROLE rolename\n"
-"SET [ SESSION | LOCAL ] ROLE NONE\n"
-"RESET ROLE"
+#: sql_help.c:1158
+#| msgid "encoding"
+msgid "encoding_name"
+msgstr "název_kódování"
+
+#: sql_help.c:1184
+msgid "input_data_type"
+msgstr "vstupní_datový_typ"
+
+#: sql_help.c:1185 sql_help.c:1193
+msgid "sfunc"
 msgstr ""
 
-#: sql_help.h:541
-msgid ""
-"set the session user identifier and the current user identifier of the "
-"current session"
-msgstr "" 
+#: sql_help.c:1186 sql_help.c:1194
+msgid "state_data_type"
+msgstr "datový_typ_stavu"
 
-#: sql_help.h:542
-msgid ""
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
-"RESET SESSION AUTHORIZATION"
+#: sql_help.c:1187 sql_help.c:1195
+msgid "ffunc"
 msgstr ""
 
-#: sql_help.h:545
-msgid "set the characteristics of the current transaction"
-msgstr "nastaví charakteristiku pro aktualní trasakci"
+#: sql_help.c:1188 sql_help.c:1196
+msgid "initial_condition"
+msgstr "výchozí_podmínka"
 
-#: sql_help.h:546
-msgid ""
-"SET TRANSACTION transaction_mode [, ...]\n"
-"SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
-"\n"
-"where transaction_mode is one of:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
-"UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
+#: sql_help.c:1189 sql_help.c:1197
+msgid "sort_operator"
+msgstr "operátor_třídění"
+
+#: sql_help.c:1190
+msgid "or the old syntax"
+msgstr "nebo stará syntaxe"
+
+#: sql_help.c:1192
+msgid "base_type"
+msgstr "základní_typ"
+
+#: sql_help.c:1236
+#| msgid "local socket"
+msgid "locale"
+msgstr "locale"
+
+#: sql_help.c:1237 sql_help.c:1271
+msgid "lc_collate"
+msgstr "lc_collate"
+
+#: sql_help.c:1238 sql_help.c:1272
+msgid "lc_ctype"
+msgstr "lc_ctype"
+
+#: sql_help.c:1240
+#| msgid "Destination"
+msgid "existing_collation"
+msgstr "existující_collation"
+
+#: sql_help.c:1250
+msgid "source_encoding"
+msgstr "kódování_zdroje"
+
+#: sql_help.c:1251
+msgid "dest_encoding"
+msgstr "kódování_cíle"
+
+#: sql_help.c:1269 sql_help.c:1785
+msgid "template"
+msgstr "Å¡ablona"
+
+#: sql_help.c:1270
+msgid "encoding"
+msgstr "kódování"
+
+#: sql_help.c:1273 sql_help.c:1440 sql_help.c:1687 sql_help.c:1695
+#: sql_help.c:1727 sql_help.c:1749
+msgid "tablespace"
+msgstr "tablespace"
+
+#: sql_help.c:1294
+msgid "constraint"
+msgstr "omezení"
+
+#: sql_help.c:1295
+msgid "where constraint is:"
+msgstr "kde omezení je:"
+
+#: sql_help.c:1309
+#| msgid "Schema"
+msgid "schema"
+msgstr "schéma"
+
+#: sql_help.c:1310
+#| msgid "Version"
+msgid "version"
+msgstr "verze"
+
+#: sql_help.c:1311
+#| msgid "new_version"
+msgid "old_version"
+msgstr "stará_verze"
+
+#: sql_help.c:1371 sql_help.c:1699
+msgid "default_expr"
+msgstr "implicitní_výraz"
+
+#: sql_help.c:1372
+msgid "rettype"
+msgstr "návratový_typ"
+
+#: sql_help.c:1374
+msgid "column_type"
+msgstr "typ_sloupce"
+
+#: sql_help.c:1375 sql_help.c:2021 sql_help.c:2451 sql_help.c:2705
+msgid "lang_name"
+msgstr "jméno_jazyka"
+
+#: sql_help.c:1381
+msgid "definition"
+msgstr "definice"
+
+#: sql_help.c:1382
+msgid "obj_file"
+msgstr "obj_file"
+
+#: sql_help.c:1383
+msgid "link_symbol"
 msgstr ""
 
-#: sql_help.h:549
-msgid "show the value of a run-time parameter"
-msgstr "zobrazí hodnoty run-time parametrů"
+#: sql_help.c:1384
+msgid "attribute"
+msgstr "atribut"
 
-#: sql_help.h:550
-msgid ""
-"SHOW name\n"
-"SHOW ALL"
+#: sql_help.c:1419 sql_help.c:1550 sql_help.c:1945
+msgid "uid"
+msgstr "uid"
+
+#: sql_help.c:1433
+msgid "method"
+msgstr "metoda"
+
+#: sql_help.c:1437 sql_help.c:1731
+msgid "opclass"
+msgstr "třída_operátoru"
+
+#: sql_help.c:1441 sql_help.c:1717
+msgid "predicate"
+msgstr "predikát"
+
+#: sql_help.c:1453
+msgid "call_handler"
 msgstr ""
 
-#: sql_help.h:554
-msgid ""
-"START TRANSACTION [ transaction_mode [, ...] ]\n"
-"\n"
-"where transaction_mode is one of:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
-"UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
+#: sql_help.c:1454
+msgid "inline_handler"
 msgstr ""
 
-#: sql_help.h:561
-msgid "empty a table or set of tables"
-msgstr "zruší obsah tabulky nebo skupiny tabulek"
+#: sql_help.c:1455
+msgid "valfunction"
+msgstr ""
 
-#: sql_help.h:562
-msgid ""
-"TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
-"    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
+#: sql_help.c:1473
+msgid "com_op"
+msgstr "com_op"
+
+#: sql_help.c:1474
+msgid "neg_op"
+msgstr "neg_op"
+
+#: sql_help.c:1475
+msgid "res_proc"
+msgstr "res_proc"
+
+#: sql_help.c:1476
+msgid "join_proc"
+msgstr "join_proc"
+
+#: sql_help.c:1492
+msgid "family_name"
+msgstr "family_name"
+
+#: sql_help.c:1503
+msgid "storage_type"
+msgstr "typ_uložení"
+
+#: sql_help.c:1561 sql_help.c:1841
+msgid "event"
+msgstr "událost"
+
+#: sql_help.c:1563 sql_help.c:1844 sql_help.c:2003 sql_help.c:2826
+#: sql_help.c:2828 sql_help.c:2896 sql_help.c:2898 sql_help.c:3029
+#: sql_help.c:3031 sql_help.c:3110 sql_help.c:3185 sql_help.c:3187
+msgid "condition"
+msgstr "podmínka"
+
+#: sql_help.c:1564 sql_help.c:1565 sql_help.c:1566
+msgid "command"
+msgstr "příkaz"
+
+#: sql_help.c:1577 sql_help.c:1579
+msgid "schema_element"
+msgstr "prvek_schématu"
+
+#: sql_help.c:1608
+msgid "server_type"
+msgstr "typ_serveru"
+
+#: sql_help.c:1609
+msgid "server_version"
+msgstr "verze_serveru"
+
+#: sql_help.c:1610 sql_help.c:2441 sql_help.c:2695
+msgid "fdw_name"
+msgstr "fdw_jméno"
+
+#: sql_help.c:1683
+msgid "like_option"
+msgstr "like_volba"
+
+#: sql_help.c:1696
+msgid "where column_constraint is:"
+msgstr "kde omezení_sloupce je:"
+
+#: sql_help.c:1700 sql_help.c:1701 sql_help.c:1710 sql_help.c:1712
+#: sql_help.c:1716
+msgid "index_parameters"
+msgstr "parametry_indexu"
+
+#: sql_help.c:1702 sql_help.c:1719
+msgid "reftable"
+msgstr "odkazovaná_tabulka"
+
+#: sql_help.c:1703 sql_help.c:1720
+msgid "refcolumn"
+msgstr "odkazovaný_sloupec"
+
+#: sql_help.c:1706
+msgid "and table_constraint is:"
+msgstr "a omezení_tabulky je:"
+
+#: sql_help.c:1714
+msgid "exclude_element"
 msgstr ""
 
-#: sql_help.h:565
-msgid "stop listening for a notification"
-msgstr "ukon�í naslouchání připomínkám"
+#: sql_help.c:1723
+msgid "and like_option is:"
+msgstr "a like_volba je:"
+
+#: sql_help.c:1724
+msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
+msgstr "parametry_indexu v UNIQUE, PRIMARY KEY, a EXCLUDE omezeních jsou:"
 
-#: sql_help.h:566
-msgid "UNLISTEN { name | * }"
+#: sql_help.c:1728
+msgid "exclude_element in an EXCLUDE constraint is:"
+msgstr "exclude_element v EXCLUDE omezení je:"
+
+#: sql_help.c:1760
+msgid "directory"
+msgstr "adresář"
+
+#: sql_help.c:1772
+msgid "parser_name"
+msgstr "jméno_parseru"
+
+#: sql_help.c:1773
+msgid "source_config"
 msgstr ""
 
-#: sql_help.h:569
-msgid "update rows of a table"
-msgstr "aktualizuje řádky tabulky"
+#: sql_help.c:1802
+msgid "start_function"
+msgstr "start_funkce"
 
-#: sql_help.h:570
-msgid ""
-"UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
-"    SET { column = { expression | DEFAULT } |\n"
-"          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } "
-"[, ...]\n"
-"    [ FROM fromlist ]\n"
-"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
+#: sql_help.c:1803
+msgid "gettoken_function"
+msgstr "gettoken_funkce"
+
+#: sql_help.c:1804
+msgid "end_function"
+msgstr "end_function"
+
+#: sql_help.c:1805
+msgid "lextypes_function"
+msgstr "lextypes_funkce"
+
+#: sql_help.c:1806
+msgid "headline_function"
+msgstr "headline_funkce"
+
+#: sql_help.c:1818
+msgid "init_function"
+msgstr "init_funkce"
+
+#: sql_help.c:1819
+msgid "lexize_function"
+msgstr "lexize_funkce"
+
+#: sql_help.c:1843
+msgid "referenced_table_name"
+msgstr "jméno_odkazované_tabulky"
+
+#: sql_help.c:1846
+msgid "arguments"
+msgstr "argumenty"
+
+#: sql_help.c:1847
+#| msgid "where option can be one of:"
+msgid "where event can be one of:"
+msgstr "kde událost může být jedno z:"
+
+#: sql_help.c:1888 sql_help.c:2785
+msgid "label"
+msgstr "popisek"
+
+#: sql_help.c:1890
+msgid "input_function"
+msgstr "vstupní_funkce"
+
+#: sql_help.c:1891
+msgid "output_function"
+msgstr "výstupní_funkce"
+
+#: sql_help.c:1892
+msgid "receive_function"
+msgstr "receive_funkce"
+
+#: sql_help.c:1893
+msgid "send_function"
+msgstr "send_funkce"
+
+#: sql_help.c:1894
+msgid "type_modifier_input_function"
 msgstr ""
 
-#: sql_help.h:573
-msgid "garbage-collect and optionally analyze a database"
-msgstr "provede úklid a případně analýzu databáze"
+#: sql_help.c:1895
+msgid "type_modifier_output_function"
+msgstr ""
 
-#: sql_help.h:574
-msgid ""
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
-"[, ...] ) ] ]"
+#: sql_help.c:1896
+msgid "analyze_function"
+msgstr "analyze_funkce"
+
+#: sql_help.c:1897
+msgid "internallength"
+msgstr "interní_délka"
+
+#: sql_help.c:1898
+msgid "alignment"
+msgstr "zarovnání"
+
+#: sql_help.c:1899
+msgid "storage"
+msgstr "uložení"
+
+#: sql_help.c:1900
+msgid "like_type"
+msgstr "like_typ"
+
+#: sql_help.c:1901
+msgid "category"
+msgstr "kategorie"
+
+#: sql_help.c:1902
+msgid "preferred"
+msgstr "preferovaný"
+
+#: sql_help.c:1903
+msgid "default"
+msgstr "implicitní"
+
+#: sql_help.c:1904
+msgid "element"
+msgstr "prvek"
+
+#: sql_help.c:1905
+msgid "delimiter"
+msgstr "oddělova�"
+
+#: sql_help.c:1906
+#| msgid "lc_collate"
+msgid "collatable"
 msgstr ""
 
-#: sql_help.h:577
-msgid "compute a set of rows"
-msgstr "spo�ítá množinu řádek"
+#: sql_help.c:1999 sql_help.c:2471 sql_help.c:2821 sql_help.c:2890
+#: sql_help.c:3024 sql_help.c:3102 sql_help.c:3180
+msgid "with_query"
+msgstr "with_dotaz"
 
-#: sql_help.h:578
-msgid ""
-"VALUES ( expression [, ...] ) [, ...]\n"
-"    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
+#: sql_help.c:2001 sql_help.c:2840 sql_help.c:2843 sql_help.c:2846
+#: sql_help.c:2850 sql_help.c:3043 sql_help.c:3046 sql_help.c:3049
+#: sql_help.c:3053 sql_help.c:3104 sql_help.c:3199 sql_help.c:3202
+#: sql_help.c:3205 sql_help.c:3209
+msgid "alias"
+msgstr "alias"
+
+#: sql_help.c:2002
+msgid "using_list"
+msgstr "using_seznam"
+
+#: sql_help.c:2004 sql_help.c:2365 sql_help.c:2534 sql_help.c:3111
+msgid "cursor_name"
+msgstr "jméno_kurzoru"
+
+#: sql_help.c:2005 sql_help.c:2476 sql_help.c:3112
+msgid "output_expression"
+msgstr "výstupní_výraz"
+
+#: sql_help.c:2006 sql_help.c:2477 sql_help.c:2824 sql_help.c:2893
+#: sql_help.c:3027 sql_help.c:3113 sql_help.c:3183
+msgid "output_name"
+msgstr "výstupní_jméno"
+
+#: sql_help.c:2022
+msgid "code"
+msgstr "kód"
+
+#: sql_help.c:2315
+msgid "parameter"
+msgstr "parametr"
+
+#: sql_help.c:2333 sql_help.c:2334 sql_help.c:2559
+msgid "statement"
+msgstr "příkaz"
+
+#: sql_help.c:2364 sql_help.c:2533
+msgid "direction"
+msgstr "směr"
+
+#: sql_help.c:2366 sql_help.c:2535
+msgid "where direction can be empty or one of:"
+msgstr "kde směr může být prázdný nebo jedno z:"
+
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2371 sql_help.c:2536 sql_help.c:2537 sql_help.c:2538
+#: sql_help.c:2539 sql_help.c:2540 sql_help.c:2834 sql_help.c:2836
+#: sql_help.c:2904 sql_help.c:2906 sql_help.c:3037 sql_help.c:3039
+#: sql_help.c:3142 sql_help.c:3144 sql_help.c:3193 sql_help.c:3195
+msgid "count"
+msgstr "po�et"
+
+#: sql_help.c:2436 sql_help.c:2690
+msgid "sequence_name"
+msgstr "sekvence"
+
+#: sql_help.c:2447 sql_help.c:2701
+msgid "arg_name"
+msgstr "jméno_argumentu"
+
+#: sql_help.c:2448 sql_help.c:2702
+msgid "arg_type"
+msgstr "typ_argumentu"
+
+#: sql_help.c:2453 sql_help.c:2707
+msgid "loid"
+msgstr "loid"
+
+#: sql_help.c:2485 sql_help.c:2548 sql_help.c:3088
+msgid "channel"
+msgstr "kanál"
+
+#: sql_help.c:2507
+msgid "lockmode"
+msgstr "mód_zámku"
+
+#: sql_help.c:2508
+msgid "where lockmode is one of:"
+msgstr "kde mód_zámku je jedno z:"
+
+#: sql_help.c:2549
+msgid "payload"
+msgstr "náklad"
+
+#: sql_help.c:2575
+msgid "old_role"
+msgstr "stará_role"
+
+#: sql_help.c:2576
+msgid "new_role"
+msgstr "nová_role"
+
+#: sql_help.c:2592 sql_help.c:2737 sql_help.c:2745
+msgid "savepoint_name"
+msgstr "jméno_savepointu"
+
+#: sql_help.c:2767
+msgid "provider"
 msgstr ""
 
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: sql_help.c:2825 sql_help.c:2856 sql_help.c:2858 sql_help.c:2895
+#: sql_help.c:3028 sql_help.c:3059 sql_help.c:3061 sql_help.c:3184
+#: sql_help.c:3215 sql_help.c:3217
+msgid "from_item"
+msgstr "z_položky"
+
+#: sql_help.c:2829 sql_help.c:2899 sql_help.c:3032 sql_help.c:3188
+msgid "window_name"
+msgstr "jméno_okna"
+
+#: sql_help.c:2830 sql_help.c:2900 sql_help.c:3033 sql_help.c:3189
+msgid "window_definition"
+msgstr "definice_okna"
+
+#: sql_help.c:2831 sql_help.c:2842 sql_help.c:2864 sql_help.c:2901
+#: sql_help.c:3034 sql_help.c:3045 sql_help.c:3067 sql_help.c:3190
+#: sql_help.c:3201 sql_help.c:3223
+msgid "select"
+msgstr "select"
+
+#: sql_help.c:2838 sql_help.c:3041 sql_help.c:3197
+msgid "where from_item can be one of:"
+msgstr "kde z_položky může být jedno z:"
+
+#: sql_help.c:2841 sql_help.c:2844 sql_help.c:2847 sql_help.c:2851
+#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3050 sql_help.c:3054
+#: sql_help.c:3200 sql_help.c:3203 sql_help.c:3206 sql_help.c:3210
+msgid "column_alias"
+msgstr "alias_sloupce"
+
+#: sql_help.c:2845 sql_help.c:2862 sql_help.c:3048 sql_help.c:3065
+#: sql_help.c:3204 sql_help.c:3221
+msgid "with_query_name"
+msgstr "jméno_with_dotazu"
+
+#: sql_help.c:2849 sql_help.c:2854 sql_help.c:3052 sql_help.c:3057
+#: sql_help.c:3208 sql_help.c:3213
+msgid "argument"
+msgstr "argument"
+
+#: sql_help.c:2852 sql_help.c:2855 sql_help.c:3055 sql_help.c:3058
+#: sql_help.c:3211 sql_help.c:3214
+msgid "column_definition"
+msgstr "definice_sloupce"
+
+#: sql_help.c:2857 sql_help.c:3060 sql_help.c:3216
+msgid "join_type"
+msgstr "typ_joinu"
+
+#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
+msgid "join_condition"
+msgstr "joinovací_podmínka"
+
+#: sql_help.c:2860 sql_help.c:3063 sql_help.c:3219
+msgid "join_column"
+msgstr "joinovací_sloupec"
+
+#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
+msgid "and with_query is:"
+msgstr "a with_dotaz je:"
+
+#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
+msgid "insert"
+msgstr "insert "
+
+#: sql_help.c:2866 sql_help.c:3069 sql_help.c:3225
+msgid "update"
+msgstr "update"
+
+#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
+msgid "delete"
+msgstr "delete"
+
+#: sql_help.c:2894
+msgid "new_table"
+msgstr "nová_tabulka"
+
+#: sql_help.c:2919
+msgid "timezone"
+msgstr "�asová_zóna"
+
+#: sql_help.c:3109
+msgid "from_list"
+msgstr "from_seznam"
+
+#: sql_help.c:3140
+msgid "sort_expression"
+msgstr ""
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
 #, c-format
 msgid "could not identify current directory: %s"
 msgstr "nelze získat aktuální adresář: %s"
 
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
 #, c-format
 msgid "invalid binary \"%s\""
 msgstr "neplatný binární soubor\"%s\""
 
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
 #, c-format
 msgid "could not read binary \"%s\""
 msgstr "nelze �íst binární soubor \"%s\""
 
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
 #, c-format
 msgid "could not find a \"%s\" to execute"
 msgstr "nelze najít spustitelný soubor \"%s\""
 
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
 #, c-format
 msgid "could not change directory to \"%s\""
 msgstr "nelze změnit adresář na \"%s\""
 
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
 #, c-format
 msgid "could not read symbolic link \"%s\""
 msgstr "nelze �íst symbolický link \"%s\""
 
-#: ../../port/exec.c:586
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "potomek skon�il s návratovým kódem %d"
 
-#: ../../port/exec.c:590
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
-msgstr "potomek byl ukon�en vyjímkou 0x%X"
+msgstr "potomek byl ukon�en výjimkou 0x%X"
 
-#: ../../port/exec.c:599
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "potomek byl ukon�en signálem %s"
 
-#: ../../port/exec.c:602
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "potomek byl ukon�en signálem %d"
 
-#: ../../port/exec.c:606
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "potomek skon�il s nerozponaným stavem %d"
 
+#~ msgid " on host \"%s\""
+#~ msgstr " na po�íta� \"%s\""
+
+#~ msgid " at port \"%s\""
+#~ msgstr " na port \"%s\""
+
+#~ msgid " as user \"%s\""
+#~ msgstr " jako uživatel \"%s\""
+
+#~ msgid "out of memory"
+#~ msgstr "nedostatek paměti"
+
+#~ msgid "define a new constraint trigger"
+#~ msgstr "defunuje nový constraint trigger"
+
+#~ msgid "  \"%s\" IN %s %s"
+#~ msgstr "  \"%s\" IN %s %s"
+
+#~ msgid "ABORT [ WORK | TRANSACTION ]"
+#~ msgstr "ABORT [ WORK | TRANSACTION ]"
diff --git a/src/bin/psql/po/de.po b/src/bin/psql/po/de.po
index b2c9732dde487..df24a5a07bdc1 100644
--- a/src/bin/psql/po/de.po
+++ b/src/bin/psql/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for psql
 # Peter Eisentraut <peter_e@gmx.net>, 2001 - 2011.
 #
-# pgtranslation Id: psql.po,v 1.46 2011/05/21 21:37:56 petere Exp $
+# pgtranslation Id: psql.po,v 1.51 2011/11/30 06:10:52 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-21 10:41+0000\n"
-"PO-Revision-Date: 2011-05-22 00:36+0300\n"
+"POT-Creation-Date: 2011-11-29 10:44+0000\n"
+"PO-Revision-Date: 2011-11-29 21:27+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -44,9 +44,9 @@ msgstr "konnte Home-Verzeichnis nicht ermitteln: %s\n"
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: konnte nicht in das Verzeichnis »%s« wechseln: %s\n"
 
-#: command.c:305
-#, fuzzy, c-format
-msgid "You are not connected.\n"
+#: command.c:305 common.c:493 common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
 msgstr "Sie sind gegenwärtig nicht mit einer Datenbank verbunden.\n"
 
 #: command.c:312
@@ -72,117 +72,127 @@ msgstr ""
 msgid "Time: %.3f ms\n"
 msgstr "Zeit: %.3f ms\n"
 
-#: command.c:524 command.c:588 command.c:1285
+#: command.c:524 command.c:594 command.c:1297
 msgid "no query buffer\n"
 msgstr "kein Anfragepuffer\n"
 
-#: command.c:557 command.c:2504
+#: command.c:557 command.c:2519
 #, c-format
 msgid "invalid line number: %s\n"
 msgstr "ungültige Zeilennummer: %s\n"
 
-#: command.c:662
+#: command.c:588
+#, c-format
+msgid "The server (version %d.%d) does not support editing function source.\n"
+msgstr "Der Server (Version %d.%d) unterstützt das Bearbeiten des Funktionsquelltextes nicht.\n"
+
+#: command.c:668
 msgid "No changes"
 msgstr "keine Änderungen"
 
-#: command.c:716
+#: command.c:722
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: ungültiger Kodierungsname oder Umwandlungsprozedur nicht gefunden\n"
 
-#: command.c:795 command.c:829 command.c:843 command.c:860 command.c:964
-#: command.c:1014 command.c:1265 command.c:1296
+#: command.c:801 command.c:835 command.c:849 command.c:866 command.c:970
+#: command.c:1020 command.c:1277 command.c:1308
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: notwendiges Argument fehlt\n"
 
-#: command.c:892
+#: command.c:898
 msgid "Query buffer is empty."
 msgstr "Anfragepuffer ist leer."
 
-#: command.c:902
+#: command.c:908
 msgid "Enter new password: "
 msgstr "Neues Passwort eingeben: "
 
-#: command.c:903
+#: command.c:909
 msgid "Enter it again: "
 msgstr "Geben Sie es noch einmal ein: "
 
-#: command.c:907
+#: command.c:913
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Passwörter stimmten nicht überein.\n"
 
-#: command.c:925
+#: command.c:931
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Passwortverschlüsselung ist fehlgeschlagen.\n"
 
-#: command.c:993 command.c:1094 command.c:1270
+#: command.c:999 command.c:1100 command.c:1282
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: Fehler\n"
 
-#: command.c:1034
+#: command.c:1040
 msgid "Query buffer reset (cleared)."
 msgstr "Anfragepuffer wurde gelöscht."
 
-#: command.c:1047
+#: command.c:1053
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Befehlsgeschichte in Datei »%s/%s« geschrieben.\n"
 
-#: command.c:1085 common.c:52 common.c:66 input.c:209 mainloop.c:72
-#: mainloop.c:234 print.c:137 print.c:151
+#: command.c:1091 common.c:52 common.c:66 common.c:90 input.c:209
+#: mainloop.c:72 mainloop.c:234 print.c:137 print.c:151
 #, c-format
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: command.c:1115
+#: command.c:1121
+#, c-format
+msgid "The server (version %d.%d) does not support showing function source.\n"
+msgstr "Der Server (Version %d.%d) unterstützt das Anzeigen des Funktionsquelltextes nicht.\n"
+
+#: command.c:1127
 msgid "function name is required\n"
 msgstr "Funktionsname wird benötigt\n"
 
-#: command.c:1250
+#: command.c:1262
 msgid "Timing is on."
 msgstr "Zeitmessung ist an."
 
-#: command.c:1252
+#: command.c:1264
 msgid "Timing is off."
 msgstr "Zeitmessung ist aus."
 
-#: command.c:1313 command.c:1333 command.c:1892 command.c:1899 command.c:1908
-#: command.c:1918 command.c:1927 command.c:1941 command.c:1958 command.c:1996
+#: command.c:1325 command.c:1345 command.c:1907 command.c:1914 command.c:1923
+#: command.c:1933 command.c:1942 command.c:1956 command.c:1973 command.c:2011
 #: common.c:137 copy.c:283 copy.c:361
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1415 startup.c:159
+#: command.c:1427 startup.c:159
 msgid "Password: "
 msgstr "Passwort: "
 
-#: command.c:1422 startup.c:162 startup.c:164
+#: command.c:1434 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "Passwort für Benutzer %s: "
 
-#: command.c:1541 command.c:2538 common.c:183 common.c:460 common.c:525
-#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:606
+#: command.c:1553 command.c:2553 common.c:183 common.c:460 common.c:525
+#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1545
+#: command.c:1557
 msgid "Previous connection kept\n"
 msgstr "Vorherige Verbindung wurde behalten\n"
 
-#: command.c:1549
+#: command.c:1561
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1582
+#: command.c:1594
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -191,7 +201,7 @@ msgstr ""
 "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s« via Socket "
 "in »%s« auf Port »%s«.\n"
 
-#: command.c:1585
+#: command.c:1597
 #, c-format
 msgid ""
 "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -200,17 +210,17 @@ msgstr ""
 "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s« auf Host "
 "»%s« auf Port »%s«.\n"
 
-#: command.c:1589
+#: command.c:1601
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "Sie sind jetzt verbunden mit der Datenbank »%s« als Benutzer »%s«.\n"
 
-#: command.c:1623
+#: command.c:1635
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, Server %s)\n"
 
-#: command.c:1631
+#: command.c:1643
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -219,17 +229,17 @@ msgstr ""
 "WARNUNG: %s-Version %d.%d, Serverversion %d.%d.\n"
 "         Einige Features von psql werden eventuell nicht funktionieren.\n"
 
-#: command.c:1661
+#: command.c:1673
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "SSL-Verbindung (Verschlüsselungsmethode: %s, Bits: %i)\n"
 
-#: command.c:1671
+#: command.c:1683
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "SSL-Verbindung (unbekannte Verschlüsselungsmethode)\n"
 
-#: command.c:1692
+#: command.c:1704
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -241,31 +251,34 @@ msgstr ""
 "         richtig. Einzelheiten finden Sie auf der psql-Handbuchseite unter\n"
 "         »Notes for Windows users«.\n"
 
-#: command.c:1773
+#: command.c:1788
 msgid ""
-"EDITOR_LINENUMBER_SWITCH variable must be set to specify a line number\n"
+"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
+"line number\n"
 msgstr ""
+"Umgebungsvariable PSQL_EDITOR_LINENUMBER_ARG muss gesetzt werden, um eine "
+"Zeilennummer angeben zu können\n"
 
-#: command.c:1810
+#: command.c:1825
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "konnte Editor »%s« nicht starten\n"
 
-#: command.c:1812
+#: command.c:1827
 msgid "could not start /bin/sh\n"
 msgstr "konnte /bin/sh nicht starten\n"
 
-#: command.c:1850
+#: command.c:1865
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "konnte temporäres Verzeichnis nicht finden: %s"
+msgid "could not locate temporary directory: %s\n"
+msgstr "konnte temporäres Verzeichnis nicht finden: %s\n"
 
-#: command.c:1877
+#: command.c:1892
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "konnte temporäre Datei »%s« nicht öffnen: %s\n"
 
-#: command.c:2107
+#: command.c:2122
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
@@ -273,122 +286,122 @@ msgstr ""
 "\\pset: zulässige Formate sind unaligned, aligned, wrapped, html, latex, "
 "troff-ms\n"
 
-#: command.c:2112
+#: command.c:2127
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Ausgabeformat ist »%s«.\n"
 
-#: command.c:2128
+#: command.c:2143
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: zulässige Linienstile sind ascii, old-ascii, unicode\n"
 
-#: command.c:2133
+#: command.c:2148
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Linienstil ist %s.\n"
 
-#: command.c:2144
+#: command.c:2159
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Rahmenstil ist %d.\n"
 
-#: command.c:2156
+#: command.c:2171
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Erweiterte Anzeige ist an.\n"
 
-#: command.c:2157
+#: command.c:2172
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Erweiterte Anzeige ist aus.\n"
 
-#: command.c:2170
+#: command.c:2185
 msgid "Showing locale-adjusted numeric output."
 msgstr "Zeige numerische Daten in lokalisiertem Format."
 
-#: command.c:2172
+#: command.c:2187
 msgid "Locale-adjusted numeric output is off."
 msgstr "Lokalisiertes Format für numerische Daten ist aus."
 
-#: command.c:2185
+#: command.c:2200
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null-Anzeige ist »%s«.\n"
 
-#: command.c:2197
+#: command.c:2212
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Feldtrennzeichen ist »%s«.\n"
 
-#: command.c:2211
+#: command.c:2226
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "Satztrennzeichen ist <newline>."
 
-#: command.c:2213
+#: command.c:2228
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Satztrennzeichen ist »%s«.\n"
 
-#: command.c:2227
+#: command.c:2242
 msgid "Showing only tuples."
 msgstr "Zeige nur Datenzeilen."
 
-#: command.c:2229
+#: command.c:2244
 msgid "Tuples only is off."
 msgstr "Nur Datenzeilen ist aus."
 
-#: command.c:2245
+#: command.c:2260
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titel ist »%s«.\n"
 
-#: command.c:2247
+#: command.c:2262
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Titel ist nicht gesetzt.\n"
 
-#: command.c:2263
+#: command.c:2278
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Tabellenattribut ist »%s«.\n"
 
-#: command.c:2265
+#: command.c:2280
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Tabellenattribute sind nicht gesetzt.\n"
 
-#: command.c:2286
+#: command.c:2301
 msgid "Pager is used for long output."
 msgstr "Pager wird für lange Ausgaben verwendet."
 
-#: command.c:2288
+#: command.c:2303
 msgid "Pager is always used."
 msgstr "Pager wird immer verwendet."
 
-#: command.c:2290
+#: command.c:2305
 msgid "Pager usage is off."
 msgstr "Pager-Verwendung ist aus."
 
-#: command.c:2304
+#: command.c:2319
 msgid "Default footer is on."
 msgstr "Standardfußzeile ist an."
 
-#: command.c:2306
+#: command.c:2321
 msgid "Default footer is off."
 msgstr "Standardfußzeile ist aus."
 
-#: command.c:2317
+#: command.c:2332
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "Zielbreite für Format »wrapped« ist %d.\n"
 
-#: command.c:2322
+#: command.c:2337
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: unbekannte Option: %s\n"
 
-#: command.c:2376
+#: command.c:2391
 msgid "\\!: failed\n"
 msgstr "\\!: fehlgeschlagen\n"
 
@@ -397,10 +410,6 @@ msgstr "\\!: fehlgeschlagen\n"
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: pg_strdup: kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "Speicher aufgebraucht"
-
 #: common.c:343
 msgid "connection to server was lost\n"
 msgstr "Verbindung zum Server wurde verloren\n"
@@ -417,10 +426,6 @@ msgstr "Fehlgeschlagen.\n"
 msgid "Succeeded.\n"
 msgstr "Erfolgreich.\n"
 
-#: common.c:493 common.c:773
-msgid "You are currently not connected to a database.\n"
-msgstr "Sie sind gegenwärtig nicht mit einer Datenbank verbunden.\n"
-
 #: common.c:499 common.c:506 common.c:799
 #, c-format
 msgid ""
@@ -528,7 +533,7 @@ msgstr ""
 "Geben Sie die zu kopierenden Daten ein, gefolgt von einem Zeilenende.\n"
 "Beenden Sie mit einem Backslash und einem Punkt alleine auf einer Zeile."
 
-#: copy.c:599
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "abgebrochen wegen Lesenfehlers"
 
@@ -1388,16 +1393,16 @@ msgid "ID"
 msgstr "ID"
 
 #: large_obj.c:290 describe.c:147 describe.c:335 describe.c:637 describe.c:787
-#: describe.c:2518 describe.c:2636 describe.c:2973 describe.c:3604
-#: describe.c:3669
+#: describe.c:2513 describe.c:2631 describe.c:2968 describe.c:3599
+#: describe.c:3664
 msgid "Owner"
 msgstr "Eigentümer"
 
 #: large_obj.c:291 large_obj.c:301 describe.c:96 describe.c:159 describe.c:338
 #: describe.c:501 describe.c:590 describe.c:661 describe.c:852 describe.c:1382
-#: describe.c:2335 describe.c:2542 describe.c:2916 describe.c:2981
-#: describe.c:3046 describe.c:3182 describe.c:3221 describe.c:3288
-#: describe.c:3347 describe.c:3356 describe.c:3415 describe.c:3854
+#: describe.c:2330 describe.c:2537 describe.c:2911 describe.c:2976
+#: describe.c:3041 describe.c:3177 describe.c:3216 describe.c:3283
+#: describe.c:3342 describe.c:3351 describe.c:3410 describe.c:3849
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1509,19 +1514,19 @@ msgid "contains support for command-line editing"
 msgstr "enthält Unterstützung für Kommandozeilenbearbeitung"
 
 #: describe.c:69 describe.c:236 describe.c:463 describe.c:585 describe.c:706
-#: describe.c:788 describe.c:849 describe.c:2509 describe.c:2703
-#: describe.c:2773 describe.c:2908 describe.c:3044 describe.c:3271
-#: describe.c:3343 describe.c:3354 describe.c:3413 describe.c:3787
-#: describe.c:3853
+#: describe.c:788 describe.c:849 describe.c:2504 describe.c:2698
+#: describe.c:2768 describe.c:2903 describe.c:3039 describe.c:3266
+#: describe.c:3338 describe.c:3349 describe.c:3408 describe.c:3782
+#: describe.c:3848
 msgid "Schema"
 msgstr "Schema"
 
 #: describe.c:70 describe.c:146 describe.c:237 describe.c:464 describe.c:586
-#: describe.c:636 describe.c:707 describe.c:850 describe.c:2510
-#: describe.c:2632 describe.c:2704 describe.c:2774 describe.c:2909
-#: describe.c:2972 describe.c:3045 describe.c:3272 describe.c:3344
-#: describe.c:3355 describe.c:3414 describe.c:3603 describe.c:3668
-#: describe.c:3851
+#: describe.c:636 describe.c:707 describe.c:850 describe.c:2505
+#: describe.c:2627 describe.c:2699 describe.c:2769 describe.c:2904
+#: describe.c:2967 describe.c:3040 describe.c:3267 describe.c:3339
+#: describe.c:3350 describe.c:3409 describe.c:3598 describe.c:3663
+#: describe.c:3846
 msgid "Name"
 msgstr "Name"
 
@@ -1578,7 +1583,7 @@ msgid "normal"
 msgstr "normal"
 
 #: describe.c:256 describe.c:301 describe.c:318 describe.c:710 describe.c:792
-#: describe.c:1362 describe.c:2517 describe.c:2705 describe.c:3681
+#: describe.c:1362 describe.c:2512 describe.c:2700 describe.c:3676
 msgid "Type"
 msgstr "Typ"
 
@@ -1614,7 +1619,7 @@ msgstr "Liste der Funktionen"
 msgid "Internal name"
 msgstr "Interner Name"
 
-#: describe.c:475 describe.c:653 describe.c:2534 describe.c:2538
+#: describe.c:475 describe.c:653 describe.c:2529 describe.c:2533
 msgid "Size"
 msgstr "Größe"
 
@@ -1646,11 +1651,11 @@ msgstr "Liste der Operatoren"
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: describe.c:643 describe.c:2910
+#: describe.c:643 describe.c:2905
 msgid "Collate"
 msgstr "Sortierfolge"
 
-#: describe.c:644 describe.c:2911
+#: describe.c:644 describe.c:2906
 msgid "Ctype"
 msgstr "Zeichentyp"
 
@@ -1662,23 +1667,23 @@ msgstr "Tablespace"
 msgid "List of databases"
 msgstr "Liste der Datenbanken"
 
-#: describe.c:708 describe.c:789 describe.c:944 describe.c:2511 sql_help.c:595
-#: sql_help.c:844 sql_help.c:971 sql_help.c:1434 sql_help.c:1564
-#: sql_help.c:1598 sql_help.c:1844 sql_help.c:2002 sql_help.c:2187
-#: sql_help.c:2268 sql_help.c:2474 sql_help.c:3105 sql_help.c:3125
-#: sql_help.c:3127 sql_help.c:3128
+#: describe.c:708 describe.c:789 describe.c:944 describe.c:2506 sql_help.c:595
+#: sql_help.c:842 sql_help.c:969 sql_help.c:1432 sql_help.c:1562
+#: sql_help.c:1596 sql_help.c:1842 sql_help.c:2000 sql_help.c:2185
+#: sql_help.c:2266 sql_help.c:2472 sql_help.c:3103 sql_help.c:3123
+#: sql_help.c:3125 sql_help.c:3126
 msgid "table"
 msgstr "Tabelle"
 
-#: describe.c:708 describe.c:945 describe.c:2512
+#: describe.c:708 describe.c:945 describe.c:2507
 msgid "view"
 msgstr "Sicht"
 
-#: describe.c:708 describe.c:790 describe.c:947 describe.c:2514
+#: describe.c:708 describe.c:790 describe.c:947 describe.c:2509
 msgid "sequence"
 msgstr "Sequenz"
 
-#: describe.c:709 describe.c:948 describe.c:2516
+#: describe.c:709 describe.c:948 describe.c:2511
 msgid "foreign table"
 msgstr "Fremdtabelle"
 
@@ -1686,7 +1691,7 @@ msgstr "Fremdtabelle"
 msgid "Column access privileges"
 msgstr "Spalten-Zugriffsprivilegien"
 
-#: describe.c:747 describe.c:3998 describe.c:4002
+#: describe.c:747 describe.c:3993 describe.c:3997
 msgid "Access privileges"
 msgstr "Zugriffsprivilegien"
 
@@ -1695,8 +1700,7 @@ msgstr "Zugriffsprivilegien"
 msgid ""
 "The server (version %d.%d) does not support altering default privileges.\n"
 msgstr ""
-"Der Server (Version %d.%d) unterstützt nicht das Ändern der "
-"Vorgabeprivilegien.\n"
+"Der Server (Version %d.%d) unterstützt kein Ändern der Vorgabeprivilegien.\n"
 
 #: describe.c:791 describe.c:883
 msgid "function"
@@ -1714,8 +1718,8 @@ msgstr "Objekt"
 msgid "aggregate"
 msgstr "Aggregat"
 
-#: describe.c:902 sql_help.c:1717 sql_help.c:2835 sql_help.c:2905
-#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
+#: describe.c:902 sql_help.c:1715 sql_help.c:2833 sql_help.c:2903
+#: sql_help.c:3036 sql_help.c:3141 sql_help.c:3192
 msgid "operator"
 msgstr "Operator"
 
@@ -1723,7 +1727,7 @@ msgstr "Operator"
 msgid "data type"
 msgstr "Datentyp"
 
-#: describe.c:946 describe.c:2513
+#: describe.c:946 describe.c:2508
 msgid "index"
 msgstr "Index"
 
@@ -1868,7 +1872,7 @@ msgstr ", INITIALLY DEFERRED"
 msgid "View definition:"
 msgstr "Sichtdefinition:"
 
-#: describe.c:1591 describe.c:1879
+#: describe.c:1591 describe.c:1874
 msgid "Rules:"
 msgstr "Regeln:"
 
@@ -1880,379 +1884,379 @@ msgstr "Indexe:"
 msgid "Check constraints:"
 msgstr "Check-Constraints:"
 
-#: describe.c:1763
+#: describe.c:1761
 msgid "Foreign-key constraints:"
 msgstr "Fremdschlüssel-Constraints:"
 
-#: describe.c:1797
+#: describe.c:1792
 msgid "Referenced by:"
 msgstr "Fremdschlüsselverweise von:"
 
-#: describe.c:1882
+#: describe.c:1877
 msgid "Disabled rules:"
 msgstr "Abgeschaltete Regeln:"
 
-#: describe.c:1885
+#: describe.c:1880
 msgid "Rules firing always:"
 msgstr "Regeln, die immer aktiv werden:"
 
-#: describe.c:1888
+#: describe.c:1883
 msgid "Rules firing on replica only:"
 msgstr "Regeln, die nur im Replikat aktiv werden:"
 
-#: describe.c:1996
+#: describe.c:1991
 msgid "Triggers:"
 msgstr "Trigger:"
 
-#: describe.c:1999
+#: describe.c:1994
 msgid "Disabled triggers:"
 msgstr "Abgeschaltete Trigger:"
 
-#: describe.c:2002
+#: describe.c:1997
 msgid "Triggers firing always:"
 msgstr "Trigger, die immer aktiv werden:"
 
-#: describe.c:2005
+#: describe.c:2000
 msgid "Triggers firing on replica only:"
 msgstr "Trigger, die nur im Replikat aktiv werden:"
 
-#: describe.c:2071
+#: describe.c:2066
 msgid "Inherits"
 msgstr "Erbt von"
 
-#: describe.c:2101
+#: describe.c:2096
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Anzahl Kindtabellen: %d (Mit \\\\d+ alle anzeigen.)"
 
-#: describe.c:2108
+#: describe.c:2103
 msgid "Child tables"
 msgstr "Kindtabellen"
 
-#: describe.c:2130
+#: describe.c:2125
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Getypte Tabelle vom Typ: %s"
 
-#: describe.c:2137
+#: describe.c:2132
 msgid "Has OIDs"
 msgstr "Hat OIDs"
 
-#: describe.c:2140 describe.c:2777 describe.c:2851
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "yes"
 msgstr "ja"
 
-#: describe.c:2140 describe.c:2777 describe.c:2851
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "no"
 msgstr "nein"
 
-#: describe.c:2148 describe.c:3619 describe.c:3683 describe.c:3739
-#: describe.c:3794
+#: describe.c:2143 describe.c:3614 describe.c:3678 describe.c:3734
+#: describe.c:3789
 msgid "Options"
 msgstr "Optionen"
 
-#: describe.c:2233
+#: describe.c:2228
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: »%s«"
 
-#: describe.c:2246
+#: describe.c:2241
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", Tablespace »%s«"
 
-#: describe.c:2328
+#: describe.c:2323
 msgid "List of roles"
 msgstr "Liste der Rollen"
 
-#: describe.c:2330
+#: describe.c:2325
 msgid "Role name"
 msgstr "Rollenname"
 
-#: describe.c:2331
+#: describe.c:2326
 msgid "Attributes"
 msgstr "Attribute"
 
-#: describe.c:2332
+#: describe.c:2327
 msgid "Member of"
 msgstr "Mitglied von"
 
-#: describe.c:2343
+#: describe.c:2338
 msgid "Superuser"
 msgstr "Superuser"
 
-#: describe.c:2346
+#: describe.c:2341
 msgid "No inheritance"
 msgstr "keine Vererbung"
 
-#: describe.c:2349
+#: describe.c:2344
 msgid "Create role"
 msgstr "Rolle erzeugen"
 
-#: describe.c:2352
+#: describe.c:2347
 msgid "Create DB"
 msgstr "DB erzeugen"
 
-#: describe.c:2355
+#: describe.c:2350
 msgid "Cannot login"
 msgstr "kann nicht einloggen"
 
-#: describe.c:2359
+#: describe.c:2354
 msgid "Replication"
 msgstr "Replikation"
 
-#: describe.c:2368
+#: describe.c:2363
 msgid "No connections"
 msgstr "keine Verbindungen"
 
-#: describe.c:2370
+#: describe.c:2365
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d Verbindung"
 msgstr[1] "%d Verbindungen"
 
-#: describe.c:2437
+#: describe.c:2432
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr ""
 "Keine Unterstützung für Rolleneinstellungen pro Datenbank in dieser "
 "Serverversion.\n"
 
-#: describe.c:2448
+#: describe.c:2443
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Keine passenden Einstellungen gefunden.\n"
 
-#: describe.c:2450
+#: describe.c:2445
 #, c-format
 msgid "No settings found.\n"
 msgstr "Keine Einstellungen gefunden.\n"
 
-#: describe.c:2455
+#: describe.c:2450
 msgid "List of settings"
 msgstr "Liste der Einstellungen"
 
-#: describe.c:2515
+#: describe.c:2510
 msgid "special"
 msgstr "speziell"
 
-#: describe.c:2523 describe.c:3788
+#: describe.c:2518 describe.c:3783
 msgid "Table"
 msgstr "Tabelle"
 
-#: describe.c:2597
+#: describe.c:2592
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Keine passenden Relationen gefunden.\n"
 
-#: describe.c:2599
+#: describe.c:2594
 #, c-format
 msgid "No relations found.\n"
 msgstr "Keine Relationen gefunden.\n"
 
-#: describe.c:2604
+#: describe.c:2599
 msgid "List of relations"
 msgstr "Liste der Relationen"
 
-#: describe.c:2640
+#: describe.c:2635
 msgid "Trusted"
 msgstr "Vertraut"
 
-#: describe.c:2648
+#: describe.c:2643
 msgid "Internal Language"
 msgstr "Interne Sprache"
 
-#: describe.c:2649
+#: describe.c:2644
 msgid "Call Handler"
 msgstr "Call-Handler"
 
-#: describe.c:2650 describe.c:3611
+#: describe.c:2645 describe.c:3606
 msgid "Validator"
 msgstr "Validator"
 
-#: describe.c:2653
+#: describe.c:2648
 msgid "Inline Handler"
 msgstr "Inline-Handler"
 
-#: describe.c:2674
+#: describe.c:2669
 msgid "List of languages"
 msgstr "Liste der Sprachen"
 
-#: describe.c:2714
+#: describe.c:2709
 msgid "Modifier"
 msgstr "Attribut"
 
-#: describe.c:2722
+#: describe.c:2717
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:2740
+#: describe.c:2735
 msgid "List of domains"
 msgstr "Liste der Domänen"
 
-#: describe.c:2775
+#: describe.c:2770
 msgid "Source"
 msgstr "Quelle"
 
-#: describe.c:2776
+#: describe.c:2771
 msgid "Destination"
 msgstr "Ziel"
 
-#: describe.c:2778
+#: describe.c:2773
 msgid "Default?"
 msgstr "Standard?"
 
-#: describe.c:2796
+#: describe.c:2791
 msgid "List of conversions"
 msgstr "Liste der Konversionen"
 
-#: describe.c:2848
+#: describe.c:2843
 msgid "Source type"
 msgstr "Quelltyp"
 
-#: describe.c:2849
+#: describe.c:2844
 msgid "Target type"
 msgstr "Zieltyp"
 
-#: describe.c:2850 describe.c:3181
+#: describe.c:2845 describe.c:3176
 msgid "Function"
 msgstr "Funktion"
 
-#: describe.c:2851
+#: describe.c:2846
 msgid "in assignment"
 msgstr "in Zuweisung"
 
-#: describe.c:2852
+#: describe.c:2847
 msgid "Implicit?"
 msgstr "Implizit?"
 
-#: describe.c:2878
+#: describe.c:2873
 msgid "List of casts"
 msgstr "Liste der Typumwandlungen"
 
-#: describe.c:2946
+#: describe.c:2941
 msgid "List of collations"
 msgstr "Liste der Sortierfolgen"
 
-#: describe.c:3004
+#: describe.c:2999
 msgid "List of schemas"
 msgstr "Liste der Schemas"
 
-#: describe.c:3027 describe.c:3260 describe.c:3328 describe.c:3396
+#: describe.c:3022 describe.c:3255 describe.c:3323 describe.c:3391
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "Der Server (Version %d.%d) unterstützt keine Volltextsuche.\n"
 
-#: describe.c:3061
+#: describe.c:3056
 msgid "List of text search parsers"
 msgstr "Liste der Textsucheparser"
 
-#: describe.c:3104
+#: describe.c:3099
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Kein Textsucheparser namens »%s« gefunden\n"
 
-#: describe.c:3179
+#: describe.c:3174
 msgid "Start parse"
 msgstr "Parsen starten"
 
-#: describe.c:3180
+#: describe.c:3175
 msgid "Method"
 msgstr "Methode"
 
-#: describe.c:3184
+#: describe.c:3179
 msgid "Get next token"
 msgstr "Nächstes Token lesen"
 
-#: describe.c:3186
+#: describe.c:3181
 msgid "End parse"
 msgstr "Parsen beenden"
 
-#: describe.c:3188
+#: describe.c:3183
 msgid "Get headline"
 msgstr "Ãœberschrift ermitteln"
 
-#: describe.c:3190
+#: describe.c:3185
 msgid "Get token types"
 msgstr "Tokentypen ermitteln"
 
-#: describe.c:3200
+#: describe.c:3195
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Textsucheparser »%s.%s«"
 
-#: describe.c:3202
+#: describe.c:3197
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Textsucheparser »%s«"
 
-#: describe.c:3220
+#: describe.c:3215
 msgid "Token name"
 msgstr "Tokenname"
 
-#: describe.c:3231
+#: describe.c:3226
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tokentypen für Parser »%s.%s«"
 
-#: describe.c:3233
+#: describe.c:3228
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tokentypen für Parser »%s«"
 
-#: describe.c:3282
+#: describe.c:3277
 msgid "Template"
 msgstr "Vorlage"
 
-#: describe.c:3283
+#: describe.c:3278
 msgid "Init options"
 msgstr "Initialisierungsoptionen:"
 
-#: describe.c:3305
+#: describe.c:3300
 msgid "List of text search dictionaries"
 msgstr "Liste der Textsuchewörterbücher"
 
-#: describe.c:3345
+#: describe.c:3340
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:3346
+#: describe.c:3341
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3373
+#: describe.c:3368
 msgid "List of text search templates"
 msgstr "Liste der Textsuchevorlagen"
 
-#: describe.c:3430
+#: describe.c:3425
 msgid "List of text search configurations"
 msgstr "Liste der Textsuchekonfigurationen"
 
-#: describe.c:3474
+#: describe.c:3469
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Keine Textsuchekonfiguration namens »%s« gefunden\n"
 
-#: describe.c:3540
+#: describe.c:3535
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:3541
+#: describe.c:3536
 msgid "Dictionaries"
 msgstr "Wörterbücher"
 
-#: describe.c:3552
+#: describe.c:3547
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Textsuchekonfiguration »%s.%s«"
 
-#: describe.c:3555
+#: describe.c:3550
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Textsuchekonfiguration »%s«"
 
-#: describe.c:3559
+#: describe.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -2261,7 +2265,7 @@ msgstr ""
 "\n"
 "Parser: »%s.%s«"
 
-#: describe.c:3562
+#: describe.c:3557
 #, c-format
 msgid ""
 "\n"
@@ -2270,86 +2274,86 @@ msgstr ""
 "\n"
 "Parser: »%s«"
 
-#: describe.c:3594
+#: describe.c:3589
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "Der Server (Version %d.%d) unterstützt keine Fremddaten-Wrapper.\n"
 
-#: describe.c:3608
+#: describe.c:3603
 msgid "Handler"
 msgstr "Handler"
 
-#: describe.c:3635
+#: describe.c:3630
 msgid "List of foreign-data wrappers"
 msgstr "Liste der Fremddaten-Wrapper"
 
-#: describe.c:3658
+#: describe.c:3653
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "Der Server (Version %d.%d) unterstützt keine Fremdserver.\n"
 
-#: describe.c:3670
+#: describe.c:3665
 msgid "Foreign-data wrapper"
 msgstr "Fremddaten-Wrapper"
 
-#: describe.c:3682 describe.c:3852
+#: describe.c:3677 describe.c:3847
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:3701
+#: describe.c:3696
 msgid "List of foreign servers"
 msgstr "Liste der Fremdserver"
 
-#: describe.c:3724
+#: describe.c:3719
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "Der Server (Version %d.%d) unterstützt keine Benutzerabbildungen.\n"
 
-#: describe.c:3733 describe.c:3789
+#: describe.c:3728 describe.c:3784
 msgid "Server"
 msgstr "Server"
 
-#: describe.c:3734
+#: describe.c:3729
 msgid "User name"
 msgstr "Benutzername"
 
-#: describe.c:3754
+#: describe.c:3749
 msgid "List of user mappings"
 msgstr "Liste der Benutzerabbildungen"
 
-#: describe.c:3777
+#: describe.c:3772
 #, c-format
 msgid "The server (version %d.%d) does not support foreign tables.\n"
 msgstr "Der Server (Version %d.%d) unterstützt keine Fremdtabellen.\n"
 
-#: describe.c:3815
+#: describe.c:3810
 msgid "List of foreign tables"
 msgstr "Liste der Fremdtabellen"
 
-#: describe.c:3838 describe.c:3892
+#: describe.c:3833 describe.c:3887
 #, c-format
 msgid "The server (version %d.%d) does not support extensions.\n"
 msgstr "Der Server (Version %d.%d) unterstützt keine Erweiterungen.\n"
 
-#: describe.c:3869
+#: describe.c:3864
 msgid "List of installed extensions"
 msgstr "Liste der installierten Erweiterungen"
 
-#: describe.c:3919
+#: describe.c:3914
 #, c-format
 msgid "Did not find any extension named \"%s\".\n"
 msgstr "Keine Erweiterungen namens »%s« gefunden\n"
 
-#: describe.c:3922
+#: describe.c:3917
 #, c-format
 msgid "Did not find any extensions.\n"
 msgstr "Keine Erweiterungen gefunden\n"
 
-#: describe.c:3966
+#: describe.c:3961
 msgid "Object Description"
 msgstr "Objektbeschreibung"
 
-#: describe.c:3975
+#: describe.c:3970
 #, c-format
 msgid "Objects in extension \"%s\""
 msgstr "Objekte in Erweiterung »%s«"
@@ -2939,99 +2943,99 @@ msgstr "berechnet eine Zeilenmenge"
 #: sql_help.c:497 sql_help.c:505 sql_help.c:508 sql_help.c:511 sql_help.c:541
 #: sql_help.c:547 sql_help.c:549 sql_help.c:553 sql_help.c:556 sql_help.c:559
 #: sql_help.c:569 sql_help.c:571 sql_help.c:588 sql_help.c:597 sql_help.c:599
-#: sql_help.c:601 sql_help.c:676 sql_help.c:678 sql_help.c:681 sql_help.c:683
-#: sql_help.c:742 sql_help.c:744 sql_help.c:746 sql_help.c:749 sql_help.c:770
-#: sql_help.c:773 sql_help.c:776 sql_help.c:779 sql_help.c:783 sql_help.c:785
-#: sql_help.c:787 sql_help.c:789 sql_help.c:803 sql_help.c:806 sql_help.c:808
-#: sql_help.c:810 sql_help.c:820 sql_help.c:822 sql_help.c:832 sql_help.c:834
-#: sql_help.c:843 sql_help.c:864 sql_help.c:866 sql_help.c:868 sql_help.c:871
-#: sql_help.c:873 sql_help.c:875 sql_help.c:913 sql_help.c:919 sql_help.c:921
-#: sql_help.c:924 sql_help.c:926 sql_help.c:928 sql_help.c:953 sql_help.c:956
-#: sql_help.c:958 sql_help.c:960 sql_help.c:962 sql_help.c:1002
-#: sql_help.c:1185 sql_help.c:1193 sql_help.c:1237 sql_help.c:1241
-#: sql_help.c:1251 sql_help.c:1269 sql_help.c:1292 sql_help.c:1324
-#: sql_help.c:1369 sql_help.c:1411 sql_help.c:1433 sql_help.c:1453
-#: sql_help.c:1454 sql_help.c:1471 sql_help.c:1491 sql_help.c:1513
-#: sql_help.c:1541 sql_help.c:1562 sql_help.c:1592 sql_help.c:1773
-#: sql_help.c:1786 sql_help.c:1803 sql_help.c:1819 sql_help.c:1842
-#: sql_help.c:1885 sql_help.c:1889 sql_help.c:1891 sql_help.c:1909
-#: sql_help.c:1936 sql_help.c:1969 sql_help.c:1979 sql_help.c:1988
-#: sql_help.c:2032 sql_help.c:2050 sql_help.c:2058 sql_help.c:2066
-#: sql_help.c:2074 sql_help.c:2090 sql_help.c:2098 sql_help.c:2107
-#: sql_help.c:2118 sql_help.c:2126 sql_help.c:2134 sql_help.c:2142
-#: sql_help.c:2152 sql_help.c:2161 sql_help.c:2170 sql_help.c:2178
-#: sql_help.c:2186 sql_help.c:2195 sql_help.c:2203 sql_help.c:2219
-#: sql_help.c:2235 sql_help.c:2243 sql_help.c:2251 sql_help.c:2259
-#: sql_help.c:2267 sql_help.c:2276 sql_help.c:2284 sql_help.c:2301
-#: sql_help.c:2316 sql_help.c:2508 sql_help.c:2559 sql_help.c:2586
-#: sql_help.c:2929 sql_help.c:2975 sql_help.c:3082
+#: sql_help.c:601 sql_help.c:675 sql_help.c:677 sql_help.c:680 sql_help.c:682
+#: sql_help.c:740 sql_help.c:742 sql_help.c:744 sql_help.c:747 sql_help.c:768
+#: sql_help.c:771 sql_help.c:774 sql_help.c:777 sql_help.c:781 sql_help.c:783
+#: sql_help.c:785 sql_help.c:787 sql_help.c:801 sql_help.c:804 sql_help.c:806
+#: sql_help.c:808 sql_help.c:818 sql_help.c:820 sql_help.c:830 sql_help.c:832
+#: sql_help.c:841 sql_help.c:862 sql_help.c:864 sql_help.c:866 sql_help.c:869
+#: sql_help.c:871 sql_help.c:873 sql_help.c:911 sql_help.c:917 sql_help.c:919
+#: sql_help.c:922 sql_help.c:924 sql_help.c:926 sql_help.c:951 sql_help.c:954
+#: sql_help.c:956 sql_help.c:958 sql_help.c:960 sql_help.c:1000
+#: sql_help.c:1183 sql_help.c:1191 sql_help.c:1235 sql_help.c:1239
+#: sql_help.c:1249 sql_help.c:1267 sql_help.c:1290 sql_help.c:1322
+#: sql_help.c:1367 sql_help.c:1409 sql_help.c:1431 sql_help.c:1451
+#: sql_help.c:1452 sql_help.c:1469 sql_help.c:1489 sql_help.c:1511
+#: sql_help.c:1539 sql_help.c:1560 sql_help.c:1590 sql_help.c:1771
+#: sql_help.c:1784 sql_help.c:1801 sql_help.c:1817 sql_help.c:1840
+#: sql_help.c:1883 sql_help.c:1887 sql_help.c:1889 sql_help.c:1907
+#: sql_help.c:1934 sql_help.c:1967 sql_help.c:1977 sql_help.c:1986
+#: sql_help.c:2030 sql_help.c:2048 sql_help.c:2056 sql_help.c:2064
+#: sql_help.c:2072 sql_help.c:2088 sql_help.c:2096 sql_help.c:2105
+#: sql_help.c:2116 sql_help.c:2124 sql_help.c:2132 sql_help.c:2140
+#: sql_help.c:2150 sql_help.c:2159 sql_help.c:2168 sql_help.c:2176
+#: sql_help.c:2184 sql_help.c:2193 sql_help.c:2201 sql_help.c:2217
+#: sql_help.c:2233 sql_help.c:2241 sql_help.c:2249 sql_help.c:2257
+#: sql_help.c:2265 sql_help.c:2274 sql_help.c:2282 sql_help.c:2299
+#: sql_help.c:2314 sql_help.c:2506 sql_help.c:2557 sql_help.c:2584
+#: sql_help.c:2927 sql_help.c:2973 sql_help.c:3080
 msgid "name"
 msgstr "Name"
 
 #: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:317 sql_help.c:320
-#: sql_help.c:2033
+#: sql_help.c:2031
 msgid "type"
 msgstr "Typ"
 
 #: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:312
 #: sql_help.c:360 sql_help.c:393 sql_help.c:405 sql_help.c:422 sql_help.c:461
-#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:682
-#: sql_help.c:743 sql_help.c:786 sql_help.c:807 sql_help.c:821 sql_help.c:833
-#: sql_help.c:845 sql_help.c:872 sql_help.c:920 sql_help.c:961
+#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:681
+#: sql_help.c:741 sql_help.c:784 sql_help.c:805 sql_help.c:819 sql_help.c:831
+#: sql_help.c:843 sql_help.c:870 sql_help.c:918 sql_help.c:959
 msgid "new_name"
 msgstr "neuer_Name"
 
 #: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:187
 #: sql_help.c:282 sql_help.c:322 sql_help.c:365 sql_help.c:424 sql_help.c:433
 #: sql_help.c:445 sql_help.c:464 sql_help.c:510 sql_help.c:572 sql_help.c:598
-#: sql_help.c:617 sql_help.c:727 sql_help.c:745 sql_help.c:788 sql_help.c:809
-#: sql_help.c:867 sql_help.c:959
+#: sql_help.c:617 sql_help.c:725 sql_help.c:743 sql_help.c:786 sql_help.c:807
+#: sql_help.c:865 sql_help.c:957
 msgid "new_owner"
 msgstr "neuer_Eigentümer"
 
 #: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:189 sql_help.c:228
 #: sql_help.c:314 sql_help.c:370 sql_help.c:449 sql_help.c:467 sql_help.c:513
-#: sql_help.c:602 sql_help.c:684 sql_help.c:790 sql_help.c:811 sql_help.c:823
-#: sql_help.c:835 sql_help.c:874 sql_help.c:963
+#: sql_help.c:602 sql_help.c:683 sql_help.c:788 sql_help.c:809 sql_help.c:821
+#: sql_help.c:833 sql_help.c:872 sql_help.c:961
 msgid "new_schema"
 msgstr "neues_Schema"
 
 #: sql_help.c:88 sql_help.c:279 sql_help.c:323 sql_help.c:542 sql_help.c:614
-#: sql_help.c:804 sql_help.c:914 sql_help.c:940 sql_help.c:1144
-#: sql_help.c:1149 sql_help.c:1327 sql_help.c:1345 sql_help.c:1412
-#: sql_help.c:1542 sql_help.c:1613 sql_help.c:1788 sql_help.c:1937
-#: sql_help.c:1959 sql_help.c:2334
+#: sql_help.c:802 sql_help.c:912 sql_help.c:938 sql_help.c:1142
+#: sql_help.c:1147 sql_help.c:1325 sql_help.c:1343 sql_help.c:1410
+#: sql_help.c:1540 sql_help.c:1611 sql_help.c:1786 sql_help.c:1935
+#: sql_help.c:1957 sql_help.c:2332
 msgid "option"
 msgstr "Option"
 
-#: sql_help.c:89 sql_help.c:543 sql_help.c:915 sql_help.c:1413 sql_help.c:1543
-#: sql_help.c:1938
+#: sql_help.c:89 sql_help.c:543 sql_help.c:913 sql_help.c:1411 sql_help.c:1541
+#: sql_help.c:1936
 msgid "where option can be:"
 msgstr "wobei Option Folgendes sein kann:"
 
-#: sql_help.c:90 sql_help.c:544 sql_help.c:916 sql_help.c:1276 sql_help.c:1544
-#: sql_help.c:1939
+#: sql_help.c:90 sql_help.c:544 sql_help.c:914 sql_help.c:1274 sql_help.c:1542
+#: sql_help.c:1937
 msgid "connlimit"
 msgstr "Verbindungslimit"
 
-#: sql_help.c:96 sql_help.c:728
+#: sql_help.c:96 sql_help.c:726
 msgid "new_tablespace"
 msgstr "neuer_Tablespace"
 
 #: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:374 sql_help.c:376
-#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:922
-#: sql_help.c:925 sql_help.c:927 sql_help.c:1380 sql_help.c:2603
-#: sql_help.c:2918
+#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:920
+#: sql_help.c:923 sql_help.c:925 sql_help.c:1378 sql_help.c:2601
+#: sql_help.c:2916
 msgid "configuration_parameter"
 msgstr "Konfigurationsparameter"
 
 #: sql_help.c:99 sql_help.c:280 sql_help.c:324 sql_help.c:375 sql_help.c:410
-#: sql_help.c:552 sql_help.c:615 sql_help.c:703 sql_help.c:722 sql_help.c:748
-#: sql_help.c:805 sql_help.c:923 sql_help.c:941 sql_help.c:1328
-#: sql_help.c:1346 sql_help.c:1381 sql_help.c:1382 sql_help.c:1441
-#: sql_help.c:1614 sql_help.c:1688 sql_help.c:1696 sql_help.c:1728
-#: sql_help.c:1750 sql_help.c:1789 sql_help.c:1960 sql_help.c:2919
-#: sql_help.c:2920
+#: sql_help.c:552 sql_help.c:615 sql_help.c:702 sql_help.c:720 sql_help.c:746
+#: sql_help.c:803 sql_help.c:921 sql_help.c:939 sql_help.c:1326
+#: sql_help.c:1344 sql_help.c:1379 sql_help.c:1380 sql_help.c:1439
+#: sql_help.c:1612 sql_help.c:1686 sql_help.c:1694 sql_help.c:1726
+#: sql_help.c:1748 sql_help.c:1787 sql_help.c:1958 sql_help.c:2917
+#: sql_help.c:2918
 msgid "value"
 msgstr "Wert"
 
@@ -3039,9 +3043,9 @@ msgstr "Wert"
 msgid "target_role"
 msgstr "Zielrolle"
 
-#: sql_help.c:152 sql_help.c:1577 sql_help.c:2432 sql_help.c:2439
-#: sql_help.c:2451 sql_help.c:2457 sql_help.c:2686 sql_help.c:2693
-#: sql_help.c:2705 sql_help.c:2711
+#: sql_help.c:152 sql_help.c:1575 sql_help.c:2430 sql_help.c:2437
+#: sql_help.c:2449 sql_help.c:2455 sql_help.c:2684 sql_help.c:2691
+#: sql_help.c:2703 sql_help.c:2709
 msgid "schema_name"
 msgstr "Schemaname"
 
@@ -3054,28 +3058,28 @@ msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "wobei abgekürztes_Grant_oder_Revoke Folgendes sein kann:"
 
 #: sql_help.c:155 sql_help.c:156 sql_help.c:157 sql_help.c:158 sql_help.c:159
-#: sql_help.c:160 sql_help.c:1416 sql_help.c:1417 sql_help.c:1418
-#: sql_help.c:1419 sql_help.c:1420 sql_help.c:1547 sql_help.c:1548
-#: sql_help.c:1549 sql_help.c:1550 sql_help.c:1551 sql_help.c:1942
-#: sql_help.c:1943 sql_help.c:1944 sql_help.c:1945 sql_help.c:1946
-#: sql_help.c:2433 sql_help.c:2437 sql_help.c:2440 sql_help.c:2442
-#: sql_help.c:2444 sql_help.c:2446 sql_help.c:2452 sql_help.c:2454
-#: sql_help.c:2456 sql_help.c:2458 sql_help.c:2460 sql_help.c:2461
-#: sql_help.c:2462 sql_help.c:2687 sql_help.c:2691 sql_help.c:2694
-#: sql_help.c:2696 sql_help.c:2698 sql_help.c:2700 sql_help.c:2706
-#: sql_help.c:2708 sql_help.c:2710 sql_help.c:2712 sql_help.c:2714
-#: sql_help.c:2715 sql_help.c:2716 sql_help.c:2939
+#: sql_help.c:160 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
+#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1545 sql_help.c:1546
+#: sql_help.c:1547 sql_help.c:1548 sql_help.c:1549 sql_help.c:1940
+#: sql_help.c:1941 sql_help.c:1942 sql_help.c:1943 sql_help.c:1944
+#: sql_help.c:2431 sql_help.c:2435 sql_help.c:2438 sql_help.c:2440
+#: sql_help.c:2442 sql_help.c:2444 sql_help.c:2450 sql_help.c:2452
+#: sql_help.c:2454 sql_help.c:2456 sql_help.c:2458 sql_help.c:2459
+#: sql_help.c:2460 sql_help.c:2685 sql_help.c:2689 sql_help.c:2692
+#: sql_help.c:2694 sql_help.c:2696 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2706 sql_help.c:2708 sql_help.c:2710 sql_help.c:2712
+#: sql_help.c:2713 sql_help.c:2714 sql_help.c:2937
 msgid "role_name"
 msgstr "Rollenname"
 
-#: sql_help.c:180 sql_help.c:694 sql_help.c:696 sql_help.c:955 sql_help.c:1295
-#: sql_help.c:1299 sql_help.c:1437 sql_help.c:1700 sql_help.c:1710
-#: sql_help.c:1732 sql_help.c:2476 sql_help.c:2824 sql_help.c:2825
-#: sql_help.c:2829 sql_help.c:2834 sql_help.c:2893 sql_help.c:2894
-#: sql_help.c:2899 sql_help.c:2904 sql_help.c:3027 sql_help.c:3028
-#: sql_help.c:3032 sql_help.c:3037 sql_help.c:3108 sql_help.c:3110
-#: sql_help.c:3141 sql_help.c:3183 sql_help.c:3184 sql_help.c:3188
-#: sql_help.c:3193
+#: sql_help.c:180 sql_help.c:693 sql_help.c:695 sql_help.c:953 sql_help.c:1293
+#: sql_help.c:1297 sql_help.c:1435 sql_help.c:1698 sql_help.c:1708
+#: sql_help.c:1730 sql_help.c:2474 sql_help.c:2822 sql_help.c:2823
+#: sql_help.c:2827 sql_help.c:2832 sql_help.c:2891 sql_help.c:2892
+#: sql_help.c:2897 sql_help.c:2902 sql_help.c:3025 sql_help.c:3026
+#: sql_help.c:3030 sql_help.c:3035 sql_help.c:3106 sql_help.c:3108
+#: sql_help.c:3139 sql_help.c:3181 sql_help.c:3182 sql_help.c:3186
+#: sql_help.c:3191
 msgid "expression"
 msgstr "Ausdruck"
 
@@ -3083,13 +3087,13 @@ msgstr "Ausdruck"
 msgid "domain_constraint"
 msgstr "Domanen-Constraint"
 
-#: sql_help.c:185 sql_help.c:710 sql_help.c:711 sql_help.c:730 sql_help.c:1062
-#: sql_help.c:1298 sql_help.c:1699 sql_help.c:1709
+#: sql_help.c:185 sql_help.c:708 sql_help.c:709 sql_help.c:728 sql_help.c:1059
+#: sql_help.c:1296 sql_help.c:1697 sql_help.c:1707
 msgid "constraint_name"
 msgstr "Constraint-Name"
 
-#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1310
-#: sql_help.c:2082
+#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1308
+#: sql_help.c:2080
 msgid "extension_name"
 msgstr "Erweiterungsname"
 
@@ -3105,121 +3109,121 @@ msgstr "Elementobjekt"
 msgid "where member_object is:"
 msgstr "wobei Elementobjekt Folgendes ist:"
 
-#: sql_help.c:234 sql_help.c:1057 sql_help.c:2773
+#: sql_help.c:234 sql_help.c:1052 sql_help.c:2771
 msgid "agg_name"
 msgstr "Aggname"
 
-#: sql_help.c:235 sql_help.c:1058 sql_help.c:2774
+#: sql_help.c:235 sql_help.c:1053 sql_help.c:2772
 msgid "agg_type"
 msgstr "Aggtyp"
 
-#: sql_help.c:236 sql_help.c:1059 sql_help.c:1217 sql_help.c:1221
-#: sql_help.c:1223 sql_help.c:2041
+#: sql_help.c:236 sql_help.c:1054 sql_help.c:1215 sql_help.c:1219
+#: sql_help.c:1221 sql_help.c:2039
 msgid "source_type"
 msgstr "Quelltyp"
 
-#: sql_help.c:237 sql_help.c:1060 sql_help.c:1218 sql_help.c:1222
-#: sql_help.c:1224 sql_help.c:2042
+#: sql_help.c:237 sql_help.c:1055 sql_help.c:1216 sql_help.c:1220
+#: sql_help.c:1222 sql_help.c:2040
 msgid "target_type"
 msgstr "Zieltyp"
 
 #: sql_help.c:238 sql_help.c:239 sql_help.c:240 sql_help.c:241 sql_help.c:242
 #: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:255 sql_help.c:256
 #: sql_help.c:257 sql_help.c:258 sql_help.c:259 sql_help.c:260 sql_help.c:261
-#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1054
-#: sql_help.c:1061 sql_help.c:1064 sql_help.c:1065 sql_help.c:1066
-#: sql_help.c:1067 sql_help.c:1068 sql_help.c:1069 sql_help.c:1074
-#: sql_help.c:1079 sql_help.c:1081 sql_help.c:1083 sql_help.c:1084
-#: sql_help.c:1087 sql_help.c:1088 sql_help.c:1089 sql_help.c:1090
-#: sql_help.c:1091 sql_help.c:1092 sql_help.c:1093 sql_help.c:1094
-#: sql_help.c:1097 sql_help.c:1098 sql_help.c:2770 sql_help.c:2775
-#: sql_help.c:2776 sql_help.c:2782 sql_help.c:2783 sql_help.c:2784
-#: sql_help.c:2785 sql_help.c:2786
+#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1056
+#: sql_help.c:1061 sql_help.c:1062 sql_help.c:1063 sql_help.c:1064
+#: sql_help.c:1065 sql_help.c:1066 sql_help.c:1071 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1080 sql_help.c:1081 sql_help.c:1084
+#: sql_help.c:1085 sql_help.c:1086 sql_help.c:1087 sql_help.c:1088
+#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1096 sql_help.c:2768 sql_help.c:2773
+#: sql_help.c:2774 sql_help.c:2780 sql_help.c:2781 sql_help.c:2782
+#: sql_help.c:2783 sql_help.c:2784
 msgid "object_name"
 msgstr "Objektname"
 
-#: sql_help.c:243 sql_help.c:495 sql_help.c:1070 sql_help.c:1219
-#: sql_help.c:1254 sql_help.c:1472 sql_help.c:1503 sql_help.c:1847
-#: sql_help.c:2447 sql_help.c:2701 sql_help.c:2777 sql_help.c:2850
-#: sql_help.c:2855 sql_help.c:3053 sql_help.c:3058 sql_help.c:3209
-#: sql_help.c:3214
+#: sql_help.c:243 sql_help.c:495 sql_help.c:1067 sql_help.c:1217
+#: sql_help.c:1252 sql_help.c:1470 sql_help.c:1501 sql_help.c:1845
+#: sql_help.c:2445 sql_help.c:2699 sql_help.c:2775 sql_help.c:2848
+#: sql_help.c:2853 sql_help.c:3051 sql_help.c:3056 sql_help.c:3207
+#: sql_help.c:3212
 msgid "function_name"
 msgstr "Funktionsname"
 
 #: sql_help.c:244 sql_help.c:352 sql_help.c:357 sql_help.c:362 sql_help.c:367
-#: sql_help.c:1071 sql_help.c:1370 sql_help.c:2108 sql_help.c:2448
-#: sql_help.c:2702 sql_help.c:2778
+#: sql_help.c:1068 sql_help.c:1368 sql_help.c:2106 sql_help.c:2446
+#: sql_help.c:2700 sql_help.c:2776
 msgid "argmode"
 msgstr "Argmodus"
 
 #: sql_help.c:245 sql_help.c:353 sql_help.c:358 sql_help.c:363 sql_help.c:368
-#: sql_help.c:1072 sql_help.c:1371 sql_help.c:2109 sql_help.c:2779
+#: sql_help.c:1069 sql_help.c:1369 sql_help.c:2107 sql_help.c:2777
 msgid "argname"
 msgstr "Argname"
 
 #: sql_help.c:246 sql_help.c:354 sql_help.c:359 sql_help.c:364 sql_help.c:369
-#: sql_help.c:1073 sql_help.c:1372 sql_help.c:2110 sql_help.c:2780
+#: sql_help.c:1070 sql_help.c:1370 sql_help.c:2108 sql_help.c:2778
 msgid "argtype"
 msgstr "Argtyp"
 
-#: sql_help.c:247 sql_help.c:488 sql_help.c:1076 sql_help.c:1496
+#: sql_help.c:247 sql_help.c:488 sql_help.c:1073 sql_help.c:1494
 msgid "operator_name"
 msgstr "Operatorname"
 
-#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1077
-#: sql_help.c:1473 sql_help.c:2143
+#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1074
+#: sql_help.c:1471 sql_help.c:2141
 msgid "left_type"
 msgstr "linker_Typ"
 
-#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1078
-#: sql_help.c:1474 sql_help.c:2144
+#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1075
+#: sql_help.c:1472 sql_help.c:2142
 msgid "right_type"
 msgstr "rechter_Typ"
 
 #: sql_help.c:251 sql_help.c:253 sql_help.c:460 sql_help.c:463 sql_help.c:466
 #: sql_help.c:486 sql_help.c:498 sql_help.c:506 sql_help.c:509 sql_help.c:512
-#: sql_help.c:1080 sql_help.c:1082 sql_help.c:1493 sql_help.c:1514
-#: sql_help.c:1715 sql_help.c:2153 sql_help.c:2162
+#: sql_help.c:1077 sql_help.c:1079 sql_help.c:1491 sql_help.c:1512
+#: sql_help.c:1713 sql_help.c:2151 sql_help.c:2160
 msgid "index_method"
 msgstr "Indexmethode"
 
-#: sql_help.c:277 sql_help.c:1325
+#: sql_help.c:277 sql_help.c:1323
 msgid "handler_function"
 msgstr "Handler-Funktion"
 
-#: sql_help.c:278 sql_help.c:1326
+#: sql_help.c:278 sql_help.c:1324
 msgid "validator_function"
 msgstr "Validator-Funktion"
 
-#: sql_help.c:307 sql_help.c:355 sql_help.c:677 sql_help.c:865 sql_help.c:1706
-#: sql_help.c:1707 sql_help.c:1723 sql_help.c:1724
+#: sql_help.c:307 sql_help.c:355 sql_help.c:676 sql_help.c:863 sql_help.c:1704
+#: sql_help.c:1705 sql_help.c:1721 sql_help.c:1722
 msgid "action"
 msgstr "Aktion"
 
 #: sql_help.c:309 sql_help.c:316 sql_help.c:318 sql_help.c:319 sql_help.c:321
-#: sql_help.c:596 sql_help.c:679 sql_help.c:686 sql_help.c:690 sql_help.c:691
-#: sql_help.c:695 sql_help.c:697 sql_help.c:698 sql_help.c:699 sql_help.c:701
-#: sql_help.c:704 sql_help.c:706 sql_help.c:954 sql_help.c:957 sql_help.c:972
-#: sql_help.c:1142 sql_help.c:1146 sql_help.c:1158 sql_help.c:1159
-#: sql_help.c:1436 sql_help.c:1599 sql_help.c:1731 sql_help.c:2434
-#: sql_help.c:2435 sql_help.c:2475 sql_help.c:2688 sql_help.c:2689
-#: sql_help.c:3107 sql_help.c:3109 sql_help.c:3126 sql_help.c:3129
+#: sql_help.c:596 sql_help.c:678 sql_help.c:685 sql_help.c:689 sql_help.c:690
+#: sql_help.c:694 sql_help.c:696 sql_help.c:697 sql_help.c:698 sql_help.c:700
+#: sql_help.c:703 sql_help.c:705 sql_help.c:952 sql_help.c:955 sql_help.c:970
+#: sql_help.c:1140 sql_help.c:1144 sql_help.c:1156 sql_help.c:1157
+#: sql_help.c:1434 sql_help.c:1597 sql_help.c:1729 sql_help.c:2432
+#: sql_help.c:2433 sql_help.c:2473 sql_help.c:2686 sql_help.c:2687
+#: sql_help.c:3105 sql_help.c:3107 sql_help.c:3124 sql_help.c:3127
 msgid "column"
 msgstr "Spalte"
 
-#: sql_help.c:310 sql_help.c:680
+#: sql_help.c:310 sql_help.c:679
 msgid "new_column"
 msgstr "neue_Spalte"
 
-#: sql_help.c:315 sql_help.c:371 sql_help.c:685 sql_help.c:878
+#: sql_help.c:315 sql_help.c:371 sql_help.c:684 sql_help.c:876
 msgid "where action is one of:"
 msgstr "wobei Aktion Folgendes sein kann:"
 
-#: sql_help.c:372 sql_help.c:1378
+#: sql_help.c:372 sql_help.c:1376
 msgid "execution_cost"
 msgstr "Ausführungskosten"
 
-#: sql_help.c:373 sql_help.c:1379
+#: sql_help.c:373 sql_help.c:1377
 msgid "result_rows"
 msgstr "Ergebniszeilen"
 
@@ -3227,77 +3231,77 @@ msgstr "Ergebniszeilen"
 msgid "group_name"
 msgstr "Gruppenname"
 
-#: sql_help.c:389 sql_help.c:391 sql_help.c:938 sql_help.c:1270
-#: sql_help.c:1578 sql_help.c:1580 sql_help.c:1761 sql_help.c:1957
-#: sql_help.c:2292 sql_help.c:2949
+#: sql_help.c:389 sql_help.c:391 sql_help.c:936 sql_help.c:1268
+#: sql_help.c:1576 sql_help.c:1578 sql_help.c:1759 sql_help.c:1955
+#: sql_help.c:2290 sql_help.c:2947
 msgid "user_name"
 msgstr "Benutzername"
 
-#: sql_help.c:407 sql_help.c:1760 sql_help.c:2227 sql_help.c:2459
-#: sql_help.c:2713
+#: sql_help.c:407 sql_help.c:1758 sql_help.c:2225 sql_help.c:2457
+#: sql_help.c:2711
 msgid "tablespace_name"
 msgstr "Tablespace-Name"
 
-#: sql_help.c:409 sql_help.c:412 sql_help.c:721 sql_help.c:723 sql_help.c:1440
-#: sql_help.c:1687 sql_help.c:1695 sql_help.c:1727 sql_help.c:1749
+#: sql_help.c:409 sql_help.c:412 sql_help.c:719 sql_help.c:721 sql_help.c:1438
+#: sql_help.c:1685 sql_help.c:1693 sql_help.c:1725 sql_help.c:1747
 msgid "storage_parameter"
 msgstr "Storage-Parameter"
 
-#: sql_help.c:432 sql_help.c:1075 sql_help.c:2781
+#: sql_help.c:432 sql_help.c:1072 sql_help.c:2779
 msgid "large_object_oid"
 msgstr "Large-Object-OID"
 
-#: sql_help.c:487 sql_help.c:499 sql_help.c:1495
+#: sql_help.c:487 sql_help.c:499 sql_help.c:1493
 msgid "strategy_number"
 msgstr "Strategienummer"
 
 #: sql_help.c:489 sql_help.c:490 sql_help.c:493 sql_help.c:494 sql_help.c:500
-#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1497
-#: sql_help.c:1498 sql_help.c:1501 sql_help.c:1502
+#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1495
+#: sql_help.c:1496 sql_help.c:1499 sql_help.c:1500
 msgid "op_type"
 msgstr "Optyp"
 
-#: sql_help.c:491 sql_help.c:1499
+#: sql_help.c:491 sql_help.c:1497
 msgid "sort_family_name"
 msgstr "Sortierfamilienname"
 
-#: sql_help.c:492 sql_help.c:502 sql_help.c:1500
+#: sql_help.c:492 sql_help.c:502 sql_help.c:1498
 msgid "support_number"
 msgstr "Unterst-Nummer"
 
-#: sql_help.c:496 sql_help.c:1220 sql_help.c:1504
+#: sql_help.c:496 sql_help.c:1218 sql_help.c:1502
 msgid "argument_type"
 msgstr "Argumenttyp"
 
-#: sql_help.c:545 sql_help.c:917 sql_help.c:1414 sql_help.c:1545
-#: sql_help.c:1940
+#: sql_help.c:545 sql_help.c:915 sql_help.c:1412 sql_help.c:1543
+#: sql_help.c:1938
 msgid "password"
 msgstr "Passwort"
 
-#: sql_help.c:546 sql_help.c:918 sql_help.c:1415 sql_help.c:1546
-#: sql_help.c:1941
+#: sql_help.c:546 sql_help.c:916 sql_help.c:1413 sql_help.c:1544
+#: sql_help.c:1939
 msgid "timestamp"
 msgstr "Zeit"
 
-#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2441
-#: sql_help.c:2695
+#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2439
+#: sql_help.c:2693
 msgid "database_name"
 msgstr "Datenbankname"
 
-#: sql_help.c:589 sql_help.c:1593
+#: sql_help.c:589 sql_help.c:1591
 msgid "increment"
 msgstr "Inkrement"
 
-#: sql_help.c:590 sql_help.c:1594
+#: sql_help.c:590 sql_help.c:1592
 msgid "minvalue"
 msgstr "Minwert"
 
-#: sql_help.c:591 sql_help.c:1595
+#: sql_help.c:591 sql_help.c:1593
 msgid "maxvalue"
 msgstr "Maxwert"
 
-#: sql_help.c:592 sql_help.c:1596 sql_help.c:2837 sql_help.c:2907
-#: sql_help.c:3040 sql_help.c:3145 sql_help.c:3196
+#: sql_help.c:592 sql_help.c:1594 sql_help.c:2835 sql_help.c:2905
+#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
 msgid "start"
 msgstr "Start"
 
@@ -3305,745 +3309,749 @@ msgstr "Start"
 msgid "restart"
 msgstr "Restart"
 
-#: sql_help.c:594 sql_help.c:1597
+#: sql_help.c:594 sql_help.c:1595
 msgid "cache"
 msgstr "Cache"
 
-#: sql_help.c:612 sql_help.c:616 sql_help.c:939 sql_help.c:1344
-#: sql_help.c:1609 sql_help.c:1958 sql_help.c:2211 sql_help.c:2293
-#: sql_help.c:2445 sql_help.c:2699
+#: sql_help.c:612 sql_help.c:616 sql_help.c:937 sql_help.c:1342
+#: sql_help.c:1607 sql_help.c:1956 sql_help.c:2209 sql_help.c:2291
+#: sql_help.c:2443 sql_help.c:2697
 msgid "server_name"
 msgstr "Servername"
 
-#: sql_help.c:687 sql_help.c:692 sql_help.c:880 sql_help.c:884 sql_help.c:1293
-#: sql_help.c:1343 sql_help.c:1492 sql_help.c:1680 sql_help.c:1887
-#: sql_help.c:2560
+#: sql_help.c:686 sql_help.c:691 sql_help.c:878 sql_help.c:882 sql_help.c:1291
+#: sql_help.c:1341 sql_help.c:1490 sql_help.c:1678 sql_help.c:1885
+#: sql_help.c:2558
 msgid "data_type"
 msgstr "Datentyp"
 
-#: sql_help.c:688 sql_help.c:693 sql_help.c:881 sql_help.c:885 sql_help.c:1294
-#: sql_help.c:1438 sql_help.c:1681 sql_help.c:1888
+#: sql_help.c:687 sql_help.c:692 sql_help.c:879 sql_help.c:883 sql_help.c:1292
+#: sql_help.c:1436 sql_help.c:1679 sql_help.c:1886
 msgid "collation"
 msgstr "Sortierfolge"
 
-#: sql_help.c:689 sql_help.c:1682 sql_help.c:1693
+#: sql_help.c:688 sql_help.c:1680 sql_help.c:1691
 msgid "column_constraint"
 msgstr "Spalten-Constraint"
 
-#: sql_help.c:700
+#: sql_help.c:699
 msgid "integer"
 msgstr "ganze_Zahl"
 
-#: sql_help.c:702 sql_help.c:705
+#: sql_help.c:701 sql_help.c:704
 msgid "attribute_option"
 msgstr "Attributoption"
 
-#: sql_help.c:707 sql_help.c:709 sql_help.c:1683 sql_help.c:1694
+#: sql_help.c:706 sql_help.c:1681 sql_help.c:1692
 msgid "table_constraint"
 msgstr "Tabellen-Constraint"
 
-#: sql_help.c:708
+#: sql_help.c:707
 msgid "table_constraint_using_index"
 msgstr "Tabellen-Constraint-für-Index"
 
-#: sql_help.c:712 sql_help.c:713 sql_help.c:714 sql_help.c:715 sql_help.c:1095
+#: sql_help.c:710 sql_help.c:711 sql_help.c:712 sql_help.c:713 sql_help.c:1093
 msgid "trigger_name"
 msgstr "Triggername"
 
-#: sql_help.c:716 sql_help.c:717 sql_help.c:718 sql_help.c:719
+#: sql_help.c:714 sql_help.c:715 sql_help.c:716 sql_help.c:717
 msgid "rewrite_rule_name"
 msgstr "Regelname"
 
-#: sql_help.c:720 sql_help.c:731 sql_help.c:1012
+#: sql_help.c:718 sql_help.c:729 sql_help.c:1010
 msgid "index_name"
 msgstr "Indexname"
 
-#: sql_help.c:724 sql_help.c:725 sql_help.c:1684 sql_help.c:1686
+#: sql_help.c:722 sql_help.c:723 sql_help.c:1682 sql_help.c:1684
 msgid "parent_table"
 msgstr "Elterntabelle"
 
-#: sql_help.c:726 sql_help.c:1691
+#: sql_help.c:724 sql_help.c:1689
 msgid "type_name"
 msgstr "Typname"
 
-#: sql_help.c:729
+#: sql_help.c:727
 msgid "and table_constraint_using_index is:"
 msgstr "und Tabellen-Constraint-für-Index Folgendes ist:"
 
-#: sql_help.c:747 sql_help.c:750
+#: sql_help.c:745 sql_help.c:748
 msgid "tablespace_option"
 msgstr "Tablespace-Option"
 
-#: sql_help.c:771 sql_help.c:774 sql_help.c:780 sql_help.c:784
+#: sql_help.c:769 sql_help.c:772 sql_help.c:778 sql_help.c:782
 msgid "token_type"
 msgstr "Tokentyp"
 
-#: sql_help.c:772 sql_help.c:775
+#: sql_help.c:770 sql_help.c:773
 msgid "dictionary_name"
 msgstr "Wörterbuchname"
 
-#: sql_help.c:777 sql_help.c:781
+#: sql_help.c:775 sql_help.c:779
 msgid "old_dictionary"
 msgstr "altes_Wörterbuch"
 
-#: sql_help.c:778 sql_help.c:782
+#: sql_help.c:776 sql_help.c:780
 msgid "new_dictionary"
 msgstr "neues_Wörterbuch"
 
-#: sql_help.c:869 sql_help.c:879 sql_help.c:882 sql_help.c:883 sql_help.c:1886
+#: sql_help.c:867 sql_help.c:877 sql_help.c:880 sql_help.c:881 sql_help.c:1884
 msgid "attribute_name"
 msgstr "Attributname"
 
-#: sql_help.c:870
+#: sql_help.c:868
 msgid "new_attribute_name"
 msgstr "neuer_Attributname"
 
-#: sql_help.c:876
+#: sql_help.c:874
 msgid "new_enum_value"
 msgstr "neuer_Enum-Wert"
 
-#: sql_help.c:877
+#: sql_help.c:875
 msgid "existing_enum_value"
 msgstr "existierender_Enum-Wert"
 
-#: sql_help.c:986 sql_help.c:2964 sql_help.c:2965 sql_help.c:2989
+#: sql_help.c:984 sql_help.c:2962 sql_help.c:2963 sql_help.c:2987
 msgid "transaction_mode"
 msgstr "Transaktionsmodus"
 
-#: sql_help.c:987 sql_help.c:2966 sql_help.c:2990
+#: sql_help.c:985 sql_help.c:2964 sql_help.c:2988
 msgid "where transaction_mode is one of:"
 msgstr "wobei Transaktionsmodus Folgendes sein kann:"
 
-#: sql_help.c:1011 sql_help.c:1055 sql_help.c:1063 sql_help.c:1086
-#: sql_help.c:1096 sql_help.c:1141 sql_help.c:1145 sql_help.c:1341
-#: sql_help.c:1678 sql_help.c:1690 sql_help.c:1747 sql_help.c:2431
-#: sql_help.c:2436 sql_help.c:2685 sql_help.c:2690 sql_help.c:2771
-#: sql_help.c:2839 sql_help.c:2841 sql_help.c:2870 sql_help.c:2909
-#: sql_help.c:3042 sql_help.c:3044 sql_help.c:3073 sql_help.c:3198
-#: sql_help.c:3200 sql_help.c:3229
+#: sql_help.c:1009 sql_help.c:1060 sql_help.c:1083 sql_help.c:1094
+#: sql_help.c:1139 sql_help.c:1143 sql_help.c:1339 sql_help.c:1676
+#: sql_help.c:1688 sql_help.c:1745 sql_help.c:2429 sql_help.c:2434
+#: sql_help.c:2683 sql_help.c:2688 sql_help.c:2769 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2868 sql_help.c:2907 sql_help.c:3040
+#: sql_help.c:3042 sql_help.c:3071 sql_help.c:3196 sql_help.c:3198
+#: sql_help.c:3227
 msgid "table_name"
 msgstr "Tabellenname"
 
-#: sql_help.c:1056 sql_help.c:1342 sql_help.c:1375 sql_help.c:1679
-#: sql_help.c:1692 sql_help.c:1711 sql_help.c:1713 sql_help.c:1720
-#: sql_help.c:1748 sql_help.c:1850 sql_help.c:1970 sql_help.c:2772
-#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "Relationsname"
+
+#: sql_help.c:1058 sql_help.c:1340 sql_help.c:1373 sql_help.c:1677
+#: sql_help.c:1690 sql_help.c:1709 sql_help.c:1711 sql_help.c:1718
+#: sql_help.c:1746 sql_help.c:1848 sql_help.c:1968 sql_help.c:2770
+#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
 msgid "column_name"
 msgstr "Spaltenname"
 
-#: sql_help.c:1085
+#: sql_help.c:1082
 msgid "rule_name"
 msgstr "Regelname"
 
-#: sql_help.c:1099
+#: sql_help.c:1097
 msgid "text"
 msgstr "Text"
 
-#: sql_help.c:1114 sql_help.c:2569 sql_help.c:2731
+#: sql_help.c:1112 sql_help.c:2567 sql_help.c:2729
 msgid "transaction_id"
 msgstr "Transaktions-ID"
 
-#: sql_help.c:1143 sql_help.c:1148 sql_help.c:2495
+#: sql_help.c:1141 sql_help.c:1146 sql_help.c:2493
 msgid "filename"
 msgstr "Dateiname"
 
-#: sql_help.c:1147 sql_help.c:1752 sql_help.c:1971 sql_help.c:1989
-#: sql_help.c:2477
+#: sql_help.c:1145 sql_help.c:1750 sql_help.c:1969 sql_help.c:1987
+#: sql_help.c:2475
 msgid "query"
 msgstr "Anfrage"
 
-#: sql_help.c:1150 sql_help.c:2337
+#: sql_help.c:1148 sql_help.c:2335
 msgid "where option can be one of:"
 msgstr "wobei Option eins der folgenden sein kann:"
 
-#: sql_help.c:1151
+#: sql_help.c:1149
 msgid "format_name"
 msgstr "Formatname"
 
-#: sql_help.c:1152 sql_help.c:1155 sql_help.c:2338 sql_help.c:2339
-#: sql_help.c:2340 sql_help.c:2341
+#: sql_help.c:1150 sql_help.c:1153 sql_help.c:2336 sql_help.c:2337
+#: sql_help.c:2338 sql_help.c:2339
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:1153
+#: sql_help.c:1151
 msgid "delimiter_character"
 msgstr "Trennzeichen"
 
-#: sql_help.c:1154
+#: sql_help.c:1152
 msgid "null_string"
 msgstr "Null-Zeichenkette"
 
-#: sql_help.c:1156
+#: sql_help.c:1154
 msgid "quote_character"
 msgstr "Quote-Zeichen"
 
-#: sql_help.c:1157
+#: sql_help.c:1155
 msgid "escape_character"
 msgstr "Escape-Zeichen"
 
-#: sql_help.c:1160
+#: sql_help.c:1158
 msgid "encoding_name"
 msgstr "Kodierungsname"
 
-#: sql_help.c:1186
+#: sql_help.c:1184
 msgid "input_data_type"
 msgstr "Eingabedatentyp"
 
-#: sql_help.c:1187 sql_help.c:1195
+#: sql_help.c:1185 sql_help.c:1193
 msgid "sfunc"
 msgstr "Ãœbergangsfunktion"
 
-#: sql_help.c:1188 sql_help.c:1196
+#: sql_help.c:1186 sql_help.c:1194
 msgid "state_data_type"
 msgstr "Zustandsdatentyp"
 
-#: sql_help.c:1189 sql_help.c:1197
+#: sql_help.c:1187 sql_help.c:1195
 msgid "ffunc"
 msgstr "Abschlussfunktion"
 
-#: sql_help.c:1190 sql_help.c:1198
+#: sql_help.c:1188 sql_help.c:1196
 msgid "initial_condition"
 msgstr "Anfangswert"
 
-#: sql_help.c:1191 sql_help.c:1199
+#: sql_help.c:1189 sql_help.c:1197
 msgid "sort_operator"
 msgstr "Sortieroperator"
 
-#: sql_help.c:1192
+#: sql_help.c:1190
 msgid "or the old syntax"
 msgstr "oder die alte Syntax"
 
-#: sql_help.c:1194
+#: sql_help.c:1192
 msgid "base_type"
 msgstr "Basistyp"
 
-#: sql_help.c:1238
+#: sql_help.c:1236
 msgid "locale"
 msgstr "Locale"
 
-#: sql_help.c:1239 sql_help.c:1273
+#: sql_help.c:1237 sql_help.c:1271
 msgid "lc_collate"
 msgstr "lc_collate"
 
-#: sql_help.c:1240 sql_help.c:1274
+#: sql_help.c:1238 sql_help.c:1272
 msgid "lc_ctype"
 msgstr "lc_ctype"
 
-#: sql_help.c:1242
+#: sql_help.c:1240
 msgid "existing_collation"
 msgstr "existierende_Sortierfolge"
 
-#: sql_help.c:1252
+#: sql_help.c:1250
 msgid "source_encoding"
 msgstr "Quellkodierung"
 
-#: sql_help.c:1253
+#: sql_help.c:1251
 msgid "dest_encoding"
 msgstr "Zielkodierung"
 
-#: sql_help.c:1271 sql_help.c:1787
+#: sql_help.c:1269 sql_help.c:1785
 msgid "template"
 msgstr "Vorlage"
 
-#: sql_help.c:1272
+#: sql_help.c:1270
 msgid "encoding"
 msgstr "Kodierung"
 
-#: sql_help.c:1275 sql_help.c:1442 sql_help.c:1689 sql_help.c:1697
-#: sql_help.c:1729 sql_help.c:1751
+#: sql_help.c:1273 sql_help.c:1440 sql_help.c:1687 sql_help.c:1695
+#: sql_help.c:1727 sql_help.c:1749
 msgid "tablespace"
 msgstr "Tablespace"
 
-#: sql_help.c:1296
+#: sql_help.c:1294
 msgid "constraint"
 msgstr "Constraint"
 
-#: sql_help.c:1297
+#: sql_help.c:1295
 msgid "where constraint is:"
 msgstr "wobei Constraint Folgendes ist:"
 
-#: sql_help.c:1311
+#: sql_help.c:1309
 msgid "schema"
 msgstr "Schema"
 
-#: sql_help.c:1312
+#: sql_help.c:1310
 msgid "version"
 msgstr "Version"
 
-#: sql_help.c:1313
+#: sql_help.c:1311
 msgid "old_version"
 msgstr "neue_Version"
 
-#: sql_help.c:1373 sql_help.c:1701
+#: sql_help.c:1371 sql_help.c:1699
 msgid "default_expr"
 msgstr "Vorgabeausdruck"
 
-#: sql_help.c:1374
+#: sql_help.c:1372
 msgid "rettype"
 msgstr "Rückgabetyp"
 
-#: sql_help.c:1376
+#: sql_help.c:1374
 msgid "column_type"
 msgstr "Spaltentyp"
 
-#: sql_help.c:1377 sql_help.c:2023 sql_help.c:2453 sql_help.c:2707
+#: sql_help.c:1375 sql_help.c:2021 sql_help.c:2451 sql_help.c:2705
 msgid "lang_name"
 msgstr "Sprachname"
 
-#: sql_help.c:1383
+#: sql_help.c:1381
 msgid "definition"
 msgstr "Definition"
 
-#: sql_help.c:1384
+#: sql_help.c:1382
 msgid "obj_file"
 msgstr "Objektdatei"
 
-#: sql_help.c:1385
+#: sql_help.c:1383
 msgid "link_symbol"
 msgstr "Linksymbol"
 
-#: sql_help.c:1386
+#: sql_help.c:1384
 msgid "attribute"
 msgstr "Attribut"
 
-#: sql_help.c:1421 sql_help.c:1552 sql_help.c:1947
+#: sql_help.c:1419 sql_help.c:1550 sql_help.c:1945
 msgid "uid"
 msgstr "Uid"
 
-#: sql_help.c:1435
+#: sql_help.c:1433
 msgid "method"
 msgstr "Methode"
 
-#: sql_help.c:1439 sql_help.c:1733
+#: sql_help.c:1437 sql_help.c:1731
 msgid "opclass"
 msgstr "Opklasse"
 
-#: sql_help.c:1443 sql_help.c:1719
+#: sql_help.c:1441 sql_help.c:1717
 msgid "predicate"
 msgstr "Prädikat"
 
-#: sql_help.c:1455
+#: sql_help.c:1453
 msgid "call_handler"
 msgstr "Handler"
 
-#: sql_help.c:1456
+#: sql_help.c:1454
 msgid "inline_handler"
 msgstr "Inline-Handler"
 
-#: sql_help.c:1457
+#: sql_help.c:1455
 msgid "valfunction"
 msgstr "Valfunktion"
 
-#: sql_help.c:1475
+#: sql_help.c:1473
 msgid "com_op"
 msgstr "Kommutator-Op"
 
-#: sql_help.c:1476
+#: sql_help.c:1474
 msgid "neg_op"
 msgstr "Umkehrungs-Op"
 
-#: sql_help.c:1477
+#: sql_help.c:1475
 msgid "res_proc"
 msgstr "Res-Funktion"
 
-#: sql_help.c:1478
+#: sql_help.c:1476
 msgid "join_proc"
 msgstr "Join-Funktion"
 
-#: sql_help.c:1494
+#: sql_help.c:1492
 msgid "family_name"
 msgstr "Familienname"
 
-#: sql_help.c:1505
+#: sql_help.c:1503
 msgid "storage_type"
 msgstr "Storage-Typ"
 
-#: sql_help.c:1563 sql_help.c:1843
+#: sql_help.c:1561 sql_help.c:1841
 msgid "event"
 msgstr "Ereignis"
 
-#: sql_help.c:1565 sql_help.c:1846 sql_help.c:2005 sql_help.c:2828
-#: sql_help.c:2830 sql_help.c:2898 sql_help.c:2900 sql_help.c:3031
-#: sql_help.c:3033 sql_help.c:3112 sql_help.c:3187 sql_help.c:3189
+#: sql_help.c:1563 sql_help.c:1844 sql_help.c:2003 sql_help.c:2826
+#: sql_help.c:2828 sql_help.c:2896 sql_help.c:2898 sql_help.c:3029
+#: sql_help.c:3031 sql_help.c:3110 sql_help.c:3185 sql_help.c:3187
 msgid "condition"
 msgstr "Bedingung"
 
-#: sql_help.c:1566 sql_help.c:1567 sql_help.c:1568
+#: sql_help.c:1564 sql_help.c:1565 sql_help.c:1566
 msgid "command"
 msgstr "Befehl"
 
-#: sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1577 sql_help.c:1579
 msgid "schema_element"
 msgstr "Schemaelement"
 
-#: sql_help.c:1610
+#: sql_help.c:1608
 msgid "server_type"
 msgstr "Servertyp"
 
-#: sql_help.c:1611
+#: sql_help.c:1609
 msgid "server_version"
 msgstr "Serverversion"
 
-#: sql_help.c:1612 sql_help.c:2443 sql_help.c:2697
+#: sql_help.c:1610 sql_help.c:2441 sql_help.c:2695
 msgid "fdw_name"
 msgstr "FDW-Name"
 
-#: sql_help.c:1685
+#: sql_help.c:1683
 msgid "like_option"
 msgstr "Like-Option"
 
-#: sql_help.c:1698
+#: sql_help.c:1696
 msgid "where column_constraint is:"
 msgstr "wobei Spalten-Constraint Folgendes ist:"
 
-#: sql_help.c:1702 sql_help.c:1703 sql_help.c:1712 sql_help.c:1714
-#: sql_help.c:1718
+#: sql_help.c:1700 sql_help.c:1701 sql_help.c:1710 sql_help.c:1712
+#: sql_help.c:1716
 msgid "index_parameters"
 msgstr "Indexparameter"
 
-#: sql_help.c:1704 sql_help.c:1721
+#: sql_help.c:1702 sql_help.c:1719
 msgid "reftable"
 msgstr "Reftabelle"
 
-#: sql_help.c:1705 sql_help.c:1722
+#: sql_help.c:1703 sql_help.c:1720
 msgid "refcolumn"
 msgstr "Refspalte"
 
-#: sql_help.c:1708
+#: sql_help.c:1706
 msgid "and table_constraint is:"
 msgstr "und Tabellen-Constraint Folgendes ist:"
 
-#: sql_help.c:1716
+#: sql_help.c:1714
 msgid "exclude_element"
 msgstr "Exclude-Element"
 
-#: sql_help.c:1725
+#: sql_help.c:1723
 msgid "and like_option is:"
 msgstr "und Like-Option Folgendes ist:"
 
-#: sql_help.c:1726
+#: sql_help.c:1724
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "Indexparameter bei UNIQUE-, PRIMARY KEY- und EXCLUDE-Constraints sind:"
 
-#: sql_help.c:1730
+#: sql_help.c:1728
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "Exclude-Element in einem EXCLUDE-Constraint ist:"
 
-#: sql_help.c:1762
+#: sql_help.c:1760
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: sql_help.c:1774
+#: sql_help.c:1772
 msgid "parser_name"
 msgstr "Parser-Name"
 
-#: sql_help.c:1775
+#: sql_help.c:1773
 msgid "source_config"
 msgstr "Quellkonfig"
 
-#: sql_help.c:1804
+#: sql_help.c:1802
 msgid "start_function"
 msgstr "Startfunktion"
 
-#: sql_help.c:1805
+#: sql_help.c:1803
 msgid "gettoken_function"
 msgstr "Gettext-Funktion"
 
-#: sql_help.c:1806
+#: sql_help.c:1804
 msgid "end_function"
 msgstr "Endfunktion"
 
-#: sql_help.c:1807
+#: sql_help.c:1805
 msgid "lextypes_function"
 msgstr "Lextypenfunktion"
 
-#: sql_help.c:1808
+#: sql_help.c:1806
 msgid "headline_function"
 msgstr "Headline-Funktion"
 
-#: sql_help.c:1820
+#: sql_help.c:1818
 msgid "init_function"
 msgstr "Init-Funktion"
 
-#: sql_help.c:1821
+#: sql_help.c:1819
 msgid "lexize_function"
 msgstr "Lexize-Funktion"
 
-#: sql_help.c:1845
+#: sql_help.c:1843
 msgid "referenced_table_name"
 msgstr "verwiesener_Tabellenname"
 
-#: sql_help.c:1848
+#: sql_help.c:1846
 msgid "arguments"
 msgstr "Argumente"
 
-#: sql_help.c:1849
+#: sql_help.c:1847
 msgid "where event can be one of:"
 msgstr "wobei Ereignis eins der folgenden sein kann:"
 
-#: sql_help.c:1890 sql_help.c:2787
+#: sql_help.c:1888 sql_help.c:2785
 msgid "label"
 msgstr "Label"
 
-#: sql_help.c:1892
+#: sql_help.c:1890
 msgid "input_function"
 msgstr "Eingabefunktion"
 
-#: sql_help.c:1893
+#: sql_help.c:1891
 msgid "output_function"
 msgstr "Ausgabefunktion"
 
-#: sql_help.c:1894
+#: sql_help.c:1892
 msgid "receive_function"
 msgstr "Empfangsfunktion"
 
-#: sql_help.c:1895
+#: sql_help.c:1893
 msgid "send_function"
 msgstr "Sendefunktion"
 
-#: sql_help.c:1896
+#: sql_help.c:1894
 msgid "type_modifier_input_function"
 msgstr "Typmod-Eingabefunktion"
 
-#: sql_help.c:1897
+#: sql_help.c:1895
 msgid "type_modifier_output_function"
 msgstr "Typmod-Ausgabefunktion"
 
-#: sql_help.c:1898
+#: sql_help.c:1896
 msgid "analyze_function"
 msgstr "Analyze-Funktion"
 
-#: sql_help.c:1899
+#: sql_help.c:1897
 msgid "internallength"
 msgstr "interne_Länge"
 
-#: sql_help.c:1900
+#: sql_help.c:1898
 msgid "alignment"
 msgstr "Ausrichtung"
 
-#: sql_help.c:1901
+#: sql_help.c:1899
 msgid "storage"
 msgstr "Speicherung"
 
-#: sql_help.c:1902
+#: sql_help.c:1900
 msgid "like_type"
 msgstr "wie_Typ"
 
-#: sql_help.c:1903
+#: sql_help.c:1901
 msgid "category"
 msgstr "Kategorie"
 
-#: sql_help.c:1904
+#: sql_help.c:1902
 msgid "preferred"
 msgstr "bevorzugt"
 
-#: sql_help.c:1905
+#: sql_help.c:1903
 msgid "default"
 msgstr "Vorgabewert"
 
-#: sql_help.c:1906
+#: sql_help.c:1904
 msgid "element"
 msgstr "Element"
 
-#: sql_help.c:1907
+#: sql_help.c:1905
 msgid "delimiter"
 msgstr "Trennzeichen"
 
-#: sql_help.c:1908
+#: sql_help.c:1906
 msgid "collatable"
 msgstr "sortierbar"
 
-#: sql_help.c:2001 sql_help.c:2473 sql_help.c:2823 sql_help.c:2892
-#: sql_help.c:3026 sql_help.c:3104 sql_help.c:3182
+#: sql_help.c:1999 sql_help.c:2471 sql_help.c:2821 sql_help.c:2890
+#: sql_help.c:3024 sql_help.c:3102 sql_help.c:3180
 msgid "with_query"
 msgstr "With-Anfrage"
 
-#: sql_help.c:2003 sql_help.c:2842 sql_help.c:2845 sql_help.c:2848
-#: sql_help.c:2852 sql_help.c:3045 sql_help.c:3048 sql_help.c:3051
-#: sql_help.c:3055 sql_help.c:3106 sql_help.c:3201 sql_help.c:3204
-#: sql_help.c:3207 sql_help.c:3211
+#: sql_help.c:2001 sql_help.c:2840 sql_help.c:2843 sql_help.c:2846
+#: sql_help.c:2850 sql_help.c:3043 sql_help.c:3046 sql_help.c:3049
+#: sql_help.c:3053 sql_help.c:3104 sql_help.c:3199 sql_help.c:3202
+#: sql_help.c:3205 sql_help.c:3209
 msgid "alias"
 msgstr "Alias"
 
-#: sql_help.c:2004
+#: sql_help.c:2002
 msgid "using_list"
 msgstr "Using-Liste"
 
-#: sql_help.c:2006 sql_help.c:2367 sql_help.c:2536 sql_help.c:3113
+#: sql_help.c:2004 sql_help.c:2365 sql_help.c:2534 sql_help.c:3111
 msgid "cursor_name"
 msgstr "Cursor-Name"
 
-#: sql_help.c:2007 sql_help.c:2478 sql_help.c:3114
+#: sql_help.c:2005 sql_help.c:2476 sql_help.c:3112
 msgid "output_expression"
 msgstr "Ausgabeausdruck"
 
-#: sql_help.c:2008 sql_help.c:2479 sql_help.c:2826 sql_help.c:2895
-#: sql_help.c:3029 sql_help.c:3115 sql_help.c:3185
+#: sql_help.c:2006 sql_help.c:2477 sql_help.c:2824 sql_help.c:2893
+#: sql_help.c:3027 sql_help.c:3113 sql_help.c:3183
 msgid "output_name"
 msgstr "Ausgabename"
 
-#: sql_help.c:2024
+#: sql_help.c:2022
 msgid "code"
 msgstr "Code"
 
-#: sql_help.c:2317
+#: sql_help.c:2315
 msgid "parameter"
 msgstr "Parameter"
 
-#: sql_help.c:2335 sql_help.c:2336 sql_help.c:2561
+#: sql_help.c:2333 sql_help.c:2334 sql_help.c:2559
 msgid "statement"
 msgstr "Anweisung"
 
-#: sql_help.c:2366 sql_help.c:2535
+#: sql_help.c:2364 sql_help.c:2533
 msgid "direction"
 msgstr "Richtung"
 
-#: sql_help.c:2368 sql_help.c:2537
+#: sql_help.c:2366 sql_help.c:2535
 msgid "where direction can be empty or one of:"
 msgstr "wobei Richtung leer sein kann oder Folgendes:"
 
-#: sql_help.c:2369 sql_help.c:2370 sql_help.c:2371 sql_help.c:2372
-#: sql_help.c:2373 sql_help.c:2538 sql_help.c:2539 sql_help.c:2540
-#: sql_help.c:2541 sql_help.c:2542 sql_help.c:2836 sql_help.c:2838
-#: sql_help.c:2906 sql_help.c:2908 sql_help.c:3039 sql_help.c:3041
-#: sql_help.c:3144 sql_help.c:3146 sql_help.c:3195 sql_help.c:3197
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2371 sql_help.c:2536 sql_help.c:2537 sql_help.c:2538
+#: sql_help.c:2539 sql_help.c:2540 sql_help.c:2834 sql_help.c:2836
+#: sql_help.c:2904 sql_help.c:2906 sql_help.c:3037 sql_help.c:3039
+#: sql_help.c:3142 sql_help.c:3144 sql_help.c:3193 sql_help.c:3195
 msgid "count"
 msgstr "Anzahl"
 
-#: sql_help.c:2438 sql_help.c:2692
+#: sql_help.c:2436 sql_help.c:2690
 msgid "sequence_name"
 msgstr "Sequenzname"
 
-#: sql_help.c:2449 sql_help.c:2703
+#: sql_help.c:2447 sql_help.c:2701
 msgid "arg_name"
 msgstr "Argname"
 
-#: sql_help.c:2450 sql_help.c:2704
+#: sql_help.c:2448 sql_help.c:2702
 msgid "arg_type"
 msgstr "Argtyp"
 
-#: sql_help.c:2455 sql_help.c:2709
+#: sql_help.c:2453 sql_help.c:2707
 msgid "loid"
 msgstr "Large-Object-OID"
 
-#: sql_help.c:2487 sql_help.c:2550 sql_help.c:3090
+#: sql_help.c:2485 sql_help.c:2548 sql_help.c:3088
 msgid "channel"
 msgstr "Kanal"
 
-#: sql_help.c:2509
+#: sql_help.c:2507
 msgid "lockmode"
 msgstr "Sperrmodus"
 
-#: sql_help.c:2510
+#: sql_help.c:2508
 msgid "where lockmode is one of:"
 msgstr "wobei Sperrmodus Folgendes sein kann:"
 
-#: sql_help.c:2551
+#: sql_help.c:2549
 msgid "payload"
 msgstr "Payload"
 
-#: sql_help.c:2577
+#: sql_help.c:2575
 msgid "old_role"
 msgstr "alte_Rolle"
 
-#: sql_help.c:2578
+#: sql_help.c:2576
 msgid "new_role"
 msgstr "neue_Rolle"
 
-#: sql_help.c:2594 sql_help.c:2739 sql_help.c:2747
+#: sql_help.c:2592 sql_help.c:2737 sql_help.c:2745
 msgid "savepoint_name"
 msgstr "Savepoint-Name"
 
-#: sql_help.c:2769
+#: sql_help.c:2767
 msgid "provider"
 msgstr "Provider"
 
-#: sql_help.c:2827 sql_help.c:2858 sql_help.c:2860 sql_help.c:2897
-#: sql_help.c:3030 sql_help.c:3061 sql_help.c:3063 sql_help.c:3186
-#: sql_help.c:3217 sql_help.c:3219
+#: sql_help.c:2825 sql_help.c:2856 sql_help.c:2858 sql_help.c:2895
+#: sql_help.c:3028 sql_help.c:3059 sql_help.c:3061 sql_help.c:3184
+#: sql_help.c:3215 sql_help.c:3217
 msgid "from_item"
 msgstr "From-Element"
 
-#: sql_help.c:2831 sql_help.c:2901 sql_help.c:3034 sql_help.c:3190
+#: sql_help.c:2829 sql_help.c:2899 sql_help.c:3032 sql_help.c:3188
 msgid "window_name"
 msgstr "Fenstername"
 
-#: sql_help.c:2832 sql_help.c:2902 sql_help.c:3035 sql_help.c:3191
+#: sql_help.c:2830 sql_help.c:2900 sql_help.c:3033 sql_help.c:3189
 msgid "window_definition"
 msgstr "Fensterdefinition"
 
-#: sql_help.c:2833 sql_help.c:2844 sql_help.c:2866 sql_help.c:2903
-#: sql_help.c:3036 sql_help.c:3047 sql_help.c:3069 sql_help.c:3192
-#: sql_help.c:3203 sql_help.c:3225
+#: sql_help.c:2831 sql_help.c:2842 sql_help.c:2864 sql_help.c:2901
+#: sql_help.c:3034 sql_help.c:3045 sql_help.c:3067 sql_help.c:3190
+#: sql_help.c:3201 sql_help.c:3223
 msgid "select"
 msgstr "Select"
 
-#: sql_help.c:2840 sql_help.c:3043 sql_help.c:3199
+#: sql_help.c:2838 sql_help.c:3041 sql_help.c:3197
 msgid "where from_item can be one of:"
 msgstr "wobei From-Element Folgendes sein kann:"
 
-#: sql_help.c:2843 sql_help.c:2846 sql_help.c:2849 sql_help.c:2853
-#: sql_help.c:3046 sql_help.c:3049 sql_help.c:3052 sql_help.c:3056
-#: sql_help.c:3202 sql_help.c:3205 sql_help.c:3208 sql_help.c:3212
+#: sql_help.c:2841 sql_help.c:2844 sql_help.c:2847 sql_help.c:2851
+#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3050 sql_help.c:3054
+#: sql_help.c:3200 sql_help.c:3203 sql_help.c:3206 sql_help.c:3210
 msgid "column_alias"
 msgstr " Spaltenalias"
 
-#: sql_help.c:2847 sql_help.c:2864 sql_help.c:3050 sql_help.c:3067
-#: sql_help.c:3206 sql_help.c:3223
+#: sql_help.c:2845 sql_help.c:2862 sql_help.c:3048 sql_help.c:3065
+#: sql_help.c:3204 sql_help.c:3221
 msgid "with_query_name"
 msgstr "With-Anfragename"
 
-#: sql_help.c:2851 sql_help.c:2856 sql_help.c:3054 sql_help.c:3059
-#: sql_help.c:3210 sql_help.c:3215
+#: sql_help.c:2849 sql_help.c:2854 sql_help.c:3052 sql_help.c:3057
+#: sql_help.c:3208 sql_help.c:3213
 msgid "argument"
 msgstr "Argument"
 
-#: sql_help.c:2854 sql_help.c:2857 sql_help.c:3057 sql_help.c:3060
-#: sql_help.c:3213 sql_help.c:3216
+#: sql_help.c:2852 sql_help.c:2855 sql_help.c:3055 sql_help.c:3058
+#: sql_help.c:3211 sql_help.c:3214
 msgid "column_definition"
 msgstr "Spaltendefinition"
 
-#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
+#: sql_help.c:2857 sql_help.c:3060 sql_help.c:3216
 msgid "join_type"
 msgstr "Verbundtyp"
 
-#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
+#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
 msgid "join_condition"
 msgstr "Verbundbedingung"
 
-#: sql_help.c:2862 sql_help.c:3065 sql_help.c:3221
+#: sql_help.c:2860 sql_help.c:3063 sql_help.c:3219
 msgid "join_column"
 msgstr "Verbundspalte"
 
-#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
+#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
 msgid "and with_query is:"
 msgstr "und With-Anfrage ist:"
 
-#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
+#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:2868 sql_help.c:3071 sql_help.c:3227
+#: sql_help.c:2866 sql_help.c:3069 sql_help.c:3225
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:2869 sql_help.c:3072 sql_help.c:3228
+#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:2896
+#: sql_help.c:2894
 msgid "new_table"
 msgstr "neue_Tabelle"
 
-#: sql_help.c:2921
+#: sql_help.c:2919
 msgid "timezone"
 msgstr "Zeitzone"
 
-#: sql_help.c:3111
+#: sql_help.c:3109
 msgid "from_list"
 msgstr "From-Liste"
 
-#: sql_help.c:3142
+#: sql_help.c:3140
 msgid "sort_expression"
 msgstr "Sortierausdruck"
 
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
index e9ec8a8d7e83f..d55c163d7dc4e 100644
--- a/src/bin/psql/po/es.po
+++ b/src/bin/psql/po/es.po
@@ -1,184 +1,220 @@
 # spanish translation of psql.
 #
-# Copyright (C) 2003-2010 PostgreSQL Global Development Group
+# Copyright (C) 2003-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
-# Alvaro Herrera, <alvherre@alvh.no-ip.org>, 2003-2010
+# Alvaro Herrera, <alvherre@alvh.no-ip.org>, 2003-2011
 # Diego A. Gil <diego@adminsa.com>, 2005
 #
-# pgtranslation Id: psql.po,v 1.22 2010/09/01 21:52:03 alvherre Exp $
+# pgtranslation Id: psql.po,v 1.24 2011/09/08 01:25:46 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: psql (PostgreSQL 9.0)\n"
+"Project-Id-Version: psql (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-01 18:03+0000\n"
-"PO-Revision-Date: 2010-09-01 17:17-0400\n"
+"POT-Creation-Date: 2011-09-07 20:55+0000\n"
+"PO-Revision-Date: 2011-09-07 22:25-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: command.c:112
+#: command.c:113
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Orden \\%s no válida. Use \\? para obtener ayuda.\n"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "orden \\%s no válida\n"
 
-#: command.c:125
+#: command.c:126
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: argumento extra «%s» ignorado\n"
 
-#: command.c:267
+#: command.c:268
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "No se ha podido obtener directorio home: %s\n"
 
-#: command.c:283
+#: command.c:284
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: no se pudo cambiar directorio a «%s»: %s\n"
 
-#: command.c:316 common.c:940
+#: command.c:305 common.c:493 common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "No está conectado a una base de datos.\n"
+
+#: command.c:312
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Está conectado a la base de datos «%s» como el usuario «%s» a través del "
+"socket en «%s» port «%s».\n"
+
+#: command.c:315
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
+"\"%s\".\n"
+msgstr ""
+"Está conectado a la base de datos «%s» como el usuario «%s» en el servidor "
+"«%s» port «%s».\n"
+
+#: command.c:339 common.c:940
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Duración: %.3f ms\n"
 
-#: command.c:485 command.c:513 command.c:1064
+#: command.c:524 command.c:588 command.c:1285
 msgid "no query buffer\n"
 msgstr "no hay búfer de consulta\n"
 
-#: command.c:555
+#: command.c:557 command.c:2507
+#, c-format
+msgid "invalid line number: %s\n"
+msgstr "número de línea no válido: %s\n"
+
+#: command.c:662
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: command.c:609
+#: command.c:716
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: nombre de codificación no válido o procedimiento de conversión\n"
 "no encontrado\n"
 
-#: command.c:688 command.c:722 command.c:736 command.c:753 command.c:857
-#: command.c:907 command.c:1044 command.c:1075
+#: command.c:795 command.c:829 command.c:843 command.c:860 command.c:964
+#: command.c:1014 command.c:1265 command.c:1296
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: falta argumento requerido\n"
 
-#: command.c:785
+#: command.c:892
 msgid "Query buffer is empty."
 msgstr "El búfer de consulta está vacío."
 
-#: command.c:795
+#: command.c:902
 msgid "Enter new password: "
 msgstr "Ingrese la nueva contraseña: "
 
-#: command.c:796
+#: command.c:903
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: command.c:800
+#: command.c:907
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las constraseñas no coinciden.\n"
 
-#: command.c:818
+#: command.c:925
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "El cifrado de la contraseña falló.\n"
 
-#: command.c:886 command.c:987 command.c:1049
+#: command.c:993 command.c:1094 command.c:1270
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: error\n"
 
-#: command.c:927
+#: command.c:1034
 msgid "Query buffer reset (cleared)."
 msgstr "El búfer de consulta ha sido reiniciado (limpiado)."
 
-#: command.c:940
+#: command.c:1047
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Se escribió la historia en el archivo «%s/%s».\n"
 
-#: command.c:978 common.c:52 common.c:66 input.c:209 mainloop.c:72
-#: mainloop.c:234 print.c:137 print.c:151
+#: command.c:1085 common.c:52 common.c:66 common.c:90 input.c:209
+#: mainloop.c:72 mainloop.c:234 print.c:137 print.c:151
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
-#: command.c:1029
+#: command.c:1115
+msgid "function name is required\n"
+msgstr "el nombre de la función es requerido\n"
+
+#: command.c:1250
 msgid "Timing is on."
 msgstr "El despliegue de duración está activado."
 
-#: command.c:1031
+#: command.c:1252
 msgid "Timing is off."
 msgstr "El despliegue de duración está desactivado."
 
-#: command.c:1092 command.c:1112 command.c:1633 command.c:1640 command.c:1649
-#: command.c:1659 command.c:1668 command.c:1682 command.c:1699 command.c:1737
+#: command.c:1313 command.c:1333 command.c:1895 command.c:1902 command.c:1911
+#: command.c:1921 command.c:1930 command.c:1944 command.c:1961 command.c:1999
 #: common.c:137 copy.c:283 copy.c:361
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1194 startup.c:159
+#: command.c:1415 startup.c:159
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: command.c:1201 startup.c:162 startup.c:164
+#: command.c:1422 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "Contraseña para usuario %s: "
 
-#: command.c:1318 command.c:2207 common.c:183 common.c:460 common.c:525
-#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:606
+#: command.c:1541 command.c:2541 common.c:183 common.c:460 common.c:525
+#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1322
+#: command.c:1545
 msgid "Previous connection kept\n"
 msgstr "Se ha mantenido la conexión anterior\n"
 
-#: command.c:1326
+#: command.c:1549
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1350
-#, c-format
-msgid "You are now connected to database \"%s\""
-msgstr "Ahora está conectado a la base de datos «%s»"
-
-#: command.c:1353
+#: command.c:1582
 #, c-format
-msgid " on host \"%s\""
-msgstr " en el servidor «%s»"
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+"at port \"%s\".\n"
+msgstr ""
+"Ahora está conectado a la base de datos «%s» como el usuario «%s» a través "
+"del socket en «%s» port «%s».\n"
 
-#: command.c:1356
+#: command.c:1585
 #, c-format
-msgid " at port \"%s\""
-msgstr " en el puerto «%s»"
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Ahora está conectado a la base de datos «%s» como el usuario «%s» en el "
+"servidor «%s» port «%s».\n"
 
-#: command.c:1359
+#: command.c:1589
 #, c-format
-msgid " as user \"%s\""
-msgstr " como el usuario «%s»"
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr "Ahora está conectado a la base de datos «%s» con el usuario «%s».\n"
 
-#: command.c:1394
+#: command.c:1623
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, servidor %s)\n"
 
-#: command.c:1402
+#: command.c:1631
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -187,17 +223,17 @@ msgstr ""
 "ADVERTENCIA: %s versión %d.%d, servidor versión %d.%d.\n"
 "          Algunas características de psql pueden no funcionar.\n"
 
-#: command.c:1432
+#: command.c:1661
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "conexión SSL (cifrado: %s, bits: %i)\n"
 
-#: command.c:1442
+#: command.c:1671
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "conexión SSL (cifrado desconocido)\n"
 
-#: command.c:1463
+#: command.c:1692
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -210,26 +246,34 @@ msgstr ""
 "            Vea la página de referencia de psql «Notes for Windows users»\n"
 "            para obtener más detalles.\n"
 
-#: command.c:1552
+#: command.c:1776
+msgid ""
+"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
+"line number\n"
+msgstr ""
+"la variable de ambiente PSQL_EDITOR_LINENUMBER_SWITCH debe estar definida "
+"para poder especificar un número de línea\n"
+
+#: command.c:1813
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "no se pudo iniciar el editor «%s»\n"
 
-#: command.c:1554
+#: command.c:1815
 msgid "could not start /bin/sh\n"
 msgstr "no se pudo iniciar /bin/sh\n"
 
-#: command.c:1591
+#: command.c:1853
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "no se encontró el directorio temporal: %s"
+msgid "could not locate temporary directory: %s\n"
+msgstr "no se pudo ubicar el directorio temporal: %s\n"
 
-#: command.c:1618
+#: command.c:1880
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "no se pudo abrir archivo temporal «%s»: %s\n"
 
-#: command.c:1839
+#: command.c:2110
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
@@ -237,122 +281,122 @@ msgstr ""
 "\\pset: formatos permitidos son unaligned, aligned, wrapped, html, latex, "
 "troff-ms\n"
 
-#: command.c:1844
+#: command.c:2115
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "El formato de salida es %s.\n"
 
-#: command.c:1860
+#: command.c:2131
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: estilos de línea permitidos son ascii, old-ascii, unicode\n"
 
-#: command.c:1865
+#: command.c:2136
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "El estilo de línea es %s.\n"
 
-#: command.c:1876
+#: command.c:2147
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "El estilo de borde es %d.\n"
 
-#: command.c:1888
+#: command.c:2159
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Se ha activado el despliegue expandido.\n"
 
-#: command.c:1889
+#: command.c:2160
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Se ha desactivado el despliegue expandido.\n"
 
-#: command.c:1902
+#: command.c:2173
 msgid "Showing locale-adjusted numeric output."
 msgstr "Mostrando salida numérica ajustada localmente"
 
-#: command.c:1904
+#: command.c:2175
 msgid "Locale-adjusted numeric output is off."
 msgstr "La salida numérica ajustada localmente está deshabilitada. "
 
-#: command.c:1917
+#: command.c:2188
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Despliegue de nulos es «%s».\n"
 
-#: command.c:1929
+#: command.c:2200
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "El separador de campos es «%s».\n"
 
-#: command.c:1943
+#: command.c:2214
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "El separador de filas es <salto de línea>."
 
-#: command.c:1945
+#: command.c:2216
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "El separador de filas es «%s».\n"
 
-#: command.c:1959
+#: command.c:2230
 msgid "Showing only tuples."
 msgstr "Mostrando sólo filas."
 
-#: command.c:1961
+#: command.c:2232
 msgid "Tuples only is off."
 msgstr "Mostrar sólo filas está desactivado."
 
-#: command.c:1977
+#: command.c:2248
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "El título es «%s».\n"
 
-#: command.c:1979
+#: command.c:2250
 #, c-format
 msgid "Title is unset.\n"
 msgstr "El título ha sido indefinido.\n"
 
-#: command.c:1995
+#: command.c:2266
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Los atributos de tabla son «%s».\n"
 
-#: command.c:1997
+#: command.c:2268
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Los atributos de tabla han sido indefinidos.\n"
 
-#: command.c:2018
+#: command.c:2289
 msgid "Pager is used for long output."
 msgstr "El paginador se usará para salida larga."
 
-#: command.c:2020
+#: command.c:2291
 msgid "Pager is always used."
 msgstr "El paginador se usará siempre."
 
-#: command.c:2022
+#: command.c:2293
 msgid "Pager usage is off."
 msgstr "El paginador no se usará."
 
-#: command.c:2036
+#: command.c:2307
 msgid "Default footer is on."
 msgstr "El pie por omisión está activo."
 
-#: command.c:2038
+#: command.c:2309
 msgid "Default footer is off."
 msgstr "El pie de página por omisión está desactivado."
 
-#: command.c:2049
+#: command.c:2320
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "El ancho para el formato «wrapped» es %d.\n"
 
-#: command.c:2054
+#: command.c:2325
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: opción desconocida: %s\n"
 
-#: command.c:2108
+#: command.c:2379
 msgid "\\!: failed\n"
 msgstr "\\!: falló\n"
 
@@ -361,10 +405,6 @@ msgstr "\\!: falló\n"
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: pg_strdup: no se puede duplicar puntero nulo (error interno)\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "memoria agotada"
-
 #: common.c:343
 msgid "connection to server was lost\n"
 msgstr "se ha perdido la conexión al servidor\n"
@@ -381,10 +421,6 @@ msgstr "falló.\n"
 msgid "Succeeded.\n"
 msgstr "con éxito.\n"
 
-#: common.c:493 common.c:773
-msgid "You are currently not connected to a database.\n"
-msgstr "No está conectado a una base de datos.\n"
-
 #: common.c:499 common.c:506 common.c:799
 #, c-format
 msgid ""
@@ -491,36 +527,36 @@ msgstr ""
 "Ingrese los datos a ser copiados seguidos de un fin de línea.\n"
 "Termine con un backslash y un punto."
 
-#: copy.c:599
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "se abortó por un error de lectura"
 
-#: help.c:52
+#: help.c:48
 msgid "on"
 msgstr "activado"
 
-#: help.c:52
+#: help.c:48
 msgid "off"
 msgstr "desactivado"
 
-#: help.c:74
+#: help.c:70
 #, c-format
 msgid "could not get current user name: %s\n"
 msgstr "no se pudo obtener el nombre de usuario actual: %s\n"
 
-#: help.c:86
+#: help.c:82
 #, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
 "\n"
 msgstr "psql es el terminal interactivo de PostgreSQL.\n"
 
-#: help.c:87
+#: help.c:83
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: help.c:88
+#: help.c:84
 #, c-format
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
@@ -529,12 +565,12 @@ msgstr ""
 "  psql [OPCIONES]... [BASE-DE-DATOS [USUARIO]]\n"
 "\n"
 
-#: help.c:90
+#: help.c:86
 #, c-format
 msgid "General options:\n"
 msgstr "Opciones generales:\n"
 
-#: help.c:95
+#: help.c:91
 #, c-format
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
@@ -542,7 +578,7 @@ msgid ""
 msgstr ""
 "  -c, --command=ORDEN  ejecutar sólo una orden (SQL o interna) y salir\n"
 
-#: help.c:96
+#: help.c:92
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
@@ -550,17 +586,17 @@ msgstr ""
 "  -d, --dbname=NOMBRE  nombre de base de datos a conectarse\n"
 "                       (por omisión: «%s»)\n"
 
-#: help.c:97
+#: help.c:93
 #, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=ARCHIVO   ejecutar órdenes desde archivo, luego salir\n"
 
-#: help.c:98
+#: help.c:94
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list           listar bases de datos, luego salir\n"
 
-#: help.c:99
+#: help.c:95
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
@@ -569,12 +605,12 @@ msgstr ""
 "  -v, --set=, --variable=NOMBRE=VALOR\n"
 "                       definir variable de psql NOMBRE a VALOR\n"
 
-#: help.c:101
+#: help.c:97
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc      no leer archivo de configuración (~/.psqlrc)\n"
 
-#: help.c:102
+#: help.c:98
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -583,17 +619,17 @@ msgstr ""
 "  -1 («uno»), --single-transaction\n"
 "                       ejecuta archivo de órdenes en una única transacción\n"
 
-#: help.c:104
+#: help.c:100
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help               muestra esta ayuda y termina\n"
 
-#: help.c:105
+#: help.c:101
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version            muestra información de la versión y termina\n"
 
-#: help.c:107
+#: help.c:103
 #, c-format
 msgid ""
 "\n"
@@ -602,54 +638,54 @@ msgstr ""
 "\n"
 "Opciones de entrada y salida:\n"
 
-#: help.c:108
+#: help.c:104
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all       mostrar las órdenes del script\n"
 
-#: help.c:109
+#: help.c:105
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries   mostrar órdenes enviadas al servidor\n"
 
-#: help.c:110
+#: help.c:106
 #, c-format
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr ""
 "  -E, --echo-hidden    mostrar consultas generadas por órdenes internas\n"
 
-#: help.c:111
+#: help.c:107
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=ARCH  envía el registro de la sesión a un archivo\n"
 
-#: help.c:112
+#: help.c:108
 #, c-format
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline    deshabilitar edición de línea de órdenes (readline)\n"
 
-#: help.c:113
+#: help.c:109
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=ARCHIVO enviar resultados de consultas a archivo (u |orden)\n"
 
-#: help.c:114
+#: help.c:110
 #, c-format
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet          modo silencioso (sin mensajes, sólo resultados)\n"
 
-#: help.c:115
+#: help.c:111
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step    modo paso a paso (confirmar cada consulta)\n"
 
-#: help.c:116
+#: help.c:112
 #, c-format
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
@@ -657,7 +693,7 @@ msgid ""
 msgstr ""
 "  -S, --single-line    modo de líneas (fin de línea termina la orden SQL)\n"
 
-#: help.c:118
+#: help.c:114
 #, c-format
 msgid ""
 "\n"
@@ -666,12 +702,12 @@ msgstr ""
 "\n"
 "Opciones de formato de salida:\n"
 
-#: help.c:119
+#: help.c:115
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align       modo de salida desalineado\n"
 
-#: help.c:120
+#: help.c:116
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -680,12 +716,12 @@ msgstr ""
 "  -F, --field-separator=CADENA\n"
 "                       definir separador de columnas (por omisión: «%s»)\n"
 
-#: help.c:123
+#: help.c:119
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html           modo de salida en tablas HTML\n"
 
-#: help.c:124
+#: help.c:120
 #, c-format
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
@@ -694,7 +730,7 @@ msgstr ""
 "  -P, --pset=VAR[=ARG] definir opción de impresión VAR en ARG (ver orden "
 "\\pset)\n"
 
-#: help.c:125
+#: help.c:121
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -704,12 +740,12 @@ msgstr ""
 "                       definir separador de filas (por omisión: salto de "
 "línea)\n"
 
-#: help.c:127
+#: help.c:123
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only    sólo muestra registros\n"
 
-#: help.c:128
+#: help.c:124
 #, c-format
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
@@ -719,12 +755,12 @@ msgstr ""
 "                       definir atributos de marcas de tabla HTML (ancho, "
 "borde)\n"
 
-#: help.c:129
+#: help.c:125
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded       activar modo expandido de salida de tablas\n"
 
-#: help.c:131
+#: help.c:127
 #, c-format
 msgid ""
 "\n"
@@ -733,7 +769,7 @@ msgstr ""
 "\n"
 "Opciones de la conexión:\n"
 
-#: help.c:134
+#: help.c:130
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME      database server host or socket directory "
@@ -742,28 +778,28 @@ msgstr ""
 "  -h, --host=NOMBRE    nombre del anfitrión o directorio de socket\n"
 "                       (por omisión: «%s»)\n"
 
-#: help.c:135
+#: help.c:131
 msgid "local socket"
 msgstr "socket local"
 
-#: help.c:138
+#: help.c:134
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr "  -p, --port=PUERTO    puerto del servidor (por omisión: «%s»)\n"
 
-#: help.c:144
+#: help.c:140
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
 "  -U, --username=NOMBRE\n"
 "                       nombre de usuario  (por omisión: «%s»)\n"
 
-#: help.c:145
+#: help.c:141
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password    nunca pedir contraseña\n"
 
-#: help.c:146
+#: help.c:142
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -772,7 +808,7 @@ msgstr ""
 "  -W, --password       forzar petición de contraseña\n"
 "                       (debería ser automático)\n"
 
-#: help.c:148
+#: help.c:144
 #, c-format
 msgid ""
 "\n"
@@ -788,24 +824,24 @@ msgstr ""
 "en la documentación de PostgreSQL.\n"
 "\n"
 
-#: help.c:151
+#: help.c:147
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: help.c:169
+#: help.c:165
 #, c-format
 msgid "General\n"
 msgstr "General\n"
 
-#: help.c:170
+#: help.c:166
 #, c-format
 msgid ""
 "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
 "  \\copyright      mostrar términos de uso y distribución de PostgreSQL\n"
 
-#: help.c:171
+#: help.c:167
 #, c-format
 msgid ""
 "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
@@ -813,7 +849,7 @@ msgstr ""
 "  \\g [ARCH] o ;   enviar búfer de consulta al servidor\n"
 "                  (y resultados a archivo u |orden)\n"
 
-#: help.c:172
+#: help.c:168
 #, c-format
 msgid ""
 "  \\h [NAME]              help on syntax of SQL commands, * for all "
@@ -822,59 +858,61 @@ msgstr ""
 "  \\h [NOMBRE]     mostrar ayuda de sintaxis de órdenes SQL;\n"
 "                  use «*» para todas las órdenes\n"
 
-#: help.c:173
+#: help.c:169
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q              salir de psql\n"
 
-#: help.c:176
+#: help.c:172
 #, c-format
 msgid "Query Buffer\n"
 msgstr "Búfer de consulta\n"
 
-#: help.c:177
+#: help.c:173
 #, c-format
 msgid ""
-"  \\e [FILE]              edit the query buffer (or file) with external "
+"  \\e [FILE] [LINE]       edit the query buffer (or file) with external "
 "editor\n"
 msgstr ""
-"  \\e [ARCHIVO]    editar el búfer de consulta (o archivo) con editor "
+"  \\e [ARCHIVO] [L�NEA]\n"
+"                  editar el búfer de consulta (o archivo) con editor "
 "externo\n"
 
-#: help.c:178
+#: help.c:174
 #, c-format
 msgid ""
-"  \\ef [FUNCNAME]         edit function definition with external editor\n"
+"  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr ""
-"  \\ef [FUNCIÓN]   editar una función con editor externo\n"
+"  \\ef [NOMBRE-FUNCIÓN [L�NEA]]\n"
+"                  editar una función con editor externo\n"
 
-#: help.c:179
+#: help.c:175
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p              mostrar el contenido del búfer de consulta\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r              reiniciar (limpiar) el búfer de consulta\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr ""
 "  \\s [ARCHIVO]    mostrar historial de órdenes o guardarlo en archivo\n"
 
-#: help.c:184
+#: help.c:180
 #, c-format
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w ARCHIVO      escribir búfer de consulta a archivo\n"
 
-#: help.c:187
+#: help.c:183
 #, c-format
 msgid "Input/Output\n"
 msgstr "Entrada/Salida\n"
 
-#: help.c:188
+#: help.c:184
 #, c-format
 msgid ""
 "  \\copy ...              perform SQL COPY with data stream to the client "
@@ -882,150 +920,167 @@ msgid ""
 msgstr ""
 "  \\copy ...       ejecutar orden SQL COPY con flujo de datos al cliente\n"
 
-#: help.c:189
+#: help.c:185
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr "  \\echo [CADENA]  escribir cadena a salida estándar\n"
 
-#: help.c:190
+#: help.c:186
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i ARCHIVO      ejecutar órdenes desde archivo\n"
 
-#: help.c:191
+#: help.c:187
 #, c-format
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr "  \\o [ARCHIVO]    enviar resultados de consultas a archivo u |orden\n"
 
-#: help.c:192
+#: help.c:188
 #, c-format
 msgid ""
 "  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr "  \\qecho [CADENA] escribir cadena a salida de consultas (ver \\o)\n"
 
-#: help.c:195
+#: help.c:191
 #, c-format
 msgid "Informational\n"
 msgstr "Informativo\n"
 
-#: help.c:196
+#: help.c:192
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr ""
 "   (opciones: S = desplegar objectos de sistema, + = agregar más detalle)\n"
 
-#: help.c:197
+#: help.c:193
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
 msgstr "  \\d[S+]            listar tablas, vistas y secuencias\n"
 
-#: help.c:198
+#: help.c:194
 #, c-format
 msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
 msgstr "  \\d[S+]  NOMBRE    describir tabla, índice, secuencia o vista\n"
 
-#: help.c:199
+#: help.c:195
 #, c-format
 msgid "  \\da[S]  [PATTERN]      list aggregates\n"
 msgstr "  \\da[S]  [PATRÓN]  listar funciones de agregación\n"
 
-#: help.c:200
+#: help.c:196
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
 msgstr "  \\db[+]  [PATRÓN]  listar tablespaces\n"
 
-#: help.c:201
+#: help.c:197
 #, c-format
 msgid "  \\dc[S]  [PATTERN]      list conversions\n"
 msgstr "  \\dc[S]  [PATRÓN]  listar conversiones\n"
 
-#: help.c:202
+#: help.c:198
 #, c-format
 msgid "  \\dC     [PATTERN]      list casts\n"
 msgstr "  \\dC     [PATRÓN]  listar conversiones de tipo (casts)\n"
 
-#: help.c:203
+#: help.c:199
 #, c-format
 msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
 msgstr "  \\dd[S]  [PATRÓN]  listar comentarios de objetos\n"
 
-#: help.c:204
+#: help.c:200
 #, c-format
 msgid "  \\ddp    [PATTERN]      list default privileges\n"
 msgstr "  \\ddp    [PATRÓN]  listar privilegios por omisión\n"
 
-#: help.c:205
+#: help.c:201
 #, c-format
 msgid "  \\dD[S]  [PATTERN]      list domains\n"
 msgstr "  \\dD[S]  [PATRÓN]  listar dominios\n"
 
-#: help.c:206
+#: help.c:202
+#, c-format
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [PATRÓN]  listar tablas foráneas\n"
+
+#: help.c:203
 #, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
 msgstr "  \\des[+] [PATRÓN]  listar servidores foráneos\n"
 
-#: help.c:207
+#: help.c:204
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
 msgstr "  \\deu[+] [PATRÓN]  listar mapeos de usuario\n"
 
-#: help.c:208
+#: help.c:205
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
 msgstr "  \\dew[+] [PATRÓN]  listar conectores de datos externos\n"
 
-#: help.c:209
+#: help.c:206
 #, c-format
 msgid ""
 "  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
-msgstr "  \\df[antw][S+] [PATRÓN]  listar funciones [sólo ag./normal/trigger/ventana]\n"
+msgstr ""
+"  \\df[antw][S+] [PATRÓN]  listar funciones [sólo ag./normal/trigger/"
+"ventana]\n"
 
-#: help.c:210
+#: help.c:207
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
 msgstr "  \\dF[+]  [PATRÓN]  listar configuraciones de búsqueda en texto\n"
 
-#: help.c:211
+#: help.c:208
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr "  \\dFd[+] [PATRÓN]  listar diccionarios de búsqueda en texto\n"
 
-#: help.c:212
+#: help.c:209
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr "  \\dFp[+] [PATRÓN]  listar analizadores (parsers) de búsq. en texto\n"
 
-#: help.c:213
+#: help.c:210
 #, c-format
 msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
 msgstr "  \\dFt[+] [PATRÓN]  listar plantillas de búsqueda en texto\n"
 
-#: help.c:214
+#: help.c:211
 #, c-format
-msgid "  \\dg[+]  [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg[+]  [PATRÓN]  listar roles (grupos)\n"
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]  [PATRÓN]  listar roles\n"
 
-#: help.c:215
+#: help.c:212
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [PATRÓN]  listar índices\n"
 
-#: help.c:216
+#: help.c:213
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
 msgstr "  \\dl               listar objetos grandes, lo mismo que \\lo_list\n"
 
-#: help.c:217
+#: help.c:214
 #, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
-msgstr "  \\dn[+]  [PATRÓN]  listar esquemas\n"
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [PATRÓN]  listar lenguajes procedurales\n"
 
-#: help.c:218
+#: help.c:215
+#, c-format
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
+msgstr "  \\dn[S+] [PATRÓN]  listar esquemas\n"
+
+#: help.c:216
 #, c-format
 msgid "  \\do[S]  [PATTERN]      list operators\n"
 msgstr "  \\do[S]  [PATRÓN]  listar operadores\n"
 
-#: help.c:219
+#: help.c:217
+#, c-format
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dO[S]  [PATRÓN]  listar ordenamientos (collations)\n"
+
+#: help.c:218
 #, c-format
 msgid ""
 "  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
@@ -1033,64 +1088,79 @@ msgstr ""
 "  \\dp     [PATRÓN]  listar privilegios de acceso a tablas, vistas y "
 "secuencias\n"
 
-#: help.c:220
+#: help.c:219
 #, c-format
 msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
 msgstr "  \\drds [PAT1 [PAT2]] listar parámetros de rol por base de datos\n"
 
-#: help.c:221
+#: help.c:220
 #, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
 msgstr "  \\ds[S+] [PATRÓN]  listar secuencias\n"
 
-#: help.c:222
+#: help.c:221
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
 msgstr "  \\dt[S+] [PATRÓN]  listar tablas\n"
 
-#: help.c:223
+#: help.c:222
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
 msgstr "  \\dT[S+] [PATRÓN]  listar tipos de dato\n"
 
-#: help.c:224
+#: help.c:223
 #, c-format
-msgid "  \\du[+]  [PATTERN]      list roles (users)\n"
-msgstr "  \\du[+]  [PATRÓN]  listar roles (usuarios)\n"
+msgid "  \\du[+]  [PATTERN]      list roles\n"
+msgstr "  \\du[+]  [PATRÓN]  listar roles\n"
 
-#: help.c:225
+#: help.c:224
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
 msgstr "  \\dv[S+] [PATRÓN]  listar vistas\n"
 
+#: help.c:225
+#, c-format
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dE[S+] [PATRÓN]  listar tablas foráneas\n"
+
 #: help.c:226
 #, c-format
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[S]  [PATRÓN]  listar extensiones\n"
+
+#: help.c:227
+#, c-format
 msgid "  \\l[+]                  list all databases\n"
 msgstr "  \\l[+]             listar bases de datos\n"
 
-#: help.c:227
+#: help.c:228
+#, c-format
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf[+] FUNCIÓN    mostrar la definición de una función\n"
+
+#: help.c:229
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [PATRÓN]  lo mismo que \\dp\n"
 
-#: help.c:230
+#: help.c:232
 #, c-format
 msgid "Formatting\n"
 msgstr "Formato\n"
 
-#: help.c:231
+#: help.c:233
 #, c-format
 msgid ""
 "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a              cambiar entre modo de salida alineado y sin alinear\n"
 
-#: help.c:232
+#: help.c:234
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [CADENA]     definir título de tabla, o indefinir si es vacío\n"
 
-#: help.c:233
+#: help.c:235
 #, c-format
 msgid ""
 "  \\f [STRING]            show or set field separator for unaligned query "
@@ -1099,12 +1169,12 @@ msgstr ""
 "  \\f [CADENA]     mostrar o definir separador de campos para\n"
 "                  modo de salida sin alinear\n"
 
-#: help.c:234
+#: help.c:236
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H              cambiar modo de salida HTML (actualmente %s)\n"
 
-#: help.c:236
+#: help.c:238
 #, c-format
 msgid ""
 "  \\pset NAME [VALUE]     set table output option\n"
@@ -1119,12 +1189,12 @@ msgstr ""
 "                  numericlocale,recordsep,tuples_only,title,tableattr,"
 "pager})\n"
 
-#: help.c:239
+#: help.c:241
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]     mostrar sólo filas (actualmente %s)\n"
 
-#: help.c:241
+#: help.c:243
 #, c-format
 msgid ""
 "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
@@ -1132,17 +1202,17 @@ msgstr ""
 "  \\T [CADENA]     definir atributos HTML de <table>, o indefinir si es "
 "vacío\n"
 
-#: help.c:242
+#: help.c:244
 #, c-format
 msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off]     cambiar modo expandido (actualmente %s)\n"
 
-#: help.c:246
+#: help.c:248
 #, c-format
 msgid "Connection\n"
 msgstr "Conexiones\n"
 
-#: help.c:247
+#: help.c:249
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -1151,14 +1221,14 @@ msgstr ""
 "  \\c[onnect] [BASE-DE-DATOS|- USUARIO|- ANFITRIÓN|- PUERTO|-]\n"
 "                  conectar a una nueva base de datos (actual: «%s»)\n"
 
-#: help.c:250
+#: help.c:252
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr ""
 "  \\encoding [CODIFICACIÓN]\n"
 "                  mostrar o definir codificación del cliente\n"
 
-#: help.c:251
+#: help.c:253
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr ""
@@ -1167,22 +1237,28 @@ msgstr ""
 
 #: help.c:254
 #, c-format
+msgid ""
+"  \\conninfo              display information about current connection\n"
+msgstr "  \\conninfo      despliega la información sobre la conexión actual\n"
+
+#: help.c:257
+#, c-format
 msgid "Operating System\n"
 msgstr "Sistema Operativo\n"
 
-#: help.c:255
+#: help.c:258
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]        cambiar el directorio de trabajo actual\n"
 
-#: help.c:256
+#: help.c:259
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr ""
 "  \\timing [on|off] mostrar tiempo de ejecución de órdenes\n"
 "                   (actualmente %s)\n"
 
-#: help.c:258
+#: help.c:261
 #, c-format
 msgid ""
 "  \\! [COMMAND]           execute command in shell or start interactive "
@@ -1191,18 +1267,18 @@ msgstr ""
 "  \\! [ORDEN]       ejecutar orden en intérprete de órdenes (shell),\n"
 "                   o iniciar intérprete interactivo\n"
 
-#: help.c:261
+#: help.c:264
 #, c-format
 msgid "Variables\n"
 msgstr "Variables\n"
 
-#: help.c:262
+#: help.c:265
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr ""
 "  \\prompt [TEXTO] NOMBRE  preguntar al usuario el valor de la variable\n"
 
-#: help.c:263
+#: help.c:266
 #, c-format
 msgid ""
 "  \\set [NAME [VALUE]]    set internal variable, or list all if no "
@@ -1211,17 +1287,17 @@ msgstr ""
 "  \\set [NOMBRE [VALOR]]   definir variables internas,\n"
 "                          listar todas si no se dan parámetros\n"
 
-#: help.c:264
+#: help.c:267
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NOMBRE           indefinir (eliminar) variable interna\n"
 
-#: help.c:267
+#: help.c:270
 #, c-format
 msgid "Large Objects\n"
 msgstr "Objetos Grandes\n"
 
-#: help.c:268
+#: help.c:271
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -1234,11 +1310,11 @@ msgstr ""
 "  \\lo_list\n"
 "  \\lo_unlink LOBOID   operaciones con objetos grandes\n"
 
-#: help.c:321
+#: help.c:318
 msgid "Available help:\n"
 msgstr "Ayuda disponible:\n"
 
-#: help.c:410
+#: help.c:402
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1252,7 +1328,7 @@ msgstr ""
 "Sintaxis:\n"
 "%s\n"
 
-#: help.c:426
+#: help.c:418
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -1294,16 +1370,17 @@ msgstr "%s: estado de transacción desconocido\n"
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:290 describe.c:146 describe.c:334 describe.c:613 describe.c:762
-#: describe.c:2381 describe.c:2681 describe.c:3310 describe.c:3369
+#: large_obj.c:290 describe.c:147 describe.c:335 describe.c:637 describe.c:787
+#: describe.c:2513 describe.c:2631 describe.c:2968 describe.c:3599
+#: describe.c:3664
 msgid "Owner"
 msgstr "Dueño"
 
-#: large_obj.c:291 large_obj.c:301 describe.c:95 describe.c:158 describe.c:337
-#: describe.c:490 describe.c:566 describe.c:637 describe.c:827 describe.c:1318
-#: describe.c:2205 describe.c:2395 describe.c:2689 describe.c:2751
-#: describe.c:2887 describe.c:2926 describe.c:2993 describe.c:3052
-#: describe.c:3061 describe.c:3120
+#: large_obj.c:291 large_obj.c:301 describe.c:96 describe.c:159 describe.c:338
+#: describe.c:501 describe.c:590 describe.c:661 describe.c:852 describe.c:1382
+#: describe.c:2330 describe.c:2537 describe.c:2911 describe.c:2976
+#: describe.c:3041 describe.c:3177 describe.c:3216 describe.c:3283
+#: describe.c:3342 describe.c:3351 describe.c:3410 describe.c:3849
 msgid "Description"
 msgstr "Descripción"
 
@@ -1371,12 +1448,12 @@ msgid_plural "(%lu rows)"
 msgstr[0] "(%lu fila)"
 msgstr[1] "(%lu filas)"
 
-#: startup.c:237
+#: startup.c:243
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir archivo de log «%s»: %s\n"
 
-#: startup.c:299
+#: startup.c:305
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -1385,212 +1462,218 @@ msgstr ""
 "Digite «help» para obtener ayuda.\n"
 "\n"
 
-#: startup.c:445
+#: startup.c:451
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: no se pudo definir parámetro de impresión «%s»\n"
 
-#: startup.c:484
+#: startup.c:490
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: no se pudo eliminar la variable «%s»\n"
 
-#: startup.c:494
+#: startup.c:500
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: no se pudo definir la variable «%s»\n"
 
-#: startup.c:531 startup.c:537
+#: startup.c:537 startup.c:543
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener más información.\n"
 
-#: startup.c:554
+#: startup.c:560
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: atención: se ignoró argumento extra «%s» en línea de órdenes\n"
 
-#: startup.c:619
+#: startup.c:625
 msgid "contains support for command-line editing"
 msgstr "incluye soporte para edición de línea de órdenes"
 
-#: describe.c:68 describe.c:235 describe.c:462 describe.c:561 describe.c:682
-#: describe.c:763 describe.c:824 describe.c:2373 describe.c:2494
-#: describe.c:2549 describe.c:2749 describe.c:2976 describe.c:3048
-#: describe.c:3059 describe.c:3118
+#: describe.c:69 describe.c:236 describe.c:463 describe.c:585 describe.c:706
+#: describe.c:788 describe.c:849 describe.c:2504 describe.c:2698
+#: describe.c:2768 describe.c:2903 describe.c:3039 describe.c:3266
+#: describe.c:3338 describe.c:3349 describe.c:3408 describe.c:3782
+#: describe.c:3848
 msgid "Schema"
 msgstr "Esquema"
 
-#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:562
-#: describe.c:612 describe.c:683 describe.c:825 describe.c:2374
-#: describe.c:2495 describe.c:2550 describe.c:2680 describe.c:2750
-#: describe.c:2977 describe.c:3049 describe.c:3060 describe.c:3119
-#: describe.c:3309 describe.c:3368
+#: describe.c:70 describe.c:146 describe.c:237 describe.c:464 describe.c:586
+#: describe.c:636 describe.c:707 describe.c:850 describe.c:2505
+#: describe.c:2627 describe.c:2699 describe.c:2769 describe.c:2904
+#: describe.c:2967 describe.c:3040 describe.c:3267 describe.c:3339
+#: describe.c:3350 describe.c:3409 describe.c:3598 describe.c:3663
+#: describe.c:3846
 msgid "Name"
 msgstr "Nombre"
 
-#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
+#: describe.c:71 describe.c:249 describe.c:295 describe.c:312
 msgid "Result data type"
 msgstr "Tipo de dato de salida"
 
-#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
+#: describe.c:85 describe.c:89 describe.c:250 describe.c:296 describe.c:313
 msgid "Argument data types"
 msgstr "Tipos de datos de argumentos"
 
-#: describe.c:113
+#: describe.c:114
 msgid "List of aggregate functions"
 msgstr "Listado de funciones de agregación"
 
-#: describe.c:134
+#: describe.c:135
 #, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "El servidor (versión %d.%d) no soporta tablespaces.\n"
 
-#: describe.c:147
+#: describe.c:148
 msgid "Location"
 msgstr "Ubicación"
 
-#: describe.c:175
+#: describe.c:176
 msgid "List of tablespaces"
 msgstr "Listado de tablespaces"
 
-#: describe.c:212
+#: describe.c:213
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df sólo acepta las opciones [antwS+]\n"
 
-#: describe.c:218
+#: describe.c:219
 #, c-format
 msgid "\\df does not take a \"w\" option with server version %d.%d\n"
 msgstr "\\df no acepta la opción «w» en un servidor versión %d.%d\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:251 describe.c:297 describe.c:314
+#: describe.c:252 describe.c:298 describe.c:315
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:252
+#: describe.c:253
 msgid "window"
 msgstr "ventana"
 
-#: describe.c:253 describe.c:298 describe.c:315 describe.c:964
+#: describe.c:254 describe.c:299 describe.c:316 describe.c:990
 msgid "trigger"
 msgstr "disparador"
 
-#: describe.c:254 describe.c:299 describe.c:316
+#: describe.c:255 describe.c:300 describe.c:317
 msgid "normal"
 msgstr "normal"
 
-#: describe.c:255 describe.c:300 describe.c:317 describe.c:685 describe.c:767
-#: describe.c:1299 describe.c:2380 describe.c:2496 describe.c:3381
+#: describe.c:256 describe.c:301 describe.c:318 describe.c:710 describe.c:792
+#: describe.c:1362 describe.c:2512 describe.c:2700 describe.c:3676
 msgid "Type"
 msgstr "Tipo"
 
-#: describe.c:330
+#: describe.c:331
 msgid "immutable"
 msgstr "inmutable"
 
-#: describe.c:331
+#: describe.c:332
 msgid "stable"
 msgstr "estable"
 
-#: describe.c:332
+#: describe.c:333
 msgid "volatile"
 msgstr "volátil"
 
-#: describe.c:333
+#: describe.c:334
 msgid "Volatility"
 msgstr "Volatilidad"
 
-#: describe.c:335
+#: describe.c:336
 msgid "Language"
 msgstr "Lenguaje"
 
-#: describe.c:336
+#: describe.c:337
 msgid "Source code"
 msgstr "Código fuente"
 
-#: describe.c:434
+#: describe.c:435
 msgid "List of functions"
 msgstr "Listado de funciones"
 
-#: describe.c:473
+#: describe.c:474
 msgid "Internal name"
 msgstr "Nombre interno"
 
-#: describe.c:474 describe.c:629 describe.c:2391
+#: describe.c:475 describe.c:653 describe.c:2529 describe.c:2533
 msgid "Size"
 msgstr "Tamaño"
 
-#: describe.c:486
+#: describe.c:496
 msgid "Elements"
 msgstr "Elementos"
 
-#: describe.c:530
+#: describe.c:541
 msgid "List of data types"
 msgstr "Listado de tipos de dato"
 
-#: describe.c:563
+#: describe.c:587
 msgid "Left arg type"
 msgstr "Tipo arg izq"
 
-#: describe.c:564
+#: describe.c:588
 msgid "Right arg type"
 msgstr "Tipo arg der"
 
-#: describe.c:565
+#: describe.c:589
 msgid "Result type"
 msgstr "Tipo resultado"
 
-#: describe.c:584
+#: describe.c:608
 msgid "List of operators"
 msgstr "Listado de operadores"
 
-#: describe.c:614
+#: describe.c:638
 msgid "Encoding"
 msgstr "Codificación"
 
-#: describe.c:619
-msgid "Collation"
-msgstr "Collation"
+#: describe.c:643 describe.c:2905
+msgid "Collate"
+msgstr "Collate"
 
-#: describe.c:620
+#: describe.c:644 describe.c:2906
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:633
+#: describe.c:657
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:650
+#: describe.c:674
 msgid "List of databases"
 msgstr "Listado de base de datos"
 
-#: describe.c:684 describe.c:764 describe.c:919 describe.c:2375 sql_help.c:443
-#: sql_help.c:660 sql_help.c:761 sql_help.c:1178 sql_help.c:1305
-#: sql_help.c:1339 sql_help.c:1574 sql_help.c:1723 sql_help.c:1884
-#: sql_help.c:1965 sql_help.c:2159 sql_help.c:2719 sql_help.c:2739
-#: sql_help.c:2741 sql_help.c:2742
+#: describe.c:708 describe.c:789 describe.c:944 describe.c:2506 sql_help.c:595
+#: sql_help.c:842 sql_help.c:969 sql_help.c:1432 sql_help.c:1562
+#: sql_help.c:1596 sql_help.c:1842 sql_help.c:2000 sql_help.c:2185
+#: sql_help.c:2266 sql_help.c:2472 sql_help.c:3103 sql_help.c:3123
+#: sql_help.c:3125 sql_help.c:3126
 msgid "table"
 msgstr "tabla"
 
-#: describe.c:684 describe.c:920 describe.c:2376
+#: describe.c:708 describe.c:945 describe.c:2507
 msgid "view"
 msgstr "vista"
 
-#: describe.c:684 describe.c:765 describe.c:922 describe.c:2378
+#: describe.c:708 describe.c:790 describe.c:947 describe.c:2509
 msgid "sequence"
 msgstr "secuencia"
 
-#: describe.c:696
+#: describe.c:709 describe.c:948 describe.c:2511
+msgid "foreign table"
+msgstr "tabla foránea"
+
+#: describe.c:721
 msgid "Column access privileges"
 msgstr "Privilegios de acceso a columnas"
 
-#: describe.c:722 describe.c:3476 describe.c:3480
+#: describe.c:747 describe.c:3993 describe.c:3997
 msgid "Access privileges"
 msgstr "Privilegios"
 
-#: describe.c:750
+#: describe.c:775
 #, c-format
 msgid ""
 "The server (version %d.%d) does not support altering default privileges.\n"
@@ -1598,506 +1681,559 @@ msgstr ""
 "El servidor (versión %d.%d) no soporta la alteración de privilegios por "
 "omisión.\n"
 
-#: describe.c:766 describe.c:858
+#: describe.c:791 describe.c:883
 msgid "function"
 msgstr "función"
 
-#: describe.c:790
+#: describe.c:815
 msgid "Default access privileges"
 msgstr "Privilegios de acceso por omisión"
 
-#: describe.c:826
+#: describe.c:851
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:838
+#: describe.c:863
 msgid "aggregate"
 msgstr "función de agregación"
 
-#: describe.c:877 sql_help.c:1457 sql_help.c:2457 sql_help.c:2525
-#: sql_help.c:2656 sql_help.c:2757 sql_help.c:2808
+#: describe.c:902 sql_help.c:1715 sql_help.c:2833 sql_help.c:2903
+#: sql_help.c:3036 sql_help.c:3141 sql_help.c:3192
 msgid "operator"
 msgstr "operador"
 
-#: describe.c:896
+#: describe.c:921
 msgid "data type"
 msgstr "tipo de dato"
 
-#: describe.c:921 describe.c:2377
+#: describe.c:946 describe.c:2508
 msgid "index"
 msgstr "índice"
 
-#: describe.c:943
+#: describe.c:969
 msgid "rule"
 msgstr "regla"
 
-#: describe.c:987
+#: describe.c:1013
 msgid "Object descriptions"
 msgstr "Descripciones de objetos"
 
-#: describe.c:1040
+#: describe.c:1066
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "No se encontró relación llamada «%s».\n"
 
-#: describe.c:1194
+#: describe.c:1238
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "No se encontró relación con OID %s.\n"
 
-#: describe.c:1262
+#: describe.c:1314
+#, c-format
+msgid "Unlogged table \"%s.%s\""
+msgstr "Tabla unlogged «%s.%s»"
+
+#: describe.c:1317
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabla «%s.%s»"
 
-#: describe.c:1266
+#: describe.c:1321
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vista «%s.%s»"
 
-#: describe.c:1270
+#: describe.c:1325
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Secuencia «%s.%s»"
 
-#: describe.c:1274
+#: describe.c:1330
+#, c-format
+msgid "Unlogged index \"%s.%s\""
+msgstr "�ndice unlogged «%s.%s»"
+
+#: describe.c:1333
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "�ndice «%s.%s»"
 
-#: describe.c:1279
+#: describe.c:1338
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relación especial «%s.%s»"
 
-#: describe.c:1283
+#: describe.c:1342
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Tabla TOAST «%s.%s»"
 
-#: describe.c:1287
+#: describe.c:1346
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo compuesto «%s.%s»"
 
-#: describe.c:1298
+#: describe.c:1350
+#, c-format
+msgid "Foreign table \"%s.%s\""
+msgstr "Tabla foránea «%s.%s»"
+
+#: describe.c:1361
 msgid "Column"
 msgstr "Columna"
 
-#: describe.c:1305
+#: describe.c:1369
 msgid "Modifiers"
 msgstr "Modificadores"
 
-#: describe.c:1310
+#: describe.c:1374
 msgid "Value"
 msgstr "Valor"
 
-#: describe.c:1313
+#: describe.c:1377
 msgid "Definition"
 msgstr "Definición"
 
-#: describe.c:1317
+#: describe.c:1381
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: describe.c:1359
+#: describe.c:1427
+#, c-format
+msgid "collate %s"
+msgstr "collate %s"
+
+#: describe.c:1435
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1368
+#: describe.c:1445
 #, c-format
 msgid "default %s"
 msgstr "valor por omisión %s"
 
-#: describe.c:1459
+#: describe.c:1536
 msgid "primary key, "
 msgstr "llave primaria, "
 
-#: describe.c:1461
+#: describe.c:1538
 msgid "unique, "
 msgstr "único, "
 
-#: describe.c:1467
+#: describe.c:1544
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "de tabla «%s.%s»"
 
-#: describe.c:1471
+#: describe.c:1548
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:1474
+#: describe.c:1551
 msgid ", clustered"
 msgstr ", clustered"
 
-#: describe.c:1477
+#: describe.c:1554
 msgid ", invalid"
 msgstr ", no válido"
 
-#: describe.c:1480
+#: describe.c:1557
 msgid ", deferrable"
 msgstr ", postergable"
 
-#: describe.c:1483
+#: describe.c:1560
 msgid ", initially deferred"
 msgstr ", inicialmente postergada"
 
-#: describe.c:1497
+#: describe.c:1574
 msgid "View definition:"
 msgstr "Definición de vista:"
 
-#: describe.c:1514 describe.c:1792
+#: describe.c:1591 describe.c:1874
 msgid "Rules:"
 msgstr "Reglas:"
 
-#: describe.c:1573
+#: describe.c:1650
 msgid "Indexes:"
 msgstr "�ndices:"
 
-#: describe.c:1648
+#: describe.c:1730
 msgid "Check constraints:"
 msgstr "Restricciones CHECK:"
 
-#: describe.c:1679
+#: describe.c:1761
 msgid "Foreign-key constraints:"
 msgstr "Restricciones de llave foránea:"
 
-#: describe.c:1710
+#: describe.c:1792
 msgid "Referenced by:"
 msgstr "Referenciada por:"
 
-#: describe.c:1795
+#: describe.c:1877
 msgid "Disabled rules:"
 msgstr "Reglas deshabilitadas:"
 
-#: describe.c:1798
+#: describe.c:1880
 msgid "Rules firing always:"
 msgstr "Reglas que se activan siempre:"
 
-#: describe.c:1801
+#: describe.c:1883
 msgid "Rules firing on replica only:"
 msgstr "Reglas que se activan sólo en las réplicas:"
 
-#: describe.c:1903
+#: describe.c:1991
 msgid "Triggers:"
 msgstr "Triggers:"
 
-#: describe.c:1906
+#: describe.c:1994
 msgid "Disabled triggers:"
 msgstr "Disparadores deshabilitados:"
 
-#: describe.c:1909
+#: describe.c:1997
 msgid "Triggers firing always:"
 msgstr "Disparadores que siempre se ejecutan:"
 
-#: describe.c:1912
+#: describe.c:2000
 msgid "Triggers firing on replica only:"
 msgstr "Disparadores que se ejecutan sólo en las réplicas:"
 
-#: describe.c:1945
+#: describe.c:2066
 msgid "Inherits"
 msgstr "Hereda"
 
-#: describe.c:1975
+#: describe.c:2096
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Número de tablas hijas: %d (Use \\d+ para listarlas.)"
 
-#: describe.c:1982
+#: describe.c:2103
 msgid "Child tables"
 msgstr "Tablas hijas"
 
-#: describe.c:2004
+#: describe.c:2125
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Tabla tipada de tipo: %s"
 
-#: describe.c:2011
+#: describe.c:2132
 msgid "Has OIDs"
 msgstr "Tiene OIDs"
 
-#: describe.c:2014 describe.c:2553 describe.c:2627
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "yes"
 msgstr "sí"
 
-#: describe.c:2014 describe.c:2553 describe.c:2627
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "no"
 msgstr "no"
 
-#: describe.c:2022 describe.c:3319 describe.c:3383 describe.c:3439
+#: describe.c:2143 describe.c:3614 describe.c:3678 describe.c:3734
+#: describe.c:3789
 msgid "Options"
 msgstr "Opciones"
 
-#: describe.c:2107
+#: describe.c:2228
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: «%s»"
 
-#: describe.c:2120
+#: describe.c:2241
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace «%s»"
 
-#: describe.c:2198
+#: describe.c:2323
 msgid "List of roles"
 msgstr "Lista de roles"
 
-#: describe.c:2200
+#: describe.c:2325
 msgid "Role name"
 msgstr "Nombre de rol"
 
-#: describe.c:2201
+#: describe.c:2326
 msgid "Attributes"
 msgstr "Atributos"
 
-#: describe.c:2202
+#: describe.c:2327
 msgid "Member of"
 msgstr "Miembro de"
 
-#: describe.c:2213
+#: describe.c:2338
 msgid "Superuser"
 msgstr "Superusuario"
 
-#: describe.c:2216
+#: describe.c:2341
 msgid "No inheritance"
 msgstr "Sin herencia"
 
-#: describe.c:2219
+#: describe.c:2344
 msgid "Create role"
 msgstr "Crear rol"
 
-#: describe.c:2222
+#: describe.c:2347
 msgid "Create DB"
 msgstr "Crear BD"
 
-#: describe.c:2225
+#: describe.c:2350
 msgid "Cannot login"
 msgstr "No puede conectarse"
 
-#: describe.c:2234
+#: describe.c:2354
+msgid "Replication"
+msgstr "Replicación"
+
+#: describe.c:2363
 msgid "No connections"
 msgstr "Ninguna conexión"
 
-#: describe.c:2236
+#: describe.c:2365
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d conexión"
 msgstr[1] "%d conexiones"
 
-#: describe.c:2303
+#: describe.c:2432
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr "Este servidor no permite parámetros por usuario por base de datos.\n"
 
-#: describe.c:2314
+#: describe.c:2443
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "No se encontraron parámetros coincidentes.\n"
 
-#: describe.c:2316
+#: describe.c:2445
 #, c-format
 msgid "No settings found.\n"
 msgstr "No se encontraron parámetros.\n"
 
-#: describe.c:2321
+#: describe.c:2450
 msgid "List of settings"
 msgstr "Listado de parámetros"
 
-#: describe.c:2379
+#: describe.c:2510
 msgid "special"
 msgstr "especial"
 
-#: describe.c:2386
+#: describe.c:2518 describe.c:3783
 msgid "Table"
 msgstr "Tabla"
 
-#: describe.c:2446
+#: describe.c:2592
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "No se encontraron relaciones coincidentes.\n"
 
-#: describe.c:2448
+#: describe.c:2594
 #, c-format
 msgid "No relations found.\n"
 msgstr "No se encontraron relaciones.\n"
 
-#: describe.c:2453
+#: describe.c:2599
 msgid "List of relations"
 msgstr "Listado de relaciones"
 
-#: describe.c:2497
+#: describe.c:2635
+msgid "Trusted"
+msgstr "Confiable"
+
+#: describe.c:2643
+msgid "Internal Language"
+msgstr "Lenguaje interno"
+
+#: describe.c:2644
+msgid "Call Handler"
+msgstr "Manejador de llamada"
+
+#: describe.c:2645 describe.c:3606
+msgid "Validator"
+msgstr "Validador"
+
+#: describe.c:2648
+msgid "Inline Handler"
+msgstr "Manejador en línea"
+
+#: describe.c:2669
+msgid "List of languages"
+msgstr "Lista de lenguajes"
+
+#: describe.c:2709
 msgid "Modifier"
 msgstr "Modificador"
 
-#: describe.c:2498
+#: describe.c:2717
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:2516
+#: describe.c:2735
 msgid "List of domains"
 msgstr "Listado de dominios"
 
-#: describe.c:2551
+#: describe.c:2770
 msgid "Source"
 msgstr "Fuente"
 
-#: describe.c:2552
+#: describe.c:2771
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:2554
+#: describe.c:2773
 msgid "Default?"
 msgstr "Por omisión?"
 
-#: describe.c:2572
+#: describe.c:2791
 msgid "List of conversions"
 msgstr "Listado de conversiones"
 
-#: describe.c:2624
+#: describe.c:2843
 msgid "Source type"
 msgstr "Tipo fuente"
 
-#: describe.c:2625
+#: describe.c:2844
 msgid "Target type"
 msgstr "Tipo destino"
 
-#: describe.c:2626 describe.c:2886
+#: describe.c:2845 describe.c:3176
 msgid "Function"
 msgstr "Función"
 
-#: describe.c:2627
+#: describe.c:2846
 msgid "in assignment"
 msgstr "en asignación"
 
-#: describe.c:2628
+#: describe.c:2847
 msgid "Implicit?"
 msgstr "Implícito?"
 
-#: describe.c:2654
+#: describe.c:2873
 msgid "List of casts"
 msgstr "Listado de conversiones de tipo (casts)"
 
-#: describe.c:2709
+#: describe.c:2941
+msgid "List of collations"
+msgstr "Listado de ordenamientos"
+
+#: describe.c:2999
 msgid "List of schemas"
 msgstr "Listado de esquemas"
 
-#: describe.c:2732 describe.c:2965 describe.c:3033 describe.c:3101
+#: describe.c:3022 describe.c:3255 describe.c:3323 describe.c:3391
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "El servidor (versión %d.%d) no soporta búsqueda en texto.\n"
 
-#: describe.c:2766
+#: describe.c:3056
 msgid "List of text search parsers"
 msgstr "Listado de analizadores de búsqueda en texto"
 
-#: describe.c:2809
+#: describe.c:3099
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "No se encontró ningún analizador de búsqueda en texto llamado «%s».\n"
 
-#: describe.c:2884
+#: describe.c:3174
 msgid "Start parse"
 msgstr "Inicio de parse"
 
-#: describe.c:2885
+#: describe.c:3175
 msgid "Method"
 msgstr "Método"
 
-#: describe.c:2889
+#: describe.c:3179
 msgid "Get next token"
 msgstr "Obtener siguiente elemento"
 
-#: describe.c:2891
+#: describe.c:3181
 msgid "End parse"
 msgstr "Fin de parse"
 
-#: describe.c:2893
+#: describe.c:3183
 msgid "Get headline"
 msgstr "Obtener encabezado"
 
-#: describe.c:2895
+#: describe.c:3185
 msgid "Get token types"
 msgstr "Obtener tipos de elemento"
 
-#: describe.c:2905
+#: describe.c:3195
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analizador de búsqueda en texto «%s.%s»"
 
-#: describe.c:2907
+#: describe.c:3197
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analizador de búsqueda en texto «%s»"
 
-#: describe.c:2925
+#: describe.c:3215
 msgid "Token name"
 msgstr "Nombre de elemento"
 
-#: describe.c:2936
+#: describe.c:3226
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para el analizador «%s.%s»"
 
-#: describe.c:2938
+#: describe.c:3228
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para el analizador «%s»"
 
-#: describe.c:2987
+#: describe.c:3277
 msgid "Template"
 msgstr "Plantilla"
 
-#: describe.c:2988
+#: describe.c:3278
 msgid "Init options"
 msgstr "Opciones de inicialización"
 
-#: describe.c:3010
+#: describe.c:3300
 msgid "List of text search dictionaries"
 msgstr "Listado de diccionarios de búsqueda en texto"
 
-#: describe.c:3050
+#: describe.c:3340
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:3051
+#: describe.c:3341
 msgid "Lexize"
 msgstr "Fn. análisis léx."
 
-#: describe.c:3078
+#: describe.c:3368
 msgid "List of text search templates"
 msgstr "Listado de plantillas de búsqueda en texto"
 
-#: describe.c:3135
+#: describe.c:3425
 msgid "List of text search configurations"
 msgstr "Listado de configuraciones de búsqueda en texto"
 
-#: describe.c:3179
+#: describe.c:3469
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "No se encontró una configuración de búsqueda en texto llamada «%s».\n"
 
-#: describe.c:3245
+#: describe.c:3535
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:3246
+#: describe.c:3536
 msgid "Dictionaries"
 msgstr "Diccionarios"
 
-#: describe.c:3257
+#: describe.c:3547
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuración de búsqueda en texto «%s.%s»"
 
-#: describe.c:3260
+#: describe.c:3550
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuración de búsqueda en texto «%s»"
 
-#: describe.c:3264
+#: describe.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -2106,7 +2242,7 @@ msgstr ""
 "\n"
 "Analizador: «%s.%s»"
 
-#: describe.c:3267
+#: describe.c:3557
 #, c-format
 msgid ""
 "\n"
@@ -2115,554 +2251,627 @@ msgstr ""
 "\n"
 "Analizador: «%s»"
 
-#: describe.c:3299
+#: describe.c:3589
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "El servidor (versión %d.%d) no soporta conectores de datos externos.\n"
 
-#: describe.c:3311
-msgid "Validator"
-msgstr "Validador"
+#: describe.c:3603
+msgid "Handler"
+msgstr "Manejador"
 
-#: describe.c:3335
+#: describe.c:3630
 msgid "List of foreign-data wrappers"
 msgstr "Listado de conectores de datos externos"
 
-#: describe.c:3358
+#: describe.c:3653
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "El servidor (versión %d.%d) no soporta servidores foráneos.\n"
 
-#: describe.c:3370
+#: describe.c:3665
 msgid "Foreign-data wrapper"
 msgstr "Conectores de datos externos"
 
-#: describe.c:3382
+#: describe.c:3677 describe.c:3847
 msgid "Version"
 msgstr "Versión"
 
-#: describe.c:3401
+#: describe.c:3696
 msgid "List of foreign servers"
 msgstr "Listado de servidores foráneos"
 
-#: describe.c:3424
+#: describe.c:3719
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "El servidor (versión %d.%d) no soporta mapeos de usuario.\n"
 
-#: describe.c:3433
+#: describe.c:3728 describe.c:3784
 msgid "Server"
 msgstr "Servidor"
 
-#: describe.c:3434
+#: describe.c:3729
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: describe.c:3454
+#: describe.c:3749
 msgid "List of user mappings"
 msgstr "Listado de mapeos de usuario"
 
-#: sql_help.h:173 sql_help.h:788
+#: describe.c:3772
+#, c-format
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "El servidor (versión %d.%d) no soporta tablas foráneas.\n"
+
+#: describe.c:3810
+msgid "List of foreign tables"
+msgstr "Listado de tablas foráneas"
+
+#: describe.c:3833 describe.c:3887
+#, c-format
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "El servidor (versión %d.%d) no soporta extensiones.\n"
+
+#: describe.c:3864
+msgid "List of installed extensions"
+msgstr "Listado de extensiones instaladas"
+
+#: describe.c:3914
+#, c-format
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "No se encontró extensión llamada «%s».\n"
+
+#: describe.c:3917
+#, c-format
+msgid "Did not find any extensions.\n"
+msgstr "No se encontró ninguna extensión.\n"
+
+#: describe.c:3961
+msgid "Object Description"
+msgstr "Descripciones de objetos"
+
+#: describe.c:3970
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr "Objetos en extensión «%s»"
+
+#: sql_help.h:182 sql_help.h:837
 msgid "abort the current transaction"
 msgstr "aborta la transacción en curso"
 
-#: sql_help.h:178
+#: sql_help.h:187
 msgid "change the definition of an aggregate function"
 msgstr "cambia la definición de una función de agregación"
 
-#: sql_help.h:183
+#: sql_help.h:192
+msgid "change the definition of a collation"
+msgstr "cambia la definición de un ordenamiento"
+
+#: sql_help.h:197
 msgid "change the definition of a conversion"
 msgstr "cambia la definición de una conversión"
 
-#: sql_help.h:188
+#: sql_help.h:202
 msgid "change a database"
 msgstr "cambia una base de datos"
 
-#: sql_help.h:193
+#: sql_help.h:207
 msgid "define default access privileges"
 msgstr "define privilegios de acceso por omisión"
 
-#: sql_help.h:198
+#: sql_help.h:212
 msgid "change the definition of a domain"
 msgstr "cambia la definición de un dominio"
 
-#: sql_help.h:203
+#: sql_help.h:217
+msgid "change the definition of an extension"
+msgstr "cambia la definición de una extensión"
+
+#: sql_help.h:222
 msgid "change the definition of a foreign-data wrapper"
 msgstr "cambia la definición de un conector de datos externos"
 
-#: sql_help.h:208
+#: sql_help.h:227
+msgid "change the definition of a foreign table"
+msgstr "cambia la definición de una tabla foránea"
+
+#: sql_help.h:232
 msgid "change the definition of a function"
 msgstr "cambia la definición de una función"
 
-#: sql_help.h:213
+#: sql_help.h:237
 msgid "change role name or membership"
 msgstr "cambiar nombre del rol o membresía"
 
-#: sql_help.h:218
+#: sql_help.h:242
 msgid "change the definition of an index"
 msgstr "cambia la definición de un índice"
 
-#: sql_help.h:223
+#: sql_help.h:247
 msgid "change the definition of a procedural language"
 msgstr "cambia la definición de un lenguaje procedural"
 
-#: sql_help.h:228
+#: sql_help.h:252
 msgid "change the definition of a large object"
 msgstr "cambia la definición de un objeto grande"
 
-#: sql_help.h:233
+#: sql_help.h:257
 msgid "change the definition of an operator"
 msgstr "cambia la definición de un operador"
 
-#: sql_help.h:238
+#: sql_help.h:262
 msgid "change the definition of an operator class"
 msgstr "cambia la definición de una clase de operadores"
 
-#: sql_help.h:243
+#: sql_help.h:267
 msgid "change the definition of an operator family"
 msgstr "cambia la definición de una familia de operadores"
 
-#: sql_help.h:248 sql_help.h:308
+#: sql_help.h:272 sql_help.h:332
 msgid "change a database role"
 msgstr "cambia un rol de la base de datos"
 
-#: sql_help.h:253
+#: sql_help.h:277
 msgid "change the definition of a schema"
 msgstr "cambia la definición de un esquema"
 
-#: sql_help.h:258
+#: sql_help.h:282
 msgid "change the definition of a sequence generator"
 msgstr "cambia la definición de un generador secuencial"
 
-#: sql_help.h:263
+#: sql_help.h:287
 msgid "change the definition of a foreign server"
 msgstr "cambia la definición de un servidor foráneo"
 
-#: sql_help.h:268
+#: sql_help.h:292
 msgid "change the definition of a table"
 msgstr "cambia la definición de una tabla"
 
-#: sql_help.h:273
+#: sql_help.h:297
 msgid "change the definition of a tablespace"
 msgstr "cambia la definición de un tablespace"
 
-#: sql_help.h:278
+#: sql_help.h:302
 msgid "change the definition of a text search configuration"
 msgstr "cambia la definición de una configuración de búsqueda en texto"
 
-#: sql_help.h:283
+#: sql_help.h:307
 msgid "change the definition of a text search dictionary"
 msgstr "cambia la definición de un diccionario de búsqueda en texto"
 
-#: sql_help.h:288
+#: sql_help.h:312
 msgid "change the definition of a text search parser"
 msgstr "cambia la definición de un analizador de búsqueda en texto"
 
-#: sql_help.h:293
+#: sql_help.h:317
 msgid "change the definition of a text search template"
 msgstr "cambia la definición de una plantilla de búsqueda en texto"
 
-#: sql_help.h:298
+#: sql_help.h:322
 msgid "change the definition of a trigger"
 msgstr "cambia la definición de un disparador"
 
-#: sql_help.h:303
+#: sql_help.h:327
 msgid "change the definition of a type"
 msgstr "cambia la definición de un tipo"
 
-#: sql_help.h:313
+#: sql_help.h:337
 msgid "change the definition of a user mapping"
 msgstr "cambia la definición de un mapeo de usuario"
 
-#: sql_help.h:318
+#: sql_help.h:342
 msgid "change the definition of a view"
 msgstr "cambia la definición de una vista"
 
-#: sql_help.h:323
+#: sql_help.h:347
 msgid "collect statistics about a database"
 msgstr "recolecta estadísticas sobre una base de datos"
 
-#: sql_help.h:328 sql_help.h:848
+#: sql_help.h:352 sql_help.h:902
 msgid "start a transaction block"
 msgstr "inicia un bloque de transacción"
 
-#: sql_help.h:333
+#: sql_help.h:357
 msgid "force a transaction log checkpoint"
 msgstr "fuerza un checkpoint del registro de transacciones"
 
-#: sql_help.h:338
+#: sql_help.h:362
 msgid "close a cursor"
 msgstr "cierra un cursor"
 
-#: sql_help.h:343
+#: sql_help.h:367
 msgid "cluster a table according to an index"
 msgstr "reordena una tabla siguiendo un índice"
 
-#: sql_help.h:348
+#: sql_help.h:372
 msgid "define or change the comment of an object"
 msgstr "define o cambia un comentario sobre un objeto"
 
-#: sql_help.h:353 sql_help.h:698
+#: sql_help.h:377 sql_help.h:747
 msgid "commit the current transaction"
 msgstr "compromete la transacción en curso"
 
-#: sql_help.h:358
+#: sql_help.h:382
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "confirma una transacción que fue preparada para two-phase commit"
 
-#: sql_help.h:363
+#: sql_help.h:387
 msgid "copy data between a file and a table"
 msgstr "copia datos entre un archivo y una tabla"
 
-#: sql_help.h:368
+#: sql_help.h:392
 msgid "define a new aggregate function"
 msgstr "define una nueva función de agregación"
 
-#: sql_help.h:373
+#: sql_help.h:397
 msgid "define a new cast"
 msgstr "define una nueva conversión de tipo"
 
-#: sql_help.h:378
-msgid "define a new constraint trigger"
-msgstr "define un nuevo disparador de restricción"
+#: sql_help.h:402
+msgid "define a new collation"
+msgstr "define un nuevo ordenamiento"
 
-#: sql_help.h:383
+#: sql_help.h:407
 msgid "define a new encoding conversion"
 msgstr "define una nueva conversión de codificación"
 
-#: sql_help.h:388
+#: sql_help.h:412
 msgid "create a new database"
 msgstr "crea una nueva base de datos"
 
-#: sql_help.h:393
+#: sql_help.h:417
 msgid "define a new domain"
 msgstr "define un nuevo dominio"
 
-#: sql_help.h:398
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "instala una extensión"
+
+#: sql_help.h:427
 msgid "define a new foreign-data wrapper"
 msgstr "define un nuevo conector de datos externos"
 
-#: sql_help.h:403
+#: sql_help.h:432
+msgid "define a new foreign table"
+msgstr "define una nueva tabla foránea"
+
+#: sql_help.h:437
 msgid "define a new function"
 msgstr "define una nueva función"
 
-#: sql_help.h:408 sql_help.h:438 sql_help.h:508
+#: sql_help.h:442 sql_help.h:472 sql_help.h:542
 msgid "define a new database role"
 msgstr "define un nuevo rol de la base de datos"
 
-#: sql_help.h:413
+#: sql_help.h:447
 msgid "define a new index"
 msgstr "define un nuevo índice"
 
-#: sql_help.h:418
+#: sql_help.h:452
 msgid "define a new procedural language"
 msgstr "define un nuevo lenguaje procedural"
 
-#: sql_help.h:423
+#: sql_help.h:457
 msgid "define a new operator"
 msgstr "define un nuevo operador"
 
-#: sql_help.h:428
+#: sql_help.h:462
 msgid "define a new operator class"
 msgstr "define una nueva clase de operadores"
 
-#: sql_help.h:433
+#: sql_help.h:467
 msgid "define a new operator family"
 msgstr "define una nueva familia de operadores"
 
-#: sql_help.h:443
+#: sql_help.h:477
 msgid "define a new rewrite rule"
 msgstr "define una nueva regla de reescritura"
 
-#: sql_help.h:448
+#: sql_help.h:482
 msgid "define a new schema"
 msgstr "define un nuevo schema"
 
-#: sql_help.h:453
+#: sql_help.h:487
 msgid "define a new sequence generator"
 msgstr "define un nuevo generador secuencial"
 
-#: sql_help.h:458
+#: sql_help.h:492
 msgid "define a new foreign server"
 msgstr "define un nuevo servidor foráneo"
 
-#: sql_help.h:463
+#: sql_help.h:497
 msgid "define a new table"
 msgstr "define una nueva tabla"
 
-#: sql_help.h:468 sql_help.h:813
+#: sql_help.h:502 sql_help.h:867
 msgid "define a new table from the results of a query"
 msgstr "crea una nueva tabla usando los resultados de una consulta"
 
-#: sql_help.h:473
+#: sql_help.h:507
 msgid "define a new tablespace"
 msgstr "define un nuevo tablespace"
 
-#: sql_help.h:478
+#: sql_help.h:512
 msgid "define a new text search configuration"
 msgstr "define una nueva configuración de búsqueda en texto"
 
-#: sql_help.h:483
+#: sql_help.h:517
 msgid "define a new text search dictionary"
 msgstr "define un nuevo diccionario de búsqueda en texto"
 
-#: sql_help.h:488
+#: sql_help.h:522
 msgid "define a new text search parser"
 msgstr "define un nuevo analizador de búsqueda en texto"
 
-#: sql_help.h:493
+#: sql_help.h:527
 msgid "define a new text search template"
 msgstr "define una nueva plantilla de búsqueda en texto"
 
-#: sql_help.h:498
+#: sql_help.h:532
 msgid "define a new trigger"
 msgstr "define un nuevo disparador"
 
-#: sql_help.h:503
+#: sql_help.h:537
 msgid "define a new data type"
 msgstr "define un nuevo tipo de datos"
 
-#: sql_help.h:513
+#: sql_help.h:547
 msgid "define a new mapping of a user to a foreign server"
 msgstr "define un nuevo mapa de usuario a servidor foráneo"
 
-#: sql_help.h:518
+#: sql_help.h:552
 msgid "define a new view"
 msgstr "define una nueva vista"
 
-#: sql_help.h:523
+#: sql_help.h:557
 msgid "deallocate a prepared statement"
 msgstr "elimina una sentencia preparada"
 
-#: sql_help.h:528
+#: sql_help.h:562
 msgid "define a cursor"
 msgstr "define un nuevo cursor"
 
-#: sql_help.h:533
+#: sql_help.h:567
 msgid "delete rows of a table"
 msgstr "elimina filas de una tabla"
 
-#: sql_help.h:538
+#: sql_help.h:572
 msgid "discard session state"
 msgstr "descartar datos de la sesión"
 
-#: sql_help.h:543
+#: sql_help.h:577
 msgid "execute an anonymous code block"
 msgstr "ejecutar un bloque anónimo de código"
 
-#: sql_help.h:548
+#: sql_help.h:582
 msgid "remove an aggregate function"
 msgstr "elimina una función de agregación"
 
-#: sql_help.h:553
+#: sql_help.h:587
 msgid "remove a cast"
 msgstr "elimina una conversión de tipo"
 
-#: sql_help.h:558
+#: sql_help.h:592
+msgid "remove a collation"
+msgstr "elimina un ordenamiento"
+
+#: sql_help.h:597
 msgid "remove a conversion"
 msgstr "elimina una conversión de codificación"
 
-#: sql_help.h:563
+#: sql_help.h:602
 msgid "remove a database"
 msgstr "elimina una base de datos"
 
-#: sql_help.h:568
+#: sql_help.h:607
 msgid "remove a domain"
 msgstr "elimina un dominio"
 
-#: sql_help.h:573
+#: sql_help.h:612
+msgid "remove an extension"
+msgstr "elimina una extensión"
+
+#: sql_help.h:617
 msgid "remove a foreign-data wrapper"
 msgstr "elimina un conector de datos externos"
 
-#: sql_help.h:578
+#: sql_help.h:622
+msgid "remove a foreign table"
+msgstr "elimina una tabla foránea"
+
+#: sql_help.h:627
 msgid "remove a function"
 msgstr "elimina una función"
 
-#: sql_help.h:583 sql_help.h:618 sql_help.h:683
+#: sql_help.h:632 sql_help.h:667 sql_help.h:732
 msgid "remove a database role"
 msgstr "elimina un rol de base de datos"
 
-#: sql_help.h:588
+#: sql_help.h:637
 msgid "remove an index"
 msgstr "elimina un índice"
 
-#: sql_help.h:593
+#: sql_help.h:642
 msgid "remove a procedural language"
 msgstr "elimina un lenguaje procedural"
 
-#: sql_help.h:598
+#: sql_help.h:647
 msgid "remove an operator"
 msgstr "elimina un operador"
 
-#: sql_help.h:603
+#: sql_help.h:652
 msgid "remove an operator class"
 msgstr "elimina una clase de operadores"
 
-#: sql_help.h:608
+#: sql_help.h:657
 msgid "remove an operator family"
 msgstr "elimina una familia de operadores"
 
-#: sql_help.h:613
+#: sql_help.h:662
 msgid "remove database objects owned by a database role"
 msgstr "elimina objetos de propiedad de un rol de la base de datos"
 
-#: sql_help.h:623
+#: sql_help.h:672
 msgid "remove a rewrite rule"
 msgstr "elimina una regla de reescritura"
 
-#: sql_help.h:628
+#: sql_help.h:677
 msgid "remove a schema"
 msgstr "elimina un schema"
 
-#: sql_help.h:633
+#: sql_help.h:682
 msgid "remove a sequence"
 msgstr "elimina un generador secuencial"
 
-#: sql_help.h:638
+#: sql_help.h:687
 msgid "remove a foreign server descriptor"
 msgstr "elimina un descriptor de servidor foráneo"
 
-#: sql_help.h:643
+#: sql_help.h:692
 msgid "remove a table"
 msgstr "elimina una tabla"
 
-#: sql_help.h:648
+#: sql_help.h:697
 msgid "remove a tablespace"
 msgstr "elimina un tablespace"
 
-#: sql_help.h:653
+#: sql_help.h:702
 msgid "remove a text search configuration"
 msgstr "elimina una configuración de búsqueda en texto"
 
-#: sql_help.h:658
+#: sql_help.h:707
 msgid "remove a text search dictionary"
 msgstr "elimina un diccionario de búsqueda en texto"
 
-#: sql_help.h:663
+#: sql_help.h:712
 msgid "remove a text search parser"
 msgstr "elimina un analizador de búsqueda en texto"
 
-#: sql_help.h:668
+#: sql_help.h:717
 msgid "remove a text search template"
 msgstr "elimina una plantilla de búsqueda en texto"
 
-#: sql_help.h:673
+#: sql_help.h:722
 msgid "remove a trigger"
 msgstr "elimina un disparador"
 
-#: sql_help.h:678
+#: sql_help.h:727
 msgid "remove a data type"
 msgstr "elimina un tipo de datos"
 
-#: sql_help.h:688
+#: sql_help.h:737
 msgid "remove a user mapping for a foreign server"
 msgstr "elimina un mapeo de usuario para un servidor remoto"
 
-#: sql_help.h:693
+#: sql_help.h:742
 msgid "remove a view"
 msgstr "elimina una vista"
 
-#: sql_help.h:703
+#: sql_help.h:752
 msgid "execute a prepared statement"
 msgstr "ejecuta una sentencia preparada"
 
-#: sql_help.h:708
+#: sql_help.h:757
 msgid "show the execution plan of a statement"
 msgstr "muestra el plan de ejecución de una sentencia"
 
-#: sql_help.h:713
+#: sql_help.h:762
 msgid "retrieve rows from a query using a cursor"
 msgstr "recupera filas de una consulta usando un cursor"
 
-#: sql_help.h:718
+#: sql_help.h:767
 msgid "define access privileges"
 msgstr "define privilegios de acceso"
 
-#: sql_help.h:723
+#: sql_help.h:772
 msgid "create new rows in a table"
 msgstr "crea nuevas filas en una tabla"
 
-#: sql_help.h:728
+#: sql_help.h:777
 msgid "listen for a notification"
 msgstr "escucha notificaciones"
 
-#: sql_help.h:733
+#: sql_help.h:782
 msgid "load a shared library file"
 msgstr "carga un archivo de biblioteca compartida"
 
-#: sql_help.h:738
+#: sql_help.h:787
 msgid "lock a table"
 msgstr "bloquea una tabla"
 
-#: sql_help.h:743
+#: sql_help.h:792
 msgid "position a cursor"
 msgstr "reposiciona un cursor"
 
-#: sql_help.h:748
+#: sql_help.h:797
 msgid "generate a notification"
 msgstr "genera una notificación"
 
-#: sql_help.h:753
+#: sql_help.h:802
 msgid "prepare a statement for execution"
 msgstr "prepara una sentencia para ejecución"
 
-#: sql_help.h:758
+#: sql_help.h:807
 msgid "prepare the current transaction for two-phase commit"
 msgstr "prepara la transacción actual para two-phase commit"
 
-#: sql_help.h:763
+#: sql_help.h:812
 msgid "change the ownership of database objects owned by a database role"
 msgstr ""
 "cambia de dueño a los objetos de propiedad de un rol de la base de datos"
 
-#: sql_help.h:768
+#: sql_help.h:817
 msgid "rebuild indexes"
 msgstr "reconstruye índices"
 
-#: sql_help.h:773
+#: sql_help.h:822
 msgid "destroy a previously defined savepoint"
 msgstr "destruye un savepoint previamente definido"
 
-#: sql_help.h:778
+#: sql_help.h:827
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "restaura el valor de un parámetro de configuración al valor inicial"
 
-#: sql_help.h:783
+#: sql_help.h:832
 msgid "remove access privileges"
 msgstr "revoca privilegios de acceso"
 
-#: sql_help.h:793
+#: sql_help.h:842
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "cancela una transacción que fue previamente preparada para two-phase commit."
 
-#: sql_help.h:798
+#: sql_help.h:847
 msgid "roll back to a savepoint"
 msgstr "descartar hacia un savepoint"
 
-#: sql_help.h:803
+#: sql_help.h:852
 msgid "define a new savepoint within the current transaction"
 msgstr "define un nuevo savepoint en la transacción en curso"
 
-#: sql_help.h:808 sql_help.h:853 sql_help.h:883
+#: sql_help.h:857
+msgid "define or change a security label applied to an object"
+msgstr "define o cambia una etiqueta de seguridad sobre un objeto"
+
+#: sql_help.h:862 sql_help.h:907 sql_help.h:937
 msgid "retrieve rows from a table or view"
 msgstr "recupera filas desde una tabla o vista"
 
-#: sql_help.h:818
+#: sql_help.h:872
 msgid "change a run-time parameter"
 msgstr "cambia un parámetro de configuración"
 
-#: sql_help.h:823
+#: sql_help.h:877
 msgid "set constraint check timing for the current transaction"
 msgstr ""
 "define el modo de verificación de las restricciones de la transacción en "
 "curso"
 
-#: sql_help.h:828
+#: sql_help.h:882
 msgid "set the current user identifier of the current session"
 msgstr "define el identificador de usuario actual de la sesión actual"
 
-#: sql_help.h:833
+#: sql_help.h:887
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
@@ -2670,1027 +2879,1155 @@ msgstr ""
 "define el identificador del usuario de sesión y el identificador\n"
 "del usuario actual de la sesión en curso"
 
-#: sql_help.h:838
+#: sql_help.h:892
 msgid "set the characteristics of the current transaction"
 msgstr "define las características de la transacción en curso"
 
-#: sql_help.h:843
+#: sql_help.h:897
 msgid "show the value of a run-time parameter"
 msgstr "muestra el valor de un parámetro de configuración"
 
-#: sql_help.h:858
+#: sql_help.h:912
 msgid "empty a table or set of tables"
 msgstr "vacía una tabla o conjunto de tablas"
 
-#: sql_help.h:863
+#: sql_help.h:917
 msgid "stop listening for a notification"
 msgstr "deja de escuchar una notificación"
 
-#: sql_help.h:868
+#: sql_help.h:922
 msgid "update rows of a table"
 msgstr "actualiza filas de una tabla"
 
-#: sql_help.h:873
+#: sql_help.h:927
 msgid "garbage-collect and optionally analyze a database"
 msgstr "recolecta basura y opcionalmente estadísticas sobre una base de datos"
 
-#: sql_help.h:878
+#: sql_help.h:932
 msgid "compute a set of rows"
 msgstr "calcula un conjunto de registros"
 
-#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:43 sql_help.c:45
-#: sql_help.c:69 sql_help.c:73 sql_help.c:75 sql_help.c:77 sql_help.c:79
-#: sql_help.c:82 sql_help.c:84 sql_help.c:86 sql_help.c:161 sql_help.c:163
-#: sql_help.c:164 sql_help.c:166 sql_help.c:168 sql_help.c:170 sql_help.c:182
-#: sql_help.c:186 sql_help.c:214 sql_help.c:219 sql_help.c:224 sql_help.c:229
-#: sql_help.c:267 sql_help.c:269 sql_help.c:271 sql_help.c:274 sql_help.c:284
-#: sql_help.c:286 sql_help.c:304 sql_help.c:316 sql_help.c:319 sql_help.c:338
-#: sql_help.c:349 sql_help.c:357 sql_help.c:360 sql_help.c:389 sql_help.c:395
-#: sql_help.c:397 sql_help.c:401 sql_help.c:404 sql_help.c:407 sql_help.c:417
-#: sql_help.c:419 sql_help.c:436 sql_help.c:445 sql_help.c:447 sql_help.c:449
-#: sql_help.c:513 sql_help.c:515 sql_help.c:518 sql_help.c:520 sql_help.c:570
-#: sql_help.c:572 sql_help.c:574 sql_help.c:577 sql_help.c:597 sql_help.c:600
-#: sql_help.c:603 sql_help.c:606 sql_help.c:610 sql_help.c:612 sql_help.c:614
-#: sql_help.c:627 sql_help.c:630 sql_help.c:632 sql_help.c:641 sql_help.c:650
-#: sql_help.c:659 sql_help.c:671 sql_help.c:673 sql_help.c:675 sql_help.c:703
-#: sql_help.c:709 sql_help.c:711 sql_help.c:714 sql_help.c:716 sql_help.c:718
-#: sql_help.c:743 sql_help.c:746 sql_help.c:748 sql_help.c:750 sql_help.c:752
-#: sql_help.c:791 sql_help.c:962 sql_help.c:970 sql_help.c:1016
-#: sql_help.c:1031 sql_help.c:1049 sql_help.c:1071 sql_help.c:1087
-#: sql_help.c:1113 sql_help.c:1155 sql_help.c:1177 sql_help.c:1196
-#: sql_help.c:1197 sql_help.c:1214 sql_help.c:1234 sql_help.c:1255
-#: sql_help.c:1282 sql_help.c:1303 sql_help.c:1333 sql_help.c:1513
-#: sql_help.c:1526 sql_help.c:1543 sql_help.c:1559 sql_help.c:1572
-#: sql_help.c:1611 sql_help.c:1614 sql_help.c:1616 sql_help.c:1633
-#: sql_help.c:1659 sql_help.c:1692 sql_help.c:1702 sql_help.c:1711
-#: sql_help.c:1753 sql_help.c:1771 sql_help.c:1779 sql_help.c:1787
-#: sql_help.c:1795 sql_help.c:1804 sql_help.c:1815 sql_help.c:1823
-#: sql_help.c:1831 sql_help.c:1839 sql_help.c:1849 sql_help.c:1858
-#: sql_help.c:1867 sql_help.c:1875 sql_help.c:1883 sql_help.c:1892
-#: sql_help.c:1900 sql_help.c:1916 sql_help.c:1932 sql_help.c:1940
-#: sql_help.c:1948 sql_help.c:1956 sql_help.c:1964 sql_help.c:1973
-#: sql_help.c:1981 sql_help.c:1998 sql_help.c:2013 sql_help.c:2193
-#: sql_help.c:2221 sql_help.c:2248 sql_help.c:2549 sql_help.c:2594
-#: sql_help.c:2698
+#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:44 sql_help.c:46
+#: sql_help.c:48 sql_help.c:59 sql_help.c:61 sql_help.c:63 sql_help.c:87
+#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
+#: sql_help.c:102 sql_help.c:104 sql_help.c:179 sql_help.c:181 sql_help.c:182
+#: sql_help.c:184 sql_help.c:186 sql_help.c:188 sql_help.c:276 sql_help.c:281
+#: sql_help.c:306 sql_help.c:308 sql_help.c:311 sql_help.c:313 sql_help.c:351
+#: sql_help.c:356 sql_help.c:361 sql_help.c:366 sql_help.c:404 sql_help.c:406
+#: sql_help.c:408 sql_help.c:411 sql_help.c:421 sql_help.c:423 sql_help.c:442
+#: sql_help.c:446 sql_help.c:459 sql_help.c:462 sql_help.c:465 sql_help.c:485
+#: sql_help.c:497 sql_help.c:505 sql_help.c:508 sql_help.c:511 sql_help.c:541
+#: sql_help.c:547 sql_help.c:549 sql_help.c:553 sql_help.c:556 sql_help.c:559
+#: sql_help.c:569 sql_help.c:571 sql_help.c:588 sql_help.c:597 sql_help.c:599
+#: sql_help.c:601 sql_help.c:675 sql_help.c:677 sql_help.c:680 sql_help.c:682
+#: sql_help.c:740 sql_help.c:742 sql_help.c:744 sql_help.c:747 sql_help.c:768
+#: sql_help.c:771 sql_help.c:774 sql_help.c:777 sql_help.c:781 sql_help.c:783
+#: sql_help.c:785 sql_help.c:787 sql_help.c:801 sql_help.c:804 sql_help.c:806
+#: sql_help.c:808 sql_help.c:818 sql_help.c:820 sql_help.c:830 sql_help.c:832
+#: sql_help.c:841 sql_help.c:862 sql_help.c:864 sql_help.c:866 sql_help.c:869
+#: sql_help.c:871 sql_help.c:873 sql_help.c:911 sql_help.c:917 sql_help.c:919
+#: sql_help.c:922 sql_help.c:924 sql_help.c:926 sql_help.c:951 sql_help.c:954
+#: sql_help.c:956 sql_help.c:958 sql_help.c:960 sql_help.c:1000
+#: sql_help.c:1183 sql_help.c:1191 sql_help.c:1235 sql_help.c:1239
+#: sql_help.c:1249 sql_help.c:1267 sql_help.c:1290 sql_help.c:1322
+#: sql_help.c:1367 sql_help.c:1409 sql_help.c:1431 sql_help.c:1451
+#: sql_help.c:1452 sql_help.c:1469 sql_help.c:1489 sql_help.c:1511
+#: sql_help.c:1539 sql_help.c:1560 sql_help.c:1590 sql_help.c:1771
+#: sql_help.c:1784 sql_help.c:1801 sql_help.c:1817 sql_help.c:1840
+#: sql_help.c:1883 sql_help.c:1887 sql_help.c:1889 sql_help.c:1907
+#: sql_help.c:1934 sql_help.c:1967 sql_help.c:1977 sql_help.c:1986
+#: sql_help.c:2030 sql_help.c:2048 sql_help.c:2056 sql_help.c:2064
+#: sql_help.c:2072 sql_help.c:2088 sql_help.c:2096 sql_help.c:2105
+#: sql_help.c:2116 sql_help.c:2124 sql_help.c:2132 sql_help.c:2140
+#: sql_help.c:2150 sql_help.c:2159 sql_help.c:2168 sql_help.c:2176
+#: sql_help.c:2184 sql_help.c:2193 sql_help.c:2201 sql_help.c:2217
+#: sql_help.c:2233 sql_help.c:2241 sql_help.c:2249 sql_help.c:2257
+#: sql_help.c:2265 sql_help.c:2274 sql_help.c:2282 sql_help.c:2299
+#: sql_help.c:2314 sql_help.c:2506 sql_help.c:2557 sql_help.c:2584
+#: sql_help.c:2927 sql_help.c:2973 sql_help.c:3080
 msgid "name"
 msgstr "nombre"
 
-#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:524 sql_help.c:528
-#: sql_help.c:1754
+#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:317 sql_help.c:320
+#: sql_help.c:2031
 msgid "type"
 msgstr "tipo"
 
-#: sql_help.c:28 sql_help.c:44 sql_help.c:74 sql_help.c:223 sql_help.c:256
-#: sql_help.c:268 sql_help.c:285 sql_help.c:318 sql_help.c:359 sql_help.c:396
-#: sql_help.c:418 sql_help.c:448 sql_help.c:519 sql_help.c:571 sql_help.c:613
-#: sql_help.c:631 sql_help.c:642 sql_help.c:651 sql_help.c:661 sql_help.c:672
-#: sql_help.c:710 sql_help.c:751
+#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:312
+#: sql_help.c:360 sql_help.c:393 sql_help.c:405 sql_help.c:422 sql_help.c:461
+#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:681
+#: sql_help.c:741 sql_help.c:784 sql_help.c:805 sql_help.c:819 sql_help.c:831
+#: sql_help.c:843 sql_help.c:870 sql_help.c:918 sql_help.c:959
 msgid "new_name"
 msgstr "nuevo_nombre"
 
-#: sql_help.c:31 sql_help.c:46 sql_help.c:76 sql_help.c:169 sql_help.c:187
-#: sql_help.c:228 sql_help.c:287 sql_help.c:296 sql_help.c:307 sql_help.c:321
-#: sql_help.c:362 sql_help.c:420 sql_help.c:446 sql_help.c:465 sql_help.c:558
-#: sql_help.c:573 sql_help.c:615 sql_help.c:633 sql_help.c:674 sql_help.c:749
+#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:187
+#: sql_help.c:282 sql_help.c:322 sql_help.c:365 sql_help.c:424 sql_help.c:433
+#: sql_help.c:445 sql_help.c:464 sql_help.c:510 sql_help.c:572 sql_help.c:598
+#: sql_help.c:617 sql_help.c:725 sql_help.c:743 sql_help.c:786 sql_help.c:807
+#: sql_help.c:865 sql_help.c:957
 msgid "new_owner"
 msgstr "nuevo_dueño"
 
-#: sql_help.c:34 sql_help.c:171 sql_help.c:233 sql_help.c:450 sql_help.c:521
-#: sql_help.c:676 sql_help.c:753
+#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:189 sql_help.c:228
+#: sql_help.c:314 sql_help.c:370 sql_help.c:449 sql_help.c:467 sql_help.c:513
+#: sql_help.c:602 sql_help.c:683 sql_help.c:788 sql_help.c:809 sql_help.c:821
+#: sql_help.c:833 sql_help.c:872 sql_help.c:961
 msgid "new_schema"
 msgstr "nuevo_esquema"
 
-#: sql_help.c:70 sql_help.c:184 sql_help.c:390 sql_help.c:462 sql_help.c:628
-#: sql_help.c:704 sql_help.c:730 sql_help.c:922 sql_help.c:927 sql_help.c:1089
-#: sql_help.c:1156 sql_help.c:1283 sql_help.c:1354 sql_help.c:1528
-#: sql_help.c:1660 sql_help.c:1682
+#: sql_help.c:88 sql_help.c:279 sql_help.c:323 sql_help.c:542 sql_help.c:614
+#: sql_help.c:802 sql_help.c:912 sql_help.c:938 sql_help.c:1142
+#: sql_help.c:1147 sql_help.c:1325 sql_help.c:1343 sql_help.c:1410
+#: sql_help.c:1540 sql_help.c:1611 sql_help.c:1786 sql_help.c:1935
+#: sql_help.c:1957 sql_help.c:2332
 msgid "option"
 msgstr "opción"
 
-#: sql_help.c:71 sql_help.c:391 sql_help.c:705 sql_help.c:1157 sql_help.c:1284
-#: sql_help.c:1661
+#: sql_help.c:89 sql_help.c:543 sql_help.c:913 sql_help.c:1411 sql_help.c:1541
+#: sql_help.c:1936
 msgid "where option can be:"
 msgstr "donde opción puede ser:"
 
-#: sql_help.c:72 sql_help.c:392 sql_help.c:706 sql_help.c:1056 sql_help.c:1285
-#: sql_help.c:1662
+#: sql_help.c:90 sql_help.c:544 sql_help.c:914 sql_help.c:1274 sql_help.c:1542
+#: sql_help.c:1937
 msgid "connlimit"
 msgstr "límite_conexiones"
 
-#: sql_help.c:78 sql_help.c:559
+#: sql_help.c:96 sql_help.c:726
 msgid "new_tablespace"
 msgstr "nuevo_tablespace"
 
-#: sql_help.c:80 sql_help.c:83 sql_help.c:85 sql_help.c:237 sql_help.c:239
-#: sql_help.c:240 sql_help.c:399 sql_help.c:403 sql_help.c:406 sql_help.c:712
-#: sql_help.c:715 sql_help.c:717 sql_help.c:1124 sql_help.c:2265
-#: sql_help.c:2538
+#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:374 sql_help.c:376
+#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:920
+#: sql_help.c:923 sql_help.c:925 sql_help.c:1378 sql_help.c:2601
+#: sql_help.c:2916
 msgid "configuration_parameter"
 msgstr "parámetro_de_configuración"
 
-#: sql_help.c:81 sql_help.c:185 sql_help.c:238 sql_help.c:273 sql_help.c:400
-#: sql_help.c:463 sql_help.c:538 sql_help.c:554 sql_help.c:576 sql_help.c:629
-#: sql_help.c:713 sql_help.c:731 sql_help.c:1090 sql_help.c:1125
-#: sql_help.c:1126 sql_help.c:1184 sql_help.c:1355 sql_help.c:1428
-#: sql_help.c:1437 sql_help.c:1468 sql_help.c:1490 sql_help.c:1529
-#: sql_help.c:1683 sql_help.c:2539 sql_help.c:2540
+#: sql_help.c:99 sql_help.c:280 sql_help.c:324 sql_help.c:375 sql_help.c:410
+#: sql_help.c:552 sql_help.c:615 sql_help.c:702 sql_help.c:720 sql_help.c:746
+#: sql_help.c:803 sql_help.c:921 sql_help.c:939 sql_help.c:1326
+#: sql_help.c:1344 sql_help.c:1379 sql_help.c:1380 sql_help.c:1439
+#: sql_help.c:1612 sql_help.c:1686 sql_help.c:1694 sql_help.c:1726
+#: sql_help.c:1748 sql_help.c:1787 sql_help.c:1958 sql_help.c:2917
+#: sql_help.c:2918
 msgid "value"
 msgstr "valor"
 
-#: sql_help.c:133
+#: sql_help.c:151
 msgid "target_role"
 msgstr "rol_destino"
 
-#: sql_help.c:134 sql_help.c:1318 sql_help.c:2119 sql_help.c:2126
-#: sql_help.c:2138 sql_help.c:2144 sql_help.c:2348 sql_help.c:2355
-#: sql_help.c:2367 sql_help.c:2373
+#: sql_help.c:152 sql_help.c:1575 sql_help.c:2430 sql_help.c:2437
+#: sql_help.c:2449 sql_help.c:2455 sql_help.c:2684 sql_help.c:2691
+#: sql_help.c:2703 sql_help.c:2709
 msgid "schema_name"
 msgstr "nombre_de_esquema"
 
-#: sql_help.c:135
+#: sql_help.c:153
 msgid "abbreviated_grant_or_revoke"
 msgstr "grant_o_revoke_abreviado"
 
-#: sql_help.c:136
+#: sql_help.c:154
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "donde grant_o_revoke_abreviado es uno de:"
 
-#: sql_help.c:137 sql_help.c:138 sql_help.c:139 sql_help.c:140 sql_help.c:141
-#: sql_help.c:142 sql_help.c:1160 sql_help.c:1161 sql_help.c:1162
-#: sql_help.c:1163 sql_help.c:1164 sql_help.c:1288 sql_help.c:1289
-#: sql_help.c:1290 sql_help.c:1291 sql_help.c:1292 sql_help.c:1665
-#: sql_help.c:1666 sql_help.c:1667 sql_help.c:1668 sql_help.c:1669
-#: sql_help.c:2120 sql_help.c:2124 sql_help.c:2127 sql_help.c:2129
-#: sql_help.c:2131 sql_help.c:2133 sql_help.c:2139 sql_help.c:2141
-#: sql_help.c:2143 sql_help.c:2145 sql_help.c:2147 sql_help.c:2148
-#: sql_help.c:2149 sql_help.c:2349 sql_help.c:2353 sql_help.c:2356
-#: sql_help.c:2358 sql_help.c:2360 sql_help.c:2362 sql_help.c:2368
-#: sql_help.c:2370 sql_help.c:2372 sql_help.c:2374 sql_help.c:2376
-#: sql_help.c:2377 sql_help.c:2378 sql_help.c:2559
+#: sql_help.c:155 sql_help.c:156 sql_help.c:157 sql_help.c:158 sql_help.c:159
+#: sql_help.c:160 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
+#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1545 sql_help.c:1546
+#: sql_help.c:1547 sql_help.c:1548 sql_help.c:1549 sql_help.c:1940
+#: sql_help.c:1941 sql_help.c:1942 sql_help.c:1943 sql_help.c:1944
+#: sql_help.c:2431 sql_help.c:2435 sql_help.c:2438 sql_help.c:2440
+#: sql_help.c:2442 sql_help.c:2444 sql_help.c:2450 sql_help.c:2452
+#: sql_help.c:2454 sql_help.c:2456 sql_help.c:2458 sql_help.c:2459
+#: sql_help.c:2460 sql_help.c:2685 sql_help.c:2689 sql_help.c:2692
+#: sql_help.c:2694 sql_help.c:2696 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2706 sql_help.c:2708 sql_help.c:2710 sql_help.c:2712
+#: sql_help.c:2713 sql_help.c:2714 sql_help.c:2937
 msgid "role_name"
 msgstr "nombre_de_rol"
 
-#: sql_help.c:162 sql_help.c:529 sql_help.c:531 sql_help.c:745 sql_help.c:1073
-#: sql_help.c:1077 sql_help.c:1181 sql_help.c:1441 sql_help.c:1450
-#: sql_help.c:1472 sql_help.c:2161 sql_help.c:2446 sql_help.c:2447
-#: sql_help.c:2451 sql_help.c:2456 sql_help.c:2513 sql_help.c:2514
-#: sql_help.c:2519 sql_help.c:2524 sql_help.c:2645 sql_help.c:2646
-#: sql_help.c:2650 sql_help.c:2655 sql_help.c:2722 sql_help.c:2724
-#: sql_help.c:2755 sql_help.c:2797 sql_help.c:2798 sql_help.c:2802
-#: sql_help.c:2807
+#: sql_help.c:180 sql_help.c:693 sql_help.c:695 sql_help.c:953 sql_help.c:1293
+#: sql_help.c:1297 sql_help.c:1435 sql_help.c:1698 sql_help.c:1708
+#: sql_help.c:1730 sql_help.c:2474 sql_help.c:2822 sql_help.c:2823
+#: sql_help.c:2827 sql_help.c:2832 sql_help.c:2891 sql_help.c:2892
+#: sql_help.c:2897 sql_help.c:2902 sql_help.c:3025 sql_help.c:3026
+#: sql_help.c:3030 sql_help.c:3035 sql_help.c:3106 sql_help.c:3108
+#: sql_help.c:3139 sql_help.c:3181 sql_help.c:3182 sql_help.c:3186
+#: sql_help.c:3191
 msgid "expression"
 msgstr "expresión"
 
-#: sql_help.c:165
+#: sql_help.c:183
 msgid "domain_constraint"
 msgstr "restricción_de_dominio"
 
-#: sql_help.c:167 sql_help.c:543 sql_help.c:845 sql_help.c:1076
-#: sql_help.c:1440 sql_help.c:1449
+#: sql_help.c:185 sql_help.c:708 sql_help.c:709 sql_help.c:728 sql_help.c:1059
+#: sql_help.c:1296 sql_help.c:1697 sql_help.c:1707
 msgid "constraint_name"
 msgstr "nombre_restricción"
 
-#: sql_help.c:183 sql_help.c:1088 sql_help.c:1200
-msgid "valfunction"
-msgstr "función_val"
+#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1308
+#: sql_help.c:2080
+msgid "extension_name"
+msgstr "nombre_de_extensión"
+
+#: sql_help.c:226 sql_help.c:613
+msgid "new_version"
+msgstr "nueva_versión"
+
+#: sql_help.c:230 sql_help.c:232
+msgid "member_object"
+msgstr "objeto_miembro"
+
+#: sql_help.c:233
+msgid "where member_object is:"
+msgstr "dondo objeto_miembro es:"
+
+#: sql_help.c:234 sql_help.c:1052 sql_help.c:2771
+msgid "agg_name"
+msgstr "nombre_agg"
+
+#: sql_help.c:235 sql_help.c:1053 sql_help.c:2772
+msgid "agg_type"
+msgstr "tipo_agg"
 
-#: sql_help.c:215 sql_help.c:220 sql_help.c:225 sql_help.c:230 sql_help.c:851
-#: sql_help.c:1114 sql_help.c:1805 sql_help.c:2135 sql_help.c:2364
+#: sql_help.c:236 sql_help.c:1054 sql_help.c:1215 sql_help.c:1219
+#: sql_help.c:1221 sql_help.c:2039
+msgid "source_type"
+msgstr "tipo_fuente"
+
+#: sql_help.c:237 sql_help.c:1055 sql_help.c:1216 sql_help.c:1220
+#: sql_help.c:1222 sql_help.c:2040
+msgid "target_type"
+msgstr "tipo_destino"
+
+#: sql_help.c:238 sql_help.c:239 sql_help.c:240 sql_help.c:241 sql_help.c:242
+#: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:255 sql_help.c:256
+#: sql_help.c:257 sql_help.c:258 sql_help.c:259 sql_help.c:260 sql_help.c:261
+#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1056
+#: sql_help.c:1061 sql_help.c:1062 sql_help.c:1063 sql_help.c:1064
+#: sql_help.c:1065 sql_help.c:1066 sql_help.c:1071 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1080 sql_help.c:1081 sql_help.c:1084
+#: sql_help.c:1085 sql_help.c:1086 sql_help.c:1087 sql_help.c:1088
+#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1096 sql_help.c:2768 sql_help.c:2773
+#: sql_help.c:2774 sql_help.c:2780 sql_help.c:2781 sql_help.c:2782
+#: sql_help.c:2783 sql_help.c:2784
+msgid "object_name"
+msgstr "nombre_de_objeto"
+
+#: sql_help.c:243 sql_help.c:495 sql_help.c:1067 sql_help.c:1217
+#: sql_help.c:1252 sql_help.c:1470 sql_help.c:1501 sql_help.c:1845
+#: sql_help.c:2445 sql_help.c:2699 sql_help.c:2775 sql_help.c:2848
+#: sql_help.c:2853 sql_help.c:3051 sql_help.c:3056 sql_help.c:3207
+#: sql_help.c:3212
+msgid "function_name"
+msgstr "nombre_de_función"
+
+#: sql_help.c:244 sql_help.c:352 sql_help.c:357 sql_help.c:362 sql_help.c:367
+#: sql_help.c:1068 sql_help.c:1368 sql_help.c:2106 sql_help.c:2446
+#: sql_help.c:2700 sql_help.c:2776
 msgid "argmode"
 msgstr "modo_arg"
 
-#: sql_help.c:216 sql_help.c:221 sql_help.c:226 sql_help.c:231 sql_help.c:852
-#: sql_help.c:1115 sql_help.c:1806
+#: sql_help.c:245 sql_help.c:353 sql_help.c:358 sql_help.c:363 sql_help.c:368
+#: sql_help.c:1069 sql_help.c:1369 sql_help.c:2107 sql_help.c:2777
 msgid "argname"
 msgstr "nombre_arg"
 
-#: sql_help.c:217 sql_help.c:222 sql_help.c:227 sql_help.c:232 sql_help.c:853
-#: sql_help.c:1116 sql_help.c:1807
+#: sql_help.c:246 sql_help.c:354 sql_help.c:359 sql_help.c:364 sql_help.c:369
+#: sql_help.c:1070 sql_help.c:1370 sql_help.c:2108 sql_help.c:2778
 msgid "argtype"
 msgstr "tipo_arg"
 
-#: sql_help.c:218 sql_help.c:514 sql_help.c:1446 sql_help.c:1447
-#: sql_help.c:1463 sql_help.c:1464
+#: sql_help.c:247 sql_help.c:488 sql_help.c:1073 sql_help.c:1494
+msgid "operator_name"
+msgstr "nombre_operador"
+
+#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1074
+#: sql_help.c:1471 sql_help.c:2141
+msgid "left_type"
+msgstr "tipo_izq"
+
+#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1075
+#: sql_help.c:1472 sql_help.c:2142
+msgid "right_type"
+msgstr "tipo_der"
+
+#: sql_help.c:251 sql_help.c:253 sql_help.c:460 sql_help.c:463 sql_help.c:466
+#: sql_help.c:486 sql_help.c:498 sql_help.c:506 sql_help.c:509 sql_help.c:512
+#: sql_help.c:1077 sql_help.c:1079 sql_help.c:1491 sql_help.c:1512
+#: sql_help.c:1713 sql_help.c:2151 sql_help.c:2160
+msgid "index_method"
+msgstr "método_de_índice"
+
+#: sql_help.c:277 sql_help.c:1323
+msgid "handler_function"
+msgstr "función_manejadora"
+
+#: sql_help.c:278 sql_help.c:1324
+msgid "validator_function"
+msgstr "función_validadora"
+
+#: sql_help.c:307 sql_help.c:355 sql_help.c:676 sql_help.c:863 sql_help.c:1704
+#: sql_help.c:1705 sql_help.c:1721 sql_help.c:1722
 msgid "action"
 msgstr "acción"
 
-#: sql_help.c:234 sql_help.c:522
+#: sql_help.c:309 sql_help.c:316 sql_help.c:318 sql_help.c:319 sql_help.c:321
+#: sql_help.c:596 sql_help.c:678 sql_help.c:685 sql_help.c:689 sql_help.c:690
+#: sql_help.c:694 sql_help.c:696 sql_help.c:697 sql_help.c:698 sql_help.c:700
+#: sql_help.c:703 sql_help.c:705 sql_help.c:952 sql_help.c:955 sql_help.c:970
+#: sql_help.c:1140 sql_help.c:1144 sql_help.c:1156 sql_help.c:1157
+#: sql_help.c:1434 sql_help.c:1597 sql_help.c:1729 sql_help.c:2432
+#: sql_help.c:2433 sql_help.c:2473 sql_help.c:2686 sql_help.c:2687
+#: sql_help.c:3105 sql_help.c:3107 sql_help.c:3124 sql_help.c:3127
+msgid "column"
+msgstr "columna"
+
+#: sql_help.c:310 sql_help.c:679
+msgid "new_column"
+msgstr "nueva_columna"
+
+#: sql_help.c:315 sql_help.c:371 sql_help.c:684 sql_help.c:876
 msgid "where action is one of:"
 msgstr "donde acción es una de:"
 
-#: sql_help.c:235 sql_help.c:1122
+#: sql_help.c:372 sql_help.c:1376
 msgid "execution_cost"
 msgstr "costo_de_ejecución"
 
-#: sql_help.c:236 sql_help.c:1123
+#: sql_help.c:373 sql_help.c:1377
 msgid "result_rows"
 msgstr "núm_de_filas"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:255
+#: sql_help.c:388 sql_help.c:390 sql_help.c:392
 msgid "group_name"
 msgstr "nombre_de_grupo"
 
-#: sql_help.c:252 sql_help.c:254 sql_help.c:728 sql_help.c:1050
-#: sql_help.c:1319 sql_help.c:1321 sql_help.c:1501 sql_help.c:1680
-#: sql_help.c:1989 sql_help.c:2569
+#: sql_help.c:389 sql_help.c:391 sql_help.c:936 sql_help.c:1268
+#: sql_help.c:1576 sql_help.c:1578 sql_help.c:1759 sql_help.c:1955
+#: sql_help.c:2290 sql_help.c:2947
 msgid "user_name"
 msgstr "nombre_de_usuario"
 
-#: sql_help.c:270 sql_help.c:1500 sql_help.c:1924 sql_help.c:2146
-#: sql_help.c:2375
+#: sql_help.c:407 sql_help.c:1758 sql_help.c:2225 sql_help.c:2457
+#: sql_help.c:2711
 msgid "tablespace_name"
 msgstr "nombre_de_tablespace"
 
-#: sql_help.c:272 sql_help.c:275 sql_help.c:553 sql_help.c:555 sql_help.c:1183
-#: sql_help.c:1427 sql_help.c:1436 sql_help.c:1467 sql_help.c:1489
+#: sql_help.c:409 sql_help.c:412 sql_help.c:719 sql_help.c:721 sql_help.c:1438
+#: sql_help.c:1685 sql_help.c:1693 sql_help.c:1725 sql_help.c:1747
 msgid "storage_parameter"
 msgstr "parámetro_de_almacenamiento"
 
-#: sql_help.c:295 sql_help.c:855
+#: sql_help.c:432 sql_help.c:1072 sql_help.c:2779
 msgid "large_object_oid"
 msgstr "oid_de_objeto_grande"
 
-#: sql_help.c:305 sql_help.c:857 sql_help.c:1216 sql_help.c:1840
-msgid "left_type"
-msgstr "tipo_izq"
-
-#: sql_help.c:306 sql_help.c:858 sql_help.c:1217 sql_help.c:1841
-msgid "right_type"
-msgstr "tipo_der"
-
-#: sql_help.c:317 sql_help.c:320 sql_help.c:339 sql_help.c:350 sql_help.c:358
-#: sql_help.c:361 sql_help.c:860 sql_help.c:862 sql_help.c:1236
-#: sql_help.c:1256 sql_help.c:1455 sql_help.c:1850 sql_help.c:1859
-msgid "index_method"
-msgstr "método_de_índice"
-
-#: sql_help.c:340 sql_help.c:351 sql_help.c:1238
+#: sql_help.c:487 sql_help.c:499 sql_help.c:1493
 msgid "strategy_number"
 msgstr "número_de_estrategia"
 
-#: sql_help.c:341 sql_help.c:856 sql_help.c:1239
-msgid "operator_name"
-msgstr "nombre_operador"
-
-#: sql_help.c:342 sql_help.c:343 sql_help.c:345 sql_help.c:346 sql_help.c:352
-#: sql_help.c:353 sql_help.c:355 sql_help.c:356 sql_help.c:1240
-#: sql_help.c:1241 sql_help.c:1243 sql_help.c:1244
+#: sql_help.c:489 sql_help.c:490 sql_help.c:493 sql_help.c:494 sql_help.c:500
+#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1495
+#: sql_help.c:1496 sql_help.c:1499 sql_help.c:1500
 msgid "op_type"
 msgstr "tipo_op"
 
-#: sql_help.c:344 sql_help.c:354 sql_help.c:1242
+#: sql_help.c:491 sql_help.c:1497
+msgid "sort_family_name"
+msgstr "nombre_familia_ordenamiento"
+
+#: sql_help.c:492 sql_help.c:502 sql_help.c:1498
 msgid "support_number"
 msgstr "número_de_soporte"
 
-#: sql_help.c:347 sql_help.c:850 sql_help.c:996 sql_help.c:1021
-#: sql_help.c:1034 sql_help.c:1215 sql_help.c:1245 sql_help.c:1576
-#: sql_help.c:2134 sql_help.c:2363 sql_help.c:2472 sql_help.c:2477
-#: sql_help.c:2671 sql_help.c:2676 sql_help.c:2823 sql_help.c:2828
-msgid "function_name"
-msgstr "nombre_de_función"
-
-#: sql_help.c:348 sql_help.c:997 sql_help.c:1246
+#: sql_help.c:496 sql_help.c:1218 sql_help.c:1502
 msgid "argument_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:393 sql_help.c:707 sql_help.c:1158 sql_help.c:1286
-#: sql_help.c:1663
+#: sql_help.c:545 sql_help.c:915 sql_help.c:1412 sql_help.c:1543
+#: sql_help.c:1938
 msgid "password"
 msgstr "contraseña"
 
-#: sql_help.c:394 sql_help.c:708 sql_help.c:1159 sql_help.c:1287
-#: sql_help.c:1664
+#: sql_help.c:546 sql_help.c:916 sql_help.c:1413 sql_help.c:1544
+#: sql_help.c:1939
 msgid "timestamp"
 msgstr "fecha_hora"
 
-#: sql_help.c:398 sql_help.c:402 sql_help.c:405 sql_help.c:408 sql_help.c:2128
-#: sql_help.c:2357
+#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2439
+#: sql_help.c:2693
 msgid "database_name"
 msgstr "nombre_de_base_de_datos"
 
-#: sql_help.c:437 sql_help.c:1334
+#: sql_help.c:589 sql_help.c:1591
 msgid "increment"
 msgstr "incremento"
 
-#: sql_help.c:438 sql_help.c:1335
+#: sql_help.c:590 sql_help.c:1592
 msgid "minvalue"
 msgstr "valormin"
 
-#: sql_help.c:439 sql_help.c:1336
+#: sql_help.c:591 sql_help.c:1593
 msgid "maxvalue"
 msgstr "valormax"
 
-#: sql_help.c:440 sql_help.c:1337 sql_help.c:2459 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2759 sql_help.c:2810
+#: sql_help.c:592 sql_help.c:1594 sql_help.c:2835 sql_help.c:2905
+#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
 msgid "start"
 msgstr "inicio"
 
-#: sql_help.c:441
+#: sql_help.c:593
 msgid "restart"
 msgstr "reinicio"
 
-#: sql_help.c:442 sql_help.c:1338
+#: sql_help.c:594 sql_help.c:1595
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:444 sql_help.c:516 sql_help.c:523 sql_help.c:526 sql_help.c:527
-#: sql_help.c:530 sql_help.c:532 sql_help.c:533 sql_help.c:534 sql_help.c:536
-#: sql_help.c:539 sql_help.c:541 sql_help.c:744 sql_help.c:747 sql_help.c:762
-#: sql_help.c:920 sql_help.c:924 sql_help.c:936 sql_help.c:937 sql_help.c:1180
-#: sql_help.c:1340 sql_help.c:1471 sql_help.c:2121 sql_help.c:2122
-#: sql_help.c:2160 sql_help.c:2350 sql_help.c:2351 sql_help.c:2721
-#: sql_help.c:2723 sql_help.c:2740 sql_help.c:2743
-msgid "column"
-msgstr "columna"
-
-#: sql_help.c:460 sql_help.c:464 sql_help.c:729 sql_help.c:1350
-#: sql_help.c:1681 sql_help.c:1908 sql_help.c:1990 sql_help.c:2132
-#: sql_help.c:2361
+#: sql_help.c:612 sql_help.c:616 sql_help.c:937 sql_help.c:1342
+#: sql_help.c:1607 sql_help.c:1956 sql_help.c:2209 sql_help.c:2291
+#: sql_help.c:2443 sql_help.c:2697
 msgid "server_name"
 msgstr "nombre_de_servidor"
 
-#: sql_help.c:461
-msgid "new_version"
-msgstr "nueva_versión"
+#: sql_help.c:686 sql_help.c:691 sql_help.c:878 sql_help.c:882 sql_help.c:1291
+#: sql_help.c:1341 sql_help.c:1490 sql_help.c:1678 sql_help.c:1885
+#: sql_help.c:2558
+msgid "data_type"
+msgstr "tipo_de_dato"
 
-#: sql_help.c:517
-msgid "new_column"
-msgstr "nueva_columna"
+#: sql_help.c:687 sql_help.c:692 sql_help.c:879 sql_help.c:883 sql_help.c:1292
+#: sql_help.c:1436 sql_help.c:1679 sql_help.c:1886
+msgid "collation"
+msgstr "ordenamiento"
 
-#: sql_help.c:525 sql_help.c:1422 sql_help.c:1434
+#: sql_help.c:688 sql_help.c:1680 sql_help.c:1691
 msgid "column_constraint"
 msgstr "restricción_de_columna"
 
-#: sql_help.c:535
+#: sql_help.c:699
 msgid "integer"
 msgstr "entero"
 
-#: sql_help.c:537 sql_help.c:540
+#: sql_help.c:701 sql_help.c:704
 msgid "attribute_option"
 msgstr "opción_de_atributo"
 
-#: sql_help.c:542 sql_help.c:1423 sql_help.c:1435
+#: sql_help.c:706 sql_help.c:1681 sql_help.c:1692
 msgid "table_constraint"
 msgstr "restricción_de_tabla"
 
-#: sql_help.c:544 sql_help.c:545 sql_help.c:546 sql_help.c:547 sql_help.c:874
+#: sql_help.c:707
+msgid "table_constraint_using_index"
+msgstr "restricción_de_tabla_con_índice"
+
+#: sql_help.c:710 sql_help.c:711 sql_help.c:712 sql_help.c:713 sql_help.c:1093
 msgid "trigger_name"
 msgstr "nombre_disparador"
 
-#: sql_help.c:548 sql_help.c:549 sql_help.c:550 sql_help.c:551
+#: sql_help.c:714 sql_help.c:715 sql_help.c:716 sql_help.c:717
 msgid "rewrite_rule_name"
 msgstr "nombre_regla_de_reescritura"
 
-#: sql_help.c:552 sql_help.c:801
+#: sql_help.c:718 sql_help.c:729 sql_help.c:1010
 msgid "index_name"
 msgstr "nombre_índice"
 
-#: sql_help.c:556 sql_help.c:557 sql_help.c:1424 sql_help.c:1426
+#: sql_help.c:722 sql_help.c:723 sql_help.c:1682 sql_help.c:1684
 msgid "parent_table"
 msgstr "tabla_padre"
 
-#: sql_help.c:575 sql_help.c:578
+#: sql_help.c:724 sql_help.c:1689
+msgid "type_name"
+msgstr "nombre_de_tipo"
+
+#: sql_help.c:727
+msgid "and table_constraint_using_index is:"
+msgstr "y restricción_de_tabla_con_índice es:"
+
+#: sql_help.c:745 sql_help.c:748
 msgid "tablespace_option"
 msgstr "opción_de_tablespace"
 
-#: sql_help.c:598 sql_help.c:601 sql_help.c:607 sql_help.c:611
+#: sql_help.c:769 sql_help.c:772 sql_help.c:778 sql_help.c:782
 msgid "token_type"
 msgstr "tipo_de_token"
 
-#: sql_help.c:599 sql_help.c:602
+#: sql_help.c:770 sql_help.c:773
 msgid "dictionary_name"
 msgstr "nombre_diccionario"
 
-#: sql_help.c:604 sql_help.c:608
+#: sql_help.c:775 sql_help.c:779
 msgid "old_dictionary"
 msgstr "diccionario_antiguo"
 
-#: sql_help.c:605 sql_help.c:609
+#: sql_help.c:776 sql_help.c:780
 msgid "new_dictionary"
 msgstr "diccionario_nuevo"
 
-#: sql_help.c:775 sql_help.c:2583 sql_help.c:2584 sql_help.c:2607
+#: sql_help.c:867 sql_help.c:877 sql_help.c:880 sql_help.c:881 sql_help.c:1884
+msgid "attribute_name"
+msgstr "nombre_atributo"
+
+#: sql_help.c:868
+msgid "new_attribute_name"
+msgstr "nuevo_nombre_atributo"
+
+#: sql_help.c:874
+msgid "new_enum_value"
+msgstr "nuevo_valor_enum"
+
+#: sql_help.c:875
+msgid "existing_enum_value"
+msgstr "valor_enum_existente"
+
+#: sql_help.c:984 sql_help.c:2962 sql_help.c:2963 sql_help.c:2987
 msgid "transaction_mode"
 msgstr "modo_de_transacción"
 
-#: sql_help.c:776 sql_help.c:2585 sql_help.c:2608
+#: sql_help.c:985 sql_help.c:2964 sql_help.c:2988
 msgid "where transaction_mode is one of:"
 msgstr "donde modo_de_transacción es uno de:"
 
-#: sql_help.c:800 sql_help.c:839 sql_help.c:846 sql_help.c:866 sql_help.c:875
-#: sql_help.c:919 sql_help.c:923 sql_help.c:1018 sql_help.c:1418
-#: sql_help.c:1430 sql_help.c:1487 sql_help.c:2118 sql_help.c:2123
-#: sql_help.c:2347 sql_help.c:2352 sql_help.c:2461 sql_help.c:2463
-#: sql_help.c:2489 sql_help.c:2529 sql_help.c:2660 sql_help.c:2662
-#: sql_help.c:2688 sql_help.c:2812 sql_help.c:2814 sql_help.c:2840
+#: sql_help.c:1009 sql_help.c:1060 sql_help.c:1083 sql_help.c:1094
+#: sql_help.c:1139 sql_help.c:1143 sql_help.c:1339 sql_help.c:1676
+#: sql_help.c:1688 sql_help.c:1745 sql_help.c:2429 sql_help.c:2434
+#: sql_help.c:2683 sql_help.c:2688 sql_help.c:2769 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2868 sql_help.c:2907 sql_help.c:3040
+#: sql_help.c:3042 sql_help.c:3071 sql_help.c:3196 sql_help.c:3198
+#: sql_help.c:3227
 msgid "table_name"
 msgstr "nombre_de_tabla"
 
-#: sql_help.c:838 sql_help.c:847 sql_help.c:848 sql_help.c:849 sql_help.c:854
-#: sql_help.c:859 sql_help.c:861 sql_help.c:863 sql_help.c:864 sql_help.c:867
-#: sql_help.c:868 sql_help.c:869 sql_help.c:870 sql_help.c:871 sql_help.c:872
-#: sql_help.c:873 sql_help.c:876 sql_help.c:877
-msgid "object_name"
-msgstr "nombre_de_objeto"
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "nombre_relación"
 
-#: sql_help.c:840 sql_help.c:1119 sql_help.c:1419 sql_help.c:1432
-#: sql_help.c:1451 sql_help.c:1453 sql_help.c:1460 sql_help.c:1488
-#: sql_help.c:1693 sql_help.c:2487 sql_help.c:2686 sql_help.c:2838
+#: sql_help.c:1058 sql_help.c:1340 sql_help.c:1373 sql_help.c:1677
+#: sql_help.c:1690 sql_help.c:1709 sql_help.c:1711 sql_help.c:1718
+#: sql_help.c:1746 sql_help.c:1848 sql_help.c:1968 sql_help.c:2770
+#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
 msgid "column_name"
 msgstr "nombre_de_columna"
 
-#: sql_help.c:841
-msgid "agg_name"
-msgstr "nombre_agg"
-
-#: sql_help.c:842
-msgid "agg_type"
-msgstr "tipo_agg"
-
-#: sql_help.c:843 sql_help.c:994 sql_help.c:998 sql_help.c:1000
-#: sql_help.c:1762
-msgid "source_type"
-msgstr "tipo_fuente"
-
-#: sql_help.c:844 sql_help.c:995 sql_help.c:999 sql_help.c:1001
-#: sql_help.c:1763
-msgid "target_type"
-msgstr "tipo_destino"
-
-#: sql_help.c:865
+#: sql_help.c:1082
 msgid "rule_name"
 msgstr "nombre_regla"
 
-#: sql_help.c:878
+#: sql_help.c:1097
 msgid "text"
 msgstr "texto"
 
-#: sql_help.c:893 sql_help.c:2231 sql_help.c:2393
+#: sql_help.c:1112 sql_help.c:2567 sql_help.c:2729
 msgid "transaction_id"
 msgstr "id_de_transacción"
 
-#: sql_help.c:921 sql_help.c:926 sql_help.c:2180
+#: sql_help.c:1141 sql_help.c:1146 sql_help.c:2493
 msgid "filename"
 msgstr "nombre_de_archivo"
 
-#: sql_help.c:925 sql_help.c:1492 sql_help.c:1694 sql_help.c:1712
-#: sql_help.c:2162
+#: sql_help.c:1145 sql_help.c:1750 sql_help.c:1969 sql_help.c:1987
+#: sql_help.c:2475
 msgid "query"
 msgstr "consulta"
 
-#: sql_help.c:928
+#: sql_help.c:1148 sql_help.c:2335
 msgid "where option can be one of:"
 msgstr "donde opción puede ser una de:"
 
-#: sql_help.c:929
+#: sql_help.c:1149
 msgid "format_name"
 msgstr "nombre_de_formato"
 
-#: sql_help.c:930 sql_help.c:933 sql_help.c:2023 sql_help.c:2024
-#: sql_help.c:2025 sql_help.c:2026
+#: sql_help.c:1150 sql_help.c:1153 sql_help.c:2336 sql_help.c:2337
+#: sql_help.c:2338 sql_help.c:2339
 msgid "boolean"
 msgstr "booleano"
 
-#: sql_help.c:931
+#: sql_help.c:1151
 msgid "delimiter_character"
 msgstr "carácter_delimitador"
 
-#: sql_help.c:932
+#: sql_help.c:1152
 msgid "null_string"
 msgstr "cadena_null"
 
-#: sql_help.c:934
+#: sql_help.c:1154
 msgid "quote_character"
 msgstr " carácter_de_comilla"
 
-#: sql_help.c:935
+#: sql_help.c:1155
 msgid "escape_character"
 msgstr "carácter_de_escape"
 
-#: sql_help.c:963
+#: sql_help.c:1158
+msgid "encoding_name"
+msgstr "nombre_codificación"
+
+#: sql_help.c:1184
 msgid "input_data_type"
 msgstr "tipo_de_dato_entrada"
 
-#: sql_help.c:964 sql_help.c:972
+#: sql_help.c:1185 sql_help.c:1193
 msgid "sfunc"
 msgstr "ftransición"
 
-#: sql_help.c:965 sql_help.c:973
+#: sql_help.c:1186 sql_help.c:1194
 msgid "state_data_type"
 msgstr "tipo_de_dato_de_estado"
 
-#: sql_help.c:966 sql_help.c:974
+#: sql_help.c:1187 sql_help.c:1195
 msgid "ffunc"
 msgstr "ffinal"
 
-#: sql_help.c:967 sql_help.c:975
+#: sql_help.c:1188 sql_help.c:1196
 msgid "initial_condition"
 msgstr "condición_inicial"
 
-#: sql_help.c:968 sql_help.c:976
+#: sql_help.c:1189 sql_help.c:1197
 msgid "sort_operator"
 msgstr "operador_de_ordenamiento"
 
-#: sql_help.c:969
+#: sql_help.c:1190
 msgid "or the old syntax"
 msgstr "o la sintaxis antigua"
 
-#: sql_help.c:971
+#: sql_help.c:1192
 msgid "base_type"
 msgstr "tipo_base"
 
-#: sql_help.c:1017 sql_help.c:1304 sql_help.c:1573
-msgid "event"
-msgstr "evento"
+#: sql_help.c:1236
+msgid "locale"
+msgstr "configuración regional"
 
-#: sql_help.c:1019
-msgid "referenced_table_name"
-msgstr "nombre_tabla_referenciada"
+#: sql_help.c:1237 sql_help.c:1271
+msgid "lc_collate"
+msgstr "lc_collate"
 
-#: sql_help.c:1020 sql_help.c:1306 sql_help.c:1575 sql_help.c:1726
-#: sql_help.c:2450 sql_help.c:2452 sql_help.c:2518 sql_help.c:2520
-#: sql_help.c:2649 sql_help.c:2651 sql_help.c:2726 sql_help.c:2801
-#: sql_help.c:2803
-msgid "condition"
-msgstr "condición"
+#: sql_help.c:1238 sql_help.c:1272
+msgid "lc_ctype"
+msgstr "lc_ctype"
 
-#: sql_help.c:1022 sql_help.c:1577
-msgid "arguments"
-msgstr "argumentos"
+#: sql_help.c:1240
+msgid "existing_collation"
+msgstr "ordenamiento_existente"
 
-#: sql_help.c:1032
+#: sql_help.c:1250
 msgid "source_encoding"
 msgstr "codificación_origen"
 
-#: sql_help.c:1033
+#: sql_help.c:1251
 msgid "dest_encoding"
 msgstr "codificación_destino"
 
-#: sql_help.c:1051 sql_help.c:1527
+#: sql_help.c:1269 sql_help.c:1785
 msgid "template"
 msgstr "plantilla"
 
-#: sql_help.c:1052
+#: sql_help.c:1270
 msgid "encoding"
 msgstr "codificación"
 
-#: sql_help.c:1053
-msgid "lc_collate"
-msgstr "lc_collate"
-
-#: sql_help.c:1054
-msgid "lc_ctype"
-msgstr "lc_ctype"
-
-#: sql_help.c:1055 sql_help.c:1185 sql_help.c:1429 sql_help.c:1438
-#: sql_help.c:1469 sql_help.c:1491
+#: sql_help.c:1273 sql_help.c:1440 sql_help.c:1687 sql_help.c:1695
+#: sql_help.c:1727 sql_help.c:1749
 msgid "tablespace"
 msgstr "tablespace"
 
-#: sql_help.c:1072 sql_help.c:1235 sql_help.c:1420 sql_help.c:1613
-#: sql_help.c:2222
-msgid "data_type"
-msgstr "tipo_de_dato"
-
-#: sql_help.c:1074
+#: sql_help.c:1294
 msgid "constraint"
 msgstr "restricción"
 
-#: sql_help.c:1075
+#: sql_help.c:1295
 msgid "where constraint is:"
 msgstr "donde restricción es:"
 
-#: sql_help.c:1117 sql_help.c:1421 sql_help.c:1433
+#: sql_help.c:1309
+msgid "schema"
+msgstr "esquema"
+
+#: sql_help.c:1310
+msgid "version"
+msgstr "versión"
+
+#: sql_help.c:1311
+msgid "old_version"
+msgstr "versión_antigua"
+
+#: sql_help.c:1371 sql_help.c:1699
 msgid "default_expr"
 msgstr "expr_por_omisión"
 
-#: sql_help.c:1118
+#: sql_help.c:1372
 msgid "rettype"
 msgstr "tipo_ret"
 
-#: sql_help.c:1120
+#: sql_help.c:1374
 msgid "column_type"
 msgstr "tipo_columna"
 
-#: sql_help.c:1121 sql_help.c:1744 sql_help.c:2140 sql_help.c:2369
+#: sql_help.c:1375 sql_help.c:2021 sql_help.c:2451 sql_help.c:2705
 msgid "lang_name"
 msgstr "nombre_lenguaje"
 
-#: sql_help.c:1127
+#: sql_help.c:1381
 msgid "definition"
 msgstr "definición"
 
-#: sql_help.c:1128
+#: sql_help.c:1382
 msgid "obj_file"
 msgstr "archivo_obj"
 
-#: sql_help.c:1129
+#: sql_help.c:1383
 msgid "link_symbol"
 msgstr "símbolo_enlace"
 
-#: sql_help.c:1130
+#: sql_help.c:1384
 msgid "attribute"
 msgstr "atributo"
 
-#: sql_help.c:1165 sql_help.c:1293 sql_help.c:1670
+#: sql_help.c:1419 sql_help.c:1550 sql_help.c:1945
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1179
+#: sql_help.c:1433
 msgid "method"
 msgstr "método"
 
-#: sql_help.c:1182 sql_help.c:1473
+#: sql_help.c:1437 sql_help.c:1731
 msgid "opclass"
 msgstr "clase_de_ops"
 
-#: sql_help.c:1186 sql_help.c:1459
+#: sql_help.c:1441 sql_help.c:1717
 msgid "predicate"
 msgstr "predicado"
 
-#: sql_help.c:1198
+#: sql_help.c:1453
 msgid "call_handler"
 msgstr "manejador_de_llamada"
 
-#: sql_help.c:1199
+#: sql_help.c:1454
 msgid "inline_handler"
 msgstr "manejador_en_línea"
 
-#: sql_help.c:1218
+#: sql_help.c:1455
+msgid "valfunction"
+msgstr "función_val"
+
+#: sql_help.c:1473
 msgid "com_op"
 msgstr "op_conm"
 
-#: sql_help.c:1219
+#: sql_help.c:1474
 msgid "neg_op"
 msgstr "op_neg"
 
-#: sql_help.c:1220
+#: sql_help.c:1475
 msgid "res_proc"
 msgstr "proc_res"
 
-#: sql_help.c:1221
+#: sql_help.c:1476
 msgid "join_proc"
 msgstr "proc_join"
 
-#: sql_help.c:1237
+#: sql_help.c:1492
 msgid "family_name"
 msgstr "nombre_familia"
 
-#: sql_help.c:1247
+#: sql_help.c:1503
 msgid "storage_type"
 msgstr "tipo_almacenamiento"
 
-#: sql_help.c:1307 sql_help.c:1308 sql_help.c:1309
+#: sql_help.c:1561 sql_help.c:1841
+msgid "event"
+msgstr "evento"
+
+#: sql_help.c:1563 sql_help.c:1844 sql_help.c:2003 sql_help.c:2826
+#: sql_help.c:2828 sql_help.c:2896 sql_help.c:2898 sql_help.c:3029
+#: sql_help.c:3031 sql_help.c:3110 sql_help.c:3185 sql_help.c:3187
+msgid "condition"
+msgstr "condición"
+
+#: sql_help.c:1564 sql_help.c:1565 sql_help.c:1566
 msgid "command"
 msgstr "orden"
 
-#: sql_help.c:1320 sql_help.c:1322
+#: sql_help.c:1577 sql_help.c:1579
 msgid "schema_element"
 msgstr "elemento_de_esquema"
 
-#: sql_help.c:1351
+#: sql_help.c:1608
 msgid "server_type"
 msgstr "tipo_de_servidor"
 
-#: sql_help.c:1352
+#: sql_help.c:1609
 msgid "server_version"
 msgstr "versión_de_servidor"
 
-#: sql_help.c:1353 sql_help.c:2130 sql_help.c:2359
+#: sql_help.c:1610 sql_help.c:2441 sql_help.c:2695
 msgid "fdw_name"
 msgstr "nombre_fdw"
 
-#: sql_help.c:1425
+#: sql_help.c:1683
 msgid "like_option"
 msgstr "opción_de_like"
 
-#: sql_help.c:1431
-msgid "type_name"
-msgstr "nombre_de_tipo"
-
-#: sql_help.c:1439
+#: sql_help.c:1696
 msgid "where column_constraint is:"
 msgstr "donde restricción_de_columna es:"
 
-#: sql_help.c:1442 sql_help.c:1443 sql_help.c:1452 sql_help.c:1454
-#: sql_help.c:1458
+#: sql_help.c:1700 sql_help.c:1701 sql_help.c:1710 sql_help.c:1712
+#: sql_help.c:1716
 msgid "index_parameters"
 msgstr "parámetros_de_índice"
 
-#: sql_help.c:1444 sql_help.c:1461
+#: sql_help.c:1702 sql_help.c:1719
 msgid "reftable"
 msgstr "tabla_ref"
 
-#: sql_help.c:1445 sql_help.c:1462
+#: sql_help.c:1703 sql_help.c:1720
 msgid "refcolumn"
 msgstr "columna_ref"
 
-#: sql_help.c:1448
+#: sql_help.c:1706
 msgid "and table_constraint is:"
 msgstr "y restricción_de_tabla es:"
 
-#: sql_help.c:1456
+#: sql_help.c:1714
 msgid "exclude_element"
 msgstr "elemento_de_exclusión"
 
-#: sql_help.c:1465
+#: sql_help.c:1723
 msgid "and like_option is:"
 msgstr "y opción_de_like es:"
 
-#: sql_help.c:1466
+#: sql_help.c:1724
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "parámetros_de_índice en UNIQUE, PRIMARY KEY y EXCLUDE son:"
 
-#: sql_help.c:1470
+#: sql_help.c:1728
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "element_de_exclusión en una restricción EXCLUDE es:"
 
-#: sql_help.c:1502
+#: sql_help.c:1760
 msgid "directory"
 msgstr "directorio"
 
-#: sql_help.c:1514
+#: sql_help.c:1772
 msgid "parser_name"
 msgstr "nombre_de_parser"
 
-#: sql_help.c:1515
+#: sql_help.c:1773
 msgid "source_config"
 msgstr "config_origen"
 
-#: sql_help.c:1544
+#: sql_help.c:1802
 msgid "start_function"
 msgstr "función_inicio"
 
-#: sql_help.c:1545
+#: sql_help.c:1803
 msgid "gettoken_function"
 msgstr "función_gettoken"
 
-#: sql_help.c:1546
+#: sql_help.c:1804
 msgid "end_function"
 msgstr "función_fin"
 
-#: sql_help.c:1547
+#: sql_help.c:1805
 msgid "lextypes_function"
 msgstr "función_lextypes"
 
-#: sql_help.c:1548
+#: sql_help.c:1806
 msgid "headline_function"
 msgstr "función_headline"
 
-#: sql_help.c:1560
+#: sql_help.c:1818
 msgid "init_function"
 msgstr "función_init"
 
-#: sql_help.c:1561
+#: sql_help.c:1819
 msgid "lexize_function"
 msgstr "función_lexize"
 
-#: sql_help.c:1612
-msgid "attribute_name"
-msgstr "nombre_atributo"
+#: sql_help.c:1843
+msgid "referenced_table_name"
+msgstr "nombre_tabla_referenciada"
 
-#: sql_help.c:1615
+#: sql_help.c:1846
+msgid "arguments"
+msgstr "argumentos"
+
+#: sql_help.c:1847
+msgid "where event can be one of:"
+msgstr "donde evento puede ser una de:"
+
+#: sql_help.c:1888 sql_help.c:2785
 msgid "label"
 msgstr "etiqueta"
 
-#: sql_help.c:1617
+#: sql_help.c:1890
 msgid "input_function"
 msgstr "función_entrada"
 
-#: sql_help.c:1618
+#: sql_help.c:1891
 msgid "output_function"
 msgstr "función_salida"
 
-#: sql_help.c:1619
+#: sql_help.c:1892
 msgid "receive_function"
 msgstr "función_receive"
 
-#: sql_help.c:1620
+#: sql_help.c:1893
 msgid "send_function"
 msgstr "función_send"
 
-#: sql_help.c:1621
+#: sql_help.c:1894
 msgid "type_modifier_input_function"
 msgstr "función_entrada_del_modificador_de_tipo"
 
-#: sql_help.c:1622
+#: sql_help.c:1895
 msgid "type_modifier_output_function"
 msgstr "función_salida_del_modificador_de_tipo"
 
-#: sql_help.c:1623
+#: sql_help.c:1896
 msgid "analyze_function"
 msgstr "función_analyze"
 
-#: sql_help.c:1624
+#: sql_help.c:1897
 msgid "internallength"
 msgstr "largo_interno"
 
-#: sql_help.c:1625
+#: sql_help.c:1898
 msgid "alignment"
 msgstr "alineamiento"
 
-#: sql_help.c:1626
+#: sql_help.c:1899
 msgid "storage"
 msgstr "almacenamiento"
 
-#: sql_help.c:1627
+#: sql_help.c:1900
 msgid "like_type"
 msgstr "como_tipo"
 
-#: sql_help.c:1628
+#: sql_help.c:1901
 msgid "category"
 msgstr "categoría"
 
-#: sql_help.c:1629
+#: sql_help.c:1902
 msgid "preferred"
 msgstr "preferido"
 
-#: sql_help.c:1630
+#: sql_help.c:1903
 msgid "default"
 msgstr "valor_por_omisión"
 
-#: sql_help.c:1631
+#: sql_help.c:1904
 msgid "element"
 msgstr "elemento"
 
-#: sql_help.c:1632
+#: sql_help.c:1905
 msgid "delimiter"
 msgstr "delimitador"
 
-#: sql_help.c:1724 sql_help.c:2464 sql_help.c:2467 sql_help.c:2470
-#: sql_help.c:2474 sql_help.c:2663 sql_help.c:2666 sql_help.c:2669
-#: sql_help.c:2673 sql_help.c:2720 sql_help.c:2815 sql_help.c:2818
-#: sql_help.c:2821 sql_help.c:2825
+#: sql_help.c:1906
+msgid "collatable"
+msgstr "ordenable"
+
+#: sql_help.c:1999 sql_help.c:2471 sql_help.c:2821 sql_help.c:2890
+#: sql_help.c:3024 sql_help.c:3102 sql_help.c:3180
+msgid "with_query"
+msgstr "consulta_with"
+
+#: sql_help.c:2001 sql_help.c:2840 sql_help.c:2843 sql_help.c:2846
+#: sql_help.c:2850 sql_help.c:3043 sql_help.c:3046 sql_help.c:3049
+#: sql_help.c:3053 sql_help.c:3104 sql_help.c:3199 sql_help.c:3202
+#: sql_help.c:3205 sql_help.c:3209
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:1725
+#: sql_help.c:2002
 msgid "using_list"
 msgstr "lista_using"
 
-#: sql_help.c:1727 sql_help.c:2054 sql_help.c:2204 sql_help.c:2727
+#: sql_help.c:2004 sql_help.c:2365 sql_help.c:2534 sql_help.c:3111
 msgid "cursor_name"
 msgstr "nombre_de_cursor"
 
-#: sql_help.c:1728 sql_help.c:2163 sql_help.c:2728
+#: sql_help.c:2005 sql_help.c:2476 sql_help.c:3112
 msgid "output_expression"
 msgstr "expresión_de_salida"
 
-#: sql_help.c:1729 sql_help.c:2164 sql_help.c:2448 sql_help.c:2515
-#: sql_help.c:2647 sql_help.c:2729 sql_help.c:2799
+#: sql_help.c:2006 sql_help.c:2477 sql_help.c:2824 sql_help.c:2893
+#: sql_help.c:3027 sql_help.c:3113 sql_help.c:3183
 msgid "output_name"
 msgstr "nombre_de_salida"
 
-#: sql_help.c:1745
+#: sql_help.c:2022
 msgid "code"
 msgstr "código"
 
-#: sql_help.c:2014
+#: sql_help.c:2315
 msgid "parameter"
 msgstr "parámetro"
 
-#: sql_help.c:2027 sql_help.c:2028 sql_help.c:2223
+#: sql_help.c:2333 sql_help.c:2334 sql_help.c:2559
 msgid "statement"
 msgstr "sentencia"
 
-#: sql_help.c:2053 sql_help.c:2203
+#: sql_help.c:2364 sql_help.c:2533
 msgid "direction"
 msgstr "dirección"
 
-#: sql_help.c:2055
+#: sql_help.c:2366 sql_help.c:2535
 msgid "where direction can be empty or one of:"
 msgstr "donde dirección puede ser vacío o uno de:"
 
-#: sql_help.c:2056 sql_help.c:2057 sql_help.c:2058 sql_help.c:2059
-#: sql_help.c:2060 sql_help.c:2458 sql_help.c:2460 sql_help.c:2526
-#: sql_help.c:2528 sql_help.c:2657 sql_help.c:2659 sql_help.c:2758
-#: sql_help.c:2760 sql_help.c:2809 sql_help.c:2811
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2371 sql_help.c:2536 sql_help.c:2537 sql_help.c:2538
+#: sql_help.c:2539 sql_help.c:2540 sql_help.c:2834 sql_help.c:2836
+#: sql_help.c:2904 sql_help.c:2906 sql_help.c:3037 sql_help.c:3039
+#: sql_help.c:3142 sql_help.c:3144 sql_help.c:3193 sql_help.c:3195
 msgid "count"
 msgstr "cantidad"
 
-#: sql_help.c:2125 sql_help.c:2354
+#: sql_help.c:2436 sql_help.c:2690
 msgid "sequence_name"
 msgstr "nombre_secuencia"
 
-#: sql_help.c:2136 sql_help.c:2365
+#: sql_help.c:2447 sql_help.c:2701
 msgid "arg_name"
 msgstr "nombre_arg"
 
-#: sql_help.c:2137 sql_help.c:2366
+#: sql_help.c:2448 sql_help.c:2702
 msgid "arg_type"
 msgstr "tipo_arg"
 
-#: sql_help.c:2142 sql_help.c:2371
+#: sql_help.c:2453 sql_help.c:2707
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:2172 sql_help.c:2212 sql_help.c:2706
+#: sql_help.c:2485 sql_help.c:2548 sql_help.c:3088
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:2194
+#: sql_help.c:2507
 msgid "lockmode"
 msgstr "modo_bloqueo"
 
-#: sql_help.c:2195
+#: sql_help.c:2508
 msgid "where lockmode is one of:"
 msgstr "donde modo_bloqueo es uno de:"
 
-#: sql_help.c:2213
+#: sql_help.c:2549
 msgid "payload"
 msgstr "carga"
 
-#: sql_help.c:2239
+#: sql_help.c:2575
 msgid "old_role"
 msgstr "rol_antiguo"
 
-#: sql_help.c:2240
+#: sql_help.c:2576
 msgid "new_role"
 msgstr "rol_nuevo"
 
-#: sql_help.c:2256 sql_help.c:2401 sql_help.c:2409
+#: sql_help.c:2592 sql_help.c:2737 sql_help.c:2745
 msgid "savepoint_name"
 msgstr "nombre_de_savepoint"
 
-#: sql_help.c:2445 sql_help.c:2512 sql_help.c:2644 sql_help.c:2796
-msgid "with_query"
-msgstr "consulta_with"
+#: sql_help.c:2767
+msgid "provider"
+msgstr "proveedor"
 
-#: sql_help.c:2449 sql_help.c:2480 sql_help.c:2482 sql_help.c:2517
-#: sql_help.c:2648 sql_help.c:2679 sql_help.c:2681 sql_help.c:2800
-#: sql_help.c:2831 sql_help.c:2833
+#: sql_help.c:2825 sql_help.c:2856 sql_help.c:2858 sql_help.c:2895
+#: sql_help.c:3028 sql_help.c:3059 sql_help.c:3061 sql_help.c:3184
+#: sql_help.c:3215 sql_help.c:3217
 msgid "from_item"
 msgstr "item_de_from"
 
-#: sql_help.c:2453 sql_help.c:2521 sql_help.c:2652 sql_help.c:2804
+#: sql_help.c:2829 sql_help.c:2899 sql_help.c:3032 sql_help.c:3188
 msgid "window_name"
 msgstr "nombre_de_ventana"
 
-#: sql_help.c:2454 sql_help.c:2522 sql_help.c:2653 sql_help.c:2805
+#: sql_help.c:2830 sql_help.c:2900 sql_help.c:3033 sql_help.c:3189
 msgid "window_definition"
 msgstr "definición_de_ventana"
 
-#: sql_help.c:2455 sql_help.c:2466 sql_help.c:2488 sql_help.c:2523
-#: sql_help.c:2654 sql_help.c:2665 sql_help.c:2687 sql_help.c:2806
-#: sql_help.c:2817 sql_help.c:2839
+#: sql_help.c:2831 sql_help.c:2842 sql_help.c:2864 sql_help.c:2901
+#: sql_help.c:3034 sql_help.c:3045 sql_help.c:3067 sql_help.c:3190
+#: sql_help.c:3201 sql_help.c:3223
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:2462 sql_help.c:2661 sql_help.c:2813
+#: sql_help.c:2838 sql_help.c:3041 sql_help.c:3197
 msgid "where from_item can be one of:"
 msgstr "donde item_de_from puede ser uno de:"
 
-#: sql_help.c:2465 sql_help.c:2468 sql_help.c:2471 sql_help.c:2475
-#: sql_help.c:2664 sql_help.c:2667 sql_help.c:2670 sql_help.c:2674
-#: sql_help.c:2816 sql_help.c:2819 sql_help.c:2822 sql_help.c:2826
+#: sql_help.c:2841 sql_help.c:2844 sql_help.c:2847 sql_help.c:2851
+#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3050 sql_help.c:3054
+#: sql_help.c:3200 sql_help.c:3203 sql_help.c:3206 sql_help.c:3210
 msgid "column_alias"
 msgstr "alias_de_columna"
 
-#: sql_help.c:2469 sql_help.c:2486 sql_help.c:2490 sql_help.c:2668
-#: sql_help.c:2685 sql_help.c:2689 sql_help.c:2820 sql_help.c:2837
-#: sql_help.c:2841
+#: sql_help.c:2845 sql_help.c:2862 sql_help.c:3048 sql_help.c:3065
+#: sql_help.c:3204 sql_help.c:3221
 msgid "with_query_name"
 msgstr "nombre_consulta_with"
 
-#: sql_help.c:2473 sql_help.c:2478 sql_help.c:2672 sql_help.c:2677
-#: sql_help.c:2824 sql_help.c:2829
+#: sql_help.c:2849 sql_help.c:2854 sql_help.c:3052 sql_help.c:3057
+#: sql_help.c:3208 sql_help.c:3213
 msgid "argument"
 msgstr "argumento"
 
-#: sql_help.c:2476 sql_help.c:2479 sql_help.c:2675 sql_help.c:2678
-#: sql_help.c:2827 sql_help.c:2830
+#: sql_help.c:2852 sql_help.c:2855 sql_help.c:3055 sql_help.c:3058
+#: sql_help.c:3211 sql_help.c:3214
 msgid "column_definition"
 msgstr "definición_de_columna"
 
-#: sql_help.c:2481 sql_help.c:2680 sql_help.c:2832
+#: sql_help.c:2857 sql_help.c:3060 sql_help.c:3216
 msgid "join_type"
 msgstr "tipo_de_join"
 
-#: sql_help.c:2483 sql_help.c:2682 sql_help.c:2834
+#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
 msgid "join_condition"
 msgstr "condición_de_join"
 
-#: sql_help.c:2484 sql_help.c:2683 sql_help.c:2835
+#: sql_help.c:2860 sql_help.c:3063 sql_help.c:3219
 msgid "join_column"
 msgstr "columna_de_join"
 
-#: sql_help.c:2485 sql_help.c:2684 sql_help.c:2836
+#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
 msgid "and with_query is:"
 msgstr "y consulta_with es:"
 
-#: sql_help.c:2516
+#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
+msgid "insert"
+msgstr "insert"
+
+#: sql_help.c:2866 sql_help.c:3069 sql_help.c:3225
+msgid "update"
+msgstr "update"
+
+#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
+msgid "delete"
+msgstr "delete"
+
+#: sql_help.c:2894
 msgid "new_table"
 msgstr "nueva_tabla"
 
-#: sql_help.c:2541
+#: sql_help.c:2919
 msgid "timezone"
 msgstr "huso_horario"
 
-#: sql_help.c:2725
+#: sql_help.c:3109
 msgid "from_list"
 msgstr "lista_from"
 
-#: sql_help.c:2756
+#: sql_help.c:3140
 msgid "sort_expression"
 msgstr "expresión_orden"
 
@@ -3724,78 +4061,27 @@ msgstr "no se pudo cambiar el directorio a «%s»"
 msgid "could not read symbolic link \"%s\""
 msgstr "no se pudo leer el enlace simbólico «%s»"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "el proceso hijo terminó con código de salida %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "el proceso hijo fue terminado por una excepción 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "el proceso hijo fue terminado por una señal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "el proceso hijo fue terminado por una señal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
-
-#~ msgid "You are not connected.\n"
-#~ msgstr "No está conectado.\n"
-
-#~ msgid ""
-#~ "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
-#~ "at port \"%s\".\n"
-#~ msgstr ""
-#~ "Está conectado a la base de datos «%s» como el usuario «%s» a través del "
-#~ "socket en «%s» port «%s».\n"
-
-#~ msgid ""
-#~ "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at "
-#~ "port \"%s\".\n"
-#~ msgstr ""
-#~ "Está conectado a la base de datos «%s» como el usuario «%s» en el servidor «%"
-#~ "s» port «%s».\n"
-
-#~ msgid "invalid line number: %s\n"
-#~ msgstr "número de línea no válido: %s\n"
-
-#~ msgid "function name is required\n"
-#~ msgstr "el nombre de la función es requerido\n"
-
-#~ msgid ""
-#~ "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s"
-#~ "\" at port \"%s\".\n"
-#~ msgstr ""
-#~ "Ahora está conectado a la base de datos «%s» como el usuario «%s» a través "
-#~ "del socket en «%s» port «%s».\n"
-
-#~ msgid ""
-#~ "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
-#~ "port \"%s\".\n"
-#~ msgstr ""
-#~ "Ahora está conectado a la base de datos «%s» como el usuario «%s» en el "
-#~ "servidor «%s» port «%s».\n"
-
-#~ msgid ""
-#~ "EDITOR_LINENUMBER_SWITCH variable must be set to specify a line number\n"
-#~ msgstr ""
-#~ "la variable EDITOR_LINENUMBER_SWITCH debe estar definida para poder "
-#~ "especificar un número de línea\n"
-
-#~ msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
-#~ msgstr "  \\sf[+] FUNCIÓN    mostrar la definición de una función\n"
-
-#~ msgid ""
-#~ "  \\conninfo              display information about current connection\n"
-#~ msgstr ""
-#~ "  \\conninfo      despliega la información sobre la conexión actual\n"
diff --git a/src/bin/psql/po/fr.po b/src/bin/psql/po/fr.po
index 0d72a6448d852..b9da772dfb5fb 100644
--- a/src/bin/psql/po/fr.po
+++ b/src/bin/psql/po/fr.po
@@ -11,114 +11,139 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-09 15:59+0000\n"
-"PO-Revision-Date: 2010-09-09 18:24+0100\n"
+"POT-Creation-Date: 2011-09-05 18:55+0000\n"
+"PO-Revision-Date: 2011-09-05 22:28+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: command.c:112
+#: command.c:113
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Commande \\%s invalide. Essayez \\? pour l'aide-mémoire.\n"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "commande \\%s invalide\n"
 
-#: command.c:125
+#: command.c:126
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s : argument « %s » supplémentaire ignoré\n"
 
-#: command.c:267
+#: command.c:268
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "n'a pas pu obtenir le répertoire de l'utilisateur : %s\n"
 
-#: command.c:283
+#: command.c:284
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s : n'a pas pu accéder au répertoire « %s » : %s\n"
 
-#: command.c:316
+#: command.c:305
+#: common.c:493
+#: common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "Vous n'êtes pas connecté à une base de données.\n"
+
+#: command.c:312
+#, c-format
+msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
+msgstr "Vous êtes connecté à la base de données « %s » en tant qu'utilisateur « %s » via le socket dans « %s » via le port « %s ».\n"
+
+#: command.c:315
+#, c-format
+msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
+msgstr "Vous êtes connecté à la base de données « %s » en tant qu'utilisateur « %s » sur l'hôte « %s » via le port « %s ».\n"
+
+#: command.c:339
 #: common.c:940
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Temps : %.3f ms\n"
 
-#: command.c:485
-#: command.c:513
-#: command.c:1064
+#: command.c:524
+#: command.c:588
+#: command.c:1285
 msgid "no query buffer\n"
 msgstr "aucun tampon de requête\n"
 
-#: command.c:555
+#: command.c:557
+#: command.c:2507
+#, c-format
+msgid "invalid line number: %s\n"
+msgstr "numéro de ligne invalide : %s\n"
+
+#: command.c:662
 msgid "No changes"
 msgstr "Aucun changement"
 
-#: command.c:609
+#: command.c:716
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s : nom d'encodage invalide ou procédure de conversion introuvable\n"
 
-#: command.c:688
-#: command.c:722
-#: command.c:736
-#: command.c:753
-#: command.c:857
-#: command.c:907
-#: command.c:1044
-#: command.c:1075
+#: command.c:795
+#: command.c:829
+#: command.c:843
+#: command.c:860
+#: command.c:964
+#: command.c:1014
+#: command.c:1265
+#: command.c:1296
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s : argument requis manquant\n"
 
-#: command.c:785
+#: command.c:892
 msgid "Query buffer is empty."
 msgstr "Le tampon de requête est vide."
 
-#: command.c:795
+#: command.c:902
 msgid "Enter new password: "
 msgstr "Saisissez le nouveau mot de passe :"
 
-#: command.c:796
+#: command.c:903
 msgid "Enter it again: "
 msgstr "Saisissez-le à nouveau :"
 
-#: command.c:800
+#: command.c:907
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Les mots de passe ne sont pas identiques.\n"
 
-#: command.c:818
+#: command.c:925
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Échec du chiffrement du mot de passe.\n"
 
-#: command.c:886
-#: command.c:987
-#: command.c:1049
+#: command.c:993
+#: command.c:1094
+#: command.c:1270
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s : erreur\n"
 
-#: command.c:927
+#: command.c:1034
 msgid "Query buffer reset (cleared)."
 msgstr "Le tampon de requête a été effacé."
 
-#: command.c:940
+#: command.c:1047
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Historique sauvegardé dans le fichier « %s/%s ».\n"
 
-#: command.c:978
+#: command.c:1085
 #: common.c:52
 #: common.c:66
+#: common.c:90
 #: input.c:209
 #: mainloop.c:72
 #: mainloop.c:234
@@ -128,24 +153,28 @@ msgstr "Historique sauvegard
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
 
-#: command.c:1029
+#: command.c:1115
+msgid "function name is required\n"
+msgstr "le nom de la fonction est requis\n"
+
+#: command.c:1250
 msgid "Timing is on."
 msgstr "Chronométrage activé."
 
-#: command.c:1031
+#: command.c:1252
 msgid "Timing is off."
 msgstr "Chronométrage désactivé."
 
-#: command.c:1092
-#: command.c:1112
-#: command.c:1633
-#: command.c:1640
-#: command.c:1649
-#: command.c:1659
-#: command.c:1668
-#: command.c:1682
-#: command.c:1699
-#: command.c:1737
+#: command.c:1313
+#: command.c:1333
+#: command.c:1895
+#: command.c:1902
+#: command.c:1911
+#: command.c:1921
+#: command.c:1930
+#: command.c:1944
+#: command.c:1961
+#: command.c:1999
 #: common.c:137
 #: copy.c:283
 #: copy.c:361
@@ -153,20 +182,20 @@ msgstr "Chronom
 msgid "%s: %s\n"
 msgstr "%s : %s\n"
 
-#: command.c:1194
+#: command.c:1415
 #: startup.c:159
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: command.c:1201
+#: command.c:1422
 #: startup.c:162
 #: startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "Mot de passe pour l'utilisateur %s : "
 
-#: command.c:1318
-#: command.c:2207
+#: command.c:1541
+#: command.c:2541
 #: common.c:183
 #: common.c:460
 #: common.c:525
@@ -175,46 +204,41 @@ msgstr "Mot de passe pour l'utilisateur %s : "
 #: common.c:925
 #: copy.c:432
 #: copy.c:477
-#: copy.c:606
+#: copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1322
+#: command.c:1545
 msgid "Previous connection kept\n"
 msgstr "Connexion précédente conservée\n"
 
-#: command.c:1326
+#: command.c:1549
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect : %s"
 
-#: command.c:1350
+#: command.c:1582
 #, c-format
-msgid "You are now connected to database \"%s\""
-msgstr "Vous êtes maintenant connecté à la base de données « %s »"
+msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
+msgstr "Vous êtes maintenant connecté à la base de données « %s » en tant qu'utilisateur « %s » via le socket dans « %s » via le port « %s ».\n"
 
-#: command.c:1353
+#: command.c:1585
 #, c-format
-msgid " on host \"%s\""
-msgstr " sur l'hôte « %s »"
+msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
+msgstr "Vous êtes maintenant connecté à la base de données « %s » en tant qu'utilisateur « %s » sur l'hôte « %s » via le port « %s ».\n"
 
-#: command.c:1356
+#: command.c:1589
 #, c-format
-msgid " at port \"%s\""
-msgstr " sur le port « %s »"
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr "Vous êtes maintenant connecté à la base de données « %s » en tant qu'utilisateur « %s ».\n"
 
-#: command.c:1359
-#, c-format
-msgid " as user \"%s\""
-msgstr " comme utilisateur « %s »"
-
-#: command.c:1394
+#: command.c:1623
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, serveur %s)\n"
 
-#: command.c:1402
+#: command.c:1631
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -223,17 +247,17 @@ msgstr ""
 "ATTENTION : %s version %d.%d, version du serveur %d.%d.\n"
 "         Certaines fonctionnalités de psql pourraient ne pas fonctionner.\n"
 
-#: command.c:1432
+#: command.c:1661
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "Connexion SSL (chiffrement : %s, bits : %i)\n"
 
-#: command.c:1442
+#: command.c:1671
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "Connexion SSL (chiffrement inconnu)\n"
 
-#: command.c:1463
+#: command.c:1692
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -245,147 +269,153 @@ msgstr ""
 "            Voir la section « Notes aux utilisateurs de Windows » de la page\n"
 "            référence de psql pour les détails.\n"
 
-#: command.c:1552
+#: command.c:1776
+msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number\n"
+msgstr ""
+"la variable d'environnement EDITOR_LINENUMBER_SWITCH doit être configurée\n"
+"pour spécifier un numéro de ligne\n"
+
+#: command.c:1813
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "n'a pas pu exécuter l'éditeur « %s »\n"
 
-#: command.c:1554
+#: command.c:1815
 msgid "could not start /bin/sh\n"
 msgstr "n'a pas pu exécuter /bin/sh\n"
 
-#: command.c:1591
+#: command.c:1853
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "n'a pas pu localiser le répertoire temporaire : %s"
+msgid "could not locate temporary directory: %s\n"
+msgstr "n'a pas pu localiser le répertoire temporaire : %s\n"
 
-#: command.c:1618
+#: command.c:1880
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le fichier temporaire « %s » : %s\n"
 
-#: command.c:1839
+#: command.c:2110
 msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n"
 msgstr ""
 "\\pset : les formats autorisés sont unaligned, aligned, wrapped, html, latex,\n"
 "troff-ms\n"
 
-#: command.c:1844
+#: command.c:2115
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Le format de sortie est %s.\n"
 
-#: command.c:1860
+#: command.c:2131
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: les styles de lignes autorisés sont ascii, old-ascii, unicode\n"
 
-#: command.c:1865
+#: command.c:2136
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Le style de ligne est %s.\n"
 
-#: command.c:1876
+#: command.c:2147
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Le style de bordure est %d.\n"
 
-#: command.c:1888
+#: command.c:2159
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Affichage étendu activé.\n"
 
-#: command.c:1889
+#: command.c:2160
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Affichage étendu désactivé.\n"
 
-#: command.c:1902
+#: command.c:2173
 msgid "Showing locale-adjusted numeric output."
 msgstr "Affichage de la sortie numérique adaptée à la locale."
 
-#: command.c:1904
+#: command.c:2175
 msgid "Locale-adjusted numeric output is off."
 msgstr "L'affichage de la sortie numérique adaptée à la locale est désactivé."
 
-#: command.c:1917
+#: command.c:2188
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "L'affichage de null est « %s ».\n"
 
-#: command.c:1929
+#: command.c:2200
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Le séparateur de champs est « %s ».\n"
 
-#: command.c:1943
+#: command.c:2214
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "Le séparateur d'enregistrements est <saut de ligne>."
 
-#: command.c:1945
+#: command.c:2216
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Le séparateur d'enregistrements est « %s ».\n"
 
-#: command.c:1959
+#: command.c:2230
 msgid "Showing only tuples."
 msgstr "Affichage des tuples seuls."
 
-#: command.c:1961
+#: command.c:2232
 msgid "Tuples only is off."
 msgstr "L'affichage des tuples seuls est désactivé."
 
-#: command.c:1977
+#: command.c:2248
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Le titre est « %s ».\n"
 
-#: command.c:1979
+#: command.c:2250
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Le titre n'est pas défini.\n"
 
-#: command.c:1995
+#: command.c:2266
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "L'attribut de la table est « %s ».\n"
 
-#: command.c:1997
+#: command.c:2268
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Les attributs de la table ne sont pas définis.\n"
 
-#: command.c:2018
+#: command.c:2289
 msgid "Pager is used for long output."
 msgstr "Le pagineur est utilisé pour les affichages importants."
 
-#: command.c:2020
+#: command.c:2291
 msgid "Pager is always used."
 msgstr "Le pagineur est toujours utilisé."
 
-#: command.c:2022
+#: command.c:2293
 msgid "Pager usage is off."
 msgstr "Le pagineur n'est pas utilisé."
 
-#: command.c:2036
+#: command.c:2307
 msgid "Default footer is on."
 msgstr "Le bas de page pas défaut est activé."
 
-#: command.c:2038
+#: command.c:2309
 msgid "Default footer is off."
 msgstr "Le bas de page par défaut est désactivé."
 
-#: command.c:2049
+#: command.c:2320
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "La largeur cible pour le format « wrapped » est %d.\n"
 
-#: command.c:2054
+#: command.c:2325
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset : option inconnue : %s\n"
 
-#: command.c:2108
+#: command.c:2379
 msgid "\\!: failed\n"
 msgstr "\\! : échec\n"
 
@@ -394,10 +424,6 @@ msgstr "\\! : 
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s : pg_strdup : ne peut pas dupliquer le pointeur null (erreur interne)\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "mémoire épuisée"
-
 #: common.c:343
 msgid "connection to server was lost\n"
 msgstr "la connexion au serveur a été perdue\n"
@@ -414,11 +440,6 @@ msgstr "
 msgid "Succeeded.\n"
 msgstr "Succès.\n"
 
-#: common.c:493
-#: common.c:773
-msgid "You are currently not connected to a database.\n"
-msgstr "Vous n'êtes pas connecté à une base de données.\n"
-
 #: common.c:499
 #: common.c:506
 #: common.c:799
@@ -522,24 +543,24 @@ msgstr ""
 "Saisissez les données à copier suivies d'un saut de ligne.\n"
 "Terminez avec un antislash et un point seuls sur une ligne."
 
-#: copy.c:599
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "annulé du fait d'une erreur de lecture"
 
-#: help.c:52
+#: help.c:48
 msgid "on"
 msgstr "activé"
 
-#: help.c:52
+#: help.c:48
 msgid "off"
 msgstr "désactivé"
 
-#: help.c:74
+#: help.c:70
 #, c-format
 msgid "could not get current user name: %s\n"
 msgstr "n'a pas pu obtenir le nom d'utilisateur courant : %s\n"
 
-#: help.c:86
+#: help.c:82
 #, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
@@ -548,12 +569,12 @@ msgstr ""
 "psql est l'interface interactive de PostgreSQL.\n"
 "\n"
 
-#: help.c:87
+#: help.c:83
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: help.c:88
+#: help.c:84
 #, c-format
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
@@ -562,19 +583,19 @@ msgstr ""
 "  psql [OPTIONS]... [NOM_BASE [NOM_UTILISATEUR]]\n"
 "\n"
 
-#: help.c:90
+#: help.c:86
 #, c-format
 msgid "General options:\n"
 msgstr "Options générales :\n"
 
-#: help.c:95
+#: help.c:91
 #, c-format
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr ""
 "  -c, --command=COMMANDE\n"
 "                  exécute une commande unique (SQL ou interne), puis quitte\n"
 
-#: help.c:96
+#: help.c:92
 #, c-format
 msgid "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
@@ -582,19 +603,19 @@ msgstr ""
 "                  indique le nom de la base de données à laquelle se\n"
 "                  connecter (par défaut : « %s »)\n"
 
-#: help.c:97
+#: help.c:93
 #, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr ""
 "  -f, --file=FICHIER\n"
 "                  exécute les commandes du fichier, puis quitte\n"
 
-#: help.c:98
+#: help.c:94
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list      affiche les bases de données disponibles, puis quitte\n"
 
-#: help.c:99
+#: help.c:95
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
@@ -603,12 +624,12 @@ msgstr ""
 "  -v, --set, --variable NOM=VALEUR\n"
 "                  initialise la variable psql NOM à VALEUR\n"
 
-#: help.c:101
+#: help.c:97
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc ne lit pas le fichier de démarrage (~/.psqlrc)\n"
 
-#: help.c:102
+#: help.c:98
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -617,17 +638,17 @@ msgstr ""
 "  -1 (« un »), --single-transaction\n"
 "                  exécute un fichier de commande dans une transaction unique\n"
 
-#: help.c:104
+#: help.c:100
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help          affiche cette aide, puis quitte\n"
 
-#: help.c:105
+#: help.c:101
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version       affiche la version, puis quitte\n"
 
-#: help.c:107
+#: help.c:103
 #, c-format
 msgid ""
 "\n"
@@ -636,33 +657,33 @@ msgstr ""
 "\n"
 "Options d'entrée/sortie :\n"
 
-#: help.c:108
+#: help.c:104
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all  affiche les lignes du script\n"
 
-#: help.c:109
+#: help.c:105
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr ""
 "  -e, --echo-queries\n"
 "                  affiche les commandes envoyées au serveur\n"
 
-#: help.c:110
+#: help.c:106
 #, c-format
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr ""
 "  -E, --echo-hidden\n"
 "                  affiche les requêtes engendrées par les commandes internes\n"
 
-#: help.c:111
+#: help.c:107
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr ""
 "  -L, --log-file=FICHIER\n"
 "                  envoie les traces dans le fichier\n"
 
-#: help.c:112
+#: help.c:108
 #, c-format
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
@@ -670,7 +691,7 @@ msgstr ""
 "                  désactive l'édition avancée de la ligne de commande\n"
 "                  (readline)\n"
 
-#: help.c:113
+#: help.c:109
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
@@ -678,14 +699,14 @@ msgstr ""
 "                  écrit les résultats des requêtes dans un fichier (ou\n"
 "                  |tube)\n"
 
-#: help.c:114
+#: help.c:110
 #, c-format
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet     s'exécute silencieusement (pas de messages, uniquement le\n"
 "                  résultat des requêtes)\n"
 
-#: help.c:115
+#: help.c:111
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
@@ -693,7 +714,7 @@ msgstr ""
 "                  active le mode étape par étape (confirmation pour chaque\n"
 "                  requête)\n"
 
-#: help.c:116
+#: help.c:112
 #, c-format
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr ""
@@ -701,7 +722,7 @@ msgstr ""
 "                  active le mode ligne par ligne (EOL termine la commande\n"
 "                  SQL)\n"
 
-#: help.c:118
+#: help.c:114
 #, c-format
 msgid ""
 "\n"
@@ -710,14 +731,14 @@ msgstr ""
 "\n"
 "Options de formattage de la sortie :\n"
 
-#: help.c:119
+#: help.c:115
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr ""
 "  -A, --no-align  active le mode d'affichage non aligné des tables (-P\n"
 "                  format=unaligned)\n"
 
-#: help.c:120
+#: help.c:116
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -727,12 +748,12 @@ msgstr ""
 "                  initialise le séparateur de champs (par défaut : « %s »)\n"
 "                  (-P fieldsep=)\n"
 
-#: help.c:123
+#: help.c:119
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html      active le mode d'affichage HTML des tables (-P                  format=html)\n"
 
-#: help.c:124
+#: help.c:120
 #, c-format
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr ""
@@ -740,7 +761,7 @@ msgstr ""
 "                  initialise l'option d'impression VAR à ARG (voir la\n"
 "                  commande \\pset)\n"
 
-#: help.c:125
+#: help.c:121
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -750,14 +771,14 @@ msgstr ""
 "                  initialise le séparateur d'enregistrements (par défaut :\n"
 "                  saut de ligne) (-P recordsep=)\n"
 
-#: help.c:127
+#: help.c:123
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr ""
 "  -t, --tuples-only\n"
 "                  affiche seulement les lignes (-P tuples_only)\n"
 
-#: help.c:128
+#: help.c:124
 #, c-format
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr ""
@@ -765,12 +786,12 @@ msgstr ""
 "                  initialise les attributs des balises HTML de tableau\n"
 "                  (largeur, bordure) (-P tableattr=)\n"
 
-#: help.c:129
+#: help.c:125
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded  active l'affichage étendu des tables (-P expanded)\n"
 
-#: help.c:131
+#: help.c:127
 #, c-format
 msgid ""
 "\n"
@@ -779,25 +800,25 @@ msgstr ""
 "\n"
 "Options de connexion :\n"
 
-#: help.c:134
+#: help.c:130
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory (default: \"%s\")\n"
 msgstr ""
 "  -h, --host=HOTE nom d'hôte du serveur de la base de données ou répertoire\n"
 "                  de la socket (par défaut : %s)\n"
 
-#: help.c:135
+#: help.c:131
 msgid "local socket"
 msgstr "socket locale"
 
-#: help.c:138
+#: help.c:134
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr ""
 "  -p, --port=PORT port du serveur de la base de données (par défaut :\n"
 "                  « %s »)\n"
 
-#: help.c:144
+#: help.c:140
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
@@ -805,21 +826,21 @@ msgstr ""
 "                  nom d'utilisateur de la base de données (par défaut :\n"
 "                  « %s »)\n"
 
-#: help.c:145
+#: help.c:141
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr ""
 "  -w, --no-password\n"
 "                  ne demande jamais un mot de passe\n"
 
-#: help.c:146
+#: help.c:142
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr ""
 "  -W, --password  force la demande du mot de passe (devrait survenir\n"
 "                  automatiquement)\n"
 
-#: help.c:148
+#: help.c:144
 #, c-format
 msgid ""
 "\n"
@@ -834,334 +855,364 @@ msgstr ""
 "de la documentation de PostgreSQL.\n"
 "\n"
 
-#: help.c:151
+#: help.c:147
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Rapportez les bogues à <pgsql-bugs@postgresql.org>.\n"
 
-#: help.c:169
+#: help.c:165
 #, c-format
 msgid "General\n"
 msgstr "Général\n"
 
-#: help.c:170
+#: help.c:166
 #, c-format
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
 "  \\copyright           affiche les conditions d'utilisation et de\n"
 "                       distribution de PostgreSQL\n"
 
-#: help.c:171
+#: help.c:167
 #, c-format
 msgid "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
 msgstr ""
 "  \\g [FICHIER] ou ;    envoie le tampon de requêtes au serveur (et les\n"
 "                       résultats au fichier ou |tube)\n"
 
-#: help.c:172
+#: help.c:168
 #, c-format
 msgid "  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"
 msgstr ""
 "  \\h [NOM]             aide-mémoire pour les commandes SQL, * pour toutes\n"
 "                       les commandes\n"
 
-#: help.c:173
+#: help.c:169
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                   quitte psql\n"
 
-#: help.c:176
+#: help.c:172
 #, c-format
 msgid "Query Buffer\n"
 msgstr "Tampon de requête\n"
 
-#: help.c:177
+#: help.c:173
 #, c-format
-msgid "  \\e [FILE]              edit the query buffer (or file) with external editor\n"
+msgid "  \\e [FILE] [LINE]       edit the query buffer (or file) with external editor\n"
 msgstr ""
-"  \\e [FICHIER]         édite le tampon de requête ou le fichier avec un\n"
+"  \\e [FICHIER] [LIGNE] édite le tampon de requête ou le fichier avec un\n"
 "                        éditeur externe\n"
 
-#: help.c:178
+#: help.c:174
 #, c-format
-msgid "  \\ef [FUNCNAME]         edit function definition with external editor\n"
+msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr ""
-"  \\ef [FONCTION]       édite la définition de fonction avec un éditeur\n"
+"  \\ef [FONCTION [LIGNE]] édite la définition de fonction avec un éditeur\n"
 "                        externe\n"
 
-#: help.c:179
+#: help.c:175
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                   affiche le contenu du tampon de requête\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                   efface le tampon de requêtes\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr ""
 "  \\s [FICHIER]         affiche l'historique ou le sauvegarde dans un\n"
 "                       fichier\n"
 
-#: help.c:184
+#: help.c:180
 #, c-format
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr ""
 "  \\w [FICHIER]         écrit le contenu du tampon de requêtes dans un\n"
 "                       fichier\n"
 
-#: help.c:187
+#: help.c:183
 #, c-format
 msgid "Input/Output\n"
 msgstr "Entrée/Sortie\n"
 
-#: help.c:188
+#: help.c:184
 #, c-format
 msgid "  \\copy ...              perform SQL COPY with data stream to the client host\n"
 msgstr ""
 "  \\copy ...            exécute SQL COPY avec le flux de données dirigé vers\n"
 "                       l'hôte client\n"
 
-#: help.c:189
+#: help.c:185
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr "  \\echo [TEXTE]        écrit un texte sur la sortie standard\n"
 
-#: help.c:190
+#: help.c:186
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i FICHIER           exécute les commandes du fichier\n"
 
-#: help.c:191
+#: help.c:187
 #, c-format
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr ""
 "  \\o [FICHIER]         envoie les résultats de la requête vers un fichier\n"
 "                       ou un |tube\n"
 
-#: help.c:192
+#: help.c:188
 #, c-format
 msgid "  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr ""
 "  \\qecho [TEXTE]       écrit un texte sur la sortie des résultats des\n"
 "                       requêtes (voir \\o)\n"
 
-#: help.c:195
+#: help.c:191
 #, c-format
 msgid "Informational\n"
 msgstr "Informations\n"
 
-#: help.c:196
+#: help.c:192
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr "  (options : S = affiche les objets systèmes, + = informations supplémentaires)\n"
 
-#: help.c:197
+#: help.c:193
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
 msgstr "  \\d[S+]               affiche la liste des tables, vues et séquences\n"
 
-#: help.c:198
+#: help.c:194
 #, c-format
 msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
 msgstr ""
 "  \\d[S+] NOM           affiche la description de la table, de la vue,\n"
 "                       de la séquence ou de l'index\n"
 
-#: help.c:199
+#: help.c:195
 #, c-format
 msgid "  \\da[S]  [PATTERN]      list aggregates\n"
 msgstr "  \\da[+] [MODÈLE]      affiche les aggrégats\n"
 
-#: help.c:200
+#: help.c:196
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
 msgstr "  \\db[+] [MODÈLE]      affiche la liste des tablespaces\n"
 
-#: help.c:201
+#: help.c:197
 #, c-format
 msgid "  \\dc[S]  [PATTERN]      list conversions\n"
 msgstr "  \\dc[S] [MODÈLE]      affiche la liste des conversions\n"
 
-#: help.c:202
+#: help.c:198
 #, c-format
 msgid "  \\dC     [PATTERN]      list casts\n"
 msgstr "  \\dC    [MODÈLE]      affiche la liste des transtypages\n"
 
-#: help.c:203
+#: help.c:199
 #, c-format
 msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
 msgstr "  \\dd[S] [MODÈLE]      affiche les commentaires de l'objet\n"
 
-#: help.c:204
+#: help.c:200
 #, c-format
 msgid "  \\ddp    [PATTERN]      list default privileges\n"
 msgstr "  \\ddp   [MODÈLE]      affiche les droits par défaut\n"
 
-#: help.c:205
+#: help.c:201
 #, c-format
 msgid "  \\dD[S]  [PATTERN]      list domains\n"
 msgstr "  \\dD[S] [MODÈLE]      affiche la liste des domaines\n"
 
-#: help.c:206
+#: help.c:202
+#, c-format
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [MODÈLE]     affiche la liste des tables distantes\n"
+
+#: help.c:203
 #, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
 msgstr "  \\des[+] [MODÈLE]     affiche la liste des serveurs distants\n"
 
-#: help.c:207
+#: help.c:204
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
 msgstr "  \\deu[+] [MODÈLE]     affiche la liste des correspondances utilisateurs\n"
 
-#: help.c:208
+#: help.c:205
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
 msgstr "  \\dew[+] [MODÈLE]     affiche la liste des wrappers de données distantes\n"
 
-#: help.c:209
+#: help.c:206
 #, c-format
 msgid "  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
 msgstr ""
 "  \\df[antw][S+] [PATRN] affiche la liste des fonctions\n"
 "                        [seulement agg/normal/trigger/window]\n"
 
-#: help.c:210
+#: help.c:207
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
 msgstr ""
 "  \\dF[+] [MODÈLE]      affiche la liste des configurations de la recherche\n"
 "                        plein texte\n"
 
-#: help.c:211
+#: help.c:208
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr ""
 "  \\dFd[+] [MODÈLE]     affiche la liste des dictionnaires de la recherche de\n"
 "                        texte\n"
 
-#: help.c:212
+#: help.c:209
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr ""
 "  \\dFp[+] [MODÈLE]        affiche la liste des analyseurs de la recherche de\n"
 "                       texte\n"
 
-#: help.c:213
+#: help.c:210
 #, c-format
 msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
 msgstr ""
 "  \\dFt[+] [MODÈLE]     affiche la liste des modèles de la recherche de\n"
 "                        texte\n"
 
-#: help.c:214
+#: help.c:211
 #, c-format
-msgid "  \\dg[+]  [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg[+]  [MODÈLE]     affiche la liste des groupes\n"
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]  [MODÈLE]     affiche la liste des rôles\n"
 
-#: help.c:215
+#: help.c:212
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [MODÈLE]     affiche la liste des index\n"
 
-#: help.c:216
+#: help.c:213
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
 msgstr ""
 "  \\dl                  affiche la liste des « Large Objects », identique à\n"
 "                        \\lo_list\n"
 
-#: help.c:217
+#: help.c:214
 #, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
-msgstr "  \\dn[+]  [MODÈLE]     affiche la liste des schémas\n"
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [MODÈLE]     affiche la liste des langages procéduraux\n"
 
-#: help.c:218
+#: help.c:215
+#, c-format
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
+msgstr "  \\dn[S+]  [MODÈLE]    affiche la liste des schémas\n"
+
+#: help.c:216
 #, c-format
 msgid "  \\do[S]  [PATTERN]      list operators\n"
 msgstr "  \\do[S]  [MODÈLE]     affiche la liste des opérateurs\n"
 
-#: help.c:219
+#: help.c:217
+#, c-format
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dO[S+] [MODÈLE]     affiche la liste des collationnements\n"
+
+#: help.c:218
 #, c-format
 msgid "  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
 msgstr ""
 "  \\dp     [MODÈLE]     affiche la liste des droits d'accès aux tables,\n"
 "                        vues, séquences\n"
 
-#: help.c:220
+#: help.c:219
 #, c-format
 msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
 msgstr "  \\drds [MODEL1 [MODEL2]] liste la configuration utilisateur par base de                           données\n"
 
-#: help.c:221
+#: help.c:220
 #, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
 msgstr "  \\ds[S+] [MODÈLE]     affiche la liste des séquences\n"
 
-#: help.c:222
+#: help.c:221
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
 msgstr "  \\dt[S+] [MODÈLE]     affiche la liste des tables\n"
 
-#: help.c:223
+#: help.c:222
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
 msgstr "  \\dT[S+] [MODÈLE]     affiche la liste des types de données\n"
 
-#: help.c:224
+#: help.c:223
 #, c-format
-msgid "  \\du[+]  [PATTERN]      list roles (users)\n"
+msgid "  \\du[+]  [PATTERN]      list roles\n"
 msgstr "  \\du[+]  [MODÈLE]     affiche la liste des rôles (utilisateurs)\n"
 
-#: help.c:225
+#: help.c:224
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
 msgstr "  \\dv[S+] [MODÈLE]     affiche la liste des vues\n"
 
+#: help.c:225
+#, c-format
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dE[S+] [MODÈLE]     affiche la liste des tables distantes\n"
+
 #: help.c:226
 #, c-format
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[S] [MODÈLE]      affiche la liste des extensions\n"
+
+#: help.c:227
+#, c-format
 msgid "  \\l[+]                  list all databases\n"
 msgstr "  \\l[+]                affiche la liste des bases de données\n"
 
-#: help.c:227
+#: help.c:228
+#, c-format
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf [FONCTION]       édite la définition d'une fonction\n"
+
+#: help.c:229
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [MODÈLE]     identique à \\dp\n"
 
-#: help.c:230
+#: help.c:232
 #, c-format
 msgid "Formatting\n"
 msgstr "Formatage\n"
 
-#: help.c:231
+#: help.c:233
 #, c-format
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a                   bascule entre les modes de sortie alignée et non\n"
 "                        alignée\n"
 
-#: help.c:232
+#: help.c:234
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [CHAÎNE]          initialise le titre d'une table, ou le désactive en\n"
 "                        l'absence d'argument\n"
 
-#: help.c:233
+#: help.c:235
 #, c-format
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr ""
 "  \\f [CHAÎNE]          affiche ou initialise le séparateur de champ pour\n"
 "                        une sortie non alignée des requêtes\n"
 
-#: help.c:234
+#: help.c:236
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                   bascule le mode de sortie HTML (actuellement %s)\n"
 
-#: help.c:236
+#: help.c:238
 #, c-format
 msgid ""
 "  \\pset NAME [VALUE]     set table output option\n"
@@ -1173,29 +1224,29 @@ msgstr ""
 "                                 null|numericlocale|recordsep|tuples_only|\n"
 "                                 title|tableattr|pager})\n"
 
-#: help.c:239
+#: help.c:241
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t                   affiche uniquement les lignes (actuellement %s)\n"
 
-#: help.c:241
+#: help.c:243
 #, c-format
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 "  \\T [CHAÎNE]          initialise les attributs HTML de la balise <table>,\n"
 "                        ou l'annule en l'absence d'argument\n"
 
-#: help.c:242
+#: help.c:244
 #, c-format
 msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
 msgstr "  \\x                   bascule l'affichage étendu (actuellement %s)\n"
 
-#: help.c:246
+#: help.c:248
 #, c-format
 msgid "Connection\n"
 msgstr "Connexions\n"
 
-#: help.c:247
+#: help.c:249
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -1205,12 +1256,12 @@ msgstr ""
 "                        se connecte à une autre base de données\n"
 "                        (actuellement « %s »)\n"
 
-#: help.c:250
+#: help.c:252
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [ENCODAGE] affiche ou initialise l'encodage du client\n"
 
-#: help.c:251
+#: help.c:253
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr ""
@@ -1220,58 +1271,63 @@ msgstr ""
 
 #: help.c:254
 #, c-format
+msgid "  \\conninfo              display information about current connection\n"
+msgstr "  \\conninfo            affiche des informations sur la connexion en cours\n"
+
+#: help.c:257
+#, c-format
 msgid "Operating System\n"
 msgstr "Système d'exploitation\n"
 
-#: help.c:255
+#: help.c:258
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [RÉPERTOIRE]     change de répertoire de travail\n"
 
-#: help.c:256
+#: help.c:259
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr ""
 "  \\timing [on|off]     bascule l'activation du chronométrage des commandes\n"
 "                        (actuellement %s)\n"
 
-#: help.c:258
+#: help.c:261
 #, c-format
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr ""
 "  \\! [COMMANDE]        exécute la commande dans un shell ou exécute un\n"
 "                        shell interactif\n"
 
-#: help.c:261
+#: help.c:264
 #, c-format
 msgid "Variables\n"
 msgstr "Variables\n"
 
-#: help.c:262
+#: help.c:265
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr ""
 "  \\prompt [TEXTE] NOM  demande à l'utilisateur de configurer la variable\n"
 "                        interne\n"
 
-#: help.c:263
+#: help.c:266
 #, c-format
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr ""
 "  \\set [NOM [VALEUR]]  initialise une variable interne ou les affiche\n"
 "                        toutes en l'absence de paramètre\n"
 
-#: help.c:264
+#: help.c:267
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NOM           désactive (supprime) la variable interne\n"
 
-#: help.c:267
+#: help.c:270
 #, c-format
 msgid "Large Objects\n"
 msgstr "« Large objects »\n"
 
-#: help.c:268
+#: help.c:271
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -1285,11 +1341,11 @@ msgstr ""
 "  \\lo_unlink OIDLOB\n"
 "                        opérations sur les « Large Objects »\n"
 
-#: help.c:321
+#: help.c:318
 msgid "Available help:\n"
 msgstr "Aide-mémoire disponible :\n"
 
-#: help.c:410
+#: help.c:402
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1304,7 +1360,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:426
+#: help.c:418
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -1348,37 +1404,40 @@ msgid "ID"
 msgstr "ID"
 
 #: large_obj.c:290
-#: describe.c:146
-#: describe.c:334
-#: describe.c:613
-#: describe.c:762
-#: describe.c:2381
-#: describe.c:2681
-#: describe.c:3310
-#: describe.c:3369
+#: describe.c:147
+#: describe.c:335
+#: describe.c:637
+#: describe.c:787
+#: describe.c:2513
+#: describe.c:2631
+#: describe.c:2968
+#: describe.c:3599
+#: describe.c:3664
 msgid "Owner"
 msgstr "Propriétaire"
 
 #: large_obj.c:291
 #: large_obj.c:301
-#: describe.c:95
-#: describe.c:158
-#: describe.c:337
-#: describe.c:490
-#: describe.c:566
-#: describe.c:637
-#: describe.c:827
-#: describe.c:1318
-#: describe.c:2205
-#: describe.c:2395
-#: describe.c:2689
-#: describe.c:2751
-#: describe.c:2887
-#: describe.c:2926
-#: describe.c:2993
-#: describe.c:3052
-#: describe.c:3061
-#: describe.c:3120
+#: describe.c:96
+#: describe.c:159
+#: describe.c:338
+#: describe.c:501
+#: describe.c:590
+#: describe.c:661
+#: describe.c:852
+#: describe.c:1382
+#: describe.c:2330
+#: describe.c:2537
+#: describe.c:2911
+#: describe.c:2976
+#: describe.c:3041
+#: describe.c:3177
+#: describe.c:3216
+#: describe.c:3283
+#: describe.c:3342
+#: describe.c:3351
+#: describe.c:3410
+#: describe.c:3849
 msgid "Description"
 msgstr "Description"
 
@@ -1447,12 +1506,12 @@ msgid_plural "(%lu rows)"
 msgstr[0] "(%lu ligne)"
 msgstr[1] "(%lu lignes)"
 
-#: startup.c:237
+#: startup.c:243
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le journal applicatif « %s » : %s\n"
 
-#: startup.c:299
+#: startup.c:305
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -1461,805 +1520,875 @@ msgstr ""
 "Saisissez « help » pour l'aide.\n"
 "\n"
 
-#: startup.c:445
+#: startup.c:451
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s : n'a pas pu configurer le paramètre d'impression « %s »\n"
 
-#: startup.c:484
+#: startup.c:490
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s : n'a pas pu effacer la variable « %s »\n"
 
-#: startup.c:494
+#: startup.c:500
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s : n'a pas pu initialiser la variable « %s »\n"
 
-#: startup.c:531
 #: startup.c:537
+#: startup.c:543
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
-#: startup.c:554
+#: startup.c:560
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s : attention : option supplémentaire « %s » ignorée\n"
 
-#: startup.c:619
+#: startup.c:625
 msgid "contains support for command-line editing"
 msgstr "contient une gestion avancée de la ligne de commande"
 
-#: describe.c:68
-#: describe.c:235
-#: describe.c:462
-#: describe.c:561
-#: describe.c:682
-#: describe.c:763
-#: describe.c:824
-#: describe.c:2373
-#: describe.c:2494
-#: describe.c:2549
-#: describe.c:2749
-#: describe.c:2976
-#: describe.c:3048
-#: describe.c:3059
-#: describe.c:3118
-msgid "Schema"
-msgstr "Schéma"
-
 #: describe.c:69
-#: describe.c:145
 #: describe.c:236
 #: describe.c:463
-#: describe.c:562
-#: describe.c:612
-#: describe.c:683
-#: describe.c:825
-#: describe.c:2374
-#: describe.c:2495
-#: describe.c:2550
-#: describe.c:2680
-#: describe.c:2750
-#: describe.c:2977
-#: describe.c:3049
-#: describe.c:3060
-#: describe.c:3119
-#: describe.c:3309
-#: describe.c:3368
-msgid "Name"
-msgstr "Nom"
+#: describe.c:585
+#: describe.c:706
+#: describe.c:788
+#: describe.c:849
+#: describe.c:2504
+#: describe.c:2698
+#: describe.c:2768
+#: describe.c:2903
+#: describe.c:3039
+#: describe.c:3266
+#: describe.c:3338
+#: describe.c:3349
+#: describe.c:3408
+#: describe.c:3782
+#: describe.c:3848
+msgid "Schema"
+msgstr "Schéma"
 
 #: describe.c:70
-#: describe.c:248
-#: describe.c:294
-#: describe.c:311
-msgid "Result data type"
-msgstr "Type de données du résultat"
+#: describe.c:146
+#: describe.c:237
+#: describe.c:464
+#: describe.c:586
+#: describe.c:636
+#: describe.c:707
+#: describe.c:850
+#: describe.c:2505
+#: describe.c:2627
+#: describe.c:2699
+#: describe.c:2769
+#: describe.c:2904
+#: describe.c:2967
+#: describe.c:3040
+#: describe.c:3267
+#: describe.c:3339
+#: describe.c:3350
+#: describe.c:3409
+#: describe.c:3598
+#: describe.c:3663
+#: describe.c:3846
+msgid "Name"
+msgstr "Nom"
 
-#: describe.c:84
-#: describe.c:88
+#: describe.c:71
 #: describe.c:249
 #: describe.c:295
 #: describe.c:312
+msgid "Result data type"
+msgstr "Type de données du résultat"
+
+#: describe.c:85
+#: describe.c:89
+#: describe.c:250
+#: describe.c:296
+#: describe.c:313
 msgid "Argument data types"
 msgstr "Type de données des paramètres"
 
-#: describe.c:113
+#: describe.c:114
 msgid "List of aggregate functions"
 msgstr "Liste des fonctions d'agrégation"
 
-#: describe.c:134
+#: describe.c:135
 #, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les tablespaces.\n"
 
-#: describe.c:147
+#: describe.c:148
 msgid "Location"
 msgstr "Emplacement"
 
-#: describe.c:175
+#: describe.c:176
 msgid "List of tablespaces"
 msgstr "Liste des tablespaces"
 
-#: describe.c:212
+#: describe.c:213
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df prends seulement [antwS+] comme options\n"
 
-#: describe.c:218
+#: describe.c:219
 #, c-format
 msgid "\\df does not take a \"w\" option with server version %d.%d\n"
 msgstr "\\df ne prend pas l'option « w » pour un serveur en version %d.%d.\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:251
-#: describe.c:297
-#: describe.c:314
+#: describe.c:252
+#: describe.c:298
+#: describe.c:315
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:252
+#: describe.c:253
 msgid "window"
 msgstr "window"
 
-#: describe.c:253
-#: describe.c:298
-#: describe.c:315
-#: describe.c:964
-msgid "trigger"
-msgstr "trigger"
-
 #: describe.c:254
 #: describe.c:299
 #: describe.c:316
-msgid "normal"
-msgstr "normal"
+#: describe.c:990
+msgid "trigger"
+msgstr "trigger"
 
 #: describe.c:255
 #: describe.c:300
 #: describe.c:317
-#: describe.c:685
-#: describe.c:767
-#: describe.c:1299
-#: describe.c:2380
-#: describe.c:2496
-#: describe.c:3381
+msgid "normal"
+msgstr "normal"
+
+#: describe.c:256
+#: describe.c:301
+#: describe.c:318
+#: describe.c:710
+#: describe.c:792
+#: describe.c:1362
+#: describe.c:2512
+#: describe.c:2700
+#: describe.c:3676
 msgid "Type"
 msgstr "Type"
 
-#: describe.c:330
+#: describe.c:331
 msgid "immutable"
 msgstr "immutable"
 
-#: describe.c:331
+#: describe.c:332
 msgid "stable"
 msgstr "stable"
 
-#: describe.c:332
+#: describe.c:333
 msgid "volatile"
 msgstr "volatile"
 
-#: describe.c:333
+#: describe.c:334
 msgid "Volatility"
 msgstr "Volatibilité"
 
-#: describe.c:335
+#: describe.c:336
 msgid "Language"
 msgstr "Langage"
 
-#: describe.c:336
+#: describe.c:337
 msgid "Source code"
 msgstr "Code source"
 
-#: describe.c:434
+#: describe.c:435
 msgid "List of functions"
 msgstr "Liste des fonctions"
 
-#: describe.c:473
+#: describe.c:474
 msgid "Internal name"
 msgstr "Nom interne"
 
-#: describe.c:474
-#: describe.c:629
-#: describe.c:2391
+#: describe.c:475
+#: describe.c:653
+#: describe.c:2529
+#: describe.c:2533
 msgid "Size"
 msgstr "Taille"
 
-#: describe.c:486
+#: describe.c:496
 msgid "Elements"
 msgstr "Éléments"
 
-#: describe.c:530
+#: describe.c:541
 msgid "List of data types"
 msgstr "Liste des types de données"
 
-#: describe.c:563
+#: describe.c:587
 msgid "Left arg type"
 msgstr "Type de l'arg. gauche"
 
-#: describe.c:564
+#: describe.c:588
 msgid "Right arg type"
 msgstr "Type de l'arg. droit"
 
-#: describe.c:565
+#: describe.c:589
 msgid "Result type"
 msgstr "Type du résultat"
 
-#: describe.c:584
+#: describe.c:608
 msgid "List of operators"
 msgstr "Liste des opérateurs"
 
-#: describe.c:614
+#: describe.c:638
 msgid "Encoding"
 msgstr "Encodage"
 
-#: describe.c:619
-msgid "Collation"
-msgstr "Tri"
+#: describe.c:643
+#: describe.c:2905
+msgid "Collate"
+msgstr "Collationnement"
 
-#: describe.c:620
+#: describe.c:644
+#: describe.c:2906
 msgid "Ctype"
 msgstr "Type caract."
 
-#: describe.c:633
+#: describe.c:657
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:650
+#: describe.c:674
 msgid "List of databases"
 msgstr "Liste des bases de données"
 
-#: describe.c:684
-#: describe.c:764
-#: describe.c:919
-#: describe.c:2375
-#: sql_help.c:443
-#: sql_help.c:660
-#: sql_help.c:761
-#: sql_help.c:1178
-#: sql_help.c:1305
-#: sql_help.c:1339
-#: sql_help.c:1574
-#: sql_help.c:1723
-#: sql_help.c:1884
-#: sql_help.c:1965
-#: sql_help.c:2159
-#: sql_help.c:2719
-#: sql_help.c:2739
-#: sql_help.c:2741
-#: sql_help.c:2742
+#: describe.c:708
+#: describe.c:789
+#: describe.c:944
+#: describe.c:2506
+#: sql_help.c:595
+#: sql_help.c:842
+#: sql_help.c:969
+#: sql_help.c:1432
+#: sql_help.c:1562
+#: sql_help.c:1596
+#: sql_help.c:1842
+#: sql_help.c:2000
+#: sql_help.c:2185
+#: sql_help.c:2266
+#: sql_help.c:2472
+#: sql_help.c:3103
+#: sql_help.c:3123
+#: sql_help.c:3125
+#: sql_help.c:3126
 msgid "table"
 msgstr "table"
 
-#: describe.c:684
-#: describe.c:920
-#: describe.c:2376
+#: describe.c:708
+#: describe.c:945
+#: describe.c:2507
 msgid "view"
 msgstr "vue"
 
-#: describe.c:684
-#: describe.c:765
-#: describe.c:922
-#: describe.c:2378
+#: describe.c:708
+#: describe.c:790
+#: describe.c:947
+#: describe.c:2509
 msgid "sequence"
 msgstr "séquence"
 
-#: describe.c:696
+#: describe.c:709
+#: describe.c:948
+#: describe.c:2511
+msgid "foreign table"
+msgstr "table distante"
+
+#: describe.c:721
 msgid "Column access privileges"
 msgstr "Droits d'accès à la colonne"
 
-#: describe.c:722
-#: describe.c:3476
-#: describe.c:3480
+#: describe.c:747
+#: describe.c:3993
+#: describe.c:3997
 msgid "Access privileges"
 msgstr "Droits d'accès"
 
-#: describe.c:750
+#: describe.c:775
 #, c-format
 msgid "The server (version %d.%d) does not support altering default privileges.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas la modification des droits par défaut.\n"
 
-#: describe.c:766
-#: describe.c:858
+#: describe.c:791
+#: describe.c:883
 msgid "function"
 msgstr "fonction"
 
-#: describe.c:790
+#: describe.c:815
 msgid "Default access privileges"
 msgstr "Droits d'accès par défaut"
 
-#: describe.c:826
+#: describe.c:851
 msgid "Object"
 msgstr "Objet"
 
-#: describe.c:838
+#: describe.c:863
 msgid "aggregate"
 msgstr "agrégation"
 
-#: describe.c:877
-#: sql_help.c:1457
-#: sql_help.c:2457
-#: sql_help.c:2525
-#: sql_help.c:2656
-#: sql_help.c:2757
-#: sql_help.c:2808
+#: describe.c:902
+#: sql_help.c:1715
+#: sql_help.c:2833
+#: sql_help.c:2903
+#: sql_help.c:3036
+#: sql_help.c:3141
+#: sql_help.c:3192
 msgid "operator"
 msgstr "opérateur"
 
-#: describe.c:896
+#: describe.c:921
 msgid "data type"
 msgstr "type de données"
 
-#: describe.c:921
-#: describe.c:2377
+#: describe.c:946
+#: describe.c:2508
 msgid "index"
 msgstr "index"
 
-#: describe.c:943
+#: describe.c:969
 msgid "rule"
 msgstr "règle"
 
-#: describe.c:987
+#: describe.c:1013
 msgid "Object descriptions"
 msgstr "Descriptions des objets"
 
-#: describe.c:1040
+#: describe.c:1066
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Aucune relation nommée « %s » n'a été trouvée.\n"
 
-#: describe.c:1194
+#: describe.c:1238
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Aucune relation avec l'OID « %s » n'a été trouvée.\n"
 
-#: describe.c:1262
+#: describe.c:1314
+#, c-format
+msgid "Unlogged table \"%s.%s\""
+msgstr "Table non tracée « %s.%s »"
+
+#: describe.c:1317
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Table « %s.%s »"
 
-#: describe.c:1266
+#: describe.c:1321
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vue « %s.%s »"
 
-#: describe.c:1270
+#: describe.c:1325
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Séquence « %s.%s »"
 
-#: describe.c:1274
+#: describe.c:1330
+#, c-format
+msgid "Unlogged index \"%s.%s\""
+msgstr "Index non tracé « %s.%s »"
+
+#: describe.c:1333
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index « %s.%s »"
 
-#: describe.c:1279
+#: describe.c:1338
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relation spéciale « %s.%s »"
 
-#: describe.c:1283
+#: describe.c:1342
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "Table TOAST « %s.%s »"
 
-#: describe.c:1287
+#: describe.c:1346
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Type composé « %s.%s »"
 
-#: describe.c:1298
+#: describe.c:1350
+#, c-format
+msgid "Foreign table \"%s.%s\""
+msgstr "Table distante « %s.%s »"
+
+#: describe.c:1361
 msgid "Column"
 msgstr "Colonne"
 
-#: describe.c:1305
+#: describe.c:1369
 msgid "Modifiers"
 msgstr "Modificateurs"
 
-#: describe.c:1310
+#: describe.c:1374
 msgid "Value"
 msgstr "Valeur"
 
-#: describe.c:1313
+#: describe.c:1377
 msgid "Definition"
 msgstr "Définition"
 
-#: describe.c:1317
+#: describe.c:1381
 msgid "Storage"
 msgstr "Stockage"
 
-#: describe.c:1359
+#: describe.c:1427
+#, c-format
+msgid "collate %s"
+msgstr "collationnement %s"
+
+#: describe.c:1435
 msgid "not null"
 msgstr "non NULL"
 
 #. translator: default values of column definitions
-#: describe.c:1368
+#: describe.c:1445
 #, c-format
 msgid "default %s"
 msgstr "Par défaut, %s"
 
-#: describe.c:1459
+#: describe.c:1536
 msgid "primary key, "
 msgstr "clé primaire, "
 
-#: describe.c:1461
+#: describe.c:1538
 msgid "unique, "
 msgstr "unique, "
 
-#: describe.c:1467
+#: describe.c:1544
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "pour la table « %s.%s »"
 
-#: describe.c:1471
+#: describe.c:1548
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", prédicat (%s)"
 
-#: describe.c:1474
+#: describe.c:1551
 msgid ", clustered"
 msgstr ", en cluster"
 
-#: describe.c:1477
+#: describe.c:1554
 msgid ", invalid"
 msgstr ", invalide"
 
-#: describe.c:1480
+#: describe.c:1557
 msgid ", deferrable"
 msgstr ", déferrable"
 
-#: describe.c:1483
+#: describe.c:1560
 msgid ", initially deferred"
 msgstr ", initialement déferré"
 
-#: describe.c:1497
+#: describe.c:1574
 msgid "View definition:"
 msgstr "Définition de la vue :"
 
-#: describe.c:1514
-#: describe.c:1792
+#: describe.c:1591
+#: describe.c:1874
 msgid "Rules:"
 msgstr "Règles :"
 
-#: describe.c:1573
+#: describe.c:1650
 msgid "Indexes:"
 msgstr "Index :"
 
-#: describe.c:1648
+#: describe.c:1730
 msgid "Check constraints:"
 msgstr "Contraintes de vérification :"
 
-#: describe.c:1679
+#: describe.c:1761
 msgid "Foreign-key constraints:"
 msgstr "Contraintes de clés étrangères :"
 
-#: describe.c:1710
+#: describe.c:1792
 msgid "Referenced by:"
 msgstr "Référencé par :"
 
-#: describe.c:1795
+#: describe.c:1877
 msgid "Disabled rules:"
 msgstr "Règles désactivées :"
 
-#: describe.c:1798
+#: describe.c:1880
 msgid "Rules firing always:"
 msgstr "Règles toujous activées :"
 
-#: describe.c:1801
+#: describe.c:1883
 msgid "Rules firing on replica only:"
 msgstr "Règles activées uniquement sur le réplica :"
 
-#: describe.c:1903
+#: describe.c:1991
 msgid "Triggers:"
 msgstr "Triggers :"
 
-#: describe.c:1906
+#: describe.c:1994
 msgid "Disabled triggers:"
 msgstr "Triggers désactivés :"
 
-#: describe.c:1909
+#: describe.c:1997
 msgid "Triggers firing always:"
 msgstr "Triggers toujours activés :"
 
-#: describe.c:1912
+#: describe.c:2000
 msgid "Triggers firing on replica only:"
 msgstr "Triggers activés uniquement sur le réplica :"
 
-#: describe.c:1945
+#: describe.c:2066
 msgid "Inherits"
 msgstr "Hérite de"
 
-#: describe.c:1975
+#: describe.c:2096
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Nombre de tables enfants : %d (utilisez \\d+ pour les lister)"
 
-#: describe.c:1982
+#: describe.c:2103
 msgid "Child tables"
 msgstr "Tables enfant :"
 
-#: describe.c:2004
+#: describe.c:2125
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Table de type : %s"
 
-#: describe.c:2011
+#: describe.c:2132
 msgid "Has OIDs"
 msgstr "Contient des OID"
 
-#: describe.c:2014
-#: describe.c:2553
-#: describe.c:2627
+#: describe.c:2135
+#: describe.c:2772
+#: describe.c:2846
 msgid "yes"
 msgstr "oui"
 
-#: describe.c:2014
-#: describe.c:2553
-#: describe.c:2627
+#: describe.c:2135
+#: describe.c:2772
+#: describe.c:2846
 msgid "no"
 msgstr "non"
 
-#: describe.c:2022
-#: describe.c:3319
-#: describe.c:3383
-#: describe.c:3439
+#: describe.c:2143
+#: describe.c:3614
+#: describe.c:3678
+#: describe.c:3734
+#: describe.c:3789
 msgid "Options"
 msgstr "Options"
 
-#: describe.c:2107
+#: describe.c:2228
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace : « %s »"
 
-#: describe.c:2120
+#: describe.c:2241
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace « %s »"
 
-#: describe.c:2198
+#: describe.c:2323
 msgid "List of roles"
 msgstr "Liste des rôles"
 
-#: describe.c:2200
+#: describe.c:2325
 msgid "Role name"
 msgstr "Nom du rôle"
 
-#: describe.c:2201
+#: describe.c:2326
 msgid "Attributes"
 msgstr "Attributs"
 
-#: describe.c:2202
+#: describe.c:2327
 msgid "Member of"
 msgstr "Membre de"
 
-#: describe.c:2213
+#: describe.c:2338
 msgid "Superuser"
 msgstr "Superutilisateur"
 
-#: describe.c:2216
+#: describe.c:2341
 msgid "No inheritance"
 msgstr "Pas d'héritage"
 
-#: describe.c:2219
+#: describe.c:2344
 msgid "Create role"
 msgstr "Créer un rôle"
 
-#: describe.c:2222
+#: describe.c:2347
 msgid "Create DB"
 msgstr "Créer une base"
 
-#: describe.c:2225
+#: describe.c:2350
 msgid "Cannot login"
 msgstr "Ne peut pas se connecter"
 
-#: describe.c:2234
+#: describe.c:2354
+msgid "Replication"
+msgstr "Réplication"
+
+#: describe.c:2363
 msgid "No connections"
 msgstr "Sans connexions"
 
-#: describe.c:2236
+#: describe.c:2365
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d connexion"
 msgstr[1] "%d connexions"
 
-#: describe.c:2303
+#: describe.c:2432
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr "Pas de supprot des paramètres rôle par base de données pour la version de ce serveur.\n"
 
-#: describe.c:2314
+#: describe.c:2443
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Aucun paramètre correspondant trouvé.\n"
 
-#: describe.c:2316
+#: describe.c:2445
 #, c-format
 msgid "No settings found.\n"
 msgstr "Aucun paramètre trouvé.\n"
 
-#: describe.c:2321
+#: describe.c:2450
 msgid "List of settings"
 msgstr "Liste des paramètres"
 
-#: describe.c:2379
+#: describe.c:2510
 msgid "special"
 msgstr "spécial"
 
-#: describe.c:2386
+#: describe.c:2518
+#: describe.c:3783
 msgid "Table"
 msgstr "Table"
 
-#: describe.c:2446
+#: describe.c:2592
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Aucune relation correspondante trouvée.\n"
 
-#: describe.c:2448
+#: describe.c:2594
 #, c-format
 msgid "No relations found.\n"
 msgstr "Aucune relation trouvée.\n"
 
-#: describe.c:2453
+#: describe.c:2599
 msgid "List of relations"
 msgstr "Liste des relations"
 
-#: describe.c:2497
+#: describe.c:2635
+msgid "Trusted"
+msgstr "De confiance"
+
+#: describe.c:2643
+msgid "Internal Language"
+msgstr "Langage interne"
+
+#: describe.c:2644
+msgid "Call Handler"
+msgstr "Gestionnaire d'appel"
+
+#: describe.c:2645
+#: describe.c:3606
+msgid "Validator"
+msgstr "Validateur"
+
+#: describe.c:2648
+msgid "Inline Handler"
+msgstr "Gestionnaire en ligne"
+
+#: describe.c:2669
+msgid "List of languages"
+msgstr "Liste des langages"
+
+#: describe.c:2709
 msgid "Modifier"
 msgstr "Modificateur"
 
-#: describe.c:2498
+#: describe.c:2717
 msgid "Check"
 msgstr "Vérification"
 
-#: describe.c:2516
+#: describe.c:2735
 msgid "List of domains"
 msgstr "Liste des domaines"
 
-#: describe.c:2551
+#: describe.c:2770
 msgid "Source"
 msgstr "Source"
 
-#: describe.c:2552
+#: describe.c:2771
 msgid "Destination"
 msgstr "Destination"
 
-#: describe.c:2554
+#: describe.c:2773
 msgid "Default?"
 msgstr "Par défaut ?"
 
-#: describe.c:2572
+#: describe.c:2791
 msgid "List of conversions"
 msgstr "Liste des conversions"
 
-#: describe.c:2624
+#: describe.c:2843
 msgid "Source type"
 msgstr "Type source"
 
-#: describe.c:2625
+#: describe.c:2844
 msgid "Target type"
 msgstr "Type cible"
 
-#: describe.c:2626
-#: describe.c:2886
+#: describe.c:2845
+#: describe.c:3176
 msgid "Function"
 msgstr "Fonction"
 
-#: describe.c:2627
+#: describe.c:2846
 msgid "in assignment"
 msgstr "assigné"
 
-#: describe.c:2628
+#: describe.c:2847
 msgid "Implicit?"
 msgstr "Implicite ?"
 
-#: describe.c:2654
+#: describe.c:2873
 msgid "List of casts"
 msgstr "Liste des conversions explicites"
 
-#: describe.c:2709
+#: describe.c:2941
+msgid "List of collations"
+msgstr "Liste des collationnements"
+
+#: describe.c:2999
 msgid "List of schemas"
 msgstr "Liste des schémas"
 
-#: describe.c:2732
-#: describe.c:2965
-#: describe.c:3033
-#: describe.c:3101
+#: describe.c:3022
+#: describe.c:3255
+#: describe.c:3323
+#: describe.c:3391
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas la recherche plein texte.\n"
 
-#: describe.c:2766
+#: describe.c:3056
 msgid "List of text search parsers"
 msgstr "Liste des analyseurs de la recherche de texte"
 
-#: describe.c:2809
+#: describe.c:3099
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Aucun analyseur de la recherche de texte nommé « %s » n'a été trouvé.\n"
 
-#: describe.c:2884
+#: describe.c:3174
 msgid "Start parse"
 msgstr "Début de l'analyse"
 
-#: describe.c:2885
+#: describe.c:3175
 msgid "Method"
 msgstr "Méthode"
 
-#: describe.c:2889
+#: describe.c:3179
 msgid "Get next token"
 msgstr "Obtenir le prochain jeton"
 
-#: describe.c:2891
+#: describe.c:3181
 msgid "End parse"
 msgstr "Fin de l'analyse"
 
-#: describe.c:2893
+#: describe.c:3183
 msgid "Get headline"
 msgstr "Obtenir l'en-tête"
 
-#: describe.c:2895
+#: describe.c:3185
 msgid "Get token types"
 msgstr "Obtenir les types de jeton"
 
-#: describe.c:2905
+#: describe.c:3195
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analyseur « %s.%s » de la recherche de texte"
 
-#: describe.c:2907
+#: describe.c:3197
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analyseur « %s » de la recherche de texte"
 
-#: describe.c:2925
+#: describe.c:3215
 msgid "Token name"
 msgstr "Nom du jeton"
 
-#: describe.c:2936
+#: describe.c:3226
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Types de jeton pour l'analyseur « %s.%s »"
 
-#: describe.c:2938
+#: describe.c:3228
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Types de jeton pour l'analyseur « %s »"
 
-#: describe.c:2987
+#: describe.c:3277
 msgid "Template"
 msgstr "Modèle"
 
-#: describe.c:2988
+#: describe.c:3278
 msgid "Init options"
 msgstr "Options d'initialisation :"
 
-#: describe.c:3010
+#: describe.c:3300
 msgid "List of text search dictionaries"
 msgstr "Liste des dictionnaires de la recherche de texte"
 
-#: describe.c:3050
+#: describe.c:3340
 msgid "Init"
 msgstr "Initialisation"
 
-#: describe.c:3051
+#: describe.c:3341
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3078
+#: describe.c:3368
 msgid "List of text search templates"
 msgstr "Liste des modèles de la recherche de texte"
 
-#: describe.c:3135
+#: describe.c:3425
 msgid "List of text search configurations"
 msgstr "Liste des configurations de la recherche de texte"
 
-#: describe.c:3179
+#: describe.c:3469
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Aucune configuration de la recherche de texte nommée « %s » n'a été trouvée.\n"
 
-#: describe.c:3245
+#: describe.c:3535
 msgid "Token"
 msgstr "Jeton"
 
-#: describe.c:3246
+#: describe.c:3536
 msgid "Dictionaries"
 msgstr "Dictionnaires"
 
-#: describe.c:3257
+#: describe.c:3547
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuration « %s.%s » de la recherche de texte"
 
-#: describe.c:3260
+#: describe.c:3550
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuration « %s » de la recherche de texte"
 
-#: describe.c:3264
+#: describe.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -2268,7 +2397,7 @@ msgstr ""
 "\n"
 "Analyseur : « %s.%s »"
 
-#: describe.c:3267
+#: describe.c:3557
 #, c-format
 msgid ""
 "\n"
@@ -2277,2238 +2406,2563 @@ msgstr ""
 "\n"
 "Analyseur : « %s »"
 
-#: describe.c:3299
+#: describe.c:3589
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les wrappers de données distantes.\n"
 
-#: describe.c:3311
-msgid "Validator"
-msgstr "Validateur"
+#: describe.c:3603
+msgid "Handler"
+msgstr "Gestionnaire"
 
-#: describe.c:3335
+#: describe.c:3630
 msgid "List of foreign-data wrappers"
 msgstr "Liste des wrappers de données distantes"
 
-#: describe.c:3358
+#: describe.c:3653
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les serveurs distants.\n"
 
-#: describe.c:3370
+#: describe.c:3665
 msgid "Foreign-data wrapper"
 msgstr "Wrapper des données distantes"
 
-#: describe.c:3382
+#: describe.c:3677
+#: describe.c:3847
 msgid "Version"
 msgstr "Version"
 
-#: describe.c:3401
+#: describe.c:3696
 msgid "List of foreign servers"
 msgstr "Liste des serveurs distants"
 
-#: describe.c:3424
+#: describe.c:3719
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "Le serveur (version %d.%d) ne supporte pas les correspondances d'utilisateurs.\n"
 
-#: describe.c:3433
+#: describe.c:3728
+#: describe.c:3784
 msgid "Server"
 msgstr "Serveur"
 
-#: describe.c:3434
+#: describe.c:3729
 msgid "User name"
 msgstr "Nom de l'utilisateur"
 
-#: describe.c:3454
+#: describe.c:3749
 msgid "List of user mappings"
 msgstr "Liste des correspondances utilisateurs"
 
-#: sql_help.h:173
-#: sql_help.h:788
+#: describe.c:3772
+#, c-format
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "Le serveur (version %d.%d) ne supporte pas les tables distantes.\n"
+
+#: describe.c:3810
+msgid "List of foreign tables"
+msgstr "Liste des tables distantes"
+
+#: describe.c:3833
+#: describe.c:3887
+#, c-format
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "Le serveur (version %d.%d) ne supporte pas les extensions.\n"
+
+#: describe.c:3864
+msgid "List of installed extensions"
+msgstr "Liste des extensions installées"
+
+#: describe.c:3914
+#, c-format
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "N'a trouvé aucune extension nommée « %s ».\n"
+
+#: describe.c:3917
+#, c-format
+msgid "Did not find any extensions.\n"
+msgstr "N'a trouvé aucune extension.\n"
+
+#: describe.c:3961
+msgid "Object Description"
+msgstr "Description d'un objet"
+
+#: describe.c:3970
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr "Objets dans l'extension « %s »"
+
+#: sql_help.h:182
+#: sql_help.h:837
 msgid "abort the current transaction"
 msgstr "abandonner la transaction en cours"
 
-#: sql_help.h:178
+#: sql_help.h:187
 msgid "change the definition of an aggregate function"
 msgstr "modifier la définition d'une fonction d'agrégation"
 
-#: sql_help.h:183
+#: sql_help.h:192
+msgid "change the definition of a collation"
+msgstr "modifier la définition d'un collationnement"
+
+#: sql_help.h:197
 msgid "change the definition of a conversion"
 msgstr "modifier la définition d'une conversion"
 
-#: sql_help.h:188
+#: sql_help.h:202
 msgid "change a database"
 msgstr "modifier une base de données"
 
-#: sql_help.h:193
+#: sql_help.h:207
 msgid "define default access privileges"
 msgstr "définir les droits d'accès par défaut"
 
-#: sql_help.h:198
+#: sql_help.h:212
 msgid "change the definition of a domain"
 msgstr "modifier la définition d'un domaine"
 
-#: sql_help.h:203
+#: sql_help.h:217
+msgid "change the definition of an extension"
+msgstr "modifier la définition d'une extension"
+
+#: sql_help.h:222
 msgid "change the definition of a foreign-data wrapper"
 msgstr "modifier la définition d'un wrapper de données distantes"
 
-#: sql_help.h:208
+#: sql_help.h:227
+msgid "change the definition of a foreign table"
+msgstr "modifier la définition d'une table distante"
+
+#: sql_help.h:232
 msgid "change the definition of a function"
 msgstr "modifier la définition d'une fonction"
 
-#: sql_help.h:213
+#: sql_help.h:237
 msgid "change role name or membership"
 msgstr "modifier le nom d'un groupe ou la liste des ses membres"
 
-#: sql_help.h:218
+#: sql_help.h:242
 msgid "change the definition of an index"
 msgstr "modifier la définition d'un index"
 
-#: sql_help.h:223
+#: sql_help.h:247
 msgid "change the definition of a procedural language"
 msgstr "modifier la définition d'un langage procédural"
 
-#: sql_help.h:228
+#: sql_help.h:252
 msgid "change the definition of a large object"
 msgstr "modifier la définition d'un « Large Object »"
 
-#: sql_help.h:233
+#: sql_help.h:257
 msgid "change the definition of an operator"
 msgstr "modifier la définition d'un opérateur"
 
-#: sql_help.h:238
+#: sql_help.h:262
 msgid "change the definition of an operator class"
 msgstr "modifier la définition d'une classe d'opérateurs"
 
-#: sql_help.h:243
+#: sql_help.h:267
 msgid "change the definition of an operator family"
 msgstr "modifier la définition d'une famille d'opérateur"
 
-#: sql_help.h:248
-#: sql_help.h:308
+#: sql_help.h:272
+#: sql_help.h:332
 msgid "change a database role"
 msgstr "modifier un rôle"
 
-#: sql_help.h:253
+#: sql_help.h:277
 msgid "change the definition of a schema"
 msgstr "modifier la définition d'un schéma"
 
-#: sql_help.h:258
+#: sql_help.h:282
 msgid "change the definition of a sequence generator"
 msgstr "modifier la définition d'un générateur de séquence"
 
-#: sql_help.h:263
+#: sql_help.h:287
 msgid "change the definition of a foreign server"
 msgstr "modifier la définition d'un serveur distant"
 
-#: sql_help.h:268
+#: sql_help.h:292
 msgid "change the definition of a table"
 msgstr "modifier la définition d'une table"
 
-#: sql_help.h:273
+#: sql_help.h:297
 msgid "change the definition of a tablespace"
 msgstr "modifier la définition d'un tablespace"
 
-#: sql_help.h:278
+#: sql_help.h:302
 msgid "change the definition of a text search configuration"
 msgstr "modifier la définition d'une configuration de la recherche de texte"
 
-#: sql_help.h:283
+#: sql_help.h:307
 msgid "change the definition of a text search dictionary"
 msgstr "modifier la définition d'un dictionnaire de la recherche de texte"
 
-#: sql_help.h:288
+#: sql_help.h:312
 msgid "change the definition of a text search parser"
 msgstr "modifier la définition d'un analyseur de la recherche de texte"
 
-#: sql_help.h:293
+#: sql_help.h:317
 msgid "change the definition of a text search template"
 msgstr "modifier la définition d'un modèle de la recherche de texte"
 
-#: sql_help.h:298
+#: sql_help.h:322
 msgid "change the definition of a trigger"
 msgstr "modifier la définition d'un trigger"
 
-#: sql_help.h:303
+#: sql_help.h:327
 msgid "change the definition of a type"
 msgstr "modifier la définition d'un type"
 
-#: sql_help.h:313
+#: sql_help.h:337
 msgid "change the definition of a user mapping"
 msgstr "modifier la définition d'une correspondance d'utilisateur"
 
-#: sql_help.h:318
+#: sql_help.h:342
 msgid "change the definition of a view"
 msgstr "modifier la définition d'une vue"
 
-#: sql_help.h:323
+#: sql_help.h:347
 msgid "collect statistics about a database"
 msgstr "acquérir des statistiques concernant la base de données"
 
-#: sql_help.h:328
-#: sql_help.h:848
+#: sql_help.h:352
+#: sql_help.h:902
 msgid "start a transaction block"
 msgstr "débuter un bloc de transaction"
 
-#: sql_help.h:333
+#: sql_help.h:357
 msgid "force a transaction log checkpoint"
 msgstr "forcer un point de vérification des journaux de transaction"
 
-#: sql_help.h:338
+#: sql_help.h:362
 msgid "close a cursor"
 msgstr "fermer un curseur"
 
-#: sql_help.h:343
+#: sql_help.h:367
 msgid "cluster a table according to an index"
 msgstr "réorganiser (cluster) une table en fonction d'un index"
 
-#: sql_help.h:348
+#: sql_help.h:372
 msgid "define or change the comment of an object"
 msgstr "définir ou modifier les commentaires d'un objet"
 
-#: sql_help.h:353
-#: sql_help.h:698
+#: sql_help.h:377
+#: sql_help.h:747
 msgid "commit the current transaction"
 msgstr "valider la transaction en cours"
 
-#: sql_help.h:358
+#: sql_help.h:382
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "valider une transaction précédemment préparée pour une validation en deux\n"
 "phases"
 
-#: sql_help.h:363
+#: sql_help.h:387
 msgid "copy data between a file and a table"
 msgstr "copier des données entre un fichier et une table"
 
-#: sql_help.h:368
+#: sql_help.h:392
 msgid "define a new aggregate function"
 msgstr "définir une nouvelle fonction d'agrégation"
 
-#: sql_help.h:373
+#: sql_help.h:397
 msgid "define a new cast"
 msgstr "définir un nouveau transtypage"
 
-#: sql_help.h:378
-msgid "define a new constraint trigger"
-msgstr "définir une nouvelle contrainte de déclenchement"
+#: sql_help.h:402
+msgid "define a new collation"
+msgstr "définir un nouveau collationnement"
 
-#: sql_help.h:383
+#: sql_help.h:407
 msgid "define a new encoding conversion"
 msgstr "définir une nouvelle conversion d'encodage"
 
-#: sql_help.h:388
+#: sql_help.h:412
 msgid "create a new database"
 msgstr "créer une nouvelle base de données"
 
-#: sql_help.h:393
+#: sql_help.h:417
 msgid "define a new domain"
 msgstr "définir un nouveau domaine"
 
-#: sql_help.h:398
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "installer une extension"
+
+#: sql_help.h:427
 msgid "define a new foreign-data wrapper"
 msgstr "définir un nouveau wrapper de données distantes"
 
-#: sql_help.h:403
+#: sql_help.h:432
+msgid "define a new foreign table"
+msgstr "définir une nouvelle table distante"
+
+#: sql_help.h:437
 msgid "define a new function"
 msgstr "définir une nouvelle fonction"
 
-#: sql_help.h:408
-#: sql_help.h:438
-#: sql_help.h:508
+#: sql_help.h:442
+#: sql_help.h:472
+#: sql_help.h:542
 msgid "define a new database role"
 msgstr "définir un nouveau rôle"
 
-#: sql_help.h:413
+#: sql_help.h:447
 msgid "define a new index"
 msgstr "définir un nouvel index"
 
-#: sql_help.h:418
+#: sql_help.h:452
 msgid "define a new procedural language"
 msgstr "définir un nouveau langage de procédures"
 
-#: sql_help.h:423
+#: sql_help.h:457
 msgid "define a new operator"
 msgstr "définir un nouvel opérateur"
 
-#: sql_help.h:428
+#: sql_help.h:462
 msgid "define a new operator class"
 msgstr "définir une nouvelle classe d'opérateur"
 
-#: sql_help.h:433
+#: sql_help.h:467
 msgid "define a new operator family"
 msgstr "définir une nouvelle famille d'opérateur"
 
-#: sql_help.h:443
+#: sql_help.h:477
 msgid "define a new rewrite rule"
 msgstr "définir une nouvelle règle de réécriture"
 
-#: sql_help.h:448
+#: sql_help.h:482
 msgid "define a new schema"
 msgstr "définir un nouveau schéma"
 
-#: sql_help.h:453
+#: sql_help.h:487
 msgid "define a new sequence generator"
 msgstr "définir un nouveau générateur de séquence"
 
-#: sql_help.h:458
+#: sql_help.h:492
 msgid "define a new foreign server"
 msgstr "définir un nouveau serveur distant"
 
-#: sql_help.h:463
+#: sql_help.h:497
 msgid "define a new table"
 msgstr "définir une nouvelle table"
 
-#: sql_help.h:468
-#: sql_help.h:813
+#: sql_help.h:502
+#: sql_help.h:867
 msgid "define a new table from the results of a query"
 msgstr "définir une nouvelle table à partir des résultats d'une requête"
 
-#: sql_help.h:473
+#: sql_help.h:507
 msgid "define a new tablespace"
 msgstr "définir un nouveau tablespace"
 
-#: sql_help.h:478
+#: sql_help.h:512
 msgid "define a new text search configuration"
 msgstr "définir une nouvelle configuration de la recherche de texte"
 
-#: sql_help.h:483
+#: sql_help.h:517
 msgid "define a new text search dictionary"
 msgstr "définir un nouveau dictionnaire de la recherche de texte"
 
-#: sql_help.h:488
+#: sql_help.h:522
 msgid "define a new text search parser"
 msgstr "définir un nouvel analyseur de la recherche de texte"
 
-#: sql_help.h:493
+#: sql_help.h:527
 msgid "define a new text search template"
 msgstr "définir un nouveau modèle de la recherche de texte"
 
-#: sql_help.h:498
+#: sql_help.h:532
 msgid "define a new trigger"
 msgstr "définir un nouveau trigger"
 
-#: sql_help.h:503
+#: sql_help.h:537
 msgid "define a new data type"
 msgstr "définir un nouveau type de données"
 
-#: sql_help.h:513
+#: sql_help.h:547
 msgid "define a new mapping of a user to a foreign server"
 msgstr "définit une nouvelle correspondance d'un utilisateur vers un serveur distant"
 
-#: sql_help.h:518
+#: sql_help.h:552
 msgid "define a new view"
 msgstr "définir une nouvelle vue"
 
-#: sql_help.h:523
+#: sql_help.h:557
 msgid "deallocate a prepared statement"
 msgstr "désallouer une instruction préparée"
 
-#: sql_help.h:528
+#: sql_help.h:562
 msgid "define a cursor"
 msgstr "définir un curseur"
 
-#: sql_help.h:533
+#: sql_help.h:567
 msgid "delete rows of a table"
 msgstr "supprimer des lignes d'une table"
 
-#: sql_help.h:538
+#: sql_help.h:572
 msgid "discard session state"
 msgstr "annuler l'état de la session"
 
-#: sql_help.h:543
+#: sql_help.h:577
 msgid "execute an anonymous code block"
 msgstr "exécute un bloc de code anonyme"
 
-#: sql_help.h:548
+#: sql_help.h:582
 msgid "remove an aggregate function"
 msgstr "supprimer une fonction d'agrégation"
 
-#: sql_help.h:553
+#: sql_help.h:587
 msgid "remove a cast"
 msgstr "supprimer un transtypage"
 
-#: sql_help.h:558
+#: sql_help.h:592
+msgid "remove a collation"
+msgstr "supprimer un collationnement"
+
+#: sql_help.h:597
 msgid "remove a conversion"
 msgstr "supprimer une conversion"
 
-#: sql_help.h:563
+#: sql_help.h:602
 msgid "remove a database"
 msgstr "supprimer une base de données"
 
-#: sql_help.h:568
+#: sql_help.h:607
 msgid "remove a domain"
 msgstr "supprimer un domaine"
 
-#: sql_help.h:573
+#: sql_help.h:612
+msgid "remove an extension"
+msgstr "supprimer une extension"
+
+#: sql_help.h:617
 msgid "remove a foreign-data wrapper"
 msgstr "supprimer un wrapper de données distantes"
 
-#: sql_help.h:578
+#: sql_help.h:622
+msgid "remove a foreign table"
+msgstr "supprimer une table distante"
+
+#: sql_help.h:627
 msgid "remove a function"
 msgstr "supprimer une fonction"
 
-#: sql_help.h:583
-#: sql_help.h:618
-#: sql_help.h:683
+#: sql_help.h:632
+#: sql_help.h:667
+#: sql_help.h:732
 msgid "remove a database role"
 msgstr "supprimer un rôle de la base de données"
 
-#: sql_help.h:588
+#: sql_help.h:637
 msgid "remove an index"
 msgstr "supprimer un index"
 
-#: sql_help.h:593
+#: sql_help.h:642
 msgid "remove a procedural language"
 msgstr "supprimer un langage procédural"
 
-#: sql_help.h:598
+#: sql_help.h:647
 msgid "remove an operator"
 msgstr "supprimer un opérateur"
 
-#: sql_help.h:603
+#: sql_help.h:652
 msgid "remove an operator class"
 msgstr "supprimer une classe d'opérateur"
 
-#: sql_help.h:608
+#: sql_help.h:657
 msgid "remove an operator family"
 msgstr "supprimer une famille d'opérateur"
 
-#: sql_help.h:613
+#: sql_help.h:662
 msgid "remove database objects owned by a database role"
 msgstr "supprimer les objets appartenant à un rôle"
 
-#: sql_help.h:623
+#: sql_help.h:672
 msgid "remove a rewrite rule"
 msgstr "supprimer une règle de réécriture"
 
-#: sql_help.h:628
+#: sql_help.h:677
 msgid "remove a schema"
 msgstr "supprimer un schéma"
 
-#: sql_help.h:633
+#: sql_help.h:682
 msgid "remove a sequence"
 msgstr "supprimer une séquence"
 
-#: sql_help.h:638
+#: sql_help.h:687
 msgid "remove a foreign server descriptor"
 msgstr "supprimer un descripteur de serveur distant"
 
-#: sql_help.h:643
+#: sql_help.h:692
 msgid "remove a table"
 msgstr "supprimer une table"
 
-#: sql_help.h:648
+#: sql_help.h:697
 msgid "remove a tablespace"
 msgstr "supprimer un tablespace"
 
-#: sql_help.h:653
+#: sql_help.h:702
 msgid "remove a text search configuration"
 msgstr "supprimer une configuration de la recherche de texte"
 
-#: sql_help.h:658
+#: sql_help.h:707
 msgid "remove a text search dictionary"
 msgstr "supprimer un dictionnaire de la recherche de texte"
 
-#: sql_help.h:663
+#: sql_help.h:712
 msgid "remove a text search parser"
 msgstr "supprimer un analyseur de la recherche de texte"
 
-#: sql_help.h:668
+#: sql_help.h:717
 msgid "remove a text search template"
 msgstr "supprimer un modèle de la recherche de texte"
 
-#: sql_help.h:673
+#: sql_help.h:722
 msgid "remove a trigger"
 msgstr "supprimer un trigger"
 
-#: sql_help.h:678
+#: sql_help.h:727
 msgid "remove a data type"
 msgstr "supprimer un type de données"
 
-#: sql_help.h:688
+#: sql_help.h:737
 msgid "remove a user mapping for a foreign server"
 msgstr "supprime une correspondance utilisateur pour un serveur distant"
 
-#: sql_help.h:693
+#: sql_help.h:742
 msgid "remove a view"
 msgstr "supprimer une vue"
 
-#: sql_help.h:703
+#: sql_help.h:752
 msgid "execute a prepared statement"
 msgstr "exécuter une instruction préparée"
 
-#: sql_help.h:708
+#: sql_help.h:757
 msgid "show the execution plan of a statement"
 msgstr "afficher le plan d'exécution d'une instruction"
 
-#: sql_help.h:713
+#: sql_help.h:762
 msgid "retrieve rows from a query using a cursor"
 msgstr "extraire certaines lignes d'une requête à l'aide d'un curseur"
 
-#: sql_help.h:718
+#: sql_help.h:767
 msgid "define access privileges"
 msgstr "définir des privilèges d'accès"
 
-#: sql_help.h:723
+#: sql_help.h:772
 msgid "create new rows in a table"
 msgstr "créer de nouvelles lignes dans une table"
 
-#: sql_help.h:728
+#: sql_help.h:777
 msgid "listen for a notification"
 msgstr "se mettre à l'écoute d'une notification"
 
-#: sql_help.h:733
+#: sql_help.h:782
 msgid "load a shared library file"
 msgstr "charger un fichier de bibliothèque partagée"
 
-#: sql_help.h:738
+#: sql_help.h:787
 msgid "lock a table"
 msgstr "verrouiller une table"
 
-#: sql_help.h:743
+#: sql_help.h:792
 msgid "position a cursor"
 msgstr "positionner un curseur"
 
-#: sql_help.h:748
+#: sql_help.h:797
 msgid "generate a notification"
 msgstr "engendrer une notification"
 
-#: sql_help.h:753
+#: sql_help.h:802
 msgid "prepare a statement for execution"
 msgstr "préparer une instruction pour exécution"
 
-#: sql_help.h:758
+#: sql_help.h:807
 msgid "prepare the current transaction for two-phase commit"
 msgstr "préparer la transaction en cours pour une validation en deux phases"
 
-#: sql_help.h:763
+#: sql_help.h:812
 msgid "change the ownership of database objects owned by a database role"
 msgstr "changer le propriétaire des objets d'un rôle"
 
-#: sql_help.h:768
+#: sql_help.h:817
 msgid "rebuild indexes"
 msgstr "reconstruire des index"
 
-#: sql_help.h:773
+#: sql_help.h:822
 msgid "destroy a previously defined savepoint"
 msgstr "détruire un point de retournement précédemment défini"
 
-#: sql_help.h:778
+#: sql_help.h:827
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "réinitialiser un paramètre d'exécution à sa valeur par défaut"
 
-#: sql_help.h:783
+#: sql_help.h:832
 msgid "remove access privileges"
 msgstr "supprimer des privilèges d'accès"
 
-#: sql_help.h:793
+#: sql_help.h:842
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "annuler une transaction précédemment préparée pour une validation en deux\n"
 "phases"
 
-#: sql_help.h:798
+#: sql_help.h:847
 msgid "roll back to a savepoint"
 msgstr "annuler jusqu'au point de retournement"
 
-#: sql_help.h:803
+#: sql_help.h:852
 msgid "define a new savepoint within the current transaction"
 msgstr "définir un nouveau point de retournement pour la transaction en cours"
 
-#: sql_help.h:808
-#: sql_help.h:853
-#: sql_help.h:883
+#: sql_help.h:857
+msgid "define or change a security label applied to an object"
+msgstr "définir ou modifier un label de sécurité à un objet"
+
+#: sql_help.h:862
+#: sql_help.h:907
+#: sql_help.h:937
 msgid "retrieve rows from a table or view"
 msgstr "extraire des lignes d'une table ou d'une vue"
 
-#: sql_help.h:818
+#: sql_help.h:872
 msgid "change a run-time parameter"
 msgstr "modifier un paramètre d'exécution"
 
-#: sql_help.h:823
+#: sql_help.h:877
 msgid "set constraint check timing for the current transaction"
 msgstr "définir le moment de la vérification des contraintes pour la transaction en cours"
 
-#: sql_help.h:828
+#: sql_help.h:882
 msgid "set the current user identifier of the current session"
 msgstr "définir l'identifiant actuel de l'utilisateur de la session courante"
 
-#: sql_help.h:833
+#: sql_help.h:887
 msgid "set the session user identifier and the current user identifier of the current session"
 msgstr ""
 "définir l'identifiant de l'utilisateur de session et l'identifiant actuel de\n"
 "l'utilisateur de la session courante"
 
-#: sql_help.h:838
+#: sql_help.h:892
 msgid "set the characteristics of the current transaction"
 msgstr "définir les caractéristiques de la transaction en cours"
 
-#: sql_help.h:843
+#: sql_help.h:897
 msgid "show the value of a run-time parameter"
 msgstr "afficher la valeur d'un paramètre d'exécution"
 
-#: sql_help.h:858
+#: sql_help.h:912
 msgid "empty a table or set of tables"
 msgstr "vider une table ou un ensemble de tables"
 
-#: sql_help.h:863
+#: sql_help.h:917
 msgid "stop listening for a notification"
 msgstr "arrêter l'écoute d'une notification"
 
-#: sql_help.h:868
+#: sql_help.h:922
 msgid "update rows of a table"
 msgstr "actualiser les lignes d'une table"
 
-#: sql_help.h:873
+#: sql_help.h:927
 msgid "garbage-collect and optionally analyze a database"
 msgstr "compacter et optionnellement analyser une base de données"
 
-#: sql_help.h:878
+#: sql_help.h:932
 msgid "compute a set of rows"
 msgstr "calculer un ensemble de lignes"
 
 #: sql_help.c:26
 #: sql_help.c:29
 #: sql_help.c:32
-#: sql_help.c:43
-#: sql_help.c:45
-#: sql_help.c:69
-#: sql_help.c:73
-#: sql_help.c:75
-#: sql_help.c:77
-#: sql_help.c:79
-#: sql_help.c:82
-#: sql_help.c:84
-#: sql_help.c:86
-#: sql_help.c:161
-#: sql_help.c:163
-#: sql_help.c:164
-#: sql_help.c:166
-#: sql_help.c:168
-#: sql_help.c:170
+#: sql_help.c:44
+#: sql_help.c:46
+#: sql_help.c:48
+#: sql_help.c:59
+#: sql_help.c:61
+#: sql_help.c:63
+#: sql_help.c:87
+#: sql_help.c:91
+#: sql_help.c:93
+#: sql_help.c:95
+#: sql_help.c:97
+#: sql_help.c:100
+#: sql_help.c:102
+#: sql_help.c:104
+#: sql_help.c:179
+#: sql_help.c:181
 #: sql_help.c:182
+#: sql_help.c:184
 #: sql_help.c:186
-#: sql_help.c:214
-#: sql_help.c:219
-#: sql_help.c:224
-#: sql_help.c:229
-#: sql_help.c:267
-#: sql_help.c:269
-#: sql_help.c:271
-#: sql_help.c:274
-#: sql_help.c:284
-#: sql_help.c:286
-#: sql_help.c:304
-#: sql_help.c:316
-#: sql_help.c:319
-#: sql_help.c:338
-#: sql_help.c:349
-#: sql_help.c:357
-#: sql_help.c:360
-#: sql_help.c:389
-#: sql_help.c:395
-#: sql_help.c:397
-#: sql_help.c:401
+#: sql_help.c:188
+#: sql_help.c:276
+#: sql_help.c:281
+#: sql_help.c:306
+#: sql_help.c:308
+#: sql_help.c:311
+#: sql_help.c:313
+#: sql_help.c:351
+#: sql_help.c:356
+#: sql_help.c:361
+#: sql_help.c:366
 #: sql_help.c:404
-#: sql_help.c:407
-#: sql_help.c:417
-#: sql_help.c:419
-#: sql_help.c:436
-#: sql_help.c:445
-#: sql_help.c:447
-#: sql_help.c:449
-#: sql_help.c:513
-#: sql_help.c:515
-#: sql_help.c:518
-#: sql_help.c:520
-#: sql_help.c:570
-#: sql_help.c:572
-#: sql_help.c:574
-#: sql_help.c:577
+#: sql_help.c:406
+#: sql_help.c:408
+#: sql_help.c:411
+#: sql_help.c:421
+#: sql_help.c:423
+#: sql_help.c:442
+#: sql_help.c:446
+#: sql_help.c:459
+#: sql_help.c:462
+#: sql_help.c:465
+#: sql_help.c:485
+#: sql_help.c:497
+#: sql_help.c:505
+#: sql_help.c:508
+#: sql_help.c:511
+#: sql_help.c:541
+#: sql_help.c:547
+#: sql_help.c:549
+#: sql_help.c:553
+#: sql_help.c:556
+#: sql_help.c:559
+#: sql_help.c:569
+#: sql_help.c:571
+#: sql_help.c:588
 #: sql_help.c:597
-#: sql_help.c:600
-#: sql_help.c:603
-#: sql_help.c:606
-#: sql_help.c:610
-#: sql_help.c:612
-#: sql_help.c:614
-#: sql_help.c:627
-#: sql_help.c:630
-#: sql_help.c:632
-#: sql_help.c:641
-#: sql_help.c:650
-#: sql_help.c:659
-#: sql_help.c:671
-#: sql_help.c:673
+#: sql_help.c:599
+#: sql_help.c:601
 #: sql_help.c:675
-#: sql_help.c:703
-#: sql_help.c:709
-#: sql_help.c:711
-#: sql_help.c:714
-#: sql_help.c:716
-#: sql_help.c:718
-#: sql_help.c:743
-#: sql_help.c:746
-#: sql_help.c:748
-#: sql_help.c:750
-#: sql_help.c:752
-#: sql_help.c:791
-#: sql_help.c:962
-#: sql_help.c:970
-#: sql_help.c:1016
-#: sql_help.c:1031
-#: sql_help.c:1049
-#: sql_help.c:1071
-#: sql_help.c:1087
-#: sql_help.c:1113
-#: sql_help.c:1155
-#: sql_help.c:1177
-#: sql_help.c:1196
-#: sql_help.c:1197
-#: sql_help.c:1214
-#: sql_help.c:1234
-#: sql_help.c:1255
-#: sql_help.c:1282
-#: sql_help.c:1303
-#: sql_help.c:1333
-#: sql_help.c:1513
-#: sql_help.c:1526
-#: sql_help.c:1543
-#: sql_help.c:1559
-#: sql_help.c:1572
-#: sql_help.c:1611
-#: sql_help.c:1614
-#: sql_help.c:1616
-#: sql_help.c:1633
-#: sql_help.c:1659
-#: sql_help.c:1692
-#: sql_help.c:1702
-#: sql_help.c:1711
-#: sql_help.c:1753
+#: sql_help.c:677
+#: sql_help.c:680
+#: sql_help.c:682
+#: sql_help.c:740
+#: sql_help.c:742
+#: sql_help.c:744
+#: sql_help.c:747
+#: sql_help.c:768
+#: sql_help.c:771
+#: sql_help.c:774
+#: sql_help.c:777
+#: sql_help.c:781
+#: sql_help.c:783
+#: sql_help.c:785
+#: sql_help.c:787
+#: sql_help.c:801
+#: sql_help.c:804
+#: sql_help.c:806
+#: sql_help.c:808
+#: sql_help.c:818
+#: sql_help.c:820
+#: sql_help.c:830
+#: sql_help.c:832
+#: sql_help.c:841
+#: sql_help.c:862
+#: sql_help.c:864
+#: sql_help.c:866
+#: sql_help.c:869
+#: sql_help.c:871
+#: sql_help.c:873
+#: sql_help.c:911
+#: sql_help.c:917
+#: sql_help.c:919
+#: sql_help.c:922
+#: sql_help.c:924
+#: sql_help.c:926
+#: sql_help.c:951
+#: sql_help.c:954
+#: sql_help.c:956
+#: sql_help.c:958
+#: sql_help.c:960
+#: sql_help.c:1000
+#: sql_help.c:1183
+#: sql_help.c:1191
+#: sql_help.c:1235
+#: sql_help.c:1239
+#: sql_help.c:1249
+#: sql_help.c:1267
+#: sql_help.c:1290
+#: sql_help.c:1322
+#: sql_help.c:1367
+#: sql_help.c:1409
+#: sql_help.c:1431
+#: sql_help.c:1451
+#: sql_help.c:1452
+#: sql_help.c:1469
+#: sql_help.c:1489
+#: sql_help.c:1511
+#: sql_help.c:1539
+#: sql_help.c:1560
+#: sql_help.c:1590
 #: sql_help.c:1771
-#: sql_help.c:1779
-#: sql_help.c:1787
-#: sql_help.c:1795
-#: sql_help.c:1804
-#: sql_help.c:1815
-#: sql_help.c:1823
-#: sql_help.c:1831
-#: sql_help.c:1839
-#: sql_help.c:1849
-#: sql_help.c:1858
-#: sql_help.c:1867
-#: sql_help.c:1875
+#: sql_help.c:1784
+#: sql_help.c:1801
+#: sql_help.c:1817
+#: sql_help.c:1840
 #: sql_help.c:1883
-#: sql_help.c:1892
-#: sql_help.c:1900
-#: sql_help.c:1916
-#: sql_help.c:1932
-#: sql_help.c:1940
-#: sql_help.c:1948
-#: sql_help.c:1956
-#: sql_help.c:1964
-#: sql_help.c:1973
-#: sql_help.c:1981
-#: sql_help.c:1998
-#: sql_help.c:2013
+#: sql_help.c:1887
+#: sql_help.c:1889
+#: sql_help.c:1907
+#: sql_help.c:1934
+#: sql_help.c:1967
+#: sql_help.c:1977
+#: sql_help.c:1986
+#: sql_help.c:2030
+#: sql_help.c:2048
+#: sql_help.c:2056
+#: sql_help.c:2064
+#: sql_help.c:2072
+#: sql_help.c:2088
+#: sql_help.c:2096
+#: sql_help.c:2105
+#: sql_help.c:2116
+#: sql_help.c:2124
+#: sql_help.c:2132
+#: sql_help.c:2140
+#: sql_help.c:2150
+#: sql_help.c:2159
+#: sql_help.c:2168
+#: sql_help.c:2176
+#: sql_help.c:2184
 #: sql_help.c:2193
-#: sql_help.c:2221
-#: sql_help.c:2248
-#: sql_help.c:2549
-#: sql_help.c:2594
-#: sql_help.c:2698
+#: sql_help.c:2201
+#: sql_help.c:2217
+#: sql_help.c:2233
+#: sql_help.c:2241
+#: sql_help.c:2249
+#: sql_help.c:2257
+#: sql_help.c:2265
+#: sql_help.c:2274
+#: sql_help.c:2282
+#: sql_help.c:2299
+#: sql_help.c:2314
+#: sql_help.c:2506
+#: sql_help.c:2557
+#: sql_help.c:2584
+#: sql_help.c:2927
+#: sql_help.c:2973
+#: sql_help.c:3080
 msgid "name"
 msgstr "nom"
 
 #: sql_help.c:27
 #: sql_help.c:30
 #: sql_help.c:33
-#: sql_help.c:524
-#: sql_help.c:528
-#: sql_help.c:1754
+#: sql_help.c:317
+#: sql_help.c:320
+#: sql_help.c:2031
 msgid "type"
 msgstr "type"
 
 #: sql_help.c:28
-#: sql_help.c:44
-#: sql_help.c:74
-#: sql_help.c:223
-#: sql_help.c:256
-#: sql_help.c:268
-#: sql_help.c:285
-#: sql_help.c:318
-#: sql_help.c:359
-#: sql_help.c:396
-#: sql_help.c:418
-#: sql_help.c:448
-#: sql_help.c:519
-#: sql_help.c:571
-#: sql_help.c:613
-#: sql_help.c:631
-#: sql_help.c:642
-#: sql_help.c:651
-#: sql_help.c:661
-#: sql_help.c:672
-#: sql_help.c:710
-#: sql_help.c:751
+#: sql_help.c:45
+#: sql_help.c:60
+#: sql_help.c:92
+#: sql_help.c:312
+#: sql_help.c:360
+#: sql_help.c:393
+#: sql_help.c:405
+#: sql_help.c:422
+#: sql_help.c:461
+#: sql_help.c:507
+#: sql_help.c:548
+#: sql_help.c:570
+#: sql_help.c:600
+#: sql_help.c:681
+#: sql_help.c:741
+#: sql_help.c:784
+#: sql_help.c:805
+#: sql_help.c:819
+#: sql_help.c:831
+#: sql_help.c:843
+#: sql_help.c:870
+#: sql_help.c:918
+#: sql_help.c:959
 msgid "new_name"
 msgstr "nouveau_nom"
 
 #: sql_help.c:31
-#: sql_help.c:46
-#: sql_help.c:76
-#: sql_help.c:169
+#: sql_help.c:47
+#: sql_help.c:62
+#: sql_help.c:94
 #: sql_help.c:187
-#: sql_help.c:228
-#: sql_help.c:287
-#: sql_help.c:296
-#: sql_help.c:307
-#: sql_help.c:321
-#: sql_help.c:362
-#: sql_help.c:420
-#: sql_help.c:446
-#: sql_help.c:465
-#: sql_help.c:558
-#: sql_help.c:573
-#: sql_help.c:615
-#: sql_help.c:633
-#: sql_help.c:674
-#: sql_help.c:749
+#: sql_help.c:282
+#: sql_help.c:322
+#: sql_help.c:365
+#: sql_help.c:424
+#: sql_help.c:433
+#: sql_help.c:445
+#: sql_help.c:464
+#: sql_help.c:510
+#: sql_help.c:572
+#: sql_help.c:598
+#: sql_help.c:617
+#: sql_help.c:725
+#: sql_help.c:743
+#: sql_help.c:786
+#: sql_help.c:807
+#: sql_help.c:865
+#: sql_help.c:957
 msgid "new_owner"
 msgstr "nouveau_propriétaire"
 
 #: sql_help.c:34
-#: sql_help.c:171
-#: sql_help.c:233
-#: sql_help.c:450
-#: sql_help.c:521
-#: sql_help.c:676
-#: sql_help.c:753
+#: sql_help.c:49
+#: sql_help.c:64
+#: sql_help.c:189
+#: sql_help.c:228
+#: sql_help.c:314
+#: sql_help.c:370
+#: sql_help.c:449
+#: sql_help.c:467
+#: sql_help.c:513
+#: sql_help.c:602
+#: sql_help.c:683
+#: sql_help.c:788
+#: sql_help.c:809
+#: sql_help.c:821
+#: sql_help.c:833
+#: sql_help.c:872
+#: sql_help.c:961
 msgid "new_schema"
 msgstr "nouveau_schéma"
 
-#: sql_help.c:70
-#: sql_help.c:184
-#: sql_help.c:390
-#: sql_help.c:462
-#: sql_help.c:628
-#: sql_help.c:704
-#: sql_help.c:730
-#: sql_help.c:922
-#: sql_help.c:927
-#: sql_help.c:1089
-#: sql_help.c:1156
-#: sql_help.c:1283
-#: sql_help.c:1354
-#: sql_help.c:1528
-#: sql_help.c:1660
-#: sql_help.c:1682
+#: sql_help.c:88
+#: sql_help.c:279
+#: sql_help.c:323
+#: sql_help.c:542
+#: sql_help.c:614
+#: sql_help.c:802
+#: sql_help.c:912
+#: sql_help.c:938
+#: sql_help.c:1142
+#: sql_help.c:1147
+#: sql_help.c:1325
+#: sql_help.c:1343
+#: sql_help.c:1410
+#: sql_help.c:1540
+#: sql_help.c:1611
+#: sql_help.c:1786
+#: sql_help.c:1935
+#: sql_help.c:1957
+#: sql_help.c:2332
 msgid "option"
 msgstr "option"
 
-#: sql_help.c:71
-#: sql_help.c:391
-#: sql_help.c:705
-#: sql_help.c:1157
-#: sql_help.c:1284
-#: sql_help.c:1661
+#: sql_help.c:89
+#: sql_help.c:543
+#: sql_help.c:913
+#: sql_help.c:1411
+#: sql_help.c:1541
+#: sql_help.c:1936
 msgid "where option can be:"
 msgstr "où option peut être :"
 
-#: sql_help.c:72
-#: sql_help.c:392
-#: sql_help.c:706
-#: sql_help.c:1056
-#: sql_help.c:1285
-#: sql_help.c:1662
+#: sql_help.c:90
+#: sql_help.c:544
+#: sql_help.c:914
+#: sql_help.c:1274
+#: sql_help.c:1542
+#: sql_help.c:1937
 msgid "connlimit"
 msgstr "limite_de_connexion"
 
-#: sql_help.c:78
-#: sql_help.c:559
+#: sql_help.c:96
+#: sql_help.c:726
 msgid "new_tablespace"
 msgstr "nouveau_tablespace"
 
-#: sql_help.c:80
-#: sql_help.c:83
-#: sql_help.c:85
-#: sql_help.c:237
-#: sql_help.c:239
-#: sql_help.c:240
-#: sql_help.c:399
-#: sql_help.c:403
-#: sql_help.c:406
-#: sql_help.c:712
-#: sql_help.c:715
-#: sql_help.c:717
-#: sql_help.c:1124
-#: sql_help.c:2265
-#: sql_help.c:2538
+#: sql_help.c:98
+#: sql_help.c:101
+#: sql_help.c:103
+#: sql_help.c:374
+#: sql_help.c:376
+#: sql_help.c:377
+#: sql_help.c:551
+#: sql_help.c:555
+#: sql_help.c:558
+#: sql_help.c:920
+#: sql_help.c:923
+#: sql_help.c:925
+#: sql_help.c:1378
+#: sql_help.c:2601
+#: sql_help.c:2916
 msgid "configuration_parameter"
 msgstr "paramètre_configuration"
 
-#: sql_help.c:81
-#: sql_help.c:185
-#: sql_help.c:238
-#: sql_help.c:273
-#: sql_help.c:400
-#: sql_help.c:463
-#: sql_help.c:538
-#: sql_help.c:554
-#: sql_help.c:576
-#: sql_help.c:629
-#: sql_help.c:713
-#: sql_help.c:731
-#: sql_help.c:1090
-#: sql_help.c:1125
-#: sql_help.c:1126
-#: sql_help.c:1184
-#: sql_help.c:1355
-#: sql_help.c:1428
-#: sql_help.c:1437
-#: sql_help.c:1468
-#: sql_help.c:1490
-#: sql_help.c:1529
-#: sql_help.c:1683
-#: sql_help.c:2539
-#: sql_help.c:2540
+#: sql_help.c:99
+#: sql_help.c:280
+#: sql_help.c:324
+#: sql_help.c:375
+#: sql_help.c:410
+#: sql_help.c:552
+#: sql_help.c:615
+#: sql_help.c:702
+#: sql_help.c:720
+#: sql_help.c:746
+#: sql_help.c:803
+#: sql_help.c:921
+#: sql_help.c:939
+#: sql_help.c:1326
+#: sql_help.c:1344
+#: sql_help.c:1379
+#: sql_help.c:1380
+#: sql_help.c:1439
+#: sql_help.c:1612
+#: sql_help.c:1686
+#: sql_help.c:1694
+#: sql_help.c:1726
+#: sql_help.c:1748
+#: sql_help.c:1787
+#: sql_help.c:1958
+#: sql_help.c:2917
+#: sql_help.c:2918
 msgid "value"
 msgstr "valeur"
 
-#: sql_help.c:133
+#: sql_help.c:151
 msgid "target_role"
 msgstr "rôle_cible"
 
-#: sql_help.c:134
-#: sql_help.c:1318
-#: sql_help.c:2119
-#: sql_help.c:2126
-#: sql_help.c:2138
-#: sql_help.c:2144
-#: sql_help.c:2348
-#: sql_help.c:2355
-#: sql_help.c:2367
-#: sql_help.c:2373
+#: sql_help.c:152
+#: sql_help.c:1575
+#: sql_help.c:2430
+#: sql_help.c:2437
+#: sql_help.c:2449
+#: sql_help.c:2455
+#: sql_help.c:2684
+#: sql_help.c:2691
+#: sql_help.c:2703
+#: sql_help.c:2709
 msgid "schema_name"
 msgstr "nom_schéma"
 
-#: sql_help.c:135
+#: sql_help.c:153
 msgid "abbreviated_grant_or_revoke"
 msgstr "grant_ou_revoke_raccourci"
 
-#: sql_help.c:136
+#: sql_help.c:154
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "où abbreviated_grant_or_revoke fait partie de :"
 
-#: sql_help.c:137
-#: sql_help.c:138
-#: sql_help.c:139
-#: sql_help.c:140
-#: sql_help.c:141
-#: sql_help.c:142
-#: sql_help.c:1160
-#: sql_help.c:1161
-#: sql_help.c:1162
-#: sql_help.c:1163
-#: sql_help.c:1164
-#: sql_help.c:1288
-#: sql_help.c:1289
-#: sql_help.c:1290
-#: sql_help.c:1291
-#: sql_help.c:1292
-#: sql_help.c:1665
-#: sql_help.c:1666
-#: sql_help.c:1667
-#: sql_help.c:1668
-#: sql_help.c:1669
-#: sql_help.c:2120
-#: sql_help.c:2124
-#: sql_help.c:2127
-#: sql_help.c:2129
-#: sql_help.c:2131
-#: sql_help.c:2133
-#: sql_help.c:2139
-#: sql_help.c:2141
-#: sql_help.c:2143
-#: sql_help.c:2145
-#: sql_help.c:2147
-#: sql_help.c:2148
-#: sql_help.c:2149
-#: sql_help.c:2349
-#: sql_help.c:2353
-#: sql_help.c:2356
-#: sql_help.c:2358
-#: sql_help.c:2360
-#: sql_help.c:2362
-#: sql_help.c:2368
-#: sql_help.c:2370
-#: sql_help.c:2372
-#: sql_help.c:2374
-#: sql_help.c:2376
-#: sql_help.c:2377
-#: sql_help.c:2378
-#: sql_help.c:2559
+#: sql_help.c:155
+#: sql_help.c:156
+#: sql_help.c:157
+#: sql_help.c:158
+#: sql_help.c:159
+#: sql_help.c:160
+#: sql_help.c:1414
+#: sql_help.c:1415
+#: sql_help.c:1416
+#: sql_help.c:1417
+#: sql_help.c:1418
+#: sql_help.c:1545
+#: sql_help.c:1546
+#: sql_help.c:1547
+#: sql_help.c:1548
+#: sql_help.c:1549
+#: sql_help.c:1940
+#: sql_help.c:1941
+#: sql_help.c:1942
+#: sql_help.c:1943
+#: sql_help.c:1944
+#: sql_help.c:2431
+#: sql_help.c:2435
+#: sql_help.c:2438
+#: sql_help.c:2440
+#: sql_help.c:2442
+#: sql_help.c:2444
+#: sql_help.c:2450
+#: sql_help.c:2452
+#: sql_help.c:2454
+#: sql_help.c:2456
+#: sql_help.c:2458
+#: sql_help.c:2459
+#: sql_help.c:2460
+#: sql_help.c:2685
+#: sql_help.c:2689
+#: sql_help.c:2692
+#: sql_help.c:2694
+#: sql_help.c:2696
+#: sql_help.c:2698
+#: sql_help.c:2704
+#: sql_help.c:2706
+#: sql_help.c:2708
+#: sql_help.c:2710
+#: sql_help.c:2712
+#: sql_help.c:2713
+#: sql_help.c:2714
+#: sql_help.c:2937
 msgid "role_name"
 msgstr "nom_rôle"
 
-#: sql_help.c:162
-#: sql_help.c:529
-#: sql_help.c:531
-#: sql_help.c:745
-#: sql_help.c:1073
-#: sql_help.c:1077
-#: sql_help.c:1181
-#: sql_help.c:1441
-#: sql_help.c:1450
-#: sql_help.c:1472
-#: sql_help.c:2161
-#: sql_help.c:2446
-#: sql_help.c:2447
-#: sql_help.c:2451
-#: sql_help.c:2456
-#: sql_help.c:2513
-#: sql_help.c:2514
-#: sql_help.c:2519
-#: sql_help.c:2524
-#: sql_help.c:2645
-#: sql_help.c:2646
-#: sql_help.c:2650
-#: sql_help.c:2655
-#: sql_help.c:2722
-#: sql_help.c:2724
-#: sql_help.c:2755
-#: sql_help.c:2797
-#: sql_help.c:2798
-#: sql_help.c:2802
-#: sql_help.c:2807
+#: sql_help.c:180
+#: sql_help.c:693
+#: sql_help.c:695
+#: sql_help.c:953
+#: sql_help.c:1293
+#: sql_help.c:1297
+#: sql_help.c:1435
+#: sql_help.c:1698
+#: sql_help.c:1708
+#: sql_help.c:1730
+#: sql_help.c:2474
+#: sql_help.c:2822
+#: sql_help.c:2823
+#: sql_help.c:2827
+#: sql_help.c:2832
+#: sql_help.c:2891
+#: sql_help.c:2892
+#: sql_help.c:2897
+#: sql_help.c:2902
+#: sql_help.c:3025
+#: sql_help.c:3026
+#: sql_help.c:3030
+#: sql_help.c:3035
+#: sql_help.c:3106
+#: sql_help.c:3108
+#: sql_help.c:3139
+#: sql_help.c:3181
+#: sql_help.c:3182
+#: sql_help.c:3186
+#: sql_help.c:3191
 msgid "expression"
 msgstr "expression"
 
-#: sql_help.c:165
+#: sql_help.c:183
 msgid "domain_constraint"
 msgstr "contrainte_domaine"
 
-#: sql_help.c:167
-#: sql_help.c:543
-#: sql_help.c:845
-#: sql_help.c:1076
-#: sql_help.c:1440
-#: sql_help.c:1449
+#: sql_help.c:185
+#: sql_help.c:708
+#: sql_help.c:709
+#: sql_help.c:728
+#: sql_help.c:1059
+#: sql_help.c:1296
+#: sql_help.c:1697
+#: sql_help.c:1707
 msgid "constraint_name"
 msgstr "nom_contrainte"
 
-#: sql_help.c:183
-#: sql_help.c:1088
-#: sql_help.c:1200
-msgid "valfunction"
-msgstr "fonction_val"
-
-#: sql_help.c:215
-#: sql_help.c:220
 #: sql_help.c:225
+#: sql_help.c:227
+#: sql_help.c:229
+#: sql_help.c:231
+#: sql_help.c:1308
+#: sql_help.c:2080
+msgid "extension_name"
+msgstr "nom_extension"
+
+#: sql_help.c:226
+#: sql_help.c:613
+msgid "new_version"
+msgstr "nouvelle_version"
+
 #: sql_help.c:230
-#: sql_help.c:851
-#: sql_help.c:1114
-#: sql_help.c:1805
-#: sql_help.c:2135
-#: sql_help.c:2364
+#: sql_help.c:232
+msgid "member_object"
+msgstr "objet_membre"
+
+#: sql_help.c:233
+msgid "where member_object is:"
+msgstr "où objet_membre fait partie de :"
+
+#: sql_help.c:234
+#: sql_help.c:1052
+#: sql_help.c:2771
+msgid "agg_name"
+msgstr "nom_d_agrégat"
+
+#: sql_help.c:235
+#: sql_help.c:1053
+#: sql_help.c:2772
+msgid "agg_type"
+msgstr "type_aggrégat"
+
+#: sql_help.c:236
+#: sql_help.c:1054
+#: sql_help.c:1215
+#: sql_help.c:1219
+#: sql_help.c:1221
+#: sql_help.c:2039
+msgid "source_type"
+msgstr "type_source"
+
+#: sql_help.c:237
+#: sql_help.c:1055
+#: sql_help.c:1216
+#: sql_help.c:1220
+#: sql_help.c:1222
+#: sql_help.c:2040
+msgid "target_type"
+msgstr "type_cible"
+
+#: sql_help.c:238
+#: sql_help.c:239
+#: sql_help.c:240
+#: sql_help.c:241
+#: sql_help.c:242
+#: sql_help.c:250
+#: sql_help.c:252
+#: sql_help.c:254
+#: sql_help.c:255
+#: sql_help.c:256
+#: sql_help.c:257
+#: sql_help.c:258
+#: sql_help.c:259
+#: sql_help.c:260
+#: sql_help.c:261
+#: sql_help.c:262
+#: sql_help.c:263
+#: sql_help.c:264
+#: sql_help.c:1056
+#: sql_help.c:1061
+#: sql_help.c:1062
+#: sql_help.c:1063
+#: sql_help.c:1064
+#: sql_help.c:1065
+#: sql_help.c:1066
+#: sql_help.c:1071
+#: sql_help.c:1076
+#: sql_help.c:1078
+#: sql_help.c:1080
+#: sql_help.c:1081
+#: sql_help.c:1084
+#: sql_help.c:1085
+#: sql_help.c:1086
+#: sql_help.c:1087
+#: sql_help.c:1088
+#: sql_help.c:1089
+#: sql_help.c:1090
+#: sql_help.c:1091
+#: sql_help.c:1092
+#: sql_help.c:1095
+#: sql_help.c:1096
+#: sql_help.c:2768
+#: sql_help.c:2773
+#: sql_help.c:2774
+#: sql_help.c:2780
+#: sql_help.c:2781
+#: sql_help.c:2782
+#: sql_help.c:2783
+#: sql_help.c:2784
+msgid "object_name"
+msgstr "nom_objet"
+
+#: sql_help.c:243
+#: sql_help.c:495
+#: sql_help.c:1067
+#: sql_help.c:1217
+#: sql_help.c:1252
+#: sql_help.c:1470
+#: sql_help.c:1501
+#: sql_help.c:1845
+#: sql_help.c:2445
+#: sql_help.c:2699
+#: sql_help.c:2775
+#: sql_help.c:2848
+#: sql_help.c:2853
+#: sql_help.c:3051
+#: sql_help.c:3056
+#: sql_help.c:3207
+#: sql_help.c:3212
+msgid "function_name"
+msgstr "nom_fonction"
+
+#: sql_help.c:244
+#: sql_help.c:352
+#: sql_help.c:357
+#: sql_help.c:362
+#: sql_help.c:367
+#: sql_help.c:1068
+#: sql_help.c:1368
+#: sql_help.c:2106
+#: sql_help.c:2446
+#: sql_help.c:2700
+#: sql_help.c:2776
 msgid "argmode"
 msgstr "mode_argument"
 
-#: sql_help.c:216
-#: sql_help.c:221
-#: sql_help.c:226
-#: sql_help.c:231
-#: sql_help.c:852
-#: sql_help.c:1115
-#: sql_help.c:1806
+#: sql_help.c:245
+#: sql_help.c:353
+#: sql_help.c:358
+#: sql_help.c:363
+#: sql_help.c:368
+#: sql_help.c:1069
+#: sql_help.c:1369
+#: sql_help.c:2107
+#: sql_help.c:2777
 msgid "argname"
 msgstr "nom_agrégat"
 
-#: sql_help.c:217
-#: sql_help.c:222
-#: sql_help.c:227
-#: sql_help.c:232
-#: sql_help.c:853
-#: sql_help.c:1116
-#: sql_help.c:1807
+#: sql_help.c:246
+#: sql_help.c:354
+#: sql_help.c:359
+#: sql_help.c:364
+#: sql_help.c:369
+#: sql_help.c:1070
+#: sql_help.c:1370
+#: sql_help.c:2108
+#: sql_help.c:2778
 msgid "argtype"
 msgstr "type_argument"
 
-#: sql_help.c:218
-#: sql_help.c:514
-#: sql_help.c:1446
-#: sql_help.c:1447
-#: sql_help.c:1463
-#: sql_help.c:1464
+#: sql_help.c:247
+#: sql_help.c:488
+#: sql_help.c:1073
+#: sql_help.c:1494
+msgid "operator_name"
+msgstr "nom_opérateur"
+
+#: sql_help.c:248
+#: sql_help.c:443
+#: sql_help.c:447
+#: sql_help.c:1074
+#: sql_help.c:1471
+#: sql_help.c:2141
+msgid "left_type"
+msgstr "type_argument_gauche"
+
+#: sql_help.c:249
+#: sql_help.c:444
+#: sql_help.c:448
+#: sql_help.c:1075
+#: sql_help.c:1472
+#: sql_help.c:2142
+msgid "right_type"
+msgstr "type_argument_droit"
+
+#: sql_help.c:251
+#: sql_help.c:253
+#: sql_help.c:460
+#: sql_help.c:463
+#: sql_help.c:466
+#: sql_help.c:486
+#: sql_help.c:498
+#: sql_help.c:506
+#: sql_help.c:509
+#: sql_help.c:512
+#: sql_help.c:1077
+#: sql_help.c:1079
+#: sql_help.c:1491
+#: sql_help.c:1512
+#: sql_help.c:1713
+#: sql_help.c:2151
+#: sql_help.c:2160
+msgid "index_method"
+msgstr "méthode_indexage"
+
+#: sql_help.c:277
+#: sql_help.c:1323
+msgid "handler_function"
+msgstr "fonction_gestionnaire"
+
+#: sql_help.c:278
+#: sql_help.c:1324
+msgid "validator_function"
+msgstr "fonction_validateur"
+
+#: sql_help.c:307
+#: sql_help.c:355
+#: sql_help.c:676
+#: sql_help.c:863
+#: sql_help.c:1704
+#: sql_help.c:1705
+#: sql_help.c:1721
+#: sql_help.c:1722
 msgid "action"
 msgstr "action"
 
-#: sql_help.c:234
-#: sql_help.c:522
+#: sql_help.c:309
+#: sql_help.c:316
+#: sql_help.c:318
+#: sql_help.c:319
+#: sql_help.c:321
+#: sql_help.c:596
+#: sql_help.c:678
+#: sql_help.c:685
+#: sql_help.c:689
+#: sql_help.c:690
+#: sql_help.c:694
+#: sql_help.c:696
+#: sql_help.c:697
+#: sql_help.c:698
+#: sql_help.c:700
+#: sql_help.c:703
+#: sql_help.c:705
+#: sql_help.c:952
+#: sql_help.c:955
+#: sql_help.c:970
+#: sql_help.c:1140
+#: sql_help.c:1144
+#: sql_help.c:1156
+#: sql_help.c:1157
+#: sql_help.c:1434
+#: sql_help.c:1597
+#: sql_help.c:1729
+#: sql_help.c:2432
+#: sql_help.c:2433
+#: sql_help.c:2473
+#: sql_help.c:2686
+#: sql_help.c:2687
+#: sql_help.c:3105
+#: sql_help.c:3107
+#: sql_help.c:3124
+#: sql_help.c:3127
+msgid "column"
+msgstr "colonne"
+
+#: sql_help.c:310
+#: sql_help.c:679
+msgid "new_column"
+msgstr "nouvelle_colonne"
+
+#: sql_help.c:315
+#: sql_help.c:371
+#: sql_help.c:684
+#: sql_help.c:876
 msgid "where action is one of:"
 msgstr "où action fait partie de :"
 
-#: sql_help.c:235
-#: sql_help.c:1122
+#: sql_help.c:372
+#: sql_help.c:1376
 msgid "execution_cost"
 msgstr "coût_exécution"
 
-#: sql_help.c:236
-#: sql_help.c:1123
+#: sql_help.c:373
+#: sql_help.c:1377
 msgid "result_rows"
 msgstr "lignes_de_résultat"
 
-#: sql_help.c:251
-#: sql_help.c:253
-#: sql_help.c:255
+#: sql_help.c:388
+#: sql_help.c:390
+#: sql_help.c:392
 msgid "group_name"
 msgstr "nom_groupe"
 
-#: sql_help.c:252
-#: sql_help.c:254
-#: sql_help.c:728
-#: sql_help.c:1050
-#: sql_help.c:1319
-#: sql_help.c:1321
-#: sql_help.c:1501
-#: sql_help.c:1680
-#: sql_help.c:1989
-#: sql_help.c:2569
+#: sql_help.c:389
+#: sql_help.c:391
+#: sql_help.c:936
+#: sql_help.c:1268
+#: sql_help.c:1576
+#: sql_help.c:1578
+#: sql_help.c:1759
+#: sql_help.c:1955
+#: sql_help.c:2290
+#: sql_help.c:2947
 msgid "user_name"
 msgstr "nom_utilisateur"
 
-#: sql_help.c:270
-#: sql_help.c:1500
-#: sql_help.c:1924
-#: sql_help.c:2146
-#: sql_help.c:2375
+#: sql_help.c:407
+#: sql_help.c:1758
+#: sql_help.c:2225
+#: sql_help.c:2457
+#: sql_help.c:2711
 msgid "tablespace_name"
 msgstr "nom_tablespace"
 
-#: sql_help.c:272
-#: sql_help.c:275
-#: sql_help.c:553
-#: sql_help.c:555
-#: sql_help.c:1183
-#: sql_help.c:1427
-#: sql_help.c:1436
-#: sql_help.c:1467
-#: sql_help.c:1489
+#: sql_help.c:409
+#: sql_help.c:412
+#: sql_help.c:719
+#: sql_help.c:721
+#: sql_help.c:1438
+#: sql_help.c:1685
+#: sql_help.c:1693
+#: sql_help.c:1725
+#: sql_help.c:1747
 msgid "storage_parameter"
 msgstr "paramètre_stockage"
 
-#: sql_help.c:295
-#: sql_help.c:855
+#: sql_help.c:432
+#: sql_help.c:1072
+#: sql_help.c:2779
 msgid "large_object_oid"
 msgstr "oid_large_object"
 
-#: sql_help.c:305
-#: sql_help.c:857
-#: sql_help.c:1216
-#: sql_help.c:1840
-msgid "left_type"
-msgstr "type_argument_gauche"
-
-#: sql_help.c:306
-#: sql_help.c:858
-#: sql_help.c:1217
-#: sql_help.c:1841
-msgid "right_type"
-msgstr "type_argument_droit"
-
-#: sql_help.c:317
-#: sql_help.c:320
-#: sql_help.c:339
-#: sql_help.c:350
-#: sql_help.c:358
-#: sql_help.c:361
-#: sql_help.c:860
-#: sql_help.c:862
-#: sql_help.c:1236
-#: sql_help.c:1256
-#: sql_help.c:1455
-#: sql_help.c:1850
-#: sql_help.c:1859
-msgid "index_method"
-msgstr "méthode_indexage"
-
-#: sql_help.c:340
-#: sql_help.c:351
-#: sql_help.c:1238
+#: sql_help.c:487
+#: sql_help.c:499
+#: sql_help.c:1493
 msgid "strategy_number"
 msgstr "numéro_de_stratégie"
 
-#: sql_help.c:341
-#: sql_help.c:856
-#: sql_help.c:1239
-msgid "operator_name"
-msgstr "nom_opérateur"
-
-#: sql_help.c:342
-#: sql_help.c:343
-#: sql_help.c:345
-#: sql_help.c:346
-#: sql_help.c:352
-#: sql_help.c:353
-#: sql_help.c:355
-#: sql_help.c:356
-#: sql_help.c:1240
-#: sql_help.c:1241
-#: sql_help.c:1243
-#: sql_help.c:1244
+#: sql_help.c:489
+#: sql_help.c:490
+#: sql_help.c:493
+#: sql_help.c:494
+#: sql_help.c:500
+#: sql_help.c:501
+#: sql_help.c:503
+#: sql_help.c:504
+#: sql_help.c:1495
+#: sql_help.c:1496
+#: sql_help.c:1499
+#: sql_help.c:1500
 msgid "op_type"
 msgstr "type_op"
 
-#: sql_help.c:344
-#: sql_help.c:354
-#: sql_help.c:1242
+#: sql_help.c:491
+#: sql_help.c:1497
+msgid "sort_family_name"
+msgstr "nom_famille_tri"
+
+#: sql_help.c:492
+#: sql_help.c:502
+#: sql_help.c:1498
 msgid "support_number"
 msgstr "numéro_de_support"
 
-#: sql_help.c:347
-#: sql_help.c:850
-#: sql_help.c:996
-#: sql_help.c:1021
-#: sql_help.c:1034
-#: sql_help.c:1215
-#: sql_help.c:1245
-#: sql_help.c:1576
-#: sql_help.c:2134
-#: sql_help.c:2363
-#: sql_help.c:2472
-#: sql_help.c:2477
-#: sql_help.c:2671
-#: sql_help.c:2676
-#: sql_help.c:2823
-#: sql_help.c:2828
-msgid "function_name"
-msgstr "nom_fonction"
-
-#: sql_help.c:348
-#: sql_help.c:997
-#: sql_help.c:1246
+#: sql_help.c:496
+#: sql_help.c:1218
+#: sql_help.c:1502
 msgid "argument_type"
 msgstr "type_argument"
 
-#: sql_help.c:393
-#: sql_help.c:707
-#: sql_help.c:1158
-#: sql_help.c:1286
-#: sql_help.c:1663
+#: sql_help.c:545
+#: sql_help.c:915
+#: sql_help.c:1412
+#: sql_help.c:1543
+#: sql_help.c:1938
 msgid "password"
 msgstr "mot_de_passe"
 
-#: sql_help.c:394
-#: sql_help.c:708
-#: sql_help.c:1159
-#: sql_help.c:1287
-#: sql_help.c:1664
+#: sql_help.c:546
+#: sql_help.c:916
+#: sql_help.c:1413
+#: sql_help.c:1544
+#: sql_help.c:1939
 msgid "timestamp"
 msgstr "horodatage"
 
-#: sql_help.c:398
-#: sql_help.c:402
-#: sql_help.c:405
-#: sql_help.c:408
-#: sql_help.c:2128
-#: sql_help.c:2357
+#: sql_help.c:550
+#: sql_help.c:554
+#: sql_help.c:557
+#: sql_help.c:560
+#: sql_help.c:2439
+#: sql_help.c:2693
 msgid "database_name"
 msgstr "nom_base_de_donnée"
 
-#: sql_help.c:437
-#: sql_help.c:1334
+#: sql_help.c:589
+#: sql_help.c:1591
 msgid "increment"
 msgstr "incrément"
 
-#: sql_help.c:438
-#: sql_help.c:1335
+#: sql_help.c:590
+#: sql_help.c:1592
 msgid "minvalue"
 msgstr "valeur_min"
 
-#: sql_help.c:439
-#: sql_help.c:1336
+#: sql_help.c:591
+#: sql_help.c:1593
 msgid "maxvalue"
 msgstr "valeur_max"
 
-#: sql_help.c:440
-#: sql_help.c:1337
-#: sql_help.c:2459
-#: sql_help.c:2527
-#: sql_help.c:2658
-#: sql_help.c:2759
-#: sql_help.c:2810
+#: sql_help.c:592
+#: sql_help.c:1594
+#: sql_help.c:2835
+#: sql_help.c:2905
+#: sql_help.c:3038
+#: sql_help.c:3143
+#: sql_help.c:3194
 msgid "start"
 msgstr "début"
 
-#: sql_help.c:441
+#: sql_help.c:593
 msgid "restart"
 msgstr "nouveau_début"
 
-#: sql_help.c:442
-#: sql_help.c:1338
+#: sql_help.c:594
+#: sql_help.c:1595
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:444
-#: sql_help.c:516
-#: sql_help.c:523
-#: sql_help.c:526
-#: sql_help.c:527
-#: sql_help.c:530
-#: sql_help.c:532
-#: sql_help.c:533
-#: sql_help.c:534
-#: sql_help.c:536
-#: sql_help.c:539
-#: sql_help.c:541
-#: sql_help.c:744
-#: sql_help.c:747
-#: sql_help.c:762
-#: sql_help.c:920
-#: sql_help.c:924
-#: sql_help.c:936
+#: sql_help.c:612
+#: sql_help.c:616
 #: sql_help.c:937
-#: sql_help.c:1180
-#: sql_help.c:1340
-#: sql_help.c:1471
-#: sql_help.c:2121
-#: sql_help.c:2122
-#: sql_help.c:2160
-#: sql_help.c:2350
-#: sql_help.c:2351
-#: sql_help.c:2721
-#: sql_help.c:2723
-#: sql_help.c:2740
-#: sql_help.c:2743
-msgid "column"
-msgstr "colonne"
-
-#: sql_help.c:460
-#: sql_help.c:464
-#: sql_help.c:729
-#: sql_help.c:1350
-#: sql_help.c:1681
-#: sql_help.c:1908
-#: sql_help.c:1990
-#: sql_help.c:2132
-#: sql_help.c:2361
+#: sql_help.c:1342
+#: sql_help.c:1607
+#: sql_help.c:1956
+#: sql_help.c:2209
+#: sql_help.c:2291
+#: sql_help.c:2443
+#: sql_help.c:2697
 msgid "server_name"
 msgstr "nom_serveur"
 
-#: sql_help.c:461
-msgid "new_version"
-msgstr "nouvelle_version"
+#: sql_help.c:686
+#: sql_help.c:691
+#: sql_help.c:878
+#: sql_help.c:882
+#: sql_help.c:1291
+#: sql_help.c:1341
+#: sql_help.c:1490
+#: sql_help.c:1678
+#: sql_help.c:1885
+#: sql_help.c:2558
+msgid "data_type"
+msgstr "type_données"
 
-#: sql_help.c:517
-msgid "new_column"
-msgstr "nouvelle_colonne"
+#: sql_help.c:687
+#: sql_help.c:692
+#: sql_help.c:879
+#: sql_help.c:883
+#: sql_help.c:1292
+#: sql_help.c:1436
+#: sql_help.c:1679
+#: sql_help.c:1886
+msgid "collation"
+msgstr "collationnement"
 
-#: sql_help.c:525
-#: sql_help.c:1422
-#: sql_help.c:1434
+#: sql_help.c:688
+#: sql_help.c:1680
+#: sql_help.c:1691
 msgid "column_constraint"
 msgstr "contrainte_colonne"
 
-#: sql_help.c:535
+#: sql_help.c:699
 msgid "integer"
 msgstr "entier"
 
-#: sql_help.c:537
-#: sql_help.c:540
+#: sql_help.c:701
+#: sql_help.c:704
 msgid "attribute_option"
 msgstr "option_attribut"
 
-#: sql_help.c:542
-#: sql_help.c:1423
-#: sql_help.c:1435
+#: sql_help.c:706
+#: sql_help.c:1681
+#: sql_help.c:1692
 msgid "table_constraint"
 msgstr "contrainte_table"
 
-#: sql_help.c:544
-#: sql_help.c:545
-#: sql_help.c:546
-#: sql_help.c:547
-#: sql_help.c:874
+#: sql_help.c:707
+msgid "table_constraint_using_index"
+msgstr "contrainte_table_utilisant_index"
+
+#: sql_help.c:710
+#: sql_help.c:711
+#: sql_help.c:712
+#: sql_help.c:713
+#: sql_help.c:1093
 msgid "trigger_name"
 msgstr "nom_trigger"
 
-#: sql_help.c:548
-#: sql_help.c:549
-#: sql_help.c:550
-#: sql_help.c:551
+#: sql_help.c:714
+#: sql_help.c:715
+#: sql_help.c:716
+#: sql_help.c:717
 msgid "rewrite_rule_name"
 msgstr "nom_règle_réécriture"
 
-#: sql_help.c:552
-#: sql_help.c:801
+#: sql_help.c:718
+#: sql_help.c:729
+#: sql_help.c:1010
 msgid "index_name"
 msgstr "nom_index"
 
-#: sql_help.c:556
-#: sql_help.c:557
-#: sql_help.c:1424
-#: sql_help.c:1426
+#: sql_help.c:722
+#: sql_help.c:723
+#: sql_help.c:1682
+#: sql_help.c:1684
 msgid "parent_table"
 msgstr "table_parent"
 
-#: sql_help.c:575
-#: sql_help.c:578
+#: sql_help.c:724
+#: sql_help.c:1689
+msgid "type_name"
+msgstr "nom_type"
+
+#: sql_help.c:727
+msgid "and table_constraint_using_index is:"
+msgstr "et contrainte_table_utilisant_index est :"
+
+#: sql_help.c:745
+#: sql_help.c:748
 msgid "tablespace_option"
 msgstr "option_tablespace"
 
-#: sql_help.c:598
-#: sql_help.c:601
-#: sql_help.c:607
-#: sql_help.c:611
+#: sql_help.c:769
+#: sql_help.c:772
+#: sql_help.c:778
+#: sql_help.c:782
 msgid "token_type"
 msgstr "type_jeton"
 
-#: sql_help.c:599
-#: sql_help.c:602
+#: sql_help.c:770
+#: sql_help.c:773
 msgid "dictionary_name"
 msgstr "nom_dictionnaire"
 
-#: sql_help.c:604
-#: sql_help.c:608
+#: sql_help.c:775
+#: sql_help.c:779
 msgid "old_dictionary"
 msgstr "ancien_dictionnaire"
 
-#: sql_help.c:605
-#: sql_help.c:609
+#: sql_help.c:776
+#: sql_help.c:780
 msgid "new_dictionary"
 msgstr "nouveau_dictionnaire"
 
-#: sql_help.c:775
-#: sql_help.c:2583
-#: sql_help.c:2584
-#: sql_help.c:2607
+#: sql_help.c:867
+#: sql_help.c:877
+#: sql_help.c:880
+#: sql_help.c:881
+#: sql_help.c:1884
+msgid "attribute_name"
+msgstr "nom_attribut"
+
+#: sql_help.c:868
+msgid "new_attribute_name"
+msgstr "nouveau_nom_attribut"
+
+#: sql_help.c:874
+msgid "new_enum_value"
+msgstr "nouvelle_valeur_enum"
+
+#: sql_help.c:875
+msgid "existing_enum_value"
+msgstr "valeur_enum_existante"
+
+#: sql_help.c:984
+#: sql_help.c:2962
+#: sql_help.c:2963
+#: sql_help.c:2987
 msgid "transaction_mode"
 msgstr "mode_transaction"
 
-#: sql_help.c:776
-#: sql_help.c:2585
-#: sql_help.c:2608
+#: sql_help.c:985
+#: sql_help.c:2964
+#: sql_help.c:2988
 msgid "where transaction_mode is one of:"
 msgstr "où mode_transaction fait partie de :"
 
-#: sql_help.c:800
-#: sql_help.c:839
-#: sql_help.c:846
-#: sql_help.c:866
-#: sql_help.c:875
-#: sql_help.c:919
-#: sql_help.c:923
-#: sql_help.c:1018
-#: sql_help.c:1418
-#: sql_help.c:1430
-#: sql_help.c:1487
-#: sql_help.c:2118
-#: sql_help.c:2123
-#: sql_help.c:2347
-#: sql_help.c:2352
-#: sql_help.c:2461
-#: sql_help.c:2463
-#: sql_help.c:2489
-#: sql_help.c:2529
-#: sql_help.c:2660
-#: sql_help.c:2662
+#: sql_help.c:1009
+#: sql_help.c:1060
+#: sql_help.c:1083
+#: sql_help.c:1094
+#: sql_help.c:1139
+#: sql_help.c:1143
+#: sql_help.c:1339
+#: sql_help.c:1676
+#: sql_help.c:1688
+#: sql_help.c:1745
+#: sql_help.c:2429
+#: sql_help.c:2434
+#: sql_help.c:2683
 #: sql_help.c:2688
-#: sql_help.c:2812
-#: sql_help.c:2814
-#: sql_help.c:2840
+#: sql_help.c:2769
+#: sql_help.c:2837
+#: sql_help.c:2839
+#: sql_help.c:2868
+#: sql_help.c:2907
+#: sql_help.c:3040
+#: sql_help.c:3042
+#: sql_help.c:3071
+#: sql_help.c:3196
+#: sql_help.c:3198
+#: sql_help.c:3227
 msgid "table_name"
 msgstr "nom_table"
 
-#: sql_help.c:838
-#: sql_help.c:847
-#: sql_help.c:848
-#: sql_help.c:849
-#: sql_help.c:854
-#: sql_help.c:859
-#: sql_help.c:861
-#: sql_help.c:863
-#: sql_help.c:864
-#: sql_help.c:867
-#: sql_help.c:868
-#: sql_help.c:869
-#: sql_help.c:870
-#: sql_help.c:871
-#: sql_help.c:872
-#: sql_help.c:873
-#: sql_help.c:876
-#: sql_help.c:877
-msgid "object_name"
-msgstr "nom_objet"
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "nom_relation"
 
-#: sql_help.c:840
-#: sql_help.c:1119
-#: sql_help.c:1419
-#: sql_help.c:1432
-#: sql_help.c:1451
-#: sql_help.c:1453
-#: sql_help.c:1460
-#: sql_help.c:1488
-#: sql_help.c:1693
-#: sql_help.c:2487
-#: sql_help.c:2686
-#: sql_help.c:2838
+#: sql_help.c:1058
+#: sql_help.c:1340
+#: sql_help.c:1373
+#: sql_help.c:1677
+#: sql_help.c:1690
+#: sql_help.c:1709
+#: sql_help.c:1711
+#: sql_help.c:1718
+#: sql_help.c:1746
+#: sql_help.c:1848
+#: sql_help.c:1968
+#: sql_help.c:2770
+#: sql_help.c:2863
+#: sql_help.c:3066
+#: sql_help.c:3222
 msgid "column_name"
 msgstr "nom_colonne"
 
-#: sql_help.c:841
-msgid "agg_name"
-msgstr "nom_d_agrégat"
-
-#: sql_help.c:842
-msgid "agg_type"
-msgstr "type_aggrégat"
-
-#: sql_help.c:843
-#: sql_help.c:994
-#: sql_help.c:998
-#: sql_help.c:1000
-#: sql_help.c:1762
-msgid "source_type"
-msgstr "type_source"
-
-#: sql_help.c:844
-#: sql_help.c:995
-#: sql_help.c:999
-#: sql_help.c:1001
-#: sql_help.c:1763
-msgid "target_type"
-msgstr "type_cible"
-
-#: sql_help.c:865
+#: sql_help.c:1082
 msgid "rule_name"
 msgstr "nom_règle"
 
-#: sql_help.c:878
+#: sql_help.c:1097
 msgid "text"
 msgstr "texte"
 
-#: sql_help.c:893
-#: sql_help.c:2231
-#: sql_help.c:2393
+#: sql_help.c:1112
+#: sql_help.c:2567
+#: sql_help.c:2729
 msgid "transaction_id"
 msgstr "id_transaction"
 
-#: sql_help.c:921
-#: sql_help.c:926
-#: sql_help.c:2180
+#: sql_help.c:1141
+#: sql_help.c:1146
+#: sql_help.c:2493
 msgid "filename"
 msgstr "nom_fichier"
 
-#: sql_help.c:925
-#: sql_help.c:1492
-#: sql_help.c:1694
-#: sql_help.c:1712
-#: sql_help.c:2162
+#: sql_help.c:1145
+#: sql_help.c:1750
+#: sql_help.c:1969
+#: sql_help.c:1987
+#: sql_help.c:2475
 msgid "query"
 msgstr "requête"
 
-#: sql_help.c:928
+#: sql_help.c:1148
+#: sql_help.c:2335
 msgid "where option can be one of:"
 msgstr "où option fait partie de :"
 
-#: sql_help.c:929
+#: sql_help.c:1149
 msgid "format_name"
 msgstr "nom_format"
 
-#: sql_help.c:930
-#: sql_help.c:933
-#: sql_help.c:2023
-#: sql_help.c:2024
-#: sql_help.c:2025
-#: sql_help.c:2026
+#: sql_help.c:1150
+#: sql_help.c:1153
+#: sql_help.c:2336
+#: sql_help.c:2337
+#: sql_help.c:2338
+#: sql_help.c:2339
 msgid "boolean"
 msgstr "boolean"
 
-#: sql_help.c:931
+#: sql_help.c:1151
 msgid "delimiter_character"
 msgstr "caractère_délimiteur"
 
-#: sql_help.c:932
+#: sql_help.c:1152
 msgid "null_string"
 msgstr "chaîne_null"
 
-#: sql_help.c:934
+#: sql_help.c:1154
 msgid "quote_character"
 msgstr "caractère_guillemet"
 
-#: sql_help.c:935
+#: sql_help.c:1155
 msgid "escape_character"
 msgstr "chaîne_d_échappement"
 
-#: sql_help.c:963
+#: sql_help.c:1158
+msgid "encoding_name"
+msgstr "nom_encodage"
+
+#: sql_help.c:1184
 msgid "input_data_type"
 msgstr "type_de_données_en_entrée"
 
-#: sql_help.c:964
-#: sql_help.c:972
+#: sql_help.c:1185
+#: sql_help.c:1193
 msgid "sfunc"
 msgstr "sfunc"
 
-#: sql_help.c:965
-#: sql_help.c:973
+#: sql_help.c:1186
+#: sql_help.c:1194
 msgid "state_data_type"
 msgstr "type_de_données_statut"
 
-#: sql_help.c:966
-#: sql_help.c:974
+#: sql_help.c:1187
+#: sql_help.c:1195
 msgid "ffunc"
 msgstr "ffunc"
 
-#: sql_help.c:967
-#: sql_help.c:975
+#: sql_help.c:1188
+#: sql_help.c:1196
 msgid "initial_condition"
 msgstr "condition_initiale"
 
-#: sql_help.c:968
-#: sql_help.c:976
+#: sql_help.c:1189
+#: sql_help.c:1197
 msgid "sort_operator"
 msgstr "opérateur_de_tri"
 
-#: sql_help.c:969
+#: sql_help.c:1190
 msgid "or the old syntax"
 msgstr "ou l'ancienne syntaxe"
 
-#: sql_help.c:971
+#: sql_help.c:1192
 msgid "base_type"
 msgstr "type_base"
 
-#: sql_help.c:1017
-#: sql_help.c:1304
-#: sql_help.c:1573
-msgid "event"
-msgstr "événement"
+#: sql_help.c:1236
+msgid "locale"
+msgstr "locale"
 
-#: sql_help.c:1019
-msgid "referenced_table_name"
-msgstr "nom_table_référencée"
+#: sql_help.c:1237
+#: sql_help.c:1271
+msgid "lc_collate"
+msgstr "lc_collate"
 
-#: sql_help.c:1020
-#: sql_help.c:1306
-#: sql_help.c:1575
-#: sql_help.c:1726
-#: sql_help.c:2450
-#: sql_help.c:2452
-#: sql_help.c:2518
-#: sql_help.c:2520
-#: sql_help.c:2649
-#: sql_help.c:2651
-#: sql_help.c:2726
-#: sql_help.c:2801
-#: sql_help.c:2803
-msgid "condition"
-msgstr "condition"
+#: sql_help.c:1238
+#: sql_help.c:1272
+msgid "lc_ctype"
+msgstr "lc_ctype"
 
-#: sql_help.c:1022
-#: sql_help.c:1577
-msgid "arguments"
-msgstr "arguments"
+#: sql_help.c:1240
+msgid "existing_collation"
+msgstr "collationnement_existant"
 
-#: sql_help.c:1032
+#: sql_help.c:1250
 msgid "source_encoding"
 msgstr "encodage_source"
 
-#: sql_help.c:1033
+#: sql_help.c:1251
 msgid "dest_encoding"
 msgstr "encodage_destination"
 
-#: sql_help.c:1051
-#: sql_help.c:1527
+#: sql_help.c:1269
+#: sql_help.c:1785
 msgid "template"
 msgstr "modèle"
 
-#: sql_help.c:1052
+#: sql_help.c:1270
 msgid "encoding"
 msgstr "encodage"
 
-#: sql_help.c:1053
-msgid "lc_collate"
-msgstr "lc_collate"
-
-#: sql_help.c:1054
-msgid "lc_ctype"
-msgstr "lc_ctype"
-
-#: sql_help.c:1055
-#: sql_help.c:1185
-#: sql_help.c:1429
-#: sql_help.c:1438
-#: sql_help.c:1469
-#: sql_help.c:1491
+#: sql_help.c:1273
+#: sql_help.c:1440
+#: sql_help.c:1687
+#: sql_help.c:1695
+#: sql_help.c:1727
+#: sql_help.c:1749
 msgid "tablespace"
 msgstr "tablespace"
 
-#: sql_help.c:1072
-#: sql_help.c:1235
-#: sql_help.c:1420
-#: sql_help.c:1613
-#: sql_help.c:2222
-msgid "data_type"
-msgstr "type_données"
-
-#: sql_help.c:1074
+#: sql_help.c:1294
 msgid "constraint"
 msgstr "contrainte"
 
-#: sql_help.c:1075
+#: sql_help.c:1295
 msgid "where constraint is:"
 msgstr "où la contrainte est :"
 
-#: sql_help.c:1117
-#: sql_help.c:1421
-#: sql_help.c:1433
+#: sql_help.c:1309
+msgid "schema"
+msgstr "schéma"
+
+#: sql_help.c:1310
+msgid "version"
+msgstr "version"
+
+#: sql_help.c:1311
+msgid "old_version"
+msgstr "ancienne_version"
+
+#: sql_help.c:1371
+#: sql_help.c:1699
 msgid "default_expr"
 msgstr "expression_par_défaut"
 
-#: sql_help.c:1118
+#: sql_help.c:1372
 msgid "rettype"
 msgstr "type_en_retour"
 
-#: sql_help.c:1120
+#: sql_help.c:1374
 msgid "column_type"
 msgstr "type_colonne"
 
-#: sql_help.c:1121
-#: sql_help.c:1744
-#: sql_help.c:2140
-#: sql_help.c:2369
+#: sql_help.c:1375
+#: sql_help.c:2021
+#: sql_help.c:2451
+#: sql_help.c:2705
 msgid "lang_name"
 msgstr "nom_langage"
 
-#: sql_help.c:1127
+#: sql_help.c:1381
 msgid "definition"
 msgstr "définition"
 
-#: sql_help.c:1128
+#: sql_help.c:1382
 msgid "obj_file"
 msgstr "fichier_objet"
 
-#: sql_help.c:1129
+#: sql_help.c:1383
 msgid "link_symbol"
 msgstr "symbole_link"
 
-#: sql_help.c:1130
+#: sql_help.c:1384
 msgid "attribute"
 msgstr "attribut"
 
-#: sql_help.c:1165
-#: sql_help.c:1293
-#: sql_help.c:1670
+#: sql_help.c:1419
+#: sql_help.c:1550
+#: sql_help.c:1945
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1179
+#: sql_help.c:1433
 msgid "method"
 msgstr "méthode"
 
-#: sql_help.c:1182
-#: sql_help.c:1473
+#: sql_help.c:1437
+#: sql_help.c:1731
 msgid "opclass"
 msgstr "classe_d_opérateur"
 
-#: sql_help.c:1186
-#: sql_help.c:1459
+#: sql_help.c:1441
+#: sql_help.c:1717
 msgid "predicate"
 msgstr "prédicat"
 
-#: sql_help.c:1198
+#: sql_help.c:1453
 msgid "call_handler"
 msgstr "gestionnaire_d_appel"
 
-#: sql_help.c:1199
+#: sql_help.c:1454
 msgid "inline_handler"
 msgstr "gestionnaire_en_ligne"
 
-#: sql_help.c:1218
+#: sql_help.c:1455
+msgid "valfunction"
+msgstr "fonction_val"
+
+#: sql_help.c:1473
 msgid "com_op"
 msgstr "com_op"
 
-#: sql_help.c:1219
+#: sql_help.c:1474
 msgid "neg_op"
 msgstr "neg_op"
 
-#: sql_help.c:1220
+#: sql_help.c:1475
 msgid "res_proc"
 msgstr "res_proc"
 
-#: sql_help.c:1221
+#: sql_help.c:1476
 msgid "join_proc"
 msgstr "join_proc"
 
-#: sql_help.c:1237
+#: sql_help.c:1492
 msgid "family_name"
 msgstr "nom_famille"
 
-#: sql_help.c:1247
+#: sql_help.c:1503
 msgid "storage_type"
 msgstr "type_stockage"
 
-#: sql_help.c:1307
-#: sql_help.c:1308
-#: sql_help.c:1309
+#: sql_help.c:1561
+#: sql_help.c:1841
+msgid "event"
+msgstr "événement"
+
+#: sql_help.c:1563
+#: sql_help.c:1844
+#: sql_help.c:2003
+#: sql_help.c:2826
+#: sql_help.c:2828
+#: sql_help.c:2896
+#: sql_help.c:2898
+#: sql_help.c:3029
+#: sql_help.c:3031
+#: sql_help.c:3110
+#: sql_help.c:3185
+#: sql_help.c:3187
+msgid "condition"
+msgstr "condition"
+
+#: sql_help.c:1564
+#: sql_help.c:1565
+#: sql_help.c:1566
 msgid "command"
 msgstr "commande"
 
-#: sql_help.c:1320
-#: sql_help.c:1322
+#: sql_help.c:1577
+#: sql_help.c:1579
 msgid "schema_element"
 msgstr "élément_schéma"
 
-#: sql_help.c:1351
+#: sql_help.c:1608
 msgid "server_type"
 msgstr "type_serveur"
 
-#: sql_help.c:1352
+#: sql_help.c:1609
 msgid "server_version"
 msgstr "version_serveur"
 
-#: sql_help.c:1353
-#: sql_help.c:2130
-#: sql_help.c:2359
+#: sql_help.c:1610
+#: sql_help.c:2441
+#: sql_help.c:2695
 msgid "fdw_name"
 msgstr "nom_fdw"
 
-#: sql_help.c:1425
+#: sql_help.c:1683
 msgid "like_option"
 msgstr "option_like"
 
-#: sql_help.c:1431
-msgid "type_name"
-msgstr "nom_type"
-
-#: sql_help.c:1439
+#: sql_help.c:1696
 msgid "where column_constraint is:"
 msgstr "où contrainte_colonne est :"
 
-#: sql_help.c:1442
-#: sql_help.c:1443
-#: sql_help.c:1452
-#: sql_help.c:1454
-#: sql_help.c:1458
+#: sql_help.c:1700
+#: sql_help.c:1701
+#: sql_help.c:1710
+#: sql_help.c:1712
+#: sql_help.c:1716
 msgid "index_parameters"
 msgstr "paramètres_index"
 
-#: sql_help.c:1444
-#: sql_help.c:1461
+#: sql_help.c:1702
+#: sql_help.c:1719
 msgid "reftable"
 msgstr "table_référence"
 
-#: sql_help.c:1445
-#: sql_help.c:1462
+#: sql_help.c:1703
+#: sql_help.c:1720
 msgid "refcolumn"
 msgstr "colonne_référence"
 
-#: sql_help.c:1448
+#: sql_help.c:1706
 msgid "and table_constraint is:"
 msgstr "et contrainte_table est :"
 
-#: sql_help.c:1456
+#: sql_help.c:1714
 msgid "exclude_element"
 msgstr "élément_exclusion"
 
-#: sql_help.c:1465
+#: sql_help.c:1723
 msgid "and like_option is:"
 msgstr "et option_like est :"
 
-#: sql_help.c:1466
+#: sql_help.c:1724
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "dans les contraintes UNIQUE, PRIMARY KEY et EXCLUDE, les paramètres_index sont :"
 
-#: sql_help.c:1470
+#: sql_help.c:1728
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "élément_exclusion dans une contrainte EXCLUDE est :"
 
-#: sql_help.c:1502
+#: sql_help.c:1760
 msgid "directory"
 msgstr "répertoire"
 
-#: sql_help.c:1514
+#: sql_help.c:1772
 msgid "parser_name"
 msgstr "nom_analyseur"
 
-#: sql_help.c:1515
+#: sql_help.c:1773
 msgid "source_config"
 msgstr "configuration_source"
 
-#: sql_help.c:1544
+#: sql_help.c:1802
 msgid "start_function"
 msgstr "fonction_start"
 
-#: sql_help.c:1545
+#: sql_help.c:1803
 msgid "gettoken_function"
 msgstr "fonction_gettoken"
 
-#: sql_help.c:1546
+#: sql_help.c:1804
 msgid "end_function"
 msgstr "fonction_end"
 
-#: sql_help.c:1547
+#: sql_help.c:1805
 msgid "lextypes_function"
 msgstr "fonction_lextypes"
 
-#: sql_help.c:1548
+#: sql_help.c:1806
 msgid "headline_function"
 msgstr "fonction_headline"
 
-#: sql_help.c:1560
+#: sql_help.c:1818
 msgid "init_function"
 msgstr "fonction_init"
 
-#: sql_help.c:1561
+#: sql_help.c:1819
 msgid "lexize_function"
 msgstr "fonction_lexize"
 
-#: sql_help.c:1612
-msgid "attribute_name"
-msgstr "nom_attribut"
+#: sql_help.c:1843
+msgid "referenced_table_name"
+msgstr "nom_table_référencée"
+
+#: sql_help.c:1846
+msgid "arguments"
+msgstr "arguments"
+
+#: sql_help.c:1847
+msgid "where event can be one of:"
+msgstr "où événement fait partie de :"
 
-#: sql_help.c:1615
+#: sql_help.c:1888
+#: sql_help.c:2785
 msgid "label"
 msgstr "label"
 
-#: sql_help.c:1617
+#: sql_help.c:1890
 msgid "input_function"
 msgstr "fonction_en_sortie"
 
-#: sql_help.c:1618
+#: sql_help.c:1891
 msgid "output_function"
 msgstr "fonction_en_sortie"
 
-#: sql_help.c:1619
+#: sql_help.c:1892
 msgid "receive_function"
 msgstr "fonction_receive"
 
-#: sql_help.c:1620
+#: sql_help.c:1893
 msgid "send_function"
 msgstr "fonction_send"
 
-#: sql_help.c:1621
+#: sql_help.c:1894
 msgid "type_modifier_input_function"
 msgstr "fonction_en_entrée_modificateur_type"
 
-#: sql_help.c:1622
+#: sql_help.c:1895
 msgid "type_modifier_output_function"
 msgstr "fonction_en_sortie_modificateur_type"
 
-#: sql_help.c:1623
+#: sql_help.c:1896
 msgid "analyze_function"
 msgstr "fonction_analyze"
 
-#: sql_help.c:1624
+#: sql_help.c:1897
 msgid "internallength"
 msgstr "longueur_interne"
 
-#: sql_help.c:1625
+#: sql_help.c:1898
 msgid "alignment"
 msgstr "alignement"
 
-#: sql_help.c:1626
+#: sql_help.c:1899
 msgid "storage"
 msgstr "stockage"
 
-#: sql_help.c:1627
+#: sql_help.c:1900
 msgid "like_type"
 msgstr "type_like"
 
-#: sql_help.c:1628
+#: sql_help.c:1901
 msgid "category"
 msgstr "catégorie"
 
-#: sql_help.c:1629
+#: sql_help.c:1902
 msgid "preferred"
 msgstr "préféré"
 
-#: sql_help.c:1630
+#: sql_help.c:1903
 msgid "default"
 msgstr "par défaut"
 
-#: sql_help.c:1631
+#: sql_help.c:1904
 msgid "element"
 msgstr "élément"
 
-#: sql_help.c:1632
+#: sql_help.c:1905
 msgid "delimiter"
 msgstr "délimiteur"
 
-#: sql_help.c:1724
-#: sql_help.c:2464
-#: sql_help.c:2467
-#: sql_help.c:2470
-#: sql_help.c:2474
-#: sql_help.c:2663
-#: sql_help.c:2666
-#: sql_help.c:2669
-#: sql_help.c:2673
-#: sql_help.c:2720
-#: sql_help.c:2815
-#: sql_help.c:2818
+#: sql_help.c:1906
+msgid "collatable"
+msgstr "collationnable"
+
+#: sql_help.c:1999
+#: sql_help.c:2471
 #: sql_help.c:2821
-#: sql_help.c:2825
+#: sql_help.c:2890
+#: sql_help.c:3024
+#: sql_help.c:3102
+#: sql_help.c:3180
+msgid "with_query"
+msgstr "requête_with"
+
+#: sql_help.c:2001
+#: sql_help.c:2840
+#: sql_help.c:2843
+#: sql_help.c:2846
+#: sql_help.c:2850
+#: sql_help.c:3043
+#: sql_help.c:3046
+#: sql_help.c:3049
+#: sql_help.c:3053
+#: sql_help.c:3104
+#: sql_help.c:3199
+#: sql_help.c:3202
+#: sql_help.c:3205
+#: sql_help.c:3209
 msgid "alias"
 msgstr "alias"
 
-#: sql_help.c:1725
+#: sql_help.c:2002
 msgid "using_list"
 msgstr "liste_using"
 
-#: sql_help.c:1727
-#: sql_help.c:2054
-#: sql_help.c:2204
-#: sql_help.c:2727
+#: sql_help.c:2004
+#: sql_help.c:2365
+#: sql_help.c:2534
+#: sql_help.c:3111
 msgid "cursor_name"
 msgstr "nom_curseur"
 
-#: sql_help.c:1728
-#: sql_help.c:2163
-#: sql_help.c:2728
+#: sql_help.c:2005
+#: sql_help.c:2476
+#: sql_help.c:3112
 msgid "output_expression"
 msgstr "expression_en_sortie"
 
-#: sql_help.c:1729
-#: sql_help.c:2164
-#: sql_help.c:2448
-#: sql_help.c:2515
-#: sql_help.c:2647
-#: sql_help.c:2729
-#: sql_help.c:2799
+#: sql_help.c:2006
+#: sql_help.c:2477
+#: sql_help.c:2824
+#: sql_help.c:2893
+#: sql_help.c:3027
+#: sql_help.c:3113
+#: sql_help.c:3183
 msgid "output_name"
 msgstr "nom_en_sortie"
 
-#: sql_help.c:1745
+#: sql_help.c:2022
 msgid "code"
 msgstr "code"
 
-#: sql_help.c:2014
+#: sql_help.c:2315
 msgid "parameter"
 msgstr "paramètre"
 
-#: sql_help.c:2027
-#: sql_help.c:2028
-#: sql_help.c:2223
+#: sql_help.c:2333
+#: sql_help.c:2334
+#: sql_help.c:2559
 msgid "statement"
 msgstr "instruction"
 
-#: sql_help.c:2053
-#: sql_help.c:2203
+#: sql_help.c:2364
+#: sql_help.c:2533
 msgid "direction"
 msgstr "direction"
 
-#: sql_help.c:2055
+#: sql_help.c:2366
+#: sql_help.c:2535
 msgid "where direction can be empty or one of:"
 msgstr "où direction peut être vide ou faire partie de :"
 
-#: sql_help.c:2056
-#: sql_help.c:2057
-#: sql_help.c:2058
-#: sql_help.c:2059
-#: sql_help.c:2060
-#: sql_help.c:2458
-#: sql_help.c:2460
-#: sql_help.c:2526
-#: sql_help.c:2528
-#: sql_help.c:2657
-#: sql_help.c:2659
-#: sql_help.c:2758
-#: sql_help.c:2760
-#: sql_help.c:2809
-#: sql_help.c:2811
+#: sql_help.c:2367
+#: sql_help.c:2368
+#: sql_help.c:2369
+#: sql_help.c:2370
+#: sql_help.c:2371
+#: sql_help.c:2536
+#: sql_help.c:2537
+#: sql_help.c:2538
+#: sql_help.c:2539
+#: sql_help.c:2540
+#: sql_help.c:2834
+#: sql_help.c:2836
+#: sql_help.c:2904
+#: sql_help.c:2906
+#: sql_help.c:3037
+#: sql_help.c:3039
+#: sql_help.c:3142
+#: sql_help.c:3144
+#: sql_help.c:3193
+#: sql_help.c:3195
 msgid "count"
 msgstr "nombre"
 
-#: sql_help.c:2125
-#: sql_help.c:2354
+#: sql_help.c:2436
+#: sql_help.c:2690
 msgid "sequence_name"
 msgstr "nom_séquence"
 
-#: sql_help.c:2136
-#: sql_help.c:2365
+#: sql_help.c:2447
+#: sql_help.c:2701
 msgid "arg_name"
 msgstr "nom_argument"
 
-#: sql_help.c:2137
-#: sql_help.c:2366
+#: sql_help.c:2448
+#: sql_help.c:2702
 msgid "arg_type"
 msgstr "type_arg"
 
-#: sql_help.c:2142
-#: sql_help.c:2371
+#: sql_help.c:2453
+#: sql_help.c:2707
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:2172
-#: sql_help.c:2212
-#: sql_help.c:2706
+#: sql_help.c:2485
+#: sql_help.c:2548
+#: sql_help.c:3088
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:2194
+#: sql_help.c:2507
 msgid "lockmode"
 msgstr "mode_de_verrou"
 
-#: sql_help.c:2195
+#: sql_help.c:2508
 msgid "where lockmode is one of:"
 msgstr "où mode_de_verrou fait partie de :"
 
-#: sql_help.c:2213
+#: sql_help.c:2549
 msgid "payload"
 msgstr "contenu"
 
-#: sql_help.c:2239
+#: sql_help.c:2575
 msgid "old_role"
 msgstr "ancien_rôle"
 
-#: sql_help.c:2240
+#: sql_help.c:2576
 msgid "new_role"
 msgstr "nouveau_rôle"
 
-#: sql_help.c:2256
-#: sql_help.c:2401
-#: sql_help.c:2409
+#: sql_help.c:2592
+#: sql_help.c:2737
+#: sql_help.c:2745
 msgid "savepoint_name"
 msgstr "nom_savepoint"
 
-#: sql_help.c:2445
-#: sql_help.c:2512
-#: sql_help.c:2644
-#: sql_help.c:2796
-msgid "with_query"
-msgstr "requête_with"
+#: sql_help.c:2767
+msgid "provider"
+msgstr "fournisseur"
 
-#: sql_help.c:2449
-#: sql_help.c:2480
-#: sql_help.c:2482
-#: sql_help.c:2517
-#: sql_help.c:2648
-#: sql_help.c:2679
-#: sql_help.c:2681
-#: sql_help.c:2800
-#: sql_help.c:2831
-#: sql_help.c:2833
+#: sql_help.c:2825
+#: sql_help.c:2856
+#: sql_help.c:2858
+#: sql_help.c:2895
+#: sql_help.c:3028
+#: sql_help.c:3059
+#: sql_help.c:3061
+#: sql_help.c:3184
+#: sql_help.c:3215
+#: sql_help.c:3217
 msgid "from_item"
 msgstr "élément_from"
 
-#: sql_help.c:2453
-#: sql_help.c:2521
-#: sql_help.c:2652
-#: sql_help.c:2804
+#: sql_help.c:2829
+#: sql_help.c:2899
+#: sql_help.c:3032
+#: sql_help.c:3188
 msgid "window_name"
 msgstr "nom_window"
 
-#: sql_help.c:2454
-#: sql_help.c:2522
-#: sql_help.c:2653
-#: sql_help.c:2805
+#: sql_help.c:2830
+#: sql_help.c:2900
+#: sql_help.c:3033
+#: sql_help.c:3189
 msgid "window_definition"
 msgstr "définition_window"
 
-#: sql_help.c:2455
-#: sql_help.c:2466
-#: sql_help.c:2488
-#: sql_help.c:2523
-#: sql_help.c:2654
-#: sql_help.c:2665
-#: sql_help.c:2687
-#: sql_help.c:2806
-#: sql_help.c:2817
-#: sql_help.c:2839
+#: sql_help.c:2831
+#: sql_help.c:2842
+#: sql_help.c:2864
+#: sql_help.c:2901
+#: sql_help.c:3034
+#: sql_help.c:3045
+#: sql_help.c:3067
+#: sql_help.c:3190
+#: sql_help.c:3201
+#: sql_help.c:3223
 msgid "select"
 msgstr "sélection"
 
-#: sql_help.c:2462
-#: sql_help.c:2661
-#: sql_help.c:2813
+#: sql_help.c:2838
+#: sql_help.c:3041
+#: sql_help.c:3197
 msgid "where from_item can be one of:"
 msgstr "où élément_from fait partie de :"
 
-#: sql_help.c:2465
-#: sql_help.c:2468
-#: sql_help.c:2471
-#: sql_help.c:2475
-#: sql_help.c:2664
-#: sql_help.c:2667
-#: sql_help.c:2670
-#: sql_help.c:2674
-#: sql_help.c:2816
-#: sql_help.c:2819
-#: sql_help.c:2822
-#: sql_help.c:2826
+#: sql_help.c:2841
+#: sql_help.c:2844
+#: sql_help.c:2847
+#: sql_help.c:2851
+#: sql_help.c:3044
+#: sql_help.c:3047
+#: sql_help.c:3050
+#: sql_help.c:3054
+#: sql_help.c:3200
+#: sql_help.c:3203
+#: sql_help.c:3206
+#: sql_help.c:3210
 msgid "column_alias"
 msgstr "alias_colonne"
 
-#: sql_help.c:2469
-#: sql_help.c:2486
-#: sql_help.c:2490
-#: sql_help.c:2668
-#: sql_help.c:2685
-#: sql_help.c:2689
-#: sql_help.c:2820
-#: sql_help.c:2837
-#: sql_help.c:2841
+#: sql_help.c:2845
+#: sql_help.c:2862
+#: sql_help.c:3048
+#: sql_help.c:3065
+#: sql_help.c:3204
+#: sql_help.c:3221
 msgid "with_query_name"
 msgstr "nom_requête_with"
 
-#: sql_help.c:2473
-#: sql_help.c:2478
-#: sql_help.c:2672
-#: sql_help.c:2677
-#: sql_help.c:2824
-#: sql_help.c:2829
+#: sql_help.c:2849
+#: sql_help.c:2854
+#: sql_help.c:3052
+#: sql_help.c:3057
+#: sql_help.c:3208
+#: sql_help.c:3213
 msgid "argument"
 msgstr "argument"
 
-#: sql_help.c:2476
-#: sql_help.c:2479
-#: sql_help.c:2675
-#: sql_help.c:2678
-#: sql_help.c:2827
-#: sql_help.c:2830
+#: sql_help.c:2852
+#: sql_help.c:2855
+#: sql_help.c:3055
+#: sql_help.c:3058
+#: sql_help.c:3211
+#: sql_help.c:3214
 msgid "column_definition"
 msgstr "définition_colonne"
 
-#: sql_help.c:2481
-#: sql_help.c:2680
-#: sql_help.c:2832
+#: sql_help.c:2857
+#: sql_help.c:3060
+#: sql_help.c:3216
 msgid "join_type"
 msgstr "type_de_jointure"
 
-#: sql_help.c:2483
-#: sql_help.c:2682
-#: sql_help.c:2834
+#: sql_help.c:2859
+#: sql_help.c:3062
+#: sql_help.c:3218
 msgid "join_condition"
 msgstr "condition_de_jointure"
 
-#: sql_help.c:2484
-#: sql_help.c:2683
-#: sql_help.c:2835
+#: sql_help.c:2860
+#: sql_help.c:3063
+#: sql_help.c:3219
 msgid "join_column"
 msgstr "colonne_de_jointure"
 
-#: sql_help.c:2485
-#: sql_help.c:2684
-#: sql_help.c:2836
+#: sql_help.c:2861
+#: sql_help.c:3064
+#: sql_help.c:3220
 msgid "and with_query is:"
 msgstr "et requête_with est :"
 
-#: sql_help.c:2516
+#: sql_help.c:2865
+#: sql_help.c:3068
+#: sql_help.c:3224
+msgid "insert"
+msgstr "insert"
+
+#: sql_help.c:2866
+#: sql_help.c:3069
+#: sql_help.c:3225
+msgid "update"
+msgstr "update"
+
+#: sql_help.c:2867
+#: sql_help.c:3070
+#: sql_help.c:3226
+msgid "delete"
+msgstr "delete"
+
+#: sql_help.c:2894
 msgid "new_table"
 msgstr "nouvelle_table"
 
-#: sql_help.c:2541
+#: sql_help.c:2919
 msgid "timezone"
 msgstr "fuseau_horaire"
 
-#: sql_help.c:2725
+#: sql_help.c:3109
 msgid "from_list"
 msgstr "liste_from"
 
-#: sql_help.c:2756
+#: sql_help.c:3140
 msgid "sort_expression"
 msgstr "expression_de_tri"
 
@@ -4545,39 +4999,58 @@ msgstr "n'a pas pu acc
 msgid "could not read symbolic link \"%s\""
 msgstr "n'a pas pu lire le lien symbolique « %s »"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "le processus fils a quitté avec le code de sortie %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "le processus fils a été terminé par l'exception 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "le processus fils a été terminé par le signal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "le processus fils a été terminé par le signal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitté avec un statut %d non reconnu"
 
+#~ msgid "out of memory"
+#~ msgstr "mémoire épuisée"
+
+#~ msgid " on host \"%s\""
+#~ msgstr " sur l'hôte « %s »"
+
+#~ msgid " at port \"%s\""
+#~ msgstr " sur le port « %s »"
+
+#~ msgid " as user \"%s\""
+#~ msgstr " comme utilisateur « %s »"
+
+#~ msgid "define a new constraint trigger"
+#~ msgstr "définir une nouvelle contrainte de déclenchement"
+
 #~ msgid "Exclusion constraints:"
 #~ msgstr "Contraintes d'exclusion :"
+
 #~ msgid "rolename"
 #~ msgstr "nom_rôle"
+
 #~ msgid "number"
 #~ msgstr "numéro"
+
 #~ msgid "ABORT [ WORK | TRANSACTION ]"
 #~ msgstr "ABORT [ WORK | TRANSACTION ]"
+
 #~ msgid ""
 #~ "ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
 #~ "ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
@@ -4586,12 +5059,14 @@ msgstr "le processus fils a quitt
 #~ "ALTER AGGREGATE nom ( type [ , ... ] ) RENAME TO nouveau_nom\n"
 #~ "ALTER AGGREGATE nom ( type [ , ... ] ) OWNER TO nouveau_propriétaire\n"
 #~ "ALTER AGGREGATE nom ( type [ , ... ] ) SET SCHEMA nouveau_schéma"
+
 #~ msgid ""
 #~ "ALTER CONVERSION name RENAME TO newname\n"
 #~ "ALTER CONVERSION name OWNER TO newowner"
 #~ msgstr ""
 #~ "ALTER CONVERSION nom RENAME TO nouveau_nom\n"
 #~ "ALTER CONVERSION nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
@@ -4628,6 +5103,7 @@ msgstr "le processus fils a quitt
 #~ "ALTER DATABASE nom SET paramètre_configuration FROM CURRENT\n"
 #~ "ALTER DATABASE nom RESET paramètre_configuration\n"
 #~ "ALTER DATABASE nom RESET ALL"
+
 #~ msgid ""
 #~ "ALTER DOMAIN name\n"
 #~ "    { SET DEFAULT expression | DROP DEFAULT }\n"
@@ -4654,6 +5130,7 @@ msgstr "le processus fils a quitt
 #~ "    OWNER TO nouveau_propriétaire \n"
 #~ "ALTER DOMAIN nom\n"
 #~ "    SET SCHEMA nouveau_schéma"
+
 #~ msgid ""
 #~ "ALTER FOREIGN DATA WRAPPER name\n"
 #~ "    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
@@ -4664,6 +5141,7 @@ msgstr "le processus fils a quitt
 #~ "    [ VALIDATOR fonction_validation | NO VALIDATOR ]\n"
 #~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['valeur'] [, ... ]) ]\n"
 #~ "ALTER FOREIGN DATA WRAPPER nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
 #~ "    action [ ... ] [ RESTRICT ]\n"
@@ -4706,6 +5184,7 @@ msgstr "le processus fils a quitt
 #~ "    SET paramètre FROM CURRENT\n"
 #~ "    RESET paramètre\n"
 #~ "    RESET ALL"
+
 #~ msgid ""
 #~ "ALTER GROUP groupname ADD USER username [, ... ]\n"
 #~ "ALTER GROUP groupname DROP USER username [, ... ]\n"
@@ -4716,6 +5195,7 @@ msgstr "le processus fils a quitt
 #~ "ALTER GROUP nom_groupe DROP USER nom_utilisateur [, ... ]\n"
 #~ "\n"
 #~ "ALTER GROUP nom_groupe RENAME TO nouveau_nom"
+
 #~ msgid ""
 #~ "ALTER INDEX name RENAME TO new_name\n"
 #~ "ALTER INDEX name SET TABLESPACE tablespace_name\n"
@@ -4726,18 +5206,21 @@ msgstr "le processus fils a quitt
 #~ "ALTER INDEX nom SET TABLESPACE nom_tablespace\n"
 #~ "ALTER INDEX nom SET ( paramètre_stockage = valeur [, ... ] )\n"
 #~ "ALTER INDEX nom RESET ( paramètre_stockage [, ... ] )"
+
 #~ msgid ""
 #~ "ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
 #~ "ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
 #~ msgstr ""
 #~ "ALTER [ PROCEDURAL ] LANGUAGE nom RENAME TO nouveau_nom\n"
 #~ "ALTER [ PROCEDURAL ] LANGUAGE nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER "
 #~ "TO newowner"
 #~ msgstr ""
 #~ "ALTER OPERATOR nom ( { lefttype | NONE } , { righttype | NONE } )\n"
 #~ "  OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
 #~ "ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
@@ -4746,6 +5229,7 @@ msgstr "le processus fils a quitt
 #~ "  RENAME TO nouveau_nom\n"
 #~ "ALTER OPERATOR CLASS nom USING méthode_indexation\n"
 #~ "  OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER OPERATOR FAMILY name USING index_method ADD\n"
 #~ "  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
@@ -4772,6 +5256,7 @@ msgstr "le processus fils a quitt
 #~ "  RENAME TO nouveau_nom\n"
 #~ "ALTER OPERATOR FAMILY nom USING méthode_indexage\n"
 #~ "  OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
@@ -4815,12 +5300,14 @@ msgstr "le processus fils a quitt
 #~ "ALTER ROLE name SET paramètre FROM CURRENT\n"
 #~ "ALTER ROLE nom RESET paramètre\n"
 #~ "ALTER ROLE name RESET ALL"
+
 #~ msgid ""
 #~ "ALTER SCHEMA name RENAME TO newname\n"
 #~ "ALTER SCHEMA name OWNER TO newowner"
 #~ msgstr ""
 #~ "ALTER SCHEMA nom RENAME TO nouveau_nom\n"
 #~ "ALTER SCHEMA nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 #~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
@@ -4843,6 +5330,7 @@ msgstr "le processus fils a quitt
 #~ "ALTER SEQUENCE nom OWNER TO new_propriétaire\n"
 #~ "ALTER SEQUENCE nom RENAME TO new_nom\n"
 #~ "ALTER SEQUENCE nom SET SCHEMA new_schéma"
+
 #~ msgid ""
 #~ "ALTER SERVER servername [ VERSION 'newversion' ]\n"
 #~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]\n"
@@ -4851,6 +5339,7 @@ msgstr "le processus fils a quitt
 #~ "ALTER SERVER nom [ VERSION 'nouvelleversion' ]\n"
 #~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['valeur'] [, ... ] ) ]\n"
 #~ "ALTER SERVER nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER TABLE [ ONLY ] name [ * ]\n"
 #~ "    action [, ... ]\n"
@@ -4933,12 +5422,14 @@ msgstr "le processus fils a quitt
 #~ "    NO INHERIT table_parent\n"
 #~ "    OWNER TO nouveau_propriétaire\n"
 #~ "    SET TABLESPACE nouveau_tablespace"
+
 #~ msgid ""
 #~ "ALTER TABLESPACE name RENAME TO newname\n"
 #~ "ALTER TABLESPACE name OWNER TO newowner"
 #~ msgstr ""
 #~ "ALTER TABLESPACE nom RENAME TO nouveau_nom\n"
 #~ "ALTER TABLESPACE nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER TEXT SEARCH CONFIGURATION name\n"
 #~ "    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
@@ -4967,6 +5458,7 @@ msgstr "le processus fils a quitt
 #~ "    DROP MAPPING [ IF EXISTS ] FOR type_jeton [, ... ]\n"
 #~ "ALTER TEXT SEARCH CONFIGURATION nom RENAME TO nouveau_nom\n"
 #~ "ALTER TEXT SEARCH CONFIGURATION nom OWNER TO nouveau_propriétaire"
+
 #~ msgid ""
 #~ "ALTER TEXT SEARCH DICTIONARY name (\n"
 #~ "    option [ = value ] [, ... ]\n"
@@ -4979,12 +5471,16 @@ msgstr "le processus fils a quitt
 #~ ")\n"
 #~ "ALTER TEXT SEARCH DICTIONARY nom RENAME TO nouveau_nom\n"
 #~ "ALTER TEXT SEARCH DICTIONARY nom OWNER TO nouveau_propriétaire"
+
 #~ msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
 #~ msgstr "ALTER TEXT SEARCH PARSER nom RENAME TO nouveau_nom"
+
 #~ msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
 #~ msgstr "ALTER TEXT SEARCH TEMPLATE nom RENAME TO nouveau_nom"
+
 #~ msgid "ALTER TRIGGER name ON table RENAME TO newname"
 #~ msgstr "ALTER TRIGGER nom ON table RENAME TO nouveau_nom"
+
 #~ msgid ""
 #~ "ALTER TYPE name RENAME TO new_name\n"
 #~ "ALTER TYPE name OWNER TO new_owner \n"
@@ -4993,6 +5489,7 @@ msgstr "le processus fils a quitt
 #~ "ALTER TYPE nom RENAME TO nouveau_nom\n"
 #~ "ALTER TYPE nom OWNER TO nouveau_propriétaire\n"
 #~ "ALTER TYPE nom SET SCHEMA nouveau_schéma"
+
 #~ msgid ""
 #~ "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
@@ -5036,6 +5533,7 @@ msgstr "le processus fils a quitt
 #~ "ALTER USER name SET paramètre FROM CURRENT\n"
 #~ "ALTER USER nom RESET paramètre\n"
 #~ "ALTER USER name RESET ALL"
+
 #~ msgid ""
 #~ "ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
 #~ "    SERVER servername\n"
@@ -5045,6 +5543,7 @@ msgstr "le processus fils a quitt
 #~ "PUBLIC }\n"
 #~ "    SERVER nom_serveur\n"
 #~ "    OPTIONS ( [ ADD | SET | DROP ] option ['valeur'] [, ... ] )"
+
 #~ msgid ""
 #~ "ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
 #~ "ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
@@ -5057,8 +5556,10 @@ msgstr "le processus fils a quitt
 #~ "ALTER VIEW nom OWNER TO nouveau_propriétaire\n"
 #~ "ALTER VIEW nom RENAME TO nouveau_nom\n"
 #~ "ALTER VIEW nom SET SCHEMA nouveau_schéma"
+
 #~ msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
 #~ msgstr "ANALYZE [ VERBOSE ] [ table [ ( colonne [, ...] ) ] ]"
+
 #~ msgid ""
 #~ "BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
 #~ "\n"
@@ -5075,16 +5576,20 @@ msgstr "le processus fils a quitt
 #~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ |\n"
 #~ "                      READ COMMITTED | READ UNCOMMITTED }\n"
 #~ "    READ WRITE | READ ONLY"
+
 #~ msgid "CHECKPOINT"
 #~ msgstr "CHECKPOINT"
+
 #~ msgid "CLOSE { name | ALL }"
 #~ msgstr "CLOSE { nom | ALL }"
+
 #~ msgid ""
 #~ "CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
 #~ "CLUSTER [VERBOSE]"
 #~ msgstr ""
 #~ "CLUSTER [VERBOSE] nom_table [ USING nom_index ]\n"
 #~ "CLUSTER [VERBOSE]"
+
 #~ msgid ""
 #~ "COMMENT ON\n"
 #~ "{\n"
@@ -5148,10 +5653,13 @@ msgstr "le processus fils a quitt
 #~ "  TYPE nom_objet |\n"
 #~ "  VIEW nom_objet\n"
 #~ "} IS 'text'"
+
 #~ msgid "COMMIT [ WORK | TRANSACTION ]"
 #~ msgstr "COMMIT [ WORK | TRANSACTION ]"
+
 #~ msgid "COMMIT PREPARED transaction_id"
 #~ msgstr "COMMIT PREPARED id_transaction"
+
 #~ msgid ""
 #~ "COPY tablename [ ( column [, ...] ) ]\n"
 #~ "    FROM { 'filename' | STDIN }\n"
@@ -5200,6 +5708,7 @@ msgstr "le processus fils a quitt
 #~ "                [ QUOTE [ AS ] 'guillemet' ] \n"
 #~ "                [ ESCAPE [ AS ] 'échappement' ]\n"
 #~ "                [ FORCE QUOTE colonne [, ...] ]"
+
 #~ msgid ""
 #~ "CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
 #~ "    SFUNC = sfunc,\n"
@@ -5238,6 +5747,7 @@ msgstr "le processus fils a quitt
 #~ "    [ , INITCOND = condition_initiale ]\n"
 #~ "    [ , SORTOP = opérateur_tri ]\n"
 #~ ")"
+
 #~ msgid ""
 #~ "CREATE CAST (sourcetype AS targettype)\n"
 #~ "    WITH FUNCTION funcname (argtypes)\n"
@@ -5262,6 +5772,7 @@ msgstr "le processus fils a quitt
 #~ "CREATE CAST (type_source AS type_cible)\n"
 #~ "    WITH INOUT\n"
 #~ "    [ AS ASSIGNMENT | AS IMPLICIT ]"
+
 #~ msgid ""
 #~ "CREATE CONSTRAINT TRIGGER name\n"
 #~ "    AFTER event [ OR ... ]\n"
@@ -5280,12 +5791,14 @@ msgstr "le processus fils a quitt
 #~ "INITIALLY DEFERRED } }\n"
 #~ "    FOR EACH ROW\n"
 #~ "    EXECUTE PROCEDURE nom_fonction ( arguments )"
+
 #~ msgid ""
 #~ "CREATE [ DEFAULT ] CONVERSION name\n"
 #~ "    FOR source_encoding TO dest_encoding FROM funcname"
 #~ msgstr ""
 #~ "CREATE [DEFAULT] CONVERSION nom\n"
 #~ "    FOR codage_source TO codage_cible FROM nom_fonction"
+
 #~ msgid ""
 #~ "CREATE DATABASE name\n"
 #~ "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
@@ -5304,6 +5817,7 @@ msgstr "le processus fils a quitt
 #~ "           [ LC_CTYPE [=] type_caract ]\n"
 #~ "           [ TABLESPACE [=] tablespace ]\n"
 #~ "           [ CONNECTION LIMIT [=] limite_connexion ] ]"
+
 #~ msgid ""
 #~ "CREATE DOMAIN name [ AS ] data_type\n"
 #~ "    [ DEFAULT expression ]\n"
@@ -5322,6 +5836,7 @@ msgstr "le processus fils a quitt
 #~ "\n"
 #~ "[ CONSTRAINT nom_contrainte ]\n"
 #~ "{ NOT NULL | NULL | CHECK (expression) }"
+
 #~ msgid ""
 #~ "CREATE FOREIGN DATA WRAPPER name\n"
 #~ "    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
@@ -5330,6 +5845,7 @@ msgstr "le processus fils a quitt
 #~ "CREATE FOREIGN DATA WRAPPER nom\n"
 #~ "    [ VALIDATOR fonction_validation | NO VALIDATOR ]\n"
 #~ "    [ OPTIONS ( option 'valeur' [, ... ] ) ]"
+
 #~ msgid ""
 #~ "CREATE [ OR REPLACE ] FUNCTION\n"
 #~ "    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
@@ -5367,6 +5883,7 @@ msgstr "le processus fils a quitt
 #~ "    | AS 'fichier_obj', 'symbôle_lien'\n"
 #~ "  } ...\n"
 #~ "    [ WITH ( attribut [, ...] ) ]"
+
 #~ msgid ""
 #~ "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
@@ -5405,6 +5922,7 @@ msgstr "le processus fils a quitt
 #~ "    | ADMIN nom_rôle [, ...]\n"
 #~ "    | USER nom_rôle [, ...]\n"
 #~ "    | SYSID uid"
+
 #~ msgid ""
 #~ "CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
 #~ "    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS "
@@ -5420,6 +5938,7 @@ msgstr "le processus fils a quitt
 #~ "    [ WITH ( parametre_stockage = valeur [, ... ] ) ]\n"
 #~ "    [ TABLESPACE tablespace ]\n"
 #~ "    [ WHERE predicat ]"
+
 #~ msgid ""
 #~ "CREATE [ PROCEDURAL ] LANGUAGE name\n"
 #~ "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
@@ -5428,6 +5947,7 @@ msgstr "le processus fils a quitt
 #~ "CREATE [ PROCEDURAL ] LANGUAGE nom\n"
 #~ "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE nom\n"
 #~ "    HANDLER gestionnaire_appels [ VALIDATOR fonction_val ]"
+
 #~ msgid ""
 #~ "CREATE OPERATOR name (\n"
 #~ "    PROCEDURE = funcname\n"
@@ -5444,6 +5964,7 @@ msgstr "le processus fils a quitt
 #~ "    [, RESTRICT = proc_res ] [, JOIN = proc_join ]\n"
 #~ "    [, HASHES ] [, MERGES ]\n"
 #~ ")"
+
 #~ msgid ""
 #~ "CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
 #~ "  USING index_method [ FAMILY family_name ] AS\n"
@@ -5460,8 +5981,10 @@ msgstr "le processus fils a quitt
 #~ "      nom_fonction ( type_argument [, ...] )\n"
 #~ "    | STORAGE type_stockage\n"
 #~ "  } [, ... ]"
+
 #~ msgid "CREATE OPERATOR FAMILY name USING index_method"
 #~ msgstr "CREATE OPERATOR FAMILY nom USING methode_indexage"
+
 #~ msgid ""
 #~ "CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
@@ -5502,6 +6025,7 @@ msgstr "le processus fils a quitt
 #~ "    | ADMIN nom_rôle [, ...]\n"
 #~ "    | USER nom_rôle [, ...]\n"
 #~ "    | SYSID uid"
+
 #~ msgid ""
 #~ "CREATE [ OR REPLACE ] RULE name AS ON event\n"
 #~ "    TO table [ WHERE condition ]\n"
@@ -5512,6 +6036,7 @@ msgstr "le processus fils a quitt
 #~ "    TO table [ WHERE condition ]\n"
 #~ "    DO [ ALSO | INSTEAD ] { NOTHING | commande | ( commande ; "
 #~ "commande ... ) }"
+
 #~ msgid ""
 #~ "CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element "
 #~ "[ ... ] ]\n"
@@ -5520,6 +6045,7 @@ msgstr "le processus fils a quitt
 #~ "CREATE SCHEMA nom_schema [ AUTHORIZATION nom_utilisateur ]\n"
 #~ "  [ element_schema [ ... ] ]\n"
 #~ "CREATE SCHEMA AUTHORIZATION nom_utilisateur [ element_schema [ ... ] ]"
+
 #~ msgid ""
 #~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 #~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
@@ -5535,6 +6061,7 @@ msgstr "le processus fils a quitt
 #~ "    [ CACHE en_cache ]\n"
 #~ "    [ [ NO ] CYCLE ]\n"
 #~ "    [ OWNED BY { table.colonne | NONE } ]"
+
 #~ msgid ""
 #~ "CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION "
 #~ "'serverversion' ]\n"
@@ -5544,6 +6071,7 @@ msgstr "le processus fils a quitt
 #~ "CREATE SERVER nom [ TYPE 'typeserveur' ] [ VERSION 'versionserveur' ]\n"
 #~ "    FOREIGN DATA WRAPPER nomfdw\n"
 #~ "    [ OPTIONS ( option 'valeur' [, ... ] ) ]"
+
 #~ msgid ""
 #~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
 #~ "  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
@@ -5636,6 +6164,7 @@ msgstr "le processus fils a quitt
 #~ "\n"
 #~ "[ WITH ( paramètre_stockage [= valeur] [, ... ] ) ]\n"
 #~ "[ USING INDEX TABLESPACE espace_logique ]"
+
 #~ msgid ""
 #~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
 #~ "    [ (column_name [, ...] ) ]\n"
@@ -5653,11 +6182,13 @@ msgstr "le processus fils a quitt
 #~ "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
 #~ "    [ TABLESPACE tablespace ]\n"
 #~ "    AS requête    [ WITH [ NO ] DATA ]"
+
 #~ msgid ""
 #~ "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
 #~ msgstr ""
 #~ "CREATE TABLESPACE nom_tablespace [ OWNER nom_utilisateur ]\n"
 #~ "    LOCATION 'répertoire'"
+
 #~ msgid ""
 #~ "CREATE TEXT SEARCH CONFIGURATION name (\n"
 #~ "    PARSER = parser_name |\n"
@@ -5668,6 +6199,7 @@ msgstr "le processus fils a quitt
 #~ "    PARSER = nom_analyseur |\n"
 #~ "    COPY = config_source\n"
 #~ ")"
+
 #~ msgid ""
 #~ "CREATE TEXT SEARCH DICTIONARY name (\n"
 #~ "    TEMPLATE = template\n"
@@ -5678,6 +6210,7 @@ msgstr "le processus fils a quitt
 #~ "    TEMPLATE = modèle\n"
 #~ "    [, option = valeur [, ... ]]\n"
 #~ ")"
+
 #~ msgid ""
 #~ "CREATE TEXT SEARCH PARSER name (\n"
 #~ "    START = start_function ,\n"
@@ -5694,6 +6227,7 @@ msgstr "le processus fils a quitt
 #~ "    LEXTYPES = fonction_typeslexem\n"
 #~ "    [, HEADLINE = fonction_entete ]\n"
 #~ ")"
+
 #~ msgid ""
 #~ "CREATE TEXT SEARCH TEMPLATE name (\n"
 #~ "    [ INIT = init_function , ]\n"
@@ -5704,6 +6238,7 @@ msgstr "le processus fils a quitt
 #~ "    [ INIT = fonction_init , ]\n"
 #~ "    LEXIZE = fonction_lexize\n"
 #~ ")"
+
 #~ msgid ""
 #~ "CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
 #~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
@@ -5712,6 +6247,7 @@ msgstr "le processus fils a quitt
 #~ "CREATE TRIGGER nom { BEFORE | AFTER } { événement [ OR ... ] }\n"
 #~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
 #~ "    EXECUTE PROCEDURE nom_fonction ( arguments )"
+
 #~ msgid ""
 #~ "CREATE TYPE name AS\n"
 #~ "    ( attribute_name data_type [, ... ] )\n"
@@ -5768,6 +6304,7 @@ msgstr "le processus fils a quitt
 #~ ")\n"
 #~ "\n"
 #~ "CREATE TYPE nom"
+
 #~ msgid ""
 #~ "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
 #~ "\n"
@@ -5808,6 +6345,7 @@ msgstr "le processus fils a quitt
 #~ "    | ADMIN nom_rôle [, ...]\n"
 #~ "    | USER nom_rôle [, ...]\n"
 #~ "    | SYSID uid"
+
 #~ msgid ""
 #~ "CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
 #~ "    SERVER servername\n"
@@ -5817,6 +6355,7 @@ msgstr "le processus fils a quitt
 #~ "PUBLIC }\n"
 #~ "    SERVER nomserveur\n"
 #~ "    [ OPTIONS ( option 'valeur' [ , ... ] ) ]"
+
 #~ msgid ""
 #~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
 #~ "[, ...] ) ]\n"
@@ -5825,14 +6364,17 @@ msgstr "le processus fils a quitt
 #~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW nom\n"
 #~ "    [ ( nom_colonne [, ...] ) ]\n"
 #~ "    AS requête"
+
 #~ msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
 #~ msgstr "DEALLOCATE [ PREPARE ] { nom_plan | ALL }"
+
 #~ msgid ""
 #~ "DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
 #~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
 #~ msgstr ""
 #~ "DECLARE nom [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
 #~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR requête"
+
 #~ msgid ""
 #~ "DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
 #~ "    [ USING usinglist ]\n"
@@ -5843,25 +6385,33 @@ msgstr "le processus fils a quitt
 #~ "    [ USING liste_using ]\n"
 #~ "    [ WHERE condition | WHERE CURRENT OF nom_curseur ]\n"
 #~ "    [ RETURNING * | expression_sortie [ [ AS ] nom_sortie ] [, ...] ]"
+
 #~ msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
 #~ msgstr "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
+
 #~ msgid ""
 #~ "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | "
 #~ "RESTRICT ]"
 #~ msgstr ""
 #~ "DROP AGGREGATE [ IF EXISTS ] nom ( type [ , ... ] ) [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
 #~ msgstr ""
 #~ "DROP CAST [ IF EXISTS ] (type_source AS type_cible) [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP CONVERSION [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP DATABASE [ IF EXISTS ] name"
 #~ msgstr "DROP DATABASE [ IF EXISTS ] nom"
+
 #~ msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP DOMAIN [ IF EXISTS ] nom [, ...]  [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype "
 #~ "[, ...] ] )\n"
@@ -5870,14 +6420,18 @@ msgstr "le processus fils a quitt
 #~ "DROP FUNCTION [IF EXISTS ] nom\n"
 #~ "    ( [ [ mode_arg ] [ nom_arg ] type_arg [, ...] ] )\n"
 #~ "    [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
 #~ msgstr "DROP GROUP [IF EXISTS ] nom [, ...]"
+
 #~ msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP INDEX [IF EXISTS ] nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr ""
 #~ "DROP [ PROCEDURAL ] LANGUAGE [IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
 #~ "NONE } ) [ CASCADE | RESTRICT ]"
@@ -5885,66 +6439,89 @@ msgstr "le processus fils a quitt
 #~ "DROP OPERATOR [IF EXISTS ] nom\n"
 #~ "  ( { type_gauche | NONE } , { type_droit | NONE } )\n"
 #~ "  [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
 #~ "RESTRICT ]"
 #~ msgstr ""
 #~ "DROP OPERATOR CLASS [IF EXISTS ] nom\n"
 #~ "    USING méthode_indexage [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
 #~ "RESTRICT ]"
 #~ msgstr ""
 #~ "DROP OPERATOR FAMILY [IF EXISTS ] nom\n"
 #~ "  USING méthode_indexage [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP OWNED BY nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
 #~ msgstr "DROP ROLE [IF EXISTS ] nom [, ...]"
+
 #~ msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP RULE [IF EXISTS ] nom ON relation [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP SCHEMA [IF EXISTS ] nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP SEQUENCE [IF EXISTS ] nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP SERVER [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP TABLE [IF EXISTS ] nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
 #~ msgstr "DROP TABLESPACE [IF EXISTS ] nom_tablespace"
+
 #~ msgid ""
 #~ "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr ""
 #~ "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid ""
 #~ "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr ""
 #~ "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP TEXT SEARCH PARSER [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] nom [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP TRIGGER [IF EXISTS ] nom ON table [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP TYPE [IF EXISTS ] nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid "DROP USER [ IF EXISTS ] name [, ...]"
 #~ msgstr "DROP USER [IF EXISTS ] nom [, ...]"
+
 #~ msgid ""
 #~ "DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | "
 #~ "PUBLIC } SERVER servername"
 #~ msgstr ""
 #~ "DROP USER MAPPING [ IF EXISTS ] FOR { nomutilisateur | USER | "
 #~ "CURRENT_USER | PUBLIC } SERVER nomserveur"
+
 #~ msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
 #~ msgstr "DROP VIEW [IF EXISTS ] nom [, ...] [ CASCADE | RESTRICT ]"
+
 #~ msgid "END [ WORK | TRANSACTION ]"
 #~ msgstr "END [ WORK | TRANSACTION ]"
+
 #~ msgid "EXECUTE name [ ( parameter [, ...] ) ]"
 #~ msgstr "EXECUTE nom_plan [ ( paramètre [, ...] ) ]"
+
 #~ msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
 #~ msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] instruction"
+
 #~ msgid ""
 #~ "FETCH [ direction { FROM | IN } ] cursorname\n"
 #~ "\n"
@@ -5984,6 +6561,7 @@ msgstr "le processus fils a quitt
 #~ "    BACKWARD\n"
 #~ "    BACKWARD nombre\n"
 #~ "    BACKWARD ALL"
+
 #~ msgid ""
 #~ "GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
 #~ "TRIGGER }\n"
@@ -6080,6 +6658,7 @@ msgstr "le processus fils a quitt
 #~ "    TO { [ GROUP ] nom_rôle | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 #~ "\n"
 #~ "GRANT rôle [, ...] TO nom_rôle [, ...] [ WITH ADMIN OPTION ]"
+
 #~ msgid ""
 #~ "INSERT INTO table [ ( column [, ...] ) ]\n"
 #~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) "
@@ -6090,10 +6669,13 @@ msgstr "le processus fils a quitt
 #~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) "
 #~ "[, ...] | requête }\n"
 #~ "    [ RETURNING * | expression_sortie [ [ AS ] nom_sortie ] [, ...] ]"
+
 #~ msgid "LISTEN name"
 #~ msgstr "LISTEN nom"
+
 #~ msgid "LOAD 'filename'"
 #~ msgstr "LOAD 'nom_de_fichier'"
+
 #~ msgid ""
 #~ "LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
 #~ "\n"
@@ -6109,20 +6691,28 @@ msgstr "le processus fils a quitt
 #~ "\n"
 #~ "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
 #~ "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
+
 #~ msgid "MOVE [ direction { FROM | IN } ] cursorname"
 #~ msgstr "MOVE [ direction { FROM | IN } ] nom_de_curseur"
+
 #~ msgid "NOTIFY name"
 #~ msgstr "NOTIFY nom"
+
 #~ msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
 #~ msgstr "PREPARE nom_plan [ ( type_données [, ...] ) ] AS instruction"
+
 #~ msgid "PREPARE TRANSACTION transaction_id"
 #~ msgstr "PREPARE TRANSACTION id_transaction"
+
 #~ msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
 #~ msgstr "REASSIGN OWNED BY ancien_role [, ...] TO nouveau_role"
+
 #~ msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
 #~ msgstr "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nom [ FORCE ]"
+
 #~ msgid "RELEASE [ SAVEPOINT ] savepoint_name"
 #~ msgstr "RELEASE [ SAVEPOINT ] nom_retour"
+
 #~ msgid ""
 #~ "REVOKE [ GRANT OPTION FOR ]\n"
 #~ "    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
@@ -6263,12 +6853,16 @@ msgstr "le processus fils a quitt
 #~ "REVOKE [ ADMIN OPTION FOR ]\n"
 #~ "    role [, ...] FROM nom_rôle [, ...]\n"
 #~ "    [ CASCADE | RESTRICT ]"
+
 #~ msgid "ROLLBACK [ WORK | TRANSACTION ]"
 #~ msgstr "ROLLBACK [ WORK | TRANSACTION ]"
+
 #~ msgid "ROLLBACK PREPARED transaction_id"
 #~ msgstr "ROLLBACK PREPARED id_transaction"
+
 #~ msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
 #~ msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] nom_retour"
+
 #~ msgid ""
 #~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 #~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
@@ -6340,6 +6934,7 @@ msgstr "le processus fils a quitt
 #~ "    nom_requête_with [ ( nom_colonne [, ...] ) ] AS ( select )\n"
 #~ "\n"
 #~ "TABLE { [ ONLY ] nom_table [ * ] | nom_requête_with }"
+
 #~ msgid ""
 #~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
 #~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
@@ -6374,6 +6969,7 @@ msgstr "le processus fils a quitt
 #~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
 #~ "    [ FETCH { FIRST | NEXT } [ total ] { ROW | ROWS } ONLY ]\n"
 #~ "    [ FOR { UPDATE | SHARE } [ OF nom_table [, ...] ] [ NOWAIT ] [...] ]"
+
 #~ msgid ""
 #~ "SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | "
 #~ "'value' | DEFAULT }\n"
@@ -6382,8 +6978,10 @@ msgstr "le processus fils a quitt
 #~ "SET [ SESSION | LOCAL ] paramètre { TO | = } { valeur | 'valeur' | "
 #~ "DEFAULT }\n"
 #~ "SET [ SESSION | LOCAL ] TIME ZONE { zone_horaire | LOCAL | DEFAULT }"
+
 #~ msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
 #~ msgstr "SET CONSTRAINTS { ALL | nom [, ...] } { DEFERRED | IMMEDIATE }"
+
 #~ msgid ""
 #~ "SET [ SESSION | LOCAL ] ROLE rolename\n"
 #~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
@@ -6392,6 +6990,7 @@ msgstr "le processus fils a quitt
 #~ "SET [ SESSION | LOCAL ] ROLE nom_rôle\n"
 #~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
 #~ "RESET ROLE"
+
 #~ msgid ""
 #~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
 #~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
@@ -6400,6 +6999,7 @@ msgstr "le processus fils a quitt
 #~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION nom_utilisateur\n"
 #~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
 #~ "RESET SESSION AUTHORIZATION"
+
 #~ msgid ""
 #~ "SET TRANSACTION transaction_mode [, ...]\n"
 #~ "SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
@@ -6418,12 +7018,14 @@ msgstr "le processus fils a quitt
 #~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ |\n"
 #~ "                      READ COMMITTED | READ UNCOMMITTED }\n"
 #~ "    READ WRITE | READ ONLY"
+
 #~ msgid ""
 #~ "SHOW name\n"
 #~ "SHOW ALL"
 #~ msgstr ""
 #~ "SHOW nom\n"
 #~ "SHOW ALL"
+
 #~ msgid ""
 #~ "START TRANSACTION [ transaction_mode [, ...] ]\n"
 #~ "\n"
@@ -6440,14 +7042,17 @@ msgstr "le processus fils a quitt
 #~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ |\n"
 #~ "                      READ COMMITTED | READ UNCOMMITTED }\n"
 #~ "    READ WRITE | READ ONLY"
+
 #~ msgid ""
 #~ "TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
 #~ "    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
 #~ msgstr ""
 #~ "TRUNCATE [ TABLE ] [ ONLY ] nom [, ... ]\n"
 #~ "    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
+
 #~ msgid "UNLISTEN { name | * }"
 #~ msgstr "UNLISTEN { nom | * }"
+
 #~ msgid ""
 #~ "UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
 #~ "    SET { column = { expression | DEFAULT } |\n"
@@ -6464,6 +7069,7 @@ msgstr "le processus fils a quitt
 #~ "    [ FROM liste_from ]\n"
 #~ "    [ WHERE condition | WHERE CURRENT OF nom_curseur ]\n"
 #~ "    [ RETURNING * | expression_sortie [ [ AS ] nom_sortie ] [, ...] ]"
+
 #~ msgid ""
 #~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 #~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
@@ -6472,6 +7078,7 @@ msgstr "le processus fils a quitt
 #~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 #~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (colonne "
 #~ "[, ...] ) ] ]"
+
 #~ msgid ""
 #~ "VALUES ( expression [, ...] ) [, ...]\n"
 #~ "    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
@@ -6484,14 +7091,16 @@ msgstr "le processus fils a quitt
 #~ "    [ LIMIT { total | ALL } ]\n"
 #~ "    [ OFFSET début [ ROW | ROWS ] ]\n"
 #~ "    [ FETCH { FIRST | NEXT } [ total ] { ROW | ROWS } ONLY ]"
+
 #~ msgid "  \"%s\" IN %s %s"
 #~ msgstr "  \"%s\" DANS %s %s"
+
 #~ msgid "(1 row)"
+
 #~ msgid_plural "(%lu rows)"
 #~ msgstr[0] "(1 ligne)"
 #~ msgstr[1] "(%lu lignes)"
-#~ msgid "  \\df[S+] [PATTERN]      list functions\n"
-#~ msgstr "  \\df[S+] [MODÈLE]     affiche la liste des fonctions\n"
+
 #~ msgid ""
 #~ "  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 #~ "                 list tables/indexes/sequences/views/system tables\n"
@@ -6499,16 +7108,19 @@ msgstr "le processus fils a quitt
 #~ "  \\d{t|i|s|v|S} [MODÈLE] (ajouter « + » pour plus de détails)\n"
 #~ "                       affiche la liste des\n"
 #~ "                       tables/index/séquences/vues/tables système\n"
+
 #~ msgid "  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\db [MODÈLE]         affiche la liste des tablespaces (ajouter « + » "
 #~ "pour\n"
 #~ "                       plus de détails)\n"
+
 #~ msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\df [MODÈLE]         affiche la liste des fonctions (ajouter « + » "
 #~ "pour\n"
 #~ "                       plus de détails)\n"
+
 #~ msgid ""
 #~ "  \\dFd [PATTERN] list text search dictionaries (add \"+\" for more "
 #~ "detail)\n"
@@ -6516,26 +7128,31 @@ msgstr "le processus fils a quitt
 #~ "  \\dFd [MODÈLE]        affiche la liste des dictionnaires de la "
 #~ "recherche\n"
 #~ "                       de texte (ajouter « + » pour plus de détails)\n"
+
 #~ msgid ""
 #~ "  \\dFp [PATTERN] list text search parsers (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\dFp [MODÈLE]        affiche la liste des analyseurs de la recherche "
 #~ "de\n"
 #~ "                       texte (ajouter « + » pour plus de détails)\n"
+
 #~ msgid "  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\dn [MODÈLE]         affiche la liste des schémas (ajouter « + » pour\n"
 #~ "                       plus de détails)\n"
+
 #~ msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
 #~ msgstr ""
-#~ "  \\dT [MODÈLE]         affiche la liste des types de données (ajouter « + "
-#~ "»\n"
+#~ "  \\dT [MODÈLE]         affiche la liste des types de données (ajouter « "
+#~ "+ »\n"
 #~ "                       pour plus de détails)\n"
+
 #~ msgid "  \\l             list all databases (add \"+\" for more detail)\n"
 #~ msgstr ""
-#~ "  \\l                   affiche la liste des bases de données (ajouter « + "
-#~ "»\n"
+#~ "  \\l                   affiche la liste des bases de données (ajouter « "
+#~ "+ »\n"
 #~ "                       pour plus de détails)\n"
+
 #~ msgid ""
 #~ "  \\z [PATTERN]   list table, view, and sequence access privileges (same "
 #~ "as \\dp)\n"
@@ -6543,8 +7160,10 @@ msgstr "le processus fils a quitt
 #~ "  \\z [MODÈLE]          affiche la liste des privilèges d'accès aux "
 #~ "tables,\n"
 #~ "                       vues et séquences (identique à \\dp)\n"
+
 #~ msgid "Copy, Large Object\n"
 #~ msgstr "Copie, « Large Object »\n"
+
 #~ msgid ""
 #~ "Welcome to %s %s (server %s), the PostgreSQL interactive terminal.\n"
 #~ "\n"
@@ -6552,12 +7171,14 @@ msgstr "le processus fils a quitt
 #~ "Bienvenue dans %s %s (serveur %s), l'interface interactive de "
 #~ "PostgreSQL.\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Bienvenue dans %s %s, l'interface interactive de PostgreSQL.\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "WARNING:  You are connected to a server with major version %d.%d,\n"
 #~ "but your %s client is major version %d.%d.  Some backslash commands,\n"
@@ -6570,12 +7191,15 @@ msgstr "le processus fils a quitt
 #~ "commandes avec antislashs, comme \\d, peuvent ne pas fonctionner\n"
 #~ "correctement.\n"
 #~ "\n"
+
 #~ msgid "Access privileges for database \"%s\""
 #~ msgstr "Droits d'accès pour la base de données « %s »"
+
 #~ msgid "?%c? \"%s.%s\""
 #~ msgstr "?%c? « %s.%s »"
+
 #~ msgid "    \"%s\""
 #~ msgstr "    « %s »"
+
 #~ msgid "ALTER VIEW name RENAME TO newname"
 #~ msgstr "ALTER VIEW nom RENAME TO nouveau_nom"
-
diff --git a/src/bin/psql/po/ja.po b/src/bin/psql/po/ja.po
index b0a0eb71aae08..18afe4668dac5 100644
--- a/src/bin/psql/po/ja.po
+++ b/src/bin/psql/po/ja.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0.0\n"
+"Project-Id-Version: PostgreSQL 9.1 beta2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-19 21:46+0900\n"
-"PO-Revision-Date: 2011-01-15 22:30+0900\n"
+"POT-Creation-Date: 2011-08-27 16:47+0900\n"
+"PO-Revision-Date: 2011-08-27 16:51+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -14,164 +14,199 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: command.c:112
+#: command.c:113
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "�正�コマンド��：\\%s。\\? �ヘルプを�照������。\n"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "�正�コマンド��：\\%s：\n"
 
-#: command.c:125
+#: command.c:126
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: 余分�引数 \"%s\" �無視�れ���。\n"
 
-#: command.c:267
+#: command.c:268
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "ホームディレクトリ \"%s\" ��置を特定����ん。\n"
 
-#: command.c:283
+#: command.c:284
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: ディレクトリを \"%s\" �変更����ん：%s\n"
 
-#: command.c:316 common.c:940
+#: command.c:305 common.c:493 common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "�在データベース��接続�����ん。\n"
+
+#: command.c:312
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"データベース\"%s\"�ユーザ\"%s\"�ソケット\"%s\"経由��ート\"%s\"�接続��"
+"���。\n"
+
+#: command.c:315
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
+"\"%s\".\n"
+msgstr ""
+"ホスト\"%3$s\"上��ート\"%4$s\"�データベース\"%1$s\"�ユーザ\"%2$s\"�接続"
+"�����\n"
+
+#: command.c:339 common.c:940
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "時間: %.3f ms\n"
 
-#: command.c:485 command.c:513 command.c:1064
+#: command.c:524 command.c:588 command.c:1285
 msgid "no query buffer\n"
 msgstr "クエリー�ッファ��り��ん。\n"
 
-#: command.c:555
+#: command.c:557 command.c:2507
+#, c-format
+msgid "invalid line number: %s\n"
+msgstr "無効�行番���: %s\n"
+
+#: command.c:662
 msgid "No changes"
 msgstr "変更��"
 
-#: command.c:609
+#: command.c:716
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: 正��エンコーディング���������変�用プロシージャ�見��り��"
 "ん。\n"
 
-#: command.c:688 command.c:722 command.c:736 command.c:753 command.c:857
-#: command.c:907 command.c:1044 command.c:1075
+#: command.c:795 command.c:829 command.c:843 command.c:860 command.c:964
+#: command.c:1014 command.c:1265 command.c:1296
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: 引数��足�����。\n"
 
-#: command.c:785
+#: command.c:892
 msgid "Query buffer is empty."
 msgstr "クエリー�ッファ�空��。"
 
-#: command.c:795
+#: command.c:902
 msgid "Enter new password: "
 msgstr "新��パスワード: "
 
-#: command.c:796
+#: command.c:903
 msgid "Enter it again: "
 msgstr "も�一度入力������："
 
-#: command.c:800
+#: command.c:907
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "パスワード�マッ����ん。\n"
 
-#: command.c:818
+#: command.c:925
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "パスワード�暗�化�失敗����。\n"
 
-#: command.c:886 command.c:987 command.c:1049
+#: command.c:993 command.c:1094 command.c:1270
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: エラー\n"
 
-#: command.c:927
+#: command.c:1034
 msgid "Query buffer reset (cleared)."
 msgstr "クエリー�ッファ�リセット（クリア）�れ���。"
 
-#: command.c:940
+#: command.c:1047
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "ファイル \"%s/%s\" �ヒストリを出力����。\n"
 
-#: command.c:978 common.c:52 common.c:66 input.c:209 mainloop.c:72
-#: mainloop.c:234 print.c:137 print.c:151
+#: command.c:1085 common.c:52 common.c:66 common.c:90 input.c:209
+#: mainloop.c:72 mainloop.c:234 print.c:137 print.c:151
 #, c-format
 msgid "out of memory\n"
 msgstr "メモリ�足��\n"
 
-#: command.c:1029
+#: command.c:1115
+msgid "function name is required\n"
+msgstr "関数��必���\n"
+
+#: command.c:1250
 msgid "Timing is on."
 msgstr "タイミング� on ��。"
 
-#: command.c:1031
+#: command.c:1252
 msgid "Timing is off."
 msgstr "タイミング� off ��。"
 
-#: command.c:1092 command.c:1112 command.c:1633 command.c:1640 command.c:1649
-#: command.c:1659 command.c:1668 command.c:1682 command.c:1699 command.c:1737
+#: command.c:1313 command.c:1333 command.c:1895 command.c:1902 command.c:1911
+#: command.c:1921 command.c:1930 command.c:1944 command.c:1961 command.c:1999
 #: common.c:137 copy.c:283 copy.c:361
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1194 startup.c:159
+#: command.c:1415 startup.c:159
 msgid "Password: "
 msgstr "パスワード: "
 
-#: command.c:1201 startup.c:162 startup.c:164
+#: command.c:1422 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "ユーザ %s �パスワード: "
 
-#: command.c:1318 command.c:2207 common.c:183 common.c:460 common.c:525
-#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:606
+#: command.c:1541 command.c:2541 common.c:183 common.c:460 common.c:525
+#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1322
+#: command.c:1545
 msgid "Previous connection kept\n"
 msgstr "以��接続����れ����。\n"
 
-#: command.c:1326
+#: command.c:1549
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1350
-#, c-format
-msgid "You are now connected to database \"%s\""
-msgstr "データベース \"%s\" �接続����。"
-
-#: command.c:1353
+#: command.c:1582
 #, c-format
-msgid " on host \"%s\""
-msgstr "ホスト：\"%s\""
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+"at port \"%s\".\n"
+msgstr ""
+"�ート\"%4$s\"�ソケット\"%3$s\"経由�データベース\"%1$s\"�ユーザ\"%2$s\"�"
+"��接続����。\n"
 
-#: command.c:1356
+#: command.c:1585
 #, c-format
-msgid " at port \"%s\""
-msgstr "�ート番�：\"%s\""
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"ホスト\"%3$s\"上��ート\"%4$s\"�データベース\"%1$s\"�ユーザ\"%2$s\"���"
+"接続����。\n"
 
-#: command.c:1359
+#: command.c:1589
 #, c-format
-msgid " as user \"%s\""
-msgstr "ユーザ�：\"%s\""
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr "データベース \"%s\" �ユーザ\"%s\"���接続����。\n"
 
-#: command.c:1394
+#: command.c:1623
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, サー�ー %s)\n"
 
-#: command.c:1402
+#: command.c:1631
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -180,17 +215,17 @@ msgstr ""
 "注�： %s �ージョン %d.%d, サー�ー�ージョン %d.%d.\n"
 "         psql �機能�中��動作���も���る�も�れ��ん。\n"
 
-#: command.c:1432
+#: command.c:1661
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "SSL 接続 (暗�化方�: %s, ビット長: %i)\n"
 
-#: command.c:1442
+#: command.c:1671
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "SSL 接続 (未定義�暗�化方�)\n"
 
-#: command.c:1463
+#: command.c:1692
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -203,26 +238,32 @@ msgstr ""
 "      （ウィンドウズユーザ����）を�照������。\n"
 "\n"
 
-#: command.c:1552
+#: command.c:1776
+msgid ""
+"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
+"line number\n"
+msgstr "行番�を指定�る����PSQL_EDITOR_LINENUMBER_ARG変数を設定���れ��り��ん\n"
+
+#: command.c:1813
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "エディタ \"%s\" を起動����ん���。\n"
 
-#: command.c:1554
+#: command.c:1815
 msgid "could not start /bin/sh\n"
 msgstr "/bin/sh を起動����ん���。\n"
 
-#: command.c:1591
+#: command.c:1853
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "一時ディレクトリ \"%s\" �見��り��ん。"
+msgid "could not locate temporary directory: %s\n"
+msgstr "一時ディレクトリ�移動����ん: %s\n"
 
-#: command.c:1618
+#: command.c:1880
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "一時ファイル \"%s\" を開���ん: %s\n"
 
-#: command.c:1839
+#: command.c:2110
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
@@ -230,122 +271,122 @@ msgstr ""
 "\\pset: 有効�フォーマット� unaligned, aligned, wrapped, html, latex, troff-"
 "ms ��。\n"
 
-#: command.c:1844
+#: command.c:2115
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "出力フォーマット� %s ��。\n"
 
-#: command.c:1860
+#: command.c:2131
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: 有効�行スタイル� ascii, old-ascii, unicode ��。\n"
 
-#: command.c:1865
+#: command.c:2136
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "境界線�スタイル� %s ��。\n"
 
-#: command.c:1876
+#: command.c:2147
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "境界線�スタイル� %d ��。\n"
 
-#: command.c:1888
+#: command.c:2159
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "拡張表示� on ��。\n"
 
-#: command.c:1889
+#: command.c:2160
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "拡張表示� off ��。\n"
 
-#: command.c:1902
+#: command.c:2173
 msgid "Showing locale-adjusted numeric output."
 msgstr "ロケール�調整�れ�数値出力を表示�����。"
 
-#: command.c:1904
+#: command.c:2175
 msgid "Locale-adjusted numeric output is off."
 msgstr "「数値出力�ロケール調整�� off ��。"
 
-#: command.c:1917
+#: command.c:2188
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null 表示� \"%s\" ��。\n"
 
-#: command.c:1929
+#: command.c:2200
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "フィールド区切り文字� \"%s\" ��。\n"
 
-#: command.c:1943
+#: command.c:2214
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "レコード区切り文字� <newline> ��。"
 
-#: command.c:1945
+#: command.c:2216
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "レコード区切り文字� \"%s\" ��。\n"
 
-#: command.c:1959
+#: command.c:2230
 msgid "Showing only tuples."
 msgstr "タプル��を表示�����。"
 
-#: command.c:1961
+#: command.c:2232
 msgid "Tuples only is off."
 msgstr "「タプル��表示�� off ��。"
 
-#: command.c:1977
+#: command.c:2248
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "タイトル� \"%s\" ��。\n"
 
-#: command.c:1979
+#: command.c:2250
 #, c-format
 msgid "Title is unset.\n"
 msgstr "タイトル�セット�れ����ん。\n"
 
-#: command.c:1995
+#: command.c:2266
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "テーブル属性� \"%s\" ��。\n"
 
-#: command.c:1997
+#: command.c:2268
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "テーブル属性�セット�れ����ん。\n"
 
-#: command.c:2018
+#: command.c:2289
 msgid "Pager is used for long output."
 msgstr "出力�長�場��ページャ�使�れ��。"
 
-#: command.c:2020
+#: command.c:2291
 msgid "Pager is always used."
 msgstr "常�ページャ�使�れ��。"
 
-#: command.c:2022
+#: command.c:2293
 msgid "Pager usage is off."
 msgstr "「ページャを使��� off ��。"
 
-#: command.c:2036
+#: command.c:2307
 msgid "Default footer is on."
 msgstr "デフォルト�フッタ� on ��。"
 
-#: command.c:2038
+#: command.c:2309
 msgid "Default footer is off."
 msgstr "デフォルト�フッタ� off ��。"
 
-#: command.c:2049
+#: command.c:2320
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "\"wrapped\" フォーマット�対象幅� %d ��。\n"
 
-#: command.c:2054
+#: command.c:2325
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: 未定義�オプション：%s\n"
 
-#: command.c:2108
+#: command.c:2379
 msgid "\\!: failed\n"
 msgstr "\\!: 失敗\n"
 
@@ -354,10 +395,6 @@ msgstr "\\!: 失敗\n"
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: pg_strdup: null �インタを複製����ん（内部エラー）。\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "メモリ�足��"
-
 #: common.c:343
 msgid "connection to server was lost\n"
 msgstr "サー�ー��接続�切れ���。\n"
@@ -374,10 +411,6 @@ msgstr "失敗。\n"
 msgid "Succeeded.\n"
 msgstr "�功。\n"
 
-#: common.c:493 common.c:773
-msgid "You are currently not connected to a database.\n"
-msgstr "�在データベース��接続�����ん。\n"
-
 #: common.c:499 common.c:506 common.c:799
 #, c-format
 msgid ""
@@ -485,24 +518,24 @@ msgstr ""
 "コピー�るデータ�続��改行を入力���。\n"
 "�ックスラッシュ(\\)�ピリオド���行�終了���。"
 
-#: copy.c:599
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "読�込��失敗����異常終了����"
 
-#: help.c:52
+#: help.c:48
 msgid "on"
 msgstr "オン"
 
-#: help.c:52
+#: help.c:48
 msgid "off"
 msgstr "オフ"
 
-#: help.c:74
+#: help.c:70
 #, c-format
 msgid "could not get current user name: %s\n"
 msgstr "�在�ユーザ�を�得����ん��: %s\n"
 
-#: help.c:86
+#: help.c:82
 #, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
@@ -511,12 +544,12 @@ msgstr ""
 "psql � PostgreSQL �会話型ターミナル��。\n"
 "\n"
 
-#: help.c:87
+#: help.c:83
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: help.c:88
+#: help.c:84
 #, c-format
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
@@ -525,12 +558,12 @@ msgstr ""
 "  psql [オプション]... [データベース� [ユーザ�]]\n"
 "\n"
 
-#: help.c:90
+#: help.c:86
 #, c-format
 msgid "General options:\n"
 msgstr "一般的�オプション：\n"
 
-#: help.c:95
+#: help.c:91
 #, c-format
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
@@ -539,25 +572,25 @@ msgstr ""
 "  -c, --command=コマンド   (SQL���内部�)�一コマンドを一���実行��終"
 "了\n"
 
-#: help.c:96
+#: help.c:92
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr ""
 "  -d, --dbname=DB�        接続�るデータベース�を指定(デフォルト: \"%s\")\n"
 
-#: help.c:97
+#: help.c:93
 #, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr ""
 "  -f, --file=ファイル�    ファイル�らコマンドを読�込ん�実行後�終了\n"
 
-#: help.c:98
+#: help.c:94
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l(エル), --list         使用�能�データベース一覧を表示��終了\n"
 
-#: help.c:99
+#: help.c:95
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
@@ -566,12 +599,12 @@ msgstr ""
 "  -v, --set=, --variable=��=値\n"
 "                           psql 変数 '��' � '値' をセット\n"
 
-#: help.c:101
+#: help.c:97
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X, --no-psqlrc          �期化ファイル (~/.psqlrc) を読�����\n"
 
-#: help.c:102
+#: help.c:98
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -581,17 +614,17 @@ msgstr ""
 "                           �一�トランザクション���コマンドファイルを実"
 "行\n"
 
-#: help.c:104
+#: help.c:100
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   ヘルプを表示��終了\n"
 
-#: help.c:105
+#: help.c:101
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                �ージョン情報を表示��終了\n"
 
-#: help.c:107
+#: help.c:103
 #, c-format
 msgid ""
 "\n"
@@ -600,54 +633,54 @@ msgstr ""
 "\n"
 "入出力オプション：\n"
 
-#: help.c:108
+#: help.c:104
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           スクリプト�ら�����入力を表示\n"
 
-#: help.c:109
+#: help.c:105
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       サー�ー��信��コマンドを表示\n"
 
-#: help.c:110
+#: help.c:106
 #, c-format
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden        内部コマンド�生���クエリーを表示\n"
 
-#: help.c:111
+#: help.c:107
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=ファイル� セッションログをファイル�書�込む\n"
 
-#: help.c:112
+#: help.c:108
 #, c-format
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr ""
 "  -n, --no-readline        拡張コマンドライン編集機能(readline)を無効��る\n"
 
-#: help.c:113
+#: help.c:109
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=ファイル�  クエリー��果をファイル(��� |パイプ)��る\n"
 
-#: help.c:114
+#: help.c:110
 #, c-format
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr ""
 "  -q, --quiet              ���実行(メッセージ����クエリー出力��)\n"
 
-#: help.c:115
+#: help.c:111
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
 "  -s, --single-step        シングルステップモード(�クエリー���確�)\n"
 
-#: help.c:116
+#: help.c:112
 #, c-format
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
@@ -655,7 +688,7 @@ msgid ""
 msgstr ""
 "  -S, --single-line        �一行モード(行末を SQL コマンド�終了����)\n"
 
-#: help.c:118
+#: help.c:114
 #, c-format
 msgid ""
 "\n"
@@ -664,12 +697,12 @@ msgstr ""
 "\n"
 "出力フォーマットオプション:\n"
 
-#: help.c:119
+#: help.c:115
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           ������テーブル出力モード\n"
 
-#: help.c:120
+#: help.c:116
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -678,12 +711,12 @@ msgstr ""
 "  -F, --field-separator=文字列\n"
 "                           フィールド区切り文字を設定(デフォルト: \"%s\")\n"
 
-#: help.c:123
+#: help.c:119
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               HTML テーブル出力モード\n"
 
-#: help.c:124
+#: help.c:120
 #, c-format
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
@@ -692,7 +725,7 @@ msgstr ""
 "  -P, --pset=変数[=値]     表示オプション '変数' を '値' �セット (\\pset コ"
 "マンドを�照)\n"
 
-#: help.c:125
+#: help.c:121
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -701,12 +734,12 @@ msgstr ""
 "  -R, --record-separator=文字列\n"
 "                           レコード区切り文字を設定(デフォルト：改行)\n"
 
-#: help.c:127
+#: help.c:123
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        行��を表示\n"
 
-#: help.c:128
+#: help.c:124
 #, c-format
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
@@ -714,12 +747,12 @@ msgid ""
 msgstr ""
 "  -T, --table-attr=TEXT    HTMLテーブル�タグ属性をセット(width, border等)\n"
 
-#: help.c:129
+#: help.c:125
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           拡張テーブル出力を有効��る\n"
 
-#: help.c:131
+#: help.c:127
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +761,7 @@ msgstr ""
 "\n"
 "接続オプション:\n"
 
-#: help.c:134
+#: help.c:130
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME      database server host or socket directory "
@@ -737,29 +770,29 @@ msgstr ""
 "  -h, --host=ホスト�      データベースサー�ー�ホスト���ソケット�ディレ"
 "クトリ(デフォルト: \"%s\")\n"
 
-#: help.c:135
+#: help.c:131
 msgid "local socket"
 msgstr "ローカルソケット"
 
-#: help.c:138
+#: help.c:134
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr ""
 "  -p, --port=�ート番�    データベースサー�ー��ート番�(デフォルト： \"%s"
 "\")\n"
 
-#: help.c:144
+#: help.c:140
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
 "  -U, --username=ユーザー�  データベース�ユーザ�(デフォルト: \"%s\")\n"
 
-#: help.c:145
+#: help.c:141
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        パスワード入力を�求���\n"
 
-#: help.c:146
+#: help.c:142
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -768,7 +801,7 @@ msgstr ""
 "  -W, --password           パスワードプロンプトを強制表示�る\n"
 "                           （本��自動的�表示�れる����）\n"
 
-#: help.c:148
+#: help.c:144
 #, c-format
 msgid ""
 "\n"
@@ -784,23 +817,23 @@ msgstr ""
 "セクションを�照���。\n"
 "\n"
 
-#: help.c:151
+#: help.c:147
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "�具��<pgsql-bugs@postgresql.org>��報告������。\n"
 
-#: help.c:169
+#: help.c:165
 #, c-format
 msgid "General\n"
 msgstr "一般\n"
 
-#: help.c:170
+#: help.c:166
 #, c-format
 msgid ""
 "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             PostgreSQL �使�方��布�件を表示\n"
 
-#: help.c:171
+#: help.c:167
 #, c-format
 msgid ""
 "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
@@ -808,64 +841,64 @@ msgstr ""
 "  \\g [ファイル] ��� ';'  クエリー実行（���果をファイル��� |パイプ "
 "�書�出�)\n"
 
-#: help.c:172
+#: help.c:168
 #, c-format
 msgid ""
 "  \\h [NAME]              help on syntax of SQL commands, * for all "
 "commands\n"
 msgstr "  \\h [��]              SQL コマンド�文法ヘルプ�* �全コマンド\n"
 
-#: help.c:173
+#: help.c:169
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     psql を終了�る\n"
 
-#: help.c:176
+#: help.c:172
 #, c-format
 msgid "Query Buffer\n"
 msgstr "クエリー�ッファ\n"
 
-#: help.c:177
+#: help.c:173
 #, c-format
 msgid ""
-"  \\e [FILE]              edit the query buffer (or file) with external "
+"  \\e [FILE] [LINE]       edit the query buffer (or file) with external "
 "editor\n"
 msgstr ""
-"  \\e [ファイル]          �在�クエリー�ッファ(やファイル)を外部エディタ�"
+"  \\e [ファイル] [行番�] �在�クエリー�ッファ(やファイル)を外部エディタ�"
 "編集�る\n"
 
-#: help.c:178
+#: help.c:174
 #, c-format
 msgid ""
-"  \\ef [FUNCNAME]         edit function definition with external editor\n"
-msgstr "  \\e [関数�]            関数定義を外部エディタ�編集\n"
+"  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
+msgstr "  \\e [関数� [行番�]]   関数定義を外部エディタ�編集�る\n"
 
-#: help.c:179
+#: help.c:175
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                     クエリー�ッファ�内容を表示�る\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                     クエリー�ッファをリセット（クリア）�る\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [ファイル]          ヒストリを表示���ファイル��存�る\n"
 
-#: help.c:184
+#: help.c:180
 #, c-format
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w ファイル            クエリー�ッファ�内容をファイル�書�出�\n"
 
-#: help.c:187
+#: help.c:183
 #, c-format
 msgid "Input/Output\n"
 msgstr "入出力\n"
 
-#: help.c:188
+#: help.c:184
 #, c-format
 msgid ""
 "  \\copy ...              perform SQL COPY with data stream to the client "
@@ -874,104 +907,109 @@ msgstr ""
 "  \\copy ...              クライアントホスト�対��データストリーム\n"
 "                          を使�� SQL コピーを行�\n"
 
-#: help.c:189
+#: help.c:185
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr "  \\echo [文字列]         文字列を標準出力�書�出�\n"
 
-#: help.c:190
+#: help.c:186
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i ファイル            ファイル�らコマンドを読�込ん�実行�る\n"
 
-#: help.c:191
+#: help.c:187
 #, c-format
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr ""
 "  \\o [ファイル]          ����クエリー��果をファイル��� |パイプ ��"
 "ã‚‹\n"
 
-#: help.c:192
+#: help.c:188
 #, c-format
 msgid ""
 "  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr ""
 "  \\qecho [文字列]        文字列をクエリー出力ストリーム�出力(\\o を�照)\n"
 
-#: help.c:195
+#: help.c:191
 #, c-format
 msgid "Informational\n"
 msgstr "情報\n"
 
-#: help.c:196
+#: help.c:192
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr "  (修飾�: S = システムオブジェクトを表示 + = 付加情報)\n"
 
-#: help.c:197
+#: help.c:193
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
 msgstr ""
 "  \\d[S+]                 テーブル�ビュー�シーケンス�一覧を表示�る\n"
 
-#: help.c:198
+#: help.c:194
 #, c-format
 msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
 msgstr ""
 "  \\d[S+]  ��           テーブル�ビュー�シーケンス�インデックス�説明を"
 "表示�る\n"
 
-#: help.c:199
+#: help.c:195
 #, c-format
 msgid "  \\da[S]  [PATTERN]      list aggregates\n"
 msgstr "  \\da[S]  [パターン]     集約関数�一覧を表示�る\n"
 
-#: help.c:200
+#: help.c:196
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
 msgstr "  \\db[+]  [パターン]     テーブルスペース�一覧を表示�る\n"
 
-#: help.c:201
+#: help.c:197
 #, c-format
 msgid "  \\dc[S]  [PATTERN]      list conversions\n"
 msgstr "  \\dc[S]  [パターン]     変�ルール�一覧を表示�る\n"
 
-#: help.c:202
+#: help.c:198
 #, c-format
 msgid "  \\dC     [PATTERN]      list casts\n"
 msgstr "  \\dC     [パターン]     キャスト�一覧を表示�る\n"
 
-#: help.c:203
+#: help.c:199
 #, c-format
 msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
 msgstr "  \\dd[S]  [パターン]     オブジェクト�コメントを表示�る\n"
 
-#: help.c:204
+#: help.c:200
 #, c-format
 msgid "  \\ddp    [PATTERN]      list default privileges\n"
 msgstr "  \\ddp    [パターン]     デフォルト権��一覧を表示�る\n"
 
-#: help.c:205
+#: help.c:201
 #, c-format
 msgid "  \\dD[S]  [PATTERN]      list domains\n"
 msgstr "  \\dD[S]  [パターン]     ドメイン�一覧を表示�る\n"
 
-#: help.c:206
+#: help.c:202
+#, c-format
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [パターン]     外部テーブル�一覧を表示�る\n"
+
+#: help.c:203
 #, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
 msgstr "  \\des[+] [パターン]     外部サー�ー�一覧を表示�る\n"
 
-#: help.c:207
+#: help.c:204
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
 msgstr "  \\deu[+] [パターン]     ユーザマッピング�一覧を表示�る\n"
 
-#: help.c:208
+#: help.c:205
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
 msgstr "  \\dew[+] [パターン]     外部データラッパー�一覧を表示�る\n"
 
-#: help.c:209
+#: help.c:206
 #, c-format
 msgid ""
 "  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
@@ -979,54 +1017,64 @@ msgstr ""
 "  \\df[antw][S+] [パターン]      関数（集約/通常/トリガー/ウィンドウ��）�"
 "一覧を表示�る\n"
 
-#: help.c:210
+#: help.c:207
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
 msgstr "  \\dF[+]  [パターン]     テキスト検索設定�一覧を表示�る\n"
 
-#: help.c:211
+#: help.c:208
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr "  \\dFd[+] [パターン]     テキスト検索用辞書�一覧を表示�る\n"
 
-#: help.c:212
+#: help.c:209
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr "  \\dFp[+] [パターン]     テキスト検索用パーサー�一覧を表示�る\n"
 
-#: help.c:213
+#: help.c:210
 #, c-format
 msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
 msgstr "  \\dFt[+] [パターン]     テキスト検索用テンプレート�一覧を表示�る\n"
 
-#: help.c:214
+#: help.c:211
 #, c-format
-msgid "  \\dg[+]  [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg[+]  [パターン]     ロール（グループ）�一覧を表示�る\n"
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]  [パターン]     ロール�一覧を表示�る\n"
 
-#: help.c:215
+#: help.c:212
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [パターン]     インデックス�一覧を表示�る\n"
 
-#: help.c:216
+#: help.c:213
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
 msgstr ""
 "  \\dl                    ラージオブジェクト�一覧を表示�る。\\lo_list ��"
 "�。\n"
 
-#: help.c:217
+#: help.c:214
 #, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
-msgstr "  \\dn[+]  [パターン]     スキーマ�一覧を表示�る\n"
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [パターン]     手続�言語�一覧を表示�る\n"
 
-#: help.c:218
+#: help.c:215
+#, c-format
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
+msgstr "  \\dn[S+]  [パターン]     スキーマ�一覧を表示�る\n"
+
+#: help.c:216
 #, c-format
 msgid "  \\do[S]  [PATTERN]      list operators\n"
 msgstr "  \\do[S]  [��]         演算��一覧を表示�る\n"
 
-#: help.c:219
+#: help.c:217
+#, c-format
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dD[S+]  [パターン]     照�順��一覧を表示�る\n"
+
+#: help.c:218
 #, c-format
 msgid ""
 "  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
@@ -1034,68 +1082,83 @@ msgstr ""
 "  \\dp     [パターン]     テーブル�ビュー�シーケンス�アクセス権一覧を表示"
 "�る\n"
 
-#: help.c:220
+#: help.c:219
 #, c-format
 msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
 msgstr ""
 "  \\drds [パターン1 [パターン2]] データベース毎�ロール（ユーザー）設定�一覧"
 "を表示�る\n"
 
-#: help.c:221
+#: help.c:220
 #, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
 msgstr "  \\ds[S+] [パターン]     シーケンス�一覧を表示�る\n"
 
-#: help.c:222
+#: help.c:221
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
 msgstr "  \\dt[S+] [パターン]     テーブル�一覧を表示�る\n"
 
-#: help.c:223
+#: help.c:222
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
 msgstr "  \\dT[S+] [パターン]     データ型�一覧を表示�る\n"
 
-#: help.c:224
+#: help.c:223
 #, c-format
-msgid "  \\du[+]  [PATTERN]      list roles (users)\n"
-msgstr "  \\du[+]  [パターン]     ロール（ユーザー）�一覧を表示�る\n"
+msgid "  \\du[+]  [PATTERN]      list roles\n"
+msgstr "  \\du[+]  [パターン]     ロール�一覧を表示�る\n"
 
-#: help.c:225
+#: help.c:224
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
 msgstr "  \\dv[S+] [パターン]     ビュー�一覧を表示�る\n"
 
+#: help.c:225
+#, c-format
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dE[S+] [パターン]     外部テーブル�一覧を表示�る\n"
+
 #: help.c:226
 #, c-format
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[+]  [パターン]     拡張�一覧を表示�る\n"
+
+#: help.c:227
+#, c-format
 msgid "  \\l[+]                  list all databases\n"
 msgstr "  \\l[+]                  データベース�一覧を表示�る\n"
 
-#: help.c:227
+#: help.c:228
+#, c-format
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf[+] 関数�            関数定義を表示�る\n"
+
+#: help.c:229
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [パターン]     \\dp ���\n"
 
-#: help.c:230
+#: help.c:232
 #, c-format
 msgid "Formatting\n"
 msgstr "書�設定\n"
 
-#: help.c:231
+#: help.c:233
 #, c-format
 msgid ""
 "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr ""
 "  \\a                     出力モード� 'unaligned' / 'aligned' を切り替�る\n"
 
-#: help.c:232
+#: help.c:234
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C タイトル            テーブル�タイトルをセット�る。指定���れ�解"
 "除\n"
 
-#: help.c:233
+#: help.c:235
 #, c-format
 msgid ""
 "  \\f [STRING]            show or set field separator for unaligned query "
@@ -1105,12 +1168,12 @@ msgstr ""
 "�\n"
 "                          使用�るフィールド区切り文字を表示���設定�る\n"
 
-#: help.c:234
+#: help.c:236
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     HTML �出力モードを切り替�る(�在: %s)\n"
 
-#: help.c:236
+#: help.c:238
 #, c-format
 msgid ""
 "  \\pset NAME [VALUE]     set table output option\n"
@@ -1125,12 +1188,12 @@ msgstr ""
 "                         numericlocale|recordsep|tuples_only|title|tableattr|"
 "pager})\n"
 
-#: help.c:239
+#: help.c:241
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            行��を表示�る�？ (�在: %s)\n"
 
-#: help.c:241
+#: help.c:243
 #, c-format
 msgid ""
 "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
@@ -1138,17 +1201,17 @@ msgstr ""
 "  \\T [文字列]            HTML � <table> タグ�属性をセット。引数���れ�"
 "解除\n"
 
-#: help.c:242
+#: help.c:244
 #, c-format
 msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off]            拡張出力�切り替�(�在: %s)\n"
 
-#: help.c:246
+#: help.c:248
 #, c-format
 msgid "Connection\n"
 msgstr "接続\n"
 
-#: help.c:247
+#: help.c:249
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -1157,34 +1220,40 @@ msgstr ""
 "  \\c[onnect] [DB�|- ユーザ�|- ホスト�|- �ート番�|-]\n"
 "                         新��データベース�接続�る (�在: \"%s\")\n"
 
-#: help.c:250
+#: help.c:252
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr ""
 "  \\encoding [エンコーディング]\n"
 "                         クライアント�エンコーディングを表示���セット\n"
 
-#: help.c:251
+#: help.c:253
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [ユーザ�]   ユーザ�パスワードを安全�変更�る\n"
 
 #: help.c:254
 #, c-format
+msgid ""
+"  \\conninfo              display information about current connection\n"
+msgstr "  \\conninfo              �在�接続�関�る情報を表示�る\n"
+
+#: help.c:257
+#, c-format
 msgid "Operating System\n"
 msgstr "オペレーティングシステム\n"
 
-#: help.c:255
+#: help.c:258
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]              カレントディレクトリを変更\n"
 
-#: help.c:256
+#: help.c:259
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       コマンド�タイミングを切り替�る(�在: %s)\n"
 
-#: help.c:258
+#: help.c:261
 #, c-format
 msgid ""
 "  \\! [COMMAND]           execute command in shell or start interactive "
@@ -1193,17 +1262,17 @@ msgstr ""
 "  \\! [コマンド]          シェル�コマンドを実行�も���会話型シェルを起"
 "å‹•\n"
 
-#: help.c:261
+#: help.c:264
 #, c-format
 msgid "Variables\n"
 msgstr "変数\n"
 
-#: help.c:262
+#: help.c:265
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [テキスト] 変数�    ユーザ�内部変数をセット�るよ�促�\n"
 
-#: help.c:263
+#: help.c:266
 #, c-format
 msgid ""
 "  \\set [NAME [VALUE]]    set internal variable, or list all if no "
@@ -1212,17 +1281,17 @@ msgstr ""
 "  \\set [変数� [値]]\n"
 "                         内部変数�値をセット。引数���場��一覧表示。\n"
 
-#: help.c:264
+#: help.c:267
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset 変数�          内部変数を削除�る\n"
 
-#: help.c:267
+#: help.c:270
 #, c-format
 msgid "Large Objects\n"
 msgstr "ラージオブジェクト\n"
 
-#: help.c:268
+#: help.c:271
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -1235,11 +1304,11 @@ msgstr ""
 "  \\lo_list\n"
 "  \\lo_unlink LOBOID     ラージオブジェクト��作\n"
 
-#: help.c:321
+#: help.c:318
 msgid "Available help:\n"
 msgstr "利用�能�ヘルプ:\n"
 
-#: help.c:410
+#: help.c:402
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1254,7 +1323,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:426
+#: help.c:418
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -1296,16 +1365,17 @@ msgstr "%s: トランザクション�状態��明��。\n"
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:290 describe.c:146 describe.c:334 describe.c:613 describe.c:762
-#: describe.c:2381 describe.c:2681 describe.c:3310 describe.c:3369
+#: large_obj.c:290 describe.c:147 describe.c:335 describe.c:637 describe.c:787
+#: describe.c:2513 describe.c:2631 describe.c:2968 describe.c:3599
+#: describe.c:3664
 msgid "Owner"
 msgstr "所有者"
 
-#: large_obj.c:291 large_obj.c:301 describe.c:95 describe.c:158 describe.c:337
-#: describe.c:490 describe.c:566 describe.c:637 describe.c:827 describe.c:1318
-#: describe.c:2205 describe.c:2395 describe.c:2689 describe.c:2751
-#: describe.c:2887 describe.c:2926 describe.c:2993 describe.c:3052
-#: describe.c:3061 describe.c:3120
+#: large_obj.c:291 large_obj.c:301 describe.c:96 describe.c:159 describe.c:338
+#: describe.c:501 describe.c:590 describe.c:661 describe.c:852 describe.c:1382
+#: describe.c:2330 describe.c:2537 describe.c:2911 describe.c:2976
+#: describe.c:3041 describe.c:3177 describe.c:3216 describe.c:3283
+#: describe.c:3342 describe.c:3351 describe.c:3410 describe.c:3849
 msgid "Description"
 msgstr "説明"
 
@@ -1373,12 +1443,12 @@ msgid_plural "(%lu rows)"
 msgstr[0] "(%lu 行)"
 msgstr[1] "(%lu 行)"
 
-#: startup.c:237
+#: startup.c:243
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: ログファイル \"%s\" をオープン����ん: %s\n"
 
-#: startup.c:299
+#: startup.c:305
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -1387,721 +1457,780 @@ msgstr ""
 "\"help\" �ヘルプを表示���.\n"
 "\n"
 
-#: startup.c:445
+#: startup.c:451
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: 表示用パラメータ \"%s\" をセット����ん���\n"
 
-#: startup.c:484
+#: startup.c:490
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: 変数 \"%s\" を削除����ん���\n"
 
-#: startup.c:494
+#: startup.c:500
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: 変数 \"%s\" をセット����ん���\n"
 
-#: startup.c:531 startup.c:537
+#: startup.c:537 startup.c:543
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "詳細� '%s --help' を�らん����\n"
 
-#: startup.c:554
+#: startup.c:560
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: 警告：余分�コマンドラインオプション \"%s\" �無視�れ��\n"
 
-#: startup.c:619
+#: startup.c:625
 msgid "contains support for command-line editing"
 msgstr "コマンドライン編集機能�サ�ート�組�込�れ����。"
 
-#: describe.c:68 describe.c:235 describe.c:462 describe.c:561 describe.c:682
-#: describe.c:763 describe.c:824 describe.c:2373 describe.c:2494
-#: describe.c:2549 describe.c:2749 describe.c:2976 describe.c:3048
-#: describe.c:3059 describe.c:3118
+#: describe.c:69 describe.c:236 describe.c:463 describe.c:585 describe.c:706
+#: describe.c:788 describe.c:849 describe.c:2504 describe.c:2698
+#: describe.c:2768 describe.c:2903 describe.c:3039 describe.c:3266
+#: describe.c:3338 describe.c:3349 describe.c:3408 describe.c:3782
+#: describe.c:3848
 msgid "Schema"
 msgstr "スキーマ"
 
-#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:562
-#: describe.c:612 describe.c:683 describe.c:825 describe.c:2374
-#: describe.c:2495 describe.c:2550 describe.c:2680 describe.c:2750
-#: describe.c:2977 describe.c:3049 describe.c:3060 describe.c:3119
-#: describe.c:3309 describe.c:3368
+#: describe.c:70 describe.c:146 describe.c:237 describe.c:464 describe.c:586
+#: describe.c:636 describe.c:707 describe.c:850 describe.c:2505
+#: describe.c:2627 describe.c:2699 describe.c:2769 describe.c:2904
+#: describe.c:2967 describe.c:3040 describe.c:3267 describe.c:3339
+#: describe.c:3350 describe.c:3409 describe.c:3598 describe.c:3663
+#: describe.c:3846
 msgid "Name"
 msgstr "��"
 
-#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
+#: describe.c:71 describe.c:249 describe.c:295 describe.c:312
 msgid "Result data type"
 msgstr "�果�データ型"
 
-#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
+#: describe.c:85 describe.c:89 describe.c:250 describe.c:296 describe.c:313
 msgid "Argument data types"
 msgstr "引数�データ型"
 
-#: describe.c:113
+#: describe.c:114
 msgid "List of aggregate functions"
 msgstr "集約関数一覧"
 
-#: describe.c:134
+#: describe.c:135
 #, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr ""
 "��サー�ー��ージョン (%d.%d) �テーブルスペースをサ�ート�����ん。\n"
 
-#: describe.c:147
+#: describe.c:148
 msgid "Location"
 msgstr "場所"
 
-#: describe.c:175
+#: describe.c:176
 msgid "List of tablespaces"
 msgstr "テーブルスペース一覧"
 
-#: describe.c:212
+#: describe.c:213
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df�オプション���[antwS+]��を�る�������\n"
 
-#: describe.c:218
+#: describe.c:219
 #, c-format
 msgid "\\df does not take a \"w\" option with server version %d.%d\n"
 msgstr "サー�ー�ージョン%d.%d��\\df�\"w\"オプションを��付���ん\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:251 describe.c:297 describe.c:314
+#: describe.c:252 describe.c:298 describe.c:315
 msgid "agg"
 msgstr "agg（集約）"
 
-#: describe.c:252
+#: describe.c:253
 msgid "window"
 msgstr "window（ウィンドウ）"
 
-#: describe.c:253 describe.c:298 describe.c:315 describe.c:964
+#: describe.c:254 describe.c:299 describe.c:316 describe.c:990
 msgid "trigger"
 msgstr "trigger（トリガ）"
 
-#: describe.c:254 describe.c:299 describe.c:316
+#: describe.c:255 describe.c:300 describe.c:317
 msgid "normal"
 msgstr "normal（通常）"
 
-#: describe.c:255 describe.c:300 describe.c:317 describe.c:685 describe.c:767
-#: describe.c:1299 describe.c:2380 describe.c:2496 describe.c:3381
+#: describe.c:256 describe.c:301 describe.c:318 describe.c:710 describe.c:792
+#: describe.c:1362 describe.c:2512 describe.c:2700 describe.c:3676
 msgid "Type"
 msgstr "åž‹"
 
-#: describe.c:330
+#: describe.c:331
 msgid "immutable"
 msgstr "�変"
 
-#: describe.c:331
+#: describe.c:332
 msgid "stable"
 msgstr "安定"
 
-#: describe.c:332
+#: describe.c:333
 msgid "volatile"
 msgstr "�発性"
 
-#: describe.c:333
+#: describe.c:334
 msgid "Volatility"
 msgstr "�発性"
 
-#: describe.c:335
+#: describe.c:336
 msgid "Language"
 msgstr "言語"
 
-#: describe.c:336
+#: describe.c:337
 msgid "Source code"
 msgstr "ソースコード"
 
-#: describe.c:434
+#: describe.c:435
 msgid "List of functions"
 msgstr "関数一覧"
 
-#: describe.c:473
+#: describe.c:474
 msgid "Internal name"
 msgstr "内部�"
 
-#: describe.c:474 describe.c:629 describe.c:2391
+#: describe.c:475 describe.c:653 describe.c:2529 describe.c:2533
 msgid "Size"
 msgstr "サイズ"
 
-#: describe.c:486
+#: describe.c:496
 msgid "Elements"
 msgstr "�素"
 
-#: describe.c:530
+#: describe.c:541
 msgid "List of data types"
 msgstr "データ型一覧"
 
-#: describe.c:563
+#: describe.c:587
 msgid "Left arg type"
 msgstr "左辺�型"
 
-#: describe.c:564
+#: describe.c:588
 msgid "Right arg type"
 msgstr "�辺�型"
 
-#: describe.c:565
+#: describe.c:589
 msgid "Result type"
 msgstr "�果�型"
 
-#: describe.c:584
+#: describe.c:608
 msgid "List of operators"
 msgstr "演算�一覧"
 
-#: describe.c:614
+#: describe.c:638
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: describe.c:619
-msgid "Collation"
+#: describe.c:643 describe.c:2905
+msgid "Collate"
 msgstr "照�順�"
 
-#: describe.c:620
+#: describe.c:644 describe.c:2906
 msgid "Ctype"
 msgstr "Ctype(変�演算�)"
 
-#: describe.c:633
+#: describe.c:657
 msgid "Tablespace"
 msgstr "テーブルスペース"
 
-#: describe.c:650
+#: describe.c:674
 msgid "List of databases"
 msgstr "データベース一覧"
 
-#: describe.c:684 describe.c:764 describe.c:919 describe.c:2375 sql_help.c:443
-#: sql_help.c:660 sql_help.c:761 sql_help.c:1177 sql_help.c:1304
-#: sql_help.c:1338 sql_help.c:1573 sql_help.c:1722 sql_help.c:1883
-#: sql_help.c:1964 sql_help.c:2158 sql_help.c:2718 sql_help.c:2738
-#: sql_help.c:2740 sql_help.c:2741
+#: describe.c:708 describe.c:789 describe.c:944 describe.c:2506 sql_help.c:595
+#: sql_help.c:842 sql_help.c:969 sql_help.c:1432 sql_help.c:1562
+#: sql_help.c:1596 sql_help.c:1842 sql_help.c:2000 sql_help.c:2185
+#: sql_help.c:2266 sql_help.c:2472 sql_help.c:3103 sql_help.c:3123
+#: sql_help.c:3125 sql_help.c:3126
 msgid "table"
 msgstr "テーブル"
 
-#: describe.c:684 describe.c:920 describe.c:2376
+#: describe.c:708 describe.c:945 describe.c:2507
 msgid "view"
 msgstr "ビュー"
 
-#: describe.c:684 describe.c:765 describe.c:922 describe.c:2378
+#: describe.c:708 describe.c:790 describe.c:947 describe.c:2509
 msgid "sequence"
 msgstr "シーケンス"
 
-#: describe.c:696
+#: describe.c:709 describe.c:948 describe.c:2511
+msgid "foreign table"
+msgstr "外部テーブル"
+
+#: describe.c:721
 msgid "Column access privileges"
-msgstr "アクセス権�を剥奪�る"
+msgstr "カラム�アクセス権�"
 
-#: describe.c:722 describe.c:3476 describe.c:3480
+#: describe.c:747 describe.c:3993 describe.c:3997
 msgid "Access privileges"
 msgstr "アクセス権"
 
-#: describe.c:750
+#: describe.c:775
 #, c-format
 msgid ""
 "The server (version %d.%d) does not support altering default privileges.\n"
 msgstr ""
 "��サー�ー(�ージョン%d.%d)�代替�デフォルト権�をサ�ート�����ん。\n"
 
-#: describe.c:766 describe.c:858
+#: describe.c:791 describe.c:883
 msgid "function"
 msgstr "関数"
 
-#: describe.c:790
+#: describe.c:815
 msgid "Default access privileges"
 msgstr "デフォルト�アクセス権�"
 
-#: describe.c:826
+#: describe.c:851
 msgid "Object"
 msgstr "オブジェクト"
 
-#: describe.c:838
+#: describe.c:863
 msgid "aggregate"
 msgstr "集約関数"
 
-#: describe.c:877 sql_help.c:1456 sql_help.c:2456 sql_help.c:2524
-#: sql_help.c:2655 sql_help.c:2756 sql_help.c:2807
+#: describe.c:902 sql_help.c:1715 sql_help.c:2833 sql_help.c:2903
+#: sql_help.c:3036 sql_help.c:3141 sql_help.c:3192
 msgid "operator"
 msgstr "演算�"
 
-#: describe.c:896
+#: describe.c:921
 msgid "data type"
 msgstr "データ型"
 
-#: describe.c:921 describe.c:2377
+#: describe.c:946 describe.c:2508
 msgid "index"
 msgstr "インデックス"
 
-#: describe.c:943
+#: describe.c:969
 msgid "rule"
 msgstr "ルール"
 
-#: describe.c:987
+#: describe.c:1013
 msgid "Object descriptions"
 msgstr "オブジェクト�説明"
 
-#: describe.c:1040
+#: describe.c:1066
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "\"%s\" ������リレーション�見��り��ん。\n"
 
-#: describe.c:1194
+#: describe.c:1238
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "OID %s を��リレーション�見��り��ん。\n"
 
-#: describe.c:1262
+#: describe.c:1314
+#, c-format
+msgid "Unlogged table \"%s.%s\""
+msgstr "ログを�ら��テーブル \"%s.%s\""
+
+#: describe.c:1317
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "テーブル \"%s.%s\""
 
-#: describe.c:1266
+#: describe.c:1321
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "ビュー \"%s.%s\""
 
-#: describe.c:1270
+#: describe.c:1325
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "シーケンス \"%s.%s\""
 
-#: describe.c:1274
+#: describe.c:1330
+#, c-format
+msgid "Unlogged index \"%s.%s\""
+msgstr "ログを�ら��インデックス \"%s.%s\""
+
+#: describe.c:1333
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "インデックス \"%s.%s\""
 
-#: describe.c:1279
+#: describe.c:1338
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "特殊�リレーション \"%s.%s\""
 
-#: describe.c:1283
+#: describe.c:1342
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST テーブル \"%s.%s\""
 
-#: describe.c:1287
+#: describe.c:1346
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "複�型 \"%s.%s\""
 
-#: describe.c:1298
+#: describe.c:1350
+#, c-format
+msgid "Foreign table \"%s.%s\""
+msgstr "外部テーブル \"%s.%s\""
+
+#: describe.c:1361
 msgid "Column"
 msgstr "カラム"
 
-#: describe.c:1305
+#: describe.c:1369
 msgid "Modifiers"
 msgstr "修飾語"
 
-#: describe.c:1310
+#: describe.c:1374
 msgid "Value"
 msgstr "値"
 
-#: describe.c:1313
+#: describe.c:1377
 msgid "Definition"
 msgstr "定義"
 
-#: describe.c:1317
+#: describe.c:1381
 msgid "Storage"
 msgstr "ストレージ"
 
-#: describe.c:1359
+#: describe.c:1427
+#, c-format
+msgid "collate %s"
+msgstr "照�順� %s"
+
+#: describe.c:1435
 msgid "not null"
 msgstr "not null"
 
 #. translator: default values of column definitions
-#: describe.c:1368
+#: describe.c:1445
 #, c-format
 msgid "default %s"
 msgstr "default %s"
 
-#: describe.c:1459
+#: describe.c:1536
 msgid "primary key, "
 msgstr "プライマリキー, "
 
-#: describe.c:1461
+#: describe.c:1538
 msgid "unique, "
 msgstr "ユニーク, "
 
-#: describe.c:1467
+#: describe.c:1544
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "テーブル \"%s.%s\" 用"
 
-#: describe.c:1471
+#: describe.c:1548
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", 述語 (%s)"
 
-#: describe.c:1474
+#: describe.c:1551
 msgid ", clustered"
 msgstr ", クラスタ化済�"
 
-#: describe.c:1477
+#: describe.c:1554
 msgid ", invalid"
 msgstr ", 無効"
 
-#: describe.c:1480
+#: describe.c:1557
 msgid ", deferrable"
 msgstr ", �延�能"
 
-#: describe.c:1483
+#: describe.c:1560
 msgid ", initially deferred"
 msgstr ", 最��ら�延�れ��る"
 
-#: describe.c:1497
+#: describe.c:1574
 msgid "View definition:"
 msgstr "ビュー定義:"
 
-#: describe.c:1514 describe.c:1792
+#: describe.c:1591 describe.c:1874
 msgid "Rules:"
 msgstr "ルール:"
 
-#: describe.c:1573
+#: describe.c:1650
 msgid "Indexes:"
 msgstr "インデックス:"
 
-#: describe.c:1648
+#: describe.c:1730
 msgid "Check constraints:"
 msgstr "CHECK 制約:"
 
-#: describe.c:1679
+#: describe.c:1761
 msgid "Foreign-key constraints:"
 msgstr "外部キー制約:"
 
-#: describe.c:1710
+#: describe.c:1792
 msgid "Referenced by:"
 msgstr "�照元："
 
-#: describe.c:1795
+#: describe.c:1877
 msgid "Disabled rules:"
 msgstr "無効��れ�ルール："
 
-#: describe.c:1798
+#: describe.c:1880
 msgid "Rules firing always:"
 msgstr "常�無視�れるルール"
 
-#: describe.c:1801
+#: describe.c:1883
 msgid "Rules firing on replica only:"
 msgstr "レプリカ���無視�れるルール"
 
-#: describe.c:1903
+#: describe.c:1991
 msgid "Triggers:"
 msgstr "トリガ:"
 
-#: describe.c:1906
+#: describe.c:1994
 msgid "Disabled triggers:"
 msgstr "無効��れ�トリガ："
 
-#: describe.c:1909
+#: describe.c:1997
 msgid "Triggers firing always:"
 msgstr "常�無視�れるトリガ"
 
-#: describe.c:1912
+#: describe.c:2000
 msgid "Triggers firing on replica only:"
 msgstr "レプリカ���無視�れるトリガ"
 
-#: describe.c:1945
+#: describe.c:2066
 msgid "Inherits"
 msgstr "継承"
 
-#: describe.c:1975
+#: describe.c:2096
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "�テーブル�数：%d（\\d �一覧表示）"
 
-#: describe.c:1982
+#: describe.c:2103
 msgid "Child tables"
 msgstr "�テーブル"
 
-#: describe.c:2004
+#: describe.c:2125
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "型付��れ�テーブル�型：%s"
 
-#: describe.c:2011
+#: describe.c:2132
 msgid "Has OIDs"
 msgstr "OID を��"
 
-#: describe.c:2014 describe.c:2553 describe.c:2627
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "yes"
 msgstr "yes"
 
-#: describe.c:2014 describe.c:2553 describe.c:2627
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "no"
 msgstr "no"
 
-#: describe.c:2022 describe.c:3319 describe.c:3383 describe.c:3439
+#: describe.c:2143 describe.c:3614 describe.c:3678 describe.c:3734
+#: describe.c:3789
 msgid "Options"
 msgstr "オプション"
 
-#: describe.c:2107
+#: describe.c:2228
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "テーブルスペース \"%s\""
 
-#: describe.c:2120
+#: describe.c:2241
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr "テーブルスペース \"%s\""
 
-#: describe.c:2198
+#: describe.c:2323
 msgid "List of roles"
 msgstr "ロール一覧"
 
-#: describe.c:2200
+#: describe.c:2325
 msgid "Role name"
 msgstr "ロール�"
 
-#: describe.c:2201
+#: describe.c:2326
 msgid "Attributes"
 msgstr "属性"
 
-#: describe.c:2202
+#: describe.c:2327
 msgid "Member of"
 msgstr "メン�ー"
 
-#: describe.c:2213
+#: describe.c:2338
 msgid "Superuser"
 msgstr "スーパーユーザ"
 
-#: describe.c:2216
+#: describe.c:2341
 msgid "No inheritance"
 msgstr "継承��"
 
-#: describe.c:2219
+#: describe.c:2344
 msgid "Create role"
 msgstr "ロールを作���る"
 
-#: describe.c:2222
+#: describe.c:2347
 msgid "Create DB"
 msgstr "DBを作���る"
 
-#: describe.c:2225
+#: describe.c:2350
 msgid "Cannot login"
 msgstr "ログイン����"
 
-#: describe.c:2234
+#: describe.c:2354
+msgid "Replication"
+msgstr "レプリケーション"
+
+#: describe.c:2363
 msgid "No connections"
 msgstr "接続��"
 
-#: describe.c:2236
+#: describe.c:2365
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d 個�接続"
 msgstr[1] "%d 個�接続"
 
-#: describe.c:2303
+#: describe.c:2432
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr ""
 "���ージョン�サー�ー���データベース毎�ロール設定をサ�ート�����"
 "ん。\n"
 
-#: describe.c:2314
+#: describe.c:2443
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "マッ��る設定�見��り��ん\n"
 
-#: describe.c:2316
+#: describe.c:2445
 #, c-format
 msgid "No settings found.\n"
 msgstr "設定��り��ん。\n"
 
-#: describe.c:2321
+#: describe.c:2450
 msgid "List of settings"
 msgstr "設定�一覧"
 
-#: describe.c:2379
+#: describe.c:2510
 msgid "special"
 msgstr "特殊"
 
-#: describe.c:2386
+#: describe.c:2518 describe.c:3783
 msgid "Table"
 msgstr "テーブル"
 
-#: describe.c:2446
+#: describe.c:2592
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "マッ��るリレーション�見��り��ん\n"
 
-#: describe.c:2448
+#: describe.c:2594
 #, c-format
 msgid "No relations found.\n"
 msgstr "リレーション��り��ん。\n"
 
-#: describe.c:2453
+#: describe.c:2599
 msgid "List of relations"
 msgstr "リレーション�一覧"
 
-#: describe.c:2497
+#: describe.c:2635
+msgid "Trusted"
+msgstr "ä¿¡é ¼?"
+
+#: describe.c:2643
+msgid "Internal Language"
+msgstr "内部言語"
+
+#: describe.c:2644
+msgid "Call Handler"
+msgstr "呼�出��ンドラー"
+
+#: describe.c:2645 describe.c:3606
+msgid "Validator"
+msgstr "�リデータ"
+
+#: describe.c:2648
+msgid "Inline Handler"
+msgstr "インライン�ンドラー"
+
+#: describe.c:2669
+msgid "List of languages"
+msgstr "言語一覧"
+
+#: describe.c:2709
 msgid "Modifier"
 msgstr "修飾語"
 
-#: describe.c:2498
+#: describe.c:2717
 msgid "Check"
 msgstr "�ェック"
 
-#: describe.c:2516
+#: describe.c:2735
 msgid "List of domains"
 msgstr "ドメイン一覧"
 
-#: describe.c:2551
+#: describe.c:2770
 msgid "Source"
 msgstr "ソース"
 
-#: describe.c:2552
+#: describe.c:2771
 msgid "Destination"
 msgstr "宛先"
 
-#: describe.c:2554
+#: describe.c:2773
 msgid "Default?"
 msgstr "デフォルト？"
 
-#: describe.c:2572
+#: describe.c:2791
 msgid "List of conversions"
 msgstr "変�ルール一覧"
 
-#: describe.c:2624
+#: describe.c:2843
 msgid "Source type"
 msgstr "ソース�型"
 
-#: describe.c:2625
+#: describe.c:2844
 msgid "Target type"
 msgstr "ターゲット�型"
 
-#: describe.c:2626 describe.c:2886
+#: describe.c:2845 describe.c:3176
 msgid "Function"
 msgstr "関数"
 
-#: describe.c:2627
+#: describe.c:2846
 msgid "in assignment"
 msgstr "代入"
 
-#: describe.c:2628
+#: describe.c:2847
 msgid "Implicit?"
 msgstr "æš—é»™?"
 
-#: describe.c:2654
+#: describe.c:2873
 msgid "List of casts"
 msgstr "キャスト一覧"
 
-#: describe.c:2709
+#: describe.c:2941
+msgid "List of collations"
+msgstr "照�順�一覧"
+
+#: describe.c:2999
 msgid "List of schemas"
 msgstr "スキーマ一覧"
 
-#: describe.c:2732 describe.c:2965 describe.c:3033 describe.c:3101
+#: describe.c:3022 describe.c:3255 describe.c:3323 describe.c:3391
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "���ージョン (%d.%d) �サー�ー�全文検索をサ�ート�����ん。\n"
 
-#: describe.c:2766
+#: describe.c:3056
 msgid "List of text search parsers"
 msgstr "テキスト検索用パーサ一覧"
 
-#: describe.c:2809
+#: describe.c:3099
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "テキスト検索用パーサ \"%s\" �見��り��ん。\n"
 
-#: describe.c:2884
+#: describe.c:3174
 msgid "Start parse"
 msgstr "パース起動"
 
-#: describe.c:2885
+#: describe.c:3175
 msgid "Method"
 msgstr "メソッド"
 
-#: describe.c:2889
+#: describe.c:3179
 msgid "Get next token"
 msgstr "次�トークンを�得"
 
-#: describe.c:2891
+#: describe.c:3181
 msgid "End parse"
 msgstr "パース終了"
 
-#: describe.c:2893
+#: describe.c:3183
 msgid "Get headline"
 msgstr "見出���得"
 
-#: describe.c:2895
+#: describe.c:3185
 msgid "Get token types"
 msgstr "トークンタイプ��得"
 
-#: describe.c:2905
+#: describe.c:3195
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "テキスト検索用パーサ \"%s.%s\""
 
-#: describe.c:2907
+#: describe.c:3197
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "テキスト検索用パーサ \"%s\""
 
-#: describe.c:2925
+#: describe.c:3215
 msgid "Token name"
 msgstr "トークン�"
 
-#: describe.c:2936
+#: describe.c:3226
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "パーサ \"%s.%s\" �トークンタイプ"
 
-#: describe.c:2938
+#: describe.c:3228
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "パーサ \"%s\" �トークンタイプ"
 
-#: describe.c:2987
+#: describe.c:3277
 msgid "Template"
 msgstr "テンプレート"
 
-#: describe.c:2988
+#: describe.c:3278
 msgid "Init options"
 msgstr "�期化オプション:"
 
-#: describe.c:3010
+#: describe.c:3300
 msgid "List of text search dictionaries"
 msgstr "テキスト検索用辞書�一覧"
 
-#: describe.c:3050
+#: describe.c:3340
 msgid "Init"
 msgstr "�期化"
 
-#: describe.c:3051
+#: describe.c:3341
 msgid "Lexize"
 msgstr "Lex 処�"
 
-#: describe.c:3078
+#: describe.c:3368
 msgid "List of text search templates"
 msgstr "テキスト検索用テンプレート一覧"
 
-#: describe.c:3135
+#: describe.c:3425
 msgid "List of text search configurations"
 msgstr "テキスト検索用設定一覧"
 
-#: describe.c:3179
+#: describe.c:3469
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "テキスト検索用設定 \"%s\" �見��り��ん。\n"
 
-#: describe.c:3245
+#: describe.c:3535
 msgid "Token"
 msgstr "トークン"
 
-#: describe.c:3246
+#: describe.c:3536
 msgid "Dictionaries"
 msgstr "辞書"
 
-#: describe.c:3257
+#: describe.c:3547
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "テキスト検索用設定 \"%s.%s\""
 
-#: describe.c:3260
+#: describe.c:3550
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "テキスト検索用設定 \"%s\""
 
-#: describe.c:3264
+#: describe.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -2110,7 +2239,7 @@ msgstr ""
 "\n"
 "パーサ： \"%s.%s\""
 
-#: describe.c:3267
+#: describe.c:3557
 #, c-format
 msgid ""
 "\n"
@@ -2119,555 +2248,627 @@ msgstr ""
 "\n"
 "パーサ：\"%s\""
 
-#: describe.c:3299
+#: describe.c:3589
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr ""
 "���ージョン (%d.%d) �サー�ー�外部データラッパーをサ�ート�����"
 "ん。\n"
 
-#: describe.c:3311
-msgid "Validator"
-msgstr "�リデータ"
+#: describe.c:3603
+msgid "Handler"
+msgstr "�ンドラー"
 
-#: describe.c:3335
+#: describe.c:3630
 msgid "List of foreign-data wrappers"
 msgstr "外部データラッパー�一覧"
 
-#: describe.c:3358
+#: describe.c:3653
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "��サー�ー(�ージョン%d.%d)�外部サー�ーをサ�ート�����ん。\n"
 
-#: describe.c:3370
+#: describe.c:3665
 msgid "Foreign-data wrapper"
 msgstr "外部データラッパー"
 
-#: describe.c:3382
+#: describe.c:3677 describe.c:3847
 msgid "Version"
 msgstr "�ージョン"
 
-#: describe.c:3401
+#: describe.c:3696
 msgid "List of foreign servers"
 msgstr "外部サー�ー一覧"
 
-#: describe.c:3424
+#: describe.c:3719
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "��サー�ー(�ージョン%d.%d)�ユーザマップをサ�ート�����ん。\n"
 
-#: describe.c:3433
+#: describe.c:3728 describe.c:3784
 msgid "Server"
 msgstr "サー�ー"
 
-#: describe.c:3434
+#: describe.c:3729
 msgid "User name"
 msgstr "ユーザ�"
 
-#: describe.c:3454
+#: describe.c:3749
 msgid "List of user mappings"
 msgstr "ユーザマッピング�一覧"
 
-#: sql_help.h:173 sql_help.h:788
+#: describe.c:3772
+#, c-format
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "��サー�ー(�ージョン%d.%d)�外部テーブルをサ�ート�����ん。\n"
+
+#: describe.c:3810
+msgid "List of foreign tables"
+msgstr "外部テーブル一覧"
+
+#: describe.c:3833 describe.c:3887
+#, c-format
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "��サー�ー��ージョン (%d.%d) �拡張をサ�ート�����ん。\n"
+
+#: describe.c:3864
+msgid "List of installed extensions"
+msgstr "インストール済��拡張�一覧"
+
+#: describe.c:3914
+#, c-format
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "\"%s\" ������拡張�見��り��ん。\n"
+
+#: describe.c:3917
+#, c-format
+msgid "Did not find any extensions.\n"
+msgstr "拡張�����見��り��ん。\n"
+
+#: describe.c:3961
+msgid "Object Description"
+msgstr "オブジェクト�説明"
+
+#: describe.c:3970
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr "拡張\"%s\"内�オブジェクト"
+
+#: sql_help.h:182 sql_help.h:837
 msgid "abort the current transaction"
 msgstr "�在�トランザクションを中断�る"
 
-#: sql_help.h:178
+#: sql_help.h:187
 msgid "change the definition of an aggregate function"
 msgstr "集約関数�定義を変更�る"
 
-#: sql_help.h:183
+#: sql_help.h:192
+msgid "change the definition of a collation"
+msgstr "照�順��定義を変更�る"
+
+#: sql_help.h:197
 msgid "change the definition of a conversion"
 msgstr "エンコーディング変�ルール�定義を変更�る"
 
-#: sql_help.h:188
+#: sql_help.h:202
 msgid "change a database"
 msgstr "データベースを変更�る"
 
-#: sql_help.h:193
+#: sql_help.h:207
 msgid "define default access privileges"
 msgstr "デフォルト�アクセス権�を定義�る"
 
-#: sql_help.h:198
+#: sql_help.h:212
 msgid "change the definition of a domain"
 msgstr "ドメイン�定義を変更�る"
 
-#: sql_help.h:203
+#: sql_help.h:217
+msgid "change the definition of an extension"
+msgstr "拡張�定義を変更�る"
+
+#: sql_help.h:222
 msgid "change the definition of a foreign-data wrapper"
 msgstr "外部データラッパー�定義を変更�る"
 
-#: sql_help.h:208
+#: sql_help.h:227
+msgid "change the definition of a foreign table"
+msgstr "外部テーブル�定義を変更�る"
+
+#: sql_help.h:232
 msgid "change the definition of a function"
 msgstr "関数�定義を変更�る"
 
-#: sql_help.h:213
+#: sql_help.h:237
 msgid "change role name or membership"
 msgstr "ロール������メン�ーシップを変更�る"
 
-#: sql_help.h:218
+#: sql_help.h:242
 msgid "change the definition of an index"
 msgstr "インデックス�定義を変更�る"
 
-#: sql_help.h:223
+#: sql_help.h:247
 msgid "change the definition of a procedural language"
 msgstr "手続�言語�定義を変更�る"
 
-#: sql_help.h:228
+#: sql_help.h:252
 msgid "change the definition of a large object"
 msgstr "ラージオブジェクト�定義を変更�る"
 
-#: sql_help.h:233
+#: sql_help.h:257
 msgid "change the definition of an operator"
 msgstr "演算��定義を変更�る"
 
-#: sql_help.h:238
+#: sql_help.h:262
 msgid "change the definition of an operator class"
 msgstr "演算�クラス�定義を変更�る"
 
-#: sql_help.h:243
+#: sql_help.h:267
 msgid "change the definition of an operator family"
 msgstr "演算�ファミリ�定義を変更�る"
 
-#: sql_help.h:248 sql_help.h:308
+#: sql_help.h:272 sql_help.h:332
 msgid "change a database role"
 msgstr "データベース�ロールを変更�る"
 
-#: sql_help.h:253
+#: sql_help.h:277
 msgid "change the definition of a schema"
 msgstr "スキーマ�定義を変更�る"
 
-#: sql_help.h:258
+#: sql_help.h:282
 msgid "change the definition of a sequence generator"
-msgstr "シーケンス生�器�定義を変更�る"
+msgstr "シーケンスジェ�レーター�定義を変更�る"
 
-#: sql_help.h:263
+#: sql_help.h:287
 msgid "change the definition of a foreign server"
 msgstr "外部サー�ー�定義を変更�る"
 
-#: sql_help.h:268
+#: sql_help.h:292
 msgid "change the definition of a table"
 msgstr "テーブル�定義を変更�る"
 
-#: sql_help.h:273
+#: sql_help.h:297
 msgid "change the definition of a tablespace"
 msgstr "テーブルスペース�定義を変更�る"
 
-#: sql_help.h:278
+#: sql_help.h:302
 msgid "change the definition of a text search configuration"
 msgstr "テキスト検索設定�定義を変更�る"
 
-#: sql_help.h:283
+#: sql_help.h:307
 msgid "change the definition of a text search dictionary"
 msgstr "テキスト検索辞書�定義を変更�る"
 
-#: sql_help.h:288
+#: sql_help.h:312
 msgid "change the definition of a text search parser"
 msgstr "テキスト検索パーサ�定義を変更�る"
 
-#: sql_help.h:293
+#: sql_help.h:317
 msgid "change the definition of a text search template"
 msgstr "テキスト検索テンプレート�定義を変更�る"
 
-#: sql_help.h:298
+#: sql_help.h:322
 msgid "change the definition of a trigger"
 msgstr "トリガ�定義を変更�る"
 
-#: sql_help.h:303
+#: sql_help.h:327
 msgid "change the definition of a type"
 msgstr "型�定義を変更�る"
 
-#: sql_help.h:313
+#: sql_help.h:337
 msgid "change the definition of a user mapping"
 msgstr "ユーザマッピング�定義を変更�る"
 
-#: sql_help.h:318
+#: sql_help.h:342
 msgid "change the definition of a view"
 msgstr "ビュー�定義を変更�る"
 
-#: sql_help.h:323
+#: sql_help.h:347
 msgid "collect statistics about a database"
 msgstr "データベース�統計情報を�集�る"
 
-#: sql_help.h:328 sql_help.h:848
+#: sql_help.h:352 sql_help.h:902
 msgid "start a transaction block"
 msgstr "トランザクションブロックを開始�る"
 
-#: sql_help.h:333
+#: sql_help.h:357
 msgid "force a transaction log checkpoint"
 msgstr "トランザクションログ��ェック�イントを強制設定�る"
 
-#: sql_help.h:338
+#: sql_help.h:362
 msgid "close a cursor"
 msgstr "カーソルを閉�る"
 
-#: sql_help.h:343
+#: sql_help.h:367
 msgid "cluster a table according to an index"
 msgstr "インデックス�従��テーブルをクラスタ化�る"
 
-#: sql_help.h:348
+#: sql_help.h:372
 msgid "define or change the comment of an object"
 msgstr "オブジェクト�コメントを定義���変更�る"
 
-#: sql_help.h:353 sql_help.h:698
+#: sql_help.h:377 sql_help.h:747
 msgid "commit the current transaction"
-msgstr "�在�トランザクションをコミット（確定）�る"
+msgstr "�在�トランザクションをコミット�る"
 
-#: sql_help.h:358
+#: sql_help.h:382
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr ""
-"２フェーズコミット����事��準備�れ�トランザクションを\n"
-"コミット�る"
+"２フェーズコミット����事��準備�れ�トランザクションをコミット�る"
 
-#: sql_help.h:363
+#: sql_help.h:387
 msgid "copy data between a file and a table"
 msgstr "ファイル�テーブル間�データをコピー�る"
 
-#: sql_help.h:368
+#: sql_help.h:392
 msgid "define a new aggregate function"
 msgstr "新��集約関数を定義�る"
 
-#: sql_help.h:373
+#: sql_help.h:397
 msgid "define a new cast"
 msgstr "新��キャストを定義�る"
 
-#: sql_help.h:378
-msgid "define a new constraint trigger"
-msgstr "新��制約トリガを定義�る"
+#: sql_help.h:402
+msgid "define a new collation"
+msgstr "新��照�順�を定義�る"
 
-#: sql_help.h:383
+#: sql_help.h:407
 msgid "define a new encoding conversion"
 msgstr "新��エンコーディング�変�ルールを定義�る"
 
-#: sql_help.h:388
+#: sql_help.h:412
 msgid "create a new database"
 msgstr "新��データベースを作��る"
 
-#: sql_help.h:393
+#: sql_help.h:417
 msgid "define a new domain"
 msgstr "新��ドメインを定義�る"
 
-#: sql_help.h:398
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "拡張をインストール�る"
+
+#: sql_help.h:427
 msgid "define a new foreign-data wrapper"
 msgstr "新��外部データラッパーを定義�る"
 
-#: sql_help.h:403
+#: sql_help.h:432
+msgid "define a new foreign table"
+msgstr "新��外部テーブルを定義�る"
+
+#: sql_help.h:437
 msgid "define a new function"
 msgstr "新��関数を定義�る"
 
-#: sql_help.h:408 sql_help.h:438 sql_help.h:508
+#: sql_help.h:442 sql_help.h:472 sql_help.h:542
 msgid "define a new database role"
 msgstr "データベース�新��ロールを定義�る"
 
-#: sql_help.h:413
+#: sql_help.h:447
 msgid "define a new index"
 msgstr "新��インデックスを定義�る"
 
-#: sql_help.h:418
+#: sql_help.h:452
 msgid "define a new procedural language"
 msgstr "新��手続�言語を定義�る"
 
-#: sql_help.h:423
+#: sql_help.h:457
 msgid "define a new operator"
 msgstr "新��演算�を定義�る"
 
-#: sql_help.h:428
+#: sql_help.h:462
 msgid "define a new operator class"
 msgstr "新��演算�クラスを定義�る"
 
-#: sql_help.h:433
+#: sql_help.h:467
 msgid "define a new operator family"
 msgstr "新��演算�ファミリを定義�る"
 
-#: sql_help.h:443
+#: sql_help.h:477
 msgid "define a new rewrite rule"
 msgstr "新��書���ルールを定義�る"
 
-#: sql_help.h:448
+#: sql_help.h:482
 msgid "define a new schema"
 msgstr "新��スキーマを定義�る"
 
-#: sql_help.h:453
+#: sql_help.h:487
 msgid "define a new sequence generator"
-msgstr "新��シーケンス発生器を定義�る"
+msgstr "新��シーケンスジェ�レーターを定義�る"
 
-#: sql_help.h:458
+#: sql_help.h:492
 msgid "define a new foreign server"
 msgstr "新��外部サー�ーを定義�る"
 
-#: sql_help.h:463
+#: sql_help.h:497
 msgid "define a new table"
 msgstr "新��テーブルを定義�る"
 
-#: sql_help.h:468 sql_help.h:813
+#: sql_help.h:502 sql_help.h:867
 msgid "define a new table from the results of a query"
 msgstr "クエリー��果�ら新��テーブルを生��る"
 
-#: sql_help.h:473
+#: sql_help.h:507
 msgid "define a new tablespace"
 msgstr "新��テーブルスペースを定義�る"
 
-#: sql_help.h:478
+#: sql_help.h:512
 msgid "define a new text search configuration"
 msgstr "新��テキスト検索設定を定義�る"
 
-#: sql_help.h:483
+#: sql_help.h:517
 msgid "define a new text search dictionary"
 msgstr "新��テキスト検索用辞書を定義�る"
 
-#: sql_help.h:488
+#: sql_help.h:522
 msgid "define a new text search parser"
 msgstr "新��テキスト検索用パーサを定義�る"
 
-#: sql_help.h:493
+#: sql_help.h:527
 msgid "define a new text search template"
 msgstr "新��テキスト検索テンプレートを定義�る"
 
-#: sql_help.h:498
+#: sql_help.h:532
 msgid "define a new trigger"
 msgstr "新��トリガを定義�る"
 
-#: sql_help.h:503
+#: sql_help.h:537
 msgid "define a new data type"
 msgstr "新��データ型を定義�る"
 
-#: sql_help.h:513
+#: sql_help.h:547
 msgid "define a new mapping of a user to a foreign server"
 msgstr "外部サー�ー�対��ユーザ�新��マッピングを定義�る"
 
-#: sql_help.h:518
+#: sql_help.h:552
 msgid "define a new view"
 msgstr "新��ビューを定義�る"
 
-#: sql_help.h:523
+#: sql_help.h:557
 msgid "deallocate a prepared statement"
-msgstr "準備済�ステートメントを開放�る"
+msgstr "プリペアドステートメントを開放�る"
 
-#: sql_help.h:528
+#: sql_help.h:562
 msgid "define a cursor"
 msgstr "カーソルを定義�る"
 
-#: sql_help.h:533
+#: sql_help.h:567
 msgid "delete rows of a table"
 msgstr "テーブル�行を削除�る"
 
-#: sql_help.h:538
+#: sql_help.h:572
 msgid "discard session state"
 msgstr "セッション�状態を破棄�る"
 
-#: sql_help.h:543
+#: sql_help.h:577
 msgid "execute an anonymous code block"
 msgstr "無�コードブロックを実行�る"
 
-#: sql_help.h:548
+#: sql_help.h:582
 msgid "remove an aggregate function"
 msgstr "集約関数を削除�る"
 
-#: sql_help.h:553
+#: sql_help.h:587
 msgid "remove a cast"
 msgstr "キャストを削除�る"
 
-#: sql_help.h:558
+#: sql_help.h:592
+msgid "remove a collation"
+msgstr "照�順�を削除�る"
+
+#: sql_help.h:597
 msgid "remove a conversion"
 msgstr "エンコーディング変�ルールを削除�る"
 
-#: sql_help.h:563
+#: sql_help.h:602
 msgid "remove a database"
 msgstr "データベースを削除�る"
 
-#: sql_help.h:568
+#: sql_help.h:607
 msgid "remove a domain"
 msgstr "ドメインを削除�る"
 
-#: sql_help.h:573
+#: sql_help.h:612
+msgid "remove an extension"
+msgstr "拡張を削除�る"
+
+#: sql_help.h:617
 msgid "remove a foreign-data wrapper"
 msgstr "外部データラッパーを削除�る"
 
-#: sql_help.h:578
+#: sql_help.h:622
+msgid "remove a foreign table"
+msgstr "外部テーブルを削除�る"
+
+#: sql_help.h:627
 msgid "remove a function"
 msgstr "関数を削除�る"
 
-#: sql_help.h:583 sql_help.h:618 sql_help.h:683
+#: sql_help.h:632 sql_help.h:667 sql_help.h:732
 msgid "remove a database role"
 msgstr "データベース�ロールを削除�る"
 
-#: sql_help.h:588
+#: sql_help.h:637
 msgid "remove an index"
 msgstr "インデックスを削除�る"
 
-#: sql_help.h:593
+#: sql_help.h:642
 msgid "remove a procedural language"
 msgstr "手続�言語を削除�る"
 
-#: sql_help.h:598
+#: sql_help.h:647
 msgid "remove an operator"
 msgstr "演算�を削除�る"
 
-#: sql_help.h:603
+#: sql_help.h:652
 msgid "remove an operator class"
 msgstr "演算�クラスを削除�る"
 
-#: sql_help.h:608
+#: sql_help.h:657
 msgid "remove an operator family"
 msgstr "演算�ファミリを削除�る"
 
-#: sql_help.h:613
+#: sql_help.h:662
 msgid "remove database objects owned by a database role"
 msgstr "特定�データベースロール�所有�るデータベースオブジェクトを削除�る"
 
-#: sql_help.h:623
+#: sql_help.h:672
 msgid "remove a rewrite rule"
 msgstr "書���ルールを削除�る"
 
-#: sql_help.h:628
+#: sql_help.h:677
 msgid "remove a schema"
 msgstr "スキーマを削除�る"
 
-#: sql_help.h:633
+#: sql_help.h:682
 msgid "remove a sequence"
 msgstr "シーケンスを削除�る"
 
-#: sql_help.h:638
+#: sql_help.h:687
 msgid "remove a foreign server descriptor"
 msgstr "外部サー�ー識別�を削除�る"
 
-#: sql_help.h:643
+#: sql_help.h:692
 msgid "remove a table"
 msgstr "テーブルを削除�る"
 
-#: sql_help.h:648
+#: sql_help.h:697
 msgid "remove a tablespace"
 msgstr "テーブルスペースを削除�る"
 
-#: sql_help.h:653
+#: sql_help.h:702
 msgid "remove a text search configuration"
 msgstr "テキスト検索設定を削除�る"
 
-#: sql_help.h:658
+#: sql_help.h:707
 msgid "remove a text search dictionary"
 msgstr "テキスト検索用辞書を削除�る"
 
-#: sql_help.h:663
+#: sql_help.h:712
 msgid "remove a text search parser"
 msgstr "テキスト検索用パーサを削除�る"
 
-#: sql_help.h:668
+#: sql_help.h:717
 msgid "remove a text search template"
 msgstr "テキスト検索用テンプレートを削除�る"
 
-#: sql_help.h:673
+#: sql_help.h:722
 msgid "remove a trigger"
 msgstr "トリガを削除�る"
 
-#: sql_help.h:678
+#: sql_help.h:727
 msgid "remove a data type"
 msgstr "データ型を削除�る"
 
-#: sql_help.h:688
+#: sql_help.h:737
 msgid "remove a user mapping for a foreign server"
-msgstr "外部サー�ーー�ユーザ定義マッピングを削除"
+msgstr "外部サー�ー�ユーザマッピングを削除"
 
-#: sql_help.h:693
+#: sql_help.h:742
 msgid "remove a view"
 msgstr "ビューを削除�る"
 
-#: sql_help.h:703
+#: sql_help.h:752
 msgid "execute a prepared statement"
-msgstr "準備済�ステートメントを実行�る"
+msgstr "プリペアドステートメントを実行�る"
 
-#: sql_help.h:708
+#: sql_help.h:757
 msgid "show the execution plan of a statement"
 msgstr "ステートメント�実行プランを表示�る"
 
-#: sql_help.h:713
+#: sql_help.h:762
 msgid "retrieve rows from a query using a cursor"
 msgstr "カーソルを使��クエリー�ら行を�り出�"
 
-#: sql_help.h:718
+#: sql_help.h:767
 msgid "define access privileges"
 msgstr "アクセス権�を定義�る"
 
-#: sql_help.h:723
+#: sql_help.h:772
 msgid "create new rows in a table"
 msgstr "テーブル�新��行を作��る"
 
-#: sql_help.h:728
+#: sql_help.h:777
 msgid "listen for a notification"
 msgstr "通知メッセージを監視�る"
 
-#: sql_help.h:733
+#: sql_help.h:782
 msgid "load a shared library file"
 msgstr "共有ライブラリファイルをロード�る"
 
-#: sql_help.h:738
+#: sql_help.h:787
 msgid "lock a table"
 msgstr "テーブルをロック�る"
 
-#: sql_help.h:743
+#: sql_help.h:792
 msgid "position a cursor"
 msgstr "カーソルを�置付�る"
 
-#: sql_help.h:748
+#: sql_help.h:797
 msgid "generate a notification"
 msgstr "通知メッセージを生��る"
 
-#: sql_help.h:753
+#: sql_help.h:802
 msgid "prepare a statement for execution"
 msgstr "実行�先立��ステートメントを準備�る"
 
-#: sql_help.h:758
+#: sql_help.h:807
 msgid "prepare the current transaction for two-phase commit"
 msgstr "２フェーズコミット用��在�トランザクションを準備�る"
 
-#: sql_help.h:763
+#: sql_help.h:812
 msgid "change the ownership of database objects owned by a database role"
 msgstr ""
 "�るデータベースロール�所有�るデータベースオブジェクト�所有者を変更�る"
 
-#: sql_help.h:768
+#: sql_help.h:817
 msgid "rebuild indexes"
 msgstr "インデックスを�構築�る"
 
-#: sql_help.h:773
+#: sql_help.h:822
 msgid "destroy a previously defined savepoint"
 msgstr "�回定義��セーブ�イントを削除�る"
 
-#: sql_help.h:778
+#: sql_help.h:827
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "実行時パラメータ�値をデフォルト値�戻�"
 
-#: sql_help.h:783
+#: sql_help.h:832
 msgid "remove access privileges"
 msgstr "アクセス権�を剥奪�る"
 
-#: sql_help.h:793
+#: sql_help.h:842
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "２フェーズコミット用�事�準備�れ�トランザクションをキャンセル�る"
 
-#: sql_help.h:798
+#: sql_help.h:847
 msgid "roll back to a savepoint"
 msgstr "セーブ�イント��ロール�ック�る"
 
-#: sql_help.h:803
+#: sql_help.h:852
 msgid "define a new savepoint within the current transaction"
 msgstr "�在�トランザクション�対��新��セーブ�イントを定義�る"
 
-#: sql_help.h:808 sql_help.h:853 sql_help.h:883
+#: sql_help.h:857
+msgid "define or change a security label applied to an object"
+msgstr "オブジェクト��用�れるセキュリティラベルを定義���変更�る"
+
+#: sql_help.h:862 sql_help.h:907 sql_help.h:937
 msgid "retrieve rows from a table or view"
 msgstr "テーブルも���ビュー�ら行を�り出�"
 
-#: sql_help.h:818
+#: sql_help.h:872
 msgid "change a run-time parameter"
 msgstr "実行時パラメータを変更�る"
 
-#: sql_help.h:823
+#: sql_help.h:877
 msgid "set constraint check timing for the current transaction"
 msgstr "�在�トランザクション�対��制約検査�タイミングを設定�る"
 
-#: sql_help.h:828
+#: sql_help.h:882
 msgid "set the current user identifier of the current session"
 msgstr "�在�セッション���る�在�ユーザ識別を設定�る"
 
-#: sql_help.h:833
+#: sql_help.h:887
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
@@ -2675,1023 +2876,1156 @@ msgstr ""
 "セッション�ユーザ識別��よ��在�セッション���る�在�ユーザ識別を設定"
 "�る"
 
-#: sql_help.h:838
+#: sql_help.h:892
 msgid "set the characteristics of the current transaction"
 msgstr "�在�トランザクション�特性を設定���"
 
-#: sql_help.h:843
+#: sql_help.h:897
 msgid "show the value of a run-time parameter"
 msgstr "実行時パラメータ�値を表示�る"
 
-#: sql_help.h:858
+#: sql_help.h:912
 msgid "empty a table or set of tables"
 msgstr "テーブルも���テーブル�セットを 0 件�切り詰�る"
 
-#: sql_help.h:863
+#: sql_help.h:917
 msgid "stop listening for a notification"
 msgstr "通知メッセージ�監視を中止�る"
 
-#: sql_help.h:868
+#: sql_help.h:922
 msgid "update rows of a table"
 msgstr "テーブル�行を更新�る"
 
-#: sql_help.h:873
+#: sql_help.h:927
 msgid "garbage-collect and optionally analyze a database"
 msgstr "ガーベジコレクションを行��オプション�データベース�分�を���"
 
-#: sql_help.h:878
+#: sql_help.h:932
 msgid "compute a set of rows"
-msgstr "ロール�セットを計算���"
-
-#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:43 sql_help.c:45
-#: sql_help.c:69 sql_help.c:73 sql_help.c:75 sql_help.c:77 sql_help.c:79
-#: sql_help.c:82 sql_help.c:84 sql_help.c:86 sql_help.c:161 sql_help.c:163
-#: sql_help.c:164 sql_help.c:166 sql_help.c:168 sql_help.c:170 sql_help.c:182
-#: sql_help.c:186 sql_help.c:214 sql_help.c:219 sql_help.c:224 sql_help.c:229
-#: sql_help.c:267 sql_help.c:269 sql_help.c:271 sql_help.c:274 sql_help.c:284
-#: sql_help.c:286 sql_help.c:304 sql_help.c:316 sql_help.c:319 sql_help.c:338
-#: sql_help.c:349 sql_help.c:357 sql_help.c:360 sql_help.c:389 sql_help.c:395
-#: sql_help.c:397 sql_help.c:401 sql_help.c:404 sql_help.c:407 sql_help.c:417
-#: sql_help.c:419 sql_help.c:436 sql_help.c:445 sql_help.c:447 sql_help.c:449
-#: sql_help.c:513 sql_help.c:515 sql_help.c:518 sql_help.c:520 sql_help.c:570
-#: sql_help.c:572 sql_help.c:574 sql_help.c:577 sql_help.c:597 sql_help.c:600
-#: sql_help.c:603 sql_help.c:606 sql_help.c:610 sql_help.c:612 sql_help.c:614
-#: sql_help.c:627 sql_help.c:630 sql_help.c:632 sql_help.c:641 sql_help.c:650
-#: sql_help.c:659 sql_help.c:671 sql_help.c:673 sql_help.c:675 sql_help.c:703
-#: sql_help.c:709 sql_help.c:711 sql_help.c:714 sql_help.c:716 sql_help.c:718
-#: sql_help.c:743 sql_help.c:746 sql_help.c:748 sql_help.c:750 sql_help.c:752
-#: sql_help.c:791 sql_help.c:962 sql_help.c:969 sql_help.c:1015
-#: sql_help.c:1030 sql_help.c:1048 sql_help.c:1070 sql_help.c:1086
-#: sql_help.c:1112 sql_help.c:1154 sql_help.c:1176 sql_help.c:1195
-#: sql_help.c:1196 sql_help.c:1213 sql_help.c:1233 sql_help.c:1254
-#: sql_help.c:1281 sql_help.c:1302 sql_help.c:1332 sql_help.c:1512
-#: sql_help.c:1525 sql_help.c:1542 sql_help.c:1558 sql_help.c:1571
-#: sql_help.c:1610 sql_help.c:1613 sql_help.c:1615 sql_help.c:1632
-#: sql_help.c:1658 sql_help.c:1691 sql_help.c:1701 sql_help.c:1710
-#: sql_help.c:1752 sql_help.c:1770 sql_help.c:1778 sql_help.c:1786
-#: sql_help.c:1794 sql_help.c:1803 sql_help.c:1814 sql_help.c:1822
-#: sql_help.c:1830 sql_help.c:1838 sql_help.c:1848 sql_help.c:1857
-#: sql_help.c:1866 sql_help.c:1874 sql_help.c:1882 sql_help.c:1891
-#: sql_help.c:1899 sql_help.c:1915 sql_help.c:1931 sql_help.c:1939
-#: sql_help.c:1947 sql_help.c:1955 sql_help.c:1963 sql_help.c:1972
-#: sql_help.c:1980 sql_help.c:1997 sql_help.c:2012 sql_help.c:2192
-#: sql_help.c:2220 sql_help.c:2247 sql_help.c:2548 sql_help.c:2593
-#: sql_help.c:2697
+msgstr "行セットを計算���"
+
+#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:44 sql_help.c:46
+#: sql_help.c:48 sql_help.c:59 sql_help.c:61 sql_help.c:63 sql_help.c:87
+#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
+#: sql_help.c:102 sql_help.c:104 sql_help.c:179 sql_help.c:181 sql_help.c:182
+#: sql_help.c:184 sql_help.c:186 sql_help.c:188 sql_help.c:276 sql_help.c:281
+#: sql_help.c:306 sql_help.c:308 sql_help.c:311 sql_help.c:313 sql_help.c:351
+#: sql_help.c:356 sql_help.c:361 sql_help.c:366 sql_help.c:404 sql_help.c:406
+#: sql_help.c:408 sql_help.c:411 sql_help.c:421 sql_help.c:423 sql_help.c:442
+#: sql_help.c:446 sql_help.c:459 sql_help.c:462 sql_help.c:465 sql_help.c:485
+#: sql_help.c:497 sql_help.c:505 sql_help.c:508 sql_help.c:511 sql_help.c:541
+#: sql_help.c:547 sql_help.c:549 sql_help.c:553 sql_help.c:556 sql_help.c:559
+#: sql_help.c:569 sql_help.c:571 sql_help.c:588 sql_help.c:597 sql_help.c:599
+#: sql_help.c:601 sql_help.c:675 sql_help.c:677 sql_help.c:680 sql_help.c:682
+#: sql_help.c:740 sql_help.c:742 sql_help.c:744 sql_help.c:747 sql_help.c:768
+#: sql_help.c:771 sql_help.c:774 sql_help.c:777 sql_help.c:781 sql_help.c:783
+#: sql_help.c:785 sql_help.c:787 sql_help.c:801 sql_help.c:804 sql_help.c:806
+#: sql_help.c:808 sql_help.c:818 sql_help.c:820 sql_help.c:830 sql_help.c:832
+#: sql_help.c:841 sql_help.c:862 sql_help.c:864 sql_help.c:866 sql_help.c:869
+#: sql_help.c:871 sql_help.c:873 sql_help.c:911 sql_help.c:917 sql_help.c:919
+#: sql_help.c:922 sql_help.c:924 sql_help.c:926 sql_help.c:951 sql_help.c:954
+#: sql_help.c:956 sql_help.c:958 sql_help.c:960 sql_help.c:1000
+#: sql_help.c:1183 sql_help.c:1191 sql_help.c:1235 sql_help.c:1239
+#: sql_help.c:1249 sql_help.c:1267 sql_help.c:1290 sql_help.c:1322
+#: sql_help.c:1367 sql_help.c:1409 sql_help.c:1431 sql_help.c:1451
+#: sql_help.c:1452 sql_help.c:1469 sql_help.c:1489 sql_help.c:1511
+#: sql_help.c:1539 sql_help.c:1560 sql_help.c:1590 sql_help.c:1771
+#: sql_help.c:1784 sql_help.c:1801 sql_help.c:1817 sql_help.c:1840
+#: sql_help.c:1883 sql_help.c:1887 sql_help.c:1889 sql_help.c:1907
+#: sql_help.c:1934 sql_help.c:1967 sql_help.c:1977 sql_help.c:1986
+#: sql_help.c:2030 sql_help.c:2048 sql_help.c:2056 sql_help.c:2064
+#: sql_help.c:2072 sql_help.c:2088 sql_help.c:2096 sql_help.c:2105
+#: sql_help.c:2116 sql_help.c:2124 sql_help.c:2132 sql_help.c:2140
+#: sql_help.c:2150 sql_help.c:2159 sql_help.c:2168 sql_help.c:2176
+#: sql_help.c:2184 sql_help.c:2193 sql_help.c:2201 sql_help.c:2217
+#: sql_help.c:2233 sql_help.c:2241 sql_help.c:2249 sql_help.c:2257
+#: sql_help.c:2265 sql_help.c:2274 sql_help.c:2282 sql_help.c:2299
+#: sql_help.c:2314 sql_help.c:2506 sql_help.c:2557 sql_help.c:2584
+#: sql_help.c:2927 sql_help.c:2973 sql_help.c:3080
 msgid "name"
 msgstr "��"
 
-#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:524 sql_help.c:528
-#: sql_help.c:1753
+#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:317 sql_help.c:320
+#: sql_help.c:2031
 msgid "type"
 msgstr "åž‹"
 
-#: sql_help.c:28 sql_help.c:44 sql_help.c:74 sql_help.c:223 sql_help.c:256
-#: sql_help.c:268 sql_help.c:285 sql_help.c:318 sql_help.c:359 sql_help.c:396
-#: sql_help.c:418 sql_help.c:448 sql_help.c:519 sql_help.c:571 sql_help.c:613
-#: sql_help.c:631 sql_help.c:642 sql_help.c:651 sql_help.c:661 sql_help.c:672
-#: sql_help.c:710 sql_help.c:751
+#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:312
+#: sql_help.c:360 sql_help.c:393 sql_help.c:405 sql_help.c:422 sql_help.c:461
+#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:681
+#: sql_help.c:741 sql_help.c:784 sql_help.c:805 sql_help.c:819 sql_help.c:831
+#: sql_help.c:843 sql_help.c:870 sql_help.c:918 sql_help.c:959
 msgid "new_name"
 msgstr "新����"
 
-#: sql_help.c:31 sql_help.c:46 sql_help.c:76 sql_help.c:169 sql_help.c:187
-#: sql_help.c:228 sql_help.c:287 sql_help.c:296 sql_help.c:307 sql_help.c:321
-#: sql_help.c:362 sql_help.c:420 sql_help.c:446 sql_help.c:465 sql_help.c:558
-#: sql_help.c:573 sql_help.c:615 sql_help.c:633 sql_help.c:674 sql_help.c:749
+#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:187
+#: sql_help.c:282 sql_help.c:322 sql_help.c:365 sql_help.c:424 sql_help.c:433
+#: sql_help.c:445 sql_help.c:464 sql_help.c:510 sql_help.c:572 sql_help.c:598
+#: sql_help.c:617 sql_help.c:725 sql_help.c:743 sql_help.c:786 sql_help.c:807
+#: sql_help.c:865 sql_help.c:957
 msgid "new_owner"
 msgstr "新��所有者"
 
-#: sql_help.c:34 sql_help.c:171 sql_help.c:233 sql_help.c:450 sql_help.c:521
-#: sql_help.c:676 sql_help.c:753
+#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:189 sql_help.c:228
+#: sql_help.c:314 sql_help.c:370 sql_help.c:449 sql_help.c:467 sql_help.c:513
+#: sql_help.c:602 sql_help.c:683 sql_help.c:788 sql_help.c:809 sql_help.c:821
+#: sql_help.c:833 sql_help.c:872 sql_help.c:961
 msgid "new_schema"
-msgstr "新��スキーマ %s"
+msgstr "新��スキーマ"
 
-#: sql_help.c:70 sql_help.c:184 sql_help.c:390 sql_help.c:462 sql_help.c:628
-#: sql_help.c:704 sql_help.c:730 sql_help.c:922 sql_help.c:927 sql_help.c:1088
-#: sql_help.c:1155 sql_help.c:1282 sql_help.c:1353 sql_help.c:1527
-#: sql_help.c:1659 sql_help.c:1681
+#: sql_help.c:88 sql_help.c:279 sql_help.c:323 sql_help.c:542 sql_help.c:614
+#: sql_help.c:802 sql_help.c:912 sql_help.c:938 sql_help.c:1142
+#: sql_help.c:1147 sql_help.c:1325 sql_help.c:1343 sql_help.c:1410
+#: sql_help.c:1540 sql_help.c:1611 sql_help.c:1786 sql_help.c:1935
+#: sql_help.c:1957 sql_help.c:2332
 msgid "option"
 msgstr "オプション"
 
-#: sql_help.c:71 sql_help.c:391 sql_help.c:705 sql_help.c:1156 sql_help.c:1283
-#: sql_help.c:1660
+#: sql_help.c:89 sql_help.c:543 sql_help.c:913 sql_help.c:1411 sql_help.c:1541
+#: sql_help.c:1936
 msgid "where option can be:"
 msgstr "オプション�以下�通り："
 
-#: sql_help.c:72 sql_help.c:392 sql_help.c:706 sql_help.c:1055 sql_help.c:1284
-#: sql_help.c:1661
+#: sql_help.c:90 sql_help.c:544 sql_help.c:914 sql_help.c:1274 sql_help.c:1542
+#: sql_help.c:1937
 msgid "connlimit"
 msgstr "最大接続数"
 
-#: sql_help.c:78 sql_help.c:559
+#: sql_help.c:96 sql_help.c:726
 msgid "new_tablespace"
 msgstr "テーブルスペース"
 
-#: sql_help.c:80 sql_help.c:83 sql_help.c:85 sql_help.c:237 sql_help.c:239
-#: sql_help.c:240 sql_help.c:399 sql_help.c:403 sql_help.c:406 sql_help.c:712
-#: sql_help.c:715 sql_help.c:717 sql_help.c:1123 sql_help.c:2264
-#: sql_help.c:2537
+#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:374 sql_help.c:376
+#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:920
+#: sql_help.c:923 sql_help.c:925 sql_help.c:1378 sql_help.c:2601
+#: sql_help.c:2916
 msgid "configuration_parameter"
 msgstr "設定パラメータ"
 
-#: sql_help.c:81 sql_help.c:185 sql_help.c:238 sql_help.c:273 sql_help.c:400
-#: sql_help.c:463 sql_help.c:538 sql_help.c:554 sql_help.c:576 sql_help.c:629
-#: sql_help.c:713 sql_help.c:731 sql_help.c:1089 sql_help.c:1124
-#: sql_help.c:1125 sql_help.c:1183 sql_help.c:1354 sql_help.c:1427
-#: sql_help.c:1436 sql_help.c:1467 sql_help.c:1489 sql_help.c:1528
-#: sql_help.c:1682 sql_help.c:2538 sql_help.c:2539
+#: sql_help.c:99 sql_help.c:280 sql_help.c:324 sql_help.c:375 sql_help.c:410
+#: sql_help.c:552 sql_help.c:615 sql_help.c:702 sql_help.c:720 sql_help.c:746
+#: sql_help.c:803 sql_help.c:921 sql_help.c:939 sql_help.c:1326
+#: sql_help.c:1344 sql_help.c:1379 sql_help.c:1380 sql_help.c:1439
+#: sql_help.c:1612 sql_help.c:1686 sql_help.c:1694 sql_help.c:1726
+#: sql_help.c:1748 sql_help.c:1787 sql_help.c:1958 sql_help.c:2917
+#: sql_help.c:2918
 msgid "value"
 msgstr "値"
 
-#: sql_help.c:133
+#: sql_help.c:151
 msgid "target_role"
 msgstr "対象�ロール"
 
-#: sql_help.c:134 sql_help.c:1317 sql_help.c:2118 sql_help.c:2125
-#: sql_help.c:2137 sql_help.c:2143 sql_help.c:2347 sql_help.c:2354
-#: sql_help.c:2366 sql_help.c:2372
+#: sql_help.c:152 sql_help.c:1575 sql_help.c:2430 sql_help.c:2437
+#: sql_help.c:2449 sql_help.c:2455 sql_help.c:2684 sql_help.c:2691
+#: sql_help.c:2703 sql_help.c:2709
 msgid "schema_name"
 msgstr "スキーマ�"
 
-#: sql_help.c:135
+#: sql_help.c:153
 msgid "abbreviated_grant_or_revoke"
 msgstr "権�付与�剥奪��略形"
 
-#: sql_help.c:136
+#: sql_help.c:154
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "権�付与�剥奪��略形�以下���れ�："
 
-#: sql_help.c:137 sql_help.c:138 sql_help.c:139 sql_help.c:140 sql_help.c:141
-#: sql_help.c:142 sql_help.c:1159 sql_help.c:1160 sql_help.c:1161
-#: sql_help.c:1162 sql_help.c:1163 sql_help.c:1287 sql_help.c:1288
-#: sql_help.c:1289 sql_help.c:1290 sql_help.c:1291 sql_help.c:1664
-#: sql_help.c:1665 sql_help.c:1666 sql_help.c:1667 sql_help.c:1668
-#: sql_help.c:2119 sql_help.c:2123 sql_help.c:2126 sql_help.c:2128
-#: sql_help.c:2130 sql_help.c:2132 sql_help.c:2138 sql_help.c:2140
-#: sql_help.c:2142 sql_help.c:2144 sql_help.c:2146 sql_help.c:2147
-#: sql_help.c:2148 sql_help.c:2348 sql_help.c:2352 sql_help.c:2355
-#: sql_help.c:2357 sql_help.c:2359 sql_help.c:2361 sql_help.c:2367
-#: sql_help.c:2369 sql_help.c:2371 sql_help.c:2373 sql_help.c:2375
-#: sql_help.c:2376 sql_help.c:2377 sql_help.c:2558
+#: sql_help.c:155 sql_help.c:156 sql_help.c:157 sql_help.c:158 sql_help.c:159
+#: sql_help.c:160 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
+#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1545 sql_help.c:1546
+#: sql_help.c:1547 sql_help.c:1548 sql_help.c:1549 sql_help.c:1940
+#: sql_help.c:1941 sql_help.c:1942 sql_help.c:1943 sql_help.c:1944
+#: sql_help.c:2431 sql_help.c:2435 sql_help.c:2438 sql_help.c:2440
+#: sql_help.c:2442 sql_help.c:2444 sql_help.c:2450 sql_help.c:2452
+#: sql_help.c:2454 sql_help.c:2456 sql_help.c:2458 sql_help.c:2459
+#: sql_help.c:2460 sql_help.c:2685 sql_help.c:2689 sql_help.c:2692
+#: sql_help.c:2694 sql_help.c:2696 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2706 sql_help.c:2708 sql_help.c:2710 sql_help.c:2712
+#: sql_help.c:2713 sql_help.c:2714 sql_help.c:2937
 msgid "role_name"
 msgstr "ロール�"
 
-#: sql_help.c:162 sql_help.c:529 sql_help.c:531 sql_help.c:745 sql_help.c:1072
-#: sql_help.c:1076 sql_help.c:1180 sql_help.c:1440 sql_help.c:1449
-#: sql_help.c:1471 sql_help.c:2160 sql_help.c:2445 sql_help.c:2446
-#: sql_help.c:2450 sql_help.c:2455 sql_help.c:2512 sql_help.c:2513
-#: sql_help.c:2518 sql_help.c:2523 sql_help.c:2644 sql_help.c:2645
-#: sql_help.c:2649 sql_help.c:2654 sql_help.c:2721 sql_help.c:2723
-#: sql_help.c:2754 sql_help.c:2796 sql_help.c:2797 sql_help.c:2801
-#: sql_help.c:2806
+#: sql_help.c:180 sql_help.c:693 sql_help.c:695 sql_help.c:953 sql_help.c:1293
+#: sql_help.c:1297 sql_help.c:1435 sql_help.c:1698 sql_help.c:1708
+#: sql_help.c:1730 sql_help.c:2474 sql_help.c:2822 sql_help.c:2823
+#: sql_help.c:2827 sql_help.c:2832 sql_help.c:2891 sql_help.c:2892
+#: sql_help.c:2897 sql_help.c:2902 sql_help.c:3025 sql_help.c:3026
+#: sql_help.c:3030 sql_help.c:3035 sql_help.c:3106 sql_help.c:3108
+#: sql_help.c:3139 sql_help.c:3181 sql_help.c:3182 sql_help.c:3186
+#: sql_help.c:3191
 msgid "expression"
 msgstr "評価�"
 
-#: sql_help.c:165
+#: sql_help.c:183
 msgid "domain_constraint"
 msgstr "ドメイン制約"
 
-#: sql_help.c:167 sql_help.c:543 sql_help.c:845 sql_help.c:1075
-#: sql_help.c:1439 sql_help.c:1448
+#: sql_help.c:185 sql_help.c:708 sql_help.c:709 sql_help.c:728 sql_help.c:1059
+#: sql_help.c:1296 sql_help.c:1697 sql_help.c:1707
 msgid "constraint_name"
 msgstr "制約�"
 
-#: sql_help.c:183 sql_help.c:1087 sql_help.c:1199
-msgid "valfunction"
-msgstr "�リデータ関数"
+#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1308
+#: sql_help.c:2080
+msgid "extension_name"
+msgstr "拡張�"
+
+#: sql_help.c:226 sql_help.c:613
+msgid "new_version"
+msgstr "新���ージョン"
+
+#: sql_help.c:230 sql_help.c:232
+msgid "member_object"
+msgstr "メン�オブジェクト"
+
+#: sql_help.c:233
+msgid "where member_object is:"
+msgstr "メン�オブジェクト�以下�通り:"
+
+#: sql_help.c:234 sql_help.c:1052 sql_help.c:2771
+msgid "agg_name"
+msgstr "集約関数�"
+
+#: sql_help.c:235 sql_help.c:1053 sql_help.c:2772
+msgid "agg_type"
+msgstr "集約関数�型"
+
+#: sql_help.c:236 sql_help.c:1054 sql_help.c:1215 sql_help.c:1219
+#: sql_help.c:1221 sql_help.c:2039
+msgid "source_type"
+msgstr "ソース�型"
+
+#: sql_help.c:237 sql_help.c:1055 sql_help.c:1216 sql_help.c:1220
+#: sql_help.c:1222 sql_help.c:2040
+msgid "target_type"
+msgstr "ターゲット�型"
+
+#: sql_help.c:238 sql_help.c:239 sql_help.c:240 sql_help.c:241 sql_help.c:242
+#: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:255 sql_help.c:256
+#: sql_help.c:257 sql_help.c:258 sql_help.c:259 sql_help.c:260 sql_help.c:261
+#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1056
+#: sql_help.c:1061 sql_help.c:1062 sql_help.c:1063 sql_help.c:1064
+#: sql_help.c:1065 sql_help.c:1066 sql_help.c:1071 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1080 sql_help.c:1081 sql_help.c:1084
+#: sql_help.c:1085 sql_help.c:1086 sql_help.c:1087 sql_help.c:1088
+#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1096 sql_help.c:2768 sql_help.c:2773
+#: sql_help.c:2774 sql_help.c:2780 sql_help.c:2781 sql_help.c:2782
+#: sql_help.c:2783 sql_help.c:2784
+msgid "object_name"
+msgstr "オブジェクト�"
 
-#: sql_help.c:215 sql_help.c:220 sql_help.c:225 sql_help.c:230 sql_help.c:851
-#: sql_help.c:1113 sql_help.c:1804 sql_help.c:2134 sql_help.c:2363
+#: sql_help.c:243 sql_help.c:495 sql_help.c:1067 sql_help.c:1217
+#: sql_help.c:1252 sql_help.c:1470 sql_help.c:1501 sql_help.c:1845
+#: sql_help.c:2445 sql_help.c:2699 sql_help.c:2775 sql_help.c:2848
+#: sql_help.c:2853 sql_help.c:3051 sql_help.c:3056 sql_help.c:3207
+#: sql_help.c:3212
+msgid "function_name"
+msgstr "関数�"
+
+#: sql_help.c:244 sql_help.c:352 sql_help.c:357 sql_help.c:362 sql_help.c:367
+#: sql_help.c:1068 sql_help.c:1368 sql_help.c:2106 sql_help.c:2446
+#: sql_help.c:2700 sql_help.c:2776
 msgid "argmode"
 msgstr "引数�モード"
 
-#: sql_help.c:216 sql_help.c:221 sql_help.c:226 sql_help.c:231 sql_help.c:852
-#: sql_help.c:1114 sql_help.c:1805
+#: sql_help.c:245 sql_help.c:353 sql_help.c:358 sql_help.c:363 sql_help.c:368
+#: sql_help.c:1069 sql_help.c:1369 sql_help.c:2107 sql_help.c:2777
 msgid "argname"
 msgstr "引数�"
 
-#: sql_help.c:217 sql_help.c:222 sql_help.c:227 sql_help.c:232 sql_help.c:853
-#: sql_help.c:1115 sql_help.c:1806
+#: sql_help.c:246 sql_help.c:354 sql_help.c:359 sql_help.c:364 sql_help.c:369
+#: sql_help.c:1070 sql_help.c:1370 sql_help.c:2108 sql_help.c:2778
 msgid "argtype"
 msgstr "引数�型"
 
-#: sql_help.c:218 sql_help.c:514 sql_help.c:1445 sql_help.c:1446
-#: sql_help.c:1462 sql_help.c:1463
+#: sql_help.c:247 sql_help.c:488 sql_help.c:1073 sql_help.c:1494
+msgid "operator_name"
+msgstr "演算��"
+
+#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1074
+#: sql_help.c:1471 sql_help.c:2141
+msgid "left_type"
+msgstr "左辺�型"
+
+#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1075
+#: sql_help.c:1472 sql_help.c:2142
+msgid "right_type"
+msgstr "�辺�型"
+
+#: sql_help.c:251 sql_help.c:253 sql_help.c:460 sql_help.c:463 sql_help.c:466
+#: sql_help.c:486 sql_help.c:498 sql_help.c:506 sql_help.c:509 sql_help.c:512
+#: sql_help.c:1077 sql_help.c:1079 sql_help.c:1491 sql_help.c:1512
+#: sql_help.c:1713 sql_help.c:2151 sql_help.c:2160
+msgid "index_method"
+msgstr "インデックスメソッド"
+
+#: sql_help.c:277 sql_help.c:1323
+msgid "handler_function"
+msgstr "�ンドラ関数"
+
+#: sql_help.c:278 sql_help.c:1324
+msgid "validator_function"
+msgstr "�リデータ関数"
+
+#: sql_help.c:307 sql_help.c:355 sql_help.c:676 sql_help.c:863 sql_help.c:1704
+#: sql_help.c:1705 sql_help.c:1721 sql_help.c:1722
 msgid "action"
 msgstr "アクション"
 
-#: sql_help.c:234 sql_help.c:522
+#: sql_help.c:309 sql_help.c:316 sql_help.c:318 sql_help.c:319 sql_help.c:321
+#: sql_help.c:596 sql_help.c:678 sql_help.c:685 sql_help.c:689 sql_help.c:690
+#: sql_help.c:694 sql_help.c:696 sql_help.c:697 sql_help.c:698 sql_help.c:700
+#: sql_help.c:703 sql_help.c:705 sql_help.c:952 sql_help.c:955 sql_help.c:970
+#: sql_help.c:1140 sql_help.c:1144 sql_help.c:1156 sql_help.c:1157
+#: sql_help.c:1434 sql_help.c:1597 sql_help.c:1729 sql_help.c:2432
+#: sql_help.c:2433 sql_help.c:2473 sql_help.c:2686 sql_help.c:2687
+#: sql_help.c:3105 sql_help.c:3107 sql_help.c:3124 sql_help.c:3127
+msgid "column"
+msgstr "カラム"
+
+#: sql_help.c:310 sql_help.c:679
+msgid "new_column"
+msgstr "新��カラム"
+
+#: sql_help.c:315 sql_help.c:371 sql_help.c:684 sql_help.c:876
 msgid "where action is one of:"
 msgstr "アクション�以下���れ�："
 
-#: sql_help.c:235 sql_help.c:1121
+#: sql_help.c:372 sql_help.c:1376
 msgid "execution_cost"
 msgstr "実行コスト"
 
-#: sql_help.c:236 sql_help.c:1122
+#: sql_help.c:373 sql_help.c:1377
 msgid "result_rows"
 msgstr "�果�行数"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:255
+#: sql_help.c:388 sql_help.c:390 sql_help.c:392
 msgid "group_name"
 msgstr "グループ�"
 
-#: sql_help.c:252 sql_help.c:254 sql_help.c:728 sql_help.c:1049
-#: sql_help.c:1318 sql_help.c:1320 sql_help.c:1500 sql_help.c:1679
-#: sql_help.c:1988 sql_help.c:2568
+#: sql_help.c:389 sql_help.c:391 sql_help.c:936 sql_help.c:1268
+#: sql_help.c:1576 sql_help.c:1578 sql_help.c:1759 sql_help.c:1955
+#: sql_help.c:2290 sql_help.c:2947
 msgid "user_name"
 msgstr "ユーザ�"
 
-#: sql_help.c:270 sql_help.c:1499 sql_help.c:1923 sql_help.c:2145
-#: sql_help.c:2374
+#: sql_help.c:407 sql_help.c:1758 sql_help.c:2225 sql_help.c:2457
+#: sql_help.c:2711
 msgid "tablespace_name"
 msgstr "テーブルスペース�"
 
-#: sql_help.c:272 sql_help.c:275 sql_help.c:553 sql_help.c:555 sql_help.c:1182
-#: sql_help.c:1426 sql_help.c:1435 sql_help.c:1466 sql_help.c:1488
+#: sql_help.c:409 sql_help.c:412 sql_help.c:719 sql_help.c:721 sql_help.c:1438
+#: sql_help.c:1685 sql_help.c:1693 sql_help.c:1725 sql_help.c:1747
 msgid "storage_parameter"
 msgstr "ストレージパラメーター"
 
-#: sql_help.c:295 sql_help.c:855
+#: sql_help.c:432 sql_help.c:1072 sql_help.c:2779
 msgid "large_object_oid"
-msgstr "ラージオブジェクト� oid"
-
-#: sql_help.c:305 sql_help.c:857 sql_help.c:1215 sql_help.c:1839
-msgid "left_type"
-msgstr "左辺�型"
-
-#: sql_help.c:306 sql_help.c:858 sql_help.c:1216 sql_help.c:1840
-msgid "right_type"
-msgstr "�辺�型"
-
-#: sql_help.c:317 sql_help.c:320 sql_help.c:339 sql_help.c:350 sql_help.c:358
-#: sql_help.c:361 sql_help.c:860 sql_help.c:862 sql_help.c:1235
-#: sql_help.c:1255 sql_help.c:1454 sql_help.c:1849 sql_help.c:1858
-msgid "index_method"
-msgstr "インデックスメソッド"
+msgstr "ラージオブジェクト�oid"
 
-#: sql_help.c:340 sql_help.c:351 sql_help.c:1237
+#: sql_help.c:487 sql_help.c:499 sql_help.c:1493
 msgid "strategy_number"
 msgstr "ストラテジー番�"
 
-#: sql_help.c:341 sql_help.c:856 sql_help.c:1238
-msgid "operator_name"
-msgstr "演算��"
-
-#: sql_help.c:342 sql_help.c:343 sql_help.c:345 sql_help.c:346 sql_help.c:352
-#: sql_help.c:353 sql_help.c:355 sql_help.c:356 sql_help.c:1239
-#: sql_help.c:1240 sql_help.c:1242 sql_help.c:1243
+#: sql_help.c:489 sql_help.c:490 sql_help.c:493 sql_help.c:494 sql_help.c:500
+#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1495
+#: sql_help.c:1496 sql_help.c:1499 sql_help.c:1500
 msgid "op_type"
 msgstr "演算��型"
 
-#: sql_help.c:344 sql_help.c:354 sql_help.c:1241
+#: sql_help.c:491 sql_help.c:1497
+msgid "sort_family_name"
+msgstr "ソートファミリー�"
+
+#: sql_help.c:492 sql_help.c:502 sql_help.c:1498
 msgid "support_number"
 msgstr "サ�ート番�"
 
-#: sql_help.c:347 sql_help.c:850 sql_help.c:995 sql_help.c:1020
-#: sql_help.c:1033 sql_help.c:1214 sql_help.c:1244 sql_help.c:1575
-#: sql_help.c:2133 sql_help.c:2362 sql_help.c:2471 sql_help.c:2476
-#: sql_help.c:2670 sql_help.c:2675 sql_help.c:2822 sql_help.c:2827
-msgid "function_name"
-msgstr "関数�"
-
-#: sql_help.c:348 sql_help.c:996 sql_help.c:1245
+#: sql_help.c:496 sql_help.c:1218 sql_help.c:1502
 msgid "argument_type"
 msgstr "引数�型"
 
-#: sql_help.c:393 sql_help.c:707 sql_help.c:1157 sql_help.c:1285
-#: sql_help.c:1662
+#: sql_help.c:545 sql_help.c:915 sql_help.c:1412 sql_help.c:1543
+#: sql_help.c:1938
 msgid "password"
 msgstr "パスワード"
 
-#: sql_help.c:394 sql_help.c:708 sql_help.c:1158 sql_help.c:1286
-#: sql_help.c:1663
+#: sql_help.c:546 sql_help.c:916 sql_help.c:1413 sql_help.c:1544
+#: sql_help.c:1939
 msgid "timestamp"
 msgstr "タイムスタンプ"
 
-#: sql_help.c:398 sql_help.c:402 sql_help.c:405 sql_help.c:408 sql_help.c:2127
-#: sql_help.c:2356
+#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2439
+#: sql_help.c:2693
 msgid "database_name"
 msgstr "データベース�"
 
-#: sql_help.c:437 sql_help.c:1333
+#: sql_help.c:589 sql_help.c:1591
 msgid "increment"
 msgstr "増分"
 
-#: sql_help.c:438 sql_help.c:1334
+#: sql_help.c:590 sql_help.c:1592
 msgid "minvalue"
 msgstr "最�値"
 
-#: sql_help.c:439 sql_help.c:1335
+#: sql_help.c:591 sql_help.c:1593
 msgid "maxvalue"
 msgstr "最大値"
 
-#: sql_help.c:440 sql_help.c:1336 sql_help.c:2458 sql_help.c:2526
-#: sql_help.c:2657 sql_help.c:2758 sql_help.c:2809
+#: sql_help.c:592 sql_help.c:1594 sql_help.c:2835 sql_help.c:2905
+#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
 msgid "start"
-msgstr "開始"
+msgstr "開始値"
 
-#: sql_help.c:441
+#: sql_help.c:593
 msgid "restart"
-msgstr "�起動"
+msgstr "�開始値"
 
-#: sql_help.c:442 sql_help.c:1337
+#: sql_help.c:594 sql_help.c:1595
 msgid "cache"
 msgstr "キャッシュ"
 
-#: sql_help.c:444 sql_help.c:516 sql_help.c:523 sql_help.c:526 sql_help.c:527
-#: sql_help.c:530 sql_help.c:532 sql_help.c:533 sql_help.c:534 sql_help.c:536
-#: sql_help.c:539 sql_help.c:541 sql_help.c:744 sql_help.c:747 sql_help.c:762
-#: sql_help.c:920 sql_help.c:924 sql_help.c:936 sql_help.c:937 sql_help.c:1179
-#: sql_help.c:1339 sql_help.c:1470 sql_help.c:2120 sql_help.c:2121
-#: sql_help.c:2159 sql_help.c:2349 sql_help.c:2350 sql_help.c:2720
-#: sql_help.c:2722 sql_help.c:2739 sql_help.c:2742
-msgid "column"
-msgstr "カラム"
-
-#: sql_help.c:460 sql_help.c:464 sql_help.c:729 sql_help.c:1349
-#: sql_help.c:1680 sql_help.c:1907 sql_help.c:1989 sql_help.c:2131
-#: sql_help.c:2360
+#: sql_help.c:612 sql_help.c:616 sql_help.c:937 sql_help.c:1342
+#: sql_help.c:1607 sql_help.c:1956 sql_help.c:2209 sql_help.c:2291
+#: sql_help.c:2443 sql_help.c:2697
 msgid "server_name"
 msgstr "サー�ー�"
 
-#: sql_help.c:461
-msgid "new_version"
-msgstr "新���ージョン"
+#: sql_help.c:686 sql_help.c:691 sql_help.c:878 sql_help.c:882 sql_help.c:1291
+#: sql_help.c:1341 sql_help.c:1490 sql_help.c:1678 sql_help.c:1885
+#: sql_help.c:2558
+msgid "data_type"
+msgstr "データ型"
 
-#: sql_help.c:517
-msgid "new_column"
-msgstr "新��カラム"
+#: sql_help.c:687 sql_help.c:692 sql_help.c:879 sql_help.c:883 sql_help.c:1292
+#: sql_help.c:1436 sql_help.c:1679 sql_help.c:1886
+msgid "collation"
+msgstr "照�順�"
 
-#: sql_help.c:525 sql_help.c:1421 sql_help.c:1433
+#: sql_help.c:688 sql_help.c:1680 sql_help.c:1691
 msgid "column_constraint"
 msgstr "カラム制約"
 
-#: sql_help.c:535
+#: sql_help.c:699
 msgid "integer"
 msgstr "æ•´æ•°"
 
-#: sql_help.c:537 sql_help.c:540
+#: sql_help.c:701 sql_help.c:704
 msgid "attribute_option"
 msgstr "属性オプション"
 
-#: sql_help.c:542 sql_help.c:1422 sql_help.c:1434
+#: sql_help.c:706 sql_help.c:1681 sql_help.c:1692
 msgid "table_constraint"
 msgstr "テーブル制約"
 
-#: sql_help.c:544 sql_help.c:545 sql_help.c:546 sql_help.c:547 sql_help.c:874
+#: sql_help.c:707
+msgid "table_constraint_using_index"
+msgstr "インデックスを使用�るテーブル制約"
+
+#: sql_help.c:710 sql_help.c:711 sql_help.c:712 sql_help.c:713 sql_help.c:1093
 msgid "trigger_name"
 msgstr "トリガー�"
 
-#: sql_help.c:548 sql_help.c:549 sql_help.c:550 sql_help.c:551
+#: sql_help.c:714 sql_help.c:715 sql_help.c:716 sql_help.c:717
 msgid "rewrite_rule_name"
 msgstr "書���ルール�"
 
-#: sql_help.c:552 sql_help.c:801
+#: sql_help.c:718 sql_help.c:729 sql_help.c:1010
 msgid "index_name"
 msgstr "インデックス�"
 
-#: sql_help.c:556 sql_help.c:557 sql_help.c:1423 sql_help.c:1425
+#: sql_help.c:722 sql_help.c:723 sql_help.c:1682 sql_help.c:1684
 msgid "parent_table"
 msgstr "親テーブル"
 
-#: sql_help.c:575 sql_help.c:578
+#: sql_help.c:724 sql_help.c:1689
+msgid "type_name"
+msgstr "型�"
+
+#: sql_help.c:727
+msgid "and table_constraint_using_index is:"
+msgstr "��インデックスを使用�るテーブル�制約�件�以下�通り:"
+
+#: sql_help.c:745 sql_help.c:748
 msgid "tablespace_option"
 msgstr "テーブルスペース・オプション"
 
-#: sql_help.c:598 sql_help.c:601 sql_help.c:607 sql_help.c:611
+#: sql_help.c:769 sql_help.c:772 sql_help.c:778 sql_help.c:782
 msgid "token_type"
 msgstr "トークン�型"
 
-#: sql_help.c:599 sql_help.c:602
+#: sql_help.c:770 sql_help.c:773
 msgid "dictionary_name"
 msgstr "辞書�"
 
-#: sql_help.c:604 sql_help.c:608
+#: sql_help.c:775 sql_help.c:779
 msgid "old_dictionary"
 msgstr "元�辞書"
 
-#: sql_help.c:605 sql_help.c:609
+#: sql_help.c:776 sql_help.c:780
 msgid "new_dictionary"
 msgstr "新��辞書"
 
-#: sql_help.c:775 sql_help.c:2582 sql_help.c:2583 sql_help.c:2606
+#: sql_help.c:867 sql_help.c:877 sql_help.c:880 sql_help.c:881 sql_help.c:1884
+msgid "attribute_name"
+msgstr "属性�"
+
+#: sql_help.c:868
+msgid "new_attribute_name"
+msgstr "新��属性�"
+
+#: sql_help.c:874
+msgid "new_enum_value"
+msgstr "新��列挙値"
+
+#: sql_help.c:875
+msgid "existing_enum_value"
+msgstr "既存�列挙値"
+
+#: sql_help.c:984 sql_help.c:2962 sql_help.c:2963 sql_help.c:2987
 msgid "transaction_mode"
 msgstr "トランザクション�モード"
 
-#: sql_help.c:776 sql_help.c:2584 sql_help.c:2607
+#: sql_help.c:985 sql_help.c:2964 sql_help.c:2988
 msgid "where transaction_mode is one of:"
 msgstr "トランザクション�モード�以下���れ�："
 
-#: sql_help.c:800 sql_help.c:839 sql_help.c:846 sql_help.c:866 sql_help.c:875
-#: sql_help.c:919 sql_help.c:923 sql_help.c:1017 sql_help.c:1417
-#: sql_help.c:1429 sql_help.c:1486 sql_help.c:2117 sql_help.c:2122
-#: sql_help.c:2346 sql_help.c:2351 sql_help.c:2460 sql_help.c:2462
-#: sql_help.c:2488 sql_help.c:2528 sql_help.c:2659 sql_help.c:2661
-#: sql_help.c:2687 sql_help.c:2811 sql_help.c:2813 sql_help.c:2839
+#: sql_help.c:1009 sql_help.c:1060 sql_help.c:1083 sql_help.c:1094
+#: sql_help.c:1139 sql_help.c:1143 sql_help.c:1339 sql_help.c:1676
+#: sql_help.c:1688 sql_help.c:1745 sql_help.c:2429 sql_help.c:2434
+#: sql_help.c:2683 sql_help.c:2688 sql_help.c:2769 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2868 sql_help.c:2907 sql_help.c:3040
+#: sql_help.c:3042 sql_help.c:3071 sql_help.c:3196 sql_help.c:3198
+#: sql_help.c:3227
 msgid "table_name"
 msgstr "テーブル�"
 
-#: sql_help.c:838 sql_help.c:847 sql_help.c:848 sql_help.c:849 sql_help.c:854
-#: sql_help.c:859 sql_help.c:861 sql_help.c:863 sql_help.c:864 sql_help.c:867
-#: sql_help.c:868 sql_help.c:869 sql_help.c:870 sql_help.c:871 sql_help.c:872
-#: sql_help.c:873 sql_help.c:876 sql_help.c:877
-msgid "object_name"
-msgstr "オブジェクト�"
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "拡張�"
 
-#: sql_help.c:840 sql_help.c:1118 sql_help.c:1418 sql_help.c:1431
-#: sql_help.c:1450 sql_help.c:1452 sql_help.c:1459 sql_help.c:1487
-#: sql_help.c:1692 sql_help.c:2486 sql_help.c:2685 sql_help.c:2837
+#: sql_help.c:1058 sql_help.c:1340 sql_help.c:1373 sql_help.c:1677
+#: sql_help.c:1690 sql_help.c:1709 sql_help.c:1711 sql_help.c:1718
+#: sql_help.c:1746 sql_help.c:1848 sql_help.c:1968 sql_help.c:2770
+#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
 msgid "column_name"
 msgstr "カラム�"
 
-#: sql_help.c:841
-msgid "agg_name"
-msgstr "集約関数�"
-
-#: sql_help.c:842
-msgid "agg_type"
-msgstr "集約関数�型"
-
-#: sql_help.c:843 sql_help.c:993 sql_help.c:997 sql_help.c:999 sql_help.c:1761
-msgid "source_type"
-msgstr "ソース�型"
-
-#: sql_help.c:844 sql_help.c:994 sql_help.c:998 sql_help.c:1000
-#: sql_help.c:1762
-msgid "target_type"
-msgstr "ターゲット�型"
-
-#: sql_help.c:865
+#: sql_help.c:1082
 msgid "rule_name"
 msgstr "ロール�"
 
-#: sql_help.c:878
+#: sql_help.c:1097
 msgid "text"
 msgstr "テキスト"
 
-#: sql_help.c:893 sql_help.c:2230 sql_help.c:2392
+#: sql_help.c:1112 sql_help.c:2567 sql_help.c:2729
 msgid "transaction_id"
 msgstr "トランザクション ID"
 
-#: sql_help.c:921 sql_help.c:926 sql_help.c:2179
+#: sql_help.c:1141 sql_help.c:1146 sql_help.c:2493
 msgid "filename"
 msgstr "ファイル�"
 
-#: sql_help.c:925 sql_help.c:1491 sql_help.c:1693 sql_help.c:1711
-#: sql_help.c:2161
+#: sql_help.c:1145 sql_help.c:1750 sql_help.c:1969 sql_help.c:1987
+#: sql_help.c:2475
 msgid "query"
 msgstr "クエリー"
 
-#: sql_help.c:928
+#: sql_help.c:1148 sql_help.c:2335
 msgid "where option can be one of:"
 msgstr "オプション�以下���れ�："
 
-#: sql_help.c:929
+#: sql_help.c:1149
 msgid "format_name"
 msgstr "フォーマット�"
 
-#: sql_help.c:930 sql_help.c:933 sql_help.c:2022 sql_help.c:2023
-#: sql_help.c:2024 sql_help.c:2025
+#: sql_help.c:1150 sql_help.c:1153 sql_help.c:2336 sql_help.c:2337
+#: sql_help.c:2338 sql_help.c:2339
 msgid "boolean"
 msgstr "ブール値"
 
-#: sql_help.c:931
+#: sql_help.c:1151
 msgid "delimiter_character"
 msgstr "区切り文字"
 
-#: sql_help.c:932
+#: sql_help.c:1152
 msgid "null_string"
 msgstr "null文字列"
 
-#: sql_help.c:934
+#: sql_help.c:1154
 msgid "quote_character"
 msgstr "引用符文字"
 
-#: sql_help.c:935
+#: sql_help.c:1155
 msgid "escape_character"
 msgstr "エスケープ文字"
 
-#: sql_help.c:963
+#: sql_help.c:1158
+msgid "encoding_name"
+msgstr "エンコーディング�"
+
+#: sql_help.c:1184
 msgid "input_data_type"
 msgstr "入力データ�型"
 
-#: sql_help.c:964 sql_help.c:971
+#: sql_help.c:1185 sql_help.c:1193
 msgid "sfunc"
 msgstr "状態�移関数"
 
-#: sql_help.c:965 sql_help.c:972
+#: sql_help.c:1186 sql_help.c:1194
 msgid "state_data_type"
 msgstr "状態データ�型"
 
-#: sql_help.c:966 sql_help.c:973
+#: sql_help.c:1187 sql_help.c:1195
 msgid "ffunc"
 msgstr "終了関数"
 
-#: sql_help.c:967 sql_help.c:974
+#: sql_help.c:1188 sql_help.c:1196
 msgid "initial_condition"
 msgstr "�期�件"
 
-#: sql_help.c:968 sql_help.c:975
+#: sql_help.c:1189 sql_help.c:1197
 msgid "sort_operator"
 msgstr "ソート演算�"
 
-#: sql_help.c:970
+#: sql_help.c:1190
+msgid "or the old syntax"
+msgstr "�����構文"
+
+#: sql_help.c:1192
 msgid "base_type"
 msgstr "基本�型"
 
-#: sql_help.c:1016 sql_help.c:1303 sql_help.c:1572
-msgid "event"
-msgstr "イベント"
+#: sql_help.c:1236
+msgid "locale"
+msgstr "ロケール"
 
-#: sql_help.c:1018
-msgid "referenced_table_name"
-msgstr "��照テーブル�"
+#: sql_help.c:1237 sql_help.c:1271
+msgid "lc_collate"
+msgstr "照�順�"
 
-#: sql_help.c:1019 sql_help.c:1305 sql_help.c:1574 sql_help.c:1725
-#: sql_help.c:2449 sql_help.c:2451 sql_help.c:2517 sql_help.c:2519
-#: sql_help.c:2648 sql_help.c:2650 sql_help.c:2725 sql_help.c:2800
-#: sql_help.c:2802
-msgid "condition"
-msgstr "�件"
+#: sql_help.c:1238 sql_help.c:1272
+msgid "lc_ctype"
+msgstr "Ctype(変�演算�)"
 
-#: sql_help.c:1021 sql_help.c:1576
-msgid "arguments"
-msgstr "引数"
+#: sql_help.c:1240
+msgid "existing_collation"
+msgstr "既存�照�順�"
 
-#: sql_help.c:1031
+#: sql_help.c:1250
 msgid "source_encoding"
 msgstr "変�元�エンコーディング"
 
-#: sql_help.c:1032
+#: sql_help.c:1251
 msgid "dest_encoding"
 msgstr "変�先�エンコーディング"
 
-#: sql_help.c:1050 sql_help.c:1526
+#: sql_help.c:1269 sql_help.c:1785
 msgid "template"
 msgstr "テンプレート"
 
-#: sql_help.c:1051
+#: sql_help.c:1270
 msgid "encoding"
 msgstr "エンコーディング"
 
-#: sql_help.c:1052
-msgid "lc_collate"
-msgstr "照�順�"
-
-#: sql_help.c:1053
-msgid "lc_ctype"
-msgstr "Ctype(変�演算�)"
-
-#: sql_help.c:1054 sql_help.c:1184 sql_help.c:1428 sql_help.c:1437
-#: sql_help.c:1468 sql_help.c:1490
+#: sql_help.c:1273 sql_help.c:1440 sql_help.c:1687 sql_help.c:1695
+#: sql_help.c:1727 sql_help.c:1749
 msgid "tablespace"
 msgstr "テーブルスペース"
 
-#: sql_help.c:1071 sql_help.c:1234 sql_help.c:1419 sql_help.c:1612
-#: sql_help.c:2221
-msgid "data_type"
-msgstr "データ型"
-
-#: sql_help.c:1073
+#: sql_help.c:1294
 msgid "constraint"
 msgstr "制約"
 
-#: sql_help.c:1074
+#: sql_help.c:1295
 msgid "where constraint is:"
 msgstr "制約�件："
 
-#: sql_help.c:1116 sql_help.c:1420 sql_help.c:1432
+#: sql_help.c:1309
+msgid "schema"
+msgstr "スキーマ"
+
+#: sql_help.c:1310
+msgid "version"
+msgstr "�ージョン"
+
+#: sql_help.c:1311
+msgid "old_version"
+msgstr "���ージョン"
+
+#: sql_help.c:1371 sql_help.c:1699
 msgid "default_expr"
 msgstr "デフォルト�評価�"
 
-#: sql_help.c:1117
+#: sql_help.c:1372
 msgid "rettype"
 msgstr "戻り値�型"
 
-#: sql_help.c:1119
+#: sql_help.c:1374
 msgid "column_type"
 msgstr "カラム�型"
 
-#: sql_help.c:1120 sql_help.c:1743 sql_help.c:2139 sql_help.c:2368
+#: sql_help.c:1375 sql_help.c:2021 sql_help.c:2451 sql_help.c:2705
 msgid "lang_name"
 msgstr "言語"
 
-#: sql_help.c:1126
+#: sql_help.c:1381
 msgid "definition"
 msgstr "定義"
 
-#: sql_help.c:1127
+#: sql_help.c:1382
 msgid "obj_file"
 msgstr "オブジェクトファイル�"
 
-#: sql_help.c:1128
+#: sql_help.c:1383
 msgid "link_symbol"
 msgstr "リンクシンボル"
 
-#: sql_help.c:1129
+#: sql_help.c:1384
 msgid "attribute"
 msgstr "属性"
 
-#: sql_help.c:1164 sql_help.c:1292 sql_help.c:1669
+#: sql_help.c:1419 sql_help.c:1550 sql_help.c:1945
 msgid "uid"
 msgstr "ユーザーID"
 
-#: sql_help.c:1178
+#: sql_help.c:1433
 msgid "method"
 msgstr "メソッド"
 
-#: sql_help.c:1181 sql_help.c:1472
+#: sql_help.c:1437 sql_help.c:1731
 msgid "opclass"
 msgstr "演算�クラス"
 
-#: sql_help.c:1185 sql_help.c:1458
+#: sql_help.c:1441 sql_help.c:1717
 msgid "predicate"
 msgstr "述語"
 
-#: sql_help.c:1197
+#: sql_help.c:1453
 msgid "call_handler"
 msgstr "呼�出��ンドラー"
 
-#: sql_help.c:1198
+#: sql_help.c:1454
 msgid "inline_handler"
 msgstr "インライン�ンドラー"
 
-#: sql_help.c:1217
+#: sql_help.c:1455
+msgid "valfunction"
+msgstr "�リデータ関数"
+
+#: sql_help.c:1473
 msgid "com_op"
 msgstr "交�用演算�"
 
-#: sql_help.c:1218
+#: sql_help.c:1474
 msgid "neg_op"
 msgstr "�定用演算�"
 
-#: sql_help.c:1219
+#: sql_help.c:1475
 msgid "res_proc"
 msgstr "制約手続�"
 
-#: sql_help.c:1220
+#: sql_help.c:1476
 msgid "join_proc"
 msgstr "JOIN手続�"
 
-#: sql_help.c:1236
+#: sql_help.c:1492
 msgid "family_name"
 msgstr "ファミリー�"
 
-#: sql_help.c:1246
+#: sql_help.c:1503
 msgid "storage_type"
 msgstr "ストレージ�型"
 
-#: sql_help.c:1306 sql_help.c:1307 sql_help.c:1308
+#: sql_help.c:1561 sql_help.c:1841
+msgid "event"
+msgstr "イベント"
+
+#: sql_help.c:1563 sql_help.c:1844 sql_help.c:2003 sql_help.c:2826
+#: sql_help.c:2828 sql_help.c:2896 sql_help.c:2898 sql_help.c:3029
+#: sql_help.c:3031 sql_help.c:3110 sql_help.c:3185 sql_help.c:3187
+msgid "condition"
+msgstr "�件"
+
+#: sql_help.c:1564 sql_help.c:1565 sql_help.c:1566
 msgid "command"
 msgstr "コマンド"
 
-#: sql_help.c:1319 sql_help.c:1321
+#: sql_help.c:1577 sql_help.c:1579
 msgid "schema_element"
 msgstr "スキーマ�素"
 
-#: sql_help.c:1350
+#: sql_help.c:1608
 msgid "server_type"
 msgstr "サー�ー�タイプ"
 
-#: sql_help.c:1351
+#: sql_help.c:1609
 msgid "server_version"
 msgstr "サー�ー��ージョン"
 
-#: sql_help.c:1352 sql_help.c:2129 sql_help.c:2358
+#: sql_help.c:1610 sql_help.c:2441 sql_help.c:2695
 msgid "fdw_name"
 msgstr "外部データラッパー"
 
-#: sql_help.c:1424
+#: sql_help.c:1683
 msgid "like_option"
 msgstr "LIKE オプション:"
 
-#: sql_help.c:1430
-msgid "type_name"
-msgstr "型�"
-
-#: sql_help.c:1438
+#: sql_help.c:1696
 msgid "where column_constraint is:"
-msgstr "カラム�制約�件："
+msgstr "カラム制約："
 
-#: sql_help.c:1441 sql_help.c:1442 sql_help.c:1451 sql_help.c:1453
-#: sql_help.c:1457
+#: sql_help.c:1700 sql_help.c:1701 sql_help.c:1710 sql_help.c:1712
+#: sql_help.c:1716
 msgid "index_parameters"
 msgstr "インデックス�パラメーター"
 
-#: sql_help.c:1443 sql_help.c:1460
+#: sql_help.c:1702 sql_help.c:1719
 msgid "reftable"
 msgstr "�照テーブル"
 
-#: sql_help.c:1444 sql_help.c:1461
+#: sql_help.c:1703 sql_help.c:1720
 msgid "refcolumn"
 msgstr "�照カラム"
 
-#: sql_help.c:1447
+#: sql_help.c:1706
 msgid "and table_constraint is:"
-msgstr "テーブル�制約�件"
+msgstr "テーブル制約:"
 
-#: sql_help.c:1455
+#: sql_help.c:1714
 msgid "exclude_element"
 msgstr "排他�素"
 
-#: sql_help.c:1464
+#: sql_help.c:1723
 msgid "and like_option is:"
-msgstr "LIKE オプション�："
+msgstr "LIKE オプション："
 
-#: sql_help.c:1465
+#: sql_help.c:1724
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr ""
 "UNIQUE, PRIMARY KEY, EXCLUDE ���るインデックスパラメーター�制約�件："
 
-#: sql_help.c:1469
+#: sql_help.c:1728
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "EXCLUDE ���る排他�素�制約�件："
 
-#: sql_help.c:1501
+#: sql_help.c:1760
 msgid "directory"
 msgstr "ディレクトリー"
 
-#: sql_help.c:1513
+#: sql_help.c:1772
 msgid "parser_name"
 msgstr "パーサー�"
 
-#: sql_help.c:1514
+#: sql_help.c:1773
 msgid "source_config"
 msgstr "ソース設定"
 
-#: sql_help.c:1543
+#: sql_help.c:1802
 msgid "start_function"
 msgstr "開始関数"
 
-#: sql_help.c:1544
+#: sql_help.c:1803
 msgid "gettoken_function"
 msgstr "トークン�得用関数"
 
-#: sql_help.c:1545
+#: sql_help.c:1804
 msgid "end_function"
 msgstr "終了関数"
 
-#: sql_help.c:1546
+#: sql_help.c:1805
 msgid "lextypes_function"
 msgstr "LEX 型�関数"
 
-#: sql_help.c:1547
+#: sql_help.c:1806
 msgid "headline_function"
 msgstr "見出�関数"
 
-#: sql_help.c:1559
+#: sql_help.c:1818
 msgid "init_function"
 msgstr "�期処�関数"
 
-#: sql_help.c:1560
+#: sql_help.c:1819
 msgid "lexize_function"
 msgstr "LEX 処�関数"
 
-#: sql_help.c:1611
-msgid "attribute_name"
-msgstr "属性�"
+#: sql_help.c:1843
+msgid "referenced_table_name"
+msgstr "��照テーブル�"
 
-#: sql_help.c:1614
+#: sql_help.c:1846
+msgid "arguments"
+msgstr "引数"
+
+#: sql_help.c:1847
+msgid "where event can be one of:"
+msgstr "イベント�以下���れ�："
+
+#: sql_help.c:1888 sql_help.c:2785
 msgid "label"
 msgstr "ラベル"
 
-#: sql_help.c:1616
+#: sql_help.c:1890
 msgid "input_function"
 msgstr "入力関数"
 
-#: sql_help.c:1617
+#: sql_help.c:1891
 msgid "output_function"
 msgstr "出力関数"
 
-#: sql_help.c:1618
+#: sql_help.c:1892
 msgid "receive_function"
 msgstr "�信関数"
 
-#: sql_help.c:1619
+#: sql_help.c:1893
 msgid "send_function"
 msgstr "�信関数"
 
-#: sql_help.c:1620
+#: sql_help.c:1894
 msgid "type_modifier_input_function"
 msgstr "型修飾��入力関数"
 
-#: sql_help.c:1621
+#: sql_help.c:1895
 msgid "type_modifier_output_function"
 msgstr "型修飾��出力関数"
 
-#: sql_help.c:1622
+#: sql_help.c:1896
 msgid "analyze_function"
 msgstr "分�関数"
 
-#: sql_help.c:1623
+#: sql_help.c:1897
 msgid "internallength"
 msgstr "内部長"
 
-#: sql_help.c:1624
+#: sql_help.c:1898
 msgid "alignment"
 msgstr "アラインメント"
 
-#: sql_help.c:1625
+#: sql_help.c:1899
 msgid "storage"
 msgstr "ストレージ"
 
-#: sql_help.c:1626
+#: sql_help.c:1900
 msgid "like_type"
 msgstr "LIKE�型"
 
-#: sql_help.c:1627
+#: sql_help.c:1901
 msgid "category"
 msgstr "カテゴリー"
 
-#: sql_help.c:1628
+#: sql_help.c:1902
 msgid "preferred"
 msgstr "推奨"
 
-#: sql_help.c:1629
+#: sql_help.c:1903
 msgid "default"
 msgstr "デフォルト"
 
-#: sql_help.c:1630
+#: sql_help.c:1904
 msgid "element"
 msgstr "�素"
 
-#: sql_help.c:1631
+#: sql_help.c:1905
 msgid "delimiter"
 msgstr "デリミタ"
 
-#: sql_help.c:1723 sql_help.c:2463 sql_help.c:2466 sql_help.c:2469
-#: sql_help.c:2473 sql_help.c:2662 sql_help.c:2665 sql_help.c:2668
-#: sql_help.c:2672 sql_help.c:2719 sql_help.c:2814 sql_help.c:2817
-#: sql_help.c:2820 sql_help.c:2824
+#: sql_help.c:1906
+msgid "collatable"
+msgstr "照�順�"
+
+#: sql_help.c:1999 sql_help.c:2471 sql_help.c:2821 sql_help.c:2890
+#: sql_help.c:3024 sql_help.c:3102 sql_help.c:3180
+msgid "with_query"
+msgstr "WITH クエリー"
+
+#: sql_help.c:2001 sql_help.c:2840 sql_help.c:2843 sql_help.c:2846
+#: sql_help.c:2850 sql_help.c:3043 sql_help.c:3046 sql_help.c:3049
+#: sql_help.c:3053 sql_help.c:3104 sql_help.c:3199 sql_help.c:3202
+#: sql_help.c:3205 sql_help.c:3209
 msgid "alias"
 msgstr "別�"
 
-#: sql_help.c:1724
+#: sql_help.c:2002
 msgid "using_list"
 msgstr "USING リスト"
 
-#: sql_help.c:1726 sql_help.c:2053 sql_help.c:2203 sql_help.c:2726
+#: sql_help.c:2004 sql_help.c:2365 sql_help.c:2534 sql_help.c:3111
 msgid "cursor_name"
 msgstr "カーソル�"
 
-#: sql_help.c:1727 sql_help.c:2162 sql_help.c:2727
+#: sql_help.c:2005 sql_help.c:2476 sql_help.c:3112
 msgid "output_expression"
 msgstr "出力表�"
 
-#: sql_help.c:1728 sql_help.c:2163 sql_help.c:2447 sql_help.c:2514
-#: sql_help.c:2646 sql_help.c:2728 sql_help.c:2798
+#: sql_help.c:2006 sql_help.c:2477 sql_help.c:2824 sql_help.c:2893
+#: sql_help.c:3027 sql_help.c:3113 sql_help.c:3183
 msgid "output_name"
 msgstr "出力�"
 
-#: sql_help.c:1744
+#: sql_help.c:2022
 msgid "code"
 msgstr "コード"
 
-#: sql_help.c:2013
+#: sql_help.c:2315
 msgid "parameter"
 msgstr "パラメータ"
 
-#: sql_help.c:2026 sql_help.c:2027 sql_help.c:2222
+#: sql_help.c:2333 sql_help.c:2334 sql_help.c:2559
 msgid "statement"
 msgstr "ステートメント"
 
-#: sql_help.c:2052 sql_help.c:2202
+#: sql_help.c:2364 sql_help.c:2533
 msgid "direction"
 msgstr "方�"
 
-#: sql_help.c:2054
+#: sql_help.c:2366 sql_help.c:2535
 msgid "where direction can be empty or one of:"
 msgstr "方��無指定も���以下���れ�："
 
-#: sql_help.c:2055 sql_help.c:2056 sql_help.c:2057 sql_help.c:2058
-#: sql_help.c:2059 sql_help.c:2457 sql_help.c:2459 sql_help.c:2525
-#: sql_help.c:2527 sql_help.c:2656 sql_help.c:2658 sql_help.c:2757
-#: sql_help.c:2759 sql_help.c:2808 sql_help.c:2810
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2371 sql_help.c:2536 sql_help.c:2537 sql_help.c:2538
+#: sql_help.c:2539 sql_help.c:2540 sql_help.c:2834 sql_help.c:2836
+#: sql_help.c:2904 sql_help.c:2906 sql_help.c:3037 sql_help.c:3039
+#: sql_help.c:3142 sql_help.c:3144 sql_help.c:3193 sql_help.c:3195
 msgid "count"
 msgstr "カウント"
 
-#: sql_help.c:2124 sql_help.c:2353
+#: sql_help.c:2436 sql_help.c:2690
 msgid "sequence_name"
 msgstr "シーケンス�"
 
-#: sql_help.c:2135 sql_help.c:2364
+#: sql_help.c:2447 sql_help.c:2701
 msgid "arg_name"
 msgstr "引数�"
 
-#: sql_help.c:2136 sql_help.c:2365
+#: sql_help.c:2448 sql_help.c:2702
 msgid "arg_type"
 msgstr "引数�型"
 
-#: sql_help.c:2141 sql_help.c:2370
+#: sql_help.c:2453 sql_help.c:2707
 msgid "loid"
 msgstr "ラージオブジェクトid"
 
-#: sql_help.c:2171 sql_help.c:2211 sql_help.c:2705
+#: sql_help.c:2485 sql_help.c:2548 sql_help.c:3088
 msgid "channel"
 msgstr "�ャ�ル"
 
-#: sql_help.c:2193
+#: sql_help.c:2507
 msgid "lockmode"
 msgstr "ロックモード"
 
-#: sql_help.c:2194
+#: sql_help.c:2508
 msgid "where lockmode is one of:"
 msgstr "ロックモード�以下���れ�："
 
-#: sql_help.c:2212
+#: sql_help.c:2549
 msgid "payload"
 msgstr "ペイロード"
 
-#: sql_help.c:2238
+#: sql_help.c:2575
 msgid "old_role"
 msgstr "元�ロール"
 
-#: sql_help.c:2239
+#: sql_help.c:2576
 msgid "new_role"
 msgstr "新��ロール"
 
-#: sql_help.c:2255 sql_help.c:2400 sql_help.c:2408
+#: sql_help.c:2592 sql_help.c:2737 sql_help.c:2745
 msgid "savepoint_name"
 msgstr "セーブ�イント�"
 
-#: sql_help.c:2444 sql_help.c:2511 sql_help.c:2643 sql_help.c:2795
-msgid "with_query"
-msgstr "WITH クエリー"
+#: sql_help.c:2767
+msgid "provider"
+msgstr "プロ�イダ"
 
-#: sql_help.c:2448 sql_help.c:2479 sql_help.c:2481 sql_help.c:2516
-#: sql_help.c:2647 sql_help.c:2678 sql_help.c:2680 sql_help.c:2799
-#: sql_help.c:2830 sql_help.c:2832
+#: sql_help.c:2825 sql_help.c:2856 sql_help.c:2858 sql_help.c:2895
+#: sql_help.c:3028 sql_help.c:3059 sql_help.c:3061 sql_help.c:3184
+#: sql_help.c:3215 sql_help.c:3217
 msgid "from_item"
 msgstr "FROM é …ç›®"
 
-#: sql_help.c:2452 sql_help.c:2520 sql_help.c:2651 sql_help.c:2803
+#: sql_help.c:2829 sql_help.c:2899 sql_help.c:3032 sql_help.c:3188
 msgid "window_name"
 msgstr "ウィンドウ�"
 
-#: sql_help.c:2453 sql_help.c:2521 sql_help.c:2652 sql_help.c:2804
+#: sql_help.c:2830 sql_help.c:2900 sql_help.c:3033 sql_help.c:3189
 msgid "window_definition"
 msgstr "ウィンドウ定義"
 
-#: sql_help.c:2454 sql_help.c:2465 sql_help.c:2487 sql_help.c:2522
-#: sql_help.c:2653 sql_help.c:2664 sql_help.c:2686 sql_help.c:2805
-#: sql_help.c:2816 sql_help.c:2838
+#: sql_help.c:2831 sql_help.c:2842 sql_help.c:2864 sql_help.c:2901
+#: sql_help.c:3034 sql_help.c:3045 sql_help.c:3067 sql_help.c:3190
+#: sql_help.c:3201 sql_help.c:3223
 msgid "select"
 msgstr "SELECT �"
 
-#: sql_help.c:2461 sql_help.c:2660 sql_help.c:2812
+#: sql_help.c:2838 sql_help.c:3041 sql_help.c:3197
 msgid "where from_item can be one of:"
 msgstr "FROM 項目�以下���れ�："
 
-#: sql_help.c:2464 sql_help.c:2467 sql_help.c:2470 sql_help.c:2474
-#: sql_help.c:2663 sql_help.c:2666 sql_help.c:2669 sql_help.c:2673
-#: sql_help.c:2815 sql_help.c:2818 sql_help.c:2821 sql_help.c:2825
+#: sql_help.c:2841 sql_help.c:2844 sql_help.c:2847 sql_help.c:2851
+#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3050 sql_help.c:3054
+#: sql_help.c:3200 sql_help.c:3203 sql_help.c:3206 sql_help.c:3210
 msgid "column_alias"
 msgstr "カラム�別�"
 
-#: sql_help.c:2468 sql_help.c:2485 sql_help.c:2489 sql_help.c:2667
-#: sql_help.c:2684 sql_help.c:2688 sql_help.c:2819 sql_help.c:2836
-#: sql_help.c:2840
+#: sql_help.c:2845 sql_help.c:2862 sql_help.c:3048 sql_help.c:3065
+#: sql_help.c:3204 sql_help.c:3221
 msgid "with_query_name"
 msgstr "WITH クエリー�"
 
-#: sql_help.c:2472 sql_help.c:2477 sql_help.c:2671 sql_help.c:2676
-#: sql_help.c:2823 sql_help.c:2828
+#: sql_help.c:2849 sql_help.c:2854 sql_help.c:3052 sql_help.c:3057
+#: sql_help.c:3208 sql_help.c:3213
 msgid "argument"
 msgstr "引数"
 
-#: sql_help.c:2475 sql_help.c:2478 sql_help.c:2674 sql_help.c:2677
-#: sql_help.c:2826 sql_help.c:2829
+#: sql_help.c:2852 sql_help.c:2855 sql_help.c:3055 sql_help.c:3058
+#: sql_help.c:3211 sql_help.c:3214
 msgid "column_definition"
 msgstr "カラム定義"
 
-#: sql_help.c:2480 sql_help.c:2679 sql_help.c:2831
+#: sql_help.c:2857 sql_help.c:3060 sql_help.c:3216
 msgid "join_type"
 msgstr "JOIN タイプ"
 
-#: sql_help.c:2482 sql_help.c:2681 sql_help.c:2833
+#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
 msgid "join_condition"
 msgstr "JOIN �件"
 
-#: sql_help.c:2483 sql_help.c:2682 sql_help.c:2834
+#: sql_help.c:2860 sql_help.c:3063 sql_help.c:3219
 msgid "join_column"
 msgstr "JOIN カラム"
 
-#: sql_help.c:2484 sql_help.c:2683 sql_help.c:2835
+#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
 msgid "and with_query is:"
 msgstr "WITH クエリー："
 
-#: sql_help.c:2515
+#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
+msgid "insert"
+msgstr "INSERT�"
+
+#: sql_help.c:2866 sql_help.c:3069 sql_help.c:3225
+msgid "update"
+msgstr "UPDATE�"
+
+#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
+msgid "delete"
+msgstr "DELETE�"
+
+#: sql_help.c:2894
 msgid "new_table"
 msgstr "新��テーブル"
 
-#: sql_help.c:2540
+#: sql_help.c:2919
 msgid "timezone"
 msgstr "タイムゾーン"
 
-#: sql_help.c:2724
+#: sql_help.c:3109
 msgid "from_list"
 msgstr "FROM リスト"
 
-#: sql_help.c:2755
+#: sql_help.c:3140
 msgid "sort_expression"
 msgstr "ソート表�"
 
@@ -3725,27 +4059,42 @@ msgstr "ディレクトリを \"%s\" �変更����ん���。"
 msgid "could not read symbolic link \"%s\""
 msgstr "シンボリックリンク \"%s\" を読�込���ん���。"
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "�プロセス�終了コード %d �終了����。"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "�プロセス�例外 0x%X �終了��られ���。"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "�プロセス�シグナル %s �終了��られ���。"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "�プロセス�シグナル %d �終了��られ���。"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "�プロセス��識����ステータス %d �より終了����。"
+
+#~ msgid "out of memory"
+#~ msgstr "メモリ�足��"
+
+#~ msgid " on host \"%s\""
+#~ msgstr "ホスト：\"%s\""
+
+#~ msgid " at port \"%s\""
+#~ msgstr "�ート番�：\"%s\""
+
+#~ msgid " as user \"%s\""
+#~ msgstr "ユーザ�：\"%s\""
+
+#~ msgid "define a new constraint trigger"
+#~ msgstr "新��制約トリガを定義�る"
diff --git a/src/bin/psql/po/pl.po b/src/bin/psql/po/pl.po
new file mode 100644
index 0000000000000..a1f6cdf901802
--- /dev/null
+++ b/src/bin/psql/po/pl.po
@@ -0,0 +1,4114 @@
+# Polish message translation file for psql
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: psql (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-10-08 08:42+0000\n"
+"PO-Revision-Date: 2011-10-09 17:42+0200\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: command.c:113
+#, c-format
+msgid "Invalid command \\%s. Try \\? for help.\n"
+msgstr "Niepoprawne polecenie \\%s. Spróbuj \\? by uzyskać pomoc.\n"
+
+#: command.c:115
+#, c-format
+msgid "invalid command \\%s\n"
+msgstr "niepoprawne polecenie \\%s\n"
+
+#: command.c:126
+#, c-format
+msgid "\\%s: extra argument \"%s\" ignored\n"
+msgstr "\\%s: nadmiarowy argument \"%s\" zignorowany\n"
+
+#: command.c:268
+#, c-format
+msgid "could not get home directory: %s\n"
+msgstr "nie można pobrać folderu domowego: %s\n"
+
+#: command.c:284
+#, c-format
+msgid "\\%s: could not change directory to \"%s\": %s\n"
+msgstr "\\%s: nie można zmienić katalogu na \"%s\": %s\n"
+
+#: command.c:305 common.c:493 common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "Nie jesteś obecnie połączony do bazy danych.\n"
+
+#: command.c:312
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Jesteś obecnie połączony do bazy danych \"%s\" jako użytkownik \"%s\" przez "
+"gniazdo w \"%s\" port \"%s\".\n"
+
+#: command.c:315
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
+"\"%s\".\n"
+msgstr ""
+"Jesteś obecnie połączony do bazy danych \"%s\" jako użytkownik \"%s\" na "
+"serwerze \"%s\" port \"%s\".\n"
+
+#: command.c:339 common.c:940
+#, c-format
+msgid "Time: %.3f ms\n"
+msgstr "Czas: %.3f ms\n"
+
+#: command.c:524 command.c:588 command.c:1285
+msgid "no query buffer\n"
+msgstr "brak bufora zapytania\n"
+
+#: command.c:557 command.c:2507
+#, c-format
+msgid "invalid line number: %s\n"
+msgstr "nieprawidłowy numer linii: %s\n"
+
+#: command.c:662
+msgid "No changes"
+msgstr "Bez zmian"
+
+#: command.c:716
+#, c-format
+msgid "%s: invalid encoding name or conversion procedure not found\n"
+msgstr ""
+"%s: nieprawidłowa nazwa kodowania lub nie znaleziono procedury konwersji\n"
+
+#: command.c:795 command.c:829 command.c:843 command.c:860 command.c:964
+#: command.c:1014 command.c:1265 command.c:1296
+#, c-format
+msgid "\\%s: missing required argument\n"
+msgstr "\\%s: brakujÄ…cy wymagany argument\n"
+
+#: command.c:892
+msgid "Query buffer is empty."
+msgstr "Bufor zapytania jest pusty."
+
+#: command.c:902
+msgid "Enter new password: "
+msgstr "Wprowadź nowe hasło: "
+
+#: command.c:903
+msgid "Enter it again: "
+msgstr "Powtórz podane hasło: "
+
+#: command.c:907
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "Podane hasła różnią się.\n"
+
+#: command.c:925
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "Nie udało się zaszyfrować hasła.\n"
+
+#: command.c:993 command.c:1094 command.c:1270
+#, c-format
+msgid "\\%s: error\n"
+msgstr "\\%s: błąd\n"
+
+#: command.c:1034
+msgid "Query buffer reset (cleared)."
+msgstr "Reset bufora zapytania (wyczyszczony)."
+
+#: command.c:1047
+#, c-format
+msgid "Wrote history to file \"%s/%s\".\n"
+msgstr "Zapisano historiÄ™ do pliku \"%s/%s\".\n"
+
+#: command.c:1085 common.c:52 common.c:66 common.c:90 input.c:209
+#: mainloop.c:72 mainloop.c:234 print.c:137 print.c:151
+#, c-format
+msgid "out of memory\n"
+msgstr "brak pamięci\n"
+
+#: command.c:1115
+msgid "function name is required\n"
+msgstr "wymagana jest nazwa funkcji\n"
+
+#: command.c:1250
+msgid "Timing is on."
+msgstr "Pomiar czasu włączony."
+
+#: command.c:1252
+msgid "Timing is off."
+msgstr "Pomiar czasu wyłączony."
+
+#: command.c:1313 command.c:1333 command.c:1895 command.c:1902 command.c:1911
+#: command.c:1921 command.c:1930 command.c:1944 command.c:1961 command.c:1999
+#: common.c:137 copy.c:283 copy.c:361
+#, c-format
+msgid "%s: %s\n"
+msgstr "%s: %s\n"
+
+#: command.c:1415 startup.c:159
+msgid "Password: "
+msgstr "Hasło: "
+
+#: command.c:1422 startup.c:162 startup.c:164
+#, c-format
+msgid "Password for user %s: "
+msgstr "Hasło użytkownika %s: "
+
+#: command.c:1541 command.c:2541 common.c:183 common.c:460 common.c:525
+#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:607
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: command.c:1545
+msgid "Previous connection kept\n"
+msgstr "Poprzednie połączenie zachowane\n"
+
+#: command.c:1549
+#, c-format
+msgid "\\connect: %s"
+msgstr "\\connect: %s"
+
+#: command.c:1582
+#, c-format
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+"at port \"%s\".\n"
+msgstr ""
+"Jesteś obecnie połączony do bazy danych \"%s\" jako użytkownik \"%s\" przez "
+"gniazdo na \"%s\" port \"%s\".\n"
+
+#: command.c:1585
+#, c-format
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Jesteś obecnie połączony do bazy danych \"%s\" jako użytkownik \"%s\" na "
+"serwerze \"%s\" port \"%s\".\n"
+
+#: command.c:1589
+#, c-format
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr ""
+"Jesteś obecnie połączony do bazy danych \"%s\" jako użytkownik \"%s\".\n"
+
+#: command.c:1623
+#, c-format
+msgid "%s (%s, server %s)\n"
+msgstr "%s (%s, serwer %s)\n"
+
+#: command.c:1631
+#, c-format
+msgid ""
+"WARNING: %s version %d.%d, server version %d.%d.\n"
+"         Some psql features might not work.\n"
+msgstr ""
+"OSTRZEŻENIE: %s wersja %d.%d, wersja serwera %d.%d.\n"
+"             Niektóre cechy psql mogą nie działać.\n"
+
+#: command.c:1661
+#, c-format
+msgid "SSL connection (cipher: %s, bits: %i)\n"
+msgstr "Połączenie SSL (szyfr: %s, bity: %i)\n"
+
+#: command.c:1671
+#, c-format
+msgid "SSL connection (unknown cipher)\n"
+msgstr "Połączenie SSL (nieznany szyfr)\n"
+
+#: command.c:1692
+#, c-format
+msgid ""
+"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
+"         8-bit characters might not work correctly. See psql reference\n"
+"         page \"Notes for Windows users\" for details.\n"
+msgstr ""
+"OSTRZEŻENIE: strona kodowa konsoli (%u) jest różna od kodowania Windows "
+"(%u)\n"
+"             8-bitowe znaki mogą nie wyglądać poprawnie. Przejrzyj odnośną\n"
+"             stronę \"Notes for Windows users\" by poznać szczegóły.\n"
+
+#: command.c:1776
+msgid ""
+"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
+"line number\n"
+msgstr ""
+"musi być ustawiona zmienna środowiskowa PSQL_EDITOR_LINENUMBER_ARG by "
+"wskazać numer linii\n"
+
+#: command.c:1813
+#, c-format
+msgid "could not start editor \"%s\"\n"
+msgstr "nie można uruchomić edytora \"%s\"\n"
+
+#: command.c:1815
+msgid "could not start /bin/sh\n"
+msgstr "nie można uruchomić /bin/sh\n"
+
+#: command.c:1853
+#, c-format
+msgid "could not locate temporary directory: %s\n"
+msgstr "nie można utworzyć katalogu tymczasowego: %s\n"
+
+#: command.c:1880
+#, c-format
+msgid "could not open temporary file \"%s\": %s\n"
+msgstr "nie można otworzyć pliku tymczasowego \"%s\": %s\n"
+
+#: command.c:2110
+msgid ""
+"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
+"ms\n"
+msgstr ""
+"\\pset: dostępnymi formatami są unaligned, aligned, wrapped, html, latex, "
+"troff-ms\n"
+
+#: command.c:2115
+#, c-format
+msgid "Output format is %s.\n"
+msgstr "Format wyjścia to %s.\n"
+
+#: command.c:2131
+msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
+msgstr "\\pset: dostępne style linii to ascii, old-ascii, unicode\n"
+
+#: command.c:2136
+#, c-format
+msgid "Line style is %s.\n"
+msgstr "Styl linii to %s.\n"
+
+#: command.c:2147
+#, c-format
+msgid "Border style is %d.\n"
+msgstr "Styl obramowania to %d.\n"
+
+#: command.c:2159
+#, c-format
+msgid "Expanded display is on.\n"
+msgstr "Rozszerzone wyświetlanie jest włączone.\n"
+
+#: command.c:2160
+#, c-format
+msgid "Expanded display is off.\n"
+msgstr "Rozszerzone wyświetlanie jest wyłączone.\n"
+
+#: command.c:2173
+msgid "Showing locale-adjusted numeric output."
+msgstr "Wyświetlanie dostosowanego do lokalizacji wyjścia numerycznego."
+
+#: command.c:2175
+msgid "Locale-adjusted numeric output is off."
+msgstr "Dostosowane do lokalizacji wyświetlanie liczb jest wyłączone."
+
+#: command.c:2188
+#, c-format
+msgid "Null display is \"%s\".\n"
+msgstr "Wyświetlanie Null jako \"%s\".\n"
+
+#: command.c:2200
+#, c-format
+msgid "Field separator is \"%s\".\n"
+msgstr "Separatorem pól jest \"%s\".\n"
+
+#: command.c:2214
+#, c-format
+msgid "Record separator is <newline>."
+msgstr "Separatorem rekordów jest <nowalinia>."
+
+#: command.c:2216
+#, c-format
+msgid "Record separator is \"%s\".\n"
+msgstr "Separatorem rekordów jest \"%s\".\n"
+
+#: command.c:2230
+msgid "Showing only tuples."
+msgstr "Pokazywanie tylko krotek."
+
+#: command.c:2232
+msgid "Tuples only is off."
+msgstr "Tylko krotki wyłączone."
+
+#: command.c:2248
+#, c-format
+msgid "Title is \"%s\".\n"
+msgstr "Tytuł to \"%s\".\n"
+
+#: command.c:2250
+#, c-format
+msgid "Title is unset.\n"
+msgstr "Tytuł nie jest ustawiony.\n"
+
+#: command.c:2266
+#, c-format
+msgid "Table attribute is \"%s\".\n"
+msgstr "Atrybut tabeli to \"%s\".\n"
+
+#: command.c:2268
+#, c-format
+msgid "Table attributes unset.\n"
+msgstr "Atrybuty tabeli nie sÄ… ustawione.\n"
+
+#: command.c:2289
+msgid "Pager is used for long output."
+msgstr "Stronicowanie jest używane dla długiego wyjścia."
+
+#: command.c:2291
+msgid "Pager is always used."
+msgstr "Stronicowanie zawsze używane."
+
+#: command.c:2293
+msgid "Pager usage is off."
+msgstr "Stronicowanie nigdy nie używane."
+
+#: command.c:2307
+msgid "Default footer is on."
+msgstr "Domyślna stopka jest włączona."
+
+#: command.c:2309
+msgid "Default footer is off."
+msgstr "Domyślna stopka jest wyłączona."
+
+#: command.c:2320
+#, c-format
+msgid "Target width for \"wrapped\" format is %d.\n"
+msgstr "Docelowa szerokość \"zawijanego\" formatu to %d.\n"
+
+#: command.c:2325
+#, c-format
+msgid "\\pset: unknown option: %s\n"
+msgstr "\\pset: nieznana opcja: %s\n"
+
+#: command.c:2379
+msgid "\\!: failed\n"
+msgstr "\\!: niepowodzenie\n"
+
+#: common.c:45
+#, c-format
+msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgstr ""
+"%s: pg_strdup: nie można powielić pustego wskazania (błąd wewnętrzny)\n"
+
+#: common.c:343
+msgid "connection to server was lost\n"
+msgstr "utracono połączenie z serwerem\n"
+
+#: common.c:347
+msgid "The connection to the server was lost. Attempting reset: "
+msgstr "Połączenie z serwerem zostało przerwane. Próba resetu: "
+
+#: common.c:352
+msgid "Failed.\n"
+msgstr "Nieudane.\n"
+
+#: common.c:359
+msgid "Succeeded.\n"
+msgstr "Udane.\n"
+
+#: common.c:499 common.c:506 common.c:799
+#, c-format
+msgid ""
+"********* QUERY **********\n"
+"%s\n"
+"**************************\n"
+"\n"
+msgstr ""
+"********* ZAPYTANIE **********\n"
+"%s\n"
+"******************************\n"
+"\n"
+
+#: common.c:560
+#, c-format
+msgid ""
+"Asynchronous notification \"%s\" with payload \"%s\" received from server "
+"process with PID %d.\n"
+msgstr ""
+"Asynchroniczne powiadomienie \"%s\" o Å‚adunku \"%s\" otrzymano z procesu "
+"serwera PID %d.\n"
+
+#: common.c:563
+#, c-format
+msgid ""
+"Asynchronous notification \"%s\" received from server process with PID %d.\n"
+msgstr ""
+"Asynchroniczne powiadomienie \"%s\" otrzymano z procesu serwera PID %d.\n"
+
+#: common.c:781
+#, c-format
+msgid ""
+"***(Single step mode: verify command)"
+"*******************************************\n"
+"%s\n"
+"***(press return to proceed or enter x and return to cancel)"
+"********************\n"
+msgstr ""
+"***(Tryb jednokrokowy: sprawdzenie polecenia)"
+"***********************************\n"
+"%s\n"
+"***(wciśnij enter by iść dalej lub x i enter by anulować)"
+"***********************\n"
+
+#: common.c:832
+#, c-format
+msgid ""
+"The server (version %d.%d) does not support savepoints for "
+"ON_ERROR_ROLLBACK.\n"
+msgstr ""
+"Serwer (wersja %d.%d) nie obsługuje punktów zapisu dla ON_ERROR_ROLLBACK.\n"
+
+#: copy.c:96
+msgid "\\copy: arguments required\n"
+msgstr "\\copy: wymagane sÄ… argumenty\n"
+
+#: copy.c:228
+#, c-format
+msgid "\\copy: parse error at \"%s\"\n"
+msgstr "\\copy: błąd analizy przy \"%s\"\n"
+
+#: copy.c:230
+msgid "\\copy: parse error at end of line\n"
+msgstr "\\copy: błąd analizy na końcu linii\n"
+
+#: copy.c:294
+#, c-format
+msgid "%s: cannot copy from/to a directory\n"
+msgstr "%s: nie można kopiować z/do folderu\n"
+
+#: copy.c:331
+#, c-format
+msgid "\\copy: %s"
+msgstr "\\copy: %s"
+
+#: copy.c:335 copy.c:349
+#, c-format
+msgid "\\copy: unexpected response (%d)\n"
+msgstr "\\copy: nieoczekiwana odpowiedź (%d)\n"
+
+#: copy.c:353
+msgid "trying to exit copy mode"
+msgstr "próba wyjścia z trybu kopiowanie"
+
+#: copy.c:407 copy.c:417
+#, c-format
+msgid "could not write COPY data: %s\n"
+msgstr "nie można zapisać danych COPY: %s\n"
+
+#: copy.c:424
+#, c-format
+msgid "COPY data transfer failed: %s"
+msgstr "transfer danych COPY nie powiódł się: %s"
+
+#: copy.c:472
+msgid "canceled by user"
+msgstr "anulowane przez użytkownika"
+
+#: copy.c:487
+msgid ""
+"Enter data to be copied followed by a newline.\n"
+"End with a backslash and a period on a line by itself."
+msgstr ""
+"Wprowadź dane do skopiowania poprzedzone nową linią.\n"
+"Zakończ linią zawierająca tylko odwróconym ukośnikiem i spację."
+
+#: copy.c:600
+msgid "aborted because of read failure"
+msgstr "przerwane na skutek nieudanego odczytu"
+
+#: help.c:48
+msgid "on"
+msgstr "włączone"
+
+#: help.c:48
+msgid "off"
+msgstr "wyłączone"
+
+#: help.c:70
+#, c-format
+msgid "could not get current user name: %s\n"
+msgstr "nie udało się uzyskać nazwy bieżącego użytkownika: %s\n"
+
+#: help.c:82
+#, c-format
+msgid ""
+"psql is the PostgreSQL interactive terminal.\n"
+"\n"
+msgstr ""
+"psql jest interaktywnym terminalem PostgreSQL.\n"
+"\n"
+
+#: help.c:83
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: help.c:84
+#, c-format
+msgid ""
+"  psql [OPTION]... [DBNAME [USERNAME]]\n"
+"\n"
+msgstr ""
+"  psql [OPCJA]... [NAZWADB [NAZWAUŻYTKOWNIKA]]\n"
+"\n"
+
+#: help.c:86
+#, c-format
+msgid "General options:\n"
+msgstr "Opcje ogólne:\n"
+
+#: help.c:91
+#, c-format
+msgid ""
+"  -c, --command=COMMAND    run only single command (SQL or internal) and "
+"exit\n"
+msgstr ""
+"  -c, --command=POLECENIE  wykonuje jedno polecenie (SQL lub wewnętrzne) i "
+"kończy\n"
+
+#: help.c:92
+#, c-format
+msgid ""
+"  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
+msgstr ""
+"  -d, --dbname=NAZWADB     nazwa bazy danych do połączenia (domyślnie: \"%s"
+"\")\n"
+
+#: help.c:93
+#, c-format
+msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
+msgstr "  -f, --file=NAZWAPLIKU    wykonuje polecenia z pliku i kończy\n"
+
+#: help.c:94
+#, c-format
+msgid "  -l, --list               list available databases, then exit\n"
+msgstr "  -l, --list               listuje dostępne bazy danych i kończy\n"
+
+#: help.c:95
+#, c-format
+msgid ""
+"  -v, --set=, --variable=NAME=VALUE\n"
+"                           set psql variable NAME to VALUE\n"
+msgstr ""
+"  -v, --set=, --variable=NAZWA=WARTOŚĆ\n"
+"                           ustala wartość zmiennej psql NAZWA na WARTOŚĆ\n"
+
+#: help.c:97
+#, c-format
+msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
+msgstr "  -X, --no-psqlrc          nie czyta pliku startowego (~/.psqlrc)\n"
+
+#: help.c:98
+#, c-format
+msgid ""
+"  -1 (\"one\"), --single-transaction\n"
+"                           execute command file as a single transaction\n"
+msgstr ""
+"  -1 (\"one\"), --single-transaction\n"
+"                           wykonuje plik poleceń w jednej transakcji\n"
+
+#: help.c:100
+#, c-format
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   pokazuje ten ekran pomocy i kończy\n"
+
+#: help.c:101
+#, c-format
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                pokazuje informacje o wersji i kończy\n"
+
+#: help.c:103
+#, c-format
+msgid ""
+"\n"
+"Input and output options:\n"
+msgstr ""
+"\n"
+"Opcje wejścia i wyjścia:\n"
+
+#: help.c:104
+#, c-format
+msgid "  -a, --echo-all           echo all input from script\n"
+msgstr "  -a, --echo-all           echo wejścia ze skryptu\n"
+
+#: help.c:105
+#, c-format
+msgid "  -e, --echo-queries       echo commands sent to server\n"
+msgstr "  -e, --echo-queries       polecenia echo wysyłane na serwer\n"
+
+#: help.c:106
+#, c-format
+msgid ""
+"  -E, --echo-hidden        display queries that internal commands generate\n"
+msgstr ""
+"  -E, --echo-hidden        wyświetlenie zapytań tworzonych przez polecenia "
+"wewnętrzne\n"
+
+#: help.c:107
+#, c-format
+msgid "  -L, --log-file=FILENAME  send session log to file\n"
+msgstr ""
+"  -L, --log-file=NAZWAPLIKU\n"
+"                           wysyła komunikaty sesji do pliku\n"
+
+#: help.c:108
+#, c-format
+msgid ""
+"  -n, --no-readline        disable enhanced command line editing (readline)\n"
+msgstr ""
+"  -n, --no-readline        wyłącza rozszerzoną edycje linii poleceń "
+"(readline)\n"
+
+#: help.c:109
+#, c-format
+msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
+msgstr ""
+"  -o, --output=NAZWAPLIKU  wysyła wyniki zapytania do pliku (lub |przewodu)\n"
+
+#: help.c:110
+#, c-format
+msgid ""
+"  -q, --quiet              run quietly (no messages, only query output)\n"
+msgstr ""
+"  -q, --quiet              ciche wykonanie (bez komunikatów, tylko wyniki "
+"zapytań)\n"
+
+#: help.c:111
+#, c-format
+msgid "  -s, --single-step        single-step mode (confirm each query)\n"
+msgstr ""
+"  -s, --single-step        tryb jednokrokowy (potwierdzenie każdego "
+"zapytania)\n"
+
+#: help.c:112
+#, c-format
+msgid ""
+"  -S, --single-line        single-line mode (end of line terminates SQL "
+"command)\n"
+msgstr ""
+"  -S, --single-line        tryb jednoliniowy (koniec linii kończy polecenie "
+"SQL)\n"
+
+#: help.c:114
+#, c-format
+msgid ""
+"\n"
+"Output format options:\n"
+msgstr ""
+"\n"
+"Opcje formatowania wyjścia:\n"
+
+#: help.c:115
+#, c-format
+msgid "  -A, --no-align           unaligned table output mode\n"
+msgstr "  -A, --no-align           tryb braku wyrównania tabeli na wyjściu\n"
+
+#: help.c:116
+#, c-format
+msgid ""
+"  -F, --field-separator=STRING\n"
+"                           set field separator (default: \"%s\")\n"
+msgstr ""
+"  -F, --field-separator=CIĄGZNAKÓW\n"
+"                           ustala separator pól (domyślnie: \"%s\")\n"
+
+#: help.c:119
+#, c-format
+msgid "  -H, --html               HTML table output mode\n"
+msgstr "  -H, --html               tryb wyjścia tabeli HTML\n"
+
+#: help.c:120
+#, c-format
+msgid ""
+"  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
+"command)\n"
+msgstr ""
+"  -P, --pset=ZMI[=ARG]     ustawia opcjÄ™ drukowania ZMI na ARG (patrz "
+"polecenie \\pset)\n"
+
+#: help.c:121
+#, c-format
+msgid ""
+"  -R, --record-separator=STRING\n"
+"                           set record separator (default: newline)\n"
+msgstr ""
+"  -R, --record-separator=CIĄGZNAKÓW\n"
+"                           ustawia separator rekordów (domyślnie: "
+"nowalinia)\n"
+
+#: help.c:123
+#, c-format
+msgid "  -t, --tuples-only        print rows only\n"
+msgstr "  -t, --tuples-only        drukuje tylko wiersze\n"
+
+#: help.c:124
+#, c-format
+msgid ""
+"  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
+"border)\n"
+msgstr ""
+"  -T, --table-attr=TEKST   ustawia atrybuty znaczników tabeli HTML (np., "
+"szerokość, ramkę)\n"
+
+#: help.c:125
+#, c-format
+msgid "  -x, --expanded           turn on expanded table output\n"
+msgstr "  -x, --expanded           włącza wyjście rozciągniętej tabeli\n"
+
+#: help.c:127
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Opcje połączenia:\n"
+
+#: help.c:130
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME      database server host or socket directory "
+"(default: \"%s\")\n"
+msgstr ""
+"  -h, --host=NAZWAHOSTA    host serwera bazy danych lub katalog gniazda "
+"(domyślnie: \"%s\")\n"
+
+#: help.c:131
+msgid "local socket"
+msgstr "lokalne gniazdo sieciowe"
+
+#: help.c:134
+#, c-format
+msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
+msgstr ""
+"  -p, --port=PORT          port na serwerze bazy danych (domyślnie: \"%s\")\n"
+
+#: help.c:140
+#, c-format
+msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
+msgstr ""
+"  -U, --username=NZAWAUZYTKOWNIKA\n"
+"                           nazwa użytkownika bazy danych (domyślnie: \"%s\")\n"
+
+#: help.c:141
+#, c-format
+msgid "  -w, --no-password        never prompt for password\n"
+msgstr "  -w, --no-password        nie pytaj nigdy o hasło\n"
+
+#: help.c:142
+#, c-format
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           wymuś pytanie o hasło (powinno nastąpić "
+"automatycznie)\n"
+
+#: help.c:144
+#, c-format
+msgid ""
+"\n"
+"For more information, type \"\\?\" (for internal commands) or \"\\help"
+"\" (for SQL\n"
+"commands) from within psql, or consult the psql section in the PostgreSQL\n"
+"documentation.\n"
+"\n"
+msgstr ""
+"\n"
+"By uzyskać więcej informacji wpisz \"\\?\" (dla poleceń wewnętrznych) lub "
+"\"\\help\" \n"
+"(dal poleceń SQL) w psql, lub sprawdź w rozdziale dotyczącym psql\n"
+"dokumentacji PostgreSQL.\n"
+"\n"
+
+#: help.c:147
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: help.c:165
+#, c-format
+msgid "General\n"
+msgstr "Informacje ogólne\n"
+
+#: help.c:166
+#, c-format
+msgid ""
+"  \\copyright             show PostgreSQL usage and distribution terms\n"
+msgstr ""
+"  \\copyright             pokazuje warunku użytkowania i dystrybucji "
+"PostgreSQL\n"
+
+#: help.c:167
+#, c-format
+msgid ""
+"  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
+msgstr ""
+"  \\g [PLIK] or ;         wykonuje polecenie (i wysyła wyniki do pliku lub |"
+"przewodu)\n"
+
+#: help.c:168
+#, c-format
+msgid ""
+"  \\h [NAME]              help on syntax of SQL commands, * for all "
+"commands\n"
+msgstr ""
+"  \\h [NAZWA]             pomoc odnośnie  składni poleceń SQL, * dla "
+"wszystkich poleceń\n"
+
+#: help.c:169
+#, c-format
+msgid "  \\q                     quit psql\n"
+msgstr "  \\q                     wychodzi z psql\n"
+
+#: help.c:172
+#, c-format
+msgid "Query Buffer\n"
+msgstr "Bufor Zapytania\n"
+
+#: help.c:173
+#, c-format
+msgid ""
+"  \\e [FILE] [LINE]       edit the query buffer (or file) with external "
+"editor\n"
+msgstr ""
+"  \\e [PLIK] [LINIA]      edytuje bufor zapytania (lub plik) edytorem "
+"zewnętrznym\n"
+
+#: help.c:174
+#, c-format
+msgid ""
+"  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
+msgstr ""
+"  \\ef [NAZWAFUNK [LINIA]]\n"
+"                         edytuje definicję funkcji edytorem zewnętrznym\n"
+
+#: help.c:175
+#, c-format
+msgid "  \\p                     show the contents of the query buffer\n"
+msgstr "  \\p                     pokazuje zawartość bufora zapytania\n"
+
+#: help.c:176
+#, c-format
+msgid "  \\r                     reset (clear) the query buffer\n"
+msgstr ""
+"  \\p                     resetuje (czyści) zawartość bufora zapytania\n"
+
+#: help.c:178
+#, c-format
+msgid "  \\s [FILE]              display history or save it to file\n"
+msgstr ""
+"  \\s [PLIK]              wyświetla historię lub zapisuje ja do pliku\n"
+
+#: help.c:180
+#, c-format
+msgid "  \\w FILE                write query buffer to file\n"
+msgstr "  \\w PLIK                zapisuje bufor zapytania do pliku\n"
+
+#: help.c:183
+#, c-format
+msgid "Input/Output\n"
+msgstr "Wejście/Wyjście\n"
+
+#: help.c:184
+#, c-format
+msgid ""
+"  \\copy ...              perform SQL COPY with data stream to the client "
+"host\n"
+msgstr ""
+"  \\copy ...              wykonuje SQL COPY strumienia danych na host "
+"klienta\n"
+
+#: help.c:185
+#, c-format
+msgid "  \\echo [STRING]         write string to standard output\n"
+msgstr ""
+"  \\echo [STRING]         zapisuje ciąg znaków do standardowego wyjścia\n"
+
+#: help.c:186
+#, c-format
+msgid "  \\i FILE                execute commands from file\n"
+msgstr "  \\i PLIK                wykonuje polecenia z pliku\n"
+
+#: help.c:187
+#, c-format
+msgid "  \\o [FILE]              send all query results to file or |pipe\n"
+msgstr ""
+"  \\o [PLIK] lub ;        wysyła wszystkie wyniki zapytania do pliku lub |"
+"przewodu\n"
+
+#: help.c:188
+#, c-format
+msgid ""
+"  \\qecho [STRING]        write string to query output stream (see \\o)\n"
+msgstr ""
+"  \\qecho [STRING]        zapisuje ciąg znaków do strumienia wyjściowego \n"
+"                         zapytania (patrz \\o)\n"
+
+#: help.c:191
+#, c-format
+msgid "Informational\n"
+msgstr "Informacyjne\n"
+
+#: help.c:192
+#, c-format
+msgid "  (options: S = show system objects, + = additional detail)\n"
+msgstr "  (opcje: S = pokaż obiekty systemowe, + = dodatkowe szczegóły)\n"
+
+#: help.c:193
+#, c-format
+msgid "  \\d[S+]                 list tables, views, and sequences\n"
+msgstr "  \\d[S+]                 listuje tabele, widoku i dekwencje\n"
+
+#: help.c:194
+#, c-format
+msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
+msgstr ""
+"  \\d[S+]  NAZWA          opisuje tabelÄ™, widok, sekwencjÄ™ lub indeks\n"
+
+#: help.c:195
+#, c-format
+msgid "  \\da[S]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[S]  [WZORZEC]      listuje agregaty\n"
+
+#: help.c:196
+#, c-format
+msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
+msgstr "  \\db[+]  [WZORZEC]      listuje przestrzenie tabel\n"
+
+#: help.c:197
+#, c-format
+msgid "  \\dc[S]  [PATTERN]      list conversions\n"
+msgstr "  \\dc[S]  [WZORZEC]      listuje konwersje\n"
+
+#: help.c:198
+#, c-format
+msgid "  \\dC     [PATTERN]      list casts\n"
+msgstr "  \\dC     [WZORZEC]      listuje rzutowania\n"
+
+#: help.c:199
+#, c-format
+msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
+msgstr "  \\dd[S]  [WZORZEC]      pokazuje komentarze obiektów\n"
+
+#: help.c:200
+#, c-format
+msgid "  \\ddp    [PATTERN]      list default privileges\n"
+msgstr "  \\ddp    [WZORZEC]      listuje domyślne uprawnienia\n"
+
+#: help.c:201
+#, c-format
+msgid "  \\dD[S]  [PATTERN]      list domains\n"
+msgstr "  \\dD[S]  [WZORZEC]      listuje domeny\n"
+
+#: help.c:202
+#, c-format
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [WZORZEC]      listuje tabele zewnętrzne\n"
+
+#: help.c:203
+#, c-format
+msgid "  \\des[+] [PATTERN]      list foreign servers\n"
+msgstr "  \\des[+] [WZORZEC]      listuje serwery obce\n"
+
+#: help.c:204
+#, c-format
+msgid "  \\deu[+] [PATTERN]      list user mappings\n"
+msgstr "  \\deu[+] [WZORZEC]      listuje mapowania użytkownika\n"
+
+#: help.c:205
+#, c-format
+msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
+msgstr "  \\dew[+] [WZORZEC]      listuje opakowania obcych danych\n"
+
+#: help.c:206
+#, c-format
+msgid ""
+"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
+msgstr ""
+"  \\df[antw][S+] [WZORC]  listuje funkcje [tylko agreg/zwykły/wyzwalacz/"
+"okno]\n"
+
+#: help.c:207
+#, c-format
+msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
+msgstr ""
+"  \\dF[+]  [WZORZEC]      listuje konfiguracje wyszukiwania tekstowego\n"
+
+#: help.c:208
+#, c-format
+msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
+msgstr "  \\dFd[+] [WZORZEC]      listuje słowniki wyszukiwania tekstowego\n"
+
+#: help.c:209
+#, c-format
+msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
+msgstr ""
+"  \\dFp[+] [WZORZEC]      listuje analizatory wyszukiwania tekstowego\n"
+
+#: help.c:210
+#, c-format
+msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
+msgstr "  \\dFt[+] [WZORZEC]      listuje wzorce wyszukiwania tekstowego\n"
+
+#: help.c:211
+#, c-format
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]  [WZORZEC]      listuje role\n"
+
+#: help.c:212
+#, c-format
+msgid "  \\di[S+] [PATTERN]      list indexes\n"
+msgstr "  \\di[S+] [WZORZEC]      listuje indeksy\n"
+
+#: help.c:213
+#, c-format
+msgid "  \\dl                    list large objects, same as \\lo_list\n"
+msgstr ""
+"  \\dl                    listuje duże obiekty, to samo, co \\lo_list\n"
+
+#: help.c:214
+#, c-format
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [WZORZEC]      listuje języki proceduralne\n"
+
+#: help.c:215
+#, c-format
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
+msgstr "  \\dn[S+] [WZORZEC]      listuje schematy\n"
+
+#: help.c:216
+#, c-format
+msgid "  \\do[S]  [PATTERN]      list operators\n"
+msgstr "  \\do[S]  [WZORZEC]      listuje operatory\n"
+
+#: help.c:217
+#, c-format
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dO[S+] [WZORZEC]      listuje porównania\n"
+
+#: help.c:218
+#, c-format
+msgid ""
+"  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
+msgstr ""
+"  \\dp     [WZORZEC]      listuje uprawnienia dostępu do tabeli, widoku \n"
+"                         lub sekwencji\n"
+
+#: help.c:219
+#, c-format
+msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
+msgstr "  \\drds [WZORC1 [WZORC2]] listuje ustawienia ról wedle baz danych\n"
+
+#: help.c:220
+#, c-format
+msgid "  \\ds[S+] [PATTERN]      list sequences\n"
+msgstr "  \\ds[S+] [WZORZEC]      listuje sekwencje\n"
+
+#: help.c:221
+#, c-format
+msgid "  \\dt[S+] [PATTERN]      list tables\n"
+msgstr "  \\dt[S+] [WZORZEC]      listuje tabele\n"
+
+#: help.c:222
+#, c-format
+msgid "  \\dT[S+] [PATTERN]      list data types\n"
+msgstr "  \\dT[S+] [WZORZEC]      listuje typy danych\n"
+
+#: help.c:223
+#, c-format
+msgid "  \\du[+]  [PATTERN]      list roles\n"
+msgstr "  \\du[+]  [WZORZEC]      listuje role\n"
+
+#: help.c:224
+#, c-format
+msgid "  \\dv[S+] [PATTERN]      list views\n"
+msgstr "  \\dv[S+] [WZORZEC]      listuje widoki\n"
+
+#: help.c:225
+#, c-format
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dE[S+] [WZORZEC]      listuje tabele obce\n"
+
+#: help.c:226
+#, c-format
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[+]  [WZORZEC]      listuje rozszerzenia\n"
+
+#: help.c:227
+#, c-format
+msgid "  \\l[+]                  list all databases\n"
+msgstr "  \\l[+]                  listuje wszystkie bazy danych\n"
+
+#: help.c:228
+#, c-format
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf[+] NAZWAFUNK       pokazuje definicjÄ™ funkcji\n"
+
+#: help.c:229
+#, c-format
+msgid "  \\z      [PATTERN]      same as \\dp\n"
+msgstr "  \\z      [WZORZEC]      to samo co \\dp\n"
+
+#: help.c:232
+#, c-format
+msgid "Formatting\n"
+msgstr "Formatowanie\n"
+
+#: help.c:233
+#, c-format
+msgid ""
+"  \\a                     toggle between unaligned and aligned output mode\n"
+msgstr ""
+"  \\a                     przełącza między trybem wyjścia wyrównanym i "
+"niewyrównwnym\n"
+
+#: help.c:234
+#, c-format
+msgid "  \\C [STRING]            set table title, or unset if none\n"
+msgstr ""
+"  \\C [STRING]            ustawia tytuł tabeli lub czyści jeśli brak "
+"parametru\n"
+
+#: help.c:235
+#, c-format
+msgid ""
+"  \\f [STRING]            show or set field separator for unaligned query "
+"output\n"
+msgstr ""
+"  \\f [STRING]            pokazuje lub ustawia separator pól dla "
+"niewyrównanego\n"
+"                         wyjścia zapytania\n"
+
+#: help.c:236
+#, c-format
+msgid "  \\H                     toggle HTML output mode (currently %s)\n"
+msgstr "  \\H                     przełącza tryb wyjścia HTML (obecnie %s)\n"
+
+#: help.c:238
+#, c-format
+msgid ""
+"  \\pset NAME [VALUE]     set table output option\n"
+"                         (NAME := {format|border|expanded|fieldsep|footer|"
+"null|\n"
+"                         numericlocale|recordsep|tuples_only|title|tableattr|"
+"pager})\n"
+msgstr ""
+"  \\pset NAZWA [VARTOSC]  ustawia opcje wyjścia tabeli\n"
+"                         (NAZWA := {format|border|expanded|fieldsep|footer|"
+"null|\n"
+"                         numericlocale|recordsep|tuples_only|title|tableattr|"
+"pager})\n"
+
+#: help.c:241
+#, c-format
+msgid "  \\t [on|off]            show only rows (currently %s)\n"
+msgstr "  \\t [on|off]            pokazywanie tylko wierszy (obecnie %s)\n"
+
+#: help.c:243
+#, c-format
+msgid ""
+"  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
+msgstr ""
+"  \\T [STRING]            ustawia atrybuty znacznika HTML <table>, lub "
+"czyści jeśli pusty\n"
+
+#: help.c:244
+#, c-format
+msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
+msgstr ""
+"  \\x [on|off]            przełącza rozciągnięte wyjście (obecnie %s)\n"
+
+#: help.c:248
+#, c-format
+msgid "Connection\n"
+msgstr "Połączenie\n"
+
+#: help.c:249
+#, c-format
+msgid ""
+"  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
+"                         connect to new database (currently \"%s\")\n"
+msgstr ""
+"  \\c[onnect] [NAZWADB|- UŻYTK|- HOST|- PORT|-]\n"
+"                         Å‚Ä…czy do nowej bazy danych (obecnie \"%s\")\n"
+
+#: help.c:252
+#, c-format
+msgid "  \\encoding [ENCODING]   show or set client encoding\n"
+msgstr "  \\encoding [KODOWANIE]  pokazuje lub ustawia kodowanie klienta\n"
+
+#: help.c:253
+#, c-format
+msgid "  \\password [USERNAME]   securely change the password for a user\n"
+msgstr ""
+"  \\password [NAZWAUZYT]  zmienia w sposób bezpieczny hasło użytkownika\n"
+
+#: help.c:254
+#, c-format
+msgid ""
+"  \\conninfo              display information about current connection\n"
+msgstr "  \\conninfo              wyświetla informację o bieżącym połączeniu\n"
+
+#: help.c:257
+#, c-format
+msgid "Operating System\n"
+msgstr "System Operacyjny\n"
+
+#: help.c:258
+#, c-format
+msgid "  \\cd [DIR]              change the current working directory\n"
+msgstr "  \\cd [FDR]              zmienia bieżący folder roboczy\n"
+
+#: help.c:259
+#, c-format
+msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
+msgstr ""
+"  \\timing [on|off]       przełącza pomiar czasu poleceń (obecnie %s)\n"
+
+#: help.c:261
+#, c-format
+msgid ""
+"  \\! [COMMAND]           execute command in shell or start interactive "
+"shell\n"
+msgstr ""
+"  \\! [POLECENIE]         wykonuje polecenie powłoki lub uruchamia "
+"interaktywną powłokę\n"
+
+#: help.c:264
+#, c-format
+msgid "Variables\n"
+msgstr "Zmienne\n"
+
+#: help.c:265
+#, c-format
+msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
+msgstr ""
+"  \\prompt [TEKST] NAZWA  prosi użytkownika o ustawienie zmiennej "
+"wewnętrznej\n"
+
+#: help.c:266
+#, c-format
+msgid ""
+"  \\set [NAME [VALUE]]    set internal variable, or list all if no "
+"parameters\n"
+msgstr ""
+"  \\set [NAZWA [WARTOŚĆ]] ustawia zmienną wewnętrzną lub listuje wszystkie,\n"
+"                         jeśli brak parametrów\n"
+
+#: help.c:267
+#, c-format
+msgid "  \\unset NAME            unset (delete) internal variable\n"
+msgstr ""
+"  \\unset NAZWA           ustawia jako pustą (usuwa) zmienną wewnętrzną\n"
+
+#: help.c:270
+#, c-format
+msgid "Large Objects\n"
+msgstr "Duże Obiekty\n"
+
+#: help.c:271
+#, c-format
+msgid ""
+"  \\lo_export LOBOID FILE\n"
+"  \\lo_import FILE [COMMENT]\n"
+"  \\lo_list\n"
+"  \\lo_unlink LOBOID      large object operations\n"
+msgstr ""
+"  \\lo_export LOBOID PLIK\n"
+"  \\lo_import PLIK [KOMENTARZ]\n"
+"  \\lo_list\n"
+"  \\lo_unlink LOBOID      operacje na dużych obiektach\n"
+
+#: help.c:318
+msgid "Available help:\n"
+msgstr "Dostępna pomoc:\n"
+
+#: help.c:402
+#, c-format
+msgid ""
+"Command:     %s\n"
+"Description: %s\n"
+"Syntax:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Polecenie:   %s\n"
+"Opis:        %s\n"
+"Składnia:\n"
+"%s\n"
+"\n"
+
+#: help.c:418
+#, c-format
+msgid ""
+"No help available for \"%s\".\n"
+"Try \\h with no arguments to see available help.\n"
+msgstr ""
+"Brak dostępnej pomocy dla \"%s\".\n"
+"Spróbuj \\h bez argumentów by zobaczyć dostępną pomoc.\n"
+
+#: input.c:198
+#, c-format
+msgid "could not read from input file: %s\n"
+msgstr "nie można czytać z pliku wejścia: %s\n"
+
+#: input.c:406
+#, c-format
+msgid "could not save history to file \"%s\": %s\n"
+msgstr "nie można zapisać historii do pliku \"%s\": %s\n"
+
+#: input.c:411
+msgid "history is not supported by this installation\n"
+msgstr "historia nie jest obsługiwana przez tą instalację\n"
+
+#: large_obj.c:66
+#, c-format
+msgid "%s: not connected to a database\n"
+msgstr "%s: nie połączono z bazą danych\n"
+
+#: large_obj.c:85
+#, c-format
+msgid "%s: current transaction is aborted\n"
+msgstr "%s: bieżąca transakcja została przerwana\n"
+
+#: large_obj.c:88
+#, c-format
+msgid "%s: unknown transaction status\n"
+msgstr "%s: nieznany status transakcji\n"
+
+#: large_obj.c:289 large_obj.c:300
+msgid "ID"
+msgstr "Identyfikator"
+
+#: large_obj.c:290 describe.c:147 describe.c:335 describe.c:637 describe.c:787
+#: describe.c:2513 describe.c:2631 describe.c:2968 describe.c:3599
+#: describe.c:3664
+msgid "Owner"
+msgstr "Właściciel"
+
+#: large_obj.c:291 large_obj.c:301 describe.c:96 describe.c:159 describe.c:338
+#: describe.c:501 describe.c:590 describe.c:661 describe.c:852 describe.c:1382
+#: describe.c:2330 describe.c:2537 describe.c:2911 describe.c:2976
+#: describe.c:3041 describe.c:3177 describe.c:3216 describe.c:3283
+#: describe.c:3342 describe.c:3351 describe.c:3410 describe.c:3849
+msgid "Description"
+msgstr "Opis"
+
+#: large_obj.c:310
+msgid "Large objects"
+msgstr "Duże obiekty"
+
+#: mainloop.c:159
+#, c-format
+msgid "Use \"\\q\" to leave %s.\n"
+msgstr "Użyj \"\\q\" by opuścić %s.\n"
+
+#: mainloop.c:189
+msgid "You are using psql, the command-line interface to PostgreSQL."
+msgstr "Używasz psql, interfejsu wiersza poleceń PostgreSQL."
+
+#: mainloop.c:190
+#, c-format
+msgid ""
+"Type:  \\copyright for distribution terms\n"
+"       \\h for help with SQL commands\n"
+"       \\? for help with psql commands\n"
+"       \\g or terminate with semicolon to execute query\n"
+"       \\q to quit\n"
+msgstr ""
+"Wpisz:  \\copyright by poznać warunki rozpowszechniania\n"
+"        \\h by uzyskać pomoc dla poleceń SQL\n"
+"        \\? by uzyskać pomoc poleceń psql\n"
+"        \\g lub zakończ średnikiem by wykonać zapytanie\n"
+"        \\q by wyjść\n"
+
+#: print.c:1138
+#, c-format
+msgid "(No rows)\n"
+msgstr "(Brak wierszy)\n"
+
+#: print.c:2028
+#, c-format
+msgid "Interrupted\n"
+msgstr "Przerwane\n"
+
+#: print.c:2097
+#, c-format
+msgid "Cannot add header to table content: column count of %d exceeded.\n"
+msgstr ""
+"Nie można dodać nagłówka do zawartości tabeli: przekroczona liczba kolumn "
+"%d.\n"
+
+#: print.c:2137
+#, c-format
+msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
+msgstr ""
+"Nie można dodać komórki do zawartości tabeli: przekroczona liczba komórek "
+"%d.\n"
+
+#: print.c:2358
+#, c-format
+msgid "invalid output format (internal error): %d"
+msgstr "niepoprawny format wyjścia (błąd wewnętrzny): %d"
+
+#: print.c:2455
+#, c-format
+msgid "(%lu row)"
+msgid_plural "(%lu rows)"
+msgstr[0] "(%lu wiersz)"
+msgstr[1] "(%lu wiersze)"
+msgstr[2] "(%lu wierszy)"
+
+#: startup.c:243
+#, c-format
+msgid "%s: could not open log file \"%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku logów \"%s\": %s\n"
+
+#: startup.c:305
+#, c-format
+msgid ""
+"Type \"help\" for help.\n"
+"\n"
+msgstr ""
+"Wpisz \"help\" by uzyskać pomoc.\n"
+"\n"
+
+#: startup.c:451
+#, c-format
+msgid "%s: could not set printing parameter \"%s\"\n"
+msgstr "%s: nie można ustawić parametru wydruku \"%s\"\n"
+
+#: startup.c:490
+#, c-format
+msgid "%s: could not delete variable \"%s\"\n"
+msgstr "%s: nie można usunąć zmiennej \"%s\"\n"
+
+#: startup.c:500
+#, c-format
+msgid "%s: could not set variable \"%s\"\n"
+msgstr "%s: nie można ustawić zmiennej \"%s\"\n"
+
+#: startup.c:537 startup.c:543
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: startup.c:560
+#, c-format
+msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
+msgstr ""
+"%s: ostrzeżenie: nadmiarowy argument wiersza poleceń \"%s\" zignorowany\n"
+
+#: startup.c:625
+msgid "contains support for command-line editing"
+msgstr "zawiera wsparcie dla edycji wiersza poleceń"
+
+#: describe.c:69 describe.c:236 describe.c:463 describe.c:585 describe.c:706
+#: describe.c:788 describe.c:849 describe.c:2504 describe.c:2698
+#: describe.c:2768 describe.c:2903 describe.c:3039 describe.c:3266
+#: describe.c:3338 describe.c:3349 describe.c:3408 describe.c:3782
+#: describe.c:3848
+msgid "Schema"
+msgstr "Schemat"
+
+#: describe.c:70 describe.c:146 describe.c:237 describe.c:464 describe.c:586
+#: describe.c:636 describe.c:707 describe.c:850 describe.c:2505
+#: describe.c:2627 describe.c:2699 describe.c:2769 describe.c:2904
+#: describe.c:2967 describe.c:3040 describe.c:3267 describe.c:3339
+#: describe.c:3350 describe.c:3409 describe.c:3598 describe.c:3663
+#: describe.c:3846
+msgid "Name"
+msgstr "Nazwa"
+
+#: describe.c:71 describe.c:249 describe.c:295 describe.c:312
+msgid "Result data type"
+msgstr "Typ danych wyniku"
+
+#: describe.c:85 describe.c:89 describe.c:250 describe.c:296 describe.c:313
+msgid "Argument data types"
+msgstr "Typy danych argumentów"
+
+#: describe.c:114
+msgid "List of aggregate functions"
+msgstr "Lista funkcji agregujÄ…cych"
+
+#: describe.c:135
+#, c-format
+msgid "The server (version %d.%d) does not support tablespaces.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje przestrzeni tabel.\n"
+
+#: describe.c:148
+msgid "Location"
+msgstr "Położenie"
+
+#: describe.c:176
+msgid "List of tablespaces"
+msgstr "Lista przestrzeni tabel"
+
+#: describe.c:213
+#, c-format
+msgid "\\df only takes [antwS+] as options\n"
+msgstr "\\df przyjmuje tylko opcje [antwS+]\n"
+
+#: describe.c:219
+#, c-format
+msgid "\\df does not take a \"w\" option with server version %d.%d\n"
+msgstr "\\df nie przyjmuje opcji \"w\" w wersji serwera %d.%d\n"
+
+#. translator: "agg" is short for "aggregate"
+#: describe.c:252 describe.c:298 describe.c:315
+msgid "agg"
+msgstr "agreg"
+
+#: describe.c:253
+msgid "window"
+msgstr "okno"
+
+#: describe.c:254 describe.c:299 describe.c:316 describe.c:990
+msgid "trigger"
+msgstr "wyzwalacz"
+
+#: describe.c:255 describe.c:300 describe.c:317
+msgid "normal"
+msgstr "zwykły"
+
+#: describe.c:256 describe.c:301 describe.c:318 describe.c:710 describe.c:792
+#: describe.c:1362 describe.c:2512 describe.c:2700 describe.c:3676
+msgid "Type"
+msgstr "Typ"
+
+#: describe.c:331
+msgid "immutable"
+msgstr "niezmienny"
+
+#: describe.c:332
+msgid "stable"
+msgstr "stabilny"
+
+#: describe.c:333
+msgid "volatile"
+msgstr "zmienny"
+
+#: describe.c:334
+msgid "Volatility"
+msgstr "Zmienność"
+
+#: describe.c:336
+msgid "Language"
+msgstr "Język"
+
+#: describe.c:337
+msgid "Source code"
+msgstr "Kod źródłowy"
+
+#: describe.c:435
+msgid "List of functions"
+msgstr "Lista funkcji"
+
+#: describe.c:474
+msgid "Internal name"
+msgstr "Nazwa wewnętrzna"
+
+#: describe.c:475 describe.c:653 describe.c:2529 describe.c:2533
+msgid "Size"
+msgstr "Rozmiar"
+
+#: describe.c:496
+msgid "Elements"
+msgstr "Elementy"
+
+#: describe.c:541
+msgid "List of data types"
+msgstr "Lista typów danych"
+
+#: describe.c:587
+msgid "Left arg type"
+msgstr "Typ lewego arg"
+
+#: describe.c:588
+msgid "Right arg type"
+msgstr "Typ prawego arg"
+
+#: describe.c:589
+msgid "Result type"
+msgstr "Typ wyniku"
+
+#: describe.c:608
+msgid "List of operators"
+msgstr "Lista operatorów"
+
+#: describe.c:638
+msgid "Encoding"
+msgstr "Kodowanie"
+
+#: describe.c:643 describe.c:2905
+msgid "Collate"
+msgstr "Porównanie"
+
+#: describe.c:644 describe.c:2906
+msgid "Ctype"
+msgstr "Ctype"
+
+#: describe.c:657
+msgid "Tablespace"
+msgstr "Przestrzeń Tabel"
+
+#: describe.c:674
+msgid "List of databases"
+msgstr "Lista baz danych"
+
+#: describe.c:708 describe.c:789 describe.c:944 describe.c:2506 sql_help.c:595
+#: sql_help.c:842 sql_help.c:969 sql_help.c:1432 sql_help.c:1562
+#: sql_help.c:1596 sql_help.c:1842 sql_help.c:2000 sql_help.c:2185
+#: sql_help.c:2266 sql_help.c:2472 sql_help.c:3103 sql_help.c:3123
+#: sql_help.c:3125 sql_help.c:3126
+msgid "table"
+msgstr "tabela"
+
+#: describe.c:708 describe.c:945 describe.c:2507
+msgid "view"
+msgstr "widok"
+
+#: describe.c:708 describe.c:790 describe.c:947 describe.c:2509
+msgid "sequence"
+msgstr "sekwencja"
+
+#: describe.c:709 describe.c:948 describe.c:2511
+msgid "foreign table"
+msgstr "tabela obca"
+
+#: describe.c:721
+msgid "Column access privileges"
+msgstr "Uprawnienia dostępu do kolumn"
+
+#: describe.c:747 describe.c:3993 describe.c:3997
+msgid "Access privileges"
+msgstr "Uprawnienia dostępu"
+
+#: describe.c:775
+#, c-format
+msgid ""
+"The server (version %d.%d) does not support altering default privileges.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje zmiany domyślnych uprawnień.\n"
+
+#: describe.c:791 describe.c:883
+msgid "function"
+msgstr "funkcja"
+
+#: describe.c:815
+msgid "Default access privileges"
+msgstr "Domyślne uprawnienia dostępu"
+
+#: describe.c:851
+msgid "Object"
+msgstr "Obiekt"
+
+#: describe.c:863
+msgid "aggregate"
+msgstr "agregat"
+
+#: describe.c:902 sql_help.c:1715 sql_help.c:2833 sql_help.c:2903
+#: sql_help.c:3036 sql_help.c:3141 sql_help.c:3192
+msgid "operator"
+msgstr "operator"
+
+#: describe.c:921
+msgid "data type"
+msgstr "typ danych"
+
+#: describe.c:946 describe.c:2508
+msgid "index"
+msgstr "indeks"
+
+#: describe.c:969
+msgid "rule"
+msgstr "reguła"
+
+#: describe.c:1013
+msgid "Object descriptions"
+msgstr "Opisy obiektów"
+
+#: describe.c:1066
+#, c-format
+msgid "Did not find any relation named \"%s\".\n"
+msgstr "Nie znaleziono żadnej relacji o nazwie \"%s\".\n"
+
+#: describe.c:1238
+#, c-format
+msgid "Did not find any relation with OID %s.\n"
+msgstr "Nie znaleziono żadnej relacji o OID %s.\n"
+
+#: describe.c:1314
+#, c-format
+msgid "Unlogged table \"%s.%s\""
+msgstr "Niezalogowany indeks \"%s.%s\""
+
+#: describe.c:1317
+#, c-format
+msgid "Table \"%s.%s\""
+msgstr "Tabela \"%s.%s\""
+
+#: describe.c:1321
+#, c-format
+msgid "View \"%s.%s\""
+msgstr "Widok \"%s.%s\""
+
+#: describe.c:1325
+#, c-format
+msgid "Sequence \"%s.%s\""
+msgstr "Sekwencja \"%s.%s\""
+
+#: describe.c:1330
+#, c-format
+msgid "Unlogged index \"%s.%s\""
+msgstr "Niezalogowany indeks \"%s.%s\""
+
+#: describe.c:1333
+#, c-format
+msgid "Index \"%s.%s\""
+msgstr "Indeks \"%s.%s\""
+
+#: describe.c:1338
+#, c-format
+msgid "Special relation \"%s.%s\""
+msgstr "Relacja specjalna \"%s.%s\""
+
+#: describe.c:1342
+#, c-format
+msgid "TOAST table \"%s.%s\""
+msgstr "Tabela TOAST \"%s.%s\""
+
+#: describe.c:1346
+#, c-format
+msgid "Composite type \"%s.%s\""
+msgstr "Typ złożony \"%s.%s\""
+
+#: describe.c:1350
+#, c-format
+msgid "Foreign table \"%s.%s\""
+msgstr "Tabela obca \"%s.%s\""
+
+#: describe.c:1361
+msgid "Column"
+msgstr "Kolumna"
+
+#: describe.c:1369
+msgid "Modifiers"
+msgstr "Modyfikatory"
+
+#: describe.c:1374
+msgid "Value"
+msgstr "Wartość"
+
+#: describe.c:1377
+msgid "Definition"
+msgstr "Definicja"
+
+#: describe.c:1381
+msgid "Storage"
+msgstr "Przechowywanie"
+
+#: describe.c:1427
+#, c-format
+msgid "collate %s"
+msgstr "porównanie %s"
+
+#: describe.c:1435
+msgid "not null"
+msgstr "niepusty"
+
+#. translator: default values of column definitions
+#: describe.c:1445
+#, c-format
+msgid "default %s"
+msgstr "domyślnie %s"
+
+#: describe.c:1536
+msgid "primary key, "
+msgstr "klucz główny, "
+
+#: describe.c:1538
+msgid "unique, "
+msgstr "klucz unikalny, "
+
+#: describe.c:1544
+#, c-format
+msgid "for table \"%s.%s\""
+msgstr "dla tabeli \"%s.%s\""
+
+#: describe.c:1548
+#, c-format
+msgid ", predicate (%s)"
+msgstr ", orzeczenie (%s)"
+
+#: describe.c:1551
+msgid ", clustered"
+msgstr ", klastrowany"
+
+#: describe.c:1554
+msgid ", invalid"
+msgstr ", niepoprawny"
+
+#: describe.c:1557
+msgid ", deferrable"
+msgstr ", odraczalny"
+
+#: describe.c:1560
+msgid ", initially deferred"
+msgstr ", poczÄ…tkowo odroczony"
+
+#: describe.c:1574
+msgid "View definition:"
+msgstr "Definicja widoku:"
+
+#: describe.c:1591 describe.c:1874
+msgid "Rules:"
+msgstr "Reguły:"
+
+#: describe.c:1650
+msgid "Indexes:"
+msgstr "Indeksy:"
+
+#: describe.c:1730
+msgid "Check constraints:"
+msgstr "Ograniczenie kontrolne:"
+
+#: describe.c:1761
+msgid "Foreign-key constraints:"
+msgstr "Ograniczenia kluczy obcych:"
+
+#: describe.c:1792
+msgid "Referenced by:"
+msgstr "Wskazywany przez:"
+
+#: describe.c:1877
+msgid "Disabled rules:"
+msgstr "Wyłączone reguły:"
+
+#: describe.c:1880
+msgid "Rules firing always:"
+msgstr "Reguły odpalane zawsze:"
+
+#: describe.c:1883
+msgid "Rules firing on replica only:"
+msgstr "Reguły odpalane tylko przy replikacji:"
+
+#: describe.c:1991
+msgid "Triggers:"
+msgstr "Wyzwalacze:"
+
+#: describe.c:1994
+msgid "Disabled triggers:"
+msgstr "Wyłączone wyzwalacze:"
+
+#: describe.c:1997
+msgid "Triggers firing always:"
+msgstr "Wyzwalacze odpalane zawsze:"
+
+#: describe.c:2000
+msgid "Triggers firing on replica only:"
+msgstr "Wyzwalacze odpalane tylko przy replikacji:"
+
+#: describe.c:2066
+msgid "Inherits"
+msgstr "Dziedziczenia"
+
+#: describe.c:2096
+#, c-format
+msgid "Number of child tables: %d (Use \\d+ to list them.)"
+msgstr "Liczba tabel podrzędnych: %d (Użyj \\d+ by je wylistować.)"
+
+#: describe.c:2103
+msgid "Child tables"
+msgstr "Tabele podrzędne"
+
+#: describe.c:2125
+#, c-format
+msgid "Typed table of type: %s"
+msgstr "Tabela typizowana typu: %s"
+
+#: describe.c:2132
+msgid "Has OIDs"
+msgstr "Zawiera OIDy"
+
+#: describe.c:2135 describe.c:2772 describe.c:2846
+msgid "yes"
+msgstr "tak"
+
+#: describe.c:2135 describe.c:2772 describe.c:2846
+msgid "no"
+msgstr "nie"
+
+#: describe.c:2143 describe.c:3614 describe.c:3678 describe.c:3734
+#: describe.c:3789
+msgid "Options"
+msgstr "Opcje"
+
+#: describe.c:2228
+#, c-format
+msgid "Tablespace: \"%s\""
+msgstr "Przestrzeń  tabel: \"%s\""
+
+#: describe.c:2241
+#, c-format
+msgid ", tablespace \"%s\""
+msgstr ", przestrzeń tabel \"%s\""
+
+#: describe.c:2323
+msgid "List of roles"
+msgstr "Lista ról"
+
+#: describe.c:2325
+msgid "Role name"
+msgstr "Nazwa roli"
+
+#: describe.c:2326
+msgid "Attributes"
+msgstr "Atrybuty"
+
+#: describe.c:2327
+msgid "Member of"
+msgstr "Element"
+
+#: describe.c:2338
+msgid "Superuser"
+msgstr "Superużytkownik"
+
+#: describe.c:2341
+msgid "No inheritance"
+msgstr "Bez dziedziczenia"
+
+#: describe.c:2344
+msgid "Create role"
+msgstr "Utwórz rolę"
+
+#: describe.c:2347
+msgid "Create DB"
+msgstr "Utwórz DB"
+
+#: describe.c:2350
+msgid "Cannot login"
+msgstr "Nie można zalogować"
+
+#: describe.c:2354
+msgid "Replication"
+msgstr "Replikacja"
+
+#: describe.c:2363
+msgid "No connections"
+msgstr "Brak połączeń"
+
+#: describe.c:2365
+#, c-format
+msgid "%d connection"
+msgid_plural "%d connections"
+msgstr[0] "%d połączenie"
+msgstr[1] "%d połączenia"
+msgstr[2] "%d połączeń"
+
+#: describe.c:2432
+#, c-format
+msgid "No per-database role settings support in this server version.\n"
+msgstr ""
+"Brak obsługi oddzielnych ustawień ról dla baz danych w tej wersji serwera.\n"
+
+#: describe.c:2443
+#, c-format
+msgid "No matching settings found.\n"
+msgstr "Nie znaleziono pasujących ustawień.\n"
+
+#: describe.c:2445
+#, c-format
+msgid "No settings found.\n"
+msgstr "Nie znaleziono ustawień.\n"
+
+#: describe.c:2450
+msgid "List of settings"
+msgstr "Lista ustawień"
+
+#: describe.c:2510
+msgid "special"
+msgstr "specjalny"
+
+#: describe.c:2518 describe.c:3783
+msgid "Table"
+msgstr "Tabela"
+
+#: describe.c:2592
+#, c-format
+msgid "No matching relations found.\n"
+msgstr "Nie znaleziono pasujÄ…cych relacji.\n"
+
+#: describe.c:2594
+#, c-format
+msgid "No relations found.\n"
+msgstr "Nie znaleziono relacji.\n"
+
+#: describe.c:2599
+msgid "List of relations"
+msgstr "Lista relacji"
+
+#: describe.c:2635
+msgid "Trusted"
+msgstr "Zaufany"
+
+#: describe.c:2643
+msgid "Internal Language"
+msgstr "Język wewnętrzny"
+
+#: describe.c:2644
+msgid "Call Handler"
+msgstr "Uchwyt Wywołania"
+
+#: describe.c:2645 describe.c:3606
+msgid "Validator"
+msgstr "Walidator"
+
+#: describe.c:2648
+msgid "Inline Handler"
+msgstr "Uchwyt Wbudowany"
+
+#: describe.c:2669
+msgid "List of languages"
+msgstr "Lista języków"
+
+#: describe.c:2709
+msgid "Modifier"
+msgstr "Modyfikator"
+
+#: describe.c:2717
+msgid "Check"
+msgstr "Sprawdzenie"
+
+#: describe.c:2735
+msgid "List of domains"
+msgstr "Lista domen"
+
+#: describe.c:2770
+msgid "Source"
+msgstr "Źródło"
+
+#: describe.c:2771
+msgid "Destination"
+msgstr "Cel"
+
+#: describe.c:2773
+msgid "Default?"
+msgstr "Domyślnie?"
+
+#: describe.c:2791
+msgid "List of conversions"
+msgstr "Lista przekształceń"
+
+#: describe.c:2843
+msgid "Source type"
+msgstr "Typ źródłowy"
+
+#: describe.c:2844
+msgid "Target type"
+msgstr "Typ docelowy"
+
+#: describe.c:2845 describe.c:3176
+msgid "Function"
+msgstr "Funkcja"
+
+#: describe.c:2846
+msgid "in assignment"
+msgstr "przypisanie"
+
+#: describe.c:2847
+msgid "Implicit?"
+msgstr "Bezwarunkowy?"
+
+#: describe.c:2873
+msgid "List of casts"
+msgstr "Lista rzutowań"
+
+#: describe.c:2941
+msgid "List of collations"
+msgstr "Spis porównań"
+
+#: describe.c:2999
+msgid "List of schemas"
+msgstr "Lista schematów"
+
+#: describe.c:3022 describe.c:3255 describe.c:3323 describe.c:3391
+#, c-format
+msgid "The server (version %d.%d) does not support full text search.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje pełnego wyszukiwania tekstowego.\n"
+
+#: describe.c:3056
+msgid "List of text search parsers"
+msgstr "Lista parserów wyszukiwania tekstowego"
+
+#: describe.c:3099
+#, c-format
+msgid "Did not find any text search parser named \"%s\".\n"
+msgstr "Nie znaleziono parsera wyszukiwania tekstowego o nazwie \"%s\".\n"
+
+#: describe.c:3174
+msgid "Start parse"
+msgstr "PoczÄ…tek parsowania"
+
+#: describe.c:3175
+msgid "Method"
+msgstr "Metoda"
+
+#: describe.c:3179
+msgid "Get next token"
+msgstr "Pobierz następny token"
+
+#: describe.c:3181
+msgid "End parse"
+msgstr "Koniec parsowania"
+
+#: describe.c:3183
+msgid "Get headline"
+msgstr "Pobierz nagłówek"
+
+#: describe.c:3185
+msgid "Get token types"
+msgstr "Pobierz typy tokenów"
+
+#: describe.c:3195
+#, c-format
+msgid "Text search parser \"%s.%s\""
+msgstr "Parser wyszukiwania tekstowego \"%s.%s\""
+
+#: describe.c:3197
+#, c-format
+msgid "Text search parser \"%s\""
+msgstr "Parser wyszukiwania tekstowego \"%s\""
+
+#: describe.c:3215
+msgid "Token name"
+msgstr "Nazwa tokenu"
+
+#: describe.c:3226
+#, c-format
+msgid "Token types for parser \"%s.%s\""
+msgstr "Typy tokenów dla analizatora \"%s.%s\""
+
+#: describe.c:3228
+#, c-format
+msgid "Token types for parser \"%s\""
+msgstr "Typy tokenów dla parsera \"%s\""
+
+#: describe.c:3277
+msgid "Template"
+msgstr "Szablon"
+
+#: describe.c:3278
+msgid "Init options"
+msgstr "Opcje inicjacji"
+
+#: describe.c:3300
+msgid "List of text search dictionaries"
+msgstr "Lista słowników wyszukiwania tekstowego"
+
+#: describe.c:3340
+msgid "Init"
+msgstr "Init"
+
+#: describe.c:3341
+msgid "Lexize"
+msgstr "Lexize"
+
+#: describe.c:3368
+msgid "List of text search templates"
+msgstr "Lista szablonów wyszukiwania tekstowego"
+
+#: describe.c:3425
+msgid "List of text search configurations"
+msgstr "Lista konfiguracji wyszukiwania tekstowego"
+
+#: describe.c:3469
+#, c-format
+msgid "Did not find any text search configuration named \"%s\".\n"
+msgstr "Nie znaleziono konfiguracji wyszukiwania tekstowego o nazwie \"%s\".\n"
+
+#: describe.c:3535
+msgid "Token"
+msgstr "Token"
+
+#: describe.c:3536
+msgid "Dictionaries"
+msgstr "SÅ‚owniki"
+
+#: describe.c:3547
+#, c-format
+msgid "Text search configuration \"%s.%s\""
+msgstr "Konfiguracja wyszukiwania tekstowego \"%s.%s\""
+
+#: describe.c:3550
+#, c-format
+msgid "Text search configuration \"%s\""
+msgstr "Konfiguracja wyszukiwania tekstowego \"%s\""
+
+#: describe.c:3554
+#, c-format
+msgid ""
+"\n"
+"Parser: \"%s.%s\""
+msgstr ""
+"\n"
+"Analizator: \"%s.%s\""
+
+#: describe.c:3557
+#, c-format
+msgid ""
+"\n"
+"Parser: \"%s\""
+msgstr ""
+"\n"
+"Parser: \"%s\""
+
+#: describe.c:3589
+#, c-format
+msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje opakowań danych obcych.\n"
+
+#: describe.c:3603
+msgid "Handler"
+msgstr "Uchwyt"
+
+#: describe.c:3630
+msgid "List of foreign-data wrappers"
+msgstr "Lista opakowań danych obcych"
+
+#: describe.c:3653
+#, c-format
+msgid "The server (version %d.%d) does not support foreign servers.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje serwerów obcych.\n"
+
+#: describe.c:3665
+msgid "Foreign-data wrapper"
+msgstr "Opakowanie obcych danych"
+
+#: describe.c:3677 describe.c:3847
+msgid "Version"
+msgstr "Wersja"
+
+#: describe.c:3696
+msgid "List of foreign servers"
+msgstr "Lista serwerów obcych"
+
+#: describe.c:3719
+#, c-format
+msgid "The server (version %d.%d) does not support user mappings.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje przestrzeni mapowań użytkownika.\n"
+
+#: describe.c:3728 describe.c:3784
+msgid "Server"
+msgstr "Serwer"
+
+#: describe.c:3729
+msgid "User name"
+msgstr "Nazwa użytkownika"
+
+#: describe.c:3749
+msgid "List of user mappings"
+msgstr "Lista mapowań użytkownika"
+
+#: describe.c:3772
+#, c-format
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje tabel obcych.\n"
+
+#: describe.c:3810
+msgid "List of foreign tables"
+msgstr "Lista tabel obcych"
+
+#: describe.c:3833 describe.c:3887
+#, c-format
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "Serwer (wersja %d.%d) nie obsługuje rozszerzeń.\n"
+
+#: describe.c:3864
+msgid "List of installed extensions"
+msgstr "Lista zainstalowanych rozszerzeń"
+
+#: describe.c:3914
+#, c-format
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "Nie znaleziono żadnego rozszerzenia o nazwie \"%s\".\n"
+
+#: describe.c:3917
+#, c-format
+msgid "Did not find any extensions.\n"
+msgstr "Nie znaleziono żadnego rozszerzenia.\n"
+
+#: describe.c:3961
+msgid "Object Description"
+msgstr "Opis Obiektu"
+
+#: describe.c:3970
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr "Obiekty w rozszerzeniu \"%s\""
+
+#: sql_help.h:182 sql_help.h:837
+msgid "abort the current transaction"
+msgstr "przerywa bieżącą transakcję"
+
+#: sql_help.h:187
+msgid "change the definition of an aggregate function"
+msgstr "zmienia definicjÄ™ funkcji agregujÄ…cej"
+
+#: sql_help.h:192
+msgid "change the definition of a collation"
+msgstr "zmienia definicję porównania"
+
+#: sql_help.h:197
+msgid "change the definition of a conversion"
+msgstr "zmienia definicjÄ™ konwersji"
+
+#: sql_help.h:202
+msgid "change a database"
+msgstr "zmienia bazÄ™ danych"
+
+#: sql_help.h:207
+msgid "define default access privileges"
+msgstr "definiuje domyślne uprawnienia dostępu"
+
+#: sql_help.h:212
+msgid "change the definition of a domain"
+msgstr "zmienia definicjÄ™ domeny"
+
+#: sql_help.h:217
+msgid "change the definition of an extension"
+msgstr "zmienia definicjÄ™ rozszerzenia"
+
+#: sql_help.h:222
+msgid "change the definition of a foreign-data wrapper"
+msgstr "zmienia definicjÄ™ opakowania obcych danych"
+
+#: sql_help.h:227
+msgid "change the definition of a foreign table"
+msgstr "zmienia definicjÄ™ tabeli obcej"
+
+#: sql_help.h:232
+msgid "change the definition of a function"
+msgstr "zmienia definicjÄ™ funkcji"
+
+#: sql_help.h:237
+msgid "change role name or membership"
+msgstr "zmienia nazwę roli lub przynależność"
+
+#: sql_help.h:242
+msgid "change the definition of an index"
+msgstr "zmienia definicjÄ™ indeksu"
+
+#: sql_help.h:247
+msgid "change the definition of a procedural language"
+msgstr "zmienia definicję języka proceduralnego`"
+
+#: sql_help.h:252
+msgid "change the definition of a large object"
+msgstr "zmienia definicję dużego obiektu"
+
+#: sql_help.h:257
+msgid "change the definition of an operator"
+msgstr "zmienia definicjÄ™ operatora"
+
+#: sql_help.h:262
+msgid "change the definition of an operator class"
+msgstr "zmienia definicjÄ™ klasy operatora"
+
+#: sql_help.h:267
+msgid "change the definition of an operator family"
+msgstr "zmienia definicjÄ™ rodziny operatora"
+
+#: sql_help.h:272 sql_help.h:332
+msgid "change a database role"
+msgstr "zmienia rolÄ™ bazy danych"
+
+#: sql_help.h:277
+msgid "change the definition of a schema"
+msgstr "zmienia definicjÄ™ schematu"
+
+#: sql_help.h:282
+msgid "change the definition of a sequence generator"
+msgstr "zmienia definicjÄ™ generatora sekwencji"
+
+#: sql_help.h:287
+msgid "change the definition of a foreign server"
+msgstr "zmienia definicjÄ™ serwera obcego"
+
+#: sql_help.h:292
+msgid "change the definition of a table"
+msgstr "zmienia definicjÄ™ tabeli"
+
+#: sql_help.h:297
+msgid "change the definition of a tablespace"
+msgstr "zmienia definicjÄ™ przestrzeni tabel"
+
+#: sql_help.h:302
+msgid "change the definition of a text search configuration"
+msgstr "zmienia definicjÄ™ konfiguracji wyszukiwania tekstowego"
+
+#: sql_help.h:307
+msgid "change the definition of a text search dictionary"
+msgstr "zmienia definicję słownika wyszukiwania tekstowego"
+
+#: sql_help.h:312
+msgid "change the definition of a text search parser"
+msgstr "zmienia definicjÄ™ analizatora wyszukiwania tekstowego"
+
+#: sql_help.h:317
+msgid "change the definition of a text search template"
+msgstr "zmienia definicjÄ™ szablonu wyszukiwania tekstowego"
+
+#: sql_help.h:322
+msgid "change the definition of a trigger"
+msgstr "zmienia definicjÄ™ wyzwalacza"
+
+#: sql_help.h:327
+msgid "change the definition of a type"
+msgstr "zmienia definicjÄ™ typu"
+
+#: sql_help.h:337
+msgid "change the definition of a user mapping"
+msgstr "zmienia definicję mapowania użytkownika"
+
+#: sql_help.h:342
+msgid "change the definition of a view"
+msgstr "zmienia definicjÄ™ widoku"
+
+#: sql_help.h:347
+msgid "collect statistics about a database"
+msgstr "zbiera statystyki na temat bazy danych"
+
+#: sql_help.h:352 sql_help.h:902
+msgid "start a transaction block"
+msgstr "poczÄ…tek bloku transakcji"
+
+#: sql_help.h:357
+msgid "force a transaction log checkpoint"
+msgstr "wymuszenie punkty kontrolne logów transakcji"
+
+#: sql_help.h:362
+msgid "close a cursor"
+msgstr "zamyka kursor"
+
+#: sql_help.h:367
+msgid "cluster a table according to an index"
+msgstr "klaster lub tabela zgodna z indeksem"
+
+#: sql_help.h:372
+msgid "define or change the comment of an object"
+msgstr "definiuje lub zmienia komentarz obiektu"
+
+#: sql_help.h:377 sql_help.h:747
+msgid "commit the current transaction"
+msgstr "zatwierdzenie bieżącej transakcji"
+
+#: sql_help.h:382
+msgid "commit a transaction that was earlier prepared for two-phase commit"
+msgstr ""
+"zatwierdzenie transakcji uprzednio przygotowanej do zatwierdzenia dwufazowego"
+
+#: sql_help.h:387
+msgid "copy data between a file and a table"
+msgstr "kopiuje dane między plikiem i tabelą"
+
+#: sql_help.h:392
+msgid "define a new aggregate function"
+msgstr "definiuje nowÄ… funkcjÄ™ agregujÄ…cÄ…"
+
+#: sql_help.h:397
+msgid "define a new cast"
+msgstr "definiuje nowe rzutowanie"
+
+#: sql_help.h:402
+msgid "define a new collation"
+msgstr "definiuje nowe porównanie"
+
+#: sql_help.h:407
+msgid "define a new encoding conversion"
+msgstr "definiuje nowe przekształcenie kodowania"
+
+#: sql_help.h:412
+msgid "create a new database"
+msgstr "tworzy nowÄ… bazÄ™ danych"
+
+#: sql_help.h:417
+msgid "define a new domain"
+msgstr "definiuje nowÄ… domenÄ™"
+
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "instaluje nowe rozszerzenie"
+
+#: sql_help.h:427
+msgid "define a new foreign-data wrapper"
+msgstr "definiuje nowe opakowania obcych danych"
+
+#: sql_help.h:432
+msgid "define a new foreign table"
+msgstr "definiuje nowÄ… tabelÄ™ obcÄ…"
+
+#: sql_help.h:437
+msgid "define a new function"
+msgstr "definiuje nowÄ… funkcjÄ™"
+
+#: sql_help.h:442 sql_help.h:472 sql_help.h:542
+msgid "define a new database role"
+msgstr "definiuje nowÄ… rolÄ™ bazy danych"
+
+#: sql_help.h:447
+msgid "define a new index"
+msgstr "definiuje nowy indeks"
+
+#: sql_help.h:452
+msgid "define a new procedural language"
+msgstr "definiuje nowy język proceduralny"
+
+#: sql_help.h:457
+msgid "define a new operator"
+msgstr "definiuje nowy operator"
+
+#: sql_help.h:462
+msgid "define a new operator class"
+msgstr "definiuje nowÄ… klasÄ™ operatora"
+
+#: sql_help.h:467
+msgid "define a new operator family"
+msgstr "definiuje nowÄ… rodzinÄ™ operatora"
+
+#: sql_help.h:477
+#, fuzzy
+msgid "define a new rewrite rule"
+msgstr "definiuje nową regułę przepisania"
+
+#: sql_help.h:482
+msgid "define a new schema"
+msgstr "definiuje nowy schemat"
+
+#: sql_help.h:487
+msgid "define a new sequence generator"
+msgstr "definiuje nowy generator sekwencji"
+
+#: sql_help.h:492
+msgid "define a new foreign server"
+msgstr "definiuje nowy serwer obcy"
+
+#: sql_help.h:497
+msgid "define a new table"
+msgstr "definiuje nowÄ… tabelÄ™"
+
+#: sql_help.h:502 sql_help.h:867
+msgid "define a new table from the results of a query"
+msgstr "definiuje nową tabelę z wyników zapytania"
+
+#: sql_help.h:507
+msgid "define a new tablespace"
+msgstr "definiuje nową przestrzeń tabel"
+
+#: sql_help.h:512
+msgid "define a new text search configuration"
+msgstr "definiuje nowÄ… konfiguracjÄ™ wyszukiwania tekstowego"
+
+#: sql_help.h:517
+msgid "define a new text search dictionary"
+msgstr "definiuje nowy słownik wyszukiwania tekstowego"
+
+#: sql_help.h:522
+msgid "define a new text search parser"
+msgstr "definiuje nowy analizator wyszukiwania tekstowego"
+
+#: sql_help.h:527
+msgid "define a new text search template"
+msgstr "definiuje nowy szablon wyszukiwania tekstowego"
+
+#: sql_help.h:532
+msgid "define a new trigger"
+msgstr "definiuje nowy wyzwalacz"
+
+#: sql_help.h:537
+msgid "define a new data type"
+msgstr "definiuje nowy typ danych"
+
+#: sql_help.h:547
+msgid "define a new mapping of a user to a foreign server"
+msgstr "definiuje nowe mapowanie użytkownika do serwera obcego"
+
+#: sql_help.h:552
+msgid "define a new view"
+msgstr "definiuje nowy widok"
+
+#: sql_help.h:557
+#, fuzzy
+msgid "deallocate a prepared statement"
+msgstr "przemieszcza przygotowane wyrażenie"
+
+#: sql_help.h:562
+msgid "define a cursor"
+msgstr "definiuje kursor"
+
+#: sql_help.h:567
+msgid "delete rows of a table"
+msgstr "usuwa wiersze z tabeli"
+
+#: sql_help.h:572
+msgid "discard session state"
+msgstr "odrzuca stan sesji"
+
+#: sql_help.h:577
+msgid "execute an anonymous code block"
+msgstr "wykonuje anonimowy blok kodu"
+
+#: sql_help.h:582
+msgid "remove an aggregate function"
+msgstr "definiuje funkcjÄ™ agregujÄ…cÄ…"
+
+#: sql_help.h:587
+msgid "remove a cast"
+msgstr "usuwa rzutowanie"
+
+#: sql_help.h:592
+msgid "remove a collation"
+msgstr "usuwa porównanie"
+
+#: sql_help.h:597
+msgid "remove a conversion"
+msgstr "usuwa konwersjÄ™"
+
+#: sql_help.h:602
+msgid "remove a database"
+msgstr "usuwa bazÄ™ danych"
+
+#: sql_help.h:607
+msgid "remove a domain"
+msgstr "usuwa domenÄ™"
+
+#: sql_help.h:612
+msgid "remove an extension"
+msgstr "usuwa rozszerzenie"
+
+#: sql_help.h:617
+msgid "remove a foreign-data wrapper"
+msgstr "usuwa opakowanie obcych danych"
+
+#: sql_help.h:622
+msgid "remove a foreign table"
+msgstr "usuwa tabelÄ™ obcÄ…"
+
+#: sql_help.h:627
+msgid "remove a function"
+msgstr "usuwa funkcjÄ™"
+
+#: sql_help.h:632 sql_help.h:667 sql_help.h:732
+msgid "remove a database role"
+msgstr "usuwa rolÄ™ bazy danych"
+
+#: sql_help.h:637
+msgid "remove an index"
+msgstr "usuwa indeks"
+
+#: sql_help.h:642
+msgid "remove a procedural language"
+msgstr "usuwa język proceduralny"
+
+#: sql_help.h:647
+msgid "remove an operator"
+msgstr "usuwa operator"
+
+#: sql_help.h:652
+msgid "remove an operator class"
+msgstr "usuwa klasÄ™ operatora"
+
+#: sql_help.h:657
+msgid "remove an operator family"
+msgstr "usuwa rodzinÄ™ operatora"
+
+#: sql_help.h:662
+msgid "remove database objects owned by a database role"
+msgstr "usuwa obiekty bazy danych których właścicielem jest rola bazy danych"
+
+#: sql_help.h:672
+#, fuzzy
+msgid "remove a rewrite rule"
+msgstr "usuwa regułę przepisywania"
+
+#: sql_help.h:677
+msgid "remove a schema"
+msgstr "usuwa schemat"
+
+#: sql_help.h:682
+msgid "remove a sequence"
+msgstr "usuwa sekwencjÄ™"
+
+#: sql_help.h:687
+msgid "remove a foreign server descriptor"
+msgstr "usuwa deskryptor serwera obcego"
+
+#: sql_help.h:692
+msgid "remove a table"
+msgstr "usuwa tabelÄ™"
+
+#: sql_help.h:697
+msgid "remove a tablespace"
+msgstr "usuwa przestrzeń tabel"
+
+#: sql_help.h:702
+msgid "remove a text search configuration"
+msgstr "usuwa konfiguracjÄ™ wyszukiwania tekstowego"
+
+#: sql_help.h:707
+msgid "remove a text search dictionary"
+msgstr "usuwa słownik wyszukiwania tekstowego"
+
+#: sql_help.h:712
+msgid "remove a text search parser"
+msgstr "usuwa analizator wyszukiwania tekstowego"
+
+#: sql_help.h:717
+msgid "remove a text search template"
+msgstr "usuwa szablon wyszukiwania tekstowego"
+
+#: sql_help.h:722
+msgid "remove a trigger"
+msgstr "usuwa wyzwalacz"
+
+#: sql_help.h:727
+msgid "remove a data type"
+msgstr "usuwa typ danych"
+
+#: sql_help.h:737
+msgid "remove a user mapping for a foreign server"
+msgstr "usuwa mapowanie użytkownika dla serwera obcego"
+
+#: sql_help.h:742
+msgid "remove a view"
+msgstr "usuwa widok"
+
+#: sql_help.h:752
+msgid "execute a prepared statement"
+msgstr "wykonuje przygotowane wyrażenie"
+
+#: sql_help.h:757
+msgid "show the execution plan of a statement"
+msgstr "pokazuje plan wykonania wyrażenia"
+
+#: sql_help.h:762
+msgid "retrieve rows from a query using a cursor"
+msgstr "pobiera wiersze z zapytania przy użyciu kursora"
+
+#: sql_help.h:767
+msgid "define access privileges"
+msgstr "definiuje uprawnienia dostępu"
+
+#: sql_help.h:772
+msgid "create new rows in a table"
+msgstr "tworzy nowe wiersze w tabeli"
+
+#: sql_help.h:777
+msgid "listen for a notification"
+msgstr "nasłuchuje powiadomień"
+
+#: sql_help.h:782
+msgid "load a shared library file"
+msgstr "wczytuje współdzieloną bibliotekę plików"
+
+#: sql_help.h:787
+msgid "lock a table"
+msgstr "blokuje tabelÄ™"
+
+#: sql_help.h:792
+msgid "position a cursor"
+msgstr "pozycjonuje kursor"
+
+#: sql_help.h:797
+msgid "generate a notification"
+msgstr "generuje powiadomienie"
+
+#: sql_help.h:802
+msgid "prepare a statement for execution"
+msgstr "przygotowuje wyrażenie do wykonania"
+
+#: sql_help.h:807
+msgid "prepare the current transaction for two-phase commit"
+msgstr "przygotowane bieżącej transakcji do zatwierdzenia dwufazowego"
+
+#: sql_help.h:812
+msgid "change the ownership of database objects owned by a database role"
+msgstr ""
+"zmienia posiadacza obiektów bazy danych, których właścicielem jest rola bazy "
+"danych"
+
+#: sql_help.h:817
+msgid "rebuild indexes"
+msgstr "przebudowuje indeksy"
+
+#: sql_help.h:822
+msgid "destroy a previously defined savepoint"
+msgstr "usuwa zdefiniowany poprzednio punkt zapisu"
+
+#: sql_help.h:827
+msgid "restore the value of a run-time parameter to the default value"
+msgstr "przywraca wartość domyślną parametru czasu wykonania"
+
+#: sql_help.h:832
+msgid "remove access privileges"
+msgstr "usuwa uprawnienia dostępu"
+
+#: sql_help.h:842
+msgid "cancel a transaction that was earlier prepared for two-phase commit"
+msgstr "anuluje transakcjÄ™ uprzednio przygotowanÄ… do zatwierdzenia dwufazowego"
+
+#: sql_help.h:847
+msgid "roll back to a savepoint"
+msgstr "wycofanie do punktu zapisu"
+
+#: sql_help.h:852
+msgid "define a new savepoint within the current transaction"
+msgstr "definiuje punkt zapisu w bieżącej transakcji"
+
+#: sql_help.h:857
+msgid "define or change a security label applied to an object"
+msgstr "definiuje zmianę etykiety bezpieczeństwa zastosowanych do obiektu"
+
+#: sql_help.h:862 sql_help.h:907 sql_help.h:937
+msgid "retrieve rows from a table or view"
+msgstr "odczytuje wiersza z tabeli lub widoku"
+
+#: sql_help.h:872
+msgid "change a run-time parameter"
+msgstr "zmienia parametr czasu wykonania"
+
+#: sql_help.h:877
+msgid "set constraint check timing for the current transaction"
+msgstr "ustawia pomiar czasu ograniczeń sprawdzających dla bieżącej transakcji"
+
+#: sql_help.h:882
+msgid "set the current user identifier of the current session"
+msgstr "ustawia identyfikator bieżącego użytkownika z bieżącej sesji"
+
+#: sql_help.h:887
+msgid ""
+"set the session user identifier and the current user identifier of the "
+"current session"
+msgstr ""
+"ustawia identyfikator użytkownika sesji i identyfikator bieżącego "
+"użytkownika z bieżącej sesji"
+
+#: sql_help.h:892
+msgid "set the characteristics of the current transaction"
+msgstr "ustawia charakterystyki bieżącej transakcji"
+
+#: sql_help.h:897
+msgid "show the value of a run-time parameter"
+msgstr "pokazuje wartość parametru czasu wykonania"
+
+#: sql_help.h:912
+msgid "empty a table or set of tables"
+msgstr "opróżnia tabelę lub grupę tabel"
+
+#: sql_help.h:917
+msgid "stop listening for a notification"
+msgstr "zatrzymuje nasłuchiwania powiadomień"
+
+#: sql_help.h:922
+msgid "update rows of a table"
+msgstr "modyfikuje wiersze w tabeli"
+
+#: sql_help.h:927
+msgid "garbage-collect and optionally analyze a database"
+msgstr "porządkuje śmieci i opcjonalnie analizuje bazy danych"
+
+#: sql_help.h:932
+msgid "compute a set of rows"
+msgstr "oblicza zbiór wierszy"
+
+#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:44 sql_help.c:46
+#: sql_help.c:48 sql_help.c:59 sql_help.c:61 sql_help.c:63 sql_help.c:87
+#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
+#: sql_help.c:102 sql_help.c:104 sql_help.c:179 sql_help.c:181 sql_help.c:182
+#: sql_help.c:184 sql_help.c:186 sql_help.c:188 sql_help.c:276 sql_help.c:281
+#: sql_help.c:306 sql_help.c:308 sql_help.c:311 sql_help.c:313 sql_help.c:351
+#: sql_help.c:356 sql_help.c:361 sql_help.c:366 sql_help.c:404 sql_help.c:406
+#: sql_help.c:408 sql_help.c:411 sql_help.c:421 sql_help.c:423 sql_help.c:442
+#: sql_help.c:446 sql_help.c:459 sql_help.c:462 sql_help.c:465 sql_help.c:485
+#: sql_help.c:497 sql_help.c:505 sql_help.c:508 sql_help.c:511 sql_help.c:541
+#: sql_help.c:547 sql_help.c:549 sql_help.c:553 sql_help.c:556 sql_help.c:559
+#: sql_help.c:569 sql_help.c:571 sql_help.c:588 sql_help.c:597 sql_help.c:599
+#: sql_help.c:601 sql_help.c:675 sql_help.c:677 sql_help.c:680 sql_help.c:682
+#: sql_help.c:740 sql_help.c:742 sql_help.c:744 sql_help.c:747 sql_help.c:768
+#: sql_help.c:771 sql_help.c:774 sql_help.c:777 sql_help.c:781 sql_help.c:783
+#: sql_help.c:785 sql_help.c:787 sql_help.c:801 sql_help.c:804 sql_help.c:806
+#: sql_help.c:808 sql_help.c:818 sql_help.c:820 sql_help.c:830 sql_help.c:832
+#: sql_help.c:841 sql_help.c:862 sql_help.c:864 sql_help.c:866 sql_help.c:869
+#: sql_help.c:871 sql_help.c:873 sql_help.c:911 sql_help.c:917 sql_help.c:919
+#: sql_help.c:922 sql_help.c:924 sql_help.c:926 sql_help.c:951 sql_help.c:954
+#: sql_help.c:956 sql_help.c:958 sql_help.c:960 sql_help.c:1000
+#: sql_help.c:1183 sql_help.c:1191 sql_help.c:1235 sql_help.c:1239
+#: sql_help.c:1249 sql_help.c:1267 sql_help.c:1290 sql_help.c:1322
+#: sql_help.c:1367 sql_help.c:1409 sql_help.c:1431 sql_help.c:1451
+#: sql_help.c:1452 sql_help.c:1469 sql_help.c:1489 sql_help.c:1511
+#: sql_help.c:1539 sql_help.c:1560 sql_help.c:1590 sql_help.c:1771
+#: sql_help.c:1784 sql_help.c:1801 sql_help.c:1817 sql_help.c:1840
+#: sql_help.c:1883 sql_help.c:1887 sql_help.c:1889 sql_help.c:1907
+#: sql_help.c:1934 sql_help.c:1967 sql_help.c:1977 sql_help.c:1986
+#: sql_help.c:2030 sql_help.c:2048 sql_help.c:2056 sql_help.c:2064
+#: sql_help.c:2072 sql_help.c:2088 sql_help.c:2096 sql_help.c:2105
+#: sql_help.c:2116 sql_help.c:2124 sql_help.c:2132 sql_help.c:2140
+#: sql_help.c:2150 sql_help.c:2159 sql_help.c:2168 sql_help.c:2176
+#: sql_help.c:2184 sql_help.c:2193 sql_help.c:2201 sql_help.c:2217
+#: sql_help.c:2233 sql_help.c:2241 sql_help.c:2249 sql_help.c:2257
+#: sql_help.c:2265 sql_help.c:2274 sql_help.c:2282 sql_help.c:2299
+#: sql_help.c:2314 sql_help.c:2506 sql_help.c:2557 sql_help.c:2584
+#: sql_help.c:2927 sql_help.c:2973 sql_help.c:3080
+msgid "name"
+msgstr "nazwa"
+
+#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:317 sql_help.c:320
+#: sql_help.c:2031
+msgid "type"
+msgstr "typ"
+
+#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:312
+#: sql_help.c:360 sql_help.c:393 sql_help.c:405 sql_help.c:422 sql_help.c:461
+#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:681
+#: sql_help.c:741 sql_help.c:784 sql_help.c:805 sql_help.c:819 sql_help.c:831
+#: sql_help.c:843 sql_help.c:870 sql_help.c:918 sql_help.c:959
+msgid "new_name"
+msgstr "nowa_nazwa"
+
+#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:187
+#: sql_help.c:282 sql_help.c:322 sql_help.c:365 sql_help.c:424 sql_help.c:433
+#: sql_help.c:445 sql_help.c:464 sql_help.c:510 sql_help.c:572 sql_help.c:598
+#: sql_help.c:617 sql_help.c:725 sql_help.c:743 sql_help.c:786 sql_help.c:807
+#: sql_help.c:865 sql_help.c:957
+msgid "new_owner"
+msgstr "nowy_właściciel"
+
+#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:189 sql_help.c:228
+#: sql_help.c:314 sql_help.c:370 sql_help.c:449 sql_help.c:467 sql_help.c:513
+#: sql_help.c:602 sql_help.c:683 sql_help.c:788 sql_help.c:809 sql_help.c:821
+#: sql_help.c:833 sql_help.c:872 sql_help.c:961
+msgid "new_schema"
+msgstr "nowy_schemat"
+
+#: sql_help.c:88 sql_help.c:279 sql_help.c:323 sql_help.c:542 sql_help.c:614
+#: sql_help.c:802 sql_help.c:912 sql_help.c:938 sql_help.c:1142
+#: sql_help.c:1147 sql_help.c:1325 sql_help.c:1343 sql_help.c:1410
+#: sql_help.c:1540 sql_help.c:1611 sql_help.c:1786 sql_help.c:1935
+#: sql_help.c:1957 sql_help.c:2332
+msgid "option"
+msgstr "opcja"
+
+#: sql_help.c:89 sql_help.c:543 sql_help.c:913 sql_help.c:1411 sql_help.c:1541
+#: sql_help.c:1936
+msgid "where option can be:"
+msgstr "gdzie opcja może przyjmować:"
+
+#: sql_help.c:90 sql_help.c:544 sql_help.c:914 sql_help.c:1274 sql_help.c:1542
+#: sql_help.c:1937
+msgid "connlimit"
+msgstr "limitpołączeń"
+
+#: sql_help.c:96 sql_help.c:726
+msgid "new_tablespace"
+msgstr "nowa_przestrzeńtabel"
+
+#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:374 sql_help.c:376
+#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:920
+#: sql_help.c:923 sql_help.c:925 sql_help.c:1378 sql_help.c:2601
+#: sql_help.c:2916
+msgid "configuration_parameter"
+msgstr "parametr_konfiguracji"
+
+#: sql_help.c:99 sql_help.c:280 sql_help.c:324 sql_help.c:375 sql_help.c:410
+#: sql_help.c:552 sql_help.c:615 sql_help.c:702 sql_help.c:720 sql_help.c:746
+#: sql_help.c:803 sql_help.c:921 sql_help.c:939 sql_help.c:1326
+#: sql_help.c:1344 sql_help.c:1379 sql_help.c:1380 sql_help.c:1439
+#: sql_help.c:1612 sql_help.c:1686 sql_help.c:1694 sql_help.c:1726
+#: sql_help.c:1748 sql_help.c:1787 sql_help.c:1958 sql_help.c:2917
+#: sql_help.c:2918
+msgid "value"
+msgstr "wartość"
+
+#: sql_help.c:151
+msgid "target_role"
+msgstr "rola_docelowa"
+
+#: sql_help.c:152 sql_help.c:1575 sql_help.c:2430 sql_help.c:2437
+#: sql_help.c:2449 sql_help.c:2455 sql_help.c:2684 sql_help.c:2691
+#: sql_help.c:2703 sql_help.c:2709
+msgid "schema_name"
+msgstr "nazwa_schematu"
+
+#: sql_help.c:153
+msgid "abbreviated_grant_or_revoke"
+msgstr "skrót_przyznania_lub_odebrania_uprawnień"
+
+#: sql_help.c:154
+msgid "where abbreviated_grant_or_revoke is one of:"
+msgstr "gdzie skrót_przyznania_lub_odebrania_uprawnień to jedno z:"
+
+#: sql_help.c:155 sql_help.c:156 sql_help.c:157 sql_help.c:158 sql_help.c:159
+#: sql_help.c:160 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
+#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1545 sql_help.c:1546
+#: sql_help.c:1547 sql_help.c:1548 sql_help.c:1549 sql_help.c:1940
+#: sql_help.c:1941 sql_help.c:1942 sql_help.c:1943 sql_help.c:1944
+#: sql_help.c:2431 sql_help.c:2435 sql_help.c:2438 sql_help.c:2440
+#: sql_help.c:2442 sql_help.c:2444 sql_help.c:2450 sql_help.c:2452
+#: sql_help.c:2454 sql_help.c:2456 sql_help.c:2458 sql_help.c:2459
+#: sql_help.c:2460 sql_help.c:2685 sql_help.c:2689 sql_help.c:2692
+#: sql_help.c:2694 sql_help.c:2696 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2706 sql_help.c:2708 sql_help.c:2710 sql_help.c:2712
+#: sql_help.c:2713 sql_help.c:2714 sql_help.c:2937
+msgid "role_name"
+msgstr "nazwa_roli"
+
+#: sql_help.c:180 sql_help.c:693 sql_help.c:695 sql_help.c:953 sql_help.c:1293
+#: sql_help.c:1297 sql_help.c:1435 sql_help.c:1698 sql_help.c:1708
+#: sql_help.c:1730 sql_help.c:2474 sql_help.c:2822 sql_help.c:2823
+#: sql_help.c:2827 sql_help.c:2832 sql_help.c:2891 sql_help.c:2892
+#: sql_help.c:2897 sql_help.c:2902 sql_help.c:3025 sql_help.c:3026
+#: sql_help.c:3030 sql_help.c:3035 sql_help.c:3106 sql_help.c:3108
+#: sql_help.c:3139 sql_help.c:3181 sql_help.c:3182 sql_help.c:3186
+#: sql_help.c:3191
+msgid "expression"
+msgstr "wyrażenie"
+
+#: sql_help.c:183
+msgid "domain_constraint"
+msgstr "ograniczenie_domeny"
+
+#: sql_help.c:185 sql_help.c:708 sql_help.c:709 sql_help.c:728 sql_help.c:1059
+#: sql_help.c:1296 sql_help.c:1697 sql_help.c:1707
+msgid "constraint_name"
+msgstr "nazwa_ograniczenia"
+
+#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1308
+#: sql_help.c:2080
+msgid "extension_name"
+msgstr "nazwa_rozszerzenia"
+
+#: sql_help.c:226 sql_help.c:613
+msgid "new_version"
+msgstr "nowa_wersja"
+
+#: sql_help.c:230 sql_help.c:232
+msgid "member_object"
+msgstr "obiekt_składowy"
+
+#: sql_help.c:233
+msgid "where member_object is:"
+msgstr "gdzie obiekt_składowy to:"
+
+#: sql_help.c:234 sql_help.c:1052 sql_help.c:2771
+msgid "agg_name"
+msgstr "nazwa_agreg"
+
+#: sql_help.c:235 sql_help.c:1053 sql_help.c:2772
+msgid "agg_type"
+msgstr "typ_agreg"
+
+#: sql_help.c:236 sql_help.c:1054 sql_help.c:1215 sql_help.c:1219
+#: sql_help.c:1221 sql_help.c:2039
+msgid "source_type"
+msgstr "typ_źródłowy"
+
+#: sql_help.c:237 sql_help.c:1055 sql_help.c:1216 sql_help.c:1220
+#: sql_help.c:1222 sql_help.c:2040
+msgid "target_type"
+msgstr "typ_docelowy"
+
+#: sql_help.c:238 sql_help.c:239 sql_help.c:240 sql_help.c:241 sql_help.c:242
+#: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:255 sql_help.c:256
+#: sql_help.c:257 sql_help.c:258 sql_help.c:259 sql_help.c:260 sql_help.c:261
+#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1056
+#: sql_help.c:1061 sql_help.c:1062 sql_help.c:1063 sql_help.c:1064
+#: sql_help.c:1065 sql_help.c:1066 sql_help.c:1071 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1080 sql_help.c:1081 sql_help.c:1084
+#: sql_help.c:1085 sql_help.c:1086 sql_help.c:1087 sql_help.c:1088
+#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1096 sql_help.c:2768 sql_help.c:2773
+#: sql_help.c:2774 sql_help.c:2780 sql_help.c:2781 sql_help.c:2782
+#: sql_help.c:2783 sql_help.c:2784
+msgid "object_name"
+msgstr "nazwa_obiektu"
+
+#: sql_help.c:243 sql_help.c:495 sql_help.c:1067 sql_help.c:1217
+#: sql_help.c:1252 sql_help.c:1470 sql_help.c:1501 sql_help.c:1845
+#: sql_help.c:2445 sql_help.c:2699 sql_help.c:2775 sql_help.c:2848
+#: sql_help.c:2853 sql_help.c:3051 sql_help.c:3056 sql_help.c:3207
+#: sql_help.c:3212
+msgid "function_name"
+msgstr "nazwa_funkcji"
+
+#: sql_help.c:244 sql_help.c:352 sql_help.c:357 sql_help.c:362 sql_help.c:367
+#: sql_help.c:1068 sql_help.c:1368 sql_help.c:2106 sql_help.c:2446
+#: sql_help.c:2700 sql_help.c:2776
+msgid "argmode"
+msgstr "trybarg"
+
+#: sql_help.c:245 sql_help.c:353 sql_help.c:358 sql_help.c:363 sql_help.c:368
+#: sql_help.c:1069 sql_help.c:1369 sql_help.c:2107 sql_help.c:2777
+msgid "argname"
+msgstr "nazwaarg"
+
+#: sql_help.c:246 sql_help.c:354 sql_help.c:359 sql_help.c:364 sql_help.c:369
+#: sql_help.c:1070 sql_help.c:1370 sql_help.c:2108 sql_help.c:2778
+msgid "argtype"
+msgstr "typarg"
+
+#: sql_help.c:247 sql_help.c:488 sql_help.c:1073 sql_help.c:1494
+msgid "operator_name"
+msgstr "nazwa_operatora"
+
+#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1074
+#: sql_help.c:1471 sql_help.c:2141
+msgid "left_type"
+msgstr "typ_lewy"
+
+#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1075
+#: sql_help.c:1472 sql_help.c:2142
+msgid "right_type"
+msgstr "typ_prawy"
+
+#: sql_help.c:251 sql_help.c:253 sql_help.c:460 sql_help.c:463 sql_help.c:466
+#: sql_help.c:486 sql_help.c:498 sql_help.c:506 sql_help.c:509 sql_help.c:512
+#: sql_help.c:1077 sql_help.c:1079 sql_help.c:1491 sql_help.c:1512
+#: sql_help.c:1713 sql_help.c:2151 sql_help.c:2160
+msgid "index_method"
+msgstr "metoda_indeksowania"
+
+#: sql_help.c:277 sql_help.c:1323
+msgid "handler_function"
+msgstr "funkcja_uchwytu"
+
+#: sql_help.c:278 sql_help.c:1324
+msgid "validator_function"
+msgstr "funkcja_walidatora"
+
+#: sql_help.c:307 sql_help.c:355 sql_help.c:676 sql_help.c:863 sql_help.c:1704
+#: sql_help.c:1705 sql_help.c:1721 sql_help.c:1722
+msgid "action"
+msgstr "akcja"
+
+#: sql_help.c:309 sql_help.c:316 sql_help.c:318 sql_help.c:319 sql_help.c:321
+#: sql_help.c:596 sql_help.c:678 sql_help.c:685 sql_help.c:689 sql_help.c:690
+#: sql_help.c:694 sql_help.c:696 sql_help.c:697 sql_help.c:698 sql_help.c:700
+#: sql_help.c:703 sql_help.c:705 sql_help.c:952 sql_help.c:955 sql_help.c:970
+#: sql_help.c:1140 sql_help.c:1144 sql_help.c:1156 sql_help.c:1157
+#: sql_help.c:1434 sql_help.c:1597 sql_help.c:1729 sql_help.c:2432
+#: sql_help.c:2433 sql_help.c:2473 sql_help.c:2686 sql_help.c:2687
+#: sql_help.c:3105 sql_help.c:3107 sql_help.c:3124 sql_help.c:3127
+msgid "column"
+msgstr "kolumna"
+
+#: sql_help.c:310 sql_help.c:679
+msgid "new_column"
+msgstr "nowa_kolumna"
+
+#: sql_help.c:315 sql_help.c:371 sql_help.c:684 sql_help.c:876
+msgid "where action is one of:"
+msgstr "gdzie akcja to jedna z:"
+
+#: sql_help.c:372 sql_help.c:1376
+msgid "execution_cost"
+msgstr "koszt_wykonania"
+
+#: sql_help.c:373 sql_help.c:1377
+msgid "result_rows"
+msgstr "wiersze_wynikowe"
+
+#: sql_help.c:388 sql_help.c:390 sql_help.c:392
+msgid "group_name"
+msgstr "nazwa_grupy"
+
+#: sql_help.c:389 sql_help.c:391 sql_help.c:936 sql_help.c:1268
+#: sql_help.c:1576 sql_help.c:1578 sql_help.c:1759 sql_help.c:1955
+#: sql_help.c:2290 sql_help.c:2947
+msgid "user_name"
+msgstr "nazwa_użytkownika"
+
+#: sql_help.c:407 sql_help.c:1758 sql_help.c:2225 sql_help.c:2457
+#: sql_help.c:2711
+msgid "tablespace_name"
+msgstr "nazwa_przestrzenitabel"
+
+#: sql_help.c:409 sql_help.c:412 sql_help.c:719 sql_help.c:721 sql_help.c:1438
+#: sql_help.c:1685 sql_help.c:1693 sql_help.c:1725 sql_help.c:1747
+msgid "storage_parameter"
+msgstr "parametr_przechowywania"
+
+#: sql_help.c:432 sql_help.c:1072 sql_help.c:2779
+msgid "large_object_oid"
+msgstr "oid_dużego_obiektu"
+
+#: sql_help.c:487 sql_help.c:499 sql_help.c:1493
+msgid "strategy_number"
+msgstr "numer_strategii"
+
+#: sql_help.c:489 sql_help.c:490 sql_help.c:493 sql_help.c:494 sql_help.c:500
+#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1495
+#: sql_help.c:1496 sql_help.c:1499 sql_help.c:1500
+msgid "op_type"
+msgstr "typ_op"
+
+#: sql_help.c:491 sql_help.c:1497
+msgid "sort_family_name"
+msgstr "nazwa_rodziny_sortowania"
+
+#: sql_help.c:492 sql_help.c:502 sql_help.c:1498
+msgid "support_number"
+msgstr "numer_obsługi"
+
+#: sql_help.c:496 sql_help.c:1218 sql_help.c:1502
+msgid "argument_type"
+msgstr "typ_argumentu"
+
+#: sql_help.c:545 sql_help.c:915 sql_help.c:1412 sql_help.c:1543
+#: sql_help.c:1938
+msgid "password"
+msgstr "hasło"
+
+#: sql_help.c:546 sql_help.c:916 sql_help.c:1413 sql_help.c:1544
+#: sql_help.c:1939
+msgid "timestamp"
+msgstr "znacznik_czasu"
+
+#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2439
+#: sql_help.c:2693
+msgid "database_name"
+msgstr "nazwa_bazydanych"
+
+#: sql_help.c:589 sql_help.c:1591
+msgid "increment"
+msgstr "przyrost"
+
+#: sql_help.c:590 sql_help.c:1592
+msgid "minvalue"
+msgstr "wartośćmin"
+
+#: sql_help.c:591 sql_help.c:1593
+msgid "maxvalue"
+msgstr "wartośćmaks"
+
+#: sql_help.c:592 sql_help.c:1594 sql_help.c:2835 sql_help.c:2905
+#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
+msgid "start"
+msgstr "poczÄ…tek"
+
+#: sql_help.c:593
+msgid "restart"
+msgstr "restart"
+
+#: sql_help.c:594 sql_help.c:1595
+msgid "cache"
+msgstr "pamięć_podręczna"
+
+#: sql_help.c:612 sql_help.c:616 sql_help.c:937 sql_help.c:1342
+#: sql_help.c:1607 sql_help.c:1956 sql_help.c:2209 sql_help.c:2291
+#: sql_help.c:2443 sql_help.c:2697
+msgid "server_name"
+msgstr "nazwa_serwera"
+
+#: sql_help.c:686 sql_help.c:691 sql_help.c:878 sql_help.c:882 sql_help.c:1291
+#: sql_help.c:1341 sql_help.c:1490 sql_help.c:1678 sql_help.c:1885
+#: sql_help.c:2558
+msgid "data_type"
+msgstr "typ_danych"
+
+#: sql_help.c:687 sql_help.c:692 sql_help.c:879 sql_help.c:883 sql_help.c:1292
+#: sql_help.c:1436 sql_help.c:1679 sql_help.c:1886
+msgid "collation"
+msgstr "porównanie"
+
+#: sql_help.c:688 sql_help.c:1680 sql_help.c:1691
+msgid "column_constraint"
+msgstr "ograniczenie_kolumny"
+
+#: sql_help.c:699
+msgid "integer"
+msgstr "liczba_całkowita"
+
+#: sql_help.c:701 sql_help.c:704
+msgid "attribute_option"
+msgstr "opcja_atrybutu"
+
+#: sql_help.c:706 sql_help.c:1681 sql_help.c:1692
+msgid "table_constraint"
+msgstr "ograniczenie_tabeli"
+
+#: sql_help.c:707
+msgid "table_constraint_using_index"
+msgstr "ograniczenie_tabeli_używające_indeksu"
+
+#: sql_help.c:710 sql_help.c:711 sql_help.c:712 sql_help.c:713 sql_help.c:1093
+msgid "trigger_name"
+msgstr "nazwa_wyzwalacza"
+
+#: sql_help.c:714 sql_help.c:715 sql_help.c:716 sql_help.c:717
+#, fuzzy
+msgid "rewrite_rule_name"
+msgstr "nazwa_reguły"
+
+#: sql_help.c:718 sql_help.c:729 sql_help.c:1010
+msgid "index_name"
+msgstr "nazwa_indeksu"
+
+#: sql_help.c:722 sql_help.c:723 sql_help.c:1682 sql_help.c:1684
+msgid "parent_table"
+msgstr "tabela_nadrzędna"
+
+#: sql_help.c:724 sql_help.c:1689
+msgid "type_name"
+msgstr "nazwa_typu"
+
+#: sql_help.c:727
+msgid "and table_constraint_using_index is:"
+msgstr "a ograniczenie_tabeli_używające_indeksu to:"
+
+#: sql_help.c:745 sql_help.c:748
+msgid "tablespace_option"
+msgstr "opcja_przestrzeni_tabel"
+
+#: sql_help.c:769 sql_help.c:772 sql_help.c:778 sql_help.c:782
+msgid "token_type"
+msgstr "typ_tokenu"
+
+#: sql_help.c:770 sql_help.c:773
+msgid "dictionary_name"
+msgstr "nazwa_słownika"
+
+#: sql_help.c:775 sql_help.c:779
+msgid "old_dictionary"
+msgstr "stary_słownik"
+
+#: sql_help.c:776 sql_help.c:780
+msgid "new_dictionary"
+msgstr "nowy_słownik"
+
+#: sql_help.c:867 sql_help.c:877 sql_help.c:880 sql_help.c:881 sql_help.c:1884
+msgid "attribute_name"
+msgstr "nazwa_atrybutu"
+
+#: sql_help.c:868
+msgid "new_attribute_name"
+msgstr "nowa_nazwa_atrybutu"
+
+#: sql_help.c:874
+msgid "new_enum_value"
+msgstr "nowa_nazwa_wylicz"
+
+#: sql_help.c:875
+msgid "existing_enum_value"
+msgstr "istniejąca_wartość_wylicz"
+
+#: sql_help.c:984 sql_help.c:2962 sql_help.c:2963 sql_help.c:2987
+msgid "transaction_mode"
+msgstr "tryb_transakcji"
+
+#: sql_help.c:985 sql_help.c:2964 sql_help.c:2988
+msgid "where transaction_mode is one of:"
+msgstr "gdzie tryb_transakcji to jeden z:"
+
+#: sql_help.c:1009 sql_help.c:1060 sql_help.c:1083 sql_help.c:1094
+#: sql_help.c:1139 sql_help.c:1143 sql_help.c:1339 sql_help.c:1676
+#: sql_help.c:1688 sql_help.c:1745 sql_help.c:2429 sql_help.c:2434
+#: sql_help.c:2683 sql_help.c:2688 sql_help.c:2769 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2868 sql_help.c:2907 sql_help.c:3040
+#: sql_help.c:3042 sql_help.c:3071 sql_help.c:3196 sql_help.c:3198
+#: sql_help.c:3227
+msgid "table_name"
+msgstr "nazwa_tabeli"
+
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "nazwa_relacji"
+
+#: sql_help.c:1058 sql_help.c:1340 sql_help.c:1373 sql_help.c:1677
+#: sql_help.c:1690 sql_help.c:1709 sql_help.c:1711 sql_help.c:1718
+#: sql_help.c:1746 sql_help.c:1848 sql_help.c:1968 sql_help.c:2770
+#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
+msgid "column_name"
+msgstr "nazwa_kolumny"
+
+#: sql_help.c:1082
+msgid "rule_name"
+msgstr "nazwa_reguły"
+
+#: sql_help.c:1097
+msgid "text"
+msgstr "tekst"
+
+#: sql_help.c:1112 sql_help.c:2567 sql_help.c:2729
+msgid "transaction_id"
+msgstr "id_transakcji"
+
+#: sql_help.c:1141 sql_help.c:1146 sql_help.c:2493
+msgid "filename"
+msgstr "nazwa_pliku"
+
+#: sql_help.c:1145 sql_help.c:1750 sql_help.c:1969 sql_help.c:1987
+#: sql_help.c:2475
+msgid "query"
+msgstr "zapytanie"
+
+#: sql_help.c:1148 sql_help.c:2335
+msgid "where option can be one of:"
+msgstr "gdzie opcja może być jedną z:"
+
+#: sql_help.c:1149
+msgid "format_name"
+msgstr "nazwa_formatu"
+
+#: sql_help.c:1150 sql_help.c:1153 sql_help.c:2336 sql_help.c:2337
+#: sql_help.c:2338 sql_help.c:2339
+msgid "boolean"
+msgstr "boolean"
+
+#: sql_help.c:1151
+msgid "delimiter_character"
+msgstr "znak_ogranicznika"
+
+#: sql_help.c:1152
+msgid "null_string"
+msgstr "pusty_ciąg_znaków"
+
+#: sql_help.c:1154
+msgid "quote_character"
+msgstr "znak_cytatu"
+
+#: sql_help.c:1155
+msgid "escape_character"
+msgstr "znak_ucieczki"
+
+#: sql_help.c:1158
+msgid "encoding_name"
+msgstr "nazwa_kodowania"
+
+#: sql_help.c:1184
+msgid "input_data_type"
+msgstr "typ_danych_wejściowych"
+
+#: sql_help.c:1185 sql_help.c:1193
+msgid "sfunc"
+msgstr "sfunk"
+
+#: sql_help.c:1186 sql_help.c:1194
+msgid "state_data_type"
+msgstr "typ_danych_stanu"
+
+#: sql_help.c:1187 sql_help.c:1195
+msgid "ffunc"
+msgstr "ffunk"
+
+#: sql_help.c:1188 sql_help.c:1196
+msgid "initial_condition"
+msgstr "warunek_poczÄ…tkowy"
+
+#: sql_help.c:1189 sql_help.c:1197
+msgid "sort_operator"
+msgstr "operator_sortowania"
+
+#: sql_help.c:1190
+msgid "or the old syntax"
+msgstr "albo stara składnia"
+
+#: sql_help.c:1192
+msgid "base_type"
+msgstr "typ_bazowy"
+
+#: sql_help.c:1236
+msgid "locale"
+msgstr "lokalizacja"
+
+#: sql_help.c:1237 sql_help.c:1271
+msgid "lc_collate"
+msgstr "lc_collate"
+
+#: sql_help.c:1238 sql_help.c:1272
+msgid "lc_ctype"
+msgstr "lc_ctype"
+
+#: sql_help.c:1240
+msgid "existing_collation"
+msgstr "istniejące_porównanie"
+
+#: sql_help.c:1250
+msgid "source_encoding"
+msgstr "kodowanie_źródła"
+
+#: sql_help.c:1251
+msgid "dest_encoding"
+msgstr "kodowanie_celu"
+
+#: sql_help.c:1269 sql_help.c:1785
+msgid "template"
+msgstr "szablon"
+
+#: sql_help.c:1270
+msgid "encoding"
+msgstr "kodowanie"
+
+#: sql_help.c:1273 sql_help.c:1440 sql_help.c:1687 sql_help.c:1695
+#: sql_help.c:1727 sql_help.c:1749
+msgid "tablespace"
+msgstr "przestrzeń_tabel"
+
+#: sql_help.c:1294
+msgid "constraint"
+msgstr "ograniczenie"
+
+#: sql_help.c:1295
+msgid "where constraint is:"
+msgstr "gdzie ograniczenie to:"
+
+#: sql_help.c:1309
+msgid "schema"
+msgstr "schemat"
+
+#: sql_help.c:1310
+msgid "version"
+msgstr "wersja"
+
+#: sql_help.c:1311
+msgid "old_version"
+msgstr "stara_wersja"
+
+#: sql_help.c:1371 sql_help.c:1699
+msgid "default_expr"
+msgstr "wyrażenie_domyślne"
+
+#: sql_help.c:1372
+msgid "rettype"
+msgstr "typ_zwracany"
+
+#: sql_help.c:1374
+msgid "column_type"
+msgstr "typ_kolumny"
+
+#: sql_help.c:1375 sql_help.c:2021 sql_help.c:2451 sql_help.c:2705
+msgid "lang_name"
+msgstr "nazwa_jęz"
+
+#: sql_help.c:1381
+msgid "definition"
+msgstr "definicja"
+
+#: sql_help.c:1382
+msgid "obj_file"
+msgstr "plik_obj"
+
+#: sql_help.c:1383
+msgid "link_symbol"
+msgstr "link_symbolicz"
+
+#: sql_help.c:1384
+msgid "attribute"
+msgstr "atrybut"
+
+#: sql_help.c:1419 sql_help.c:1550 sql_help.c:1945
+msgid "uid"
+msgstr "uid"
+
+#: sql_help.c:1433
+msgid "method"
+msgstr "metoda"
+
+#: sql_help.c:1437 sql_help.c:1731
+msgid "opclass"
+msgstr "klasa_op"
+
+#: sql_help.c:1441 sql_help.c:1717
+msgid "predicate"
+msgstr "orzeczenie"
+
+#: sql_help.c:1453
+msgid "call_handler"
+msgstr "uchwyt_wywołania"
+
+#: sql_help.c:1454
+msgid "inline_handler"
+msgstr "uchwyt_wbudowany"
+
+#: sql_help.c:1455
+msgid "valfunction"
+msgstr "funkcja_walid"
+
+#: sql_help.c:1473
+msgid "com_op"
+msgstr "op_kom"
+
+#: sql_help.c:1474
+msgid "neg_op"
+msgstr "op_neg"
+
+#: sql_help.c:1475
+msgid "res_proc"
+msgstr "proc_res"
+
+#: sql_help.c:1476
+msgid "join_proc"
+msgstr "procedura_złączenia"
+
+#: sql_help.c:1492
+msgid "family_name"
+msgstr "nazwa_rodziny"
+
+#: sql_help.c:1503
+msgid "storage_type"
+msgstr "typ_przechowywania"
+
+#: sql_help.c:1561 sql_help.c:1841
+msgid "event"
+msgstr "zdarzenie"
+
+#: sql_help.c:1563 sql_help.c:1844 sql_help.c:2003 sql_help.c:2826
+#: sql_help.c:2828 sql_help.c:2896 sql_help.c:2898 sql_help.c:3029
+#: sql_help.c:3031 sql_help.c:3110 sql_help.c:3185 sql_help.c:3187
+msgid "condition"
+msgstr "warunek"
+
+#: sql_help.c:1564 sql_help.c:1565 sql_help.c:1566
+msgid "command"
+msgstr "polecenie"
+
+#: sql_help.c:1577 sql_help.c:1579
+msgid "schema_element"
+msgstr "element_schematu"
+
+#: sql_help.c:1608
+msgid "server_type"
+msgstr "typ_serwera"
+
+#: sql_help.c:1609
+msgid "server_version"
+msgstr "wersja_serwera"
+
+#: sql_help.c:1610 sql_help.c:2441 sql_help.c:2695
+msgid "fdw_name"
+msgstr "nazwa_fdw"
+
+#: sql_help.c:1683
+msgid "like_option"
+msgstr "opcja_podobne"
+
+#: sql_help.c:1696
+msgid "where column_constraint is:"
+msgstr "gdzie ograniczenie_kolumny to:"
+
+#: sql_help.c:1700 sql_help.c:1701 sql_help.c:1710 sql_help.c:1712
+#: sql_help.c:1716
+msgid "index_parameters"
+msgstr "parametry_indeksu"
+
+#: sql_help.c:1702 sql_help.c:1719
+msgid "reftable"
+msgstr "tabelaref"
+
+#: sql_help.c:1703 sql_help.c:1720
+msgid "refcolumn"
+msgstr "kolumnaref"
+
+#: sql_help.c:1706
+msgid "and table_constraint is:"
+msgstr "a ograniczenie_tabeli to:"
+
+#: sql_help.c:1714
+msgid "exclude_element"
+msgstr "element_wyłączany"
+
+#: sql_help.c:1723
+msgid "and like_option is:"
+msgstr "a opcja_podobne to:"
+
+#: sql_help.c:1724
+msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
+msgstr "parametry_indeksu w ograniczeniach UNIQUE, PRIMARY KEY i EXCLUDE to:"
+
+#: sql_help.c:1728
+msgid "exclude_element in an EXCLUDE constraint is:"
+msgstr "element_wyłączany w ograniczeniu EXCLUDE to:"
+
+#: sql_help.c:1760
+msgid "directory"
+msgstr "folder"
+
+#: sql_help.c:1772
+msgid "parser_name"
+msgstr "nazwa_analizatora"
+
+#: sql_help.c:1773
+msgid "source_config"
+msgstr "konfiguracja_źródła"
+
+#: sql_help.c:1802
+msgid "start_function"
+msgstr "funkcja_startowa"
+
+#: sql_help.c:1803
+msgid "gettoken_function"
+msgstr "funkcja_gettoken"
+
+#: sql_help.c:1804
+msgid "end_function"
+msgstr "funkcja_kończąca"
+
+#: sql_help.c:1805
+msgid "lextypes_function"
+msgstr "funkcja_lextypes"
+
+#: sql_help.c:1806
+msgid "headline_function"
+msgstr "funkcja_nagłówkowa"
+
+#: sql_help.c:1818
+msgid "init_function"
+msgstr "funkcja_inicjujÄ…ca"
+
+#: sql_help.c:1819
+msgid "lexize_function"
+msgstr "funkcja_lexize"
+
+#: sql_help.c:1843
+msgid "referenced_table_name"
+msgstr "nazwa_tabeli_odwołania"
+
+#: sql_help.c:1846
+msgid "arguments"
+msgstr "argumenty"
+
+#: sql_help.c:1847
+msgid "where event can be one of:"
+msgstr "gdzie zdarzenie może być jednym z:"
+
+#: sql_help.c:1888 sql_help.c:2785
+msgid "label"
+msgstr "etykieta"
+
+#: sql_help.c:1890
+msgid "input_function"
+msgstr "funkcja_wejścia"
+
+#: sql_help.c:1891
+msgid "output_function"
+msgstr "funkcja_wyjścia"
+
+#: sql_help.c:1892
+msgid "receive_function"
+msgstr "funkcja_odbierajÄ…ca"
+
+#: sql_help.c:1893
+msgid "send_function"
+msgstr "funkcja_wysyłająca"
+
+#: sql_help.c:1894
+msgid "type_modifier_input_function"
+msgstr "funkcja_przyjmujÄ…ca_modyfikator_typu"
+
+#: sql_help.c:1895
+msgid "type_modifier_output_function"
+msgstr "funkcja_zwracajÄ…ca_modyfikator_typu"
+
+#: sql_help.c:1896
+msgid "analyze_function"
+msgstr "funkcja_analizy"
+
+#: sql_help.c:1897
+msgid "internallength"
+msgstr "wewnętrzna_długość"
+
+#: sql_help.c:1898
+msgid "alignment"
+msgstr "wyrównanie"
+
+#: sql_help.c:1899
+msgid "storage"
+msgstr "nośnik"
+
+#: sql_help.c:1900
+msgid "like_type"
+msgstr "typ_podobne"
+
+#: sql_help.c:1901
+msgid "category"
+msgstr "kategoria"
+
+#: sql_help.c:1902
+msgid "preferred"
+msgstr "preferowane"
+
+#: sql_help.c:1903
+msgid "default"
+msgstr "domyślnie"
+
+#: sql_help.c:1904
+msgid "element"
+msgstr "element"
+
+#: sql_help.c:1905
+msgid "delimiter"
+msgstr "ogranicznik"
+
+#: sql_help.c:1906
+msgid "collatable"
+msgstr "porównywalne"
+
+#: sql_help.c:1999 sql_help.c:2471 sql_help.c:2821 sql_help.c:2890
+#: sql_help.c:3024 sql_help.c:3102 sql_help.c:3180
+msgid "with_query"
+msgstr "z_kwerendy"
+
+#: sql_help.c:2001 sql_help.c:2840 sql_help.c:2843 sql_help.c:2846
+#: sql_help.c:2850 sql_help.c:3043 sql_help.c:3046 sql_help.c:3049
+#: sql_help.c:3053 sql_help.c:3104 sql_help.c:3199 sql_help.c:3202
+#: sql_help.c:3205 sql_help.c:3209
+msgid "alias"
+msgstr "alias"
+
+#: sql_help.c:2002
+msgid "using_list"
+msgstr "lista_użycia"
+
+#: sql_help.c:2004 sql_help.c:2365 sql_help.c:2534 sql_help.c:3111
+msgid "cursor_name"
+msgstr "nazwa_kursora"
+
+#: sql_help.c:2005 sql_help.c:2476 sql_help.c:3112
+msgid "output_expression"
+msgstr "wyrażenie_wyjścia"
+
+#: sql_help.c:2006 sql_help.c:2477 sql_help.c:2824 sql_help.c:2893
+#: sql_help.c:3027 sql_help.c:3113 sql_help.c:3183
+msgid "output_name"
+msgstr "nazwa_wyjścia"
+
+#: sql_help.c:2022
+msgid "code"
+msgstr "kod"
+
+#: sql_help.c:2315
+msgid "parameter"
+msgstr "parametr"
+
+#: sql_help.c:2333 sql_help.c:2334 sql_help.c:2559
+msgid "statement"
+msgstr "wyrażenie"
+
+#: sql_help.c:2364 sql_help.c:2533
+msgid "direction"
+msgstr "kierunek"
+
+#: sql_help.c:2366 sql_help.c:2535
+msgid "where direction can be empty or one of:"
+msgstr "gdzie kierunek może być pusty lub jednym z:"
+
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2371 sql_help.c:2536 sql_help.c:2537 sql_help.c:2538
+#: sql_help.c:2539 sql_help.c:2540 sql_help.c:2834 sql_help.c:2836
+#: sql_help.c:2904 sql_help.c:2906 sql_help.c:3037 sql_help.c:3039
+#: sql_help.c:3142 sql_help.c:3144 sql_help.c:3193 sql_help.c:3195
+msgid "count"
+msgstr "ilość"
+
+#: sql_help.c:2436 sql_help.c:2690
+msgid "sequence_name"
+msgstr "nazwa_sekwencji"
+
+#: sql_help.c:2447 sql_help.c:2701
+msgid "arg_name"
+msgstr "nazwa_arg"
+
+#: sql_help.c:2448 sql_help.c:2702
+msgid "arg_type"
+msgstr "typ_arg"
+
+#: sql_help.c:2453 sql_help.c:2707
+msgid "loid"
+msgstr "loid"
+
+#: sql_help.c:2485 sql_help.c:2548 sql_help.c:3088
+msgid "channel"
+msgstr "kanał"
+
+#: sql_help.c:2507
+msgid "lockmode"
+msgstr "tryb_blokady"
+
+#: sql_help.c:2508
+msgid "where lockmode is one of:"
+msgstr "gdzie tryb_blokady jest jednym z:"
+
+#: sql_help.c:2549
+msgid "payload"
+msgstr "Å‚adunek"
+
+#: sql_help.c:2575
+msgid "old_role"
+msgstr "stara_rola"
+
+#: sql_help.c:2576
+msgid "new_role"
+msgstr "nowa_rola"
+
+#: sql_help.c:2592 sql_help.c:2737 sql_help.c:2745
+msgid "savepoint_name"
+msgstr "nazwa_punktu_zapisu"
+
+#: sql_help.c:2767
+msgid "provider"
+msgstr "dostawca"
+
+#: sql_help.c:2825 sql_help.c:2856 sql_help.c:2858 sql_help.c:2895
+#: sql_help.c:3028 sql_help.c:3059 sql_help.c:3061 sql_help.c:3184
+#: sql_help.c:3215 sql_help.c:3217
+msgid "from_item"
+msgstr "element_z"
+
+#: sql_help.c:2829 sql_help.c:2899 sql_help.c:3032 sql_help.c:3188
+msgid "window_name"
+msgstr "nazwa_okna"
+
+#: sql_help.c:2830 sql_help.c:2900 sql_help.c:3033 sql_help.c:3189
+msgid "window_definition"
+msgstr "definicja_okna"
+
+#: sql_help.c:2831 sql_help.c:2842 sql_help.c:2864 sql_help.c:2901
+#: sql_help.c:3034 sql_help.c:3045 sql_help.c:3067 sql_help.c:3190
+#: sql_help.c:3201 sql_help.c:3223
+msgid "select"
+msgstr "wybierz"
+
+#: sql_help.c:2838 sql_help.c:3041 sql_help.c:3197
+msgid "where from_item can be one of:"
+msgstr "gdzie element_z może być jednym z:"
+
+#: sql_help.c:2841 sql_help.c:2844 sql_help.c:2847 sql_help.c:2851
+#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3050 sql_help.c:3054
+#: sql_help.c:3200 sql_help.c:3203 sql_help.c:3206 sql_help.c:3210
+msgid "column_alias"
+msgstr "alias_kolumny"
+
+#: sql_help.c:2845 sql_help.c:2862 sql_help.c:3048 sql_help.c:3065
+#: sql_help.c:3204 sql_help.c:3221
+msgid "with_query_name"
+msgstr "nazwa_kwerendy_z"
+
+#: sql_help.c:2849 sql_help.c:2854 sql_help.c:3052 sql_help.c:3057
+#: sql_help.c:3208 sql_help.c:3213
+msgid "argument"
+msgstr "argument"
+
+#: sql_help.c:2852 sql_help.c:2855 sql_help.c:3055 sql_help.c:3058
+#: sql_help.c:3211 sql_help.c:3214
+msgid "column_definition"
+msgstr "definicja_kolumny"
+
+#: sql_help.c:2857 sql_help.c:3060 sql_help.c:3216
+msgid "join_type"
+msgstr "typ_złączenia"
+
+#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
+msgid "join_condition"
+msgstr "warunek_złączenia"
+
+#: sql_help.c:2860 sql_help.c:3063 sql_help.c:3219
+msgid "join_column"
+msgstr "kolumna_złączana"
+
+#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
+msgid "and with_query is:"
+msgstr "a z_kwerendÄ… to:"
+
+#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
+msgid "insert"
+msgstr "wstaw"
+
+#: sql_help.c:2866 sql_help.c:3069 sql_help.c:3225
+msgid "update"
+msgstr "modyfikuj"
+
+#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
+msgid "delete"
+msgstr "usuń"
+
+#: sql_help.c:2894
+msgid "new_table"
+msgstr "nowa_tabela"
+
+#: sql_help.c:2919
+msgid "timezone"
+msgstr "strefa_czasowa"
+
+#: sql_help.c:3109
+msgid "from_list"
+msgstr "z_listy"
+
+#: sql_help.c:3140
+msgid "sort_expression"
+msgstr "wyrażenie_sortowania"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "nie można zidentyfikować aktualnego katalogu: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "niepoprawny binarny \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "nie można odczytać binarnego \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "nie znaleziono \"%s\" do wykonania"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "nie można zmienić katalogu na \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "nie można odczytać odwołania symbolicznego  \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "proces potomny zakończył działanie z kodem %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "proces potomny został zatrzymany przez wyjątek 0x%X"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "proces potomny został zatrzymany przez sygnał %s"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "proces potomny został zakończony przez sygnał %d"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
diff --git a/src/bin/psql/po/pt_BR.po b/src/bin/psql/po/pt_BR.po
index 1182e7738b191..a71049540d37e 100644
--- a/src/bin/psql/po/pt_BR.po
+++ b/src/bin/psql/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for psql
 # 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-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-08 23:58-0300\n"
+"POT-Creation-Date: 2011-11-30 16:07-0300\n"
 "PO-Revision-Date: 2005-11-02 10:30-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -17,164 +17,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: command.c:112
+#: command.c:113
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Comando inválido \\%s. Tente \\? para ajuda.\n"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "comando inválido \\%s\n"
 
-#: command.c:125
+#: command.c:126
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: argumento extra \"%s\" ignorado\n"
 
-#: command.c:267
+#: command.c:268
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "não pôde alternar para diretório base do usuário: %s\n"
 
-#: command.c:283
+#: command.c:284
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: não pôde mudar diretório para \"%s\": %s\n"
 
-#: command.c:316 common.c:940
+#: command.c:305 common.c:493 common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "Você não está conectado ao banco de dados.\n"
+
+#: command.c:312
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Você está conectado ao banco de dados \"%s\" como usuário \"%s\" via soquete "
+"em \"%s\" na porta \"%s\".\n"
+
+#: command.c:315
+#, c-format
+msgid ""
+"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
+"\"%s\".\n"
+msgstr ""
+"Você está conectado ao banco de dados \"%s\" como usuário \"%s\" na máquina "
+"\"%s\" na porta \"%s\".\n"
+
+#: command.c:339 common.c:940
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Tempo: %.3f ms\n"
 
-#: command.c:485 command.c:513 command.c:1064
+#: command.c:524 command.c:594 command.c:1297
 msgid "no query buffer\n"
 msgstr "nenhum buffer de consulta\n"
 
-#: command.c:555
+#: command.c:557 command.c:2519
+#, c-format
+msgid "invalid line number: %s\n"
+msgstr "número de linha inválido: %s\n"
+
+#: command.c:588
+#, c-format
+msgid "The server (version %d.%d) does not support editing function source.\n"
+msgstr "O servidor (versão %d.%d) não suporta edição do código da função.\n"
+
+#: command.c:668
 msgid "No changes"
 msgstr "Nenhuma alteração"
 
-#: command.c:609
+#: command.c:722
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: nome da codificação é inválido ou procedimento de conversão não foi "
 "encontrado\n"
 
-#: command.c:688 command.c:722 command.c:736 command.c:753 command.c:857
-#: command.c:907 command.c:1044 command.c:1075
+#: command.c:801 command.c:835 command.c:849 command.c:866 command.c:970
+#: command.c:1020 command.c:1277 command.c:1308
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: faltando argumento requerido\n"
 
-#: command.c:785
+#: command.c:898
 msgid "Query buffer is empty."
 msgstr "Buffer de consulta está vazio."
 
-#: command.c:795
+#: command.c:908
 msgid "Enter new password: "
 msgstr "Digite nova senha: "
 
-#: command.c:796
+#: command.c:909
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: command.c:800
+#: command.c:913
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Senhas não correspondem.\n"
 
-#: command.c:818
+#: command.c:931
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Criptografia de senha falhou.\n"
 
-#: command.c:886 command.c:987 command.c:1049
+#: command.c:999 command.c:1100 command.c:1282
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: erro\n"
 
-#: command.c:927
+#: command.c:1040
 msgid "Query buffer reset (cleared)."
 msgstr "Buffer de consulta reiniciado (limpo)."
 
-#: command.c:940
+#: command.c:1053
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Histórico escrito para arquivo \"%s/%s\".\n"
 
-#: command.c:978 common.c:52 common.c:66 input.c:209 mainloop.c:72
-#: mainloop.c:234 print.c:137 print.c:151
+#: command.c:1091 common.c:52 common.c:66 common.c:90 input.c:209
+#: mainloop.c:72 mainloop.c:234 print.c:137 print.c:151
 #, c-format
 msgid "out of memory\n"
 msgstr "sem memória\n"
 
-#: command.c:1029
+#: command.c:1121
+#, c-format
+msgid "The server (version %d.%d) does not support showing function source.\n"
+msgstr "O servidor (versão %d.%d) não suporta exibição do código da função.\n"
+
+#: command.c:1127
+msgid "function name is required\n"
+msgstr "nome de função é requerido\n"
+
+#: command.c:1262
 msgid "Timing is on."
 msgstr "Tempo de execução está habilitado."
 
-#: command.c:1031
+#: command.c:1264
 msgid "Timing is off."
 msgstr "Tempo de execução está desabilitado."
 
-#: command.c:1092 command.c:1112 command.c:1633 command.c:1640 command.c:1649
-#: command.c:1659 command.c:1668 command.c:1682 command.c:1699 command.c:1737
+#: command.c:1325 command.c:1345 command.c:1907 command.c:1914 command.c:1923
+#: command.c:1933 command.c:1942 command.c:1956 command.c:1973 command.c:2011
 #: common.c:137 copy.c:283 copy.c:361
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1194 startup.c:159
+#: command.c:1427 startup.c:159
 msgid "Password: "
 msgstr "Senha: "
 
-#: command.c:1201 startup.c:162 startup.c:164
+#: command.c:1434 startup.c:162 startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "Senha para usuário %s: "
 
-#: command.c:1318 command.c:2207 common.c:183 common.c:460 common.c:525
-#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:606
+#: command.c:1553 command.c:2553 common.c:183 common.c:460 common.c:525
+#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1322
+#: command.c:1557
 msgid "Previous connection kept\n"
 msgstr "Conexão anterior mantida\n"
 
-#: command.c:1326
+#: command.c:1561
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1350
+#: command.c:1594
 #, c-format
-msgid "You are now connected to database \"%s\""
-msgstr "Você está conectado ao banco de dados \"%s\" agora"
-
-#: command.c:1353
-#, c-format
-msgid " on host \"%s\""
-msgstr " na máquina \"%s\""
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
+"at port \"%s\".\n"
+msgstr ""
+"Você está conectado agora ao banco de dados \"%s\" como usuário \"%s\" via "
+"soquete em \"%s\" na porta \"%s\".\n"
 
-#: command.c:1356
+#: command.c:1597
 #, c-format
-msgid " at port \"%s\""
-msgstr " na porta \"%s\""
+msgid ""
+"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
+"port \"%s\".\n"
+msgstr ""
+"Você está conectado agora ao banco de dados \"%s\" como usuário \"%s\" na "
+"máquina \"%s\" na porta \"%s\".\n"
 
-#: command.c:1359
+#: command.c:1601
 #, c-format
-msgid " as user \"%s\""
-msgstr " como usuário \"%s\""
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr ""
+"Você está conectado agora ao banco de dados \"%s\" como usuário \"%s\".\n"
 
-#: command.c:1394
+#: command.c:1635
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, servidor %s)\n"
 
-#: command.c:1402
+#: command.c:1643
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -183,19 +229,19 @@ msgstr ""
 "AVISO: %s versão %d.%d, servidor versão %d.%d.\n"
 "         Algumas funcionalidades do psql podem não funcionar.\n"
 
-#: command.c:1432
+#: command.c:1673
 #, c-format
 msgid "SSL connection (cipher: %s, bits: %i)\n"
 msgstr "conexão SSL (cifra: %s, bits: %i)\n"
 
-#: command.c:1442
+#: command.c:1683
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr ""
 "conexão SSL (cifra desconhecida)\n"
 "\n"
 
-#: command.c:1463
+#: command.c:1704
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -209,26 +255,34 @@ msgstr ""
 "         referência do psql \"Notes for Windows users\" para obter "
 "detalhes.\n"
 
-#: command.c:1552
+#: command.c:1788
+msgid ""
+"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
+"line number\n"
+msgstr ""
+"variável de ambiente PSQL_EDITOR_LINENUMBER_ARG deve ser definida para "
+"especificar um número de linha\n"
+
+#: command.c:1825
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "não pôde iniciar o editor \"%s\"\n"
 
-#: command.c:1554
+#: command.c:1827
 msgid "could not start /bin/sh\n"
 msgstr "não pôde iniciar /bin/sh\n"
 
-#: command.c:1591
+#: command.c:1865
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "não pôde localizar diretório temporário: %s"
+msgid "could not locate temporary directory: %s\n"
+msgstr "não pôde localizar diretório temporário: %s\n"
 
-#: command.c:1618
+#: command.c:1892
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "não pôde abrir arquivo temporário \"%s\": %s\n"
 
-#: command.c:1839
+#: command.c:2122
 msgid ""
 "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
 "ms\n"
@@ -236,122 +290,122 @@ msgstr ""
 "\\pset: formatos permitidos são unaligned, aligned, wrapped, html, latex, "
 "troff-ms\n"
 
-#: command.c:1844
+#: command.c:2127
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Formato de saída é %s.\n"
 
-#: command.c:1860
+#: command.c:2143
 msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
 msgstr "\\pset: estilos de linha permitidos são ascii, old-ascii, unicode\n"
 
-#: command.c:1865
+#: command.c:2148
 #, c-format
 msgid "Line style is %s.\n"
 msgstr "Estilo de linha é %s.\n"
 
-#: command.c:1876
+#: command.c:2159
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Estilo de borda é %d.\n"
 
-#: command.c:1888
+#: command.c:2171
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Exibição expandida está habilitada.\n"
 
-#: command.c:1889
+#: command.c:2172
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Exibição expandida está desabilitada.\n"
 
-#: command.c:1902
+#: command.c:2185
 msgid "Showing locale-adjusted numeric output."
 msgstr "Exibindo formato numérico baseado na configuração regional."
 
-#: command.c:1904
+#: command.c:2187
 msgid "Locale-adjusted numeric output is off."
 msgstr "Formato numérico baseado no idioma está desabilitado."
 
-#: command.c:1917
+#: command.c:2200
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Exibição nula é \"%s\".\n"
 
-#: command.c:1929
+#: command.c:2212
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Separador de campos é \"%s\".\n"
 
-#: command.c:1943
+#: command.c:2226
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "Separador de registros é <novalinha>."
 
-#: command.c:1945
+#: command.c:2228
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Separador de registros é \"%s\".\n"
 
-#: command.c:1959
+#: command.c:2242
 msgid "Showing only tuples."
 msgstr "Mostrando apenas tuplas."
 
-#: command.c:1961
+#: command.c:2244
 msgid "Tuples only is off."
 msgstr "Somente tuplas está desabilitado."
 
-#: command.c:1977
+#: command.c:2260
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Título é \"%s\".\n"
 
-#: command.c:1979
+#: command.c:2262
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Título não está definido.\n"
 
-#: command.c:1995
+#: command.c:2278
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Atributo de tabela é \"%s\".\n"
 
-#: command.c:1997
+#: command.c:2280
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Atributos de tabela não estão definidos.\n"
 
-#: command.c:2018
+#: command.c:2301
 msgid "Pager is used for long output."
 msgstr "Paginação é usada para saída longa."
 
-#: command.c:2020
+#: command.c:2303
 msgid "Pager is always used."
 msgstr "Paginação é sempre utilizada."
 
-#: command.c:2022
+#: command.c:2305
 msgid "Pager usage is off."
 msgstr "Uso de paginação está desabilitado."
 
-#: command.c:2036
+#: command.c:2319
 msgid "Default footer is on."
 msgstr "Rodapé padrão está habilitado."
 
-#: command.c:2038
+#: command.c:2321
 msgid "Default footer is off."
 msgstr "Rodapé padrão está desabilitado."
 
-#: command.c:2049
+#: command.c:2332
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr "largura para formato \"wrapped\" é %d.\n"
 
-#: command.c:2054
+#: command.c:2337
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: opção desconhecida: %s\n"
 
-#: command.c:2108
+#: command.c:2391
 msgid "\\!: failed\n"
 msgstr "\\!: falhou\n"
 
@@ -360,10 +414,6 @@ msgstr "\\!: falhou\n"
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: pg_strdup: não pode duplicar ponteiro nulo (erro interno)\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "sem memória"
-
 #: common.c:343
 msgid "connection to server was lost\n"
 msgstr "conexão com servidor foi perdida\n"
@@ -380,10 +430,6 @@ msgstr "Falhou.\n"
 msgid "Succeeded.\n"
 msgstr "Sucedido.\n"
 
-#: common.c:493 common.c:773
-msgid "You are currently not connected to a database.\n"
-msgstr "Você não está conectado ao banco de dados.\n"
-
 #: common.c:499 common.c:506 common.c:799
 #, c-format
 msgid ""
@@ -491,24 +537,24 @@ msgstr ""
 "Informe os dados a serem copiados seguido pelo caracter de nova linha.\n"
 "Finalize com uma barra invertida e um ponto na linha."
 
-#: copy.c:599
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "interrompido devido a falha de leitura"
 
-#: help.c:52
+#: help.c:48
 msgid "on"
 msgstr "habilitado"
 
-#: help.c:52
+#: help.c:48
 msgid "off"
 msgstr "desabilitado"
 
-#: help.c:74
+#: help.c:70
 #, c-format
 msgid "could not get current user name: %s\n"
 msgstr "não pôde obter nome de usuário atual: %s\n"
 
-#: help.c:86
+#: help.c:82
 #, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
@@ -517,12 +563,12 @@ msgstr ""
 "psql é o terminal iterativo do PostgreSQL.\n"
 "\n"
 
-#: help.c:87
+#: help.c:83
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: help.c:88
+#: help.c:84
 #, c-format
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
@@ -531,12 +577,12 @@ msgstr ""
 "  psql [OPÇÃO]... [NOMEBD [USU�RIO]]\n"
 "\n"
 
-#: help.c:90
+#: help.c:86
 #, c-format
 msgid "General options:\n"
 msgstr "Opções gerais:\n"
 
-#: help.c:95
+#: help.c:91
 #, c-format
 msgid ""
 "  -c, --command=COMMAND    run only single command (SQL or internal) and "
@@ -545,7 +591,7 @@ msgstr ""
 "  -c, --command=COMANDO    executa somente um comando (SQL ou interno) e "
 "termina\n"
 
-#: help.c:96
+#: help.c:92
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
@@ -553,18 +599,18 @@ msgstr ""
 "  -d, --dbname=NOMEBD      especifica o nome do banco de dados ao qual quer "
 "se conectar (padrão: \"%s\")\n"
 
-#: help.c:97
+#: help.c:93
 #, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=ARQUIVO       executa comandos de um arquivo e termina\n"
 
-#: help.c:98
+#: help.c:94
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr ""
 "  -l, --list               lista os bancos de dados disponíveis e termina\n"
 
-#: help.c:99
+#: help.c:95
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
@@ -573,13 +619,13 @@ msgstr ""
 "  -v, --set=, --variable=NOME=VALOR\n"
 "                           define variável do psql NOME como VALOR\n"
 
-#: help.c:101
+#: help.c:97
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr ""
 "  -X, --no-psqlrc          não lê o arquivo de inicialização (~/.psqlrc)\n"
 
-#: help.c:102
+#: help.c:98
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -589,18 +635,18 @@ msgstr ""
 "                           executa comandos do arquivo como uma transação "
 "única\n"
 
-#: help.c:104
+#: help.c:100
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   mostra esta ajuda e termina\n"
 
-#: help.c:105
+#: help.c:101
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr ""
 "  --version                mostra informação sobre a versão e termina\n"
 
-#: help.c:107
+#: help.c:103
 #, c-format
 msgid ""
 "\n"
@@ -609,29 +655,29 @@ msgstr ""
 "\n"
 "Opções de entrada e saída:\n"
 
-#: help.c:108
+#: help.c:104
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           mostra toda entrada do script\n"
 
-#: help.c:109
+#: help.c:105
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       mostra comandos enviados ao servidor\n"
 
-#: help.c:110
+#: help.c:106
 #, c-format
 msgid ""
 "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr ""
 "  -E, --echo-hidden        mostra consultas que os comandos internos geram\n"
 
-#: help.c:111
+#: help.c:107
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=ARQUIVO   envia log da sessão para arquivo\n"
 
-#: help.c:112
+#: help.c:108
 #, c-format
 msgid ""
 "  -n, --no-readline        disable enhanced command line editing (readline)\n"
@@ -639,14 +685,14 @@ msgstr ""
 "  -n, --no-readline        desabilita edição de linha de comando melhorada "
 "(readline)\n"
 
-#: help.c:113
+#: help.c:109
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr ""
 "  -o, --output=ARQUIVO     envia resultados da consulta para um arquivo (ou |"
 "pipe)\n"
 
-#: help.c:114
+#: help.c:110
 #, c-format
 msgid ""
 "  -q, --quiet              run quietly (no messages, only query output)\n"
@@ -654,13 +700,13 @@ msgstr ""
 "  -q, --quiet              executa silenciosamente (sem mensagens, somente "
 "saída da consulta)\n"
 
-#: help.c:115
+#: help.c:111
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr ""
 "  -s, --single-step        modo passo-a-passo (confirma cada consulta)\n"
 
-#: help.c:116
+#: help.c:112
 #, c-format
 msgid ""
 "  -S, --single-line        single-line mode (end of line terminates SQL "
@@ -669,7 +715,7 @@ msgstr ""
 "  -S, --single-line        modo linha única (fim da linha termina o comando "
 "SQL)\n"
 
-#: help.c:118
+#: help.c:114
 #, c-format
 msgid ""
 "\n"
@@ -678,12 +724,12 @@ msgstr ""
 "\n"
 "Opções para formato de saída:\n"
 
-#: help.c:119
+#: help.c:115
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           modo de saída em tabela desalinhada\n"
 
-#: help.c:120
+#: help.c:116
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -692,12 +738,12 @@ msgstr ""
 "  -F, --field-separator=SEPARADOR\n"
 "                           define separador de campos (padrão: \"%s\")\n"
 
-#: help.c:123
+#: help.c:119
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               modo de saída em tabela HTML\n"
 
-#: help.c:124
+#: help.c:120
 #, c-format
 msgid ""
 "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
@@ -706,7 +752,7 @@ msgstr ""
 "  -P, --pset=VAR[=ARG]     define opção de exibição VAR para ARG (veja "
 "comando \\pset)\n"
 
-#: help.c:125
+#: help.c:121
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -716,12 +762,12 @@ msgstr ""
 "                           define separador de registros (padrão: nova "
 "linha)\n"
 
-#: help.c:127
+#: help.c:123
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        exibe somente registros\n"
 
-#: help.c:128
+#: help.c:124
 #, c-format
 msgid ""
 "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
@@ -730,12 +776,12 @@ msgstr ""
 "  -T, --table-attr=TEXTO   define atributos do marcador table do HTML (i.e. "
 "width, border)\n"
 
-#: help.c:129
+#: help.c:125
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded           habilita saída em tabela expandida\n"
 
-#: help.c:131
+#: help.c:127
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +790,7 @@ msgstr ""
 "\n"
 "Opções de conexão:\n"
 
-#: help.c:134
+#: help.c:130
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME      database server host or socket directory "
@@ -753,30 +799,30 @@ msgstr ""
 "  -h, --host=M�QUINA       máquina do servidor de banco de dados ou "
 "diretório do soquete (padrão: \"%s\")\n"
 
-#: help.c:135
+#: help.c:131
 msgid "local socket"
 msgstr "soquete local"
 
-#: help.c:138
+#: help.c:134
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr ""
 "  -p, --port=PORTA         porta do servidor de banco de dados (padrão: \"%s"
 "\")\n"
 
-#: help.c:144
+#: help.c:140
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr ""
 "  -U, --username=USU�RIO   nome de usuário do banco de dados (padrão: \"%s"
 "\")\n"
 
-#: help.c:145
+#: help.c:141
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -w, --no-password        nunca pergunta senha\n"
 
-#: help.c:146
+#: help.c:142
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
@@ -784,7 +830,7 @@ msgid ""
 msgstr ""
 "  -W, --password           pergunta senha (pode ocorrer automaticamente)\n"
 
-#: help.c:148
+#: help.c:144
 #, c-format
 msgid ""
 "\n"
@@ -801,24 +847,24 @@ msgstr ""
 "documentação do PostgreSQL.\n"
 "\n"
 
-#: help.c:151
+#: help.c:147
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: help.c:169
+#: help.c:165
 #, c-format
 msgid "General\n"
 msgstr "Geral\n"
 
-#: help.c:170
+#: help.c:166
 #, c-format
 msgid ""
 "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr ""
 "  \\copyright             mostra termos de uso e distribuição do PostgreSQL\n"
 
-#: help.c:171
+#: help.c:167
 #, c-format
 msgid ""
 "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
@@ -826,7 +872,7 @@ msgstr ""
 "  \\g [ARQUIVO] ou ;      executa consulta (e envia os resultados para "
 "arquivo ou |pipe)\n"
 
-#: help.c:172
+#: help.c:168
 #, c-format
 msgid ""
 "  \\h [NAME]              help on syntax of SQL commands, * for all "
@@ -835,58 +881,59 @@ msgstr ""
 "  \\h [NOME]              mostra sintaxe dos comandos SQL, * para todos os "
 "comandos\n"
 
-#: help.c:173
+#: help.c:169
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     sair do psql\n"
 
-#: help.c:176
+#: help.c:172
 #, c-format
 msgid "Query Buffer\n"
 msgstr "Buffer de consulta\n"
 
-#: help.c:177
+#: help.c:173
 #, c-format
 msgid ""
-"  \\e [FILE]              edit the query buffer (or file) with external "
+"  \\e [FILE] [LINE]       edit the query buffer (or file) with external "
 "editor\n"
 msgstr ""
-"  \\e [ARQUIVO]           edita o buffer de consulta (ou arquivo) com um "
+"  \\e [ARQUIVO] [LINHA]    edita o buffer de consulta (ou arquivo) com um "
 "editor externo\n"
 
-#: help.c:178
+#: help.c:174
 #, c-format
 msgid ""
-"  \\ef [FUNCNAME]         edit function definition with external editor\n"
+"  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr ""
-"  \\ef [NOMEFUNÇÃO]       edita a definição de função com um editor externo\n"
+"  \\ef [NOMEFUNÇÃO [LINHA]] edita a definição de função com um editor "
+"externo\n"
 
-#: help.c:179
+#: help.c:175
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                     mostra o conteúdo do buffer de consulta\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                     reinicia (apaga) o buffer de consulta\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [ARQUIVO]           mostra histórico ou grava-o em um arquivo\n"
 
-#: help.c:184
+#: help.c:180
 #, c-format
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w [ARQUIVO]           escreve o buffer de consulta para arquivo\n"
 
-#: help.c:187
+#: help.c:183
 #, c-format
 msgid "Input/Output\n"
 msgstr "Entrada/Saída\n"
 
-#: help.c:188
+#: help.c:184
 #, c-format
 msgid ""
 "  \\copy ...              perform SQL COPY with data stream to the client "
@@ -895,25 +942,25 @@ msgstr ""
 "  \\copy ...              realiza comando SQL COPY dos dados para máquina "
 "cliente\n"
 
-#: help.c:189
+#: help.c:185
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr ""
 "  \\echo [TEXTO]         escreve cadeia de caracteres na saída padrão\n"
 
-#: help.c:190
+#: help.c:186
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i ARQUIVO             executa comandos de um arquivo\n"
 
-#: help.c:191
+#: help.c:187
 #, c-format
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr ""
 "  \\o [ARQUIVO]           envia todos os resultados da consulta para arquivo "
 "ou |pipe\n"
 
-#: help.c:192
+#: help.c:188
 #, c-format
 msgid ""
 "  \\qecho [STRING]        write string to query output stream (see \\o)\n"
@@ -921,78 +968,83 @@ msgstr ""
 "  \\qecho [TEXTO]         escreve cadeia de caracteres para saída da "
 "consulta (veja \\o)\n"
 
-#: help.c:195
+#: help.c:191
 #, c-format
 msgid "Informational\n"
 msgstr "Informativo\n"
 
-#: help.c:196
+#: help.c:192
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr "  (opções: S = mostra objetos do sistema, + = detalhes)\n"
 
-#: help.c:197
+#: help.c:193
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
 msgstr "  \\d[S+]                 lista tabelas, visões e sequências\n"
 
-#: help.c:198
+#: help.c:194
 #, c-format
 msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
 msgstr ""
 "  \\d[S+]  NOME           descreve tabela, visão, sequência ou índice\n"
 
-#: help.c:199
+#: help.c:195
 #, c-format
 msgid "  \\da[S]  [PATTERN]      list aggregates\n"
 msgstr "  \\da[S]  [MODELO]       lista funções de agregação\n"
 
-#: help.c:200
+#: help.c:196
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
 msgstr "  \\db[+]  [MODELO]       lista tablespaces\n"
 
-#: help.c:201
+#: help.c:197
 #, c-format
 msgid "  \\dc[S]  [PATTERN]      list conversions\n"
 msgstr "  \\dc[S]  [MODELO]       lista conversões\n"
 
-#: help.c:202
+#: help.c:198
 #, c-format
 msgid "  \\dC     [PATTERN]      list casts\n"
 msgstr "  \\dC     [MODELO]       lista conversões de tipos\n"
 
-#: help.c:203
+#: help.c:199
 #, c-format
 msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
 msgstr "  \\dd[S]  [MODELO]       mostra comentário do objeto\n"
 
-#: help.c:204
+#: help.c:200
 #, c-format
 msgid "  \\ddp    [PATTERN]      list default privileges\n"
 msgstr "  \\ddp    [MODELO]       lista privilégios padrão\n"
 
-#: help.c:205
+#: help.c:201
 #, c-format
 msgid "  \\dD[S]  [PATTERN]      list domains\n"
 msgstr "  \\dD[S]  [MODELO]       lista domínios\n"
 
-#: help.c:206
+#: help.c:202
+#, c-format
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [MODELO]       lista tabelas externas\n"
+
+#: help.c:203
 #, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
 msgstr "  \\des[+] [MODELO]       lista servidores externos\n"
 
-#: help.c:207
+#: help.c:204
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
 msgstr "  \\deu[+] [MODELO]       lista mapeamento de usuários\n"
 
-#: help.c:208
+#: help.c:205
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
 msgstr "  \\dew[+] [MODELO]       lista adaptadores de dados externos\n"
 
-#: help.c:209
+#: help.c:206
 #, c-format
 msgid ""
 "  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
@@ -1000,52 +1052,62 @@ msgstr ""
 "  \\df[antw][S+] [MODELO] lista funções [somente agr/normal/gatilho/"
 "deslizante]\n"
 
-#: help.c:210
+#: help.c:207
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
 msgstr "  \\dF[+]  [MODELO]       lista configurações de busca textual\n"
 
-#: help.c:211
+#: help.c:208
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr "  \\dFd[+] [MODELO]       lista dicionários de busca textual\n"
 
-#: help.c:212
+#: help.c:209
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr "  \\dFp[+] [MODELO]       lista analisadores de busca textual\n"
 
-#: help.c:213
+#: help.c:210
 #, c-format
 msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
 msgstr "  \\dFt[+] [MODELO]       lista modelos de busca textual\n"
 
-#: help.c:214
+#: help.c:211
 #, c-format
-msgid "  \\dg[+]  [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg     [MODELO]       lista roles (grupos)\n"
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]  [MODELO]       lista roles\n"
 
-#: help.c:215
+#: help.c:212
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [MODELO]       lista índices\n"
 
-#: help.c:216
+#: help.c:213
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
 msgstr "  \\dl                    lista objetos grandes, mesmo que \\lo_list\n"
 
-#: help.c:217
+#: help.c:214
 #, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
-msgstr "  \\dn[+]  [MODELO]       lista esquemas\n"
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [MODELO]       lista linguagens procedurais\n"
 
-#: help.c:218
+#: help.c:215
+#, c-format
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
+msgstr "  \\dn[S+] [MODELO]       lista esquemas\n"
+
+#: help.c:216
 #, c-format
 msgid "  \\do[S]  [PATTERN]      list operators\n"
 msgstr "  \\do[S]  [MODELO]       lista operadores\n"
 
-#: help.c:219
+#: help.c:217
+#, c-format
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dO[S+] [MODELO]       lista ordenações\n"
+
+#: help.c:218
 #, c-format
 msgid ""
 "  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
@@ -1053,53 +1115,68 @@ msgstr ""
 "  \\dp     [MODELO]       lista privilégios de acesso de tabelas, visões e "
 "sequências\n"
 
-#: help.c:220
+#: help.c:219
 #, c-format
 msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
 msgstr ""
 "  \\drds  [MOD1 [MOD2]]    lista configurações de roles por banco de dados\n"
 
-#: help.c:221
+#: help.c:220
 #, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
 msgstr "  \\ds[S+] [MODELO]       lista sequências\n"
 
-#: help.c:222
+#: help.c:221
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
 msgstr "  \\dt[S+] [MODELO]       lista tabelas\n"
 
-#: help.c:223
+#: help.c:222
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
 msgstr "  \\dT[S+] [MODELO]       lista tipos de dados\n"
 
-#: help.c:224
+#: help.c:223
 #, c-format
-msgid "  \\du[+]  [PATTERN]      list roles (users)\n"
-msgstr "  \\du     [MODELO]       lista roles (usuários)\n"
+msgid "  \\du[+]  [PATTERN]      list roles\n"
+msgstr "  \\du[+]  [MODELO]       lista roles\n"
 
-#: help.c:225
+#: help.c:224
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
 msgstr "  \\dv[S+] [MODELO]       lista visões\n"
 
+#: help.c:225
+#, c-format
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dE[S+] [MODELO]       lista tabelas externas\n"
+
 #: help.c:226
 #, c-format
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[+]  [MODELO]       lista extensões\n"
+
+#: help.c:227
+#, c-format
 msgid "  \\l[+]                  list all databases\n"
 msgstr "  \\l[+]                  lista todos os bancos de dados\n"
 
-#: help.c:227
+#: help.c:228
+#, c-format
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\sf[+] NOMEFUNÇÃO      edita a definição da função\n"
+
+#: help.c:229
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [MODELO]       mesmo que \\dp\n"
 
-#: help.c:230
+#: help.c:232
 #, c-format
 msgid "Formatting\n"
 msgstr "Formatação\n"
 
-#: help.c:231
+#: help.c:233
 #, c-format
 msgid ""
 "  \\a                     toggle between unaligned and aligned output mode\n"
@@ -1107,14 +1184,14 @@ msgstr ""
 "  \\a                     alterna entre modo de saída desalinhado e "
 "alinhado\n"
 
-#: help.c:232
+#: help.c:234
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr ""
 "  \\C [TEXTO]             define o título da tabela, ou apaga caso nada seja "
 "especificado\n"
 
-#: help.c:233
+#: help.c:235
 #, c-format
 msgid ""
 "  \\f [STRING]            show or set field separator for unaligned query "
@@ -1123,13 +1200,13 @@ msgstr ""
 "  \\f [TEXTO]             mostra ou define separador de campos para saída de "
 "consulta desalinhada\n"
 
-#: help.c:234
+#: help.c:236
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr ""
 "  \\H                     alterna para modo de saída em HTML (atual %s)\n"
 
-#: help.c:236
+#: help.c:238
 #, c-format
 msgid ""
 "  \\pset NAME [VALUE]     set table output option\n"
@@ -1144,12 +1221,12 @@ msgstr ""
 "                         numericlocale|recordsep|tuples_only|title|tableattr|"
 "pager})\n"
 
-#: help.c:239
+#: help.c:241
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]            mostra somente registros (atual %s)\n"
 
-#: help.c:241
+#: help.c:243
 #, c-format
 msgid ""
 "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
@@ -1157,17 +1234,17 @@ msgstr ""
 "  \\T [TEXTO]             define atributos do marcador HTML <table> ou apaga "
 "caso nada seja especificado\n"
 
-#: help.c:242
+#: help.c:244
 #, c-format
 msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off]            alterna para saída expandida (atual %s)\n"
 
-#: help.c:246
+#: help.c:248
 #, c-format
 msgid "Connection\n"
 msgstr "Conexão\n"
 
-#: help.c:247
+#: help.c:249
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -1176,34 +1253,40 @@ msgstr ""
 "  \\c[onnect] [NOMEBD|- USU�RIO|- M�QUINA|- PORTA|-]\n"
 "                         conecta a um outro banco de dados (atual \"%s\")\n"
 
-#: help.c:250
+#: help.c:252
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [CODIFICAÇÃO] mostra ou define codificação do cliente\n"
 
-#: help.c:251
+#: help.c:253
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [USU�RIO]    altera a senha de um usuário com segurança\n"
 
 #: help.c:254
 #, c-format
+msgid ""
+"  \\conninfo              display information about current connection\n"
+msgstr "  \\conninfo              mostra informação sobre conexão atual\n"
+
+#: help.c:257
+#, c-format
 msgid "Operating System\n"
 msgstr "Sistema Operacional\n"
 
-#: help.c:255
+#: help.c:258
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIRETÓRIO]        muda o diretório de trabalho atual\n"
 
-#: help.c:256
+#: help.c:259
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr ""
 "  \\timing [on|off]       alterna para duração da execução de comandos "
 "(atualmente %s)\n"
 
-#: help.c:258
+#: help.c:261
 #, c-format
 msgid ""
 "  \\! [COMMAND]           execute command in shell or start interactive "
@@ -1212,19 +1295,19 @@ msgstr ""
 "  \\! [COMANDO]           executa comando na shell ou inicia shell "
 "iterativa\n"
 
-#: help.c:261
+#: help.c:264
 #, c-format
 msgid "Variables\n"
 msgstr "Variáveis\n"
 
-#: help.c:262
+#: help.c:265
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr ""
 "  \\prompt [TEXTO] NOME   pergunta o usuário ao definir uma variável "
 "interna\n"
 
-#: help.c:263
+#: help.c:266
 #, c-format
 msgid ""
 "  \\set [NAME [VALUE]]    set internal variable, or list all if no "
@@ -1233,17 +1316,17 @@ msgstr ""
 "  \\set [NOME [VALOR]]    define variável interna ou lista todos caso não "
 "tenha parâmetros\n"
 
-#: help.c:264
+#: help.c:267
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset NOME            apaga (exclui) variável interna\n"
 
-#: help.c:267
+#: help.c:270
 #, c-format
 msgid "Large Objects\n"
 msgstr "Objetos Grandes\n"
 
-#: help.c:268
+#: help.c:271
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -1256,11 +1339,11 @@ msgstr ""
 "  \\lo_list\n"
 "  \\lo_unlink OIDLOB      operações com objetos grandes\n"
 
-#: help.c:321
+#: help.c:318
 msgid "Available help:\n"
 msgstr "Ajuda disponível:\n"
 
-#: help.c:410
+#: help.c:402
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1275,7 +1358,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:426
+#: help.c:418
 #, c-format
 msgid ""
 "No help available for \"%s\".\n"
@@ -1317,16 +1400,17 @@ msgstr "%s: status da transação é desconhecido\n"
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:290 describe.c:146 describe.c:334 describe.c:613 describe.c:762
-#: describe.c:2381 describe.c:2681 describe.c:3310 describe.c:3369
+#: large_obj.c:290 describe.c:147 describe.c:335 describe.c:637 describe.c:787
+#: describe.c:2513 describe.c:2631 describe.c:2968 describe.c:3599
+#: describe.c:3664
 msgid "Owner"
 msgstr "Dono"
 
-#: large_obj.c:291 large_obj.c:301 describe.c:95 describe.c:158 describe.c:337
-#: describe.c:490 describe.c:566 describe.c:637 describe.c:827 describe.c:1318
-#: describe.c:2205 describe.c:2395 describe.c:2689 describe.c:2751
-#: describe.c:2887 describe.c:2926 describe.c:2993 describe.c:3052
-#: describe.c:3061 describe.c:3120
+#: large_obj.c:291 large_obj.c:301 describe.c:96 describe.c:159 describe.c:338
+#: describe.c:501 describe.c:590 describe.c:661 describe.c:852 describe.c:1382
+#: describe.c:2330 describe.c:2537 describe.c:2911 describe.c:2976
+#: describe.c:3041 describe.c:3177 describe.c:3216 describe.c:3283
+#: describe.c:3342 describe.c:3351 describe.c:3410 describe.c:3849
 msgid "Description"
 msgstr "Descrição"
 
@@ -1395,12 +1479,12 @@ msgid_plural "(%lu rows)"
 msgstr[0] "(%lu registro)"
 msgstr[1] "(%lu registros)"
 
-#: startup.c:237
+#: startup.c:243
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo de log \"%s\": %s\n"
 
-#: startup.c:299
+#: startup.c:305
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -1409,720 +1493,779 @@ msgstr ""
 "Digite \"help\" para ajuda.\n"
 "\n"
 
-#: startup.c:445
+#: startup.c:451
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: não pôde definir parâmetro de exibição \"%s\"\n"
 
-#: startup.c:484
+#: startup.c:490
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: não pôde apagar variável \"%s\"\n"
 
-#: startup.c:494
+#: startup.c:500
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: não pôde definir variável \"%s\"\n"
 
-#: startup.c:531 startup.c:537
+#: startup.c:537 startup.c:543
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: startup.c:554
+#: startup.c:560
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: aviso: argumento extra de linha de comando \"%s\" ignorado\n"
 
-#: startup.c:619
+#: startup.c:625
 msgid "contains support for command-line editing"
 msgstr "contém suporte a edição em linha de comando"
 
-#: describe.c:68 describe.c:235 describe.c:462 describe.c:561 describe.c:682
-#: describe.c:763 describe.c:824 describe.c:2373 describe.c:2494
-#: describe.c:2549 describe.c:2749 describe.c:2976 describe.c:3048
-#: describe.c:3059 describe.c:3118
+#: describe.c:69 describe.c:236 describe.c:463 describe.c:585 describe.c:706
+#: describe.c:788 describe.c:849 describe.c:2504 describe.c:2698
+#: describe.c:2768 describe.c:2903 describe.c:3039 describe.c:3266
+#: describe.c:3338 describe.c:3349 describe.c:3408 describe.c:3782
+#: describe.c:3848
 msgid "Schema"
 msgstr "Esquema"
 
-#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:562
-#: describe.c:612 describe.c:683 describe.c:825 describe.c:2374
-#: describe.c:2495 describe.c:2550 describe.c:2680 describe.c:2750
-#: describe.c:2977 describe.c:3049 describe.c:3060 describe.c:3119
-#: describe.c:3309 describe.c:3368
+#: describe.c:70 describe.c:146 describe.c:237 describe.c:464 describe.c:586
+#: describe.c:636 describe.c:707 describe.c:850 describe.c:2505
+#: describe.c:2627 describe.c:2699 describe.c:2769 describe.c:2904
+#: describe.c:2967 describe.c:3040 describe.c:3267 describe.c:3339
+#: describe.c:3350 describe.c:3409 describe.c:3598 describe.c:3663
+#: describe.c:3846
 msgid "Name"
 msgstr "Nome"
 
-#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
+#: describe.c:71 describe.c:249 describe.c:295 describe.c:312
 msgid "Result data type"
 msgstr "Tipo de dado do resultado"
 
-#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
+#: describe.c:85 describe.c:89 describe.c:250 describe.c:296 describe.c:313
 msgid "Argument data types"
 msgstr "Tipos de dado do argumento"
 
-#: describe.c:113
+#: describe.c:114
 msgid "List of aggregate functions"
 msgstr "Lista das funções de agregação"
 
-#: describe.c:134
+#: describe.c:135
 #, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "O servidor (versão %d.%d) não suporta tablespaces.\n"
 
-#: describe.c:147
+#: describe.c:148
 msgid "Location"
 msgstr "Local"
 
-#: describe.c:175
+#: describe.c:176
 msgid "List of tablespaces"
 msgstr "Lista das tablespaces"
 
-#: describe.c:212
+#: describe.c:213
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df só possui as opções [antwS+]\n"
 
-#: describe.c:218
+#: describe.c:219
 #, c-format
 msgid "\\df does not take a \"w\" option with server version %d.%d\n"
 msgstr "\\df não possui a opção \"w\" em um servidor na versão %d.%d.\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:251 describe.c:297 describe.c:314
+#: describe.c:252 describe.c:298 describe.c:315
 msgid "agg"
 msgstr "agr"
 
-#: describe.c:252
+#: describe.c:253
 msgid "window"
 msgstr "deslizante"
 
-#: describe.c:253 describe.c:298 describe.c:315 describe.c:964
+#: describe.c:254 describe.c:299 describe.c:316 describe.c:990
 msgid "trigger"
 msgstr "gatilho"
 
-#: describe.c:254 describe.c:299 describe.c:316
+#: describe.c:255 describe.c:300 describe.c:317
 msgid "normal"
 msgstr "normal"
 
-#: describe.c:255 describe.c:300 describe.c:317 describe.c:685 describe.c:767
-#: describe.c:1299 describe.c:2380 describe.c:2496 describe.c:3381
+#: describe.c:256 describe.c:301 describe.c:318 describe.c:710 describe.c:792
+#: describe.c:1362 describe.c:2512 describe.c:2700 describe.c:3676
 msgid "Type"
 msgstr "Tipo"
 
-#: describe.c:330
+#: describe.c:331
 msgid "immutable"
 msgstr "imutável"
 
-#: describe.c:331
+#: describe.c:332
 msgid "stable"
 msgstr "estável"
 
-#: describe.c:332
+#: describe.c:333
 msgid "volatile"
 msgstr "volátil"
 
-#: describe.c:333
+#: describe.c:334
 msgid "Volatility"
 msgstr "Volatilidade"
 
-#: describe.c:335
+#: describe.c:336
 msgid "Language"
 msgstr "Linguagem"
 
-#: describe.c:336
+#: describe.c:337
 msgid "Source code"
 msgstr "Código fonte"
 
-#: describe.c:434
+#: describe.c:435
 msgid "List of functions"
 msgstr "Lista de funções"
 
-#: describe.c:473
+#: describe.c:474
 msgid "Internal name"
 msgstr "Nome interno"
 
-#: describe.c:474 describe.c:629 describe.c:2391
+#: describe.c:475 describe.c:653 describe.c:2529 describe.c:2533
 msgid "Size"
 msgstr "Tamanho"
 
-#: describe.c:486
+#: describe.c:496
 msgid "Elements"
 msgstr "Elementos"
 
-#: describe.c:530
+#: describe.c:541
 msgid "List of data types"
 msgstr "Lista de tipos de dado"
 
-#: describe.c:563
+#: describe.c:587
 msgid "Left arg type"
 msgstr "Tipo de argumento à esquerda"
 
-#: describe.c:564
+#: describe.c:588
 msgid "Right arg type"
 msgstr "Tipo de argumento à direita"
 
-#: describe.c:565
+#: describe.c:589
 msgid "Result type"
 msgstr "Tipo resultante"
 
-#: describe.c:584
+#: describe.c:608
 msgid "List of operators"
 msgstr "Lista de operadores"
 
-#: describe.c:614
+#: describe.c:638
 msgid "Encoding"
 msgstr "Codificação"
 
-#: describe.c:619
-msgid "Collation"
-msgstr "Collation"
+#: describe.c:643 describe.c:2905
+msgid "Collate"
+msgstr "Collate"
 
-#: describe.c:620
+#: describe.c:644 describe.c:2906
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:633
+#: describe.c:657
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:650
+#: describe.c:674
 msgid "List of databases"
 msgstr "Lista dos bancos de dados"
 
-#: describe.c:684 describe.c:764 describe.c:919 describe.c:2375 sql_help.c:443
-#: sql_help.c:660 sql_help.c:761 sql_help.c:1178 sql_help.c:1305
-#: sql_help.c:1339 sql_help.c:1574 sql_help.c:1723 sql_help.c:1884
-#: sql_help.c:1965 sql_help.c:2159 sql_help.c:2719 sql_help.c:2739
-#: sql_help.c:2741 sql_help.c:2742
+#: describe.c:708 describe.c:789 describe.c:944 describe.c:2506 sql_help.c:595
+#: sql_help.c:842 sql_help.c:969 sql_help.c:1432 sql_help.c:1562
+#: sql_help.c:1596 sql_help.c:1842 sql_help.c:2000 sql_help.c:2185
+#: sql_help.c:2266 sql_help.c:2472 sql_help.c:3103 sql_help.c:3123
+#: sql_help.c:3125 sql_help.c:3126
 msgid "table"
 msgstr "tabela"
 
-#: describe.c:684 describe.c:920 describe.c:2376
+#: describe.c:708 describe.c:945 describe.c:2507
 msgid "view"
 msgstr "visão"
 
-#: describe.c:684 describe.c:765 describe.c:922 describe.c:2378
+#: describe.c:708 describe.c:790 describe.c:947 describe.c:2509
 msgid "sequence"
 msgstr "sequência"
 
-#: describe.c:696
+#: describe.c:709 describe.c:948 describe.c:2511
+msgid "foreign table"
+msgstr "tabela externa"
+
+#: describe.c:721
 msgid "Column access privileges"
 msgstr "Privilégios de acesso à coluna"
 
-#: describe.c:722 describe.c:3476 describe.c:3480
+#: describe.c:747 describe.c:3993 describe.c:3997
 msgid "Access privileges"
 msgstr "Privilégios de acesso"
 
-#: describe.c:750
+#: describe.c:775
 #, c-format
 msgid ""
 "The server (version %d.%d) does not support altering default privileges.\n"
 msgstr ""
 "O servidor (versão %d.%d) não suporta alteração de privilégios padrão.\n"
 
-#: describe.c:766 describe.c:858
+#: describe.c:791 describe.c:883
 msgid "function"
 msgstr "função"
 
-#: describe.c:790
+#: describe.c:815
 msgid "Default access privileges"
 msgstr "Privilégios de acesso padrão"
 
-#: describe.c:826
+#: describe.c:851
 msgid "Object"
 msgstr "Objeto"
 
-#: describe.c:838
+#: describe.c:863
 msgid "aggregate"
 msgstr "agregação"
 
-#: describe.c:877 sql_help.c:1457 sql_help.c:2457 sql_help.c:2525
-#: sql_help.c:2656 sql_help.c:2757 sql_help.c:2808
+#: describe.c:902 sql_help.c:1715 sql_help.c:2833 sql_help.c:2903
+#: sql_help.c:3036 sql_help.c:3141 sql_help.c:3192
 msgid "operator"
 msgstr "operador"
 
-#: describe.c:896
+#: describe.c:921
 msgid "data type"
 msgstr "tipo de dado"
 
-#: describe.c:921 describe.c:2377
+#: describe.c:946 describe.c:2508
 msgid "index"
 msgstr "índice"
 
-#: describe.c:943
+#: describe.c:969
 msgid "rule"
 msgstr "regra"
 
-#: describe.c:987
+#: describe.c:1013
 msgid "Object descriptions"
 msgstr "Descrições dos Objetos"
 
-#: describe.c:1040
+#: describe.c:1066
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Não encontrou nenhuma relação chamada \"%s\".\n"
 
-#: describe.c:1194
+#: describe.c:1238
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "Não encontrou nenhuma relação com OID %s.\n"
 
-#: describe.c:1262
+#: describe.c:1314
+#, c-format
+msgid "Unlogged table \"%s.%s\""
+msgstr "Tabela unlogged \"%s.%s\""
+
+#: describe.c:1317
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabela \"%s.%s\""
 
-#: describe.c:1266
+#: describe.c:1321
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Visão \"%s.%s\""
 
-#: describe.c:1270
+#: describe.c:1325
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequência \"%s.%s\""
 
-#: describe.c:1274
+#: describe.c:1330
+#, c-format
+msgid "Unlogged index \"%s.%s\""
+msgstr "�ndice unlogged \"%s.%s\""
+
+#: describe.c:1333
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "�ndice \"%s.%s\""
 
-#: describe.c:1279
+#: describe.c:1338
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Relação especial \"%s.%s\""
 
-#: describe.c:1283
+#: describe.c:1342
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "tabela TOAST \"%s.%s\""
 
-#: describe.c:1287
+#: describe.c:1346
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Tipo composto \"%s.%s\""
 
-#: describe.c:1298
+#: describe.c:1350
+#, c-format
+msgid "Foreign table \"%s.%s\""
+msgstr "Tabela externa \"%s.%s\""
+
+#: describe.c:1361
 msgid "Column"
 msgstr "Coluna"
 
-#: describe.c:1305
+#: describe.c:1369
 msgid "Modifiers"
 msgstr "Modificadores"
 
-#: describe.c:1310
+#: describe.c:1374
 msgid "Value"
 msgstr "Valor"
 
-#: describe.c:1313
+#: describe.c:1377
 msgid "Definition"
 msgstr "Definição"
 
-#: describe.c:1317
+#: describe.c:1381
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: describe.c:1359
+#: describe.c:1427
+#, c-format
+msgid "collate %s"
+msgstr "collate %s"
+
+#: describe.c:1435
 msgid "not null"
 msgstr "não nulo"
 
 #. translator: default values of column definitions
-#: describe.c:1368
+#: describe.c:1445
 #, c-format
 msgid "default %s"
 msgstr "valor padrão de %s"
 
-#: describe.c:1459
+#: describe.c:1536
 msgid "primary key, "
 msgstr "chave primária, "
 
-#: describe.c:1461
+#: describe.c:1538
 msgid "unique, "
 msgstr "unicidade, "
 
-#: describe.c:1467
+#: describe.c:1544
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "para tabela \"%s.%s\""
 
-#: describe.c:1471
+#: describe.c:1548
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", predicado (%s)"
 
-#: describe.c:1474
+#: describe.c:1551
 msgid ", clustered"
 msgstr ", agrupada"
 
-#: describe.c:1477
+#: describe.c:1554
 msgid ", invalid"
 msgstr ", inválido"
 
-#: describe.c:1480
+#: describe.c:1557
 msgid ", deferrable"
 msgstr ", postergável"
 
-#: describe.c:1483
+#: describe.c:1560
 msgid ", initially deferred"
 msgstr ", inicialmente postergada"
 
-#: describe.c:1497
+#: describe.c:1574
 msgid "View definition:"
 msgstr "Definição da visão:"
 
-#: describe.c:1514 describe.c:1792
+#: describe.c:1591 describe.c:1874
 msgid "Rules:"
 msgstr "Regras:"
 
-#: describe.c:1573
+#: describe.c:1650
 msgid "Indexes:"
 msgstr "�ndices:"
 
-#: describe.c:1648
+#: describe.c:1730
 msgid "Check constraints:"
 msgstr "Restrições de verificação:"
 
-#: describe.c:1679
+#: describe.c:1761
 msgid "Foreign-key constraints:"
 msgstr "Restrições de chave estrangeira:"
 
-#: describe.c:1710
+#: describe.c:1792
 msgid "Referenced by:"
 msgstr "Referenciada por:"
 
-#: describe.c:1795
+#: describe.c:1877
 msgid "Disabled rules:"
 msgstr "Regras desabilitadas:"
 
-#: describe.c:1798
+#: describe.c:1880
 msgid "Rules firing always:"
 msgstr "Regras sempre disparadas:"
 
-#: describe.c:1801
+#: describe.c:1883
 msgid "Rules firing on replica only:"
 msgstr "Regras somente disparadas na réplica:"
 
-#: describe.c:1903
+#: describe.c:1991
 msgid "Triggers:"
 msgstr "Gatilhos:"
 
-#: describe.c:1906
+#: describe.c:1994
 msgid "Disabled triggers:"
 msgstr "Gatilhos desabilitados:"
 
-#: describe.c:1909
+#: describe.c:1997
 msgid "Triggers firing always:"
 msgstr "Gatilhos sempre disparados:"
 
-#: describe.c:1912
+#: describe.c:2000
 msgid "Triggers firing on replica only:"
 msgstr "Gatilhos somente disparados na réplica:"
 
-#: describe.c:1945
+#: describe.c:2066
 msgid "Inherits"
 msgstr "Heranças"
 
-#: describe.c:1975
+#: describe.c:2096
 #, c-format
 msgid "Number of child tables: %d (Use \\d+ to list them.)"
 msgstr "Número de tabelas descendentes: %d (Utilize \\d+ para listá-las.)"
 
-#: describe.c:1982
+#: describe.c:2103
 msgid "Child tables"
 msgstr "Tabelas descendentes"
 
-#: describe.c:2004
+#: describe.c:2125
 #, c-format
 msgid "Typed table of type: %s"
 msgstr "Tabela protótipo de tipo: %s"
 
-#: describe.c:2011
+#: describe.c:2132
 msgid "Has OIDs"
 msgstr "Têm OIDs"
 
-#: describe.c:2014 describe.c:2553 describe.c:2627
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "yes"
 msgstr "sim"
 
-#: describe.c:2014 describe.c:2553 describe.c:2627
+#: describe.c:2135 describe.c:2772 describe.c:2846
 msgid "no"
 msgstr "não"
 
-#: describe.c:2022 describe.c:3319 describe.c:3383 describe.c:3439
+#: describe.c:2143 describe.c:3614 describe.c:3678 describe.c:3734
+#: describe.c:3789
 msgid "Options"
 msgstr "Opções"
 
-#: describe.c:2107
+#: describe.c:2228
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: \"%s\""
 
-#: describe.c:2120
+#: describe.c:2241
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace \"%s\""
 
-#: describe.c:2198
+#: describe.c:2323
 msgid "List of roles"
 msgstr "Lista de roles"
 
-#: describe.c:2200
+#: describe.c:2325
 msgid "Role name"
 msgstr "Nome da role"
 
-#: describe.c:2201
+#: describe.c:2326
 msgid "Attributes"
 msgstr "Atributos"
 
-#: describe.c:2202
+#: describe.c:2327
 msgid "Member of"
 msgstr "Membro de"
 
-#: describe.c:2213
+#: describe.c:2338
 msgid "Superuser"
 msgstr "Super-usuário"
 
-#: describe.c:2216
+#: describe.c:2341
 msgid "No inheritance"
 msgstr "Nenhuma herança"
 
-#: describe.c:2219
+#: describe.c:2344
 msgid "Create role"
 msgstr "Cria role"
 
-#: describe.c:2222
+#: describe.c:2347
 msgid "Create DB"
 msgstr "Cria BD"
 
-#: describe.c:2225
+#: describe.c:2350
 msgid "Cannot login"
 msgstr "Não pode efetuar login"
 
-#: describe.c:2234
+#: describe.c:2354
+msgid "Replication"
+msgstr "Replicação"
+
+#: describe.c:2363
 msgid "No connections"
 msgstr "Nenhuma conexão"
 
-#: describe.c:2236
+#: describe.c:2365
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d conexão"
 msgstr[1] "%d conexões"
 
-#: describe.c:2303
+#: describe.c:2432
 #, c-format
 msgid "No per-database role settings support in this server version.\n"
 msgstr ""
 "Nenhum suporte a configurações de roles por banco de dados nesta versão do "
 "servidor.\n"
 
-#: describe.c:2314
+#: describe.c:2443
 #, c-format
 msgid "No matching settings found.\n"
 msgstr "Nenhuma configuração correspondente foi encontrada.\n"
 
-#: describe.c:2316
+#: describe.c:2445
 #, c-format
 msgid "No settings found.\n"
 msgstr "Nenhuma configuração foi encontrada.\n"
 
-#: describe.c:2321
+#: describe.c:2450
 msgid "List of settings"
 msgstr "Lista de configurações"
 
-#: describe.c:2379
+#: describe.c:2510
 msgid "special"
 msgstr "especial"
 
-#: describe.c:2386
+#: describe.c:2518 describe.c:3783
 msgid "Table"
 msgstr "Tabela"
 
-#: describe.c:2446
+#: describe.c:2592
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Nenhuma relação correspondente foi encontrada.\n"
 
-#: describe.c:2448
+#: describe.c:2594
 #, c-format
 msgid "No relations found.\n"
 msgstr "Nenhuma relação foi encontrada.\n"
 
-#: describe.c:2453
+#: describe.c:2599
 msgid "List of relations"
 msgstr "Lista de relações"
 
-#: describe.c:2497
+#: describe.c:2635
+msgid "Trusted"
+msgstr "Confiável"
+
+#: describe.c:2643
+msgid "Internal Language"
+msgstr "Linguagem Interna"
+
+#: describe.c:2644
+msgid "Call Handler"
+msgstr "Manipulador de Chamada"
+
+#: describe.c:2645 describe.c:3606
+msgid "Validator"
+msgstr "Validador"
+
+#: describe.c:2648
+msgid "Inline Handler"
+msgstr "Manipulador de Código Embutido"
+
+#: describe.c:2669
+msgid "List of languages"
+msgstr "Lista de linguagens"
+
+#: describe.c:2709
 msgid "Modifier"
 msgstr "Modificador"
 
-#: describe.c:2498
+#: describe.c:2717
 msgid "Check"
 msgstr "Verificação"
 
-#: describe.c:2516
+#: describe.c:2735
 msgid "List of domains"
 msgstr "Lista de domínios"
 
-#: describe.c:2551
+#: describe.c:2770
 msgid "Source"
 msgstr "Fonte"
 
-#: describe.c:2552
+#: describe.c:2771
 msgid "Destination"
 msgstr "Destino"
 
-#: describe.c:2554
+#: describe.c:2773
 msgid "Default?"
 msgstr "Padrão?"
 
-#: describe.c:2572
+#: describe.c:2791
 msgid "List of conversions"
 msgstr "Lista de conversões"
 
-#: describe.c:2624
+#: describe.c:2843
 msgid "Source type"
 msgstr "Tipo fonte"
 
-#: describe.c:2625
+#: describe.c:2844
 msgid "Target type"
 msgstr "Tipo alvo"
 
-#: describe.c:2626 describe.c:2886
+#: describe.c:2845 describe.c:3176
 msgid "Function"
 msgstr "Função"
 
-#: describe.c:2627
+#: describe.c:2846
 msgid "in assignment"
 msgstr "em atribuição"
 
-#: describe.c:2628
+#: describe.c:2847
 msgid "Implicit?"
 msgstr "Implícito?"
 
-#: describe.c:2654
+#: describe.c:2873
 msgid "List of casts"
 msgstr "Lista de conversões de tipos"
 
-#: describe.c:2709
+#: describe.c:2941
+msgid "List of collations"
+msgstr "Lista de ordenações"
+
+#: describe.c:2999
 msgid "List of schemas"
 msgstr "Lista de esquemas"
 
-#: describe.c:2732 describe.c:2965 describe.c:3033 describe.c:3101
+#: describe.c:3022 describe.c:3255 describe.c:3323 describe.c:3391
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "O servidor (versão %d.%d) não suporta busca textual.\n"
 
-#: describe.c:2766
+#: describe.c:3056
 msgid "List of text search parsers"
 msgstr "Lista de analisadores de busca textual"
 
-#: describe.c:2809
+#: describe.c:3099
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "Não encontrou nenhum analisador de busca textual chamado \"%s\".\n"
 
-#: describe.c:2884
+#: describe.c:3174
 msgid "Start parse"
 msgstr "Iniciar análise"
 
-#: describe.c:2885
+#: describe.c:3175
 msgid "Method"
 msgstr "Método"
 
-#: describe.c:2889
+#: describe.c:3179
 msgid "Get next token"
 msgstr "Obter próximo elemento"
 
-#: describe.c:2891
+#: describe.c:3181
 msgid "End parse"
 msgstr "Terminar análise"
 
-#: describe.c:2893
+#: describe.c:3183
 msgid "Get headline"
 msgstr "Obter destaque"
 
-#: describe.c:2895
+#: describe.c:3185
 msgid "Get token types"
 msgstr "Obter tipos de elemento"
 
-#: describe.c:2905
+#: describe.c:3195
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Analisador de busca textual \"%s.%s\""
 
-#: describe.c:2907
+#: describe.c:3197
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "Analisador de busca textual \"%s\""
 
-#: describe.c:2925
+#: describe.c:3215
 msgid "Token name"
 msgstr "Nome do elemento"
 
-#: describe.c:2936
+#: describe.c:3226
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "Tipos de elemento para analisador \"%s.%s\""
 
-#: describe.c:2938
+#: describe.c:3228
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "Tipos de elemento para analisador \"%s\""
 
-#: describe.c:2987
+#: describe.c:3277
 msgid "Template"
 msgstr "Modelo"
 
-#: describe.c:2988
+#: describe.c:3278
 msgid "Init options"
 msgstr "Opções de inicialização"
 
-#: describe.c:3010
+#: describe.c:3300
 msgid "List of text search dictionaries"
 msgstr "Lista de dicionários de busca textual"
 
-#: describe.c:3050
+#: describe.c:3340
 msgid "Init"
 msgstr "Inicializador"
 
-#: describe.c:3051
+#: describe.c:3341
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:3078
+#: describe.c:3368
 msgid "List of text search templates"
 msgstr "Lista de modelos de busca textual"
 
-#: describe.c:3135
+#: describe.c:3425
 msgid "List of text search configurations"
 msgstr "Lista de configurações de busca textual"
 
-#: describe.c:3179
+#: describe.c:3469
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "Não encontrou nenhuma configuração de busca textual chamada \"%s\".\n"
 
-#: describe.c:3245
+#: describe.c:3535
 msgid "Token"
 msgstr "Elemento"
 
-#: describe.c:3246
+#: describe.c:3536
 msgid "Dictionaries"
 msgstr "Dicionários"
 
-#: describe.c:3257
+#: describe.c:3547
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Configuração de busca textual \"%s.%s\""
 
-#: describe.c:3260
+#: describe.c:3550
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Configuração de busca textual \"%s\""
 
-#: describe.c:3264
+#: describe.c:3554
 #, c-format
 msgid ""
 "\n"
@@ -2131,7 +2274,7 @@ msgstr ""
 "\n"
 "Analisador: \"%s.%s\""
 
-#: describe.c:3267
+#: describe.c:3557
 #, c-format
 msgid ""
 "\n"
@@ -2140,557 +2283,630 @@ msgstr ""
 "\n"
 "Analisador: \"%s\""
 
-#: describe.c:3299
+#: describe.c:3589
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "O servidor (versão %d.%d) não suporta adaptadores de dados externos.\n"
 
-#: describe.c:3311
-msgid "Validator"
-msgstr "Validador"
+#: describe.c:3603
+msgid "Handler"
+msgstr "Manipulador"
 
-#: describe.c:3335
+#: describe.c:3630
 msgid "List of foreign-data wrappers"
 msgstr "Lista de adaptadores de dados externos"
 
-#: describe.c:3358
+#: describe.c:3653
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "O servidor (versão %d.%d) não suporta servidores externos.\n"
 
-#: describe.c:3370
+#: describe.c:3665
 msgid "Foreign-data wrapper"
 msgstr "Adaptador de dados externos"
 
-#: describe.c:3382
+#: describe.c:3677 describe.c:3847
 msgid "Version"
 msgstr "Versão"
 
-#: describe.c:3401
+#: describe.c:3696
 msgid "List of foreign servers"
 msgstr "Lista de servidores externos"
 
-#: describe.c:3424
+#: describe.c:3719
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "O servidor (versão %d.%d) não suporta mapeamentos de usuários.\n"
 
-#: describe.c:3433
+#: describe.c:3728 describe.c:3784
 msgid "Server"
 msgstr "Servidor"
 
-#: describe.c:3434
+#: describe.c:3729
 msgid "User name"
 msgstr "Nome de usuário"
 
-#: describe.c:3454
+#: describe.c:3749
 msgid "List of user mappings"
 msgstr "Lista de mapeamentos de usuários"
 
-#: sql_help.h:173 sql_help.h:788
+#: describe.c:3772
+#, c-format
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "O servidor (versão %d.%d) não suporta tabelas externas.\n"
+
+#: describe.c:3810
+msgid "List of foreign tables"
+msgstr "Lista de tabelas externas"
+
+#: describe.c:3833 describe.c:3887
+#, c-format
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "O servidor (versão %d.%d) não suporta extensões.\n"
+
+#: describe.c:3864
+msgid "List of installed extensions"
+msgstr "Lista de extensões instaladas"
+
+#: describe.c:3914
+#, c-format
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "Não encontrou nenhuma extensão chamada \"%s\".\n"
+
+#: describe.c:3917
+#, c-format
+msgid "Did not find any extensions.\n"
+msgstr "Não encontrou nenhuma extensão.\n"
+
+#: describe.c:3961
+msgid "Object Description"
+msgstr "Descrição do Objeto"
+
+#: describe.c:3970
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr "Objetos na extensão \"%s\""
+
+#: sql_help.h:182 sql_help.h:837
 msgid "abort the current transaction"
 msgstr "transação atual foi interrompida"
 
-#: sql_help.h:178
+#: sql_help.h:187
 msgid "change the definition of an aggregate function"
 msgstr "muda a definição de uma função de agregação"
 
-#: sql_help.h:183
+#: sql_help.h:192
+msgid "change the definition of a collation"
+msgstr "muda a definição de uma ordenação"
+
+#: sql_help.h:197
 msgid "change the definition of a conversion"
 msgstr "muda a definição de uma conversão"
 
-#: sql_help.h:188
+#: sql_help.h:202
 msgid "change a database"
 msgstr "muda o banco de dados"
 
-#: sql_help.h:193
+#: sql_help.h:207
 msgid "define default access privileges"
 msgstr "define privilégios de acesso padrão"
 
-#: sql_help.h:198
+#: sql_help.h:212
 msgid "change the definition of a domain"
 msgstr "muda a definição de um domínio"
 
-#: sql_help.h:203
+#: sql_help.h:217
+msgid "change the definition of an extension"
+msgstr "muda a definição de uma extensão"
+
+#: sql_help.h:222
 msgid "change the definition of a foreign-data wrapper"
 msgstr "muda a definição de um adaptador de dados externos"
 
-#: sql_help.h:208
+#: sql_help.h:227
+msgid "change the definition of a foreign table"
+msgstr "muda a definição de uma tabela externa"
+
+#: sql_help.h:232
 msgid "change the definition of a function"
 msgstr "muda a definição de uma função"
 
-#: sql_help.h:213
+#: sql_help.h:237
 msgid "change role name or membership"
 msgstr "muda nome da role ou membro"
 
-#: sql_help.h:218
+#: sql_help.h:242
 msgid "change the definition of an index"
 msgstr "muda a definição de um índice"
 
-#: sql_help.h:223
+#: sql_help.h:247
 msgid "change the definition of a procedural language"
 msgstr "muda a definição de uma linguagem procedural"
 
-#: sql_help.h:228
+#: sql_help.h:252
 msgid "change the definition of a large object"
 msgstr "muda a definição de um objeto grande"
 
-#: sql_help.h:233
+#: sql_help.h:257
 msgid "change the definition of an operator"
 msgstr "muda a definição de um operador"
 
-#: sql_help.h:238
+#: sql_help.h:262
 msgid "change the definition of an operator class"
 msgstr "muda a definição de uma classe de operadores"
 
-#: sql_help.h:243
+#: sql_help.h:267
 msgid "change the definition of an operator family"
 msgstr "muda a definição de uma família de operadores"
 
-#: sql_help.h:248 sql_help.h:308
+#: sql_help.h:272 sql_help.h:332
 msgid "change a database role"
 msgstr "muda uma role do banco de dados"
 
-#: sql_help.h:253
+#: sql_help.h:277
 msgid "change the definition of a schema"
 msgstr "muda a definição de um esquema"
 
-#: sql_help.h:258
+#: sql_help.h:282
 msgid "change the definition of a sequence generator"
 msgstr "muda a definição de um gerador de sequência"
 
-#: sql_help.h:263
+#: sql_help.h:287
 msgid "change the definition of a foreign server"
 msgstr "muda a definição de um servidor externo"
 
-#: sql_help.h:268
+#: sql_help.h:292
 msgid "change the definition of a table"
 msgstr "muda a definição de uma tabela"
 
-#: sql_help.h:273
+#: sql_help.h:297
 msgid "change the definition of a tablespace"
 msgstr "muda a definição de uma tablespace"
 
-#: sql_help.h:278
+#: sql_help.h:302
 msgid "change the definition of a text search configuration"
 msgstr "muda a definição de uma configuração de busca textual"
 
-#: sql_help.h:283
+#: sql_help.h:307
 msgid "change the definition of a text search dictionary"
 msgstr "muda a definição de um dicionário de busca textual"
 
-#: sql_help.h:288
+#: sql_help.h:312
 msgid "change the definition of a text search parser"
 msgstr "muda a definição de um analisador de busca textual"
 
-#: sql_help.h:293
+#: sql_help.h:317
 msgid "change the definition of a text search template"
 msgstr "muda a definição de um modelo de busca textual"
 
-#: sql_help.h:298
+#: sql_help.h:322
 msgid "change the definition of a trigger"
 msgstr "muda a definição de um gatilho"
 
-#: sql_help.h:303
+#: sql_help.h:327
 msgid "change the definition of a type"
 msgstr "muda a definição de um tipo"
 
-#: sql_help.h:313
+#: sql_help.h:337
 msgid "change the definition of a user mapping"
 msgstr "muda a definição de um mapeamento de usuários"
 
-#: sql_help.h:318
+#: sql_help.h:342
 msgid "change the definition of a view"
 msgstr "muda a definição de uma visão"
 
-#: sql_help.h:323
+#: sql_help.h:347
 msgid "collect statistics about a database"
 msgstr "coleta estatísticas sobre o banco de dados"
 
-#: sql_help.h:328 sql_help.h:848
+#: sql_help.h:352 sql_help.h:902
 msgid "start a transaction block"
 msgstr "inicia um bloco de transação"
 
-#: sql_help.h:333
+#: sql_help.h:357
 msgid "force a transaction log checkpoint"
 msgstr "força ponto de controle no log de transação"
 
-#: sql_help.h:338
+#: sql_help.h:362
 msgid "close a cursor"
 msgstr "fecha um cursor"
 
-#: sql_help.h:343
+#: sql_help.h:367
 msgid "cluster a table according to an index"
 msgstr "agrupa uma tabela de acordo com um índice"
 
-#: sql_help.h:348
+#: sql_help.h:372
 msgid "define or change the comment of an object"
 msgstr "define ou muda um comentário de um objeto"
 
-#: sql_help.h:353 sql_help.h:698
+#: sql_help.h:377 sql_help.h:747
 msgid "commit the current transaction"
 msgstr "efetiva a transação atual"
 
-#: sql_help.h:358
+#: sql_help.h:382
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "efetiva uma transação que foi anteriormente preparada para efetivação em "
 "duas fases"
 
-#: sql_help.h:363
+#: sql_help.h:387
 msgid "copy data between a file and a table"
 msgstr "copia dados de um arquivo para uma tabela"
 
-#: sql_help.h:368
+#: sql_help.h:392
 msgid "define a new aggregate function"
 msgstr "define um nova função de agregação"
 
-#: sql_help.h:373
+#: sql_help.h:397
 msgid "define a new cast"
 msgstr "define uma nova conversão de tipo"
 
-#: sql_help.h:378
-msgid "define a new constraint trigger"
-msgstr "define um novo gatilho de restrição"
+#: sql_help.h:402
+msgid "define a new collation"
+msgstr "define uma nova ordenação"
 
-#: sql_help.h:383
+#: sql_help.h:407
 msgid "define a new encoding conversion"
 msgstr "define uma nova conversão de codificação"
 
-#: sql_help.h:388
+#: sql_help.h:412
 msgid "create a new database"
 msgstr "cria um novo banco de dados"
 
-#: sql_help.h:393
+#: sql_help.h:417
 msgid "define a new domain"
 msgstr "define um novo domínio"
 
-#: sql_help.h:398
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "instala uma extensão"
+
+#: sql_help.h:427
 msgid "define a new foreign-data wrapper"
 msgstr "define um novo adaptador de dados externos"
 
-#: sql_help.h:403
+#: sql_help.h:432
+msgid "define a new foreign table"
+msgstr "define uma nova tabela externa"
+
+#: sql_help.h:437
 msgid "define a new function"
 msgstr "define uma nova função"
 
-#: sql_help.h:408 sql_help.h:438 sql_help.h:508
+#: sql_help.h:442 sql_help.h:472 sql_help.h:542
 msgid "define a new database role"
 msgstr "define uma nova role do banco de dados"
 
-#: sql_help.h:413
+#: sql_help.h:447
 msgid "define a new index"
 msgstr "define um novo índice"
 
-#: sql_help.h:418
+#: sql_help.h:452
 msgid "define a new procedural language"
 msgstr "define uma nova linguagem procedural"
 
-#: sql_help.h:423
+#: sql_help.h:457
 msgid "define a new operator"
 msgstr "define um novo operador"
 
-#: sql_help.h:428
+#: sql_help.h:462
 msgid "define a new operator class"
 msgstr "define uma nova classe de operadores"
 
-#: sql_help.h:433
+#: sql_help.h:467
 msgid "define a new operator family"
 msgstr "define uma nova família de operadores"
 
-#: sql_help.h:443
+#: sql_help.h:477
 msgid "define a new rewrite rule"
 msgstr "define uma nova regra de reescrita"
 
-#: sql_help.h:448
+#: sql_help.h:482
 msgid "define a new schema"
 msgstr "define um novo esquema"
 
-#: sql_help.h:453
+#: sql_help.h:487
 msgid "define a new sequence generator"
 msgstr "define um novo gerador de sequência"
 
-#: sql_help.h:458
+#: sql_help.h:492
 msgid "define a new foreign server"
 msgstr "define um novo servidor externo"
 
-#: sql_help.h:463
+#: sql_help.h:497
 msgid "define a new table"
 msgstr "define uma nova tabela"
 
-#: sql_help.h:468 sql_help.h:813
+#: sql_help.h:502 sql_help.h:867
 msgid "define a new table from the results of a query"
 msgstr "cria uma nova tabela a partir dos resultados de uma consulta"
 
-#: sql_help.h:473
+#: sql_help.h:507
 msgid "define a new tablespace"
 msgstr "define uma nova tablespace"
 
-#: sql_help.h:478
+#: sql_help.h:512
 msgid "define a new text search configuration"
 msgstr "define uma nova configuração de busca textual"
 
-#: sql_help.h:483
+#: sql_help.h:517
 msgid "define a new text search dictionary"
 msgstr "define um novo dicionário de busca textual"
 
-#: sql_help.h:488
+#: sql_help.h:522
 msgid "define a new text search parser"
 msgstr "define um novo analisador de busca textual"
 
-#: sql_help.h:493
+#: sql_help.h:527
 msgid "define a new text search template"
 msgstr "define um novo modelo de busca textual"
 
-#: sql_help.h:498
+#: sql_help.h:532
 msgid "define a new trigger"
 msgstr "define um novo gatilho"
 
-#: sql_help.h:503
+#: sql_help.h:537
 msgid "define a new data type"
 msgstr "define um novo tipo de dado"
 
-#: sql_help.h:513
+#: sql_help.h:547
 msgid "define a new mapping of a user to a foreign server"
 msgstr "define um novo mapeamento de um usuário para um servidor externo"
 
-#: sql_help.h:518
+#: sql_help.h:552
 msgid "define a new view"
 msgstr "define uma nova visão"
 
-#: sql_help.h:523
+#: sql_help.h:557
 msgid "deallocate a prepared statement"
 msgstr "remove um comando preparado"
 
-#: sql_help.h:528
+#: sql_help.h:562
 msgid "define a cursor"
 msgstr "define um cursor"
 
-#: sql_help.h:533
+#: sql_help.h:567
 msgid "delete rows of a table"
 msgstr "apaga registros de uma tabela"
 
-#: sql_help.h:538
+#: sql_help.h:572
 msgid "discard session state"
 msgstr "descarta estado da sessão"
 
-#: sql_help.h:543
+#: sql_help.h:577
 msgid "execute an anonymous code block"
 msgstr "executa um bloco de código anônimo"
 
-#: sql_help.h:548
+#: sql_help.h:582
 msgid "remove an aggregate function"
 msgstr "remove uma função de agregação"
 
-#: sql_help.h:553
+#: sql_help.h:587
 msgid "remove a cast"
 msgstr "remove uma conversão de tipo"
 
-#: sql_help.h:558
+#: sql_help.h:592
+msgid "remove a collation"
+msgstr "remove uma ordenação"
+
+#: sql_help.h:597
 msgid "remove a conversion"
 msgstr "remove uma conversão"
 
-#: sql_help.h:563
+#: sql_help.h:602
 msgid "remove a database"
 msgstr "remove um banco de dados"
 
-#: sql_help.h:568
+#: sql_help.h:607
 msgid "remove a domain"
 msgstr "remove um domínio"
 
-#: sql_help.h:573
+#: sql_help.h:612
+msgid "remove an extension"
+msgstr "remove uma extensão"
+
+#: sql_help.h:617
 msgid "remove a foreign-data wrapper"
 msgstr "remove um adaptador de dados externos"
 
-#: sql_help.h:578
+#: sql_help.h:622
+msgid "remove a foreign table"
+msgstr "remove uma tabela externa"
+
+#: sql_help.h:627
 msgid "remove a function"
 msgstr "remove uma função"
 
-#: sql_help.h:583 sql_help.h:618 sql_help.h:683
+#: sql_help.h:632 sql_help.h:667 sql_help.h:732
 msgid "remove a database role"
 msgstr "remove uma role do banco de dados"
 
-#: sql_help.h:588
+#: sql_help.h:637
 msgid "remove an index"
 msgstr "remove um índice"
 
-#: sql_help.h:593
+#: sql_help.h:642
 msgid "remove a procedural language"
 msgstr "remove uma linguagem procedural"
 
-#: sql_help.h:598
+#: sql_help.h:647
 msgid "remove an operator"
 msgstr "remove um operador"
 
-#: sql_help.h:603
+#: sql_help.h:652
 msgid "remove an operator class"
 msgstr "remove uma classe de operadores"
 
-#: sql_help.h:608
+#: sql_help.h:657
 msgid "remove an operator family"
 msgstr "remove uma família de operadores"
 
-#: sql_help.h:613
+#: sql_help.h:662
 msgid "remove database objects owned by a database role"
 msgstr ""
 "remove objetos do banco de dados cujo dono é uma role do banco de dados"
 
-#: sql_help.h:623
+#: sql_help.h:672
 msgid "remove a rewrite rule"
 msgstr "remove uma regra de reescrita"
 
-#: sql_help.h:628
+#: sql_help.h:677
 msgid "remove a schema"
 msgstr "remove um esquema"
 
-#: sql_help.h:633
+#: sql_help.h:682
 msgid "remove a sequence"
 msgstr "remove uma sequência"
 
-#: sql_help.h:638
+#: sql_help.h:687
 msgid "remove a foreign server descriptor"
 msgstr "remove um descritor de servidor externo"
 
-#: sql_help.h:643
+#: sql_help.h:692
 msgid "remove a table"
 msgstr "remove uma tabela"
 
-#: sql_help.h:648
+#: sql_help.h:697
 msgid "remove a tablespace"
 msgstr "remove uma tablespace"
 
-#: sql_help.h:653
+#: sql_help.h:702
 msgid "remove a text search configuration"
 msgstr "remove uma configuração de busca textual"
 
-#: sql_help.h:658
+#: sql_help.h:707
 msgid "remove a text search dictionary"
 msgstr "remove um dicionário de busca textual"
 
-#: sql_help.h:663
+#: sql_help.h:712
 msgid "remove a text search parser"
 msgstr "remove um analisador de busca textual"
 
-#: sql_help.h:668
+#: sql_help.h:717
 msgid "remove a text search template"
 msgstr "remove um modelo de busca textual"
 
-#: sql_help.h:673
+#: sql_help.h:722
 msgid "remove a trigger"
 msgstr "remove um gatilho"
 
-#: sql_help.h:678
+#: sql_help.h:727
 msgid "remove a data type"
 msgstr "remove um tipo de dado"
 
-#: sql_help.h:688
+#: sql_help.h:737
 msgid "remove a user mapping for a foreign server"
 msgstr "remove um mapeamento de usuários para um servidor externo"
 
-#: sql_help.h:693
+#: sql_help.h:742
 msgid "remove a view"
 msgstr "remove uma visão"
 
-#: sql_help.h:703
+#: sql_help.h:752
 msgid "execute a prepared statement"
 msgstr "executa um comando preparado"
 
-#: sql_help.h:708
+#: sql_help.h:757
 msgid "show the execution plan of a statement"
 msgstr "mostra o plano de execução de um comando"
 
-#: sql_help.h:713
+#: sql_help.h:762
 msgid "retrieve rows from a query using a cursor"
 msgstr "recupera registros de uma consulta utilizando um cursor"
 
-#: sql_help.h:718
+#: sql_help.h:767
 msgid "define access privileges"
 msgstr "define privilégios de acesso"
 
-#: sql_help.h:723
+#: sql_help.h:772
 msgid "create new rows in a table"
 msgstr "cria novos registros em uma tabela"
 
-#: sql_help.h:728
+#: sql_help.h:777
 msgid "listen for a notification"
 msgstr "espera por uma notificação"
 
-#: sql_help.h:733
+#: sql_help.h:782
 msgid "load a shared library file"
 msgstr "carrega um arquivo de biblioteca compartilhada"
 
-#: sql_help.h:738
+#: sql_help.h:787
 msgid "lock a table"
 msgstr "bloqueia uma tabela"
 
-#: sql_help.h:743
+#: sql_help.h:792
 msgid "position a cursor"
 msgstr "posiciona um cursor"
 
-#: sql_help.h:748
+#: sql_help.h:797
 msgid "generate a notification"
 msgstr "gera uma notificação"
 
-#: sql_help.h:753
+#: sql_help.h:802
 msgid "prepare a statement for execution"
 msgstr "prepara um comando para execução"
 
-#: sql_help.h:758
+#: sql_help.h:807
 msgid "prepare the current transaction for two-phase commit"
 msgstr "prepara a transação atual para efetivação em duas fases"
 
-#: sql_help.h:763
+#: sql_help.h:812
 msgid "change the ownership of database objects owned by a database role"
 msgstr ""
 "muda o dono dos objetos do banco de dados cujo dono é uma role do banco de "
 "dados"
 
-#: sql_help.h:768
+#: sql_help.h:817
 msgid "rebuild indexes"
 msgstr "reconstrói índices"
 
-#: sql_help.h:773
+#: sql_help.h:822
 msgid "destroy a previously defined savepoint"
 msgstr "destrói um ponto de salvamento definido anteriormente"
 
-#: sql_help.h:778
+#: sql_help.h:827
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "restaura o valor do parâmetro em tempo de execução para o valor padrão"
 
-#: sql_help.h:783
+#: sql_help.h:832
 msgid "remove access privileges"
 msgstr "remove privilégios de acesso"
 
-#: sql_help.h:793
+#: sql_help.h:842
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr ""
 "cancela uma transação que foi anteriormente preparada para efetivação em "
 "duas fases"
 
-#: sql_help.h:798
+#: sql_help.h:847
 msgid "roll back to a savepoint"
 msgstr "desfaz modificações de um ponto de salvamento"
 
-#: sql_help.h:803
+#: sql_help.h:852
 msgid "define a new savepoint within the current transaction"
 msgstr "define um novo ponto de salvamento na transação atual"
 
-#: sql_help.h:808 sql_help.h:853 sql_help.h:883
+#: sql_help.h:857
+msgid "define or change a security label applied to an object"
+msgstr "define ou muda um rótulo de segurança aplicado a um objeto"
+
+#: sql_help.h:862 sql_help.h:907 sql_help.h:937
 msgid "retrieve rows from a table or view"
 msgstr "recupera registros de uma tabela ou visão"
 
-#: sql_help.h:818
+#: sql_help.h:872
 msgid "change a run-time parameter"
 msgstr "muda um parâmetro em tempo de execução"
 
-#: sql_help.h:823
+#: sql_help.h:877
 msgid "set constraint check timing for the current transaction"
 msgstr "define o momento de verificação da restrição na transação atual"
 
-#: sql_help.h:828
+#: sql_help.h:882
 msgid "set the current user identifier of the current session"
 msgstr "define o identificador do usuário atual nesta sessão"
 
-#: sql_help.h:833
+#: sql_help.h:887
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
@@ -2698,1027 +2914,1155 @@ msgstr ""
 "define o identificador da sessão do usuário e o identificador do usuário na "
 "sessão atual"
 
-#: sql_help.h:838
+#: sql_help.h:892
 msgid "set the characteristics of the current transaction"
 msgstr "define as características da transação atual"
 
-#: sql_help.h:843
+#: sql_help.h:897
 msgid "show the value of a run-time parameter"
 msgstr "mostra o valor de um parâmetro em tempo de execução"
 
-#: sql_help.h:858
+#: sql_help.h:912
 msgid "empty a table or set of tables"
 msgstr "esvazia uma tabela ou um conjunto de tabelas"
 
-#: sql_help.h:863
+#: sql_help.h:917
 msgid "stop listening for a notification"
 msgstr "para de esperar por notificação"
 
-#: sql_help.h:868
+#: sql_help.h:922
 msgid "update rows of a table"
 msgstr "atualiza registros de uma tabela"
 
-#: sql_help.h:873
+#: sql_help.h:927
 msgid "garbage-collect and optionally analyze a database"
 msgstr "coleta lixo e opcionalmente analisa um banco de dados"
 
-#: sql_help.h:878
+#: sql_help.h:932
 msgid "compute a set of rows"
 msgstr "computa um conjunto de registros"
 
-#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:43 sql_help.c:45
-#: sql_help.c:69 sql_help.c:73 sql_help.c:75 sql_help.c:77 sql_help.c:79
-#: sql_help.c:82 sql_help.c:84 sql_help.c:86 sql_help.c:161 sql_help.c:163
-#: sql_help.c:164 sql_help.c:166 sql_help.c:168 sql_help.c:170 sql_help.c:182
-#: sql_help.c:186 sql_help.c:214 sql_help.c:219 sql_help.c:224 sql_help.c:229
-#: sql_help.c:267 sql_help.c:269 sql_help.c:271 sql_help.c:274 sql_help.c:284
-#: sql_help.c:286 sql_help.c:304 sql_help.c:316 sql_help.c:319 sql_help.c:338
-#: sql_help.c:349 sql_help.c:357 sql_help.c:360 sql_help.c:389 sql_help.c:395
-#: sql_help.c:397 sql_help.c:401 sql_help.c:404 sql_help.c:407 sql_help.c:417
-#: sql_help.c:419 sql_help.c:436 sql_help.c:445 sql_help.c:447 sql_help.c:449
-#: sql_help.c:513 sql_help.c:515 sql_help.c:518 sql_help.c:520 sql_help.c:570
-#: sql_help.c:572 sql_help.c:574 sql_help.c:577 sql_help.c:597 sql_help.c:600
-#: sql_help.c:603 sql_help.c:606 sql_help.c:610 sql_help.c:612 sql_help.c:614
-#: sql_help.c:627 sql_help.c:630 sql_help.c:632 sql_help.c:641 sql_help.c:650
-#: sql_help.c:659 sql_help.c:671 sql_help.c:673 sql_help.c:675 sql_help.c:703
-#: sql_help.c:709 sql_help.c:711 sql_help.c:714 sql_help.c:716 sql_help.c:718
-#: sql_help.c:743 sql_help.c:746 sql_help.c:748 sql_help.c:750 sql_help.c:752
-#: sql_help.c:791 sql_help.c:962 sql_help.c:970 sql_help.c:1016
-#: sql_help.c:1031 sql_help.c:1049 sql_help.c:1071 sql_help.c:1087
-#: sql_help.c:1113 sql_help.c:1155 sql_help.c:1177 sql_help.c:1196
-#: sql_help.c:1197 sql_help.c:1214 sql_help.c:1234 sql_help.c:1255
-#: sql_help.c:1282 sql_help.c:1303 sql_help.c:1333 sql_help.c:1513
-#: sql_help.c:1526 sql_help.c:1543 sql_help.c:1559 sql_help.c:1572
-#: sql_help.c:1611 sql_help.c:1614 sql_help.c:1616 sql_help.c:1633
-#: sql_help.c:1659 sql_help.c:1692 sql_help.c:1702 sql_help.c:1711
-#: sql_help.c:1753 sql_help.c:1771 sql_help.c:1779 sql_help.c:1787
-#: sql_help.c:1795 sql_help.c:1804 sql_help.c:1815 sql_help.c:1823
-#: sql_help.c:1831 sql_help.c:1839 sql_help.c:1849 sql_help.c:1858
-#: sql_help.c:1867 sql_help.c:1875 sql_help.c:1883 sql_help.c:1892
-#: sql_help.c:1900 sql_help.c:1916 sql_help.c:1932 sql_help.c:1940
-#: sql_help.c:1948 sql_help.c:1956 sql_help.c:1964 sql_help.c:1973
-#: sql_help.c:1981 sql_help.c:1998 sql_help.c:2013 sql_help.c:2193
-#: sql_help.c:2221 sql_help.c:2248 sql_help.c:2549 sql_help.c:2594
-#: sql_help.c:2698
+#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:44 sql_help.c:46
+#: sql_help.c:48 sql_help.c:59 sql_help.c:61 sql_help.c:63 sql_help.c:87
+#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
+#: sql_help.c:102 sql_help.c:104 sql_help.c:179 sql_help.c:181 sql_help.c:182
+#: sql_help.c:184 sql_help.c:186 sql_help.c:188 sql_help.c:276 sql_help.c:281
+#: sql_help.c:306 sql_help.c:308 sql_help.c:311 sql_help.c:313 sql_help.c:351
+#: sql_help.c:356 sql_help.c:361 sql_help.c:366 sql_help.c:404 sql_help.c:406
+#: sql_help.c:408 sql_help.c:411 sql_help.c:421 sql_help.c:423 sql_help.c:442
+#: sql_help.c:446 sql_help.c:459 sql_help.c:462 sql_help.c:465 sql_help.c:485
+#: sql_help.c:497 sql_help.c:505 sql_help.c:508 sql_help.c:511 sql_help.c:541
+#: sql_help.c:547 sql_help.c:549 sql_help.c:553 sql_help.c:556 sql_help.c:559
+#: sql_help.c:569 sql_help.c:571 sql_help.c:588 sql_help.c:597 sql_help.c:599
+#: sql_help.c:601 sql_help.c:675 sql_help.c:677 sql_help.c:680 sql_help.c:682
+#: sql_help.c:740 sql_help.c:742 sql_help.c:744 sql_help.c:747 sql_help.c:768
+#: sql_help.c:771 sql_help.c:774 sql_help.c:777 sql_help.c:781 sql_help.c:783
+#: sql_help.c:785 sql_help.c:787 sql_help.c:801 sql_help.c:804 sql_help.c:806
+#: sql_help.c:808 sql_help.c:818 sql_help.c:820 sql_help.c:830 sql_help.c:832
+#: sql_help.c:841 sql_help.c:862 sql_help.c:864 sql_help.c:866 sql_help.c:869
+#: sql_help.c:871 sql_help.c:873 sql_help.c:911 sql_help.c:917 sql_help.c:919
+#: sql_help.c:922 sql_help.c:924 sql_help.c:926 sql_help.c:951 sql_help.c:954
+#: sql_help.c:956 sql_help.c:958 sql_help.c:960 sql_help.c:1000
+#: sql_help.c:1183 sql_help.c:1191 sql_help.c:1235 sql_help.c:1239
+#: sql_help.c:1249 sql_help.c:1267 sql_help.c:1290 sql_help.c:1322
+#: sql_help.c:1367 sql_help.c:1409 sql_help.c:1431 sql_help.c:1451
+#: sql_help.c:1452 sql_help.c:1469 sql_help.c:1489 sql_help.c:1511
+#: sql_help.c:1539 sql_help.c:1560 sql_help.c:1590 sql_help.c:1771
+#: sql_help.c:1784 sql_help.c:1801 sql_help.c:1817 sql_help.c:1840
+#: sql_help.c:1883 sql_help.c:1887 sql_help.c:1889 sql_help.c:1907
+#: sql_help.c:1934 sql_help.c:1967 sql_help.c:1977 sql_help.c:1986
+#: sql_help.c:2030 sql_help.c:2048 sql_help.c:2056 sql_help.c:2064
+#: sql_help.c:2072 sql_help.c:2088 sql_help.c:2096 sql_help.c:2105
+#: sql_help.c:2116 sql_help.c:2124 sql_help.c:2132 sql_help.c:2140
+#: sql_help.c:2150 sql_help.c:2159 sql_help.c:2168 sql_help.c:2176
+#: sql_help.c:2184 sql_help.c:2193 sql_help.c:2201 sql_help.c:2217
+#: sql_help.c:2233 sql_help.c:2241 sql_help.c:2249 sql_help.c:2257
+#: sql_help.c:2265 sql_help.c:2274 sql_help.c:2282 sql_help.c:2299
+#: sql_help.c:2314 sql_help.c:2506 sql_help.c:2557 sql_help.c:2584
+#: sql_help.c:2927 sql_help.c:2973 sql_help.c:3080
 msgid "name"
 msgstr "nome"
 
-#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:524 sql_help.c:528
-#: sql_help.c:1754
+#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:317 sql_help.c:320
+#: sql_help.c:2031
 msgid "type"
 msgstr "tipo"
 
-#: sql_help.c:28 sql_help.c:44 sql_help.c:74 sql_help.c:223 sql_help.c:256
-#: sql_help.c:268 sql_help.c:285 sql_help.c:318 sql_help.c:359 sql_help.c:396
-#: sql_help.c:418 sql_help.c:448 sql_help.c:519 sql_help.c:571 sql_help.c:613
-#: sql_help.c:631 sql_help.c:642 sql_help.c:651 sql_help.c:661 sql_help.c:672
-#: sql_help.c:710 sql_help.c:751
+#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:312
+#: sql_help.c:360 sql_help.c:393 sql_help.c:405 sql_help.c:422 sql_help.c:461
+#: sql_help.c:507 sql_help.c:548 sql_help.c:570 sql_help.c:600 sql_help.c:681
+#: sql_help.c:741 sql_help.c:784 sql_help.c:805 sql_help.c:819 sql_help.c:831
+#: sql_help.c:843 sql_help.c:870 sql_help.c:918 sql_help.c:959
 msgid "new_name"
 msgstr "novo_nome"
 
-#: sql_help.c:31 sql_help.c:46 sql_help.c:76 sql_help.c:169 sql_help.c:187
-#: sql_help.c:228 sql_help.c:287 sql_help.c:296 sql_help.c:307 sql_help.c:321
-#: sql_help.c:362 sql_help.c:420 sql_help.c:446 sql_help.c:465 sql_help.c:558
-#: sql_help.c:573 sql_help.c:615 sql_help.c:633 sql_help.c:674 sql_help.c:749
+#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:187
+#: sql_help.c:282 sql_help.c:322 sql_help.c:365 sql_help.c:424 sql_help.c:433
+#: sql_help.c:445 sql_help.c:464 sql_help.c:510 sql_help.c:572 sql_help.c:598
+#: sql_help.c:617 sql_help.c:725 sql_help.c:743 sql_help.c:786 sql_help.c:807
+#: sql_help.c:865 sql_help.c:957
 msgid "new_owner"
 msgstr "novo_dono"
 
-#: sql_help.c:34 sql_help.c:171 sql_help.c:233 sql_help.c:450 sql_help.c:521
-#: sql_help.c:676 sql_help.c:753
+#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:189 sql_help.c:228
+#: sql_help.c:314 sql_help.c:370 sql_help.c:449 sql_help.c:467 sql_help.c:513
+#: sql_help.c:602 sql_help.c:683 sql_help.c:788 sql_help.c:809 sql_help.c:821
+#: sql_help.c:833 sql_help.c:872 sql_help.c:961
 msgid "new_schema"
 msgstr "novo_esquema"
 
-#: sql_help.c:70 sql_help.c:184 sql_help.c:390 sql_help.c:462 sql_help.c:628
-#: sql_help.c:704 sql_help.c:730 sql_help.c:922 sql_help.c:927 sql_help.c:1089
-#: sql_help.c:1156 sql_help.c:1283 sql_help.c:1354 sql_help.c:1528
-#: sql_help.c:1660 sql_help.c:1682
+#: sql_help.c:88 sql_help.c:279 sql_help.c:323 sql_help.c:542 sql_help.c:614
+#: sql_help.c:802 sql_help.c:912 sql_help.c:938 sql_help.c:1142
+#: sql_help.c:1147 sql_help.c:1325 sql_help.c:1343 sql_help.c:1410
+#: sql_help.c:1540 sql_help.c:1611 sql_help.c:1786 sql_help.c:1935
+#: sql_help.c:1957 sql_help.c:2332
 msgid "option"
 msgstr "opção"
 
-#: sql_help.c:71 sql_help.c:391 sql_help.c:705 sql_help.c:1157 sql_help.c:1284
-#: sql_help.c:1661
+#: sql_help.c:89 sql_help.c:543 sql_help.c:913 sql_help.c:1411 sql_help.c:1541
+#: sql_help.c:1936
 msgid "where option can be:"
 msgstr "onde opção pode ser:"
 
-#: sql_help.c:72 sql_help.c:392 sql_help.c:706 sql_help.c:1056 sql_help.c:1285
-#: sql_help.c:1662
+#: sql_help.c:90 sql_help.c:544 sql_help.c:914 sql_help.c:1274 sql_help.c:1542
+#: sql_help.c:1937
 msgid "connlimit"
 msgstr "limite_conexão"
 
-#: sql_help.c:78 sql_help.c:559
+#: sql_help.c:96 sql_help.c:726
 msgid "new_tablespace"
 msgstr "nova_tablespace"
 
-#: sql_help.c:80 sql_help.c:83 sql_help.c:85 sql_help.c:237 sql_help.c:239
-#: sql_help.c:240 sql_help.c:399 sql_help.c:403 sql_help.c:406 sql_help.c:712
-#: sql_help.c:715 sql_help.c:717 sql_help.c:1124 sql_help.c:2265
-#: sql_help.c:2538
+#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:374 sql_help.c:376
+#: sql_help.c:377 sql_help.c:551 sql_help.c:555 sql_help.c:558 sql_help.c:920
+#: sql_help.c:923 sql_help.c:925 sql_help.c:1378 sql_help.c:2601
+#: sql_help.c:2916
 msgid "configuration_parameter"
 msgstr "parâmetro_de_configuração"
 
-#: sql_help.c:81 sql_help.c:185 sql_help.c:238 sql_help.c:273 sql_help.c:400
-#: sql_help.c:463 sql_help.c:538 sql_help.c:554 sql_help.c:576 sql_help.c:629
-#: sql_help.c:713 sql_help.c:731 sql_help.c:1090 sql_help.c:1125
-#: sql_help.c:1126 sql_help.c:1184 sql_help.c:1355 sql_help.c:1428
-#: sql_help.c:1437 sql_help.c:1468 sql_help.c:1490 sql_help.c:1529
-#: sql_help.c:1683 sql_help.c:2539 sql_help.c:2540
+#: sql_help.c:99 sql_help.c:280 sql_help.c:324 sql_help.c:375 sql_help.c:410
+#: sql_help.c:552 sql_help.c:615 sql_help.c:702 sql_help.c:720 sql_help.c:746
+#: sql_help.c:803 sql_help.c:921 sql_help.c:939 sql_help.c:1326
+#: sql_help.c:1344 sql_help.c:1379 sql_help.c:1380 sql_help.c:1439
+#: sql_help.c:1612 sql_help.c:1686 sql_help.c:1694 sql_help.c:1726
+#: sql_help.c:1748 sql_help.c:1787 sql_help.c:1958 sql_help.c:2917
+#: sql_help.c:2918
 msgid "value"
 msgstr "valor"
 
-#: sql_help.c:133
+#: sql_help.c:151
 msgid "target_role"
 msgstr "role_alvo"
 
-#: sql_help.c:134 sql_help.c:1318 sql_help.c:2119 sql_help.c:2126
-#: sql_help.c:2138 sql_help.c:2144 sql_help.c:2348 sql_help.c:2355
-#: sql_help.c:2367 sql_help.c:2373
+#: sql_help.c:152 sql_help.c:1575 sql_help.c:2430 sql_help.c:2437
+#: sql_help.c:2449 sql_help.c:2455 sql_help.c:2684 sql_help.c:2691
+#: sql_help.c:2703 sql_help.c:2709
 msgid "schema_name"
 msgstr "nome_esquema"
 
-#: sql_help.c:135
+#: sql_help.c:153
 msgid "abbreviated_grant_or_revoke"
 msgstr "comando_grant_ou_revoke"
 
-#: sql_help.c:136
+#: sql_help.c:154
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "onde comando_grant_ou_revoke é um dos:"
 
-#: sql_help.c:137 sql_help.c:138 sql_help.c:139 sql_help.c:140 sql_help.c:141
-#: sql_help.c:142 sql_help.c:1160 sql_help.c:1161 sql_help.c:1162
-#: sql_help.c:1163 sql_help.c:1164 sql_help.c:1288 sql_help.c:1289
-#: sql_help.c:1290 sql_help.c:1291 sql_help.c:1292 sql_help.c:1665
-#: sql_help.c:1666 sql_help.c:1667 sql_help.c:1668 sql_help.c:1669
-#: sql_help.c:2120 sql_help.c:2124 sql_help.c:2127 sql_help.c:2129
-#: sql_help.c:2131 sql_help.c:2133 sql_help.c:2139 sql_help.c:2141
-#: sql_help.c:2143 sql_help.c:2145 sql_help.c:2147 sql_help.c:2148
-#: sql_help.c:2149 sql_help.c:2349 sql_help.c:2353 sql_help.c:2356
-#: sql_help.c:2358 sql_help.c:2360 sql_help.c:2362 sql_help.c:2368
-#: sql_help.c:2370 sql_help.c:2372 sql_help.c:2374 sql_help.c:2376
-#: sql_help.c:2377 sql_help.c:2378 sql_help.c:2559
+#: sql_help.c:155 sql_help.c:156 sql_help.c:157 sql_help.c:158 sql_help.c:159
+#: sql_help.c:160 sql_help.c:1414 sql_help.c:1415 sql_help.c:1416
+#: sql_help.c:1417 sql_help.c:1418 sql_help.c:1545 sql_help.c:1546
+#: sql_help.c:1547 sql_help.c:1548 sql_help.c:1549 sql_help.c:1940
+#: sql_help.c:1941 sql_help.c:1942 sql_help.c:1943 sql_help.c:1944
+#: sql_help.c:2431 sql_help.c:2435 sql_help.c:2438 sql_help.c:2440
+#: sql_help.c:2442 sql_help.c:2444 sql_help.c:2450 sql_help.c:2452
+#: sql_help.c:2454 sql_help.c:2456 sql_help.c:2458 sql_help.c:2459
+#: sql_help.c:2460 sql_help.c:2685 sql_help.c:2689 sql_help.c:2692
+#: sql_help.c:2694 sql_help.c:2696 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2706 sql_help.c:2708 sql_help.c:2710 sql_help.c:2712
+#: sql_help.c:2713 sql_help.c:2714 sql_help.c:2937
 msgid "role_name"
 msgstr "nome_role"
 
-#: sql_help.c:162 sql_help.c:529 sql_help.c:531 sql_help.c:745 sql_help.c:1073
-#: sql_help.c:1077 sql_help.c:1181 sql_help.c:1441 sql_help.c:1450
-#: sql_help.c:1472 sql_help.c:2161 sql_help.c:2446 sql_help.c:2447
-#: sql_help.c:2451 sql_help.c:2456 sql_help.c:2513 sql_help.c:2514
-#: sql_help.c:2519 sql_help.c:2524 sql_help.c:2645 sql_help.c:2646
-#: sql_help.c:2650 sql_help.c:2655 sql_help.c:2722 sql_help.c:2724
-#: sql_help.c:2755 sql_help.c:2797 sql_help.c:2798 sql_help.c:2802
-#: sql_help.c:2807
+#: sql_help.c:180 sql_help.c:693 sql_help.c:695 sql_help.c:953 sql_help.c:1293
+#: sql_help.c:1297 sql_help.c:1435 sql_help.c:1698 sql_help.c:1708
+#: sql_help.c:1730 sql_help.c:2474 sql_help.c:2822 sql_help.c:2823
+#: sql_help.c:2827 sql_help.c:2832 sql_help.c:2891 sql_help.c:2892
+#: sql_help.c:2897 sql_help.c:2902 sql_help.c:3025 sql_help.c:3026
+#: sql_help.c:3030 sql_help.c:3035 sql_help.c:3106 sql_help.c:3108
+#: sql_help.c:3139 sql_help.c:3181 sql_help.c:3182 sql_help.c:3186
+#: sql_help.c:3191
 msgid "expression"
 msgstr "expressão"
 
-#: sql_help.c:165
+#: sql_help.c:183
 msgid "domain_constraint"
 msgstr "restrição_domínio"
 
-#: sql_help.c:167 sql_help.c:543 sql_help.c:845 sql_help.c:1076
-#: sql_help.c:1440 sql_help.c:1449
+#: sql_help.c:185 sql_help.c:708 sql_help.c:709 sql_help.c:728 sql_help.c:1059
+#: sql_help.c:1296 sql_help.c:1697 sql_help.c:1707
 msgid "constraint_name"
 msgstr "nome_restrição"
 
-#: sql_help.c:183 sql_help.c:1088 sql_help.c:1200
-msgid "valfunction"
-msgstr "função_validação"
+#: sql_help.c:225 sql_help.c:227 sql_help.c:229 sql_help.c:231 sql_help.c:1308
+#: sql_help.c:2080
+msgid "extension_name"
+msgstr "nome_extensão"
+
+#: sql_help.c:226 sql_help.c:613
+msgid "new_version"
+msgstr "nova_versão"
+
+#: sql_help.c:230 sql_help.c:232
+msgid "member_object"
+msgstr "objeto_membro"
+
+#: sql_help.c:233
+msgid "where member_object is:"
+msgstr "onde objeto_membro é:"
+
+#: sql_help.c:234 sql_help.c:1052 sql_help.c:2771
+msgid "agg_name"
+msgstr "nome_agregação"
 
-#: sql_help.c:215 sql_help.c:220 sql_help.c:225 sql_help.c:230 sql_help.c:851
-#: sql_help.c:1114 sql_help.c:1805 sql_help.c:2135 sql_help.c:2364
+#: sql_help.c:235 sql_help.c:1053 sql_help.c:2772
+msgid "agg_type"
+msgstr "tipo_agregação"
+
+#: sql_help.c:236 sql_help.c:1054 sql_help.c:1215 sql_help.c:1219
+#: sql_help.c:1221 sql_help.c:2039
+msgid "source_type"
+msgstr "tipo_origem"
+
+#: sql_help.c:237 sql_help.c:1055 sql_help.c:1216 sql_help.c:1220
+#: sql_help.c:1222 sql_help.c:2040
+msgid "target_type"
+msgstr "tipo_destino"
+
+#: sql_help.c:238 sql_help.c:239 sql_help.c:240 sql_help.c:241 sql_help.c:242
+#: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:255 sql_help.c:256
+#: sql_help.c:257 sql_help.c:258 sql_help.c:259 sql_help.c:260 sql_help.c:261
+#: sql_help.c:262 sql_help.c:263 sql_help.c:264 sql_help.c:1056
+#: sql_help.c:1061 sql_help.c:1062 sql_help.c:1063 sql_help.c:1064
+#: sql_help.c:1065 sql_help.c:1066 sql_help.c:1071 sql_help.c:1076
+#: sql_help.c:1078 sql_help.c:1080 sql_help.c:1081 sql_help.c:1084
+#: sql_help.c:1085 sql_help.c:1086 sql_help.c:1087 sql_help.c:1088
+#: sql_help.c:1089 sql_help.c:1090 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1096 sql_help.c:2768 sql_help.c:2773
+#: sql_help.c:2774 sql_help.c:2780 sql_help.c:2781 sql_help.c:2782
+#: sql_help.c:2783 sql_help.c:2784
+msgid "object_name"
+msgstr "nome_objeto"
+
+#: sql_help.c:243 sql_help.c:495 sql_help.c:1067 sql_help.c:1217
+#: sql_help.c:1252 sql_help.c:1470 sql_help.c:1501 sql_help.c:1845
+#: sql_help.c:2445 sql_help.c:2699 sql_help.c:2775 sql_help.c:2848
+#: sql_help.c:2853 sql_help.c:3051 sql_help.c:3056 sql_help.c:3207
+#: sql_help.c:3212
+msgid "function_name"
+msgstr "nome_função"
+
+#: sql_help.c:244 sql_help.c:352 sql_help.c:357 sql_help.c:362 sql_help.c:367
+#: sql_help.c:1068 sql_help.c:1368 sql_help.c:2106 sql_help.c:2446
+#: sql_help.c:2700 sql_help.c:2776
 msgid "argmode"
 msgstr "modo_argumento"
 
-#: sql_help.c:216 sql_help.c:221 sql_help.c:226 sql_help.c:231 sql_help.c:852
-#: sql_help.c:1115 sql_help.c:1806
+#: sql_help.c:245 sql_help.c:353 sql_help.c:358 sql_help.c:363 sql_help.c:368
+#: sql_help.c:1069 sql_help.c:1369 sql_help.c:2107 sql_help.c:2777
 msgid "argname"
 msgstr "nome_argumento"
 
-#: sql_help.c:217 sql_help.c:222 sql_help.c:227 sql_help.c:232 sql_help.c:853
-#: sql_help.c:1116 sql_help.c:1807
+#: sql_help.c:246 sql_help.c:354 sql_help.c:359 sql_help.c:364 sql_help.c:369
+#: sql_help.c:1070 sql_help.c:1370 sql_help.c:2108 sql_help.c:2778
 msgid "argtype"
 msgstr "tipo_argumento"
 
-#: sql_help.c:218 sql_help.c:514 sql_help.c:1446 sql_help.c:1447
-#: sql_help.c:1463 sql_help.c:1464
+#: sql_help.c:247 sql_help.c:488 sql_help.c:1073 sql_help.c:1494
+msgid "operator_name"
+msgstr "nome_operador"
+
+#: sql_help.c:248 sql_help.c:443 sql_help.c:447 sql_help.c:1074
+#: sql_help.c:1471 sql_help.c:2141
+msgid "left_type"
+msgstr "tipo_esquerda"
+
+#: sql_help.c:249 sql_help.c:444 sql_help.c:448 sql_help.c:1075
+#: sql_help.c:1472 sql_help.c:2142
+msgid "right_type"
+msgstr "tipo_direita"
+
+#: sql_help.c:251 sql_help.c:253 sql_help.c:460 sql_help.c:463 sql_help.c:466
+#: sql_help.c:486 sql_help.c:498 sql_help.c:506 sql_help.c:509 sql_help.c:512
+#: sql_help.c:1077 sql_help.c:1079 sql_help.c:1491 sql_help.c:1512
+#: sql_help.c:1713 sql_help.c:2151 sql_help.c:2160
+msgid "index_method"
+msgstr "método_índice"
+
+#: sql_help.c:277 sql_help.c:1323
+msgid "handler_function"
+msgstr "função_manipulação"
+
+#: sql_help.c:278 sql_help.c:1324
+msgid "validator_function"
+msgstr "função_validação"
+
+#: sql_help.c:307 sql_help.c:355 sql_help.c:676 sql_help.c:863 sql_help.c:1704
+#: sql_help.c:1705 sql_help.c:1721 sql_help.c:1722
 msgid "action"
 msgstr "ação"
 
-#: sql_help.c:234 sql_help.c:522
+#: sql_help.c:309 sql_help.c:316 sql_help.c:318 sql_help.c:319 sql_help.c:321
+#: sql_help.c:596 sql_help.c:678 sql_help.c:685 sql_help.c:689 sql_help.c:690
+#: sql_help.c:694 sql_help.c:696 sql_help.c:697 sql_help.c:698 sql_help.c:700
+#: sql_help.c:703 sql_help.c:705 sql_help.c:952 sql_help.c:955 sql_help.c:970
+#: sql_help.c:1140 sql_help.c:1144 sql_help.c:1156 sql_help.c:1157
+#: sql_help.c:1434 sql_help.c:1597 sql_help.c:1729 sql_help.c:2432
+#: sql_help.c:2433 sql_help.c:2473 sql_help.c:2686 sql_help.c:2687
+#: sql_help.c:3105 sql_help.c:3107 sql_help.c:3124 sql_help.c:3127
+msgid "column"
+msgstr "coluna"
+
+#: sql_help.c:310 sql_help.c:679
+msgid "new_column"
+msgstr "nova_coluna"
+
+#: sql_help.c:315 sql_help.c:371 sql_help.c:684 sql_help.c:876
 msgid "where action is one of:"
 msgstr "onde ação é uma das:"
 
-#: sql_help.c:235 sql_help.c:1122
+#: sql_help.c:372 sql_help.c:1376
 msgid "execution_cost"
 msgstr "custo_execução"
 
-#: sql_help.c:236 sql_help.c:1123
+#: sql_help.c:373 sql_help.c:1377
 msgid "result_rows"
 msgstr "registros_retornados"
 
-#: sql_help.c:251 sql_help.c:253 sql_help.c:255
+#: sql_help.c:388 sql_help.c:390 sql_help.c:392
 msgid "group_name"
 msgstr "nome_grupo"
 
-#: sql_help.c:252 sql_help.c:254 sql_help.c:728 sql_help.c:1050
-#: sql_help.c:1319 sql_help.c:1321 sql_help.c:1501 sql_help.c:1680
-#: sql_help.c:1989 sql_help.c:2569
+#: sql_help.c:389 sql_help.c:391 sql_help.c:936 sql_help.c:1268
+#: sql_help.c:1576 sql_help.c:1578 sql_help.c:1759 sql_help.c:1955
+#: sql_help.c:2290 sql_help.c:2947
 msgid "user_name"
 msgstr "nome_usuário"
 
-#: sql_help.c:270 sql_help.c:1500 sql_help.c:1924 sql_help.c:2146
-#: sql_help.c:2375
+#: sql_help.c:407 sql_help.c:1758 sql_help.c:2225 sql_help.c:2457
+#: sql_help.c:2711
 msgid "tablespace_name"
 msgstr "nome_tablespace"
 
-#: sql_help.c:272 sql_help.c:275 sql_help.c:553 sql_help.c:555 sql_help.c:1183
-#: sql_help.c:1427 sql_help.c:1436 sql_help.c:1467 sql_help.c:1489
+#: sql_help.c:409 sql_help.c:412 sql_help.c:719 sql_help.c:721 sql_help.c:1438
+#: sql_help.c:1685 sql_help.c:1693 sql_help.c:1725 sql_help.c:1747
 msgid "storage_parameter"
 msgstr "parâmetro_armazenamento"
 
-#: sql_help.c:295 sql_help.c:855
+#: sql_help.c:432 sql_help.c:1072 sql_help.c:2779
 msgid "large_object_oid"
 msgstr "oid_objeto_grande"
 
-#: sql_help.c:305 sql_help.c:857 sql_help.c:1216 sql_help.c:1840
-msgid "left_type"
-msgstr "tipo_esquerda"
-
-#: sql_help.c:306 sql_help.c:858 sql_help.c:1217 sql_help.c:1841
-msgid "right_type"
-msgstr "tipo_direita"
-
-#: sql_help.c:317 sql_help.c:320 sql_help.c:339 sql_help.c:350 sql_help.c:358
-#: sql_help.c:361 sql_help.c:860 sql_help.c:862 sql_help.c:1236
-#: sql_help.c:1256 sql_help.c:1455 sql_help.c:1850 sql_help.c:1859
-msgid "index_method"
-msgstr "método_índice"
-
-#: sql_help.c:340 sql_help.c:351 sql_help.c:1238
+#: sql_help.c:487 sql_help.c:499 sql_help.c:1493
 msgid "strategy_number"
 msgstr "número_estratégia"
 
-#: sql_help.c:341 sql_help.c:856 sql_help.c:1239
-msgid "operator_name"
-msgstr "nome_operador"
-
-#: sql_help.c:342 sql_help.c:343 sql_help.c:345 sql_help.c:346 sql_help.c:352
-#: sql_help.c:353 sql_help.c:355 sql_help.c:356 sql_help.c:1240
-#: sql_help.c:1241 sql_help.c:1243 sql_help.c:1244
+#: sql_help.c:489 sql_help.c:490 sql_help.c:493 sql_help.c:494 sql_help.c:500
+#: sql_help.c:501 sql_help.c:503 sql_help.c:504 sql_help.c:1495
+#: sql_help.c:1496 sql_help.c:1499 sql_help.c:1500
 msgid "op_type"
 msgstr "tipo_operador"
 
-#: sql_help.c:344 sql_help.c:354 sql_help.c:1242
+#: sql_help.c:491 sql_help.c:1497
+msgid "sort_family_name"
+msgstr "nome_família_ordenação"
+
+#: sql_help.c:492 sql_help.c:502 sql_help.c:1498
 msgid "support_number"
 msgstr "número_suporte"
 
-#: sql_help.c:347 sql_help.c:850 sql_help.c:996 sql_help.c:1021
-#: sql_help.c:1034 sql_help.c:1215 sql_help.c:1245 sql_help.c:1576
-#: sql_help.c:2134 sql_help.c:2363 sql_help.c:2472 sql_help.c:2477
-#: sql_help.c:2671 sql_help.c:2676 sql_help.c:2823 sql_help.c:2828
-msgid "function_name"
-msgstr "nome_função"
-
-#: sql_help.c:348 sql_help.c:997 sql_help.c:1246
+#: sql_help.c:496 sql_help.c:1218 sql_help.c:1502
 msgid "argument_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:393 sql_help.c:707 sql_help.c:1158 sql_help.c:1286
-#: sql_help.c:1663
+#: sql_help.c:545 sql_help.c:915 sql_help.c:1412 sql_help.c:1543
+#: sql_help.c:1938
 msgid "password"
 msgstr "senha"
 
-#: sql_help.c:394 sql_help.c:708 sql_help.c:1159 sql_help.c:1287
-#: sql_help.c:1664
+#: sql_help.c:546 sql_help.c:916 sql_help.c:1413 sql_help.c:1544
+#: sql_help.c:1939
 msgid "timestamp"
 msgstr "tempo_absoluto"
 
-#: sql_help.c:398 sql_help.c:402 sql_help.c:405 sql_help.c:408 sql_help.c:2128
-#: sql_help.c:2357
+#: sql_help.c:550 sql_help.c:554 sql_help.c:557 sql_help.c:560 sql_help.c:2439
+#: sql_help.c:2693
 msgid "database_name"
 msgstr "nome_banco_de_dados"
 
-#: sql_help.c:437 sql_help.c:1334
+#: sql_help.c:589 sql_help.c:1591
 msgid "increment"
 msgstr "incremento"
 
-#: sql_help.c:438 sql_help.c:1335
+#: sql_help.c:590 sql_help.c:1592
 msgid "minvalue"
 msgstr "valor_mínimo"
 
-#: sql_help.c:439 sql_help.c:1336
+#: sql_help.c:591 sql_help.c:1593
 msgid "maxvalue"
 msgstr "valor_máximo"
 
-#: sql_help.c:440 sql_help.c:1337 sql_help.c:2459 sql_help.c:2527
-#: sql_help.c:2658 sql_help.c:2759 sql_help.c:2810
+#: sql_help.c:592 sql_help.c:1594 sql_help.c:2835 sql_help.c:2905
+#: sql_help.c:3038 sql_help.c:3143 sql_help.c:3194
 msgid "start"
 msgstr "início"
 
-#: sql_help.c:441
+#: sql_help.c:593
 msgid "restart"
 msgstr "reinício"
 
-#: sql_help.c:442 sql_help.c:1338
+#: sql_help.c:594 sql_help.c:1595
 msgid "cache"
 msgstr "cache"
 
-#: sql_help.c:444 sql_help.c:516 sql_help.c:523 sql_help.c:526 sql_help.c:527
-#: sql_help.c:530 sql_help.c:532 sql_help.c:533 sql_help.c:534 sql_help.c:536
-#: sql_help.c:539 sql_help.c:541 sql_help.c:744 sql_help.c:747 sql_help.c:762
-#: sql_help.c:920 sql_help.c:924 sql_help.c:936 sql_help.c:937 sql_help.c:1180
-#: sql_help.c:1340 sql_help.c:1471 sql_help.c:2121 sql_help.c:2122
-#: sql_help.c:2160 sql_help.c:2350 sql_help.c:2351 sql_help.c:2721
-#: sql_help.c:2723 sql_help.c:2740 sql_help.c:2743
-msgid "column"
-msgstr "coluna"
-
-#: sql_help.c:460 sql_help.c:464 sql_help.c:729 sql_help.c:1350
-#: sql_help.c:1681 sql_help.c:1908 sql_help.c:1990 sql_help.c:2132
-#: sql_help.c:2361
+#: sql_help.c:612 sql_help.c:616 sql_help.c:937 sql_help.c:1342
+#: sql_help.c:1607 sql_help.c:1956 sql_help.c:2209 sql_help.c:2291
+#: sql_help.c:2443 sql_help.c:2697
 msgid "server_name"
 msgstr "nome_servidor"
 
-#: sql_help.c:461
-msgid "new_version"
-msgstr "nova_versão"
+#: sql_help.c:686 sql_help.c:691 sql_help.c:878 sql_help.c:882 sql_help.c:1291
+#: sql_help.c:1341 sql_help.c:1490 sql_help.c:1678 sql_help.c:1885
+#: sql_help.c:2558
+msgid "data_type"
+msgstr "tipo_de_dado"
 
-#: sql_help.c:517
-msgid "new_column"
-msgstr "nova_coluna"
+#: sql_help.c:687 sql_help.c:692 sql_help.c:879 sql_help.c:883 sql_help.c:1292
+#: sql_help.c:1436 sql_help.c:1679 sql_help.c:1886
+msgid "collation"
+msgstr "ordenação"
 
-#: sql_help.c:525 sql_help.c:1422 sql_help.c:1434
+#: sql_help.c:688 sql_help.c:1680 sql_help.c:1691
 msgid "column_constraint"
 msgstr "restrição_coluna"
 
-#: sql_help.c:535
+#: sql_help.c:699
 msgid "integer"
 msgstr "inteiro"
 
-#: sql_help.c:537 sql_help.c:540
+#: sql_help.c:701 sql_help.c:704
 msgid "attribute_option"
 msgstr "opção_atributo"
 
-#: sql_help.c:542 sql_help.c:1423 sql_help.c:1435
+#: sql_help.c:706 sql_help.c:1681 sql_help.c:1692
 msgid "table_constraint"
 msgstr "restrição_tabela"
 
-#: sql_help.c:544 sql_help.c:545 sql_help.c:546 sql_help.c:547 sql_help.c:874
+#: sql_help.c:707
+msgid "table_constraint_using_index"
+msgstr "restrição_tabela_utilizando_índice"
+
+#: sql_help.c:710 sql_help.c:711 sql_help.c:712 sql_help.c:713 sql_help.c:1093
 msgid "trigger_name"
 msgstr "nome_gatilho"
 
-#: sql_help.c:548 sql_help.c:549 sql_help.c:550 sql_help.c:551
+#: sql_help.c:714 sql_help.c:715 sql_help.c:716 sql_help.c:717
 msgid "rewrite_rule_name"
 msgstr "nome_regra_reescrita"
 
-#: sql_help.c:552 sql_help.c:801
+#: sql_help.c:718 sql_help.c:729 sql_help.c:1010
 msgid "index_name"
 msgstr "nome_índice"
 
-#: sql_help.c:556 sql_help.c:557 sql_help.c:1424 sql_help.c:1426
+#: sql_help.c:722 sql_help.c:723 sql_help.c:1682 sql_help.c:1684
 msgid "parent_table"
 msgstr "tabela_ancestral"
 
-#: sql_help.c:575 sql_help.c:578
+#: sql_help.c:724 sql_help.c:1689
+msgid "type_name"
+msgstr "nome_tipo"
+
+#: sql_help.c:727
+msgid "and table_constraint_using_index is:"
+msgstr "e restrição_tabela_utilizando_índice é:"
+
+#: sql_help.c:745 sql_help.c:748
 msgid "tablespace_option"
 msgstr "opção_tablespace"
 
-#: sql_help.c:598 sql_help.c:601 sql_help.c:607 sql_help.c:611
+#: sql_help.c:769 sql_help.c:772 sql_help.c:778 sql_help.c:782
 msgid "token_type"
 msgstr "tipo_elemento"
 
-#: sql_help.c:599 sql_help.c:602
+#: sql_help.c:770 sql_help.c:773
 msgid "dictionary_name"
 msgstr "nome_dicionário"
 
-#: sql_help.c:604 sql_help.c:608
+#: sql_help.c:775 sql_help.c:779
 msgid "old_dictionary"
 msgstr "dicionário_antigo"
 
-#: sql_help.c:605 sql_help.c:609
+#: sql_help.c:776 sql_help.c:780
 msgid "new_dictionary"
 msgstr "novo_dicionário"
 
-#: sql_help.c:775 sql_help.c:2583 sql_help.c:2584 sql_help.c:2607
+#: sql_help.c:867 sql_help.c:877 sql_help.c:880 sql_help.c:881 sql_help.c:1884
+msgid "attribute_name"
+msgstr "nome_atributo"
+
+#: sql_help.c:868
+msgid "new_attribute_name"
+msgstr "novo_nome_atributo"
+
+#: sql_help.c:874
+msgid "new_enum_value"
+msgstr "novo_valor_enum"
+
+#: sql_help.c:875
+msgid "existing_enum_value"
+msgstr "valor_enum_existente"
+
+#: sql_help.c:984 sql_help.c:2962 sql_help.c:2963 sql_help.c:2987
 msgid "transaction_mode"
 msgstr "modo_transação"
 
-#: sql_help.c:776 sql_help.c:2585 sql_help.c:2608
+#: sql_help.c:985 sql_help.c:2964 sql_help.c:2988
 msgid "where transaction_mode is one of:"
 msgstr "onde modo_transação é um dos:"
 
-#: sql_help.c:800 sql_help.c:839 sql_help.c:846 sql_help.c:866 sql_help.c:875
-#: sql_help.c:919 sql_help.c:923 sql_help.c:1018 sql_help.c:1418
-#: sql_help.c:1430 sql_help.c:1487 sql_help.c:2118 sql_help.c:2123
-#: sql_help.c:2347 sql_help.c:2352 sql_help.c:2461 sql_help.c:2463
-#: sql_help.c:2489 sql_help.c:2529 sql_help.c:2660 sql_help.c:2662
-#: sql_help.c:2688 sql_help.c:2812 sql_help.c:2814 sql_help.c:2840
+#: sql_help.c:1009 sql_help.c:1060 sql_help.c:1083 sql_help.c:1094
+#: sql_help.c:1139 sql_help.c:1143 sql_help.c:1339 sql_help.c:1676
+#: sql_help.c:1688 sql_help.c:1745 sql_help.c:2429 sql_help.c:2434
+#: sql_help.c:2683 sql_help.c:2688 sql_help.c:2769 sql_help.c:2837
+#: sql_help.c:2839 sql_help.c:2868 sql_help.c:2907 sql_help.c:3040
+#: sql_help.c:3042 sql_help.c:3071 sql_help.c:3196 sql_help.c:3198
+#: sql_help.c:3227
 msgid "table_name"
 msgstr "nome_tabela"
 
-#: sql_help.c:838 sql_help.c:847 sql_help.c:848 sql_help.c:849 sql_help.c:854
-#: sql_help.c:859 sql_help.c:861 sql_help.c:863 sql_help.c:864 sql_help.c:867
-#: sql_help.c:868 sql_help.c:869 sql_help.c:870 sql_help.c:871 sql_help.c:872
-#: sql_help.c:873 sql_help.c:876 sql_help.c:877
-msgid "object_name"
-msgstr "nome_objeto"
+#: sql_help.c:1057
+msgid "relation_name"
+msgstr "nome_relação"
 
-#: sql_help.c:840 sql_help.c:1119 sql_help.c:1419 sql_help.c:1432
-#: sql_help.c:1451 sql_help.c:1453 sql_help.c:1460 sql_help.c:1488
-#: sql_help.c:1693 sql_help.c:2487 sql_help.c:2686 sql_help.c:2838
+#: sql_help.c:1058 sql_help.c:1340 sql_help.c:1373 sql_help.c:1677
+#: sql_help.c:1690 sql_help.c:1709 sql_help.c:1711 sql_help.c:1718
+#: sql_help.c:1746 sql_help.c:1848 sql_help.c:1968 sql_help.c:2770
+#: sql_help.c:2863 sql_help.c:3066 sql_help.c:3222
 msgid "column_name"
 msgstr "nome_coluna"
 
-#: sql_help.c:841
-msgid "agg_name"
-msgstr "nome_agregação"
-
-#: sql_help.c:842
-msgid "agg_type"
-msgstr "tipo_agregação"
-
-#: sql_help.c:843 sql_help.c:994 sql_help.c:998 sql_help.c:1000
-#: sql_help.c:1762
-msgid "source_type"
-msgstr "tipo_origem"
-
-#: sql_help.c:844 sql_help.c:995 sql_help.c:999 sql_help.c:1001
-#: sql_help.c:1763
-msgid "target_type"
-msgstr "tipo_destino"
-
-#: sql_help.c:865
+#: sql_help.c:1082
 msgid "rule_name"
 msgstr "nome_regra"
 
-#: sql_help.c:878
+#: sql_help.c:1097
 msgid "text"
 msgstr "texto"
 
-#: sql_help.c:893 sql_help.c:2231 sql_help.c:2393
+#: sql_help.c:1112 sql_help.c:2567 sql_help.c:2729
 msgid "transaction_id"
 msgstr "id_transação"
 
-#: sql_help.c:921 sql_help.c:926 sql_help.c:2180
+#: sql_help.c:1141 sql_help.c:1146 sql_help.c:2493
 msgid "filename"
 msgstr "arquivo"
 
-#: sql_help.c:925 sql_help.c:1492 sql_help.c:1694 sql_help.c:1712
-#: sql_help.c:2162
+#: sql_help.c:1145 sql_help.c:1750 sql_help.c:1969 sql_help.c:1987
+#: sql_help.c:2475
 msgid "query"
 msgstr "consulta"
 
-#: sql_help.c:928
+#: sql_help.c:1148 sql_help.c:2335
 msgid "where option can be one of:"
 msgstr "onde opção pod ser um das:"
 
-#: sql_help.c:929
+#: sql_help.c:1149
 msgid "format_name"
 msgstr "nome_formato"
 
-#: sql_help.c:930 sql_help.c:933 sql_help.c:2023 sql_help.c:2024
-#: sql_help.c:2025 sql_help.c:2026
+#: sql_help.c:1150 sql_help.c:1153 sql_help.c:2336 sql_help.c:2337
+#: sql_help.c:2338 sql_help.c:2339
 msgid "boolean"
 msgstr "booleano"
 
-#: sql_help.c:931
+#: sql_help.c:1151
 msgid "delimiter_character"
 msgstr "caracter_delimitador"
 
-#: sql_help.c:932
+#: sql_help.c:1152
 msgid "null_string"
 msgstr "cadeia_nula"
 
-#: sql_help.c:934
+#: sql_help.c:1154
 msgid "quote_character"
 msgstr "caracter_separador"
 
-#: sql_help.c:935
+#: sql_help.c:1155
 msgid "escape_character"
 msgstr "caracter_escape"
 
-#: sql_help.c:963
+#: sql_help.c:1158
+msgid "encoding_name"
+msgstr "nome_codificação"
+
+#: sql_help.c:1184
 msgid "input_data_type"
 msgstr "tipo_de_dado_entrada"
 
-#: sql_help.c:964 sql_help.c:972
+#: sql_help.c:1185 sql_help.c:1193
 msgid "sfunc"
 msgstr "função_trans_estado"
 
-#: sql_help.c:965 sql_help.c:973
+#: sql_help.c:1186 sql_help.c:1194
 msgid "state_data_type"
 msgstr "tipo_de_dado_estado"
 
-#: sql_help.c:966 sql_help.c:974
+#: sql_help.c:1187 sql_help.c:1195
 msgid "ffunc"
 msgstr "função_final"
 
-#: sql_help.c:967 sql_help.c:975
+#: sql_help.c:1188 sql_help.c:1196
 msgid "initial_condition"
 msgstr "condição_inicial"
 
-#: sql_help.c:968 sql_help.c:976
+#: sql_help.c:1189 sql_help.c:1197
 msgid "sort_operator"
 msgstr "operador_ordenação"
 
-#: sql_help.c:969
+#: sql_help.c:1190
 msgid "or the old syntax"
 msgstr "ou a sintaxe antiga"
 
-#: sql_help.c:971
+#: sql_help.c:1192
 msgid "base_type"
 msgstr "tipo_base"
 
-#: sql_help.c:1017 sql_help.c:1304 sql_help.c:1573
-msgid "event"
-msgstr "evento"
+#: sql_help.c:1236
+msgid "locale"
+msgstr "configuração regional"
 
-#: sql_help.c:1019
-msgid "referenced_table_name"
-msgstr "nome_tabela_referenciada"
+#: sql_help.c:1237 sql_help.c:1271
+msgid "lc_collate"
+msgstr "lc_collate"
 
-#: sql_help.c:1020 sql_help.c:1306 sql_help.c:1575 sql_help.c:1726
-#: sql_help.c:2450 sql_help.c:2452 sql_help.c:2518 sql_help.c:2520
-#: sql_help.c:2649 sql_help.c:2651 sql_help.c:2726 sql_help.c:2801
-#: sql_help.c:2803
-msgid "condition"
-msgstr "condição"
+#: sql_help.c:1238 sql_help.c:1272
+msgid "lc_ctype"
+msgstr "lc_ctype"
 
-#: sql_help.c:1022 sql_help.c:1577
-msgid "arguments"
-msgstr "argumentos"
+#: sql_help.c:1240
+msgid "existing_collation"
+msgstr "ordenação_existente"
 
-#: sql_help.c:1032
+#: sql_help.c:1250
 msgid "source_encoding"
 msgstr "codificação_origem"
 
-#: sql_help.c:1033
+#: sql_help.c:1251
 msgid "dest_encoding"
 msgstr "codificação_destino"
 
-#: sql_help.c:1051 sql_help.c:1527
+#: sql_help.c:1269 sql_help.c:1785
 msgid "template"
 msgstr "modelo"
 
-#: sql_help.c:1052
+#: sql_help.c:1270
 msgid "encoding"
 msgstr "codificação"
 
-#: sql_help.c:1053
-msgid "lc_collate"
-msgstr "lc_collate"
-
-#: sql_help.c:1054
-msgid "lc_ctype"
-msgstr "lc_ctype"
-
-#: sql_help.c:1055 sql_help.c:1185 sql_help.c:1429 sql_help.c:1438
-#: sql_help.c:1469 sql_help.c:1491
+#: sql_help.c:1273 sql_help.c:1440 sql_help.c:1687 sql_help.c:1695
+#: sql_help.c:1727 sql_help.c:1749
 msgid "tablespace"
 msgstr "tablespace"
 
-#: sql_help.c:1072 sql_help.c:1235 sql_help.c:1420 sql_help.c:1613
-#: sql_help.c:2222
-msgid "data_type"
-msgstr "tipo_de_dado"
-
-#: sql_help.c:1074
+#: sql_help.c:1294
 msgid "constraint"
 msgstr "restrição"
 
-#: sql_help.c:1075
+#: sql_help.c:1295
 msgid "where constraint is:"
 msgstr "onde restrição é:"
 
-#: sql_help.c:1117 sql_help.c:1421 sql_help.c:1433
+#: sql_help.c:1309
+msgid "schema"
+msgstr "esquema"
+
+#: sql_help.c:1310
+msgid "version"
+msgstr "versão"
+
+#: sql_help.c:1311
+msgid "old_version"
+msgstr "versão_antiga"
+
+#: sql_help.c:1371 sql_help.c:1699
 msgid "default_expr"
 msgstr "expressão_padrão"
 
-#: sql_help.c:1118
+#: sql_help.c:1372
 msgid "rettype"
 msgstr "tipo_retorno"
 
-#: sql_help.c:1120
+#: sql_help.c:1374
 msgid "column_type"
 msgstr "tipo_coluna"
 
-#: sql_help.c:1121 sql_help.c:1744 sql_help.c:2140 sql_help.c:2369
+#: sql_help.c:1375 sql_help.c:2021 sql_help.c:2451 sql_help.c:2705
 msgid "lang_name"
 msgstr "nome_linguagem"
 
-#: sql_help.c:1127
+#: sql_help.c:1381
 msgid "definition"
 msgstr "definição"
 
-#: sql_help.c:1128
+#: sql_help.c:1382
 msgid "obj_file"
 msgstr "arquivo_objeto"
 
-#: sql_help.c:1129
+#: sql_help.c:1383
 msgid "link_symbol"
 msgstr "símbolo_ligação"
 
-#: sql_help.c:1130
+#: sql_help.c:1384
 msgid "attribute"
 msgstr "atributo"
 
-#: sql_help.c:1165 sql_help.c:1293 sql_help.c:1670
+#: sql_help.c:1419 sql_help.c:1550 sql_help.c:1945
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:1179
+#: sql_help.c:1433
 msgid "method"
 msgstr "método"
 
-#: sql_help.c:1182 sql_help.c:1473
+#: sql_help.c:1437 sql_help.c:1731
 msgid "opclass"
 msgstr "classe_operadores"
 
-#: sql_help.c:1186 sql_help.c:1459
+#: sql_help.c:1441 sql_help.c:1717
 msgid "predicate"
 msgstr "predicado"
 
-#: sql_help.c:1198
+#: sql_help.c:1453
 msgid "call_handler"
 msgstr "manipulador_chamada"
 
-#: sql_help.c:1199
+#: sql_help.c:1454
 msgid "inline_handler"
 msgstr "manipulador_em_linha"
 
-#: sql_help.c:1218
+#: sql_help.c:1455
+msgid "valfunction"
+msgstr "função_validação"
+
+#: sql_help.c:1473
 msgid "com_op"
 msgstr "operador_comutação"
 
-#: sql_help.c:1219
+#: sql_help.c:1474
 msgid "neg_op"
 msgstr "operador_negação"
 
-#: sql_help.c:1220
+#: sql_help.c:1475
 msgid "res_proc"
 msgstr "proc_restrição"
 
-#: sql_help.c:1221
+#: sql_help.c:1476
 msgid "join_proc"
 msgstr "proc_junção"
 
-#: sql_help.c:1237
+#: sql_help.c:1492
 msgid "family_name"
 msgstr "nome_família"
 
-#: sql_help.c:1247
+#: sql_help.c:1503
 msgid "storage_type"
 msgstr "tipo_armazenamento"
 
-#: sql_help.c:1307 sql_help.c:1308 sql_help.c:1309
+#: sql_help.c:1561 sql_help.c:1841
+msgid "event"
+msgstr "evento"
+
+#: sql_help.c:1563 sql_help.c:1844 sql_help.c:2003 sql_help.c:2826
+#: sql_help.c:2828 sql_help.c:2896 sql_help.c:2898 sql_help.c:3029
+#: sql_help.c:3031 sql_help.c:3110 sql_help.c:3185 sql_help.c:3187
+msgid "condition"
+msgstr "condição"
+
+#: sql_help.c:1564 sql_help.c:1565 sql_help.c:1566
 msgid "command"
 msgstr "comando"
 
-#: sql_help.c:1320 sql_help.c:1322
+#: sql_help.c:1577 sql_help.c:1579
 msgid "schema_element"
 msgstr "elemento_esquema"
 
-#: sql_help.c:1351
+#: sql_help.c:1608
 msgid "server_type"
 msgstr "tipo_servidor"
 
-#: sql_help.c:1352
+#: sql_help.c:1609
 msgid "server_version"
 msgstr "versão_servidor"
 
-#: sql_help.c:1353 sql_help.c:2130 sql_help.c:2359
+#: sql_help.c:1610 sql_help.c:2441 sql_help.c:2695
 msgid "fdw_name"
 msgstr "nome_ade"
 
-#: sql_help.c:1425
+#: sql_help.c:1683
 msgid "like_option"
 msgstr "opção_like"
 
-#: sql_help.c:1431
-msgid "type_name"
-msgstr "nome_tipo"
-
-#: sql_help.c:1439
+#: sql_help.c:1696
 msgid "where column_constraint is:"
 msgstr "onde restrição_coluna é:"
 
-#: sql_help.c:1442 sql_help.c:1443 sql_help.c:1452 sql_help.c:1454
-#: sql_help.c:1458
+#: sql_help.c:1700 sql_help.c:1701 sql_help.c:1710 sql_help.c:1712
+#: sql_help.c:1716
 msgid "index_parameters"
 msgstr "parâmetros_índice"
 
-#: sql_help.c:1444 sql_help.c:1461
+#: sql_help.c:1702 sql_help.c:1719
 msgid "reftable"
 msgstr "tabela_ref"
 
-#: sql_help.c:1445 sql_help.c:1462
+#: sql_help.c:1703 sql_help.c:1720
 msgid "refcolumn"
 msgstr "coluna_ref"
 
-#: sql_help.c:1448
+#: sql_help.c:1706
 msgid "and table_constraint is:"
 msgstr "e restrição_tabela é:"
 
-#: sql_help.c:1456
+#: sql_help.c:1714
 msgid "exclude_element"
 msgstr "elemento_exclusão"
 
-#: sql_help.c:1465
+#: sql_help.c:1723
 msgid "and like_option is:"
 msgstr "e opção_like é:"
 
-#: sql_help.c:1466
+#: sql_help.c:1724
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "parâmetros_índice em restrições UNIQUE, PRIMARY KEY e EXCLUDE são:"
 
-#: sql_help.c:1470
+#: sql_help.c:1728
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "elemento_exclusão em uma restrição EXCLUDE é:"
 
-#: sql_help.c:1502
+#: sql_help.c:1760
 msgid "directory"
 msgstr "diretório"
 
-#: sql_help.c:1514
+#: sql_help.c:1772
 msgid "parser_name"
 msgstr "nome_analisador"
 
-#: sql_help.c:1515
+#: sql_help.c:1773
 msgid "source_config"
 msgstr "configuração_origem"
 
-#: sql_help.c:1544
+#: sql_help.c:1802
 msgid "start_function"
 msgstr "função_início"
 
-#: sql_help.c:1545
+#: sql_help.c:1803
 msgid "gettoken_function"
 msgstr "função_gettoken"
 
-#: sql_help.c:1546
+#: sql_help.c:1804
 msgid "end_function"
 msgstr "função_fim"
 
-#: sql_help.c:1547
+#: sql_help.c:1805
 msgid "lextypes_function"
 msgstr "função_lextypes"
 
-#: sql_help.c:1548
+#: sql_help.c:1806
 msgid "headline_function"
 msgstr "função_headline"
 
-#: sql_help.c:1560
+#: sql_help.c:1818
 msgid "init_function"
 msgstr "função_init"
 
-#: sql_help.c:1561
+#: sql_help.c:1819
 msgid "lexize_function"
 msgstr "função_lexize"
 
-#: sql_help.c:1612
-msgid "attribute_name"
-msgstr "nome_atributo"
+#: sql_help.c:1843
+msgid "referenced_table_name"
+msgstr "nome_tabela_referenciada"
 
-#: sql_help.c:1615
+#: sql_help.c:1846
+msgid "arguments"
+msgstr "argumentos"
+
+#: sql_help.c:1847
+msgid "where event can be one of:"
+msgstr "onde evento pod ser um dos:"
+
+#: sql_help.c:1888 sql_help.c:2785
 msgid "label"
 msgstr "rótulo"
 
-#: sql_help.c:1617
+#: sql_help.c:1890
 msgid "input_function"
 msgstr "função_entrada"
 
-#: sql_help.c:1618
+#: sql_help.c:1891
 msgid "output_function"
 msgstr "função_saída"
 
-#: sql_help.c:1619
+#: sql_help.c:1892
 msgid "receive_function"
 msgstr "função_recepção"
 
-#: sql_help.c:1620
+#: sql_help.c:1893
 msgid "send_function"
 msgstr "função_envio"
 
-#: sql_help.c:1621
+#: sql_help.c:1894
 msgid "type_modifier_input_function"
 msgstr "função_entrada_modificador_tipo"
 
-#: sql_help.c:1622
+#: sql_help.c:1895
 msgid "type_modifier_output_function"
 msgstr "função_saída_modificador_tipo"
 
-#: sql_help.c:1623
+#: sql_help.c:1896
 msgid "analyze_function"
 msgstr "função_análise"
 
-#: sql_help.c:1624
+#: sql_help.c:1897
 msgid "internallength"
 msgstr "tamanho_interno"
 
-#: sql_help.c:1625
+#: sql_help.c:1898
 msgid "alignment"
 msgstr "alinhamento"
 
-#: sql_help.c:1626
+#: sql_help.c:1899
 msgid "storage"
 msgstr "armazenamento"
 
-#: sql_help.c:1627
+#: sql_help.c:1900
 msgid "like_type"
 msgstr "tipo_like"
 
-#: sql_help.c:1628
+#: sql_help.c:1901
 msgid "category"
 msgstr "categoria"
 
-#: sql_help.c:1629
+#: sql_help.c:1902
 msgid "preferred"
 msgstr "tipo_preferido"
 
-#: sql_help.c:1630
+#: sql_help.c:1903
 msgid "default"
 msgstr "valor_padrão"
 
-#: sql_help.c:1631
+#: sql_help.c:1904
 msgid "element"
 msgstr "elemento"
 
-#: sql_help.c:1632
+#: sql_help.c:1905
 msgid "delimiter"
 msgstr "delimitador"
 
-#: sql_help.c:1724 sql_help.c:2464 sql_help.c:2467 sql_help.c:2470
-#: sql_help.c:2474 sql_help.c:2663 sql_help.c:2666 sql_help.c:2669
-#: sql_help.c:2673 sql_help.c:2720 sql_help.c:2815 sql_help.c:2818
-#: sql_help.c:2821 sql_help.c:2825
+#: sql_help.c:1906
+msgid "collatable"
+msgstr "collatable"
+
+#: sql_help.c:1999 sql_help.c:2471 sql_help.c:2821 sql_help.c:2890
+#: sql_help.c:3024 sql_help.c:3102 sql_help.c:3180
+msgid "with_query"
+msgstr "consulta_with"
+
+#: sql_help.c:2001 sql_help.c:2840 sql_help.c:2843 sql_help.c:2846
+#: sql_help.c:2850 sql_help.c:3043 sql_help.c:3046 sql_help.c:3049
+#: sql_help.c:3053 sql_help.c:3104 sql_help.c:3199 sql_help.c:3202
+#: sql_help.c:3205 sql_help.c:3209
 msgid "alias"
 msgstr "aliás"
 
-#: sql_help.c:1725
+#: sql_help.c:2002
 msgid "using_list"
 msgstr "lista_using"
 
-#: sql_help.c:1727 sql_help.c:2054 sql_help.c:2204 sql_help.c:2727
+#: sql_help.c:2004 sql_help.c:2365 sql_help.c:2534 sql_help.c:3111
 msgid "cursor_name"
 msgstr "nome_cursor"
 
-#: sql_help.c:1728 sql_help.c:2163 sql_help.c:2728
+#: sql_help.c:2005 sql_help.c:2476 sql_help.c:3112
 msgid "output_expression"
 msgstr "expressão_saída"
 
-#: sql_help.c:1729 sql_help.c:2164 sql_help.c:2448 sql_help.c:2515
-#: sql_help.c:2647 sql_help.c:2729 sql_help.c:2799
+#: sql_help.c:2006 sql_help.c:2477 sql_help.c:2824 sql_help.c:2893
+#: sql_help.c:3027 sql_help.c:3113 sql_help.c:3183
 msgid "output_name"
 msgstr "nome_saída"
 
-#: sql_help.c:1745
+#: sql_help.c:2022
 msgid "code"
 msgstr "código"
 
-#: sql_help.c:2014
+#: sql_help.c:2315
 msgid "parameter"
 msgstr "parâmetro"
 
-#: sql_help.c:2027 sql_help.c:2028 sql_help.c:2223
+#: sql_help.c:2333 sql_help.c:2334 sql_help.c:2559
 msgid "statement"
 msgstr "comando"
 
-#: sql_help.c:2053 sql_help.c:2203
+#: sql_help.c:2364 sql_help.c:2533
 msgid "direction"
 msgstr "direção"
 
-#: sql_help.c:2055
+#: sql_help.c:2366 sql_help.c:2535
 msgid "where direction can be empty or one of:"
 msgstr "onde direção pode ser vazio ou um dos:"
 
-#: sql_help.c:2056 sql_help.c:2057 sql_help.c:2058 sql_help.c:2059
-#: sql_help.c:2060 sql_help.c:2458 sql_help.c:2460 sql_help.c:2526
-#: sql_help.c:2528 sql_help.c:2657 sql_help.c:2659 sql_help.c:2758
-#: sql_help.c:2760 sql_help.c:2809 sql_help.c:2811
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2371 sql_help.c:2536 sql_help.c:2537 sql_help.c:2538
+#: sql_help.c:2539 sql_help.c:2540 sql_help.c:2834 sql_help.c:2836
+#: sql_help.c:2904 sql_help.c:2906 sql_help.c:3037 sql_help.c:3039
+#: sql_help.c:3142 sql_help.c:3144 sql_help.c:3193 sql_help.c:3195
 msgid "count"
 msgstr "contador"
 
-#: sql_help.c:2125 sql_help.c:2354
+#: sql_help.c:2436 sql_help.c:2690
 msgid "sequence_name"
 msgstr "nome_sequência"
 
-#: sql_help.c:2136 sql_help.c:2365
+#: sql_help.c:2447 sql_help.c:2701
 msgid "arg_name"
 msgstr "nome_argumento"
 
-#: sql_help.c:2137 sql_help.c:2366
+#: sql_help.c:2448 sql_help.c:2702
 msgid "arg_type"
 msgstr "tipo_argumento"
 
-#: sql_help.c:2142 sql_help.c:2371
+#: sql_help.c:2453 sql_help.c:2707
 msgid "loid"
 msgstr "loid"
 
-#: sql_help.c:2172 sql_help.c:2212 sql_help.c:2706
+#: sql_help.c:2485 sql_help.c:2548 sql_help.c:3088
 msgid "channel"
 msgstr "canal"
 
-#: sql_help.c:2194
+#: sql_help.c:2507
 msgid "lockmode"
 msgstr "modo_bloqueio"
 
-#: sql_help.c:2195
+#: sql_help.c:2508
 msgid "where lockmode is one of:"
 msgstr "onde modo_bloqueio é um dos:"
 
-#: sql_help.c:2213
+#: sql_help.c:2549
 msgid "payload"
 msgstr "informação"
 
-#: sql_help.c:2239
+#: sql_help.c:2575
 msgid "old_role"
 msgstr "role_antiga"
 
-#: sql_help.c:2240
+#: sql_help.c:2576
 msgid "new_role"
 msgstr "nova_role"
 
-#: sql_help.c:2256 sql_help.c:2401 sql_help.c:2409
+#: sql_help.c:2592 sql_help.c:2737 sql_help.c:2745
 msgid "savepoint_name"
 msgstr "nome_ponto_de_salvamento"
 
-#: sql_help.c:2445 sql_help.c:2512 sql_help.c:2644 sql_help.c:2796
-msgid "with_query"
-msgstr "consulta_with"
+#: sql_help.c:2767
+msgid "provider"
+msgstr "fornecedor"
 
-#: sql_help.c:2449 sql_help.c:2480 sql_help.c:2482 sql_help.c:2517
-#: sql_help.c:2648 sql_help.c:2679 sql_help.c:2681 sql_help.c:2800
-#: sql_help.c:2831 sql_help.c:2833
+#: sql_help.c:2825 sql_help.c:2856 sql_help.c:2858 sql_help.c:2895
+#: sql_help.c:3028 sql_help.c:3059 sql_help.c:3061 sql_help.c:3184
+#: sql_help.c:3215 sql_help.c:3217
 msgid "from_item"
 msgstr "item_from"
 
-#: sql_help.c:2453 sql_help.c:2521 sql_help.c:2652 sql_help.c:2804
+#: sql_help.c:2829 sql_help.c:2899 sql_help.c:3032 sql_help.c:3188
 msgid "window_name"
 msgstr "nome_deslizante"
 
-#: sql_help.c:2454 sql_help.c:2522 sql_help.c:2653 sql_help.c:2805
+#: sql_help.c:2830 sql_help.c:2900 sql_help.c:3033 sql_help.c:3189
 msgid "window_definition"
 msgstr "definição_deslizante"
 
-#: sql_help.c:2455 sql_help.c:2466 sql_help.c:2488 sql_help.c:2523
-#: sql_help.c:2654 sql_help.c:2665 sql_help.c:2687 sql_help.c:2806
-#: sql_help.c:2817 sql_help.c:2839
+#: sql_help.c:2831 sql_help.c:2842 sql_help.c:2864 sql_help.c:2901
+#: sql_help.c:3034 sql_help.c:3045 sql_help.c:3067 sql_help.c:3190
+#: sql_help.c:3201 sql_help.c:3223
 msgid "select"
 msgstr "seleção"
 
-#: sql_help.c:2462 sql_help.c:2661 sql_help.c:2813
+#: sql_help.c:2838 sql_help.c:3041 sql_help.c:3197
 msgid "where from_item can be one of:"
 msgstr "onde item_from pode ser um dos:"
 
-#: sql_help.c:2465 sql_help.c:2468 sql_help.c:2471 sql_help.c:2475
-#: sql_help.c:2664 sql_help.c:2667 sql_help.c:2670 sql_help.c:2674
-#: sql_help.c:2816 sql_help.c:2819 sql_help.c:2822 sql_help.c:2826
+#: sql_help.c:2841 sql_help.c:2844 sql_help.c:2847 sql_help.c:2851
+#: sql_help.c:3044 sql_help.c:3047 sql_help.c:3050 sql_help.c:3054
+#: sql_help.c:3200 sql_help.c:3203 sql_help.c:3206 sql_help.c:3210
 msgid "column_alias"
 msgstr "aliás_coluna"
 
-#: sql_help.c:2469 sql_help.c:2486 sql_help.c:2490 sql_help.c:2668
-#: sql_help.c:2685 sql_help.c:2689 sql_help.c:2820 sql_help.c:2837
-#: sql_help.c:2841
+#: sql_help.c:2845 sql_help.c:2862 sql_help.c:3048 sql_help.c:3065
+#: sql_help.c:3204 sql_help.c:3221
 msgid "with_query_name"
 msgstr "nome_consulta_with"
 
-#: sql_help.c:2473 sql_help.c:2478 sql_help.c:2672 sql_help.c:2677
-#: sql_help.c:2824 sql_help.c:2829
+#: sql_help.c:2849 sql_help.c:2854 sql_help.c:3052 sql_help.c:3057
+#: sql_help.c:3208 sql_help.c:3213
 msgid "argument"
 msgstr "argumento"
 
-#: sql_help.c:2476 sql_help.c:2479 sql_help.c:2675 sql_help.c:2678
-#: sql_help.c:2827 sql_help.c:2830
+#: sql_help.c:2852 sql_help.c:2855 sql_help.c:3055 sql_help.c:3058
+#: sql_help.c:3211 sql_help.c:3214
 msgid "column_definition"
 msgstr "definição_coluna"
 
-#: sql_help.c:2481 sql_help.c:2680 sql_help.c:2832
+#: sql_help.c:2857 sql_help.c:3060 sql_help.c:3216
 msgid "join_type"
 msgstr "tipo_junção"
 
-#: sql_help.c:2483 sql_help.c:2682 sql_help.c:2834
+#: sql_help.c:2859 sql_help.c:3062 sql_help.c:3218
 msgid "join_condition"
 msgstr "condição_junção"
 
-#: sql_help.c:2484 sql_help.c:2683 sql_help.c:2835
+#: sql_help.c:2860 sql_help.c:3063 sql_help.c:3219
 msgid "join_column"
 msgstr "coluna_junção"
 
-#: sql_help.c:2485 sql_help.c:2684 sql_help.c:2836
+#: sql_help.c:2861 sql_help.c:3064 sql_help.c:3220
 msgid "and with_query is:"
 msgstr "e consulta_with é:"
 
-#: sql_help.c:2516
+#: sql_help.c:2865 sql_help.c:3068 sql_help.c:3224
+msgid "insert"
+msgstr "inserção"
+
+#: sql_help.c:2866 sql_help.c:3069 sql_help.c:3225
+msgid "update"
+msgstr "atualização"
+
+#: sql_help.c:2867 sql_help.c:3070 sql_help.c:3226
+msgid "delete"
+msgstr "exclusão"
+
+#: sql_help.c:2894
 msgid "new_table"
 msgstr "nova_tabela"
 
-#: sql_help.c:2541
+#: sql_help.c:2919
 msgid "timezone"
 msgstr "zona_horária"
 
-#: sql_help.c:2725
+#: sql_help.c:3109
 msgid "from_list"
 msgstr "lista_from"
 
-#: sql_help.c:2756
+#: sql_help.c:3140
 msgid "sort_expression"
 msgstr "expressão_ordenação"
 
@@ -3752,27 +4096,27 @@ msgstr "não pôde mudar diretório para \"%s\""
 msgid "could not read symbolic link \"%s\""
 msgstr "não pôde ler link simbólico \"%s\""
 
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
 #, c-format
 msgid "child process exited with exit code %d"
 msgstr "processo filho terminou com código de saída %d"
 
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
 #, c-format
 msgid "child process was terminated by exception 0x%X"
 msgstr "processo filho foi terminado pela exceção 0x%X"
 
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
 #, c-format
 msgid "child process was terminated by signal %s"
 msgstr "processo filho foi terminado pelo sinal %s"
 
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
 #, c-format
 msgid "child process was terminated by signal %d"
 msgstr "processo filho foi terminado pelo sinal %d"
 
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "processo filho terminou com status desconhecido %d"
diff --git a/src/bin/psql/po/sv.po b/src/bin/psql/po/sv.po
deleted file mode 100644
index f0db905c52a89..0000000000000
--- a/src/bin/psql/po/sv.po
+++ /dev/null
@@ -1,5567 +0,0 @@
-# Swedish message translation file for psql
-# Peter Eisentraut <peter_e@gmx.net>, 2001, 2009, 2010.
-# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006.
-#
-# pgtranslation Id: psql.po,v 1.7 2010/07/03 01:48:43 petere Exp $
-#
-# Use these quotes: "%s"
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-01 15:17+0000\n"
-"PO-Revision-Date: 2010-07-02 21:48-0400\n"
-"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: command.c:112
-#, c-format
-msgid "Invalid command \\%s. Try \\? for help.\n"
-msgstr "Ogiltigt kommando \\%s. Försök med \\? för hjälp.\n"
-
-#: command.c:114
-#, c-format
-msgid "invalid command \\%s\n"
-msgstr "ogiltigt kommando \\%s\n"
-
-#: command.c:125
-#, c-format
-msgid "\\%s: extra argument \"%s\" ignored\n"
-msgstr "\\%s: extra argument \"%s\" ignorerat\n"
-
-#: command.c:267
-#, c-format
-msgid "could not get home directory: %s\n"
-msgstr "kunde inte hämta hemkatalogen: %s\n"
-
-#: command.c:283
-#, c-format
-msgid "\\%s: could not change directory to \"%s\": %s\n"
-msgstr "\\%s: kunde inte byta katalog till \"%s\": %s\n"
-
-#: command.c:316 common.c:940
-#, c-format
-msgid "Time: %.3f ms\n"
-msgstr "Tid: %.3f ms\n"
-
-#: command.c:485 command.c:513 command.c:1064
-msgid "no query buffer\n"
-msgstr "ingen frågebuffert\n"
-
-#: command.c:555
-msgid "No changes"
-msgstr ""
-
-#: command.c:609
-#, c-format
-msgid "%s: invalid encoding name or conversion procedure not found\n"
-msgstr "%s: ogiltigt kodningsnamn eller konverteringsprocedur hittades inte\n"
-
-#: command.c:688 command.c:722 command.c:736 command.c:753 command.c:857
-#: command.c:907 command.c:1044 command.c:1075
-#, c-format
-msgid "\\%s: missing required argument\n"
-msgstr "\\%s: obligatoriskt argument saknas\n"
-
-#: command.c:785
-msgid "Query buffer is empty."
-msgstr "Frågebufferten är tom."
-
-#: command.c:795
-msgid "Enter new password: "
-msgstr "Mata in nytt lösenord: "
-
-#: command.c:796
-msgid "Enter it again: "
-msgstr "Mata in det igen: "
-
-#: command.c:800
-#, c-format
-msgid "Passwords didn't match.\n"
-msgstr "Lösenorden matchade inte varandra.\n"
-
-#: command.c:818
-#, c-format
-msgid "Password encryption failed.\n"
-msgstr "Lösenordskryptering misslyckades.\n"
-
-#: command.c:886 command.c:987 command.c:1049
-#, c-format
-msgid "\\%s: error\n"
-msgstr "\\%s: fel\n"
-
-#: command.c:927
-msgid "Query buffer reset (cleared)."
-msgstr "Frågebufferten har blivit borttagen."
-
-#: command.c:940
-#, c-format
-msgid "Wrote history to file \"%s/%s\".\n"
-msgstr "Kommandohistorien har skrivits till \"%s/%s\".\n"
-
-#: command.c:978 common.c:52 common.c:66 input.c:209 mainloop.c:72
-#: mainloop.c:234 print.c:137 print.c:151
-#, c-format
-msgid "out of memory\n"
-msgstr "minnet slut\n"
-
-#: command.c:1029
-msgid "Timing is on."
-msgstr "Tidtagning är på."
-
-#: command.c:1031
-msgid "Timing is off."
-msgstr "Tidtagning är av."
-
-#: command.c:1092 command.c:1112 command.c:1633 command.c:1640 command.c:1649
-#: command.c:1659 command.c:1668 command.c:1682 command.c:1699 command.c:1737
-#: common.c:137 copy.c:283 copy.c:361
-#, c-format
-msgid "%s: %s\n"
-msgstr "%s: %s\n"
-
-#: command.c:1194 startup.c:159
-msgid "Password: "
-msgstr "Lösenord: "
-
-#: command.c:1201 startup.c:162 startup.c:164
-#, c-format
-msgid "Password for user %s: "
-msgstr "Lösenord för användare %s: "
-
-#: command.c:1318 command.c:2207 common.c:183 common.c:460 common.c:525
-#: common.c:816 common.c:841 common.c:925 copy.c:432 copy.c:477 copy.c:606
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: command.c:1322
-msgid "Previous connection kept\n"
-msgstr "Föregående förbindelse bevarad\n"
-
-#: command.c:1326
-#, c-format
-msgid "\\connect: %s"
-msgstr "\\connect: %s"
-
-#: command.c:1350
-#, c-format
-msgid "You are now connected to database \"%s\""
-msgstr "Du är nu uppkopplad mot databasen \"%s\""
-
-#: command.c:1353
-#, c-format
-msgid " on host \"%s\""
-msgstr " på värd \"%s\""
-
-#: command.c:1356
-#, c-format
-msgid " at port \"%s\""
-msgstr " port \"%s\""
-
-#: command.c:1359
-#, c-format
-msgid " as user \"%s\""
-msgstr " som användare \"%s\""
-
-#: command.c:1394
-#, c-format
-msgid "%s (%s, server %s)\n"
-msgstr "%s (%s, server %s)\n"
-
-#: command.c:1402
-#, c-format
-msgid ""
-"WARNING: %s version %d.%d, server version %d.%d.\n"
-"         Some psql features might not work.\n"
-msgstr ""
-
-#: command.c:1432
-#, c-format
-msgid "SSL connection (cipher: %s, bits: %i)\n"
-msgstr "SSL-förbindelse (krypto: %s, bitar: %i)\n"
-
-#: command.c:1442
-#, fuzzy, c-format
-msgid "SSL connection (unknown cipher)\n"
-msgstr ""
-"SSL-förbindelse (krypto: %s, bitar: %i)\n"
-"\n"
-
-#: command.c:1463
-#, c-format
-msgid ""
-"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
-"         8-bit characters might not work correctly. See psql reference\n"
-"         page \"Notes for Windows users\" for details.\n"
-msgstr ""
-"VARNING: Konsollens \"code page\" (%u) skiljer sig fån Windows \"code page\" (%u)\n"
-"         8-bitars tecken kommer troligen inte fungera korrekt. Se psql:s\n"
-"         referensmanual i sektionen \"Notes for Windows users\" för mer detaljer.\n"
-
-#: command.c:1552
-#, c-format
-msgid "could not start editor \"%s\"\n"
-msgstr "kunde inte starta editorn \"%s\"\n"
-
-#: command.c:1554
-msgid "could not start /bin/sh\n"
-msgstr "kunde inte starta /bin/sh\n"
-
-#: command.c:1591
-#, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "kunde inte hitta temp-katalogen: %s"
-
-#: command.c:1618
-#, c-format
-msgid "could not open temporary file \"%s\": %s\n"
-msgstr "kunde inte öppna temporär fil \"%s\": %s\n"
-
-#: command.c:1839
-msgid ""
-"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
-"ms\n"
-msgstr ""
-"\\pset: tillåtna format är unaligned, aligned, wrapped, html, latex, troff-"
-"ms\n"
-
-#: command.c:1844
-#, c-format
-msgid "Output format is %s.\n"
-msgstr "Utdataformatet är \"%s\".\n"
-
-#: command.c:1860
-msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
-msgstr ""
-
-#: command.c:1865
-#, fuzzy, c-format
-msgid "Line style is %s.\n"
-msgstr "Ramstil är %d.\n"
-
-#: command.c:1876
-#, c-format
-msgid "Border style is %d.\n"
-msgstr "Ramstil är %d.\n"
-
-#: command.c:1888
-#, c-format
-msgid "Expanded display is on.\n"
-msgstr "Utökad visning är på.\n"
-
-#: command.c:1889
-#, c-format
-msgid "Expanded display is off.\n"
-msgstr "Utökad visning är av.\n"
-
-#: command.c:1902
-msgid "Showing locale-adjusted numeric output."
-msgstr "Visar lokal-anpassad numerisk utdata."
-
-#: command.c:1904
-msgid "Locale-adjusted numeric output is off."
-msgstr "Lokal-anpassad numerisk utdata är av."
-
-#: command.c:1917
-#, c-format
-msgid "Null display is \"%s\".\n"
-msgstr "Null-visare är \"%s\".\n"
-
-#: command.c:1929
-#, c-format
-msgid "Field separator is \"%s\".\n"
-msgstr "Fältseparatorn är \"%s\".\n"
-
-#: command.c:1943
-#, c-format
-msgid "Record separator is <newline>."
-msgstr "Postseparatorn är <nyrad>."
-
-#: command.c:1945
-#, c-format
-msgid "Record separator is \"%s\".\n"
-msgstr "Postseparatorn är \"%s\".\n"
-
-#: command.c:1959
-msgid "Showing only tuples."
-msgstr "Visar bara tupler."
-
-#: command.c:1961
-msgid "Tuples only is off."
-msgstr "Visa bara tupler är av."
-
-#: command.c:1977
-#, c-format
-msgid "Title is \"%s\".\n"
-msgstr "Titeln är \"%s\".\n"
-
-#: command.c:1979
-#, c-format
-msgid "Title is unset.\n"
-msgstr "Titeln är inte satt.\n"
-
-#: command.c:1995
-#, c-format
-msgid "Table attribute is \"%s\".\n"
-msgstr "Tabellattribut är \"%s\".\n"
-
-#: command.c:1997
-#, c-format
-msgid "Table attributes unset.\n"
-msgstr "Tabellattribut är ej satt.\n"
-
-#: command.c:2018
-msgid "Pager is used for long output."
-msgstr "Siduppdelare är på för lång utdata."
-
-#: command.c:2020
-msgid "Pager is always used."
-msgstr "Siduppdelare används alltid."
-
-#: command.c:2022
-msgid "Pager usage is off."
-msgstr "Siduppdelare är av."
-
-#: command.c:2036
-msgid "Default footer is on."
-msgstr "Standard sidfot är på."
-
-#: command.c:2038
-msgid "Default footer is off."
-msgstr "Standard sidfot är av."
-
-#: command.c:2049
-#, c-format
-msgid "Target width for \"wrapped\" format is %d.\n"
-msgstr ""
-
-#: command.c:2054
-#, c-format
-msgid "\\pset: unknown option: %s\n"
-msgstr "\\pset: okänd parameter: %s\n"
-
-#: command.c:2108
-msgid "\\!: failed\n"
-msgstr "\\!: misslyckades\n"
-
-#: common.c:45
-#, c-format
-msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgstr "%s: pg_strdup: kan inte duplicera null-pekare (internt fel)\n"
-
-#: common.c:90
-msgid "out of memory"
-msgstr "minnet slut"
-
-#: common.c:343
-msgid "connection to server was lost\n"
-msgstr "förbindelsen till servern har brutits\n"
-
-#: common.c:347
-msgid "The connection to the server was lost. Attempting reset: "
-msgstr "Förbindelsen till servern har brutits. Försöker starta om: "
-
-#: common.c:352
-msgid "Failed.\n"
-msgstr "Misslyckades.\n"
-
-#: common.c:359
-msgid "Succeeded.\n"
-msgstr "Lyckades.\n"
-
-#: common.c:493 common.c:773
-msgid "You are currently not connected to a database.\n"
-msgstr "Du är för närvarande inte uppkopplad mot en databas.\n"
-
-#: common.c:499 common.c:506 common.c:799
-#, c-format
-msgid ""
-"********* QUERY **********\n"
-"%s\n"
-"**************************\n"
-"\n"
-msgstr ""
-"********* FRÅGA **********\n"
-"%s\n"
-"**************************\n"
-"\n"
-
-#: common.c:560
-#, fuzzy, c-format
-msgid ""
-"Asynchronous notification \"%s\" with payload \"%s\" received from server "
-"process with PID %d.\n"
-msgstr "Asynkron notificering \"%s\" mottagen från serverprocess med PID %d.\n"
-
-#: common.c:563
-#, c-format
-msgid ""
-"Asynchronous notification \"%s\" received from server process with PID %d.\n"
-msgstr "Asynkron notificering \"%s\" mottagen från serverprocess med PID %d.\n"
-
-#: common.c:781
-#, c-format
-msgid ""
-"***(Single step mode: verify command)"
-"*******************************************\n"
-"%s\n"
-"***(press return to proceed or enter x and return to cancel)"
-"********************\n"
-msgstr ""
-"***(Stegningsläge: Verifiera kommando)"
-"*******************************************\n"
-"%s\n"
-"***(tryck return för att fortsätta eller skriv x och return för att avbryta)"
-"*****\n"
-
-#: common.c:832
-#, c-format
-msgid ""
-"The server (version %d.%d) does not support savepoints for "
-"ON_ERROR_ROLLBACK.\n"
-msgstr ""
-"Servern (version %d.%d) stöder inte sparpunkter för ON_ERROR_ROLLBACK.\n"
-
-#: copy.c:96
-msgid "\\copy: arguments required\n"
-msgstr "\\copy: argument krävs\n"
-
-#: copy.c:228
-#, c-format
-msgid "\\copy: parse error at \"%s\"\n"
-msgstr "\\copy: parsfel vid \"%s\"\n"
-
-#: copy.c:230
-msgid "\\copy: parse error at end of line\n"
-msgstr "\\copy: parsfel vid radslutet\n"
-
-#: copy.c:294
-#, c-format
-msgid "%s: cannot copy from/to a directory\n"
-msgstr "%s: kan inte kopiera från/till en katalog\n"
-
-#: copy.c:331
-#, c-format
-msgid "\\copy: %s"
-msgstr "\\copy: %s"
-
-#: copy.c:335 copy.c:349
-#, c-format
-msgid "\\copy: unexpected response (%d)\n"
-msgstr "\\copy: oväntat svar (%d)\n"
-
-#: copy.c:353
-msgid "trying to exit copy mode"
-msgstr ""
-
-#: copy.c:407 copy.c:417
-#, c-format
-msgid "could not write COPY data: %s\n"
-msgstr "kunde inte skriva COPY-data: %s\n"
-
-#: copy.c:424
-#, c-format
-msgid "COPY data transfer failed: %s"
-msgstr "COPY-överföring av data misslyckades: %s"
-
-#: copy.c:472
-msgid "canceled by user"
-msgstr "avbruten av användaren"
-
-#: copy.c:487
-msgid ""
-"Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
-msgstr ""
-"Mata in data som skall kopieras följt av en nyrad.\n"
-"Avsluta med bakstreck och en punkt ensamma på en rad."
-
-#: copy.c:599
-msgid "aborted because of read failure"
-msgstr "avbruten på grund av läsfel"
-
-#: help.c:52
-msgid "on"
-msgstr "på"
-
-#: help.c:52
-msgid "off"
-msgstr "av"
-
-#: help.c:74
-#, c-format
-msgid "could not get current user name: %s\n"
-msgstr "kunde inte hämta det aktuella användarnamnet: %s\n"
-
-#: help.c:86
-#, c-format
-msgid ""
-"psql is the PostgreSQL interactive terminal.\n"
-"\n"
-msgstr ""
-"psql är den interaktiva PostgreSQL-terminalen.\n"
-"\n"
-
-#: help.c:87
-#, c-format
-msgid "Usage:\n"
-msgstr "Användning:\n"
-
-#: help.c:88
-#, c-format
-msgid ""
-"  psql [OPTION]... [DBNAME [USERNAME]]\n"
-"\n"
-msgstr ""
-"  psql [FLAGGA]... [DBNAMN [ANVÄNDARNAMN]]\n"
-"\n"
-
-#: help.c:90
-#, c-format
-msgid "General options:\n"
-msgstr "Allmänna flaggor:\n"
-
-#: help.c:95
-#, c-format
-msgid ""
-"  -c, --command=COMMAND    run only single command (SQL or internal) and "
-"exit\n"
-msgstr ""
-"  -c, --command=KOMMANDO   kör ett kommando (SQL eller internt) och avsluta "
-"sedan\n"
-
-#: help.c:96
-#, c-format
-msgid ""
-"  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
-msgstr ""
-"  -d, --dbname=DBNAMN      databasnamn att koppla upp mot (standard: \"%s"
-"\")\n"
-
-#: help.c:97
-#, c-format
-msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
-msgstr "  -f, --file=FILNAMN       kör kommandon från fil och avsluta sedan\n"
-
-#: help.c:98
-#, c-format
-msgid "  -l, --list               list available databases, then exit\n"
-msgstr ""
-"  -l, --list               lista befintliga databaser och avsluta sedan\n"
-
-#: help.c:99
-#, c-format
-msgid ""
-"  -v, --set=, --variable=NAME=VALUE\n"
-"                           set psql variable NAME to VALUE\n"
-msgstr ""
-"  -v, --set=, --variale=NAMN=VÄRDE\n"
-"                           sätt psql-variabel NAMN till VÄRDE\n"
-
-#: help.c:101
-#, c-format
-msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
-msgstr "  -X, --no-psqlrc          läs inte startfilen (~/.psqlrc)\n"
-
-#: help.c:102
-#, c-format
-msgid ""
-"  -1 (\"one\"), --single-transaction\n"
-"                           execute command file as a single transaction\n"
-msgstr ""
-"  -1 (\"ett\"), --single-transaction\n"
-"                           kör kommandofilen som en transaktion\n"
-
-#: help.c:104
-#, c-format
-msgid "  --help                   show this help, then exit\n"
-msgstr "  --help                   visa denna hjälp och avsluta sedan\n"
-
-#: help.c:105
-#, c-format
-msgid "  --version                output version information, then exit\n"
-msgstr ""
-"  --version                visa versionsinformation och avsluta sedan\n"
-
-#: help.c:107
-#, c-format
-msgid ""
-"\n"
-"Input and output options:\n"
-msgstr ""
-"\n"
-"Flaggor för in-/utmatning:\n"
-
-#: help.c:108
-#, c-format
-msgid "  -a, --echo-all           echo all input from script\n"
-msgstr "  -a, --echo-all           visa all indata från skript\n"
-
-#: help.c:109
-#, c-format
-msgid "  -e, --echo-queries       echo commands sent to server\n"
-msgstr "  -e, --echo-queries       visa kommandon som skickas till servern\n"
-
-#: help.c:110
-#, c-format
-msgid ""
-"  -E, --echo-hidden        display queries that internal commands generate\n"
-msgstr "  -E, --echo-hidden        visa frågor som interna kommandon skapar\n"
-
-#: help.c:111
-#, c-format
-msgid "  -L, --log-file=FILENAME  send session log to file\n"
-msgstr "  -L, --log-file=FILENAME  skicka sessions-logg till fil\n"
-
-#: help.c:112
-#, c-format
-msgid ""
-"  -n, --no-readline        disable enhanced command line editing (readline)\n"
-msgstr ""
-"  -n, --no-readline        slå av förbättrad kommandoradsredigering "
-"(readline)\n"
-
-#: help.c:113
-#, c-format
-msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
-msgstr "  -o, --output=FILNAMN     skriv frågeresultat till fil (eller |rör)\n"
-
-#: help.c:114
-#, c-format
-msgid ""
-"  -q, --quiet              run quietly (no messages, only query output)\n"
-msgstr ""
-"  -q, --quiet              kör tyst (inga meddelanden, endast frågeutdata)\n"
-
-#: help.c:115
-#, c-format
-msgid "  -s, --single-step        single-step mode (confirm each query)\n"
-msgstr "  -s, --single-step        stegningsläge (bekräfta varje fråga)\n"
-
-#: help.c:116
-#, c-format
-msgid ""
-"  -S, --single-line        single-line mode (end of line terminates SQL "
-"command)\n"
-msgstr ""
-"  -S, --single-line        enradsläge (slutet på raden avslutar SQL-"
-"kommando)\n"
-
-#: help.c:118
-#, c-format
-msgid ""
-"\n"
-"Output format options:\n"
-msgstr ""
-"\n"
-"Flaggor för utdataformat:\n"
-
-#: help.c:119
-#, c-format
-msgid "  -A, --no-align           unaligned table output mode\n"
-msgstr "  -A, --no-align           ojusterad utskrift av tabeller\n"
-
-#: help.c:120
-#, c-format
-msgid ""
-"  -F, --field-separator=STRING\n"
-"                           set field separator (default: \"%s\")\n"
-msgstr ""
-"  -F, --field-separator=STRÄNG\n"
-"                           sätt fältseparator (standard: \"%s\")\n"
-
-#: help.c:123
-#, c-format
-msgid "  -H, --html               HTML table output mode\n"
-msgstr "  -H, --html               HTML-utskrift av tabeller\n"
-
-#: help.c:124
-#, c-format
-msgid ""
-"  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset "
-"command)\n"
-msgstr ""
-"  -P, --pset=VAR[=ARG]     sätt utskriftsvariabel VAR till ARG (se kommando "
-"\\pset)\n"
-
-#: help.c:125
-#, c-format
-msgid ""
-"  -R, --record-separator=STRING\n"
-"                           set record separator (default: newline)\n"
-msgstr ""
-"  -R, --record-separator=STRÄNG\n"
-"                           sätt postseparator (standard: newline)\n"
-
-#: help.c:127
-#, c-format
-msgid "  -t, --tuples-only        print rows only\n"
-msgstr "  -t, --tuples-only        visa endast rader\n"
-
-#: help.c:128
-#, c-format
-msgid ""
-"  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, "
-"border)\n"
-msgstr ""
-"  -T, --table-attr=TEXT    sätt HTML-tabellers flaggor (t.ex. width, "
-"border)\n"
-
-#: help.c:129
-#, c-format
-msgid "  -x, --expanded           turn on expanded table output\n"
-msgstr "  -x, --expanded           slå på utökad utsrift av tabeller\n"
-
-#: help.c:131
-#, c-format
-msgid ""
-"\n"
-"Connection options:\n"
-msgstr ""
-"\n"
-"Anslutningsflaggor:\n"
-
-#: help.c:134
-#, c-format
-msgid ""
-"  -h, --host=HOSTNAME      database server host or socket directory "
-"(default: \"%s\")\n"
-msgstr ""
-"  -h, --host=VÄRDNAMN      databasens värdnamn eller uttagkatalog (socket)\n"
-"                           (standard: \"%s\")\n"
-
-#: help.c:135
-msgid "local socket"
-msgstr "lokalt uttag (socket)"
-
-#: help.c:138
-#, c-format
-msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
-msgstr "  -p, --port=PORT          databasens serverport (standard: \"%s\")\n"
-
-#: help.c:144
-#, c-format
-msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
-msgstr ""
-"  -U, --username=ANVNAMN   användarnamn för databasen (standard: \"%s\")\n"
-
-#: help.c:145
-#, fuzzy, c-format
-msgid "  -w, --no-password        never prompt for password\n"
-msgstr "  -W, --password            fråga efter lösenord\n"
-
-#: help.c:146
-#, c-format
-msgid ""
-"  -W, --password           force password prompt (should happen "
-"automatically)\n"
-msgstr "  -W, --password           fråga om lösenord (borde ske automatiskt)\n"
-
-#: help.c:148
-#, c-format
-msgid ""
-"\n"
-"For more information, type \"\\?\" (for internal commands) or \"\\help"
-"\" (for SQL\n"
-"commands) from within psql, or consult the psql section in the PostgreSQL\n"
-"documentation.\n"
-"\n"
-msgstr ""
-"\n"
-"För mer information, skriv \"\\?\" (för interna kommandon) eller\n"
-"\"\\help\" (för SQL-kommandon) i psql, eller läs avsnittet om psql\n"
-"i PostgreSQL-dokumentationen.\n"
-
-#: help.c:151
-#, c-format
-msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
-
-#: help.c:169
-#, c-format
-msgid "General\n"
-msgstr "Allmänna\n"
-
-#: help.c:170
-#, c-format
-msgid ""
-"  \\copyright             show PostgreSQL usage and distribution terms\n"
-msgstr "  \\copyright             visa PostgreSQL-upphovsrättsinformation\n"
-
-#: help.c:171
-#, c-format
-msgid ""
-"  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
-msgstr ""
-"  \\g [FILNAMN] eller ;   kör frågan (och skriv resultatet till fil eller |"
-"rör)\n"
-
-#: help.c:172
-#, c-format
-msgid ""
-"  \\h [NAME]              help on syntax of SQL commands, * for all "
-"commands\n"
-msgstr ""
-"  \\h [NAMN]              hjälp med syntaxen för SQL-kommandon, * för alla "
-"kommandon\n"
-
-#: help.c:173
-#, c-format
-msgid "  \\q                     quit psql\n"
-msgstr "  \\q                     avsluta psql\n"
-
-#: help.c:176
-#, c-format
-msgid "Query Buffer\n"
-msgstr "Frågebuffert\n"
-
-#: help.c:177
-#, c-format
-msgid ""
-"  \\e [FILE]              edit the query buffer (or file) with external "
-"editor\n"
-msgstr ""
-"  \\e [FILNAMN]           redigera frågebufferten (eller filen) med extern "
-"redigerare\n"
-
-#: help.c:178
-#, fuzzy, c-format
-msgid ""
-"  \\ef [FUNCNAME]         edit function definition with external editor\n"
-msgstr ""
-"  \\e [FILNAMN]   redigera frågebufferten (eller filen) med extern "
-"redigerare\n"
-
-#: help.c:179
-#, c-format
-msgid "  \\p                     show the contents of the query buffer\n"
-msgstr "  \\p                     visa innehållet i frågebufferten\n"
-
-#: help.c:180
-#, c-format
-msgid "  \\r                     reset (clear) the query buffer\n"
-msgstr "  \\r                     nollställ (radera) frågebufferten\n"
-
-#: help.c:182
-#, c-format
-msgid "  \\s [FILE]              display history or save it to file\n"
-msgstr ""
-"  \\s [FILNAMN]           visa kommandohistorien eller spara den i fil\n"
-
-#: help.c:184
-#, c-format
-msgid "  \\w FILE                write query buffer to file\n"
-msgstr "  \\w FILNAMN             skriv frågebuffert till fil\n"
-
-#: help.c:187
-#, c-format
-msgid "Input/Output\n"
-msgstr "In-/Utmatning\n"
-
-#: help.c:188
-#, c-format
-msgid ""
-"  \\copy ...              perform SQL COPY with data stream to the client "
-"host\n"
-msgstr ""
-"  \\copy ...              utför SQL COPY med dataström till klientvärden\n"
-
-#: help.c:189
-#, c-format
-msgid "  \\echo [STRING]         write string to standard output\n"
-msgstr "  \\echo [TEXT]           skriv text till standard ut\n"
-
-#: help.c:190
-#, c-format
-msgid "  \\i FILE                execute commands from file\n"
-msgstr "  \\i FILNAMN             kör kommandon från fil\n"
-
-#: help.c:191
-#, c-format
-msgid "  \\o [FILE]              send all query results to file or |pipe\n"
-msgstr "  \\o [FILNAMN]           skicka frågeresultat till fil eller |rör\n"
-
-#: help.c:192
-#, c-format
-msgid ""
-"  \\qecho [STRING]        write string to query output stream (see \\o)\n"
-msgstr ""
-"  \\qecho [TEXT]          skriv text till frågeutdataströmmen (se \\o)\n"
-
-#: help.c:195
-#, c-format
-msgid "Informational\n"
-msgstr "Informationer\n"
-
-#: help.c:196
-#, c-format
-msgid "  (options: S = show system objects, + = additional detail)\n"
-msgstr "  (flaggor: S = lista systemobjekt, + = mer detaljer)\n"
-
-#: help.c:197
-#, c-format
-msgid "  \\d[S+]                 list tables, views, and sequences\n"
-msgstr "  \\d[S+]                 lista tabeller, vyer och sekvenser\n"
-
-#: help.c:198
-#, c-format
-msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
-msgstr "  \\d[S+]  NAMN           beskriv tabell, vy, sekvens eller index\n"
-
-#: help.c:199
-#, c-format
-msgid "  \\da[S]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[S]  [MALL]         lista aggregatfunktioner\n"
-
-#: help.c:200
-#, c-format
-msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
-msgstr "  \\db[+]  [MALL]         lista tabellutrymmen\n"
-
-#: help.c:201
-#, c-format
-msgid "  \\dc[S]  [PATTERN]      list conversions\n"
-msgstr "  \\dc[S]  [MALL]         lista konverteringar\n"
-
-#: help.c:202
-#, c-format
-msgid "  \\dC     [PATTERN]      list casts\n"
-msgstr "  \\dC     [MALL]         lista typomvandlingar\n"
-
-#: help.c:203
-#, c-format
-msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
-msgstr "  \\dd[S]  [MALL]         visa kommentar för objekt\n"
-
-#: help.c:204
-#, fuzzy, c-format
-msgid "  \\ddp    [PATTERN]      list default privileges\n"
-msgstr "  \\dC     [MALL]         lista typomvandlingar\n"
-
-#: help.c:205
-#, c-format
-msgid "  \\dD[S]  [PATTERN]      list domains\n"
-msgstr "  \\dD[S]  [MALL]         lista domäner\n"
-
-#: help.c:206
-#, fuzzy, c-format
-msgid "  \\des[+] [PATTERN]      list foreign servers\n"
-msgstr "  \\du [MALL]     lista användare\n"
-
-#: help.c:207
-#, fuzzy, c-format
-msgid "  \\deu[+] [PATTERN]      list user mappings\n"
-msgstr "  \\du [MALL]     lista användare\n"
-
-#: help.c:208
-#, fuzzy, c-format
-msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
-msgstr "  \\dg [MALL]     lista grupper\n"
-
-#: help.c:209
-#, c-format
-msgid ""
-"  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
-msgstr ""
-"  \\df[antw][S+] [MALL]   lista [endast agg/normala/utlösar/window] "
-"funktioner\n"
-
-#: help.c:210
-#, c-format
-msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
-msgstr "  \\dF[+]  [MALL]         lista textsökkonfigurationer\n"
-
-#: help.c:211
-#, c-format
-msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
-msgstr "  \\dFd[+] [MALL]         lista textsökordlistor\n"
-
-#: help.c:212
-#, c-format
-msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
-msgstr "  \\dFp[+] [MALL]         lista textsöktolkare\n"
-
-#: help.c:213
-#, c-format
-msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
-msgstr "  \\dFt[+] [MALL]         lista textsökmallar\n"
-
-#: help.c:214
-#, c-format
-msgid "  \\dg[+]  [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg[+]  [MALL]         lista roller (grupper)\n"
-
-#: help.c:215
-#, c-format
-msgid "  \\di[S+] [PATTERN]      list indexes\n"
-msgstr "  \\di[S+] [MALL]         lista index\n"
-
-#: help.c:216
-#, c-format
-msgid "  \\dl                    list large objects, same as \\lo_list\n"
-msgstr "  \\dl                    lista stora objekt, samma som \\lo_list\n"
-
-#: help.c:217
-#, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
-msgstr "  \\dn[+]  [MALL]         lista scheman\n"
-
-#: help.c:218
-#, c-format
-msgid "  \\do[S]  [PATTERN]      list operators\n"
-msgstr "  \\do[S]  [MALL]         lista operatorer\n"
-
-#: help.c:219
-#, c-format
-msgid ""
-"  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
-msgstr ""
-"  \\dp     [MALL]         lista åtkomsträttigheter för tabeller, vyer och "
-"sekvenser\n"
-
-#: help.c:220
-#, c-format
-msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
-msgstr ""
-
-#: help.c:221
-#, c-format
-msgid "  \\ds[S+] [PATTERN]      list sequences\n"
-msgstr "  \\ds[S+] [MALL]         lista sekvenser\n"
-
-#: help.c:222
-#, c-format
-msgid "  \\dt[S+] [PATTERN]      list tables\n"
-msgstr "  \\dt[S+] [MALL]         lista tabeller\n"
-
-#: help.c:223
-#, c-format
-msgid "  \\dT[S+] [PATTERN]      list data types\n"
-msgstr "  \\dT[S+] [MALL]         lista datatyper\n"
-
-#: help.c:224
-#, c-format
-msgid "  \\du[+]  [PATTERN]      list roles (users)\n"
-msgstr "  \\du[+]  [MALL]         lista roller (användare)\n"
-
-#: help.c:225
-#, c-format
-msgid "  \\dv[S+] [PATTERN]      list views\n"
-msgstr "  \\dv[S+] [MALL]         lista vyer\n"
-
-#: help.c:226
-#, c-format
-msgid "  \\l[+]                  list all databases\n"
-msgstr "  \\l[+]                  lista alla databaser\n"
-
-#: help.c:227
-#, c-format
-msgid "  \\z      [PATTERN]      same as \\dp\n"
-msgstr "  \\z      [MALL]         samma som \\dp\n"
-
-#: help.c:230
-#, c-format
-msgid "Formatting\n"
-msgstr "Formatering\n"
-
-#: help.c:231
-#, c-format
-msgid ""
-"  \\a                     toggle between unaligned and aligned output mode\n"
-msgstr ""
-"  \\a                     byt mellan ojusterat och justerat utdataformat\n"
-
-#: help.c:232
-#, c-format
-msgid "  \\C [STRING]            set table title, or unset if none\n"
-msgstr "  \\C [TEXT]              sätt tabelltitel, eller nollställ\n"
-
-#: help.c:233
-#, c-format
-msgid ""
-"  \\f [STRING]            show or set field separator for unaligned query "
-"output\n"
-msgstr ""
-"  \\f [TEXT]              visa eller sätt fältseparatorn för ojusterad "
-"utmatning\n"
-
-#: help.c:234
-#, c-format
-msgid "  \\H                     toggle HTML output mode (currently %s)\n"
-msgstr ""
-"  \\H                     slå på/av HTML-utskriftsläge (för närvarande: %s)\n"
-
-#: help.c:236
-#, c-format
-msgid ""
-"  \\pset NAME [VALUE]     set table output option\n"
-"                         (NAME := {format|border|expanded|fieldsep|footer|"
-"null|\n"
-"                         numericlocale|recordsep|tuples_only|title|tableattr|"
-"pager})\n"
-msgstr ""
-"  \\pset NAMN [VÄRDE]     sätt tabellutskriftsval\n"
-"                         (NAMN := {format|border|expanded|fieldsep|footer|"
-"null|\n"
-"                         numericlocale|recordsep|tuples_only|title|tableattr|"
-"pager})\n"
-
-#: help.c:239
-#, c-format
-msgid "  \\t [on|off]            show only rows (currently %s)\n"
-msgstr "  \\t [on|off]            visa endast rader (för närvarande: %s)\n"
-
-#: help.c:241
-#, c-format
-msgid ""
-"  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
-msgstr ""
-"  \\T [TEXT]              sätt HTML-tabellens <table>-attribut, eller "
-"nollställ\n"
-
-#: help.c:242
-#, c-format
-msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
-msgstr ""
-"  \\x [on|off]            slå på/av utökad utskrift (för närvarande: %s)\n"
-
-#: help.c:246
-#, c-format
-msgid "Connection\n"
-msgstr "Förbindelse\n"
-
-#: help.c:247
-#, c-format
-msgid ""
-"  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-"                         connect to new database (currently \"%s\")\n"
-msgstr ""
-"  \\c[onnect] [DBNAMN|- ANVÄNDARE|- VÄRD|- PORT|-]\n"
-"                         koppla upp mot ny databas (för närvarande \"%s\")\n"
-
-#: help.c:250
-#, c-format
-msgid "  \\encoding [ENCODING]   show or set client encoding\n"
-msgstr "  \\encoding [KODNING]    visa eller sätt klientens teckenkodning\n"
-
-#: help.c:251
-#, c-format
-msgid "  \\password [USERNAME]   securely change the password for a user\n"
-msgstr ""
-
-#: help.c:254
-#, c-format
-msgid "Operating System\n"
-msgstr "Operativsystem\n"
-
-#: help.c:255
-#, c-format
-msgid "  \\cd [DIR]              change the current working directory\n"
-msgstr "  \\cd [KATALOG]          byt den aktuella katalogen\n"
-
-#: help.c:256
-#, c-format
-msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
-msgstr ""
-"  \\timing [on|off]       slå på/av tidstagning av kommandon (för "
-"närvarande: %s)\n"
-
-#: help.c:258
-#, c-format
-msgid ""
-"  \\! [COMMAND]           execute command in shell or start interactive "
-"shell\n"
-msgstr ""
-"  \\! [KOMMANDO]          kör kommando i skal eller starta interaktivt skal\n"
-
-#: help.c:261
-#, c-format
-msgid "Variables\n"
-msgstr "Variabler\n"
-
-#: help.c:262
-#, fuzzy, c-format
-msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
-msgstr "  \\unset NAME    ta bort intern variabel\n"
-
-#: help.c:263
-#, c-format
-msgid ""
-"  \\set [NAME [VALUE]]    set internal variable, or list all if no "
-"parameters\n"
-msgstr ""
-"  \\set [NAMN [VÄRDE]]    sätt intern variabel, eller lista alla om ingen "
-"param\n"
-
-#: help.c:264
-#, c-format
-msgid "  \\unset NAME            unset (delete) internal variable\n"
-msgstr "  \\unset NAME            ta bort intern variabel\n"
-
-#: help.c:267
-#, c-format
-msgid "Large Objects\n"
-msgstr "Stora objekt\n"
-
-#: help.c:268
-#, c-format
-msgid ""
-"  \\lo_export LOBOID FILE\n"
-"  \\lo_import FILE [COMMENT]\n"
-"  \\lo_list\n"
-"  \\lo_unlink LOBOID      large object operations\n"
-msgstr ""
-"  \\lo_export LOBOID FIL\n"
-"  \\lo_import FIL [KOMMENTAR]\n"
-"  \\lo_list\n"
-"  \\lo_unlink LOBOID      operationer på stora objekt\n"
-
-#: help.c:321
-msgid "Available help:\n"
-msgstr "Tillgänglig hjälp:\n"
-
-#: help.c:410
-#, c-format
-msgid ""
-"Command:     %s\n"
-"Description: %s\n"
-"Syntax:\n"
-"%s\n"
-"\n"
-msgstr ""
-"Kommando:    %s\n"
-"Beskrivning: %s\n"
-"Syntax:\n"
-"%s\n"
-"\n"
-
-#: help.c:426
-#, c-format
-msgid ""
-"No help available for \"%s\".\n"
-"Try \\h with no arguments to see available help.\n"
-msgstr ""
-"Ingen hjälp tillgänglig för \"%s\".\n"
-"Försök med \\h utan argument för att se den tillgängliga hjälpen.\n"
-
-#: input.c:198
-#, c-format
-msgid "could not read from input file: %s\n"
-msgstr "kunde inte läsa från infilen: %s\n"
-
-#: input.c:406
-#, c-format
-msgid "could not save history to file \"%s\": %s\n"
-msgstr "kunde inte skriva kommandohistorien till \"%s\": %s\n"
-
-#: input.c:411
-msgid "history is not supported by this installation\n"
-msgstr "historia stöds inte av denna installationen\n"
-
-#: large_obj.c:66
-#, c-format
-msgid "%s: not connected to a database\n"
-msgstr "%s: ej uppkopplad mot en databas\n"
-
-#: large_obj.c:85
-#, c-format
-msgid "%s: current transaction is aborted\n"
-msgstr "%s: aktuell transaktion är avbruten\n"
-
-#: large_obj.c:88
-#, c-format
-msgid "%s: unknown transaction status\n"
-msgstr "%s: okänd transaktionsstatus\n"
-
-#: large_obj.c:289 large_obj.c:300
-msgid "ID"
-msgstr "ID"
-
-#: large_obj.c:290 describe.c:146 describe.c:334 describe.c:613 describe.c:762
-#: describe.c:2381 describe.c:2681 describe.c:3310 describe.c:3369
-msgid "Owner"
-msgstr "Ägare"
-
-#: large_obj.c:291 large_obj.c:301 describe.c:95 describe.c:158 describe.c:337
-#: describe.c:490 describe.c:566 describe.c:637 describe.c:827 describe.c:1318
-#: describe.c:2205 describe.c:2395 describe.c:2689 describe.c:2751
-#: describe.c:2887 describe.c:2926 describe.c:2993 describe.c:3052
-#: describe.c:3061 describe.c:3120
-msgid "Description"
-msgstr "Beskrivning"
-
-#: large_obj.c:310
-msgid "Large objects"
-msgstr "Stora objekt"
-
-#: mainloop.c:159
-#, c-format
-msgid "Use \"\\q\" to leave %s.\n"
-msgstr "Använd \"\\q\" för att lämna %s.\n"
-
-#: mainloop.c:189
-msgid "You are using psql, the command-line interface to PostgreSQL."
-msgstr "Du använder psql, den interaktiva PostgreSQL-terminalen."
-
-#: mainloop.c:190
-#, c-format
-msgid ""
-"Type:  \\copyright for distribution terms\n"
-"       \\h for help with SQL commands\n"
-"       \\? for help with psql commands\n"
-"       \\g or terminate with semicolon to execute query\n"
-"       \\q to quit\n"
-msgstr ""
-"Skriv:  \\copyright för upphovsrättsinformation\n"
-"        \\h för hjälp om SQL-kommandon\n"
-"        \\? för hjälp om psql-kommandon\n"
-"        \\g eller avsluta med semikolon för att köra en fråga\n"
-"        \\q för att avsluta\n"
-
-#: print.c:1138
-#, c-format
-msgid "(No rows)\n"
-msgstr "(Inga rader)\n"
-
-#: print.c:2028
-#, c-format
-msgid "Interrupted\n"
-msgstr "Avbruten\n"
-
-#: print.c:2097
-#, c-format
-msgid "Cannot add header to table content: column count of %d exceeded.\n"
-msgstr ""
-
-#: print.c:2137
-#, c-format
-msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
-msgstr ""
-
-#: print.c:2357
-#, c-format
-msgid "invalid output format (internal error): %d"
-msgstr "ogiltigt utdataformat (internt fel): %d"
-
-#: print.c:2454
-#, c-format
-msgid "(%lu row)"
-msgid_plural "(%lu rows)"
-msgstr[0] "(%lu rad)"
-msgstr[1] "(%lu rader)"
-
-#: startup.c:237
-#, c-format
-msgid "%s: could not open log file \"%s\": %s\n"
-msgstr "%s: kunde inte öppna logg-fil \"%s\": %s\n"
-
-#: startup.c:299
-#, c-format
-msgid ""
-"Type \"help\" for help.\n"
-"\n"
-msgstr ""
-"Skriv \"help\" för hjälp.\n"
-"\n"
-
-#: startup.c:445
-#, c-format
-msgid "%s: could not set printing parameter \"%s\"\n"
-msgstr "%s: kunde inte sätta utskriftsparameter \"%s\"\n"
-
-#: startup.c:484
-#, c-format
-msgid "%s: could not delete variable \"%s\"\n"
-msgstr "%s: kunde inte ta bort variabeln \"%s\"\n"
-
-#: startup.c:494
-#, c-format
-msgid "%s: could not set variable \"%s\"\n"
-msgstr "%s: kunde inte sätta variabeln \"%s\"\n"
-
-#: startup.c:531 startup.c:537
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Försök med \"%s --help\" för mer information.\n"
-
-#: startup.c:554
-#, c-format
-msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
-msgstr "%s: varning: extra kommandoradsargument \"%s\" ignorerad\n"
-
-#: startup.c:619
-msgid "contains support for command-line editing"
-msgstr "innehåller stöd för kommandoradsredigering"
-
-#: describe.c:68 describe.c:235 describe.c:462 describe.c:561 describe.c:682
-#: describe.c:763 describe.c:824 describe.c:2373 describe.c:2494
-#: describe.c:2549 describe.c:2749 describe.c:2976 describe.c:3048
-#: describe.c:3059 describe.c:3118
-msgid "Schema"
-msgstr "Schema"
-
-#: describe.c:69 describe.c:145 describe.c:236 describe.c:463 describe.c:562
-#: describe.c:612 describe.c:683 describe.c:825 describe.c:2374
-#: describe.c:2495 describe.c:2550 describe.c:2680 describe.c:2750
-#: describe.c:2977 describe.c:3049 describe.c:3060 describe.c:3119
-#: describe.c:3309 describe.c:3368
-msgid "Name"
-msgstr "Namn"
-
-#: describe.c:70 describe.c:248 describe.c:294 describe.c:311
-msgid "Result data type"
-msgstr "Resultatdatatyp"
-
-#: describe.c:84 describe.c:88 describe.c:249 describe.c:295 describe.c:312
-msgid "Argument data types"
-msgstr "Argumentdatatyp"
-
-#: describe.c:113
-msgid "List of aggregate functions"
-msgstr "Lista med aggregatfunktioner"
-
-#: describe.c:134
-#, c-format
-msgid "The server (version %d.%d) does not support tablespaces.\n"
-msgstr "Servern (version %d.%d) stöder inte tabellutrymmen.\n"
-
-#: describe.c:147
-msgid "Location"
-msgstr "Plats"
-
-#: describe.c:175
-msgid "List of tablespaces"
-msgstr "Lista med tabellutrymmen"
-
-#: describe.c:212
-#, c-format
-msgid "\\df only takes [antwS+] as options\n"
-msgstr ""
-
-#: describe.c:218
-#, c-format
-msgid "\\df does not take a \"w\" option with server version %d.%d\n"
-msgstr ""
-
-#. translator: "agg" is short for "aggregate"
-#: describe.c:251 describe.c:297 describe.c:314
-msgid "agg"
-msgstr "agg"
-
-#: describe.c:252
-msgid "window"
-msgstr ""
-
-#: describe.c:253 describe.c:298 describe.c:315 describe.c:964
-msgid "trigger"
-msgstr "utlösare"
-
-#: describe.c:254 describe.c:299 describe.c:316
-#, fuzzy
-msgid "normal"
-msgstr "Information\n"
-
-#: describe.c:255 describe.c:300 describe.c:317 describe.c:685 describe.c:767
-#: describe.c:1299 describe.c:2380 describe.c:2496 describe.c:3381
-msgid "Type"
-msgstr "Typ"
-
-#: describe.c:330
-#, fuzzy
-msgid "immutable"
-msgstr "tabell"
-
-#: describe.c:331
-#, fuzzy
-msgid "stable"
-msgstr "tabell"
-
-#: describe.c:332
-msgid "volatile"
-msgstr ""
-
-#: describe.c:333
-msgid "Volatility"
-msgstr ""
-
-#: describe.c:335
-msgid "Language"
-msgstr "Språk"
-
-#: describe.c:336
-msgid "Source code"
-msgstr "Källkod"
-
-#: describe.c:434
-msgid "List of functions"
-msgstr "Lista med funktioner"
-
-#: describe.c:473
-msgid "Internal name"
-msgstr "Internt namn"
-
-#: describe.c:474 describe.c:629 describe.c:2391
-msgid "Size"
-msgstr "Storlek"
-
-#: describe.c:486
-msgid "Elements"
-msgstr "Element"
-
-#: describe.c:530
-msgid "List of data types"
-msgstr "Lista med datatyper"
-
-#: describe.c:563
-msgid "Left arg type"
-msgstr "Vänster argumenttyp"
-
-#: describe.c:564
-msgid "Right arg type"
-msgstr "Höger argumenttyp"
-
-#: describe.c:565
-msgid "Result type"
-msgstr "Resultattyp"
-
-#: describe.c:584
-msgid "List of operators"
-msgstr "Lista med operatorer"
-
-#: describe.c:614
-msgid "Encoding"
-msgstr "Kodning"
-
-#: describe.c:619
-msgid "Collation"
-msgstr "Collation"
-
-#: describe.c:620
-msgid "Ctype"
-msgstr "Ctype"
-
-#: describe.c:633
-msgid "Tablespace"
-msgstr "Tabellutrymme"
-
-#: describe.c:650
-msgid "List of databases"
-msgstr "Lista med databaser"
-
-#: describe.c:684 describe.c:764 describe.c:919 describe.c:2375 sql_help.c:443
-#: sql_help.c:660 sql_help.c:761 sql_help.c:1177 sql_help.c:1304
-#: sql_help.c:1338 sql_help.c:1573 sql_help.c:1722 sql_help.c:1883
-#: sql_help.c:1964 sql_help.c:2158 sql_help.c:2718 sql_help.c:2738
-#: sql_help.c:2740 sql_help.c:2741
-msgid "table"
-msgstr "tabell"
-
-#: describe.c:684 describe.c:920 describe.c:2376
-msgid "view"
-msgstr "vy"
-
-#: describe.c:684 describe.c:765 describe.c:922 describe.c:2378
-msgid "sequence"
-msgstr "sekvens"
-
-#: describe.c:696
-msgid "Column access privileges"
-msgstr "Kolumnåtkomsträttigheter"
-
-#: describe.c:722 describe.c:3476 describe.c:3480
-msgid "Access privileges"
-msgstr "Åtkomsträttigheter"
-
-#: describe.c:750
-#, fuzzy, c-format
-msgid ""
-"The server (version %d.%d) does not support altering default privileges.\n"
-msgstr "Denna serverversion (%d) stöder inte tabellutrymmen.\n"
-
-#: describe.c:766 describe.c:858
-msgid "function"
-msgstr "funktion"
-
-#: describe.c:790
-msgid "Default access privileges"
-msgstr ""
-
-#: describe.c:826
-msgid "Object"
-msgstr "Objekt"
-
-#: describe.c:838
-msgid "aggregate"
-msgstr "aggregat"
-
-#: describe.c:877 sql_help.c:1456 sql_help.c:2456 sql_help.c:2524
-#: sql_help.c:2655 sql_help.c:2756 sql_help.c:2807
-msgid "operator"
-msgstr "operator"
-
-#: describe.c:896
-msgid "data type"
-msgstr "datatyp"
-
-#: describe.c:921 describe.c:2377
-msgid "index"
-msgstr "index"
-
-#: describe.c:943
-msgid "rule"
-msgstr "rule"
-
-#: describe.c:987
-msgid "Object descriptions"
-msgstr "Objektbeskrivningar"
-
-#: describe.c:1040
-#, c-format
-msgid "Did not find any relation named \"%s\".\n"
-msgstr "Kunde inte hitta en relation med namn \"%s\".\n"
-
-#: describe.c:1194
-#, c-format
-msgid "Did not find any relation with OID %s.\n"
-msgstr "Kunde inte hitta en relation med OID %s.\n"
-
-#: describe.c:1262
-#, c-format
-msgid "Table \"%s.%s\""
-msgstr "Tabell \"%s.%s\""
-
-#: describe.c:1266
-#, c-format
-msgid "View \"%s.%s\""
-msgstr "Vy \"%s.%s\""
-
-#: describe.c:1270
-#, c-format
-msgid "Sequence \"%s.%s\""
-msgstr "Sekvens \"%s.%s\""
-
-#: describe.c:1274
-#, c-format
-msgid "Index \"%s.%s\""
-msgstr "Index \"%s.%s\""
-
-#: describe.c:1279
-#, c-format
-msgid "Special relation \"%s.%s\""
-msgstr "Särskild relation \"%s.%s\""
-
-#: describe.c:1283
-#, c-format
-msgid "TOAST table \"%s.%s\""
-msgstr "TOAST-tabell \"%s.%s\""
-
-#: describe.c:1287
-#, c-format
-msgid "Composite type \"%s.%s\""
-msgstr "Sammansatt typ \"%s.%s\""
-
-#: describe.c:1298
-msgid "Column"
-msgstr "Kolumn"
-
-#: describe.c:1305
-msgid "Modifiers"
-msgstr "Modifierare"
-
-#: describe.c:1310
-msgid "Value"
-msgstr "Värde"
-
-#: describe.c:1313
-msgid "Definition"
-msgstr "Definition"
-
-#: describe.c:1317
-msgid "Storage"
-msgstr "Lagring"
-
-#: describe.c:1359
-msgid "not null"
-msgstr ""
-
-#. translator: default values of column definitions
-#: describe.c:1368
-#, c-format
-msgid "default %s"
-msgstr "default %s"
-
-#: describe.c:1459
-msgid "primary key, "
-msgstr "primärnyckel, "
-
-#: describe.c:1461
-msgid "unique, "
-msgstr "unik, "
-
-#: describe.c:1467
-#, c-format
-msgid "for table \"%s.%s\""
-msgstr "för tabell \"%s.%s\""
-
-#: describe.c:1471
-#, c-format
-msgid ", predicate (%s)"
-msgstr ", predikat (%s)"
-
-#: describe.c:1474
-msgid ", clustered"
-msgstr ", klustrad"
-
-#: describe.c:1477
-msgid ", invalid"
-msgstr ", ogiltig"
-
-#: describe.c:1480
-msgid ", deferrable"
-msgstr ""
-
-#: describe.c:1483
-msgid ", initially deferred"
-msgstr ""
-
-#: describe.c:1497
-msgid "View definition:"
-msgstr "Vydefinition:"
-
-#: describe.c:1514 describe.c:1792
-msgid "Rules:"
-msgstr "Regler:"
-
-#: describe.c:1573
-msgid "Indexes:"
-msgstr "Index:"
-
-#: describe.c:1648
-msgid "Check constraints:"
-msgstr "Kontrollvillkor:"
-
-#: describe.c:1679
-msgid "Foreign-key constraints:"
-msgstr "Främmande nyckel-villkor:"
-
-#: describe.c:1710
-msgid "Referenced by:"
-msgstr ""
-
-#: describe.c:1795
-msgid "Disabled rules:"
-msgstr ""
-
-#: describe.c:1798
-msgid "Rules firing always:"
-msgstr ""
-
-#: describe.c:1801
-msgid "Rules firing on replica only:"
-msgstr ""
-
-#: describe.c:1903
-msgid "Triggers:"
-msgstr "Utlösare:"
-
-#: describe.c:1906
-#, fuzzy
-msgid "Disabled triggers:"
-msgstr "stänger av utlösare för %s\n"
-
-#: describe.c:1909
-msgid "Triggers firing always:"
-msgstr ""
-
-#: describe.c:1912
-msgid "Triggers firing on replica only:"
-msgstr ""
-
-#: describe.c:1945
-msgid "Inherits"
-msgstr "Ärver"
-
-#: describe.c:1975
-#, c-format
-msgid "Number of child tables: %d (Use \\d+ to list them.)"
-msgstr ""
-
-#: describe.c:1982
-msgid "Child tables"
-msgstr "Barntabeller"
-
-#: describe.c:2004
-#, c-format
-msgid "Typed table of type: %s"
-msgstr ""
-
-#: describe.c:2011
-msgid "Has OIDs"
-msgstr "Har OID:er"
-
-#: describe.c:2014 describe.c:2553 describe.c:2627
-msgid "yes"
-msgstr "ja"
-
-#: describe.c:2014 describe.c:2553 describe.c:2627
-msgid "no"
-msgstr "nej"
-
-#: describe.c:2022 describe.c:3319 describe.c:3383 describe.c:3439
-msgid "Options"
-msgstr "Options"
-
-#: describe.c:2107
-#, c-format
-msgid "Tablespace: \"%s\""
-msgstr "Tabellutrymme: \"%s\""
-
-#: describe.c:2120
-#, c-format
-msgid ", tablespace \"%s\""
-msgstr ", tabellutrymme: \"%s\""
-
-#: describe.c:2198
-msgid "List of roles"
-msgstr "Lista med roller"
-
-#: describe.c:2200
-msgid "Role name"
-msgstr "Rollnamn"
-
-#: describe.c:2201
-msgid "Attributes"
-msgstr "Attribut"
-
-#: describe.c:2202
-msgid "Member of"
-msgstr "Medlem av"
-
-#: describe.c:2213
-msgid "Superuser"
-msgstr "Superanvändare"
-
-#: describe.c:2216
-msgid "No inheritance"
-msgstr ""
-
-#: describe.c:2219
-msgid "Create role"
-msgstr "Skapa roll"
-
-#: describe.c:2222
-msgid "Create DB"
-msgstr "Skapa DB"
-
-#: describe.c:2225
-msgid "Cannot login"
-msgstr ""
-
-#: describe.c:2234
-msgid "No connections"
-msgstr "Inga uppkopplingar"
-
-#: describe.c:2236
-#, c-format
-msgid "%d connection"
-msgid_plural "%d connections"
-msgstr[0] "%d uppkoppling"
-msgstr[1] "%d uppkopplingar"
-
-#: describe.c:2303
-#, c-format
-msgid "No per-database role settings support in this server version.\n"
-msgstr ""
-
-#: describe.c:2314
-#, fuzzy, c-format
-msgid "No matching settings found.\n"
-msgstr "Inga matchande relationer funna.\n"
-
-#: describe.c:2316
-#, fuzzy, c-format
-msgid "No settings found.\n"
-msgstr "Inga relationer funna.\n"
-
-#: describe.c:2321
-#, fuzzy
-msgid "List of settings"
-msgstr "Lista med relationer"
-
-#: describe.c:2379
-msgid "special"
-msgstr "särskild"
-
-#: describe.c:2386
-msgid "Table"
-msgstr "Tabell"
-
-#: describe.c:2446
-#, c-format
-msgid "No matching relations found.\n"
-msgstr "Inga matchande relationer funna.\n"
-
-#: describe.c:2448
-#, c-format
-msgid "No relations found.\n"
-msgstr "Inga relationer funna.\n"
-
-#: describe.c:2453
-msgid "List of relations"
-msgstr "Lista med relationer"
-
-#: describe.c:2497
-msgid "Modifier"
-msgstr "Modifierare"
-
-#: describe.c:2498
-msgid "Check"
-msgstr "Check"
-
-#: describe.c:2516
-msgid "List of domains"
-msgstr "Lista med domäner"
-
-#: describe.c:2551
-msgid "Source"
-msgstr "Källa"
-
-#: describe.c:2552
-msgid "Destination"
-msgstr "Mål"
-
-#: describe.c:2554
-msgid "Default?"
-msgstr "Standard?"
-
-#: describe.c:2572
-msgid "List of conversions"
-msgstr "Lista med konverteringar"
-
-#: describe.c:2624
-msgid "Source type"
-msgstr "Källtyp"
-
-#: describe.c:2625
-msgid "Target type"
-msgstr "Måltyp"
-
-#: describe.c:2626 describe.c:2886
-msgid "Function"
-msgstr "Funktion"
-
-#: describe.c:2627
-msgid "in assignment"
-msgstr "i tilldelning"
-
-#: describe.c:2628
-msgid "Implicit?"
-msgstr "Implicit?"
-
-#: describe.c:2654
-msgid "List of casts"
-msgstr "Lista med typomvandlingar"
-
-#: describe.c:2709
-msgid "List of schemas"
-msgstr "Lista med scheman"
-
-#: describe.c:2732 describe.c:2965 describe.c:3033 describe.c:3101
-#, c-format
-msgid "The server (version %d.%d) does not support full text search.\n"
-msgstr "Servern (version %d.%d) stöder inte fulltextsökning.\n"
-
-#: describe.c:2766
-msgid "List of text search parsers"
-msgstr "Lista med textsöktolkare"
-
-#: describe.c:2809
-#, c-format
-msgid "Did not find any text search parser named \"%s\".\n"
-msgstr "Kunde inte hitta en textsöktolkare med namn \"%s\".\n"
-
-#: describe.c:2884
-msgid "Start parse"
-msgstr ""
-
-#: describe.c:2885
-msgid "Method"
-msgstr ""
-
-#: describe.c:2889
-msgid "Get next token"
-msgstr ""
-
-#: describe.c:2891
-msgid "End parse"
-msgstr ""
-
-#: describe.c:2893
-msgid "Get headline"
-msgstr ""
-
-#: describe.c:2895
-msgid "Get token types"
-msgstr ""
-
-#: describe.c:2905
-#, c-format
-msgid "Text search parser \"%s.%s\""
-msgstr "Textsöktolkare \"%s.%s\""
-
-#: describe.c:2907
-#, c-format
-msgid "Text search parser \"%s\""
-msgstr "Textsöktolkare \"%s\""
-
-#: describe.c:2925
-#, fuzzy
-msgid "Token name"
-msgstr "Rollnamn"
-
-#: describe.c:2936
-#, c-format
-msgid "Token types for parser \"%s.%s\""
-msgstr ""
-
-#: describe.c:2938
-#, fuzzy, c-format
-msgid "Token types for parser \"%s\""
-msgstr "kunde inte tolka inställningen för parameter \"%s\""
-
-#: describe.c:2987
-msgid "Template"
-msgstr "Mall"
-
-#: describe.c:2988
-#, fuzzy
-msgid "Init options"
-msgstr "Generella flaggor:"
-
-#: describe.c:3010
-msgid "List of text search dictionaries"
-msgstr "Lista med textsökordlistor"
-
-#: describe.c:3050
-msgid "Init"
-msgstr "Init"
-
-#: describe.c:3051
-#, fuzzy
-msgid "Lexize"
-msgstr "Storlek"
-
-#: describe.c:3078
-msgid "List of text search templates"
-msgstr "Lista med textsökmallar"
-
-#: describe.c:3135
-msgid "List of text search configurations"
-msgstr "Lista med textsökkonfigurationer"
-
-#: describe.c:3179
-#, c-format
-msgid "Did not find any text search configuration named \"%s\".\n"
-msgstr "Kunde inte hitta en textsökkonfiguration med namn \"%s\".\n"
-
-#: describe.c:3245
-msgid "Token"
-msgstr ""
-
-#: describe.c:3246
-msgid "Dictionaries"
-msgstr "Ordlistor"
-
-#: describe.c:3257
-#, c-format
-msgid "Text search configuration \"%s.%s\""
-msgstr "Textsökkonfiguration \"%s.%s\""
-
-#: describe.c:3260
-#, c-format
-msgid "Text search configuration \"%s\""
-msgstr "Textsökkonfiguration \"%s\""
-
-#: describe.c:3264
-#, c-format
-msgid ""
-"\n"
-"Parser: \"%s.%s\""
-msgstr ""
-"\n"
-"Tolkare: \"%s.%s\""
-
-#: describe.c:3267
-#, c-format
-msgid ""
-"\n"
-"Parser: \"%s\""
-msgstr ""
-"\n"
-"Tolkare: \"%s\""
-
-#: describe.c:3299
-#, fuzzy, c-format
-msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
-msgstr "Denna serverversion (%d) stöder inte tabellutrymmen.\n"
-
-#: describe.c:3311
-msgid "Validator"
-msgstr ""
-
-#: describe.c:3335
-#, fuzzy
-msgid "List of foreign-data wrappers"
-msgstr "Lista med datatyper"
-
-#: describe.c:3358
-#, fuzzy, c-format
-msgid "The server (version %d.%d) does not support foreign servers.\n"
-msgstr "Denna serverversion (%d) stöder inte tabellutrymmen.\n"
-
-#: describe.c:3370
-msgid "Foreign-data wrapper"
-msgstr ""
-
-#: describe.c:3382
-msgid "Version"
-msgstr "Version"
-
-#: describe.c:3401
-#, fuzzy
-msgid "List of foreign servers"
-msgstr "Lista med konverteringar"
-
-#: describe.c:3424
-#, fuzzy, c-format
-msgid "The server (version %d.%d) does not support user mappings.\n"
-msgstr "Denna serverversion (%d) stöder inte tabellutrymmen.\n"
-
-#: describe.c:3433
-msgid "Server"
-msgstr "Server"
-
-#: describe.c:3434
-msgid "User name"
-msgstr "Användarnamn"
-
-#: describe.c:3454
-#, fuzzy
-msgid "List of user mappings"
-msgstr "Lista av domäner"
-
-#: sql_help.h:173 sql_help.h:788
-msgid "abort the current transaction"
-msgstr "avbryt aktuell transaktion"
-
-#: sql_help.h:178
-msgid "change the definition of an aggregate function"
-msgstr "ändra definitionen av en aggregatfunktion"
-
-#: sql_help.h:183
-msgid "change the definition of a conversion"
-msgstr "ändra definitionen av en konvertering"
-
-#: sql_help.h:188
-msgid "change a database"
-msgstr "ändra en databas"
-
-#: sql_help.h:193
-msgid "define default access privileges"
-msgstr ""
-
-#: sql_help.h:198
-msgid "change the definition of a domain"
-msgstr "ändra definitionen av en domän"
-
-#: sql_help.h:203
-#, fuzzy
-msgid "change the definition of a foreign-data wrapper"
-msgstr "ändra definitionen av en utlösare"
-
-#: sql_help.h:208
-msgid "change the definition of a function"
-msgstr "ändra definitionen av en funktion"
-
-#: sql_help.h:213
-msgid "change role name or membership"
-msgstr "ändra rollnamn eller medlemskap"
-
-#: sql_help.h:218
-msgid "change the definition of an index"
-msgstr "ändra definitionen av ett index"
-
-#: sql_help.h:223
-msgid "change the definition of a procedural language"
-msgstr "ändra definitionen av ett procedur-språk"
-
-#: sql_help.h:228
-#, fuzzy
-msgid "change the definition of a large object"
-msgstr "ändra definitionen av en tabell"
-
-#: sql_help.h:233
-msgid "change the definition of an operator"
-msgstr "ändra definitionen av en operator"
-
-#: sql_help.h:238
-msgid "change the definition of an operator class"
-msgstr "ändra definitionen av en operatorklass"
-
-#: sql_help.h:243
-msgid "change the definition of an operator family"
-msgstr "ändra definitionen av en operatorfamilj"
-
-#: sql_help.h:248 sql_help.h:308
-msgid "change a database role"
-msgstr "ändra databasroll"
-
-#: sql_help.h:253
-msgid "change the definition of a schema"
-msgstr "ändra definitionen av ett schema"
-
-#: sql_help.h:258
-msgid "change the definition of a sequence generator"
-msgstr "ändra definitionen av en sekvensgenerator"
-
-#: sql_help.h:263
-#, fuzzy
-msgid "change the definition of a foreign server"
-msgstr "ändra definitionen av en utlösare"
-
-#: sql_help.h:268
-msgid "change the definition of a table"
-msgstr "ändra definitionen av en tabell"
-
-#: sql_help.h:273
-msgid "change the definition of a tablespace"
-msgstr "ändra definitionen av ett tabellutrymme"
-
-#: sql_help.h:278
-msgid "change the definition of a text search configuration"
-msgstr "ändra definitionen av en textsökkonfiguration"
-
-#: sql_help.h:283
-msgid "change the definition of a text search dictionary"
-msgstr "ändra definitionen av en textsökordlista"
-
-#: sql_help.h:288
-msgid "change the definition of a text search parser"
-msgstr "ändra definitionen av en textsöktolkare"
-
-#: sql_help.h:293
-msgid "change the definition of a text search template"
-msgstr "ändra definitionen av en textsökmall"
-
-#: sql_help.h:298
-msgid "change the definition of a trigger"
-msgstr "ändra definitionen av en utlösare"
-
-#: sql_help.h:303
-msgid "change the definition of a type"
-msgstr "ändra definitionen av en typ"
-
-#: sql_help.h:313
-#, fuzzy
-msgid "change the definition of a user mapping"
-msgstr "ändra definitionen av en domän"
-
-#: sql_help.h:318
-msgid "change the definition of a view"
-msgstr "ändra definitionen av en vy"
-
-#: sql_help.h:323
-msgid "collect statistics about a database"
-msgstr "samla in statistik om en databas"
-
-#: sql_help.h:328 sql_help.h:848
-msgid "start a transaction block"
-msgstr "starta ett transaktionsblock"
-
-#: sql_help.h:333
-msgid "force a transaction log checkpoint"
-msgstr "tvinga transaktionsloggen att göra en checkpoint"
-
-#: sql_help.h:338
-msgid "close a cursor"
-msgstr "stäng en markör"
-
-#: sql_help.h:343
-msgid "cluster a table according to an index"
-msgstr "klustra en tabell efter ett index"
-
-#: sql_help.h:348
-msgid "define or change the comment of an object"
-msgstr "definiera eller ändra en kommentar på ett objekt"
-
-#: sql_help.h:353 sql_help.h:698
-msgid "commit the current transaction"
-msgstr "utför den aktuella transaktionen"
-
-#: sql_help.h:358
-msgid "commit a transaction that was earlier prepared for two-phase commit"
-msgstr ""
-"utför commit på en transaktion som tidigare förberetts för två-fas-commit"
-
-#: sql_help.h:363
-msgid "copy data between a file and a table"
-msgstr "kopiera data mellan en fil och en tabell"
-
-#: sql_help.h:368
-msgid "define a new aggregate function"
-msgstr "definiera en ny aggregatfunktion"
-
-#: sql_help.h:373
-msgid "define a new cast"
-msgstr "definiera en ny typomvandling"
-
-#: sql_help.h:378
-msgid "define a new constraint trigger"
-msgstr "definiera en ny villkorsutlösare"
-
-#: sql_help.h:383
-msgid "define a new encoding conversion"
-msgstr "definiera en ny teckenkodningskonvertering"
-
-#: sql_help.h:388
-msgid "create a new database"
-msgstr "skapa en ny databas"
-
-#: sql_help.h:393
-msgid "define a new domain"
-msgstr "definiera en ny domän"
-
-#: sql_help.h:398
-#, fuzzy
-msgid "define a new foreign-data wrapper"
-msgstr "definiera en ny datatyp"
-
-#: sql_help.h:403
-msgid "define a new function"
-msgstr "definiera en ny funktion"
-
-#: sql_help.h:408 sql_help.h:438 sql_help.h:508
-msgid "define a new database role"
-msgstr "definiera en ny databasroll"
-
-#: sql_help.h:413
-msgid "define a new index"
-msgstr "skapa ett nytt index"
-
-#: sql_help.h:418
-msgid "define a new procedural language"
-msgstr "definiera ett nytt procedur-språk"
-
-#: sql_help.h:423
-msgid "define a new operator"
-msgstr "definiera en ny operator"
-
-#: sql_help.h:428
-msgid "define a new operator class"
-msgstr "definiera en ny operatorklass"
-
-#: sql_help.h:433
-msgid "define a new operator family"
-msgstr "definiera en ny operatorfamilj"
-
-#: sql_help.h:443
-msgid "define a new rewrite rule"
-msgstr "definiera en ny omskrivningsregel"
-
-#: sql_help.h:448
-msgid "define a new schema"
-msgstr "definiera ett nytt schema"
-
-#: sql_help.h:453
-msgid "define a new sequence generator"
-msgstr "definiera en ny sekvensgenerator"
-
-#: sql_help.h:458
-#, fuzzy
-msgid "define a new foreign server"
-msgstr "definiera en ny utlösare"
-
-#: sql_help.h:463
-msgid "define a new table"
-msgstr "definiera en ny tabell"
-
-#: sql_help.h:468 sql_help.h:813
-msgid "define a new table from the results of a query"
-msgstr "definiera en ny tabell utifrån resultatet av en fråga"
-
-#: sql_help.h:473
-msgid "define a new tablespace"
-msgstr "definiera ett nytt tabellutrymme"
-
-#: sql_help.h:478
-msgid "define a new text search configuration"
-msgstr "definiera en ny textsökkonfiguration"
-
-#: sql_help.h:483
-msgid "define a new text search dictionary"
-msgstr "definiera en ny textsökordlista"
-
-#: sql_help.h:488
-msgid "define a new text search parser"
-msgstr "definiera en ny textsöktolkare"
-
-#: sql_help.h:493
-msgid "define a new text search template"
-msgstr "definiera en ny textsökmall"
-
-#: sql_help.h:498
-msgid "define a new trigger"
-msgstr "definiera en ny utlösare"
-
-#: sql_help.h:503
-msgid "define a new data type"
-msgstr "definiera en ny datatyp"
-
-#: sql_help.h:513
-msgid "define a new mapping of a user to a foreign server"
-msgstr ""
-
-#: sql_help.h:518
-msgid "define a new view"
-msgstr "definiera en ny vy"
-
-#: sql_help.h:523
-msgid "deallocate a prepared statement"
-msgstr "deallokera en förberedd sats"
-
-#: sql_help.h:528
-msgid "define a cursor"
-msgstr "definiera en markör"
-
-#: sql_help.h:533
-msgid "delete rows of a table"
-msgstr "radera rader i en tabell"
-
-#: sql_help.h:538
-msgid "discard session state"
-msgstr ""
-
-#: sql_help.h:543
-msgid "execute an anonymous code block"
-msgstr ""
-
-#: sql_help.h:548
-msgid "remove an aggregate function"
-msgstr "ta bort en aggregatfunktioner"
-
-#: sql_help.h:553
-msgid "remove a cast"
-msgstr "ta bort en typomvandling"
-
-#: sql_help.h:558
-msgid "remove a conversion"
-msgstr "ta bort en konvertering"
-
-#: sql_help.h:563
-msgid "remove a database"
-msgstr "ta bort en databas"
-
-#: sql_help.h:568
-msgid "remove a domain"
-msgstr "ta bort en domän"
-
-#: sql_help.h:573
-#, fuzzy
-msgid "remove a foreign-data wrapper"
-msgstr "ta bort en datatyp"
-
-#: sql_help.h:578
-msgid "remove a function"
-msgstr "ta bort en funktion"
-
-#: sql_help.h:583 sql_help.h:618 sql_help.h:683
-msgid "remove a database role"
-msgstr "ta bort en databasroll"
-
-#: sql_help.h:588
-msgid "remove an index"
-msgstr "ta bort ett index"
-
-#: sql_help.h:593
-msgid "remove a procedural language"
-msgstr "ta bort ett procedur-språk"
-
-#: sql_help.h:598
-msgid "remove an operator"
-msgstr "ta bort en operator"
-
-#: sql_help.h:603
-msgid "remove an operator class"
-msgstr "ta bort en operatorklass"
-
-#: sql_help.h:608
-msgid "remove an operator family"
-msgstr "ta bort en operatorfamilj"
-
-#: sql_help.h:613
-msgid "remove database objects owned by a database role"
-msgstr "ta bort databasobjekt som ägs av databasroll"
-
-#: sql_help.h:623
-msgid "remove a rewrite rule"
-msgstr "ta bort en omskrivningsregel"
-
-#: sql_help.h:628
-msgid "remove a schema"
-msgstr "ta bort ett schema"
-
-#: sql_help.h:633
-msgid "remove a sequence"
-msgstr "ta bort en sekvens"
-
-#: sql_help.h:638
-#, fuzzy
-msgid "remove a foreign server descriptor"
-msgstr "ta bort en konvertering"
-
-#: sql_help.h:643
-msgid "remove a table"
-msgstr "ta bort en tabell"
-
-#: sql_help.h:648
-msgid "remove a tablespace"
-msgstr "ta bort ett tabellutrymme"
-
-#: sql_help.h:653
-msgid "remove a text search configuration"
-msgstr "ta bort en textsökkonfiguration"
-
-#: sql_help.h:658
-msgid "remove a text search dictionary"
-msgstr "ta bort en textsökordlista"
-
-#: sql_help.h:663
-msgid "remove a text search parser"
-msgstr "ta bort en textsöktolkare"
-
-#: sql_help.h:668
-msgid "remove a text search template"
-msgstr "ta bort en textsökmall"
-
-#: sql_help.h:673
-msgid "remove a trigger"
-msgstr "ta bort en utlösare"
-
-#: sql_help.h:678
-msgid "remove a data type"
-msgstr "ta bort en datatyp"
-
-#: sql_help.h:688
-msgid "remove a user mapping for a foreign server"
-msgstr ""
-
-#: sql_help.h:693
-msgid "remove a view"
-msgstr "ta bort en vy"
-
-#: sql_help.h:703
-msgid "execute a prepared statement"
-msgstr "utför en förberedd sats"
-
-#: sql_help.h:708
-msgid "show the execution plan of a statement"
-msgstr "visa körningsplanen för en sats"
-
-#: sql_help.h:713
-msgid "retrieve rows from a query using a cursor"
-msgstr "hämta rader från en fråga med hjälp av en markör"
-
-#: sql_help.h:718
-msgid "define access privileges"
-msgstr "definera åtkomsträttigheter"
-
-#: sql_help.h:723
-msgid "create new rows in a table"
-msgstr "skapa nya rader i en tabell"
-
-#: sql_help.h:728
-msgid "listen for a notification"
-msgstr "lyssna efter notifiering"
-
-#: sql_help.h:733
-msgid "load a shared library file"
-msgstr "ladda en delad biblioteksfil (shared library)"
-
-#: sql_help.h:738
-msgid "lock a table"
-msgstr "lås en tabell"
-
-#: sql_help.h:743
-msgid "position a cursor"
-msgstr "flytta en markör"
-
-#: sql_help.h:748
-msgid "generate a notification"
-msgstr "generera en notifiering"
-
-#: sql_help.h:753
-msgid "prepare a statement for execution"
-msgstr "förbered en sats för körning"
-
-#: sql_help.h:758
-msgid "prepare the current transaction for two-phase commit"
-msgstr "avbryt aktuell transaktion för två-fas-commit"
-
-#: sql_help.h:763
-msgid "change the ownership of database objects owned by a database role"
-msgstr "byt ägare på databasobjekt som ägs av en databasroll"
-
-#: sql_help.h:768
-msgid "rebuild indexes"
-msgstr "återskapa index"
-
-#: sql_help.h:773
-msgid "destroy a previously defined savepoint"
-msgstr "ta bort en tidigare definierad sparpunkt"
-
-#: sql_help.h:778
-msgid "restore the value of a run-time parameter to the default value"
-msgstr "återställ värde av körningsparameter till standardvärdet"
-
-#: sql_help.h:783
-msgid "remove access privileges"
-msgstr "ta bort åtkomsträttigheter"
-
-#: sql_help.h:793
-msgid "cancel a transaction that was earlier prepared for two-phase commit"
-msgstr "avbryt en transaktion som tidigare förberetts för två-fas-commit"
-
-#: sql_help.h:798
-msgid "roll back to a savepoint"
-msgstr "rulla tillbaka till sparpunkt"
-
-#: sql_help.h:803
-msgid "define a new savepoint within the current transaction"
-msgstr "definera en ny sparpunkt i den aktuella transaktionen"
-
-#: sql_help.h:808 sql_help.h:853 sql_help.h:883
-msgid "retrieve rows from a table or view"
-msgstr "hämta rader från en tabell eller vy"
-
-#: sql_help.h:818
-msgid "change a run-time parameter"
-msgstr "ändra en körningsparamter"
-
-#: sql_help.h:823
-#, fuzzy
-msgid "set constraint check timing for the current transaction"
-msgstr "sätt integritetsvillkorsläge för nuvarande transaktion"
-
-#: sql_help.h:828
-msgid "set the current user identifier of the current session"
-msgstr "sätt användare för den aktiva sessionen"
-
-#: sql_help.h:833
-msgid ""
-"set the session user identifier and the current user identifier of the "
-"current session"
-msgstr ""
-"sätt sessionsanvändaridentifierare och nuvarande användaridentifierare för "
-"den aktiva sessionen"
-
-#: sql_help.h:838
-msgid "set the characteristics of the current transaction"
-msgstr "sätt inställningar för nuvarande transaktionen"
-
-#: sql_help.h:843
-msgid "show the value of a run-time parameter"
-msgstr "visa värde på en körningsparameter"
-
-#: sql_help.h:858
-msgid "empty a table or set of tables"
-msgstr "töm en eller flera tabeller"
-
-#: sql_help.h:863
-msgid "stop listening for a notification"
-msgstr "sluta att lyssna efter notifiering"
-
-#: sql_help.h:868
-msgid "update rows of a table"
-msgstr "uppdatera rader i en tabell"
-
-#: sql_help.h:873
-msgid "garbage-collect and optionally analyze a database"
-msgstr "skräpsamla och eventuellt analysera en databas"
-
-#: sql_help.h:878
-msgid "compute a set of rows"
-msgstr "beräkna en mängd rader"
-
-#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:43 sql_help.c:45
-#: sql_help.c:69 sql_help.c:73 sql_help.c:75 sql_help.c:77 sql_help.c:79
-#: sql_help.c:82 sql_help.c:84 sql_help.c:86 sql_help.c:161 sql_help.c:163
-#: sql_help.c:164 sql_help.c:166 sql_help.c:168 sql_help.c:170 sql_help.c:182
-#: sql_help.c:186 sql_help.c:214 sql_help.c:219 sql_help.c:224 sql_help.c:229
-#: sql_help.c:267 sql_help.c:269 sql_help.c:271 sql_help.c:274 sql_help.c:284
-#: sql_help.c:286 sql_help.c:304 sql_help.c:316 sql_help.c:319 sql_help.c:338
-#: sql_help.c:349 sql_help.c:357 sql_help.c:360 sql_help.c:389 sql_help.c:395
-#: sql_help.c:397 sql_help.c:401 sql_help.c:404 sql_help.c:407 sql_help.c:417
-#: sql_help.c:419 sql_help.c:436 sql_help.c:445 sql_help.c:447 sql_help.c:449
-#: sql_help.c:513 sql_help.c:515 sql_help.c:518 sql_help.c:520 sql_help.c:570
-#: sql_help.c:572 sql_help.c:574 sql_help.c:577 sql_help.c:597 sql_help.c:600
-#: sql_help.c:603 sql_help.c:606 sql_help.c:610 sql_help.c:612 sql_help.c:614
-#: sql_help.c:627 sql_help.c:630 sql_help.c:632 sql_help.c:641 sql_help.c:650
-#: sql_help.c:659 sql_help.c:671 sql_help.c:673 sql_help.c:675 sql_help.c:703
-#: sql_help.c:709 sql_help.c:711 sql_help.c:714 sql_help.c:716 sql_help.c:718
-#: sql_help.c:743 sql_help.c:746 sql_help.c:748 sql_help.c:750 sql_help.c:752
-#: sql_help.c:791 sql_help.c:962 sql_help.c:969 sql_help.c:1015
-#: sql_help.c:1030 sql_help.c:1048 sql_help.c:1070 sql_help.c:1086
-#: sql_help.c:1112 sql_help.c:1154 sql_help.c:1176 sql_help.c:1195
-#: sql_help.c:1196 sql_help.c:1213 sql_help.c:1233 sql_help.c:1254
-#: sql_help.c:1281 sql_help.c:1302 sql_help.c:1332 sql_help.c:1512
-#: sql_help.c:1525 sql_help.c:1542 sql_help.c:1558 sql_help.c:1571
-#: sql_help.c:1610 sql_help.c:1613 sql_help.c:1615 sql_help.c:1632
-#: sql_help.c:1658 sql_help.c:1691 sql_help.c:1701 sql_help.c:1710
-#: sql_help.c:1752 sql_help.c:1770 sql_help.c:1778 sql_help.c:1786
-#: sql_help.c:1794 sql_help.c:1803 sql_help.c:1814 sql_help.c:1822
-#: sql_help.c:1830 sql_help.c:1838 sql_help.c:1848 sql_help.c:1857
-#: sql_help.c:1866 sql_help.c:1874 sql_help.c:1882 sql_help.c:1891
-#: sql_help.c:1899 sql_help.c:1915 sql_help.c:1931 sql_help.c:1939
-#: sql_help.c:1947 sql_help.c:1955 sql_help.c:1963 sql_help.c:1972
-#: sql_help.c:1980 sql_help.c:1997 sql_help.c:2012 sql_help.c:2192
-#: sql_help.c:2220 sql_help.c:2247 sql_help.c:2548 sql_help.c:2593
-#: sql_help.c:2697
-msgid "name"
-msgstr "namn"
-
-#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:524 sql_help.c:528
-#: sql_help.c:1753
-msgid "type"
-msgstr "typ"
-
-#: sql_help.c:28 sql_help.c:44 sql_help.c:74 sql_help.c:223 sql_help.c:256
-#: sql_help.c:268 sql_help.c:285 sql_help.c:318 sql_help.c:359 sql_help.c:396
-#: sql_help.c:418 sql_help.c:448 sql_help.c:519 sql_help.c:571 sql_help.c:613
-#: sql_help.c:631 sql_help.c:642 sql_help.c:651 sql_help.c:661 sql_help.c:672
-#: sql_help.c:710 sql_help.c:751
-msgid "new_name"
-msgstr "nytt_namn"
-
-#: sql_help.c:31 sql_help.c:46 sql_help.c:76 sql_help.c:169 sql_help.c:187
-#: sql_help.c:228 sql_help.c:287 sql_help.c:296 sql_help.c:307 sql_help.c:321
-#: sql_help.c:362 sql_help.c:420 sql_help.c:446 sql_help.c:465 sql_help.c:558
-#: sql_help.c:573 sql_help.c:615 sql_help.c:633 sql_help.c:674 sql_help.c:749
-msgid "new_owner"
-msgstr "ny_ägare"
-
-#: sql_help.c:34 sql_help.c:171 sql_help.c:233 sql_help.c:450 sql_help.c:521
-#: sql_help.c:676 sql_help.c:753
-msgid "new_schema"
-msgstr "nytt_schema"
-
-#: sql_help.c:70 sql_help.c:184 sql_help.c:390 sql_help.c:462 sql_help.c:628
-#: sql_help.c:704 sql_help.c:730 sql_help.c:922 sql_help.c:927 sql_help.c:1088
-#: sql_help.c:1155 sql_help.c:1282 sql_help.c:1353 sql_help.c:1527
-#: sql_help.c:1659 sql_help.c:1681
-#, fuzzy
-msgid "option"
-msgstr "Options"
-
-#: sql_help.c:71 sql_help.c:391 sql_help.c:705 sql_help.c:1156 sql_help.c:1283
-#: sql_help.c:1660
-#, fuzzy
-msgid "where option can be:"
-msgstr ""
-"\n"
-"Andra flaggor:\n"
-
-#: sql_help.c:72 sql_help.c:392 sql_help.c:706 sql_help.c:1055 sql_help.c:1284
-#: sql_help.c:1661
-msgid "connlimit"
-msgstr "anslutningstak"
-
-#: sql_help.c:78 sql_help.c:559
-msgid "new_tablespace"
-msgstr "nytt_tabellutrymme"
-
-#: sql_help.c:80 sql_help.c:83 sql_help.c:85 sql_help.c:237 sql_help.c:239
-#: sql_help.c:240 sql_help.c:399 sql_help.c:403 sql_help.c:406 sql_help.c:712
-#: sql_help.c:715 sql_help.c:717 sql_help.c:1123 sql_help.c:2264
-#: sql_help.c:2537
-msgid "configuration_parameter"
-msgstr "konfigurationsparameter"
-
-#: sql_help.c:81 sql_help.c:185 sql_help.c:238 sql_help.c:273 sql_help.c:400
-#: sql_help.c:463 sql_help.c:538 sql_help.c:554 sql_help.c:576 sql_help.c:629
-#: sql_help.c:713 sql_help.c:731 sql_help.c:1089 sql_help.c:1124
-#: sql_help.c:1125 sql_help.c:1183 sql_help.c:1354 sql_help.c:1427
-#: sql_help.c:1436 sql_help.c:1467 sql_help.c:1489 sql_help.c:1528
-#: sql_help.c:1682 sql_help.c:2538 sql_help.c:2539
-msgid "value"
-msgstr "värde"
-
-#: sql_help.c:133
-#, fuzzy
-msgid "target_role"
-msgstr "Skapa roll"
-
-#: sql_help.c:134 sql_help.c:1317 sql_help.c:2118 sql_help.c:2125
-#: sql_help.c:2137 sql_help.c:2143 sql_help.c:2347 sql_help.c:2354
-#: sql_help.c:2366 sql_help.c:2372
-msgid "schema_name"
-msgstr "schemanamn"
-
-#: sql_help.c:135
-msgid "abbreviated_grant_or_revoke"
-msgstr ""
-
-#: sql_help.c:136
-msgid "where abbreviated_grant_or_revoke is one of:"
-msgstr ""
-
-#: sql_help.c:137 sql_help.c:138 sql_help.c:139 sql_help.c:140 sql_help.c:141
-#: sql_help.c:142 sql_help.c:1159 sql_help.c:1160 sql_help.c:1161
-#: sql_help.c:1162 sql_help.c:1163 sql_help.c:1287 sql_help.c:1288
-#: sql_help.c:1289 sql_help.c:1290 sql_help.c:1291 sql_help.c:1664
-#: sql_help.c:1665 sql_help.c:1666 sql_help.c:1667 sql_help.c:1668
-#: sql_help.c:2119 sql_help.c:2123 sql_help.c:2126 sql_help.c:2128
-#: sql_help.c:2130 sql_help.c:2132 sql_help.c:2138 sql_help.c:2140
-#: sql_help.c:2142 sql_help.c:2144 sql_help.c:2146 sql_help.c:2147
-#: sql_help.c:2148 sql_help.c:2348 sql_help.c:2352 sql_help.c:2355
-#: sql_help.c:2357 sql_help.c:2359 sql_help.c:2361 sql_help.c:2367
-#: sql_help.c:2369 sql_help.c:2371 sql_help.c:2373 sql_help.c:2375
-#: sql_help.c:2376 sql_help.c:2377 sql_help.c:2558
-msgid "role_name"
-msgstr "rollnamn"
-
-#: sql_help.c:162 sql_help.c:529 sql_help.c:531 sql_help.c:745 sql_help.c:1072
-#: sql_help.c:1076 sql_help.c:1180 sql_help.c:1440 sql_help.c:1449
-#: sql_help.c:1471 sql_help.c:2160 sql_help.c:2445 sql_help.c:2446
-#: sql_help.c:2450 sql_help.c:2455 sql_help.c:2512 sql_help.c:2513
-#: sql_help.c:2518 sql_help.c:2523 sql_help.c:2644 sql_help.c:2645
-#: sql_help.c:2649 sql_help.c:2654 sql_help.c:2721 sql_help.c:2723
-#: sql_help.c:2754 sql_help.c:2796 sql_help.c:2797 sql_help.c:2801
-#: sql_help.c:2806
-msgid "expression"
-msgstr "uttryck"
-
-#: sql_help.c:165
-msgid "domain_constraint"
-msgstr "domain_villkor"
-
-#: sql_help.c:167 sql_help.c:543 sql_help.c:845 sql_help.c:1075
-#: sql_help.c:1439 sql_help.c:1448
-msgid "constraint_name"
-msgstr "villkorsnamn"
-
-#: sql_help.c:183 sql_help.c:1087 sql_help.c:1199
-msgid "valfunction"
-msgstr "val-funktion"
-
-#: sql_help.c:215 sql_help.c:220 sql_help.c:225 sql_help.c:230 sql_help.c:851
-#: sql_help.c:1113 sql_help.c:1804 sql_help.c:2134 sql_help.c:2363
-msgid "argmode"
-msgstr "arg_läge"
-
-#: sql_help.c:216 sql_help.c:221 sql_help.c:226 sql_help.c:231 sql_help.c:852
-#: sql_help.c:1114 sql_help.c:1805
-msgid "argname"
-msgstr "arg_namn"
-
-#: sql_help.c:217 sql_help.c:222 sql_help.c:227 sql_help.c:232 sql_help.c:853
-#: sql_help.c:1115 sql_help.c:1806
-msgid "argtype"
-msgstr "arg_typ"
-
-#: sql_help.c:218 sql_help.c:514 sql_help.c:1445 sql_help.c:1446
-#: sql_help.c:1462 sql_help.c:1463
-msgid "action"
-msgstr "aktion"
-
-#: sql_help.c:234 sql_help.c:522
-msgid "where action is one of:"
-msgstr "där aktion är en av:"
-
-#: sql_help.c:235 sql_help.c:1121
-#, fuzzy
-msgid "execution_cost"
-msgstr "kör %s %s\n"
-
-#: sql_help.c:236 sql_help.c:1122
-msgid "result_rows"
-msgstr ""
-
-#: sql_help.c:251 sql_help.c:253 sql_help.c:255
-msgid "group_name"
-msgstr "gruppnamn"
-
-#: sql_help.c:252 sql_help.c:254 sql_help.c:728 sql_help.c:1049
-#: sql_help.c:1318 sql_help.c:1320 sql_help.c:1500 sql_help.c:1679
-#: sql_help.c:1988 sql_help.c:2568
-msgid "user_name"
-msgstr "användarnamn"
-
-#: sql_help.c:270 sql_help.c:1499 sql_help.c:1923 sql_help.c:2145
-#: sql_help.c:2374
-msgid "tablespace_name"
-msgstr "tabellutrymmesnamn"
-
-#: sql_help.c:272 sql_help.c:275 sql_help.c:553 sql_help.c:555 sql_help.c:1182
-#: sql_help.c:1426 sql_help.c:1435 sql_help.c:1466 sql_help.c:1488
-msgid "storage_parameter"
-msgstr "lagringsparameter"
-
-#: sql_help.c:295 sql_help.c:855
-msgid "large_object_oid"
-msgstr "stort_objekt_oid"
-
-#: sql_help.c:305 sql_help.c:857 sql_help.c:1215 sql_help.c:1839
-msgid "left_type"
-msgstr "vänster_typ"
-
-#: sql_help.c:306 sql_help.c:858 sql_help.c:1216 sql_help.c:1840
-msgid "right_type"
-msgstr "höger_typ"
-
-#: sql_help.c:317 sql_help.c:320 sql_help.c:339 sql_help.c:350 sql_help.c:358
-#: sql_help.c:361 sql_help.c:860 sql_help.c:862 sql_help.c:1235
-#: sql_help.c:1255 sql_help.c:1454 sql_help.c:1849 sql_help.c:1858
-msgid "index_method"
-msgstr "indexmetod"
-
-#: sql_help.c:340 sql_help.c:351 sql_help.c:1237
-msgid "strategy_number"
-msgstr "strateginummer"
-
-#: sql_help.c:341 sql_help.c:856 sql_help.c:1238
-msgid "operator_name"
-msgstr "operatornamn"
-
-#: sql_help.c:342 sql_help.c:343 sql_help.c:345 sql_help.c:346 sql_help.c:352
-#: sql_help.c:353 sql_help.c:355 sql_help.c:356 sql_help.c:1239
-#: sql_help.c:1240 sql_help.c:1242 sql_help.c:1243
-msgid "op_type"
-msgstr "op_typ"
-
-#: sql_help.c:344 sql_help.c:354 sql_help.c:1241
-msgid "support_number"
-msgstr "supportnummer"
-
-#: sql_help.c:347 sql_help.c:850 sql_help.c:995 sql_help.c:1020
-#: sql_help.c:1033 sql_help.c:1214 sql_help.c:1244 sql_help.c:1575
-#: sql_help.c:2133 sql_help.c:2362 sql_help.c:2471 sql_help.c:2476
-#: sql_help.c:2670 sql_help.c:2675 sql_help.c:2822 sql_help.c:2827
-msgid "function_name"
-msgstr "funktionsnamn"
-
-#: sql_help.c:348 sql_help.c:996 sql_help.c:1245
-msgid "argument_type"
-msgstr "argumenttyp"
-
-#: sql_help.c:393 sql_help.c:707 sql_help.c:1157 sql_help.c:1285
-#: sql_help.c:1662
-msgid "password"
-msgstr "lösenord"
-
-#: sql_help.c:394 sql_help.c:708 sql_help.c:1158 sql_help.c:1286
-#: sql_help.c:1663
-msgid "timestamp"
-msgstr "tidsstämpel"
-
-#: sql_help.c:398 sql_help.c:402 sql_help.c:405 sql_help.c:408 sql_help.c:2127
-#: sql_help.c:2356
-msgid "database_name"
-msgstr "databasnamn"
-
-#: sql_help.c:437 sql_help.c:1333
-msgid "increment"
-msgstr "ökningsvärde"
-
-#: sql_help.c:438 sql_help.c:1334
-msgid "minvalue"
-msgstr "minvärde"
-
-#: sql_help.c:439 sql_help.c:1335
-msgid "maxvalue"
-msgstr "maxvärde"
-
-#: sql_help.c:440 sql_help.c:1336 sql_help.c:2458 sql_help.c:2526
-#: sql_help.c:2657 sql_help.c:2758 sql_help.c:2809
-msgid "start"
-msgstr "start"
-
-#: sql_help.c:441
-msgid "restart"
-msgstr ""
-
-#: sql_help.c:442 sql_help.c:1337
-msgid "cache"
-msgstr "cache"
-
-#: sql_help.c:444 sql_help.c:516 sql_help.c:523 sql_help.c:526 sql_help.c:527
-#: sql_help.c:530 sql_help.c:532 sql_help.c:533 sql_help.c:534 sql_help.c:536
-#: sql_help.c:539 sql_help.c:541 sql_help.c:744 sql_help.c:747 sql_help.c:762
-#: sql_help.c:920 sql_help.c:924 sql_help.c:936 sql_help.c:937 sql_help.c:1179
-#: sql_help.c:1339 sql_help.c:1470 sql_help.c:2120 sql_help.c:2121
-#: sql_help.c:2159 sql_help.c:2349 sql_help.c:2350 sql_help.c:2720
-#: sql_help.c:2722 sql_help.c:2739 sql_help.c:2742
-msgid "column"
-msgstr "kolumn"
-
-#: sql_help.c:460 sql_help.c:464 sql_help.c:729 sql_help.c:1349
-#: sql_help.c:1680 sql_help.c:1907 sql_help.c:1989 sql_help.c:2131
-#: sql_help.c:2360
-#, fuzzy
-msgid "server_name"
-msgstr "Användarnamn"
-
-#: sql_help.c:461
-msgid "new_version"
-msgstr "ny_version"
-
-#: sql_help.c:517
-msgid "new_column"
-msgstr "ny_kolumn"
-
-#: sql_help.c:525 sql_help.c:1421 sql_help.c:1433
-msgid "column_constraint"
-msgstr "kolumnvillkor"
-
-#: sql_help.c:535
-msgid "integer"
-msgstr "heltal"
-
-#: sql_help.c:537 sql_help.c:540
-#, fuzzy
-msgid "attribute_option"
-msgstr "Attribut"
-
-#: sql_help.c:542 sql_help.c:1422 sql_help.c:1434
-msgid "table_constraint"
-msgstr "tabellvillkor"
-
-#: sql_help.c:544 sql_help.c:545 sql_help.c:546 sql_help.c:547 sql_help.c:874
-msgid "trigger_name"
-msgstr "utlösarnamn"
-
-#: sql_help.c:548 sql_help.c:549 sql_help.c:550 sql_help.c:551
-msgid "rewrite_rule_name"
-msgstr ""
-
-#: sql_help.c:552 sql_help.c:801
-msgid "index_name"
-msgstr "indexnamn"
-
-#: sql_help.c:556 sql_help.c:557 sql_help.c:1423 sql_help.c:1425
-msgid "parent_table"
-msgstr "föräldertabell"
-
-#: sql_help.c:575 sql_help.c:578
-#, fuzzy
-msgid "tablespace_option"
-msgstr "Tabellutrymme"
-
-#: sql_help.c:598 sql_help.c:601 sql_help.c:607 sql_help.c:611
-msgid "token_type"
-msgstr ""
-
-#: sql_help.c:599 sql_help.c:602
-#, fuzzy
-msgid "dictionary_name"
-msgstr "Ordlistor"
-
-#: sql_help.c:604 sql_help.c:608
-#, fuzzy
-msgid "old_dictionary"
-msgstr "Ordlistor"
-
-#: sql_help.c:605 sql_help.c:609
-#, fuzzy
-msgid "new_dictionary"
-msgstr "Ordlistor"
-
-#: sql_help.c:775 sql_help.c:2582 sql_help.c:2583 sql_help.c:2606
-msgid "transaction_mode"
-msgstr "transaktionsläge"
-
-#: sql_help.c:776 sql_help.c:2584 sql_help.c:2607
-msgid "where transaction_mode is one of:"
-msgstr "där transaktionsläge är en av:"
-
-#: sql_help.c:800 sql_help.c:839 sql_help.c:846 sql_help.c:866 sql_help.c:875
-#: sql_help.c:919 sql_help.c:923 sql_help.c:1017 sql_help.c:1417
-#: sql_help.c:1429 sql_help.c:1486 sql_help.c:2117 sql_help.c:2122
-#: sql_help.c:2346 sql_help.c:2351 sql_help.c:2460 sql_help.c:2462
-#: sql_help.c:2488 sql_help.c:2528 sql_help.c:2659 sql_help.c:2661
-#: sql_help.c:2687 sql_help.c:2811 sql_help.c:2813 sql_help.c:2839
-msgid "table_name"
-msgstr "tabellnamn"
-
-#: sql_help.c:838 sql_help.c:847 sql_help.c:848 sql_help.c:849 sql_help.c:854
-#: sql_help.c:859 sql_help.c:861 sql_help.c:863 sql_help.c:864 sql_help.c:867
-#: sql_help.c:868 sql_help.c:869 sql_help.c:870 sql_help.c:871 sql_help.c:872
-#: sql_help.c:873 sql_help.c:876 sql_help.c:877
-msgid "object_name"
-msgstr "objektnamn"
-
-#: sql_help.c:840 sql_help.c:1118 sql_help.c:1418 sql_help.c:1431
-#: sql_help.c:1450 sql_help.c:1452 sql_help.c:1459 sql_help.c:1487
-#: sql_help.c:1692 sql_help.c:2486 sql_help.c:2685 sql_help.c:2837
-msgid "column_name"
-msgstr "kolumnnamn"
-
-#: sql_help.c:841
-msgid "agg_name"
-msgstr "agg_namn"
-
-#: sql_help.c:842
-msgid "agg_type"
-msgstr "agg_typ"
-
-#: sql_help.c:843 sql_help.c:993 sql_help.c:997 sql_help.c:999 sql_help.c:1761
-msgid "source_type"
-msgstr "källtyp"
-
-#: sql_help.c:844 sql_help.c:994 sql_help.c:998 sql_help.c:1000
-#: sql_help.c:1762
-msgid "target_type"
-msgstr "måltyp"
-
-#: sql_help.c:865
-msgid "rule_name"
-msgstr "regelnamn"
-
-#: sql_help.c:878
-msgid "text"
-msgstr "text"
-
-#: sql_help.c:893 sql_help.c:2230 sql_help.c:2392
-msgid "transaction_id"
-msgstr "transaktions-id"
-
-#: sql_help.c:921 sql_help.c:926 sql_help.c:2179
-msgid "filename"
-msgstr "filnamn"
-
-#: sql_help.c:925 sql_help.c:1491 sql_help.c:1693 sql_help.c:1711
-#: sql_help.c:2161
-msgid "query"
-msgstr "fråga"
-
-#: sql_help.c:928
-msgid "where option can be one of:"
-msgstr ""
-
-#: sql_help.c:929
-#, fuzzy
-msgid "format_name"
-msgstr "Informationer\n"
-
-#: sql_help.c:930 sql_help.c:933 sql_help.c:2022 sql_help.c:2023
-#: sql_help.c:2024 sql_help.c:2025
-msgid "boolean"
-msgstr ""
-
-#: sql_help.c:931
-#, fuzzy
-msgid "delimiter_character"
-msgstr "COPY-avdelaren måste vara exakt ett tecken"
-
-#: sql_help.c:932
-msgid "null_string"
-msgstr "null-sträng"
-
-#: sql_help.c:934
-#, fuzzy
-msgid "quote_character"
-msgstr " vid tecken %d"
-
-#: sql_help.c:935
-#, fuzzy
-msgid "escape_character"
-msgstr " vid tecken %d"
-
-#: sql_help.c:963
-msgid "input_data_type"
-msgstr "indatatyp"
-
-#: sql_help.c:964 sql_help.c:971
-msgid "sfunc"
-msgstr "sfunc"
-
-#: sql_help.c:965 sql_help.c:972
-msgid "state_data_type"
-msgstr "tillståndsdatatyp"
-
-#: sql_help.c:966 sql_help.c:973
-msgid "ffunc"
-msgstr "ffunc"
-
-#: sql_help.c:967 sql_help.c:974
-msgid "initial_condition"
-msgstr "startvärde"
-
-#: sql_help.c:968 sql_help.c:975
-msgid "sort_operator"
-msgstr "sorteringsoperator"
-
-#: sql_help.c:970
-#, fuzzy
-msgid "base_type"
-msgstr "Måltyp"
-
-#: sql_help.c:1016 sql_help.c:1303 sql_help.c:1572
-msgid "event"
-msgstr "händelse"
-
-#: sql_help.c:1018
-msgid "referenced_table_name"
-msgstr "refererat_tabellnamn"
-
-#: sql_help.c:1019 sql_help.c:1305 sql_help.c:1574 sql_help.c:1725
-#: sql_help.c:2449 sql_help.c:2451 sql_help.c:2517 sql_help.c:2519
-#: sql_help.c:2648 sql_help.c:2650 sql_help.c:2725 sql_help.c:2800
-#: sql_help.c:2802
-msgid "condition"
-msgstr "villkor"
-
-#: sql_help.c:1021 sql_help.c:1576
-msgid "arguments"
-msgstr "argument"
-
-#: sql_help.c:1031
-msgid "source_encoding"
-msgstr "källkodning"
-
-#: sql_help.c:1032
-msgid "dest_encoding"
-msgstr "målkodning"
-
-#: sql_help.c:1050 sql_help.c:1526
-msgid "template"
-msgstr "mall"
-
-#: sql_help.c:1051
-msgid "encoding"
-msgstr "kodning"
-
-#: sql_help.c:1052
-msgid "lc_collate"
-msgstr "lc_collate"
-
-#: sql_help.c:1053
-msgid "lc_ctype"
-msgstr "lc_ctype"
-
-#: sql_help.c:1054 sql_help.c:1184 sql_help.c:1428 sql_help.c:1437
-#: sql_help.c:1468 sql_help.c:1490
-msgid "tablespace"
-msgstr "tabellutrymme"
-
-#: sql_help.c:1071 sql_help.c:1234 sql_help.c:1419 sql_help.c:1612
-#: sql_help.c:2221
-msgid "data_type"
-msgstr "datatyp"
-
-#: sql_help.c:1073
-msgid "constraint"
-msgstr "villkor"
-
-#: sql_help.c:1074
-msgid "where constraint is:"
-msgstr "där villkor är:"
-
-#: sql_help.c:1116 sql_help.c:1420 sql_help.c:1432
-msgid "default_expr"
-msgstr "default_uttryck"
-
-#: sql_help.c:1117
-msgid "rettype"
-msgstr "rettyp"
-
-#: sql_help.c:1119
-msgid "column_type"
-msgstr "kolumntyp"
-
-#: sql_help.c:1120 sql_help.c:1743 sql_help.c:2139 sql_help.c:2368
-msgid "lang_name"
-msgstr "språknamn"
-
-#: sql_help.c:1126
-msgid "definition"
-msgstr "definition"
-
-#: sql_help.c:1127
-msgid "obj_file"
-msgstr "obj-fil"
-
-#: sql_help.c:1128
-msgid "link_symbol"
-msgstr "linksymbol"
-
-#: sql_help.c:1129
-msgid "attribute"
-msgstr "attribut"
-
-#: sql_help.c:1164 sql_help.c:1292 sql_help.c:1669
-msgid "uid"
-msgstr "uid"
-
-#: sql_help.c:1178
-msgid "method"
-msgstr "metod"
-
-#: sql_help.c:1181 sql_help.c:1472
-msgid "opclass"
-msgstr "op-klass"
-
-#: sql_help.c:1185 sql_help.c:1458
-msgid "predicate"
-msgstr "predikat"
-
-#: sql_help.c:1197
-msgid "call_handler"
-msgstr "anropshanterare"
-
-#: sql_help.c:1198
-msgid "inline_handler"
-msgstr "inline-hanterare"
-
-#: sql_help.c:1217
-msgid "com_op"
-msgstr "com_op"
-
-#: sql_help.c:1218
-msgid "neg_op"
-msgstr "neg_op"
-
-#: sql_help.c:1219
-msgid "res_proc"
-msgstr "res_proc"
-
-#: sql_help.c:1220
-msgid "join_proc"
-msgstr "join_proc"
-
-#: sql_help.c:1236
-msgid "family_name"
-msgstr ""
-
-#: sql_help.c:1246
-msgid "storage_type"
-msgstr "lagringstyp"
-
-#: sql_help.c:1306 sql_help.c:1307 sql_help.c:1308
-msgid "command"
-msgstr "kommando"
-
-#: sql_help.c:1319 sql_help.c:1321
-msgid "schema_element"
-msgstr "schema-element"
-
-#: sql_help.c:1350
-msgid "server_type"
-msgstr "servertyp"
-
-#: sql_help.c:1351
-msgid "server_version"
-msgstr "serverversion"
-
-#: sql_help.c:1352 sql_help.c:2129 sql_help.c:2358
-msgid "fdw_name"
-msgstr "fdw-namn"
-
-#: sql_help.c:1424
-#, fuzzy
-msgid "like_option"
-msgstr "Generella flaggor:"
-
-#: sql_help.c:1430
-msgid "type_name"
-msgstr "typnamn"
-
-#: sql_help.c:1438
-msgid "where column_constraint is:"
-msgstr "där kolumnvillkor är:"
-
-#: sql_help.c:1441 sql_help.c:1442 sql_help.c:1451 sql_help.c:1453
-#: sql_help.c:1457
-msgid "index_parameters"
-msgstr "indexparametrar"
-
-#: sql_help.c:1443 sql_help.c:1460
-msgid "reftable"
-msgstr "reftabell"
-
-#: sql_help.c:1444 sql_help.c:1461
-msgid "refcolumn"
-msgstr "refkolumn"
-
-#: sql_help.c:1447
-msgid "and table_constraint is:"
-msgstr "och tabellvillkor är:"
-
-#: sql_help.c:1455
-msgid "exclude_element"
-msgstr ""
-
-#: sql_help.c:1464
-msgid "and like_option is:"
-msgstr ""
-
-#: sql_help.c:1465
-msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
-msgstr ""
-
-#: sql_help.c:1469
-msgid "exclude_element in an EXCLUDE constraint is:"
-msgstr ""
-
-#: sql_help.c:1501
-msgid "directory"
-msgstr "katalog"
-
-#: sql_help.c:1513
-#, fuzzy
-msgid "parser_name"
-msgstr "Användarnamn"
-
-#: sql_help.c:1514
-msgid "source_config"
-msgstr ""
-
-#: sql_help.c:1543
-#, fuzzy
-msgid "start_function"
-msgstr "funktion"
-
-#: sql_help.c:1544
-#, fuzzy
-msgid "gettoken_function"
-msgstr "ta bort en funktion"
-
-#: sql_help.c:1545
-#, fuzzy
-msgid "end_function"
-msgstr "funktion"
-
-#: sql_help.c:1546
-#, fuzzy
-msgid "lextypes_function"
-msgstr "funktion"
-
-#: sql_help.c:1547
-#, fuzzy
-msgid "headline_function"
-msgstr "funktion"
-
-#: sql_help.c:1559
-#, fuzzy
-msgid "init_function"
-msgstr "funktion"
-
-#: sql_help.c:1560
-#, fuzzy
-msgid "lexize_function"
-msgstr "funktion"
-
-#: sql_help.c:1611
-msgid "attribute_name"
-msgstr "attributnamn"
-
-#: sql_help.c:1614
-#, fuzzy
-msgid "label"
-msgstr "tabell"
-
-#: sql_help.c:1616
-msgid "input_function"
-msgstr "inmatningsfunktion"
-
-#: sql_help.c:1617
-msgid "output_function"
-msgstr "utmatningsfunktion"
-
-#: sql_help.c:1618
-msgid "receive_function"
-msgstr "mottagarfunktion"
-
-#: sql_help.c:1619
-msgid "send_function"
-msgstr "sändfunktion"
-
-#: sql_help.c:1620
-msgid "type_modifier_input_function"
-msgstr ""
-
-#: sql_help.c:1621
-msgid "type_modifier_output_function"
-msgstr ""
-
-#: sql_help.c:1622
-#, fuzzy
-msgid "analyze_function"
-msgstr "funktion"
-
-#: sql_help.c:1623
-msgid "internallength"
-msgstr "internlängd"
-
-#: sql_help.c:1624
-msgid "alignment"
-msgstr "justering"
-
-#: sql_help.c:1625
-msgid "storage"
-msgstr "lagring"
-
-#: sql_help.c:1626
-msgid "like_type"
-msgstr ""
-
-#: sql_help.c:1627
-msgid "category"
-msgstr ""
-
-#: sql_help.c:1628
-msgid "preferred"
-msgstr ""
-
-#: sql_help.c:1629
-msgid "default"
-msgstr "standard"
-
-#: sql_help.c:1630
-msgid "element"
-msgstr "element"
-
-#: sql_help.c:1631
-msgid "delimiter"
-msgstr "avskiljare"
-
-#: sql_help.c:1723 sql_help.c:2463 sql_help.c:2466 sql_help.c:2469
-#: sql_help.c:2473 sql_help.c:2662 sql_help.c:2665 sql_help.c:2668
-#: sql_help.c:2672 sql_help.c:2719 sql_help.c:2814 sql_help.c:2817
-#: sql_help.c:2820 sql_help.c:2824
-msgid "alias"
-msgstr "alias"
-
-#: sql_help.c:1724
-msgid "using_list"
-msgstr "using-lista"
-
-#: sql_help.c:1726 sql_help.c:2053 sql_help.c:2203 sql_help.c:2726
-msgid "cursor_name"
-msgstr "markörnamn"
-
-#: sql_help.c:1727 sql_help.c:2162 sql_help.c:2727
-msgid "output_expression"
-msgstr "utdatauttryck"
-
-#: sql_help.c:1728 sql_help.c:2163 sql_help.c:2447 sql_help.c:2514
-#: sql_help.c:2646 sql_help.c:2728 sql_help.c:2798
-msgid "output_name"
-msgstr "utdatanamn"
-
-#: sql_help.c:1744
-msgid "code"
-msgstr "kod"
-
-#: sql_help.c:2013
-msgid "parameter"
-msgstr "parameter"
-
-#: sql_help.c:2026 sql_help.c:2027 sql_help.c:2222
-msgid "statement"
-msgstr "sats"
-
-#: sql_help.c:2052 sql_help.c:2202
-msgid "direction"
-msgstr "riktning"
-
-#: sql_help.c:2054
-msgid "where direction can be empty or one of:"
-msgstr "där riktning kan vara tom eller en av:"
-
-#: sql_help.c:2055 sql_help.c:2056 sql_help.c:2057 sql_help.c:2058
-#: sql_help.c:2059 sql_help.c:2457 sql_help.c:2459 sql_help.c:2525
-#: sql_help.c:2527 sql_help.c:2656 sql_help.c:2658 sql_help.c:2757
-#: sql_help.c:2759 sql_help.c:2808 sql_help.c:2810
-msgid "count"
-msgstr "antal"
-
-#: sql_help.c:2124 sql_help.c:2353
-msgid "sequence_name"
-msgstr "sekvensnamn"
-
-#: sql_help.c:2135 sql_help.c:2364
-msgid "arg_name"
-msgstr "arg_namn"
-
-#: sql_help.c:2136 sql_help.c:2365
-msgid "arg_type"
-msgstr "arg_typ"
-
-#: sql_help.c:2141 sql_help.c:2370
-msgid "loid"
-msgstr ""
-
-#: sql_help.c:2171 sql_help.c:2211 sql_help.c:2705
-msgid "channel"
-msgstr ""
-
-#: sql_help.c:2193
-msgid "lockmode"
-msgstr "låsläge"
-
-#: sql_help.c:2194
-msgid "where lockmode is one of:"
-msgstr "där låsläge är en av:"
-
-#: sql_help.c:2212
-msgid "payload"
-msgstr ""
-
-#: sql_help.c:2238
-msgid "old_role"
-msgstr "gammal_roll"
-
-#: sql_help.c:2239
-msgid "new_role"
-msgstr "ny_roll"
-
-#: sql_help.c:2255 sql_help.c:2400 sql_help.c:2408
-msgid "savepoint_name"
-msgstr "sparpunktnamn"
-
-#: sql_help.c:2444 sql_help.c:2511 sql_help.c:2643 sql_help.c:2795
-msgid "with_query"
-msgstr ""
-
-#: sql_help.c:2448 sql_help.c:2479 sql_help.c:2481 sql_help.c:2516
-#: sql_help.c:2647 sql_help.c:2678 sql_help.c:2680 sql_help.c:2799
-#: sql_help.c:2830 sql_help.c:2832
-msgid "from_item"
-msgstr "frånval"
-
-#: sql_help.c:2452 sql_help.c:2520 sql_help.c:2651 sql_help.c:2803
-msgid "window_name"
-msgstr ""
-
-#: sql_help.c:2453 sql_help.c:2521 sql_help.c:2652 sql_help.c:2804
-msgid "window_definition"
-msgstr ""
-
-#: sql_help.c:2454 sql_help.c:2465 sql_help.c:2487 sql_help.c:2522
-#: sql_help.c:2653 sql_help.c:2664 sql_help.c:2686 sql_help.c:2805
-#: sql_help.c:2816 sql_help.c:2838
-msgid "select"
-msgstr "select"
-
-#: sql_help.c:2461 sql_help.c:2660 sql_help.c:2812
-msgid "where from_item can be one of:"
-msgstr "där frånval kan vara en av:"
-
-#: sql_help.c:2464 sql_help.c:2467 sql_help.c:2470 sql_help.c:2474
-#: sql_help.c:2663 sql_help.c:2666 sql_help.c:2669 sql_help.c:2673
-#: sql_help.c:2815 sql_help.c:2818 sql_help.c:2821 sql_help.c:2825
-msgid "column_alias"
-msgstr "kolumnalias"
-
-#: sql_help.c:2468 sql_help.c:2485 sql_help.c:2489 sql_help.c:2667
-#: sql_help.c:2684 sql_help.c:2688 sql_help.c:2819 sql_help.c:2836
-#: sql_help.c:2840
-msgid "with_query_name"
-msgstr ""
-
-#: sql_help.c:2472 sql_help.c:2477 sql_help.c:2671 sql_help.c:2676
-#: sql_help.c:2823 sql_help.c:2828
-msgid "argument"
-msgstr "argument"
-
-#: sql_help.c:2475 sql_help.c:2478 sql_help.c:2674 sql_help.c:2677
-#: sql_help.c:2826 sql_help.c:2829
-msgid "column_definition"
-msgstr "kolumndefinition"
-
-#: sql_help.c:2480 sql_help.c:2679 sql_help.c:2831
-msgid "join_type"
-msgstr "join-typ"
-
-#: sql_help.c:2482 sql_help.c:2681 sql_help.c:2833
-msgid "join_condition"
-msgstr "join-villkor"
-
-#: sql_help.c:2483 sql_help.c:2682 sql_help.c:2834
-msgid "join_column"
-msgstr "join-kolumn"
-
-#: sql_help.c:2484 sql_help.c:2683 sql_help.c:2835
-msgid "and with_query is:"
-msgstr ""
-
-#: sql_help.c:2515
-msgid "new_table"
-msgstr "ny_tabell"
-
-#: sql_help.c:2540
-msgid "timezone"
-msgstr "tidszon"
-
-#: sql_help.c:2724
-msgid "from_list"
-msgstr ""
-
-#: sql_help.c:2755
-msgid "sort_expression"
-msgstr "sorteringsuttryck"
-
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "kunde inte identifiera aktuell katalog: %s"
-
-#: ../../port/exec.c:144
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "ogiltigt binär \"%s\""
-
-#: ../../port/exec.c:193
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "kunde inte läsa binären \"%s\""
-
-#: ../../port/exec.c:200
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "kunde inte hitta en \"%s\" att köra"
-
-#: ../../port/exec.c:255 ../../port/exec.c:291
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "kunde inte byta katalog till \"%s\""
-
-#: ../../port/exec.c:270
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "kunde inte läsa symbolisk länk \"%s\""
-
-#: ../../port/exec.c:516
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "barnprocess avslutade med kod %d"
-
-#: ../../port/exec.c:520
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "barnprocess terminerades av fel 0x%X"
-
-#: ../../port/exec.c:529
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "barnprocess terminerades av signal %s"
-
-#: ../../port/exec.c:532
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "barnprocess terminerades av signal %d"
-
-#: ../../port/exec.c:536
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "barnprocess avslutade med okänd statuskod %d"
-
-#~ msgid "ABORT [ WORK | TRANSACTION ]"
-#~ msgstr "ABORT [ WORK | TRANSACTION ]"
-
-#~ msgid ""
-#~ "ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
-#~ "ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
-#~ "ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
-#~ msgstr ""
-#~ "ALTER AGGREGATE namn ( typ [ , ... ] ) RENAME TO nytt_namn\n"
-#~ "ALTER AGGREGATE name ( typ [ , ... ] ) OWNER TO ny_ägare\n"
-#~ "ALTER AGGREGATE namn ( typ [ , ... ] ) SET SCHEMA nytt_schema"
-
-#~ msgid ""
-#~ "ALTER CONVERSION name RENAME TO newname\n"
-#~ "ALTER CONVERSION name OWNER TO newowner"
-#~ msgstr ""
-#~ "ALTER CONVERSION namn RENAME TO nytt_namn\n"
-#~ "ALTER CONVERSION namn OWNER TO ny_ägare"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
-#~ "\n"
-#~ "where option can be:\n"
-#~ "\n"
-#~ "    CONNECTION LIMIT connlimit\n"
-#~ "\n"
-#~ "ALTER DATABASE name RENAME TO newname\n"
-#~ "\n"
-#~ "ALTER DATABASE name OWNER TO new_owner\n"
-#~ "\n"
-#~ "ALTER DATABASE name SET TABLESPACE new_tablespace\n"
-#~ "\n"
-#~ "ALTER DATABASE name SET configuration_parameter { TO | = } { value | "
-#~ "DEFAULT }\n"
-#~ "ALTER DATABASE name SET configuration_parameter FROM CURRENT\n"
-#~ "ALTER DATABASE name RESET configuration_parameter\n"
-#~ "ALTER DATABASE name RESET ALL"
-#~ msgstr ""
-#~ "ALTER DATABASE namn [ [ WITH ] alternativ [ ... ] ]\n"
-#~ "\n"
-#~ "där alternativ kan vara:\n"
-#~ "\n"
-#~ "    CONNECTION LIMIT anslutningstak\n"
-#~ "\n"
-#~ "ALTER DATABASE namn SET parameter { TO | = } { värde | DEFAULT }\n"
-#~ "ALTER DATABASE namn RESET parameter\n"
-#~ "\n"
-#~ "ALTER DATABASE namn RENAME TO nyttnamn\n"
-#~ "\n"
-#~ "ALTER DATABASE namn OWNER TO ny_ägare"
-
-#~ msgid ""
-#~ "ALTER DOMAIN name\n"
-#~ "    { SET DEFAULT expression | DROP DEFAULT }\n"
-#~ "ALTER DOMAIN name\n"
-#~ "    { SET | DROP } NOT NULL\n"
-#~ "ALTER DOMAIN name\n"
-#~ "    ADD domain_constraint\n"
-#~ "ALTER DOMAIN name\n"
-#~ "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-#~ "ALTER DOMAIN name\n"
-#~ "    OWNER TO new_owner \n"
-#~ "ALTER DOMAIN name\n"
-#~ "    SET SCHEMA new_schema"
-#~ msgstr ""
-#~ "ALTER DOMAIN namn\n"
-#~ "    { SET DEFAULT uttryck | DROP DEFAULT }\n"
-#~ "ALTER DOMAIN namn\n"
-#~ "    { SET | DROP } NOT NULL\n"
-#~ "ALTER DOMAIN namn\n"
-#~ "    ADD domain_villkor (constraint)\n"
-#~ "ALTER DOMAIN namn\n"
-#~ "    DROP CONSTRAINT villkorsnamn [ RESTRICT | CASCADE ]\n"
-#~ "ALTER DOMAIN namn\n"
-#~ "    OWNER TO ny_ägare\n"
-#~ "ALTER DOMAIN namn\n"
-#~ "    SET SCHEMA nytt_schema"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-#~ "    action [ ... ] [ RESTRICT ]\n"
-#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-#~ "    RENAME TO new_name\n"
-#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-#~ "    OWNER TO new_owner\n"
-#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-#~ "    SET SCHEMA new_schema\n"
-#~ "\n"
-#~ "where action is one of:\n"
-#~ "\n"
-#~ "    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-#~ "    IMMUTABLE | STABLE | VOLATILE\n"
-#~ "    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-#~ "    COST execution_cost\n"
-#~ "    ROWS result_rows\n"
-#~ "    SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-#~ "    SET configuration_parameter FROM CURRENT\n"
-#~ "    RESET configuration_parameter\n"
-#~ "    RESET ALL"
-#~ msgstr ""
-#~ "ALTER FUNCTION namn ( [ [ arg_läge ] [ arg_namn ] arg_typ [, ...] ] )\n"
-#~ "    aktion [, ... ] [ RESTRICT ]\n"
-#~ "ALTER FUNCTION namn ( [ [ arg_läge ] [ arg_namn ] arg_typ [, ...] ] )\n"
-#~ "    RENAME TO nytt_namn\n"
-#~ "ALTER FUNCTION namn ( [ [ arg_läge ] [ arg_namn ] arg_typ [, ...] ] )\n"
-#~ "    OWNER TO ny_ägare\n"
-#~ "ALTER FUNCTION namn ( [ [ arg_läge ] [ arg_namn ] arg_typ [, ...] ] )\n"
-#~ "    SET SCHEMA nytt_schema\n"
-#~ "\n"
-#~ "där aktion är en av:\n"
-#~ "\n"
-#~ "    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-#~ "    IMMUTABLE | STABLE | VOLATILE\n"
-#~ "    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER"
-
-#~ msgid ""
-#~ "ALTER GROUP groupname ADD USER username [, ... ]\n"
-#~ "ALTER GROUP groupname DROP USER username [, ... ]\n"
-#~ "\n"
-#~ "ALTER GROUP groupname RENAME TO newname"
-#~ msgstr ""
-#~ "ALTER GROUP gruppnamn ADD USER användarnamn [, ... ]\n"
-#~ "ALTER GROUP gruppnamn DROP USER användarnamn [, ... ]\n"
-#~ "\n"
-#~ "ALTER GROUP gruppnamn RENAME TO nyttnamn"
-
-#~ msgid ""
-#~ "ALTER INDEX name RENAME TO new_name\n"
-#~ "ALTER INDEX name SET TABLESPACE tablespace_name\n"
-#~ "ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
-#~ "ALTER INDEX name RESET ( storage_parameter [, ... ] )"
-#~ msgstr ""
-#~ "ALTER INDEX namn RENAME TO nytt_namn\n"
-#~ "ALTER INDEX namn SET TABLESPACE tabellutrymmesnamn\n"
-#~ "ALTER INDEX namn SET ( lagringsparameter = värde [, ... ] )\n"
-#~ "ALTER INDEX namn RESET ( lagringsparameter [, ... ] )"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
-#~ "ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
-#~ msgstr ""
-#~ "ALTER SCHEMA namn RENAME TO nytt_namn\n"
-#~ "ALTER SCHEMA namn OWNER TO ny_ägare"
-
-#~ msgid ""
-#~ "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER "
-#~ "TO newowner"
-#~ msgstr ""
-#~ "ALTER OPERATOR namn ( { vänster_typ | NONE }, { höger_typ | NONE } ) "
-#~ "OWNER TO ny_ägare"
-
-#~ msgid ""
-#~ "ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
-#~ "ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
-#~ msgstr ""
-#~ "ALTER OPERATOR CLASS namn USING indexmetod RENAME TO nytt_namn\n"
-#~ "ALTER OPERATOR CLASS namn USING indexmetod OWNER TO ny_ägare"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
-#~ "\n"
-#~ "where option can be:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT connlimit\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-#~ "    | VALID UNTIL 'timestamp' \n"
-#~ "\n"
-#~ "ALTER ROLE name RENAME TO newname\n"
-#~ "\n"
-#~ "ALTER ROLE name SET configuration_parameter { TO | = } { value | "
-#~ "DEFAULT }\n"
-#~ "ALTER ROLE name SET configuration_parameter FROM CURRENT\n"
-#~ "ALTER ROLE name RESET configuration_parameter\n"
-#~ "ALTER ROLE name RESET ALL"
-#~ msgstr ""
-#~ "ALTER ROLE namn [ [ WITH ] alternativ [ ... ] ]\n"
-#~ "\n"
-#~ "där alternativ kan vara:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT anslutningstak\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'lösenord'\n"
-#~ "    | VALID UNTIL 'tidsstämpel' \n"
-#~ "\n"
-#~ "ALTER ROLE namn RENAME TO nytt_namn\n"
-#~ "\n"
-#~ "ALTER ROLE namn SET konfigurationsparameter { TO | = } { värde | "
-#~ "DEFAULT }\n"
-#~ "ALTER ROLE namn RESET konfigurationsparameter"
-
-#~ msgid ""
-#~ "ALTER SCHEMA name RENAME TO newname\n"
-#~ "ALTER SCHEMA name OWNER TO newowner"
-#~ msgstr ""
-#~ "ALTER SCHEMA namn RENAME TO nytt_namn\n"
-#~ "ALTER SCHEMA namn OWNER TO ny_ägare"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
-#~ "MAXVALUE ]\n"
-#~ "    [ START [ WITH ] start ]\n"
-#~ "    [ RESTART [ [ WITH ] restart ] ]\n"
-#~ "    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-#~ "    [ OWNED BY { table.column | NONE } ]\n"
-#~ "ALTER SEQUENCE name OWNER TO new_owner\n"
-#~ "ALTER SEQUENCE name RENAME TO new_name\n"
-#~ "ALTER SEQUENCE name SET SCHEMA new_schema"
-#~ msgstr ""
-#~ "ALTER SEQUENCE namn [ INCREMENT [ BY ] ökningsvärde ]\n"
-#~ "    [ MINVALUE minvärde | NO MINVALUE ] [ MAXVALUE maxvärde | NO "
-#~ "MAXVALUE ]\n"
-#~ "    [ RESTART [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-#~ "    [ OWNED BY { tabell.kolumn | NONE } ]\n"
-#~ "ALTER SEQUENCE namn SET SCHEMA nytt_schema"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER TABLE [ ONLY ] name [ * ]\n"
-#~ "    action [, ... ]\n"
-#~ "ALTER TABLE [ ONLY ] name [ * ]\n"
-#~ "    RENAME [ COLUMN ] column TO new_column\n"
-#~ "ALTER TABLE name\n"
-#~ "    RENAME TO new_name\n"
-#~ "ALTER TABLE name\n"
-#~ "    SET SCHEMA new_schema\n"
-#~ "\n"
-#~ "where action is one of:\n"
-#~ "\n"
-#~ "    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"
-#~ "    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"
-#~ "    ALTER [ COLUMN ] column [ SET DATA ] TYPE type [ USING expression ]\n"
-#~ "    ALTER [ COLUMN ] column SET DEFAULT expression\n"
-#~ "    ALTER [ COLUMN ] column DROP DEFAULT\n"
-#~ "    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"
-#~ "    ALTER [ COLUMN ] column SET STATISTICS integer\n"
-#~ "    ALTER [ COLUMN ] column SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
-#~ "MAIN }\n"
-#~ "    ADD table_constraint\n"
-#~ "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-#~ "    DISABLE TRIGGER [ trigger_name | ALL | USER ]\n"
-#~ "    ENABLE TRIGGER [ trigger_name | ALL | USER ]\n"
-#~ "    ENABLE REPLICA TRIGGER trigger_name\n"
-#~ "    ENABLE ALWAYS TRIGGER trigger_name\n"
-#~ "    DISABLE RULE rewrite_rule_name\n"
-#~ "    ENABLE RULE rewrite_rule_name\n"
-#~ "    ENABLE REPLICA RULE rewrite_rule_name\n"
-#~ "    ENABLE ALWAYS RULE rewrite_rule_name\n"
-#~ "    CLUSTER ON index_name\n"
-#~ "    SET WITHOUT CLUSTER\n"
-#~ "    SET WITH OIDS\n"
-#~ "    SET WITHOUT OIDS\n"
-#~ "    SET ( storage_parameter = value [, ... ] )\n"
-#~ "    RESET ( storage_parameter [, ... ] )\n"
-#~ "    INHERIT parent_table\n"
-#~ "    NO INHERIT parent_table\n"
-#~ "    OWNER TO new_owner\n"
-#~ "    SET TABLESPACE new_tablespace"
-#~ msgstr ""
-#~ "ALTER TABLE [ ONLY ] namn [ * ]\n"
-#~ "    aktion [, ... ]\n"
-#~ "ALTER TABLE [ ONLY ] namn [ * ]\n"
-#~ "    RENAME [ COLUMN ] kolumn TO ny_kolumn\n"
-#~ "ALTER TABLE namn\n"
-#~ "    RENAME TO nytt_namn\n"
-#~ "ALTER TABLE namn\n"
-#~ "    SET SCHEMA nytt_schema\n"
-#~ "\n"
-#~ "där aktion är en av:\n"
-#~ "\n"
-#~ "    ADD [ COLUMN ] kolumn type [ kolumnvillkor [ ... ] ]\n"
-#~ "    DROP [ COLUMN ] kolumn [ RESTRICT | CASCADE ]\n"
-#~ "    ALTER [ COLUMN ] kolumn TYPE type [ USING uttryck ]\n"
-#~ "    ALTER [ COLUMN ] kolumn SET DEFAULT uttryck\n"
-#~ "    ALTER [ COLUMN ] kolumn DROP DEFAULT\n"
-#~ "    ALTER [ COLUMN ] kolumn { SET | DROP } NOT NULL\n"
-#~ "    ALTER [ COLUMN ] kolumn SET STATISTICS heltal\n"
-#~ "    ALTER [ COLUMN ] kolumn SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
-#~ "MAIN }\n"
-#~ "    ADD tabellvillkor\n"
-#~ "    DROP CONSTRAINT villkorsnamn [ RESTRICT | CASCADE ]\n"
-#~ "    DISABLE TRIGGER [ utlösarnamn | ALL | USER ]\n"
-#~ "    ENABLE TRIGGER [ utlösarnamn | ALL | USER ]\n"
-#~ "    CLUSTER ON indexnamn\n"
-#~ "    SET WITHOUT CLUSTER\n"
-#~ "    SET WITHOUT OIDS\n"
-#~ "    SET ( lagringsparameter = värde [, ... ] )\n"
-#~ "    RESET ( lagringsparameter [, ... ] )\n"
-#~ "    INHERIT föräldertabell\n"
-#~ "    NO INHERIT föräldertabell\n"
-#~ "    OWNER TO ny_ägare\n"
-#~ "    SET TABLESPACE tabellutrymme"
-
-#~ msgid ""
-#~ "ALTER TABLESPACE name RENAME TO newname\n"
-#~ "ALTER TABLESPACE name OWNER TO newowner"
-#~ msgstr ""
-#~ "ALTER TABLESPACE namn RENAME TO nytt_namn\n"
-#~ "ALTER TABLESPACE namn OWNER TO ny_ägare"
-
-#~ msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
-#~ msgstr "ALTER TEXT SEARCH PARSER namn RENAME TO nyttnamn"
-
-#~ msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
-#~ msgstr "ALTER TEXT SEARCH TEMPLATE namn RENAME TO nyttnamn"
-
-#~ msgid "ALTER TRIGGER name ON table RENAME TO newname"
-#~ msgstr "ALTER TRIGGER namb ON tabell RENAME TO nyttnamn"
-
-#~ msgid ""
-#~ "ALTER TYPE name RENAME TO new_name\n"
-#~ "ALTER TYPE name OWNER TO new_owner \n"
-#~ "ALTER TYPE name SET SCHEMA new_schema"
-#~ msgstr ""
-#~ "ALTER TYPE namn RENAME TO nytt_namn\n"
-#~ "ALTER TYPE namn OWNER TO ny_ägare \n"
-#~ "ALTER TYPE namn SET SCHEMA nytt_schema"
-
-#, fuzzy
-#~ msgid ""
-#~ "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
-#~ "\n"
-#~ "where option can be:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT connlimit\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-#~ "    | VALID UNTIL 'timestamp' \n"
-#~ "\n"
-#~ "ALTER USER name RENAME TO newname\n"
-#~ "\n"
-#~ "ALTER USER name SET configuration_parameter { TO | = } { value | "
-#~ "DEFAULT }\n"
-#~ "ALTER USER name SET configuration_parameter FROM CURRENT\n"
-#~ "ALTER USER name RESET configuration_parameter\n"
-#~ "ALTER USER name RESET ALL"
-#~ msgstr ""
-#~ "ALTER USER namn [ [ WITH ] alternativ [ ... ] ]\n"
-#~ "\n"
-#~ "där alternativ kan vara:\n"
-#~ "\n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT anslutningstak\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'lösenord' \n"
-#~ "    | VALID UNTIL 'tidsstämpel'\n"
-#~ "\n"
-#~ "ALTER USER namn RENAME TO nytt_namn\n"
-#~ "\n"
-#~ "ALTER USER namn SET konfigurationsparameter { TO | = } { värde | "
-#~ "DEFAULT }\n"
-#~ "ALTER USER namn RESET konfigurationsparameter"
-
-#~ msgid ""
-#~ "ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
-#~ "ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
-#~ "ALTER VIEW name OWNER TO new_owner\n"
-#~ "ALTER VIEW name RENAME TO new_name\n"
-#~ "ALTER VIEW name SET SCHEMA new_schema"
-#~ msgstr ""
-#~ "ALTER VIEW namn ALTER [ COLUMN ] kolumn SET DEFAULT uttryck\n"
-#~ "ALTER VIEW namn ALTER [ COLUMN ] kolumn DROP DEFAULT\n"
-#~ "ALTER VIEW namn OWNER TO ny_ägare\n"
-#~ "ALTER VIEW namn RENAME TO nytt_namn\n"
-#~ "ALTER VIEW namn SET SCHEMA nytt_schema"
-
-#~ msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
-#~ msgstr "ANALYZE [ VERBOSE ] [ tabell [ ( kolumn [, ...] ) ] ]"
-
-#~ msgid ""
-#~ "BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
-#~ "\n"
-#~ "where transaction_mode is one of:\n"
-#~ "\n"
-#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
-#~ "READ UNCOMMITTED }\n"
-#~ "    READ WRITE | READ ONLY"
-#~ msgstr ""
-#~ "BEGIN [ WORK | TRANSACTION ] [ transaktionsläge [, ...] ]\n"
-#~ "\n"
-#~ "där transaktionsläge är en av:\n"
-#~ "\n"
-#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
-#~ "READ UNCOMMITTED }\n"
-#~ "    READ WRITE | READ ONLY"
-
-#~ msgid "CHECKPOINT"
-#~ msgstr "CHECKPOINT"
-
-#~ msgid "CLOSE { name | ALL }"
-#~ msgstr "CLOSE { namn | ALL }"
-
-#~ msgid ""
-#~ "CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
-#~ "CLUSTER [VERBOSE]"
-#~ msgstr ""
-#~ "CLUSTER [VERBOSE] tabellnamn [ USING indexnamn ]\n"
-#~ "CLUSTER [VERBOSE]"
-
-#, fuzzy
-#~ msgid ""
-#~ "COMMENT ON\n"
-#~ "{\n"
-#~ "  TABLE object_name |\n"
-#~ "  COLUMN table_name.column_name |\n"
-#~ "  AGGREGATE agg_name (agg_type [, ...] ) |\n"
-#~ "  CAST (sourcetype AS targettype) |\n"
-#~ "  CONSTRAINT constraint_name ON table_name |\n"
-#~ "  CONVERSION object_name |\n"
-#~ "  DATABASE object_name |\n"
-#~ "  DOMAIN object_name |\n"
-#~ "  FUNCTION func_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) |\n"
-#~ "  INDEX object_name |\n"
-#~ "  LARGE OBJECT large_object_oid |\n"
-#~ "  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
-#~ "  OPERATOR CLASS object_name USING index_method |\n"
-#~ "  OPERATOR FAMILY object_name USING index_method |\n"
-#~ "  [ PROCEDURAL ] LANGUAGE object_name |\n"
-#~ "  ROLE object_name |\n"
-#~ "  RULE rule_name ON table_name |\n"
-#~ "  SCHEMA object_name |\n"
-#~ "  SEQUENCE object_name |\n"
-#~ "  TABLESPACE object_name |\n"
-#~ "  TEXT SEARCH CONFIGURATION object_name |\n"
-#~ "  TEXT SEARCH DICTIONARY object_name |\n"
-#~ "  TEXT SEARCH PARSER object_name |\n"
-#~ "  TEXT SEARCH TEMPLATE object_name |\n"
-#~ "  TRIGGER trigger_name ON table_name |\n"
-#~ "  TYPE object_name |\n"
-#~ "  VIEW object_name\n"
-#~ "} IS 'text'"
-#~ msgstr ""
-#~ "COMMENT ON\n"
-#~ "{\n"
-#~ "  TABLE objektname |\n"
-#~ "  COLUMN tabellnamn.kolumnnamn |\n"
-#~ "  AGGREGATE agg_namn (agg_typ) |\n"
-#~ "  CAST (källtyp AS måltyp) |\n"
-#~ "  CONSTRAINT villkorsnamn ON tabellnamn |\n"
-#~ "  CONVERSION objektnamn |\n"
-#~ "  DATABASE objektnamn |\n"
-#~ "  DOMAIN objektnamn |\n"
-#~ "  FUNCTION funk_namn ( [ [ arg_läge ] [ arg_namn ] arg_typ [, ...] ] ) |\n"
-#~ "  INDEX objektnamn |\n"
-#~ "  LARGE OBJECT stort_objekt_oid |\n"
-#~ "  OPERATOR op (vänster operandstyp, höger operandstyp) |\n"
-#~ "  OPERATOR CLASS objektnamn USING indexmetod |\n"
-#~ "  [ PROCEDURAL ] LANGUAGE objektnamn |\n"
-#~ "  ROLE objektnamn |\n"
-#~ "  RULE regelnamn ON tabellnamn |\n"
-#~ "  SCHEMA objektnamn |\n"
-#~ "  SEQUENCE objektnamn |\n"
-#~ "  TRIGGER utlösarnamn ON tabellnamn |\n"
-#~ "  TYPE objektnamn |\n"
-#~ "  VIEW objektnamn\n"
-#~ "} IS 'text'"
-
-#~ msgid "COMMIT [ WORK | TRANSACTION ]"
-#~ msgstr "COMMIT [ WORK | TRANSACTION ]"
-
-#~ msgid "COMMIT PREPARED transaction_id"
-#~ msgstr "COMMIT PREPARED transaktions-id"
-
-#, fuzzy
-#~ msgid ""
-#~ "COPY tablename [ ( column [, ...] ) ]\n"
-#~ "    FROM { 'filename' | STDIN }\n"
-#~ "    [ [ WITH ] \n"
-#~ "          [ BINARY ]\n"
-#~ "          [ OIDS ]\n"
-#~ "          [ DELIMITER [ AS ] 'delimiter' ]\n"
-#~ "          [ NULL [ AS ] 'null string' ]\n"
-#~ "          [ CSV [ HEADER ]\n"
-#~ "                [ QUOTE [ AS ] 'quote' ] \n"
-#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
-#~ "                [ FORCE NOT NULL column [, ...] ]\n"
-#~ "\n"
-#~ "COPY { tablename [ ( column [, ...] ) ] | ( query ) }\n"
-#~ "    TO { 'filename' | STDOUT }\n"
-#~ "    [ [ WITH ] \n"
-#~ "          [ BINARY ]\n"
-#~ "          [ OIDS ]\n"
-#~ "          [ DELIMITER [ AS ] 'delimiter' ]\n"
-#~ "          [ NULL [ AS ] 'null string' ]\n"
-#~ "          [ CSV [ HEADER ]\n"
-#~ "                [ QUOTE [ AS ] 'quote' ] \n"
-#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
-#~ "                [ FORCE QUOTE column [, ...] ]"
-#~ msgstr ""
-#~ "COPY tabellnamn [ ( kolumn [, ...] ) ]\n"
-#~ "    FROM { 'filnamn' | STDIN }\n"
-#~ "    [ [ WITH ] \n"
-#~ "          [ BINARY ] \n"
-#~ "          [ OIDS ]\n"
-#~ "          [ DELIMITER [ AS ] 'avdelare' ]\n"
-#~ "          [ NULL [ AS ] 'null-sträng' ] ]\n"
-#~ "          [ CSV [ HEADER ]\n"
-#~ "                [ QUOTE [ AS ] 'citat' ]\n"
-#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
-#~ "                [ FORCE NOT NULL kolumn [, ...] ]\n"
-#~ "\n"
-#~ "COPY { tabellnamn [ ( kolumn [, ...] ) ] | ( fråga ) }\n"
-#~ "    TO { 'filnamn' | STDOUT }\n"
-#~ "    [ [ WITH ] \n"
-#~ "          [ BINARY ]\n"
-#~ "          [ HEADER ]\n"
-#~ "          [ OIDS ]\n"
-#~ "          [ DELIMITER [ AS ] 'avdelare' ]\n"
-#~ "          [ NULL [ AS ] 'null-sträng' ] ]\n"
-#~ "          [ CSV [ HEADER ]\n"
-#~ "                [ QUOTE [ AS ] 'citat' ]\n"
-#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
-#~ "                [ FORCE QUOTE kolumn [, ...] ]"
-
-#~ msgid ""
-#~ "CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
-#~ "    SFUNC = sfunc,\n"
-#~ "    STYPE = state_data_type\n"
-#~ "    [ , FINALFUNC = ffunc ]\n"
-#~ "    [ , INITCOND = initial_condition ]\n"
-#~ "    [ , SORTOP = sort_operator ]\n"
-#~ ")\n"
-#~ "\n"
-#~ "or the old syntax\n"
-#~ "\n"
-#~ "CREATE AGGREGATE name (\n"
-#~ "    BASETYPE = base_type,\n"
-#~ "    SFUNC = sfunc,\n"
-#~ "    STYPE = state_data_type\n"
-#~ "    [ , FINALFUNC = ffunc ]\n"
-#~ "    [ , INITCOND = initial_condition ]\n"
-#~ "    [ , SORTOP = sort_operator ]\n"
-#~ ")"
-#~ msgstr ""
-#~ "CREATE AGGREGATE namn ( indatatyp [ , ... ] ) (\n"
-#~ "    SFUNC = sfunc,\n"
-#~ "    STYPE = tillståndsdatatyp\n"
-#~ "    [ , FINALFUNC = ffunc ]\n"
-#~ "    [ , INITCOND = startvärde ]\n"
-#~ "    [ , SORTOP = sorteringsoperator ]\n"
-#~ ")\n"
-#~ "\n"
-#~ "eller den gamla syntaxen\n"
-#~ "\n"
-#~ "CREATE AGGREGATE namn (\n"
-#~ "    BASETYPE = indatatyp\n"
-#~ "    SFUNC = sfunc,\n"
-#~ "    STYPE = tillståndsdatatyp\n"
-#~ "    [ , FINALFUNC = ffunc ]\n"
-#~ "    [ , INITCOND = startvärde ]\n"
-#~ "    [ , SORTOP = sorteringsoperator ]\n"
-#~ ")"
-
-#~ msgid ""
-#~ "CREATE CAST (sourcetype AS targettype)\n"
-#~ "    WITH FUNCTION funcname (argtypes)\n"
-#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-#~ "\n"
-#~ "CREATE CAST (sourcetype AS targettype)\n"
-#~ "    WITHOUT FUNCTION\n"
-#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-#~ "\n"
-#~ "CREATE CAST (sourcetype AS targettype)\n"
-#~ "    WITH INOUT\n"
-#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]"
-#~ msgstr ""
-#~ "CREATE CAST (källtyp AS måltyp)\n"
-#~ "    WITH FUNCTION funknamn (argtyper)\n"
-#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-#~ "\n"
-#~ "CREATE CAST (källtyp AS måltyp)\n"
-#~ "    WITHOUT FUNCTION\n"
-#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-#~ "\n"
-#~ "CREATE CAST (källtyp AS måltyp)\n"
-#~ "    WITH INOUT\n"
-#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]"
-
-#~ msgid ""
-#~ "CREATE CONSTRAINT TRIGGER name\n"
-#~ "    AFTER event [ OR ... ]\n"
-#~ "    ON table_name\n"
-#~ "    [ FROM referenced_table_name ]\n"
-#~ "    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
-#~ "DEFERRED } }\n"
-#~ "    FOR EACH ROW\n"
-#~ "    EXECUTE PROCEDURE funcname ( arguments )"
-#~ msgstr ""
-#~ "CREATE CONSTRAINT TRIGGER namn \n"
-#~ "    AFTER händelse [ OR ... ]\n"
-#~ "    ON tabellnamn\n"
-#~ "    [ FROM refererat_tabellnamn ]\n"
-#~ "    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
-#~ "DEFERRED } }\n"
-#~ "    FOR EACH ROW\n"
-#~ "    EXECUTE PROCEDURE funktionsnamn ( argument )"
-
-#~ msgid ""
-#~ "CREATE [ DEFAULT ] CONVERSION name\n"
-#~ "    FOR source_encoding TO dest_encoding FROM funcname"
-#~ msgstr ""
-#~ "CREATE [ DEFAULT ] CONVERSION namn\n"
-#~ "    FOR källkodning TO målkodning FROM funknamn"
-
-#, fuzzy
-#~ msgid ""
-#~ "CREATE DATABASE name\n"
-#~ "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
-#~ "           [ TEMPLATE [=] template ]\n"
-#~ "           [ ENCODING [=] encoding ]\n"
-#~ "           [ LC_COLLATE [=] lc_collate ]\n"
-#~ "           [ LC_CTYPE [=] lc_ctype ]\n"
-#~ "           [ TABLESPACE [=] tablespace ]\n"
-#~ "           [ CONNECTION LIMIT [=] connlimit ] ]"
-#~ msgstr ""
-#~ "CREATE DATABASE namn\n"
-#~ "    [ [ WITH ] [ OWNER [=] db-ägare ]\n"
-#~ "           [ TEMPLATE [=] mall ]\n"
-#~ "           [ ENCODING [=] kodning ]\n"
-#~ "           [ TABLESPACE [=] tabellutrymme ] ]\n"
-#~ "           [ CONNECTION LIMIT [=] anslutningstak ] ]"
-
-#~ msgid ""
-#~ "CREATE DOMAIN name [ AS ] data_type\n"
-#~ "    [ DEFAULT expression ]\n"
-#~ "    [ constraint [ ... ] ]\n"
-#~ "\n"
-#~ "where constraint is:\n"
-#~ "\n"
-#~ "[ CONSTRAINT constraint_name ]\n"
-#~ "{ NOT NULL | NULL | CHECK (expression) }"
-#~ msgstr ""
-#~ "CREATE DOMAIN namn [ AS ] datatyp\n"
-#~ "    [ DEFAULT uttryck ]\n"
-#~ "    [ villkor [ ... ] ]\n"
-#~ "\n"
-#~ "där villkor är:\n"
-#~ "\n"
-#~ "[ CONSTRAINT villkorsnamn ]\n"
-#~ "{ NOT NULL | NULL | CHECK (uttryck) }"
-
-#, fuzzy
-#~ msgid ""
-#~ "CREATE [ OR REPLACE ] FUNCTION\n"
-#~ "    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
-#~ "[, ...] ] )\n"
-#~ "    [ RETURNS rettype\n"
-#~ "      | RETURNS TABLE ( colname coltype [, ...] ) ]\n"
-#~ "  { LANGUAGE langname\n"
-#~ "    | WINDOW\n"
-#~ "    | IMMUTABLE | STABLE | VOLATILE\n"
-#~ "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-#~ "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-#~ "    | COST execution_cost\n"
-#~ "    | ROWS result_rows\n"
-#~ "    | SET configuration_parameter { TO value | = value | FROM CURRENT }\n"
-#~ "    | AS 'definition'\n"
-#~ "    | AS 'obj_file', 'link_symbol'\n"
-#~ "  } ...\n"
-#~ "    [ WITH ( attribute [, ...] ) ]"
-#~ msgstr ""
-#~ "CREATE [ OR REPLACE ] FUNCTION\n"
-#~ "    namn ( [ [ arg_läge ] [ arg_namn ] arg_typ [, ...] ] )\n"
-#~ "    [ RETURNS rettyp ]\n"
-#~ "  { LANGUAGE språknamn\n"
-#~ "    | IMMUTABLE | STABLE | VOLATILE\n"
-#~ "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-#~ "    | [EXTERNAL] SECURITY INVOKER | [EXTERNAL] SECURITY DEFINER\n"
-#~ "    | AS 'definition'\n"
-#~ "    | AS 'obj-fil', 'länksymbol'\n"
-#~ "  } ...\n"
-#~ "    [ WITH ( attribut [, ...] ) ]"
-
-#~ msgid ""
-#~ "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
-#~ "\n"
-#~ "where option can be:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-#~ "    | VALID UNTIL 'timestamp' \n"
-#~ "    | IN ROLE rolename [, ...]\n"
-#~ "    | IN GROUP rolename [, ...]\n"
-#~ "    | ROLE rolename [, ...]\n"
-#~ "    | ADMIN rolename [, ...]\n"
-#~ "    | USER rolename [, ...]\n"
-#~ "    | SYSID uid"
-#~ msgstr ""
-#~ "CREATE GROUP namn [ [ WITH ] alternativ [ ... ] ]\n"
-#~ "\n"
-#~ "där alternativ kan vara:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'lösenord'\n"
-#~ "    | VALID UNTIL 'tidsstämpel' \n"
-#~ "    | IN ROLE rollnamn [, ...]\n"
-#~ "    | IN GROUP rollnamn [, ...]\n"
-#~ "    | ROLE rollnamn [, ...]\n"
-#~ "    | ADMIN rollnamn [, ...]\n"
-#~ "    | USER rollnamn [, ...]\n"
-#~ "    | SYSID uid"
-
-#~ msgid ""
-#~ "CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
-#~ "    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS "
-#~ "{ FIRST | LAST } ] [, ...] )\n"
-#~ "    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
-#~ "    [ TABLESPACE tablespace ]\n"
-#~ "    [ WHERE predicate ]"
-#~ msgstr ""
-#~ "CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] namn ON tabell [ USING metod ]\n"
-#~ "    ( { kolumn | ( uttryck ) } [ op-klass ] [ ASC | DESC ] [ NULLS "
-#~ "{ FIRST | LAST } ] [, ...] )\n"
-#~ "    [ WITH ( lagringsparameter = värde [, ... ] ) ]\n"
-#~ "    [ TABLESPACE tabellutrymme ]\n"
-#~ "    [ WHERE predikat ]"
-
-#~ msgid ""
-#~ "CREATE [ PROCEDURAL ] LANGUAGE name\n"
-#~ "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
-#~ "    HANDLER call_handler [ VALIDATOR valfunction ]"
-#~ msgstr ""
-#~ "CREATE [ PROCEDURAL ] LANGUAGE namn\n"
-#~ "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE namn\n"
-#~ "    HANDLER anropshanterare [ VALIDATOR val-funktion ]"
-
-#~ msgid ""
-#~ "CREATE OPERATOR name (\n"
-#~ "    PROCEDURE = funcname\n"
-#~ "    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"
-#~ "    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
-#~ "    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
-#~ "    [, HASHES ] [, MERGES ]\n"
-#~ ")"
-#~ msgstr ""
-#~ "CREATE OPERATOR namn (\n"
-#~ "    PROCEDURE = funknamn\n"
-#~ "    [, LEFTARG = vänster-typ ] [, RIGHTARG = höger-typ ]\n"
-#~ "    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
-#~ "    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
-#~ "    [, HASHES ] [, MERGES ]\n"
-#~ ")"
-
-#, fuzzy
-#~ msgid ""
-#~ "CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
-#~ "  USING index_method [ FAMILY family_name ] AS\n"
-#~ "  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ]\n"
-#~ "   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
-#~ "( argument_type [, ...] )\n"
-#~ "   | STORAGE storage_type\n"
-#~ "  } [, ... ]"
-#~ msgstr ""
-#~ "CREATE OPERATOR CLASS namn [ DEFAULT ] FOR TYPE datatyp USING indexmetod "
-#~ "AS\n"
-#~ "  {  OPERATOR strateginummer operatornamn [ ( op_typ, op_typ ) ] "
-#~ "[ RECHECK ]\n"
-#~ "   | FUNCTION supportnummer funknamn ( argumenttyp [, ...] )\n"
-#~ "   | STORAGE lagringstyp\n"
-#~ "  } [, ... ]"
-
-#~ msgid "CREATE OPERATOR FAMILY name USING index_method"
-#~ msgstr "CREATE OPERATOR FAMILY namn USING indexmetod"
-
-#~ msgid ""
-#~ "CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
-#~ "\n"
-#~ "where option can be:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT connlimit\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-#~ "    | VALID UNTIL 'timestamp' \n"
-#~ "    | IN ROLE rolename [, ...]\n"
-#~ "    | IN GROUP rolename [, ...]\n"
-#~ "    | ROLE rolename [, ...]\n"
-#~ "    | ADMIN rolename [, ...]\n"
-#~ "    | USER rolename [, ...]\n"
-#~ "    | SYSID uid"
-#~ msgstr ""
-#~ "CREATE ROLE namn [ [ WITH ] alternativ [ ... ] ]\n"
-#~ "\n"
-#~ "där alternativ kan vara:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT anslutningstak\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'lösenord'\n"
-#~ "    | VALID UNTIL 'tidsstämpel' \n"
-#~ "    | IN ROLE rollnamn [, ...]\n"
-#~ "    | IN GROUP rollnamn [, ...]\n"
-#~ "    | ROLE rollnamn [, ...]\n"
-#~ "    | ADMIN rollnamn [, ...]\n"
-#~ "    | USER rollnamn [, ...]\n"
-#~ "    | SYSID uid"
-
-#~ msgid ""
-#~ "CREATE [ OR REPLACE ] RULE name AS ON event\n"
-#~ "    TO table [ WHERE condition ]\n"
-#~ "    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; "
-#~ "command ... ) }"
-#~ msgstr ""
-#~ "CREATE [ OR REPLACE ] RULE namn AS ON händelse\n"
-#~ "    TO tabell [ WHERE villkor ]\n"
-#~ "    DO [ ALSO | INSTEAD ] { NOTHING | kommando | ( kommando ; "
-#~ "kommando ... ) }"
-
-#~ msgid ""
-#~ "CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element "
-#~ "[ ... ] ]\n"
-#~ "CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ]"
-#~ msgstr ""
-#~ "CREATE SCHEMA schema-namn [ AUTHORIZATION användarnamn ] [ schema-element "
-#~ "[ ... ] ]\n"
-#~ "CREATE SCHEMA AUTHORIZATION användarnamn [ schema-element [ ... ] ]"
-
-#~ msgid ""
-#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
-#~ "MAXVALUE ]\n"
-#~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-#~ "    [ OWNED BY { table.column | NONE } ]"
-#~ msgstr ""
-#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE namn [ INCREMENT [ BY ] "
-#~ "ökningsvärde ]\n"
-#~ "    [ MINVALUE minvärde | NO MINVALUE ] [ MAXVALUE maxvärde | NO "
-#~ "MAXVALUE ]\n"
-#~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-#~ "    [ OWNED BY { tabell.kolumn | NONE } ]"
-
-#, fuzzy
-#~ msgid ""
-#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
-#~ "  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
-#~ "[ ... ] ]\n"
-#~ "    | table_constraint\n"
-#~ "    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | "
-#~ "CONSTRAINTS | INDEXES } ] ... }\n"
-#~ "    [, ... ]\n"
-#~ "] )\n"
-#~ "[ INHERITS ( parent_table [, ... ] ) ]\n"
-#~ "[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
-#~ "OIDS ]\n"
-#~ "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-#~ "[ TABLESPACE tablespace ]\n"
-#~ "\n"
-#~ "where column_constraint is:\n"
-#~ "\n"
-#~ "[ CONSTRAINT constraint_name ]\n"
-#~ "{ NOT NULL | \n"
-#~ "  NULL | \n"
-#~ "  UNIQUE index_parameters |\n"
-#~ "  PRIMARY KEY index_parameters |\n"
-#~ "  CHECK ( expression ) |\n"
-#~ "  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | "
-#~ "MATCH SIMPLE ]\n"
-#~ "    [ ON DELETE action ] [ ON UPDATE action ] }\n"
-#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
-#~ "IMMEDIATE ]\n"
-#~ "\n"
-#~ "and table_constraint is:\n"
-#~ "\n"
-#~ "[ CONSTRAINT constraint_name ]\n"
-#~ "{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
-#~ "  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
-#~ "  CHECK ( expression ) |\n"
-#~ "  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "
-#~ "[, ... ] ) ]\n"
-#~ "    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] "
-#~ "[ ON UPDATE action ] }\n"
-#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
-#~ "IMMEDIATE ]\n"
-#~ "\n"
-#~ "index_parameters in UNIQUE and PRIMARY KEY constraints are:\n"
-#~ "\n"
-#~ "[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
-#~ "[ USING INDEX TABLESPACE tablespace ]"
-#~ msgstr ""
-#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tabellnamn ( [\n"
-#~ "  { kolumnname datatyp [ DEFAULT default_uttryck ] [ kolumnvillkor "
-#~ "[ ... ] ]\n"
-#~ "  | tabellvillkor\n"
-#~ "  | LIKE föräldratabell [ { INCLUDING | EXCLUDING } { DEFAULTS | "
-#~ "CONSTRAINTS } ] ... } \n"
-#~ "  [, ... ]\n"
-#~ "] )\n"
-#~ "[ INHERITS ( föräldratabell [, ... ] ) ]\n"
-#~ "[ WITH ( lagringsparameter [= värde] [, ... ] ) | WITH OIDS | WITHOUT \"\n"
-#~ "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-#~ "[ TABLESPACE tabellutrymme ]\n"
-#~ "\n"
-#~ "där kolumnvillkor är:\n"
-#~ "\n"
-#~ "[ CONSTRAINT villkorsnamn ]\n"
-#~ "{ NOT NULL |\n"
-#~ "  NULL |\n"
-#~ "  UNIQUE index_parameter |\n"
-#~ "  PRIMARY KEY index_parameter |\n"
-#~ "  CHECK (uttryck) |\n"
-#~ "  REFERENCES reftabell [ ( refkolumn ) ] [ MATCH FULL | MATCH PARTIAL | "
-#~ "MATCH SIMPLE ]\n"
-#~ "    [ ON DELETE aktion ] [ ON UPDATE aktion ] }\n"
-#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
-#~ "IMMEDIATE ]\n"
-#~ "\n"
-#~ "och tabellvillkor är:\n"
-#~ "\n"
-#~ "[ CONSTRAINT villkorsnamn ]\n"
-#~ "{ UNIQUE ( kolumnnamn [, ... ] ) index_parameter |\n"
-#~ "  PRIMARY KEY ( kolumnnamn [, ... ] ) index_parameter |\n"
-#~ "  CHECK ( uttryck ) |\n"
-#~ "  FOREIGN KEY ( kolumnnamn [, ... ] ) REFERENCES reftabell [ ( refkolumn "
-#~ "[, ... ] ) ]\n"
-#~ "    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE aktion ] "
-#~ "[ ON UPDATE aktion ] }\n"
-#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
-#~ "IMMEDIATE ]\n"
-#~ "\n"
-#~ "index_parameter i UNIQUE och PRIMARY KEY villkoren är:\\n\"\n"
-#~ "\n"
-#~ "[ WITH ( lagringsparameter [= värde] [, ... ] ) ]\n"
-#~ "[ USING INDEX TABLESPACE tabellutrymme ]"
-
-#~ msgid ""
-#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
-#~ "    [ (column_name [, ...] ) ]\n"
-#~ "    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
-#~ "OIDS ]\n"
-#~ "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-#~ "    [ TABLESPACE tablespace ]\n"
-#~ "    AS query\n"
-#~ "    [ WITH [ NO ] DATA ]"
-#~ msgstr ""
-#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tabellnamn\n"
-#~ "    [ (kolumnnamn [, ...] ) ]\n"
-#~ "    [ WITH ( lagringsparameter [= värde] [, ... ] ) | WITH OIDS | WITHOUT "
-#~ "OIDS ]\n"
-#~ "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-#~ "    [ TABLESPACE tabellutrymme ]\n"
-#~ "    AS fråga\n"
-#~ "    [ WITH [ NO ] DATA ]"
-
-#~ msgid ""
-#~ "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
-#~ msgstr ""
-#~ "CREATE TABLESPACE tabellutrymmesnamn [ OWNER användarnamn ] LOCATION "
-#~ "'katalog'"
-
-#~ msgid ""
-#~ "CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
-#~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-#~ "    EXECUTE PROCEDURE funcname ( arguments )"
-#~ msgstr ""
-#~ "CREATE TRIGGER namn { BEFORE | AFTER } { händelse [ OR ... ] }\n"
-#~ "    ON tabell [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-#~ "    EXECUTE PROCEDURE funknamn ( argument )"
-
-#, fuzzy
-#~ msgid ""
-#~ "CREATE TYPE name AS\n"
-#~ "    ( attribute_name data_type [, ... ] )\n"
-#~ "\n"
-#~ "CREATE TYPE name AS ENUM\n"
-#~ "    ( 'label' [, ... ] )\n"
-#~ "\n"
-#~ "CREATE TYPE name (\n"
-#~ "    INPUT = input_function,\n"
-#~ "    OUTPUT = output_function\n"
-#~ "    [ , RECEIVE = receive_function ]\n"
-#~ "    [ , SEND = send_function ]\n"
-#~ "    [ , TYPMOD_IN = type_modifier_input_function ]\n"
-#~ "    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
-#~ "    [ , ANALYZE = analyze_function ]\n"
-#~ "    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
-#~ "    [ , PASSEDBYVALUE ]\n"
-#~ "    [ , ALIGNMENT = alignment ]\n"
-#~ "    [ , STORAGE = storage ]\n"
-#~ "    [ , LIKE = like_type ]\n"
-#~ "    [ , CATEGORY = category ]\n"
-#~ "    [ , PREFERRED = preferred ]\n"
-#~ "    [ , DEFAULT = default ]\n"
-#~ "    [ , ELEMENT = element ]\n"
-#~ "    [ , DELIMITER = delimiter ]\n"
-#~ ")\n"
-#~ "\n"
-#~ "CREATE TYPE name"
-#~ msgstr ""
-#~ "CREATE TYPE namn AS\n"
-#~ "    ( attributnamn datatyp [, ... ] )\n"
-#~ "\n"
-#~ "CREATE TYPE namn (\n"
-#~ "    INPUT = inmatningsfunktion,\n"
-#~ "    OUTPUT = utmatningsfunktion\n"
-#~ "    [ , RECEIVE = mottagarfunktion ]\n"
-#~ "    [ , SEND = sändfunktion ]\n"
-#~ "    [ , ANALYZE = analysfunktion ]\n"
-#~ "    [ , INTERNALLENGTH = { internlängd | VARIABLE } ]\n"
-#~ "    [ , PASSEDBYVALUE ]\n"
-#~ "    [ , ALIGNMENT = justering ]\n"
-#~ "    [ , STORAGE = lagring ]\n"
-#~ "    [ , DEFAULT = standard ]\n"
-#~ "    [ , ELEMENT = element ]\n"
-#~ "    [ , DELIMITER = avskiljare ]\n"
-#~ ")\n"
-#~ "\n"
-#~ "CREATE TYPE namn"
-
-#~ msgid ""
-#~ "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
-#~ "\n"
-#~ "where option can be:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT connlimit\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-#~ "    | VALID UNTIL 'timestamp' \n"
-#~ "    | IN ROLE rolename [, ...]\n"
-#~ "    | IN GROUP rolename [, ...]\n"
-#~ "    | ROLE rolename [, ...]\n"
-#~ "    | ADMIN rolename [, ...]\n"
-#~ "    | USER rolename [, ...]\n"
-#~ "    | SYSID uid"
-#~ msgstr ""
-#~ "CREATE USER namn [ [ WITH ] alternativ [ ... ] ]\n"
-#~ "\n"
-#~ "där alternativ kan vara:\n"
-#~ "    \n"
-#~ "      SUPERUSER | NOSUPERUSER\n"
-#~ "    | CREATEDB | NOCREATEDB\n"
-#~ "    | CREATEROLE | NOCREATEROLE\n"
-#~ "    | CREATEUSER | NOCREATEUSER\n"
-#~ "    | INHERIT | NOINHERIT\n"
-#~ "    | LOGIN | NOLOGIN\n"
-#~ "    | CONNECTION LIMIT anslutningstak\n"
-#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'lösenord'\n"
-#~ "    | VALID UNTIL 'tidsstämpel' \n"
-#~ "    | IN ROLE rollnamn [, ...]\n"
-#~ "    | IN GROUP rollnamn [, ...]\n"
-#~ "    | ROLE rollnamn [, ...]\n"
-#~ "    | ADMIN rollnamn [, ...]\n"
-#~ "    | USER rollnamn [, ...]\n"
-#~ "    | SYSID uid"
-
-#~ msgid ""
-#~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
-#~ "[, ...] ) ]\n"
-#~ "    AS query"
-#~ msgstr ""
-#~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW namn [ ( kolumnnamn "
-#~ "[, ...] ) ]\n"
-#~ "    AS fråga"
-
-#~ msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
-#~ msgstr "DEALLOCATE [ PREPARE ] { namn | ALL }"
-
-#~ msgid ""
-#~ "DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-#~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
-#~ msgstr ""
-#~ "DECLARE namn [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-#~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR fråga"
-
-#~ msgid ""
-#~ "DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
-#~ "    [ USING usinglist ]\n"
-#~ "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-#~ msgstr ""
-#~ "DELETE FROM [ ONLY ] tabell [ [ AS ] alias ]\n"
-#~ "    [ USING using-lista ]\n"
-#~ "    [ WHERE villkor | WHERE CURRENT OF märkörnamn ]\n"
-#~ "    [ RETURNING * | utdatauttryck [ [ AS ] utdatanamn ] [, ...] ]"
-
-#~ msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
-#~ msgstr "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
-
-#~ msgid ""
-#~ "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | "
-#~ "RESTRICT ]"
-#~ msgstr ""
-#~ "DROP AGGREGATE [ IF EXISTS ] namn ( typ [ , ... ] ) [ CASCADE | RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP CAST [ IF EXISTS ] (källtyp AS måltyp) [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP CONVERSION [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP DATABASE [ IF EXISTS ] name"
-#~ msgstr "DROP DATABASE [ IF EXISTS ] namn"
-
-#~ msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP DOMAIN [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#, fuzzy
-#~ msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP CONVERSION [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype "
-#~ "[, ...] ] )\n"
-#~ "    [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "DROP FUNCTION [ IF EXISTS ] namn ( [ [ arg_läge ] [ arg_namn ] arg_typ "
-#~ "[, ...] ] )\n"
-#~ "    [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
-#~ msgstr "DROP GROUP [ IF EXISTS ] namn [, ...]"
-
-#~ msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP INDEX [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
-#~ "NONE } ) [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "DROP OPERATOR [ IF EXISTS ] namn ( { vänster_typ | NONE } , { höger_typ | "
-#~ "NONE } ) [ CASCADE | RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
-#~ "RESTRICT ]"
-#~ msgstr ""
-#~ "DROP OPERATOR CLASS [ IF EXISTS ] namn USING indexmetod [ CASCADE | "
-#~ "RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
-#~ "RESTRICT ]"
-#~ msgstr ""
-#~ "DROP OPERATOR FAMILY [ IF EXISTS ] namn USING indexmetod [ CASCADE | "
-#~ "RESTRICT ]"
-
-#~ msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP OWNED BY namn [, ...] [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
-#~ msgstr "DROP ROLE [ IF EXISTS ] namn [, ...]"
-
-#~ msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP RULE [ IF EXISTS ] namn ON relation [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP SCHEMA [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP SEQUENCE [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#, fuzzy
-#~ msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP CONVERSION [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP TABLE [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
-#~ msgstr "DROP TABLESPACE [ IF EXISTS ] tabellutrymmesnamn"
-
-#~ msgid ""
-#~ "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid ""
-#~ "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP TEXT SEARCH PARSER [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] namn [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP TRIGGER [ IF EXISTS ] namn ON tabell [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP TYPE [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#~ msgid "DROP USER [ IF EXISTS ] name [, ...]"
-#~ msgstr "DROP USER [ IF EXISTS ] namn [, ...]"
-
-#~ msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-#~ msgstr "DROP VIEW [ IF EXISTS ] namn [, ...] [ CASCADE | RESTRICT ]"
-
-#~ msgid "END [ WORK | TRANSACTION ]"
-#~ msgstr "END [ WORK | TRANSACTION ]"
-
-#~ msgid "EXECUTE name [ ( parameter [, ...] ) ]"
-#~ msgstr "EXECUTE namn [ ( parameter [, ...] ) ]"
-
-#~ msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
-#~ msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] sats"
-
-#~ msgid ""
-#~ "FETCH [ direction { FROM | IN } ] cursorname\n"
-#~ "\n"
-#~ "where direction can be empty or one of:\n"
-#~ "\n"
-#~ "    NEXT\n"
-#~ "    PRIOR\n"
-#~ "    FIRST\n"
-#~ "    LAST\n"
-#~ "    ABSOLUTE count\n"
-#~ "    RELATIVE count\n"
-#~ "    count\n"
-#~ "    ALL\n"
-#~ "    FORWARD\n"
-#~ "    FORWARD count\n"
-#~ "    FORWARD ALL\n"
-#~ "    BACKWARD\n"
-#~ "    BACKWARD count\n"
-#~ "    BACKWARD ALL"
-#~ msgstr ""
-#~ "FETCH [ riktning { FROM | IN } ] markörsnamn\n"
-#~ "\n"
-#~ "där riktning kan vara tom eller en av:\n"
-#~ "\n"
-#~ "    NEXT\n"
-#~ "    PRIOR\n"
-#~ "    FIRST\n"
-#~ "    LAST\n"
-#~ "    ABSOLUTE antal\n"
-#~ "    RELATIVE antal\n"
-#~ "    antal\n"
-#~ "    ALL\n"
-#~ "    FORWARD\n"
-#~ "    FORWARD antal\n"
-#~ "    FORWARD ALL\n"
-#~ "    BACKWARD\n"
-#~ "    BACKWARD antal\n"
-#~ "    BACKWARD ALL"
-
-#, fuzzy
-#~ msgid ""
-#~ "GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
-#~ "TRIGGER }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON [ TABLE ] tablename [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
-#~ "    ON [ TABLE ] tablename [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { USAGE | SELECT | UPDATE }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SEQUENCE sequencename [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
-#~ "[ PRIVILEGES ] }\n"
-#~ "    ON DATABASE dbname [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FOREIGN SERVER servername [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
-#~ "[, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON LANGUAGE langname [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SCHEMA schemaname [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON TABLESPACE tablespacename [, ...]\n"
-#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-#~ "\n"
-#~ "GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
-#~ msgstr ""
-#~ "GRANT { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON [ TABLE ] tabellnamn [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { USAGE | SELECT | UPDATE }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SEQUENCE sekvensnamn [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
-#~ "[ PRIVILEGES ] }\n"
-#~ "    ON DATABASE dbnamn [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FUNCTION funkname ( [ [ arg_läge ] [ arg_namn ] arg_typ "
-#~ "[, ...] ] ) [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON LANGUAGE språknamn [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SCHEMA schemanamn [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON TABLESPACE tabellutrymmesnamn [, ...]\n"
-#~ "    TO { användarnamn | GROUP gruppnamn | PUBLIC } [, ...] [ WITH GRANT "
-#~ "OPTION ]\n"
-#~ "\n"
-#~ "GRANT roll [, ...] TO användarnamn [, ...] [ WITH ADMIN OPTION ]"
-
-#~ msgid ""
-#~ "INSERT INTO table [ ( column [, ...] ) ]\n"
-#~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) "
-#~ "[, ...] | query }\n"
-#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-#~ msgstr ""
-#~ "INSERT INTO tabell [ ( kolumn [, ...] ) ]\n"
-#~ "    { DEFAULT VALUES | VALUES ( { uttryck | DEFAULT } [, ...] ) [, ...] | "
-#~ "fråga }\n"
-#~ "    [ RETURNING * | utdatauttryck [ [ AS ] utdatanamn ] [, ...] ]"
-
-#~ msgid "LISTEN name"
-#~ msgstr "LISTEN namn"
-
-#~ msgid "LOAD 'filename'"
-#~ msgstr "LOAD 'filnamn'"
-
-#~ msgid ""
-#~ "LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
-#~ "\n"
-#~ "where lockmode is one of:\n"
-#~ "\n"
-#~ "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
-#~ "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
-#~ msgstr ""
-#~ "LOCK [ TABLE ] [ ONLY ] namn [, ...] [ IN låsläge MODE ] [ NOWAIT ]\n"
-#~ "\n"
-#~ "där låsläge är en av:\n"
-#~ "\n"
-#~ "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
-#~ "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
-
-#~ msgid "MOVE [ direction { FROM | IN } ] cursorname"
-#~ msgstr "MOVE [ riktning { FROM | IN } ] markörnamn"
-
-#~ msgid "NOTIFY name"
-#~ msgstr "NOTIFY namn"
-
-#~ msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
-#~ msgstr "PREPARE namn [ ( datatyp [, ...] ) ] AS sats"
-
-#~ msgid "PREPARE TRANSACTION transaction_id"
-#~ msgstr "PREPARE TRANSACTION transaktions_id"
-
-#~ msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
-#~ msgstr "REASSIGN OWNED BY gammal_roll [, ...] TO ny_roll"
-
-#~ msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
-#~ msgstr "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } namn [ FORCE ]"
-
-#~ msgid "RELEASE [ SAVEPOINT ] savepoint_name"
-#~ msgstr "RELEASE [ SAVEPOINT ] sparpunktsnamn"
-
-#, fuzzy
-#~ msgid ""
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
-#~ "TRIGGER }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON [ TABLE ] tablename [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
-#~ "    ON [ TABLE ] tablename [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { USAGE | SELECT | UPDATE }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SEQUENCE sequencename [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
-#~ "[ PRIVILEGES ] }\n"
-#~ "    ON DATABASE dbname [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FOREIGN SERVER servername [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
-#~ "[, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON LANGUAGE langname [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SCHEMA schemaname [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { CREATE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON TABLESPACE tablespacename [, ...]\n"
-#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ ADMIN OPTION FOR ]\n"
-#~ "    role [, ...] FROM rolename [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { SELECT | INSERT | UPDATE | DELETE | REFERENCES | TRIGGER }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON [ TABLE ] tabellnamn [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { USAGE | SELECT | UPDATE }\n"
-#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SEQUENCE sekvensnamn [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON DATABASE dbnamn [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON FUNCTION funknamn ( [ [ arg_läge ] [ arg_namn ] arg_typ "
-#~ "[, ...] ] ) [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON LANGUAGE språknamn [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-#~ "    ON SCHEMA schemanamn [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ GRANT OPTION FOR ]\n"
-#~ "    { CREATE | ALL [ PRIVILEGES ] }\n"
-#~ "    ON TABLESPACE tabellutrymmesnamn [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]\n"
-#~ "\n"
-#~ "REVOKE [ ADMIN OPTION FOR ]\n"
-#~ "    rolk [, ...]\n"
-#~ "    FROM { användarnamn | GROUP gruppnamn | PUBLIC } [, ...]\n"
-#~ "    [ CASCADE | RESTRICT ]"
-
-#~ msgid "ROLLBACK [ WORK | TRANSACTION ]"
-#~ msgstr "ROLLBACK [ WORK | TRANSACTION ]"
-
-#~ msgid "ROLLBACK PREPARED transaction_id"
-#~ msgstr "ROLLBACK PREPARED transaktions_id"
-
-#~ msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
-#~ msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] sparpunktsnamn"
-
-#, fuzzy
-#~ msgid ""
-#~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-#~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-#~ "    * | expression [ [ AS ] output_name ] [, ...]\n"
-#~ "    [ FROM from_item [, ...] ]\n"
-#~ "    [ WHERE condition ]\n"
-#~ "    [ GROUP BY expression [, ...] ]\n"
-#~ "    [ HAVING condition [, ...] ]\n"
-#~ "    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-#~ "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST "
-#~ "| LAST } ] [, ...] ]\n"
-#~ "    [ LIMIT { count | ALL } ]\n"
-#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
-#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-#~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] "
-#~ "[...] ]\n"
-#~ "\n"
-#~ "where from_item can be one of:\n"
-#~ "\n"
-#~ "    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias "
-#~ "[, ...] ) ] ]\n"
-#~ "    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
-#~ "    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-#~ "    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
-#~ "[, ...] | column_definition [, ...] ) ]\n"
-#~ "    function_name ( [ argument [, ...] ] ) AS ( column_definition "
-#~ "[, ...] )\n"
-#~ "    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
-#~ "( join_column [, ...] ) ]\n"
-#~ "\n"
-#~ "and with_query is:\n"
-#~ "\n"
-#~ "    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
-#~ "\n"
-#~ "TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
-#~ msgstr ""
-#~ "SELECT [ ALL | DISTINCT [ ON ( uttryck [, ...] ) ] ]\n"
-#~ "    * | uttryck [ AS utnamn ] [, ...]\n"
-#~ "    [ FROM frånval [, ...] ]\n"
-#~ "    [ WHERE villkor ]\n"
-#~ "    [ GROUP BY uttryck [, ...] ]\n"
-#~ "    [ HAVING villkor [, ...] ]\n"
-#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-#~ "    [ ORDER BY uttryck [ ASC | DESC | USING operator ] [, ...] ]\n"
-#~ "    [ LIMIT { antal | ALL } ]\n"
-#~ "    [ OFFSET start ]\n"
-#~ "    [ FOR { UPDATE | SHARE } [ OF tabellnamn [, ...] ] [ NOWAIT ] "
-#~ "[...] ]\n"
-#~ "\n"
-#~ "där frånval kan vara en av:\n"
-#~ "\n"
-#~ "    [ ONLY ] tabellnamn [ * ] [ [ AS ] alias [ ( kolumnalias "
-#~ "[, ...] ) ] ]\n"
-#~ "    ( select ) [ AS ] alias [ ( kolumnalias [, ...] ) ]\n"
-#~ "    funktionsnamn ( [ argument [, ...] ] ) [ AS ] alias [ ( kolumnalias "
-#~ "[, ...] | kolumndefinition [, ...] ) ]\n"
-#~ "    funktionsnamn ( [ argument [, ...] ] ) AS ( kolumndefinition "
-#~ "[, ...] )\n"
-#~ "    frånval [ NATURAL ] join-typ frånval [ ON join-villkor | USING ( join-"
-#~ "kolumn [, ...] ) ]"
-
-#, fuzzy
-#~ msgid ""
-#~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-#~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-#~ "    * | expression [ [ AS ] output_name ] [, ...]\n"
-#~ "    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
-#~ "    [ FROM from_item [, ...] ]\n"
-#~ "    [ WHERE condition ]\n"
-#~ "    [ GROUP BY expression [, ...] ]\n"
-#~ "    [ HAVING condition [, ...] ]\n"
-#~ "    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-#~ "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST "
-#~ "| LAST } ] [, ...] ]\n"
-#~ "    [ LIMIT { count | ALL } ]\n"
-#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
-#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-#~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
-#~ msgstr ""
-#~ "SELECT [ ALL | DISTINCT [ ON ( uttryck [, ...] ) ] ]\n"
-#~ "    * | uttryck [ AS utnamn ] [, ...]\n"
-#~ "    INTO [ TEMPORARY | TEMP ] [ TABLE ] ny_tabell\n"
-#~ "    [ FROM frånval [, ...] ]\n"
-#~ "    [ WHERE villkor ]\n"
-#~ "    [ GROUP BY uttryck [, ...] ]\n"
-#~ "    [ HAVING villkor [, ...] ]\n"
-#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-#~ "    [ ORDER BY uttryck [ ASC | DESC | USING operator ] [, ...] ]\n"
-#~ "    [ LIMIT { antal | ALL } ]\n"
-#~ "    [ OFFSET start ]\n"
-#~ "    [ FOR { UPDATE | SHARE } [ OF tabellnamn [, ...] ] [ NOWAIT ] [...] ]"
-
-#~ msgid ""
-#~ "SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | "
-#~ "'value' | DEFAULT }\n"
-#~ "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
-#~ msgstr ""
-#~ "SET [ SESSION | LOCAL ] konfigurationsparameter { TO | = } { värde | "
-#~ "'värde' | DEFAULT }\n"
-#~ "SET [ SESSION | LOCAL ] TIME ZONE { tidszon | LOCAL | DEFAULT }"
-
-#~ msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
-#~ msgstr "SET CONSTRAINTS { ALL | namn [, ...] } { DEFERRED | IMMEDIATE }"
-
-#~ msgid ""
-#~ "SET [ SESSION | LOCAL ] ROLE rolename\n"
-#~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
-#~ "RESET ROLE"
-#~ msgstr ""
-#~ "SET [ SESSION | LOCAL ] ROLE rollnamn\n"
-#~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
-#~ "RESET ROLE"
-
-#~ msgid ""
-#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
-#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
-#~ "RESET SESSION AUTHORIZATION"
-#~ msgstr ""
-#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION användarnamn\n"
-#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
-#~ "RESET SESSION AUTHORIZATION"
-
-#~ msgid ""
-#~ "SET TRANSACTION transaction_mode [, ...]\n"
-#~ "SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
-#~ "\n"
-#~ "where transaction_mode is one of:\n"
-#~ "\n"
-#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
-#~ "READ UNCOMMITTED }\n"
-#~ "    READ WRITE | READ ONLY"
-#~ msgstr ""
-#~ "SET TRANSACTION transaktionsläge [, ...]\n"
-#~ "SET SESSION CHARACTERISTICS AS TRANSACTION transaktionsläge [, ...]\n"
-#~ "\n"
-#~ "där transaktionsläge är en av:\n"
-#~ "\n"
-#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
-#~ "READ UNCOMMITTED }\n"
-#~ "    READ WRITE | READ ONLY"
-
-#~ msgid ""
-#~ "SHOW name\n"
-#~ "SHOW ALL"
-#~ msgstr ""
-#~ "SHOW namn\n"
-#~ "SHOW ALL"
-
-#~ msgid ""
-#~ "START TRANSACTION [ transaction_mode [, ...] ]\n"
-#~ "\n"
-#~ "where transaction_mode is one of:\n"
-#~ "\n"
-#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
-#~ "READ UNCOMMITTED }\n"
-#~ "    READ WRITE | READ ONLY"
-#~ msgstr ""
-#~ "START TRANSACTION [ transaktionsläge [, ...] ]\n"
-#~ "\n"
-#~ "där transaktionsläge är en av:\n"
-#~ "\n"
-#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
-#~ "READ UNCOMMITTED }\n"
-#~ "    READ WRITE | READ ONLY"
-
-#~ msgid ""
-#~ "TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
-#~ "    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
-#~ msgstr ""
-#~ "TRUNCATE [ TABLE ] [ ONLY ] namn [, ... ]\n"
-#~ "    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
-
-#~ msgid "UNLISTEN { name | * }"
-#~ msgstr "UNLISTEN { namn | * }"
-
-#~ msgid ""
-#~ "UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
-#~ "    SET { column = { expression | DEFAULT } |\n"
-#~ "          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } "
-#~ "[, ...]\n"
-#~ "    [ FROM fromlist ]\n"
-#~ "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-#~ msgstr ""
-#~ "UPDATE [ ONLY ] tabell [ [ AS ] alias ]\n"
-#~ "    SET { kolumn = { uttryck | DEFAULT } |\n"
-#~ "          ( kolumn [, ...] ) = ( { uttryck | DEFAULT } [, ...] ) } "
-#~ "[, ...]\n"
-#~ "    [ FROM frånlista ]\n"
-#~ "    [ WHERE villkor | WHERE CURRENT OF markörnamn ]\n"
-#~ "    [ RETURNING * | utdatauttryck [ [ AS ] utdatanamn ] [, ...] ]"
-
-#~ msgid ""
-#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
-#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
-#~ "[, ...] ) ] ]"
-#~ msgstr ""
-#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ tabell ]\n"
-#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ tabell [ (kolumn "
-#~ "[, ...] ) ] ]"
-
-#~ msgid ""
-#~ "VALUES ( expression [, ...] ) [, ...]\n"
-#~ "    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
-#~ "    [ LIMIT { count | ALL } ]\n"
-#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
-#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
-#~ msgstr ""
-#~ "VALUES ( uttryck [, ...] ) [, ...]\n"
-#~ "    [ ORDER BY sorteringsuttryck [ ASC | DESC | USING operator ] "
-#~ "[, ...] ]\n"
-#~ "    [ LIMIT { antal | ALL } ]\n"
-#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
-#~ "    [ FETCH { FIRST | NEXT } [ antal ] { ROW | ROWS } ONLY ]"
-
-#~ msgid ""
-#~ "WARNING:  You are connected to a server with major version %d.%d,\n"
-#~ "but your %s client is major version %d.%d.  Some backslash commands,\n"
-#~ "such as \\d, might not work properly.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "VARNING:  Du är uppkopplad mot en server med version %d.%d,\n"
-#~ "men din klient %s är version %d.%d.  En del snedstreckkommandon\n"
-#~ "så som \\d kommer eventuellt inte att fungera som de skall.\n"
-#~ "\n"
diff --git a/src/bin/psql/po/tr.po b/src/bin/psql/po/tr.po
index f5159159a70c9..3d974cf8c787a 100644
--- a/src/bin/psql/po/tr.po
+++ b/src/bin/psql/po/tr.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psql-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-11 05:09+0000\n"
-"PO-Revision-Date: 2009-06-11 10:57+0200\n"
+"POT-Creation-Date: 2011-08-29 20:41+0000\n"
+"PO-Revision-Date: 2011-09-01 03:44+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,204 +18,229 @@ msgstr ""
 "X-Poedit-Country: TURKEY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.3.1\n"
-"X-Poedit-Basepath: /home/ntufar/pg/pgsql/src/bin/psql/\n"
+"X-Poedit-Basepath: /home/devrim/PostgreSQL/pgsql-cvs/pgsql\n"
 "X-Poedit-Bookmarks: -1,-1,333,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: command.c:112
+#: command.c:113
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Geçersiz komut \\%s. Yardım için \\? yazınız.\n"
 
-#: command.c:114
+#: command.c:115
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "geçersiz komut \\%s\n"
 
-#: command.c:125
+#: command.c:126
 #, c-format
 msgid "\\%s: extra argument \"%s\" ignored\n"
 msgstr "\\%s: \"%s\" fazla parametresi atlandı\n"
 
-#: command.c:267
+#: command.c:268
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "home dizinine ulaşılamamıştır: %s\n"
 
-#: command.c:283
+#: command.c:284
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: \"%s\" dizinine geçiş yapılamamıştır: %s\n"
 
-#: command.c:316
-#: common.c:935
+#: command.c:305
+#: common.c:493
+#: common.c:773
+#, c-format
+msgid "You are currently not connected to a database.\n"
+msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
+
+#: command.c:312
+#, fuzzy, c-format
+msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
+msgstr "\"%2$s\" kullanıcısı olarak \"%1$s\" veritabanına bağlanıldı\n"
+
+#: command.c:315
+#, fuzzy, c-format
+msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
+msgstr "\"%2$s\" kullanıcısı olarak \"%1$s\" veritabanına bağlanıldı\n"
+
+#: command.c:339
+#: common.c:940
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "Süre: %.3f milisaniye\n"
 
-#: command.c:468
-#: command.c:496
-#: command.c:1035
+#: command.c:524
+#: command.c:588
+#: command.c:1290
+#, c-format
 msgid "no query buffer\n"
 msgstr "sorgu tamponu mevcut deÄŸil\n"
 
-#: command.c:538
+#: command.c:557
+#: command.c:2534
+#, c-format
+msgid "invalid line number: %s\n"
+msgstr "Geçersiz satır numarası: %s\n"
+
+#: command.c:662
 msgid "No changes"
 msgstr "DeÄŸiÅŸiklik yok"
 
-#: command.c:592
+#: command.c:716
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s: dil kodlama adı geçersiz ya da dönüştürme fonksiyonu bulunamadı\n"
 
-#: command.c:660
-#: command.c:694
-#: command.c:708
-#: command.c:725
-#: command.c:829
-#: command.c:879
-#: command.c:1015
-#: command.c:1046
+#: command.c:796
+#: command.c:834
+#: command.c:848
+#: command.c:865
+#: command.c:969
+#: command.c:1019
+#: command.c:1270
+#: command.c:1301
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: zorunlu argüman eksik\n"
 
-#: command.c:757
+#: command.c:897
 msgid "Query buffer is empty."
 msgstr "Sorgu tamponu boÅŸ."
 
-#: command.c:767
+#: command.c:907
 msgid "Enter new password: "
 msgstr "Yeni ÅŸifre girin:"
 
-#: command.c:768
+#: command.c:908
 msgid "Enter it again: "
 msgstr "Yıneden girin:"
 
-#: command.c:772
+#: command.c:912
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Şifreler uyuşmıyor.\n"
 
-#: command.c:790
+#: command.c:930
 #, c-format
 msgid "Password encryption failed.\n"
 msgstr "Parola şifrleme hatası.\n"
 
-#: command.c:858
-#: command.c:959
-#: command.c:1020
-#, c-format
-msgid "\\%s: error\n"
-msgstr "\\%s: hata\n"
+#: command.c:998
+#: command.c:1099
+#: command.c:1275
+#, fuzzy, c-format
+msgid "\\%s: error while setting variable\n"
+msgstr "%s: \"%s\" değişkeni atanamıyor\n"
 
-#: command.c:899
+#: command.c:1039
 msgid "Query buffer reset (cleared)."
 msgstr "Sorgu tamponu sıfırlanmış."
 
-#: command.c:912
+#: command.c:1052
 #, c-format
 msgid "Wrote history to file \"%s/%s\".\n"
 msgstr "Geçmiş, \"%s/%s\" dosyasına yazılmış.\n"
 
-#: command.c:950
+#: command.c:1090
 #: common.c:52
 #: common.c:66
-#: input.c:198
-#: mainloop.c:69
-#: mainloop.c:227
-#: print.c:61
-#: print.c:75
+#: common.c:90
+#: input.c:209
+#: mainloop.c:72
+#: mainloop.c:234
+#: print.c:137
+#: print.c:151
 #, c-format
 msgid "out of memory\n"
 msgstr "yetersiz bellek\n"
 
-#: command.c:1000
+#: command.c:1120
+#, c-format
+msgid "function name is required\n"
+msgstr "fonksiyon adı gerekli\n"
+
+#: command.c:1255
 msgid "Timing is on."
 msgstr "Zamanlama açık."
 
-#: command.c:1002
+#: command.c:1257
 msgid "Timing is off."
 msgstr "Zamanlama kapalı."
 
-#: command.c:1063
-#: command.c:1083
-#: command.c:1581
-#: command.c:1588
-#: command.c:1597
-#: command.c:1607
-#: command.c:1616
-#: command.c:1630
-#: command.c:1647
-#: command.c:1680
+#: command.c:1318
+#: command.c:1338
+#: command.c:1900
+#: command.c:1907
+#: command.c:1916
+#: command.c:1926
+#: command.c:1935
+#: command.c:1949
+#: command.c:1966
+#: command.c:2026
 #: common.c:137
-#: copy.c:517
-#: copy.c:581
+#: copy.c:283
+#: copy.c:361
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:1165
+#: command.c:1420
 #: startup.c:159
 msgid "Password: "
 msgstr "Åžifre: "
 
-#: command.c:1172
+#: command.c:1427
 #: startup.c:162
 #: startup.c:164
 #, c-format
 msgid "Password for user %s: "
 msgstr "%s kulalnıcısının şifresi: "
 
-#: command.c:1268
-#: command.c:2110
+#: command.c:1546
+#: command.c:2568
 #: common.c:183
 #: common.c:460
 #: common.c:525
-#: common.c:811
-#: common.c:836
-#: common.c:920
-#: copy.c:652
-#: copy.c:697
-#: copy.c:826
+#: common.c:816
+#: common.c:841
+#: common.c:925
+#: copy.c:432
+#: copy.c:477
+#: copy.c:607
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1272
+#: command.c:1550
 msgid "Previous connection kept\n"
 msgstr "Önceki bağlantı kullanılacaktır\n"
 
-#: command.c:1276
+#: command.c:1554
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1300
-#, c-format
-msgid "You are now connected to database \"%s\""
+#: command.c:1587
+#, fuzzy, c-format
+msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
 msgstr "Şu an \"%s\" veritabanına bağlısınız"
 
-#: command.c:1303
+#: command.c:1590
 #, c-format
-msgid " on host \"%s\""
-msgstr " \"%s\" sistemi"
+msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
+msgstr "Şu anda \"%s\" veritabanına \"%s\" kullanıcısı ile \"%s\" sunucusunda \"%s\". porttan bağlısınız.\n"
 
-#: command.c:1306
+#: command.c:1594
 #, c-format
-msgid " at port \"%s\""
-msgstr " \"%s\" portunda"
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr "Şu an \"%s\" veritabanına \"%s\" kullanıcısı ile bağlısınız.\n"
 
-#: command.c:1309
-#, c-format
-msgid " as user \"%s\""
-msgstr " \"%s\" kullanıcısı"
-
-#: command.c:1344
+#: command.c:1628
 #, c-format
 msgid "%s (%s, server %s)\n"
 msgstr "%s (%s, sunucu %s)\n"
 
-#: command.c:1351
+#: command.c:1636
 #, c-format
 msgid ""
 "WARNING: %s version %d.%d, server version %d.%d.\n"
@@ -223,17 +249,17 @@ msgstr ""
 "UYARI: %s sürümü %d.%d, sunucu sürümü %d.%d.\n"
 "         Bazı psql özellikleri çalışmayabilir.\n"
 
-#: command.c:1381
+#: command.c:1666
 #, c-format
-msgid "SSL connection (cipher: %s, bits: %i)\n"
-msgstr "SSL bağlantısı (cipher: %s, bit sayısı: %i)\n"
+msgid "SSL connection (cipher: %s, bits: %d)\n"
+msgstr "SSL bağlantısı (cipher: %s, bit sayısı: %d)\n"
 
-#: command.c:1390
+#: command.c:1676
 #, c-format
 msgid "SSL connection (unknown cipher)\n"
 msgstr "SSL bağlantısı (bilinmeyen cipher)\n"
 
-#: command.c:1411
+#: command.c:1697
 #, c-format
 msgid ""
 "WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -244,136 +270,154 @@ msgstr ""
 "         8-bitlik karakterler doğru çalışmayabilir. Ayrıntılar için psql referans\n"
 "         belgelerinde \"Windows kullanıcılarına notlar\" bölümüne bakın.\n"
 
-#: command.c:1500
+#: command.c:1781
+#, c-format
+msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number\n"
+msgstr "bir satır numarası belirtmek için PSQL_EDITOR_LINENUMBER_ARG çevresel değişkenini ayarlamanız gereklidir\n"
+
+#: command.c:1818
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "\"%s\" metin düzenleyicisi çalıştırılamadı\n"
 
-#: command.c:1502
+#: command.c:1820
+#, c-format
 msgid "could not start /bin/sh\n"
 msgstr "/bin/sh başlatılamıyor\n"
 
-#: command.c:1539
+#: command.c:1858
 #, c-format
-msgid "cannot locate temporary directory: %s"
-msgstr "geçici dizin bulunamıyor: %s"
+msgid "could not locate temporary directory: %s\n"
+msgstr "geçici dizin bulunamıyor: %s\n"
 
-#: command.c:1566
+#: command.c:1885
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "\"%s\" geçici dosya açılamıyor: %s\n"
 
-#: command.c:1764
+#: command.c:2137
+#, c-format
 msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n"
 msgstr "\\pset: izin verilen biçimler: unaligned, aligned, wrapped, html, latex, troff-ms\n"
 
-#: command.c:1769
+#: command.c:2142
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Çıktı formatı: %s.\n"
 
-#: command.c:1779
+#: command.c:2158
+#, c-format
+msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
+msgstr ""
+
+#: command.c:2163
+#, c-format
+msgid "Line style is %s.\n"
+msgstr "Satır stili: %s.\n"
+
+#: command.c:2174
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Kenar stili: %d.\n"
 
-#: command.c:1791
+#: command.c:2186
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "Geniş gösterme açık.\n"
 
-#: command.c:1792
+#: command.c:2187
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "Geniş gösterme kapalı.\n"
 
-#: command.c:1805
+#: command.c:2200
 msgid "Showing locale-adjusted numeric output."
 msgstr "Yerel duyarlı sayısal çıktı gösteriliyor."
 
-#: command.c:1807
+#: command.c:2202
 msgid "Locale-adjusted numeric output is off."
 msgstr "Yerel duyarlı sayısıal çıktı biçimlendirme kapalı."
 
-#: command.c:1820
+#: command.c:2215
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null display is \"%s\".\n"
 
-#: command.c:1832
+#: command.c:2227
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Alan ayracı: \"%s\".\n"
 
-#: command.c:1846
+#: command.c:2241
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "Kayıt ayracı <newline>."
 
-#: command.c:1848
+#: command.c:2243
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "Kayıt ayracı \"%s\".\n"
 
-#: command.c:1862
+#: command.c:2257
 msgid "Showing only tuples."
 msgstr "Sadece kayıtlar gösteriliyor."
 
-#: command.c:1864
+#: command.c:2259
 msgid "Tuples only is off."
 msgstr "Sadece kayıtları gösterme kapalı."
 
-#: command.c:1880
+#: command.c:2275
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Başlık \"%s\".\n"
 
-#: command.c:1882
+#: command.c:2277
 #, c-format
 msgid "Title is unset.\n"
 msgstr "Başlık kaldırıldı\n"
 
-#: command.c:1898
+#: command.c:2293
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Tablo özelliği: \"%s\".\n"
 
-#: command.c:1900
+#: command.c:2295
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "Tablo özellikleri kaldırıldı.\n"
 
-#: command.c:1921
+#: command.c:2316
 msgid "Pager is used for long output."
 msgstr "Uzun çıktı için sayfalama kullanıacaktır."
 
-#: command.c:1923
+#: command.c:2318
 msgid "Pager is always used."
 msgstr "Sayfalama her zaman kullanılacak."
 
-#: command.c:1925
+#: command.c:2320
 msgid "Pager usage is off."
 msgstr "Sayfalama kullanımı kapalı."
 
-#: command.c:1939
+#: command.c:2334
 msgid "Default footer is on."
 msgstr "Varsayılan alt başlık açık."
 
-#: command.c:1941
+#: command.c:2336
 msgid "Default footer is off."
 msgstr "Varsayılan alt başlık kapalı."
 
-#: command.c:1952
+#: command.c:2347
 #, c-format
 msgid "Target width for \"wrapped\" format is %d.\n"
 msgstr " \"wrapped\" biçimi için hedef genişlik %d.\n"
 
-#: command.c:1957
+#: command.c:2352
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: bilinmeyen seçenek: %s\n"
 
-#: command.c:2011
+#: command.c:2406
+#, c-format
 msgid "\\!: failed\n"
 msgstr "\\!: başarısız\n"
 
@@ -382,11 +426,8 @@ msgstr "\\!: başarısız\n"
 msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: pg_strdup: null pointer  duplicate edilemiyor (iç hata)\n"
 
-#: common.c:90
-msgid "out of memory"
-msgstr "yetersiz bellek"
-
 #: common.c:343
+#, c-format
 msgid "connection to server was lost\n"
 msgstr "sunucuya bağlantı kesildi\n"
 
@@ -402,14 +443,9 @@ msgstr "Başarısız.\n"
 msgid "Succeeded.\n"
 msgstr "Başarılı.\n"
 
-#: common.c:493
-#: common.c:768
-msgid "You are currently not connected to a database.\n"
-msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
-
 #: common.c:499
 #: common.c:506
-#: common.c:794
+#: common.c:799
 #, c-format
 msgid ""
 "********* QUERY **********\n"
@@ -422,12 +458,17 @@ msgstr ""
 "**************************\n"
 "\n"
 
-#: common.c:558
+#: common.c:560
+#, fuzzy, c-format
+msgid "Asynchronous notification \"%s\" with payload \"%s\" received from server process with PID %d.\n"
+msgstr "PID %2$d olan sunucu sürecinden \"%1$s\" asenkon bildiri alınmış.\n"
+
+#: common.c:563
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "PID %2$d olan sunucu sürecinden \"%1$s\" asenkon bildiri alınmış.\n"
 
-#: common.c:776
+#: common.c:781
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -438,56 +479,62 @@ msgstr ""
 "%s\n"
 "***(devam etmek için return, durdurmak için x ve return'e basınız)********************\n"
 
-#: common.c:827
+#: common.c:832
 #, c-format
 msgid "The server (version %d.%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"
 msgstr "Sunucu (%d.%d sürümü)  ON_ERROR_ROLLBACK için savepointleri desteklememektedir.\n"
 
-#: copy.c:120
+#: copy.c:96
+#, c-format
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: parametre eksik\n"
 
-#: copy.c:399
+#: copy.c:228
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: \"%s\" ifadesinde ayrıştırma hatası\n"
 
-#: copy.c:401
+#: copy.c:230
+#, c-format
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: satır sonunda ayrıştırma hatası\n"
 
-#: copy.c:528
+#: copy.c:294
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: dizinden ya da dizine kopyalanamıyor\n"
 
-#: copy.c:554
+#: copy.c:331
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:558
-#: copy.c:572
+#: copy.c:335
+#: copy.c:349
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: beklenmeyen yanıt (%d)\n"
 
-#: copy.c:627
-#: copy.c:637
+#: copy.c:353
+msgid "trying to exit copy mode"
+msgstr "copy modundan çıkmaya çalışıyor"
+
+#: copy.c:407
+#: copy.c:417
 #, c-format
 msgid "could not write COPY data: %s\n"
 msgstr "COPY verisi yazılamadı: %s\n"
 
-#: copy.c:644
+#: copy.c:424
 #, c-format
 msgid "COPY data transfer failed: %s"
 msgstr "COPY veri aktarımı başarısız: %s"
 
-#: copy.c:692
+#: copy.c:472
 msgid "canceled by user"
 msgstr "kullanıcı tarafından iptal edildi"
 
-#: copy.c:707
+#: copy.c:487
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -495,24 +542,24 @@ msgstr ""
 "Kopyalanacak veriyi girin ve ardından entera basın.\n"
 "Sonuçlandırmak için yeni satırda ters taksim işareti ve nokta girin."
 
-#: copy.c:819
+#: copy.c:600
 msgid "aborted because of read failure"
 msgstr "okuma hatası nedeniyle kesildi"
 
-#: help.c:52
+#: help.c:48
 msgid "on"
 msgstr "açık"
 
-#: help.c:52
+#: help.c:48
 msgid "off"
 msgstr "kapalı"
 
-#: help.c:74
+#: help.c:70
 #, c-format
 msgid "could not get current user name: %s\n"
 msgstr "geçerli kullanıcı adı alınamadı: %s\n"
 
-#: help.c:86
+#: help.c:82
 #, c-format
 msgid ""
 "psql is the PostgreSQL interactive terminal.\n"
@@ -521,12 +568,12 @@ msgstr ""
 "psql PostgreSQL'in  etkilişimli arayüzüdür.\n"
 "\n"
 
-#: help.c:87
+#: help.c:83
 #, c-format
 msgid "Usage:\n"
 msgstr "Kullanımı:\n"
 
-#: help.c:88
+#: help.c:84
 #, c-format
 msgid ""
 "  psql [OPTION]... [DBNAME [USERNAME]]\n"
@@ -535,32 +582,32 @@ msgstr ""
 "  psql [SEÇENEK]... [VERİTABANI ADI [KULLANICI ADI]]\n"
 "\n"
 
-#: help.c:90
+#: help.c:86
 #, c-format
 msgid "General options:\n"
 msgstr "Genel seçenekler:\n"
 
-#: help.c:95
+#: help.c:91
 #, c-format
 msgid "  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n"
 msgstr "  -c, --command=KOMUT    tek bir komut çalıştır (SQL ya da dahili) ve çık\n"
 
-#: help.c:96
+#: help.c:92
 #, c-format
 msgid "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
 msgstr "  -d, --dbname=DBNAME      bağlanılacak veritabanının adı (öntanımlı: \"%s\")\n"
 
-#: help.c:97
+#: help.c:93
 #, c-format
 msgid "  -f, --file=FILENAME      execute commands from file, then exit\n"
 msgstr "  -f, --file=DOSYA ADI     dosyadan komutları çalıştır ve çık\n"
 
-#: help.c:98
+#: help.c:94
 #, c-format
 msgid "  -l, --list               list available databases, then exit\n"
 msgstr "  -l, --list               veritabanlarını listele ve çık\n"
 
-#: help.c:99
+#: help.c:95
 #, c-format
 msgid ""
 "  -v, --set=, --variable=NAME=VALUE\n"
@@ -569,12 +616,12 @@ msgstr ""
 "  -v, --set=, --variable=ADI=DEÄžER\n"
 "                            ADI kısmında belirtilen psql değişkeninin değerini DEĞER ile belirtilen değer olarak ata\n"
 
-#: help.c:101
+#: help.c:97
 #, c-format
 msgid "  -X, --no-psqlrc          do not read startup file (~/.psqlrc)\n"
 msgstr "  -X , --no-psqlrc         başlangıç dosyasını (~/.psqlrc) okuma\n"
 
-#: help.c:102
+#: help.c:98
 #, c-format
 msgid ""
 "  -1 (\"one\"), --single-transaction\n"
@@ -583,17 +630,17 @@ msgstr ""
 "  -1 (\"one\"), --single-transaction\n"
 "                           komut dosyasını tek bir transaction olarak çalıştır\n"
 
-#: help.c:104
+#: help.c:100
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   bu yardımı gösterir ve çıkar\n"
 
-#: help.c:105
+#: help.c:101
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                sürüm bilgisini gösterir ve çıkar\n"
 
-#: help.c:107
+#: help.c:103
 #, c-format
 msgid ""
 "\n"
@@ -602,52 +649,52 @@ msgstr ""
 "\n"
 "Giriş ve çıkış tercihleri:\n"
 
-#: help.c:108
+#: help.c:104
 #, c-format
 msgid "  -a, --echo-all           echo all input from script\n"
 msgstr "  -a, --echo-all           betik dosyasının içeriğini yansıt\n"
 
-#: help.c:109
+#: help.c:105
 #, c-format
 msgid "  -e, --echo-queries       echo commands sent to server\n"
 msgstr "  -e, --echo-queries       sunucuya gönderilen komutları yansıt\n"
 
-#: help.c:110
+#: help.c:106
 #, c-format
 msgid "  -E, --echo-hidden        display queries that internal commands generate\n"
 msgstr "  -E, --echo-hidden        dahili komutların ürettiği sorguları göster\n"
 
-#: help.c:111
+#: help.c:107
 #, c-format
 msgid "  -L, --log-file=FILENAME  send session log to file\n"
 msgstr "  -L, --log-file=DOSYA ADI  oturum kaydını dosyaya kaydet\n"
 
-#: help.c:112
+#: help.c:108
 #, c-format
 msgid "  -n, --no-readline        disable enhanced command line editing (readline)\n"
 msgstr "  -n, --no-readline        gelişmiş komut satırı düzenleyicisini devre dışı bırak (readline)\n"
 
-#: help.c:113
+#: help.c:109
 #, c-format
 msgid "  -o, --output=FILENAME    send query results to file (or |pipe)\n"
 msgstr "  -o, --output=DOSYA ADI    sorgu sonuçlarını dosyaya aktar (ya da |pipe)\n"
 
-#: help.c:114
+#: help.c:110
 #, c-format
 msgid "  -q, --quiet              run quietly (no messages, only query output)\n"
 msgstr "  -q, --quiet              sessiz biçim (mesajlar kapalı, sadece sorgu sonuçları açık)\n"
 
-#: help.c:115
+#: help.c:111
 #, c-format
 msgid "  -s, --single-step        single-step mode (confirm each query)\n"
 msgstr "  -s, --single-step        tek adım biçimi (her sorguyu onaylama)\n"
 
-#: help.c:116
+#: help.c:112
 #, c-format
 msgid "  -S, --single-line        single-line mode (end of line terminates SQL command)\n"
 msgstr "  -S, --single-line        tek satır modu (satır sonu SQL komutunu sonlandırır)\n"
 
-#: help.c:118
+#: help.c:114
 #, c-format
 msgid ""
 "\n"
@@ -656,12 +703,12 @@ msgstr ""
 "\n"
 "Çıktı biçimi seçenekleri:\n"
 
-#: help.c:119
+#: help.c:115
 #, c-format
 msgid "  -A, --no-align           unaligned table output mode\n"
 msgstr "  -A, --no-align           dizilmemiş tablo çıktı modu\n"
 
-#: help.c:120
+#: help.c:116
 #, c-format
 msgid ""
 "  -F, --field-separator=STRING\n"
@@ -670,17 +717,17 @@ msgstr ""
 "  -F, --field-separator=DÄ°ZGÄ°\n"
 "                           alan ayırıcısını ayarla (default: \"%s\")\n"
 
-#: help.c:123
+#: help.c:119
 #, c-format
 msgid "  -H, --html               HTML table output mode\n"
 msgstr "  -H, --html               HTML tablosu çıktı modu\n"
 
-#: help.c:124
+#: help.c:120
 #, c-format
 msgid "  -P, --pset=VAR[=ARG]     set printing option VAR to ARG (see \\pset command)\n"
 msgstr "  -P, --pset=VAR[=ARG]     VAR yazma  ayarınına ARG değerini ata (\\pset komutuna bak)\n"
 
-#: help.c:125
+#: help.c:121
 #, c-format
 msgid ""
 "  -R, --record-separator=STRING\n"
@@ -689,22 +736,22 @@ msgstr ""
 "  -R, --record-separator=DÄ°ZGÄ°\n"
 "                           kayıt ayracını ayarla (varsayılan: newline)\n"
 
-#: help.c:127
+#: help.c:123
 #, c-format
 msgid "  -t, --tuples-only        print rows only\n"
 msgstr "  -t, --tuples-only        sadece satırları yaz\n"
 
-#: help.c:128
+#: help.c:124
 #, c-format
 msgid "  -T, --table-attr=TEXT    set HTML table tag attributes (e.g., width, border)\n"
 msgstr "  -T, --table-attr=TEXT    HTML tablo tag parametrelerini ayarla (genişlik, kenarlık)\n"
 
-#: help.c:129
+#: help.c:125
 #, c-format
 msgid "  -x, --expanded           turn on expanded table output\n"
 msgstr "  -x, --expanded            gelişmiş tablo çıktısını atkinleştir\n"
 
-#: help.c:131
+#: help.c:127
 #, c-format
 msgid ""
 "\n"
@@ -713,36 +760,36 @@ msgstr ""
 "\n"
 "Bağlantı seçenekleri:\n"
 
-#: help.c:134
+#: help.c:130
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory (default: \"%s\")\n"
 msgstr "  -h, --host= HOST ADI      veritabanı sunucu adresi ya da soket dizini (varsayılan: \"%s\")\n"
 
-#: help.c:135
+#: help.c:131
 msgid "local socket"
 msgstr "yerel soket"
 
-#: help.c:138
+#: help.c:134
 #, c-format
 msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
 msgstr "  -p, --port=PORT         veritabanı sunucusu port numarası (varsayılan: \"%s\")\n"
 
-#: help.c:144
+#: help.c:140
 #, c-format
 msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
 msgstr "  -U, --username=KULLANICI ADI         veritabanı kullanıcı adı (varsayılan: \"%s\")\n"
 
-#: help.c:145
+#: help.c:141
 #, c-format
 msgid "  -w, --no-password        never prompt for password\n"
 msgstr "  -W, --no-password         bağlanmak için kesinlikle parola sorma\n"
 
-#: help.c:146
+#: help.c:142
 #, c-format
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W              şifre sor (otomatik olarak her zaman açık)\n"
 
-#: help.c:148
+#: help.c:144
 #, c-format
 msgid ""
 "\n"
@@ -757,210 +804,230 @@ msgstr ""
 "bakın.\n"
 "\n"
 
-#: help.c:151
+#: help.c:147
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Hataları <pgsql-bugs@postgresql.org> adresine bildirebilirsiniz.\n"
 
-#: help.c:169
+#: help.c:165
 #, c-format
 msgid "General\n"
 msgstr "Genel\n"
 
-#: help.c:170
+#: help.c:166
 #, c-format
 msgid "  \\copyright             show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright             PostgreSQL kullanım ve dağıtım şartlarını göster\n"
 
-#: help.c:171
+#: help.c:167
 #, c-format
 msgid "  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"
 msgstr "  \\g [DOSYA] or ;         sorguyu çalıştır (anve sonucu dosyaya ya da |pipe'a gönder)\n"
 
-#: help.c:172
+#: help.c:168
 #, c-format
 msgid "  \\h [NAME]              help on syntax of SQL commands, * for all commands\n"
 msgstr "  \\h [NAME]              SQL komutları için sözdizimi yardımı, tüm komutlar için * ekleyin\n"
 
-#: help.c:173
+#: help.c:169
 #, c-format
 msgid "  \\q                     quit psql\n"
 msgstr "  \\q                     psql'den çık\n"
 
-#: help.c:176
+#: help.c:172
 #, c-format
 msgid "Query Buffer\n"
 msgstr "Sorgu tamponu\n"
 
-#: help.c:177
-#, c-format
-msgid "  \\e [FILE]              edit the query buffer (or file) with external editor\n"
+#: help.c:173
+#, fuzzy, c-format
+msgid "  \\e [FILE] [LINE]       edit the query buffer (or file) with external editor\n"
 msgstr "  \\e [FILE]              sorgu tamponunu (ya da dosyasını) harici bir metin düzenleyici ile düzenle\n"
 
-#: help.c:178
-#, c-format
-msgid "  \\ef [FUNCNAME]         edit function definition with external editor\n"
+#: help.c:174
+#, fuzzy, c-format
+msgid "  \\ef [FUNCNAME [LINE]]  edit function definition with external editor\n"
 msgstr "  \\ef [FUNCNAME]         fonksiyon tanımını harici bir metin düzenleyici ile düzenle\n"
 
-#: help.c:179
+#: help.c:175
 #, c-format
 msgid "  \\p                     show the contents of the query buffer\n"
 msgstr "  \\p                     sorgu tamponunun içeriğini göster\n"
 
-#: help.c:180
+#: help.c:176
 #, c-format
 msgid "  \\r                     reset (clear) the query buffer\n"
 msgstr "  \\r                     sorgu tamponunu sıfırla (temizle)\n"
 
-#: help.c:182
+#: help.c:178
 #, c-format
 msgid "  \\s [FILE]              display history or save it to file\n"
 msgstr "  \\s [DOSYA]              geçmişi göster ya da  dosyaya kaydet\n"
 
-#: help.c:184
+#: help.c:180
 #, c-format
 msgid "  \\w FILE                write query buffer to file\n"
 msgstr "  \\w DOSYA            sorgu tamponunu dosyaya kaydet\n"
 
-#: help.c:187
+#: help.c:183
 #, c-format
 msgid "Input/Output\n"
 msgstr "Giriş/Çıkış\n"
 
-#: help.c:188
+#: help.c:184
 #, c-format
 msgid "  \\copy ...              perform SQL COPY with data stream to the client host\n"
 msgstr "  \\copy ...              istemci sisteminden veri akımı ile SQL COPY komutunu çalıştır\n"
 
-#: help.c:189
+#: help.c:185
 #, c-format
 msgid "  \\echo [STRING]         write string to standard output\n"
 msgstr "  \\echo [METIN]           standart çıktıya bir satır gönder\n"
 
-#: help.c:190
+#: help.c:186
 #, c-format
 msgid "  \\i FILE                execute commands from file\n"
 msgstr "  \\i DOSYA                dosyadaki komutları çalıştıre\n"
 
-#: help.c:191
+#: help.c:187
+#, fuzzy, c-format
+msgid "  \\ir FILE               as \\i, but relative to location of current script\n"
+msgstr "  \\o [DOSYA]            tüm sorgu sonuçlarını dosyaya ya da |pipe'e gönder\n"
+
+#: help.c:188
 #, c-format
 msgid "  \\o [FILE]              send all query results to file or |pipe\n"
 msgstr "  \\o [DOSYA]            tüm sorgu sonuçlarını dosyaya ya da |pipe'e gönder\n"
 
-#: help.c:192
+#: help.c:189
 #, c-format
 msgid "  \\qecho [STRING]        write string to query output stream (see \\o)\n"
 msgstr "  \\qecho [STRING]        sorgu çıktı akımına dizgi yaz (\\o seçeneğine bakınız)\n"
 
-#: help.c:195
+#: help.c:192
 #, c-format
 msgid "Informational\n"
 msgstr "Bilgi edinme\n"
 
-#: help.c:196
+#: help.c:193
 #, c-format
 msgid "  (options: S = show system objects, + = additional detail)\n"
 msgstr "  (seçenekler: S = sistem nesnelerini göster, + = ek ayrıntılar)\n"
 
-#: help.c:197
+#: help.c:194
 #, c-format
 msgid "  \\d[S+]                 list tables, views, and sequences\n"
 msgstr "  \\d[S+]                 tablo, views, ve sequenceleri listele\n"
 
-#: help.c:198
+#: help.c:195
 #, c-format
 msgid "  \\d[S+]  NAME           describe table, view, sequence, or index\n"
 msgstr "  \\d[S+}  AD                tablo, indeks, sequence, ya da view tanımlarını göster\n"
 
-#: help.c:199
+#: help.c:196
 #, c-format
-msgid "  \\da[+]  [PATTERN]      list aggregates\n"
-msgstr "  \\da[+]  [PATTERN]      aggregateleri listele\n"
+msgid "  \\da[S]  [PATTERN]      list aggregates\n"
+msgstr "  \\da[S]  [PATTERN]      aggregateleri listele\n"
 
-#: help.c:200
+#: help.c:197
 #, c-format
 msgid "  \\db[+]  [PATTERN]      list tablespaces\n"
 msgstr "  \\db[+]  [PATTERN]      tablespaceleri listele\n"
 
+#: help.c:198
+#, c-format
+msgid "  \\dc[S+] [PATTERN]      list conversions\n"
+msgstr "  \\dc[S+]  [PATTERN]      dönüşümleri listele\n"
+
+#: help.c:199
+#, c-format
+msgid "  \\dC[+]  [PATTERN]      list casts\n"
+msgstr "  \\dC[+]  [PATTERN]      castleri listele\n"
+
+#: help.c:200
+#, fuzzy, c-format
+msgid "  \\dd[S]  [PATTERN]      show object descriptions not displayed elsewhere\n"
+msgstr "  \\dd[S]  [PATTERN]      nesnelerin yorumlarını göster\n"
+
 #: help.c:201
 #, c-format
-msgid "  \\dc[S]  [PATTERN]      list conversions\n"
-msgstr "  \\dc[S]  [PATTERN]      dönüşümleri listele\n"
+msgid "  \\ddp    [PATTERN]      list default privileges\n"
+msgstr "  \\ddp    [PATTERN]      öntanımlı izinleri listele\n"
 
 #: help.c:202
 #, c-format
-msgid "  \\dC     [PATTERN]      list casts\n"
-msgstr "  \\dC     [PATTERN]      castleri listele\n"
+msgid "  \\dD[S+] [PATTERN]      list domains\n"
+msgstr "  \\dD[S+] [PATTERN]     domainleri listele\n"
 
 #: help.c:203
 #, c-format
-msgid "  \\dd[S]  [PATTERN]      show comments on objects\n"
-msgstr "  \\dd[S]  [PATTERN]      nesnelerin yorumlarını göster\n"
+msgid "  \\det[+] [PATTERN]      list foreign tables\n"
+msgstr "  \\det[+] [PATTERN]      foreign tabloları listele\n"
 
 #: help.c:204
 #, c-format
-msgid "  \\dD[S]  [PATTERN]      list domains\n"
-msgstr "  \\dD[S]  [PATTERN]      domainleri listele\n"
-
-#: help.c:205
-#, c-format
 msgid "  \\des[+] [PATTERN]      list foreign servers\n"
 msgstr "  \\des[+] [PATTERN]      foreign sunucuları listele\n"
 
-#: help.c:206
+#: help.c:205
 #, c-format
 msgid "  \\deu[+] [PATTERN]      list user mappings\n"
 msgstr "  \\deu[+] [PATTERN]      kullanıcı haritalamasını listele\n"
 
-#: help.c:207
+#: help.c:206
 #, c-format
 msgid "  \\dew[+] [PATTERN]      list foreign-data wrappers\n"
 msgstr "  \\dew[+] [PATTERN]      foreign-data wrapperlarını listele\n"
 
-#: help.c:208
+#: help.c:207
 #, c-format
 msgid "  \\df[antw][S+] [PATRN]  list [only agg/normal/trigger/window] functions\n"
 msgstr "  \\df[antw][S+] [PATRN]  [sadece agg/normal/trigger/window] fonksiyonlarını listele\n"
 
-#: help.c:209
+#: help.c:208
 #, c-format
 msgid "  \\dF[+]  [PATTERN]      list text search configurations\n"
 msgstr "  \\dF[+]  [PATTERN]      metin arama yapılandırmalarını listele\n"
 
-#: help.c:210
+#: help.c:209
 #, c-format
 msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
 msgstr "  \\dFd[+] [PATTERN]      metin arama sözlüklerini listele\n"
 
-#: help.c:211
+#: help.c:210
 #, c-format
 msgid "  \\dFp[+] [PATTERN]      list text search parsers\n"
 msgstr "  \\dFp[+] [PATTERN]      metin arama ayrıştırıcılarını listele\n"
 
-#: help.c:212
+#: help.c:211
 #, c-format
 msgid "  \\dFt[+] [PATTERN]      list text search templates\n"
 msgstr "  \\dFt[+] [PATTERN]      metin arama şablonlarını listele\n"
 
-#: help.c:213
+#: help.c:212
 #, c-format
-msgid "  \\dg     [PATTERN]      list roles (groups)\n"
-msgstr "  \\dg     [PATTERN]      rolleri (grupları) listele\n"
+msgid "  \\dg[+]  [PATTERN]      list roles\n"
+msgstr "  \\dg[+]    [PATTERN]      rolleri listele\n"
 
-#: help.c:214
+#: help.c:213
 #, c-format
 msgid "  \\di[S+] [PATTERN]      list indexes\n"
 msgstr "  \\di[S+] [PATTERN]      indexleri göster\n"
 
-#: help.c:215
+#: help.c:214
 #, c-format
 msgid "  \\dl                    list large objects, same as \\lo_list\n"
 msgstr "  \\dl                    large objectleri göster; \\lo_list ile aynıdır\n"
 
+#: help.c:215
+#, c-format
+msgid "  \\dL[S+] [PATTERN]      list procedural languages\n"
+msgstr "  \\dL[S+] [PATTERN]      yordamsal dilleri listele\n"
+
 #: help.c:216
 #, c-format
-msgid "  \\dn[+]  [PATTERN]      list schemas\n"
-msgstr "  \\dn[+]  [PATTERN]      şemaları listele\n"
+msgid "  \\dn[S+] [PATTERN]      list schemas\n"
+msgstr "  \\dn[S+]  [PATTERN]      şemaları listele\n"
 
 #: help.c:217
 #, c-format
@@ -969,70 +1036,95 @@ msgstr "  \\do[S] [PATTERN]     operatörleri listele\n"
 
 #: help.c:218
 #, c-format
+msgid "  \\dO[S+] [PATTERN]      list collations\n"
+msgstr "  \\dO[S+]  [PATTERN]      collationları listele\n"
+
+#: help.c:219
+#, c-format
 msgid "  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"
 msgstr "  \\dp     [PATTERN]      tablo, view, ve  sequence eriÅŸim izinlerini listele\n"
 
-#: help.c:219
+#: help.c:220
+#, c-format
+msgid "  \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
+msgstr "  \\drds [PATRN1 [PATRN2]] veritabanı başına rol ayarlarını listele\n"
+
+#: help.c:221
 #, c-format
 msgid "  \\ds[S+] [PATTERN]      list sequences\n"
 msgstr "  \\ds[S+] [PATTERN]      sequenceları listele\n"
 
-#: help.c:220
+#: help.c:222
 #, c-format
 msgid "  \\dt[S+] [PATTERN]      list tables\n"
 msgstr "  \\dt[S+] [PATTERN]      tabloları listele\n"
 
-#: help.c:221
+#: help.c:223
 #, c-format
 msgid "  \\dT[S+] [PATTERN]      list data types\n"
 msgstr "  \\dT[S+] [PATTERN]      veri tiplerini listele\n"
 
-#: help.c:222
+#: help.c:224
 #, c-format
-msgid "  \\du     [PATTERN]      list roles (users)\n"
-msgstr "  \\du     [PATTERN]      rolleri (kullanıcıları) listele\n"
+msgid "  \\du[+]  [PATTERN]      list roles\n"
+msgstr "  \\du[+]  [PATTERN]      rolleri listele\n"
 
-#: help.c:223
+#: help.c:225
 #, c-format
 msgid "  \\dv[S+] [PATTERN]      list views\n"
 msgstr "  \\dv[S+] [PATTERN]      viewları listele\n"
 
-#: help.c:224
+#: help.c:226
+#, fuzzy, c-format
+msgid "  \\dE[S+] [PATTERN]      list foreign tables\n"
+msgstr "  \\dt[S+] [PATTERN]      tabloları listele\n"
+
+#: help.c:227
+#, c-format
+msgid "  \\dx[+]  [PATTERN]      list extensions\n"
+msgstr "  \\dx[+]  [PATTERN]      uzantıları listele\n"
+
+#: help.c:228
 #, c-format
 msgid "  \\l[+]                  list all databases\n"
 msgstr "  \\l[+]                  tüm tablespaceleri listele\n"
 
-#: help.c:225
+#: help.c:229
+#, fuzzy, c-format
+msgid "  \\sf[+] FUNCNAME        show a function's definition\n"
+msgstr "  \\ef [FUNCNAME]         fonksiyon tanımını harici bir metin düzenleyici ile düzenle\n"
+
+#: help.c:230
 #, c-format
 msgid "  \\z      [PATTERN]      same as \\dp\n"
 msgstr "  \\z      [PATTERN]       \\dp ile aynı\n"
 
-#: help.c:228
+#: help.c:233
 #, c-format
 msgid "Formatting\n"
 msgstr "Biçimlendirme:\n"
 
-#: help.c:229
+#: help.c:234
 #, c-format
 msgid "  \\a                     toggle between unaligned and aligned output mode\n"
 msgstr "  \\a                    düzenli ve düzensiz çıktı modu arasında geçiş yap\n"
 
-#: help.c:230
+#: help.c:235
 #, c-format
 msgid "  \\C [STRING]            set table title, or unset if none\n"
 msgstr "  \\C [DİZİ]            tablo başlığını ayarla, ya da boş bırakılırsa kaldır\n"
 
-#: help.c:231
+#: help.c:236
 #, c-format
 msgid "  \\f [STRING]            show or set field separator for unaligned query output\n"
 msgstr "  \\f [DİZİ]            düzensiz sorgu çıktısı için alan ayracını göster ya da tanımla\n"
 
-#: help.c:232
+#: help.c:237
 #, c-format
 msgid "  \\H                     toggle HTML output mode (currently %s)\n"
 msgstr "  \\H                     HTML çıktı modunu değiştir (şu anda %s)\n"
 
-#: help.c:234
+#: help.c:239
 #, c-format
 msgid ""
 "  \\pset NAME [VALUE]     set table output option\n"
@@ -1043,27 +1135,27 @@ msgstr ""
 "                         (AD := {format|border|expanded|fieldsep|footer|null|\n"
 "                         numericlocale|recordsep|tuples_only|title|tableattr|pager})\n"
 
-#: help.c:237
+#: help.c:242
 #, c-format
 msgid "  \\t [on|off]            show only rows (currently %s)\n"
 msgstr "  \\t [on|off]             sadece satırları göster (şu an %s)\n"
 
-#: help.c:239
+#: help.c:244
 #, c-format
 msgid "  \\T [STRING]            set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [DİZGİ]            HTML <table>  parametrelerini tanımla, boş ise tüm parametrelerini kaldır\n"
 
-#: help.c:240
+#: help.c:245
 #, c-format
 msgid "  \\x [on|off]            toggle expanded output (currently %s)\n"
 msgstr "  \\x [on|off]            geniş çıktı ayarla (şu an %s)\n"
 
-#: help.c:244
+#: help.c:249
 #, c-format
 msgid "Connection\n"
 msgstr "Bağlantı\n"
 
-#: help.c:245
+#: help.c:250
 #, c-format
 msgid ""
 "  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -1072,62 +1164,67 @@ msgstr ""
 "  \\c[onnect] [VERÄ°TABANI ADI|- KULLANICI ADI|- KARÅžI SUNUCU|- PORT|-]\n"
 "                        yeni veritabanına bağlan (geçerli veritabanı \"%s\")\n"
 
-#: help.c:248
+#: help.c:253
 #, c-format
 msgid "  \\encoding [ENCODING]   show or set client encoding\n"
 msgstr "  \\encoding [KODLAMA]    istemci dil kodlamasını göster\n"
 
-#: help.c:249
+#: help.c:254
 #, c-format
 msgid "  \\password [USERNAME]   securely change the password for a user\n"
 msgstr "  \\password [KULLANICI ADI]   kullanıcının parolasını güvenli şekilde değiştir\n"
 
-#: help.c:252
+#: help.c:255
+#, c-format
+msgid "  \\conninfo              display information about current connection\n"
+msgstr ""
+
+#: help.c:258
 #, c-format
 msgid "Operating System\n"
 msgstr "iÅŸletim Sistemi\n"
 
-#: help.c:253
+#: help.c:259
 #, c-format
 msgid "  \\cd [DIR]              change the current working directory\n"
 msgstr "  \\cd [DIR]              geçerli çalışma dizinini değiştir\n"
 
-#: help.c:254
+#: help.c:260
 #, c-format
 msgid "  \\timing [on|off]       toggle timing of commands (currently %s)\n"
 msgstr "  \\timing [on|off]       komutların çalışma zamanlamasının gösterilmesini değiştir (şu anda %s)\n"
 
-#: help.c:256
+#: help.c:262
 #, c-format
 msgid "  \\! [COMMAND]           execute command in shell or start interactive shell\n"
 msgstr "  \\! [KOMUT]           komutu kabukta çalıştır ya da etkileşimli kabuğu başlat\n"
 
-#: help.c:259
+#: help.c:265
 #, c-format
 msgid "Variables\n"
 msgstr "DeÄŸiÅŸkenler\n"
 
-#: help.c:260
+#: help.c:266
 #, c-format
 msgid "  \\prompt [TEXT] NAME    prompt user to set internal variable\n"
 msgstr "  \\prompt [METİN] AD    kullanıcıdan dahili değişkeni değiştirmesini iste\n"
 
-#: help.c:261
+#: help.c:267
 #, c-format
 msgid "  \\set [NAME [VALUE]]    set internal variable, or list all if no parameters\n"
 msgstr "  \\set [AD [DEĞER]]    dahili değişkene değer ata, DEĞER boş ise tüm değişkenlerin listesini göster\n"
 
-#: help.c:262
+#: help.c:268
 #, c-format
 msgid "  \\unset NAME            unset (delete) internal variable\n"
 msgstr "  \\unset AD            dahili değişkenleri sıfırla(sil)\n"
 
-#: help.c:265
+#: help.c:271
 #, c-format
 msgid "Large Objects\n"
 msgstr "Large Objectler\n"
 
-#: help.c:266
+#: help.c:272
 #, c-format
 msgid ""
 "  \\lo_export LOBOID FILE\n"
@@ -1140,11 +1237,11 @@ msgstr ""
 "  \\lo_list\n"
 "  \\lo_unlink LOBOID      large object operasyonları\n"
 
-#: help.c:318
+#: help.c:319
 msgid "Available help:\n"
 msgstr "Yardım:\n"
 
-#: help.c:407
+#: help.c:403
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -1159,26 +1256,27 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:423
-#, c-format
+#: help.c:419
+#, fuzzy, c-format
 msgid ""
-"No help available for \"%-.*s\".\n"
+"No help available for \"%s\".\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
 "\"%-.*s\" için yardım bulunmamaktadır.\n"
 "\\h yazarak yardım konularının listesini görüntüleyin.\n"
 
-#: input.c:187
+#: input.c:198
 #, c-format
 msgid "could not read from input file: %s\n"
 msgstr "girdi dosyasından okunamadı: %s\n"
 
-#: input.c:347
+#: input.c:406
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "İşlem geçmişi \"%s\" dosyasına kaydedilemiyor: %s\n"
 
-#: input.c:352
+#: input.c:411
+#, c-format
 msgid "history is not supported by this installation\n"
 msgstr "bu kurulum işlem geçmişini desteklemiyor\n"
 
@@ -1197,46 +1295,70 @@ msgstr "%s: geçerli transaction iptal edildi\n"
 msgid "%s: unknown transaction status\n"
 msgstr "%s: bilinmeyen transaction durumu\n"
 
-#: large_obj.c:286
+#: large_obj.c:289
+#: large_obj.c:300
 msgid "ID"
 msgstr "ID"
 
-#: large_obj.c:287
-#: describe.c:95
-#: describe.c:158
-#: describe.c:337
-#: describe.c:490
-#: describe.c:565
-#: describe.c:636
-#: describe.c:759
-#: describe.c:1237
-#: describe.c:2008
-#: describe.c:2139
-#: describe.c:2431
-#: describe.c:2493
-#: describe.c:2629
-#: describe.c:2668
-#: describe.c:2735
-#: describe.c:2794
-#: describe.c:2803
-#: describe.c:2862
+#: large_obj.c:290
+#: describe.c:147
+#: describe.c:335
+#: describe.c:637
+#: describe.c:787
+#: describe.c:2533
+#: describe.c:2651
+#: describe.c:3042
+#: describe.c:3673
+#: describe.c:3754
+msgid "Owner"
+msgstr "Sahibi"
+
+#: large_obj.c:291
+#: large_obj.c:301
+#: describe.c:96
+#: describe.c:159
+#: describe.c:338
+#: describe.c:501
+#: describe.c:590
+#: describe.c:661
+#: describe.c:855
+#: describe.c:1380
+#: describe.c:2350
+#: describe.c:2557
+#: describe.c:2678
+#: describe.c:2746
+#: describe.c:2817
+#: describe.c:2901
+#: describe.c:2985
+#: describe.c:3050
+#: describe.c:3115
+#: describe.c:3251
+#: describe.c:3290
+#: describe.c:3357
+#: describe.c:3416
+#: describe.c:3425
+#: describe.c:3484
+#: describe.c:3698
+#: describe.c:3775
+#: describe.c:3904
+#: describe.c:3970
 msgid "Description"
 msgstr "Açıklama"
 
-#: large_obj.c:295
+#: large_obj.c:310
 msgid "Large objects"
 msgstr "Large objectler"
 
-#: mainloop.c:156
+#: mainloop.c:159
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "%s'den çıkmak için \"\\q\" kullanın.\n"
 
-#: mainloop.c:182
+#: mainloop.c:189
 msgid "You are using psql, the command-line interface to PostgreSQL."
 msgstr "PostgreSQL'in komut satırı arabirimi olan psql'i kullanıyorsunuz."
 
-#: mainloop.c:183
+#: mainloop.c:190
 #, c-format
 msgid ""
 "Type:  \\copyright for distribution terms\n"
@@ -1251,44 +1373,44 @@ msgstr ""
 "       \\g ya da noktalı virgül:  sorguyu çalıştırmak için\n"
 "       \\q çıkmak için\n"
 
-#: print.c:973
+#: print.c:1138
 #, c-format
 msgid "(No rows)\n"
 msgstr "(Satır yok)\n"
 
-#: print.c:1960
+#: print.c:2028
 #, c-format
 msgid "Interrupted\n"
 msgstr "kesildi\n"
 
-#: print.c:2027
+#: print.c:2097
 #, c-format
 msgid "Cannot add header to table content: column count of %d exceeded.\n"
 msgstr "B aşlık tablo içeriğine eklenemedi: %d kolon sayısı aşıldı.\n"
 
-#: print.c:2064
+#: print.c:2137
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
 msgstr "Hücre tablo içeriğine eklenemedi: %d olan toplan hücre sayısı açıldı.\n"
 
-#: print.c:2263
+#: print.c:2358
 #, c-format
 msgid "invalid output format (internal error): %d"
 msgstr "geçersiz çıktı biçimi (iç hata): %d"
 
-#: print.c:2352
+#: print.c:2455
 #, c-format
 msgid "(%lu row)"
 msgid_plural "(%lu rows)"
 msgstr[0] "(%lu satır)"
 msgstr[1] "(%lu satır)"
 
-#: startup.c:217
+#: startup.c:243
 #, c-format
 msgid "%s: could not open log file \"%s\": %s\n"
 msgstr "%s: \"%s\" kayıti dosyası açılamıyor: %s\n"
 
-#: startup.c:279
+#: startup.c:305
 #, c-format
 msgid ""
 "Type \"help\" for help.\n"
@@ -1297,744 +1419,881 @@ msgstr ""
 "Yardım için \"help\" yazınız.\n"
 "\n"
 
-#: startup.c:425
+#: startup.c:451
 #, c-format
 msgid "%s: could not set printing parameter \"%s\"\n"
 msgstr "%s: \"%s\" yazdırma parametrlesi ayarlanamıyor\n"
 
-#: startup.c:464
+#: startup.c:490
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: \"%s\" deÄŸiÅŸkeni silinemiyor\n"
 
-#: startup.c:474
+#: startup.c:500
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: \"%s\" değişkeni atanamıyor\n"
 
-#: startup.c:511
-#: startup.c:517
+#: startup.c:537
+#: startup.c:543
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Daha fazla bilgi için  \"%s --help\" yazın.\n"
 
-#: startup.c:534
+#: startup.c:560
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: uyarı: \"%s\" fazla argümanı atlanmıştır\n"
 
-#: startup.c:599
+#: startup.c:625
 msgid "contains support for command-line editing"
 msgstr "komut satırı düzenleme desteği mevcuttur"
 
-#: describe.c:68
-#: describe.c:235
-#: describe.c:462
-#: describe.c:560
-#: describe.c:681
-#: describe.c:756
-#: describe.c:2117
-#: describe.c:2237
-#: describe.c:2292
-#: describe.c:2491
-#: describe.c:2718
-#: describe.c:2790
-#: describe.c:2801
-#: describe.c:2860
-msgid "Schema"
-msgstr "Åžema"
-
 #: describe.c:69
-#: describe.c:145
 #: describe.c:236
 #: describe.c:463
-#: describe.c:561
-#: describe.c:611
-#: describe.c:682
-#: describe.c:757
-#: describe.c:2118
-#: describe.c:2238
-#: describe.c:2293
-#: describe.c:2422
-#: describe.c:2492
-#: describe.c:2719
-#: describe.c:2791
-#: describe.c:2802
-#: describe.c:2861
-#: describe.c:3051
-#: describe.c:3110
-msgid "Name"
-msgstr "Adı"
+#: describe.c:585
+#: describe.c:706
+#: describe.c:788
+#: describe.c:852
+#: describe.c:2524
+#: describe.c:2725
+#: describe.c:2807
+#: describe.c:2977
+#: describe.c:3113
+#: describe.c:3340
+#: describe.c:3412
+#: describe.c:3423
+#: describe.c:3482
+#: describe.c:3890
+#: describe.c:3969
+msgid "Schema"
+msgstr "Åžema"
 
 #: describe.c:70
-#: describe.c:248
-#: describe.c:294
-#: describe.c:311
-msgid "Result data type"
-msgstr "Sonuç veri tipi"
+#: describe.c:146
+#: describe.c:237
+#: describe.c:464
+#: describe.c:586
+#: describe.c:636
+#: describe.c:707
+#: describe.c:853
+#: describe.c:2525
+#: describe.c:2647
+#: describe.c:2726
+#: describe.c:2808
+#: describe.c:2978
+#: describe.c:3041
+#: describe.c:3114
+#: describe.c:3341
+#: describe.c:3413
+#: describe.c:3424
+#: describe.c:3483
+#: describe.c:3672
+#: describe.c:3753
+#: describe.c:3967
+msgid "Name"
+msgstr "Adı"
 
-#: describe.c:84
-#: describe.c:88
+#: describe.c:71
 #: describe.c:249
 #: describe.c:295
 #: describe.c:312
+msgid "Result data type"
+msgstr "Sonuç veri tipi"
+
+#: describe.c:85
+#: describe.c:89
+#: describe.c:250
+#: describe.c:296
+#: describe.c:313
 msgid "Argument data types"
 msgstr "Argüman veri tipi"
 
-#: describe.c:113
+#: describe.c:114
 msgid "List of aggregate functions"
 msgstr "Aggregate fonksiyonların listesi"
 
-#: describe.c:134
+#: describe.c:135
 #, c-format
 msgid "The server (version %d.%d) does not support tablespaces.\n"
 msgstr "Bu sunucu (%d.%d sürümü) tablespace desteklememektedir.\n"
 
-#: describe.c:146
-#: describe.c:334
-#: describe.c:612
-#: describe.c:2125
-#: describe.c:2423
-#: describe.c:3052
-#: describe.c:3111
-msgid "Owner"
-msgstr "Sahibi"
-
-#: describe.c:147
+#: describe.c:148
 msgid "Location"
 msgstr "Yer"
 
-#: describe.c:175
+#: describe.c:176
 msgid "List of tablespaces"
 msgstr "Tablespace listesi"
 
-#: describe.c:212
+#: describe.c:213
 #, c-format
 msgid "\\df only takes [antwS+] as options\n"
 msgstr "\\df sadece [antwS+] seçeneklerini alır\n"
 
-#: describe.c:218
+#: describe.c:219
 #, c-format
 msgid "\\df does not take a \"w\" option with server version %d.%d\n"
 msgstr "\\df \"w\" seçeneğini %d.%d sunucu sürümünde almaz\n"
 
 #. translator: "agg" is short for "aggregate"
-#: describe.c:251
-#: describe.c:297
-#: describe.c:314
+#: describe.c:252
+#: describe.c:298
+#: describe.c:315
 msgid "agg"
 msgstr "agg"
 
-#: describe.c:252
+#: describe.c:253
 msgid "window"
 msgstr "pencere"
 
-#: describe.c:253
-#: describe.c:298
-#: describe.c:315
-#: describe.c:896
-msgid "trigger"
-msgstr "tetikleyici (trigger)"
-
 #: describe.c:254
 #: describe.c:299
 #: describe.c:316
-msgid "normal"
-msgstr "normal"
+#: describe.c:960
+msgid "trigger"
+msgstr "tetikleyici (trigger)"
 
 #: describe.c:255
 #: describe.c:300
 #: describe.c:317
-#: describe.c:684
-#: describe.c:1222
-#: describe.c:2124
-#: describe.c:2239
-#: describe.c:3123
+msgid "normal"
+msgstr "normal"
+
+#: describe.c:256
+#: describe.c:301
+#: describe.c:318
+#: describe.c:710
+#: describe.c:792
+#: describe.c:1354
+#: describe.c:2532
+#: describe.c:2727
+#: describe.c:3772
 msgid "Type"
 msgstr "Veri tipi"
 
-#: describe.c:330
+#: describe.c:331
 msgid "immutable"
 msgstr "duraÄŸan"
 
-#: describe.c:331
+#: describe.c:332
 msgid "stable"
 msgstr "kararlı"
 
-#: describe.c:332
+#: describe.c:333
 msgid "volatile"
 msgstr "oynaklık"
 
-#: describe.c:333
+#: describe.c:334
 msgid "Volatility"
 msgstr "Oynaklık"
 
-#: describe.c:335
+#: describe.c:336
 msgid "Language"
 msgstr "Dil"
 
-#: describe.c:336
+#: describe.c:337
 msgid "Source code"
 msgstr "Kaynak kodu"
 
-#: describe.c:434
+#: describe.c:435
 msgid "List of functions"
 msgstr "Fonksiyonların listesi"
 
-#: describe.c:473
+#: describe.c:474
 msgid "Internal name"
 msgstr "Dahili adı"
 
-#: describe.c:474
-#: describe.c:628
-#: describe.c:2135
+#: describe.c:475
+#: describe.c:653
+#: describe.c:2549
+#: describe.c:2553
 msgid "Size"
 msgstr "Boyut"
 
-#: describe.c:486
+#: describe.c:496
 msgid "Elements"
 msgstr "Elemanlar"
 
-#: describe.c:529
+#: describe.c:541
 msgid "List of data types"
 msgstr "Veri tiplerinin listesi"
 
-#: describe.c:562
+#: describe.c:587
 msgid "Left arg type"
 msgstr "Sol argüman veri tipi"
 
-#: describe.c:563
+#: describe.c:588
 msgid "Right arg type"
 msgstr "Sağ argüman veri tipi"
 
-#: describe.c:564
+#: describe.c:589
 msgid "Result type"
 msgstr "Sonuç veri tipi"
 
-#: describe.c:583
+#: describe.c:608
 msgid "List of operators"
 msgstr "Operatörlerin listesi"
 
-#: describe.c:613
+#: describe.c:638
 msgid "Encoding"
 msgstr "Dil Kodlaması"
 
-#: describe.c:618
-msgid "Collation"
+#: describe.c:643
+#: describe.c:2979
+#, fuzzy
+msgid "Collate"
 msgstr "Sıralama"
 
-#: describe.c:619
+#: describe.c:644
+#: describe.c:2980
 msgid "Ctype"
 msgstr "Ctype"
 
-#: describe.c:632
+#: describe.c:657
 msgid "Tablespace"
 msgstr "Tablespace"
 
-#: describe.c:649
+#: describe.c:674
 msgid "List of databases"
 msgstr "Veritabanlarının listesi"
 
-#: describe.c:683
-#: describe.c:851
-#: describe.c:2119
+#: describe.c:708
+#: describe.c:789
+#: describe.c:2526
+#: sql_help.c:603
+#: sql_help.c:850
+#: sql_help.c:977
+#: sql_help.c:1442
+#: sql_help.c:1572
+#: sql_help.c:1606
+#: sql_help.c:1852
+#: sql_help.c:2010
+#: sql_help.c:2195
+#: sql_help.c:2276
+#: sql_help.c:2482
+#: sql_help.c:3119
+#: sql_help.c:3139
+#: sql_help.c:3141
+#: sql_help.c:3142
 msgid "table"
 msgstr "tablo"
 
-#: describe.c:683
-#: describe.c:852
-#: describe.c:2120
+#: describe.c:708
+#: describe.c:2527
 msgid "view"
 msgstr "view"
 
-#: describe.c:683
-#: describe.c:854
-#: describe.c:2122
+#: describe.c:708
+#: describe.c:790
+#: describe.c:2529
 msgid "sequence"
 msgstr "sequence"
 
-#: describe.c:695
+#: describe.c:709
+#: describe.c:2531
+#, fuzzy
+msgid "foreign table"
+msgstr "referans tablosu"
+
+#: describe.c:721
 msgid "Column access privileges"
 msgstr "Kolon erişim hakları"
 
-#: describe.c:721
-#: describe.c:3218
-#: describe.c:3222
+#: describe.c:747
+#: describe.c:4114
+#: describe.c:4118
 msgid "Access privileges"
 msgstr "Erişim hakları"
 
-#: describe.c:758
-msgid "Object"
-msgstr "Nesne"
-
-#: describe.c:770
-msgid "aggregate"
-msgstr "aggregate"
+#: describe.c:775
+#, fuzzy, c-format
+msgid "The server (version %d.%d) does not support altering default privileges.\n"
+msgstr "Bu sunucu (%d.%d sürümü) foreign sunucularını desteklemiyor.\n"
 
-#: describe.c:790
+#: describe.c:791
 msgid "function"
 msgstr "fonksiyon"
 
-#: describe.c:809
-msgid "operator"
-msgstr "operatör"
+#: describe.c:815
+#, fuzzy
+msgid "Default access privileges"
+msgstr "erişim haklarını tanımla"
 
-#: describe.c:828
-msgid "data type"
-msgstr "veri tipi"
+#: describe.c:854
+msgid "Object"
+msgstr "Nesne"
 
-#: describe.c:853
-#: describe.c:2121
-msgid "index"
-msgstr "indeks"
+#: describe.c:868
+#: sql_help.c:1302
+msgid "constraint"
+msgstr "kısıtlama"
+
+#: describe.c:896
+#, fuzzy
+msgid "operator class"
+msgstr "%s operatoru"
 
-#: describe.c:875
+#: describe.c:918
+#, fuzzy
+msgid "operator family"
+msgstr "opeartör ailesini kaldır"
+
+#: describe.c:940
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:919
+#: describe.c:982
 msgid "Object descriptions"
 msgstr "Nesne açıklamaları"
 
-#: describe.c:972
+#: describe.c:1035
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "\"%s\" adında nesne bulunamadı.\n"
 
-#: describe.c:1109
+#: describe.c:1207
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "OID %s olan nesne bulunamadı.\n"
 
-#: describe.c:1184
+#: describe.c:1306
+#, fuzzy, c-format
+msgid "Unlogged table \"%s.%s\""
+msgstr "\"%s.%s\" tablosu için "
+
+#: describe.c:1309
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tablo \"%s.%s\""
 
-#: describe.c:1188
+#: describe.c:1313
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "View \"%s.%s\""
 
-#: describe.c:1192
+#: describe.c:1317
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequence \"%s.%s\""
 
-#: describe.c:1196
+#: describe.c:1322
+#, fuzzy, c-format
+msgid "Unlogged index \"%s.%s\""
+msgstr "Ä°ndex \"%s.%s\""
+
+#: describe.c:1325
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Ä°ndex \"%s.%s\""
 
-#: describe.c:1201
+#: describe.c:1330
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Özel nesne \"%s.%s\""
 
-#: describe.c:1205
+#: describe.c:1334
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST tablosu \"%s.%s\""
 
-#: describe.c:1209
+#: describe.c:1338
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "BirleÅŸik veri tipi \"%s.%s\""
 
-#: describe.c:1221
+#: describe.c:1342
+#, fuzzy, c-format
+msgid "Foreign table \"%s.%s\""
+msgstr "\"%s.%s\" tablosu için "
+
+#: describe.c:1353
 msgid "Column"
 msgstr "Kolon"
 
-#: describe.c:1227
+#: describe.c:1361
 msgid "Modifiers"
 msgstr "Modifiers"
 
-#: describe.c:1232
+#: describe.c:1366
 msgid "Value"
 msgstr "DeÄŸer"
 
-#: describe.c:1236
+#: describe.c:1369
+msgid "Definition"
+msgstr "Tanım"
+
+#: describe.c:1372
+#: describe.c:3693
+#: describe.c:3774
+#: describe.c:3842
+#: describe.c:3903
+#, fuzzy
+msgid "FDW Options"
+msgstr "Seçenekler"
+
+#: describe.c:1376
 msgid "Storage"
 msgstr "Saklama"
 
-#: describe.c:1278
+#: describe.c:1425
+#, c-format
+msgid "collate %s"
+msgstr ""
+
+#: describe.c:1433
 msgid "not null"
 msgstr "Null deÄŸil"
 
 #. translator: default values of column definitions
-#: describe.c:1287
+#: describe.c:1443
 #, c-format
 msgid "default %s"
 msgstr "öntanımlı %s"
 
-#: describe.c:1353
+#: describe.c:1541
 msgid "primary key, "
 msgstr "birincil anahtar, "
 
-#: describe.c:1355
+#: describe.c:1543
 msgid "unique, "
 msgstr "tekil, "
 
-#: describe.c:1361
+#: describe.c:1549
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "\"%s.%s\" tablosu için "
 
-#: describe.c:1365
+#: describe.c:1553
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", belirli (%s)"
 
-#: describe.c:1368
+#: describe.c:1556
 msgid ", clustered"
 msgstr ", clustered"
 
-#: describe.c:1371
+#: describe.c:1559
 msgid ", invalid"
 msgstr ", geçersiz"
 
-#: describe.c:1385
+#: describe.c:1562
+msgid ", deferrable"
+msgstr ""
+
+#: describe.c:1565
+msgid ", initially deferred"
+msgstr ""
+
+#: describe.c:1579
 msgid "View definition:"
 msgstr "View tanımı:"
 
-#: describe.c:1402
-#: describe.c:1655
+#: describe.c:1596
+#: describe.c:1879
 msgid "Rules:"
 msgstr "Rulelar:"
 
-#: describe.c:1449
+#: describe.c:1655
 msgid "Indexes:"
 msgstr "Ä°ndeksler:"
 
-#: describe.c:1509
+#: describe.c:1735
 msgid "Check constraints:"
 msgstr "Check constraints:"
 
-#: describe.c:1540
+#: describe.c:1766
 msgid "Foreign-key constraints:"
 msgstr "İkincil anahtar sınırlamaları:"
 
-#: describe.c:1571
+#: describe.c:1797
 msgid "Referenced by:"
 msgstr "Referans veren:"
 
-#. translator: the first %s is a FK name, the following are
-#. * a table name and the FK definition
-#: describe.c:1576
-#, c-format
-msgid "  \"%s\" IN %s %s"
-msgstr "  \"%s\",  %s %s içinde"
-
-#: describe.c:1658
+#: describe.c:1882
 msgid "Disabled rules:"
 msgstr "Devre dışı bırakılmış rule'lar:"
 
-#: describe.c:1661
+#: describe.c:1885
 msgid "Rules firing always:"
 msgstr "Her zaman çalıştırılan rule'ler:"
 
-#: describe.c:1664
+#: describe.c:1888
 msgid "Rules firing on replica only:"
 msgstr "Sadece kopyada çalıştırılan rule'ler:"
 
-#: describe.c:1760
+#: describe.c:1996
 msgid "Triggers:"
 msgstr "Tetikleyiciler(Triggers):"
 
-#: describe.c:1763
+#: describe.c:1999
 msgid "Disabled triggers:"
 msgstr "Devre dışı bırakılmış tetikleyiciler:"
 
-#: describe.c:1766
+#: describe.c:2002
 msgid "Triggers firing always:"
 msgstr "Her zaman çalıştırılan tetikleyiciler:"
 
-#: describe.c:1769
+#: describe.c:2005
 msgid "Triggers firing on replica only:"
 msgstr "Sadece kopyada çalıştırılan tetikleyiciler:"
 
-#: describe.c:1802
+#: describe.c:2086
 msgid "Inherits"
 msgstr "Inherits"
 
-#: describe.c:1817
+#: describe.c:2116
+#, c-format
+msgid "Number of child tables: %d (Use \\d+ to list them.)"
+msgstr "alt tabloların sayısı: %d (Listelemek için \\d+ kullanabilirsiniz.)"
+
+#: describe.c:2123
+msgid "Child tables"
+msgstr "alt tablolar"
+
+#: describe.c:2145
+#, c-format
+msgid "Typed table of type: %s"
+msgstr ""
+
+#: describe.c:2152
 msgid "Has OIDs"
 msgstr " OIDleri var"
 
-#: describe.c:1820
-#: describe.c:2296
-#: describe.c:2369
+#: describe.c:2155
+#: describe.c:2811
+#: describe.c:2895
 msgid "yes"
 msgstr "evet"
 
-#: describe.c:1820
-#: describe.c:2296
-#: describe.c:2369
+#: describe.c:2155
+#: describe.c:2811
+#: describe.c:2893
 msgid "no"
 msgstr "hayır"
 
-#: describe.c:1828
-#: describe.c:3061
-#: describe.c:3125
-#: describe.c:3181
+#: describe.c:2163
 msgid "Options"
 msgstr "Seçenekler"
 
-#: describe.c:1913
+#: describe.c:2248
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "Tablespace: \"%s\""
 
-#. translator: before this string there's an index
-#. * description like '"foo_pkey" PRIMARY KEY, btree (a)'
-#: describe.c:1923
+#: describe.c:2261
 #, c-format
 msgid ", tablespace \"%s\""
 msgstr ", tablespace \"%s\""
 
-#: describe.c:2001
+#: describe.c:2343
 msgid "List of roles"
 msgstr "Veritabanı rolleri listesi"
 
-#: describe.c:2003
+#: describe.c:2345
 msgid "Role name"
 msgstr "Rol adı"
 
-#: describe.c:2004
+#: describe.c:2346
 msgid "Attributes"
 msgstr "Özellikler"
 
-#: describe.c:2005
+#: describe.c:2347
 msgid "Member of"
 msgstr "Ãœyesidir"
 
-#: describe.c:2016
+#: describe.c:2358
 msgid "Superuser"
 msgstr "Superuser"
 
-#: describe.c:2019
+#: describe.c:2361
 msgid "No inheritance"
 msgstr "Miras yok"
 
-#: describe.c:2022
+#: describe.c:2364
 msgid "Create role"
 msgstr "Rol oluÅŸtur"
 
-#: describe.c:2025
+#: describe.c:2367
 msgid "Create DB"
 msgstr "Veritabanı Oluştur"
 
-#: describe.c:2028
+#: describe.c:2370
 msgid "Cannot login"
 msgstr "Giriş yapılamıyor"
 
-#: describe.c:2037
+#: describe.c:2374
+#, fuzzy
+msgid "Replication"
+msgstr "Hedef"
+
+#: describe.c:2383
 msgid "No connections"
 msgstr "Bağlantı yok"
 
-#: describe.c:2039
+#: describe.c:2385
 #, c-format
 msgid "%d connection"
 msgid_plural "%d connections"
 msgstr[0] "%d bağlantı"
 msgstr[1] "1 bağlantı"
 
-#: describe.c:2123
+#: describe.c:2452
+#, c-format
+msgid "No per-database role settings support in this server version.\n"
+msgstr ""
+
+#: describe.c:2463
+#, fuzzy, c-format
+msgid "No matching settings found.\n"
+msgstr "Eşleşen nesne bulunamadı.\n"
+
+#: describe.c:2465
+#, fuzzy, c-format
+msgid "No settings found.\n"
+msgstr "Nesne bulunamadı.\n"
+
+#: describe.c:2470
+msgid "List of settings"
+msgstr "Seçeneklerin lsitesi"
+
+#: describe.c:2528
+msgid "index"
+msgstr "indeks"
+
+#: describe.c:2530
 msgid "special"
 msgstr "özel"
 
-#: describe.c:2130
+#: describe.c:2538
+#: describe.c:3891
 msgid "Table"
 msgstr "Tablo"
 
-#: describe.c:2189
+#: describe.c:2612
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "Eşleşen nesne bulunamadı.\n"
 
-#: describe.c:2191
+#: describe.c:2614
 #, c-format
 msgid "No relations found.\n"
 msgstr "Nesne bulunamadı.\n"
 
-#: describe.c:2196
+#: describe.c:2619
 msgid "List of relations"
 msgstr "Nesnelerin listesi"
 
-#: describe.c:2240
+#: describe.c:2655
+#, fuzzy
+msgid "Trusted"
+msgstr "Güvenilir mi?"
+
+#: describe.c:2663
+#, fuzzy
+msgid "Internal Language"
+msgstr "Dahili adı"
+
+#: describe.c:2664
+#, fuzzy
+msgid "Call Handler"
+msgstr "call_handler"
+
+#: describe.c:2665
+#: describe.c:3680
+msgid "Validator"
+msgstr "Onaylayan"
+
+#: describe.c:2668
+#, fuzzy
+msgid "Inline Handler"
+msgstr "inline_handler"
+
+#: describe.c:2696
+#, fuzzy
+msgid "List of languages"
+msgstr "Veritabanı rolleri listesi"
+
+#: describe.c:2740
 msgid "Modifier"
 msgstr "Düzenleyici"
 
-#: describe.c:2241
+#: describe.c:2741
 msgid "Check"
 msgstr "Check"
 
-#: describe.c:2259
+#: describe.c:2776
 msgid "List of domains"
 msgstr "Domainlerin listesi"
 
-#: describe.c:2294
+#: describe.c:2809
 msgid "Source"
 msgstr "Kaynak"
 
-#: describe.c:2295
+#: describe.c:2810
 msgid "Destination"
 msgstr "Hedef"
 
-#: describe.c:2297
+#: describe.c:2812
 msgid "Default?"
 msgstr "Varsayılan?"
 
-#: describe.c:2315
+#: describe.c:2849
 msgid "List of conversions"
 msgstr "Dönüşümlerin listesi"
 
-#: describe.c:2366
+#: describe.c:2890
 msgid "Source type"
 msgstr "Kaynak tipi"
 
-#: describe.c:2367
+#: describe.c:2891
 msgid "Target type"
 msgstr "Hedef tipi"
 
-#: describe.c:2368
-#: describe.c:2628
+#: describe.c:2892
+#: describe.c:3250
 msgid "Function"
 msgstr "Fonksiyon"
 
-#: describe.c:2369
+#: describe.c:2894
 msgid "in assignment"
 msgstr "in assignment"
 
-#: describe.c:2370
+#: describe.c:2896
 msgid "Implicit?"
 msgstr "Örtülü mü?"
 
-#: describe.c:2396
+#: describe.c:2947
 msgid "List of casts"
 msgstr "Castlerin listesi"
 
-#: describe.c:2451
+#: describe.c:3015
+#, fuzzy
+msgid "List of collations"
+msgstr "Nesnelerin listesi"
+
+#: describe.c:3073
 msgid "List of schemas"
 msgstr "Şemaların listesi"
 
-#: describe.c:2474
-#: describe.c:2707
-#: describe.c:2775
-#: describe.c:2843
+#: describe.c:3096
+#: describe.c:3329
+#: describe.c:3397
+#: describe.c:3465
 #, c-format
 msgid "The server (version %d.%d) does not support full text search.\n"
 msgstr "Bu sunucu (%d.%d sürümü) tam metin aramayı desteklememektedir.\n"
 
-#: describe.c:2508
+#: describe.c:3130
 msgid "List of text search parsers"
 msgstr "Metin arama ayrıştıcılarının listesi"
 
-#: describe.c:2551
+#: describe.c:3173
 #, c-format
 msgid "Did not find any text search parser named \"%s\".\n"
 msgstr "\"%s\" adında metin arama ayrıştırıcısı bulunamadı.\n"
 
-#: describe.c:2626
+#: describe.c:3248
 msgid "Start parse"
 msgstr "Ayrıştırmayı başlat"
 
-#: describe.c:2627
+#: describe.c:3249
 msgid "Method"
 msgstr "Yöntem"
 
-#: describe.c:2631
+#: describe.c:3253
 msgid "Get next token"
 msgstr "Sıradaki tokeni al"
 
-#: describe.c:2633
+#: describe.c:3255
 msgid "End parse"
 msgstr "Ayrıştırmayı bitir"
 
-#: describe.c:2635
+#: describe.c:3257
 msgid "Get headline"
 msgstr "Başlığı al"
 
-#: describe.c:2637
+#: describe.c:3259
 msgid "Get token types"
 msgstr "Token tiplerini al"
 
-#: describe.c:2647
+#: describe.c:3269
 #, c-format
 msgid "Text search parser \"%s.%s\""
 msgstr "Metin arama ayrıştırıcısı \"%s.%s\""
 
-#: describe.c:2649
+#: describe.c:3271
 #, c-format
 msgid "Text search parser \"%s\""
 msgstr "\"%s\" metin arama ayrıştırıcısı"
 
-#: describe.c:2667
+#: describe.c:3289
 msgid "Token name"
 msgstr "Token adı"
 
-#: describe.c:2678
+#: describe.c:3300
 #, c-format
 msgid "Token types for parser \"%s.%s\""
 msgstr "\"%s.%s\" ayrıştırıcısı için token tipleri"
 
-#: describe.c:2680
+#: describe.c:3302
 #, c-format
 msgid "Token types for parser \"%s\""
 msgstr "\"%s\" ayrıştırıcısı için token tipleri"
 
-#: describe.c:2729
+#: describe.c:3351
 msgid "Template"
 msgstr "Åžablon"
 
-#: describe.c:2730
+#: describe.c:3352
 msgid "Init options"
 msgstr "İnit seçenekleri"
 
-#: describe.c:2752
+#: describe.c:3374
 msgid "List of text search dictionaries"
 msgstr "Metin arama sözlüklerinin listesi"
 
-#: describe.c:2792
+#: describe.c:3414
 msgid "Init"
 msgstr "Init"
 
-#: describe.c:2793
+#: describe.c:3415
 msgid "Lexize"
 msgstr "Lexize"
 
-#: describe.c:2820
+#: describe.c:3442
 msgid "List of text search templates"
 msgstr "Metin arama şablonlarının listesi"
 
-#: describe.c:2877
+#: describe.c:3499
 msgid "List of text search configurations"
 msgstr "Metin arama yapılandırmalarının listesi"
 
-#: describe.c:2921
+#: describe.c:3543
 #, c-format
 msgid "Did not find any text search configuration named \"%s\".\n"
 msgstr "\"%s\" adında metin arama yapılandırması bulunamadı.\n"
 
-#: describe.c:2987
+#: describe.c:3609
 msgid "Token"
 msgstr "Token"
 
-#: describe.c:2988
+#: describe.c:3610
 msgid "Dictionaries"
 msgstr "Sözlükler"
 
-#: describe.c:2999
+#: describe.c:3621
 #, c-format
 msgid "Text search configuration \"%s.%s\""
 msgstr "Metin arama yapılandırması \"%s.%s\""
 
-#: describe.c:3002
+#: describe.c:3624
 #, c-format
 msgid "Text search configuration \"%s\""
 msgstr "Metin arama yapılandırması \"%s\""
 
-#: describe.c:3006
+#: describe.c:3628
 #, c-format
 msgid ""
 "\n"
@@ -2043,7 +2302,7 @@ msgstr ""
 "\n"
 "Ayrıştırıcı \"%s.%s\""
 
-#: describe.c:3009
+#: describe.c:3631
 #, c-format
 msgid ""
 "\n"
@@ -2052,2719 +2311,4815 @@ msgstr ""
 "\n"
 "Ayrıştırıcı: \"%s\""
 
-#: describe.c:3041
+#: describe.c:3663
 #, c-format
 msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
 msgstr "Sunucu  (%d.%d sürümü) foreign-data wrapperlarını desteklememektedir.\n"
 
-#: describe.c:3053
-msgid "Validator"
-msgstr "Onaylayan"
+#: describe.c:3677
+#, fuzzy
+msgid "Handler"
+msgstr "call_handler"
 
-#: describe.c:3077
+#: describe.c:3720
 msgid "List of foreign-data wrappers"
 msgstr "Foreign-data wrapperlarının listesi"
 
-#: describe.c:3100
+#: describe.c:3743
 #, c-format
 msgid "The server (version %d.%d) does not support foreign servers.\n"
 msgstr "Bu sunucu (%d.%d sürümü) foreign sunucularını desteklemiyor.\n"
 
-#: describe.c:3112
+#: describe.c:3755
 msgid "Foreign-data wrapper"
 msgstr "Foreign-data wrapper"
 
-#: describe.c:3124
+#: describe.c:3773
+#: describe.c:3968
 msgid "Version"
 msgstr "Sürüm"
 
-#: describe.c:3143
+#: describe.c:3799
 msgid "List of foreign servers"
 msgstr "Foreign sunucuların listesi"
 
-#: describe.c:3166
+#: describe.c:3822
 #, c-format
 msgid "The server (version %d.%d) does not support user mappings.\n"
 msgstr "Sunucu  (%d.%d sürümü) kullanıcı haritalamasını desteklememektedir.\n"
 
-#: describe.c:3175
+#: describe.c:3831
+#: describe.c:3892
 msgid "Server"
 msgstr "Sunucu"
 
-#: describe.c:3176
+#: describe.c:3832
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#: describe.c:3196
+#: describe.c:3857
 msgid "List of user mappings"
 msgstr "Kullanıcı eşlemelerinin listesi"
 
-#: sql_help.h:25
-#: sql_help.h:505
+#: describe.c:3880
+#, fuzzy, c-format
+msgid "The server (version %d.%d) does not support foreign tables.\n"
+msgstr "Bu sunucu (%d.%d sürümü) foreign sunucularını desteklemiyor.\n"
+
+#: describe.c:3931
+#, fuzzy
+msgid "List of foreign tables"
+msgstr "Foreign sunucuların listesi"
+
+#: describe.c:3954
+#: describe.c:4008
+#, fuzzy, c-format
+msgid "The server (version %d.%d) does not support extensions.\n"
+msgstr "Bu sunucu (%d.%d sürümü) tablespace desteklememektedir.\n"
+
+#: describe.c:3985
+#, fuzzy
+msgid "List of installed extensions"
+msgstr "Dönüşümlerin listesi"
+
+#: describe.c:4035
+#, fuzzy, c-format
+msgid "Did not find any extension named \"%s\".\n"
+msgstr "\"%s\" adında nesne bulunamadı.\n"
+
+#: describe.c:4038
+#, fuzzy, c-format
+msgid "Did not find any extensions.\n"
+msgstr "\"%s\" adında nesne bulunamadı.\n"
+
+#: describe.c:4082
+#, fuzzy
+msgid "Object Description"
+msgstr "Nesne açıklamaları"
+
+#: describe.c:4091
+#, c-format
+msgid "Objects in extension \"%s\""
+msgstr ""
+
+#: sql_help.h:182
+#: sql_help.h:837
 msgid "abort the current transaction"
 msgstr "aktif transcation'ı iptal et"
 
-#: sql_help.h:26
-msgid "ABORT [ WORK | TRANSACTION ]"
-msgstr "ABORT [ WORK | TRANSACTION ]"
-
-#: sql_help.h:29
+#: sql_help.h:187
 msgid "change the definition of an aggregate function"
 msgstr "aggregate fonksiyonunun tanımını değiştir"
 
-#: sql_help.h:30
-msgid ""
-"ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
-"ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
-"ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
-msgstr ""
-"ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
-"ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
-"ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
+#: sql_help.h:192
+#, fuzzy
+msgid "change the definition of a collation"
+msgstr "fonksiyon tanımını değiştir"
 
-#: sql_help.h:33
+#: sql_help.h:197
 msgid "change the definition of a conversion"
 msgstr "bir dönüşümün tanımını değiştir"
 
-#: sql_help.h:34
-msgid ""
-"ALTER CONVERSION name RENAME TO newname\n"
-"ALTER CONVERSION name OWNER TO newowner"
-msgstr ""
-"ALTER CONVERSION dönüşüm_adı RENAME TO yeni_ad\n"
-"ALTER CONVERSION dönüşüm_adı OWNER TO yeni_sahip"
-
-#: sql_help.h:37
+#: sql_help.h:202
 msgid "change a database"
 msgstr "veritabanını değiştir"
 
-#: sql_help.h:38
-msgid ""
-"ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"\n"
-"    CONNECTION LIMIT connlimit\n"
-"\n"
-"ALTER DATABASE name RENAME TO newname\n"
-"\n"
-"ALTER DATABASE name OWNER TO new_owner\n"
-"\n"
-"ALTER DATABASE name SET TABLESPACE new_tablespace\n"
-"\n"
-"ALTER DATABASE name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"ALTER DATABASE name SET configuration_parameter FROM CURRENT\n"
-"ALTER DATABASE name RESET configuration_parameter\n"
-"ALTER DATABASE name RESET ALL"
-msgstr ""
-"ALTER DATABASE veritabanı_adı [ [ WITH ] seçenek [ ... ] ]\n"
-"\n"
-"seçenek aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    CONNECTION LIMIT bağlantı limiti\n"
-"\n"
-"ALTER DATABASE veritabanı_adı RENAME TO yeni_adı\n"
-"\n"
-"ALTER DATABASE veritabanı_adı OWNER TO yeni_sahibi\n"
-"\n"
-"ALTER DATABASE veritabanı_adı SET yapılandırma_parametresi { TO | = } { değer | DEFAULT }\n"
-"ALTER DATABASE veritabanı_adı SET yapılandırma_parametresi FROM CURRENT\n"
-"ALTER DATABASE veritabanı_adı RESET yapılandırma_parametresi\n"
-"ALTER DATABASE veritabanı_adı RESET ALL"
+#: sql_help.h:207
+#, fuzzy
+msgid "define default access privileges"
+msgstr "erişim haklarını tanımla"
 
-#: sql_help.h:41
+#: sql_help.h:212
 msgid "change the definition of a domain"
 msgstr "domain tanımını değiştir"
 
-#: sql_help.h:42
-msgid ""
-"ALTER DOMAIN name\n"
-"    { SET DEFAULT expression | DROP DEFAULT }\n"
-"ALTER DOMAIN name\n"
-"    { SET | DROP } NOT NULL\n"
-"ALTER DOMAIN name\n"
-"    ADD domain_constraint\n"
-"ALTER DOMAIN name\n"
-"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-"ALTER DOMAIN name\n"
-"    OWNER TO new_owner \n"
-"ALTER DOMAIN name\n"
-"    SET SCHEMA new_schema"
-msgstr ""
-"ALTER DOMAIN name\n"
-"    { SET DEFAULT expression | DROP DEFAULT }\n"
-"ALTER DOMAIN name\n"
-"    { SET | DROP } NOT NULL\n"
-"ALTER DOMAIN name\n"
-"    ADD domain_constraint\n"
-"ALTER DOMAIN name\n"
-"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-"ALTER DOMAIN name\n"
-"    OWNER TO new_owner \n"
-"ALTER DOMAIN name\n"
-"    SET SCHEMA new_schema"
-
-#: sql_help.h:45
+#: sql_help.h:217
+#, fuzzy
+msgid "change the definition of an extension"
+msgstr "bir dönüşümün tanımını değiştir"
+
+#: sql_help.h:222
 msgid "change the definition of a foreign-data wrapper"
 msgstr "foreign-data wrapper tanımını değiştir"
 
-#: sql_help.h:46
-msgid ""
-"ALTER FOREIGN DATA WRAPPER name\n"
-"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
-"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ]) ]\n"
-"ALTER FOREIGN DATA WRAPPER name OWNER TO new_owner"
-msgstr ""
-"ALTER FOREIGN DATA WRAPPER ad\n"
-"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
-"    [ SEÇENEKLER ( [ ADD | SET | DROP ] seçenek ['değer'] [, ... ]) ]\n"
-"ALTER FOREIGN DATA WRAPPER ad OWNER TO yeni sahibi"
+#: sql_help.h:227
+#, fuzzy
+msgid "change the definition of a foreign table"
+msgstr "foreign server tanımını değiştir"
 
-#: sql_help.h:49
+#: sql_help.h:232
 msgid "change the definition of a function"
 msgstr "fonksiyon tanımını değiştir"
 
-#: sql_help.h:50
-msgid ""
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    action [ ... ] [ RESTRICT ]\n"
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    RENAME TO new_name\n"
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    OWNER TO new_owner\n"
-"ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    SET SCHEMA new_schema\n"
-"\n"
-"where action is one of:\n"
-"\n"
-"    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-"    IMMUTABLE | STABLE | VOLATILE\n"
-"    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    COST execution_cost\n"
-"    ROWS result_rows\n"
-"    SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"    SET configuration_parameter FROM CURRENT\n"
-"    RESET configuration_parameter\n"
-"    RESET ALL"
-msgstr ""
-"ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    iÅŸlem [ ... ] [ RESTRICT ]\n"
-"ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    RENAME TO yeni_adı\n"
-"ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    OWNER TO yeni_sahibi\n"
-"ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    SET SCHEMA yeni_ÅŸema\n"
-"\n"
-"işlem aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-"    IMMUTABLE | STABLE | VOLATILE\n"
-"    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    COST çalıştırma_maliyeti(execution cost)\n"
-"    ROWS result_rows\n"
-"    SET yapılandırma_parametresi { TO | = } { value | DEFAULT }\n"
-"    SET yapılandırma_parametresi FROM CURRENT\n"
-"    RESET yapılandırma_parametresi\n"
-"    RESET ALL"
-
-#: sql_help.h:53
+#: sql_help.h:237
 msgid "change role name or membership"
 msgstr "üyeliği veya rol adını değiştir"
 
-#: sql_help.h:54
-msgid ""
-"ALTER GROUP groupname ADD USER username [, ... ]\n"
-"ALTER GROUP groupname DROP USER username [, ... ]\n"
-"\n"
-"ALTER GROUP groupname RENAME TO newname"
-msgstr ""
-"ALTER GROUP grup_adı ADD USER kullanıcı_adı [, ... ]\n"
-"ALTER GROUP grup_adı DROP USER kullanıcı_adı [, ... ]\n"
-"\n"
-"ALTER GROUP grup_adı RENAME TO yeni_ad"
-
-#: sql_help.h:57
+#: sql_help.h:242
 msgid "change the definition of an index"
 msgstr "index tanımını değiştir"
 
-#: sql_help.h:58
-msgid ""
-"ALTER INDEX name RENAME TO new_name\n"
-"ALTER INDEX name SET TABLESPACE tablespace_name\n"
-"ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
-"ALTER INDEX name RESET ( storage_parameter [, ... ] )"
-msgstr ""
-"ALTER INDEX name RENAME TO new_name\n"
-"ALTER INDEX name SET TABLESPACE tablespace_name\n"
-"ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
-"ALTER INDEX name RESET ( storage_parameter [, ... ] )"
-
-#: sql_help.h:61
+#: sql_help.h:247
 msgid "change the definition of a procedural language"
 msgstr "yordamsal dilinin tanımını değiştir"
 
-#: sql_help.h:62
-msgid ""
-"ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
-"ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
-msgstr ""
-"ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
-"ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
+#: sql_help.h:252
+#, fuzzy
+msgid "change the definition of a large object"
+msgstr "tablonun tanımını değiştir"
 
-#: sql_help.h:65
+#: sql_help.h:257
 msgid "change the definition of an operator"
 msgstr "operatör tanımını değiştir"
 
-#: sql_help.h:66
-msgid "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER TO newowner"
-msgstr "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER TO yeni_sahip"
-
-#: sql_help.h:69
+#: sql_help.h:262
 msgid "change the definition of an operator class"
 msgstr "operatör sınıfının tanımını değiştir"
 
-#: sql_help.h:70
-msgid ""
-"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
-"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
-msgstr ""
-"ALTER OPERATOR CLASS ad USING index_method RENAME TO yeni_ad\n"
-"ALTER OPERATOR CLASS ad USING index_method OWNER TO yeni_sahip"
-
-#: sql_help.h:73
+#: sql_help.h:267
 msgid "change the definition of an operator family"
 msgstr "operatör ailesinin tanımını değiştir"
 
-#: sql_help.h:74
-msgid ""
-"ALTER OPERATOR FAMILY name USING index_method ADD\n"
-"  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname ( argument_type [, ...] )\n"
-"  } [, ... ]\n"
-"ALTER OPERATOR FAMILY name USING index_method DROP\n"
-"  {  OPERATOR strategy_number ( op_type [ , op_type ] )\n"
-"   | FUNCTION support_number ( op_type [ , op_type ] )\n"
-"  } [, ... ]\n"
-"ALTER OPERATOR FAMILY name USING index_method RENAME TO newname\n"
-"ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner"
-msgstr ""
-"ALTER OPERATOR FAMILY adı USING index_methodu ADD\n"
-"  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname ( argument_type [, ...] )\n"
-"  } [, ... ]\n"
-"ALTER OPERATOR FAMILY ad USING index_methodu DROP\n"
-"  {  OPERATOR strategy_number ( op_type [ , op_type ] )\n"
-"   | FUNCTION support_number ( op_type [ , op_type ] )\n"
-"  } [, ... ]\n"
-"ALTER OPERATOR FAMILY ad USING index_methodu RENAME TO yeni ad\n"
-"ALTER OPERATOR FAMILY ad USING index_methodu OWNER TO yeni sahibi"
-
-#: sql_help.h:77
-#: sql_help.h:125
+#: sql_help.h:272
+#: sql_help.h:332
 msgid "change a database role"
 msgstr "veritabanı dolünü değiştir"
 
-#: sql_help.h:78
-msgid ""
-"ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"\n"
-"ALTER ROLE name RENAME TO newname\n"
-"\n"
-"ALTER ROLE name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"ALTER ROLE name SET configuration_parameter FROM CURRENT\n"
-"ALTER ROLE name RESET configuration_parameter\n"
-"ALTER ROLE name RESET ALL"
-msgstr ""
-"ALTER ROLE rol_adı [ [ WITH ] seçenek [ ... ] ]\n"
-"\n"
-"seçenek aşağıdakilerden birisi olabilir:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT bağlantı_sayısı_sınırı\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"\n"
-"ALTER ROLE rol_adı RENAME TO yeni_adı\n"
-"\n"
-"ALTER ROLE rol_adı SET yapılandırma_parametresi { TO | = } { value | DEFAULT }\n"
-"ALTER ROLE rol_adı SET yapılandırma_parametresi FROM CURRENT\n"
-"ALTER ROLE rol_adı RESET yapılandırma_parametresi\n"
-"ALTER ROLE rol_adı RESET ALL"
-
-#: sql_help.h:81
+#: sql_help.h:277
 msgid "change the definition of a schema"
 msgstr "şema tanımını değiştir"
 
-#: sql_help.h:82
-msgid ""
-"ALTER SCHEMA name RENAME TO newname\n"
-"ALTER SCHEMA name OWNER TO newowner"
-msgstr ""
-"ALTER SCHEMA şema_adı RENAME TO yeni_ad\n"
-"ALTER SCHEMA şema_adı OWNER TO yeni_sahip"
-
-#: sql_help.h:85
+#: sql_help.h:282
 msgid "change the definition of a sequence generator"
 msgstr "sequence üretecinin tanımını değiştir"
 
-#: sql_help.h:86
-msgid ""
-"ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ START [ WITH ] start ]\n"
-"    [ RESTART [ [ WITH ] restart ] ]\n"
-"    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-"    [ OWNED BY { table.column | NONE } ]\n"
-"ALTER SEQUENCE name OWNER TO new_owner\n"
-"ALTER SEQUENCE name RENAME TO new_name\n"
-"ALTER SEQUENCE name SET SCHEMA new_schema"
-msgstr ""
-"ALTER SEQUENCE ad [ INCREMENT [ BY ] arttırma miktarı ]\n"
-"    [ MINVALUE en az değer | NO MINVALUE ] [ MAXVALUE üst değer | NO MAXVALUE ]\n"
-"    [ START [ WITH ] başlama sayısı ]\n"
-"    [ RESTART [ [ WITH ] yeniden başlama sayısı ] ]\n"
-"    [ CACHE önbellek ] [ [ NO ] CYCLE ]\n"
-"    [ OWNED BY { tablo.kolon | NONE } ]\n"
-"ALTER SEQUENCE ad OWNER TO yeni sahibir\n"
-"ALTER SEQUENCE ad RENAME TO yeni adı\n"
-"ALTER SEQUENCE namade SET SCHEMA yeni şeması"
-
-#: sql_help.h:89
+#: sql_help.h:287
 msgid "change the definition of a foreign server"
 msgstr "foreign server tanımını değiştir"
 
-#: sql_help.h:90
-msgid ""
-"ALTER SERVER servername [ VERSION 'newversion' ]\n"
-"    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]\n"
-"ALTER SERVER servername OWNER TO new_owner"
-msgstr ""
-"ALTER SERVER sunucu adı [ VERSION 'yeni sürüm' ]\n"
-"    [ OPTIONS ( [ ADD | SET | DROP ] seçenek ['değer'] [, ... ] ) ]\n"
-"ALTER SERVER sunucu adı OWNER TO yeni sahibi"
-
-#: sql_help.h:93
+#: sql_help.h:292
 msgid "change the definition of a table"
 msgstr "tablonun tanımını değiştir"
 
-#: sql_help.h:94
-msgid ""
-"ALTER TABLE [ ONLY ] name [ * ]\n"
-"    action [, ... ]\n"
-"ALTER TABLE [ ONLY ] name [ * ]\n"
-"    RENAME [ COLUMN ] column TO new_column\n"
-"ALTER TABLE name\n"
-"    RENAME TO new_name\n"
-"ALTER TABLE name\n"
-"    SET SCHEMA new_schema\n"
-"\n"
-"where action is one of:\n"
-"\n"
-"    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"
-"    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] column [ SET DATA ] TYPE type [ USING expression ]\n"
-"    ALTER [ COLUMN ] column SET DEFAULT expression\n"
-"    ALTER [ COLUMN ] column DROP DEFAULT\n"
-"    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"
-"    ALTER [ COLUMN ] column SET STATISTICS integer\n"
-"    ALTER [ COLUMN ] column SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }\n"
-"    ADD table_constraint\n"
-"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
-"    DISABLE TRIGGER [ trigger_name | ALL | USER ]\n"
-"    ENABLE TRIGGER [ trigger_name | ALL | USER ]\n"
-"    ENABLE REPLICA TRIGGER trigger_name\n"
-"    ENABLE ALWAYS TRIGGER trigger_name\n"
-"    DISABLE RULE rewrite_rule_name\n"
-"    ENABLE RULE rewrite_rule_name\n"
-"    ENABLE REPLICA RULE rewrite_rule_name\n"
-"    ENABLE ALWAYS RULE rewrite_rule_name\n"
-"    CLUSTER ON index_name\n"
-"    SET WITHOUT CLUSTER\n"
-"    SET WITH OIDS\n"
-"    SET WITHOUT OIDS\n"
-"    SET ( storage_parameter = value [, ... ] )\n"
-"    RESET ( storage_parameter [, ... ] )\n"
-"    INHERIT parent_table\n"
-"    NO INHERIT parent_table\n"
-"    OWNER TO new_owner\n"
-"    SET TABLESPACE new_tablespace"
-msgstr ""
-"ALTER TABLE [ ONLY ] ad [ * ]\n"
-"    action [, ... ]\n"
-"ALTER TABLE [ ONLY ] ad [ * ]\n"
-"    RENAME [ COLUMN ] kolon TO yeni kolon\n"
-"ALTER TABLE ad\n"
-"    RENAME TO yeni ad\n"
-"ALTER TABLE ad\n"
-"    SET SCHEMA yeni ÅŸema\n"
-"\n"
-"action aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    ADD [ COLUMN ] kolon kolon_tipi [ kolon kısıtlaması [ ... ] ]\n"
-"    DROP [ COLUMN ] kolon [ RESTRICT | CASCADE ]\n"
-"    ALTER [ COLUMN ] kolon [ SET DATA ] TYPE type [ USING ifade ]\n"
-"    ALTER [ COLUMN ] kolon SET DEFAULT ifade\n"
-"    ALTER [ COLUMN ] kolon DROP DEFAULT\n"
-"    ALTER [ COLUMN ] kolon { SET | DROP } NOT NULL\n"
-"    ALTER [ COLUMN ] kolon SET STATISTICS tamsayı\n"
-"    ALTER [ COLUMN ] kolon SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }\n"
-"    ADD tablo kısıtlaması\n"
-"    DROP CONSTRAINT kısıtlama adı [ RESTRICT | CASCADE ]\n"
-"    DISABLE TRIGGER [ trigger adı | ALL | USER ]\n"
-"    ENABLE TRIGGER[ trigger adı | ALL | USER ]\n"
-"    ENABLE REPLICA TRIGGER trigger adı\n"
-"    ENABLE ALWAYS TRIGGER trigger adı\n"
-"    DISABLE RULE rewrite_rule_name\n"
-"    ENABLE RULE rewrite_rule_name\n"
-"    ENABLE REPLICA RULE rewrite_rule_name\n"
-"    ENABLE ALWAYS RULE rewrite_rule_name\n"
-"    CLUSTER ON index adı\n"
-"    SET WITHOUT CLUSTER\n"
-"    SET WITH OIDS\n"
-"    SET WITHOUT OIDS\n"
-"    SET ( storage_parameter = value [, ... ] )\n"
-"    RESET ( storage_parameter [, ... ] )\n"
-"    INHERIT üst tablo\n"
-"    NO INHERIT üst tablo\n"
-"    OWNER TO yeni sahibi\n"
-"    SET TABLESPACE yeni tablespace"
-
-#: sql_help.h:97
+#: sql_help.h:297
 msgid "change the definition of a tablespace"
 msgstr "tablespace tanımını değiştir"
 
-#: sql_help.h:98
-msgid ""
-"ALTER TABLESPACE name RENAME TO newname\n"
-"ALTER TABLESPACE name OWNER TO newowner"
-msgstr ""
-"ALTER TABLESPACE tablespace_adı RENAME TO yeni_ad\n"
-"ALTER TABLESPACE tablespace_adı OWNER TO yeni_sahip"
-
-#: sql_help.h:101
+#: sql_help.h:302
 msgid "change the definition of a text search configuration"
 msgstr "metin arama yapılandırmasının tanımını değiştir"
 
-#: sql_help.h:102
-msgid ""
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING REPLACE old_dictionary WITH new_dictionary\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH new_dictionary\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname\n"
-"ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
-msgstr ""
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING REPLACE old_dictionary WITH new_dictionary\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH new_dictionary\n"
-"ALTER TEXT SEARCH CONFIGURATION name\n"
-"    DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ]\n"
-"ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname\n"
-"ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
-
-#: sql_help.h:105
+#: sql_help.h:307
 msgid "change the definition of a text search dictionary"
 msgstr "metin arama sözlüğünün tanımını değiştir"
 
-#: sql_help.h:106
-msgid ""
-"ALTER TEXT SEARCH DICTIONARY name (\n"
-"    option [ = value ] [, ... ]\n"
-")\n"
-"ALTER TEXT SEARCH DICTIONARY name RENAME TO newname\n"
-"ALTER TEXT SEARCH DICTIONARY name OWNER TO newowner"
-msgstr ""
-"ALTER TEXT SEARCH DICTIONARY ad (\n"
-"    option [ = value ] [, ... ]\n"
-")\n"
-"ALTER TEXT SEARCH DICTIONARY ad RENAME TO yeni adı\n"
-"ALTER TEXT SEARCH DICTIONARY ad OWNER TO yeni sahibi"
-
-#: sql_help.h:109
+#: sql_help.h:312
 msgid "change the definition of a text search parser"
 msgstr "metin arama ayrıştırıcısının tanımını değiştir"
 
-#: sql_help.h:110
-msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
-msgstr "ALTER TEXT SEARCH PARSER ayrıştırıcı_adı RENAME TO yeni_adı"
-
-#: sql_help.h:113
+#: sql_help.h:317
 msgid "change the definition of a text search template"
 msgstr "metin arama şablonunun tanımını değiştir"
 
-#: sql_help.h:114
-msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
-msgstr "ALTER TEXT SEARCH TEMPLATE şablon_adı RENAME TO yeni_adı"
-
-#: sql_help.h:117
+#: sql_help.h:322
 msgid "change the definition of a trigger"
 msgstr "trigger tanımını değiştir"
 
-#: sql_help.h:118
-msgid "ALTER TRIGGER name ON table RENAME TO newname"
-msgstr "ALTER TRIGGER trigger_adı ON tablo_adı RENAME TO yeni_ad"
-
-#: sql_help.h:121
+#: sql_help.h:327
 msgid "change the definition of a type"
 msgstr "type tanımını değiştir"
 
-#: sql_help.h:122
-msgid ""
-"ALTER TYPE name RENAME TO new_name\n"
-"ALTER TYPE name OWNER TO new_owner \n"
-"ALTER TYPE name SET SCHEMA new_schema"
-msgstr ""
-"ALTER TYPE ad RENAME TO yeni adı\n"
-"ALTER TYPE ad OWNER TO yeni sahibi \n"
-"ALTER TYPE ad SET SCHEMA yeni ÅŸema"
-
-#: sql_help.h:126
-msgid ""
-"ALTER USER name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"\n"
-"ALTER USER name RENAME TO newname\n"
-"\n"
-"ALTER USER name SET configuration_parameter { TO | = } { value | DEFAULT }\n"
-"ALTER USER name SET configuration_parameter FROM CURRENT\n"
-"ALTER USER name RESET configuration_parameter\n"
-"ALTER USER name RESET ALL"
-msgstr ""
-"ALTER USER kullanıcı_adı [ [ WITH ] seçenek [ ... ] ]\n"
-"\n"
-"seçenek aşağıdakilerden birisi olabilir:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT bağlantı_sayısı_sınırı\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"\n"
-"ALTER USER kullanıcı_adı RENAME TO yeni_adı\n"
-"\n"
-"ALTER USER kullanıcı_adı SET yapılandırma_parametresi { TO | = } { value | DEFAULT }\n"
-"ALTER USER kullanıcı_adı SET yapılandırma_parametresi FROM CURRENT\n"
-"ALTER USER kullanıcı_adı RESET yapılandırma_parametresi\n"
-"ALTER USER kullanıcı_adı RESET ALL"
-
-#: sql_help.h:129
+#: sql_help.h:337
 msgid "change the definition of a user mapping"
 msgstr "kullanıcı haritalama tanımını değiştir"
 
-#: sql_help.h:130
-msgid ""
-"ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
-"    SERVER servername\n"
-"    OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] )"
-msgstr ""
-"ALTER USER MAPPING FOR { kullanıcı adı | USER | CURRENT_USER | PUBLIC }\n"
-"    SERVER sunucu adı\n"
-"    OPTIONS ( [ ADD | SET | DROP ] seçenek ['değer'] [, ... ] )"
-
-#: sql_help.h:133
+#: sql_help.h:342
 msgid "change the definition of a view"
 msgstr "view tanımını değiştir"
 
-#: sql_help.h:134
-msgid ""
-"ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
-"ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
-"ALTER VIEW name OWNER TO new_owner\n"
-"ALTER VIEW name RENAME TO new_name\n"
-"ALTER VIEW name SET SCHEMA new_schema"
-msgstr ""
-"ALTER VIEW ad ALTER [ COLUMN ] kolon SET DEFAULT ifade\n"
-"ALTER VIEW ad ALTER [ COLUMN ] kolon DROP DEFAULT\n"
-"ALTER VIEW ad OWNER TO yeni sahibi\n"
-"ALTER VIEW ad RENAME TO yeni adı\n"
-"ALTER VIEW ad SET SCHEMA yeni ÅŸema"
-
-#: sql_help.h:137
+#: sql_help.h:347
 msgid "collect statistics about a database"
 msgstr "database hakkında istatistikleri topla"
 
-#: sql_help.h:138
-msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
-msgstr "ANALYZE [ VERBOSE ] [ tablo [ ( kolon [, ...] ) ] ]"
-
-#: sql_help.h:141
-#: sql_help.h:553
+#: sql_help.h:352
+#: sql_help.h:902
 msgid "start a transaction block"
 msgstr "transaction bloÄŸunu baÅŸlat"
 
-#: sql_help.h:142
-msgid ""
-"BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
-"\n"
-"where transaction_mode is one of:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
-msgstr ""
-"BEGIN [ WORK | TRANSACTION ] [ transaction_modu [, ...] ]\n"
-"\n"
-"transaction_modu aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
-
-#: sql_help.h:145
+#: sql_help.h:357
 msgid "force a transaction log checkpoint"
 msgstr "transaction checkpoint'i gerçekleştir"
 
-#: sql_help.h:146
-msgid "CHECKPOINT"
-msgstr "CHECKPOINT"
-
-#: sql_help.h:149
+#: sql_help.h:362
 msgid "close a cursor"
 msgstr "cursor'u kapat"
 
-#: sql_help.h:150
-msgid "CLOSE { name | ALL }"
-msgstr "CLOSE { name | ALL }"
-
-#: sql_help.h:153
+#: sql_help.h:367
 msgid "cluster a table according to an index"
 msgstr "indexe dayanarak tabloyu cluster iÅŸlemine tabi tut"
 
-#: sql_help.h:154
-msgid ""
-"CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
-"CLUSTER [VERBOSE]"
-msgstr ""
-"CLUSTER [VERBOSE] tablo adı [ USING index adı ]\n"
-"CLUSTER [VERBOSE]"
-
-#: sql_help.h:157
+#: sql_help.h:372
 msgid "define or change the comment of an object"
 msgstr "Nesne yorumunu tanımla ya da değiştir"
 
-#: sql_help.h:158
-msgid ""
-"COMMENT ON\n"
-"{\n"
-"  TABLE object_name |\n"
-"  COLUMN table_name.column_name |\n"
-"  AGGREGATE agg_name (agg_type [, ...] ) |\n"
-"  CAST (sourcetype AS targettype) |\n"
-"  CONSTRAINT constraint_name ON table_name |\n"
-"  CONVERSION object_name |\n"
-"  DATABASE object_name |\n"
-"  DOMAIN object_name |\n"
-"  FUNCTION func_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) |\n"
-"  INDEX object_name |\n"
-"  LARGE OBJECT large_object_oid |\n"
-"  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
-"  OPERATOR CLASS object_name USING index_method |\n"
-"  OPERATOR FAMILY object_name USING index_method |\n"
-"  [ PROCEDURAL ] LANGUAGE object_name |\n"
-"  ROLE object_name |\n"
-"  RULE rule_name ON table_name |\n"
-"  SCHEMA object_name |\n"
-"  SEQUENCE object_name |\n"
-"  TABLESPACE object_name |\n"
-"  TEXT SEARCH CONFIGURATION object_name |\n"
-"  TEXT SEARCH DICTIONARY object_name |\n"
-"  TEXT SEARCH PARSER object_name |\n"
-"  TEXT SEARCH TEMPLATE object_name |\n"
-"  TRIGGER trigger_name ON table_name |\n"
-"  TYPE object_name |\n"
-"  VIEW object_name\n"
-"} IS 'text'"
-msgstr ""
-"COMMENT ON\n"
-"{\n"
-"  TABLE nesne_ado |\n"
-"  COLUMN tablo_adı.kolon_adı |\n"
-"  AGGREGATE agg_name (agg_type [, ...] ) |\n"
-"  CAST (sourcetype AS targettype) |\n"
-"  CONSTRAINT constraint_name ON table_name |\n"
-"  CONVERSION nesne_adı |\n"
-"  DATABASE nesne_adı |\n"
-"  DOMAIN nesne_adı |\n"
-"  FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] ) |\n"
-"  INDEX nesne_adı |\n"
-"  LARGE OBJECT large_object_oid |\n"
-"  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
-"  OPERATOR CLASS nesne_adı USING index_yöntemi |\n"
-"  OPERATOR FAMILY nesne_adı USING index_yöntemi |\n"
-"  [ PROCEDURAL ] LANGUAGE nesne_adı |\n"
-"  ROLE nesne_adı |\n"
-"  RULE kural_adı ON tablo_adı |\n"
-"  SCHEMA nesne_adı |\n"
-"  SEQUENCE nesne_adı |\n"
-"  TABLESPACE nesne_adı |\n"
-"  TEXT SEARCH CONFIGURATION nesne_adı |\n"
-"  TEXT SEARCH DICTIONARY nesne_adı |\n"
-"  TEXT SEARCH PARSER nesne_adı |\n"
-"  TEXT SEARCH TEMPLATE nesne_adı |\n"
-"  TRIGGER tetikleyici_adı ON table_name |\n"
-"  TYPE nesne_adı |\n"
-"  VIEW nesne_adı\n"
-"} IS 'text'"
-
-#: sql_help.h:161
-#: sql_help.h:433
+#: sql_help.h:377
+#: sql_help.h:747
 msgid "commit the current transaction"
 msgstr "geçerli transaction'u commit et"
 
-#: sql_help.h:162
-msgid "COMMIT [ WORK | TRANSACTION ]"
-msgstr "COMMIT [ WORK | TRANSACTION ]"
-
-#: sql_help.h:165
+#: sql_help.h:382
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "daha önce two-phase commit için hazırlanmış transaction'u commit et"
 
-#: sql_help.h:166
-msgid "COMMIT PREPARED transaction_id"
-msgstr "COMMIT PREPARED transaction_id"
-
-#: sql_help.h:169
+#: sql_help.h:387
 msgid "copy data between a file and a table"
 msgstr "dosya ile veritabanı tablosu arasında veriyi transfer et"
 
-#: sql_help.h:170
-msgid ""
-"COPY tablename [ ( column [, ...] ) ]\n"
-"    FROM { 'filename' | STDIN }\n"
-"    [ [ WITH ] \n"
-"          [ BINARY ]\n"
-"          [ OIDS ]\n"
-"          [ DELIMITER [ AS ] 'delimiter' ]\n"
-"          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ HEADER ]\n"
-"                [ QUOTE [ AS ] 'quote' ] \n"
-"                [ ESCAPE [ AS ] 'escape' ]\n"
-"                [ FORCE NOT NULL column [, ...] ]\n"
-"\n"
-"COPY { tablename [ ( column [, ...] ) ] | ( query ) }\n"
-"    TO { 'filename' | STDOUT }\n"
-"    [ [ WITH ] \n"
-"          [ BINARY ]\n"
-"          [ OIDS ]\n"
-"          [ DELIMITER [ AS ] 'delimiter' ]\n"
-"          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ HEADER ]\n"
-"                [ QUOTE [ AS ] 'quote' ] \n"
-"                [ ESCAPE [ AS ] 'escape' ]\n"
-"                [ FORCE QUOTE column [, ...] ]"
-msgstr ""
-"COPY tablo adı [ ( kolon [, ...] ) ]\n"
-"    FROM { 'dosya adı' | STDIN }\n"
-"    [ [ WITH ] \n"
-"          [ BINARY ]\n"
-"          [ OIDS ]\n"
-"          [ DELIMITER [ AS ] 'delimiter' ]\n"
-"          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ HEADER ]\n"
-"                [ QUOTE [ AS ] 'quote' ] \n"
-"                [ ESCAPE [ AS ] 'escape' ]\n"
-"                [ FORCE NOT NULL column [, ...] ]\n"
-"\n"
-"COPY { tablo adı [ ( kolon [, ...] ) ] | ( sorgu ) }\n"
-"    TO { 'dosya adı' | STDOUT }\n"
-"    [ [ WITH ] \n"
-"          [ BINARY ]\n"
-"          [ OIDS ]\n"
-"          [ DELIMITER [ AS ] 'delimiter' ]\n"
-"          [ NULL [ AS ] 'null string' ]\n"
-"          [ CSV [ HEADER ]\n"
-"                [ QUOTE [ AS ] 'quote' ] \n"
-"                [ ESCAPE [ AS ] 'escape' ]\n"
-"                [ FORCE QUOTE column [, ...] ]"
-
-#: sql_help.h:173
+#: sql_help.h:392
 msgid "define a new aggregate function"
 msgstr "yeni aggregate fonksiyonunu tanımla"
 
-#: sql_help.h:174
-msgid ""
-"CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
-"    SFUNC = sfunc,\n"
-"    STYPE = state_data_type\n"
-"    [ , FINALFUNC = ffunc ]\n"
-"    [ , INITCOND = initial_condition ]\n"
-"    [ , SORTOP = sort_operator ]\n"
-")\n"
-"\n"
-"or the old syntax\n"
-"\n"
-"CREATE AGGREGATE name (\n"
-"    BASETYPE = base_type,\n"
-"    SFUNC = sfunc,\n"
-"    STYPE = state_data_type\n"
-"    [ , FINALFUNC = ffunc ]\n"
-"    [ , INITCOND = initial_condition ]\n"
-"    [ , SORTOP = sort_operator ]\n"
-")"
-msgstr ""
-"CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
-"    SFUNC = sfunc,\n"
-"    STYPE = state_data_type\n"
-"    [ , FINALFUNC = ffunc ]\n"
-"    [ , INITCOND = initial_condition ]\n"
-"    [ , SORTOP = sort_operator ]\n"
-")\n"
-"\n"
-"or the old syntax\n"
-"\n"
-"CREATE AGGREGATE name (\n"
-"    BASETYPE = base_type,\n"
-"    SFUNC = sfunc,\n"
-"    STYPE = state_data_type\n"
-"    [ , FINALFUNC = ffunc ]\n"
-"    [ , INITCOND = initial_condition ]\n"
-"    [ , SORTOP = sort_operator ]\n"
-")"
-
-#: sql_help.h:177
+#: sql_help.h:397
 msgid "define a new cast"
 msgstr "yeni cast tanımla"
 
-#: sql_help.h:178
-msgid ""
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITH FUNCTION funcname (argtypes)\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-"\n"
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITHOUT FUNCTION\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-"\n"
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITH INOUT\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]"
-msgstr ""
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITH FUNCTION funcname (argtypes)\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-"\n"
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITHOUT FUNCTION\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
-"\n"
-"CREATE CAST (sourcetype AS targettype)\n"
-"    WITH INOUT\n"
-"    [ AS ASSIGNMENT | AS IMPLICIT ]"
-
-#: sql_help.h:181
-msgid "define a new constraint trigger"
-msgstr "yeni constraint trigger tanımla"
+#: sql_help.h:402
+#, fuzzy
+msgid "define a new collation"
+msgstr "yeni fonksiyonu tanımla"
 
-#: sql_help.h:182
-msgid ""
-"CREATE CONSTRAINT TRIGGER name\n"
-"    AFTER event [ OR ... ]\n"
-"    ON table_name\n"
-"    [ FROM referenced_table_name ]\n"
-"    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY DEFERRED } }\n"
-"    FOR EACH ROW\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-msgstr ""
-"CREATE CONSTRAINT TRIGGER name\n"
-"    AFTER event [ OR ... ]\n"
-"    ON table_name\n"
-"    [ FROM referenced_table_name ]\n"
-"    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY DEFERRED } }\n"
-"    FOR EACH ROW\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-
-#: sql_help.h:185
+#: sql_help.h:407
 msgid "define a new encoding conversion"
 msgstr "yeni kodlama dönüşümü tanımla"
 
-#: sql_help.h:186
-msgid ""
-"CREATE [ DEFAULT ] CONVERSION name\n"
-"    FOR source_encoding TO dest_encoding FROM funcname"
-msgstr ""
-"CREATE [ DEFAULT ] CONVERSION name\n"
-"    FOR source_encoding TO dest_encoding FROM funcname"
-
-#: sql_help.h:189
+#: sql_help.h:412
 msgid "create a new database"
 msgstr "yeni veritabanı oluştur"
 
-#: sql_help.h:190
-msgid ""
-"CREATE DATABASE name\n"
-"    [ [ WITH ] [ OWNER [=] dbowner ]\n"
-"           [ TEMPLATE [=] template ]\n"
-"           [ ENCODING [=] encoding ]\n"
-"           [ LC_COLLATE [=] lc_collate ]\n"
-"           [ LC_CTYPE [=] lc_ctype ]\n"
-"           [ TABLESPACE [=] tablespace ]\n"
-"           [ CONNECTION LIMIT [=] connlimit ] ]"
-msgstr ""
-"CREATE DATABASE ad\n"
-"    [ [ WITH ] [ OWNER [=] veritabanı sahibi ]\n"
-"           [ TEMPLATE [=] ÅŸablon ]\n"
-"           [ ENCODING [=] dil kodlaması ]\n"
-"           [ LC_COLLATE [=] lc_collate ]\n"
-"           [ LC_CTYPE [=] lc_ctype ]\n"
-"           [ TABLESPACE [=] tablespace ]\n"
-"           [ CONNECTION LIMIT [=] bağlantı sınırı ] ]"
-
-#: sql_help.h:193
+#: sql_help.h:417
 msgid "define a new domain"
 msgstr "yeni domaın tanımla"
 
-#: sql_help.h:194
-msgid ""
-"CREATE DOMAIN name [ AS ] data_type\n"
-"    [ DEFAULT expression ]\n"
-"    [ constraint [ ... ] ]\n"
-"\n"
-"where constraint is:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | NULL | CHECK (expression) }"
-msgstr ""
-"CREATE DOMAIN name [ AS ] data_type\n"
-"    [ DEFAULT expression ]\n"
-"    [ constraint [ ... ] ]\n"
-"\n"
-"constraint aşağıdakilerden birisi olabilir:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | NULL | CHECK (expression) }"
+#: sql_help.h:422
+msgid "install an extension"
+msgstr "bir uzantı kur"
 
-#: sql_help.h:197
+#: sql_help.h:427
 msgid "define a new foreign-data wrapper"
 msgstr "yeni foreign-data wrapper tanımla"
 
-#: sql_help.h:198
-msgid ""
-"CREATE FOREIGN DATA WRAPPER name\n"
-"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
-"    [ OPTIONS ( option 'value' [, ... ] ) ]"
-msgstr ""
-"CREATE FOREIGN DATA WRAPPER ad\n"
-"    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
-"    [ OPTIONS ( option 'value' [, ... ] ) ]"
+#: sql_help.h:432
+#, fuzzy
+msgid "define a new foreign table"
+msgstr "yeni foreign sunucu tanımla"
 
-#: sql_help.h:201
+#: sql_help.h:437
 msgid "define a new function"
 msgstr "yeni fonksiyonu tanımla"
 
-#: sql_help.h:202
-msgid ""
-"CREATE [ OR REPLACE ] FUNCTION\n"
-"    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] [, ...] ] )\n"
-"    [ RETURNS rettype\n"
-"      | RETURNS TABLE ( colname coltype [, ...] ) ]\n"
-"  { LANGUAGE langname\n"
-"    | WINDOW\n"
-"    | IMMUTABLE | STABLE | VOLATILE\n"
-"    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-"    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    | COST execution_cost\n"
-"    | ROWS result_rows\n"
-"    | SET configuration_parameter { TO value | = value | FROM CURRENT }\n"
-"    | AS 'definition'\n"
-"    | AS 'obj_file', 'link_symbol'\n"
-"  } ...\n"
-"    [ WITH ( attribute [, ...] ) ]"
-msgstr ""
-"CREATE [ OR REPLACE ] FUNCTION\n"
-"    ad ( [ [ argüman modu ] [ argüman adı ] argüman tipi [ { DEFAULT | = } defexpr ] [, ...] ] )\n"
-"    [ RETURNS rettype\n"
-"      | RETURNS TABLE ( kolon_adı kolon_tipi [, ...] ) ]\n"
-"  { LANGUAGE dil adı\n"
-"    | WINDOW\n"
-"    | IMMUTABLE | STABLE | VOLATILE\n"
-"    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
-"    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
-"    | COST execution_cost\n"
-"    | ROWS result_rows\n"
-"    | SET yapılandırma parametresi { TO değer | = değer | FROM CURRENT }\n"
-"    | AS 'tanım'\n"
-"    | AS 'obj_file', 'link_symbol'\n"
-"  } ...\n"
-"    [ WITH ( attribute [, ...] ) ]"
-
-#: sql_help.h:205
-#: sql_help.h:229
-#: sql_help.h:285
+#: sql_help.h:442
+#: sql_help.h:472
+#: sql_help.h:542
 msgid "define a new database role"
 msgstr "yeni veritabanı rolü tanımla"
 
-#: sql_help.h:206
-msgid ""
-"CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-msgstr ""
-"CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"seçenek aşağıdakilerden birisi olabilir:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'ÅŸifre'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-
-#: sql_help.h:209
+#: sql_help.h:447
 msgid "define a new index"
 msgstr "yeni indeks tanımla"
 
-#: sql_help.h:210
-msgid ""
-"CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
-"    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )\n"
-"    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
-"    [ TABLESPACE tablespace ]\n"
-"    [ WHERE predicate ]"
-msgstr ""
-"CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
-"    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )\n"
-"    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
-"    [ TABLESPACE tablespace ]\n"
-"    [ WHERE predicate ]"
-
-#: sql_help.h:213
+#: sql_help.h:452
 msgid "define a new procedural language"
 msgstr "yeni yordamsal dil tanımla"
 
-#: sql_help.h:214
-msgid ""
-"CREATE [ PROCEDURAL ] LANGUAGE name\n"
-"CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
-"    HANDLER call_handler [ VALIDATOR valfunction ]"
-msgstr ""
-"CREATE [ PROCEDURAL ] LANGUAGE name\n"
-"CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
-"    HANDLER call_handler [ VALIDATOR valfunction ]"
-
-#: sql_help.h:217
+#: sql_help.h:457
 msgid "define a new operator"
 msgstr "yeni operator tanımla"
 
-#: sql_help.h:218
-msgid ""
-"CREATE OPERATOR name (\n"
-"    PROCEDURE = funcname\n"
-"    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"
-"    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
-"    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
-"    [, HASHES ] [, MERGES ]\n"
-")"
-msgstr ""
-"CREATE OPERATOR name (\n"
-"    PROCEDURE = funcname\n"
-"    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"
-"    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
-"    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
-"    [, HASHES ] [, MERGES ]\n"
-")"
-
-#: sql_help.h:221
+#: sql_help.h:462
 msgid "define a new operator class"
 msgstr "yeni operator class tanımla"
 
-#: sql_help.h:222
-msgid ""
-"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
-"  USING index_method [ FAMILY family_name ] AS\n"
-"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ]\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname ( argument_type [, ...] )\n"
-"   | STORAGE storage_type\n"
-"  } [, ... ]"
-msgstr ""
-"CREATE OPERATOR CLASS ad [ DEFAULT ] FOR TYPE veri tipi\n"
-"  USING index metodu [ FAMILY family_name ] AS\n"
-"  {  OPERATOR strategy_number operatör adı [ ( op_type, op_type ) ]\n"
-"   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] fonksiyon adı ( argument_type [, ...] )\n"
-"   | STORAGE storage_type\n"
-"  } [, ... ]"
-
-#: sql_help.h:225
+#: sql_help.h:467
 msgid "define a new operator family"
 msgstr "yeni operatör ailesini tanımla"
 
-#: sql_help.h:226
-msgid "CREATE OPERATOR FAMILY name USING index_method"
-msgstr "CREATE OPERATOR FAMILY name USING index_method"
-
-#: sql_help.h:230
-msgid ""
-"CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-msgstr ""
-"CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"seçenek aşağıdakilerden birisi olabilir:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-
-#: sql_help.h:233
+#: sql_help.h:477
 msgid "define a new rewrite rule"
 msgstr "yeni rewriter rule tanımla"
 
-#: sql_help.h:234
-msgid ""
-"CREATE [ OR REPLACE ] RULE name AS ON event\n"
-"    TO table [ WHERE condition ]\n"
-"    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"
-msgstr ""
-"CREATE [ OR REPLACE ] RULE name AS ON event\n"
-"    TO tablo_adı [ WHERE condition ]\n"
-"    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"
-
-#: sql_help.h:237
+#: sql_help.h:482
 msgid "define a new schema"
 msgstr "yeni şema tanımla"
 
-#: sql_help.h:238
-msgid ""
-"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element [ ... ] ]\n"
-"CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ]"
-msgstr ""
-"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ TABLESPACE tablespace ] [ schema_element [ ... ] ]\n"
-"CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] [ schema_element [ ... ] ]"
-
-#: sql_help.h:241
+#: sql_help.h:487
 msgid "define a new sequence generator"
 msgstr "yeni sequence generator tanımla"
 
-#: sql_help.h:242
-msgid ""
-"CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-"    [ OWNED BY { table.column | NONE } ]"
-msgstr ""
-"CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
-"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
-"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
-"    [ OWNED BY { table.column | NONE } ]"
-
-#: sql_help.h:245
+#: sql_help.h:492
 msgid "define a new foreign server"
 msgstr "yeni foreign sunucu tanımla"
 
-#: sql_help.h:246
-msgid ""
-"CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION 'serverversion' ]\n"
-"    FOREIGN DATA WRAPPER fdwname\n"
-"    [ OPTIONS ( option 'value' [, ... ] ) ]"
-msgstr ""
-"CREATE SERVER sunucu adı [ TYPE 'sunucu tipi' ] [ VERSION 'sunucu sürümü' ]\n"
-"    FOREIGN DATA WRAPPER fdw adı\n"
-"    [ OPTIONS ( seçenek 'değer' [, ... ] ) ]"
-
-#: sql_help.h:249
+#: sql_help.h:497
 msgid "define a new table"
 msgstr "yeni tablo tanımla"
 
-#: sql_help.h:250
-msgid ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
-"  { column_name data_type [ DEFAULT default_expr ] [ column_constraint [ ... ] ]\n"
-"    | table_constraint\n"
-"    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | INDEXES } ] ... }\n"
-"    [, ... ]\n"
-"] )\n"
-"[ INHERITS ( parent_table [, ... ] ) ]\n"
-"[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
-"[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-"[ TABLESPACE tablespace ]\n"
-"\n"
-"where column_constraint is:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | \n"
-"  NULL | \n"
-"  UNIQUE index_parameters |\n"
-"  PRIMARY KEY index_parameters |\n"
-"  CHECK ( expression ) |\n"
-"  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]\n"
-"    [ ON DELETE action ] [ ON UPDATE action ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]\n"
-"\n"
-"and table_constraint is:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
-"  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
-"  CHECK ( expression ) |\n"
-"  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]\n"
-"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON UPDATE action ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]\n"
-"\n"
-"index_parameters in UNIQUE and PRIMARY KEY constraints are:\n"
-"\n"
-"[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
-"[ USING INDEX TABLESPACE tablespace ]"
-msgstr ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tablo_adı ( [\n"
-"  { kolon_adı veri_tipi [ DEFAULT default_expr ] [ kolon_kısıtlayıcısı [ ... ] ]\n"
-"    | tablo_kısıtlayıcısı\n"
-"    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | INDEXES } ] ... }\n"
-"    [, ... ]\n"
-"] )\n"
-"[ INHERITS ( parent_table [, ... ] ) ]\n"
-"[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
-"[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-"[ TABLESPACE tablo_uzayı ]\n"
-"\n"
-"kolon_kısıtlayıcısı aşağıdakilerden birisi olabilir:\n"
-"\n"
-"im[ CONSTRAINT constraint_name ]\n"
-"{ NOT NULL | \n"
-"  NULL | \n"
-"  UNIQUE index_parametreleri |\n"
-"  PRIMARY KEY index_parametreleri |\n"
-"  CHECK ( ifade ) |\n"
-"  REFERENCES referans_tablosu [ ( referans_kolonu ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]\n"
-"    [ ON DELETE iÅŸlem ] [ ON UPDATE iÅŸlem ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]\n"
-"\n"
-"ve tablo_kısıtlayıcısı aşağıdakilerden birisi olabilir:\n"
-"\n"
-"[ CONSTRAINT constraint_name ]\n"
-"{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
-"  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
-"  CHECK ( expression ) |\n"
-"  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn [, ... ] ) ]\n"
-"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON UPDATE action ] }\n"
-"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]\n"
-"\n"
-"UNIQUE ve PRIMARY KEY kısıtlamalarındaki index parametreleri aşağıdakilerden birisi olabilir:\n"
-"\n"
-"[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
-"[ USING INDEX TABLESPACE tablo_uzayı ]"
-
-#: sql_help.h:253
-#: sql_help.h:525
+#: sql_help.h:502
+#: sql_help.h:867
 msgid "define a new table from the results of a query"
 msgstr "sorgu sonuçlarından yeni tablo tanımla"
 
-#: sql_help.h:254
-msgid ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
-"    [ (column_name [, ...] ) ]\n"
-"    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
-"    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-"    [ TABLESPACE tablespace ]\n"
-"    AS query\n"
-"    [ WITH [ NO ] DATA ]"
-msgstr ""
-"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tablo adı\n"
-"    [ (kolon adı [, ...] ) ]\n"
-"    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]\n"
-"    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
-"    [ TABLESPACE tablespace ]\n"
-"    AS sorgu\n"
-"    [ WITH [ NO ] DATA ]"
-
-#: sql_help.h:257
+#: sql_help.h:507
 msgid "define a new tablespace"
 msgstr "yeni tablespace tanımla"
 
-#: sql_help.h:258
-msgid "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
-msgstr "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
-
-#: sql_help.h:261
+#: sql_help.h:512
 msgid "define a new text search configuration"
 msgstr "yeni metin arama yapılandırması tanımla"
 
-#: sql_help.h:262
-msgid ""
-"CREATE TEXT SEARCH CONFIGURATION name (\n"
-"    PARSER = parser_name |\n"
-"    COPY = source_config\n"
-")"
-msgstr ""
-"CREATE TEXT SEARCH CONFIGURATION name (\n"
-"    PARSER = parser_name |\n"
-"    COPY = source_config\n"
-")"
-
-#: sql_help.h:265
+#: sql_help.h:517
 msgid "define a new text search dictionary"
 msgstr "yeni metin arama sözlüğü tanımla"
 
-#: sql_help.h:266
-msgid ""
-"CREATE TEXT SEARCH DICTIONARY name (\n"
-"    TEMPLATE = template\n"
-"    [, option = value [, ... ]]\n"
-")"
-msgstr ""
-"CREATE TEXT SEARCH DICTIONARY ad (\n"
-"    TEMPLATE = ÅŸablon\n"
-"    [, option = value [, ... ]]\n"
-")"
-
-#: sql_help.h:269
+#: sql_help.h:522
 msgid "define a new text search parser"
 msgstr "yeni metin arama ayrıştırıcısı tanımla"
 
-#: sql_help.h:270
-msgid ""
-"CREATE TEXT SEARCH PARSER name (\n"
-"    START = start_function ,\n"
-"    GETTOKEN = gettoken_function ,\n"
-"    END = end_function ,\n"
-"    LEXTYPES = lextypes_function\n"
-"    [, HEADLINE = headline_function ]\n"
-")"
-msgstr ""
-"CREATE TEXT SEARCH PARSER name (\n"
-"    START = start_function ,\n"
-"    GETTOKEN = gettoken_function ,\n"
-"    END = end_function ,\n"
-"    LEXTYPES = lextypes_function\n"
-"    [, HEADLINE = headline_function ]\n"
-")"
-
-#: sql_help.h:273
+#: sql_help.h:527
 msgid "define a new text search template"
 msgstr "yeni metin arama şablonu tanımla"
 
-#: sql_help.h:274
-msgid ""
-"CREATE TEXT SEARCH TEMPLATE name (\n"
-"    [ INIT = init_function , ]\n"
-"    LEXIZE = lexize_function\n"
-")"
-msgstr ""
-"CREATE TEXT SEARCH TEMPLATE ad (\n"
-"    [ INIT = init_function , ]\n"
-"    LEXIZE = lexize_function\n"
-")"
-
-#: sql_help.h:277
+#: sql_help.h:532
 msgid "define a new trigger"
 msgstr "yeni trigger tanımla"
 
-#: sql_help.h:278
-msgid ""
-"CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
-"    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-msgstr ""
-"CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
-"    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
-"    EXECUTE PROCEDURE funcname ( arguments )"
-
-#: sql_help.h:281
+#: sql_help.h:537
 msgid "define a new data type"
 msgstr "yeni veri tipi tanımla"
 
-#: sql_help.h:282
-msgid ""
-"CREATE TYPE name AS\n"
-"    ( attribute_name data_type [, ... ] )\n"
-"\n"
-"CREATE TYPE name AS ENUM\n"
-"    ( 'label' [, ... ] )\n"
-"\n"
-"CREATE TYPE name (\n"
-"    INPUT = input_function,\n"
-"    OUTPUT = output_function\n"
-"    [ , RECEIVE = receive_function ]\n"
-"    [ , SEND = send_function ]\n"
-"    [ , TYPMOD_IN = type_modifier_input_function ]\n"
-"    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
-"    [ , ANALYZE = analyze_function ]\n"
-"    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
-"    [ , PASSEDBYVALUE ]\n"
-"    [ , ALIGNMENT = alignment ]\n"
-"    [ , STORAGE = storage ]\n"
-"    [ , LIKE = like_type ]\n"
-"    [ , CATEGORY = category ]\n"
-"    [ , PREFERRED = preferred ]\n"
-"    [ , DEFAULT = default ]\n"
-"    [ , ELEMENT = element ]\n"
-"    [ , DELIMITER = delimiter ]\n"
-")\n"
-"\n"
-"CREATE TYPE name"
-msgstr ""
-"CREATE TYPE ad AS\n"
-"    ( attribute_name veri tipi [, ... ] )\n"
-"\n"
-"CREATE TYPE ad AS ENUM\n"
-"    ( 'label' [, ... ] )\n"
-"\n"
-"CREATE TYPE ad (\n"
-"    INPUT = input_function,\n"
-"    OUTPUT = output_function\n"
-"    [ , RECEIVE = receive_function ]\n"
-"    [ , SEND = send_function ]\n"
-"    [ , TYPMOD_IN = type_modifier_input_function ]\n"
-"    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
-"    [ , ANALYZE = analyze_function ]\n"
-"    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
-"    [ , PASSEDBYVALUE ]\n"
-"    [ , ALIGNMENT = alignment ]\n"
-"    [ , STORAGE = storage ]\n"
-"    [ , LIKE = like_type ]\n"
-"    [ , CATEGORY = category ]\n"
-"    [ , PREFERRED = preferred ]\n"
-"    [ , DEFAULT = default ]\n"
-"    [ , ELEMENT = element ]\n"
-"    [ , DELIMITER = delimiter ]\n"
-")\n"
-"\n"
-"CREATE TYPE name"
-
-#: sql_help.h:286
-msgid ""
-"CREATE USER name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"where option can be:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-msgstr ""
-"CREATE USER name [ [ WITH ] option [ ... ] ]\n"
-"\n"
-"seçenek aşağıdakilerden birisi olabilir:\n"
-"    \n"
-"      SUPERUSER | NOSUPERUSER\n"
-"    | CREATEDB | NOCREATEDB\n"
-"    | CREATEROLE | NOCREATEROLE\n"
-"    | CREATEUSER | NOCREATEUSER\n"
-"    | INHERIT | NOINHERIT\n"
-"    | LOGIN | NOLOGIN\n"
-"    | CONNECTION LIMIT connlimit\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
-"    | VALID UNTIL 'timestamp' \n"
-"    | IN ROLE rolename [, ...]\n"
-"    | IN GROUP rolename [, ...]\n"
-"    | ROLE rolename [, ...]\n"
-"    | ADMIN rolename [, ...]\n"
-"    | USER rolename [, ...]\n"
-"    | SYSID uid"
-
-#: sql_help.h:289
+#: sql_help.h:547
 msgid "define a new mapping of a user to a foreign server"
 msgstr "bir foreign sunucuya yeni kullanıcı haritalamasını tanımla"
 
-#: sql_help.h:290
-msgid ""
-"CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
-"    SERVER servername\n"
-"    [ OPTIONS ( option 'value' [ , ... ] ) ]"
-msgstr ""
-"CREATE USER MAPPING FOR { kullanıcı adı | USER | CURRENT_USER | PUBLIC }\n"
-"    SERVER sunucu adı\n"
-"    [ OPTIONS ( seçenek 'değer' [ , ... ] ) ]"
-
-#: sql_help.h:293
+#: sql_help.h:552
 msgid "define a new view"
 msgstr "yeni vew tanımla"
 
-#: sql_help.h:294
-msgid ""
-"CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name [, ...] ) ]\n"
-"    AS query"
-msgstr ""
-"CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name [, ...] ) ]\n"
-"    AS query"
-
-#: sql_help.h:297
+#: sql_help.h:557
 msgid "deallocate a prepared statement"
 msgstr "deallocate a prepared statement"
 
-#: sql_help.h:298
-msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
-msgstr "DEALLOCATE [ PREPARE ] { name | ALL }"
-
-#: sql_help.h:301
+#: sql_help.h:562
 msgid "define a cursor"
 msgstr "cursor tanımla"
 
-#: sql_help.h:302
-msgid ""
-"DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
-msgstr ""
-"DECLARE ad [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
-"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR sorgu"
-
-#: sql_help.h:305
+#: sql_help.h:567
 msgid "delete rows of a table"
 msgstr "tablodan satırları sil"
 
-#: sql_help.h:306
-msgid ""
-"DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
-"    [ USING usinglist ]\n"
-"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-msgstr ""
-"DELETE FROM [ ONLY ] tablo [ [ AS ] takma_adı ]\n"
-"    [ USING usinglist ]\n"
-"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-
-#: sql_help.h:309
+#: sql_help.h:572
 msgid "discard session state"
 msgstr "oturum bilgileri unut"
 
-#: sql_help.h:310
-msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
-msgstr "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
+#: sql_help.h:577
+msgid "execute an anonymous code block"
+msgstr "bir anonim kod bloğu çalıştır"
 
-#: sql_help.h:313
+#: sql_help.h:582
 msgid "remove an aggregate function"
 msgstr "aggregate function'u kaldır"
 
-#: sql_help.h:314
-msgid "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | RESTRICT ]"
-msgstr "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:317
+#: sql_help.h:587
 msgid "remove a cast"
 msgstr "cast kaldır"
 
-#: sql_help.h:318
-msgid "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
-msgstr "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
+#: sql_help.h:592
+#, fuzzy
+msgid "remove a collation"
+msgstr "function kaldır"
 
-#: sql_help.h:321
+#: sql_help.h:597
 msgid "remove a conversion"
 msgstr "conversion kaldır"
 
-#: sql_help.h:322
-msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP CONVERSION [ IF EXISTS ] conversion_adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:325
+#: sql_help.h:602
 msgid "remove a database"
 msgstr "veritabanını kaldır"
 
-#: sql_help.h:326
-msgid "DROP DATABASE [ IF EXISTS ] name"
-msgstr "DROP DATABASE [ IF EXISTS ] veritabanı_adı"
-
-#: sql_help.h:329
+#: sql_help.h:607
 msgid "remove a domain"
 msgstr "domain kaldır"
 
-#: sql_help.h:330
-msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP DOMAIN [ IF EXISTS ] adı [, ...] [ CASCADE | RESTRICT ]"
+#: sql_help.h:612
+#, fuzzy
+msgid "remove an extension"
+msgstr "conversion kaldır"
 
-#: sql_help.h:333
+#: sql_help.h:617
 msgid "remove a foreign-data wrapper"
 msgstr "foreign-data wrapper'ını kaldır"
 
-#: sql_help.h:334
-msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] ad [ CASCADE | RESTRICT ]"
+#: sql_help.h:622
+#, fuzzy
+msgid "remove a foreign table"
+msgstr "tablo kaldır"
 
-#: sql_help.h:337
+#: sql_help.h:627
 msgid "remove a function"
 msgstr "function kaldır"
 
-#: sql_help.h:338
-msgid ""
-"DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    [ CASCADE | RESTRICT ]"
-msgstr ""
-"DROP FUNCTION [ IF EXISTS ] fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
-"    [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:341
-#: sql_help.h:369
-#: sql_help.h:421
+#: sql_help.h:632
+#: sql_help.h:667
+#: sql_help.h:732
 msgid "remove a database role"
 msgstr "veritabanı rolünü kaldır"
 
-#: sql_help.h:342
-msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
-msgstr "DROP GROUP [ IF EXISTS ] name [, ...]"
-
-#: sql_help.h:345
+#: sql_help.h:637
 msgid "remove an index"
 msgstr "indeks kaldır"
 
-#: sql_help.h:346
-msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP INDEX [ IF EXISTS ] index_adı [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:349
+#: sql_help.h:642
 msgid "remove a procedural language"
 msgstr "yordamsal dili kaldır"
 
-#: sql_help.h:350
-msgid "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] dil_adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:353
+#: sql_help.h:647
 msgid "remove an operator"
 msgstr "opeartor kaldır"
 
-#: sql_help.h:354
-msgid "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE | RESTRICT ]"
-msgstr "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:357
+#: sql_help.h:652
 msgid "remove an operator class"
 msgstr "operator class kaldır"
 
-#: sql_help.h:358
-msgid "DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | RESTRICT ]"
-msgstr "DROP OPERATOR CLASS [ IF EXISTS ] ad USING index_method [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:361
+#: sql_help.h:657
 msgid "remove an operator family"
 msgstr "opeartör ailesini kaldır"
 
-#: sql_help.h:362
-msgid "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | RESTRICT ]"
-msgstr "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:365
+#: sql_help.h:662
 msgid "remove database objects owned by a database role"
 msgstr "veritabanı rolüne ait veritabanı nesneleri kaldır"
 
-#: sql_help.h:366
-msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:370
-msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
-msgstr "DROP ROLE [ IF EXISTS ] name [, ...]"
-
-#: sql_help.h:373
+#: sql_help.h:672
 msgid "remove a rewrite rule"
 msgstr "rewrite rule kaldır"
 
-#: sql_help.h:374
-msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
-msgstr "DROP RULE [ IF EXISTS ] rule_adı ON relation [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:377
+#: sql_help.h:677
 msgid "remove a schema"
 msgstr "şema kaldır"
 
-#: sql_help.h:378
-msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP SCHEMA [ IF EXISTS ] şema_adı [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:381
+#: sql_help.h:682
 msgid "remove a sequence"
 msgstr "sequence kaldır"
 
-#: sql_help.h:382
-msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP SEQUENCE [ IF EXISTS ] sequence_adı [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:385
+#: sql_help.h:687
 msgid "remove a foreign server descriptor"
 msgstr "foreign sunucu tanımını kaldır"
 
-#: sql_help.h:386
-msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
-msgstr "DROP SERVER [ IF EXISTS ] sunucu adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:389
+#: sql_help.h:692
 msgid "remove a table"
 msgstr "tablo kaldır"
 
-#: sql_help.h:390
-msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP TABLE [ IF EXISTS ] tablo_adı [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:393
+#: sql_help.h:697
 msgid "remove a tablespace"
 msgstr "tablespace kaldır"
 
-#: sql_help.h:394
-msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
-msgstr "DROP TABLESPACE [ IF EXISTS ] tablespace_adı"
-
-#: sql_help.h:397
+#: sql_help.h:702
 msgid "remove a text search configuration"
 msgstr "metin arama yapılandırmasını kaldır"
 
-#: sql_help.h:398
-msgid "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:401
+#: sql_help.h:707
 msgid "remove a text search dictionary"
 msgstr "biri metin arama sözlüğünü kaldır"
 
-#: sql_help.h:402
-msgid "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:405
+#: sql_help.h:712
 msgid "remove a text search parser"
 msgstr "bir metin arama ayrıştırıcısını kaldır"
 
-#: sql_help.h:406
-msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP TEXT SEARCH PARSER [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:409
+#: sql_help.h:717
 msgid "remove a text search template"
 msgstr "bir metin arama şablonunu kaldır"
 
-#: sql_help.h:410
-msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
-msgstr "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:413
+#: sql_help.h:722
 msgid "remove a trigger"
 msgstr "trigger kaldır"
 
-#: sql_help.h:414
-msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
-msgstr "DROP TRIGGER [ IF EXISTS ] trigger_adı ON tablo_adı [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:417
+#: sql_help.h:727
 msgid "remove a data type"
 msgstr "veri tipi kaldır"
 
-#: sql_help.h:418
-msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP TYPE [ IF EXISTS ] tip_adı [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:422
-msgid "DROP USER [ IF EXISTS ] name [, ...]"
-msgstr "DROP USER [ IF EXISTS ] name [, ...]"
-
-#: sql_help.h:425
+#: sql_help.h:737
 msgid "remove a user mapping for a foreign server"
 msgstr "bir foreign sunucu için kullanıcı haritalamasını kaldır"
 
-#: sql_help.h:426
-msgid "DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | PUBLIC } SERVER servername"
-msgstr "DROP USER MAPPING [ IF EXISTS ] FOR { kullanıcı adı | USER | CURRENT_USER | PUBLIC } SERVER sunucu adı"
-
-#: sql_help.h:429
+#: sql_help.h:742
 msgid "remove a view"
 msgstr "view kaldır"
 
-#: sql_help.h:430
-msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
-msgstr "DROP VIEW [ IF EXISTS ] view_adı [, ...] [ CASCADE | RESTRICT ]"
-
-#: sql_help.h:434
-msgid "END [ WORK | TRANSACTION ]"
-msgstr "END [ WORK | TRANSACTION ]"
-
-#: sql_help.h:437
+#: sql_help.h:752
 msgid "execute a prepared statement"
 msgstr "hazırlanmış komutu çalıştır"
 
-#: sql_help.h:438
-msgid "EXECUTE name [ ( parameter [, ...] ) ]"
-msgstr "EXECUTE adı [ ( parameter [, ...] ) ]"
-
-#: sql_help.h:441
+#: sql_help.h:757
 msgid "show the execution plan of a statement"
 msgstr "sorgunun execution planını göster"
 
-#: sql_help.h:442
-msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
-msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] ifade"
-
-#: sql_help.h:445
+#: sql_help.h:762
 msgid "retrieve rows from a query using a cursor"
 msgstr "cursor kullanarak sorgunun sonucundan satırları getir"
 
-#: sql_help.h:446
-msgid ""
-"FETCH [ direction { FROM | IN } ] cursorname\n"
-"\n"
-"where direction can be empty or one of:\n"
-"\n"
-"    NEXT\n"
-"    PRIOR\n"
-"    FIRST\n"
-"    LAST\n"
-"    ABSOLUTE count\n"
-"    RELATIVE count\n"
-"    count\n"
-"    ALL\n"
-"    FORWARD\n"
-"    FORWARD count\n"
-"    FORWARD ALL\n"
-"    BACKWARD\n"
-"    BACKWARD count\n"
-"    BACKWARD ALL"
-msgstr ""
-"FETCH [ direction { FROM | IN } ] cursorname\n"
-"\n"
-"direction boş ya da aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    NEXT\n"
-"    PRIOR\n"
-"    FIRST\n"
-"    LAST\n"
-"    ABSOLUTE count\n"
-"    RELATIVE count\n"
-"    count\n"
-"    ALL\n"
-"    FORWARD\n"
-"    FORWARD count\n"
-"    FORWARD ALL\n"
-"    BACKWARD\n"
-"    BACKWARD count\n"
-"    BACKWARD ALL"
-
-#: sql_help.h:449
+#: sql_help.h:767
 msgid "define access privileges"
 msgstr "erişim haklarını tanımla"
 
-#: sql_help.h:450
-msgid ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
-"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { USAGE | SELECT | UPDATE }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE sequencename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON DATABASE dbname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN SERVER servername [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON LANGUAGE langname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SCHEMA schemaname [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
-msgstr ""
-"GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON [ TABLE ] tablo adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( kolon [, ...] )\n"
-"    [,...] | ALL [ PRIVILEGES ] ( kolon [, ...] ) }\n"
-"    ON [ TABLE ] tablo adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { USAGE | SELECT | UPDATE }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE sequence adı [, ...]\n"
-"    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON DATABASE veritabanı adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN DATA WRAPPER fdw adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN SERVER sunucu adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION fonksiyon adı ( [ [ argüman modu ] [ argüman adı ] argüman tipi [, ...] ] ) [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON LANGUAGE dil adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SCHEMA şema adı [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
-"\n"
-"GRANT role [, ...] TO rol adı [, ...] [ WITH ADMIN OPTION ]"
-
-#: sql_help.h:453
+#: sql_help.h:772
 msgid "create new rows in a table"
 msgstr "tabloda yeni satırları ekliyor"
 
-#: sql_help.h:454
-msgid ""
-"INSERT INTO table [ ( column [, ...] ) ]\n"
-"    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | query }\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-msgstr ""
-"IINSERT INTO table [ ( column [, ...] ) ]\n"
-"    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | query }\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-
-#: sql_help.h:457
+#: sql_help.h:777
 msgid "listen for a notification"
 msgstr "bildiri bekleme durumuna geç"
 
-#: sql_help.h:458
-msgid "LISTEN name"
-msgstr "LISTEN ad"
-
-#: sql_help.h:461
-msgid "load or reload a shared library file"
-msgstr "shared library yükle"
+#: sql_help.h:782
+msgid "load a shared library file"
+msgstr "shared library dosyası yükle"
 
-#: sql_help.h:462
-msgid "LOAD 'filename'"
-msgstr "LOAD 'dosya adı'"
-
-#: sql_help.h:465
+#: sql_help.h:787
 msgid "lock a table"
 msgstr "tabloyu kilitle"
 
-#: sql_help.h:466
-msgid ""
-"LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
-"\n"
-"where lockmode is one of:\n"
-"\n"
-"    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
-"    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
-msgstr ""
-"LOCK [ TABLE ] [ ONLY ] ad [, ...] [ IN kilit modu MODE ] [ NOWAIT ]\n"
-"\n"
-"kilit modu aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
-"    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
-
-#: sql_help.h:469
+#: sql_help.h:792
 msgid "position a cursor"
 msgstr "cursor'u yereÅŸtir"
 
-#: sql_help.h:470
-msgid "MOVE [ direction { FROM | IN } ] cursorname"
-msgstr "MOVE [ direction { FROM | IN } ] cursor_adı"
-
-#: sql_help.h:473
+#: sql_help.h:797
 msgid "generate a notification"
 msgstr "bildiri üret"
 
-#: sql_help.h:474
-msgid "NOTIFY name"
-msgstr "NOTIFY ad"
-
-#: sql_help.h:477
+#: sql_help.h:802
 msgid "prepare a statement for execution"
 msgstr "çalıştırmak için sorguyu hazırla"
 
-#: sql_help.h:478
-msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
-msgstr "PREPARE adı [ ( veri_tipi [, ...] ) ] AS ifade"
-
-#: sql_help.h:481
+#: sql_help.h:807
 msgid "prepare the current transaction for two-phase commit"
 msgstr "geçerli transaction'u two-phase commit için hazırla"
 
-#: sql_help.h:482
-msgid "PREPARE TRANSACTION transaction_id"
-msgstr "PREPARE TRANSACTION transaction_id"
-
-#: sql_help.h:485
+#: sql_help.h:812
 msgid "change the ownership of database objects owned by a database role"
 msgstr "veritabanı rolünün sahip olduğu nesnelerinin sahipliğini değiştir"
 
-#: sql_help.h:486
-msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
-msgstr "REASSIGN OWNED BY eski_rol [, ...] TO yeni_rol"
-
-#: sql_help.h:489
+#: sql_help.h:817
 msgid "rebuild indexes"
 msgstr "indeksleri yeniden oluÅŸtur"
 
-#: sql_help.h:490
-msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
-msgstr "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } adı [ FORCE ]"
-
-#: sql_help.h:493
+#: sql_help.h:822
 msgid "destroy a previously defined savepoint"
 msgstr "önceki tanımlanmış savepoint'i kaldır"
 
-#: sql_help.h:494
-msgid "RELEASE [ SAVEPOINT ] savepoint_name"
-msgstr "RELEASE [ SAVEPOINT ] savepoint_adı"
-
-#: sql_help.h:497
+#: sql_help.h:827
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "çalıştırma zamanı parametresini öntanımlı değerine getir"
 
-#: sql_help.h:498
-msgid ""
-"RESET configuration_parameter\n"
-"RESET ALL"
-msgstr ""
-"RESET configuration_parameter\n"
-"RESET ALL"
-
-#: sql_help.h:501
+#: sql_help.h:832
 msgid "remove access privileges"
 msgstr "erişim hakkını kaldır"
 
-#: sql_help.h:502
-msgid ""
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
-"    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
-"    ON [ TABLE ] tablename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { USAGE | SELECT | UPDATE }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE sequencename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON DATABASE dbname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN SERVER servername [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON LANGUAGE langname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SCHEMA schemaname [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespacename [, ...]\n"
-"    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ ADMIN OPTION FOR ]\n"
-"    role [, ...] FROM rolename [, ...]\n"
-"    [ CASCADE | RESTRICT ]"
+#: sql_help.h:842
+msgid "cancel a transaction that was earlier prepared for two-phase commit"
+msgstr "daha önce two-phase commit için hazırlanmış transaction'u iptal et"
+
+#: sql_help.h:847
+msgid "roll back to a savepoint"
+msgstr "savepoint'a rollback"
+
+#: sql_help.h:852
+msgid "define a new savepoint within the current transaction"
+msgstr "geerli transaction içinde savepoint tanımla"
+
+#: sql_help.h:857
+#, fuzzy
+msgid "define or change a security label applied to an object"
+msgstr "Nesne yorumunu tanımla ya da değiştir"
+
+#: sql_help.h:862
+#: sql_help.h:907
+#: sql_help.h:937
+msgid "retrieve rows from a table or view"
+msgstr "tablo ya da  view'dan satırları getir"
+
+#: sql_help.h:872
+msgid "change a run-time parameter"
+msgstr "çalışma zamanı parametresini değiştir"
+
+#: sql_help.h:877
+#, fuzzy
+msgid "set constraint check timing for the current transaction"
+msgstr "geçerli transaction için constraint doğrulama biçimini belirle"
+
+#: sql_help.h:882
+msgid "set the current user identifier of the current session"
+msgstr "geçerli oturumun geçerli kullanıcısını tanımla"
+
+#: sql_help.h:887
+msgid "set the session user identifier and the current user identifier of the current session"
+msgstr "ilk oturum ve geçerli oturum için kullanıcı tanımla"
+
+#: sql_help.h:892
+msgid "set the characteristics of the current transaction"
+msgstr "geçerli transcation'ın karakteristiklerini ayarla"
+
+#: sql_help.h:897
+msgid "show the value of a run-time parameter"
+msgstr "çalıştırma zaman parametresinın değerini göster"
+
+#: sql_help.h:912
+msgid "empty a table or set of tables"
+msgstr "bir veya birden fazla tabloyu kısalt"
+
+#: sql_help.h:917
+msgid "stop listening for a notification"
+msgstr "bildiriyi beklemeyi durdur"
+
+#: sql_help.h:922
+msgid "update rows of a table"
+msgstr "tablodaki satırları güncelle"
+
+#: sql_help.h:927
+msgid "garbage-collect and optionally analyze a database"
+msgstr "Veritabanındaki çöpleri-toparla ve veritabanını (tercihe başlı) analiz et"
+
+#: sql_help.h:932
+msgid "compute a set of rows"
+msgstr "compute a set of rows"
+
+#: sql_help.c:26
+#: sql_help.c:29
+#: sql_help.c:32
+#: sql_help.c:44
+#: sql_help.c:46
+#: sql_help.c:48
+#: sql_help.c:59
+#: sql_help.c:61
+#: sql_help.c:63
+#: sql_help.c:87
+#: sql_help.c:91
+#: sql_help.c:93
+#: sql_help.c:95
+#: sql_help.c:97
+#: sql_help.c:100
+#: sql_help.c:102
+#: sql_help.c:104
+#: sql_help.c:181
+#: sql_help.c:183
+#: sql_help.c:184
+#: sql_help.c:186
+#: sql_help.c:188
+#: sql_help.c:190
+#: sql_help.c:192
+#: sql_help.c:280
+#: sql_help.c:285
+#: sql_help.c:311
+#: sql_help.c:313
+#: sql_help.c:316
+#: sql_help.c:318
+#: sql_help.c:359
+#: sql_help.c:364
+#: sql_help.c:369
+#: sql_help.c:374
+#: sql_help.c:412
+#: sql_help.c:414
+#: sql_help.c:416
+#: sql_help.c:419
+#: sql_help.c:429
+#: sql_help.c:431
+#: sql_help.c:450
+#: sql_help.c:454
+#: sql_help.c:467
+#: sql_help.c:470
+#: sql_help.c:473
+#: sql_help.c:493
+#: sql_help.c:505
+#: sql_help.c:513
+#: sql_help.c:516
+#: sql_help.c:519
+#: sql_help.c:549
+#: sql_help.c:555
+#: sql_help.c:557
+#: sql_help.c:561
+#: sql_help.c:564
+#: sql_help.c:567
+#: sql_help.c:577
+#: sql_help.c:579
+#: sql_help.c:596
+#: sql_help.c:605
+#: sql_help.c:607
+#: sql_help.c:609
+#: sql_help.c:683
+#: sql_help.c:685
+#: sql_help.c:688
+#: sql_help.c:690
+#: sql_help.c:748
+#: sql_help.c:750
+#: sql_help.c:752
+#: sql_help.c:755
+#: sql_help.c:776
+#: sql_help.c:779
+#: sql_help.c:782
+#: sql_help.c:785
+#: sql_help.c:789
+#: sql_help.c:791
+#: sql_help.c:793
+#: sql_help.c:795
+#: sql_help.c:809
+#: sql_help.c:812
+#: sql_help.c:814
+#: sql_help.c:816
+#: sql_help.c:826
+#: sql_help.c:828
+#: sql_help.c:838
+#: sql_help.c:840
+#: sql_help.c:849
+#: sql_help.c:870
+#: sql_help.c:872
+#: sql_help.c:874
+#: sql_help.c:877
+#: sql_help.c:879
+#: sql_help.c:881
+#: sql_help.c:919
+#: sql_help.c:925
+#: sql_help.c:927
+#: sql_help.c:930
+#: sql_help.c:932
+#: sql_help.c:934
+#: sql_help.c:959
+#: sql_help.c:962
+#: sql_help.c:964
+#: sql_help.c:966
+#: sql_help.c:968
+#: sql_help.c:1008
+#: sql_help.c:1191
+#: sql_help.c:1199
+#: sql_help.c:1243
+#: sql_help.c:1247
+#: sql_help.c:1257
+#: sql_help.c:1275
+#: sql_help.c:1298
+#: sql_help.c:1330
+#: sql_help.c:1377
+#: sql_help.c:1419
+#: sql_help.c:1441
+#: sql_help.c:1461
+#: sql_help.c:1462
+#: sql_help.c:1479
+#: sql_help.c:1499
+#: sql_help.c:1521
+#: sql_help.c:1549
+#: sql_help.c:1570
+#: sql_help.c:1600
+#: sql_help.c:1781
+#: sql_help.c:1794
+#: sql_help.c:1811
+#: sql_help.c:1827
+#: sql_help.c:1850
+#: sql_help.c:1893
+#: sql_help.c:1897
+#: sql_help.c:1899
+#: sql_help.c:1917
+#: sql_help.c:1944
+#: sql_help.c:1977
+#: sql_help.c:1987
+#: sql_help.c:1996
+#: sql_help.c:2040
+#: sql_help.c:2058
+#: sql_help.c:2066
+#: sql_help.c:2074
+#: sql_help.c:2082
+#: sql_help.c:2098
+#: sql_help.c:2106
+#: sql_help.c:2115
+#: sql_help.c:2126
+#: sql_help.c:2134
+#: sql_help.c:2142
+#: sql_help.c:2150
+#: sql_help.c:2160
+#: sql_help.c:2169
+#: sql_help.c:2178
+#: sql_help.c:2186
+#: sql_help.c:2194
+#: sql_help.c:2203
+#: sql_help.c:2211
+#: sql_help.c:2227
+#: sql_help.c:2243
+#: sql_help.c:2251
+#: sql_help.c:2259
+#: sql_help.c:2267
+#: sql_help.c:2275
+#: sql_help.c:2284
+#: sql_help.c:2292
+#: sql_help.c:2309
+#: sql_help.c:2324
+#: sql_help.c:2516
+#: sql_help.c:2567
+#: sql_help.c:2594
+#: sql_help.c:2943
+#: sql_help.c:2989
+#: sql_help.c:3096
+msgid "name"
+msgstr "ad"
+
+#: sql_help.c:27
+#: sql_help.c:30
+#: sql_help.c:33
+#: sql_help.c:322
+#: sql_help.c:325
+#: sql_help.c:2041
+msgid "type"
+msgstr "tip"
+
+#: sql_help.c:28
+#: sql_help.c:45
+#: sql_help.c:60
+#: sql_help.c:92
+#: sql_help.c:317
+#: sql_help.c:368
+#: sql_help.c:401
+#: sql_help.c:413
+#: sql_help.c:430
+#: sql_help.c:469
+#: sql_help.c:515
+#: sql_help.c:556
+#: sql_help.c:578
+#: sql_help.c:608
+#: sql_help.c:689
+#: sql_help.c:749
+#: sql_help.c:792
+#: sql_help.c:813
+#: sql_help.c:827
+#: sql_help.c:839
+#: sql_help.c:851
+#: sql_help.c:878
+#: sql_help.c:926
+#: sql_help.c:967
+msgid "new_name"
+msgstr "yeni_adı"
+
+#: sql_help.c:31
+#: sql_help.c:47
+#: sql_help.c:62
+#: sql_help.c:94
+#: sql_help.c:191
+#: sql_help.c:286
+#: sql_help.c:330
+#: sql_help.c:373
+#: sql_help.c:432
+#: sql_help.c:441
+#: sql_help.c:453
+#: sql_help.c:472
+#: sql_help.c:518
+#: sql_help.c:580
+#: sql_help.c:606
+#: sql_help.c:625
+#: sql_help.c:733
+#: sql_help.c:751
+#: sql_help.c:794
+#: sql_help.c:815
+#: sql_help.c:873
+#: sql_help.c:965
+msgid "new_owner"
+msgstr "yeni_sahibi"
+
+#: sql_help.c:34
+#: sql_help.c:49
+#: sql_help.c:64
+#: sql_help.c:193
+#: sql_help.c:232
+#: sql_help.c:319
+#: sql_help.c:378
+#: sql_help.c:457
+#: sql_help.c:475
+#: sql_help.c:521
+#: sql_help.c:610
+#: sql_help.c:691
+#: sql_help.c:796
+#: sql_help.c:817
+#: sql_help.c:829
+#: sql_help.c:841
+#: sql_help.c:880
+#: sql_help.c:969
+msgid "new_schema"
+msgstr "yeni_ÅŸema"
+
+#: sql_help.c:88
+#: sql_help.c:283
+#: sql_help.c:328
+#: sql_help.c:331
+#: sql_help.c:550
+#: sql_help.c:622
+#: sql_help.c:810
+#: sql_help.c:920
+#: sql_help.c:946
+#: sql_help.c:1150
+#: sql_help.c:1155
+#: sql_help.c:1333
+#: sql_help.c:1350
+#: sql_help.c:1353
+#: sql_help.c:1420
+#: sql_help.c:1550
+#: sql_help.c:1621
+#: sql_help.c:1796
+#: sql_help.c:1945
+#: sql_help.c:1967
+#: sql_help.c:2342
+msgid "option"
+msgstr "seçenek"
+
+#: sql_help.c:89
+#: sql_help.c:551
+#: sql_help.c:921
+#: sql_help.c:1421
+#: sql_help.c:1551
+#: sql_help.c:1946
+msgid "where option can be:"
+msgstr "seçenek şunlar olabilir:"
+
+#: sql_help.c:90
+#: sql_help.c:552
+#: sql_help.c:922
+#: sql_help.c:1282
+#: sql_help.c:1552
+#: sql_help.c:1947
+#, fuzzy
+msgid "connlimit"
+msgstr "sınırsız"
+
+#: sql_help.c:96
+#: sql_help.c:734
+#, fuzzy
+msgid "new_tablespace"
+msgstr "Tablespace"
+
+#: sql_help.c:98
+#: sql_help.c:101
+#: sql_help.c:103
+#: sql_help.c:382
+#: sql_help.c:384
+#: sql_help.c:385
+#: sql_help.c:559
+#: sql_help.c:563
+#: sql_help.c:566
+#: sql_help.c:928
+#: sql_help.c:931
+#: sql_help.c:933
+#: sql_help.c:1388
+#: sql_help.c:2611
+#: sql_help.c:2932
+msgid "configuration_parameter"
+msgstr "yapılandırma_parametresi"
+
+#: sql_help.c:99
+#: sql_help.c:284
+#: sql_help.c:329
+#: sql_help.c:332
+#: sql_help.c:383
+#: sql_help.c:418
+#: sql_help.c:560
+#: sql_help.c:623
+#: sql_help.c:710
+#: sql_help.c:728
+#: sql_help.c:754
+#: sql_help.c:811
+#: sql_help.c:929
+#: sql_help.c:947
+#: sql_help.c:1334
+#: sql_help.c:1351
+#: sql_help.c:1354
+#: sql_help.c:1389
+#: sql_help.c:1390
+#: sql_help.c:1449
+#: sql_help.c:1622
+#: sql_help.c:1696
+#: sql_help.c:1704
+#: sql_help.c:1736
+#: sql_help.c:1758
+#: sql_help.c:1797
+#: sql_help.c:1968
+#: sql_help.c:2933
+#: sql_help.c:2934
+msgid "value"
+msgstr "deÄŸer"
+
+#: sql_help.c:151
+msgid "target_role"
+msgstr "hedef_rol"
+
+#: sql_help.c:152
+#: sql_help.c:1585
+#: sql_help.c:2440
+#: sql_help.c:2447
+#: sql_help.c:2459
+#: sql_help.c:2465
+#: sql_help.c:2694
+#: sql_help.c:2701
+#: sql_help.c:2713
+#: sql_help.c:2719
+msgid "schema_name"
+msgstr "şema_adı"
+
+#: sql_help.c:153
+msgid "abbreviated_grant_or_revoke"
 msgstr ""
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON [ TABLE ] tablo adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { SELECT | INSERT | UPDATE | REFERENCES } ( kolon [, ...] )\n"
-"    [,...] | ALL [ PRIVILEGES ] ( kolon [, ...] ) }\n"
-"    ON [ TABLE ] tablo adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { USAGE | SELECT | UPDATE }\n"
-"    [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SEQUENCE sequence adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON DATABASE veritabanı adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN DATA WRAPPER fdw adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı  | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON FOREIGN SERVER sunucu adu [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { EXECUTE | ALL [ PRIVILEGES ] }\n"
-"    ON FUNCTION fonksiyon adı ( [ [ argüman modu ] [ argüman adı ] argüman tipi [, ...] ] ) [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { USAGE | ALL [ PRIVILEGES ] }\n"
-"    ON LANGUAGE dil adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
-"    ON SCHEMA şema adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ GRANT OPTION FOR ]\n"
-"    { CREATE | ALL [ PRIVILEGES ] }\n"
-"    ON TABLESPACE tablespace adı [, ...]\n"
-"    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
-"    [ CASCADE | RESTRICT ]\n"
-"\n"
-"REVOKE [ ADMIN OPTION FOR ]\n"
-"    role [, ...] FROM rol adı [, ...]\n"
-"    [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:506
-msgid "ROLLBACK [ WORK | TRANSACTION ]"
-msgstr "ROLLBACK [ WORK | TRANSACTION ]"
+#: sql_help.c:154
+msgid "where abbreviated_grant_or_revoke is one of:"
+msgstr ""
+
+#: sql_help.c:155
+#: sql_help.c:156
+#: sql_help.c:157
+#: sql_help.c:158
+#: sql_help.c:159
+#: sql_help.c:160
+#: sql_help.c:1424
+#: sql_help.c:1425
+#: sql_help.c:1426
+#: sql_help.c:1427
+#: sql_help.c:1428
+#: sql_help.c:1555
+#: sql_help.c:1556
+#: sql_help.c:1557
+#: sql_help.c:1558
+#: sql_help.c:1559
+#: sql_help.c:1950
+#: sql_help.c:1951
+#: sql_help.c:1952
+#: sql_help.c:1953
+#: sql_help.c:1954
+#: sql_help.c:2441
+#: sql_help.c:2445
+#: sql_help.c:2448
+#: sql_help.c:2450
+#: sql_help.c:2452
+#: sql_help.c:2454
+#: sql_help.c:2460
+#: sql_help.c:2462
+#: sql_help.c:2464
+#: sql_help.c:2466
+#: sql_help.c:2468
+#: sql_help.c:2469
+#: sql_help.c:2470
+#: sql_help.c:2695
+#: sql_help.c:2699
+#: sql_help.c:2702
+#: sql_help.c:2704
+#: sql_help.c:2706
+#: sql_help.c:2708
+#: sql_help.c:2714
+#: sql_help.c:2716
+#: sql_help.c:2718
+#: sql_help.c:2720
+#: sql_help.c:2722
+#: sql_help.c:2723
+#: sql_help.c:2724
+#: sql_help.c:2953
+msgid "role_name"
+msgstr "rol_adı"
+
+#: sql_help.c:182
+#: sql_help.c:701
+#: sql_help.c:703
+#: sql_help.c:961
+#: sql_help.c:1301
+#: sql_help.c:1305
+#: sql_help.c:1445
+#: sql_help.c:1708
+#: sql_help.c:1718
+#: sql_help.c:1740
+#: sql_help.c:2484
+#: sql_help.c:2838
+#: sql_help.c:2839
+#: sql_help.c:2843
+#: sql_help.c:2848
+#: sql_help.c:2907
+#: sql_help.c:2908
+#: sql_help.c:2913
+#: sql_help.c:2918
+#: sql_help.c:3041
+#: sql_help.c:3042
+#: sql_help.c:3046
+#: sql_help.c:3051
+#: sql_help.c:3122
+#: sql_help.c:3124
+#: sql_help.c:3155
+#: sql_help.c:3197
+#: sql_help.c:3198
+#: sql_help.c:3202
+#: sql_help.c:3207
+msgid "expression"
+msgstr "ifade"
+
+#: sql_help.c:185
+#, fuzzy
+msgid "domain_constraint"
+msgstr "bütünlük kısıtlamaları okunuyor\n"
+
+#: sql_help.c:187
+#: sql_help.c:189
+#: sql_help.c:716
+#: sql_help.c:717
+#: sql_help.c:736
+#: sql_help.c:1067
+#: sql_help.c:1304
+#: sql_help.c:1707
+#: sql_help.c:1717
+msgid "constraint_name"
+msgstr "%kısıtlama_adı"
+
+#: sql_help.c:229
+#: sql_help.c:231
+#: sql_help.c:233
+#: sql_help.c:235
+#: sql_help.c:1316
+#: sql_help.c:2090
+#, fuzzy
+msgid "extension_name"
+msgstr "fonksiyon_adı"
+
+#: sql_help.c:230
+#: sql_help.c:621
+msgid "new_version"
+msgstr "yeni_sürüm"
+
+#: sql_help.c:234
+#: sql_help.c:236
+msgid "member_object"
+msgstr "üye_nesnesi"
+
+#: sql_help.c:237
+msgid "where member_object is:"
+msgstr ""
+
+#: sql_help.c:238
+#: sql_help.c:1060
+#: sql_help.c:2784
+msgid "agg_name"
+msgstr ""
+
+#: sql_help.c:239
+#: sql_help.c:1061
+#: sql_help.c:2785
+#, fuzzy
+msgid "agg_type"
+msgstr "Hedef tipi"
+
+#: sql_help.c:240
+#: sql_help.c:1062
+#: sql_help.c:1223
+#: sql_help.c:1227
+#: sql_help.c:1229
+#: sql_help.c:2049
+#, fuzzy
+msgid "source_type"
+msgstr "Kaynak tipi"
+
+#: sql_help.c:241
+#: sql_help.c:1063
+#: sql_help.c:1224
+#: sql_help.c:1228
+#: sql_help.c:1230
+#: sql_help.c:2050
+#, fuzzy
+msgid "target_type"
+msgstr "Hedef tipi"
+
+#: sql_help.c:242
+#: sql_help.c:243
+#: sql_help.c:244
+#: sql_help.c:245
+#: sql_help.c:246
+#: sql_help.c:254
+#: sql_help.c:256
+#: sql_help.c:258
+#: sql_help.c:259
+#: sql_help.c:260
+#: sql_help.c:261
+#: sql_help.c:262
+#: sql_help.c:263
+#: sql_help.c:264
+#: sql_help.c:265
+#: sql_help.c:266
+#: sql_help.c:267
+#: sql_help.c:268
+#: sql_help.c:1064
+#: sql_help.c:1069
+#: sql_help.c:1070
+#: sql_help.c:1071
+#: sql_help.c:1072
+#: sql_help.c:1073
+#: sql_help.c:1074
+#: sql_help.c:1079
+#: sql_help.c:1084
+#: sql_help.c:1086
+#: sql_help.c:1088
+#: sql_help.c:1089
+#: sql_help.c:1092
+#: sql_help.c:1093
+#: sql_help.c:1094
+#: sql_help.c:1095
+#: sql_help.c:1096
+#: sql_help.c:1097
+#: sql_help.c:1098
+#: sql_help.c:1099
+#: sql_help.c:1100
+#: sql_help.c:1103
+#: sql_help.c:1104
+#: sql_help.c:2781
+#: sql_help.c:2786
+#: sql_help.c:2787
+#: sql_help.c:2788
+#: sql_help.c:2794
+#: sql_help.c:2795
+#: sql_help.c:2796
+#: sql_help.c:2797
+#: sql_help.c:2798
+#: sql_help.c:2799
+#: sql_help.c:2800
+msgid "object_name"
+msgstr "nesne_adı"
+
+#: sql_help.c:247
+#: sql_help.c:503
+#: sql_help.c:1075
+#: sql_help.c:1225
+#: sql_help.c:1260
+#: sql_help.c:1480
+#: sql_help.c:1511
+#: sql_help.c:1855
+#: sql_help.c:2455
+#: sql_help.c:2709
+#: sql_help.c:2789
+#: sql_help.c:2864
+#: sql_help.c:2869
+#: sql_help.c:3067
+#: sql_help.c:3072
+#: sql_help.c:3223
+#: sql_help.c:3228
+msgid "function_name"
+msgstr "fonksiyon_adı"
+
+#: sql_help.c:248
+#: sql_help.c:360
+#: sql_help.c:365
+#: sql_help.c:370
+#: sql_help.c:375
+#: sql_help.c:1076
+#: sql_help.c:1378
+#: sql_help.c:2116
+#: sql_help.c:2456
+#: sql_help.c:2710
+#: sql_help.c:2790
+msgid "argmode"
+msgstr ""
+
+#: sql_help.c:249
+#: sql_help.c:361
+#: sql_help.c:366
+#: sql_help.c:371
+#: sql_help.c:376
+#: sql_help.c:1077
+#: sql_help.c:1379
+#: sql_help.c:2117
+#: sql_help.c:2791
+msgid "argname"
+msgstr "bağımsız değişken adı"
+
+#: sql_help.c:250
+#: sql_help.c:362
+#: sql_help.c:367
+#: sql_help.c:372
+#: sql_help.c:377
+#: sql_help.c:1078
+#: sql_help.c:1380
+#: sql_help.c:2118
+#: sql_help.c:2792
+#, fuzzy
+msgid "argtype"
+msgstr "Hedef tipi"
+
+#: sql_help.c:251
+#: sql_help.c:496
+#: sql_help.c:1081
+#: sql_help.c:1504
+msgid "operator_name"
+msgstr "operatör_adı"
+
+#: sql_help.c:252
+#: sql_help.c:451
+#: sql_help.c:455
+#: sql_help.c:1082
+#: sql_help.c:1481
+#: sql_help.c:2151
+msgid "left_type"
+msgstr "sol_argüman_veri_tipi"
+
+#: sql_help.c:253
+#: sql_help.c:452
+#: sql_help.c:456
+#: sql_help.c:1083
+#: sql_help.c:1482
+#: sql_help.c:2152
+#, fuzzy
+msgid "right_type"
+msgstr "Sağ argüman veri tipi"
+
+#: sql_help.c:255
+#: sql_help.c:257
+#: sql_help.c:468
+#: sql_help.c:471
+#: sql_help.c:474
+#: sql_help.c:494
+#: sql_help.c:506
+#: sql_help.c:514
+#: sql_help.c:517
+#: sql_help.c:520
+#: sql_help.c:1085
+#: sql_help.c:1087
+#: sql_help.c:1501
+#: sql_help.c:1522
+#: sql_help.c:1723
+#: sql_help.c:2161
+#: sql_help.c:2170
+msgid "index_method"
+msgstr "index_yöntemi"
+
+#: sql_help.c:281
+#: sql_help.c:1331
+#, fuzzy
+msgid "handler_function"
+msgstr "fonksiyon"
+
+#: sql_help.c:282
+#: sql_help.c:1332
+#, fuzzy
+msgid "validator_function"
+msgstr "valfunction"
+
+#: sql_help.c:312
+#: sql_help.c:363
+#: sql_help.c:684
+#: sql_help.c:871
+#: sql_help.c:1714
+#: sql_help.c:1715
+#: sql_help.c:1731
+#: sql_help.c:1732
+msgid "action"
+msgstr "hareket"
+
+#: sql_help.c:314
+#: sql_help.c:321
+#: sql_help.c:323
+#: sql_help.c:324
+#: sql_help.c:326
+#: sql_help.c:327
+#: sql_help.c:604
+#: sql_help.c:686
+#: sql_help.c:693
+#: sql_help.c:697
+#: sql_help.c:698
+#: sql_help.c:702
+#: sql_help.c:704
+#: sql_help.c:705
+#: sql_help.c:706
+#: sql_help.c:708
+#: sql_help.c:711
+#: sql_help.c:713
+#: sql_help.c:960
+#: sql_help.c:963
+#: sql_help.c:978
+#: sql_help.c:1148
+#: sql_help.c:1152
+#: sql_help.c:1164
+#: sql_help.c:1165
+#: sql_help.c:1444
+#: sql_help.c:1607
+#: sql_help.c:1739
+#: sql_help.c:2442
+#: sql_help.c:2443
+#: sql_help.c:2483
+#: sql_help.c:2696
+#: sql_help.c:2697
+#: sql_help.c:3121
+#: sql_help.c:3123
+#: sql_help.c:3140
+#: sql_help.c:3143
+msgid "column"
+msgstr "kolon"
+
+#: sql_help.c:315
+#: sql_help.c:687
+msgid "new_column"
+msgstr "yeni_kolon"
+
+#: sql_help.c:320
+#: sql_help.c:379
+#: sql_help.c:692
+#: sql_help.c:884
+msgid "where action is one of:"
+msgstr "hareket aşağıdakilerden birisi olabilir:"
+
+#: sql_help.c:380
+#: sql_help.c:1386
+msgid "execution_cost"
+msgstr "execution_cost"
+
+#: sql_help.c:381
+#: sql_help.c:1387
+msgid "result_rows"
+msgstr ""
+
+#: sql_help.c:396
+#: sql_help.c:398
+#: sql_help.c:400
+msgid "group_name"
+msgstr "grup_adı"
+
+#: sql_help.c:397
+#: sql_help.c:399
+#: sql_help.c:944
+#: sql_help.c:1276
+#: sql_help.c:1586
+#: sql_help.c:1588
+#: sql_help.c:1769
+#: sql_help.c:1965
+#: sql_help.c:2300
+#: sql_help.c:2963
+msgid "user_name"
+msgstr "kullanıcı_adı"
+
+#: sql_help.c:415
+#: sql_help.c:1768
+#: sql_help.c:2235
+#: sql_help.c:2467
+#: sql_help.c:2721
+msgid "tablespace_name"
+msgstr "tablespace_adı"
+
+#: sql_help.c:417
+#: sql_help.c:420
+#: sql_help.c:727
+#: sql_help.c:729
+#: sql_help.c:1448
+#: sql_help.c:1695
+#: sql_help.c:1703
+#: sql_help.c:1735
+#: sql_help.c:1757
+msgid "storage_parameter"
+msgstr "saklama_parametresi"
+
+#: sql_help.c:440
+#: sql_help.c:1080
+#: sql_help.c:2793
+#, fuzzy
+msgid "large_object_oid"
+msgstr "Large objectler"
+
+#: sql_help.c:495
+#: sql_help.c:507
+#: sql_help.c:1503
+msgid "strategy_number"
+msgstr ""
+
+#: sql_help.c:497
+#: sql_help.c:498
+#: sql_help.c:501
+#: sql_help.c:502
+#: sql_help.c:508
+#: sql_help.c:509
+#: sql_help.c:511
+#: sql_help.c:512
+#: sql_help.c:1505
+#: sql_help.c:1506
+#: sql_help.c:1509
+#: sql_help.c:1510
+msgid "op_type"
+msgstr "operatör_tipi"
+
+#: sql_help.c:499
+#: sql_help.c:1507
+#, fuzzy
+msgid "sort_family_name"
+msgstr "family_name"
+
+#: sql_help.c:500
+#: sql_help.c:510
+#: sql_help.c:1508
+msgid "support_number"
+msgstr ""
+
+#: sql_help.c:504
+#: sql_help.c:1226
+#: sql_help.c:1512
+msgid "argument_type"
+msgstr "bağımsız_değişken_tipi"
+
+#: sql_help.c:553
+#: sql_help.c:923
+#: sql_help.c:1422
+#: sql_help.c:1553
+#: sql_help.c:1948
+msgid "password"
+msgstr "parola"
+
+#: sql_help.c:554
+#: sql_help.c:924
+#: sql_help.c:1423
+#: sql_help.c:1554
+#: sql_help.c:1949
+msgid "timestamp"
+msgstr "timestamp"
+
+#: sql_help.c:558
+#: sql_help.c:562
+#: sql_help.c:565
+#: sql_help.c:568
+#: sql_help.c:2449
+#: sql_help.c:2703
+msgid "database_name"
+msgstr "veritabanı_adı"
+
+#: sql_help.c:597
+#: sql_help.c:1601
+msgid "increment"
+msgstr ""
+
+#: sql_help.c:598
+#: sql_help.c:1602
+msgid "minvalue"
+msgstr "en düşük değer"
+
+#: sql_help.c:599
+#: sql_help.c:1603
+msgid "maxvalue"
+msgstr "en yüksek değer"
+
+#: sql_help.c:600
+#: sql_help.c:1604
+#: sql_help.c:2851
+#: sql_help.c:2921
+#: sql_help.c:3054
+#: sql_help.c:3159
+#: sql_help.c:3210
+msgid "start"
+msgstr "baÅŸlat"
+
+#: sql_help.c:601
+msgid "restart"
+msgstr "yeniden baÅŸlat"
+
+#: sql_help.c:602
+#: sql_help.c:1605
+msgid "cache"
+msgstr "önbellek"
+
+#: sql_help.c:620
+#: sql_help.c:624
+#: sql_help.c:945
+#: sql_help.c:1352
+#: sql_help.c:1617
+#: sql_help.c:1966
+#: sql_help.c:2219
+#: sql_help.c:2301
+#: sql_help.c:2453
+#: sql_help.c:2707
+msgid "server_name"
+msgstr "sunucu_adı"
+
+#: sql_help.c:694
+#: sql_help.c:699
+#: sql_help.c:886
+#: sql_help.c:890
+#: sql_help.c:1299
+#: sql_help.c:1349
+#: sql_help.c:1500
+#: sql_help.c:1688
+#: sql_help.c:1895
+#: sql_help.c:2568
+msgid "data_type"
+msgstr "veri_tipi"
+
+#: sql_help.c:695
+#: sql_help.c:700
+#: sql_help.c:887
+#: sql_help.c:891
+#: sql_help.c:1300
+#: sql_help.c:1446
+#: sql_help.c:1689
+#: sql_help.c:1896
+#, fuzzy
+msgid "collation"
+msgstr "Sıralama"
+
+#: sql_help.c:696
+#: sql_help.c:1690
+#: sql_help.c:1701
+msgid "column_constraint"
+msgstr "kolon_kısıtlaması"
+
+#: sql_help.c:707
+msgid "integer"
+msgstr "tamsayı"
+
+#: sql_help.c:709
+#: sql_help.c:712
+msgid "attribute_option"
+msgstr "özellik_seçeneği"
+
+#: sql_help.c:714
+#: sql_help.c:1691
+#: sql_help.c:1702
+msgid "table_constraint"
+msgstr "tablo_kısıtlaması"
+
+#: sql_help.c:715
+#, fuzzy
+msgid "table_constraint_using_index"
+msgstr "tablo_kısıtlaması"
+
+#: sql_help.c:718
+#: sql_help.c:719
+#: sql_help.c:720
+#: sql_help.c:721
+#: sql_help.c:1101
+msgid "trigger_name"
+msgstr "tetikleyici_adı"
+
+#: sql_help.c:722
+#: sql_help.c:723
+#: sql_help.c:724
+#: sql_help.c:725
+msgid "rewrite_rule_name"
+msgstr "rewrite_kural_adı"
+
+#: sql_help.c:726
+#: sql_help.c:737
+#: sql_help.c:1018
+msgid "index_name"
+msgstr "index_adı"
+
+#: sql_help.c:730
+#: sql_help.c:731
+#: sql_help.c:1692
+#: sql_help.c:1694
+msgid "parent_table"
+msgstr "üst_tablo"
+
+#: sql_help.c:732
+#: sql_help.c:1699
+msgid "type_name"
+msgstr "tip_adı"
+
+#: sql_help.c:735
+#, fuzzy
+msgid "and table_constraint_using_index is:"
+msgstr "%s constraint"
+
+#: sql_help.c:753
+#: sql_help.c:756
+msgid "tablespace_option"
+msgstr "tablespace_seçeneği"
+
+#: sql_help.c:777
+#: sql_help.c:780
+#: sql_help.c:786
+#: sql_help.c:790
+msgid "token_type"
+msgstr "token_tipi"
+
+#: sql_help.c:778
+#: sql_help.c:781
+msgid "dictionary_name"
+msgstr "sözlük_adı"
+
+#: sql_help.c:783
+#: sql_help.c:787
+msgid "old_dictionary"
+msgstr "eski_sözlük"
+
+#: sql_help.c:784
+#: sql_help.c:788
+msgid "new_dictionary"
+msgstr "yeni_sözlük"
+
+#: sql_help.c:875
+#: sql_help.c:885
+#: sql_help.c:888
+#: sql_help.c:889
+#: sql_help.c:1894
+#, fuzzy
+msgid "attribute_name"
+msgstr "Özellikler"
+
+#: sql_help.c:876
+#, fuzzy
+msgid "new_attribute_name"
+msgstr "Özellikler"
+
+#: sql_help.c:882
+#, fuzzy
+msgid "new_enum_value"
+msgstr "yeni_adı"
+
+#: sql_help.c:883
+msgid "existing_enum_value"
+msgstr ""
+
+#: sql_help.c:992
+#: sql_help.c:2978
+#: sql_help.c:2979
+#: sql_help.c:3003
+msgid "transaction_mode"
+msgstr "transaction_modu"
+
+#: sql_help.c:993
+#: sql_help.c:2980
+#: sql_help.c:3004
+msgid "where transaction_mode is one of:"
+msgstr "transaction_modu aşağıdakilerden birisi olabilir:"
+
+#: sql_help.c:1017
+#: sql_help.c:1068
+#: sql_help.c:1091
+#: sql_help.c:1102
+#: sql_help.c:1147
+#: sql_help.c:1151
+#: sql_help.c:1347
+#: sql_help.c:1686
+#: sql_help.c:1698
+#: sql_help.c:1755
+#: sql_help.c:2439
+#: sql_help.c:2444
+#: sql_help.c:2693
+#: sql_help.c:2698
+#: sql_help.c:2782
+#: sql_help.c:2853
+#: sql_help.c:2855
+#: sql_help.c:2884
+#: sql_help.c:2923
+#: sql_help.c:3056
+#: sql_help.c:3058
+#: sql_help.c:3087
+#: sql_help.c:3212
+#: sql_help.c:3214
+#: sql_help.c:3243
+msgid "table_name"
+msgstr "tablo_adı"
+
+#: sql_help.c:1065
+#, fuzzy
+msgid "relation_name"
+msgstr "dil_adı"
+
+#: sql_help.c:1066
+#: sql_help.c:1348
+#: sql_help.c:1383
+#: sql_help.c:1687
+#: sql_help.c:1700
+#: sql_help.c:1719
+#: sql_help.c:1721
+#: sql_help.c:1728
+#: sql_help.c:1756
+#: sql_help.c:1858
+#: sql_help.c:1978
+#: sql_help.c:2783
+#: sql_help.c:2879
+#: sql_help.c:3082
+#: sql_help.c:3238
+#, fuzzy
+msgid "column_name"
+msgstr "Rol adı"
+
+#: sql_help.c:1090
+#, fuzzy
+msgid "rule_name"
+msgstr "Rol adı"
+
+#: sql_help.c:1105
+msgid "text"
+msgstr "metin"
+
+#: sql_help.c:1120
+#: sql_help.c:2577
+#: sql_help.c:2739
+#, fuzzy
+msgid "transaction_id"
+msgstr "transaction salt okunurdur"
+
+#: sql_help.c:1149
+#: sql_help.c:1154
+#: sql_help.c:2503
+#, fuzzy
+msgid "filename"
+msgstr "Rol adı"
+
+#: sql_help.c:1153
+#: sql_help.c:1760
+#: sql_help.c:1979
+#: sql_help.c:1997
+#: sql_help.c:2485
+msgid "query"
+msgstr "sorgu"
+
+#: sql_help.c:1156
+#: sql_help.c:2345
+msgid "where option can be one of:"
+msgstr "seçenek aşağıdakilerden birisi olabilir:"
+
+#: sql_help.c:1157
+#, fuzzy
+msgid "format_name"
+msgstr "Bilgi edinme\n"
+
+#: sql_help.c:1158
+#: sql_help.c:1161
+#: sql_help.c:2346
+#: sql_help.c:2347
+#: sql_help.c:2348
+#: sql_help.c:2349
+msgid "boolean"
+msgstr "boolean"
+
+#: sql_help.c:1159
+msgid "delimiter_character"
+msgstr "ayrıştırıcı_karaktersi"
+
+#: sql_help.c:1160
+msgid "null_string"
+msgstr "null_dizi"
+
+#: sql_help.c:1162
+#, fuzzy
+msgid "quote_character"
+msgstr " %d karakterinde "
+
+#: sql_help.c:1163
+#, fuzzy
+msgid "escape_character"
+msgstr "escape satırı geçersiz"
+
+#: sql_help.c:1166
+#, fuzzy
+msgid "encoding_name"
+msgstr "Dil Kodlaması"
+
+#: sql_help.c:1192
+#, fuzzy
+msgid "input_data_type"
+msgstr "veri tipi"
+
+#: sql_help.c:1193
+#: sql_help.c:1201
+#, fuzzy
+msgid "sfunc"
+msgstr "sequence"
+
+#: sql_help.c:1194
+#: sql_help.c:1202
+#, fuzzy
+msgid "state_data_type"
+msgstr "veri tipi"
+
+#: sql_help.c:1195
+#: sql_help.c:1203
+#, fuzzy
+msgid "ffunc"
+msgstr "fonksiyon"
+
+#: sql_help.c:1196
+#: sql_help.c:1204
+msgid "initial_condition"
+msgstr "ilk_durum"
+
+#: sql_help.c:1197
+#: sql_help.c:1205
+#, fuzzy
+msgid "sort_operator"
+msgstr "operatör"
+
+#: sql_help.c:1198
+msgid "or the old syntax"
+msgstr "ya da eski sözdizimi"
+
+#: sql_help.c:1200
+#, fuzzy
+msgid "base_type"
+msgstr "Hedef tipi"
+
+#: sql_help.c:1244
+#, fuzzy
+msgid "locale"
+msgstr "yerel soket"
+
+#: sql_help.c:1245
+#: sql_help.c:1279
+msgid "lc_collate"
+msgstr ""
+
+#: sql_help.c:1246
+#: sql_help.c:1280
+#, fuzzy
+msgid "lc_ctype"
+msgstr "Ctype"
+
+#: sql_help.c:1248
+#, fuzzy
+msgid "existing_collation"
+msgstr "Hedef"
+
+#: sql_help.c:1258
+#, fuzzy
+msgid "source_encoding"
+msgstr "Kaynak kodu"
+
+#: sql_help.c:1259
+#, fuzzy
+msgid "dest_encoding"
+msgstr "Dil Kodlaması"
+
+#: sql_help.c:1277
+#: sql_help.c:1795
+#, fuzzy
+msgid "template"
+msgstr "Åžablon"
+
+#: sql_help.c:1278
+#, fuzzy
+msgid "encoding"
+msgstr "Dil Kodlaması"
+
+#: sql_help.c:1281
+#: sql_help.c:1450
+#: sql_help.c:1697
+#: sql_help.c:1705
+#: sql_help.c:1737
+#: sql_help.c:1759
+#, fuzzy
+msgid "tablespace"
+msgstr "Tablespace"
+
+#: sql_help.c:1303
+msgid "where constraint is:"
+msgstr "kısıtlama şu şekilde olabilir:"
+
+#: sql_help.c:1317
+#, fuzzy
+msgid "schema"
+msgstr "Åžema"
+
+#: sql_help.c:1318
+#, fuzzy
+msgid "version"
+msgstr "Sürüm"
+
+#: sql_help.c:1319
+#, fuzzy
+msgid "old_version"
+msgstr "yeni_sürüm"
+
+#: sql_help.c:1381
+#: sql_help.c:1709
+#, fuzzy
+msgid "default_expr"
+msgstr "öntanımlı %s"
+
+#: sql_help.c:1382
+msgid "rettype"
+msgstr "dönüş tipi"
+
+#: sql_help.c:1384
+msgid "column_type"
+msgstr "kolon_tipi"
+
+#: sql_help.c:1385
+#: sql_help.c:2031
+#: sql_help.c:2461
+#: sql_help.c:2715
+msgid "lang_name"
+msgstr "dil_adı"
+
+#: sql_help.c:1391
+msgid "definition"
+msgstr "tanımı"
+
+#: sql_help.c:1392
+msgid "obj_file"
+msgstr "obj_file"
+
+#: sql_help.c:1393
+#, fuzzy
+msgid "link_symbol"
+msgstr "geçersiz sembol"
+
+#: sql_help.c:1394
+#, fuzzy
+msgid "attribute"
+msgstr "Özellikler"
+
+#: sql_help.c:1429
+#: sql_help.c:1560
+#: sql_help.c:1955
+msgid "uid"
+msgstr "kullanıcı numarası"
+
+#: sql_help.c:1443
+msgid "method"
+msgstr "yöntem"
+
+#: sql_help.c:1447
+#: sql_help.c:1741
+msgid "opclass"
+msgstr "opclass"
+
+#: sql_help.c:1451
+#: sql_help.c:1727
+#, fuzzy
+msgid "predicate"
+msgstr ", belirli (%s)"
+
+#: sql_help.c:1463
+msgid "call_handler"
+msgstr "call_handler"
+
+#: sql_help.c:1464
+msgid "inline_handler"
+msgstr "inline_handler"
+
+#: sql_help.c:1465
+msgid "valfunction"
+msgstr "valfunction"
+
+#: sql_help.c:1483
+msgid "com_op"
+msgstr "com_op"
+
+#: sql_help.c:1484
+msgid "neg_op"
+msgstr "neg_op"
+
+#: sql_help.c:1485
+msgid "res_proc"
+msgstr "res_proc"
+
+#: sql_help.c:1486
+msgid "join_proc"
+msgstr "join_proc"
+
+#: sql_help.c:1502
+msgid "family_name"
+msgstr "family_name"
+
+#: sql_help.c:1513
+msgid "storage_type"
+msgstr "saklama_tipi"
+
+#: sql_help.c:1571
+#: sql_help.c:1851
+#, fuzzy
+msgid "event"
+msgstr "Elemanlar"
+
+#: sql_help.c:1573
+#: sql_help.c:1854
+#: sql_help.c:2013
+#: sql_help.c:2842
+#: sql_help.c:2844
+#: sql_help.c:2912
+#: sql_help.c:2914
+#: sql_help.c:3045
+#: sql_help.c:3047
+#: sql_help.c:3126
+#: sql_help.c:3201
+#: sql_help.c:3203
+#, fuzzy
+msgid "condition"
+msgstr "%d bağlantı"
+
+#: sql_help.c:1574
+#: sql_help.c:1575
+#: sql_help.c:1576
+msgid "command"
+msgstr "komıt"
+
+#: sql_help.c:1587
+#: sql_help.c:1589
+msgid "schema_element"
+msgstr "şema_elemanı"
+
+#: sql_help.c:1618
+msgid "server_type"
+msgstr "sunucu_tipi"
+
+#: sql_help.c:1619
+msgid "server_version"
+msgstr "sunucu_sürümü"
+
+#: sql_help.c:1620
+#: sql_help.c:2451
+#: sql_help.c:2705
+msgid "fdw_name"
+msgstr "fdw_adı"
+
+#: sql_help.c:1693
+#, fuzzy
+msgid "like_option"
+msgstr "İnit seçenekleri"
+
+#: sql_help.c:1706
+msgid "where column_constraint is:"
+msgstr "kolon_kısıtlaması aşağıdakilerden birisi olabilir:"
+
+#: sql_help.c:1710
+#: sql_help.c:1711
+#: sql_help.c:1720
+#: sql_help.c:1722
+#: sql_help.c:1726
+#, fuzzy
+msgid "index_parameters"
+msgstr "%s parametresi"
+
+#: sql_help.c:1712
+#: sql_help.c:1729
+msgid "reftable"
+msgstr "referans tablosu"
+
+#: sql_help.c:1713
+#: sql_help.c:1730
+msgid "refcolumn"
+msgstr "referans kolonu"
+
+#: sql_help.c:1716
+#, fuzzy
+msgid "and table_constraint is:"
+msgstr "%s constraint"
+
+#: sql_help.c:1724
+msgid "exclude_element"
+msgstr "exclude_element"
+
+#: sql_help.c:1725
+#: sql_help.c:2849
+#: sql_help.c:2919
+#: sql_help.c:3052
+#: sql_help.c:3157
+#: sql_help.c:3208
+msgid "operator"
+msgstr "operatör"
+
+#: sql_help.c:1733
+msgid "and like_option is:"
+msgstr "like_seçeneği şu olabilir:"
+
+#: sql_help.c:1734
+msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
+msgstr "UNIQUE, PRIMARY KEY ve EXCLUDE kısıtlamalarında index_parametreleri şunlar olabilir:"
+
+#: sql_help.c:1738
+msgid "exclude_element in an EXCLUDE constraint is:"
+msgstr ""
+
+#: sql_help.c:1770
+msgid "directory"
+msgstr "dizin"
+
+#: sql_help.c:1782
+msgid "parser_name"
+msgstr "ayrıştırıcı_adı"
+
+#: sql_help.c:1783
+msgid "source_config"
+msgstr "source_config"
+
+#: sql_help.c:1812
+msgid "start_function"
+msgstr "başlangıç_fonksiyonu"
+
+#: sql_help.c:1813
+#, fuzzy
+msgid "gettoken_function"
+msgstr "function kaldır"
+
+#: sql_help.c:1814
+msgid "end_function"
+msgstr "end_fonksiyonu"
+
+#: sql_help.c:1815
+msgid "lextypes_function"
+msgstr "lextypes_fonksiyonu"
+
+#: sql_help.c:1816
+#, fuzzy
+msgid "headline_function"
+msgstr "fonksiyon"
+
+#: sql_help.c:1828
+msgid "init_function"
+msgstr "ilkendirme_fonksiyonu"
+
+#: sql_help.c:1829
+msgid "lexize_function"
+msgstr "lexize_fonksiyonu"
+
+#: sql_help.c:1853
+msgid "referenced_table_name"
+msgstr ""
+
+#: sql_help.c:1856
+#, fuzzy
+msgid "arguments"
+msgstr "çok fazla argüman"
+
+#: sql_help.c:1857
+#, fuzzy
+msgid "where event can be one of:"
+msgstr "seçenek aşağıdakilerden birisi olabilir:"
+
+#: sql_help.c:1898
+#: sql_help.c:2801
+msgid "label"
+msgstr "etiket"
+
+#: sql_help.c:1900
+msgid "input_function"
+msgstr "giriÅŸ_fonksiyonu"
+
+#: sql_help.c:1901
+msgid "output_function"
+msgstr "çıktı_fonksiyonu"
+
+#: sql_help.c:1902
+#, fuzzy
+msgid "receive_function"
+msgstr "function kaldır"
+
+#: sql_help.c:1903
+msgid "send_function"
+msgstr "gönderme_fonksiyonu"
+
+#: sql_help.c:1904
+msgid "type_modifier_input_function"
+msgstr "type_modifier_input_function"
+
+#: sql_help.c:1905
+msgid "type_modifier_output_function"
+msgstr "type_modifier_output_function"
+
+#: sql_help.c:1906
+msgid "analyze_function"
+msgstr "analiz_fonksiyonu"
+
+#: sql_help.c:1907
+msgid "internallength"
+msgstr "internallength"
+
+#: sql_help.c:1908
+#, fuzzy
+msgid "alignment"
+msgstr "atama"
+
+#: sql_help.c:1909
+msgid "storage"
+msgstr "saklama"
+
+#: sql_help.c:1910
+msgid "like_type"
+msgstr "like_type"
+
+#: sql_help.c:1911
+msgid "category"
+msgstr "category"
+
+#: sql_help.c:1912
+msgid "preferred"
+msgstr "tercih edilen"
+
+#: sql_help.c:1913
+msgid "default"
+msgstr "öntanımlı"
+
+#: sql_help.c:1914
+msgid "element"
+msgstr "öğe"
+
+#: sql_help.c:1915
+msgid "delimiter"
+msgstr "sınırlayıcı"
+
+#: sql_help.c:1916
+#, fuzzy
+msgid "collatable"
+msgstr "tablo"
+
+#: sql_help.c:2009
+#: sql_help.c:2481
+#: sql_help.c:2837
+#: sql_help.c:2906
+#: sql_help.c:3040
+#: sql_help.c:3118
+#: sql_help.c:3196
+msgid "with_query"
+msgstr ""
+
+#: sql_help.c:2011
+#: sql_help.c:2856
+#: sql_help.c:2859
+#: sql_help.c:2862
+#: sql_help.c:2866
+#: sql_help.c:3059
+#: sql_help.c:3062
+#: sql_help.c:3065
+#: sql_help.c:3069
+#: sql_help.c:3120
+#: sql_help.c:3215
+#: sql_help.c:3218
+#: sql_help.c:3221
+#: sql_help.c:3225
+msgid "alias"
+msgstr "takma ad"
+
+#: sql_help.c:2012
+msgid "using_list"
+msgstr "using_list"
+
+#: sql_help.c:2014
+#: sql_help.c:2375
+#: sql_help.c:2544
+#: sql_help.c:3127
+msgid "cursor_name"
+msgstr "imleç_adı"
+
+#: sql_help.c:2015
+#: sql_help.c:2486
+#: sql_help.c:3128
+#, fuzzy
+msgid "output_expression"
+msgstr "birden fazla varsayılan ifade"
+
+#: sql_help.c:2016
+#: sql_help.c:2487
+#: sql_help.c:2840
+#: sql_help.c:2909
+#: sql_help.c:3043
+#: sql_help.c:3129
+#: sql_help.c:3199
+msgid "output_name"
+msgstr "output_name"
+
+#: sql_help.c:2032
+msgid "code"
+msgstr "kod"
+
+#: sql_help.c:2325
+msgid "parameter"
+msgstr "deÄŸiÅŸken"
+
+#: sql_help.c:2343
+#: sql_help.c:2344
+#: sql_help.c:2569
+msgid "statement"
+msgstr "ifade"
+
+#: sql_help.c:2374
+#: sql_help.c:2543
+#, fuzzy
+msgid "direction"
+msgstr "%d bağlantı"
+
+#: sql_help.c:2376
+#: sql_help.c:2545
+msgid "where direction can be empty or one of:"
+msgstr ""
+
+#: sql_help.c:2377
+#: sql_help.c:2378
+#: sql_help.c:2379
+#: sql_help.c:2380
+#: sql_help.c:2381
+#: sql_help.c:2546
+#: sql_help.c:2547
+#: sql_help.c:2548
+#: sql_help.c:2549
+#: sql_help.c:2550
+#: sql_help.c:2850
+#: sql_help.c:2852
+#: sql_help.c:2920
+#: sql_help.c:2922
+#: sql_help.c:3053
+#: sql_help.c:3055
+#: sql_help.c:3158
+#: sql_help.c:3160
+#: sql_help.c:3209
+#: sql_help.c:3211
+msgid "count"
+msgstr "toplam sayı"
+
+#: sql_help.c:2446
+#: sql_help.c:2700
+msgid "sequence_name"
+msgstr "sequence_adı"
+
+#: sql_help.c:2457
+#: sql_help.c:2711
+msgid "arg_name"
+msgstr ""
+
+#: sql_help.c:2458
+#: sql_help.c:2712
+msgid "arg_type"
+msgstr "bağımsız_değişken_tipi"
+
+#: sql_help.c:2463
+#: sql_help.c:2717
+msgid "loid"
+msgstr ""
+
+#: sql_help.c:2495
+#: sql_help.c:2558
+#: sql_help.c:3104
+msgid "channel"
+msgstr "kanal"
+
+#: sql_help.c:2517
+msgid "lockmode"
+msgstr ""
+
+#: sql_help.c:2518
+msgid "where lockmode is one of:"
+msgstr ""
+
+#: sql_help.c:2559
+msgid "payload"
+msgstr ""
+
+#: sql_help.c:2585
+msgid "old_role"
+msgstr "eski_rol"
+
+#: sql_help.c:2586
+msgid "new_role"
+msgstr "yeni_rol"
+
+#: sql_help.c:2602
+#: sql_help.c:2747
+#: sql_help.c:2755
+msgid "savepoint_name"
+msgstr "savepoint_adı"
+
+#: sql_help.c:2780
+msgid "provider"
+msgstr ""
+
+#: sql_help.c:2841
+#: sql_help.c:2872
+#: sql_help.c:2874
+#: sql_help.c:2911
+#: sql_help.c:3044
+#: sql_help.c:3075
+#: sql_help.c:3077
+#: sql_help.c:3200
+#: sql_help.c:3231
+#: sql_help.c:3233
+msgid "from_item"
+msgstr "from_item"
+
+#: sql_help.c:2845
+#: sql_help.c:2915
+#: sql_help.c:3048
+#: sql_help.c:3204
+msgid "window_name"
+msgstr "pencere_adı"
+
+#: sql_help.c:2846
+#: sql_help.c:2916
+#: sql_help.c:3049
+#: sql_help.c:3205
+msgid "window_definition"
+msgstr "window_tanımı"
+
+#: sql_help.c:2847
+#: sql_help.c:2858
+#: sql_help.c:2880
+#: sql_help.c:2917
+#: sql_help.c:3050
+#: sql_help.c:3061
+#: sql_help.c:3083
+#: sql_help.c:3206
+#: sql_help.c:3217
+#: sql_help.c:3239
+msgid "select"
+msgstr ""
+
+#: sql_help.c:2854
+#: sql_help.c:3057
+#: sql_help.c:3213
+msgid "where from_item can be one of:"
+msgstr ""
+
+#: sql_help.c:2857
+#: sql_help.c:2860
+#: sql_help.c:2863
+#: sql_help.c:2867
+#: sql_help.c:3060
+#: sql_help.c:3063
+#: sql_help.c:3066
+#: sql_help.c:3070
+#: sql_help.c:3216
+#: sql_help.c:3219
+#: sql_help.c:3222
+#: sql_help.c:3226
+msgid "column_alias"
+msgstr "kolon_takma_adı"
+
+#: sql_help.c:2861
+#: sql_help.c:2878
+#: sql_help.c:3064
+#: sql_help.c:3081
+#: sql_help.c:3220
+#: sql_help.c:3237
+msgid "with_query_name"
+msgstr ""
+
+#: sql_help.c:2865
+#: sql_help.c:2870
+#: sql_help.c:3068
+#: sql_help.c:3073
+#: sql_help.c:3224
+#: sql_help.c:3229
+msgid "argument"
+msgstr "bağımsız değişken"
+
+#: sql_help.c:2868
+#: sql_help.c:2871
+#: sql_help.c:3071
+#: sql_help.c:3074
+#: sql_help.c:3227
+#: sql_help.c:3230
+msgid "column_definition"
+msgstr "kolon_tanımı"
+
+#: sql_help.c:2873
+#: sql_help.c:3076
+#: sql_help.c:3232
+msgid "join_type"
+msgstr "join_tipi"
+
+#: sql_help.c:2875
+#: sql_help.c:3078
+#: sql_help.c:3234
+msgid "join_condition"
+msgstr "join_şartı"
+
+#: sql_help.c:2876
+#: sql_help.c:3079
+#: sql_help.c:3235
+msgid "join_column"
+msgstr ""
+
+#: sql_help.c:2877
+#: sql_help.c:3080
+#: sql_help.c:3236
+msgid "and with_query is:"
+msgstr ""
+
+#: sql_help.c:2881
+#: sql_help.c:3084
+#: sql_help.c:3240
+msgid "insert"
+msgstr ""
+
+#: sql_help.c:2882
+#: sql_help.c:3085
+#: sql_help.c:3241
+msgid "update"
+msgstr ""
+
+#: sql_help.c:2883
+#: sql_help.c:3086
+#: sql_help.c:3242
+msgid "delete"
+msgstr ""
+
+#: sql_help.c:2910
+msgid "new_table"
+msgstr "yeni_tablo"
+
+#: sql_help.c:2935
+msgid "timezone"
+msgstr ""
+
+#: sql_help.c:3125
+msgid "from_list"
+msgstr ""
+
+#: sql_help.c:3156
+msgid "sort_expression"
+msgstr ""
+
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "geçerli dizin tespit edilemedi: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "geçersiz ikili (binary) \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "\"%s\" ikili (binary) dosyası okunamadı"
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "\"%s\"  çalıştırmak için bulunamadı"
+
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "symbolic link \"%s\" okuma hatası"
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
+
+#~ msgid "\\%s: error\n"
+#~ msgstr "\\%s: hata\n"
+
+#~ msgid " on host \"%s\""
+#~ msgstr " \"%s\" sistemi"
+
+#~ msgid " at port \"%s\""
+#~ msgstr " \"%s\" portunda"
+
+#~ msgid " as user \"%s\""
+#~ msgstr " \"%s\" kullanıcısı"
+
+#~ msgid "out of memory"
+#~ msgstr "yetersiz bellek"
+
+#~ msgid "aggregate"
+#~ msgstr "aggregate"
+
+#~ msgid "data type"
+#~ msgstr "veri tipi"
+
+#~ msgid "define a new constraint trigger"
+#~ msgstr "yeni constraint trigger tanımla"
+
+#~ msgid "ABORT [ WORK | TRANSACTION ]"
+#~ msgstr "ABORT [ WORK | TRANSACTION ]"
+
+#~ msgid ""
+#~ "ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
+#~ "ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
+#~ "ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
+#~ msgstr ""
+#~ "ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name\n"
+#~ "ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner\n"
+#~ "ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema"
+
+#~ msgid ""
+#~ "ALTER CONVERSION name RENAME TO newname\n"
+#~ "ALTER CONVERSION name OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER CONVERSION dönüşüm_adı RENAME TO yeni_ad\n"
+#~ "ALTER CONVERSION dönüşüm_adı OWNER TO yeni_sahip"
+
+#~ msgid ""
+#~ "ALTER DATABASE name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "where option can be:\n"
+#~ "\n"
+#~ "    CONNECTION LIMIT connlimit\n"
+#~ "\n"
+#~ "ALTER DATABASE name RENAME TO newname\n"
+#~ "\n"
+#~ "ALTER DATABASE name OWNER TO new_owner\n"
+#~ "\n"
+#~ "ALTER DATABASE name SET TABLESPACE new_tablespace\n"
+#~ "\n"
+#~ "ALTER DATABASE name SET configuration_parameter { TO | = } { value | "
+#~ "DEFAULT }\n"
+#~ "ALTER DATABASE name SET configuration_parameter FROM CURRENT\n"
+#~ "ALTER DATABASE name RESET configuration_parameter\n"
+#~ "ALTER DATABASE name RESET ALL"
+#~ msgstr ""
+#~ "ALTER DATABASE veritabanı_adı [ [ WITH ] seçenek [ ... ] ]\n"
+#~ "\n"
+#~ "seçenek aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    CONNECTION LIMIT bağlantı limiti\n"
+#~ "\n"
+#~ "ALTER DATABASE veritabanı_adı RENAME TO yeni_adı\n"
+#~ "\n"
+#~ "ALTER DATABASE veritabanı_adı OWNER TO yeni_sahibi\n"
+#~ "\n"
+#~ "ALTER DATABASE veritabanı_adı SET yapılandırma_parametresi { TO | = } "
+#~ "{ deÄŸer | DEFAULT }\n"
+#~ "ALTER DATABASE veritabanı_adı SET yapılandırma_parametresi FROM CURRENT\n"
+#~ "ALTER DATABASE veritabanı_adı RESET yapılandırma_parametresi\n"
+#~ "ALTER DATABASE veritabanı_adı RESET ALL"
+
+#~ msgid ""
+#~ "ALTER DOMAIN name\n"
+#~ "    { SET DEFAULT expression | DROP DEFAULT }\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    { SET | DROP } NOT NULL\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    ADD domain_constraint\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    OWNER TO new_owner \n"
+#~ "ALTER DOMAIN name\n"
+#~ "    SET SCHEMA new_schema"
+#~ msgstr ""
+#~ "ALTER DOMAIN name\n"
+#~ "    { SET DEFAULT expression | DROP DEFAULT }\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    { SET | DROP } NOT NULL\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    ADD domain_constraint\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
+#~ "ALTER DOMAIN name\n"
+#~ "    OWNER TO new_owner \n"
+#~ "ALTER DOMAIN name\n"
+#~ "    SET SCHEMA new_schema"
+
+#~ msgid ""
+#~ "ALTER FOREIGN DATA WRAPPER name\n"
+#~ "    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+#~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ]) ]\n"
+#~ "ALTER FOREIGN DATA WRAPPER name OWNER TO new_owner"
+#~ msgstr ""
+#~ "ALTER FOREIGN DATA WRAPPER ad\n"
+#~ "    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+#~ "    [ SEÇENEKLER ( [ ADD | SET | DROP ] seçenek ['değer'] [, ... ]) ]\n"
+#~ "ALTER FOREIGN DATA WRAPPER ad OWNER TO yeni sahibi"
+
+#~ msgid ""
+#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+#~ "    action [ ... ] [ RESTRICT ]\n"
+#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+#~ "    RENAME TO new_name\n"
+#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+#~ "    OWNER TO new_owner\n"
+#~ "ALTER FUNCTION name ( [ [ argmode ] [ argname ] argtype [, ...] ] )\n"
+#~ "    SET SCHEMA new_schema\n"
+#~ "\n"
+#~ "where action is one of:\n"
+#~ "\n"
+#~ "    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
+#~ "    IMMUTABLE | STABLE | VOLATILE\n"
+#~ "    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
+#~ "    COST execution_cost\n"
+#~ "    ROWS result_rows\n"
+#~ "    SET configuration_parameter { TO | = } { value | DEFAULT }\n"
+#~ "    SET configuration_parameter FROM CURRENT\n"
+#~ "    RESET configuration_parameter\n"
+#~ "    RESET ALL"
+#~ msgstr ""
+#~ "ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype "
+#~ "[, ...] ] )\n"
+#~ "    iÅŸlem [ ... ] [ RESTRICT ]\n"
+#~ "ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype "
+#~ "[, ...] ] )\n"
+#~ "    RENAME TO yeni_adı\n"
+#~ "ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype "
+#~ "[, ...] ] )\n"
+#~ "    OWNER TO yeni_sahibi\n"
+#~ "ALTER FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype "
+#~ "[, ...] ] )\n"
+#~ "    SET SCHEMA yeni_ÅŸema\n"
+#~ "\n"
+#~ "işlem aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
+#~ "    IMMUTABLE | STABLE | VOLATILE\n"
+#~ "    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
+#~ "    COST çalıştırma_maliyeti(execution cost)\n"
+#~ "    ROWS result_rows\n"
+#~ "    SET yapılandırma_parametresi { TO | = } { value | DEFAULT }\n"
+#~ "    SET yapılandırma_parametresi FROM CURRENT\n"
+#~ "    RESET yapılandırma_parametresi\n"
+#~ "    RESET ALL"
+
+#~ msgid ""
+#~ "ALTER GROUP groupname ADD USER username [, ... ]\n"
+#~ "ALTER GROUP groupname DROP USER username [, ... ]\n"
+#~ "\n"
+#~ "ALTER GROUP groupname RENAME TO newname"
+#~ msgstr ""
+#~ "ALTER GROUP grup_adı ADD USER kullanıcı_adı [, ... ]\n"
+#~ "ALTER GROUP grup_adı DROP USER kullanıcı_adı [, ... ]\n"
+#~ "\n"
+#~ "ALTER GROUP grup_adı RENAME TO yeni_ad"
+
+#~ msgid ""
+#~ "ALTER INDEX name RENAME TO new_name\n"
+#~ "ALTER INDEX name SET TABLESPACE tablespace_name\n"
+#~ "ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
+#~ "ALTER INDEX name RESET ( storage_parameter [, ... ] )"
+#~ msgstr ""
+#~ "ALTER INDEX name RENAME TO new_name\n"
+#~ "ALTER INDEX name SET TABLESPACE tablespace_name\n"
+#~ "ALTER INDEX name SET ( storage_parameter = value [, ... ] )\n"
+#~ "ALTER INDEX name RESET ( storage_parameter [, ... ] )"
+
+#~ msgid ""
+#~ "ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
+#~ "ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
+#~ msgstr ""
+#~ "ALTER [ PROCEDURAL ] LANGUAGE name RENAME TO newname\n"
+#~ "ALTER [ PROCEDURAL ] LANGUAGE name OWNER TO new_owner"
+
+#~ msgid ""
+#~ "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER "
+#~ "TO newowner"
+#~ msgstr ""
+#~ "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER "
+#~ "TO yeni_sahip"
+
+#~ msgid ""
+#~ "ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
+#~ "ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER OPERATOR CLASS ad USING index_method RENAME TO yeni_ad\n"
+#~ "ALTER OPERATOR CLASS ad USING index_method OWNER TO yeni_sahip"
+
+#~ msgid ""
+#~ "ALTER OPERATOR FAMILY name USING index_method ADD\n"
+#~ "  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
+#~ "   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
+#~ "( argument_type [, ...] )\n"
+#~ "  } [, ... ]\n"
+#~ "ALTER OPERATOR FAMILY name USING index_method DROP\n"
+#~ "  {  OPERATOR strategy_number ( op_type [ , op_type ] )\n"
+#~ "   | FUNCTION support_number ( op_type [ , op_type ] )\n"
+#~ "  } [, ... ]\n"
+#~ "ALTER OPERATOR FAMILY name USING index_method RENAME TO newname\n"
+#~ "ALTER OPERATOR FAMILY name USING index_method OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER OPERATOR FAMILY adı USING index_methodu ADD\n"
+#~ "  {  OPERATOR strategy_number operator_name ( op_type, op_type )\n"
+#~ "   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
+#~ "( argument_type [, ...] )\n"
+#~ "  } [, ... ]\n"
+#~ "ALTER OPERATOR FAMILY ad USING index_methodu DROP\n"
+#~ "  {  OPERATOR strategy_number ( op_type [ , op_type ] )\n"
+#~ "   | FUNCTION support_number ( op_type [ , op_type ] )\n"
+#~ "  } [, ... ]\n"
+#~ "ALTER OPERATOR FAMILY ad USING index_methodu RENAME TO yeni ad\n"
+#~ "ALTER OPERATOR FAMILY ad USING index_methodu OWNER TO yeni sahibi"
+
+#~ msgid ""
+#~ "ALTER ROLE name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "where option can be:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT connlimit\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "\n"
+#~ "ALTER ROLE name RENAME TO newname\n"
+#~ "\n"
+#~ "ALTER ROLE name SET configuration_parameter { TO | = } { value | "
+#~ "DEFAULT }\n"
+#~ "ALTER ROLE name SET configuration_parameter FROM CURRENT\n"
+#~ "ALTER ROLE name RESET configuration_parameter\n"
+#~ "ALTER ROLE name RESET ALL"
+#~ msgstr ""
+#~ "ALTER ROLE rol_adı [ [ WITH ] seçenek [ ... ] ]\n"
+#~ "\n"
+#~ "seçenek aşağıdakilerden birisi olabilir:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT bağlantı_sayısı_sınırı\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "\n"
+#~ "ALTER ROLE rol_adı RENAME TO yeni_adı\n"
+#~ "\n"
+#~ "ALTER ROLE rol_adı SET yapılandırma_parametresi { TO | = } { value | "
+#~ "DEFAULT }\n"
+#~ "ALTER ROLE rol_adı SET yapılandırma_parametresi FROM CURRENT\n"
+#~ "ALTER ROLE rol_adı RESET yapılandırma_parametresi\n"
+#~ "ALTER ROLE rol_adı RESET ALL"
+
+#~ msgid ""
+#~ "ALTER SCHEMA name RENAME TO newname\n"
+#~ "ALTER SCHEMA name OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER SCHEMA şema_adı RENAME TO yeni_ad\n"
+#~ "ALTER SCHEMA şema_adı OWNER TO yeni_sahip"
+
+#~ msgid ""
+#~ "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
+#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
+#~ "MAXVALUE ]\n"
+#~ "    [ START [ WITH ] start ]\n"
+#~ "    [ RESTART [ [ WITH ] restart ] ]\n"
+#~ "    [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+#~ "    [ OWNED BY { table.column | NONE } ]\n"
+#~ "ALTER SEQUENCE name OWNER TO new_owner\n"
+#~ "ALTER SEQUENCE name RENAME TO new_name\n"
+#~ "ALTER SEQUENCE name SET SCHEMA new_schema"
+#~ msgstr ""
+#~ "ALTER SEQUENCE ad [ INCREMENT [ BY ] arttırma miktarı ]\n"
+#~ "    [ MINVALUE en az değer | NO MINVALUE ] [ MAXVALUE üst değer | NO "
+#~ "MAXVALUE ]\n"
+#~ "    [ START [ WITH ] başlama sayısı ]\n"
+#~ "    [ RESTART [ [ WITH ] yeniden başlama sayısı ] ]\n"
+#~ "    [ CACHE önbellek ] [ [ NO ] CYCLE ]\n"
+#~ "    [ OWNED BY { tablo.kolon | NONE } ]\n"
+#~ "ALTER SEQUENCE ad OWNER TO yeni sahibir\n"
+#~ "ALTER SEQUENCE ad RENAME TO yeni adı\n"
+#~ "ALTER SEQUENCE namade SET SCHEMA yeni şeması"
+
+#~ msgid ""
+#~ "ALTER SERVER servername [ VERSION 'newversion' ]\n"
+#~ "    [ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]\n"
+#~ "ALTER SERVER servername OWNER TO new_owner"
+#~ msgstr ""
+#~ "ALTER SERVER sunucu adı [ VERSION 'yeni sürüm' ]\n"
+#~ "    [ OPTIONS ( [ ADD | SET | DROP ] seçenek ['değer'] [, ... ] ) ]\n"
+#~ "ALTER SERVER sunucu adı OWNER TO yeni sahibi"
+
+#~ msgid ""
+#~ "ALTER TABLE [ ONLY ] name [ * ]\n"
+#~ "    action [, ... ]\n"
+#~ "ALTER TABLE [ ONLY ] name [ * ]\n"
+#~ "    RENAME [ COLUMN ] column TO new_column\n"
+#~ "ALTER TABLE name\n"
+#~ "    RENAME TO new_name\n"
+#~ "ALTER TABLE name\n"
+#~ "    SET SCHEMA new_schema\n"
+#~ "\n"
+#~ "where action is one of:\n"
+#~ "\n"
+#~ "    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"
+#~ "    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"
+#~ "    ALTER [ COLUMN ] column [ SET DATA ] TYPE type [ USING expression ]\n"
+#~ "    ALTER [ COLUMN ] column SET DEFAULT expression\n"
+#~ "    ALTER [ COLUMN ] column DROP DEFAULT\n"
+#~ "    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"
+#~ "    ALTER [ COLUMN ] column SET STATISTICS integer\n"
+#~ "    ALTER [ COLUMN ] column SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
+#~ "MAIN }\n"
+#~ "    ADD table_constraint\n"
+#~ "    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"
+#~ "    DISABLE TRIGGER [ trigger_name | ALL | USER ]\n"
+#~ "    ENABLE TRIGGER [ trigger_name | ALL | USER ]\n"
+#~ "    ENABLE REPLICA TRIGGER trigger_name\n"
+#~ "    ENABLE ALWAYS TRIGGER trigger_name\n"
+#~ "    DISABLE RULE rewrite_rule_name\n"
+#~ "    ENABLE RULE rewrite_rule_name\n"
+#~ "    ENABLE REPLICA RULE rewrite_rule_name\n"
+#~ "    ENABLE ALWAYS RULE rewrite_rule_name\n"
+#~ "    CLUSTER ON index_name\n"
+#~ "    SET WITHOUT CLUSTER\n"
+#~ "    SET WITH OIDS\n"
+#~ "    SET WITHOUT OIDS\n"
+#~ "    SET ( storage_parameter = value [, ... ] )\n"
+#~ "    RESET ( storage_parameter [, ... ] )\n"
+#~ "    INHERIT parent_table\n"
+#~ "    NO INHERIT parent_table\n"
+#~ "    OWNER TO new_owner\n"
+#~ "    SET TABLESPACE new_tablespace"
+#~ msgstr ""
+#~ "ALTER TABLE [ ONLY ] ad [ * ]\n"
+#~ "    action [, ... ]\n"
+#~ "ALTER TABLE [ ONLY ] ad [ * ]\n"
+#~ "    RENAME [ COLUMN ] kolon TO yeni kolon\n"
+#~ "ALTER TABLE ad\n"
+#~ "    RENAME TO yeni ad\n"
+#~ "ALTER TABLE ad\n"
+#~ "    SET SCHEMA yeni ÅŸema\n"
+#~ "\n"
+#~ "action aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    ADD [ COLUMN ] kolon kolon_tipi [ kolon kısıtlaması [ ... ] ]\n"
+#~ "    DROP [ COLUMN ] kolon [ RESTRICT | CASCADE ]\n"
+#~ "    ALTER [ COLUMN ] kolon [ SET DATA ] TYPE type [ USING ifade ]\n"
+#~ "    ALTER [ COLUMN ] kolon SET DEFAULT ifade\n"
+#~ "    ALTER [ COLUMN ] kolon DROP DEFAULT\n"
+#~ "    ALTER [ COLUMN ] kolon { SET | DROP } NOT NULL\n"
+#~ "    ALTER [ COLUMN ] kolon SET STATISTICS tamsayı\n"
+#~ "    ALTER [ COLUMN ] kolon SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "
+#~ "MAIN }\n"
+#~ "    ADD tablo kısıtlaması\n"
+#~ "    DROP CONSTRAINT kısıtlama adı [ RESTRICT | CASCADE ]\n"
+#~ "    DISABLE TRIGGER [ trigger adı | ALL | USER ]\n"
+#~ "    ENABLE TRIGGER[ trigger adı | ALL | USER ]\n"
+#~ "    ENABLE REPLICA TRIGGER trigger adı\n"
+#~ "    ENABLE ALWAYS TRIGGER trigger adı\n"
+#~ "    DISABLE RULE rewrite_rule_name\n"
+#~ "    ENABLE RULE rewrite_rule_name\n"
+#~ "    ENABLE REPLICA RULE rewrite_rule_name\n"
+#~ "    ENABLE ALWAYS RULE rewrite_rule_name\n"
+#~ "    CLUSTER ON index adı\n"
+#~ "    SET WITHOUT CLUSTER\n"
+#~ "    SET WITH OIDS\n"
+#~ "    SET WITHOUT OIDS\n"
+#~ "    SET ( storage_parameter = value [, ... ] )\n"
+#~ "    RESET ( storage_parameter [, ... ] )\n"
+#~ "    INHERIT üst tablo\n"
+#~ "    NO INHERIT üst tablo\n"
+#~ "    OWNER TO yeni sahibi\n"
+#~ "    SET TABLESPACE yeni tablespace"
+
+#~ msgid ""
+#~ "ALTER TABLESPACE name RENAME TO newname\n"
+#~ "ALTER TABLESPACE name OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER TABLESPACE tablespace_adı RENAME TO yeni_ad\n"
+#~ "ALTER TABLESPACE tablespace_adı OWNER TO yeni_sahip"
+
+#~ msgid ""
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ALTER MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ALTER MAPPING REPLACE old_dictionary WITH new_dictionary\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH "
+#~ "new_dictionary\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ]\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ADD MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ALTER MAPPING FOR token_type [, ... ] WITH dictionary_name [, ... ]\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ALTER MAPPING REPLACE old_dictionary WITH new_dictionary\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    ALTER MAPPING FOR token_type [, ... ] REPLACE old_dictionary WITH "
+#~ "new_dictionary\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name\n"
+#~ "    DROP MAPPING [ IF EXISTS ] FOR token_type [, ... ]\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name RENAME TO newname\n"
+#~ "ALTER TEXT SEARCH CONFIGURATION name OWNER TO newowner"
+
+#~ msgid ""
+#~ "ALTER TEXT SEARCH DICTIONARY name (\n"
+#~ "    option [ = value ] [, ... ]\n"
+#~ ")\n"
+#~ "ALTER TEXT SEARCH DICTIONARY name RENAME TO newname\n"
+#~ "ALTER TEXT SEARCH DICTIONARY name OWNER TO newowner"
+#~ msgstr ""
+#~ "ALTER TEXT SEARCH DICTIONARY ad (\n"
+#~ "    option [ = value ] [, ... ]\n"
+#~ ")\n"
+#~ "ALTER TEXT SEARCH DICTIONARY ad RENAME TO yeni adı\n"
+#~ "ALTER TEXT SEARCH DICTIONARY ad OWNER TO yeni sahibi"
+
+#~ msgid "ALTER TEXT SEARCH PARSER name RENAME TO newname"
+#~ msgstr "ALTER TEXT SEARCH PARSER ayrıştırıcı_adı RENAME TO yeni_adı"
+
+#~ msgid "ALTER TEXT SEARCH TEMPLATE name RENAME TO newname"
+#~ msgstr "ALTER TEXT SEARCH TEMPLATE şablon_adı RENAME TO yeni_adı"
+
+#~ msgid "ALTER TRIGGER name ON table RENAME TO newname"
+#~ msgstr "ALTER TRIGGER trigger_adı ON tablo_adı RENAME TO yeni_ad"
+
+#~ msgid ""
+#~ "ALTER TYPE name RENAME TO new_name\n"
+#~ "ALTER TYPE name OWNER TO new_owner \n"
+#~ "ALTER TYPE name SET SCHEMA new_schema"
+#~ msgstr ""
+#~ "ALTER TYPE ad RENAME TO yeni adı\n"
+#~ "ALTER TYPE ad OWNER TO yeni sahibi \n"
+#~ "ALTER TYPE ad SET SCHEMA yeni ÅŸema"
+
+#~ msgid ""
+#~ "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "where option can be:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT connlimit\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "\n"
+#~ "ALTER USER name RENAME TO newname\n"
+#~ "\n"
+#~ "ALTER USER name SET configuration_parameter { TO | = } { value | "
+#~ "DEFAULT }\n"
+#~ "ALTER USER name SET configuration_parameter FROM CURRENT\n"
+#~ "ALTER USER name RESET configuration_parameter\n"
+#~ "ALTER USER name RESET ALL"
+#~ msgstr ""
+#~ "ALTER USER kullanıcı_adı [ [ WITH ] seçenek [ ... ] ]\n"
+#~ "\n"
+#~ "seçenek aşağıdakilerden birisi olabilir:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT bağlantı_sayısı_sınırı\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "\n"
+#~ "ALTER USER kullanıcı_adı RENAME TO yeni_adı\n"
+#~ "\n"
+#~ "ALTER USER kullanıcı_adı SET yapılandırma_parametresi { TO | = } { value "
+#~ "| DEFAULT }\n"
+#~ "ALTER USER kullanıcı_adı SET yapılandırma_parametresi FROM CURRENT\n"
+#~ "ALTER USER kullanıcı_adı RESET yapılandırma_parametresi\n"
+#~ "ALTER USER kullanıcı_adı RESET ALL"
+
+#~ msgid ""
+#~ "ALTER USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
+#~ "    SERVER servername\n"
+#~ "    OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] )"
+#~ msgstr ""
+#~ "ALTER USER MAPPING FOR { kullanıcı adı | USER | CURRENT_USER | PUBLIC }\n"
+#~ "    SERVER sunucu adı\n"
+#~ "    OPTIONS ( [ ADD | SET | DROP ] seçenek ['değer'] [, ... ] )"
+
+#~ msgid ""
+#~ "ALTER VIEW name ALTER [ COLUMN ] column SET DEFAULT expression\n"
+#~ "ALTER VIEW name ALTER [ COLUMN ] column DROP DEFAULT\n"
+#~ "ALTER VIEW name OWNER TO new_owner\n"
+#~ "ALTER VIEW name RENAME TO new_name\n"
+#~ "ALTER VIEW name SET SCHEMA new_schema"
+#~ msgstr ""
+#~ "ALTER VIEW ad ALTER [ COLUMN ] kolon SET DEFAULT ifade\n"
+#~ "ALTER VIEW ad ALTER [ COLUMN ] kolon DROP DEFAULT\n"
+#~ "ALTER VIEW ad OWNER TO yeni sahibi\n"
+#~ "ALTER VIEW ad RENAME TO yeni adı\n"
+#~ "ALTER VIEW ad SET SCHEMA yeni ÅŸema"
+
+#~ msgid "ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]"
+#~ msgstr "ANALYZE [ VERBOSE ] [ tablo [ ( kolon [, ...] ) ] ]"
+
+#~ msgid ""
+#~ "BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
+#~ "\n"
+#~ "where transaction_mode is one of:\n"
+#~ "\n"
+#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
+#~ "READ UNCOMMITTED }\n"
+#~ "    READ WRITE | READ ONLY"
+#~ msgstr ""
+#~ "BEGIN [ WORK | TRANSACTION ] [ transaction_modu [, ...] ]\n"
+#~ "\n"
+#~ "transaction_modu aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
+#~ "READ UNCOMMITTED }\n"
+#~ "    READ WRITE | READ ONLY"
+
+#~ msgid "CHECKPOINT"
+#~ msgstr "CHECKPOINT"
+
+#~ msgid "CLOSE { name | ALL }"
+#~ msgstr "CLOSE { name | ALL }"
+
+#~ msgid ""
+#~ "CLUSTER [VERBOSE] tablename [ USING indexname ]\n"
+#~ "CLUSTER [VERBOSE]"
+#~ msgstr ""
+#~ "CLUSTER [VERBOSE] tablo adı [ USING index adı ]\n"
+#~ "CLUSTER [VERBOSE]"
+
+#~ msgid ""
+#~ "COMMENT ON\n"
+#~ "{\n"
+#~ "  TABLE object_name |\n"
+#~ "  COLUMN table_name.column_name |\n"
+#~ "  AGGREGATE agg_name (agg_type [, ...] ) |\n"
+#~ "  CAST (sourcetype AS targettype) |\n"
+#~ "  CONSTRAINT constraint_name ON table_name |\n"
+#~ "  CONVERSION object_name |\n"
+#~ "  DATABASE object_name |\n"
+#~ "  DOMAIN object_name |\n"
+#~ "  FUNCTION func_name ( [ [ argmode ] [ argname ] argtype [, ...] ] ) |\n"
+#~ "  INDEX object_name |\n"
+#~ "  LARGE OBJECT large_object_oid |\n"
+#~ "  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
+#~ "  OPERATOR CLASS object_name USING index_method |\n"
+#~ "  OPERATOR FAMILY object_name USING index_method |\n"
+#~ "  [ PROCEDURAL ] LANGUAGE object_name |\n"
+#~ "  ROLE object_name |\n"
+#~ "  RULE rule_name ON table_name |\n"
+#~ "  SCHEMA object_name |\n"
+#~ "  SEQUENCE object_name |\n"
+#~ "  TABLESPACE object_name |\n"
+#~ "  TEXT SEARCH CONFIGURATION object_name |\n"
+#~ "  TEXT SEARCH DICTIONARY object_name |\n"
+#~ "  TEXT SEARCH PARSER object_name |\n"
+#~ "  TEXT SEARCH TEMPLATE object_name |\n"
+#~ "  TRIGGER trigger_name ON table_name |\n"
+#~ "  TYPE object_name |\n"
+#~ "  VIEW object_name\n"
+#~ "} IS 'text'"
+#~ msgstr ""
+#~ "COMMENT ON\n"
+#~ "{\n"
+#~ "  TABLE nesne_ado |\n"
+#~ "  COLUMN tablo_adı.kolon_adı |\n"
+#~ "  AGGREGATE agg_name (agg_type [, ...] ) |\n"
+#~ "  CAST (sourcetype AS targettype) |\n"
+#~ "  CONSTRAINT constraint_name ON table_name |\n"
+#~ "  CONVERSION nesne_adı |\n"
+#~ "  DATABASE nesne_adı |\n"
+#~ "  DOMAIN nesne_adı |\n"
+#~ "  FUNCTION fonksiyon_adı ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
+#~ "|\n"
+#~ "  INDEX nesne_adı |\n"
+#~ "  LARGE OBJECT large_object_oid |\n"
+#~ "  OPERATOR op (leftoperand_type, rightoperand_type) |\n"
+#~ "  OPERATOR CLASS nesne_adı USING index_yöntemi |\n"
+#~ "  OPERATOR FAMILY nesne_adı USING index_yöntemi |\n"
+#~ "  [ PROCEDURAL ] LANGUAGE nesne_adı |\n"
+#~ "  ROLE nesne_adı |\n"
+#~ "  RULE kural_adı ON tablo_adı |\n"
+#~ "  SCHEMA nesne_adı |\n"
+#~ "  SEQUENCE nesne_adı |\n"
+#~ "  TABLESPACE nesne_adı |\n"
+#~ "  TEXT SEARCH CONFIGURATION nesne_adı |\n"
+#~ "  TEXT SEARCH DICTIONARY nesne_adı |\n"
+#~ "  TEXT SEARCH PARSER nesne_adı |\n"
+#~ "  TEXT SEARCH TEMPLATE nesne_adı |\n"
+#~ "  TRIGGER tetikleyici_adı ON table_name |\n"
+#~ "  TYPE nesne_adı |\n"
+#~ "  VIEW nesne_adı\n"
+#~ "} IS 'text'"
+
+#~ msgid "COMMIT [ WORK | TRANSACTION ]"
+#~ msgstr "COMMIT [ WORK | TRANSACTION ]"
+
+#~ msgid "COMMIT PREPARED transaction_id"
+#~ msgstr "COMMIT PREPARED transaction_id"
+
+#~ msgid ""
+#~ "COPY tablename [ ( column [, ...] ) ]\n"
+#~ "    FROM { 'filename' | STDIN }\n"
+#~ "    [ [ WITH ] \n"
+#~ "          [ BINARY ]\n"
+#~ "          [ OIDS ]\n"
+#~ "          [ DELIMITER [ AS ] 'delimiter' ]\n"
+#~ "          [ NULL [ AS ] 'null string' ]\n"
+#~ "          [ CSV [ HEADER ]\n"
+#~ "                [ QUOTE [ AS ] 'quote' ] \n"
+#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
+#~ "                [ FORCE NOT NULL column [, ...] ]\n"
+#~ "\n"
+#~ "COPY { tablename [ ( column [, ...] ) ] | ( query ) }\n"
+#~ "    TO { 'filename' | STDOUT }\n"
+#~ "    [ [ WITH ] \n"
+#~ "          [ BINARY ]\n"
+#~ "          [ OIDS ]\n"
+#~ "          [ DELIMITER [ AS ] 'delimiter' ]\n"
+#~ "          [ NULL [ AS ] 'null string' ]\n"
+#~ "          [ CSV [ HEADER ]\n"
+#~ "                [ QUOTE [ AS ] 'quote' ] \n"
+#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
+#~ "                [ FORCE QUOTE column [, ...] ]"
+#~ msgstr ""
+#~ "COPY tablo adı [ ( kolon [, ...] ) ]\n"
+#~ "    FROM { 'dosya adı' | STDIN }\n"
+#~ "    [ [ WITH ] \n"
+#~ "          [ BINARY ]\n"
+#~ "          [ OIDS ]\n"
+#~ "          [ DELIMITER [ AS ] 'delimiter' ]\n"
+#~ "          [ NULL [ AS ] 'null string' ]\n"
+#~ "          [ CSV [ HEADER ]\n"
+#~ "                [ QUOTE [ AS ] 'quote' ] \n"
+#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
+#~ "                [ FORCE NOT NULL column [, ...] ]\n"
+#~ "\n"
+#~ "COPY { tablo adı [ ( kolon [, ...] ) ] | ( sorgu ) }\n"
+#~ "    TO { 'dosya adı' | STDOUT }\n"
+#~ "    [ [ WITH ] \n"
+#~ "          [ BINARY ]\n"
+#~ "          [ OIDS ]\n"
+#~ "          [ DELIMITER [ AS ] 'delimiter' ]\n"
+#~ "          [ NULL [ AS ] 'null string' ]\n"
+#~ "          [ CSV [ HEADER ]\n"
+#~ "                [ QUOTE [ AS ] 'quote' ] \n"
+#~ "                [ ESCAPE [ AS ] 'escape' ]\n"
+#~ "                [ FORCE QUOTE column [, ...] ]"
+
+#~ msgid ""
+#~ "CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
+#~ "    SFUNC = sfunc,\n"
+#~ "    STYPE = state_data_type\n"
+#~ "    [ , FINALFUNC = ffunc ]\n"
+#~ "    [ , INITCOND = initial_condition ]\n"
+#~ "    [ , SORTOP = sort_operator ]\n"
+#~ ")\n"
+#~ "\n"
+#~ "or the old syntax\n"
+#~ "\n"
+#~ "CREATE AGGREGATE name (\n"
+#~ "    BASETYPE = base_type,\n"
+#~ "    SFUNC = sfunc,\n"
+#~ "    STYPE = state_data_type\n"
+#~ "    [ , FINALFUNC = ffunc ]\n"
+#~ "    [ , INITCOND = initial_condition ]\n"
+#~ "    [ , SORTOP = sort_operator ]\n"
+#~ ")"
+#~ msgstr ""
+#~ "CREATE AGGREGATE name ( input_data_type [ , ... ] ) (\n"
+#~ "    SFUNC = sfunc,\n"
+#~ "    STYPE = state_data_type\n"
+#~ "    [ , FINALFUNC = ffunc ]\n"
+#~ "    [ , INITCOND = initial_condition ]\n"
+#~ "    [ , SORTOP = sort_operator ]\n"
+#~ ")\n"
+#~ "\n"
+#~ "or the old syntax\n"
+#~ "\n"
+#~ "CREATE AGGREGATE name (\n"
+#~ "    BASETYPE = base_type,\n"
+#~ "    SFUNC = sfunc,\n"
+#~ "    STYPE = state_data_type\n"
+#~ "    [ , FINALFUNC = ffunc ]\n"
+#~ "    [ , INITCOND = initial_condition ]\n"
+#~ "    [ , SORTOP = sort_operator ]\n"
+#~ ")"
+
+#~ msgid ""
+#~ "CREATE CAST (sourcetype AS targettype)\n"
+#~ "    WITH FUNCTION funcname (argtypes)\n"
+#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+#~ "\n"
+#~ "CREATE CAST (sourcetype AS targettype)\n"
+#~ "    WITHOUT FUNCTION\n"
+#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+#~ "\n"
+#~ "CREATE CAST (sourcetype AS targettype)\n"
+#~ "    WITH INOUT\n"
+#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]"
+#~ msgstr ""
+#~ "CREATE CAST (sourcetype AS targettype)\n"
+#~ "    WITH FUNCTION funcname (argtypes)\n"
+#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+#~ "\n"
+#~ "CREATE CAST (sourcetype AS targettype)\n"
+#~ "    WITHOUT FUNCTION\n"
+#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]\n"
+#~ "\n"
+#~ "CREATE CAST (sourcetype AS targettype)\n"
+#~ "    WITH INOUT\n"
+#~ "    [ AS ASSIGNMENT | AS IMPLICIT ]"
+
+#~ msgid ""
+#~ "CREATE CONSTRAINT TRIGGER name\n"
+#~ "    AFTER event [ OR ... ]\n"
+#~ "    ON table_name\n"
+#~ "    [ FROM referenced_table_name ]\n"
+#~ "    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
+#~ "DEFERRED } }\n"
+#~ "    FOR EACH ROW\n"
+#~ "    EXECUTE PROCEDURE funcname ( arguments )"
+#~ msgstr ""
+#~ "CREATE CONSTRAINT TRIGGER name\n"
+#~ "    AFTER event [ OR ... ]\n"
+#~ "    ON table_name\n"
+#~ "    [ FROM referenced_table_name ]\n"
+#~ "    { NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY "
+#~ "DEFERRED } }\n"
+#~ "    FOR EACH ROW\n"
+#~ "    EXECUTE PROCEDURE funcname ( arguments )"
+
+#~ msgid ""
+#~ "CREATE [ DEFAULT ] CONVERSION name\n"
+#~ "    FOR source_encoding TO dest_encoding FROM funcname"
+#~ msgstr ""
+#~ "CREATE [ DEFAULT ] CONVERSION name\n"
+#~ "    FOR source_encoding TO dest_encoding FROM funcname"
+
+#~ msgid ""
+#~ "CREATE DATABASE name\n"
+#~ "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
+#~ "           [ TEMPLATE [=] template ]\n"
+#~ "           [ ENCODING [=] encoding ]\n"
+#~ "           [ LC_COLLATE [=] lc_collate ]\n"
+#~ "           [ LC_CTYPE [=] lc_ctype ]\n"
+#~ "           [ TABLESPACE [=] tablespace ]\n"
+#~ "           [ CONNECTION LIMIT [=] connlimit ] ]"
+#~ msgstr ""
+#~ "CREATE DATABASE ad\n"
+#~ "    [ [ WITH ] [ OWNER [=] veritabanı sahibi ]\n"
+#~ "           [ TEMPLATE [=] ÅŸablon ]\n"
+#~ "           [ ENCODING [=] dil kodlaması ]\n"
+#~ "           [ LC_COLLATE [=] lc_collate ]\n"
+#~ "           [ LC_CTYPE [=] lc_ctype ]\n"
+#~ "           [ TABLESPACE [=] tablespace ]\n"
+#~ "           [ CONNECTION LIMIT [=] bağlantı sınırı ] ]"
+
+#~ msgid ""
+#~ "CREATE DOMAIN name [ AS ] data_type\n"
+#~ "    [ DEFAULT expression ]\n"
+#~ "    [ constraint [ ... ] ]\n"
+#~ "\n"
+#~ "where constraint is:\n"
+#~ "\n"
+#~ "[ CONSTRAINT constraint_name ]\n"
+#~ "{ NOT NULL | NULL | CHECK (expression) }"
+#~ msgstr ""
+#~ "CREATE DOMAIN name [ AS ] data_type\n"
+#~ "    [ DEFAULT expression ]\n"
+#~ "    [ constraint [ ... ] ]\n"
+#~ "\n"
+#~ "constraint aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "[ CONSTRAINT constraint_name ]\n"
+#~ "{ NOT NULL | NULL | CHECK (expression) }"
+
+#~ msgid ""
+#~ "CREATE FOREIGN DATA WRAPPER name\n"
+#~ "    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+#~ "    [ OPTIONS ( option 'value' [, ... ] ) ]"
+#~ msgstr ""
+#~ "CREATE FOREIGN DATA WRAPPER ad\n"
+#~ "    [ VALIDATOR valfunction | NO VALIDATOR ]\n"
+#~ "    [ OPTIONS ( option 'value' [, ... ] ) ]"
+
+#~ msgid ""
+#~ "CREATE [ OR REPLACE ] FUNCTION\n"
+#~ "    name ( [ [ argmode ] [ argname ] argtype [ { DEFAULT | = } defexpr ] "
+#~ "[, ...] ] )\n"
+#~ "    [ RETURNS rettype\n"
+#~ "      | RETURNS TABLE ( colname coltype [, ...] ) ]\n"
+#~ "  { LANGUAGE langname\n"
+#~ "    | WINDOW\n"
+#~ "    | IMMUTABLE | STABLE | VOLATILE\n"
+#~ "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
+#~ "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
+#~ "    | COST execution_cost\n"
+#~ "    | ROWS result_rows\n"
+#~ "    | SET configuration_parameter { TO value | = value | FROM CURRENT }\n"
+#~ "    | AS 'definition'\n"
+#~ "    | AS 'obj_file', 'link_symbol'\n"
+#~ "  } ...\n"
+#~ "    [ WITH ( attribute [, ...] ) ]"
+#~ msgstr ""
+#~ "CREATE [ OR REPLACE ] FUNCTION\n"
+#~ "    ad ( [ [ argüman modu ] [ argüman adı ] argüman tipi [ { DEFAULT | "
+#~ "= } defexpr ] [, ...] ] )\n"
+#~ "    [ RETURNS rettype\n"
+#~ "      | RETURNS TABLE ( kolon_adı kolon_tipi [, ...] ) ]\n"
+#~ "  { LANGUAGE dil adı\n"
+#~ "    | WINDOW\n"
+#~ "    | IMMUTABLE | STABLE | VOLATILE\n"
+#~ "    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"
+#~ "    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"
+#~ "    | COST execution_cost\n"
+#~ "    | ROWS result_rows\n"
+#~ "    | SET yapılandırma parametresi { TO değer | = değer | FROM CURRENT }\n"
+#~ "    | AS 'tanım'\n"
+#~ "    | AS 'obj_file', 'link_symbol'\n"
+#~ "  } ...\n"
+#~ "    [ WITH ( attribute [, ...] ) ]"
+
+#~ msgid ""
+#~ "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "where option can be:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "    | IN ROLE rolename [, ...]\n"
+#~ "    | IN GROUP rolename [, ...]\n"
+#~ "    | ROLE rolename [, ...]\n"
+#~ "    | ADMIN rolename [, ...]\n"
+#~ "    | USER rolename [, ...]\n"
+#~ "    | SYSID uid"
+#~ msgstr ""
+#~ "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "seçenek aşağıdakilerden birisi olabilir:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'ÅŸifre'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "    | IN ROLE rolename [, ...]\n"
+#~ "    | IN GROUP rolename [, ...]\n"
+#~ "    | ROLE rolename [, ...]\n"
+#~ "    | ADMIN rolename [, ...]\n"
+#~ "    | USER rolename [, ...]\n"
+#~ "    | SYSID uid"
+
+#~ msgid ""
+#~ "CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
+#~ "    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS "
+#~ "{ FIRST | LAST } ] [, ...] )\n"
+#~ "    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
+#~ "    [ TABLESPACE tablespace ]\n"
+#~ "    [ WHERE predicate ]"
+#~ msgstr ""
+#~ "CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] name ON table [ USING method ]\n"
+#~ "    ( { column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS "
+#~ "{ FIRST | LAST } ] [, ...] )\n"
+#~ "    [ WITH ( storage_parameter = value [, ... ] ) ]\n"
+#~ "    [ TABLESPACE tablespace ]\n"
+#~ "    [ WHERE predicate ]"
+
+#~ msgid ""
+#~ "CREATE [ PROCEDURAL ] LANGUAGE name\n"
+#~ "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
+#~ "    HANDLER call_handler [ VALIDATOR valfunction ]"
+#~ msgstr ""
+#~ "CREATE [ PROCEDURAL ] LANGUAGE name\n"
+#~ "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
+#~ "    HANDLER call_handler [ VALIDATOR valfunction ]"
+
+#~ msgid ""
+#~ "CREATE OPERATOR name (\n"
+#~ "    PROCEDURE = funcname\n"
+#~ "    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"
+#~ "    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
+#~ "    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
+#~ "    [, HASHES ] [, MERGES ]\n"
+#~ ")"
+#~ msgstr ""
+#~ "CREATE OPERATOR name (\n"
+#~ "    PROCEDURE = funcname\n"
+#~ "    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"
+#~ "    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"
+#~ "    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"
+#~ "    [, HASHES ] [, MERGES ]\n"
+#~ ")"
+
+#~ msgid ""
+#~ "CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type\n"
+#~ "  USING index_method [ FAMILY family_name ] AS\n"
+#~ "  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ]\n"
+#~ "   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] funcname "
+#~ "( argument_type [, ...] )\n"
+#~ "   | STORAGE storage_type\n"
+#~ "  } [, ... ]"
+#~ msgstr ""
+#~ "CREATE OPERATOR CLASS ad [ DEFAULT ] FOR TYPE veri tipi\n"
+#~ "  USING index metodu [ FAMILY family_name ] AS\n"
+#~ "  {  OPERATOR strategy_number operatör adı [ ( op_type, op_type ) ]\n"
+#~ "   | FUNCTION support_number [ ( op_type [ , op_type ] ) ] fonksiyon adı "
+#~ "( argument_type [, ...] )\n"
+#~ "   | STORAGE storage_type\n"
+#~ "  } [, ... ]"
+
+#~ msgid "CREATE OPERATOR FAMILY name USING index_method"
+#~ msgstr "CREATE OPERATOR FAMILY name USING index_method"
+
+#~ msgid ""
+#~ "CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "where option can be:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT connlimit\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "    | IN ROLE rolename [, ...]\n"
+#~ "    | IN GROUP rolename [, ...]\n"
+#~ "    | ROLE rolename [, ...]\n"
+#~ "    | ADMIN rolename [, ...]\n"
+#~ "    | USER rolename [, ...]\n"
+#~ "    | SYSID uid"
+#~ msgstr ""
+#~ "CREATE ROLE name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "seçenek aşağıdakilerden birisi olabilir:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT connlimit\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "    | IN ROLE rolename [, ...]\n"
+#~ "    | IN GROUP rolename [, ...]\n"
+#~ "    | ROLE rolename [, ...]\n"
+#~ "    | ADMIN rolename [, ...]\n"
+#~ "    | USER rolename [, ...]\n"
+#~ "    | SYSID uid"
+
+#~ msgid ""
+#~ "CREATE [ OR REPLACE ] RULE name AS ON event\n"
+#~ "    TO table [ WHERE condition ]\n"
+#~ "    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; "
+#~ "command ... ) }"
+#~ msgstr ""
+#~ "CREATE [ OR REPLACE ] RULE name AS ON event\n"
+#~ "    TO tablo_adı [ WHERE condition ]\n"
+#~ "    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; "
+#~ "command ... ) }"
+
+#~ msgid ""
+#~ "CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ schema_element "
+#~ "[ ... ] ]\n"
+#~ "CREATE SCHEMA AUTHORIZATION username [ schema_element [ ... ] ]"
+#~ msgstr ""
+#~ "CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ TABLESPACE "
+#~ "tablespace ] [ schema_element [ ... ] ]\n"
+#~ "CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] "
+#~ "[ schema_element [ ... ] ]"
+
+#~ msgid ""
+#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
+#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
+#~ "MAXVALUE ]\n"
+#~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+#~ "    [ OWNED BY { table.column | NONE } ]"
+#~ msgstr ""
+#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
+#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "
+#~ "MAXVALUE ]\n"
+#~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"
+#~ "    [ OWNED BY { table.column | NONE } ]"
+
+#~ msgid ""
+#~ "CREATE SERVER servername [ TYPE 'servertype' ] [ VERSION "
+#~ "'serverversion' ]\n"
+#~ "    FOREIGN DATA WRAPPER fdwname\n"
+#~ "    [ OPTIONS ( option 'value' [, ... ] ) ]"
+#~ msgstr ""
+#~ "CREATE SERVER sunucu adı [ TYPE 'sunucu tipi' ] [ VERSION 'sunucu "
+#~ "sürümü' ]\n"
+#~ "    FOREIGN DATA WRAPPER fdw adı\n"
+#~ "    [ OPTIONS ( seçenek 'değer' [, ... ] ) ]"
+
+#~ msgid ""
+#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [\n"
+#~ "  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
+#~ "[ ... ] ]\n"
+#~ "    | table_constraint\n"
+#~ "    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | "
+#~ "CONSTRAINTS | INDEXES } ] ... }\n"
+#~ "    [, ... ]\n"
+#~ "] )\n"
+#~ "[ INHERITS ( parent_table [, ... ] ) ]\n"
+#~ "[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
+#~ "OIDS ]\n"
+#~ "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
+#~ "[ TABLESPACE tablespace ]\n"
+#~ "\n"
+#~ "where column_constraint is:\n"
+#~ "\n"
+#~ "[ CONSTRAINT constraint_name ]\n"
+#~ "{ NOT NULL | \n"
+#~ "  NULL | \n"
+#~ "  UNIQUE index_parameters |\n"
+#~ "  PRIMARY KEY index_parameters |\n"
+#~ "  CHECK ( expression ) |\n"
+#~ "  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | "
+#~ "MATCH SIMPLE ]\n"
+#~ "    [ ON DELETE action ] [ ON UPDATE action ] }\n"
+#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
+#~ "IMMEDIATE ]\n"
+#~ "\n"
+#~ "and table_constraint is:\n"
+#~ "\n"
+#~ "[ CONSTRAINT constraint_name ]\n"
+#~ "{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
+#~ "  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
+#~ "  CHECK ( expression ) |\n"
+#~ "  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "
+#~ "[, ... ] ) ]\n"
+#~ "    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] "
+#~ "[ ON UPDATE action ] }\n"
+#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
+#~ "IMMEDIATE ]\n"
+#~ "\n"
+#~ "index_parameters in UNIQUE and PRIMARY KEY constraints are:\n"
+#~ "\n"
+#~ "[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
+#~ "[ USING INDEX TABLESPACE tablespace ]"
+#~ msgstr ""
+#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tablo_adı ( [\n"
+#~ "  { kolon_adı veri_tipi [ DEFAULT default_expr ] [ kolon_kısıtlayıcısı "
+#~ "[ ... ] ]\n"
+#~ "    | tablo_kısıtlayıcısı\n"
+#~ "    | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | "
+#~ "CONSTRAINTS | INDEXES } ] ... }\n"
+#~ "    [, ... ]\n"
+#~ "] )\n"
+#~ "[ INHERITS ( parent_table [, ... ] ) ]\n"
+#~ "[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
+#~ "OIDS ]\n"
+#~ "[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
+#~ "[ TABLESPACE tablo_uzayı ]\n"
+#~ "\n"
+#~ "kolon_kısıtlayıcısı aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "im[ CONSTRAINT constraint_name ]\n"
+#~ "{ NOT NULL | \n"
+#~ "  NULL | \n"
+#~ "  UNIQUE index_parametreleri |\n"
+#~ "  PRIMARY KEY index_parametreleri |\n"
+#~ "  CHECK ( ifade ) |\n"
+#~ "  REFERENCES referans_tablosu [ ( referans_kolonu ) ] [ MATCH FULL | "
+#~ "MATCH PARTIAL | MATCH SIMPLE ]\n"
+#~ "    [ ON DELETE iÅŸlem ] [ ON UPDATE iÅŸlem ] }\n"
+#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
+#~ "IMMEDIATE ]\n"
+#~ "\n"
+#~ "ve tablo_kısıtlayıcısı aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "[ CONSTRAINT constraint_name ]\n"
+#~ "{ UNIQUE ( column_name [, ... ] ) index_parameters |\n"
+#~ "  PRIMARY KEY ( column_name [, ... ] ) index_parameters |\n"
+#~ "  CHECK ( expression ) |\n"
+#~ "  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "
+#~ "[, ... ] ) ]\n"
+#~ "    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] "
+#~ "[ ON UPDATE action ] }\n"
+#~ "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "
+#~ "IMMEDIATE ]\n"
+#~ "\n"
+#~ "UNIQUE ve PRIMARY KEY kısıtlamalarındaki index parametreleri "
+#~ "aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "[ WITH ( storage_parameter [= value] [, ... ] ) ]\n"
+#~ "[ USING INDEX TABLESPACE tablo_uzayı ]"
+
+#~ msgid ""
+#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name\n"
+#~ "    [ (column_name [, ...] ) ]\n"
+#~ "    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
+#~ "OIDS ]\n"
+#~ "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
+#~ "    [ TABLESPACE tablespace ]\n"
+#~ "    AS query\n"
+#~ "    [ WITH [ NO ] DATA ]"
+#~ msgstr ""
+#~ "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE tablo adı\n"
+#~ "    [ (kolon adı [, ...] ) ]\n"
+#~ "    [ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT "
+#~ "OIDS ]\n"
+#~ "    [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"
+#~ "    [ TABLESPACE tablespace ]\n"
+#~ "    AS sorgu\n"
+#~ "    [ WITH [ NO ] DATA ]"
+
+#~ msgid ""
+#~ "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
+#~ msgstr ""
+#~ "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
+
+#~ msgid ""
+#~ "CREATE TEXT SEARCH CONFIGURATION name (\n"
+#~ "    PARSER = parser_name |\n"
+#~ "    COPY = source_config\n"
+#~ ")"
+#~ msgstr ""
+#~ "CREATE TEXT SEARCH CONFIGURATION name (\n"
+#~ "    PARSER = parser_name |\n"
+#~ "    COPY = source_config\n"
+#~ ")"
+
+#~ msgid ""
+#~ "CREATE TEXT SEARCH DICTIONARY name (\n"
+#~ "    TEMPLATE = template\n"
+#~ "    [, option = value [, ... ]]\n"
+#~ ")"
+#~ msgstr ""
+#~ "CREATE TEXT SEARCH DICTIONARY ad (\n"
+#~ "    TEMPLATE = ÅŸablon\n"
+#~ "    [, option = value [, ... ]]\n"
+#~ ")"
+
+#~ msgid ""
+#~ "CREATE TEXT SEARCH PARSER name (\n"
+#~ "    START = start_function ,\n"
+#~ "    GETTOKEN = gettoken_function ,\n"
+#~ "    END = end_function ,\n"
+#~ "    LEXTYPES = lextypes_function\n"
+#~ "    [, HEADLINE = headline_function ]\n"
+#~ ")"
+#~ msgstr ""
+#~ "CREATE TEXT SEARCH PARSER name (\n"
+#~ "    START = start_function ,\n"
+#~ "    GETTOKEN = gettoken_function ,\n"
+#~ "    END = end_function ,\n"
+#~ "    LEXTYPES = lextypes_function\n"
+#~ "    [, HEADLINE = headline_function ]\n"
+#~ ")"
+
+#~ msgid ""
+#~ "CREATE TEXT SEARCH TEMPLATE name (\n"
+#~ "    [ INIT = init_function , ]\n"
+#~ "    LEXIZE = lexize_function\n"
+#~ ")"
+#~ msgstr ""
+#~ "CREATE TEXT SEARCH TEMPLATE ad (\n"
+#~ "    [ INIT = init_function , ]\n"
+#~ "    LEXIZE = lexize_function\n"
+#~ ")"
+
+#~ msgid ""
+#~ "CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
+#~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
+#~ "    EXECUTE PROCEDURE funcname ( arguments )"
+#~ msgstr ""
+#~ "CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
+#~ "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
+#~ "    EXECUTE PROCEDURE funcname ( arguments )"
+
+#~ msgid ""
+#~ "CREATE TYPE name AS\n"
+#~ "    ( attribute_name data_type [, ... ] )\n"
+#~ "\n"
+#~ "CREATE TYPE name AS ENUM\n"
+#~ "    ( 'label' [, ... ] )\n"
+#~ "\n"
+#~ "CREATE TYPE name (\n"
+#~ "    INPUT = input_function,\n"
+#~ "    OUTPUT = output_function\n"
+#~ "    [ , RECEIVE = receive_function ]\n"
+#~ "    [ , SEND = send_function ]\n"
+#~ "    [ , TYPMOD_IN = type_modifier_input_function ]\n"
+#~ "    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
+#~ "    [ , ANALYZE = analyze_function ]\n"
+#~ "    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
+#~ "    [ , PASSEDBYVALUE ]\n"
+#~ "    [ , ALIGNMENT = alignment ]\n"
+#~ "    [ , STORAGE = storage ]\n"
+#~ "    [ , LIKE = like_type ]\n"
+#~ "    [ , CATEGORY = category ]\n"
+#~ "    [ , PREFERRED = preferred ]\n"
+#~ "    [ , DEFAULT = default ]\n"
+#~ "    [ , ELEMENT = element ]\n"
+#~ "    [ , DELIMITER = delimiter ]\n"
+#~ ")\n"
+#~ "\n"
+#~ "CREATE TYPE name"
+#~ msgstr ""
+#~ "CREATE TYPE ad AS\n"
+#~ "    ( attribute_name veri tipi [, ... ] )\n"
+#~ "\n"
+#~ "CREATE TYPE ad AS ENUM\n"
+#~ "    ( 'label' [, ... ] )\n"
+#~ "\n"
+#~ "CREATE TYPE ad (\n"
+#~ "    INPUT = input_function,\n"
+#~ "    OUTPUT = output_function\n"
+#~ "    [ , RECEIVE = receive_function ]\n"
+#~ "    [ , SEND = send_function ]\n"
+#~ "    [ , TYPMOD_IN = type_modifier_input_function ]\n"
+#~ "    [ , TYPMOD_OUT = type_modifier_output_function ]\n"
+#~ "    [ , ANALYZE = analyze_function ]\n"
+#~ "    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"
+#~ "    [ , PASSEDBYVALUE ]\n"
+#~ "    [ , ALIGNMENT = alignment ]\n"
+#~ "    [ , STORAGE = storage ]\n"
+#~ "    [ , LIKE = like_type ]\n"
+#~ "    [ , CATEGORY = category ]\n"
+#~ "    [ , PREFERRED = preferred ]\n"
+#~ "    [ , DEFAULT = default ]\n"
+#~ "    [ , ELEMENT = element ]\n"
+#~ "    [ , DELIMITER = delimiter ]\n"
+#~ ")\n"
+#~ "\n"
+#~ "CREATE TYPE name"
+
+#~ msgid ""
+#~ "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "where option can be:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT connlimit\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "    | IN ROLE rolename [, ...]\n"
+#~ "    | IN GROUP rolename [, ...]\n"
+#~ "    | ROLE rolename [, ...]\n"
+#~ "    | ADMIN rolename [, ...]\n"
+#~ "    | USER rolename [, ...]\n"
+#~ "    | SYSID uid"
+#~ msgstr ""
+#~ "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
+#~ "\n"
+#~ "seçenek aşağıdakilerden birisi olabilir:\n"
+#~ "    \n"
+#~ "      SUPERUSER | NOSUPERUSER\n"
+#~ "    | CREATEDB | NOCREATEDB\n"
+#~ "    | CREATEROLE | NOCREATEROLE\n"
+#~ "    | CREATEUSER | NOCREATEUSER\n"
+#~ "    | INHERIT | NOINHERIT\n"
+#~ "    | LOGIN | NOLOGIN\n"
+#~ "    | CONNECTION LIMIT connlimit\n"
+#~ "    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
+#~ "    | VALID UNTIL 'timestamp' \n"
+#~ "    | IN ROLE rolename [, ...]\n"
+#~ "    | IN GROUP rolename [, ...]\n"
+#~ "    | ROLE rolename [, ...]\n"
+#~ "    | ADMIN rolename [, ...]\n"
+#~ "    | USER rolename [, ...]\n"
+#~ "    | SYSID uid"
+
+#~ msgid ""
+#~ "CREATE USER MAPPING FOR { username | USER | CURRENT_USER | PUBLIC }\n"
+#~ "    SERVER servername\n"
+#~ "    [ OPTIONS ( option 'value' [ , ... ] ) ]"
+#~ msgstr ""
+#~ "CREATE USER MAPPING FOR { kullanıcı adı | USER | CURRENT_USER | PUBLIC }\n"
+#~ "    SERVER sunucu adı\n"
+#~ "    [ OPTIONS ( seçenek 'değer' [ , ... ] ) ]"
+
+#~ msgid ""
+#~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
+#~ "[, ...] ) ]\n"
+#~ "    AS query"
+#~ msgstr ""
+#~ "CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] VIEW name [ ( column_name "
+#~ "[, ...] ) ]\n"
+#~ "    AS query"
+
+#~ msgid "DEALLOCATE [ PREPARE ] { name | ALL }"
+#~ msgstr "DEALLOCATE [ PREPARE ] { name | ALL }"
+
+#~ msgid ""
+#~ "DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
+#~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query"
+#~ msgstr ""
+#~ "DECLARE ad [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
+#~ "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR sorgu"
+
+#~ msgid ""
+#~ "DELETE FROM [ ONLY ] table [ [ AS ] alias ]\n"
+#~ "    [ USING usinglist ]\n"
+#~ "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
+#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
+#~ msgstr ""
+#~ "DELETE FROM [ ONLY ] tablo [ [ AS ] takma_adı ]\n"
+#~ "    [ USING usinglist ]\n"
+#~ "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
+#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
+
+#~ msgid "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
+#~ msgstr "DISCARD { ALL | PLANS | TEMPORARY | TEMP }"
+
+#~ msgid ""
+#~ "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | "
+#~ "RESTRICT ]"
+#~ msgstr ""
+#~ "DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | "
+#~ "RESTRICT ]"
+
+#~ msgid ""
+#~ "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP CAST [ IF EXISTS ] (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP CONVERSION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP CONVERSION [ IF EXISTS ] conversion_adı [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP DATABASE [ IF EXISTS ] name"
+#~ msgstr "DROP DATABASE [ IF EXISTS ] veritabanı_adı"
+
+#~ msgid "DROP DOMAIN [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP DOMAIN [ IF EXISTS ] adı [, ...] [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP FOREIGN DATA WRAPPER [ IF EXISTS ] ad [ CASCADE | RESTRICT ]"
+
+#~ msgid ""
+#~ "DROP FUNCTION [ IF EXISTS ] name ( [ [ argmode ] [ argname ] argtype "
+#~ "[, ...] ] )\n"
+#~ "    [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP FUNCTION [ IF EXISTS ] fonksiyon_adı ( [ [ argmode ] [ argname ] "
+#~ "argtype [, ...] ] )\n"
+#~ "    [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP GROUP [ IF EXISTS ] name [, ...]"
+#~ msgstr "DROP GROUP [ IF EXISTS ] name [, ...]"
+
+#~ msgid "DROP INDEX [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP INDEX [ IF EXISTS ] index_adı [, ...] [ CASCADE | RESTRICT ]"
+
+#~ msgid ""
+#~ "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] dil_adı [ CASCADE | RESTRICT ]"
+
+#~ msgid ""
+#~ "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
+#~ "NONE } ) [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP OPERATOR [ IF EXISTS ] name ( { lefttype | NONE } , { righttype | "
+#~ "NONE } ) [ CASCADE | RESTRICT ]"
+
+#~ msgid ""
+#~ "DROP OPERATOR CLASS [ IF EXISTS ] name USING index_method [ CASCADE | "
+#~ "RESTRICT ]"
+#~ msgstr ""
+#~ "DROP OPERATOR CLASS [ IF EXISTS ] ad USING index_method [ CASCADE | "
+#~ "RESTRICT ]"
+
+#~ msgid ""
+#~ "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
+#~ "RESTRICT ]"
+#~ msgstr ""
+#~ "DROP OPERATOR FAMILY [ IF EXISTS ] name USING index_method [ CASCADE | "
+#~ "RESTRICT ]"
+
+#~ msgid "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP OWNED BY name [, ...] [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP ROLE [ IF EXISTS ] name [, ...]"
+#~ msgstr "DROP ROLE [ IF EXISTS ] name [, ...]"
+
+#~ msgid "DROP RULE [ IF EXISTS ] name ON relation [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP RULE [ IF EXISTS ] rule_adı ON relation [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP SCHEMA [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP SCHEMA [ IF EXISTS ] şema_adı [, ...] [ CASCADE | RESTRICT ]"
+
+#~ msgid "DROP SEQUENCE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP SEQUENCE [ IF EXISTS ] sequence_adı [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:509
-msgid "cancel a transaction that was earlier prepared for two-phase commit"
-msgstr "daha önce two-phase commit için hazırlanmış transaction'u iptal et"
+#~ msgid "DROP SERVER [ IF EXISTS ] servername [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP SERVER [ IF EXISTS ] sunucu adı [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:510
-msgid "ROLLBACK PREPARED transaction_id"
-msgstr "ROLLBACK PREPARED transaction_id"
+#~ msgid "DROP TABLE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP TABLE [ IF EXISTS ] tablo_adı [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:513
-msgid "roll back to a savepoint"
-msgstr "savepoint'a rollback"
+#~ msgid "DROP TABLESPACE [ IF EXISTS ] tablespacename"
+#~ msgstr "DROP TABLESPACE [ IF EXISTS ] tablespace_adı"
 
-#: sql_help.h:514
-msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
-msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_adı"
+#~ msgid ""
+#~ "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:517
-msgid "define a new savepoint within the current transaction"
-msgstr "geerli transaction içinde savepoint tanımla"
+#~ msgid ""
+#~ "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:518
-msgid "SAVEPOINT savepoint_name"
-msgstr "SAVEPOINT savepoint_name"
+#~ msgid "DROP TEXT SEARCH PARSER [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP TEXT SEARCH PARSER [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:521
-#: sql_help.h:557
-#: sql_help.h:581
-msgid "retrieve rows from a table or view"
-msgstr "tablo ya da  view'dan satırları getir"
+#~ msgid "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] name [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] adı [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:522
-#: sql_help.h:558
-#: sql_help.h:582
-msgid ""
-"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ [ AS ] output_name ] [, ...]\n"
-"    [ FROM from_item [, ...] ]\n"
-"    [ WHERE condition ]\n"
-"    [ GROUP BY expression [, ...] ]\n"
-"    [ HAVING condition [, ...] ]\n"
-"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]\n"
-"\n"
-"where from_item can be one of:\n"
-"\n"
-"    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-"    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
-"    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-"    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias [, ...] | column_definition [, ...] ) ]\n"
-"    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"
-"    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING ( join_column [, ...] ) ]\n"
-"\n"
-"and with_query is:\n"
-"\n"
-"    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
-"\n"
-"TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
-msgstr ""
-"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ [ AS ] output_name ] [, ...]\n"
-"    [ FROM from_item [, ...] ]\n"
-"    [ WHERE condition ]\n"
-"    [ GROUP BY expression [, ...] ]\n"
-"    [ HAVING condition [, ...] ]\n"
-"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]\n"
-"\n"
-"where from_item can be one of:\n"
-"\n"
-"    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-"    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
-"    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
-"    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias [, ...] | column_definition [, ...] ) ]\n"
-"    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"
-"    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING ( join_column [, ...] ) ]\n"
-"\n"
-"and with_query is:\n"
-"\n"
-"    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
-"\n"
-"TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
+#~ msgid "DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "DROP TRIGGER [ IF EXISTS ] trigger_adı ON tablo_adı [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:526
-msgid ""
-"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ [ AS ] output_name ] [, ...]\n"
-"    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
-"    [ FROM from_item [, ...] ]\n"
-"    [ WHERE condition ]\n"
-"    [ GROUP BY expression [, ...] ]\n"
-"    [ HAVING condition [, ...] ]\n"
-"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
-msgstr ""
-"[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
-"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
-"    * | expression [ [ AS ] output_name ] [, ...]\n"
-"    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
-"    [ FROM from_item [, ...] ]\n"
-"    [ WHERE condition ]\n"
-"    [ GROUP BY expression [, ...] ]\n"
-"    [ HAVING condition [, ...] ]\n"
-"    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
-"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
-"    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST | LAST } ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
-"    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
-
-#: sql_help.h:529
-msgid "change a run-time parameter"
-msgstr "çalışma zamanı parametresini değiştir"
+#~ msgid "DROP TYPE [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP TYPE [ IF EXISTS ] tip_adı [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:530
-msgid ""
-"SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | 'value' | DEFAULT }\n"
-"SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
-msgstr ""
-"SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | 'value' | DEFAULT }\n"
-"SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
+#~ msgid "DROP USER [ IF EXISTS ] name [, ...]"
+#~ msgstr "DROP USER [ IF EXISTS ] name [, ...]"
 
-#: sql_help.h:533
-msgid "set constraint checking modes for the current transaction"
-msgstr "geçerli transaction için constraint doğrulama biçimini belirle"
+#~ msgid ""
+#~ "DROP USER MAPPING [ IF EXISTS ] FOR { username | USER | CURRENT_USER | "
+#~ "PUBLIC } SERVER servername"
+#~ msgstr ""
+#~ "DROP USER MAPPING [ IF EXISTS ] FOR { kullanıcı adı | USER | CURRENT_USER "
+#~ "| PUBLIC } SERVER sunucu adı"
 
-#: sql_help.h:534
-msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
-msgstr "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
+#~ msgid "DROP VIEW [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]"
+#~ msgstr "DROP VIEW [ IF EXISTS ] view_adı [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:537
-msgid "set the current user identifier of the current session"
-msgstr "geçerli oturumun geçerli kullanıcısını tanımla"
+#~ msgid "END [ WORK | TRANSACTION ]"
+#~ msgstr "END [ WORK | TRANSACTION ]"
 
-#: sql_help.h:538
-msgid ""
-"SET [ SESSION | LOCAL ] ROLE rolename\n"
-"SET [ SESSION | LOCAL ] ROLE NONE\n"
-"RESET ROLE"
-msgstr ""
-"SET [ SESSION | LOCAL ] ROLE rol_adı\n"
-"SET [ SESSION | LOCAL ] ROLE NONE\n"
-"RESET ROLE"
+#~ msgid "EXECUTE name [ ( parameter [, ...] ) ]"
+#~ msgstr "EXECUTE adı [ ( parameter [, ...] ) ]"
 
-#: sql_help.h:541
-msgid "set the session user identifier and the current user identifier of the current session"
-msgstr "ilk oturum ve geçerli oturum için kullanıcı tanımla"
+#~ msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
+#~ msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] ifade"
 
-#: sql_help.h:542
-msgid ""
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
-"RESET SESSION AUTHORIZATION"
-msgstr ""
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION kullanıcı_adı\n"
-"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
-"RESET SESSION AUTHORIZATION"
+#~ msgid ""
+#~ "FETCH [ direction { FROM | IN } ] cursorname\n"
+#~ "\n"
+#~ "where direction can be empty or one of:\n"
+#~ "\n"
+#~ "    NEXT\n"
+#~ "    PRIOR\n"
+#~ "    FIRST\n"
+#~ "    LAST\n"
+#~ "    ABSOLUTE count\n"
+#~ "    RELATIVE count\n"
+#~ "    count\n"
+#~ "    ALL\n"
+#~ "    FORWARD\n"
+#~ "    FORWARD count\n"
+#~ "    FORWARD ALL\n"
+#~ "    BACKWARD\n"
+#~ "    BACKWARD count\n"
+#~ "    BACKWARD ALL"
+#~ msgstr ""
+#~ "FETCH [ direction { FROM | IN } ] cursorname\n"
+#~ "\n"
+#~ "direction boş ya da aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    NEXT\n"
+#~ "    PRIOR\n"
+#~ "    FIRST\n"
+#~ "    LAST\n"
+#~ "    ABSOLUTE count\n"
+#~ "    RELATIVE count\n"
+#~ "    count\n"
+#~ "    ALL\n"
+#~ "    FORWARD\n"
+#~ "    FORWARD count\n"
+#~ "    FORWARD ALL\n"
+#~ "    BACKWARD\n"
+#~ "    BACKWARD count\n"
+#~ "    BACKWARD ALL"
 
-#: sql_help.h:545
-msgid "set the characteristics of the current transaction"
-msgstr "geçerli transcation'ın karakteristiklerini ayarla"
+#~ msgid ""
+#~ "GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+#~ "TRIGGER }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON [ TABLE ] tablename [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
+#~ "    ON [ TABLE ] tablename [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { USAGE | SELECT | UPDATE }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SEQUENCE sequencename [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
+#~ "[ PRIVILEGES ] }\n"
+#~ "    ON DATABASE dbname [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN SERVER servername [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
+#~ "[, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON LANGUAGE langname [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SCHEMA schemaname [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON TABLESPACE tablespacename [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT role [, ...] TO rolename [, ...] [ WITH ADMIN OPTION ]"
+#~ msgstr ""
+#~ "GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+#~ "TRIGGER }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON [ TABLE ] tablo adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( kolon [, ...] )\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] ( kolon [, ...] ) }\n"
+#~ "    ON [ TABLE ] tablo adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { USAGE | SELECT | UPDATE }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SEQUENCE sequence adı [, ...]\n"
+#~ "    TO { [ GROUP ] rolename | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
+#~ "[ PRIVILEGES ] }\n"
+#~ "    ON DATABASE veritabanı adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN DATA WRAPPER fdw adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN SERVER sunucu adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FUNCTION fonksiyon adı ( [ [ argüman modu ] [ argüman adı ] "
+#~ "argüman tipi [, ...] ] ) [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON LANGUAGE dil adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SCHEMA şema adı [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT { CREATE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON TABLESPACE tablespacename [, ...]\n"
+#~ "    TO { [ GROUP ] rol adı | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
+#~ "\n"
+#~ "GRANT role [, ...] TO rol adı [, ...] [ WITH ADMIN OPTION ]"
 
-#: sql_help.h:546
-msgid ""
-"SET TRANSACTION transaction_mode [, ...]\n"
-"SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
-"\n"
-"where transaction_mode is one of:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
-msgstr ""
-"SET TRANSACTION transaction_mode [, ...]\n"
-"SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
-"\n"
-"transaction_mode aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
+#~ msgid ""
+#~ "INSERT INTO table [ ( column [, ...] ) ]\n"
+#~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) "
+#~ "[, ...] | query }\n"
+#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
+#~ msgstr ""
+#~ "IINSERT INTO table [ ( column [, ...] ) ]\n"
+#~ "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) "
+#~ "[, ...] | query }\n"
+#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
 
-#: sql_help.h:549
-msgid "show the value of a run-time parameter"
-msgstr "çalıştırma zaman parametresinın değerini göster"
+#~ msgid "LISTEN name"
+#~ msgstr "LISTEN ad"
 
-#: sql_help.h:550
-msgid ""
-"SHOW name\n"
-"SHOW ALL"
-msgstr ""
-"SHOW name\n"
-"SHOW ALL"
+#~ msgid "LOAD 'filename'"
+#~ msgstr "LOAD 'dosya adı'"
 
-#: sql_help.h:554
-msgid ""
-"START TRANSACTION [ transaction_mode [, ...] ]\n"
-"\n"
-"where transaction_mode is one of:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
-msgstr ""
-"START TRANSACTION [ transaction_mode [, ...] ]\n"
-"\n"
-"transaction_mode aşağıdakilerden birisi olabilir:\n"
-"\n"
-"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ UNCOMMITTED }\n"
-"    READ WRITE | READ ONLY"
+#~ msgid ""
+#~ "LOCK [ TABLE ] [ ONLY ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
+#~ "\n"
+#~ "where lockmode is one of:\n"
+#~ "\n"
+#~ "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
+#~ "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
+#~ msgstr ""
+#~ "LOCK [ TABLE ] [ ONLY ] ad [, ...] [ IN kilit modu MODE ] [ NOWAIT ]\n"
+#~ "\n"
+#~ "kilit modu aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
+#~ "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 
-#: sql_help.h:561
-msgid "empty a table or set of tables"
-msgstr "bir veya birden fazla tabloyu kısalt"
+#~ msgid "MOVE [ direction { FROM | IN } ] cursorname"
+#~ msgstr "MOVE [ direction { FROM | IN } ] cursor_adı"
 
-#: sql_help.h:562
-msgid ""
-"TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
-"    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
-msgstr ""
-"TRUNCATE [ TABLE ] [ ONLY ] ad [, ... ]\n"
-"    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
+#~ msgid "NOTIFY name"
+#~ msgstr "NOTIFY ad"
 
-#: sql_help.h:565
-msgid "stop listening for a notification"
-msgstr "bildiriyi beklemeyi durdur"
+#~ msgid "PREPARE name [ ( datatype [, ...] ) ] AS statement"
+#~ msgstr "PREPARE adı [ ( veri_tipi [, ...] ) ] AS ifade"
 
-#: sql_help.h:566
-msgid "UNLISTEN { name | * }"
-msgstr "UNLISTEN { name | * }"
+#~ msgid "PREPARE TRANSACTION transaction_id"
+#~ msgstr "PREPARE TRANSACTION transaction_id"
 
-#: sql_help.h:569
-msgid "update rows of a table"
-msgstr "tablodaki satırları güncelle"
+#~ msgid "REASSIGN OWNED BY old_role [, ...] TO new_role"
+#~ msgstr "REASSIGN OWNED BY eski_rol [, ...] TO yeni_rol"
 
-#: sql_help.h:570
-msgid ""
-"UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
-"    SET { column = { expression | DEFAULT } |\n"
-"          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } [, ...]\n"
-"    [ FROM fromlist ]\n"
-"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-msgstr ""
-"UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
-"    SET { column = { expression | DEFAULT } |\n"
-"          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } [, ...]\n"
-"    [ FROM fromlist ]\n"
-"    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
-"    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
-
-#: sql_help.h:573
-msgid "garbage-collect and optionally analyze a database"
-msgstr "Veritabanındaki çöpleri-toparla ve veritabanını (tercihe başlı) analiz et"
+#~ msgid "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ]"
+#~ msgstr "REINDEX { INDEX | TABLE | DATABASE | SYSTEM } adı [ FORCE ]"
 
-#: sql_help.h:574
-msgid ""
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]"
-msgstr ""
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]"
+#~ msgid "RELEASE [ SAVEPOINT ] savepoint_name"
+#~ msgstr "RELEASE [ SAVEPOINT ] savepoint_adı"
 
-#: sql_help.h:577
-msgid "compute a set of rows"
-msgstr "compute a set of rows"
+#~ msgid ""
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+#~ "TRIGGER }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON [ TABLE ] tablename [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] ( column [, ...] ) }\n"
+#~ "    ON [ TABLE ] tablename [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { USAGE | SELECT | UPDATE }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SEQUENCE sequencename [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
+#~ "[ PRIVILEGES ] }\n"
+#~ "    ON DATABASE dbname [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN DATA WRAPPER fdwname [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN SERVER servername [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FUNCTION funcname ( [ [ argmode ] [ argname ] argtype [, ...] ] ) "
+#~ "[, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON LANGUAGE langname [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SCHEMA schemaname [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { CREATE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON TABLESPACE tablespacename [, ...]\n"
+#~ "    FROM { [ GROUP ] rolename | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ ADMIN OPTION FOR ]\n"
+#~ "    role [, ...] FROM rolename [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | "
+#~ "TRIGGER }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON [ TABLE ] tablo adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { SELECT | INSERT | UPDATE | REFERENCES } ( kolon [, ...] )\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] ( kolon [, ...] ) }\n"
+#~ "    ON [ TABLE ] tablo adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { USAGE | SELECT | UPDATE }\n"
+#~ "    [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SEQUENCE sequence adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { CREATE | CONNECT | TEMPORARY | TEMP } [,...] | ALL "
+#~ "[ PRIVILEGES ] }\n"
+#~ "    ON DATABASE veritabanı adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN DATA WRAPPER fdw adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı  | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FOREIGN SERVER sunucu adu [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { EXECUTE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON FUNCTION fonksiyon adı ( [ [ argüman modu ] [ argüman adı ] "
+#~ "argüman tipi [, ...] ] ) [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { USAGE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON LANGUAGE dil adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"
+#~ "    ON SCHEMA şema adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ GRANT OPTION FOR ]\n"
+#~ "    { CREATE | ALL [ PRIVILEGES ] }\n"
+#~ "    ON TABLESPACE tablespace adı [, ...]\n"
+#~ "    FROM { [ GROUP ] rol adı | PUBLIC } [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]\n"
+#~ "\n"
+#~ "REVOKE [ ADMIN OPTION FOR ]\n"
+#~ "    role [, ...] FROM rol adı [, ...]\n"
+#~ "    [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:578
-msgid ""
-"VALUES ( expression [, ...] ) [, ...]\n"
-"    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
-msgstr ""
-"VALUES ( expression [, ...] ) [, ...]\n"
-"    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
-"    [ LIMIT { count | ALL } ]\n"
-"    [ OFFSET start [ ROW | ROWS ] ]\n"
-"    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
+#~ msgid "ROLLBACK [ WORK | TRANSACTION ]"
+#~ msgstr "ROLLBACK [ WORK | TRANSACTION ]"
 
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "geçerli dizin tespit edilemedi: %s"
+#~ msgid "ROLLBACK PREPARED transaction_id"
+#~ msgstr "ROLLBACK PREPARED transaction_id"
 
-#: ../../port/exec.c:214
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "geçersiz ikili (binary) \"%s\""
+#~ msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
+#~ msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_adı"
 
-#: ../../port/exec.c:263
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "\"%s\" ikili (binary) dosyası okunamadı"
+#~ msgid ""
+#~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+#~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
+#~ "    * | expression [ [ AS ] output_name ] [, ...]\n"
+#~ "    [ FROM from_item [, ...] ]\n"
+#~ "    [ WHERE condition ]\n"
+#~ "    [ GROUP BY expression [, ...] ]\n"
+#~ "    [ HAVING condition [, ...] ]\n"
+#~ "    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
+#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST "
+#~ "| LAST } ] [, ...] ]\n"
+#~ "    [ LIMIT { count | ALL } ]\n"
+#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+#~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] "
+#~ "[...] ]\n"
+#~ "\n"
+#~ "where from_item can be one of:\n"
+#~ "\n"
+#~ "    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias "
+#~ "[, ...] ) ] ]\n"
+#~ "    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
+#~ "    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
+#~ "    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
+#~ "[, ...] | column_definition [, ...] ) ]\n"
+#~ "    function_name ( [ argument [, ...] ] ) AS ( column_definition "
+#~ "[, ...] )\n"
+#~ "    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
+#~ "( join_column [, ...] ) ]\n"
+#~ "\n"
+#~ "and with_query is:\n"
+#~ "\n"
+#~ "    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
+#~ "\n"
+#~ "TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
+#~ msgstr ""
+#~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+#~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
+#~ "    * | expression [ [ AS ] output_name ] [, ...]\n"
+#~ "    [ FROM from_item [, ...] ]\n"
+#~ "    [ WHERE condition ]\n"
+#~ "    [ GROUP BY expression [, ...] ]\n"
+#~ "    [ HAVING condition [, ...] ]\n"
+#~ "    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
+#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST "
+#~ "| LAST } ] [, ...] ]\n"
+#~ "    [ LIMIT { count | ALL } ]\n"
+#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+#~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] "
+#~ "[...] ]\n"
+#~ "\n"
+#~ "where from_item can be one of:\n"
+#~ "\n"
+#~ "    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias "
+#~ "[, ...] ) ] ]\n"
+#~ "    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"
+#~ "    with_query_name [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"
+#~ "    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "
+#~ "[, ...] | column_definition [, ...] ) ]\n"
+#~ "    function_name ( [ argument [, ...] ] ) AS ( column_definition "
+#~ "[, ...] )\n"
+#~ "    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
+#~ "( join_column [, ...] ) ]\n"
+#~ "\n"
+#~ "and with_query is:\n"
+#~ "\n"
+#~ "    with_query_name [ ( column_name [, ...] ) ] AS ( select )\n"
+#~ "\n"
+#~ "TABLE { [ ONLY ] table_name [ * ] | with_query_name }"
 
-#: ../../port/exec.c:270
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "\"%s\"  çalıştırmak için bulunamadı"
+#~ msgid ""
+#~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+#~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
+#~ "    * | expression [ [ AS ] output_name ] [, ...]\n"
+#~ "    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
+#~ "    [ FROM from_item [, ...] ]\n"
+#~ "    [ WHERE condition ]\n"
+#~ "    [ GROUP BY expression [, ...] ]\n"
+#~ "    [ HAVING condition [, ...] ]\n"
+#~ "    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
+#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST "
+#~ "| LAST } ] [, ...] ]\n"
+#~ "    [ LIMIT { count | ALL } ]\n"
+#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+#~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
+#~ msgstr ""
+#~ "[ WITH [ RECURSIVE ] with_query [, ...] ]\n"
+#~ "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
+#~ "    * | expression [ [ AS ] output_name ] [, ...]\n"
+#~ "    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"
+#~ "    [ FROM from_item [, ...] ]\n"
+#~ "    [ WHERE condition ]\n"
+#~ "    [ GROUP BY expression [, ...] ]\n"
+#~ "    [ HAVING condition [, ...] ]\n"
+#~ "    [ WINDOW window_name AS ( window_definition ) [, ...] ]\n"
+#~ "    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"
+#~ "    [ ORDER BY expression [ ASC | DESC | USING operator ] [ NULLS { FIRST "
+#~ "| LAST } ] [, ...] ]\n"
+#~ "    [ LIMIT { count | ALL } ]\n"
+#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]\n"
+#~ "    [ FOR { UPDATE | SHARE } [ OF table_name [, ...] ] [ NOWAIT ] [...] ]"
 
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
+#~ msgid ""
+#~ "SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | "
+#~ "'value' | DEFAULT }\n"
+#~ "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
+#~ msgstr ""
+#~ "SET [ SESSION | LOCAL ] configuration_parameter { TO | = } { value | "
+#~ "'value' | DEFAULT }\n"
+#~ "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
 
-#: ../../port/exec.c:340
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "symbolic link \"%s\" okuma hatası"
+#~ msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
+#~ msgstr "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
 
-#: ../../port/exec.c:586
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
+#~ msgid ""
+#~ "SET [ SESSION | LOCAL ] ROLE rolename\n"
+#~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
+#~ "RESET ROLE"
+#~ msgstr ""
+#~ "SET [ SESSION | LOCAL ] ROLE rol_adı\n"
+#~ "SET [ SESSION | LOCAL ] ROLE NONE\n"
+#~ "RESET ROLE"
 
-#: ../../port/exec.c:590
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
+#~ msgid ""
+#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
+#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
+#~ "RESET SESSION AUTHORIZATION"
+#~ msgstr ""
+#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION kullanıcı_adı\n"
+#~ "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
+#~ "RESET SESSION AUTHORIZATION"
 
-#: ../../port/exec.c:599
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
+#~ msgid ""
+#~ "SET TRANSACTION transaction_mode [, ...]\n"
+#~ "SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
+#~ "\n"
+#~ "where transaction_mode is one of:\n"
+#~ "\n"
+#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
+#~ "READ UNCOMMITTED }\n"
+#~ "    READ WRITE | READ ONLY"
+#~ msgstr ""
+#~ "SET TRANSACTION transaction_mode [, ...]\n"
+#~ "SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
+#~ "\n"
+#~ "transaction_mode aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
+#~ "READ UNCOMMITTED }\n"
+#~ "    READ WRITE | READ ONLY"
 
-#: ../../port/exec.c:602
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
+#~ msgid ""
+#~ "SHOW name\n"
+#~ "SHOW ALL"
+#~ msgstr ""
+#~ "SHOW name\n"
+#~ "SHOW ALL"
 
-#: ../../port/exec.c:606
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
+#~ msgid ""
+#~ "START TRANSACTION [ transaction_mode [, ...] ]\n"
+#~ "\n"
+#~ "where transaction_mode is one of:\n"
+#~ "\n"
+#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
+#~ "READ UNCOMMITTED }\n"
+#~ "    READ WRITE | READ ONLY"
+#~ msgstr ""
+#~ "START TRANSACTION [ transaction_mode [, ...] ]\n"
+#~ "\n"
+#~ "transaction_mode aşağıdakilerden birisi olabilir:\n"
+#~ "\n"
+#~ "    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | "
+#~ "READ UNCOMMITTED }\n"
+#~ "    READ WRITE | READ ONLY"
+
+#~ msgid ""
+#~ "TRUNCATE [ TABLE ] [ ONLY ] name [, ... ]\n"
+#~ "    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
+#~ msgstr ""
+#~ "TRUNCATE [ TABLE ] [ ONLY ] ad [, ... ]\n"
+#~ "    [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]"
+
+#~ msgid "UNLISTEN { name | * }"
+#~ msgstr "UNLISTEN { name | * }"
+
+#~ msgid ""
+#~ "UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
+#~ "    SET { column = { expression | DEFAULT } |\n"
+#~ "          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } "
+#~ "[, ...]\n"
+#~ "    [ FROM fromlist ]\n"
+#~ "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
+#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
+#~ msgstr ""
+#~ "UPDATE [ ONLY ] table [ [ AS ] alias ]\n"
+#~ "    SET { column = { expression | DEFAULT } |\n"
+#~ "          ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } "
+#~ "[, ...]\n"
+#~ "    [ FROM fromlist ]\n"
+#~ "    [ WHERE condition | WHERE CURRENT OF cursor_name ]\n"
+#~ "    [ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]"
+
+#~ msgid ""
+#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
+#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
+#~ "[, ...] ) ] ]"
+#~ msgstr ""
+#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
+#~ "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
+#~ "[, ...] ) ] ]"
+
+#~ msgid ""
+#~ "VALUES ( expression [, ...] ) [, ...]\n"
+#~ "    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
+#~ "    [ LIMIT { count | ALL } ]\n"
+#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
+#~ msgstr ""
+#~ "VALUES ( expression [, ...] ) [, ...]\n"
+#~ "    [ ORDER BY sort_expression [ ASC | DESC | USING operator ] [, ...] ]\n"
+#~ "    [ LIMIT { count | ALL } ]\n"
+#~ "    [ OFFSET start [ ROW | ROWS ] ]\n"
+#~ "    [ FETCH { FIRST | NEXT } [ count ] { ROW | ROWS } ONLY ]"
+
+#~ msgid "  \"%s\" IN %s %s"
+#~ msgstr "  \"%s\",  %s %s içinde"
 
 #~ msgid "(1 row)"
+
 #~ msgid_plural "(%lu rows)"
 #~ msgstr[0] "(%lu satır)"
 #~ msgstr[1] "(1 satır)"
+
 #~ msgid "Usage:"
 #~ msgstr "Kullanımı:"
+
 #~ msgid "General options:"
 #~ msgstr "Genel tercihler:"
+
 #~ msgid "  -1 (\"one\")      execute command file as a single transaction"
 #~ msgstr "  -1 (rakamla bir)      komutu tek bir transaction olarak iÅŸle"
+
 #~ msgid "  --help          show this help, then exit"
 #~ msgstr "  --help          yardım metnini göster ve çık"
+
 #~ msgid "  --version       output version information, then exit"
 #~ msgstr "  --version       sürüm bilgisini göster ve çık"
+
 #~ msgid "  -t              print rows only (-P tuples_only)"
 #~ msgstr "  -t              sadece satırları göster (-P tuples_only)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Connection options:"
 #~ msgstr ""
 #~ "\n"
 #~ "Bağlantı tercihleri:"
+
 #~ msgid ""
 #~ "  -W              force password prompt (should happen automatically)"
 #~ msgstr "  -W              şifre sorulmasını sağla (otomatik olarak olmalı)"
+
 #~ msgid ""
 #~ "  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 #~ "                 list tables/indexes/sequences/views/system tables\n"
@@ -4772,57 +7127,69 @@ msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
 #~ "  \\d{t|i|s|v|S} [PATTERN] (daha fazla ayrıntı için \"+\" ekleyin)\n"
 #~ "                 tablolar/indeksler/sequenceler/viewlar/system "
 #~ "tablolarını listele\n"
+
 #~ msgid "  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\db [PATTERN]  tablespaceleri listele (daha fazla ayrıntı için \"+\" "
 #~ "ekleyin)\n"
+
 #~ msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\df [PATTERN]  fonksiyonları göster (daha fazla ayrıntı için \"+\" "
 #~ "ekleyin)\n"
+
 #~ msgid ""
 #~ "  \\dFd [PATTERN] list text search dictionaries (add \"+\" for more "
 #~ "detail)\n"
 #~ msgstr ""
 #~ "  \\dFd [PATTERN]  metin arama sözlüklerini listele (daha fazla ayrıntı "
 #~ "için \"+\" ekleyin)\n"
+
 #~ msgid ""
 #~ "  \\dFp [PATTERN] list text search parsers (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\dFp [PATTERN] metin arama ayrıştırıcılarını listele (daha fazla "
 #~ "ayrıntı için \"+\" ekleyin)\n"
+
 #~ msgid "  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\dn [PATTERN]  şemaları göster (daha fazla ayrıntı için \"+\" "
 #~ "ekleyin)\n"
+
 #~ msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\dT [PATTERN]  veri tipleri listele (daha fazla ayrıntı için \"+\" "
 #~ "ekleyin)\n"
+
 #~ msgid "  \\l             list all databases (add \"+\" for more detail)\n"
 #~ msgstr ""
 #~ "  \\l             tüm veritabanlarını listele (daha fazla ayrıntı için \"+"
 #~ "\" ekleyin)\n"
+
 #~ msgid ""
 #~ "  \\z [PATTERN]   list table, view, and sequence access privileges (same "
 #~ "as \\dp)\n"
 #~ msgstr ""
 #~ "  \\z [PATTERN]   tablo, view, ve sequence erişim haklarını listele (\\dp "
 #~ "ile aynı)\n"
+
 #~ msgid "Copy, Large Object\n"
 #~ msgstr "Copy, Large Object\n"
+
 #~ msgid ""
 #~ "Welcome to %s %s (server %s), the PostgreSQL interactive terminal.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "PostgreSQL etkilişimli arayüzü %s %s(server %s).\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "PostgreSQL etkilişimli arayüzü %s %s.\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "WARNING:  You are connected to a server with major version %d.%d,\n"
 #~ "but your %s client is major version %d.%d.  Some backslash commands,\n"
@@ -4833,18 +7200,21 @@ msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
 #~ "ancak %s istemcinizin sürümü %d.%d. \\d gibi bazı backslash ile başlayan "
 #~ "komutlar düzgün çalışmayabilir\n"
 #~ "\n"
+
 #~ msgid "Access privileges for database \"%s\""
 #~ msgstr "\"%s\" veritabanının erişim hakları"
+
 #~ msgid "?%c? \"%s.%s\""
 #~ msgstr "?%c? \"%s.%s\""
+
 #~ msgid "    \"%s\""
 #~ msgstr "    \"%s\""
-#~ msgid "no limit"
-#~ msgstr "sınırsız"
+
 #~ msgid "ALTER VIEW name RENAME TO newname"
 #~ msgstr "ALTER VIEW view_adı RENAME TO yeni_ad"
+
 #~ msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 #~ msgstr "%s: Uyarı: -u parametresi kullanımdan kalkmıştır. -U kullanın.\n"
+
 #~ msgid "(binary compatible)"
 #~ msgstr "(ikili (binary) uyumlu)"
-
diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index dfc6648e56942..1d4e7f11e99db 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -722,6 +722,23 @@ other			.
 					escape_variable(true);
 				}
 
+	/*
+	 * These rules just avoid the need for scanner backup if one of the
+	 * two rules above fails to match completely.
+	 */
+
+:'[A-Za-z0-9_]*	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					ECHO;
+				}
+
+:\"[A-Za-z0-9_]*	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					ECHO;
+				}
+
 	/*
 	 * Back to backend-compatible rules.
 	 */
@@ -912,7 +929,7 @@ other			.
 					}
 				}
 
-:[A-Za-z0-9_]*	{
+:[A-Za-z0-9_]+	{
 					/* Possible psql variable substitution */
 					if (option_type == OT_VERBATIM)
 						ECHO;
@@ -959,6 +976,20 @@ other			.
 					}
 				}
 
+:'[A-Za-z0-9_]*	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					ECHO;
+					BEGIN(xslashdefaultarg);
+				}
+
+:\"[A-Za-z0-9_]*	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					ECHO;
+					BEGIN(xslashdefaultarg);
+				}
+
 "|"				{
 					ECHO;
 					if (option_type == OT_FILEPIPE)
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index 7228f9d0eead7..0d5c1fbf3d991 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -18,8 +18,10 @@
 
 #if defined(WIN32) || defined(__CYGWIN__)
 #define DEFAULT_EDITOR	"notepad.exe"
+/* no DEFAULT_EDITOR_LINENUMBER_ARG for Notepad */
 #else
 #define DEFAULT_EDITOR	"vi"
+#define DEFAULT_EDITOR_LINENUMBER_ARG "+"
 #endif
 
 #define DEFAULT_PROMPT1 "%/%R%# "
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 9a7eca0766101..a5a035fcc5929 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -369,11 +369,11 @@ static const SchemaQuery Query_for_list_of_updatables = {
 	NULL
 };
 
-static const SchemaQuery Query_for_list_of_tisvf = {
+static const SchemaQuery Query_for_list_of_relations = {
 	/* catname */
 	"pg_catalog.pg_class c",
 	/* selcondition */
-	"c.relkind IN ('r', 'i', 'S', 'v', 'f')",
+	NULL,
 	/* viscondition */
 	"pg_catalog.pg_table_is_visible(c.oid)",
 	/* namespace */
@@ -755,7 +755,7 @@ psql_completion(char *text, int start, int end)
 	completion_info_charp2 = NULL;
 
 	/*
-	 * Scan the input line before our current position for the last five
+	 * Scan the input line before our current position for the last six
 	 * words. According to those we'll make some smart decisions on what the
 	 * user is probably intending to type. TODO: Use strtokx() to do this.
 	 */
@@ -1553,9 +1553,10 @@ psql_completion(char *text, int start, int end)
 			 pg_strcasecmp(prev_wd, "ON") == 0)
 	{
 		static const char *const list_COMMENT[] =
-		{"CAST", "COLLATION", "CONVERSION", "DATABASE", "FOREIGN DATA WRAPPER",
-			"SERVER", "FOREIGN TABLE", "INDEX", "LANGUAGE", "RULE", "SCHEMA",
-			"SEQUENCE", "TABLE", "TYPE", "VIEW", "COLUMN", "AGGREGATE", "FUNCTION",
+		{"CAST", "COLLATION", "CONVERSION", "DATABASE", "EXTENSION",
+			"FOREIGN DATA WRAPPER", "FOREIGN TABLE",
+			"SERVER", "INDEX", "LANGUAGE", "RULE", "SCHEMA", "SEQUENCE",
+			"TABLE", "TYPE", "VIEW", "COLUMN", "AGGREGATE", "FUNCTION",
 			"OPERATOR", "TRIGGER", "CONSTRAINT", "DOMAIN", "LARGE OBJECT",
 		"TABLESPACE", "TEXT SEARCH", "ROLE", NULL};
 
@@ -1582,11 +1583,10 @@ psql_completion(char *text, int start, int end)
 	}
 	else if ((pg_strcasecmp(prev4_wd, "COMMENT") == 0 &&
 			  pg_strcasecmp(prev3_wd, "ON") == 0) ||
+			 (pg_strcasecmp(prev5_wd, "COMMENT") == 0 &&
+			  pg_strcasecmp(prev4_wd, "ON") == 0) ||
 			 (pg_strcasecmp(prev6_wd, "COMMENT") == 0 &&
-			  pg_strcasecmp(prev5_wd, "ON") == 0) ||
-			 (pg_strcasecmp(prev5_wd, "ON") == 0 &&
-			  pg_strcasecmp(prev4_wd, "TEXT") == 0 &&
-			  pg_strcasecmp(prev3_wd, "SEARCH") == 0))
+			  pg_strcasecmp(prev5_wd, "ON") == 0))
 		COMPLETE_WITH_CONST("IS");
 
 /* COPY */
@@ -2826,7 +2826,7 @@ psql_completion(char *text, int start, int end)
 
 	/* must be at end of \d list */
 	else if (strncmp(prev_wd, "\\d", strlen("\\d")) == 0)
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tisvf, NULL);
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_relations, NULL);
 
 	else if (strcmp(prev_wd, "\\ef") == 0)
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_functions, NULL);
@@ -2922,6 +2922,7 @@ psql_completion(char *text, int start, int end)
 	free(prev3_wd);
 	free(prev4_wd);
 	free(prev5_wd);
+	free(prev6_wd);
 
 	/* Return our Grand List O' Matches */
 	return matches;
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index c882123dd1959..9a7cc2c264cc6 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -289,10 +289,9 @@ yesno_prompt(const char *question)
 {
 	char		prompt[256];
 
-	/*
-	 * translator: This is a question followed by the translated options for
-	 * "yes" and "no".
-	 */
+	/*------
+	   translator: This is a question followed by the translated options for
+	   "yes" and "no". */
 	snprintf(prompt, sizeof(prompt), _("%s (%s/%s) "),
 			 _(question), _(PG_YESLETTER), _(PG_NOLETTER));
 
@@ -378,7 +377,7 @@ ResetCancelConn(void)
 
 #ifndef WIN32
 /*
- * Handle interrupt signals by cancelling the current command,
+ * Handle interrupt signals by canceling the current command,
  * if it's being executed through executeMaintenanceCommand(),
  * and thus has a cancelConn set.
  */
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index 2ae7bfa27e409..6bbf1f51b308f 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,6 +1,6 @@
 # src/bin/scripts/nls.mk
 CATALOG_NAME    := pgscripts
-AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ro sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES := cs de es fr it ja ko pl pt_BR ro sv ta tr zh_CN zh_TW
 GETTEXT_FILES   := createdb.c createlang.c createuser.c \
                    dropdb.c droplang.c dropuser.c \
                    clusterdb.c vacuumdb.c reindexdb.c \
diff --git a/src/bin/scripts/po/cs.po b/src/bin/scripts/po/cs.po
index 38d1098a920d7..c6529cd973820 100644
--- a/src/bin/scripts/po/cs.po
+++ b/src/bin/scripts/po/cs.po
@@ -1,35 +1,36 @@
 # translation of pgscripts-cs.po to Czech
 # Czech translation of pg_scripts messages.
 #
-# pgtranslation Id: pgscripts.po,v 1.3 2009/10/14 21:08:40 petere Exp $
-# Karel Žák, 2001-2003, 2004.
-# Zdeněk Kotala, 2009.
+# pgtranslation Id: pgscripts.po,v 1.4 2011/09/03 14:06:12 petere Exp $
 #
+# Karel Žák, 2001-2003, 2004.
+# Zdeněk Kotala, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: postgresql-8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-06 23:08+0000\n"
-"PO-Revision-Date: 2009-07-06 14:09+0200\n"
-"Last-Translator: Zdeněk Kotala\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-08-30 11:35+0200\n"
+"PO-Revision-Date: 2011-08-30 13:40+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: createdb.c:114 createdb.c:133 createlang.c:89 createlang.c:110
 #: createlang.c:163 createuser.c:149 createuser.c:164 dropdb.c:83 dropdb.c:92
-#: dropdb.c:100 droplang.c:100 droplang.c:121 droplang.c:175 dropuser.c:83
-#: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:121 vacuumdb.c:136
+#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:163 dropuser.c:83
+#: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:127 vacuumdb.c:142
 #: reindexdb.c:114 reindexdb.c:128
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Zkuste \"%s --help\" pro více informací.\n"
 
-#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:119
-#: dropuser.c:96 clusterdb.c:117 vacuumdb.c:134 reindexdb.c:127
+#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:107
+#: dropuser.c:96 clusterdb.c:117 vacuumdb.c:140 reindexdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: příliš mnoho parametrů příkazové řádky (první je \"%s\")\n"
@@ -49,17 +50,17 @@ msgstr "%s: --locale a --lc-collate nelze zvolit sou�asně\n"
 msgid "%s: \"%s\" is not a valid encoding name\n"
 msgstr "%s: \"%s\" není platné jméno kódování znaků\n"
 
-#: createdb.c:204
+#: createdb.c:209
 #, c-format
 msgid "%s: database creation failed: %s"
 msgstr "%s: vytvoření databáze selhalo: %s"
 
-#: createdb.c:227
+#: createdb.c:229
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: tvorba komentáře selhala (databáze byla vytvořena): %s"
 
-#: createdb.c:244
+#: createdb.c:247
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -68,20 +69,20 @@ msgstr ""
 "%s vytvoří PostgreSQL databázi.\n"
 "\n"
 
-#: createdb.c:245 createlang.c:215 createuser.c:300 dropdb.c:140
-#: droplang.c:332 dropuser.c:139 clusterdb.c:236 vacuumdb.c:262
+#: createdb.c:248 createlang.c:223 createuser.c:300 dropdb.c:144
+#: droplang.c:224 dropuser.c:139 clusterdb.c:236 vacuumdb.c:328
 #: reindexdb.c:313
 #, c-format
 msgid "Usage:\n"
 msgstr "Použití:\n"
 
-#: createdb.c:246
+#: createdb.c:249
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [PŘEP�NAČ]... [DATAB�ZE] [POPIS]\n"
 
-#: createdb.c:247 createlang.c:217 createuser.c:302 dropdb.c:142
-#: droplang.c:334 dropuser.c:141 clusterdb.c:238 vacuumdb.c:264
+#: createdb.c:250 createlang.c:225 createuser.c:302 dropdb.c:146
+#: droplang.c:226 dropuser.c:141 clusterdb.c:238 vacuumdb.c:330
 #: reindexdb.c:315
 #, c-format
 msgid ""
@@ -91,61 +92,61 @@ msgstr ""
 "\n"
 "Přepína�e:\n"
 
-#: createdb.c:248
+#: createdb.c:251
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr "  -D, --tablespace=PROSTOR     výchozí prostor tabulek pro databázi\n"
 
-#: createdb.c:249
+#: createdb.c:252
 #, c-format
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
 msgstr "  -e, --echo                   ukázat příkazy posílané na server\n"
 
-#: createdb.c:250
+#: createdb.c:253
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=KÓDOV�N�      kódování znaků databáze\n"
 
-#: createdb.c:251
+#: createdb.c:254
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr "  -l, --locale=LOCALE          nastavení locale pro databázi\n"
 
-#: createdb.c:252
+#: createdb.c:255
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
 msgstr "      --lc-collate=LOCALE      nastavení LC_COLLATE pro databázi\n"
 
-#: createdb.c:253
+#: createdb.c:256
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
 msgstr "      --lc-ctype=LOCALE        nastavení LC_CTYPE pro databázi\n"
 
-#: createdb.c:254
+#: createdb.c:257
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr ""
 "  -O, --owner=VLASTN�K         uživatel, který má být vlastníkem nové "
 "databáze\n"
 
-#: createdb.c:255
+#: createdb.c:258
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=ŠABLONA       šablona databáze ke kopírování\n"
 
-#: createdb.c:256
+#: createdb.c:259
 #, c-format
 msgid "  --help                       show this help, then exit\n"
 msgstr "  --help                       ukáže tento text a skon�í\n"
 
-#: createdb.c:257
+#: createdb.c:260
 #, c-format
 msgid "  --version                    output version information, then exit\n"
 msgstr "  --version                    ukáže informace o verzi a skon�í\n"
 
-#: createdb.c:258 createlang.c:223 createuser.c:321 dropdb.c:147
-#: droplang.c:340 dropuser.c:146 clusterdb.c:247 vacuumdb.c:276
+#: createdb.c:261 createlang.c:231 createuser.c:321 dropdb.c:151
+#: droplang.c:232 dropuser.c:146 clusterdb.c:247 vacuumdb.c:343
 #: reindexdb.c:325
 #, c-format
 msgid ""
@@ -155,7 +156,7 @@ msgstr ""
 "\n"
 "Parametry spojení:\n"
 
-#: createdb.c:259
+#: createdb.c:262
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
@@ -163,28 +164,28 @@ msgstr ""
 "  -h, --host=HOSTNAME          jméno databázového serveru nebo adresáře se "
 "soketem\n"
 
-#: createdb.c:260
+#: createdb.c:263
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT              port databázového serveru\n"
 
-#: createdb.c:261
+#: createdb.c:264
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr ""
 "  -U, --username=UŽIVATEL      jméno uživatele pro spojení se serverem\n"
 
-#: createdb.c:262
+#: createdb.c:265
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password            neptá se na heslo\n"
 
-#: createdb.c:263
-#,  c-format
+#: createdb.c:266
+#, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password               vynutí dotaz na heslo\n"
 
-#: createdb.c:264
+#: createdb.c:267
 #, c-format
 msgid ""
 "\n"
@@ -194,8 +195,8 @@ msgstr ""
 "Implicitně je vytvořena databáze stejného jména jako je jméno aktuálního "
 "uživatele.\n"
 
-#: createdb.c:265 createlang.c:229 createuser.c:329 dropdb.c:153
-#: droplang.c:346 dropuser.c:152 clusterdb.c:254 vacuumdb.c:283
+#: createdb.c:268 createlang.c:237 createuser.c:329 dropdb.c:157
+#: droplang.c:238 dropuser.c:152 clusterdb.c:254 vacuumdb.c:350
 #: reindexdb.c:332
 #, c-format
 msgid ""
@@ -205,27 +206,27 @@ msgstr ""
 "\n"
 "Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:140 droplang.c:151
+#: createlang.c:140 droplang.c:139
 msgid "Name"
 msgstr "Jméno"
 
-#: createlang.c:141 droplang.c:152
+#: createlang.c:141 droplang.c:140
 msgid "yes"
 msgstr "ano"
 
-#: createlang.c:141 droplang.c:152
+#: createlang.c:141 droplang.c:140
 msgid "no"
 msgstr "ne"
 
-#: createlang.c:142 droplang.c:153
+#: createlang.c:142 droplang.c:141
 msgid "Trusted?"
 msgstr "Důvěryhodný?"
 
-#: createlang.c:151 droplang.c:162
+#: createlang.c:151 droplang.c:150
 msgid "Procedural Languages"
 msgstr "Procedurální jazyky"
 
-#: createlang.c:162 droplang.c:173
+#: createlang.c:162 droplang.c:161
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: chybí povinný parametr jméno jazyka\n"
@@ -235,12 +236,12 @@ msgstr "%s: chybí povinný parametr jméno jazyka\n"
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: jazyk \"%s\" je již v databázi \"%s\" instalován\n"
 
-#: createlang.c:198
+#: createlang.c:206
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: instalace jazyka selhala: %s"
 
-#: createlang.c:214
+#: createlang.c:222
 #, c-format
 msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
@@ -249,69 +250,69 @@ msgstr ""
 "%s instaluje procedurální jazyk do PostgreSQL databáze.\n"
 "\n"
 
-#: createlang.c:216 droplang.c:333
+#: createlang.c:224 droplang.c:225
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "  %s [PŘEP�NAČ]... JAZYK [DATAB�ZE]\n"
 
-#: createlang.c:218
+#: createlang.c:226
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DATAB�ZE      databáze do které bude jazyk instalován\n"
 
-#: createlang.c:219 createuser.c:306 dropdb.c:143 droplang.c:336
+#: createlang.c:227 createuser.c:306 dropdb.c:147 droplang.c:228
 #: dropuser.c:142 clusterdb.c:241 reindexdb.c:318
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                ukazovat příkazy posílané na server\n"
 
-#: createlang.c:220 droplang.c:337
+#: createlang.c:228 droplang.c:229
 #, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
 msgstr "  -l, --list                ukáže seznam již nainstalovaných jazyků\n"
 
-#: createlang.c:221 createuser.c:319 dropdb.c:145 droplang.c:338
+#: createlang.c:229 createuser.c:319 dropdb.c:149 droplang.c:230
 #: dropuser.c:144 clusterdb.c:245 reindexdb.c:323
 #, c-format
 msgid "  --help                    show this help, then exit\n"
 msgstr "  --help                    ukáže tuto nápovědu a skon�í\n"
 
-#: createlang.c:222 createuser.c:320 dropdb.c:146 droplang.c:339
+#: createlang.c:230 createuser.c:320 dropdb.c:150 droplang.c:231
 #: dropuser.c:145 clusterdb.c:246 reindexdb.c:324
 #, c-format
 msgid "  --version                 output version information, then exit\n"
 msgstr "  --version                 ukáže informaci o verzi a skon�í\n"
 
-#: createlang.c:224 createuser.c:322 dropdb.c:148 droplang.c:341
-#: dropuser.c:147 clusterdb.c:248 vacuumdb.c:277 reindexdb.c:326
+#: createlang.c:232 createuser.c:322 dropdb.c:152 droplang.c:233
+#: dropuser.c:147 clusterdb.c:248 vacuumdb.c:344 reindexdb.c:326
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
 "  -h, --host=HOSTNAME       jméno databázového serveru nebo adresáře se "
 "soketem\n"
 
-#: createlang.c:225 createuser.c:323 dropdb.c:149 droplang.c:342
-#: dropuser.c:148 clusterdb.c:249 vacuumdb.c:278 reindexdb.c:327
+#: createlang.c:233 createuser.c:323 dropdb.c:153 droplang.c:234
+#: dropuser.c:148 clusterdb.c:249 vacuumdb.c:345 reindexdb.c:327
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT          port databázového serveru\n"
 
-#: createlang.c:226 dropdb.c:150 droplang.c:343 clusterdb.c:250 vacuumdb.c:279
+#: createlang.c:234 dropdb.c:154 droplang.c:235 clusterdb.c:250 vacuumdb.c:346
 #: reindexdb.c:328
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=UŽIVATEL   jméno uživatele pro spojení se serverem\n"
 
-#: createlang.c:227 createuser.c:325 dropdb.c:151 droplang.c:344
-#: dropuser.c:150 clusterdb.c:251 vacuumdb.c:280 reindexdb.c:329
+#: createlang.c:235 createuser.c:325 dropdb.c:155 droplang.c:236
+#: dropuser.c:150 clusterdb.c:251 vacuumdb.c:347 reindexdb.c:329
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         neptá se na heslo\n"
 
-#: createlang.c:228 createuser.c:326 dropdb.c:152 droplang.c:345
-#: dropuser.c:151 clusterdb.c:252 vacuumdb.c:281 reindexdb.c:330
+#: createlang.c:236 createuser.c:326 dropdb.c:156 droplang.c:237
+#: dropuser.c:151 clusterdb.c:252 vacuumdb.c:348 reindexdb.c:330
 #, c-format
 msgid "  -W, --password            force password prompt\n"
 msgstr "  -W, --password            vynutí dotaz na heslo\n"
@@ -335,7 +336,7 @@ msgstr "Hesla se neshodují.\n"
 
 #: createuser.c:189
 msgid "Shall the new role be a superuser?"
-msgstr ""
+msgstr "Má být nová role superuživatel?"
 
 #: createuser.c:204
 msgid "Shall the new role be allowed to create databases?"
@@ -374,7 +375,8 @@ msgstr "  %s [PŘEP�NAČ]... [JMÉNO ROLE]\n"
 msgid ""
 "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
 msgstr ""
-"  -c, --connection-limit=N  limit po�tu konexí pro role (implicitně: bez limitu)\n"
+"  -c, --connection-limit=N  limit po�tu konexí pro role (implicitně: bez "
+"limitu)\n"
 
 #: createuser.c:304
 #, c-format
@@ -477,12 +479,12 @@ msgstr "Databáze \"%s\" bude trvale odstraněna.\n"
 msgid "Are you sure?"
 msgstr "Ur�itě?"
 
-#: dropdb.c:124
+#: dropdb.c:128
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: odstraňování databáze selhalo: %s"
 
-#: dropdb.c:139
+#: dropdb.c:143
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -491,34 +493,27 @@ msgstr ""
 "%s odstraňuje PostgreSQL databázi.\n"
 "\n"
 
-#: dropdb.c:141
+#: dropdb.c:145
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [PŘEP�NAČ]... DATAB�ZE\n"
 
-#: dropdb.c:144 dropuser.c:143
+#: dropdb.c:148 dropuser.c:143
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         zeptej se před smazáním �ehokoli\n"
 
-#: droplang.c:203
+#: droplang.c:190
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: jazyk \"%s\" není v databázi \"%s\" instalován\n"
 
-#: droplang.c:223
-#, c-format
-msgid ""
-"%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr ""
-"%s: stále je %s funkcí definováno v jazyce \"%s\"; jazyk nebyl odstraněn.\n"
-
-#: droplang.c:316
+#: droplang.c:208
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: odstraňování jazyka selhalo: %s"
 
-#: droplang.c:331
+#: droplang.c:223
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
@@ -527,7 +522,7 @@ msgstr ""
 "%s odstraňuje procedurální jazyk z databáze.\n"
 "\n"
 
-#: droplang.c:335
+#: droplang.c:227
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
@@ -600,7 +595,7 @@ msgstr ""
 "%s vytváří cluster všech již dříve clusterovaných tabulek v databázi.\n"
 "\n"
 
-#: clusterdb.c:237 vacuumdb.c:263 reindexdb.c:314
+#: clusterdb.c:237 vacuumdb.c:329 reindexdb.c:314
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [PŘEP�NAČ]... [DATAB�ZE]\n"
@@ -639,33 +634,43 @@ msgstr ""
 "\n"
 "Pro detaily �těte popis SQL příkazu CLUSTER.\n"
 
-#: vacuumdb.c:146
+#: vacuumdb.c:150
+#, c-format
+msgid "%s: cannot use the \"full\" option when performing only analyze\n"
+msgstr "%s: při provádění jen analyze nelze použít volbu \"full\"\n"
+
+#: vacuumdb.c:156
+#, c-format
+msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
+msgstr "%s: při provádění jen analyze nelze použít volbu \"freeze\"\n"
+
+#: vacuumdb.c:169
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
 "%s: nelze provádět VACUUM u všech databází a zároveň specifikovat jen jednu\n"
 
-#: vacuumdb.c:152
+#: vacuumdb.c:175
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: nelze provést VACUUM specifické tabulky ve všech databázích\n"
 
-#: vacuumdb.c:212
+#: vacuumdb.c:278
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: provádění VACUUM tabulky \"%s\" v databázi \"%s\" selhalo: %s"
 
-#: vacuumdb.c:215
+#: vacuumdb.c:281
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: provádění VACUUM databáze \"%s\" selhalo: %s"
 
-#: vacuumdb.c:245
+#: vacuumdb.c:311
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: provádí se VACUUM databáze \"%s\"\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:327
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -674,70 +679,75 @@ msgstr ""
 "%s pro�išťuje a analyzuje PostgreSQL databázi.\n"
 "\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:331
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       provést VACUUM všech databází\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:332
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr ""
 "  -d, --dbname=DATAB�ZE           jméno databáze k provedení příkazu VACUUM\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:333
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
 msgstr "  -e, --echo                      ukázat příkazy posílané na server\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:334
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      provést plné (FULL) VACUUM\n"
 
-#: vacuumdb.c:269
+#: vacuumdb.c:335
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
-msgstr "  -F, --freeze                    zmrazí transak�ní informace záznamů\n"
+msgstr ""
+"  -F, --freeze                    zmrazí transak�ní informace záznamů\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:336
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     tichý mód\n"
 
-#: vacuumdb.c:271
+#: vacuumdb.c:337
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr ""
 "  -t, --table='TABULKA[(SLOUPCE)]'  provést VACUUM pouze u specifikované "
 "tabulky\n"
 
-#: vacuumdb.c:272
+#: vacuumdb.c:338
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   vypisovat více informací\n"
 
-#: vacuumdb.c:273
+#: vacuumdb.c:339
 #, c-format
-msgid "  -z, --analyze                   update optimizer hints\n"
+msgid "  -z, --analyze                   update optimizer statistics\n"
+msgstr "  -z, --analyze                   aktualizace statistik optimalizéru\n"
+
+#: vacuumdb.c:340
+#, c-format
+msgid "  -Z, --analyze-only              only update optimizer statistics\n"
 msgstr ""
-"  -z, --analyze                   aktualizace informací používaných pro\n"
-"                                  optimalizaci dotazů\n"
+"  -Z, --analyze-only              pouze aktualizaze statistik optimalizéru\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:341
 #, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          ukáže tento text a skon�í\n"
 
-#: vacuumdb.c:275
+#: vacuumdb.c:342
 #, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
 msgstr "  --version                       ukáže informace o verzi a skon�í\n"
 
-#: vacuumdb.c:282
+#: vacuumdb.c:349
 #, c-format
 msgid ""
 "\n"
@@ -770,15 +780,13 @@ msgstr "%s: nelze reindexovat vybraný index ve všech databázích\n"
 #, c-format
 msgid ""
 "%s: cannot reindex a specific table and system catalogs at the same time\n"
-msgstr ""
-"%s: nelze reindexovat vybranou tabulku a sou�asně sytémový katalog\n"
+msgstr "%s: nelze reindexovat vybranou tabulku a sou�asně sytémový katalog\n"
 
 #: reindexdb.c:169
 #, c-format
 msgid ""
 "%s: cannot reindex a specific index and system catalogs at the same time\n"
-msgstr ""
-"%s: nelze reindexovat vybraný index a sou�asně sytémový katalog\n"
+msgstr "%s: nelze reindexovat vybraný index a sou�asně sytémový katalog\n"
 
 #: reindexdb.c:238
 #, c-format
@@ -858,69 +866,79 @@ msgstr "%s: nelze získat informace o aktuálním uživateli: %s\n"
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: nelze získat aktuální uživatelské jméno: %s\n"
 
-#: common.c:103 common.c:127
+#: common.c:103 common.c:155
 msgid "Password: "
 msgstr "Heslo: "
 
-#: common.c:116
+#: common.c:117
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek paměti\n"
+
+#: common.c:144
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: nelze navázat spojení s databází %s\n"
 
-#: common.c:138
+#: common.c:166
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: nelze navázat spojení s databází %s: %s"
 
-#: common.c:162 common.c:190
+#: common.c:190 common.c:218
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: dotaz selhal: %s"
 
-#: common.c:164 common.c:192
+#: common.c:192 common.c:220
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: dotaz byl: %s\n"
 
-#: common.c:238
+#: common.c:266
 #, c-format
 msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
 msgstr "pg_strdup: nelze duplikovat nulový ukazatel (interní chyba)\n"
 
-#: common.c:244
+#: common.c:272
 #, c-format
 msgid "out of memory\n"
 msgstr "paměť vy�erpána\n"
 
 #  translator: Make sure the (y/n) prompts match the translation of this.
 #. translator: abbreviation for "yes"
-#: common.c:255
+#: common.c:283
 msgid "y"
 msgstr "a"
 
 #  translator: Make sure the (y/n) prompts match the translation of this.
 #. translator: abbreviation for "no"
-#: common.c:257
+#: common.c:285
 msgid "n"
 msgstr "n"
 
-#: common.c:268
+#: common.c:296
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s/%s) "
 
-#: common.c:289
+#: common.c:317
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
 msgstr "Prosím odpovězte \"%s\" nebo \"%s\".\n"
 
-#: common.c:367 common.c:400
+#: common.c:395 common.c:428
 #, c-format
 msgid "Cancel request sent\n"
 msgstr "Požadavek na zrušení byl poslán\n"
 
-#: common.c:369 common.c:402
+#: common.c:397 common.c:430
 #, c-format
 msgid "Could not send cancel request: %s"
 msgstr "Nelze poslat požadavek na zrušení: %s"
 
+#~ msgid ""
+#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
+#~ msgstr ""
+#~ "%s: stále je %s funkcí definováno v jazyce \"%s\"; jazyk nebyl "
+#~ "odstraněn.\n"
diff --git a/src/bin/scripts/po/de.po b/src/bin/scripts/po/de.po
index bc68ed982a2e5..592a5e85fe6f3 100644
--- a/src/bin/scripts/po/de.po
+++ b/src/bin/scripts/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for "scripts".
 # Peter Eisentraut <peter_e@gmx.net>, 2003 - 2010.
 #
-# pgtranslation Id: pgscripts.po,v 1.11 2010/03/17 21:33:45 petere Exp $
+# pgtranslation Id: pgscripts.po,v 1.12 2011/07/15 19:32:37 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -9,24 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-03-17 19:16+0000\n"
-"PO-Revision-Date: 2010-03-17 23:33+0200\n"
+"POT-Creation-Date: 2011-07-15 08:56+0000\n"
+"PO-Revision-Date: 2011-07-15 21:38+0300\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: createdb.c:114 createdb.c:133 createlang.c:89 createlang.c:110
 #: createlang.c:163 createuser.c:149 createuser.c:164 dropdb.c:83 dropdb.c:92
-#: dropdb.c:100 droplang.c:100 droplang.c:121 droplang.c:175 dropuser.c:83
+#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:163 dropuser.c:83
 #: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:127 vacuumdb.c:142
 #: reindexdb.c:114 reindexdb.c:128
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:119
+#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:107
 #: dropuser.c:96 clusterdb.c:117 vacuumdb.c:140 reindexdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
@@ -47,18 +48,17 @@ msgstr "%s: --locale und --lc-collate können nicht zusammen angegeben werden\n"
 msgid "%s: \"%s\" is not a valid encoding name\n"
 msgstr "%s: »%s« ist kein gültiger Kodierungsname\n"
 
-#: createdb.c:204
+#: createdb.c:209
 #, c-format
 msgid "%s: database creation failed: %s"
-msgstr "%s: Erzeugung der Datenbank ist fehlgeschlagen: %s"
+msgstr "%s: Erzeugen der Datenbank ist fehlgeschlagen: %s"
 
-#: createdb.c:227
+#: createdb.c:229
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
-msgstr ""
-"%s: Erzeugung des Kommentars ist fehlgeschlagen (Datenbank wurde erzeugt): %s"
+msgstr "%s: Erzeugen des Kommentars ist fehlgeschlagen (Datenbank wurde erzeugt): %s"
 
-#: createdb.c:244
+#: createdb.c:247
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -67,20 +67,20 @@ msgstr ""
 "%s erzeugt eine PostgreSQL-Datenbank.\n"
 "\n"
 
-#: createdb.c:245 createlang.c:215 createuser.c:300 dropdb.c:140
-#: droplang.c:374 dropuser.c:139 clusterdb.c:236 vacuumdb.c:328
+#: createdb.c:248 createlang.c:223 createuser.c:300 dropdb.c:144
+#: droplang.c:224 dropuser.c:139 clusterdb.c:236 vacuumdb.c:328
 #: reindexdb.c:313
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: createdb.c:246
+#: createdb.c:249
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [OPTION]... [DBNAME] [BESCHREIBUNG]\n"
 
-#: createdb.c:247 createlang.c:217 createuser.c:302 dropdb.c:142
-#: droplang.c:376 dropuser.c:141 clusterdb.c:238 vacuumdb.c:330
+#: createdb.c:250 createlang.c:225 createuser.c:302 dropdb.c:146
+#: droplang.c:226 dropuser.c:141 clusterdb.c:238 vacuumdb.c:330
 #: reindexdb.c:315
 #, c-format
 msgid ""
@@ -90,12 +90,12 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: createdb.c:248
+#: createdb.c:251
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr "  -D, --tablespace=TABLESPACE  Standard-Tablespace der Datenbank\n"
 
-#: createdb.c:249
+#: createdb.c:252
 #, c-format
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
@@ -103,52 +103,52 @@ msgstr ""
 "  -e, --echo                   zeige die Befehle, die an den Server\n"
 "                               gesendet werden\n"
 
-#: createdb.c:250
+#: createdb.c:253
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=KODIERUNG     Kodierung für die Datenbank\n"
 
-#: createdb.c:251
+#: createdb.c:254
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
 msgstr ""
 "  -l, --locale=LOCALE          Lokale-Einstellungen für die Datenbank\n"
 
-#: createdb.c:252
+#: createdb.c:255
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
 msgstr ""
 "      --lc-collate=LOCALE      LC_COLLATE-Einstellung für die Datenbank\n"
 
-#: createdb.c:253
+#: createdb.c:256
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
 msgstr ""
 "      --lc-ctype=LOCALE        LC_CTYPE-Einstellung für die Datenbank\n"
 
-#: createdb.c:254
+#: createdb.c:257
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr "  -O, --owner=EIGENTÜMER       Eigentümer der neuen Datenbank\n"
 
-#: createdb.c:255
+#: createdb.c:258
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
 msgstr "  -T, --template=TEMPLATE      zu kopierende Template-Datenbank\n"
 
-#: createdb.c:256
+#: createdb.c:259
 #, c-format
 msgid "  --help                       show this help, then exit\n"
 msgstr "  --help                       diese Hilfe anzeigen, dann beenden\n"
 
-#: createdb.c:257
+#: createdb.c:260
 #, c-format
 msgid "  --version                    output version information, then exit\n"
 msgstr ""
 "  --version                    Versionsinformationen anzeigen, dann beenden\n"
 
-#: createdb.c:258 createlang.c:223 createuser.c:321 dropdb.c:147
-#: droplang.c:382 dropuser.c:146 clusterdb.c:247 vacuumdb.c:343
+#: createdb.c:261 createlang.c:231 createuser.c:321 dropdb.c:151
+#: droplang.c:232 dropuser.c:146 clusterdb.c:247 vacuumdb.c:343
 #: reindexdb.c:325
 #, c-format
 msgid ""
@@ -158,7 +158,7 @@ msgstr ""
 "\n"
 "Verbindungsoptionen:\n"
 
-#: createdb.c:259
+#: createdb.c:262
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
@@ -166,27 +166,27 @@ msgstr ""
 "  -h, --host=HOSTNAME          Name des Datenbankservers oder Socket-"
 "Verzeichnis\n"
 
-#: createdb.c:260
+#: createdb.c:263
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT              Port des Datenbankservers\n"
 
-#: createdb.c:261
+#: createdb.c:264
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=NAME          Datenbankbenutzername\n"
 
-#: createdb.c:262
+#: createdb.c:265
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
 msgstr "  -w, --no-password            niemals nach Passwort fragen\n"
 
-#: createdb.c:263
+#: createdb.c:266
 #, c-format
 msgid "  -W, --password               force password prompt\n"
 msgstr "  -W, --password               Passwortfrage erzwingen\n"
 
-#: createdb.c:264
+#: createdb.c:267
 #, c-format
 msgid ""
 "\n"
@@ -196,8 +196,8 @@ msgstr ""
 "Wenn nichts anderes angegeben ist, dann wird eine Datenbank mit dem Namen\n"
 "des aktuellen Benutzers erzeugt.\n"
 
-#: createdb.c:265 createlang.c:229 createuser.c:329 dropdb.c:153
-#: droplang.c:388 dropuser.c:152 clusterdb.c:254 vacuumdb.c:350
+#: createdb.c:268 createlang.c:237 createuser.c:329 dropdb.c:157
+#: droplang.c:238 dropuser.c:152 clusterdb.c:254 vacuumdb.c:350
 #: reindexdb.c:332
 #, c-format
 msgid ""
@@ -207,27 +207,27 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:140 droplang.c:151
+#: createlang.c:140 droplang.c:139
 msgid "Name"
 msgstr "Name"
 
-#: createlang.c:141 droplang.c:152
+#: createlang.c:141 droplang.c:140
 msgid "yes"
 msgstr "ja"
 
-#: createlang.c:141 droplang.c:152
+#: createlang.c:141 droplang.c:140
 msgid "no"
 msgstr "nein"
 
-#: createlang.c:142 droplang.c:153
+#: createlang.c:142 droplang.c:141
 msgid "Trusted?"
 msgstr "Vertraut?"
 
-#: createlang.c:151 droplang.c:162
+#: createlang.c:151 droplang.c:150
 msgid "Procedural Languages"
 msgstr "Prozedurale Sprachen"
 
-#: createlang.c:162 droplang.c:173
+#: createlang.c:162 droplang.c:161
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: Sprachenname als Argument fehlt\n"
@@ -237,12 +237,12 @@ msgstr "%s: Sprachenname als Argument fehlt\n"
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: Sprache »%s« ist bereits in Datenbank »%s« installiert\n"
 
-#: createlang.c:198
+#: createlang.c:206
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: Installation der Sprache fehlgeschlagen: %s"
 
-#: createlang.c:214
+#: createlang.c:222
 #, c-format
 msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
@@ -251,19 +251,19 @@ msgstr ""
 "%s installiert eine prozedurale Sprache in einer PostgreSQL-Datenbank.\n"
 "\n"
 
-#: createlang.c:216 droplang.c:375
+#: createlang.c:224 droplang.c:225
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "%s [OPTION]... SPRACHE [DBNAME]\n"
 
-#: createlang.c:218
+#: createlang.c:226
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr ""
 "  -d, --dbname=DBNAME       Datenbank, in der die Sprache installiert\n"
 "                            werden soll\n"
 
-#: createlang.c:219 createuser.c:306 dropdb.c:143 droplang.c:378
+#: createlang.c:227 createuser.c:306 dropdb.c:147 droplang.c:228
 #: dropuser.c:142 clusterdb.c:241 reindexdb.c:318
 #, c-format
 msgid ""
@@ -272,27 +272,27 @@ msgstr ""
 "  -e, --echo                zeige die Befehle, die an den Server\n"
 "                            gesendet werden\n"
 
-#: createlang.c:220 droplang.c:379
+#: createlang.c:228 droplang.c:229
 #, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
 msgstr ""
 "  -l, --list                zeige Liste gegenwärtig installierter Sprachen\n"
 
-#: createlang.c:221 createuser.c:319 dropdb.c:145 droplang.c:380
+#: createlang.c:229 createuser.c:319 dropdb.c:149 droplang.c:230
 #: dropuser.c:144 clusterdb.c:245 reindexdb.c:323
 #, c-format
 msgid "  --help                    show this help, then exit\n"
 msgstr "  --help                    diese Hilfe anzeigen, dann beenden\n"
 
-#: createlang.c:222 createuser.c:320 dropdb.c:146 droplang.c:381
+#: createlang.c:230 createuser.c:320 dropdb.c:150 droplang.c:231
 #: dropuser.c:145 clusterdb.c:246 reindexdb.c:324
 #, c-format
 msgid "  --version                 output version information, then exit\n"
 msgstr ""
 "  --version                 Versionsinformationen anzeigen, dann beenden\n"
 
-#: createlang.c:224 createuser.c:322 dropdb.c:148 droplang.c:383
+#: createlang.c:232 createuser.c:322 dropdb.c:152 droplang.c:233
 #: dropuser.c:147 clusterdb.c:248 vacuumdb.c:344 reindexdb.c:326
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
@@ -300,25 +300,25 @@ msgstr ""
 "  -h, --host=HOSTNAME       Name des Datenbankservers oder Socket-"
 "Verzeichnis\n"
 
-#: createlang.c:225 createuser.c:323 dropdb.c:149 droplang.c:384
+#: createlang.c:233 createuser.c:323 dropdb.c:153 droplang.c:234
 #: dropuser.c:148 clusterdb.c:249 vacuumdb.c:345 reindexdb.c:327
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           Port des Datenbankservers\n"
 
-#: createlang.c:226 dropdb.c:150 droplang.c:385 clusterdb.c:250 vacuumdb.c:346
+#: createlang.c:234 dropdb.c:154 droplang.c:235 clusterdb.c:250 vacuumdb.c:346
 #: reindexdb.c:328
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=NAME       Datenbankbenutzername\n"
 
-#: createlang.c:227 createuser.c:325 dropdb.c:151 droplang.c:386
+#: createlang.c:235 createuser.c:325 dropdb.c:155 droplang.c:236
 #: dropuser.c:150 clusterdb.c:251 vacuumdb.c:347 reindexdb.c:329
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
 msgstr "  -w, --no-password         niemals nach Passwort fragen\n"
 
-#: createlang.c:228 createuser.c:326 dropdb.c:152 droplang.c:387
+#: createlang.c:236 createuser.c:326 dropdb.c:156 droplang.c:237
 #: dropuser.c:151 clusterdb.c:252 vacuumdb.c:348 reindexdb.c:330
 #, c-format
 msgid "  -W, --password            force password prompt\n"
@@ -361,7 +361,7 @@ msgstr "Passwortverschlüsselung ist fehlgeschlagen.\n"
 #: createuser.c:284
 #, c-format
 msgid "%s: creation of new role failed: %s"
-msgstr "%s: Erzeugung der neuen Rolle fehlgeschlagen: %s"
+msgstr "%s: Erzeugen der neuen Rolle fehlgeschlagen: %s"
 
 #: createuser.c:299
 #, c-format
@@ -489,12 +489,12 @@ msgstr "Datenbank »%s« wird unwiderruflich gelöscht werden.\n"
 msgid "Are you sure?"
 msgstr "Sind Sie sich sicher?"
 
-#: dropdb.c:124
+#: dropdb.c:128
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: Löschen der Datenbank fehlgeschlagen: %s"
 
-#: dropdb.c:139
+#: dropdb.c:143
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -503,35 +503,28 @@ msgstr ""
 "%s löscht eine PostgreSQL-Datenbank.\n"
 "\n"
 
-#: dropdb.c:141
+#: dropdb.c:145
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr " %s [OPTION]... DBNAME\n"
 
-#: dropdb.c:144 dropuser.c:143
+#: dropdb.c:148 dropuser.c:143
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr ""
 "  -i, --interactive         frage nach, bevor irgendetwas gelöscht wird\n"
 
-#: droplang.c:203
+#: droplang.c:190
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: Sprache »%s« ist nicht in Datenbank »%s« installiert\n"
 
-#: droplang.c:224
-#, c-format
-msgid ""
-"%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr ""
-"%s: noch %s Funktionen in Sprache »%s« deklariert; Sprache nicht gelöscht\n"
-
-#: droplang.c:358
+#: droplang.c:208
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: Löschen der Sprache fehlgeschlagen: %s"
 
-#: droplang.c:373
+#: droplang.c:223
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
@@ -540,7 +533,7 @@ msgstr ""
 "%s löscht eine prozedurale Sprache aus einer Datenbank.\n"
 "\n"
 
-#: droplang.c:377
+#: droplang.c:227
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
@@ -664,7 +657,8 @@ msgstr ""
 #, c-format
 msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
 msgstr ""
-"%s: kann Option »freeze« nicht verwenden, wenn nur Analyze durchgeführt wird\n"
+"%s: kann Option »freeze« nicht verwenden, wenn nur Analyze durchgeführt "
+"wird\n"
 
 #: vacuumdb.c:169
 #, c-format
@@ -754,12 +748,16 @@ msgstr "  -v, --verbose                   erzeuge viele Meldungen\n"
 #: vacuumdb.c:339
 #, c-format
 msgid "  -z, --analyze                   update optimizer statistics\n"
-msgstr "  -z, --analyze                   aktualisiere Statistiken für den Optimierer\n"
+msgstr ""
+"  -z, --analyze                   aktualisiere Statistiken für den "
+"Optimierer\n"
 
 #: vacuumdb.c:340
 #, c-format
 msgid "  -Z, --analyze-only              only update optimizer statistics\n"
-msgstr "  -Z, --analyze-only              aktualisiere nur Statistiken für den Optimierer\n"
+msgstr ""
+"  -Z, --analyze-only              aktualisiere nur Statistiken für den "
+"Optimierer\n"
 
 #: vacuumdb.c:341
 #, c-format
@@ -973,3 +971,9 @@ msgstr "Abbruchsanforderung gesendet\n"
 #, c-format
 msgid "Could not send cancel request: %s"
 msgstr "Konnte Abbruchsanforderung nicht senden: %s"
+
+#~ msgid ""
+#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
+#~ msgstr ""
+#~ "%s: noch %s Funktionen in Sprache »%s« deklariert; Sprache nicht "
+#~ "gelöscht\n"
diff --git a/src/bin/scripts/po/pl.po b/src/bin/scripts/po/pl.po
new file mode 100644
index 0000000000000..b095a29b9423a
--- /dev/null
+++ b/src/bin/scripts/po/pl.po
@@ -0,0 +1,956 @@
+# Polish message translation file for pgscripts
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pgscripts (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:56+0000\n"
+"PO-Revision-Date: 2011-09-30 09:49-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: createdb.c:114 createdb.c:133 createlang.c:89 createlang.c:110
+#: createlang.c:163 createuser.c:149 createuser.c:164 dropdb.c:83 dropdb.c:92
+#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:163 dropuser.c:83
+#: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:127 vacuumdb.c:142
+#: reindexdb.c:114 reindexdb.c:128
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:107
+#: dropuser.c:96 clusterdb.c:117 vacuumdb.c:140 reindexdb.c:127
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: za duża ilość parametrów wiersza poleceń (pierwszy to \"%s\")\n"
+
+#: createdb.c:141
+#, c-format
+msgid "%s: only one of --locale and --lc-ctype can be specified\n"
+msgstr "%s: tylko jedna z --locale i --lc-ctype może być wskazany\n"
+
+#: createdb.c:147
+#, c-format
+msgid "%s: only one of --locale and --lc-collate can be specified\n"
+msgstr "%s: tylko jedna z --locale i --lc-collate może być wskazany\n"
+
+#: createdb.c:159
+#, c-format
+msgid "%s: \"%s\" is not a valid encoding name\n"
+msgstr "%s: \"%s\" nie jest poprawnÄ… nazwÄ… kodowania serwera\n"
+
+#: createdb.c:209
+#, c-format
+msgid "%s: database creation failed: %s"
+msgstr "%s: nie udało się utworzyć bazy danych: %s"
+
+#: createdb.c:229
+#, c-format
+msgid "%s: comment creation failed (database was created): %s"
+msgstr "%s: nie udało się utworzyć notatki (baza danych została utworzona): %s"
+
+#: createdb.c:247
+#, c-format
+msgid ""
+"%s creates a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s tworzy bazÄ™ danych PostgreSQL.\n"
+"\n"
+
+#: createdb.c:248 createlang.c:223 createuser.c:300 dropdb.c:144
+#: droplang.c:224 dropuser.c:139 clusterdb.c:236 vacuumdb.c:328
+#: reindexdb.c:313
+#, c-format
+msgid "Usage:\n"
+msgstr "Składnia:\n"
+
+#: createdb.c:249
+#, c-format
+msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
+msgstr "  %s [OPCJA]... [NAZWA] [OPIS]\n"
+
+#: createdb.c:250 createlang.c:225 createuser.c:302 dropdb.c:146
+#: droplang.c:226 dropuser.c:141 clusterdb.c:238 vacuumdb.c:330
+#: reindexdb.c:315
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opcje:\n"
+
+#: createdb.c:251
+#, c-format
+msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
+msgstr ""
+"  -D, --tablespace=TABLESPACE  domyślna przestrzeń tabel dla bazy danych\n"
+
+#: createdb.c:252
+#, c-format
+msgid ""
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr ""
+"  -e, --echo                   pokazuje polecenia przesyłane do serwera\n"
+
+#: createdb.c:253
+#, c-format
+msgid "  -E, --encoding=ENCODING      encoding for the database\n"
+msgstr ""
+"  -E, --encoding=KODOWANIE     ustawia domyślne kodowanie dla bazy danych\n"
+
+#: createdb.c:254
+#, c-format
+msgid "  -l, --locale=LOCALE          locale settings for the database\n"
+msgstr "  -l, --locale=LOKALIZACJA     ustawienia regionalne dla bazy danych\n"
+
+#: createdb.c:255
+#, c-format
+msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
+msgstr "      --lc-collate=LOKALIZACJA ustawienie LC_COLLATE dla bazy danych\n"
+
+#: createdb.c:256
+#, c-format
+msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
+msgstr "      --lc-ctype=LOKALIZACJA   ustawienie LC_CTYPE dla bazy danych\n"
+
+#: createdb.c:257
+#, c-format
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr ""
+"  -O, --owner=W�AŚCICIEL       użytkownik bazy danych będący właścicielem "
+"nowej bazy\n"
+
+#: createdb.c:258
+#, c-format
+msgid "  -T, --template=TEMPLATE      template database to copy\n"
+msgstr "  -T, --template=SZABLON       szablon bazy do skopiowania\n"
+
+#: createdb.c:259
+#, c-format
+msgid "  --help                       show this help, then exit\n"
+msgstr "  --help                       pokazuje ten ekran pomocy i kończy\n"
+
+#: createdb.c:260
+#, c-format
+msgid "  --version                    output version information, then exit\n"
+msgstr "  --version                    pokazuje informacje o wersji i kończy\n"
+
+#: createdb.c:261 createlang.c:231 createuser.c:321 dropdb.c:151
+#: droplang.c:232 dropuser.c:146 clusterdb.c:247 vacuumdb.c:343
+#: reindexdb.c:325
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Opcje połączenia:\n"
+
+#: createdb.c:262
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr ""
+"  -h, --host=NAZWAHOSTA        host serwera bazy danych lub katalog gniazda\n"
+
+#: createdb.c:263
+#, c-format
+msgid "  -p, --port=PORT              database server port\n"
+msgstr "  -p, --port=PORT              numer portu na serwera bazy dnaych\n"
+
+#: createdb.c:264
+#, c-format
+msgid "  -U, --username=USERNAME      user name to connect as\n"
+msgstr "  -U, --username=NAZWAUZYTK    nazwa użytkownika do połączenia\n"
+
+#: createdb.c:265
+#, c-format
+msgid "  -w, --no-password            never prompt for password\n"
+msgstr "  -w, --no-password            nie pytaj nigdy o hasło\n"
+
+#: createdb.c:266
+#, c-format
+msgid "  -W, --password               force password prompt\n"
+msgstr "  -W, --password               wymuś pytanie o hasło\n"
+
+#: createdb.c:267
+#, c-format
+msgid ""
+"\n"
+"By default, a database with the same name as the current user is created.\n"
+msgstr ""
+"\n"
+"Domyślnie, jest tworzona baza danych o tej samej nazwie co bieżący "
+"użytkownik.\n"
+
+#: createdb.c:268 createlang.c:237 createuser.c:329 dropdb.c:157
+#: droplang.c:238 dropuser.c:152 clusterdb.c:254 vacuumdb.c:350
+#: reindexdb.c:332
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: createlang.c:140 droplang.c:139
+msgid "Name"
+msgstr "Nazwa"
+
+#: createlang.c:141 droplang.c:140
+msgid "yes"
+msgstr "tak"
+
+#: createlang.c:141 droplang.c:140
+msgid "no"
+msgstr "nie"
+
+#: createlang.c:142 droplang.c:141
+msgid "Trusted?"
+msgstr "Zaufany?"
+
+#: createlang.c:151 droplang.c:150
+msgid "Procedural Languages"
+msgstr "Języki Proceduralne"
+
+#: createlang.c:162 droplang.c:161
+#, c-format
+msgid "%s: missing required argument language name\n"
+msgstr "%s: brak wymaganego argumentu nazwy języka\n"
+
+#: createlang.c:184
+#, c-format
+msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
+msgstr "%s: język \"%s\" jest już zainstalowany w bazie danych \"%s\"\n"
+
+#: createlang.c:206
+#, c-format
+msgid "%s: language installation failed: %s"
+msgstr "%s: instalacja języka nie powiodła się: %s"
+
+#: createlang.c:222
+#, c-format
+msgid ""
+"%s installs a procedural language into a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s instaluje język proceduralny w bazie danych PostgreSQL.\n"
+"\n"
+
+#: createlang.c:224 droplang.c:225
+#, c-format
+msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
+msgstr "  %s [OPCJA]... NAZWAJĘZYKA [NAZWADB]\n"
+
+#: createlang.c:226
+#, c-format
+msgid "  -d, --dbname=DBNAME       database to install language in\n"
+msgstr "  -d, --dbname=NAZWADB      baza danych do zainstalowania języka\n"
+
+#: createlang.c:227 createuser.c:306 dropdb.c:147 droplang.c:228
+#: dropuser.c:142 clusterdb.c:241 reindexdb.c:318
+#, c-format
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr "  -e, --echo                pokazuje polecenia przesyłane do serwera\n"
+
+#: createlang.c:228 droplang.c:229
+#, c-format
+msgid ""
+"  -l, --list                show a list of currently installed languages\n"
+msgstr ""
+"  -l, --list                pokazuje listÄ™ aktualnie zainstalowanych "
+"języków\n"
+
+#: createlang.c:229 createuser.c:319 dropdb.c:149 droplang.c:230
+#: dropuser.c:144 clusterdb.c:245 reindexdb.c:323
+#, c-format
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    pokazuje ten ekran pomocy i kończy\n"
+
+#: createlang.c:230 createuser.c:320 dropdb.c:150 droplang.c:231
+#: dropuser.c:145 clusterdb.c:246 reindexdb.c:324
+#, c-format
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 pokazuje informacje o wersji i kończy\n"
+
+#: createlang.c:232 createuser.c:322 dropdb.c:152 droplang.c:233
+#: dropuser.c:147 clusterdb.c:248 vacuumdb.c:344 reindexdb.c:326
+#, c-format
+msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
+msgstr ""
+"  -h, --host=NAZWAHOSTA     host serwera bazy danych lub katalog gniazda\n"
+
+#: createlang.c:233 createuser.c:323 dropdb.c:153 droplang.c:234
+#: dropuser.c:148 clusterdb.c:249 vacuumdb.c:345 reindexdb.c:327
+#, c-format
+msgid "  -p, --port=PORT           database server port\n"
+msgstr "  -p, --port=PORT           numer portu na serwera bazy dnaych\n"
+
+#: createlang.c:234 dropdb.c:154 droplang.c:235 clusterdb.c:250 vacuumdb.c:346
+#: reindexdb.c:328
+#, c-format
+msgid "  -U, --username=USERNAME   user name to connect as\n"
+msgstr "  -U, --username=NAZWAUZYTK nazwa użytkownika do połączenia\n"
+
+#: createlang.c:235 createuser.c:325 dropdb.c:155 droplang.c:236
+#: dropuser.c:150 clusterdb.c:251 vacuumdb.c:347 reindexdb.c:329
+#, c-format
+msgid "  -w, --no-password         never prompt for password\n"
+msgstr "  -w, --no-password         nie pytaj nigdy o hasło\n"
+
+#: createlang.c:236 createuser.c:326 dropdb.c:156 droplang.c:237
+#: dropuser.c:151 clusterdb.c:252 vacuumdb.c:348 reindexdb.c:330
+#, c-format
+msgid "  -W, --password            force password prompt\n"
+msgstr "  -W, --password            wymuś pytanie o hasło\n"
+
+#: createuser.c:169
+msgid "Enter name of role to add: "
+msgstr "Wpisz nazwÄ™ roli do dodania: "
+
+#: createuser.c:176
+msgid "Enter password for new role: "
+msgstr "Podaj hasło dla nowej roli: "
+
+#: createuser.c:177
+msgid "Enter it again: "
+msgstr "Powtórz podane hasło: "
+
+#: createuser.c:180
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "Podane hasła różnią się.\n"
+
+#: createuser.c:189
+msgid "Shall the new role be a superuser?"
+msgstr "Czy nowa rola ma być superużytkownikiem?"
+
+#: createuser.c:204
+msgid "Shall the new role be allowed to create databases?"
+msgstr "Czy nowa rola ma mieć możliwość tworzenia nowych baz danych?"
+
+#: createuser.c:212
+msgid "Shall the new role be allowed to create more new roles?"
+msgstr "Czy nowa rola ma mieć możliwość tworzenia nowych ról?"
+
+#: createuser.c:245
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "Nie udało się zaszyfrować hasła.\n"
+
+#: createuser.c:284
+#, c-format
+msgid "%s: creation of new role failed: %s"
+msgstr "%s: utworzenie nowej roli nie powiodło się: %s"
+
+#: createuser.c:299
+#, c-format
+msgid ""
+"%s creates a new PostgreSQL role.\n"
+"\n"
+msgstr ""
+"%s tworzy nowÄ… rolÄ™ PostgreSQL.\n"
+"\n"
+
+#: createuser.c:301 dropuser.c:140
+#, c-format
+msgid "  %s [OPTION]... [ROLENAME]\n"
+msgstr "  %s [OPCJA]... [NAZWAROLI]\n"
+
+#: createuser.c:303
+#, c-format
+msgid ""
+"  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
+msgstr ""
+"  -c, --connection-limit=N  limit połączeń dla roli (domyślnie: bez limitu)\n"
+
+#: createuser.c:304
+#, c-format
+msgid "  -d, --createdb            role can create new databases\n"
+msgstr "  -d, --createdb            rola może tworzyć nowe bazy danych\n"
+
+#: createuser.c:305
+#, c-format
+msgid "  -D, --no-createdb         role cannot create databases\n"
+msgstr "  -D, --no-createdb         rola nie może tworzyć baz danych\n"
+
+#: createuser.c:307
+#, c-format
+msgid "  -E, --encrypted           encrypt stored password\n"
+msgstr "  -E, --encrypted           szyfruje zapisane hasło\n"
+
+#: createuser.c:308
+#, c-format
+msgid ""
+"  -i, --inherit             role inherits privileges of roles it is a\n"
+"                            member of (default)\n"
+msgstr ""
+"  -i, --inherit             rola dziedziczy uprawnienia od ról, których\n"
+"                            jest członkiem (domyślnie)\n"
+
+#: createuser.c:310
+#, c-format
+msgid "  -I, --no-inherit          role does not inherit privileges\n"
+msgstr "  -I, --no-inherit          rola nie dziedziczy uprawnień\n"
+
+#: createuser.c:311
+#, c-format
+msgid "  -l, --login               role can login (default)\n"
+msgstr "  -l, --login               rola może się logować (domyślnie)\n"
+
+#: createuser.c:312
+#, c-format
+msgid "  -L, --no-login            role cannot login\n"
+msgstr "  -L, --no-login            rola nie może się logować\n"
+
+#: createuser.c:313
+#, c-format
+msgid "  -N, --unencrypted         do not encrypt stored password\n"
+msgstr "  -N, --unencrypted         nie szyfruje zapisanego hasła\n"
+
+#: createuser.c:314
+#, c-format
+msgid "  -P, --pwprompt            assign a password to new role\n"
+msgstr "  -P, --pwprompt            przypisuje hasło do nowej roli\n"
+
+#: createuser.c:315
+#, c-format
+msgid "  -r, --createrole          role can create new roles\n"
+msgstr "  -r, --createrole          rola może tworzyć nowe role\n"
+
+#: createuser.c:316
+#, c-format
+msgid "  -R, --no-createrole       role cannot create roles\n"
+msgstr "  -R, --no-createrole       rola nie może tworzyć ról\n"
+
+#: createuser.c:317
+#, c-format
+msgid "  -s, --superuser           role will be superuser\n"
+msgstr "  -s, --superuser           rola będzie superużytkownikiem\n"
+
+#: createuser.c:318
+#, c-format
+msgid "  -S, --no-superuser        role will not be superuser\n"
+msgstr "  -S, --no-superuser        rola nie będzie superużytkownikiem\n"
+
+#: createuser.c:324
+#, c-format
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
+msgstr ""
+"  -U, --username=USERNAME   nazwa użytkownika do połączenia z bazą (nie tego "
+"do utworzenia)\n"
+
+#: createuser.c:327
+#, c-format
+msgid ""
+"\n"
+"If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you will\n"
+"be prompted interactively.\n"
+msgstr ""
+"\n"
+"Jeśli jedna z -d, -D, -r, -R, -s, -S, i NAZWAROLI nie została wskazana,\n"
+"będziesz pytany interaktywnie.\n"
+
+#: dropdb.c:91
+#, c-format
+msgid "%s: missing required argument database name\n"
+msgstr "%s: brak wymaganego argumentu nazwy bazy danych\n"
+
+#: dropdb.c:106
+#, c-format
+msgid "Database \"%s\" will be permanently removed.\n"
+msgstr "Baza danych \"%s\" zostanie usunięta na stałe.\n"
+
+#: dropdb.c:107 dropuser.c:108
+msgid "Are you sure?"
+msgstr "Czy na pewno?"
+
+#: dropdb.c:128
+#, c-format
+msgid "%s: database removal failed: %s"
+msgstr "%s: usunięcie bazy danych nie powiodło się: %s"
+
+#: dropdb.c:143
+#, c-format
+msgid ""
+"%s removes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s usuwa bazÄ™ danych PostgreSQL.\n"
+"\n"
+
+#: dropdb.c:145
+#, c-format
+msgid "  %s [OPTION]... DBNAME\n"
+msgstr "  %s [OPCJA]... NAZWADB\n"
+
+#: dropdb.c:148 dropuser.c:143
+#, c-format
+msgid "  -i, --interactive         prompt before deleting anything\n"
+msgstr "  -i, --interactive         monit przed usunięciem czegokolwiek\n"
+
+#: droplang.c:190
+#, c-format
+msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
+msgstr "%s: język \"%s\" nie jest zainstalowany w bazie danych \"%s\"\n"
+
+#: droplang.c:208
+#, c-format
+msgid "%s: language removal failed: %s"
+msgstr "%s: usunięcie języka nie powiodło się: %s"
+
+#: droplang.c:223
+#, c-format
+msgid ""
+"%s removes a procedural language from a database.\n"
+"\n"
+msgstr ""
+"%s usuwa język proceduralny z bazy danych.\n"
+"\n"
+
+#: droplang.c:227
+#, c-format
+msgid ""
+"  -d, --dbname=DBNAME       database from which to remove the language\n"
+msgstr "  -d, --dbname=NAZWADB      baza danych z której usunie się język\n"
+
+#: dropuser.c:103
+msgid "Enter name of role to drop: "
+msgstr "Wpisz nazwÄ™ roli do skasowania: "
+
+#: dropuser.c:107
+#, c-format
+msgid "Role \"%s\" will be permanently removed.\n"
+msgstr "Rola \"%s\" zostanie usunięta na stałe.\n"
+
+#: dropuser.c:123
+#, c-format
+msgid "%s: removal of role \"%s\" failed: %s"
+msgstr "%s: usunięcie roli \"%s\" nie powiodło się: %s"
+
+#: dropuser.c:138
+#, c-format
+msgid ""
+"%s removes a PostgreSQL role.\n"
+"\n"
+msgstr ""
+"%s usuwa rolÄ™ PostgreSQL.\n"
+"\n"
+
+#: dropuser.c:149
+#, c-format
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
+msgstr ""
+"  -U, --username=USERNAME   nazwa użytkownika do połączenia z bazą (nie tego "
+"do skasowania)\n"
+
+#: clusterdb.c:129
+#, c-format
+msgid "%s: cannot cluster all databases and a specific one at the same time\n"
+msgstr ""
+"%s: nie można klastrować wszystkich baz danych i jednej wskazanej w tym "
+"samym czasie\n"
+
+#: clusterdb.c:135
+#, c-format
+msgid "%s: cannot cluster a specific table in all databases\n"
+msgstr ""
+"%s: nie można klastrować wskazanej tabeli we wszystkich bazach danych\n"
+
+#: clusterdb.c:187
+#, c-format
+msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: klastrowanie tabeli \"%s\" w bazie danych \"%s\" nie udało się: %s"
+
+#: clusterdb.c:190
+#, c-format
+msgid "%s: clustering of database \"%s\" failed: %s"
+msgstr "%s: klastrowanie bazy danych \"%s\" nie udało się: %s"
+
+#: clusterdb.c:219
+#, c-format
+msgid "%s: clustering database \"%s\"\n"
+msgstr "%s: klastrowanie bazy danych \"%s\"\n"
+
+#: clusterdb.c:235
+#, c-format
+msgid ""
+"%s clusters all previously clustered tables in a database.\n"
+"\n"
+msgstr ""
+"%s klastruje wszystkie poprzednio sklastrowane tabele w bazie danych.\n"
+"\n"
+
+#: clusterdb.c:237 vacuumdb.c:329 reindexdb.c:314
+#, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [OPCJA]... [NAZWADB]\n"
+
+#: clusterdb.c:239
+#, c-format
+msgid "  -a, --all                 cluster all databases\n"
+msgstr "  -a, --all                 sklastruj wszystkie bazy danych\n"
+
+#: clusterdb.c:240
+#, c-format
+msgid "  -d, --dbname=DBNAME       database to cluster\n"
+msgstr "  -d, --dbname=NAZWADB      baza danych do klastrowania\n"
+
+#: clusterdb.c:242 reindexdb.c:320
+#, c-format
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               nie wypisuj komunikatów\n"
+
+#: clusterdb.c:243
+#, c-format
+msgid "  -t, --table=TABLE         cluster specific table only\n"
+msgstr "  -t, --table=TABELA        klastruj tylko wskazanÄ… tabelÄ™\n"
+
+#: clusterdb.c:244
+#, c-format
+msgid "  -v, --verbose             write a lot of output\n"
+msgstr "  -v, --verbose             wypisuje dużo danych wyjściowych\n"
+
+#: clusterdb.c:253
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command CLUSTER for details.\n"
+msgstr ""
+"\n"
+"Przeczytaj opis polecenia SQL CLUSTER by uzyskać informacje szczegółowe.\n"
+
+#: vacuumdb.c:150
+#, c-format
+msgid "%s: cannot use the \"full\" option when performing only analyze\n"
+msgstr ""
+"%s: nie można używać opcji \"full\" podczas wykonywania wyłącznie analizy\n"
+
+#: vacuumdb.c:156
+#, c-format
+msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
+msgstr ""
+"%s: nie można używać opcji \"freeze\" podczas wykonywania wyłącznie analizy\n"
+
+#: vacuumdb.c:169
+#, c-format
+msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
+msgstr ""
+"%s: nie można odkurzyć wszystkich baz danych i jednej wskazanej w tym samym "
+"czasie\n"
+
+#: vacuumdb.c:175
+#, c-format
+msgid "%s: cannot vacuum a specific table in all databases\n"
+msgstr "%s: nie można odkurzyć wskazanej tabeli we wszystkich bazach danych\n"
+
+#: vacuumdb.c:278
+#, c-format
+msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: odkurzenie tabeli \"%s\" w bazie danych \"%s\" nie udało się: %s"
+
+#: vacuumdb.c:281
+#, c-format
+msgid "%s: vacuuming of database \"%s\" failed: %s"
+msgstr "%s: odkurzenie bazy danych \"%s\" nie udało się: %s"
+
+#: vacuumdb.c:311
+#, c-format
+msgid "%s: vacuuming database \"%s\"\n"
+msgstr "%s: odkurzenie bazy danych \"%s\"\n"
+
+#: vacuumdb.c:327
+#, c-format
+msgid ""
+"%s cleans and analyzes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s czyści bazę danych PostgreSQL.\n"
+"\n"
+
+#: vacuumdb.c:331
+#, c-format
+msgid "  -a, --all                       vacuum all databases\n"
+msgstr "  -a, --all                       odkurza wszystkie bazy danych\n"
+
+#: vacuumdb.c:332
+#, c-format
+msgid "  -d, --dbname=DBNAME             database to vacuum\n"
+msgstr "  -d, --dbname=NAZWADB            baza danych do odkurzenia\n"
+
+#: vacuumdb.c:333
+#, c-format
+msgid ""
+"  -e, --echo                      show the commands being sent to the "
+"server\n"
+msgstr ""
+"  -e, --echo                      pokazuje polecenia przesyłane do serwera\n"
+
+#: vacuumdb.c:334
+#, c-format
+msgid "  -f, --full                      do full vacuuming\n"
+msgstr "  -f, --full                      wykonuje pełne odkurzenie\n"
+
+#: vacuumdb.c:335
+#, c-format
+msgid "  -F, --freeze                    freeze row transaction information\n"
+msgstr ""
+"  -F, --freeze                    zamraża informację transakcji wiersza\n"
+
+#: vacuumdb.c:336
+#, c-format
+msgid "  -q, --quiet                     don't write any messages\n"
+msgstr "  -q, --quiet                     nie wypisuje komunikatów\n"
+
+#: vacuumdb.c:337
+#, c-format
+msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
+msgstr "  -t, --table='TABLE[(COLUMNS)]'  odkurza tylko określoną tabelę\n"
+
+#: vacuumdb.c:338
+#, c-format
+msgid "  -v, --verbose                   write a lot of output\n"
+msgstr "  -v, --verbose                   wypisuje dużo danych wyjściowych\n"
+
+#: vacuumdb.c:339
+#, c-format
+msgid "  -z, --analyze                   update optimizer statistics\n"
+msgstr ""
+"  -z, --analyze                   aktualizuje statystyki optymalizatora\n"
+
+#: vacuumdb.c:340
+#, c-format
+msgid "  -Z, --analyze-only              only update optimizer statistics\n"
+msgstr ""
+"  -Z, --analyze-only              aktualizuje tylko statystyki "
+"optymalizatora\n"
+
+#: vacuumdb.c:341
+#, c-format
+msgid "  --help                          show this help, then exit\n"
+msgstr "  --help                          pokazuje ten ekran pomocy i kończy\n"
+
+#: vacuumdb.c:342
+#, c-format
+msgid ""
+"  --version                       output version information, then exit\n"
+msgstr ""
+"  --version                       pokazuje informacje o wersji i kończy\n"
+
+#: vacuumdb.c:349
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command VACUUM for details.\n"
+msgstr ""
+"\n"
+"Przeczytaj opis polecenia SQL VACUUM by uzyskać informacje szczegółowe.\n"
+
+#: reindexdb.c:138
+#, c-format
+msgid "%s: cannot reindex all databases and a specific one at the same time\n"
+msgstr ""
+"%s: nie można przeindeksować wszystkich baz danych i jednej wskazanej w tym "
+"samym czasie\n"
+
+#: reindexdb.c:143
+#, c-format
+msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
+msgstr ""
+"%s: nie można przeindeksować wszystkich baz danych i katalogów systemowych w "
+"tym samym czasie\n"
+
+#: reindexdb.c:148
+#, c-format
+msgid "%s: cannot reindex a specific table in all databases\n"
+msgstr ""
+"%s: nie można przeindeksować wskazanej tabeli we wszystkich bazach danych\n"
+
+#: reindexdb.c:153
+#, c-format
+msgid "%s: cannot reindex a specific index in all databases\n"
+msgstr ""
+"%s: nie można przeindeksować wskazanego indeksu we wszystkich bazach danych\n"
+
+#: reindexdb.c:164
+#, c-format
+msgid ""
+"%s: cannot reindex a specific table and system catalogs at the same time\n"
+msgstr ""
+"%s: nie można przeindeksować wskazanej tabeli i katalogów systemowych w tym "
+"samym czasie\n"
+
+#: reindexdb.c:169
+#, c-format
+msgid ""
+"%s: cannot reindex a specific index and system catalogs at the same time\n"
+msgstr ""
+"%s: nie można przeindeksować wskazanego indeksu i katalogów systemowych w "
+"tym samym czasie\n"
+
+#: reindexdb.c:238
+#, c-format
+msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
+msgstr ""
+"%s: przeindeksowanie tabeli \"%s\" w bazie danych \"%s\" nie udało się: %s"
+
+#: reindexdb.c:241
+#, c-format
+msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
+msgstr ""
+"%s: przeindeksowanie indeksu \"%s\" w bazie danych \"%s\" nie udało się: %s"
+
+#: reindexdb.c:244
+#, c-format
+msgid "%s: reindexing of database \"%s\" failed: %s"
+msgstr "%s: przeindeksowanie bazy danych \"%s\" nie udało się: %s"
+
+#: reindexdb.c:273
+#, c-format
+msgid "%s: reindexing database \"%s\"\n"
+msgstr "%s: przeindeksowanie bazy danych \"%s\"\n"
+
+#: reindexdb.c:300
+#, c-format
+msgid "%s: reindexing of system catalogs failed: %s"
+msgstr "%s: przeindeksowanie katalogów systemowych nie udało się: %s"
+
+#: reindexdb.c:312
+#, c-format
+msgid ""
+"%s reindexes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s przeindeksowuje bazÄ™ danych PostgreSQL.\n"
+"\n"
+
+#: reindexdb.c:316
+#, c-format
+msgid "  -a, --all                 reindex all databases\n"
+msgstr "  -a, --all                 przeindeksuj wszystkie bazy danych\n"
+
+#: reindexdb.c:317
+#, c-format
+msgid "  -d, --dbname=DBNAME       database to reindex\n"
+msgstr "  -d, --dbname=NAZWADB      baza danych do przeindeksowania\n"
+
+#: reindexdb.c:319
+#, c-format
+msgid "  -i, --index=INDEX         recreate specific index only\n"
+msgstr "  -i, --index=INDEKS        odtwórz tylko wskazany indeks\n"
+
+#: reindexdb.c:321
+#, c-format
+msgid "  -s, --system              reindex system catalogs\n"
+msgstr "  -s, --system              przeindeksuj katalogi systemowe\n"
+
+#: reindexdb.c:322
+#, c-format
+msgid "  -t, --table=TABLE         reindex specific table only\n"
+msgstr "  -t, --table=TABELA        przeindeksuj tylko wskazanÄ… tabelÄ™\n"
+
+#: reindexdb.c:331
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command REINDEX for details.\n"
+msgstr ""
+"\n"
+"Przeczytaj opis polecenia SQL REINDEX by uzyskać informacje szczegółowe.\n"
+
+#: common.c:45
+#, c-format
+msgid "%s: could not obtain information about current user: %s\n"
+msgstr "%s: nie można uzyskać informacji o bieżącym użytkowniku: %s\n"
+
+#: common.c:56
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s: nie można pobrać nazwy bieżącego użytkownika: %s\n"
+
+#: common.c:103 common.c:155
+msgid "Password: "
+msgstr "Hasło: "
+
+#: common.c:117
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: brak pamięci\n"
+
+#: common.c:144
+#, c-format
+msgid "%s: could not connect to database %s\n"
+msgstr "%s: nie można połączyć się do bazy danych %s\n"
+
+#: common.c:166
+#, c-format
+msgid "%s: could not connect to database %s: %s"
+msgstr "%s: nie można połączyć się do bazy danych %s: %s"
+
+#: common.c:190 common.c:218
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s: zapytanie nie powiodło się: %s"
+
+#: common.c:192 common.c:220
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s: zapytanie brzmiało: %s\n"
+
+#: common.c:266
+#, c-format
+msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgstr "pg_strdup: nie można powielić pustego wskazania (bład wewnętrzny)\n"
+
+#: common.c:272
+#, c-format
+msgid "out of memory\n"
+msgstr "brak pamięci\n"
+
+#. translator: abbreviation for "yes"
+#: common.c:283
+msgid "y"
+msgstr "t"
+
+#. translator: abbreviation for "no"
+#: common.c:285
+msgid "n"
+msgstr "n"
+
+#. translator: This is a question followed by the translated options for
+#. "yes" and "no".
+#: common.c:295
+#, c-format
+msgid "%s (%s/%s) "
+msgstr "%s (%s/%s) "
+
+#: common.c:316
+#, c-format
+msgid "Please answer \"%s\" or \"%s\".\n"
+msgstr "Wymagana jest odpowiedź \"%s\" lub \"%s\".\n"
+
+#: common.c:394 common.c:427
+#, c-format
+msgid "Cancel request sent\n"
+msgstr "Wysłano żądanie anulowania\n"
+
+#: common.c:396 common.c:429
+#, c-format
+msgid "Could not send cancel request: %s"
+msgstr "Nie udało się wysłać żądania anulowania: %s"
diff --git a/src/bin/scripts/po/pt_BR.po b/src/bin/scripts/po/pt_BR.po
index 0010c41e7f809..4475c7dd627ce 100644
--- a/src/bin/scripts/po/pt_BR.po
+++ b/src/bin/scripts/po/pt_BR.po
@@ -1,11 +1,11 @@
 # Brazilian Portuguese message translation file for pgscripts
 # 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-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-05-08 21:44-0300\n"
 "PO-Revision-Date: 2005-10-06 00:21-0300\n"
diff --git a/src/include/Makefile b/src/include/Makefile
index 1bfb4a7166d16..56940c8838faf 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -49,6 +49,12 @@ install: all installdirs
 	  cp $(srcdir)/$$dir/*.h '$(DESTDIR)$(includedir_server)'/$$dir/ || exit; \
 	  chmod $(INSTALL_DATA_MODE) '$(DESTDIR)$(includedir_server)'/$$dir/*.h  || exit; \
 	done
+ifeq ($(vpath_build),yes)
+	for file in dynloader.h catalog/schemapg.h parser/gram.h utils/probes.h; do \
+	  cp $$file '$(DESTDIR)$(includedir_server)'/$$file || exit; \
+	  chmod $(INSTALL_DATA_MODE) '$(DESTDIR)$(includedir_server)'/$$file || exit; \
+	done
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq'
diff --git a/src/include/access/clog.h b/src/include/access/clog.h
index 7a8918e0fc569..691430c97ca19 100644
--- a/src/include/access/clog.h
+++ b/src/include/access/clog.h
@@ -40,6 +40,7 @@ extern Size CLOGShmemSize(void);
 extern void CLOGShmemInit(void);
 extern void BootStrapCLOG(void);
 extern void StartupCLOG(void);
+extern void TrimCLOG(void);
 extern void ShutdownCLOG(void);
 extern void CheckPointCLOG(void);
 extern void ExtendCLOG(TransactionId newestXact);
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 7663033723b41..ee60ca82ae826 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -35,7 +35,6 @@ typedef struct HeapScanDescData
 	BlockNumber rs_startblock;	/* block # to start at */
 	BufferAccessStrategy rs_strategy;	/* access strategy for reads */
 	bool		rs_syncscan;	/* report location to syncscan logic? */
-	bool		rs_relpredicatelocked;	/* predicate lock on relation exists */
 
 	/* scan current state */
 	bool		rs_inited;		/* false = scan not init'd yet */
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index 977e0b4748129..710b5fa50240a 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -144,6 +144,15 @@ extern struct varlena *heap_tuple_untoast_attr_slice(struct varlena * attr,
 							  int32 sliceoffset,
 							  int32 slicelength);
 
+/* ----------
+ * toast_flatten_tuple -
+ *
+ *	"Flatten" a tuple to contain no out-of-line toasted fields.
+ *	(This does not eliminate compressed or short-header datums.)
+ * ----------
+ */
+extern HeapTuple toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc);
+
 /* ----------
  * toast_flatten_tuple_attribute -
  *
diff --git a/src/include/access/twophase_rmgr.h b/src/include/access/twophase_rmgr.h
index 1c7d8bb4c03e1..090a2bc5db08c 100644
--- a/src/include/access/twophase_rmgr.h
+++ b/src/include/access/twophase_rmgr.h
@@ -23,10 +23,10 @@ typedef uint8 TwoPhaseRmgrId;
  */
 #define TWOPHASE_RM_END_ID			0
 #define TWOPHASE_RM_LOCK_ID			1
-#define TWOPHASE_RM_PREDICATELOCK_ID	2
-#define TWOPHASE_RM_PGSTAT_ID		3
-#define TWOPHASE_RM_MULTIXACT_ID	4
-#define TWOPHASE_RM_MAX_ID			TWOPHASE_RM_MULTIXACT_ID
+#define TWOPHASE_RM_PGSTAT_ID		2
+#define TWOPHASE_RM_MULTIXACT_ID	3
+#define TWOPHASE_RM_PREDICATELOCK_ID	4
+#define TWOPHASE_RM_MAX_ID			TWOPHASE_RM_PREDICATELOCK_ID
 
 extern const TwoPhaseCallback twophase_recover_callbacks[];
 extern const TwoPhaseCallback twophase_postcommit_callbacks[];
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
index a3bd729156f79..5dfb25fee7442 100644
--- a/src/include/catalog/dependency.h
+++ b/src/include/catalog/dependency.h
@@ -201,7 +201,8 @@ extern void recordMultipleDependencies(const ObjectAddress *depender,
 						   int nreferenced,
 						   DependencyType behavior);
 
-extern void recordDependencyOnCurrentExtension(const ObjectAddress *object);
+extern void recordDependencyOnCurrentExtension(const ObjectAddress *object,
+								   bool isReplace);
 
 extern long deleteDependencyRecordsFor(Oid classId, Oid objectId,
 						   bool skipExtensionDeps);
diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h
index 53600969ad7e2..7e1e194794c20 100644
--- a/src/include/catalog/namespace.h
+++ b/src/include/catalog/namespace.h
@@ -50,6 +50,7 @@ typedef struct OverrideSearchPath
 extern Oid	RangeVarGetRelid(const RangeVar *relation, bool failOK);
 extern Oid	RangeVarGetCreationNamespace(const RangeVar *newRelation);
 extern Oid	RangeVarGetAndCheckCreationNamespace(const RangeVar *newRelation);
+extern void RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid);
 extern Oid	RelnameGetRelid(const char *relname);
 extern bool RelationIsVisible(Oid relid);
 
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index ffcce3c87cc38..bfe540fdcfbe1 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -140,17 +140,18 @@ DATA(insert OID = 1259 (  pg_class		PGNSP 83 0 PGUID 0 0 0 0 0 0 0 f f p r 26 0
 DESCR("");
 
 
-#define		  RELKIND_RELATION		  'r'		/* ordinary table */
-#define		  RELKIND_INDEX			  'i'		/* secondary index */
-#define		  RELKIND_SEQUENCE		  'S'		/* sequence object */
-#define		  RELKIND_TOASTVALUE	  't'		/* for out-of-line values */
-#define		  RELKIND_VIEW			  'v'		/* view */
-#define		  RELKIND_COMPOSITE_TYPE  'c'		/* composite type */
-#define		  RELKIND_FOREIGN_TABLE   'f'		/* foreign table */
-#define		  RELKIND_UNCATALOGED	  'u'		/* not yet cataloged */
-
-#define		  RELPERSISTENCE_PERMANENT	'p'		/* regular table */
-#define		  RELPERSISTENCE_UNLOGGED	'u'		/* unlogged permanent table */
-#define		  RELPERSISTENCE_TEMP		't'		/* temporary table */
+#define		  RELKIND_RELATION		'r'	/* ordinary table */
+#define		  RELKIND_INDEX			'i'	/* secondary index */
+#define		  RELKIND_SEQUENCE		'S'	/* sequence object */
+#define		  RELKIND_TOASTVALUE		't'	/* for out-of-line values */
+#define		  RELKIND_VIEW			'v'	/* view */
+#define		  RELKIND_MAT_VIEW		'm'	/* mat view */
+#define		  RELKIND_COMPOSITE_TYPE	'c'	/* composite type */
+#define		  RELKIND_FOREIGN_TABLE		'f'	/* foreign table */
+#define		  RELKIND_UNCATALOGED		'u'	/* not yet cataloged */
+
+#define		  RELPERSISTENCE_PERMANENT	'p'	/* regular table */
+#define		  RELPERSISTENCE_UNLOGGED	'u'	/* unlogged permanent table */
+#define		  RELPERSISTENCE_TEMP		't'	/* temporary table */
 
 #endif   /* PG_CLASS_H */
diff --git a/src/include/commands/matview.h b/src/include/commands/matview.h
new file mode 100644
index 0000000000000..a6c5249a24e2c
--- /dev/null
+++ b/src/include/commands/matview.h
@@ -0,0 +1,21 @@
+/*-------------------------------------------------------------------------
+ *
+ * view.h
+ *
+ *
+ *
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/commands/view.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef MATVIEW_H
+#define MATVIEW_H
+
+#include "nodes/parsenodes.h"
+
+extern void DefineMatView(MatViewStmt *stmt, const char *queryString);
+
+#endif   /* MATVIEW_H */
diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
index 3f971eb218f77..0e8bbe0929f35 100644
--- a/src/include/commands/tablecmds.h
+++ b/src/include/commands/tablecmds.h
@@ -14,6 +14,7 @@
 #ifndef TABLECMDS_H
 #define TABLECMDS_H
 
+#include "access/htup.h"
 #include "nodes/parsenodes.h"
 #include "storage/lock.h"
 #include "utils/relcache.h"
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 1a636a0987058..eba1bae24adb8 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -50,7 +50,8 @@ typedef struct QueryDesc
 	PlanState  *planstate;		/* tree of per-plan-node state */
 
 	/* This is always set NULL by the core system, but plugins can change it */
-	struct Instrumentation *totaltime;	/* total time spent in ExecutorRun */
+  struct Instrumentation *totaltime;	/* total time spent in ExecutorRun */
+  // int relOrMatView;
 } QueryDesc;
 
 /* in pquery.c */
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index bdd499bea662d..1d3cca8c5454c 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -163,8 +163,8 @@ extern TupleTableSlot *ExecFilterJunk(JunkFilter *junkfilter,
 /*
  * prototypes from functions in execMain.c
  */
-extern void ExecutorStart(QueryDesc *queryDesc, int eflags);
-extern void standard_ExecutorStart(QueryDesc *queryDesc, int eflags);
+extern void ExecutorStart(QueryDesc *queryDesc, int eflags, char relOrMat);
+extern void standard_ExecutorStart(QueryDesc *queryDesc, int eflags, char relOrMat);
 extern void ExecutorRun(QueryDesc *queryDesc,
 			ScanDirection direction, long count);
 extern void standard_ExecutorRun(QueryDesc *queryDesc,
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 16756616e5215..187c70a0e010b 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -354,7 +354,7 @@ typedef struct EState
 	/* Stuff used for firing triggers: */
 	List	   *es_trig_target_relations;		/* trigger-only ResultRelInfos */
 	TupleTableSlot *es_trig_tuple_slot; /* for trigger output tuples */
-	TupleTableSlot *es_trig_oldtup_slot;		/* for trigger old tuples */
+	TupleTableSlot *es_trig_oldtup_slot;		/* for TriggerEnabled */
 
 	/* Parameter info: */
 	ParamListInfo es_param_list_info;	/* values of external params */
@@ -401,6 +401,12 @@ typedef struct EState
 	HeapTuple  *es_epqTuple;	/* array of EPQ substitute tuples */
 	bool	   *es_epqTupleSet; /* true if EPQ tuple is provided */
 	bool	   *es_epqScanDone; /* true if EPQ tuple has been fetched */
+
+	/*
+	 * this field added at end of struct to avoid post-release ABI breakage in
+	 * existing release branches.  It'll be in a more logical place in 9.2.
+	 */
+	TupleTableSlot *es_trig_newtup_slot;		/* for TriggerEnabled */
 } EState;
 
 
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 61314608f53e0..812666211ef4d 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -35,7 +35,8 @@ extern Var *makeVarFromTargetEntry(Index varno,
 
 extern Var *makeWholeRowVar(RangeTblEntry *rte,
 				Index varno,
-				Index varlevelsup);
+				Index varlevelsup,
+				bool allowScalar);
 
 extern TargetEntry *makeTargetEntry(Expr *expr,
 				AttrNumber resno,
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index d8bc6b82143ee..c543bd66784ce 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -295,6 +295,7 @@ typedef enum NodeTag
 	T_RuleStmt,
 	T_NotifyStmt,
 	T_ListenStmt,
+	T_MatViewStmt,
 	T_UnlistenStmt,
 	T_TransactionStmt,
 	T_ViewStmt,
@@ -402,6 +403,13 @@ typedef enum NodeTag
 	T_WithClause,
 	T_CommonTableExpr,
 
+	/*
+	 * TAGS FOR REPLICATION GRAMMAR PARSE NODES (replnodes.h)
+	 */
+	T_IdentifySystemCmd,
+	T_BaseBackupCmd,
+	T_StartReplicationCmd,
+
 	/*
 	 * TAGS FOR RANDOM OTHER STUFF
 	 *
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 14937d4363ee7..1335b94ba5996 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -111,7 +111,9 @@ typedef struct Query
 	int			resultRelation; /* rtable index of target relation for
 								 * INSERT/UPDATE/DELETE; 0 for SELECT */
 
-	IntoClause *intoClause;		/* target for SELECT INTO / CREATE TABLE AS */
+  IntoClause *intoClause;		/* target for SELECT INTO / CREATE TABLE AS */
+
+  // int relOrMatView; /* Added to accomodate matview processing as "select ... into ..." */  
 
 	bool		hasAggs;		/* has aggregates in tlist or havingQual */
 	bool		hasWindowFuncs; /* has window functions in tlist */
@@ -1134,7 +1136,8 @@ typedef enum ObjectType
 	OBJECT_TSPARSER,
 	OBJECT_TSTEMPLATE,
 	OBJECT_TYPE,
-	OBJECT_VIEW
+	OBJECT_VIEW,
+    OBJECT_MAT_VIEW
 } ObjectType;
 
 /* ----------------------
@@ -1221,7 +1224,8 @@ typedef enum AlterTableType
 	AT_DropInherit,				/* NO INHERIT parent */
 	AT_AddOf,					/* OF <type_name> */
 	AT_DropOf,					/* NOT OF */
-	AT_GenericOptions,			/* OPTIONS (...) */
+	AT_GenericOptions, /* OPTIONS (...) */
+	AT_AddColumnToMatView			/* implicitly via CREATE OR REPLACE MAT VIEW */
 } AlterTableType;
 
 typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
@@ -1234,7 +1238,6 @@ typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 								 * constraint, or parent table */
 	DropBehavior behavior;		/* RESTRICT or CASCADE for DROP cases */
 	bool		missing_ok;		/* skip error if missing? */
-	bool		validated;
 } AlterTableCmd;
 
 
@@ -1469,8 +1472,9 @@ typedef struct CreateStmt
  *
  * If skip_validation is true then we skip checking that the existing rows
  * in the table satisfy the constraint, and just install the catalog entries
- * for the constraint.	This is currently used only during CREATE TABLE
- * (when we know the table must be empty).
+ * for the constraint.  A new FK constraint is marked as valid iff
+ * initially_valid is true.  (Usually skip_validation and initially_valid
+ * are inverses, but we can set both true if the table is known empty.)
  *
  * Constraint attributes (DEFERRABLE etc) are initially represented as
  * separate Constraint nodes for simplicity of parsing.  parse_utilcmd.c makes
@@ -1544,7 +1548,7 @@ typedef struct Constraint
 	char		fk_upd_action;	/* ON UPDATE action */
 	char		fk_del_action;	/* ON DELETE action */
 	bool		skip_validation;	/* skip validation of existing rows? */
-	bool		initially_valid;	/* start the new constraint as valid */
+	bool		initially_valid;	/* mark the new constraint as valid? */
 } Constraint;
 
 /* ----------------------
@@ -2338,6 +2342,21 @@ typedef struct ViewStmt
 	bool		replace;		/* replace an existing view? */
 } ViewStmt;
 
+/* ----------------------
+ *		Create MatView Statement
+ * ----------------------
+ */
+
+typedef struct MatViewStmt
+{
+	NodeTag		type;
+	RangeVar   *matView;			/* the view to be created */
+	List	   *aliases;		/* target column names */
+	Node	   *query;			/* the SELECT query */
+	bool		replace;		/* replace an existing view? */
+} MatViewStmt;
+
+
 /* ----------------------
  *		Load Statement
  * ----------------------
@@ -2417,7 +2436,7 @@ typedef enum VacuumOption
 	VACOPT_VERBOSE = 1 << 2,	/* print progress info */
 	VACOPT_FREEZE = 1 << 3,		/* FREEZE option */
 	VACOPT_FULL = 1 << 4,		/* FULL (non-concurrent) vacuum */
-	VACOPT_NOWAIT = 1 << 5
+	VACOPT_NOWAIT = 1 << 5		/* don't wait to get lock (autovacuum only) */
 } VacuumOption;
 
 typedef struct VacuumStmt
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 7c085b3f4f666..7ab0b34885ca6 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -488,7 +488,9 @@ typedef struct Join
  * The nestParams list identifies any executor Params that must be passed
  * into execution of the inner subplan carrying values from the current row
  * of the outer subplan.  Currently we restrict these values to be simple
- * Vars, but perhaps someday that'd be worth relaxing.
+ * Vars, but perhaps someday that'd be worth relaxing.  (Note: during plan
+ * creation, the paramval can actually be a PlaceHolderVar expression; but it
+ * must be a Var with varno OUTER_VAR by the time it gets to the executor.)
  * ----------------
  */
 typedef struct NestLoop
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index f6592697e4455..4a7178520fb05 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -491,6 +491,9 @@ typedef struct IndexOptInfo
 	bool		amsearchnulls;	/* can AM search for NULL/NOT NULL entries? */
 	bool		amhasgettuple;	/* does AM have amgettuple interface? */
 	bool		amhasgetbitmap; /* does AM have amgetbitmap interface? */
+
+	/* Added at end of struct to avoid ABI breakage in released branches */
+	bool		immediate;		/* is uniqueness enforced immediately? */
 } IndexOptInfo;
 
 
@@ -1429,13 +1432,16 @@ typedef struct MinMaxAggInfo
  *
  * Each paramlist item shows the absolute query level it is associated with,
  * where the outermost query is level 1 and nested subqueries have higher
- * numbers.  The item the parameter slot represents can be one of three kinds:
+ * numbers.  The item the parameter slot represents can be one of four kinds:
  *
  * A Var: the slot represents a variable of that level that must be passed
  * down because subqueries have outer references to it, or must be passed
  * from a NestLoop node of that level to its inner scan.  The varlevelsup
  * value in the Var will always be zero.
  *
+ * A PlaceHolderVar: this works much like the Var case.  It is currently
+ * only needed for NestLoop parameters, not outer references.
+ *
  * An Aggref (with an expression tree representing its argument): the slot
  * represents an aggregate expression that is an outer reference for some
  * subquery.  The Aggref itself has agglevelsup = 0, and its argument tree
@@ -1445,20 +1451,20 @@ typedef struct MinMaxAggInfo
  * for that subplan).  The absolute level shown for such items corresponds
  * to the parent query of the subplan.
  *
- * Note: we detect duplicate Var parameters and coalesce them into one slot,
- * but we do not bother to do this for Aggrefs, and it would be incorrect
- * to do so for Param slots.  Duplicate detection is actually *necessary*
- * in the case of NestLoop parameters since it serves to match up the usage
- * of a Param (in the inner scan) with the assignment of the value (in the
- * NestLoop node).	This might result in the same PARAM_EXEC slot being used
- * by multiple NestLoop nodes or SubPlan nodes, but no harm is done since
+ * Note: we detect duplicate Var and PlaceHolderVar parameters and coalesce
+ * them into one slot, but we do not bother to do this for Aggrefs, and it
+ * would be incorrect to do so for Param slots.  Duplicate detection is
+ * actually *necessary* for NestLoop parameters since it serves to match up
+ * the usage of a Param (in the inner scan) with the assignment of the value
+ * (in the NestLoop node). This might result in the same PARAM_EXEC slot being
+ * used by multiple NestLoop nodes or SubPlan nodes, but no harm is done since
  * the same value would be assigned anyway.
  */
 typedef struct PlannerParamItem
 {
 	NodeTag		type;
 
-	Node	   *item;			/* the Var, Aggref, or Param */
+	Node	   *item;			/* the Var, PlaceHolderVar, Aggref, or Param */
 	Index		abslevel;		/* its absolute query level */
 } PlannerParamItem;
 
diff --git a/src/include/replication/replnodes.h b/src/include/nodes/replnodes.h
similarity index 80%
rename from src/include/replication/replnodes.h
rename to src/include/nodes/replnodes.h
index e027f9203b987..8cbd18a24c970 100644
--- a/src/include/replication/replnodes.h
+++ b/src/include/nodes/replnodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * src/include/replication/replnodes.h
+ * src/include/nodes/replnodes.h
  *
  *-------------------------------------------------------------------------
  */
@@ -15,18 +15,8 @@
 #define REPLNODES_H
 
 #include "access/xlogdefs.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
+#include "nodes/pg_list.h"
 
-/*
- * NodeTags for replication parser
- */
-typedef enum ReplNodeTag
-{
-	T_IdentifySystemCmd = 10,
-	T_BaseBackupCmd,
-	T_StartReplicationCmd
-}	ReplNodeTag;
 
 /* ----------------------
  *		IDENTIFY_SYSTEM command
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index dde6d82db4d64..4cef7fadb2a55 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -48,7 +48,6 @@ extern Expr *make_ands_explicit(List *andclauses);
 extern List *make_ands_implicit(Expr *clause);
 
 extern bool contain_agg_clause(Node *clause);
-extern List *pull_agg_clause(Node *clause);
 extern void count_agg_clauses(PlannerInfo *root, Node *clause,
 				  AggClauseCosts *costs);
 
diff --git a/src/include/optimizer/placeholder.h b/src/include/optimizer/placeholder.h
index cce9e1ef1b143..5fbebfcb0c8dd 100644
--- a/src/include/optimizer/placeholder.h
+++ b/src/include/optimizer/placeholder.h
@@ -20,8 +20,10 @@
 extern PlaceHolderVar *make_placeholder_expr(PlannerInfo *root, Expr *expr,
 					  Relids phrels);
 extern PlaceHolderInfo *find_placeholder_info(PlannerInfo *root,
-					  PlaceHolderVar *phv);
-extern void find_placeholders_in_jointree(PlannerInfo *root);
+					  PlaceHolderVar *phv, bool create_new_ph);
+extern void find_placeholders_in_query(PlannerInfo *root);
+extern void mark_placeholder_maybe_needed(PlannerInfo *root,
+							  PlaceHolderInfo *phinfo, Relids relids);
 extern void update_placeholder_eval_levels(PlannerInfo *root,
 							   SpecialJoinInfo *new_sjinfo);
 extern void fix_placeholder_input_needed_levels(PlannerInfo *root);
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 5261691af69ca..69ba6b6923ff2 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -92,7 +92,7 @@ extern int	join_collapse_limit;
 extern void add_base_rels_to_query(PlannerInfo *root, Node *jtnode);
 extern void build_base_rel_tlists(PlannerInfo *root, List *final_tlist);
 extern void add_vars_to_targetlist(PlannerInfo *root, List *vars,
-					   Relids where_needed);
+					   Relids where_needed, bool create_new_ph);
 extern List *deconstruct_jointree(PlannerInfo *root);
 extern void distribute_restrictinfo_to_rels(PlannerInfo *root,
 								RestrictInfo *restrictinfo);
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index ff9e2b7f89f01..564865ad68f6f 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -29,7 +29,9 @@ extern void SS_finalize_plan(PlannerInfo *root, Plan *plan,
 				 bool attach_initplans);
 extern Param *SS_make_initplan_from_plan(PlannerInfo *root, Plan *plan,
 					Oid resulttype, int32 resulttypmod, Oid resultcollation);
-extern Param *assign_nestloop_param(PlannerInfo *root, Var *var);
+extern Param *assign_nestloop_param_var(PlannerInfo *root, Var *var);
+extern Param *assign_nestloop_param_placeholdervar(PlannerInfo *root,
+												   PlaceHolderVar *phv);
 extern int	SS_assign_special_param(PlannerInfo *root);
 
 #endif   /* SUBSELECT_H */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 7af59589dcbc5..a3b307d7fb650 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -14,13 +14,14 @@
 #ifndef TLIST_H
 #define TLIST_H
 
-#include "nodes/relation.h"
+#include "optimizer/var.h"
 
 
 extern TargetEntry *tlist_member(Node *node, List *targetlist);
 extern TargetEntry *tlist_member_ignore_relabel(Node *node, List *targetlist);
 
-extern List *flatten_tlist(List *tlist);
+extern List *flatten_tlist(List *tlist, PVCAggregateBehavior aggbehavior,
+			  PVCPlaceHolderBehavior phbehavior);
 extern List *add_to_flat_tlist(List *tlist, List *exprs);
 
 extern List *get_tlist_exprs(List *tlist, bool includeJunk);
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 33340dda0fa59..5d7e2d93e9110 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -16,11 +16,18 @@
 
 #include "nodes/relation.h"
 
+typedef enum
+{
+	PVC_REJECT_AGGREGATES,		/* throw error if Aggref found */
+	PVC_INCLUDE_AGGREGATES,		/* include Aggrefs in output list */
+	PVC_RECURSE_AGGREGATES		/* recurse into Aggref arguments */
+} PVCAggregateBehavior;
+
 typedef enum
 {
 	PVC_REJECT_PLACEHOLDERS,	/* throw error if PlaceHolderVar found */
 	PVC_INCLUDE_PLACEHOLDERS,	/* include PlaceHolderVars in output list */
-	PVC_RECURSE_PLACEHOLDERS	/* recurse into PlaceHolderVar argument */
+	PVC_RECURSE_PLACEHOLDERS	/* recurse into PlaceHolderVar arguments */
 } PVCPlaceHolderBehavior;
 
 extern Relids pull_varnos(Node *node);
@@ -30,7 +37,8 @@ extern bool contain_vars_of_level(Node *node, int levelsup);
 extern int	locate_var_of_level(Node *node, int levelsup);
 extern int	locate_var_of_relation(Node *node, int relid, int levelsup);
 extern int	find_minimum_var_level(Node *node);
-extern List *pull_var_clause(Node *node, PVCPlaceHolderBehavior behavior);
+extern List *pull_var_clause(Node *node, PVCAggregateBehavior aggbehavior,
+				PVCPlaceHolderBehavior phbehavior);
 extern Node *flatten_join_alias_vars(PlannerInfo *root, Node *node);
 
 #endif   /* VAR_H */
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index 12c2faf3de8fb..2e0fc4d4847ef 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -229,6 +229,7 @@ PG_KEYWORD("location", LOCATION, UNRESERVED_KEYWORD)
 PG_KEYWORD("lock", LOCK_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("mapping", MAPPING, UNRESERVED_KEYWORD)
 PG_KEYWORD("match", MATCH, UNRESERVED_KEYWORD)
+PG_KEYWORD("matview", MATVIEW, UNRESERVED_KEYWORD)
 PG_KEYWORD("maxvalue", MAXVALUE, UNRESERVED_KEYWORD)
 PG_KEYWORD("minute", MINUTE_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("minvalue", MINVALUE, UNRESERVED_KEYWORD)
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index ba860ee6d2369..0c3c70c24810c 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -569,16 +569,16 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.1beta2"
+#define PACKAGE_STRING "PostgreSQL 9.1.2"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "9.1beta2"
+#define PACKAGE_VERSION "9.1.2"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "9.1beta2"
+#define PG_VERSION "9.1.2"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90100
+#define PG_VERSION_NUM 90102
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "postgresql"
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index 5f4cf93a24900..6c8e31269c51d 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -218,7 +218,7 @@
  * Enable debugging print statements for WAL-related operations; see
  * also the wal_debug GUC var.
  */
-#define WAL_DEBUG
+/* #define WAL_DEBUG */
 
 /*
  * Enable tracing of resource consumption during sort operations;
diff --git a/src/include/port.h b/src/include/port.h
index 4c7ed64317748..088e02e780937 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -183,15 +183,6 @@ extern unsigned char pg_ascii_tolower(unsigned char ch);
 #ifdef printf
 #undef printf
 #endif
-/*
- * Versions of libintl >= 0.18? try to replace setlocale() with a macro
- * to their own versions.  Remove the macro, if it exists, because it
- * ends up calling the wrong version when the backend and libintl use
- * different versions of msvcrt.
- */
-#if defined(setlocale) && defined(WIN32)
-#undef setlocale
-#endif
 
 extern int	pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
 extern int
@@ -234,6 +225,27 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
 #endif
 #endif   /* USE_REPL_SNPRINTF */
 
+#if defined(WIN32)
+/*
+ * Versions of libintl >= 0.18? try to replace setlocale() with a macro
+ * to their own versions.  Remove the macro, if it exists, because it
+ * ends up calling the wrong version when the backend and libintl use
+ * different versions of msvcrt.
+ */
+#if defined(setlocale)
+#undef setlocale
+#endif
+
+/*
+ * Define our own wrapper macro around setlocale() to work around bugs in
+ * Windows' native setlocale() function.
+ */
+extern char *pgwin32_setlocale(int category, const char *locale);
+
+#define setlocale(a,b) pgwin32_setlocale(a,b)
+
+#endif   /* WIN32 */
+
 /* Portable prompt handling */
 extern char *simple_prompt(const char *prompt, int maxlen, bool echo);
 
diff --git a/src/include/replication/basebackup.h b/src/include/replication/basebackup.h
index 831c33fb4a932..7ce1f38372f62 100644
--- a/src/include/replication/basebackup.h
+++ b/src/include/replication/basebackup.h
@@ -5,14 +5,14 @@
  *
  * Portions Copyright (c) 2010-2011, PostgreSQL Global Development Group
  *
- * src/include/replication/walsender.h
+ * src/include/replication/basebackup.h
  *
  *-------------------------------------------------------------------------
  */
 #ifndef _BASEBACKUP_H
 #define _BASEBACKUP_H
 
-#include "replication/replnodes.h"
+#include "nodes/replnodes.h"
 
 extern void SendBaseBackup(BaseBackupCmd *cmd);
 
diff --git a/src/include/replication/syncrep.h b/src/include/replication/syncrep.h
index efbebbcc06e38..d71047e14703d 100644
--- a/src/include/replication/syncrep.h
+++ b/src/include/replication/syncrep.h
@@ -33,8 +33,8 @@ extern char *SyncRepStandbyNames;
 /* called by user backend */
 extern void SyncRepWaitForLSN(XLogRecPtr XactCommitLSN);
 
-/* callback at backend exit */
-extern void SyncRepCleanupAtProcExit(int code, Datum arg);
+/* called at backend exit */
+extern void SyncRepCleanupAtProcExit(void);
 
 /* called by wal sender */
 extern void SyncRepInitConfig(void);
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index 77417ba034ae3..3836e6ef017f1 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -16,6 +16,8 @@
 
 /* The ON SELECT rule of a view is always named this: */
 #define ViewSelectRuleName	"_RETURN"
+/* The ON SELECT rule of a mat view is named this: */
+#define MatViewSelectRuleName	"_RETURN_MAT"
 
 extern bool IsDefinedRewriteRule(Oid owningRel, const char *ruleName);
 
diff --git a/src/include/storage/latch.h b/src/include/storage/latch.h
index 03ec07119b904..4da28566a6807 100644
--- a/src/include/storage/latch.h
+++ b/src/include/storage/latch.h
@@ -3,6 +3,66 @@
  * latch.h
  *	  Routines for interprocess latches
  *
+ * A latch is a boolean variable, with operations that let processes sleep
+ * until it is set. A latch can be set from another process, or a signal
+ * handler within the same process.
+ *
+ * The latch interface is a reliable replacement for the common pattern of
+ * using pg_usleep() or select() to wait until a signal arrives, where the
+ * signal handler sets a flag variable. Because on some platforms an
+ * incoming signal doesn't interrupt sleep, and even on platforms where it
+ * does there is a race condition if the signal arrives just before
+ * entering the sleep, the common pattern must periodically wake up and
+ * poll the flag variable. The pselect() system call was invented to solve
+ * this problem, but it is not portable enough. Latches are designed to
+ * overcome these limitations, allowing you to sleep without polling and
+ * ensuring quick response to signals from other processes.
+ *
+ * There are two kinds of latches: local and shared. A local latch is
+ * initialized by InitLatch, and can only be set from the same process.
+ * A local latch can be used to wait for a signal to arrive, by calling
+ * SetLatch in the signal handler. A shared latch resides in shared memory,
+ * and must be initialized at postmaster startup by InitSharedLatch. Before
+ * a shared latch can be waited on, it must be associated with a process
+ * with OwnLatch. Only the process owning the latch can wait on it, but any
+ * process can set it.
+ *
+ * There are three basic operations on a latch:
+ *
+ * SetLatch		- Sets the latch
+ * ResetLatch	- Clears the latch, allowing it to be set again
+ * WaitLatch	- Waits for the latch to become set
+ *
+ * WaitLatch includes a provision for timeouts (which should hopefully not
+ * be necessary once the code is fully latch-ified).
+ * See unix_latch.c for detailed specifications for the exported functions.
+ *
+ * The correct pattern to wait for event(s) is:
+ *
+ * for (;;)
+ * {
+ *	   ResetLatch();
+ *	   if (work to do)
+ *		   Do Stuff();
+ *	   WaitLatch();
+ * }
+ *
+ * It's important to reset the latch *before* checking if there's work to
+ * do. Otherwise, if someone sets the latch between the check and the
+ * ResetLatch call, you will miss it and Wait will incorrectly block.
+ *
+ * To wake up the waiter, you must first set a global flag or something
+ * else that the wait loop tests in the "if (work to do)" part, and call
+ * SetLatch *after* that. SetLatch is designed to return quickly if the
+ * latch is already set.
+ *
+ * Presently, when using a shared latch for interprocess signalling, the
+ * flag variable(s) set by senders and inspected by the wait loop must
+ * be protected by spinlocks or LWLocks, else it is possible to miss events
+ * on machines with weak memory ordering (such as PPC).  This restriction
+ * will be lifted in future by inserting suitable memory barriers into
+ * SetLatch and ResetLatch.
+ *
  *
  * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
@@ -44,16 +104,17 @@ extern int WaitLatchOrSocket(volatile Latch *latch, pgsocket sock,
 extern void SetLatch(volatile Latch *latch);
 extern void ResetLatch(volatile Latch *latch);
 
-#define TestLatch(latch) (((volatile Latch *) latch)->is_set)
+/* beware of memory ordering issues if you use this macro! */
+#define TestLatch(latch) (((volatile Latch *) (latch))->is_set)
 
 /*
- * Unix implementation uses SIGUSR1 for inter-process signaling, Win32 doesn't
- * need this.
+ * Unix implementation uses SIGUSR1 for inter-process signaling.
+ * Win32 doesn't need this.
  */
 #ifndef WIN32
 extern void latch_sigusr1_handler(void);
 #else
-#define latch_sigusr1_handler()
+#define latch_sigusr1_handler()  ((void) 0)
 #endif
 
 #endif   /* LATCH_H */
diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h
index 760c76cff069e..5ddbc1d3f4135 100644
--- a/src/include/storage/predicate.h
+++ b/src/include/storage/predicate.h
@@ -39,23 +39,24 @@ extern Size PredicateLockShmemSize(void);
 extern void CheckPointPredicate(void);
 
 /* predicate lock reporting */
-extern bool PageIsPredicateLocked(const Relation relation, const BlockNumber blkno);
+extern bool PageIsPredicateLocked(Relation relation, BlockNumber blkno);
 
 /* predicate lock maintenance */
 extern Snapshot RegisterSerializableTransaction(Snapshot snapshot);
-extern void RegisterPredicateLockingXid(const TransactionId xid);
-extern void PredicateLockRelation(const Relation relation);
-extern void PredicateLockPage(const Relation relation, const BlockNumber blkno);
-extern void PredicateLockTuple(const Relation relation, const HeapTuple tuple);
-extern void PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno, const BlockNumber newblkno);
-extern void PredicateLockPageCombine(const Relation relation, const BlockNumber oldblkno, const BlockNumber newblkno);
-extern void TransferPredicateLocksToHeapRelation(const Relation relation);
-extern void ReleasePredicateLocks(const bool isCommit);
+extern void RegisterPredicateLockingXid(TransactionId xid);
+extern void PredicateLockRelation(Relation relation, Snapshot snapshot);
+extern void PredicateLockPage(Relation relation, BlockNumber blkno, Snapshot snapshot);
+extern void PredicateLockTuple(Relation relation, HeapTuple tuple, Snapshot snapshot);
+extern void PredicateLockPageSplit(Relation relation, BlockNumber oldblkno, BlockNumber newblkno);
+extern void PredicateLockPageCombine(Relation relation, BlockNumber oldblkno, BlockNumber newblkno);
+extern void TransferPredicateLocksToHeapRelation(Relation relation);
+extern void ReleasePredicateLocks(bool isCommit);
 
 /* conflict detection (may also trigger rollback) */
-extern void CheckForSerializableConflictOut(const bool valid, const Relation relation, const HeapTuple tuple, const Buffer buffer);
-extern void CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple, const Buffer buffer);
-extern void CheckTableForSerializableConflictIn(const Relation relation);
+extern void CheckForSerializableConflictOut(bool valid, Relation relation, HeapTuple tuple,
+								Buffer buffer, Snapshot snapshot);
+extern void CheckForSerializableConflictIn(Relation relation, HeapTuple tuple, Buffer buffer);
+extern void CheckTableForSerializableConflictIn(Relation relation);
 
 /* final rollback checking */
 extern void PreCommit_CheckForSerializationFailure(void);
diff --git a/src/include/storage/predicate_internals.h b/src/include/storage/predicate_internals.h
index da6e641f4e4ec..fcbf2d8a22021 100644
--- a/src/include/storage/predicate_internals.h
+++ b/src/include/storage/predicate_internals.h
@@ -57,9 +57,26 @@ typedef struct SERIALIZABLEXACT
 {
 	VirtualTransactionId vxid;	/* The executing process always has one of
 								 * these. */
+
+	/*
+	 * We use two numbers to track the order that transactions commit. Before
+	 * commit, a transaction is marked as prepared, and prepareSeqNo is set.
+	 * Shortly after commit, it's marked as committed, and commitSeqNo is set.
+	 * This doesn't give a strict commit order, but these two values together
+	 * are good enough for us, as we can always err on the safe side and
+	 * assume that there's a conflict, if we can't be sure of the exact
+	 * ordering of two commits.
+	 *
+	 * Note that a transaction is marked as prepared for a short period during
+	 * commit processing, even if two-phase commit is not used. But with
+	 * two-phase commit, a transaction can stay in prepared state for some
+	 * time.
+	 */
+	SerCommitSeqNo prepareSeqNo;
 	SerCommitSeqNo commitSeqNo;
-	union						/* these values are not both interesting at
-								 * the same time */
+
+	/* these values are not both interesting at the same time */
+	union
 	{
 		SerCommitSeqNo earliestOutConflictCommit;		/* when committed with
 														 * conflict out */
@@ -90,22 +107,22 @@ typedef struct SERIALIZABLEXACT
 	int			pid;			/* pid of associated process */
 } SERIALIZABLEXACT;
 
-#define SXACT_FLAG_ROLLED_BACK				0x00000001
-#define SXACT_FLAG_COMMITTED				0x00000002
+#define SXACT_FLAG_COMMITTED			0x00000001		/* already committed */
+#define SXACT_FLAG_PREPARED				0x00000002		/* about to commit */
+#define SXACT_FLAG_ROLLED_BACK			0x00000004		/* already rolled back */
+#define SXACT_FLAG_DOOMED				0x00000008		/* will roll back */
 /*
  * The following flag actually means that the flagged transaction has a
  * conflict out *to a transaction which committed ahead of it*.  It's hard
  * to get that into a name of a reasonable length.
  */
-#define SXACT_FLAG_CONFLICT_OUT				0x00000004
-#define SXACT_FLAG_READ_ONLY				0x00000008
-#define SXACT_FLAG_MARKED_FOR_DEATH			0x00000010
-#define SXACT_FLAG_DEFERRABLE_WAITING		0x00000020
-#define SXACT_FLAG_RO_SAFE					0x00000040
-#define SXACT_FLAG_RO_UNSAFE				0x00000080
-#define SXACT_FLAG_SUMMARY_CONFLICT_IN		0x00000100
-#define SXACT_FLAG_SUMMARY_CONFLICT_OUT		0x00000200
-#define SXACT_FLAG_PREPARED					0x00000400
+#define SXACT_FLAG_CONFLICT_OUT			0x00000010
+#define SXACT_FLAG_READ_ONLY			0x00000020
+#define SXACT_FLAG_DEFERRABLE_WAITING	0x00000040
+#define SXACT_FLAG_RO_SAFE				0x00000080
+#define SXACT_FLAG_RO_UNSAFE			0x00000100
+#define SXACT_FLAG_SUMMARY_CONFLICT_IN	0x00000200
+#define SXACT_FLAG_SUMMARY_CONFLICT_OUT 0x00000400
 
 /*
  * The following types are used to provide an ad hoc list for holding
@@ -133,8 +150,8 @@ typedef struct PredXactListData
 	/*
 	 * These global variables are maintained when registering and cleaning up
 	 * serializable transactions.  They must be global across all backends,
-	 * but are not needed outside the predicate.c source file. Protected
-	 * by SerializableXactHashLock.
+	 * but are not needed outside the predicate.c source file. Protected by
+	 * SerializableXactHashLock.
 	 */
 	TransactionId SxactGlobalXmin;		/* global xmin for active serializable
 										 * transactions */
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 4819cb8110817..7b181b22bc89e 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -15,7 +15,6 @@
 #define _PROC_H_
 
 #include "access/xlog.h"
-#include "replication/syncrep.h"
 #include "storage/latch.h"
 #include "storage/lock.h"
 #include "storage/pg_sema.h"
@@ -118,13 +117,14 @@ struct PGPROC
 	LOCKMASK	heldLocks;		/* bitmask for lock types already held on this
 								 * lock object by this backend */
 
+	Latch		procLatch;		/* generic latch for process */
+
 	/*
 	 * Info to allow us to wait for synchronous replication, if needed.
 	 * waitLSN is InvalidXLogRecPtr if not waiting; set only by user backend.
 	 * syncRepState must not be touched except by owning process or WALSender.
 	 * syncRepLinks used only while holding SyncRepLock.
 	 */
-	Latch		waitLatch;		/* allow us to wait for sync rep */
 	XLogRecPtr	waitLSN;		/* waiting for this LSN or higher */
 	int			syncRepState;	/* wait state for sync rep */
 	SHM_QUEUE	syncRepLinks;	/* list link if process is in syncrep queue */
@@ -159,7 +159,7 @@ typedef struct PROC_HDR
 	/* The proc of the Startup process, since not in ProcArray */
 	PGPROC	   *startupProc;
 	int			startupProcPid;
-	/* Buffer id of the buffer that Startup process waits for pin on */
+	/* Buffer id of the buffer that Startup process waits for pin on, or -1 */
 	int			startupBufferPinWaitBufId;
 } PROC_HDR;
 
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
index 3c20fc48f6767..efe40c9ca81e6 100644
--- a/src/include/storage/procarray.h
+++ b/src/include/storage/procarray.h
@@ -46,6 +46,7 @@ extern Snapshot GetSnapshotData(Snapshot snapshot);
 extern bool TransactionIdIsInProgress(TransactionId xid);
 extern bool TransactionIdIsActive(TransactionId xid);
 extern TransactionId GetOldestXmin(bool allDbs, bool ignoreVacuum);
+extern TransactionId GetOldestActiveTransactionId(void);
 
 extern int	GetTransactionsInCommit(TransactionId **xids_p);
 extern bool HaveTransactionsInCommit(TransactionId *xids, int nxids);
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index 690b4070af856..e587a5c4a4dcb 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -35,7 +35,7 @@ extern void ResolveRecoveryConflictWithDatabase(Oid dbid);
 
 extern void ResolveRecoveryConflictWithBufferPin(void);
 extern void SendRecoveryConflictWithBufferPin(ProcSignalReason reason);
-extern void CheckRecoveryConflictDeadlock(LWLockId partitionLock);
+extern void CheckRecoveryConflictDeadlock(void);
 
 /*
  * Standby Rmgr (RM_STANDBY_ID)
@@ -111,6 +111,6 @@ typedef RunningTransactionsData *RunningTransactions;
 extern void LogAccessExclusiveLock(Oid dbOid, Oid relOid);
 extern void LogAccessExclusiveLockPrepare(void);
 
-extern void LogStandbySnapshot(TransactionId *oldestActiveXid, TransactionId *nextXid);
+extern void LogStandbySnapshot(TransactionId *nextXid);
 
 #endif   /* STANDBY_H */
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 4a3bd02689515..93b141d683915 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -146,6 +146,12 @@ errdetail(const char *fmt,...)
    the supplied arguments. */
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
 
+extern int
+errdetail_internal(const char *fmt,...)
+/* This extension allows gcc to check the format string for consistency with
+   the supplied arguments. */
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
+
 extern int
 errdetail_log(const char *fmt,...)
 /* This extension allows gcc to check the format string for consistency with
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index ee52cd735e337..8975561b20e12 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -155,7 +155,7 @@ typedef enum
 	/* Types of set_config_option actions */
 	GUC_ACTION_SET,				/* regular SET command */
 	GUC_ACTION_LOCAL,			/* SET LOCAL command */
-	GUC_ACTION_SAVE				/* function SET option */
+	GUC_ACTION_SAVE				/* function SET option, or temp assignment */
 } GucAction;
 
 #define GUC_QUALIFIER_SEPARATOR '.'
@@ -296,7 +296,8 @@ extern void DefineCustomEnumVariable(
 
 extern void EmitWarningsOnPlaceholders(const char *className);
 
-extern const char *GetConfigOption(const char *name, bool restrict_superuser);
+extern const char *GetConfigOption(const char *name, bool missing_ok,
+				bool restrict_superuser);
 extern const char *GetConfigOptionResetString(const char *name);
 extern void ProcessConfigFile(GucContext context);
 extern void InitializeGUCOptions(void);
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index a1ca012ef9a7b..7f8c69fcf4dbb 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -67,8 +67,9 @@ enum config_group
 	WAL_SETTINGS,
 	WAL_CHECKPOINTS,
 	WAL_ARCHIVING,
-	WAL_REPLICATION,
-	WAL_STANDBY_SERVERS,
+	REPLICATION,
+	REPLICATION_MASTER,
+	REPLICATION_STANDBY,
 	QUERY_TUNING,
 	QUERY_TUNING_METHOD,
 	QUERY_TUNING_COST,
diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h
index 9626a2de81f61..fa217b6611698 100644
--- a/src/include/utils/inet.h
+++ b/src/include/utils/inet.h
@@ -70,9 +70,11 @@ typedef struct macaddr
 /*
  * fmgr interface macros
  */
-#define DatumGetInetP(X)	((inet *) PG_DETOAST_DATUM_PACKED(X))
+#define DatumGetInetP(X)	((inet *) PG_DETOAST_DATUM(X))
+#define DatumGetInetPP(X)	((inet *) PG_DETOAST_DATUM_PACKED(X))
 #define InetPGetDatum(X)	PointerGetDatum(X)
 #define PG_GETARG_INET_P(n) DatumGetInetP(PG_GETARG_DATUM(n))
+#define PG_GETARG_INET_PP(n) DatumGetInetP(PG_GETARG_DATUM_PACKED(n))
 #define PG_RETURN_INET_P(x) return InetPGetDatum(x)
 /* macaddr is a fixed-length pass-by-reference datatype */
 #define DatumGetMacaddrP(X)    ((macaddr *) DatumGetPointer(X))
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 0a419dcf65b4b..f4490adc31892 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -17,6 +17,15 @@
 #include "access/htup.h"
 #include "nodes/pg_list.h"
 
+/* Result list element for get_op_btree_interpretation */
+typedef struct OpBtreeInterpretation
+{
+	Oid			opfamily_id;		/* btree opfamily containing operator */
+	int			strategy;			/* its strategy number */
+	Oid			oplefttype;			/* declared left input datatype */
+	Oid			oprighttype;		/* declared right input datatype */
+} OpBtreeInterpretation;
+
 /* I/O function selector for get_type_io_data */
 typedef enum IOFuncSelector
 {
@@ -50,8 +59,7 @@ extern bool get_compatible_hash_operators(Oid opno,
 							  Oid *lhs_opno, Oid *rhs_opno);
 extern bool get_op_hash_functions(Oid opno,
 					  RegProcedure *lhs_procno, RegProcedure *rhs_procno);
-extern void get_op_btree_interpretation(Oid opno,
-							List **opfamilies, List **opstrats);
+extern List *get_op_btree_interpretation(Oid opno);
 extern bool equality_ops_are_compatible(Oid opno1, Oid opno2);
 extern Oid get_opfamily_proc(Oid opfamily, Oid lefttype, Oid righttype,
 				  int16 procnum);
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 1f4def5684571..5de9f359ef2d5 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -97,7 +97,8 @@ extern void AtEOSubXact_RelationCache(bool isCommit, SubTransactionId mySubid,
  * Routines to help manage rebuilding of relcache init files
  */
 extern bool RelationIdIsInInitFile(Oid relationId);
-extern void RelationCacheInitFileInvalidate(bool beforeSend);
+extern void RelationCacheInitFilePreInvalidate(void);
+extern void RelationCacheInitFilePostInvalidate(void);
 extern void RelationCacheInitFileRemove(void);
 
 /* should be used only by relcache.c and catcache.c */
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index cdf84c3b09c27..2b2ffb6207327 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -26,7 +26,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))
 
 OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o memory.o \
 	connect.o misc.o path.o pgstrcasecmp.o \
-	$(filter snprintf.o strlcpy.o, $(LIBOBJS))
+	$(filter snprintf.o strlcpy.o win32setlocale.o, $(LIBOBJS))
 
 # thread.c is needed only for non-WIN32 implementation of path.c
 ifneq ($(PORTNAME), win32)
@@ -57,7 +57,7 @@ include $(top_srcdir)/src/Makefile.shlib
 # necessarily use the same object files as the backend uses. Instead,
 # symlink the source files in here and build our own object file.
 
-path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/%
+path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h
@@ -74,6 +74,6 @@ uninstall: uninstall-lib
 
 clean distclean: clean-lib
 	rm -f $(OBJS)
-	rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c
+	rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c
 
 maintainer-clean: distclean maintainer-clean-lib
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 970fa93509970..2fb54392c9e80 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -478,7 +478,7 @@ sprintf_double_value(char *ptr, double value, const char *delim)
 			sprintf(ptr, "%s%s", "Infinity", delim);
 	}
 	else
-		sprintf(ptr, "%.14g%s", value, delim);
+		sprintf(ptr, "%.15g%s", value, delim);
 }
 
 static void
@@ -494,7 +494,7 @@ sprintf_float_value(char *ptr, float value, const char *delim)
 			sprintf(ptr, "%s%s", "Infinity", delim);
 	}
 	else
-		sprintf(ptr, "%.14g%s", value, delim);
+		sprintf(ptr, "%.15g%s", value, delim);
 }
 
 bool
@@ -1675,7 +1675,7 @@ ecpg_execute(struct statement * stmt)
 					if (PQresultStatus(results) == PGRES_COMMAND_OK)
 						ecpg_log("ecpg_execute on line %d: got PGRES_COMMAND_OK after PGRES_COPY_OUT\n", stmt->lineno);
 					else
-						ecpg_log("ecpg_execute on line %d: got error after PGRES_COPY_OUT: %s", PQresultErrorMessage(results));
+						ecpg_log("ecpg_execute on line %d: got error after PGRES_COPY_OUT: %s", stmt->lineno, PQresultErrorMessage(results));
 				}
 				break;
 			}
@@ -1698,7 +1698,7 @@ ecpg_execute(struct statement * stmt)
 	notify = PQnotifies(stmt->connection->connection);
 	if (notify)
 	{
-		ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend pid %d received\n",
+		ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend PID %d received\n",
 				 stmt->lineno, notify->relname, notify->be_pid);
 		PQfreemem(notify);
 	}
@@ -1773,7 +1773,12 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
 	if (statement_type == ECPGst_prepnormal)
 	{
 		if (!ecpg_auto_prepare(lineno, connection_name, compat, &prepname, query))
+		{
+			setlocale(LC_NUMERIC, oldlocale);
+			ecpg_free(oldlocale);
+			va_end(args);
 			return (false);
+		}
 
 		/*
 		 * statement is now prepared, so instead of the query we have to
@@ -1800,6 +1805,9 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
 		else
 		{
 			ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);
+			setlocale(LC_NUMERIC, oldlocale);
+			ecpg_free(oldlocale);
+			va_end(args);
 			return (false);
 		}
 	}
diff --git a/src/interfaces/ecpg/ecpglib/nls.mk b/src/interfaces/ecpg/ecpglib/nls.mk
index e78b83dba69de..f7d4c8cd409ef 100644
--- a/src/interfaces/ecpg/ecpglib/nls.mk
+++ b/src/interfaces/ecpg/ecpglib/nls.mk
@@ -1,5 +1,5 @@
 # src/interfaces/ecpg/ecpglib/nls.mk
 CATALOG_NAME	 = ecpglib
-AVAIL_LANGUAGES	 = de es fr it ja pt_BR tr zh_CN
+AVAIL_LANGUAGES	 = cs de es fr it ja pl pt_BR tr zh_CN
 GETTEXT_FILES	 = connect.c error.c execute.c misc.c
 GETTEXT_TRIGGERS = ecpg_gettext
diff --git a/src/interfaces/ecpg/ecpglib/po/cs.po b/src/interfaces/ecpg/ecpglib/po/cs.po
new file mode 100644
index 0000000000000..fb2184b990d4a
--- /dev/null
+++ b/src/interfaces/ecpg/ecpglib/po/cs.po
@@ -0,0 +1,174 @@
+# LANGUAGE message translation file for ecpglib
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-03 19:41+0200\n"
+"PO-Revision-Date: 2011-09-04 23:29+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: connect.c:224
+msgid "empty message text"
+msgstr "prázdný text zprávy"
+
+#: connect.c:379 connect.c:405 connect.c:518
+msgid "<DEFAULT>"
+msgstr "<V�CHOZ�>"
+
+#: error.c:29
+#, c-format
+msgid "no data found on line %d"
+msgstr "na řádce %d nenalezena žádná data"
+
+#: error.c:39
+#, c-format
+msgid "out of memory on line %d"
+msgstr "nedostatek paměti na řádce %d"
+
+#: error.c:49
+#, c-format
+msgid "unsupported type \"%s\" on line %d"
+msgstr "nepodporovaný typ \"%s\" na řádce %d"
+
+#: error.c:59
+#, c-format
+msgid "too many arguments on line %d"
+msgstr "příliš mnoho argumentů na řádce %d"
+
+#: error.c:69
+#, c-format
+msgid "too few arguments on line %d"
+msgstr "příliš málo argumentů na řádce %d"
+
+#: error.c:79
+#, c-format
+msgid "invalid input syntax for type int: \"%s\", on line %d"
+msgstr "chybná vstupní syntaxe pro typ int: \"%s\", na řádce %d"
+
+#: error.c:89
+#, c-format
+msgid "invalid input syntax for type unsigned int: \"%s\", on line %d"
+msgstr "chybná vstupní syntaxe pro typ unsigned int: \"%s\", na řádce %d"
+
+#: error.c:99
+#, c-format
+msgid "invalid input syntax for floating-point type: \"%s\", on line %d"
+msgstr "chybná vstupní syntaxe pro typ floating-point: \"%s\", na řádce %d"
+
+#: error.c:110
+#, c-format
+msgid "invalid syntax for type boolean: \"%s\", on line %d"
+msgstr "chybná vstupní syntaxe pro typ boolean: \"%s\", na řádce %d"
+
+#: error.c:118
+#, c-format
+msgid "could not convert boolean value: size mismatch, on line %d"
+msgstr "nelze zkonvertovat boolean hodnotu: nesprávná velikost, na řádce %d"
+
+#: error.c:128
+#, c-format
+msgid "empty query on line %d"
+msgstr "prázdný dotaz na řádce %d"
+
+#: error.c:138
+#, c-format
+msgid "null value without indicator on line %d"
+msgstr "null hodnota bez indikátoru na řádce %d"
+
+#: error.c:148
+#, c-format
+msgid "variable does not have an array type on line %d"
+msgstr "proměnná nemá datový typ pole na řádce %d"
+
+#: error.c:158
+#, c-format
+msgid "data read from server is not an array on line %d"
+msgstr "data na�tená ze serveru nejsou pole na řádce %d"
+
+#: error.c:168
+#, c-format
+msgid "inserting an array of variables is not supported on line %d"
+msgstr "vkládání pole proměnných není podporováno na řádce %d"
+
+#: error.c:178
+#, c-format
+msgid "connection \"%s\" does not exist on line %d"
+msgstr "spojení \"%s\" neexistuje na řádce %d"
+
+#: error.c:188
+#, c-format
+msgid "not connected to connection \"%s\" on line %d"
+msgstr "neotevřené spojení \"%s\" na řádce %d"
+
+#: error.c:198
+#, c-format
+msgid "invalid statement name \"%s\" on line %d"
+msgstr "neplatný název příkazu \"%s\" na řádce %d"
+
+#: error.c:208
+#, c-format
+msgid "descriptor \"%s\" not found on line %d"
+msgstr "deskriptor \"%s\" nenalezen na řádce %d"
+
+#: error.c:218
+#, c-format
+msgid "descriptor index out of range on line %d"
+msgstr "index deskriptoru mimo rozsah na řádce %d"
+
+#: error.c:228
+#, c-format
+msgid "unrecognized descriptor item \"%s\" on line %d"
+msgstr "nerozpoznaná položka deskriptoru \"%s\" na řádce %d"
+
+#: error.c:238
+#, c-format
+msgid "variable does not have a numeric type on line %d"
+msgstr "proměnná nemá �íselný datový typ na řádce %d"
+
+#: error.c:248
+#, c-format
+msgid "variable does not have a character type on line %d"
+msgstr "proměnná nemá znakový datový typ na řádce %d"
+
+#: error.c:258
+#, c-format
+msgid "error in transaction processing on line %d"
+msgstr "chyba v transak�ním zpracování na řádce %d"
+
+#: error.c:268
+#, c-format
+msgid "could not connect to database \"%s\" on line %d"
+msgstr "nelze se spojit s databází \"%s\" na řádce %d"
+
+#: error.c:278
+#, c-format
+msgid "SQL error %d on line %d"
+msgstr "SQL chyba %d na řádce %d"
+
+#: error.c:318
+msgid "the connection to the server was lost"
+msgstr "spojení se serverem bylo ztraceno"
+
+#: error.c:405
+#, c-format
+msgid "SQL error: %s\n"
+msgstr "SQL chyba: %s\n"
+
+#: execute.c:1919
+msgid "<empty>"
+msgstr "<prázdný>"
+
+#: misc.c:113
+msgid "NULL"
+msgstr "NULL"
diff --git a/src/interfaces/ecpg/ecpglib/po/pl.po b/src/interfaces/ecpg/ecpglib/po/pl.po
new file mode 100644
index 0000000000000..7dbc4fe82ee1e
--- /dev/null
+++ b/src/interfaces/ecpg/ecpglib/po/pl.po
@@ -0,0 +1,176 @@
+# Polish message translation file for ecpglib
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ecpglib (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:57+0000\n"
+"PO-Revision-Date: 2011-09-30 09:51-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: connect.c:224
+msgid "empty message text"
+msgstr "pusty tekst komunikatu"
+
+#: connect.c:379 connect.c:405 connect.c:518
+msgid "<DEFAULT>"
+msgstr "<DOMYÅšLNIE>"
+
+#: error.c:29
+#, c-format
+msgid "no data found on line %d"
+msgstr "nie znaleziono danych, linia %d"
+
+#: error.c:39
+#, c-format
+msgid "out of memory on line %d"
+msgstr "brak pamięci, linia %d"
+
+#: error.c:49
+#, c-format
+msgid "unsupported type \"%s\" on line %d"
+msgstr "nieobsługiwany typ \"%s\", linia %d"
+
+#: error.c:59
+#, c-format
+msgid "too many arguments on line %d"
+msgstr "zbyt wiele argumentów, linia %d"
+
+#: error.c:69
+#, c-format
+msgid "too few arguments on line %d"
+msgstr "zbyt mało argumentów, linia %d"
+
+#: error.c:79
+#, c-format
+msgid "invalid input syntax for type int: \"%s\", on line %d"
+msgstr "niepoprawna składnia wejścia dla typu int: \"%s\", linia %d"
+
+#: error.c:89
+#, c-format
+msgid "invalid input syntax for type unsigned int: \"%s\", on line %d"
+msgstr "niepoprawna składnia wejścia dla typu unsigned int: \"%s\", linia %d"
+
+#: error.c:99
+#, c-format
+msgid "invalid input syntax for floating-point type: \"%s\", on line %d"
+msgstr "niepoprawna składnia wejścia dla typu floating-point: \"%s\", linia %d"
+
+#: error.c:110
+#, c-format
+msgid "invalid syntax for type boolean: \"%s\", on line %d"
+msgstr "niepoprawna składnia wejścia dla typu boolean: \"%s\", linia %d"
+
+#: error.c:118
+#, c-format
+msgid "could not convert boolean value: size mismatch, on line %d"
+msgstr ""
+"nie można przekształcić wartości logicznej: niepoprawny rozmiar, linia %d"
+
+#: error.c:128
+#, c-format
+msgid "empty query on line %d"
+msgstr "puste zapytanie, linia %d"
+
+#: error.c:138
+#, c-format
+msgid "null value without indicator on line %d"
+msgstr "wartość null bez wskaźnika, linia %d"
+
+#: error.c:148
+#, c-format
+msgid "variable does not have an array type on line %d"
+msgstr "zmienna nie ma typu array, linia %d"
+
+#: error.c:158
+#, c-format
+msgid "data read from server is not an array on line %d"
+msgstr "dane odczytane z serwera nie sÄ… tablicÄ…, linia %d"
+
+#: error.c:168
+#, c-format
+msgid "inserting an array of variables is not supported on line %d"
+msgstr "wstawienie tablicy zmiennych nie jest obsługiwane, linia %d"
+
+#: error.c:178
+#, c-format
+msgid "connection \"%s\" does not exist on line %d"
+msgstr "połączenie \"%s\" nie istnieje, linia %d"
+
+#: error.c:188
+#, c-format
+msgid "not connected to connection \"%s\" on line %d"
+msgstr "nie wykonano połączenia z \"%s\", linia %d"
+
+#: error.c:198
+#, c-format
+msgid "invalid statement name \"%s\" on line %d"
+msgstr "niepoprawna nazwa wyrażenia \"%s\", linia %d"
+
+#: error.c:208
+#, c-format
+msgid "descriptor \"%s\" not found on line %d"
+msgstr "nie odnaleziono deskryptora \"%s\", linia %d"
+
+#: error.c:218
+#, c-format
+msgid "descriptor index out of range on line %d"
+msgstr "indeks deskryptora poza zakresem, linia %d"
+
+#: error.c:228
+#, c-format
+msgid "unrecognized descriptor item \"%s\" on line %d"
+msgstr "niezrozumiały element deskryptora \"%s\", linia %d"
+
+#: error.c:238
+#, c-format
+msgid "variable does not have a numeric type on line %d"
+msgstr "zmienna nie ma typu typu numeric, linia %d"
+
+#: error.c:248
+#, c-format
+msgid "variable does not have a character type on line %d"
+msgstr "zmienna nie ma typu typu character, linia %d"
+
+#: error.c:258
+#, c-format
+msgid "error in transaction processing on line %d"
+msgstr "błąd w przetwarzaniu transakcji, linia %d"
+
+#: error.c:268
+#, c-format
+msgid "could not connect to database \"%s\" on line %d"
+msgstr "nie można połączyć się z bazą danych \"%s\", linia %d"
+
+#: error.c:278
+#, c-format
+msgid "SQL error %d on line %d"
+msgstr "błąd SQL %d, linia %d"
+
+#: error.c:318
+msgid "the connection to the server was lost"
+msgstr "połączenie z serwerem zostało przerwane"
+
+#: error.c:405
+#, c-format
+msgid "SQL error: %s\n"
+msgstr "błąd SQL: %s\n"
+
+#: execute.c:1919
+msgid "<empty>"
+msgstr "<pusty>"
+
+#: misc.c:113
+msgid "NULL"
+msgstr "NULL"
diff --git a/src/interfaces/ecpg/ecpglib/po/pt_BR.po b/src/interfaces/ecpg/ecpglib/po/pt_BR.po
index c2a1090656439..7241a687f6216 100644
--- a/src/interfaces/ecpg/ecpglib/po/pt_BR.po
+++ b/src/interfaces/ecpg/ecpglib/po/pt_BR.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 # Fernando Ike de Oliveira <fike@midstorm.org>, 2009.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2010-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-05-08 22:12-0300\n"
 "PO-Revision-Date: 2009-02-09 13:00-0200\n"
diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c
index 33b4d2bce3d3e..ac43c4bfa8445 100644
--- a/src/interfaces/ecpg/ecpglib/sqlda.c
+++ b/src/interfaces/ecpg/ecpglib/sqlda.c
@@ -124,13 +124,13 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
 				}
 				break;
 			case ECPGt_date:
-				ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(date), &offset, &next_offset);
+				ecpg_sqlda_align_add_size(offset, sizeof(date), sizeof(date), &offset, &next_offset);
 				break;
 			case ECPGt_timestamp:
-				ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(timestamp), &offset, &next_offset);
+				ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
 				break;
 			case ECPGt_interval:
-				ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(interval), &offset, &next_offset);
+				ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(interval), &offset, &next_offset);
 				break;
 			case ECPGt_char:
 			case ECPGt_unsigned_char:
@@ -359,7 +359,7 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat ** _sqlda, const PGresult
 				sqlda->sqlvar[i].sqllen = sizeof(date);
 				break;
 			case ECPGt_timestamp:
-				ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset);
+				ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
 				sqlda->sqlvar[i].sqldata = (char *) sqlda + offset;
 				sqlda->sqlvar[i].sqllen = sizeof(timestamp);
 				break;
@@ -545,7 +545,7 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct ** _sqlda, const PGresult
 				sqlda->sqlvar[i].sqllen = sizeof(date);
 				break;
 			case ECPGt_timestamp:
-				ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset);
+				ecpg_sqlda_align_add_size(offset, sizeof(int64), sizeof(timestamp), &offset, &next_offset);
 				sqlda->sqlvar[i].sqldata = (char *) sqlda + offset;
 				sqlda->sqlvar[i].sqllen = sizeof(timestamp);
 				break;
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 36b3c26adab6d..8e85fe9e5afb3 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -57,8 +57,8 @@ else
 	@$(missing) flex $< $@
 endif
 
-preproc.y: ../../../backend/parser/gram.y parse2.pl ecpg.addons ecpg.header ecpg.tokens ecpg.trailer ecpg.type
-	$(PERL) $(srcdir)/parse2.pl $(srcdir) < $< > $@
+preproc.y: ../../../backend/parser/gram.y parse.pl ecpg.addons ecpg.header ecpg.tokens ecpg.trailer ecpg.type
+	$(PERL) $(srcdir)/parse.pl $(srcdir) < $< > $@
 	$(PERL) $(srcdir)/check_rules.pl $(srcdir) $<
 
 ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.h
diff --git a/src/interfaces/ecpg/preproc/README.parser b/src/interfaces/ecpg/preproc/README.parser
index 6d6daac4ba3a6..ddc3061d486b1 100644
--- a/src/interfaces/ecpg/preproc/README.parser
+++ b/src/interfaces/ecpg/preproc/README.parser
@@ -3,7 +3,7 @@ ECPG modifies and extends the core grammar in a way that
    defined in ecpg.tokens, types are defined in ecpg.type
 2) most tokens from the core grammar are simply converted
    to literals concatenated together to form the SQL string
-   passed to the server, this is done by parse2.pl.
+   passed to the server, this is done by parse.pl.
 3) some rules need side-effects, actions are either added
    or completely overridden (compared to the basic token
    concatenation) for them, these are defined in ecpg.addons,
@@ -20,7 +20,7 @@ rules concatenated together. e.g. if gram.y has this:
        ruleA: tokenA tokenB tokenC {...}
 then "dumpedtokens" is "ruleAtokenAtokenBtokenC".
 "postfix" above can be:
-a) "block" - the automatic rule created by parse2.pl is completely
+a) "block" - the automatic rule created by parse.pl is completely
     overridden, the code block has to be written completely as
     it were in a plain bison grammar
 b) "rule" - the automatic rule is extended on, so new syntaxes
diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons
index a689dbc70e68b..f6f9ff4313d41 100644
--- a/src/interfaces/ecpg/preproc/ecpg.addons
+++ b/src/interfaces/ecpg/preproc/ecpg.addons
@@ -207,12 +207,6 @@ ECPG: CopyStmtCOPYopt_binaryqualified_nameopt_column_listopt_oidscopy_fromcopy_f
 ECPG: CopyStmtCOPYselect_with_parensTOcopy_file_nameopt_withcopy_options addon
 			if (strcmp($4, "stdin") == 0)
 				mmerror(PARSE_ERROR, ET_ERROR, "COPY TO STDIN is not possible");
-ECPG: ConstraintAttributeSpecConstraintDeferrabilitySpecConstraintTimeSpec addon
-			if (strcmp($1, "deferrable") != 0 && strcmp($2, "initially deferrable") == 0 )
-				mmerror(PARSE_ERROR, ET_ERROR, "constraint declared INITIALLY DEFERRED must be DEFERRABLE");
-ECPG: ConstraintAttributeSpecConstraintTimeSpecConstraintDeferrabilitySpec addon
-			if (strcmp($2, "deferrable") != 0 && strcmp($1, "initially deferrable") == 0 )
-				mmerror(PARSE_ERROR, ET_ERROR, "constraint declared INITIALLY DEFERRED must be DEFERRABLE");
 ECPG: var_valueNumericOnly addon
 		if ($1[0] == '$')
 		{
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index 3a941ce1abe24..4e0c52caae21f 100644
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1591,7 +1591,7 @@ ECPGCKeywords: S_AUTO				{ $$ = mm_strdup("auto"); }
  * CONNECTION can be added back in all_unreserved_keyword, but CURRENT and
  * INPUT are reserved for ecpg purposes.
  *
- * The mentioned exclusions are done by $replace_line settings in parse2.pl.
+ * The mentioned exclusions are done by $replace_line settings in parse.pl.
  */
 all_unreserved_keyword: unreserved_keyword	{ $$ = $1; }
 		| ECPGunreserved_interval			{ $$ = $1; }
diff --git a/src/interfaces/ecpg/preproc/nls.mk b/src/interfaces/ecpg/preproc/nls.mk
index c9417481b731c..653f662024c6e 100644
--- a/src/interfaces/ecpg/preproc/nls.mk
+++ b/src/interfaces/ecpg/preproc/nls.mk
@@ -1,5 +1,5 @@
 # src/interfaces/ecpg/preproc/nls.mk
 CATALOG_NAME	 = ecpg
-AVAIL_LANGUAGES	 = de es fr it ja ko pt_BR tr zh_CN zh_TW
+AVAIL_LANGUAGES	 = cs de es fr it ja ko pl pt_BR tr zh_CN zh_TW
 GETTEXT_FILES	 = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c
 GETTEXT_TRIGGERS = _ mmerror:3
diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl
index 232801020358b..515470e9d142d 100644
--- a/src/interfaces/ecpg/preproc/parse.pl
+++ b/src/interfaces/ecpg/preproc/parse.pl
@@ -1,499 +1,648 @@
 #!/usr/bin/perl
 # src/interfaces/ecpg/preproc/parse.pl
-# parser generater for ecpg
+# parser generater for ecpg version 2
 # call with backend parser as stdin
 #
 # Copyright (c) 2007-2011, PostgreSQL Global Development Group
 #
 # Written by Mike Aubury <mike.aubury@aubit.com>
 #	     Michael Meskes <meskes@postgresql.org>
+#            Andy Colson <andy@squeakycode.net>   
 #
 # Placed under the same license as PostgreSQL.
 #
 
-if (@ARGV) {
-	$path = $ARGV[0];
-	shift @ARGV;
-}
+use strict;
+use warnings;
+no warnings 'uninitialized';
+
+my $path = shift @ARGV;
+$path = "." unless $path;
 
-if ($path eq '') { $path = "."; }
+my $copymode              = 0;
+my $brace_indent          = 0;
+my $yaccmode              = 0;
+my $header_included       = 0;
+my $feature_not_supported = 0;
+my $tokenmode             = 0;
 
-$[ = 1;			# set array base to 1
-$, = ' ';		# set output field separator
-$\ = "\n";		# set output record separator
+my(%buff, $infield, $comment, %tokens, %addons );
+my($stmt_mode, @fields);
+my($line, $non_term_id);
 
-$copymode = 'off';
-$brace_indent = 0;
-$yaccmode = 0;
-$header_included = 0;
-$feature_not_supported = 0;
-$tokenmode = 0;
 
 # some token have to be replaced by other symbols
 # either in the rule
-$replace_token{'BCONST'} = 'ecpg_bconst';
-$replace_token{'FCONST'} = 'ecpg_fconst';
-$replace_token{'Sconst'} = 'ecpg_sconst';
-$replace_token{'IDENT'} = 'ecpg_ident';
-$replace_token{'PARAM'} = 'ecpg_param';
+my %replace_token = (
+	'BCONST' => 'ecpg_bconst',
+	'FCONST' => 'ecpg_fconst',
+	'Sconst' => 'ecpg_sconst',
+	'IDENT'  => 'ecpg_ident',
+	'PARAM'  => 'ecpg_param',
+);
+
 # or in the block
-$replace_string{'WITH_TIME'} = 'with time';
-$replace_string{'NULLS_FIRST'} = 'nulls first';
-$replace_string{'NULLS_LAST'} = 'nulls last';
-$replace_string{'TYPECAST'} = '::';
-$replace_string{'DOT_DOT'} = '..';
-$replace_string{'COLON_EQUALS'} = ':=';
+my %replace_string = (
+	'WITH_TIME'    => 'with time',
+	'NULLS_FIRST'  => 'nulls first',
+	'NULLS_LAST'   => 'nulls last',
+	'TYPECAST'     => '::',
+	'DOT_DOT'      => '..',
+	'COLON_EQUALS' => ':=',
+);
 
 # specific replace_types for specific non-terminals - never include the ':'
 # ECPG-only replace_types are defined in ecpg-replace_types
-$replace_types{'PrepareStmt'} = '<prep>';
-$replace_types{'opt_array_bounds'} = '<index>';
-# "ignore" means: do not create type and rules for this non-term-id
-$replace_types{'stmtblock'} = 'ignore';
-$replace_types{'stmtmulti'} = 'ignore';
-$replace_types{'CreateAsStmt'} = 'ignore';
-$replace_types{'DeallocateStmt'} = 'ignore';
-$replace_types{'ColId'} = 'ignore';
-$replace_types{'type_function_name'} = 'ignore';
-$replace_types{'ColLabel'} = 'ignore';
-$replace_types{'Sconst'} = 'ignore';
+my %replace_types = (
+	'PrepareStmt'      => '<prep>',
+	'opt_array_bounds' => '<index>',
+
+	# "ignore" means: do not create type and rules for this non-term-id
+	'stmtblock'          => 'ignore',
+	'stmtmulti'          => 'ignore',
+	'CreateAsStmt'       => 'ignore',
+	'DeallocateStmt'     => 'ignore',
+	'ColId'              => 'ignore',
+	'type_function_name' => 'ignore',
+	'ColLabel'           => 'ignore',
+	'Sconst'             => 'ignore',
+);
 
 # these replace_line commands excise certain keywords from the core keyword
 # lists.  Be sure to account for these in ColLabel and related productions.
-$replace_line{'unreserved_keywordCONNECTION'} = 'ignore';
-$replace_line{'unreserved_keywordCURRENT_P'} = 'ignore';
-$replace_line{'unreserved_keywordDAY_P'} = 'ignore';
-$replace_line{'unreserved_keywordHOUR_P'} = 'ignore';
-$replace_line{'unreserved_keywordINPUT_P'} = 'ignore';
-$replace_line{'unreserved_keywordMINUTE_P'} = 'ignore';
-$replace_line{'unreserved_keywordMONTH_P'} = 'ignore';
-$replace_line{'unreserved_keywordSECOND_P'} = 'ignore';
-$replace_line{'unreserved_keywordYEAR_P'} = 'ignore';
-$replace_line{'col_name_keywordCHAR_P'} = 'ignore';
-$replace_line{'col_name_keywordINT_P'} = 'ignore';
-$replace_line{'col_name_keywordVALUES'} = 'ignore';
-$replace_line{'reserved_keywordTO'} = 'ignore';
-$replace_line{'reserved_keywordUNION'} = 'ignore';
-
-# some other production rules have to be ignored or replaced
-$replace_line{'fetch_argsFORWARDopt_from_incursor_name'} = 'ignore';
-$replace_line{'fetch_argsBACKWARDopt_from_incursor_name'} = 'ignore';
-$replace_line{"opt_array_boundsopt_array_bounds'['Iconst']'"} = 'ignore';
-$replace_line{'VariableShowStmtSHOWvar_name'} = 'SHOW var_name ecpg_into';
-$replace_line{'VariableShowStmtSHOWTIMEZONE'} = 'SHOW TIME ZONE ecpg_into';
-$replace_line{'VariableShowStmtSHOWTRANSACTIONISOLATIONLEVEL'} = 'SHOW TRANSACTION ISOLATION LEVEL ecpg_into';
-$replace_line{'VariableShowStmtSHOWSESSIONAUTHORIZATION'} = 'SHOW SESSION AUTHORIZATION ecpg_into';
-$replace_line{'returning_clauseRETURNINGtarget_list'} = 'RETURNING target_list ecpg_into';
-$replace_line{'ExecuteStmtEXECUTEnameexecute_param_clause'} = 'EXECUTE prepared_name execute_param_clause execute_rest';
-$replace_line{'ExecuteStmtCREATEOptTempTABLEcreate_as_targetASEXECUTEnameexecute_param_clause'} = 'CREATE OptTemp TABLE create_as_target AS EXECUTE prepared_name execute_param_clause';
-$replace_line{'PrepareStmtPREPAREnameprep_type_clauseASPreparableStmt'} = 'PREPARE prepared_name prep_type_clause AS PreparableStmt';
-$replace_line{'var_nameColId'} = 'ECPGColId';
-
-line: while (<>) {
-    chomp;	# strip record separator
-    @Fld = split(' ', $_, -1);
-
-    # Dump the action for a rule -
-    # mode indicates if we are processing the 'stmt:' rule (mode==0 means normal,  mode==1 means stmt:)
-    # flds are the fields to use. These may start with a '$' - in which case they are the result of a previous non-terminal
-    #                             if they dont start with a '$' then they are token name
-    #
-    # len is the number of fields in flds...
-    # leadin is the padding to apply at the beginning (just use for formatting)
-
-    if (/ERRCODE_FEATURE_NOT_SUPPORTED/) {
-	$feature_not_supported = 1;
-	next line;
-    }
-
-    if (/^%%/) {
-	$tokenmode = 2;
-	$copymode = 'on';
-	$yaccmode++;
-	$infield = 0;
-	$fieldcount = 0;
-    }
-
-    $S = $_;
-    $prec = 0;
-    # Make sure any braces are split
-    $s = '{', $S =~ s/$s/ { /g;
-    $s = '}', $S =~ s/$s/ } /g;
-    # Any comments are split
-    $s = '[/][*]', $S =~ s#$s# /* #g;
-    $s = '[*][/]', $S =~ s#$s# */ #g;
-
-    # Now split the line into individual fields
-    $n = (@arr = split(' ', $S));
-
-    if ($arr[1] eq '%token' && $tokenmode == 0) {
-	$tokenmode = 1;
-	&include_stuff('tokens', 'ecpg.tokens', '', 1, 0);
-	$type = 1;
-    }
-    elsif ($arr[1] eq '%type' && $header_included == 0) {
-	&include_stuff('header', 'ecpg.header', '', 1, 0);
-	&include_stuff('ecpgtype', 'ecpg.type', '', 1, 0);
-	$header_included = 1;
-    }
-
-    if ($tokenmode == 1) {
-	$str = '';
-	for ($a = 1; $a <= $n; $a++) {
-	    if ($arr[$a] eq '/*') {
-		$comment++;
-		next;
-	    }
-	    if ($arr[$a] eq '*/') {
-		$comment--;
-		next;
-	    }
-	    if ($comment) {
-		next;
-	    }
-	    if (substr($arr[$a], 1, 1) eq '<') {
-		next;
-		# its a type
-	    }
-	    $tokens{$arr[$a]} = 1;
-
-	    $str = $str . ' ' . $arr[$a];
-	    if ($arr[$a] eq 'IDENT' && $arr[$a - 1] eq '%nonassoc') {
-	    # add two more tokens to the list
-		$str = $str . "\n%nonassoc CSTRING\n%nonassoc UIDENT";
-	    }
-	}
-	&add_to_buffer('orig_tokens', $str);
-	next line;
-    }
-
-    # Dont worry about anything if we're not in the right section of gram.y
-    if ($yaccmode != 1) {
-	next line;
-    }
-
-    # Go through each field in turn
-    for ($fieldIndexer = 1; $fieldIndexer <= $n; $fieldIndexer++) {
-	if ($arr[$fieldIndexer] eq '*/' && $comment) {
-	    $comment = 0;
-	    next;
-	}
-	elsif ($comment) {
-	    next;
-	}
-	elsif ($arr[$fieldIndexer] eq '/*') {
-	    # start of a multiline comment
-	    $comment = 1;
-	    next;
-	}
-	elsif ($arr[$fieldIndexer] eq '//') {
-	    next line;
-	}
-	elsif ($arr[$fieldIndexer] eq '}') {
-	    $brace_indent--;
-	    next;
-	}
-	elsif ($arr[$fieldIndexer] eq '{') {
-	    $brace_indent++;
-	    next;
-	}
-
-	if ($brace_indent > 0) {
-	    next;
-	}
-	if ($arr[$fieldIndexer] eq ';') {
-	    if ($copymode eq 'on') {
-		if ($infield && $includetype eq '') {
-		    &dump_line($stmt_mode, $fields, $field_count);
+my %replace_line = (
+	'unreserved_keywordCONNECTION' => 'ignore',
+	'unreserved_keywordCURRENT_P'  => 'ignore',
+	'unreserved_keywordDAY_P'      => 'ignore',
+	'unreserved_keywordHOUR_P'     => 'ignore',
+	'unreserved_keywordINPUT_P'    => 'ignore',
+	'unreserved_keywordMINUTE_P'   => 'ignore',
+	'unreserved_keywordMONTH_P'    => 'ignore',
+	'unreserved_keywordSECOND_P'   => 'ignore',
+	'unreserved_keywordYEAR_P'     => 'ignore',
+	'col_name_keywordCHAR_P'       => 'ignore',
+	'col_name_keywordINT_P'        => 'ignore',
+	'col_name_keywordVALUES'       => 'ignore',
+	'reserved_keywordTO'           => 'ignore',
+	'reserved_keywordUNION'        => 'ignore',
+
+	# some other production rules have to be ignored or replaced
+	'fetch_argsFORWARDopt_from_incursor_name'      => 'ignore',
+	'fetch_argsBACKWARDopt_from_incursor_name'     => 'ignore',
+	"opt_array_boundsopt_array_bounds'['Iconst']'" => 'ignore',
+	'VariableShowStmtSHOWvar_name'                 => 'SHOW var_name ecpg_into',
+	'VariableShowStmtSHOWTIMEZONE' => 'SHOW TIME ZONE ecpg_into',
+	'VariableShowStmtSHOWTRANSACTIONISOLATIONLEVEL' => 'SHOW TRANSACTION ISOLATION LEVEL ecpg_into',
+	'VariableShowStmtSHOWSESSIONAUTHORIZATION' => 'SHOW SESSION AUTHORIZATION ecpg_into',
+	'returning_clauseRETURNINGtarget_list' => 'RETURNING target_list ecpg_into',
+	'ExecuteStmtEXECUTEnameexecute_param_clause' => 'EXECUTE prepared_name execute_param_clause execute_rest',
+	'ExecuteStmtCREATEOptTempTABLEcreate_as_targetASEXECUTEnameexecute_param_clause' => 
+			'CREATE OptTemp TABLE create_as_target AS EXECUTE prepared_name execute_param_clause',
+	'PrepareStmtPREPAREnameprep_type_clauseASPreparableStmt' => 
+			'PREPARE prepared_name prep_type_clause AS PreparableStmt',
+	'var_nameColId' => 'ECPGColId',
+);
+
+preload_addons();
+
+main();
+
+dump_buffer('header');
+dump_buffer('tokens');
+dump_buffer('types');
+dump_buffer('ecpgtype');
+dump_buffer('orig_tokens');
+print '%%', "\n";
+print 'prog: statements;', "\n";
+dump_buffer('rules');
+include_file( 'trailer', 'ecpg.trailer' );
+dump_buffer('trailer');
+
+sub main
+{
+	line: while (<>) 
+	{
+		if (/ERRCODE_FEATURE_NOT_SUPPORTED/) 
+		{
+			$feature_not_supported = 1;
+			next line;
 		}
-		&add_to_buffer('rules', ";\n\n");
-	    }
-	    else {
-		$copymode = 'on';
-	    }
-	    $field_count = 0;
-	    $infield = 0;
-	    $line = '';
-	    $includetype = '';
-	    next;
-	}
 
-	if ($arr[$fieldIndexer] eq '|') {
-	    if ($copymode eq 'on') {
-		if ($infield && $includetype eq '') {
-		    $infield = $infield + &dump_line($stmt_mode, $fields, $field_count);
-		}
-		if ($infield > 1) {
-		    $line = '| ';
+		chomp; 
+		
+		# comment out the line below to make the result file match (blank line wise)
+		# the prior version. 
+		#next if ($_ eq '');
+
+		# Dump the action for a rule -
+		# stmt_mode indicates if we are processing the 'stmt:'
+		# rule (mode==0 means normal,  mode==1 means stmt:)
+		# flds are the fields to use. These may start with a '$' - in
+		# which case they are the result of a previous non-terminal
+		#
+		# if they dont start with a '$' then they are token name
+		#
+		# len is the number of fields in flds...
+		# leadin is the padding to apply at the beginning (just use for formatting)
+
+		if (/^%%/) {
+			$tokenmode = 2;
+			$copymode  = 1;
+			$yaccmode++;
+			$infield    = 0;
 		}
-	    }
-	    $field_count = 0;
-	    $includetype = '';
-	    next;
-	}
 
-	if ($replace_token{$arr[$fieldIndexer]}) {
-	    $arr[$fieldIndexer] = $replace_token{$arr[$fieldIndexer]};
-	}
+		my $prec = 0;
 
-	# Are we looking at a declaration of a non-terminal ?
-	if (($arr[$fieldIndexer] =~ '[A-Za-z0-9]+:') || $arr[$fieldIndexer + 1] eq ':') {
-	    $non_term_id = $arr[$fieldIndexer];
-	    $s = ':', $non_term_id =~ s/$s//g;
-
-	    if ($replace_types{$non_term_id} eq '') {
-		$replace_types{$non_term_id} = '<str>';
-	    }
-	    if ($replace_types{$non_term_id} eq 'ignore') {
-		$copymode = ';';
-		$line = '';
-		next line;
-	    }
-	    else {
-		$copymode = 'on';
-	    }
-	    $line = $line . ' ' . $arr[$fieldIndexer];
-	    # Do we have the : attached already ?
-	    # If yes, we'll have already printed the ':'
-	    if (!($arr[$fieldIndexer] =~ '[A-Za-z0-9]+:')) {
-		# Consume the ':' which is next...
-		$line = $line . ':';
-		$fieldIndexer++;
-	    }
-
-	    # Special mode?
-	    if ($non_term_id eq 'stmt') {
-		$stmt_mode = 1;
-	    }
-	    else {
-		$stmt_mode = 0;
-	    }
-	    $tstr = '%type ' . $replace_types{$non_term_id} . ' ' .  $non_term_id;
-	    &add_to_buffer('types', $tstr);
-
-	    if ($copymode eq 'on') {
-		&add_to_buffer('rules', $line);
-	    }
-	    $line = '';
-	    $field_count = 0;
-	    $infield = 1;
-	    next;
-	}
-	elsif ($copymode eq 'on') {
-	    $line = $line . ' ' . $arr[$fieldIndexer];
-	}
-	if ($arr[$fieldIndexer] eq '%prec') {
-	    $prec = 1;
-	    next;
-	}
+		# Make sure any braces are split
+		s/{/ { /g;
+		s/}/ } /g;
+
+		# Any comments are split
+		s|\/\*| /* |g;
+		s|\*\/| */ |g;
+
+		# Now split the line into individual fields
+		my @arr = split(' ');
 
-	if ($copymode eq 'on' && !$prec && !$comment && $arr[$fieldIndexer] ne '/*EMPTY*/' && length($arr[$fieldIndexer]) && $infield) {
-	    $nfield = $field_count + 1;
-	    if ($arr[$fieldIndexer] ne 'Op' && ($tokens{$arr[$fieldIndexer]} > 0 || $arr[$fieldIndexer] =~ "'.+'") || $stmt_mode == 1) {
-		if ($replace_string{$arr[$fieldIndexer]}) {
-		    $S = $replace_string{$arr[$fieldIndexer]};
+		if ( $arr[0] eq '%token' && $tokenmode == 0 ) 
+		{
+			$tokenmode = 1;
+			include_file( 'tokens', 'ecpg.tokens' );
 		}
-		else {
-		    $S = $arr[$fieldIndexer];
+		elsif ( $arr[0] eq '%type' && $header_included == 0 ) 
+		{
+			include_file( 'header',   'ecpg.header' );
+			include_file( 'ecpgtype', 'ecpg.type' );
+			$header_included = 1;
 		}
-		$s = '_P', $S =~ s/$s//g;
-		$s = "'", $S =~ s/$s//g;
-		if ($stmt_mode == 1) {
-		    $fields{$field_count++} = $S;
+
+		if ( $tokenmode == 1 ) 
+		{
+			my $str = '';
+			my $prior = '';
+			for my $a (@arr)
+			{
+				if ( $a eq '/*' ) 
+				{
+					$comment++;
+					next;
+				}
+				if ( $a eq '*/' ) 
+				{
+					$comment--;
+					next;
+				}
+				if ($comment) 
+				{
+					next;
+				}
+				if ( substr( $a, 0, 1 ) eq '<' ) {
+					next;
+
+					# its a type
+				}
+				$tokens{ $a } = 1;
+
+				$str = $str . ' ' . $a;
+				if ( $a eq 'IDENT' && $prior eq '%nonassoc' ) 
+				{
+					# add two more tokens to the list
+					$str = $str . "\n%nonassoc CSTRING\n%nonassoc UIDENT";
+				}
+				$prior = $a;
+			}
+			add_to_buffer( 'orig_tokens', $str );
+			next line;
+		}
+
+		# Dont worry about anything if we're not in the right section of gram.y
+		if ( $yaccmode != 1 ) 
+		{
+			next line;
 		}
-		else {
-		    $fields{$field_count++} = lc($S);
+		
+
+		# Go through each field in turn
+		for (my $fieldIndexer = 0 ; $fieldIndexer < scalar(@arr) ; $fieldIndexer++ ) 
+		{
+			if ( $arr[$fieldIndexer] eq '*/' && $comment ) 
+			{
+				$comment = 0;
+				next;
+			}
+			elsif ($comment) 
+			{
+				next;
+			}
+			elsif ( $arr[$fieldIndexer] eq '/*' ) 
+			{
+				# start of a multiline comment
+				$comment = 1;
+				next;
+			}
+			elsif ( $arr[$fieldIndexer] eq '//' ) 
+			{
+				next line;
+			}
+			elsif ( $arr[$fieldIndexer] eq '}' ) 
+			{
+				$brace_indent--;
+				next;
+			}
+			elsif ( $arr[$fieldIndexer] eq '{' ) 
+			{
+				$brace_indent++;
+				next;
+			}
+
+			if ( $brace_indent > 0 ) 
+			{
+				next;
+			}
+			if ( $arr[$fieldIndexer] eq ';' ) 
+			{
+				if ($copymode) 
+				{
+					if ( $infield ) 
+					{
+						dump_line( $stmt_mode, \@fields );
+					}
+					add_to_buffer( 'rules', ";\n\n" );
+				}
+				else 
+				{
+					$copymode = 1;
+				}
+				@fields   = ();
+				$infield  = 0;
+				$line     = '';
+				next;
+			}
+
+			if ( $arr[$fieldIndexer] eq '|' ) 
+			{
+				if ($copymode) 
+				{
+					if ( $infield  ) 
+					{
+						$infield = $infield + dump_line( $stmt_mode, \@fields );
+					}
+					if ( $infield > 1 ) 
+					{
+						$line = '| ';
+					}
+				}
+				@fields = ();
+				next;
+			}
+
+			if ( exists $replace_token{ $arr[$fieldIndexer] } ) 
+			{
+				$arr[$fieldIndexer] = $replace_token{ $arr[$fieldIndexer] };
+			}
+
+			# Are we looking at a declaration of a non-terminal ?
+			if ( ( $arr[$fieldIndexer] =~ /[A-Za-z0-9]+:/ )
+				|| $arr[ $fieldIndexer + 1 ] eq ':' )
+			{
+				$non_term_id = $arr[$fieldIndexer];
+				$non_term_id =~ tr/://d;
+
+				if ( not defined $replace_types{$non_term_id} ) 
+				{
+					$replace_types{$non_term_id} = '<str>';
+					$copymode = 1;
+				}
+				elsif ( $replace_types{$non_term_id} eq 'ignore' ) 
+				{
+					$copymode = 0;
+					$line     = '';
+					next line;
+				}
+				$line = $line . ' ' . $arr[$fieldIndexer];
+
+				# Do we have the : attached already ?
+				# If yes, we'll have already printed the ':'
+				if ( !( $arr[$fieldIndexer] =~ '[A-Za-z0-9]+:' ) ) 
+				{
+					# Consume the ':' which is next...
+					$line = $line . ':';
+					$fieldIndexer++;
+				}
+
+				# Special mode?
+				if ( $non_term_id eq 'stmt' ) 
+				{
+					$stmt_mode = 1;
+				}
+				else 
+				{
+					$stmt_mode = 0;
+				}
+				my $tstr = '%type ' . $replace_types{$non_term_id} . ' ' . $non_term_id;
+				add_to_buffer( 'types', $tstr );
+
+				if ($copymode) 
+				{
+					add_to_buffer( 'rules', $line );
+				}
+				$line     = '';
+				@fields   = ();
+				$infield  = 1;
+				next;
+			}
+			elsif ($copymode) {
+				$line = $line . ' ' . $arr[$fieldIndexer];
+			}
+			if ( $arr[$fieldIndexer] eq '%prec' ) 
+			{
+				$prec = 1;
+				next;
+			}
+
+			if (   $copymode
+				&& !$prec
+				&& !$comment
+				&& length( $arr[$fieldIndexer] )
+				&& $infield )
+			{
+				if (
+					$arr[$fieldIndexer] ne 'Op'
+					&& ( $tokens{ $arr[$fieldIndexer] } > 0 || $arr[$fieldIndexer] =~ /'.+'/ )
+					|| $stmt_mode == 1
+				  )
+				{
+					my $S;
+					if ( exists $replace_string{ $arr[$fieldIndexer] } ) 
+					{
+						$S = $replace_string{ $arr[$fieldIndexer] };
+					}
+					else 
+					{
+						$S = $arr[$fieldIndexer];
+					}
+					$S =~ s/_P//g;
+					$S =~ tr/'//d;
+					if ( $stmt_mode == 1 ) 
+					{
+						push(@fields, $S);
+					}
+					else 
+					{
+						push(@fields, lc($S));
+					}
+				}
+				else 
+				{
+					push(@fields, '$' . (scalar(@fields)+1));
+				}
+			}
 		}
-	    }
-	    else {
-		$fields{$field_count++} = "\$" . $nfield;
-	    }
 	}
-    }
 }
 
-&dump('header');
-&dump('tokens');
-&dump('types');
-&dump('ecpgtype');
-&dump('orig_tokens');
-print '%%';
-print 'prog: statements;';
-&dump('rules');
-&include_stuff('trailer', 'ecpg.trailer', '', 1, 0);
-&dump('trailer');
-
-sub include_stuff {
-    local($includestream, $includefilename, $includeblock, $copy, $field_count) = @_;
-    $copied = 0;
-    $inblock = 0;
-    $filename = $path . "/" . $includefilename;
-    while (($_ = &Getline2($filename),$getline_ok)) {
-	if ($includeblock ne '' && $Fld[1] eq 'ECPG:' && $inblock == 0) {
-	    if ($Fld[2] eq $includeblock) {
-		$copy = 1;
-		$inblock = 1;
-		$includetype = $Fld[3];
-		if ($includetype eq 'rule') {
-		    &dump_fields($stmt_mode, *fields, $field_count, ' { ');
-		}
-		elsif ($includetype eq 'addon') {
-		    &add_to_buffer('rules', ' { ');
-		}
-	    }
-	    else {
-		$copy = 0;
-	    }
+
+# append a file onto a buffer.
+# Arguments:  buffer_name, filename (without path)
+sub include_file 
+{
+	my ($buffer, $filename) = @_;
+	my $full = "$path/$filename";
+	open(my $fh, '<', $full) or die;
+	while ( <$fh> ) 
+	{
+		chomp;
+		add_to_buffer( $buffer, $_ );
 	}
-	else {
-	    if ($copy == 1 && $Fld[1] ne 'ECPG:') {
-		&add_to_buffer($includestream, $_);
-		$copied = 1;
-		$inblock = 0;
-	    }
+	close($fh);
+}
+
+sub include_addon
+{
+	my($buffer, $block, $fields, $stmt_mode) = @_;
+	my $rec = $addons{$block};
+	return 0 unless $rec;
+	
+	if ( $rec->{type} eq 'rule' ) 
+	{
+		dump_fields( $stmt_mode, $fields, ' { ' );
 	}
-    }
-    delete $opened{$filename} && close($filename);
-    if ($includetype eq 'addon') {
-	&dump_fields($stmt_mode, *fields, $field_count, '');
-    }
-    if ($copied == 1) {
-	$field_count = 0;
-	$line = '';
-    }
-    $copied;
+	elsif ( $rec->{type} eq 'addon' ) 
+	{
+		add_to_buffer( 'rules', ' { ' );
+	}
+
+	#add_to_buffer( $stream, $_ );
+	#We have an array to add to the buffer, we'll add it ourself instead of 
+	#calling add_to_buffer, which does not know about arrays
+	
+	push( @{ $buff{$buffer} }, @{ $rec->{lines} } );
+
+	if ( $rec->{type} eq 'addon' ) 
+	{
+		dump_fields( $stmt_mode, $fields, '' );
+	}
+
+
+	# if we added something (ie there are lines in our array), return 1
+	return 1 if (scalar(@{ $rec->{lines} }) > 0);
+	return 0;
 }
 
-sub add_to_buffer {
-    local($buffer, $str) = @_;
-    $buff{$buffer, $buffcnt{$buffer}++} = $str;
+
+# include_addon does this same thing, but does not call this
+# sub... so if you change this, you need to fix include_addon too
+#   Pass:  buffer_name, string_to_append
+sub add_to_buffer 
+{
+	push( @{ $buff{$_[0]} }, "$_[1]\n" );
 }
 
-sub dump {
-    local($buffer) = @_;
-    print '/* ' . $buffer . ' */';
-    for ($a = 0; $a < $buffcnt{$buffer}; $a++) {
-	print $buff{$buffer, $a};
-    }
+sub dump_buffer 
+{
+	my($buffer) = @_;
+	print '/* ', $buffer, ' */',"\n";
+	my $ref = $buff{$buffer};
+	print @$ref;
 }
 
-sub dump_fields {
-    local($mode, *flds, $len, $ln) = @_;
-    if ($mode == 0) {
-	#Normal
-	&add_to_buffer('rules', $ln);
-	if ($feature_not_supported == 1) {
-	    # we found an unsupported feature, but we have to
-	    # filter out ExecuteStmt: CREATE OptTemp TABLE ...
-	    # because the warning there is only valid in some situations
-	    if ($flds{0} ne 'create' || $flds{2} ne 'table') {
-		&add_to_buffer('rules', "mmerror(PARSE_ERROR, ET_WARNING, \"unsupported feature will be passed to server\");");
-	    }
-	    $feature_not_supported = 0;
-	}
+sub dump_fields 
+{
+	my ( $mode, $flds, $ln ) = @_;
+	my $len = scalar(@$flds);
+
+	if ( $mode == 0 ) 
+	{
+		#Normal
+		add_to_buffer( 'rules', $ln );
+		if ( $feature_not_supported == 1 ) 
+		{
+			# we found an unsupported feature, but we have to
+			# filter out ExecuteStmt: CREATE OptTemp TABLE ...
+			# because the warning there is only valid in some situations
+			if ( $flds->[0] ne 'create' || $flds->[2] ne 'table' ) 
+			{
+				add_to_buffer( 'rules', 
+					'mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");'
+				);
+			}
+			$feature_not_supported = 0;
+		}
 
-	if ($len == 0) {
-	    # We have no fields ?
-	    &add_to_buffer('rules', " \$\$=EMPTY; }");
+		if ( $len == 0 ) 
+		{
+			# We have no fields ?
+			add_to_buffer( 'rules', ' $$=EMPTY; }' );
+		} 
+		else 
+		{
+			# Go through each field and try to 'aggregate' the tokens 
+			# into a single 'mm_strdup' where possible
+			my @flds_new;
+			my $str;
+			for ( my $z = 0 ; $z < $len ; $z++ ) 
+			{
+				if ( substr( $flds->[$z], 0, 1 ) eq '$' ) 
+				{
+					push(@flds_new, $flds->[$z]);
+					next;
+				}
+
+				$str = $flds->[$z];
+
+				while (1) 
+				{
+					if ( $z >= $len - 1 || substr( $flds->[ $z + 1 ], 0, 1 ) eq '$' )
+					{
+						# We're at the end...
+						push(@flds_new,  "mm_strdup(\"$str\")");
+						last;
+					}
+					$z++;
+					$str = $str . ' ' . $flds->[$z];
+				}
+			}
+
+			# So - how many fields did we end up with ?
+			$len = scalar(@flds_new);
+			if ( $len == 1 ) 
+			{
+				# Straight assignement
+				$str = ' $$ = ' . $flds_new[0] . ';';
+				add_to_buffer( 'rules', $str );
+			}
+			else 
+			{
+				# Need to concatenate the results to form
+				# our final string
+				$str = ' $$ = cat_str(' . $len . ',' . join(',', @flds_new) . ');';
+				add_to_buffer( 'rules', $str );
+			}
+			add_to_buffer( 'rules', '}' );
+		}
 	}
-	else {
-	    # Go through each field and try to 'aggregate' the tokens into a single 'mm_strdup' where possible
-	    $cnt = 0;
-	    for ($z = 0; $z < $len; $z++) {
-		if (substr($flds{$z}, 1, 1) eq "\$") {
-		    $flds_new{$cnt++} = $flds{$z};
-		    next;
+	else
+	{
+		# we're in the stmt: rule
+		if ($len)
+		{
+			# or just the statement ...
+			add_to_buffer( 'rules', ' { output_statement($1, 0, ECPGst_normal); }' );
 		}
+		else
+		{
+			add_to_buffer( 'rules', ' { $$ = NULL; }' );
+		}
+	}
+}
 
-		$str = $flds{$z};
 
-		while (1) {
-		    if ($z >= $len - 1 || substr($flds{$z + 1}, 1, 1) eq "\$") {
-			# We're at the end...
-			$flds_new{$cnt++} = "mm_strdup(\"" . $str . "\")";
-			last;
-		    }
-		    $z++;
-		    $str = $str . ' ' . $flds{$z};
+sub dump_line 
+{
+	my($stmt_mode, $fields) = @_;
+	my $block = $non_term_id . $line;
+	$block =~ tr/ |//d;
+	my $rep = $replace_line{$block};
+	if ($rep)
+	{
+		if ($rep eq 'ignore' ) 
+		{
+			return 0;
 		}
-	    }
-
-	    # So - how many fields did we end up with ?
-	    if ($cnt == 1) {
-		# Straight assignement
-		$str = " \$\$ = " . $flds_new{0} . ';';
-		&add_to_buffer('rules', $str);
-	    }
-	    else {
-		# Need to concatenate the results to form
-		# our final string
-		$str = " \$\$ = cat_str(" . $cnt;
-
-		for ($z = 0; $z < $cnt; $z++) {
-		    $str = $str . ',' . $flds_new{$z};
+
+		if ( index( $line, '|' ) != -1 ) 
+		{
+			$line = '| ' . $rep;
 		}
-		$str = $str . ');';
-		&add_to_buffer('rules', $str);
-	    }
-	    if ($literal_mode == 0) {
-		&add_to_buffer('rules', '}');
-	    }
-	}
-    }
-    else {
-	# we're in the stmt: rule
-	if ($len) {
-	    # or just the statement ...
-	    &add_to_buffer('rules', " { output_statement(\$1, 0, ECPGst_normal); }");
+		else 
+		{
+			$line = $rep;
+		}
+		$block = $non_term_id . $line;
+		$block =~ tr/ |//d;
 	}
-	else {
-	    &add_to_buffer('rules', " { \$\$ = NULL; }");
+	add_to_buffer( 'rules', $line );
+	my $i = include_addon( 'rules', $block, $fields, $stmt_mode);
+	if ( $i == 0 ) 
+	{
+		dump_fields( $stmt_mode, $fields, ' { ' );
 	}
-    }
+	return 1;
 }
 
-sub generate_block {
-    local($line) = @_;
-    $block = $non_term_id . $line;
-    $s = ' ', $block =~ s/$s//g;
-    $s = "\\|", $block =~ s/$s//g;
-    return $block;
-}
+=top
+	load addons into cache
+	%addons = { 
+		stmtClosePortalStmt => { 'type' => 'block', 'lines' => [ "{", "if (INFORMIX_MODE)" ..., "}" ] },
+		stmtViewStmt => { 'type' => 'rule', 'lines' => [ "| ECPGAllocateDescr", ... ] }
+	}
 
-sub dump_line {
-    local($stmt_mode, $fields, $field_count) = @_;
-    $block = &generate_block($line);
-    if ($replace_line{$block} eq 'ignore') {
-	return 0;
-    }
-    elsif ($replace_line{$block}) {
-	if (index($line, '|') != 0) {
-	    $line = '| ' . $replace_line{$block};
+=cut
+sub preload_addons
+{
+	my $filename = $path . "/ecpg.addons";
+	open(my $fh, '<', $filename) or die;
+	# there may be multple lines starting ECPG: and then multiple lines of code.
+	# the code need to be add to all prior ECPG records.
+	my (@needsRules, @code, $record);
+	# there may be comments before the first ECPG line, skip them
+	my $skip = 1;
+	while ( <$fh> ) 
+	{
+		if (/^ECPG:\s(\S+)\s?(\w+)?/)
+		{
+			$skip = 0;
+			if (@code)
+			{
+				for my $x (@needsRules)
+				{
+					push(@{ $x->{lines} }, @code);
+				}
+				@code = ();
+				@needsRules = ();
+			}
+			$record = {};
+			$record->{type} = $2;
+			$record->{lines} = [];
+			if (exists $addons{$1}) { die "Ga! there are dups!\n"; }
+			$addons{$1} = $record;
+			push(@needsRules, $record);
+		} 
+		else
+		{
+			next if $skip;
+			push(@code, $_);
+		}
 	}
-	else {
-	    $line = $replace_line{$block};
+	close($fh);
+	if (@code)
+	{
+		for my $x (@needsRules)
+		{
+			push(@{ $x->{lines} }, @code);
+		}
 	}
-	$block = &generate_block($line);
-    }
-    &add_to_buffer('rules', $line);
-    $i = &include_stuff('rules', 'ecpg.addons', $block, 0, $field_count);
-    if ($i == 0) {
-	&dump_fields($stmt_mode, *fields, $field_count, ' { ');
-    }
-    return 1;
 }
 
-sub Getline2 {
-    &Pick('',@_);
-    if ($getline_ok = (($_ = <$fh>) ne '')) {
-	chomp;	# strip record separator
-	@Fld = split(' ', $_, -1);
-    }
-    $_;
-}
 
-sub Pick {
-    local($mode,$name,$pipe) = @_;
-    $fh = $name;
-    open($name,$mode.$name.$pipe) unless $opened{$name}++;
-}
diff --git a/src/interfaces/ecpg/preproc/parse2.pl b/src/interfaces/ecpg/preproc/parse2.pl
deleted file mode 100644
index dd509373a5afd..0000000000000
--- a/src/interfaces/ecpg/preproc/parse2.pl
+++ /dev/null
@@ -1,648 +0,0 @@
-#!/usr/bin/perl
-# src/interfaces/ecpg/preproc/parse2.pl
-# parser generater for ecpg version 2
-# call with backend parser as stdin
-#
-# Copyright (c) 2007-2011, PostgreSQL Global Development Group
-#
-# Written by Mike Aubury <mike.aubury@aubit.com>
-#	     Michael Meskes <meskes@postgresql.org>
-#            Andy Colson <andy@squeakycode.net>   
-#
-# Placed under the same license as PostgreSQL.
-#
-
-use strict;
-use warnings;
-no warnings 'uninitialized';
-
-my $path = shift @ARGV;
-$path = "." unless $path;
-
-my $copymode              = 0;
-my $brace_indent          = 0;
-my $yaccmode              = 0;
-my $header_included       = 0;
-my $feature_not_supported = 0;
-my $tokenmode             = 0;
-
-my(%buff, $infield, $comment, %tokens, %addons );
-my($stmt_mode, @fields);
-my($line, $non_term_id);
-
-
-# some token have to be replaced by other symbols
-# either in the rule
-my %replace_token = (
-	'BCONST' => 'ecpg_bconst',
-	'FCONST' => 'ecpg_fconst',
-	'Sconst' => 'ecpg_sconst',
-	'IDENT'  => 'ecpg_ident',
-	'PARAM'  => 'ecpg_param',
-);
-
-# or in the block
-my %replace_string = (
-	'WITH_TIME'    => 'with time',
-	'NULLS_FIRST'  => 'nulls first',
-	'NULLS_LAST'   => 'nulls last',
-	'TYPECAST'     => '::',
-	'DOT_DOT'      => '..',
-	'COLON_EQUALS' => ':=',
-);
-
-# specific replace_types for specific non-terminals - never include the ':'
-# ECPG-only replace_types are defined in ecpg-replace_types
-my %replace_types = (
-	'PrepareStmt'      => '<prep>',
-	'opt_array_bounds' => '<index>',
-
-	# "ignore" means: do not create type and rules for this non-term-id
-	'stmtblock'          => 'ignore',
-	'stmtmulti'          => 'ignore',
-	'CreateAsStmt'       => 'ignore',
-	'DeallocateStmt'     => 'ignore',
-	'ColId'              => 'ignore',
-	'type_function_name' => 'ignore',
-	'ColLabel'           => 'ignore',
-	'Sconst'             => 'ignore',
-);
-
-# these replace_line commands excise certain keywords from the core keyword
-# lists.  Be sure to account for these in ColLabel and related productions.
-my %replace_line = (
-	'unreserved_keywordCONNECTION' => 'ignore',
-	'unreserved_keywordCURRENT_P'  => 'ignore',
-	'unreserved_keywordDAY_P'      => 'ignore',
-	'unreserved_keywordHOUR_P'     => 'ignore',
-	'unreserved_keywordINPUT_P'    => 'ignore',
-	'unreserved_keywordMINUTE_P'   => 'ignore',
-	'unreserved_keywordMONTH_P'    => 'ignore',
-	'unreserved_keywordSECOND_P'   => 'ignore',
-	'unreserved_keywordYEAR_P'     => 'ignore',
-	'col_name_keywordCHAR_P'       => 'ignore',
-	'col_name_keywordINT_P'        => 'ignore',
-	'col_name_keywordVALUES'       => 'ignore',
-	'reserved_keywordTO'           => 'ignore',
-	'reserved_keywordUNION'        => 'ignore',
-
-	# some other production rules have to be ignored or replaced
-	'fetch_argsFORWARDopt_from_incursor_name'      => 'ignore',
-	'fetch_argsBACKWARDopt_from_incursor_name'     => 'ignore',
-	"opt_array_boundsopt_array_bounds'['Iconst']'" => 'ignore',
-	'VariableShowStmtSHOWvar_name'                 => 'SHOW var_name ecpg_into',
-	'VariableShowStmtSHOWTIMEZONE' => 'SHOW TIME ZONE ecpg_into',
-	'VariableShowStmtSHOWTRANSACTIONISOLATIONLEVEL' => 'SHOW TRANSACTION ISOLATION LEVEL ecpg_into',
-	'VariableShowStmtSHOWSESSIONAUTHORIZATION' => 'SHOW SESSION AUTHORIZATION ecpg_into',
-	'returning_clauseRETURNINGtarget_list' => 'RETURNING target_list ecpg_into',
-	'ExecuteStmtEXECUTEnameexecute_param_clause' => 'EXECUTE prepared_name execute_param_clause execute_rest',
-	'ExecuteStmtCREATEOptTempTABLEcreate_as_targetASEXECUTEnameexecute_param_clause' => 
-			'CREATE OptTemp TABLE create_as_target AS EXECUTE prepared_name execute_param_clause',
-	'PrepareStmtPREPAREnameprep_type_clauseASPreparableStmt' => 
-			'PREPARE prepared_name prep_type_clause AS PreparableStmt',
-	'var_nameColId' => 'ECPGColId',
-);
-
-preload_addons();
-
-main();
-
-dump_buffer('header');
-dump_buffer('tokens');
-dump_buffer('types');
-dump_buffer('ecpgtype');
-dump_buffer('orig_tokens');
-print '%%', "\n";
-print 'prog: statements;', "\n";
-dump_buffer('rules');
-include_file( 'trailer', 'ecpg.trailer' );
-dump_buffer('trailer');
-
-sub main
-{
-	line: while (<>) 
-	{
-		if (/ERRCODE_FEATURE_NOT_SUPPORTED/) 
-		{
-			$feature_not_supported = 1;
-			next line;
-		}
-
-		chomp; 
-		
-		# comment out the line below to make the result file match (blank line wise)
-		# the prior version. 
-		#next if ($_ eq '');
-
-		# Dump the action for a rule -
-		# stmt_mode indicates if we are processing the 'stmt:'
-		# rule (mode==0 means normal,  mode==1 means stmt:)
-		# flds are the fields to use. These may start with a '$' - in
-		# which case they are the result of a previous non-terminal
-		#
-		# if they dont start with a '$' then they are token name
-		#
-		# len is the number of fields in flds...
-		# leadin is the padding to apply at the beginning (just use for formatting)
-
-		if (/^%%/) {
-			$tokenmode = 2;
-			$copymode  = 1;
-			$yaccmode++;
-			$infield    = 0;
-		}
-
-		my $prec = 0;
-
-		# Make sure any braces are split
-		s/{/ { /g;
-		s/}/ } /g;
-
-		# Any comments are split
-		s|\/\*| /* |g;
-		s|\*\/| */ |g;
-
-		# Now split the line into individual fields
-		my @arr = split(' ');
-
-		if ( $arr[0] eq '%token' && $tokenmode == 0 ) 
-		{
-			$tokenmode = 1;
-			include_file( 'tokens', 'ecpg.tokens' );
-		}
-		elsif ( $arr[0] eq '%type' && $header_included == 0 ) 
-		{
-			include_file( 'header',   'ecpg.header' );
-			include_file( 'ecpgtype', 'ecpg.type' );
-			$header_included = 1;
-		}
-
-		if ( $tokenmode == 1 ) 
-		{
-			my $str = '';
-			my $prior = '';
-			for my $a (@arr)
-			{
-				if ( $a eq '/*' ) 
-				{
-					$comment++;
-					next;
-				}
-				if ( $a eq '*/' ) 
-				{
-					$comment--;
-					next;
-				}
-				if ($comment) 
-				{
-					next;
-				}
-				if ( substr( $a, 0, 1 ) eq '<' ) {
-					next;
-
-					# its a type
-				}
-				$tokens{ $a } = 1;
-
-				$str = $str . ' ' . $a;
-				if ( $a eq 'IDENT' && $prior eq '%nonassoc' ) 
-				{
-					# add two more tokens to the list
-					$str = $str . "\n%nonassoc CSTRING\n%nonassoc UIDENT";
-				}
-				$prior = $a;
-			}
-			add_to_buffer( 'orig_tokens', $str );
-			next line;
-		}
-
-		# Dont worry about anything if we're not in the right section of gram.y
-		if ( $yaccmode != 1 ) 
-		{
-			next line;
-		}
-		
-
-		# Go through each field in turn
-		for (my $fieldIndexer = 0 ; $fieldIndexer < scalar(@arr) ; $fieldIndexer++ ) 
-		{
-			if ( $arr[$fieldIndexer] eq '*/' && $comment ) 
-			{
-				$comment = 0;
-				next;
-			}
-			elsif ($comment) 
-			{
-				next;
-			}
-			elsif ( $arr[$fieldIndexer] eq '/*' ) 
-			{
-				# start of a multiline comment
-				$comment = 1;
-				next;
-			}
-			elsif ( $arr[$fieldIndexer] eq '//' ) 
-			{
-				next line;
-			}
-			elsif ( $arr[$fieldIndexer] eq '}' ) 
-			{
-				$brace_indent--;
-				next;
-			}
-			elsif ( $arr[$fieldIndexer] eq '{' ) 
-			{
-				$brace_indent++;
-				next;
-			}
-
-			if ( $brace_indent > 0 ) 
-			{
-				next;
-			}
-			if ( $arr[$fieldIndexer] eq ';' ) 
-			{
-				if ($copymode) 
-				{
-					if ( $infield ) 
-					{
-						dump_line( $stmt_mode, \@fields );
-					}
-					add_to_buffer( 'rules', ";\n\n" );
-				}
-				else 
-				{
-					$copymode = 1;
-				}
-				@fields   = ();
-				$infield  = 0;
-				$line     = '';
-				next;
-			}
-
-			if ( $arr[$fieldIndexer] eq '|' ) 
-			{
-				if ($copymode) 
-				{
-					if ( $infield  ) 
-					{
-						$infield = $infield + dump_line( $stmt_mode, \@fields );
-					}
-					if ( $infield > 1 ) 
-					{
-						$line = '| ';
-					}
-				}
-				@fields = ();
-				next;
-			}
-
-			if ( exists $replace_token{ $arr[$fieldIndexer] } ) 
-			{
-				$arr[$fieldIndexer] = $replace_token{ $arr[$fieldIndexer] };
-			}
-
-			# Are we looking at a declaration of a non-terminal ?
-			if ( ( $arr[$fieldIndexer] =~ /[A-Za-z0-9]+:/ )
-				|| $arr[ $fieldIndexer + 1 ] eq ':' )
-			{
-				$non_term_id = $arr[$fieldIndexer];
-				$non_term_id =~ tr/://d;
-
-				if ( not defined $replace_types{$non_term_id} ) 
-				{
-					$replace_types{$non_term_id} = '<str>';
-					$copymode = 1;
-				}
-				elsif ( $replace_types{$non_term_id} eq 'ignore' ) 
-				{
-					$copymode = 0;
-					$line     = '';
-					next line;
-				}
-				$line = $line . ' ' . $arr[$fieldIndexer];
-
-				# Do we have the : attached already ?
-				# If yes, we'll have already printed the ':'
-				if ( !( $arr[$fieldIndexer] =~ '[A-Za-z0-9]+:' ) ) 
-				{
-					# Consume the ':' which is next...
-					$line = $line . ':';
-					$fieldIndexer++;
-				}
-
-				# Special mode?
-				if ( $non_term_id eq 'stmt' ) 
-				{
-					$stmt_mode = 1;
-				}
-				else 
-				{
-					$stmt_mode = 0;
-				}
-				my $tstr = '%type ' . $replace_types{$non_term_id} . ' ' . $non_term_id;
-				add_to_buffer( 'types', $tstr );
-
-				if ($copymode) 
-				{
-					add_to_buffer( 'rules', $line );
-				}
-				$line     = '';
-				@fields   = ();
-				$infield  = 1;
-				next;
-			}
-			elsif ($copymode) {
-				$line = $line . ' ' . $arr[$fieldIndexer];
-			}
-			if ( $arr[$fieldIndexer] eq '%prec' ) 
-			{
-				$prec = 1;
-				next;
-			}
-
-			if (   $copymode
-				&& !$prec
-				&& !$comment
-				&& length( $arr[$fieldIndexer] )
-				&& $infield )
-			{
-				if (
-					$arr[$fieldIndexer] ne 'Op'
-					&& ( $tokens{ $arr[$fieldIndexer] } > 0 || $arr[$fieldIndexer] =~ /'.+'/ )
-					|| $stmt_mode == 1
-				  )
-				{
-					my $S;
-					if ( exists $replace_string{ $arr[$fieldIndexer] } ) 
-					{
-						$S = $replace_string{ $arr[$fieldIndexer] };
-					}
-					else 
-					{
-						$S = $arr[$fieldIndexer];
-					}
-					$S =~ s/_P//g;
-					$S =~ tr/'//d;
-					if ( $stmt_mode == 1 ) 
-					{
-						push(@fields, $S);
-					}
-					else 
-					{
-						push(@fields, lc($S));
-					}
-				}
-				else 
-				{
-					push(@fields, '$' . (scalar(@fields)+1));
-				}
-			}
-		}
-	}
-}
-
-
-# append a file onto a buffer.
-# Arguments:  buffer_name, filename (without path)
-sub include_file 
-{
-	my ($buffer, $filename) = @_;
-	my $full = "$path/$filename";
-	open(my $fh, '<', $full) or die;
-	while ( <$fh> ) 
-	{
-		chomp;
-		add_to_buffer( $buffer, $_ );
-	}
-	close($fh);
-}
-
-sub include_addon
-{
-	my($buffer, $block, $fields, $stmt_mode) = @_;
-	my $rec = $addons{$block};
-	return 0 unless $rec;
-	
-	if ( $rec->{type} eq 'rule' ) 
-	{
-		dump_fields( $stmt_mode, $fields, ' { ' );
-	}
-	elsif ( $rec->{type} eq 'addon' ) 
-	{
-		add_to_buffer( 'rules', ' { ' );
-	}
-
-	#add_to_buffer( $stream, $_ );
-	#We have an array to add to the buffer, we'll add it ourself instead of 
-	#calling add_to_buffer, which does not know about arrays
-	
-	push( @{ $buff{$buffer} }, @{ $rec->{lines} } );
-
-	if ( $rec->{type} eq 'addon' ) 
-	{
-		dump_fields( $stmt_mode, $fields, '' );
-	}
-
-
-	# if we added something (ie there are lines in our array), return 1
-	return 1 if (scalar(@{ $rec->{lines} }) > 0);
-	return 0;
-}
-
-
-# include_addon does this same thing, but does not call this
-# sub... so if you change this, you need to fix include_addon too
-#   Pass:  buffer_name, string_to_append
-sub add_to_buffer 
-{
-	push( @{ $buff{$_[0]} }, "$_[1]\n" );
-}
-
-sub dump_buffer 
-{
-	my($buffer) = @_;
-	print '/* ', $buffer, ' */',"\n";
-	my $ref = $buff{$buffer};
-	print @$ref;
-}
-
-sub dump_fields 
-{
-	my ( $mode, $flds, $ln ) = @_;
-	my $len = scalar(@$flds);
-
-	if ( $mode == 0 ) 
-	{
-		#Normal
-		add_to_buffer( 'rules', $ln );
-		if ( $feature_not_supported == 1 ) 
-		{
-			# we found an unsupported feature, but we have to
-			# filter out ExecuteStmt: CREATE OptTemp TABLE ...
-			# because the warning there is only valid in some situations
-			if ( $flds->[0] ne 'create' || $flds->[2] ne 'table' ) 
-			{
-				add_to_buffer( 'rules', 
-					'mmerror(PARSE_ERROR, ET_WARNING, "unsupported feature will be passed to server");'
-				);
-			}
-			$feature_not_supported = 0;
-		}
-
-		if ( $len == 0 ) 
-		{
-			# We have no fields ?
-			add_to_buffer( 'rules', ' $$=EMPTY; }' );
-		} 
-		else 
-		{
-			# Go through each field and try to 'aggregate' the tokens 
-			# into a single 'mm_strdup' where possible
-			my @flds_new;
-			my $str;
-			for ( my $z = 0 ; $z < $len ; $z++ ) 
-			{
-				if ( substr( $flds->[$z], 0, 1 ) eq '$' ) 
-				{
-					push(@flds_new, $flds->[$z]);
-					next;
-				}
-
-				$str = $flds->[$z];
-
-				while (1) 
-				{
-					if ( $z >= $len - 1 || substr( $flds->[ $z + 1 ], 0, 1 ) eq '$' )
-					{
-						# We're at the end...
-						push(@flds_new,  "mm_strdup(\"$str\")");
-						last;
-					}
-					$z++;
-					$str = $str . ' ' . $flds->[$z];
-				}
-			}
-
-			# So - how many fields did we end up with ?
-			$len = scalar(@flds_new);
-			if ( $len == 1 ) 
-			{
-				# Straight assignement
-				$str = ' $$ = ' . $flds_new[0] . ';';
-				add_to_buffer( 'rules', $str );
-			}
-			else 
-			{
-				# Need to concatenate the results to form
-				# our final string
-				$str = ' $$ = cat_str(' . $len . ',' . join(',', @flds_new) . ');';
-				add_to_buffer( 'rules', $str );
-			}
-			add_to_buffer( 'rules', '}' );
-		}
-	}
-	else
-	{
-		# we're in the stmt: rule
-		if ($len)
-		{
-			# or just the statement ...
-			add_to_buffer( 'rules', ' { output_statement($1, 0, ECPGst_normal); }' );
-		}
-		else
-		{
-			add_to_buffer( 'rules', ' { $$ = NULL; }' );
-		}
-	}
-}
-
-
-sub dump_line 
-{
-	my($stmt_mode, $fields) = @_;
-	my $block = $non_term_id . $line;
-	$block =~ tr/ |//d;
-	my $rep = $replace_line{$block};
-	if ($rep)
-	{
-		if ($rep eq 'ignore' ) 
-		{
-			return 0;
-		}
-
-		if ( index( $line, '|' ) != -1 ) 
-		{
-			$line = '| ' . $rep;
-		}
-		else 
-		{
-			$line = $rep;
-		}
-		$block = $non_term_id . $line;
-		$block =~ tr/ |//d;
-	}
-	add_to_buffer( 'rules', $line );
-	my $i = include_addon( 'rules', $block, $fields, $stmt_mode);
-	if ( $i == 0 ) 
-	{
-		dump_fields( $stmt_mode, $fields, ' { ' );
-	}
-	return 1;
-}
-
-=top
-	load addons into cache
-	%addons = { 
-		stmtClosePortalStmt => { 'type' => 'block', 'lines' => [ "{", "if (INFORMIX_MODE)" ..., "}" ] },
-		stmtViewStmt => { 'type' => 'rule', 'lines' => [ "| ECPGAllocateDescr", ... ] }
-	}
-
-=cut
-sub preload_addons
-{
-	my $filename = $path . "/ecpg.addons";
-	open(my $fh, '<', $filename) or die;
-	# there may be multple lines starting ECPG: and then multiple lines of code.
-	# the code need to be add to all prior ECPG records.
-	my (@needsRules, @code, $record);
-	# there may be comments before the first ECPG line, skip them
-	my $skip = 1;
-	while ( <$fh> ) 
-	{
-		if (/^ECPG:\s(\S+)\s?(\w+)?/)
-		{
-			$skip = 0;
-			if (@code)
-			{
-				for my $x (@needsRules)
-				{
-					push(@{ $x->{lines} }, @code);
-				}
-				@code = ();
-				@needsRules = ();
-			}
-			$record = {};
-			$record->{type} = $2;
-			$record->{lines} = [];
-			if (exists $addons{$1}) { die "Ga! there are dups!\n"; }
-			$addons{$1} = $record;
-			push(@needsRules, $record);
-		} 
-		else
-		{
-			next if $skip;
-			push(@code, $_);
-		}
-	}
-	close($fh);
-	if (@code)
-	{
-		for my $x (@needsRules)
-		{
-			push(@{ $x->{lines} }, @code);
-		}
-	}
-}
-
-
diff --git a/src/interfaces/ecpg/preproc/po/cs.po b/src/interfaces/ecpg/preproc/po/cs.po
new file mode 100644
index 0000000000000..43f0d1b2e66e0
--- /dev/null
+++ b/src/interfaces/ecpg/preproc/po/cs.po
@@ -0,0 +1,624 @@
+# LANGUAGE message translation file for ecpg
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-04 02:55+0000\n"
+"PO-Revision-Date: 2011-09-04 23:19+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: descriptor.c:64
+#, c-format
+msgid "variable \"%s\" must have a numeric type"
+msgstr "proměnná \"%s\" musí mít �íselný typ"
+
+#: descriptor.c:124 descriptor.c:146
+#, c-format
+msgid "descriptor \"%s\" does not exist"
+msgstr ""
+
+#: descriptor.c:161 descriptor.c:210
+#, c-format
+msgid "descriptor header item \"%d\" does not exist"
+msgstr ""
+
+#: descriptor.c:182
+msgid "nullable is always 1"
+msgstr "nullable je vždy 1"
+
+#: descriptor.c:185
+msgid "key_member is always 0"
+msgstr "key_member je vždy 0"
+
+#: descriptor.c:277
+#, c-format
+msgid "descriptor item \"%s\" is not implemented"
+msgstr ""
+
+#: descriptor.c:287
+#, c-format
+msgid "descriptor item \"%s\" cannot be set"
+msgstr ""
+
+#: ecpg.c:35
+#, c-format
+msgid ""
+"%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
+"\n"
+msgstr ""
+"%s je PostgreSQL preprocesor vloženého SQL pro C programy.\n"
+"\n"
+
+#: ecpg.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]... FILE...\n"
+"\n"
+msgstr ""
+"Použití:\n"
+"  %s [VOLBA]... SOUBOR...\n"
+"\n"
+
+#: ecpg.c:40
+#, c-format
+msgid "Options:\n"
+msgstr "Volby:\n"
+
+#: ecpg.c:41
+#, c-format
+msgid ""
+"  -c             automatically generate C code from embedded SQL code;\n"
+"                 this affects EXEC SQL TYPE\n"
+msgstr ""
+"  -c             automaticky generuje C kód z vložných SQL příkazů;\n"
+"                 toto ovlivňuje EXEC SQL TYPE\n"
+
+#: ecpg.c:43
+#, c-format
+msgid ""
+"  -C MODE        set compatibility mode; MODE can be one of\n"
+"                 \"INFORMIX\", \"INFORMIX_SE\"\n"
+msgstr ""
+"  -C MÓD         nastaví mód kompatibility; MÓD může být jedno z \n"
+"                 \"INFORMIX\", \"INFORMIX_SE\"\n"
+
+#: ecpg.c:46
+#, c-format
+msgid "  -d             generate parser debug output\n"
+msgstr "  -d             zapne generování ladicích informací parseru\n"
+
+#: ecpg.c:48
+#, c-format
+msgid "  -D SYMBOL      define SYMBOL\n"
+msgstr "  -D SYMBOL      definuje SYMBOL\n"
+
+#: ecpg.c:49
+#, c-format
+msgid ""
+"  -h             parse a header file, this option includes option \"-c\"\n"
+msgstr ""
+"  -h             naparsuje hlavi�kový soubor, tato volba zahrnuje volbu \"-c"
+"\"\n"
+
+#: ecpg.c:50
+#, c-format
+msgid "  -i             parse system include files as well\n"
+msgstr "  -i             naparsuje také systémové hlavi�kové soubory\n"
+
+#: ecpg.c:51
+#, c-format
+msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
+msgstr "  -I ADRES�Ř     vyhledá include soubory v ADRES�Ři\n"
+
+#: ecpg.c:52
+#, c-format
+msgid "  -o OUTFILE     write result to OUTFILE\n"
+msgstr "  -o SOUBOR     zapíše výsledek do SOUBORu\n"
+
+#: ecpg.c:53
+#, c-format
+msgid ""
+"  -r OPTION      specify run-time behavior; OPTION can be:\n"
+"                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+msgstr ""
+"  -r VOLBA      ur�uje run-time chování; VOLBA může být:\n"
+"                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+
+#: ecpg.c:55
+#, c-format
+msgid "  --regression   run in regression testing mode\n"
+msgstr "  --regression   běh v módu regresních testů\n"
+
+#: ecpg.c:56
+#, c-format
+msgid "  -t             turn on autocommit of transactions\n"
+msgstr "  -t             zapne autocommit transakcí\n"
+
+#: ecpg.c:57
+#, c-format
+msgid "  --help         show this help, then exit\n"
+msgstr "  --help         zobrazí tuto nápovědu; poté skon�í\n"
+
+#: ecpg.c:58
+#, c-format
+msgid "  --version      output version information, then exit\n"
+msgstr "  --version      vypíše informaci o verzi, poté skon�í\n"
+
+#: ecpg.c:59
+#, c-format
+msgid ""
+"\n"
+"If no output file is specified, the name is formed by adding .c to the\n"
+"input file name, after stripping off .pgc if present.\n"
+msgstr ""
+"\n"
+"Pokud není zadán žádný výstupní soubor, je jméno získáno přidáním .c\n"
+"na konec jména vstupního souboru, po odstranění koncovky .pgc pokud\n"
+"je přítomna.\n"
+
+#: ecpg.c:61
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: ecpg.c:182 ecpg.c:333 ecpg.c:343
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: nelze otevřít soubor \"%s\": %s\n"
+
+#: ecpg.c:221 ecpg.c:234 ecpg.c:250 ecpg.c:275
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: ecpg.c:245
+#, c-format
+msgid "%s: parser debug support (-d) not available\n"
+msgstr "%s: podpora pro ladicí informace parseru (-d) není dostupná\n"
+
+#: ecpg.c:263
+#, c-format
+msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
+msgstr ""
+
+#: ecpg.c:265
+#, c-format
+msgid "EXEC SQL INCLUDE ... search starts here:\n"
+msgstr "EXEC SQL INCLUDE ... hledání za�íná zde:\n"
+
+#: ecpg.c:268
+#, c-format
+msgid "end of search list\n"
+msgstr "konec vyhledávacího seznamu\n"
+
+#: ecpg.c:274
+#, c-format
+msgid "%s: no input files specified\n"
+msgstr "%s: nebyl zadán žádný vstupní soubor\n"
+
+#: ecpg.c:466
+#, c-format
+msgid "cursor \"%s\" has been declared but not opened"
+msgstr "kurzor \"%s\" byl deklarován ale nebyl otevřen"
+
+#: ecpg.c:479 preproc.y:109
+#, c-format
+msgid "could not remove output file \"%s\"\n"
+msgstr "nelze odstranit výstupní soubor \"%s\"\n"
+
+#: pgc.l:402
+msgid "unterminated /* comment"
+msgstr "neukon�ený /* komentář"
+
+#: pgc.l:415
+msgid "invalid bit string literal"
+msgstr "neplatný bit string literál"
+
+#: pgc.l:424
+msgid "unterminated bit string literal"
+msgstr "neukon�ený literál - bitový řetězec"
+
+#: pgc.l:440
+msgid "unterminated hexadecimal string literal"
+msgstr "neukon�ený literál - hexadecimální řetězec"
+
+#: pgc.l:518
+msgid "unterminated quoted string"
+msgstr "neukon�ený řetězec v uvozovkách"
+
+#: pgc.l:573 pgc.l:586
+msgid "zero-length delimited identifier"
+msgstr ""
+
+#: pgc.l:594
+msgid "unterminated quoted identifier"
+msgstr "neukon�ený identifikátor v uvozovkách"
+
+#: pgc.l:940
+msgid "missing identifier in EXEC SQL UNDEF command"
+msgstr "chybějící identifikátor v příkazu EXEC SQL UNDEF"
+
+#: pgc.l:986 pgc.l:1000
+msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+msgstr "chybějící odpovídající \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+
+#: pgc.l:989 pgc.l:1002 pgc.l:1178
+msgid "missing \"EXEC SQL ENDIF;\""
+msgstr "chybějící \"EXEC SQL ENDIF;\""
+
+#: pgc.l:1018 pgc.l:1037
+msgid "more than one EXEC SQL ELSE"
+msgstr "více než jedna větev EXEC SQL ELSE"
+
+#: pgc.l:1059 pgc.l:1073
+msgid "unmatched EXEC SQL ENDIF"
+msgstr "neodpovídající EXEC SQL ENDIF"
+
+#: pgc.l:1093
+msgid "too many nested EXEC SQL IFDEF conditions"
+msgstr "příliš mnoho zanořených EXEC SQL IFDEF podmínek"
+
+#: pgc.l:1126
+msgid "missing identifier in EXEC SQL IFDEF command"
+msgstr "chybějící identifikátor v příkazu EXEC SQL IFDEF"
+
+#: pgc.l:1135
+msgid "missing identifier in EXEC SQL DEFINE command"
+msgstr "chybějící identifikátor v příkazu EXEC SQL DEFINE"
+
+#: pgc.l:1168
+msgid "syntax error in EXEC SQL INCLUDE command"
+msgstr "syntaktická chyba v příkazu EXEC SQL INCLUDE"
+
+#: pgc.l:1217
+msgid ""
+"internal error: unreachable state; please report this to <pgsql-"
+"bugs@postgresql.org>"
+msgstr ""
+"interní chyba: nedosažitelný stav; oznamte toto prosím na <pgsql-"
+"bugs@postgresql.org>"
+
+#: pgc.l:1342
+#, c-format
+msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
+msgstr ""
+"Chyba: include path \"%s/%s\" na řádku %d je příliš dlouhá, přeskakuji\n"
+
+#: pgc.l:1364
+#, c-format
+msgid "could not open include file \"%s\" on line %d"
+msgstr "nelze otevřít soubor \"%s\" na řádku %d"
+
+#: preproc.y:31
+msgid "syntax error"
+msgstr "syntaktická chyba"
+
+#: preproc.y:81
+#, c-format
+msgid "WARNING: "
+msgstr "VAROV�N�: "
+
+#: preproc.y:85
+#, c-format
+msgid "ERROR: "
+msgstr "CHYBA: "
+
+#: preproc.y:391
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "kurzor \"%s\" neexistuje"
+
+#: preproc.y:419
+msgid "initializer not allowed in type definition"
+msgstr "inicializátor (initializer) není v definici typu povolen"
+
+#: preproc.y:421
+msgid "type name \"string\" is reserved in Informix mode"
+msgstr "název typu \"string\" je vyhrazen pro mód Informix"
+
+#: preproc.y:428 preproc.y:13011
+#, c-format
+msgid "type \"%s\" is already defined"
+msgstr "typ \"%s\" je již definován"
+
+#: preproc.y:452 preproc.y:13651 preproc.y:13972 variable.c:610
+msgid "multidimensional arrays for simple data types are not supported"
+msgstr "vícerozměrná pole pro jednoduché datové typy nejsou podporována"
+
+#: preproc.y:1425
+msgid "AT option not allowed in CLOSE DATABASE statement"
+msgstr "AT volba není v příkazu CLOSE DATABASE povolena"
+
+#: preproc.y:1495 preproc.y:1639
+msgid "AT option not allowed in DEALLOCATE statement"
+msgstr "AT volba není v příkazu DEALLOCATE povolena"
+
+#: preproc.y:1625
+msgid "AT option not allowed in CONNECT statement"
+msgstr "AT volba není v příkazu CONNECT povolena"
+
+#: preproc.y:1661
+msgid "AT option not allowed in DISCONNECT statement"
+msgstr "AT volba není v příkazu DISCONNECT povolena"
+
+#: preproc.y:1716
+msgid "AT option not allowed in SET CONNECTION statement"
+msgstr "AT volba není v příkazu SET CONNECTION povolena"
+
+#: preproc.y:1738
+msgid "AT option not allowed in TYPE statement"
+msgstr "AT volba není v příkazu TYPE povolena"
+
+#: preproc.y:1747
+msgid "AT option not allowed in VAR statement"
+msgstr "AT volba není v příkazu VAR povolena"
+
+#: preproc.y:1754
+msgid "AT option not allowed in WHENEVER statement"
+msgstr "AT volba není v příkazu WHENEVER povolena"
+
+#: preproc.y:2100 preproc.y:3338 preproc.y:4526 preproc.y:4535 preproc.y:4816
+#: preproc.y:7103 preproc.y:7108 preproc.y:7113 preproc.y:9447 preproc.y:9990
+msgid "unsupported feature will be passed to server"
+msgstr "nepodporovaná vlastnost bude předána serveru"
+
+#: preproc.y:2326
+msgid "SHOW ALL is not implemented"
+msgstr "příkaz SHOW ALL není implementován"
+
+#: preproc.y:2749 preproc.y:2760
+msgid "COPY TO STDIN is not possible"
+msgstr "příkaz COPY TO STDIN nelze použít"
+
+#: preproc.y:2751
+msgid "COPY FROM STDOUT is not possible"
+msgstr "příkaz COPY FROM STDOUT nelze použít"
+
+#: preproc.y:2753
+msgid "COPY FROM STDIN is not implemented"
+msgstr "příkaz COPY FROM STDIN není implementován"
+
+#: preproc.y:7909 preproc.y:12600
+#, c-format
+msgid "using variable \"%s\" in different declare statements is not supported"
+msgstr "použití proměnné \"%s\" v dalších deklaracích není podporováno"
+
+#: preproc.y:7911 preproc.y:12602
+#, c-format
+msgid "cursor \"%s\" is already defined"
+msgstr "kurzor \"%s\" je již definován"
+
+#: preproc.y:8329
+msgid "no longer supported LIMIT #,# syntax passed to server"
+msgstr "již neopdporovaná syntaxe LIMIT #,# předána serveru"
+
+#: preproc.y:8564
+msgid "subquery in FROM must have an alias"
+msgstr "poddotaz ve FROM musí mít alias"
+
+#: preproc.y:12332
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS nemůže specifikovat INTO"
+
+#: preproc.y:12369
+#, c-format
+msgid "expected \"@\", found \"%s\""
+msgstr "o�ekáváno \"@\", nalezeno \"%s\""
+
+#: preproc.y:12381
+msgid ""
+"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
+"supported"
+msgstr ""
+"podporovány jsou pouze protokoly \"tcp\" a \"unix\" a typ databáze "
+"\"postgresql\""
+
+#: preproc.y:12384
+#, c-format
+msgid "expected \"://\", found \"%s\""
+msgstr "o�ekáváno \"://\", nalezeno \"%s\""
+
+#: preproc.y:12389
+#, c-format
+msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
+msgstr "Unixové sockety fungují pouze na \"localhost\" ale ne na \"%s\""
+
+#: preproc.y:12415
+#, c-format
+msgid "expected \"postgresql\", found \"%s\""
+msgstr "o�ekáváno \"postgresql\", nalezeno \"%s\""
+
+#: preproc.y:12418
+#, c-format
+msgid "invalid connection type: %s"
+msgstr "chybný typ spojení: %s"
+
+#: preproc.y:12427
+#, c-format
+msgid "expected \"@\" or \"://\", found \"%s\""
+msgstr "o�ekáváno \"@\" nebo \"://\", nalezeno \"%s\""
+
+#: preproc.y:12502 preproc.y:12520
+msgid "invalid data type"
+msgstr "chybný datový typ"
+
+#: preproc.y:12531 preproc.y:12546
+msgid "incomplete statement"
+msgstr "neúplný příkaz"
+
+#: preproc.y:12534 preproc.y:12549
+#, c-format
+msgid "unrecognized token \"%s\""
+msgstr "nerozpoznaný token \"%s\""
+
+#: preproc.y:12822
+msgid "only data types numeric and decimal have precision/scale argument"
+msgstr "pouze datové typy numeric a decimal mají argumenty přesnost/velikost"
+
+#: preproc.y:12834
+msgid "interval specification not allowed here"
+msgstr "specifikace intervalu zde není povolena"
+
+#: preproc.y:12986 preproc.y:13038
+msgid "too many levels in nested structure/union definition"
+msgstr "příliš mnoho úrovní v definici vnořené struktury/union"
+
+#: preproc.y:13169
+msgid "pointers to varchar are not implemented"
+msgstr "ukazatele na varchar nejsou implementovány"
+
+#: preproc.y:13356 preproc.y:13381
+msgid "using unsupported DESCRIBE statement"
+msgstr "použití nepodporovaného příkazu DESCRIBE"
+
+#: preproc.y:13618
+msgid "initializer not allowed in EXEC SQL VAR command"
+msgstr "inicializátor není v příkazu EXEC SQL VAR podporován"
+
+#: preproc.y:13930
+msgid "arrays of indicators are not allowed on input"
+msgstr "pole identifikátorů nejsou na vstupu povolena"
+
+#. translator: %s is typically the translation of "syntax error"
+#: preproc.y:14184
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s na nebo blízko \"%s\""
+
+#: type.c:18 type.c:30
+msgid "out of memory"
+msgstr "nedostatek paměti"
+
+#: type.c:212 type.c:594
+#, c-format
+msgid "unrecognized variable type code %d"
+msgstr "nerozpoznaný kód typu proměnné %d"
+
+#: type.c:261
+#, c-format
+msgid "variable \"%s\" is hidden by a local variable of a different type"
+msgstr "proměnná \"%s\" je překryta lokální proměnnou s jiným datovým typem"
+
+#: type.c:263
+#, c-format
+msgid "variable \"%s\" is hidden by a local variable"
+msgstr "proměnná \"%s\" je překryta lokální proměnnou"
+
+#: type.c:275
+#, c-format
+msgid ""
+"indicator variable \"%s\" is hidden by a local variable of a different type"
+msgstr ""
+"indicator variable \"%s\" je překryta lokální proměnnou s jiným datovým typem"
+
+#: type.c:277
+#, c-format
+msgid "indicator variable \"%s\" is hidden by a local variable"
+msgstr "indicator variable \"%s\" je překryta lokální proměnnou"
+
+#: type.c:285
+msgid "indicator for array/pointer has to be array/pointer"
+msgstr "indicator variable pro pole/ukaztel musí být pole/ukazatel"
+
+#: type.c:289
+msgid "nested arrays are not supported (except strings)"
+msgstr "vnořená pole nejsou podporována (kromě řetězců)"
+
+#: type.c:322
+msgid "indicator for struct has to be a struct"
+msgstr "indikátor pro strukturu musí být struktura"
+
+#: type.c:331 type.c:339 type.c:347
+msgid "indicator for simple data type has to be simple"
+msgstr "indikátor pro jednoduché datové typy musí být jednoduchý"
+
+#: type.c:653
+#, c-format
+msgid "unrecognized descriptor item code %d"
+msgstr "nerozpoznaný kód deskriptoru položky %d"
+
+#: variable.c:89 variable.c:112
+#, c-format
+msgid "incorrectly formed variable \"%s\""
+msgstr "nesprávně vytvořený název proměnné \"%s\""
+
+#: variable.c:135
+#, c-format
+msgid "variable \"%s\" is not a pointer"
+msgstr "proměnná \"%s\" není ukazatel"
+
+#: variable.c:138 variable.c:163
+#, c-format
+msgid "variable \"%s\" is not a pointer to a structure or a union"
+msgstr "proměnná \"%s\" není ukazatel na strukturu nebo sjednocení"
+
+#: variable.c:150
+#, c-format
+msgid "variable \"%s\" is neither a structure nor a union"
+msgstr "proměnná \"%s\" není ani struktura ani sjednocení"
+
+#: variable.c:160
+#, c-format
+msgid "variable \"%s\" is not an array"
+msgstr "proměnná \"%s\" není pole"
+
+#: variable.c:229 variable.c:251
+#, c-format
+msgid "variable \"%s\" is not declared"
+msgstr "proměnná \"%s\" není deklarována"
+
+#: variable.c:484
+msgid "indicator variable must have an integer type"
+msgstr "indicator variable musí mít celo�íselný typ"
+
+#: variable.c:496
+#, c-format
+msgid "unrecognized data type name \"%s\""
+msgstr "nerozpoznaný název datového typu \"%s\""
+
+#: variable.c:507 variable.c:515 variable.c:532 variable.c:535
+msgid "multidimensional arrays are not supported"
+msgstr "vícerozměrná pole nejsou podporována"
+
+#: variable.c:524
+#, c-format
+msgid ""
+"multilevel pointers (more than 2 levels) are not supported; found %d level"
+msgid_plural ""
+"multilevel pointers (more than 2 levels) are not supported; found %d levels"
+msgstr[0] ""
+"víceúrovňové ukazatele (více než 2 úrovně) nejsou podporovány; nalezena %d "
+"úroveň"
+msgstr[1] ""
+"víceúrovňové ukazatele (více než 2 úrovně) nejsou podporovány; nalezeny %d "
+"úrovně"
+msgstr[2] ""
+"víceúrovňové ukazatele (více než 2 úrovně) nejsou podporovány; nalezeno %d "
+"úrovní"
+
+#: variable.c:529
+msgid "pointer to pointer is not supported for this data type"
+msgstr "ukazatel na ukazatel není pro tento datový typ podporován"
+
+#: variable.c:549
+msgid "multidimensional arrays for structures are not supported"
+msgstr "vícerozměrná pole pro struktury nejsou podporována"
+
+#~ msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+#~ msgstr "omezení definované jako INITIALLY DEFERRED musí být DEFERRABLE"
diff --git a/src/interfaces/ecpg/preproc/po/pl.po b/src/interfaces/ecpg/preproc/po/pl.po
new file mode 100644
index 0000000000000..b42f1312c0bf1
--- /dev/null
+++ b/src/interfaces/ecpg/preproc/po/pl.po
@@ -0,0 +1,623 @@
+# Polish message translation file for ecpg
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ecpg (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:57+0000\n"
+"PO-Revision-Date: 2011-09-30 09:51-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: descriptor.c:64
+#, c-format
+msgid "variable \"%s\" must have a numeric type"
+msgstr "zmienna \"%s\" musi mieć typ numeryczny"
+
+#: descriptor.c:124 descriptor.c:146
+#, c-format
+msgid "descriptor \"%s\" does not exist"
+msgstr "deskryptor \"%s\" nie istnieje"
+
+#: descriptor.c:161 descriptor.c:210
+#, c-format
+msgid "descriptor header item \"%d\" does not exist"
+msgstr "element nagłówka deskryptora \"%d\" nie istnieje"
+
+#: descriptor.c:182
+msgid "nullable is always 1"
+msgstr "nullable jest zawsze 1"
+
+#: descriptor.c:185
+msgid "key_member is always 0"
+msgstr "key_member jest zawsze 0"
+
+#: descriptor.c:277
+#, c-format
+msgid "descriptor item \"%s\" is not implemented"
+msgstr "element deskryptora \"%s\" nie jest zaimplementowany"
+
+#: descriptor.c:287
+#, c-format
+msgid "descriptor item \"%s\" cannot be set"
+msgstr "element deskryptora \"%s\" nie może zostać ustawiony"
+
+#: ecpg.c:35
+#, c-format
+msgid ""
+"%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
+"\n"
+msgstr ""
+"%s jest osadzonym w PostgreSQL preprocesorem SQL dla programów C.\n"
+"\n"
+
+#: ecpg.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]... FILE...\n"
+"\n"
+msgstr ""
+"Sposób użycia:\n"
+"  %s [OPCJE]... PLIK...\n"
+"\n"
+
+#: ecpg.c:40
+#, c-format
+msgid "Options:\n"
+msgstr "Opcje:\n"
+
+#: ecpg.c:41
+#, c-format
+msgid ""
+"  -c             automatically generate C code from embedded SQL code;\n"
+"                 this affects EXEC SQL TYPE\n"
+msgstr ""
+"  -c             automatycznie generuje kod w C z osadzonego kodu SQL;\n"
+"                 dotyczy to EXEC SQL TYPE\n"
+
+#: ecpg.c:43
+#, c-format
+msgid ""
+"  -C MODE        set compatibility mode; MODE can be one of\n"
+"                 \"INFORMIX\", \"INFORMIX_SE\"\n"
+msgstr ""
+"  -C TRYB        ustala tryb kompatybilności; TRYB może być jednym z\n"
+"                 \"INFORMIX\", \"INFORMIX_SE\"\n"
+
+#: ecpg.c:46
+#, c-format
+msgid "  -d             generate parser debug output\n"
+msgstr "  -d             generuje wyjście debugowania parsera\n"
+
+#: ecpg.c:48
+#, c-format
+msgid "  -D SYMBOL      define SYMBOL\n"
+msgstr "  -D SYMBOL      definiuje SYMBOL\n"
+
+#: ecpg.c:49
+#, c-format
+msgid ""
+"  -h             parse a header file, this option includes option \"-c\"\n"
+msgstr ""
+"  -h             parsuje plik nagłówkowy, opcja ta zawiera opcję \"-c\"\n"
+
+#: ecpg.c:50
+#, c-format
+msgid "  -i             parse system include files as well\n"
+msgstr "  -i             parsuje również systemowe pliki nagłówkowe\n"
+
+#: ecpg.c:51
+#, c-format
+msgid "  -I DIRECTORY   search DIRECTORY for include files\n"
+msgstr "  -I FOLDER   przeszukuje FOLDER w poszukiwaniu plików nagłówkowych\n"
+
+#: ecpg.c:52
+#, c-format
+msgid "  -o OUTFILE     write result to OUTFILE\n"
+msgstr "  -o PLIKOUT     zapisuje wynik do PLIKOUT\n"
+
+#: ecpg.c:53
+#, c-format
+msgid ""
+"  -r OPTION      specify run-time behavior; OPTION can be:\n"
+"                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+msgstr ""
+"  -r OPCJA       określa zachowanie uruchomienia; OPTCJA może być:\n"
+"                 \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+
+#: ecpg.c:55
+#, c-format
+msgid "  --regression   run in regression testing mode\n"
+msgstr "  --regression   wykonanie w trybie testów regresyjnych\n"
+
+#: ecpg.c:56
+#, c-format
+msgid "  -t             turn on autocommit of transactions\n"
+msgstr "  -t             włącza automatyczne zatwierdzanie transakcji\n"
+
+#: ecpg.c:57
+#, c-format
+msgid "  --help         show this help, then exit\n"
+msgstr "  --help         pokazuje ten ekran pomocy i kończy\n"
+
+#: ecpg.c:58
+#, c-format
+msgid "  --version      output version information, then exit\n"
+msgstr "  --version      wypisuje informacje o wersji i kończy\n"
+
+#: ecpg.c:59
+#, c-format
+msgid ""
+"\n"
+"If no output file is specified, the name is formed by adding .c to the\n"
+"input file name, after stripping off .pgc if present.\n"
+msgstr ""
+"\n"
+"Jeżeli nie wskazano pliku wyjścia, nazwa jest tworzona przez dodanie .c\n"
+"do nazwy pliku wejścia, po usunięciu .pgc jeśli obecne.\n"
+
+#: ecpg.c:61
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
+
+#: ecpg.c:182 ecpg.c:333 ecpg.c:343
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: nie można otworzyć pliku \"%s\": %s\n"
+
+#: ecpg.c:221 ecpg.c:234 ecpg.c:250 ecpg.c:275
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
+
+#: ecpg.c:245
+#, c-format
+msgid "%s: parser debug support (-d) not available\n"
+msgstr "%s: wsparcie debugu analizatora (-d) niedostępne\n"
+
+#: ecpg.c:263
+#, c-format
+msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
+msgstr "%s, preprocesor C osadzony w PostgreSQL, wersja %d.%d.%d\n"
+
+#: ecpg.c:265
+#, c-format
+msgid "EXEC SQL INCLUDE ... search starts here:\n"
+msgstr "EXEC SQL INCLUDE ... wyszukiwanie zaczyna siÄ™ tutaj:\n"
+
+#: ecpg.c:268
+#, c-format
+msgid "end of search list\n"
+msgstr "koniec listy wyszukiwania\n"
+
+#: ecpg.c:274
+#, c-format
+msgid "%s: no input files specified\n"
+msgstr "%s: nie wskazano pliku wejściowego\n"
+
+#: ecpg.c:466
+#, c-format
+msgid "cursor \"%s\" has been declared but not opened"
+msgstr "kursor \"%s\" został zadeklarowany, ale nie otwarty"
+
+#: ecpg.c:479 preproc.y:109
+#, c-format
+msgid "could not remove output file \"%s\"\n"
+msgstr "nie można usunąć pliku wyjścia \"%s\"\n"
+
+#: pgc.l:402
+msgid "unterminated /* comment"
+msgstr "nie zakończony komentarz /*"
+
+#: pgc.l:415
+msgid "invalid bit string literal"
+msgstr "nieprawidłowa stała łańcucha bitów"
+
+#: pgc.l:424
+msgid "unterminated bit string literal"
+msgstr "niezakończona stała łańcucha bitów"
+
+#: pgc.l:440
+msgid "unterminated hexadecimal string literal"
+msgstr "niezakończona stała łańcucha szesnastkowego"
+
+#: pgc.l:518
+msgid "unterminated quoted string"
+msgstr "niezakończona stała łańcuchowa"
+
+#: pgc.l:573 pgc.l:586
+msgid "zero-length delimited identifier"
+msgstr "ograniczony identyfikator o długości zero"
+
+#: pgc.l:594
+msgid "unterminated quoted identifier"
+msgstr "niezakończony łańcuch identyfikatora"
+
+#: pgc.l:940
+msgid "missing identifier in EXEC SQL UNDEF command"
+msgstr "brakujÄ…cy identyfikator w poleceniu EXEC SQL UNDEF"
+
+#: pgc.l:986 pgc.l:1000
+msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+msgstr "brak pasujÄ…cego \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+
+#: pgc.l:989 pgc.l:1002 pgc.l:1178
+msgid "missing \"EXEC SQL ENDIF;\""
+msgstr "brak \"EXEC SQL ENDIF;\""
+
+#: pgc.l:1018 pgc.l:1037
+msgid "more than one EXEC SQL ELSE"
+msgstr "więcej niż jeden EXEC SQL ELSE"
+
+#: pgc.l:1059 pgc.l:1073
+msgid "unmatched EXEC SQL ENDIF"
+msgstr "niedopasowany EXEC SQL ENDIF"
+
+#: pgc.l:1093
+msgid "too many nested EXEC SQL IFDEF conditions"
+msgstr "zbyt wiele zagłębień warunków EXEC SQL IFDEF"
+
+#: pgc.l:1126
+msgid "missing identifier in EXEC SQL IFDEF command"
+msgstr "brakujÄ…cy identyfikator w poleceniu EXEC SQL IFDEF"
+
+#: pgc.l:1135
+msgid "missing identifier in EXEC SQL DEFINE command"
+msgstr "brakujÄ…cy identyfikator w poleceniu EXEC SQL DEFINE"
+
+#: pgc.l:1168
+msgid "syntax error in EXEC SQL INCLUDE command"
+msgstr "błąd składni w poleceniu EXEC SQL INCLUDE"
+
+#: pgc.l:1217
+msgid ""
+"internal error: unreachable state; please report this to <pgsql-"
+"bugs@postgresql.org>"
+msgstr ""
+"błąd wewnętrzny: nieosiągalny stan; proszę przesłać go na adres <pgsql-"
+"bugs@postgresql.org>"
+
+#: pgc.l:1342
+#, c-format
+msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
+msgstr ""
+"Błąd: załączona ścieżka \"%s/%s\" jest zbyt długa w linii %d, pominięto\n"
+
+#: pgc.l:1364
+#, c-format
+msgid "could not open include file \"%s\" on line %d"
+msgstr "nie można otworzyć załączonego pliku \"%s\" w linii %d"
+
+#: preproc.y:31
+msgid "syntax error"
+msgstr "błąd składni"
+
+#: preproc.y:81
+#, c-format
+msgid "WARNING: "
+msgstr "OSTRZEŻENIE: "
+
+#: preproc.y:85
+#, c-format
+msgid "ERROR: "
+msgstr "B�ĄD: "
+
+#: preproc.y:391
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "kursor \"%s\" nie istnieje"
+
+#: preproc.y:419
+msgid "initializer not allowed in type definition"
+msgstr "inicjator niedozwolony w definicji typu"
+
+#: preproc.y:421
+msgid "type name \"string\" is reserved in Informix mode"
+msgstr "nazwa typu \"string\" jest zarezerwowana w trybie Informix"
+
+#: preproc.y:428 preproc.y:13011
+#, c-format
+msgid "type \"%s\" is already defined"
+msgstr "typ \"%s\" już istnieje"
+
+#: preproc.y:452 preproc.y:13651 preproc.y:13972 variable.c:610
+msgid "multidimensional arrays for simple data types are not supported"
+msgstr "wielowymiarowe tablice dla prostych typów danych nie są wspierane"
+
+#: preproc.y:1425
+msgid "AT option not allowed in CLOSE DATABASE statement"
+msgstr "opcja AT niedozwolona w wyrażeniu CLOSE DATABASE"
+
+#: preproc.y:1495 preproc.y:1639
+msgid "AT option not allowed in DEALLOCATE statement"
+msgstr "opcja AT niedozwolona w wyrażeniu DEALLOCATE"
+
+#: preproc.y:1625
+msgid "AT option not allowed in CONNECT statement"
+msgstr "opcja AT niedozwolona w wyrażeniu CONNECT"
+
+#: preproc.y:1661
+msgid "AT option not allowed in DISCONNECT statement"
+msgstr "opcja AT niedozwolona w wyrażeniu DISCONNECT"
+
+#: preproc.y:1716
+msgid "AT option not allowed in SET CONNECTION statement"
+msgstr "opcja AT niedozwolona w wyrażeniu SET CONNECTION"
+
+#: preproc.y:1738
+msgid "AT option not allowed in TYPE statement"
+msgstr "opcja AT niedozwolona w wyrażeniu TYPE"
+
+#: preproc.y:1747
+msgid "AT option not allowed in VAR statement"
+msgstr "opcja AT niedozwolona w wyrażeniu VAR"
+
+#: preproc.y:1754
+msgid "AT option not allowed in WHENEVER statement"
+msgstr "opcja AT niedozwolona w wyrażeniu WHENEVER"
+
+#: preproc.y:2100 preproc.y:3338 preproc.y:4526 preproc.y:4535 preproc.y:4816
+#: preproc.y:7103 preproc.y:7108 preproc.y:7113 preproc.y:9447 preproc.y:9990
+msgid "unsupported feature will be passed to server"
+msgstr "niewspierana cecha zostanie przekazana na serwer"
+
+#: preproc.y:2326
+msgid "SHOW ALL is not implemented"
+msgstr "SHOW ALL nie jest zaimplementowane"
+
+#: preproc.y:2749 preproc.y:2760
+msgid "COPY TO STDIN is not possible"
+msgstr "COPY TO STDIN nie jest możliwe"
+
+#: preproc.y:2751
+msgid "COPY FROM STDOUT is not possible"
+msgstr "COPY FROM STDOUT nie jest możliwe"
+
+#: preproc.y:2753
+msgid "COPY FROM STDIN is not implemented"
+msgstr "COPY FROM STDIN nie zostało zaimplementowane"
+
+#: preproc.y:7909 preproc.y:12600
+#, c-format
+msgid "using variable \"%s\" in different declare statements is not supported"
+msgstr ""
+"użycie zmiennej \"%s\" w innych wyrażeniach deklaracji nie jest wspierane"
+
+#: preproc.y:7911 preproc.y:12602
+#, c-format
+msgid "cursor \"%s\" is already defined"
+msgstr "kursor \"%s\" już istnieje"
+
+#: preproc.y:8329
+msgid "no longer supported LIMIT #,# syntax passed to server"
+msgstr "już nie wspierana składnia LIMIT #,# przesłana na serwer"
+
+#: preproc.y:8564
+msgid "subquery in FROM must have an alias"
+msgstr "podzapytanie z FROM musi mieć alias"
+
+#: preproc.y:12332
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS nie może zawierać INTO"
+
+#: preproc.y:12369
+#, c-format
+msgid "expected \"@\", found \"%s\""
+msgstr "oczekiwano \"@\", znaleziono \"%s\""
+
+#: preproc.y:12381
+msgid ""
+"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
+"supported"
+msgstr ""
+"tylko protokoły \"tcp\" i \"unix\" oraz typ bazy danych \"postgresql\" są "
+"wspierane"
+
+#: preproc.y:12384
+#, c-format
+msgid "expected \"://\", found \"%s\""
+msgstr "oczekiwano \"://\", znaleziono \"%s\""
+
+#: preproc.y:12389
+#, c-format
+msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
+msgstr ""
+"Gniazda dziedziny Uniksa działają tylko na \"localhost\" a nie na \"%s\""
+
+#: preproc.y:12415
+#, c-format
+msgid "expected \"postgresql\", found \"%s\""
+msgstr "oczekiwano \"postgresql\", znaleziono \"%s\""
+
+#: preproc.y:12418
+#, c-format
+msgid "invalid connection type: %s"
+msgstr "niepoprawny typ połączenia: %s"
+
+#: preproc.y:12427
+#, c-format
+msgid "expected \"@\" or \"://\", found \"%s\""
+msgstr "oczekiwano \"@\" lub \"://\", znaleziono \"%s\""
+
+#: preproc.y:12502 preproc.y:12520
+msgid "invalid data type"
+msgstr "niepoprawny typ danych"
+
+#: preproc.y:12531 preproc.y:12546
+msgid "incomplete statement"
+msgstr "niepełne wyrażenie"
+
+#: preproc.y:12534 preproc.y:12549
+#, c-format
+msgid "unrecognized token \"%s\""
+msgstr "niezrozumiały token \"%s\""
+
+#: preproc.y:12822
+msgid "only data types numeric and decimal have precision/scale argument"
+msgstr "tylko typy danych numeric i decimal majÄ… argument precyzji/skali"
+
+#: preproc.y:12834
+msgid "interval specification not allowed here"
+msgstr "specyfikacja interwału niedozwolona tutaj"
+
+#: preproc.y:12986 preproc.y:13038
+msgid "too many levels in nested structure/union definition"
+msgstr "zbyt wiele poziomów w zagnieżdżonej definicji structure/union"
+
+#: preproc.y:13169
+msgid "pointers to varchar are not implemented"
+msgstr "wskazania na varchar nie sÄ… zaimplementowane"
+
+#: preproc.y:13356 preproc.y:13381
+msgid "using unsupported DESCRIBE statement"
+msgstr "użycie niewspieranego wyrażenia DESCRIBE"
+
+#: preproc.y:13618
+msgid "initializer not allowed in EXEC SQL VAR command"
+msgstr "inicjator niedopuszczalny w poleceniu EXEC SQL VAR"
+
+#: preproc.y:13930
+msgid "arrays of indicators are not allowed on input"
+msgstr "tabele wskazań nie są dozwolone w wejściu"
+
+#. translator: %s is typically the translation of "syntax error"
+#: preproc.y:14184
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s w lub pobliżu \"%s\""
+
+#: type.c:18 type.c:30
+msgid "out of memory"
+msgstr "brak pamięci"
+
+#: type.c:212 type.c:594
+#, c-format
+msgid "unrecognized variable type code %d"
+msgstr "niezrozumiały kod typu zmiennej %d"
+
+#: type.c:261
+#, c-format
+msgid "variable \"%s\" is hidden by a local variable of a different type"
+msgstr "zmienna \"%s\" została przykryta przez zmienną lokalną innego typu"
+
+#: type.c:263
+#, c-format
+msgid "variable \"%s\" is hidden by a local variable"
+msgstr "zmienna \"%s\" została przykryta przez zmienną lokalną"
+
+#: type.c:275
+#, c-format
+msgid ""
+"indicator variable \"%s\" is hidden by a local variable of a different type"
+msgstr ""
+"zmienna wskaźnikowa \"%s\" została przykryta przez zmienną lokalną innego "
+"typu"
+
+#: type.c:277
+#, c-format
+msgid "indicator variable \"%s\" is hidden by a local variable"
+msgstr "zmienna wskaźnikowa \"%s\" została przykryta przez zmienną lokalną"
+
+#: type.c:285
+msgid "indicator for array/pointer has to be array/pointer"
+msgstr "wskaźnik do array/pointer musi być array/pointer"
+
+#: type.c:289
+msgid "nested arrays are not supported (except strings)"
+msgstr "tabele zagnieżdżone nie są wspierane (poza ciągami znaków)"
+
+#: type.c:322
+msgid "indicator for struct has to be a struct"
+msgstr "wskaźnik do struct musi być struct"
+
+#: type.c:331 type.c:339 type.c:347
+msgid "indicator for simple data type has to be simple"
+msgstr "wskaźnik do prostego typu danych musi być prosty "
+
+#: type.c:653
+#, c-format
+msgid "unrecognized descriptor item code %d"
+msgstr "niezrozumiały kod deskryptora elementu %d "
+
+#: variable.c:89 variable.c:112
+#, c-format
+msgid "incorrectly formed variable \"%s\""
+msgstr "niepoprawnie utworzona zmienna \"%s\""
+
+#: variable.c:135
+#, c-format
+msgid "variable \"%s\" is not a pointer"
+msgstr "zmienna \"%s\" nie jest wskaźnikiem"
+
+#: variable.c:138 variable.c:163
+#, c-format
+msgid "variable \"%s\" is not a pointer to a structure or a union"
+msgstr "zmienna \"%s\" nie jest wskazaniem na structure ani union"
+
+#: variable.c:150
+#, c-format
+msgid "variable \"%s\" is neither a structure nor a union"
+msgstr "zmienna \"%s\" nie jest ani structure ani union"
+
+#: variable.c:160
+#, c-format
+msgid "variable \"%s\" is not an array"
+msgstr "zmienna \"%s\" nie jest tablicÄ…"
+
+#: variable.c:229 variable.c:251
+#, c-format
+msgid "variable \"%s\" is not declared"
+msgstr "zmienna \"%s\" nie została zadeklarowana"
+
+#: variable.c:484
+msgid "indicator variable must have an integer type"
+msgstr "zmienna wskaźnikowa musi mieć typ integer"
+
+#: variable.c:496
+#, c-format
+msgid "unrecognized data type name \"%s\""
+msgstr "niezrozumiała nazwa typu danych \"%s\""
+
+#: variable.c:507 variable.c:515 variable.c:532 variable.c:535
+msgid "multidimensional arrays are not supported"
+msgstr "wielowymiarowe tablice nie sÄ… wspierane"
+
+#: variable.c:524
+#, c-format
+msgid ""
+"multilevel pointers (more than 2 levels) are not supported; found %d level"
+msgid_plural ""
+"multilevel pointers (more than 2 levels) are not supported; found %d levels"
+msgstr[0] ""
+"wielopoziomowe wskaźniki (więcej niż 2 poziomy) nie są wspierane; znaleziono "
+"%d poziom"
+msgstr[1] ""
+"wielopoziomowe wskaźniki (więcej niż 2 poziomy) nie są wspierane; znaleziono "
+"%d poziomy"
+msgstr[2] ""
+"wielopoziomowe wskaźniki (więcej niż 2 poziomy) nie są wspierane; znaleziono "
+"%d poziomów"
+
+#: variable.c:529
+msgid "pointer to pointer is not supported for this data type"
+msgstr "wskazanie na wskaźnik nie jest wspierane dla tego typu danych"
+
+#: variable.c:549
+msgid "multidimensional arrays for structures are not supported"
+msgstr "wielowymiarowe tablice dla struktur nie sÄ… wspierane"
diff --git a/src/interfaces/ecpg/preproc/po/pt_BR.po b/src/interfaces/ecpg/preproc/po/pt_BR.po
index e54cb21b2a013..5b3a5c6954b0e 100644
--- a/src/interfaces/ecpg/preproc/po/pt_BR.po
+++ b/src/interfaces/ecpg/preproc/po/pt_BR.po
@@ -2,11 +2,11 @@
 # Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 # Fernando Ike de Oliveira <fike@midstorm.org>, 2009.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2010-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2010-09-16 11:50-0300\n"
 "PO-Revision-Date: 2009-02-09 12:59-0200\n"
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 7ee8287cab395..e899aef83c03e 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -5,8 +5,8 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := \
-	-I$(top_builddir)/src/port \
-	-I$(top_srcdir)/src/test/regress \
+	'-I$(top_builddir)/src/port' \
+	'-I$(top_srcdir)/src/test/regress' \
 	'-DHOST_TUPLE="$(host_tuple)"' \
 	'-DMAKEPROG="$(MAKE)"' \
 	'-DSHELLPROG="$(SHELL)"' \
@@ -84,4 +84,4 @@ checktcp: all
 	./pg_regress  --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost
 
 installcheck: all
-	./pg_regress  --psqldir=$(PSQLDIR) --dbname=regress1,connectdb --top-builddir=$(top_builddir) $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb
+	./pg_regress  --psqldir='$(PSQLDIR)' --dbname=regress1,connectdb --top-builddir=$(top_builddir) $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr b/src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr
index 2cb9d25701480..dc906c85b461c 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr
+++ b/src/interfaces/ecpg/test/expected/compat_informix-rnull.stderr
@@ -22,7 +22,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: free_params on line 36: parameter 4 = t
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: free_params on line 36: parameter 5 = 3.710000038147
+[NO_PID]: free_params on line 36: parameter 5 = 3.71000003814697
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: free_params on line 36: parameter 6 = 487444
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -74,7 +74,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 59: RESULT: t offset: -1; array: no
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 59: RESULT: 3.710000038147 offset: -1; array: no
+[NO_PID]: ecpg_get_data on line 59: RESULT: 3.71000003814697 offset: -1; array: no
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 59: RESULT: 487444 offset: -1; array: no
 [NO_PID]: sqlca: code: 0, state: 00000
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 9d4b313b85028..c1522684621de 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -37,7 +37,7 @@ OBJS=	fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
 # libpgport C files we always use
 OBJS += chklocale.o inet_net_ntop.o noblock.o pgstrcasecmp.o thread.o
 # libpgport C files that are needed if identified by configure
-OBJS += $(filter crypt.o getaddrinfo.o getpeereid.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o, $(LIBOBJS))
+OBJS += $(filter crypt.o getaddrinfo.o getpeereid.o inet_aton.o open.o snprintf.o strerror.o strlcpy.o win32error.o win32setlocale.o, $(LIBOBJS))
 # backend/libpq
 OBJS += ip.o md5.o
 # utils/mb
@@ -88,7 +88,7 @@ backend_src = $(top_srcdir)/src/backend
 # For some libpgport modules, this only happens if configure decides 
 # the module is needed (see filter hack in OBJS, above).
 
-chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c pgsleep.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c win32error.c: % : $(top_srcdir)/src/port/%
+chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c pgsleep.c pgstrcasecmp.c snprintf.c strerror.c strlcpy.c thread.c win32error.c win32setlocale.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 ip.c md5.c: % : $(backend_src)/libpq/%
@@ -135,7 +135,7 @@ clean distclean: clean-lib
 # Might be left over from a Win32 client-only build
 	rm -f pg_config_paths.h
 	rm -f inet_net_ntop.c noblock.c pgstrcasecmp.c thread.c
-	rm -f chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c
+	rm -f chklocale.c crypt.c getaddrinfo.c getpeereid.c inet_aton.c open.c snprintf.c strerror.c strlcpy.c win32error.c win32setlocale.c
 	rm -f pgsleep.c	
 	rm -f md5.c ip.c
 	rm -f encnames.c wchar.c
diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index 4f0afb5f6c71c..fbef737ecda72 100644
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -80,6 +80,8 @@ CLEAN :
 	-@erase "$(INTDIR)\inet_aton.obj"
 	-@erase "$(INTDIR)\crypt.obj"
 	-@erase "$(INTDIR)\noblock.obj"
+	-@erase "$(INTDIR)\chklocale.obj"
+	-@erase "$(INTDIR)\inet_net_ntop.obj"
 	-@erase "$(INTDIR)\md5.obj"
 	-@erase "$(INTDIR)\ip.obj"
 	-@erase "$(INTDIR)\fe-auth.obj"
@@ -123,6 +125,8 @@ LIB32_OBJS= \
 	"$(INTDIR)\inet_aton.obj" \
 	"$(INTDIR)\crypt.obj" \
 	"$(INTDIR)\noblock.obj" \
+	"$(INTDIR)\chklocale.obj" \
+	"$(INTDIR)\inet_net_ntop.obj" \
 	"$(INTDIR)\md5.obj" \
 	"$(INTDIR)\ip.obj" \
 	"$(INTDIR)\fe-auth.obj" \
@@ -222,6 +226,16 @@ LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
 	$(CPP_PROJ) ..\..\port\noblock.c
 <<
 
+"$(INTDIR)\chklocale.obj" : ..\..\port\chklocale.c
+	$(CPP) @<<
+	$(CPP_PROJ) ..\..\port\chklocale.c
+<<
+
+"$(INTDIR)\inet_net_ntop.obj" : ..\..\port\inet_net_ntop.c
+	$(CPP) @<<
+	$(CPP_PROJ) ..\..\port\inet_net_ntop.c
+<<
+
 "$(INTDIR)\md5.obj" : ..\..\backend\libpq\md5.c
 	$(CPP) @<<
 	$(CPP_PROJ) ..\..\backend\libpq\md5.c
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9e4807e8a96ca..2c3d544df727a 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -2022,16 +2022,19 @@ PQconnectPoll(PGconn *conn)
 						/* should not happen really */
 						return PGRES_POLLING_READING;
 					}
-					/* mark byte consumed */
-					conn->inStart = conn->inCursor;
 					if (SSLok == 'S')
 					{
+						/* mark byte consumed */
+						conn->inStart = conn->inCursor;
 						/* Set up global SSL state if required */
 						if (pqsecure_initialize(conn) != 0)
 							goto error_return;
 					}
 					else if (SSLok == 'N')
 					{
+						/* mark byte consumed */
+						conn->inStart = conn->inCursor;
+						/* OK to do without SSL? */
 						if (conn->sslmode[0] == 'r' ||	/* "require" */
 							conn->sslmode[0] == 'v')	/* "verify-ca" or
 														 * "verify-full" */
@@ -2048,26 +2051,17 @@ PQconnectPoll(PGconn *conn)
 					}
 					else if (SSLok == 'E')
 					{
-						/* Received error - probably protocol mismatch */
-						if (conn->Pfdebug)
-							fprintf(conn->Pfdebug, "received error from server, attempting fallback to pre-7.0\n");
-						if (conn->sslmode[0] == 'r' ||	/* "require" */
-							conn->sslmode[0] == 'v')	/* "verify-ca" or
-														 * "verify-full" */
-						{
-							/* Require SSL, but server is too old */
-							appendPQExpBuffer(&conn->errorMessage,
-											  libpq_gettext("server does not support SSL, but SSL was required\n"));
-							goto error_return;
-						}
-						/* Otherwise, try again without SSL */
-						conn->allow_ssl_try = false;
-						/* Assume it ain't gonna handle protocol 3, either */
-						conn->pversion = PG_PROTOCOL(2, 0);
-						/* Must drop the old connection */
-						closesocket(conn->sock);
-						conn->sock = -1;
-						conn->status = CONNECTION_NEEDED;
+						/*
+						 * Server failure of some sort, such as failure to
+						 * fork a backend process.  We need to process and
+						 * report the error message, which might be formatted
+						 * according to either protocol 2 or protocol 3.
+						 * Rather than duplicate the code for that, we flip
+						 * into AWAITING_RESPONSE state and let the code there
+						 * deal with it.  Note we have *not* consumed the "E"
+						 * byte here.
+						 */
+						conn->status = CONNECTION_AWAITING_RESPONSE;
 						goto keep_going;
 					}
 					else
@@ -2105,6 +2099,9 @@ PQconnectPoll(PGconn *conn)
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 				}
@@ -2218,6 +2215,9 @@ PQconnectPoll(PGconn *conn)
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 
@@ -2285,6 +2285,9 @@ PQconnectPoll(PGconn *conn)
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 
@@ -2293,8 +2296,7 @@ PQconnectPoll(PGconn *conn)
 					 * then do a non-SSL retry
 					 */
 					if (conn->sslmode[0] == 'p' /* "prefer" */
-						&& conn->ssl
-						&& conn->allow_ssl_try	/* redundant? */
+						&& conn->allow_ssl_try
 						&& !conn->wait_ssl_try) /* redundant? */
 					{
 						/* only retry once */
@@ -2304,6 +2306,9 @@ PQconnectPoll(PGconn *conn)
 						closesocket(conn->sock);
 						conn->sock = -1;
 						conn->status = CONNECTION_NEEDED;
+						/* Discard any unread/unsent data */
+						conn->inStart = conn->inCursor = conn->inEnd = 0;
+						conn->outCount = 0;
 						goto keep_going;
 					}
 #endif
@@ -2467,6 +2472,9 @@ PQconnectPoll(PGconn *conn)
 							closesocket(conn->sock);
 							conn->sock = -1;
 							conn->status = CONNECTION_NEEDED;
+							/* Discard any unread/unsent data */
+							conn->inStart = conn->inCursor = conn->inEnd = 0;
+							conn->outCount = 0;
 							goto keep_going;
 						}
 					}
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 83c5ea363fc8d..605d242809298 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -424,28 +424,8 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 	if (tup_num < 0 || tup_num > res->ntups)
 		return FALSE;
 
-	/* need to grow the tuple table? */
-	if (res->ntups >= res->tupArrSize)
-	{
-		int			n = res->tupArrSize ? res->tupArrSize * 2 : 128;
-		PGresAttValue **tups;
-
-		if (res->tuples)
-			tups = (PGresAttValue **) realloc(res->tuples, n * sizeof(PGresAttValue *));
-		else
-			tups = (PGresAttValue **) malloc(n * sizeof(PGresAttValue *));
-
-		if (!tups)
-			return FALSE;
-
-		memset(tups + res->tupArrSize, 0,
-			   (n - res->tupArrSize) * sizeof(PGresAttValue *));
-		res->tuples = tups;
-		res->tupArrSize = n;
-	}
-
 	/* need to allocate a new tuple? */
-	if (tup_num == res->ntups && !res->tuples[tup_num])
+	if (tup_num == res->ntups)
 	{
 		PGresAttValue *tup;
 		int			i;
@@ -464,8 +444,9 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 			tup[i].value = res->null_field;
 		}
 
-		res->tuples[tup_num] = tup;
-		res->ntups++;
+		/* add it to the array */
+		if (!pqAddTuple(res, tup))
+			return FALSE;
 	}
 
 	attval = &res->tuples[tup_num][field_num];
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 17dde4aecc454..edf7682e192e9 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -578,7 +578,6 @@ pqReadData(PGconn *conn)
 {
 	int			someread = 0;
 	int			nread;
-	char		sebuf[256];
 
 	if (conn->sock < 0)
 	{
@@ -647,9 +646,7 @@ pqReadData(PGconn *conn)
 		if (SOCK_ERRNO == ECONNRESET)
 			goto definitelyFailed;
 #endif
-		printfPQExpBuffer(&conn->errorMessage,
-				   libpq_gettext("could not receive data from server: %s\n"),
-						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
+		/* pqsecure_read set the error message for us */
 		return -1;
 	}
 	if (nread > 0)
@@ -709,6 +706,11 @@ pqReadData(PGconn *conn)
 			/* ready for read */
 			break;
 		default:
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext(
+								"server closed the connection unexpectedly\n"
+				   "\tThis probably means the server terminated abnormally\n"
+							 "\tbefore or while processing the request.\n"));
 			goto definitelyFailed;
 	}
 
@@ -737,9 +739,7 @@ pqReadData(PGconn *conn)
 		if (SOCK_ERRNO == ECONNRESET)
 			goto definitelyFailed;
 #endif
-		printfPQExpBuffer(&conn->errorMessage,
-				   libpq_gettext("could not receive data from server: %s\n"),
-						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
+		/* pqsecure_read set the error message for us */
 		return -1;
 	}
 	if (nread > 0)
@@ -750,14 +750,10 @@ pqReadData(PGconn *conn)
 
 	/*
 	 * OK, we are getting a zero read even though select() says ready. This
-	 * means the connection has been closed.  Cope.
+	 * means the connection has been closed.  Cope.  Note that errorMessage
+	 * has been set already.
 	 */
 definitelyFailed:
-	printfPQExpBuffer(&conn->errorMessage,
-					  libpq_gettext(
-								"server closed the connection unexpectedly\n"
-				   "\tThis probably means the server terminated abnormally\n"
-							 "\tbefore or while processing the request.\n"));
 	conn->status = CONNECTION_BAD;		/* No more connection to backend */
 	pqsecure_close(conn);
 	closesocket(conn->sock);
@@ -793,7 +789,6 @@ pqSendSome(PGconn *conn, int len)
 	while (len > 0)
 	{
 		int			sent;
-		char		sebuf[256];
 
 #ifndef WIN32
 		sent = pqsecure_write(conn, ptr, len);
@@ -809,11 +804,7 @@ pqSendSome(PGconn *conn, int len)
 
 		if (sent < 0)
 		{
-			/*
-			 * Anything except EAGAIN/EWOULDBLOCK/EINTR is trouble. If it's
-			 * EPIPE or ECONNRESET, assume we've lost the backend connection
-			 * permanently.
-			 */
+			/* Anything except EAGAIN/EWOULDBLOCK/EINTR is trouble */
 			switch (SOCK_ERRNO)
 			{
 #ifdef EAGAIN
@@ -827,15 +818,8 @@ pqSendSome(PGconn *conn, int len)
 				case EINTR:
 					continue;
 
-				case EPIPE:
-#ifdef ECONNRESET
-				case ECONNRESET:
-#endif
-					printfPQExpBuffer(&conn->errorMessage,
-									  libpq_gettext(
-								"server closed the connection unexpectedly\n"
-					"\tThis probably means the server terminated abnormally\n"
-							 "\tbefore or while processing the request.\n"));
+				default:
+					/* pqsecure_write set the error message for us */
 
 					/*
 					 * We used to close the socket here, but that's a bad idea
@@ -847,14 +831,6 @@ pqSendSome(PGconn *conn, int len)
 					 */
 					conn->outCount = 0;
 					return -1;
-
-				default:
-					printfPQExpBuffer(&conn->errorMessage,
-						libpq_gettext("could not send data to server: %s\n"),
-							SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
-					/* We don't assume it's a fatal error... */
-					conn->outCount = 0;
-					return -1;
 			}
 		}
 		else
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index cd1292ccb6102..9c6ced6a82801 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -302,11 +302,17 @@ pqsecure_close(PGconn *conn)
 
 /*
  *	Read data from a secure connection.
+ *
+ * On failure, this function is responsible for putting a suitable message
+ * into conn->errorMessage.  The caller must still inspect errno, but only
+ * to determine whether to continue/retry after error.
  */
 ssize_t
 pqsecure_read(PGconn *conn, void *ptr, size_t len)
 {
 	ssize_t		n;
+	int			result_errno = 0;
+	char		sebuf[256];
 
 #ifdef USE_SSL
 	if (conn->ssl)
@@ -325,6 +331,14 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len)
 		switch (err)
 		{
 			case SSL_ERROR_NONE:
+				if (n < 0)
+				{
+					/* Not supposed to happen, so we don't translate the msg */
+					printfPQExpBuffer(&conn->errorMessage,
+									  "SSL_read failed but did not provide error information\n");
+					/* assume the connection is broken */
+					result_errno = ECONNRESET;
+				}
 				break;
 			case SSL_ERROR_WANT_READ:
 				n = 0;
@@ -339,43 +353,61 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len)
 				 */
 				goto rloop;
 			case SSL_ERROR_SYSCALL:
+				if (n < 0)
 				{
-					char		sebuf[256];
-
-					if (n == -1)
-					{
-						REMEMBER_EPIPE(spinfo, SOCK_ERRNO == EPIPE);
+					result_errno = SOCK_ERRNO;
+					REMEMBER_EPIPE(spinfo, result_errno == EPIPE);
+					if (result_errno == EPIPE ||
+						result_errno == ECONNRESET)
 						printfPQExpBuffer(&conn->errorMessage,
-									libpq_gettext("SSL SYSCALL error: %s\n"),
-							SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
-					}
+										  libpq_gettext(
+											  "server closed the connection unexpectedly\n"
+											  "\tThis probably means the server terminated abnormally\n"
+											  "\tbefore or while processing the request.\n"));
 					else
-					{
 						printfPQExpBuffer(&conn->errorMessage,
-						 libpq_gettext("SSL SYSCALL error: EOF detected\n"));
-
-						SOCK_ERRNO_SET(ECONNRESET);
-						n = -1;
-					}
-					break;
+										  libpq_gettext("SSL SYSCALL error: %s\n"),
+										  SOCK_STRERROR(result_errno,
+														sebuf, sizeof(sebuf)));
 				}
+				else
+				{
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext("SSL SYSCALL error: EOF detected\n"));
+					/* assume the connection is broken */
+					result_errno = ECONNRESET;
+					n = -1;
+				}
+				break;
 			case SSL_ERROR_SSL:
 				{
-					char	   *err = SSLerrmessage();
+					char	   *errm = SSLerrmessage();
 
 					printfPQExpBuffer(&conn->errorMessage,
-									  libpq_gettext("SSL error: %s\n"), err);
-					SSLerrfree(err);
+									  libpq_gettext("SSL error: %s\n"), errm);
+					SSLerrfree(errm);
+					/* assume the connection is broken */
+					result_errno = ECONNRESET;
+					n = -1;
+					break;
 				}
-				/* fall through */
 			case SSL_ERROR_ZERO_RETURN:
-				SOCK_ERRNO_SET(ECONNRESET);
+				/*
+				 * Per OpenSSL documentation, this error code is only returned
+				 * for a clean connection closure, so we should not report it
+				 * as a server crash.
+				 */
+				printfPQExpBuffer(&conn->errorMessage,
+								  libpq_gettext("SSL connection has been closed unexpectedly\n"));
+				result_errno = ECONNRESET;
 				n = -1;
 				break;
 			default:
 				printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("unrecognized SSL error code: %d\n"),
 								  err);
+				/* assume the connection is broken */
+				result_errno = ECONNRESET;
 				n = -1;
 				break;
 		}
@@ -383,19 +415,66 @@ pqsecure_read(PGconn *conn, void *ptr, size_t len)
 		RESTORE_SIGPIPE(conn, spinfo);
 	}
 	else
-#endif
+#endif /* USE_SSL */
+	{
 		n = recv(conn->sock, ptr, len, 0);
 
+		if (n < 0)
+		{
+			result_errno = SOCK_ERRNO;
+
+			/* Set error message if appropriate */
+			switch (result_errno)
+			{
+#ifdef EAGAIN
+				case EAGAIN:
+#endif
+#if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
+				case EWOULDBLOCK:
+#endif
+				case EINTR:
+					/* no error message, caller is expected to retry */
+					break;
+
+#ifdef ECONNRESET
+				case ECONNRESET:
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext(
+										  "server closed the connection unexpectedly\n"
+										  "\tThis probably means the server terminated abnormally\n"
+										  "\tbefore or while processing the request.\n"));
+					break;
+#endif
+
+				default:
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext("could not receive data from server: %s\n"),
+									  SOCK_STRERROR(result_errno,
+													sebuf, sizeof(sebuf)));
+					break;
+			}
+		}
+	}
+
+	/* ensure we return the intended errno to caller */
+	SOCK_ERRNO_SET(result_errno);
+
 	return n;
 }
 
 /*
  *	Write data to a secure connection.
+ *
+ * On failure, this function is responsible for putting a suitable message
+ * into conn->errorMessage.  The caller must still inspect errno, but only
+ * to determine whether to continue/retry after error.
  */
 ssize_t
 pqsecure_write(PGconn *conn, const void *ptr, size_t len)
 {
 	ssize_t		n;
+	int			result_errno = 0;
+	char		sebuf[256];
 
 	DECLARE_SIGPIPE_INFO(spinfo);
 
@@ -412,6 +491,14 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
 		switch (err)
 		{
 			case SSL_ERROR_NONE:
+				if (n < 0)
+				{
+					/* Not supposed to happen, so we don't translate the msg */
+					printfPQExpBuffer(&conn->errorMessage,
+									  "SSL_write failed but did not provide error information\n");
+					/* assume the connection is broken */
+					result_errno = ECONNRESET;
+				}
 				break;
 			case SSL_ERROR_WANT_READ:
 
@@ -426,48 +513,67 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
 				n = 0;
 				break;
 			case SSL_ERROR_SYSCALL:
+				if (n < 0)
 				{
-					char		sebuf[256];
-
-					if (n == -1)
-					{
-						REMEMBER_EPIPE(spinfo, SOCK_ERRNO == EPIPE);
+					result_errno = SOCK_ERRNO;
+					REMEMBER_EPIPE(spinfo, result_errno == EPIPE);
+					if (result_errno == EPIPE ||
+						result_errno == ECONNRESET)
 						printfPQExpBuffer(&conn->errorMessage,
-									libpq_gettext("SSL SYSCALL error: %s\n"),
-							SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
-					}
+										  libpq_gettext(
+											  "server closed the connection unexpectedly\n"
+											  "\tThis probably means the server terminated abnormally\n"
+											  "\tbefore or while processing the request.\n"));
 					else
-					{
 						printfPQExpBuffer(&conn->errorMessage,
-						 libpq_gettext("SSL SYSCALL error: EOF detected\n"));
-						SOCK_ERRNO_SET(ECONNRESET);
-						n = -1;
-					}
-					break;
+										  libpq_gettext("SSL SYSCALL error: %s\n"),
+										  SOCK_STRERROR(result_errno,
+														sebuf, sizeof(sebuf)));
 				}
+				else
+				{
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext("SSL SYSCALL error: EOF detected\n"));
+					/* assume the connection is broken */
+					result_errno = ECONNRESET;
+					n = -1;
+				}
+				break;
 			case SSL_ERROR_SSL:
 				{
-					char	   *err = SSLerrmessage();
+					char	   *errm = SSLerrmessage();
 
 					printfPQExpBuffer(&conn->errorMessage,
-									  libpq_gettext("SSL error: %s\n"), err);
-					SSLerrfree(err);
+									  libpq_gettext("SSL error: %s\n"), errm);
+					SSLerrfree(errm);
+					/* assume the connection is broken */
+					result_errno = ECONNRESET;
+					n = -1;
+					break;
 				}
-				/* fall through */
 			case SSL_ERROR_ZERO_RETURN:
-				SOCK_ERRNO_SET(ECONNRESET);
+				/*
+				 * Per OpenSSL documentation, this error code is only returned
+				 * for a clean connection closure, so we should not report it
+				 * as a server crash.
+				 */
+				printfPQExpBuffer(&conn->errorMessage,
+								  libpq_gettext("SSL connection has been closed unexpectedly\n"));
+				result_errno = ECONNRESET;
 				n = -1;
 				break;
 			default:
 				printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("unrecognized SSL error code: %d\n"),
 								  err);
+				/* assume the connection is broken */
+				result_errno = ECONNRESET;
 				n = -1;
 				break;
 		}
 	}
 	else
-#endif
+#endif /* USE_SSL */
 	{
 		int			flags = 0;
 
@@ -484,13 +590,15 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
 
 		if (n < 0)
 		{
+			result_errno = SOCK_ERRNO;
+
 			/*
 			 * If we see an EINVAL, it may be because MSG_NOSIGNAL isn't
 			 * available on this machine.  So, clear sigpipe_flag so we don't
 			 * try the flag again, and retry the send().
 			 */
 #ifdef MSG_NOSIGNAL
-			if (flags != 0 && SOCK_ERRNO == EINVAL)
+			if (flags != 0 && result_errno == EINVAL)
 			{
 				conn->sigpipe_flag = false;
 				flags = 0;
@@ -498,12 +606,49 @@ pqsecure_write(PGconn *conn, const void *ptr, size_t len)
 			}
 #endif   /* MSG_NOSIGNAL */
 
-			REMEMBER_EPIPE(spinfo, SOCK_ERRNO == EPIPE);
+			/* Set error message if appropriate */
+			switch (result_errno)
+			{
+#ifdef EAGAIN
+				case EAGAIN:
+#endif
+#if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
+				case EWOULDBLOCK:
+#endif
+				case EINTR:
+					/* no error message, caller is expected to retry */
+					break;
+
+				case EPIPE:
+					/* Set flag for EPIPE */
+					REMEMBER_EPIPE(spinfo, true);
+					/* FALL THRU */
+
+#ifdef ECONNRESET
+				case ECONNRESET:
+#endif
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext(
+										  "server closed the connection unexpectedly\n"
+										  "\tThis probably means the server terminated abnormally\n"
+										  "\tbefore or while processing the request.\n"));
+					break;
+
+				default:
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext("could not send data to server: %s\n"),
+									  SOCK_STRERROR(result_errno,
+													sebuf, sizeof(sebuf)));
+					break;
+			}
 		}
 	}
 
 	RESTORE_SIGPIPE(conn, spinfo);
 
+	/* ensure we return the intended errno to caller */
+	SOCK_ERRNO_SET(result_errno);
+
 	return n;
 }
 
@@ -757,6 +902,12 @@ init_ssl_system(PGconn *conn)
 #endif
 			return -1;
 		}
+
+		/*
+		 * Disable OpenSSL's moving-write-buffer sanity check, because it
+		 * causes unnecessary failures in nonblocking send cases.
+		 */
+		SSL_CTX_set_mode(SSL_context, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
 	}
 
 #ifdef ENABLE_THREAD_SAFETY
diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in
index adf00b1a28d03..48fe4f0f8ac53 100644
--- a/src/interfaces/libpq/libpq.rc.in
+++ b/src/interfaces/libpq/libpq.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,1,0,0
- PRODUCTVERSION 9,1,0,0
+ FILEVERSION 9,1,2,0
+ PRODUCTVERSION 9,1,2,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "9.1.0\0"
+            VALUE "FileVersion", "9.1.2\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2011\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.1.0\0"
+            VALUE "ProductVersion", "9.1.2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index 5d38d1acf269b..9eab6dcbc58ff 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,5 +1,5 @@
 # src/interfaces/libpq/nls.mk
 CATALOG_NAME	:= libpq
-AVAIL_LANGUAGES	:= cs de es fr it ja ko pt_BR ru sv ta tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko pl pt_BR ru sv tr zh_CN zh_TW
 GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
 GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
diff --git a/src/interfaces/libpq/po/cs.po b/src/interfaces/libpq/po/cs.po
index fdf1ab4ae662d..5656d7626aab0 100644
--- a/src/interfaces/libpq/po/cs.po
+++ b/src/interfaces/libpq/po/cs.po
@@ -1,115 +1,118 @@
 # translation of libpq-cs.po to Czech
 # Czech translation of libpq messages
 #
-# pgtranslation Id: libpq.po,v 1.4 2009/10/14 21:08:40 petere Exp $
-# Karel Žák, 2001-2003, 2004.
-# Zdeněk Kotala, 2009.
+# pgtranslation Id: libpq.po,v 1.6 2011/09/08 18:23:05 petere Exp $
 #
+# Karel Žák, 2001-2003, 2004.
+# Zdeněk Kotala, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: postgresql-8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-05-24 01:17+0000\n"
-"PO-Revision-Date: 2009-05-24 14:26+0200\n"
-"Last-Translator: Zdeněk Kotala\n"
-"Language-Team:  \n"
+"POT-Creation-Date: 2011-08-30 11:37+0200\n"
+"PO-Revision-Date: 2011-09-06 11:41+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
+msgid "host name must be specified\n"
+msgstr "host musí být specifikován\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "nelze nastavit soket do blokujícího módu: %s\n"
 
-#: fe-auth.c:260 fe-auth.c:264
+#: fe-auth.c:258 fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "Kerberos 5 autentizace odmítnuta: %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "nelze obnovit neblokující mód soketu: %s\n"
 
-#: fe-auth.c:403
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "Přetrvávající chyba GSSAPI"
 
-#: fe-auth.c:432
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "duplikátní GSS autentiza�ní požadavek\n"
 
-#: fe-auth.c:452
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "chyba importu jména GSSAPI"
 
-#: fe-auth.c:538
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "Přetrvávající chyba SSPI"
 
-#: fe-auth.c:549 fe-auth.c:622 fe-auth.c:656 fe-auth.c:753 fe-connect.c:1335
-#: fe-connect.c:2616 fe-connect.c:2833 fe-connect.c:3199 fe-connect.c:3208
-#: fe-connect.c:3345 fe-connect.c:3391 fe-connect.c:3409 fe-exec.c:3109
-#: fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:757 fe-connect.c:1961
+#: fe-connect.c:3368 fe-connect.c:3586 fe-connect.c:4007 fe-connect.c:4016
+#: fe-connect.c:4153 fe-connect.c:4199 fe-connect.c:4217 fe-connect.c:4296
+#: fe-connect.c:4366 fe-connect.c:4412 fe-connect.c:4430 fe-exec.c:3121
+#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "nedostatek paměti\n"
 
-#: fe-auth.c:637
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "nelze získat SSL credentials."
 
-#: fe-auth.c:650
-msgid "host name must be specified\n"
-msgstr "host musí být specifikován\n"
-
-#: fe-auth.c:729
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "SCM_CRED metoda autentizace není podporována\n"
 
-#: fe-auth.c:803
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Kerberos 4 autentizace není podporována\n"
 
-#: fe-auth.c:819
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Kerberos 5 autentizace není podporována\n"
 
-#: fe-auth.c:886
+#: fe-auth.c:895
 msgid "GSSAPI authentication not supported\n"
 msgstr "GSSAPI autentizace není podporována\n"
 
-#: fe-auth.c:910
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "SSPI autentizace není podporována\n"
 
-#: fe-auth.c:917
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "Crypt autentizace není podporována\n"
 
-#: fe-auth.c:944
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "autentiza�ní metoda %u není podporována\n"
 
-#: fe-connect.c:524
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "neplatná hodnota sslmode: \"%s\"\n"
 
-#: fe-connect.c:545
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr ""
 "hodnota sslmode \"%s\" je neplatná pokud není zakompilována podpora SSL\n"
 
-#: fe-connect.c:728
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "nelze nastavit \"no delay\" mód TCP soketu: %s\n"
 
-#: fe-connect.c:758
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -120,7 +123,18 @@ msgstr ""
 "\tJe spuštěn server lokálně a akceptuje\n"
 "\tspojení pomocí Unix soketu \"%s\"?\n"
 
-#: fe-connect.c:768
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"nelze navázat spojení se serverem: %s\n"
+"\tJe server na \"%s\" (%s) spuštěn a akceptuje\n"
+"\tTCP/IP spojení na portu %s?\n"
+
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -131,270 +145,346 @@ msgstr ""
 "\tJe server na \"%s\" spuštěn a akceptuje\n"
 "\tTCP/IP spojení na portu %s?\n"
 
-#: fe-connect.c:858
+#: fe-connect.c:1117
+#, c-format
+msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPIDLE) selhalo: %s\n"
+
+#: fe-connect.c:1130
+#, c-format
+msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPALIVE) selhalo: %s\n"
+
+#: fe-connect.c:1162
+#, c-format
+msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPINTVL) selhalo: %s\n"
+
+#: fe-connect.c:1194
+#, c-format
+msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPCNT) selhalo: %s\n"
+
+#: fe-connect.c:1242
+#, c-format
+msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
+msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) selhalo: %ui\n"
+
+#: fe-connect.c:1294
+#, c-format
+msgid "invalid port number: \"%s\"\n"
+msgstr "neplatné �íslo portu: \"%s\"\n"
+
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "nemohu přeložit jméno hostitele \"%s\" na adresu: %s\n"
 
-#: fe-connect.c:862
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "nemohu přeložit cestu Unix-domain soketu \"%s\" na adresu: %s\n"
 
-#: fe-connect.c:1065
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "neplatný stav spojení, pravděpodobně indikující porušení paměti\n"
+msgstr "neplatný stav spojení, pravděpodobně způsobený poškozením paměti\n"
 
-#: fe-connect.c:1108
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "nelze vytvořit soket: %s\n"
 
-#: fe-connect.c:1131
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "nelze nastavit soket do neblokujícího módu: %s\n"
 
-#: fe-connect.c:1143
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "nelze nastavit soket do close-on-exec módu: %s\n"
 
-#: fe-connect.c:1230
+#: fe-connect.c:1647
+msgid "keepalives parameter must be an integer\n"
+msgstr "parametr keepalives musí být celé �íslo\n"
+
+#: fe-connect.c:1660
+#, c-format
+msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
+msgstr "setsockopt(SO_KEEPALIVE) selhalo: %s\n"
+
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "nelze obdržet chybový status soketu: %s\n"
 
-#: fe-connect.c:1268
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "nelze získat adresu klienta ze soketu: %s\n"
 
-#: fe-connect.c:1312
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "parametr requirepeer není na této platformě podporován\n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "nelze získat informace (credentials) protistrany: %s\n"
+
+#: fe-connect.c:1893
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "lokální uživatel s ID %d neexistuje\n"
+
+#: fe-connect.c:1901
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr "requirepeer obsahuje \"%s\", ale skute�né jméno peera je \"%s\"\n"
+
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "nelze poslat SSL \"negotiation paket\": %s\n"
 
-#: fe-connect.c:1348
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "nelze poslat po�áte�ní paket: %s\n"
 
-#: fe-connect.c:1414 fe-connect.c:1432
+#: fe-connect.c:2044
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "server nepodporuje SSL, le� SSL je vyžadováno\n"
 
-#: fe-connect.c:1448
+#: fe-connect.c:2070
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "přijata neplatná odpově� na SSL negotiation: %c\n"
 
-#: fe-connect.c:1524 fe-connect.c:1557
+#: fe-connect.c:2149 fe-connect.c:2182
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "o�ekáván byl autentiza�ní dotaz ze serveru, ale přijat byl %c\n"
 
-#: fe-connect.c:1728
+#: fe-connect.c:2363
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%i)"
 msgstr "nedostatek paměti pro alokaci GSSAPI bufferu (%i)"
 
-#: fe-connect.c:1813
+#: fe-connect.c:2448
 msgid "unexpected message from server during startup\n"
 msgstr "neo�ekávaná zpráva ze serveru během startu\n"
 
-#: fe-connect.c:1881
+#: fe-connect.c:2547
 #, c-format
-msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "neplatný status spojení %c, pravděpodobně indikující porušení paměti\n"
+msgid "invalid connection state %d, probably indicative of memory corruption\n"
+msgstr "neplatný stav spojení %d, pravděpodobně způsobený poškozením paměti\n"
 
-#: fe-connect.c:2224 fe-connect.c:2284
+#: fe-connect.c:2976 fe-connect.c:3036
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc \"%s\" selhalo během události PGEVT_CONNRESET\n"
 
-#: fe-connect.c:2629
+#: fe-connect.c:3381
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "naplatné LDAP URL \"%s\": schéma musí být ldap://\n"
 
-#: fe-connect.c:2644
+#: fe-connect.c:3396
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "neplatné LDAP URL \"%s\": chybí rozlišující jméno\n"
 
-#: fe-connect.c:2655 fe-connect.c:2708
+#: fe-connect.c:3407 fe-connect.c:3460
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "neplatné LDAP URL \"%s\": musí mít právě jeden atribut\n"
 
-#: fe-connect.c:2665 fe-connect.c:2722
+#: fe-connect.c:3417 fe-connect.c:3474
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr "naplatné LDAP URL \"%s\": musí mít vyhledávací rozsah (base/one/sub)\n"
 
-#: fe-connect.c:2676
+#: fe-connect.c:3428
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "naplatné LDAP URL \"%s\": není filter\n"
 
-#: fe-connect.c:2697
+#: fe-connect.c:3449
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "naplatné LDAP URL \"%s\": neplatný �íslo portu\n"
 
-#: fe-connect.c:2731
+#: fe-connect.c:3483
 msgid "could not create LDAP structure\n"
 msgstr "nelze vytvořit LDAP strukturu\n"
 
-#: fe-connect.c:2773
+#: fe-connect.c:3525
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "vyhledávání na LDAP serveru selhalo: %s\n"
 
-#: fe-connect.c:2784
+#: fe-connect.c:3536
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "nalezen více jak jeden záznam při LDAP vyhledávání\n"
 
-#: fe-connect.c:2785 fe-connect.c:2797
+#: fe-connect.c:3537 fe-connect.c:3549
 msgid "no entry found on LDAP lookup\n"
 msgstr "nebyl nalezen žádný záznam při LDAP vyhledávání\n"
 
-#: fe-connect.c:2808 fe-connect.c:2821
+#: fe-connect.c:3560 fe-connect.c:3573
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "atribut nemá žádnou hodnotu při LDAP vyhledávání\n"
 
-#: fe-connect.c:2872 fe-connect.c:2890 fe-connect.c:3247
+#: fe-connect.c:3625 fe-connect.c:3644 fe-connect.c:4055
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "chybné \"=\" po \"%s\" v informa�ním řetězci spojení\n"
 
-#: fe-connect.c:2953 fe-connect.c:3329
+#: fe-connect.c:3708 fe-connect.c:4137 fe-connect.c:4321
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "neplatný parametr spojení \"%s\"\n"
 
-#: fe-connect.c:2966 fe-connect.c:3296
+#: fe-connect.c:3724 fe-connect.c:4104
 msgid "unterminated quoted string in connection info string\n"
 msgstr "neukon�ený řetězec v uvozovkách v informa�ním řetězci spojení\n"
 
-#: fe-connect.c:3009
+#: fe-connect.c:3763
+msgid "could not get home directory to locate service definition file"
+msgstr "nelze získat domovský adresář pro nalezení kořenového certifikátu"
+
+#: fe-connect.c:3796
 #, c-format
-msgid "ERROR: service file \"%s\" not found\n"
-msgstr "CHYBA: soubor se seznamem služeb \"%s\" nebyl nalezen\n"
+msgid "definition of service \"%s\" not found\n"
+msgstr "definice služby \"%s\" nenalezena\n"
 
-#: fe-connect.c:3022
+#: fe-connect.c:3819
 #, c-format
-msgid "ERROR: line %d too long in service file \"%s\"\n"
-msgstr "CHYBA: řádka %d v souboru se seznamem služeb \"%s\" je příliš dlouhá\n"
+msgid "service file \"%s\" not found\n"
+msgstr "soubor se seznamem služeb \"%s\" nebyl nalezen\n"
 
-#: fe-connect.c:3094 fe-connect.c:3121
+#: fe-connect.c:3832
 #, c-format
-msgid "ERROR: syntax error in service file \"%s\", line %d\n"
-msgstr "CHYBA: syntaktická chyba v souboru se seznamem služeb \"%s\", řádka %d\n"
+msgid "line %d too long in service file \"%s\"\n"
+msgstr "řádek %d v souboru se seznamem služeb \"%s\" je příliš dlouhý\n"
 
-#: fe-connect.c:3577
+#: fe-connect.c:3903 fe-connect.c:3930
+#, c-format
+msgid "syntax error in service file \"%s\", line %d\n"
+msgstr "syntaktická chyba v souboru se seznamu služeb \"%s\", řádek %d\n"
+
+#: fe-connect.c:4597
 msgid "connection pointer is NULL\n"
 msgstr "pointer spojení je NULL\n"
 
-#: fe-connect.c:3860
+#: fe-connect.c:4874
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
-msgstr "VAROV�N�: soubor s hesly \"%s\" není oby�ejný soubor\n"
+msgstr "VAROV�N�: soubor s hesly \"%s\" není prostý (plain) soubor\n"
 
-#: fe-connect.c:3869
+#: fe-connect.c:4883
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
 "be u=rw (0600) or less\n"
 msgstr ""
-"UPOZORNĚN�: Soubor s hesly \"%s\" má přístupová práva pro �tení pro skupinu nebo "
-"všechny uživatele; práva by měla být u=rw (0600)\n"
+"UPOZORNĚN�: Soubor s hesly \"%s\" má přístupová práva pro �tení pro skupinu "
+"nebo všechny uživatele; práva by měla být u=rw (0600)\n"
+
+#: fe-connect.c:4971
+#, c-format
+msgid "password retrieved from file \"%s\"\n"
+msgstr "heslo na�teno ze souboru \"%s\"\n"
 
-#: fe-exec.c:826
+#: fe-exec.c:810
 msgid "NOTICE"
 msgstr "POZN�MKA"
 
-#: fe-exec.c:1013 fe-exec.c:1070 fe-exec.c:1110
+#: fe-exec.c:997 fe-exec.c:1054 fe-exec.c:1094
 msgid "command string is a null pointer\n"
 msgstr "řetězec příkazu je prázdný ukazatel\n"
 
-#: fe-exec.c:1103 fe-exec.c:1198
+#: fe-exec.c:1087 fe-exec.c:1182
 msgid "statement name is a null pointer\n"
 msgstr "název výrazu je prázdný ukazatel\n"
 
-#: fe-exec.c:1118 fe-exec.c:1272 fe-exec.c:1927 fe-exec.c:2124
+#: fe-exec.c:1102 fe-exec.c:1256 fe-exec.c:1925 fe-exec.c:2123
 msgid "function requires at least protocol version 3.0\n"
 msgstr "funkce vyžaduje protokol alespoň 3.0 a vyšší\n"
 
-#: fe-exec.c:1229
+#: fe-exec.c:1213
 msgid "no connection to the server\n"
 msgstr "není spojení se serverem\n"
 
-#: fe-exec.c:1236
+#: fe-exec.c:1220
 msgid "another command is already in progress\n"
 msgstr "zpracovává se již jiný příkaz\n"
 
-#: fe-exec.c:1348
+#: fe-exec.c:1332
 msgid "length must be given for binary parameter\n"
-msgstr "delká musí být specifikována pro binarní parametr\n"
+msgstr "délka musí být specifikována pro binarní parametr\n"
 
-#: fe-exec.c:1595
+#: fe-exec.c:1585
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "neo�ekávaný asyncStatus: %d\n"
 
-#: fe-exec.c:1615
+#: fe-exec.c:1605
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc \"%s\" selhala během události PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1745
+#: fe-exec.c:1735
 msgid "COPY terminated by new PQexec"
 msgstr "COPY bylo ukon�eno novým PQexec"
 
-#: fe-exec.c:1753
+#: fe-exec.c:1743
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN status musí být nejdříve ukon�en\n"
 
-#: fe-exec.c:1773
+#: fe-exec.c:1763
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT status musí být nejdříve ukon�en\n"
 
-#: fe-exec.c:2015 fe-exec.c:2081 fe-exec.c:2166 fe-protocol2.c:1172
-#: fe-protocol3.c:1557
+#: fe-exec.c:1771
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "PQexec není povoleno během COPY BOTH\n"
+
+#: fe-exec.c:2014 fe-exec.c:2080 fe-exec.c:2167 fe-protocol2.c:1237
+#: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "COPY se neprovádí\n"
 
-#: fe-exec.c:2358
+#: fe-exec.c:2359
 msgid "connection in wrong state\n"
 msgstr "spojení je ve špatném stavu\n"
 
-#: fe-exec.c:2389
+#: fe-exec.c:2390
 msgid "invalid ExecStatusType code"
 msgstr "neplatný ExecStatusType kód"
 
-#: fe-exec.c:2453 fe-exec.c:2476
+#: fe-exec.c:2454 fe-exec.c:2477
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "�íslo sloupce %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:2469
+#: fe-exec.c:2470
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "�íslo řádky %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:2491
+#: fe-exec.c:2492
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "�íslo parametru %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:2778
+#: fe-exec.c:2780
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "nelze interpretovat výsledek ze serveru: %s"
 
-#: fe-exec.c:3017
+#: fe-exec.c:3019 fe-exec.c:3103
 msgid "incomplete multibyte character\n"
 msgstr "nekompletní multibyte znak\n"
 
@@ -457,74 +547,66 @@ msgstr "nelze ur�it OID funkce loread\n"
 msgid "cannot determine OID of function lowrite\n"
 msgstr "nelze ur�it OID funkce lowrite\n"
 
-#: fe-misc.c:241
+#: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "pqGetInt nepodporuje integer velikosti %lu"
 
-#: fe-misc.c:277
+#: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "pqPutInt nepodporuje integer velikosti %lu"
 
-#: fe-misc.c:557 fe-misc.c:759
+#: fe-misc.c:585 fe-misc.c:784
 msgid "connection not open\n"
 msgstr "spojení není otevřeno\n"
 
-#: fe-misc.c:622 fe-misc.c:712
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "nelze přijmout data ze serveru: %s\n"
-
-#: fe-misc.c:729 fe-misc.c:806
+#: fe-misc.c:711 fe-secure.c:364 fe-secure.c:443 fe-secure.c:524
+#: fe-secure.c:632
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
 "\tbefore or while processing the request.\n"
 msgstr ""
-"server ukon�il neo�ekávaně spojení\n"
+"server neo�ekávaně ukon�il spojení\n"
 "\tToto pravděpodobně znamená, že byl ukon�en nestandardně\n"
 "\tpřed nebo během vykonávání požadavku.\n"
 
-#: fe-misc.c:823
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "nelze poslat data na server: %s\n"
-
-#: fe-misc.c:942
+#: fe-misc.c:948
 msgid "timeout expired\n"
-msgstr "�asový interval uběhl\n"
+msgstr "�asový limit (timeout) uběhl\n"
 
-#: fe-misc.c:987
+#: fe-misc.c:993
 msgid "socket not open\n"
 msgstr "soket není otevřen\n"
 
-#: fe-misc.c:1010
+#: fe-misc.c:1016
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() selhal: %s\n"
 
-#: fe-protocol2.c:89
+#: fe-protocol2.c:91
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "neplatný status spojení %c, pravděpodobně indikující porušení paměti\n"
+msgstr ""
+"neplatný status spojení %c, pravděpodobně způsobený poškozením paměti\n"
 
-#: fe-protocol2.c:330
+#: fe-protocol2.c:390
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "neplatný status  %c, pravděpodobně indikující porušení paměti\n"
+msgstr "neplatný status  %c, pravděpodobně způsobený poškozením paměti\n"
 
-#: fe-protocol2.c:419 fe-protocol3.c:186
+#: fe-protocol2.c:479 fe-protocol3.c:186
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "zpráva typu 0x%02x přišla ze serveru během ne�innosti"
 
-#: fe-protocol2.c:462
+#: fe-protocol2.c:522
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
 msgstr "neo�ekávaný znak %c následuje prázdnou odezvu dotazu(\"I\" zpráva)"
 
-#: fe-protocol2.c:516
+#: fe-protocol2.c:576
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)"
@@ -532,7 +614,7 @@ msgstr ""
 "server odeslal data (\"D\" zpráva) bez předcházejícího popisu řádky (\"T\" "
 "zpráva)"
 
-#: fe-protocol2.c:532
+#: fe-protocol2.c:592
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)"
@@ -540,25 +622,25 @@ msgstr ""
 "server odeslal binární data (\"B\" zpráva) bez předchozího popisu řádky (\"T"
 "\" zpráva)"
 
-#: fe-protocol2.c:547 fe-protocol3.c:382
+#: fe-protocol2.c:612 fe-protocol3.c:388
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "neo�ekávaná odpově� serveru; předchozí znak byl \"%c\"\n"
 
-#: fe-protocol2.c:768 fe-protocol3.c:701
+#: fe-protocol2.c:833 fe-protocol3.c:707
 msgid "out of memory for query result\n"
-msgstr "nedostatek paměti pro odpově� dotazu\n"
+msgstr "nedostatek paměti pro výsledek dotazu\n"
 
-#: fe-protocol2.c:1215 fe-protocol3.c:1625
+#: fe-protocol2.c:1280 fe-protocol3.c:1637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-protocol2.c:1227
+#: fe-protocol2.c:1292
 msgid "lost synchronization with server, resetting connection"
 msgstr "ztráta synchronizace se serverem, resetuji spojení"
 
-#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
+#: fe-protocol2.c:1426 fe-protocol2.c:1458 fe-protocol3.c:1840
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "chyba protokolu: id=0x%x\n"
@@ -571,201 +653,232 @@ msgstr ""
 "server odeslal data (\"D\" zpráva) bez předchozího popisu řádky (\"T\" "
 "zpráva)\n"
 
-#: fe-protocol3.c:403
+#: fe-protocol3.c:409
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr "obsah zprávy nesouhlasí s délkou v typu zprávy \"%c\"\n"
 
-#: fe-protocol3.c:424
+#: fe-protocol3.c:430
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "ztracena synchronizace se serverem: obdržena zpráva typu \"%c\", délky %d\n"
 
-#: fe-protocol3.c:646
+#: fe-protocol3.c:652
 msgid "unexpected field count in \"D\" message\n"
 msgstr "neo�ekávaný po�et polí v \"D\" zprávě\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:788 fe-protocol3.c:807
+#: fe-protocol3.c:798 fe-protocol3.c:817
 #, c-format
 msgid " at character %s"
 msgstr "na znaku %s"
 
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETAIL:  %s\n"
 
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "DOPORUČEN�:  %s\n"
 
-#: fe-protocol3.c:826
+#: fe-protocol3.c:836
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "DOTAZ:  %s\n"
 
-#: fe-protocol3.c:829
+#: fe-protocol3.c:839
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "KONTEXT:  %s\n"
 
-#: fe-protocol3.c:841
+#: fe-protocol3.c:851
 msgid "LOCATION:  "
 msgstr "UM�STĚN�:  "
 
-#: fe-protocol3.c:843
+#: fe-protocol3.c:853
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:845
+#: fe-protocol3.c:855
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1069
+#: fe-protocol3.c:1079
 #, c-format
 msgid "LINE %d: "
 msgstr "�DKA %d: "
 
-#: fe-protocol3.c:1453
+#: fe-protocol3.c:1465
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: not doing text COPY OUT\n"
 
-#: fe-secure.c:244
+#: fe-secure.c:265
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "nelze vytvořit SSL spojení: %s\n"
 
-#: fe-secure.c:320 fe-secure.c:404 fe-secure.c:1115
+#: fe-secure.c:369 fe-secure.c:529 fe-secure.c:1331
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL chyba: %s\n"
 
-#: fe-secure.c:326 fe-secure.c:410 fe-secure.c:1119
+#: fe-secure.c:376 fe-secure.c:536 fe-secure.c:1335
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL chyba: detekován EOF\n"
 
-#: fe-secure.c:338 fe-secure.c:421 fe-secure.c:1138
+#: fe-secure.c:387 fe-secure.c:547 fe-secure.c:1344
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL chyba: %s\n"
 
-#: fe-secure.c:348 fe-secure.c:431 fe-secure.c:1148
+#: fe-secure.c:401 fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "SSL spojení bylo neo�ekávaně ukon�eno\n"
+
+#: fe-secure.c:407 fe-secure.c:567 fe-secure.c:1353
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "neznámý chybový kód SSL: %d\n"
 
-#: fe-secure.c:532
-msgid ""
-"verified SSL connections are only supported when connecting to a host name"
-msgstr ""
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "nelze přijmout data ze serveru: %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "nelze poslat data na server: %s\n"
 
-#: fe-secure.c:551
+#: fe-secure.c:746
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "host musí být specifikován pro ověřené SSL spojení\n"
+
+#: fe-secure.c:765
 #, c-format
-msgid "server common name \"%s\" does not match host name \"%s\""
-msgstr "veřejné jméno serveru \"%s\" nesouhlasí s jménem serveru (host name) \"%s\""
+msgid "server common name \"%s\" does not match host name \"%s\"\n"
+msgstr ""
+"veřejné jméno serveru \"%s\" nesouhlasí s jménem serveru (host name) \"%s\"\n"
 
-#: fe-secure.c:593
-msgid "could not get home directory to locate client certificate files"
-msgstr "nelze získat domovský adresář pro nalezení klientského certifikátu"
+#: fe-secure.c:897
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "nelze vytvořit SSL kontext: %s\n"
 
-#: fe-secure.c:617 fe-secure.c:631
+#: fe-secure.c:1019
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
-msgstr "nelze otevřít soubor certifikátu \"%s\": %s\n"
+msgstr "nelze otevřít soubor s certifikátem \"%s\": %s\n"
 
-#: fe-secure.c:642
+#: fe-secure.c:1044 fe-secure.c:1054
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
-msgstr "nelze �íst soubor certifikát \"%s\": %s\n"
+msgstr "nelze �íst soubor s certifikátem \"%s\": %s\n"
 
-#: fe-secure.c:681
+#: fe-secure.c:1091
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "nelze nahrát SSL engine \"%s\": %s\n"
 
-#: fe-secure.c:696
+#: fe-secure.c:1103
+#, c-format
+msgid "could not initialize SSL engine \"%s\": %s\n"
+msgstr "nelze inicializovat SSL engine \"%s\": %s\n"
+
+#: fe-secure.c:1119
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "nelze �íst soubor privátního klí�e \"%s\" z enginu \"%s\": %s\n"
 
-#: fe-secure.c:727
+#: fe-secure.c:1133
+#, c-format
+msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "nelze na�íst soubor privátního klí�e \"%s\" z enginu \"%s\": %s\n"
+
+#: fe-secure.c:1170
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "certifikát je přítomen, ale soubor privátního klí�e ne \"%s\"\n"
 
-#: fe-secure.c:736
+#: fe-secure.c:1178
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; permissions should be "
 "u=rw (0600) or less\n"
 msgstr ""
-"soubor s privátním klí�em \"%s\" má povolená přístupová práva pro skupinu nebo "
-"všechny uživatele; práva by měla být u=rw (0600) nebo přísnější\n"
-
-#: fe-secure.c:746
-#, c-format
-msgid "could not open private key file \"%s\": %s\n"
-msgstr "nelze otevřít soubor s privátním klí�em \"%s\": %s\n"
-
-#: fe-secure.c:757
-#, c-format
-msgid "private key file \"%s\" changed during execution\n"
-msgstr "soubor privátního klí�e \"%s\" byl za chodu změněn\n"
+"soubor s privátním klí�em \"%s\" má povolená přístupová práva pro skupinu "
+"nebo všechny uživatele; práva by měla být u=rw (0600) nebo přísnější\n"
 
-#: fe-secure.c:768
+#: fe-secure.c:1189
 #, c-format
-msgid "could not read private key file \"%s\": %s\n"
-msgstr "nelze �íst soubor privátního klí�e \"%s\": %s\n"
+msgid "could not load private key file \"%s\": %s\n"
+msgstr "nelze na�íst soubor privátního klí�e \"%s\": %s\n"
 
-#: fe-secure.c:786
+#: fe-secure.c:1203
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "certifikát nesouhlasí se souborem privátního klí�e \"%s\": %s\n"
 
-#: fe-secure.c:917
-#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr "nelze vytvořit SSL kontext: %s\n"
-
-#: fe-secure.c:1005
-msgid "could not get home directory to locate root certificate file"
-msgstr "nelze získat domovský adresář pro nalezení kořenového certifikátu"
-
-#: fe-secure.c:1029
+#: fe-secure.c:1231
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "nelze �íst soubor s kořenovým certifikátem \"%s\": %s\n"
 
-#: fe-secure.c:1054
+#: fe-secure.c:1258
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "knihovna SSL nepodporuje CRL certifikáty (file \"%s\")\n"
 
-#: fe-secure.c:1070
+#: fe-secure.c:1285
+msgid ""
+"could not get home directory to locate root certificate file\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"nelze ur�it domácí adresář pro nalezení souboru s kořenovým certifikátem \"%s"
+"\"\n"
+"Bu� poskytněte soubor nebo změňte ssl mód tak, aby neověřoval certifkát "
+"serveru.\n"
+
+#: fe-secure.c:1289
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
 "Either provide the file or change sslmode to disable server certificate "
 "verification.\n"
-msgstr "soubor s kořenovým certifikátem  \"%s\" neexistuje\n"
-"poskytněnte soubor nebo změntě ssl mód tak, aby neověřoval certifkát serveru.\n"  
+msgstr ""
+"soubor s kořenovým certifikátem  \"%s\" neexistuje\n"
+"poskytněnte soubor nebo změntě ssl mód tak, aby neověřoval certifkát "
+"serveru.\n"
 
-#: fe-secure.c:1167
+#: fe-secure.c:1372
 #, c-format
 msgid "certificate could not be obtained: %s\n"
-msgstr "certifikát nelze obdržet: %s\n"
+msgstr "certifikát nelze získat: %s\n"
 
-#: fe-secure.c:1241
+#: fe-secure.c:1400
+msgid "SSL certificate's common name contains embedded null\n"
+msgstr "Veřejné jméno SSL certifikátu obsahuje vloženou null hodnotu\n"
+
+#: fe-secure.c:1476
 msgid "no SSL error reported"
 msgstr "žádný chybový kód SSL nebyl hlášený"
 
-#: fe-secure.c:1250
+#: fe-secure.c:1485
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL chybový kód %lu"
 
+#~ msgid "could not get home directory to locate client certificate files"
+#~ msgstr "nelze získat domovský adresář pro nalezení klientského certifikátu"
+
+#~ msgid "could not open private key file \"%s\": %s\n"
+#~ msgstr "nelze otevřít soubor s privátním klí�em \"%s\": %s\n"
+
+#~ msgid "private key file \"%s\" changed during execution\n"
+#~ msgstr "soubor privátního klí�e \"%s\" byl za chodu změněn\n"
diff --git a/src/interfaces/libpq/po/de.po b/src/interfaces/libpq/po/de.po
index ac58142fc03e5..6cfe278363897 100644
--- a/src/interfaces/libpq/po/de.po
+++ b/src/interfaces/libpq/po/de.po
@@ -1,7 +1,7 @@
 # German message translation file for libpq
 # Peter Eisentraut <peter_e@gmx.net>, 2001 - 2011.
 #
-# pgtranslation Id: libpq.po,v 1.24 2011/05/20 19:38:39 petere Exp $
+# pgtranslation Id: libpq.po,v 1.26 2011/07/27 20:44:50 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-20 00:42+0000\n"
-"PO-Revision-Date: 2011-05-20 21:42+0300\n"
+"POT-Creation-Date: 2011-07-27 16:55+0000\n"
+"PO-Revision-Date: 2011-07-27 23:42+0300\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -18,102 +18,102 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:212 fe-auth.c:431 fe-auth.c:658
+#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
 msgid "host name must be specified\n"
 msgstr "Hostname muss angegeben werden\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "konnte Socket nicht auf blockierenden Modus umstellen: %s\n"
 
-#: fe-auth.c:260 fe-auth.c:264
+#: fe-auth.c:258 fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "Authentifizierung mit Kerberos 5 abgelehnt: %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr ""
 "konnte den nicht blockierenden Modus auf dem Socket nicht wieder herstellen: "
 "%s\n"
 
-#: fe-auth.c:402
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "GSSAPI-Fortsetzungsfehler"
 
-#: fe-auth.c:438
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "doppelte GSSAPI-Authentifizierungsanfrage\n"
 
-#: fe-auth.c:458
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "GSSAPI-Namensimportfehler"
 
-#: fe-auth.c:544
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "SSPI-Fortsetzungsfehler"
 
-#: fe-auth.c:555 fe-auth.c:629 fe-auth.c:664 fe-auth.c:761 fe-connect.c:1995
-#: fe-connect.c:3394 fe-connect.c:3612 fe-connect.c:4033 fe-connect.c:4042
-#: fe-connect.c:4179 fe-connect.c:4225 fe-connect.c:4243 fe-connect.c:4322
-#: fe-connect.c:4392 fe-connect.c:4438 fe-connect.c:4456 fe-exec.c:3140
-#: fe-exec.c:3305 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:757 fe-connect.c:1961
+#: fe-connect.c:3360 fe-connect.c:3578 fe-connect.c:3999 fe-connect.c:4008
+#: fe-connect.c:4145 fe-connect.c:4191 fe-connect.c:4209 fe-connect.c:4288
+#: fe-connect.c:4358 fe-connect.c:4404 fe-connect.c:4422 fe-exec.c:3121
+#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: fe-auth.c:644
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "konnte SSPI-Credentials nicht erhalten"
 
-#: fe-auth.c:737
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "SCM_CRED-Authentifizierungsmethode nicht unterstützt\n"
 
-#: fe-auth.c:811
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Authentifizierung mit Kerberos 4 nicht unterstützt\n"
 
-#: fe-auth.c:827
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Authentifizierung mit Kerberos 5 nicht unterstützt\n"
 
-#: fe-auth.c:899
+#: fe-auth.c:895
 msgid "GSSAPI authentication not supported\n"
 msgstr "Authentifizierung mit GSSAPI nicht unterstützt\n"
 
-#: fe-auth.c:931
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "Authentifizierung mit SSPI nicht unterstützt\n"
 
-#: fe-auth.c:939
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "Authentifizierung mit Crypt nicht unterstützt\n"
 
-#: fe-auth.c:966
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "Authentifizierungsmethode %u nicht unterstützt\n"
 
-#: fe-connect.c:761
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "ungültiger sslmode-Wert: »%s«\n"
 
-#: fe-connect.c:782
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr ""
 "sslmode-Wert »%s« ist ungültig, wenn SSL-Unterstützung nicht einkompiliert "
 "worden ist\n"
 
-#: fe-connect.c:975
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "konnte Socket nicht auf TCP »No Delay«-Modus umstellen: %s\n"
 
-#: fe-connect.c:1005
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -124,7 +124,7 @@ msgstr ""
 "\tLäuft der Server lokal und akzeptiert er Verbindungen\n"
 "\tauf dem Unix-Domain-Socket »%s«?\n"
 
-#: fe-connect.c:1060
+#: fe-connect.c:1057
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -135,7 +135,7 @@ msgstr ""
 "\tLäuft der Server auf dem Host »%s« (%s) und akzeptiert er\n"
 "\tTCP/IP-Verbindungen auf Port %s?\n"
 
-#: fe-connect.c:1069
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -146,257 +146,252 @@ msgstr ""
 "\tLäuft der Server auf dem Host »%s« und akzeptiert er\n"
 "\tTCP/IP-Verbindungen auf Port %s?\n"
 
-#: fe-connect.c:1120
+#: fe-connect.c:1117
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE) fehlgeschlagen: %s\n"
 
-#: fe-connect.c:1133
+#: fe-connect.c:1130
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPALIVE) fehlgeschlagen: %s\n"
 
-#: fe-connect.c:1165
+#: fe-connect.c:1162
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL) fehlgeschlagen: %s\n"
 
-#: fe-connect.c:1197
+#: fe-connect.c:1194
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT) fehlgeschlagen: %s\n"
 
-#: fe-connect.c:1245
+#: fe-connect.c:1242
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) fehlgeschlagen: %ui\n"
 
-#: fe-connect.c:1297
+#: fe-connect.c:1294
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "ungültige Portnummer: »%s«\n"
 
-#: fe-connect.c:1340
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "konnte Hostname »%s« nicht in Adresse übersetzen: %s\n"
 
-#: fe-connect.c:1344
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "konnte Unix-Domain-Socket-Pfad »%s« nicht in Adresse übersetzen: %s\n"
 
-#: fe-connect.c:1554
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ungültiger Verbindungszustand, möglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1595
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "konnte Socket nicht erzeugen: %s\n"
 
-#: fe-connect.c:1618
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "konnte Socket nicht auf nicht-blockierenden Modus umstellen: %s\n"
 
-#: fe-connect.c:1630
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "konnte Socket nicht auf »Close on exec«-Modus umstellen: %s\n"
 
-#: fe-connect.c:1650
+#: fe-connect.c:1647
 msgid "keepalives parameter must be an integer\n"
 msgstr "Parameter »keepalives« muss eine ganze Zahl sein\n"
 
-#: fe-connect.c:1663
+#: fe-connect.c:1660
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE) fehlgeschlagen: %s\n"
 
-#: fe-connect.c:1804
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "konnte Socket-Fehlerstatus nicht ermitteln: %s\n"
 
-#: fe-connect.c:1842
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "konnte Client-Adresse vom Socket nicht ermitteln: %s\n"
 
-#: fe-connect.c:1874 fe-connect.c:1888 fe-connect.c:1900
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "Parameter »requirepeer« wird auf dieser Plattform nicht unterstützt\n"
+
+#: fe-connect.c:1883
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "konnte Credentials von Gegenstelle nicht ermitteln: %s\n"
 
-#: fe-connect.c:1908
-#, c-format
-msgid "could not get effective UID from peer credentials: %s\n"
-msgstr "konnte effektive UID nicht aus Peer-Credentials ermitteln: %s\n"
-
-#: fe-connect.c:1923
+#: fe-connect.c:1893
 #, c-format
 msgid "local user with ID %d does not exist\n"
 msgstr "lokaler Benutzer mit ID %d existiert nicht\n"
 
-#: fe-connect.c:1931
+#: fe-connect.c:1901
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
 msgstr ""
 "requirepeer gibt »%s« an, aber tatsächlicher Benutzername der Gegenstelle "
 "ist »%s«\n"
 
-#: fe-connect.c:1937
-msgid "requirepeer parameter is not supported on this platform\n"
-msgstr "Parameter »requirepeer« wird auf dieser Plattform nicht unterstützt\n"
-
-#: fe-connect.c:1969
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "konnte Paket zur SSL-Verhandlung nicht senden: %s\n"
 
-#: fe-connect.c:2008
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "konnte Startpaket nicht senden: %s\n"
 
-#: fe-connect.c:2075 fe-connect.c:2094
+#: fe-connect.c:2041 fe-connect.c:2060
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "Server unterstützt kein SSL, aber SSL wurde verlangt\n"
 
-#: fe-connect.c:2110
+#: fe-connect.c:2076
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ungültige Antwort auf SSL-Verhandlungspaket empfangen: %c\n"
 
-#: fe-connect.c:2186 fe-connect.c:2219
+#: fe-connect.c:2152 fe-connect.c:2185
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr ""
 "Authentifizierungsanfrage wurde vom Server erwartet, aber %c wurde "
 "empfangen\n"
 
-#: fe-connect.c:2392
+#: fe-connect.c:2358
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%i)"
 msgstr "Speicher aufgebraucht beim Anlegen des GSSAPI-Puffers (%i)"
 
-#: fe-connect.c:2477
+#: fe-connect.c:2443
 msgid "unexpected message from server during startup\n"
 msgstr "unerwartete Nachricht vom Server beim Start\n"
 
-#: fe-connect.c:2573
+#: fe-connect.c:2539
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr "ungültiger Verbindungszustand %d, möglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:3002 fe-connect.c:3062
+#: fe-connect.c:2968 fe-connect.c:3028
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc »%s« während PGEVT_CONNRESET-Ereignis fehlgeschlagen\n"
 
-#: fe-connect.c:3407
+#: fe-connect.c:3373
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "ungÜltige LDAP-URL »%s«: Schema muss ldap:// sein\n"
 
-#: fe-connect.c:3422
+#: fe-connect.c:3388
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "ungültige LDAP-URL »%s«: Distinguished Name fehlt\n"
 
-#: fe-connect.c:3433 fe-connect.c:3486
+#: fe-connect.c:3399 fe-connect.c:3452
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "ungültige LDAP-URL »%s«: muss genau ein Attribut haben\n"
 
-#: fe-connect.c:3443 fe-connect.c:3500
+#: fe-connect.c:3409 fe-connect.c:3466
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr "ungültige LDAP-URL »%s«: Suchbereich fehlt (base/one/sub)\n"
 
-#: fe-connect.c:3454
+#: fe-connect.c:3420
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "ungültige LDAP-URL »%s«: kein Filter\n"
 
-#: fe-connect.c:3475
+#: fe-connect.c:3441
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "ungültige LDAP-URL »%s«: ungültige Portnummer\n"
 
-#: fe-connect.c:3509
+#: fe-connect.c:3475
 msgid "could not create LDAP structure\n"
 msgstr "konnte LDAP-Struktur nicht erzeugen\n"
 
-#: fe-connect.c:3551
+#: fe-connect.c:3517
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "Suche auf LDAP-Server fehlgeschlagen: %s\n"
 
-#: fe-connect.c:3562
+#: fe-connect.c:3528
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "LDAP-Suche ergab mehr als einen Eintrag\n"
 
-#: fe-connect.c:3563 fe-connect.c:3575
+#: fe-connect.c:3529 fe-connect.c:3541
 msgid "no entry found on LDAP lookup\n"
 msgstr "kein Eintrag gefunden bei LDAP-Suche\n"
 
-#: fe-connect.c:3586 fe-connect.c:3599
+#: fe-connect.c:3552 fe-connect.c:3565
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "Attribut hat keine Werte bei LDAP-Suche\n"
 
-#: fe-connect.c:3651 fe-connect.c:3670 fe-connect.c:4081
+#: fe-connect.c:3617 fe-connect.c:3636 fe-connect.c:4047
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "fehlendes »=« nach »%s« in der Zeichenkette der Verbindungsdaten\n"
 
-#: fe-connect.c:3734 fe-connect.c:4163 fe-connect.c:4347
+#: fe-connect.c:3700 fe-connect.c:4129 fe-connect.c:4313
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "ungültige Verbindungsoption »%s«\n"
 
-#: fe-connect.c:3750 fe-connect.c:4130
+#: fe-connect.c:3716 fe-connect.c:4096
 msgid "unterminated quoted string in connection info string\n"
 msgstr ""
 "fehlendes schließendes Anführungszeichen (\") in der Zeichenkette der "
 "Verbindugsdaten\n"
 
-#: fe-connect.c:3789
+#: fe-connect.c:3755
 msgid "could not get home directory to locate service definition file"
 msgstr ""
 "konnte Home-Verzeichnis nicht ermitteln, um Servicedefinitionsdatei zu finden"
 
-#: fe-connect.c:3822
+#: fe-connect.c:3788
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "Definition von Service »%s« nicht gefunden\n"
 
-#: fe-connect.c:3845
+#: fe-connect.c:3811
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "Servicedatei »%s« nicht gefunden\n"
 
-#: fe-connect.c:3858
+#: fe-connect.c:3824
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "Zeile %d zu lang in Servicedatei »%s«\n"
 
-#: fe-connect.c:3929 fe-connect.c:3956
+#: fe-connect.c:3895 fe-connect.c:3922
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "Syntaxfehler in Servicedatei »%s«, Zeile %d\n"
 
-#: fe-connect.c:4623
+#: fe-connect.c:4589
 msgid "connection pointer is NULL\n"
 msgstr "Verbindung ist ein NULL-Zeiger\n"
 
-#: fe-connect.c:4900
+#: fe-connect.c:4866
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "WARNUNG: Passwortdatei »%s« ist keine normale Datei\n"
 
-#: fe-connect.c:4909
+#: fe-connect.c:4875
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
@@ -405,99 +400,99 @@ msgstr ""
 "WARNUNG: Passwortdatei »%s« erlaubt Lesezugriff für Gruppe oder Andere; "
 "Rechte sollten u=rw (0600) oder weniger sein\n"
 
-#: fe-connect.c:4997
+#: fe-connect.c:4963
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "Passwort wurde aus Datei »%s« gelesen\n"
 
-#: fe-exec.c:829
+#: fe-exec.c:810
 msgid "NOTICE"
 msgstr "HINWEIS"
 
-#: fe-exec.c:1016 fe-exec.c:1073 fe-exec.c:1113
+#: fe-exec.c:997 fe-exec.c:1054 fe-exec.c:1094
 msgid "command string is a null pointer\n"
 msgstr "Befehlszeichenkette ist ein NULL-Zeiger\n"
 
-#: fe-exec.c:1106 fe-exec.c:1201
+#: fe-exec.c:1087 fe-exec.c:1182
 msgid "statement name is a null pointer\n"
 msgstr "Anweisungsname ist ein NULL-Zeiger\n"
 
-#: fe-exec.c:1121 fe-exec.c:1275 fe-exec.c:1944 fe-exec.c:2142
+#: fe-exec.c:1102 fe-exec.c:1256 fe-exec.c:1925 fe-exec.c:2123
 msgid "function requires at least protocol version 3.0\n"
 msgstr "Funktion erfordert mindestens Protokollversion 3.0\n"
 
-#: fe-exec.c:1232
+#: fe-exec.c:1213
 msgid "no connection to the server\n"
 msgstr "keine Verbindung mit dem Server\n"
 
-#: fe-exec.c:1239
+#: fe-exec.c:1220
 msgid "another command is already in progress\n"
 msgstr "ein anderer Befehl ist bereits in Ausführung\n"
 
-#: fe-exec.c:1351
+#: fe-exec.c:1332
 msgid "length must be given for binary parameter\n"
 msgstr "für binäre Parameter muss eine Länge angegeben werden\n"
 
-#: fe-exec.c:1604
+#: fe-exec.c:1585
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "unerwarteter asyncStatus: %d\n"
 
-#: fe-exec.c:1624
+#: fe-exec.c:1605
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc »%s« während PGEVT_RESULTCREATE-Ereignis fehlgeschlagen\n"
 
-#: fe-exec.c:1754
+#: fe-exec.c:1735
 msgid "COPY terminated by new PQexec"
 msgstr "COPY von neuem PQexec beendet"
 
-#: fe-exec.c:1762
+#: fe-exec.c:1743
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY-IN-Zustand muss erst beendet werden\n"
 
-#: fe-exec.c:1782
+#: fe-exec.c:1763
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY-OUT-Zustand muss erst beendet werden\n"
 
-#: fe-exec.c:1790
+#: fe-exec.c:1771
 msgid "PQexec not allowed during COPY BOTH\n"
 msgstr "PQexec ist während COPY BOTH nicht erlaubt\n"
 
-#: fe-exec.c:2033 fe-exec.c:2099 fe-exec.c:2186 fe-protocol2.c:1237
+#: fe-exec.c:2014 fe-exec.c:2080 fe-exec.c:2167 fe-protocol2.c:1237
 #: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "keine COPY in Ausführung\n"
 
-#: fe-exec.c:2378
+#: fe-exec.c:2359
 msgid "connection in wrong state\n"
 msgstr "Verbindung im falschen Zustand\n"
 
-#: fe-exec.c:2409
+#: fe-exec.c:2390
 msgid "invalid ExecStatusType code"
 msgstr "ungültiger ExecStatusType-Kode"
 
-#: fe-exec.c:2473 fe-exec.c:2496
+#: fe-exec.c:2454 fe-exec.c:2477
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "Spaltennummer %d ist außerhalb des zulässigen Bereichs 0..%d"
 
-#: fe-exec.c:2489
+#: fe-exec.c:2470
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "Zeilennummer %d ist außerhalb des zulässigen Bereichs 0..%d"
 
-#: fe-exec.c:2511
+#: fe-exec.c:2492
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "Parameternummer %d ist außerhalb des zulässigen Bereichs 0..%d"
 
-#: fe-exec.c:2799
+#: fe-exec.c:2780
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "konnte Ergebnis vom Server nicht interpretieren: %s"
 
-#: fe-exec.c:3038 fe-exec.c:3122
+#: fe-exec.c:3019 fe-exec.c:3103
 msgid "incomplete multibyte character\n"
 msgstr "unvollständiges Mehrbyte-Zeichen\n"
 
@@ -564,23 +559,19 @@ msgstr "kann OID der Funktion lowrite nicht ermitteln\n"
 #: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
-msgstr "Integer der Größe %lu wird nicht von pqGetInt unterstützt"
+msgstr "Integer der Größe %lu wird von pqGetInt nicht unterstützt"
 
 #: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
-msgstr "Integer der Größe %lu wird nicht von pqPutInt unterstützt"
+msgstr "Integer der Größe %lu wird von pqPutInt nicht unterstützt"
 
-#: fe-misc.c:586 fe-misc.c:788
+#: fe-misc.c:585 fe-misc.c:784
 msgid "connection not open\n"
 msgstr "Verbindung nicht offen\n"
 
-#: fe-misc.c:651 fe-misc.c:741
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "konnte keine Daten vom Server empfangen: %s\n"
-
-#: fe-misc.c:758 fe-misc.c:836
+#: fe-misc.c:711 fe-secure.c:364 fe-secure.c:443 fe-secure.c:524
+#: fe-secure.c:632
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -590,20 +581,15 @@ msgstr ""
 "\tDas heißt wahrscheinlich, daß der Server abnormal beendete\n"
 "\tbevor oder während die Anweisung bearbeitet wurde.\n"
 
-#: fe-misc.c:853
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "konnte keine Daten an den Server senden: %s\n"
-
-#: fe-misc.c:972
+#: fe-misc.c:948
 msgid "timeout expired\n"
 msgstr "Timeout abgelaufen\n"
 
-#: fe-misc.c:1017
+#: fe-misc.c:993
 msgid "socket not open\n"
 msgstr "Socket ist nicht offen\n"
 
-#: fe-misc.c:1040
+#: fe-misc.c:1016
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fehlgeschlagen: %s\n"
@@ -747,75 +733,89 @@ msgstr "PQgetline: Text COPY OUT nicht ausgeführt\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "konnte SSL-Verbindung nicht aufbauen: %s\n"
 
-#: fe-secure.c:349 fe-secure.c:436 fe-secure.c:1180
+#: fe-secure.c:369 fe-secure.c:529 fe-secure.c:1331
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL-SYSCALL-Fehler: %s\n"
 
-#: fe-secure.c:355 fe-secure.c:442 fe-secure.c:1184
+#: fe-secure.c:376 fe-secure.c:536 fe-secure.c:1335
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL-SYSCALL-Fehler: Dateiende entdeckt\n"
 
-#: fe-secure.c:367 fe-secure.c:453 fe-secure.c:1193
+#: fe-secure.c:387 fe-secure.c:547 fe-secure.c:1344
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL-Fehler: %s\n"
 
-#: fe-secure.c:377 fe-secure.c:463 fe-secure.c:1202
+#: fe-secure.c:401 fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "SSL-Verbindung wurde unerwartet geschlossen\n"
+
+#: fe-secure.c:407 fe-secure.c:567 fe-secure.c:1353
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "unbekannter SSL-Fehlercode: %d\n"
 
-#: fe-secure.c:601
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "konnte keine Daten vom Server empfangen: %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "konnte keine Daten an den Server senden: %s\n"
+
+#: fe-secure.c:746
 msgid "host name must be specified for a verified SSL connection\n"
 msgstr "Hostname muss angegeben werden für eine verifizierte SSL-Verbindung\n"
 
-#: fe-secure.c:620
+#: fe-secure.c:765
 #, c-format
 msgid "server common name \"%s\" does not match host name \"%s\"\n"
 msgstr "Server-Common-Name »%s« stimmt nicht mit dem Hostnamen »%s« überein\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:897
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s\n"
 
-#: fe-secure.c:868
+#: fe-secure.c:1019
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "konnte Zertifikatdatei »%s« nicht öffnen: %s\n"
 
-#: fe-secure.c:893 fe-secure.c:903
+#: fe-secure.c:1044 fe-secure.c:1054
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "konnte Zertifikatdatei »%s« nicht lesen: %s\n"
 
-#: fe-secure.c:940
+#: fe-secure.c:1091
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "konnte SSL-Engine »%s« nicht laden: %s\n"
 
-#: fe-secure.c:952
+#: fe-secure.c:1103
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "konnte SSL-Engine »%s« nicht initialisieren: %s\n"
 
-#: fe-secure.c:968
+#: fe-secure.c:1119
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "konnte privaten SSL-Schlüssel »%s« nicht von Engine »%s« lesen: %s\n"
 
-#: fe-secure.c:982
+#: fe-secure.c:1133
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "konnte privaten SSL-Schlüssel »%s« nicht von Engine »%s« laden: %s\n"
 
-#: fe-secure.c:1019
+#: fe-secure.c:1170
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "Zertifikat vorhanden, aber keine private Schlüsseldatei »%s«\n"
 
-#: fe-secure.c:1027
+#: fe-secure.c:1178
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; permissions should be "
@@ -824,27 +824,27 @@ msgstr ""
 "WARNUNG: private Schlüsseldatei »%s« erlaubt Lesezugriff für Gruppe oder "
 "Andere; Rechte sollten u=rw (0600) oder weniger sein\n"
 
-#: fe-secure.c:1038
+#: fe-secure.c:1189
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "konnte private Schlüsseldatei »%s« nicht laden: %s\n"
 
-#: fe-secure.c:1052
+#: fe-secure.c:1203
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "Zertifikat passt nicht zur privaten Schlüsseldatei »%s«: %s\n"
 
-#: fe-secure.c:1080
+#: fe-secure.c:1231
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "konnte Root-Zertifikat-Datei »%s« nicht lesen: %s\n"
 
-#: fe-secure.c:1107
+#: fe-secure.c:1258
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "SSL-Bibliothek unterstützt keine CRL-Zertifikate (Datei »%s«)\n"
 
-#: fe-secure.c:1134
+#: fe-secure.c:1285
 msgid ""
 "could not get home directory to locate root certificate file\n"
 "Either provide the file or change sslmode to disable server certificate "
@@ -854,7 +854,7 @@ msgstr ""
 "Legen Sie entweder die Datei an oder ändern Sie sslmode, um die Überprüfung "
 "der Serverzertifikate abzuschalten.\n"
 
-#: fe-secure.c:1138
+#: fe-secure.c:1289
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -865,20 +865,20 @@ msgstr ""
 "Legen Sie entweder die Datei an oder ändern Sie sslmode, um die Überprüfung "
 "der Serverzertifikate abzuschalten.\n"
 
-#: fe-secure.c:1221
+#: fe-secure.c:1372
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "Zertifikat konnte nicht ermittelt werden: %s\n"
 
-#: fe-secure.c:1249
+#: fe-secure.c:1400
 msgid "SSL certificate's common name contains embedded null\n"
 msgstr "Common-Name im SSL-Zertifikat enthält Null-Byte\n"
 
-#: fe-secure.c:1325
+#: fe-secure.c:1476
 msgid "no SSL error reported"
 msgstr "kein SSL-Fehler berichtet"
 
-#: fe-secure.c:1334
+#: fe-secure.c:1485
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL-Fehlercode %lu"
diff --git a/src/interfaces/libpq/po/es.po b/src/interfaces/libpq/po/es.po
index 0b9a84d48e61c..7d2cfc91e3d09 100644
--- a/src/interfaces/libpq/po/es.po
+++ b/src/interfaces/libpq/po/es.po
@@ -1,82 +1,83 @@
 # Spanish message translation file for libpq
 #
-# Copyright (C) 2002-2010 PostgreSQL Global Development Group
+# Copyright (C) 2002-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Karim <karim@mribti.com>, 2002.
-# Updated on 2003-2010 by Alvaro Herrera <alvherre@alvh.no-ip.org>
+# Updated on 2003-2011 by Alvaro Herrera <alvherre@alvh.no-ip.org>
 # Mario González <gonzalemario@gmail.com>, 2005
 #
-# pgtranslation Id: libpq.po,v 1.12 2010/08/31 17:26:47 alvherre Exp $
+# pgtranslation Id: libpq.po,v 1.14 2011/09/03 01:54:11 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libpq (PostgreSQL 9.0)\n"
+"Project-Id-Version: libpq (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 07:23+0000\n"
-"PO-Revision-Date: 2010-08-31 13:26-0400\n"
+"POT-Creation-Date: 2011-09-02 10:56+0000\n"
+"PO-Revision-Date: 2011-09-02 22:53-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:212 fe-auth.c:432 fe-auth.c:659
+#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
 msgid "host name must be specified\n"
 msgstr "el nombre de servidor debe ser especificado\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "no se pudo poner el socket en modo bloqueante: %s\n"
 
-#: fe-auth.c:260 fe-auth.c:264
+#: fe-auth.c:258 fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "autentificación Kerberos 5 denegada: %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "no se pudo restablecer el modo no bloqueante en el socket: %s\n"
 
-#: fe-auth.c:403
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "error en continuación de GSSAPI"
 
-#: fe-auth.c:439
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "petición de autentificación GSS duplicada\n"
 
-#: fe-auth.c:459
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "error en conversión de nombre GSSAPI"
 
-#: fe-auth.c:545
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "error en continuación de SSPI"
 
-#: fe-auth.c:556 fe-auth.c:630 fe-auth.c:665 fe-auth.c:762 fe-connect.c:1893
-#: fe-connect.c:3222 fe-connect.c:3439 fe-connect.c:3855 fe-connect.c:3864
-#: fe-connect.c:4001 fe-connect.c:4047 fe-connect.c:4065 fe-connect.c:4144
-#: fe-connect.c:4214 fe-connect.c:4260 fe-connect.c:4278 fe-exec.c:3121
-#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:757 fe-connect.c:1961
+#: fe-connect.c:3368 fe-connect.c:3586 fe-connect.c:4007 fe-connect.c:4016
+#: fe-connect.c:4153 fe-connect.c:4199 fe-connect.c:4217 fe-connect.c:4296
+#: fe-connect.c:4366 fe-connect.c:4412 fe-connect.c:4430 fe-exec.c:3121
+#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
-#: fe-auth.c:645
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "no se pudo obtener las credenciales SSPI"
 
-#: fe-auth.c:738
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "el método de autentificación SCM_CRED no está soportado\n"
 
-#: fe-auth.c:812
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "el método de autentificación Kerberos 4 no está soportado\n"
 
-#: fe-auth.c:828
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "el método de autentificación Kerberos 5 no está soportado\n"
 
@@ -84,36 +85,37 @@ msgstr "el método de autentificación Kerberos 5 no está soportado\n"
 msgid "GSSAPI authentication not supported\n"
 msgstr "el método de autentificación GSSAPI no está soportado\n"
 
-#: fe-auth.c:919
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "el método de autentificación SSPI no está soportado\n"
 
-#: fe-auth.c:926
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "el método de autentificación Crypt no está soportado\n"
 
-#: fe-auth.c:953
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "el método de autentificación %u no está soportado\n"
 
-#: fe-connect.c:720
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valor sslmode no válido: «%s»\n"
 
-#: fe-connect.c:741
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr ""
-"el valor sslmode «%s» no es válido cuando no se ha compilado con soporte SSL\n"
+"el valor sslmode «%s» no es válido cuando no se ha compilado con soporte "
+"SSL\n"
 
-#: fe-connect.c:924
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "no se pudo establecer el socket en modo TCP sin retardo: %s\n"
 
-#: fe-connect.c:954
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -124,7 +126,18 @@ msgstr ""
 "\t¿Está el servidor en ejecución localmente y aceptando\n"
 "\tconexiones en el socket de dominio Unix «%s»?\n"
 
-#: fe-connect.c:964
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"no se pudo conectar con el servidor: %s\n"
+"\t¿Está el servidor en ejecución en el servidor «%s» (%s) y aceptando\n"
+"\tconexiones TCP/IP en el puerto %s?\n"
+
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -135,323 +148,325 @@ msgstr ""
 "\t¿Está el servidor en ejecución en el servidor «%s» y aceptando\n"
 "\tconexiones TCP/IP en el puerto %s?\n"
 
-#: fe-connect.c:1019
+#: fe-connect.c:1117
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE) falló: %s\n"
 
-#: fe-connect.c:1032
+#: fe-connect.c:1130
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPALIVE) falló: %s\n"
 
-#: fe-connect.c:1064
+#: fe-connect.c:1162
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL) falló: %s\n"
 
-#: fe-connect.c:1096
+#: fe-connect.c:1194
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT) falló: %s\n"
 
-#: fe-connect.c:1145
+#: fe-connect.c:1242
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 
-#: fe-connect.c:1197
+#: fe-connect.c:1294
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "número de puerto no válido: «%s»\n"
 
-#: fe-connect.c:1239
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "no se pudo traducir el nombre «%s» a una dirección: %s\n"
 
-#: fe-connect.c:1243
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "no se pudo traducir la ruta del socket Unix «%s» a una dirección: %s\n"
 
-#: fe-connect.c:1452
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr ""
 "el estado de conexión no es válido, probablemente por corrupción de memoria\n"
 
-#: fe-connect.c:1495
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "no se pudo crear el socket: %s\n"
 
-#: fe-connect.c:1518
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "no se pudo establecer el socket en modo no bloqueante: %s\n"
 
-#: fe-connect.c:1530
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "no se pudo poner el socket en modo close-on-exec: %s\n"
 
-#: fe-connect.c:1548
+#: fe-connect.c:1647
 msgid "keepalives parameter must be an integer\n"
 msgstr "el parámetro de keepalives debe ser un entero\n"
 
-#: fe-connect.c:1561
+#: fe-connect.c:1660
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE) falló: %s\n"
 
-#: fe-connect.c:1702
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "no se pudo determinar el estado de error del socket: %s\n"
 
-#: fe-connect.c:1740
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "no se pudo obtener la dirección del cliente desde el socket: %s\n"
 
-#: fe-connect.c:1772 fe-connect.c:1786 fe-connect.c:1798
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "el parámetro requirepeer no está soportado en esta plataforma\n"
+
+#: fe-connect.c:1883
 #, c-format
 msgid "could not get peer credentials: %s\n"
 msgstr "no se pudo obtener credenciales de la contraparte: %s\n"
 
-#: fe-connect.c:1806
-#, c-format
-msgid "could not get effective UID from peer credentials: %s\n"
-msgstr "no se pudo obtener el UID efectivo desde las credenciales de la contraparte: %s\n"
-
-#: fe-connect.c:1821
+#: fe-connect.c:1893
 #, c-format
 msgid "local user with ID %d does not exist\n"
 msgstr "no existe un usuario local con ID %d\n"
 
-#: fe-connect.c:1829
+#: fe-connect.c:1901
 #, c-format
 msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
-msgstr "requirepeer especifica «%s», pero el nombre de usuario de la contraparte es «%s»\n"
-
-#: fe-connect.c:1835
-msgid "requirepeer parameter is not supported on this platform\n"
-msgstr "el parámetro requirepeer no está soportado en esta plataforma\n"
+msgstr ""
+"requirepeer especifica «%s», pero el nombre de usuario de la contraparte es "
+"«%s»\n"
 
-#: fe-connect.c:1867
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "no se pudo enviar el paquete de negociación SSL: %s\n"
 
-#: fe-connect.c:1906
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "no se pudo enviar el paquete de inicio: %s\n"
 
-#: fe-connect.c:1973 fe-connect.c:1992
+#: fe-connect.c:2044
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "el servidor no soporta SSL, pero SSL es requerida\n"
 
-#: fe-connect.c:2008
+#: fe-connect.c:2070
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "se ha recibido una respuesta no válida en la negociación SSL: %c\n"
 
-#: fe-connect.c:2084 fe-connect.c:2117
+#: fe-connect.c:2149 fe-connect.c:2182
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr ""
 "se esperaba una petición de autentificación desde el servidor, pero se ha "
 "recibido %c\n"
 
-#: fe-connect.c:2288
+#: fe-connect.c:2363
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%i)"
 msgstr "memoria agotada creando el búfer GSSAPI (%i)"
 
-#: fe-connect.c:2373
+#: fe-connect.c:2448
 msgid "unexpected message from server during startup\n"
 msgstr "se ha recibido un mensaje inesperado del servidor durante el inicio\n"
 
-#: fe-connect.c:2469
+#: fe-connect.c:2547
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr ""
 "estado de conexión no válido %d, probablemente por corrupción de memoria\n"
 
-#: fe-connect.c:2830 fe-connect.c:2890
+#: fe-connect.c:2976 fe-connect.c:3036
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc «%s» falló durante el evento PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3235
+#: fe-connect.c:3381
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "URL LDAP no válida «%s»: el esquema debe ser ldap://\n"
 
-#: fe-connect.c:3250
+#: fe-connect.c:3396
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "URL LDAP no válida «%s»: distinguished name faltante\n"
 
-#: fe-connect.c:3261 fe-connect.c:3314
+#: fe-connect.c:3407 fe-connect.c:3460
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "URL LDAP no válida «%s»: debe tener exactamente un atributo\n"
 
-#: fe-connect.c:3271 fe-connect.c:3328
+#: fe-connect.c:3417 fe-connect.c:3474
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
-msgstr "URL LDAP no válida «%s»: debe tener ámbito de búsqueda (base/one/sub)\n"
+msgstr ""
+"URL LDAP no válida «%s»: debe tener ámbito de búsqueda (base/one/sub)\n"
 
-#: fe-connect.c:3282
+#: fe-connect.c:3428
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "URL LDAP no válida «%s»: no tiene filtro\n"
 
-#: fe-connect.c:3303
+#: fe-connect.c:3449
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "URL LDAP no válida «%s»: número de puerto no válido\n"
 
-#: fe-connect.c:3337
+#: fe-connect.c:3483
 msgid "could not create LDAP structure\n"
 msgstr "no se pudo crear estructura LDAP\n"
 
-#: fe-connect.c:3379
+#: fe-connect.c:3525
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "búsqueda en servidor LDAP falló: %s\n"
 
-#: fe-connect.c:3390
+#: fe-connect.c:3536
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "se encontro más de una entrada en búsqueda LDAP\n"
 
-#: fe-connect.c:3391 fe-connect.c:3403
+#: fe-connect.c:3537 fe-connect.c:3549
 msgid "no entry found on LDAP lookup\n"
 msgstr "no se encontró ninguna entrada en búsqueda LDAP\n"
 
-#: fe-connect.c:3414 fe-connect.c:3427
+#: fe-connect.c:3560 fe-connect.c:3573
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "la búsqueda LDAP entregó atributo sin valores\n"
 
-#: fe-connect.c:3478 fe-connect.c:3496 fe-connect.c:3903
+#: fe-connect.c:3625 fe-connect.c:3644 fe-connect.c:4055
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "falta «=» después de «%s» en la cadena de información de la conexión\n"
 
-#: fe-connect.c:3559 fe-connect.c:3985 fe-connect.c:4169
+#: fe-connect.c:3708 fe-connect.c:4137 fe-connect.c:4321
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "opción de conexión no válida «%s»\n"
 
-#: fe-connect.c:3572 fe-connect.c:3952
+#: fe-connect.c:3724 fe-connect.c:4104
 msgid "unterminated quoted string in connection info string\n"
 msgstr ""
 "cadena de caracteres entre comillas sin terminar en la cadena de información "
 "de conexión\n"
 
-#: fe-connect.c:3611
+#: fe-connect.c:3763
 msgid "could not get home directory to locate service definition file"
 msgstr ""
 "no se pudo obtener el directorio home para localizar el archivo de "
 "definición de servicio"
 
-#: fe-connect.c:3644
+#: fe-connect.c:3796
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "la definición de servicio «%s» no fue encontrada\n"
 
-#: fe-connect.c:3667
+#: fe-connect.c:3819
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "el archivo de servicio «%s» no fue encontrado\n"
 
-#: fe-connect.c:3680
+#: fe-connect.c:3832
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "la línea %d es demasiado larga en archivo de servicio «%s»\n"
 
-#: fe-connect.c:3751 fe-connect.c:3778
+#: fe-connect.c:3903 fe-connect.c:3930
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "error de sintaxis en archivo de servicio «%s», línea %d\n"
 
-#: fe-connect.c:4445
+#: fe-connect.c:4597
 msgid "connection pointer is NULL\n"
 msgstr "el puntero de conexión es NULL\n"
 
-#: fe-connect.c:4718
+#: fe-connect.c:4874
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ADVERTENCIA: El archivo de claves «%s» no es un archivo plano\n"
 
-#: fe-connect.c:4727
+#: fe-connect.c:4883
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
 "be u=rw (0600) or less\n"
 msgstr ""
-"ADVERTENCIA: El archivo de claves «%s» tiene permiso de lectura para el grupo "
-"u otros; los permisos deberían ser u=rw (0600) o menos\n"
+"ADVERTENCIA: El archivo de claves «%s» tiene permiso de lectura para el "
+"grupo u otros; los permisos deberían ser u=rw (0600) o menos\n"
 
-#: fe-connect.c:4815
+#: fe-connect.c:4971
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "contraseña obtenida desde el archivo «%s»\n"
 
-#: fe-exec.c:827
+#: fe-exec.c:810
 msgid "NOTICE"
 msgstr "AVISO"
 
-#: fe-exec.c:1014 fe-exec.c:1071 fe-exec.c:1111
+#: fe-exec.c:997 fe-exec.c:1054 fe-exec.c:1094
 msgid "command string is a null pointer\n"
 msgstr "la cadena de orden es un puntero nulo\n"
 
-#: fe-exec.c:1104 fe-exec.c:1199
+#: fe-exec.c:1087 fe-exec.c:1182
 msgid "statement name is a null pointer\n"
 msgstr "el nombre de sentencia es un puntero nulo\n"
 
-#: fe-exec.c:1119 fe-exec.c:1273 fe-exec.c:1928 fe-exec.c:2125
+#: fe-exec.c:1102 fe-exec.c:1256 fe-exec.c:1925 fe-exec.c:2123
 msgid "function requires at least protocol version 3.0\n"
 msgstr "la función requiere protocolo 3.0 o superior\n"
 
-#: fe-exec.c:1230
+#: fe-exec.c:1213
 msgid "no connection to the server\n"
 msgstr "no hay conexión con el servidor\n"
 
-#: fe-exec.c:1237
+#: fe-exec.c:1220
 msgid "another command is already in progress\n"
 msgstr "hay otra orden en ejecución\n"
 
-#: fe-exec.c:1349
+#: fe-exec.c:1332
 msgid "length must be given for binary parameter\n"
 msgstr "el largo debe ser especificado para un parámetro binario\n"
 
-#: fe-exec.c:1596
+#: fe-exec.c:1585
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus no esperado: %d\n"
 
-#: fe-exec.c:1616
+#: fe-exec.c:1605
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc «%s» falló durante el evento PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1746
+#: fe-exec.c:1735
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminado por un nuevo PQexec"
 
-#: fe-exec.c:1754
+#: fe-exec.c:1743
 msgid "COPY IN state must be terminated first\n"
 msgstr "el estado COPY IN debe ser terminado primero\n"
 
-#: fe-exec.c:1774
+#: fe-exec.c:1763
 msgid "COPY OUT state must be terminated first\n"
 msgstr "el estado COPY OUT debe ser terminado primero\n"
 
-#: fe-exec.c:2016 fe-exec.c:2082 fe-exec.c:2167 fe-protocol2.c:1172
-#: fe-protocol3.c:1557
+#: fe-exec.c:1771
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "PQexec no está permitido durante COPY BOTH\n"
+
+#: fe-exec.c:2014 fe-exec.c:2080 fe-exec.c:2167 fe-protocol2.c:1237
+#: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "no hay COPY alguno en ejecución\n"
 
@@ -548,26 +563,22 @@ msgstr "no se puede determinar el OID de la función loread\n"
 msgid "cannot determine OID of function lowrite\n"
 msgstr "no se puede determinar el OID de la función lowrite\n"
 
-#: fe-misc.c:262
+#: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "el entero de tamaño %lu no está soportado por pqGetInt"
 
-#: fe-misc.c:298
+#: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "el entero de tamaño %lu no está soportado por pqPutInt"
 
-#: fe-misc.c:578 fe-misc.c:780
+#: fe-misc.c:585 fe-misc.c:784
 msgid "connection not open\n"
 msgstr "la conexión no está abierta\n"
 
-#: fe-misc.c:643 fe-misc.c:733
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "no se pudo recibir datos del servidor: %s\n"
-
-#: fe-misc.c:750 fe-misc.c:828
+#: fe-misc.c:711 fe-secure.c:364 fe-secure.c:443 fe-secure.c:524
+#: fe-secure.c:632
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -577,49 +588,44 @@ msgstr ""
 "\tProbablemente se debe a que el servidor terminó de manera anormal\n"
 "\tantes o durante el procesamiento de la petición.\n"
 
-#: fe-misc.c:845
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "no se pudo enviar datos al servidor: %s\n"
-
-#: fe-misc.c:964
+#: fe-misc.c:948
 msgid "timeout expired\n"
 msgstr "tiempo de espera agotado\n"
 
-#: fe-misc.c:1009
+#: fe-misc.c:993
 msgid "socket not open\n"
 msgstr "el socket no está abierto\n"
 
-#: fe-misc.c:1032
+#: fe-misc.c:1016
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fallida: %s\n"
 
-#: fe-protocol2.c:89
+#: fe-protocol2.c:91
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr ""
 "el estado de setenv %c no es válido, probablemente por corrupción de "
 "memoria\n"
 
-#: fe-protocol2.c:330
+#: fe-protocol2.c:390
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "el estado %c no es válido, probablemente por corrupción de memoria\n"
 
-#: fe-protocol2.c:419 fe-protocol3.c:186
+#: fe-protocol2.c:479 fe-protocol3.c:186
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "un mensaje de tipo 0x%02x llegó del servidor estando inactivo"
 
-#: fe-protocol2.c:462
+#: fe-protocol2.c:522
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
 msgstr ""
 "carácter %c no esperado, siguiendo una respuesta de consulta vacía (mensaje "
 "«I»)"
 
-#: fe-protocol2.c:516
+#: fe-protocol2.c:576
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)"
@@ -627,7 +633,7 @@ msgstr ""
 "el servidor envió datos (mensaje «D») sin precederlos con una descripción de "
 "fila (mensaje «T»)"
 
-#: fe-protocol2.c:532
+#: fe-protocol2.c:592
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)"
@@ -635,27 +641,27 @@ msgstr ""
 "el servidor envió datos binarios (mensaje «B») sin precederlos con una "
 "description de fila (mensaje «T»)"
 
-#: fe-protocol2.c:547 fe-protocol3.c:382
+#: fe-protocol2.c:612 fe-protocol3.c:388
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr ""
 "se ha recibido una respuesta inesperada del servidor; el primer carácter "
 "recibido fue «%c»\n"
 
-#: fe-protocol2.c:768 fe-protocol3.c:701
+#: fe-protocol2.c:833 fe-protocol3.c:707
 msgid "out of memory for query result\n"
 msgstr "no hay suficiente memoria para el resultado de la consulta\n"
 
-#: fe-protocol2.c:1215 fe-protocol3.c:1625
+#: fe-protocol2.c:1280 fe-protocol3.c:1637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-protocol2.c:1227
+#: fe-protocol2.c:1292
 msgid "lost synchronization with server, resetting connection"
 msgstr "se perdió la sincronía con el servidor, reseteando la conexión"
 
-#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
+#: fe-protocol2.c:1426 fe-protocol2.c:1458 fe-protocol3.c:1840
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "error de protocolo: id=0x%x\n"
@@ -668,69 +674,69 @@ msgstr ""
 "el servidor envió datos (mensaje «D») sin precederlos con una description de "
 "tupla (mensaje «T»)\n"
 
-#: fe-protocol3.c:403
+#: fe-protocol3.c:409
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr ""
 "el contenido del mensaje no concuerda con el largo, en el mensaje tipo «%c»\n"
 
-#: fe-protocol3.c:424
+#: fe-protocol3.c:430
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "se perdió la sincronía con el servidor: se recibió un mensaje de tipo «%c», "
 "largo %d\n"
 
-#: fe-protocol3.c:646
+#: fe-protocol3.c:652
 msgid "unexpected field count in \"D\" message\n"
 msgstr "cantidad de campos inesperada en mensaje «D»\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:788 fe-protocol3.c:807
+#: fe-protocol3.c:798 fe-protocol3.c:817
 #, c-format
 msgid " at character %s"
 msgstr " en el carácter %s"
 
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALLE:  %s\n"
 
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "SUGERENCIA:  %s\n"
 
-#: fe-protocol3.c:826
+#: fe-protocol3.c:836
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "CONSULTA:  %s\n"
 
-#: fe-protocol3.c:829
+#: fe-protocol3.c:839
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTO:  %s\n"
 
-#: fe-protocol3.c:841
+#: fe-protocol3.c:851
 msgid "LOCATION:  "
 msgstr "UBICACIÓN:  "
 
-#: fe-protocol3.c:843
+#: fe-protocol3.c:853
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:845
+#: fe-protocol3.c:855
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1069
+#: fe-protocol3.c:1079
 #, c-format
 msgid "LINE %d: "
 msgstr "L�NEA %d: "
 
-#: fe-protocol3.c:1453
+#: fe-protocol3.c:1465
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: no se está haciendo COPY OUT de texto\n"
 
@@ -739,86 +745,95 @@ msgstr "PQgetline: no se está haciendo COPY OUT de texto\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "no se pudo establecer conexión SSL: %s\n"
 
-#: fe-secure.c:349 fe-secure.c:436 fe-secure.c:1162
+#: fe-secure.c:369 fe-secure.c:529 fe-secure.c:1331
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "ERROR en llamada SSL: %s\n"
 
-#: fe-secure.c:355 fe-secure.c:442 fe-secure.c:1166
+#: fe-secure.c:376 fe-secure.c:536 fe-secure.c:1335
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "ERROR en llamada SSL: detectado fin de archivo\n"
 
-#: fe-secure.c:367 fe-secure.c:453 fe-secure.c:1175
+#: fe-secure.c:387 fe-secure.c:547 fe-secure.c:1344
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "error de SSL: %s\n"
 
-#: fe-secure.c:377 fe-secure.c:463 fe-secure.c:1184
+#: fe-secure.c:401 fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "la conexión SSL se ha cerrado inesperadamente\n"
+
+#: fe-secure.c:407 fe-secure.c:567 fe-secure.c:1353
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "código de error SSL no reconocido: %d\n"
 
-#: fe-secure.c:601
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "no se pudo recibir datos del servidor: %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "no se pudo enviar datos al servidor: %s\n"
+
+#: fe-secure.c:746
 msgid "host name must be specified for a verified SSL connection\n"
 msgstr ""
 "el nombre de servidor debe ser especificado para una conexión SSL "
 "verificada\n"
 
-#: fe-secure.c:620
+#: fe-secure.c:765
 #, c-format
 msgid "server common name \"%s\" does not match host name \"%s\"\n"
 msgstr ""
-"el common name «%s» del servidor no coincide con el nombre de anfitrión «%s»\n"
+"el common name «%s» del servidor no coincide con el nombre de anfitrión "
+"«%s»\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:897
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "no se pudo crear el contexto SSL: %s\n"
 
-#: fe-secure.c:843
-msgid "could not get home directory to locate client certificate files\n"
-msgstr ""
-"no se pudo obtener el directorio home para localizar los archivos de "
-"certificado de cliente\n"
-
-#: fe-secure.c:868
+#: fe-secure.c:1019
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "no se pudo abrir el archivo de certificado «%s»: %s\n"
 
-#: fe-secure.c:893 fe-secure.c:903
+#: fe-secure.c:1044 fe-secure.c:1054
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "no se pudo leer el archivo de certificado «%s»: %s\n"
 
-#: fe-secure.c:940
+#: fe-secure.c:1091
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "no se pudo cargar el motor SSL «%s»: %s\n"
 
-#: fe-secure.c:952
+#: fe-secure.c:1103
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "no se pudo inicializar el motor SSL «%s»: %s\n"
 
-#: fe-secure.c:968
+#: fe-secure.c:1119
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr ""
-"no se pudo leer el archivo de la llave privada SSL «%s» desde el motor «%s»: %"
-"s\n"
+"no se pudo leer el archivo de la llave privada SSL «%s» desde el motor «%s»: "
+"%s\n"
 
-#: fe-secure.c:982
+#: fe-secure.c:1133
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "no se pudo leer la llave privada SSL «%s» desde el motor «%s»: %s\n"
 
-#: fe-secure.c:1017
+#: fe-secure.c:1170
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "el certificado está presente, pero no la llave privada «%s»\n"
 
-#: fe-secure.c:1025
+#: fe-secure.c:1178
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; permissions should be "
@@ -827,27 +842,38 @@ msgstr ""
 "el archivo de la llave privada «%s» tiene permiso de lectura para el grupo u "
 "otros; los permisos deberían ser u=rw (0600) o menos\n"
 
-#: fe-secure.c:1036
+#: fe-secure.c:1189
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "no se pudo cargar el archivo de la llave privada «%s»: %s\n"
 
-#: fe-secure.c:1050
+#: fe-secure.c:1203
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "el certificado no coincide con la llave privada «%s»: %s\n"
 
-#: fe-secure.c:1075
+#: fe-secure.c:1231
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "no se pudo leer la lista de certificado raíz «%s»: %s\n"
 
-#: fe-secure.c:1099
+#: fe-secure.c:1258
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "la biblioteca SSL no soporta certificados CRL (archivo «%s»)\n"
 
-#: fe-secure.c:1120
+#: fe-secure.c:1285
+msgid ""
+"could not get home directory to locate root certificate file\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"no se pudo obtener el directorio «home» para ubicar el archivo del "
+"certificado raíz\n"
+"Debe ya sea entregar este archivo, o bien cambiar sslmode para deshabilitar "
+"la verificación de certificados del servidor.\n"
+
+#: fe-secure.c:1289
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -858,20 +884,20 @@ msgstr ""
 "Debe ya sea entregar este archivo, o bien cambiar sslmode para deshabilitar "
 "la verificación de certificados del servidor.\n"
 
-#: fe-secure.c:1203
+#: fe-secure.c:1372
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "el certificado no pudo ser obtenido: %s\n"
 
-#: fe-secure.c:1231
+#: fe-secure.c:1400
 msgid "SSL certificate's common name contains embedded null\n"
 msgstr "el common name del certificado SSL contiene un null\n"
 
-#: fe-secure.c:1307
+#: fe-secure.c:1476
 msgid "no SSL error reported"
 msgstr "sin error SSL reportado"
 
-#: fe-secure.c:1316
+#: fe-secure.c:1485
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de error SSL %lu"
diff --git a/src/interfaces/libpq/po/fr.po b/src/interfaces/libpq/po/fr.po
index 68eed85276dcc..9c88caaf82e3c 100644
--- a/src/interfaces/libpq/po/fr.po
+++ b/src/interfaces/libpq/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-03-08 20:57+0000\n"
-"PO-Revision-Date: 2011-03-10 20:48+0100\n"
+"POT-Creation-Date: 2011-09-05 18:57+0000\n"
+"PO-Revision-Date: 2011-09-05 22:24+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: \n"
@@ -20,81 +20,81 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:212
-#: fe-auth.c:432
-#: fe-auth.c:659
+#: fe-auth.c:210
+#: fe-auth.c:429
+#: fe-auth.c:656
 msgid "host name must be specified\n"
 msgstr "le nom d'hôte doit être précisé\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "n'a pas pu activer le mode bloquant pour la socket : %s\n"
 
-#: fe-auth.c:260
-#: fe-auth.c:264
+#: fe-auth.c:258
+#: fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "authentification Kerberos 5 rejetée : %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "n'a pas pu rétablir le mode non-bloquant pour la socket : %s\n"
 
-#: fe-auth.c:403
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "erreur de suite GSSAPI"
 
-#: fe-auth.c:439
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "requête d'authentification GSS dupliquée\n"
 
-#: fe-auth.c:459
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "erreur d'import du nom GSSAPI"
 
-#: fe-auth.c:545
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "erreur de suite SSPI"
 
-#: fe-auth.c:556
-#: fe-auth.c:630
-#: fe-auth.c:665
-#: fe-auth.c:762
-#: fe-connect.c:1802
-#: fe-connect.c:3129
-#: fe-connect.c:3346
-#: fe-connect.c:3762
-#: fe-connect.c:3771
-#: fe-connect.c:3908
-#: fe-connect.c:3954
-#: fe-connect.c:3972
-#: fe-connect.c:4051
-#: fe-connect.c:4121
-#: fe-connect.c:4167
-#: fe-connect.c:4185
+#: fe-auth.c:553
+#: fe-auth.c:627
+#: fe-auth.c:662
+#: fe-auth.c:757
+#: fe-connect.c:1961
+#: fe-connect.c:3368
+#: fe-connect.c:3586
+#: fe-connect.c:4007
+#: fe-connect.c:4016
+#: fe-connect.c:4153
+#: fe-connect.c:4199
+#: fe-connect.c:4217
+#: fe-connect.c:4296
+#: fe-connect.c:4366
+#: fe-connect.c:4412
+#: fe-connect.c:4430
 #: fe-exec.c:3121
 #: fe-exec.c:3286
 #: fe-lobj.c:696
-#: fe-protocol2.c:1027
-#: fe-protocol3.c:1421
+#: fe-protocol2.c:1092
+#: fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "mémoire épuisée\n"
 
-#: fe-auth.c:645
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "n'a pas pu récupérer les pièces d'identité SSPI"
 
-#: fe-auth.c:738
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "authentification SCM_CRED non supportée\n"
 
-#: fe-auth.c:812
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "authentification Kerberos 4 non supportée\n"
 
-#: fe-auth.c:828
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "authentification Kerberos 5 non supportée\n"
 
@@ -102,35 +102,35 @@ msgstr "authentification Kerberos 5 non support
 msgid "GSSAPI authentication not supported\n"
 msgstr "authentification GSSAPI non supportée\n"
 
-#: fe-auth.c:919
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "authentification SSPI non supportée\n"
 
-#: fe-auth.c:926
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "authentification crypt non supportée\n"
 
-#: fe-auth.c:953
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "méthode d'authentification %u non supportée\n"
 
-#: fe-connect.c:712
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valeur sslmode invalide : « %s »\n"
 
-#: fe-connect.c:733
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "valeur sslmode « %s » invalide si le support SSL n'est pas compilé initialement\n"
 
-#: fe-connect.c:916
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "n'a pas pu activer le mode TCP sans délai pour la socket : %s\n"
 
-#: fe-connect.c:946
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -141,7 +141,18 @@ msgstr ""
 "\tLe serveur est-il actif localement et accepte-t-il les connexions sur la\n"
 " \tsocket Unix « %s » ?\n"
 
-#: fe-connect.c:956
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"n'a pas pu se connecter au serveur : %s\n"
+"\tLe serveur est-il actif sur l'hôte « %s » (%s)\n"
+"\tet accepte-t-il les connexionsTCP/IP sur le port %s ?\n"
+
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -152,247 +163,265 @@ msgstr ""
 "\tLe serveur est-il actif sur l'hôte « %s » et accepte-t-il les connexions\n"
 "\tTCP/IP sur le port %s ?\n"
 
-#: fe-connect.c:1011
+#: fe-connect.c:1117
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE) a échoué : %s\n"
 
-#: fe-connect.c:1024
+#: fe-connect.c:1130
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPALIVE) a échoué : %s\n"
 
-#: fe-connect.c:1056
+#: fe-connect.c:1162
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL) a échoué : %s\n"
 
-#: fe-connect.c:1088
+#: fe-connect.c:1194
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT) a échoué : %s\n"
 
-#: fe-connect.c:1137
+#: fe-connect.c:1242
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) a échoué : %ui\n"
 
-#: fe-connect.c:1189
+#: fe-connect.c:1294
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "numéro de port invalide : « %s »\n"
 
-#: fe-connect.c:1231
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "n'a pas pu traduire le nom d'hôte « %s » en adresse : %s\n"
 
-#: fe-connect.c:1235
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr ""
 "n'a pas pu traduire le chemin de la socket du domaine Unix « %s » en adresse :\n"
 "%s\n"
 
-#: fe-connect.c:1444
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "état de connexion invalide, indique probablement une corruption de mémoire\n"
 
-#: fe-connect.c:1487
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "n'a pas pu créer la socket : %s\n"
 
-#: fe-connect.c:1510
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "n'a pas pu activer le mode non-bloquant pour la socket : %s\n"
 
-#: fe-connect.c:1522
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "n'a pas pu paramétrer la socket en mode close-on-exec : %s\n"
 
-#: fe-connect.c:1540
+#: fe-connect.c:1647
 msgid "keepalives parameter must be an integer\n"
 msgstr "le paramètre keepalives doit être un entier\n"
 
-#: fe-connect.c:1553
+#: fe-connect.c:1660
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE) a échoué : %s\n"
 
-#: fe-connect.c:1694
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "n'a pas pu déterminer le statut d'erreur de la socket : %s\n"
 
-#: fe-connect.c:1732
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "n'a pas pu obtenir l'adresse du client depuis la socket : %s\n"
 
-#: fe-connect.c:1776
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "le paramètre requirepeer n'est pas supporté sur cette plateforme\n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "n'a pas pu obtenir l'authentification de l'autre : %s\n"
+
+#: fe-connect.c:1893
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "l'utilisateur local dont l'identifiant est %d n'existe pas\n"
+
+#: fe-connect.c:1901
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr "requirepeer indique « %s » mais le nom de l'utilisateur réel est « %s »\n"
+
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "n'a pas pu transmettre le paquet de négociation SSL : %s\n"
 
-#: fe-connect.c:1815
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "n'a pas pu transmettre le paquet de démarrage : %s\n"
 
-#: fe-connect.c:1882
-#: fe-connect.c:1901
+#: fe-connect.c:2044
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "le serveur ne supporte pas SSL alors que SSL était réclamé\n"
 
-#: fe-connect.c:1917
+#: fe-connect.c:2070
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "a reçu une réponse invalide à la négociation SSL : %c\n"
 
-#: fe-connect.c:1993
-#: fe-connect.c:2026
+#: fe-connect.c:2149
+#: fe-connect.c:2182
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr ""
 "attendait une requête d'authentification en provenance du serveur, mais a\n"
 " reçu %c\n"
 
-#: fe-connect.c:2197
+#: fe-connect.c:2363
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%i)"
 msgstr "mémoire épuisée lors de l'allocation du tampon GSSAPI (%i)"
 
-#: fe-connect.c:2282
+#: fe-connect.c:2448
 msgid "unexpected message from server during startup\n"
 msgstr "message inattendu du serveur lors du démarrage\n"
 
-#: fe-connect.c:2378
+#: fe-connect.c:2547
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr ""
 "état de connexion invalide (%d), indiquant probablement une corruption de\n"
 " mémoire\n"
 
-#: fe-connect.c:2737
-#: fe-connect.c:2797
+#: fe-connect.c:2976
+#: fe-connect.c:3036
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3142
+#: fe-connect.c:3381
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "URL LDAP « %s » invalide : le schéma doit être ldap://\n"
 
-#: fe-connect.c:3157
+#: fe-connect.c:3396
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "URL LDAP « %s » invalide : le « distinguished name » manque\n"
 
-#: fe-connect.c:3168
-#: fe-connect.c:3221
+#: fe-connect.c:3407
+#: fe-connect.c:3460
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "URL LDAP « %s » invalide : doit avoir exactement un attribut\n"
 
-#: fe-connect.c:3178
-#: fe-connect.c:3235
+#: fe-connect.c:3417
+#: fe-connect.c:3474
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr "URL LDAP « %s » invalide : doit avoir une échelle de recherche (base/un/sous)\n"
 
-#: fe-connect.c:3189
+#: fe-connect.c:3428
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "URL LDAP « %s » invalide : aucun filtre\n"
 
-#: fe-connect.c:3210
+#: fe-connect.c:3449
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "URL LDAP « %s » invalide : numéro de port invalide\n"
 
-#: fe-connect.c:3244
+#: fe-connect.c:3483
 msgid "could not create LDAP structure\n"
 msgstr "n'a pas pu créer la structure LDAP\n"
 
-#: fe-connect.c:3286
+#: fe-connect.c:3525
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "échec de la recherche sur le serveur LDAP : %s\n"
 
-#: fe-connect.c:3297
+#: fe-connect.c:3536
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "plusieurs entrées trouvées pendant la recherche LDAP\n"
 
-#: fe-connect.c:3298
-#: fe-connect.c:3310
+#: fe-connect.c:3537
+#: fe-connect.c:3549
 msgid "no entry found on LDAP lookup\n"
 msgstr "aucune entrée trouvée pendant la recherche LDAP\n"
 
-#: fe-connect.c:3321
-#: fe-connect.c:3334
+#: fe-connect.c:3560
+#: fe-connect.c:3573
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "l'attribut n'a pas de valeur après la recherche LDAP\n"
 
-#: fe-connect.c:3385
-#: fe-connect.c:3403
-#: fe-connect.c:3810
+#: fe-connect.c:3625
+#: fe-connect.c:3644
+#: fe-connect.c:4055
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "« = » manquant après « %s » dans la chaîne des paramètres de connexion\n"
 
-#: fe-connect.c:3466
-#: fe-connect.c:3892
-#: fe-connect.c:4076
+#: fe-connect.c:3708
+#: fe-connect.c:4137
+#: fe-connect.c:4321
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "option de connexion « %s » invalide\n"
 
-#: fe-connect.c:3479
-#: fe-connect.c:3859
+#: fe-connect.c:3724
+#: fe-connect.c:4104
 msgid "unterminated quoted string in connection info string\n"
 msgstr "guillemets non refermés dans la chaîne des paramètres de connexion\n"
 
-#: fe-connect.c:3518
+#: fe-connect.c:3763
 msgid "could not get home directory to locate service definition file"
 msgstr ""
 "n'a pas pu obtenir le répertoire personnel pour trouver le certificat de\n"
 "définition du service"
 
-#: fe-connect.c:3551
+#: fe-connect.c:3796
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "définition du service « %s » introuvable\n"
 
-#: fe-connect.c:3574
+#: fe-connect.c:3819
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "fichier de service « %s » introuvable\n"
 
-#: fe-connect.c:3587
+#: fe-connect.c:3832
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "ligne %d trop longue dans le fichier service « %s »\n"
 
-#: fe-connect.c:3658
-#: fe-connect.c:3685
+#: fe-connect.c:3903
+#: fe-connect.c:3930
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "erreur de syntaxe dans le fichier service « %s », ligne %d\n"
 
-#: fe-connect.c:4352
+#: fe-connect.c:4597
 msgid "connection pointer is NULL\n"
 msgstr "le pointeur de connexion est NULL\n"
 
-#: fe-connect.c:4625
+#: fe-connect.c:4874
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "ATTENTION : le fichier de mots de passe « %s » n'est pas un fichier texte\n"
 
-#: fe-connect.c:4634
+#: fe-connect.c:4883
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr ""
@@ -400,72 +429,76 @@ msgstr ""
 "lecture pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
 "ou inférieur\n"
 
-#: fe-connect.c:4722
+#: fe-connect.c:4971
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "mot de passe récupéré dans le fichier fichier « %s »\n"
 
-#: fe-exec.c:827
+#: fe-exec.c:810
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: fe-exec.c:1014
-#: fe-exec.c:1071
-#: fe-exec.c:1111
+#: fe-exec.c:997
+#: fe-exec.c:1054
+#: fe-exec.c:1094
 msgid "command string is a null pointer\n"
 msgstr "la chaîne de commande est un pointeur nul\n"
 
-#: fe-exec.c:1104
-#: fe-exec.c:1199
+#: fe-exec.c:1087
+#: fe-exec.c:1182
 msgid "statement name is a null pointer\n"
 msgstr "le nom de l'instruction est un pointeur nul\n"
 
-#: fe-exec.c:1119
-#: fe-exec.c:1273
-#: fe-exec.c:1928
-#: fe-exec.c:2125
+#: fe-exec.c:1102
+#: fe-exec.c:1256
+#: fe-exec.c:1925
+#: fe-exec.c:2123
 msgid "function requires at least protocol version 3.0\n"
 msgstr "la fonction nécessite au minimum le protocole 3.0\n"
 
-#: fe-exec.c:1230
+#: fe-exec.c:1213
 msgid "no connection to the server\n"
 msgstr "aucune connexion au serveur\n"
 
-#: fe-exec.c:1237
+#: fe-exec.c:1220
 msgid "another command is already in progress\n"
 msgstr "une autre commande est déjà en cours\n"
 
-#: fe-exec.c:1349
+#: fe-exec.c:1332
 msgid "length must be given for binary parameter\n"
 msgstr "la longueur doit être indiquée pour les paramètres binaires\n"
 
-#: fe-exec.c:1596
+#: fe-exec.c:1585
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus inattendu : %d\n"
 
-#: fe-exec.c:1616
+#: fe-exec.c:1605
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "échec de PGEventProc « %s » lors de l'événement PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1746
+#: fe-exec.c:1735
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminé par un nouveau PQexec"
 
-#: fe-exec.c:1754
+#: fe-exec.c:1743
 msgid "COPY IN state must be terminated first\n"
 msgstr "l'état COPY IN doit d'abord être terminé\n"
 
-#: fe-exec.c:1774
+#: fe-exec.c:1763
 msgid "COPY OUT state must be terminated first\n"
 msgstr "l'état COPY OUT doit d'abord être terminé\n"
 
-#: fe-exec.c:2016
-#: fe-exec.c:2082
+#: fe-exec.c:1771
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "PQexec non autorisé pendant COPY BOTH\n"
+
+#: fe-exec.c:2014
+#: fe-exec.c:2080
 #: fe-exec.c:2167
-#: fe-protocol2.c:1172
-#: fe-protocol3.c:1557
+#: fe-protocol2.c:1237
+#: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "aucun COPY en cours\n"
 
@@ -566,29 +599,26 @@ msgstr "ne peut pas d
 msgid "cannot determine OID of function lowrite\n"
 msgstr "ne peut pas déterminer l'OID de la fonction lowrite\n"
 
-#: fe-misc.c:262
+#: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "entier de taille %lu non supporté par pqGetInt"
 
-#: fe-misc.c:298
+#: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "entier de taille %lu non supporté par pqPutInt"
 
-#: fe-misc.c:578
-#: fe-misc.c:780
+#: fe-misc.c:585
+#: fe-misc.c:784
 msgid "connection not open\n"
 msgstr "la connexion n'est pas active\n"
 
-#: fe-misc.c:643
-#: fe-misc.c:733
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "n'a pas pu recevoir des données depuis le serveur : %s\n"
-
-#: fe-misc.c:750
-#: fe-misc.c:828
+#: fe-misc.c:711
+#: fe-secure.c:364
+#: fe-secure.c:443
+#: fe-secure.c:524
+#: fe-secure.c:632
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -598,83 +628,78 @@ msgstr ""
 "\tLe serveur s'est peut-être arrêté anormalement avant ou durant le\n"
 "\ttraitement de la requête.\n"
 
-#: fe-misc.c:845
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "n'a pas pu transmettre les données au serveur : %s\n"
-
-#: fe-misc.c:964
+#: fe-misc.c:948
 msgid "timeout expired\n"
 msgstr "le délai est dépassé\n"
 
-#: fe-misc.c:1009
+#: fe-misc.c:993
 msgid "socket not open\n"
 msgstr "socket non ouvert\n"
 
-#: fe-misc.c:1032
+#: fe-misc.c:1016
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "échec de select() : %s\n"
 
-#: fe-protocol2.c:89
+#: fe-protocol2.c:91
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "état setenv %c invalide, indiquant probablement une corruption de la mémoire\n"
 
-#: fe-protocol2.c:330
+#: fe-protocol2.c:390
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "état %c invalide, indiquant probablement une corruption de la mémoire\n"
 
-#: fe-protocol2.c:419
+#: fe-protocol2.c:479
 #: fe-protocol3.c:186
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "le message de type 0x%02x est arrivé alors que le serveur était en attente"
 
-#: fe-protocol2.c:462
+#: fe-protocol2.c:522
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
 msgstr ""
 "caractère %c inattendu à la suite d'une réponse de requête vide (message\n"
 "« I »)"
 
-#: fe-protocol2.c:516
+#: fe-protocol2.c:576
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr ""
 "le serveur a envoyé des données (message « D ») sans description préalable\n"
 "de la ligne (message « T »)"
 
-#: fe-protocol2.c:532
+#: fe-protocol2.c:592
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
 msgstr ""
 "le serveur a envoyé des données binaires (message « B ») sans description\n"
 "préalable de la ligne (message « T »)"
 
-#: fe-protocol2.c:547
-#: fe-protocol3.c:382
+#: fe-protocol2.c:612
+#: fe-protocol3.c:388
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "réponse inattendue du serveur, le premier caractère reçu étant « %c »\n"
 
-#: fe-protocol2.c:768
-#: fe-protocol3.c:701
+#: fe-protocol2.c:833
+#: fe-protocol3.c:707
 msgid "out of memory for query result\n"
 msgstr "mémoire épuisée pour le résultat de la requête\n"
 
-#: fe-protocol2.c:1215
-#: fe-protocol3.c:1625
+#: fe-protocol2.c:1280
+#: fe-protocol3.c:1637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-protocol2.c:1227
+#: fe-protocol2.c:1292
 msgid "lost synchronization with server, resetting connection"
 msgstr "synchronisation perdue avec le serveur, réinitialisation de la connexion"
 
-#: fe-protocol2.c:1361
-#: fe-protocol2.c:1393
-#: fe-protocol3.c:1828
+#: fe-protocol2.c:1426
+#: fe-protocol2.c:1458
+#: fe-protocol3.c:1840
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "erreur de protocole : id=0x%x\n"
@@ -685,71 +710,71 @@ msgstr ""
 "le serveur a envoyé des données (message « D ») sans description préalable\n"
 "de la ligne (message « T »)\n"
 
-#: fe-protocol3.c:403
+#: fe-protocol3.c:409
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr ""
 "le contenu du message ne correspond pas avec la longueur du type de message\n"
 "« %c »\n"
 
-#: fe-protocol3.c:424
+#: fe-protocol3.c:430
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "synchronisation perdue avec le serveur : a reçu le type de message « %c »,\n"
 "longueur %d\n"
 
-#: fe-protocol3.c:646
+#: fe-protocol3.c:652
 msgid "unexpected field count in \"D\" message\n"
 msgstr "nombre de champs inattendus dans le message « D »\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:788
-#: fe-protocol3.c:807
+#: fe-protocol3.c:798
+#: fe-protocol3.c:817
 #, c-format
 msgid " at character %s"
 msgstr " au caractère %s"
 
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DÉTAIL : %s\n"
 
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "ASTUCE : %s\n"
 
-#: fe-protocol3.c:826
+#: fe-protocol3.c:836
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "REQUÊTE : %s\n"
 
-#: fe-protocol3.c:829
+#: fe-protocol3.c:839
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTE : %s\n"
 
-#: fe-protocol3.c:841
+#: fe-protocol3.c:851
 msgid "LOCATION:  "
 msgstr "EMPLACEMENT : "
 
-#: fe-protocol3.c:843
+#: fe-protocol3.c:853
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:845
+#: fe-protocol3.c:855
 #, c-format
 msgid "%s:%s"
 msgstr "%s : %s"
 
-#: fe-protocol3.c:1069
+#: fe-protocol3.c:1079
 #, c-format
 msgid "LINE %d: "
 msgstr "LIGNE %d : "
 
-#: fe-protocol3.c:1453
+#: fe-protocol3.c:1465
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline : ne va pas réaliser un COPY OUT au format texte\n"
 
@@ -758,84 +783,99 @@ msgstr "PQgetline : ne va pas r
 msgid "could not establish SSL connection: %s\n"
 msgstr "n'a pas pu établir la connexion SSL : %s\n"
 
-#: fe-secure.c:349
-#: fe-secure.c:436
-#: fe-secure.c:1180
+#: fe-secure.c:369
+#: fe-secure.c:529
+#: fe-secure.c:1331
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "erreur SYSCALL SSL : %s\n"
 
-#: fe-secure.c:355
-#: fe-secure.c:442
-#: fe-secure.c:1184
+#: fe-secure.c:376
+#: fe-secure.c:536
+#: fe-secure.c:1335
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "erreur SYSCALL SSL : EOF détecté\n"
 
-#: fe-secure.c:367
-#: fe-secure.c:453
-#: fe-secure.c:1193
+#: fe-secure.c:387
+#: fe-secure.c:547
+#: fe-secure.c:1344
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "erreur SSL : %s\n"
 
-#: fe-secure.c:377
-#: fe-secure.c:463
-#: fe-secure.c:1202
+#: fe-secure.c:401
+#: fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "la connexion SSL a été fermée de façon inattendu\n"
+
+#: fe-secure.c:407
+#: fe-secure.c:567
+#: fe-secure.c:1353
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "code d'erreur SSL inconnu : %d\n"
 
-#: fe-secure.c:601
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "n'a pas pu recevoir des données depuis le serveur : %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "n'a pas pu transmettre les données au serveur : %s\n"
+
+#: fe-secure.c:746
 msgid "host name must be specified for a verified SSL connection\n"
 msgstr "le nom d'hôte doit être précisé pour une connexion SSL vérifiée\n"
 
-#: fe-secure.c:620
+#: fe-secure.c:765
 #, c-format
 msgid "server common name \"%s\" does not match host name \"%s\"\n"
 msgstr "le nom courant du serveur « %s » ne correspond pas au nom d'hôte « %s »\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:897
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "n'a pas pu créer le contexte SSL : %s\n"
 
-#: fe-secure.c:868
+#: fe-secure.c:1019
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "n'a pas pu ouvrir le certificat « %s » : %s\n"
 
-#: fe-secure.c:893
-#: fe-secure.c:903
+#: fe-secure.c:1044
+#: fe-secure.c:1054
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "n'a pas pu lire le certificat « %s » : %s\n"
 
-#: fe-secure.c:940
+#: fe-secure.c:1091
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "n'a pas pu charger le moteur SSL « %s » : %s\n"
 
-#: fe-secure.c:952
+#: fe-secure.c:1103
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "n'a pas pu initialiser le moteur SSL « %s » : %s\n"
 
-#: fe-secure.c:968
+#: fe-secure.c:1119
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "n'a pas pu lire la clé privée SSL « %s » à partir du moteur « %s » : %s\n"
 
-#: fe-secure.c:982
+#: fe-secure.c:1133
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "n'a pas pu charger la clé privée SSL « %s » à partir du moteur « %s » : %s\n"
 
-#: fe-secure.c:1019
+#: fe-secure.c:1170
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "le certificat est présent, mais la clé privée « %s » est absente\n"
 
-#: fe-secure.c:1027
+#: fe-secure.c:1178
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr ""
@@ -843,27 +883,27 @@ msgstr ""
 "pour le groupe ou universel ; les droits devraient être u=rw (0600)\n"
 "ou inférieur\n"
 
-#: fe-secure.c:1038
+#: fe-secure.c:1189
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "n'a pas pu charger le fichier de clé privée « %s » : %s\n"
 
-#: fe-secure.c:1052
+#: fe-secure.c:1203
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "le certificat ne correspond pas à la clé privée « %s » : %s\n"
 
-#: fe-secure.c:1080
+#: fe-secure.c:1231
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "n'a pas pu lire le certificat racine « %s » : %s\n"
 
-#: fe-secure.c:1107
+#: fe-secure.c:1258
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "la bibliothèque SSL ne supporte pas les certificats CRL (fichier « %s »)\n"
 
-#: fe-secure.c:1134
+#: fe-secure.c:1285
 msgid ""
 "could not get home directory to locate root certificate file\n"
 "Either provide the file or change sslmode to disable server certificate verification.\n"
@@ -872,7 +912,7 @@ msgstr ""
 "Fournissez le fichier ou modifiez sslmode pour désactiver la vérification du\n"
 "certificat par le serveur.\n"
 
-#: fe-secure.c:1138
+#: fe-secure.c:1289
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -882,20 +922,20 @@ msgstr ""
 "Fournissez le fichier ou modifiez sslmode pour désactiver la vérification du\n"
 "certificat par le serveur.\n"
 
-#: fe-secure.c:1221
+#: fe-secure.c:1372
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "le certificat n'a pas pu être obtenu : %s\n"
 
-#: fe-secure.c:1249
+#: fe-secure.c:1400
 msgid "SSL certificate's common name contains embedded null\n"
 msgstr "le nom commun du certificat SSL contient des NULL\n"
 
-#: fe-secure.c:1325
+#: fe-secure.c:1476
 msgid "no SSL error reported"
 msgstr "aucune erreur SSL reportée"
 
-#: fe-secure.c:1334
+#: fe-secure.c:1485
 #, c-format
 msgid "SSL error code %lu"
 msgstr "erreur SSL %lu"
@@ -905,26 +945,32 @@ msgstr "erreur SSL %lu"
 #~ "n'a pas pu récupérer le répertoire personnel pour trouver les "
 #~ "certificats\n"
 #~ "du client\n"
+
 #~ msgid ""
 #~ "verified SSL connections are only supported when connecting to a host "
 #~ "name\n"
 #~ msgstr ""
 #~ "les connexions SSL vérifiées ne sont supportées que lors de la connexion\n"
 #~ "à un alias hôte\n"
+
 #~ msgid "could not open private key file \"%s\": %s\n"
 #~ msgstr "n'a pas pu ouvrir le fichier de clé privée « %s » : %s\n"
+
 #~ msgid "private key file \"%s\" changed during execution\n"
 #~ msgstr "la clé privée « %s » a été modifiée durant l'exécution\n"
+
 #~ msgid "could not read private key file \"%s\": %s\n"
 #~ msgstr "n'a pas pu lire la clé privée « %s » : %s\n"
+
 #~ msgid "could not get home directory to locate root certificate file"
 #~ msgstr ""
 #~ "n'a pas pu récupérer le répertoire personnel pour trouver le certificat "
 #~ "racine"
+
 #~ msgid "invalid appname state %d, probably indicative of memory corruption\n"
 #~ msgstr ""
 #~ "état appname %d invalide, indiquant probablement une corruption de la "
 #~ "mémoire\n"
+
 #~ msgid "invalid sslverify value: \"%s\"\n"
 #~ msgstr "valeur sslverify invalide : « %s »\n"
-
diff --git a/src/interfaces/libpq/po/ja.po b/src/interfaces/libpq/po/ja.po
index d4e9a6bb36124..afccb992bcd93 100644
--- a/src/interfaces/libpq/po/ja.po
+++ b/src/interfaces/libpq/po/ja.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
+"Project-Id-Version: PostgreSQL 9.1 beta 2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-20 12:54+0900\n"
-"PO-Revision-Date: 2010-07-15 19:00+0900\n"
+"POT-Creation-Date: 2011-06-30 23:03+0900\n"
+"PO-Revision-Date: 2011-06-30 23:15+0900\n"
 "Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -14,98 +14,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
+msgid "host name must be specified\n"
+msgstr "ホスト�を指定���れ��り��ん\n"
+
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "ソケットをブロッキングモード�設定����ん���: %s\n"
 
-#: fe-auth.c:260 fe-auth.c:264
+#: fe-auth.c:258 fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "Kerberos 5�証�拒絶�れ���: %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "ソケットを�ブロッキングモード�戻��������ん���: %s\n"
 
-#: fe-auth.c:403
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "GSSAI続行エラー"
 
-#: fe-auth.c:431 fe-auth.c:657
-msgid "host name must be specified\n"
-msgstr "ホスト�を指定���れ��り��ん\n"
-
-#: fe-auth.c:438
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "�複�るGSS�証�求\n"
 
-#: fe-auth.c:458
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "GSSAPI��イン�ートエラー"
 
-#: fe-auth.c:544
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "SSPI続行エラー"
 
-#: fe-auth.c:555 fe-auth.c:629 fe-auth.c:663 fe-auth.c:760 fe-connect.c:1802
-#: fe-connect.c:3129 fe-connect.c:3346 fe-connect.c:3762 fe-connect.c:3771
-#: fe-connect.c:3908 fe-connect.c:3954 fe-connect.c:3972 fe-connect.c:4051
-#: fe-connect.c:4121 fe-connect.c:4167 fe-connect.c:4185 fe-exec.c:3121
-#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:757 fe-connect.c:1961
+#: fe-connect.c:3360 fe-connect.c:3578 fe-connect.c:3999 fe-connect.c:4008
+#: fe-connect.c:4145 fe-connect.c:4191 fe-connect.c:4209 fe-connect.c:4288
+#: fe-connect.c:4358 fe-connect.c:4404 fe-connect.c:4422 fe-exec.c:3140
+#: fe-exec.c:3305 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "メモリ�足��\n"
 
-#: fe-auth.c:644
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "SSPI資格を入手����ん���"
 
-#: fe-auth.c:736
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "SCM_CRED�証方��サ�ート�れ����ん\n"
 
-#: fe-auth.c:810
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Kerberos 4�証�サ�ート�れ����ん\n"
 
-#: fe-auth.c:826
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Kerberos 5�証�サ�ート�れ����ん\n"
 
-#: fe-auth.c:893
+#: fe-auth.c:895
 msgid "GSSAPI authentication not supported\n"
 msgstr "GSSAPI�証�サ�ート�れ����ん\n"
 
-#: fe-auth.c:917
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "SSPI�証�サ�ート�れ����ん\n"
 
-#: fe-auth.c:924
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "Crypt�証�サ�ート�れ����ん\n"
 
-#: fe-auth.c:951
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "�証方�%u�サ�ート�れ����ん\n"
 
-#: fe-connect.c:712
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "sslmode�値�無効��: \"%s\"\n"
 
-#: fe-connect.c:733
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "SSLサ�ート�組�込�れ����場�sslmode�値\"%s\"�無効��\n"
 
-#: fe-connect.c:916
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "TCPソケットを��延モード�設定����ん���: %s\n"
 
-#: fe-connect.c:946
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -117,7 +117,18 @@ msgstr ""
 "                              Unixドメインソケット\"%s\"�通信を��付���"
 "���?\n"
 
-#: fe-connect.c:956
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"サー��接続����ん���: %s\n"
+"\tサー��ホスト \"%s\" (%s) �稼動���り�\n"
+"\t����ート %s � TCP/IP 接続を��付������?\n"
+
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -125,233 +136,254 @@ msgid ""
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "サー��接続����ん���: %s\n"
-"                              サー��ホスト\"%s\"�稼動������?\n"
-"                              ����ート%s�TCP/IP接続を��付�����"
+"\tサー��ホスト\"%s\"�稼動������?\n"
+"\t����ート%s�TCP/IP接続を��付�����"
 "�?\n"
 
-#: fe-connect.c:1011
+#: fe-connect.c:1117
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE)�失敗����: %s\n"
 
-#: fe-connect.c:1024
+#: fe-connect.c:1130
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPALIVE)�失敗����: %s\n"
 
-#: fe-connect.c:1056
+#: fe-connect.c:1162
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL)�失敗����: %s\n"
 
-#: fe-connect.c:1088
+#: fe-connect.c:1194
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT)�失敗����: %s\n"
 
-#: fe-connect.c:1137
+#: fe-connect.c:1242
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS)�失敗����:%ui\n"
 
-#: fe-connect.c:1189
+#: fe-connect.c:1294
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "無効��ート番���: \"%s\"\n"
 
-#: fe-connect.c:1231
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "ホスト�\"%s\"をアドレス�変�����ん���: %s\n"
 
-#: fe-connect.c:1235
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "Unixドメインソケット�パス\"%s\"をアドレス�変�����ん���: %s\n"
 
-#: fe-connect.c:1444
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "接続状態�無効��。メモリ障害��能性��り��\n"
 
-#: fe-connect.c:1487
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "ソケットを作�����ん���: %s\n"
 
-#: fe-connect.c:1510
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "ソケットを�ブロッキングモード�設定����ん���: %s\n"
 
-#: fe-connect.c:1522
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "ソケットをclose-on-execモード�設定����ん���: %s\n"
 
-#: fe-connect.c:1540
+#: fe-connect.c:1647
 msgid "keepalives parameter must be an integer\n"
 msgstr "keepalive�パラメータ�整数���れ��り��ん\n"
 
-#: fe-connect.c:1553
+#: fe-connect.c:1660
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE)�失敗����: %s\n"
 
-#: fe-connect.c:1694
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "ソケット�エラー状態を入手����ん���: %s\n"
 
-#: fe-connect.c:1732
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "ソケット�らクライアントアドレスを入手����ん���: %s\n"
 
-#: fe-connect.c:1776
+#: fe-connect.c:1880
+#, 
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr ""
+"��プラットフォーム�� requirepeer パラメータ�サ�ート�れ����ん\n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "ピア�資格証明を入手����ん���: %s\n"
+
+#: fe-connect.c:1893
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "ID %d を��ローカルユーザ�存在���ん\n"
+
+#: fe-connect.c:1901
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr ""
+
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "SSL調�パケットを�信����ん���: %s\n"
 
-#: fe-connect.c:1815
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "開始パケットを�信����ん���: %s\n"
 
-#: fe-connect.c:1882 fe-connect.c:1901
+#: fe-connect.c:2041 fe-connect.c:2060
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "サー��SSLをサ�ート�����ん��SSL��求�れ���\n"
 
-#: fe-connect.c:1917
+#: fe-connect.c:2076
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "SSL調��対��無効�応答を�信����: %c\n"
 
-#: fe-connect.c:1993 fe-connect.c:2026
+#: fe-connect.c:2152 fe-connect.c:2185
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "サー��ら��証�求を想定��������%cを�信����\n"
 
-#: fe-connect.c:2197
+#: fe-connect.c:2358
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%i)"
 msgstr "GSSAPI�ッファ�割り当�時�メモリ�足(%i)"
 
-#: fe-connect.c:2282
+#: fe-connect.c:2443
 msgid "unexpected message from server during startup\n"
 msgstr "起動時�サー��ら想定外�メッセージ��り���\n"
 
-#: fe-connect.c:2378
+#: fe-connect.c:2539
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr "接続状態%d�無効��。メモリ障害��能性��り��\n"
 
-#: fe-connect.c:2737 fe-connect.c:2797
+#: fe-connect.c:2968 fe-connect.c:3028
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEVT_CONNRESETイベント中�PGEventProc \"%s\"�失敗����\n"
 
-#: fe-connect.c:3142
+#: fe-connect.c:3373
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "無効�LDAP URL\"%s\":スキーマ�ldap://���れ��り��ん\n"
 
-#: fe-connect.c:3157
+#: fe-connect.c:3388
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "無効�LDAP URL \"%s\": 区別���り��ん\n"
 
-#: fe-connect.c:3168 fe-connect.c:3221
+#: fe-connect.c:3399 fe-connect.c:3452
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "無効�LDAP URL \"%s\": 正確�1��属性を����れ��り��ん\n"
 
-#: fe-connect.c:3178 fe-connect.c:3235
+#: fe-connect.c:3409 fe-connect.c:3466
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr ""
 "無効�LDAP URL \"%s\": 検索スコープ(base/one/sub)を����れ��り��ん\n"
 
-#: fe-connect.c:3189
+#: fe-connect.c:3420
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "無効�LDAP URL \"%s\": フィルタ��り��ん\n"
 
-#: fe-connect.c:3210
+#: fe-connect.c:3441
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "無効�LDAP URL \"%s\": �ート番��無効��\n"
 
-#: fe-connect.c:3244
+#: fe-connect.c:3475
 msgid "could not create LDAP structure\n"
 msgstr "LDAP構造体を作�����ん���: %s\n"
 
-#: fe-connect.c:3286
+#: fe-connect.c:3517
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "LDAPサー��検索�失敗����: %s\n"
 
-#: fe-connect.c:3297
+#: fe-connect.c:3528
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "LDAP検索�果�複数�り���\n"
 
-#: fe-connect.c:3298 fe-connect.c:3310
+#: fe-connect.c:3529 fe-connect.c:3541
 msgid "no entry found on LDAP lookup\n"
 msgstr "LDAP検索�果�空���\n"
 
-#: fe-connect.c:3321 fe-connect.c:3334
+#: fe-connect.c:3552 fe-connect.c:3565
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "LDAP検索�属性�値��り��ん���\n"
 
-#: fe-connect.c:3385 fe-connect.c:3403 fe-connect.c:3810
+#: fe-connect.c:3617 fe-connect.c:3636 fe-connect.c:4047
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "接続情報文字列����\"%s\"�後�\"=\"��り��ん���\n"
 
-#: fe-connect.c:3466 fe-connect.c:3892 fe-connect.c:4076
+#: fe-connect.c:3700 fe-connect.c:4129 fe-connect.c:4313
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "接続オプション\"%s\"�無効��\n"
 
-#: fe-connect.c:3479 fe-connect.c:3859
+#: fe-connect.c:3716 fe-connect.c:4096
 msgid "unterminated quoted string in connection info string\n"
 msgstr "接続情報文字列����閉�����引用符��り���\n"
 
-#: fe-connect.c:3518
+#: fe-connect.c:3755
 msgid "could not get home directory to locate service definition file"
 msgstr ""
 "サー�設定ファイル�場所を特定�よ��������ホームディレクトリを�得�"
 "���ん���。"
 
-#: fe-connect.c:3551
+#: fe-connect.c:3788
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "サービス定義\"%s\"����り��ん\n"
 
-#: fe-connect.c:3574
+#: fe-connect.c:3811
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "サービスファイル\"%s\"����り��ん\n"
 
-#: fe-connect.c:3587
+#: fe-connect.c:3824
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "サービスファイル\"%2$s\"�行%1$d�長����。\n"
 
-#: fe-connect.c:3658 fe-connect.c:3685
+#: fe-connect.c:3895 fe-connect.c:3922
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "サービスファイル\"%s\"�行%d�構文エラー��り��\n"
 
-#: fe-connect.c:4352
+#: fe-connect.c:4589
 msgid "connection pointer is NULL\n"
 msgstr "接続�インタ�NULL��\n"
 
-#: fe-connect.c:4625
+#: fe-connect.c:4866
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "WARNING: パスワードファイル\"%s\"�テキストファイル���り��ん\n"
 
-#: fe-connect.c:4634
+#: fe-connect.c:4875
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
@@ -360,95 +392,100 @@ msgstr ""
 "警告: パスワードファイル \"%s\" �グループメン�も���他�ユーザ�ら読�る"
 "状態�������。��権��u=rw (0600)以下������\n"
 
-#: fe-connect.c:4722
+#: fe-connect.c:4963
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "ファイル\"%s\"�らパスワードを読�込����\n"
 
-#: fe-exec.c:827
+#: fe-exec.c:829
 msgid "NOTICE"
 msgstr "注�"
 
-#: fe-exec.c:1014 fe-exec.c:1071 fe-exec.c:1111
+#: fe-exec.c:1016 fe-exec.c:1073 fe-exec.c:1113
 msgid "command string is a null pointer\n"
 msgstr "コマンド文字列�ヌル�インタ��\n"
 
-#: fe-exec.c:1104 fe-exec.c:1199
+#: fe-exec.c:1106 fe-exec.c:1201
 msgid "statement name is a null pointer\n"
 msgstr "文����ヌル�インタ��\n"
 
-#: fe-exec.c:1119 fe-exec.c:1273 fe-exec.c:1928 fe-exec.c:2125
+#: fe-exec.c:1121 fe-exec.c:1275 fe-exec.c:1944 fe-exec.c:2142
 msgid "function requires at least protocol version 3.0\n"
 msgstr "関数�少���もプロトコル�ージョン3.0�必���\n"
 
-#: fe-exec.c:1230
+#: fe-exec.c:1232
 msgid "no connection to the server\n"
 msgstr "サー���接続��り��ん\n"
 
-#: fe-exec.c:1237
+#: fe-exec.c:1239
 msgid "another command is already in progress\n"
 msgstr "他�コマンドを処������\n"
 
-#: fe-exec.c:1349
+#: fe-exec.c:1351
 msgid "length must be given for binary parameter\n"
 msgstr "�イナリパラメータ��長�を指定���れ��り��ん\n"
 
-#: fe-exec.c:1596
+#: fe-exec.c:1604
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "想定外�asyncStatus: %d\n"
 
-#: fe-exec.c:1616
+#: fe-exec.c:1624
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEVT_RESULTCREATEイベント中�PGEventProc \"%s\"�失敗����\n"
 
-#: fe-exec.c:1746
+#: fe-exec.c:1754
 msgid "COPY terminated by new PQexec"
 msgstr "新��PQexec\"�よりCOPY�終了����"
 
-#: fe-exec.c:1754
+#: fe-exec.c:1762
 msgid "COPY IN state must be terminated first\n"
 msgstr "��COPY IN状態を終了����れ��り��ん\n"
 
-#: fe-exec.c:1774
+#: fe-exec.c:1782
 msgid "COPY OUT state must be terminated first\n"
 msgstr "��COPY OUT状態を終了����れ��り��ん\n"
 
-#: fe-exec.c:2016 fe-exec.c:2082 fe-exec.c:2167 fe-protocol2.c:1172
-#: fe-protocol3.c:1557
+#: fe-exec.c:1790
+#, 
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "COPY BOTH 実行中� PQexec �許��れ����ん\n"
+
+#: fe-exec.c:2033 fe-exec.c:2099 fe-exec.c:2186 fe-protocol2.c:1237
+#: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "実行中�COPY��り��ん\n"
 
-#: fe-exec.c:2359
+#: fe-exec.c:2378
 msgid "connection in wrong state\n"
 msgstr "接続状態�異常��\n"
 
-#: fe-exec.c:2390
+#: fe-exec.c:2409
 msgid "invalid ExecStatusType code"
 msgstr "ExecStatusTypeコード�無効��"
 
-#: fe-exec.c:2454 fe-exec.c:2477
+#: fe-exec.c:2473 fe-exec.c:2496
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "列番�%d�0..%d�範囲を超�����"
 
-#: fe-exec.c:2470
+#: fe-exec.c:2489
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "行番�%d�0..%d�範囲を超�����"
 
-#: fe-exec.c:2492
+#: fe-exec.c:2511
 #, c-format
 msgid "parameter number %d is out of range 0..%d"
 msgstr "パラメータ%d�0..%d�範囲を超�����"
 
-#: fe-exec.c:2780
+#: fe-exec.c:2799
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "サー��ら��果を解釈����ん���: %s"
 
-#: fe-exec.c:3019 fe-exec.c:3103
+#: fe-exec.c:3038 fe-exec.c:3122
 msgid "incomplete multibyte character\n"
 msgstr "�完全�マル��イト文字\n"
 
@@ -512,26 +549,26 @@ msgstr "loread関数�OIDを決定����ん\n"
 msgid "cannot determine OID of function lowrite\n"
 msgstr "lowrite関数�OIDを決定����ん\n"
 
-#: fe-misc.c:262
+#: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "サイズ%lu�整数�pqGetInt�サ�ート�れ����ん"
 
-#: fe-misc.c:298
+#: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "サイズ%lu�整数�pqPutInt�サ�ート�れ����ん"
 
-#: fe-misc.c:578 fe-misc.c:780
+#: fe-misc.c:586 fe-misc.c:788
 msgid "connection not open\n"
 msgstr "接続�オープン�れ����ん\n"
 
-#: fe-misc.c:643 fe-misc.c:733
+#: fe-misc.c:651 fe-misc.c:741
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "サー��らデータを�信����ん���: %s\n"
 
-#: fe-misc.c:750 fe-misc.c:828
+#: fe-misc.c:758 fe-misc.c:836
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -541,45 +578,45 @@ msgstr ""
 "        ��ら��求�処�����処�中�サー��異常終了\n"
 "        ����を�味�����。\n"
 
-#: fe-misc.c:845
+#: fe-misc.c:853
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "サー��データを�信����ん���: %s\n"
 
-#: fe-misc.c:964
+#: fe-misc.c:972
 msgid "timeout expired\n"
 msgstr "タイムアウト期間������\n"
 
-#: fe-misc.c:1009
+#: fe-misc.c:1017
 msgid "socket not open\n"
 msgstr "ソケット�オープン�れ����ん\n"
 
-#: fe-misc.c:1032
+#: fe-misc.c:1040
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select()�失敗����: %s\n"
 
-#: fe-protocol2.c:89
+#: fe-protocol2.c:91
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "setenv状態%c�無効��。メモリ障害��能性��り��\n"
 
-#: fe-protocol2.c:330
+#: fe-protocol2.c:390
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "状態%c�無効��。メモリ障害��能性��り��\n"
 
-#: fe-protocol2.c:419 fe-protocol3.c:186
+#: fe-protocol2.c:479 fe-protocol3.c:186
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "待機中�サー��らメッセージ種類0x%02x�届����"
 
-#: fe-protocol2.c:462
+#: fe-protocol2.c:522
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
 msgstr "空������応答(\"I\"メッセージ)�後�想定外�文字%c��り���"
 
-#: fe-protocol2.c:516
+#: fe-protocol2.c:576
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)"
@@ -587,7 +624,7 @@ msgstr ""
 "サー��事��行記述(\"T\"メッセージ)���データ(\"D\"メッセージ)を�信��"
 "��"
 
-#: fe-protocol2.c:532
+#: fe-protocol2.c:592
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)"
@@ -595,25 +632,25 @@ msgstr ""
 "サー��事��行記述(\"T\"メッセージ)����イナリデータ(\"B\"メッセージ)を"
 "�信����"
 
-#: fe-protocol2.c:547 fe-protocol3.c:382
+#: fe-protocol2.c:612 fe-protocol3.c:388
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "サー��ら想定外�応答��り���。��付��先頭文字�\"%c\"��\n"
 
-#: fe-protocol2.c:768 fe-protocol3.c:701
+#: fe-protocol2.c:833 fe-protocol3.c:707
 msgid "out of memory for query result\n"
 msgstr "������果用�メモリ��足�����\n"
 
-#: fe-protocol2.c:1215 fe-protocol3.c:1625
+#: fe-protocol2.c:1280 fe-protocol3.c:1637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-protocol2.c:1227
+#: fe-protocol2.c:1292
 msgid "lost synchronization with server, resetting connection"
 msgstr "サー���動機�失�れ���。接続をリセット�����"
 
-#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
+#: fe-protocol2.c:1426 fe-protocol2.c:1458 fe-protocol3.c:1840
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "プロトコルエラー: id=0x%x\n"
@@ -626,67 +663,67 @@ msgstr ""
 "サー��事��行記述(\"T\"メッセージ)���データ(\"D\"メッセージ)を�信��"
 "��\"\n"
 
-#: fe-protocol3.c:403
+#: fe-protocol3.c:409
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr "メッセージ�内容�メッセージ種類\"%c\"�長������ん\n"
 
-#: fe-protocol3.c:424
+#: fe-protocol3.c:430
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "サー����期�失�れ���。�信��メッセージ種類�\"%c\"�長��%d\n"
 
-#: fe-protocol3.c:646
+#: fe-protocol3.c:652
 msgid "unexpected field count in \"D\" message\n"
 msgstr "\"D\"メッセージ内�フィールド数�想定外���\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:788 fe-protocol3.c:807
+#: fe-protocol3.c:798 fe-protocol3.c:817
 #, c-format
 msgid " at character %s"
 msgstr "(文字�置: %s)"
 
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETAIL:  %s\n"
 
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "HINT:  %s\n"
 
-#: fe-protocol3.c:826
+#: fe-protocol3.c:836
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "QUERY:  %s\n"
 
-#: fe-protocol3.c:829
+#: fe-protocol3.c:839
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXT:  %s\n"
 
-#: fe-protocol3.c:841
+#: fe-protocol3.c:851
 msgid "LOCATION:  "
 msgstr "LOCATION:  "
 
-#: fe-protocol3.c:843
+#: fe-protocol3.c:853
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:845
+#: fe-protocol3.c:855
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1069
+#: fe-protocol3.c:1079
 #, c-format
 msgid "LINE %d: "
 msgstr "行 %d: "
 
-#: fe-protocol3.c:1453
+#: fe-protocol3.c:1465
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: テキスト�COPY OUTを行�����ん\n"
 
@@ -695,29 +732,29 @@ msgstr "PQgetline: テキスト�COPY OUTを行�����ん\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "SSL接続を確立����ん���: %s\n"
 
-#: fe-secure.c:349 fe-secure.c:436 fe-secure.c:1162
+#: fe-secure.c:349 fe-secure.c:436 fe-secure.c:1180
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALLエラー: %s\n"
 
-#: fe-secure.c:355 fe-secure.c:442 fe-secure.c:1166
+#: fe-secure.c:355 fe-secure.c:442 fe-secure.c:1184
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALLエラー: EOFを検知\n"
 
-#: fe-secure.c:367 fe-secure.c:453 fe-secure.c:1175
+#: fe-secure.c:367 fe-secure.c:453 fe-secure.c:1193
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSLエラー: %s\n"
 
-#: fe-secure.c:377 fe-secure.c:463 fe-secure.c:1184
+#: fe-secure.c:377 fe-secure.c:463 fe-secure.c:1202
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "�明�SSLエラーコード: %d\n"
 
 #: fe-secure.c:601
-msgid ""
-"verified SSL connections are only supported when connecting to a host name\n"
-msgstr "検証�れ�SSL接続�ホスト���接続時��サ�ート�れ��\n"
+#, 
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "SSL 接続を検証�る���ホスト�を指定���れ��り��ん\n"
 
 #: fe-secure.c:620
 #, c-format
@@ -729,12 +766,6 @@ msgstr "サー��正��(common name)\"%s\"�ホスト�\"%s\"�一致
 msgid "could not create SSL context: %s\n"
 msgstr "SSLコンテキストを作�����ん���: %s\n"
 
-#: fe-secure.c:843
-msgid "could not get home directory to locate client certificate files\n"
-msgstr ""
-"クライアント証明書ファイル�場所を特定�よ��������ホームディレクトリ"
-"を�得����ん���\n"
-
 #: fe-secure.c:868
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
@@ -766,12 +797,12 @@ msgstr ""
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "SSL秘密キー\"%s\"をエンジン\"%s\"�ら読��れ��ん���: %s\n"
 
-#: fe-secure.c:1017
+#: fe-secure.c:1019
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "証明書��り�����秘密キーファイル\"%s\"��り��ん���\n"
 
-#: fe-secure.c:1025
+#: fe-secure.c:1027
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; permissions should be "
@@ -780,27 +811,38 @@ msgstr ""
 "警告：秘密キーファイル \"%s\" �グループメン�や第三者�ら読�る状態����"
 "���。��権��u=rw (0600)����れ以下������\n"
 
-#: fe-secure.c:1036
+#: fe-secure.c:1038
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "秘密キーファイル\"%s\"をロード����ん���: %s\n"
 
-#: fe-secure.c:1050
+#: fe-secure.c:1052
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "証明書�秘密キーファイル\"%s\"�一致���ん: %s\n"
 
-#: fe-secure.c:1075
+#: fe-secure.c:1080
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "ルート証明書\"%s\"を読��れ��ん���: %s\n"
 
-#: fe-secure.c:1099
+#: fe-secure.c:1107
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "SSLライブラリ�CRL証明書（\"%s\"）をオープン����ん���\n"
 
-#: fe-secure.c:1120
+#: fe-secure.c:1134
+#, 
+msgid ""
+"could not get home directory to locate root certificate file\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"ルート証明書ファイルを置����ホームディレクトリ�存在���ん。\n"
+"ファイルを用��る��サー�証明書�検証を無効��るよ�� sslmode を"
+"変更������\n"
+
+#: fe-secure.c:1138
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -811,20 +853,30 @@ msgstr ""
 "ファイルを用��る�サー�証明書�検証を無効��るよ��sslmodeを変更����"
 "��\n"
 
-#: fe-secure.c:1203
+#: fe-secure.c:1221
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "証明書を入手����ん���: %s\n"
 
-#: fe-secure.c:1231
+#: fe-secure.c:1249
 msgid "SSL certificate's common name contains embedded null\n"
 msgstr "SSL 証明書�コモン�ーム� null ���れ����\n"
 
-#: fe-secure.c:1307
+#: fe-secure.c:1325
 msgid "no SSL error reported"
 msgstr "SSLエラー��り��ん���"
 
-#: fe-secure.c:1316
+#: fe-secure.c:1334
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSLエラーコード: %lu"
+
+#~ msgid ""
+#~ "verified SSL connections are only supported when connecting to a host "
+#~ "name\n"
+#~ msgstr "検証�れ�SSL接続�ホスト���接続時��サ�ート�れ��\n"
+
+#~ msgid "could not get home directory to locate client certificate files\n"
+#~ msgstr ""
+#~ "クライアント証明書ファイル�場所を特定�よ��������ホームディレクト"
+#~ "リを�得����ん���\n"
diff --git a/src/interfaces/libpq/po/pl.po b/src/interfaces/libpq/po/pl.po
new file mode 100644
index 0000000000000..48f14ecb17c92
--- /dev/null
+++ b/src/interfaces/libpq/po/pl.po
@@ -0,0 +1,938 @@
+# LIBPQ Translated Messages into the Polish Language
+# Copyright (c) 2005 toczek, xxxtoczekxxx@wp.pl
+# Distributed under the same licensing terms as PostgreSQL itself.
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: libpq (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-10-08 08:43+0000\n"
+"PO-Revision-Date: 2011-10-09 18:00+0200\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Begina Felicysym\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
+msgid "host name must be specified\n"
+msgstr "nazwa hosta musi być określona\n"
+
+#: fe-auth.c:240
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "nie można ustawić gniazda w tryb blokowania: %s\n"
+
+#: fe-auth.c:258 fe-auth.c:262
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "Kerberos 5 autoryzacja odrzucona: %*s\n"
+
+#: fe-auth.c:288
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "nie można odtworzyć trybu nieblokowanego gniazda: %s\n"
+
+#: fe-auth.c:400
+msgid "GSSAPI continuation error"
+msgstr "błąd kontynuowania GSSAPI"
+
+#: fe-auth.c:436
+msgid "duplicate GSS authentication request\n"
+msgstr "podwójne żądanie autoryzacji GSS\n"
+
+#: fe-auth.c:456
+msgid "GSSAPI name import error"
+msgstr "błąd importu nazwy GSSAPI"
+
+#: fe-auth.c:542
+msgid "SSPI continuation error"
+msgstr "błąd kontynuowania SSPI"
+
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:757 fe-connect.c:1961
+#: fe-connect.c:3368 fe-connect.c:3586 fe-connect.c:4007 fe-connect.c:4016
+#: fe-connect.c:4153 fe-connect.c:4199 fe-connect.c:4217 fe-connect.c:4296
+#: fe-connect.c:4366 fe-connect.c:4412 fe-connect.c:4430 fe-exec.c:3121
+#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
+msgid "out of memory\n"
+msgstr "brak pamięci\n"
+
+#: fe-auth.c:642
+msgid "could not acquire SSPI credentials"
+msgstr "nie można nabyć poświadczeń SSPI"
+
+#: fe-auth.c:733
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "Metoda autoryzacji SCM_CRED nie jest dostępna\n"
+
+#: fe-auth.c:807
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "metoda autoryzacji Kerberos 4 nie jest dostępna\n"
+
+#: fe-auth.c:823
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "metoda autoryzacji Kerberos 5 nie jest dostępna\n"
+
+#: fe-auth.c:895
+msgid "GSSAPI authentication not supported\n"
+msgstr "Metoda autoryzacji GSSAPI nie jest dostępna\n"
+
+#: fe-auth.c:927
+msgid "SSPI authentication not supported\n"
+msgstr "Metoda autoryzacji SSPI nie jest dostępna\n"
+
+#: fe-auth.c:935
+msgid "Crypt authentication not supported\n"
+msgstr "metoda autoryzacji Crypt nie jest dostępna\n"
+
+#: fe-auth.c:962
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "metoda autoryzacji %u nie jest dostępna\n"
+
+#: fe-connect.c:758
+#, c-format
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "błędna wartość sslmode: \"%s\"\n"
+
+#: fe-connect.c:779
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr ""
+"błędna wartość sslmode \"%s\" gdyż obsługa SSL nie została skompilowana\n"
+
+#: fe-connect.c:972
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "nie można ustawić gniazda TCP w tryb bez opóźnień: %s\n"
+
+#: fe-connect.c:1002
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running locally and accepting\n"
+"\tconnections on Unix domain socket \"%s\"?\n"
+msgstr ""
+"nie można połączyć się z serwerem: %s\n"
+"\tCzy serwer działa lokalnie i akceptuje\n"
+"\tpołączenia przy pomocy gniazd dziedziny Uniksa \"%s\"?\n"
+
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"nie można połączyć się z serwerem: %s\n"
+"\tCzy serwer działa na serwerze \"%s\" (%s) i akceptuje\n"
+"\tpołączenia TCP/IP na porcie %s?\n"
+
+#: fe-connect.c:1066
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"nie można połączyć się z serwerem: %s\n"
+"\tCzy serwer działa na stacji sieciowej \"%s\" i akceptuje\n"
+"\tpołączenia TCP/IP na porcie %s?\n"
+
+#: fe-connect.c:1117
+#, c-format
+msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
+msgstr "nie powiodło się setsockopt(TCP_KEEPIDLE): %s\n"
+
+#: fe-connect.c:1130
+#, c-format
+msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
+msgstr "nie powiodło się setsockopt(TCP_KEEPALIVE): %s\n"
+
+#: fe-connect.c:1162
+#, c-format
+msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
+msgstr "nie powiodło się setsockopt(TCP_KEEPINTVL): %s\n"
+
+#: fe-connect.c:1194
+#, c-format
+msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
+msgstr "nie powiodło się setsockopt(TCP_KEEPCNT): %s\n"
+
+#: fe-connect.c:1242
+#, c-format
+msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
+msgstr "nie powiodło się WSAIoctl(SIO_KEEPALIVE_VALS): %ui\n"
+
+#: fe-connect.c:1294
+#, c-format
+msgid "invalid port number: \"%s\"\n"
+msgstr "nieprawidłowy numer portu: \"%s\"\n"
+
+#: fe-connect.c:1337
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s\n"
+msgstr "nie można przetłumaczyć nazwy hosta \"%s\" na adres: %s\n"
+
+#: fe-connect.c:1341
+#, c-format
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr ""
+"nie można przetłumaczyć ścieżki gniazda domeny Uniks \"%s\" na adres: %s\n"
+
+#: fe-connect.c:1551
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr ""
+"błędny stan połączenia, prawdopodobnie oznajmiający uszkodzenie pamięci\n"
+
+#: fe-connect.c:1592
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "nie można utworzyć gniazda: %s\n"
+
+#: fe-connect.c:1615
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "nie można ustawić gniazda w tryb nieblokujący: %s\n"
+
+#: fe-connect.c:1627
+#, c-format
+msgid "could not set socket to close-on-exec mode: %s\n"
+msgstr "nie można ustawić gniazda obsługi zamknięcia przy uruchomieniu: %s\n"
+
+#: fe-connect.c:1647
+msgid "keepalives parameter must be an integer\n"
+msgstr "parametr keepalives musi być liczbą całkowitą\n"
+
+#: fe-connect.c:1660
+#, c-format
+msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
+msgstr "nie powiodło się setsockopt(SO_KEEPALIVE): %s\n"
+
+#: fe-connect.c:1801
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "nie można otrzymać błędu gniazda: %s\n"
+
+#: fe-connect.c:1839
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr "nie można otrzymać adresu klienta z gniazda: %s\n"
+
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "parametr requirepeer nie jest obsługiwany na tej platformie\n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "nie można pobrać poświadczeń wzajemnych: %s\n"
+
+#: fe-connect.c:1893
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "lokalny użytkownik o ID %d nie istnieje\n"
+
+#: fe-connect.c:1901
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr ""
+"requirepeer wskazuje \"%s\", ale nazwa bieżącego użytkownika równorzędnego "
+"to \"%s\"\n"
+
+#: fe-connect.c:1935
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "nie można wysłać pakietu negocjacji SSL: %s\n"
+
+#: fe-connect.c:1974
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "nie można wysłać pakietu rozpoczynającego: %s\n"
+
+#: fe-connect.c:2044
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "serwer nie obsługuje SSL, ale SSL było wymagane\n"
+
+#: fe-connect.c:2070
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "otrzymano niepoprawną odpowiedź negocjacji SSL: %c\n"
+
+#: fe-connect.c:2149 fe-connect.c:2182
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr "oczekiwano prośby autoryzacji z serwera ale otrzymano %c\n"
+
+#: fe-connect.c:2363
+#, c-format
+msgid "out of memory allocating GSSAPI buffer (%i)"
+msgstr "brak pamięci podczas alokacji buforu GSSAPI (%i)"
+
+#: fe-connect.c:2448
+msgid "unexpected message from server during startup\n"
+msgstr "niespodziewana wiadomość z serwera podczas startu\n"
+
+#: fe-connect.c:2547
+#, c-format
+msgid "invalid connection state %d, probably indicative of memory corruption\n"
+msgstr ""
+"nieprawidłowy stan połączenia %d, prawdopodobnie wskazujący na uszkodzenie "
+"pamięci\n"
+
+#: fe-connect.c:2976 fe-connect.c:3036
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
+msgstr "PGEventProc \"%s\" zawiodła podczas zdarzenia PGEVT_CONNRESET\n"
+
+#: fe-connect.c:3381
+#, c-format
+msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
+msgstr "Niepoprawny adres URL LDAP \"%s\": schemat musi być ldap://\n"
+
+#: fe-connect.c:3396
+#, c-format
+msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
+msgstr "niepoprawny adres URL LDAP \"%s\": brakująca nazwa wyróżniająca\n"
+
+#: fe-connect.c:3407 fe-connect.c:3460
+#, c-format
+msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
+msgstr "niepoprawny adres URL LDAP \"%s\": musi mieć dokładnie jeden atrybut\n"
+
+#: fe-connect.c:3417 fe-connect.c:3474
+#, c-format
+msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
+msgstr ""
+"niepoprawny adres URL LDAP \"%s\": musi mieć zakres wyszukiwania (base/one/"
+"sub)\n"
+
+#: fe-connect.c:3428
+#, c-format
+msgid "invalid LDAP URL \"%s\": no filter\n"
+msgstr "niepoprawny adres URL LDAP \"%s\": brak filtra\n"
+
+#: fe-connect.c:3449
+#, c-format
+msgid "invalid LDAP URL \"%s\": invalid port number\n"
+msgstr "niepoprawny adres URL LDAP \"%s\": niepoprawny numer portu\n"
+
+#: fe-connect.c:3483
+msgid "could not create LDAP structure\n"
+msgstr "nie można utworzyć struktury LDAP\n"
+
+#: fe-connect.c:3525
+#, c-format
+msgid "lookup on LDAP server failed: %s\n"
+msgstr "przeszukiwanie LDAP nie powiodło się: %s\n"
+
+#: fe-connect.c:3536
+msgid "more than one entry found on LDAP lookup\n"
+msgstr "ponad jeden wpis znaleziono podczas przeszukiwania LDAP\n"
+
+#: fe-connect.c:3537 fe-connect.c:3549
+msgid "no entry found on LDAP lookup\n"
+msgstr "nie znaleziono wpisu podczas przeszukiwania LDAP\n"
+
+#: fe-connect.c:3560 fe-connect.c:3573
+msgid "attribute has no values on LDAP lookup\n"
+msgstr "atrybut nie ma wartości w przeszukiwaniu LDAP\n"
+
+#: fe-connect.c:3625 fe-connect.c:3644 fe-connect.c:4055
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr "brakujące \"=\" po \"%s\" w łańcuchu informacyjnym połączenia\n"
+
+#: fe-connect.c:3708 fe-connect.c:4137 fe-connect.c:4321
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "błędna opcja połączenia \"%s\"\n"
+
+#: fe-connect.c:3724 fe-connect.c:4104
+msgid "unterminated quoted string in connection info string\n"
+msgstr "niezamknięty cudzysłów w łańcuchu informacyjnym połączenia\n"
+
+#: fe-connect.c:3763
+msgid "could not get home directory to locate service definition file"
+msgstr ""
+"nie można pobrać katalogu domowego aby zlokalizować plik definicji usługi"
+
+#: fe-connect.c:3796
+#, c-format
+msgid "definition of service \"%s\" not found\n"
+msgstr "nie znaleziono definicji usługi \"%s\"\n"
+
+#: fe-connect.c:3819
+#, c-format
+msgid "service file \"%s\" not found\n"
+msgstr "nie znaleziono pliku usługi \"%s\"\n"
+
+#: fe-connect.c:3832
+#, c-format
+msgid "line %d too long in service file \"%s\"\n"
+msgstr "zbyt długa linia %d w pliku usługi \"%s\"\n"
+
+#: fe-connect.c:3903 fe-connect.c:3930
+#, c-format
+msgid "syntax error in service file \"%s\", line %d\n"
+msgstr "błąd składni w pliku usługi \"%s\", linia %d\n"
+
+#: fe-connect.c:4597
+msgid "connection pointer is NULL\n"
+msgstr "wskaźnik połączenia ma wartość NULL\n"
+
+#: fe-connect.c:4874
+#, c-format
+msgid "WARNING: password file \"%s\" is not a plain file\n"
+msgstr "OSTRZEŻENIE: plik hasła \"%s\" nie jest zwykłym plikiem\n"
+
+#: fe-connect.c:4883
+#, c-format
+msgid ""
+"WARNING: password file \"%s\" has group or world access; permissions should "
+"be u=rw (0600) or less\n"
+msgstr ""
+"UWAGA: plik hasła \"%s\" posiada globalne lub grupowe uprawnienia odczytu;\n"
+"uprawniania powinny być ustawione na u=rw (0600) lub niżej\n"
+
+#: fe-connect.c:4971
+#, c-format
+msgid "password retrieved from file \"%s\"\n"
+msgstr "hasło odczytane z pliku \"%s\"\n"
+
+#: fe-exec.c:810
+msgid "NOTICE"
+msgstr "UWAGA"
+
+#: fe-exec.c:997 fe-exec.c:1054 fe-exec.c:1094
+msgid "command string is a null pointer\n"
+msgstr "łańcuch polecenia jest wskaźnikiem null\n"
+
+#: fe-exec.c:1087 fe-exec.c:1182
+msgid "statement name is a null pointer\n"
+msgstr "nazwa instrukcji jest wskaźnikiem null\n"
+
+#: fe-exec.c:1102 fe-exec.c:1256 fe-exec.c:1925 fe-exec.c:2123
+msgid "function requires at least protocol version 3.0\n"
+msgstr "funkcja wymaga przynajmniej protokołu w wersji 3.0\n"
+
+#: fe-exec.c:1213
+msgid "no connection to the server\n"
+msgstr "brak połączenia z serwerem\n"
+
+#: fe-exec.c:1220
+msgid "another command is already in progress\n"
+msgstr "inne polecenie jest aktualnie wykonywane\n"
+
+#: fe-exec.c:1332
+msgid "length must be given for binary parameter\n"
+msgstr "musi być podana długość parametru binarnego\n"
+
+#: fe-exec.c:1585
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "nieoczekiwany asyncStatus: %d\n"
+
+#: fe-exec.c:1605
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
+msgstr "PGEventProc \"%s\" zawiodła podczas zdarzenia PGEVT_RESULTCREATE\n"
+
+#: fe-exec.c:1735
+msgid "COPY terminated by new PQexec"
+msgstr "KOPIOWANIE zakończone przez nowe PQexec"
+
+#: fe-exec.c:1743
+msgid "COPY IN state must be terminated first\n"
+msgstr "stan COPY IN musi zostać wcześniej zakończony\n"
+
+#: fe-exec.c:1763
+msgid "COPY OUT state must be terminated first\n"
+msgstr "stan COPY OUT musi zostać wcześniej zakończony\n"
+
+#: fe-exec.c:1771
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "PQexec niedozwolone podczas COPY BOTH\n"
+
+#: fe-exec.c:2014 fe-exec.c:2080 fe-exec.c:2167 fe-protocol2.c:1237
+#: fe-protocol3.c:1569
+msgid "no COPY in progress\n"
+msgstr "brak KOPIOWANIA w toku\n"
+
+#: fe-exec.c:2359
+msgid "connection in wrong state\n"
+msgstr "połączenie posiada błędny stan\n"
+
+#: fe-exec.c:2390
+msgid "invalid ExecStatusType code"
+msgstr "błędny kod ExecStatusType"
+
+#: fe-exec.c:2454 fe-exec.c:2477
+#, c-format
+msgid "column number %d is out of range 0..%d"
+msgstr "numer kolumny %d wykracza poza zakres 0..%d"
+
+#: fe-exec.c:2470
+#, c-format
+msgid "row number %d is out of range 0..%d"
+msgstr "numer wiersza %d wykracza poza zakres 0..%d"
+
+#: fe-exec.c:2492
+#, c-format
+msgid "parameter number %d is out of range 0..%d"
+msgstr "numer parametru %d wykracza poza zakres 0..%d"
+
+#: fe-exec.c:2780
+#, c-format
+msgid "could not interpret result from server: %s"
+msgstr "nie można zinterpretować wyników z serwera: %s"
+
+#: fe-exec.c:3019 fe-exec.c:3103
+msgid "incomplete multibyte character\n"
+msgstr "niepełny znak wielobajtowy\n"
+
+#: fe-lobj.c:152
+msgid "cannot determine OID of function lo_truncate\n"
+msgstr "nie można ustalić OID funkcji lo_truncate\n"
+
+#: fe-lobj.c:380
+msgid "cannot determine OID of function lo_create\n"
+msgstr "nie można ustalić OID funkcji lo_create\n"
+
+#: fe-lobj.c:525 fe-lobj.c:624
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "nie można otworzyć pliku \"%s\": %s\n"
+
+#: fe-lobj.c:575
+#, c-format
+msgid "could not read from file \"%s\": %s\n"
+msgstr "nie można czytać z pliku \"%s\": %s\n"
+
+#: fe-lobj.c:639 fe-lobj.c:663
+#, c-format
+msgid "could not write to file \"%s\": %s\n"
+msgstr "nie można pisać do pliku \"%s\": %s\n"
+
+#: fe-lobj.c:744
+msgid "query to initialize large object functions did not return data\n"
+msgstr "zapytanie inicjujące duży obiekt nie zwróciło żadnych danych\n"
+
+#: fe-lobj.c:785
+msgid "cannot determine OID of function lo_open\n"
+msgstr "nie można ustalić OID funkcji lo_open\n"
+
+#: fe-lobj.c:792
+msgid "cannot determine OID of function lo_close\n"
+msgstr "nie można ustalić OID funkcji lo_close\n"
+
+#: fe-lobj.c:799
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "nie można ustalić OID funkcji lo_creat\n"
+
+#: fe-lobj.c:806
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "nie można ustalić OID funkcji lo_unlink\n"
+
+#: fe-lobj.c:813
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "nie można ustalić OID funkcji lo_lseek\n"
+
+#: fe-lobj.c:820
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "nie można ustalić OID funkcji lo_tell\n"
+
+#: fe-lobj.c:827
+msgid "cannot determine OID of function loread\n"
+msgstr "nie można ustalić OID funkcji loread\n"
+
+#: fe-lobj.c:834
+msgid "cannot determine OID of function lowrite\n"
+msgstr "nie można ustalić OID funkcji lowrite\n"
+
+#: fe-misc.c:270
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt"
+msgstr "typ integer o rozmiarze %lu nie jest obsługiwany przez pqGetInt"
+
+#: fe-misc.c:306
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt"
+msgstr "typ integer o rozmiarze %lu nie jest obsługiwany przez pqPutInt"
+
+#: fe-misc.c:585 fe-misc.c:784
+msgid "connection not open\n"
+msgstr "połączenie nie jest otwarte\n"
+
+#: fe-misc.c:711 fe-secure.c:364 fe-secure.c:443 fe-secure.c:524
+#: fe-secure.c:632
+msgid ""
+"server closed the connection unexpectedly\n"
+"\tThis probably means the server terminated abnormally\n"
+"\tbefore or while processing the request.\n"
+msgstr ""
+"serwer zamknął połączenie niespodziewanie\n"
+"\tOznacza to prawdopodobnie iż serwer zakończył działanie niepoprawnie\n"
+"\tprzed lub podczas przetwarzania zapytania.\n"
+
+#: fe-misc.c:948
+msgid "timeout expired\n"
+msgstr "upłynął limit czasu rządania\n"
+
+#: fe-misc.c:993
+msgid "socket not open\n"
+msgstr "gniazdo nie jest otwarte\n"
+
+#: fe-misc.c:1016
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "select() nie udało się: %s\n"
+
+#: fe-protocol2.c:91
+#, c-format
+msgid "invalid setenv state %c, probably indicative of memory corruption\n"
+msgstr ""
+"niepoprawny stan setenv %c, prawdopodobnie oznajmiający uszkodzenie pamięci\n"
+
+#: fe-protocol2.c:390
+#, c-format
+msgid "invalid state %c, probably indicative of memory corruption\n"
+msgstr "niepoprawny stan %c, prawdopodobnie oznajmiający uszkodzenie pamięci\n"
+
+#: fe-protocol2.c:479 fe-protocol3.c:186
+#, c-format
+msgid "message type 0x%02x arrived from server while idle"
+msgstr "otrzymano wiadomość typu 0x%02x z serwera podczas procesu bezczynności"
+
+#: fe-protocol2.c:522
+#, c-format
+msgid "unexpected character %c following empty query response (\"I\" message)"
+msgstr ""
+"nieznany znak %c następujący po odpowiedzi pustego zapytania (wiadomość \"I"
+"\")"
+
+#: fe-protocol2.c:576
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)"
+msgstr ""
+"serwer wysłał dane (wiadomość \"D\") bez wcześniejszego opisu wiersza "
+"(wiadomość \"T\")"
+
+#: fe-protocol2.c:592
+msgid ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)"
+msgstr ""
+"serwer wysłał dane binarne (wiadomość \"B\") bez wcześniejszego opisu "
+"wiersza (wiadomość \"T\")"
+
+#: fe-protocol2.c:612 fe-protocol3.c:388
+#, c-format
+msgid "unexpected response from server; first received character was \"%c\"\n"
+msgstr ""
+"nieznana odpowiedź z serwera: pierwszym znakiem otrzymanym był \"%c\"\n"
+
+#: fe-protocol2.c:833 fe-protocol3.c:707
+msgid "out of memory for query result\n"
+msgstr "brak pamięci dla rezultatów zapytania\n"
+
+#: fe-protocol2.c:1280 fe-protocol3.c:1637
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: fe-protocol2.c:1292
+msgid "lost synchronization with server, resetting connection"
+msgstr "utracono synchronizację z serwerem, resetuję połączenie"
+
+#: fe-protocol2.c:1426 fe-protocol2.c:1458 fe-protocol3.c:1840
+#, c-format
+msgid "protocol error: id=0x%x\n"
+msgstr "błąd protokołu: id=0x%x\n"
+
+#: fe-protocol3.c:344
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
+msgstr ""
+"serwer wysłał dane (wiadomość \"D\") bez wcześniejszego opisu wiersza "
+"(wiadomość \"T\")\n"
+
+#: fe-protocol3.c:409
+#, c-format
+msgid "message contents do not agree with length in message type \"%c\"\n"
+msgstr ""
+"zawartość wiadomości nie zgadza się z długością wiadomości typu \"%c\"\n"
+
+#: fe-protocol3.c:430
+#, c-format
+msgid "lost synchronization with server: got message type \"%c\", length %d\n"
+msgstr ""
+"utracono synchronizację z serwerem: otrzymano wiadomość typu\"%c\", długość "
+"%d\n"
+
+#: fe-protocol3.c:652
+msgid "unexpected field count in \"D\" message\n"
+msgstr "nieznane pole wyliczone w wiadomości \"D\"\n"
+
+#. translator: %s represents a digit string
+#: fe-protocol3.c:798 fe-protocol3.c:817
+#, c-format
+msgid " at character %s"
+msgstr " znak %s"
+
+#: fe-protocol3.c:830
+#, c-format
+msgid "DETAIL:  %s\n"
+msgstr "SZCZEGÓ�Y:  %s\n"
+
+#: fe-protocol3.c:833
+#, c-format
+msgid "HINT:  %s\n"
+msgstr "PODPOWIEDŹ:  %s\n"
+
+#: fe-protocol3.c:836
+#, c-format
+msgid "QUERY:  %s\n"
+msgstr "ZAPYTANIE:  %s\n"
+
+#: fe-protocol3.c:839
+#, c-format
+msgid "CONTEXT:  %s\n"
+msgstr "KONTEKST:  %s\n"
+
+#: fe-protocol3.c:851
+msgid "LOCATION:  "
+msgstr "PO�OŻENIE:  "
+
+#: fe-protocol3.c:853
+#, c-format
+msgid "%s, "
+msgstr "%s, "
+
+#: fe-protocol3.c:855
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#: fe-protocol3.c:1079
+#, c-format
+msgid "LINE %d: "
+msgstr "LINIA %d: "
+
+#: fe-protocol3.c:1465
+msgid "PQgetline: not doing text COPY OUT\n"
+msgstr "PQgetline: nie działam aktualnie w stanie COPY OUT\n"
+
+#: fe-secure.c:265
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "nie można ustanowić połączenia SSL: %s\n"
+
+#: fe-secure.c:369 fe-secure.c:529 fe-secure.c:1331
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "błąd SSL SYSCALL: %s\n"
+
+#: fe-secure.c:376 fe-secure.c:536 fe-secure.c:1335
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "błąd SSL SYSCALL: wykryto EOF\n"
+
+#: fe-secure.c:387 fe-secure.c:547 fe-secure.c:1344
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "błąd SSL: %s\n"
+
+#: fe-secure.c:401 fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "Połączenie SSL zostało nieoczekiwanie zamknięte\n"
+
+#: fe-secure.c:407 fe-secure.c:567 fe-secure.c:1353
+#, c-format
+msgid "unrecognized SSL error code: %d\n"
+msgstr "nieznany błąd SSL o kodzie: %d\n"
+
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "nie można otrzymać danych z serwera: %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "nie można wysłać danych do serwera: %s\n"
+
+#: fe-secure.c:746
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "nazwa hosta musi zostać podana dla zweryfikowanego połączenia SSL\n"
+
+#: fe-secure.c:765
+#, c-format
+msgid "server common name \"%s\" does not match host name \"%s\"\n"
+msgstr "nazwa zwyczajowa serwera \"%s\" nie odpowiada nazwie hosta \"%s\"\n"
+
+#: fe-secure.c:897
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "nie można utworzyć kontekstu SSL: %s\n"
+
+#: fe-secure.c:1019
+#, c-format
+msgid "could not open certificate file \"%s\": %s\n"
+msgstr "nie można otworzyć pliku certyfikatu \"%s\": %s\n"
+
+#: fe-secure.c:1044 fe-secure.c:1054
+#, c-format
+msgid "could not read certificate file \"%s\": %s\n"
+msgstr "nie można odczytać pliku certyfikatu \"%s\": %s\n"
+
+#: fe-secure.c:1091
+#, c-format
+msgid "could not load SSL engine \"%s\": %s\n"
+msgstr "nie można wczytać silnika SSL \"%s\": %s\n"
+
+#: fe-secure.c:1103
+#, c-format
+msgid "could not initialize SSL engine \"%s\": %s\n"
+msgstr "nie można zainicjować silnika SSL \"%s\": %s\n"
+
+#: fe-secure.c:1119
+#, c-format
+msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "nie można odczytać prywatnego klucza SSL \"%s\" z silnika \"%s\": %s\n"
+
+#: fe-secure.c:1133
+#, c-format
+msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "nie można pobrać prywatnego klucza SSL \"%s\" z silnika \"%s\": %s\n"
+
+#: fe-secure.c:1170
+#, c-format
+msgid "certificate present, but not private key file \"%s\"\n"
+msgstr ""
+"znaleziono certyfikat ale nie znaleziono pliku z prywatnym kluczem \"%s\"\n"
+
+#: fe-secure.c:1178
+#, c-format
+msgid ""
+"private key file \"%s\" has group or world access; permissions should be "
+"u=rw (0600) or less\n"
+msgstr ""
+"plik hasła \"%s\" posiada globalne lub grupowe uprawnienia odczytu;\n"
+"uprawniania powinny być ustawione na u=rw (0600) lub niżej\n"
+
+#: fe-secure.c:1189
+#, c-format
+msgid "could not load private key file \"%s\": %s\n"
+msgstr "nie można pobrać pliku z kluczem prywatnym \"%s\": %s\n"
+
+#: fe-secure.c:1203
+#, c-format
+msgid "certificate does not match private key file \"%s\": %s\n"
+msgstr "certyfikat nie pokrywa siÄ™ z prywatnym kluczem w pliku \"%s\": %s\n"
+
+#: fe-secure.c:1231
+#, c-format
+msgid "could not read root certificate file \"%s\": %s\n"
+msgstr "nie można odczytać pliku z certyfikatem użytkownika root \"%s\": %s\n"
+
+#: fe-secure.c:1258
+#, c-format
+msgid "SSL library does not support CRL certificates (file \"%s\")\n"
+msgstr "biblioteka SSL nie wspiera certyfikatów CRL (plik \"%s\")\n"
+
+#: fe-secure.c:1285
+msgid ""
+"could not get home directory to locate root certificate file\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"nie można pobrać folderu domowego aby zlokalizować plik certyfikatu "
+"głównego\n"
+"Albo dostarcz plik albo zmień tryb ssl by zablokować weryfikację certyfikatu "
+"serwera.\n"
+
+#: fe-secure.c:1289
+#, c-format
+msgid ""
+"root certificate file \"%s\" does not exist\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"plik certyfikatu głównego \"%s\" nie istnieje\n"
+"Albo dostarcz plik albo zmień tryb ssl by zablokować weryfikację certyfikatu "
+"serwera.\n"
+
+#: fe-secure.c:1372
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "certyfikat nie może zostać otrzymany: %s\n"
+
+#: fe-secure.c:1400
+msgid "SSL certificate's common name contains embedded null\n"
+msgstr "nazwa zwyczajowa certyfikatu SSL zawiera osadzony null\n"
+
+#: fe-secure.c:1476
+msgid "no SSL error reported"
+msgstr "nie zgłoszono błędu SSL"
+
+#: fe-secure.c:1485
+#, c-format
+msgid "SSL error code %lu"
+msgstr "kod błędu SSL %lu"
+
+#~ msgid "Kerberos 4 error: %s\n"
+#~ msgstr "BÅ‚Ä…d programu Kerberos 4: %s\n"
+
+#~ msgid "Kerberos 4 authentication failed\n"
+#~ msgstr "Kerberos 4: autoryzacja odrzucona\n"
+
+#~ msgid "Kerberos 5 authentication failed\n"
+#~ msgstr "Kerberos 5: autoryzacja odrzucona\n"
+
+#~ msgid "invalid authentication service name \"%s\", ignored\n"
+#~ msgstr "błędna nazwa usługi autoryzacji \"%s\", pomijam\n"
+
+#~ msgid "fe_getauthname: invalid authentication system: %d\n"
+#~ msgstr "fe_getauthname: błędy system autoryzacji: %d\n"
+
+#~ msgid "could not create large object for file \"%s\"\n"
+#~ msgstr "nie można utworzyć dużego obiektu dla pliku \"%s\"\n"
+
+#~ msgid "could not open large object %u\n"
+#~ msgstr "nie można otworzyć dużego obiektu %u\n"
+
+#~ msgid "error while reading file \"%s\"\n"
+#~ msgstr "błąd podczas odczytu pliku \"%s\"\n"
+
+#~ msgid "error while writing to file \"%s\"\n"
+#~ msgstr "błąd podczas zapisu do pliku \"%s\"\n"
+
+#~ msgid "error querying socket: %s\n"
+#~ msgstr "błąd zapytania gniazda: %s\n"
+
+#~ msgid "could not get information about host \"%s\": %s\n"
+#~ msgstr "nie można otrzymać informacji o stacji siecowej \"%s\": %s\n"
+
+#~ msgid "unsupported protocol\n"
+#~ msgstr "nieobsługiwany protokół\n"
+
+#~ msgid "could not get user information\n"
+#~ msgstr "nie można uzykać informacji o użytkowniku\n"
+
+#~ msgid "private key file \"%s\" has wrong permissions\n"
+#~ msgstr "plik z prywatnym kluczem \"%s\" posiada błędne uprawnienia\n"
+
+#~ msgid "could not open private key file \"%s\": %s\n"
+#~ msgstr "nie można otworzyć pliku z prywatnym kluczem \"%s\": %s\n"
+
+#~ msgid "private key file \"%s\" changed during execution\n"
+#~ msgstr "plik z prywatnym kluczem \"%s\" zmieniony podczas wykonywania\n"
+
+#~ msgid "certificate could not be validated: %s\n"
+#~ msgstr "certyfikat nie może zostać potwierdzony: %s\n"
diff --git a/src/interfaces/libpq/po/pt_BR.po b/src/interfaces/libpq/po/pt_BR.po
index f02da55a7e2bd..1021e5d69af40 100644
--- a/src/interfaces/libpq/po/pt_BR.po
+++ b/src/interfaces/libpq/po/pt_BR.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Cesar Suga <sartre@linuxbr.com>, 2002.
 # Roberto Mello <rmello@fslc.usu.edu>, 2002.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-26 15:08-0300\n"
+"POT-Creation-Date: 2011-08-20 23:29-0300\n"
 "PO-Revision-Date: 2005-10-04 22:45-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -18,62 +18,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:212 fe-auth.c:432 fe-auth.c:659
+#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
 msgid "host name must be specified\n"
 msgstr "nome da máquina deve ser especificado\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "não pôde configurar o soquete para modo bloqueado: %s\n"
 
-#: fe-auth.c:260 fe-auth.c:264
+#: fe-auth.c:258 fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "Autenticação Kerberos 5 rejeitada: %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "não pôde restaurar modo não-bloqueado no soquete: %s\n"
 
-#: fe-auth.c:403
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "erro ao continuar autenticação GSSAPI"
 
-#: fe-auth.c:439
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "pedido de autenticação GSS duplicado\n"
 
-#: fe-auth.c:459
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "erro de importação de nome GSSAPI"
 
-#: fe-auth.c:545
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "erro ao continuar autenticação SSPI"
 
-#: fe-auth.c:556 fe-auth.c:630 fe-auth.c:665 fe-auth.c:762 fe-connect.c:1802
-#: fe-connect.c:3129 fe-connect.c:3346 fe-connect.c:3762 fe-connect.c:3771
-#: fe-connect.c:3908 fe-connect.c:3954 fe-connect.c:3972 fe-connect.c:4051
-#: fe-connect.c:4121 fe-connect.c:4167 fe-connect.c:4185 fe-exec.c:3121
-#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:757 fe-connect.c:1961
+#: fe-connect.c:3360 fe-connect.c:3578 fe-connect.c:3999 fe-connect.c:4008
+#: fe-connect.c:4145 fe-connect.c:4191 fe-connect.c:4209 fe-connect.c:4288
+#: fe-connect.c:4358 fe-connect.c:4404 fe-connect.c:4422 fe-exec.c:3121
+#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1092 fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "sem memória\n"
 
-#: fe-auth.c:645
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "não pôde obter credenciais SSPI"
 
-#: fe-auth.c:738
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "método de autenticação SCM_CRED não é suportado\n"
 
-#: fe-auth.c:812
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Autenticação Kerberos 4 não é suportada\n"
 
-#: fe-auth.c:828
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Autenticação Kerberos 5 não é suportada\n"
 
@@ -81,36 +81,36 @@ msgstr "Autenticação Kerberos 5 não é suportada\n"
 msgid "GSSAPI authentication not supported\n"
 msgstr "Autenticação GSSAPI não é suportada\n"
 
-#: fe-auth.c:919
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "Autenticação SSPI não é suportada\n"
 
-#: fe-auth.c:926
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "Autenticação crypt não é suportada\n"
 
-#: fe-auth.c:953
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "método de autenticação %u não é suportado\n"
 
-#: fe-connect.c:712
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valor do modo ssl desconhecido: \"%s\"\n"
 
-#: fe-connect.c:733
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr ""
 "valor \"%s\" do modo ssl é inválido quando suporte a SSL não foi compilado\n"
 
-#: fe-connect.c:916
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "não pôde configurar o soquete para modo TCP sem atraso: %s\n"
 
-#: fe-connect.c:946
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -121,7 +121,18 @@ msgstr ""
 "\tO servidor está executando localmente e aceitando\n"
 "\tconexões no soquete de domínio Unix \"%s\"?\n"
 
-#: fe-connect.c:956
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"não pôde conectar ao servidor: %s\n"
+"\tO servidor está executando na máquina \"%s\" (%s) e aceitando\n"
+"\tconexões TCP/IP na porta %s?\n"
+
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -132,236 +143,255 @@ msgstr ""
 "\tO servidor está executando na máquina \"%s\" e aceitando\n"
 "\tconexões TCP/IP na porta %s?\n"
 
-#: fe-connect.c:1011
+#: fe-connect.c:1117
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE) falhou: %s\n"
 
-#: fe-connect.c:1024
+#: fe-connect.c:1130
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPALIVE) falhou: %s\n"
 
-#: fe-connect.c:1056
+#: fe-connect.c:1162
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL) falhou: %s\n"
 
-#: fe-connect.c:1088
+#: fe-connect.c:1194
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT) falhou: %s\n"
 
-#: fe-connect.c:1137
+#: fe-connect.c:1242
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) falhou: %ui\n"
 
-#: fe-connect.c:1189
+#: fe-connect.c:1294
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "número de porta inválido: \"%s\"\n"
 
-#: fe-connect.c:1231
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "não pôde traduzir nome da máquina \"%s\" para endereço: %s\n"
 
-#: fe-connect.c:1235
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr ""
 "não pôde traduzir caminho do soquete de domínio Unix \"%s\" para endereço: "
 "%s\n"
 
-#: fe-connect.c:1444
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr ""
 "estado de conexão é inválido, provavelmente indicativo de corrupção de "
 "memória\n"
 
-#: fe-connect.c:1487
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "não pôde criar soquete: %s\n"
 
-#: fe-connect.c:1510
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "não pôde configurar o soquete para modo não-bloqueado: %s\n"
 
-#: fe-connect.c:1522
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "não pôde configurar o soquete para modo fechar-após-execução: %s\n"
 
-#: fe-connect.c:1540
+#: fe-connect.c:1647
 msgid "keepalives parameter must be an integer\n"
 msgstr "parâmetro keepalives deve ser um inteiro\n"
 
-#: fe-connect.c:1553
+#: fe-connect.c:1660
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE) falhou: %s\n"
 
-#: fe-connect.c:1694
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "não pôde obter status de erro do soquete: %s\n"
 
-#: fe-connect.c:1732
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "não pôde obter do soquete o endereço do cliente: %s\n"
 
-#: fe-connect.c:1776
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "parâmetro requirepeer não é suportado nessa plataforma\n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "não pôde receber credenciais: %s\n"
+
+#: fe-connect.c:1893
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "usuário local com ID %d não existe\n"
+
+#: fe-connect.c:1901
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr "requirepeer especificou \"%s\", mas nome de usuário atual é \"%s\"\n"
+
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "não pôde mandar pacote de negociação SSL: %s\n"
 
-#: fe-connect.c:1815
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "não pôde enviar pacote de inicialização: %s\n"
 
-#: fe-connect.c:1882 fe-connect.c:1901
+#: fe-connect.c:2041 fe-connect.c:2060
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "servidor não suporta SSL, mas SSL foi requerido\n"
 
-#: fe-connect.c:1917
+#: fe-connect.c:2076
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "a negociação SSL recebeu uma resposta inválida: %c\n"
 
-#: fe-connect.c:1993 fe-connect.c:2026
+#: fe-connect.c:2152 fe-connect.c:2185
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "pedido de autenticação esperado do servidor, mas foi recebido %c\n"
 
-#: fe-connect.c:2197
+#: fe-connect.c:2358
 #, c-format
 msgid "out of memory allocating GSSAPI buffer (%i)"
 msgstr "sem memória para alocar buffer para GSSAPI (%i)"
 
-#: fe-connect.c:2282
+#: fe-connect.c:2443
 msgid "unexpected message from server during startup\n"
 msgstr "mensagem inesperada do servidor durante inicialização\n"
 
-#: fe-connect.c:2378
+#: fe-connect.c:2539
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr ""
 "estado de conexão %d é inválido, provavelmente indicativo de corrupção de "
 "memória\n"
 
-#: fe-connect.c:2737 fe-connect.c:2797
+#: fe-connect.c:2968 fe-connect.c:3028
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc \"%s\" falhou durante evento PGEVT_CONNRESET\n"
 
-#: fe-connect.c:3142
+#: fe-connect.c:3373
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "URL LDAP \"%s\" é inválida: esquema deve ser ldap://\n"
 
-#: fe-connect.c:3157
+#: fe-connect.c:3388
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "URL LDAP \"%s\" é inválida: faltando nome distinto\n"
 
-#: fe-connect.c:3168 fe-connect.c:3221
+#: fe-connect.c:3399 fe-connect.c:3452
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "URL LDAP \"%s\" é inválida: deve ter exatamente um atributo\n"
 
-#: fe-connect.c:3178 fe-connect.c:3235
+#: fe-connect.c:3409 fe-connect.c:3466
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr "URL LDAP \"%s\" é inválida: deve ter escopo de busca (base/one/sub)\n"
 
-#: fe-connect.c:3189
+#: fe-connect.c:3420
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "URL LDAP \"%s\" é inválida: nenhum filtro\n"
 
-#: fe-connect.c:3210
+#: fe-connect.c:3441
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "URL LDAP \"%s\" é inválida: número de porta é inválido\n"
 
-#: fe-connect.c:3244
+#: fe-connect.c:3475
 msgid "could not create LDAP structure\n"
 msgstr "não pôde criar estrutura LDAP\n"
 
-#: fe-connect.c:3286
+#: fe-connect.c:3517
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "busca em servidor LDAP falhou: %s\n"
 
-#: fe-connect.c:3297
+#: fe-connect.c:3528
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "mais de um registro encontrado na busca no LDAP\n"
 
-#: fe-connect.c:3298 fe-connect.c:3310
+#: fe-connect.c:3529 fe-connect.c:3541
 msgid "no entry found on LDAP lookup\n"
 msgstr "nenhum registro encontrado na busca no LDAP\n"
 
-#: fe-connect.c:3321 fe-connect.c:3334
+#: fe-connect.c:3552 fe-connect.c:3565
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "atributo não tem valores na busca no LDAP\n"
 
-#: fe-connect.c:3385 fe-connect.c:3403 fe-connect.c:3810
+#: fe-connect.c:3617 fe-connect.c:3636 fe-connect.c:4047
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "faltando \"=\" depois de \"%s\" na cadeia de caracteres de conexão\n"
 
-#: fe-connect.c:3466 fe-connect.c:3892 fe-connect.c:4076
+#: fe-connect.c:3700 fe-connect.c:4129 fe-connect.c:4313
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "opção de conexão \"%s\" é inválida\n"
 
-#: fe-connect.c:3479 fe-connect.c:3859
+#: fe-connect.c:3716 fe-connect.c:4096
 msgid "unterminated quoted string in connection info string\n"
 msgstr ""
 "cadeia de caracteres entre aspas não foi terminada na cadeia de caracteres "
 "de conexão\n"
 
-#: fe-connect.c:3518
+#: fe-connect.c:3755
 msgid "could not get home directory to locate service definition file"
 msgstr ""
 "não pôde obter diretório base do usuário para localizar arquivo de definição "
 "de serviço"
 
-#: fe-connect.c:3551
+#: fe-connect.c:3788
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "definição de serviço \"%s\" não foi encontrado\n"
 
-#: fe-connect.c:3574
+#: fe-connect.c:3811
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "arquivo de serviço \"%s\" não foi encontrado\n"
 
-#: fe-connect.c:3587
+#: fe-connect.c:3824
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr "linha %d é muito longa no arquivo de serviço \"%s\"\n"
 
-#: fe-connect.c:3658 fe-connect.c:3685
+#: fe-connect.c:3895 fe-connect.c:3922
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "erro de sintaxe no arquivo de serviço \"%s\", linha %d\n"
 
-#: fe-connect.c:4352
+#: fe-connect.c:4589
 msgid "connection pointer is NULL\n"
 msgstr "ponteiro da conexão é NULO\n"
 
-#: fe-connect.c:4625
+#: fe-connect.c:4866
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "AVISO: arquivo de senhas \"%s\" não é um arquivo no formato texto\n"
 
-#: fe-connect.c:4634
+#: fe-connect.c:4875
 #, c-format
 msgid ""
 "WARNING: password file \"%s\" has group or world access; permissions should "
@@ -370,63 +400,67 @@ msgstr ""
 "AVISO: arquivo de senhas \"%s\" tem acesso de leitura para outros ou grupo; "
 "permissões devem ser u=rw (0600) ou menos que isso\n"
 
-#: fe-connect.c:4722
+#: fe-connect.c:4963
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "senha obtida do arquivo \"%s\"\n"
 
-#: fe-exec.c:827
+#: fe-exec.c:810
 msgid "NOTICE"
 msgstr "NOTA"
 
-#: fe-exec.c:1014 fe-exec.c:1071 fe-exec.c:1111
+#: fe-exec.c:997 fe-exec.c:1054 fe-exec.c:1094
 msgid "command string is a null pointer\n"
 msgstr "cadeia de caracteres do comando é um ponteiro nulo\n"
 
-#: fe-exec.c:1104 fe-exec.c:1199
+#: fe-exec.c:1087 fe-exec.c:1182
 msgid "statement name is a null pointer\n"
 msgstr "nome do comando é um ponteiro nulo\n"
 
-#: fe-exec.c:1119 fe-exec.c:1273 fe-exec.c:1928 fe-exec.c:2125
+#: fe-exec.c:1102 fe-exec.c:1256 fe-exec.c:1925 fe-exec.c:2123
 msgid "function requires at least protocol version 3.0\n"
 msgstr "função requer pelo menos a versão 3.0 do protocolo\n"
 
-#: fe-exec.c:1230
+#: fe-exec.c:1213
 msgid "no connection to the server\n"
 msgstr "sem conexão ao servidor\n"
 
-#: fe-exec.c:1237
+#: fe-exec.c:1220
 msgid "another command is already in progress\n"
 msgstr "outro comando já está em execução\n"
 
-#: fe-exec.c:1349
+#: fe-exec.c:1332
 msgid "length must be given for binary parameter\n"
 msgstr "tamanho deve ser informado para um parâmetro binário\n"
 
-#: fe-exec.c:1596
+#: fe-exec.c:1585
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus inesperado: %d\n"
 
-#: fe-exec.c:1616
+#: fe-exec.c:1605
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc \"%s\" falhou durante evento PGEVT_RESULTCREATE\n"
 
-#: fe-exec.c:1746
+#: fe-exec.c:1735
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminado por novo PQexec"
 
-#: fe-exec.c:1754
+#: fe-exec.c:1743
 msgid "COPY IN state must be terminated first\n"
 msgstr "estado de COPY IN deve ser terminado primeiro\n"
 
-#: fe-exec.c:1774
+#: fe-exec.c:1763
 msgid "COPY OUT state must be terminated first\n"
 msgstr "estado de COPY OUT deve ser terminado primeiro\n"
 
-#: fe-exec.c:2016 fe-exec.c:2082 fe-exec.c:2167 fe-protocol2.c:1172
-#: fe-protocol3.c:1557
+#: fe-exec.c:1771
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "PQexec não é permitido durante COPY BOTH\n"
+
+#: fe-exec.c:2014 fe-exec.c:2080 fe-exec.c:2167 fe-protocol2.c:1237
+#: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "nenhum COPY está em execução\n"
 
@@ -522,26 +556,22 @@ msgstr "não pode determinar OID da função loread\n"
 msgid "cannot determine OID of function lowrite\n"
 msgstr "não pode determinar OID da função lowrite\n"
 
-#: fe-misc.c:262
+#: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "inteiro de tamanho %lu não é suportado por pqGetInt"
 
-#: fe-misc.c:298
+#: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "inteiro de tamanho %lu não é suportado por pqPutInt"
 
-#: fe-misc.c:578 fe-misc.c:780
+#: fe-misc.c:585 fe-misc.c:784
 msgid "connection not open\n"
 msgstr "conexão não está aberta\n"
 
-#: fe-misc.c:643 fe-misc.c:733
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "não pôde receber dados do servidor: %s\n"
-
-#: fe-misc.c:750 fe-misc.c:828
+#: fe-misc.c:711 fe-secure.c:364 fe-secure.c:443 fe-secure.c:524
+#: fe-secure.c:632
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -551,50 +581,45 @@ msgstr ""
 "\tIsto provavelmente significa que o servidor terminou de forma anormal\n"
 "\tantes ou durante o processamento do pedido.\n"
 
-#: fe-misc.c:845
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "não pôde enviar dados ao servidor: %s\n"
-
-#: fe-misc.c:964
+#: fe-misc.c:948
 msgid "timeout expired\n"
 msgstr "tempo de espera expirado\n"
 
-#: fe-misc.c:1009
+#: fe-misc.c:993
 msgid "socket not open\n"
 msgstr "soquete não está aberto\n"
 
-#: fe-misc.c:1032
+#: fe-misc.c:1016
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() falhou: %s\n"
 
-#: fe-protocol2.c:89
+#: fe-protocol2.c:91
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr ""
 "estado de setenv %c é inválido, provavelmente indicativo de corrupção de "
 "memória\n"
 
-#: fe-protocol2.c:330
+#: fe-protocol2.c:390
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr ""
 "estado %c é inválido, provavelmente indicativo de corrupção de memória\n"
 
-#: fe-protocol2.c:419 fe-protocol3.c:186
+#: fe-protocol2.c:479 fe-protocol3.c:186
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "tipo de mensagem 0x%02x chegou do servidor enquanto estava ocioso"
 
-#: fe-protocol2.c:462
+#: fe-protocol2.c:522
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
 msgstr ""
 "caracter inesperado %c seguido de uma resposta de consulta vazia (mensagem "
 "\"I\")"
 
-#: fe-protocol2.c:516
+#: fe-protocol2.c:576
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)"
@@ -602,7 +627,7 @@ msgstr ""
 "servidor enviou dados (mensagem \"D\") sem antes enviar descrição de "
 "registro (mensagem \"T\")"
 
-#: fe-protocol2.c:532
+#: fe-protocol2.c:592
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)"
@@ -610,26 +635,26 @@ msgstr ""
 "servidor enviou dados binários (mensagem \"B\") sem antes enviar descrição "
 "de registro (mensagem \"T\")"
 
-#: fe-protocol2.c:547 fe-protocol3.c:382
+#: fe-protocol2.c:612 fe-protocol3.c:388
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr ""
 "resposta inesperada do servidor; primeiro caracter recebido foi \"%c\"\n"
 
-#: fe-protocol2.c:768 fe-protocol3.c:701
+#: fe-protocol2.c:833 fe-protocol3.c:707
 msgid "out of memory for query result\n"
 msgstr "sem memória para resultado da consulta\n"
 
-#: fe-protocol2.c:1215 fe-protocol3.c:1625
+#: fe-protocol2.c:1280 fe-protocol3.c:1637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-protocol2.c:1227
+#: fe-protocol2.c:1292
 msgid "lost synchronization with server, resetting connection"
 msgstr "perda de sincronismo com o servidor, reiniciando conexão"
 
-#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
+#: fe-protocol2.c:1426 fe-protocol2.c:1458 fe-protocol3.c:1840
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "erro de protocolo: id=0x%x\n"
@@ -642,70 +667,70 @@ msgstr ""
 "servidor enviou dados (mensagem \"D\") sem antes enviar descrição de "
 "registro (mensagem \"T\")\n"
 
-#: fe-protocol3.c:403
+#: fe-protocol3.c:409
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr ""
 "conteúdo da mensagem não está de acordo com o tamanho no tipo de mensagem "
 "\"%c\"\n"
 
-#: fe-protocol3.c:424
+#: fe-protocol3.c:430
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "perda de sincronismo com o servidor: recebeu tipo de mensagem \"%c\", "
 "tamanho %d\n"
 
-#: fe-protocol3.c:646
+#: fe-protocol3.c:652
 msgid "unexpected field count in \"D\" message\n"
 msgstr "contagem de campos inesperada em mensagem \"D\"\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:788 fe-protocol3.c:807
+#: fe-protocol3.c:798 fe-protocol3.c:817
 #, c-format
 msgid " at character %s"
 msgstr " no caracter %s"
 
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALHE:  %s\n"
 
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "DICA:  %s\n"
 
-#: fe-protocol3.c:826
+#: fe-protocol3.c:836
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "CONSULTA:  %s\n"
 
-#: fe-protocol3.c:829
+#: fe-protocol3.c:839
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTO:  %s\n"
 
-#: fe-protocol3.c:841
+#: fe-protocol3.c:851
 msgid "LOCATION:  "
 msgstr "LOCAL:  "
 
-#: fe-protocol3.c:843
+#: fe-protocol3.c:853
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:845
+#: fe-protocol3.c:855
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1069
+#: fe-protocol3.c:1079
 #, c-format
 msgid "LINE %d: "
 msgstr "LINHA %d: "
 
-#: fe-protocol3.c:1453
+#: fe-protocol3.c:1465
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: não está fazendo COPY OUT de texto\n"
 
@@ -714,81 +739,90 @@ msgstr "PQgetline: não está fazendo COPY OUT de texto\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "não pôde estabelecer conexão SSL: %s\n"
 
-#: fe-secure.c:349 fe-secure.c:436 fe-secure.c:1162
+#: fe-secure.c:369 fe-secure.c:529 fe-secure.c:1331
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "Erro de SYSCALL SSL: %s\n"
 
-#: fe-secure.c:355 fe-secure.c:442 fe-secure.c:1166
+#: fe-secure.c:376 fe-secure.c:536 fe-secure.c:1335
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "Erro de SYSCALL SSL: EOF detectado\n"
 
-#: fe-secure.c:367 fe-secure.c:453 fe-secure.c:1175
+#: fe-secure.c:387 fe-secure.c:547 fe-secure.c:1344
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "Erro de SSL: %s\n"
 
-#: fe-secure.c:377 fe-secure.c:463 fe-secure.c:1184
+#: fe-secure.c:401 fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "conexão SSL foi fechada inesperadamente\n"
+
+#: fe-secure.c:407 fe-secure.c:567 fe-secure.c:1353
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "código de erro SSL desconhecido: %d\n"
 
-#: fe-secure.c:601
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "não pôde receber dados do servidor: %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "não pôde enviar dados ao servidor: %s\n"
+
+#: fe-secure.c:746
 msgid "host name must be specified for a verified SSL connection\n"
-msgstr "nome da máquina deve ser especificado para uma conexão SSL verificada\n"
+msgstr ""
+"nome da máquina deve ser especificado para uma conexão SSL verificada\n"
 
-#: fe-secure.c:620
+#: fe-secure.c:765
 #, c-format
 msgid "server common name \"%s\" does not match host name \"%s\"\n"
 msgstr "nome do servidor \"%s\" não corresponde ao nome da máquina \"%s\"\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:897
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "não pôde criar contexto SSL: %s\n"
 
-#: fe-secure.c:843
-msgid "could not get home directory to locate client certificate files\n"
-msgstr ""
-"não pôde obter diretório base do usuário para localizar certificados do "
-"cliente\n"
-
-#: fe-secure.c:868
+#: fe-secure.c:1019
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "não pôde abrir certificado \"%s\": %s\n"
 
-#: fe-secure.c:893 fe-secure.c:903
+#: fe-secure.c:1044 fe-secure.c:1054
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "não pôde ler certificado \"%s\": %s\n"
 
-#: fe-secure.c:940
+#: fe-secure.c:1091
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "não pôde carregar mecanismo SSL \"%s\": %s\n"
 
-#: fe-secure.c:952
+#: fe-secure.c:1103
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "não pôde inicializar mecanismo SSL \"%s\": %s\n"
 
-#: fe-secure.c:968
+#: fe-secure.c:1119
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "não pôde ler chave privada SSL \"%s\" do mecanismo \"%s\": %s\n"
 
-#: fe-secure.c:982
+#: fe-secure.c:1133
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "não pôde carregar chave privada SSL \"%s\" do mecanismo \"%s\": %s\n"
 
-#: fe-secure.c:1017
+#: fe-secure.c:1170
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "certificado presente, mas não a chave privada \"%s\"\n"
 
-#: fe-secure.c:1025
+#: fe-secure.c:1178
 #, c-format
 msgid ""
 "private key file \"%s\" has group or world access; permissions should be "
@@ -797,27 +831,38 @@ msgstr ""
 "chave privada \"%s\" tem acesso de leitura para outros ou grupo; permissões "
 "devem ser u=rw (0600) ou menos que isso\n"
 
-#: fe-secure.c:1036
+#: fe-secure.c:1189
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "não pôde carregar arquivo contendo chave privada \"%s\": %s\n"
 
-#: fe-secure.c:1050
+#: fe-secure.c:1203
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "certificado não corresponde a chave privada \"%s\": %s\n"
 
-#: fe-secure.c:1075
+#: fe-secure.c:1231
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "não pôde ler certificado raiz \"%s\": %s\n"
 
-#: fe-secure.c:1099
+#: fe-secure.c:1258
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "biblioteca SSL não suporta certificados CRL (arquivo \"%s\")\n"
 
-#: fe-secure.c:1120
+#: fe-secure.c:1285
+msgid ""
+"could not get home directory to locate root certificate file\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"não pôde obter diretório base do usuário para localizar arquivo do "
+"certificado\n"
+"Forneça um arquivo ou mude o sslmode para desabilitar a verificação de "
+"certificado do servidor.\n"
+
+#: fe-secure.c:1289
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -828,20 +873,20 @@ msgstr ""
 "Forneça um arquivo ou mude o sslmode para desabilitar a verificação de "
 "certificado do servidor.\n"
 
-#: fe-secure.c:1203
+#: fe-secure.c:1372
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certificado não pôde ser obtido: %s\n"
 
-#: fe-secure.c:1231
+#: fe-secure.c:1400
 msgid "SSL certificate's common name contains embedded null\n"
 msgstr "nome comum do certificado SSL contém nulo embutido\n"
 
-#: fe-secure.c:1307
+#: fe-secure.c:1476
 msgid "no SSL error reported"
 msgstr "nenhum erro SSL relatado"
 
-#: fe-secure.c:1316
+#: fe-secure.c:1485
 #, c-format
 msgid "SSL error code %lu"
 msgstr "código de erro SSL %lu"
diff --git a/src/interfaces/libpq/po/ta.po b/src/interfaces/libpq/po/ta.po
deleted file mode 100644
index bb11ff0a7c2c2..0000000000000
--- a/src/interfaces/libpq/po/ta.po
+++ /dev/null
@@ -1,794 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Postgres Tamil Translation\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-21 09:19-0300\n"
-"PO-Revision-Date: 2007-10-14 11:58+0530\n"
-"Last-Translator: ஆமாச�ச� <amachu@ubuntu.com>\n"
-"Language-Team: Ubuntu Tamil Team <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Tamil\n"
-"X-Poedit-Country: INDIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: fe-auth.c:268
-#, c-format
-msgid "could not set socket to blocking mode: %s\n"
-msgstr "தட�ப�ப� ம�றைக�க� சாக�கெட�டினை அமைக�க இயலவில�லை: %s\n"
-
-#: fe-auth.c:286
-#: fe-auth.c:290
-#, c-format
-msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "கேர�பரோஸ� 5 அங�கீகாரம� மற�க�கப�பட�டத�: %*s\n"
-
-#: fe-auth.c:316
-#, c-format
-msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "தடையில�லா  ம�றையினை  சாக�கெட�டின� மீத� மீட�டமைக�க இயலவில�லை: %s\n"
-
-#: fe-auth.c:439
-msgid "GSSAPI continuation error"
-msgstr "GSSAPI தொடர�வதில� வழ�"
-
-#: fe-auth.c:467
-msgid "duplicate GSS auth request\n"
-msgstr "போலி GSS அங�கீகாரத�த�க�கான கோரிக�கை\n"
-
-#: fe-auth.c:487
-msgid "GSSAPI name import error"
-msgstr "GSSAPI பெயர� இறக�க வழ�"
-
-#: fe-auth.c:573
-msgid "SSPI continuation error"
-msgstr "SSPI தொடர�வதில� வழ�"
-
-#: fe-auth.c:584
-#: fe-auth.c:649
-#: fe-auth.c:675
-#: fe-auth.c:772
-#: fe-connect.c:1299
-#: fe-connect.c:2532
-#: fe-connect.c:2749
-#: fe-connect.c:3078
-#: fe-connect.c:3087
-#: fe-connect.c:3224
-#: fe-connect.c:3264
-#: fe-connect.c:3282
-#: fe-exec.c:2751
-#: fe-lobj.c:669
-#: fe-protocol2.c:1027
-#: fe-protocol3.c:1330
-msgid "out of memory\n"
-msgstr "நினைவைத� தாண�டி\n"
-
-#: fe-auth.c:669
-msgid "hostname must be specified\n"
-msgstr "தர�நர� பெயர� கொட�க�கப� பட வேண�ட�ம�\n"
-
-#: fe-auth.c:748
-msgid "SCM_CRED authentication method not supported\n"
-msgstr "SCM_CRED அங�கீகார ம�றை ஆதரிக�கப� படவில�லை\n"
-
-#: fe-auth.c:830
-msgid "Kerberos 4 authentication not supported\n"
-msgstr "கேபராஸ� 4 அங�கீகாரம� ஆதரிக�கப� படவில�லை\n"
-
-#: fe-auth.c:846
-msgid "Kerberos 5 authentication not supported\n"
-msgstr "கேபராஸ� 5 அங�கீகாரம� ஆதரிக�கப� படவில�லை\n"
-
-#: fe-auth.c:910
-msgid "GSSAPI authentication not supported\n"
-msgstr "GSSAPI அங�கீகாரம� ஆதரிக�கப� படவில�லை\n"
-
-#: fe-auth.c:933
-msgid "SSPI authentication not supported\n"
-msgstr "SSPI அங�கீகாரம� ஆதரிக�கப� படவில�லை\n"
-
-#: fe-auth.c:962
-#, c-format
-msgid "authentication method %u not supported\n"
-msgstr "அங�கீகார ம�றையான %u ஆதரிக�கப� படவில�லை\n"
-
-#: fe-connect.c:496
-#, c-format
-msgid "invalid sslmode value: \"%s\"\n"
-msgstr "செல�ல�படியாகாத ssimode மதிப�ப�: \"%s\"\n"
-
-#: fe-connect.c:516
-#, c-format
-msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "SSL ஆதரவ� ஒட�க�கம� பெறாத போத� ssimode மதிப�ப� \"%s\" செல�ல�படியாகாத�\n"
-
-#: fe-connect.c:695
-#, c-format
-msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "TCP காத�திரா  நிலைக�க� சாக�கெட�டினை அமைக�க இயலவில�லை: %s\n"
-
-#: fe-connect.c:725
-#, c-format
-msgid ""
-"could not connect to server: %s\n"
-"\tIs the server running locally and accepting\n"
-"\tconnections on Unix domain socket \"%s\"?\n"
-msgstr ""
-"வழங�கிய�டன� இணைக�க இயலவில�லை: %s\n"
-" \t வழங�கி உள�ளூர இயங�கி\n"
-" ய�னிக�ஸ� டொமைன� சாக�கெட� களிலிர�ந�த� இணைப�களைப� பெற�கிறதா\"%s\"?\n"
-
-#: fe-connect.c:735
-#, c-format
-msgid ""
-"could not connect to server: %s\n"
-"\tIs the server running on host \"%s\" and accepting\n"
-"\tTCP/IP connections on port %s?\n"
-msgstr ""
-"வழங�கிய�டன� இணைக�க இயலவில�லை: %s\n"
-"\t தர�நரில� வழங�கி இயங�க�கிறதா \"%s\" மேல�ம� \n"
-"\tTCP/IP இணைப�ப�களை %s த�றையில� பெற�கின�றதா?\n"
-
-#: fe-connect.c:825
-#, c-format
-msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr "தர�நர� பெயர� \"%s\" னை %s ம�கவரிக�க� மொழிபெயர�க�க இயலவில�லை\n"
-
-#: fe-connect.c:829
-#, c-format
-msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
-msgstr "ய�னிக�ஸ� டொமைன� சாக�கெட� பாதையினை \"%s\" ம�கவரி %s க�க� மாற�ற இயலவில�லை\n"
-
-#: fe-connect.c:1030
-msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "செல�ல�படியாகாத இணைப�ப� நிலை, நினைவ� மழ�ங�கியதற�கான சமிக�ஞையாக இர�க�கலாம�\n"
-
-#: fe-connect.c:1073
-#, c-format
-msgid "could not create socket: %s\n"
-msgstr "சாக�கெட�டினை  உர�வாக�க இயலவில�லை: %s\n"
-
-#: fe-connect.c:1096
-#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "தடையில�லா  ம�றைக�க� சாக�கெட�டினை  அமைக�க இயலவில�லை: %s\n"
-
-#: fe-connect.c:1108
-#, c-format
-msgid "could not set socket to close-on-exec mode: %s\n"
-msgstr "close-on-exec நிலையில� சாக�கெட�டினை அமைக�க இயலவில�லை: %s\n"
-
-#: fe-connect.c:1195
-#, c-format
-msgid "could not get socket error status: %s\n"
-msgstr "சாக�கெட� வழ� நிலையை பெற இயலவில�லை: %s\n"
-
-#: fe-connect.c:1233
-#, c-format
-msgid "could not get client address from socket: %s\n"
-msgstr "வாங�கியின� ம�கவரியினை சாக�கெட�டிலிர�ந�த� பெற இயலவில�லை: %s\n"
-
-#: fe-connect.c:1277
-#, c-format
-msgid "could not send SSL negotiation packet: %s\n"
-msgstr "SSL மத�தியஸ�த பொட�டலத�தை அன�ப�ப இயலவில�லை: %s\n"
-
-#: fe-connect.c:1312
-#, c-format
-msgid "could not send startup packet: %s\n"
-msgstr "த�வக�க பொட�டலத�தை அன�ப�ப இயலவில�லை: %s\n"
-
-#: fe-connect.c:1377
-#: fe-connect.c:1394
-msgid "server does not support SSL, but SSL was required\n"
-msgstr "SSL ஆதாவினை வழங�கி ஆதரிக�கவில�லை, ஆனால� SSL  தேவைப� பட�கின�றத�\n"
-
-#: fe-connect.c:1410
-#, c-format
-msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "SSL மத�தியஸ�தத�த�க�க� ஒவ�வாத பதில� கிடைத�தத�: %c\n"
-
-#: fe-connect.c:1486
-#: fe-connect.c:1519
-#, c-format
-msgid "expected authentication request from server, but received %c\n"
-msgstr "அங�கீகார கோரிக�கை  எதிர�பார�க�கப� பட�டத�, பெற�றதோ %c\n"
-
-#: fe-connect.c:1696
-#, c-format
-msgid "out of memory allocating GSSAPI buffer (%i)"
-msgstr "GSSAPI நிலையாநினைவினை(%i) ஒத�க�க�கையில� நினைவகன�றத�"
-
-#: fe-connect.c:1785
-msgid "unexpected message from server during startup\n"
-msgstr "த�வங�க�கையில� வழங�கியிலிர�ந�த� எதிர�பாராத தகவல�\n"
-
-#: fe-connect.c:1853
-#, c-format
-msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "செல�லத�தகாத நினைவ� நிலை \"%c, நினைவ� பழ�தடைந�திர�க�கலாம�\n"
-
-#: fe-connect.c:2545
-#, c-format
-msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
-msgstr "செல�லாத LDAP URL \"%s\": திட�டம� கட�டாயம� ldap ஆக இர�க�க வேண�ட�ம�://\n"
-
-#: fe-connect.c:2560
-#, c-format
-msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
-msgstr "செல�லாத LDAP URL \"%s\": தனித�த�வம� வாய�ந�த பெயர� விட�பட�ட�ள�ளத�\n"
-
-#: fe-connect.c:2571
-#: fe-connect.c:2624
-#, c-format
-msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
-msgstr "LDAP இணைப�ப� செல�லாத� \"%s\": க�றைந�தத� ஒர� இணைப�பாவத� கொண�டிர�க�க வேண�ட�ம�\n"
-
-#: fe-connect.c:2581
-#: fe-connect.c:2638
-#, c-format
-msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
-msgstr "LDAP இணைப�ப� செல�லாத� \"%s\": தேட�வதற�கான வரம�ப� கொண�டிர�த�தல� வேண�ட�ம� (base/one/sub)\n"
-
-#: fe-connect.c:2592
-#, c-format
-msgid "invalid LDAP URL \"%s\": no filter\n"
-msgstr "LDAP இணைப�ப� செல�லாத� \"%s\": வழிகட�ட� இல�லை\n"
-
-#: fe-connect.c:2613
-#, c-format
-msgid "invalid LDAP URL \"%s\": invalid port number\n"
-msgstr "LDAP இணைப�ப� செல�லாத� \"%s\": த�றை எண� செல�லாத�\n"
-
-#: fe-connect.c:2647
-msgid "could not create LDAP structure\n"
-msgstr "LDAP கட�டமைப�பை  உர�வாக�க இயலவில�லை\n"
-
-#: fe-connect.c:2689
-#, c-format
-msgid "lookup on LDAP server failed: %s\n"
-msgstr "LDAP வழங�கியில� தேடல� செயலிழந�தத�: %s\n"
-
-#: fe-connect.c:2700
-msgid "more than one entry found on LDAP lookup\n"
-msgstr "LDAP தேடலில� ஒன�ற�க�க� மேற�பட�ட பதிவ� கிடைத�த�ள�ளத�\n"
-
-#: fe-connect.c:2701
-#: fe-connect.c:2713
-msgid "no entry found on LDAP lookup\n"
-msgstr "LDAP தேடலில� எந�தவொர� பதிவ�ம� கிடைக�கவில�லை\n"
-
-#: fe-connect.c:2724
-#: fe-connect.c:2737
-msgid "attribute has no values on LDAP lookup\n"
-msgstr "LDAP தேடலில� பண�பிற�க� மதிப�ப� எத�வ�ம� இல�லை\n"
-
-#: fe-connect.c:2788
-#: fe-connect.c:2806
-#: fe-connect.c:3126
-#, c-format
-msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "தொடர�ப�க�கான தகவல� சரத�தில� \"%s\" க�க�ப� பிறக� \"=\" இல�லை\n"
-
-#: fe-connect.c:2869
-#: fe-connect.c:3208
-#, c-format
-msgid "invalid connection option \"%s\"\n"
-msgstr "செல�ல�படியாகாத இணைப�ப�த� தேர�வ� \"%s\" \n"
-
-#: fe-connect.c:2882
-#: fe-connect.c:3175
-msgid "unterminated quoted string in connection info string\n"
-msgstr "தொடர�ப�க�கான தகவல� சரத�தில� நிறைவ�பெறாத மேற�கோளிடப� பட�ட சரம�\n"
-
-#: fe-connect.c:2925
-#, c-format
-msgid "ERROR: service file \"%s\" not found\n"
-msgstr "வழ�: \"%s\" சேவை  கோப�பினைக� காணவில�லை\n"
-
-#: fe-connect.c:2938
-#, c-format
-msgid "ERROR: line %d too long in service file \"%s\"\n"
-msgstr "வழ�: சேவைக� கோப�பில� %d வரி மிகப� பெரிதாக உள�ளத�\"%s\"\n"
-
-#: fe-connect.c:3010
-#: fe-connect.c:3037
-#, c-format
-msgid "ERROR: syntax error in service file \"%s\", line %d\n"
-msgstr "வழ�: சேவைக� கோப�ப� \"%s\" ன� வரி %d ல� நெறி வழ�\n"
-
-#: fe-connect.c:3450
-msgid "connection pointer is NULL\n"
-msgstr "இணைப�ப�ச� ச�ட�டி NULL ஆக உள�ளத�\n"
-
-#: fe-connect.c:3724
-#, c-format
-msgid "WARNING: password file \"%s\" is not a plain file\n"
-msgstr "எச�சரிக�கை: கடவ�ச� சொல�ல�க�கானக� கோப�ப� \"%s\" ஒர� சாதாரணக� கோப�ப� இல�லை\n"
-
-#: fe-connect.c:3734
-#, c-format
-msgid "WARNING: password file \"%s\" has world or group read access; permission should be u=rw (0600)\n"
-msgstr "எச�சரிக�கை: கடவ�ச� சொல� கோப�ப� \"%s\" அனைவர�ம� அல�லத� க�ழ�மம� அண�க �த�வாய� உள�ளத�; u=rw (0600) ஆக அன�மதி இர�த�தல� நல�லத�\n"
-
-#: fe-exec.c:498
-msgid "NOTICE"
-msgstr "அறிவிப�ப�"
-
-#: fe-exec.c:682
-#: fe-exec.c:739
-#: fe-exec.c:779
-msgid "command string is a null pointer\n"
-msgstr "ஆணைச� சரம� ஒர� வெற�ற�ச� ச�ட�டி\n"
-
-#: fe-exec.c:772
-#: fe-exec.c:867
-msgid "statement name is a null pointer\n"
-msgstr "வாசகத�தின� பெயர� ஒர� வெற�ற�ச� ச�ட�டி\n"
-
-#: fe-exec.c:787
-#: fe-exec.c:941
-#: fe-exec.c:1570
-#: fe-exec.c:1766
-msgid "function requires at least protocol version 3.0\n"
-msgstr "செயற�பாட�ட�க�க� க�றைந�த பட�சம� நெறி 3.0 தேவைப� பட�கிறத�\n"
-
-#: fe-exec.c:898
-msgid "no connection to the server\n"
-msgstr "வழங�கிக�க� இணைப�ப� எத�வ�ம� இல�லை\n"
-
-#: fe-exec.c:905
-msgid "another command is already in progress\n"
-msgstr "மற�றொர� ஆணை  நிறைவேற�றப� பட�ட�க�கொண�டிர�க�கிறத�\n"
-
-#: fe-exec.c:1015
-msgid "length must be given for binary parameter\n"
-msgstr "இர�ம காரணிக�க� நீளம� கட�டாயம� கொட�க�கப�பட�டிர�த�தல� வேண�ட�ம�\n"
-
-#: fe-exec.c:1262
-#, c-format
-msgid "unexpected asyncStatus: %d\n"
-msgstr "எதிர�பாராத பொர�ந�தா நிலை: %d\n"
-
-#: fe-exec.c:1388
-msgid "COPY terminated by new PQexec"
-msgstr "PQexec ஆல�  நகலெட�ப�பத� நிற�த�தப� பட�டத�"
-
-#: fe-exec.c:1396
-msgid "COPY IN state must be terminated first\n"
-msgstr "அக நகல� நிலை  ம�தலில� நிற�த�தப� பட வேண�ட�ம�\n"
-
-#: fe-exec.c:1416
-msgid "COPY OUT state must be terminated first\n"
-msgstr "ப�ற நகல� நிலை  ம�தலில� நிற�த�தப� பட வேண�ட�ம�\n"
-
-#: fe-exec.c:1658
-#: fe-exec.c:1723
-#: fe-exec.c:1808
-#: fe-protocol2.c:1172
-#: fe-protocol3.c:1486
-msgid "no COPY in progress\n"
-msgstr "நகலாக�கம� எத�வ�ம� நடைபெறவில�லை\n"
-
-#: fe-exec.c:2000
-msgid "connection in wrong state\n"
-msgstr "இணைப�ப� தவறான நிலையில� உள�ளத�\n"
-
-#: fe-exec.c:2031
-msgid "invalid ExecStatusType code"
-msgstr "ExecStatusType க�றியீட� செல�ல�படியாகாத�"
-
-#: fe-exec.c:2095
-#: fe-exec.c:2118
-#, c-format
-msgid "column number %d is out of range 0..%d"
-msgstr "நெட�வரிசை எண� %d வரம�ப�க�க�க�க� 0.. %d வெளியே  உள�ளத�\" "
-
-#: fe-exec.c:2111
-#, c-format
-msgid "row number %d is out of range 0..%d"
-msgstr "க�ற�க�க� வரிசை எண� %d வரம�ப�க�க� 0.. %d வெளியே  உள�ளத�"
-
-#: fe-exec.c:2133
-#, c-format
-msgid "parameter number %d is out of range 0..%d"
-msgstr "காரணி எண� %d வரம�ப�க�க� வெளியே  உள�ளத� 0.. %d"
-
-#: fe-exec.c:2420
-#, c-format
-msgid "could not interpret result from server: %s"
-msgstr "வழங�கியிலிர�ந�த� ம�டிவை  கணிக�க இயலவில�லை: %s"
-
-#: fe-exec.c:2659
-msgid "incomplete multibyte character\n"
-msgstr "பூர�த�தியாகாத மல�டிபைட� எழ�த�த�\n"
-
-#: fe-lobj.c:150
-msgid "cannot determine OID of function lo_truncate\n"
-msgstr "lo_truncate செயற�பாட�டின� OID னைக� கண�ட�பிடிக�க ம�டியவில�லை\n"
-
-#: fe-lobj.c:378
-msgid "cannot determine OID of function lo_create\n"
-msgstr "lo_create செயற�பாட�டின� OID யினைக� கணட�பிக�க இயலவில�லை\n"
-
-#: fe-lobj.c:502
-#: fe-lobj.c:597
-#, c-format
-msgid "could not open file \"%s\": %s\n"
-msgstr "\"%s\": %s கோப�பினைத� திறக�க இயலவில�லை\n"
-
-#: fe-lobj.c:548
-#, c-format
-msgid "could not read from file \"%s\": %s\n"
-msgstr "\"%s\": கோப�பிலிர�ந�த� வாசிக�க இயலவில�லை %s\n"
-
-#: fe-lobj.c:612
-#: fe-lobj.c:636
-#, c-format
-msgid "could not write to file \"%s\": %s\n"
-msgstr "\"%s\": கோப�பின�ள� இணைக�க இயலவில�லை %s\n"
-
-#: fe-lobj.c:717
-msgid "query to initialize large object functions did not return data\n"
-msgstr "பெர�ம� பொர�ள� செயற�பாட�களைத� த�வக�க கோரியத� தரவெதைய�ம� திர�ம�பத� தரவில�லை\n"
-
-#: fe-lobj.c:758
-msgid "cannot determine OID of function lo_open\n"
-msgstr "செயற�பாட� lo_open �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:765
-msgid "cannot determine OID of function lo_close\n"
-msgstr "செயற�பாட� lo_close �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:772
-msgid "cannot determine OID of function lo_creat\n"
-msgstr "செயற�பாட� lo_creat �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:779
-msgid "cannot determine OID of function lo_unlink\n"
-msgstr "செயற�பாட� lo_unlink �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:786
-msgid "cannot determine OID of function lo_lseek\n"
-msgstr "செயற�பாட� lo_lseek �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:793
-msgid "cannot determine OID of function lo_tell\n"
-msgstr "செயற�பாட� lo_tell �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:800
-msgid "cannot determine OID of function loread\n"
-msgstr "செயற�பாட� loread �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-lobj.c:807
-msgid "cannot determine OID of function lowrite\n"
-msgstr "செயற�பாட� lowrite �க� கொண�ட OID யினை கண�டெட�க�க இயலவில�லை\n"
-
-#: fe-misc.c:227
-#, c-format
-msgid "integer of size %lu not supported by pqGetInt"
-msgstr "%lu அளவினைக� கொண�ட எண� pqGetInt ஆல� ஆதரிக�கப� படவில�லை"
-
-#: fe-misc.c:263
-#, c-format
-msgid "integer of size %lu not supported by pqPutInt"
-msgstr "%lu அளவினைக� கொண�ட எண� pqPutInt ஆல� ஆதரிக�கப� படவில�லை"
-
-#: fe-misc.c:543
-#: fe-misc.c:745
-msgid "connection not open\n"
-msgstr " இணைப�ப� இல�லை\n"
-
-#: fe-misc.c:608
-#: fe-misc.c:698
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "வழங�கியிலிர�ந�த� தரவினைப� பெற இயலவில�லை: %s\n"
-
-#: fe-misc.c:715
-#: fe-misc.c:783
-msgid ""
-"server closed the connection unexpectedly\n"
-"\tThis probably means the server terminated abnormally\n"
-"\tbefore or while processing the request.\n"
-msgstr ""
-"இணைப�பினை வழங�கி திடீரெனத� த�ண�டித�த�க� கொண�டத�\n"
-" \tகோரிக�கையினை நிறைவேற�ற�கிற சமயம�\n"
-" \tவழங�கி திடீரென செயலற�ற� போயிர�க�கலாம�.\n"
-
-#: fe-misc.c:800
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "வழங�கிக�க� தரவினை அன�ப�ப இயலவில�லை: %s\n"
-
-#: fe-misc.c:919
-msgid "timeout expired\n"
-msgstr "காலநிர�ணயம� காலாவதியானத�\n"
-
-#: fe-misc.c:964
-msgid "socket not open\n"
-msgstr "சாக�கெட� திறக�கப� படவில�லை\n"
-
-#: fe-misc.c:987
-#, c-format
-msgid "select() failed: %s\n"
-msgstr "select() பலனலிக�கவில�லை: %s\n"
-
-#: fe-protocol2.c:89
-#, c-format
-msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "�ற�பில�லா setenv நிலை %c, நினைவ� மழ�ங�கியமைக�கான சமிக�ஞையாக இர�க�கலாம�\n"
-
-#: fe-protocol2.c:330
-#, c-format
-msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "�ற�பில�லா நிலை %c, நினைவ� மழ�ங�கியமைக�கான சமிக�ஞையாக இர�க�கலாம�\n"
-
-#: fe-protocol2.c:419
-#: fe-protocol3.c:185
-#, c-format
-msgid "message type 0x%02x arrived from server while idle"
-msgstr "செயலற�ற� இர�ந�த போத� 0x%02x செய�தி வந�தத�"
-
-#: fe-protocol2.c:462
-#, c-format
-msgid "unexpected character %c following empty query response (\"I\" message)"
-msgstr "வெற�ற� கோரிக�கையின� பதிலைத� தொடரந�த� எதிபாராத எழ�த�த� %c (\"I\" message)"
-
-#: fe-protocol2.c:516
-msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
-msgstr "க�ற�க�க� வரிசை க�றித�த ம�ன� விவரமில�லாத� (\"T\"message) வழங�கி தரவினை அன�ப�பியத� (\"D\"message)"
-
-#: fe-protocol2.c:532
-msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
-msgstr "க�ற�க�க� வரிசை க�றித�த ம�ன� விவரமில�லாத� (\"T\"message) வழங�கி இர�மத� தரவினை அன�ப�பியத� (\"B\"message)"
-
-#: fe-protocol2.c:547
-#: fe-protocol3.c:376
-#, c-format
-msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "வழங�கியிடமிர�ந�த� எதிர�பாராத தகவல�; ம�தலில� பெறப� பட�ட எழ�த�த� \"%c\"\n"
-
-#: fe-protocol2.c:768
-#: fe-protocol3.c:695
-msgid "out of memory for query result\n"
-msgstr "விண�ணப�பத�தின� ம�டிவ� நினைவ�க�க� அப�பால� உள�ளன\n"
-
-#: fe-protocol2.c:1215
-#: fe-protocol3.c:1554
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: fe-protocol2.c:1227
-msgid "lost synchronization with server, resetting connection"
-msgstr "வழங�கிய�டனான பொர�ந�த�ம� தனமையில� பாதிப�ப�, இணைப�ப� மீண�ட�ம� கொணரப�பட�கிறத�"
-
-#: fe-protocol2.c:1361
-#: fe-protocol2.c:1393
-#: fe-protocol3.c:1756
-#, c-format
-msgid "protocol error: id=0x%x\n"
-msgstr "நெறி வழ�: id=0x%x\n"
-
-#: fe-protocol3.c:338
-msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
-msgstr "க�ற�க�க� வரிசை க�றித�த ம�ன� விவரமில�லாத� (\"T\"message) வழங�கி தரவினை அன�ப�பியத� (\"D\"message)\n"
-
-#: fe-protocol3.c:397
-#, c-format
-msgid "message contents do not agree with length in message type \"%c\"\n"
-msgstr "தகவல� வகையில�ள�ள நீளத�த�டன� தகவல� விவரங�கள� ஒத�த�ப� போகவில�லை \"%c\"\n"
-
-#: fe-protocol3.c:418
-#, c-format
-msgid "lost synchronization with server: got message type \"%c\", length %d\n"
-msgstr "வழங�கிய�டன� பொர�ந�தா நிலை �ற�பட�ட�ள�ளத�: தகவல� வகை \"%c\" பெறப�பட�டத�, நீளம� %d\n"
-
-#: fe-protocol3.c:640
-msgid "unexpected field count in \"D\" message\n"
-msgstr "\"D\" தகவலில� எதிர�பாராத கள எண�ணிக�கை\n"
-
-#. translator: %s represents a digit string
-#: fe-protocol3.c:782
-#: fe-protocol3.c:801
-#, c-format
-msgid " at character %s"
-msgstr " %s எழ�த�தில�"
-
-#: fe-protocol3.c:814
-#, c-format
-msgid "DETAIL:  %s\n"
-msgstr "விவரம�: %s\n"
-
-#: fe-protocol3.c:817
-#, c-format
-msgid "HINT:  %s\n"
-msgstr "த�ப�ப�: %s\n"
-
-#: fe-protocol3.c:820
-#, c-format
-msgid "QUERY:  %s\n"
-msgstr "விண�ணப�பம�: %s\n"
-
-#: fe-protocol3.c:823
-#, c-format
-msgid "CONTEXT:  %s\n"
-msgstr "இடம�: %s\n"
-
-#: fe-protocol3.c:835
-msgid "LOCATION:  "
-msgstr "இர�ப�பிடம�: "
-
-#: fe-protocol3.c:837
-#, c-format
-msgid "%s, "
-msgstr "%s, "
-
-#: fe-protocol3.c:839
-#, c-format
-msgid "%s:%s"
-msgstr "%s:%s"
-
-#: fe-protocol3.c:1064
-#, c-format
-msgid "LINE %d: "
-msgstr "வரி %d: "
-
-#: fe-protocol3.c:1372
-msgid "PQgetline: not doing text COPY OUT\n"
-msgstr "PQgetline: உரை COPY OUT செய�யப� பட�லதில�லை\n"
-
-#: fe-secure.c:218
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "SSL இணைப�பினை �ற�பட�த�த இயலவில�லை: %s\n"
-
-#: fe-secure.c:289
-#: fe-secure.c:385
-#: fe-secure.c:927
-#, c-format
-msgid "SSL SYSCALL error: %s\n"
-msgstr "SYS SYSCALL வழ�: %s\n"
-
-#: fe-secure.c:294
-#: fe-secure.c:391
-#: fe-secure.c:931
-msgid "SSL SYSCALL error: EOF detected\n"
-msgstr "SYS SYSCALL வழ�: EOF அடையப�பட�டத�\n"
-
-#: fe-secure.c:306
-#: fe-secure.c:402
-#: fe-secure.c:950
-#, c-format
-msgid "SSL error: %s\n"
-msgstr "SSL வழ�: %s\n"
-
-#: fe-secure.c:316
-#: fe-secure.c:412
-#: fe-secure.c:960
-#, c-format
-msgid "unrecognized SSL error code: %d\n"
-msgstr "இனங�காண இயலாத SSL வழ� க�றி: %d\n"
-
-#: fe-secure.c:482
-#, c-format
-msgid "error querying socket: %s\n"
-msgstr "சாக�கெட�ட�க�காக� கோரியதில� வழ�: %s\n"
-
-#: fe-secure.c:509
-#, c-format
-msgid "could not get information about host \"%s\": %s\n"
-msgstr "தர�நர� க�றித�த  விவரங�களைப� பெற இயலவில�லை\"%s\":%s\n"
-
-#: fe-secure.c:528
-msgid "unsupported protocol\n"
-msgstr "ஆதரிக�கப� படாத நெறி\n"
-
-#: fe-secure.c:550
-#, c-format
-msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
-msgstr "வழங�கியின� பொத�ப� பெயர� \"%s\" %ld.%ld.%ld.%ld க�க� இட�ட�ச� செல�லவில�லை\n"
-
-#: fe-secure.c:557
-#, c-format
-msgid "server common name \"%s\" does not resolve to peer address\n"
-msgstr "வழங�கியின� பொத�ப� பெயரால� \"%s\" தலை ம�கவரியினைத� த�வங�க இயலவில�லை\n"
-
-#: fe-secure.c:589
-msgid "could not get user information\n"
-msgstr "பயனர� விவரங�களை  பெற இயலவில�லை\n"
-
-#: fe-secure.c:598
-#, c-format
-msgid "could not open certificate file \"%s\": %s\n"
-msgstr "சான�ற�க� கோப�பினைத� திறக�க இயலவில�லை \"%s\": %s\n"
-
-#: fe-secure.c:607
-#, c-format
-msgid "could not read certificate file \"%s\": %s\n"
-msgstr "சான�ற�க� கோப�பினை வாசிக�க இயலவில�லை \"%s\": %s\n"
-
-#: fe-secure.c:627
-msgid "invalid value of PGSSLKEY environment variable\n"
-msgstr "சூழல� மாறி PGSSLKEY க�க� செல�லத�தகாத மதிப�ப�\n"
-
-#: fe-secure.c:639
-#, c-format
-msgid "could not load SSL engine \"%s\": %s\n"
-msgstr "SSL என�ஜின�களை �ற�றவில�லை \"%s\": %s\n"
-
-#: fe-secure.c:653
-#, c-format
-msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
-msgstr "என�ஜினிலிர�ந�த� \"%s\": %s தனிப�பட�ட SSL திறவியினை வாசிக�க இயலவில�லை \"%s\"\n"
-
-#: fe-secure.c:669
-#, c-format
-msgid "certificate present, but not private key file \"%s\"\n"
-msgstr "சான�ற� உள�ளத�, ஆனால� தனித� த�ர�ப�ப�க� கோப�பினைக� காணவில�லை \"%s\"\n"
-
-#: fe-secure.c:678
-#, c-format
-msgid "private key file \"%s\" has wrong permissions\n"
-msgstr "தனித� த�ர�ப�ப�க� கோப�ப� \"%s\" தவறான அன�மதிகளைக� கொண�ட�ள�ளத�\n"
-
-#: fe-secure.c:686
-#, c-format
-msgid "could not open private key file \"%s\": %s\n"
-msgstr "தனித� த�ர�ப�ப�க� கோப�பினைத� திறக�க இயலவில�லை \"%s\":%s\n"
-
-#: fe-secure.c:695
-#, c-format
-msgid "private key file \"%s\" changed during execution\n"
-msgstr "செயல�பட�த�த�ம� போத� தனித� த�ர�ப�ப�க� கோப�ப� \"%s\" மாற�றப� பட�ட�ள�ளத�\n"
-
-#: fe-secure.c:704
-#, c-format
-msgid "could not read private key file \"%s\": %s\n"
-msgstr "தனித� த�ர�ப�ப�க� கோப�பினை  வாசிக�க இயலவில�லை \"%s\":%s\n"
-
-#: fe-secure.c:719
-#, c-format
-msgid "certificate does not match private key file \"%s\": %s\n"
-msgstr "சான�ற� தனித� த�ர�ப�ப�க� கோப�ப�டன� பொர�ந�தவில�லை \"%s\": %s\n"
-
-#: fe-secure.c:808
-#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr "SSL சூழலை உர�வாக�க இயலவில�லை: %s\n"
-
-#: fe-secure.c:849
-#, c-format
-msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "\"மூல சான�றினை  வாசிக�க இயவில�லை \"%s\": %s\n"
-
-#: fe-secure.c:869
-#, c-format
-msgid "SSL library does not support CRL certificates (file \"%s\")\n"
-msgstr "CRL சான�ற�களை SSL நிரலகம� ஆதரிக�கவில�லை (கோப�ப� \"%s\")\n"
-
-#: fe-secure.c:980
-#, c-format
-msgid "certificate could not be validated: %s\n"
-msgstr "சான�றிதழை  சரி பார�க�க இயலவில�லை: %s\n"
-
-#: fe-secure.c:994
-#, c-format
-msgid "certificate could not be obtained: %s\n"
-msgstr "சான�ற� கிடைக�கப� பெறவில�லை: %s\n"
-
-#: fe-secure.c:1074
-msgid "no SSL error reported"
-msgstr "SSL வழ� எத�வ�ம� தெரிவிக�கப� படவில�லை"
-
-#: fe-secure.c:1083
-#, c-format
-msgid "SSL error code %lu"
-msgstr "SSL வழ�க� க�றி %lu"
-
diff --git a/src/interfaces/libpq/po/tr.po b/src/interfaces/libpq/po/tr.po
index ed29eff0acf67..bed259209224c 100644
--- a/src/interfaces/libpq/po/tr.po
+++ b/src/interfaces/libpq/po/tr.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libpq-tr\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 20:09+0000\n"
-"PO-Revision-Date: 2010-09-01 11:27+0200\n"
+"POT-Creation-Date: 2011-08-30 22:43+0000\n"
+"PO-Revision-Date: 2011-08-31 13:21+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -16,81 +17,81 @@ msgstr ""
 "X-Poedit-Basepath: /home/ntufar/pg/pgsql/src/interfaces/libpq\n"
 "X-Poedit-SearchPath-0: /home/ntufar/pg/pgsql/src/interfaces/libpq\n"
 
-#: fe-auth.c:212
-#: fe-auth.c:432
-#: fe-auth.c:659
+#: fe-auth.c:210
+#: fe-auth.c:429
+#: fe-auth.c:656
 msgid "host name must be specified\n"
 msgstr "sunucu adı belirtilmelidir\n"
 
-#: fe-auth.c:242
+#: fe-auth.c:240
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "soket engelleme moduna ayarlanamadı: %s\n"
 
-#: fe-auth.c:260
-#: fe-auth.c:264
+#: fe-auth.c:258
+#: fe-auth.c:262
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "Kerberos 5 yetkilendirmesi kabul edilmedi: %*s\n"
 
-#: fe-auth.c:290
+#: fe-auth.c:288
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "could not restore non-blocking mode on socket: %s\n"
 
-#: fe-auth.c:403
+#: fe-auth.c:400
 msgid "GSSAPI continuation error"
 msgstr "GSSAPI devam hatası"
 
-#: fe-auth.c:439
+#: fe-auth.c:436
 msgid "duplicate GSS authentication request\n"
 msgstr "çift GSS yetkilendirme isteği\n"
 
-#: fe-auth.c:459
+#: fe-auth.c:456
 msgid "GSSAPI name import error"
 msgstr "GSSAPI ad aktarma hatası"
 
-#: fe-auth.c:545
+#: fe-auth.c:542
 msgid "SSPI continuation error"
 msgstr "SSPI devam hatası"
 
-#: fe-auth.c:556
-#: fe-auth.c:630
-#: fe-auth.c:665
-#: fe-auth.c:762
-#: fe-connect.c:1802
-#: fe-connect.c:3129
-#: fe-connect.c:3346
-#: fe-connect.c:3762
-#: fe-connect.c:3771
-#: fe-connect.c:3908
-#: fe-connect.c:3954
-#: fe-connect.c:3972
-#: fe-connect.c:4051
-#: fe-connect.c:4121
-#: fe-connect.c:4167
-#: fe-connect.c:4185
+#: fe-auth.c:553
+#: fe-auth.c:627
+#: fe-auth.c:662
+#: fe-auth.c:757
+#: fe-connect.c:1961
+#: fe-connect.c:3368
+#: fe-connect.c:3586
+#: fe-connect.c:4007
+#: fe-connect.c:4016
+#: fe-connect.c:4153
+#: fe-connect.c:4199
+#: fe-connect.c:4217
+#: fe-connect.c:4296
+#: fe-connect.c:4366
+#: fe-connect.c:4412
+#: fe-connect.c:4430
 #: fe-exec.c:3121
 #: fe-exec.c:3286
 #: fe-lobj.c:696
-#: fe-protocol2.c:1027
-#: fe-protocol3.c:1421
+#: fe-protocol2.c:1092
+#: fe-protocol3.c:1433
 msgid "out of memory\n"
 msgstr "yetersiz bellek\n"
 
-#: fe-auth.c:645
+#: fe-auth.c:642
 msgid "could not acquire SSPI credentials"
 msgstr "SSPI kimlik bilgileri alınamadı: %m"
 
-#: fe-auth.c:738
+#: fe-auth.c:733
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "SCM_CRED yetkilendirme yöntemi desteklenmiyor.\n"
 
-#: fe-auth.c:812
+#: fe-auth.c:807
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Kerberos 4 yetkilendirmesi desteklenmiyor\n"
 
-#: fe-auth.c:828
+#: fe-auth.c:823
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Kerberos 5 yetkilendirmesi desteklenmiyor\n"
 
@@ -98,35 +99,35 @@ msgstr "Kerberos 5 yetkilendirmesi desteklenmiyor\n"
 msgid "GSSAPI authentication not supported\n"
 msgstr "GSSAPI yetkilendirmesi desteklenmiyor\n"
 
-#: fe-auth.c:919
+#: fe-auth.c:927
 msgid "SSPI authentication not supported\n"
 msgstr "SSPI yetkilendirmesi desteklenmiyor\n"
 
-#: fe-auth.c:926
+#: fe-auth.c:935
 msgid "Crypt authentication not supported\n"
 msgstr "Crypt yetkilendirmesi desteklenmiyor\n"
 
-#: fe-auth.c:953
+#: fe-auth.c:962
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "%u yetkilendirme sistemi desteklenmiyor\n"
 
-#: fe-connect.c:712
+#: fe-connect.c:758
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "geçersiz sslmode değeri: \"%s\"\n"
 
-#: fe-connect.c:733
+#: fe-connect.c:779
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "\"%s\" ssl modu, SSL desteği derlenmeyince geçersizdir.\n"
 
-#: fe-connect.c:916
+#: fe-connect.c:972
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "could not set socket to TCP no delay mode: %s\n"
 
-#: fe-connect.c:946
+#: fe-connect.c:1002
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -137,7 +138,18 @@ msgstr ""
 "\tSunucu yerelde çalışıyor ve Unix domain\n"
 "\tsoketleri üzerinden bağlantılara izin veriyor mu? \"%s\"?\n"
 
-#: fe-connect.c:956
+#: fe-connect.c:1057
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" (%s) and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"sunucuya bağlanılamadı: %s\n"
+"\tSunucu \"%s\" (%s) sunucusunda çalışıyor ve\n"
+"\t %s portundan TCP/IP bağlantılarına izin veriyor mu?\n"
+
+#: fe-connect.c:1066
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -148,309 +160,331 @@ msgstr ""
 "\tls Sunucu \"%s\" sunucunda çalışıyor ve\n"
 "\t %s portundan bağlantılara izin veriyor mu?\n"
 
-#: fe-connect.c:1011
+#: fe-connect.c:1117
 #, c-format
 msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPIDLE) başarısız oldu: %s\n"
 
-#: fe-connect.c:1024
+#: fe-connect.c:1130
 #, c-format
 msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_REUSEADDR) başarısız oldu: %s\n"
 
-#: fe-connect.c:1056
+#: fe-connect.c:1162
 #, c-format
 msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPINTVL) başarısız oldu: %s\n"
 
-#: fe-connect.c:1088
+#: fe-connect.c:1194
 #, c-format
 msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
 msgstr "setsockopt(TCP_KEEPCNT) başarısız oldu: %s\n"
 
-#: fe-connect.c:1137
+#: fe-connect.c:1242
 #, c-format
 msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
 msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) başarısız oldu: %ui\n"
 
-#: fe-connect.c:1189
+#: fe-connect.c:1294
 #, c-format
 msgid "invalid port number: \"%s\"\n"
 msgstr "Geçersiz port numarası: \"%s\"\n"
 
-#: fe-connect.c:1231
+#: fe-connect.c:1337
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "\"%s\" makine adı bir adrese çevirilemedi: %s\n"
 
-#: fe-connect.c:1235
+#: fe-connect.c:1341
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "\"%s\" Unix domain soket yolu adrese çevirilemedi: %s\n"
 
-#: fe-connect.c:1444
+#: fe-connect.c:1551
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "Geçersiz bağlantı durumu, hafızanın zarar görmüş olmasının işareti olabilir\n"
 
-#: fe-connect.c:1487
+#: fe-connect.c:1592
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "soket yaratılamadı: %s\n"
 
-#: fe-connect.c:1510
+#: fe-connect.c:1615
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "could not set socket to non-blocking mode: %s\n"
 
-#: fe-connect.c:1522
+#: fe-connect.c:1627
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "soket close-on-exec moduna ayarlanamadı: %s\n"
 
-#: fe-connect.c:1540
+#: fe-connect.c:1647
 msgid "keepalives parameter must be an integer\n"
 msgstr "keepalives parametresi tamsayı olmalıdır\n"
 
-#: fe-connect.c:1553
+#: fe-connect.c:1660
 #, c-format
 msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
 msgstr "setsockopt(SO_KEEPALIVE) başarısız oldu: %s\n"
 
-#: fe-connect.c:1694
+#: fe-connect.c:1801
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "soket hata durumu alınamadı: %s\n"
 
-#: fe-connect.c:1732
+#: fe-connect.c:1839
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "soketten istemci adresi alınamadı: %s\n"
 
-#: fe-connect.c:1776
+#: fe-connect.c:1880
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "bu platformda requirepeer parametresi desteklenmiyor \n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "karşı tarafın kimlik bilgileri alınamadı: %s \n"
+
+#: fe-connect.c:1893
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "yerel kullanıcı ID %d mevcut değildir\n"
+
+#: fe-connect.c:1901
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr "requirepeer \"%s\" belirtiyor, ancak gerçek peer kullanıcı aıd \"%s\"\n"
+
+#: fe-connect.c:1935
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "could not send SSL negotiation packet: %s\n"
 
-#: fe-connect.c:1815
+#: fe-connect.c:1974
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "başlangıç paketi gönderilemedi: %s\n"
 
-#: fe-connect.c:1882
-#: fe-connect.c:1901
+#: fe-connect.c:2044
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "sunucu SSL desteklemiyor, ama SSL gerekli idi\n"
 
-#: fe-connect.c:1917
+#: fe-connect.c:2070
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ssl görüşmesine geçersiz yanıt alındı: %c\n"
 
-#: fe-connect.c:1993
-#: fe-connect.c:2026
+#: fe-connect.c:2149
+#: fe-connect.c:2182
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "sunucudan yetkilendirme isteği beklendi ancak %c alındı\n"
 
-#: fe-connect.c:2197
+#: fe-connect.c:2363
 #, c-format
-msgid "out of memory allocating GSSAPI buffer (%i)"
-msgstr "GSSAPI tamponu ayrılırken yetersiz bellek hatası (%i)"
+msgid "out of memory allocating GSSAPI buffer (%d)"
+msgstr "GSSAPI tamponu ayrılırken yetersiz bellek hatası (%d)"
 
-#: fe-connect.c:2282
+#: fe-connect.c:2448
 msgid "unexpected message from server during startup\n"
 msgstr "başlangıç sırasında sunucudan beklenmeyen bir mesaj alındı\n"
 
-#: fe-connect.c:2378
+#: fe-connect.c:2547
 #, c-format
 msgid "invalid connection state %d, probably indicative of memory corruption\n"
 msgstr "%d - geçersiz bağlantı durumu, bellekteki veri zarar görmüş olabilir\n"
 
-#: fe-connect.c:2737
-#: fe-connect.c:2797
+#: fe-connect.c:2976
+#: fe-connect.c:3036
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
 msgstr "PGEventProc \"%s\" işlemi PGEVT_CONNRESET işlemi sırasında başarısız oldu\n"
 
-#: fe-connect.c:3142
+#: fe-connect.c:3381
 #, c-format
 msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
 msgstr "geçersiz LDAP URL \"%s\": şema, ldap:// ile başlamalıdir\n"
 
-#: fe-connect.c:3157
+#: fe-connect.c:3396
 #, c-format
 msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
 msgstr "geçersiz LDAP URL \"%s\": distinguished name eksik\n"
 
-#: fe-connect.c:3168
-#: fe-connect.c:3221
+#: fe-connect.c:3407
+#: fe-connect.c:3460
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
 msgstr "geçersiz LDAP URL \"%s\": tam bir attribute içermelidir\n"
 
-#: fe-connect.c:3178
-#: fe-connect.c:3235
+#: fe-connect.c:3417
+#: fe-connect.c:3474
 #, c-format
 msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
 msgstr "geçersiz LDAP URL \"%s\": arama kapsamı içermelidir (base/one/sub)\n"
 
-#: fe-connect.c:3189
+#: fe-connect.c:3428
 #, c-format
 msgid "invalid LDAP URL \"%s\": no filter\n"
 msgstr "geçersiz LDAP URL \"%s\": filtere eksik\n"
 
-#: fe-connect.c:3210
+#: fe-connect.c:3449
 #, c-format
 msgid "invalid LDAP URL \"%s\": invalid port number\n"
 msgstr "geçersiz LDAP URL \"%s\": geçersiz port numarası\n"
 
-#: fe-connect.c:3244
+#: fe-connect.c:3483
 msgid "could not create LDAP structure\n"
 msgstr "LDAP yapısı oluşturma hatası\n"
 
-#: fe-connect.c:3286
+#: fe-connect.c:3525
 #, c-format
 msgid "lookup on LDAP server failed: %s\n"
 msgstr "LDAP sonucunda sorgulama hatası: %s\n"
 
-#: fe-connect.c:3297
+#: fe-connect.c:3536
 msgid "more than one entry found on LDAP lookup\n"
 msgstr "LDAP sorgusu sonucunda birden fazla giriÅŸ bulundu\n"
 
-#: fe-connect.c:3298
-#: fe-connect.c:3310
+#: fe-connect.c:3537
+#: fe-connect.c:3549
 msgid "no entry found on LDAP lookup\n"
 msgstr "LDAP sorgusu sonucunda hiçbir giriş bulunamadı\n"
 
-#: fe-connect.c:3321
-#: fe-connect.c:3334
+#: fe-connect.c:3560
+#: fe-connect.c:3573
 msgid "attribute has no values on LDAP lookup\n"
 msgstr "LDAP sorgusu sonucunda bulunan attribute, hiçbir değer içermiyor\n"
 
-#: fe-connect.c:3385
-#: fe-connect.c:3403
-#: fe-connect.c:3810
+#: fe-connect.c:3625
+#: fe-connect.c:3644
+#: fe-connect.c:4055
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "bağlantı bilgi katarında \"%s\" bilgisinden sonra \"=\" işareti eksik\n"
 
-#: fe-connect.c:3466
-#: fe-connect.c:3892
-#: fe-connect.c:4076
+#: fe-connect.c:3708
+#: fe-connect.c:4137
+#: fe-connect.c:4321
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "geçersiz bağlantı seçeneği \"%s\"\n"
 
-#: fe-connect.c:3479
-#: fe-connect.c:3859
+#: fe-connect.c:3724
+#: fe-connect.c:4104
 msgid "unterminated quoted string in connection info string\n"
 msgstr "bağlantı bilgi katarında sonlandırılmamış tırnaklı katar\n"
 
-#: fe-connect.c:3518
+#: fe-connect.c:3763
 msgid "could not get home directory to locate service definition file"
 msgstr "servis dosyasının olduğu ev dizini bulunamadı"
 
-#: fe-connect.c:3551
+#: fe-connect.c:3796
 #, c-format
 msgid "definition of service \"%s\" not found\n"
 msgstr "\"%s\" servisinin tanımı bulunamadı\n"
 
-#: fe-connect.c:3574
+#: fe-connect.c:3819
 #, c-format
 msgid "service file \"%s\" not found\n"
 msgstr "\"%s\" servis dosyası bulunamadı\n"
 
-#: fe-connect.c:3587
+#: fe-connect.c:3832
 #, c-format
 msgid "line %d too long in service file \"%s\"\n"
 msgstr " \"%2$s\" servis dosyasında %1$d no'lu satır çok uzun \n"
 
-#: fe-connect.c:3658
-#: fe-connect.c:3685
+#: fe-connect.c:3903
+#: fe-connect.c:3930
 #, c-format
 msgid "syntax error in service file \"%s\", line %d\n"
 msgstr "\"%s\" servis dosyasında yazım hatası, satır no %d\n"
 
-#: fe-connect.c:4352
+#: fe-connect.c:4597
 msgid "connection pointer is NULL\n"
 msgstr "bağlantı belirteci NULL'dur\n"
 
-#: fe-connect.c:4625
+#: fe-connect.c:4874
 #, c-format
 msgid "WARNING: password file \"%s\" is not a plain file\n"
 msgstr "UYARI: \"%s\" password dosyası düz metin dosyası değildir\n"
 
-#: fe-connect.c:4634
+#: fe-connect.c:4883
 #, c-format
 msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "UYARI: \"%s\" şifre dosyası herkes ya da grup tarafından erişilebilir durumda; dosyanın izinleri u=rw (0600) ya da daha az olmalı\n"
 
-#: fe-connect.c:4722
+#: fe-connect.c:4971
 #, c-format
 msgid "password retrieved from file \"%s\"\n"
 msgstr "\"%s\" dosyasından parola okundu\n"
 
-#: fe-exec.c:827
+#: fe-exec.c:810
 msgid "NOTICE"
 msgstr "BÄ°LGÄ°"
 
-#: fe-exec.c:1014
-#: fe-exec.c:1071
-#: fe-exec.c:1111
+#: fe-exec.c:997
+#: fe-exec.c:1054
+#: fe-exec.c:1094
 msgid "command string is a null pointer\n"
 msgstr "komut katarı null belirteçtir\n"
 
-#: fe-exec.c:1104
-#: fe-exec.c:1199
+#: fe-exec.c:1087
+#: fe-exec.c:1182
 msgid "statement name is a null pointer\n"
 msgstr "durum adı null belirteçtir\n"
 
-#: fe-exec.c:1119
-#: fe-exec.c:1273
-#: fe-exec.c:1928
-#: fe-exec.c:2125
+#: fe-exec.c:1102
+#: fe-exec.c:1256
+#: fe-exec.c:1925
+#: fe-exec.c:2123
 msgid "function requires at least protocol version 3.0\n"
 msgstr "fonksiyon en az 3.0 prokolüne gereksinim duyuyor.\n"
 
-#: fe-exec.c:1230
+#: fe-exec.c:1213
 msgid "no connection to the server\n"
 msgstr "sunucuya bağlantı yok\n"
 
-#: fe-exec.c:1237
+#: fe-exec.c:1220
 msgid "another command is already in progress\n"
 msgstr "ÅŸu anda iÅŸlenen baÅŸka bir komut var\n"
 
-#: fe-exec.c:1349
+#: fe-exec.c:1332
 msgid "length must be given for binary parameter\n"
 msgstr "binary parametresinin uzunluÄŸu belirtilmelidir\n"
 
-#: fe-exec.c:1596
+#: fe-exec.c:1585
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "beklenmeyen asyncStatus: %d\n"
 
-#: fe-exec.c:1616
+#: fe-exec.c:1605
 #, c-format
 msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
 msgstr "PGEventProc \"%s\" işlemi PGEVT_RESULTCREATE işlemi sırasında başarısız oldu\n"
 
-#: fe-exec.c:1746
+#: fe-exec.c:1735
 msgid "COPY terminated by new PQexec"
 msgstr "COPY, yeni PQexec tarafından sonlandırıldı"
 
-#: fe-exec.c:1754
+#: fe-exec.c:1743
 msgid "COPY IN state must be terminated first\n"
 msgstr "Öncelikle COPY IN durumu sonlandırılmalıdır\n"
 
-#: fe-exec.c:1774
+#: fe-exec.c:1763
 msgid "COPY OUT state must be terminated first\n"
 msgstr "Öncelikle COPY OUT durumu sonlandırılmalıdır\n"
 
-#: fe-exec.c:2016
-#: fe-exec.c:2082
+#: fe-exec.c:1771
+msgid "PQexec not allowed during COPY BOTH\n"
+msgstr "PQexec COPY BOTH sırasında izin verilmiyor\n"
+
+#: fe-exec.c:2014
+#: fe-exec.c:2080
 #: fe-exec.c:2167
-#: fe-protocol2.c:1172
-#: fe-protocol3.c:1557
+#: fe-protocol2.c:1237
+#: fe-protocol3.c:1569
 msgid "no COPY in progress\n"
 msgstr "çalışan COPY süreci yok\n"
 
@@ -549,29 +583,26 @@ msgstr "loread fonksiyonunun OID'i belirlenemiyor\n"
 msgid "cannot determine OID of function lowrite\n"
 msgstr "lowrite fonksiyonunun OID'i belirlenemiyor\n"
 
-#: fe-misc.c:262
+#: fe-misc.c:270
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "%lu büyüklüğündeki tamsayılar pqGetInt tarafından desteklenmez."
 
-#: fe-misc.c:298
+#: fe-misc.c:306
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "%lu büyüklüğündeki tamsayılar pqPutInt tarafından desteklenmez."
 
-#: fe-misc.c:578
-#: fe-misc.c:780
+#: fe-misc.c:585
+#: fe-misc.c:784
 msgid "connection not open\n"
 msgstr "bağlantı açık değil\n"
 
-#: fe-misc.c:643
-#: fe-misc.c:733
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "Sunucudan veri alınamadı: %s\n"
-
-#: fe-misc.c:750
-#: fe-misc.c:828
+#: fe-misc.c:711
+#: fe-secure.c:364
+#: fe-secure.c:443
+#: fe-secure.c:524
+#: fe-secure.c:632
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -581,77 +612,75 @@ msgstr ""
 "\tBu ileti sunucunun isteği işlemeden hemen önce ya da \n"
 "\tisteği işlerken kapatıldığı anlamına gelir.\n"
 
-#: fe-misc.c:845
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "Sunucuya veri gönderilemedi: %s\n"
-
-#: fe-misc.c:964
+#: fe-misc.c:948
 msgid "timeout expired\n"
 msgstr "zamanaşımı süresi sona derdi\n"
 
-#: fe-misc.c:1009
+#: fe-misc.c:993
 msgid "socket not open\n"
 msgstr "soket açık değil\n"
 
-#: fe-misc.c:1032
+#: fe-misc.c:1016
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() başarısız oldu: %s\n"
 
-#: fe-protocol2.c:89
+#: fe-protocol2.c:91
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "Geçersiz setenv durumu %c, belleğin zarar görmesinin bir işareti olabilir\n"
 
-#: fe-protocol2.c:330
+#: fe-protocol2.c:390
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "Geçersiz %c durumu, belleğin zarar görmesinin bir işareti olabilir\n"
 
-#: fe-protocol2.c:419
+#: fe-protocol2.c:479
 #: fe-protocol3.c:186
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
 msgstr "Sunucu boÅŸ durumdayken sunucudan 0x%02x ileti tipi geldi"
 
-#: fe-protocol2.c:462
+#: fe-protocol2.c:522
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
 msgstr "Boş sorgu yanıtını takip eden geçersiz karakter:%c  (\"I\" ileti)"
 
-#: fe-protocol2.c:516
+#: fe-protocol2.c:576
+#, c-format
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
 msgstr "Sunucu öncelikli satır tanımı olmadan veri (\"D\" ileti) gönderdi (\"T\" ileti)"
 
-#: fe-protocol2.c:532
+#: fe-protocol2.c:592
+#, c-format
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
 msgstr "Sunucu öncelikli satır tanımı olmadan ikili veri (\"D\" ileti) gönderdi (\"T\" ileti)"
 
-#: fe-protocol2.c:547
-#: fe-protocol3.c:382
+#: fe-protocol2.c:612
+#: fe-protocol3.c:388
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "sunucudan beklenmeyen bir yanıt alındı; alınan ilk karakter\"%c\" idi\n"
 
-#: fe-protocol2.c:768
-#: fe-protocol3.c:701
+#: fe-protocol2.c:833
+#: fe-protocol3.c:707
 msgid "out of memory for query result\n"
 msgstr "Sorgu sonucu için yetersiz bellek\n"
 
-#: fe-protocol2.c:1215
-#: fe-protocol3.c:1625
+#: fe-protocol2.c:1280
+#: fe-protocol3.c:1637
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: fe-protocol2.c:1227
+#: fe-protocol2.c:1292
+#, c-format
 msgid "lost synchronization with server, resetting connection"
 msgstr "sunucu ile eşzamanlama kayboldu, bağlantı yeniden açılıyor"
 
-#: fe-protocol2.c:1361
-#: fe-protocol2.c:1393
-#: fe-protocol3.c:1828
+#: fe-protocol2.c:1426
+#: fe-protocol2.c:1458
+#: fe-protocol3.c:1840
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "protokol hatası: id=0x%x\n"
@@ -660,67 +689,67 @@ msgstr "protokol hatası: id=0x%x\n"
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
 msgstr "Sunucu öncelikli satır tanımı olmadan veri (\"D\" ileti) gönderdi (\"T\" ileti)\n"
 
-#: fe-protocol3.c:403
+#: fe-protocol3.c:409
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr "İleti içeriği,\"%c\" ileti tipinin içindeki uzunlukla aynı değil\n"
 
-#: fe-protocol3.c:424
+#: fe-protocol3.c:430
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr "sunucu ile eşzamanlılık kayboldu: \"%c\" ileti tipi alındı, uzunluğu %d\n"
 
-#: fe-protocol3.c:646
+#: fe-protocol3.c:652
 msgid "unexpected field count in \"D\" message\n"
 msgstr "\"D\" iletisinde beklenmeyen alan sayısı\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:788
-#: fe-protocol3.c:807
+#: fe-protocol3.c:798
+#: fe-protocol3.c:817
 #, c-format
 msgid " at character %s"
 msgstr "%s. karakterde"
 
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "AYRINTI:  %s\n"
 
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "Ä°PUCU:  %s\n"
 
-#: fe-protocol3.c:826
+#: fe-protocol3.c:836
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "SORGU:  %s\n"
 
-#: fe-protocol3.c:829
+#: fe-protocol3.c:839
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "BAÄžLAM:  %s\n"
 
-#: fe-protocol3.c:841
+#: fe-protocol3.c:851
 msgid "LOCATION:  "
 msgstr "YER:  "
 
-#: fe-protocol3.c:843
+#: fe-protocol3.c:853
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:845
+#: fe-protocol3.c:855
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:1069
+#: fe-protocol3.c:1079
 #, c-format
 msgid "LINE %d: "
 msgstr "SATIR %d: "
 
-#: fe-protocol3.c:1453
+#: fe-protocol3.c:1465
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: COPY OUT metnini yapmıyor\n"
 
@@ -729,113 +758,132 @@ msgstr "PQgetline: COPY OUT metnini yapmıyor\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "SSL bağlantısı sağlanamadı: %s\n"
 
-#: fe-secure.c:349
-#: fe-secure.c:436
-#: fe-secure.c:1162
+#: fe-secure.c:369
+#: fe-secure.c:529
+#: fe-secure.c:1331
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL hatası: %s\n"
 
-#: fe-secure.c:355
-#: fe-secure.c:442
-#: fe-secure.c:1166
+#: fe-secure.c:376
+#: fe-secure.c:536
+#: fe-secure.c:1335
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL hatası: EOF bulundu\n"
 
-#: fe-secure.c:367
-#: fe-secure.c:453
-#: fe-secure.c:1175
+#: fe-secure.c:387
+#: fe-secure.c:547
+#: fe-secure.c:1344
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL hatası: %s\n"
 
-#: fe-secure.c:377
-#: fe-secure.c:463
-#: fe-secure.c:1184
+#: fe-secure.c:401
+#: fe-secure.c:561
+msgid "SSL connection has been closed unexpectedly\n"
+msgstr "SSL bağlantısı beklenmeyen şekilde sonlandırıldı\n"
+
+#: fe-secure.c:407
+#: fe-secure.c:567
+#: fe-secure.c:1353
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "tanımlanamayan SSL hata kodu: %d\n"
 
-#: fe-secure.c:601
+#: fe-secure.c:451
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "Sunucudan veri alınamadı: %s\n"
+
+#: fe-secure.c:639
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "Sunucuya veri gönderilemedi: %s\n"
+
+#: fe-secure.c:746
 msgid "host name must be specified for a verified SSL connection\n"
 msgstr "onaylı SSL bağlantısı için sunucu adı belirtilmelidir\n"
 
-#: fe-secure.c:620
+#: fe-secure.c:765
 #, c-format
 msgid "server common name \"%s\" does not match host name \"%s\"\n"
 msgstr "Sunucu ortak adı olan \"%s\", \"%s\" olan host adı ile eşleşmiyor\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:897
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "SSL içeriği yaratılamadı: %s\n"
 
-#: fe-secure.c:843
-msgid "could not get home directory to locate client certificate files\n"
-msgstr "İstemci sertifika dosyalarının olduğu ev dizini bulunamadı\n"
-
-#: fe-secure.c:868
+#: fe-secure.c:1019
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "\"%s\" sertifikası açılamadı: %s\n"
 
-#: fe-secure.c:893
-#: fe-secure.c:903
+#: fe-secure.c:1044
+#: fe-secure.c:1054
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "\"%s\" sertifikası okunamadı: %s\n"
 
-#: fe-secure.c:940
+#: fe-secure.c:1091
 #, c-format
 msgid "could not load SSL engine \"%s\": %s\n"
 msgstr "\"%s\" SSL motoru yüklenemedi: %s\n"
 
-#: fe-secure.c:952
+#: fe-secure.c:1103
 #, c-format
 msgid "could not initialize SSL engine \"%s\": %s\n"
 msgstr "\"%s\" SSL motoru ilklendirilemedi: %s\n"
 
-#: fe-secure.c:968
+#: fe-secure.c:1119
 #, c-format
 msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "\"%2$s\" motorundan \"%1$s\" SSL özel anahtarı okunamadı: %3$s\n"
 
-#: fe-secure.c:982
+#: fe-secure.c:1133
 #, c-format
 msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
 msgstr "\"%2$s\" motorundan \"%1$s\" SSL özel anahtarı yüklenemedi: %3$s\n"
 
-#: fe-secure.c:1017
+#: fe-secure.c:1170
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "Sertifika mevcut ancak özel anahtar mevcut değil \"%s\"\n"
 
-#: fe-secure.c:1025
+#: fe-secure.c:1178
 #, c-format
 msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
 msgstr "\"%s\" özel anahtar dosyası herkes ya da grup tarafından erişilebilir durumda; dosyanın izinleri u=rw (0600) ya da daha az olmalı\n"
 
-#: fe-secure.c:1036
+#: fe-secure.c:1189
 #, c-format
 msgid "could not load private key file \"%s\": %s\n"
 msgstr "private key dosyası \"%s\" okunamıyor: %s\n"
 
-#: fe-secure.c:1050
+#: fe-secure.c:1203
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "Sertifika, \"%s\" özel anahtar dosyası ile uyuşmuyor: %s\n"
 
-#: fe-secure.c:1075
+#: fe-secure.c:1231
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "\"%s\"kök sertifika dosyası okunamadı: %s\n"
 
-#: fe-secure.c:1099
+#: fe-secure.c:1258
 #, c-format
 msgid "SSL library does not support CRL certificates (file \"%s\")\n"
 msgstr "Kurulu SSL kütüphanesi CRL sertifikalarını desteklemiyor (dosya adı \"%s\")\n"
 
-#: fe-secure.c:1120
+#: fe-secure.c:1285
+msgid ""
+"could not get home directory to locate root certificate file\n"
+"Either provide the file or change sslmode to disable server certificate verification.\n"
+msgstr ""
+"kök sertifika dosyasının ev dizini bulunamadı\n"
+"Ya bir dosya adı belirtin, ya da sunucu sertifika onaylamasını kapatmak için sslmode'u kapatın.\n"
+
+#: fe-secure.c:1289
 #, c-format
 msgid ""
 "root certificate file \"%s\" does not exist\n"
@@ -844,24 +892,28 @@ msgstr ""
 "\"%s\" kök sertifika dosyası mevcut değil\n"
 "Ya bu dosyayı oluşturun ya da sslmode ayarını sunucu sertifika onaylamasını kapatmak için değiştirin.\n"
 
-#: fe-secure.c:1203
+#: fe-secure.c:1372
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "sertifika elde edilemedi: %s\n"
 
-#: fe-secure.c:1231
+#: fe-secure.c:1400
 msgid "SSL certificate's common name contains embedded null\n"
 msgstr "SSL sertifikasının ortak adı (common name) gömülü olarak null içeriyor\n"
 
-#: fe-secure.c:1307
+#: fe-secure.c:1476
+#, c-format
 msgid "no SSL error reported"
 msgstr "SSL hatası raporlanmadı"
 
-#: fe-secure.c:1316
+#: fe-secure.c:1485
 #, c-format
 msgid "SSL error code %lu"
 msgstr "SSL hata kodu: %lu"
 
+#~ msgid "could not get home directory to locate client certificate files\n"
+#~ msgstr "İstemci sertifika dosyalarının olduğu ev dizini bulunamadı\n"
+
 #~ msgid ""
 #~ "verified SSL connections are only supported when connecting to a host name"
 #~ msgstr ""
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 9f05d87e34570..70a741a5f410e 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -87,6 +87,8 @@ CLEAN :
 	-@erase "$(INTDIR)\inet_aton.obj"
 	-@erase "$(INTDIR)\crypt.obj"
 	-@erase "$(INTDIR)\noblock.obj"
+	-@erase "$(INTDIR)\chklocale.obj"
+	-@erase "$(INTDIR)\inet_net_ntop.obj"
 	-@erase "$(INTDIR)\md5.obj"
 	-@erase "$(INTDIR)\ip.obj"
 	-@erase "$(INTDIR)\fe-auth.obj"
@@ -112,6 +114,7 @@ CLEAN :
 	-@erase "$(INTDIR)\pgsleep.obj"
 	-@erase "$(INTDIR)\open.obj"
 	-@erase "$(INTDIR)\win32error.obj"
+	-@erase "$(INTDIR)\win32setlocale.obj"
 	-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
 	-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
 	-@erase "$(OUTDIR)\libpq.res"
@@ -132,6 +135,8 @@ LIB32_OBJS= \
 	"$(INTDIR)\inet_aton.obj" \
 	"$(INTDIR)\crypt.obj" \
 	"$(INTDIR)\noblock.obj" \
+	"$(INTDIR)\chklocale.obj" \
+	"$(INTDIR)\inet_net_ntop.obj" \
 	"$(INTDIR)\md5.obj" \
 	"$(INTDIR)\ip.obj" \
 	"$(INTDIR)\fe-auth.obj" \
@@ -155,6 +160,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\pgsleep.obj" \
 	"$(INTDIR)\open.obj" \
 	"$(INTDIR)\win32error.obj" \
+	"$(INTDIR)\win32setlocale.obj" \
 	"$(INTDIR)\pthread-win32.obj"
 
 
@@ -260,6 +266,16 @@ LINK32_OBJS= \
 	$(CPP_PROJ) ..\..\port\noblock.c
 <<
 
+"$(INTDIR)\chklocale.obj" : ..\..\port\chklocale.c
+	$(CPP) @<<
+	$(CPP_PROJ) ..\..\port\chklocale.c
+<<
+
+"$(INTDIR)\inet_net_ntop.obj" : ..\..\port\inet_net_ntop.c
+	$(CPP) @<<
+	$(CPP_PROJ) ..\..\port\inet_net_ntop.c
+<<
+
 "$(INTDIR)\md5.obj" : ..\..\backend\libpq\md5.c
 	$(CPP) @<<
 	$(CPP_PROJ) ..\..\backend\libpq\md5.c
@@ -316,6 +332,11 @@ LINK32_OBJS= \
 	$(CPP_PROJ) /I"." ..\..\port\win32error.c
 <<
 
+"$(INTDIR)\win32setlocale.obj" : ..\..\port\win32setlocale.c
+	$(CPP) @<<
+	$(CPP_PROJ) /I"." ..\..\port\win32setlocale.c
+<<
+
 .c{$(CPP_OBJS)}.obj:
 	$(CPP) $(CPP_PROJ) $<
 
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index 7bf62ae2e8a80..fc759ec082d1c 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -9,9 +9,9 @@ AROPT = crs
 libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib
 
 ifeq ($(host_os), aix3.2.5)
-	rpath = -L$(rpathdir)
+	rpath = -L'$(rpathdir)'
 else
-	rpath = -Wl,-blibpath:$(rpathdir)$(libpath)
+	rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
 endif
 
 DLSUFFIX = .so
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 05ed8416a9f93..8b089e7a761ca 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -38,6 +38,7 @@
 #   SCRIPTS_built -- script files (not binaries) to install into $PREFIX/bin,
 #     which need to be built first
 #   REGRESS -- list of regression test cases (without suffix)
+#   REGRESS_OPTS -- additional switches to pass to pg_regress
 #   EXTRA_CLEAN -- extra files to remove in 'make clean'
 #   PG_CPPFLAGS -- will be added to CPPFLAGS
 #   PG_LIBS -- will be added to PROGRAM link line
@@ -225,10 +226,8 @@ distclean maintainer-clean: clean
 
 ifdef REGRESS
 
-# Calling makefile can set REGRESS_OPTS, but this is the default:
-ifndef REGRESS_OPTS
-REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB)
-endif
+# Select database to use for running the tests
+REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB)
 
 # where to find psql for running the tests
 PSQLDIR = $(bindir)
diff --git a/src/pl/Makefile b/src/pl/Makefile
index ef630fe8d2e13..c4a0d1cd07abd 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -16,14 +16,21 @@ SUBDIRS = plpgsql
 
 ifeq ($(with_perl), yes)
 SUBDIRS += plperl
+else
+ALWAYS_SUBDIRS += plperl
 endif
 
 ifeq ($(with_python), yes)
 SUBDIRS += plpython
+else
+ALWAYS_SUBDIRS += plpython
 endif
 
 ifeq ($(with_tcl), yes)
 SUBDIRS += tcl
+else
+ALWAYS_SUBDIRS += tcl
 endif
 
 $(recurse)
+$(recurse_always)
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 79a8d5d3fadbc..55f48cd401a15 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -55,23 +55,30 @@ endif
 # where to find psql for running the tests
 PSQLDIR = $(bindir)
 
+# where to find xsubpp for building XS.
+XSUBPPDIR = $(shell $(PERL) -e 'use List::Util qw(first); print first { -r "$$_/ExtUtils/xsubpp" } @INC')
+
 include $(top_srcdir)/src/Makefile.shlib
 
-plperl.o: perlchunks.h plperl_opmask.h
+plperl.o: perlchunks.h plperl_opmask.h plperl_helpers.h
 
 plperl_opmask.h: plperl_opmask.pl
+	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
 	$(PERL) $< $@
 
 perlchunks.h: $(PERLCHUNKS)
+	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
 	$(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > $@
 
 all: all-lib
 
 SPI.c: SPI.xs
-	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
+	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
+	$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
 
 Util.c: Util.xs
-	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
+	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
+	$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
 
 
 install: all install-lib install-data
diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
index 5c1cd8cebfdc7..df54937f49406 100644
--- a/src/pl/plperl/expected/plperl.out
+++ b/src/pl/plperl/expected/plperl.out
@@ -101,6 +101,16 @@ SELECT * FROM perl_row();
   1 | hello | world | ({{1}})
 (1 row)
 
+-- test returning a composite literal
+CREATE OR REPLACE FUNCTION perl_row_lit() RETURNS testrowperl AS $$
+    return '(1,hello,world,"({{1}})")';
+$$ LANGUAGE plperl;
+SELECT perl_row_lit();
+       perl_row_lit        
+---------------------------
+ (1,hello,world,"({{1}})")
+(1 row)
+
 CREATE OR REPLACE FUNCTION perl_set() RETURNS SETOF testrowperl AS $$
     return undef;
 $$  LANGUAGE plperl;
@@ -336,7 +346,8 @@ CREATE OR REPLACE FUNCTION foo_bad() RETURNS footype AS $$
 return 42;
 $$ LANGUAGE plperl;
 SELECT * FROM foo_bad();
-ERROR:  composite-returning PL/Perl function must return reference to hash
+ERROR:  malformed record literal: "42"
+DETAIL:  Missing left parenthesis.
 CONTEXT:  PL/Perl function "foo_bad"
 CREATE OR REPLACE FUNCTION foo_bad() RETURNS footype AS $$
 return [
@@ -345,7 +356,7 @@ return [
 ];
 $$ LANGUAGE plperl;
 SELECT * FROM foo_bad();
-ERROR:  composite-returning PL/Perl function must return reference to hash
+ERROR:  cannot convert Perl array to non-array type footype
 CONTEXT:  PL/Perl function "foo_bad"
 CREATE OR REPLACE FUNCTION foo_set_bad() RETURNS SETOF footype AS $$
     return 42;
@@ -639,3 +650,56 @@ CONTEXT:  PL/Perl anonymous code block
 DO $do$ use warnings FATAL => qw(void) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;
 ERROR:  Useless use of sort in scalar context at line 1.
 CONTEXT:  PL/Perl anonymous code block
+--
+-- Make sure strings are validated
+-- Should fail for all encodings, as nul bytes are never permitted.
+--
+CREATE OR REPLACE FUNCTION perl_zerob() RETURNS TEXT AS $$
+  return "abcd\0efg";
+$$ LANGUAGE plperl;
+SELECT perl_zerob();
+ERROR:  invalid byte sequence for encoding "UTF8": 0x00
+CONTEXT:  PL/Perl function "perl_zerob"
+-- make sure functions marked as VOID without an explicit return work
+CREATE OR REPLACE FUNCTION myfuncs() RETURNS void AS $$
+   $_SHARED{myquote} = sub {
+       my $arg = shift;
+       $arg =~ s/(['\\])/\\$1/g;
+       return "'$arg'";
+   };
+$$ LANGUAGE plperl;
+SELECT myfuncs();
+ myfuncs 
+---------
+ 
+(1 row)
+
+-- make sure we can't return an array as a scalar
+CREATE OR REPLACE FUNCTION text_arrayref() RETURNS text AS $$
+	return ['array'];
+$$ LANGUAGE plperl;
+SELECT text_arrayref();
+ERROR:  cannot convert Perl array to non-array type text
+CONTEXT:  PL/Perl function "text_arrayref"
+--- make sure we can't return a hash as a scalar
+CREATE OR REPLACE FUNCTION text_hashref() RETURNS text AS $$
+	return {'hash'=>1};
+$$ LANGUAGE plperl;
+SELECT text_hashref();
+ERROR:  cannot convert Perl hash to non-composite type text
+CONTEXT:  PL/Perl function "text_hashref"
+---- make sure we can't return a blessed object as a scalar
+CREATE OR REPLACE FUNCTION text_obj() RETURNS text AS $$
+	return bless({}, 'Fake::Object');
+$$ LANGUAGE plperl;
+SELECT text_obj();
+ERROR:  cannot convert Perl hash to non-composite type text
+CONTEXT:  PL/Perl function "text_obj"
+----- make sure we can't return a scalar ref
+CREATE OR REPLACE FUNCTION text_scalarref() RETURNS text AS $$
+	my $str = 'str';
+	return \$str;
+$$ LANGUAGE plperl;
+SELECT text_scalarref();
+ERROR:  PL/Perl function must return reference to hash or array
+CONTEXT:  PL/Perl function "text_scalarref"
diff --git a/src/pl/plperl/expected/plperl_array.out b/src/pl/plperl/expected/plperl_array.out
index be76f6cc240b7..829733fef4f8e 100644
--- a/src/pl/plperl/expected/plperl_array.out
+++ b/src/pl/plperl/expected/plperl_array.out
@@ -204,6 +204,16 @@ select plperl_arrays_inout('{{1}, {2}, {3}}');
  {{1},{2},{3}}
 (1 row)
 
+-- check that we can return an array literal
+CREATE OR REPLACE FUNCTION plperl_arrays_inout_l(INTEGER[]) returns INTEGER[] AS $$
+	return shift.''; # stringify it
+$$ LANGUAGE plperl;
+select plperl_arrays_inout_l('{{1}, {2}, {3}}');
+ plperl_arrays_inout_l 
+-----------------------
+ {{1},{2},{3}}
+(1 row)
+
 -- make sure setof works
 create or replace function perl_setof_array(integer[]) returns setof integer[] language plperl as $$
 	my $arr = shift;
diff --git a/src/pl/plperl/nls.mk b/src/pl/plperl/nls.mk
index 85ff132e5b0ea..c9cd7214dcb5a 100644
--- a/src/pl/plperl/nls.mk
+++ b/src/pl/plperl/nls.mk
@@ -1,5 +1,5 @@
 # src/pl/plperl/nls.mk
 CATALOG_NAME	:= plperl
-AVAIL_LANGUAGES	:= de es fr it ja pt_BR ro tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr ja pl pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES	:= plperl.c SPI.c
 GETTEXT_TRIGGERS:= errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext
diff --git a/src/pl/plperl/plperl--1.0.sql b/src/pl/plperl/plperl--1.0.sql
index befd88274550c..801900f023db5 100644
--- a/src/pl/plperl/plperl--1.0.sql
+++ b/src/pl/plperl/plperl--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE plperl;
+
+COMMENT ON PROCEDURAL LANGUAGE plperl IS 'PL/Perl procedural language';
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 61252308cd871..8ae5a627e4632 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -154,7 +154,6 @@ typedef struct plperl_call_data
 	FunctionCallInfo fcinfo;
 	Tuplestorestate *tuple_store;
 	TupleDesc	ret_tdesc;
-	AttInMetadata *attinmeta;
 	MemoryContext tmp_cxt;
 } plperl_call_data;
 
@@ -243,12 +242,16 @@ static SV  *plperl_ref_from_pg_array(Datum arg, Oid typid);
 static SV  *split_array(plperl_array_info *info, int first, int last, int nest);
 static SV  *make_array_ref(plperl_array_info *info, int first, int last);
 static SV  *get_perl_array_ref(SV *sv);
-static Datum plperl_sv_to_datum(SV *sv, FmgrInfo *func, Oid typid,
-				   Oid typioparam, int32 typmod, bool *isnull);
-static void _sv_to_datum_finfo(FmgrInfo *fcinfo, Oid typid, Oid *typioparam);
-static Datum plperl_array_to_datum(SV *src, Oid typid);
-static ArrayBuildState *_array_to_datum(AV *av, int *ndims, int *dims,
-			  int cur_depth, ArrayBuildState *astate, Oid typid, Oid atypid);
+static Datum plperl_sv_to_datum(SV *sv, Oid typid, int32 typmod,
+				   FunctionCallInfo fcinfo,
+				   FmgrInfo *finfo, Oid typioparam,
+				   bool *isnull);
+static void _sv_to_datum_finfo(Oid typid, FmgrInfo *finfo, Oid *typioparam);
+static Datum plperl_array_to_datum(SV *src, Oid typid, int32 typmod);
+static ArrayBuildState *array_to_datum_internal(AV *av, ArrayBuildState *astate,
+						int *ndims, int *dims, int cur_depth,
+						Oid arraytypid, Oid elemtypid, int32 typmod,
+						FmgrInfo *finfo, Oid typioparam);
 static Datum plperl_hash_to_datum(SV *src, TupleDesc td);
 
 static void plperl_init_shared_libs(pTHX);
@@ -987,9 +990,8 @@ strip_trailing_ws(const char *msg)
 /* Build a tuple from a hash. */
 
 static HeapTuple
-plperl_build_tuple_result(HV *perlhash, AttInMetadata *attinmeta)
+plperl_build_tuple_result(HV *perlhash, TupleDesc td)
 {
-	TupleDesc	td = attinmeta->tupdesc;
 	Datum	   *values;
 	bool	   *nulls;
 	HE		   *he;
@@ -1005,7 +1007,6 @@ plperl_build_tuple_result(HV *perlhash, AttInMetadata *attinmeta)
 		SV		   *val = HeVAL(he);
 		char	   *key = hek2cstr(he);
 		int			attn = SPI_fnumber(td, key);
-		bool		isnull;
 
 		if (attn <= 0 || td->attrs[attn - 1]->attisdropped)
 			ereport(ERROR,
@@ -1014,12 +1015,12 @@ plperl_build_tuple_result(HV *perlhash, AttInMetadata *attinmeta)
 							key)));
 
 		values[attn - 1] = plperl_sv_to_datum(val,
-											  NULL,
 											  td->attrs[attn - 1]->atttypid,
-											  InvalidOid,
 											  td->attrs[attn - 1]->atttypmod,
-											  &isnull);
-		nulls[attn - 1] = isnull;
+											  NULL,
+											  NULL,
+											  InvalidOid,
+											  &nulls[attn - 1]);
 
 		pfree(key);
 	}
@@ -1035,8 +1036,7 @@ plperl_build_tuple_result(HV *perlhash, AttInMetadata *attinmeta)
 static Datum
 plperl_hash_to_datum(SV *src, TupleDesc td)
 {
-	AttInMetadata *attinmeta = TupleDescGetAttInMetadata(td);
-	HeapTuple	tup = plperl_build_tuple_result((HV *) SvRV(src), attinmeta);
+	HeapTuple	tup = plperl_build_tuple_result((HV *) SvRV(src), td);
 
 	return HeapTupleGetDatum(tup);
 }
@@ -1068,57 +1068,75 @@ get_perl_array_ref(SV *sv)
 }
 
 /*
- * helper function for plperl_array_to_datum, does the main recursing
+ * helper function for plperl_array_to_datum, recurses for multi-D arrays
  */
 static ArrayBuildState *
-_array_to_datum(AV *av, int *ndims, int *dims, int cur_depth,
-				ArrayBuildState *astate, Oid typid, Oid atypid)
+array_to_datum_internal(AV *av, ArrayBuildState *astate,
+						int *ndims, int *dims, int cur_depth,
+						Oid arraytypid, Oid elemtypid, int32 typmod,
+						FmgrInfo *finfo, Oid typioparam)
 {
-	int			i = 0;
+	int			i;
 	int			len = av_len(av) + 1;
 
-	if (len == 0)
-		astate = accumArrayResult(astate, (Datum) 0, true, atypid, NULL);
-
 	for (i = 0; i < len; i++)
 	{
+		/* fetch the array element */
 		SV		  **svp = av_fetch(av, i, FALSE);
+
+		/* see if this element is an array, if so get that */
 		SV		   *sav = svp ? get_perl_array_ref(*svp) : NULL;
 
+		/* multi-dimensional array? */
 		if (sav)
 		{
 			AV		   *nav = (AV *) SvRV(sav);
 
+			/* dimensionality checks */
 			if (cur_depth + 1 > MAXDIM)
 				ereport(ERROR,
 						(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 						 errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
 								cur_depth + 1, MAXDIM)));
 
-			/* size based off the first element */
+			/* set size when at first element in this level, else compare */
 			if (i == 0 && *ndims == cur_depth)
 			{
 				dims[*ndims] = av_len(nav) + 1;
 				(*ndims)++;
 			}
-			else
-			{
-				if (av_len(nav) + 1 != dims[cur_depth])
-					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-							 errmsg("multidimensional arrays must have array expressions with matching dimensions")));
-			}
-
-			astate = _array_to_datum(nav, ndims, dims, cur_depth + 1, astate,
-									 typid, atypid);
+			else if (av_len(nav) + 1 != dims[cur_depth])
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+						 errmsg("multidimensional arrays must have array expressions with matching dimensions")));
+
+			/* recurse to fetch elements of this sub-array */
+			astate = array_to_datum_internal(nav, astate,
+											 ndims, dims, cur_depth + 1,
+											 arraytypid, elemtypid, typmod,
+											 finfo, typioparam);
 		}
 		else
 		{
+			Datum		dat;
 			bool		isnull;
-			Datum		dat = plperl_sv_to_datum(svp ? *svp : NULL, NULL,
-												 atypid, 0, -1, &isnull);
 
-			astate = accumArrayResult(astate, dat, isnull, atypid, NULL);
+			/* scalar after some sub-arrays at same level? */
+			if (*ndims != cur_depth)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+						 errmsg("multidimensional arrays must have array expressions with matching dimensions")));
+
+			dat = plperl_sv_to_datum(svp ? *svp : NULL,
+									 elemtypid,
+									 typmod,
+									 NULL,
+									 finfo,
+									 typioparam,
+									 &isnull);
+
+			astate = accumArrayResult(astate, dat, isnull,
+									  elemtypid, CurrentMemoryContext);
 		}
 	}
 
@@ -1129,86 +1147,141 @@ _array_to_datum(AV *av, int *ndims, int *dims, int cur_depth,
  * convert perl array ref to a datum
  */
 static Datum
-plperl_array_to_datum(SV *src, Oid typid)
+plperl_array_to_datum(SV *src, Oid typid, int32 typmod)
 {
-	ArrayBuildState *astate = NULL;
-	Oid			atypid;
+	ArrayBuildState *astate;
+	Oid			elemtypid;
+	FmgrInfo	finfo;
+	Oid			typioparam;
 	int			dims[MAXDIM];
 	int			lbs[MAXDIM];
 	int			ndims = 1;
 	int			i;
 
-	atypid = get_element_type(typid);
-	if (!atypid)
-		atypid = typid;
+	elemtypid = get_element_type(typid);
+	if (!elemtypid)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("cannot convert Perl array to non-array type %s",
+						format_type_be(typid))));
+
+	_sv_to_datum_finfo(elemtypid, &finfo, &typioparam);
 
 	memset(dims, 0, sizeof(dims));
 	dims[0] = av_len((AV *) SvRV(src)) + 1;
 
-	astate = _array_to_datum((AV *) SvRV(src), &ndims, dims, 1, astate, typid,
-							 atypid);
+	astate = array_to_datum_internal((AV *) SvRV(src), NULL,
+									 &ndims, dims, 1,
+									 typid, elemtypid, typmod,
+									 &finfo, typioparam);
+
+	if (!astate)
+		return PointerGetDatum(construct_empty_array(elemtypid));
 
 	for (i = 0; i < ndims; i++)
 		lbs[i] = 1;
 
-	return makeMdArrayResult(astate, ndims, dims, lbs, CurrentMemoryContext, true);
+	return makeMdArrayResult(astate, ndims, dims, lbs,
+							 CurrentMemoryContext, true);
 }
 
+/* Get the information needed to convert data to the specified PG type */
 static void
-_sv_to_datum_finfo(FmgrInfo *fcinfo, Oid typid, Oid *typioparam)
+_sv_to_datum_finfo(Oid typid, FmgrInfo *finfo, Oid *typioparam)
 {
 	Oid			typinput;
 
 	/* XXX would be better to cache these lookups */
 	getTypeInputInfo(typid,
 					 &typinput, typioparam);
-	fmgr_info(typinput, fcinfo);
+	fmgr_info(typinput, finfo);
 }
 
 /*
- * convert a sv to datum
- * fcinfo and typioparam are optional and will be looked-up if needed
+ * convert Perl SV to PG datum of type typid, typmod typmod
+ *
+ * Pass the PL/Perl function's fcinfo when attempting to convert to the
+ * function's result type; otherwise pass NULL.  This is used when we need to
+ * resolve the actual result type of a function returning RECORD.
+ *
+ * finfo and typioparam should be the results of _sv_to_datum_finfo for the
+ * given typid, or NULL/InvalidOid to let this function do the lookups.
+ *
+ * *isnull is an output parameter.
  */
 static Datum
-plperl_sv_to_datum(SV *sv, FmgrInfo *finfo, Oid typid, Oid typioparam,
-				   int32 typmod, bool *isnull)
+plperl_sv_to_datum(SV *sv, Oid typid, int32 typmod,
+				   FunctionCallInfo fcinfo,
+				   FmgrInfo *finfo, Oid typioparam,
+				   bool *isnull)
 {
 	FmgrInfo	tmp;
 
 	/* we might recurse */
 	check_stack_depth();
 
-	if (isnull)
-		*isnull = false;
+	*isnull = false;
 
-	if (!sv || !SvOK(sv))
+	/*
+	 * Return NULL if result is undef, or if we're in a function returning
+	 * VOID.  In the latter case, we should pay no attention to the last Perl
+	 * statement's result, and this is a convenient means to ensure that.
+	 */
+	if (!sv || !SvOK(sv) || typid == VOIDOID)
 	{
+		/* look up type info if they did not pass it */
 		if (!finfo)
 		{
-			_sv_to_datum_finfo(&tmp, typid, &typioparam);
+			_sv_to_datum_finfo(typid, &tmp, &typioparam);
 			finfo = &tmp;
 		}
-		if (isnull)
-			*isnull = true;
+		*isnull = true;
+		/* must call typinput in case it wants to reject NULL */
 		return InputFunctionCall(finfo, NULL, typioparam, typmod);
 	}
 	else if (SvROK(sv))
 	{
+		/* handle references */
 		SV		   *sav = get_perl_array_ref(sv);
 
 		if (sav)
 		{
-			return plperl_array_to_datum(sav, typid);
+			/* handle an arrayref */
+			return plperl_array_to_datum(sav, typid, typmod);
 		}
 		else if (SvTYPE(SvRV(sv)) == SVt_PVHV)
 		{
-			TupleDesc	td = lookup_rowtype_tupdesc(typid, typmod);
-			Datum		ret = plperl_hash_to_datum(sv, td);
+			/* handle a hashref */
+			Datum		ret;
+			TupleDesc	td;
+
+			if (!type_is_rowtype(typid))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("cannot convert Perl hash to non-composite type %s",
+								format_type_be(typid))));
 
+			td = lookup_rowtype_tupdesc_noerror(typid, typmod, true);
+			if (td == NULL)
+			{
+				/* Try to look it up based on our result type */
+				if (fcinfo == NULL ||
+					get_call_result_type(fcinfo, NULL, &td) != TYPEFUNC_COMPOSITE)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("function returning record called in context "
+									"that cannot accept type record")));
+			}
+
+			ret = plperl_hash_to_datum(sv, td);
+
+			/* Release on the result of get_call_result_type is harmless */
 			ReleaseTupleDesc(td);
+
 			return ret;
 		}
 
+		/* Reference, but not reference to hash or array ... */
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 		 errmsg("PL/Perl function must return reference to hash or array")));
@@ -1216,12 +1289,14 @@ plperl_sv_to_datum(SV *sv, FmgrInfo *finfo, Oid typid, Oid typioparam,
 	}
 	else
 	{
+		/* handle a string/number */
 		Datum		ret;
 		char	   *str = sv2cstr(sv);
 
+		/* did not pass in any typeinfo? look it up */
 		if (!finfo)
 		{
-			_sv_to_datum_finfo(&tmp, typid, &typioparam);
+			_sv_to_datum_finfo(typid, &tmp, &typioparam);
 			finfo = &tmp;
 		}
 
@@ -1246,7 +1321,10 @@ plperl_sv_to_literal(SV *sv, char *fqtypename)
 	if (!OidIsValid(typid))
 		elog(ERROR, "lookup failed for type %s", fqtypename);
 
-	datum = plperl_sv_to_datum(sv, NULL, typid, 0, -1, &isnull);
+	datum = plperl_sv_to_datum(sv,
+							   typid, -1,
+							   NULL, NULL, InvalidOid,
+							   &isnull);
 
 	if (isnull)
 		return NULL;
@@ -1537,10 +1615,11 @@ plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup)
 							key)));
 
 		modvalues[slotsused] = plperl_sv_to_datum(val,
-												  NULL,
 										  tupdesc->attrs[attn - 1]->atttypid,
-												  InvalidOid,
 										 tupdesc->attrs[attn - 1]->atttypmod,
+												  NULL,
+												  NULL,
+												  InvalidOid,
 												  &isnull);
 
 		modnulls[slotsused] = isnull ? 'n' : ' ';
@@ -2038,10 +2117,9 @@ plperl_func_handler(PG_FUNCTION_ARGS)
 	Datum		retval = 0;
 	ReturnSetInfo *rsi;
 	ErrorContextCallback pl_error_context;
-	bool		has_retval = false;
 
 	/*
-	 * Create the call_data beforing connecting to SPI, so that it is not
+	 * Create the call_data before connecting to SPI, so that it is not
 	 * allocated in the SPI memory context
 	 */
 	current_call_data = (plperl_call_data *) palloc0(sizeof(plperl_call_data));
@@ -2124,51 +2202,19 @@ plperl_func_handler(PG_FUNCTION_ARGS)
 			rsi->setDesc = current_call_data->ret_tdesc;
 		}
 		retval = (Datum) 0;
-		has_retval = true;
 	}
-	else if (!SvOK(perlret))
-	{
-		/* Return NULL if Perl code returned undef */
-		if (rsi && IsA(rsi, ReturnSetInfo))
-			rsi->isDone = ExprEndResult;
-	}
-	else if (prodesc->fn_retistuple)
-	{
-		/* Return a perl hash converted to a Datum */
-		TupleDesc	td;
-
-		if (!SvOK(perlret) || !SvROK(perlret) ||
-			SvTYPE(SvRV(perlret)) != SVt_PVHV)
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("composite-returning PL/Perl function "
-							"must return reference to hash")));
-		}
-
-		/* XXX should cache the attinmeta data instead of recomputing */
-		if (get_call_result_type(fcinfo, NULL, &td) != TYPEFUNC_COMPOSITE)
-		{
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("function returning record called in context "
-							"that cannot accept type record")));
-		}
-
-		retval = plperl_hash_to_datum(perlret, td);
-		has_retval = true;
-	}
-
-	if (!has_retval)
+	else
 	{
-		bool		isnull;
-
 		retval = plperl_sv_to_datum(perlret,
-									&prodesc->result_in_func,
 									prodesc->result_oid,
-									prodesc->result_typioparam, -1, &isnull);
-		fcinfo->isnull = isnull;
-		has_retval = true;
+									-1,
+									fcinfo,
+									&prodesc->result_in_func,
+									prodesc->result_typioparam,
+									&fcinfo->isnull);
+
+		if (fcinfo->isnull && rsi && IsA(rsi, ReturnSetInfo))
+			rsi->isDone = ExprEndResult;
 	}
 
 	/* Restore the previous error callback */
@@ -2191,7 +2237,7 @@ plperl_trigger_handler(PG_FUNCTION_ARGS)
 	ErrorContextCallback pl_error_context;
 
 	/*
-	 * Create the call_data beforing connecting to SPI, so that it is not
+	 * Create the call_data before connecting to SPI, so that it is not
 	 * allocated in the SPI memory context
 	 */
 	current_call_data = (plperl_call_data *) palloc0(sizeof(plperl_call_data));
@@ -2837,19 +2883,11 @@ plperl_return_next(SV *sv)
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("cannot use return_next in a non-SETOF function")));
 
-	if (prodesc->fn_retistuple &&
-		!(SvOK(sv) && SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVHV))
-		ereport(ERROR,
-				(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("SETOF-composite-returning PL/Perl function "
-						"must call return_next with reference to hash")));
-
 	if (!current_call_data->ret_tdesc)
 	{
 		TupleDesc	tupdesc;
 
 		Assert(!current_call_data->tuple_store);
-		Assert(!current_call_data->attinmeta);
 
 		/*
 		 * This is the first call to return_next in the current PL/Perl
@@ -2870,11 +2908,6 @@ plperl_return_next(SV *sv)
 		current_call_data->tuple_store =
 			tuplestore_begin_heap(rsi->allowedModes & SFRM_Materialize_Random,
 								  false, work_mem);
-		if (prodesc->fn_retistuple)
-		{
-			current_call_data->attinmeta =
-				TupleDescGetAttInMetadata(current_call_data->ret_tdesc);
-		}
 
 		MemoryContextSwitchTo(old_cxt);
 	}
@@ -2888,7 +2921,7 @@ plperl_return_next(SV *sv)
 	if (!current_call_data->tmp_cxt)
 	{
 		current_call_data->tmp_cxt =
-			AllocSetContextCreate(rsi->econtext->ecxt_per_tuple_memory,
+			AllocSetContextCreate(CurrentMemoryContext,
 								  "PL/Perl return_next temporary cxt",
 								  ALLOCSET_DEFAULT_MINSIZE,
 								  ALLOCSET_DEFAULT_INITSIZE,
@@ -2901,8 +2934,14 @@ plperl_return_next(SV *sv)
 	{
 		HeapTuple	tuple;
 
+		if (!(SvOK(sv) && SvROK(sv) && SvTYPE(SvRV(sv)) == SVt_PVHV))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("SETOF-composite-returning PL/Perl function "
+							"must call return_next with reference to hash")));
+
 		tuple = plperl_build_tuple_result((HV *) SvRV(sv),
-										  current_call_data->attinmeta);
+										  current_call_data->ret_tdesc);
 		tuplestore_puttuple(current_call_data->tuple_store, tuple);
 	}
 	else
@@ -2911,10 +2950,12 @@ plperl_return_next(SV *sv)
 		bool		isNull;
 
 		ret = plperl_sv_to_datum(sv,
-								 &prodesc->result_in_func,
 								 prodesc->result_oid,
+								 -1,
+								 fcinfo,
+								 &prodesc->result_in_func,
 								 prodesc->result_typioparam,
-								 -1, &isNull);
+								 &isNull);
 
 		tuplestore_putvalues(current_call_data->tuple_store,
 							 current_call_data->ret_tdesc,
@@ -3317,10 +3358,12 @@ plperl_spi_exec_prepared(char *query, HV *attr, int argc, SV **argv)
 			bool		isnull;
 
 			argvalues[i] = plperl_sv_to_datum(argv[i],
-											  &qdesc->arginfuncs[i],
 											  qdesc->argtypes[i],
+											  -1,
+											  NULL,
+											  &qdesc->arginfuncs[i],
 											  qdesc->argtypioparams[i],
-											  -1, &isnull);
+											  &isnull);
 			nulls[i] = isnull ? 'n' : ' ';
 		}
 
@@ -3442,10 +3485,12 @@ plperl_spi_query_prepared(char *query, int argc, SV **argv)
 			bool		isnull;
 
 			argvalues[i] = plperl_sv_to_datum(argv[i],
-											  &qdesc->arginfuncs[i],
 											  qdesc->argtypes[i],
+											  -1,
+											  NULL,
+											  &qdesc->arginfuncs[i],
 											  qdesc->argtypioparams[i],
-											  -1, &isnull);
+											  &isnull);
 			nulls[i] = isnull ? 'n' : ' ';
 		}
 
diff --git a/src/pl/plperl/plperl_helpers.h b/src/pl/plperl/plperl_helpers.h
index 81c177b164b82..ac0a97d7aa611 100644
--- a/src/pl/plperl/plperl_helpers.h
+++ b/src/pl/plperl/plperl_helpers.h
@@ -7,10 +7,21 @@
 static inline char *
 utf_u2e(const char *utf8_str, size_t len)
 {
-	char	   *ret = (char *) pg_do_encoding_conversion((unsigned char *) utf8_str, len, PG_UTF8, GetDatabaseEncoding());
+	int 	    enc = GetDatabaseEncoding();
+
+	char	   *ret = (char *) pg_do_encoding_conversion((unsigned char *) utf8_str, len, PG_UTF8, enc);
+
+	/*
+	* when we are a PG_UTF8 or SQL_ASCII database
+	* pg_do_encoding_conversion() will not do any conversion or
+	* verification. we need to do it manually instead.
+	*/
+	if (enc == PG_UTF8 || enc == PG_SQL_ASCII)
+		pg_verify_mbstr_len(PG_UTF8, utf8_str, len, false);
 
 	if (ret == utf8_str)
 		ret = pstrdup(ret);
+
 	return ret;
 }
 
diff --git a/src/pl/plperl/plperlu--1.0.sql b/src/pl/plperl/plperlu--1.0.sql
index 025f7957c4d8f..d1d213dd5f8bc 100644
--- a/src/pl/plperl/plperlu--1.0.sql
+++ b/src/pl/plperl/plperlu--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE plperlu;
+
+COMMENT ON PROCEDURAL LANGUAGE plperlu IS 'PL/PerlU untrusted procedural language';
diff --git a/src/pl/plperl/po/cs.po b/src/pl/plperl/po/cs.po
new file mode 100644
index 0000000000000..5d8665f60be93
--- /dev/null
+++ b/src/pl/plperl/po/cs.po
@@ -0,0 +1,191 @@
+# LANGUAGE message translation file for plperl
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-04 02:51+0000\n"
+"PO-Revision-Date: 2011-09-05 14:10+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: plperl.c:361
+msgid ""
+"If true, trusted and untrusted Perl code will be compiled in strict mode."
+msgstr ""
+"Pokud je true, trusted a untrusted Perl kód bude zkompilován ve striktním "
+"módu."
+
+#: plperl.c:375
+msgid ""
+"Perl initialization code to execute when a Perl interpreter is initialized."
+msgstr "Perl inicializa�ní kód spouštěný při inicializaci Perl interpreteru."
+
+#: plperl.c:397
+msgid "Perl initialization code to execute once when plperl is first used."
+msgstr "Perl inicializa�ní kód spouštěný při prvním použití jazyka plperl."
+
+#: plperl.c:405
+msgid "Perl initialization code to execute once when plperlu is first used."
+msgstr "Perl inicializa�ní kód spouštěný při prvním použití jazyka plperlu."
+
+#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
+#: plperl.c:945 plperl.c:966 plperl.c:1867 plperl.c:1962 plperl.c:2024
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plperl.c:623
+msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
+msgstr "během spouštění PostgreSQL::InServer::SPI::bootstrap"
+
+#: plperl.c:785
+msgid "while parsing Perl initialization"
+msgstr "během parsování Perl inicializace"
+
+#: plperl.c:790
+msgid "while running Perl initialization"
+msgstr "během běhu Perl inicializace"
+
+#: plperl.c:894
+msgid "while executing PLC_TRUSTED"
+msgstr "během spouštění PLC_TRUSTED"
+
+#: plperl.c:905
+msgid "while executing utf8fix"
+msgstr "během spouštění utf8fix"
+
+#: plperl.c:946
+msgid "while executing plperl.on_plperl_init"
+msgstr "během spouštění plperl.on_plperl_init"
+
+#: plperl.c:967
+msgid "while executing plperl.on_plperlu_init"
+msgstr "během spouštění plperl.on_plperlu_init"
+
+#: plperl.c:1013 plperl.c:1540
+#, c-format
+msgid "Perl hash contains nonexistent column \"%s\""
+msgstr "Perl hash obsahuje neexistující sloupec \"%s\""
+
+#: plperl.c:1096
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "po�et rozměrů pole (%d) překra�uje povolené maximum (%d)"
+
+#: plperl.c:1110
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr "vícerozměrná pole musí mít výrazy s odpovídajícími rozměry"
+
+#: plperl.c:1218
+#| msgid "composite-returning PL/Perl function must return reference to hash"
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "PL/Perl funkce musí vracet odkaz na hash nebo pole"
+
+#: plperl.c:1517
+msgid "$_TD->{new} does not exist"
+msgstr "$_TD->{new} neexistuje"
+
+#: plperl.c:1521
+msgid "$_TD->{new} is not a hash reference"
+msgstr "$_TD->{new} není odkaz na hash"
+
+#: plperl.c:1744 plperl.c:2475
+#, c-format
+msgid "PL/Perl functions cannot return type %s"
+msgstr "PL/Perl funkce nemohou vracet datový typ %s"
+
+#: plperl.c:1757 plperl.c:2522
+#, c-format
+msgid "PL/Perl functions cannot accept type %s"
+msgstr "PL/Perl funkce nemohou přijímat datový typ %s"
+
+#: plperl.c:1871
+#, c-format
+msgid "didn't get a CODE reference from compiling function \"%s\""
+msgstr ""
+
+#: plperl.c:2076
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"funkce vracející tabulku (set-valued) byla zavolána z kontextu, který "
+"neumožňuje přijetí tabulky"
+
+#: plperl.c:2120
+msgid ""
+"set-returning PL/Perl function must return reference to array or use "
+"return_next"
+msgstr ""
+"PL/Perl funkce vracející tabulku (set-returned) musí vracet odkaz na pole "
+"nebo používat return_next."
+
+#: plperl.c:2149
+msgid "composite-returning PL/Perl function must return reference to hash"
+msgstr ""
+"PL/Perl funkce vracející složený datový typ (composite-returning) musí "
+"vracet odkaz na hash"
+
+#: plperl.c:2158
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"funkce vracející záznam byla zavolána z kontextu, který neumožňuje přijetí "
+"záznamu"
+
+#: plperl.c:2272
+msgid "ignoring modified row in DELETE trigger"
+msgstr "ignoruje modifikovaný řádek v DELETE triggeru"
+
+#: plperl.c:2280
+msgid ""
+"result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
+msgstr ""
+"výsledek PL/Perl trigger funkce musí být undef, \"SKIP\", nebo \"MODIFY\""
+
+#: plperl.c:2406 plperl.c:2412
+msgid "out of memory"
+msgstr "nedostatek paměti"
+
+#: plperl.c:2466
+msgid "trigger functions can only be called as triggers"
+msgstr ""
+"funkce pro obsluhu triggerů mohou být volané pouze prostřednictvím triggerů"
+
+#: plperl.c:2842
+msgid "cannot use return_next in a non-SETOF function"
+msgstr ""
+"return_next nelze použít v non-SETOF funkci (funkci nevracející tabulku)"
+
+#: plperl.c:2848
+msgid ""
+"SETOF-composite-returning PL/Perl function must call return_next with "
+"reference to hash"
+msgstr ""
+"PL/Perl funkce vracející tabulku složených typů (SETOF-composite-returning) "
+"musí volat return_next s odkazem na hash"
+
+#: plperl.c:3614
+#, c-format
+msgid "PL/Perl function \"%s\""
+msgstr "PL/Perl funkce \"%s\""
+
+#: plperl.c:3626
+#, c-format
+msgid "compilation of PL/Perl function \"%s\""
+msgstr "kompilace PL/Perl funkce \"%s\""
+
+#: plperl.c:3635
+msgid "PL/Perl anonymous code block"
+msgstr "PL/Perl anonymní blok kódu"
+
+
diff --git a/src/pl/plperl/po/de.po b/src/pl/plperl/po/de.po
index e5c148c75c3d7..e509b7f507ac6 100644
--- a/src/pl/plperl/po/de.po
+++ b/src/pl/plperl/po/de.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PostgreSQL package.
 # Peter Eisentraut <peter_e@gmx.net>, 2009 - 2011.
 #
-# pgtranslation Id: plperl.po,v 1.7 2011/05/11 17:25:41 petere Exp $
+# pgtranslation Id: plperl.po,v 1.8 2011/11/30 06:10:49 petere Exp $
 #
 # Use these quotes: »%s«
 #
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-11 04:38+0000\n"
-"PO-Revision-Date: 2011-05-11 19:49+0300\n"
+"POT-Creation-Date: 2011-11-09 20:39+0000\n"
+"PO-Revision-Date: 2011-11-29 22:53+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -20,117 +20,135 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:361
+#: plperl.c:364
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Wenn wahr, dann wird vertrauenswürdiger und nicht vertrauenswürdiger Perl-"
 "Code im »strict«-Modus kompiliert."
 
-#: plperl.c:375
+#: plperl.c:378
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
 "Perl-Initialisierungscode, der ausgeführt wird, wenn der Perl-Interpreter "
 "initialisiert wird."
 
-#: plperl.c:397
+#: plperl.c:400
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr ""
 "Perl-Initialisierungscode, der ausgeführt wird, wenn plperl zum ersten Mal "
 "benutzt wird."
 
-#: plperl.c:405
+#: plperl.c:408
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr ""
 "Perl-Initialisierungscode, der ausgeführt wird, wenn plperlu zum ersten Mal "
 "benutzt wird."
 
-#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
-#: plperl.c:945 plperl.c:966 plperl.c:1857 plperl.c:1952 plperl.c:2011
+#: plperl.c:625 plperl.c:787 plperl.c:792 plperl.c:896 plperl.c:907
+#: plperl.c:948 plperl.c:969 plperl.c:1942 plperl.c:2037 plperl.c:2099
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:623
+#: plperl.c:626
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "beim Ausführen von PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:785
+#: plperl.c:788
 msgid "while parsing Perl initialization"
 msgstr "beim Parsen der Perl-Initialisierung"
 
-#: plperl.c:790
+#: plperl.c:793
 msgid "while running Perl initialization"
 msgstr "beim Ausführen der Perl-Initialisierung"
 
-#: plperl.c:894
+#: plperl.c:897
 msgid "while executing PLC_TRUSTED"
 msgstr "beim Ausführen von PLC_TRUSTED"
 
-#: plperl.c:905
+#: plperl.c:908
 msgid "while executing utf8fix"
 msgstr "beim Ausführen von utf8fix"
 
-#: plperl.c:946
+#: plperl.c:949
 msgid "while executing plperl.on_plperl_init"
 msgstr "beim Ausführen von plperl.on_plperl_init"
 
-#: plperl.c:967
+#: plperl.c:970
 msgid "while executing plperl.on_plperlu_init"
 msgstr "beim Ausführen von plperl.on_plperlu_init"
 
-#: plperl.c:1013 plperl.c:1530
+#: plperl.c:1014 plperl.c:1614
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl-Hash enthält nicht existierende Spalte »%s«"
 
-#: plperl.c:1095
+#: plperl.c:1099
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "Anzahl der Arraydimensionen (%d) überschreitet erlaubtes Maximum (%d)"
 
-#: plperl.c:1109
+#: plperl.c:1111 plperl.c:1128
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
 msgstr ""
 "mehrdimensionale Arrays müssen Arraysausdrücke mit gleicher Anzahl "
 "Dimensionen haben"
 
-#: plperl.c:1214
+#: plperl.c:1165
+#, c-format
+msgid "cannot convert Perl array to non-array type %s"
+msgstr "kann Perl-Array nicht in Nicht-Array-Typ %s umwandeln"
+
+#: plperl.c:1261
+#, c-format
+msgid "cannot convert Perl hash to non-composite type %s"
+msgstr "kann Perl-Hash nicht in nicht zusammengesetzten Typ %s umwandeln"
+
+#: plperl.c:1272
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"Funktion, die einen Record zurückgibt, in einem Zusammenhang aufgerufen, der "
+"Typ record nicht verarbeiten kann"
+
+#: plperl.c:1287
 msgid "PL/Perl function must return reference to hash or array"
-msgstr "PL/Perl-Funktion muss eine Referenz auf ein Hash oder ein Array zurückgeben"
+msgstr ""
+"PL/Perl-Funktion muss eine Referenz auf ein Hash oder ein Array zurückgeben"
 
-#: plperl.c:1507
+#: plperl.c:1591
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} existiert nicht"
 
-#: plperl.c:1511
+#: plperl.c:1595
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} ist keine Hash-Referenz"
 
-#: plperl.c:1734 plperl.c:2462
+#: plperl.c:1819 plperl.c:2517
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "PL/Perl-Funktionen können keinen Rückgabetyp %s haben"
 
-#: plperl.c:1747 plperl.c:2509
+#: plperl.c:1832 plperl.c:2564
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "PL/Perl-Funktionen können Typ %s nicht annehmen"
 
-#: plperl.c:1861
+#: plperl.c:1946
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "keine CODE-Referenz erhalten beim Kompilieren von Funktion »%s«"
 
-#: plperl.c:2063
+#: plperl.c:2150
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "Funktion mit Mengenergebnis in einem Zusammenhang aufgerufen, der keine "
 "Mengenergebnisse verarbeiten kann"
 
-#: plperl.c:2107
+#: plperl.c:2194
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -138,43 +156,30 @@ msgstr ""
 "PL/Perl-Funktionen mit Mengenergebnis müssen eine Referenz auf ein Array "
 "zurückgeben oder return_next verwenden"
 
-#: plperl.c:2136
-msgid "composite-returning PL/Perl function must return reference to hash"
-msgstr ""
-"PL/Perl-Funktion, die einen zusammengesetzten Typ zurückgibt, muss eine "
-"Referenz auf ein Hash zurückgeben"
-
-#: plperl.c:2145
-msgid ""
-"function returning record called in context that cannot accept type record"
-msgstr ""
-"Funktion, die einen Record zurückgibt, in einem Zusammenhang aufgerufen, der "
-"Typ record nicht verarbeiten kann"
-
-#: plperl.c:2259
+#: plperl.c:2314
 msgid "ignoring modified row in DELETE trigger"
 msgstr "geänderte Zeile im DELETE-Trigger wird ignoriert"
 
-#: plperl.c:2267
+#: plperl.c:2322
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "Ergebnis einer PL/Perl-Triggerfunktion muss undef, »SKIP« oder »MODIFY« sein"
 
-#: plperl.c:2393 plperl.c:2399
+#: plperl.c:2448 plperl.c:2454
 msgid "out of memory"
 msgstr "Speicher aufgebraucht"
 
-#: plperl.c:2453
+#: plperl.c:2508
 msgid "trigger functions can only be called as triggers"
 msgstr "Triggerfunktionen können nur als Trigger aufgerufen werden"
 
-#: plperl.c:2825
+#: plperl.c:2884
 msgid "cannot use return_next in a non-SETOF function"
 msgstr ""
 "return_next kann nur in einer Funktion mit SETOF-Rückgabetyp verwendet werden"
 
-#: plperl.c:2831
+#: plperl.c:2940
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -182,16 +187,16 @@ msgstr ""
 "PL/Perl-Funktion, die SETOF eines zusammengesetzten Typs zurückgibt, muss "
 "return_next mit einer Referenz auf ein Hash aufrufen"
 
-#: plperl.c:3597
+#: plperl.c:3655
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "PL/Perl-Funktion »%s«"
 
-#: plperl.c:3609
+#: plperl.c:3667
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "Kompilierung der PL/Perl-Funktion »%s«"
 
-#: plperl.c:3618
+#: plperl.c:3676
 msgid "PL/Perl anonymous code block"
 msgstr "anonymer PL/Perl-Codeblock"
diff --git a/src/pl/plperl/po/es.po b/src/pl/plperl/po/es.po
index f2aa6e1385354..e6fea5a69f0c8 100644
--- a/src/pl/plperl/po/es.po
+++ b/src/pl/plperl/po/es.po
@@ -1,121 +1,139 @@
 # Spanish message translation file for plperl
 #
-# Copyright (C) 2008-2010 PostgreSQL Global Development Group
+# Copyright (C) 2008-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Emanuel Calvo Franco <postgres.arg@gmail.com>, 2008.
-# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2009-2010
+# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2009-2011
 #
-# pgtranslation Id: plperl.po,v 1.8 2010/08/31 05:10:01 alvherre Exp $
+# pgtranslation Id: plperl.po,v 1.9 2011/09/03 02:14:44 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plperl (PostgreSQL 9.0)\n"
+"Project-Id-Version: plperl (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-30 20:01+0000\n"
-"PO-Revision-Date: 2010-08-31 01:09-0400\n"
+"POT-Creation-Date: 2011-09-02 10:52+0000\n"
+"PO-Revision-Date: 2011-09-02 23:14-0300\n"
 "Last-Translator: �lvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:257
+#: plperl.c:361
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Si es verdadero, se compilará código Perl confiable y no confiable en modo "
 "«strict»."
 
-#: plperl.c:265
+#: plperl.c:375
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
 "Código Perl de inicialización a ejecutar cuando un intérprete Perl es "
 "inicializado."
 
-#: plperl.c:282
+#: plperl.c:397
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr ""
 "Código Perl de inicialización a ejecutar cuando plperl se usa por primera "
 "vez."
 
-#: plperl.c:290
+#: plperl.c:405
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr ""
 "Código Perl de inicialización a ejecutar cuando plperlu se usa por primera "
 "vez."
 
-#: plperl.c:455 plperl.c:608 plperl.c:613 plperl.c:711 plperl.c:724
-#: plperl.c:766 plperl.c:781 plperl.c:1318 plperl.c:1426 plperl.c:1482
+#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
+#: plperl.c:945 plperl.c:966 plperl.c:1867 plperl.c:1962 plperl.c:2024
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:623
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "mientras se ejecutaba PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:609
+#: plperl.c:785
 msgid "while parsing Perl initialization"
 msgstr "mientras se interpretaba la inicialización de Perl"
 
-#: plperl.c:614
+#: plperl.c:790
 msgid "while running Perl initialization"
 msgstr "mientras se ejecutaba la inicialización de Perl"
 
-#: plperl.c:712
+#: plperl.c:894
 msgid "while executing PLC_TRUSTED"
 msgstr "mientras se ejecutaba PLC_TRUSTED"
 
-#: plperl.c:725
+#: plperl.c:905
 msgid "while executing utf8fix"
 msgstr "mientras se ejecutaba utf8fix"
 
-#: plperl.c:767
+#: plperl.c:946
 msgid "while executing plperl.on_plperl_init"
 msgstr "mientras se ejecutaba plperl.on_plperl_init"
 
-#: plperl.c:782
+#: plperl.c:967
 msgid "while executing plperl.on_plperlu_init"
 msgstr "mientras se ejecutaba plperl.on_plperlu_init"
 
-#: plperl.c:824 plperl.c:1021
+#: plperl.c:1013 plperl.c:1540
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "el hash de Perl contiene el columna inexistente «%s»"
 
-#: plperl.c:997
+#: plperl.c:1096
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr ""
+"el número de dimensiones del array (%d) excede el máximo permitido (%d)"
+
+#: plperl.c:1110
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"los arrays multidimensionales deben tener expresiones de arrays con "
+"dimensiones coincidentes"
+
+#: plperl.c:1218
+msgid "PL/Perl function must return reference to hash or array"
+msgstr ""
+"una función Perl debe retornar una referencia a un hash o array"
+
+#: plperl.c:1517
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} no existe"
 
-#: plperl.c:1001
+#: plperl.c:1521
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} no es una referencia a un hash"
 
-#: plperl.c:1235 plperl.c:1924
+#: plperl.c:1744 plperl.c:2475
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "las funciones en PL/Perl no pueden retornar el tipo %s"
 
-#: plperl.c:1247 plperl.c:1970
+#: plperl.c:1757 plperl.c:2522
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funciones de PL/Perl no pueden aceptar el tipo %s"
 
-#: plperl.c:1322
+#: plperl.c:1871
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
-msgstr ""
-"no se obtuvo una referencia CODE en la compilación de la función «%s»"
+msgstr "no se obtuvo una referencia CODE en la compilación de la función «%s»"
 
-#: plperl.c:1534
+#: plperl.c:2076
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "se llamó a una función que retorna un conjunto en un contexto que no puede "
 "aceptarlo"
 
-#: plperl.c:1577
+#: plperl.c:2120
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -123,43 +141,43 @@ msgstr ""
 "una función PL/Perl que retorna un conjunto debe retornar una referencia a "
 "un array o usar return_next"
 
-#: plperl.c:1610
+#: plperl.c:2149
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr ""
 "una función Perl que retorna un tipo compuesto debe retornar una referencia "
 "a un hash"
 
-#: plperl.c:1619
+#: plperl.c:2158
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "se llamó una función que retorna un registro en un contexto que no puede "
 "aceptarlo"
 
-#: plperl.c:1739
+#: plperl.c:2272
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignorando la tupla modificada en el disparador DELETE"
 
-#: plperl.c:1747
+#: plperl.c:2280
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "el resultado de la función disparadora en PL/Perl debe ser undef, «SKIP» o "
 "«MODIFY»"
 
-#: plperl.c:1859
+#: plperl.c:2406 plperl.c:2412
 msgid "out of memory"
 msgstr "memoria agotada"
 
-#: plperl.c:1915
+#: plperl.c:2466
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plperl.c:2228
+#: plperl.c:2842
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "no se puede utilizar return_next en una función sin SETOF"
 
-#: plperl.c:2234
+#: plperl.c:2848
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -167,16 +185,16 @@ msgstr ""
 "una función Perl que retorna SETOF de un tipo compuesto debe invocar "
 "return_next con una referencia a un hash"
 
-#: plperl.c:3028
+#: plperl.c:3614
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "función PL/Perl «%s»"
 
-#: plperl.c:3040
+#: plperl.c:3626
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilación de la función PL/Perl «%s»"
 
-#: plperl.c:3049
+#: plperl.c:3635
 msgid "PL/Perl anonymous code block"
 msgstr "bloque de código anónimo de PL/Perl"
diff --git a/src/pl/plperl/po/fr.po b/src/pl/plperl/po/fr.po
index 7e869894edb15..dd178613dca16 100644
--- a/src/pl/plperl/po/fr.po
+++ b/src/pl/plperl/po/fr.po
@@ -10,181 +10,199 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-06-29 21:15+0000\n"
-"PO-Revision-Date: 2010-06-29 23:30+0100\n"
+"POT-Creation-Date: 2011-06-13 14:52+0000\n"
+"PO-Revision-Date: 2011-06-13 17:49+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:255
+#: plperl.c:361
 msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Si true, le code Perl de confiance et sans confiance sera compilé en mode\n"
 "strict."
 
-#: plperl.c:263
+#: plperl.c:375
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
 "Code d'initialisation Perl à exécuter lorsque un interpréteur Perl est\n"
 "initialisé."
 
-#: plperl.c:280
+#: plperl.c:397
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr ""
 "Code d'initialisation Perl à exécuter lorsque plperl est utilisé pour la\n"
 "première fois"
 
-#: plperl.c:288
+#: plperl.c:405
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr ""
 "Code d'initialisation Perl à exécuter lorsque plperlu est utilisé pour la\n"
 "première fois"
 
-#: plperl.c:453
-#: plperl.c:605
-#: plperl.c:610
-#: plperl.c:708
-#: plperl.c:721
-#: plperl.c:763
-#: plperl.c:778
-#: plperl.c:1315
-#: plperl.c:1423
-#: plperl.c:1479
+#: plperl.c:622
+#: plperl.c:784
+#: plperl.c:789
+#: plperl.c:893
+#: plperl.c:904
+#: plperl.c:945
+#: plperl.c:966
+#: plperl.c:1863
+#: plperl.c:1958
+#: plperl.c:2020
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:454
+#: plperl.c:623
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "lors de l'exécution de PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:606
+#: plperl.c:785
 msgid "while parsing Perl initialization"
 msgstr "lors de l'analyse de l'initialisation de perl"
 
-#: plperl.c:611
+#: plperl.c:790
 msgid "while running Perl initialization"
 msgstr "lors de l'exécution de l'initialisation de perl"
 
-#: plperl.c:709
+#: plperl.c:894
 msgid "while executing PLC_TRUSTED"
 msgstr "lors de l'exécution de PLC_TRUSTED"
 
-#: plperl.c:722
+#: plperl.c:905
 msgid "while executing utf8fix"
 msgstr "lors de l'exécution de utf8fix"
 
-#: plperl.c:764
+#: plperl.c:946
 msgid "while executing plperl.on_plperl_init"
 msgstr "lors de l'exécution de plperl.on_plperl_init"
 
-#: plperl.c:779
+#: plperl.c:967
 msgid "while executing plperl.on_plperlu_init"
 msgstr "lors de l'exécution de plperl.on_plperlu_init"
 
-#: plperl.c:821
-#: plperl.c:1018
+#: plperl.c:1013
+#: plperl.c:1536
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Le hachage Perl contient la colonne « %s » inexistante"
 
-#: plperl.c:994
+#: plperl.c:1095
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "le nombre de dimensions du tableau (%d) dépasse la maximum autorisé (%d)"
+
+#: plperl.c:1109
+msgid "multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"les tableaux multidimensionnels doivent avoir des expressions de tableaux\n"
+"avec les dimensions correspondantes"
+
+#: plperl.c:1214
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "la fonction PL/perl doit renvoyer la référence à un hachage ou à un tableau"
+
+#: plperl.c:1513
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} n'existe pas"
 
-#: plperl.c:998
+#: plperl.c:1517
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} n'est pas une référence de hachage"
 
-#: plperl.c:1232
-#: plperl.c:1921
+#: plperl.c:1740
+#: plperl.c:2471
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "Les fonctions PL/perl ne peuvent pas renvoyer le type %s"
 
-#: plperl.c:1244
-#: plperl.c:1967
+#: plperl.c:1753
+#: plperl.c:2518
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "Les fonctions PL/perl ne peuvent pas accepter le type %s"
 
-#: plperl.c:1319
+#: plperl.c:1867
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "n'a pas obtenu une référence CODE lors de la compilation de la fonction « %s »"
 
-#: plperl.c:1531
+#: plperl.c:2072
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "fonction renvoyant un ensemble appelée dans un contexte qui ne peut pas\n"
 "accepter un ensemble"
 
-#: plperl.c:1574
+#: plperl.c:2116
 msgid "set-returning PL/Perl function must return reference to array or use return_next"
 msgstr ""
 "la fonction PL/perl renvoyant des ensembles doit renvoyer la référence à\n"
 "un tableau ou utiliser return_next"
 
-#: plperl.c:1607
+#: plperl.c:2145
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr ""
 "la fonction PL/perl renvoyant des valeurs composites doit renvoyer la\n"
 "référence à un hachage"
 
-#: plperl.c:1616
+#: plperl.c:2154
 msgid "function returning record called in context that cannot accept type record"
 msgstr ""
 "fonction renvoyant le type record appelée dans un contexte qui ne peut pas\n"
 "accepter le type record"
 
-#: plperl.c:1736
+#: plperl.c:2268
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignore la ligne modifiée dans le trigger DELETE"
 
-#: plperl.c:1744
+#: plperl.c:2276
 msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "le résultat de la fonction trigger PL/perl doit être undef, « SKIP » ou\n"
 "« MODIFY »"
 
-#: plperl.c:1856
+#: plperl.c:2402
+#: plperl.c:2408
 msgid "out of memory"
 msgstr "mémoire épuisée"
 
-#: plperl.c:1912
+#: plperl.c:2462
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
 
-#: plperl.c:2225
+#: plperl.c:2838
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "ne peut pas utiliser return_next dans une fonction non SETOF"
 
-#: plperl.c:2231
+#: plperl.c:2844
 msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
 msgstr ""
 "une fonction PL/perl renvoyant des lignes composites doit appeler\n"
 "return_next avec la référence à un hachage"
 
-#: plperl.c:3025
+#: plperl.c:3610
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "fonction PL/Perl « %s »"
 
-#: plperl.c:3037
+#: plperl.c:3622
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilation de la fonction PL/Perl « %s »"
 
-#: plperl.c:3046
+#: plperl.c:3631
 msgid "PL/Perl anonymous code block"
 msgstr "bloc de code PL/Perl anonyme"
 
 #~ msgid "while executing PLC_SAFE_OK"
 #~ msgstr "lors de l'exécution de PLC_SAFE_OK"
+
 #~ msgid "creation of Perl function \"%s\" failed: %s"
 #~ msgstr "échec de la création de la fonction Perl « %s » : %s"
+
 #~ msgid "error from Perl function \"%s\": %s"
 #~ msgstr "échec dans la fonction Perl « %s » : %s"
-
diff --git a/src/pl/plperl/po/it.po b/src/pl/plperl/po/it.po
deleted file mode 100644
index b84bf11ff8c89..0000000000000
--- a/src/pl/plperl/po/it.po
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Translation of plperl to Italian
-# PostgreSQL Project
-#
-# Associazione Culturale ITPUG - Italian PostgreSQL Users Group
-# http://www.itpug.org/ - info@itpug.org
-#
-# Traduttori:
-#  * Emanuele Zamprogno <emanuele.zamprogno@itpug.org>
-# 
-# Revisori:
-#  * Gabriele Bartolini <gabriele.bartolini@itpug.org>
-#
-# Copyright (c) 2009, Associazione Culturale ITPUG
-# Distributed under the same license of the PostgreSQL project
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-07-11 05:48+0000\n"
-"PO-Revision-Date: 2009-07-18 03:10:24+0200\n"
-"Last-Translator: Gabriele Bartolini <gabriele.bartolini@2ndquadrant.it>\n"
-"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: plperl.c:202
-msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
-msgstr "Se vero, il codice Perl affidabile e non affidabile sarà compilato in modalità strict"
-
-#: plperl.c:624
-#: plperl.c:817
-#, c-format
-msgid "Perl hash contains nonexistent column \"%s\""
-msgstr "La struttura hash in Perl contiene la colonna inesistente \"%s\""
-
-#: plperl.c:793
-msgid "$_TD->{new} does not exist"
-msgstr "$_TD->{new} non esiste"
-
-#: plperl.c:797
-msgid "$_TD->{new} is not a hash reference"
-msgstr "$_TD->{new} non è un riferimento ad un hash"
-
-#: plperl.c:934
-#: plperl.c:1633
-#, c-format
-msgid "PL/Perl functions cannot return type %s"
-msgstr "la funzione PL/Perl non può ritornare il tipo %s"
-
-#: plperl.c:946
-#: plperl.c:1680
-#, c-format
-msgid "PL/Perl functions cannot accept type %s"
-msgstr "la funzione PL/Perl non può accettare il tipo %s"
-
-#: plperl.c:1022
-#, c-format
-msgid "creation of Perl function \"%s\" failed: %s"
-msgstr "creazione della funzione Perl \"%s\" fallita: %s"
-
-#: plperl.c:1152
-#: plperl.c:1210
-#, c-format
-msgid "error from Perl function \"%s\": %s"
-msgstr "errore dalla funzione Perl \"%s\": %s"
-
-#: plperl.c:1258
-msgid "set-valued function called in context that cannot accept a set"
-msgstr "la funzione set-valued è stata chiamata all'interno di un contesto che non può accettare un set"
-
-#: plperl.c:1301
-msgid "set-returning PL/Perl function must return reference to array or use return_next"
-msgstr "la funzione PL/Perl di tipo \"set-returning\" deve ritornare un riferimento ad un array o usare return_next"
-
-#: plperl.c:1334
-msgid "composite-returning PL/Perl function must return reference to hash"
-msgstr "la funzione PL/Perl \"composite-returning\" deve ritornare un riferimento all'hash"
-
-#: plperl.c:1343
-msgid "function returning record called in context that cannot accept type record"
-msgstr "la funzione che restituisce un record è chiamata all'interno di un contesto che non può accettare il tipo record"
-
-#: plperl.c:1459
-msgid "ignoring modified row in DELETE trigger"
-msgstr "ignorata la riga modificata all'interno del trigger DELETE"
-
-#: plperl.c:1467
-msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
-msgstr "il risultato della funzione trigger PL/Perl deve essere undef, \"SKIP\" oppure \"MODIFY\""
-
-# in teoria non servirebbe tradurre
-#: plperl.c:1567
-msgid "out of memory"
-msgstr "memoria esaurita"
-
-#: plperl.c:1624
-msgid "trigger functions can only be called as triggers"
-msgstr "le funzioni trigger possono solo essere chiamate come trigger"
-
-#: plperl.c:1917
-msgid "cannot use return_next in a non-SETOF function"
-msgstr "non si può usare return_next in una funzione non-SETOF"
-
-#: plperl.c:1923
-msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
-msgstr "la funzione PL/Perl SETOF-composite-returning deve chiamare return_next con riferimento all'hash"
-
diff --git a/src/pl/plperl/po/ja.po b/src/pl/plperl/po/ja.po
index d68ec883410c9..25a71f69fc084 100644
--- a/src/pl/plperl/po/ja.po
+++ b/src/pl/plperl/po/ja.po
@@ -5,103 +5,117 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
+"Project-Id-Version: PostgreSQL 9.1 beta 2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-17 18:33+0900\n"
-"PO-Revision-Date: 2010-07-17 18:33+0900\n"
-"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
+"POT-Creation-Date: 2011-06-15 17:12+0900\n"
+"PO-Revision-Date: 2011-06-15 21:48+0900\n"
+"Last-Translator: Honda Shigehiro\n"
 "Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plperl.c:257
+#: plperl.c:361
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "真�ら�信頼��信頼�れ��Perl�コード�strictモード�コンパイル�れ��。"
 
-#: plperl.c:265
+#: plperl.c:375
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr "Perl �インタプリタ��期化�れる際�実行�れる�� Perl �期化コード"
 
-#: plperl.c:282
+#: plperl.c:397
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr "plperl �最��使用�れる際�一度実行�れる�� Perl �期化コード"
 
-#: plperl.c:290
+#: plperl.c:405
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr "plperlu �最��使用�れる際�一度実行�れる�� Perl �期化コード"
 
-#: plperl.c:455 plperl.c:608 plperl.c:613 plperl.c:711 plperl.c:724
-#: plperl.c:766 plperl.c:781 plperl.c:1318 plperl.c:1426 plperl.c:1482
+#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
+#: plperl.c:945 plperl.c:966 plperl.c:1863 plperl.c:1958 plperl.c:2020
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:623
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "PostgreSQL::InServer::SPI::bootstrap �実行中�"
 
-#: plperl.c:609
+#: plperl.c:785
 msgid "while parsing Perl initialization"
 msgstr "Perl �期化処��パース中�"
 
-#: plperl.c:614
+#: plperl.c:790
 msgid "while running Perl initialization"
 msgstr "Perl �期化処��実行中�"
 
-#: plperl.c:712
+#: plperl.c:894
 msgid "while executing PLC_TRUSTED"
 msgstr "PLC_TRUSTED �実行中�"
 
-#: plperl.c:725
+#: plperl.c:905
 msgid "while executing utf8fix"
 msgstr "utf8fix �実行中�"
 
-#: plperl.c:767
+#: plperl.c:946
 msgid "while executing plperl.on_plperl_init"
 msgstr "plperl.on_plperl_init �実行中�"
 
-#: plperl.c:782
+#: plperl.c:967
 msgid "while executing plperl.on_plperlu_init"
 msgstr "plperl.on_plperlu_init �実行中�"
 
-#: plperl.c:824 plperl.c:1021
+#: plperl.c:1013 plperl.c:1536
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl�ッシュ�存在���列\"%s\"���れ��"
 
-#: plperl.c:997
+#: plperl.c:1095
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "�列�次数(%d)�上�(%d)を超�����"
+
+#: plperl.c:1109
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr "多次元�列�次数�����列�を����れ��り��ん"
+
+#: plperl.c:1214
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "PL/Perl関数��ッシュ����列���照を返�必���り��"
+
+#: plperl.c:1513
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new}�存在���ん"
 
-#: plperl.c:1001
+#: plperl.c:1517
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new}��ッシュ���照���り��ん"
 
-#: plperl.c:1235 plperl.c:1924
+#: plperl.c:1740 plperl.c:2471
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "PL/Perl関数�%s型を返��������ん"
 
-#: plperl.c:1247 plperl.c:1970
+#: plperl.c:1753 plperl.c:2518
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "PL/Perl関数�%s型を��付�られ��ん"
 
-#: plperl.c:1322
+#: plperl.c:1867
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "関数 \"%s\" �コンパイル�ら�コード�照を�得���ん���"
 
-#: plperl.c:1534
+#: plperl.c:2072
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "��コンテキスト�集�値�関数�集�を��付�られ��ん"
 
-#: plperl.c:1577
+#: plperl.c:2116
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -109,39 +123,39 @@ msgstr ""
 "集�を返�PL/Perl関数��列���照を返������return_nextを使用�る必�"
 "��り��"
 
-#: plperl.c:1610
+#: plperl.c:2145
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr "複�型を返�PL/Perl関数��ッシュ���照を返�必���り��"
 
-#: plperl.c:1619
+#: plperl.c:2154
 msgid ""
 "function returning record called in context that cannot accept type record"
 msgstr ""
 "レコード型を��付�られ��コンテキスト�レコードを返�関数�呼�出�れ��"
 "�"
 
-#: plperl.c:1739
+#: plperl.c:2268
 msgid "ignoring modified row in DELETE trigger"
 msgstr "DELETEトリガ��変更�れ�行を無視���"
 
-#: plperl.c:1747
+#: plperl.c:2276
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr "PL/Perlトリガ関数��果�\"SKIP\"���\"MODIFY\"���れ��り��ん"
 
-#: plperl.c:1859
+#: plperl.c:2402 plperl.c:2408
 msgid "out of memory"
 msgstr "メモリ�足��"
 
-#: plperl.c:1915
+#: plperl.c:2462
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数�トリガー�����コール����"
 
-#: plperl.c:2228
+#: plperl.c:2838
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "SETOF関数以外��return_nextを使用�る�������ん"
 
-#: plperl.c:2234
+#: plperl.c:2844
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -149,16 +163,16 @@ msgstr ""
 "複�型�SETOFを返�PL/Perl関数��ッシュ���照を��return_nextを呼�出��"
 "�れ��り��ん"
 
-#: plperl.c:3028
+#: plperl.c:3610
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "PL/Perl 関数 \"%s\""
 
-#: plperl.c:3040
+#: plperl.c:3622
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "PL/Perl 関数 \"%s\" �コンパイル"
 
-#: plperl.c:3049
+#: plperl.c:3631
 msgid "PL/Perl anonymous code block"
 msgstr "PL/Perl �無�コードブロック"
diff --git a/src/pl/plperl/po/pl.po b/src/pl/plperl/po/pl.po
new file mode 100644
index 0000000000000..59bcca5ca4f98
--- /dev/null
+++ b/src/pl/plperl/po/pl.po
@@ -0,0 +1,191 @@
+# Polish message translation file for plperl
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: plperl (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:52+0000\n"
+"PO-Revision-Date: 2011-09-30 09:49-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Polish TotroiseSvn translation team\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: plperl.c:361
+msgid ""
+"If true, trusted and untrusted Perl code will be compiled in strict mode."
+msgstr ""
+"Jeśli prawda, zaufanych i niezaufanych kod Perl zostanie skompilowany w "
+"trybie ścisłym."
+
+#: plperl.c:375
+msgid ""
+"Perl initialization code to execute when a Perl interpreter is initialized."
+msgstr "Kod inicjujÄ…cy Perl do wykonania gdy inicjowany jest interpreter Perl."
+
+#: plperl.c:397
+msgid "Perl initialization code to execute once when plperl is first used."
+msgstr ""
+"Kod inicjujący Perl do jednokrotnego wykonania gdy plperl jest użyty po raz "
+"pierwszy."
+
+#: plperl.c:405
+msgid "Perl initialization code to execute once when plperlu is first used."
+msgstr ""
+"Kod inicjujący Perl do jednokrotnego wykonania gdy plperlu jest użyty po raz "
+"pierwszy."
+
+#: plperl.c:622 plperl.c:784 plperl.c:789 plperl.c:893 plperl.c:904
+#: plperl.c:945 plperl.c:966 plperl.c:1867 plperl.c:1962 plperl.c:2024
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plperl.c:623
+msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
+msgstr "podczas wykonania PostgreSQL::InServer::SPI::bootstrap"
+
+#: plperl.c:785
+msgid "while parsing Perl initialization"
+msgstr "podczas przetwarzania inicjacji Perl"
+
+#: plperl.c:790
+msgid "while running Perl initialization"
+msgstr "podczas wykonywania inicjacji Perl"
+
+#: plperl.c:894
+msgid "while executing PLC_TRUSTED"
+msgstr "podczas wykonywania PLC_TRUSTED"
+
+#: plperl.c:905
+msgid "while executing utf8fix"
+msgstr "podczas wykonywania utf8fix"
+
+#: plperl.c:946
+msgid "while executing plperl.on_plperl_init"
+msgstr "podczas wykonania plperl.on_plperl_init"
+
+#: plperl.c:967
+msgid "while executing plperl.on_plperlu_init"
+msgstr "podczas wykonania plperl.on_plperlu_init"
+
+#: plperl.c:1013 plperl.c:1540
+#, c-format
+msgid "Perl hash contains nonexistent column \"%s\""
+msgstr "hasz Perl zawiera nieistniejÄ…cÄ… kolumnÄ™ \"%s\""
+
+#: plperl.c:1096
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "liczba wymiarów tablicy (%d) przekracza maksimum (%d)"
+
+#: plperl.c:1110
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"wielowymiarowe tablice muszą mieć wyrażenia tablicowe z pasującymi wymiarami"
+
+#: plperl.c:1218
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "funkcja PL/Perl musi zwracać referencję do hasza lub tablicy"
+
+#: plperl.c:1517
+msgid "$_TD->{new} does not exist"
+msgstr "$_TD->{new} nie istnieje"
+
+#: plperl.c:1521
+msgid "$_TD->{new} is not a hash reference"
+msgstr "$_TD->{new} nie jest referencjÄ… haszu"
+
+#: plperl.c:1744 plperl.c:2475
+#, c-format
+msgid "PL/Perl functions cannot return type %s"
+msgstr "funkcje PL/Perl nie mogą zwracać wartości typu %s"
+
+#: plperl.c:1757 plperl.c:2522
+#, c-format
+msgid "PL/Perl functions cannot accept type %s"
+msgstr "funkcje PL/Perl nie obsługują typu %s"
+
+#: plperl.c:1871
+#, c-format
+msgid "didn't get a CODE reference from compiling function \"%s\""
+msgstr "nie udało się pobrać wskazania CODE z kompilowanej funkcji \"%s\""
+
+#: plperl.c:2076
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"funkcja zwracająca zbiór rekordów wywołana w kontekście, w którym nie jest "
+"to dopuszczalne"
+
+#: plperl.c:2120
+msgid ""
+"set-returning PL/Perl function must return reference to array or use "
+"return_next"
+msgstr ""
+"funkcja PL/Perl zwracająca zbiór rekordów musi zwracać tablicę lub użyć "
+"return_next"
+
+#: plperl.c:2149
+msgid "composite-returning PL/Perl function must return reference to hash"
+msgstr ""
+"funkcja PL/Perl zwracająca wartości złożone musi wywołać zwracać referencję "
+"haszu"
+
+#: plperl.c:2158
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"funkcja zwracająca rekord w wywołaniu, które nie akceptuje typów złożonych"
+
+#: plperl.c:2272
+msgid "ignoring modified row in DELETE trigger"
+msgstr "ignorowanie modyfikacji wiersza w wyzwalaczy DELETE"
+
+#: plperl.c:2280
+msgid ""
+"result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
+msgstr ""
+"funkcja wyzwalacza PL/Perl musi zwracać undef, \"SKIP\", lub \"MODIFY\""
+
+#: plperl.c:2406 plperl.c:2412
+msgid "out of memory"
+msgstr "brak pamięci"
+
+#: plperl.c:2466
+msgid "trigger functions can only be called as triggers"
+msgstr "procedury wyzwalaczy mogą być wywoływane jedynie przez wyzwalacze"
+
+#: plperl.c:2842
+msgid "cannot use return_next in a non-SETOF function"
+msgstr "nie można używać return_next w funkcji nie SETOF"
+
+#: plperl.c:2848
+msgid ""
+"SETOF-composite-returning PL/Perl function must call return_next with "
+"reference to hash"
+msgstr ""
+"funkcja PL/Perl zwracająca grupę wartości złożonych musi wywołać return_next "
+"z referencjÄ… haszu"
+
+#: plperl.c:3614
+#, c-format
+msgid "PL/Perl function \"%s\""
+msgstr "funkcja PL/Perl \"%s\""
+
+#: plperl.c:3626
+#, c-format
+msgid "compilation of PL/Perl function \"%s\""
+msgstr "kompilacja funkcji PL/Perl \"%s\""
+
+#: plperl.c:3635
+msgid "PL/Perl anonymous code block"
+msgstr "anonimowy blok kodu PL/Perl"
diff --git a/src/pl/plperl/po/pt_BR.po b/src/pl/plperl/po/pt_BR.po
index a3856a4b1787f..77441bd0034dc 100644
--- a/src/pl/plperl/po/pt_BR.po
+++ b/src/pl/plperl/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for plperl
 # 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>, 2009-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-26 15:34-0300\n"
+"POT-Creation-Date: 2011-11-30 16:16-0300\n"
 "PO-Revision-Date: 2009-05-10 01:12-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -16,96 +16,134 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plperl.c:257
+#: plperl.c:364
 msgid ""
 "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr ""
 "Se verdadeiro, código Perl confiável e não-confiável será compilado em modo "
 "estrito."
 
-#: plperl.c:265
+#: plperl.c:378
 msgid ""
 "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr ""
-"Código de inicialização Perl executado quando um interpretador Perl for inicializado."
+"Código de inicialização Perl executado quando um interpretador Perl for "
+"inicializado."
 
-#: plperl.c:282
+#: plperl.c:400
 msgid "Perl initialization code to execute once when plperl is first used."
-msgstr "Código de inicialização Perl executado quando plperl for utilizado pela primeira vez."
+msgstr ""
+"Código de inicialização Perl executado quando plperl for utilizado pela "
+"primeira vez."
 
-#: plperl.c:290
+#: plperl.c:408
 msgid "Perl initialization code to execute once when plperlu is first used."
-msgstr "Código de inicialização Perl executado quando plperlu for utilizado pela primeira vez."
+msgstr ""
+"Código de inicialização Perl executado quando plperlu for utilizado pela "
+"primeira vez."
 
-#: plperl.c:455 plperl.c:608 plperl.c:613 plperl.c:711 plperl.c:724
-#: plperl.c:766 plperl.c:781 plperl.c:1318 plperl.c:1426 plperl.c:1482
+#: plperl.c:625 plperl.c:787 plperl.c:792 plperl.c:896 plperl.c:907
+#: plperl.c:948 plperl.c:969 plperl.c:1942 plperl.c:2037 plperl.c:2099
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:626
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "ao executar PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:609
+#: plperl.c:788
 msgid "while parsing Perl initialization"
 msgstr "ao analisar código de inicialização Perl"
 
-#: plperl.c:614
+#: plperl.c:793
 msgid "while running Perl initialization"
 msgstr "ao executar código de inicialização Perl"
 
-#: plperl.c:712
+#: plperl.c:897
 msgid "while executing PLC_TRUSTED"
 msgstr "ao executar PLC_TRUSTED"
 
-#: plperl.c:725
+#: plperl.c:908
 msgid "while executing utf8fix"
 msgstr "ao executar utf8fix"
 
-#: plperl.c:767
+#: plperl.c:949
 msgid "while executing plperl.on_plperl_init"
 msgstr "ao executar plperl.on_plperl_init"
 
-#: plperl.c:782
+#: plperl.c:970
 msgid "while executing plperl.on_plperlu_init"
 msgstr "ao executar plperl.on_plperlu_init"
 
-#: plperl.c:824 plperl.c:1021
+#: plperl.c:1014 plperl.c:1614
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "hash Perl contém coluna inexistente \"%s\""
 
-#: plperl.c:997
+#: plperl.c:1099
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "número de dimensões da matriz (%d) excede o máximo permitido (%d)"
+
+#: plperl.c:1111 plperl.c:1128
+msgid ""
+"multidimensional arrays must have array expressions with matching dimensions"
+msgstr ""
+"matrizes multidimensionais devem ter expressões de matriz com dimensões "
+"correspondentes"
+
+#: plperl.c:1165
+#, c-format
+msgid "cannot convert Perl array to non-array type %s"
+msgstr "não pode converter array Perl para tipo que não é array %s"
+
+#: plperl.c:1261
+#, c-format
+msgid "cannot convert Perl hash to non-composite type %s"
+msgstr "não pode converter hash Perl para tipo não-composto %s"
+
+#: plperl.c:1272
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"função que retorna record foi chamada em um contexto que não pode aceitar "
+"tipo record"
+
+#: plperl.c:1287
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "função PL/Perl deve retornar referência a um hash ou uma matriz"
+
+#: plperl.c:1591
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} não existe"
 
-#: plperl.c:1001
+#: plperl.c:1595
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} não é uma referência hash"
 
-#: plperl.c:1235 plperl.c:1924
+#: plperl.c:1819 plperl.c:2517
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "funções PL/Perl não podem retornar tipo %s"
 
-#: plperl.c:1247 plperl.c:1970
+#: plperl.c:1832 plperl.c:2564
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funções PL/Perl não podem aceitar tipo %s"
 
-#: plperl.c:1322
+#: plperl.c:1946
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "não obteve uma referência CODE da compilação da função \"%s\""
 
-#: plperl.c:1534
+#: plperl.c:2150
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "função que tem argumento do tipo conjunto foi chamada em um contexto que não "
 "pode aceitar um conjunto"
 
-#: plperl.c:1577
+#: plperl.c:2194
 msgid ""
 "set-returning PL/Perl function must return reference to array or use "
 "return_next"
@@ -113,40 +151,29 @@ msgstr ""
 "funçao PL/Perl que retorna conjunto deve retornar referência para matriz ou "
 "usar return_next"
 
-#: plperl.c:1610
-msgid "composite-returning PL/Perl function must return reference to hash"
-msgstr "função que retorna tipo composto deve retornar referência a um hash"
-
-#: plperl.c:1619
-msgid ""
-"function returning record called in context that cannot accept type record"
-msgstr ""
-"função que retorna record foi chamada em um contexto que não pode aceitar "
-"tipo record"
-
-#: plperl.c:1739
+#: plperl.c:2314
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignorando registro modificado em gatilho DELETE"
 
-#: plperl.c:1747
+#: plperl.c:2322
 msgid ""
 "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr ""
 "resultado da função de gatilho PL/Perl deve ser undef, \"SKIP\" ou \"MODIFY\""
 
-#: plperl.c:1859
+#: plperl.c:2448 plperl.c:2454
 msgid "out of memory"
 msgstr "sem memória"
 
-#: plperl.c:1915
+#: plperl.c:2508
 msgid "trigger functions can only be called as triggers"
 msgstr "funções de gatilho só podem ser chamadas como gatilhos"
 
-#: plperl.c:2228
+#: plperl.c:2884
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "não pode utilizar return_next em uma função que não retorna conjunto"
 
-#: plperl.c:2234
+#: plperl.c:2940
 msgid ""
 "SETOF-composite-returning PL/Perl function must call return_next with "
 "reference to hash"
@@ -154,16 +181,16 @@ msgstr ""
 "função PL/Perl que retorna um conjunto de tipo composto deve chamar "
 "return_next com referência a um hash"
 
-#: plperl.c:3028
+#: plperl.c:3655
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "função PL/Perl \"%s\""
 
-#: plperl.c:3040
+#: plperl.c:3667
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilação da função PL/Perl \"%s\""
 
-#: plperl.c:3049
+#: plperl.c:3676
 msgid "PL/Perl anonymous code block"
 msgstr "bloco de código PL/Perl anônimo"
diff --git a/src/pl/plperl/po/ro.po b/src/pl/plperl/po/ro.po
index 8442f9ba4d7c9..4162314e017d4 100644
--- a/src/pl/plperl/po/ro.po
+++ b/src/pl/plperl/po/ro.po
@@ -5,158 +5,181 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-02 17:58+0000\n"
-"PO-Revision-Date: 2010-09-04 21:32-0000\n"
-"Last-Translator: Max <max@oceanline.co.uk>\n"
-"Language-Team: ROMANA <max@oceanline.co.uk>\n"
+"POT-Creation-Date: 2011-11-09 20:39+0000\n"
+"PO-Revision-Date: 2011-11-22 11:32-0000\n"
+"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
+"Language-Team: ROMANA <xsoftware.consultancy@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plperl.c:257
+#: plperl.c:364
 msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr "Dacă true, trusted și untrusted codul Perl se va compila în modul strict."
 
-#: plperl.c:265
+#: plperl.c:378
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr "codul de inițializare Perl de executat odată când interpreterul Perl este inițializat."
 
-#: plperl.c:282
+#: plperl.c:400
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr "codul de inițializare Perl de executat odată când plperl este folosit pentru prima oară."
 
-#: plperl.c:290
+#: plperl.c:408
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr "codul de inițializare Perl de executat odată când plperlu este folosit pentru prima oară."
 
-#: plperl.c:455
-#: plperl.c:608
-#: plperl.c:613
-#: plperl.c:711
-#: plperl.c:724
-#: plperl.c:766
-#: plperl.c:781
-#: plperl.c:1318
-#: plperl.c:1426
-#: plperl.c:1482
+#: plperl.c:625
+#: plperl.c:787
+#: plperl.c:792
+#: plperl.c:896
+#: plperl.c:907
+#: plperl.c:948
+#: plperl.c:969
+#: plperl.c:1942
+#: plperl.c:2037
+#: plperl.c:2099
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:626
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "în timpul execuției PostgreSQL::InServer::SPI::bootstrap"
 
-#: plperl.c:609
+#: plperl.c:788
 msgid "while parsing Perl initialization"
 msgstr "în timpul parsing inițializării Perl"
 
-#: plperl.c:614
+#: plperl.c:793
 msgid "while running Perl initialization"
 msgstr "în timpul rulării intializării Perl"
 
-#: plperl.c:712
+#: plperl.c:897
 msgid "while executing PLC_TRUSTED"
 msgstr "în timpul execuției PLC_TRUSTED"
 
-#: plperl.c:725
+#: plperl.c:908
 msgid "while executing utf8fix"
 msgstr "în timpul execuției utf8fix"
 
-#: plperl.c:767
+#: plperl.c:949
 msgid "while executing plperl.on_plperl_init"
 msgstr "în timpul execuției plperl.on_plperl_init"
 
-#: plperl.c:782
+#: plperl.c:970
 msgid "while executing plperl.on_plperlu_init"
 msgstr "în timpul execuției plperl.on_plperlu_init"
 
-#: plperl.c:824
-#: plperl.c:1021
+#: plperl.c:1014
+#: plperl.c:1614
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl hash conține o coloană \"%s\" inexistentă"
 
-#: plperl.c:997
+#: plperl.c:1099
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "numarul dimensiunilor array-ului  (%d)  depăşeşte maximul admis, %d"
+
+#: plperl.c:1111
+#: plperl.c:1128
+msgid "multidimensional arrays must have array expressions with matching dimensions"
+msgstr "array-urile multidimensionale trebuie să aibă expresii de tip array cu dimensiuni corespunzătoare"
+
+#: plperl.c:1165
+#, c-format
+msgid "cannot convert Perl array to non-array type %s"
+msgstr "nu pot converti un array Perl în tipul de dată  %s"
+
+#: plperl.c:1261
+#, c-format
+msgid "cannot convert Perl hash to non-composite type %s"
+msgstr "nu pot converti tipul de dată hash din Perl într-un tip de dată composit %s"
+
+#: plperl.c:1272
+msgid "function returning record called in context that cannot accept type record"
+msgstr "apel de funcție care are rezultat de tip rând într-un context care nu acceptă tipul rând"
+
+#: plperl.c:1287
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "funcția PL/Perl trebuie să returneze o referință la hash sau array"
+
+#: plperl.c:1591
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} nu există"
 
-#: plperl.c:1001
+#: plperl.c:1595
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} nu e o referință de tip hash"
 
-#: plperl.c:1235
-#: plperl.c:1924
+#: plperl.c:1819
+#: plperl.c:2517
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "funcțiile PL/Perl functions nu pot avea ca rezultat tipul %s"
 
-#: plperl.c:1247
-#: plperl.c:1970
+#: plperl.c:1832
+#: plperl.c:2564
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "funcțiile PL/Perl nu pot accepta tipul %s"
 
-#: plperl.c:1322
+#: plperl.c:1946
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "compilarea funcției \"%s\" nu a rezultat o referință CODE"
 
-#: plperl.c:1534
+#: plperl.c:2150
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "funcţie set-valoare apelată într-un context care nu acceptă set"
 
-#: plperl.c:1577
+#: plperl.c:2194
 msgid "set-returning PL/Perl function must return reference to array or use return_next"
 msgstr "funcția PL/Perl care are rezultat de tip set trebuie să intoarcă o referință la un array sau să folosească return_next"
 
-#: plperl.c:1610
-msgid "composite-returning PL/Perl function must return reference to hash"
-msgstr "funcția PL/Perl cu rezultat de tip composite trebuie să întoarcă o referință la hash"
-
-#: plperl.c:1619
-msgid "function returning record called in context that cannot accept type record"
-msgstr "apel de funcție care are rezultat de tip rând într-un context care nu acceptă tipul rând"
-
-#: plperl.c:1739
+#: plperl.c:2314
 msgid "ignoring modified row in DELETE trigger"
 msgstr "ignor rândul modificat in triggerul DELETE"
 
-#: plperl.c:1747
+#: plperl.c:2322
 msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr "rezultatul unei funcții trigger PL/Perl trebuie să fie de tip undef, \"SKIP\", or \"MODIFY\""
 
-#: plperl.c:1859
+#: plperl.c:2448
+#: plperl.c:2454
 msgid "out of memory"
 msgstr "memorie insuficientă"
 
-#: plperl.c:1915
+#: plperl.c:2508
 msgid "trigger functions can only be called as triggers"
 msgstr "funcţiile trigger pot fi apelate doar ca triggere"
 
-#: plperl.c:2228
+#: plperl.c:2884
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "nu puteți folosi return_next într-o funcție de tip non-SETOF"
 
-#: plperl.c:2234
+#: plperl.c:2940
 msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
 msgstr "funcția PL/Perl cu rezultat de tip SETOF-composite trebuie să apeleze return_next cu referință la hash"
 
-#: plperl.c:3028
+#: plperl.c:3655
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "funcție PL/Perl  \"%s\""
 
-#: plperl.c:3040
+#: plperl.c:3667
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "compilare a funcției PL/Perl \"%s\""
 
-#: plperl.c:3049
+#: plperl.c:3676
 msgid "PL/Perl anonymous code block"
 msgstr "bloc de cod PL/Perl anonim"
 
diff --git a/src/pl/plperl/po/tr.po b/src/pl/plperl/po/tr.po
index 311b3c67a576b..8c46740be9e81 100644
--- a/src/pl/plperl/po/tr.po
+++ b/src/pl/plperl/po/tr.po
@@ -7,156 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 20:01+0000\n"
-"PO-Revision-Date: 2010-09-01 14:46+0200\n"
+"POT-Creation-Date: 2011-08-29 20:38+0000\n"
+"PO-Revision-Date: 2011-08-30 01:44+0200\n"
 "Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
 "Language-Team: Turkish <devrim@gunduz.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Turkish\n"
 "X-Poedit-Country: Turkey\n"
 
-#: plperl.c:257
+#: plperl.c:362
 msgid "If true, trusted and untrusted Perl code will be compiled in strict mode."
 msgstr "Doğru ise, trusted ve untrusted Perl kodları strict modda derlenecektir"
 
-#: plperl.c:265
+#: plperl.c:376
 msgid "Perl initialization code to execute when a Perl interpreter is initialized."
 msgstr "Perl yorumlayıcısı ilklendirildiğinde çalışacak Perl ilklendirme kodu."
 
-#: plperl.c:282
+#: plperl.c:398
 msgid "Perl initialization code to execute once when plperl is first used."
 msgstr "plperl ilk kez kullanıldığında çalışacak Perl ilklendirme kodu"
 
-#: plperl.c:290
+#: plperl.c:406
 msgid "Perl initialization code to execute once when plperlu is first used."
 msgstr "plperlu ilk kez kullanıldığında çalışacak Perl ilklendirme kodu"
 
-#: plperl.c:455
-#: plperl.c:608
-#: plperl.c:613
-#: plperl.c:711
-#: plperl.c:724
-#: plperl.c:766
-#: plperl.c:781
-#: plperl.c:1318
-#: plperl.c:1426
-#: plperl.c:1482
+#: plperl.c:623
+#: plperl.c:785
+#: plperl.c:790
+#: plperl.c:894
+#: plperl.c:905
+#: plperl.c:946
+#: plperl.c:967
+#: plperl.c:1868
+#: plperl.c:1963
+#: plperl.c:2025
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plperl.c:456
+#: plperl.c:624
+#, c-format
 msgid "while executing PostgreSQL::InServer::SPI::bootstrap"
 msgstr "PostgreSQL::InServer::SPI::bootstrap çalıştırılırken"
 
-#: plperl.c:609
+#: plperl.c:786
+#, c-format
 msgid "while parsing Perl initialization"
 msgstr "Perl ilklendirmesi ayrıştırılırken"
 
-#: plperl.c:614
+#: plperl.c:791
+#, c-format
 msgid "while running Perl initialization"
 msgstr "Perl ilklendirmesi sırasında"
 
-#: plperl.c:712
+#: plperl.c:895
+#, c-format
 msgid "while executing PLC_TRUSTED"
 msgstr " PLC_TRUSTED çalıştırılırken"
 
-#: plperl.c:725
+#: plperl.c:906
+#, c-format
 msgid "while executing utf8fix"
 msgstr "utf8fix çalıştırılırken"
 
-#: plperl.c:767
+#: plperl.c:947
+#, c-format
 msgid "while executing plperl.on_plperl_init"
 msgstr "plperl.on_plperl_init çalıştırılırken"
 
-#: plperl.c:782
+#: plperl.c:968
+#, c-format
 msgid "while executing plperl.on_plperlu_init"
 msgstr "plperl.on_plperlu_init çalıştırılırken"
 
-#: plperl.c:824
-#: plperl.c:1021
+#: plperl.c:1014
+#: plperl.c:1541
 #, c-format
 msgid "Perl hash contains nonexistent column \"%s\""
 msgstr "Perl hashi olmayan kolonu içeriyor: \"%s\""
 
-#: plperl.c:997
+#: plperl.c:1097
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "dizin boyut sayısı (%d), izin verilern en yüksek değerini (%d) aşmaktadır"
+
+#: plperl.c:1111
+#, c-format
+msgid "multidimensional arrays must have array expressions with matching dimensions"
+msgstr "çok boyutlu dizinler boyut sayısı kadar dizin ifade sayısına sahip olmalıdırlar"
+
+#: plperl.c:1219
+#, c-format
+msgid "PL/Perl function must return reference to hash or array"
+msgstr "PL/Perl fonksiyonu hash ya da dizine referans dönmelidir"
+
+#: plperl.c:1518
+#, c-format
 msgid "$_TD->{new} does not exist"
 msgstr "$_TD->{new} mevcut deÄŸil"
 
-#: plperl.c:1001
+#: plperl.c:1522
+#, c-format
 msgid "$_TD->{new} is not a hash reference"
 msgstr "$_TD->{new} hash referansı değil"
 
-#: plperl.c:1235
-#: plperl.c:1924
+#: plperl.c:1745
+#: plperl.c:2476
 #, c-format
 msgid "PL/Perl functions cannot return type %s"
 msgstr "PL/Perl fonksiyonları %s veri tipini döndüremezler"
 
-#: plperl.c:1247
-#: plperl.c:1970
+#: plperl.c:1758
+#: plperl.c:2523
 #, c-format
 msgid "PL/Perl functions cannot accept type %s"
 msgstr "PL/Perl fonksiyonları %s tipini kabul etmez"
 
-#: plperl.c:1322
+#: plperl.c:1872
 #, c-format
 msgid "didn't get a CODE reference from compiling function \"%s\""
 msgstr "\"%s\" fonksiyonu derlenirken CODE referansı alınamadı"
 
-#: plperl.c:1534
+#: plperl.c:2077
+#, c-format
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "set değerini kabul etmediği ortamda set değeri alan fonksiyon çağırılmış"
 
-#: plperl.c:1577
+#: plperl.c:2121
+#, c-format
 msgid "set-returning PL/Perl function must return reference to array or use return_next"
 msgstr "se dönen PL/Perl fonksiyonu return_next kullanmalı ya da bir diziye referans dönmelidir"
 
-#: plperl.c:1610
+#: plperl.c:2150
+#, c-format
 msgid "composite-returning PL/Perl function must return reference to hash"
 msgstr "composite döndüren PL/Perl fonksiyonu hash'e referans dönmelidir"
 
-#: plperl.c:1619
+#: plperl.c:2159
+#, c-format
 msgid "function returning record called in context that cannot accept type record"
 msgstr "tip kaydı içermeyen alanda çağırılan ve kayıt döndüren fonksiyon"
 
-#: plperl.c:1739
+#: plperl.c:2273
+#, c-format
 msgid "ignoring modified row in DELETE trigger"
 msgstr "DELETE triggerındaki değiştirilmiş satır gözardı ediliyor"
 
-#: plperl.c:1747
+#: plperl.c:2281
+#, c-format
 msgid "result of PL/Perl trigger function must be undef, \"SKIP\", or \"MODIFY\""
 msgstr "PL/Perl trigger fonksiyonun sonucu undef, \"SKIP\" ya da  \"MODIFY\" olmalıdır"
 
-#: plperl.c:1859
+#: plperl.c:2407
+#: plperl.c:2413
+#, c-format
 msgid "out of memory"
 msgstr "yetersiz bellek"
 
-#: plperl.c:1915
+#: plperl.c:2467
+#, c-format
 msgid "trigger functions can only be called as triggers"
 msgstr "trigger fonksiyonları sadece trigger olarak çağırılabilirler"
 
-#: plperl.c:2228
+#: plperl.c:2843
+#, c-format
 msgid "cannot use return_next in a non-SETOF function"
 msgstr "SETOF olmayan bir fonksiyonda return_next kullanılamaz"
 
-#: plperl.c:2234
+#: plperl.c:2849
+#, c-format
 msgid "SETOF-composite-returning PL/Perl function must call return_next with reference to hash"
 msgstr "SETOF-composite döndüren PL/Perl fonksiyonları return_next'i hash'e referans olarak çağırmalıdır"
 
-#: plperl.c:3028
+#: plperl.c:3615
 #, c-format
 msgid "PL/Perl function \"%s\""
 msgstr "\"%s\" PL/Perl fonksiyonu"
 
-#: plperl.c:3040
+#: plperl.c:3627
 #, c-format
 msgid "compilation of PL/Perl function \"%s\""
 msgstr "\"%s\" PL/Perl fonksiyonunun derlenmesi"
 
-#: plperl.c:3049
+#: plperl.c:3636
+#, c-format
 msgid "PL/Perl anonymous code block"
 msgstr "PL/Perl anonim kod bloÄŸu"
 
diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql
index 4aaca2a27c55d..84af1fd73fb78 100644
--- a/src/pl/plperl/sql/plperl.sql
+++ b/src/pl/plperl/sql/plperl.sql
@@ -50,6 +50,13 @@ $$ LANGUAGE plperl;
 SELECT perl_row();
 SELECT * FROM perl_row();
 
+-- test returning a composite literal
+CREATE OR REPLACE FUNCTION perl_row_lit() RETURNS testrowperl AS $$
+    return '(1,hello,world,"({{1}})")';
+$$ LANGUAGE plperl;
+
+SELECT perl_row_lit();
+
 
 CREATE OR REPLACE FUNCTION perl_set() RETURNS SETOF testrowperl AS $$
     return undef;
@@ -415,3 +422,52 @@ DO $do$ use strict; my $name = "foo"; my $ref = $$name; $do$ LANGUAGE plperl;
 -- check that we can "use warnings" (in this case to turn a warn into an error)
 -- yields "ERROR:  Useless use of sort in scalar context."
 DO $do$ use warnings FATAL => qw(void) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;
+
+--
+-- Make sure strings are validated
+-- Should fail for all encodings, as nul bytes are never permitted.
+--
+CREATE OR REPLACE FUNCTION perl_zerob() RETURNS TEXT AS $$
+  return "abcd\0efg";
+$$ LANGUAGE plperl;
+SELECT perl_zerob();
+
+-- make sure functions marked as VOID without an explicit return work
+CREATE OR REPLACE FUNCTION myfuncs() RETURNS void AS $$
+   $_SHARED{myquote} = sub {
+       my $arg = shift;
+       $arg =~ s/(['\\])/\\$1/g;
+       return "'$arg'";
+   };
+$$ LANGUAGE plperl;
+
+SELECT myfuncs();
+
+-- make sure we can't return an array as a scalar
+CREATE OR REPLACE FUNCTION text_arrayref() RETURNS text AS $$
+	return ['array'];
+$$ LANGUAGE plperl;
+
+SELECT text_arrayref();
+
+--- make sure we can't return a hash as a scalar
+CREATE OR REPLACE FUNCTION text_hashref() RETURNS text AS $$
+	return {'hash'=>1};
+$$ LANGUAGE plperl;
+
+SELECT text_hashref();
+
+---- make sure we can't return a blessed object as a scalar
+CREATE OR REPLACE FUNCTION text_obj() RETURNS text AS $$
+	return bless({}, 'Fake::Object');
+$$ LANGUAGE plperl;
+
+SELECT text_obj();
+
+----- make sure we can't return a scalar ref
+CREATE OR REPLACE FUNCTION text_scalarref() RETURNS text AS $$
+	my $str = 'str';
+	return \$str;
+$$ LANGUAGE plperl;
+
+SELECT text_scalarref();
diff --git a/src/pl/plperl/sql/plperl_array.sql b/src/pl/plperl/sql/plperl_array.sql
index bc67c1ad0df01..818a48ec200d6 100644
--- a/src/pl/plperl/sql/plperl_array.sql
+++ b/src/pl/plperl/sql/plperl_array.sql
@@ -152,6 +152,13 @@ $$ LANGUAGE plperl;
 
 select plperl_arrays_inout('{{1}, {2}, {3}}');
 
+-- check that we can return an array literal
+CREATE OR REPLACE FUNCTION plperl_arrays_inout_l(INTEGER[]) returns INTEGER[] AS $$
+	return shift.''; # stringify it
+$$ LANGUAGE plperl;
+
+select plperl_arrays_inout_l('{{1}, {2}, {3}}');
+
 -- make sure setof works
 create or replace function perl_setof_array(integer[]) returns setof integer[] language plperl as $$
 	my $arr = shift;
diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index bbf2a44791772..c009e3916e6da 100644
--- a/src/pl/plpgsql/src/nls.mk
+++ b/src/pl/plpgsql/src/nls.mk
@@ -1,6 +1,6 @@
 # src/pl/plpgsql/src/nls.mk
 CATALOG_NAME	:= plpgsql
-AVAIL_LANGUAGES	:= de es fr it ja ko pt_BR ro zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja ko pl pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES	:= pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
 GETTEXT_TRIGGERS:= _ errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext yyerror plpgsql_yyerror
 
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 75098ec6deb21..58c093f49566b 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -1721,12 +1721,14 @@ plpgsql_parse_cwordtype(List *idents)
 	classStruct = (Form_pg_class) GETSTRUCT(classtup);
 
 	/*
-	 * It must be a relation, sequence, view, or type
+	 * It must be a relation, sequence, view, composite type, or foreign table
 	 */
 	if (classStruct->relkind != RELKIND_RELATION &&
 		classStruct->relkind != RELKIND_SEQUENCE &&
-		classStruct->relkind != RELKIND_VIEW &&
-		classStruct->relkind != RELKIND_COMPOSITE_TYPE)
+        classStruct->relkind != RELKIND_VIEW &&
+		classStruct->relkind != RELKIND_MAT_VIEW &&
+		classStruct->relkind != RELKIND_COMPOSITE_TYPE &&
+		classStruct->relkind != RELKIND_FOREIGN_TABLE)
 		goto done;
 
 	/*
@@ -1947,11 +1949,13 @@ build_row_from_class(Oid classOid)
 	classStruct = RelationGetForm(rel);
 	relname = RelationGetRelationName(rel);
 
-	/* accept relation, sequence, view, or composite type entries */
+	/* accept relation, sequence, view, composite type, or foreign table */
 	if (classStruct->relkind != RELKIND_RELATION &&
 		classStruct->relkind != RELKIND_SEQUENCE &&
-		classStruct->relkind != RELKIND_VIEW &&
-		classStruct->relkind != RELKIND_COMPOSITE_TYPE)
+        classStruct->relkind != RELKIND_VIEW &&
+		classStruct->relkind != RELKIND_MAT_VIEW &&
+		classStruct->relkind != RELKIND_COMPOSITE_TYPE &&
+		classStruct->relkind != RELKIND_FOREIGN_TABLE)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("relation \"%s\" is not a table", relname)));
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 906a485853f12..164c38d295230 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2791,7 +2791,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 	ereport(stmt->elog_level,
 			(err_code ? errcode(err_code) : 0,
 			 errmsg_internal("%s", err_message),
-			 (err_detail != NULL) ? errdetail("%s", err_detail) : 0,
+			 (err_detail != NULL) ? errdetail_internal("%s", err_detail) : 0,
 			 (err_hint != NULL) ? errhint("%s", err_hint) : 0));
 
 	estate->err_text = NULL;	/* un-suppress... */
diff --git a/src/pl/plpgsql/src/plpgsql--1.0.sql b/src/pl/plpgsql/src/plpgsql--1.0.sql
index 514562d70fed8..5eeea56824ea9 100644
--- a/src/pl/plpgsql/src/plpgsql--1.0.sql
+++ b/src/pl/plpgsql/src/plpgsql--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE plpgsql;
+
+COMMENT ON PROCEDURAL LANGUAGE plpgsql IS 'PL/pgSQL procedural language';
diff --git a/src/pl/plpgsql/src/po/cs.po b/src/pl/plpgsql/src/po/cs.po
new file mode 100644
index 0000000000000..cee1f4b2456d4
--- /dev/null
+++ b/src/pl/plpgsql/src/po/cs.po
@@ -0,0 +1,766 @@
+# LANGUAGE message translation file for plpgsql
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Pavel Stehule <pavel.stehule@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.2\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-03 19:35+0200\n"
+"PO-Revision-Date: 2011-09-03 19:31+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: Czech\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: pl_comp.c:427 pl_handler.c:266
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "funkce v PL/pgSQL nepodporují typ %s"
+
+#: pl_comp.c:506
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "nelze ur�it skute�ný návratový typ polymorfní funkce \"%s\""
+
+# trigger functions - někde je to překládané jako "trigger funkce", někde jako "funkce s návratovým typem trigger", asi by to chtělo ujednotit
+# ok
+#: pl_comp.c:536
+msgid "trigger functions can only be called as triggers"
+msgstr ""
+"funkce pro obsluhu triggerů mohou být volané pouze prostřednictvím triggerů"
+
+#: pl_comp.c:540 pl_handler.c:251
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "funkce v PL/pgSQL nemohou vracet typ %s"
+
+#: pl_comp.c:583
+msgid "trigger functions cannot have declared arguments"
+msgstr "funkce pro obsluhu triggeru nesmí mít argumenty"
+
+#: pl_comp.c:584
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr ""
+"Parametry triggeru jsou přístupné prostřednictvím proměnných TG_NARGS a "
+"TG_ARGV."
+
+#: pl_comp.c:912
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "překlad PL/pgSQL funkce \"%s\" poblíž řádku %d"
+
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "identifikátor parametru \"%s\" není unikátní"
+
+#: pl_comp.c:1045
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "nejednozna�ný odkaz na sloupec \"%s\""
+
+# přeložil bych spíš asi jako "Identifikátor může odkazovat na proměnnou PL/pgSQL nebo na sloupec v tabulce."
+# ok
+#: pl_comp.c:1047
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr ""
+"Identifikátor může odkazovat na proměnnou PL/pgSQL nebo na sloupec v tabulce."
+
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "záznam \"%s\" nemá položku \"%s\""
+
+#: pl_comp.c:1782
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "relace \"%s\" neexistuje"
+
+#: pl_comp.c:1814
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "relace \"%s.%s\" neexistuje"
+
+# asi spíš jako "proměnná \"%s\" má pseudo-typ \"%s\" (slovo "obsahuje" si vykládám spíš jako že je sou�ástí)
+# podivej se do zdrojaku, hlasi, kdyz zkusis deklarovat promennou s pseudotype - takze jsem to prelozil
+# jeste trochu jinak
+#: pl_comp.c:1896
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "proměnná \"%s\" je deklarována jako pseudo-typ \"%s\""
+
+#: pl_comp.c:1957
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "relace \"%s\" není tabulkou"
+
+# spíš asi "je jenom obálka (shell)",
+# ok
+#: pl_comp.c:2117
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "typ \"%s\" je jen obálkou (shell)"
+
+#: pl_comp.c:2190 pl_comp.c:2243
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "nedefinovaná výjimka \"%s\""
+
+#: pl_comp.c:2401
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "nelze ur�it skute�ný typ argumentu polymorfní funkce \"%s\""
+
+#: pl_exec.c:239 pl_exec.c:510
+msgid "during initialization of execution state"
+msgstr "během inicializace proměnné execution state"
+
+#: pl_exec.c:246
+msgid "while storing call arguments into local variables"
+msgstr "během ukládání parametrů funkce do lokálních proměnných"
+
+#: pl_exec.c:301 pl_exec.c:667
+msgid "during function entry"
+msgstr "během vstupu do funkce"
+
+#: pl_exec.c:332 pl_exec.c:698
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "CONTINUE nemůže byt použito mimo tělo cyklu"
+
+#: pl_exec.c:336
+msgid "control reached end of function without RETURN"
+msgstr "funkce skon�ila, aniž by byl proveden příkaz RETURN"
+
+#: pl_exec.c:343
+msgid "while casting return value to function's return type"
+msgstr "během konverze vracené hodnoty do návratového typu funkce"
+
+# spíš asi "který neumožňuje přijetí tabulky"
+# ok
+#: pl_exec.c:356 pl_exec.c:2591
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"funkce vracející tabulku byla zavolána z kontextu, který neumožňuje přijetí "
+"tabulky"
+
+#: pl_exec.c:394
+msgid "returned record type does not match expected record type"
+msgstr ""
+"vracenou hodnotu typu record nelze konvertovat do o�ekávaného typu record"
+
+#: pl_exec.c:452 pl_exec.c:706
+msgid "during function exit"
+msgstr "během ukon�ování funkce"
+
+#: pl_exec.c:702
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "funkce obsluhy triggeru skon�ila, aniž by byl proveden příkaz RETURN"
+
+#: pl_exec.c:711
+msgid "trigger procedure cannot return a set"
+msgstr "funkce obsluhy triggeru nemůže vrátit tabulku"
+
+#: pl_exec.c:733
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr ""
+"struktura vrácené hodnoty neodpovídá struktuře tabulky svázané s triggerem"
+
+#: pl_exec.c:796
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "PL/pgSQL funkce \"%s\" řádek %d %s"
+
+#: pl_exec.c:807
+#, c-format
+msgid "PL/pgSQL function \"%s\" %s"
+msgstr "PL/pgSQL funkce \"%s\" %s"
+
+#. translator: last %s is a plpgsql statement type name
+#: pl_exec.c:815
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "PL/pgSQL funkce \"%s\" řádek %d  %s"
+
+#: pl_exec.c:821
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "PL/pgSQL funkce \"%s\""
+
+#: pl_exec.c:929
+msgid "during statement block local variable initialization"
+msgstr "během inicializace lokálních proměnných bloku"
+
+#: pl_exec.c:971
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr ""
+"NULL nemůže být výchozí hodnotou proměnné \"%s\" deklarované jako NOT NULL"
+
+#: pl_exec.c:1021
+msgid "during statement block entry"
+msgstr "během zahájení bloku"
+
+#: pl_exec.c:1042
+msgid "during statement block exit"
+msgstr "během ukon�ování bloku"
+
+#: pl_exec.c:1085
+msgid "during exception cleanup"
+msgstr "během �ištění po zachycení výjimky"
+
+#: pl_exec.c:1570
+msgid "case not found"
+msgstr "varianta nenalezena"
+
+#: pl_exec.c:1571
+msgid "CASE statement is missing ELSE part."
+msgstr "V příkazu CASE chybí �ást ELSE"
+
+#: pl_exec.c:1725
+msgid "lower bound of FOR loop cannot be null"
+msgstr "spodní limit příkazu FOR nesmí být nullL"
+
+#: pl_exec.c:1740
+msgid "upper bound of FOR loop cannot be null"
+msgstr "horní limit příkazu FOR nesmí být null"
+
+#: pl_exec.c:1757
+msgid "BY value of FOR loop cannot be null"
+msgstr "krok příkazu FOR nesmí být null"
+
+#: pl_exec.c:1763
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "krok příkazu FOR musí být větší než nula"
+
+#: pl_exec.c:1933 pl_exec.c:3395
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "kurzor \"%s\" se již používá"
+
+#: pl_exec.c:1956 pl_exec.c:3457
+msgid "arguments given for cursor without arguments"
+msgstr "argumenty pro kurzor bez argumentů"
+
+#: pl_exec.c:1975 pl_exec.c:3476
+msgid "arguments required for cursor"
+msgstr "kurzor vyžaduje argumenty"
+
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "výraz ve FOREACH nesmí být null"
+
+# výrazu/příkazu
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "výsledkem výrazu příkazu FOREACH musí být pole, nikoliv %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "dimenze podpole (%d) je mimo validní rozsah 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "FOREACH ... SLICE proměnná cyklu musí být typu pole"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "FOREACH proměnná cyklu nesmí být typu pole"
+
+#: pl_exec.c:2375 gram.y:2844
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr "RETURN NEXT nelze použít ve funkci, která nevrací tabulku"
+
+#: pl_exec.c:2399 pl_exec.c:2465
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "typ parametru příkazu RETURN NEXT neodpovídá návratovému typu funkce "
+
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "proměnné \"%s\" typu record ještě nebyla přiřazena hodnota"
+
+# te�ka na konci
+# ok
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr ""
+"Proměnná typu record, které ještě nebyla přiřazena hodnota, nemá definovanou "
+"strukturu."
+
+#: pl_exec.c:2427 pl_exec.c:2446
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr ""
+"obsah parametru příkazu RETURN NEXT nelze převést na návratový typ funkce"
+
+#: pl_exec.c:2488
+msgid "RETURN NEXT must have a parameter"
+msgstr "RETURN NEXT musí mít parametr"
+
+#: pl_exec.c:2519 gram.y:2903
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr "uvnitř funkce, která nevrací tabulku, nelze použít RETURN QUERY"
+
+#: pl_exec.c:2539
+msgid "structure of query does not match function result type"
+msgstr "struktura dotazu neodpovídá návratovému typu funkce"
+
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "RAISE bez parametrů nesmí být použito mimo obsluhu výjimky"
+
+#: pl_exec.c:2678
+msgid "too few parameters specified for RAISE"
+msgstr "příliš málo parametrů příkazu RAISE"
+
+#: pl_exec.c:2704
+msgid "too many parameters specified for RAISE"
+msgstr "příliš mnoho parametrů příkazu RAISE"
+
+#: pl_exec.c:2724
+msgid "RAISE statement option cannot be null"
+msgstr "volitelný parametr příkazu RAISE nesmí být null"
+
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "opakované použití volitelného parametru: %s příkazu RAISE"
+
+#: pl_exec.c:2795
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "v PL/pgSQL nelze použít COPY to/from klient"
+
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "v PL/pgSQL nelze zahájit/ukon�it transakci"
+
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "Použijte blok BEGIN .. END s klauzulí EXCEPTION."
+
+# "nevrací" má trochu jiný význam než "nemůže vracet"
+#: pl_exec.c:3109 pl_exec.c:3289
+msgid "INTO used with a command that cannot return data"
+msgstr "INTO je použito v příkazu, který nevrací data"
+
+#: pl_exec.c:3129 pl_exec.c:3309
+msgid "query returned no rows"
+msgstr "dotaz nevrátil žádný řádek"
+
+#: pl_exec.c:3138 pl_exec.c:3318
+msgid "query returned more than one row"
+msgstr "dotaz vrátil více než jeden řádek"
+
+#: pl_exec.c:3152
+msgid "query has no destination for result data"
+msgstr "chybí cíl pro výsledek dotazu"
+
+#: pl_exec.c:3153
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr "Pokud nechcete použít výsledek SELECTu, použijte PERFORM."
+
+# generující? spíš asi "obsahující" nebo jenom "s dynamickým dotazem"
+# ok
+#: pl_exec.c:3186 pl_exec.c:5929
+msgid "query string argument of EXECUTE is null"
+msgstr "textový argument s dynamickým dotazem příkazu EXECUTE je null"
+
+#: pl_exec.c:3251
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "EXECUTE příkazu SELECT ... INTO není implementováno"
+
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr "Možná chcete použít EXECUTE ... INTO nebo EXECUTE CREATE TABLE ... AS."
+
+# myslí se tím proměnná která se předává kurzoru nebo samotný kurzor? Pokud kurzor, tak asi spíš kurzorová proměnná.
+# ok, i kdyz v tom necitim rozdil
+#: pl_exec.c:3540 pl_exec.c:3631
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "kurzorová proměnná \"%s\" je null"
+
+#: pl_exec.c:3547 pl_exec.c:3638
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "kurzor \"%s\" neexistuje"
+
+#: pl_exec.c:3561
+msgid "relative or absolute cursor position is null"
+msgstr "relativní nebo absolutní pozice kurzoru je null"
+
+#: pl_exec.c:3702
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr "proměnné \"%s\" deklarované jako NOT NULL nelze přiřadit null"
+
+# hodnotU
+#: pl_exec.c:3760
+msgid "cannot assign non-composite value to a row variable"
+msgstr "proměnné složeného typu nelze přiřadit jinou než složenou hodnot"
+
+#: pl_exec.c:3802
+msgid "cannot assign non-composite value to a record variable"
+msgstr "proměnné typu record nelze přiřadit jinou než slouženou hodnotu"
+
+#: pl_exec.c:3973
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "po�et dimenzí pole (%d) přesáhl maxímální povolený po�et (%d)"
+
+#: pl_exec.c:3992
+msgid "subscripted object is not an array"
+msgstr "indexovaná proměnná není pole"
+
+#: pl_exec.c:4015
+msgid "array subscript in assignment must not be null"
+msgstr "index pole v přířazovacím příkazu nesmí být null"
+
+#: pl_exec.c:4493
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "dotaz \"%s\" nevrátil žádná data"
+
+#: pl_exec.c:4501
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "dotaz \"%s\" vrátil %d sloupec"
+msgstr[1] "dotaz \"%s\" vrátil %d sloupce"
+msgstr[2] "dotaz \"%s\" vrátil %d sloupců"
+
+#: pl_exec.c:4527
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "dotaz \"%s\" vrátil více než jeden řádek"
+
+#: pl_exec.c:4585
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "dotaz \"%s\" není SELECT"
+
+#: gram.y:430
+msgid "block label must be placed before DECLARE, not after"
+msgstr "návěstí bloku musí být umístěno před klí�ové slovo DECLARE, nikoliv za"
+
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "typ %s nepodporuje collations"
+
+# překládat RECORD jako "proměnná složeného typu" mi přijde divný (resp. spousta lidí nebude vědět o co jde), ale "záznam" se asi �asto používá pro řádek tabulky ...
+# record neprekladam (je to typ), prekladam row, ktery odpovida castecne zaznamu tabulek, ale take odpovida kompozitnim typum
+# o zaznamu jsem take uvazoval, ale prislo mi divny, kdybych napsal "promenna typu record nebo zaznam" ponevadz jsou to pro
+# pro mnohe z nas synonyma
+#: gram.y:465
+msgid "row or record variable cannot be CONSTANT"
+msgstr ""
+"proměnná typu record nebo složeného typu nemůže být ozna�ena jako konstanta"
+
+#: gram.y:475
+msgid "row or record variable cannot be NOT NULL"
+msgstr ""
+"proměnná typu record nebo složeného typu nemůže být ozna�ena jako NOT NULL"
+
+#: gram.y:486
+msgid "default value for row or record variable is not supported"
+msgstr ""
+"nelze zadat defaultní hodnotu proměnným typu record nebo složeného typu"
+
+#: gram.y:631 gram.y:657
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "proměnná \"%s\" neexistuje"
+
+#: gram.y:675 gram.y:688
+msgid "duplicate declaration"
+msgstr "duplicitní deklarace"
+
+#: gram.y:881
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "neznámá položka příkazu GET DIAGNOSTICS"
+
+#: gram.y:892 gram.y:3090
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" není skalární proměnná"
+
+#: gram.y:1154 gram.y:1347
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr ""
+"řídící proměnná cyklu musí být typu record nebo složeného typu, případně "
+"seznam skalárních proměnných"
+
+# asi by tam mělo být i to FOR, neplatí to pro všechny cykly
+# ok
+#: gram.y:1188
+msgid "cursor FOR loop must have only one target variable"
+msgstr "cyklus FOR nad kurzorem musí mít pouze jednu cílovou proměnnou"
+
+#: gram.y:1195
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "cyklus FOR nad kurzorem musí použít vázanou proměnnou kurzoru"
+
+#: gram.y:1278
+msgid "integer FOR loop must have only one target variable"
+msgstr "celo�iselný cyklus FOR musí mít pouze jednu cílovou proměnnou"
+
+#: gram.y:1314
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "nelze zadat atribut REVERSE v případě cyklu FOR nad dotazem"
+
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr ""
+"řídící proměnná(é) cyklu FOREACH musí být existující proměnná, případně "
+"seznam existujících proměnných"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
+msgid "unexpected end of function definition"
+msgstr "neo�ekávaný konec definice funkce"
+
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 gram.y:2242 gram.y:2821
+#: gram.y:2885 gram.y:3325 gram.y:3346
+msgid "syntax error"
+msgstr "syntaktická chyba"
+
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
+msgid "invalid SQLSTATE code"
+msgstr "nevalidní SQLSTATE kód"
+
+#: gram.y:1814
+msgid "syntax error, expected \"FOR\""
+msgstr "syntaktická chyba, o�ekává se \"FOR\""
+
+#: gram.y:1876
+msgid "FETCH statement cannot return multiple rows"
+msgstr "příkaz FETCH nesmí vracet více řádek"
+
+#: gram.y:1932
+msgid "cursor variable must be a simple variable"
+msgstr "proměnná kurzoru musí být skalární proměnná"
+
+# cursor bych asi nepřekládal, je to přímo název typu, navíc v refcursor to přeloženo není
+# kurzor (cursor) neni typ, a refcursor je fakticky varchar - vyhodil bych type
+# pripadne "promenna musi byt deklarovana jako kurzor nebo jako refcursor"
+#: gram.y:1938
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "proměnná \"%s\" musí být kurzor nebo referencí na kurzor"
+
+#: gram.y:2106
+msgid "label does not exist"
+msgstr "návěstí neexistuje"
+
+#: gram.y:2213 gram.y:2224
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" není známou proměnnou"
+
+#: gram.y:2326 gram.y:2336 gram.y:2464
+msgid "mismatched parentheses"
+msgstr "neodpovídající si závorky"
+
+#: gram.y:2340
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "chybějící \"%s\" na konci SQL výrazu"
+
+#: gram.y:2346
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "chybějící \"%s\" na konci SQL příkazu"
+
+#: gram.y:2363
+msgid "missing expression"
+msgstr "chybějící výraz"
+
+#: gram.y:2365
+msgid "missing SQL statement"
+msgstr "chybějící SQL příkaz"
+
+#: gram.y:2466
+msgid "incomplete data type declaration"
+msgstr "neúplná deklarace datového typu"
+
+#: gram.y:2489
+msgid "missing data type declaration"
+msgstr "chybějící deklarace datového typu"
+
+#: gram.y:2545
+msgid "INTO specified more than once"
+msgstr "opakované použití INTO"
+
+#: gram.y:2713
+msgid "expected FROM or IN"
+msgstr "o�ekáváno FROM nebo IN"
+
+#: gram.y:2773
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "uvnitř funkce, která vrací tabulku, RETURN nemá parametr"
+
+#: gram.y:2774
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "Použijte RETURN NEXT nebo RETURN QUERY."
+
+#: gram.y:2782
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "uvnitř funkce s OUT parametry RETURN nemá parametr"
+
+#: gram.y:2791
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "uvnitř funkce s návratovou hodnotou typu void RETURN nemá parametr"
+
+#: gram.y:2809 gram.y:2816
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr ""
+"uvnitř funkce, která vrací složenou hodnotu, lze použít RETURN pouze s "
+"proměnnou typu record nebo složeného typu"
+
+#: gram.y:2858
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "uvnitř funkce s OUT parametry RETURN NEXT nemá paramet"
+
+#: gram.y:2873 gram.y:2880
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
+msgstr ""
+"uvnitř funkce, která vrací složenou hodnotu, lze použít RETURN NEXT pouze s "
+"proměnnou typu record nebo složeného typu"
+
+#: gram.y:2959
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\" je deklarováno jako konstanta"
+
+#: gram.y:3021 gram.y:3033
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr ""
+"v seznamu cílových proměnných klauzule INTO není dovoleno použítí proměnné "
+"typu record nebo složeného typu"
+
+#: gram.y:3078
+msgid "too many INTO variables specified"
+msgstr "příliš mnoho cílových proměnných v klauzuli INTO"
+
+#: gram.y:3286
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "použití koncového návěstí \"%s\" k bloku bez návěstí"
+
+#: gram.y:3293
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "koncové návěstí \"%s\" nesouhlasí s návěstím bloku \"%s\""
+
+#: gram.y:3320
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "kurzor \"%s\" je deklarován bez parametrů"
+
+#: gram.y:3334
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "kurzor \"%s\" vyžaduje parametry"
+
+#: gram.y:3382
+msgid "unrecognized RAISE statement option"
+msgstr "neznámý volitelný parametr příkazu RAISE"
+
+#: gram.y:3386
+msgid "syntax error, expected \"=\""
+msgstr "syntaktická chyba, o�ekáváno \"=\""
+
+#: pl_funcs.c:218
+msgid "statement block"
+msgstr "blok"
+
+#: pl_funcs.c:220
+msgid "assignment"
+msgstr "přiřazení"
+
+#: pl_funcs.c:230
+msgid "FOR with integer loop variable"
+msgstr "FOR s celo�íselnou řídící proměnnou"
+
+# možná spíš "FOR nad SELECT dotazem
+# zkusim jeste neco jineho"
+#: pl_funcs.c:232
+msgid "FOR over SELECT rows"
+msgstr "FOR nad SELECT(em)"
+
+#: pl_funcs.c:234
+msgid "FOR over cursor"
+msgstr "FOR nad kurzorem"
+
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH nad polem"
+
+#: pl_funcs.c:248
+msgid "SQL statement"
+msgstr "SQL příkaz"
+
+#: pl_funcs.c:250
+msgid "EXECUTE statement"
+msgstr "EXECUTE příkaz"
+
+#: pl_funcs.c:252
+msgid "FOR over EXECUTE statement"
+msgstr "FOR nad dynamickým výběrem (FOR over EXECUTE)"
+
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr ""
+"Nastavuje způsob řešení konfliktu mezi názvy PL/pgSQL proměnných a názvy "
+"sloupců tabulek."
+
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:467
+#, c-format
+msgid "%s at end of input"
+msgstr "\"%s\" na konci vstupu"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:483
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "\"%s\" u nebo poblíž \"%s\""
+
+#~ msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
+#~ msgstr "GET STACKED DIAGNOSTICS nelze použít mimo obsluhu výjimky"
+
+#~ msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
+#~ msgstr ""
+#~ "diagnostická položka %s není dostupná v příkazu GET STACKED DIAGNOSTICS"
+
+#~ msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
+#~ msgstr ""
+#~ "diagnostická položka %s není dostupná v příkazu GET CURRENT DIAGNOSTICS"
diff --git a/src/pl/plpgsql/src/po/es.po b/src/pl/plpgsql/src/po/es.po
index e25341b98127d..70ed454441be4 100644
--- a/src/pl/plpgsql/src/po/es.po
+++ b/src/pl/plpgsql/src/po/es.po
@@ -1,108 +1,120 @@
-# translation of plpgsql-es.po to
+# translation of plpgsql.po to
 # Spanish message translation file for plpgsql
 #
-# Copyright (C) 2008-2010 PostgreSQL Global Development Group
+# Copyright (C) 2008-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
-# �lvaro Herrera <alvherre@alvh.no-ip.org> 2008-2010
+# �lvaro Herrera <alvherre@alvh.no-ip.org> 2008-2011
 # Emanuel Calvo Franco <postgres.arg@gmail.com> 2008
 # Jaime Casanova <jcasanov@systemguards.com.ec> 2010
 #
-# pgtranslation Id: plpgsql.po,v 1.11 2010/08/31 18:16:00 alvherre Exp $
+# pgtranslation Id: plpgsql.po,v 1.12 2011/09/03 02:24:29 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpgsql (PostgreSQL 9.0)\n"
+"Project-Id-Version: plpgsql (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 07:15+0000\n"
-"PO-Revision-Date: 2010-08-31 14:15-0400\n"
+"POT-Creation-Date: 2011-09-02 10:52+0000\n"
+"PO-Revision-Date: 2011-09-02 23:24-0300\n"
 "Last-Translator: \n"
 "Language-Team:  PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pl_comp.c:422 pl_handler.c:256
+#: pl_comp.c:427 pl_handler.c:266
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "las funciones PL/pgSQL no pueden aceptar el tipo %s"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "no se pudo determinar el verdadero tipo de resultado para la función "
 "polimórfica «%s»"
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr ""
 "las funciones de disparador sólo pueden ser invocadas como disparadores"
 
-#: pl_comp.c:535 pl_handler.c:241
+#: pl_comp.c:540 pl_handler.c:251
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "las funciones PL/pgSQL no pueden retornar el tipo %s"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "las funciones de disparador no pueden tener argumentos declarados"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
 msgstr ""
 "Los argumentos del disparador pueden accederse usando TG_NARGS y TG_ARGV."
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilación de la función PL/pgSQL «%s» cerca de la línea %d"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "el nombre de parámetro «%s» fue usado más de una vez"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la referencia a la columna «%s» es ambigua"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr ""
 "Podría referirse tanto a una variable PL/pgSQL como a una columna de una "
 "tabla."
 
-#: pl_comp.c:1690
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "el registro «%s» no tiene un campo «%s»"
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "no existe la relación «%s»"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "no existe la relación «%s.%s»"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variable «%s» tiene pseudotipo %s"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relación «%s» no es una tabla"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "el tipo «%s» está inconcluso"
 
-#: pl_comp.c:2087 pl_comp.c:2140
+#: pl_comp.c:2190 pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "no se reconoce la condición de excepción «%s»"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
@@ -110,360 +122,385 @@ msgstr ""
 "no se pudo determinar el verdadero tipo de argumento para la función "
 "polimórfica «%s»"
 
-#: pl_exec.c:236 pl_exec.c:507
+#: pl_exec.c:239 pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "durante la inicialización del estado de ejecución"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr ""
 "mientras se almacenaban los argumentos de invocación en variables locales"
 
-#: pl_exec.c:298 pl_exec.c:662
+#: pl_exec.c:301 pl_exec.c:667
 msgid "during function entry"
 msgstr "durante el ingreso a la función"
 
-#: pl_exec.c:329 pl_exec.c:693
+#: pl_exec.c:332 pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE no puede usarse fuera de un bucle"
 
-#: pl_exec.c:333
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "la ejecución alcanzó el fin de la función sin encontrar RETURN"
 
-#: pl_exec.c:340
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr ""
 "mientras se hacía la conversión del valor de retorno al tipo de retorno de "
 "la función"
 
-#: pl_exec.c:353 pl_exec.c:2403
+#: pl_exec.c:356 pl_exec.c:2591
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "se llamó una función que retorna un conjunto en un contexto que no puede "
 "aceptarlo"
 
-#: pl_exec.c:391
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr ""
 "el tipo de registro retornado no coincide con el tipo de registro esperado"
 
-#: pl_exec.c:449 pl_exec.c:701
+#: pl_exec.c:452 pl_exec.c:706
 msgid "during function exit"
 msgstr "durante la salida de la función"
 
-#: pl_exec.c:697
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr ""
 "la ejecución alcanzó el fin del procedimiento disparador sin encontrar RETURN"
 
-#: pl_exec.c:706
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "los procedimientos disparadores no pueden retornar conjuntos"
 
-#: pl_exec.c:728
+#: pl_exec.c:733
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr ""
 "la estructura de fila retornada no coincide con la estructura de la tabla "
 "que generó el evento de disparador"
 
-#: pl_exec.c:791
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "función PL/pgSQL «%s» en la línea %d %s"
 
-#: pl_exec.c:802
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "función PL/pgSQL «%s» %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:810
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "función PL/pgSQL «%s» en la línea %d en %s"
 
-#: pl_exec.c:816
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "función PL/pgSQL «%s»"
 
-#: pl_exec.c:924
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "durante inicialización de variables locales en el bloque de sentencias"
 
-#: pl_exec.c:966
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr ""
 "la variable «%s» declarada NOT NULL no puede tener un valor por omisión NULL"
 
-#: pl_exec.c:1016
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "durante la entrada al bloque de sentencias"
 
-#: pl_exec.c:1037
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "durante la salida del bloque de sentencias"
 
-#: pl_exec.c:1080
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "durante la finalización por excepción"
 
-#: pl_exec.c:1559
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "caso no encontrado"
 
-#: pl_exec.c:1560
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "A la sentencia CASE le falta la parte ELSE."
 
-#: pl_exec.c:1714
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "el límite inferior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1729
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "el límite superior de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1746
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "el valor BY de un ciclo FOR no puede ser null"
 
-#: pl_exec.c:1752
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "el valor BY de un ciclo FOR debe ser mayor que cero"
 
-#: pl_exec.c:1923 pl_exec.c:3196
+#: pl_exec.c:1933 pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "el cursor «%s» ya está en uso"
 
-#: pl_exec.c:1946 pl_exec.c:3258
+#: pl_exec.c:1956 pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "se dieron argumentos a un cursor sin argumentos"
 
-#: pl_exec.c:1965 pl_exec.c:3277
+#: pl_exec.c:1975 pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "se requieren argumentos para el cursor"
 
-#: pl_exec.c:2187 gram.y:2744
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "la expresión FOREACH no debe ser nula"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "una expresión FOREACH debe retornar un array, no tipo %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "la dimensión del slice (%d) está fuera de rango 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "las variables de bucles FOREACH ... SLICE deben ser de un tipo array"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "la variable de bucle FOREACH no debe ser de tipo array"
+
+#: pl_exec.c:2375 gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "no se puede usar RETURN NEXT en una función que no es SETOF"
 
-#: pl_exec.c:2211 pl_exec.c:2277
+#: pl_exec.c:2399 pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "se pasó un tipo incorrecto de resultado a RETURN NEXT"
 
-#: pl_exec.c:2233 pl_exec.c:3650 pl_exec.c:3956 pl_exec.c:3990 pl_exec.c:4052
-#: pl_exec.c:4071 pl_exec.c:4108
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "el registro «%s» no ha sido asignado aún"
 
-#: pl_exec.c:2235 pl_exec.c:3652 pl_exec.c:3958 pl_exec.c:3992 pl_exec.c:4054
-#: pl_exec.c:4073 pl_exec.c:4110
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr ""
 "La estructura de fila de un registro aún no asignado no está determinado."
 
-#: pl_exec.c:2239 pl_exec.c:2258
+#: pl_exec.c:2427 pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "se pasó un tipo de registro incorrecto a RETURN NEXT"
 
-#: pl_exec.c:2300
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT debe tener un parámetro"
 
-#: pl_exec.c:2331 gram.y:2803
+#: pl_exec.c:2519 gram.y:2903
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr ""
 "no se puede usar RETURN QUERY en una función que no ha sido declarada SETOF"
 
-#: pl_exec.c:2351
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr ""
 "la estructura de la consulta no coincide con el tipo del resultado de la "
 "función"
 
-#: pl_exec.c:2449
+#: pl_exec.c:2637
 msgid "RAISE without parameters cannot be used outside an exception handler"
 msgstr ""
 "RAISE sin parámetros no puede ser usado fuera de un manejador de excepción"
 
-#: pl_exec.c:2490
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "se especificaron muy pocos parámetros a RAISE"
 
-#: pl_exec.c:2516
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "se especificaron demasiados parámetros a RAISE"
 
-#: pl_exec.c:2536
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "la opción de sentencia en RAISE no puede ser null"
 
-#: pl_exec.c:2546 pl_exec.c:2555 pl_exec.c:2563 pl_exec.c:2571
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "la opción de RAISE ya se especificó: %s"
 
-#: pl_exec.c:2606 pl_exec.c:2607
+#: pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2757 pl_exec.c:3061
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "no se puede ejecutar COPY desde/a un cliente en PL/pgSQL"
 
-#: pl_exec.c:2761 pl_exec.c:3065
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "no se pueden iniciar o terminar transacciones en PL/pgSQL"
 
-#: pl_exec.c:2762 pl_exec.c:3066
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utilice un bloque BEGIN con una cláusula EXCEPTION."
 
-#: pl_exec.c:2910 pl_exec.c:3090
+#: pl_exec.c:3109 pl_exec.c:3289
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO es utilizado con una orden que no puede retornar datos"
 
-#: pl_exec.c:2930 pl_exec.c:3110
+#: pl_exec.c:3129 pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "la consulta no regresó filas"
 
-#: pl_exec.c:2939 pl_exec.c:3119
+#: pl_exec.c:3138 pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "la consulta regresó más de una fila"
 
-#: pl_exec.c:2953
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "la consulta no tiene un destino para los datos de resultado"
 
-#: pl_exec.c:2954
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Si quiere descartar los resultados de un SELECT, utilice PERFORM."
 
-#: pl_exec.c:2987 pl_exec.c:5610
+#: pl_exec.c:3186 pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "el argumento de consulta a ejecutar en EXECUTE es null"
 
-#: pl_exec.c:3052
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "no está implementado EXECUTE de un SELECT ... INTO"
 
-#: pl_exec.c:3053
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "Puede desear usar EXECUTE ... INTO en su lugar."
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr "Puede desear usar EXECUTE ... INTO o EXECUTE CREATE TABLE ... AS en su lugar."
 
-#: pl_exec.c:3341 pl_exec.c:3432
+#: pl_exec.c:3540 pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variable cursor «%s» es null"
 
-#: pl_exec.c:3348 pl_exec.c:3439
+#: pl_exec.c:3547 pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "no existe el cursor «%s»"
 
-#: pl_exec.c:3362
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "la posición relativa o absoluta del cursor es null"
 
-#: pl_exec.c:3503
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr ""
-"no puede asignarse un valor null a la variable «%s» que fue declarada NOT NULL"
+"no puede asignarse un valor null a la variable «%s» que fue declarada NOT "
+"NULL"
 
-#: pl_exec.c:3561
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr "no se puede asignar un valor no compuesto a una variable de tipo row"
 
-#: pl_exec.c:3603
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr ""
 "no se puede asignar un valor no compuesto a una variable de tipo record"
 
-#: pl_exec.c:3663 pl_exec.c:3997 pl_exec.c:4078 pl_exec.c:4115
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "el registro «%s» no tiene un campo «%s»"
-
-#: pl_exec.c:3773
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr ""
 "el número de dimensiones del array (%d) excede el máximo permitido (%d)"
 
-#: pl_exec.c:3787
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "el objeto al que se le puso un subíndice no es un array"
 
-#: pl_exec.c:3810
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "subíndice de array en asignación no puede ser null"
 
-#: pl_exec.c:4206
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la consulta «%s» no retornó datos"
 
-#: pl_exec.c:4214
+#: pl_exec.c:4501
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "la consulta «%s» retornó %d columna"
 msgstr[1] "la consulta «%s» retornó %d columnas"
 
-#: pl_exec.c:4240
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "la consulta «%s» retornó más de una fila"
 
-#: pl_exec.c:4298
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la consulta «%s» no es una orden SELECT"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "etiqueta de bloque debe estar antes de DECLARE, no después"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "los ordenamientos (collate) no están soportados por el tipo %s"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "variable de tipo row o record no puede ser CONSTANT"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "variable de tipo row o record no puede ser NOT NULL"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr ""
 "el valor por omisión de una variable de tipo row o record no está soportado"
 
-#: gram.y:606 gram.y:632
+#: gram.y:631 gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "no existe la variable «%s»"
 
-#: gram.y:650 gram.y:663
+#: gram.y:675 gram.y:688
 msgid "duplicate declaration"
 msgstr "declaración duplicada"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "elemento de GET DIAGNOSTICS no reconocido"
 
-#: gram.y:852 gram.y:2990
+#: gram.y:892 gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "«%s» no es una variable escalar"
 
-#: gram.y:1114 gram.y:1306
+#: gram.y:1154 gram.y:1347
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
@@ -471,209 +508,218 @@ msgstr ""
 "la variable de bucle de un bucle sobre filas debe ser una variable de tipo "
 "record o row o una lista de variables escalares"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "un bucle FOR de un cursor debe tener sólo una variable de destino"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "un bucle FOR en torno a un cursor debe usar un cursor enlazado (bound)"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr ""
 "un bucle FOR de un número entero debe tener sólo una variable de destino"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "no se puede especificar REVERSE en un bucle FOR de una consulta"
 
-#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2440 gram.y:2521 gram.y:2632
-#: gram.y:3264
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr ""
+"la variable de bucle de FOREACH debe ser una variable conocida o una lista de variables conocidas"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "fin inesperado de la definición de la función"
 
-#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1657 gram.y:1665
-#: gram.y:1679 gram.y:1774 gram.y:1951 gram.y:2030 gram.y:2143 gram.y:2721
-#: gram.y:2785 gram.y:3224 gram.y:3245
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 gram.y:2242 gram.y:2821
+#: gram.y:2885 gram.y:3325 gram.y:3346
 msgid "syntax error"
 msgstr "error de sintaxis"
 
-#: gram.y:1553 gram.y:1555 gram.y:1955 gram.y:1957
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE no válido"
 
-#: gram.y:1721
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "error de sintaxis, se esperaba «FOR»"
 
-#: gram.y:1783
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "la sentencia FETCH no puede retornar múltiples filas"
 
-#: gram.y:1839
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "variable de cursor debe ser una variable simple"
 
-#: gram.y:1845
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variable «%s» debe ser de tipo cursor o refcursor"
 
-#: gram.y:2009
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "la etiqueta no existe"
 
-#: gram.y:2114 gram.y:2125
+#: gram.y:2213 gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "«%s» no es una variable conocida"
 
-#: gram.y:2227 gram.y:2237 gram.y:2365
+#: gram.y:2326 gram.y:2336 gram.y:2464
 msgid "mismatched parentheses"
 msgstr "no coinciden los paréntesis"
 
-#: gram.y:2241
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "falta «%s» al final de la expresión SQL"
 
-#: gram.y:2247
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "falta «%s» al final de la sentencia SQL"
 
-#: gram.y:2264
+#: gram.y:2363
 msgid "missing expression"
 msgstr "expresión faltante"
 
-#: gram.y:2266
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "sentencia SQL faltante"
 
-#: gram.y:2367
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "declaración de tipo de dato incompleta"
 
-#: gram.y:2389
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "declaración de tipo de dato faltante"
 
-#: gram.y:2445
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO fue especificado más de una vez"
 
-#: gram.y:2613
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "se espera FROM o IN"
 
-#: gram.y:2673
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr ""
 "RETURN no puede tener un parámetro en una función que retorna un conjunto"
 
-#: gram.y:2674
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Use RETURN NEXT o RETURN QUERY."
 
-#: gram.y:2682
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN no puede tener parámetros en una función con parámetros OUT"
 
-#: gram.y:2691
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN no puede tener parámetro en una función que retorna void"
 
-#: gram.y:2709 gram.y:2716
+#: gram.y:2809 gram.y:2816
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN debe especificar una variable de tipo record o row en una función que "
 "retorna una fila"
 
-#: gram.y:2758
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN NEXT no puede tener parámetros en una función con parámetros OUT"
 
-#: gram.y:2773 gram.y:2780
+#: gram.y:2873 gram.y:2880
 msgid ""
 "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN NEXT debe especificar una variable tipo record o row en una función "
 "que retorna una fila"
 
-#: gram.y:2859
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "«%s» esta declarada como CONSTANT"
 
-#: gram.y:2921 gram.y:2933
+#: gram.y:3021 gram.y:3033
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr ""
 "una variable de tipo record o row no puede ser parte de una lista INTO de "
 "múltiples elementos"
 
-#: gram.y:2978
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "se especificaron demasiadas variables INTO"
 
-#: gram.y:3185
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etiqueta de término «%s» especificada para un bloque sin etiqueta"
 
-#: gram.y:3192
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "etiqueta de término «%s» difiere de la etiqueta de bloque «%s»"
 
-#: gram.y:3219
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "el cursor «%s» no tiene argumentos"
 
-#: gram.y:3233
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "el cursor «%s» tiene argumentos"
 
-#: gram.y:3281
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "no se reconoce la opción de sentencia RAISE"
 
-#: gram.y:3285
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "error de sintaxis, se esperaba «=»"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "bloque de sentencias"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "asignación"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "bucle FOR con variable entera"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "bucle FOR en torno a filas de un SELECT"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "bucle FOR en torno a un cursor"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH en torno a un array"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "sentencia SQL"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "sentencia EXECUTE"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "bucle FOR en torno a una sentencia EXECUTE"
 
@@ -686,13 +732,13 @@ msgstr ""
 "nombres de columnas de tablas."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:463
+#: pl_scanner.c:467
 #, c-format
 msgid "%s at end of input"
 msgstr "%s al final de la entrada"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s en o cerca de «%s»"
diff --git a/src/pl/plpgsql/src/po/fr.po b/src/pl/plpgsql/src/po/fr.po
index 8336dd787b9ef..95fdc7a038076 100644
--- a/src/pl/plpgsql/src/po/fr.po
+++ b/src/pl/plpgsql/src/po/fr.po
@@ -10,725 +10,768 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-06-29 21:15+0000\n"
-"PO-Revision-Date: 2010-06-29 23:32+0100\n"
+"POT-Creation-Date: 2011-06-13 14:52+0000\n"
+"PO-Revision-Date: 2011-06-13 17:57+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pl_comp.c:422
-#: pl_handler.c:256
+#: pl_comp.c:427
+#: pl_handler.c:266
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "les fonctions PL/pgsql ne peuvent pas accepter le type %s"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "n'a pas pu déterminer le type de retour actuel pour la fonction\n"
 "polymorphique « %s »"
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions triggers peuvent seulement être appelées par des triggers"
 
-#: pl_comp.c:535
-#: pl_handler.c:241
+#: pl_comp.c:540
+#: pl_handler.c:251
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "les fonctions PL/pgsql ne peuvent pas renvoyer le type %s"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "les fonctions triggers ne peuvent pas avoir des arguments déclarés"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr ""
 "Les arguments du trigger peuvent être accédés via TG_NARGS et TG_ARGV à\n"
 "la place."
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilation de la fonction PL/pgsql « %s » près de la ligne %d"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "le nom du paramètre « %s » est utilisé plus d'une fois"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "la référence à la colonne « %s » est ambigu"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr ""
 "Cela pourrait faire référence à une variable PL/pgsql ou à la colonne d'une\n"
 "table."
 
-#: pl_comp.c:1690
+#: pl_comp.c:1227
+#: pl_comp.c:1255
+#: pl_exec.c:3862
+#: pl_exec.c:4208
+#: pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "l'enregistrement « %s » n'a pas de champs « %s »"
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "la relation « %s » n'existe pas"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "la relation « %s.%s » n'existe pas"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "la variable « %s » a le pseudo-type %s"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "la relation « %s » n'est pas une table"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "le type « %s » est seulement un shell"
 
-#: pl_comp.c:2087
-#: pl_comp.c:2140
+#: pl_comp.c:2190
+#: pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condition d'exception non reconnue « %s »"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr ""
 "n'a pas pu déterminer le type d'argument actuel pour la fonction\n"
 "polymorphique « %s »"
 
-#: pl_exec.c:236
-#: pl_exec.c:511
+#: pl_exec.c:239
+#: pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "durant l'initialisation de l'état de la fonction"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "lors du stockage des arguments dans les variables locales"
 
-#: pl_exec.c:298
-#: pl_exec.c:666
+#: pl_exec.c:301
+#: pl_exec.c:667
 msgid "during function entry"
 msgstr "durant l'entrée d'une fonction"
 
-#: pl_exec.c:329
-#: pl_exec.c:697
+#: pl_exec.c:332
+#: pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE ne peut pas être utilisé à l'extérieur d'une boucle"
 
-#: pl_exec.c:333
-#: pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr ""
-"RAISE sans paramètre ne peut pas être utilisé sans un gestionnaire\n"
-"d'exception"
-
-#: pl_exec.c:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "le contrôle a atteint la fin de la fonction sans RETURN"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr "lors de la conversion de la valeur de retour au type de retour de la fonction"
 
-#: pl_exec.c:357
-#: pl_exec.c:2409
+#: pl_exec.c:356
+#: pl_exec.c:2591
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "fonction renvoyant un ensemble appelée dans un contexte qui ne peut pas\n"
 "accepter un ensemble"
 
-#: pl_exec.c:395
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr ""
 "le type d'enregistrement renvoyé ne correspond pas au type d'enregistrement\n"
 "attendu"
 
-#: pl_exec.c:453
-#: pl_exec.c:709
+#: pl_exec.c:452
+#: pl_exec.c:706
 msgid "during function exit"
 msgstr "lors de la sortie de la fonction"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "le contrôle a atteint la fin de la procédure trigger sans RETURN"
 
-#: pl_exec.c:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "la procédure trigger ne peut pas renvoyer un ensemble"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr ""
 "la structure de ligne renvoyée ne correspond pas à la structure de la table\n"
 "du trigger"
 
-#: pl_exec.c:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "fonction PL/pgsql « %s », ligne %d, %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "fonction PL/pgsql « %s », %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:818
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "fonction PL/pgsql « %s », ligne %d à %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "fonction PL/pgsql « %s »"
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "lors de l'initialisation de variables locales du bloc d'instructions"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "la variable « %s » déclarée NOT NULL ne peut pas valoir NULL par défaut"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "lors de l'entrée dans le bloc d'instructions"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "lors de la sortie du bloc d'instructions"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "lors du nettoyage de l'exception"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "case introuvable"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "l'instruction CASE n'a pas la partie ELSE."
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "la limite inférieure de la boucle FOR ne peut pas être NULL"
 
-#: pl_exec.c:1725
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "la limite supérieure de la boucle FOR ne peut pas être NULL"
 
-#: pl_exec.c:1742
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "la valeur BY d'une boucle FOR ne peut pas être NULL"
 
-#: pl_exec.c:1748
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "la valeur BY d'une boucle FOR doit être plus grande que zéro"
 
-#: pl_exec.c:1920
-#: pl_exec.c:3191
+#: pl_exec.c:1933
+#: pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "curseur « %s » déjà en cours d'utilisation"
 
-#: pl_exec.c:1943
-#: pl_exec.c:3253
+#: pl_exec.c:1956
+#: pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "arguments donnés pour le curseur sans arguments"
 
-#: pl_exec.c:1962
-#: pl_exec.c:3272
+#: pl_exec.c:1975
+#: pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "arguments requis pour le curseur"
 
-#: pl_exec.c:2014
-#: pl_exec.c:4423
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "l'expression FOREACH ne doit pas être NULL"
+
+#: pl_exec.c:2069
 #, c-format
-msgid "cursor \"%s\" closed unexpectedly"
-msgstr "le curseur « %s » a été fermé de façon inattendu"
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "l'expression FOREACH doit renvoyer un tableau, pas un type %s"
 
-#: pl_exec.c:2193
-#: gram.y:2729
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "la dimension de la partie (%d) est en dehors des valeurs valides (0..%d)"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "la variable d'une boucle FOREACH ... SLICE doit être d'un type tableau"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "la valeur d'une boucle FOREACH ne doit pas être de type tableau"
+
+#: pl_exec.c:2375
+#: gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "ne peut pas utiliser RETURN NEXT dans une fonction non SETOF"
 
-#: pl_exec.c:2217
-#: pl_exec.c:2283
+#: pl_exec.c:2399
+#: pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "mauvais type de résultat fourni dans RETURN NEXT"
 
-#: pl_exec.c:2239
-#: pl_exec.c:3641
-#: pl_exec.c:3920
-#: pl_exec.c:3954
-#: pl_exec.c:4016
-#: pl_exec.c:4035
-#: pl_exec.c:4072
+#: pl_exec.c:2421
+#: pl_exec.c:3849
+#: pl_exec.c:4166
+#: pl_exec.c:4201
+#: pl_exec.c:4268
+#: pl_exec.c:4287
+#: pl_exec.c:4355
+#: pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "l'enregistrement « %s » n'est pas encore affectée"
 
-#: pl_exec.c:2241
-#: pl_exec.c:3643
-#: pl_exec.c:3922
-#: pl_exec.c:3956
-#: pl_exec.c:4018
-#: pl_exec.c:4037
-#: pl_exec.c:4074
+#: pl_exec.c:2423
+#: pl_exec.c:3851
+#: pl_exec.c:4168
+#: pl_exec.c:4203
+#: pl_exec.c:4270
+#: pl_exec.c:4289
+#: pl_exec.c:4357
+#: pl_exec.c:4380
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "La structure de ligne d'un enregistrement pas encore affecté est indéterminée."
 
-#: pl_exec.c:2245
-#: pl_exec.c:2264
+#: pl_exec.c:2427
+#: pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "mauvais type d'enregistrement fourni à RETURN NEXT"
 
-#: pl_exec.c:2306
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT doit avoir un paramètre"
 
-#: pl_exec.c:2337
-#: gram.y:2788
+#: pl_exec.c:2519
+#: gram.y:2903
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "ne peut pas utiliser RETURN QUERY dans une fonction non SETOF"
 
-#: pl_exec.c:2357
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr "la structure de la requête ne correspond pas au type de résultat de la fonction"
 
-#: pl_exec.c:2489
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr ""
+"RAISE sans paramètre ne peut pas être utilisé sans un gestionnaire\n"
+"d'exception"
+
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "trop peu de paramètres pour RAISE"
 
-#: pl_exec.c:2515
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "trop de paramètres pour RAISE"
 
-#: pl_exec.c:2535
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "l'option de l'instruction RAISE ne peut pas être NULL"
 
-#: pl_exec.c:2545
-#: pl_exec.c:2554
-#: pl_exec.c:2562
-#: pl_exec.c:2570
+#: pl_exec.c:2734
+#: pl_exec.c:2743
+#: pl_exec.c:2751
+#: pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "option RAISE déjà spécifiée : %s"
 
-#: pl_exec.c:2605
-#: pl_exec.c:2606
+#: pl_exec.c:2794
+#: pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2752
-#: pl_exec.c:3056
+#: pl_exec.c:2945
+#: pl_exec.c:3081
+#: pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "ne peut pas utiliser COPY TO/FROM dans PL/pgsql"
 
-#: pl_exec.c:2756
-#: pl_exec.c:3060
+#: pl_exec.c:2949
+#: pl_exec.c:3085
+#: pl_exec.c:3264
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "ne peut pas utiliser les instructions BEGIN/END de transactions dans PL/pgsql"
 
-#: pl_exec.c:2757
-#: pl_exec.c:3061
+#: pl_exec.c:2950
+#: pl_exec.c:3086
+#: pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Utiliser un bloc BEGIN dans une clause EXCEPTION à la place."
 
-#: pl_exec.c:2905
-#: pl_exec.c:3085
+#: pl_exec.c:3109
+#: pl_exec.c:3289
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO utilisé dans une commande qui ne peut pas envoyer de données"
 
-#: pl_exec.c:2925
-#: pl_exec.c:3105
+#: pl_exec.c:3129
+#: pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "la requête n'a renvoyé aucune ligne"
 
-#: pl_exec.c:2934
-#: pl_exec.c:3114
+#: pl_exec.c:3138
+#: pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "la requête a renvoyé plus d'une ligne"
 
-#: pl_exec.c:2948
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "la requête n'a pas de destination pour les données résultantes"
 
-#: pl_exec.c:2949
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Si vous voulez annuler les résultats d'un SELECT, utilisez PERFORM à la place."
 
-#: pl_exec.c:2982
-#: pl_exec.c:5573
+#: pl_exec.c:3186
+#: pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "l'argument de la requête de EXECUTE est NULL"
 
-#: pl_exec.c:3047
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE de SELECT ... INTO n'est pas implanté"
 
-#: pl_exec.c:3048
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "Vous pouvez aussi utiliser EXECUTE ... INTO à la place."
+#: pl_exec.c:3252
+msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
+msgstr "Vous pouvez aussi utiliser EXECUTE ... INTO ou EXECUTE CREATE TABLE ... AS à la place."
 
-#: pl_exec.c:3336
-#: pl_exec.c:3427
+#: pl_exec.c:3540
+#: pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "la variable du curseur « %s » est NULL"
 
-#: pl_exec.c:3343
-#: pl_exec.c:3434
+#: pl_exec.c:3547
+#: pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "le curseur « %s » n'existe pas"
 
-#: pl_exec.c:3357
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "la position relative ou absolue du curseur est NULL"
 
-#: pl_exec.c:3494
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr ""
 "une valeur NULL ne peut pas être affectée à la variable « %s » déclarée\n"
 "non NULL"
 
-#: pl_exec.c:3552
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr "ne peut pas affecter une valeur non composite à une variable de type ROW"
 
-#: pl_exec.c:3594
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr "ne peut pas affecter une valeur non composite à une variable RECORD"
 
-#: pl_exec.c:3654
-#: pl_exec.c:3961
-#: pl_exec.c:4042
-#: pl_exec.c:4079
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "l'enregistrement « %s » n'a pas de champs « %s »"
-
-#: pl_exec.c:3752
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "le nombre de dimensions du tableau (%d) dépasse la maximum autorisé (%d)"
 
-#: pl_exec.c:3766
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "l'objet souscrit n'est pas un tableau"
 
-#: pl_exec.c:3789
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "un indice de tableau dans une affectation ne peut pas être NULL"
 
-#: pl_exec.c:4170
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "la requête « %s » ne renvoie pas de données"
 
-#: pl_exec.c:4178
+#: pl_exec.c:4501
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "la requête « %s » a renvoyé %d colonne"
 msgstr[1] "la requête « %s » a renvoyé %d colonnes"
 
-#: pl_exec.c:4204
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "la requête « %s » a renvoyé plus d'une ligne"
 
-#: pl_exec.c:4262
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "la requête « %s » n'est pas un SELECT"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "le label du bloc doit être placé avant DECLARE, et non pas après"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "les collationnements ne sont pas supportés par le type %s"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "la variable ROW ou RECORD ne peut pas être CONSTANT"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "la variable ROW ou RECORD ne peut pas être NOT NULL"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr "la valeur par défaut de variable ROW ou RECORD n'est pas supportée"
 
-#: gram.y:606
-#: gram.y:632
+#: gram.y:631
+#: gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "la variable « %s » n'existe pas"
 
-#: gram.y:650
-#: gram.y:663
+#: gram.y:675
+#: gram.y:688
 msgid "duplicate declaration"
 msgstr "déclaration dupliquée"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "élément GET DIAGNOSTICS non reconnu"
 
-#: gram.y:852
-#: gram.y:2975
+#: gram.y:892
+#: gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "« %s » n'est pas une variable scalaire"
 
-#: gram.y:1114
-#: gram.y:1306
+#: gram.y:1154
+#: gram.y:1347
 msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
 msgstr ""
 "la variable d'une boucle sur des lignes doit être une variable de type\n"
 "RECORD ou ROW, ou encore une liste de variables scalaires"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "le curseur de la boucle FOR doit avoir seulement une variable cible"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "le curseur de la boucle FOR doit utiliser une variable curseur limité"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr "la boucle FOR de type entier doit avoir une seule variable cible"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "ne peut pas spécifier REVERSE dans la requête de la boucle FOR"
 
-#: gram.y:1420
-#: gram.y:1457
-#: gram.y:1505
-#: gram.y:2425
-#: gram.y:2506
-#: gram.y:2617
-#: gram.y:3249
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "la variable d'une boucle FOREACH doit être une variable connue ou une liste de variables"
+
+#: gram.y:1513
+#: gram.y:1550
+#: gram.y:1598
+#: gram.y:2540
+#: gram.y:2621
+#: gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "définition inattendue de la fin de fonction"
 
-#: gram.y:1525
-#: gram.y:1549
-#: gram.y:1561
-#: gram.y:1568
-#: gram.y:1652
-#: gram.y:1759
-#: gram.y:1936
-#: gram.y:2015
-#: gram.y:2128
-#: gram.y:2706
-#: gram.y:2770
-#: gram.y:3209
-#: gram.y:3230
+#: gram.y:1618
+#: gram.y:1642
+#: gram.y:1654
+#: gram.y:1661
+#: gram.y:1750
+#: gram.y:1758
+#: gram.y:1772
+#: gram.y:1867
+#: gram.y:2048
+#: gram.y:2127
+#: gram.y:2242
+#: gram.y:2821
+#: gram.y:2885
+#: gram.y:3325
+#: gram.y:3346
 msgid "syntax error"
 msgstr "erreur de syntaxe"
 
-#: gram.y:1553
-#: gram.y:1555
-#: gram.y:1940
-#: gram.y:1942
+#: gram.y:1646
+#: gram.y:1648
+#: gram.y:2052
+#: gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "code SQLSTATE invalide"
 
-#: gram.y:1706
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "erreur de syntaxe, « FOR » attendu"
 
-#: gram.y:1768
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "l'instruction FETCH ne peut pas renvoyer plusieurs lignes"
 
-#: gram.y:1824
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "la variable de curseur doit être une variable simple"
 
-#: gram.y:1830
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "la variable « %s » doit être de type cursor ou refcursor"
 
-#: gram.y:1994
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "le label n'existe pas"
 
-#: gram.y:2099
-#: gram.y:2110
+#: gram.y:2213
+#: gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "« %s » n'est pas une variable connue"
 
-#: gram.y:2212
-#: gram.y:2222
-#: gram.y:2350
+#: gram.y:2326
+#: gram.y:2336
+#: gram.y:2464
 msgid "mismatched parentheses"
 msgstr "parenthèses non correspondantes"
 
-#: gram.y:2226
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "« %s » manquant à la fin de l'expression SQL"
 
-#: gram.y:2232
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "« %s » manquant à la fin de l'instruction SQL"
 
-#: gram.y:2249
+#: gram.y:2363
 msgid "missing expression"
 msgstr "expression manquante"
 
-#: gram.y:2251
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "instruction SQL manquante"
 
-#: gram.y:2352
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "déclaration incomplète d'un type de données"
 
-#: gram.y:2374
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "déclaration manquante d'un type de données"
 
-#: gram.y:2430
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO spécifié plus d'une fois"
 
-#: gram.y:2598
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "attendait FROM ou IN"
 
-#: gram.y:2658
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant un ensemble"
 
-#: gram.y:2659
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Utilisez RETURN NEXT ou RETURN QUERY."
 
-#: gram.y:2667
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN ne peut pas avoir un paramètre dans une fonction avec des paramètres OUT"
 
-#: gram.y:2676
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant void"
 
-#: gram.y:2694
-#: gram.y:2701
+#: gram.y:2809
+#: gram.y:2816
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN ne peut pas indiquer une variable RECORD ou ROW dans une fonction\n"
 "renvoyant une ligne"
 
-#: gram.y:2743
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "RETURN NEXT ne peut pas avoir un paramètre dans une fonction avec des\n"
 "paramètres OUT"
 
-#: gram.y:2758
-#: gram.y:2765
+#: gram.y:2873
+#: gram.y:2880
 msgid "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN NEXT doit indiquer une variable RECORD ou ROW dans une fonction\n"
 "renvoyant une ligne"
 
-#: gram.y:2844
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "« %s » est déclaré CONSTANT"
 
-#: gram.y:2906
-#: gram.y:2918
+#: gram.y:3021
+#: gram.y:3033
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr ""
 "la variable de type RECORD ou ROW ne peut pas faire partie d'une liste INTO à\n"
 "plusieurs éléments"
 
-#: gram.y:2963
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "trop de variables INTO indiquées"
 
-#: gram.y:3170
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "label de fin « %s » spécifié pour un bloc sans label"
 
-#: gram.y:3177
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "label de fin « %s » différent du label « %s » du bloc"
 
-#: gram.y:3204
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "le curseur « %s » n'a pas d'arguments"
 
-#: gram.y:3218
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "le curseur « %s » a des arguments"
 
-#: gram.y:3266
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "option de l'instruction RAISE inconnue"
 
-#: gram.y:3270
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "erreur de syntaxe, « = » attendu"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "bloc d'instructions"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "affectation"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "variable entière de boucle FOR"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "FOR sur des lignes de SELECT"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "FOR sur un curseur"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH sur un tableau"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "instruction SQL"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "instruction EXECUTE"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "FOR sur une instruction EXECUTE"
 
@@ -737,92 +780,123 @@ msgid "Sets handling of conflicts between PL/pgSQL variable names and table colu
 msgstr "Configure la gestion des conflits entre les noms de variables PL/pgsql et les noms des colonnes des tables."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:463
+#: pl_scanner.c:467
 #, c-format
 msgid "%s at end of input"
 msgstr "%s à la fin de l'entrée"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s sur ou près de « %s »"
 
+#~ msgid "cursor \"%s\" closed unexpectedly"
+#~ msgstr "le curseur « %s » a été fermé de façon inattendu"
+
 #~ msgid "row \"%s\" has no field \"%s\""
 #~ msgstr "la ligne « %s » n'a aucun champ « %s »"
+
 #~ msgid "row \"%s.%s\" has no field \"%s\""
 #~ msgstr "la ligne « %s.%s » n'a aucun champ « %s »"
+
 #~ msgid "expected \"[\""
 #~ msgstr "« [ » attendu"
+
 #~ msgid "type of \"%s\" does not match that when preparing the plan"
 #~ msgstr ""
 #~ "le type de « %s » ne correspond pas à ce qui est préparé dans le plan"
+
 #~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
 #~ msgstr ""
 #~ "le type de « %s.%s » ne correspond pas à ce qui est préparé dans le plan"
+
 #~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
 #~ msgstr ""
 #~ "le type de tg_argv[%d] ne correspond pas à ce qui est préparé dans le plan"
+
 #~ msgid "N/A (dropped column)"
 #~ msgstr "N/A (colonne supprimée)"
+
 #~ msgid ""
 #~ "Number of returned columns (%d) does not match expected column count (%d)."
 #~ msgstr ""
 #~ "Le nombre de colonnes renvoyées (%d) ne correspond pas au nombre de "
 #~ "colonnes\n"
 #~ "attendues (%d)."
+
 #~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
 #~ msgstr ""
-#~ "Le type %s renvoyé ne correspond pas au type %s attendu dans la colonne « %"
-#~ "s »."
+#~ "Le type %s renvoyé ne correspond pas au type %s attendu dans la colonne « "
+#~ "%s »."
+
 #~ msgid "only positional parameters can be aliased"
 #~ msgstr "seuls les paramètres de position peuvent avoir un alias"
+
 #~ msgid "function has no parameter \"%s\""
 #~ msgstr "la fonction n'a pas de paramètre « %s »"
+
 #~ msgid "expected an integer variable"
 #~ msgstr "attend une variable entière"
+
 #~ msgid "syntax error at \"%s\""
 #~ msgstr "erreur de syntaxe à « %s »"
+
 #~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
 #~ msgstr ""
 #~ "Attendait « FOR » pour ouvrir un curseur pour une variable sans limite."
+
 #~ msgid "expected a cursor or refcursor variable"
 #~ msgstr "attendait une variable de type cursor ou refcursor"
+
 #~ msgid "too many variables specified in SQL statement"
 #~ msgstr "trop de variables spécifiées dans l'instruction SQL"
+
 #~ msgid ""
 #~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
 #~ "or RETURN QUERY"
 #~ msgstr ""
 #~ "RETURN ne peut pas avoir un paramètre dans une fonction renvoyant des\n"
 #~ "lignes ; utilisez RETURN NEXT ou RETURN QUERY"
+
 #~ msgid "cannot assign to tg_argv"
 #~ msgstr "ne peut pas affecter à tg_argv"
+
 #~ msgid ""
 #~ "Expected record variable, row variable, or list of scalar variables "
 #~ "following INTO."
 #~ msgstr ""
 #~ "Attendait une variable RECORD, ROW ou une liste de variables scalaires\n"
 #~ "suivant INTO."
+
 #~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-#~ msgstr "instruction SQL dans la fonction PL/pgsql « %s » près de la ligne %d"
+#~ msgstr ""
+#~ "instruction SQL dans la fonction PL/pgsql « %s » près de la ligne %d"
+
 #~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
 #~ msgstr ""
 #~ "chaîne littérale dans la fonction PL/pgsql « %s » près de la ligne %d"
+
 #~ msgid "expected \")\""
 #~ msgstr "« ) » attendu"
+
 #~ msgid "variable \"%s\" does not exist in the current block"
 #~ msgstr "la variable « %s » n'existe pas dans le bloc actuel"
+
 #~ msgid "unterminated \" in identifier: %s"
 #~ msgstr "\" non terminé dans l'identifiant : %s"
+
 #~ msgid "qualified identifier cannot be used here: %s"
 #~ msgstr "l'identifiant qualifié ne peut pas être utilisé ici : %s"
+
 #~ msgid "unterminated quoted identifier"
 #~ msgstr "identifiant entre guillemets non terminé"
+
 #~ msgid "unterminated /* comment"
 #~ msgstr "commentaire /* non terminé"
+
 #~ msgid "unterminated quoted string"
 #~ msgstr "chaîne entre guillemets non terminée"
+
 #~ msgid "unterminated dollar-quoted string"
 #~ msgstr "chaîne entre dollars non terminée"
-
diff --git a/src/pl/plpgsql/src/po/ja.po b/src/pl/plpgsql/src/po/ja.po
index d622bffd4ee22..72f146ce40110 100644
--- a/src/pl/plpgsql/src/po/ja.po
+++ b/src/pl/plpgsql/src/po/ja.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9.0 beta 3\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-20 12:57+0900\n"
-"PO-Revision-Date: 2010-07-21 18:46+0900\n"
+"POT-Creation-Date: 2011-06-15 16:28+0900\n"
+"PO-Revision-Date: 2011-08-30 21:37+0900\n"
 "Last-Translator: HOTTA Michihde <hotta@net-newbie.com>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
@@ -13,31 +13,31 @@ msgstr ""
 "X-Poedit-Country: JAPAN\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pl_comp.c:422 pl_handler.c:256
+#: pl_comp.c:427 pl_handler.c:266
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "PL/pgSQL 関数�� %s 型�指定����ん"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "関数 \"%s\" �多様�形を�����実際�戻り値�型を特定����ん���"
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数�トリガー�����コール����"
 
-#: pl_comp.c:535 pl_handler.c:241
+#: pl_comp.c:540 pl_handler.c:251
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "PL/pgSQL 関数� %s 型を返���ん"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "トリガー関数��引数を宣言����ん"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
@@ -45,398 +45,433 @@ msgstr ""
 "��代�り�トリガー�引数�� TG_NARGS � TG_ARGV を通����アクセス���"
 "�"
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "PL/pgSQL 関数 \"%s\" � %d 行目付近��コンパイル"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "パラメータ \"%s\" �複数指定�れ���"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "列�照\"%s\"�曖昧��"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr ""
 "PL/pgSQL変数も���テーブル�カラム���れ�を�照�����能性��り��"
 
-#: pl_comp.c:1690
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "レコード \"%s\" ��列 \"%s\" ��り��ん"
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "リレーション \"%s\" ��り��ん"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "リレーション \"%s.%s\" ��り��ん"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "変数 \"%s\" �型�擬似タイプ %s ��"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "リレーション \"%s\" �テーブル���り��ん"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "型  \"%s\" �シェル���使���"
 
-#: pl_comp.c:2087 pl_comp.c:2140
+#: pl_comp.c:2190 pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "例外�件 \"%s\" ��識����ん"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "関数 \"%s\" �多様�形を�����実際�引数�型を特定����ん���"
 
-#: pl_exec.c:236 pl_exec.c:511
+#: pl_exec.c:239 pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "実行状態��期化中�"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "引数をローカル変数�格��る際�"
 
-#: pl_exec.c:298 pl_exec.c:666
+#: pl_exec.c:301 pl_exec.c:667
 msgid "during function entry"
 msgstr "関数登録�際�"
 
-#: pl_exec.c:329 pl_exec.c:697
+#: pl_exec.c:332 pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE �ループ�外��使���ん"
 
-#: pl_exec.c:333 pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr "引数�無� RAISE ��例外�ンドラ�外��使���ん"
-
-#: pl_exec.c:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "RETURN ��れる���制御�関数�終�り������"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr "戻り値を関数�戻り値�型�キャスト�る際�"
 
-#: pl_exec.c:357 pl_exec.c:2400
+#: pl_exec.c:356 pl_exec.c:2591
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "値�セットを��付���よ��文脈��セット値を返�関数�呼�れ���"
 
-#: pl_exec.c:395
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr "戻りレコード�型�期待�るレコード�型�一致���ん"
 
-#: pl_exec.c:453 pl_exec.c:709
+#: pl_exec.c:452 pl_exec.c:706
 msgid "during function exit"
 msgstr "関数を抜�る際�"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "RETURN ��れる���制御�トリガー手続��終�り������"
 
-#: pl_exec.c:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "トリガー手続��セットを返��������ん"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr "返�れ�行�構造��トリガー���るテーブル�構造�マッ����ん"
 
-#: pl_exec.c:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "PL/pgSQL 関数 \"%s\" � %d 行目� %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "PL/pgSQL 関数 \"%s\" � %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:818
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "PL/pgSQL 関数 \"%s\" � %d 行目�型 %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "PL/pgSQL 関数 \"%s\""
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "ステートメントブロック�ローカル変数を�期化�る際�"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr ""
 "変数 \"%s\" � NOT NULL ���宣言�れ��る����期値を NULL ��る���"
 "����ん"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "ステートメントブロックを登録�る際�"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "ステートメントブロックを抜�る際�"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "例外をクリーンアップ�る際�"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "case �見��り��ん"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "CASE ステートメント� ELSE 部分��り��ん"
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "FOR ループ�下�を NULL ��る�������ん"
 
-#: pl_exec.c:1725
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "FOR ループ�上�を NULL ��る�������ん"
 
-#: pl_exec.c:1742
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "FOR ループ���る BY �値を NULL ��る�������ん"
 
-#: pl_exec.c:1748
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "FOR ループ���る BY �値�ゼロより大����れ��り��ん"
 
-#: pl_exec.c:1920 pl_exec.c:3182
+#: pl_exec.c:1933 pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "カーソル \"%s\" ����使�れ����"
 
-#: pl_exec.c:1943 pl_exec.c:3244
+#: pl_exec.c:1956 pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "引数���カーソル�引数�与�られ���"
 
-#: pl_exec.c:1962 pl_exec.c:3263
+#: pl_exec.c:1975 pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "カーソル��引数�必���"
 
-#: pl_exec.c:2184 gram.y:2729
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "FOREACH��NULL������ん"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "FOREACH��%s型�����列を生����れ��り��ん"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "範囲次元%d�有効範囲0�ら%d���間��り��ん"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "FOREACH ... SLICEループ変数��列型���れ��り��ん"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "FOREACHループ変数��列型������ん"
+
+#: pl_exec.c:2375 gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "SETOF ���関数�� RETURN NEXT �使���ん"
 
-#: pl_exec.c:2208 pl_exec.c:2274
+#: pl_exec.c:2399 pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "RETURN NEXT ����誤��戻り値�型�指定�れ����"
 
-#: pl_exec.c:2230 pl_exec.c:3632 pl_exec.c:3911 pl_exec.c:3945 pl_exec.c:4007
-#: pl_exec.c:4026 pl_exec.c:4063
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "レコード \"%s\" �����値�代入�れ����ん"
 
-#: pl_exec.c:2232 pl_exec.c:3634 pl_exec.c:3913 pl_exec.c:3947 pl_exec.c:4009
-#: pl_exec.c:4028 pl_exec.c:4065
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "��代入�れ����レコード�タプル構造��定��"
 
-#: pl_exec.c:2236 pl_exec.c:2255
+#: pl_exec.c:2427 pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "RETURN NEXT �����誤��レコード型�指定�れ����"
 
-#: pl_exec.c:2297
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT ��パラメーター�必���"
 
-#: pl_exec.c:2328 gram.y:2788
+#: pl_exec.c:2519 gram.y:2903
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "SETOF ���関数�� RETURN QUERY �使���ん"
 
-#: pl_exec.c:2348
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr "クエリー�構造�関数�戻り値�型�一致���ん"
 
-#: pl_exec.c:2480
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "引数�無� RAISE ��例外�ンドラ�外��使���ん"
+
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "RAISE �指定�れ�パラメーター�数�足り��ん"
 
-#: pl_exec.c:2506
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "RAISE �指定�れ�パラメーター�数�多����"
 
-#: pl_exec.c:2526
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "RAISE ステートメント�オプション�� NULL �指定����ん"
 
-#: pl_exec.c:2536 pl_exec.c:2545 pl_exec.c:2553 pl_exec.c:2561
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "RAISE オプション�既�指定�れ����: %s"
 
-#: pl_exec.c:2596 pl_exec.c:2597
+#: pl_exec.c:2794 pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2743 pl_exec.c:3047
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "PL/pgSQL 内�� COPY to/from �使���ん"
 
-#: pl_exec.c:2747 pl_exec.c:3051
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "PL/pgSQL 内��トランザクションを開始�終了����ん"
 
-#: pl_exec.c:2748 pl_exec.c:3052
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "代�り� EXCEPTION �を伴� BEGIN ブロックを使用������"
 
-#: pl_exec.c:2896 pl_exec.c:3076
+#: pl_exec.c:3109 pl_exec.c:3289
 msgid "INTO used with a command that cannot return data"
 msgstr "データを返���命令� INTO �使�れ���"
 
-#: pl_exec.c:2916 pl_exec.c:3096
+#: pl_exec.c:3129 pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "クエリー�行を返���ん���"
 
-#: pl_exec.c:2925 pl_exec.c:3105
+#: pl_exec.c:3138 pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "クエリー�複数�行を返����"
 
-#: pl_exec.c:2939
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "クエリー��果データ�返�先�指定�れ����ん"
 
-#: pl_exec.c:2940
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "SELECT ��果を破棄���場���代�り� PERFORM を使������"
 
-#: pl_exec.c:2973 pl_exec.c:5547
+#: pl_exec.c:3186 pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "EXECUTE �クエリー文字列�引数� NULL ��"
 
-#: pl_exec.c:3038
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "SELECT ... INTO � EXECUTE �実装�れ����ん"
 
-#: pl_exec.c:3039
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "代�り� EXECUTE ... INTO を使������"
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr "代�り�EXECUTE ... INTO���EXECUTE CREATE TABLE ... ASを使用�る方�よ��も�れ��ん。"
 
-#: pl_exec.c:3327 pl_exec.c:3418
+#: pl_exec.c:3540 pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "カーソル変数 \"%s\" � NULL ��"
 
-#: pl_exec.c:3334 pl_exec.c:3425
+#: pl_exec.c:3547 pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "カーソル \"%s\" �存在���ん"
 
-#: pl_exec.c:3348
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "相対も���絶対カーソル�置� NULL ��"
 
-#: pl_exec.c:3485
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "NOT NULL ���宣言�れ�変数 \"%s\" �� NULL を代入����ん"
 
-#: pl_exec.c:3543
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr "複�値���値を行変数�代入����ん"
 
-#: pl_exec.c:3585
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr "複�値���値をレコード変数�代入����ん"
 
-#: pl_exec.c:3645 pl_exec.c:3952 pl_exec.c:4033 pl_exec.c:4070
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "レコード \"%s\" ��列 \"%s\" ��り��ん"
-
-#: pl_exec.c:3743
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "�列�次元数(%d)�指定�能�最大値(%d)を超�����"
 
-#: pl_exec.c:3757
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "添字��オブジェクト��列���り��ん"
 
-#: pl_exec.c:3780
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "代入���る�列�添字� NULL ������り��ん"
 
-#: pl_exec.c:4161
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "クエリー \"%s\" �データを返���ん���"
 
-#: pl_exec.c:4169
+#: pl_exec.c:4501
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "クエリー \"%s\" � %d 個�列を返����"
 msgstr[1] "クエリー \"%s\" � %d 個�列を返����"
 
-#: pl_exec.c:4195
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "クエリー \"%s\" �複数�行を返����"
 
-#: pl_exec.c:4253
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "クエリー \"%s\" � SELECT ���り��ん"
 
-#: pl_gram.c:1091
+#: pl_gram.c:1137
 msgid "syntax error: cannot back up"
 msgstr "構文エラー: �ックアップ����ん"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "ブロックラベル� DECLARE �後������置���れ��り��ん"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "%s型��照�順��サ�ート�れ��ん"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
-msgstr "行���レコード変数を CONSTRAINT ������ん"
+msgstr "行���レコード変数を CONSTANT ������ん"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "行���レコード変数を NOT NULL ������ん"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr "行���レコード変数�デフォルト値指定�サ�ート�れ����ん"
 
-#: gram.y:606 gram.y:632
+#: gram.y:631 gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "変数\"%s\"�存在���ん"
 
-#: gram.y:650 gram.y:663
+#: gram.y:675 gram.y:688
 msgid "duplicate declaration"
 msgstr "�複��宣言��。"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "GET DIAGNOSTICS 項目��識����ん"
 
-#: gram.y:852 gram.y:2975
+#: gram.y:892 gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" �スカラー変数���り��ん"
 
-#: gram.y:1114 gram.y:1306
+#: gram.y:1154 gram.y:1347
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
@@ -444,216 +479,224 @@ msgstr ""
 "行を���るループ���るループ変数��レコード�行変数�スカラー変数並��"
 "��れ����れ��り��ん"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "カーソルを使�� FOR ループ���ターゲット変数�１個��必���"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr ""
 "カーソルを使�� FOR ループ����れ�関連付�られ�カーソル変数を使用���"
 "れ��り��ん"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr "整数を使�� FOR ループ���ターゲット変数�１個��必���"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "クエリーを使�� FOR ループ�中�� REVERSE �指定����ん"
 
-#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
-#: gram.y:3249
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "FOREACH�ループ変数�既知�変数���変数�リスト���れ��り��ん"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "予期���関数定義�終端������"
 
-#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
-#: gram.y:1936 gram.y:2015 pl_gram.c:3644 gram.y:2128 gram.y:2706 gram.y:2770
-#: gram.y:3209 gram.y:3230
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 pl_gram.c:3810 gram.y:2242
+#: gram.y:2821 gram.y:2885 gram.y:3325 gram.y:3346
 msgid "syntax error"
 msgstr "構文エラー"
 
-#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "無効� SQLSTATE コード��"
 
-#: gram.y:1706
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "構文エラー。\"FOR\" を期待������"
 
-#: gram.y:1768
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "FETCH ステートメント�複数行を返���ん"
 
-#: gram.y:1824
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "カーソル変数��純変数���れ��り��ん"
 
-#: gram.y:1830
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "変数 \"%s\" � cursor 型��� refcursor 型���れ��り��ん"
 
-#: gram.y:1994
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "ラベル�存在���ん"
 
-#: pl_gram.c:3640
+#: pl_gram.c:3806
 msgid "syntax error; also virtual memory exhausted"
 msgstr "構文エラー: 仮想メモリも枯渇����"
 
-#: pl_gram.c:3760
+#: pl_gram.c:3926
 msgid "parser stack overflow"
 msgstr "パーサ�スタック�オー�ーフロー����"
 
-#: gram.y:2099 gram.y:2110
+#: gram.y:2213 gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\"�既知�変数���り��ん"
 
-#: gram.y:2212 gram.y:2222 gram.y:2350
+#: gram.y:2326 gram.y:2336 gram.y:2464
 msgid "mismatched parentheses"
 msgstr "カッコ�対応�����ん"
 
-#: gram.y:2226
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "SQL 表���終端� \"%s\" ��り��ん"
 
-#: gram.y:2232
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "SQL ステートメント�終端� \"%s\" ��り��ん"
 
-#: gram.y:2249
+#: gram.y:2363
 msgid "missing expression"
 msgstr "表����り��ん"
 
-#: gram.y:2251
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "SQLステートメント��り��ん"
 
-#: gram.y:2352
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "データ型�定義��完全��"
 
-#: gram.y:2374
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "データ型�定義��り��ん"
 
-#: gram.y:2430
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO �複数回指定�れ����"
 
-#: gram.y:2598
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "FROM も��� IN を期待������"
 
-#: gram.y:2658
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "値�セットを返�関数���RETURN�パラメータを指定����ん"
 
-#: gram.y:2659
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "RETURN NEXT も��� RETURN QUERY を使用������"
 
-#: gram.y:2667
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "OUT パラメータ���関数���RETURN ��パラメータを指定����ん"
 
-#: gram.y:2676
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "void を返�関数���RETURN ��パラメータを指定����ん"
 
-#: gram.y:2694 gram.y:2701
+#: gram.y:2809 gram.y:2816
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "行を返�関数���RETURN �レコード���行変数を指定���れ��り��ん"
 
-#: gram.y:2743
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr ""
 "OUT パラメータ���関数���RETURN NEXT ��パラメータを指定����ん"
 
-#: gram.y:2758 gram.y:2765
+#: gram.y:2873 gram.y:2880
 msgid ""
 "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "行を返�関数���RETURN NEXT �レコード���行変数を指定���れ��り��"
 "ã‚“"
 
-#: gram.y:2844
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" � CONSTANT ���宣言�れ����"
 
-#: gram.y:2906 gram.y:2918
+#: gram.y:3021 gram.y:3033
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr ""
 "レコードも���行変数��複数項目を�� INTO リスト�一部分����指定��"
 "��ん"
 
-#: gram.y:2963
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "INTO 変数�指定�多����"
 
-#: gram.y:3170
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "ラベル無�ブロック�終端ラベル \"%s\" �指定�れ���"
 
-#: gram.y:3177
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "終端ラベル \"%s\" �ブロック�ラベル \"%s\" �異�り��"
 
-#: gram.y:3204
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "カーソル \"%s\" �引数��り��ん"
 
-#: gram.y:3218
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "カーソル \"%s\" �引数�������"
 
-#: gram.y:3266
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "RAISE ステートメント�オプションを�識����ん"
 
-#: gram.y:3270
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "構文エラー。\"=\" を期待������"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "ステートメントブロック"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "代入"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "整数�ループ変数を伴� FOR"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "SELECT 行を制御�る FOR"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "カーソルを制御�る FOR"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "�列全体�対�るFOREACH"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "SQL ステートメント"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "EXECUTE ステートメント"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "EXECUTE ステートメントを制御�る FOR"
 
@@ -664,13 +707,13 @@ msgid ""
 msgstr "PL/pgSQL変数��テーブル�カラム��間���処�を設定������"
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:463
+#: pl_scanner.c:467
 #, c-format
 msgid "%s at end of input"
 msgstr "入力�最後� %s"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "\"%2$s\" も�����近辺� %1$s"
diff --git a/src/pl/plpgsql/src/po/pl.po b/src/pl/plpgsql/src/po/pl.po
new file mode 100644
index 0000000000000..61afe1138d43c
--- /dev/null
+++ b/src/pl/plpgsql/src/po/pl.po
@@ -0,0 +1,741 @@
+# plpgsql message translation file for plpgsql
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: plpgsql (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:53+0000\n"
+"PO-Revision-Date: 2011-09-30 09:49-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Polish TotroiseSvn translation team\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pl_comp.c:427 pl_handler.c:266
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "funkcje PL/pgSQL nie obsługują typu %s"
+
+#: pl_comp.c:506
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "nie można określić, jaki typ zwraca funkcja polimorficzna \"%s\""
+
+#: pl_comp.c:536
+msgid "trigger functions can only be called as triggers"
+msgstr "procedury wyzwalaczy mogą być wywoływane jedynie przez wyzwalacze"
+
+#: pl_comp.c:540 pl_handler.c:251
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "funkcje PL/pgSQL nie mogą zwracać wartości typu %s"
+
+#: pl_comp.c:583
+msgid "trigger functions cannot have declared arguments"
+msgstr "funkcje wyzwalaczy nie mogą przyjmować żadnych argumentów"
+
+#: pl_comp.c:584
+msgid ""
+"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
+"instead."
+msgstr ""
+"Argumenty dla procedury wyzwalacza sÄ… umieszczane w zmiennych TG_NARGS oraz "
+"TG_ARGV."
+
+#: pl_comp.c:912
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "kompilacja funkcji PL/pgSQL \"%s\", w okolicach linii %d"
+
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "nazwa argumentu \"%s\" użyta więcej niż raz"
+
+#: pl_comp.c:1045
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "nazwa kolumny \"%s\" jest niejednoznaczna"
+
+#: pl_comp.c:1047
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr "Nazwa może odnosić się do zmiennej PL/pgSQL albo kolumny tabeli."
+
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "rekord \"%s\" nie posiada pola \"%s\""
+
+#: pl_comp.c:1782
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "relacja \"%s\" nie istnieje"
+
+#: pl_comp.c:1814
+#, c-format
+msgid "relation \"%s.%s\" does not exist"
+msgstr "relacja \"%s.%s\" nie istnieje"
+
+#: pl_comp.c:1896
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "zmienna \"%s\" jest psuedo-typu %s"
+
+#: pl_comp.c:1957
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "relacja \"%s\" nie jest tabelÄ…"
+
+#: pl_comp.c:2117
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "typ \"%s\" jest jedynie powłoką"
+
+#: pl_comp.c:2190 pl_comp.c:2243
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "nieznany warunek wyjÄ…tku \"%s\""
+
+#: pl_comp.c:2401
+#, c-format
+msgid ""
+"could not determine actual argument type for polymorphic function \"%s\""
+msgstr "nie można określić typu argumentu dla funkcji polimorficznej \"%s\""
+
+#: pl_exec.c:239 pl_exec.c:510
+msgid "during initialization of execution state"
+msgstr "podczas inicjacji stanu wykonywania"
+
+#: pl_exec.c:246
+msgid "while storing call arguments into local variables"
+msgstr "podczas przepisywania argumentów wywołania do lokalnych zmiennych"
+
+#: pl_exec.c:301 pl_exec.c:667
+msgid "during function entry"
+msgstr "podczas wchodzenia do funkcji"
+
+#: pl_exec.c:332 pl_exec.c:698
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "instrukcja CONTINUE nie może być użyta poza pętlą"
+
+#: pl_exec.c:336
+msgid "control reached end of function without RETURN"
+msgstr "osiągnięto koniec funkcji, brakuje instrukcji RETURN"
+
+#: pl_exec.c:343
+msgid "while casting return value to function's return type"
+msgstr "podczas rzutowania zwracanej wartości na typ wyniku funkcji"
+
+#: pl_exec.c:356 pl_exec.c:2591
+msgid "set-valued function called in context that cannot accept a set"
+msgstr ""
+"funkcja zwracająca zbiór rekordów wywołana w kontekście, w którym nie jest "
+"to dopuszczalne"
+
+#: pl_exec.c:394
+msgid "returned record type does not match expected record type"
+msgstr "został zwrócony rekord o niewłaściwym typie"
+
+#: pl_exec.c:452 pl_exec.c:706
+msgid "during function exit"
+msgstr "podczas wyjścia z funkcji"
+
+#: pl_exec.c:702
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "osiągnięto koniec funkcji wyzwalacza, brakuje instrukcji RETURN"
+
+#: pl_exec.c:711
+msgid "trigger procedure cannot return a set"
+msgstr "procedura wyzwalacza nie może zwracać zbioru rekordów"
+
+#: pl_exec.c:733
+msgid ""
+"returned row structure does not match the structure of the triggering table"
+msgstr ""
+"struktura zwróconego rekordu nie odpowiada strukturze tabeli dla której "
+"wywołano wyzwalacz"
+
+#: pl_exec.c:796
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "funkcja PL/pgSQL \"%s\", wiersz %d %s"
+
+#: pl_exec.c:807
+#, c-format
+msgid "PL/pgSQL function \"%s\" %s"
+msgstr "funkcja PL/pgSQL \"%s\" %s"
+
+#. translator: last %s is a plpgsql statement type name
+#: pl_exec.c:815
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "funkcja PL/pgSQL \"%s\", wiersz %d w %s"
+
+#: pl_exec.c:821
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "funkcja PL/pgSQL \"%s\""
+
+#: pl_exec.c:929
+msgid "during statement block local variable initialization"
+msgstr "podczas inicjacji zmiennych lokalnych bloku instrukcji"
+
+#: pl_exec.c:971
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr ""
+"zmienna \"%s\" zadeklarowana jako NOT NULL nie może mieć wartości domyślnej "
+"NULL"
+
+#: pl_exec.c:1021
+msgid "during statement block entry"
+msgstr "podczas wchodzenia do bloku instrukcji"
+
+#: pl_exec.c:1042
+msgid "during statement block exit"
+msgstr "podczas opuszczania bloku instrukcji"
+
+#: pl_exec.c:1085
+msgid "during exception cleanup"
+msgstr "podczas kończenia obsługi wyjątków"
+
+#: pl_exec.c:1570
+msgid "case not found"
+msgstr "etykieta instrukcji wyboru nie znaleziona"
+
+#: pl_exec.c:1571
+msgid "CASE statement is missing ELSE part."
+msgstr "w wyrażeniu CASE brakuje części ELSE."
+
+#: pl_exec.c:1725
+msgid "lower bound of FOR loop cannot be null"
+msgstr "początkowa wartość dla pętli FOR nie może być NULL"
+
+#: pl_exec.c:1740
+msgid "upper bound of FOR loop cannot be null"
+msgstr "końcowa wartość dla pętli FOR nie może być NULL"
+
+#: pl_exec.c:1757
+msgid "BY value of FOR loop cannot be null"
+msgstr "wartość wyrażenia BY w pętli FOR nie może być NULL"
+
+#: pl_exec.c:1763
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "wartość wyrażenia BY w pętli FOR musi być większa od zera"
+
+#: pl_exec.c:1933 pl_exec.c:3395
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "kursor \"%s\" jest już używany"
+
+#: pl_exec.c:1956 pl_exec.c:3457
+msgid "arguments given for cursor without arguments"
+msgstr "podano argumenty dla kursora nie przyjmującego żadnych argumentów"
+
+#: pl_exec.c:1975 pl_exec.c:3476
+msgid "arguments required for cursor"
+msgstr "parametry wymagane dla kursora"
+
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "wyrażenie w instrukcji FOREACH nie może być NULL"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "typem wyrażenie w instrukcji FOREACH musi być tablica, nie %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "wymiar wycinka tablicy (%d) przekracza dopuszczalny zakres 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "zmienna użyta w pętli FOREACH ... SLICE musi być typu tablicowego"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "zmienna użyta w pętli FOREACH nie może być typu tablicowego"
+
+#: pl_exec.c:2375 gram.y:2844
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr ""
+"instrukcja RETURN NEXT nie może zostać użyta w funkcjach nie zwracających "
+"zbioru rekordów"
+
+#: pl_exec.c:2399 pl_exec.c:2465
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "niewłaściwy typ wyniku w instrukcji RETURN NEXT"
+
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "struktura rekordu \"%s\" nie jest jeszcze znana"
+
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr ""
+"Struktura jest nieokreślona dla niezainicjowanego rekordu abstrakcyjnego."
+
+#: pl_exec.c:2427 pl_exec.c:2446
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "błędny typ rekordu w instrukcji RETURN NEXT"
+
+#: pl_exec.c:2488
+msgid "RETURN NEXT must have a parameter"
+msgstr "po RETURN NEXT musi pojawić się parametr"
+
+#: pl_exec.c:2519 gram.y:2903
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr ""
+"nie można używać instrukcji RETURN QUERY w funkcjach nie zwracających zbioru "
+"rekordów"
+
+#: pl_exec.c:2539
+msgid "structure of query does not match function result type"
+msgstr ""
+"typ rekordu zwracany przez zapytanie nie odpowiada typowi zwracanemu przez "
+"funkcjÄ™"
+
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "RAISE bez argumentów jest dopuszczalne tylko w bloku obsługi wyjątków"
+
+#: pl_exec.c:2678
+msgid "too few parameters specified for RAISE"
+msgstr "za mało argumentów dla instrukcji RAISE"
+
+#: pl_exec.c:2704
+msgid "too many parameters specified for RAISE"
+msgstr "za dużo argumentów dla instrukcji RAISE"
+
+#: pl_exec.c:2724
+msgid "RAISE statement option cannot be null"
+msgstr "argument dla wyrażenia RAISE nie może być NULL"
+
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "argument dla instrukcji RAISE został już podany: %s"
+
+#: pl_exec.c:2795
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "instrukcja COPY nie jest obsługiwana w PL/pgSQL"
+
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "nie można rozpocząć ani zakończyć transakcji w PL/pgSQL"
+
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "Zamiast tego użyj bloku BEGIN wraz z klauzulą EXCEPTION."
+
+#: pl_exec.c:3109 pl_exec.c:3289
+msgid "INTO used with a command that cannot return data"
+msgstr "INTO zostało użyte z zapytaniem, które nie zwraca danych"
+
+#: pl_exec.c:3129 pl_exec.c:3309
+msgid "query returned no rows"
+msgstr "zapytanie nie zwróciło żadnych wierszy"
+
+#: pl_exec.c:3138 pl_exec.c:3318
+msgid "query returned more than one row"
+msgstr "zapytanie zwróciło więcej niż jeden wiersz"
+
+#: pl_exec.c:3152
+msgid "query has no destination for result data"
+msgstr "nie wskazano gdzie mają zostać zapisane wyniki zapytania"
+
+#: pl_exec.c:3153
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr ""
+"Jeśli wyniki zapytania nie są istotne, używaj instrukcji PERFOM zamiast "
+"SELECT."
+
+#: pl_exec.c:3186 pl_exec.c:5929
+msgid "query string argument of EXECUTE is null"
+msgstr "treść zapytania dla instrukcji EXECUTE ma wartość NULL"
+
+#: pl_exec.c:3251
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "użycie SELECT ... INTO w instrukcji EXECUTE nie jest obsługiwane"
+
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr ""
+"Zamiast tego możesz użyć EXECUTE ... INTO lub EXECUTE CREATE TABLE ... AS."
+
+#: pl_exec.c:3540 pl_exec.c:3631
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "zmienna kursorowa \"%s\" ma wartość NULL"
+
+#: pl_exec.c:3547 pl_exec.c:3638
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "kursor \"%s\" nie istnieje"
+
+#: pl_exec.c:3561
+msgid "relative or absolute cursor position is null"
+msgstr "względna lub bezwzględna pozycja kursora o wartości NULL"
+
+#: pl_exec.c:3702
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr ""
+"zmienna \"%s\" została zadeklarowana jako NOT NULL, nie można przypisać "
+"wartości NULL"
+
+#: pl_exec.c:3760
+msgid "cannot assign non-composite value to a row variable"
+msgstr "nie można przypisać wartości skalarnej do zmiennej rekordowej"
+
+#: pl_exec.c:3802
+msgid "cannot assign non-composite value to a record variable"
+msgstr "nie można przypisać wartości skalarnej do zmiennej rekordowej"
+
+#: pl_exec.c:3973
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "liczba wymiarów tablicy (%d) przekracza maksimum (%d)"
+
+#: pl_exec.c:3992
+msgid "subscripted object is not an array"
+msgstr "indeksowanie jest możliwe jedynie dla obiektu typu tablicowego"
+
+#: pl_exec.c:4015
+msgid "array subscript in assignment must not be null"
+msgstr ""
+"w instrukcji przypisania do elementu tablicy indeksem elementu nie może być "
+"NULL"
+
+#: pl_exec.c:4493
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "zapytanie \"%s\" nie zwróciło żadnych danych"
+
+#: pl_exec.c:4501
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "zapytanie \"%s\" zwróciło %d kolumnę"
+msgstr[1] "zapytanie \"%s\" zwróciło %d kolumny"
+msgstr[2] "zapytanie \"%s\" zwróciło %d kolumn"
+
+#: pl_exec.c:4527
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "zapytanie \"%s\" zwróciło więcej niż jeden wiersz"
+
+#: pl_exec.c:4585
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "zapytanie \"%s\" nie jest kwerendÄ… (SELECT)"
+
+#: gram.y:430
+msgid "block label must be placed before DECLARE, not after"
+msgstr "etykieta bloku musi pojawić się przed częścią DECLARE, nie po niej"
+
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "porównania nie jest dostępne dla typu %s"
+
+#: gram.y:465
+msgid "row or record variable cannot be CONSTANT"
+msgstr "rekord nie może być zadeklarowany jako CONSTANT"
+
+#: gram.y:475
+msgid "row or record variable cannot be NOT NULL"
+msgstr "rekord nie może być zadeklarowany jako NOT NULL"
+
+#: gram.y:486
+msgid "default value for row or record variable is not supported"
+msgstr ""
+"domyślna wartość dla rekordów (abstrakcyjnych oraz konkretnego typu) nie "
+"jest obsługiwana"
+
+#: gram.y:631 gram.y:657
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "zmienna \"%s\" nie istnieje"
+
+#: gram.y:675 gram.y:688
+msgid "duplicate declaration"
+msgstr "powtórzona deklaracja"
+
+#: gram.y:881
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "nieobsługiwany parametr dla instrukcji GET DIAGNOSTICS"
+
+#: gram.y:892 gram.y:3090
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" nie jest zmiennÄ… skalarnÄ…"
+
+#: gram.y:1154 gram.y:1347
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr ""
+"zmienna w pętli dla zapytań musi być rekordem (abstrakcyjnym lub konkretnego "
+"typu) albo listÄ… zmiennych skalarnych"
+
+#: gram.y:1188
+msgid "cursor FOR loop must have only one target variable"
+msgstr ""
+"w pętli FOR używającej kursorów dopuszczalna jest tylko jedna zmienna "
+"iteracyjna"
+
+#: gram.y:1195
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "w pętli FOR można używać jedynie ograniczonych kursorów"
+
+#: gram.y:1278
+msgid "integer FOR loop must have only one target variable"
+msgstr "w pętli FOR dla liczb całkowitych można używać jednej zmiennej"
+
+#: gram.y:1314
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "nie można używać REVERSE w pętli FOR dla zapytań"
+
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "zmienne używane w pętli FOREACH muszą zostać wcześniej zadeklarowana"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
+msgid "unexpected end of function definition"
+msgstr "nieoczekiwany koniec definicji funkcji"
+
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 gram.y:2242 gram.y:2821
+#: gram.y:2885 gram.y:3325 gram.y:3346
+msgid "syntax error"
+msgstr "błąd składni"
+
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
+msgid "invalid SQLSTATE code"
+msgstr "błędny kod SQLSTATE"
+
+#: gram.y:1814
+msgid "syntax error, expected \"FOR\""
+msgstr "błąd składniowy, spodziewano się \"FOR\""
+
+#: gram.y:1876
+msgid "FETCH statement cannot return multiple rows"
+msgstr "instrukcja FETCH nie może zwracać wielu wierszy"
+
+#: gram.y:1932
+msgid "cursor variable must be a simple variable"
+msgstr "zmienna kursorowa musi być zmienną skalarną"
+
+#: gram.y:1938
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "zmienna \"%s\" musi być typu cursor lub refcursor"
+
+#: gram.y:2106
+msgid "label does not exist"
+msgstr "etykieta nie istnieje"
+
+#: gram.y:2213 gram.y:2224
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" nie jest zmiennÄ…"
+
+#: gram.y:2326 gram.y:2336 gram.y:2464
+msgid "mismatched parentheses"
+msgstr "niepasujÄ…ce nawiasy"
+
+#: gram.y:2340
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "brakuje \"%s\" na końcu wyrażenia SQL"
+
+#: gram.y:2346
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "brakuje \"%s\" na końcu instrukcji SQL"
+
+#: gram.y:2363
+msgid "missing expression"
+msgstr "brakuje wyrażenia"
+
+#: gram.y:2365
+msgid "missing SQL statement"
+msgstr "brakuje instrukcji SQL"
+
+#: gram.y:2466
+msgid "incomplete data type declaration"
+msgstr "deklaracja typu abstrakcyjnego"
+
+#: gram.y:2489
+msgid "missing data type declaration"
+msgstr "brakujÄ…ca deklaracja typu"
+
+#: gram.y:2545
+msgid "INTO specified more than once"
+msgstr "INTO użyte więcej niż raz"
+
+#: gram.y:2713
+msgid "expected FROM or IN"
+msgstr "spodziewano siÄ™ FROM lub IN"
+
+#: gram.y:2773
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr ""
+"instrukcja RETURN nie może mieć parametru w funkcjach zwracających zbiory "
+"rekordów (SETOF ...)"
+
+#: gram.y:2774
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "Użyj RETURN NEXT lub RETURN QUERY."
+
+#: gram.y:2782
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr ""
+"instrukcja RETURN nie może mieć parametrów w funkcji posiadającej argumenty "
+"wyjściowe (OUT, INOUT)"
+
+#: gram.y:2791
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr ""
+"instrukcja RETURN nie może mieć parametru w funkcji, która nic nie zwraca"
+
+#: gram.y:2809 gram.y:2816
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr ""
+"w funkcji zwracającej zbiory rekordów parametrem instrukcji RETURN musi być "
+"rekord (abstrakcyjny lub konkretnego typu)"
+
+#: gram.y:2858
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr ""
+"instrukcja RETURN NEXT nie może mieć parametrów w funkcji posiadające "
+"argumenty wyjściowe (OUT, INOUT)"
+
+#: gram.y:2873 gram.y:2880
+msgid ""
+"RETURN NEXT must specify a record or row variable in function returning row"
+msgstr ""
+"w funkcji zwracającej rekord parametrem instrukcji RETURN NEXT musi również "
+"być rekord"
+
+#: gram.y:2959
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\" zadeklarowano jako CONSTANT"
+
+#: gram.y:3021 gram.y:3033
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr ""
+"zmienna rekordowa nie może być celem w wyrażeniu INTO określonym dla więcej "
+"niż jednego argumentu"
+
+#: gram.y:3078
+msgid "too many INTO variables specified"
+msgstr "po INTO podano za dużo zmiennych"
+
+#: gram.y:3286
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "etykieta \"%s\" podana na końcu bloku, który nie posiada etykiety"
+
+#: gram.y:3293
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "etykieta końcowa \"%s\" jest inna niż etykieta bloku \"%s\""
+
+#: gram.y:3320
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "kursor \"%s\" nie przyjmuje parametrów"
+
+#: gram.y:3334
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "kursor \"%s\" przyjmuje parametry"
+
+#: gram.y:3382
+msgid "unrecognized RAISE statement option"
+msgstr "nieznany parametr dla instrukcji RAISE"
+
+#: gram.y:3386
+msgid "syntax error, expected \"=\""
+msgstr "błąd składniowy, spodziewano się \"=\""
+
+#: pl_funcs.c:218
+msgid "statement block"
+msgstr "blok instrukcji"
+
+#: pl_funcs.c:220
+msgid "assignment"
+msgstr "przypisanie"
+
+#: pl_funcs.c:230
+msgid "FOR with integer loop variable"
+msgstr "pętla FOR ze zmienną typu całkowitego"
+
+#: pl_funcs.c:232
+msgid "FOR over SELECT rows"
+msgstr "pętla FOR po rekordach z zapytania SELECT"
+
+#: pl_funcs.c:234
+msgid "FOR over cursor"
+msgstr "pętla FOR względem kursora"
+
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "pętla FOREACH po elementach tablicy"
+
+#: pl_funcs.c:248
+msgid "SQL statement"
+msgstr "wyrażenie SQL"
+
+#: pl_funcs.c:250
+msgid "EXECUTE statement"
+msgstr "instrukcja EXECUTE"
+
+#: pl_funcs.c:252
+msgid "FOR over EXECUTE statement"
+msgstr "pętla FOR po wynikach instrukcji EXECUTE"
+
+#: pl_handler.c:60
+msgid ""
+"Sets handling of conflicts between PL/pgSQL variable names and table column "
+"names."
+msgstr ""
+"Ustawia sposób rozwiązywania niejednoznaczności nazw zmiennych PL/pgSQL i "
+"kolumn tabel."
+
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:467
+#, c-format
+msgid "%s at end of input"
+msgstr "%s na końcu danych wejściowych"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:483
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s w lub pobliżu \"%s\""
diff --git a/src/pl/plpgsql/src/po/pt_BR.po b/src/pl/plpgsql/src/po/pt_BR.po
index 0c5930792fc61..710b4c634c9af 100644
--- a/src/pl/plpgsql/src/po/pt_BR.po
+++ b/src/pl/plpgsql/src/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for plpgsql
 # Copyright (C) 2010 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2010-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-07-26 15:54-0300\n"
+"POT-Creation-Date: 2011-08-21 14:53-0300\n"
 "PO-Revision-Date: 2010-07-08 17:13-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: pl_comp.c:422 pl_handler.c:256
+#: pl_comp.c:427 pl_handler.c:266
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "funções PL/pgSQL não podem aceitar tipo %s"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr ""
 "não pôde determinar tipo de retorno atual para função polimófica \"%s\""
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "funções de gatilho só podem ser chamadas como gatilhos"
 
-#: pl_comp.c:535 pl_handler.c:241
+#: pl_comp.c:540 pl_handler.c:251
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "funções PL/pgSQL não podem retornar tipo %s"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "funções de gatilho não podem ter argumentos declarados"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid ""
 "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
 "instead."
@@ -49,604 +49,649 @@ msgstr ""
 "Os argumentos de um gatilho podem ser acessados através de TG_NARGS e "
 "TG_ARGV."
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilação da função PL/pgSQL \"%s\" próximo a linha %d"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "nome de parâmetro \"%s\" foi especificado mais de uma vez"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "referência à coluna \"%s\" é ambígua"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Ela poderia referenciar uma variável PL/pgSQL ou uma coluna de tabela."
 
-#: pl_comp.c:1690
+#: pl_comp.c:1227 pl_comp.c:1255 pl_exec.c:3862 pl_exec.c:4208 pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "registro \"%s\" não tem campo \"%s\""
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "relação \"%s\" não existe"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "relação \"%s.%s\" não existe"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "variável \"%s\" tem pseudo-tipo %s"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "relação \"%s\" não é uma tabela"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "tipo \"%s\" é indefinido"
 
-#: pl_comp.c:2087 pl_comp.c:2140
+#: pl_comp.c:2190 pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condição de exceção \"%s\" é desconhecida"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid ""
 "could not determine actual argument type for polymorphic function \"%s\""
 msgstr ""
 "não pôde determinar tipo do argumento atual para função polimórfica \"%s\""
 
-#: pl_exec.c:236 pl_exec.c:511
+#: pl_exec.c:239 pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "durante inicialização de estado de execução"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "ao armazenar argumentos em variáveis locais"
 
-#: pl_exec.c:298 pl_exec.c:666
+#: pl_exec.c:301 pl_exec.c:667
 msgid "during function entry"
 msgstr "durante entrada da função"
 
-#: pl_exec.c:329 pl_exec.c:697
+#: pl_exec.c:332 pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE não pode ser utilizado fora de um laço"
 
-#: pl_exec.c:333 pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr ""
-"RAISE sem parâmetros não pode ser utilizado fora de um manipulador de exceção"
-
-#: pl_exec.c:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "controle atingiu o fim da função sem RETURN"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr "ao converter valor de retorno para tipo de retorno da função"
 
-#: pl_exec.c:357 pl_exec.c:2400
+#: pl_exec.c:356 pl_exec.c:2591
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
 "função que tem argumento do tipo conjunto foi chamada em um contexto que não "
 "pode aceitar um conjunto"
 
-#: pl_exec.c:395
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr "tipo record retornado não corresponde ao tipo record esperado"
 
-#: pl_exec.c:453 pl_exec.c:709
+#: pl_exec.c:452 pl_exec.c:706
 msgid "during function exit"
 msgstr "durante saída da função"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "controle atingiu o fim da função de gatilho sem RETURN"
 
-#: pl_exec.c:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "função de gatilho não pode retornar um conjunto"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 msgid ""
 "returned row structure does not match the structure of the triggering table"
 msgstr ""
 "estrutura de registro retornada não corresponde a estrutura da tabela que "
 "disparou o evento"
 
-#: pl_exec.c:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "função PL/pgSQL \"%s\" linha %d %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "função PL/pgSQL \"%s\" %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:818
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "função PL/pgSQL \"%s\" linha %d em %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "função PL/pgSQL \"%s\""
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "durante inicialização de variável local em bloco de comandos"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "variável \"%s\" declarada NOT NULL não pode ter valor padrão NULL"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "durante entrada em bloco de comandos"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "durante saída em bloco de comandos"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "durante término de exceção"
 
-#: pl_exec.c:1553
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "case não foi encontrado"
 
-#: pl_exec.c:1554
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "comando CASE está faltando a parte ELSE."
 
-#: pl_exec.c:1710
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "limite inferior do laço FOR não pode ser nulo"
 
-#: pl_exec.c:1725
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "limite superior do laço FOR não pode ser nulo"
 
-#: pl_exec.c:1742
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "valor BY do laço FOR não pode ser nulo"
 
-#: pl_exec.c:1748
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "valor BY do laço FOR deve ser maior do que zero"
 
-#: pl_exec.c:1920 pl_exec.c:3182
+#: pl_exec.c:1933 pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "cursor \"%s\" já está em uso"
 
-#: pl_exec.c:1943 pl_exec.c:3244
+#: pl_exec.c:1956 pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "argumentos fornecidos a cursor sem argumentos"
 
-#: pl_exec.c:1962 pl_exec.c:3263
+#: pl_exec.c:1975 pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "argumentos requeridos pelo cursor"
 
-#: pl_exec.c:2184 gram.y:2729
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "expressão FOREACH não deve ser nula"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "expressão FOREACH deve produzir uma matriz, e não tipo %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "fatia da dimensão (%d) está fora do intervalo válido, 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "variável do laço FOREACH ... SLICE deve ser de um tipo matriz"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "variável do laço FOREACH não deve ser de um tipo matriz"
+
+#: pl_exec.c:2375 gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr ""
 "não pode utilizar RETURN NEXT em uma função que não foi declarada SETOF"
 
-#: pl_exec.c:2208 pl_exec.c:2274
+#: pl_exec.c:2399 pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "tipo resultante incorreto foi fornecido em RETURN NEXT"
 
-#: pl_exec.c:2230 pl_exec.c:3632 pl_exec.c:3911 pl_exec.c:3945 pl_exec.c:4007
-#: pl_exec.c:4026 pl_exec.c:4063
+#: pl_exec.c:2421 pl_exec.c:3849 pl_exec.c:4166 pl_exec.c:4201 pl_exec.c:4268
+#: pl_exec.c:4287 pl_exec.c:4355 pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "registro \"%s\" não foi atribuído ainda"
 
-#: pl_exec.c:2232 pl_exec.c:3634 pl_exec.c:3913 pl_exec.c:3947 pl_exec.c:4009
-#: pl_exec.c:4028 pl_exec.c:4065
+#: pl_exec.c:2423 pl_exec.c:3851 pl_exec.c:4168 pl_exec.c:4203 pl_exec.c:4270
+#: pl_exec.c:4289 pl_exec.c:4357 pl_exec.c:4380
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "A estrutura da tupla de um registro não atribuído é indeterminada."
 
-#: pl_exec.c:2236 pl_exec.c:2255
+#: pl_exec.c:2427 pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "tipo registro incorreto foi fornecido em RETURN NEXT"
 
-#: pl_exec.c:2297
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT deve ter um parâmetro"
 
-#: pl_exec.c:2328 gram.y:2788
+#: pl_exec.c:2519 gram.y:2903
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr ""
 "não pode utilizar RETURN QUERY em uma função que não foi declarada SETOF"
 
-#: pl_exec.c:2348
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr "estrutura da consulta não corresponde ao tipo resultante da função"
 
-#: pl_exec.c:2480
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr ""
+"RAISE sem parâmetros não pode ser utilizado fora de um manipulador de exceção"
+
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "poucos parâmetros especificados para RAISE"
 
-#: pl_exec.c:2506
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "muitos parâmetros especificados para RAISE"
 
-#: pl_exec.c:2526
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "opção do comando RAISE não pode ser nulo"
 
-#: pl_exec.c:2536 pl_exec.c:2545 pl_exec.c:2553 pl_exec.c:2561
+#: pl_exec.c:2734 pl_exec.c:2743 pl_exec.c:2751 pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "opção RAISE já foi especificada: %s"
 
-#: pl_exec.c:2596 pl_exec.c:2597
+#: pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2743 pl_exec.c:3047
+#: pl_exec.c:2945 pl_exec.c:3081 pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "não pode executar COPY para/do cliente em PL/pgSQL"
 
-#: pl_exec.c:2747 pl_exec.c:3051
+#: pl_exec.c:2949 pl_exec.c:3085 pl_exec.c:3264
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "não pode iniciar/terminar transações em PL/pgSQL"
 
-#: pl_exec.c:2748 pl_exec.c:3052
+#: pl_exec.c:2950 pl_exec.c:3086 pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Ao invés disso utilize um bloco BEGIN com uma cláusula EXCEPTION."
 
-#: pl_exec.c:2896 pl_exec.c:3076
+#: pl_exec.c:3109 pl_exec.c:3289
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO utilizado com um comando que não pode retornar dados"
 
-#: pl_exec.c:2916 pl_exec.c:3096
+#: pl_exec.c:3129 pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "consulta não retornou registros"
 
-#: pl_exec.c:2925 pl_exec.c:3105
+#: pl_exec.c:3138 pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "consulta retornou mais de um registro"
 
-#: pl_exec.c:2939
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "consulta não tem destino para os dados resultantes"
 
-#: pl_exec.c:2940
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Se você quer descartar os resultados de um SELECT, utilize PERFORM."
 
-#: pl_exec.c:2973 pl_exec.c:5547
+#: pl_exec.c:3186 pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "argumento da cadeia de caracteres do EXECUTE é nulo"
 
-#: pl_exec.c:3038
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE de SELECT ... INTO não está implementado"
 
-#: pl_exec.c:3039
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "Ao invés disso, você pode querer utilizar EXECUTE ... INTO."
+#: pl_exec.c:3252
+msgid ""
+"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
+"instead."
+msgstr "Ao invés disso, você pode querer utilizar EXECUTE ... INTO ou EXECUTE CREATE TABLE ... AS."
 
-#: pl_exec.c:3327 pl_exec.c:3418
+#: pl_exec.c:3540 pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variável do cursor \"%s\" é nula"
 
-#: pl_exec.c:3334 pl_exec.c:3425
+#: pl_exec.c:3547 pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "cursor \"%s\" não existe"
 
-#: pl_exec.c:3348
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "posição relativa ou absoluta do cursor é nula"
 
-#: pl_exec.c:3485
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "valor nulo não pode ser atribuído a variável \"%s\" declarada NOT NULL"
 
-#: pl_exec.c:3543
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr "não pode atribuir valor que não é composto a variável do tipo row"
 
-#: pl_exec.c:3585
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr "não pode atribuir valor que não é composto a variável do tipo record"
 
-#: pl_exec.c:3645 pl_exec.c:3952 pl_exec.c:4033 pl_exec.c:4070
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "registro \"%s\" não tem campo \"%s\""
-
-#: pl_exec.c:3743
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "número de dimensões da matriz (%d) excede o máximo permitido (%d)"
 
-#: pl_exec.c:3757
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "objeto com índice não é uma matriz"
 
-#: pl_exec.c:3780
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "índice da matriz em atribuição não deve ser nulo"
 
-#: pl_exec.c:4161
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "consulta \"%s\" não retornou dados"
 
-#: pl_exec.c:4169
+#: pl_exec.c:4501
 #, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
 msgstr[0] "consulta \"%s\" retornou %d coluna"
 msgstr[1] "consulta \"%s\" retornou %d colunas"
 
-#: pl_exec.c:4195
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "consulta \"%s\" retornou mais do que um registro"
 
-#: pl_exec.c:4253
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "consulta \"%s\" não é um SELECT"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "rótulo de bloco deve estar localizado antes do DECLARE e não depois"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "ordenações não são suportadas pelo tipo %s"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "variável do tipo row ou record não pode ser CONSTANT"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "variável do tipo row ou record não pode ser NOT NULL"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr "valor padrão para variável do tipo row ou record não é suportado"
 
-#: gram.y:606 gram.y:632
+#: gram.y:631 gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "variável \"%s\" não existe"
 
-#: gram.y:650 gram.y:663
+#: gram.y:675 gram.y:688
 msgid "duplicate declaration"
 msgstr "declaração duplicada"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "item de GET DIAGNOSTICS desconhecido"
 
-#: gram.y:852 gram.y:2975
+#: gram.y:892 gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" não é uma variável escalar"
 
-#: gram.y:1114 gram.y:1306
+#: gram.y:1154 gram.y:1347
 msgid ""
 "loop variable of loop over rows must be a record or row variable or list of "
 "scalar variables"
 msgstr ""
 "variável de laço sobre registros deve ser uma variável do tipo record ou row "
-"or lista de variáveis escalares"
+"ou lista de variáveis escalares"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "cursor do laço FOR deve ter somente uma variável alvo"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "cursor do laço FOR deve utilizar uma variável cursor limitado"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr "inteiro do laço FOR deve ter somente uma variável alvo"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "não pode especificar REVERSE na consulta do laço FOR"
 
-#: gram.y:1420 gram.y:1457 gram.y:1505 gram.y:2425 gram.y:2506 gram.y:2617
-#: gram.y:3249
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "variável do laço FOEACH deve ser uma variável ou lista de variáveis conhecida"
+
+#: gram.y:1513 gram.y:1550 gram.y:1598 gram.y:2540 gram.y:2621 gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "fim de definição da função inesperado"
 
-#: gram.y:1525 gram.y:1549 gram.y:1561 gram.y:1568 gram.y:1652 gram.y:1759
-#: gram.y:1936 gram.y:2015 gram.y:2128 gram.y:2706 gram.y:2770 gram.y:3209
-#: gram.y:3230
+#: gram.y:1618 gram.y:1642 gram.y:1654 gram.y:1661 gram.y:1750 gram.y:1758
+#: gram.y:1772 gram.y:1867 gram.y:2048 gram.y:2127 gram.y:2242 gram.y:2821
+#: gram.y:2885 gram.y:3325 gram.y:3346
 msgid "syntax error"
 msgstr "erro de sintaxe"
 
-#: gram.y:1553 gram.y:1555 gram.y:1940 gram.y:1942
+#: gram.y:1646 gram.y:1648 gram.y:2052 gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "código SQLSTATE inválido"
 
-#: gram.y:1706
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "erro de sintaxe, \"FOR\" esperado"
 
-#: gram.y:1768
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "comando FETCH não pode retornar múltiplos registros"
 
-#: gram.y:1824
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "variável do cursor deve ser uma variável simples"
 
-#: gram.y:1830
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "variável \"%s\" deve ser do tipo cursor ou refcursor"
 
-#: gram.y:1994
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "rótulo não existe"
 
-#: gram.y:2099 gram.y:2110
+#: gram.y:2213 gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" não é uma variável conhecida"
 
-#: gram.y:2212 gram.y:2222 gram.y:2350
+#: gram.y:2326 gram.y:2336 gram.y:2464
 msgid "mismatched parentheses"
 msgstr "parênteses não correspondem"
 
-#: gram.y:2226
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "faltando \"%s\" ao fim da expressão SQL"
 
-#: gram.y:2232
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "faltando \"%s\" ao fim do comando SQL"
 
-#: gram.y:2249
+#: gram.y:2363
 msgid "missing expression"
 msgstr "faltando expressão"
 
-#: gram.y:2251
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "faltando comando SQL"
 
-#: gram.y:2352
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "declaração de tipo de dado incompleta"
 
-#: gram.y:2374
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "faltando declaração de tipo de dado"
 
-#: gram.y:2430
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO especificado mais de uma vez"
 
-#: gram.y:2598
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "FROM ou IN esperado"
 
-#: gram.y:2658
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "RETURN não pode ter um parâmetro na função que retorna conjunto"
 
-#: gram.y:2659
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Utilize RETURN NEXT ou RETURN QUERY."
 
-#: gram.y:2667
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN não pode ter um parâmetro na função com parâmetros OUT"
 
-#: gram.y:2676
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN não pode ter um parâmetro na função que retorna void"
 
-#: gram.y:2694 gram.y:2701
+#: gram.y:2809 gram.y:2816
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN deve especificar uma variável do tipo record ou row na função que "
 "retorna registro"
 
-#: gram.y:2743
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "RETURN NEXT não pode ter um parâmetro na função com parâmetros OUT"
 
-#: gram.y:2758 gram.y:2765
+#: gram.y:2873 gram.y:2880
 msgid ""
 "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr ""
 "RETURN NEXT deve especificar uma variável do tipo record ou row na função "
 "que retorna registro"
 
-#: gram.y:2844
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" está declarado CONSTANT"
 
-#: gram.y:2906 gram.y:2918
+#: gram.y:3021 gram.y:3033
 msgid "record or row variable cannot be part of multiple-item INTO list"
-msgstr "variável do tipo record ou row não pode ser parte de uma lista INTO de múltiplos itens"
+msgstr ""
+"variável do tipo record ou row não pode ser parte de uma lista INTO de "
+"múltiplos itens"
 
-#: gram.y:2963
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "muitas variáveis INTO especificadas"
 
-#: gram.y:3170
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "rótulo de fim \"%s\" especificado para bloco sem rótulo"
 
-#: gram.y:3177
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "rótulo de fim \"%s\" difere de rótulo do bloco \"%s\""
 
-#: gram.y:3204
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "cursor \"%s\" não tem argumentos"
 
-#: gram.y:3218
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "cursor \"%s\" tem argumentos"
 
-#: gram.y:3266
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "opção do comando RAISE desconhecida"
 
-#: gram.y:3270
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "erro de sintaxe, \"=\" esperado"
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "bloco de comandos"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "atribuição"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "FOR com variável de laço inteira"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "FOR sobre registros de SELECT"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "FOR sobre cursor"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH sobre matriz"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "comando SQL"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "comando EXECUTE"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "FOR sobre comando EXECUTE"
 
@@ -654,16 +699,18 @@ msgstr "FOR sobre comando EXECUTE"
 msgid ""
 "Sets handling of conflicts between PL/pgSQL variable names and table column "
 "names."
-msgstr "Define resolução de conflitos entre nomes de variáveis PL/pgSQL e nomes de colunas de tabelas."
+msgstr ""
+"Define resolução de conflitos entre nomes de variáveis PL/pgSQL e nomes de "
+"colunas de tabelas."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:463
+#: pl_scanner.c:467
 #, c-format
 msgid "%s at end of input"
 msgstr "%s no fim da entrada"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s em ou próximo a \"%s\""
diff --git a/src/pl/plpgsql/src/po/ro.po b/src/pl/plpgsql/src/po/ro.po
index 2836701062176..6ab83a5f1f563 100644
--- a/src/pl/plpgsql/src/po/ro.po
+++ b/src/pl/plpgsql/src/po/ro.po
@@ -1,700 +1,745 @@
-# LANGUAGE message translation file for plpgsql
-# Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-04 19:58+0000\n"
-"PO-Revision-Date: 2010-09-27 22:19-0000\n"
-"Last-Translator: Max <max@oceanline.co.uk>\n"
-"Language-Team: ROMÂNĂ <max@oceanline.co.uk>\n"
+"POT-Creation-Date: 2011-11-09 20:39+0000\n"
+"PO-Revision-Date: 2011-11-22 11:32-0000\n"
+"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
+"Language-Team: ROMÂNĂ <xsoftware.consultancy@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: pl_comp.c:422
-#: pl_handler.c:256
+#: pl_comp.c:427
+#: pl_handler.c:266
 #, c-format
 msgid "PL/pgSQL functions cannot accept type %s"
 msgstr "funcţiile PL/pgSQL nu pot accepta tipul %s"
 
-#: pl_comp.c:501
+#: pl_comp.c:506
 #, c-format
 msgid "could not determine actual return type for polymorphic function \"%s\""
 msgstr "nu pot determina tipul de dată returnat pentru funcţia polimorfică  \"%s\""
 
-#: pl_comp.c:531
+#: pl_comp.c:536
 msgid "trigger functions can only be called as triggers"
 msgstr "funcţiile trigger pot fi apelate doar ca triggere"
 
-#: pl_comp.c:535
-#: pl_handler.c:241
+#: pl_comp.c:540
+#: pl_handler.c:251
 #, c-format
 msgid "PL/pgSQL functions cannot return type %s"
 msgstr "funcţiile PL/pgSQL nu pot returna tipul %s"
 
-#: pl_comp.c:576
+#: pl_comp.c:583
 msgid "trigger functions cannot have declared arguments"
 msgstr "funcţiile trigger nu pot avea argumente declarate"
 
-#: pl_comp.c:577
+#: pl_comp.c:584
 msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
 msgstr "Argumentele trigger-ului pot fi accesate cu ajutorul TG_NARGS și  TG_ARGV."
 
-#: pl_comp.c:880
+#: pl_comp.c:912
 #, c-format
 msgid "compilation of PL/pgSQL function \"%s\" near line %d"
 msgstr "compilarea funcțiee PL/pgSQL \"%s\" aproape de linia %d"
 
-#: pl_comp.c:978
+#: pl_comp.c:935
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "parametrul cu numele \"%s\" este folosit mai mult de o singură dată"
+
+#: pl_comp.c:1045
 #, c-format
 msgid "column reference \"%s\" is ambiguous"
 msgstr "referința coloanei \"%s\" este ambiguă"
 
-#: pl_comp.c:980
+#: pl_comp.c:1047
 msgid "It could refer to either a PL/pgSQL variable or a table column."
 msgstr "Se poate referi la o variabilă PL/pgSQL sau la o coloană a unei tabele."
 
-#: pl_comp.c:1690
+#: pl_comp.c:1227
+#: pl_comp.c:1255
+#: pl_exec.c:3862
+#: pl_exec.c:4208
+#: pl_exec.c:4294
+#: pl_exec.c:4385
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "înregistrarea \"%s\" nu are nici un câmp \"%s\""
+
+#: pl_comp.c:1782
 #, c-format
 msgid "relation \"%s\" does not exist"
 msgstr "relaţia \"%s\" nu există"
 
-#: pl_comp.c:1722
+#: pl_comp.c:1814
 #, c-format
 msgid "relation \"%s.%s\" does not exist"
 msgstr "relaţia \"%s.%s\" nu există"
 
-#: pl_comp.c:1804
+#: pl_comp.c:1896
 #, c-format
 msgid "variable \"%s\" has pseudo-type %s"
 msgstr "variabila  \"%s\" are pseudo-tipul %s"
 
-#: pl_comp.c:1865
+#: pl_comp.c:1957
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "relaţia \"%s\" nu este o tabelă"
 
-#: pl_comp.c:2017
+#: pl_comp.c:2117
 #, c-format
 msgid "type \"%s\" is only a shell"
 msgstr "tipul \"%s\" este doar un shell"
 
-#: pl_comp.c:2087
-#: pl_comp.c:2140
+#: pl_comp.c:2190
+#: pl_comp.c:2243
 #, c-format
 msgid "unrecognized exception condition \"%s\""
 msgstr "condiţia excepției \"%s\" nu este recunoscută"
 
-#: pl_comp.c:2295
+#: pl_comp.c:2401
 #, c-format
 msgid "could not determine actual argument type for polymorphic function \"%s\""
 msgstr "nu pot determina tipul de dată returnat pentru funcţia polimorfică  \"%s\""
 
-#: pl_exec.c:236
-#: pl_exec.c:511
+#: pl_exec.c:239
+#: pl_exec.c:510
 msgid "during initialization of execution state"
 msgstr "în timpul inițializării stării de execuție"
 
-#: pl_exec.c:243
+#: pl_exec.c:246
 msgid "while storing call arguments into local variables"
 msgstr "în timpul stocării argumentelor de apelare în variabile locale"
 
-#: pl_exec.c:298
-#: pl_exec.c:666
+#: pl_exec.c:301
+#: pl_exec.c:667
 msgid "during function entry"
 msgstr "în timpul intrării în funcție"
 
-#: pl_exec.c:329
-#: pl_exec.c:697
+#: pl_exec.c:332
+#: pl_exec.c:698
 msgid "CONTINUE cannot be used outside a loop"
 msgstr "CONTINUE nu poate fi folosit în afara unei bucle"
 
-#: pl_exec.c:333
-#: pl_exec.c:701
-msgid "RAISE without parameters cannot be used outside an exception handler"
-msgstr "RAISE fără parametri nu poate fi folosit în afara unui gestionar de excepții - exception handler"
-
-#: pl_exec.c:337
+#: pl_exec.c:336
 msgid "control reached end of function without RETURN"
 msgstr "controlul a ajuns la sfârșitul funcției fără a întâlni comanda RETURN"
 
-#: pl_exec.c:344
+#: pl_exec.c:343
 msgid "while casting return value to function's return type"
 msgstr "în timpul transformării valorii returnate în tipul de dată returnat de funcție"
 
-#: pl_exec.c:357
-#: pl_exec.c:2403
+#: pl_exec.c:356
+#: pl_exec.c:2591
 msgid "set-valued function called in context that cannot accept a set"
 msgstr "funcţie set-valoare apelată într-un context care nu acceptă set"
 
-#: pl_exec.c:395
+#: pl_exec.c:394
 msgid "returned record type does not match expected record type"
 msgstr "tipul înregistrării returnate nu se potrivește cu tipul înregistrării așteptat"
 
-#: pl_exec.c:453
-#: pl_exec.c:709
+#: pl_exec.c:452
+#: pl_exec.c:706
 msgid "during function exit"
 msgstr "în timpul ieșirii din fucție"
 
-#: pl_exec.c:705
+#: pl_exec.c:702
 msgid "control reached end of trigger procedure without RETURN"
 msgstr "controlul a ajuns la sfârșitul trigger-ului fără a întâlni comanda RETURN"
 
-#: pl_exec.c:714
+#: pl_exec.c:711
 msgid "trigger procedure cannot return a set"
 msgstr "o procedură trigger nu poate returna un set"
 
-#: pl_exec.c:736
+#: pl_exec.c:733
 msgid "returned row structure does not match the structure of the triggering table"
 msgstr "structura rândului nu se potrivește cu structura tabelei carea a activat triggerul"
 
-#: pl_exec.c:799
+#: pl_exec.c:796
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d %s"
 msgstr "PL/pgSQL funcție  \"%s\" linie %d %s"
 
-#: pl_exec.c:810
+#: pl_exec.c:807
 #, c-format
 msgid "PL/pgSQL function \"%s\" %s"
 msgstr "PL/pgSQL funcție \"%s\" %s"
 
 #. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:818
+#: pl_exec.c:815
 #, c-format
 msgid "PL/pgSQL function \"%s\" line %d at %s"
 msgstr "PL/pgSQL funcție \"%s\" linie %d la %s"
 
-#: pl_exec.c:824
+#: pl_exec.c:821
 #, c-format
 msgid "PL/pgSQL function \"%s\""
 msgstr "PL/pgSQL funcție \"%s\""
 
-#: pl_exec.c:932
+#: pl_exec.c:929
 msgid "during statement block local variable initialization"
 msgstr "în timpul inițializării variabilei locale în blocul de comenzi"
 
-#: pl_exec.c:974
+#: pl_exec.c:971
 #, c-format
 msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
 msgstr "variabila \"%s\" declarată NOT NULL nu poate fi avea valoare predefinită ca NULL"
 
-#: pl_exec.c:1023
+#: pl_exec.c:1021
 msgid "during statement block entry"
 msgstr "în timpul intrării în blocul de comenzi"
 
-#: pl_exec.c:1044
+#: pl_exec.c:1042
 msgid "during statement block exit"
 msgstr "în timpul ieșirii din blocul de comenzi"
 
-#: pl_exec.c:1087
+#: pl_exec.c:1085
 msgid "during exception cleanup"
 msgstr "în timpul operaţiei de curăţare, a excepţiei "
 
-#: pl_exec.c:1556
+#: pl_exec.c:1570
 msgid "case not found"
 msgstr "caz negăsit"
 
-#: pl_exec.c:1557
+#: pl_exec.c:1571
 msgid "CASE statement is missing ELSE part."
 msgstr "comandă CASE fără partea ELSE."
 
-#: pl_exec.c:1713
+#: pl_exec.c:1725
 msgid "lower bound of FOR loop cannot be null"
 msgstr "limita de jos a unei bucle FOR nu poate fi NULL"
 
-#: pl_exec.c:1728
+#: pl_exec.c:1740
 msgid "upper bound of FOR loop cannot be null"
 msgstr "limita de sus a unei bucle FOR nu poate fi NULL"
 
-#: pl_exec.c:1745
+#: pl_exec.c:1757
 msgid "BY value of FOR loop cannot be null"
 msgstr "BY valoare într-o buclă FOR nu poate fi NULL"
 
-#: pl_exec.c:1751
+#: pl_exec.c:1763
 msgid "BY value of FOR loop must be greater than zero"
 msgstr "BY valoare într-o buclă FOR trebuie să fie mai mare ca zero"
 
-#: pl_exec.c:1923
-#: pl_exec.c:3188
+#: pl_exec.c:1933
+#: pl_exec.c:3395
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr "cursor \"%s\" deja în uz"
 
-#: pl_exec.c:1946
-#: pl_exec.c:3250
+#: pl_exec.c:1956
+#: pl_exec.c:3457
 msgid "arguments given for cursor without arguments"
 msgstr "argumente transmise unui cursor ce nu primeÅŸte argumente"
 
-#: pl_exec.c:1965
-#: pl_exec.c:3269
+#: pl_exec.c:1975
+#: pl_exec.c:3476
 msgid "arguments required for cursor"
 msgstr "argumente necesare pentru cursor"
 
-#: pl_exec.c:2187
-#: gram.y:2744
+#: pl_exec.c:2063
+msgid "FOREACH expression must not be null"
+msgstr "expresia FOREACH nu poate fi null"
+
+#: pl_exec.c:2069
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr "expresia FOREACH trebuie să producă un arraz şi nu tipul %s"
+
+#: pl_exec.c:2086
+#, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "slice dimension (%d) este in afara intervalului permis 0..%d"
+
+#: pl_exec.c:2113
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr "variabila din bucla FOREACH ... SLICE trebuie să fie de tip array"
+
+#: pl_exec.c:2117
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "variabila din bucla FOREACH  nu trebuie să fie de tip array"
+
+#: pl_exec.c:2375
+#: gram.y:2844
 msgid "cannot use RETURN NEXT in a non-SETOF function"
 msgstr "RETURN NEXT nu poate fi folosit într-o funcţie de tip non-SETOF"
 
-#: pl_exec.c:2211
-#: pl_exec.c:2277
+#: pl_exec.c:2399
+#: pl_exec.c:2465
 msgid "wrong result type supplied in RETURN NEXT"
 msgstr "rezultat cu tip de dată greșit, furnizat în RETURN NEXT"
 
-#: pl_exec.c:2233
-#: pl_exec.c:3642
-#: pl_exec.c:3948
-#: pl_exec.c:3982
-#: pl_exec.c:4044
-#: pl_exec.c:4063
-#: pl_exec.c:4100
+#: pl_exec.c:2421
+#: pl_exec.c:3849
+#: pl_exec.c:4166
+#: pl_exec.c:4201
+#: pl_exec.c:4268
+#: pl_exec.c:4287
+#: pl_exec.c:4355
+#: pl_exec.c:4378
 #, c-format
 msgid "record \"%s\" is not assigned yet"
 msgstr "înregistrarea \"%s\" nu este atribuită încă"
 
-#: pl_exec.c:2235
-#: pl_exec.c:3644
-#: pl_exec.c:3950
-#: pl_exec.c:3984
-#: pl_exec.c:4046
-#: pl_exec.c:4065
-#: pl_exec.c:4102
+#: pl_exec.c:2423
+#: pl_exec.c:3851
+#: pl_exec.c:4168
+#: pl_exec.c:4203
+#: pl_exec.c:4270
+#: pl_exec.c:4289
+#: pl_exec.c:4357
+#: pl_exec.c:4380
 msgid "The tuple structure of a not-yet-assigned record is indeterminate."
 msgstr "Structura tuplului unei înregistrări încă-ne-atribuită  nu poate fi determinată"
 
-#: pl_exec.c:2239
-#: pl_exec.c:2258
+#: pl_exec.c:2427
+#: pl_exec.c:2446
 msgid "wrong record type supplied in RETURN NEXT"
 msgstr "tipul  înregistrării furnizat în RETURN NEXT este greşit"
 
-#: pl_exec.c:2300
+#: pl_exec.c:2488
 msgid "RETURN NEXT must have a parameter"
 msgstr "RETURN NEXT trebuie să aibă un parametru"
 
-#: pl_exec.c:2331
-#: gram.y:2803
+#: pl_exec.c:2519
+#: gram.y:2903
 msgid "cannot use RETURN QUERY in a non-SETOF function"
 msgstr "RETURN QUERY nu pote fi folosit într-o funcție non-SETOF"
 
-#: pl_exec.c:2351
+#: pl_exec.c:2539
 msgid "structure of query does not match function result type"
 msgstr "structura interogării nu se potriveşte cu tipul rezultatului funcţiei"
 
-#: pl_exec.c:2483
+#: pl_exec.c:2637
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr "RAISE fără parametri nu poate fi folosit în afara unui gestionar de excepții - exception handler"
+
+#: pl_exec.c:2678
 msgid "too few parameters specified for RAISE"
 msgstr "prea puțini parametri specificați pentru RAISE"
 
-#: pl_exec.c:2509
+#: pl_exec.c:2704
 msgid "too many parameters specified for RAISE"
 msgstr "prea mulți parametri specificați pentru RAISE"
 
-#: pl_exec.c:2529
+#: pl_exec.c:2724
 msgid "RAISE statement option cannot be null"
 msgstr "opţiunea comenzii RAISE nu poate fi NULL"
 
-#: pl_exec.c:2539
-#: pl_exec.c:2548
-#: pl_exec.c:2556
-#: pl_exec.c:2564
+#: pl_exec.c:2734
+#: pl_exec.c:2743
+#: pl_exec.c:2751
+#: pl_exec.c:2759
 #, c-format
 msgid "RAISE option already specified: %s"
 msgstr "opțiune RAISE deja specificată: %s"
 
-#: pl_exec.c:2599
-#: pl_exec.c:2600
+#: pl_exec.c:2795
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pl_exec.c:2749
-#: pl_exec.c:3053
+#: pl_exec.c:2945
+#: pl_exec.c:3081
+#: pl_exec.c:3260
 msgid "cannot COPY to/from client in PL/pgSQL"
 msgstr "COPY la/de la un client nu poate fi folosită în PL/pgSQL"
 
-#: pl_exec.c:2753
-#: pl_exec.c:3057
+#: pl_exec.c:2949
+#: pl_exec.c:3085
+#: pl_exec.c:3264
 msgid "cannot begin/end transactions in PL/pgSQL"
 msgstr "nu pot începe/termina tranzacții în PL/pgSQL"
 
-#: pl_exec.c:2754
-#: pl_exec.c:3058
+#: pl_exec.c:2950
+#: pl_exec.c:3086
+#: pl_exec.c:3265
 msgid "Use a BEGIN block with an EXCEPTION clause instead."
 msgstr "Folosiți, în loc, blocul BEGIN cu clauza EXCEPTION "
 
-#: pl_exec.c:2902
-#: pl_exec.c:3082
+#: pl_exec.c:3109
+#: pl_exec.c:3289
 msgid "INTO used with a command that cannot return data"
 msgstr "INTO utilizat într-o comandă care nu poate returna date"
 
-#: pl_exec.c:2922
-#: pl_exec.c:3102
+#: pl_exec.c:3129
+#: pl_exec.c:3309
 msgid "query returned no rows"
 msgstr "interogarea nu a rezultat nici un rând"
 
-#: pl_exec.c:2931
-#: pl_exec.c:3111
+#: pl_exec.c:3138
+#: pl_exec.c:3318
 msgid "query returned more than one row"
 msgstr "interogarea a rezultat mai mult de un rând"
 
-#: pl_exec.c:2945
+#: pl_exec.c:3152
 msgid "query has no destination for result data"
 msgstr "interogarea nu are destinaţie pentru datele rezultate"
 
-#: pl_exec.c:2946
+#: pl_exec.c:3153
 msgid "If you want to discard the results of a SELECT, use PERFORM instead."
 msgstr "Dacă doriți să renunțați la rezultatul unui SELECT, folosiți PERFORM în loc."
 
-#: pl_exec.c:2979
-#: pl_exec.c:5602
+#: pl_exec.c:3186
+#: pl_exec.c:5929
 msgid "query string argument of EXECUTE is null"
 msgstr "comanda EXECUTE are ca parametru o expresie nulă"
 
-#: pl_exec.c:3044
+#: pl_exec.c:3251
 msgid "EXECUTE of SELECT ... INTO is not implemented"
 msgstr "EXECUTE of SELECT ... INTO nu este încă implementat"
 
-#: pl_exec.c:3045
-msgid "You might want to use EXECUTE ... INTO instead."
-msgstr "Posibil să doriți să utilizați, în loc, EXECUTE ... INTO."
+#: pl_exec.c:3252
+msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
+msgstr "Poate doriți să folosiţi în loc, EXECUTE ... INTO sau EXECUTE CREATE TABLE ... AS "
 
-#: pl_exec.c:3333
-#: pl_exec.c:3424
+#: pl_exec.c:3540
+#: pl_exec.c:3631
 #, c-format
 msgid "cursor variable \"%s\" is null"
 msgstr "variabila cursor \"%s\" este NULL"
 
-#: pl_exec.c:3340
-#: pl_exec.c:3431
+#: pl_exec.c:3547
+#: pl_exec.c:3638
 #, c-format
 msgid "cursor \"%s\" does not exist"
 msgstr "cursorul \"%s\" nu există"
 
-#: pl_exec.c:3354
+#: pl_exec.c:3561
 msgid "relative or absolute cursor position is null"
 msgstr "poziţia relativă sau absolută a cursorului este NULL"
 
-#: pl_exec.c:3495
+#: pl_exec.c:3702
 #, c-format
 msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
 msgstr "NULL nu poate fi attribuit variabilei \"%s\" declarată NOT NULL"
 
-#: pl_exec.c:3553
+#: pl_exec.c:3760
 msgid "cannot assign non-composite value to a row variable"
 msgstr "o valoare de tip non-compozit nu poate fi atribuită unei variabile de tip rând"
 
-#: pl_exec.c:3595
+#: pl_exec.c:3802
 msgid "cannot assign non-composite value to a record variable"
 msgstr "o valoare de tip non-compozit nu poate fi atribuită unei variabile de tip înregistrare"
 
-#: pl_exec.c:3655
-#: pl_exec.c:3989
-#: pl_exec.c:4070
-#: pl_exec.c:4107
-#, c-format
-msgid "record \"%s\" has no field \"%s\""
-msgstr "înregistrarea \"%s\" nu are nici un câmp \"%s\""
-
-#: pl_exec.c:3765
+#: pl_exec.c:3973
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr "numarul dimensiunilor array-ului  (%d)  depăşeşte maximul admis, %d"
 
-#: pl_exec.c:3779
+#: pl_exec.c:3992
 msgid "subscripted object is not an array"
 msgstr "obiectul transmis nu este un array"
 
-#: pl_exec.c:3802
+#: pl_exec.c:4015
 msgid "array subscript in assignment must not be null"
 msgstr "array-ul transmis pentru atribuire nu poate fi null"
 
-#: pl_exec.c:4198
+#: pl_exec.c:4493
 #, c-format
 msgid "query \"%s\" did not return data"
 msgstr "interogarea \"%s\" nu a rezultat date"
 
-#: pl_exec.c:4206
-#, fuzzy, c-format
+#: pl_exec.c:4501
+#, c-format
 msgid "query \"%s\" returned %d column"
 msgid_plural "query \"%s\" returned %d columns"
-msgstr[0] "interogarea \"%s\" a rezultat %d coloane"
+msgstr[0] "interogarea \"%s\" a rezultat coloana %d"
 msgstr[1] "interogarea \"%s\" a rezultat %d coloane"
 
-#: pl_exec.c:4232
+#: pl_exec.c:4527
 #, c-format
 msgid "query \"%s\" returned more than one row"
 msgstr "interogarea \"%s\" a rezultat mai mult un rând"
 
-#: pl_exec.c:4290
+#: pl_exec.c:4585
 #, c-format
 msgid "query \"%s\" is not a SELECT"
 msgstr "interogarea \"%s\" nu este un SELECT"
 
-#: gram.y:423
+#: gram.y:430
 msgid "block label must be placed before DECLARE, not after"
 msgstr "eticheta bloc trebuie plasată înainte de DECLARE, nu după"
 
-#: gram.y:441
+#: gram.y:450
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "colaţionările nu sunt suportate de tipul de dată %s"
+
+#: gram.y:465
 msgid "row or record variable cannot be CONSTANT"
 msgstr "variabila de tip rând sau înregistrare nu poate fi CONSTANT"
 
-#: gram.y:451
+#: gram.y:475
 msgid "row or record variable cannot be NOT NULL"
 msgstr "variabila de tip rând sau înregistrare nu poate fi NOT NULL"
 
-#: gram.y:462
+#: gram.y:486
 msgid "default value for row or record variable is not supported"
 msgstr "valoare predefinită pentru o variabilă de tip rând sau înregistrare nu este suportată"
 
-#: gram.y:606
-#: gram.y:632
+#: gram.y:631
+#: gram.y:657
 #, c-format
 msgid "variable \"%s\" does not exist"
 msgstr "variabila \"%s\" nu există"
 
-#: gram.y:650
-#: gram.y:663
+#: gram.y:675
+#: gram.y:688
 msgid "duplicate declaration"
 msgstr "declarație duplicată"
 
-#: gram.y:841
+#: gram.y:881
 msgid "unrecognized GET DIAGNOSTICS item"
 msgstr "element GET DIAGNOSTICS necunoscut"
 
-#: gram.y:852
-#: gram.y:2990
+#: gram.y:892
+#: gram.y:3090
 #, c-format
 msgid "\"%s\" is not a scalar variable"
 msgstr "\"%s\" nu este o variabilă de tip scalar"
 
-#: gram.y:1114
-#: gram.y:1306
+#: gram.y:1154
+#: gram.y:1347
 msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
 msgstr "variabila unei bucle de tip -buclă peste rânduri-  trebuie să fie o variabilă de tip înregistrare sau rând, sau o listă de variabile de tip scalar"
 
-#: gram.y:1148
+#: gram.y:1188
 msgid "cursor FOR loop must have only one target variable"
 msgstr "bucla cursor FOR trebuie sa aibă doar o variabilă ţintă"
 
-#: gram.y:1155
+#: gram.y:1195
 msgid "cursor FOR loop must use a bound cursor variable"
 msgstr "bucla cursor FOR trebuie să utilizeze o variabilă de tip bound cursor"
 
-#: gram.y:1238
+#: gram.y:1278
 msgid "integer FOR loop must have only one target variable"
 msgstr "variabila de tip integer din bucla FOR trebuie să aibă o singură variabilă ţintă"
 
-#: gram.y:1273
+#: gram.y:1314
 msgid "cannot specify REVERSE in query FOR loop"
 msgstr "REVERSE nu poate fi specificat într-o interogare buclă FOR"
 
-#: gram.y:1420
-#: gram.y:1457
-#: gram.y:1505
-#: gram.y:2440
-#: gram.y:2521
-#: gram.y:2632
-#: gram.y:3264
+#: gram.y:1461
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "variabila unei bucle de tip FOREACH trebuie să fie o variabilă cunoscută sau o listă de variabile cunoscute"
+
+#: gram.y:1513
+#: gram.y:1550
+#: gram.y:1598
+#: gram.y:2540
+#: gram.y:2621
+#: gram.y:2732
+#: gram.y:3365
 msgid "unexpected end of function definition"
 msgstr "sfârșit de definiție a funcției nerecunoscut"
 
-#: gram.y:1525
-#: gram.y:1549
-#: gram.y:1561
-#: gram.y:1568
-#: gram.y:1657
-#: gram.y:1665
-#: gram.y:1679
-#: gram.y:1774
-#: gram.y:1951
-#: gram.y:2030
-#: gram.y:2143
-#: gram.y:2721
-#: gram.y:2785
-#: gram.y:3224
-#: gram.y:3245
+#: gram.y:1618
+#: gram.y:1642
+#: gram.y:1654
+#: gram.y:1661
+#: gram.y:1750
+#: gram.y:1758
+#: gram.y:1772
+#: gram.y:1867
+#: gram.y:2048
+#: gram.y:2127
+#: gram.y:2242
+#: gram.y:2821
+#: gram.y:2885
+#: gram.y:3325
+#: gram.y:3346
 msgid "syntax error"
 msgstr "eroare de sintaxă"
 
-#: gram.y:1553
-#: gram.y:1555
-#: gram.y:1955
-#: gram.y:1957
+#: gram.y:1646
+#: gram.y:1648
+#: gram.y:2052
+#: gram.y:2054
 msgid "invalid SQLSTATE code"
 msgstr "cod SQLSTATE invalid"
 
-#: gram.y:1721
+#: gram.y:1814
 msgid "syntax error, expected \"FOR\""
 msgstr "eroare de sintaxă, așteptam \"FOR\""
 
-#: gram.y:1783
+#: gram.y:1876
 msgid "FETCH statement cannot return multiple rows"
 msgstr "comanda FETCH nu poate returna mai multe rânduri"
 
-#: gram.y:1839
+#: gram.y:1932
 msgid "cursor variable must be a simple variable"
 msgstr "variabila cursor trebuie să fie o variabilă simplă"
 
-#: gram.y:1845
+#: gram.y:1938
 #, c-format
 msgid "variable \"%s\" must be of type cursor or refcursor"
 msgstr "variabila \"%s\" trebuie să fie de tip cursor sau refcursor"
 
-#: gram.y:2009
+#: gram.y:2106
 msgid "label does not exist"
 msgstr "etichetă inexistentă"
 
-#: gram.y:2114
-#: gram.y:2125
+#: gram.y:2213
+#: gram.y:2224
 #, c-format
 msgid "\"%s\" is not a known variable"
 msgstr "\"%s\" nu este o variabilă cunoscută"
 
-#: gram.y:2227
-#: gram.y:2237
-#: gram.y:2365
+#: gram.y:2326
+#: gram.y:2336
+#: gram.y:2464
 msgid "mismatched parentheses"
 msgstr "paranteze care nu se potrivesc"
 
-#: gram.y:2241
+#: gram.y:2340
 #, c-format
 msgid "missing \"%s\" at end of SQL expression"
 msgstr "lipsă \"%s\" la sfârșitul unei expresii SQL"
 
-#: gram.y:2247
+#: gram.y:2346
 #, c-format
 msgid "missing \"%s\" at end of SQL statement"
 msgstr "lipsă \"%s\" la sfârșitul unei comenzi SQL"
 
-#: gram.y:2264
+#: gram.y:2363
 msgid "missing expression"
 msgstr "expresie lipsă"
 
-#: gram.y:2266
+#: gram.y:2365
 msgid "missing SQL statement"
 msgstr "comandă SQL incompletă"
 
-#: gram.y:2367
+#: gram.y:2466
 msgid "incomplete data type declaration"
 msgstr "declarație incompletă pentru un tip de dată"
 
-#: gram.y:2389
+#: gram.y:2489
 msgid "missing data type declaration"
 msgstr "declarație lipsă pentru un tip de dată"
 
-#: gram.y:2445
+#: gram.y:2545
 msgid "INTO specified more than once"
 msgstr "INTO este folosit mai mult de o singură dată"
 
-#: gram.y:2613
+#: gram.y:2713
 msgid "expected FROM or IN"
 msgstr "este așteptat FROM sau IN"
 
-#: gram.y:2673
+#: gram.y:2773
 msgid "RETURN cannot have a parameter in function returning set"
 msgstr "RETURN nu poate avea un parametru în cazul unei funcții ce returnează un set"
 
-#: gram.y:2674
+#: gram.y:2774
 msgid "Use RETURN NEXT or RETURN QUERY."
 msgstr "Folosiți RETURN NEXT sau RETURN QUERY."
 
-#: gram.y:2682
+#: gram.y:2782
 msgid "RETURN cannot have a parameter in function with OUT parameters"
 msgstr "RETURN nu poate avea un parametru în cazul unei funcții cu parametrii de tip OUT"
 
-#: gram.y:2691
+#: gram.y:2791
 msgid "RETURN cannot have a parameter in function returning void"
 msgstr "RETURN nu poate avea un parametru în cazul unei funcții de tip void"
 
-#: gram.y:2709
-#: gram.y:2716
+#: gram.y:2809
+#: gram.y:2816
 msgid "RETURN must specify a record or row variable in function returning row"
 msgstr "RETURN trebuie să specifice o variabilă de tip înregistrare sau rând într-o funcție ce returnează un rând"
 
-#: gram.y:2758
+#: gram.y:2858
 msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
 msgstr "RETURN NEXT nu poate avea un parametru într-o funcţie cu parametrii de tip OUT"
 
-#: gram.y:2773
-#: gram.y:2780
+#: gram.y:2873
+#: gram.y:2880
 msgid "RETURN NEXT must specify a record or row variable in function returning row"
 msgstr "RETURN NEXT trebuie să specifice o variabilă de tip înregistrare sau rând într-o funcție ce returnează un rând"
 
-#: gram.y:2859
+#: gram.y:2959
 #, c-format
 msgid "\"%s\" is declared CONSTANT"
 msgstr "\"%s\" este declarat CONSTANT"
 
-#: gram.y:2921
-#: gram.y:2933
+#: gram.y:3021
+#: gram.y:3033
 msgid "record or row variable cannot be part of multiple-item INTO list"
 msgstr "variabila înregistrare sau rînd nu poate fi parte a unul element multiplu dintr-o listă INTO"
 
-#: gram.y:2978
+#: gram.y:3078
 msgid "too many INTO variables specified"
 msgstr "prea multe variabile INTO specificate"
 
-#: gram.y:3185
+#: gram.y:3286
 #, c-format
 msgid "end label \"%s\" specified for unlabelled block"
 msgstr "etichetă de sfârșit \"%s\" specificată pentru un bloc fără etichetă "
 
-#: gram.y:3192
+#: gram.y:3293
 #, c-format
 msgid "end label \"%s\" differs from block's label \"%s\""
 msgstr "eticheta de sfârșit \"%s\" diferă față de eticheta blocului \"%s\""
 
-#: gram.y:3219
+#: gram.y:3320
 #, c-format
 msgid "cursor \"%s\" has no arguments"
 msgstr "cursorul \"%s\" nu are argumente"
 
-#: gram.y:3233
+#: gram.y:3334
 #, c-format
 msgid "cursor \"%s\" has arguments"
 msgstr "cursorul \"%s\" are argumente"
 
-#: gram.y:3281
+#: gram.y:3382
 msgid "unrecognized RAISE statement option"
 msgstr "opțiune nerecunoscută a comenzii RAISE"
 
-#: gram.y:3285
+#: gram.y:3386
 msgid "syntax error, expected \"=\""
 msgstr "eroare de sintaxă, expected \"=\""
 
-#: pl_funcs.c:216
+#: pl_funcs.c:218
 msgid "statement block"
 msgstr "bloc de comenzi"
 
-#: pl_funcs.c:218
+#: pl_funcs.c:220
 msgid "assignment"
 msgstr "atribuire"
 
-#: pl_funcs.c:228
+#: pl_funcs.c:230
 msgid "FOR with integer loop variable"
 msgstr "FOR cu variabila buclei de tip integer"
 
-#: pl_funcs.c:230
+#: pl_funcs.c:232
 msgid "FOR over SELECT rows"
 msgstr "FOR peste SELECT rânduri"
 
-#: pl_funcs.c:232
+#: pl_funcs.c:234
 msgid "FOR over cursor"
 msgstr "FOR peste cursor"
 
-#: pl_funcs.c:244
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH peste cursor"
+
+#: pl_funcs.c:248
 msgid "SQL statement"
 msgstr "comandă SQL"
 
-#: pl_funcs.c:246
+#: pl_funcs.c:250
 msgid "EXECUTE statement"
 msgstr "comandă EXECUTE"
 
-#: pl_funcs.c:248
+#: pl_funcs.c:252
 msgid "FOR over EXECUTE statement"
 msgstr "FOR peste comandă EXECUTE"
 
@@ -703,13 +748,13 @@ msgid "Sets handling of conflicts between PL/pgSQL variable names and table colu
 msgstr "Stabilește modalitatea de rezolvare a conflictelor de nume dintre variabilele PL/pgSQL și coloanele tabelelor."
 
 #. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:463
+#: pl_scanner.c:467
 #, c-format
 msgid "%s at end of input"
 msgstr "%s la sfârşit de intrare"
 
 #. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:479
+#: pl_scanner.c:483
 #, c-format
 msgid "%s at or near \"%s\""
 msgstr "%s la sau aproape de \"%s\""
diff --git a/src/pl/plpgsql/src/po/tr.po b/src/pl/plpgsql/src/po/tr.po
new file mode 100644
index 0000000000000..02ac4326e6924
--- /dev/null
+++ b/src/pl/plpgsql/src/po/tr.po
@@ -0,0 +1,895 @@
+# LANGUAGE message translation file for plpgsql
+# Copyright (C) 2009 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-08-31 10:39+0000\n"
+"PO-Revision-Date: 2011-08-31 15:41+0200\n"
+"Last-Translator: Devrim GÃœNDÃœZ <devrim@gunduz.org>\n"
+"Language-Team: TR <devrim@commandprompt.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: pl_comp.c:428
+#: pl_handler.c:266
+#, c-format
+msgid "PL/pgSQL functions cannot accept type %s"
+msgstr "PL/pgSQL fonksiyonları %s veri tipini kabul etmezler"
+
+#: pl_comp.c:507
+#, c-format
+msgid "could not determine actual return type for polymorphic function \"%s\""
+msgstr "\"%s\" polimorfik fonksiyonunun asıl dönüşdeğeri belirlenemedi"
+
+#: pl_comp.c:537
+#, c-format
+msgid "trigger functions can only be called as triggers"
+msgstr "trigger fonksiyonları sadece trigger olarak çağırılabilirler"
+
+#: pl_comp.c:541
+#: pl_handler.c:251
+#, c-format
+msgid "PL/pgSQL functions cannot return type %s"
+msgstr "PL/pgSQL fonksiyonları %s tipini döndüremezler"
+
+#: pl_comp.c:584
+#, c-format
+msgid "trigger functions cannot have declared arguments"
+msgstr "trigger fonksiyonları belirtilmiş (declared) argümanlara sahip olamaz"
+
+#: pl_comp.c:585
+#, c-format
+msgid "The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead."
+msgstr "Tetikleyici bağımsız değişkenlerine TG_NARGS ve TG_ARGV üzerinden erişilebilir."
+
+#: pl_comp.c:913
+#, c-format
+msgid "compilation of PL/pgSQL function \"%s\" near line %d"
+msgstr "\"%s\" fonkiyonununun %d numaralı satırının civarlarında derlenmesi"
+
+#: pl_comp.c:936
+#, c-format
+msgid "parameter name \"%s\" used more than once"
+msgstr "\"%s\" parametresi birden fazla kez kullanılmıştır"
+
+#: pl_comp.c:1046
+#, c-format
+msgid "column reference \"%s\" is ambiguous"
+msgstr "\"%s\" sütun referansı iki anlamlı"
+
+#: pl_comp.c:1048
+#, c-format
+msgid "It could refer to either a PL/pgSQL variable or a table column."
+msgstr ""
+
+#: pl_comp.c:1228
+#: pl_comp.c:1256
+#: pl_exec.c:3922
+#: pl_exec.c:4268
+#: pl_exec.c:4354
+#: pl_exec.c:4445
+#, c-format
+msgid "record \"%s\" has no field \"%s\""
+msgstr "\"%s\" kaydı \"%s\" alanını içermiyor"
+
+#: pl_comp.c:1784
+#, c-format
+msgid "relation \"%s\" does not exist"
+msgstr "\"%s\" nesnesi mevcut deÄŸil"
+
+#: pl_comp.c:1893
+#, c-format
+msgid "variable \"%s\" has pseudo-type %s"
+msgstr "\"%s\" deÄŸiÅŸkeni %s pseudo tipine sahip"
+
+#: pl_comp.c:1954
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "\"%s\" bir tablo deÄŸil"
+
+#: pl_comp.c:2114
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr "\"%s\" tipi bir shelldir"
+
+#: pl_comp.c:2187
+#: pl_comp.c:2240
+#, c-format
+msgid "unrecognized exception condition \"%s\""
+msgstr "tanımlanamayan exception durumu \"%s\""
+
+#: pl_comp.c:2398
+#, c-format
+msgid "could not determine actual argument type for polymorphic function \"%s\""
+msgstr ""
+
+#: pl_exec.c:243
+#: pl_exec.c:514
+msgid "during initialization of execution state"
+msgstr "çalıştırma durumu ilklendirmesi sırasında"
+
+#: pl_exec.c:250
+msgid "while storing call arguments into local variables"
+msgstr ""
+
+#: pl_exec.c:305
+#: pl_exec.c:671
+msgid "during function entry"
+msgstr "fonksiyon girişi sırasında"
+
+#: pl_exec.c:336
+#: pl_exec.c:702
+#, c-format
+msgid "CONTINUE cannot be used outside a loop"
+msgstr "CONTINUE bir döngü dışında kullanılamaz"
+
+#: pl_exec.c:340
+#, c-format
+msgid "control reached end of function without RETURN"
+msgstr "control fonksiyonun sonuna RETURNsüz ulaştı"
+
+#: pl_exec.c:347
+msgid "while casting return value to function's return type"
+msgstr ""
+
+#: pl_exec.c:360
+#: pl_exec.c:2629
+#, c-format
+msgid "set-valued function called in context that cannot accept a set"
+msgstr "set değerini kabul etmediği ortamda set değeri alan fonksiyon çağırılmış"
+
+#: pl_exec.c:398
+msgid "returned record type does not match expected record type"
+msgstr ""
+
+#: pl_exec.c:456
+#: pl_exec.c:710
+msgid "during function exit"
+msgstr "fonksiyon çıkışı sırasında"
+
+#: pl_exec.c:706
+#, c-format
+msgid "control reached end of trigger procedure without RETURN"
+msgstr "trigger yordamı RETURN olmadan bitti"
+
+#: pl_exec.c:715
+#, c-format
+msgid "trigger procedure cannot return a set"
+msgstr "trigger yordamı bir küme döndüremez"
+
+#: pl_exec.c:737
+msgid "returned row structure does not match the structure of the triggering table"
+msgstr ""
+
+#: pl_exec.c:800
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d %s"
+msgstr "PL/pgSQL fonksiyonu \"%s\" satır %d %s"
+
+#: pl_exec.c:811
+#, c-format
+msgid "PL/pgSQL function \"%s\" %s"
+msgstr "PL/pgSQL fonksiyonu \"%s\" %s"
+
+#. translator: last %s is a plpgsql statement type name
+#: pl_exec.c:819
+#, c-format
+msgid "PL/pgSQL function \"%s\" line %d at %s"
+msgstr "\"%s\" PL/pgSQL fonksiyonu, %d. satır, %s içinde"
+
+#: pl_exec.c:825
+#, c-format
+msgid "PL/pgSQL function \"%s\""
+msgstr "PL/pgSQL fonksiyonu \"%s\""
+
+#: pl_exec.c:933
+msgid "during statement block local variable initialization"
+msgstr ""
+
+#: pl_exec.c:975
+#, c-format
+msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
+msgstr "NOT NULL olarak belirtilen \"%s\" değişkeni öntanımlı olarak NULL olamaz"
+
+#: pl_exec.c:1025
+msgid "during statement block entry"
+msgstr "ifade bloğu girişi sırasında"
+
+#: pl_exec.c:1046
+msgid "during statement block exit"
+msgstr "ifade bloğu çıkışı sırasında"
+
+#: pl_exec.c:1089
+msgid "during exception cleanup"
+msgstr "exception temizlemesi sırasında"
+
+#: pl_exec.c:1436
+#, c-format
+msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
+msgstr ""
+
+#: pl_exec.c:1608
+#, c-format
+msgid "case not found"
+msgstr "case bulunamadı"
+
+#: pl_exec.c:1609
+#, c-format
+msgid "CASE statement is missing ELSE part."
+msgstr "CASE ifadesindeki ELSE eksik."
+
+#: pl_exec.c:1763
+#, c-format
+msgid "lower bound of FOR loop cannot be null"
+msgstr "FOR döngüsünün alt sınırı null olamaz"
+
+#: pl_exec.c:1778
+#, c-format
+msgid "upper bound of FOR loop cannot be null"
+msgstr "For döngüsünün üst sınırı null olamaz"
+
+#: pl_exec.c:1795
+#, c-format
+msgid "BY value of FOR loop cannot be null"
+msgstr "FOR döngüsünün BY değeri null olamaz"
+
+#: pl_exec.c:1801
+#, c-format
+msgid "BY value of FOR loop must be greater than zero"
+msgstr "FOR döngüsünn BY değeri sıfırdan büyük olmalıdır"
+
+#: pl_exec.c:1971
+#: pl_exec.c:3433
+#, c-format
+msgid "cursor \"%s\" already in use"
+msgstr "\"%s\" imleci kullanımda"
+
+#: pl_exec.c:1994
+#: pl_exec.c:3495
+#, c-format
+msgid "arguments given for cursor without arguments"
+msgstr ""
+
+#: pl_exec.c:2013
+#: pl_exec.c:3514
+#, c-format
+msgid "arguments required for cursor"
+msgstr "imleç için gereken argümanlar"
+
+#: pl_exec.c:2101
+#, c-format
+msgid "FOREACH expression must not be null"
+msgstr "FOREACH ifadesi NULL olamaz"
+
+#: pl_exec.c:2107
+#, c-format
+msgid "FOREACH expression must yield an array, not type %s"
+msgstr ""
+
+#: pl_exec.c:2124
+#, fuzzy, c-format
+msgid "slice dimension (%d) is out of the valid range 0..%d"
+msgstr "%d indexi  geçerli kapsamın dışındadır: 0..%d"
+
+#: pl_exec.c:2151
+#, c-format
+msgid "FOREACH ... SLICE loop variable must be of an array type"
+msgstr ""
+
+#: pl_exec.c:2155
+#, c-format
+msgid "FOREACH loop variable must not be of an array type"
+msgstr "FOREACH döngü değişkeni dizgi tipinde olamaz"
+
+#: pl_exec.c:2413
+#: gram.y:2929
+#, c-format
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr "SETOF olmayan fonksiyonda RETURN NEXT kullanılamaz"
+
+#: pl_exec.c:2437
+#: pl_exec.c:2503
+#, c-format
+msgid "wrong result type supplied in RETURN NEXT"
+msgstr "RETURN NEXT içinde yanlış dönüş tipi verildi"
+
+#: pl_exec.c:2459
+#: pl_exec.c:3909
+#: pl_exec.c:4226
+#: pl_exec.c:4261
+#: pl_exec.c:4328
+#: pl_exec.c:4347
+#: pl_exec.c:4415
+#: pl_exec.c:4438
+#, c-format
+msgid "record \"%s\" is not assigned yet"
+msgstr "\"%s\" kaydı henüz atanmamış"
+
+#: pl_exec.c:2461
+#: pl_exec.c:3911
+#: pl_exec.c:4228
+#: pl_exec.c:4263
+#: pl_exec.c:4330
+#: pl_exec.c:4349
+#: pl_exec.c:4417
+#: pl_exec.c:4440
+#, c-format
+msgid "The tuple structure of a not-yet-assigned record is indeterminate."
+msgstr ""
+
+#: pl_exec.c:2465
+#: pl_exec.c:2484
+#, c-format
+msgid "wrong record type supplied in RETURN NEXT"
+msgstr "RETURN NEXT içinde yanlış kayıt tipi verildi"
+
+#: pl_exec.c:2526
+#, c-format
+msgid "RETURN NEXT must have a parameter"
+msgstr "RETURN NEXT bir parameter içermeli"
+
+#: pl_exec.c:2557
+#: gram.y:2988
+#, c-format
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr "RETURN QUERY, SETOF olmayan bir fonksiyon içinde bulunamaz"
+
+#: pl_exec.c:2577
+msgid "structure of query does not match function result type"
+msgstr "sorgunun yapısı fonksiyonun sonuç tipine uymuyor"
+
+#: pl_exec.c:2675
+#, c-format
+msgid "RAISE without parameters cannot be used outside an exception handler"
+msgstr ""
+
+#: pl_exec.c:2716
+#, c-format
+msgid "too few parameters specified for RAISE"
+msgstr "RAISE için çok az parametre var"
+
+#: pl_exec.c:2742
+#, c-format
+msgid "too many parameters specified for RAISE"
+msgstr "RAISE için çok fazla parametre var"
+
+#: pl_exec.c:2762
+#, c-format
+msgid "RAISE statement option cannot be null"
+msgstr "RAISE ifadesi seçeneği null olamaz"
+
+#: pl_exec.c:2772
+#: pl_exec.c:2781
+#: pl_exec.c:2789
+#: pl_exec.c:2797
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "RAISE seçeneği zaten belirtilmiş: %s"
+
+#: pl_exec.c:2833
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pl_exec.c:2983
+#: pl_exec.c:3119
+#: pl_exec.c:3298
+#, c-format
+msgid "cannot COPY to/from client in PL/pgSQL"
+msgstr "PL/pgSQL'de istemcide ya da istemciden COPY çalıştırılamaz"
+
+#: pl_exec.c:2987
+#: pl_exec.c:3123
+#: pl_exec.c:3302
+#, c-format
+msgid "cannot begin/end transactions in PL/pgSQL"
+msgstr "PL/pgSQL'de transactionlar başlatılıp durdurulamazlar"
+
+#: pl_exec.c:2988
+#: pl_exec.c:3124
+#: pl_exec.c:3303
+#, c-format
+msgid "Use a BEGIN block with an EXCEPTION clause instead."
+msgstr "Bunun yerine BEGIN bloğunu EXCEPTION yantümcesi ile kullanın."
+
+#: pl_exec.c:3147
+#: pl_exec.c:3327
+#, c-format
+msgid "INTO used with a command that cannot return data"
+msgstr "Veri döndüremeyen bir komutta INTO kullanıldı"
+
+#: pl_exec.c:3167
+#: pl_exec.c:3347
+#, c-format
+msgid "query returned no rows"
+msgstr "sorgu satır döndürmedi"
+
+#: pl_exec.c:3176
+#: pl_exec.c:3356
+#, c-format
+msgid "query returned more than one row"
+msgstr "sorgu birden fazla satır döndürdü"
+
+#: pl_exec.c:3190
+#, c-format
+msgid "query has no destination for result data"
+msgstr "Sorgu sonuç verisi için bir hedef içermiyor"
+
+#: pl_exec.c:3191
+#, c-format
+msgid "If you want to discard the results of a SELECT, use PERFORM instead."
+msgstr "SELECT'den gelen sonuçları gözardı etmek istiyorsanız SELECT yerine PERFORM kullanın."
+
+#: pl_exec.c:3224
+#: pl_exec.c:5989
+#, c-format
+msgid "query string argument of EXECUTE is null"
+msgstr ""
+
+#: pl_exec.c:3289
+#, c-format
+msgid "EXECUTE of SELECT ... INTO is not implemented"
+msgstr "EXECUTE of SELECT ... INTO kodlanmadı"
+
+#: pl_exec.c:3290
+#, c-format
+msgid "You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS instead."
+msgstr "Bunun yerine, EXECUTE ... INTO ya da EXECUTE CREATE TABLE ... AS kullanmak isteyebilirsiniz."
+
+#: pl_exec.c:3578
+#: pl_exec.c:3669
+#, c-format
+msgid "cursor variable \"%s\" is null"
+msgstr "\"%s\" imleç değişkeni null'dır"
+
+#: pl_exec.c:3585
+#: pl_exec.c:3676
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "\"%s\" imleci mevcut deÄŸil"
+
+#: pl_exec.c:3599
+#, c-format
+msgid "relative or absolute cursor position is null"
+msgstr "bağıl ya da mutlak imleç pozisyonu null"
+
+#: pl_exec.c:3762
+#, c-format
+msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
+msgstr ""
+
+#: pl_exec.c:3820
+#, c-format
+msgid "cannot assign non-composite value to a row variable"
+msgstr ""
+
+#: pl_exec.c:3862
+#, c-format
+msgid "cannot assign non-composite value to a record variable"
+msgstr ""
+
+#: pl_exec.c:4033
+#, c-format
+msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
+msgstr "dizin boyut sayısı (%d), izin verilern en yüksek değerini (%d) aşmaktadır"
+
+#: pl_exec.c:4052
+#, c-format
+msgid "subscripted object is not an array"
+msgstr ""
+
+#: pl_exec.c:4075
+#, c-format
+msgid "array subscript in assignment must not be null"
+msgstr "atamada array subscript null olamaz"
+
+#: pl_exec.c:4553
+#, c-format
+msgid "query \"%s\" did not return data"
+msgstr "\"%s\" sorgusu veri döndürmedi"
+
+#: pl_exec.c:4561
+#, c-format
+msgid "query \"%s\" returned %d column"
+msgid_plural "query \"%s\" returned %d columns"
+msgstr[0] "\"%s\" sorgusu %d kolon döndürdü"
+
+#: pl_exec.c:4587
+#, c-format
+msgid "query \"%s\" returned more than one row"
+msgstr "\"%s\" sorgusu birden fazla satır döndürdü"
+
+#: pl_exec.c:4645
+#, c-format
+msgid "query \"%s\" is not a SELECT"
+msgstr "\"%s\" sorgusu bir SELECT deÄŸil"
+
+#: gram.y:438
+#, c-format
+msgid "block label must be placed before DECLARE, not after"
+msgstr "blok etiketi DECLARE'den önce yerleştirilmelidir, sonra değil."
+
+#: gram.y:458
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "%s veri tipinde collation desteklenmemektedir"
+
+#: gram.y:473
+#, c-format
+msgid "row or record variable cannot be CONSTANT"
+msgstr "Satır ya da kayıt değişkeni CONSTANT olamaz"
+
+#: gram.y:483
+#, c-format
+msgid "row or record variable cannot be NOT NULL"
+msgstr "satır ya da kayıt değişkeni NOT NULL olamaz"
+
+#: gram.y:494
+#, c-format
+msgid "default value for row or record variable is not supported"
+msgstr "satır ya da kayıt değişkenlerine öntanımlı değer atanması desteklenmiyor"
+
+#: gram.y:639
+#: gram.y:665
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "\"%s\" deÄŸiÅŸkeni mevcut deÄŸil"
+
+#: gram.y:683
+#: gram.y:696
+msgid "duplicate declaration"
+msgstr "tekrarlanmış veri tipi deklarasyonu"
+
+#: gram.y:869
+#, c-format
+msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
+msgstr ""
+
+#: gram.y:882
+#, c-format
+msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
+msgstr ""
+
+#: gram.y:959
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "tanımlanamayan GET DIAGNOSTICS öğesi"
+
+#: gram.y:970
+#: gram.y:3175
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" scalar bir deÄŸiÅŸken deÄŸil"
+
+#: gram.y:1232
+#: gram.y:1425
+#, c-format
+msgid "loop variable of loop over rows must be a record or row variable or list of scalar variables"
+msgstr ""
+
+#: gram.y:1266
+#, c-format
+msgid "cursor FOR loop must have only one target variable"
+msgstr ""
+
+#: gram.y:1273
+#, c-format
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr ""
+
+#: gram.y:1356
+#, c-format
+msgid "integer FOR loop must have only one target variable"
+msgstr "Tamsayı FOR döngüsünde sadece bir tane hedef değişken olabilir"
+
+#: gram.y:1392
+#, c-format
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "FOR döngü sorgusu içinde REVERSE belirtilemez"
+
+#: gram.y:1539
+#, c-format
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr ""
+
+#: gram.y:1591
+#: gram.y:1628
+#: gram.y:1676
+#: gram.y:2625
+#: gram.y:2706
+#: gram.y:2817
+#: gram.y:3450
+msgid "unexpected end of function definition"
+msgstr "fonksiyon tanımında beklenmeyen sonlanma"
+
+#: gram.y:1696
+#: gram.y:1720
+#: gram.y:1732
+#: gram.y:1739
+#: gram.y:1828
+#: gram.y:1836
+#: gram.y:1850
+#: gram.y:1945
+#: gram.y:2126
+#: gram.y:2205
+#: gram.y:2327
+#: gram.y:2906
+#: gram.y:2970
+#: gram.y:3410
+#: gram.y:3431
+msgid "syntax error"
+msgstr "söz dizim hatası "
+
+#: gram.y:1724
+#: gram.y:1726
+#: gram.y:2130
+#: gram.y:2132
+msgid "invalid SQLSTATE code"
+msgstr "geçersiz SQLSTATE kodu"
+
+#: gram.y:1892
+msgid "syntax error, expected \"FOR\""
+msgstr "sözdizimi hatası, \"FOR\" bekleniyordu"
+
+#: gram.y:1954
+#, c-format
+msgid "FETCH statement cannot return multiple rows"
+msgstr "RAISE ifadesi çoklu satır döndüremez"
+
+#: gram.y:2010
+#, c-format
+msgid "cursor variable must be a simple variable"
+msgstr "imleç değişkeni basit bir değişken olmalıdır"
+
+#: gram.y:2016
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "\"%s\" değişkeni cursor ya da refcursor tiplerinden birisi olmalıdır"
+
+#: gram.y:2184
+msgid "label does not exist"
+msgstr "etiket bulunamadı"
+
+#: gram.y:2298
+#: gram.y:2309
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" bilinen bir deÄŸiÅŸken deÄŸil"
+
+#: gram.y:2411
+#: gram.y:2421
+#: gram.y:2549
+msgid "mismatched parentheses"
+msgstr "eÅŸlenmemiÅŸ parantezler"
+
+#: gram.y:2425
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "SQL ifadesinin sonunda eksik \"%s\" "
+
+#: gram.y:2431
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "SQL ifadesinin sonunda \"%s\" eksik"
+
+#: gram.y:2448
+msgid "missing expression"
+msgstr "eksik ifade"
+
+#: gram.y:2450
+msgid "missing SQL statement"
+msgstr "eksik SQL ifadesi"
+
+#: gram.y:2551
+msgid "incomplete data type declaration"
+msgstr "eksik veri tipi deklarasyonu"
+
+#: gram.y:2574
+msgid "missing data type declaration"
+msgstr "eksik veri tipi deklarasyonu"
+
+#: gram.y:2630
+msgid "INTO specified more than once"
+msgstr "INTO birden fazla belirtildi"
+
+#: gram.y:2798
+msgid "expected FROM or IN"
+msgstr "FROM ya da IN bekleniyordu"
+
+#: gram.y:2858
+#, c-format
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "RETURN, fonksiyon return set içinde parametre alamaz"
+
+#: gram.y:2859
+#, c-format
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "RETURN NEXT ya da RETURN QUERY kullanın."
+
+#: gram.y:2867
+#, c-format
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "RETURN, OUT parametreleri olan fonksiyonda parametre içeremez"
+
+#: gram.y:2876
+#, c-format
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "RETURN, void dönen bir fonksiyonda parametre alamaz"
+
+#: gram.y:2894
+#: gram.y:2901
+#, c-format
+msgid "RETURN must specify a record or row variable in function returning row"
+msgstr ""
+
+#: gram.y:2943
+#, c-format
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "RETURN NEXT OUT parametreleri olan fonksiyonda parametre içeremez"
+
+#: gram.y:2958
+#: gram.y:2965
+#, c-format
+msgid "RETURN NEXT must specify a record or row variable in function returning row"
+msgstr "RETURN NEXT satır döndüren fonksiyonda kayıt ya da satır değişkeni belirtmelidir"
+
+#: gram.y:3044
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\" CONSTANT olarak deklare edilmiÅŸ"
+
+#: gram.y:3106
+#: gram.y:3118
+#, c-format
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr ""
+
+#: gram.y:3163
+#, c-format
+msgid "too many INTO variables specified"
+msgstr "çok fazla INTO değişkeni belirtilmiş"
+
+#: gram.y:3371
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr ""
+
+#: gram.y:3378
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr ""
+
+#: gram.y:3405
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "\"%s\" imlecinin argümanı yok"
+
+#: gram.y:3419
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "\"%s\" imlecinin argümanları var"
+
+#: gram.y:3467
+msgid "unrecognized RAISE statement option"
+msgstr "tanımsız RAISE ifadesi seçeneği"
+
+#: gram.y:3471
+msgid "syntax error, expected \"=\""
+msgstr "sözdizimi hatası, \"=\" bekleniyordu"
+
+#: pl_funcs.c:218
+msgid "statement block"
+msgstr "ifade bloÄŸu"
+
+#: pl_funcs.c:220
+msgid "assignment"
+msgstr "atama"
+
+#: pl_funcs.c:230
+msgid "FOR with integer loop variable"
+msgstr "tamsayı döngüsünde FOR"
+
+#: pl_funcs.c:232
+msgid "FOR over SELECT rows"
+msgstr "FOR over SELECT rows"
+
+#: pl_funcs.c:234
+msgid "FOR over cursor"
+msgstr "FOR over cursor"
+
+#: pl_funcs.c:236
+msgid "FOREACH over array"
+msgstr "FOREACH dizgi üstünde"
+
+#: pl_funcs.c:248
+msgid "SQL statement"
+msgstr "SQL ifadesi"
+
+#: pl_funcs.c:250
+msgid "EXECUTE statement"
+msgstr "EXECUTE ifadesi"
+
+#: pl_funcs.c:252
+msgid "FOR over EXECUTE statement"
+msgstr "EXECUTE ifadesinde FOR"
+
+#: pl_handler.c:60
+msgid "Sets handling of conflicts between PL/pgSQL variable names and table column names."
+msgstr ""
+
+#. translator: %s is typically the translation of "syntax error"
+#: pl_scanner.c:474
+#, c-format
+msgid "%s at end of input"
+msgstr "giriÅŸ sonuna %s"
+
+#. translator: first %s is typically the translation of "syntax error"
+#: pl_scanner.c:490
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "\"%2$s\"  yerinde %1$s"
+
+#~ msgid "relation \"%s.%s\" does not exist"
+#~ msgstr "\"%s.%s\" nesnesi mevcut deÄŸil"
+
+#~ msgid "expected \"[\""
+#~ msgstr " \"[\" bekleniyordu"
+
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "\"%s\" satırının bir alanı yok \"%s\""
+
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "\"%s.%s\" satırında \"%s\" alanı yok."
+
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (silinmiÅŸ kolon)"
+
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr ""
+#~ "Dönen kolonların sayısı (%d) beklenen kolon sayısı (%d) ile eşleşmiyor."
+
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "fonksiyonun \"%s\" parametresi var"
+
+#~ msgid "expected an integer variable"
+#~ msgstr "tamsayı değişken bekleniyordu"
+
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "\"%s\" içinde sözdizimi hatası"
+
+#~ msgid "expected a cursor or refcursor variable"
+#~ msgstr "cursor ya da refcursonr deÄŸiÅŸkeni beklendi"
+
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "SQL ifadesinde çok fazla değişken belirtilmiş"
+
+#~ msgid "cannot assign to tg_argv"
+#~ msgstr "tg_argv'ye atama yapılamadı"
+
+#~ msgid "expected \")\""
+#~ msgstr "\")\" bekleniyordu"
+
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "\"%s\" değişkeni mevcut bloğun içinde yok"
+
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "belirteçte sonlandırılmamış *\" : %s"
+
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "sonuçlandırılmamış tırnakla sınırlandırılmış tanım"
+
+#~ msgid "unterminated /* comment"
+#~ msgstr "/* açıklama sonlandırılmamış"
+
+#~ msgid "unterminated quoted string"
+#~ msgstr "sonuçlandırılmamış tırnakla sınırlandırılmış satır"
+
+#~ msgid "unterminated dollar-quoted string"
+#~ msgstr "sonuçlandırılmamış dolar işeretiyle sınırlandırılmış satır"
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 2c0575501a488..df07fc2ced089 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -40,9 +40,10 @@ NAME = plpython$(python_majorversion)
 
 OBJS = plpython.o
 
-DATA = plpythonu.control plpythonu--1.0.sql plpythonu--unpackaged--1.0.sql \
-       plpython2u.control plpython2u--1.0.sql plpython2u--unpackaged--1.0.sql \
-       plpython3u.control plpython3u--1.0.sql plpython3u--unpackaged--1.0.sql
+DATA = $(NAME)u.control $(NAME)u--1.0.sql $(NAME)u--unpackaged--1.0.sql
+ifeq ($(python_majorversion),2)
+DATA += plpythonu.control plpythonu--1.0.sql plpythonu--unpackaged--1.0.sql
+endif
 
 
 # Python on win32 ships with import libraries only for Microsoft Visual C++,
@@ -95,16 +96,8 @@ PSQLDIR = $(bindir)
 
 include $(top_srcdir)/src/Makefile.shlib
 
-# Force this dependency to be known even without dependency info built:
-plpython.o: spiexceptions.h
-
-spiexceptions.h: $(top_srcdir)/src/backend/utils/errcodes.txt generate-spiexceptions.pl
-	$(PERL) $(srcdir)/generate-spiexceptions.pl $< > $@
-
 all: all-lib
 
-distprep: spiexceptions.h
-
 
 install: all install-lib install-data
 
@@ -151,13 +144,13 @@ installcheck: submake prep3
 	$(pg_regress_installcheck) --inputdir=./python3 --outputdir=./python3 $(REGRESS_OPTS) $(REGRESS)
 
 clean: clean3
-else
+else # not Python 3
 check: submake
 	$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
 
 installcheck: submake
 	$(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)
-endif
+endif # not Python 3
 
 .PHONY: submake
 submake:
@@ -170,9 +163,6 @@ ifeq ($(PORTNAME), win32)
 	rm -f python${pytverstr}.def
 endif
 
-maintainer-clean: distclean
-	rm -f spiexceptions.h
-
 else # can't build
 
 all:
@@ -183,3 +173,16 @@ all:
 	 echo ""
 
 endif # can't build
+
+# distprep and maintainer-clean rules should be run even if we can't build.
+
+# Force this dependency to be known even without dependency info built:
+plpython.o: spiexceptions.h
+
+spiexceptions.h: $(top_srcdir)/src/backend/utils/errcodes.txt generate-spiexceptions.pl
+	$(PERL) $(srcdir)/generate-spiexceptions.pl $< > $@
+
+distprep: spiexceptions.h
+
+maintainer-clean: distclean
+	rm -f spiexceptions.h
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
index dbf19fda9b9ea..bab07fbeb24b7 100644
--- a/src/pl/plpython/expected/plpython_error.out
+++ b/src/pl/plpython/expected/plpython_error.out
@@ -351,6 +351,28 @@ CONTEXT:  PL/Python function "specific_exception"
  
 (1 row)
 
+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
+ */
+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
+plpy.execute("insert into specific values (1)")
+plpy.execute("insert into specific values (1)")
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
+begin
+    begin
+        perform python_unique_violation();
+    exception when unique_violation then
+        return 'ok';
+    end;
+    return 'not reached';
+end;
+$$ language plpgsql;
+SELECT catch_python_unique_violation();
+ catch_python_unique_violation 
+-------------------------------
+ ok
+(1 row)
+
 /* manually starting subtransactions - a bad idea
  */
 CREATE FUNCTION manual_subxact() RETURNS void AS $$
diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
index b2194ffccfb67..6cb2ed091bf43 100644
--- a/src/pl/plpython/expected/plpython_error_0.out
+++ b/src/pl/plpython/expected/plpython_error_0.out
@@ -351,6 +351,28 @@ CONTEXT:  PL/Python function "specific_exception"
  
 (1 row)
 
+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
+ */
+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
+plpy.execute("insert into specific values (1)")
+plpy.execute("insert into specific values (1)")
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
+begin
+    begin
+        perform python_unique_violation();
+    exception when unique_violation then
+        return 'ok';
+    end;
+    return 'not reached';
+end;
+$$ language plpgsql;
+SELECT catch_python_unique_violation();
+ catch_python_unique_violation 
+-------------------------------
+ ok
+(1 row)
+
 /* manually starting subtransactions - a bad idea
  */
 CREATE FUNCTION manual_subxact() RETURNS void AS $$
diff --git a/src/pl/plpython/expected/plpython_record.out b/src/pl/plpython/expected/plpython_record.out
index 7c600896ecf4f..0bcc46c55d118 100644
--- a/src/pl/plpython/expected/plpython_record.out
+++ b/src/pl/plpython/expected/plpython_record.out
@@ -308,6 +308,27 @@ SELECT * FROM test_inout_params('test_in');
  test_in_inout
 (1 row)
 
+-- try changing the return types and call functions again
+ALTER TABLE table_record DROP COLUMN first;
+ALTER TABLE table_record DROP COLUMN second;
+ALTER TABLE table_record ADD COLUMN first text;
+ALTER TABLE table_record ADD COLUMN second int4;
+SELECT * FROM test_table_record_as('obj', 'one', 1, false);
+ first | second 
+-------+--------
+ one   |      1
+(1 row)
+
+ALTER TYPE type_record DROP ATTRIBUTE first;
+ALTER TYPE type_record DROP ATTRIBUTE second;
+ALTER TYPE type_record ADD ATTRIBUTE first text;
+ALTER TYPE type_record ADD ATTRIBUTE second int4;
+SELECT * FROM test_type_record_as('obj', 'one', 1, false);
+ first | second 
+-------+--------
+ one   |      1
+(1 row)
+
 -- errors cases
 CREATE FUNCTION test_type_record_error1() RETURNS type_record AS $$
     return { 'first': 'first' }
diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk
index 6d2716885d871..d17ee678f32ad 100644
--- a/src/pl/plpython/nls.mk
+++ b/src/pl/plpython/nls.mk
@@ -1,5 +1,5 @@
 # src/pl/plpython/nls.mk
 CATALOG_NAME	:= plpython
-AVAIL_LANGUAGES	:= de es fr it ja pt_BR ro tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr ja pl pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES	:= plpython.c
 GETTEXT_TRIGGERS:= errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 9081cffb498be..530b5f03521ff 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -343,7 +343,7 @@ static char *PLy_procedure_name(PLyProcedure *);
 static void
 PLy_elog(int, const char *,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
-static void PLy_get_spi_error_data(PyObject *exc, char **detail, char **hint, char **query, int *position);
+static void PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint, char **query, int *position);
 static void PLy_traceback(char **, char **, int *);
 
 static void *PLy_malloc(size_t);
@@ -1449,6 +1449,44 @@ PLy_function_delete_args(PLyProcedure *proc)
 			PyDict_DelItemString(proc->globals, proc->argnames[i]);
 }
 
+/*
+ * Check if our cached information about a datatype is still valid
+ */
+static bool
+PLy_procedure_argument_valid(PLyTypeInfo *arg)
+{
+	HeapTuple	relTup;
+	bool		valid;
+
+	/* Nothing to cache unless type is composite */
+	if (arg->is_rowtype != 1)
+		return true;
+
+	/*
+	 * Zero typ_relid means that we got called on an output argument of a
+	 * function returning a unnamed record type; the info for it can't change.
+	 */
+	if (!OidIsValid(arg->typ_relid))
+		return true;
+
+	/* Else we should have some cached data */
+	Assert(TransactionIdIsValid(arg->typrel_xmin));
+	Assert(ItemPointerIsValid(&arg->typrel_tid));
+
+	/* Get the pg_class tuple for the data type */
+	relTup = SearchSysCache1(RELOID, ObjectIdGetDatum(arg->typ_relid));
+	if (!HeapTupleIsValid(relTup))
+		elog(ERROR, "cache lookup failed for relation %u", arg->typ_relid);
+
+	/* If it has changed, the cached data is not valid */
+	valid = (arg->typrel_xmin == HeapTupleHeaderGetXmin(relTup->t_data) &&
+			 ItemPointerEquals(&arg->typrel_tid, &relTup->t_self));
+
+	ReleaseSysCache(relTup);
+
+	return valid;
+}
+
 /*
  * Decide whether a cached PLyProcedure struct is still valid
  */
@@ -1465,39 +1503,21 @@ PLy_procedure_valid(PLyProcedure *proc, HeapTuple procTup)
 		  ItemPointerEquals(&proc->fn_tid, &procTup->t_self)))
 		return false;
 
+	/* Else check the input argument datatypes */
 	valid = true;
-	/* If there are composite input arguments, they might have changed */
 	for (i = 0; i < proc->nargs; i++)
 	{
-		Oid			relid;
-		HeapTuple	relTup;
+		valid = PLy_procedure_argument_valid(&proc->args[i]);
 
 		/* Short-circuit on first changed argument */
 		if (!valid)
 			break;
-
-		/* Only check input arguments that are composite */
-		if (proc->args[i].is_rowtype != 1)
-			continue;
-
-		Assert(OidIsValid(proc->args[i].typ_relid));
-		Assert(TransactionIdIsValid(proc->args[i].typrel_xmin));
-		Assert(ItemPointerIsValid(&proc->args[i].typrel_tid));
-
-		/* Get the pg_class tuple for the argument type */
-		relid = proc->args[i].typ_relid;
-		relTup = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
-		if (!HeapTupleIsValid(relTup))
-			elog(ERROR, "cache lookup failed for relation %u", relid);
-
-		/* If it has changed, the function is not valid */
-		if (!(proc->args[i].typrel_xmin == HeapTupleHeaderGetXmin(relTup->t_data) &&
-			  ItemPointerEquals(&proc->args[i].typrel_tid, &relTup->t_self)))
-			valid = false;
-
-		ReleaseSysCache(relTup);
 	}
 
+	/* if the output type is composite, it might have changed */
+	if (valid)
+		valid = PLy_procedure_argument_valid(&proc->result);
+
 	return valid;
 }
 
@@ -1661,10 +1681,9 @@ PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
 
 		/*
 		 * Now get information required for input conversion of the
-		 * procedure's arguments.  Note that we ignore output arguments here
-		 * --- since we don't support returning record, and that was already
-		 * checked above, there's no need to worry about multiple output
-		 * arguments.
+		 * procedure's arguments.  Note that we ignore output arguments here.
+		 * If the function returns record, those I/O functions will be set up
+		 * when the function is first called.
 		 */
 		if (procStruct->pronargs)
 		{
@@ -1926,7 +1945,7 @@ PLy_input_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
 	 * RECORDOID means we got called to create input functions for a tuple
 	 * fetched by plpy.execute or for an anonymous record type
 	 */
-	if (desc->tdtypeid != RECORDOID && !TransactionIdIsValid(arg->typrel_xmin))
+	if (desc->tdtypeid != RECORDOID)
 	{
 		HeapTuple	relTup;
 
@@ -1936,7 +1955,7 @@ PLy_input_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
 		if (!HeapTupleIsValid(relTup))
 			elog(ERROR, "cache lookup failed for relation %u", arg->typ_relid);
 
-		/* Extract the XMIN value to later use it in PLy_procedure_valid */
+		/* Remember XMIN and TID for later validation if cache is still OK */
 		arg->typrel_xmin = HeapTupleHeaderGetXmin(relTup->t_data);
 		arg->typrel_tid = relTup->t_self;
 
@@ -2010,6 +2029,29 @@ PLy_output_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
 		arg->out.r.atts = PLy_malloc0(desc->natts * sizeof(PLyDatumToOb));
 	}
 
+	Assert(OidIsValid(desc->tdtypeid));
+
+	/*
+	 * RECORDOID means we got called to create output functions for an
+	 * anonymous record type
+	 */
+	if (desc->tdtypeid != RECORDOID)
+	{
+		HeapTuple	relTup;
+
+		/* Get the pg_class tuple corresponding to the type of the output */
+		arg->typ_relid = typeidTypeRelid(desc->tdtypeid);
+		relTup = SearchSysCache1(RELOID, ObjectIdGetDatum(arg->typ_relid));
+		if (!HeapTupleIsValid(relTup))
+			elog(ERROR, "cache lookup failed for relation %u", arg->typ_relid);
+
+		/* Remember XMIN and TID for later validation if cache is still OK */
+		arg->typrel_xmin = HeapTupleHeaderGetXmin(relTup->t_data);
+		arg->typrel_tid = relTup->t_self;
+
+		ReleaseSysCache(relTup);
+	}
+
 	for (i = 0; i < desc->natts; i++)
 	{
 		HeapTuple	typeTup;
@@ -2630,7 +2672,11 @@ PLyMapping_ToTuple(PLyTypeInfo *info, TupleDesc desc, PyObject *mapping)
 		PLyObToDatum *att;
 
 		if (desc->attrs[i]->attisdropped)
+		{
+			values[i] = (Datum) 0;
+			nulls[i] = true;
 			continue;
+		}
 
 		key = NameStr(desc->attrs[i]->attname);
 		value = NULL;
@@ -2716,7 +2762,11 @@ PLySequence_ToTuple(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
 		PLyObToDatum *att;
 
 		if (desc->attrs[i]->attisdropped)
+		{
+			values[i] = (Datum) 0;
+			nulls[i] = true;
 			continue;
+		}
 
 		value = NULL;
 		att = &info->out.r.atts[i];
@@ -2779,7 +2829,11 @@ PLyGenericObject_ToTuple(PLyTypeInfo *info, TupleDesc desc, PyObject *object)
 		PLyObToDatum *att;
 
 		if (desc->attrs[i]->attisdropped)
+		{
+			values[i] = (Datum) 0;
+			nulls[i] = true;
 			continue;
+		}
 
 		key = NameStr(desc->attrs[i]->attname);
 		value = NULL;
@@ -3972,7 +4026,13 @@ PLy_add_exceptions(PyObject *plpy)
 }
 
 #if PY_MAJOR_VERSION >= 3
-static PyMODINIT_FUNC
+/*
+ * Must have external linkage, because PyMODINIT_FUNC does dllexport on
+ * Windows-like platforms.
+ */
+PyMODINIT_FUNC PyInit_plpy(void);
+
+PyMODINIT_FUNC
 PyInit_plpy(void)
 {
 	PyObject   *m;
@@ -4344,7 +4404,7 @@ PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
 	if (!spierror)
 		goto failure;
 
-	spidata = Py_BuildValue("(zzzi)", edata->detail, edata->hint,
+	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
 							edata->internalquery, edata->internalpos);
 	if (!spidata)
 		goto failure;
@@ -4384,6 +4444,7 @@ PLy_elog(int elevel, const char *fmt,...)
 			   *val,
 			   *tb;
 	const char *primary = NULL;
+	int        sqlerrcode = 0;
 	char	   *detail = NULL;
 	char	   *hint = NULL;
 	char	   *query = NULL;
@@ -4393,7 +4454,7 @@ PLy_elog(int elevel, const char *fmt,...)
 	if (exc != NULL)
 	{
 		if (PyErr_GivenExceptionMatches(val, PLy_exc_spi_error))
-			PLy_get_spi_error_data(val, &detail, &hint, &query, &position);
+			PLy_get_spi_error_data(val, &sqlerrcode, &detail, &hint, &query, &position);
 		else if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
 			elevel = FATAL;
 	}
@@ -4434,8 +4495,9 @@ PLy_elog(int elevel, const char *fmt,...)
 	PG_TRY();
 	{
 		ereport(elevel,
-				(errmsg("%s", primary ? primary : "no exception data"),
-				 (detail) ? errdetail("%s", detail) : 0,
+				(errcode(sqlerrcode ? sqlerrcode : ERRCODE_INTERNAL_ERROR),
+				 errmsg_internal("%s", primary ? primary : "no exception data"),
+				 (detail) ? errdetail_internal("%s", detail) : 0,
 				 (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0,
 				 (hint) ? errhint("%s", hint) : 0,
 				 (query) ? internalerrquery(query) : 0,
@@ -4465,7 +4527,7 @@ PLy_elog(int elevel, const char *fmt,...)
  * Extract the error data from a SPIError
  */
 static void
-PLy_get_spi_error_data(PyObject *exc, char **detail, char **hint, char **query, int *position)
+PLy_get_spi_error_data(PyObject *exc, int* sqlerrcode, char **detail, char **hint, char **query, int *position)
 {
 	PyObject   *spidata = NULL;
 
@@ -4473,7 +4535,7 @@ PLy_get_spi_error_data(PyObject *exc, char **detail, char **hint, char **query,
 	if (!spidata)
 		goto cleanup;
 
-	if (!PyArg_ParseTuple(spidata, "zzzi", detail, hint, query, position))
+	if (!PyArg_ParseTuple(spidata, "izzzi", sqlerrcode, detail, hint, query, position))
 		goto cleanup;
 
 cleanup:
diff --git a/src/pl/plpython/plpython2u--1.0.sql b/src/pl/plpython/plpython2u--1.0.sql
index 0e4787650207a..e3a12b952eef7 100644
--- a/src/pl/plpython/plpython2u--1.0.sql
+++ b/src/pl/plpython/plpython2u--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE plpython2u;
+
+COMMENT ON PROCEDURAL LANGUAGE plpython2u IS 'PL/Python2U untrusted procedural language';
diff --git a/src/pl/plpython/plpython3u--1.0.sql b/src/pl/plpython/plpython3u--1.0.sql
index d5c6e5ab96aef..cd1fb636a00ad 100644
--- a/src/pl/plpython/plpython3u--1.0.sql
+++ b/src/pl/plpython/plpython3u--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE plpython3u;
+
+COMMENT ON PROCEDURAL LANGUAGE plpython3u IS 'PL/Python3U untrusted procedural language';
diff --git a/src/pl/plpython/plpythonu--1.0.sql b/src/pl/plpython/plpythonu--1.0.sql
index beb0aa1645777..61d3d554c930d 100644
--- a/src/pl/plpython/plpythonu--1.0.sql
+++ b/src/pl/plpython/plpythonu--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE plpythonu;
+
+COMMENT ON PROCEDURAL LANGUAGE plpythonu IS 'PL/PythonU untrusted procedural language';
diff --git a/src/pl/plpython/po/cs.po b/src/pl/plpython/po/cs.po
new file mode 100644
index 0000000000000..9a9d0017ac41c
--- /dev/null
+++ b/src/pl/plpython/po/cs.po
@@ -0,0 +1,363 @@
+# LANGUAGE message translation file for plpython
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-04 02:52+0000\n"
+"PO-Revision-Date: 2011-09-06 12:33+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.2\n"
+
+#: plpython.c:475
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "PL/Python funkce \"%s\""
+
+#: plpython.c:482
+msgid "PL/Python anonymous code block"
+msgstr "PL/Python anonymní blok kódu"
+
+#: plpython.c:489
+msgid "while modifying trigger row"
+msgstr "během modifikace řádku triggeru"
+
+#: plpython.c:496
+msgid "while creating return value"
+msgstr "během vytváření návratové hodnoty"
+
+#: plpython.c:707 plpython.c:733
+msgid "unexpected return value from trigger procedure"
+msgstr "neo�ekávaná návratová hodnota z trigger procedury"
+
+#: plpython.c:708
+msgid "Expected None or a string."
+msgstr "O�ekáváno None nebo řetězec."
+
+#: plpython.c:723
+msgid ""
+"PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
+msgstr ""
+"PL/Python trigger funkce vrátila \"MODIFY\" v DELETE triggeru -- ignorováno"
+
+#: plpython.c:734
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "O�ekáváno None, \"OK\", \"SKIP\", nebo \"MODIFY\"."
+
+#: plpython.c:786
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "TD[\"new\"] smazáno, nelze modifikovat řádek"
+
+#: plpython.c:789
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] není slovník"
+
+#: plpython.c:813
+#, c-format
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
+msgstr "TD[\"new\"] klí� slovníku na pozici %d není řetězec"
+
+#: plpython.c:819
+#, c-format
+msgid ""
+"key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
+"row"
+msgstr ""
+"klí� \"%s\" nalezený v TD[\"new\"] neexistuje jako sloupec v triggering řádku"
+
+#: plpython.c:915
+msgid "could not create new dictionary while building trigger arguments"
+msgstr "během vytváření argumentů triggeru nelze vytvářet nový slovník"
+
+#: plpython.c:1122
+msgid "unsupported set function return mode"
+msgstr "nepodporovaný návratový mód funkce vracející tabulku"
+
+#: plpython.c:1123
+msgid ""
+"PL/Python set-returning functions only support returning only value per call."
+msgstr ""
+"PL/Python funkce vracející tabulku podporují pouze vracení hodnoty pro každé "
+"volání."
+
+#: plpython.c:1135
+msgid "returned object cannot be iterated"
+msgstr "přes vrácený objekt nelze iterovat"
+
+#: plpython.c:1136
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr "PL/Python funkce vracející tabulku musí vracet iterovatelný objekt."
+
+#: plpython.c:1161
+msgid "error fetching next item from iterator"
+msgstr "chyba při na�ítání další položky z iterátoru"
+
+#: plpython.c:1196
+msgid "PL/Python function with return type \"void\" did not return None"
+msgstr ""
+"PL/Python funkce s návratovým typem \"void\" nevrátila hodnotu \"None\""
+
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "vynucené ukon�ení subtransakce která nebyla dokon�ena"
+
+#: plpython.c:1403
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "volání PyList_SetItem() selhalo během vytváření argumentů"
+
+#: plpython.c:1407
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "volání PyDict_SetItemString() selhalo během přípravy argumentů"
+
+#: plpython.c:1419
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"funkce vracející záznam byla volána v kontextu který neumožňuje příjem záznamů"
+
+#: plpython.c:1653
+msgid "trigger functions can only be called as triggers"
+msgstr ""
+"funkce pro obsluhu triggerů mohou být volané pouze prostřednictvím triggerů"
+
+#: plpython.c:1658 plpython.c:2131
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "PL/Python funkce nemohou vracet typ %s"
+
+#: plpython.c:1740
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "PL/Python funkce nepodporují typ %s"
+
+#: plpython.c:1836
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "nelze zkompiloval PL/Python funkci \"%s\""
+
+#: plpython.c:1839
+#| msgid "could not compile PL/Python function \"%s\""
+msgid "could not compile anonymous PL/Python code block"
+msgstr "nelze zkompiloval PL/Python funkci \"%s\""
+
+#: plpython.c:2133
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python nepodporuje konverzi na pole řádkových typů."
+
+#: plpython.c:2342
+msgid "cannot convert multidimensional array to Python list"
+msgstr "vícerozměrné pole nelze převést na Python seznam (list)"
+
+#: plpython.c:2343
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python podporuje pouze jednorozměrná pole."
+
+#: plpython.c:2382
+msgid "could not create new dictionary"
+msgstr "nepodařilo se vytvořit nový slovník"
+
+#: plpython.c:2477
+msgid "could not create bytes representation of Python object"
+msgstr "nepodařilo se vytvořit bytovou reprezentaci Python objektu"
+
+#: plpython.c:2575
+msgid "could not create string representation of Python object"
+msgstr "nepodařilo se vytvořit řetězcovou reprezentaci Python objektu"
+
+#: plpython.c:2586
+msgid ""
+"could not convert Python object into cstring: Python string representation "
+"appears to contain null bytes"
+msgstr ""
+"nepodařilo se převést Python objekt na cstring: zdá se že řetězcová "
+"reprezentace Python objektu obsahuje null byty"
+
+#: plpython.c:2620
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+"návratová hodnota funkce s návratovým typem pole není Python posloupnost "
+"(sequence)"
+
+#: plpython.c:2700
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "klí� \"%s\" nenalezen v mapování"
+
+#: plpython.c:2701
+msgid ""
+"To return null in a column, add the value None to the mapping with the key "
+"named after the column."
+msgstr ""
+"Pro vrácení hodnoty null ve sloupci, přidejte do mapování hodnotu None s "
+"klí�em pojmenovaným jako sloupec."
+
+#: plpython.c:2749
+msgid "length of returned sequence did not match number of columns in row"
+msgstr "délka vrácené posloupnosti neodpovídala po�tu sloupců v řádku"
+
+#: plpython.c:2857
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "atribut \"%s\" v Python objektu neexistuje"
+
+#: plpython.c:2858
+msgid ""
+"To return null in a column, let the returned object have an attribute named "
+"after column with value None."
+msgstr ""
+"Pro vrácení null ve sloupci, nechť vracený objekt má atribut pojmenovaný po "
+"sloupcis hodnotou None."
+
+#: plpython.c:3177
+msgid "plan.status takes no arguments"
+msgstr "plan.status nepřijímá žádné argumenty"
+
+#: plpython.c:3301
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "druhý argument pro plpy.prepare musí být posloupnost"
+
+#: plpython.c:3351
+#, c-format
+msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgstr "plpy.prepare: název typu na pozici %d není řetězec"
+
+#: plpython.c:3383
+msgid "plpy.prepare does not support composite types"
+msgstr "plpy.prepare nepodporuje složené typy"
+
+#: plpython.c:3473
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute o�ekávala dotaz nebo plán"
+
+#: plpython.c:3492
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execute jako druhý argument o�ekává posloupnost"
+
+#: plpython.c:3508
+msgid "could not execute plan"
+msgstr "nelze spustit plán"
+
+#: plpython.c:3511
+#, c-format
+msgid "Expected sequence of %d argument, got %d: %s"
+msgid_plural "Expected sequence of %d arguments, got %d: %s"
+msgstr[0] "O�ekávaná posloupnost %d argumentu, přišlo %d: %s"
+msgstr[1] "O�ekávaná posloupnost %d argumentů, přišlo %d: %s"
+msgstr[2] "O�ekávaná posloupnost %d argumentů, přišlo %d: %s"
+
+#: plpython.c:3653
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "volání SPI_execute_plan selhalo: %s"
+
+#: plpython.c:3731
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "volání SPI_execute selhalo: %s"
+
+#: plpython.c:3786
+msgid "unrecognized error in PLy_spi_execute_fetch_result"
+msgstr "nerozpoznaná chyba v PLy_spi_execute_fetch_result"
+
+#: plpython.c:3848
+msgid "this subtransaction has already been entered"
+msgstr "tato subtransakce již byla zahájena"
+
+#: plpython.c:3854 plpython.c:3906
+msgid "this subtransaction has already been exited"
+msgstr "tato subtransakce již byla dokon�ena"
+
+#: plpython.c:3900
+msgid "this subtransaction has not been entered"
+msgstr "tato subtransakce nebyla zahájena"
+
+#: plpython.c:3912
+msgid "there is no subtransaction to exit from"
+msgstr "nenalezena subtransakce k ukon�ení"
+
+#: plpython.c:3994
+#| msgid "could not import \"__main__\" module"
+msgid "could not add the spiexceptions module"
+msgstr "nepodařilo se naimportovat \"__main__\" modul"
+
+#: plpython.c:4077
+msgid "Python major version mismatch in session"
+msgstr "Rozpor mezi hlavními verzemi Pythonu v session"
+
+#: plpython.c:4078
+#, c-format
+msgid ""
+"This session has previously used Python major version %d, and it is now "
+"attempting to use Python major version %d."
+msgstr ""
+"Tato session již dříve používala Python s hlavní verzí %d, a nyní se "
+"pokouší použít Python s hlavní verzí %d."
+
+#: plpython.c:4080
+msgid "Start a new session to use a different Python major version."
+msgstr "Spouští se nová session pro použití jiné hlavní verze Pythonu."
+
+#: plpython.c:4095
+msgid "untrapped error in initialization"
+msgstr "nezachycená chyba v inicializaci"
+
+#: plpython.c:4123
+msgid "could not import \"__main__\" module"
+msgstr "nepodařilo se naimportovat \"__main__\" modul"
+
+#: plpython.c:4130
+msgid "could not initialize globals"
+msgstr "nepodařilo se inicializovat globální proměnné (globals)"
+
+#: plpython.c:4243
+msgid "could not parse error message in plpy.elog"
+msgstr "nepodařilo se naparsovat chybovou hlášku v plpy.elog"
+
+#: plpython.c:4267 plpython.c:4499 plpython.c:4500
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpython.c:4854
+msgid "could not convert Python Unicode object to PostgreSQL server encoding"
+msgstr "nelze převést Python Unicode objekt do serverového kódování PostgreSQL"
+
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "volání PyCObject_AsVoidPtr() selhalo"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "volání PyCObject_FromVoidPtr() selhalo"
+
+#~ msgid "transaction aborted"
+#~ msgstr "transakce přerušena"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "neplatné argumenty pro plpy.prepare"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "nerozpoznaná chyba v PLy_spi_prepare"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "nerozpoznaná chyba v PLy_spi_execute_plan"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "nerozpoznaná chyba v PLy_spi_execute_query"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "nepodařilo se vytvořit procedure cache"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "out of memory"
+#~ msgstr "nedostatek paměti"
diff --git a/src/pl/plpython/po/es.po b/src/pl/plpython/po/es.po
index a61e9e5543216..a68f1e0adb0cc 100644
--- a/src/pl/plpython/po/es.po
+++ b/src/pl/plpython/po/es.po
@@ -1,77 +1,78 @@
 # Spanish message translation file for plpython
 #
-# Copyright (C) 2009-2010 PostgreSQL Global Development Group
+# Copyright (C) 2009-2011 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
 #
 # Emanuel Calvo Franco <postgres.arg@gmail.com>, 2009.
-# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2009-2010
+# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2009-2011
 #
-# pgtranslation Id: plpython.po,v 1.6 2010/08/31 18:20:16 alvherre Exp $
+# pgtranslation Id: plpython.po,v 1.8 2011/09/07 22:16:21 alvherre Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: plpython (PostgreSQL 9.0)\n"
+"Project-Id-Version: plpython (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-31 07:15+0000\n"
-"PO-Revision-Date: 2010-08-31 14:19-0400\n"
+"POT-Creation-Date: 2011-09-07 20:53+0000\n"
+"PO-Revision-Date: 2011-09-07 19:16-0300\n"
 "Last-Translator: Alvaro Herrera <alvherre@alvh.no-ip.org>\n"
 "Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "función PL/Python «%s»"
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "bloque de código anónimo de PL/Python"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "mientras se modificaba la fila de disparador"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "mientras se creaba el valor de retorno"
 
-#: plpython.c:613 plpython.c:639
+#: plpython.c:707 plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "valor de retorno no esperado desde el procedimiento disparador"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "Se esperaba None o una cadena."
 
-#: plpython.c:629
+#: plpython.c:723
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr ""
 "función de disparador de PL/Python retorno «MODIFY» en un disparador de tipo "
 "DELETE -- ignorado"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Se esperaba None, «OK», «SKIP» o «MODIFY»."
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] borrado, no se puede modicar el registro"
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] no es un diccionario"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr ""
 "el nombre del atributo de TD[\"new\"] en la posición %d no es una cadena"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
@@ -79,102 +80,110 @@ msgid ""
 msgstr ""
 "la llave «%s» en TD[\"new\"] no existe como columna en la fila disparadora"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr ""
 "no se pudo crear un nuevo diccionario mientras se construían los argumentos "
 "de disparador"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "modo de retorno de conjunto de función no soportado"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid ""
 "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "Las funciones PL/Python que retornan conjuntos sólo permiten retornar un "
 "valor por invocación."
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado no puede ser iterado"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "Los funciones PL/Python que retornan conjuntos deben retornar un objeto "
 "iterable."
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "error extrayendo el próximo elemento del iterador"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "función PL/Python con tipo de retorno «void» no retorna None"
 
-#: plpython.c:1246
+#: plpython.c:1287
+# FIXME not very happy with this
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "abortando una subtransacción que no se ha cerrado"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falló, mientras se inicializaban los argumentos"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falló, mientras se inicializaban los argumentos"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() falló"
+#: plpython.c:1419
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"se llamó una función que retorna un registro en un contexto que no puede "
+"aceptarlo"
 
-#: plpython.c:1427
+#: plpython.c:1653
 msgid "trigger functions can only be called as triggers"
 msgstr "las funciones disparadoras sólo pueden ser llamadas como disparadores"
 
-#: plpython.c:1431 plpython.c:1815
+#: plpython.c:1658 plpython.c:2131
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "las funciones PL/Python no pueden retornar el tipo %s"
 
-#: plpython.c:1509
+#: plpython.c:1740
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "la funciones PL/Python no pueden aceptar el tipo %s"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() falló"
-
-#: plpython.c:1606
+#: plpython.c:1836
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "no se pudo compilar la función PL/Python «%s»"
 
-#: plpython.c:1817
+#: plpython.c:1839
+msgid "could not compile anonymous PL/Python code block"
+msgstr "no se pudo compilar el bloque anónimo PL/Python"
+
+#: plpython.c:2133
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python no soporta la conversión de arrays a tipos de registro."
 
-#: plpython.c:2020
+#: plpython.c:2342
 msgid "cannot convert multidimensional array to Python list"
 msgstr "no se puede convertir array multidimensional a una lista Python"
 
-#: plpython.c:2021
+#: plpython.c:2343
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python sólo soporta arrays unidimensionales."
 
-#: plpython.c:2057
+#: plpython.c:2382
 msgid "could not create new dictionary"
 msgstr "no se pudo crear un nuevo diccionario"
 
-#: plpython.c:2133
+#: plpython.c:2477
 msgid "could not create bytes representation of Python object"
 msgstr "no se pudo crear la representación de cadena de bytes de Python"
 
-#: plpython.c:2189
+#: plpython.c:2575
 msgid "could not create string representation of Python object"
 msgstr ""
 "no se pudo crear la representación de cadena de texto del objeto de Python"
 
-#: plpython.c:2200
+#: plpython.c:2586
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
@@ -182,17 +191,19 @@ msgstr ""
 "no se pudo convertir el objeto Python a un cstring: la representación de "
 "cadena Python parece tener bytes nulos (\\0)"
 
-#: plpython.c:2233
+#: plpython.c:2620
 msgid ""
 "return value of function with array return type is not a Python sequence"
-msgstr "el valor de retorno de la función con tipo de retorno array no es una secuencia Python"
+msgstr ""
+"el valor de retorno de la función con tipo de retorno array no es una "
+"secuencia Python"
 
-#: plpython.c:2308
+#: plpython.c:2700
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la llave «%s» no fue encontrada en el mapa"
 
-#: plpython.c:2309
+#: plpython.c:2701
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
@@ -200,18 +211,18 @@ msgstr ""
 "Para retornar null en una columna, agregue el valor None al mapa, con llave "
 "llamada igual que la columna."
 
-#: plpython.c:2352
+#: plpython.c:2749
 msgid "length of returned sequence did not match number of columns in row"
 msgstr ""
 "el tamaño de la secuencia retornada no concuerda con el número de columnas "
 "de la fila"
 
-#: plpython.c:2445
+#: plpython.c:2857
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "el atributo «%s» no existe en el objeto Python"
 
-#: plpython.c:2446
+#: plpython.c:2858
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
@@ -219,129 +230,147 @@ msgstr ""
 "Para retornar null en una columna, haga que el objeto retornado tenga un "
 "atributo llamado igual que la columna, con valor None."
 
-#: plpython.c:2680
+#: plpython.c:3177
 msgid "plan.status takes no arguments"
 msgstr "plan.status no lleva argumentos"
 
-#: plpython.c:2804 plpython.c:2947
-msgid "transaction aborted"
-msgstr "transacción abortada"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "argumentos no válidos para plpy.prepare"
-
-#: plpython.c:2818
+#: plpython.c:3301
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "el segundo argumento de plpy.prepare debe ser una secuencia"
 
-#: plpython.c:2868
+#: plpython.c:3351
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: el nombre de tipo en la posición %d no es una cadena"
 
-#: plpython.c:2895
+#: plpython.c:3383
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare no soporta tipos compuestos"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "error no reconocido en PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpython.c:3473
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera una consulta o un plan"
 
-#: plpython.c:2977
+#: plpython.c:3492
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute lleva una secuencia como segundo argumento"
 
-#: plpython.c:2993
+#: plpython.c:3508
 msgid "could not execute plan"
 msgstr "no se pudo ejecutar el plan"
 
-#: plpython.c:2996
+#: plpython.c:3511
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Se esperaba una secuencia de %d argumento, se obtuvo %d: %s"
 msgstr[1] "Se esperaba una secuencia de %d argumentos, se obtuvo %d: %s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "error no reconocido en PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpython.c:3653
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "falló SPI_execute_plan: %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "error no reconocido en PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpython.c:3731
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "falló SPI_execute: %s"
 
-#: plpython.c:3185
+#: plpython.c:3786
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "error desconocido en PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
+#: plpython.c:3848
+msgid "this subtransaction has already been entered"
+msgstr "ya se ha entrado en esta subtransacción"
+
+#: plpython.c:3854 plpython.c:3906
+msgid "this subtransaction has already been exited"
+msgstr "ya se ha salido de esta subtransacción"
+
+#: plpython.c:3900
+msgid "this subtransaction has not been entered"
+msgstr "no se ha entrado en esta subtransacción"
+
+#: plpython.c:3912
+msgid "there is no subtransaction to exit from"
+msgstr "no hay una subtransacción de la cual salir"
+
+#: plpython.c:3994
+msgid "could not add the spiexceptions module"
+msgstr "no se pudo importar el módulo spiexceptions"
+
+#: plpython.c:4077
 msgid "Python major version mismatch in session"
 msgstr "las versiones mayores de Python no coinciden en esta sesión"
 
-#: plpython.c:3240
+#: plpython.c:4078
 #, c-format
 msgid ""
 "This session has previously used Python major version %d, and it is now "
 "attempting to use Python major version %d."
 msgstr ""
-"Esta sesión ha usado previamente la versión mayor de Python %d, y ahora "
-"está intentando usar la versión mayor %d."
+"Esta sesión ha usado previamente la versión mayor de Python %d, y ahora está "
+"intentando usar la versión mayor %d."
 
-#: plpython.c:3242
+#: plpython.c:4080
 msgid "Start a new session to use a different Python major version."
-msgstr "Inicie una nueva sesión para usar una versión mayor de Python diferente."
+msgstr ""
+"Inicie una nueva sesión para usar una versión mayor de Python diferente."
 
-#: plpython.c:3257
+#: plpython.c:4095
 msgid "untrapped error in initialization"
 msgstr "error no capturado en la inicialización"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "no se pudo crear el cache de procedimientos"
-
-#: plpython.c:3272
+#: plpython.c:4123
 msgid "could not import \"__main__\" module"
 msgstr "no se pudo importar el módulo «__main__»"
 
-#: plpython.c:3279
+#: plpython.c:4130
 msgid "could not initialize globals"
 msgstr "no se pudo inicializar las globales"
 
-#: plpython.c:3397
+#: plpython.c:4243
 msgid "could not parse error message in plpy.elog"
 msgstr "no se pudo analizar el mensaje de error de plpy.elog"
 
-#: plpython.c:3526 plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3527
+#: plpython.c:4267 plpython.c:4499 plpython.c:4500
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "memoria agotada"
-
-#: plpython.c:3694
+#: plpython.c:4854
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr ""
 "no se pudo convertir el objeto Unicode de Python a la codificación de "
 "servidor de PostgreSQL"
+
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "PyCObject_AsVoidPtr() falló"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "PyCObject_FromVoidPtr() falló"
+
+#~ msgid "transaction aborted"
+#~ msgstr "transacción abortada"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "argumentos no válidos para plpy.prepare"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "error no reconocido en PLy_spi_prepare"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "error no reconocido en PLy_spi_execute_plan"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "error no reconocido en PLy_spi_execute_query"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "no se pudo crear el cache de procedimientos"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "out of memory"
+#~ msgstr "memoria agotada"
diff --git a/src/pl/plpython/po/fr.po b/src/pl/plpython/po/fr.po
index f13458aab791b..25f077a2c6b54 100644
--- a/src/pl/plpython/po/fr.po
+++ b/src/pl/plpython/po/fr.po
@@ -10,343 +10,374 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.4\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-08-26 02:05+0000\n"
-"PO-Revision-Date: 2010-08-26 20:36+0100\n"
+"POT-Creation-Date: 2011-06-13 14:52+0000\n"
+"PO-Revision-Date: 2011-06-13 17:51+0100\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "fonction PL/python « %s »"
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "bloc de code PL/Python anonyme"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "lors de la modification de la ligne du trigger"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "lors de la création de la valeur de retour"
 
-#: plpython.c:613
-#: plpython.c:639
+#: plpython.c:707
+#: plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "valeur de retour inattendue de la procédure trigger"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "Attendait None ou une chaîne de caractères."
 
-#: plpython.c:629
+#: plpython.c:723
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr ""
 "la fonction trigger PL/python a renvoyé « MODIFY » dans un trigger DELETE\n"
 "-- ignoré"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Attendait None, « OK », « SKIP » ou « MODIFY »."
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] supprimé, ne peut pas modifier la ligne"
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] n'est pas un dictionnaire"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "la clé TD[\"new\"] à la position ordinale %d n'est pas une chaîne"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr ""
 "la clé « %s » trouvée dans TD[\"new\"]  n'existe pas comme colonne\n"
 "de la ligne impactée par le trigger"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr ""
 "n'a pas pu créer un nouveau dictionnaire lors de la construction des\n"
 "arguments du trigger"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "mode de retour non supporté pour la fonction SET"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles supportent seulement une\n"
 "valeur renvoyée par appel"
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "l'objet renvoyé ne supporte pas les itérations"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "les fonctions PL/python renvoyant des ensembles doivent renvoyer un objet\n"
 "itérable"
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "erreur lors de la récupération du prochain élément de l'itérateur"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "la fonction PL/python avec un code de retour « void » ne renvoyait pas None"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "annulation forcée d'une sous-transaction qui n'a jamais été quittée"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "échec de PyList_SetItem() lors de l'initialisation des arguments"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "échec de PyDict_SetItemString() lors de l'initialisation des arguments"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "échec de PyCObject_AsVoidPtr()"
+#: plpython.c:1419
+msgid "function returning record called in context that cannot accept type record"
+msgstr ""
+"fonction renvoyant le type record appelée dans un contexte qui ne peut pas\n"
+"accepter le type record"
 
-#: plpython.c:1427
+#: plpython.c:1633
 msgid "trigger functions can only be called as triggers"
 msgstr "les fonctions trigger peuvent seulement être appelées par des triggers"
 
-#: plpython.c:1431
-#: plpython.c:1815
+#: plpython.c:1638
+#: plpython.c:2089
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "les fonctions PL/python ne peuvent pas renvoyer le type %s"
 
-#: plpython.c:1509
+#: plpython.c:1721
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "les fonctions PL/python ne peuvent pas accepter le type %s"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "échec de PyCObject_FromVoidPtr()"
-
-#: plpython.c:1606
+#: plpython.c:1817
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "n'a pas pu compiler la fonction PL/python « %s »"
 
-#: plpython.c:1817
+#: plpython.c:1820
+msgid "could not compile anonymous PL/Python code block"
+msgstr "n'a pas pu compiler le bloc de code anonyme PL/python"
+
+#: plpython.c:2091
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python ne supporte pas les conversions vers des tableaux de types row."
 
-#: plpython.c:2020
+#: plpython.c:2300
 msgid "cannot convert multidimensional array to Python list"
 msgstr "ne peut pas convertir un tableau multidimensionnel en liste Python"
 
-#: plpython.c:2021
+#: plpython.c:2301
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python supporte seulement les tableaux uni-dimensionnels."
 
-#: plpython.c:2057
+#: plpython.c:2340
 msgid "could not create new dictionary"
 msgstr "n'a pas pu créer le nouveau dictionnaire"
 
-#: plpython.c:2133
+#: plpython.c:2435
 msgid "could not create bytes representation of Python object"
 msgstr "n'a pas pu créer une représentation octets de l'objet Python"
 
-#: plpython.c:2189
+#: plpython.c:2533
 msgid "could not create string representation of Python object"
 msgstr "n'a pas pu créer une représentation chaîne de caractères de l'objet Python"
 
-#: plpython.c:2200
+#: plpython.c:2544
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "n'a pas pu convertir l'objet Python en csting : la représentation de la chaîne Python contient des octets nuls"
 
-#: plpython.c:2233
+#: plpython.c:2578
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "la valeur de retour de la fonction de type tableau n'est pas une séquence Python"
 
-#: plpython.c:2308
+#: plpython.c:2654
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "la clé « %s » introuvable dans la correspondance"
 
-#: plpython.c:2309
+#: plpython.c:2655
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr ""
 "Pour renvoyer NULL dans une colonne, ajoutez la valeur None à la\n"
 "correspondance de la clé nommée d'après la colonne."
 
-#: plpython.c:2352
+#: plpython.c:2703
 msgid "length of returned sequence did not match number of columns in row"
 msgstr ""
 "la longueur de la séquence renvoyée ne correspondait pas au nombre de\n"
 "colonnes dans la ligne"
 
-#: plpython.c:2445
+#: plpython.c:2803
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "l'attribut « %s » n'existe pas dans l'objet Python"
 
-#: plpython.c:2446
+#: plpython.c:2804
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr ""
 "Pour renvoyer NULL dans une colonne, faites en sorte que l'objet renvoyé ait\n"
 "un attribut nommé suivant la colonne de valeur None."
 
-#: plpython.c:2680
+#: plpython.c:3123
 msgid "plan.status takes no arguments"
 msgstr "plan.status ne prends pas d'arguments"
 
-#: plpython.c:2804
-#: plpython.c:2947
-msgid "transaction aborted"
-msgstr "transaction annulée"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "arguments invalides pour plpy.prepare"
-
-#: plpython.c:2818
+#: plpython.c:3247
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "le second argument de plpy.prepare doit être une séquence"
 
-#: plpython.c:2868
+#: plpython.c:3297
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare : le nom du type sur la position ordinale %d n'est pas une chaîne"
 
-#: plpython.c:2895
+#: plpython.c:3329
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare ne supporte pas les types composites"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "erreur inconnue dans PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpython.c:3419
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.prepare attendait une requête ou un plan"
 
-#: plpython.c:2977
+#: plpython.c:3438
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute prends une séquence dans son second argument"
 
-#: plpython.c:2993
+#: plpython.c:3454
 msgid "could not execute plan"
 msgstr "n'a pas pu exécuter le plan"
 
-#: plpython.c:2996
+#: plpython.c:3457
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Séquence attendue de %d argument, %d obtenu : %s"
 msgstr[1] "Séquence attendue de %d arguments, %d obtenus : %s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "erreur inconnue dans PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpython.c:3599
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "échec de SPI_execute_plan : %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "erreur inconnue dans PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpython.c:3677
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "échec de SPI_execute : %s"
 
-#: plpython.c:3185
+#: plpython.c:3732
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "erreur inconnue dans PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
+#: plpython.c:3794
+msgid "this subtransaction has already been entered"
+msgstr "cette sous-transaction est en cours d'utilisation"
+
+#: plpython.c:3800
+#: plpython.c:3852
+msgid "this subtransaction has already been exited"
+msgstr "déjà sorti de cette sous-transaction"
+
+#: plpython.c:3846
+msgid "this subtransaction has not been entered"
+msgstr "cette sous-transaction n'a jamais été utilisée"
+
+#: plpython.c:3858
+msgid "there is no subtransaction to exit from"
+msgstr "il n'y a pas de transaction à quitter"
+
+#: plpython.c:3940
+msgid "could not add the spiexceptions module"
+msgstr "n'a pas pu ajouter le module « spiexceptions »"
+
+#: plpython.c:4017
 msgid "Python major version mismatch in session"
 msgstr "Différence de version majeure de Python dans la session"
 
-#: plpython.c:3240
+#: plpython.c:4018
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr ""
 "Cette session a auparavant utilisé la version majeure %d de Python et elle\n"
 "essaie maintenant d'utiliser la version majeure %d."
 
-#: plpython.c:3242
+#: plpython.c:4020
 msgid "Start a new session to use a different Python major version."
 msgstr ""
 "Lancez une nouvelle session pour utiliser une version majeure différente de\n"
 "Python."
 
-#: plpython.c:3257
+#: plpython.c:4035
 msgid "untrapped error in initialization"
 msgstr "erreur non récupérée dans l'initialisation"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "n'a pas pu créer le cache de procédure"
-
-#: plpython.c:3272
+#: plpython.c:4063
 msgid "could not import \"__main__\" module"
 msgstr "n'a pas pu importer le module « __main__ »"
 
-#: plpython.c:3279
+#: plpython.c:4070
 msgid "could not initialize globals"
 msgstr "n'a pas pu initialiser les variables globales"
 
-#: plpython.c:3397
+#: plpython.c:4183
 msgid "could not parse error message in plpy.elog"
 msgstr "n'a pas pu analyser le message d'erreur dans plpy.elog"
 
-#: plpython.c:3526
-#: plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/python : %s"
-
-#: plpython.c:3527
+#: plpython.c:4207
+#: plpython.c:4437
+#: plpython.c:4438
+#: plpython.c:4439
+#: plpython.c:4440
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "mémoire épuisée"
-
-#: plpython.c:3694
+#: plpython.c:4794
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr "n'a pas pu convertir l'objet Unicode Python en encodage serveur PostgreSQL"
 
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "échec de PyCObject_AsVoidPtr()"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "échec de PyCObject_FromVoidPtr()"
+
+#~ msgid "transaction aborted"
+#~ msgstr "transaction annulée"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "arguments invalides pour plpy.prepare"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "erreur inconnue dans PLy_spi_prepare"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "erreur inconnue dans PLy_spi_execute_plan"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "erreur inconnue dans PLy_spi_execute_query"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "n'a pas pu créer le cache de procédure"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/python : %s"
+
+#~ msgid "out of memory"
+#~ msgstr "mémoire épuisée"
+
 #~ msgid "PL/Python function \"%s\" failed"
 #~ msgstr "échec de la fonction PL/python « %s »"
+
 #~ msgid ""
 #~ "could not compute string representation of Python object in PL/Python "
 #~ "function \"%s\" while modifying trigger row"
 #~ msgstr ""
 #~ "n'a pas pu traiter la représentation de la chaîne d'un objet Python dans\n"
-#~ "la fonction PL/Python « %s » lors de la modification de la ligne du trigger"
+#~ "la fonction PL/Python « %s » lors de la modification de la ligne du "
+#~ "trigger"
+
 #~ msgid ""
 #~ "could not create string representation of Python object in PL/Python "
 #~ "function \"%s\" while creating return value"
 #~ msgstr ""
 #~ "n'a pas pu créer la représentation en chaîne de caractère de l'objet\n"
-#~ "Python dans la fonction PL/python « %s » lors de la création de la valeur\n"
+#~ "Python dans la fonction PL/python « %s » lors de la création de la "
+#~ "valeur\n"
 #~ "de retour"
+
 #~ msgid "PL/Python function \"%s\" could not execute plan"
 #~ msgstr "la fonction PL/python « %s » n'a pas pu exécuter un plan"
-
diff --git a/src/pl/plpython/po/it.po b/src/pl/plpython/po/it.po
deleted file mode 100644
index a484fae517348..0000000000000
--- a/src/pl/plpython/po/it.po
+++ /dev/null
@@ -1,320 +0,0 @@
-#
-# Translation of plpython to Italian
-# PostgreSQL Project
-#
-# Associazione Culturale ITPUG - Italian PostgreSQL Users Group
-# http://www.itpug.org/ - info@itpug.org
-#
-# Traduttori:
-#  * Flavio Spada <f.spada@sbv.mi.it>
-# 
-# Revisori:
-#  * Gabriele Bartolini <gabriele.bartolini@2ndQuadrant.it>
-#
-# Copyright (c) 2010, Associazione Culturale ITPUG
-# Distributed under the same license of the PostgreSQL project
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: plpython-it\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-03-26 13:15+0000\n"
-"PO-Revision-Date: 2010-03-27 12:44:19+0100\n"
-"Last-Translator: Gabriele Bartolini <gabriele.bartolini@2ndquadrant.it>\n"
-"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: plpython.c:418
-#, c-format
-msgid "PL/Python function \"%s\""
-msgstr "funzione PL/Python \"%s\""
-
-#: plpython.c:424
-msgid "PL/Python anonymous code block"
-msgstr "codice di blocco anonimo in PL/Python"
-
-#: plpython.c:431
-msgid "while modifying trigger row"
-msgstr "durante la modifica della riga trigger"
-
-#: plpython.c:438
-msgid "while creating return value"
-msgstr "durante la creazione del valore di ritorno"
-
-#: plpython.c:604
-#: plpython.c:630
-msgid "unexpected return value from trigger procedure"
-msgstr "valore di ritorno inatteso dalla prodedura di trigger"
-
-#: plpython.c:605
-msgid "Expected None or a string."
-msgstr "Atteso None o una stringa."
-
-#: plpython.c:620
-msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
-msgstr "la funzione PL/Python trigger ha restituito \"MODIFY\" in un trigger DELETE -- ignorato"
-
-#: plpython.c:631
-msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "Atteso None, \"OK\", \"SKIP\", o \"MODIFY\"."
-
-#: plpython.c:683
-msgid "TD[\"new\"] deleted, cannot modify row"
-msgstr "TD[\"new\"] cancellato, impossibile modificare la riga"
-
-#: plpython.c:686
-msgid "TD[\"new\"] is not a dictionary"
-msgstr "TD[\"new\"] non è un dizionario"
-
-#: plpython.c:710
-#, c-format
-msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
-msgstr "la chiave di dizionario TD[\"new\"] alla posizione %d non è una stringa"
-
-#: plpython.c:716
-#, c-format
-msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
-msgstr "la chiave \"%s\" trovata in TD[\"new\"] non esiste come colonna nella riga del trigger"
-
-#: plpython.c:810
-msgid "could not create new dictionary while building trigger arguments"
-msgstr "impossibile creare un nuovo dizionario mentre si stanno costruendo gli argomenti del trigger"
-
-#: plpython.c:1017
-msgid "unsupported set function return mode"
-msgstr "modalità di ritorno della funzione set non supportata"
-
-#: plpython.c:1018
-msgid "PL/Python set-returning functions only support returning only value per call."
-msgstr "le funzioni set-returning di PL/Python supportano il valore di ritorno solo una volta per chiamata"
-
-#: plpython.c:1030
-msgid "returned object cannot be iterated"
-msgstr "l'oggetto ritornato non può essere iterato"
-
-#: plpython.c:1031
-msgid "PL/Python set-returning functions must return an iterable object."
-msgstr "le funzioni set-returning di PL/Python devono tornare un oggetto iterabile"
-
-#: plpython.c:1058
-msgid "error fetching next item from iterator"
-msgstr "errore nell'ottenere l'elemento successivo dall'iteratore"
-
-#: plpython.c:1080
-msgid "PL/Python function with return type \"void\" did not return None"
-msgstr "la funzione PL/Python con valore di ritorno \"void\" non ha restituito None"
-
-#: plpython.c:1237
-msgid "PyList_SetItem() failed, while setting up arguments"
-msgstr "PyList_SetItem() è fallita durante l'impostazione degli argomenti"
-
-#: plpython.c:1241
-msgid "PyDict_SetItemString() failed, while setting up arguments"
-msgstr "PyDict_SetItemString() è fallita durante l'impostazione degli argomenti"
-
-#: plpython.c:1416
-msgid "trigger functions can only be called as triggers"
-msgstr "le funzioni trigger possono essere chiamate solo come trigger"
-
-#: plpython.c:1420
-#: plpython.c:1800
-#, c-format
-msgid "PL/Python functions cannot return type %s"
-msgstr "le funzioni PL/Python non possono tornare il tipo %s"
-
-#: plpython.c:1498
-#, c-format
-msgid "PL/Python functions cannot accept type %s"
-msgstr "le funzioni PL/Python non possono accettare il tipo %s"
-
-#: plpython.c:1592
-#, c-format
-msgid "could not compile PL/Python function \"%s\""
-msgstr "impossibile compilare la funzione PL/Python \"%s\""
-
-#: plpython.c:1802
-msgid "PL/Python does not support conversion to arrays of row types."
-msgstr ""
-
-#: plpython.c:1996
-msgid "cannot convert multidimensional array to Python list"
-msgstr ""
-
-#: plpython.c:1997
-msgid "PL/Python only supports one-dimensional arrays."
-msgstr ""
-
-#: plpython.c:2031
-msgid "could not create new dictionary"
-msgstr "impossibile creare il nuovo dizionario"
-
-#: plpython.c:2107
-msgid "could not create bytes representation of Python object"
-msgstr "impossibile creare la rappresentazione di tipo byte dell'oggetto Python"
-
-#: plpython.c:2163
-msgid "could not create string representation of Python object"
-msgstr "impossibile creare la rappresentazione di tipo stringa dell'oggetto Python"
-
-#: plpython.c:2174
-msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
-msgstr ""
-
-#: plpython.c:2207
-msgid "return value of function with array return type is not a Python sequence"
-msgstr ""
-
-#: plpython.c:2282
-#, c-format
-msgid "key \"%s\" not found in mapping"
-msgstr "la chiave \"%s\" non è stata trovata nel dizionario"
-
-#: plpython.c:2283
-msgid "To return null in a column, add the value None to the mapping with the key named after the column."
-msgstr "Per ritornare null in una colonna, inserire nella mappa il valore None in corrispondenza del nome di colonna come chiave."
-
-#: plpython.c:2326
-msgid "length of returned sequence did not match number of columns in row"
-msgstr "la lunghezza della sequenza ritornata non rispetta il numero di colonne presenti nella riga"
-
-#: plpython.c:2419
-#, c-format
-msgid "attribute \"%s\" does not exist in Python object"
-msgstr "l'attributo \"%s\" non esiste nell'oggetto Python"
-
-#: plpython.c:2420
-msgid "To return null in a column, let the returned object have an attribute named after column with value None."
-msgstr "Per ritornare null in una colonna, assicurarsi che all'oggetto di ritorno corrisponda nel dizionario un attributo con valore None."
-
-#: plpython.c:2654
-msgid "plan.status takes no arguments"
-msgstr "plan.status non accetta argomenti"
-
-#: plpython.c:2778
-#: plpython.c:2921
-msgid "transaction aborted"
-msgstr "transazione abortita"
-
-#: plpython.c:2785
-msgid "invalid arguments for plpy.prepare"
-msgstr "argomenti non validi per plpy.prepare"
-
-#: plpython.c:2792
-msgid "second argument of plpy.prepare must be a sequence"
-msgstr "il secondo argomento di plpy.prepare deve essere una sequenza"
-
-#: plpython.c:2842
-#, c-format
-msgid "plpy.prepare: type name at ordinal position %d is not a string"
-msgstr "plpy.prepare: il nome del tipo nella posizione %d non è una stringa"
-
-#: plpython.c:2869
-msgid "plpy.prepare does not support composite types"
-msgstr "plpy.prepare non supporta tipi composti"
-
-#: plpython.c:2898
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "errore non riconosciuto in PLy_spi_prepare"
-
-#: plpython.c:2934
-msgid "plpy.execute expected a query or a plan"
-msgstr "plpy.execute si aspetta una query o un plan"
-
-#: plpython.c:2951
-msgid "plpy.execute takes a sequence as its second argument"
-msgstr "plpy.execute richiede una sequenza come secondo argomento"
-
-#: plpython.c:2967
-msgid "could not execute plan"
-msgstr "impossibile eseguire il piano"
-
-#: plpython.c:2970
-#, c-format
-msgid "Expected sequence of %d argument, got %d: %s"
-msgid_plural "Expected sequence of %d arguments, got %d: %s"
-msgstr[0] "Sequenza attesa per l'argomento %d, ricevuto %d: %s"
-msgstr[1] "Sequenza attesa di %d argomenti, ricevuti %d: %s"
-
-#: plpython.c:3047
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "errore non riconosciuto nella funzione PLy_spi_execute_plan"
-
-#: plpython.c:3066
-#, c-format
-msgid "SPI_execute_plan failed: %s"
-msgstr "SPI_execute_plan ha fallito: %s"
-
-#: plpython.c:3093
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "errore non riconosciuto nella funzione PLy_spi_execute_query"
-
-#: plpython.c:3102
-#, c-format
-msgid "SPI_execute failed: %s"
-msgstr "SPI_execute ha fallito: %s"
-
-#: plpython.c:3162
-msgid "unrecognized error in PLy_spi_execute_fetch_result"
-msgstr "errore non riconosciuto nella funzione PLy_spi_execute_fetch_result"
-
-#: plpython.c:3213
-msgid "untrapped error in initialization"
-msgstr "errore non catturato durante l'inizializzazione"
-
-#: plpython.c:3216
-msgid "could not create procedure cache"
-msgstr "impossibile creare la procedura cache"
-
-#: plpython.c:3228
-msgid "could not import \"__main__\" module"
-msgstr "impossibile importare il modulo \"__main__\""
-
-#: plpython.c:3235
-msgid "could not initialize globals"
-msgstr "impossibile inizializzare le variabili globali"
-
-#: plpython.c:3353
-msgid "could not parse error message in plpy.elog"
-msgstr "impossibile interpretare il messaggio di errore in plpy.elog"
-
-#: plpython.c:3482
-#: plpython.c:3486
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3483
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: plpython.c:3596
-msgid "out of memory"
-msgstr "memoria esaurita"
-
-#: plpython.c:3650
-msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr ""
-
-#~ msgid ""
-#~ "could not compute string representation of Python object in PL/Python "
-#~ "function \"%s\" while modifying trigger row"
-#~ msgstr ""
-#~ "impossibile calcolare la rappresentazione di tipo stringa dell'oggetto "
-#~ "Python nella funzione PL/Python \"%s\" mentre si sta modificando la riga "
-#~ "di trigger"
-
-#~ msgid ""
-#~ "could not create string representation of Python object in PL/Python "
-#~ "function \"%s\" while creating return value"
-#~ msgstr ""
-#~ "impossibile creare una rappresentazione di tipo stringa dell'oggetto "
-#~ "Python nella funzione PL/Python \"%s\" durante la creazione del valore di "
-#~ "ritorno"
-
-#~ msgid "PL/Python function \"%s\" failed"
-#~ msgstr "la funzione PL/Python \"%s\" è fallita"
diff --git a/src/pl/plpython/po/ja.po b/src/pl/plpython/po/ja.po
index 87e96c65577f9..7cb2f5fe2a243 100644
--- a/src/pl/plpython/po/ja.po
+++ b/src/pl/plpython/po/ja.po
@@ -4,67 +4,65 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0rc1\n"
+"Project-Id-Version: PostgreSQL 9.1 beta2\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-08 04:40+0900\n"
-"PO-Revision-Date: 2010-09-08 04:50+0900\n"
-"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
+"POT-Creation-Date: 2011-06-16 05:31+0900\n"
+"PO-Revision-Date: 2011-06-16 05:47+0900\n"
+"Last-Translator: Honda Shigehiro <honda@postgresql.jp>\n"
 "Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "PL/Python 関数 \"%s\""
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "PL/Python �無�コードブロック"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "トリガー行を変更�る際�"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "戻り値を生��る際�"
 
-#: plpython.c:613 plpython.c:639
+#: plpython.c:707 plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "トリガー手続��ら期待���戻り値�返�れ���"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "None も���文字列を期待������。"
 
-#: plpython.c:629
+#: plpython.c:723
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
-msgstr ""
-"PL/Python トリガー関数��DELETE トリガー� \"MODIFY\" を返����-- 無視�"
-"���"
+msgstr "PL/Python トリガー関数��DELETE トリガー� \"MODIFY\" を返����-- 無視����"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
-msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" ���れ�を期待������"
+msgstr "None, \"OK\", \"SKIP\", \"MODIFY\" ���れ�を期待������。"
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] �削除�れ���。も�や変更����ん"
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] �辞書���り��ん"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "TD[\"new\"] 辞書�%d番目�キー�文字列���り��ん"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
@@ -73,99 +71,106 @@ msgstr ""
 "TD[\"new\"] �見����キー \"%s\" ��行レベルトリガー���るカラム���"
 "�存在���ん"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "トリガー�引数を構�中��新��辞書を生�����ん���"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "未サ�ート�集�関数リターンモード��"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid ""
 "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "PL/Python �集�を返�関数���１回�コール����値��を返����サ�ー"
 "ト�れ����"
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "返�れ�オブジェクト��復�用����ん"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "PL/Python �集�を返�関数���イテレータ（�復�）オブジェクトを返���れ"
 "��り��ん"
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "イテレータ（�復�）�ら次�項目をフェッ�（�り出�）����ん"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "\"void\" 型を返� PL/Python 関数� None 型を返���ん"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "終了�����サブトランザクションを強制的�アボート�����"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "引数を設定�る際��PyList_SetItem() �失敗����"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "引数を設定�る際��PyDict_SetItemString() �失敗����"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() �失敗����"
+#: plpython.c:1419
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"レコード型を��付�られ��コンテキスト�レコードを返�関数�呼�出�れ��"
+"�"
 
-#: plpython.c:1427
+#: plpython.c:1633
 msgid "trigger functions can only be called as triggers"
 msgstr "トリガー関数�トリガー�����コール����"
 
-#: plpython.c:1431 plpython.c:1815
+#: plpython.c:1638 plpython.c:2089
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "PL/Python 関数� %s 型を返���ん"
 
-#: plpython.c:1509
+#: plpython.c:1721
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "PL/Python 関数� %s 型を��付���ん"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() �失敗����"
-
-#: plpython.c:1606
+#: plpython.c:1817
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "PL/Python 関数 \"%s\" をコンパイル����ん"
 
-#: plpython.c:1817
+#: plpython.c:1820
+msgid "could not compile anonymous PL/Python code block"
+msgstr "PL/Python匿�コードブロックをコンパイル����ん"
+
+#: plpython.c:2091
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python �行タイプ�列��変�をサ�ート�����ん"
 
-#: plpython.c:2020
+#: plpython.c:2300
 msgid "cannot convert multidimensional array to Python list"
 msgstr "多次元�列を Python � list �変�����ん"
 
-#: plpython.c:2021
+#: plpython.c:2301
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python �サ�ート���る��一次元�列����。"
 
-#: plpython.c:2057
+#: plpython.c:2340
 msgid "could not create new dictionary"
 msgstr "新��ディレクトリを作れ��ん"
 
-#: plpython.c:2133
+#: plpython.c:2435
 msgid "could not create bytes representation of Python object"
 msgstr "�イト表�� Python オブジェクトを生�����ん���"
 
-#: plpython.c:2189
+#: plpython.c:2533
 msgid "could not create string representation of Python object"
 msgstr "文字列表�� Python オブジェクトを生�����ん���"
 
-#: plpython.c:2200
+#: plpython.c:2544
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
@@ -173,17 +178,17 @@ msgstr ""
 "Python オブジェクトを cstring �変�����ん���：Python �文字列表�� "
 "null �イトを�������������"
 
-#: plpython.c:2233
+#: plpython.c:2578
 msgid ""
 "return value of function with array return type is not a Python sequence"
 msgstr "戻り値��列��る関数�戻り値� Python シーケンス���り��ん"
 
-#: plpython.c:2308
+#: plpython.c:2654
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "マッピング上�キー \"%s\" �見��り��ん"
 
-#: plpython.c:2309
+#: plpython.c:2655
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
@@ -191,16 +196,16 @@ msgstr ""
 "カラム� null を入れ�返����カラム�後������をキー����マッピン"
 "グ� None 値を追加������"
 
-#: plpython.c:2352
+#: plpython.c:2703
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "返�れ�シーケンス�長�����行�カラム数�異�り��"
 
-#: plpython.c:2445
+#: plpython.c:2803
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "属性 \"%s\" � Python オブジェクト中�存在���ん"
 
-#: plpython.c:2446
+#: plpython.c:2804
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
@@ -208,80 +213,80 @@ msgstr ""
 "カラム� null を入れ�返�場�����カラム�後�������表�れる属性�"
 "値��� None を���返�れるオブジェクト���属性を�むよ��������"
 
-#: plpython.c:2680
+#: plpython.c:3123
 msgid "plan.status takes no arguments"
 msgstr "plan.status �引数を�り��ん"
 
-#: plpython.c:2804 plpython.c:2947
-msgid "transaction aborted"
-msgstr "トランザクション�アボート����"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "plpy.prepare �引数��正��"
-
-#: plpython.c:2818
+#: plpython.c:3247
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "plpy.prepare �第二引数�シーケンス���れ��り��ん"
 
-#: plpython.c:2868
+#: plpython.c:3297
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: %d 番目�型��文字列���り��ん"
 
-#: plpython.c:2895
+#: plpython.c:3329
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare �複�型をサ�ート�����ん"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "PLy_spi_prepare ��識����エラーを検出����"
-
-#: plpython.c:2960
+#: plpython.c:3419
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute �クエリーも���実行計画を期待������"
 
-#: plpython.c:2977
+#: plpython.c:3438
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute �第二引数���シーケンスを�り��"
 
-#: plpython.c:2993
+#: plpython.c:3454
 msgid "could not execute plan"
 msgstr "プランを実行����ん���"
 
-#: plpython.c:2996
+#: plpython.c:3457
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "%d 番目�引数�シーケンスを期待��������%d ��れ���：%s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "PLy_spi_execute_plan ��識����エラーを検出����"
-
-#: plpython.c:3092
+#: plpython.c:3599
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan �失敗����：%s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "PLy_spi_execute_query ��識����エラーを検出����"
-
-#: plpython.c:3128
+#: plpython.c:3677
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute �失敗����：%s"
 
-#: plpython.c:3185
+#: plpython.c:3732
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "PLy_spi_execute_fetch_result ��識����エラーを検出����"
 
-#: plpython.c:3239
+#: plpython.c:3794
+msgid "this subtransaction has already been entered"
+msgstr "��サブトランザクション�到�済���"
+
+#: plpython.c:3800 plpython.c:3852
+msgid "this subtransaction has already been exited"
+msgstr "��サブトランザクション�終了済���"
+
+#: plpython.c:3846
+msgid "this subtransaction has not been entered"
+msgstr "��サブトランザクション��到����ん"
+
+#: plpython.c:3858
+msgid "there is no subtransaction to exit from"
+msgstr "終了�る���サブトランザクション��り��ん"
+
+#: plpython.c:3940
+msgid "could not add the spiexceptions module"
+msgstr "spiexceptionsモジュールを追加����ん���"
+
+#: plpython.c:4017
 msgid "Python major version mismatch in session"
 msgstr "セッション���� Python �メジャー�ージョン��致���ん"
 
-#: plpython.c:3240
+#: plpython.c:4018
 #, c-format
 msgid ""
 "This session has previously used Python major version %d, and it is now "
@@ -290,48 +295,66 @@ msgstr ""
 "��セッション����� Python �メジャー�ージョン %d �使�れ�����"
 "����� Python �メジャー�ージョン %d を使��������。"
 
-#: plpython.c:3242
+#: plpython.c:4020
 msgid "Start a new session to use a different Python major version."
 msgstr ""
 "Python �異���メジャー�ージョンを使�場���新��セッションを開始���"
 "���"
 
-#: plpython.c:3257
+#: plpython.c:4035
 msgid "untrapped error in initialization"
 msgstr "�期化中�������エラー��り���"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "手続�用キャッシュ(procedure cache)を生�����ん���"
-
-#: plpython.c:3272
+#: plpython.c:4063
 msgid "could not import \"__main__\" module"
 msgstr "\"__main__\" モジュールをイン�ート����ん���"
 
-#: plpython.c:3279
+#: plpython.c:4070
 msgid "could not initialize globals"
 msgstr "グロー�ル変数(globals)を�期化����ん���"
 
-#: plpython.c:3397
+#: plpython.c:4183
 msgid "could not parse error message in plpy.elog"
 msgstr "plpy.elog �エラーメッセージをパース����ん���"
 
-#: plpython.c:3526 plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3527
+#: plpython.c:4207 plpython.c:4437 plpython.c:4438 plpython.c:4439
+#: plpython.c:4440
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "メモリ�足��"
-
-#: plpython.c:3694
+#: plpython.c:4794
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr ""
 "Python � Unicode オブジェクトを PostgreSQL サー��エンコーディング�変��"
 "���ん���"
+
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "PyCObject_AsVoidPtr() �失敗����"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "PyCObject_FromVoidPtr() �失敗����"
+
+#~ msgid "transaction aborted"
+#~ msgstr "トランザクション�アボート����"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "plpy.prepare �引数��正��"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "PLy_spi_prepare ��識����エラーを検出����"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "PLy_spi_execute_plan ��識����エラーを検出����"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "PLy_spi_execute_query ��識����エラーを検出����"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "手続�用キャッシュ(procedure cache)を生�����ん���"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "out of memory"
+#~ msgstr "メモリ�足��"
diff --git a/src/pl/plpython/po/pl.po b/src/pl/plpython/po/pl.po
new file mode 100644
index 0000000000000..766c595f85275
--- /dev/null
+++ b/src/pl/plpython/po/pl.po
@@ -0,0 +1,335 @@
+# plpython message translation file for plpython
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: plpython (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:53+0000\n"
+"PO-Revision-Date: 2011-09-30 09:50-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Polish TotroiseSvn translation team\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: plpython.c:475
+#, c-format
+msgid "PL/Python function \"%s\""
+msgstr "funkcja PL/Python \"%s\""
+
+#: plpython.c:482
+msgid "PL/Python anonymous code block"
+msgstr "anonimowy blok kodu PL/Python"
+
+#: plpython.c:489
+msgid "while modifying trigger row"
+msgstr "podczas modyfikowania wiersza wyzwalacza"
+
+#: plpython.c:496
+msgid "while creating return value"
+msgstr "podczas tworzenia wartości zwracanej"
+
+#: plpython.c:707 plpython.c:733
+msgid "unexpected return value from trigger procedure"
+msgstr "nieoczekiwana wartość zwracana przez procedury wyzwalacza"
+
+#: plpython.c:708
+msgid "Expected None or a string."
+msgstr "Oczekiwano None lub ciąg znaków."
+
+#: plpython.c:723
+msgid ""
+"PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
+msgstr ""
+"funkcja wyzwalacza PL/Python zwróciła \"MODIFY\" w wyzwalaczu DELETE -- "
+"zignorowano"
+
+#: plpython.c:734
+msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
+msgstr "Oczekiwano None, \"OK\", \"SKIP\", lub \"MODIFY\"."
+
+#: plpython.c:786
+msgid "TD[\"new\"] deleted, cannot modify row"
+msgstr "usunięto TD[\"new\"], nie można zmienić wiersza"
+
+#: plpython.c:789
+msgid "TD[\"new\"] is not a dictionary"
+msgstr "TD[\"new\"] nie jest słownikiem"
+
+#: plpython.c:813
+#, c-format
+msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
+msgstr ""
+"klucz słownika TD[\"new\"] na pozycji porządkowej %d nie jest ciągiem znaków"
+
+#: plpython.c:819
+#, c-format
+msgid ""
+"key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
+"row"
+msgstr ""
+"klucz \"%s\" znaleziony w TD[\"new\"] nie istnieje jako kolumna w wierszu "
+"obsługiwanym przez wyzwalacz"
+
+#: plpython.c:915
+msgid "could not create new dictionary while building trigger arguments"
+msgstr ""
+"nie można utworzyć nowego słownika w czasie tworzenia argumentów wyzwalacza"
+
+#: plpython.c:1122
+msgid "unsupported set function return mode"
+msgstr "nieobsługiwany tryb zwracania przez funkcję grupy"
+
+#: plpython.c:1123
+msgid ""
+"PL/Python set-returning functions only support returning only value per call."
+msgstr ""
+"funkcja zwracająca grupę PL/obsługuje tylko zwracanie jednej wartości w "
+"wywołaniu."
+
+#: plpython.c:1135
+msgid "returned object cannot be iterated"
+msgstr "zwrócony obiekt nie może być przeiterowany"
+
+#: plpython.c:1136
+msgid "PL/Python set-returning functions must return an iterable object."
+msgstr "funkcje PL/Python zwracające grupę muszą zwracać iterowalny obiekt."
+
+#: plpython.c:1161
+msgid "error fetching next item from iterator"
+msgstr "błąd pobierania następnego elementu z iteratora"
+
+#: plpython.c:1196
+msgid "PL/Python function with return type \"void\" did not return None"
+msgstr "funkcja PL/Python zwracająca typ \"void\" nie zwróciła wartości None"
+
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "wymuszone przerywanie podtransakcji, która nie została zakończona"
+
+#: plpython.c:1403
+msgid "PyList_SetItem() failed, while setting up arguments"
+msgstr "nie powiodło się PyList_SetItem() podczas ustawiania argumentów"
+
+#: plpython.c:1407
+msgid "PyDict_SetItemString() failed, while setting up arguments"
+msgstr "nie powiodło się PyDict_SetItemString() podczas ustawiania argumentów"
+
+#: plpython.c:1419
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"funkcja zwracająca rekord w wywołaniu, które nie akceptuje typów złożonych"
+
+#: plpython.c:1653
+msgid "trigger functions can only be called as triggers"
+msgstr "procedury wyzwalaczy mogą być wywoływane jedynie przez wyzwalacze"
+
+#: plpython.c:1658 plpython.c:2131
+#, c-format
+msgid "PL/Python functions cannot return type %s"
+msgstr "funkcje PL/Python nie mogą zwracać wartości typu %s"
+
+#: plpython.c:1740
+#, c-format
+msgid "PL/Python functions cannot accept type %s"
+msgstr "funkcje PL/Python nie obsługują typu %s"
+
+#: plpython.c:1836
+#, c-format
+msgid "could not compile PL/Python function \"%s\""
+msgstr "nie powiodła się kompilacja funkcji PL/Python \"%s\""
+
+#: plpython.c:1839
+msgid "could not compile anonymous PL/Python code block"
+msgstr "nie udało się skompilować anonimowego bloku kodu PL/Python"
+
+#: plpython.c:2133
+msgid "PL/Python does not support conversion to arrays of row types."
+msgstr "PL/Python nie obsługuje konwersji typów wierszowych na tablice."
+
+#: plpython.c:2342
+msgid "cannot convert multidimensional array to Python list"
+msgstr "nie można skonwertować tablicy wielowymiarowej na listę Python"
+
+#: plpython.c:2343
+msgid "PL/Python only supports one-dimensional arrays."
+msgstr "PL/Python obsługuje tylko jednowymiarowe tablice."
+
+#: plpython.c:2382
+msgid "could not create new dictionary"
+msgstr "nie można utworzyć nowego słownika"
+
+#: plpython.c:2477
+msgid "could not create bytes representation of Python object"
+msgstr "nie można utworzyć reprezentacji bajtowej obiektu Python"
+
+#: plpython.c:2575
+msgid "could not create string representation of Python object"
+msgstr "nie można utworzyć reprezentacji znakowej obiektu Python"
+
+#: plpython.c:2586
+msgid ""
+"could not convert Python object into cstring: Python string representation "
+"appears to contain null bytes"
+msgstr ""
+"nie można zmienić obiektu Python na cstring: reprezentacja ciągu znaków "
+"Python wydaje się zawierać puste bajty"
+
+#: plpython.c:2620
+msgid ""
+"return value of function with array return type is not a Python sequence"
+msgstr ""
+"wartość zwrócona przez funkcję zwracającą tablicę nie jest sekwencją Python"
+
+#: plpython.c:2700
+#, c-format
+msgid "key \"%s\" not found in mapping"
+msgstr "nie odnaleziono klucza \"%s\" w mapowaniu"
+
+#: plpython.c:2701
+msgid ""
+"To return null in a column, add the value None to the mapping with the key "
+"named after the column."
+msgstr ""
+"Aby zwrócić null w kolumnie, dodaj wartość None do mapowania z kluczem "
+"nazwanym wedle kolumny."
+
+#: plpython.c:2749
+msgid "length of returned sequence did not match number of columns in row"
+msgstr "długość zwróconej sekwencji nie jest równa liczbie kolumn w wierszu"
+
+#: plpython.c:2857
+#, c-format
+msgid "attribute \"%s\" does not exist in Python object"
+msgstr "atrybut \"%s\" nie istnieje w obiekcie Python"
+
+#: plpython.c:2858
+msgid ""
+"To return null in a column, let the returned object have an attribute named "
+"after column with value None."
+msgstr ""
+"Aby zwrócić null w kolumnie, niech zwrócony obiekt posiada atrybut nazwany "
+"wedle kolumny z wartością None."
+
+#: plpython.c:3177
+msgid "plan.status takes no arguments"
+msgstr "plan.status nie przyjmuje żadnych argumentów"
+
+#: plpython.c:3301
+msgid "second argument of plpy.prepare must be a sequence"
+msgstr "drugi argument plpy.prepare musi być sekwencją"
+
+#: plpython.c:3351
+#, c-format
+msgid "plpy.prepare: type name at ordinal position %d is not a string"
+msgstr ""
+"plpy.prepare: nazwa typu na pozycji porządkowej %d nie jest ciągiem znaków"
+
+#: plpython.c:3383
+msgid "plpy.prepare does not support composite types"
+msgstr "plpy.prepare nie obsługuje typów złożonych"
+
+#: plpython.c:3473
+msgid "plpy.execute expected a query or a plan"
+msgstr "plpy.execute oczekuje kwerendy lub planu"
+
+#: plpython.c:3492
+msgid "plpy.execute takes a sequence as its second argument"
+msgstr "plpy.execute przyjmuje sekwencjÄ™ jako drugi argument"
+
+#: plpython.c:3508
+msgid "could not execute plan"
+msgstr "nie można wykonać planu"
+
+#: plpython.c:3511
+#, c-format
+msgid "Expected sequence of %d argument, got %d: %s"
+msgid_plural "Expected sequence of %d arguments, got %d: %s"
+msgstr[0] "Oczekiwano sekwencji z %d argumentem, mamy %d: %s"
+msgstr[1] "Oczekiwano sekwencji z %d argumentami, mamy %d: %s"
+msgstr[2] "Oczekiwano sekwencji z %d argumentami, mamy %d: %s"
+
+#: plpython.c:3653
+#, c-format
+msgid "SPI_execute_plan failed: %s"
+msgstr "nie powiódł się SPI_execute_plan: %s"
+
+#: plpython.c:3731
+#, c-format
+msgid "SPI_execute failed: %s"
+msgstr "nie powiódł się SPI_execute: %s"
+
+#: plpython.c:3786
+msgid "unrecognized error in PLy_spi_execute_fetch_result"
+msgstr "nierozpoznany błąd w PLy_spi_execute_fetch_result"
+
+#: plpython.c:3848
+msgid "this subtransaction has already been entered"
+msgstr "ta podtransakcja już została wprowadzona"
+
+#: plpython.c:3854 plpython.c:3906
+msgid "this subtransaction has already been exited"
+msgstr "ta podtransakcja już została zakończona"
+
+#: plpython.c:3900
+msgid "this subtransaction has not been entered"
+msgstr "ta podtransakcja nie została wprowadzona"
+
+#: plpython.c:3912
+msgid "there is no subtransaction to exit from"
+msgstr "brak podtransakcji by z niej wyjść"
+
+#: plpython.c:3994
+msgid "could not add the spiexceptions module"
+msgstr "nie udało się dodać modułu spiexceptions"
+
+#: plpython.c:4077
+msgid "Python major version mismatch in session"
+msgstr "niezgodna wersja główna Python w sesji"
+
+#: plpython.c:4078
+#, c-format
+msgid ""
+"This session has previously used Python major version %d, and it is now "
+"attempting to use Python major version %d."
+msgstr ""
+"Ta sesja używała poprzednio Python w głównej wersji %d, teraz próbuje użyć "
+"Python w głównej wersji %d."
+
+#: plpython.c:4080
+msgid "Start a new session to use a different Python major version."
+msgstr "Uruchom nową sesję aby użyć innej głównej wersji Python."
+
+#: plpython.c:4095
+msgid "untrapped error in initialization"
+msgstr "niewyłapany błąd w inicjacji"
+
+#: plpython.c:4123
+msgid "could not import \"__main__\" module"
+msgstr "nie można zaimportować modułu \"__main__\""
+
+#: plpython.c:4130
+msgid "could not initialize globals"
+msgstr "nie można zainicjować zmiennych globalnych"
+
+#: plpython.c:4243
+msgid "could not parse error message in plpy.elog"
+msgstr "nie można przetworzyć komunikatu błędu w plpy.elog"
+
+#: plpython.c:4267 plpython.c:4499 plpython.c:4500
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: plpython.c:4854
+msgid "could not convert Python Unicode object to PostgreSQL server encoding"
+msgstr ""
+"nie można zmienić obiektu unikodowego Python na kodowanie serwera PostgreSQL"
diff --git a/src/pl/plpython/po/pt_BR.po b/src/pl/plpython/po/pt_BR.po
index 5296d9fad87cb..68f0bcfaf059b 100644
--- a/src/pl/plpython/po/pt_BR.po
+++ b/src/pl/plpython/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for plpython
 # 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>, 2009-2010.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-09 10:18-0300\n"
+"POT-Creation-Date: 2011-08-21 15:17-0300\n"
 "PO-Revision-Date: 2009-05-10 01:15-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
@@ -17,57 +17,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "função PL/Python \"%s\""
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "bloco de código PL/Python anônimo"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "ao modificar registro de gatilho"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "ao criar valor de retorno"
 
-#: plpython.c:613 plpython.c:639
+#: plpython.c:707 plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "função de gatilho retornou valor inesperado"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "None ou uma cadeia de caracteres era esperado."
 
-#: plpython.c:629
+#: plpython.c:723
 msgid ""
 "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr ""
 "função de gatilho PL/Python retornou \"MODIFY\" em um gatilho DELETE -- "
 "ignorado"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Era esperado None, \"OK\", \"SKIP\" ou \"MODIFY\"."
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] removido, não pode modificar registro"
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] não é um dicionário"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr ""
 "chave do dicionário TD[\"new\"] na posição %d não é uma cadeia de caracteres"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid ""
 "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering "
@@ -76,115 +76,126 @@ msgstr ""
 "chave \"%s\" encontrada em TD[\"new\"] não existe como uma coluna no "
 "registro do gatilho"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "não pode criar novo dicionário ao construir argumentos do gatilho"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "modo de retorno da função que retorna conjunto não é suportado"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid ""
 "PL/Python set-returning functions only support returning only value per call."
 msgstr ""
 "funções PL/Python que retornam conjunto só suportam retornar um valor por "
 "chamada."
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "objeto retornado não pode ser iterado"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr ""
 "funções PL/Python que retornam conjunto devem retornar um objeto iterável."
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "erro ao buscar próximo item do iterador"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "função PL/Python com tipo de retorno \"void\" não retornou None"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "forçado a abortar subtransação que não foi concluída"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() falhou ao definir argumentos"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() falhou ao definir argumentos"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() falhou"
+#: plpython.c:1419
+msgid ""
+"function returning record called in context that cannot accept type record"
+msgstr ""
+"função que retorna record foi chamada em um contexto que não pode aceitar "
+"tipo record"
 
-#: plpython.c:1427
+#: plpython.c:1653
 msgid "trigger functions can only be called as triggers"
 msgstr "funções de gatilho só podem ser chamadas como gatilhos"
 
-#: plpython.c:1431 plpython.c:1815
+#: plpython.c:1658 plpython.c:2131
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "funções PL/Python não podem retornar tipo %s"
 
-#: plpython.c:1509
+#: plpython.c:1740
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "funções PL/Python não podem aceitar tipo %s"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() falhou"
-
-#: plpython.c:1606
+#: plpython.c:1836
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "não pôde compilar função PL/Python \"%s\""
 
-#: plpython.c:1817
+#: plpython.c:1839
+msgid "could not compile anonymous PL/Python code block"
+msgstr "não pôde compilar bloco de código PL/Python anônimo"
+
+#: plpython.c:2133
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python não suporta conversão para matrizes de tipos row."
 
-#: plpython.c:2020
+#: plpython.c:2342
 msgid "cannot convert multidimensional array to Python list"
 msgstr "não pode converter matriz multidimensional para lista Python"
 
-#: plpython.c:2021
+#: plpython.c:2343
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python só suporta matrizes unidimensionais."
 
-#: plpython.c:2057
+#: plpython.c:2382
 msgid "could not create new dictionary"
 msgstr "não pôde criar novo dicionário"
 
-#: plpython.c:2133
+#: plpython.c:2477
 msgid "could not create bytes representation of Python object"
 msgstr "não pôde criar representação de bytes de um objeto Python"
 
-#: plpython.c:2189
+#: plpython.c:2575
 msgid "could not create string representation of Python object"
 msgstr ""
 "não pôde criar representação de cadeia de caracteres de um objeto Python"
 
-#: plpython.c:2200
+#: plpython.c:2586
 msgid ""
 "could not convert Python object into cstring: Python string representation "
 "appears to contain null bytes"
-msgstr "não pôde converter objeto Python em cstring: representação de cadeia de caracteres Python parece conter bytes nulos"
+msgstr ""
+"não pôde converter objeto Python em cstring: representação de cadeia de "
+"caracteres Python parece conter bytes nulos"
 
-#: plpython.c:2233
+#: plpython.c:2620
 msgid ""
 "return value of function with array return type is not a Python sequence"
-msgstr "valor de retorno da função do tipo matriz retorna tipo que não é uma sequência Python"
+msgstr ""
+"valor de retorno da função do tipo matriz retorna tipo que não é uma "
+"sequência Python"
 
-#: plpython.c:2308
+#: plpython.c:2700
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "chave \"%s\" não foi encontrada no mapeamento"
 
-#: plpython.c:2309
+#: plpython.c:2701
 msgid ""
 "To return null in a column, add the value None to the mapping with the key "
 "named after the column."
@@ -192,17 +203,17 @@ msgstr ""
 "Para retornar nulo em uma coluna, adicionar o valor None no mapeamento cuja "
 "chave é o nome da coluna."
 
-#: plpython.c:2352
+#: plpython.c:2749
 msgid "length of returned sequence did not match number of columns in row"
 msgstr ""
 "tamanho da sequência retornada não combina com número de colunas no registro"
 
-#: plpython.c:2445
+#: plpython.c:2857
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "atributo \"%s\" não existe no objeto Python"
 
-#: plpython.c:2446
+#: plpython.c:2858
 msgid ""
 "To return null in a column, let the returned object have an attribute named "
 "after column with value None."
@@ -210,126 +221,117 @@ msgstr ""
 "Para retornar nulo na coluna, deixe o objeto retornado ter um atributo cuja "
 "chave é o nome do coluna e o valor é None."
 
-#: plpython.c:2680
+#: plpython.c:3177
 msgid "plan.status takes no arguments"
 msgstr "plan.status não contém argumentos"
 
-#: plpython.c:2804 plpython.c:2947
-msgid "transaction aborted"
-msgstr "transação interrompida"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "argumentos inválidos para plpy.prepare"
-
-#: plpython.c:2818
+#: plpython.c:3301
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "segundo argumento de plpy.prepare deve ser uma sequência"
 
-#: plpython.c:2868
+#: plpython.c:3351
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr ""
 "plpy.prepare: nome do tipo na posição %d não é uma cadeia de caracteres"
 
-#: plpython.c:2895
+#: plpython.c:3383
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare não suporta tipos compostos"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "erro desconhecido em PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpython.c:3473
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute espera uma consulta ou um plano"
 
-#: plpython.c:2977
+#: plpython.c:3492
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute recebe uma sequência como segundo argumento"
 
-#: plpython.c:2993
+#: plpython.c:3508
 msgid "could not execute plan"
 msgstr "não pôde executar plano"
 
-#: plpython.c:2996
+#: plpython.c:3511
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
 msgstr[0] "Sequência esperada de %d argumento, recebeu %d: %s"
 msgstr[1] "Sequência esperada de %d argumentos, recebeu %d: %s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "erro desconhecido em PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpython.c:3653
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan falhou: %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "erro desconhecido em PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpython.c:3731
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute falhou: %s"
 
-#: plpython.c:3185
+#: plpython.c:3786
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "erro desconhecido em PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
+#: plpython.c:3848
+msgid "this subtransaction has already been entered"
+msgstr "essa subtransação já foi iniciada"
+
+#: plpython.c:3854 plpython.c:3906
+msgid "this subtransaction has already been exited"
+msgstr "essa subtransação já foi concluída"
+
+#: plpython.c:3900
+msgid "this subtransaction has not been entered"
+msgstr "essa subtransação não foi iniciada"
+
+#: plpython.c:3912
+msgid "there is no subtransaction to exit from"
+msgstr "não há uma subtransação a ser concluída"
+
+#: plpython.c:3994
+msgid "could not add the spiexceptions module"
+msgstr "não pôde adicionar o módulo spiexceptions"
+
+#: plpython.c:4077
 msgid "Python major version mismatch in session"
 msgstr "versão do Python não corresponde na sessão"
 
-#: plpython.c:3240
+#: plpython.c:4078
 #, c-format
 msgid ""
 "This session has previously used Python major version %d, and it is now "
 "attempting to use Python major version %d."
-msgstr "Esta sessão utilizou Python versão %d, e agora está tentando utilizar Python versão %d."
+msgstr ""
+"Esta sessão utilizou Python versão %d, e agora está tentando utilizar Python "
+"versão %d."
 
-#: plpython.c:3242
+#: plpython.c:4080
 msgid "Start a new session to use a different Python major version."
 msgstr "Inicie uma nova sessão para utilizar uma versão diferente do Python."
 
-#: plpython.c:3257
+#: plpython.c:4095
 msgid "untrapped error in initialization"
 msgstr "erro não interceptado na inicialização"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "não pôde criar cache da função"
-
-#: plpython.c:3272
+#: plpython.c:4123
 msgid "could not import \"__main__\" module"
 msgstr "não pôde importar módulo \"__main__\""
 
-#: plpython.c:3279
+#: plpython.c:4130
 msgid "could not initialize globals"
 msgstr "não pôde inicializar globais"
 
-#: plpython.c:3397
+#: plpython.c:4243
 msgid "could not parse error message in plpy.elog"
 msgstr "não pode analisar mensagem de erro em plpy.elog"
 
-#: plpython.c:3526 plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3527
+#: plpython.c:4267 plpython.c:4499 plpython.c:4500
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "sem memória"
-
-#: plpython.c:3694
+#: plpython.c:4854
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
-msgstr "não pôde converter objeto Unicode Python para codificação do servidor PostgreSQL"
+msgstr ""
+"não pôde converter objeto Unicode Python para codificação do servidor "
+"PostgreSQL"
diff --git a/src/pl/plpython/po/ro.po b/src/pl/plpython/po/ro.po
index 0d5f8c32cdbf4..04d2313013d12 100644
--- a/src/pl/plpython/po/ro.po
+++ b/src/pl/plpython/po/ro.po
@@ -5,230 +5,224 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-09-04 19:58+0000\n"
-"PO-Revision-Date: 2010-09-26 19:49-0000\n"
-"Last-Translator: Max <max@oceanline.co.uk>\n"
-"Language-Team: Română <max@oceanline.co.uk>\n"
+"POT-Creation-Date: 2011-11-09 20:40+0000\n"
+"PO-Revision-Date: 2011-11-22 11:36-0000\n"
+"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
+"Language-Team: Română <xsoftware.consultancy@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-Country: ROMANIA\n"
 
-#: plpython.c:424
+#: plpython.c:475
 #, c-format
 msgid "PL/Python function \"%s\""
 msgstr "funcție PL/Python \"%s\""
 
-#: plpython.c:430
+#: plpython.c:482
 msgid "PL/Python anonymous code block"
 msgstr "bloc de cod PL/Python anonim"
 
-#: plpython.c:437
+#: plpython.c:489
 msgid "while modifying trigger row"
 msgstr "în timpul modificării triggerului de rând"
 
-#: plpython.c:444
+#: plpython.c:496
 msgid "while creating return value"
 msgstr "în timpul creării valorii rezultat"
 
-#: plpython.c:613
-#: plpython.c:639
+#: plpython.c:707
+#: plpython.c:733
 msgid "unexpected return value from trigger procedure"
 msgstr "procedura trigger a rezultat o valoare neașteptată"
 
-#: plpython.c:614
+#: plpython.c:708
 msgid "Expected None or a string."
 msgstr "așteptam None sau un șir String"
 
-#: plpython.c:629
+#: plpython.c:723
 msgid "PL/Python trigger function returned \"MODIFY\" in a DELETE trigger -- ignored"
 msgstr "funcția trigger PL/Python a rezultat \"MODIFY\" întro funcție trigger de tip DELETE  -- ignor"
 
-#: plpython.c:640
+#: plpython.c:734
 msgid "Expected None, \"OK\", \"SKIP\", or \"MODIFY\"."
 msgstr "Așteptam None, \"OK\", \"SKIP\", sau \"MODIFY\"."
 
-#: plpython.c:692
+#: plpython.c:786
 msgid "TD[\"new\"] deleted, cannot modify row"
 msgstr "TD[\"new\"] șters, nu poate modifica rândul "
 
-#: plpython.c:695
+#: plpython.c:789
 msgid "TD[\"new\"] is not a dictionary"
 msgstr "TD[\"new\"] nu este un dicționar"
 
-#: plpython.c:719
+#: plpython.c:813
 #, c-format
 msgid "TD[\"new\"] dictionary key at ordinal position %d is not a string"
 msgstr "TD[\"new\"] cheia dicționarului la poziția %d nu este un șir String"
 
-#: plpython.c:725
+#: plpython.c:819
 #, c-format
 msgid "key \"%s\" found in TD[\"new\"] does not exist as a column in the triggering row"
 msgstr "cheia \"%s\" găsită în TD[\"new\"] nu există ca și coloană în rândul care a activat triggerul"
 
-#: plpython.c:819
+#: plpython.c:915
 msgid "could not create new dictionary while building trigger arguments"
 msgstr "nu pot crea un nou dicționar în timp ce construiesc argumentele triggerului"
 
-#: plpython.c:1026
+#: plpython.c:1122
 msgid "unsupported set function return mode"
 msgstr "mod de returnare a funcției set nesuportat"
 
-#: plpython.c:1027
+#: plpython.c:1123
 msgid "PL/Python set-returning functions only support returning only value per call."
 msgstr "funcțiile PL/Python ce returnează doar seturi suportă doar o singură valoare returnată la fiecare apel."
 
-#: plpython.c:1039
+#: plpython.c:1135
 msgid "returned object cannot be iterated"
 msgstr "obiectul returnat nu poate fi iterat"
 
-#: plpython.c:1040
+#: plpython.c:1136
 msgid "PL/Python set-returning functions must return an iterable object."
 msgstr "funcțiile PL/Python ce returnează seturi trebuie să aibă ca rezultat un obiect iterabil."
 
-#: plpython.c:1067
+#: plpython.c:1161
 msgid "error fetching next item from iterator"
 msgstr "eroare la obținerea următorului element din iterator"
 
-#: plpython.c:1089
+#: plpython.c:1196
 msgid "PL/Python function with return type \"void\" did not return None"
 msgstr "funcția PL/Python cu rezultatul de tip \"void\" nu a returbat None"
 
-#: plpython.c:1246
+#: plpython.c:1287
+msgid "forcibly aborting a subtransaction that has not been exited"
+msgstr "intrerupere forţată a unei subtranzacţii din care nu s-a ieşit"
+
+#: plpython.c:1403
 msgid "PyList_SetItem() failed, while setting up arguments"
 msgstr "PyList_SetItem() a eșuat, în timpul creării argumentelor"
 
-#: plpython.c:1250
+#: plpython.c:1407
 msgid "PyDict_SetItemString() failed, while setting up arguments"
 msgstr "PyDict_SetItemString() a eșuat, în timpul creării argumentelor"
 
-#: plpython.c:1319
-msgid "PyCObject_AsVoidPtr() failed"
-msgstr "PyCObject_AsVoidPtr() a eșuat"
+#: plpython.c:1419
+msgid "function returning record called in context that cannot accept type record"
+msgstr "apel de funcție care are rezultat de tip rând într-un context care nu acceptă tipul rând"
 
-#: plpython.c:1427
+#: plpython.c:1653
 msgid "trigger functions can only be called as triggers"
 msgstr "funcţiile trigger pot fi apelate doar ca triggere"
 
-#: plpython.c:1431
-#: plpython.c:1815
+#: plpython.c:1658
+#: plpython.c:2131
 #, c-format
 msgid "PL/Python functions cannot return type %s"
 msgstr "funcțiile PL/Python nu pot returna tipul %s"
 
-#: plpython.c:1509
+#: plpython.c:1740
 #, c-format
 msgid "PL/Python functions cannot accept type %s"
 msgstr "funcțiile PL/Python nu pot accepta tipul %s"
 
-#: plpython.c:1548
-msgid "PyCObject_FromVoidPtr() failed"
-msgstr "PyCObject_FromVoidPtr() a eșuat"
-
-#: plpython.c:1606
+#: plpython.c:1836
 #, c-format
 msgid "could not compile PL/Python function \"%s\""
 msgstr "nu pot compila funcția PL/Python \"%s\""
 
-#: plpython.c:1817
+#: plpython.c:1839
+msgid "could not compile anonymous PL/Python code block"
+msgstr "nu pot compila codul bloc anonim PL/Python"
+
+#: plpython.c:2133
 msgid "PL/Python does not support conversion to arrays of row types."
 msgstr "PL/Python nu suportă conversia în array-uri de tip rând."
 
-#: plpython.c:2020
+#: plpython.c:2342
 msgid "cannot convert multidimensional array to Python list"
 msgstr "nu pot converti un array-ul  mai multe dimensiuni într-o listă Python"
 
-#: plpython.c:2021
+#: plpython.c:2343
 msgid "PL/Python only supports one-dimensional arrays."
 msgstr "PL/Python suportă doar array-uri cu o dimensiune."
 
-#: plpython.c:2057
+#: plpython.c:2382
 msgid "could not create new dictionary"
 msgstr "nu pot crea un nou dicționar"
 
-#: plpython.c:2133
+#: plpython.c:2477
 msgid "could not create bytes representation of Python object"
 msgstr "nu pot crea reprezentarea octet a obiectului Python"
 
-#: plpython.c:2189
+#: plpython.c:2575
 msgid "could not create string representation of Python object"
 msgstr "nu pot crea reprezentarea șir String a obiectului Python"
 
-#: plpython.c:2200
+#: plpython.c:2586
 msgid "could not convert Python object into cstring: Python string representation appears to contain null bytes"
 msgstr "nu pot converti obiectul Python într-un cstring: reprezentarea string a obiectului Python pare să conțină octeți nuli"
 
-#: plpython.c:2233
+#: plpython.c:2620
 msgid "return value of function with array return type is not a Python sequence"
 msgstr "return value of function with array return type is not a Python sequence"
 
-#: plpython.c:2308
+#: plpython.c:2700
 #, c-format
 msgid "key \"%s\" not found in mapping"
 msgstr "cheia \"%s\" nu e gasită în mapare"
 
-#: plpython.c:2309
+#: plpython.c:2701
 msgid "To return null in a column, add the value None to the mapping with the key named after the column."
 msgstr "Pentru a obșine null într-o coloană, adăugați valoarea None la mapare cu cheia numită cu numele coloanei."
 
-#: plpython.c:2352
+#: plpython.c:2749
 msgid "length of returned sequence did not match number of columns in row"
 msgstr "lungimea secvenței returnate nu se potrivește cu numărul de coloane din rând"
 
-#: plpython.c:2445
+#: plpython.c:2857
 #, c-format
 msgid "attribute \"%s\" does not exist in Python object"
 msgstr "atributul \"%s\" nu există în obiectul Python"
 
-#: plpython.c:2446
+#: plpython.c:2858
 msgid "To return null in a column, let the returned object have an attribute named after column with value None."
 msgstr "Pentru a abține null într-o coloană, obiectul returnat trebuie să aibă un atribut cu numele coloanei și cu valoarea None."
 
-#: plpython.c:2680
+#: plpython.c:3177
 msgid "plan.status takes no arguments"
 msgstr "plan.status nu acceptă argumente"
 
-#: plpython.c:2804
-#: plpython.c:2947
-msgid "transaction aborted"
-msgstr "tranzacție anulată"
-
-#: plpython.c:2811
-msgid "invalid arguments for plpy.prepare"
-msgstr "argumente invalide pentru plpy.prepare"
-
-#: plpython.c:2818
+#: plpython.c:3301
 msgid "second argument of plpy.prepare must be a sequence"
 msgstr "al doilea argument al plpy.prepare trebuie să fie o secvență"
 
-#: plpython.c:2868
+#: plpython.c:3351
 #, c-format
 msgid "plpy.prepare: type name at ordinal position %d is not a string"
 msgstr "plpy.prepare: numele tipului la poziția %d nu este un șir"
 
-#: plpython.c:2895
+#: plpython.c:3383
 msgid "plpy.prepare does not support composite types"
 msgstr "plpy.prepare nu suportă tipul compozit"
 
-#: plpython.c:2924
-msgid "unrecognized error in PLy_spi_prepare"
-msgstr "eroare necunoscută în PLy_spi_prepare"
-
-#: plpython.c:2960
+#: plpython.c:3473
 msgid "plpy.execute expected a query or a plan"
 msgstr "plpy.execute aștepta o interogare sau un plan"
 
-#: plpython.c:2977
+#: plpython.c:3492
 msgid "plpy.execute takes a sequence as its second argument"
 msgstr "plpy.execute acceptă o secvență ca al doilea argument"
 
-#: plpython.c:2993
+#: plpython.c:3508
 msgid "could not execute plan"
 msgstr "nu pot executa planul"
 
-#: plpython.c:2996
+#: plpython.c:3511
 #, c-format
 msgid "Expected sequence of %d argument, got %d: %s"
 msgid_plural "Expected sequence of %d arguments, got %d: %s"
@@ -236,77 +230,107 @@ msgstr[0] "Secvența așteptată a argumentului %d, a obținut %d: %s"
 msgstr[1] "Secvența așteptată a argumentelor %d, a obținut %d: %s"
 msgstr[2] "Secvența așteptată a argumentelor %d, a obținut %d: %s"
 
-#: plpython.c:3073
-msgid "unrecognized error in PLy_spi_execute_plan"
-msgstr "eroare necunoscută în PLy_spi_execute_plan"
-
-#: plpython.c:3092
+#: plpython.c:3653
 #, c-format
 msgid "SPI_execute_plan failed: %s"
 msgstr "SPI_execute_plan a eșuat: %s"
 
-#: plpython.c:3119
-msgid "unrecognized error in PLy_spi_execute_query"
-msgstr "eroare necunoscută în PLy_spi_execute_query"
-
-#: plpython.c:3128
+#: plpython.c:3731
 #, c-format
 msgid "SPI_execute failed: %s"
 msgstr "SPI_execute a eșuat: %s"
 
-#: plpython.c:3185
+#: plpython.c:3786
 msgid "unrecognized error in PLy_spi_execute_fetch_result"
 msgstr "eroare necunoscută în PLy_spi_execute_fetch_result"
 
-#: plpython.c:3239
+#: plpython.c:3848
+msgid "this subtransaction has already been entered"
+msgstr "am intrat deja în acestă subtranzacţie"
+
+#: plpython.c:3854
+#: plpython.c:3906
+msgid "this subtransaction has already been exited"
+msgstr "am ieşit deja din această subtranzacţie"
+
+#: plpython.c:3900
+msgid "this subtransaction has not been entered"
+msgstr "nu s-a intrat în această subtranzacţie"
+
+#: plpython.c:3912
+msgid "there is no subtransaction to exit from"
+msgstr "nu există nici o subtranzacţie din care să ieşim"
+
+#: plpython.c:3994
+msgid "could not add the spiexceptions module"
+msgstr "nu pot adăuga modulul spiexceptions "
+
+#: plpython.c:4077
 msgid "Python major version mismatch in session"
 msgstr "nepotrivire în sesiune de versiune majoră Python"
 
-#: plpython.c:3240
+#: plpython.c:4078
 #, c-format
 msgid "This session has previously used Python major version %d, and it is now attempting to use Python major version %d."
 msgstr "Această sesiune a folosit versiunea majoră de Python %d și acum încearcă să folosească versiunea majoră de Python %d."
 
-#: plpython.c:3242
+#: plpython.c:4080
 msgid "Start a new session to use a different Python major version."
 msgstr "Începe o nouă sesiune pentru a folosi o versiune majoră de Python diferită"
 
-#: plpython.c:3257
+#: plpython.c:4095
 msgid "untrapped error in initialization"
 msgstr "eroare netratată la inițializare"
 
-#: plpython.c:3260
-msgid "could not create procedure cache"
-msgstr "nu pot crea procedura cache"
-
-#: plpython.c:3272
+#: plpython.c:4123
 msgid "could not import \"__main__\" module"
 msgstr "nu pot importa modulul \"__main__\""
 
-#: plpython.c:3279
+#: plpython.c:4130
 msgid "could not initialize globals"
 msgstr "nu pot inițializa globals"
 
-#: plpython.c:3397
+#: plpython.c:4243
 msgid "could not parse error message in plpy.elog"
 msgstr "nu pot analiza mesajul de eroare în plpy.elog"
 
-#: plpython.c:3526
-#: plpython.c:3530
-#, c-format
-msgid "PL/Python: %s"
-msgstr "PL/Python: %s"
-
-#: plpython.c:3527
+#: plpython.c:4267
+#: plpython.c:4499
+#: plpython.c:4500
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: plpython.c:3640
-msgid "out of memory"
-msgstr "memorie insuficientă"
-
-#: plpython.c:3694
+#: plpython.c:4854
 msgid "could not convert Python Unicode object to PostgreSQL server encoding"
 msgstr "nu pot converti obiectul Unicode Python Unicode în codificarea folosită de serverul PostgreSQL"
 
+#~ msgid "PyCObject_AsVoidPtr() failed"
+#~ msgstr "PyCObject_AsVoidPtr() a eșuat"
+
+#~ msgid "PyCObject_FromVoidPtr() failed"
+#~ msgstr "PyCObject_FromVoidPtr() a eșuat"
+
+#~ msgid "transaction aborted"
+#~ msgstr "tranzacție anulată"
+
+#~ msgid "invalid arguments for plpy.prepare"
+#~ msgstr "argumente invalide pentru plpy.prepare"
+
+#~ msgid "unrecognized error in PLy_spi_prepare"
+#~ msgstr "eroare necunoscută în PLy_spi_prepare"
+
+#~ msgid "unrecognized error in PLy_spi_execute_plan"
+#~ msgstr "eroare necunoscută în PLy_spi_execute_plan"
+
+#~ msgid "unrecognized error in PLy_spi_execute_query"
+#~ msgstr "eroare necunoscută în PLy_spi_execute_query"
+
+#~ msgid "could not create procedure cache"
+#~ msgstr "nu pot crea procedura cache"
+
+#~ msgid "PL/Python: %s"
+#~ msgstr "PL/Python: %s"
+
+#~ msgid "out of memory"
+#~ msgstr "memorie insuficientă"
diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
index 4add6aaf05c90..502bbec38f458 100644
--- a/src/pl/plpython/sql/plpython_error.sql
+++ b/src/pl/plpython/sql/plpython_error.sql
@@ -257,6 +257,26 @@ SELECT specific_exception(2);
 SELECT specific_exception(NULL);
 SELECT specific_exception(2);
 
+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
+ */
+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
+plpy.execute("insert into specific values (1)")
+plpy.execute("insert into specific values (1)")
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
+begin
+    begin
+        perform python_unique_violation();
+    exception when unique_violation then
+        return 'ok';
+    end;
+    return 'not reached';
+end;
+$$ language plpgsql;
+
+SELECT catch_python_unique_violation();
+
 /* manually starting subtransactions - a bad idea
  */
 CREATE FUNCTION manual_subxact() RETURNS void AS $$
diff --git a/src/pl/plpython/sql/plpython_record.sql b/src/pl/plpython/sql/plpython_record.sql
index d727e6054ffcc..8df65fbfe1f3a 100644
--- a/src/pl/plpython/sql/plpython_record.sql
+++ b/src/pl/plpython/sql/plpython_record.sql
@@ -112,6 +112,21 @@ SELECT * FROM test_in_out_params('test_in');
 SELECT * FROM test_in_out_params_multi('test_in');
 SELECT * FROM test_inout_params('test_in');
 
+-- try changing the return types and call functions again
+
+ALTER TABLE table_record DROP COLUMN first;
+ALTER TABLE table_record DROP COLUMN second;
+ALTER TABLE table_record ADD COLUMN first text;
+ALTER TABLE table_record ADD COLUMN second int4;
+
+SELECT * FROM test_table_record_as('obj', 'one', 1, false);
+
+ALTER TYPE type_record DROP ATTRIBUTE first;
+ALTER TYPE type_record DROP ATTRIBUTE second;
+ALTER TYPE type_record ADD ATTRIBUTE first text;
+ALTER TYPE type_record ADD ATTRIBUTE second int4;
+
+SELECT * FROM test_type_record_as('obj', 'one', 1, false);
 
 -- errors cases
 
diff --git a/src/pl/tcl/nls.mk b/src/pl/tcl/nls.mk
index 1fc912c5ebab2..80988f1ceaf61 100644
--- a/src/pl/tcl/nls.mk
+++ b/src/pl/tcl/nls.mk
@@ -1,5 +1,5 @@
 # src/pl/tcl/nls.mk
 CATALOG_NAME	:= pltcl
-AVAIL_LANGUAGES	:= de es fr it ja pt_BR ro tr zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it ja pl pt_BR ro tr zh_CN zh_TW
 GETTEXT_FILES	:= pltcl.c
 GETTEXT_TRIGGERS:= errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext
diff --git a/src/pl/tcl/pltcl--1.0.sql b/src/pl/tcl/pltcl--1.0.sql
index 897e1a1fe9297..ecb264c818f19 100644
--- a/src/pl/tcl/pltcl--1.0.sql
+++ b/src/pl/tcl/pltcl--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE pltcl;
+
+COMMENT ON PROCEDURAL LANGUAGE pltcl IS 'PL/Tcl procedural language';
diff --git a/src/pl/tcl/pltclu--1.0.sql b/src/pl/tcl/pltclu--1.0.sql
index e53bb04e6d383..72dcef11e5b2b 100644
--- a/src/pl/tcl/pltclu--1.0.sql
+++ b/src/pl/tcl/pltclu--1.0.sql
@@ -7,3 +7,5 @@
  */
 
 CREATE PROCEDURAL LANGUAGE pltclu;
+
+COMMENT ON PROCEDURAL LANGUAGE pltclu IS 'PL/TclU untrusted procedural language';
diff --git a/src/pl/tcl/po/cs.po b/src/pl/tcl/po/cs.po
new file mode 100644
index 0000000000000..827d2303b5df0
--- /dev/null
+++ b/src/pl/tcl/po/cs.po
@@ -0,0 +1,55 @@
+# LANGUAGE message translation file for pltcl
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.0\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-04 02:52+0000\n"
+"PO-Revision-Date: 2011-09-04 23:43+0200\n"
+"Last-Translator: \n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pltcl.c:1149
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pltcl.c:1150
+#, c-format
+msgid ""
+"%s\n"
+"in PL/Tcl function \"%s\""
+msgstr ""
+"%s\n"
+"v PL/Tcl funkci \"%s\""
+
+#: pltcl.c:1254 pltcl.c:1261
+msgid "out of memory"
+msgstr "nedostatek paměti"
+
+#: pltcl.c:1308
+msgid "trigger functions can only be called as triggers"
+msgstr "trigger funkce mohou může být volány pouze jako triggery"
+
+#: pltcl.c:1317
+#, c-format
+msgid "PL/Tcl functions cannot return type %s"
+msgstr "PL/Tcl funkce nemohou vracet datový typ %s"
+
+#: pltcl.c:1329
+msgid "PL/Tcl functions cannot return composite types"
+msgstr "PL/Tcl funkce nemohou vracet složené datové typy"
+
+#: pltcl.c:1368
+#, c-format
+msgid "PL/Tcl functions cannot accept type %s"
+msgstr "PL/Tcl funkce nemohou přijímat datový typ %s"
diff --git a/src/pl/tcl/po/pl.po b/src/pl/tcl/po/pl.po
new file mode 100644
index 0000000000000..e2203c835fd7a
--- /dev/null
+++ b/src/pl/tcl/po/pl.po
@@ -0,0 +1,56 @@
+# pltcl message translation file for pltcl
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+# Begina Felicysym <begina.felicysym@wp.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: pltcl (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-09-29 22:53+0000\n"
+"PO-Revision-Date: 2011-09-30 09:50-0300\n"
+"Last-Translator: Begina Felicysym <begina.felicysym@wp.eu>\n"
+"Language-Team: Polish TotroiseSvn translation team\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+
+#: pltcl.c:1149
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: pltcl.c:1150
+#, c-format
+msgid ""
+"%s\n"
+"in PL/Tcl function \"%s\""
+msgstr ""
+"%s\n"
+"w funkcji PL/Tcl \"%s\""
+
+#: pltcl.c:1254 pltcl.c:1261
+msgid "out of memory"
+msgstr "brak pamięci"
+
+#: pltcl.c:1308
+msgid "trigger functions can only be called as triggers"
+msgstr "procedury wyzwalaczy mogą być wywoływane jedynie przez wyzwalacze"
+
+#: pltcl.c:1317
+#, c-format
+msgid "PL/Tcl functions cannot return type %s"
+msgstr "funkcje PL/Perl nie mogą zwracać wartości typu %s"
+
+#: pltcl.c:1329
+msgid "PL/Tcl functions cannot return composite types"
+msgstr "funkcje PL/Tcl nie mogą zwracać wartości złożonych"
+
+#: pltcl.c:1368
+#, c-format
+msgid "PL/Tcl functions cannot accept type %s"
+msgstr "funkcje PL/Tcl nie akceptujÄ… typu %s"
diff --git a/src/pl/tcl/po/pt_BR.po b/src/pl/tcl/po/pt_BR.po
index a17cfab6c598f..39d3215dc9f7a 100644
--- a/src/pl/tcl/po/pt_BR.po
+++ b/src/pl/tcl/po/pt_BR.po
@@ -1,14 +1,14 @@
 # Brazilian Portuguese message translation file for pltcl
 # 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>, 2009.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
 "POT-Creation-Date: 2009-05-06 18:00-0300\n"
-"PO-Revision-Date: 2009-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2009-05-06 18:00-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
 "Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
 "MIME-Version: 1.0\n"
diff --git a/src/port/erand48.c b/src/port/erand48.c
index 64db7a5376c88..f58a9808b416b 100644
--- a/src/port/erand48.c
+++ b/src/port/erand48.c
@@ -92,7 +92,7 @@ srand48(long seed)
 {
 	_rand48_seed[0] = RAND48_SEED_0;
 	_rand48_seed[1] = (unsigned short) seed;
-	_rand48_seed[2] = (unsigned short) (seed > 16);
+	_rand48_seed[2] = (unsigned short) (seed >> 16);
 	_rand48_mult[0] = RAND48_MULT_0;
 	_rand48_mult[1] = RAND48_MULT_1;
 	_rand48_mult[2] = RAND48_MULT_2;
diff --git a/src/port/path.c b/src/port/path.c
index 0d40a0bb9c1c2..6991bc7247b60 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -304,7 +304,7 @@ canonicalize_path(char *path)
 		}
 		else if (pending_strips > 0 && *spath != '\0')
 		{
-			/* trim a regular directory name cancelled by ".." */
+			/* trim a regular directory name canceled by ".." */
 			trim_directory(path);
 			pending_strips--;
 			/* foo/.. should become ".", not empty */
diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c
new file mode 100644
index 0000000000000..a301e769a769d
--- /dev/null
+++ b/src/port/win32setlocale.c
@@ -0,0 +1,115 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32setlocale.c
+ *		Wrapper to work around bugs in Windows setlocale() implementation
+ *
+ * Copyright (c) 2011, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  src/port/win32setlocale.c
+ *
+ *
+ * Windows has a problem with locale names that have a dot in the country
+ * name. For example:
+ *
+ * "Chinese (Traditional)_Hong Kong S.A.R..950"
+ *
+ * For some reason, setlocale() doesn't accept that. Fortunately, Windows'
+ * setlocale() accepts various alternative names for such countries, so we
+ * provide a wrapper setlocale() function that maps the troublemaking locale
+ * names to accepted aliases.
+ *-------------------------------------------------------------------------
+ */
+
+#include "c.h"
+
+#undef setlocale
+
+struct locale_map
+{
+	const char *locale_name_part;	/* string in locale name to replace */
+	const char *replacement;		/* string to replace it with */
+};
+
+static const struct locale_map locale_map_list[] = {
+
+	/*
+	 * "HKG" is listed here:
+	 * http://msdn.microsoft.com/en-us/library/cdax410z%28v=vs.71%29.aspx
+	 * (Country/Region Strings).
+	 *
+	 * "ARE" is the ISO-3166 three-letter code for U.A.E. It is not on the
+	 * above list, but seems to work anyway.
+	 */
+	{ "Hong Kong S.A.R.",						"HKG" },
+	{ "U.A.E.",									"ARE" },
+
+	/*
+	 * The ISO-3166 country code for Macau S.A.R. is MAC, but Windows doesn't
+	 * seem to recognize that. And Macau isn't listed in the table of
+	 * accepted abbreviations linked above. Fortunately, "ZHM" seems to be
+	 * accepted as an alias for "Chinese (Traditional)_Macau S.A.R..950". I'm
+	 * not sure where "ZHM" comes from, must be some legacy naming scheme. But
+	 * hey, it works.
+	 *
+	 * Note that unlike HKG and ARE, ZHM is an alias for the *whole* locale
+	 * name, not just the country part.
+	 *
+	 * Some versions of Windows spell it "Macau", others "Macao".
+	 */
+	{ "Chinese (Traditional)_Macau S.A.R..950",	"ZHM" },
+	{ "Chinese_Macau S.A.R..950",				"ZHM" },
+	{ "Chinese (Traditional)_Macao S.A.R..950",	"ZHM" },
+	{ "Chinese_Macao S.A.R..950",				"ZHM" }
+};
+
+char *
+pgwin32_setlocale(int category, const char *locale)
+{
+	char	   *result;
+	char	   *alias;
+	int			i;
+
+	if (locale == NULL)
+		return setlocale(category, locale);
+
+	/* Check if the locale name matches any of the problematic ones. */
+	alias = NULL;
+	for (i = 0; i < lengthof(locale_map_list); i++)
+	{
+		const char *needle = locale_map_list[i].locale_name_part;
+		const char *replacement = locale_map_list[i].replacement;
+		char	   *match;
+
+		match = strstr(locale, needle);
+		if (match != NULL)
+		{
+			/* Found a match. Replace the matched string. */
+			int		matchpos = match - locale;
+			int		replacementlen = strlen(replacement);
+			char   *rest = match + strlen(needle);
+			int		restlen = strlen(rest);
+
+			alias = malloc(matchpos + replacementlen + restlen + 1);
+			if (!alias)
+				return NULL;
+
+			memcpy(&alias[0], &locale[0], matchpos);
+			memcpy(&alias[matchpos], replacement, replacementlen);
+			memcpy(&alias[matchpos + replacementlen], rest, restlen + 1); /* includes null terminator */
+
+			break;
+		}
+	}
+
+	/* Call the real setlocale() function */
+	if (alias)
+	{
+		result = setlocale(category, alias);
+		free(alias);
+	}
+	else
+		result = setlocale(category, locale);
+
+	return result;
+}
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index a6fddc38bc8d1..fbfad339ef1de 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    9,1,0,0
- PRODUCTVERSION 9,1,0,0
+ FILEVERSION    9,1,2,0
+ PRODUCTVERSION 9,1,2,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32
diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index f47c5e36bb9c2..850993f6e82af 100644
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 		while ((notify = PQnotifies(conn)) != NULL)
 		{
 			fprintf(stderr,
-					"ASYNC NOTIFY of '%s' received from backend pid %d\n",
+					"ASYNC NOTIFY of '%s' received from backend PID %d\n",
 					notify->relname, notify->be_pid);
 			PQfreemem(notify);
 			nnotifies++;
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 7cbcd4b4038a6..80a8a25bb3f13 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -73,7 +73,7 @@ maintainer-clean: distclean
 	rm -f specparse.c specscanner.c
 
 installcheck: all
-	./pg_isolation_regress --psqldir=$(PSQLDIR) --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
+	./pg_isolation_regress --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
 
 # We can't support "make check" because isolationtester requires libpq, and
 # in fact (on typical platforms using shared libraries) requires libpq to
diff --git a/src/test/isolation/README b/src/test/isolation/README
index 087ac279c7a42..aeef7f6c3ab5a 100644
--- a/src/test/isolation/README
+++ b/src/test/isolation/README
@@ -5,13 +5,20 @@ Isolation tests
 
 This directory contains a set of tests for the serializable isolation level.
 Testing isolation requires running multiple overlapping transactions,
-which requires multiple concurrent connections, and can't therefore be
+which requires multiple concurrent connections, and therefore can't be
 tested using the normal pg_regress program.
 
+To run the tests, you need to have a server running at the default port
+expected by libpq.  (You can set PGPORT and so forth in your environment
+to control this.)  Then run
+    gmake installcheck
+Note that the prepared-transactions test will not pass unless you have
+the server's max_prepared_transactions parameter set to at least 3.
+
 To represent a test with overlapping transactions, we use a test specification
-file with a custom syntax, described in the next section.
+file with a custom syntax, which is described in the next section.
 
-isolationtester is program that uses libpq to open multiple connections,
+isolationtester is a program that uses libpq to open multiple connections,
 and executes a test specified by a spec file. A libpq connection string
 specifies the server and database to connect to; defaults derived from
 environment variables are used otherwise.
@@ -19,8 +26,6 @@ environment variables are used otherwise.
 pg_isolation_regress is a tool similar to pg_regress, but instead of using
 psql to execute a test, it uses isolationtester.
 
-To run the tests, you need to have a server up and running. Run
-    gmake installcheck
 
 Test specification
 ==================
@@ -63,3 +68,16 @@ permutation "<step name>" ...
   all possible overlapping orderings of the given sessions.
 
 Lines beginning with a # are considered comments.
+
+
+Support for blocking commands
+=============================
+
+Each spec may contain commands that block until further action has been taken
+(most likely, some other session runs a step that unblocks it or causes a
+deadlock).  Such a spec needs to be careful to manually specify valid
+permutations, i.e. those that would not expect a blocked session to execute a
+command.  If the spec fails to follow that rule, the spec is aborted.
+
+Only one command can be waiting at a time.  As long as one command is waiting,
+other commands are run to completion synchronously.
diff --git a/src/test/isolation/expected/classroom-scheduling.out b/src/test/isolation/expected/classroom-scheduling.out
index faae14f45a7a5..f02638c0b55c5 100644
--- a/src/test/isolation/expected/classroom-scheduling.out
+++ b/src/test/isolation/expected/classroom-scheduling.out
@@ -1,299 +1,299 @@
 Parsed test spec with 2 sessions
 
 starting permutation: rx1 wy1 c1 ry2 wx2 c2
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 1              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 ry2 c1 wx2 c2
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step c1:  COMMIT; 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
+step c1: COMMIT;
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 ry2 wx2 c1 c2
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 wy1 ry2 wx2 c2 c1
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wy1 c1 wx2 c2
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 ry2 wy1 wx2 c1 c2
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wy1 wx2 c2 c1
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 wy1 c1 c2
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 wy1 c2 c1
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 c2 wy1 c1
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 rx1 wy1 c1 wx2 c2
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: ry2 rx1 wy1 wx2 c1 c2
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wy1 wx2 c2 c1
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 wy1 c1 c2
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 wy1 c2 c1
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 c2 wy1 c1
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 wx2 rx1 wy1 c1 c2
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 wx2 rx1 wy1 c2 c1
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 wx2 rx1 c2 wy1 c1
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 0              
-step c2:  COMMIT; 
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
+step c2: COMMIT;
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 wx2 c2 rx1 wy1 c1
-step ry2:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30'; 
+step ry2: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:30';
 count          
 
 0              
-step wx2:  UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00'; 
-step c2:  COMMIT; 
-step rx1:  SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00'; 
+step wx2: UPDATE room_reservation SET start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 13:30', end_time = TIMESTAMP WITH TIME ZONE '2010-04-01 14:30' WHERE room_id = '101' AND start_time = TIMESTAMP WITH TIME ZONE '2010-04-01 10:00';
+step c2: COMMIT;
+step rx1: SELECT count(*) FROM room_reservation WHERE room_id = '101' AND start_time < TIMESTAMP WITH TIME ZONE '2010-04-01 14:00' AND end_time > TIMESTAMP WITH TIME ZONE '2010-04-01 13:00';
 count          
 
 1              
-step wy1:  INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol'); 
-step c1:  COMMIT; 
+step wy1: INSERT INTO room_reservation VALUES ('101', TIMESTAMP WITH TIME ZONE '2010-04-01 13:00', TIMESTAMP WITH TIME ZONE '2010-04-01 14:00', 'Carol');
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/multiple-row-versions.out b/src/test/isolation/expected/multiple-row-versions.out
index bbd3ecc0f73ef..d6a0c427fce0b 100644
--- a/src/test/isolation/expected/multiple-row-versions.out
+++ b/src/test/isolation/expected/multiple-row-versions.out
@@ -1,24 +1,24 @@
 Parsed test spec with 4 sessions
 
 starting permutation: rx1 wx2 c2 wx3 ry3 wy4 rz4 c4 c3 wz1 c1
-step rx1:  SELECT * FROM t WHERE id = 1000000; 
+step rx1: SELECT * FROM t WHERE id = 1000000;
 id             txt            
 
 1000000                       
-step wx2:  UPDATE t SET txt = 'b' WHERE id = 1000000; 
-step c2:  COMMIT; 
-step wx3:  UPDATE t SET txt = 'c' WHERE id = 1000000; 
-step ry3:  SELECT * FROM t WHERE id = 500000; 
+step wx2: UPDATE t SET txt = 'b' WHERE id = 1000000;
+step c2: COMMIT;
+step wx3: UPDATE t SET txt = 'c' WHERE id = 1000000;
+step ry3: SELECT * FROM t WHERE id = 500000;
 id             txt            
 
 500000                        
-step wy4:  UPDATE t SET txt = 'd' WHERE id = 500000; 
-step rz4:  SELECT * FROM t WHERE id = 1; 
+step wy4: UPDATE t SET txt = 'd' WHERE id = 500000;
+step rz4: SELECT * FROM t WHERE id = 1;
 id             txt            
 
 1                             
-step c4:  COMMIT; 
-step c3:  COMMIT; 
-step wz1:  UPDATE t SET txt = 'a' WHERE id = 1; 
+step c4: COMMIT;
+step c3: COMMIT;
+step wz1: UPDATE t SET txt = 'a' WHERE id = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/partial-index.out b/src/test/isolation/expected/partial-index.out
index 1230513675e5b..d1f00c9b3ce09 100644
--- a/src/test/isolation/expected/partial-index.out
+++ b/src/test/isolation/expected/partial-index.out
@@ -1,7 +1,7 @@
 Parsed test spec with 2 sessions
 
 starting permutation: rxy1 wx1 c1 wy2 rxy2 c2
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -15,10 +15,10 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -30,10 +30,10 @@ id             val1           val2
 6              a              1              
 7              a              1              
 8              a              1              
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rxy1 wx1 wy2 c1 rxy2 c2
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -47,15 +47,15 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step c1:  COMMIT; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step c1: COMMIT;
+step rxy2: select * from test_t where val2 = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rxy1 wx1 wy2 rxy2 c1 c2
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -69,9 +69,9 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -84,12 +84,12 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxy1 wx1 wy2 rxy2 c2 c1
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -103,9 +103,9 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -118,12 +118,12 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxy1 wy2 wx1 c1 rxy2 c2
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -137,15 +137,15 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
+step rxy2: select * from test_t where val2 = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rxy1 wy2 wx1 rxy2 c1 c2
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -159,9 +159,9 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -174,12 +174,12 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxy1 wy2 wx1 rxy2 c2 c1
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -193,9 +193,9 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -208,12 +208,12 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxy1 wy2 rxy2 wx1 c1 c2
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -227,8 +227,8 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -241,13 +241,13 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxy1 wy2 rxy2 wx1 c2 c1
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -261,8 +261,8 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -275,13 +275,13 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxy1 wy2 rxy2 c2 wx1 c1
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -295,8 +295,8 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -309,14 +309,14 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
+step c2: COMMIT;
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: wy2 rxy1 wx1 c1 rxy2 c2
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy1:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -330,15 +330,15 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
+step rxy2: select * from test_t where val2 = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wy2 rxy1 wx1 rxy2 c1 c2
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy1:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -352,8 +352,8 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -366,13 +366,13 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy1 wx1 rxy2 c2 c1
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy1:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -386,8 +386,8 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -400,13 +400,13 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy1 rxy2 wx1 c1 c2
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy1:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -420,7 +420,7 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step rxy2:  select * from test_t where val2 = 1; 
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -433,14 +433,14 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy1 rxy2 wx1 c2 c1
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy1:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -454,7 +454,7 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step rxy2:  select * from test_t where val2 = 1; 
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -467,14 +467,14 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy1 rxy2 c2 wx1 c1
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy1:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -488,7 +488,7 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step rxy2:  select * from test_t where val2 = 1; 
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -501,14 +501,14 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
+step c2: COMMIT;
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: wy2 rxy2 rxy1 wx1 c1 c2
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -521,7 +521,7 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -535,14 +535,14 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy2 rxy1 wx1 c2 c1
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -555,7 +555,7 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -569,14 +569,14 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy2 rxy1 c2 wx1 c1
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -589,7 +589,7 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step rxy1:  select * from test_t where val2 = 1; 
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -603,14 +603,14 @@ id             val1           val2
 8              a              1              
 9              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
+step c2: COMMIT;
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: wy2 rxy2 c2 rxy1 wx1 c1
-step wy2:  update test_t set val2 = 2 where val2 = 1 and id = 9; 
-step rxy2:  select * from test_t where val2 = 1; 
+step wy2: update test_t set val2 = 2 where val2 = 1 and id = 9;
+step rxy2: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -623,8 +623,8 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step c2:  COMMIT; 
-step rxy1:  select * from test_t where val2 = 1; 
+step c2: COMMIT;
+step rxy1: select * from test_t where val2 = 1;
 id             val1           val2           
 
 0              a              1              
@@ -637,5 +637,5 @@ id             val1           val2
 7              a              1              
 8              a              1              
 10             a              1              
-step wx1:  update test_t set val2 = 2 where val2 = 1 and id = 10; 
-step c1:  COMMIT; 
+step wx1: update test_t set val2 = 2 where val2 = 1 and id = 10;
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/prepared-transactions.out b/src/test/isolation/expected/prepared-transactions.out
new file mode 100644
index 0000000000000..fa672f1cb01d0
--- /dev/null
+++ b/src/test/isolation/expected/prepared-transactions.out
@@ -0,0 +1,34843 @@
+Parsed test spec with 4 sessions
+
+starting permutation: r1 r2 w2 w3 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 p1 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 p1 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 p1 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 p1 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c3: COMMIT PREPARED 's3';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c3: COMMIT PREPARED 's3';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step p1: PREPARE TRANSACTION 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c1: COMMIT PREPARED 's1';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+step c3: COMMIT PREPARED 's3';
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+step c1: COMMIT PREPARED 's1';
+step w2: INSERT INTO test2 VALUES (2);
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p2: PREPARE TRANSACTION 's2';
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
diff --git a/src/test/isolation/expected/prepared-transactions_1.out b/src/test/isolation/expected/prepared-transactions_1.out
new file mode 100644
index 0000000000000..d814e6b723f12
--- /dev/null
+++ b/src/test/isolation/expected/prepared-transactions_1.out
@@ -0,0 +1,41529 @@
+Parsed test spec with 4 sessions
+
+starting permutation: r1 r2 w2 w3 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 w3 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p1 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 w3 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 p1 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 w2 p2 p1 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 r2 p1 w2 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 w3 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w2 p1 w3 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 w2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p1 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 r2 p3 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 w2 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 r2 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 w2 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p1 p3 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 r2 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 w2 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 p1 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 w3 p3 c3 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 r2 w2 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w2 w3 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 r2 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 w2 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: r1 p1 w3 p3 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 w3 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p1 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 w3 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 p1 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 r2 p2 p1 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 w3 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 w3 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 p2 w3 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 r2 p2 w3 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w2 r1 p1 w3 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 w2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p1 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 r2 p3 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 r2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p1 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 w2 p3 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 r2 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 r2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 w2 p3 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p1 p3 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 r2 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 w2 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 p1 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r1 p3 c3 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p1 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p1 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p1 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p2 p3 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 w2 p3 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  could not serialize access due to read/write dependencies among transactions
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p2 p3 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p2 p3 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 w2 p3 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p1 p3 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 r1 p3 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 r1 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 r2 p3 c3 r1 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step r2: SELECT * FROM test3;
+c              
+
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 r2 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 r2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 p1 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 w2 c3 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 r2 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 r2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 w2 c3 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 p1 c3 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r1 c3 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p1 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 p1 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 p1 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 c3 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 c3 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 p2 c3 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 w2 c3 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 p2 c3 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 p2 c3 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 c3 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 c3 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 w2 c3 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 p1 c3 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 r1 c3 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 r2 c3 r1 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 r2 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 r2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 w2 p1 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 r2 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 r2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 r2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 r2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 w2 c1 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 c1 r2 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r1 p1 c1 w2 r2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step r2: SELECT * FROM test3;
+c              
+
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p1 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p1 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p1 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p2 p1 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p2 p1 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 w2 p2 c2 p1 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 w2 p2 c1 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 w2 p2 c2 c1 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 w2 c1 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step w2: INSERT INTO test2 VALUES (2);
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
+
+starting permutation: w3 p3 c3 r2 r1 p1 c1 w2 p2 c2 check
+a              
+
+a              
+
+step w3: INSERT INTO test3 VALUES (3);
+step p3: PREPARE TRANSACTION 's3';
+ERROR:  prepared transactions are disabled
+step c3: COMMIT PREPARED 's3';
+ERROR:  prepared transaction with identifier "s3" does not exist
+step r2: SELECT * FROM test3;
+c              
+
+step r1: SELECT * FROM test2;
+b              
+
+step p1: PREPARE TRANSACTION 's1';
+ERROR:  prepared transactions are disabled
+step c1: COMMIT PREPARED 's1';
+ERROR:  prepared transaction with identifier "s1" does not exist
+step w2: INSERT INTO test2 VALUES (2);
+step p2: PREPARE TRANSACTION 's2';
+ERROR:  prepared transactions are disabled
+step c2: COMMIT PREPARED 's2';
+ERROR:  prepared transaction with identifier "s2" does not exist
+step check: SELECT * FROM test1,test2,test3;
+a              b              c              
+
diff --git a/src/test/isolation/expected/project-manager.out b/src/test/isolation/expected/project-manager.out
index 0050a744a8689..f85f5136ec3bf 100644
--- a/src/test/isolation/expected/project-manager.out
+++ b/src/test/isolation/expected/project-manager.out
@@ -1,299 +1,299 @@
 Parsed test spec with 2 sessions
 
 starting permutation: rx1 wy1 c1 ry2 wx2 c2
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 1              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 ry2 c1 wx2 c2
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step c1:  COMMIT; 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
+step c1: COMMIT;
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 ry2 wx2 c1 c2
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 wy1 ry2 wx2 c2 c1
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wy1 c1 wx2 c2
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 ry2 wy1 wx2 c1 c2
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wy1 wx2 c2 c1
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 wy1 c1 c2
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 wy1 c2 c1
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 c2 wy1 c1
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 rx1 wy1 c1 wx2 c2
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: ry2 rx1 wy1 wx2 c1 c2
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wy1 wx2 c2 c1
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 wy1 c1 c2
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 wy1 c2 c1
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 c2 wy1 c1
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 wx2 rx1 wy1 c1 c2
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 wx2 rx1 wy1 c2 c1
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 wx2 rx1 c2 wy1 c1
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 1              
-step c2:  COMMIT; 
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
+step c2: COMMIT;
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 wx2 c2 rx1 wy1 c1
-step ry2:  SELECT count(*) FROM project WHERE project_manager = 1; 
+step ry2: SELECT count(*) FROM project WHERE project_manager = 1;
 count          
 
 0              
-step wx2:  UPDATE person SET is_project_manager = false WHERE person_id = 1; 
-step c2:  COMMIT; 
-step rx1:  SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager; 
+step wx2: UPDATE person SET is_project_manager = false WHERE person_id = 1;
+step c2: COMMIT;
+step rx1: SELECT count(*) FROM person WHERE person_id = 1 AND is_project_manager;
 count          
 
 0              
-step wy1:  INSERT INTO project VALUES (101, 'Build Great Wall', 1); 
-step c1:  COMMIT; 
+step wy1: INSERT INTO project VALUES (101, 'Build Great Wall', 1);
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/receipt-report.out b/src/test/isolation/expected/receipt-report.out
index bcab10ea959d1..bc68d676a012b 100644
--- a/src/test/isolation/expected/receipt-report.out
+++ b/src/test/isolation/expected/receipt-report.out
@@ -1,3379 +1,3379 @@
 Parsed test spec with 3 sessions
 
 starting permutation: rxwy1 c1 wx2 c2 rx3 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 c1 wx2 rx3 c2 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 c1 wx2 rx3 ry3 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 c1 wx2 rx3 ry3 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 c1 rx3 wx2 c2 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 c1 rx3 wx2 ry3 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 c1 rx3 wx2 ry3 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 c1 rx3 ry3 wx2 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 c1 rx3 ry3 wx2 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 c1 rx3 ry3 c3 wx2 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rxwy1 wx2 c1 c2 rx3 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 c1 rx3 c2 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 c1 rx3 ry3 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 c1 rx3 ry3 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 wx2 c2 c1 rx3 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 c2 rx3 c1 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 c2 rx3 ry3 c1 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 c2 rx3 ry3 c3 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxwy1 wx2 rx3 c1 c2 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 c1 ry3 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 c1 ry3 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 c2 c1 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 c2 ry3 c1 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 c2 ry3 c3 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 ry3 c1 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 ry3 c1 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 ry3 c2 c1 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 ry3 c2 c3 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 ry3 c3 c1 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 wx2 rx3 ry3 c3 c2 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 rx3 c1 wx2 c2 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 c1 wx2 ry3 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 c1 wx2 ry3 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 c1 ry3 wx2 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 c1 ry3 wx2 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 c1 ry3 c3 wx2 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 c1 c2 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 c1 ry3 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 c1 ry3 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 c2 c1 ry3 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 c2 ry3 c1 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 c2 ry3 c3 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 ry3 c1 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 ry3 c1 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 ry3 c2 c1 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 ry3 c2 c3 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 ry3 c3 c1 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 wx2 ry3 c3 c2 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 c1 wx2 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 c1 wx2 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 c1 c3 wx2 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 wx2 c1 c2 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 wx2 c1 c3 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 wx2 c2 c1 c3
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 wx2 c2 c3 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 wx2 c3 c1 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 wx2 c3 c2 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 c3 c1 wx2 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 c3 wx2 c1 c2
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy1 rx3 ry3 c3 wx2 c2 c1
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rxwy1 c1 c2 rx3 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 c1 rx3 c2 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 c1 rx3 ry3 c2 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 c1 rx3 ry3 c3 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rxwy1 c2 c1 rx3 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
 3              12-22-2008     4.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 c2 rx3 c1 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 c2 rx3 ry3 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 c2 rx3 ry3 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx2 rxwy1 rx3 c1 c2 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 c1 ry3 c2 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 c1 ry3 c3 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 c2 c1 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 c2 ry3 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 c2 ry3 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 ry3 c1 c2 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 ry3 c1 c3 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 ry3 c2 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 ry3 c2 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 ry3 c3 c1 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rxwy1 rx3 ry3 c3 c2 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 c2 rxwy1 c1 rx3 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 c2 rxwy1 rx3 c1 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 c2 rxwy1 rx3 ry3 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 c2 rxwy1 rx3 ry3 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 c2 rx3 rxwy1 c1 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 c2 rx3 rxwy1 ry3 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 c2 rx3 rxwy1 ry3 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 c2 rx3 ry3 rxwy1 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 c2 rx3 ry3 rxwy1 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 c2 rx3 ry3 c3 rxwy1 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-23-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 c1 c2 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 c1 ry3 c2 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 c1 ry3 c3 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 c2 c1 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 c2 ry3 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 c2 ry3 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 ry3 c1 c2 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 ry3 c1 c3 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 ry3 c2 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 ry3 c2 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 ry3 c3 c1 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rx3 rxwy1 ry3 c3 c2 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 c2 rxwy1 c1 ry3 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 c2 rxwy1 ry3 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 c2 rxwy1 ry3 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 c2 ry3 rxwy1 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 c2 ry3 rxwy1 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 c2 ry3 c3 rxwy1 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 ry3 rxwy1 c1 c2 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 ry3 rxwy1 c1 c3 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rx3 ry3 rxwy1 c2 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 ry3 rxwy1 c2 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 ry3 rxwy1 c3 c1 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rx3 ry3 rxwy1 c3 c2 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 ry3 c2 rxwy1 c1 c3
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx2 rx3 ry3 c2 rxwy1 c3 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 ry3 c2 c3 rxwy1 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 ry3 c3 rxwy1 c1 c2
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx2 rx3 ry3 c3 rxwy1 c2 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx2 rx3 ry3 c3 c2 rxwy1 c1
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: rx3 rxwy1 c1 wx2 c2 ry3 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 c1 wx2 ry3 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 c1 wx2 ry3 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 c1 ry3 wx2 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 c1 ry3 wx2 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 c1 ry3 c3 wx2 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 c1 c2 ry3 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 c1 ry3 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 c1 ry3 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 c2 c1 ry3 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 c2 ry3 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 c2 ry3 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 ry3 c1 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 ry3 c1 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 ry3 c2 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 ry3 c2 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 ry3 c3 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 wx2 ry3 c3 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 c1 wx2 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 c1 wx2 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 c1 c3 wx2 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 wx2 c1 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 wx2 c1 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 wx2 c2 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 wx2 c2 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 wx2 c3 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 wx2 c3 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 c3 c1 wx2 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 c3 wx2 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 rxwy1 ry3 c3 wx2 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 c1 c2 ry3 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 c1 ry3 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 c1 ry3 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 c2 c1 ry3 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 c2 ry3 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 c2 ry3 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 ry3 c1 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 ry3 c1 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 ry3 c2 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 ry3 c2 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 ry3 c3 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 wx2 rxwy1 ry3 c3 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 c2 rxwy1 c1 ry3 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 c2 rxwy1 ry3 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 c2 rxwy1 ry3 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 c2 ry3 rxwy1 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 c2 ry3 rxwy1 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 c2 ry3 c3 rxwy1 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 ry3 rxwy1 c1 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 ry3 rxwy1 c1 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 wx2 ry3 rxwy1 c2 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 ry3 rxwy1 c2 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 ry3 rxwy1 c3 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 wx2 ry3 rxwy1 c3 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 ry3 c2 rxwy1 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 wx2 ry3 c2 rxwy1 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 ry3 c2 c3 rxwy1 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 ry3 c3 rxwy1 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 wx2 ry3 c3 rxwy1 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 wx2 ry3 c3 c2 rxwy1 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 c1 wx2 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 c1 wx2 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 c1 c3 wx2 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 wx2 c1 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 wx2 c1 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 wx2 c2 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 wx2 c2 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 wx2 c3 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 wx2 c3 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 c3 c1 wx2 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 c3 wx2 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 rxwy1 c3 wx2 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 wx2 rxwy1 c1 c2 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 ry3 wx2 rxwy1 c1 c3 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 wx2 rxwy1 c2 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 ry3 wx2 rxwy1 c2 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 wx2 rxwy1 c3 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 wx2 rxwy1 c3 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 wx2 c2 rxwy1 c1 c3
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rx3 ry3 wx2 c2 rxwy1 c3 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 wx2 c2 c3 rxwy1 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 wx2 c3 rxwy1 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 wx2 c3 rxwy1 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 wx2 c3 c2 rxwy1 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c3: COMMIT;
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 c3 rxwy1 c1 wx2 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 c3 rxwy1 wx2 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 c3 rxwy1 wx2 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 c3 wx2 rxwy1 c1 c2
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rx3 ry3 c3 wx2 rxwy1 c2 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rx3 ry3 c3 wx2 c2 rxwy1 c1
-step rx3:  SELECT * FROM ctl WHERE k = 'receipt'; 
+step rx3: SELECT * FROM ctl WHERE k = 'receipt';
 k              deposit_date   
 
 receipt        12-22-2008     
-step ry3:  SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22'; 
+step ry3: SELECT * FROM receipt WHERE deposit_date = DATE '2008-12-22';
 receipt_no     deposit_date   amount         
 
 1              12-22-2008     1.00           
 2              12-22-2008     2.00           
-step c3:  COMMIT; 
-step wx2:  UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt'; 
-step c2:  COMMIT; 
-step rxwy1:  INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00); 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx2: UPDATE ctl SET deposit_date = DATE '2008-12-23' WHERE k = 'receipt';
+step c2: COMMIT;
+step rxwy1: INSERT INTO receipt VALUES (3, (SELECT deposit_date FROM ctl WHERE k = 'receipt'), 4.00);
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/referential-integrity.out b/src/test/isolation/expected/referential-integrity.out
index 569d0347cc01e..ba42efa39bee6 100644
--- a/src/test/isolation/expected/referential-integrity.out
+++ b/src/test/isolation/expected/referential-integrity.out
@@ -1,629 +1,629 @@
 Parsed test spec with 2 sessions
 
 starting permutation: rx1 wy1 c1 rx2 ry2 wx2 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
 1              
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 rx2 c1 ry2 wx2 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step c1:  COMMIT; 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step c1: COMMIT;
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 rx2 ry2 c1 wx2 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step c1: COMMIT;
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 rx2 ry2 wx2 c1 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 wy1 rx2 ry2 wx2 c2 c1
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 wy1 c1 ry2 wx2 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 rx2 wy1 ry2 c1 wx2 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step c1: COMMIT;
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 rx2 wy1 ry2 wx2 c1 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 wy1 ry2 wx2 c2 c1
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 ry2 wy1 c1 wx2 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 rx2 ry2 wy1 wx2 c1 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wy1:  INSERT INTO b VALUES (1); 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step wx2: DELETE FROM a WHERE i = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 ry2 wy1 wx2 c2 c1
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wy1:  INSERT INTO b VALUES (1); 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 ry2 wx2 wy1 c1 c2
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 ry2 wx2 wy1 c2 c1
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step wy1:  INSERT INTO b VALUES (1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step wy1: INSERT INTO b VALUES (1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 rx2 ry2 wx2 c2 wy1 c1
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO b VALUES (1); 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step wy1: INSERT INTO b VALUES (1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: rx2 rx1 wy1 c1 ry2 wx2 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx2 rx1 wy1 ry2 c1 wx2 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step c1: COMMIT;
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx2 rx1 wy1 ry2 wx2 c1 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 rx1 wy1 ry2 wx2 c2 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 rx1 ry2 wy1 c1 wx2 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx2 rx1 ry2 wy1 wx2 c1 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wy1:  INSERT INTO b VALUES (1); 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step wx2: DELETE FROM a WHERE i = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 rx1 ry2 wy1 wx2 c2 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wy1:  INSERT INTO b VALUES (1); 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 rx1 ry2 wx2 wy1 c1 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 rx1 ry2 wx2 wy1 c2 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step wy1:  INSERT INTO b VALUES (1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step wy1: INSERT INTO b VALUES (1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 rx1 ry2 wx2 c2 wy1 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO b VALUES (1); 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step wy1: INSERT INTO b VALUES (1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: rx2 ry2 rx1 wy1 c1 wx2 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM a WHERE i = 1; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step wx2: DELETE FROM a WHERE i = 1;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx2 ry2 rx1 wy1 wx2 c1 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step wx2: DELETE FROM a WHERE i = 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 ry2 rx1 wy1 wx2 c2 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 ry2 rx1 wx2 wy1 c1 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wx2:  DELETE FROM a WHERE i = 1; 
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 ry2 rx1 wx2 wy1 c2 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wx2:  DELETE FROM a WHERE i = 1; 
-step wy1:  INSERT INTO b VALUES (1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM a WHERE i = 1;
+step wy1: INSERT INTO b VALUES (1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 ry2 rx1 wx2 c2 wy1 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO b VALUES (1); 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step wy1: INSERT INTO b VALUES (1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: rx2 ry2 wx2 rx1 wy1 c1 c2
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 ry2 wx2 rx1 wy1 c2 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step wy1:  INSERT INTO b VALUES (1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx2 ry2 wx2 rx1 c2 wy1 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step c2:  COMMIT; 
-step wy1:  INSERT INTO b VALUES (1); 
+step c2: COMMIT;
+step wy1: INSERT INTO b VALUES (1);
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: rx2 ry2 wx2 c2 rx1 wy1 c1
-step rx2:  SELECT i FROM a WHERE i = 1; 
+step rx2: SELECT i FROM a WHERE i = 1;
 i              
 
 1              
-step ry2:  SELECT a_id FROM b WHERE a_id = 1; 
+step ry2: SELECT a_id FROM b WHERE a_id = 1;
 a_id           
 
-step wx2:  DELETE FROM a WHERE i = 1; 
-step c2:  COMMIT; 
-step rx1:  SELECT i FROM a WHERE i = 1; 
+step wx2: DELETE FROM a WHERE i = 1;
+step c2: COMMIT;
+step rx1: SELECT i FROM a WHERE i = 1;
 i              
 
-step wy1:  INSERT INTO b VALUES (1); 
-step c1:  COMMIT; 
+step wy1: INSERT INTO b VALUES (1);
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/ri-trigger.out b/src/test/isolation/expected/ri-trigger.out
index 9709e771953fe..88943287aa603 100644
--- a/src/test/isolation/expected/ri-trigger.out
+++ b/src/test/isolation/expected/ri-trigger.out
@@ -1,111 +1,111 @@
 Parsed test spec with 2 sessions
 
 starting permutation: wxry1 c1 r2 wyrx2 c2
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step c1:  COMMIT; 
-step r2:  SELECT TRUE; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step c1: COMMIT;
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
 ERROR:  child row exists
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wxry1 r2 c1 wyrx2 c2
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step r2:  SELECT TRUE; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step r2: SELECT TRUE;
 bool           
 
 t              
-step c1:  COMMIT; 
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
+step c1: COMMIT;
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wxry1 r2 wyrx2 c1 c2
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step r2:  SELECT TRUE; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wxry1 r2 wyrx2 c2 c1
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step r2:  SELECT TRUE; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: r2 wxry1 c1 wyrx2 c2
-step r2:  SELECT TRUE; 
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step c1:  COMMIT; 
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step c1: COMMIT;
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: r2 wxry1 wyrx2 c1 c2
-step r2:  SELECT TRUE; 
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: r2 wxry1 wyrx2 c2 c1
-step r2:  SELECT TRUE; 
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: r2 wyrx2 wxry1 c1 c2
-step r2:  SELECT TRUE; 
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: r2 wyrx2 wxry1 c2 c1
-step r2:  SELECT TRUE; 
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: r2 wyrx2 c2 wxry1 c1
-step r2:  SELECT TRUE; 
+step r2: SELECT TRUE;
 bool           
 
 t              
-step wyrx2:  DELETE FROM parent WHERE parent_id = 0; 
-step c2:  COMMIT; 
-step wxry1:  INSERT INTO child (parent_id) VALUES (0); 
+step wyrx2: DELETE FROM parent WHERE parent_id = 0;
+step c2: COMMIT;
+step wxry1: INSERT INTO child (parent_id) VALUES (0);
 ERROR:  parent row missing
-step c1:  COMMIT; 
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/simple-write-skew.out b/src/test/isolation/expected/simple-write-skew.out
index 5896beec33176..835500de6d490 100644
--- a/src/test/isolation/expected/simple-write-skew.out
+++ b/src/test/isolation/expected/simple-write-skew.out
@@ -1,41 +1,41 @@
 Parsed test spec with 2 sessions
 
 starting permutation: rwx1 c1 rwx2 c2
-step rwx1:  UPDATE test SET t = 'apple' WHERE t = 'pear'; 
-step c1:  COMMIT; 
-step rwx2:  UPDATE test SET t = 'pear' WHERE t = 'apple'
-step c2:  COMMIT; 
+step rwx1: UPDATE test SET t = 'apple' WHERE t = 'pear';
+step c1: COMMIT;
+step rwx2: UPDATE test SET t = 'pear' WHERE t = 'apple'
+step c2: COMMIT;
 
 starting permutation: rwx1 rwx2 c1 c2
-step rwx1:  UPDATE test SET t = 'apple' WHERE t = 'pear'; 
-step rwx2:  UPDATE test SET t = 'pear' WHERE t = 'apple'
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rwx1: UPDATE test SET t = 'apple' WHERE t = 'pear';
+step rwx2: UPDATE test SET t = 'pear' WHERE t = 'apple'
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rwx1 rwx2 c2 c1
-step rwx1:  UPDATE test SET t = 'apple' WHERE t = 'pear'; 
-step rwx2:  UPDATE test SET t = 'pear' WHERE t = 'apple'
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rwx1: UPDATE test SET t = 'apple' WHERE t = 'pear';
+step rwx2: UPDATE test SET t = 'pear' WHERE t = 'apple'
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rwx2 rwx1 c1 c2
-step rwx2:  UPDATE test SET t = 'pear' WHERE t = 'apple'
-step rwx1:  UPDATE test SET t = 'apple' WHERE t = 'pear'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rwx2: UPDATE test SET t = 'pear' WHERE t = 'apple'
+step rwx1: UPDATE test SET t = 'apple' WHERE t = 'pear';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rwx2 rwx1 c2 c1
-step rwx2:  UPDATE test SET t = 'pear' WHERE t = 'apple'
-step rwx1:  UPDATE test SET t = 'apple' WHERE t = 'pear'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rwx2: UPDATE test SET t = 'pear' WHERE t = 'apple'
+step rwx1: UPDATE test SET t = 'apple' WHERE t = 'pear';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rwx2 c2 rwx1 c1
-step rwx2:  UPDATE test SET t = 'pear' WHERE t = 'apple'
-step c2:  COMMIT; 
-step rwx1:  UPDATE test SET t = 'apple' WHERE t = 'pear'; 
-step c1:  COMMIT; 
+step rwx2: UPDATE test SET t = 'pear' WHERE t = 'apple'
+step c2: COMMIT;
+step rwx1: UPDATE test SET t = 'apple' WHERE t = 'pear';
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/temporal-range-integrity.out b/src/test/isolation/expected/temporal-range-integrity.out
index 3e7fb9869051a..f1b24023a2c09 100644
--- a/src/test/isolation/expected/temporal-range-integrity.out
+++ b/src/test/isolation/expected/temporal-range-integrity.out
@@ -1,299 +1,299 @@
 Parsed test spec with 2 sessions
 
 starting permutation: rx1 wy1 c1 ry2 wx2 c2
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 1              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 ry2 c1 wx2 c2
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step c1:  COMMIT; 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
+step c1: COMMIT;
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 wy1 ry2 wx2 c1 c2
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 wy1 ry2 wx2 c2 c1
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wy1 c1 wx2 c2
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: rx1 ry2 wy1 wx2 c1 c2
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wy1 wx2 c2 c1
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 wy1 c1 c2
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 wy1 c2 c1
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rx1 ry2 wx2 c2 wy1 c1
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 rx1 wy1 c1 wx2 c2
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: ry2 rx1 wy1 wx2 c1 c2
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wy1 wx2 c2 c1
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 wy1 c1 c2
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 wy1 c2 c1
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 rx1 wx2 c2 wy1 c1
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 wx2 rx1 wy1 c1 c2
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 wx2 rx1 wy1 c2 c1
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry2 wx2 rx1 c2 wy1 c1
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 1              
-step c2:  COMMIT; 
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
+step c2: COMMIT;
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: ry2 wx2 c2 rx1 wy1 c1
-step ry2:  SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01'; 
+step ry2: SELECT count(*) FROM offense WHERE statute_cite = '123.45(1)a' AND offense_date >= DATE '2008-01-01';
 count          
 
 0              
-step wx2:  DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01'; 
-step c2:  COMMIT; 
-step rx1:  SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15'); 
+step wx2: DELETE FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date = DATE '2008-01-01';
+step c2: COMMIT;
+step rx1: SELECT count(*) FROM statute WHERE statute_cite = '123.45(1)a' AND eff_date <= DATE '2009-05-15' AND (exp_date IS NULL OR exp_date > DATE '2009-05-15');
 count          
 
 0              
-step wy1:  INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15'); 
-step c1:  COMMIT; 
+step wy1: INSERT INTO offense VALUES (1, '123.45(1)a', DATE '2009-05-15');
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/total-cash.out b/src/test/isolation/expected/total-cash.out
index df1950843b263..5121edc710bdd 100644
--- a/src/test/isolation/expected/total-cash.out
+++ b/src/test/isolation/expected/total-cash.out
@@ -1,281 +1,281 @@
 Parsed test spec with 2 sessions
 
 starting permutation: wx1 rxy1 c1 wy2 rxy2 c2
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step c1: COMMIT;
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 800            
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wx1 rxy1 wy2 c1 rxy2 c2
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step c1:  COMMIT; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step c1: COMMIT;
+step rxy2: SELECT SUM(balance) FROM accounts;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wx1 rxy1 wy2 rxy2 c1 c2
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 rxy1 wy2 rxy2 c2 c1
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 wy2 rxy1 c1 rxy2 c2
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step c1: COMMIT;
+step rxy2: SELECT SUM(balance) FROM accounts;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wx1 wy2 rxy1 rxy2 c1 c2
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 wy2 rxy1 rxy2 c2 c1
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 wy2 rxy2 rxy1 c1 c2
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 wy2 rxy2 rxy1 c2 c1
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 wy2 rxy2 c2 rxy1 c1
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step c2: COMMIT;
+step rxy1: SELECT SUM(balance) FROM accounts;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: wy2 wx1 rxy1 c1 rxy2 c2
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step c1: COMMIT;
+step rxy2: SELECT SUM(balance) FROM accounts;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c2:  COMMIT; 
+step c2: COMMIT;
 
 starting permutation: wy2 wx1 rxy1 rxy2 c1 c2
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 wx1 rxy1 rxy2 c2 c1
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 wx1 rxy2 rxy1 c1 c2
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 wx1 rxy2 rxy1 c2 c1
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 wx1 rxy2 c2 rxy1 c1
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step c2: COMMIT;
+step rxy1: SELECT SUM(balance) FROM accounts;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: wy2 rxy2 wx1 rxy1 c1 c2
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy2 wx1 rxy1 c2 c1
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wy2 rxy2 wx1 c2 rxy1 c1
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step c2:  COMMIT; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step c2: COMMIT;
+step rxy1: SELECT SUM(balance) FROM accounts;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c1:  COMMIT; 
+step c1: COMMIT;
 
 starting permutation: wy2 rxy2 c2 wx1 rxy1 c1
-step wy2:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings'; 
-step rxy2:  SELECT SUM(balance) FROM accounts; 
+step wy2: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'savings';
+step rxy2: SELECT SUM(balance) FROM accounts;
 sum            
 
 1000           
-step c2:  COMMIT; 
-step wx1:  UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; 
-step rxy1:  SELECT SUM(balance) FROM accounts; 
+step c2: COMMIT;
+step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
+step rxy1: SELECT SUM(balance) FROM accounts;
 sum            
 
 800            
-step c1:  COMMIT; 
+step c1: COMMIT;
diff --git a/src/test/isolation/expected/two-ids.out b/src/test/isolation/expected/two-ids.out
index 81e6139680561..2fbba1e2197dc 100644
--- a/src/test/isolation/expected/two-ids.out
+++ b/src/test/isolation/expected/two-ids.out
@@ -1,1007 +1,1007 @@
 Parsed test spec with 3 sessions
 
 starting permutation: wx1 c1 rxwy2 c2 ry3 c3
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 3              
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx1 c1 rxwy2 ry3 c2 c3
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx1 c1 rxwy2 ry3 c3 c2
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx1 c1 ry3 rxwy2 c2 c3
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx1 c1 ry3 rxwy2 c3 c2
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx1 c1 ry3 c3 rxwy2 c2
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
 
 starting permutation: wx1 rxwy2 c1 c2 ry3 c3
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx1 rxwy2 c1 ry3 c2 c3
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx1 rxwy2 c1 ry3 c3 c2
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 rxwy2 c2 c1 ry3 c3
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx1 rxwy2 c2 ry3 c1 c3
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx1 rxwy2 c2 ry3 c3 c1
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx1 rxwy2 ry3 c1 c2 c3
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx1 rxwy2 ry3 c1 c3 c2
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 rxwy2 ry3 c2 c1 c3
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx1 rxwy2 ry3 c2 c3 c1
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx1 rxwy2 ry3 c3 c1 c2
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx1 rxwy2 ry3 c3 c2 c1
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx1 ry3 c1 rxwy2 c2 c3
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx1 ry3 c1 rxwy2 c3 c2
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx1 ry3 c1 c3 rxwy2 c2
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
 
 starting permutation: wx1 ry3 rxwy2 c1 c2 c3
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: wx1 ry3 rxwy2 c1 c3 c2
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: wx1 ry3 rxwy2 c2 c1 c3
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: wx1 ry3 rxwy2 c2 c3 c1
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx1 ry3 rxwy2 c3 c1 c2
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx1 ry3 rxwy2 c3 c2 c1
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: wx1 ry3 c3 c1 rxwy2 c2
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
 
 starting permutation: wx1 ry3 c3 rxwy2 c1 c2
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: wx1 ry3 c3 rxwy2 c2 c1
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 wx1 c1 c2 ry3 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy2 wx1 c1 ry3 c2 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy2 wx1 c1 ry3 c3 c2
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxwy2 wx1 c2 c1 ry3 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy2 wx1 c2 ry3 c1 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy2 wx1 c2 ry3 c3 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 wx1 ry3 c1 c2 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy2 wx1 ry3 c1 c3 c2
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxwy2 wx1 ry3 c2 c1 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy2 wx1 ry3 c2 c3 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 wx1 ry3 c3 c1 c2
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy2 wx1 ry3 c3 c2 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 c2 wx1 c1 ry3 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy2 c2 wx1 ry3 c1 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 2              
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy2 c2 wx1 ry3 c3 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 c2 ry3 wx1 c1 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy2 c2 ry3 wx1 c3 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 c2 ry3 c3 wx1 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step ry3: select id from D2;
 id             
 
 2              
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
 
 starting permutation: rxwy2 ry3 wx1 c1 c2 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: rxwy2 ry3 wx1 c1 c3 c2
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: rxwy2 ry3 wx1 c2 c1 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy2 ry3 wx1 c2 c3 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 ry3 wx1 c3 c1 c2
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy2 ry3 wx1 c3 c2 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 ry3 c2 wx1 c1 c3
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: rxwy2 ry3 c2 wx1 c3 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 ry3 c2 c3 wx1 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
+step c2: COMMIT;
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
 
 starting permutation: rxwy2 ry3 c3 wx1 c1 c2
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: rxwy2 ry3 c3 wx1 c2 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: rxwy2 ry3 c3 c2 wx1 c1
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step ry3:  select id from D2; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
 
 starting permutation: ry3 wx1 c1 rxwy2 c2 c3
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c3: COMMIT;
 
 starting permutation: ry3 wx1 c1 rxwy2 c3 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 wx1 c1 c3 rxwy2 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
 
 starting permutation: ry3 wx1 rxwy2 c1 c2 c3
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: ry3 wx1 rxwy2 c1 c3 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry3 wx1 rxwy2 c2 c1 c3
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: ry3 wx1 rxwy2 c2 c3 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 wx1 rxwy2 c3 c1 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 wx1 rxwy2 c3 c2 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 wx1 c3 c1 rxwy2 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
 
 starting permutation: ry3 wx1 c3 rxwy2 c1 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 wx1 c3 rxwy2 c2 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 rxwy2 wx1 c1 c2 c3
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
-step c3:  COMMIT; 
+step c3: COMMIT;
 
 starting permutation: ry3 rxwy2 wx1 c1 c3 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c3: COMMIT;
+step c2: COMMIT;
 ERROR:  could not serialize access due to read/write dependencies among transactions
 
 starting permutation: ry3 rxwy2 wx1 c2 c1 c3
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: ry3 rxwy2 wx1 c2 c3 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 rxwy2 wx1 c3 c1 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 rxwy2 wx1 c3 c2 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 rxwy2 c2 wx1 c1 c3
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c3:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c3: COMMIT;
 
 starting permutation: ry3 rxwy2 c2 wx1 c3 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c3:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c3: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 rxwy2 c2 c3 wx1 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
 
 starting permutation: ry3 rxwy2 c3 wx1 c1 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 rxwy2 c3 wx1 c2 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 rxwy2 c3 c2 wx1 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c3:  COMMIT; 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c3: COMMIT;
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
 
 starting permutation: ry3 c3 wx1 c1 rxwy2 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
 
 starting permutation: ry3 c3 wx1 rxwy2 c1 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 c3 wx1 rxwy2 c2 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step wx1: update D1 set id = id + 1;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 c3 rxwy2 wx1 c1 c2
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
-step c2:  COMMIT; 
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
+step c2: COMMIT;
 
 starting permutation: ry3 c3 rxwy2 wx1 c2 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step wx1:  update D1 set id = id + 1; 
-step c2:  COMMIT; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step wx1: update D1 set id = id + 1;
+step c2: COMMIT;
+step c1: COMMIT;
 
 starting permutation: ry3 c3 rxwy2 c2 wx1 c1
-step ry3:  select id from D2; 
+step ry3: select id from D2;
 id             
 
 1              
-step c3:  COMMIT; 
-step rxwy2:  update D2 set id = (select id+1 from D1); 
-step c2:  COMMIT; 
-step wx1:  update D1 set id = id + 1; 
-step c1:  COMMIT; 
+step c3: COMMIT;
+step rxwy2: update D2 set id = (select id+1 from D1);
+step c2: COMMIT;
+step wx1: update D1 set id = id + 1;
+step c1: COMMIT;
diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index 6ea8a29f490f3..386ef78aac805 100644
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -9,3 +9,4 @@ test: ri-trigger
 test: partial-index
 test: two-ids
 test: multiple-row-versions
+test: prepared-transactions
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index 0f77917fb532d..1d76f2cd088d9 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -278,11 +278,15 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 		if (testspec->sessions[i]->setupsql)
 		{
 			res = PQexec(conns[i], testspec->sessions[i]->setupsql);
-			if (PQresultStatus(res) != PGRES_COMMAND_OK)
+			if (PQresultStatus(res) == PGRES_TUPLES_OK)
+			{
+				printResultSet(res);
+			}
+			else if (PQresultStatus(res) != PGRES_COMMAND_OK)
 			{
 				fprintf(stderr, "setup of session %s failed: %s",
 						testspec->sessions[i]->name,
-						PQerrorMessage(conns[0]));
+						PQerrorMessage(conns[i]));
 				exit_nicely();
 			}
 			PQclear(res);
@@ -329,7 +333,7 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 			{
 				fprintf(stderr, "teardown of session %s failed: %s",
 						testspec->sessions[i]->name,
-						PQerrorMessage(conns[0]));
+						PQerrorMessage(conns[i]));
 				/* don't exit on teardown failure */
 			}
 			PQclear(res);
@@ -340,7 +344,11 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps)
 	if (testspec->teardownsql)
 	{
 		res = PQexec(conns[0], testspec->teardownsql);
-		if (PQresultStatus(res) != PGRES_COMMAND_OK)
+		if (PQresultStatus(res) == PGRES_TUPLES_OK)
+		{
+			printResultSet(res);
+		}
+		else if (PQresultStatus(res) != PGRES_COMMAND_OK)
 		{
 			fprintf(stderr, "teardown failed: %s",
 					PQerrorMessage(conns[0]));
diff --git a/src/test/isolation/specs/prepared-transactions.spec b/src/test/isolation/specs/prepared-transactions.spec
new file mode 100644
index 0000000000000..bb9e154e6ea40
--- /dev/null
+++ b/src/test/isolation/specs/prepared-transactions.spec
@@ -0,0 +1,1507 @@
+# This test verifies that if there's a series of rw-conflicts
+#   s1 ---> s2 ---> s3, with s3 committing first
+# at least one transaction will be aborted, regardless of the order in
+# which the conflicts are detected and transactions prepare and
+# commit.
+#
+#
+# Tables test2 and test3 are used to create the
+# s1 --> s2 and s2 --> s3 rw-dependencies respectively
+#
+# test1 isn't involved in the anomaly; s1 only inserts a row into it
+# so that there's an easy way to tell (by looking for that row) if s1
+# successfully committed.
+#
+# force_snapshot is used to force s2 and s3 to take their snapshot
+# immediately after BEGIN, so we can be sure the three transactions
+# overlap.
+setup
+{
+    CREATE TABLE test1 (a int);
+    CREATE TABLE test2 (b int);
+    CREATE TABLE test3 (c int);
+    CREATE TABLE force_snapshot (a int);
+}
+
+teardown
+{
+    DROP TABLE test1;
+    DROP TABLE test2;
+    DROP TABLE test3;
+    DROP TABLE force_snapshot;
+}
+
+
+session "s1"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; INSERT INTO test1 VALUES (1); }
+step "r1" { SELECT * FROM test2; }
+step "p1" { PREPARE TRANSACTION 's1'; }
+step "c1" { COMMIT PREPARED 's1'; }
+
+session "s2"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; SELECT * FROM force_snapshot; }
+step "r2" { SELECT * FROM test3; }
+step "w2" { INSERT INTO test2 VALUES (2); }
+step "p2" { PREPARE TRANSACTION 's2'; }
+step "c2" { COMMIT PREPARED 's2'; }
+
+session "s3"
+setup { BEGIN ISOLATION LEVEL SERIALIZABLE; SELECT * FROM force_snapshot; }
+step "w3" { INSERT INTO test3 VALUES (3); }
+step "p3" { PREPARE TRANSACTION 's3'; }
+step "c3" { COMMIT PREPARED 's3'; }
+
+# When run at the end of the permutations below, this SELECT statement
+# should never return any tuples, because at least one of the three
+# transactions involved should be aborted.
+session "s4"
+step "check" { SELECT * FROM test1,test2,test3; }
+
+# We run on all permutations of the statements above subject to the
+# following constraints:
+#   - each transaction's reads/writes must happen before it prepares
+#   - each transaction must prepare before committing
+#   - s3 must be the first of the three transactions to commit
+# ...which means that each permutation should fail.
+#
+# To bring the number of permutations down a bit, we further require
+# them to satisfy *one* of the following:
+#  - r1 < w2 < r2 < w3   (T1-->T2 conflict on write, T2-->T3 on write)
+#  - r1 < w2 < w3 < r2   (T1-->T2 conflict on read, T2-->T3 on write)
+#  - w2 < r1 < r2 < w3   (T1-->T2 conflict on write, T2-->T3 on read)
+#  - w2 < r1 < w3 < r2   (T1-->T2 conflict on read, T2-->T3 on read)
+# This eliminates some redundant combinations. For example, it doesn't
+# matter if w2 happens before w3 as long as both come before the
+# conflicting reads.
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "w3"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "p2"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p1"  "p2"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "w3"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "p1"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "w2"  "p2"  "p1"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "w3"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "p2"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "r2"  "p1"  "w2"  "p2"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p1"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "w3"  "p3"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w2"  "p1"  "w3"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "w2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p1"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "w2"  "p3"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "w2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "w2"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "w2"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p1"  "p3"  "c3"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "w2"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "w2"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "p1"  "c3"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "w2"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "w3"  "p3"  "c3"  "p1"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "w3"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "p2"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "r2"  "w2"  "p2"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w2"  "w3"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "w2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "w2"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "w2"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "r1"  "p1"  "w3"  "p3"  "c3"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "w3"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "w3"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "p2"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p1"  "p2"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "w3"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "p1"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "r2"  "p2"  "p1"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "r2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p1"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "w3"  "p3"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "w3"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "p2"  "w3"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "r2"  "p2"  "w3"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w2"  "r1"  "p1"  "w3"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "w2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "w2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p1"  "p3"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "r2"  "p3"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "r2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p1"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "w2"  "p3"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "w2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "r2"  "p3"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "r2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "w2"  "p3"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "r2"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "w2"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p1"  "p3"  "c3"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "r2"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "w2"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "r2"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "w2"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "p1"  "c3"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "r2"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "w2"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r1"  "p3"  "c3"  "p1"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p1"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p1"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p1"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p3"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p3"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p3"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p3"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p2"  "p3"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "w2"  "p3"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p2"  "p3"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p2"  "p3"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p3"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p3"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p3"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p3"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "w2"  "p3"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p1"  "p3"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "r1"  "p3"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "r1"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "r2"  "p3"  "c3"  "r1"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "r2"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "r2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "p1"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "w2"  "c3"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "r2"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "r2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "r2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "r2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "r2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "r2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "c3"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "c3"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "c3"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "w2"  "c3"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "p1"  "c3"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "r2"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "w2"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r1"  "c3"  "p1"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p1"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p1"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p1"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p1"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p1"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p2"  "p1"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p2"  "p1"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p2"  "c3"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p2"  "c3"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "p2"  "c3"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "c3"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "c3"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "c3"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "c3"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "c3"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "w2"  "c3"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "w2"  "p2"  "c3"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "w2"  "p2"  "c3"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "w2"  "c3"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "w2"  "c3"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "w2"  "c3"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "c3"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "c3"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "c3"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "p1"  "c3"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "r1"  "c3"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "r2"  "c3"  "r1"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "r2"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "r2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "r2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "r2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "r2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "r2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "r2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "p1"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "p1"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "p1"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "w2"  "p1"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "r2"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "r2"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "r2"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "r2"  "c1"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "w2"  "r2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "w2"  "r2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "w2"  "r2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "w2"  "c1"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "c1"  "r2"  "w2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r1"  "p1"  "c1"  "w2"  "r2"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "w2"  "p1"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "w2"  "p1"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "w2"  "p1"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "w2"  "p2"  "p1"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "w2"  "p2"  "p1"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "w2"  "p2"  "c2"  "p1"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "p1"  "w2"  "p2"  "c1"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "p1"  "w2"  "p2"  "c2"  "c1"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "p1"  "w2"  "c1"  "p2"  "c2"  "check"
+permutation  "w3"  "p3"  "c3"  "r2"  "r1"  "p1"  "c1"  "w2"  "p2"  "c2"  "check"
diff --git a/src/test/isolation/specscanner.l b/src/test/isolation/specscanner.l
index c3193917c0374..36e10e7678572 100644
--- a/src/test/isolation/specscanner.l
+++ b/src/test/isolation/specscanner.l
@@ -64,12 +64,12 @@ teardown		{ return(TEARDOWN); }
 <qstr><<EOF>>	{ yyerror("unterminated quoted string"); }
 
  /* SQL blocks: { UPDATE ... } */
-"{"				{
+"{"{space}*		{
 
 					litbufpos = 0;
 					BEGIN(sql);
 				}
-<sql>"}"		{
+<sql>{space}*"}" {
 					litbuf[litbufpos] = '\0';
 					yylval.str = strdup(litbuf);
 					BEGIN(INITIAL);
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index f84da45de6505..95c6ed5346077 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1509,7 +1509,7 @@ drop table another;
 create table tab1 (a int, b text);
 create table tab2 (x int, y tab1);
 alter table tab1 alter column b type varchar; -- fails
-ERROR:  cannot alter table "tab1" because column "tab2"."y" uses its rowtype
+ERROR:  cannot alter table "tab1" because column "tab2.y" uses its row type
 -- disallow recursive containment of row types
 create temp table recur1 (f1 int);
 alter table recur1 add column f2 recur1; -- fails
@@ -1568,90 +1568,88 @@ and c.relname != 'my_locks'
 group by c.relname;
 create table alterlock (f1 int primary key, f2 text);
 NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "alterlock_pkey" for table "alterlock"
--- share update exclusive
 begin; alter table alterlock alter column f2 set statistics 150;
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
 (1 row)
 
 rollback;
 begin; alter table alterlock cluster on alterlock_pkey;
 select * from my_locks order by 1;
-    relname     |       max_lockmode       
-----------------+--------------------------
- alterlock      | ShareUpdateExclusiveLock
- alterlock_pkey | ShareUpdateExclusiveLock
+    relname     |    max_lockmode     
+----------------+---------------------
+ alterlock      | AccessExclusiveLock
+ alterlock_pkey | AccessExclusiveLock
 (2 rows)
 
 commit;
 begin; alter table alterlock set without cluster;
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
 (1 row)
 
 commit;
 begin; alter table alterlock set (fillfactor = 100);
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
- pg_toast  | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
+ pg_toast  | AccessExclusiveLock
 (2 rows)
 
 commit;
 begin; alter table alterlock reset (fillfactor);
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
- pg_toast  | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
+ pg_toast  | AccessExclusiveLock
 (2 rows)
 
 commit;
 begin; alter table alterlock set (toast.autovacuum_enabled = off);
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
- pg_toast  | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
+ pg_toast  | AccessExclusiveLock
 (2 rows)
 
 commit;
 begin; alter table alterlock set (autovacuum_enabled = off);
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
- pg_toast  | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
+ pg_toast  | AccessExclusiveLock
 (2 rows)
 
 commit;
 begin; alter table alterlock alter column f2 set (n_distinct = 1);
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
 (1 row)
 
 rollback;
 begin; alter table alterlock alter column f2 set storage extended;
 select * from my_locks order by 1;
-  relname  |       max_lockmode       
------------+--------------------------
- alterlock | ShareUpdateExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
 (1 row)
 
 rollback;
--- share row exclusive
 begin; alter table alterlock alter column f2 set default 'x';
 select * from my_locks order by 1;
-  relname  |     max_lockmode      
------------+-----------------------
- alterlock | ShareRowExclusiveLock
+  relname  |    max_lockmode     
+-----------+---------------------
+ alterlock | AccessExclusiveLock
 (1 row)
 
 rollback;
@@ -1845,7 +1843,7 @@ DROP TYPE test_type;
 CREATE TYPE test_type1 AS (a int, b text);
 CREATE TABLE test_tbl1 (x int, y test_type1);
 ALTER TYPE test_type1 ALTER ATTRIBUTE b TYPE varchar; -- fails
-ERROR:  cannot alter type "test_type1" because column "test_tbl1"."y" uses it
+ERROR:  cannot alter type "test_type1" because column "test_tbl1.y" uses it
 CREATE TYPE test_type2 AS (a int, b text);
 CREATE TABLE test_tbl2 OF test_type2;
 CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2);
diff --git a/src/test/regress/expected/collate.linux.utf8.out b/src/test/regress/expected/collate.linux.utf8.out
index c065ae98ebb49..8cee6ed812757 100644
--- a/src/test/regress/expected/collate.linux.utf8.out
+++ b/src/test/regress/expected/collate.linux.utf8.out
@@ -421,7 +421,7 @@ SELECT table_name, view_definition FROM information_schema.views
  collview3  | SELECT collate_test10.a, lower(((collate_test10.x || collate_test10.x) COLLATE "C")) AS lower FROM collate_test10;
 (3 rows)
 
--- collation propagation in various expression type
+-- collation propagation in various expression types
 SELECT a, coalesce(b, 'foo') FROM collate_test1 ORDER BY 2;
  a | coalesce 
 ---+----------
@@ -967,6 +967,7 @@ CREATE COLLATION test3 (lc_collate = 'en_US.utf8'); -- fail, need lc_ctype
 ERROR:  parameter "lc_ctype" must be specified
 CREATE COLLATION testx (locale = 'nonsense'); -- fail
 ERROR:  could not create locale "nonsense": No such file or directory
+DETAIL:  The operating system could not find any locale data for the locale name "nonsense".
 CREATE COLLATION test4 FROM nonsense;
 ERROR:  collation "nonsense" for encoding "UTF8" does not exist
 CREATE COLLATION test5 FROM test0;
diff --git a/src/test/regress/expected/collate.out b/src/test/regress/expected/collate.out
index 627ae1f3f8f77..dc17feaefe41e 100644
--- a/src/test/regress/expected/collate.out
+++ b/src/test/regress/expected/collate.out
@@ -201,7 +201,7 @@ SELECT table_name, view_definition FROM information_schema.views
  collview3  | SELECT collate_test10.a, lower(((collate_test10.x || collate_test10.x) COLLATE "POSIX")) AS lower FROM collate_test10;
 (3 rows)
 
--- collation propagation in various expression type
+-- collation propagation in various expression types
 SELECT a, coalesce(b, 'foo') FROM collate_test1 ORDER BY 2;
  a | coalesce 
 ---+----------
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index c78d9ee1e801a..b23c712204e20 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -1279,6 +1279,18 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL
      1
 (1 row)
 
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+ count 
+-------
+   499
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
+ count 
+-------
+     0
+(1 row)
+
 DROP INDEX onek_nulltest;
 CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2 desc,unique1);
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
@@ -1305,6 +1317,18 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL
      1
 (1 row)
 
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+ count 
+-------
+   499
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
+ count 
+-------
+     0
+(1 row)
+
 DROP INDEX onek_nulltest;
 CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2 desc nulls last,unique1);
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
@@ -1331,6 +1355,18 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL
      1
 (1 row)
 
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+ count 
+-------
+   499
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
+ count 
+-------
+     0
+(1 row)
+
 DROP INDEX onek_nulltest;
 CREATE UNIQUE INDEX onek_nulltest ON onek_with_null (unique2  nulls first,unique1);
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
@@ -1357,6 +1393,18 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL
      1
 (1 row)
 
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+ count 
+-------
+   499
+(1 row)
+
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
+ count 
+-------
+     0
+(1 row)
+
 RESET enable_seqscan;
 RESET enable_indexscan;
 RESET enable_bitmapscan;
diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index 62010a14821a7..d20790f909849 100644
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -204,3 +204,19 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text
 );
 NOTICE:  relation "test_tsvector" already exists, skipping
+CREATE UNLOGGED TABLE unlogged1 (a int primary key);			-- OK
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "unlogged1_pkey" for table "unlogged1"
+INSERT INTO unlogged1 VALUES (42);
+CREATE UNLOGGED TABLE public.unlogged2 (a int primary key);		-- also OK
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "unlogged2_pkey" for table "unlogged2"
+CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int primary key);	-- not OK
+ERROR:  only temporary relations may be created in temporary schemas
+CREATE TABLE pg_temp.implicitly_temp (a int primary key);		-- OK
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "implicitly_temp_pkey" for table "implicitly_temp"
+CREATE TEMP TABLE explicitly_temp (a int primary key);			-- also OK
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "explicitly_temp_pkey" for table "explicitly_temp"
+CREATE TEMP TABLE pg_temp.doubly_temp (a int primary key);		-- also OK
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "doubly_temp_pkey" for table "doubly_temp"
+CREATE TEMP TABLE public.temp_to_perm (a int primary key);		-- not OK
+ERROR:  cannot create temporary relation in non-temporary schema
+DROP TABLE unlogged1, public.unlogged2;
diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out
index f2c06854d0f8c..f9490a3a55062 100644
--- a/src/test/regress/expected/create_view.out
+++ b/src/test/regress/expected/create_view.out
@@ -81,11 +81,11 @@ CREATE VIEW temp_view_test.v2 AS SELECT * FROM base_table;
 -- should fail
 CREATE VIEW temp_view_test.v3_temp AS SELECT * FROM temp_table;
 NOTICE:  view "v3_temp" will be a temporary view
-ERROR:  temporary tables cannot specify a schema name
+ERROR:  cannot create temporary relation in non-temporary schema
 -- should fail
 CREATE SCHEMA test_schema
     CREATE TEMP VIEW testview AS SELECT 1;
-ERROR:  temporary tables cannot specify a schema name
+ERROR:  cannot create temporary relation in non-temporary schema
 -- joins: if any of the join relations are temporary, the view
 -- should also be temporary
 -- should be non-temp
diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out
index 2586b07241e4c..34bc31ab3806a 100644
--- a/src/test/regress/expected/domain.out
+++ b/src/test/regress/expected/domain.out
@@ -510,12 +510,12 @@ create type ddtest1 as (f1 posint);
 create table ddtest2(f1 ddtest1);
 insert into ddtest2 values(row(-1));
 alter domain posint add constraint c1 check(value >= 0);
-ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
+ERROR:  cannot alter type "posint" because column "ddtest2.f1" uses it
 drop table ddtest2;
 create table ddtest2(f1 ddtest1[]);
 insert into ddtest2 values('{(-1)}');
 alter domain posint add constraint c1 check(value >= 0);
-ERROR:  cannot alter type "posint" because column "ddtest2"."f1" uses it
+ERROR:  cannot alter type "posint" because column "ddtest2.f1" uses it
 drop table ddtest2;
 alter domain posint add constraint c1 check(value >= 0);
 create domain posint2 as posint check (value % 2 = 0);
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index e18eed8c1cf04..2b3eddfc8b37b 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -694,14 +694,14 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;           -- ERROR
 ERROR:  "ft1" is not a table or view
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
-ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) using '0'; -- ERROR
-ERROR:  ALTER TYPE USING is only supported on plain tables
+ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) USING '0'; -- ERROR
+ERROR:  "ft1" is not a table
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
 -- can't change the column type if it's used elsewhere
 CREATE TABLE use_ft1_column_type (x ft1);
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE integer;	-- ERROR
-ERROR:  cannot alter foreign table "ft1" because column "use_ft1_column_type"."x" uses its rowtype
+ERROR:  cannot alter foreign table "ft1" because column "use_ft1_column_type.x" uses its row type
 DROP TABLE use_ft1_column_type;
 ALTER FOREIGN TABLE ft1 ADD CONSTRAINT ft1_c9_check CHECK (c9 < 0); -- ERROR
 ERROR:  "ft1" is not a table
diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index 87d573b6abf02..65dfe024a99f1 100644
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -1287,3 +1287,35 @@ SELECT * FROM tasks;
 (3 rows)
 
 COMMIT;
+--
+-- Test self-referential FK with CASCADE (bug #6268)
+--
+create temp table selfref (
+    a int primary key,
+    b int,
+    foreign key (b) references selfref (a)
+        on update cascade on delete cascade
+);
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "selfref_pkey" for table "selfref"
+insert into selfref (a, b)
+values
+    (0, 0),
+    (1, 1);
+begin;
+    update selfref set a = 123 where a = 0;
+    select a, b from selfref;
+  a  |  b  
+-----+-----
+   1 |   1
+ 123 | 123
+(2 rows)
+
+    update selfref set a = 456 where a = 123;
+    select a, b from selfref;
+  a  |  b  
+-----+-----
+   1 |   1
+ 456 | 456
+(2 rows)
+
+commit;
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index d59ca449dc4fc..efd6ac4fe084a 100644
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -1242,3 +1242,61 @@ NOTICE:  drop cascades to 3 other objects
 DETAIL:  drop cascades to table matest1
 drop cascades to table matest2
 drop cascades to table matest3
+--
+-- Test merge-append for UNION ALL append relations
+-- Check handling of duplicated, constant, or volatile targetlist items
+--
+set enable_seqscan = off;
+set enable_indexscan = on;
+set enable_bitmapscan = off;
+explain (costs off)
+SELECT thousand, tenthous FROM tenk1
+UNION ALL
+SELECT thousand, thousand FROM tenk1
+ORDER BY thousand, tenthous;
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Result
+   ->  Merge Append
+         Sort Key: public.tenk1.thousand, public.tenk1.tenthous
+         ->  Index Scan using tenk1_thous_tenthous on tenk1
+         ->  Sort
+               Sort Key: public.tenk1.thousand, public.tenk1.thousand
+               ->  Seq Scan on tenk1
+(7 rows)
+
+explain (costs off)
+SELECT thousand, tenthous FROM tenk1
+UNION ALL
+SELECT 42, 42 FROM tenk1
+ORDER BY thousand, tenthous;
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Result
+   ->  Merge Append
+         Sort Key: public.tenk1.thousand, public.tenk1.tenthous
+         ->  Index Scan using tenk1_thous_tenthous on tenk1
+         ->  Sort
+               Sort Key: (42), (42)
+               ->  Seq Scan on tenk1
+(7 rows)
+
+explain (costs off)
+SELECT thousand, tenthous FROM tenk1
+UNION ALL
+SELECT thousand, random()::integer FROM tenk1
+ORDER BY thousand, tenthous;
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ Result
+   ->  Merge Append
+         Sort Key: public.tenk1.thousand, public.tenk1.tenthous
+         ->  Index Scan using tenk1_thous_tenthous on tenk1
+         ->  Sort
+               Sort Key: public.tenk1.thousand, ((random())::integer)
+               ->  Seq Scan on tenk1
+(7 rows)
+
+reset enable_seqscan;
+reset enable_indexscan;
+reset enable_bitmapscan;
diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index 178214b4b9d32..5447a26f447a1 100644
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -2129,6 +2129,7 @@ on (x1 = xx1) where (xx2 is not null);
 -- regression test: check for bug with propagation of implied equality
 -- to outside an IN
 --
+analyze tenk1;		-- ensure we get consistent plans here
 select count(*) from tenk1 a where unique1 in
   (select unique1 from tenk1 b join tenk1 c using (unique1)
    where b.unique2 = 42);
@@ -2488,6 +2489,88 @@ order by c.name;
 (3 rows)
 
 rollback;
+--
+-- test incorrect handling of placeholders that only appear in targetlists,
+-- per bug #6154
+--
+SELECT * FROM
+( SELECT 1 as key1 ) sub1
+LEFT JOIN
+( SELECT sub3.key3, sub4.value2, COALESCE(sub4.value2, 66) as value3 FROM
+    ( SELECT 1 as key3 ) sub3
+    LEFT JOIN
+    ( SELECT sub5.key5, COALESCE(sub6.value1, 1) as value2 FROM
+        ( SELECT 1 as key5 ) sub5
+        LEFT JOIN
+        ( SELECT 2 as key6, 42 as value1 ) sub6
+        ON sub5.key5 = sub6.key6
+    ) sub4
+    ON sub4.key5 = sub3.key3
+) sub2
+ON sub1.key1 = sub2.key3;
+ key1 | key3 | value2 | value3 
+------+------+--------+--------
+    1 |    1 |      1 |      1
+(1 row)
+
+-- test the path using join aliases, too
+SELECT * FROM
+( SELECT 1 as key1 ) sub1
+LEFT JOIN
+( SELECT sub3.key3, value2, COALESCE(value2, 66) as value3 FROM
+    ( SELECT 1 as key3 ) sub3
+    LEFT JOIN
+    ( SELECT sub5.key5, COALESCE(sub6.value1, 1) as value2 FROM
+        ( SELECT 1 as key5 ) sub5
+        LEFT JOIN
+        ( SELECT 2 as key6, 42 as value1 ) sub6
+        ON sub5.key5 = sub6.key6
+    ) sub4
+    ON sub4.key5 = sub3.key3
+) sub2
+ON sub1.key1 = sub2.key3;
+ key1 | key3 | value2 | value3 
+------+------+--------+--------
+    1 |    1 |      1 |      1
+(1 row)
+
+--
+-- test case where a PlaceHolderVar is used as a nestloop parameter
+--
+EXPLAIN (COSTS OFF)
+SELECT qq, unique1
+  FROM
+  ( SELECT COALESCE(q1, 0) AS qq FROM int8_tbl a ) AS ss1
+  FULL OUTER JOIN
+  ( SELECT COALESCE(q2, -1) AS qq FROM int8_tbl b ) AS ss2
+  USING (qq)
+  INNER JOIN tenk1 c ON qq = unique2;
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
+ Nested Loop
+   ->  Hash Full Join
+         Hash Cond: (COALESCE(a.q1, 0::bigint) = COALESCE(b.q2, (-1)::bigint))
+         ->  Seq Scan on int8_tbl a
+         ->  Hash
+               ->  Seq Scan on int8_tbl b
+   ->  Index Scan using tenk1_unique2 on tenk1 c
+         Index Cond: (unique2 = COALESCE((COALESCE(a.q1, 0::bigint)), (COALESCE(b.q2, (-1)::bigint))))
+(8 rows)
+
+SELECT qq, unique1
+  FROM
+  ( SELECT COALESCE(q1, 0) AS qq FROM int8_tbl a ) AS ss1
+  FULL OUTER JOIN
+  ( SELECT COALESCE(q2, -1) AS qq FROM int8_tbl b ) AS ss2
+  USING (qq)
+  INNER JOIN tenk1 c ON qq = unique2;
+ qq  | unique1 
+-----+---------
+ 123 |    4596
+ 123 |    4596
+ 456 |    7318
+(3 rows)
+
 --
 -- test the corner cases FULL JOIN ON TRUE and FULL JOIN ON FALSE
 --
diff --git a/src/test/regress/expected/numeric.out b/src/test/regress/expected/numeric.out
index d9927b79151f7..71c520e5e7a03 100644
--- a/src/test/regress/expected/numeric.out
+++ b/src/test/regress/expected/numeric.out
@@ -1154,6 +1154,24 @@ SELECT '' AS to_char_23, to_char(val, '9.999EEEE')				FROM num_data;
             | -2.493e+07
 (10 rows)
 
+SELECT '' AS to_char_24, to_char('100'::numeric, 'FM999.9');
+ to_char_24 | to_char 
+------------+---------
+            | 100.
+(1 row)
+
+SELECT '' AS to_char_25, to_char('100'::numeric, 'FM999.');
+ to_char_25 | to_char 
+------------+---------
+            | 100
+(1 row)
+
+SELECT '' AS to_char_26, to_char('100'::numeric, 'FM999');
+ to_char_26 | to_char 
+------------+---------
+            | 100
+(1 row)
+
 -- TO_NUMBER()
 --
 SELECT '' AS to_number_1,  to_number('-34,338,492', '99G999G999');
diff --git a/src/test/regress/expected/polymorphism.out b/src/test/regress/expected/polymorphism.out
index 4d1fc2beb04e8..cb3d756290cf1 100644
--- a/src/test/regress/expected/polymorphism.out
+++ b/src/test/regress/expected/polymorphism.out
@@ -578,6 +578,27 @@ select q2, sql_if(q2 > 0, q2, q2 + 1) from int8_tbl;
  -4567890123456789 | -4567890123456788
 (5 rows)
 
+-- another sort of polymorphic aggregate
+CREATE AGGREGATE array_cat_accum (anyarray)
+(
+    sfunc = array_cat,
+    stype = anyarray,
+    initcond = '{}'
+);
+SELECT array_cat_accum(i)
+FROM (VALUES (ARRAY[1,2]), (ARRAY[3,4])) as t(i);
+ array_cat_accum 
+-----------------
+ {1,2,3,4}
+(1 row)
+
+SELECT array_cat_accum(i)
+FROM (VALUES (ARRAY[row(1,2),row(3,4)]), (ARRAY[row(5,6),row(7,8)])) as t(i);
+          array_cat_accum          
+-----------------------------------
+ {"(1,2)","(3,4)","(5,6)","(7,8)"}
+(1 row)
+
 -- another kind of polymorphic aggregate
 create function add_group(grp anyarray, ad anyelement, size integer)
   returns anyarray
diff --git a/src/test/regress/expected/prepared_xacts.out b/src/test/regress/expected/prepared_xacts.out
index 1a6b4ce1d94f6..c0b08649e8d8b 100644
--- a/src/test/regress/expected/prepared_xacts.out
+++ b/src/test/regress/expected/prepared_xacts.out
@@ -88,17 +88,17 @@ SELECT gid FROM pg_prepared_xacts;
 
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 INSERT INTO pxtest1 VALUES ('fff');
+-- This should fail, because the gid foo3 is already in use
+PREPARE TRANSACTION 'foo3';
+ERROR:  transaction identifier "foo3" is already in use
 SELECT * FROM pxtest1;
  foobar 
 --------
  aaa
  ddd
- fff
-(3 rows)
+(2 rows)
 
--- This should fail, because the gid foo3 is already in use
-PREPARE TRANSACTION 'foo3';
-ERROR:  transaction identifier "foo3" is already in use
+ROLLBACK PREPARED 'foo3';
 SELECT * FROM pxtest1;
  foobar 
 --------
@@ -106,7 +106,24 @@ SELECT * FROM pxtest1;
  ddd
 (2 rows)
 
-ROLLBACK PREPARED 'foo3';
+-- Test serialization failure (SSI)
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
+SELECT * FROM pxtest1;
+ foobar 
+--------
+ aaa
+ eee
+(2 rows)
+
+PREPARE TRANSACTION 'foo4';
+SELECT gid FROM pg_prepared_xacts;
+ gid  
+------
+ foo4
+(1 row)
+
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 SELECT * FROM pxtest1;
  foobar 
 --------
@@ -114,6 +131,24 @@ SELECT * FROM pxtest1;
  ddd
 (2 rows)
 
+-- This should fail, because the two transactions have a write-skew anomaly
+INSERT INTO pxtest1 VALUES ('fff');
+ERROR:  could not serialize access due to read/write dependencies among transactions
+DETAIL:  Reason code: Canceled on identification as a pivot, during write.
+HINT:  The transaction might succeed if retried.
+PREPARE TRANSACTION 'foo5';
+SELECT gid FROM pg_prepared_xacts;
+ gid  
+------
+ foo4
+(1 row)
+
+ROLLBACK PREPARED 'foo4';
+SELECT gid FROM pg_prepared_xacts;
+ gid 
+-----
+(0 rows)
+
 -- Clean up
 DROP TABLE pxtest1;
 -- Test subtransactions
diff --git a/src/test/regress/expected/prepared_xacts_1.out b/src/test/regress/expected/prepared_xacts_1.out
index 5051eaabd7117..898f278c11ed8 100644
--- a/src/test/regress/expected/prepared_xacts_1.out
+++ b/src/test/regress/expected/prepared_xacts_1.out
@@ -92,13 +92,6 @@ SELECT gid FROM pg_prepared_xacts;
 
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 INSERT INTO pxtest1 VALUES ('fff');
-SELECT * FROM pxtest1;
- foobar 
---------
- aaa
- fff
-(2 rows)
-
 -- This should fail, because the gid foo3 is already in use
 PREPARE TRANSACTION 'foo3';
 ERROR:  prepared transactions are disabled
@@ -117,6 +110,47 @@ SELECT * FROM pxtest1;
  aaa
 (1 row)
 
+-- Test serialization failure (SSI)
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
+SELECT * FROM pxtest1;
+ foobar 
+--------
+ aaa
+(1 row)
+
+PREPARE TRANSACTION 'foo4';
+ERROR:  prepared transactions are disabled
+HINT:  Set max_prepared_transactions to a nonzero value.
+SELECT gid FROM pg_prepared_xacts;
+ gid 
+-----
+(0 rows)
+
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+SELECT * FROM pxtest1;
+ foobar 
+--------
+ aaa
+(1 row)
+
+-- This should fail, because the two transactions have a write-skew anomaly
+INSERT INTO pxtest1 VALUES ('fff');
+PREPARE TRANSACTION 'foo5';
+ERROR:  prepared transactions are disabled
+HINT:  Set max_prepared_transactions to a nonzero value.
+SELECT gid FROM pg_prepared_xacts;
+ gid 
+-----
+(0 rows)
+
+ROLLBACK PREPARED 'foo4';
+ERROR:  prepared transaction with identifier "foo4" does not exist
+SELECT gid FROM pg_prepared_xacts;
+ gid 
+-----
+(0 rows)
+
 -- Clean up
 DROP TABLE pxtest1;
 -- Test subtransactions
diff --git a/src/test/regress/expected/rowtypes.out b/src/test/regress/expected/rowtypes.out
index 9430bd9b486f7..a5ddbdc140566 100644
--- a/src/test/regress/expected/rowtypes.out
+++ b/src/test/regress/expected/rowtypes.out
@@ -84,7 +84,7 @@ select * from people;
 
 -- at the moment this will not work due to ALTER TABLE inadequacy:
 alter table fullname add column suffix text default '';
-ERROR:  cannot alter table "fullname" because column "people"."fn" uses its rowtype
+ERROR:  cannot alter table "fullname" because column "people.fn" uses its row type
 -- but this should work:
 alter table fullname add column suffix text default null;
 select * from people;
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
index 2440dcd822508..e638f0a60c30b 100644
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@ -266,7 +266,7 @@ SELECT * FROM foo WHERE id IN
 CREATE TABLE orderstest (
     approver_ref integer,
     po_ref integer,
-    ordercancelled boolean
+    ordercanceled boolean
 );
 INSERT INTO orderstest VALUES (1, 1, false);
 INSERT INTO orderstest VALUES (66, 5, false);
@@ -285,8 +285,8 @@ SELECT *,
    WHEN ord.approver_ref=1 THEN '---' ELSE 'Approved'
  END) AS "Approved",
 (SELECT CASE
- WHEN ord.ordercancelled
- THEN 'Cancelled'
+ WHEN ord.ordercanceled
+ THEN 'Canceled'
  ELSE
   (SELECT CASE
 		WHEN ord.po_ref=1
@@ -300,8 +300,8 @@ SELECT *,
 	END)
 END) AS "Status",
 (CASE
- WHEN ord.ordercancelled
- THEN 'Cancelled'
+ WHEN ord.ordercanceled
+ THEN 'Canceled'
  ELSE
   (CASE
 		WHEN ord.po_ref=1
@@ -316,19 +316,19 @@ END) AS "Status",
 END) AS "Status_OK"
 FROM orderstest ord;
 SELECT * FROM orders_view;
- approver_ref | po_ref | ordercancelled | Approved |  Status   | Status_OK 
---------------+--------+----------------+----------+-----------+-----------
-            1 |      1 | f              | ---      | ---       | ---
-           66 |      5 | f              | Approved | PO        | PO
-           66 |      6 | f              | Approved | PO        | PO
-           66 |      7 | f              | Approved | PO        | PO
-           66 |      1 | t              | Approved | Cancelled | Cancelled
-           66 |      8 | f              | Approved | PO        | PO
-           66 |      1 | f              | Approved | Approved  | Approved
-           77 |      1 | f              | Approved | Approved  | Approved
-            1 |      1 | f              | ---      | ---       | ---
-           66 |      1 | f              | Approved | Approved  | Approved
-            1 |      1 | f              | ---      | ---       | ---
+ approver_ref | po_ref | ordercanceled | Approved |  Status  | Status_OK 
+--------------+--------+---------------+----------+----------+-----------
+            1 |      1 | f             | ---      | ---      | ---
+           66 |      5 | f             | Approved | PO       | PO
+           66 |      6 | f             | Approved | PO       | PO
+           66 |      7 | f             | Approved | PO       | PO
+           66 |      1 | t             | Approved | Canceled | Canceled
+           66 |      8 | f             | Approved | PO       | PO
+           66 |      1 | f             | Approved | Approved | Approved
+           77 |      1 | f             | Approved | Approved | Approved
+            1 |      1 | f             | ---      | ---      | ---
+           66 |      1 | f             | Approved | Approved | Approved
+            1 |      1 | f             | ---      | ---      | ---
 (11 rows)
 
 DROP TABLE orderstest cascade;
@@ -530,3 +530,15 @@ select '1'::text in (select '1'::name union all select '1'::name);
  t
 (1 row)
 
+--
+-- Test case for planner bug with nested EXISTS handling
+--
+select a.thousand from tenk1 a, tenk1 b
+where a.thousand = b.thousand
+  and exists ( select 1 from tenk1 c where b.hundred = c.hundred
+                   and not exists ( select 1 from tenk1 d
+                                    where a.thousand = d.thousand ) );
+ thousand 
+----------
+(0 rows)
+
diff --git a/src/test/regress/expected/text.out b/src/test/regress/expected/text.out
index b84e8544d5e08..e45714f77ecd1 100644
--- a/src/test/regress/expected/text.out
+++ b/src/test/regress/expected/text.out
@@ -171,11 +171,11 @@ select format('Hello %%%%');
 
 -- should fail
 select format('Hello %s %s', 'World');
-ERROR:  too few arguments for format conversion
+ERROR:  too few arguments for format
 select format('Hello %s');
-ERROR:  too few arguments for format conversion
+ERROR:  too few arguments for format
 select format('Hello %x', 20);
-ERROR:  unrecognized conversion specifier: x
+ERROR:  unrecognized conversion specifier "x"
 -- check literal and sql identifiers
 select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', 10, 'Hello');
                  format                 
@@ -203,7 +203,7 @@ select format('INSERT INTO %I VALUES(%L,%L)', 'mytab', NULL, 'Hello');
 
 -- should fail, sql identifier cannot be NULL
 select format('INSERT INTO %I VALUES(%L,%L)', NULL, 10, 'Hello');
-ERROR:  NULL cannot be escaped as an SQL identifier
+ERROR:  null values cannot be formatted as an SQL identifier
 -- check positional placeholders
 select format('%1$s %3$s', 1, 2, 3);
  format 
@@ -219,15 +219,15 @@ select format('%1$s %12$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
 
 -- should fail
 select format('%1$s %4$s', 1, 2, 3);
-ERROR:  too few arguments for format conversion
+ERROR:  too few arguments for format
 select format('%1$s %13$s', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
-ERROR:  too few arguments for format conversion
+ERROR:  too few arguments for format
 select format('%1s', 1);
 ERROR:  unterminated conversion specifier
 select format('%1$', 1);
 ERROR:  unterminated conversion specifier
 select format('%1$1', 1);
-ERROR:  unrecognized conversion specifier: 1
+ERROR:  unrecognized conversion specifier "1"
 --checkk mix of positional and ordered placeholders
 select format('Hello %s %1$s %s', 'World', 'Hello again');
             format             
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index c9e8c1a141b9e..b4d391974d21e 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -446,6 +446,35 @@ NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER,
 NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
 NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
 NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+--
+-- Test case for bug with BEFORE trigger followed by AFTER trigger with WHEN
+--
+CREATE TABLE some_t (some_col boolean NOT NULL);
+CREATE FUNCTION dummy_update_func() RETURNS trigger AS $$
+BEGIN
+  RAISE NOTICE 'dummy_update_func(%) called: action = %, old = %, new = %',
+    TG_ARGV[0], TG_OP, OLD, NEW;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER some_trig_before BEFORE UPDATE ON some_t FOR EACH ROW
+  EXECUTE PROCEDURE dummy_update_func('before');
+CREATE TRIGGER some_trig_aftera AFTER UPDATE ON some_t FOR EACH ROW
+  WHEN (NOT OLD.some_col AND NEW.some_col)
+  EXECUTE PROCEDURE dummy_update_func('aftera');
+CREATE TRIGGER some_trig_afterb AFTER UPDATE ON some_t FOR EACH ROW
+  WHEN (NOT NEW.some_col)
+  EXECUTE PROCEDURE dummy_update_func('afterb');
+INSERT INTO some_t VALUES (TRUE);
+UPDATE some_t SET some_col = TRUE;
+NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (t), new = (t)
+UPDATE some_t SET some_col = FALSE;
+NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (t), new = (f)
+NOTICE:  dummy_update_func(afterb) called: action = UPDATE, old = (t), new = (f)
+UPDATE some_t SET some_col = TRUE;
+NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (f), new = (t)
+NOTICE:  dummy_update_func(aftera) called: action = UPDATE, old = (f), new = (t)
+DROP TABLE some_t;
 -- bogus cases
 CREATE TRIGGER error_upd_and_col BEFORE UPDATE OR UPDATE OF a ON main_table
 FOR EACH ROW EXECUTE PROCEDURE trigger_func('error_upd_and_col');
diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out
index aa0a0c2067441..048d463533ad5 100644
--- a/src/test/regress/expected/window.out
+++ b/src/test/regress/expected/window.out
@@ -587,6 +587,33 @@ SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno),
     11 | develop   |   5200 |   500 |    200 |  500 | 200
 (10 rows)
 
+-- window function over ungrouped agg over empty row set (bug before 9.1)
+SELECT SUM(COUNT(f1)) OVER () FROM int4_tbl WHERE f1=42;
+ sum 
+-----
+   0
+(1 row)
+
+-- window function with ORDER BY an expression involving aggregates (9.1 bug)
+select ten,
+  sum(unique1) + sum(unique2) as res,
+  rank() over (order by sum(unique1) + sum(unique2)) as rank
+from tenk1
+group by ten order by ten;
+ ten |   res    | rank 
+-----+----------+------
+   0 |  9976146 |    4
+   1 | 10114187 |    9
+   2 | 10059554 |    8
+   3 |  9878541 |    1
+   4 |  9881005 |    2
+   5 |  9981670 |    5
+   6 |  9947099 |    3
+   7 | 10120309 |   10
+   8 |  9991305 |    6
+   9 | 10040184 |    7
+(10 rows)
+
 -- test non-default frame specifications
 SELECT four, ten,
 	sum(ten) over (partition by four order by ten),
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index 376f28d99a1ea..b1d68e9055537 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -50,13 +50,17 @@ test: create_function_2
 test: copy copyselect
 
 # ----------
-# Another group of parallel tests
+# More groups of parallel tests
 # ----------
-test: constraints triggers create_misc create_aggregate create_operator inherit typed_table vacuum drop_if_exists create_cast
-
-# Depends on the above
+test: create_misc create_operator
+# These depend on the above two
 test: create_index create_view
 
+# ----------
+# Another group of parallel tests
+# ----------
+test: create_aggregate create_cast constraints triggers inherit typed_table vacuum drop_if_exists
+
 # ----------
 # sanity_check does a vacuum, affecting the sort order of SELECT *
 # results. So it should not run parallel to other tests.
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 9fc9c1088ffb0..1c5c176e1f25f 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2310,7 +2310,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 #else
 #define ULONGPID(x) (unsigned long) (x)
 #endif
-		printf(_("running on port %d with pid %lu\n"),
+		printf(_("running on port %d with PID %lu\n"),
 			   port, ULONGPID(postmaster_pid));
 	}
 	else
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index bb654f9c61297..ac0c2071d2925 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -49,20 +49,20 @@ test: create_function_1
 test: create_type
 test: create_table
 test: create_function_2
-test: create_cast
 test: copy
 test: copyselect
-test: constraints
-test: triggers
 test: create_misc
-test: create_aggregate
 test: create_operator
 test: create_index
-test: drop_if_exists
+test: create_view
+test: create_aggregate
+test: create_cast
+test: constraints
+test: triggers
 test: inherit
 test: typed_table
 test: vacuum
-test: create_view
+test: drop_if_exists
 test: sanity_check
 test: errors
 test: select
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index b5d76ea68e3fb..49078ae77489e 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -1175,7 +1175,6 @@ group by c.relname;
 
 create table alterlock (f1 int primary key, f2 text);
 
--- share update exclusive
 begin; alter table alterlock alter column f2 set statistics 150;
 select * from my_locks order by 1;
 rollback;
@@ -1212,7 +1211,6 @@ begin; alter table alterlock alter column f2 set storage extended;
 select * from my_locks order by 1;
 rollback;
 
--- share row exclusive
 begin; alter table alterlock alter column f2 set default 'x';
 select * from my_locks order by 1;
 rollback;
diff --git a/src/test/regress/sql/collate.linux.utf8.sql b/src/test/regress/sql/collate.linux.utf8.sql
index e16d96a3316df..73f5587b700f5 100644
--- a/src/test/regress/sql/collate.linux.utf8.sql
+++ b/src/test/regress/sql/collate.linux.utf8.sql
@@ -161,7 +161,7 @@ SELECT table_name, view_definition FROM information_schema.views
   WHERE table_name LIKE 'collview%' ORDER BY 1;
 
 
--- collation propagation in various expression type
+-- collation propagation in various expression types
 
 SELECT a, coalesce(b, 'foo') FROM collate_test1 ORDER BY 2;
 SELECT a, coalesce(b, 'foo') FROM collate_test2 ORDER BY 2;
diff --git a/src/test/regress/sql/collate.sql b/src/test/regress/sql/collate.sql
index 9585852bc543f..52d830d58a976 100644
--- a/src/test/regress/sql/collate.sql
+++ b/src/test/regress/sql/collate.sql
@@ -99,7 +99,7 @@ SELECT table_name, view_definition FROM information_schema.views
   WHERE table_name LIKE 'collview%' ORDER BY 1;
 
 
--- collation propagation in various expression type
+-- collation propagation in various expression types
 
 SELECT a, coalesce(b, 'foo') FROM collate_test1 ORDER BY 2;
 SELECT a, coalesce(b, 'foo') FROM collate_test2 ORDER BY 2;
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index 31b49ca2273b9..bf27379f5918e 100644
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -451,6 +451,8 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
 
 DROP INDEX onek_nulltest;
 
@@ -460,6 +462,8 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
 
 DROP INDEX onek_nulltest;
 
@@ -469,6 +473,8 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
 
 DROP INDEX onek_nulltest;
 
@@ -478,6 +484,8 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL;
 SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NULL;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NOT NULL AND unique1 > 500;
+SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique1 > 500;
 
 RESET enable_seqscan;
 RESET enable_indexscan;
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index e622b1f0f5bd4..a050e8b6d1a67 100644
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -240,3 +240,13 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
 CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text
 );
+
+CREATE UNLOGGED TABLE unlogged1 (a int primary key);			-- OK
+INSERT INTO unlogged1 VALUES (42);
+CREATE UNLOGGED TABLE public.unlogged2 (a int primary key);		-- also OK
+CREATE UNLOGGED TABLE pg_temp.unlogged3 (a int primary key);	-- not OK
+CREATE TABLE pg_temp.implicitly_temp (a int primary key);		-- OK
+CREATE TEMP TABLE explicitly_temp (a int primary key);			-- also OK
+CREATE TEMP TABLE pg_temp.doubly_temp (a int primary key);		-- also OK
+CREATE TEMP TABLE public.temp_to_perm (a int primary key);		-- not OK
+DROP TABLE unlogged1, public.unlogged2;
diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index d3239216c10f8..58e506047744b 100644
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -294,7 +294,7 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c4 SET DEFAULT 0;          -- ERROR
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c5 DROP DEFAULT;           -- ERROR
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c6 SET NOT NULL;
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c7 DROP NOT NULL;
-ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) using '0'; -- ERROR
+ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10) USING '0'; -- ERROR
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 TYPE char(10);
 ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET DATA TYPE text;
 -- can't change the column type if it's used elsewhere
diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql
index 6d7bdbe77a94a..6bd9ddd1a5e89 100644
--- a/src/test/regress/sql/foreign_key.sql
+++ b/src/test/regress/sql/foreign_key.sql
@@ -921,3 +921,25 @@ SELECT * FROM tasks;
 DELETE FROM users WHERE id = 2;
 SELECT * FROM tasks;
 COMMIT;
+
+--
+-- Test self-referential FK with CASCADE (bug #6268)
+--
+create temp table selfref (
+    a int primary key,
+    b int,
+    foreign key (b) references selfref (a)
+        on update cascade on delete cascade
+);
+
+insert into selfref (a, b)
+values
+    (0, 0),
+    (1, 1);
+
+begin;
+    update selfref set a = 123 where a = 0;
+    select a, b from selfref;
+    update selfref set a = 456 where a = 123;
+    select a, b from selfref;
+commit;
diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index 3087a14b729f9..6e5a1d1c8eeae 100644
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -406,3 +406,34 @@ select * from matest0 order by 1-id;
 reset enable_seqscan;
 
 drop table matest0 cascade;
+
+--
+-- Test merge-append for UNION ALL append relations
+-- Check handling of duplicated, constant, or volatile targetlist items
+--
+
+set enable_seqscan = off;
+set enable_indexscan = on;
+set enable_bitmapscan = off;
+
+explain (costs off)
+SELECT thousand, tenthous FROM tenk1
+UNION ALL
+SELECT thousand, thousand FROM tenk1
+ORDER BY thousand, tenthous;
+
+explain (costs off)
+SELECT thousand, tenthous FROM tenk1
+UNION ALL
+SELECT 42, 42 FROM tenk1
+ORDER BY thousand, tenthous;
+
+explain (costs off)
+SELECT thousand, tenthous FROM tenk1
+UNION ALL
+SELECT thousand, random()::integer FROM tenk1
+ORDER BY thousand, tenthous;
+
+reset enable_seqscan;
+reset enable_indexscan;
+reset enable_bitmapscan;
diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index 3012031fce320..247fae11f9908 100644
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -330,6 +330,8 @@ on (x1 = xx1) where (xx2 is not null);
 -- regression test: check for bug with propagation of implied equality
 -- to outside an IN
 --
+analyze tenk1;		-- ensure we get consistent plans here
+
 select count(*) from tenk1 a where unique1 in
   (select unique1 from tenk1 b join tenk1 c using (unique1)
    where b.unique2 = 42);
@@ -602,6 +604,64 @@ order by c.name;
 
 rollback;
 
+--
+-- test incorrect handling of placeholders that only appear in targetlists,
+-- per bug #6154
+--
+SELECT * FROM
+( SELECT 1 as key1 ) sub1
+LEFT JOIN
+( SELECT sub3.key3, sub4.value2, COALESCE(sub4.value2, 66) as value3 FROM
+    ( SELECT 1 as key3 ) sub3
+    LEFT JOIN
+    ( SELECT sub5.key5, COALESCE(sub6.value1, 1) as value2 FROM
+        ( SELECT 1 as key5 ) sub5
+        LEFT JOIN
+        ( SELECT 2 as key6, 42 as value1 ) sub6
+        ON sub5.key5 = sub6.key6
+    ) sub4
+    ON sub4.key5 = sub3.key3
+) sub2
+ON sub1.key1 = sub2.key3;
+
+-- test the path using join aliases, too
+SELECT * FROM
+( SELECT 1 as key1 ) sub1
+LEFT JOIN
+( SELECT sub3.key3, value2, COALESCE(value2, 66) as value3 FROM
+    ( SELECT 1 as key3 ) sub3
+    LEFT JOIN
+    ( SELECT sub5.key5, COALESCE(sub6.value1, 1) as value2 FROM
+        ( SELECT 1 as key5 ) sub5
+        LEFT JOIN
+        ( SELECT 2 as key6, 42 as value1 ) sub6
+        ON sub5.key5 = sub6.key6
+    ) sub4
+    ON sub4.key5 = sub3.key3
+) sub2
+ON sub1.key1 = sub2.key3;
+
+--
+-- test case where a PlaceHolderVar is used as a nestloop parameter
+--
+
+EXPLAIN (COSTS OFF)
+SELECT qq, unique1
+  FROM
+  ( SELECT COALESCE(q1, 0) AS qq FROM int8_tbl a ) AS ss1
+  FULL OUTER JOIN
+  ( SELECT COALESCE(q2, -1) AS qq FROM int8_tbl b ) AS ss2
+  USING (qq)
+  INNER JOIN tenk1 c ON qq = unique2;
+
+SELECT qq, unique1
+  FROM
+  ( SELECT COALESCE(q1, 0) AS qq FROM int8_tbl a ) AS ss1
+  FULL OUTER JOIN
+  ( SELECT COALESCE(q2, -1) AS qq FROM int8_tbl b ) AS ss2
+  USING (qq)
+  INNER JOIN tenk1 c ON qq = unique2;
+
 --
 -- test the corner cases FULL JOIN ON TRUE and FULL JOIN ON FALSE
 --
diff --git a/src/test/regress/sql/numeric.sql b/src/test/regress/sql/numeric.sql
index a1435ec85ee0e..b2dc46fae2870 100644
--- a/src/test/regress/sql/numeric.sql
+++ b/src/test/regress/sql/numeric.sql
@@ -764,6 +764,10 @@ SELECT '' AS to_char_21, to_char(val, '999999SG9999999999')			FROM num_data;
 SELECT '' AS to_char_22, to_char(val, 'FM9999999999999999.999999999999999')	FROM num_data;
 SELECT '' AS to_char_23, to_char(val, '9.999EEEE')				FROM num_data;
 
+SELECT '' AS to_char_24, to_char('100'::numeric, 'FM999.9');
+SELECT '' AS to_char_25, to_char('100'::numeric, 'FM999.');
+SELECT '' AS to_char_26, to_char('100'::numeric, 'FM999');
+
 -- TO_NUMBER()
 --
 SELECT '' AS to_number_1,  to_number('-34,338,492', '99G999G999');
diff --git a/src/test/regress/sql/polymorphism.sql b/src/test/regress/sql/polymorphism.sql
index 50e6905d4cac3..3d8dd1e55485d 100644
--- a/src/test/regress/sql/polymorphism.sql
+++ b/src/test/regress/sql/polymorphism.sql
@@ -392,6 +392,21 @@ select f1, sql_if(f1 > 0, bleat(f1), bleat(f1 + 1)) from int4_tbl;
 
 select q2, sql_if(q2 > 0, q2, q2 + 1) from int8_tbl;
 
+-- another sort of polymorphic aggregate
+
+CREATE AGGREGATE array_cat_accum (anyarray)
+(
+    sfunc = array_cat,
+    stype = anyarray,
+    initcond = '{}'
+);
+
+SELECT array_cat_accum(i)
+FROM (VALUES (ARRAY[1,2]), (ARRAY[3,4])) as t(i);
+
+SELECT array_cat_accum(i)
+FROM (VALUES (ARRAY[row(1,2),row(3,4)]), (ARRAY[row(5,6),row(7,8)])) as t(i);
+
 -- another kind of polymorphic aggregate
 
 create function add_group(grp anyarray, ad anyelement, size integer)
diff --git a/src/test/regress/sql/prepared_xacts.sql b/src/test/regress/sql/prepared_xacts.sql
index 2bdbb0d18911e..7902152775c70 100644
--- a/src/test/regress/sql/prepared_xacts.sql
+++ b/src/test/regress/sql/prepared_xacts.sql
@@ -54,7 +54,6 @@ SELECT gid FROM pg_prepared_xacts;
 
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 INSERT INTO pxtest1 VALUES ('fff');
-SELECT * FROM pxtest1;
 
 -- This should fail, because the gid foo3 is already in use
 PREPARE TRANSACTION 'foo3';
@@ -65,6 +64,27 @@ ROLLBACK PREPARED 'foo3';
 
 SELECT * FROM pxtest1;
 
+-- Test serialization failure (SSI)
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+UPDATE pxtest1 SET foobar = 'eee' WHERE foobar = 'ddd';
+SELECT * FROM pxtest1;
+PREPARE TRANSACTION 'foo4';
+
+SELECT gid FROM pg_prepared_xacts;
+
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+SELECT * FROM pxtest1;
+
+-- This should fail, because the two transactions have a write-skew anomaly
+INSERT INTO pxtest1 VALUES ('fff');
+PREPARE TRANSACTION 'foo5';
+
+SELECT gid FROM pg_prepared_xacts;
+
+ROLLBACK PREPARED 'foo4';
+
+SELECT gid FROM pg_prepared_xacts;
+
 -- Clean up
 DROP TABLE pxtest1;
 
diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
index 296e38b8c1eff..3cecbc1d41b1e 100644
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@ -136,7 +136,7 @@ SELECT * FROM foo WHERE id IN
 CREATE TABLE orderstest (
     approver_ref integer,
     po_ref integer,
-    ordercancelled boolean
+    ordercanceled boolean
 );
 
 INSERT INTO orderstest VALUES (1, 1, false);
@@ -157,8 +157,8 @@ SELECT *,
    WHEN ord.approver_ref=1 THEN '---' ELSE 'Approved'
  END) AS "Approved",
 (SELECT CASE
- WHEN ord.ordercancelled
- THEN 'Cancelled'
+ WHEN ord.ordercanceled
+ THEN 'Canceled'
  ELSE
   (SELECT CASE
 		WHEN ord.po_ref=1
@@ -172,8 +172,8 @@ SELECT *,
 	END)
 END) AS "Status",
 (CASE
- WHEN ord.ordercancelled
- THEN 'Cancelled'
+ WHEN ord.ordercanceled
+ THEN 'Canceled'
  ELSE
   (CASE
 		WHEN ord.po_ref=1
@@ -341,3 +341,12 @@ from
 --
 
 select '1'::text in (select '1'::name union all select '1'::name);
+
+--
+-- Test case for planner bug with nested EXISTS handling
+--
+select a.thousand from tenk1 a, tenk1 b
+where a.thousand = b.thousand
+  and exists ( select 1 from tenk1 c where b.hundred = c.hundred
+                   and not exists ( select 1 from tenk1 d
+                                    where a.thousand = d.thousand ) );
diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index 28928d5a93607..e52131dbba2d7 100644
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -308,6 +308,32 @@ SELECT pg_get_triggerdef(oid) FROM pg_trigger WHERE tgrelid = 'main_table'::regc
 UPDATE main_table SET a = 50;
 UPDATE main_table SET b = 10;
 
+--
+-- Test case for bug with BEFORE trigger followed by AFTER trigger with WHEN
+--
+
+CREATE TABLE some_t (some_col boolean NOT NULL);
+CREATE FUNCTION dummy_update_func() RETURNS trigger AS $$
+BEGIN
+  RAISE NOTICE 'dummy_update_func(%) called: action = %, old = %, new = %',
+    TG_ARGV[0], TG_OP, OLD, NEW;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER some_trig_before BEFORE UPDATE ON some_t FOR EACH ROW
+  EXECUTE PROCEDURE dummy_update_func('before');
+CREATE TRIGGER some_trig_aftera AFTER UPDATE ON some_t FOR EACH ROW
+  WHEN (NOT OLD.some_col AND NEW.some_col)
+  EXECUTE PROCEDURE dummy_update_func('aftera');
+CREATE TRIGGER some_trig_afterb AFTER UPDATE ON some_t FOR EACH ROW
+  WHEN (NOT NEW.some_col)
+  EXECUTE PROCEDURE dummy_update_func('afterb');
+INSERT INTO some_t VALUES (TRUE);
+UPDATE some_t SET some_col = TRUE;
+UPDATE some_t SET some_col = FALSE;
+UPDATE some_t SET some_col = TRUE;
+DROP TABLE some_t;
+
 -- bogus cases
 CREATE TRIGGER error_upd_and_col BEFORE UPDATE OR UPDATE OF a ON main_table
 FOR EACH ROW EXECUTE PROCEDURE trigger_func('error_upd_and_col');
diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql
index 6a5c855eadbdf..268430a260ba3 100644
--- a/src/test/regress/sql/window.sql
+++ b/src/test/regress/sql/window.sql
@@ -135,6 +135,16 @@ SELECT empno, depname, salary, bonus, depadj, MIN(bonus) OVER (ORDER BY empno),
 		THEN 200 END AS depadj FROM empsalary
 )s;
 
+-- window function over ungrouped agg over empty row set (bug before 9.1)
+SELECT SUM(COUNT(f1)) OVER () FROM int4_tbl WHERE f1=42;
+
+-- window function with ORDER BY an expression involving aggregates (9.1 bug)
+select ten,
+  sum(unique1) + sum(unique2) as res,
+  rank() over (order by sum(unique1) + sum(unique2)) as rank
+from tenk1
+group by ten order by ten;
+
 -- test non-default frame specifications
 SELECT four, ten,
 	sum(ten) over (partition by four order by ten),
diff --git a/src/timezone/README b/src/timezone/README
index 4db3148e0cd3b..201b2938814d3 100644
--- a/src/timezone/README
+++ b/src/timezone/README
@@ -3,9 +3,12 @@ src/timezone/README
 Timezone
 ========
 
-This is a PostgreSQL adapted version of the timezone library from:
+This is a PostgreSQL adapted version of the timezone library from
+http://www.iana.org/time-zones
 
-	ftp://elsie.nci.nih.gov/pub/tzcode*.tar.gz
+The source code can be found at:
+
+	ftp://ftp.iana.org/tz/releases/tzcode*.tar.gz
 
 The code is currently synced with release 2010c.  There are many cosmetic
 (and not so cosmetic) differences from the original tzcode library, but
@@ -13,7 +16,7 @@ diffs in the upstream version should usually be propagated to our version.
 
 The data files under data/ are an exact copy of the latest data set from:
 
-	ftp://elsie.nci.nih.gov/pub/tzdata*.tar.gz
+	ftp://ftp.iana.org/tz/releases/tzdata*.tar.gz
 
 Since time zone rules change frequently in some parts of the world,
 we should endeavor to update the data files before each PostgreSQL
diff --git a/src/timezone/data/africa b/src/timezone/data/africa
index 13c7470ecc190..87f57c650a8ba 100644
--- a/src/timezone/data/africa
+++ b/src/timezone/data/africa
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)africa	8.30
+# @(#)africa	8.33
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -58,7 +58,7 @@
 # I invented the following abbreviations; corrections are welcome!
 #	 2:00	WAST	West Africa Summer Time
 #	 2:30	BEAT	British East Africa Time (no longer used)
-#	 2:44:45 BEAUT	British East Africa Unified Time (no longer used)
+#	 2:45	BEAUT	British East Africa Unified Time (no longer used)
 #	 3:00	CAST	Central Africa Summer Time (no longer used)
 #	 3:00	SAST	South Africa Summer Time (no longer used)
 #	 3:00	EAT	East Africa Time
@@ -212,7 +212,21 @@ Rule	Egypt	1989	only	-	May	 6	1:00	1:00	S
 Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	S
 # IATA (after 1990) says transitions are at 0:00.
 # Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
-Rule	Egypt	1995	max	-	Apr	lastFri	 0:00s	1:00	S
+
+# From Alexander Krivenyshev (2011-04-20):
+# "...Egypt's interim cabinet decided on Wednesday to cancel daylight
+# saving time after a poll posted on its website showed the majority of
+# Egyptians would approve the cancellation."
+#
+# Egypt to cancel daylight saving time
+# <a href="http://www.almasryalyoum.com/en/node/407168">
+# http://www.almasryalyoum.com/en/node/407168
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html">
+# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
+# </a>
+Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
 Rule	Egypt	1995	2005	-	Sep	lastThu	23:00s	0	-
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
@@ -313,7 +327,7 @@ Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
 Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
 Rule	Egypt	2010	only	-	Aug	11	0:00	0	-
 Rule	Egypt	2010	only	-	Sep	10	0:00	1:00	S
-Rule	Egypt	2010	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
@@ -382,7 +396,7 @@ Zone	Africa/Bissau	-1:02:20 -	LMT	1911 May 26
 Zone	Africa/Nairobi	2:27:16	-	LMT	1928 Jul
 			3:00	-	EAT	1930
 			2:30	-	BEAT	1940
-			2:44:45	-	BEAUT	1960
+			2:45	-	BEAUT	1960
 			3:00	-	EAT
 
 # Lesotho
@@ -943,6 +957,11 @@ Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			2:00	Sudan	CA%sT	2000 Jan 15 12:00
 			3:00	-	EAT
 
+# South Sudan
+Zone	Africa/Juba	2:06:24 -	LMT	1931
+			2:00	Sudan	CA%sT	2000 Jan 15 12:00
+			3:00	-	EAT
+
 # Swaziland
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
@@ -952,7 +971,7 @@ Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
 			3:00	-	EAT	1948
-			2:44:45	-	BEAUT	1961
+			2:45	-	BEAUT	1961
 			3:00	-	EAT
 
 # Togo
@@ -1078,7 +1097,7 @@ Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
 Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
 			3:00	-	EAT	1930
 			2:30	-	BEAT	1948
-			2:44:45	-	BEAUT	1957
+			2:45	-	BEAUT	1957
 			3:00	-	EAT
 
 # Zambia
diff --git a/src/timezone/data/antarctica b/src/timezone/data/antarctica
index 629b2d7b8159c..d19fbde0fcf4a 100644
--- a/src/timezone/data/antarctica
+++ b/src/timezone/data/antarctica
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)antarctica	8.8
+# @(#)antarctica	8.9
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -19,18 +19,6 @@
 # I made up all time zone abbreviations mentioned here; corrections welcome!
 # FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
 
-# These rules are stolen from the `europe' file.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	RussAQ	1981	1984	-	Apr	 1	 0:00	1:00	S
-Rule	RussAQ	1981	1983	-	Oct	 1	 0:00	0	-
-Rule	RussAQ	1984	1991	-	Sep	lastSun	 2:00s	0	-
-Rule	RussAQ	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
-Rule	RussAQ	1992	only	-	Mar	lastSat	 23:00	1:00	S
-Rule	RussAQ	1992	only	-	Sep	lastSat	 23:00	0	-
-Rule	RussAQ	1993	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule	RussAQ	1993	1995	-	Sep	lastSun	 2:00s	0	-
-Rule	RussAQ	1996	max	-	Oct	lastSun	 2:00s	0	-
-
 # These rules are stolen from the `southamerica' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
diff --git a/src/timezone/data/asia b/src/timezone/data/asia
index d415ba801c6b0..925cc36f0fb10 100644
--- a/src/timezone/data/asia
+++ b/src/timezone/data/asia
@@ -1,4 +1,4 @@
-# @(#)asia	8.64
+# @(#)asia	8.69
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -77,6 +77,10 @@ Rule RussiaAsia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
 Rule RussiaAsia	1993	1995	-	Sep	lastSun	 2:00s	0	-
 Rule RussiaAsia	1996	max	-	Oct	lastSun	 2:00s	0	-
 
+# From Arthur David Olson (2011-06-15):
+# While Russia abandoned DST in 2011, Armenia may choose to
+# follow Russia's "old" rules.
+
 # Afghanistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Kabul	4:36:48 -	LMT	1890
@@ -2190,7 +2194,47 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
 # </a>
 
+# From Steffen Thorsen (2011-08-26):
+# Gaza and the West Bank did go back to standard time in the beginning of
+# August, and will now enter daylight saving time again on 2011-08-30
+# 00:00 (so two periods of DST in 2011). The pause was because of
+# Ramadan.
+#
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=416217">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
+# </a>
+# Additional info:
+# <a href="http://www.timeanddate.com/news/time/palestine-dst-2011.html">
+# http://www.timeanddate.com/news/time/palestine-dst-2011.html
+# </a>
+
+# From Alexander Krivenyshev (2011-08-27):
+# According to the article in The Jerusalem Post:
+# "...Earlier this month, the Palestinian government in the West Bank decided to
+# move to standard time for 30 days, during Ramadan. The Palestinians in the
+# Gaza Strip accepted the change and also moved their clocks one hour back.
+# The Hamas government said on Saturday that it won't observe summertime after
+# the Muslim feast of Id al-Fitr, which begins on Tuesday..."
+# ...
+# <a href="http://www.jpost.com/MiddleEast/Article.aspx?id=235650">
+# http://www.jpost.com/MiddleEast/Article.aspx?id=235650
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html">
+# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
+# </a>
 # The rules for Egypt are stolen from the `africa' file.
+
+# From Steffen Thorsen (2011-09-30):
+# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30 
+# 00:00).
+# So West Bank and Gaza now have the same time again.
+#
+# Many sources, including:
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=424808">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
+# </a>
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
 Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
@@ -2206,19 +2250,37 @@ Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
 Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
 Rule Palestine	2006	only	-	Sep	22	0:00	0	-
 Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
+Rule Palestine	2008	only	-	Aug	lastFri	0:00	0	-
 Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-Rule Palestine	2010	max	-	Mar	lastSat	0:01	1:00	S
-Rule Palestine	2009	max	-	Sep	Fri>=1	2:00	0	-
+Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
+Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
 Rule Palestine	2010	only	-	Aug	11	0:00	0	-
 
+# From Arthur David Olson (2011-09-20):
+# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
 			2:00	Zion	EET	1948 May 15
 			2:00 EgyptAsia	EE%sT	1967 Jun  5
 			2:00	Zion	I%sT	1996
 			2:00	Jordan	EE%sT	1999
-			2:00 Palestine	EE%sT
+			2:00 Palestine	EE%sT	2011 Apr  2 12:01
+			2:00	1:00	EEST	2011 Aug  1
+			2:00	-	EET
+
+Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
+			2:00	Zion	EET	1948 May 15
+			2:00 EgyptAsia	EE%sT	1967 Jun  5
+			2:00	Zion	I%sT	1996
+			2:00	Jordan	EE%sT	1999
+			2:00 Palestine	EE%sT	2008 Aug
+			2:00 	1:00	EEST	2008 Sep
+			2:00 Palestine	EE%sT	2011 Apr  1 12:01
+			2:00	1:00	EEST	2011 Aug  1
+			2:00	-	EET	2011 Aug 30
+			2:00	1:00	EEST	2011 Sep 30 3:00
+			2:00	-	EET
 
 # Paracel Is
 # no information
diff --git a/src/timezone/data/australasia b/src/timezone/data/australasia
index 6949172dc31ac..d884cbc985bac 100644
--- a/src/timezone/data/australasia
+++ b/src/timezone/data/australasia
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)australasia	8.23
+# @(#)australasia	8.29
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -296,6 +296,32 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # http://www.worldtimezone.com/dst_news/dst_news_fiji04.html
 # </a>
 
+# From Steffen Thorsen (2011-10-03):
+# Now the dates have been confirmed, and at least our start date 
+# assumption was correct (end date was one week wrong).
+#
+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155">
+# www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
+# </a>
+# which says
+# Members of the public are reminded to change their time to one hour in 
+# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to 
+# 2am on February 26 next year.
+
+# From Ken Rylander (2011-10-24)
+# Another change to the Fiji DST end date. In the TZ database the end date for
+# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22.
+#
+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155">
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155
+# </a>
+# states:
+#
+# The end of daylight saving scheduled initially for the 26th of February 2012
+# has been brought forward to the 22nd of January 2012.
+# The commencement of daylight saving will remain unchanged and start
+# on the  23rd of October, 2011.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
@@ -303,6 +329,8 @@ Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
 Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
+Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
+Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time
@@ -499,7 +527,7 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
 # </a>
 
-# From Raymond Hughes (2010-10-07):
+# From Laupue Raymond Hughes (2010-10-07):
 # Please see
 # <a href="http://www.mcil.gov.ws">
 # http://www.mcil.gov.ws
@@ -509,7 +537,7 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks
 # backwards from 1:00am to 12:00am"
 
-# From Raymond Hughes (2011-03-07)
+# From Laupue Raymond Hughes (2011-03-07):
 # I believe this will be posted shortly on the website
 # <a href="http://www.mcil.gov.ws">
 # www.mcil.gov.ws
@@ -529,12 +557,74 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 # Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE,
 # INDUSTRY AND LABOUR 28th February 2011
 
+# From David Zuelke (2011-05-09):
+# Subject: Samoa to move timezone from east to west of international date line
+# 
+# <a href="http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963">
+# http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963
+# </a>
+
+# From Mark Sim-Smith (2011-08-17):
+# I have been in contact with Leilani Tuala Warren from the Samoa Law
+# Reform Commission, and she has sent me a copy of the Bill that she
+# confirmed has been passed...Most of the sections are about maps rather
+# than the time zone change, but I'll paste the relevant bits below. But
+# the essence is that at midnight 29 Dec (UTC-11 I suppose), Samoa
+# changes from UTC-11 to UTC+13:
+#
+# International Date Line Bill 2011
+#
+# AN ACT to provide for the change to standard time in Samoa and to make
+# consequential amendments to the position of the International Date
+# Line, and for related purposes.
+#
+# BE IT ENACTED by the Legislative Assembly of Samoa in Parliament
+# assembled as follows:
+#
+# 1. Short title and commencement-(1) This Act may be cited as the
+# International Date Line Act 2011. (2) Except for section 5(3) this Act
+# commences at 12 o'clock midnight, on Thursday 29th December 2011. (3)
+# Section 5(3) commences on the date of assent by the Head of State.
+#
+# [snip]
+#
+# 3. Interpretation - [snip] "Samoa standard time" in this Act and any
+# other statute of Samoa which refers to 'Samoa standard time' means the
+# time 13 hours in advance of Co-ordinated Universal Time.
+#
+# 4. Samoa standard time - (1) Upon the commencement of this Act, Samoa
+# standard time shall be set at 13 hours in advance of Co-ordinated
+# Universal Time for the whole of Samoa. (2) All references to Samoa's
+# time zone and to Samoa standard time in Samoa in all legislation and
+# instruments after the commencement of this Act shall be references to
+# Samoa standard time as provided for in this Act. (3) Nothing in this
+# Act affects the provisions of the Daylight Saving Act 2009, except that
+# it defines Samoa standard time....
+
+# From Laupue Raymond Hughes (2011-09-02):
+# <a href="http://www.mcil.gov.ws/mcil_publications.html">
+# http://www.mcil.gov.ws/mcil_publications.html
+# </a>
+#
+# here is the official website publication for Samoa DST and dateline change
+#
+# DST
+# Year	End	Time	Start	Time
+# 2011	- - -	- - -	24 September	3:00am to 4:00am
+# 2012	01 April	4:00am to 3:00am	- - -	- - -
+#
+# Dateline Change skip Friday 30th Dec 2011
+# Thursday 29th December 2011	23:59:59 Hours
+# Saturday 31st December 2011	00:00:00 Hours
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
 			-11:30	-	SAMT	1950		# Samoa Time
 			-11:00	-	WST	2010 Sep 26
 			-11:00	1:00	WSDT	2011 Apr 2 4:00
-			-11:00	-	WST
+			-11:00	-	WST	2011 Sep 24 3:00
+			-11:00	1:00	WSDT	2011 Dec 30
+			 13:00	1:00	WSDT	2012 Apr 1 4:00
+			 13:00	-	WST
 
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
@@ -1206,7 +1296,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Lord Howe Island Board (controlling authority for the Island) is
 # seeking the community's views on various options for summer time
 # arrangements on the Island, e.g. advance clocks by 1 full hour
-# instead of only 30 minutes.  Dependant on the wishes of residents
+# instead of only 30 minutes.  [Dependent] on the wishes of residents
 # the Board may approach the NSW government to change the existing
 # arrangements.  The starting date for summer time on the Island will
 # however always coincide with the rest of NSW.
@@ -1332,7 +1422,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # From Paul Eggert (1996-01-22):
 # Today's _Wall Street Journal_ (page 1) reports that Kiribati
-# ``declared it the same day throught the country as of Jan. 1, 1995''
+# ``declared it the same day [throughout] the country as of Jan. 1, 1995''
 # as part of the competition to be first into the 21st century.
 
 
diff --git a/src/timezone/data/backward b/src/timezone/data/backward
index f1f95a894151e..b2d837d2f8898 100644
--- a/src/timezone/data/backward
+++ b/src/timezone/data/backward
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)backward	8.9
+# @(#)backward	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
diff --git a/src/timezone/data/europe b/src/timezone/data/europe
index 221b8504ad1d3..8230b5ef3fa85 100644
--- a/src/timezone/data/europe
+++ b/src/timezone/data/europe
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)europe	8.31
+# @(#)europe	8.40
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -146,7 +146,7 @@
 # A monument to Willett was unveiled on 1927-05-21, in an open space in
 # a 45-acre wood near Chislehurst, Kent that was purchased by popular
 # subscription and open to the public.  On the south face of the monolith,
-# designed by G. W. Miller, is the the William Willett Memorial Sundial,
+# designed by G. W. Miller, is the...William Willett Memorial Sundial,
 # which is permanently set to Summer Time.
 
 # From Winston Churchill (1934-04-28):
@@ -561,9 +561,28 @@ Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
 #
 Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
 Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-Rule	Russia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
+Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
 Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-Rule	Russia	1996	max	-	Oct	lastSun	 2:00s	0	-
+Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
+
+# From Alexander Krivenyshev (2011-06-14):
+# According to Kremlin press service, Russian President Dmitry Medvedev
+# signed a federal law "On calculation of time" on June 9, 2011.
+# According to the law Russia is abolishing daylight saving time.
+# 
+# Medvedev signed a law "On the Calculation of Time" (in russian): 
+# <a href="http://bmockbe.ru/events/?ID=7583">
+# http://bmockbe.ru/events/?ID=7583
+# </a>
+# 
+# Medvedev signed a law on the calculation of the time (in russian):
+# <a href="http://www.regnum.ru/news/polit/1413906.html">
+# http://www.regnum.ru/news/polit/1413906.html
+# </a>
+
+# From Arthur David Olson (2011-06-15):
+# Take "abolishing daylight saving time" to mean that time is now considered
+# to be standard.
 
 # These are for backward compatibility with older versions.
 
@@ -669,6 +688,23 @@ Zone	Europe/Vienna	1:05:20 -	LMT	1893 Apr
 			1:00	EU	CE%sT
 
 # Belarus
+# From Yauhen Kharuzhy (2011-09-16):
+# By latest Belarus government act Europe/Minsk timezone was changed to
+# GMT+3 without DST (was GMT+2 with DST).
+#
+# Sources (Russian language):
+# 1.
+# <a href="http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html">
+# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
+# </a>
+# 2.
+# <a href="http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/">
+# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
+# </a>
+# 3.
+# <a href="http://news.tut.by/society/250578.html">
+# http://news.tut.by/society/250578.html
+# </a>
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Minsk	1:50:16 -	LMT	1880
 			1:50	-	MMT	1924 May 2 # Minsk Mean Time
@@ -680,7 +716,8 @@ Zone	Europe/Minsk	1:50:16 -	LMT	1880
 			2:00	1:00	EEST	1991 Sep 29 2:00s
 			2:00	-	EET	1992 Mar 29 0:00s
 			2:00	1:00	EEST	1992 Sep 27 0:00s
-			2:00	Russia	EE%sT
+			2:00	Russia	EE%sT	2011 Mar 27 2:00s
+			3:00	-	FET # Further-eastern European Time
 
 # Belgium
 #
@@ -1618,6 +1655,41 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2 0:00s # Valletta
 # But [two people] separately reported via
 # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
 # The Tiraspol entry has therefore been removed for now.
+#
+# From Alexander Krivenyshev (2011-10-17):
+# Pridnestrovian Moldavian Republic (PMR, also known as
+# "Pridnestrovie") has abolished seasonal clock change (no transition
+# to the Winter Time).
+#
+# News (in Russian):
+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+# </a>
+#
+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+# http://www.allmoldova.com/moldova-news/1249064116.html
+# </a>
+#
+# The substance of this change (reinstatement of the Tiraspol entry)
+# is from a patch from Petr Machata (2011-10-17)
+#
+# From Tim Parenti (2011-10-19)
+# In addition, being situated at +4651+2938 would give Tiraspol
+# a pre-1880 LMT offset of 1:58:32.
+#
+# (which agrees with the earlier entry that had been removed)
+#
+# From Alexander Krivenyshev (2011-10-26)
+# NO need to divide Moldova into two timezones at this point.
+# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own
+# decision to abolish DST this winter. 
+# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
+# Tiraspol will go back to winter time on October 30, 2011.
+# News from Moldova (in russian):
+# <a href="http://ru.publika.md/link_317061.html">
+# http://ru.publika.md/link_317061.html
+# </a>
+
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1786,7 +1858,7 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 #
 # All these events predate our cutoff date of 1970.  Unless we can
 # come up with more definitive info about the timekeeping during the
-# war years it's probably best just do do the following for now:
+# war years it's probably best just do...the following for now:
 Link	Europe/Oslo	Arctic/Longyearbyen
 
 # Poland
@@ -2013,7 +2085,8 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 			 1:00	C-Eur	CE%sT	1945
 			 2:00	Poland	CE%sT	1946
 			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
-			 2:00	Russia	EE%sT
+			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
+			 3:00	-	FET # Further-eastern European Time
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Respublika Adygeya, Arkhangel'skaya oblast',
@@ -2042,7 +2115,8 @@ Zone Europe/Moscow	 2:30:20 -	LMT	1880
 			 2:00	-	EET	1930 Jun 21
 			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
 			 2:00	Russia	EE%sT	1992 Jan 19 2:00s
-			 3:00	Russia	MSK/MSD
+			 3:00	Russia	MSK/MSD	2011 Mar 27 2:00s
+			 4:00	-	MSK
 #
 # Astrakhanskaya oblast', Kirovskaya oblast', Saratovskaya oblast',
 # Volgogradskaya oblast'.  Shanks & Pottenger say Kirov is still at +0400
@@ -2055,7 +2129,8 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 4:00	Russia	VOL%sT	1989 Mar 26 2:00s # Volgograd T
 			 3:00	Russia	VOL%sT	1991 Mar 31 2:00s
 			 4:00	-	VOLT	1992 Mar 29 2:00s
-			 3:00	Russia	VOL%sT
+			 3:00	Russia	VOL%sT	2011 Mar 27 2:00s
+			 4:00	-	VOLT
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Samarskaya oblast', Udmyrtskaya respublika
@@ -2067,7 +2142,8 @@ Zone Europe/Samara	 3:20:36 -	LMT	1919 Jul  1 2:00
 			 2:00	Russia	KUY%sT	1991 Sep 29 2:00s
 			 3:00	-	KUYT	1991 Oct 20 3:00
 			 4:00	Russia	SAM%sT	2010 Mar 28 2:00s # Samara Time
-			 3:00	Russia	SAM%sT
+			 3:00	Russia	SAM%sT	2011 Mar 27 2:00s
+			 4:00	-	SAMT
 
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
@@ -2080,7 +2156,8 @@ Zone Asia/Yekaterinburg	 4:02:24 -	LMT	1919 Jul 15 4:00
 			 4:00	-	SVET	1930 Jun 21 # Sverdlovsk Time
 			 5:00	Russia	SVE%sT	1991 Mar 31 2:00s
 			 4:00	Russia	SVE%sT	1992 Jan 19 2:00s
-			 5:00	Russia	YEK%sT	# Yekaterinburg Time
+			 5:00	Russia	YEK%sT	2011 Mar 27 2:00s
+			 6:00	-	YEKT	# Yekaterinburg Time
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Respublika Altaj, Altajskij kraj, Omskaya oblast'.
@@ -2088,7 +2165,8 @@ Zone Asia/Omsk		 4:53:36 -	LMT	1919 Nov 14
 			 5:00	-	OMST	1930 Jun 21 # Omsk TIme
 			 6:00	Russia	OMS%sT	1991 Mar 31 2:00s
 			 5:00	Russia	OMS%sT	1992 Jan 19 2:00s
-			 6:00	Russia	OMS%sT
+			 6:00	Russia	OMS%sT	2011 Mar 27 2:00s
+			 7:00	-	OMST
 #
 # From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's
 # not clear when it switched from +7 to +6.
@@ -2098,7 +2176,8 @@ Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14 6:00
 			 7:00	Russia	NOV%sT	1991 Mar 31 2:00s
 			 6:00	Russia	NOV%sT	1992 Jan 19 2:00s
 			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
-			 6:00	Russia	NOV%sT
+			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
+			 7:00	-	NOVT
 
 # From Alexander Krivenyshev (2009-10-13):
 # Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
@@ -2131,7 +2210,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	1920 Jan  6
 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
-			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
+			 6:00	Russia	NOV%sT	2011 Mar 27 2:00s
+			 7:00	-	NOVT # Novosibirsk/Novokuznetsk Time
 
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
@@ -2142,7 +2222,8 @@ Zone Asia/Krasnoyarsk	 6:11:20 -	LMT	1920 Jan  6
 			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
-			 7:00	Russia	KRA%sT
+			 7:00	Russia	KRA%sT	2011 Mar 27 2:00s
+			 8:00	-	KRAT
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Respublika Buryatiya, Irkutskaya oblast',
@@ -2152,14 +2233,15 @@ Zone Asia/Irkutsk	 6:57:20 -	LMT	1880
 			 7:00	-	IRKT	1930 Jun 21 # Irkutsk Time
 			 8:00	Russia	IRK%sT	1991 Mar 31 2:00s
 			 7:00	Russia	IRK%sT	1992 Jan 19 2:00s
-			 8:00	Russia	IRK%sT
+			 8:00	Russia	IRK%sT	2011 Mar 27 2:00s
+			 9:00	-	IRKT
 #
 # From Oscar van Vlijmen (2003-10-18): [This region consists of]
 # Aginskij Buryatskij avtonomnyj okrug, Amurskaya oblast',
 # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
 
 # From Oscar van Vlijmen (2009-11-29):
-# ...some regions of RUssia were merged with others since 2005...
+# ...some regions of [Russia] were merged with others since 2005...
 # Some names were changed, no big deal, except for one instance: a new name.
 # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
 
@@ -2175,7 +2257,8 @@ Zone Asia/Yakutsk	 8:38:40 -	LMT	1919 Dec 15
 			 8:00	-	YAKT	1930 Jun 21 # Yakutsk Time
 			 9:00	Russia	YAK%sT	1991 Mar 31 2:00s
 			 8:00	Russia	YAK%sT	1992 Jan 19 2:00s
-			 9:00	Russia	YAK%sT
+			 9:00	Russia	YAK%sT	2011 Mar 27 2:00s
+			 10:00	-	YAKT
 #
 # From Oscar van Vlijmen (2003-10-18): [This region consists of]
 # Evrejskaya avtonomnaya oblast', Khabarovskij kraj, Primorskij kraj,
@@ -2188,7 +2271,8 @@ Zone Asia/Vladivostok	 8:47:44 -	LMT	1922 Nov 15
 			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
 			10:00	Russia	VLA%sT	1991 Mar 31 2:00s
 			 9:00	Russia	VLA%sST	1992 Jan 19 2:00s
-			10:00	Russia	VLA%sT
+			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
+			11:00	-	VLAT
 #
 # Sakhalinskaya oblast'.
 # The Zone name should be Yuzhno-Sakhalinsk, but that's too long.
@@ -2198,7 +2282,8 @@ Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
 			11:00	Russia	SAK%sT	1991 Mar 31 2:00s # Sakhalin T.
 			10:00	Russia	SAK%sT	1992 Jan 19 2:00s
 			11:00	Russia	SAK%sT	1997 Mar lastSun 2:00s
-			10:00	Russia	SAK%sT
+			10:00	Russia	SAK%sT	2011 Mar 27 2:00s
+			11:00	-	SAKT
 #
 # From Oscar van Vlijmen (2003-10-18): [This region consists of]
 # Magadanskaya oblast', Respublika Sakha (Yakutiya).
@@ -2211,7 +2296,8 @@ Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
 			10:00	-	MAGT	1930 Jun 21 # Magadan Time
 			11:00	Russia	MAG%sT	1991 Mar 31 2:00s
 			10:00	Russia	MAG%sT	1992 Jan 19 2:00s
-			11:00	Russia	MAG%sT
+			11:00	Russia	MAG%sT	2011 Mar 27 2:00s
+			12:00	-	MAGT
 #
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
 # Kamchatskaya oblast', Koryakskij avtonomnyj okrug.
@@ -2222,7 +2308,8 @@ Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
 			12:00	Russia	PET%sT	1991 Mar 31 2:00s
 			11:00	Russia	PET%sT	1992 Jan 19 2:00s
 			12:00	Russia	PET%sT	2010 Mar 28 2:00s
-			11:00	Russia	PET%sT
+			11:00	Russia	PET%sT	2011 Mar 27 2:00s
+			12:00	-	PETT
 #
 # Chukotskij avtonomnyj okrug
 Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
@@ -2231,7 +2318,8 @@ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			12:00	Russia	ANA%sT	1991 Mar 31 2:00s
 			11:00	Russia	ANA%sT	1992 Jan 19 2:00s
 			12:00	Russia	ANA%sT	2010 Mar 28 2:00s
-			11:00	Russia	ANA%sT
+			11:00	Russia	ANA%sT	2011 Mar 27 2:00s
+			12:00	-	ANAT
 
 # Serbia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2577,6 +2665,50 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # of March at 3am the time is changing to 4am and each last Sunday of
 # October the time at 4am is changing to 3am"
 
+# From Alexander Krivenyshev (2011-09-20):
+# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+# abolish the transfer clock to winter time.
+#
+# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+# approval from 266 deputies.
+#
+# Ukraine abolishes transter back to the winter time (in Russian)
+# <a href="http://news.mail.ru/politics/6861560/">
+# http://news.mail.ru/politics/6861560/
+# </a>
+#
+# The Ukrainians will no longer change the clock (in Russian)
+# <a href="http://www.segodnya.ua/news/14290482.html">
+# http://www.segodnya.ua/news/14290482.html
+# </a>
+#
+# Deputies cancelled the winter time (in Russian)
+# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
+# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+# </a>
+#
+# From Philip Pizzey (2011-10-18):
+# Today my Ukrainian colleagues have informed me that the
+# Ukrainian parliament have decided that they will go to winter
+# time this year after all.
+#
+# From Udo Schwedt (2011-10-18):
+# As far as I understand, the recent change to the Ukranian time zone 
+# (Europe/Kiev) to introduce permanent daylight saving time (similar
+# to Russia) was reverted today:
+#
+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+# </a>
+#
+# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+# The law documents themselves are at
+#
+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+# </a>
+
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Most of Ukraine since 1970 has been like Kiev.
 # "Kyiv" is the transliteration of the Ukrainian name, but
diff --git a/src/timezone/data/iso3166.tab b/src/timezone/data/iso3166.tab
index b8a2592c0083b..950c40f1db660 100644
--- a/src/timezone/data/iso3166.tab
+++ b/src/timezone/data/iso3166.tab
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)iso3166.tab	8.6
+# @(#)iso3166.tab	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 # ISO 3166 alpha-2 country codes
@@ -21,6 +21,9 @@
 #
 # Lines beginning with `#' are comments.
 #
+# From Arthur David Olson (2011-08-17):
+# Resynchronized today with the ISO 3166 site (adding SS for South Sudan).
+#
 #country-
 #code	country name
 AD	Andorra
@@ -30,7 +33,6 @@ AG	Antigua & Barbuda
 AI	Anguilla
 AL	Albania
 AM	Armenia
-AN	Netherlands Antilles
 AO	Angola
 AQ	Antarctica
 AR	Argentina
@@ -53,6 +55,7 @@ BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
+BQ	Bonaire Sint Eustatius & Saba
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -75,6 +78,7 @@ CO	Colombia
 CR	Costa Rica
 CU	Cuba
 CV	Cape Verde
+CW	Curacao
 CX	Christmas Island
 CY	Cyprus
 CZ	Czech Republic
@@ -229,8 +233,10 @@ SM	San Marino
 SN	Senegal
 SO	Somalia
 SR	Suriname
+SS	South Sudan
 ST	Sao Tome & Principe
 SV	El Salvador
+SX	Sint Maarten
 SY	Syria
 SZ	Swaziland
 TC	Turks & Caicos Is
diff --git a/src/timezone/data/northamerica b/src/timezone/data/northamerica
index 0dcdafb9d8228..a21bf895b053e 100644
--- a/src/timezone/data/northamerica
+++ b/src/timezone/data/northamerica
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)northamerica	8.42
+# @(#)northamerica	8.51
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -468,6 +468,10 @@ Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:07:02
 # own time. I asked about daylight saving; they said it wasn't used. I
 # did not inquire about practices in the past.
 
+# From Arthur David Olson (2011-08-17):
+# For lack of better information, assume that Metlakatla's
+# abandonment of use of daylight saving resulted from the 1983 vote.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
 			 -8:57:41 -	LMT	1900 Aug 20 12:00
@@ -479,7 +483,7 @@ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
 			 -8:00	US	P%sT	1983 Oct 30 2:00
 			 -9:00	US	Y%sT	1983 Nov 30
 			 -9:00	US	AK%sT
-Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
+Zone America/Sitka	 14:58:47 -	LMT	1867 Oct 18
 			 -9:01:13 -	LMT	1900 Aug 20 12:00
 			 -8:00	-	PST	1942
 			 -8:00	US	P%sT	1946
@@ -493,7 +497,7 @@ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
 			 -8:00	US	P%sT	1946
 			 -8:00	-	PST	1969
 			 -8:00	US	P%sT	1983 Oct 30 2:00
-			 -8:00	US	MeST
+			 -8:00	-	MeST
 Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
 			 -9:18:55 -	LMT	1900 Aug 20 12:00
 			 -9:00	-	YST	1942
@@ -593,8 +597,8 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
 			-10:30	-	HST	1933 Apr 30 2:00 #Laws 1933
 			-10:30	1:00	HDT	1933 May 21 12:00 #Laws 1933+12
 			-10:30	-	HST	1942 Feb 09 2:00 #Schmitt&Cox+2
-			-10:30	1:00	HDT	1945 Sep 30 2:00 #Schmitt&Fox+2
-			-10:30	US	H%sT	1947 Jun  8 2:00 #Schmitt&Fox+2
+			-10:30	1:00	HDT	1945 Sep 30 2:00 #Schmitt&Cox+2
+			-10:30	-	HST	1947 Jun  8 2:00 #Schmitt&Cox+2
 			-10:00	-	HST
 
 # Now we turn to US areas that have diverged from the consensus since 1970.
@@ -1163,12 +1167,29 @@ Rule	StJohns	1960	1986	-	Oct	lastSun	2:00	0	S
 # From Paul Eggert (2000-10-02):
 # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
 # at 00:01 local time.  For now, assume it started in 1987.
+
+# From Michael Pelley (2011-09-12):
+# We received today, Monday, September 12, 2011, notification that the
+# changes to the Newfoundland Standard Time Act have been proclaimed.
+# The change in the Act stipulates that the change from Daylight Savings
+# Time to Standard Time and from Standard Time to Daylight Savings Time
+# now occurs at 2:00AM.
+# ...
+# <a href="http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm">
+# http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
+# </a>
+# ...
+# MICHAEL PELLEY  |  Manager of Enterprise Architecture - Solution Delivery
+# Office of the Chief Information Officer
+# Executive Council
+# Government of Newfoundland & Labrador
+
 Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
 Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
 Rule	StJohns	1988	only	-	Apr	Sun>=1	0:01	2:00	DD
 Rule	StJohns	1989	2006	-	Apr	Sun>=1	0:01	1:00	D
-Rule	StJohns	2007	max	-	Mar	Sun>=8	0:01	1:00	D
-Rule	StJohns	2007	max	-	Nov	Sun>=1	0:01	0	S
+Rule	StJohns	2007	2011	-	Mar	Sun>=8	0:01	1:00	D
+Rule	StJohns	2007	2010	-	Nov	Sun>=1	0:01	0	S
 #
 # St John's has an apostrophe, but Posix file names can't have apostrophes.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1178,7 +1199,8 @@ Zone America/St_Johns	-3:30:52 -	LMT	1884
 			-3:30:52 StJohns N%sT	1935 Mar 30
 			-3:30	StJohns	N%sT	1942 May 11
 			-3:30	Canada	N%sT	1946
-			-3:30	StJohns	N%sT
+			-3:30	StJohns	N%sT	2011 Nov
+			-3:30	Canada	N%sT
 
 # most of east Labrador
 
@@ -1192,7 +1214,8 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 			-3:30	StJohns	N%sT	1942 May 11
 			-3:30	Canada	N%sT	1946
 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
-			-4:00	StJohns	A%sT
+			-4:00	StJohns	A%sT	2011 Nov
+			-4:00	Canada	A%sT
 
 
 # west Labrador, Nova Scotia, Prince Edward I
@@ -1924,20 +1947,69 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 # daylight saving....
 # http://www.nnsl.com/frames/newspapers/2006-11/nov13_06none.html
 
-# From Chris Walton (2007-03-14):
-# Today I phoned the "hamlet office" to find out what Resolute was doing with
-# its clocks.
+# From Chris Walton (2011-03-21):
+# Back in 2007 I initiated the creation of a new "zone file" for Resolute
+# Bay. Resolute Bay is a small community located about 900km north of
+# the Arctic Circle. The zone file was required because Resolute Bay had
+# decided to use UTC-5 instead of UTC-6 for the winter of 2006-2007.
+#
+# According to new information which I received last week, Resolute Bay
+# went back to using UTC-6 in the winter of 2007-2008...
+#
+# On March 11/2007 most of Canada went onto daylight saving. On March
+# 14/2007 I phoned the Resolute Bay hamlet office to do a "time check." I
+# talked to somebody that was both knowledgeable and helpful. I was able
+# to confirm that Resolute Bay was still operating on UTC-5. It was
+# explained to me that Resolute Bay had been on the Eastern Time zone
+# (EST) in the winter, and was now back on the Central Time zone (CDT).
+# i.e. the time zone had changed twice in the last year but the clocks
+# had not moved. The residents had to know which time zone they were in
+# so they could follow the correct TV schedule...
+#
+# On Nov 02/2008 most of Canada went onto standard time. On Nov 03/2008 I
+# phoned the Resolute Bay hamlet office...[D]ue to the challenging nature
+# of the phone call, I decided to seek out an alternate source of
+# information. I found an e-mail address for somebody by the name of
+# Stephanie Adams whose job was listed as "Inns North Support Officer for
+# Arctic Co-operatives." I was under the impression that Stephanie lived
+# and worked in Resolute Bay...
+#
+# On March 14/2011 I phoned the hamlet office again. I was told that
+# Resolute Bay had been using Central Standard Time over the winter of
+# 2010-2011 and that the clocks had therefore been moved one hour ahead
+# on March 13/2011. The person I talked to was aware that Resolute Bay
+# had previously experimented with Eastern Standard Time but he could not
+# tell me when the practice had stopped.
+#
+# On March 17/2011 I searched the Web to find an e-mail address of
+# somebody that might be able to tell me exactly when Resolute Bay went
+# off Eastern Standard Time. I stumbled on the name "Aziz Kheraj." Aziz
+# used to be the mayor of Resolute Bay and he apparently owns half the
+# businesses including "South Camp Inn." This website has some info on
+# Aziz:
+# <a href="http://www.uphere.ca/node/493">
+# http://www.uphere.ca/node/493
+# </a>
 #
-# The individual that answered the phone confirmed that the clocks did not
-# move at the end of daylight saving on October 29/2006.  He also told me that
-# the clocks did not move this past weekend (March 11/2007)....
-
-# From Chris Walton (2008-11-13):
-# ...the residents of Resolute believe that they are changing "time zones"
-# twice a year.  In winter months, local time is qualified with "Eastern
-# Time" which is really "Eastern Standard Time (UTC-5)".  In summer
-# months, local time is qualified with "Central Time" which is really
-# "Central Daylight Time (UTC-5)"...
+# I sent Aziz an e-mail asking when Resolute Bay had stopped using
+# Eastern Standard Time.
+#
+# Aziz responded quickly with this: "hi, The time was not changed for the
+# 1 year only, the following year, the community went back to the old way
+# of "spring ahead-fall behind" currently we are zulu plus 5 hrs and in
+# the winter Zulu plus 6 hrs"
+#
+# This of course conflicted with everything I had ascertained in November 2008.
+#
+# I sent Aziz a copy of my 2008 e-mail exchange with Stephanie. Aziz
+# responded with this: "Hi, Stephanie lives in Winnipeg. I live here, You
+# may want to check with the weather office in Resolute Bay or do a
+# search on the weather through Env. Canada. web site"
+#
+# If I had realized the Stephanie did not live in Resolute Bay I would
+# never have contacted her.  I now believe that all the information I
+# obtained in November 2008 should be ignored...
+# I apologize for reporting incorrect information in 2008.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
@@ -1965,14 +2037,12 @@ Zone America/Iqaluit	0	-	zzz	1942 Aug # Frobisher Bay est.
 			-6:00	Canada	C%sT	2000 Oct 29 2:00
 			-5:00	Canada	E%sT
 # aka Qausuittuq
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Resolute 2006	max	-	Nov	Sun>=1	2:00	0	ES
-Rule	Resolute 2007	max	-	Mar	Sun>=8	2:00	0	CD
 Zone America/Resolute	0	-	zzz	1947 Aug 31 # Resolute founded
 			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
 			-5:00	-	EST	2001 Apr  1 3:00
 			-6:00	Canada	C%sT	2006 Oct 29 2:00
-			-5:00	Resolute	%sT
+			-5:00	-	EST	2007 Mar 11 3:00
+			-6:00	Canada	C%sT
 # aka Kangiqiniq
 Zone America/Rankin_Inlet 0	-	zzz	1957 # Rankin Inlet founded
 			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
@@ -2620,6 +2690,20 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 # <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html">
 # http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
 # </a>
+#
+# From Steffen Thorsen (2011-10-30)
+# Cuba will end DST two weeks later this year. Instead of going back 
+# tonight, it has been delayed to 2011-11-13 at 01:00.
+#
+# One source (Spanish)
+# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html">
+# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
+# </a>
+#
+# Our page:
+# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html">
+# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
+# </a>
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
@@ -2651,12 +2735,14 @@ Rule	Cuba	1997	only	-	Oct	12	0:00s	0	S
 Rule	Cuba	1998	1999	-	Mar	lastSun	0:00s	1:00	D
 Rule	Cuba	1998	2003	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2000	2004	-	Apr	Sun>=1	0:00s	1:00	D
-Rule	Cuba	2006	max	-	Oct	lastSun	0:00s	0	S
+Rule	Cuba	2006	2010	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2007	only	-	Mar	Sun>=8	0:00s	1:00	D
 Rule	Cuba	2008	only	-	Mar	Sun>=15	0:00s	1:00	D
 Rule	Cuba	2009	2010	-	Mar	Sun>=8	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Mar	Sun>=15	0:00s	1:00	D
+Rule	Cuba	2011	only	-	Nov	13	0:00s	0	S
 Rule	Cuba	2012	max	-	Mar	Sun>=8	0:00s	1:00	D
+Rule	Cuba	2012	max	-	Oct	lastSun	0:00s	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Havana	-5:29:28 -	LMT	1890
diff --git a/src/timezone/data/southamerica b/src/timezone/data/southamerica
index 930381df7a18a..6012005c48504 100644
--- a/src/timezone/data/southamerica
+++ b/src/timezone/data/southamerica
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)southamerica	8.48
+# @(#)southamerica	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -745,7 +745,7 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 #
 # As a result of the above Decree I believe the America/Rio_Branco
 # timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
-# be created to represent the the west side of the Para State. I
+# be created to represent the...west side of the Para State. I
 # suggest this new timezone be called Santarem as the most
 # important/populated city in the affected area.
 #
@@ -797,6 +797,39 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html">
 # http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
 # </a>
+#
+# From Alexander Krivenyshev (2011-10-04):
+# State Bahia will return to Daylight savings time this year after 8 years off.
+# The announcement was made by Governor Jaques Wagner in an interview to a 
+# television station in Salvador. 
+
+# In Portuguese:
+# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
+# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
+# </a> and
+# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html">
+# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+# </a>
+
+# From Guilherme Bernardes Rodrigues (2011-10-07):
+# There is news in the media, however there is still no decree about it.
+# I just send a e-mail to Zulmira Brandão at
+# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
+# oficial agency about time in Brazil, and she confirmed that the old rule is
+# still in force.
+
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+#	 [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
@@ -1034,7 +1067,8 @@ Zone America/Maceio	-2:22:52 -	LMT	1914
 # of America/Salvador.
 Zone America/Bahia	-2:34:04 -	LMT	1914
 			-3:00	Brazil	BR%sT	2003 Sep 24
-			-3:00	-	BRT
+			-3:00	-	BRT	2011 Oct 16
+			-3:00	Brazil	BR%sT
 #
 # Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
 # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
@@ -1276,6 +1310,14 @@ Zone	America/Curacao	-4:35:44 -	LMT	1912 Feb 12	# Willemstad
 			-4:30	-	ANT	1965 # Netherlands Antilles Time
 			-4:00	-	AST
 
+# From Arthur David Olson (2011-06-15):
+# At least for now, use links for places with new iso3166 codes.
+# The name "Lower Prince's Quarter" is both longer than fourteen charaters
+# and contains an apostrophe; use "Lower_Princes" below.
+
+Link	America/Curacao	America/Lower_Princes # Sint Maarten
+Link	America/Curacao	America/Kralendijk # Bonaire, Sint Estatius and Saba
+
 # Ecuador
 #
 # From Paul Eggert (2007-03-04):
diff --git a/src/timezone/data/zone.tab b/src/timezone/data/zone.tab
index b06ace4282b8c..c81709d956e74 100644
--- a/src/timezone/data/zone.tab
+++ b/src/timezone/data/zone.tab
@@ -1,5 +1,5 @@
 # <pre>
-# @(#)zone.tab	8.43
+# @(#)zone.tab	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -32,7 +32,6 @@ AG	+1703-06148	America/Antigua
 AI	+1812-06304	America/Anguilla
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
-AN	+1211-06900	America/Curacao
 AO	-0848+01314	Africa/Luanda
 AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
 AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
@@ -87,6 +86,7 @@ BL	+1753-06251	America/St_Barthelemy
 BM	+3217-06446	Atlantic/Bermuda
 BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
+BQ	+120903-0681636	America/Kralendijk
 BR	-0351-03225	America/Noronha	Atlantic islands
 BR	-0127-04829	America/Belem	Amapa, E Para
 BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
@@ -120,7 +120,7 @@ CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did
 CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
 CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
 CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
-CA	+744144-0944945	America/Resolute	Eastern Standard Time - Resolute, Nunavut
+CA	+744144-0944945	America/Resolute	Central Standard Time - Resolute, Nunavut
 CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
 CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
 CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
@@ -155,6 +155,7 @@ CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
 CU	+2308-08222	America/Havana
 CV	+1455-02331	Atlantic/Cape_Verde
+CW	+1211-06900	America/Curacao
 CX	-1025+10543	Indian/Christmas
 CY	+3510+03322	Asia/Nicosia
 CZ	+5005+01426	Europe/Prague
@@ -318,7 +319,8 @@ PL	+5215+02100	Europe/Warsaw
 PM	+4703-05620	America/Miquelon
 PN	-2504-13005	Pacific/Pitcairn
 PR	+182806-0660622	America/Puerto_Rico
-PS	+3130+03428	Asia/Gaza
+PS	+3130+03428	Asia/Gaza	Gaza Strip
+PS	+313200+0350542	Asia/Hebron	West Bank
 PT	+3843-00908	Europe/Lisbon	mainland
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
@@ -360,8 +362,10 @@ SM	+4355+01228	Europe/San_Marino
 SN	+1440-01726	Africa/Dakar
 SO	+0204+04522	Africa/Mogadishu
 SR	+0550-05510	America/Paramaribo
+SS	+0451+03136	Africa/Juba
 ST	+0020+00644	Africa/Sao_Tome
 SV	+1342-08912	America/El_Salvador
+SX	+180305-0630250	America/Lower_Princes
 SY	+3330+03618	Asia/Damascus
 SZ	-2618+03106	Africa/Mbabane
 TC	+2128-07108	America/Grand_Turk
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index ce6e7d1add963..685016c133e11 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -716,9 +716,10 @@ static const struct
 		"Cen. Australia Standard Time", "Cen. Australia Daylight Time",
 		"Australia/Adelaide"
 	},							/* (GMT+09:30) Adelaide */
+	/* Central America (other than Mexico) generally does not observe DST */
 	{
 		"Central America Standard Time", "Central America Daylight Time",
-		"CST6CDT"
+		"CST6"
 	},							/* (GMT-06:00) Central America */
 	{
 		"Central Asia Standard Time", "Central Asia Daylight Time",
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 1d10ee98e8312..7883587f9546b 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -13,6 +13,8 @@ use Project;
 use Solution;
 use Cwd;
 use File::Copy;
+use Config;
+use List::Util qw(first);
 
 use Exporter;
 our (@ISA, @EXPORT_OK);
@@ -53,7 +55,7 @@ sub mkvcbuild
       snprintf.c strlcat.c strlcpy.c dirmod.c exec.c noblock.c path.c
       pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c qsort.c qsort_arg.c
       sprompt.c thread.c getopt.c getopt_long.c dirent.c rint.c win32env.c
-      win32error.c);
+      win32error.c win32setlocale.c);
 
     $libpgport = $solution->AddProject('libpgport','lib','misc');
     $libpgport->AddDefine('FRONTEND');
@@ -106,11 +108,11 @@ sub mkvcbuild
             (my $xsc = $xs) =~ s/\.xs/.c/;
             if (Solution::IsNewer("$plperlsrc$xsc","$plperlsrc$xs"))
             {
+                my $xsubppdir = first { -e "$_\\ExtUtils\\xsubpp" } @INC;
                 print "Building $plperlsrc$xsc...\n";
                 system( $solution->{options}->{perl}
                       . '/bin/perl '
-                      . $solution->{options}->{perl}
-                      . '/lib/ExtUtils/xsubpp -typemap '
+                      . "$xsubppdir/ExtUtils/xsubpp -typemap "
                       . $solution->{options}->{perl}
                       . '/lib/ExtUtils/typemap '
                       . "$plperlsrc$xs "
diff --git a/src/tools/msvc/install.bat b/src/tools/msvc/install.bat
index 8c5fb1dccbaae..1d2ab9c9b0a71 100644
--- a/src/tools/msvc/install.bat
+++ b/src/tools/msvc/install.bat
@@ -15,7 +15,7 @@ exit /b 1
 SETLOCAL
 
 IF NOT EXIST buildenv.pl goto nobuildenv
-perl -e "require 'buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat
index e67b8fcf19d24..c5d355e5abde8 100755
--- a/src/tools/msvc/pgbison.bat
+++ b/src/tools/msvc/pgbison.bat
@@ -2,7 +2,7 @@
 REM src/tools/msvc/pgbison.bat
 
 IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
-perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/src/tools/msvc/pgflex.bat b/src/tools/msvc/pgflex.bat
index 75f4eb9dfe95f..e26724cc5f0c8 100755
--- a/src/tools/msvc/pgflex.bat
+++ b/src/tools/msvc/pgflex.bat
@@ -5,7 +5,7 @@ REM silence flex bleatings about file path style
 SET CYGWIN=nodosfilewarning
 
 IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
-perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/todo b/todo
new file mode 100644
index 0000000000000..66191e87bfe35
--- /dev/null
+++ b/todo
@@ -0,0 +1,33 @@
+TODO
+
+- copy ViewStmt in gram.y as MatViewStmt
+- Store materialized view as table
+- Prevent listing materialized view when enumerating tables of a database
+- PG_PARSE_QUERY in postgres.c calls raw_parser in parser.c
+- make matview.c analogous to view.c
+- include defintions of functions to be used in utility.c (define matview etc.)
+- CreateCommandTag constructs the command (commandTag object)
+- main processing fuction is execSimpleQuery
+    - uses pg_parse_query for parsing the query string (produces parsetree_list)
+    - CreateCommandTag uses parsetree_list
+- add CREATE MATVIEW to help file
+
+
+- drop MV
+- implemet \dm
+- listing views should not list mv
+- edit definematerializedvirtualrelation
+-in function addnewrelationtuple in heap.c (add entry to pg_class )...need to specify that matview has space while view does not
+
+
+- changing pg_class.h requires make clean and make
+- utility.c : 530,
+- view.c: 263
+- postgres.c : 574
+ - analyze.c:84
+
+
+ - extension.c:742 ->executeSQLString
+ - execMain.c:initPlan, :132, :215 calls iniPlan which calls OpenIntoRel which which creates query 
+ description which is executed by executorRun called in extension.c:743 following executorStart
+